From a7813c37a1dee3b5ba8d2e4da451e0f16e96f519 Mon Sep 17 00:00:00 2001
From: Alexis Algoud <alexis@atm-consulting.fr>
Date: Mon, 12 Dec 2016 12:36:00 +0100
Subject: [PATCH 001/505] init inventory integration

---
 htdocs/core/class/coreobject.class.php     | 214 ++++++++++
 htdocs/inventory/ajax/ajax.inventory.php   |  50 +++
 htdocs/inventory/class/inventory.class.php | 466 +++++++++++++++++++++
 3 files changed, 730 insertions(+)
 create mode 100644 htdocs/core/class/coreobject.class.php
 create mode 100644 htdocs/inventory/ajax/ajax.inventory.php
 create mode 100644 htdocs/inventory/class/inventory.class.php

diff --git a/htdocs/core/class/coreobject.class.php b/htdocs/core/class/coreobject.class.php
new file mode 100644
index 00000000000..1cc68f38cb7
--- /dev/null
+++ b/htdocs/core/class/coreobject.class.php
@@ -0,0 +1,214 @@
+<?php
+/* Copyright (C) 2016		ATM Consulting			<support@atm-consulting.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
+ * 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/class/coreobject.inventory.php
+ *	\ingroup    core
+ *	\brief      File of class to manage all object. Might be replace or merge into commonobject
+ */
+ 
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
+
+class CoreObject extends CommonObject {
+	
+	 
+	 /**
+	 *  Constructor
+	 *
+	 *  @param      DoliDB		$db      Database handler
+	 */
+	function __construct(DoliDB &$db) {
+		
+		$this->db = &$db;
+		
+		$this->date_0 = '1001-01-01 00:00:00'; //TODO there is a solution for this ?
+	}
+	
+	private function init() {
+		
+		$this->id = 0;
+		$this->datec = time();
+		$this->tms = time();
+		
+		if(!empty($this->__fields)) {
+			foreach ($this->__fields as $field=>$info) {
+		
+		        if($this->is_date($info)){
+					$this->{$field} = time();
+		        }
+		        elseif($this->is_array($info)){
+					$this->{$field} = array();
+		        }
+		        elseif($this->is_int($info)){
+					$this->{$field} = (int)0;
+		        }
+		        elseif($this->is_float($info)) {
+					$this->{$field} = (double)0;
+				}
+		        else{
+					$this->{$field} = '';
+		        }
+		    }
+			
+		    $this->to_delete=false;
+			
+			return true;
+		}
+		else{
+			return false;
+		}
+			
+	}
+	
+	
+	private function is_date(Array &$info){
+	
+		if(is_array($info)) {
+			if(isset($info['type']) && $info['type']=='date') return true;
+			else return false;
+		}
+		else return false;
+	}
+	
+	private function is_array($info) {
+		
+	  	if(is_array($info)) {
+			if(isset($info['type']) && $info['type']=='array') return true;
+			else return false;
+		}
+		else return false;
+	}
+	
+	
+	private function is_null($info){
+		if(is_array($info)) {
+			if(isset($info['type']) && $info['type']=='null') return true;
+			else return false;
+		}
+		else return false;
+	}
+	
+	private function is_int($info){
+	
+		if(is_array($info)) {
+			if(isset($info['type']) && ($info['type']=='int' || $info['type']=='integer' )) return true;
+			else return false;
+		}
+		else return false;
+	}
+	private function _is_float($info){
+		if(is_array($info)) {
+			if(isset($info['type']) && $info['type']=='float') return true;
+			else return false;
+		} else return false;
+	}
+	
+	private function _is_text($info){
+	  	if(is_array($info)) {
+			if(isset($info['type']) && $info['type']=='text') return true;
+			else return false;
+		} else return false;
+	}
+	private function _is_index($info){
+	  	if(is_array($info)) {
+			if(isset($info['index']) && $info['index']==true) return true;
+			else return false;
+		} else return false;
+	}
+		
+	private function set_save_query(){
+		
+		$query=array(
+			'rowid'=>$this->id
+			,'datec'=>($this->id>0 ? $this->db->jdate($this->datec) : time())
+			,'tms'=>time()
+		);
+		
+		foreach ($this->__fields as $field=>$info) {
+	
+			if($this->_is_date($info)){
+				if(empty($this->{$field})){
+					$query[$field] = $this->date_0;
+				}
+				else{
+					$query[$field] = $this->db->jdate($this->{$field});
+				}
+		  	}
+		  	else if($this->is_array($info)){
+		  		    $query[$field] = serialize($this->{$field});
+		  	}
+		
+		  	else if($this->is_int($info)){
+		    	$query[$field] = (int)price2num($this->{$field});
+		  	}
+		
+		  	else if($this->_is_float($info)){
+		    	$query[$field] = (double)price2num($this->{$field});
+		  	}
+		
+		  	elseif($this->_is_null($info)) {
+		  		$query[$field] = (is_null($this->{$field}) || (empty($this->{$field}) && $this->{$field}!==0 && $this->{$field}!=='0')?null:$this->{$field});
+		    }
+		    else{
+		       $query[$field] = $this->{$field};
+		    }
+		
+	    }
+	
+		return $query;
+	}
+		
+	
+	public function fetch($id, $loadChild = true) {
+		
+		if(empty($id)) return false;
+
+		$res = $db->query( 'SELECT '.$this->get_field_list().'datec,tms
+						FROM '.$this->table_element.'
+						WHERE rowid='.$id );
+		if($obj = $db->fetch_object($res)) {
+				$this->rowid=$id;
+			
+				$this->set_vars_by_db($db);
+
+				$this->datec=$this->db->idate($obj->datec);
+				$this->tms=$this->db->idate($obj->tms);
+				
+				if($loadChild) $this->loadChild($db);
+
+				$this->run_trigger($db, 'load');
+
+				return $this->id;
+		}
+		else {
+				return false;
+		}
+		
+	}
+	public function update() {
+		
+		
+		
+	}
+	public function create() {
+		
+		
+		
+	}
+	
+	
+}
diff --git a/htdocs/inventory/ajax/ajax.inventory.php b/htdocs/inventory/ajax/ajax.inventory.php
new file mode 100644
index 00000000000..34efecfab8f
--- /dev/null
+++ b/htdocs/inventory/ajax/ajax.inventory.php
@@ -0,0 +1,50 @@
+<?php
+
+    require('../config.php');
+    require('../class/inventory.class.php');
+
+    
+    $get = GETPOST('get');
+    $put = GETPOST('put');
+    
+    $PDOdb=new TPDOdb;
+    
+    switch ($put) {
+        case 'qty':
+            if (!$user->rights->inventory->write) { echo -1; exit; }
+            
+            $fk_det_inventory = GETPOST('fk_det_inventory');
+            
+            $det = new Inventorydet;
+            if( $det->load($PDOdb, $fk_det_inventory)) {
+                $det->qty_view+=GETPOST('qty');
+                $det->save($PDOdb);
+                
+                echo $det->qty_view;
+            }
+            else {
+                echo -2;
+            }            
+            
+            break;
+			
+        case 'pmp':
+            if (!$user->rights->inventory->write || !$user->rights->inventory->changePMP) { echo -1; exit; }
+            
+            $fk_det_inventory = GETPOST('fk_det_inventory');
+            
+            $det = new Inventorydet;
+            if( $det->load($PDOdb, $fk_det_inventory)) {
+                $det->new_pmp=price2num(GETPOST('pmp'));
+                $det->save($PDOdb);
+                
+                echo $det->new_pmp;
+            }
+            else {
+                echo -2;
+            }            
+            
+            break;
+        
+    }
+ 
diff --git a/htdocs/inventory/class/inventory.class.php b/htdocs/inventory/class/inventory.class.php
new file mode 100644
index 00000000000..808dd7933be
--- /dev/null
+++ b/htdocs/inventory/class/inventory.class.php
@@ -0,0 +1,466 @@
+<?php
+/* Copyright (C) 2016		ATM Consulting			<support@atm-consulting.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
+ * 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/inventory/class/product.inventory.php
+ *	\ingroup    product
+ *	\brief      File of class to manage predefined products stock
+ */
+ 
+require_once DOL_DOCUMENT_ROOT.'/core/class/coreobject.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+
+class Inventory extends CoreObject
+{
+	
+	public $element='inventory';
+	public $table_element='inventory';
+	public $fk_element='fk_inventory';
+	protected $childtables=array('inventorydet');    // To test if we can delete object
+	protected $isnolinkedbythird = 1;     // No field fk_soc
+	protected $ismultientitymanaged = 1;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
+	
+	/**
+	 * Warehouse Id
+	 * @var int
+	 */
+	public $fk_warehouse;
+	/**
+	 * Entity Id
+	 * @var int
+	 */
+	public $entity;
+	
+	/**
+	 * Status
+	 * @var int
+	 */
+	public $status;
+	/**
+	 * Inventory Date
+	 * @var date
+	 */
+	public $date_inventory;
+	/**
+	 * Inventory Title
+	 * @var string
+	 */
+	public $title;
+	
+	private $__fields=array(
+		'fk_warehouse'=>array('type'=>'integer','index'=>true)
+		,'entity'=>array('type'=>'integer','index'=>true)
+		,'status'=>array('type'=>'integer','index'=>true)
+		,'date_inventory'=>array('type'=>'date')
+		,'title'=>array('type'=>'string')
+	);
+	
+	function __construct() 
+	{
+		
+		parent::init();
+		
+        $this->_init_vars();
+        
+	    $this->start();
+		
+		$this->setChild('Inventorydet','fk_inventory');
+		
+		$this->status = 0;
+		$this->entity = $conf->entity;
+		$this->errors = array();
+		$this->amount = 0;
+		
+	}
+	
+	function sort_det() 
+	{
+		usort($this->Inventorydet, array('Inventory', 'customSort'));
+	}
+	
+	function load(&$PDOdb, $id,$annexe = true) 
+	{
+	    
+        if(!$annexe) $this->withChild = false;
+        
+		$res = parent::load($PDOdb, $id);
+		$this->sort_det();
+		
+		$this->amount = 0;
+		foreach($this->Inventorydet as &$det){
+			$this->amount+=$det->qty_view * $det->pmp;
+		}
+		
+		return $res;
+	}
+	
+	
+	function customSort(&$objA, &$objB)
+	{
+		global $db;
+		
+		$r = strcmp(strtoupper(trim($objA->product->ref)), strtoupper(trim($objB->product->ref)));
+		
+		if ($r < 0) $r = -1;
+		elseif ($r > 0) $r = 1;
+		else $r = 0;
+		
+		return $r;
+	}
+	
+	function changePMP(&$PDOdb) {
+		
+		foreach ($this->Inventorydet as $k => &$Inventorydet)
+		{
+			
+			if($Inventorydet->new_pmp>0) {
+				$Inventorydet->pmp = $Inventorydet->new_pmp; 
+				$Inventorydet->new_pmp = 0;
+			
+				$PDOdb->Execute("UPDATE ".MAIN_DB_PREFIX."product as p SET pmp = ".$Inventorydet->pmp."
+				WHERE rowid = ".$Inventorydet->fk_product );
+				
+				if((float)DOL_VERSION<4.0) {
+					
+					$PDOdb->Execute("UPDATE ".MAIN_DB_PREFIX."product_stock SET pmp=".$Inventorydet->pmp."
+					 WHERE fk_entrepot = ".$this->fk_warehouse." AND fk_product = ".$Inventorydet->fk_product) ;
+					
+				}
+				
+			}
+		}
+		
+		parent::save($PDOdb);
+		
+	}
+	
+	function save(&$PDOdb)
+	{
+		//si on valide l'inventaire on sauvegarde le stock à cette instant
+		if ($this->status)
+		{
+			 $this->regulate($PDOdb);
+		}
+		
+		parent::save($PDOdb);
+	}
+	
+	function set_values($Tab)
+	{
+		global $db,$langs;
+		
+		if (isset($Tab['qty_to_add']))
+		{
+			foreach ($Tab['qty_to_add'] as $k => $qty)
+			{
+				$qty = (float) price2num($qty);
+				
+				if ($qty < 0) 
+				{
+					$this->errors[] = $langs->trans('inventoryErrorQtyAdd');
+					return 0;
+				} 
+				
+				$product = new Product($db);
+				$product->fetch($this->Inventorydet[$k]->fk_product);
+				
+				$this->Inventorydet[$k]->pmp = $product->pmp;
+				$this->Inventorydet[$k]->qty_view += $qty;
+			}	
+		}
+		
+		return parent::set_values($Tab);
+	}
+	
+    function deleteAllLine(&$PDOdb) {
+        
+        foreach($this->Inventorydet as &$det) {
+            $det->to_delete = true;
+        }
+        
+        $this->save($PDOdb);
+      
+        $this->Inventorydet=array();
+        
+    }
+    
+    function add_product(&$PDOdb, $fk_product, $fk_entrepot='') {
+        
+        $k = $this->addChild($PDOdb, 'Inventorydet');
+        $det =  &$this->Inventorydet[$k];
+        
+        $det->fk_inventory = $this->getId();
+        $det->fk_product = $fk_product;
+		$det->fk_warehouse = empty($fk_entrepot) ? $this->fk_warehouse : $fk_entrepot;
+        
+        $det->load_product();
+                
+        $date = $this->get_date('date_inventory', 'Y-m-d');
+        if(empty($date))$date = $this->get_date('date_cre', 'Y-m-d'); 
+        $det->setStockDate($PDOdb, $date , $fk_entrepot);
+        
+    }
+    
+    function correct_stock($fk_product, $id_entrepot, $nbpiece, $movement, $label='', $price=0, $inventorycode='')
+	{
+		global $conf, $db, $langs, $user;
+		
+		/* duplication method product to add datem */
+		if ($id_entrepot)
+		{
+			$db->begin();
+
+			require_once DOL_DOCUMENT_ROOT .'/product/stock/class/mouvementstock.class.php';
+
+			$op[0] = "+".trim($nbpiece);
+			$op[1] = "-".trim($nbpiece);
+
+			$datem = empty($conf->global->INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT) ? dol_now() : $this->date_inventory;
+
+			$movementstock=new MouvementStock($db);
+			$result=$movementstock->_create($user,$fk_product,$id_entrepot,$op[$movement],$movement,$price,$label,$inventorycode, $datem);
+			
+			if ($result >= 0)
+			{
+				$db->commit();
+				return 1;
+			}
+			else
+			{
+			    $this->error=$movementstock->error;
+			    $this->errors=$movementstock->errors;
+
+				$db->rollback();
+				return -1;
+			}
+		}
+	}
+	
+	function regulate(&$PDOdb)
+	{
+		global $db,$user,$langs,$conf;
+		
+		if($conf->global->INVENTORY_DISABLE_VIRTUAL){
+			$pdt_virtuel = false;
+			// Test si pdt virtuel est activé
+			if($conf->global->PRODUIT_SOUSPRODUITS)
+			{
+				$pdt_virtuel = true;
+				$conf->global->PRODUIT_SOUSPRODUITS = 0;
+			}
+		}
+		
+		foreach ($this->Inventorydet as $k => $Inventorydet)
+		{
+			$product = new Product($db);
+			$product->fetch($Inventorydet->fk_product);
+			
+			/*
+			 * Ancien code qui était pourri et qui modifié la valeur du stock théorique si le parent était déstocké le même jour que l'enfant
+			 * 
+			 * $product->load_stock();
+			$Inventorydet->qty_stock = $product->stock_warehouse[$this->fk_warehouse]->real;
+			
+			if(date('Y-m-d', $this->date_inventory) < date('Y-m-d')) {
+				$TRes = $Inventorydet->getPmpStockFromDate($PDOdb, date('Y-m-d', $this->date_inventory), $this->fk_warehouse);
+				$Inventorydet->qty_stock = $TRes[1];
+			}
+			*/
+			if ($Inventorydet->qty_view != $Inventorydet->qty_stock)
+			{
+				$Inventorydet->qty_regulated = $Inventorydet->qty_view - $Inventorydet->qty_stock;
+				$nbpiece = abs($Inventorydet->qty_regulated);
+				$movement = (int) ($Inventorydet->qty_view < $Inventorydet->qty_stock); // 0 = add ; 1 = remove
+						
+				$href = dol_buildpath('/inventory/inventory.php?id='.$this->getId().'&action=view', 1);
+				
+				if(empty($this->title))
+					$this->correct_stock($product->id, $Inventorydet->fk_warehouse, $nbpiece, $movement, $langs->trans('inventoryMvtStock', $href, $this->getId()));
+				else
+					$this->correct_stock($product->id, $Inventorydet->fk_warehouse, $nbpiece, $movement, $langs->trans('inventoryMvtStockWithNomInventaire', $href, $this->title));
+			}
+		}
+
+		if($conf->global->INVENTORY_DISABLE_VIRTUAL){
+			// Test si pdt virtuel était activé avant la régule
+			if($pdt_virtuel) $conf->global->PRODUIT_SOUSPRODUITS = 1;
+		}
+		
+		return 1;
+	}
+    
+    static function getLink($id) {
+        global $langs;
+        
+        $PDOdb=new TPDOdb;
+        
+        $i = new Inventory;
+        $i->load($PDOdb, $id, false);
+        
+        $title = !empty($i->title) ? $i->title : $langs->trans('inventoryTitle').' '.$i->getId();
+        
+        return '<a href="'.dol_buildpath('/inventory/inventory.php?id='.$i->getId().'&action=view', 1).'">'.img_picto('','object_list.png','',0).' '.$title.'</a>';
+        
+    }
+}
+
+class Inventorydet extends TObjetStd
+{
+	function __construct()
+	{
+		global $conf;
+		
+		$this->set_table(MAIN_DB_PREFIX.'inventorydet');
+    	$this->TChamps = array(); 	  
+		$this->add_champs('fk_inventory,fk_warehouse,fk_product,entity', 'type=entier;');
+		$this->add_champs('qty_view,qty_stock,qty_regulated,pmp,pa,new_pmp', 'type=float;');
+
+		$this->_init_vars();
+	    $this->start();
+		
+		$this->entity = $conf->entity;
+		$this->errors = array();
+		
+		$this->product = null;
+		
+		$this->current_pa = 0;
+		
+	}
+	
+	function load(&$PDOdb, $id) 
+	{
+		global $conf;
+		
+		$res = parent::load($PDOdb, $id);
+		$this->load_product();
+        $this->fetch_current_pa();
+			
+		return $res;
+	}
+	
+	function fetch_current_pa() {
+		global $db,$conf;
+		
+		if(empty($conf->global->INVENTORY_USE_MIN_PA_IF_NO_LAST_PA)) return false;
+		
+		if($this->pa>0){ 
+			$this->current_pa = $this->pa;
+		}
+		else {
+			
+			dol_include_once('/fourn/class/fournisseur.product.class.php');
+			$p= new ProductFournisseur($db);
+			$p->find_min_price_product_fournisseur($this->fk_product);
+			
+			if($p->fourn_qty>0)	$this->current_pa = $p->fourn_price / $p->fourn_qty;
+		}
+		return true;
+	}
+	
+    function setStockDate(&$PDOdb, $date, $fk_warehouse) {
+        
+		list($pmp,$stock) = $this->getPmpStockFromDate($PDOdb, $date, $fk_warehouse);
+		
+        $this->qty_stock = $stock;
+        $this->pmp = $pmp;
+        
+        $last_pa = 0;
+        $sql = "SELECT price FROM ".MAIN_DB_PREFIX."stock_mouvement 
+                WHERE fk_entrepot=".$fk_warehouse." 
+                AND fk_product=".$this->fk_product." 
+                AND (origintype='order_supplier' || origintype='invoice_supplier')
+                AND price>0 
+                AND datem<='".$date." 23:59:59'
+                ORDER BY datem DESC LIMIT 1";
+               
+        $PDOdb->Execute($sql);
+       
+        if($obj = $PDOdb->Get_line()) {
+            $last_pa = $obj->price;
+        }
+        
+        $this->pa = $last_pa;
+      /*  var_dump($fk_warehouse,$this->product->stock_warehouse,$this->pmp, $this->pa, $this->qty_stock);
+        exit;*/
+    }
+
+	function getPmpStockFromDate(&$PDOdb, $date, $fk_warehouse){
+		
+		$res = $this->product->load_stock();
+		
+		if($res>0) {
+			$stock = isset($this->product->stock_warehouse[$fk_warehouse]->real) ? $this->product->stock_warehouse[$fk_warehouse]->real : 0;
+			
+			if((float)DOL_VERSION<4.0) {
+				$pmp = isset($this->product->stock_warehouse[$fk_warehouse]->pmp) ? $this->product->stock_warehouse[$fk_warehouse]->pmp : 0; 
+			}
+			else{
+				$pmp = $this->product->pmp;
+			}
+			
+		}
+		
+		//On récupère tous les mouvements de stocks du produit entre aujourd'hui et la date de l'inventaire
+		$sql = "SELECT value, price
+				FROM ".MAIN_DB_PREFIX."stock_mouvement
+				WHERE fk_product = ".$this->product->id."
+					AND fk_entrepot = ".$fk_warehouse."
+					AND datem > '".date('Y-m-d 23:59:59',strtotime($date))."'
+				ORDER BY datem DESC";
+
+		//echo $sql.'<br>';
+		$PDOdb->Execute($sql);
+		$TMouvementStock = $PDOdb->Get_All();
+		$laststock = $stock;
+		$lastpmp = $pmp;
+		//Pour chacun des mouvements on recalcule le PMP et le stock physique
+		foreach($TMouvementStock as $mouvement){
+			
+			//150
+			//if($this->product->id==394) echo 'laststock = '.$stock.'<br>';
+			
+			//9.33
+			//if($this->product->id==394) echo 'lastpmp = '.$pmp.'<br>';
+			$price = ($mouvement->price>0 && $mouvement->value>0) ? $mouvement->price : $lastpmp;  
+				
+			$stock_value = $laststock * $lastpmp;
+			
+			$laststock -= $mouvement->value;
+			
+			$last_stock_value = $stock_value - ($mouvement->value * $price);	
+			
+			$lastpmp = ($laststock != 0) ? $last_stock_value / $laststock : $lastpmp;
+			 
+			
+
+		}
+		
+		return array($lastpmp,$laststock);
+	}
+    
+	function load_product() 
+	{
+		global $db;
+		
+		if($this->fk_product>0) {
+			$this->product = new Product($db);
+			$this->product->fetch($this->fk_product);
+		}
+		
+	}
+	
+}

From b8284447fd0149d574ded0dd073b4426376e248c Mon Sep 17 00:00:00 2001
From: jfefe <jfefe@aternatik.fr>
Date: Mon, 12 Dec 2016 15:19:47 +0100
Subject: [PATCH 002/505] API can receive documents

---
 htdocs/api/class/api.class.php           |  41 ++---
 htdocs/api/class/api_documents.class.php | 143 ++++++++++++++++++
 htdocs/api/index.php                     |  12 +-
 test/phpunit/RestAPIDocumentTest.php     | 183 +++++++++++++++++++++++
 4 files changed, 354 insertions(+), 25 deletions(-)
 create mode 100644 htdocs/api/class/api_documents.class.php
 create mode 100644 test/phpunit/RestAPIDocumentTest.php

diff --git a/htdocs/api/class/api.class.php b/htdocs/api/class/api.class.php
index 5ffae225df1..ed97968e502 100644
--- a/htdocs/api/class/api.class.php
+++ b/htdocs/api/class/api.class.php
@@ -19,6 +19,7 @@
 use Luracast\Restler\Restler;
 use Luracast\Restler\RestException;
 use Luracast\Restler\Defaults;
+use Luracast\Restler\Format\UploadFormat;
 
 require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
 
@@ -47,14 +48,14 @@ class DolibarrApi
     function __construct($db, $cachedir='')
     {
         global $conf;
-        
+
         if (empty($cachedir)) $cachedir = $conf->api->dir_temp;
         Defaults::$cacheDirectory = $cachedir;
-        
+
         $this->db = $db;
         $production_mode = ( empty($conf->global->API_PRODUCTION_MODE) ? false : true );
         $this->r = new Restler($production_mode);
-        
+
         $this->r->setAPIVersion(1);
     }
 
@@ -86,20 +87,20 @@ class DolibarrApi
 
         // Remove $db object property for object
         unset($object->db);
-        
+
         // Remove linkedObjects. We should already have linkedObjectIds that avoid huge responses
         unset($object->linkedObjects);
-        
+
         unset($object->lignes); // should be ->lines
         unset($object->oldline);
-        
+
         unset($object->error);
         unset($object->errors);
-        
+
         unset($object->ref_previous);
         unset($object->ref_next);
         unset($object->ref_int);
-        
+
         unset($object->projet);     // Should be fk_project
         unset($object->project);    // Should be fk_project
         unset($object->author);     // Should be fk_user_author
@@ -111,18 +112,18 @@ class DolibarrApi
         unset($object->timespent_withhour);
         unset($object->timespent_fk_user);
         unset($object->timespent_note);
-        
+
         unset($object->statuts);
         unset($object->statuts_short);
         unset($object->statuts_logo);
         unset($object->statuts_long);
-        
+
         unset($object->element);
         unset($object->fk_element);
         unset($object->table_element);
         unset($object->table_element_line);
         unset($object->picto);
-        
+
         // Remove the $oldcopy property because it is not supported by the JSON
         // encoder. The following error is generated when trying to serialize
         // it: "Error encoding/decoding JSON: Type is not supported"
@@ -152,7 +153,7 @@ class DolibarrApi
                 }
             }
         }*/
-        
+
 		return $object;
     }
 
@@ -187,12 +188,12 @@ class DolibarrApi
 
 		return checkUserAccessToObject(DolibarrApiAccess::$user, $featuresarray,$resource_id,$dbtablename,$feature2,$dbt_keyfield,$dbt_select);
 	}
-	
+
 	/**
 	 * Return if a $sqlfilters parameter is valid
-	 * 
+	 *
 	 * @param  string   $sqlfilters     sqlfilter string
-	 * @return boolean                  True if valid, False if not valid 
+	 * @return boolean                  True if valid, False if not valid
 	 */
 	function _checkFilters($sqlfilters)
 	{
@@ -216,22 +217,22 @@ class DolibarrApi
 	    }
 	    return true;
 	}
-	
+
 	/**
 	 * Function to forge a SQL criteria
-	 * 
+	 *
 	 * @param  array    $matches       Array of found string by regex search
 	 * @return string                  Forged criteria. Example: "t.field like 'abc%'"
 	 */
 	static function _forge_criteria_callback($matches)
 	{
 	    global $db;
-	    
+
 	    //dol_syslog("Convert matches ".$matches[1]);
 	    if (empty($matches[1])) return '';
 	    $tmp=explode(':',$matches[1]);
         if (count($tmp) < 3) return '';
-        
+
 	    $tmpescaped=$tmp[2];
 	    if (preg_match('/^\'(.*)\'$/', $tmpescaped, $regbis))
 	    {
@@ -242,5 +243,5 @@ class DolibarrApi
 	        $tmpescaped = $db->escape($tmpescaped);
 	    }
 	    return $db->escape($tmp[0]).' '.strtoupper($db->escape($tmp[1]))." ".$tmpescaped;
-	}	
+	}
 }
diff --git a/htdocs/api/class/api_documents.class.php b/htdocs/api/class/api_documents.class.php
new file mode 100644
index 00000000000..ca10b2befce
--- /dev/null
+++ b/htdocs/api/class/api_documents.class.php
@@ -0,0 +1,143 @@
+<?php
+/* Copyright (C) 2016   Xebax Christy           <xebax@wanadoo.fr>
+ * Copyright (C) 2016	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2016   Jean-François Ferry     <jfefe@aternatik.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
+ * 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/>.
+ */
+
+use Luracast\Restler\RestException;
+use Luracast\Restler\Format\UploadFormat;
+
+
+require_once DOL_DOCUMENT_ROOT.'/main.inc.php';
+
+/**
+ * API class for receive files
+ *
+ * @access protected
+ * @class Documents {@requires user,external}
+ */
+class Documents extends DolibarrApi
+{
+
+    /**
+     * @var array   $DOCUMENT_FIELDS     Mandatory fields, checked when create and update object
+     */
+    static $DOCUMENT_FIELDS = array(
+        'name',
+        'modulepart',
+        'file'
+    );
+
+    /**
+     * Constructor
+     */
+    function __construct()
+    {
+        global $db;
+        $this->db = $db;
+    }
+
+    /**
+     * Return a document
+     *
+     * @param   string  $module_part    Module part for file
+     * @param   string  $filename       File name
+     *
+     * @return array
+     * @throws RestException
+     *
+     */
+     public function get($module_part, $filename) {
+
+     }
+
+
+    /**
+     * Receive file
+     *
+     * @param   array   $request_data   Request datas
+     *
+     * @return  bool     State of copy
+     * @throws RestException
+     */
+    public function post($request_data) {
+        global $conf;
+        
+        require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
+
+        if (!DolibarrApiAccess::$user->rights->ecm->upload) {
+            throw new RestException(401);
+        }
+
+        // Suppression de la chaine de caractere ../ dans $original_file
+		$original_file = str_replace("../","/", $request_data['name']);
+        $refname = str_replace("../","/", $request_data['refname']);
+
+		// find the subdirectory name as the reference
+		if (empty($request_data['refname'])) $refname=basename(dirname($original_file)."/");
+
+        // Security:
+		// On interdit les remontees de repertoire ainsi que les pipe dans
+		// les noms de fichiers.
+		if (preg_match('/\.\./',$original_file) || preg_match('/[<>|]/',$original_file))
+		{
+            throw new RestException(401,'Refused to deliver file '.$original_file);
+		}
+        if (preg_match('/\.\./',$refname) || preg_match('/[<>|]/',$refname))
+		{
+            throw new RestException(401,'Refused to deliver file '.$refname);
+		}
+
+        $modulepart = $request_data['modulepart'];
+
+        // Check mandatory fields
+        $result = $this->_validate_file($request_data);
+
+        $upload_dir = DOL_DATA_ROOT . '/' .$modulepart.'/'.dol_sanitizeFileName($refname);
+        $destfile = $upload_dir . $original_file;
+
+        if (!is_dir($upload_dir)) {
+            throw new RestException(401,'Directory not exists : '.$upload_dir);
+        }
+
+        $file = $_FILES['file'];
+        $srcfile = $file['tmp_name'];
+        $res = dol_move($srcfile, $destfile, 0, 1);
+
+        if (!$res) {
+            throw new RestException(500);
+        }
+
+        return $res;
+    }
+
+    /**
+     * Validate fields before create or update object
+     *
+     * @param   array           $data   Array with data to verify
+     * @return  array
+     * @throws  RestException
+     */
+    function _validate_file($data) {
+        $result = array();
+        foreach (Documents::$DOCUMENT_FIELDS as $field) {
+            if (!isset($data[$field]))
+                throw new RestException(400, "$field field missing");
+            $result[$field] = $data[$field];
+        }
+        return $result;
+    }
+}
diff --git a/htdocs/api/index.php b/htdocs/api/index.php
index 8ad60c4b340..5db8d7a78c9 100644
--- a/htdocs/api/index.php
+++ b/htdocs/api/index.php
@@ -56,16 +56,18 @@ if (empty($conf->global->MAIN_MODULE_API))
     exit;
 }
 
-
 $api = new DolibarrApi($db);
 
 // Enable the Restler API Explorer.
 // See https://github.com/Luracast/Restler-API-Explorer for more info.
 $api->r->addAPIClass('Luracast\\Restler\\Explorer');
 
-$api->r->setSupportedFormats('JsonFormat', 'XmlFormat');
+$api->r->setSupportedFormats('JsonFormat', 'XmlFormat', 'UploadFormat');
 $api->r->addAuthenticationClass('DolibarrApiAccess','');
 
+// Define accepted mime types
+UploadFormat::$allowedMimeTypes = array('image/jpeg', 'image/png', 'text/plain', 'application/octet-stream');
+
 $listofapis = array();
 
 $modulesdir = dolGetModulesDirs();
@@ -86,7 +88,7 @@ foreach ($modulesdir as $dir)
                 $module = strtolower($reg[1]);
                 $moduledirforclass = $module;
                 $moduleforperm = $module;
-                
+
                 if ($module == 'propale') {
                     $moduledirforclass = 'comm/propal';
                     $moduleforperm='propal';
@@ -119,7 +121,7 @@ foreach ($modulesdir as $dir)
                     $moduledirforclass = 'fourn';
                 }
                 //dol_syslog("Found module file ".$file." - module=".$module." - moduledirforclass=".$moduledirforclass);
-                
+
                 // Defined if module is enabled
                 $enabled=true;
                 if (empty($conf->$moduleforperm->enabled)) $enabled=false;
@@ -142,7 +144,7 @@ foreach ($modulesdir as $dir)
                         while (($file_searched = readdir($handle_part))!==false)
                         {
                             if ($file_searched == 'api_access.class.php') continue;
-                            
+
                             // Support of the deprecated API.
                             if (is_readable($dir_part.$file_searched) && preg_match("/^api_deprecated_(.*)\.class\.php$/i",$file_searched,$reg))
                             {
diff --git a/test/phpunit/RestAPIDocumentTest.php b/test/phpunit/RestAPIDocumentTest.php
new file mode 100644
index 00000000000..ea0c218027f
--- /dev/null
+++ b/test/phpunit/RestAPIDocumentTest.php
@@ -0,0 +1,183 @@
+<?php
+/* Copyright (C) 2010 Laurent Destailleur  <eldy@users.sourceforge.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * or see http://www.gnu.org/
+ */
+
+/**
+ *      \file       test/phpunit/RestAPIDocumentTest.php
+ *      \ingroup    test
+ *      \brief      PHPUnit test
+ *      \remarks    To run this script as CLI:  phpunit filename.php.
+ */
+global $conf,$user,$langs,$db;
+//define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
+//require_once 'PHPUnit/Autoload.php';
+require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
+require_once dirname(__FILE__).'/../../htdocs/core/lib/date.lib.php';
+require_once dirname(__FILE__).'/../../htdocs/core/lib/geturl.lib.php';
+
+if (empty($user->id)) {
+    echo "Load permissions for admin user nb 1\n";
+    $user->fetch(1);
+    $user->getrights();
+}
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
+$conf->global->MAIN_UMASK = '0666';
+
+/**
+ * Class for PHPUnit tests.
+ *
+ * @backupGlobals disabled
+ * @backupStaticAttributes enabled
+ * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
+ */
+class RestAPIDocumentTest extends PHPUnit_Framework_TestCase
+{
+    protected $savconf;
+    protected $savuser;
+    protected $savlangs;
+    protected $savdb;
+    protected $api_url;
+    protected $api_key;
+
+    /**
+     * Constructor
+     * We save global variables into local variables.
+     *
+     * @return DateLibTest
+     */
+    public function __construct()
+    {
+        //$this->sharedFixture
+        global $conf,$user,$langs,$db;
+        $this->savconf = $conf;
+        $this->savuser = $user;
+        $this->savlangs = $langs;
+        $this->savdb = $db;
+
+        echo __METHOD__.' db->type='.$db->type.' user->id='.$user->id;
+        //print " - db ".$db->db;
+        echo "\n";
+    }
+
+    // Static methods
+    public static function setUpBeforeClass()
+    {
+        global $conf,$user,$langs,$db;
+        $db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
+
+        echo __METHOD__."\n";
+    }
+
+    // tear down after class
+    public static function tearDownAfterClass()
+    {
+        global $conf,$user,$langs,$db;
+        $db->rollback();
+
+        echo __METHOD__."\n";
+    }
+
+    /**
+     * Init phpunit tests.
+     */
+    protected function setUp()
+    {
+        global $conf,$user,$langs,$db;
+        $conf = $this->savconf;
+        $user = $this->savuser;
+        $langs = $this->savlangs;
+        $db = $this->savdb;
+
+        $this->api_url = DOL_MAIN_URL_ROOT.'/api/index.php';
+
+        $login = 'admin';
+        $password = 'admin';
+        $url = $this->api_url.'/login?login='.$login.'&password='.$password;
+        // Call the API login method to save api_key for this test class
+        $result = getURLContent($url, 'GET', '', 1, array());
+        echo __METHOD__.' result = '.var_export($result, true)."\n";
+        echo __METHOD__.' curl_error_no: '.$result['curl_error_no']."\n";
+        $this->assertEquals($result['curl_error_no'], '');
+        $object = json_decode($result['content'], true);
+        $this->assertNotNull($object, 'Parsing of json result must no be null');
+        $this->assertEquals('200', $object['success']['code']);
+
+        $this->api_key = $object['success']['token'];
+        echo __METHOD__." api_key: $this->api_key \n";
+
+        echo __METHOD__."\n";
+    }
+
+    /**
+     * End phpunit tests.
+     */
+    protected function tearDown()
+    {
+        echo __METHOD__."\n";
+    }
+
+    /**
+     * testRestReceiveDocument.
+     *
+     * @return int
+     */
+    public function testRestReceiveDocument()
+    {
+        global $conf,$user,$langs,$db;
+
+        $url = $this->api_url.'/documents/?api_key='.$this->api_key;
+
+        $fileName = 'img250x20.png';
+        $filePath = dirname(__FILE__).'/'.$fileName;
+        $mimetype = mime_content_type($filePath);
+      // Init Curl file object
+      // See https://wiki.php.net/rfc/curl-file-upload
+      $cfile = curl_file_create($filePath, $mimetype);
+
+        echo __METHOD__.' Request POST url='.$url."\n";
+
+      // Send to existant directory
+      $data = array(
+          'modulepart' => 'facture',
+          'file' => $cfile,
+          'refname' => 'AV1303-0003',
+          'name' => $fileName, // Name for destination
+          'type' => $mimetype, );
+
+        $result = getURLContent($url, 'POST', $data, 1);
+
+        echo __METHOD__.' Result for sending document: '.var_export($result, true)."\n";
+        echo __METHOD__.' curl_error_no: '.$result['curl_error_no']."\n";
+        $this->assertEquals($result['curl_error_no'], '');
+        $this->assertEquals($result['content'], 'true');
+
+      // Send to unexistant directory
+      $data = array(
+          'modulepart' => 'facture',
+          'file' => $cfile,
+          'name' => 'AV1303-0003STSEIUDEISRESIJLEU/'.$fileName, // Name for destination
+          'type' => $mimetype, );
+
+        $result2 = getURLContent($url, 'POST', $data, 1);
+        echo __METHOD__.' Result for sending document: '.var_export($result2, true)."\n";
+        echo __METHOD__.' curl_error_no: '.$result['curl_error_no']."\n";
+
+        $object = json_decode($result2['content'], true);
+        $this->assertNotNull($object, 'Parsing of json result must no be null');
+        $this->assertEquals('401', $object['error']['code']);
+    }
+}

From cdfbed5d084215994320f82bd98315373e018034 Mon Sep 17 00:00:00 2001
From: Alexis Algoud <alexis@atm-consulting.fr>
Date: Mon, 12 Dec 2016 17:36:22 +0100
Subject: [PATCH 003/505] new listview

---
 htdocs/core/class/class.listview.php       | 1216 ++++++++++++++++++++
 htdocs/inventory/class/inventory.class.php |   64 +-
 2 files changed, 1270 insertions(+), 10 deletions(-)
 create mode 100644 htdocs/core/class/class.listview.php

diff --git a/htdocs/core/class/class.listview.php b/htdocs/core/class/class.listview.php
new file mode 100644
index 00000000000..f37fc9a1628
--- /dev/null
+++ b/htdocs/core/class/class.listview.php
@@ -0,0 +1,1216 @@
+<?php
+/*
+ 
+ Copyright (C) 2013-2015 ATM Consulting <support@atm-consulting.fr>
+
+ This program and all files within this directory and sub directory
+ 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 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/>.
+ */
+
+class Listview {
+	
+	function __construct( $id ) {
+			
+		$this->id = $id;
+		
+		$this->TTotalTmp=array();
+		
+		$this->sql = '';
+
+	}
+	private function init(&$TParam) {
+		
+		global $conf, $langs;
+		
+		if(!isset($TParam['hide']))$TParam['hide']=array();
+		if(!isset($TParam['link']))$TParam['link']=array();
+		if(!isset($TParam['type']))$TParam['type']=array();
+		if(!isset($TParam['orderby']['noOrder']))$TParam['orderby']['noOrder']=array();
+		if(!isset($TParam['no-select'])) $TParam['no-select'] = 1;
+		
+		if(!isset($TParam['liste']))$TParam['liste']=array();
+		$TParam['liste'] = array_merge(array(
+			'messageNothing'=>"Il n'y a aucun élément à afficher."
+			,'picto_precedent'=>'&lt;'
+			,'picto_suivant'=>'&gt;'
+			,'order_down'=>img_down()
+			,'order_up'=>img_up()
+			,'noheader'=>0
+			,'useBottomPagination'=>0
+			,'image'=>''
+			,'titre'=>'Liste'
+			,'orderDown'=>''
+			,'orderUp'=>''
+			,'id'=>$this->id
+			,'picto_search'=>img_picto('Search', 'search.png')
+			,'head_search'=>''
+			,'export'=>array()
+			,'view_type'=>''
+		),$TParam['liste']);
+		
+		if(empty($TParam['limit']))$TParam['limit']=array();
+		if(!empty($_REQUEST['TListTBS'][$this->id]['page'])) $TParam['limit']['page'] = $_REQUEST['TListTBS'][$this->id]['page'];
+		
+		$TParam['limit']=array_merge(array('page'=>1, 'nbLine'=>$conf->liste_limit, 'global'=>0), $TParam['limit']);
+		
+		if(!empty($_REQUEST['TListTBS'][$this->id]['orderBy'])) {
+			$TParam['orderBy'] = $_REQUEST['TListTBS'][$this->id]['orderBy']; 
+		}
+		
+	//	print_r($TParam);
+	}
+	private function getSearchNull($key, &$TParam) {
+		return !empty($TParam['search'][$key]['allow_is_null']);
+	} 
+	private function getSearchKey($key, &$TParam) {
+		
+		$TPrefixe=array();
+		if(!empty($TParam['search'][$key]['table'])) {
+			if (!is_array($TParam['search'][$key]['table'])) $TParam['search'][$key]['table'] = array($TParam['search'][$key]['table']);
+			
+			foreach ($TParam['search'][$key]['table'] as $prefix_table) {
+				$TPrefixe[] = '`'.$prefix_table.'`.'; 
+			}
+		}
+		
+		$TKey=array();
+		if(!empty($TParam['search'][$key]['field'])) {
+			if (!is_array($TParam['search'][$key]['field'])) $TParam['search'][$key]['field'] = array($TParam['search'][$key]['field']);
+			
+			foreach ($TParam['search'][$key]['field'] as $i => $field) {
+				$prefixe = !empty($TPrefixe[$i]) ? $TPrefixe[$i] : $TPrefixe[0];
+				$TKey[] = $prefixe.'`'. $field .'`';
+			}
+		} else {
+			$TKey[] =$TPrefixe[0].'`'. strtr($key,';','*').'`';
+		}
+		
+		return $TKey;
+	} 
+	private function getSearchValue($value) {
+		$value = strtr(trim($value),';','*');	
+			
+		return $value;
+	}
+	
+	private function dateToSQLDate($date) {
+		
+		list($dd,$mm,$aaaa) = explode('/', substr($date,0,10));
+		
+		$value = date('Y-m-d', mktime(0,0,0,$mm,$dd,$aaaa));
+		
+		return $value;
+	}
+	
+	private function addSqlFromTypeDate(&$TSQLMore, &$value, $sKey, $sBindKey)
+	{
+		if(is_array($value))
+		{
+			
+			unset($this->TBind[$sBindKey]);
+			// Si le type de "recherche" est "calendars" on a 2 champs de transmis, [début et fin] ou [que début] ou [que fin] => un BETWEEN Sql serait utile que dans le 1er cas 
+			// donc l'utilisation des opérateur >= et <= permettent un fonctionnement générique
+			$TSQLDate=array();
+			if(!empty($value['deb']))
+			{
+				$valueDeb = $this->dateToSQLDate($value['deb']);
+				
+				if(isset($this->TBind[$sBindKey.'_start'])) // TODO can't use this in query case
+				{
+					$this->TBind[$sBindKey.'_start'] = $valueDeb;
+				}
+				
+				$TSQLDate[]=$sKey." >= '".$valueDeb." 00:00:00'" ;
+				
+			}
+			
+			if(!empty($value['fin']))
+			{
+				$valueFin = $this->dateToSQLDate($value['fin']);
+				if(isset($this->TBind[$sBindKey.'_end'])) { // TODO can't use this in query case
+					$this->TBind[$sBindKey.'_end'] = $valueFin;
+				}
+				
+				$TSQLDate[]=$sKey." <= '".$valueFin." 23:59:59'" ;	
+				
+			}
+			
+			if(!empty($TSQLDate)) $TSQLMore[] = implode(' AND ', $TSQLDate);
+		}
+		else
+		{
+			// Sinon je communique une date directement au format d/m/Y et la méthode du dessous reformat en Y-m-d
+			$value = $this->dateToSQLDate($value);
+			if(isset($this->TBind[$sBindKey]))
+			{
+				$this->TBind[$sBindKey] = $value;
+			}
+			else
+			{
+				// Le % en fin de chaine permet de trouver un resultat si le contenu est au format Y-m-d H:i:s et non en Y-m-d
+				$TSQLMore[]=$sKey." LIKE '".$value."%'" ;
+			}
+		}
+	}
+	
+	private function addSqlFromOther(&$TSQLMore, &$value, &$TParam, $sKey, $sBindKey, $key)
+	{
+	
+		$value = $this->getSearchValue($value);
+		
+		if(isset($TParam['operator'][$key]))
+		{
+			if($TParam['operator'][$key] == '<' || $TParam['operator'][$key] == '>' || $TParam['operator'][$key]=='=')
+			{
+				$TSQLMore[] = $sKey . ' ' . $TParam['operator'][$key] . ' "' . $value . '"';
+			}
+			elseif ($TParam['operator'][$key]=='IN')
+			{
+				$TSQLMore[] = $sKey . ' ' . $TParam['operator'][$key] . ' (' . $value . ')';
+			}
+			else
+			{
+				if(strpos($value,'%')===false) $value = '%'.$value.'%';
+				$TSQLMore[]=$sKey." LIKE '".addslashes($value)."'" ;
+			}
+		}
+		else
+		{
+			if(strpos($value,'%')===false) $value = '%'.$value.'%';
+			$TSQLMore[]=$sKey." LIKE '".addslashes($value)."'" ;
+		}
+		
+	
+	}
+
+	private function search($sql,&$TParam) {
+	
+		if(!empty($_REQUEST['TListTBS'][$this->id]['search'])) {
+			$sqlGROUPBY='';
+			if(strpos($sql,'GROUP BY')!==false) { //TODO regex
+				list($sql, $sqlGROUPBY) = explode('GROUP BY', $sql);
+			}
+			
+			if(strpos($sql,'WHERE ')===false)$sql.=' WHERE 1 '; //TODO regex
+			
+			foreach($_REQUEST['TListTBS'][$this->id]['search'] as $key=>$value)
+			{
+				$TsKey = $this->getSearchKey($key, $TParam);
+				$TsBindKey = $this->getTsBindKey($TsKey);
+				
+				//if (!empty($value)) var_dump($TsKey, $TsBindKey, '==================================');
+				$TSQLMore = array();
+				
+				$allow_is_null = $this->getSearchNull($key,$TParam);
+				$search_on_null = false; //TODO useless
+				
+				foreach ($TsKey as $i => &$sKey)
+				{
+					//if (!empty($value)) var_dump($sKey);
+					$sBindKey = $TsBindKey[$i];
+					
+					if($allow_is_null && !empty($_REQUEST['TListTBS'][$this->id]['search_on_null'][$key]))
+					{
+						$this->TBind[$sBindKey.'_null'] = $sKey.' IS NULL ';
+						$TSQLMore[] = $sKey.' IS NULL ';
+						$search_on_null = true;
+						
+						if(isset($this->TBind[$sBindKey])) $this->TBind[$sBindKey]= '';
+						$value = '';
+					}
+					elseif($allow_is_null)
+					{
+						$this->TBind[$sBindKey.'_null'] =0; // $sKey.' IS NOT NULL ';
+						//$TSQLMore[] =  $sKey.' IS NOT NULL ';
+					}
+					
+					if($value!='') { // pas empty car biensûr le statut = 0 existe dans de nombreux cas
+						
+						if(isset($TParam['type'][$key]) && ($TParam['type'][$key]==='date' || $TParam['type'][$key]==='datetime'))
+						{
+							$this->addSqlFromTypeDate($TSQLMore, $value, $sKey, $sBindKey);
+						}
+						else
+						{
+							$this->addSqlFromOther($TSQLMore, $value, $TParam, $sKey, $sBindKey, $key);
+						}
+					}
+				}
+
+				if(!isset($this->TBind[$sBindKey]) && !empty($TSQLMore))
+				{
+					$sql.=' AND ( '.implode(' OR ',$TSQLMore).' ) ';
+				}
+				
+			}
+			
+			if($sqlGROUPBY!='')	$sql.=' GROUP BY '.$sqlGROUPBY;
+			
+		}
+
+		
+		return $sql;
+	}
+
+	private function getViewType(&$TParam) {
+		if(!empty($TParam['view_type'])) return $TParam['view_type']; 
+		else if (is_string($TParam['type']))return $TParam['type'] ;
+		else return 'list';
+	}
+
+	public function render(&$db,$sql,$TParam=array(),$TBind=array()) {
+		$this->typeRender = 'sql';
+	//		print_r($TParam);
+		$TEntete=array();
+		$TChamps=array();	
+		
+		$this->init($TParam);
+		
+		if(!empty($TBind)) $this->TBind = $TBind;
+		
+		$sql = $this->search($sql,$TParam);
+		$sql = $this->order_by($sql, $TParam);		
+		
+		$this->parse_sql($db, $TEntete, $TChamps, $TParam, $sql);	
+		
+		list($TTotal, $TTotalGroup)=$this->get_total($TChamps, $TParam);
+		
+		$view_type = $this->getViewType($TParam);
+				
+		if($view_type == 'raw') {
+			return $this->renderRAW($TEntete, $TChamps,$TTotal,$TTotalGroup, $TParam);
+		}
+		else if($view_type == 'chart') {
+			return $this->renderChart($TEntete, $TChamps,$TTotal, $TParam);	
+		}
+		else {
+			return $this->renderList($TEntete, $TChamps,$TTotal,$TTotalGroup, $TParam);	
+		}
+		
+		
+	}
+	public function renderDataTableAjax(&$db,$sql,$TParam=array()) {
+		$this->renderDataTableSQL($db, $sql, $TParam);
+	}
+	public function renderDataTableSQL(&$db,$sql,$TParam=array()) {
+		$this->typeRender = 'dataTableAjax';
+	//		print_r($TParam);
+		$TEntete=array();
+		$TChamps=array();	
+		
+		$this->init($TParam);
+		
+		$sql = $this->search($sql,$TParam);
+		$sql = $this->order_by($sql, $TParam);		
+		
+		$this->parse_sql($db, $TEntete, $TChamps, $TParam, $sql);	
+		list($TTotal, $TTotalGroup)=$this->get_total($TChamps, $TParam);
+		
+		return $this->renderList($TEntete, $TChamps,$TTotal,$TTotalGroup, $TParam);
+		
+	}
+	public function renderXML(&$db,$xmlString, $TParam=array()) {
+		$this->typeRender = 'xml';
+		
+		$TEntete=array();
+		$TChamps=array();	
+		
+		$this->init($TParam);
+		
+		$this->parse_xml($db, $TEntete, $TChamps, $TParam,$xmlString);
+		
+		list($TTotal, $TTotalGroup)=$this->get_total($TChamps, $TParam);
+		
+		return $this->renderList($TEntete, $TChamps,$TTotal,$TTotalGroup, $TParam);
+		
+	}
+	private function setSearch(&$TEntete, &$TParam) {
+		global $langs;
+		
+		if(empty($TParam['search'])) return array();
+		
+		$TSearch=array();
+		$form=new TFormCore;
+		$form->strict_string_compare = true;
+		
+		$nb_search_in_bar = 0;
+		
+		if(!empty($TParam['search'])) {
+			foreach($TEntete as $key=>$libelle) { // init
+				if(empty($TSearch[$key]))$TSearch[$key]='';
+			}
+		}		
+		foreach($TParam['search'] as $key=>$param_search) {
+			
+		
+			$value = isset($_REQUEST['TListTBS'][$this->id]['search'][$key]) ? $_REQUEST['TListTBS'][$this->id]['search'][$key] : '';
+			
+			$typeRecherche = (is_array($param_search) && isset($param_search['recherche'])) ? $param_search['recherche'] : $param_search;  
+			
+			if(is_array($typeRecherche)) {
+				$typeRecherche = array(''=>' ') + $typeRecherche;
+				$fsearch=$form->combo('','TListTBS['.$this->id.'][search]['.$key.']', $typeRecherche,$value,0,'',' listviewtbs="combo" init-value="'.$value.'" ');
+			}
+			else if($typeRecherche==='calendar') {
+				$fsearch=$form->calendrier('','TListTBS['.$this->id.'][search]['.$key.']',$value,10,10,' listviewtbs="calendar" ');	
+			}
+			else if($typeRecherche==='calendars') {
+				$fsearch=$form->calendrier('','TListTBS['.$this->id.'][search]['.$key.'][deb]',isset($value['deb'])?$value['deb']:'',10,10,' listviewtbs="calendars" ')
+					.' '.$form->calendrier('','TListTBS['.$this->id.'][search]['.$key.'][fin]',isset($value['fin'])?$value['fin']:'',10,10,' listviewtbs="calendars" ');	
+			}
+			else if(is_string($typeRecherche)) {
+				$fsearch=$TParam['search'][$key];	
+			}
+			else {
+				$fsearch=$form->texte('','TListTBS['.$this->id.'][search]['.$key.']',$value,15,255,' listviewtbs="input" ');	
+			}
+
+			if(!empty($param_search['allow_is_null'])) {
+				$valueNull = isset($_REQUEST['TListTBS'][$this->id]['search_on_null'][$key]) ? 1 : 0;
+				$fsearch.=' '.$form->checkbox1('', 'TListTBS['.$this->id.'][search_on_null]['.$key.']',1, $valueNull,' onclick=" if($(this).is(\':checked\')){ $(this).prev().val(\'\'); }" ').img_help(1, $langs->trans('SearchOnNUllValue'));
+			}
+			
+
+			if(!empty($TEntete[$key]) || $this->getViewType($TParam) == 'chart') {
+				$TSearch[$key] = $fsearch;
+				$nb_search_in_bar++;
+			}
+			else {
+				
+				$libelle = !empty($TParam['title'][$key]) ? $TParam['title'][$key] : $key ;
+				$TParam['liste']['head_search'].='<div>'.$libelle.' '.$fsearch.'</div>';	
+			}
+				
+		}
+		
+		$search_button = ' <a href="#" onclick="TListTBS_submitSearch(this);" class="list-search-link">'.$TParam['liste']['picto_search'].'</a>';
+
+		if(!empty($TParam['liste']['head_search'])) {
+			$TParam['liste']['head_search'].='<div align="right">'.$langs->trans('Search').' '.$search_button.'</div>';
+		}
+		
+		if($nb_search_in_bar>0) {
+			end($TSearch);
+			list($key,$v) = each($TSearch);
+			$TSearch[$key].=$search_button;
+		}
+		else{
+			$TSearch=array();
+		}
+		
+		return $TSearch;
+	}
+
+	/*
+	 * Function analysant et totalisant une colonne
+	 * Supporté : sum, average
+	 */
+	private function get_total(&$TChamps, &$TParam) {
+		$TTotal=$TTotalGroup=array();	
+		
+		if(!empty($TParam['math']) && !empty($TChamps[0])) {
+			
+			foreach($TChamps[0] as $field=>$value) {
+				$TTotal[$field]='';	
+				$TTotalGroup[$field] = '';
+			}
+		
+			foreach($TParam['math'] as $field=>$typeMath){
+
+				if(is_array($typeMath)) {
+					$targetField = $typeMath[1];
+					$typeMath = $typeMath[0];
+				}
+				else {
+					$targetField = $field;
+				}
+
+				if($typeMath == 'groupsum') {
+					$TTotalGroup[$field] = array('target'=>$targetField, 'values'=> $this->TTotalTmp['@groupsum'][$targetField]);
+					
+				}
+				else if($typeMath=='average') {
+					$TTotal[$field]=array_sum($this->TTotalTmp[$targetField]) / count($this->TTotalTmp[$targetField]);
+				}
+				elseif($typeMath=='count') {
+					$TTotal[$field]=count($this->TTotalTmp[$targetField]);
+				}
+				else {
+					$TTotal[$field]=array_sum($this->TTotalTmp[$targetField]);	
+				}
+								
+			}
+			
+		
+		}
+		
+		return array($TTotal,$TTotalGroup);
+	}
+
+	private function getJS(&$TParam) {
+		$javaScript = '<script language="javascript">
+		if(typeof(TListTBS_include)=="undefined") {
+			document.write("<script type=\"text/javascript\" src=\"'.COREHTTP.'includes/js/list.tbs.js\"></scr");
+	  		document.write("ipt>");
+		}
+		</script>';
+
+
+		if($this->typeRender=='dataTable') {
+			
+			$javaScript.='<!-- datatable  -->
+			<script language="javascript">
+					
+					if(typeof(TListTBS_dataTable_include)=="undefined") {
+						var TListTBS_dataTable_include=true;	
+						document.write("<script type=\"text/javascript\" src=\"'.COREHTTP.'includes/js/dataTable/js/jquery.dataTables.min.js\"></scr");
+			  			document.write("ipt>");
+						document.write("<link rel=\"stylesheet\" href=\"'.COREHTTP.'includes/js/dataTable/css/jquery.dataTables.css\" />");
+					}
+			
+					$(document).ready(function () {
+						$("#'.$this->id.'").wrap("<div id=\"'.$this->id.'_datatable_container\">");	
+						$("#'.$this->id.'").dataTable({
+					        "sPaginationType": "full_numbers"
+					        ,"aLengthMenu": [['.$TParam['limit']['nbLine'].',-1], ['.$TParam['limit']['nbLine'].', "All"]]
+					        ,"iDisplayLength" : '.$TParam['limit']['nbLine'].'
+					    });
+					}); 
+			</script>';
+			
+			$TPagination=array();
+		}
+		elseif($this->typeRender=='dataTableAjax') {
+			$javaScript.='<!-- datatable  -->
+			<script language="javascript">
+			
+					if(typeof(TListTBS_dataTable_include)=="undefined") {
+						var TListTBS_dataTable_include=true;
+						document.write("<script type=\"text/javascript\" src=\"'.COREHTTP.'includes/js/dataTable/js/jquery.dataTables.min.js\"></scr");
+			  			document.write("ipt>");
+						document.write("<link rel=\"stylesheet\" href=\"'.COREHTTP.'includes/js/dataTable/css/jquery.dataTables.css\" />");
+					}
+			
+					$(document).ready(function () {
+						$("#'.$this->id.'").wrap("<div id=\"'.$this->id.'_datatable_container\">");	
+						var oTable = $("#'.$this->id.'").dataTable({
+					        "sPaginationType": "full_numbers"
+					        ,"iDisplayLength" : '.$TParam['limit']['nbLine'].'
+					        ,"sPaginationType": "full_numbers"
+					        ,"oLanguage": {
+								"sSearch": "Recherche globale :"
+								/*,"sUrl": "media/language/de_DE.txt" pour depuis un fichier */
+							}
+					    });
+						
+						
+						/* Ajoute du filtre via la recherche sur colonne */
+					    $("#'.$this->id.' thead tr.barre-recherche td").each( function ( i ) {
+					        $("select", this).change( function () {
+					            oTable.fnFilter( $(this).val(), i );
+					        } );
+					        $("input", this).keyup( function () {
+					            oTable.fnFilter( $(this).val(), i );
+					        } );
+							
+					    } );
+						
+					}); 
+			</script>';
+		}
+		
+		return $javaScript;
+	}
+
+	private function setExport(&$TParam,$TChamps,$TEntete) {
+		global $langs;
+		
+		$Tab=array();
+		if(!empty($TParam['export'])) {
+			$token = GETPOST('token');
+			if(empty($token)) $token = md5($this->id.time().rand(1,9999));
+
+			$_SESSION['token_list_'.$token] = gzdeflate( serialize( array(
+				'title'=>$this->title
+				,'sql'=>$this->sql
+				,'TBind'=>$this->TBind
+				,'TChamps'=>$TChamps
+				,'TEntete'=>$TEntete
+			) ) );
+
+			foreach($TParam['export'] as $mode_export) {
+				
+				$Tab[] = array(
+						'label'=>$langs->trans('Export'.$mode_export)
+						,'url'=>dol_buildpath('/abricot/downlist.php',1)
+						,'mode'=>$mode_export
+						,'token'=>$token
+						,'session_name'=>session_name()
+				);
+				
+			}
+			
+		}
+		
+		
+		return $Tab;
+	}
+
+	private function renderChart(&$TEntete, &$TChamps,&$TTotal, &$TParam) {
+		
+		$TData = array();
+		$header = '';
+		$first = true;
+		
+		$TSearch = $this->setSearch($TEntete, $TParam);
+		$TExport= $this->setExport($TParam, $TChamps, $TEntete);
+		
+		if(empty($TParam['xaxis']) && !empty($TEntete)) {
+			$fieldXaxis = key($TEntete);
+		}
+		else {
+			$fieldXaxis = $TParam['xaxis'];
+		}
+		
+		$TValue=array(); $key = null;
+		foreach($TEntete as $field=>&$entete) {
+			if($field!=$fieldXaxis)$TValue[] = addslashes($entete['libelle']);
+		}
+
+		$header='["'.addslashes( $TEntete[$fieldXaxis]['libelle'] ).'","'.implode('","', $TValue).'"]';
+		//var_dump($fieldXaxis, $TChamps);
+		foreach($TChamps as &$row) {
+			$TValue=array();
+			$key = null;
+			
+			foreach($row as $k=>$v) {
+				
+				if($k == $fieldXaxis) {
+					$key = $v;
+				}
+				else {
+					$TValue[] = (float)$v;
+				}
+				
+			}
+
+			if(!is_null($key)) {
+				if(!isset($TData[$key])) $TData[$key] = $TValue;
+				else {
+					foreach($TData[$key] as $k=>$v) {
+						$TData[$key][$k]+=(float)$TValue[$k];
+					}
+					
+				}
+			}
+			
+			
+		}
+		
+		$data = $header;
+		foreach($TData as $key=>$TValue) {
+			
+			$data .= ',[ "'.$key.'", ';
+			foreach($TValue as $v) {
+				$data.=(float)$v.',';
+			}
+			
+			$data.=' ]';
+		}
+		
+		$height = empty($TParam['height']) ? 500 : $TParam['height'];
+		$curveType= empty($TParam['curveType']) ? 'none': $TParam['curveType']; // none or function
+		$pieHole =  empty($TParam['pieHole']) ? 0: $TParam['pieHole']; // none or function
+		$hAxis = empty($TParam['hAxis']) ? array() : $TParam['hAxis']; // Array of params
+		$vAxis = empty($TParam['vAxis']) ? array() : $TParam['vAxis']; // Array of params
+		
+		// This feature is experimental and may change in future releases
+		$explorer = empty($TParam['explorer']) ? array() : $TParam['explorer']; // Note: The explorer only works with continuous axes (such as numbers or dates)
+		
+		$type = empty($TParam['chartType']) ? 'LineChart' : $TParam['chartType'];
+		
+		$html = '';
+		
+		if(!empty($TSearch)) {
+			
+			$html.='<table class="border searchbox">';
+			foreach($TSearch as $field=>$input) {
+				if(!empty($input)) {
+					$label = !empty($TParam['title'][$field]) ? $TParam['title'][$field] : $field;
+					$html.='<tr><td>'.$label.'</td><td>'.$input.'</td></tr>';	
+				}
+			}
+			
+			$html.='</table>';
+			
+		}
+		$javaScript = $this->getJS($TParam);
+		
+		$html.='<script type="text/javascript" src="https://www.google.com/jsapi"></script>
+		<script type="text/javascript">
+		  
+		  	  google.load("visualization", "1", {"packages":["corechart"]});
+		      google.setOnLoadCallback(drawChart'.$this->id.');
+			
+			  function drawChart'.$this->id.'() {
+		        var data = google.visualization.arrayToDataTable([
+		          '.$data.'
+		        ]);
+	
+		        var options = {
+		          title: "'.addslashes($TParam['liste']['titre']).'"
+		          '.(!empty($curveType) ? ',curveType: "'.$curveType.'"' : '' ).'
+		          ,legend: { position: "bottom" }
+				  ,animation: { "startup": true }
+				  '.(!empty($explorer) ? ',explorer: '.json_encode($explorer) : '').'
+				  ,height : '.$height.'
+				  ,hAxis: '.json_encode($hAxis).'
+				  ,vAxis: '.json_encode($vAxis).'
+				  '.( $type == 'PieChart' && !empty($pieHole) ? ',pieHole: '.$pieHole : '').'
+				  '.( $type == 'AreaChart' ? ',isStacked: \'percent\'' : '').'
+		        };
+
+		        var chart = new google.visualization.'.$type.'(document.getElementById("div_query_chart'.$this->id.'"));
+		
+		        chart.draw(data, options);
+		      }
+		  
+	    </script>
+		<div id="div_query_chart'.$this->id.'"></div>
+		'.$javaScript; 
+		
+		return $html;
+	}
+
+	private function addTotalGroup($TChamps,$TTotalGroup) {
+		global $langs;
+		
+		$Tab=array();
+		
+		$proto_total_line = array();
+		
+		$tagbase = $old_tagbase = null;
+		
+		$addGroupLine = false;
+		
+		foreach($TChamps as $k=>&$line) {
+				
+			if(empty($proto_total_line)) {
+				foreach($line as $field=>$value) {
+					$proto_total_line[$field] = '';
+				}
+				$group_line = $proto_total_line;	
+			}
+			
+			$addGroupLine = false;
+			
+			$tagbase = '';
+			foreach($line as $field=>$value) {
+				
+				if(!empty($TTotalGroup[$field])) {
+					$tagbase.=$value.'|';
+					$group_line[$field] = '<div style="text-align:right; font-weight:bold; color:#552266;">'.(empty($value) ? $langs->trans('Empty') : $value ).' : </div>';
+					$group_line[$TTotalGroup[$field]['target']] = '<div style="text-align:right; font-weight:bold; color:#552266;">'.price($TTotalGroup[$field]['values'][$value]).'</div>';
+					$addGroupLine = true;
+				}
+				
+			}
+			
+			if(!is_null($old_tagbase) && $old_tagbase!=$tagbase && $addGroupLine) {
+			//	var_dump(array($k,$tagbase,$old_tagbase,$empty_line));
+				$Tab[] = $previous_group_line;
+			}
+			
+			$old_tagbase = $tagbase;
+			$previous_group_line = $group_line;
+			$group_line = $proto_total_line;
+			
+			$Tab[] = $line;
+			
+			
+			
+		}
+		if($addGroupLine) {
+			$Tab[] = $previous_group_line;
+		}
+		
+		
+		return $Tab;
+	}
+
+	private function renderRAW(&$TEntete, &$TChamps, &$TTotal,&$TTotalGroup, &$TParam) {
+		$TSearch = $this->setSearch($TEntete, $TParam);
+		$TExport=$this->setExport($TParam, $TChamps, $TEntete);
+		$TChamps = $this->addTotalGroup($TChamps,$TTotalGroup);
+		
+		return array(
+				'entete'=>$TEntete
+				,'champs'=>$TChamps
+				,'recherche'=>$TSearch
+				,'total'=>$TTotal
+				,'export'=>$TExport
+				,'haveExport'=>count($TExport)
+				, 'id'=>$this->id
+				, 'nb_columns'=>count($TEntete) 
+				,'totalNB'=>count($TChamps)
+				, 'nbSearch'=>count($TSearch)
+				, 'haveTotal'=>(int)!empty($TTotal)
+				, 'havePage'=>(int)!empty($TPagination) 
+		);
+	}
+	
+	private function renderList(&$TEntete, &$TChamps, &$TTotal,&$TTotalGroup, &$TParam) {
+		$TBS = new TTemplateTBS;
+		
+		$javaScript = $this->getJS($TParam);
+		
+		if($this->typeRender!='dataTableAjax') {
+			$TPagination=array(
+				'pagination'=>array('pageSize'=>$TParam['limit']['nbLine'], 'pageNum'=>$TParam['limit']['page'], 'blockName'=>'champs', 'totalNB'=>count($TChamps))
+			);
+		}
+		else {
+			$TPagination=array();
+		}
+		
+		$TSearch = $this->setSearch($TEntete, $TParam);
+		$TExport=$this->setExport($TParam, $TChamps, $TEntete);
+		$TChamps = $this->addTotalGroup($TChamps,$TTotalGroup);
+		
+		return $TBS->render($this->template
+			, array(
+				'entete'=>$TEntete
+				,'champs'=>$TChamps
+				,'recherche'=>$TSearch
+				,'total'=>$TTotal
+				,'export'=>$TExport
+			)
+			, array(
+				'liste'=>array_merge(array('haveExport'=>count($TExport), 'id'=>$this->id, 'nb_columns'=>count($TEntete) ,'totalNB'=>count($TChamps), 'nbSearch'=>count($TSearch), 'haveTotal'=>(int)!empty($TTotal), 'havePage'=>(int)!empty($TPagination) ), $TParam['liste'])
+			)
+			, $TPagination
+			, array()
+		)
+		.$javaScript;
+	}
+	public function renderDatatable(&$db, $TField, $TParam) {
+		$this->typeRender = 'dataTable';
+		// on conserve db pour le traitement ultérieur des subQuery
+		$TEntete=array();
+		$TChamps=array();	
+		
+		//$TParam['limit']['nbLine'] = 99999;
+		
+		$this->init($TParam);
+		
+		$this->parse_array($TEntete, $TChamps, $TParam,$TField);
+		list($TTotal, $TTotalGroup)=$this->get_total($TChamps, $TParam);
+		return $this->renderList($TEntete, $TChamps, $TTotal,$TTotalGroup,$TParam);
+		
+	}
+	public function renderArray(&$db,$TField, $TParam=array()) {
+		$this->typeRender = 'array';
+		// on conserve db pour le traitement ultérieur des subQuery
+		$TEntete=array();
+		$TChamps=array();	
+		
+		$this->init($TParam);
+		
+		$this->parse_array($TEntete, $TChamps, $TParam,$TField);
+		list($TTotal, $TTotalGroup)=$this->get_total($TChamps, $TParam);
+		
+		$view_type = $this->getViewType($TParam);
+		
+		if($view_type == 'raw') {
+			return $this->renderRAW($TEntete, $TChamps,$TTotal, $TParam);
+		}
+		if($view_type == 'chart') {
+			return $this->renderChart($TEntete, $TChamps,$TTotal, $TParam);	
+		}
+		else {
+			return $this->renderList($TEntete, $TChamps,$TTotal,$TTotalGroup, $TParam);	
+		}
+	}
+
+	private function order_by($sql, &$TParam) {
+		$first = true;	
+		//	print_r($TParam['orderBy']);
+		if(!empty($TParam['orderBy'])) {
+			
+			if(strpos($sql,'LIMIT ')!==false) {
+				list($sql, $sqlLIMIT) = explode('LIMIT ', $sql);
+			}
+			
+			$sql.=' ORDER BY '; 
+			foreach($TParam['orderBy'] as $field=>$order) {
+				if(!$first) $sql.=',';
+				
+				if($order=='DESC')$TParam['liste']['orderDown'] = $field;
+				else $TParam['liste']['orderUp'] = $field;
+				
+				if(strpos($field,'.')===false)	$sql.='`'.$field.'` '.$order;
+				else $sql.=$field.' '.$order;
+				
+				$first=false;
+			}
+			
+			if(!empty($sqlLIMIT))$sql.=' LIMIT '.$sqlLIMIT;
+			
+		}
+		
+		return $sql;
+	}
+	private function parse_xml(&$db, &$TEntete, &$TChamps, &$TParam, $xmlString) {
+		$xml = simplexml_load_string($xmlString); 
+		 $this->THideFlip = array_flip($TParam['hide']);
+
+		$first=true;
+		foreach($xml->{$TParam['node']['main']}->{$TParam['node']['object']} as $node) {
+			if($first) {
+				$this->init_entete($TEntete, $TParam, $node);
+				$first=false;
+			}	
+			
+			$this->set_line($TChamps, $TParam, $node);
+		}		
+
+	}
+	private function parse_array(&$TEntete, &$TChamps, &$TParam, $TField) {
+		$first=true;
+		
+		 $this->THideFlip = array_flip($TParam['hide']);
+		$this->TTotalTmp=array();
+		
+		if(empty($TField)) return false;
+		
+		foreach($TField as $row) {
+			if($first) {
+				$this->init_entete($TEntete, $TParam, $row);
+				$first=false;
+			}	
+			
+			$this->set_line($TChamps, $TParam, $row);
+		}		
+
+	}
+	
+	private function init_entete(&$TEntete, &$TParam, $currentLine) {
+		
+		$TField=$TFieldVisibility=array();
+		
+		foreach ($currentLine as $field => $value) {
+			$TField[$field]=true;
+		}
+		
+		global $user;
+		
+		$contextpage=md5($_SERVER['PHP_SELF']);
+		if((float)DOL_VERSION>=4.0 && empty($TParam['no-select'])) {
+			
+			dol_include_once('/core/class/html.form.class.php');
+			
+			global $db,$conf,$user;
+			$form=new Form($db);
+				
+			$selectedfields = GETPOST('TListTBS_'.$this->id.'_selectedfields');
+			
+			if(!empty($selectedfields)) {
+				include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+				$tabparam['MAIN_SELECTEDFIELDS_'.$contextpage]=$selectedfields;
+	    		$result=dol_set_user_param($db, $conf, $user, $tabparam);
+			}
+			
+			$tmpvar='MAIN_SELECTEDFIELDS_'.$contextpage;
+			if (! empty($user->conf->$tmpvar)) {
+				$tmparray=explode(',', $user->conf->$tmpvar);
+				$TParam['hide']=array();
+		        foreach($TField as $field=>$dummy)
+		        {
+		          	$libelle = isset($TParam['title'][$field]) ? $TParam['title'][$field] : $field;
+
+					if(!in_array($field,$tmparray)) {
+				  		$TParam['hide'][] = $field;
+						$visible = 0;
+				  	}
+					else{
+						$visible = 1;
+					}
+		            
+					$TFieldVisibility[$field]=array(
+						'label'=>$libelle
+						,'checked'=>$visible
+					);
+					
+					
+		        }
+			}
+			else{
+				foreach($TField as $field=>$dummy)
+		        {
+		        	$libelle = isset($TParam['title'][$field]) ? $TParam['title'][$field] : $field;
+					$visible = (!in_array($field,$TParam['hide'])) ? 1 : 0;	
+					$TFieldVisibility[$field]=array(
+						'label'=>$libelle
+						,'checked'=>$visible
+					);
+				}
+			}	
+
+			$selectedfields=$form->multiSelectArrayWithCheckbox('TListTBS_'.$this->id.'_selectedfields', $TFieldVisibility, $contextpage);	// This also change content of $arrayfields_0
+			
+		}
+		
+		foreach ($currentLine as $field => $value) {
+			$libelle = isset($TParam['title'][$field]) ? $TParam['title'][$field] : $field;
+			$visible = (!in_array($field,$TParam['hide'])) ? 1 : 0;	
+			
+			if($visible) {
+				$lastfield = $field;
+				$TEntete[$field] = array(
+					'libelle'=>$libelle
+					,'order'=>((in_array($field, $TParam['orderby']['noOrder']) || $this->typeRender != 'sql') ? 0 : 1)
+					,'width'=>(!empty($TParam['size']['width'][$field]) ? $TParam['size']['width'][$field] : 'auto')
+					,'text-align'=>(!empty($TParam['position']['text-align'][$field]) ? $TParam['position']['text-align'][$field] : 'auto')
+					,'more'=>''
+				);
+				  
+			}
+		}
+		
+		if(!empty($selectedfields) && !empty($lastfield)) {
+			$TEntete[$lastfield]['more']='<div style="float:right">'.$selectedfields.'</div>';
+		}
+		
+		
+		/*if(!empty($TParam['search']) && !empty($TEntete)) {
+			$TEntete['actions']=array('libelle'=>'<!-- actions -->', 'order'=>0);
+		}*/
+		
+	}
+	
+	private function in_view(&$TParam, $line_number) {
+		global $conf;
+//		var_dump($_REQUEST['get-all-for-export']);
+		if(!empty($_REQUEST['get-all-for-export'])) return true; // doit être dans la vue
+
+		$page_number = !empty($TParam['limit']['page']) ? $TParam['limit']['page'] : 1;
+		$line_per_page = !empty($TParam['limit']['nbLine']) ? $TParam['limit']['nbLine'] : $conf->liste_limit;
+		
+		$start = ($page_number-1) * $line_per_page;
+		$end = ($page_number* $line_per_page) -1;
+		
+		if($line_number>=$start && $line_number<=$end) return true;
+		else return false;
+	}
+	
+	private function set_line(&$TChamps, &$TParam, $currentLine) {
+		
+			global $conf;
+		
+			$line_number = count($TChamps);
+			
+			if($this->in_view($TParam,$line_number)) {
+				
+				$row=array(); $trans = array();
+				foreach($currentLine as $field=>$value) {
+					
+					if(is_object($value)) {
+						if(get_class($value)=='stdClass') {$value=print_r($value, true);}
+						else $value=(string)$value;
+					} 
+					
+					if(isset($TParam['subQuery'][$field])) {
+						$dbSub = new TPDOdb; //TODO finish it
+						$dbSub->Execute( strtr($TParam['subQuery'][$field], array_merge( $trans, array('@val@'=>$value)  )) );
+						$subResult = '';
+						while($dbSub->Get_line()) {
+							$subResult.= implode(', ',$dbSub->currentLine).'<br />';
+						}
+						$value=$subResult;
+						$dbSub->close();
+					}
+					
+					$trans['@'.$field.'@'] = $value;
+					
+					if(!empty($TParam['math'][$field])) {
+						$float_value = (double)strip_tags($value);
+						$this->TTotalTmp[$field][] = $float_value;
+					}
+					
+					if(!in_array($field,$TParam['hide'])) {
+						$row[$field]=$value;
+						
+						if(isset($TParam['eval'][$field]) && in_array($field,array_keys($row))) {
+							$strToEval = 'return '.strtr( $TParam['eval'][$field] ,  array_merge( $trans, array('@val@'=>$row[$field])  )).';';
+							$row[$field] = eval($strToEval);
+						}
+						
+						if(isset($TParam['type'][$field]) && !isset($TParam['eval'][$field])) {
+							if($TParam['type'][$field]=='date' 
+								|| $TParam['type'][$field]=='datetime' ) {
+
+								if($row[$field] != '0000-00-00 00:00:00' && $row[$field] != '1000-01-01 00:00:00' && $row[$field] != '0000-00-00' && !empty($row[$field])) {
+									if($TParam['type'][$field]=='datetime')$row[$field] = dol_print_date(strtotime($row[$field]),'dayhoursec');
+									else $row[$field] = dol_print_date(strtotime($row[$field]),'day');
+								} else {
+									$row[$field] = '';
+								}
+							}
+							if($TParam['type'][$field]=='hour') { $row[$field] = date('H:i', strtotime($row[$field])); }
+							if($TParam['type'][$field]=='money') { $row[$field] = '<div align="right">'.price($row[$field],0,'',1,-1,2).'</div>'; }
+							if($TParam['type'][$field]=='number') { $row[$field] = '<div align="right">'.price($row[$field]).'</div>'; }
+							if($TParam['type'][$field]=='integer') { $row[$field] = '<div align="right">'.(int)$row[$field].'</div>'; }
+						}
+	
+	                                        if(isset($TParam['link'][$field])) {
+	                                                if(empty($row[$field]) && $row[$field]!==0 && $row[$field]!=='0')$row[$field]='(vide)';
+	                                                $row[$field]= strtr( $TParam['link'][$field],  array_merge( $trans, array('@val@'=>$row[$field])  )) ;
+	                                        }
+	                                        
+	                                        if(isset($TParam['translate'][$field])) {
+							if(isset($TParam['translate'][$field][''])) unset($TParam['translate'][$field]['']);
+	                                                $row[$field] = strtr( $row[$field] , $TParam['translate'][$field]);
+	                                        }
+	
+	
+					} 
+					
+					
+				} 
+			}
+			else{
+				$row=array(); 
+
+				foreach($currentLine as $field=>&$value) {
+					if(!isset($this->THideFlip[$field])) {
+						if(isset($TParam['math'][$field]) && !empty($TParam['math'][$field])) {
+							$float_value = (double)strip_tags($value);
+							$this->TTotalTmp[$field][] = $float_value;
+						}
+						
+						$row[$field] = $value;
+					}
+				}
+			}
+
+			if(!empty($TParam['math'][$field])) {
+			foreach($row as $field=>$value) {
+				if(!empty($TParam['math'][$field]) && is_array($TParam['math'][$field])) {
+						$toField = $TParam['math'][$field][1];
+						$float_value = (double)strip_tags($row[$toField]);
+						$this->TTotalTmp['@groupsum'][$toField][ $row[$field]  ] +=$float_value;
+						
+				}
+			}
+			}
+			$TChamps[] = $row;	
+	}
+	
+	private function getBind(&$TParam) {
+		
+		$TBind = array();
+		foreach($this->TBind as $k=>$v) {
+			if(!empty($TParam['operator'][$k]) && $TParam['operator'][$k] == 'IN') {
+				
+				if($v==='')$TBind[$k] =array("'0'");
+				else $TBind[$k] =explode(',', $v);
+				
+			}
+			else{
+				$TBind[$k] = $v;
+			}
+			
+		}
+		
+		return $TBind;
+	}
+	
+	private function getSQL(&$PDOdb,$sql,&$TParam) {
+		global $user,$conf;
+
+		$sql=strtr($sql,array(
+			'@current_user@'=>$user->id
+		));
+
+		//AA oui c'est moche mais le bindParam ne prends pas en compte les tableaux pour le IN ce qui est super pénalisant. En attendant de refaire mieux ou d'un coup de main
+		$TBind = $this->getBind($TParam);
+		
+		$sql = preg_replace_callback('/(:[a-z])\w+/i',function($matches) use($TBind,$PDOdb) {
+			$field = substr($matches[0],1);
+			 if(isset($TBind[$field]) || is_null($TBind[$field]) ) {
+			 	
+				if(is_array($TBind[$field])) {
+					$r = '';
+					foreach($TBind[$field] as $v ){
+						if(!empty($r))$r.=',';
+						$r.=$PDOdb->quote($v);
+					}
+					
+					return $r;
+					
+				}
+				else if(strpos($TBind[$field],' IS NULL') === false) {
+			 		return $PDOdb->quote($TBind[$field]);	
+			 	}
+				else {
+					return $TBind[$field];
+				}
+			 } 
+			 else {
+			 	 return 'errorBindingField '.$field;
+			 }
+			  
+		}, $sql);
+		
+		
+		return $sql;
+	}
+	
+	private function limitSQL($sql,&$TParam) {
+		
+		if(!empty($TParam['limit']['global']) && strpos($sql,'LIMIT ')===false ) {
+			
+			$sql.=' LIMIT '.(int)$TParam['limit']['global'];
+			
+		}
+		
+		return $sql;
+	}
+	
+	private function parse_sql(&$PDOdb, &$TEntete, &$TChamps,&$TParam, $sql, $TBind=array()) {
+		
+		//$sql.=' LIMIT '.($TParam['limit']['page']*$TParam['limit']['nbLine']).','.$TParam['limit']['nbLine'];
+		$sql = $this->limitSQL($sql, $TParam);
+		
+		$this->TTotalTmp=array();
+		
+		$this->sql = $this->getSQL($PDOdb,$sql,$TParam);
+		$this->THideFlip = array_flip($TParam['hide']);
+
+		$res = $PDOdb->Execute($this->sql);
+		$first=true;
+		while($currentLine = $PDOdb->Get_line()) {
+			if($first) {
+				$this->init_entete($TEntete, $TParam, $currentLine);
+				$first = false;
+			}
+			
+			$this->set_line($TChamps, $TParam, $currentLine);
+			
+		}
+
+//pre($TChamps);exit;
+
+	}	
+}
diff --git a/htdocs/inventory/class/inventory.class.php b/htdocs/inventory/class/inventory.class.php
index 808dd7933be..60a8dde8652 100644
--- a/htdocs/inventory/class/inventory.class.php
+++ b/htdocs/inventory/class/inventory.class.php
@@ -69,9 +69,11 @@ class Inventory extends CoreObject
 		,'title'=>array('type'=>'string')
 	);
 	
-	function __construct() 
+	function __construct(&$db) 
 	{
 		
+		$this->db = &$db;
+		
 		parent::init();
 		
         $this->_init_vars();
@@ -316,22 +318,64 @@ class Inventory extends CoreObject
         return '<a href="'.dol_buildpath('/inventory/inventory.php?id='.$i->getId().'&action=view', 1).'">'.img_picto('','object_list.png','',0).' '.$title.'</a>';
         
     }
+	
+	static function getSQL($type) {
+		global $conf;
+		
+		if($type=='All') {
+			
+			$sql="SELECT i.rowid, e.label, i.date_inventory, i.fk_warehouse, i.date_cre, i.date_maj, i.status
+				  FROM ".MAIN_DB_PREFIX."inventory i
+				  LEFT JOIN ".MAIN_DB_PREFIX."entrepot e ON (e.rowid = i.fk_warehouse)
+				  WHERE i.entity=".(int) $conf->entity;
+			
+		}
+	
+		return $sql;	
+	}
+	
 }
 
-class Inventorydet extends TObjetStd
+class Inventorydet extends CoreObject
 {
-	function __construct()
+	public $element='inventorydet';
+	public $table_element='inventorydet';
+	protected $isnolinkedbythird = 1;     // No field fk_soc
+	protected $ismultientitymanaged = 0;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
+	
+	public $fk_inventory;
+	public $fk_warehouse;
+	public $fk_product;
+	public $entity;
+	public $qty_view;
+	public $qty_stock;
+	public $qty_regulated;
+	public $pmp;
+	public $pa;
+	public $new_pmp;
+	
+	private $__fields=array(
+		'fk_inventory'=>array('type'=>'int')
+		,'fk_warehouse'=>array('type'=>'int')
+		,'fk_product'=>array('type'=>'int')
+		,'entity'=>array('type'=>'int')
+		,'qty_view'=>array('type'=>'float')
+		,'qty_stock'=>array('type'=>'float')
+		,'qty_regulated'=>array('type'=>'float')
+		,'pmp'=>array('type'=>'float')
+		,'pa'=>array('type'=>'float')
+		,'new_pmp'=>array('type'=>'float')
+	);
+	
+	
+	function __construct(&$db)
 	{
 		global $conf;
 		
-		$this->set_table(MAIN_DB_PREFIX.'inventorydet');
-    	$this->TChamps = array(); 	  
-		$this->add_champs('fk_inventory,fk_warehouse,fk_product,entity', 'type=entier;');
-		$this->add_champs('qty_view,qty_stock,qty_regulated,pmp,pa,new_pmp', 'type=float;');
-
-		$this->_init_vars();
-	    $this->start();
+		$this->db = &$db;
 		
+		parent::init();
+				
 		$this->entity = $conf->entity;
 		$this->errors = array();
 		

From dfb9ae234cfe3b156cedba54e72c36d8e88e19ea Mon Sep 17 00:00:00 2001
From: Alexis Algoud <alexis@atm-consulting.fr>
Date: Mon, 12 Dec 2016 19:03:02 +0100
Subject: [PATCH 004/505] debug

---
 htdocs/core/class/coreobject.class.php        |  23 +-
 ...{class.listview.php => listview.class.php} | 520 +++---------------
 htdocs/core/js/listview.js                    | 143 +++++
 htdocs/inventory/class/inventory.class.php    |  81 ++-
 4 files changed, 266 insertions(+), 501 deletions(-)
 rename htdocs/core/class/{class.listview.php => listview.class.php} (61%)
 create mode 100644 htdocs/core/js/listview.js

diff --git a/htdocs/core/class/coreobject.class.php b/htdocs/core/class/coreobject.class.php
index 1cc68f38cb7..7d784073412 100644
--- a/htdocs/core/class/coreobject.class.php
+++ b/htdocs/core/class/coreobject.class.php
@@ -25,7 +25,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
 
 class CoreObject extends CommonObject {
 	
-	 
+	protected $__fields=array(); 
 	 /**
 	 *  Constructor
 	 *
@@ -38,7 +38,7 @@ class CoreObject extends CommonObject {
 		$this->date_0 = '1001-01-01 00:00:00'; //TODO there is a solution for this ?
 	}
 	
-	private function init() {
+	protected function init() {
 		
 		$this->id = 0;
 		$this->datec = time();
@@ -110,20 +110,20 @@ class CoreObject extends CommonObject {
 		}
 		else return false;
 	}
-	private function _is_float($info){
+	private function is_float($info){
 		if(is_array($info)) {
 			if(isset($info['type']) && $info['type']=='float') return true;
 			else return false;
 		} else return false;
 	}
 	
-	private function _is_text($info){
+	private function is_text($info){
 	  	if(is_array($info)) {
 			if(isset($info['type']) && $info['type']=='text') return true;
 			else return false;
 		} else return false;
 	}
-	private function _is_index($info){
+	private function is_index($info){
 	  	if(is_array($info)) {
 			if(isset($info['index']) && $info['index']==true) return true;
 			else return false;
@@ -172,14 +172,23 @@ class CoreObject extends CommonObject {
 		return $query;
 	}
 		
+	private function get_field_list(){
+			
+		$keys = array_keys($this->__fields);
+		
+	    return implode(',', $keys);
+	}
 	
 	public function fetch($id, $loadChild = true) {
 		
 		if(empty($id)) return false;
 
-		$res = $db->query( 'SELECT '.$this->get_field_list().'datec,tms
+		$sql = 'SELECT '.$this->get_field_list().',datec,tms
 						FROM '.$this->table_element.'
-						WHERE rowid='.$id );
+						WHERE rowid='.$id;
+						
+		$res = $this->db->query( $sql );
+			var_dump($sql);		
 		if($obj = $db->fetch_object($res)) {
 				$this->rowid=$id;
 			
diff --git a/htdocs/core/class/class.listview.php b/htdocs/core/class/listview.class.php
similarity index 61%
rename from htdocs/core/class/class.listview.php
rename to htdocs/core/class/listview.class.php
index f37fc9a1628..0cedad18855 100644
--- a/htdocs/core/class/class.listview.php
+++ b/htdocs/core/class/listview.class.php
@@ -20,7 +20,9 @@
 
 class Listview {
 	
-	function __construct( $id ) {
+	function __construct(&$db, $id ) {
+			
+		$this->db = &$db;
 			
 		$this->id = $id;
 		
@@ -263,79 +265,25 @@ class Listview {
 		return $sql;
 	}
 
-	private function getViewType(&$TParam) {
-		if(!empty($TParam['view_type'])) return $TParam['view_type']; 
-		else if (is_string($TParam['type']))return $TParam['type'] ;
-		else return 'list';
+	public function render($sql,$TParam=array()) {
+
+		$THeader=array();
+		$TField=array();	
+		
+		$this->init($TParam);
+		
+		$sql = $this->search($sql,$TParam);
+		$sql = $this->order_by($sql, $TParam);		
+		
+		$this->parse_sql($THeader, $TField, $TParam, $sql);	
+		
+		list($TTotal, $TTotalGroup)=$this->get_total($TField, $TParam);
+		
+		return $this->renderList($THeader, $TField,$TTotal,$TTotalGroup, $TParam);	
+		
 	}
 
-	public function render(&$db,$sql,$TParam=array(),$TBind=array()) {
-		$this->typeRender = 'sql';
-	//		print_r($TParam);
-		$TEntete=array();
-		$TChamps=array();	
-		
-		$this->init($TParam);
-		
-		if(!empty($TBind)) $this->TBind = $TBind;
-		
-		$sql = $this->search($sql,$TParam);
-		$sql = $this->order_by($sql, $TParam);		
-		
-		$this->parse_sql($db, $TEntete, $TChamps, $TParam, $sql);	
-		
-		list($TTotal, $TTotalGroup)=$this->get_total($TChamps, $TParam);
-		
-		$view_type = $this->getViewType($TParam);
-				
-		if($view_type == 'raw') {
-			return $this->renderRAW($TEntete, $TChamps,$TTotal,$TTotalGroup, $TParam);
-		}
-		else if($view_type == 'chart') {
-			return $this->renderChart($TEntete, $TChamps,$TTotal, $TParam);	
-		}
-		else {
-			return $this->renderList($TEntete, $TChamps,$TTotal,$TTotalGroup, $TParam);	
-		}
-		
-		
-	}
-	public function renderDataTableAjax(&$db,$sql,$TParam=array()) {
-		$this->renderDataTableSQL($db, $sql, $TParam);
-	}
-	public function renderDataTableSQL(&$db,$sql,$TParam=array()) {
-		$this->typeRender = 'dataTableAjax';
-	//		print_r($TParam);
-		$TEntete=array();
-		$TChamps=array();	
-		
-		$this->init($TParam);
-		
-		$sql = $this->search($sql,$TParam);
-		$sql = $this->order_by($sql, $TParam);		
-		
-		$this->parse_sql($db, $TEntete, $TChamps, $TParam, $sql);	
-		list($TTotal, $TTotalGroup)=$this->get_total($TChamps, $TParam);
-		
-		return $this->renderList($TEntete, $TChamps,$TTotal,$TTotalGroup, $TParam);
-		
-	}
-	public function renderXML(&$db,$xmlString, $TParam=array()) {
-		$this->typeRender = 'xml';
-		
-		$TEntete=array();
-		$TChamps=array();	
-		
-		$this->init($TParam);
-		
-		$this->parse_xml($db, $TEntete, $TChamps, $TParam,$xmlString);
-		
-		list($TTotal, $TTotalGroup)=$this->get_total($TChamps, $TParam);
-		
-		return $this->renderList($TEntete, $TChamps,$TTotal,$TTotalGroup, $TParam);
-		
-	}
-	private function setSearch(&$TEntete, &$TParam) {
+	private function setSearch(&$THeader, &$TParam) {
 		global $langs;
 		
 		if(empty($TParam['search'])) return array();
@@ -347,7 +295,7 @@ class Listview {
 		$nb_search_in_bar = 0;
 		
 		if(!empty($TParam['search'])) {
-			foreach($TEntete as $key=>$libelle) { // init
+			foreach($THeader as $key=>$libelle) { // init
 				if(empty($TSearch[$key]))$TSearch[$key]='';
 			}
 		}		
@@ -382,7 +330,7 @@ class Listview {
 			}
 			
 
-			if(!empty($TEntete[$key]) || $this->getViewType($TParam) == 'chart') {
+			if(!empty($THeader[$key]) || $this->getViewType($TParam) == 'chart') {
 				$TSearch[$key] = $fsearch;
 				$nb_search_in_bar++;
 			}
@@ -416,12 +364,12 @@ class Listview {
 	 * Function analysant et totalisant une colonne
 	 * Supporté : sum, average
 	 */
-	private function get_total(&$TChamps, &$TParam) {
+	private function get_total(&$TField, &$TParam) {
 		$TTotal=$TTotalGroup=array();	
 		
-		if(!empty($TParam['math']) && !empty($TChamps[0])) {
+		if(!empty($TParam['math']) && !empty($TField[0])) {
 			
-			foreach($TChamps[0] as $field=>$value) {
+			foreach($TField[0] as $field=>$value) {
 				$TTotal[$field]='';	
 				$TTotalGroup[$field] = '';
 			}
@@ -460,80 +408,16 @@ class Listview {
 
 	private function getJS(&$TParam) {
 		$javaScript = '<script language="javascript">
-		if(typeof(TListTBS_include)=="undefined") {
-			document.write("<script type=\"text/javascript\" src=\"'.COREHTTP.'includes/js/list.tbs.js\"></scr");
+		if(typeof(TListview_include)=="undefined") {
+			document.write("<script type=\"text/javascript\" src=\"'.DOL_URL_ROOT.'/core/js/list.view.js\"></scr");
 	  		document.write("ipt>");
 		}
 		</script>';
 
-
-		if($this->typeRender=='dataTable') {
-			
-			$javaScript.='<!-- datatable  -->
-			<script language="javascript">
-					
-					if(typeof(TListTBS_dataTable_include)=="undefined") {
-						var TListTBS_dataTable_include=true;	
-						document.write("<script type=\"text/javascript\" src=\"'.COREHTTP.'includes/js/dataTable/js/jquery.dataTables.min.js\"></scr");
-			  			document.write("ipt>");
-						document.write("<link rel=\"stylesheet\" href=\"'.COREHTTP.'includes/js/dataTable/css/jquery.dataTables.css\" />");
-					}
-			
-					$(document).ready(function () {
-						$("#'.$this->id.'").wrap("<div id=\"'.$this->id.'_datatable_container\">");	
-						$("#'.$this->id.'").dataTable({
-					        "sPaginationType": "full_numbers"
-					        ,"aLengthMenu": [['.$TParam['limit']['nbLine'].',-1], ['.$TParam['limit']['nbLine'].', "All"]]
-					        ,"iDisplayLength" : '.$TParam['limit']['nbLine'].'
-					    });
-					}); 
-			</script>';
-			
-			$TPagination=array();
-		}
-		elseif($this->typeRender=='dataTableAjax') {
-			$javaScript.='<!-- datatable  -->
-			<script language="javascript">
-			
-					if(typeof(TListTBS_dataTable_include)=="undefined") {
-						var TListTBS_dataTable_include=true;
-						document.write("<script type=\"text/javascript\" src=\"'.COREHTTP.'includes/js/dataTable/js/jquery.dataTables.min.js\"></scr");
-			  			document.write("ipt>");
-						document.write("<link rel=\"stylesheet\" href=\"'.COREHTTP.'includes/js/dataTable/css/jquery.dataTables.css\" />");
-					}
-			
-					$(document).ready(function () {
-						$("#'.$this->id.'").wrap("<div id=\"'.$this->id.'_datatable_container\">");	
-						var oTable = $("#'.$this->id.'").dataTable({
-					        "sPaginationType": "full_numbers"
-					        ,"iDisplayLength" : '.$TParam['limit']['nbLine'].'
-					        ,"sPaginationType": "full_numbers"
-					        ,"oLanguage": {
-								"sSearch": "Recherche globale :"
-								/*,"sUrl": "media/language/de_DE.txt" pour depuis un fichier */
-							}
-					    });
-						
-						
-						/* Ajoute du filtre via la recherche sur colonne */
-					    $("#'.$this->id.' thead tr.barre-recherche td").each( function ( i ) {
-					        $("select", this).change( function () {
-					            oTable.fnFilter( $(this).val(), i );
-					        } );
-					        $("input", this).keyup( function () {
-					            oTable.fnFilter( $(this).val(), i );
-					        } );
-							
-					    } );
-						
-					}); 
-			</script>';
-		}
-		
 		return $javaScript;
 	}
 
-	private function setExport(&$TParam,$TChamps,$TEntete) {
+	private function setExport(&$TParam,$TField,$THeader) {
 		global $langs;
 		
 		$Tab=array();
@@ -545,8 +429,8 @@ class Listview {
 				'title'=>$this->title
 				,'sql'=>$this->sql
 				,'TBind'=>$this->TBind
-				,'TChamps'=>$TChamps
-				,'TEntete'=>$TEntete
+				,'TChamps'=>$TField
+				,'TEntete'=>$THeader
 			) ) );
 
 			foreach($TParam['export'] as $mode_export) {
@@ -567,133 +451,7 @@ class Listview {
 		return $Tab;
 	}
 
-	private function renderChart(&$TEntete, &$TChamps,&$TTotal, &$TParam) {
-		
-		$TData = array();
-		$header = '';
-		$first = true;
-		
-		$TSearch = $this->setSearch($TEntete, $TParam);
-		$TExport= $this->setExport($TParam, $TChamps, $TEntete);
-		
-		if(empty($TParam['xaxis']) && !empty($TEntete)) {
-			$fieldXaxis = key($TEntete);
-		}
-		else {
-			$fieldXaxis = $TParam['xaxis'];
-		}
-		
-		$TValue=array(); $key = null;
-		foreach($TEntete as $field=>&$entete) {
-			if($field!=$fieldXaxis)$TValue[] = addslashes($entete['libelle']);
-		}
-
-		$header='["'.addslashes( $TEntete[$fieldXaxis]['libelle'] ).'","'.implode('","', $TValue).'"]';
-		//var_dump($fieldXaxis, $TChamps);
-		foreach($TChamps as &$row) {
-			$TValue=array();
-			$key = null;
-			
-			foreach($row as $k=>$v) {
-				
-				if($k == $fieldXaxis) {
-					$key = $v;
-				}
-				else {
-					$TValue[] = (float)$v;
-				}
-				
-			}
-
-			if(!is_null($key)) {
-				if(!isset($TData[$key])) $TData[$key] = $TValue;
-				else {
-					foreach($TData[$key] as $k=>$v) {
-						$TData[$key][$k]+=(float)$TValue[$k];
-					}
-					
-				}
-			}
-			
-			
-		}
-		
-		$data = $header;
-		foreach($TData as $key=>$TValue) {
-			
-			$data .= ',[ "'.$key.'", ';
-			foreach($TValue as $v) {
-				$data.=(float)$v.',';
-			}
-			
-			$data.=' ]';
-		}
-		
-		$height = empty($TParam['height']) ? 500 : $TParam['height'];
-		$curveType= empty($TParam['curveType']) ? 'none': $TParam['curveType']; // none or function
-		$pieHole =  empty($TParam['pieHole']) ? 0: $TParam['pieHole']; // none or function
-		$hAxis = empty($TParam['hAxis']) ? array() : $TParam['hAxis']; // Array of params
-		$vAxis = empty($TParam['vAxis']) ? array() : $TParam['vAxis']; // Array of params
-		
-		// This feature is experimental and may change in future releases
-		$explorer = empty($TParam['explorer']) ? array() : $TParam['explorer']; // Note: The explorer only works with continuous axes (such as numbers or dates)
-		
-		$type = empty($TParam['chartType']) ? 'LineChart' : $TParam['chartType'];
-		
-		$html = '';
-		
-		if(!empty($TSearch)) {
-			
-			$html.='<table class="border searchbox">';
-			foreach($TSearch as $field=>$input) {
-				if(!empty($input)) {
-					$label = !empty($TParam['title'][$field]) ? $TParam['title'][$field] : $field;
-					$html.='<tr><td>'.$label.'</td><td>'.$input.'</td></tr>';	
-				}
-			}
-			
-			$html.='</table>';
-			
-		}
-		$javaScript = $this->getJS($TParam);
-		
-		$html.='<script type="text/javascript" src="https://www.google.com/jsapi"></script>
-		<script type="text/javascript">
-		  
-		  	  google.load("visualization", "1", {"packages":["corechart"]});
-		      google.setOnLoadCallback(drawChart'.$this->id.');
-			
-			  function drawChart'.$this->id.'() {
-		        var data = google.visualization.arrayToDataTable([
-		          '.$data.'
-		        ]);
-	
-		        var options = {
-		          title: "'.addslashes($TParam['liste']['titre']).'"
-		          '.(!empty($curveType) ? ',curveType: "'.$curveType.'"' : '' ).'
-		          ,legend: { position: "bottom" }
-				  ,animation: { "startup": true }
-				  '.(!empty($explorer) ? ',explorer: '.json_encode($explorer) : '').'
-				  ,height : '.$height.'
-				  ,hAxis: '.json_encode($hAxis).'
-				  ,vAxis: '.json_encode($vAxis).'
-				  '.( $type == 'PieChart' && !empty($pieHole) ? ',pieHole: '.$pieHole : '').'
-				  '.( $type == 'AreaChart' ? ',isStacked: \'percent\'' : '').'
-		        };
-
-		        var chart = new google.visualization.'.$type.'(document.getElementById("div_query_chart'.$this->id.'"));
-		
-		        chart.draw(data, options);
-		      }
-		  
-	    </script>
-		<div id="div_query_chart'.$this->id.'"></div>
-		'.$javaScript; 
-		
-		return $html;
-	}
-
-	private function addTotalGroup($TChamps,$TTotalGroup) {
+	private function addTotalGroup($TField,$TTotalGroup) {
 		global $langs;
 		
 		$Tab=array();
@@ -704,7 +462,7 @@ class Listview {
 		
 		$addGroupLine = false;
 		
-		foreach($TChamps as $k=>&$line) {
+		foreach($TField as $k=>&$line) {
 				
 			if(empty($proto_total_line)) {
 				foreach($line as $field=>$value) {
@@ -748,99 +506,50 @@ class Listview {
 		
 		return $Tab;
 	}
-
-	private function renderRAW(&$TEntete, &$TChamps, &$TTotal,&$TTotalGroup, &$TParam) {
-		$TSearch = $this->setSearch($TEntete, $TParam);
-		$TExport=$this->setExport($TParam, $TChamps, $TEntete);
-		$TChamps = $this->addTotalGroup($TChamps,$TTotalGroup);
-		
-		return array(
-				'entete'=>$TEntete
-				,'champs'=>$TChamps
-				,'recherche'=>$TSearch
-				,'total'=>$TTotal
-				,'export'=>$TExport
-				,'haveExport'=>count($TExport)
-				, 'id'=>$this->id
-				, 'nb_columns'=>count($TEntete) 
-				,'totalNB'=>count($TChamps)
-				, 'nbSearch'=>count($TSearch)
-				, 'haveTotal'=>(int)!empty($TTotal)
-				, 'havePage'=>(int)!empty($TPagination) 
-		);
-	}
 	
-	private function renderList(&$TEntete, &$TChamps, &$TTotal,&$TTotalGroup, &$TParam) {
-		$TBS = new TTemplateTBS;
-		
+	private function renderList(&$THeader, &$TField, &$TTotal,&$TTotalGroup, &$TParam) {
+			
 		$javaScript = $this->getJS($TParam);
 		
-		if($this->typeRender!='dataTableAjax') {
-			$TPagination=array(
-				'pagination'=>array('pageSize'=>$TParam['limit']['nbLine'], 'pageNum'=>$TParam['limit']['page'], 'blockName'=>'champs', 'totalNB'=>count($TChamps))
-			);
-		}
-		else {
-			$TPagination=array();
-		}
+		$TPagination=array(
+			'pagination'=>array('pageSize'=>$TParam['limit']['nbLine'], 'pageNum'=>$TParam['limit']['page'], 'blockName'=>'champs', 'totalNB'=>count($TField))
+		);
 		
-		$TSearch = $this->setSearch($TEntete, $TParam);
-		$TExport=$this->setExport($TParam, $TChamps, $TEntete);
-		$TChamps = $this->addTotalGroup($TChamps,$TTotalGroup);
+		$TSearch = $this->setSearch($THeader, $TParam);
+		$TExport=$this->setExport($TParam, $TField, $THeader);
+		$TField = $this->addTotalGroup($TField,$TTotalGroup);
 		
-		return $TBS->render($this->template
-			, array(
-				'entete'=>$TEntete
-				,'champs'=>$TChamps
+		var_dump(
+			array(
+				'entete'=>$THeader
+				,'champs'=>$TField
 				,'recherche'=>$TSearch
 				,'total'=>$TTotal
 				,'export'=>$TExport
 			)
 			, array(
-				'liste'=>array_merge(array('haveExport'=>count($TExport), 'id'=>$this->id, 'nb_columns'=>count($TEntete) ,'totalNB'=>count($TChamps), 'nbSearch'=>count($TSearch), 'haveTotal'=>(int)!empty($TTotal), 'havePage'=>(int)!empty($TPagination) ), $TParam['liste'])
+				'liste'=>array_merge(array('haveExport'=>count($TExport), 'id'=>$this->id, 'nb_columns'=>count($THeader) ,'totalNB'=>count($TField), 'nbSearch'=>count($TSearch), 'haveTotal'=>(int)!empty($TTotal), 'havePage'=>(int)!empty($TPagination) ), $TParam['liste'])
 			)
 			, $TPagination
-			, array()
-		)
-		.$javaScript;
-	}
-	public function renderDatatable(&$db, $TField, $TParam) {
-		$this->typeRender = 'dataTable';
-		// on conserve db pour le traitement ultérieur des subQuery
-		$TEntete=array();
-		$TChamps=array();	
-		
-		//$TParam['limit']['nbLine'] = 99999;
-		
-		$this->init($TParam);
-		
-		$this->parse_array($TEntete, $TChamps, $TParam,$TField);
-		list($TTotal, $TTotalGroup)=$this->get_total($TChamps, $TParam);
-		return $this->renderList($TEntete, $TChamps, $TTotal,$TTotalGroup,$TParam);
-		
+			
+		);
+		
+		$javaScript;
 	}
+	
 	public function renderArray(&$db,$TField, $TParam=array()) {
 		$this->typeRender = 'array';
 		// on conserve db pour le traitement ultérieur des subQuery
-		$TEntete=array();
-		$TChamps=array();	
+		$THeader=array();
+		$TField=array();	
 		
 		$this->init($TParam);
 		
-		$this->parse_array($TEntete, $TChamps, $TParam,$TField);
-		list($TTotal, $TTotalGroup)=$this->get_total($TChamps, $TParam);
+		$this->parse_array($THeader, $TField, $TParam,$TField);
+		list($TTotal, $TTotalGroup)=$this->get_total($TField, $TParam);
 		
-		$view_type = $this->getViewType($TParam);
+		$this->renderList($THeader, $TField,$TTotal,$TTotalGroup, $TParam);	
 		
-		if($view_type == 'raw') {
-			return $this->renderRAW($TEntete, $TChamps,$TTotal, $TParam);
-		}
-		if($view_type == 'chart') {
-			return $this->renderChart($TEntete, $TChamps,$TTotal, $TParam);	
-		}
-		else {
-			return $this->renderList($TEntete, $TChamps,$TTotal,$TTotalGroup, $TParam);	
-		}
 	}
 
 	private function order_by($sql, &$TParam) {
@@ -848,7 +557,7 @@ class Listview {
 		//	print_r($TParam['orderBy']);
 		if(!empty($TParam['orderBy'])) {
 			
-			if(strpos($sql,'LIMIT ')!==false) {
+			if(strpos($sql,'LIMIT ')!==false) { //TODO regex
 				list($sql, $sqlLIMIT) = explode('LIMIT ', $sql);
 			}
 			
@@ -871,22 +580,8 @@ class Listview {
 		
 		return $sql;
 	}
-	private function parse_xml(&$db, &$TEntete, &$TChamps, &$TParam, $xmlString) {
-		$xml = simplexml_load_string($xmlString); 
-		 $this->THideFlip = array_flip($TParam['hide']);
-
-		$first=true;
-		foreach($xml->{$TParam['node']['main']}->{$TParam['node']['object']} as $node) {
-			if($first) {
-				$this->init_entete($TEntete, $TParam, $node);
-				$first=false;
-			}	
-			
-			$this->set_line($TChamps, $TParam, $node);
-		}		
-
-	}
-	private function parse_array(&$TEntete, &$TChamps, &$TParam, $TField) {
+	
+	private function parse_array(&$THeader, &$TField, &$TParam, $TField) {
 		$first=true;
 		
 		 $this->THideFlip = array_flip($TParam['hide']);
@@ -896,16 +591,16 @@ class Listview {
 		
 		foreach($TField as $row) {
 			if($first) {
-				$this->init_entete($TEntete, $TParam, $row);
+				$this->init_entete($THeader, $TParam, $row);
 				$first=false;
 			}	
 			
-			$this->set_line($TChamps, $TParam, $row);
+			$this->set_line($TField, $TParam, $row);
 		}		
 
 	}
 	
-	private function init_entete(&$TEntete, &$TParam, $currentLine) {
+	private function init_entete(&$THeader, &$TParam, $currentLine) {
 		
 		$TField=$TFieldVisibility=array();
 		
@@ -977,7 +672,7 @@ class Listview {
 			
 			if($visible) {
 				$lastfield = $field;
-				$TEntete[$field] = array(
+				$THeader[$field] = array(
 					'libelle'=>$libelle
 					,'order'=>((in_array($field, $TParam['orderby']['noOrder']) || $this->typeRender != 'sql') ? 0 : 1)
 					,'width'=>(!empty($TParam['size']['width'][$field]) ? $TParam['size']['width'][$field] : 'auto')
@@ -989,19 +684,15 @@ class Listview {
 		}
 		
 		if(!empty($selectedfields) && !empty($lastfield)) {
-			$TEntete[$lastfield]['more']='<div style="float:right">'.$selectedfields.'</div>';
+			$THeader[$lastfield]['more']='<div style="float:right">'.$selectedfields.'</div>';
 		}
 		
 		
-		/*if(!empty($TParam['search']) && !empty($TEntete)) {
-			$TEntete['actions']=array('libelle'=>'<!-- actions -->', 'order'=>0);
-		}*/
-		
 	}
 	
 	private function in_view(&$TParam, $line_number) {
 		global $conf;
-//		var_dump($_REQUEST['get-all-for-export']);
+
 		if(!empty($_REQUEST['get-all-for-export'])) return true; // doit être dans la vue
 
 		$page_number = !empty($TParam['limit']['page']) ? $TParam['limit']['page'] : 1;
@@ -1014,11 +705,11 @@ class Listview {
 		else return false;
 	}
 	
-	private function set_line(&$TChamps, &$TParam, $currentLine) {
+	private function set_line(&$TField, &$TParam, $currentLine) {
 		
 			global $conf;
 		
-			$line_number = count($TChamps);
+			$line_number = count($TField);
 			
 			if($this->in_view($TParam,$line_number)) {
 				
@@ -1114,67 +805,7 @@ class Listview {
 				}
 			}
 			}
-			$TChamps[] = $row;	
-	}
-	
-	private function getBind(&$TParam) {
-		
-		$TBind = array();
-		foreach($this->TBind as $k=>$v) {
-			if(!empty($TParam['operator'][$k]) && $TParam['operator'][$k] == 'IN') {
-				
-				if($v==='')$TBind[$k] =array("'0'");
-				else $TBind[$k] =explode(',', $v);
-				
-			}
-			else{
-				$TBind[$k] = $v;
-			}
-			
-		}
-		
-		return $TBind;
-	}
-	
-	private function getSQL(&$PDOdb,$sql,&$TParam) {
-		global $user,$conf;
-
-		$sql=strtr($sql,array(
-			'@current_user@'=>$user->id
-		));
-
-		//AA oui c'est moche mais le bindParam ne prends pas en compte les tableaux pour le IN ce qui est super pénalisant. En attendant de refaire mieux ou d'un coup de main
-		$TBind = $this->getBind($TParam);
-		
-		$sql = preg_replace_callback('/(:[a-z])\w+/i',function($matches) use($TBind,$PDOdb) {
-			$field = substr($matches[0],1);
-			 if(isset($TBind[$field]) || is_null($TBind[$field]) ) {
-			 	
-				if(is_array($TBind[$field])) {
-					$r = '';
-					foreach($TBind[$field] as $v ){
-						if(!empty($r))$r.=',';
-						$r.=$PDOdb->quote($v);
-					}
-					
-					return $r;
-					
-				}
-				else if(strpos($TBind[$field],' IS NULL') === false) {
-			 		return $PDOdb->quote($TBind[$field]);	
-			 	}
-				else {
-					return $TBind[$field];
-				}
-			 } 
-			 else {
-			 	 return 'errorBindingField '.$field;
-			 }
-			  
-		}, $sql);
-		
-		
-		return $sql;
+			$TField[] = $row;	
 	}
 	
 	private function limitSQL($sql,&$TParam) {
@@ -1188,29 +819,26 @@ class Listview {
 		return $sql;
 	}
 	
-	private function parse_sql(&$PDOdb, &$TEntete, &$TChamps,&$TParam, $sql, $TBind=array()) {
+	private function parse_sql( &$THeader, &$TField,&$TParam, $sql) {
+		global $db;	
 		
-		//$sql.=' LIMIT '.($TParam['limit']['page']*$TParam['limit']['nbLine']).','.$TParam['limit']['nbLine'];
-		$sql = $this->limitSQL($sql, $TParam);
+		$this->sql = $this->limitSQL($sql, $TParam);
 		
 		$this->TTotalTmp=array();
 		
-		$this->sql = $this->getSQL($PDOdb,$sql,$TParam);
 		$this->THideFlip = array_flip($TParam['hide']);
 
-		$res = $PDOdb->Execute($this->sql);
+		$res = $db->query($this->sql);
 		$first=true;
-		while($currentLine = $PDOdb->Get_line()) {
+		while($currentLine = $db->fetch_object($res)) {
 			if($first) {
-				$this->init_entete($TEntete, $TParam, $currentLine);
+				$this->init_entete($THeader, $TParam, $currentLine);
 				$first = false;
 			}
 			
-			$this->set_line($TChamps, $TParam, $currentLine);
+			$this->set_line($TField, $TParam, $currentLine);
 			
 		}
 
-//pre($TChamps);exit;
-
 	}	
 }
diff --git a/htdocs/core/js/listview.js b/htdocs/core/js/listview.js
new file mode 100644
index 00000000000..1157c2ef4b8
--- /dev/null
+++ b/htdocs/core/js/listview.js
@@ -0,0 +1,143 @@
+var TListTBS_include = true;
+
+function TListTBS_OrderDown(idListe, column) {
+	var base_url = document.location.href;
+	
+	base_url = TListTBS_recup_form_param(idListe,base_url);
+	base_url = TListTBS_removeParam(base_url,'TListTBS['+encodeURIComponent(idListe)+'][orderBy]');
+	
+	base_url = TListTBS_removeParam(base_url,'get-all-for-export');
+	
+	document.location.href=TListTBS_modifyUrl(base_url,"TListTBS["+encodeURIComponent(idListe)+"][orderBy]["+encodeURIComponent(column)+"]","DESC");
+}
+function TListTBS_OrderUp(idListe, column) {
+	
+	var base_url = document.location.href;
+	
+	base_url = TListTBS_recup_form_param(idListe,base_url);
+	base_url = TListTBS_removeParam(base_url,'TListTBS['+encodeURIComponent(idListe)+'][orderBy]');
+	
+	base_url = TListTBS_removeParam(base_url,'get-all-for-export');
+	
+	document.location.href=TListTBS_modifyUrl(base_url,"TListTBS["+encodeURIComponent(idListe)+"][orderBy]["+encodeURIComponent(column)+"]","ASC");
+}
+function TListTBS_modifyUrl(strURL,paramName,paramNewValue){
+	    if (strURL.indexOf(paramName+'=')!=-1){
+        	
+                var strFirstPart=strURL.substring(0,strURL.indexOf(paramName+'=',0))+paramName+'=';
+                var strLastPart="";
+                if (strURL.indexOf('&',strFirstPart.length-1)>0)
+                      strLastPart=strURL.substring(strURL.indexOf('&',strFirstPart.length-1),strURL.length);
+              		  strURL=strFirstPart+paramNewValue+strLastPart;
+                }
+        else{
+                if (strURL.search('=')!=-1) // permet de verifier s'il y a dej� des param�tres dans l'URL
+                        strURL+='&'+paramName+'='+paramNewValue;
+                else
+                        strURL+='?'+paramName+'='+paramNewValue;
+        }
+        
+        return strURL;
+}
+function TListTBS_removeParam(strURL, paramMask) {
+	var cpt=0;
+	var url = '';
+	
+	 while(strURL.indexOf(paramMask)!=-1 && cpt++ <50){
+	 	var strFirstPart= strURL.substring(0,strURL.indexOf(paramMask)-1);
+	 	
+	 	var strLastPart='';
+	 	if (strURL.indexOf('&',strFirstPart.length+1)>0) {
+	 		strLastPart = strURL.substring(strURL.indexOf('&',strFirstPart.length+1),strURL.length);	
+	 	}
+	 		
+		url = strFirstPart+strLastPart;
+	 	
+	 }
+	 
+	 if(url=='')url = strURL;
+	 
+	 return url;
+}
+
+function TListTBS_recup_form_param(idListe,base_url) {
+	
+	$('#'+idListe+' tr.barre-recherche [listviewtbs],#'+idListe+' tr.barre-recherche-head input,#'+idListe+' tr.barre-recherche-head select,#'+idListe+' div.tabsAction input[listviewtbs]').each(function(i,item) {
+		if($(item).attr("name")) {
+			base_url = TListTBS_modifyUrl(base_url, $(item).attr("name") , $(item).val());
+		}
+		
+	});
+	
+	return base_url;
+}
+
+function TListTBS_GoToPage(idListe,pageNumber){
+	
+	var base_url = document.location.href;
+	
+	base_url = TListTBS_recup_form_param(idListe,base_url);
+	base_url =TListTBS_modifyUrl(base_url,"TListTBS["+encodeURIComponent(idListe)+"][page]",pageNumber);
+	
+	base_url = TListTBS_removeParam(base_url,'get-all-for-export');
+	
+	document.location.href=base_url;
+}
+function TListTBS_submitSearch(obj) {
+	
+	$(obj).closest('form').submit();
+	//console.log($(obj).closest('form'));
+}
+function TListTBS_launch_downloadAs(mode,url,token,session_name) {
+	 $('#listTBSdAS_export_form').remove();
+	
+	$form = $('<form action="'+url+'" method="post" name="listTBSdAS_export_form" id="listTBSdAS_export_form"></form>');
+	$form.append('<input type="hidden" name="mode" value="'+mode+'" />');
+	$form.append('<input type="hidden" name="token" value="'+token+'" />');
+	$form.append('<input type="hidden" name="session_name" value="'+session_name+'" />');
+	
+	$('body').append($form);
+	
+    $('#listTBSdAS_export_form').submit();
+	
+}
+
+function TListTBS_downloadAs(obj, mode,url,token,session_name) {
+	
+	$form = $(obj).closest('form');
+	$div = $form.find('div.tabsAction');
+	$div.append('<input type="hidden" listviewtbs="hidden" name="token" value="'+token+'" />');
+	$div.append('<input type="hidden" listviewtbs="hidden" name="mode" value="'+mode+'" />');
+	$div.append('<input type="hidden" listviewtbs="hidden" name="url" value="'+url+'" />');
+	$div.append('<input type="hidden" listviewtbs="hidden" name="session_name" value="'+session_name+'" />');
+	$div.append('<input type="hidden" listviewtbs="hidden" name="get-all-for-export" value="1" />');
+	
+	TListTBS_submitSearch(obj);
+}
+
+$(document).ready(function() {
+	$('tr.barre-recherche input').keypress(function(e) {
+	    if(e.which == 13) {
+	       
+	       var id_list = $(this).closest('table').attr('id');
+	       
+	       $('#'+id_list+' .list-search-link').click();
+	       
+	    }
+	});
+	
+	var $_GET = {};
+	
+	document.location.search.replace(/\??(?:([^=]+)=([^&]*)&?)/g, function () {
+	    function decode(s) {
+	        return decodeURIComponent(s.split("+").join(" "));
+	    }
+	
+	    $_GET[decode(arguments[1])] = decode(arguments[2]);
+	});
+	
+	if(typeof $_GET["get-all-for-export"] != "undefined") {
+		TListTBS_launch_downloadAs($_GET["mode"],$_GET["url"],$_GET["token"],$_GET["session_name"]);
+	}
+	
+});
diff --git a/htdocs/inventory/class/inventory.class.php b/htdocs/inventory/class/inventory.class.php
index 60a8dde8652..f158ab260cf 100644
--- a/htdocs/inventory/class/inventory.class.php
+++ b/htdocs/inventory/class/inventory.class.php
@@ -61,7 +61,7 @@ class Inventory extends CoreObject
 	 */
 	public $title;
 	
-	private $__fields=array(
+	protected $__fields=array(
 		'fk_warehouse'=>array('type'=>'integer','index'=>true)
 		,'entity'=>array('type'=>'integer','index'=>true)
 		,'status'=>array('type'=>'integer','index'=>true)
@@ -69,20 +69,14 @@ class Inventory extends CoreObject
 		,'title'=>array('type'=>'string')
 	);
 	
-	function __construct(&$db) 
+	function __construct(DoliDB &$db) 
 	{
 		
 		$this->db = &$db;
 		
 		parent::init();
 		
-        $this->_init_vars();
-        
-	    $this->start();
-		
-		$this->setChild('Inventorydet','fk_inventory');
-		
-		$this->status = 0;
+       	$this->status = 0;
 		$this->entity = $conf->entity;
 		$this->errors = array();
 		$this->amount = 0;
@@ -94,12 +88,12 @@ class Inventory extends CoreObject
 		usort($this->Inventorydet, array('Inventory', 'customSort'));
 	}
 	
-	function load(&$PDOdb, $id,$annexe = true) 
+	function fetch($id,$annexe = true) 
 	{
 	    
         if(!$annexe) $this->withChild = false;
         
-		$res = parent::load($PDOdb, $id);
+		$res = parent::fetch($id);
 		$this->sort_det();
 		
 		$this->amount = 0;
@@ -124,7 +118,7 @@ class Inventory extends CoreObject
 		return $r;
 	}
 	
-	function changePMP(&$PDOdb) {
+	function changePMP() {
 		
 		foreach ($this->Inventorydet as $k => &$Inventorydet)
 		{
@@ -133,16 +127,9 @@ class Inventory extends CoreObject
 				$Inventorydet->pmp = $Inventorydet->new_pmp; 
 				$Inventorydet->new_pmp = 0;
 			
-				$PDOdb->Execute("UPDATE ".MAIN_DB_PREFIX."product as p SET pmp = ".$Inventorydet->pmp."
+				$db->query("UPDATE ".MAIN_DB_PREFIX."product as p SET pmp = ".$Inventorydet->pmp."
 				WHERE rowid = ".$Inventorydet->fk_product );
 				
-				if((float)DOL_VERSION<4.0) {
-					
-					$PDOdb->Execute("UPDATE ".MAIN_DB_PREFIX."product_stock SET pmp=".$Inventorydet->pmp."
-					 WHERE fk_entrepot = ".$this->fk_warehouse." AND fk_product = ".$Inventorydet->fk_product) ;
-					
-				}
-				
 			}
 		}
 		
@@ -150,15 +137,15 @@ class Inventory extends CoreObject
 		
 	}
 	
-	function save(&$PDOdb)
+	function update()
 	{
 		//si on valide l'inventaire on sauvegarde le stock à cette instant
 		if ($this->status)
 		{
-			 $this->regulate($PDOdb);
+			 $this->regulate();
 		}
 		
-		parent::save($PDOdb);
+		parent::update();
 	}
 	
 	function set_values($Tab)
@@ -188,24 +175,24 @@ class Inventory extends CoreObject
 		return parent::set_values($Tab);
 	}
 	
-    function deleteAllLine(&$PDOdb) {
+    function deleteAllLine() {
         
         foreach($this->Inventorydet as &$det) {
             $det->to_delete = true;
         }
         
-        $this->save($PDOdb);
+        $this->update();
       
         $this->Inventorydet=array();
         
     }
     
-    function add_product(&$PDOdb, $fk_product, $fk_entrepot='') {
+    function add_product($fk_product, $fk_entrepot='') {
         
-        $k = $this->addChild($PDOdb, 'Inventorydet');
+        $k = $this->addChild('Inventorydet');
         $det =  &$this->Inventorydet[$k];
         
-        $det->fk_inventory = $this->getId();
+        $det->fk_inventory = $this->id;
         $det->fk_product = $fk_product;
 		$det->fk_warehouse = empty($fk_entrepot) ? $this->fk_warehouse : $fk_entrepot;
         
@@ -213,16 +200,16 @@ class Inventory extends CoreObject
                 
         $date = $this->get_date('date_inventory', 'Y-m-d');
         if(empty($date))$date = $this->get_date('date_cre', 'Y-m-d'); 
-        $det->setStockDate($PDOdb, $date , $fk_entrepot);
+        $det->setStockDate( $date , $fk_entrepot);
         
     }
     
-    function correct_stock($fk_product, $id_entrepot, $nbpiece, $movement, $label='', $price=0, $inventorycode='')
+    function correct_stock($fk_product, $fk_warehouse, $nbpiece, $movement, $label='', $price=0, $inventorycode='')
 	{
 		global $conf, $db, $langs, $user;
 		
 		/* duplication method product to add datem */
-		if ($id_entrepot)
+		if ($fk_warehouse)
 		{
 			$db->begin();
 
@@ -234,7 +221,7 @@ class Inventory extends CoreObject
 			$datem = empty($conf->global->INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT) ? dol_now() : $this->date_inventory;
 
 			$movementstock=new MouvementStock($db);
-			$result=$movementstock->_create($user,$fk_product,$id_entrepot,$op[$movement],$movement,$price,$label,$inventorycode, $datem);
+			$result=$movementstock->_create($user,$fk_product,$fk_warehouse,$op[$movement],$movement,$price,$label,$inventorycode, $datem);
 			
 			if ($result >= 0)
 			{
@@ -252,7 +239,7 @@ class Inventory extends CoreObject
 		}
 	}
 	
-	function regulate(&$PDOdb)
+	function regulate()
 	{
 		global $db,$user,$langs,$conf;
 		
@@ -288,10 +275,10 @@ class Inventory extends CoreObject
 				$nbpiece = abs($Inventorydet->qty_regulated);
 				$movement = (int) ($Inventorydet->qty_view < $Inventorydet->qty_stock); // 0 = add ; 1 = remove
 						
-				$href = dol_buildpath('/inventory/inventory.php?id='.$this->getId().'&action=view', 1);
+				$href = dol_buildpath('/inventory/inventory.php?id='.$this->id.'&action=view', 1);
 				
 				if(empty($this->title))
-					$this->correct_stock($product->id, $Inventorydet->fk_warehouse, $nbpiece, $movement, $langs->trans('inventoryMvtStock', $href, $this->getId()));
+					$this->correct_stock($product->id, $Inventorydet->fk_warehouse, $nbpiece, $movement, $langs->trans('inventoryMvtStock', $href, $this->id));
 				else
 					$this->correct_stock($product->id, $Inventorydet->fk_warehouse, $nbpiece, $movement, $langs->trans('inventoryMvtStockWithNomInventaire', $href, $this->title));
 			}
@@ -306,16 +293,14 @@ class Inventory extends CoreObject
 	}
     
     static function getLink($id) {
-        global $langs;
+        global $langs,$db;
         
-        $PDOdb=new TPDOdb;
+        $i = new Inventory($db);
+        $i->fetch($id, false);
         
-        $i = new Inventory;
-        $i->load($PDOdb, $id, false);
+        $title = !empty($i->title) ? $i->title : $langs->trans('inventoryTitle').' '.$i->id;
         
-        $title = !empty($i->title) ? $i->title : $langs->trans('inventoryTitle').' '.$i->getId();
-        
-        return '<a href="'.dol_buildpath('/inventory/inventory.php?id='.$i->getId().'&action=view', 1).'">'.img_picto('','object_list.png','',0).' '.$title.'</a>';
+        return '<a href="'.dol_buildpath('/inventory/inventory.php?id='.$i->id.'&action=view', 1).'">'.img_picto('','object_list.png','',0).' '.$title.'</a>';
         
     }
 	
@@ -354,7 +339,7 @@ class Inventorydet extends CoreObject
 	public $pa;
 	public $new_pmp;
 	
-	private $__fields=array(
+	protected $__fields=array(
 		'fk_inventory'=>array('type'=>'int')
 		,'fk_warehouse'=>array('type'=>'int')
 		,'fk_product'=>array('type'=>'int')
@@ -385,11 +370,11 @@ class Inventorydet extends CoreObject
 		
 	}
 	
-	function load(&$PDOdb, $id) 
+	function fetch($id) 
 	{
 		global $conf;
 		
-		$res = parent::load($PDOdb, $id);
+		$res = parent::fetch($id);
 		$this->load_product();
         $this->fetch_current_pa();
 			
@@ -431,9 +416,9 @@ class Inventorydet extends CoreObject
                 AND datem<='".$date." 23:59:59'
                 ORDER BY datem DESC LIMIT 1";
                
-        $PDOdb->Execute($sql);
+        $res = $db->query($sql);
        
-        if($obj = $PDOdb->Get_line()) {
+        if($obj = $db->fetch_object($res)) {
             $last_pa = $obj->price;
         }
         
@@ -467,7 +452,7 @@ class Inventorydet extends CoreObject
 				ORDER BY datem DESC";
 
 		//echo $sql.'<br>';
-		$PDOdb->Execute($sql);
+		$db->query($sql);
 		$TMouvementStock = $PDOdb->Get_All();
 		$laststock = $stock;
 		$lastpmp = $pmp;

From baf1acb4fdb861bf8923f9dfc65adae22befd088 Mon Sep 17 00:00:00 2001
From: Alexis Algoud <alexis@atm-consulting.fr>
Date: Tue, 13 Dec 2016 09:17:43 +0100
Subject: [PATCH 005/505] debug

---
 htdocs/core/class/coreobject.class.php     | 80 +++++++++++++++++++---
 htdocs/core/class/listview.class.php       | 28 +++++---
 htdocs/inventory/class/inventory.class.php | 17 +++--
 3 files changed, 101 insertions(+), 24 deletions(-)

diff --git a/htdocs/core/class/coreobject.class.php b/htdocs/core/class/coreobject.class.php
index 7d784073412..dc52fdd9bf5 100644
--- a/htdocs/core/class/coreobject.class.php
+++ b/htdocs/core/class/coreobject.class.php
@@ -25,6 +25,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
 
 class CoreObject extends CommonObject {
 	
+	public $db;
+	
 	protected $__fields=array(); 
 	 /**
 	 *  Constructor
@@ -33,8 +35,6 @@ class CoreObject extends CommonObject {
 	 */
 	function __construct(DoliDB &$db) {
 		
-		$this->db = &$db;
-		
 		$this->date_0 = '1001-01-01 00:00:00'; //TODO there is a solution for this ?
 	}
 	
@@ -179,27 +179,55 @@ class CoreObject extends CommonObject {
 	    return implode(',', $keys);
 	}
 	
+	private function set_vars_by_db(&$obj){
+
+		foreach ($this->__fields as $field=>$info) {
+			if($this->is_date($info)){
+				if($obj->{$field} === '0000-00-00 00:00:00' || $obj->{$field} === '1000-01-01 00:00:00')$this->{$field} = 0;
+				else $this->{$field} = strtotime($obj->{$field});
+			}
+			elseif($this->is_array($info)){
+				$this->{$field} = @unserialize($obj->{$field});
+				//HACK POUR LES DONNES NON UTF8
+				if($this->{$field}===FALSE)@unserialize(utf8_decode($obj->{$field}));
+			}
+			elseif($this->is_int($info)){
+				$this->{$field} = (int)$obj->{$field};
+			}
+			elseif($this->is_float($info)){
+				$this->{$field} = (double)$obj->{$field};
+			}
+			elseif($this->is_null($info)){
+				$val = $obj->{$field};
+				// zero is not null 
+				$this->{$field} = (is_null($val) || (empty($val) && $val!==0 && $val!=='0')?null:$val);
+			}
+			else{
+				$this->{$field} = $obj->{$field};
+			}
+
+		}
+	}
+	
 	public function fetch($id, $loadChild = true) {
 		
 		if(empty($id)) return false;
 
 		$sql = 'SELECT '.$this->get_field_list().',datec,tms
-						FROM '.$this->table_element.'
+						FROM '.MAIN_DB_PREFIX.$this->table_element.'
 						WHERE rowid='.$id;
-						
+				var_dump($sql);		
 		$res = $this->db->query( $sql );
-			var_dump($sql);		
-		if($obj = $db->fetch_object($res)) {
+				
+		if($obj = $this->db->fetch_object($res)) {
 				$this->rowid=$id;
 			
-				$this->set_vars_by_db($db);
+				$this->set_vars_by_db($obj);
 
 				$this->datec=$this->db->idate($obj->datec);
 				$this->tms=$this->db->idate($obj->tms);
 				
-				if($loadChild) $this->loadChild($db);
-
-				$this->run_trigger($db, 'load');
+				if($loadChild) $this->fetchChild();
 
 				return $this->id;
 		}
@@ -208,6 +236,38 @@ class CoreObject extends CommonObject {
 		}
 		
 	}
+	
+	public function fetchChild() {
+		if($this->withChild && !empty($this->childtables) && !empty($this->fk_element)) {
+
+			foreach($this->childtables as &$childTable) {
+					
+					$className = ucfirst($childTable);
+					
+					$this->{$className}=array();
+					
+					$sql = " SELECT rowid FROM ".MAIN_DB_PREFIX.$childTable." WHERE ".$this->fk_element."=".$this->rowid;
+					$res = $this->db->query($sql);
+					if($res) {
+						
+						while($obj = $db->fetch_object($res)) {
+							
+							$o=new $className($this->db);	
+							$o->fetch($obj->rowid);
+							
+							$this->{$className}[] = $o;
+							
+						}
+						
+					}
+
+			}
+
+		}
+
+	}
+	
+	
 	public function update() {
 		
 		
diff --git a/htdocs/core/class/listview.class.php b/htdocs/core/class/listview.class.php
index 0cedad18855..8df337b699c 100644
--- a/htdocs/core/class/listview.class.php
+++ b/htdocs/core/class/listview.class.php
@@ -820,7 +820,6 @@ class Listview {
 	}
 	
 	private function parse_sql( &$THeader, &$TField,&$TParam, $sql) {
-		global $db;	
 		
 		$this->sql = $this->limitSQL($sql, $TParam);
 		
@@ -828,17 +827,26 @@ class Listview {
 		
 		$this->THideFlip = array_flip($TParam['hide']);
 
-		$res = $db->query($this->sql);
-		$first=true;
-		while($currentLine = $db->fetch_object($res)) {
-			if($first) {
-				$this->init_entete($THeader, $TParam, $currentLine);
-				$first = false;
+		$res = $this->db->query($this->sql);
+		if($res!==false) {
+			
+			dol_syslog(get_class($this)."::parse_sql id=".$this->id." sql=".$this->sql, LOG_DEBUG);
+			
+			$first=true;
+			while($currentLine = $this->db->fetch_object($res)) {
+				if($first) {
+					$this->init_entete($THeader, $TParam, $currentLine);
+					$first = false;
+				}
+				
+				$this->set_line($TField, $TParam, $currentLine);
+				
 			}
 			
-			$this->set_line($TField, $TParam, $currentLine);
-			
 		}
-
+		else {
+			dol_syslog(get_class($this)."::parse_sql id=".$this->id." sql=".$this->sql, LOG_ERR);
+		}
+		
 	}	
 }
diff --git a/htdocs/inventory/class/inventory.class.php b/htdocs/inventory/class/inventory.class.php
index f158ab260cf..d092a876ad2 100644
--- a/htdocs/inventory/class/inventory.class.php
+++ b/htdocs/inventory/class/inventory.class.php
@@ -69,6 +69,8 @@ class Inventory extends CoreObject
 		,'title'=>array('type'=>'string')
 	);
 	
+	public $db;
+	
 	function __construct(DoliDB &$db) 
 	{
 		
@@ -292,15 +294,22 @@ class Inventory extends CoreObject
 		return 1;
 	}
     
+	public function getNomUrl($picto = 1) {
+		global $langs;
+		
+		$title = !empty($this->title) ? $this->title : $langs->trans('inventoryTitle').' '.$this->id;
+        
+        return '<a href="'.dol_buildpath('/inventory/inventory.php?id='.$this->id, 1).'">'.($picto ? img_picto('','object_list.png','',0).' ' : '').$title.'</a>';
+        
+	} 
+	
     static function getLink($id) {
         global $langs,$db;
         
         $i = new Inventory($db);
         $i->fetch($id, false);
         
-        $title = !empty($i->title) ? $i->title : $langs->trans('inventoryTitle').' '.$i->id;
-        
-        return '<a href="'.dol_buildpath('/inventory/inventory.php?id='.$i->id.'&action=view', 1).'">'.img_picto('','object_list.png','',0).' '.$title.'</a>';
+        return $i->getNomUrl();
         
     }
 	
@@ -309,7 +318,7 @@ class Inventory extends CoreObject
 		
 		if($type=='All') {
 			
-			$sql="SELECT i.rowid, e.label, i.date_inventory, i.fk_warehouse, i.date_cre, i.date_maj, i.status
+			$sql="SELECT i.rowid, e.label, i.date_inventory, i.fk_warehouse, i.datec, i.tms, i.status
 				  FROM ".MAIN_DB_PREFIX."inventory i
 				  LEFT JOIN ".MAIN_DB_PREFIX."entrepot e ON (e.rowid = i.fk_warehouse)
 				  WHERE i.entity=".(int) $conf->entity;

From efc22a4cd8b8dc4b6ea9c6be07c37eba0466def6 Mon Sep 17 00:00:00 2001
From: Alexis Algoud <alexis@atm-consulting.fr>
Date: Tue, 13 Dec 2016 09:49:59 +0100
Subject: [PATCH 006/505] include default list conception

---
 htdocs/core/class/coreobject.class.php     |   7 +-
 htdocs/core/class/listview.class.php       | 159 +++++++++++++--------
 htdocs/inventory/class/inventory.class.php |  11 +-
 3 files changed, 113 insertions(+), 64 deletions(-)

diff --git a/htdocs/core/class/coreobject.class.php b/htdocs/core/class/coreobject.class.php
index dc52fdd9bf5..96cbbb89a88 100644
--- a/htdocs/core/class/coreobject.class.php
+++ b/htdocs/core/class/coreobject.class.php
@@ -27,6 +27,8 @@ class CoreObject extends CommonObject {
 	
 	public $db;
 	
+	public $withChild = true;
+	
 	protected $__fields=array(); 
 	 /**
 	 *  Constructor
@@ -216,7 +218,7 @@ class CoreObject extends CommonObject {
 		$sql = 'SELECT '.$this->get_field_list().',datec,tms
 						FROM '.MAIN_DB_PREFIX.$this->table_element.'
 						WHERE rowid='.$id;
-				var_dump($sql);		
+		
 		$res = $this->db->query( $sql );
 				
 		if($obj = $this->db->fetch_object($res)) {
@@ -238,8 +240,8 @@ class CoreObject extends CommonObject {
 	}
 	
 	public function fetchChild() {
-		if($this->withChild && !empty($this->childtables) && !empty($this->fk_element)) {
 
+		if($this->withChild && !empty($this->childtables) && !empty($this->fk_element)) {
 			foreach($this->childtables as &$childTable) {
 					
 					$className = ucfirst($childTable);
@@ -248,6 +250,7 @@ class CoreObject extends CommonObject {
 					
 					$sql = " SELECT rowid FROM ".MAIN_DB_PREFIX.$childTable." WHERE ".$this->fk_element."=".$this->rowid;
 					$res = $this->db->query($sql);
+					
 					if($res) {
 						
 						while($obj = $db->fetch_object($res)) {
diff --git a/htdocs/core/class/listview.class.php b/htdocs/core/class/listview.class.php
index 8df337b699c..db66f9f15a3 100644
--- a/htdocs/core/class/listview.class.php
+++ b/htdocs/core/class/listview.class.php
@@ -41,33 +41,30 @@ class Listview {
 		if(!isset($TParam['orderby']['noOrder']))$TParam['orderby']['noOrder']=array();
 		if(!isset($TParam['no-select'])) $TParam['no-select'] = 1;
 		
-		if(!isset($TParam['liste']))$TParam['liste']=array();
-		$TParam['liste'] = array_merge(array(
-			'messageNothing'=>"Il n'y a aucun élément à afficher."
-			,'picto_precedent'=>'&lt;'
-			,'picto_suivant'=>'&gt;'
-			,'order_down'=>img_down()
-			,'order_up'=>img_up()
+		if(!isset($TParam['list']))$TParam['list']=array();
+		$TParam['list'] = array_merge(array(
+			'messageNothing'=>$langs->trans('ListMessageNothingToShow')
 			,'noheader'=>0
 			,'useBottomPagination'=>0
 			,'image'=>''
-			,'titre'=>'Liste'
+			,'title'=>$langs->trans('List')
 			,'orderDown'=>''
 			,'orderUp'=>''
 			,'id'=>$this->id
-			,'picto_search'=>img_picto('Search', 'search.png')
 			,'head_search'=>''
 			,'export'=>array()
-			,'view_type'=>''
-		),$TParam['liste']);
+			,'view_type'=>'' //TODO to include graph or kanban instead of list
+		),$TParam['list']);
+		
+		$POSTList = GETPOST('Listview');
 		
 		if(empty($TParam['limit']))$TParam['limit']=array();
-		if(!empty($_REQUEST['TListTBS'][$this->id]['page'])) $TParam['limit']['page'] = $_REQUEST['TListTBS'][$this->id]['page'];
+		if(!empty($POSTList[$this->id]['page'])) $TParam['limit']['page'] = $POSTList[$this->id]['page'];
 		
 		$TParam['limit']=array_merge(array('page'=>1, 'nbLine'=>$conf->liste_limit, 'global'=>0), $TParam['limit']);
 		
-		if(!empty($_REQUEST['TListTBS'][$this->id]['orderBy'])) {
-			$TParam['orderBy'] = $_REQUEST['TListTBS'][$this->id]['orderBy']; 
+		if(!empty($POSTList[$this->id]['orderBy'])) {
+			$TParam['orderBy'] = $POSTList[$this->id]['orderBy']; 
 		}
 		
 	//	print_r($TParam);
@@ -124,9 +121,9 @@ class Listview {
 			// Si le type de "recherche" est "calendars" on a 2 champs de transmis, [début et fin] ou [que début] ou [que fin] => un BETWEEN Sql serait utile que dans le 1er cas 
 			// donc l'utilisation des opérateur >= et <= permettent un fonctionnement générique
 			$TSQLDate=array();
-			if(!empty($value['deb']))
+			if(!empty($value['start']))
 			{
-				$valueDeb = $this->dateToSQLDate($value['deb']);
+				$valueDeb = $this->dateToSQLDate($value['start']);
 				
 				if(isset($this->TBind[$sBindKey.'_start'])) // TODO can't use this in query case
 				{
@@ -137,9 +134,9 @@ class Listview {
 				
 			}
 			
-			if(!empty($value['fin']))
+			if(!empty($value['end']))
 			{
-				$valueFin = $this->dateToSQLDate($value['fin']);
+				$valueFin = $this->dateToSQLDate($value['end']);
 				if(isset($this->TBind[$sBindKey.'_end'])) { // TODO can't use this in query case
 					$this->TBind[$sBindKey.'_end'] = $valueFin;
 				}
@@ -198,7 +195,7 @@ class Listview {
 
 	private function search($sql,&$TParam) {
 	
-		if(!empty($_REQUEST['TListTBS'][$this->id]['search'])) {
+		if(!empty($_REQUEST['Listview'][$this->id]['search'])) {
 			$sqlGROUPBY='';
 			if(strpos($sql,'GROUP BY')!==false) { //TODO regex
 				list($sql, $sqlGROUPBY) = explode('GROUP BY', $sql);
@@ -206,7 +203,7 @@ class Listview {
 			
 			if(strpos($sql,'WHERE ')===false)$sql.=' WHERE 1 '; //TODO regex
 			
-			foreach($_REQUEST['TListTBS'][$this->id]['search'] as $key=>$value)
+			foreach($_REQUEST['Listview'][$this->id]['search'] as $key=>$value)
 			{
 				$TsKey = $this->getSearchKey($key, $TParam);
 				$TsBindKey = $this->getTsBindKey($TsKey);
@@ -222,7 +219,7 @@ class Listview {
 					//if (!empty($value)) var_dump($sKey);
 					$sBindKey = $TsBindKey[$i];
 					
-					if($allow_is_null && !empty($_REQUEST['TListTBS'][$this->id]['search_on_null'][$key]))
+					if($allow_is_null && !empty($_REQUEST['Listview'][$this->id]['search_on_null'][$key]))
 					{
 						$this->TBind[$sBindKey.'_null'] = $sKey.' IS NULL ';
 						$TSQLMore[] = $sKey.' IS NULL ';
@@ -302,31 +299,31 @@ class Listview {
 		foreach($TParam['search'] as $key=>$param_search) {
 			
 		
-			$value = isset($_REQUEST['TListTBS'][$this->id]['search'][$key]) ? $_REQUEST['TListTBS'][$this->id]['search'][$key] : '';
+			$value = isset($_REQUEST['Listview'][$this->id]['search'][$key]) ? $_REQUEST['Listview'][$this->id]['search'][$key] : '';
 			
 			$typeRecherche = (is_array($param_search) && isset($param_search['recherche'])) ? $param_search['recherche'] : $param_search;  
 			
 			if(is_array($typeRecherche)) {
 				$typeRecherche = array(''=>' ') + $typeRecherche;
-				$fsearch=$form->combo('','TListTBS['.$this->id.'][search]['.$key.']', $typeRecherche,$value,0,'',' listviewtbs="combo" init-value="'.$value.'" ');
+				$fsearch=$form->combo('','Listview['.$this->id.'][search]['.$key.']', $typeRecherche,$value,0,'',' listviewtbs="combo" init-value="'.$value.'" ');
 			}
 			else if($typeRecherche==='calendar') {
-				$fsearch=$form->calendrier('','TListTBS['.$this->id.'][search]['.$key.']',$value,10,10,' listviewtbs="calendar" ');	
+				$fsearch=$form->calendrier('','Listview['.$this->id.'][search]['.$key.']',$value,10,10,' listviewtbs="calendar" ');	
 			}
 			else if($typeRecherche==='calendars') {
-				$fsearch=$form->calendrier('','TListTBS['.$this->id.'][search]['.$key.'][deb]',isset($value['deb'])?$value['deb']:'',10,10,' listviewtbs="calendars" ')
-					.' '.$form->calendrier('','TListTBS['.$this->id.'][search]['.$key.'][fin]',isset($value['fin'])?$value['fin']:'',10,10,' listviewtbs="calendars" ');	
+				$fsearch=$form->calendrier('','Listview['.$this->id.'][search]['.$key.'][start]',isset($value['start'])?$value['start']:'',10,10,' listviewtbs="calendars" ')
+					.' '.$form->calendrier('','Listview['.$this->id.'][search]['.$key.'][end]',isset($value['end'])?$value['end']:'',10,10,' listviewtbs="calendars" ');	
 			}
 			else if(is_string($typeRecherche)) {
 				$fsearch=$TParam['search'][$key];	
 			}
 			else {
-				$fsearch=$form->texte('','TListTBS['.$this->id.'][search]['.$key.']',$value,15,255,' listviewtbs="input" ');	
+				$fsearch=$form->texte('','Listview['.$this->id.'][search]['.$key.']',$value,15,255,' listviewtbs="input" ');	
 			}
 
 			if(!empty($param_search['allow_is_null'])) {
-				$valueNull = isset($_REQUEST['TListTBS'][$this->id]['search_on_null'][$key]) ? 1 : 0;
-				$fsearch.=' '.$form->checkbox1('', 'TListTBS['.$this->id.'][search_on_null]['.$key.']',1, $valueNull,' onclick=" if($(this).is(\':checked\')){ $(this).prev().val(\'\'); }" ').img_help(1, $langs->trans('SearchOnNUllValue'));
+				$valueNull = isset($_REQUEST['Listview'][$this->id]['search_on_null'][$key]) ? 1 : 0;
+				$fsearch.=' '.$form->checkbox1('', 'Listview['.$this->id.'][search_on_null]['.$key.']',1, $valueNull,' onclick=" if($(this).is(\':checked\')){ $(this).prev().val(\'\'); }" ').img_help(1, $langs->trans('SearchOnNUllValue'));
 			}
 			
 
@@ -342,7 +339,7 @@ class Listview {
 				
 		}
 		
-		$search_button = ' <a href="#" onclick="TListTBS_submitSearch(this);" class="list-search-link">'.$TParam['liste']['picto_search'].'</a>';
+		$search_button = ' <a href="#" onclick="ListviewsubmitSearch(this);" class="list-search-link">'.$TParam['liste']['picto_search'].'</a>';
 
 		if(!empty($TParam['liste']['head_search'])) {
 			$TParam['liste']['head_search'].='<div align="right">'.$langs->trans('Search').' '.$search_button.'</div>';
@@ -519,22 +516,77 @@ class Listview {
 		$TExport=$this->setExport($TParam, $TField, $THeader);
 		$TField = $this->addTotalGroup($TField,$TTotalGroup);
 		
-		var_dump(
-			array(
-				'entete'=>$THeader
-				,'champs'=>$TField
-				,'recherche'=>$TSearch
-				,'total'=>$TTotal
-				,'export'=>$TExport
-			)
-			, array(
-				'liste'=>array_merge(array('haveExport'=>count($TExport), 'id'=>$this->id, 'nb_columns'=>count($THeader) ,'totalNB'=>count($TField), 'nbSearch'=>count($TSearch), 'haveTotal'=>(int)!empty($TTotal), 'havePage'=>(int)!empty($TPagination) ), $TParam['liste'])
-			)
-			, $TPagination
-			
-		);
+		$out = $javaScript;
 		
-		$javaScript;
+		$out.=load_fiche_titre($TParam['list']['title']);
+		print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, count($TField), 'title_products.png', 0, '', '', $limit);
+		/*
+		$out.='<table width="100%" border="0" class="notopnoleftnoright" style="margin-bottom: 2px;">
+				<tr>
+					[onshow;block=begin; when [liste.noheader]==0]
+					<td class="nobordernopadding" width="40" align="left" valign="middle">
+						[liste.image;magnet=img; strconv=no]
+					</td>
+					<td class="nobordernopadding"><div class="titre">[liste.titre; strconv=no]</div></td>
+					[onshow;block=end]
+					<td class="nobordernopadding" align="right" valign="middle">
+						<div class="pagination"> 
+							[onshow;block=div; when [liste.havePage]+-0 ]
+							<!-- [onshow;block=div;when [pagination.last]+-1 ] -->
+							<ul style="display: inline-block; list-style: outside none none;">
+								<li class="pagination" style="display: inline-block;"><a class="paginationprevious" href="javascript:TListTBS_GoToPage('[liste.id]',[pagination.prev])"><!-- [pagination.prev;endpoint;magnet=li] --> [liste.picto_precedent;strconv=no] </a></li>
+								<li class="pagination" style="display: inline-block;"><a class="page" href="javascript:TListTBS_GoToPage('[liste.id]',[pagination.page;navsize=15;navpos=centred])"> [pagination.page;block=li] </a></li>
+								<li class="pagination" style="display: inline-block;"><span class="active"> [pagination.page;block=li;currpage] </span></li>
+								<li class="pagination" style="display: inline-block;"><a class="paginationnext" href="javascript:TListTBS_GoToPage('[liste.id]',[pagination.next])"><!-- [pagination.last;endpoint;magnet=li] --> [liste.picto_suivant;strconv=no] </a></li>
+							</ul>
+						</div>
+					</td>
+				</tr>
+		</table>	
+		
+		<table id="[liste.id]" class="liste" width="100%">
+			<thead>
+				<tr class="liste_titre barre-recherche-head">
+					<td colspan="[liste.nb_columns]">[liste.head_search;strconv=no;magnet=tr]</td>
+				</tr>
+				<tr class="liste_titre">
+					<th style="width:[entete.width;];text-align:[entete.text-align]" class="liste_titre">[entete.libelle;block=th;strconv=no] 
+						<span class="nowrap">[onshow;block=span; when [entete.order]==1]<a href="javascript:TListTBS_OrderDown('[liste.id]','[entete.$;strconv=js]')">[liste.order_down;strconv=no]</a><a href="javascript:TListTBS_OrderUp('[liste.id]', '[entete.$;strconv=js]')">[liste.order_up;strconv=no]</a></span>
+						[entete.more;strconv=no;]
+					</th>
+				</tr>
+				
+				<tr class="liste_titre barre-recherche">[onshow;block=tr;when [liste.nbSearch]+-0]
+					<td class="liste_titre">[recherche.val;block=td;strconv=no]</td>
+				</tr>
+			
+			</thead>
+			<tbody>
+				<tr class="impair">
+					<!-- [champs.$;block=tr;sub1] -->
+					<td field="[champs_sub1.$]">[champs_sub1.val;block=td; strconv=no]</td>
+				</tr>
+				<tr class="pair">
+					<!-- [champs.$;block=tr;sub1] -->
+					<td field="[champs_sub1.$]">[champs_sub1.val;block=td; strconv=no]</td>
+				</tr>
+			</tbody>
+			<tfoot>
+				<tr class="liste_total">
+					[onshow;block=tr; when [liste.haveTotal]+-0 ]
+					<td align="right" field="[total.$]">[total.val;block=td;strconv=no;frm=0 000,00]</td>
+				</tr>
+			</tfoot>
+			
+		</table>
+		
+		<div class="tabsAction">
+			[onshow;block=div; when [liste.haveExport]+-0 ]
+			<a href="javascript:;" onclick="TListTBS_downloadAs(this, '[export.mode]','[export.url]','[export.token]','[export.session_name]');" class="butAction">[export.label;block=a;]</a>
+		</div>
+		<p align="center">
+			[liste.messageNothing;strconv=no] [onshow; block=p;  when [liste.totalNB]==0]
+		</p>';*/
 	}
 	
 	public function renderArray(&$db,$TField, $TParam=array()) {
@@ -611,14 +663,14 @@ class Listview {
 		global $user;
 		
 		$contextpage=md5($_SERVER['PHP_SELF']);
-		if((float)DOL_VERSION>=4.0 && empty($TParam['no-select'])) {
+		if(empty($TParam['no-select'])) {
 			
 			dol_include_once('/core/class/html.form.class.php');
 			
 			global $db,$conf,$user;
 			$form=new Form($db);
 				
-			$selectedfields = GETPOST('TListTBS_'.$this->id.'_selectedfields');
+			$selectedfields = GETPOST('Listview'.$this->id.'_selectedfields');
 			
 			if(!empty($selectedfields)) {
 				include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
@@ -662,7 +714,7 @@ class Listview {
 				}
 			}	
 
-			$selectedfields=$form->multiSelectArrayWithCheckbox('TListTBS_'.$this->id.'_selectedfields', $TFieldVisibility, $contextpage);	// This also change content of $arrayfields_0
+			$selectedfields=$form->multiSelectArrayWithCheckbox('Listview'.$this->id.'_selectedfields', $TFieldVisibility, $contextpage);	// This also change content of $arrayfields_0
 			
 		}
 		
@@ -721,17 +773,6 @@ class Listview {
 						else $value=(string)$value;
 					} 
 					
-					if(isset($TParam['subQuery'][$field])) {
-						$dbSub = new TPDOdb; //TODO finish it
-						$dbSub->Execute( strtr($TParam['subQuery'][$field], array_merge( $trans, array('@val@'=>$value)  )) );
-						$subResult = '';
-						while($dbSub->Get_line()) {
-							$subResult.= implode(', ',$dbSub->currentLine).'<br />';
-						}
-						$value=$subResult;
-						$dbSub->close();
-					}
-					
 					$trans['@'.$field.'@'] = $value;
 					
 					if(!empty($TParam['math'][$field])) {
diff --git a/htdocs/inventory/class/inventory.class.php b/htdocs/inventory/class/inventory.class.php
index d092a876ad2..59ad70cec4e 100644
--- a/htdocs/inventory/class/inventory.class.php
+++ b/htdocs/inventory/class/inventory.class.php
@@ -87,7 +87,8 @@ class Inventory extends CoreObject
 	
 	function sort_det() 
 	{
-		usort($this->Inventorydet, array('Inventory', 'customSort'));
+
+		if(!empty($this->Inventorydet))	usort($this->Inventorydet, array('Inventory', 'customSort'));
 	}
 	
 	function fetch($id,$annexe = true) 
@@ -99,8 +100,12 @@ class Inventory extends CoreObject
 		$this->sort_det();
 		
 		$this->amount = 0;
-		foreach($this->Inventorydet as &$det){
-			$this->amount+=$det->qty_view * $det->pmp;
+		
+		if(!empty($this->Inventorydet ))  {
+			foreach($this->Inventorydet as &$det){
+				$this->amount+=$det->qty_view * $det->pmp;
+			}
+			
 		}
 		
 		return $res;

From a636d27ccbfc1e5ea59862af1d7e909b382ffff7 Mon Sep 17 00:00:00 2001
From: Alexis Algoud <alexis@atm-consulting.fr>
Date: Wed, 14 Dec 2016 14:34:12 +0100
Subject: [PATCH 007/505] Div

---
 htdocs/core/class/coreobject.class.php     |  22 +-
 htdocs/core/class/listview.class.php       | 144 ++--
 htdocs/core/lib/functions.lib.php          | 114 ++-
 htdocs/inventory/class/inventory.class.php |  24 +-
 htdocs/inventory/img/inventory.png         | Bin 0 -> 1802 bytes
 htdocs/inventory/inventory.php             | 797 +++++++++++++++++++++
 htdocs/inventory/lib/inventory.lib.php     | 245 +++++++
 htdocs/inventory/tpl/inventory.tpl.php     | 211 ++++++
 8 files changed, 1433 insertions(+), 124 deletions(-)
 create mode 100644 htdocs/inventory/img/inventory.png
 create mode 100644 htdocs/inventory/inventory.php
 create mode 100644 htdocs/inventory/lib/inventory.lib.php
 create mode 100644 htdocs/inventory/tpl/inventory.tpl.php

diff --git a/htdocs/core/class/coreobject.class.php b/htdocs/core/class/coreobject.class.php
index 96cbbb89a88..b7e4b2770e3 100644
--- a/htdocs/core/class/coreobject.class.php
+++ b/htdocs/core/class/coreobject.class.php
@@ -1,5 +1,7 @@
 <?php
-/* Copyright (C) 2016		ATM Consulting			<support@atm-consulting.fr>
+/* EXPERIMENTAL
+ * 
+ * Copyright (C) 2016		ATM Consulting			<support@atm-consulting.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
@@ -220,9 +222,8 @@ class CoreObject extends CommonObject {
 						WHERE rowid='.$id;
 		
 		$res = $this->db->query( $sql );
-				
 		if($obj = $this->db->fetch_object($res)) {
-				$this->rowid=$id;
+				$this->id=$id;
 			
 				$this->set_vars_by_db($obj);
 
@@ -248,12 +249,12 @@ class CoreObject extends CommonObject {
 					
 					$this->{$className}=array();
 					
-					$sql = " SELECT rowid FROM ".MAIN_DB_PREFIX.$childTable." WHERE ".$this->fk_element."=".$this->rowid;
+					$sql = " SELECT rowid FROM ".MAIN_DB_PREFIX.$childTable." WHERE ".$this->fk_element."=".$this->id;
 					$res = $this->db->query($sql);
 					
 					if($res) {
-						
-						while($obj = $db->fetch_object($res)) {
+						$Tab=array();
+						while($obj = $this->db->fetch_object($res)) {
 							
 							$o=new $className($this->db);	
 							$o->fetch($obj->rowid);
@@ -282,5 +283,14 @@ class CoreObject extends CommonObject {
 		
 	}
 	
+	public function get_date($field,$format='') {
+		if(empty($this->{$field})) return '';
+		elseif($this->{$field}<=strtotime('1000-01-01 00:00:00')) return '';
+		else {
+			return dol_print_date($this->{$field}, $format);
+		}
+	
+	}
+	
 	
 }
diff --git a/htdocs/core/class/listview.class.php b/htdocs/core/class/listview.class.php
index db66f9f15a3..e94a648ec27 100644
--- a/htdocs/core/class/listview.class.php
+++ b/htdocs/core/class/listview.class.php
@@ -1,7 +1,8 @@
 <?php
 /*
+ EXPERIMENTAL
  
- Copyright (C) 2013-2015 ATM Consulting <support@atm-consulting.fr>
+ Copyright (C) 2016 ATM Consulting <support@atm-consulting.fr>
 
  This program and all files within this directory and sub directory
  is free software: you can redistribute it and/or modify it under 
@@ -505,88 +506,91 @@ class Listview {
 	}
 	
 	private function renderList(&$THeader, &$TField, &$TTotal,&$TTotalGroup, &$TParam) {
-			
+		
 		$javaScript = $this->getJS($TParam);
 		
-		$TPagination=array(
+		/*$TPagination=array(
 			'pagination'=>array('pageSize'=>$TParam['limit']['nbLine'], 'pageNum'=>$TParam['limit']['page'], 'blockName'=>'champs', 'totalNB'=>count($TField))
-		);
+		);*/
 		
 		$TSearch = $this->setSearch($THeader, $TParam);
 		$TExport=$this->setExport($TParam, $TField, $THeader);
 		$TField = $this->addTotalGroup($TField,$TTotalGroup);
 		
 		$out = $javaScript;
+		$out.=load_fiche_titre($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $TParam['limit']['page'], count($TField), 'title_products.png', 0, '', '', $limit);
+		$out.='<table id="'.$this->id.'" class="liste" width="100%">
+			<thead>';
 		
-		$out.=load_fiche_titre($TParam['list']['title']);
-		print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, count($TField), 'title_products.png', 0, '', '', $limit);
-		/*
-		$out.='<table width="100%" border="0" class="notopnoleftnoright" style="margin-bottom: 2px;">
-				<tr>
-					[onshow;block=begin; when [liste.noheader]==0]
-					<td class="nobordernopadding" width="40" align="left" valign="middle">
-						[liste.image;magnet=img; strconv=no]
-					</td>
-					<td class="nobordernopadding"><div class="titre">[liste.titre; strconv=no]</div></td>
-					[onshow;block=end]
-					<td class="nobordernopadding" align="right" valign="middle">
-						<div class="pagination"> 
-							[onshow;block=div; when [liste.havePage]+-0 ]
-							<!-- [onshow;block=div;when [pagination.last]+-1 ] -->
-							<ul style="display: inline-block; list-style: outside none none;">
-								<li class="pagination" style="display: inline-block;"><a class="paginationprevious" href="javascript:TListTBS_GoToPage('[liste.id]',[pagination.prev])"><!-- [pagination.prev;endpoint;magnet=li] --> [liste.picto_precedent;strconv=no] </a></li>
-								<li class="pagination" style="display: inline-block;"><a class="page" href="javascript:TListTBS_GoToPage('[liste.id]',[pagination.page;navsize=15;navpos=centred])"> [pagination.page;block=li] </a></li>
-								<li class="pagination" style="display: inline-block;"><span class="active"> [pagination.page;block=li;currpage] </span></li>
-								<li class="pagination" style="display: inline-block;"><a class="paginationnext" href="javascript:TListTBS_GoToPage('[liste.id]',[pagination.next])"><!-- [pagination.last;endpoint;magnet=li] --> [liste.picto_suivant;strconv=no] </a></li>
-							</ul>
-						</div>
-					</td>
-				</tr>
-		</table>	
+		if(!empty($TParam['liste']['head_search'])) {
+			$out.='<tr class="liste_titre barre-recherche-head">
+					<td colspan="'.$TParam['liste']['nb_columns'].'">'.$TParam['liste']['head_search'].'</td>
+				</tr>';
+		}
+			
+		$out.='<tr class="liste_titre">';
 		
-		<table id="[liste.id]" class="liste" width="100%">
-			<thead>
-				<tr class="liste_titre barre-recherche-head">
-					<td colspan="[liste.nb_columns]">[liste.head_search;strconv=no;magnet=tr]</td>
-				</tr>
-				<tr class="liste_titre">
-					<th style="width:[entete.width;];text-align:[entete.text-align]" class="liste_titre">[entete.libelle;block=th;strconv=no] 
-						<span class="nowrap">[onshow;block=span; when [entete.order]==1]<a href="javascript:TListTBS_OrderDown('[liste.id]','[entete.$;strconv=js]')">[liste.order_down;strconv=no]</a><a href="javascript:TListTBS_OrderUp('[liste.id]', '[entete.$;strconv=js]')">[liste.order_up;strconv=no]</a></span>
-						[entete.more;strconv=no;]
-					</th>
-				</tr>
+		foreach($THeader as $head) {
+			$out.='<th style="width:'.$head['width'].';text-align:'.$head['text-align'].'" class="liste_titre">'.$head['libelle'];
+						
+			if($head['order']) $out.='<span class="nowrap">[onshow;block=span; when [entete.order]==1]<a href="javascript:Listview_OrderDown(\'[liste.id]\',\'[entete.$;strconv=js]\')">'.img_down().'</a>
+								<a href="javascript:Listview_OrderUp(\'[liste.id]\', \'[entete.$;strconv=js]\')">'.img_up().'</a></span>';
+			
+			$out.=$head['more'];
+			$out.='</th>';
+		}
+		
+		$out.='</tr>';
+			
+		if(!empty($TParam['liste']['nbSearch'])) {
+		$out.='<tr class="liste_titre barre-recherche">
+					<td class="liste_titre">'.img_search().'</td>
+				</tr>';
+		}
 				
-				<tr class="liste_titre barre-recherche">[onshow;block=tr;when [liste.nbSearch]+-0]
-					<td class="liste_titre">[recherche.val;block=td;strconv=no]</td>
-				</tr>
-			
-			</thead>
-			<tbody>
-				<tr class="impair">
-					<!-- [champs.$;block=tr;sub1] -->
-					<td field="[champs_sub1.$]">[champs_sub1.val;block=td; strconv=no]</td>
-				</tr>
-				<tr class="pair">
-					<!-- [champs.$;block=tr;sub1] -->
-					<td field="[champs_sub1.$]">[champs_sub1.val;block=td; strconv=no]</td>
-				</tr>
-			</tbody>
-			<tfoot>
-				<tr class="liste_total">
-					[onshow;block=tr; when [liste.haveTotal]+-0 ]
-					<td align="right" field="[total.$]">[total.val;block=td;strconv=no;frm=0 000,00]</td>
-				</tr>
-			</tfoot>
-			
-		</table>
+		$out.='</thead><tbody>';
 		
-		<div class="tabsAction">
-			[onshow;block=div; when [liste.haveExport]+-0 ]
-			<a href="javascript:;" onclick="TListTBS_downloadAs(this, '[export.mode]','[export.url]','[export.token]','[export.session_name]');" class="butAction">[export.label;block=a;]</a>
-		</div>
-		<p align="center">
-			[liste.messageNothing;strconv=no] [onshow; block=p;  when [liste.totalNB]==0]
-		</p>';*/
+		$class='pair';
+		
+		if(empty($TField)) {
+			$out.='<tr class="'.$class.'">
+					<td colspan="'.$TParam['liste']['nb_columns'].'">'.$TParam['liste']['messageNothing'].'</td></tr>';
+			
+		}
+		else{
+			
+			foreach($TField as $fields) { //TODO pagination limit
+					
+				$class = ($class=='pair') ? 'impair' : 'pair';
+				$out.='<tr class="'.$class.'"> <!-- '.$field.' -->';
+			
+				foreach($fields as $field=>$value) {
+					$out.='<td field="'.$field.'">'.$value.'</td>';
+				}
+					
+				$out.='</tr>';
+					
+			}
+			
+			$out.='</tbody>';
+			
+			if(!empty($TParam['liste']['haveTotal'])) {
+				$out.='<tfoot>
+				<tr class="liste_total">';
+			
+				foreach($TTotal as $field=>$total) {
+					$out.='<td align="right" field="'.$field.'">'.price($total).'</td>';
+				}
+					
+				$out.='</tr></tfoot>';
+			}
+				
+		}
+		
+			
+		$out.='</table>';
+		
+		return $out;
 	}
 	
 	public function renderArray(&$db,$TField, $TParam=array()) {
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 082177b5cbc..c4b21e4ee82 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3157,7 +3157,7 @@ function load_fiche_titre($titre, $morehtmlright='', $picto='title_generic.png',
 }
 
 /**
- *	Print a title with navigation controls for pagination
+ *	return a title with navigation controls for pagination
  *
  *	@param	string	    $titre				Title to show (required)
  *	@param	int   	    $page				Numero of page to show in navigation links (required)
@@ -3176,7 +3176,7 @@ function load_fiche_titre($titre, $morehtmlright='', $picto='title_generic.png',
  *  @param  int         $hideselectlimit    Force to hide select limit
  *	@return	void
  */
-function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $sortorder='', $center='', $num=-1, $totalnboflines=-1, $picto='title_generic.png', $pictoisfullpath=0, $morehtml='', $morecss='', $limit=-1, $hideselectlimit=0)
+function load_barre_liste($titre, $page, $file, $options='', $sortfield='', $sortorder='', $center='', $num=-1, $totalnboflines=-1, $picto='title_generic.png', $pictoisfullpath=0, $morehtml='', $morecss='', $limit=-1, $hideselectlimit=0)
 {
 	global $conf,$langs;
 	
@@ -3196,27 +3196,26 @@ function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $so
 		$nextpage = 0;
 	}
 	//print 'totalnboflines='.$totalnboflines.'-savlimit='.$savlimit.'-limit='.$limit.'-num='.$num.'-nextpage='.$nextpage;
-	
-	print "\n";
-	print "<!-- Begin title '".$titre."' -->\n";
-	print '<table width="100%" border="0" class="notopnoleftnoright'.($morecss?' '.$morecss:'').'" style="margin-bottom: 6px;"><tr>';
+	$out = "\n";
+	$out.= "<!-- Begin title '".$titre."' -->\n";
+	$out.='<table width="100%" border="0" class="notopnoleftnoright'.($morecss?' '.$morecss:'').'" style="margin-bottom: 6px;"><tr>';
 
 	// Left
-	//if ($picto && $titre) print '<td class="nobordernopadding hideonsmartphone" width="40" align="left" valign="middle">'.img_picto('', $picto, 'id="pictotitle"', $pictoisfullpath).'</td>';
-	print '<td class="nobordernopadding valignmiddle">';
-	if ($picto && $titre) print img_picto('', $picto, 'class="hideonsmartphone valignmiddle" id="pictotitle"', $pictoisfullpath);
-	print '<div class="titre inline-block">'.$titre;
-	if (!empty($titre) && $savtotalnboflines >= 0) print ' ('.$totalnboflines.')';
-	print '</div></td>';
+	//if ($picto && $titre) $out.='<td class="nobordernopadding hideonsmartphone" width="40" align="left" valign="middle">'.img_picto('', $picto, 'id="pictotitle"', $pictoisfullpath).'</td>';
+	$out.='<td class="nobordernopadding valignmiddle">';
+	if ($picto && $titre) $out.=img_picto('', $picto, 'class="hideonsmartphone valignmiddle" id="pictotitle"', $pictoisfullpath);
+	$out.='<div class="titre inline-block">'.$titre;
+	if (!empty($titre) && $savtotalnboflines >= 0) $out.=' ('.$totalnboflines.')';
+	$out.='</div></td>';
 
 	// Center
 	if ($center)
 	{
-		print '<td class="nobordernopadding center valignmiddle">'.$center.'</td>';
+		$out.='<td class="nobordernopadding center valignmiddle">'.$center.'</td>';
 	}
 
 	// Right
-	print '<td class="nobordernopadding valignmiddle" align="right">';
+	$out.='<td class="nobordernopadding valignmiddle" align="right">';
 	if ($sortfield) $options .= "&amp;sortfield=".$sortfield;
 	if ($sortorder) $options .= "&amp;sortorder=".$sortorder;
 	// Show navigation bar
@@ -3265,15 +3264,39 @@ function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $so
 			$pagelist.= '<li'.(($conf->dol_use_jmobile != 4)?' class="pagination"':'').'><span '.(($conf->dol_use_jmobile != 4)?'class="active"':'data-role="button"').'>'.($page+1)."</li>";
 		}
 	}
-	print_fleche_navigation($page, $file, $options, $nextpage, $pagelist, $morehtml, $savlimit, $totalnboflines, $hideselectlimit);		// output the div and ul for previous/last completed with page numbers into $pagelist
-	print '</td>';
+	$out.=load_fleche_navigation($page, $file, $options, $nextpage, $pagelist, $morehtml, $savlimit, $totalnboflines, $hideselectlimit);		// output the div and ul for previous/last completed with page numbers into $pagelist
+	$out.='</td>';
 
-	print '</tr></table>'."\n";
-	print "<!-- End title -->\n\n";
+	$out.='</tr></table>'."\n";
+	$out.="<!-- End title -->\n\n";
+}
+/**
+ *	Print a title with navigation controls for pagination
+ *
+ *	@param	string	    $titre				Title to show (required)
+ *	@param	int   	    $page				Numero of page to show in navigation links (required)
+ *	@param	string	    $file				Url of page (required)
+ *	@param	string	    $options         	More parameters for links ('' by default, does not include sortfield neither sortorder)
+ *	@param	string    	$sortfield       	Field to sort on ('' by default)
+ *	@param	string	    $sortorder       	Order to sort ('' by default)
+ *	@param	string	    $center          	String in the middle ('' by default). We often find here string $massaction comming from $form->selectMassAction() 
+ *	@param	int		    $num				Number of records found by select with limit+1
+ *	@param	int		    $totalnboflines		Total number of records/lines for all pages (if known). Use a negative value to not show number.
+ *	@param	string	    $picto				Icon to use before title (should be a 32x32 transparent png file)
+ *	@param	int		    $pictoisfullpath	1=Icon name is a full absolute url of image
+ *  @param	string	    $morehtml			More html to show
+ *  @param  string      $morecss            More css to the table
+ *  @param  int         $limit              Max number of lines (-1 = use default, 0 = no limit, > 0 = limit).
+ *  @param  int         $hideselectlimit    Force to hide select limit
+ *	@return	void
+ */
+function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $sortorder='', $center='', $num=-1, $totalnboflines=-1, $picto='title_generic.png', $pictoisfullpath=0, $morehtml='', $morecss='', $limit=-1, $hideselectlimit=0)
+{
+	echo load_barre_liste($titre, $page, $file, $options, $sortfield, $sortorder, $center, $num, $totalnboflines, $picto, $pictoisfullpath, $morehtml, $morecss, $limit, $hideselectlimit);
 }
 
 /**
- *	Function to show navigation arrows into lists
+ *	Function to return navigation arrows into lists
  *
  *	@param	int				$page				Number of page
  *	@param	string			$file				Page URL (in most cases provided with $_SERVER["PHP_SELF"])
@@ -3286,11 +3309,11 @@ function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $so
  *  @param  int             $hideselectlimit    Force to hide select limit
  *	@return	void
  */
-function print_fleche_navigation($page, $file, $options='', $nextpage=0, $betweenarrows='', $afterarrows='', $limit=-1, $totalnboflines=0, $hideselectlimit=0)
+function load_fleche_navigation($page, $file, $options='', $nextpage=0, $betweenarrows='', $afterarrows='', $limit=-1, $totalnboflines=0, $hideselectlimit=0)
 {
 	global $conf, $langs;
 
-	print '<div class="pagination"><ul>';
+	$out='<div class="pagination"><ul>';
 	if ((int) $limit >= 0 && empty($hideselectlimit))
 	{
 	    $pagesizechoices='10:10,20:20,30:30,40:40,50:50,100:100,250:250,500:500,1000:1000,5000:5000';
@@ -3298,8 +3321,8 @@ function print_fleche_navigation($page, $file, $options='', $nextpage=0, $betwee
 	    //$pagesizechoices.=',2:2';
 	    if (! empty($conf->global->MAIN_PAGESIZE_CHOICES)) $pagesizechoices=$conf->global->MAIN_PAGESIZE_CHOICES;
 	     
-        print '<li class="pagination">';
-        print '<select class="flat selectlimit" name="limit">';
+        $out.='<li class="pagination">';
+        $out.='<select class="flat selectlimit" name="limit">';
         $tmpchoice=explode(',',$pagesizechoices);
         $tmpkey=$limit.':'.$limit;
         if (! in_array($tmpkey, $tmpchoice)) $tmpchoice[]=$tmpkey;
@@ -3320,13 +3343,13 @@ function print_fleche_navigation($page, $file, $options='', $nextpage=0, $betwee
                     $selected = ' selected="selected"';
                     $found = true;
                 }
-                print '<option name="'.$key.'"'.$selected.'>'.dol_escape_htmltag($val).'</option>'."\n";
+                $out.='<option name="'.$key.'"'.$selected.'>'.dol_escape_htmltag($val).'</option>'."\n";
             }
         }
-        print '</select>';
+        $out.='</select>';
         if ($conf->use_javascript_ajax)
         {
-            print '<!-- JS CODE TO ENABLE select limit to launch submit of page -->
+            $out.='<!-- JS CODE TO ENABLE select limit to launch submit of page -->
             		<script type="text/javascript">
                 	jQuery(document).ready(function () {
             	  		jQuery(".selectlimit").change(function() {
@@ -3337,31 +3360,48 @@ function print_fleche_navigation($page, $file, $options='', $nextpage=0, $betwee
             		</script>
                 ';
         }
-        print '</li>';	    
+        $out.='</li>';	    
 	}
 	if ($page > 0)
 	{
-		if (($conf->dol_use_jmobile != 4)) print '<li class="pagination"><a class="paginationprevious" href="'.$file.'?page='.($page-1).$options.'"><</a></li>';
-		else print '<li><a data-role="button" data-icon="arrow-l" data-iconpos="left" href="'.$file.'?page='.($page-1).$options.'">'.$langs->trans("Previous").'</a></li>';
+		if (($conf->dol_use_jmobile != 4)) $out.='<li class="pagination"><a class="paginationprevious" href="'.$file.'?page='.($page-1).$options.'"><</a></li>';
+		else $out.='<li><a data-role="button" data-icon="arrow-l" data-iconpos="left" href="'.$file.'?page='.($page-1).$options.'">'.$langs->trans("Previous").'</a></li>';
 	}
 	if ($betweenarrows)
 	{
-		print $betweenarrows;
+		$out.=$betweenarrows;
 	}
 	if ($nextpage > 0)
 	{
-		if (($conf->dol_use_jmobile != 4)) print '<li class="pagination"><a class="paginationnext" href="'.$file.'?page='.($page+1).$options.'">></a></li>';
-		else print '<li><a data-role="button" data-icon="arrow-r" data-iconpos="right" href="'.$file.'?page='.($page+1).$options.'">'.$langs->trans("Next").'</a></li>';
+		if (($conf->dol_use_jmobile != 4)) $out.='<li class="pagination"><a class="paginationnext" href="'.$file.'?page='.($page+1).$options.'">></a></li>';
+		else $out.='<li><a data-role="button" data-icon="arrow-r" data-iconpos="right" href="'.$file.'?page='.($page+1).$options.'">'.$langs->trans("Next").'</a></li>';
 	}
 	if ($afterarrows)
 	{
-		print '<li class="paginationafterarrows">';
-		print $afterarrows;
-		print '</li>';
+		$out.='<li class="paginationafterarrows">';
+		$out.=$afterarrows;
+		$out.='</li>';
 	}
-	print '</ul></div>'."\n";
+	$out.='</ul></div>'."\n";
+}
+/**
+ *	Function to show navigation arrows into lists
+ *
+ *	@param	int				$page				Number of page
+ *	@param	string			$file				Page URL (in most cases provided with $_SERVER["PHP_SELF"])
+ *	@param	string			$options         	Other url paramaters to propagate ("" by default, may include sortfield and sortorder)
+ *	@param	integer			$nextpage	    	Do we show a next page button
+ *	@param	string			$betweenarrows		HTML content to show between arrows. MUST contains '<li> </li>' tags or '<li><span> </span></li>'.
+ *  @param	string			$afterarrows		HTML content to show after arrows. Must NOT contains '<li> </li>' tags.
+ *  @param  int             $limit              Max nb of record to show  (-1 = no combo with limit, 0 = no limit, > 0 = limit)
+ *	@param	int		        $totalnboflines		Total number of records/lines for all pages (if known)
+ *  @param  int             $hideselectlimit    Force to hide select limit
+ *	@return	void
+ */
+function print_fleche_navigation($page, $file, $options='', $nextpage=0, $betweenarrows='', $afterarrows='', $limit=-1, $totalnboflines=0, $hideselectlimit=0)
+{
+	echo load_fleche_navigation($page, $file, $options, $nextpage, $betweenarrows, $afterarrows, $limit, $totalnboflines, $hideselectlimit);
 }
-
 
 /**
  *	Return a string with VAT rate label formated for view output
diff --git a/htdocs/inventory/class/inventory.class.php b/htdocs/inventory/class/inventory.class.php
index 59ad70cec4e..2a485d24a0a 100644
--- a/htdocs/inventory/class/inventory.class.php
+++ b/htdocs/inventory/class/inventory.class.php
@@ -97,17 +97,20 @@ class Inventory extends CoreObject
         if(!$annexe) $this->withChild = false;
         
 		$res = parent::fetch($id);
-		$this->sort_det();
 		
-		$this->amount = 0;
-		
-		if(!empty($this->Inventorydet ))  {
-			foreach($this->Inventorydet as &$det){
-				$this->amount+=$det->qty_view * $det->pmp;
-			}
+		if($res>0) {
+			$this->sort_det();
 			
+			$this->amount = 0;
+			
+			if(!empty($this->Inventorydet ))  {
+				foreach($this->Inventorydet as &$det){
+					$this->amount+=$det->qty_view * $det->pmp;
+				}
+				
+			}
 		}
-		
+				
 		return $res;
 	}
 	
@@ -312,9 +315,8 @@ class Inventory extends CoreObject
         global $langs,$db;
         
         $i = new Inventory($db);
-        $i->fetch($id, false);
-        
-        return $i->getNomUrl();
+        if($i->fetch($id, false)>0) return $i->getNomUrl();
+        else return $langs->trans('InventoryUnableToFetchObject');
         
     }
 	
diff --git a/htdocs/inventory/img/inventory.png b/htdocs/inventory/img/inventory.png
new file mode 100644
index 0000000000000000000000000000000000000000..e54ad0eef7d76b373e8769153f9039a75681ab3b
GIT binary patch
literal 1802
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

literal 0
HcmV?d00001

diff --git a/htdocs/inventory/inventory.php b/htdocs/inventory/inventory.php
new file mode 100644
index 00000000000..d46f05059b4
--- /dev/null
+++ b/htdocs/inventory/inventory.php
@@ -0,0 +1,797 @@
+<?php
+/* Copyright (C) 2016		ATM Consulting			<support@atm-consulting.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
+ * 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/inventory/inventory.php
+ *	\ingroup    product
+ *	\brief      File of class to manage inventory
+ */
+ 
+require_once '../main.inc.php';
+
+ini_set('memory_limit', '512M');
+
+require_once DOL_DOCUMENT_ROOT.'/core/class/listview.class.php';
+require_once DOL_DOCUMENT_ROOT.'/inventory/class/inventory.class.php';
+require_once DOL_DOCUMENT_ROOT.'/inventory/lib/inventory.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+include_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
+
+set_time_limit(0);
+
+if(!$user->rights->inventory->read) accessforbidden();
+
+$langs->load("inventory");
+
+_action();
+
+function _action() 
+{
+	global $user, $db, $conf, $langs;	
+	
+	/*******************************************************************
+	* ACTIONS
+	*
+	* Put here all code to do according to value of "action" parameter
+	********************************************************************/
+
+	$action=GETPOST('action');
+	
+	switch($action) {
+		case 'list':
+			_list();
+
+			break;
+		
+		case 'create':
+			if (!$user->rights->inventory->create) accessforbidden();
+			
+			$inventory = new Inventory($db);
+			
+			_fiche_warehouse($user, $db, $conf, $langs, $inventory);
+
+			break;
+		
+		case 'confirmCreate':
+			if (!$user->rights->inventory->create) accessforbidden();
+			
+			
+			$inventory = new Inventory($db);
+			$inventory->set_values($_REQUEST);
+			
+            $fk_inventory = $inventory->save();
+            $fk_category = (int)GETPOST('fk_category');
+            $fk_supplier = (int)GETPOST('fk_supplier');
+            $fk_warehouse = (int)GETPOST('fk_warehouse');
+			$only_prods_in_stock = (int)GETPOST('OnlyProdsInStock');
+            
+			$e = new Entrepot($db);
+			$e->fetch($fk_warehouse);
+			$TChildWarehouses = array($fk_warehouse);
+			if(method_exists($e, 'get_children_warehouses')) $e->get_children_warehouses($fk_warehouse, $TChildWarehouses);
+			
+			$sql = 'SELECT ps.fk_product, ps.fk_entrepot 
+			     FROM '.MAIN_DB_PREFIX.'product_stock ps 
+			     INNER JOIN '.MAIN_DB_PREFIX.'product p ON (p.rowid = ps.fk_product) 
+                 LEFT JOIN '.MAIN_DB_PREFIX.'categorie_product cp ON (cp.fk_product = p.rowid)
+				 LEFT JOIN '.MAIN_DB_PREFIX.'product_fournisseur_price pfp ON (pfp.fk_product = p.rowid)
+			     WHERE ps.fk_entrepot IN ('.implode(', ', $TChildWarehouses).')';
+			
+            if($fk_category>0) $sql.= " AND cp.fk_categorie=".$fk_category;
+			if($fk_supplier>0) $sql.= " AND pfp.fk_soc=".$fk_supplier;
+			if($only_prods_in_stock>0) $sql.= ' AND ps.reel > 0';
+			
+			$sql.=' GROUP BY ps.fk_product, ps.fk_entrepot
+					ORDER BY p.ref ASC,p.label ASC';
+                 
+                 
+			$Tab = $PDOdb->ExecuteAsArray($sql);
+			
+			foreach($Tab as &$row) {
+			
+                $inventory->add_product($PDOdb, $row->fk_product, $row->fk_entrepot);
+			}
+			
+			$inventory->save($PDOdb);
+			
+			header('Location: '.dol_buildpath('inventory/inventory.php?id='.$inventory->getId().'&action=edit', 1));
+		
+		case 'edit':
+			if (!$user->rights->inventory->write) accessforbidden();
+			
+			
+			$id = __get('id', 0, 'int');
+			
+			$inventory = new Inventory($db);
+			$inventory->load($PDOdb, $id);
+			
+			_fiche($PDOdb, $user, $db, $conf, $langs, $inventory, __get('action', 'edit', 'string'));
+			
+			break;
+			
+		case 'save':
+			if (!$user->rights->inventory->write) accessforbidden();
+			
+			
+			$id = __get('id', 0, 'int');
+			
+			$inventory = new Inventory($db);
+			$inventory->load($PDOdb, $id);
+			
+			$inventory->set_values($_REQUEST);
+			
+			if ($inventory->errors)
+			{
+				setEventMessage($inventory->errors, 'errors');
+				_fiche($PDOdb, $user, $db, $conf, $langs, $inventory, 'edit');
+			}
+			else 
+			{
+				$inventory->save($PDOdb);
+				header('Location: '.dol_buildpath('inventory/inventory.php?id='.$inventory->getId().'&action=view', 1));
+			}
+			
+			break;
+			
+		case 'regulate':
+			
+			$id = __get('id', 0, 'int');
+			
+			$inventory = new Inventory($db);
+			$inventory->load($PDOdb, $id);
+            
+            if($inventory->status == 0) {
+                $inventory->status = 1;
+                $inventory->save($PDOdb);
+                
+                _fiche($PDOdb, $user, $db, $conf, $langs, $inventory, 'view');
+                
+            
+            }
+            else {
+               _fiche($PDOdb, $user, $db, $conf, $langs, $inventory, 'view');
+            }
+            
+			break;
+			
+		case 'changePMP':
+			
+			$id = __get('id', 0, 'int');
+			
+			$inventory = new Inventory($db);
+			$inventory->load($PDOdb, $id);
+			
+			$inventory->changePMP($PDOdb);
+			
+			_fiche($PDOdb, $user, $db, $conf, $langs, $inventory, 'view');
+			
+			break;
+			
+		case 'add_line':
+			if (!$user->rights->inventory->write) accessforbidden();
+			
+			
+			$id = __get('id', 0, 'int');
+			$fk_warehouse = __get('fk_warehouse', 0, 'int');
+			
+			$inventory = new Inventory($db);
+			$inventory->load($PDOdb, $id);
+			
+			$type = (!empty($conf->use_javascript_ajax) && !empty($conf->global->PRODUIT_USE_SEARCH_TO_SELECT) ? 'string' : 'int'); //AA heu ?
+			
+			$fk_product = __get('fk_product', 0, $type);
+			
+			if ($fk_product)
+			{
+				$product = new Product($db);
+				$product->fetch($fk_product);	// ! ref TODO vérifier quand même			
+				if($product->type != 0) {
+					setEventMessage($langs->trans('ThisIsNotAProduct'),'errors');
+				}
+				else{
+					
+					//Check product not already exists
+					$alreadyExists = false;
+					foreach ($inventory->Inventorydet as $invdet)
+					{
+						if ($invdet->fk_product == $product->id
+							&& $invdet->fk_warehouse == $fk_warehouse)
+						{
+							$alreadyExists = true;
+							break;
+						}
+					}
+					
+					if (!$alreadyExists)
+					{
+					    $inventory->add_product($PDOdb, $product->id, $fk_warehouse);
+                        
+					}
+					else
+					{
+						setEventMessage($langs->trans('inventoryWarningProductAlreadyExists'), 'warnings');
+					}
+					
+				}
+				
+				$inventory->save($PDOdb);
+				$inventory->sort_det();
+			}
+			
+			_fiche($PDOdb, $user, $db, $conf, $langs, $inventory, 'edit');
+			
+			break;
+			
+		case 'delete_line':
+			if (!$user->rights->inventory->write) accessforbidden();
+			
+			
+			//Cette action devrais se faire uniquement si le status de l'inventaire est à 0 mais aucune vérif
+			$rowid = __get('rowid', 0, 'int');
+			$Inventorydet = new Inventory($db);
+			$Inventorydet->load($PDOdb, $rowid);
+			$Inventorydet->delete($PDOdb);
+			
+			$id = __get('id', 0, 'int');
+			$inventory = new Inventory($db);
+			$inventory->load($PDOdb, $id);
+			
+			_fiche($PDOdb, $user, $db, $conf, $langs, $inventory, 'edit');
+			
+			break;
+        case 'flush':
+            if (!$user->rights->inventory->create) accessforbidden();
+            
+            
+            $id = __get('id', 0, 'int');
+            
+            $inventory = new Inventory($db);
+            $inventory->load($PDOdb, $id);
+            
+            $inventory->deleteAllLine($PDOdb);
+            
+            setEventMessage('Inventaire vidé');
+            
+            _fiche($PDOdb, $user, $db, $conf, $langs, $inventory, 'edit');
+           
+            
+            break;
+		case 'delete':
+			if (!$user->rights->inventory->create) accessforbidden();
+            
+			
+			$id = __get('id', 0, 'int');
+			
+			$inventory = new Inventory($db);
+			$inventory->load($PDOdb, $id);
+			
+			$inventory->delete($PDOdb);
+			
+			header('Location: '.dol_buildpath('/inventory/inventory.php', 1));
+			exit;
+			//_list();
+			
+		case 'printDoc':
+			
+			$id = __get('id', 0, 'int');
+			
+			$inventory = new Inventory($db);
+			$inventory->load($PDOdb, $id);
+			
+			generateODT($PDOdb, $db, $conf, $langs, $inventory);
+			break;
+			
+		case 'exportCSV':
+			
+			$id = __get('id', 0, 'int');
+			
+			$inventory = new Inventory($db);
+			$inventory->load($PDOdb, $id);
+			
+			exportCSV($inventory);
+			
+			exit;
+			break;
+			
+		default:
+			if (!$user->rights->inventory->write) accessforbidden();
+				
+			$id = GETPOST('id');
+				
+			$inventory = new Inventory($db);
+			$inventory->fetch($id);
+				
+			_card($inventory, $action );
+				
+			
+			break;
+	}
+	
+}
+
+function _list() 
+{
+	
+	global $db, $conf, $langs, $user;
+		
+	llxHeader('',$langs->trans('inventoryListTitle'),'','');
+	
+	$inventory = new Inventory($db);
+	$l = new ListView($db,'listInventory');
+
+	$THide = array('label');
+
+	echo $l->render(Inventory::getSQL('All'), array(
+		'limit'=>array(
+			'nbLine'=>'30'
+		)
+		,'subQuery'=>array()
+		,'link'=>array(
+			'fk_warehouse'=>'<a href="'.DOL_URL_ROOT.'/product/stock/card.php?id=@val@">'.img_picto('','object_stock.png','',0).' @label@</a>'
+		)
+		,'translate'=>array()
+		,'hide'=>$THide
+		,'type'=>array(
+			'date_cre'=>'date'
+			,'date_maj'=>'datetime'
+			,'date_inventory'=>'date'
+		)
+		,'liste'=>array(
+			'titre'=>$langs->trans('inventoryListTitle')
+			,'image'=>img_picto('','title.png', '', 0)
+			,'picto_precedent'=>img_picto('','back.png', '', 0)
+			,'picto_suivant'=>img_picto('','next.png', '', 0)
+			,'noheader'=> (int)isset($_REQUEST['fk_soc']) | (int)isset($_REQUEST['fk_product'])
+			,'messageNothing'=>$langs->trans('inventoryListEmpty')
+			,'picto_search'=>img_picto('','search.png', '', 0)
+		)
+		,'title'=>array(
+			'rowid'=>$langs->trans('Title')
+			,'fk_warehouse'=>$langs->trans('Warehouse')
+			,'date_inventory'=>$langs->trans('InventoryDate')
+			,'datec'=>$langs->trans('DateCreation')
+			,'tms'=>$langs->trans('DateUpdate')
+			,'status'=>$langs->trans('Status')
+		)
+		,'eval'=>array(
+			'status' => '(@val@ ? img_picto("'.$langs->trans("inventoryValidate").'", "statut4") : img_picto("'.$langs->trans("inventoryDraft").'", "statut3"))'
+			,'rowid'=>'Inventory::getLink(@val@)'
+            
+		)
+	));
+
+
+	if ($user->rights->inventory->create)
+	{
+		print '<div class="tabsAction">';
+		print '<a class="butAction" href="inventory.php?action=create">'.$langs->trans('inventoryCreate').'</a>';
+		print '</div>';
+	}
+
+	llxFooter('');
+}
+
+function _fiche_warehouse(&$PDOdb, &$user, &$db, &$conf, $langs, $inventory)
+{
+	dol_include_once('/categories/class/categorie.class.php');    
+        
+	llxHeader('',$langs->trans('inventorySelectWarehouse'),'','');
+	print dol_get_fiche_head(inventoryPrepareHead($inventory));
+	
+	$form=new TFormCore('inventory.php', 'confirmCreate');
+	print $form->hidden('action', 'confirmCreate');
+	$form->Set_typeaff('edit');
+	
+    $formproduct = new FormProduct($db);
+    $formDoli = new Form($db);
+    
+    ?>
+    <table class="border" width="100%" >
+        <tr>
+            <td><?php echo $langs->trans('Title') ?></td>
+            <td><?php echo $form->texte('', 'title', '',50,255) ?></td> 
+        </tr>
+        <tr>
+            <td><?php echo $langs->trans('Date') ?></td>
+            <td><?php echo $form->calendrier('', 'date_inventory',time()) ?></td> 
+        </tr>
+        
+        <tr>
+            <td><?php echo $langs->trans('inventorySelectWarehouse') ?></td>
+            <td><?php echo $formproduct->selectWarehouses('', 'fk_warehouse') ?></td> 
+        </tr>
+        
+        <tr>
+            <td><?php echo $langs->trans('SelectCategory') ?></td>
+            <td><?php echo $formDoli->select_all_categories(0,'', 'fk_category') ?></td> 
+        </tr>
+        <tr>
+            <td><?php echo $langs->trans('SelectFournisseur') ?></td>
+            <td><?php echo $formDoli->select_thirdparty('','fk_supplier','s.fournisseur = 1') ?></td> 
+        </tr>
+        <tr>
+            <td><?php echo $langs->trans('OnlyProdsInStock') ?></td>
+            <td><input type="checkbox" name="OnlyProdsInStock" value="1"></td> 
+        </tr>
+        
+    </table>
+    <?php
+    
+	print '<div class="tabsAction">';
+	print '<input type="submit" class="butAction" value="'.$langs->trans('inventoryConfirmCreate').'" />';
+	print '</div>';
+	
+	print $form->end_form();	
+	llxFooter('');
+}
+
+function _card(&$inventory, $mode='edit')
+{
+	global $langs, $conf, $db, $user;
+	
+	llxHeader('',$langs->trans('inventoryEdit'),'','');
+	
+	$warehouse = new Entrepot($db);
+	$warehouse->fetch($inventory->fk_warehouse);
+	
+	print dol_get_fiche_head(inventoryPrepareHead($inventory, $langs->trans('inventoryOfWarehouse', $warehouse->libelle), '&action='.$mode));
+	
+	$lines = array();
+	_card_line($inventory, $lines, $form);
+	
+	print '<b>'.$langs->trans('inventoryOnDate')." ".$inventory->get_date('date_inventory').'</b><br><br>';
+	
+	$inventoryTPL = array(
+		'id'=> $inventory->id
+		,'date_cre' => $inventory->get_date('date_cre', 'd/m/Y')
+		,'date_maj' => $inventory->get_date('date_maj', 'd/m/Y H:i')
+		,'fk_warehouse' => $inventory->fk_warehouse
+		,'status' => $inventory->status
+		,'entity' => $inventory->entity
+		,'amount' => price( round($inventory->amount,2) )
+		,'amount_actual'=>price (round($inventory->amount_actual,2))
+		
+	);
+	
+	$can_validate = !empty($user->rights->inventory->validate);
+	$view_url = dol_buildpath('/inventory/inventory.php', 1);
+	
+	$view = array(
+		'mode' => $mode
+		,'url' => dol_buildpath('/inventory/inventory.php', 1)
+		,'can_validate' => (int) $user->rights->inventory->validate
+		,'is_already_validate' => (int) $inventory->status
+		,'token'=>$_SESSION['newtoken']
+	);
+	
+	include './tpl/inventory.tpl.php';
+	
+	llxFooter('');
+}
+
+
+function _card_line(&$inventory, &$lines, &$form)
+{
+	global $db;
+	$inventory->amount_actual = 0;
+	
+	$TCacheEntrepot = array();
+
+	foreach ($inventory->Inventorydet as $k => $Inventorydet)
+	{
+	    
+        $product = & $Inventorydet->product;
+		$stock = $Inventorydet->qty_stock;
+	
+        $pmp = $Inventorydet->pmp;
+		$pmp_actual = $pmp * $stock;
+		$inventory->amount_actual+=$pmp_actual;
+
+        $last_pa = $Inventorydet->pa;
+		$current_pa = $Inventorydet->current_pa;
+        
+		$e = new Entrepot($db);
+		if(!empty($TCacheEntrepot[$Inventorydet->fk_warehouse])) $e = $TCacheEntrepot[$Inventorydet->fk_warehouse];
+		elseif($e->fetch($Inventorydet->fk_warehouse) > 0) $TCacheEntrepot[$e->id] = $e;
+		
+		$lines[]=array(
+			'produit' => $product->getNomUrl(1).'&nbsp;-&nbsp;'.$product->label
+			,'entrepot'=>$e->getNomUrl(1)
+			,'barcode' => $product->barcode
+			/*,'qty' => $form->texte('', 'qty_to_add['.$k.']', (isset($_REQUEST['qty_to_add'][$k]) ? $_REQUEST['qty_to_add'][$k] : 0), 8, 0, "style='text-align:center;'")
+                        .($form->type_aff!='view' ? '<a id="a_save_qty_'.$k.'" href="javascript:save_qty('.$k.')">'.img_picto('Ajouter', 'plus16@inventory').'</a>' : '')
+			,'qty_view' => $Inventorydet->qty_view ? $Inventorydet->qty_view : 0
+			,'qty_stock' => $stock
+			,'qty_regulated' => $Inventorydet->qty_regulated ? $Inventorydet->qty_regulated : 0
+			,'action' => $user->rights->inventory->write ? '<a onclick="if (!confirm(\'Confirmez-vous la suppression de la ligne ?\')) return false;" href="'.dol_buildpath('inventory/inventory.php?id='.$inventory->getId().'&action=delete_line&rowid='.$Inventorydet->getId(), 1).'">'.img_picto($langs->trans('inventoryDeleteLine'), 'delete').'</a>' : ''
+			,'pmp_stock'=>round($pmp_actual,2)
+            ,'pmp_actual'=> round($pmp * $Inventorydet->qty_view,2)
+			,'pmp_new'=>(!empty($user->rights->inventory->changePMP) ?  $form->texte('', 'new_pmp['.$k.']',$Inventorydet->new_pmp, 8, 0, "style='text-align:right;'")
+                        .($form->type_aff!='view' ? '<a id="a_save_new_pmp_'.$k.'" href="javascript:save_pmp('.$k.')">'.img_picto($langs->trans('Save'), 'bt-save.png@inventory').'</a>' : '') : '' )
+            */,'pa_stock'=>round($last_pa * $stock,2)
+            ,'pa_actual'=>round($last_pa * $Inventorydet->qty_view,2)
+			,'current_pa_stock'=>round($current_pa * $stock,2)
+			,'current_pa_actual'=>round($current_pa * $Inventorydet->qty_view,2)
+          
+            ,'k'=>$k
+            ,'id'=>$Inventorydet->id
+				
+		);
+	}
+
+}
+
+function exportCSV(&$inventory) {
+	global $conf;
+	
+	header('Content-Type: application/octet-stream');
+    header('Content-disposition: attachment; filename=inventory-'. $inventory->getId().'-'.date('Ymd-His').'.csv');
+    header('Pragma: no-cache');
+    header('Cache-Control: no-store, no-cache, must-revalidate, post-check=0, pre-check=0');
+    header('Expires: 0');
+	
+	echo 'Ref;Label;barcode;qty theorique;PMP;dernier PA;';
+	if(!empty($conf->global->INVENTORY_USE_MIN_PA_IF_NO_LAST_PA)) echo 'PA courant;';
+	echo 'qty réelle;PMP;dernier PA;';
+	if(!empty($conf->global->INVENTORY_USE_MIN_PA_IF_NO_LAST_PA)) echo 'PA courant;';
+	echo 'qty regulée;'."\r\n";
+	
+	foreach ($inventory->Inventorydet as $k => $Inventorydet)
+	{
+		$product = & $Inventorydet->product;
+		$stock = $Inventorydet->qty_stock;
+	
+        $pmp = $Inventorydet->pmp;
+		$pmp_actual = $pmp * $stock;
+		$inventory->amount_actual+=$pmp_actual;
+
+        $last_pa = $Inventorydet->pa;
+        $current_pa = $Inventorydet->current_pa;
+		
+		if(!empty($conf->global->INVENTORY_USE_MIN_PA_IF_NO_LAST_PA)) {
+			$row=array(
+				'produit' => $product->ref
+				,'label'=>$product->label
+				,'barcode' => $product->barcode
+				,'qty_stock' => $stock
+				,'pmp_stock'=>round($pmp_actual,2)
+	            ,'pa_stock'=>round($last_pa * $stock,2)
+				,'current_pa_stock'=>round($current_pa * $stock,2)
+			    ,'qty_view' => $Inventorydet->qty_view ? $Inventorydet->qty_view : 0
+				,'pmp_actual'=>round($pmp * $Inventorydet->qty_view,2)
+	            ,'pa_actual'=>round($last_pa * $Inventorydet->qty_view,2)
+	        	,'current_pa_actual'=>round($current_pa * $Inventorydet->qty_view,2)    
+				,'qty_regulated' => $Inventorydet->qty_regulated ? $Inventorydet->qty_regulated : 0
+				
+			);
+			
+		}
+		else{
+			$row=array(
+				'produit' => $product->ref
+				,'label'=>$product->label
+				,'barcode' => $product->barcode
+				,'qty_stock' => $stock
+				,'pmp_stock'=>round($pmp_actual,2)
+	            ,'pa_stock'=>round($last_pa * $stock,2)
+	            ,'qty_view' => $Inventorydet->qty_view ? $Inventorydet->qty_view : 0
+				,'pmp_actual'=>round($pmp * $Inventorydet->qty_view,2)
+	            ,'pa_actual'=>round($last_pa * $Inventorydet->qty_view,2)
+	            
+				,'qty_regulated' => $Inventorydet->qty_regulated ? $Inventorydet->qty_regulated : 0
+				
+		);
+			
+		}
+		
+		
+		echo '"'.implode('";"', $row).'"'."\r\n";
+		
+	}
+	
+	exit;
+}
+
+function generateODT(&$PDOdb, &$db, &$conf, &$langs, &$inventory) 
+{
+	$TBS=new TTemplateTBS();
+
+	$InventoryPrint = array(); // Tableau envoyé à la fonction render contenant les informations concernant l'inventaire
+	
+	foreach($inventory->Inventorydet as $k => $v) 
+	{
+		$prod = new Product($db);
+		$prod->fetch($v->fk_product);
+		//$prod->fetch_optionals($prod->id);
+		
+		$InventoryPrint[] = array(
+			'product' => $prod->ref.' - '.$prod->label
+			, 'qty_view' => $v->qty_view
+		);
+	}
+
+	$warehouse = new Entrepot($db);
+	$warehouse->fetch($inventory->fk_warehouse);
+	
+	$dirName = 'INVENTORY'.$inventory->getId().'('.date("d_m_Y").')';
+	$dir = DOL_DATA_ROOT.'/inventory/'.$dirName.'/';
+	
+	@mkdir($dir, 0777, true);
+	
+	$template = "templateINVENTORY.odt";
+	//$template = "templateOF.doc";
+
+	$file_gen = $TBS->render(dol_buildpath('inventory/exempleTemplate/'.$template)
+		,array(
+			'InventoryPrint'=>$InventoryPrint
+		)
+		,array(
+			'date_cre'=>$inventory->get_date('date_cre', 'd/m/Y')
+			,'date_maj'=>$inventory->get_date('date_maj', 'd/m/Y H:i')
+			,'date_inv'=>$inventory->get_date('date_inventory', 'd/m/Y')
+			,'numero'=>empty($inventory->title) ? 'Inventaire n°'.$inventory->getId() : $inventory->title
+			,'warehouse'=>$warehouse->libelle
+			,'status'=>($inventory->status ? $langs->transnoentitiesnoconv('inventoryValidate') : $langs->transnoentitiesnoconv('inventoryDraft'))
+			,'logo'=>DOL_DATA_ROOT."/mycompany/logos/".MAIN_INFO_SOCIETE_LOGO
+		)
+		,array()
+		,array(
+			'outFile'=>$dir.$inventory->getId().".odt"
+			,"convertToPDF"=>(!empty($conf->global->INVENTORY_GEN_PDF) ? true : false)
+			,'charset'=>OPENTBS_ALREADY_UTF8
+			
+		)
+		
+	);
+
+	header("Location: ".DOL_URL_ROOT."/document.php?modulepart=inventory&entity=".$conf->entity."&file=".$dirName."/".$inventory->getId(). (!empty($conf->global->INVENTORY_GEN_PDF) ? '.pdf' : '.odt') );
+	
+   /*
+    $size = filesize("./" . basename($file_gen));
+    header("Content-Type: application/force-download; name=\"" . basename($file_gen) . "\"");
+    header("Content-Transfer-Encoding: binary");
+    header("Content-Length: $size");
+    header("Content-Disposition: attachment; filename=\"" . basename($file_gen) . "\"");
+    header("Expires: 0");
+    header("Cache-Control: no-cache, must-revalidate");
+    header("Pragma: no-cache"); 
+    
+	readfile($file_gen);
+   */
+    
+	//header("Location: ".DOL_URL_ROOT."/document.php?modulepart=asset&entity=1&file=".$dirName."/".$assetOf->numero.".doc");
+
+}
+function _footerList($view,$total_pmp,$total_pmp_actual,$total_pa,$total_pa_actual, $total_current_pa,$total_current_pa_actual) {
+	global $conf,$user,$langs;
+	
+	
+	    if ($view['can_validate'] == 1) { ?>
+        <tr style="background-color:#dedede;">
+            <th colspan="3">&nbsp;</th>
+            <?php if (! empty($conf->barcode->enabled)) { ?>
+					<th align="center">&nbsp;</td>
+			<?php } ?>
+            <th align="right"><?php echo price($total_pmp) ?></th>
+            <th align="right"><?php echo price($total_pa) ?></th>
+            <?php
+	                 if(!empty($conf->global->INVENTORY_USE_MIN_PA_IF_NO_LAST_PA)){
+	              		echo '<th align="right">'.price($total_current_pa).'</th>';   	
+					 }
+			?>
+            <th>&nbsp;</th>
+            <th align="right"><?php echo price($total_pmp_actual) ?></th>
+            <?php
+            if(!empty($user->rights->inventory->changePMP)) {
+               	echo '<th>&nbsp;</th>';	
+			}
+			?>
+            <th align="right"><?php echo price($total_pa_actual) ?></th>
+            <?php
+	                 if(!empty($conf->global->INVENTORY_USE_MIN_PA_IF_NO_LAST_PA)){
+	              		echo '<th align="right">'.price($total_current_pa_actual).'</th>';   	
+					 }
+			?>
+
+            <th>&nbsp;</th>
+            <?php if ($view['is_already_validate'] != 1) { ?>
+            <th>&nbsp;</th>
+            <?php } ?>
+        </tr>
+        <?php } 
+}
+function _headerList($view) {
+	global $conf,$user,$langs;
+	
+	?>
+			<tr style="background-color:#dedede;">
+				<th align="left" width="20%">&nbsp;&nbsp;Produit</th>
+				<th align="center">Entrepôt</td>
+				<?php if (! empty($conf->barcode->enabled)) { ?>
+					<th align="center">Code-barre</td>
+				<?php } ?>
+				<?php if ($view['can_validate'] == 1) { ?>
+					<th align="center" width="20%">Quantité théorique</th>
+					<?php
+	                 if(!empty($conf->global->INVENTORY_USE_MIN_PA_IF_NO_LAST_PA)){
+	              		echo '<th align="center" width="20%" colspan="3">Valeur théorique</th>';   	
+					 }
+					 else {
+					 	echo '<th align="center" width="20%" colspan="2">Valeur théorique</th>';
+					 }
+					 
+					?>
+					
+				<?php } ?>
+				    <th align="center" width="20%">Quantité réelle</th>
+				<?php if ($view['can_validate'] == 1) { ?>
+				    
+				    <?php
+				    
+				     $colspan = 2;
+					 if(!empty($conf->global->INVENTORY_USE_MIN_PA_IF_NO_LAST_PA)) $colspan++;
+				     if(!empty($conf->global->INVENTORY_USE_MIN_PA_IF_NO_LAST_PA)) $colspan++;
+					
+	                 echo '<th align="center" width="20%" colspan="'.$colspan.'">Valeur réelle</th>';
+					 
+					?>
+						
+					<th align="center" width="15%">Quantité régulée</th>
+				<?php } ?>
+				<?php if ($view['is_already_validate'] != 1) { ?>
+					<th align="center" width="5%">#</th>
+				<?php } ?>
+				<th align="center" width="5%"></th>
+			</tr>
+			<?php if ($view['can_validate'] == 1) { ?>
+	    	<tr style="background-color:#dedede;">
+	    	    <th colspan="<?php echo empty($conf->barcode->enabled) ? 3 : 4;  ?>">&nbsp;</th>
+	    	    <th>PMP</th>
+	    	    <th>Dernier PA</th>
+	    	    <?php
+	                 if(!empty($conf->global->INVENTORY_USE_MIN_PA_IF_NO_LAST_PA)){
+	              		echo '<th>PA courant</th>';   	
+					 }
+					 
+				?>
+	    	    <th>&nbsp;</th>
+	    	    <th>PMP</th>
+	    	    <?php
+	    	    if(!empty($user->rights->inventory->changePMP)) {
+	    	    	echo '<th rel="newPMP">'.$langs->trans('ColumnNewPMP').'</th>';
+	    	    }
+	    	    ?>
+	            <th>Dernier PA</th>
+	            <?php
+	                 if(!empty($conf->global->INVENTORY_USE_MIN_PA_IF_NO_LAST_PA)){
+	              		echo '<th>PA courant</th>';   	
+					 }
+					 
+				?>
+	            <th>&nbsp;</th>
+	            <?php if ($view['is_already_validate'] != 1) { ?>
+	            <th>&nbsp;</th>
+	            <?php } ?>
+	    	</tr>
+	    	<?php 
+	} 
+	
+}
diff --git a/htdocs/inventory/lib/inventory.lib.php b/htdocs/inventory/lib/inventory.lib.php
new file mode 100644
index 00000000000..fd60d631a58
--- /dev/null
+++ b/htdocs/inventory/lib/inventory.lib.php
@@ -0,0 +1,245 @@
+<?php
+/* <one line to give the program's name and a brief idea of what it does.>
+ * Copyright (C) 2015 ATM Consulting <support@atm-consulting.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
+ * 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		lib/inventory.lib.php
+ *	\ingroup	inventory
+ *	\brief		This file is an example module library
+ *				Put some comments here
+ */
+
+function inventoryAdminPrepareHead()
+{
+    global $langs, $conf;
+
+    $langs->load("inventory@inventory");
+
+    $h = 0;
+    $head = array();
+
+    $head[$h][0] = dol_buildpath("/inventory/admin/inventory_setup.php", 1);
+    $head[$h][1] = $langs->trans("Parameters");
+    $head[$h][2] = 'settings';
+    $h++;
+    $head[$h][0] = dol_buildpath("/inventory/admin/inventory_about.php", 1);
+    $head[$h][1] = $langs->trans("About");
+    $head[$h][2] = 'about';
+    $h++;
+
+    // Show more tabs from modules
+    // Entries must be declared in modules descriptor with line
+    //$this->tabs = array(
+    //	'entity:+tabname:Title:@inventory:/inventory/mypage.php?id=__ID__'
+    //); // to add new tab
+    //$this->tabs = array(
+    //	'entity:-tabname:Title:@inventory:/inventory/mypage.php?id=__ID__'
+    //); // to remove a tab
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'inventory');
+
+    return $head;
+}
+
+function inventoryPrepareHead(&$inventory, $title='Inventaire', $get='')
+{
+	return array(
+		array(dol_buildpath('/inventory/inventory.php?id='.$inventory->id.$get, 1), $title,'inventaire')
+	);
+}
+
+
+
+function inventorySelectProducts(&$inventory)
+{
+	global $conf,$db;
+	
+	$except_product_id = array();
+	
+	foreach ($inventory->Inventorydet as $Inventorydet)
+	{
+		$except_product_id[] = $Inventorydet->fk_product;
+	}
+	
+	ob_start();
+	$form = new Form($db);
+	$form->select_produits(-1, 'fk_product');
+	
+	// Il nous faut impérativement une liste custom car il ne faut que les entrepôts de la famille de celui qu'on inventorie
+	$TChildWarehouses = array($inventory->fk_warehouse);
+	$e = new Entrepot($db);
+	$e->fetch($inventory->fk_warehouse);
+	if(method_exists($e, 'get_children_warehouses')) $e->get_children_warehouses($e->id, $TChildWarehouses);
+	
+	$Tab = array();
+	$sql = 'SELECT rowid, label
+			FROM '.MAIN_DB_PREFIX.'entrepot WHERE rowid IN('.implode(', ', $TChildWarehouses).')';
+	if(method_exists($e, 'get_children_warehouses')) $sql.= ' ORDER BY fk_parent';
+	$resql = $db->query($sql);
+	while($res = $db->fetch_object($resql)) {
+		$Tab[$res->rowid] = $res->label;
+	}
+	print '&nbsp;&nbsp;&nbsp;';
+	print 'Entrepôt : '.$form::selectarray('fk_warehouse', $Tab);
+	
+	$select_html = ob_get_clean();
+	
+	return $select_html;
+}
+
+function ajaxAutocompleter($selected, $htmlname, $url, $urloption='', $minLength=2, $autoselect=0, $ajaxoptions=array())
+{
+    if (empty($minLength)) $minLength=1;
+
+	$script = '<input type="hidden" name="'.$htmlname.'" id="'.$htmlname.'" value="'.$selected.'" />';
+
+	$script.= '<script type="text/javascript">';
+	$script.= '$(document).ready(function() {
+					var autoselect = '.$autoselect.';
+					var options = '.json_encode($ajaxoptions).';
+
+					// Remove product id before select another product
+					// use keyup instead change to avoid loosing the product id
+					$("input#search_'.$htmlname.'").keydown(function() {
+						//console.log(\'purge_id_after_keydown\');
+						$("#'.$htmlname.'").val("");
+					});
+					$("input#search_'.$htmlname.'").change(function() {
+						//console.log(\'change\');
+						$("#'.$htmlname.'").trigger("change");
+					});
+					// Check when keyup
+					$("input#search_'.$htmlname.'").keyup(function() {
+							//console.log(\'keyup\');
+						    if ($(this).val().length == 0)
+						    {
+	                            $("#search_'.$htmlname.'").val("");
+	                            $("#'.$htmlname.'").val("").trigger("change");
+	                            if (options.option_disabled) {
+	    							$("#" + options.option_disabled).removeAttr("disabled");
+	    						}
+	    						if (options.disabled) {
+	    							$.each(options.disabled, function(key, value) {
+	    								$("#" + value).removeAttr("disabled");
+									});
+	    						}
+	    						if (options.update) {
+	    							$.each(options.update, function(key, value) {
+	    								$("#" + key).val("").trigger("change");
+									});
+								}
+								if (options.show) {
+	    							$.each(options.show, function(key, value) {
+	    								$("#" + value).hide().trigger("hide");
+									});
+								}
+								if (options.update_textarea) {
+	    							$.each(options.update_textarea, function(key, value) {
+	    								if (typeof CKEDITOR == "object" && typeof CKEDITOR.instances != "undefined" && CKEDITOR.instances[key] != "undefined") {
+	    									CKEDITOR.instances[key].setData("");
+	    								} else {
+	    									$("#" + key).html("");
+										}
+	    							});
+	    						}
+						    }
+                    });
+    				$("input#search_'.$htmlname.'").autocomplete({
+    					source: function( request, response ) {
+    						$.get("'.$url.($urloption?'?'.$urloption:'').'", { '.$htmlname.': request.term }, function(data){
+								response($.map( data, function( item ) {
+									if (autoselect == 1 && data.length == 1) {
+										$("#search_'.$htmlname.'").val(item.value);
+										$("#'.$htmlname.'").val(item.key).trigger("change");
+									}
+									var label = item.label.toString();
+									var update = {};
+									if (options.update) {
+										$.each(options.update, function(key, value) {
+											update[key] = item[value];
+										});
+									}
+									var textarea = {};
+									if (options.update_textarea) {
+										$.each(options.update_textarea, function(key, value) {
+											textarea[key] = item[value];
+										});
+									}
+									return { label: label, value: item.value, id: item.key, update: update, textarea: textarea, disabled: item.disabled }
+								}));
+							}, "json");
+						},
+						dataType: "json",
+    					minLength: '.$minLength.',
+    					select: function( event, ui ) {		// Function ran when new value is selected into javascript combo
+							//console.log(\'set value of id with \'+ui.item.id);
+    						$("#'.$htmlname.'").val(ui.item.id).trigger("change");	// Select new value
+    						// Disable an element
+    						if (options.option_disabled) {
+    							if (ui.item.disabled) {
+    								$("#" + options.option_disabled).attr("disabled", "disabled");
+    								if (options.error) {
+    									$.jnotify(options.error, "error", true);		// Output with jnotify the error message
+    								}
+    								if (options.warning) {
+    									$.jnotify(options.warning, "warning", false);		// Output with jnotify the warning message
+    								}
+							} else {
+    								$("#" + options.option_disabled).removeAttr("disabled");
+    							}
+    						}
+    						if (options.disabled) {
+    							$.each(options.disabled, function(key, value) {
+    								$("#" + value).attr("disabled", "disabled");
+    							});
+    						}
+    						if (options.show) {
+    							$.each(options.show, function(key, value) {
+    								$("#" + value).show().trigger("show");
+    							});
+    						}
+    						// Update an input
+    						if (ui.item.update) {
+    							// loop on each "update" fields
+    							$.each(ui.item.update, function(key, value) {
+    								$("#" + key).val(value).trigger("change");
+    							});
+    						}
+    						if (ui.item.textarea) {
+    							$.each(ui.item.textarea, function(key, value) {
+    								if (typeof CKEDITOR == "object" && typeof CKEDITOR.instances != "undefined" && CKEDITOR.instances[key] != "undefined") {
+    									CKEDITOR.instances[key].setData(value);
+    									CKEDITOR.instances[key].focus();
+    								} else {
+    									$("#" + key).html(value);
+    									$("#" + key).focus();
+									}
+    							});
+    						}
+    						$("#search_'.$htmlname.'").trigger("change");	// To tell that input text field was modified
+    					}
+					}).data( "autocomplete" )._renderItem = function( ul, item ) {
+						return $( "<li></li>" )
+						.data( "item.autocomplete", item )
+						.append( \'<a><span class="tag">\' + item.label + "</span></a>" )
+						.appendTo(ul);
+					};
+
+  				});';
+	$script.= '</script>';
+
+	return $script;
+}
diff --git a/htdocs/inventory/tpl/inventory.tpl.php b/htdocs/inventory/tpl/inventory.tpl.php
new file mode 100644
index 00000000000..d7022245f5b
--- /dev/null
+++ b/htdocs/inventory/tpl/inventory.tpl.php
@@ -0,0 +1,211 @@
+<script type="text/javascript">
+    function save_qty(k) {
+        
+        var $input = $('input[name="qty_to_add['+k+']"]');
+        var fk_det_inventory = $('input[name=det_id_'+k+']').val();
+        var qty = $input.val();
+        
+        $('#a_save_qty_'+k).hide();
+        
+        $.ajax({
+            url:"script/interface.php"
+            ,data:{
+                'fk_det_inventory' : fk_det_inventory
+                ,'qty': qty
+                ,'put':'qty'
+            }
+            
+        }).done(function(data) {
+            $('#qty_view_'+k).html(data);
+            $input.val(0);
+            $.jnotify("Quantité ajoutée : "+qty, "mesgs" );
+            
+            $('#a_save_qty_'+k).show();
+            
+            hide_save_button();
+        });
+        
+        
+    }
+    
+    function save_pmp(k) {
+    	
+        var $input = $('input[name="new_pmp['+k+']"]');
+        var fk_det_inventory = $('input[name=det_id_'+k+']').val();
+        var pmp = $input.val();
+        
+        $('#a_save_new_pmp_'+k).hide();
+        
+        $.ajax({
+            url:"script/interface.php"
+            ,data:{
+                'fk_det_inventory' : fk_det_inventory
+                ,'pmp': pmp
+                ,'put':'pmp'
+            }
+            
+        }).done(function(data) {
+           	$input.css({"background-color":"#66ff66"});
+            $.jnotify("PMP sauvegardé : "+pmp, "mesgs" );
+            $('#a_save_new_pmp_'+k).show();
+             
+        });
+        
+    }
+    
+    function hide_save_button() {
+       var nb = 0;
+       $('input[name^="qty_to_add"]').each(function() {
+           nb += $(this).val();
+       });
+       
+       if(nb>0) {
+           $('input[name=modify]').show();
+           
+       }
+       else{
+           $('input[name=modify]').hide();
+           
+       }
+        
+    }
+</script>
+
+<?php if ($inventory->status != 1) { ?>
+	<strong><?php echo $langs->trans('AddInventoryProduct'); ?> : </strong>
+	<form action="<?php echo $_SERVER['PHP_SELF']; ?>" method="post">
+		<input type="hidden" name="action" value="add_line" />
+		<input type="hidden" name="id" value="<?php echo $inventory->id; ?>" />
+	
+		<?php echo inventorySelectProducts($inventory); ?>
+		
+			<input class="butAction" type="submit" value="<?php echo $langs->trans('AddProduct'); ?>" />
+	</form>
+<?php } ?>
+
+<form action="<?php echo $_SERVER['PHP_SELF']; ?>" method="post">
+	
+	<?php if ($view['is_already_validate'] == 1) { ?>
+		<div class="warning">Cet inventaire est validé</div>
+	<?php } ?>
+	
+	<input type="hidden" name="action" value="save" />
+	<input type="hidden" name="id" value="<?php echo $inventory->id; ?>" />
+	
+	<table width="100%" class="border workstation">
+		<?php
+		
+		_headerList($view); 
+        
+        $total_pmp = $total_pa = $total_pmp_actual = $total_pa_actual =$total_current_pa=$total_current_pa_actual = 0;
+        $i=1;
+        
+        foreach ($lines as $k=>$row) { 
+            
+            $total_pmp+=$row['pmp_stock'];
+            $total_pa+=$row['pa_stock'];
+            $total_pmp_actual+=$row['pmp_actual'];
+            $total_pa_actual+=$row['pa_actual'];
+            
+			if($i%20 === 0)
+			{
+            	_headerList($view);
+			} // Fin IF principal
+	    	?>
+			<tr style="background-color:<?php echo ($k%2 == 0) ? '#fff':'#eee'; ?>;">
+				<td align="left">&nbsp;&nbsp;<?php echo $row['produit']; ?></td>
+				<td align="center"><?php echo $row['entrepot']; ?></td>
+				<?php if (! empty($conf->barcode->enabled)) { ?>
+					<td align="center"><?php echo $row['barcode']; ?></td>
+				<?php } ?>
+				<?php if ($can_validate == 1) { ?>
+					<td align="center" style="background-color: #e8e8ff;"><?php echo $row['qty_stock']; ?></td>
+					<td align="right" style="background-color: #e8e8ff;"><?php echo price( $row['pmp_stock']); ?></td>
+					<td align="right" style="background-color: #e8e8ff;"><?php echo price( $row['pa_stock']); ?></td>
+	               <?php
+	                 if(!empty($conf->global->INVENTORY_USE_MIN_PA_IF_NO_LAST_PA)){
+	                 	echo '<td align="right" style="background-color: #e8e8ff;">'.price($row['current_pa_stock']).'</td>';
+						 $total_current_pa+=$row['current_pa_stock'];
+	                 }   
+	                    
+	               ?>
+				<?php } ?>
+				<td align="center"><?php echo $row['qty']; ?>&nbsp;&nbsp;<span id="qty_view_<?php echo $row['k']; ?>"><?php echo $row['qty_view']; ?></span>
+                    <input type="hidden" name="det_id_<?php echo $row['k']; ?>" value="<?php echo $row['id']; ?>" /> 
+                </td>
+                <?php if ($can_validate == 1) { ?>
+                    <td align="right"><?php echo price($row['pmp_actual']); ?></td>
+                    <?php
+                    if(!empty($user->rights->inventory->changePMP)) {
+                    	echo '<td>'.$row['pmp_new'].'</td>';	
+					}
+                    ?>
+                    <td align="right"><?php echo price($row['pa_actual']); ?></td>
+		               <?php
+		                 if(!empty($conf->global->INVENTORY_USE_MIN_PA_IF_NO_LAST_PA)){
+		                 	echo '<td align="right">'.price($row['current_pa_actual']).'</td>';
+							 $total_current_pa_actual+=$row['current_pa_actual'];
+		                 }   
+		                    
+		               ?>
+                    <td align="center"><?php echo $row['qty_regulated']; ?></td>
+				<?php } ?>
+				<?php if ($view['is_already_validate'] != 1) { ?>
+					<td align="center" width="20%"><?php echo $row['action']; ?></td>
+				<?php } ?>
+			</tr>
+			<?php $i++; ?>
+		
+		<?php } 
+		
+		_footerList($view,$total_pmp,$total_pmp_actual,$total_pa,$total_pa_actual, $total_current_pa,$total_current_pa_actual);
+		?>
+	
+	  
+		
+	</table>
+	
+	<?php if ($view['is_already_validate'] != 1) { ?>
+		<div class="tabsAction" style="height:30px;">
+			<?php if ($view['mode'] == 'view') { ?>
+				<a href="<?php echo $view_url; ?>?id=<?php echo $inventory->id; ?>&action=printDoc" class="butAction"><?php echo $langs->trans('Print') ?></a>
+				<a href="<?php echo $view_url; ?>?id=<?php echo $inventory->id; ?>&action=exportCSV" class="butAction"><?php echo $langs->trans('ExportCSV') ?></a>
+				<a href="<?php echo $view_url; ?>?id=<?php echo $inventory->id; ?>&action=edit" class="butAction"><?php echo $langs->trans('Modify') ?></a>
+				<?php 
+				 if(!empty($user->rights->inventory->changePMP)) {
+				 	echo '<a href="javascript:;" onclick="javascript:if (!confirm(\'Confirmez-vous l\\\'application du nouveau PMP ?\')) return false; else document.location.href=\''.$view_url
+				 			.'?id='.$inventory->id
+				 			.'&action=changePMP&token='.$view['token'].'\'; " class="butAction">'.$langs->trans('ApplyPMP').'</a>';
+				 }
+				
+				if ($can_validate == 1) { ?>
+					<a href="javascript:;" onclick="javascript:if (!confirm('Confirmez-vous la régulation ?')) return false; else document.location.href='<?php echo $view_url; ?>?id=<?php echo $inventory->id; ?>&action=regulate&token=<?php echo $view['token']; ?>'; " class="butAction">Réguler le stock</a>
+				<?php } ?>
+			<?php } ?>
+			<?php if ($view['mode'] == 'edit') { ?>
+				<input name="back" type="button" class="butAction" value="Quitter la saisie" onclick="document.location='?id=<?php echo $inventory->id; ?>&action=view';" />
+			<?php } ?>
+			<?php if ($can_validate == 1) { ?>
+                <a onclick="if (!confirm('Confirmez-vous la vidange ?')) return false;" href="<?php echo $view_url; ?>?id=<?php echo $inventory->id; ?>&action=flush" class="butActionDelete">Vider</a>
+                &nbsp;&nbsp;&nbsp;
+                <a onclick="if (!confirm('Confirmez-vous la suppression ?')) return false;" href="<?php echo $view_url; ?>?id=<?php echo $inventory->id; ?>&action=delete" class="butActionDelete">Supprimer</a>
+        	<?php } ?>
+		</div>
+	<?php } ?>
+	<?php if ($view['is_already_validate'] == 1) { ?>
+		<div class="tabsAction">
+			<?php if ($can_validate == 1) { ?>
+
+				<a href="<?php echo $view_url; ?>?id=<?php echo $inventory->id; ?>&action=printDoc" class="butAction"><?php echo $langs->trans('Print') ?></a>
+				<a href="<?php echo $view_url; ?>?id=<?php echo $inventory->id; ?>&action=exportCSV" class="butAction"><?php echo $langs->trans('ExportCSV') ?></a>
+				<a href="#" title="Cet inventaire est validé" class="butActionRefused"><?php echo $langs->trans('Delete') ?></a>
+				
+			<?php } ?>
+		</div>
+	<?php } ?>
+</form>
+<p>Date de création : <?php echo $inventory->get_date('datec') ?>
+<br />Dernière mise à jour : <?php echo $inventory->get_date('tms') ?></p>
+	
+
+	

From 565bcf233276535280c86a16f287df1eae7963a5 Mon Sep 17 00:00:00 2001
From: Alexis Algoud <alexis@atm-consulting.fr>
Date: Wed, 14 Dec 2016 16:11:37 +0100
Subject: [PATCH 008/505] debug fetch method

---
 htdocs/core/class/coreobject.class.php     |  76 +++++++++--
 htdocs/inventory/class/inventory.class.php |  58 ++++-----
 htdocs/inventory/inventory.php             | 145 ++++++---------------
 htdocs/inventory/tpl/inventory.tpl.php     |  12 +-
 4 files changed, 137 insertions(+), 154 deletions(-)

diff --git a/htdocs/core/class/coreobject.class.php b/htdocs/core/class/coreobject.class.php
index b7e4b2770e3..f5e5b0e79a1 100644
--- a/htdocs/core/class/coreobject.class.php
+++ b/htdocs/core/class/coreobject.class.php
@@ -78,14 +78,20 @@ class CoreObject extends CommonObject {
 			
 	}
 	
+	private function checkFieldType($field, $type) {
+		
+		if( isset($this->__fields[$field]) && method_exists($this, 'is_'.$type)) {
+			return $this->{'is_'.$type}($this->__fields[$field]);
+		}
+		else return false;
+		
+	}
 	
 	private function is_date(Array &$info){
 	
-		if(is_array($info)) {
-			if(isset($info['type']) && $info['type']=='date') return true;
-			else return false;
-		}
+		if(isset($info['type']) && $info['type']=='date') return true;
 		else return false;
+		
 	}
 	
 	private function is_array($info) {
@@ -239,7 +245,25 @@ class CoreObject extends CommonObject {
 		}
 		
 	}
+	public function addChild($tabName, $id='', $key='id', $try_to_load = false) {
+		if(!empty($id)) {
+			foreach($this->{$tabName} as $k=>&$object) {
+				if($object->{$key} === $id) return $k;
 	
+			}
+		}
+	
+		$k = count($this->{$tabName});
+	
+		$className = ucfirst($tabName);
+		$this->{$tabName}[$k] = new $className($this->db);
+		if($id>0 && $key==='id' && $try_to_load) { 
+			$this->{$tabName}[$k]->fetch($id); 
+		}
+	
+	
+		return $k;
+	}
 	public function fetchChild() {
 
 		if($this->withChild && !empty($this->childtables) && !empty($this->fk_element)) {
@@ -272,13 +296,13 @@ class CoreObject extends CommonObject {
 	}
 	
 	
-	public function update() {
-		
+	public function update(User &$user) {
+		if(empty($this->id )) return $this->create($user);
 		
 		
 	}
-	public function create() {
-		
+	public function create(User &$user) {
+		if($this->id>0) return $this->update($user);
 		
 		
 	}
@@ -287,10 +311,46 @@ class CoreObject extends CommonObject {
 		if(empty($this->{$field})) return '';
 		elseif($this->{$field}<=strtotime('1000-01-01 00:00:00')) return '';
 		else {
+			
 			return dol_print_date($this->{$field}, $format);
 		}
 	
 	}
 	
+	public function set_date($field,$date){
+
+	  	if(empty($date)) {
+	  		$this->{$field} = 0;
+	  	}
+		else {
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+				
+			$this->{$field} = dol_stringtotime($date);
+		}
+
+		return $this->{$field};
+	}
+	
+	public function set_values(&$Tab) {
+		foreach ($Tab as $key=>$value) {
+	
+			if($this->checkFieldType($key,'date')) {
+				$this->set_date($key, $value);
+			}
+			else if( $this->checkFieldType($key,'array')){
+				$this->{$key} = $value;
+			}
+			else if( $this->checkFieldType($key,'float') ) {
+				$this->{$key} = (double)price2num($value);
+			}
+			else if( $this->checkFieldType($key,'int') ) {
+				$this->{$key} = (int)price2num($value);
+			}
+			else {
+				$this->{$key} = @stripslashes($value);
+			}
+			
+		}
+	}
 	
 }
diff --git a/htdocs/inventory/class/inventory.class.php b/htdocs/inventory/class/inventory.class.php
index 2a485d24a0a..f2ff6484c64 100644
--- a/htdocs/inventory/class/inventory.class.php
+++ b/htdocs/inventory/class/inventory.class.php
@@ -147,15 +147,16 @@ class Inventory extends CoreObject
 		
 	}
 	
-	function update()
+	function update(User &$user)
 	{
+		
 		//si on valide l'inventaire on sauvegarde le stock à cette instant
 		if ($this->status)
 		{
 			 $this->regulate();
 		}
 		
-		parent::update();
+		parent::update($user);
 	}
 	
 	function set_values($Tab)
@@ -209,7 +210,7 @@ class Inventory extends CoreObject
         $det->load_product();
                 
         $date = $this->get_date('date_inventory', 'Y-m-d');
-        if(empty($date))$date = $this->get_date('date_cre', 'Y-m-d'); 
+        if(empty($date))$date = $this->get_date('datec', 'Y-m-d'); 
         $det->setStockDate( $date , $fk_entrepot);
         
     }
@@ -416,9 +417,9 @@ class Inventorydet extends CoreObject
 		return true;
 	}
 	
-    function setStockDate(&$PDOdb, $date, $fk_warehouse) {
+    function setStockDate($date, $fk_warehouse) {
         
-		list($pmp,$stock) = $this->getPmpStockFromDate($PDOdb, $date, $fk_warehouse);
+		list($pmp,$stock) = $this->getPmpStockFromDate($date, $fk_warehouse);
 		
         $this->qty_stock = $stock;
         $this->pmp = $pmp;
@@ -432,18 +433,17 @@ class Inventorydet extends CoreObject
                 AND datem<='".$date." 23:59:59'
                 ORDER BY datem DESC LIMIT 1";
                
-        $res = $db->query($sql);
+        $res = $this->db->query($sql);
        
-        if($obj = $db->fetch_object($res)) {
+        if($res && $obj = $this->db->fetch_object($res)) {
             $last_pa = $obj->price;
         }
         
         $this->pa = $last_pa;
-      /*  var_dump($fk_warehouse,$this->product->stock_warehouse,$this->pmp, $this->pa, $this->qty_stock);
-        exit;*/
+      
     }
 
-	function getPmpStockFromDate(&$PDOdb, $date, $fk_warehouse){
+	function getPmpStockFromDate( $date, $fk_warehouse){
 		
 		$res = $this->product->load_stock();
 		
@@ -459,7 +459,7 @@ class Inventorydet extends CoreObject
 			
 		}
 		
-		//On récupère tous les mouvements de stocks du produit entre aujourd'hui et la date de l'inventaire
+		//All Stock mouvement between now and inventory date
 		$sql = "SELECT value, price
 				FROM ".MAIN_DB_PREFIX."stock_mouvement
 				WHERE fk_product = ".$this->product->id."
@@ -467,31 +467,25 @@ class Inventorydet extends CoreObject
 					AND datem > '".date('Y-m-d 23:59:59',strtotime($date))."'
 				ORDER BY datem DESC";
 
-		//echo $sql.'<br>';
-		$db->query($sql);
-		$TMouvementStock = $PDOdb->Get_All();
+		
+		$res = $this->db->query($sql);
+		
 		$laststock = $stock;
 		$lastpmp = $pmp;
-		//Pour chacun des mouvements on recalcule le PMP et le stock physique
-		foreach($TMouvementStock as $mouvement){
-			
-			//150
-			//if($this->product->id==394) echo 'laststock = '.$stock.'<br>';
-			
-			//9.33
-			//if($this->product->id==394) echo 'lastpmp = '.$pmp.'<br>';
-			$price = ($mouvement->price>0 && $mouvement->value>0) ? $mouvement->price : $lastpmp;  
+		
+		if($res) {
+			while($mouvement = $this->db->fetch_object($res)) {
+				$price = ($mouvement->price>0 && $mouvement->value>0) ? $mouvement->price : $lastpmp;
 				
-			$stock_value = $laststock * $lastpmp;
+				$stock_value = $laststock * $lastpmp;
+					
+				$laststock -= $mouvement->value;
+					
+				$last_stock_value = $stock_value - ($mouvement->value * $price);
+					
+				$lastpmp = ($laststock != 0) ? $last_stock_value / $laststock : $lastpmp;
+			}
 			
-			$laststock -= $mouvement->value;
-			
-			$last_stock_value = $stock_value - ($mouvement->value * $price);	
-			
-			$lastpmp = ($laststock != 0) ? $last_stock_value / $laststock : $lastpmp;
-			 
-			
-
 		}
 		
 		return array($lastpmp,$laststock);
diff --git a/htdocs/inventory/inventory.php b/htdocs/inventory/inventory.php
index d46f05059b4..4e70ee1b4cc 100644
--- a/htdocs/inventory/inventory.php
+++ b/htdocs/inventory/inventory.php
@@ -66,18 +66,17 @@ function _action()
 			
 			$inventory = new Inventory($db);
 			
-			_fiche_warehouse($user, $db, $conf, $langs, $inventory);
+			_card_warehouse( $inventory);
 
 			break;
 		
 		case 'confirmCreate':
 			if (!$user->rights->inventory->create) accessforbidden();
-			
-			
+		
 			$inventory = new Inventory($db);
-			$inventory->set_values($_REQUEST);
+			$inventory->set_values($_POST);
 			
-            $fk_inventory = $inventory->save();
+            $fk_inventory = $inventory->create($user);
             $fk_category = (int)GETPOST('fk_category');
             $fk_supplier = (int)GETPOST('fk_supplier');
             $fk_warehouse = (int)GETPOST('fk_warehouse');
@@ -86,7 +85,7 @@ function _action()
 			$e = new Entrepot($db);
 			$e->fetch($fk_warehouse);
 			$TChildWarehouses = array($fk_warehouse);
-			if(method_exists($e, 'get_children_warehouses')) $e->get_children_warehouses($fk_warehouse, $TChildWarehouses);
+			$e->get_children_warehouses($fk_warehouse, $TChildWarehouses);
 			
 			$sql = 'SELECT ps.fk_product, ps.fk_entrepot 
 			     FROM '.MAIN_DB_PREFIX.'product_stock ps 
@@ -103,27 +102,27 @@ function _action()
 					ORDER BY p.ref ASC,p.label ASC';
                  
                  
-			$Tab = $PDOdb->ExecuteAsArray($sql);
-			
-			foreach($Tab as &$row) {
-			
-                $inventory->add_product($PDOdb, $row->fk_product, $row->fk_entrepot);
+			$res = $db->query($sql);
+			if($res) {
+				while($obj = $db->fetch_object($res)){
+				
+	                $inventory->add_product($obj->fk_product, $obj->fk_entrepot);
+				}
 			}
 			
-			$inventory->save($PDOdb);
+			$inventory->update($user);
+			
+			header('Location: '.dol_buildpath('inventory/inventory.php?id='.$inventory->id.'&action=edit', 1));
+			break;
 			
-			header('Location: '.dol_buildpath('inventory/inventory.php?id='.$inventory->getId().'&action=edit', 1));
-		
 		case 'edit':
 			if (!$user->rights->inventory->write) accessforbidden();
 			
 			
-			$id = __get('id', 0, 'int');
-			
 			$inventory = new Inventory($db);
-			$inventory->load($PDOdb, $id);
+			$inventory->fetch(GETPOST('id'));
 			
-			_fiche($PDOdb, $user, $db, $conf, $langs, $inventory, __get('action', 'edit', 'string'));
+			_card($inventory, GETPOST('action'));
 			
 			break;
 			
@@ -389,29 +388,29 @@ function _list()
 	llxFooter('');
 }
 
-function _fiche_warehouse(&$PDOdb, &$user, &$db, &$conf, $langs, $inventory)
+function _card_warehouse(&$inventory)
 {
+	global $langs,$conf,$db, $user, $form;
+	
 	dol_include_once('/categories/class/categorie.class.php');    
         
 	llxHeader('',$langs->trans('inventorySelectWarehouse'),'','');
 	print dol_get_fiche_head(inventoryPrepareHead($inventory));
 	
-	$form=new TFormCore('inventory.php', 'confirmCreate');
-	print $form->hidden('action', 'confirmCreate');
-	$form->Set_typeaff('edit');
+	echo '<form name="confirmCreate" action="'.$_SERVER['PHP_SELF'].'" method="post" />';
+	echo '<input type="hidden" name="action" value="confirmCreate" />';
 	
     $formproduct = new FormProduct($db);
-    $formDoli = new Form($db);
     
     ?>
     <table class="border" width="100%" >
         <tr>
             <td><?php echo $langs->trans('Title') ?></td>
-            <td><?php echo $form->texte('', 'title', '',50,255) ?></td> 
+            <td><input type="text" name="title" value="" size="50" /></td> 
         </tr>
         <tr>
             <td><?php echo $langs->trans('Date') ?></td>
-            <td><?php echo $form->calendrier('', 'date_inventory',time()) ?></td> 
+            <td><?php echo $form->select_date(time(),'date_inventory'); ?></td> 
         </tr>
         
         <tr>
@@ -421,11 +420,11 @@ function _fiche_warehouse(&$PDOdb, &$user, &$db, &$conf, $langs, $inventory)
         
         <tr>
             <td><?php echo $langs->trans('SelectCategory') ?></td>
-            <td><?php echo $formDoli->select_all_categories(0,'', 'fk_category') ?></td> 
+            <td><?php echo $form->select_all_categories(0,'', 'fk_category') ?></td> 
         </tr>
         <tr>
             <td><?php echo $langs->trans('SelectFournisseur') ?></td>
-            <td><?php echo $formDoli->select_thirdparty('','fk_supplier','s.fournisseur = 1') ?></td> 
+            <td><?php echo $form->select_thirdparty('','fk_supplier','s.fournisseur = 1') ?></td> 
         </tr>
         <tr>
             <td><?php echo $langs->trans('OnlyProdsInStock') ?></td>
@@ -439,7 +438,8 @@ function _fiche_warehouse(&$PDOdb, &$user, &$db, &$conf, $langs, $inventory)
 	print '<input type="submit" class="butAction" value="'.$langs->trans('inventoryConfirmCreate').'" />';
 	print '</div>';
 	
-	print $form->end_form();	
+	echo '</form>';
+	
 	llxFooter('');
 }
 
@@ -455,7 +455,7 @@ function _card(&$inventory, $mode='edit')
 	print dol_get_fiche_head(inventoryPrepareHead($inventory, $langs->trans('inventoryOfWarehouse', $warehouse->libelle), '&action='.$mode));
 	
 	$lines = array();
-	_card_line($inventory, $lines, $form);
+	_card_line($inventory, $lines, $mode);
 	
 	print '<b>'.$langs->trans('inventoryOnDate')." ".$inventory->get_date('date_inventory').'</b><br><br>';
 	
@@ -488,7 +488,7 @@ function _card(&$inventory, $mode='edit')
 }
 
 
-function _card_line(&$inventory, &$lines, &$form)
+function _card_line(&$inventory, &$lines, $mode)
 {
 	global $db;
 	$inventory->amount_actual = 0;
@@ -512,21 +512,23 @@ function _card_line(&$inventory, &$lines, &$form)
 		if(!empty($TCacheEntrepot[$Inventorydet->fk_warehouse])) $e = $TCacheEntrepot[$Inventorydet->fk_warehouse];
 		elseif($e->fetch($Inventorydet->fk_warehouse) > 0) $TCacheEntrepot[$e->id] = $e;
 		
+		$qty = (float)GETPOST('qty_to_add')[$k];
+		
 		$lines[]=array(
 			'produit' => $product->getNomUrl(1).'&nbsp;-&nbsp;'.$product->label
 			,'entrepot'=>$e->getNomUrl(1)
 			,'barcode' => $product->barcode
-			/*,'qty' => $form->texte('', 'qty_to_add['.$k.']', (isset($_REQUEST['qty_to_add'][$k]) ? $_REQUEST['qty_to_add'][$k] : 0), 8, 0, "style='text-align:center;'")
-                        .($form->type_aff!='view' ? '<a id="a_save_qty_'.$k.'" href="javascript:save_qty('.$k.')">'.img_picto('Ajouter', 'plus16@inventory').'</a>' : '')
+			,'qty' =>($mode == 'edit' ? '<input type="text" name="qty_to_add['.$k.']" value="'.$qty.'" size="8" style="text-align:center;" />' : $qty )
+                        .($mode =='edit' ? '<a id="a_save_qty_'.$k.'" href="javascript:save_qty('.$k.')">'.img_picto($langs->trans('Add'), 'plus16@inventory').'</a>' : '')
 			,'qty_view' => $Inventorydet->qty_view ? $Inventorydet->qty_view : 0
 			,'qty_stock' => $stock
 			,'qty_regulated' => $Inventorydet->qty_regulated ? $Inventorydet->qty_regulated : 0
-			,'action' => $user->rights->inventory->write ? '<a onclick="if (!confirm(\'Confirmez-vous la suppression de la ligne ?\')) return false;" href="'.dol_buildpath('inventory/inventory.php?id='.$inventory->getId().'&action=delete_line&rowid='.$Inventorydet->getId(), 1).'">'.img_picto($langs->trans('inventoryDeleteLine'), 'delete').'</a>' : ''
+			,'action' => ($user->rights->inventory->write ? '<a onclick="if (!confirm(\'Confirmez-vous la suppression de la ligne ?\')) return false;" href="'.dol_buildpath('inventory/inventory.php?id='.$inventory->getId().'&action=delete_line&rowid='.$Inventorydet->getId(), 1).'">'.img_picto($langs->trans('inventoryDeleteLine'), 'delete').'</a>' : '')
 			,'pmp_stock'=>round($pmp_actual,2)
             ,'pmp_actual'=> round($pmp * $Inventorydet->qty_view,2)
-			,'pmp_new'=>(!empty($user->rights->inventory->changePMP) ?  $form->texte('', 'new_pmp['.$k.']',$Inventorydet->new_pmp, 8, 0, "style='text-align:right;'")
-                        .($form->type_aff!='view' ? '<a id="a_save_new_pmp_'.$k.'" href="javascript:save_pmp('.$k.')">'.img_picto($langs->trans('Save'), 'bt-save.png@inventory').'</a>' : '') : '' )
-            */,'pa_stock'=>round($last_pa * $stock,2)
+			,'pmp_new'=>(!empty($user->rights->inventory->changePMP) ? '<input type="text" name="new_pmp['.$k.']" value="'.$Inventorydet->new_pmp.'" size="8" style="text-align:right;" />'
+					.($mode =='edit' ? '<a id="a_save_new_pmp_'.$k.'" href="javascript:save_pmp('.$k.')">'.img_picto($langs->trans('Save'), 'bt-save.png@inventory').'</a>' : '') : '')
+            ,'pa_stock'=>round($last_pa * $stock,2)
             ,'pa_actual'=>round($last_pa * $Inventorydet->qty_view,2)
 			,'current_pa_stock'=>round($current_pa * $stock,2)
 			,'current_pa_actual'=>round($current_pa * $Inventorydet->qty_view,2)
@@ -610,80 +612,9 @@ function exportCSV(&$inventory) {
 	exit;
 }
 
-function generateODT(&$PDOdb, &$db, &$conf, &$langs, &$inventory) 
-{
-	$TBS=new TTemplateTBS();
-
-	$InventoryPrint = array(); // Tableau envoyé à la fonction render contenant les informations concernant l'inventaire
-	
-	foreach($inventory->Inventorydet as $k => $v) 
-	{
-		$prod = new Product($db);
-		$prod->fetch($v->fk_product);
-		//$prod->fetch_optionals($prod->id);
-		
-		$InventoryPrint[] = array(
-			'product' => $prod->ref.' - '.$prod->label
-			, 'qty_view' => $v->qty_view
-		);
-	}
-
-	$warehouse = new Entrepot($db);
-	$warehouse->fetch($inventory->fk_warehouse);
-	
-	$dirName = 'INVENTORY'.$inventory->getId().'('.date("d_m_Y").')';
-	$dir = DOL_DATA_ROOT.'/inventory/'.$dirName.'/';
-	
-	@mkdir($dir, 0777, true);
-	
-	$template = "templateINVENTORY.odt";
-	//$template = "templateOF.doc";
-
-	$file_gen = $TBS->render(dol_buildpath('inventory/exempleTemplate/'.$template)
-		,array(
-			'InventoryPrint'=>$InventoryPrint
-		)
-		,array(
-			'date_cre'=>$inventory->get_date('date_cre', 'd/m/Y')
-			,'date_maj'=>$inventory->get_date('date_maj', 'd/m/Y H:i')
-			,'date_inv'=>$inventory->get_date('date_inventory', 'd/m/Y')
-			,'numero'=>empty($inventory->title) ? 'Inventaire n°'.$inventory->getId() : $inventory->title
-			,'warehouse'=>$warehouse->libelle
-			,'status'=>($inventory->status ? $langs->transnoentitiesnoconv('inventoryValidate') : $langs->transnoentitiesnoconv('inventoryDraft'))
-			,'logo'=>DOL_DATA_ROOT."/mycompany/logos/".MAIN_INFO_SOCIETE_LOGO
-		)
-		,array()
-		,array(
-			'outFile'=>$dir.$inventory->getId().".odt"
-			,"convertToPDF"=>(!empty($conf->global->INVENTORY_GEN_PDF) ? true : false)
-			,'charset'=>OPENTBS_ALREADY_UTF8
-			
-		)
-		
-	);
-
-	header("Location: ".DOL_URL_ROOT."/document.php?modulepart=inventory&entity=".$conf->entity."&file=".$dirName."/".$inventory->getId(). (!empty($conf->global->INVENTORY_GEN_PDF) ? '.pdf' : '.odt') );
-	
-   /*
-    $size = filesize("./" . basename($file_gen));
-    header("Content-Type: application/force-download; name=\"" . basename($file_gen) . "\"");
-    header("Content-Transfer-Encoding: binary");
-    header("Content-Length: $size");
-    header("Content-Disposition: attachment; filename=\"" . basename($file_gen) . "\"");
-    header("Expires: 0");
-    header("Cache-Control: no-cache, must-revalidate");
-    header("Pragma: no-cache"); 
-    
-	readfile($file_gen);
-   */
-    
-	//header("Location: ".DOL_URL_ROOT."/document.php?modulepart=asset&entity=1&file=".$dirName."/".$assetOf->numero.".doc");
-
-}
 function _footerList($view,$total_pmp,$total_pmp_actual,$total_pa,$total_pa_actual, $total_current_pa,$total_current_pa_actual) {
 	global $conf,$user,$langs;
 	
-	
 	    if ($view['can_validate'] == 1) { ?>
         <tr style="background-color:#dedede;">
             <th colspan="3">&nbsp;</th>
diff --git a/htdocs/inventory/tpl/inventory.tpl.php b/htdocs/inventory/tpl/inventory.tpl.php
index d7022245f5b..8a3bfd0f2a6 100644
--- a/htdocs/inventory/tpl/inventory.tpl.php
+++ b/htdocs/inventory/tpl/inventory.tpl.php
@@ -154,9 +154,9 @@
 					<td align="center" width="20%"><?php echo $row['action']; ?></td>
 				<?php } ?>
 			</tr>
-			<?php $i++; ?>
-		
-		<?php } 
+			<?php $i++; 
+        
+        } 
 		
 		_footerList($view,$total_pmp,$total_pmp_actual,$total_pa,$total_pa_actual, $total_current_pa,$total_current_pa_actual);
 		?>
@@ -168,18 +168,17 @@
 	<?php if ($view['is_already_validate'] != 1) { ?>
 		<div class="tabsAction" style="height:30px;">
 			<?php if ($view['mode'] == 'view') { ?>
-				<a href="<?php echo $view_url; ?>?id=<?php echo $inventory->id; ?>&action=printDoc" class="butAction"><?php echo $langs->trans('Print') ?></a>
 				<a href="<?php echo $view_url; ?>?id=<?php echo $inventory->id; ?>&action=exportCSV" class="butAction"><?php echo $langs->trans('ExportCSV') ?></a>
 				<a href="<?php echo $view_url; ?>?id=<?php echo $inventory->id; ?>&action=edit" class="butAction"><?php echo $langs->trans('Modify') ?></a>
 				<?php 
 				 if(!empty($user->rights->inventory->changePMP)) {
-				 	echo '<a href="javascript:;" onclick="javascript:if (!confirm(\'Confirmez-vous l\\\'application du nouveau PMP ?\')) return false; else document.location.href=\''.$view_url
+				 	echo '<a href="javascript:;" onclick="if (!confirm(\'Confirmez-vous l\\\'application du nouveau PMP ?\')) return false; else document.location.href=\''.$view_url
 				 			.'?id='.$inventory->id
 				 			.'&action=changePMP&token='.$view['token'].'\'; " class="butAction">'.$langs->trans('ApplyPMP').'</a>';
 				 }
 				
 				if ($can_validate == 1) { ?>
-					<a href="javascript:;" onclick="javascript:if (!confirm('Confirmez-vous la régulation ?')) return false; else document.location.href='<?php echo $view_url; ?>?id=<?php echo $inventory->id; ?>&action=regulate&token=<?php echo $view['token']; ?>'; " class="butAction">Réguler le stock</a>
+					<a href="javascript:;" onclick="if (!confirm('Confirmez-vous la régulation ?')) return false; else document.location.href='<?php echo $view_url; ?>?id=<?php echo $inventory->id; ?>&action=regulate&token=<?php echo $view['token']; ?>'; " class="butAction">Réguler le stock</a>
 				<?php } ?>
 			<?php } ?>
 			<?php if ($view['mode'] == 'edit') { ?>
@@ -196,7 +195,6 @@
 		<div class="tabsAction">
 			<?php if ($can_validate == 1) { ?>
 
-				<a href="<?php echo $view_url; ?>?id=<?php echo $inventory->id; ?>&action=printDoc" class="butAction"><?php echo $langs->trans('Print') ?></a>
 				<a href="<?php echo $view_url; ?>?id=<?php echo $inventory->id; ?>&action=exportCSV" class="butAction"><?php echo $langs->trans('ExportCSV') ?></a>
 				<a href="#" title="Cet inventaire est validé" class="butActionRefused"><?php echo $langs->trans('Delete') ?></a>
 				

From a463759ba3b88cdcc97a263c2cd6e42d5944aaf7 Mon Sep 17 00:00:00 2001
From: Alexis Algoud <alexis@atm-consulting.fr>
Date: Wed, 14 Dec 2016 16:54:05 +0100
Subject: [PATCH 009/505] init query builder into db

---
 htdocs/core/class/coreobject.class.php |  98 +++++++++++++++++++++-
 htdocs/core/db/DoliDB.class.php        | 108 +++++++++++++++++++++++++
 2 files changed, 203 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/class/coreobject.class.php b/htdocs/core/class/coreobject.class.php
index f5e5b0e79a1..8f55a5bf458 100644
--- a/htdocs/core/class/coreobject.class.php
+++ b/htdocs/core/class/coreobject.class.php
@@ -150,7 +150,7 @@ class CoreObject extends CommonObject {
 		
 		foreach ($this->__fields as $field=>$info) {
 	
-			if($this->_is_date($info)){
+			if($this->is_date($info)){
 				if(empty($this->{$field})){
 					$query[$field] = $this->date_0;
 				}
@@ -166,11 +166,11 @@ class CoreObject extends CommonObject {
 		    	$query[$field] = (int)price2num($this->{$field});
 		  	}
 		
-		  	else if($this->_is_float($info)){
+		  	else if($this->is_float($info)){
 		    	$query[$field] = (double)price2num($this->{$field});
 		  	}
 		
-		  	elseif($this->_is_null($info)) {
+		  	elseif($this->is_null($info)) {
 		  		$query[$field] = (is_null($this->{$field}) || (empty($this->{$field}) && $this->{$field}!==0 && $this->{$field}!=='0')?null:$this->{$field});
 		    }
 		    else{
@@ -264,6 +264,20 @@ class CoreObject extends CommonObject {
 	
 		return $k;
 	}
+	
+	public function removeChild($tabName, $id, $key='id') {
+		foreach($this->{$tabName} as &$object) {
+	
+			if($object->{$key} == $id) {
+				$object->to_delete = true;
+				return true;
+			}
+	
+	
+		}
+		return false;
+	}
+	
 	public function fetchChild() {
 
 		if($this->withChild && !empty($this->childtables) && !empty($this->fk_element)) {
@@ -295,18 +309,96 @@ class CoreObject extends CommonObject {
 
 	}
 	
+	public function saveChild(User &$user) {
 	
+		if($this->withChild && !empty($this->childtables) && !empty($this->fk_element)) {
+			foreach($this->childtables as &$childTable) {
+	
+				$className = ucfirst($childTable);
+	
+				foreach($this->{$className} as $i => &$object) {
+	
+					$object->{$this->fk_element} = $this->id;
+					
+					$object->update($user);
+					if($this->unsetChildDeleted && isset($object->to_delete) && $object->to_delete==true) unset($this->{$className}[$i]);
+				}
+	
+			}
+		}
+	}
 	public function update(User &$user) {
 		if(empty($this->id )) return $this->create($user);
 		
+		if(isset($this->to_delete) && $this->to_delete==true) {
+			$this->delete();
+		}
+		else {
+		
+			$query = array();
+			
+			$query['id']=$this->id;
+			if(!isset($this->no_dt_maj))$query['tms'] = date('Y-m-d H:i:s');
+			$this->set_save_query($query);
+		
+			$this->db->update($this->table_element,$query,array('id'));
+			
+			$this->id = $this->db->last_insert_id($this->table_element);
+				
+			$result = $this->call_trigger(strtoupper($this->element). '_UPDATE', $user);
+				
+			$this->saveChild($user);
+		
+		}
+		return $this->id;
+		
 		
 	}
 	public function create(User &$user) {
 		if($this->id>0) return $this->update($user);
 		
+		$query = array();
+		$query['datec'] = date("Y-m-d H:i:s",$this->datec);
+		if(!isset($this->no_dt_maj))$query['tms'] = date('Y-m-d H:i:s');
+		$this->set_save_query($query);
+	
+		$this->db->insert($this->table_element,$query);
+	
+		$this->id = $this->db->last_insert_id($this->table_element);
+		
+		$result = $this->call_trigger(strtoupper($this->element). '_CREATE', $user);
+		
+		$this->saveChild($user);
+	
+	
+		return $this->id;
 		
 	}
+	public function delete(){
+		if($this->id>0){
+			$this->call_trigger(strtoupper($this->element). '_DELETE', $user);
+			$this->db->delete($this->table_element,array('id'=>$this->id),array(0=>'id'));
+			
+			if($this->withChild) {
+				foreach($this->childtables as &$childTable) {
+						
+					$className = ucfirst($childTable);
+					foreach($this->{$className} as &$object) {
+			
+						$object->delete();
+			
+					}
+			
+				}
+			}
+			
+		
+			
+		}
 	
+		
+	
+	}
 	public function get_date($field,$format='') {
 		if(empty($this->{$field})) return '';
 		elseif($this->{$field}<=strtotime('1000-01-01 00:00:00')) return '';
diff --git a/htdocs/core/db/DoliDB.class.php b/htdocs/core/db/DoliDB.class.php
index c63227e1601..395f6009169 100644
--- a/htdocs/core/db/DoliDB.class.php
+++ b/htdocs/core/db/DoliDB.class.php
@@ -288,5 +288,113 @@ abstract class DoliDB implements Database
 	{
 		return $this->lastqueryerror;
 	}
+	
+	/**
+	 *	Generate and execute Update SQL commande
+	 *
+	 * 	@param	string				$table		table to update
+	 *	@param	array				$values		array of values to update
+	 *	@param  int|string|array	$key		key of value to select row to update
+	 *	@return	bool|result						false or boolean
+	 */
+	function update($table,$values,$key){
+	
+		foreach ($value as $k => $v) {
+			if(is_string($v)) $v=stripslashes($v);
+				
+			if (is_array($key)){
+				$i=array_search($k , $key );
+				if ( $i !== false) {
+					$where[] = $key[$i]."=" . $this->escape( $v ) ;
+					continue;
+				}
+			} else {
+				if ( $k == $key) {
+					$where[] = "$k=" .$this->escape( $v ) ;
+					continue;
+				}
+			}
+	
+			if(is_null($v)) $val = 'NULL';
+			else if(is_int($v) || is_double($v)) $val=$v;
+			else $val = $this->escape( $v );
+	
+			$tmp[] = "$k=$val";
+		}
+		$sql = sprintf( "UPDATE $table SET %s WHERE %s" , implode( ",", $tmp ) , implode(" AND ",$where) );
+	
+		$res = $this->query( $sql );
+	
+		if($res===false) {
+			//error
+			return false;
+		}
+	
+		return true;
+	}
+	
+	/**
+	 *	Generate and execute Insert SQL commande
+	 *
+	 * 	@param	string				$table		table to update
+	 *	@param	array				$values		array of values to update
+	 *	@return	bool|result						false or boolean
+	 */
+	function insert($table,$values){
+		 
+		foreach ($values as $k => $v) {
+	
+			$fields[] = $k;
+			if(is_null($v)){
+				$values[] = 'NULL';
+			}else{
+				$v=stripslashes($v);
+				$values[] =$this->escape( $v );
+			}
+		}
+		$sql = sprintf( 'INSERT INTO '.$table.' ( %s ) values( %s ) ', implode( ",", $fields ) ,  implode( ",", $values ) );
+	
+		$res = $this->query($sql);
+		
+		if($res===false) {
+	
+			return false;
+		}
+		
+		return true;
+	}
+	
+	/**
+	 *	Generate and execute Delete SQL commande
+	 *
+	 * 	@param	string				$table		table for the delete
+	 *	@param	array				$values		array of values to delete
+	 *	@param  int|string|array	$key		key of value to select row to update
+	 *	@return	bool|result						false or boolean
+	 */
+	function delete($table,$values,$key){
+		foreach ($values as $k => $v) {
+			if(is_string($v)) $v=stripslashes($v);
+		
+			if (is_array($key)){
+				$i=array_search($k , $key );
+				if ( $i !== false) {
+					$where[] = $key[$i]."=" . $this->escape( $v ) ;
+					continue;
+				}
+			} else {
+				if ( $k == $key) {
+					$where[] = "$k=" .$this->escape( $v ) ;
+					continue;
+				}
+			}
+			
+		}
+	
+		$sql = sprintf( 'DELETE FROM '.$table.' WHERE '.implode(" AND ",$where));
+	
+		return $this->query( $sql );
+	}
+	
 }
 

From 703b8708e3702b21cf4027e2ad0d5c071298dfab Mon Sep 17 00:00:00 2001
From: Alexis Algoud <alexis@atm-consulting.fr>
Date: Thu, 15 Dec 2016 10:39:59 +0100
Subject: [PATCH 010/505] fix create

---
 htdocs/core/class/coreobject.class.php     |  66 +++--
 htdocs/core/db/DoliDB.class.php            |  55 ++--
 htdocs/core/modules/modinventory.class.php | 329 +++++++++++++++++++++
 htdocs/inventory/class/inventory.class.php |   4 +-
 htdocs/inventory/img/bt-save.png           | Bin 0 -> 493 bytes
 htdocs/inventory/inventory.php             |   5 +-
 6 files changed, 401 insertions(+), 58 deletions(-)
 create mode 100644 htdocs/core/modules/modinventory.class.php
 create mode 100644 htdocs/inventory/img/bt-save.png

diff --git a/htdocs/core/class/coreobject.class.php b/htdocs/core/class/coreobject.class.php
index 8f55a5bf458..7613a556092 100644
--- a/htdocs/core/class/coreobject.class.php
+++ b/htdocs/core/class/coreobject.class.php
@@ -31,7 +31,14 @@ class CoreObject extends CommonObject {
 	
 	public $withChild = true;
 	
-	protected $__fields=array(); 
+	public $no_update_tms = false;
+	
+	public $date_0 = '1001-01-01 00:00:00'; //TODO there is a solution for this ?
+	
+	/*
+	 *  @var Array $_fields Fields to synchronize with Database
+	 */
+	protected $__fields=array();
 	 /**
 	 *  Constructor
 	 *
@@ -39,7 +46,7 @@ class CoreObject extends CommonObject {
 	 */
 	function __construct(DoliDB &$db) {
 		
-		$this->date_0 = '1001-01-01 00:00:00'; //TODO there is a solution for this ?
+
 	}
 	
 	protected function init() {
@@ -142,11 +149,7 @@ class CoreObject extends CommonObject {
 		
 	private function set_save_query(){
 		
-		$query=array(
-			'rowid'=>$this->id
-			,'datec'=>($this->id>0 ? $this->db->jdate($this->datec) : time())
-			,'tms'=>time()
-		);
+		$query=array();
 		
 		foreach ($this->__fields as $field=>$info) {
 	
@@ -315,20 +318,21 @@ class CoreObject extends CommonObject {
 			foreach($this->childtables as &$childTable) {
 	
 				$className = ucfirst($childTable);
-	
-				foreach($this->{$className} as $i => &$object) {
-	
-					$object->{$this->fk_element} = $this->id;
-					
-					$object->update($user);
-					if($this->unsetChildDeleted && isset($object->to_delete) && $object->to_delete==true) unset($this->{$className}[$i]);
+				if(!empty($this->{$className})) {
+					foreach($this->{$className} as $i => &$object) {
+		
+						$object->{$this->fk_element} = $this->id;
+						
+						$object->update($user);
+						if($this->unsetChildDeleted && isset($object->to_delete) && $object->to_delete==true) unset($this->{$className}[$i]);
+					}
 				}
 	
 			}
 		}
 	}
 	public function update(User &$user) {
-		if(empty($this->id )) return $this->create($user);
+		if(empty($this->id )) return $this->create($user); // To test, with that, no need to test on high level object, the core decide it, update just needed
 		
 		if(isset($this->to_delete) && $this->to_delete==true) {
 			$this->delete();
@@ -337,10 +341,10 @@ class CoreObject extends CommonObject {
 		
 			$query = array();
 			
+			$query = $this->set_save_query();
 			$query['id']=$this->id;
-			if(!isset($this->no_dt_maj))$query['tms'] = date('Y-m-d H:i:s');
-			$this->set_save_query($query);
-		
+			if(empty($this->no_update_tms))$query['tms'] = date('Y-m-d H:i:s');
+				
 			$this->db->update($this->table_element,$query,array('id'));
 			
 			$this->id = $this->db->last_insert_id($this->table_element);
@@ -358,21 +362,25 @@ class CoreObject extends CommonObject {
 		if($this->id>0) return $this->update($user);
 		
 		$query = array();
+		$query = $this->set_save_query();
 		$query['datec'] = date("Y-m-d H:i:s",$this->datec);
-		if(!isset($this->no_dt_maj))$query['tms'] = date('Y-m-d H:i:s');
-		$this->set_save_query($query);
-	
-		$this->db->insert($this->table_element,$query);
-	
-		$this->id = $this->db->last_insert_id($this->table_element);
+		if(empty($this->no_update_tms))$query['tms'] = date('Y-m-d H:i:s');
 		
-		$result = $this->call_trigger(strtoupper($this->element). '_CREATE', $user);
-		
-		$this->saveChild($user);
+		$res = $this->db->insert($this->table_element,$query);
 	
+		if($res) {
+			$this->id = $this->db->last_insert_id($this->table_element);
+			
+			$result = $this->call_trigger(strtoupper($this->element). '_CREATE', $user);
+			
+			$this->saveChild($user);
+			
+			return $this->id;
+		}
+		else{
+			return false;
+		}
 	
-		return $this->id;
-		
 	}
 	public function delete(){
 		if($this->id>0){
diff --git a/htdocs/core/db/DoliDB.class.php b/htdocs/core/db/DoliDB.class.php
index 395f6009169..85766c31949 100644
--- a/htdocs/core/db/DoliDB.class.php
+++ b/htdocs/core/db/DoliDB.class.php
@@ -288,6 +288,19 @@ abstract class DoliDB implements Database
 	{
 		return $this->lastqueryerror;
 	}
+	/*
+	 * Add quote to field value if necessary
+	 * 
+	 * @param string|int	$value	value to protect
+	 * @return string|int 
+	*/
+	function quote($value) {
+		
+		if(is_null($value)) return 'NULL';
+		else if(is_numeric($value)) return $value;
+		else return "'".$this->escape( $value )."'";
+		
+	}
 	
 	/**
 	 *	Generate and execute Update SQL commande
@@ -297,31 +310,27 @@ abstract class DoliDB implements Database
 	 *	@param  int|string|array	$key		key of value to select row to update
 	 *	@return	bool|result						false or boolean
 	 */
-	function update($table,$values,$key){
+	function update($table,$fields,$key){
 	
-		foreach ($value as $k => $v) {
+		foreach ($fields as $k => $v) {
 			if(is_string($v)) $v=stripslashes($v);
 				
 			if (is_array($key)){
 				$i=array_search($k , $key );
 				if ( $i !== false) {
-					$where[] = $key[$i]."=" . $this->escape( $v ) ;
+					$where[] = $key[$i].'=' . $this->quote( $v ) ;
 					continue;
 				}
 			} else {
 				if ( $k == $key) {
-					$where[] = "$k=" .$this->escape( $v ) ;
+					$where[] = $k.'=' .$this->quote( $v ) ;
 					continue;
 				}
 			}
 	
-			if(is_null($v)) $val = 'NULL';
-			else if(is_int($v) || is_double($v)) $val=$v;
-			else $val = $this->escape( $v );
-	
-			$tmp[] = "$k=$val";
+			$tmp[] = $k.'='.$this->quote($val);
 		}
-		$sql = sprintf( "UPDATE $table SET %s WHERE %s" , implode( ",", $tmp ) , implode(" AND ",$where) );
+		$sql = sprintf( 'UPDATE '.MAIN_DB_PREFIX.$table.' SET %s WHERE %s' , implode( ',', $tmp ) , implode(' AND ',$where) );
 	
 		$res = $this->query( $sql );
 	
@@ -340,22 +349,18 @@ abstract class DoliDB implements Database
 	 *	@param	array				$values		array of values to update
 	 *	@return	bool|result						false or boolean
 	 */
-	function insert($table,$values){
+	function insert($table,$fields){
 		 
-		foreach ($values as $k => $v) {
+		foreach ($fields as $k => $v) {
 	
-			$fields[] = $k;
-			if(is_null($v)){
-				$values[] = 'NULL';
-			}else{
-				$v=stripslashes($v);
-				$values[] =$this->escape( $v );
-			}
+			$keys[] = $k;
+			$values[] = $this->quote($v);
+			
 		}
-		$sql = sprintf( 'INSERT INTO '.$table.' ( %s ) values( %s ) ', implode( ",", $fields ) ,  implode( ",", $values ) );
-	
-		$res = $this->query($sql);
 		
+		$sql = sprintf( 'INSERT INTO '.MAIN_DB_PREFIX.$table.' ( %s ) values( %s ) ', implode( ",", $keys ) ,  implode( ",", $values ) );
+
+		$res = $this->query($sql);
 		if($res===false) {
 	
 			return false;
@@ -372,8 +377,8 @@ abstract class DoliDB implements Database
 	 *	@param  int|string|array	$key		key of value to select row to update
 	 *	@return	bool|result						false or boolean
 	 */
-	function delete($table,$values,$key){
-		foreach ($values as $k => $v) {
+	function delete($table,$fields,$key){
+		foreach ($fields as $k => $v) {
 			if(is_string($v)) $v=stripslashes($v);
 		
 			if (is_array($key)){
@@ -391,7 +396,7 @@ abstract class DoliDB implements Database
 			
 		}
 	
-		$sql = sprintf( 'DELETE FROM '.$table.' WHERE '.implode(" AND ",$where));
+		$sql = sprintf( 'DELETE FROM '.MAIN_DB_PREFIX.$table.' WHERE '.implode(' AND ',$where));
 	
 		return $this->query( $sql );
 	}
diff --git a/htdocs/core/modules/modinventory.class.php b/htdocs/core/modules/modinventory.class.php
new file mode 100644
index 00000000000..10fb1cc477e
--- /dev/null
+++ b/htdocs/core/modules/modinventory.class.php
@@ -0,0 +1,329 @@
+<?php
+/* Copyright (C) 2003      Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
+ *
+ * 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/>.
+ */
+
+/**
+ * 	\defgroup   inventory     Module inventory
+ *  \brief      Example of a module descriptor.
+ *				Such a file must be copied into htdocs/inventory/core/modules directory.
+ *  \file       htdocs/inventory/core/modules/modinventory.class.php
+ *  \ingroup    inventory
+ *  \brief      Description and activation file for module inventory
+ */
+include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
+
+
+/**
+ *  Description and activation class for module inventory
+ */
+class modinventory extends DolibarrModules
+{
+	/**
+	 *   Constructor. Define names, constants, directories, boxes, permissions
+	 *
+	 *   @param      DoliDB		$db      Database handler
+	 */
+	function __construct($db)
+	{
+        global $langs,$conf;
+
+        $this->db = $db;
+
+		// Id for module (must be unique).
+		// Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id).
+		$this->numero = 104420; // 104000 to 104999 for ATM CONSULTING
+		// Key text used to identify module (for permissions, menus, etc...)
+		$this->rights_class = 'inventory';
+
+		// Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
+		// It is used to group modules in module setup page
+		$this->family = "products";
+		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+		$this->name = preg_replace('/^mod/i','',get_class($this));
+		// Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
+		$this->description = "Description of module inventory";
+		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
+		$this->version = 'dolibarr';
+		// Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
+		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+		// Where to store the module in setup page (0=common,1=interface,2=others,3=very specific)
+		$this->special = 0;
+		// Name of image file used for this module.
+		// If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
+		// If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
+		$this->picto='inventory@inventory';
+
+		// Defined all module parts (triggers, login, substitutions, menus, css, etc...)
+		// for default path (eg: /inventory/core/xxxxx) (0=disable, 1=enable)
+		// for specific path of parts (eg: /inventory/core/modules/barcode)
+		// for specific css file (eg: /inventory/css/inventory.css.php)
+		//$this->module_parts = array(
+		//                        	'triggers' => 0,                                 	// Set this to 1 if module has its own trigger directory (core/triggers)
+		//							'login' => 0,                                    	// Set this to 1 if module has its own login method directory (core/login)
+		//							'substitutions' => 0,                            	// Set this to 1 if module has its own substitution function file (core/substitutions)
+		//							'menus' => 0,                                    	// Set this to 1 if module has its own menus handler directory (core/menus)
+		//							'theme' => 0,                                    	// Set this to 1 if module has its own theme directory (theme)
+		//                        	'tpl' => 0,                                      	// Set this to 1 if module overwrite template dir (core/tpl)
+		//							'barcode' => 0,                                  	// Set this to 1 if module has its own barcode directory (core/modules/barcode)
+		//							'models' => 0,                                   	// Set this to 1 if module has its own models directory (core/modules/xxx)
+		//							'css' => array('/inventory/css/inventory.css.php'),	// Set this to relative path of css file if module has its own css file
+	 	//							'js' => array('/inventory/js/inventory.js'),          // Set this to relative path of js file if module must load a js on all pages
+		//							'hooks' => array('hookcontext1','hookcontext2')  	// Set here all hooks context managed by module
+		//							'dir' => array('output' => 'othermodulename'),      // To force the default directories names
+		//							'workflow' => array('WORKFLOW_MODULE1_YOURACTIONTYPE_MODULE2'=>array('enabled'=>'! empty($conf->module1->enabled) && ! empty($conf->module2->enabled)', 'picto'=>'yourpicto@inventory')) // Set here all workflow context managed by module
+		//                        );
+		$this->module_parts = array();
+
+		// Data directories to create when module is enabled.
+		// Example: this->dirs = array("/inventory/temp");
+		$this->dirs = array();
+
+		// Config pages. Put here list of php page, stored into inventory/admin directory, to use to setup module.
+		$this->config_page_url = array("inventory_setup.php@inventory");
+
+		// Dependencies
+		$this->hidden = false;			// A condition to hide module
+		$this->depends = array('modStock');		// List of modules id that must be enabled if this module is enabled
+		$this->requiredby = array();	// List of modules id to disable if this one is disabled
+		$this->conflictwith = array();	// List of modules id this module is in conflict with
+		$this->phpmin = array(5,0);					// Minimum version of PHP required by module
+		$this->need_dolibarr_version = array(3,0);	// Minimum version of Dolibarr required by module
+		$this->langfiles = array("inventory@inventory");
+
+		// Constants
+		// List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 'current' or 'allentities', deleteonunactive)
+		// Example: $this->const=array(0=>array('MYMODULE_MYNEWCONST1','chaine','myvalue','This is a constant to add',1),
+		//                             1=>array('MYMODULE_MYNEWCONST2','chaine','myvalue','This is another constant to add',0, 'current', 1)
+		// );
+		$this->const = array();
+
+		// Array to add new pages in new tabs
+		// Example: $this->tabs = array('objecttype:+tabname1:Title1:mylangfile@inventory:$user->rights->inventory->read:/inventory/mynewtab1.php?id=__ID__',  	// To add a new tab identified by code tabname1
+        //                              'objecttype:+tabname2:Title2:mylangfile@inventory:$user->rights->othermodule->read:/inventory/mynewtab2.php?id=__ID__',  	// To add another new tab identified by code tabname2
+        //                              'objecttype:-tabname:NU:conditiontoremove');                                                     						// To remove an existing tab identified by code tabname
+		// where objecttype can be
+		// 'categories_x'	  to add a tab in category view (replace 'x' by type of category (0=product, 1=supplier, 2=customer, 3=member)
+		// 'contact'          to add a tab in contact view
+		// 'contract'         to add a tab in contract view
+		// 'group'            to add a tab in group view
+		// 'intervention'     to add a tab in intervention view
+		// 'invoice'          to add a tab in customer invoice view
+		// 'invoice_supplier' to add a tab in supplier invoice view
+		// 'member'           to add a tab in fundation member view
+		// 'opensurveypoll'	  to add a tab in opensurvey poll view
+		// 'order'            to add a tab in customer order view
+		// 'order_supplier'   to add a tab in supplier order view
+		// 'payment'		  to add a tab in payment view
+		// 'payment_supplier' to add a tab in supplier payment view
+		// 'product'          to add a tab in product view
+		// 'propal'           to add a tab in propal view
+		// 'project'          to add a tab in project view
+		// 'stock'            to add a tab in stock view
+		// 'thirdparty'       to add a tab in third party view
+		// 'user'             to add a tab in user view
+        $this->tabs = array();
+
+        // Dictionaries
+	    if (! isset($conf->inventory->enabled))
+        {
+        	$conf->inventory=new stdClass();
+        	$conf->inventory->enabled=0;
+        }
+		$this->dictionaries=array();
+        /* Example:
+        if (! isset($conf->inventory->enabled)) $conf->inventory->enabled=0;	// This is to avoid warnings
+        $this->dictionaries=array(
+            'langs'=>'mylangfile@inventory',
+            'tabname'=>array(MAIN_DB_PREFIX."table1",MAIN_DB_PREFIX."table2",MAIN_DB_PREFIX."table3"),		// List of tables we want to see into dictonnary editor
+            'tablib'=>array("Table1","Table2","Table3"),													// Label of tables
+            'tabsql'=>array('SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table1 as f','SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table2 as f','SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table3 as f'),	// Request to select fields
+            'tabsqlsort'=>array("label ASC","label ASC","label ASC"),																					// Sort order
+            'tabfield'=>array("code,label","code,label","code,label"),																					// List of fields (result of select to show dictionary)
+            'tabfieldvalue'=>array("code,label","code,label","code,label"),																				// List of fields (list of fields to edit a record)
+            'tabfieldinsert'=>array("code,label","code,label","code,label"),																			// List of fields (list of fields for insert)
+            'tabrowid'=>array("rowid","rowid","rowid"),																									// Name of columns with primary key (try to always name it 'rowid')
+            'tabcond'=>array($conf->inventory->enabled,$conf->inventory->enabled,$conf->inventory->enabled)												// Condition to show each dictionary
+        );
+        */
+
+        // Boxes
+		// Add here list of php file(s) stored in core/boxes that contains class to show a box.
+        $this->boxes = array();			// List of boxes
+		// Example:
+		//$this->boxes=array(array(0=>array('file'=>'myboxa.php','note'=>'','enabledbydefaulton'=>'Home'),1=>array('file'=>'myboxb.php','note'=>''),2=>array('file'=>'myboxc.php','note'=>'')););
+
+		$langs->load('inventory@inventory');
+		
+		// Permissions
+		$this->rights = array();		// Permission array used by this module
+		$r=0;
+
+		// Add here list of permission defined by an id, a label, a boolean and two constant strings.
+		// Example:
+		// $this->rights[$r][0] = $this->numero + $r;	// Permission id (must not be already used)
+		// $this->rights[$r][1] = 'Permision label';	// Permission label
+		// $this->rights[$r][3] = 1; 					// Permission by default for new user (0/1)
+		// $this->rights[$r][4] = 'level1';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		// $this->rights[$r][5] = 'level2';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		// $r++;
+		
+		$this->rights[$r][0] = $this->numero + $r;	// Permission id (must not be already used)
+		$this->rights[$r][1] = 'inventoryReadPermission';	// Permission label
+		$this->rights[$r][3] = 1; 					// Permission by default for new user (0/1)
+		$this->rights[$r][4] = 'read';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		$r++;
+		
+		$this->rights[$r][0] = $this->numero + $r;	// Permission id (must not be already used)
+		$this->rights[$r][1] = 'inventoryCreatePermission';	// Permission label
+		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
+		$this->rights[$r][4] = 'create';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		$r++;
+	
+		$this->rights[$r][0] = $this->numero + $r;	// Permission id (must not be already used)
+		$this->rights[$r][1] = 'inventoryWritePermission';	// Permission label
+		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
+		$this->rights[$r][4] = 'write';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		$r++;
+		
+		$this->rights[$r][0] = $this->numero + $r;	// Permission id (must not be already used)
+		$this->rights[$r][1] = 'inventoryValidatePermission';	// Permission label
+		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
+		$this->rights[$r][4] = 'validate';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		$r++;
+
+		$this->rights[$r][0] = $this->numero + $r;	// Permission id (must not be already used)
+		$this->rights[$r][1] = 'inventoryChangePMPPermission';	// Permission label
+		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
+		$this->rights[$r][4] = 'changePMP';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		$r++;
+
+		// Main menu entries
+		$this->menu = array();			// List of menus to add
+		$r=0;
+
+		// Add here entries to declare new menus
+		//
+		// Example to declare a new Top Menu entry and its Left menu entry:
+		// $this->menu[$r]=array(	'fk_menu'=>0,			                // Put 0 if this is a top menu
+		//							'type'=>'top',			                // This is a Top menu entry
+		//							'titre'=>'inventory top menu',
+		//							'mainmenu'=>'inventory',
+		//							'leftmenu'=>'inventory',
+		//							'url'=>'/inventory/pagetop.php',
+		//							'langs'=>'mylangfile@inventory',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+		//							'position'=>100,
+		//							'enabled'=>'$conf->inventory->enabled',	// Define condition to show or hide menu entry. Use '$conf->inventory->enabled' if entry must be visible if module is enabled.
+		//							'perms'=>'1',			                // Use 'perms'=>'$user->rights->inventory->level1->level2' if you want your menu with a permission rules
+		//							'target'=>'',
+		//							'user'=>2);				                // 0=Menu for internal users, 1=external users, 2=both
+		// $r++;
+		//
+		// Example to declare a Left Menu entry into an existing Top menu entry:
+		// $this->menu[$r]=array(	'fk_menu'=>'fk_mainmenu=xxx',		    // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+		//							'type'=>'left',			                // This is a Left menu entry
+		//							'titre'=>'inventory left menu',
+		//							'mainmenu'=>'xxx',
+		//							'leftmenu'=>'inventory',
+		//							'url'=>'/inventory/pagelevel2.php',
+		//							'langs'=>'mylangfile@inventory',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+		//							'position'=>100,
+		//							'enabled'=>'$conf->inventory->enabled',  // Define condition to show or hide menu entry. Use '$conf->inventory->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+		//							'perms'=>'1',			                // Use 'perms'=>'$user->rights->inventory->level1->level2' if you want your menu with a permission rules
+		//							'target'=>'',
+		//							'user'=>2);				                // 0=Menu for internal users, 1=external users, 2=both
+		// $r++;
+		$this->menu[$r]=array(	'fk_menu'=>'fk_mainmenu=products,fk_leftmenu=stock',			                // Put 0 if this is a top menu
+								'type'=>'left',			                // This is a Top menu entry
+								'titre'=>'Liste des inventaires',
+								'mainmenu'=>'inventory',
+								'leftmenu'=>'inventory',
+								'url'=>'/inventory/inventory.php?action=list',
+								'langs'=>'inventory@inventory',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+								'position'=>100,
+								'enabled'=>'$conf->inventory->enabled',	// Define condition to show or hide menu entry. Use '$conf->inventory->enabled' if entry must be visible if module is enabled.
+								'perms'=>'$user->rights->inventory->read',			                // Use 'perms'=>'$user->rights->inventory->level1->level2' if you want your menu with a permission rules
+								'target'=>'',
+								'user'=>2);				                // 0=Menu for internal users, 1=external users, 2=both
+		$r++;
+		
+		$this->menu[$r]=array(	'fk_menu'=>'fk_mainmenu=products,fk_leftmenu=stock',			                // Put 0 if this is a top menu
+								'type'=>'left',			                // This is a Top menu entry
+								'titre'=>'Nouvel inventaire',
+								'mainmenu'=>'inventory',
+								'leftmenu'=>'inventory',
+								'url'=>'/inventory/inventory.php?action=create',
+								'langs'=>'inventory@inventory',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+								'position'=>100,
+								'enabled'=>'$conf->inventory->enabled',	// Define condition to show or hide menu entry. Use '$conf->inventory->enabled' if entry must be visible if module is enabled.
+								'perms'=>'$user->rights->inventory->create',			                // Use 'perms'=>'$user->rights->inventory->level1->level2' if you want your menu with a permission rules
+								'target'=>'',
+								'user'=>2);				                // 0=Menu for internal users, 1=external users, 2=both
+		$r++;
+
+		// Exports
+		$r=1;
+
+		// Example:
+		// $this->export_code[$r]=$this->rights_class.'_'.$r;
+		// $this->export_label[$r]='CustomersInvoicesAndInvoiceLines';	// Translation key (used only if key ExportDataset_xxx_z not found)
+        // $this->export_enabled[$r]='1';                               // Condition to show export in list (ie: '$user->id==3'). Set to 1 to always show when module is enabled.
+		// $this->export_permission[$r]=array(array("facture","facture","export"));
+		// $this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','s.fk_pays'=>'Country','s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.code_compta'=>'CustomerAccountancyCode','s.code_compta_fournisseur'=>'SupplierAccountancyCode','f.rowid'=>"InvoiceId",'f.facnumber'=>"InvoiceRef",'f.datec'=>"InvoiceDateCreation",'f.datef'=>"DateInvoice",'f.total'=>"TotalHT",'f.total_ttc'=>"TotalTTC",'f.tva'=>"TotalVAT",'f.paye'=>"InvoicePaid",'f.fk_statut'=>'InvoiceStatus','f.note'=>"InvoiceNote",'fd.rowid'=>'LineId','fd.description'=>"LineDescription",'fd.price'=>"LineUnitPrice",'fd.tva_tx'=>"LineVATRate",'fd.qty'=>"LineQty",'fd.total_ht'=>"LineTotalHT",'fd.total_tva'=>"LineTotalTVA",'fd.total_ttc'=>"LineTotalTTC",'fd.date_start'=>"DateStart",'fd.date_end'=>"DateEnd",'fd.fk_product'=>'ProductId','p.ref'=>'ProductRef');
+		// $this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','s.fk_pays'=>'company','s.phone'=>'company','s.siren'=>'company','s.siret'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.code_compta'=>'company','s.code_compta_fournisseur'=>'company','f.rowid'=>"invoice",'f.facnumber'=>"invoice",'f.datec'=>"invoice",'f.datef'=>"invoice",'f.total'=>"invoice",'f.total_ttc'=>"invoice",'f.tva'=>"invoice",'f.paye'=>"invoice",'f.fk_statut'=>'invoice','f.note'=>"invoice",'fd.rowid'=>'invoice_line','fd.description'=>"invoice_line",'fd.price'=>"invoice_line",'fd.total_ht'=>"invoice_line",'fd.total_tva'=>"invoice_line",'fd.total_ttc'=>"invoice_line",'fd.tva_tx'=>"invoice_line",'fd.qty'=>"invoice_line",'fd.date_start'=>"invoice_line",'fd.date_end'=>"invoice_line",'fd.fk_product'=>'product','p.ref'=>'product');
+		// $this->export_sql_start[$r]='SELECT DISTINCT ';
+		// $this->export_sql_end[$r]  =' FROM ('.MAIN_DB_PREFIX.'facture as f, '.MAIN_DB_PREFIX.'facturedet as fd, '.MAIN_DB_PREFIX.'societe as s)';
+		// $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';
+		// $this->export_sql_order[$r] .=' ORDER BY s.nom';
+		// $r++;
+	}
+
+	/**
+	 *		Function called when module is enabled.
+	 *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
+	 *		It also creates data directories
+	 *
+     *      @param      string	$options    Options when enabling module ('', 'noboxes')
+	 *      @return     int             	1 if OK, 0 if KO
+	 */
+	function init($options='')
+	{
+		$sql = array();
+		define('INC_FROM_DOLIBARR', true);
+		dol_include_once('/inventory/config.php');
+		dol_include_once("/inventory/script/create-maj-base.php");
+		
+		return $this->_init($sql, $options);
+	}
+
+	/**
+	 *		Function called when module is disabled.
+	 *      Remove from database constants, boxes and permissions from Dolibarr database.
+	 *		Data directories are not deleted
+	 *
+     *      @param      string	$options    Options when enabling module ('', 'noboxes')
+	 *      @return     int             	1 if OK, 0 if KO
+	 */
+	function remove($options='')
+	{
+		$sql = array();
+
+		return $this->_remove($sql, $options);
+	}
+
+}
diff --git a/htdocs/inventory/class/inventory.class.php b/htdocs/inventory/class/inventory.class.php
index f2ff6484c64..76ed46c4aa8 100644
--- a/htdocs/inventory/class/inventory.class.php
+++ b/htdocs/inventory/class/inventory.class.php
@@ -159,7 +159,7 @@ class Inventory extends CoreObject
 		parent::update($user);
 	}
 	
-	function set_values($Tab)
+	function set_values(&$Tab)
 	{
 		global $db,$langs;
 		
@@ -183,7 +183,7 @@ class Inventory extends CoreObject
 			}	
 		}
 		
-		return parent::set_values($Tab);
+		parent::set_values($Tab);
 	}
 	
     function deleteAllLine() {
diff --git a/htdocs/inventory/img/bt-save.png b/htdocs/inventory/img/bt-save.png
new file mode 100644
index 0000000000000000000000000000000000000000..f20d292ca91805ab875cbb48391cba2e94e3f194
GIT binary patch
literal 493
zcmV<J0TTX+P)<h;3K|Lk000e1NJLTq000pH000pP1^@s6J8eh$0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzk4Z#9RCwB?RIy3}K@gogf>;DB6!8NR
z1gjKw5($c?FkoS2VIkVsX<-$VG!`O)SSTs9h<{)au@C}cZ*M*ziUuSX&F#!aXZG$i
zF&9m6;4!yzJ8$32ENkWSdHAnIZeIpIwANtTHV_dIA}9tb1<Jtny#kat!?G-pobAkH
zoH;5HVam+SK=Gyo7uhvX)Px4(U1@kj&7OR(O?)exgN5`wTo$h+HO;s-B)ZxBl6F)o
z8%3zlJKYrp%B&Zs6J`$*2HRtdJCB5u0^3Z*epMnyNbNl_L9VYaC5W9Q{VHiG=bHq5
zl9j!)Kd0j<2`h(55)<R*r<~%Al046AYWbEpQ9Fqpkn}@<6rv;`*j=6l*Y8K2d*QeQ
zwFVkrXY8Mz!^luHTuGonZ2h1B8;6CiSKQp{P!hj{UQ7ry=}wZz=W567yO|JZ{i7$z
zVHGbu>4(>v14}z6zFdUW+_4$A*W93~2-T2sq_LIMs7|t<;^mkZ8tnBIC^H<%a2WSO
j#)$U$lt^ynQ-A>gD&Upv=pk<>00000NkvXXu0mjflc~?j

literal 0
HcmV?d00001

diff --git a/htdocs/inventory/inventory.php b/htdocs/inventory/inventory.php
index 4e70ee1b4cc..1d9ec174257 100644
--- a/htdocs/inventory/inventory.php
+++ b/htdocs/inventory/inventory.php
@@ -77,6 +77,7 @@ function _action()
 			$inventory->set_values($_POST);
 			
             $fk_inventory = $inventory->create($user);
+			
             $fk_category = (int)GETPOST('fk_category');
             $fk_supplier = (int)GETPOST('fk_supplier');
             $fk_warehouse = (int)GETPOST('fk_warehouse');
@@ -490,7 +491,7 @@ function _card(&$inventory, $mode='edit')
 
 function _card_line(&$inventory, &$lines, $mode)
 {
-	global $db;
+	global $db,$langs,$user,$conf;
 	$inventory->amount_actual = 0;
 	
 	$TCacheEntrepot = array();
@@ -523,7 +524,7 @@ function _card_line(&$inventory, &$lines, $mode)
 			,'qty_view' => $Inventorydet->qty_view ? $Inventorydet->qty_view : 0
 			,'qty_stock' => $stock
 			,'qty_regulated' => $Inventorydet->qty_regulated ? $Inventorydet->qty_regulated : 0
-			,'action' => ($user->rights->inventory->write ? '<a onclick="if (!confirm(\'Confirmez-vous la suppression de la ligne ?\')) return false;" href="'.dol_buildpath('inventory/inventory.php?id='.$inventory->getId().'&action=delete_line&rowid='.$Inventorydet->getId(), 1).'">'.img_picto($langs->trans('inventoryDeleteLine'), 'delete').'</a>' : '')
+			,'action' => ($user->rights->inventory->write ? '<a onclick="if (!confirm(\'Confirmez-vous la suppression de la ligne ?\')) return false;" href="'.dol_buildpath('inventory/inventory.php?id='.$inventory->id.'&action=delete_line&rowid='.$Inventorydet->id, 1).'">'.img_picto($langs->trans('inventoryDeleteLine'), 'delete').'</a>' : '')
 			,'pmp_stock'=>round($pmp_actual,2)
             ,'pmp_actual'=> round($pmp * $Inventorydet->qty_view,2)
 			,'pmp_new'=>(!empty($user->rights->inventory->changePMP) ? '<input type="text" name="new_pmp['.$k.']" value="'.$Inventorydet->new_pmp.'" size="8" style="text-align:right;" />'

From 81b01cd05529218ac7dda3a7ad7c55b1fca6d268 Mon Sep 17 00:00:00 2001
From: Alexis Algoud <alexis@atm-consulting.fr>
Date: Thu, 15 Dec 2016 11:23:13 +0100
Subject: [PATCH 011/505] fix

---
 htdocs/core/class/coreobject.class.php     |  21 +--
 htdocs/core/db/DoliDB.class.php            |  26 ++--
 htdocs/inventory/admin/inventory_setup.php | 168 +++++++++++++++++++++
 htdocs/inventory/ajax/ajax.inventory.php   |  19 +--
 htdocs/inventory/img/plus.png              | Bin 0 -> 1299 bytes
 htdocs/inventory/img/plus16.png            | Bin 0 -> 665 bytes
 htdocs/inventory/inventory.php             |  68 ++++-----
 htdocs/inventory/tpl/inventory.tpl.php     |   6 +-
 8 files changed, 239 insertions(+), 69 deletions(-)
 create mode 100644 htdocs/inventory/admin/inventory_setup.php
 create mode 100644 htdocs/inventory/img/plus.png
 create mode 100644 htdocs/inventory/img/plus16.png

diff --git a/htdocs/core/class/coreobject.class.php b/htdocs/core/class/coreobject.class.php
index 7613a556092..75706403069 100644
--- a/htdocs/core/class/coreobject.class.php
+++ b/htdocs/core/class/coreobject.class.php
@@ -342,10 +342,10 @@ class CoreObject extends CommonObject {
 			$query = array();
 			
 			$query = $this->set_save_query();
-			$query['id']=$this->id;
+			$query['rowid']=$this->id;
 			if(empty($this->no_update_tms))$query['tms'] = date('Y-m-d H:i:s');
 				
-			$this->db->update($this->table_element,$query,array('id'));
+			$this->db->update($this->table_element,$query,array('rowid'));
 			
 			$this->id = $this->db->last_insert_id($this->table_element);
 				
@@ -382,19 +382,22 @@ class CoreObject extends CommonObject {
 		}
 	
 	}
-	public function delete(){
+	public function delete(User &$user){
 		if($this->id>0){
 			$this->call_trigger(strtoupper($this->element). '_DELETE', $user);
-			$this->db->delete($this->table_element,array('id'=>$this->id),array(0=>'id'));
 			
-			if($this->withChild) {
+			$this->db->delete($this->table_element,array('rowid'=>$this->id),array('rowid'));
+			
+			if($this->withChild && !empty($this->childtables)) {
 				foreach($this->childtables as &$childTable) {
 						
 					$className = ucfirst($childTable);
-					foreach($this->{$className} as &$object) {
-			
-						$object->delete();
-			
+					if(!empty($this->{$className})) {
+						foreach($this->{$className} as &$object) {
+				
+							$object->delete($user);
+				
+						}
 					}
 			
 				}
diff --git a/htdocs/core/db/DoliDB.class.php b/htdocs/core/db/DoliDB.class.php
index 85766c31949..da0717e665b 100644
--- a/htdocs/core/db/DoliDB.class.php
+++ b/htdocs/core/db/DoliDB.class.php
@@ -313,7 +313,6 @@ abstract class DoliDB implements Database
 	function update($table,$fields,$key){
 	
 		foreach ($fields as $k => $v) {
-			if(is_string($v)) $v=stripslashes($v);
 				
 			if (is_array($key)){
 				$i=array_search($k , $key );
@@ -328,10 +327,9 @@ abstract class DoliDB implements Database
 				}
 			}
 	
-			$tmp[] = $k.'='.$this->quote($val);
+			$tmp[] = $k.'='.$this->quote($v);
 		}
-		$sql = sprintf( 'UPDATE '.MAIN_DB_PREFIX.$table.' SET %s WHERE %s' , implode( ',', $tmp ) , implode(' AND ',$where) );
-	
+		$sql = 'UPDATE '.MAIN_DB_PREFIX.$table.' SET '.implode( ',', $tmp ).' WHERE ' . implode(' AND ',$where) ;
 		$res = $this->query( $sql );
 	
 		if($res===false) {
@@ -358,7 +356,9 @@ abstract class DoliDB implements Database
 			
 		}
 		
-		$sql = sprintf( 'INSERT INTO '.MAIN_DB_PREFIX.$table.' ( %s ) values( %s ) ', implode( ",", $keys ) ,  implode( ",", $values ) );
+		$sql = 'INSERT INTO '.MAIN_DB_PREFIX.$table.' 
+					( '.implode( ",", $keys ).' ) 
+					VALUES ( '.implode( ",", $values ).' ) ';
 
 		$res = $this->query($sql);
 		if($res===false) {
@@ -379,26 +379,30 @@ abstract class DoliDB implements Database
 	 */
 	function delete($table,$fields,$key){
 		foreach ($fields as $k => $v) {
-			if(is_string($v)) $v=stripslashes($v);
-		
 			if (is_array($key)){
 				$i=array_search($k , $key );
 				if ( $i !== false) {
-					$where[] = $key[$i]."=" . $this->escape( $v ) ;
+					$where[] = $key[$i].'=' . $this->quote( $v ) ;
 					continue;
 				}
 			} else {
 				if ( $k == $key) {
-					$where[] = "$k=" .$this->escape( $v ) ;
+					$where[] = $k.'='.$this->quote( $v ) ;
 					continue;
 				}
 			}
 			
 		}
 	
-		$sql = sprintf( 'DELETE FROM '.MAIN_DB_PREFIX.$table.' WHERE '.implode(' AND ',$where));
+		$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$table.' WHERE '.implode(' AND ',$where);
 	
-		return $this->query( $sql );
+		$res = $this->query( $sql );
+		if($res===false) {
+			return false;
+		}
+		
+		return true;
+		
 	}
 	
 }
diff --git a/htdocs/inventory/admin/inventory_setup.php b/htdocs/inventory/admin/inventory_setup.php
new file mode 100644
index 00000000000..f55bc092517
--- /dev/null
+++ b/htdocs/inventory/admin/inventory_setup.php
@@ -0,0 +1,168 @@
+<?php
+/* <one line to give the program's name and a brief idea of what it does.>
+ * Copyright (C) 2015 ATM Consulting <support@atm-consulting.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
+ * 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		admin/inventory.php
+ * 	\ingroup	inventory
+ * 	\brief		This file is an example module setup page
+ * 				Put some comments here
+ */
+// Dolibarr environment
+$res = @include("../../main.inc.php"); // From htdocs directory
+if (! $res) {
+    $res = @include("../../../main.inc.php"); // From "custom" directory
+}
+
+// Libraries
+require_once DOL_DOCUMENT_ROOT . "/core/lib/admin.lib.php";
+require_once '../lib/inventory.lib.php';
+
+// Translations
+$langs->load("inventory@inventory");
+
+// Access control
+if (! $user->admin) {
+    accessforbidden();
+}
+
+// Parameters
+$action = GETPOST('action', 'alpha');
+
+/*
+ * Actions
+ */
+if (preg_match('/set_(.*)/',$action,$reg))
+{
+	$code=$reg[1];
+	if (dolibarr_set_const($db, $code, GETPOST($code), 'chaine', 0, '', $conf->entity) > 0)
+	{
+		header("Location: ".$_SERVER["PHP_SELF"]);
+		exit;
+	}
+	else
+	{
+		dol_print_error($db);
+	}
+}
+	
+if (preg_match('/del_(.*)/',$action,$reg))
+{
+	$code=$reg[1];
+	if (dolibarr_del_const($db, $code, 0) > 0)
+	{
+		Header("Location: ".$_SERVER["PHP_SELF"]);
+		exit;
+	}
+	else
+	{
+		dol_print_error($db);
+	}
+}
+
+/*
+ * View
+ */
+$page_name = "inventorySetup";
+llxHeader('', $langs->trans($page_name));
+
+// Subheader
+$linkback = '<a href="' . DOL_URL_ROOT . '/admin/modules.php">'
+    . $langs->trans("BackToModuleList") . '</a>';
+print_fiche_titre($langs->trans($page_name), $linkback);
+
+// Configuration header
+$head = inventoryAdminPrepareHead();
+dol_fiche_head(
+    $head,
+    'settings',
+    $langs->trans("Module104420Name"),
+    0,
+    "inventory@inventory"
+);
+
+// Setup page goes here
+$form=new Form($db);
+$var=false;
+print '<table class="noborder" width="100%">';
+print '<tr class="liste_titre">';
+print '<td>'.$langs->trans("Parameters").'</td>'."\n";
+print '<td align="center" width="20">&nbsp;</td>';
+print '<td align="center" width="100">'.$langs->trans("Value").'</td>'."\n";
+
+
+// Example with a yes / no select
+$var=!$var;
+print '<tr '.$bc[$var].'>';
+print '<td>'.$langs->trans("INVENTORY_GEN_PDF").'</td>';
+print '<td align="center" width="20">&nbsp;</td>';
+print '<td align="right" width="300">';
+print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<input type="hidden" name="action" value="set_INVENTORY_GEN_PDF">';
+print $form->selectyesno("INVENTORY_GEN_PDF",$conf->global->INVENTORY_GEN_PDF,1);
+print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+print '</form>';
+print '</td></tr>';
+
+// Example with a yes / no select
+$var=!$var;
+print '<tr '.$bc[$var].'>';
+print '<td>'.$langs->trans("INVENTORY_DISABLE_VIRTUAL").'</td>';
+print '<td align="center" width="20">&nbsp;</td>';
+print '<td align="right" width="300">';
+print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<input type="hidden" name="action" value="set_INVENTORY_DISABLE_VIRTUAL">';
+print $form->selectyesno("INVENTORY_DISABLE_VIRTUAL",$conf->global->INVENTORY_DISABLE_VIRTUAL,1);
+print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+print '</form>';
+print '</td></tr>';
+
+// Example with a yes / no select
+$var=!$var;
+print '<tr '.$bc[$var].'>';
+print '<td>'.$langs->trans("INVENTORY_USE_MIN_PA_IF_NO_LAST_PA").'</td>';
+print '<td align="center" width="20">&nbsp;</td>';
+print '<td align="right" width="300">';
+print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<input type="hidden" name="action" value="set_INVENTORY_USE_MIN_PA_IF_NO_LAST_PA">';
+print $form->selectyesno("INVENTORY_USE_MIN_PA_IF_NO_LAST_PA",$conf->global->INVENTORY_USE_MIN_PA_IF_NO_LAST_PA,1);
+print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+print '</form>';
+print '</td></tr>';
+
+// Example with a yes / no select
+$var=!$var;
+print '<tr '.$bc[$var].'>';
+print '<td>'.$langs->trans("INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT").'</td>';
+print '<td align="center" width="20">&nbsp;</td>';
+print '<td align="right" width="300">';
+print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<input type="hidden" name="action" value="set_INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT">';
+print $form->selectyesno("INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT",$conf->global->INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT,1);
+print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+print '</form>';
+print '</td></tr>';
+
+print '</table>';
+
+llxFooter();
+
+$db->close();
\ No newline at end of file
diff --git a/htdocs/inventory/ajax/ajax.inventory.php b/htdocs/inventory/ajax/ajax.inventory.php
index 34efecfab8f..f2f5ef54903 100644
--- a/htdocs/inventory/ajax/ajax.inventory.php
+++ b/htdocs/inventory/ajax/ajax.inventory.php
@@ -1,24 +1,21 @@
 <?php
 
-    require('../config.php');
-    require('../class/inventory.class.php');
-
+    require '../../main.inc.php';
+    require_once DOL_DOCUMENT_ROOT.'/inventory/class/inventory.class.php';
     
     $get = GETPOST('get');
     $put = GETPOST('put');
     
-    $PDOdb=new TPDOdb;
-    
     switch ($put) {
         case 'qty':
             if (!$user->rights->inventory->write) { echo -1; exit; }
             
             $fk_det_inventory = GETPOST('fk_det_inventory');
             
-            $det = new Inventorydet;
-            if( $det->load($PDOdb, $fk_det_inventory)) {
+            $det = new Inventorydet($db);
+            if( $det->fetch( $fk_det_inventory)) {
                 $det->qty_view+=GETPOST('qty');
-                $det->save($PDOdb);
+                $det->update($user);
                 
                 echo $det->qty_view;
             }
@@ -33,10 +30,10 @@
             
             $fk_det_inventory = GETPOST('fk_det_inventory');
             
-            $det = new Inventorydet;
-            if( $det->load($PDOdb, $fk_det_inventory)) {
+            $det = new Inventorydet($db);
+            if( $det->fetch( $fk_det_inventory)) {
                 $det->new_pmp=price2num(GETPOST('pmp'));
-                $det->save($PDOdb);
+                $det->update($user);
                 
                 echo $det->new_pmp;
             }
diff --git a/htdocs/inventory/img/plus.png b/htdocs/inventory/img/plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..b7072a96960e30374c5d4f6a5e9bfc374e7a532a
GIT binary patch
literal 1299
zcmV+u1?>8XP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-v<T?BRjgnoCN>?02y>e
zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00etUL_t(o!?l;qYaC@9$3Hun
z-R>r7NwP^cY02AGDU_xVmNpiZDhL+DlP!XX2QLa1CD6aXqaGA`Q1IZ{Lr;QO>Ol{R
zp2WMMHcbebDalT=vzd8bJ!ED(nQqc;n|$G6W}auB-}m?a%oI2Pqobn$Jb3URohsGq
z^^t0|Is^<^Yb(YWwAO7YWe^0x*4o<ICLjS$pFYj<^726x6zC1d8;!<iQ&Uq{%H{H`
zwRYSXTQtU?ltfC25JE^Py;iGr*Z2LOR#sMS0^yScAE>~|lP4?HYW4b=GiSc2)oMt&
zOQw`UDb=}`Qlhm+2+>&!g24E`zZ3+)w{aYcxw$!3R#wnjAFM#FR%2shgHxwYU0PgR
zyg5ET-Y66b8FGzMa*qP}d!-b{7=#eCTCG3V*VjLeqUfI|dSHBf9MAJOckbMk3l}cj
zs#GfddkHjJ?>-A5&|2>y*IIYHk&fiu*!TUnTdmd|$8j*mbU6F63WQ<E{QUe|=g*)2
zad2?(SZZ}DG`&yByM-hr&3XcGi^bwQ#+X0iIR39zs}Y9b;~toqnR)s0<;!=<<#Oeb
zkVjUhBaL^SEM3bEYi;%_JkPr*rR;>GFf=qov)N=~VxqFRxcK|%=;%V$eR($vA@F_w
zmJp(4j3FsQ3k>#G`mbuUyEk1k#&nd>S`$Ul-_2(8)wDv~YPFgwaASCQcp+;^-a08I
zJ3BiBL9lf1-o5)-@0CiWsp;wItLd|~mMDq{!;mP7I!ak<7l03dZvfn+QH;#a&VFu;
z=^DqpLXP9O`D}Jw*G*l$y}eDd*?g?zGWZ(!4p1&YqtRFz7#Q4B$Jr3%vpk!{DU?!p
zp2yD4PS^DuO288Er2~}5#>U=AJ6bl=(~+G^70E*gK^TU;kf(Sbz&(5RY_+eiZ?2p5
zLI|QLVz=e)mQ)<aNGWX>ftIJk1TgKEN~K|?)EMwsBiY*8`oZ(OPm9H3(OQeO79oU<
zqR8taa21%!DPn-HfOor{FTjLrtsODOIN9V&6%ay%zVCZITBH&s@@Vh#{xM+Kl~SI_
zHjJzS#+U-nkNspgK*deFS{j0UH#=&$g+d`vN_9#pOKyy@hrqF)3<I=XrPO8|$J%k6
zzI-3oS|10d0XHY`eiHLN#sD)pLYpL8H$=deD}>mTQhJW#Od4%Sd%2Vn&-1PU*Sc)3
z19x+CQ^3DZ;hAk<-C12--IPM!)mo!6r{3Dy8dA!m4F5W?>KJ3<upR!KZ9<!yo1Mfw
zLVUlcDa_2w*m}KgCnqOu61#)OTo-|JJ?u+ID=kka`Sjjyx7#<Qlx%El^xAZKncEN7
z(_}5Uu8UHNfq{WzTI*k<D0-;}0k@M5SIA_0Kk#M`d;bDn2X?wGE+pA$k7$Izi%-(<
zwZyu^Cf@=s_8OyCfQN@{`K6~VlX>8`Lm>YJc;Q)VwFG<!#Lqyy4ZN3Y<Ijvf;1l2u
zu)I&AK1^EiZQ!H)PtWuI9cRz*5#U5}$doe&%Qg@s$=36S;r~2|UOP4t;aLCx002ov
JPDHLkV1j!aXlwug

literal 0
HcmV?d00001

diff --git a/htdocs/inventory/img/plus16.png b/htdocs/inventory/img/plus16.png
new file mode 100644
index 0000000000000000000000000000000000000000..ad17ac89391585adf3fe47f650c3e38ebd5779c7
GIT binary patch
literal 665
zcmV;K0%rY*P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-v<T?BqEXMq5=Q_02y>e
zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00IF?L_t(I%YBf)Yg17i#Xm23
zFPK1Dy0mf1E9sDe1d2mr5Hg8_7!f0Mh@0T9ga1V9(A9sSgE-YX3I4#X2pz;BSuD}m
z)YeCH-@WhNyq7wd7oH*QfdgOoo^$wqk3|9-8yoEG>`<%K8ihik7KYKH)&WYXqh7D~
zx!rE>uB@!k>2xL@D;co9zFsYrN_%s2a|^!jqm-IZYmMi5zmJcPZ}<ECFR>>b5A}Ne
zQKeFO17v;QM@os5^1qNMigLDXKd~(9n^Nj4K)Tgxk<Dgrtgf!^{u2f$B^e9`p67Xo
zzVDxCt<%PsE5;Z`qY>$J`r&9adTWgNVF5IoO)rzl%xkR)f*?Nk#s2>OGXU3hw=Bzg
zdU|?_5P~R*0FHoyU9DE{JB~B&`#xH0;*cN+ocO(Nx9fyq$P|`<hMmvnYeI<l&p$$l
zm&4&OBc=QpE5k5+4@AHacnmDW)!D|FLKH=4tr0@>4-O8V$HrVPhm;cF^_T#SL_on-
zN}Z=tsmbX{jLnzAR!aR!rBaxoK?t!3YylbI1Mq6BYXbH03rh+APu!w=uUsylyRLf<
zB)OdsZcpuE-T|OkES@-yGrinQ1Z>VQcL7*lUdFcV>oWvr!1poFX6)Cd`*?7{nX`EJ
zqEgp@-X+FE;9AmPT@Z8&xCvaHv<;ttchkbZ0%0!T4SB2a00000NkvXXu0mjfN$Dr+

literal 0
HcmV?d00001

diff --git a/htdocs/inventory/inventory.php b/htdocs/inventory/inventory.php
index 1d9ec174257..ccda1b37c0e 100644
--- a/htdocs/inventory/inventory.php
+++ b/htdocs/inventory/inventory.php
@@ -131,7 +131,7 @@ function _action()
 			if (!$user->rights->inventory->write) accessforbidden();
 			
 			
-			$id = __get('id', 0, 'int');
+			$id = GETPOST('id');
 			
 			$inventory = new Inventory($db);
 			$inventory->load($PDOdb, $id);
@@ -153,7 +153,7 @@ function _action()
 			
 		case 'regulate':
 			
-			$id = __get('id', 0, 'int');
+			$id = GETPOST('id');
 			
 			$inventory = new Inventory($db);
 			$inventory->load($PDOdb, $id);
@@ -174,10 +174,10 @@ function _action()
 			
 		case 'changePMP':
 			
-			$id = __get('id', 0, 'int');
+			$id = GETPOST('id');
 			
 			$inventory = new Inventory($db);
-			$inventory->load($PDOdb, $id);
+			$inventory->fetch( $id );
 			
 			$inventory->changePMP($PDOdb);
 			
@@ -188,12 +188,11 @@ function _action()
 		case 'add_line':
 			if (!$user->rights->inventory->write) accessforbidden();
 			
-			
-			$id = __get('id', 0, 'int');
-			$fk_warehouse = __get('fk_warehouse', 0, 'int');
+			$id = GETPOST('id');
+			$fk_warehouse = GETPOST('fk_warehouse');
 			
 			$inventory = new Inventory($db);
-			$inventory->load($PDOdb, $id);
+			$inventory->fetch( $id );
 			
 			$type = (!empty($conf->use_javascript_ajax) && !empty($conf->global->PRODUIT_USE_SEARCH_TO_SELECT) ? 'string' : 'int'); //AA heu ?
 			
@@ -245,16 +244,17 @@ function _action()
 			
 			
 			//Cette action devrais se faire uniquement si le status de l'inventaire est à 0 mais aucune vérif
-			$rowid = __get('rowid', 0, 'int');
-			$Inventorydet = new Inventory($db);
-			$Inventorydet->load($PDOdb, $rowid);
-			$Inventorydet->delete($PDOdb);
-			
-			$id = __get('id', 0, 'int');
+			$rowid = GETPOST('rowid');
+			$Inventorydet = new Inventorydet($db);
+			if($Inventorydet->fetch($rowid)>0) {
+				$Inventorydet->delete($user);
+				setEventMessage("ProductDeletedFromInventory");
+			}
+			$id = GETPOST('id');
 			$inventory = new Inventory($db);
-			$inventory->load($PDOdb, $id);
+			$inventory->fetch( $id);
 			
-			_fiche($PDOdb, $user, $db, $conf, $langs, $inventory, 'edit');
+			_card($inventory, 'edit');
 			
 			break;
         case 'flush':
@@ -519,16 +519,14 @@ function _card_line(&$inventory, &$lines, $mode)
 			'produit' => $product->getNomUrl(1).'&nbsp;-&nbsp;'.$product->label
 			,'entrepot'=>$e->getNomUrl(1)
 			,'barcode' => $product->barcode
-			,'qty' =>($mode == 'edit' ? '<input type="text" name="qty_to_add['.$k.']" value="'.$qty.'" size="8" style="text-align:center;" />' : $qty )
-                        .($mode =='edit' ? '<a id="a_save_qty_'.$k.'" href="javascript:save_qty('.$k.')">'.img_picto($langs->trans('Add'), 'plus16@inventory').'</a>' : '')
+			,'qty' =>($mode == 'edit' ? '<input type="text" name="qty_to_add['.$k.']" value="'.$qty.'" size="8" style="text-align:center;" /> <a id="a_save_qty_'.$k.'" href="javascript:save_qty('.$k.')">'.img_picto($langs->trans('Add'), 'plus16@inventory').'</a>' : '' )
 			,'qty_view' => $Inventorydet->qty_view ? $Inventorydet->qty_view : 0
 			,'qty_stock' => $stock
 			,'qty_regulated' => $Inventorydet->qty_regulated ? $Inventorydet->qty_regulated : 0
 			,'action' => ($user->rights->inventory->write ? '<a onclick="if (!confirm(\'Confirmez-vous la suppression de la ligne ?\')) return false;" href="'.dol_buildpath('inventory/inventory.php?id='.$inventory->id.'&action=delete_line&rowid='.$Inventorydet->id, 1).'">'.img_picto($langs->trans('inventoryDeleteLine'), 'delete').'</a>' : '')
 			,'pmp_stock'=>round($pmp_actual,2)
             ,'pmp_actual'=> round($pmp * $Inventorydet->qty_view,2)
-			,'pmp_new'=>(!empty($user->rights->inventory->changePMP) ? '<input type="text" name="new_pmp['.$k.']" value="'.$Inventorydet->new_pmp.'" size="8" style="text-align:right;" />'
-					.($mode =='edit' ? '<a id="a_save_new_pmp_'.$k.'" href="javascript:save_pmp('.$k.')">'.img_picto($langs->trans('Save'), 'bt-save.png@inventory').'</a>' : '') : '')
+			,'pmp_new'=>(!empty($user->rights->inventory->changePMP && $mode =='edit') ? '<input type="text" name="new_pmp['.$k.']" value="'.$Inventorydet->new_pmp.'" size="8" style="text-align:right;" /> <a id="a_save_new_pmp_'.$k.'" href="javascript:save_pmp('.$k.')">'.img_picto($langs->trans('Save'), 'bt-save.png@inventory').'</a>' :  price($Inventorydet->new_pmp))
             ,'pa_stock'=>round($last_pa * $stock,2)
             ,'pa_actual'=>round($last_pa * $Inventorydet->qty_view,2)
 			,'current_pa_stock'=>round($current_pa * $stock,2)
@@ -656,24 +654,24 @@ function _headerList($view) {
 	?>
 			<tr style="background-color:#dedede;">
 				<th align="left" width="20%">&nbsp;&nbsp;Produit</th>
-				<th align="center">Entrepôt</td>
+				<th align="center"><?php echo $langs->trans('Warehouse'); ?></th>
 				<?php if (! empty($conf->barcode->enabled)) { ?>
-					<th align="center">Code-barre</td>
+					<th align="center"><?php echo $langs->trans('Barcode'); ?></th>
 				<?php } ?>
 				<?php if ($view['can_validate'] == 1) { ?>
-					<th align="center" width="20%">Quantité théorique</th>
+					<th align="center" width="20%"><?php echo $langs->trans('TheoricalQty'); ?></th>
 					<?php
 	                 if(!empty($conf->global->INVENTORY_USE_MIN_PA_IF_NO_LAST_PA)){
-	              		echo '<th align="center" width="20%" colspan="3">Valeur théorique</th>';   	
+	              		echo '<th align="center" width="20%" colspan="3">'.$langs->trans('TheoricalValue').'</th>';   	
 					 }
 					 else {
-					 	echo '<th align="center" width="20%" colspan="2">Valeur théorique</th>';
+					 	echo '<th align="center" width="20%" colspan="2">'.$langs->trans('TheoricalValue').'</th>';
 					 }
 					 
 					?>
 					
 				<?php } ?>
-				    <th align="center" width="20%">Quantité réelle</th>
+				    <th align="center" width="20%"><?php echo $langs->trans('RealQty'); ?></th>
 				<?php if ($view['can_validate'] == 1) { ?>
 				    
 				    <?php
@@ -682,39 +680,39 @@ function _headerList($view) {
 					 if(!empty($conf->global->INVENTORY_USE_MIN_PA_IF_NO_LAST_PA)) $colspan++;
 				     if(!empty($conf->global->INVENTORY_USE_MIN_PA_IF_NO_LAST_PA)) $colspan++;
 					
-	                 echo '<th align="center" width="20%" colspan="'.$colspan.'">Valeur réelle</th>';
+	                 echo '<th align="center" width="20%" colspan="'.$colspan.'">'.$langs->trans('RealValue').'</th>';
 					 
 					?>
 						
-					<th align="center" width="15%">Quantité régulée</th>
+					<th align="center" width="15%"><?php echo $langs->trans('RegulatedQty'); ?></th>
 				<?php } ?>
 				<?php if ($view['is_already_validate'] != 1) { ?>
 					<th align="center" width="5%">#</th>
 				<?php } ?>
-				<th align="center" width="5%"></th>
+				
 			</tr>
 			<?php if ($view['can_validate'] == 1) { ?>
 	    	<tr style="background-color:#dedede;">
 	    	    <th colspan="<?php echo empty($conf->barcode->enabled) ? 3 : 4;  ?>">&nbsp;</th>
-	    	    <th>PMP</th>
-	    	    <th>Dernier PA</th>
+	    	    <th><?php echo $langs->trans('PMP'); ?></th>
+	    	    <th><?php echo $langs->trans('LastPA'); ?></th>
 	    	    <?php
 	                 if(!empty($conf->global->INVENTORY_USE_MIN_PA_IF_NO_LAST_PA)){
-	              		echo '<th>PA courant</th>';   	
+	              		echo '<th>'.$langs->trans('CurrentPA').'</th>';   	
 					 }
 					 
 				?>
 	    	    <th>&nbsp;</th>
-	    	    <th>PMP</th>
+	    	    <th><?php echo $langs->trans('PMP'); ?></th>
 	    	    <?php
 	    	    if(!empty($user->rights->inventory->changePMP)) {
 	    	    	echo '<th rel="newPMP">'.$langs->trans('ColumnNewPMP').'</th>';
 	    	    }
 	    	    ?>
-	            <th>Dernier PA</th>
+	            <th><?php echo $langs->trans('LastPA'); ?></th>
 	            <?php
 	                 if(!empty($conf->global->INVENTORY_USE_MIN_PA_IF_NO_LAST_PA)){
-	              		echo '<th>PA courant</th>';   	
+	              		echo '<th>'.$langs->trans('CurrentPA').'</th>';   	
 					 }
 					 
 				?>
diff --git a/htdocs/inventory/tpl/inventory.tpl.php b/htdocs/inventory/tpl/inventory.tpl.php
index 8a3bfd0f2a6..c3c1347446b 100644
--- a/htdocs/inventory/tpl/inventory.tpl.php
+++ b/htdocs/inventory/tpl/inventory.tpl.php
@@ -8,7 +8,7 @@
         $('#a_save_qty_'+k).hide();
         
         $.ajax({
-            url:"script/interface.php"
+            url:"ajax/ajax.inventory.php"
             ,data:{
                 'fk_det_inventory' : fk_det_inventory
                 ,'qty': qty
@@ -37,7 +37,7 @@
         $('#a_save_new_pmp_'+k).hide();
         
         $.ajax({
-            url:"script/interface.php"
+            url:"ajax/ajax.inventory.php"
             ,data:{
                 'fk_det_inventory' : fk_det_inventory
                 ,'pmp': pmp
@@ -137,7 +137,7 @@
                     <td align="right"><?php echo price($row['pmp_actual']); ?></td>
                     <?php
                     if(!empty($user->rights->inventory->changePMP)) {
-                    	echo '<td>'.$row['pmp_new'].'</td>';	
+                    	echo '<td align="right">'.$row['pmp_new'].'</td>';	
 					}
                     ?>
                     <td align="right"><?php echo price($row['pa_actual']); ?></td>

From 9f6f87465503e57e757b46b4de0c783a510f17b8 Mon Sep 17 00:00:00 2001
From: Alexis Algoud <alexis@atm-consulting.fr>
Date: Thu, 15 Dec 2016 12:33:26 +0100
Subject: [PATCH 012/505] fix

---
 htdocs/core/class/coreobject.class.php     |  4 +-
 htdocs/core/db/DoliDB.class.php            |  2 +-
 htdocs/inventory/class/inventory.class.php | 55 ++++++++++++----
 htdocs/inventory/inventory.php             | 73 ++++++----------------
 4 files changed, 64 insertions(+), 70 deletions(-)

diff --git a/htdocs/core/class/coreobject.class.php b/htdocs/core/class/coreobject.class.php
index 75706403069..50b59761b1d 100644
--- a/htdocs/core/class/coreobject.class.php
+++ b/htdocs/core/class/coreobject.class.php
@@ -158,7 +158,7 @@ class CoreObject extends CommonObject {
 					$query[$field] = $this->date_0;
 				}
 				else{
-					$query[$field] = $this->db->jdate($this->{$field});
+					$query[$field] = $this->db->idate($this->{$field});
 				}
 		  	}
 		  	else if($this->is_array($info)){
@@ -427,7 +427,6 @@ class CoreObject extends CommonObject {
 	  	}
 		else {
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-				
 			$this->{$field} = dol_stringtotime($date);
 		}
 
@@ -435,6 +434,7 @@ class CoreObject extends CommonObject {
 	}
 	
 	public function set_values(&$Tab) {
+		
 		foreach ($Tab as $key=>$value) {
 	
 			if($this->checkFieldType($key,'date')) {
diff --git a/htdocs/core/db/DoliDB.class.php b/htdocs/core/db/DoliDB.class.php
index da0717e665b..230572050b5 100644
--- a/htdocs/core/db/DoliDB.class.php
+++ b/htdocs/core/db/DoliDB.class.php
@@ -355,7 +355,7 @@ abstract class DoliDB implements Database
 			$values[] = $this->quote($v);
 			
 		}
-		
+
 		$sql = 'INSERT INTO '.MAIN_DB_PREFIX.$table.' 
 					( '.implode( ",", $keys ).' ) 
 					VALUES ( '.implode( ",", $values ).' ) ';
diff --git a/htdocs/inventory/class/inventory.class.php b/htdocs/inventory/class/inventory.class.php
index 76ed46c4aa8..b02d601854d 100644
--- a/htdocs/inventory/class/inventory.class.php
+++ b/htdocs/inventory/class/inventory.class.php
@@ -71,8 +71,9 @@ class Inventory extends CoreObject
 	
 	public $db;
 	
-	function __construct(DoliDB &$db) 
+	public function __construct(DoliDB &$db) 
 	{
+		global $conf;
 		
 		$this->db = &$db;
 		
@@ -85,13 +86,13 @@ class Inventory extends CoreObject
 		
 	}
 	
-	function sort_det() 
+	private function sort_det() 
 	{
 
 		if(!empty($this->Inventorydet))	usort($this->Inventorydet, array('Inventory', 'customSort'));
 	}
 	
-	function fetch($id,$annexe = true) 
+	public function fetch($id,$annexe = true) 
 	{
 	    
         if(!$annexe) $this->withChild = false;
@@ -115,7 +116,7 @@ class Inventory extends CoreObject
 	}
 	
 	
-	function customSort(&$objA, &$objB)
+	private function customSort(&$objA, &$objB)
 	{
 		global $db;
 		
@@ -128,7 +129,7 @@ class Inventory extends CoreObject
 		return $r;
 	}
 	
-	function changePMP() {
+	public function changePMP() {
 		
 		foreach ($this->Inventorydet as $k => &$Inventorydet)
 		{
@@ -147,7 +148,7 @@ class Inventory extends CoreObject
 		
 	}
 	
-	function update(User &$user)
+	public function update(User &$user)
 	{
 		
 		//si on valide l'inventaire on sauvegarde le stock à cette instant
@@ -159,7 +160,7 @@ class Inventory extends CoreObject
 		parent::update($user);
 	}
 	
-	function set_values(&$Tab)
+	public function set_values(&$Tab)
 	{
 		global $db,$langs;
 		
@@ -186,19 +187,19 @@ class Inventory extends CoreObject
 		parent::set_values($Tab);
 	}
 	
-    function deleteAllLine() {
+    public function deleteAllLine(User &$user) {
         
         foreach($this->Inventorydet as &$det) {
             $det->to_delete = true;
         }
         
-        $this->update();
+        $this->update($user);
       
         $this->Inventorydet=array();
         
     }
     
-    function add_product($fk_product, $fk_entrepot='') {
+    public function add_product($fk_product, $fk_entrepot='') {
         
         $k = $this->addChild('Inventorydet');
         $det =  &$this->Inventorydet[$k];
@@ -215,7 +216,7 @@ class Inventory extends CoreObject
         
     }
     
-    function correct_stock($fk_product, $fk_warehouse, $nbpiece, $movement, $label='', $price=0, $inventorycode='')
+    public function correct_stock($fk_product, $fk_warehouse, $nbpiece, $movement, $label='', $price=0, $inventorycode='')
 	{
 		global $conf, $db, $langs, $user;
 		
@@ -250,7 +251,7 @@ class Inventory extends CoreObject
 		}
 	}
 	
-	function regulate()
+	public function regulate()
 	{
 		global $db,$user,$langs,$conf;
 		
@@ -312,6 +313,36 @@ class Inventory extends CoreObject
         
 	} 
 	
+	public function add_products_for($fk_warehouse,$fk_category=0,$fk_supplier=0,$only_prods_in_stock=0) {
+		$e = new Entrepot($this->db);
+		$e->fetch($fk_warehouse);
+		$TChildWarehouses = array($fk_warehouse);
+		$e->get_children_warehouses($fk_warehouse, $TChildWarehouses);
+			
+		$sql = 'SELECT ps.fk_product, ps.fk_entrepot
+			     FROM '.MAIN_DB_PREFIX.'product_stock ps
+			     INNER JOIN '.MAIN_DB_PREFIX.'product p ON (p.rowid = ps.fk_product)
+                 LEFT JOIN '.MAIN_DB_PREFIX.'categorie_product cp ON (cp.fk_product = p.rowid)
+				 LEFT JOIN '.MAIN_DB_PREFIX.'product_fournisseur_price pfp ON (pfp.fk_product = p.rowid)
+			     WHERE ps.fk_entrepot IN ('.implode(', ', $TChildWarehouses).')';
+			
+		if($fk_category>0) $sql.= " AND cp.fk_categorie=".$fk_category;
+		if($fk_supplier>0) $sql.= " AND pfp.fk_soc=".$fk_supplier;
+		if(!empty($only_prods_in_stock)) $sql.= ' AND ps.reel > 0';
+			
+		$sql.=' GROUP BY ps.fk_product, ps.fk_entrepot
+					ORDER BY p.ref ASC,p.label ASC';
+		 
+		$res = $this->db->query($sql);
+		if($res) {
+			while($obj = $this->db->fetch_object($res)){
+				$this->add_product($obj->fk_product, $obj->fk_entrepot);
+			}
+		}
+			
+		
+	}
+	
     static function getLink($id) {
         global $langs,$db;
         
diff --git a/htdocs/inventory/inventory.php b/htdocs/inventory/inventory.php
index ccda1b37c0e..b03627d326a 100644
--- a/htdocs/inventory/inventory.php
+++ b/htdocs/inventory/inventory.php
@@ -83,34 +83,7 @@ function _action()
             $fk_warehouse = (int)GETPOST('fk_warehouse');
 			$only_prods_in_stock = (int)GETPOST('OnlyProdsInStock');
             
-			$e = new Entrepot($db);
-			$e->fetch($fk_warehouse);
-			$TChildWarehouses = array($fk_warehouse);
-			$e->get_children_warehouses($fk_warehouse, $TChildWarehouses);
-			
-			$sql = 'SELECT ps.fk_product, ps.fk_entrepot 
-			     FROM '.MAIN_DB_PREFIX.'product_stock ps 
-			     INNER JOIN '.MAIN_DB_PREFIX.'product p ON (p.rowid = ps.fk_product) 
-                 LEFT JOIN '.MAIN_DB_PREFIX.'categorie_product cp ON (cp.fk_product = p.rowid)
-				 LEFT JOIN '.MAIN_DB_PREFIX.'product_fournisseur_price pfp ON (pfp.fk_product = p.rowid)
-			     WHERE ps.fk_entrepot IN ('.implode(', ', $TChildWarehouses).')';
-			
-            if($fk_category>0) $sql.= " AND cp.fk_categorie=".$fk_category;
-			if($fk_supplier>0) $sql.= " AND pfp.fk_soc=".$fk_supplier;
-			if($only_prods_in_stock>0) $sql.= ' AND ps.reel > 0';
-			
-			$sql.=' GROUP BY ps.fk_product, ps.fk_entrepot
-					ORDER BY p.ref ASC,p.label ASC';
-                 
-                 
-			$res = $db->query($sql);
-			if($res) {
-				while($obj = $db->fetch_object($res)){
-				
-	                $inventory->add_product($obj->fk_product, $obj->fk_entrepot);
-				}
-			}
-			
+			$inventory->add_products_for($fk_warehouse,$fk_category,$fk_supplier,$only_prods_in_stock);
 			$inventory->update($user);
 			
 			header('Location: '.dol_buildpath('inventory/inventory.php?id='.$inventory->id.'&action=edit', 1));
@@ -134,14 +107,14 @@ function _action()
 			$id = GETPOST('id');
 			
 			$inventory = new Inventory($db);
-			$inventory->load($PDOdb, $id);
+			$inventory->fetch($id);
 			
 			$inventory->set_values($_REQUEST);
 			
 			if ($inventory->errors)
 			{
 				setEventMessage($inventory->errors, 'errors');
-				_fiche($PDOdb, $user, $db, $conf, $langs, $inventory, 'edit');
+				_card( $inventory, 'edit');
 			}
 			else 
 			{
@@ -156,18 +129,18 @@ function _action()
 			$id = GETPOST('id');
 			
 			$inventory = new Inventory($db);
-			$inventory->load($PDOdb, $id);
+			$inventory->fetch($id);
             
             if($inventory->status == 0) {
                 $inventory->status = 1;
-                $inventory->save($PDOdb);
+                $inventory->update($user);
                 
-                _fiche($PDOdb, $user, $db, $conf, $langs, $inventory, 'view');
+                _card( $inventory, 'view');
                 
             
             }
             else {
-               _fiche($PDOdb, $user, $db, $conf, $langs, $inventory, 'view');
+               _card( $inventory, 'view');
             }
             
 			break;
@@ -181,7 +154,7 @@ function _action()
 			
 			$inventory->changePMP($PDOdb);
 			
-			_fiche($PDOdb, $user, $db, $conf, $langs, $inventory, 'view');
+			_card( $inventory, 'view');
 			
 			break;
 			
@@ -235,7 +208,7 @@ function _action()
 				$inventory->sort_det();
 			}
 			
-			_fiche($PDOdb, $user, $db, $conf, $langs, $inventory, 'edit');
+			_card( $inventory, 'edit');
 			
 			break;
 			
@@ -261,16 +234,16 @@ function _action()
             if (!$user->rights->inventory->create) accessforbidden();
             
             
-            $id = __get('id', 0, 'int');
+            $id = GETPOST('id');
             
             $inventory = new Inventory($db);
-            $inventory->load($PDOdb, $id);
+            $inventory->fetch($id);
             
             $inventory->deleteAllLine($PDOdb);
             
             setEventMessage('Inventaire vidé');
             
-            _fiche($PDOdb, $user, $db, $conf, $langs, $inventory, 'edit');
+            _card( $inventory, 'edit');
            
             
             break;
@@ -278,33 +251,23 @@ function _action()
 			if (!$user->rights->inventory->create) accessforbidden();
             
 			
-			$id = __get('id', 0, 'int');
+			$id = GETPOST('id');
 			
 			$inventory = new Inventory($db);
-			$inventory->load($PDOdb, $id);
+			$inventory->fetch($id);
 			
-			$inventory->delete($PDOdb);
+			$inventory->delete($user);
 			
 			header('Location: '.dol_buildpath('/inventory/inventory.php', 1));
 			exit;
 			//_list();
 			
-		case 'printDoc':
-			
-			$id = __get('id', 0, 'int');
-			
-			$inventory = new Inventory($db);
-			$inventory->load($PDOdb, $id);
-			
-			generateODT($PDOdb, $db, $conf, $langs, $inventory);
-			break;
-			
 		case 'exportCSV':
 			
-			$id = __get('id', 0, 'int');
+			$id = GETPOST('id');
 			
 			$inventory = new Inventory($db);
-			$inventory->load($PDOdb, $id);
+			$inventory->fetch($id);
 			
 			exportCSV($inventory);
 			
@@ -453,7 +416,7 @@ function _card(&$inventory, $mode='edit')
 	$warehouse = new Entrepot($db);
 	$warehouse->fetch($inventory->fk_warehouse);
 	
-	print dol_get_fiche_head(inventoryPrepareHead($inventory, $langs->trans('inventoryOfWarehouse', $warehouse->libelle), '&action='.$mode));
+	print dol_get_fiche_head(inventoryPrepareHead($inventory, $langs->trans('inventoryOfWarehouse', $warehouse->libelle), empty($mode) ? '': '&action='.$mode));
 	
 	$lines = array();
 	_card_line($inventory, $lines, $mode);

From 1596760d21211d562717467d5043e96d9eda3245 Mon Sep 17 00:00:00 2001
From: Alexis Algoud <alexis@atm-consulting.fr>
Date: Thu, 15 Dec 2016 17:02:20 +0100
Subject: [PATCH 013/505] fix regulate / apply new PMP / add or remove line

---
 htdocs/core/class/coreobject.class.php     |  24 +++-
 htdocs/inventory/class/inventory.class.php |  47 ++++----
 htdocs/inventory/inventory.php             | 129 ++++++++++++++-------
 htdocs/inventory/tpl/inventory.tpl.php     |  26 ++---
 4 files changed, 142 insertions(+), 84 deletions(-)

diff --git a/htdocs/core/class/coreobject.class.php b/htdocs/core/class/coreobject.class.php
index 50b59761b1d..2022844d6fe 100644
--- a/htdocs/core/class/coreobject.class.php
+++ b/htdocs/core/class/coreobject.class.php
@@ -35,6 +35,7 @@ class CoreObject extends CommonObject {
 	
 	public $date_0 = '1001-01-01 00:00:00'; //TODO there is a solution for this ?
 	
+	public $error = '';
 	/*
 	 *  @var Array $_fields Fields to synchronize with Database
 	 */
@@ -244,6 +245,8 @@ class CoreObject extends CommonObject {
 				return $this->id;
 		}
 		else {
+				$this->error = $this->db->lasterror();
+				
 				return false;
 		}
 		
@@ -335,7 +338,7 @@ class CoreObject extends CommonObject {
 		if(empty($this->id )) return $this->create($user); // To test, with that, no need to test on high level object, the core decide it, update just needed
 		
 		if(isset($this->to_delete) && $this->to_delete==true) {
-			$this->delete();
+			$this->delete($user);
 		}
 		else {
 		
@@ -345,13 +348,21 @@ class CoreObject extends CommonObject {
 			$query['rowid']=$this->id;
 			if(empty($this->no_update_tms))$query['tms'] = date('Y-m-d H:i:s');
 				
-			$this->db->update($this->table_element,$query,array('rowid'));
+			$res = $this->db->update($this->table_element,$query,array('rowid'));
 			
-			$this->id = $this->db->last_insert_id($this->table_element);
+			if($res) {
+			
+				$result = $this->call_trigger(strtoupper($this->element). '_UPDATE', $user);
 				
-			$result = $this->call_trigger(strtoupper($this->element). '_UPDATE', $user);
+				$this->saveChild($user);
+			
+				return true;
+			}
+			else{
+				$this->error = $this->db->lasterror();
 				
-			$this->saveChild($user);
+				return false;
+			}
 		
 		}
 		return $this->id;
@@ -378,6 +389,9 @@ class CoreObject extends CommonObject {
 			return $this->id;
 		}
 		else{
+			
+			$this->error = $this->db->lasterror();
+			
 			return false;
 		}
 	
diff --git a/htdocs/inventory/class/inventory.class.php b/htdocs/inventory/class/inventory.class.php
index b02d601854d..b39445807e9 100644
--- a/htdocs/inventory/class/inventory.class.php
+++ b/htdocs/inventory/class/inventory.class.php
@@ -86,7 +86,7 @@ class Inventory extends CoreObject
 		
 	}
 	
-	private function sort_det() 
+	public function sort_det() 
 	{
 
 		if(!empty($this->Inventorydet))	usort($this->Inventorydet, array('Inventory', 'customSort'));
@@ -129,22 +129,23 @@ class Inventory extends CoreObject
 		return $r;
 	}
 	
-	public function changePMP() {
-		
-		foreach ($this->Inventorydet as $k => &$Inventorydet)
-		{
-			
-			if($Inventorydet->new_pmp>0) {
-				$Inventorydet->pmp = $Inventorydet->new_pmp; 
-				$Inventorydet->new_pmp = 0;
-			
-				$db->query("UPDATE ".MAIN_DB_PREFIX."product as p SET pmp = ".$Inventorydet->pmp."
-				WHERE rowid = ".$Inventorydet->fk_product );
+	public function changePMP(User &$user) {
+		if(!empty($this->Inventorydet)) {
+			foreach ($this->Inventorydet as $k => &$Inventorydet)
+			{
 				
+				if($Inventorydet->new_pmp>0) {
+					$Inventorydet->pmp = $Inventorydet->new_pmp; 
+					$Inventorydet->new_pmp = 0;
+				
+					$this->db->query("UPDATE ".MAIN_DB_PREFIX."product as p SET pmp = ".$Inventorydet->pmp."
+					WHERE rowid = ".$Inventorydet->fk_product );
+					
+				}
 			}
 		}
 		
-		parent::save($PDOdb);
+		return parent::update($user);
 		
 	}
 	
@@ -214,6 +215,7 @@ class Inventory extends CoreObject
         if(empty($date))$date = $this->get_date('datec', 'Y-m-d'); 
         $det->setStockDate( $date , $fk_entrepot);
         
+        return true;
     }
     
     public function correct_stock($fk_product, $fk_warehouse, $nbpiece, $movement, $label='', $price=0, $inventorycode='')
@@ -233,6 +235,9 @@ class Inventory extends CoreObject
 			$datem = empty($conf->global->INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT) ? dol_now() : $this->date_inventory;
 
 			$movementstock=new MouvementStock($db);
+			$movementstock->origin = new stdClass();
+			$movementstock->origin->element = 'inventory';
+			$movementstock->origin->id = $this->id;
 			$result=$movementstock->_create($user,$fk_product,$fk_warehouse,$op[$movement],$movement,$price,$label,$inventorycode, $datem);
 			
 			if ($result >= 0)
@@ -289,10 +294,7 @@ class Inventory extends CoreObject
 						
 				$href = dol_buildpath('/inventory/inventory.php?id='.$this->id.'&action=view', 1);
 				
-				if(empty($this->title))
-					$this->correct_stock($product->id, $Inventorydet->fk_warehouse, $nbpiece, $movement, $langs->trans('inventoryMvtStock', $href, $this->id));
-				else
-					$this->correct_stock($product->id, $Inventorydet->fk_warehouse, $nbpiece, $movement, $langs->trans('inventoryMvtStockWithNomInventaire', $href, $this->title));
+				$this->correct_stock($product->id, $Inventorydet->fk_warehouse, $nbpiece, $movement, $langs->trans('inventoryMvtStock'));
 			}
 		}
 
@@ -304,12 +306,15 @@ class Inventory extends CoreObject
 		return 1;
 	}
     
-	public function getNomUrl($picto = 1) {
+	public function getTitle() {
 		global $langs;
 		
-		$title = !empty($this->title) ? $this->title : $langs->trans('inventoryTitle').' '.$this->id;
-        
-        return '<a href="'.dol_buildpath('/inventory/inventory.php?id='.$this->id, 1).'">'.($picto ? img_picto('','object_list.png','',0).' ' : '').$title.'</a>';
+		return !empty($this->title) ? $this->title : $langs->trans('inventoryTitle').' '.$this->id;
+	}
+	
+	public function getNomUrl($picto = 1) {
+		
+        return '<a href="'.dol_buildpath('/inventory/inventory.php?id='.$this->id, 1).'">'.($picto ? img_picto('','object_list.png','',0).' ' : '').$this->getTitle().'</a>';
         
 	} 
 	
diff --git a/htdocs/inventory/inventory.php b/htdocs/inventory/inventory.php
index b03627d326a..5a87eb94ceb 100644
--- a/htdocs/inventory/inventory.php
+++ b/htdocs/inventory/inventory.php
@@ -77,16 +77,25 @@ function _action()
 			$inventory->set_values($_POST);
 			
             $fk_inventory = $inventory->create($user);
-			
-            $fk_category = (int)GETPOST('fk_category');
-            $fk_supplier = (int)GETPOST('fk_supplier');
-            $fk_warehouse = (int)GETPOST('fk_warehouse');
-			$only_prods_in_stock = (int)GETPOST('OnlyProdsInStock');
+			if($fk_inventory>0) {
+            	
+            	$fk_category = (int)GETPOST('fk_category');
+            	$fk_supplier = (int)GETPOST('fk_supplier');
+            	$fk_warehouse = (int)GETPOST('fk_warehouse');
+            	$only_prods_in_stock = (int)GETPOST('OnlyProdsInStock');
+            	
+            	$inventory->add_products_for($fk_warehouse,$fk_category,$fk_supplier,$only_prods_in_stock);
+            	$inventory->update($user);
+            	
+            	header('Location: '.dol_buildpath('/inventory/inventory.php?id='.$inventory->id.'&action=edit', 1));
+            	
+            }
+            else{
+            	
+            	setEventMessage($inventory->error,'errors');
+            	header('Location: '.dol_buildpath('/inventory/inventory.php?action=create', 1));
+            }
             
-			$inventory->add_products_for($fk_warehouse,$fk_category,$fk_supplier,$only_prods_in_stock);
-			$inventory->update($user);
-			
-			header('Location: '.dol_buildpath('inventory/inventory.php?id='.$inventory->id.'&action=edit', 1));
 			break;
 			
 		case 'edit':
@@ -118,14 +127,14 @@ function _action()
 			}
 			else 
 			{
-				$inventory->save($PDOdb);
+				$inventory->udpate($user);
 				header('Location: '.dol_buildpath('inventory/inventory.php?id='.$inventory->getId().'&action=view', 1));
 			}
 			
 			break;
 			
-		case 'regulate':
-			
+		case 'confirm_regulate':
+			if (!$user->rights->inventory->write) accessforbidden();
 			$id = GETPOST('id');
 			
 			$inventory = new Inventory($db);
@@ -145,14 +154,14 @@ function _action()
             
 			break;
 			
-		case 'changePMP':
+		case 'confirm_changePMP':
 			
 			$id = GETPOST('id');
 			
 			$inventory = new Inventory($db);
 			$inventory->fetch( $id );
 			
-			$inventory->changePMP($PDOdb);
+			$inventory->changePMP($user);
 			
 			_card( $inventory, 'view');
 			
@@ -167,35 +176,33 @@ function _action()
 			$inventory = new Inventory($db);
 			$inventory->fetch( $id );
 			
-			$type = (!empty($conf->use_javascript_ajax) && !empty($conf->global->PRODUIT_USE_SEARCH_TO_SELECT) ? 'string' : 'int'); //AA heu ?
-			
-			$fk_product = __get('fk_product', 0, $type);
-			
-			if ($fk_product)
+			$fk_product = GETPOST('fk_product');
+			if ($fk_product>0)
 			{
 				$product = new Product($db);
-				$product->fetch($fk_product);	// ! ref TODO vérifier quand même			
-				if($product->type != 0) {
+				if($product->fetch($fk_product)<=0 || $product->type != 0) {
 					setEventMessage($langs->trans('ThisIsNotAProduct'),'errors');
 				}
 				else{
 					
 					//Check product not already exists
 					$alreadyExists = false;
-					foreach ($inventory->Inventorydet as $invdet)
-					{
-						if ($invdet->fk_product == $product->id
-							&& $invdet->fk_warehouse == $fk_warehouse)
+					if(!empty($inventory->Inventorydet)) {
+						foreach ($inventory->Inventorydet as $invdet)
 						{
-							$alreadyExists = true;
-							break;
+							if ($invdet->fk_product == $product->id
+								&& $invdet->fk_warehouse == $fk_warehouse)
+							{
+								$alreadyExists = true;
+								break;
+							}
 						}
 					}
-					
 					if (!$alreadyExists)
 					{
-					    $inventory->add_product($PDOdb, $product->id, $fk_warehouse);
-                        
+					    if($inventory->add_product($product->id, $fk_warehouse)) {
+					    	setEventMessage($langs->trans('ProductAdded'));
+					    }
 					}
 					else
 					{
@@ -204,7 +211,7 @@ function _action()
 					
 				}
 				
-				$inventory->save($PDOdb);
+				$inventory->update($user);
 				$inventory->sort_det();
 			}
 			
@@ -212,7 +219,7 @@ function _action()
 			
 			break;
 			
-		case 'delete_line':
+		case 'confirm_delete_line':
 			if (!$user->rights->inventory->write) accessforbidden();
 			
 			
@@ -230,7 +237,7 @@ function _action()
 			_card($inventory, 'edit');
 			
 			break;
-        case 'flush':
+        case 'confirm_flush':
             if (!$user->rights->inventory->create) accessforbidden();
             
             
@@ -239,15 +246,15 @@ function _action()
             $inventory = new Inventory($db);
             $inventory->fetch($id);
             
-            $inventory->deleteAllLine($PDOdb);
+            $inventory->deleteAllLine($user);
             
-            setEventMessage('Inventaire vidé');
+            setEventMessage($langs->trans('InventoryFlushed'));
             
             _card( $inventory, 'edit');
            
             
             break;
-		case 'delete':
+		case 'confirm_delete':
 			if (!$user->rights->inventory->create) accessforbidden();
             
 			
@@ -258,7 +265,9 @@ function _action()
 			
 			$inventory->delete($user);
 			
-			header('Location: '.dol_buildpath('/inventory/inventory.php', 1));
+			setEventMessage($langs->trans('InventoryDeleted'));
+			
+			header('Location: '.dol_buildpath('/inventory/inventory.php?action=list', 1));
 			exit;
 			//_list();
 			
@@ -407,19 +416,53 @@ function _card_warehouse(&$inventory)
 	llxFooter('');
 }
 
-function _card(&$inventory, $mode='edit')
+function _card(&$inventory, $action='edit')
 {
-	global $langs, $conf, $db, $user;
+	global $langs, $conf, $db, $user,$form;
 	
 	llxHeader('',$langs->trans('inventoryEdit'),'','');
 	
+	if($action == 'changePMP') {
+	
+		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$inventory->id,$langs->trans('ApplyNewPMP')
+				,$langs->trans('ConfirmApplyNewPMP',$inventory->getTitle()),'confirm_changePMP'
+				,array(),'no',1);
+	
+	}
+	else if($action == 'flush') {
+	
+		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$inventory->id,$langs->trans('FlushInventory')
+				,$langs->trans('ConfirmFlushInventory',$inventory->getTitle()),'confirm_flush'
+				,array(),'no',1);
+	
+	}
+	else if($action == 'delete') {
+	
+		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$inventory->id,$langs->trans('Delete')
+				,$langs->trans('ConfirmDelete',$inventory->getTitle()),'confirm_delete'
+				,array(),'no',1);
+	
+	}
+	else if($action == 'delete_line') {
+		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$inventory->id.'&rowid='.GETPOST('rowid'),$langs->trans('DeleteLine')
+				,$langs->trans('ConfirmDeleteLine',$inventory->getTitle()),'confirm_delete_line'
+				,array(),'no',1);
+	
+	}
+	else if($action == 'regulate') {
+		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$inventory->id,$langs->trans('RegulateStock')
+				,$langs->trans('ConfirmRegulateStock',$inventory->getTitle()),'confirm_regulate'
+				,array(),'no',1);
+	
+	}
+	
 	$warehouse = new Entrepot($db);
 	$warehouse->fetch($inventory->fk_warehouse);
 	
-	print dol_get_fiche_head(inventoryPrepareHead($inventory, $langs->trans('inventoryOfWarehouse', $warehouse->libelle), empty($mode) ? '': '&action='.$mode));
+	print dol_get_fiche_head(inventoryPrepareHead($inventory, $langs->trans('inventoryOfWarehouse', $warehouse->libelle), empty($action) ? '': '&action='.$action));
 	
 	$lines = array();
-	_card_line($inventory, $lines, $mode);
+	_card_line($inventory, $lines, $action);
 	
 	print '<b>'.$langs->trans('inventoryOnDate')." ".$inventory->get_date('date_inventory').'</b><br><br>';
 	
@@ -439,7 +482,7 @@ function _card(&$inventory, $mode='edit')
 	$view_url = dol_buildpath('/inventory/inventory.php', 1);
 	
 	$view = array(
-		'mode' => $mode
+		'mode' => $action
 		,'url' => dol_buildpath('/inventory/inventory.php', 1)
 		,'can_validate' => (int) $user->rights->inventory->validate
 		,'is_already_validate' => (int) $inventory->status
@@ -486,7 +529,7 @@ function _card_line(&$inventory, &$lines, $mode)
 			,'qty_view' => $Inventorydet->qty_view ? $Inventorydet->qty_view : 0
 			,'qty_stock' => $stock
 			,'qty_regulated' => $Inventorydet->qty_regulated ? $Inventorydet->qty_regulated : 0
-			,'action' => ($user->rights->inventory->write ? '<a onclick="if (!confirm(\'Confirmez-vous la suppression de la ligne ?\')) return false;" href="'.dol_buildpath('inventory/inventory.php?id='.$inventory->id.'&action=delete_line&rowid='.$Inventorydet->id, 1).'">'.img_picto($langs->trans('inventoryDeleteLine'), 'delete').'</a>' : '')
+			,'action' => ($user->rights->inventory->write && $mode=='edit' ? '<a href="'.dol_buildpath('inventory/inventory.php?id='.$inventory->id.'&action=delete_line&rowid='.$Inventorydet->id, 1).'">'.img_picto($langs->trans('inventoryDeleteLine'), 'delete').'</a>' : '')
 			,'pmp_stock'=>round($pmp_actual,2)
             ,'pmp_actual'=> round($pmp * $Inventorydet->qty_view,2)
 			,'pmp_new'=>(!empty($user->rights->inventory->changePMP && $mode =='edit') ? '<input type="text" name="new_pmp['.$k.']" value="'.$Inventorydet->new_pmp.'" size="8" style="text-align:right;" /> <a id="a_save_new_pmp_'.$k.'" href="javascript:save_pmp('.$k.')">'.img_picto($langs->trans('Save'), 'bt-save.png@inventory').'</a>' :  price($Inventorydet->new_pmp))
diff --git a/htdocs/inventory/tpl/inventory.tpl.php b/htdocs/inventory/tpl/inventory.tpl.php
index c3c1347446b..d707ec581b1 100644
--- a/htdocs/inventory/tpl/inventory.tpl.php
+++ b/htdocs/inventory/tpl/inventory.tpl.php
@@ -159,44 +159,40 @@
         } 
 		
 		_footerList($view,$total_pmp,$total_pmp_actual,$total_pa,$total_pa_actual, $total_current_pa,$total_current_pa_actual);
-		?>
 	
-	  
-		
+		?>
 	</table>
 	
-	<?php if ($view['is_already_validate'] != 1) { ?>
+	<?php if ($inventory->status != 1) { ?>
 		<div class="tabsAction" style="height:30px;">
-			<?php if ($view['mode'] == 'view') { ?>
+			<?php if ($action!= 'edit') { ?>
 				<a href="<?php echo $view_url; ?>?id=<?php echo $inventory->id; ?>&action=exportCSV" class="butAction"><?php echo $langs->trans('ExportCSV') ?></a>
 				<a href="<?php echo $view_url; ?>?id=<?php echo $inventory->id; ?>&action=edit" class="butAction"><?php echo $langs->trans('Modify') ?></a>
 				<?php 
 				 if(!empty($user->rights->inventory->changePMP)) {
-				 	echo '<a href="javascript:;" onclick="if (!confirm(\'Confirmez-vous l\\\'application du nouveau PMP ?\')) return false; else document.location.href=\''.$view_url
-				 			.'?id='.$inventory->id
-				 			.'&action=changePMP&token='.$view['token'].'\'; " class="butAction">'.$langs->trans('ApplyPMP').'</a>';
+				 	echo '<a href="'.$view_url.'?id='.$inventory->id.'&action=changePMP" class="butAction">'.$langs->trans('ApplyPMP').'</a>';
 				 }
 				
 				if ($can_validate == 1) { ?>
-					<a href="javascript:;" onclick="if (!confirm('Confirmez-vous la régulation ?')) return false; else document.location.href='<?php echo $view_url; ?>?id=<?php echo $inventory->id; ?>&action=regulate&token=<?php echo $view['token']; ?>'; " class="butAction">Réguler le stock</a>
+					<a href="<?php echo $view_url; ?>?id=<?php echo $inventory->id; ?>&action=regulate&token=" class="butAction"><?php echo $langs->trans('RegulateStock') ?></a>
 				<?php } ?>
 			<?php } ?>
-			<?php if ($view['mode'] == 'edit') { ?>
-				<input name="back" type="button" class="butAction" value="Quitter la saisie" onclick="document.location='?id=<?php echo $inventory->id; ?>&action=view';" />
+			<?php if ($action == 'edit') { ?>
+				<input name="back" type="button" class="butAction" value="<?php echo $langs->trans('ExitEditMode'); ?>" onclick="document.location='?id=<?php echo $inventory->id; ?>&action=view';" />
 			<?php } ?>
 			<?php if ($can_validate == 1) { ?>
-                <a onclick="if (!confirm('Confirmez-vous la vidange ?')) return false;" href="<?php echo $view_url; ?>?id=<?php echo $inventory->id; ?>&action=flush" class="butActionDelete">Vider</a>
+                <a href="<?php echo $view_url; ?>?id=<?php echo $inventory->id; ?>&action=flush" class="butActionDelete"><?php  echo $langs->trans('Flush'); ?></a>
                 &nbsp;&nbsp;&nbsp;
-                <a onclick="if (!confirm('Confirmez-vous la suppression ?')) return false;" href="<?php echo $view_url; ?>?id=<?php echo $inventory->id; ?>&action=delete" class="butActionDelete">Supprimer</a>
+                <a href="<?php echo $view_url; ?>?id=<?php echo $inventory->id; ?>&action=delete" class="butActionDelete"><?php echo $langs->trans('Delete') ?></a>
         	<?php } ?>
 		</div>
 	<?php } ?>
-	<?php if ($view['is_already_validate'] == 1) { ?>
+	<?php if ($inventory->status == 1) { ?>
 		<div class="tabsAction">
 			<?php if ($can_validate == 1) { ?>
 
 				<a href="<?php echo $view_url; ?>?id=<?php echo $inventory->id; ?>&action=exportCSV" class="butAction"><?php echo $langs->trans('ExportCSV') ?></a>
-				<a href="#" title="Cet inventaire est validé" class="butActionRefused"><?php echo $langs->trans('Delete') ?></a>
+				<a href="#" title="<?php echo $langs->trans('InventoryAlreadyValidated'); ?>" class="butActionRefused"><?php echo $langs->trans('Delete') ?></a>
 				
 			<?php } ?>
 		</div>

From b7a6a71dff921c7bca72fcca7c964fd7b2c0b7a5 Mon Sep 17 00:00:00 2001
From: Alexis Algoud <alexis@atm-consulting.fr>
Date: Thu, 15 Dec 2016 17:20:46 +0100
Subject: [PATCH 014/505] move file to core

---
 .../inventory.php}                            |  26 +--
 ...ntory.class.php => modInventory.class.php} |   4 +-
 htdocs/inventory/lib/inventory.lib.php        | 161 +-----------------
 3 files changed, 15 insertions(+), 176 deletions(-)
 rename htdocs/{inventory/admin/inventory_setup.php => admin/inventory.php} (84%)
 rename htdocs/core/modules/{modinventory.class.php => modInventory.class.php} (99%)

diff --git a/htdocs/inventory/admin/inventory_setup.php b/htdocs/admin/inventory.php
similarity index 84%
rename from htdocs/inventory/admin/inventory_setup.php
rename to htdocs/admin/inventory.php
index f55bc092517..2548494fc79 100644
--- a/htdocs/inventory/admin/inventory_setup.php
+++ b/htdocs/admin/inventory.php
@@ -23,17 +23,16 @@
  * 				Put some comments here
  */
 // Dolibarr environment
-$res = @include("../../main.inc.php"); // From htdocs directory
-if (! $res) {
-    $res = @include("../../../main.inc.php"); // From "custom" directory
-}
+require '../main.inc.php';
+
 
 // Libraries
 require_once DOL_DOCUMENT_ROOT . "/core/lib/admin.lib.php";
-require_once '../lib/inventory.lib.php';
+require_once DOL_DOCUMENT_ROOT .'/inventory/lib/inventory.lib.php';
 
 // Translations
-$langs->load("inventory@inventory");
+$langs->load("stock");
+$langs->load("inventory");
 
 // Access control
 if (! $user->admin) {
@@ -104,21 +103,6 @@ print '<td>'.$langs->trans("Parameters").'</td>'."\n";
 print '<td align="center" width="20">&nbsp;</td>';
 print '<td align="center" width="100">'.$langs->trans("Value").'</td>'."\n";
 
-
-// Example with a yes / no select
-$var=!$var;
-print '<tr '.$bc[$var].'>';
-print '<td>'.$langs->trans("INVENTORY_GEN_PDF").'</td>';
-print '<td align="center" width="20">&nbsp;</td>';
-print '<td align="right" width="300">';
-print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print '<input type="hidden" name="action" value="set_INVENTORY_GEN_PDF">';
-print $form->selectyesno("INVENTORY_GEN_PDF",$conf->global->INVENTORY_GEN_PDF,1);
-print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
-print '</form>';
-print '</td></tr>';
-
 // Example with a yes / no select
 $var=!$var;
 print '<tr '.$bc[$var].'>';
diff --git a/htdocs/core/modules/modinventory.class.php b/htdocs/core/modules/modInventory.class.php
similarity index 99%
rename from htdocs/core/modules/modinventory.class.php
rename to htdocs/core/modules/modInventory.class.php
index 10fb1cc477e..31170375752 100644
--- a/htdocs/core/modules/modinventory.class.php
+++ b/htdocs/core/modules/modInventory.class.php
@@ -94,7 +94,7 @@ class modinventory extends DolibarrModules
 		$this->dirs = array();
 
 		// Config pages. Put here list of php page, stored into inventory/admin directory, to use to setup module.
-		$this->config_page_url = array("inventory_setup.php@inventory");
+		$this->config_page_url = array("inventory.php");
 
 		// Dependencies
 		$this->hidden = false;			// A condition to hide module
@@ -103,7 +103,7 @@ class modinventory extends DolibarrModules
 		$this->conflictwith = array();	// List of modules id this module is in conflict with
 		$this->phpmin = array(5,0);					// Minimum version of PHP required by module
 		$this->need_dolibarr_version = array(3,0);	// Minimum version of Dolibarr required by module
-		$this->langfiles = array("inventory@inventory");
+		$this->langfiles = array("inventory");
 
 		// Constants
 		// List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 'current' or 'allentities', deleteonunactive)
diff --git a/htdocs/inventory/lib/inventory.lib.php b/htdocs/inventory/lib/inventory.lib.php
index fd60d631a58..3cbf03a67c7 100644
--- a/htdocs/inventory/lib/inventory.lib.php
+++ b/htdocs/inventory/lib/inventory.lib.php
@@ -32,14 +32,11 @@ function inventoryAdminPrepareHead()
     $h = 0;
     $head = array();
 
-    $head[$h][0] = dol_buildpath("/inventory/admin/inventory_setup.php", 1);
+    $head[$h][0] = dol_buildpath("/admin/inventory.php", 1);
     $head[$h][1] = $langs->trans("Parameters");
     $head[$h][2] = 'settings';
     $h++;
-    $head[$h][0] = dol_buildpath("/inventory/admin/inventory_about.php", 1);
-    $head[$h][1] = $langs->trans("About");
-    $head[$h][2] = 'about';
-    $h++;
+    
 
     // Show more tabs from modules
     // Entries must be declared in modules descriptor with line
@@ -54,10 +51,12 @@ function inventoryAdminPrepareHead()
     return $head;
 }
 
-function inventoryPrepareHead(&$inventory, $title='Inventaire', $get='')
+function inventoryPrepareHead(&$inventory, $title='Inventory', $get='')
 {
+	global $langs;
+	
 	return array(
-		array(dol_buildpath('/inventory/inventory.php?id='.$inventory->id.$get, 1), $title,'inventaire')
+		array(dol_buildpath('/inventory/inventory.php?id='.$inventory->id.$get, 1), $langs->trans($title),'inventory')
 	);
 }
 
@@ -65,7 +64,7 @@ function inventoryPrepareHead(&$inventory, $title='Inventaire', $get='')
 
 function inventorySelectProducts(&$inventory)
 {
-	global $conf,$db;
+	global $conf,$db,$langs;
 	
 	$except_product_id = array();
 	
@@ -78,7 +77,6 @@ function inventorySelectProducts(&$inventory)
 	$form = new Form($db);
 	$form->select_produits(-1, 'fk_product');
 	
-	// Il nous faut impérativement une liste custom car il ne faut que les entrepôts de la famille de celui qu'on inventorie
 	$TChildWarehouses = array($inventory->fk_warehouse);
 	$e = new Entrepot($db);
 	$e->fetch($inventory->fk_warehouse);
@@ -93,153 +91,10 @@ function inventorySelectProducts(&$inventory)
 		$Tab[$res->rowid] = $res->label;
 	}
 	print '&nbsp;&nbsp;&nbsp;';
-	print 'Entrepôt : '.$form::selectarray('fk_warehouse', $Tab);
+	print $langs->trans('Warehouse').' : '.$form::selectarray('fk_warehouse', $Tab);
 	
 	$select_html = ob_get_clean();
 	
 	return $select_html;
 }
 
-function ajaxAutocompleter($selected, $htmlname, $url, $urloption='', $minLength=2, $autoselect=0, $ajaxoptions=array())
-{
-    if (empty($minLength)) $minLength=1;
-
-	$script = '<input type="hidden" name="'.$htmlname.'" id="'.$htmlname.'" value="'.$selected.'" />';
-
-	$script.= '<script type="text/javascript">';
-	$script.= '$(document).ready(function() {
-					var autoselect = '.$autoselect.';
-					var options = '.json_encode($ajaxoptions).';
-
-					// Remove product id before select another product
-					// use keyup instead change to avoid loosing the product id
-					$("input#search_'.$htmlname.'").keydown(function() {
-						//console.log(\'purge_id_after_keydown\');
-						$("#'.$htmlname.'").val("");
-					});
-					$("input#search_'.$htmlname.'").change(function() {
-						//console.log(\'change\');
-						$("#'.$htmlname.'").trigger("change");
-					});
-					// Check when keyup
-					$("input#search_'.$htmlname.'").keyup(function() {
-							//console.log(\'keyup\');
-						    if ($(this).val().length == 0)
-						    {
-	                            $("#search_'.$htmlname.'").val("");
-	                            $("#'.$htmlname.'").val("").trigger("change");
-	                            if (options.option_disabled) {
-	    							$("#" + options.option_disabled).removeAttr("disabled");
-	    						}
-	    						if (options.disabled) {
-	    							$.each(options.disabled, function(key, value) {
-	    								$("#" + value).removeAttr("disabled");
-									});
-	    						}
-	    						if (options.update) {
-	    							$.each(options.update, function(key, value) {
-	    								$("#" + key).val("").trigger("change");
-									});
-								}
-								if (options.show) {
-	    							$.each(options.show, function(key, value) {
-	    								$("#" + value).hide().trigger("hide");
-									});
-								}
-								if (options.update_textarea) {
-	    							$.each(options.update_textarea, function(key, value) {
-	    								if (typeof CKEDITOR == "object" && typeof CKEDITOR.instances != "undefined" && CKEDITOR.instances[key] != "undefined") {
-	    									CKEDITOR.instances[key].setData("");
-	    								} else {
-	    									$("#" + key).html("");
-										}
-	    							});
-	    						}
-						    }
-                    });
-    				$("input#search_'.$htmlname.'").autocomplete({
-    					source: function( request, response ) {
-    						$.get("'.$url.($urloption?'?'.$urloption:'').'", { '.$htmlname.': request.term }, function(data){
-								response($.map( data, function( item ) {
-									if (autoselect == 1 && data.length == 1) {
-										$("#search_'.$htmlname.'").val(item.value);
-										$("#'.$htmlname.'").val(item.key).trigger("change");
-									}
-									var label = item.label.toString();
-									var update = {};
-									if (options.update) {
-										$.each(options.update, function(key, value) {
-											update[key] = item[value];
-										});
-									}
-									var textarea = {};
-									if (options.update_textarea) {
-										$.each(options.update_textarea, function(key, value) {
-											textarea[key] = item[value];
-										});
-									}
-									return { label: label, value: item.value, id: item.key, update: update, textarea: textarea, disabled: item.disabled }
-								}));
-							}, "json");
-						},
-						dataType: "json",
-    					minLength: '.$minLength.',
-    					select: function( event, ui ) {		// Function ran when new value is selected into javascript combo
-							//console.log(\'set value of id with \'+ui.item.id);
-    						$("#'.$htmlname.'").val(ui.item.id).trigger("change");	// Select new value
-    						// Disable an element
-    						if (options.option_disabled) {
-    							if (ui.item.disabled) {
-    								$("#" + options.option_disabled).attr("disabled", "disabled");
-    								if (options.error) {
-    									$.jnotify(options.error, "error", true);		// Output with jnotify the error message
-    								}
-    								if (options.warning) {
-    									$.jnotify(options.warning, "warning", false);		// Output with jnotify the warning message
-    								}
-							} else {
-    								$("#" + options.option_disabled).removeAttr("disabled");
-    							}
-    						}
-    						if (options.disabled) {
-    							$.each(options.disabled, function(key, value) {
-    								$("#" + value).attr("disabled", "disabled");
-    							});
-    						}
-    						if (options.show) {
-    							$.each(options.show, function(key, value) {
-    								$("#" + value).show().trigger("show");
-    							});
-    						}
-    						// Update an input
-    						if (ui.item.update) {
-    							// loop on each "update" fields
-    							$.each(ui.item.update, function(key, value) {
-    								$("#" + key).val(value).trigger("change");
-    							});
-    						}
-    						if (ui.item.textarea) {
-    							$.each(ui.item.textarea, function(key, value) {
-    								if (typeof CKEDITOR == "object" && typeof CKEDITOR.instances != "undefined" && CKEDITOR.instances[key] != "undefined") {
-    									CKEDITOR.instances[key].setData(value);
-    									CKEDITOR.instances[key].focus();
-    								} else {
-    									$("#" + key).html(value);
-    									$("#" + key).focus();
-									}
-    							});
-    						}
-    						$("#search_'.$htmlname.'").trigger("change");	// To tell that input text field was modified
-    					}
-					}).data( "autocomplete" )._renderItem = function( ul, item ) {
-						return $( "<li></li>" )
-						.data( "item.autocomplete", item )
-						.append( \'<a><span class="tag">\' + item.label + "</span></a>" )
-						.appendTo(ul);
-					};
-
-  				});';
-	$script.= '</script>';
-
-	return $script;
-}

From e65ae08e5cbf926a16ee75c655dc50fe4e955ac0 Mon Sep 17 00:00:00 2001
From: Alexis Algoud <alexis@atm-consulting.fr>
Date: Thu, 15 Dec 2016 17:42:14 +0100
Subject: [PATCH 015/505] langs

---
 htdocs/inventory/inventory.php    |  7 ++---
 htdocs/langs/en_US/inventory.lang | 52 +++++++++++++++++++++++++++++++
 htdocs/langs/fr_FR/inventory.lang | 50 +++++++++++++++++++++++++++++
 3 files changed, 104 insertions(+), 5 deletions(-)
 create mode 100644 htdocs/langs/en_US/inventory.lang
 create mode 100644 htdocs/langs/fr_FR/inventory.lang

diff --git a/htdocs/inventory/inventory.php b/htdocs/inventory/inventory.php
index 5a87eb94ceb..d0ca303c239 100644
--- a/htdocs/inventory/inventory.php
+++ b/htdocs/inventory/inventory.php
@@ -23,8 +23,6 @@
  
 require_once '../main.inc.php';
 
-ini_set('memory_limit', '512M');
-
 require_once DOL_DOCUMENT_ROOT.'/core/class/listview.class.php';
 require_once DOL_DOCUMENT_ROOT.'/inventory/class/inventory.class.php';
 require_once DOL_DOCUMENT_ROOT.'/inventory/lib/inventory.lib.php';
@@ -35,12 +33,11 @@ require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 include_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 
-set_time_limit(0);
+$langs->load("stock");
+$langs->load("inventory");
 
 if(!$user->rights->inventory->read) accessforbidden();
 
-$langs->load("inventory");
-
 _action();
 
 function _action() 
diff --git a/htdocs/langs/en_US/inventory.lang b/htdocs/langs/en_US/inventory.lang
new file mode 100644
index 00000000000..ba947f09d77
--- /dev/null
+++ b/htdocs/langs/en_US/inventory.lang
@@ -0,0 +1,52 @@
+# Dolibarr language file - Source file is en_US - inventory
+
+Module104420Name = Inventory
+Module104420Desc = Create and manage your inventory
+
+inventorySetup = Inventory Setup
+
+inventoryCreatePermission=Create new inventory
+inventoryReadPermission=View inventories
+inventoryWritePermission=Update inventories
+inventoryValidatePermission=Validate inventory
+
+inventoryTitle=Inventory
+inventoryListTitle=List
+inventoryListEmpty=No inventory in progress
+
+inventoryCreateDelete=Create/Delete inventory
+inventoryCreate=Create new
+inventoryEdit=Edit
+inventoryValidate=Validated
+inventoryDraft=Running
+inventorySelectWarehouse=Warehouse choice
+inventoryConfirmCreate=Create
+inventoryOfWarehouse=Inventory for warehouse : %s
+inventoryErrorQtyAdd=Error : one quantity is leaser than zero
+inventoryMvtStock=By inventory
+inventoryWarningProductAlreadyExists=This product is already into list
+SelectCategory=Category filter
+SelectFournisseur=Supplier filter
+inventoryOnDate=Inventory 
+INVENTORY_DISABLE_VIRTUAL=Allow to not destock child product from a kit on inventory
+INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Use the buy price if no last buy price can be found
+INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT=Stock mouvment have date of inventory
+inventoryChangePMPPermission=Allow to change PMP value for a product
+ColumnNewPMP=New unit PMP
+OnlyProdsInStock=Do not add product without stock
+TheoricalQty=Theorique qty
+TheoricalValue=Theorique qty
+LastPA=Last BP
+CurrentPA=Curent BP
+RealQty=Real Qty
+RealValue=Real Value
+RegulatedQty=Regulated Qty
+AddInventoryProduct=Add product to inventory
+AddProduct=Add
+ApplyPMP=Apply PMP
+FlushInventory=Flush inventory
+ConfirmFlushInventory=Do you confirm this action ?
+InventoryFlushed=Inventory flushed
+ExitEditMode=Exit edition
+inventoryDeleteLine=Delete line
+RegulateStock=Regulate Stock
\ No newline at end of file
diff --git a/htdocs/langs/fr_FR/inventory.lang b/htdocs/langs/fr_FR/inventory.lang
new file mode 100644
index 00000000000..85fdf3112dc
--- /dev/null
+++ b/htdocs/langs/fr_FR/inventory.lang
@@ -0,0 +1,50 @@
+Module104420Name = Inventory
+Module104420Desc = Create and manage your inventory
+
+inventorySetup = Inventory Setup
+
+inventoryCreatePermission=Create new inventory
+inventoryReadPermission=View inventories
+inventoryWritePermission=Update inventories
+inventoryValidatePermission=Validate inventory
+
+inventoryTitle=Inventory
+inventoryListTitle=List
+inventoryListEmpty=No inventory in progress
+
+inventoryCreateDelete=Create/Delete inventory
+inventoryCreate=Create new
+inventoryEdit=Edit
+inventoryValidate=Validated
+inventoryDraft=Running
+inventorySelectWarehouse=Warehouse choice
+inventoryConfirmCreate=Create
+inventoryOfWarehouse=Inventory for warehouse : %s
+inventoryErrorQtyAdd=Error : one quantity is leaser than zero
+inventoryMvtStock=By inventory
+inventoryWarningProductAlreadyExists=This product is already into list
+SelectCategory=Category filter
+SelectFournisseur=Supplier filter
+inventoryOnDate=Inventory 
+INVENTORY_DISABLE_VIRTUAL=Allow to not destock child product from a kit on inventory
+INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Use the buy price if no last buy price can be found
+INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT=Stock mouvment have date of inventory
+inventoryChangePMPPermission=Allow to change PMP value for a product
+ColumnNewPMP=New unit PMP
+OnlyProdsInStock=Do not add product without stock
+TheoricalQty=Theorique qty
+TheoricalValue=Theorique qty
+LastPA=Last BP
+CurrentPA=Curent BP
+RealQty=Real Qty
+RealValue=Real Value
+RegulatedQty=Regulated Qty
+AddInventoryProduct=Add product to inventory
+AddProduct=Add
+ApplyPMP=Apply PMP
+FlushInventory=Flush inventory
+ConfirmFlushInventory=Do you confirm this action ?
+InventoryFlushed=Inventory flushed
+ExitEditMode=Exit edition
+inventoryDeleteLine=Delete line
+RegulateStock=Regulate Stock
\ No newline at end of file

From 4d375bcf958bed8cffe9b4b56f9fa58f3f669472 Mon Sep 17 00:00:00 2001
From: Alexis Algoud <alexis@atm-consulting.fr>
Date: Fri, 16 Dec 2016 11:31:14 +0100
Subject: [PATCH 016/505] debug translate

---
 htdocs/core/class/listview.class.php       | 95 +++++++---------------
 htdocs/core/js/listview.js                 | 56 ++++++-------
 htdocs/core/modules/modInventory.class.php | 11 +--
 htdocs/inventory/inventory.php             | 17 ++--
 htdocs/langs/en_US/inventory.lang          |  4 +-
 htdocs/langs/fr_FR/inventory.lang          |  4 +-
 6 files changed, 75 insertions(+), 112 deletions(-)

diff --git a/htdocs/core/class/listview.class.php b/htdocs/core/class/listview.class.php
index e94a648ec27..d276853a362 100644
--- a/htdocs/core/class/listview.class.php
+++ b/htdocs/core/class/listview.class.php
@@ -68,7 +68,6 @@ class Listview {
 			$TParam['orderBy'] = $POSTList[$this->id]['orderBy']; 
 		}
 		
-	//	print_r($TParam);
 	}
 	private function getSearchNull($key, &$TParam) {
 		return !empty($TParam['search'][$key]['allow_is_null']);
@@ -80,7 +79,7 @@ class Listview {
 			if (!is_array($TParam['search'][$key]['table'])) $TParam['search'][$key]['table'] = array($TParam['search'][$key]['table']);
 			
 			foreach ($TParam['search'][$key]['table'] as $prefix_table) {
-				$TPrefixe[] = '`'.$prefix_table.'`.'; 
+				$TPrefixe[] = $prefix_table.'.'; 
 			}
 		}
 		
@@ -90,27 +89,18 @@ class Listview {
 			
 			foreach ($TParam['search'][$key]['field'] as $i => $field) {
 				$prefixe = !empty($TPrefixe[$i]) ? $TPrefixe[$i] : $TPrefixe[0];
-				$TKey[] = $prefixe.'`'. $field .'`';
+				$TKey[] = $prefixe. $field ;
 			}
 		} else {
-			$TKey[] =$TPrefixe[0].'`'. strtr($key,';','*').'`';
+			$TKey[] =$TPrefixe[0].$key;
 		}
 		
 		return $TKey;
 	} 
-	private function getSearchValue($value) {
-		$value = strtr(trim($value),';','*');	
-			
-		return $value;
-	}
 	
 	private function dateToSQLDate($date) {
 		
-		list($dd,$mm,$aaaa) = explode('/', substr($date,0,10));
-		
-		$value = date('Y-m-d', mktime(0,0,0,$mm,$dd,$aaaa));
-		
-		return $value;
+		return $this->db->jdate($date);
 	}
 	
 	private function addSqlFromTypeDate(&$TSQLMore, &$value, $sKey, $sBindKey)
@@ -118,19 +108,10 @@ class Listview {
 		if(is_array($value))
 		{
 			
-			unset($this->TBind[$sBindKey]);
-			// Si le type de "recherche" est "calendars" on a 2 champs de transmis, [début et fin] ou [que début] ou [que fin] => un BETWEEN Sql serait utile que dans le 1er cas 
-			// donc l'utilisation des opérateur >= et <= permettent un fonctionnement générique
 			$TSQLDate=array();
 			if(!empty($value['start']))
 			{
 				$valueDeb = $this->dateToSQLDate($value['start']);
-				
-				if(isset($this->TBind[$sBindKey.'_start'])) // TODO can't use this in query case
-				{
-					$this->TBind[$sBindKey.'_start'] = $valueDeb;
-				}
-				
 				$TSQLDate[]=$sKey." >= '".$valueDeb." 00:00:00'" ;
 				
 			}
@@ -138,10 +119,6 @@ class Listview {
 			if(!empty($value['end']))
 			{
 				$valueFin = $this->dateToSQLDate($value['end']);
-				if(isset($this->TBind[$sBindKey.'_end'])) { // TODO can't use this in query case
-					$this->TBind[$sBindKey.'_end'] = $valueFin;
-				}
-				
 				$TSQLDate[]=$sKey." <= '".$valueFin." 23:59:59'" ;	
 				
 			}
@@ -150,25 +127,15 @@ class Listview {
 		}
 		else
 		{
-			// Sinon je communique une date directement au format d/m/Y et la méthode du dessous reformat en Y-m-d
 			$value = $this->dateToSQLDate($value);
-			if(isset($this->TBind[$sBindKey]))
-			{
-				$this->TBind[$sBindKey] = $value;
-			}
-			else
-			{
-				// Le % en fin de chaine permet de trouver un resultat si le contenu est au format Y-m-d H:i:s et non en Y-m-d
-				$TSQLMore[]=$sKey." LIKE '".$value."%'" ;
-			}
+			$TSQLMore[]=$sKey." LIKE '".$value."%'" ;
+			
 		}
 	}
 	
 	private function addSqlFromOther(&$TSQLMore, &$value, &$TParam, $sKey, $sBindKey, $key)
 	{
 	
-		$value = $this->getSearchValue($value);
-		
 		if(isset($TParam['operator'][$key]))
 		{
 			if($TParam['operator'][$key] == '<' || $TParam['operator'][$key] == '>' || $TParam['operator'][$key]=='=')
@@ -207,7 +174,6 @@ class Listview {
 			foreach($_REQUEST['Listview'][$this->id]['search'] as $key=>$value)
 			{
 				$TsKey = $this->getSearchKey($key, $TParam);
-				$TsBindKey = $this->getTsBindKey($TsKey);
 				
 				//if (!empty($value)) var_dump($TsKey, $TsBindKey, '==================================');
 				$TSQLMore = array();
@@ -217,38 +183,32 @@ class Listview {
 				
 				foreach ($TsKey as $i => &$sKey)
 				{
-					//if (!empty($value)) var_dump($sKey);
-					$sBindKey = $TsBindKey[$i];
-					
 					if($allow_is_null && !empty($_REQUEST['Listview'][$this->id]['search_on_null'][$key]))
 					{
-						$this->TBind[$sBindKey.'_null'] = $sKey.' IS NULL ';
 						$TSQLMore[] = $sKey.' IS NULL ';
 						$search_on_null = true;
 						
-						if(isset($this->TBind[$sBindKey])) $this->TBind[$sBindKey]= '';
 						$value = '';
 					}
 					elseif($allow_is_null)
 					{
-						$this->TBind[$sBindKey.'_null'] =0; // $sKey.' IS NOT NULL ';
-						//$TSQLMore[] =  $sKey.' IS NOT NULL ';
+						null;
 					}
 					
 					if($value!='') { // pas empty car biensûr le statut = 0 existe dans de nombreux cas
 						
 						if(isset($TParam['type'][$key]) && ($TParam['type'][$key]==='date' || $TParam['type'][$key]==='datetime'))
 						{
-							$this->addSqlFromTypeDate($TSQLMore, $value, $sKey, $sBindKey);
+							$this->addSqlFromTypeDate($TSQLMore, $value, $sKey);
 						}
 						else
 						{
-							$this->addSqlFromOther($TSQLMore, $value, $TParam, $sKey, $sBindKey, $key);
+							$this->addSqlFromOther($TSQLMore, $value, $TParam, $sKey, $key);
 						}
 					}
 				}
 
-				if(!isset($this->TBind[$sBindKey]) && !empty($TSQLMore))
+				if(!empty($TSQLMore))
 				{
 					$sql.=' AND ( '.implode(' OR ',$TSQLMore).' ) ';
 				}
@@ -282,13 +242,11 @@ class Listview {
 	}
 
 	private function setSearch(&$THeader, &$TParam) {
-		global $langs;
+		global $langs, $form;
 		
 		if(empty($TParam['search'])) return array();
 		
 		$TSearch=array();
-		$form=new TFormCore;
-		$form->strict_string_compare = true;
 		
 		$nb_search_in_bar = 0;
 		
@@ -296,20 +254,22 @@ class Listview {
 			foreach($THeader as $key=>$libelle) { // init
 				if(empty($TSearch[$key]))$TSearch[$key]='';
 			}
-		}		
+		}	
+		
+		$ListPOST = GETPOST('Listview');
+		
 		foreach($TParam['search'] as $key=>$param_search) {
 			
-		
-			$value = isset($_REQUEST['Listview'][$this->id]['search'][$key]) ? $_REQUEST['Listview'][$this->id]['search'][$key] : '';
+			$value = isset($ListPOST[$this->id]['search'][$key]) ? $ListPOST[$this->id]['search'][$key] : '';
 			
 			$typeRecherche = (is_array($param_search) && isset($param_search['recherche'])) ? $param_search['recherche'] : $param_search;  
 			
 			if(is_array($typeRecherche)) {
-				$typeRecherche = array(''=>' ') + $typeRecherche;
-				$fsearch=$form->combo('','Listview['.$this->id.'][search]['.$key.']', $typeRecherche,$value,0,'',' listviewtbs="combo" init-value="'.$value.'" ');
+				$fsearch=$form->selectarray('Listview['.$this->id.'][search]['.$key.']', $typeRecherche,$value,1);
 			}
 			else if($typeRecherche==='calendar') {
-				$fsearch=$form->calendrier('','Listview['.$this->id.'][search]['.$key.']',$value,10,10,' listviewtbs="calendar" ');	
+				$fsearch = $form->select_date($value, 'Listview['.$this->id.'][search]['.$key.']',0, 0, 1, "", 1, 0, 1);
+				//$fsearch=$form->calendrier('','Listview['.$this->id.'][search]['.$key.']',$value,10,10,' listviewtbs="calendar" ');	
 			}
 			else if($typeRecherche==='calendars') {
 				$fsearch=$form->calendrier('','Listview['.$this->id.'][search]['.$key.'][start]',isset($value['start'])?$value['start']:'',10,10,' listviewtbs="calendars" ')
@@ -340,7 +300,7 @@ class Listview {
 				
 		}
 		
-		$search_button = ' <a href="#" onclick="ListviewsubmitSearch(this);" class="list-search-link">'.$TParam['liste']['picto_search'].'</a>';
+		$search_button = ' <a href="#" onclick="Listview_submitSearch(this);" class="list-search-link">'.$TParam['liste']['picto_search'].'</a>';
 
 		if(!empty($TParam['liste']['head_search'])) {
 			$TParam['liste']['head_search'].='<div align="right">'.$langs->trans('Search').' '.$search_button.'</div>';
@@ -406,8 +366,8 @@ class Listview {
 
 	private function getJS(&$TParam) {
 		$javaScript = '<script language="javascript">
-		if(typeof(TListview_include)=="undefined") {
-			document.write("<script type=\"text/javascript\" src=\"'.DOL_URL_ROOT.'/core/js/list.view.js\"></scr");
+		if(typeof(Listview_include)=="undefined") {
+			document.write("<script type=\"text/javascript\" src=\"'.DOL_URL_ROOT.'/core/js/listview.js?version='.DOL_VERSION.'\"></scr");
 	  		document.write("ipt>");
 		}
 		</script>';
@@ -542,10 +502,13 @@ class Listview {
 		
 		$out.='</tr>';
 			
-		if(!empty($TParam['liste']['nbSearch'])) {
-		$out.='<tr class="liste_titre barre-recherche">
-					<td class="liste_titre">'.img_search().'</td>
-				</tr>';
+		if(count($TSearch)>0) {
+			$out.='<tr class="liste_titre barre-recherche">';
+			foreach($TSearch as $field=>$search) {
+				$out.='<td class="liste_titre">'.$search.'</td>';
+				
+			}
+			$out.='</tr>';
 		}
 				
 		$out.='</thead><tbody>';
diff --git a/htdocs/core/js/listview.js b/htdocs/core/js/listview.js
index 1157c2ef4b8..03ca7f72508 100644
--- a/htdocs/core/js/listview.js
+++ b/htdocs/core/js/listview.js
@@ -1,27 +1,27 @@
-var TListTBS_include = true;
+var Listview_include = true;
 
-function TListTBS_OrderDown(idListe, column) {
+function Listview_OrderDown(idListe, column) {
 	var base_url = document.location.href;
 	
-	base_url = TListTBS_recup_form_param(idListe,base_url);
-	base_url = TListTBS_removeParam(base_url,'TListTBS['+encodeURIComponent(idListe)+'][orderBy]');
+	base_url = Listview_recup_form_param(idListe,base_url);
+	base_url = Listview_removeParam(base_url,'Listview['+encodeURIComponent(idListe)+'][orderBy]');
 	
-	base_url = TListTBS_removeParam(base_url,'get-all-for-export');
+	base_url = Listview_removeParam(base_url,'get-all-for-export');
 	
-	document.location.href=TListTBS_modifyUrl(base_url,"TListTBS["+encodeURIComponent(idListe)+"][orderBy]["+encodeURIComponent(column)+"]","DESC");
+	document.location.href=Listview_modifyUrl(base_url,"Listview["+encodeURIComponent(idListe)+"][orderBy]["+encodeURIComponent(column)+"]","DESC");
 }
-function TListTBS_OrderUp(idListe, column) {
+function Listview_OrderUp(idListe, column) {
 	
 	var base_url = document.location.href;
 	
-	base_url = TListTBS_recup_form_param(idListe,base_url);
-	base_url = TListTBS_removeParam(base_url,'TListTBS['+encodeURIComponent(idListe)+'][orderBy]');
+	base_url = Listview_recup_form_param(idListe,base_url);
+	base_url = Listview_removeParam(base_url,'Listview['+encodeURIComponent(idListe)+'][orderBy]');
 	
-	base_url = TListTBS_removeParam(base_url,'get-all-for-export');
+	base_url = Listview_removeParam(base_url,'get-all-for-export');
 	
-	document.location.href=TListTBS_modifyUrl(base_url,"TListTBS["+encodeURIComponent(idListe)+"][orderBy]["+encodeURIComponent(column)+"]","ASC");
+	document.location.href=Listview_modifyUrl(base_url,"Listview["+encodeURIComponent(idListe)+"][orderBy]["+encodeURIComponent(column)+"]","ASC");
 }
-function TListTBS_modifyUrl(strURL,paramName,paramNewValue){
+function Listview_modifyUrl(strURL,paramName,paramNewValue){
 	    if (strURL.indexOf(paramName+'=')!=-1){
         	
                 var strFirstPart=strURL.substring(0,strURL.indexOf(paramName+'=',0))+paramName+'=';
@@ -39,7 +39,7 @@ function TListTBS_modifyUrl(strURL,paramName,paramNewValue){
         
         return strURL;
 }
-function TListTBS_removeParam(strURL, paramMask) {
+function Listview_removeParam(strURL, paramMask) {
 	var cpt=0;
 	var url = '';
 	
@@ -60,11 +60,11 @@ function TListTBS_removeParam(strURL, paramMask) {
 	 return url;
 }
 
-function TListTBS_recup_form_param(idListe,base_url) {
+function Listview_recup_form_param(idListe,base_url) {
 	
 	$('#'+idListe+' tr.barre-recherche [listviewtbs],#'+idListe+' tr.barre-recherche-head input,#'+idListe+' tr.barre-recherche-head select,#'+idListe+' div.tabsAction input[listviewtbs]').each(function(i,item) {
 		if($(item).attr("name")) {
-			base_url = TListTBS_modifyUrl(base_url, $(item).attr("name") , $(item).val());
+			base_url = Listview_modifyUrl(base_url, $(item).attr("name") , $(item).val());
 		}
 		
 	});
@@ -72,37 +72,37 @@ function TListTBS_recup_form_param(idListe,base_url) {
 	return base_url;
 }
 
-function TListTBS_GoToPage(idListe,pageNumber){
+function Listview_GoToPage(idListe,pageNumber){
 	
 	var base_url = document.location.href;
 	
-	base_url = TListTBS_recup_form_param(idListe,base_url);
-	base_url =TListTBS_modifyUrl(base_url,"TListTBS["+encodeURIComponent(idListe)+"][page]",pageNumber);
+	base_url = Listview_recup_form_param(idListe,base_url);
+	base_url =Listview_modifyUrl(base_url,"Listview["+encodeURIComponent(idListe)+"][page]",pageNumber);
 	
-	base_url = TListTBS_removeParam(base_url,'get-all-for-export');
+	base_url = Listview_removeParam(base_url,'get-all-for-export');
 	
 	document.location.href=base_url;
 }
-function TListTBS_submitSearch(obj) {
+function Listview_submitSearch(obj) {
 	
 	$(obj).closest('form').submit();
-	//console.log($(obj).closest('form'));
+
 }
-function TListTBS_launch_downloadAs(mode,url,token,session_name) {
-	 $('#listTBSdAS_export_form').remove();
+function Listview_launch_downloadAs(mode,url,token,session_name) {
+	 $('#listviewdAS_export_form').remove();
 	
-	$form = $('<form action="'+url+'" method="post" name="listTBSdAS_export_form" id="listTBSdAS_export_form"></form>');
+	$form = $('<form action="'+url+'" method="post" name="listviewdAS_export_form" id="listTBSdAS_export_form"></form>');
 	$form.append('<input type="hidden" name="mode" value="'+mode+'" />');
 	$form.append('<input type="hidden" name="token" value="'+token+'" />');
 	$form.append('<input type="hidden" name="session_name" value="'+session_name+'" />');
 	
 	$('body').append($form);
 	
-    $('#listTBSdAS_export_form').submit();
+    $('#listviewdAS_export_form').submit();
 	
 }
 
-function TListTBS_downloadAs(obj, mode,url,token,session_name) {
+function Listview_downloadAs(obj, mode,url,token,session_name) {
 	
 	$form = $(obj).closest('form');
 	$div = $form.find('div.tabsAction');
@@ -112,7 +112,7 @@ function TListTBS_downloadAs(obj, mode,url,token,session_name) {
 	$div.append('<input type="hidden" listviewtbs="hidden" name="session_name" value="'+session_name+'" />');
 	$div.append('<input type="hidden" listviewtbs="hidden" name="get-all-for-export" value="1" />');
 	
-	TListTBS_submitSearch(obj);
+	Listview_submitSearch(obj);
 }
 
 $(document).ready(function() {
@@ -137,7 +137,7 @@ $(document).ready(function() {
 	});
 	
 	if(typeof $_GET["get-all-for-export"] != "undefined") {
-		TListTBS_launch_downloadAs($_GET["mode"],$_GET["url"],$_GET["token"],$_GET["session_name"]);
+		Listview_launch_downloadAs($_GET["mode"],$_GET["url"],$_GET["token"],$_GET["session_name"]);
 	}
 	
 });
diff --git a/htdocs/core/modules/modInventory.class.php b/htdocs/core/modules/modInventory.class.php
index 31170375752..abe65b65647 100644
--- a/htdocs/core/modules/modInventory.class.php
+++ b/htdocs/core/modules/modInventory.class.php
@@ -66,7 +66,7 @@ class modinventory extends DolibarrModules
 		// Name of image file used for this module.
 		// If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
 		// If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
-		$this->picto='inventory@inventory';
+		$this->picto='inventory';
 
 		// Defined all module parts (triggers, login, substitutions, menus, css, etc...)
 		// for default path (eg: /inventory/core/xxxxx) (0=disable, 1=enable)
@@ -167,8 +167,6 @@ class modinventory extends DolibarrModules
 		// Example:
 		//$this->boxes=array(array(0=>array('file'=>'myboxa.php','note'=>'','enabledbydefaulton'=>'Home'),1=>array('file'=>'myboxb.php','note'=>''),2=>array('file'=>'myboxc.php','note'=>'')););
 
-		$langs->load('inventory@inventory');
-		
 		// Permissions
 		$this->rights = array();		// Permission array used by this module
 		$r=0;
@@ -249,11 +247,11 @@ class modinventory extends DolibarrModules
 		// $r++;
 		$this->menu[$r]=array(	'fk_menu'=>'fk_mainmenu=products,fk_leftmenu=stock',			                // Put 0 if this is a top menu
 								'type'=>'left',			                // This is a Top menu entry
-								'titre'=>'Liste des inventaires',
+								'titre'=>'ListInventory',
 								'mainmenu'=>'inventory',
 								'leftmenu'=>'inventory',
 								'url'=>'/inventory/inventory.php?action=list',
-								'langs'=>'inventory@inventory',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+								'langs'=>'inventory',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
 								'position'=>100,
 								'enabled'=>'$conf->inventory->enabled',	// Define condition to show or hide menu entry. Use '$conf->inventory->enabled' if entry must be visible if module is enabled.
 								'perms'=>'$user->rights->inventory->read',			                // Use 'perms'=>'$user->rights->inventory->level1->level2' if you want your menu with a permission rules
@@ -263,11 +261,10 @@ class modinventory extends DolibarrModules
 		
 		$this->menu[$r]=array(	'fk_menu'=>'fk_mainmenu=products,fk_leftmenu=stock',			                // Put 0 if this is a top menu
 								'type'=>'left',			                // This is a Top menu entry
-								'titre'=>'Nouvel inventaire',
+								'titre'=>'NewInventory',
 								'mainmenu'=>'inventory',
 								'leftmenu'=>'inventory',
 								'url'=>'/inventory/inventory.php?action=create',
-								'langs'=>'inventory@inventory',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
 								'position'=>100,
 								'enabled'=>'$conf->inventory->enabled',	// Define condition to show or hide menu entry. Use '$conf->inventory->enabled' if entry must be visible if module is enabled.
 								'perms'=>'$user->rights->inventory->create',			                // Use 'perms'=>'$user->rights->inventory->level1->level2' if you want your menu with a permission rules
diff --git a/htdocs/inventory/inventory.php b/htdocs/inventory/inventory.php
index d0ca303c239..f0a0d073a27 100644
--- a/htdocs/inventory/inventory.php
+++ b/htdocs/inventory/inventory.php
@@ -266,8 +266,8 @@ function _action()
 			
 			header('Location: '.dol_buildpath('/inventory/inventory.php?action=list', 1));
 			exit;
-			//_list();
 			
+			break;
 		case 'exportCSV':
 			
 			$id = GETPOST('id');
@@ -309,18 +309,14 @@ function _list()
 	$THide = array('label');
 
 	echo $l->render(Inventory::getSQL('All'), array(
-		'limit'=>array(
-			'nbLine'=>'30'
-		)
-		,'subQuery'=>array()
-		,'link'=>array(
+		'link'=>array(
 			'fk_warehouse'=>'<a href="'.DOL_URL_ROOT.'/product/stock/card.php?id=@val@">'.img_picto('','object_stock.png','',0).' @label@</a>'
 		)
 		,'translate'=>array()
 		,'hide'=>$THide
 		,'type'=>array(
-			'date_cre'=>'date'
-			,'date_maj'=>'datetime'
+			'datec'=>'date'
+			,'tms'=>'datetime'
 			,'date_inventory'=>'date'
 		)
 		,'liste'=>array(
@@ -343,7 +339,10 @@ function _list()
 		,'eval'=>array(
 			'status' => '(@val@ ? img_picto("'.$langs->trans("inventoryValidate").'", "statut4") : img_picto("'.$langs->trans("inventoryDraft").'", "statut3"))'
 			,'rowid'=>'Inventory::getLink(@val@)'
-            
+		)
+		,'search'=>array(
+				'date_inventory'=>'calendar'
+				
 		)
 	));
 
diff --git a/htdocs/langs/en_US/inventory.lang b/htdocs/langs/en_US/inventory.lang
index ba947f09d77..152aceed862 100644
--- a/htdocs/langs/en_US/inventory.lang
+++ b/htdocs/langs/en_US/inventory.lang
@@ -49,4 +49,6 @@ ConfirmFlushInventory=Do you confirm this action ?
 InventoryFlushed=Inventory flushed
 ExitEditMode=Exit edition
 inventoryDeleteLine=Delete line
-RegulateStock=Regulate Stock
\ No newline at end of file
+RegulateStock=Regulate Stock
+ListInventory=Inventories list
+NewInventory=New inventory
\ No newline at end of file
diff --git a/htdocs/langs/fr_FR/inventory.lang b/htdocs/langs/fr_FR/inventory.lang
index 85fdf3112dc..546a5202976 100644
--- a/htdocs/langs/fr_FR/inventory.lang
+++ b/htdocs/langs/fr_FR/inventory.lang
@@ -47,4 +47,6 @@ ConfirmFlushInventory=Do you confirm this action ?
 InventoryFlushed=Inventory flushed
 ExitEditMode=Exit edition
 inventoryDeleteLine=Delete line
-RegulateStock=Regulate Stock
\ No newline at end of file
+RegulateStock=Regulate Stock
+InventoryDate=Inventory date
+DateUpdate=Last update
\ No newline at end of file

From 79867a85d05d6730eaa88951c7ab149745efa89e Mon Sep 17 00:00:00 2001
From: Alexis Algoud <alexis@atm-consulting.fr>
Date: Fri, 16 Dec 2016 16:09:02 +0100
Subject: [PATCH 017/505] fix list issue

---
 htdocs/core/class/listview.class.php       |  74 +++++++--------
 htdocs/core/js/listview.js                 |  10 +-
 htdocs/core/modules/modInventory.class.php |   2 +-
 htdocs/inventory/class/inventory.class.php |   2 +-
 htdocs/inventory/inventory.php             |  68 +-------------
 htdocs/inventory/list.php                  | 103 +++++++++++++++++++++
 6 files changed, 152 insertions(+), 107 deletions(-)
 create mode 100644 htdocs/inventory/list.php

diff --git a/htdocs/core/class/listview.class.php b/htdocs/core/class/listview.class.php
index d276853a362..6b57fd36a21 100644
--- a/htdocs/core/class/listview.class.php
+++ b/htdocs/core/class/listview.class.php
@@ -40,7 +40,7 @@ class Listview {
 		if(!isset($TParam['link']))$TParam['link']=array();
 		if(!isset($TParam['type']))$TParam['type']=array();
 		if(!isset($TParam['orderby']['noOrder']))$TParam['orderby']['noOrder']=array();
-		if(!isset($TParam['no-select'])) $TParam['no-select'] = 1;
+		if(!isset($TParam['allow-fields-select'])) $TParam['allow-fields-select'] = 0;
 		
 		if(!isset($TParam['list']))$TParam['list']=array();
 		$TParam['list'] = array_merge(array(
@@ -53,7 +53,7 @@ class Listview {
 			,'orderUp'=>''
 			,'id'=>$this->id
 			,'head_search'=>''
-			,'export'=>array()
+			,'export'=>array() //TODO include native export
 			,'view_type'=>'' //TODO to include graph or kanban instead of list
 		),$TParam['list']);
 		
@@ -133,7 +133,7 @@ class Listview {
 		}
 	}
 	
-	private function addSqlFromOther(&$TSQLMore, &$value, &$TParam, $sKey, $sBindKey, $key)
+	private function addSqlFromOther(&$TSQLMore, &$value, &$TParam, $sKey, $key)
 	{
 	
 		if(isset($TParam['operator'][$key]))
@@ -272,38 +272,40 @@ class Listview {
 				//$fsearch=$form->calendrier('','Listview['.$this->id.'][search]['.$key.']',$value,10,10,' listviewtbs="calendar" ');	
 			}
 			else if($typeRecherche==='calendars') {
-				$fsearch=$form->calendrier('','Listview['.$this->id.'][search]['.$key.'][start]',isset($value['start'])?$value['start']:'',10,10,' listviewtbs="calendars" ')
-					.' '.$form->calendrier('','Listview['.$this->id.'][search]['.$key.'][end]',isset($value['end'])?$value['end']:'',10,10,' listviewtbs="calendars" ');	
+				
+				$fsearch = $form->select_date(isset($value['start'])?$value['start']:'', 'Listview['.$this->id.'][search]['.$key.'][start]',0, 0, 1, "", 1, 0, 1)
+						 . $form->select_date(isset($value['end'])?$value['end']:'', 'Listview['.$this->id.'][search]['.$key.'][end]',0, 0, 1, "", 1, 0, 1);
+				
 			}
 			else if(is_string($typeRecherche)) {
 				$fsearch=$TParam['search'][$key];	
 			}
 			else {
-				$fsearch=$form->texte('','Listview['.$this->id.'][search]['.$key.']',$value,15,255,' listviewtbs="input" ');	
+				$fsearch='<input type="text" name="Listview['.$this->id.'][search]['.$key.']" id="Listview['.$this->id.'][search]['.$key.']" value="'.$value.'" size="15" />';
 			}
 
 			if(!empty($param_search['allow_is_null'])) {
-				$valueNull = isset($_REQUEST['Listview'][$this->id]['search_on_null'][$key]) ? 1 : 0;
+				$valueNull = isset($ListPOST[$this->id]['search_on_null'][$key]) ? 1 : 0;
 				$fsearch.=' '.$form->checkbox1('', 'Listview['.$this->id.'][search_on_null]['.$key.']',1, $valueNull,' onclick=" if($(this).is(\':checked\')){ $(this).prev().val(\'\'); }" ').img_help(1, $langs->trans('SearchOnNUllValue'));
 			}
 			
 
-			if(!empty($THeader[$key]) || $this->getViewType($TParam) == 'chart') {
+			if(!empty($THeader[$key])) {
 				$TSearch[$key] = $fsearch;
 				$nb_search_in_bar++;
 			}
 			else {
 				
-				$libelle = !empty($TParam['title'][$key]) ? $TParam['title'][$key] : $key ;
-				$TParam['liste']['head_search'].='<div>'.$libelle.' '.$fsearch.'</div>';	
+				$label = !empty($TParam['title'][$key]) ? $TParam['title'][$key] : $key ;
+				$TParam['list']['head_search'].='<div><span style="min-width:200px;display:inline-block;">'.$libelle.'</span> '.$fsearch.'</div>';	
 			}
 				
 		}
 		
-		$search_button = ' <a href="#" onclick="Listview_submitSearch(this);" class="list-search-link">'.$TParam['liste']['picto_search'].'</a>';
+		$search_button = ' <a href="#" onclick="Listview_submitSearch(this);" class="list-search-link">'.img_search().'</a>';
 
-		if(!empty($TParam['liste']['head_search'])) {
-			$TParam['liste']['head_search'].='<div align="right">'.$langs->trans('Search').' '.$search_button.'</div>';
+		if(!empty($TParam['list']['head_search'])) {
+			$TParam['list']['head_search']='<div style="float:right;">'.$search_button.'</div>'.$TParam['list']['head_search'];
 		}
 		
 		if($nb_search_in_bar>0) {
@@ -364,7 +366,7 @@ class Listview {
 		return array($TTotal,$TTotalGroup);
 	}
 
-	private function getJS(&$TParam) {
+	private function getJS() {
 		$javaScript = '<script language="javascript">
 		if(typeof(Listview_include)=="undefined") {
 			document.write("<script type=\"text/javascript\" src=\"'.DOL_URL_ROOT.'/core/js/listview.js?version='.DOL_VERSION.'\"></scr");
@@ -467,34 +469,32 @@ class Listview {
 	
 	private function renderList(&$THeader, &$TField, &$TTotal,&$TTotalGroup, &$TParam) {
 		
-		$javaScript = $this->getJS($TParam);
-		
-		/*$TPagination=array(
-			'pagination'=>array('pageSize'=>$TParam['limit']['nbLine'], 'pageNum'=>$TParam['limit']['page'], 'blockName'=>'champs', 'totalNB'=>count($TField))
-		);*/
-		
 		$TSearch = $this->setSearch($THeader, $TParam);
 		$TExport=$this->setExport($TParam, $TField, $THeader);
 		$TField = $this->addTotalGroup($TField,$TTotalGroup);
 		
-		$out = $javaScript;
+		$out = $this->getJS();
 		$out.=load_fiche_titre($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $TParam['limit']['page'], count($TField), 'title_products.png', 0, '', '', $limit);
 		$out.='<table id="'.$this->id.'" class="liste" width="100%">
 			<thead>';
 		
-		if(!empty($TParam['liste']['head_search'])) {
+		if(!empty($TParam['list']['head_search'])) {
 			$out.='<tr class="liste_titre barre-recherche-head">
-					<td colspan="'.$TParam['liste']['nb_columns'].'">'.$TParam['liste']['head_search'].'</td>
+					<td colspan="'.count($THeader).'">'.$TParam['list']['head_search'].'</td>
 				</tr>';
 		}
 			
 		$out.='<tr class="liste_titre">';
 		
-		foreach($THeader as $head) {
+		foreach($THeader as $field=>$head) {
+			if(empty($head['width']))$head['width']='auto';
+			
 			$out.='<th style="width:'.$head['width'].';text-align:'.$head['text-align'].'" class="liste_titre">'.$head['libelle'];
-						
-			if($head['order']) $out.='<span class="nowrap">[onshow;block=span; when [entete.order]==1]<a href="javascript:Listview_OrderDown(\'[liste.id]\',\'[entete.$;strconv=js]\')">'.img_down().'</a>
-								<a href="javascript:Listview_OrderUp(\'[liste.id]\', \'[entete.$;strconv=js]\')">'.img_up().'</a></span>';
+				
+			if($head['order']) $out.='<span class="nowrap">
+					<a href="javascript:Listview_OrderDown(\''.$this->id.'\',\''.$field.'\')">'.img_down().'</a>
+					<a href="javascript:Listview_OrderUp(\''.$this->id.'\', \''.$field.'\')">'.img_up().'</a>
+			</span>';
 			
 			$out.=$head['more'];
 			$out.='</th>';
@@ -517,7 +517,7 @@ class Listview {
 		
 		if(empty($TField)) {
 			$out.='<tr class="'.$class.'">
-					<td colspan="'.$TParam['liste']['nb_columns'].'">'.$TParam['liste']['messageNothing'].'</td></tr>';
+					<td colspan="'.$TParam['list']['nb_columns'].'">'.$TParam['list']['messageNothing'].'</td></tr>';
 			
 		}
 		else{
@@ -537,7 +537,7 @@ class Listview {
 			
 			$out.='</tbody>';
 			
-			if(!empty($TParam['liste']['haveTotal'])) {
+			if(!empty($TParam['list']['haveTotal'])) {
 				$out.='<tfoot>
 				<tr class="liste_total">';
 			
@@ -584,8 +584,8 @@ class Listview {
 			foreach($TParam['orderBy'] as $field=>$order) {
 				if(!$first) $sql.=',';
 				
-				if($order=='DESC')$TParam['liste']['orderDown'] = $field;
-				else $TParam['liste']['orderUp'] = $field;
+				if($order=='DESC')$TParam['list']['orderDown'] = $field;
+				else $TParam['list']['orderUp'] = $field;
 				
 				if(strpos($field,'.')===false)	$sql.='`'.$field.'` '.$order;
 				else $sql.=$field.' '.$order;
@@ -610,7 +610,7 @@ class Listview {
 		
 		foreach($TField as $row) {
 			if($first) {
-				$this->init_entete($THeader, $TParam, $row);
+				$this->initHeader($THeader, $TParam, $row);
 				$first=false;
 			}	
 			
@@ -619,7 +619,7 @@ class Listview {
 
 	}
 	
-	private function init_entete(&$THeader, &$TParam, $currentLine) {
+	private function initHeader(&$THeader, &$TParam, $currentLine) {
 		
 		$TField=$TFieldVisibility=array();
 		
@@ -630,9 +630,9 @@ class Listview {
 		global $user;
 		
 		$contextpage=md5($_SERVER['PHP_SELF']);
-		if(empty($TParam['no-select'])) {
+		if(!empty($TParam['allow-field-select'])) {
 			
-			dol_include_once('/core/class/html.form.class.php');
+			include_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
 			
 			global $db,$conf,$user;
 			$form=new Form($db);
@@ -693,7 +693,7 @@ class Listview {
 				$lastfield = $field;
 				$THeader[$field] = array(
 					'libelle'=>$libelle
-					,'order'=>((in_array($field, $TParam['orderby']['noOrder']) || $this->typeRender != 'sql') ? 0 : 1)
+					,'order'=>(in_array($field, $TParam['orderby']['noOrder']) ? 0 : 1)
 					,'width'=>(!empty($TParam['size']['width'][$field]) ? $TParam['size']['width'][$field] : 'auto')
 					,'text-align'=>(!empty($TParam['position']['text-align'][$field]) ? $TParam['position']['text-align'][$field] : 'auto')
 					,'more'=>''
@@ -843,7 +843,7 @@ class Listview {
 			$first=true;
 			while($currentLine = $this->db->fetch_object($res)) {
 				if($first) {
-					$this->init_entete($THeader, $TParam, $currentLine);
+					$this->initHeader($THeader, $TParam, $currentLine);
 					$first = false;
 				}
 				
diff --git a/htdocs/core/js/listview.js b/htdocs/core/js/listview.js
index 03ca7f72508..0affb264474 100644
--- a/htdocs/core/js/listview.js
+++ b/htdocs/core/js/listview.js
@@ -85,7 +85,15 @@ function Listview_GoToPage(idListe,pageNumber){
 }
 function Listview_submitSearch(obj) {
 	
-	$(obj).closest('form').submit();
+	$form = $(obj).closest('form');
+	console.log($form);
+	if($form.length>0){
+		$form.submit();
+	}
+	else{
+		//There is no form for search action
+		null;
+	}
 
 }
 function Listview_launch_downloadAs(mode,url,token,session_name) {
diff --git a/htdocs/core/modules/modInventory.class.php b/htdocs/core/modules/modInventory.class.php
index abe65b65647..d3ee39c89ff 100644
--- a/htdocs/core/modules/modInventory.class.php
+++ b/htdocs/core/modules/modInventory.class.php
@@ -250,7 +250,7 @@ class modinventory extends DolibarrModules
 								'titre'=>'ListInventory',
 								'mainmenu'=>'inventory',
 								'leftmenu'=>'inventory',
-								'url'=>'/inventory/inventory.php?action=list',
+								'url'=>'/inventory/list.php',
 								'langs'=>'inventory',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
 								'position'=>100,
 								'enabled'=>'$conf->inventory->enabled',	// Define condition to show or hide menu entry. Use '$conf->inventory->enabled' if entry must be visible if module is enabled.
diff --git a/htdocs/inventory/class/inventory.class.php b/htdocs/inventory/class/inventory.class.php
index b39445807e9..344252f4dc4 100644
--- a/htdocs/inventory/class/inventory.class.php
+++ b/htdocs/inventory/class/inventory.class.php
@@ -362,7 +362,7 @@ class Inventory extends CoreObject
 		
 		if($type=='All') {
 			
-			$sql="SELECT i.rowid, e.label, i.date_inventory, i.fk_warehouse, i.datec, i.tms, i.status
+			$sql="SELECT i.rowid,i.title, e.label, i.date_inventory, i.fk_warehouse, i.datec, i.tms, i.status
 				  FROM ".MAIN_DB_PREFIX."inventory i
 				  LEFT JOIN ".MAIN_DB_PREFIX."entrepot e ON (e.rowid = i.fk_warehouse)
 				  WHERE i.entity=".(int) $conf->entity;
diff --git a/htdocs/inventory/inventory.php b/htdocs/inventory/inventory.php
index f0a0d073a27..e8918f021d0 100644
--- a/htdocs/inventory/inventory.php
+++ b/htdocs/inventory/inventory.php
@@ -53,11 +53,6 @@ function _action()
 	$action=GETPOST('action');
 	
 	switch($action) {
-		case 'list':
-			_list();
-
-			break;
-		
 		case 'create':
 			if (!$user->rights->inventory->create) accessforbidden();
 			
@@ -264,7 +259,7 @@ function _action()
 			
 			setEventMessage($langs->trans('InventoryDeleted'));
 			
-			header('Location: '.dol_buildpath('/inventory/inventory.php?action=list', 1));
+			header('Location: '.dol_buildpath('/inventory/list.php', 1));
 			exit;
 			
 			break;
@@ -296,67 +291,6 @@ function _action()
 	
 }
 
-function _list() 
-{
-	
-	global $db, $conf, $langs, $user;
-		
-	llxHeader('',$langs->trans('inventoryListTitle'),'','');
-	
-	$inventory = new Inventory($db);
-	$l = new ListView($db,'listInventory');
-
-	$THide = array('label');
-
-	echo $l->render(Inventory::getSQL('All'), array(
-		'link'=>array(
-			'fk_warehouse'=>'<a href="'.DOL_URL_ROOT.'/product/stock/card.php?id=@val@">'.img_picto('','object_stock.png','',0).' @label@</a>'
-		)
-		,'translate'=>array()
-		,'hide'=>$THide
-		,'type'=>array(
-			'datec'=>'date'
-			,'tms'=>'datetime'
-			,'date_inventory'=>'date'
-		)
-		,'liste'=>array(
-			'titre'=>$langs->trans('inventoryListTitle')
-			,'image'=>img_picto('','title.png', '', 0)
-			,'picto_precedent'=>img_picto('','back.png', '', 0)
-			,'picto_suivant'=>img_picto('','next.png', '', 0)
-			,'noheader'=> (int)isset($_REQUEST['fk_soc']) | (int)isset($_REQUEST['fk_product'])
-			,'messageNothing'=>$langs->trans('inventoryListEmpty')
-			,'picto_search'=>img_picto('','search.png', '', 0)
-		)
-		,'title'=>array(
-			'rowid'=>$langs->trans('Title')
-			,'fk_warehouse'=>$langs->trans('Warehouse')
-			,'date_inventory'=>$langs->trans('InventoryDate')
-			,'datec'=>$langs->trans('DateCreation')
-			,'tms'=>$langs->trans('DateUpdate')
-			,'status'=>$langs->trans('Status')
-		)
-		,'eval'=>array(
-			'status' => '(@val@ ? img_picto("'.$langs->trans("inventoryValidate").'", "statut4") : img_picto("'.$langs->trans("inventoryDraft").'", "statut3"))'
-			,'rowid'=>'Inventory::getLink(@val@)'
-		)
-		,'search'=>array(
-				'date_inventory'=>'calendar'
-				
-		)
-	));
-
-
-	if ($user->rights->inventory->create)
-	{
-		print '<div class="tabsAction">';
-		print '<a class="butAction" href="inventory.php?action=create">'.$langs->trans('inventoryCreate').'</a>';
-		print '</div>';
-	}
-
-	llxFooter('');
-}
-
 function _card_warehouse(&$inventory)
 {
 	global $langs,$conf,$db, $user, $form;
diff --git a/htdocs/inventory/list.php b/htdocs/inventory/list.php
new file mode 100644
index 00000000000..a2294029657
--- /dev/null
+++ b/htdocs/inventory/list.php
@@ -0,0 +1,103 @@
+<?php
+/* Copyright (C) 2016		ATM Consulting			<support@atm-consulting.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
+ * 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/inventory/inventory.php
+ *	\ingroup    product
+ *	\brief      File of class to manage inventory
+ */
+ 
+require_once '../main.inc.php';
+
+require_once DOL_DOCUMENT_ROOT.'/core/class/listview.class.php';
+require_once DOL_DOCUMENT_ROOT.'/inventory/class/inventory.class.php';
+require_once DOL_DOCUMENT_ROOT.'/inventory/lib/inventory.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+include_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
+
+$langs->load("stock");
+$langs->load("inventory");
+
+if(!$user->rights->inventory->read) accessforbidden();
+
+_list();
+
+
+function _list() 
+{
+	
+	global $db, $conf, $langs, $user;
+		
+	llxHeader('',$langs->trans('inventoryListTitle'),'','');
+	
+	echo '<form name="formListInvetory" action="'.$_SERVER['PHP_SELF'].'" method="post" >';
+	
+	$inventory = new Inventory($db);
+	$l = new ListView($db,'listInventory');
+
+	$THide = array('label','title');
+
+	echo $l->render(Inventory::getSQL('All'), array(
+		'link'=>array(
+			'fk_warehouse'=>'<a href="'.DOL_URL_ROOT.'/product/stock/card.php?id=@val@">'.img_picto('','object_stock.png','',0).' @label@</a>'
+		)
+		,'translate'=>array()
+		,'hide'=>$THide
+		,'type'=>array(
+			'datec'=>'date'
+			,'tms'=>'datetime'
+			,'date_inventory'=>'date'
+		)
+		,'list'=>array(
+			'title'=>$langs->trans('inventoryListTitle')
+			,'messageNothing'=>$langs->trans('inventoryListEmpty')
+		)
+		,'title'=>array(
+			'rowid'=>$langs->trans('Title')
+			,'fk_warehouse'=>$langs->trans('Warehouse')
+			,'date_inventory'=>$langs->trans('InventoryDate')
+			,'datec'=>$langs->trans('DateCreation')
+			,'tms'=>$langs->trans('DateUpdate')
+			,'status'=>$langs->trans('Status')
+		)
+		,'eval'=>array(
+			'status' => '(@val@ ? img_picto("'.$langs->trans("inventoryValidate").'", "statut4") : img_picto("'.$langs->trans("inventoryDraft").'", "statut3"))'
+			,'rowid'=>'Inventory::getLink(@val@)'
+		)
+		,'search'=>array(
+				'date_inventory'=>'calendar'
+				,'title'=>true
+				
+		)
+	));
+
+
+	if ($user->rights->inventory->create)
+	{
+		print '<div class="tabsAction">';
+		print '<a class="butAction" href="inventory.php?action=create">'.$langs->trans('inventoryCreate').'</a>';
+		print '</div>';
+	}
+
+	echo '</form>';
+	
+	llxFooter('');
+}
\ No newline at end of file

From 41ddaf5d9b83b4b0a1f6eb4e1251818cf30d426f Mon Sep 17 00:00:00 2001
From: Alexis Algoud <alexis@atm-consulting.fr>
Date: Fri, 16 Dec 2016 16:28:10 +0100
Subject: [PATCH 018/505] fix but major bug on date name, as to seach a
 solution

---
 htdocs/core/class/listview.class.php | 19 +++++++++++--------
 htdocs/inventory/inventory.php       |  4 ++--
 htdocs/inventory/list.php            |  5 ++---
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/htdocs/core/class/listview.class.php b/htdocs/core/class/listview.class.php
index 6b57fd36a21..1333e5b0e6c 100644
--- a/htdocs/core/class/listview.class.php
+++ b/htdocs/core/class/listview.class.php
@@ -103,7 +103,7 @@ class Listview {
 		return $this->db->jdate($date);
 	}
 	
-	private function addSqlFromTypeDate(&$TSQLMore, &$value, $sKey, $sBindKey)
+	private function addSqlFromTypeDate(&$TSQLMore, &$value, $sKey)
 	{
 		if(is_array($value))
 		{
@@ -135,7 +135,8 @@ class Listview {
 	
 	private function addSqlFromOther(&$TSQLMore, &$value, &$TParam, $sKey, $key)
 	{
-	
+		if($value==-1) return false;
+			
 		if(isset($TParam['operator'][$key]))
 		{
 			if($TParam['operator'][$key] == '<' || $TParam['operator'][$key] == '>' || $TParam['operator'][$key]=='=')
@@ -154,16 +155,18 @@ class Listview {
 		}
 		else
 		{
-			if(strpos($value,'%')===false) $value = '%'.$value.'%';
-			$TSQLMore[]=$sKey." LIKE '".addslashes($value)."'" ;
+				if(strpos($value,'%')===false) $value = '%'.$value.'%';
+				$TSQLMore[]=$sKey." LIKE '".addslashes($value)."'" ;
 		}
 		
-	
+		return true;
 	}
 
 	private function search($sql,&$TParam) {
 	
-		if(!empty($_REQUEST['Listview'][$this->id]['search'])) {
+		$ListPOST = GETPOST('Listview');
+		
+		if(!empty($ListPOST[$this->id]['search'])) {
 			$sqlGROUPBY='';
 			if(strpos($sql,'GROUP BY')!==false) { //TODO regex
 				list($sql, $sqlGROUPBY) = explode('GROUP BY', $sql);
@@ -171,7 +174,7 @@ class Listview {
 			
 			if(strpos($sql,'WHERE ')===false)$sql.=' WHERE 1 '; //TODO regex
 			
-			foreach($_REQUEST['Listview'][$this->id]['search'] as $key=>$value)
+			foreach($ListPOST[$this->id]['search'] as $key=>$value)
 			{
 				$TsKey = $this->getSearchKey($key, $TParam);
 				
@@ -183,7 +186,7 @@ class Listview {
 				
 				foreach ($TsKey as $i => &$sKey)
 				{
-					if($allow_is_null && !empty($_REQUEST['Listview'][$this->id]['search_on_null'][$key]))
+					if($allow_is_null && !empty($ListPOST[$this->id]['search_on_null'][$key]))
 					{
 						$TSQLMore[] = $sKey.' IS NULL ';
 						$search_on_null = true;
diff --git a/htdocs/inventory/inventory.php b/htdocs/inventory/inventory.php
index e8918f021d0..7e43c3ce44e 100644
--- a/htdocs/inventory/inventory.php
+++ b/htdocs/inventory/inventory.php
@@ -270,7 +270,7 @@ function _action()
 			$inventory = new Inventory($db);
 			$inventory->fetch($id);
 			
-			exportCSV($inventory);
+			_exportCSV($inventory);
 			
 			exit;
 			break;
@@ -476,7 +476,7 @@ function _card_line(&$inventory, &$lines, $mode)
 
 }
 
-function exportCSV(&$inventory) {
+function _exportCSV(&$inventory) {
 	global $conf;
 	
 	header('Content-Type: application/octet-stream');
diff --git a/htdocs/inventory/list.php b/htdocs/inventory/list.php
index a2294029657..c6846cfc618 100644
--- a/htdocs/inventory/list.php
+++ b/htdocs/inventory/list.php
@@ -83,9 +83,8 @@ function _list()
 			,'rowid'=>'Inventory::getLink(@val@)'
 		)
 		,'search'=>array(
-				'date_inventory'=>'calendar'
-				,'title'=>true
-				
+				'date_inventory'=>'calendars'
+				,'status'=>array(1=>$langs->trans("inventoryValidate"), 0=>$langs->trans("inventoryDraft"))
 		)
 	));
 

From f0ea6104014733ab3a955e476ace4f81e7bd3d3c Mon Sep 17 00:00:00 2001
From: Alexis Algoud <alexis@atm-consulting.fr>
Date: Fri, 16 Dec 2016 17:06:05 +0100
Subject: [PATCH 019/505] change date value

---
 htdocs/core/class/listview.class.php | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/class/listview.class.php b/htdocs/core/class/listview.class.php
index 1333e5b0e6c..46a766a1206 100644
--- a/htdocs/core/class/listview.class.php
+++ b/htdocs/core/class/listview.class.php
@@ -173,6 +173,7 @@ class Listview {
 			}
 			
 			if(strpos($sql,'WHERE ')===false)$sql.=' WHERE 1 '; //TODO regex
+			//TODO	$value = GETPOST('Listview_'.$this->id.'_search_'.$key) ? mktime(0,0,0, (int)GETPOST('Listview_'.$this->id.'_search_'.$key.'month'), (int)GETPOST('Listview_'.$this->id.'_search_'.$key.'day'), (int)GETPOST('Listview_'.$this->id.'_search_'.$key.'year') ) : '';
 			
 			foreach($ListPOST[$this->id]['search'] as $key=>$value)
 			{
@@ -271,13 +272,19 @@ class Listview {
 				$fsearch=$form->selectarray('Listview['.$this->id.'][search]['.$key.']', $typeRecherche,$value,1);
 			}
 			else if($typeRecherche==='calendar') {
-				$fsearch = $form->select_date($value, 'Listview['.$this->id.'][search]['.$key.']',0, 0, 1, "", 1, 0, 1);
+				
+				$value = GETPOST('Listview_'.$this->id.'_search_'.$key) ? mktime(0,0,0, (int)GETPOST('Listview_'.$this->id.'_search_'.$key.'month'), (int)GETPOST('Listview_'.$this->id.'_search_'.$key.'day'), (int)GETPOST('Listview_'.$this->id.'_search_'.$key.'year') ) : '';
+				
+				$fsearch = $form->select_date($value, 'Listview_'.$this->id.'_search_'.$key,0, 0, 1, "", 1, 0, 1);
 				//$fsearch=$form->calendrier('','Listview['.$this->id.'][search]['.$key.']',$value,10,10,' listviewtbs="calendar" ');	
 			}
 			else if($typeRecherche==='calendars') {
 				
-				$fsearch = $form->select_date(isset($value['start'])?$value['start']:'', 'Listview['.$this->id.'][search]['.$key.'][start]',0, 0, 1, "", 1, 0, 1)
-						 . $form->select_date(isset($value['end'])?$value['end']:'', 'Listview['.$this->id.'][search]['.$key.'][end]',0, 0, 1, "", 1, 0, 1);
+				$value_start = GETPOST('Listview_'.$this->id.'_search_'.$key.'_start') ? mktime(0,0,0, (int)GETPOST('Listview_'.$this->id.'_search_'.$key.'_startmonth'), (int)GETPOST('Listview_'.$this->id.'_search_'.$key.'_startday'), (int)GETPOST('Listview_'.$this->id.'_search_'.$key.'_startyear') ) : '';
+				$value_end = GETPOST('Listview_'.$this->id.'_search_'.$key.'_end') ? mktime(0,0,0, (int)GETPOST('Listview_'.$this->id.'_search_'.$key.'_endmonth'), (int)GETPOST('Listview_'.$this->id.'_search_'.$key.'_endday'), (int)GETPOST('Listview_'.$this->id.'_search_'.$key.'_endyear') ) : '';
+			
+				$fsearch = $form->select_date($value_start, 'Listview_'.$this->id.'_search_'.$key.'_start',0, 0, 1, "", 1, 0, 1)
+						 . $form->select_date($value_end, 'Listview_'.$this->id.'_search_'.$key.'_end',0, 0, 1, "", 1, 0, 1);
 				
 			}
 			else if(is_string($typeRecherche)) {
@@ -837,7 +844,7 @@ class Listview {
 		$this->TTotalTmp=array();
 		
 		$this->THideFlip = array_flip($TParam['hide']);
-
+var_dump($this->sql);
 		$res = $this->db->query($this->sql);
 		if($res!==false) {
 			

From 65b956b011b3f29e8d920fc90f8d043327fbbcdf Mon Sep 17 00:00:00 2001
From: Alexis Algoud <alexis@atm-consulting.fr>
Date: Mon, 9 Jan 2017 10:33:33 +0100
Subject: [PATCH 020/505] NEW sql for inventory

---
 .../install/mysql/migration/5.0.0-6.0.0.sql   | 37 +++++++++++++++++++
 .../mysql/tables/llx_inventory.key.sql        | 21 +++++++++++
 htdocs/install/mysql/tables/llx_inventory.sql | 31 ++++++++++++++++
 .../mysql/tables/llx_inventorydet.key.sql     | 22 +++++++++++
 .../install/mysql/tables/llx_inventorydet.sql | 36 ++++++++++++++++++
 5 files changed, 147 insertions(+)
 create mode 100644 htdocs/install/mysql/tables/llx_inventory.key.sql
 create mode 100644 htdocs/install/mysql/tables/llx_inventory.sql
 create mode 100644 htdocs/install/mysql/tables/llx_inventorydet.key.sql
 create mode 100644 htdocs/install/mysql/tables/llx_inventorydet.sql

diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index e770a99de66..40707aaddfe 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -46,3 +46,40 @@ insert into llx_c_action_trigger (code,label,description,elementtype,rang) value
 
 ALTER TABLE llx_loan ADD COLUMN fk_projet integer DEFAULT NULL;
 
+-- NEW inventory module
+CREATE TABLE llx_inventory 
+( 
+rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY, 
+datec DATETIME DEFAULT NULL, 
+tms timestamp, 
+fk_warehouse integer DEFAULT 0, 
+entity integer DEFAULT 0, 
+status integer DEFAULT 0, 
+title varchar(255) NOT NULL, 
+date_inventory datetime DATETIME DEFAULT NULL
+) 
+ENGINE=InnoDB;
+
+CREATE TABLE llx_inventorydet 
+( 
+rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY, 
+datec DATETIME DEFAULT NULL, 
+tms timestamp, 
+fk_inventory integer DEFAULT 0, 
+fk_warehouse integer DEFAULT 0,
+fk_product integer DEFAULT 0,  
+entity integer DEFAULT 0, 
+qty_view double DEFAULT 0, 
+qty_stock double DEFAULT 0, 
+qty_regulated double DEFAULT 0, 
+pmp double DEFAULT 0, 
+pa double DEFAULT 0, 
+new_pmp double DEFAULT 0, 
+) 
+ENGINE=InnoDB;
+
+ALTER TABLE llx_inventory ADD INDEX idx_inventory_tms (tms);
+ALTER TABLE llx_inventory ADD INDEX idx_inventory_datec (date_cre);
+ALTER TABLE llx_inventorydet ADD INDEX idx_inventorydet_tms (tms);
+ALTER TABLE llx_inventorydet ADD INDEX idx_inventorydet_datec (date_cre);
+ALTER TABLE llx_inventorydet ADD INDEX idx_inventorydet_fk_inventory (fk_inventory);
diff --git a/htdocs/install/mysql/tables/llx_inventory.key.sql b/htdocs/install/mysql/tables/llx_inventory.key.sql
new file mode 100644
index 00000000000..6596e88d817
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_inventory.key.sql
@@ -0,0 +1,21 @@
+-- ===================================================================
+-- Copyright (C) 2012	Laurent Destailleur	<eldy@users.sourceforge.net>
+-- Copyright (C) 2017	ATM Consulting		<support@atm-consulting.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
+-- 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/>.
+--
+-- ===================================================================
+
+ALTER TABLE llx_inventory ADD INDEX idx_inventory_tms (tms);
+ALTER TABLE llx_inventory ADD INDEX idx_inventory_datec (date_cre);
diff --git a/htdocs/install/mysql/tables/llx_inventory.sql b/htdocs/install/mysql/tables/llx_inventory.sql
new file mode 100644
index 00000000000..dc4b66f1be2
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_inventory.sql
@@ -0,0 +1,31 @@
+-- ===================================================================
+-- Copyright (C) 2012      Laurent Destailleur  <eldy@users.sourceforge.net>
+-- Copyright (C) 2017	ATM Consulting		<support@atm-consulting.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
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <http://www.gnu.org/licenses/>.
+--
+-- ===================================================================
+
+CREATE TABLE llx_inventory 
+( 
+rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY, 
+datec DATETIME DEFAULT NULL, 
+tms timestamp, 
+fk_warehouse integer DEFAULT 0, 
+entity integer DEFAULT 0, 
+status integer DEFAULT 0, 
+title varchar(255) NOT NULL, 
+date_inventory datetime DATETIME DEFAULT NULL
+) 
+ENGINE=InnoDB;
diff --git a/htdocs/install/mysql/tables/llx_inventorydet.key.sql b/htdocs/install/mysql/tables/llx_inventorydet.key.sql
new file mode 100644
index 00000000000..31c5884f60b
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_inventorydet.key.sql
@@ -0,0 +1,22 @@
+-- ===================================================================
+-- Copyright (C) 2012	Laurent Destailleur	<eldy@users.sourceforge.net>
+-- Copyright (C) 2017	ATM Consulting		<support@atm-consulting.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
+-- 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/>.
+--
+-- ===================================================================
+
+ALTER TABLE llx_inventorydet ADD INDEX idx_inventorydet_tms (tms);
+ALTER TABLE llx_inventorydet ADD INDEX idx_inventorydet_datec (date_cre);
+ALTER TABLE llx_inventorydet ADD INDEX idx_inventorydet_fk_inventory (fk_inventory);
diff --git a/htdocs/install/mysql/tables/llx_inventorydet.sql b/htdocs/install/mysql/tables/llx_inventorydet.sql
new file mode 100644
index 00000000000..c67ccd32a3f
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_inventorydet.sql
@@ -0,0 +1,36 @@
+-- ===================================================================
+-- Copyright (C) 2012      Laurent Destailleur  <eldy@users.sourceforge.net>
+-- Copyright (C) 2017	ATM Consulting		<support@atm-consulting.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
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <http://www.gnu.org/licenses/>.
+--
+-- ===================================================================
+
+CREATE TABLE llx_inventorydet 
+( 
+rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY, 
+datec DATETIME DEFAULT NULL, 
+tms timestamp, 
+fk_inventory integer DEFAULT 0, 
+fk_warehouse integer DEFAULT 0,
+fk_product integer DEFAULT 0,  
+entity integer DEFAULT 0, 
+qty_view double DEFAULT 0, 
+qty_stock double DEFAULT 0, 
+qty_regulated double DEFAULT 0, 
+pmp double DEFAULT 0, 
+pa double DEFAULT 0, 
+new_pmp double DEFAULT 0, 
+) 
+ENGINE=InnoDB;

From 07d6bbf8354f92417b7d440a57691a90bf73b6cd Mon Sep 17 00:00:00 2001
From: Alexis ALGOUD <alexis@atm-consulting.fr>
Date: Mon, 20 Feb 2017 15:53:43 +0100
Subject: [PATCH 021/505] change for tms

---
 htdocs/core/class/coreobject.class.php | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/htdocs/core/class/coreobject.class.php b/htdocs/core/class/coreobject.class.php
index 2022844d6fe..aa4d96dbbaa 100644
--- a/htdocs/core/class/coreobject.class.php
+++ b/htdocs/core/class/coreobject.class.php
@@ -33,8 +33,6 @@ class CoreObject extends CommonObject {
 	
 	public $no_update_tms = false;
 	
-	public $date_0 = '1001-01-01 00:00:00'; //TODO there is a solution for this ?
-	
 	public $error = '';
 	/*
 	 *  @var Array $_fields Fields to synchronize with Database
@@ -53,8 +51,8 @@ class CoreObject extends CommonObject {
 	protected function init() {
 		
 		$this->id = 0;
-		$this->datec = time();
-		$this->tms = time();
+		$this->datec = 0;
+		$this->tms = 0;
 		
 		if(!empty($this->__fields)) {
 			foreach ($this->__fields as $field=>$info) {
@@ -156,7 +154,7 @@ class CoreObject extends CommonObject {
 	
 			if($this->is_date($info)){
 				if(empty($this->{$field})){
-					$query[$field] = $this->date_0;
+					$query[$field] = NULL;
 				}
 				else{
 					$query[$field] = $this->db->idate($this->{$field});
@@ -197,7 +195,7 @@ class CoreObject extends CommonObject {
 
 		foreach ($this->__fields as $field=>$info) {
 			if($this->is_date($info)){
-				if($obj->{$field} === '0000-00-00 00:00:00' || $obj->{$field} === '1000-01-01 00:00:00')$this->{$field} = 0;
+				if(empty($obj->{$field}) || $obj->{$field} === '0000-00-00 00:00:00' || $obj->{$field} === '1000-01-01 00:00:00')$this->{$field} = 0;
 				else $this->{$field} = strtotime($obj->{$field});
 			}
 			elseif($this->is_array($info)){
@@ -346,7 +344,6 @@ class CoreObject extends CommonObject {
 			
 			$query = $this->set_save_query();
 			$query['rowid']=$this->id;
-			if(empty($this->no_update_tms))$query['tms'] = date('Y-m-d H:i:s');
 				
 			$res = $this->db->update($this->table_element,$query,array('rowid'));
 			
@@ -375,7 +372,6 @@ class CoreObject extends CommonObject {
 		$query = array();
 		$query = $this->set_save_query();
 		$query['datec'] = date("Y-m-d H:i:s",$this->datec);
-		if(empty($this->no_update_tms))$query['tms'] = date('Y-m-d H:i:s');
 		
 		$res = $this->db->insert($this->table_element,$query);
 	
@@ -426,7 +422,6 @@ class CoreObject extends CommonObject {
 	}
 	public function get_date($field,$format='') {
 		if(empty($this->{$field})) return '';
-		elseif($this->{$field}<=strtotime('1000-01-01 00:00:00')) return '';
 		else {
 			
 			return dol_print_date($this->{$field}, $format);

From 4a97864d2356b21657e31009c5da658383b29c64 Mon Sep 17 00:00:00 2001
From: Alexis ALGOUD <alexis@atm-consulting.fr>
Date: Mon, 20 Feb 2017 15:54:02 +0100
Subject: [PATCH 022/505] change for tms

---
 htdocs/core/class/coreobject.class.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/htdocs/core/class/coreobject.class.php b/htdocs/core/class/coreobject.class.php
index aa4d96dbbaa..312120c59bf 100644
--- a/htdocs/core/class/coreobject.class.php
+++ b/htdocs/core/class/coreobject.class.php
@@ -31,8 +31,6 @@ class CoreObject extends CommonObject {
 	
 	public $withChild = true;
 	
-	public $no_update_tms = false;
-	
 	public $error = '';
 	/*
 	 *  @var Array $_fields Fields to synchronize with Database

From 942b58efaf3d0091b33d1a12d7e1d7b9880e6deb Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Wed, 22 Feb 2017 06:33:52 +0100
Subject: [PATCH 023/505] New : Integration of Stripe

---
 .tx/config                                    |   6 +
 build/rpm/dolibarr_fedora.spec                |   1 +
 build/rpm/dolibarr_generic.spec               |   1 +
 build/rpm/dolibarr_mandriva.spec              |   1 +
 build/rpm/dolibarr_opensuse.spec              |   1 +
 htdocs/adherents/admin/public.php             |   5 +-
 htdocs/adherents/subscription.php             |   7 +
 htdocs/compta/facture.php                     |   6 +
 htdocs/core/modules/modStripe.class.php       | 103 ++
 ...face_20_modStripe_StripeWorkflow.class.php | 113 ++
 .../interface_90_all_Demo.class.php-NORUN     |   1 +
 htdocs/langs/en_US/stripe.lang                |  40 +
 htdocs/public/demo/index.php                  |   2 +-
 htdocs/public/members/new.php                 |  16 +-
 htdocs/public/paybox/paymentko.php            |   1 +
 htdocs/public/paybox/paymentok.php            |   1 +
 htdocs/public/paypal/newpayment.php           |   1 +
 htdocs/public/paypal/paymentko.php            |   1 +
 htdocs/public/paypal/paymentok.php            |   1 +
 htdocs/public/stripe/index.php                |  28 +
 htdocs/public/stripe/newpayment.php           | 977 ++++++++++++++++++
 htdocs/public/stripe/paymentko.php            | 115 +++
 htdocs/public/stripe/paymentok.php            | 172 +++
 htdocs/stripe/admin/index.html                |   0
 htdocs/stripe/admin/stripe.php                | 225 ++++
 htdocs/stripe/img/index.html                  |   0
 htdocs/stripe/img/object_stripe.png           | Bin 0 -> 819 bytes
 htdocs/stripe/index.html                      |   0
 htdocs/stripe/lib/index.html                  |   0
 htdocs/stripe/lib/stripe.lib.php              | 445 ++++++++
 htdocs/theme/eldy/style.css.php               |   2 +-
 htdocs/theme/md/style.css.php                 |   2 +-
 32 files changed, 2267 insertions(+), 7 deletions(-)
 create mode 100644 htdocs/core/modules/modStripe.class.php
 create mode 100644 htdocs/core/triggers/interface_20_modStripe_StripeWorkflow.class.php
 create mode 100644 htdocs/langs/en_US/stripe.lang
 create mode 100644 htdocs/public/stripe/index.php
 create mode 100644 htdocs/public/stripe/newpayment.php
 create mode 100644 htdocs/public/stripe/paymentko.php
 create mode 100644 htdocs/public/stripe/paymentok.php
 create mode 100644 htdocs/stripe/admin/index.html
 create mode 100644 htdocs/stripe/admin/stripe.php
 create mode 100644 htdocs/stripe/img/index.html
 create mode 100644 htdocs/stripe/img/object_stripe.png
 create mode 100644 htdocs/stripe/index.html
 create mode 100644 htdocs/stripe/lib/index.html
 create mode 100644 htdocs/stripe/lib/stripe.lib.php

diff --git a/.tx/config b/.tx/config
index 010227f6e61..ae2741c9852 100644
--- a/.tx/config
+++ b/.tx/config
@@ -326,6 +326,12 @@ source_file = htdocs/langs/en_US/stocks.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
 
+[dolibarr.stripe]
+file_filter = htdocs/langs/<lang>/stripe.lang
+source_file = htdocs/langs/en_US/stripe.lang
+source_lang = en_US
+type = MOZILLAPROPERTIES
+
 [dolibarr.suppliers]
 file_filter = htdocs/langs/<lang>/suppliers.lang
 source_file = htdocs/langs/en_US/suppliers.lang
diff --git a/build/rpm/dolibarr_fedora.spec b/build/rpm/dolibarr_fedora.spec
index e65e6bc3b7d..c0119e54e9e 100755
--- a/build/rpm/dolibarr_fedora.spec
+++ b/build/rpm/dolibarr_fedora.spec
@@ -202,6 +202,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/public
 %_datadir/dolibarr/htdocs/resource
 %_datadir/dolibarr/htdocs/societe
+%_datadir/dolibarr/htdocs/stripe
 %_datadir/dolibarr/htdocs/supplier_proposal
 %_datadir/dolibarr/htdocs/support
 %_datadir/dolibarr/htdocs/theme
diff --git a/build/rpm/dolibarr_generic.spec b/build/rpm/dolibarr_generic.spec
index 655ef87f925..54ff3b6cac8 100755
--- a/build/rpm/dolibarr_generic.spec
+++ b/build/rpm/dolibarr_generic.spec
@@ -282,6 +282,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/public
 %_datadir/dolibarr/htdocs/resource
 %_datadir/dolibarr/htdocs/societe
+%_datadir/dolibarr/htdocs/stripe
 %_datadir/dolibarr/htdocs/supplier_proposal
 %_datadir/dolibarr/htdocs/support
 %_datadir/dolibarr/htdocs/theme
diff --git a/build/rpm/dolibarr_mandriva.spec b/build/rpm/dolibarr_mandriva.spec
index 55fb7183734..7237de58a70 100755
--- a/build/rpm/dolibarr_mandriva.spec
+++ b/build/rpm/dolibarr_mandriva.spec
@@ -199,6 +199,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/public
 %_datadir/dolibarr/htdocs/resource
 %_datadir/dolibarr/htdocs/societe
+%_datadir/dolibarr/htdocs/stripe
 %_datadir/dolibarr/htdocs/supplier_proposal
 %_datadir/dolibarr/htdocs/support
 %_datadir/dolibarr/htdocs/theme
diff --git a/build/rpm/dolibarr_opensuse.spec b/build/rpm/dolibarr_opensuse.spec
index f7e29927ebb..9e12a96e054 100755
--- a/build/rpm/dolibarr_opensuse.spec
+++ b/build/rpm/dolibarr_opensuse.spec
@@ -210,6 +210,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/public
 %_datadir/dolibarr/htdocs/resource
 %_datadir/dolibarr/htdocs/societe
+%_datadir/dolibarr/htdocs/stripe
 %_datadir/dolibarr/htdocs/supplier_proposal
 %_datadir/dolibarr/htdocs/support
 %_datadir/dolibarr/htdocs/theme
diff --git a/htdocs/adherents/admin/public.php b/htdocs/adherents/admin/public.php
index a23c1f40def..488b1bc542b 100644
--- a/htdocs/adherents/admin/public.php
+++ b/htdocs/adherents/admin/public.php
@@ -179,7 +179,7 @@ print '</td><td align="right">';
 print $form->selectyesno("MEMBER_NEWFORM_EDITAMOUNT",(! empty($conf->global->MEMBER_NEWFORM_EDITAMOUNT)?$conf->global->MEMBER_NEWFORM_EDITAMOUNT:0),1);
 print "</td></tr>\n";
 
-if (! empty($conf->paybox->enabled) || ! empty($conf->paypal->enabled))
+if (! empty($conf->paybox->enabled) || ! empty($conf->paypal->enabled) || ! empty($conf->stripe->enabled))
 {
 	// Jump to an online payment page
 	$var=! $var;
@@ -189,11 +189,12 @@ if (! empty($conf->paybox->enabled) || ! empty($conf->paypal->enabled))
 	$listofval=array();
 	if (! empty($conf->paybox->enabled)) $listofval['paybox']='Paybox';
 	if (! empty($conf->paypal->enabled)) $listofval['paypal']='PayPal';
+	if (! empty($conf->stripe->enabled)) $listofval['stripe']='Stripe';
 	print $form->selectarray("MEMBER_NEWFORM_PAYONLINE",$listofval,(! empty($conf->global->MEMBER_NEWFORM_PAYONLINE)?$conf->global->MEMBER_NEWFORM_PAYONLINE:''),1);
 	print "</td></tr>\n";
 }
 
-if (! empty($conf->paybox->enabled) || ! empty($conf->paypal->enabled))
+if (! empty($conf->paybox->enabled) || ! empty($conf->paypal->enabled) || ! empty($conf->stripe->enabled))
 {
     // Jump to an online payment page
     $var=! $var;
diff --git a/htdocs/adherents/subscription.php b/htdocs/adherents/subscription.php
index 0c9c8467f1f..ba33c1c73b6 100644
--- a/htdocs/adherents/subscription.php
+++ b/htdocs/adherents/subscription.php
@@ -871,6 +871,13 @@ if ($rowid > 0)
             print showPaypalPaymentUrl('membersubscription',$object->ref);
         }
 
+        // Link for stripe payment
+        if (! empty($conf->stripe->enabled))
+        {
+            include_once DOL_DOCUMENT_ROOT.'/stripe/lib/stripe.lib.php';
+            print showStripePaymentUrl('membersubscription',$object->ref);
+        }
+
     }
 
     /*
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 29cbe624fca..34ce3226c7e 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -4207,6 +4207,12 @@ else if ($id > 0 || ! empty($ref))
 			print showPaypalPaymentUrl('invoice', $object->ref);
 		}
 
+		// Link for stripe payment
+		if (! empty($conf->stripe->enabled) && $object->statut != 0) {
+			include_once DOL_DOCUMENT_ROOT . '/stripe/lib/stripe.lib.php';
+			print showStripePaymentUrl('invoice', $object->ref);
+		}
+
 		print '</div><div class="fichehalfright"><div class="ficheaddleft">';
 
 		// List of actions on element
diff --git a/htdocs/core/modules/modStripe.class.php b/htdocs/core/modules/modStripe.class.php
new file mode 100644
index 00000000000..11dd6ee68e4
--- /dev/null
+++ b/htdocs/core/modules/modStripe.class.php
@@ -0,0 +1,103 @@
+<?php
+/* Copyright (C) 2003		Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2009	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2016		Alexandre Spangaro		<aspangaro.dolibarr@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
+ * 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/>.
+ */
+
+/**
+ * 	\defgroup   stripe     Module stripe
+ * 	\brief      Add integration with Stripe online payment system.
+ *  \file       htdocs/core/modules/modStripe.class.php
+ *  \ingroup    stripe
+ *  \brief      Description and activation file for module Stripe
+ */
+include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
+
+
+/**
+ * 	Description and activation class for module Paybox
+ */
+class modStripe extends DolibarrModules
+{
+    /**
+     *   Constructor. Define names, constants, directories, boxes, permissions
+     *
+     *   @param      DoliDB		$db      Database handler
+     */
+    function __construct($db)
+    {
+        $this->db = $db;
+
+        // Id for module (must be unique).
+        // Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id).
+        $this->numero = 50300;
+        // Key text used to identify module (for permissions, menus, etc...)
+        $this->rights_class = 'stripe';
+
+        // Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
+        // It is used to group modules in module setup page
+        $this->family = "other";
+        // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+        $this->name = preg_replace('/^mod/i','',get_class($this));
+        // Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
+        $this->description = "Module to offer an online payment page by credit card with Stripe";
+        // Possible values for version are: 'development', 'experimental', 'dolibarr' or version
+        $this->version = 'dolibarr';
+        // Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
+        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+        // Where to store the module in setup page (0=common,1=interface,2=other)
+        $this->special = 1;
+        // Name of image file used for this module.
+        // If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
+        // If file is in module/img directory, use this->picto=DOL_URL_ROOT.'/module/img/file.png'
+        $this->picto='stripe@stripe';
+
+        // Data directories to create when module is enabled.
+        $this->dirs = array('/stripe/temp');
+
+        // Config pages. Put here list of php page names stored in admmin directory used to setup module.
+        $this->config_page_url = array("stripe.php@stripe");
+
+        // Dependencies
+        $this->depends = array();		// List of modules id that must be enabled if this module is enabled
+        $this->requiredby = array();	// List of modules id to disable if this one is disabled
+        $this->phpmin = array(4,1);					// Minimum version of PHP required by module
+        $this->need_dolibarr_version = array(2,6);	// Minimum version of Dolibarr required by module
+        $this->langfiles = array("stripe");
+
+        // Constants
+        $this->const = array();			// List of particular constants to add when module is enabled
+
+        // New pages on tabs
+        $this->tabs = array();
+
+        // Boxes
+        $this->boxes = array();			// List of boxes
+        $r=0;
+
+        // Permissions
+        $this->rights = array();		// Permission array used by this module
+        $r=0;
+
+        // Main menu entries
+        $this->menus = array();			// List of menus to add
+        $r=0;
+
+        // Exports
+        $r=1;
+    }
+}
+
diff --git a/htdocs/core/triggers/interface_20_modStripe_StripeWorkflow.class.php b/htdocs/core/triggers/interface_20_modStripe_StripeWorkflow.class.php
new file mode 100644
index 00000000000..4fbf29c7b07
--- /dev/null
+++ b/htdocs/core/triggers/interface_20_modStripe_StripeWorkflow.class.php
@@ -0,0 +1,113 @@
+<?php
+/* Copyright (C) 2011-2012	Regis Houssin		<regis.houssin@capnetworks.com>
+ * Copyright (C) 2014		Marcos García		<marcosgdf@gmail.com>
+ * Copyright (C) 2017		Alexandre Spangaro	<aspangaro@zendsi.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/triggers/interface_20_modStripe_StripeWorkflow.class.php
+ *      \ingroup    stripe
+ *      \brief      Trigger file for stripe workflow
+ */
+
+require_once DOL_DOCUMENT_ROOT.'/core/triggers/dolibarrtriggers.class.php';
+
+
+/**
+ *  Class of triggers for stripe module
+ */
+class InterfaceStripeWorkflow extends DolibarrTriggers
+{
+	public $picto = 'stripe@stripe';
+	public $family = 'stripe';
+	public $description = "Triggers of this module allows to manage stripe workflow";
+	public $version = self::VERSION_DOLIBARR;
+
+	/**
+	 * Function called when a Dolibarrr business event is done.
+	 * All functions "runTrigger" are triggered if file is inside directory htdocs/core/triggers or htdocs/module/code/triggers (and declared)
+	 *
+	 * @param string		$action		Event action code
+	 * @param Object		$object     Object
+	 * @param User			$user       Object user
+	 * @param Translate		$langs      Object langs
+	 * @param conf			$conf       Object conf
+	 * @return int         				<0 if KO, 0 if no triggered ran, >0 if OK
+	 */
+	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
+    {
+        // Mettre ici le code a executer en reaction de l'action
+        // Les donnees de l'action sont stockees dans $object
+
+        if ($action == 'STRIPE_PAYMENT_OK')
+        {
+        	dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". source=".$object->source." ref=".$object->ref);
+
+        	if (! empty($object->source))
+        	{
+        		if ($object->source == 'membersubscription')
+        		{
+        			//require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherents.class.php';
+
+        			// TODO add subscription treatment
+        		}
+        		else
+        		{
+        			require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+
+        			$soc = new Societe($this->db);
+
+        			// Parse element/subelement (ex: project_task)
+        			$element = $path = $filename = $object->source;
+        			if (preg_match('/^([^_]+)_([^_]+)/i',$object->source,$regs))
+        			{
+        				$element = $path = $regs[1];
+        				$filename = $regs[2];
+        			}
+        			// For compatibility
+        			if ($element == 'order') {
+        				$path = $filename = 'commande';
+        			}
+        			if ($element == 'invoice') {
+        				$path = 'compta/facture'; $filename = 'facture';
+        			}
+
+        			dol_include_once('/'.$path.'/class/'.$filename.'.class.php');
+
+        			$classname = ucfirst($filename);
+        			$obj = new $classname($this->db);
+
+        			$ret = $obj->fetch('',$object->ref);
+        			if ($ret < 0) return -1;
+
+        			// Add payer id
+        			$soc->setValueFrom('ref_int', $object->payerID, 'societe', $obj->socid);
+
+        			// Add transaction id
+        			$obj->setValueFrom('ref_int',$object->resArray["TRANSACTIONID"]);
+        		}
+        	}
+        	else
+        	{
+        		// TODO add free tag treatment
+        	}
+
+        }
+
+		return 0;
+    }
+
+}
diff --git a/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN b/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
index 717ef6585f5..5a36bf1069a 100644
--- a/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
+++ b/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
@@ -209,6 +209,7 @@ class InterfaceDemo extends DolibarrTriggers
 		    // Online  
 		    case 'PAYMENT_PAYBOX_OK':
 		    case 'PAYMENT_PAYPAL_OK':
+			case 'PAYMENT_STRIPE_OK':
 		    
 			// Donation
 		    case 'DON_CREATE':
diff --git a/htdocs/langs/en_US/stripe.lang b/htdocs/langs/en_US/stripe.lang
new file mode 100644
index 00000000000..f19b4e44a52
--- /dev/null
+++ b/htdocs/langs/en_US/stripe.lang
@@ -0,0 +1,40 @@
+# Dolibarr language file - Source file is en_US - stripe
+StripeSetup=Stripe module setup
+StripeDesc=This module offer pages to allow payment on <a href="http://www.stripe.com" target="_blank">Stripe</a> by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...)
+StripeOrCBDoPayment=Pay with credit card or Stripe
+FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects
+PaymentForm=Payment form
+WelcomeOnPaymentPage=Welcome on our online payment service
+ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s.
+ThisIsInformationOnPayment=This is information on payment to do
+ToComplete=To complete
+YourEMail=Email to receive payment confirmation
+Creditor=Creditor
+PaymentCode=Payment code
+StripeDoPayment=Go on payment
+YouWillBeRedirectedOnStripe=You will be redirected on secured Stripe page to input you credit card information
+Continue=Next
+ToOfferALinkForOnlinePayment=URL for %s payment
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a customer order
+ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment user interface for a customer invoice
+ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment user interface for a contract line
+ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment user interface for a free amount
+ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment user interface for a member subscription
+YouCanAddTagOnUrl=You can also add url parameter <b>&tag=<i>value</i></b> to any of those URL (required only for free payment) to add your own payment comment tag.
+SetupStripeToHavePaymentCreatedAutomatically=Setup your Stripe with url <b>%s</b> to have payment created automatically when validated by Stripe. 
+YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you.
+YourPaymentHasNotBeenRecorded=You payment has not been recorded and transaction has been canceled. Thank you.
+AccountParameter=Account parameters
+UsageParameter=Usage parameters
+InformationToFindParameters=Help to find your %s account information
+STRIPE_CGI_URL_V2=Url of Stripe CGI module for payment
+VendorName=Name of vendor
+CSSUrlForPaymentForm=CSS style sheet url for payment form
+MessageOK=Message on validated payment return page
+MessageKO=Message on canceled payment return page
+NewStripePaymentReceived=New Stripe payment received
+NewStripePaymentFailed=New Stripe payment tried but failed
+STRIPE_TEST_SECRET_KEY=Secret test key
+STRIPE_TEST_PUBLISHABLE_KEY=Publishable test key
+STRIPE_LIVE_SECRET_KEY=Secret live key
+STRIPE_LIVE_PUBLISHABLE_KEY=Publishable live key
\ No newline at end of file
diff --git a/htdocs/public/demo/index.php b/htdocs/public/demo/index.php
index bcca53e9245..3c3353e5eb6 100644
--- a/htdocs/public/demo/index.php
+++ b/htdocs/public/demo/index.php
@@ -107,7 +107,7 @@ if (empty($reshook))
 
 	// Visible
 	$alwayscheckedmodules=array('barcode','bookmark','categorie','externalrss','fckeditor','geoipmaxmind','gravatar','memcached','syslog','user','webservices');  // Technical module we always want
-	$alwaysuncheckedmodules=array('dynamicprices','loan','multicurrency','paybox','paypal','google','printing','scanner','workflow');  // Module we never want
+	$alwaysuncheckedmodules=array('dynamicprices','loan','multicurrency','paybox','paypal','stripe','google','printing','scanner','workflow');  // Module we never want
 	// Not visible
 	$alwayshiddencheckedmodules=array('accounting','api','barcode','bookmark','clicktodial','comptabilite','cron','document','domain','externalrss','externalsite','fckeditor','geoipmaxmind','gravatar','label','ldap',
 									'mailmanspip','notification','oauth','syslog','user','webservices',
diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php
index b101e656f67..104dec7ca09 100644
--- a/htdocs/public/members/new.php
+++ b/htdocs/public/members/new.php
@@ -27,7 +27,7 @@
  *  Note that you can add following constant to change behaviour of page
  *  MEMBER_NEWFORM_AMOUNT               Default amount for auto-subscribe form
  *  MEMBER_NEWFORM_EDITAMOUNT           Amount can be edited
- *  MEMBER_NEWFORM_PAYONLINE            Suggest payment with paypal of paybox
+ *  MEMBER_NEWFORM_PAYONLINE            Suggest payment with paypal, paybox or stripe
  *  MEMBER_NEWFORM_DOLIBARRTURNOVER     Show field turnover (specific for dolibarr foundation)
  *  MEMBER_URL_REDIRECT_SUBSCRIPTION    Url to redirect once subscribe submitted
  *  MEMBER_NEWFORM_FORCETYPE            Force type of member
@@ -314,6 +314,18 @@ if ($action == 'add')
                     	$urlback.='&securekey='.dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . 'membersubscription' . $adh->ref, 2);
                     }
                     
+                }
+				else if ($conf->global->MEMBER_NEWFORM_PAYONLINE == 'stripe')
+                {
+                    $urlback=DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?from=membernewform&source=membersubscription&ref='.$adh->ref;
+                    if (price2num(GETPOST('amount'))) $urlback.='&amount='.price2num(GETPOST('amount'));
+                    if (GETPOST('email')) $urlback.='&email='.urlencode(GETPOST('email'));
+					/*
+                    if (! empty($conf->global->PAYPAL_SECURITY_TOKEN) && ! empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE))
+                    {
+                    	$urlback.='&securekey='.dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . 'membersubscription' . $adh->ref, 2);
+                    }
+					*/
                 }
                 else
                 {
@@ -579,7 +591,7 @@ if (! empty($conf->global->MEMBER_NEWFORM_AMOUNT)
     {
         $amount=GETPOST('amount')?GETPOST('amount'):$conf->global->MEMBER_NEWFORM_AMOUNT;
     }
-    // $conf->global->MEMBER_NEWFORM_PAYONLINE is 'paypal' or 'paybox'
+    // $conf->global->MEMBER_NEWFORM_PAYONLINE is 'paypal', 'paybox' or 'stripe'
     print '<tr><td>'.$langs->trans("Subscription").'</td><td class="nowrap">';
     if (! empty($conf->global->MEMBER_NEWFORM_EDITAMOUNT))
     {
diff --git a/htdocs/public/paybox/paymentko.php b/htdocs/public/paybox/paymentko.php
index 09de4525b39..77c8e982a09 100644
--- a/htdocs/public/paybox/paymentko.php
+++ b/htdocs/public/paybox/paymentko.php
@@ -46,6 +46,7 @@ $langs->load("bills");
 $langs->load("companies");
 $langs->load("paybox");
 $langs->load("paypal");
+$langs->load("stripe");
 
 
 
diff --git a/htdocs/public/paybox/paymentok.php b/htdocs/public/paybox/paymentok.php
index 9c3030a86ba..1d5c178f05f 100644
--- a/htdocs/public/paybox/paymentok.php
+++ b/htdocs/public/paybox/paymentok.php
@@ -46,6 +46,7 @@ $langs->load("bills");
 $langs->load("companies");
 $langs->load("paybox");
 $langs->load("paypal");
+$langs->load("stripe");
 
 /*$source=GETPOST('source');
 $ref=GETPOST('ref');
diff --git a/htdocs/public/paypal/newpayment.php b/htdocs/public/paypal/newpayment.php
index b5d105d6cf6..02e1e6ec8ad 100644
--- a/htdocs/public/paypal/newpayment.php
+++ b/htdocs/public/paypal/newpayment.php
@@ -53,6 +53,7 @@ $langs->load("companies");
 $langs->load("errors");
 $langs->load("paybox");
 $langs->load("paypal");
+$langs->load("stripe");
 
 // Input are:
 // type ('invoice','order','contractline'),
diff --git a/htdocs/public/paypal/paymentko.php b/htdocs/public/paypal/paymentko.php
index 4bad572ed8b..d7724a8fd6c 100644
--- a/htdocs/public/paypal/paymentko.php
+++ b/htdocs/public/paypal/paymentko.php
@@ -50,6 +50,7 @@ $langs->load("bills");
 $langs->load("companies");
 $langs->load("paybox");
 $langs->load("paypal");
+$langs->load("stripe");
 
 $PAYPALTOKEN=GETPOST('TOKEN');
 if (empty($PAYPALTOKEN)) $PAYPALTOKEN=GETPOST('token');
diff --git a/htdocs/public/paypal/paymentok.php b/htdocs/public/paypal/paymentok.php
index 90f13aa6f17..1913ab05879 100644
--- a/htdocs/public/paypal/paymentok.php
+++ b/htdocs/public/paypal/paymentok.php
@@ -50,6 +50,7 @@ $langs->load("bills");
 $langs->load("companies");
 $langs->load("paybox");
 $langs->load("paypal");
+$langs->load("stripe");
 
 // Clean parameters
 $PAYPAL_API_USER="";
diff --git a/htdocs/public/stripe/index.php b/htdocs/public/stripe/index.php
new file mode 100644
index 00000000000..0b7ad1c82e4
--- /dev/null
+++ b/htdocs/public/stripe/index.php
@@ -0,0 +1,28 @@
+<?php
+/* Copyright (C) 2009 Laurent Destailleur  <eldy@users.sourceforge.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *     	\file       htdocs/public/paybox/index.php
+ *		\ingroup    core
+ *		\brief      A redirect page to an error
+ *		\author	    Laurent Destailleur
+ */
+
+require '../../master.inc.php';
+
+header("Location: ".DOL_URL_ROOT.'/public/error-404.php');
+
diff --git a/htdocs/public/stripe/newpayment.php b/htdocs/public/stripe/newpayment.php
new file mode 100644
index 00000000000..33499fe7098
--- /dev/null
+++ b/htdocs/public/stripe/newpayment.php
@@ -0,0 +1,977 @@
+<?php
+/* Copyright (C) 2001-2002	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2006-2012	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2009-2012	Regis Houssin			<regis.houssin@capnetworks.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * For test: https://stripe.com/docs
+ */
+
+/**
+ *     	\file       htdocs/public/stripe/newpayment.php
+ *		\ingroup    stripe
+ *		\brief      File to offer a way to make a payment for a particular Dolibarr entity
+ */
+
+define("NOLOGIN",1);		// This means this output page does not require to be logged.
+define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.
+
+// For MultiCompany module.
+// Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
+// TODO This should be useless. Because entity must be retreive from object ref and not from url.
+$entity=(! empty($_GET['entity']) ? (int) $_GET['entity'] : (! empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
+if (is_numeric($entity)) define("DOLENTITY", $entity);
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/stripe/lib/stripe.lib.php';
+// require_once DOL_DOCUMENT_ROOT.'/stripe/lib/stripefunctions.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+
+// Security check
+if (empty($conf->stripe->enabled)) accessforbidden('',0,0,1);
+
+$langs->load("main");
+$langs->load("other");
+$langs->load("dict");
+$langs->load("bills");
+$langs->load("companies");
+$langs->load("errors");
+$langs->load("paybox");
+$langs->load("paypal");
+$langs->load("stripe");
+
+// Input are:
+// type ('invoice','order','contractline'),
+// id (object id),
+// amount (required if id is empty),
+// tag (a free text, required if type is empty)
+// currency (iso code)
+
+$suffix=GETPOST("suffix",'alpha');
+$amount=price2num(GETPOST("amount"));
+if (! GETPOST("currency",'alpha')) $currency=$conf->currency;
+else $currency=GETPOST("currency",'alpha');
+
+if (! GETPOST("action"))
+{
+    if (! GETPOST("amount") && ! GETPOST("source"))
+    {
+    	dol_print_error('',$langs->trans('ErrorBadParameters')." - amount or source");
+    	exit;
+    }
+    if (is_numeric($amount) && ! GETPOST("tag") && ! GETPOST("source"))
+    {
+    	dol_print_error('',$langs->trans('ErrorBadParameters')." - tag or source");
+    	exit;
+    }
+    if (GETPOST("source") && ! GETPOST("ref"))
+    {
+    	dol_print_error('',$langs->trans('ErrorBadParameters')." - ref");
+    	exit;
+    }
+}
+
+// Define $urlwithroot
+//$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
+//$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
+$urlwithroot=DOL_MAIN_URL_ROOT;						// This is to use same domain name than current
+
+$urlok=$urlwithroot.'/public/stripe/paymentok.php?';
+$urlko=$urlwithroot.'/public/stripe/paymentko.php?';
+
+// Complete urls for post treatment
+$SOURCE=GETPOST("source",'alpha');
+$ref=$REF=GETPOST('ref','alpha');
+$TAG=GETPOST("tag",'alpha');
+$FULLTAG=GETPOST("fulltag",'alpha');		// fulltag is tag with more informations
+$SECUREKEY=GETPOST("securekey");	        // Secure key
+
+if (! empty($SOURCE))
+{
+    $urlok.='source='.urlencode($SOURCE).'&';
+    $urlko.='source='.urlencode($SOURCE).'&';
+}
+if (! empty($REF))
+{
+    $urlok.='ref='.urlencode($REF).'&';
+    $urlko.='ref='.urlencode($REF).'&';
+}
+if (! empty($TAG))
+{
+    $urlok.='tag='.urlencode($TAG).'&';
+    $urlko.='tag='.urlencode($TAG).'&';
+}
+if (! empty($FULLTAG))
+{
+    $urlok.='fulltag='.urlencode($FULLTAG).'&';
+    $urlko.='fulltag='.urlencode($FULLTAG).'&';
+}
+if (! empty($SECUREKEY))
+{
+    $urlok.='securekey='.urlencode($SECUREKEY).'&';
+    $urlko.='securekey='.urlencode($SECUREKEY).'&';
+}
+if (! empty($entity))
+{
+	$urlok.='entity='.urlencode($entity).'&';
+	$urlko.='entity='.urlencode($entity).'&';
+}
+$urlok=preg_replace('/&$/','',$urlok);  // Remove last &
+$urlko=preg_replace('/&$/','',$urlko);  // Remove last &
+
+// Check parameters
+$PAYPAL_API_OK="";
+if ($urlok) $PAYPAL_API_OK=$urlok;
+$PAYPAL_API_KO="";
+if ($urlko) $PAYPAL_API_KO=$urlko;
+/*
+if (empty($PAYPAL_API_USER))
+{
+    dol_print_error('',"Paypal setup param PAYPAL_API_USER not defined");
+    return -1;
+}
+if (empty($PAYPAL_API_PASSWORD))
+{
+    dol_print_error('',"Paypal setup param PAYPAL_API_PASSWORD not defined");
+    return -1;
+}
+if (empty($PAYPAL_API_SIGNATURE))
+{
+    dol_print_error('',"Paypal setup param PAYPAL_API_SIGNATURE not defined");
+    return -1;
+}
+*/
+
+// Check security token
+$valid=true;
+if (! empty($conf->global->PAYPAL_SECURITY_TOKEN))
+{
+    if (! empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE))
+    {
+	    if ($SOURCE && $REF) $token = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . $SOURCE . $REF, 2);    // Use the source in the hash to avoid duplicates if the references are identical
+	    else $token = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
+    }
+    else
+    {
+        $token = $conf->global->PAYPAL_SECURITY_TOKEN;
+    }
+	if ($SECUREKEY != $token) $valid=false;
+
+	if (! $valid)
+	{
+    	print '<div class="error">Bad value for key.</div>';
+	    //print 'SECUREKEY='.$SECUREKEY.' token='.$token.' valid='.$valid;
+    	exit;
+	}
+}
+
+
+
+/*
+ * Actions
+ */
+
+if (GETPOST("action") == 'dopayment')
+{
+	$PAYPAL_API_PRICE=price2num(GETPOST("newamount"),'MT');
+    $PAYPAL_PAYMENT_TYPE='Sale';
+
+    $shipToName=GETPOST("shipToName");
+    $shipToStreet=GETPOST("shipToStreet");
+    $shipToCity=GETPOST("shipToCity");
+    $shipToState=GETPOST("shipToState");
+    $shipToCountryCode=GETPOST("shipToCountryCode");
+    $shipToZip=GETPOST("shipToZip");
+    $shipToStreet2=GETPOST("shipToStreet2");
+    $phoneNum=GETPOST("phoneNum");
+    $email=GETPOST("email");
+    $desc=GETPOST("desc");
+
+	$mesg='';
+	if (empty($PAYPAL_API_PRICE) || ! is_numeric($PAYPAL_API_PRICE))   $mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Amount"));
+	//elseif (empty($EMAIL))          $mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("YourEMail"));
+	//elseif (! isValidEMail($EMAIL)) $mesg=$langs->trans("ErrorBadEMail",$EMAIL);
+	elseif (empty($FULLTAG))        $mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("PaymentCode"));
+
+    //var_dump($_POST);
+	if (empty($mesg))
+	{
+		dol_syslog("newpayment.php call paypal api and do redirect", LOG_DEBUG);
+
+		// Other
+		$PAYPAL_API_DEVISE="USD";
+		//if ($currency == 'EUR') $PAYPAL_API_DEVISE="EUR";
+		//if ($currency == 'USD') $PAYPAL_API_DEVISE="USD";
+        if (! empty($currency)) $PAYPAL_API_DEVISE=$currency;
+
+	    dol_syslog("Submit Paypal form", LOG_DEBUG);
+	    dol_syslog("PAYPAL_API_USER: $PAYPAL_API_USER", LOG_DEBUG);
+	    //dol_syslog("PAYPAL_API_PASSWORD: $PAYPAL_API_PASSWORD", LOG_DEBUG);  // No password into log files
+	    dol_syslog("PAYPAL_API_SIGNATURE: $PAYPAL_API_SIGNATURE", LOG_DEBUG);
+	    dol_syslog("PAYPAL_API_SANDBOX: $PAYPAL_API_SANDBOX", LOG_DEBUG);
+	    dol_syslog("PAYPAL_API_OK: $PAYPAL_API_OK", LOG_DEBUG);
+	    dol_syslog("PAYPAL_API_KO: $PAYPAL_API_KO", LOG_DEBUG);
+	    dol_syslog("PAYPAL_API_PRICE: $PAYPAL_API_PRICE", LOG_DEBUG);
+	    dol_syslog("PAYPAL_API_DEVISE: $PAYPAL_API_DEVISE", LOG_DEBUG);
+        dol_syslog("shipToName: $shipToName", LOG_DEBUG);
+        dol_syslog("shipToStreet: $shipToStreet", LOG_DEBUG);
+        dol_syslog("shipToCity: $shipToCity", LOG_DEBUG);
+        dol_syslog("shipToState: $shipToState", LOG_DEBUG);
+        dol_syslog("shipToCountryCode: $shipToCountryCode", LOG_DEBUG);
+        dol_syslog("shipToZip: $shipToZip", LOG_DEBUG);
+        dol_syslog("shipToStreet2: $shipToStreet2", LOG_DEBUG);
+        dol_syslog("phoneNum: $phoneNum", LOG_DEBUG);
+        dol_syslog("email: $email", LOG_DEBUG);
+        dol_syslog("desc: $desc", LOG_DEBUG);
+
+        dol_syslog("SCRIPT_URI: ".(empty($_SERVER["SCRIPT_URI"])?'':$_SERVER["SCRIPT_URI"]), LOG_DEBUG);	// If defined script uri must match domain of PAYPAL_API_OK and PAYPAL_API_KO
+	    //$_SESSION["PaymentType"]=$PAYPAL_PAYMENT_TYPE;
+	    //$_SESSION["currencyCodeType"]=$PAYPAL_API_DEVISE;
+	    //$_SESSION["Payment_Amount"]=$PAYPAL_API_PRICE;
+
+	    // A redirect is added if API call successfull
+        print_paypal_redirect($PAYPAL_API_PRICE,$PAYPAL_API_DEVISE,$PAYPAL_PAYMENT_TYPE,$PAYPAL_API_OK,$PAYPAL_API_KO, $FULLTAG);
+
+		exit;
+	}
+}
+
+
+
+/*
+ * View
+ */
+
+llxHeaderStripe($langs->trans("PaymentForm"));
+
+if (! empty($PAYPAL_API_SANDBOX))
+{
+	dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode'),'','warning');
+}
+
+// Common variables
+$creditor=$mysoc->name;
+$paramcreditor='PAYPAL_CREDITOR_'.$suffix;
+if (! empty($conf->global->$paramcreditor)) $creditor=$conf->global->$paramcreditor;
+else if (! empty($conf->global->PAYPAL_CREDITOR)) $creditor=$conf->global->PAYPAL_CREDITOR;
+
+print '<span id="dolpaymentspan"></span>'."\n";
+print '<div class="center">'."\n";
+print '<form id="dolpaymentform" class="center" name="paymentform" action="'.$_SERVER["PHP_SELF"].'" method="POST">'."\n";
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'."\n";
+print '<input type="hidden" name="action" value="dopayment">'."\n";
+print '<input type="hidden" name="tag" value="'.GETPOST("tag",'alpha').'">'."\n";
+print '<input type="hidden" name="suffix" value="'.GETPOST("suffix",'alpha').'">'."\n";
+print '<input type="hidden" name="securekey" value="'.$SECUREKEY.'">'."\n";
+print '<input type="hidden" name="entity" value="'.$entity.'" />';
+print "\n";
+print '<!-- Form to send a Paypal payment -->'."\n";
+print '<!-- PAYPAL_API_SANDBOX = '.$conf->global->PAYPAL_API_SANDBOX.' -->'."\n";
+print '<!-- PAYPAL_API_INTEGRAL_OR_PAYPALONLY = '.$conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY.' -->'."\n";
+print '<!-- creditor = '.$creditor.' -->'."\n";
+print '<!-- urlok = '.$urlok.' -->'."\n";
+print '<!-- urlko = '.$urlko.' -->'."\n";
+print "\n";
+
+print '<table id="dolpaymenttable" summary="Payment form" class="center">'."\n";
+
+// Show logo (search order: logo defined by PAYBOX_LOGO_suffix, then PAYBOX_LOGO, then small company logo, large company logo, theme logo, common logo)
+$width=0;
+// Define logo and logosmall
+$logosmall=$mysoc->logo_small;
+$logo=$mysoc->logo;
+$paramlogo='PAYBOX_LOGO_'.$suffix;
+if (! empty($conf->global->$paramlogo)) $logosmall=$conf->global->$paramlogo;
+else if (! empty($conf->global->PAYBOX_LOGO)) $logosmall=$conf->global->PAYBOX_LOGO;
+//print '<!-- Show logo (logosmall='.$logosmall.' logo='.$logo.') -->'."\n";
+// Define urllogo
+$urllogo='';
+if (! empty($logosmall) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$logosmall))
+{
+	$urllogo=DOL_URL_ROOT.'/viewimage.php?modulepart=companylogo&amp;file='.urlencode('thumbs/'.$logosmall);
+}
+elseif (! empty($logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$logo))
+{
+	$urllogo=DOL_URL_ROOT.'/viewimage.php?modulepart=companylogo&amp;file='.urlencode($logo);
+	$width=96;
+}
+// Output html code for logo
+if ($urllogo)
+{
+	print '<tr>';
+	print '<td align="center"><img id="dolpaymentlogo" title="'.$title.'" src="'.$urllogo.'"';
+	if ($width) print ' width="'.$width.'"';
+	print '></td>';
+	print '</tr>'."\n";
+}
+
+// Output introduction text
+$text='';
+if (! empty($conf->global->PAYPAL_NEWFORM_TEXT))
+{
+    $langs->load("members");
+    if (preg_match('/^\((.*)\)$/',$conf->global->PAYPAL_NEWFORM_TEXT,$reg)) $text.=$langs->trans($reg[1])."<br>\n";
+    else $text.=$conf->global->PAYPAL_NEWFORM_TEXT."<br>\n";
+    $text='<tr><td align="center"><br>'.$text.'<br></td></tr>'."\n";
+}
+if (empty($text))
+{
+    $text.='<tr><td class="textpublicpayment"><br><strong>'.$langs->trans("WelcomeOnPaymentPage").'</strong><br></td></tr>'."\n";
+    $text.='<tr><td class="textpublicpayment"><br>'.$langs->trans("ThisScreenAllowsYouToPay",$creditor).'<br><br></td></tr>'."\n";
+}
+print $text;
+
+// Output payment summary form
+print '<tr><td align="center">';
+print '<table with="100%" id="tablepublicpayment">';
+print '<tr class="liste_total"><td align="left" colspan="2">'.$langs->trans("ThisIsInformationOnPayment").' :</td></tr>'."\n";
+
+$found=false;
+$error=0;
+$var=false;
+
+// Free payment
+if (! GETPOST("source") && $valid)
+{
+	$found=true;
+	$tag=GETPOST("tag");
+	$fulltag=$tag;
+
+	// Creditor
+	$var=!$var;
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
+    print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
+    print '<input type="hidden" name="creditor" value="'.$creditor.'">';
+    print '</td></tr>'."\n";
+
+	// Amount
+	$var=!$var;
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
+	if (empty($amount)) print ' ('.$langs->trans("ToComplete").')';
+	print '</td><td class="CTableRow'.($var?'1':'2').'">';
+	if (empty($amount) || ! is_numeric($amount))
+	{
+        print '<input type="hidden" name="amount" value="'.GETPOST("amount",'int').'">';
+	    print '<input class="flat" size=8 type="text" name="newamount" value="'.GETPOST("newamount","int").'">';
+	}
+	else {
+		print '<b>'.price($amount).'</b>';
+        print '<input type="hidden" name="amount" value="'.$amount.'">';
+		print '<input type="hidden" name="newamount" value="'.$amount.'">';
+	}
+	// Currency
+	print ' <b>'.$langs->trans("Currency".$currency).'</b>';
+	print '<input type="hidden" name="currency" value="'.$currency.'">';
+	print '</td></tr>'."\n";
+
+	// Tag
+	$var=!$var;
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
+	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
+	print '<input type="hidden" name="tag" value="'.$tag.'">';
+	print '<input type="hidden" name="fulltag" value="'.$fulltag.'">';
+	print '</td></tr>'."\n";
+
+    // We do not add fields shipToName, shipToStreet, shipToCity, shipToState, shipToCountryCode, shipToZip, shipToStreet2, phoneNum
+    // as they don't exists (buyer is unknown, tag is free).
+}
+
+
+// Payment on customer order
+if (GETPOST("source") == 'order' && $valid)
+{
+	$found=true;
+	$langs->load("orders");
+
+	require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+
+	$order=new Commande($db);
+	$result=$order->fetch('',$ref);
+	if ($result < 0)
+	{
+		$mesg=$order->error;
+		$error++;
+	}
+	else
+	{
+		$result=$order->fetch_thirdparty($order->socid);
+	}
+
+	$amount=$order->total_ttc;
+    if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
+    $amount=price2num($amount);
+
+	$fulltag='ORD='.$order->ref.'.CUS='.$order->thirdparty->id;
+	//$fulltag.='.NAM='.strtr($order->thirdparty->name,"-"," ");
+	if (! empty($TAG)) { $tag=$TAG; $fulltag.='.TAG='.$TAG; }
+	$fulltag=dol_string_unaccent($fulltag);
+
+	// Creditor
+	$var=!$var;
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
+    print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
+    print '<input type="hidden" name="creditor" value="'.$creditor.'">';
+    print '</td></tr>'."\n";
+
+	// Debitor
+	$var=!$var;
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("ThirdParty");
+	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$order->thirdparty->name.'</b>';
+
+	// Object
+	$var=!$var;
+	$text='<b>'.$langs->trans("PaymentOrderRef",$order->ref).'</b>';
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Designation");
+	print '</td><td class="CTableRow'.($var?'1':'2').'">'.$text;
+	print '<input type="hidden" name="source" value="'.GETPOST("source",'alpha').'">';
+	print '<input type="hidden" name="ref" value="'.$order->ref.'">';
+	print '</td></tr>'."\n";
+
+	// Amount
+	$var=!$var;
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
+	if (empty($amount)) print ' ('.$langs->trans("ToComplete").')';
+	print '</td><td class="CTableRow'.($var?'1':'2').'">';
+	if (empty($amount) || ! is_numeric($amount))
+	{
+        print '<input type="hidden" name="amount" value="'.GETPOST("amount",'int').'">';
+	    print '<input class="flat" size=8 type="text" name="newamount" value="'.GETPOST("newamount","int").'">';
+	}
+	else {
+		print '<b>'.price($amount).'</b>';
+        print '<input type="hidden" name="amount" value="'.$amount.'">';
+		print '<input type="hidden" name="newamount" value="'.$amount.'">';
+	}
+	// Currency
+	print ' <b>'.$langs->trans("Currency".$currency).'</b>';
+	print '<input type="hidden" name="currency" value="'.$currency.'">';
+	print '</td></tr>'."\n";
+
+	// Tag
+	$var=!$var;
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
+	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
+	print '<input type="hidden" name="tag" value="'.$tag.'">';
+	print '<input type="hidden" name="fulltag" value="'.$fulltag.'">';
+	print '</td></tr>'."\n";
+
+	// Shipping address
+	$shipToName=$order->thirdparty->name;
+    $shipToStreet=$order->thirdparty->address;
+    $shipToCity=$order->thirdparty->town;
+    $shipToState=$order->thirdparty->state_code;
+    $shipToCountryCode=$order->thirdparty->country_code;
+    $shipToZip=$order->thirdparty->zip;
+    $shipToStreet2='';
+    $phoneNum=$order->thirdparty->phone;
+    if ($shipToName && $shipToStreet && $shipToCity && $shipToCountryCode && $shipToZip)
+    {
+        print '<input type="hidden" name="shipToName" value="'.$shipToName.'">'."\n";
+        print '<input type="hidden" name="shipToStreet" value="'.$shipToStreet.'">'."\n";
+        print '<input type="hidden" name="shipToCity" value="'.$shipToCity.'">'."\n";
+        print '<input type="hidden" name="shipToState" value="'.$shipToState.'">'."\n";
+        print '<input type="hidden" name="shipToCountryCode" value="'.$shipToCountryCode.'">'."\n";
+        print '<input type="hidden" name="shipToZip" value="'.$shipToZip.'">'."\n";
+        print '<input type="hidden" name="shipToStreet2" value="'.$shipToStreet2.'">'."\n";
+        print '<input type="hidden" name="phoneNum" value="'.$phoneNum.'">'."\n";
+    }
+    else
+    {
+        print '<!-- Shipping address not complete, so we don t use it -->'."\n";
+    }
+    print '<input type="hidden" name="email" value="'.$order->thirdparty->email.'">'."\n";
+    print '<input type="hidden" name="desc" value="'.$langs->trans("Order").' '.$order->ref.'">'."\n";
+}
+
+
+// Payment on customer invoice
+if (GETPOST("source") == 'invoice' && $valid)
+{
+	$found=true;
+	$langs->load("bills");
+
+	require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+
+	$invoice=new Facture($db);
+	$result=$invoice->fetch('',$ref);
+	if ($result < 0)
+	{
+		$mesg=$invoice->error;
+		$error++;
+	}
+	else
+	{
+		$result=$invoice->fetch_thirdparty($invoice->socid);
+	}
+
+	$amount=price2num($invoice->total_ttc - $invoice->getSommePaiement());
+    if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
+    $amount=price2num($amount);
+
+	$fulltag='INV='.$invoice->ref.'.CUS='.$invoice->thirdparty->id;
+	//$fulltag.='.NAM='.strtr($invoice->thirdparty->name,"-"," ");
+	if (! empty($TAG)) { $tag=$TAG; $fulltag.='.TAG='.$TAG; }
+	$fulltag=dol_string_unaccent($fulltag);
+
+	// Creditor
+	$var=!$var;
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
+    print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
+    print '<input type="hidden" name="creditor" value="'.$creditor.'">';
+    print '</td></tr>'."\n";
+
+	// Debitor
+	$var=!$var;
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("ThirdParty");
+	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$invoice->thirdparty->name.'</b>';
+
+	// Object
+	$var=!$var;
+	$text='<b>'.$langs->trans("PaymentInvoiceRef",$invoice->ref).'</b>';
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Designation");
+	print '</td><td class="CTableRow'.($var?'1':'2').'">'.$text;
+	print '<input type="hidden" name="source" value="'.GETPOST("source",'alpha').'">';
+	print '<input type="hidden" name="ref" value="'.$invoice->ref.'">';
+	print '</td></tr>'."\n";
+
+	// Amount
+	$var=!$var;
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
+	if (empty($amount)) print ' ('.$langs->trans("ToComplete").')';
+	print '</td><td class="CTableRow'.($var?'1':'2').'">';
+	if (empty($amount) || ! is_numeric($amount))
+	{
+        print '<input type="hidden" name="amount" value="'.GETPOST("amount",'int').'">';
+	    print '<input class="flat" size=8 type="text" name="newamount" value="'.GETPOST("newamount","int").'">';
+	}
+	else {
+		print '<b>'.price($amount).'</b>';
+        print '<input type="hidden" name="amount" value="'.$amount.'">';
+		print '<input type="hidden" name="newamount" value="'.$amount.'">';
+	}
+	// Currency
+	print ' <b>'.$langs->trans("Currency".$currency).'</b>';
+	print '<input type="hidden" name="currency" value="'.$currency.'">';
+	print '</td></tr>'."\n";
+
+	// Tag
+	$var=!$var;
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
+	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
+	print '<input type="hidden" name="tag" value="'.$tag.'">';
+	print '<input type="hidden" name="fulltag" value="'.$fulltag.'">';
+	print '</td></tr>'."\n";
+
+    // Shipping address
+    $shipToName=$invoice->thirdparty->name;
+    $shipToStreet=$invoice->thirdparty->address;
+    $shipToCity=$invoice->thirdparty->town;
+    $shipToState=$invoice->thirdparty->state_code;
+    $shipToCountryCode=$invoice->thirdparty->country_code;
+    $shipToZip=$invoice->thirdparty->zip;
+    $shipToStreet2='';
+    $phoneNum=$invoice->thirdparty->phone;
+    if ($shipToName && $shipToStreet && $shipToCity && $shipToCountryCode && $shipToZip)
+    {
+        print '<input type="hidden" name="shipToName" value="'.$shipToName.'">'."\n";
+        print '<input type="hidden" name="shipToStreet" value="'.$shipToStreet.'">'."\n";
+        print '<input type="hidden" name="shipToCity" value="'.$shipToCity.'">'."\n";
+        print '<input type="hidden" name="shipToState" value="'.$shipToState.'">'."\n";
+        print '<input type="hidden" name="shipToCountryCode" value="'.$shipToCountryCode.'">'."\n";
+        print '<input type="hidden" name="shipToZip" value="'.$shipToZip.'">'."\n";
+        print '<input type="hidden" name="shipToStreet2" value="'.$shipToStreet2.'">'."\n";
+        print '<input type="hidden" name="phoneNum" value="'.$phoneNum.'">'."\n";
+    }
+    else
+    {
+        print '<!-- Shipping address not complete, so we don t use it -->'."\n";
+    }
+    print '<input type="hidden" name="email" value="'.$invoice->thirdparty->email.'">'."\n";
+    print '<input type="hidden" name="desc" value="'.$langs->trans("Invoice").' '.$invoice->ref.'">'."\n";
+}
+
+// Payment on contract line
+if (GETPOST("source") == 'contractline' && $valid)
+{
+	$found=true;
+	$langs->load("contracts");
+
+	require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
+
+	$contractline=new ContratLigne($db);
+	$result=$contractline->fetch('',$ref);
+	if ($result < 0)
+	{
+		$mesg=$contractline->error;
+		$error++;
+	}
+	else
+	{
+		if ($contractline->fk_contrat > 0)
+		{
+			$contract=new Contrat($db);
+			$result=$contract->fetch($contractline->fk_contrat);
+			if ($result > 0)
+			{
+				$result=$contract->fetch_thirdparty($contract->socid);
+			}
+			else
+			{
+				$mesg=$contract->error;
+				$error++;
+			}
+		}
+		else
+		{
+			$mesg='ErrorRecordNotFound';
+			$error++;
+		}
+	}
+
+	$amount=$contractline->total_ttc;
+	if ($contractline->fk_product)
+	{
+		$product=new Product($db);
+		$result=$product->fetch($contractline->fk_product);
+
+		// We define price for product (TODO Put this in a method in product class)
+		if (! empty($conf->global->PRODUIT_MULTIPRICES))
+		{
+			$pu_ht = $product->multiprices[$contract->thirdparty->price_level];
+			$pu_ttc = $product->multiprices_ttc[$contract->thirdparty->price_level];
+			$price_base_type = $product->multiprices_base_type[$contract->thirdparty->price_level];
+		}
+		else
+		{
+			$pu_ht = $product->price;
+			$pu_ttc = $product->price_ttc;
+			$price_base_type = $product->price_base_type;
+		}
+
+		$amount=$pu_ttc;
+		if (empty($amount))
+		{
+			dol_print_error('','ErrorNoPriceDefinedForThisProduct');
+			exit;
+		}
+	}
+    if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
+    $amount=price2num($amount);
+
+	$fulltag='COL='.$contractline->ref.'.CON='.$contract->ref.'.CUS='.$contract->thirdparty->id.'.DAT='.dol_print_date(dol_now(),'%Y%m%d%H%M');
+	//$fulltag.='.NAM='.strtr($contract->thirdparty->name,"-"," ");
+	if (! empty($TAG)) { $tag=$TAG; $fulltag.='.TAG='.$TAG; }
+	$fulltag=dol_string_unaccent($fulltag);
+
+	$qty=1;
+	if (GETPOST('qty')) $qty=GETPOST('qty');
+
+	// Creditor
+	$var=!$var;
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
+	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
+    print '<input type="hidden" name="creditor" value="'.$creditor.'">';
+	print '</td></tr>'."\n";
+
+	// Debitor
+	$var=!$var;
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("ThirdParty");
+	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$contract->thirdparty->name.'</b>';
+
+	// Object
+	$var=!$var;
+	$text='<b>'.$langs->trans("PaymentRenewContractId",$contract->ref,$contractline->ref).'</b>';
+	if ($contractline->fk_product)
+	{
+		$text.='<br>'.$product->ref.($product->label?' - '.$product->label:'');
+	}
+	if ($contractline->description) $text.='<br>'.dol_htmlentitiesbr($contractline->description);
+	//if ($contractline->date_fin_validite) {
+	//	$text.='<br>'.$langs->trans("DateEndPlanned").': ';
+	//	$text.=dol_print_date($contractline->date_fin_validite);
+	//}
+	if ($contractline->date_fin_validite)
+	{
+		$text.='<br>'.$langs->trans("ExpiredSince").': '.dol_print_date($contractline->date_fin_validite);
+	}
+
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Designation");
+	print '</td><td class="CTableRow'.($var?'1':'2').'">'.$text;
+	print '<input type="hidden" name="source" value="'.GETPOST("source",'alpha').'">';
+	print '<input type="hidden" name="ref" value="'.$contractline->ref.'">';
+	print '</td></tr>'."\n";
+
+	// Quantity
+	$var=!$var;
+	$label=$langs->trans("Quantity");
+	$qty=1;
+	$duration='';
+	if ($contractline->fk_product)
+	{
+		if ($product->isService() && $product->duration_value > 0)
+		{
+			$label=$langs->trans("Duration");
+
+			// TODO Put this in a global method
+			if ($product->duration_value > 1)
+			{
+				$dur=array("h"=>$langs->trans("Hours"),"d"=>$langs->trans("DurationDays"),"w"=>$langs->trans("DurationWeeks"),"m"=>$langs->trans("DurationMonths"),"y"=>$langs->trans("DurationYears"));
+			}
+			else
+			{
+				$dur=array("h"=>$langs->trans("Hour"),"d"=>$langs->trans("DurationDay"),"w"=>$langs->trans("DurationWeek"),"m"=>$langs->trans("DurationMonth"),"y"=>$langs->trans("DurationYear"));
+			}
+			$duration=$product->duration_value.' '.$dur[$product->duration_unit];
+		}
+	}
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$label.'</td>';
+	print '<td class="CTableRow'.($var?'1':'2').'"><b>'.($duration?$duration:$qty).'</b>';
+	print '<input type="hidden" name="newqty" value="'.dol_escape_htmltag($qty).'">';
+	print '</b></td></tr>'."\n";
+
+	// Amount
+	$var=!$var;
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
+	if (empty($amount)) print ' ('.$langs->trans("ToComplete").')';
+	print '</td><td class="CTableRow'.($var?'1':'2').'">';
+	if (empty($amount) || ! is_numeric($amount))
+	{
+        print '<input type="hidden" name="amount" value="'.GETPOST("amount",'int').'">';
+	    print '<input class="flat" size=8 type="text" name="newamount" value="'.GETPOST("newamount","int").'">';
+	}
+	else {
+		print '<b>'.price($amount).'</b>';
+        print '<input type="hidden" name="amount" value="'.$amount.'">';
+		print '<input type="hidden" name="newamount" value="'.$amount.'">';
+	}
+	// Currency
+	print ' <b>'.$langs->trans("Currency".$currency).'</b>';
+	print '<input type="hidden" name="currency" value="'.$currency.'">';
+	print '</td></tr>'."\n";
+
+	// Tag
+	$var=!$var;
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
+	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
+	print '<input type="hidden" name="tag" value="'.$tag.'">';
+	print '<input type="hidden" name="fulltag" value="'.$fulltag.'">';
+	print '</td></tr>'."\n";
+
+    // Shipping address
+    $shipToName=$contract->thirdparty->name;
+    $shipToStreet=$contract->thirdparty->address;
+    $shipToCity=$contract->thirdparty->town;
+    $shipToState=$contract->thirdparty->state_code;
+    $shipToCountryCode=$contract->thirdparty->country_code;
+    $shipToZip=$contract->thirdparty->zip;
+    $shipToStreet2='';
+    $phoneNum=$contract->thirdparty->phone;
+    if ($shipToName && $shipToStreet && $shipToCity && $shipToCountryCode && $shipToZip)
+    {
+        print '<input type="hidden" name="shipToName" value="'.$shipToName.'">'."\n";
+        print '<input type="hidden" name="shipToStreet" value="'.$shipToStreet.'">'."\n";
+        print '<input type="hidden" name="shipToCity" value="'.$shipToCity.'">'."\n";
+        print '<input type="hidden" name="shipToState" value="'.$shipToState.'">'."\n";
+        print '<input type="hidden" name="shipToCountryCode" value="'.$shipToCountryCode.'">'."\n";
+        print '<input type="hidden" name="shipToZip" value="'.$shipToZip.'">'."\n";
+        print '<input type="hidden" name="shipToStreet2" value="'.$shipToStreet2.'">'."\n";
+        print '<input type="hidden" name="phoneNum" value="'.$phoneNum.'">'."\n";
+    }
+    else
+    {
+        print '<!-- Shipping address not complete, so we don t use it -->'."\n";
+    }
+    print '<input type="hidden" name="email" value="'.$contract->thirdparty->email.'">'."\n";
+    print '<input type="hidden" name="desc" value="'.$langs->trans("Contract").' '.$contract->ref.'">'."\n";
+}
+
+// Payment on member subscription
+if (GETPOST("source") == 'membersubscription' && $valid)
+{
+	$found=true;
+	$langs->load("members");
+
+	require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/adherents/class/subscription.class.php';
+
+	$member=new Adherent($db);
+	$result=$member->fetch('',$ref);
+	if ($result < 0)
+	{
+		$mesg=$member->error;
+		$error++;
+	}
+	else
+	{
+		$subscription=new Subscription($db);
+	}
+
+	$amount=$subscription->total_ttc;
+    if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
+    $amount=price2num($amount);
+
+	$fulltag='MEM='.$member->id.'.DAT='.dol_print_date(dol_now(),'%Y%m%d%H%M');
+	if (! empty($TAG)) { $tag=$TAG; $fulltag.='.TAG='.$TAG; }
+	$fulltag=dol_string_unaccent($fulltag);
+
+	// Creditor
+	$var=!$var;
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
+    print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
+    print '<input type="hidden" name="creditor" value="'.$creditor.'">';
+    print '</td></tr>'."\n";
+
+	// Debitor
+	$var=!$var;
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Member");
+	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>';
+	if ($member->morphy == 'mor' && ! empty($member->societe)) print $member->societe;
+	else print $member->getFullName($langs);
+	print '</b>';
+
+	// Object
+	$var=!$var;
+	$text='<b>'.$langs->trans("PaymentSubscription").'</b>';
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Designation");
+	print '</td><td class="CTableRow'.($var?'1':'2').'">'.$text;
+	print '<input type="hidden" name="source" value="'.GETPOST("source",'alpha').'">';
+	print '<input type="hidden" name="ref" value="'.$member->ref.'">';
+	print '</td></tr>'."\n";
+
+	if ($member->last_subscription_date || $member->last_subscription_amount)
+	{
+		// Last subscription date
+		$var=!$var;
+		print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("LastSubscriptionDate");
+		print '</td><td class="CTableRow'.($var?'1':'2').'">'.dol_print_date($member->last_subscription_date,'day');
+		print '</td></tr>'."\n";
+
+		// Last subscription amount
+		$var=!$var;
+		print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("LastSubscriptionAmount");
+		print '</td><td class="CTableRow'.($var?'1':'2').'">'.price($member->last_subscription_amount);
+		print '</td></tr>'."\n";
+
+		if (empty($amount) && ! GETPOST('newamount')) $_GET['newamount']=$member->last_subscription_amount;
+	}
+
+	// Amount
+	$var=!$var;
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
+	if (empty($amount))
+	{
+		print ' ('.$langs->trans("ToComplete");
+		if (! empty($conf->global->MEMBER_EXT_URL_SUBSCRIPTION_INFO)) print ' - <a href="'.$conf->global->MEMBER_EXT_URL_SUBSCRIPTION_INFO.'" rel="external" target="_blank">'.$langs->trans("SeeHere").'</a>';
+		print ')';
+	}
+	print '</td><td class="CTableRow'.($var?'1':'2').'">';
+	if (empty($amount) || ! is_numeric($amount))
+	{
+	    $valtoshow=GETPOST("newamount",'int');
+	    if (! empty($conf->global->MEMBER_MIN_AMOUNT) && $valtoshow) $valtoshow=max($conf->global->MEMBER_MIN_AMOUNT,$valtoshow);
+        print '<input type="hidden" name="amount" value="'.GETPOST("amount",'int').'">';
+	    print '<input class="flat" size="8" type="text" name="newamount" value="'.$valtoshow.'">';
+	}
+	else {
+	    $valtoshow=$amount;
+	    if (! empty($conf->global->MEMBER_MIN_AMOUNT) && $valtoshow) $valtoshow=max($conf->global->MEMBER_MIN_AMOUNT,$valtoshow);
+	    print '<b>'.price($valtoshow).'</b>';
+        print '<input type="hidden" name="amount" value="'.$valtoshow.'">';
+		print '<input type="hidden" name="newamount" value="'.$valtoshow.'">';
+	}
+	// Currency
+	print ' <b>'.$langs->trans("Currency".$currency).'</b>';
+	print '<input type="hidden" name="currency" value="'.$currency.'">';
+	print '</td></tr>'."\n";
+
+	// Tag
+	$var=!$var;
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
+	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
+	print '<input type="hidden" name="tag" value="'.$tag.'">';
+	print '<input type="hidden" name="fulltag" value="'.$fulltag.'">';
+	print '</td></tr>'."\n";
+
+    // Shipping address
+    $shipToName=$member->getFullName($langs);
+    $shipToStreet=$member->address;
+    $shipToCity=$member->town;
+    $shipToState=$member->state_code;
+    $shipToCountryCode=$member->country_code;
+    $shipToZip=$member->zip;
+    $shipToStreet2='';
+    $phoneNum=$member->phone;
+    if ($shipToName && $shipToStreet && $shipToCity && $shipToCountryCode && $shipToZip)
+    {
+        print '<input type="hidden" name="shipToName" value="'.$shipToName.'">'."\n";
+        print '<input type="hidden" name="shipToStreet" value="'.$shipToStreet.'">'."\n";
+        print '<input type="hidden" name="shipToCity" value="'.$shipToCity.'">'."\n";
+        print '<input type="hidden" name="shipToState" value="'.$shipToState.'">'."\n";
+        print '<input type="hidden" name="shipToCountryCode" value="'.$shipToCountryCode.'">'."\n";
+        print '<input type="hidden" name="shipToZip" value="'.$shipToZip.'">'."\n";
+        print '<input type="hidden" name="shipToStreet2" value="'.$shipToStreet2.'">'."\n";
+        print '<input type="hidden" name="phoneNum" value="'.$phoneNum.'">'."\n";
+    }
+    else
+    {
+        print '<!-- Shipping address not complete, so we don t use it -->'."\n";
+    }
+    print '<input type="hidden" name="email" value="'.$member->email.'">'."\n";
+    print '<input type="hidden" name="desc" value="'.$langs->trans("PaymentSubscription").'">'."\n";
+}
+
+
+
+
+if (! $found && ! $mesg) $mesg=$langs->trans("ErrorBadParameters");
+
+if ($mesg) print '<tr><td align="center" colspan="2"><br><div class="warning">'.$mesg.'</div></td></tr>'."\n";
+
+print '</table>'."\n";
+print "\n";
+
+if ($found && ! $error)	// We are in a management option and no error
+{
+	if (empty($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY)) $conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY='integral';
+
+	if ($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY == 'integral')
+	{
+		print '<br><input class="button" type="submit" name="dopayment" value="'.$langs->trans("StripeOrCBDoPayment").'">';
+	}
+	if ($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY == 'stripeonly')
+	{
+		print '<br><input class="button" type="submit" name="dopayment" value="'.$langs->trans("StripeDoPayment").'">';
+	}
+}
+else
+{
+	dol_print_error_email('ERRORNEWPAYMENTPAYPAL');
+}
+
+print '</td></tr>'."\n";
+
+print '</table>'."\n";
+print '</form>'."\n";
+print '</div>'."\n";
+print '<br>';
+
+
+html_print_stripe_footer($mysoc,$langs);
+
+llxFooterStripe();
+
+$db->close();
diff --git a/htdocs/public/stripe/paymentko.php b/htdocs/public/stripe/paymentko.php
new file mode 100644
index 00000000000..09de4525b39
--- /dev/null
+++ b/htdocs/public/stripe/paymentko.php
@@ -0,0 +1,115 @@
+<?php
+/* Copyright (C) 2001-2002 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2006-2013 Laurent Destailleur  <eldy@users.sourceforge.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *     	\file       htdocs/public/paybox/paymentko.php
+ *		\ingroup    paybox
+ *		\brief      File to show page after a failed payment
+ *		\author	    Laurent Destailleur
+ */
+
+define("NOLOGIN",1);		// This means this output page does not require to be logged.
+define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.
+
+// For MultiCompany module.
+// Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
+// TODO This should be useless. Because entity must be retreive from object ref and not from url.
+$entity=(! empty($_GET['entity']) ? (int) $_GET['entity'] : (! empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
+if (is_numeric($entity)) define("DOLENTITY", $entity);
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/paybox/lib/paybox.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+
+// Security check
+if (empty($conf->paybox->enabled)) accessforbidden('',0,0,1);
+
+$langs->load("main");
+$langs->load("other");
+$langs->load("dict");
+$langs->load("bills");
+$langs->load("companies");
+$langs->load("paybox");
+$langs->load("paypal");
+
+
+
+
+/*
+ * Actions
+ */
+
+
+
+
+
+/*
+ * View
+ */
+
+dol_syslog("Callback url when a PayBox payment was canceled. query_string=".(empty($_SERVER["QUERY_STRING"])?'':$_SERVER["QUERY_STRING"])." script_uri=".(empty($_SERVER["SCRIPT_URI"])?'':$_SERVER["SCRIPT_URI"]), LOG_DEBUG, 0, '_paybox');
+
+$tracepost = "";
+foreach($_POST as $k => $v) $tracepost .= "{$k} - {$v}\n";
+dol_syslog("POST=".$tracepost, LOG_DEBUG, 0, '_paybox');
+
+
+// Send an email
+if (! empty($conf->global->PAYBOX_PAYONLINE_SENDEMAIL))
+{
+	$sendto=$conf->global->PAYBOX_PAYONLINE_SENDEMAIL;
+	$from=$conf->global->MAILING_EMAIL_FROM;
+
+	$urlback=$_SERVER["REQUEST_URI"];
+	$topic='['.$conf->global->MAIN_APPLICATION_TITLE.'] '.$langs->transnoentitiesnoconv("NewPayboxPaymentFailed");
+	$content=$langs->transnoentitiesnoconv("NewPayboxPaymentFailed")."\n".$fulltag;
+	require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+	$mailfile = new CMailFile($topic, $sendto, $from, $content);
+
+	$result=$mailfile->sendfile();
+	if ($result)
+	{
+		dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_paybox');
+	}
+	else
+	{
+		dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_paybox');
+	}
+}
+
+
+llxHeaderPayBox($langs->trans("PaymentForm"));
+
+
+// Show message
+print '<span id="dolpaymentspan"></span>'."\n";
+print '<div id="dolpaymentdiv" align="center">'."\n";
+
+print $langs->trans("YourPaymentHasNotBeenRecorded")."<br><br>\n";
+
+if (! empty($conf->global->PAYBOX_MESSAGE_KO)) print $conf->global->PAYBOX_MESSAGE_KO;
+
+print "\n</div>\n";
+
+
+html_print_paybox_footer($mysoc,$langs);
+
+
+llxFooterPayBox();
+
+$db->close();
diff --git a/htdocs/public/stripe/paymentok.php b/htdocs/public/stripe/paymentok.php
new file mode 100644
index 00000000000..9c3030a86ba
--- /dev/null
+++ b/htdocs/public/stripe/paymentok.php
@@ -0,0 +1,172 @@
+<?php
+/* Copyright (C) 2001-2002 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2006-2013 Laurent Destailleur  <eldy@users.sourceforge.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *     	\file       htdocs/public/paybox/paymentok.php
+ *		\ingroup    paybox
+ *		\brief      File to show page after a successful payment
+ *		\author	    Laurent Destailleur
+ */
+
+define("NOLOGIN",1);		// This means this output page does not require to be logged.
+define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.
+
+// For MultiCompany module.
+// Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
+// TODO This should be useless. Because entity must be retreive from object ref and not from url.
+$entity=(! empty($_GET['entity']) ? (int) $_GET['entity'] : (! empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
+if (is_numeric($entity)) define("DOLENTITY", $entity);
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/paybox/lib/paybox.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+
+// Security check
+if (empty($conf->paybox->enabled)) accessforbidden('',0,0,1);
+
+$langs->load("main");
+$langs->load("other");
+$langs->load("dict");
+$langs->load("bills");
+$langs->load("companies");
+$langs->load("paybox");
+$langs->load("paypal");
+
+/*$source=GETPOST('source');
+$ref=GETPOST('ref');
+$PAYBOXTOKEN=GETPOST('TOKEN');
+if (empty($PAYBOXTOKEN)) $PAYBOXTOKEN=GETPOST('token');
+$PAYBOXPAYERID=GETPOST('PAYERID');
+if (empty($PAYBOXPAYERID)) $PAYBOXPAYERID=GETPOST('PayerID');
+*/
+$PAYBOXFULLTAG=GETPOST('FULLTAG');
+if (empty($PAYBOXFULLTAG)) $PAYBOXFULLTAG=GETPOST('fulltag');
+
+
+/*
+ * Actions
+ */
+
+
+
+
+
+/*
+ * View
+ */
+
+dol_syslog("Callback url when a PayBox payment was done. query_string=".(empty($_SERVER["QUERY_STRING"])?'':$_SERVER["QUERY_STRING"])." script_uri=".(empty($_SERVER["SCRIPT_URI"])?'':$_SERVER["SCRIPT_URI"]), LOG_DEBUG, 0, '_paybox');
+
+$tracepost = "";
+foreach($_POST as $k => $v) $tracepost .= "{$k} - {$v}\n";
+dol_syslog("POST=".$tracepost, LOG_DEBUG, 0, '_paybox');
+
+llxHeaderPayBox($langs->trans("PaymentForm"));
+
+
+// Show message
+print '<span id="dolpaymentspan"></span>'."\n";
+print '<div id="dolpaymentdiv" align="center">'."\n";
+
+// Get on url call
+/*
+$token              = $PAYBOXTOKEN;
+*/
+$fulltag            = $PAYBOXFULLTAG;
+/*$payerID            = $PAYBOXPAYERID;
+// Set by newpayment.php
+$paymentType        = $_SESSION['PaymentType'];
+$currencyCodeType   = $_SESSION['currencyCodeType'];
+$FinalPaymentAmt    = $_SESSION["Payment_Amount"];
+// From env
+$ipaddress          = $_SESSION['ipaddress'];
+
+dol_syslog("Call newpaymentok with token=".$token." paymentType=".$paymentType." currencyCodeType=".$currencyCodeType." payerID=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt." fulltag=".$fulltag);
+*/
+
+
+print $langs->trans("YourPaymentHasBeenRecorded")."<br><br>\n";
+
+if (! empty($conf->global->PAYBOX_MESSAGE_OK)) print $conf->global->PAYBOX_MESSAGE_OK;
+
+// Appel des triggers
+include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+$interface=new Interfaces($db);
+$result=$interface->run_triggers('PAYBOX_PAYMENT_OK',$object,$user,$langs,$conf);
+if ($result < 0) { $error++; $errors=$interface->errors; }
+// Fin appel triggers
+
+
+// Send an email
+if (! empty($conf->global->PAYBOX_PAYONLINE_SENDEMAIL))
+{
+	$sendto=$conf->global->PAYBOX_PAYONLINE_SENDEMAIL;
+	$from=$conf->global->MAILING_EMAIL_FROM;
+	// Define $urlwithroot
+	$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
+	$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
+	//$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
+
+	$urlback=$_SERVER["REQUEST_URI"];
+	$topic='['.$conf->global->MAIN_APPLICATION_TITLE.'] '.$langs->transnoentitiesnoconv("NewPayboxPaymentReceived");
+	$tmptag=dolExplodeIntoArray($fulltag,'.','=');
+	$content="";
+	if (! empty($tmptag['MEM']))
+	{
+		$langs->load("members");
+		$url=$urlwithroot."/adherents/card_subscriptions.php?rowid=".$tmptag['MEM'];
+		$content.=$langs->trans("PaymentSubscription")."<br>\n";
+		$content.=$langs->trans("MemberId").': '.$tmptag['MEM']."<br>\n";
+		$content.=$langs->trans("Link").': <a href="'.$url.'">'.$url.'</a>'."<br>\n";
+	}
+	else
+	{
+		$content.=$langs->transnoentitiesnoconv("NewPayboxPaymentReceived")."<br>\n";
+	}
+	$content.="<br>\n";
+	$content.=$langs->transnoentitiesnoconv("TechnicalInformation").":<br>\n";
+	$content.=$langs->transnoentitiesnoconv("ReturnURLAfterPayment").': '.$urlback."<br>\n";
+	$content.="tag=".$fulltag."<br>\n";
+
+	$ishtml=dol_textishtml($content);	// May contain urls
+
+	require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+	$mailfile = new CMailFile($topic, $sendto, $from, $content, array(), array(), array(), '', '', 0, $ishtml);
+
+	// Send an email
+	$result=$mailfile->sendfile();
+	if ($result)
+	{
+		dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_paybox');
+	}
+	else
+	{
+		dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_paybox');
+	}
+}
+
+
+
+print "\n</div>\n";
+
+html_print_paybox_footer($mysoc,$langs);
+
+
+llxFooterPayBox();
+
+$db->close();
diff --git a/htdocs/stripe/admin/index.html b/htdocs/stripe/admin/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/stripe/admin/stripe.php b/htdocs/stripe/admin/stripe.php
new file mode 100644
index 00000000000..481f6634227
--- /dev/null
+++ b/htdocs/stripe/admin/stripe.php
@@ -0,0 +1,225 @@
+<?php
+/* Copyright (C) 2017		Alexandre Spangaro		<aspangaro@zendsi.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/stripe/admin/stripe.php
+ * \ingroup    stripe
+ * \brief      Page to setup stripe module
+ */
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/stripe/lib/stripe.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+
+$servicename='Stripe';
+
+$langs->load("admin");
+$langs->load("other");
+$langs->load("stripe");
+
+if (!$user->admin)
+  accessforbidden();
+  
+$action = GETPOST('action','alpha');
+
+
+if ($action == 'setvalue' && $user->admin)
+{
+	$db->begin();
+
+    $result=dolibarr_set_const($db, "STRIPE_API_SANDBOX",GETPOST('STRIPE_API_SANDBOX','alpha'),'chaine',0,'',$conf->entity);
+    if (! $result > 0) $error++;
+	$result=dolibarr_set_const($db, "STRIPE_TEST_SECRET_KEY",GETPOST('STRIPE_TEST_SECRET_KEY','alpha'),'chaine',0,'',$conf->entity);
+	if (! $result > 0) $error++;
+	$result=dolibarr_set_const($db, "STRIPE_TEST_PUBLISHABLE_KEY",GETPOST('STRIPE_TEST_PUBLISHABLE_KEY','alpha'),'chaine',0,'',$conf->entity);
+	if (! $result > 0) $error++;
+	$result=dolibarr_set_const($db, "STRIPE_LIVE_SECRET_KEY",GETPOST('STRIPE_LIVE_SECRET_KEY','alpha'),'chaine',0,'',$conf->entity);
+	if (! $result > 0) $error++;
+	$result=dolibarr_set_const($db, "STRIPE_LIVE_PUBLISHABLE_KEY",GETPOST('STRIPE_LIVE_PUBLISHABLE_KEY','alpha'),'chaine',0,'',$conf->entity);
+	if (! $result > 0) $error++;
+    $result=dolibarr_set_const($db, "STRIPE_CREDITOR",GETPOST('STRIPE_CREDITOR','alpha'),'chaine',0,'',$conf->entity);
+    if (! $result > 0) $error++;
+	$result=dolibarr_set_const($db, "STRIPE_CSS_URL",GETPOST('STRIPE_CSS_URL','alpha'),'chaine',0,'',$conf->entity);
+	if (! $result > 0) $error++;
+    $result=dolibarr_set_const($db, "STRIPE_MESSAGE_OK",GETPOST('STRIPE_MESSAGE_OK','alpha'),'chaine',0,'',$conf->entity);
+    if (! $result > 0) $error++;
+    $result=dolibarr_set_const($db, "STRIPE_MESSAGE_KO",GETPOST('STRIPE_MESSAGE_KO','alpha'),'chaine',0,'',$conf->entity);
+	if (! $result > 0) $error++;
+	
+    if (! $error)
+  	{
+  		$db->commit();
+	    setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+  	}
+  	else
+  	{
+  		$db->rollback();
+		dol_print_error($db);
+    }
+}
+
+
+/*
+ *	View
+ */
+
+$SECRET_TEST_KEY="sk_test_xxxxxxxxxxxxxxxxxxxxxxxx"; // Stripe test secret key
+if (empty($conf->global->STRIPE_TEST_SECRET_KEY)) $conf->global->STRIPE_TEST_SECRET_KEY = $SECRET_TEST_KEY;
+$PUBLISHABLE_TEST_KEY="pk_test_xxxxxxxxxxxxxxxxxxxxxxxx"; // Stripe test publishable key
+if (empty($conf->global->STRIPE_TEST_PUBLISHABLE_KEY)) $conf->global->STRIPE_TEST_PUBLISHABLE_KEY = $PUBLISHABLE_TEST_KEY;
+
+$SECRET_LIVE_KEY="sk_live_xxxxxxxxxxxxxxxxxxxxxxxx"; // Stripe live secret key
+if (empty($conf->global->STRIPE_LIVE_SECRET_KEY)) $conf->global->STRIPE_LIVE_SECRET_KEY = $SECRET_LIVE_KEY;
+$PUBLISHABLE_LIVE_KEY="pk_live_xxxxxxxxxxxxxxxxxxxxxxxx"; // Stripe live publishable key
+if (empty($conf->global->STRIPE_LIVE_PUBLISHABLE_KEY)) $conf->global->STRIPE_LIVE_PUBLISHABLE_KEY = $PUBLISHABLE_LIVE_KEY;
+
+llxHeader('',$langs->trans("StripeSetup"));
+
+
+$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
+print load_fiche_titre($langs->trans("ModuleSetup").' Stripe',$linkback);
+print '<br>';
+
+$head=stripeadmin_prepare_head();
+
+print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<input type="hidden" name="action" value="setvalue">';
+
+dol_fiche_head($head, 'stripeaccount', '');
+
+print $langs->trans("StripeDesc")."<br>\n";
+
+print '<br>';
+
+$var=true;
+
+print '<table class="noborder" width="100%">';
+print '<tr class="liste_titre">';
+print '<td>'.$langs->trans("AccountParameter").'</td>';
+print '<td>'.$langs->trans("Value").'</td>';
+print "</tr>\n";
+
+$var=!$var;
+print '<tr '.$bc[$var].'><td class="fieldrequired">';
+print $langs->trans("STRIPE_API_SANDBOX").'</td><td>';
+print $form->selectyesno("STRIPE_API_SANDBOX",$conf->global->STRIPE_API_SANDBOX,1);
+print '</td></tr>';
+
+$var=!$var;
+print '<tr '.$bc[$var].'><td>';
+print '<span class="titlefield fieldrequired">'.$langs->trans("STRIPE_TEST_SECRET_KEY").'</span></td><td>';
+print '<input size="32" type="text" name="STRIPE_TEST_SECRET_KEY" value="'.$conf->global->STRIPE_TEST_SECRET_KEY.'">';
+print '<br>'.$langs->trans("Example").': sk_test_xxxxxxxxxxxxxxxxxxxxxxxx';
+print '</td></tr>';
+
+$var=!$var;
+print '<tr '.$bc[$var].'><td>';
+print '<span class="fieldrequired">'.$langs->trans("STRIPE_TEST_PUBLISHABLE_KEY").'</span></td><td>';
+print '<input size="32" type="text" name="STRIPE_TEST_PUBLISHABLE_KEY" value="'.$conf->global->STRIPE_TEST_PUBLISHABLE_KEY.'">';
+print '<br>'.$langs->trans("Example").': pk_test_xxxxxxxxxxxxxxxxxxxxxxxx';
+print '</td></tr>';
+
+$var=!$var;
+print '<tr '.$bc[$var].'><td>';
+print '<span class="fieldrequired">'.$langs->trans("STRIPE_LIVE_SECRET_KEY").'</span></td><td>';
+print '<input size="32" type="text" name="STRIPE_LIVE_SECRET_KEY" value="'.$conf->global->STRIPE_LIVE_SECRET_KEY.'">';
+print '<br>'.$langs->trans("Example").': sk_live_xxxxxxxxxxxxxxxxxxxxxxxx';
+print '</td></tr>';
+
+$var=!$var;
+print '<tr '.$bc[$var].'><td>';
+print '<span class="fieldrequired">'.$langs->trans("STRIPE_LIVE_PUBLISHABLE_KEY").'</span></td><td>';
+print '<input size="32" type="text" name="STRIPE_LIVE_PUBLISHABLE_KEY" value="'.$conf->global->STRIPE_LIVE_PUBLISHABLE_KEY.'">';
+print '<br>'.$langs->trans("Example").': pk_live_xxxxxxxxxxxxxxxxxxxxxxxx';
+print '</td></tr>';
+
+$var=true;
+print '<tr class="liste_titre">';
+print '<td>'.$langs->trans("UsageParameter").'</td>';
+print '<td>'.$langs->trans("Value").'</td>';
+print "</tr>\n";
+
+$var=!$var;
+print '<tr '.$bc[$var].'><td>';
+print $langs->trans("VendorName").'</td><td>';
+print '<input size="64" type="text" name="STRIPE_CREDITOR" value="'.$conf->global->STRIPE_CREDITOR.'">';
+print '<br>'.$langs->trans("Example").': '.$mysoc->name;
+print '</td></tr>';
+
+$var=!$var;
+print '<tr '.$bc[$var].'><td>';
+print $langs->trans("CSSUrlForPaymentForm").'</td><td>';
+print '<input size="64" type="text" name="STRIPE_CSS_URL" value="'.$conf->global->STRIPE_CSS_URL.'">';
+print '<br>'.$langs->trans("Example").': http://mysite/mycss.css';
+print '</td></tr>';
+
+$var=!$var;
+print '<tr '.$bc[$var].'><td>';
+print $langs->trans("MessageOK").'</td><td>';
+$doleditor=new DolEditor('STRIPE_MESSAGE_OK',$conf->global->STRIPE_MESSAGE_OK,'',100,'dolibarr_details','In',false,true,true,ROWS_2,60);
+$doleditor->Create();
+print '</td></tr>';
+
+$var=!$var;
+print '<tr '.$bc[$var].'><td>';
+print $langs->trans("MessageKO").'</td><td>';
+$doleditor=new DolEditor('STRIPE_MESSAGE_KO',$conf->global->STRIPE_MESSAGE_KO,'',100,'dolibarr_details','In',false,true,true,ROWS_2,60);
+$doleditor->Create();
+print '</td></tr>';
+
+print '</table>';
+
+dol_fiche_end();
+
+print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></div>';
+
+print '</form>';
+
+print '<br><br>';
+
+print '<u>'.$langs->trans("FollowingUrlAreAvailableToMakePayments").':</u><br>';
+print img_picto('','object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnFreeAmount",$servicename).':<br>';
+print '<b>'.DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?amount=<i>9.99</i>&tag=<i>your_free_tag</i></b>'."<br>\n";
+if (! empty($conf->commande->enabled))
+{
+	print img_picto('','object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnOrder",$servicename).':<br>';
+	print '<b>'.DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?source=order&ref=<i>order_ref</i></b>'."<br>\n";
+}
+if (! empty($conf->facture->enabled))
+{
+	print img_picto('','object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnInvoice",$servicename).':<br>';
+	print '<b>'.DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?source=invoice&ref=<i>invoice_ref</i></b>'."<br>\n";
+}
+if (! empty($conf->contrat->enabled))
+{
+	print img_picto('','object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnContractLine",$servicename).':<br>';
+	print '<b>'.DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?source=contractline&ref=<i>contractline_ref</i></b>'."<br>\n";
+}
+if (! empty($conf->adherent->enabled))
+{
+	print img_picto('','object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnMemberSubscription",$servicename).':<br>';
+	print '<b>'.DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?source=membersubscription&ref=<i>member_ref</i></b>'."<br>\n";
+}
+
+print "<br>";
+print info_admin($langs->trans("YouCanAddTagOnUrl"));
+
+llxFooter();
+
+$db->close();
diff --git a/htdocs/stripe/img/index.html b/htdocs/stripe/img/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/stripe/img/object_stripe.png b/htdocs/stripe/img/object_stripe.png
new file mode 100644
index 0000000000000000000000000000000000000000..287bd24910cb0fc86f886d02789f29b993bad530
GIT binary patch
literal 819
zcmV-31I+x1P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006O%
z3;baP00009a7bBm000ie000ie0hKEb8vp<RFLXs%bVG7wVRUJ4ZXi@?ZDjy$WpXYc
zF)<)!>2`81ATls8IUq4NIxsmpFgGA8FflMNTjFhO00007bV*G`2iXD;69^O^U!ddw
z00M_eL_t(IPfb%#NK`=_{$}2L`}XbI#Y*sBfuXLJQs|+mbEhCG$e>Q)sY3?|JV=3r
zhax(3=~@s$cInbJItE!FL?o7(MUj}TmTjx<zJ1g8o3}3;_?X={^Zoh#W=4JbuwowF
zS;YKo8C7FoTm?59LTL>+8d^I5p&UgdzdheUcQK3M;T)V+b@tl3*XuCg;3mUOj+e2U
zwd2~^!rh)@rLp?c;M;Nxy)ah+d=Dn@;pB4g0=lOp!u2Uak~o9^C6#iSj#&I^pe~$z
zZfsma*{F=ym&cj&?dT~oB2$&ib-bP3z`gq=t}DA&glvh4leoChL`!>sv8!F^+ZS50
zjC|g~!2>z&ON_)lfdVBcKuEJB$)Te=k;!n8WBSE!Je(@w>9cjLl%fWyQA$I^CfNSy
z!flXcWU?A_^ILfQ<QHz-UP)rpRbWVtML?5i-EAojreFTS=4NaKh6Y1SPIO>wv=yCu
zeJfyS7UeW*Ay6%_B1;q{E1>aXwT|mIm+)$)f+(_wi=M6wE?;a$bBkx)qpU*gQ_M?C
zNI~@=^zgkD<L-ksj886O=FO%R@iPj81HL86WfQ<n6IcN`MvcQq3YfUkhEpe+Fwh@x
zEjbAp5lEzf?E$~X<Y?PKBE1|+DRi`XIDRaTk#kKL>Syg78(Ri53(-IKB!LKsGm#2?
zUaH~!$0};Ir2eRGFuPd8t*J8BC;~4PkRAZ)(&!gcV>BC8ggDEh#0=Q&O4M+(L?J0u
zn;4&$3p;rEx_Z2A@_*4}b0y|Y<6Cg^d?(GkiF-nrVjk$^ygQ5TcCHVf&Z4*1;}ez=
xl0Jw_8nqA>;D-U6fJV|l@gnx;>KNIzfxiXLt)E)oqyhi{002ovPDHLkV1kvqX=wle

literal 0
HcmV?d00001

diff --git a/htdocs/stripe/index.html b/htdocs/stripe/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/stripe/lib/index.html b/htdocs/stripe/lib/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/stripe/lib/stripe.lib.php b/htdocs/stripe/lib/stripe.lib.php
new file mode 100644
index 00000000000..d2d138cc8b3
--- /dev/null
+++ b/htdocs/stripe/lib/stripe.lib.php
@@ -0,0 +1,445 @@
+<?php
+/* Copyright (C) 2017      Alexandre Spangaro   <aspangaro@zendsi.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/stripe/lib/stripe.lib.php
+ *	\ingroup		stripe
+ *  \brief			Library for common stripe functions
+ */
+
+
+
+/**
+ * Show header
+ *
+ * @param 	string	$title		Title of page
+ * @param 	string	$head		Head string to add int head section
+ * @return	void
+ */
+function llxHeaderStripe($title, $head = "")
+{
+	global $user, $conf, $langs;
+
+	header("Content-type: text/html; charset=".$conf->file->character_set_client);
+
+	print '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">';
+	//print '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" http://www.w3.org/TR/1999/REC-html401-19991224/strict.dtd>';
+	print "\n";
+	print "<html>\n";
+	print "<head>\n";
+	print '<meta name="robots" content="noindex,nofollow">'."\n";
+	print '<meta name="keywords" content="dolibarr,payment,online">'."\n";
+	print '<meta name="description" content="Welcome on Dolibarr online payment form">'."\n";
+	print "<title>".$title."</title>\n";
+	if ($head) print $head."\n";
+	if (! empty($conf->global->STRIPE_CSS_URL)) print '<link rel="stylesheet" type="text/css" href="'.$conf->global->STRIPE_CSS_URL.'?lang='.$langs->defaultlang.'">'."\n";
+	else
+	{
+		print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.$conf->css.'?lang='.$langs->defaultlang.'">'."\n";
+		print '<style type="text/css">';
+		print '.CTableRow1      { margin: 1px; padding: 3px; font: 12px verdana,arial; background: #e6E6eE; color: #000000; -moz-border-radius-topleft:6px; -moz-border-radius-topright:6px; -moz-border-radius-bottomleft:6px; -moz-border-radius-bottomright:6px;}';
+		print '.CTableRow2      { margin: 1px; padding: 3px; font: 12px verdana,arial; background: #FFFFFF; color: #000000; -moz-border-radius-topleft:6px; -moz-border-radius-topright:6px; -moz-border-radius-bottomleft:6px; -moz-border-radius-bottomright:6px;}';
+		print '</style>';
+	}
+	print "</head>\n";
+	print '<body style="margin: 20px;">'."\n";
+}
+
+/**
+ * Show footer
+ *
+ * @return	void
+ */
+function llxFooterStripe()
+{
+	print "</body>\n";
+	print "</html>\n";
+}
+
+/**
+ *  Define head array for tabs of stripe tools setup pages
+ *
+ *  @return			Array of head
+ */
+function stripeadmin_prepare_head()
+{
+	global $langs, $conf;
+
+	$h = 0;
+	$head = array();
+
+	$head[$h][0] = DOL_URL_ROOT."/stripe/admin/stripe.php";
+	$head[$h][1] = $langs->trans("Stripe");
+	$head[$h][2] = 'stripeaccount';
+	$h++;
+
+	$object=new stdClass();
+
+    // Show more tabs from modules
+    // Entries must be declared in modules descriptor with line
+    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
+    // $this->tabs = array('entity:-tabname);   												to remove a tab
+	complete_head_from_modules($conf,$langs,$object,$head,$h,'stripeadmin');
+
+	complete_head_from_modules($conf,$langs,$object,$head,$h,'stripeadmin','remove');
+
+    return $head;
+}
+
+
+
+/**
+ * Return string with full Url
+ *
+ * @param   string	$type		Type of URL ('free', 'order', 'invoice', 'contractline', 'membersubscription' ...)
+ * @param	string	$ref		Ref of object
+ * @return	string				Url string
+ */
+function showStripePaymentUrl($type,$ref)
+{
+	global $conf, $langs;
+
+	$langs->load("paypal");
+    $langs->load("paybox");
+	$langs->load("stripe");
+    $servicename='Stripe';
+    $out='<br><br>';
+    $out.=img_picto('','object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePayment",$servicename).'<br>';
+    $url=getStripePaymentUrl(0,$type,$ref);
+    $out.='<input type="text" id="stripeurl" class="quatrevingtpercent" value="'.$url.'"><br>';
+    return $out;
+}
+
+/**
+ * Return string with full Url
+ *
+ * @param   int		$mode		0=True url, 1=Url formated with colors
+ * @param   string	$type		Type of URL ('free', 'order', 'invoice', 'contractline', 'membersubscription' ...)
+ * @param	string	$ref		Ref of object
+ * @param	int		$amount		Amount
+ * @param	string	$freetag	Free tag
+ * @return	string				Url string
+ */
+function getStripePaymentUrl($mode,$type,$ref='',$amount='9.99',$freetag='your_free_tag')
+{
+	global $conf;
+
+	$ref=str_replace(' ','',$ref);
+	
+    if ($type == 'free')
+    {
+	    $out=DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?amount='.($mode?'<font color="#666666">':'').$amount.($mode?'</font>':'').'&tag='.($mode?'<font color="#666666">':'').$freetag.($mode?'</font>':'');
+	    if (! empty($conf->global->PAYPAL_SECURITY_TOKEN))
+	    {
+	    	if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $out.='&securekey='.$conf->global->PAYPAL_SECURITY_TOKEN;
+	    	else $out.='&securekey='.dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
+	    }
+    }
+    if ($type == 'order')
+    {
+        $out=DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?source=order&ref='.($mode?'<font color="#666666">':'');
+        if ($mode == 1) $out.='order_ref';
+        if ($mode == 0) $out.=urlencode($ref);
+	    $out.=($mode?'</font>':'');
+        if (! empty($conf->global->PAYPAL_SECURITY_TOKEN))
+        {
+    	    if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $out.='&securekey='.$conf->global->PAYPAL_SECURITY_TOKEN;
+            else
+            {
+                $out.='&securekey='.($mode?'<font color="#666666">':'');
+                if ($mode == 1) $out.="hash('".$conf->global->PAYPAL_SECURITY_TOKEN."' + '".$type."' + order_ref)";
+                if ($mode == 0) $out.= dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . $type . $ref, 2);
+                $out.=($mode?'</font>':'');
+            }
+        }
+    }
+    if ($type == 'invoice')
+    {
+        $out=DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?source=invoice&ref='.($mode?'<font color="#666666">':'');
+        if ($mode == 1) $out.='invoice_ref';
+        if ($mode == 0) $out.=urlencode($ref);
+	    $out.=($mode?'</font>':'');
+        if (! empty($conf->global->PAYPAL_SECURITY_TOKEN))
+        {
+    	    if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $out.='&securekey='.$conf->global->PAYPAL_SECURITY_TOKEN;
+            else
+            {
+                $out.='&securekey='.($mode?'<font color="#666666">':'');
+                if ($mode == 1) $out.="hash('".$conf->global->PAYPAL_SECURITY_TOKEN."' + '".$type."' + invoice_ref)";
+                if ($mode == 0) $out.= dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . $type . $ref, 2);
+                $out.=($mode?'</font>':'');
+            }
+        }
+    }
+    if ($type == 'contractline')
+    {
+        $out=DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?source=contractline&ref='.($mode?'<font color="#666666">':'');
+        if ($mode == 1) $out.='contractline_ref';
+        if ($mode == 0) $out.=urlencode($ref);
+	    $out.=($mode?'</font>':'');
+        if (! empty($conf->global->PAYPAL_SECURITY_TOKEN))
+        {
+    	    if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $out.='&securekey='.$conf->global->PAYPAL_SECURITY_TOKEN;
+            else
+            {
+                $out.='&securekey='.($mode?'<font color="#666666">':'');
+                if ($mode == 1) $out.="hash('".$conf->global->PAYPAL_SECURITY_TOKEN."' + '".$type."' + contractline_ref)";
+                if ($mode == 0) $out.= dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . $type . $ref, 2);
+                $out.=($mode?'</font>':'');
+            }
+        }
+    }
+    if ($type == 'membersubscription')
+    {
+        $out=DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?source=membersubscription&ref='.($mode?'<font color="#666666">':'');
+        if ($mode == 1) $out.='member_ref';
+        if ($mode == 0) $out.=urlencode($ref);
+	    $out.=($mode?'</font>':'');
+        if (! empty($conf->global->PAYPAL_SECURITY_TOKEN))
+        {
+    	    if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $out.='&securekey='.$conf->global->PAYPAL_SECURITY_TOKEN;
+            else
+            {
+                $out.='&securekey='.($mode?'<font color="#666666">':'');
+                if ($mode == 1) $out.="hash('".$conf->global->PAYPAL_SECURITY_TOKEN."' + '".$type."' + member_ref)";
+                if ($mode == 0) $out.= dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . $type . $ref, 2);
+                $out.=($mode?'</font>':'');
+            }
+        }
+    }
+
+    // For multicompany
+    $out.="&entity=".$conf->entity; // Check the entity because He may be the same reference in several entities
+
+    return $out;
+}
+
+
+/**
+ * Create a redirect form to paybox form
+ *
+ * @param	int   	$PRICE		Price
+ * @param   string	$CURRENCY	Currency
+ * @param   string	$EMAIL		EMail
+ * @param   string	$urlok		Url to go back if payment is OK
+ * @param   string	$urlko		Url to go back if payment is KO
+ * @param   string	$TAG		Tag
+ * @return  int              	1 if OK, -1 if ERROR
+ */
+function print_stripe_redirect($PRICE,$CURRENCY,$EMAIL,$urlok,$urlko,$TAG)
+{
+	global $conf, $langs, $db;
+
+	dol_syslog("Stripe.lib::print_paybox_redirect", LOG_DEBUG);
+
+	// Clean parameters
+	$PBX_IDENTIFIANT="2";	// Identifiant pour v2 test
+	if (! empty($conf->global->PAYBOX_PBX_IDENTIFIANT)) $PBX_IDENTIFIANT=$conf->global->PAYBOX_PBX_IDENTIFIANT;
+	$IBS_SITE="1999888";    // Site test
+	if (! empty($conf->global->PAYBOX_IBS_SITE)) $IBS_SITE=$conf->global->PAYBOX_IBS_SITE;
+	$IBS_RANG="99";         // Rang test
+	if (! empty($conf->global->PAYBOX_IBS_RANG)) $IBS_RANG=$conf->global->PAYBOX_IBS_RANG;
+	$IBS_DEVISE="840";		// Currency (Dollar US by default)
+	if ($CURRENCY == 'EUR') $IBS_DEVISE="978";
+	if ($CURRENCY == 'USD') $IBS_DEVISE="840";
+
+	$URLPAYBOX="";
+	if ($conf->global->PAYBOX_CGI_URL_V1) $URLPAYBOX=$conf->global->PAYBOX_CGI_URL_V1;
+	if ($conf->global->PAYBOX_CGI_URL_V2) $URLPAYBOX=$conf->global->PAYBOX_CGI_URL_V2;
+
+	if (empty($IBS_DEVISE))
+	{
+		dol_print_error('',"Paybox setup param PAYBOX_IBS_DEVISE not defined");
+		return -1;
+	}
+	if (empty($URLPAYBOX))
+	{
+		dol_print_error('',"Paybox setup param PAYBOX_CGI_URL_V1 and PAYBOX_CGI_URL_V2 undefined");
+		return -1;
+	}
+	if (empty($IBS_SITE))
+	{
+		dol_print_error('',"Paybox setup param PAYBOX_IBS_SITE not defined");
+		return -1;
+	}
+	if (empty($IBS_RANG))
+	{
+		dol_print_error('',"Paybox setup param PAYBOX_IBS_RANG not defined");
+		return -1;
+	}
+
+	// Definition des parametres vente produit pour paybox
+    $IBS_CMD=$TAG;
+    $IBS_TOTAL=$PRICE*100;     	// En centimes
+    $IBS_MODE=1;            	// Mode formulaire
+    $IBS_PORTEUR=$EMAIL;
+	$IBS_RETOUR="montant:M;ref:R;auto:A;trans:T";   // Format des parametres du get de validation en reponse (url a definir sous paybox)
+    $IBS_TXT=' ';	// Use a space
+    $IBS_BOUTPI=$langs->trans("Wait");
+    //$IBS_BOUTPI='';
+    $IBS_EFFECTUE=$urlok;
+    $IBS_ANNULE=$urlko;
+    $IBS_REFUSE=$urlko;
+    $IBS_BKGD="#FFFFFF";
+    $IBS_WAIT="2000";
+	$IBS_LANG="GBR"; 	// By default GBR=english (FRA, GBR, ESP, ITA et DEU...)
+	if (preg_match('/^FR/i',$langs->defaultlang)) $IBS_LANG="FRA";
+	if (preg_match('/^ES/i',$langs->defaultlang)) $IBS_LANG="ESP";
+	if (preg_match('/^IT/i',$langs->defaultlang)) $IBS_LANG="ITA";
+	if (preg_match('/^DE/i',$langs->defaultlang)) $IBS_LANG="DEU";
+	if (preg_match('/^NL/i',$langs->defaultlang)) $IBS_LANG="NLD";
+	if (preg_match('/^SE/i',$langs->defaultlang)) $IBS_LANG="SWE";
+	$IBS_OUTPUT='E';
+	$PBX_SOURCE='HTML';
+	$PBX_TYPEPAIEMENT='CARTE';
+
+    dol_syslog("Soumission Paybox", LOG_DEBUG);
+    dol_syslog("IBS_MODE: $IBS_MODE", LOG_DEBUG);
+    dol_syslog("IBS_SITE: $IBS_SITE", LOG_DEBUG);
+    dol_syslog("IBS_RANG: $IBS_RANG", LOG_DEBUG);
+    dol_syslog("IBS_TOTAL: $IBS_TOTAL", LOG_DEBUG);
+    dol_syslog("IBS_DEVISE: $IBS_DEVISE", LOG_DEBUG);
+    dol_syslog("IBS_CMD: $IBS_CMD", LOG_DEBUG);
+    dol_syslog("IBS_PORTEUR: $IBS_PORTEUR", LOG_DEBUG);
+    dol_syslog("IBS_RETOUR: $IBS_RETOUR", LOG_DEBUG);
+    dol_syslog("IBS_EFFECTUE: $IBS_EFFECTUE", LOG_DEBUG);
+    dol_syslog("IBS_ANNULE: $IBS_ANNULE", LOG_DEBUG);
+    dol_syslog("IBS_REFUSE: $IBS_REFUSE", LOG_DEBUG);
+    dol_syslog("IBS_BKGD: $IBS_BKGD", LOG_DEBUG);
+    dol_syslog("IBS_WAIT: $IBS_WAIT", LOG_DEBUG);
+    dol_syslog("IBS_LANG: $IBS_LANG", LOG_DEBUG);
+    dol_syslog("IBS_OUTPUT: $IBS_OUTPUT", LOG_DEBUG);
+    dol_syslog("PBX_IDENTIFIANT: $PBX_IDENTIFIANT", LOG_DEBUG);
+    dol_syslog("PBX_SOURCE: $PBX_SOURCE", LOG_DEBUG);
+    dol_syslog("PBX_TYPEPAIEMENT: $PBX_TYPEPAIEMENT", LOG_DEBUG);
+
+    header("Content-type: text/html; charset=".$conf->file->character_set_client);
+
+    print '<html>'."\n";
+    print '<head>'."\n";
+    print "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=".$conf->file->character_set_client."\">\n";
+    print '</head>'."\n";
+    print '<body>'."\n";
+    print "\n";
+
+    // Formulaire pour module Paybox
+    print '<form action="'.$URLPAYBOX.'" NAME="Submit" method="POST">'."\n";
+
+    // For Paybox V2 (PBX_xxx)
+    print '<!-- Param for Paybox v2 -->'."\n";
+    print '<input type="hidden" name="PBX_IDENTIFIANT" value="'.$PBX_IDENTIFIANT.'">'."\n";
+    print '<input type="hidden" name="PBX_MODE" value="'.$IBS_MODE.'">'."\n";
+    print '<input type="hidden" name="PBX_SITE" value="'.$IBS_SITE.'">'."\n";
+    print '<input type="hidden" name="PBX_RANG" value="'.$IBS_RANG.'">'."\n";
+    print '<input type="hidden" name="PBX_TOTAL" value="'.$IBS_TOTAL.'">'."\n";
+    print '<input type="hidden" name="PBX_DEVISE" value="'.$IBS_DEVISE.'">'."\n";
+    print '<input type="hidden" name="PBX_CMD" value="'.$IBS_CMD.'">'."\n";
+    print '<input type="hidden" name="PBX_PORTEUR" value="'.$IBS_PORTEUR.'">'."\n";
+    print '<input type="hidden" name="PBX_RETOUR" value="'.$IBS_RETOUR.'">'."\n";
+    print '<input type="hidden" name="PBX_EFFECTUE" value="'.$IBS_EFFECTUE.'">'."\n";
+    print '<input type="hidden" name="PBX_ANNULE" value="'.$IBS_ANNULE.'">'."\n";
+    print '<input type="hidden" name="PBX_REFUSE" value="'.$IBS_REFUSE.'">'."\n";
+    print '<input type="hidden" name="PBX_TXT" value="'.$IBS_TXT.'">'."\n";
+    print '<input type="hidden" name="PBX_BKGD" value="'.$IBS_BKGD.'">'."\n";
+    print '<input type="hidden" name="PBX_WAIT" value="'.$IBS_WAIT.'">'."\n";
+    print '<input type="hidden" name="PBX_LANGUE" value="'.$IBS_LANG.'">'."\n";
+    print '<input type="hidden" name="PBX_OUTPUT" value="'.$IBS_OUTPUT.'">'."\n";
+    print '<input type="hidden" name="PBX_SOURCE" value="'.$PBX_SOURCE.'">'."\n";
+    print '<input type="hidden" name="PBX_TYPEPAIEMENT" value="'.$PBX_TYPEPAIEMENT.'">'."\n";
+
+    print '</form>'."\n";
+
+
+    print "\n";
+    print '<script type="text/javascript" language="javascript">'."\n";
+    print '	document.Submit.submit();'."\n";
+    print '</script>'."\n";
+    print "\n";
+    print '</body></html>'."\n";
+    print "\n";
+
+	return;
+}
+
+
+/**
+ * Show footer of company in HTML pages
+ *
+ * @param   Societe		$fromcompany	Third party
+ * @param   Translate	$langs			Output language
+ * @return	void
+ */
+function html_print_stripe_footer($fromcompany,$langs)
+{
+	global $conf;
+
+	// Juridical status
+	$line1="";
+	if ($fromcompany->forme_juridique_code)
+	{
+		$line1.=($line1?" - ":"").getFormeJuridiqueLabel($fromcompany->forme_juridique_code);
+	}
+	// Capital
+	if ($fromcompany->capital)
+	{
+		$line1.=($line1?" - ":"").$langs->transnoentities("CapitalOf",$fromcompany->capital)." ".$langs->transnoentities("Currency".$conf->currency);
+	}
+	// Prof Id 1
+	if ($fromcompany->idprof1 && ($fromcompany->country_code != 'FR' || ! $fromcompany->idprof2))
+	{
+		$field=$langs->transcountrynoentities("ProfId1",$fromcompany->country_code);
+		if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
+		$line1.=($line1?" - ":"").$field.": ".$fromcompany->idprof1;
+	}
+	// Prof Id 2
+	if ($fromcompany->idprof2)
+	{
+		$field=$langs->transcountrynoentities("ProfId2",$fromcompany->country_code);
+		if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
+		$line1.=($line1?" - ":"").$field.": ".$fromcompany->idprof2;
+	}
+
+	// Second line of company infos
+	$line2="";
+	// Prof Id 3
+	if ($fromcompany->idprof3)
+	{
+		$field=$langs->transcountrynoentities("ProfId3",$fromcompany->country_code);
+		if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
+		$line2.=($line2?" - ":"").$field.": ".$fromcompany->idprof3;
+	}
+	// Prof Id 4
+	if ($fromcompany->idprof4)
+	{
+		$field=$langs->transcountrynoentities("ProfId4",$fromcompany->country_code);
+		if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
+		$line2.=($line2?" - ":"").$field.": ".$fromcompany->idprof4;
+	}
+	// IntraCommunautary VAT
+	if ($fromcompany->tva_intra != '')
+	{
+		$line2.=($line2?" - ":"").$langs->transnoentities("VATIntraShort").": ".$fromcompany->tva_intra;
+	}
+
+	print '<br><br><hr>'."\n";
+	print '<div class="center"><font style="font-size: 10px;">'."\n";
+	print $fromcompany->name.'<br>';
+	print $line1.'<br>';
+	print $line2;
+	print '</font></div>'."\n";
+}
+
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index c8b18c81987..ef9a08524b3 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -1361,7 +1361,7 @@ $mainmenuusedarray=array_unique(explode(',',$mainmenuused));
 
 $generic=1;
 // Put here list of menu entries when the div.mainmenu.menuentry was previously defined
-$divalreadydefined=array('home','companies','products','commercial','externalsite','accountancy','project','tools','members','agenda','ftp','holiday','hrm','bookmark','cashdesk','ecm','geoipmaxmind','gravatar','clicktodial','paypal','webservices','websites');
+$divalreadydefined=array('home','companies','products','commercial','externalsite','accountancy','project','tools','members','agenda','ftp','holiday','hrm','bookmark','cashdesk','ecm','geoipmaxmind','gravatar','clicktodial','paypal','stripe','webservices','websites');
 // Put here list of menu entries we are sure we don't want
 $divnotrequired=array('multicurrency','salaries','margin','opensurvey','paybox','expensereport','incoterm','prelevement','propal','workflow','notification','supplier_proposal','cron','product','productbatch','expedition');
 foreach($mainmenuusedarray as $val)
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index ad4ec25df1d..144df2d12f8 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -1371,7 +1371,7 @@ $mainmenuusedarray=array_unique(explode(',',$mainmenuused));
 
 $generic=1;
 // Put here list of menu entries when the div.mainmenu.menuentry was previously defined
-$divalreadydefined=array('home','companies','products','commercial','externalsite','accountancy','project','tools','members','agenda','ftp','holiday','hrm','bookmark','cashdesk','ecm','geoipmaxmind','gravatar','clicktodial','paypal','webservices','websites');
+$divalreadydefined=array('home','companies','products','commercial','externalsite','accountancy','project','tools','members','agenda','ftp','holiday','hrm','bookmark','cashdesk','ecm','geoipmaxmind','gravatar','clicktodial','paypal','stripe','webservices','websites');
 // Put here list of menu entries we are sure we don't want
 $divnotrequired=array('multicurrency','salaries','margin','opensurvey','paybox','expensereport','incoterm','prelevement','propal','workflow','notification','supplier_proposal','cron','product','productbatch','expedition');
 foreach($mainmenuusedarray as $val)

From de832d90a96693e35db3a618eedc183e93e0e754 Mon Sep 17 00:00:00 2001
From: atm-ph <phf@atm-consulting.fr>
Date: Sat, 25 Mar 2017 00:50:53 +0100
Subject: [PATCH 024/505] Refactoring

---
 htdocs/core/class/coreobject.class.php | 522 ++++++++++++++++---------
 1 file changed, 336 insertions(+), 186 deletions(-)

diff --git a/htdocs/core/class/coreobject.class.php b/htdocs/core/class/coreobject.class.php
index 312120c59bf..5619361547e 100644
--- a/htdocs/core/class/coreobject.class.php
+++ b/htdocs/core/class/coreobject.class.php
@@ -25,10 +25,8 @@
  
 require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
 
-class CoreObject extends CommonObject {
-	
-	public $db;
-	
+class CoreObject extends CommonObject
+{
 	public $withChild = true;
 	
 	public $error = '';
@@ -41,217 +39,326 @@ class CoreObject extends CommonObject {
 	 *
 	 *  @param      DoliDB		$db      Database handler
 	 */
-	function __construct(DoliDB &$db) {
-		
-
+	function __construct(DoliDB &$db)
+    {
+        $this->db = $db;
 	}
-	
-	protected function init() {
-		
+
+    /**
+     * Function to init fields
+     *
+     * @return bool
+     */
+	protected function init()
+    {
 		$this->id = 0;
 		$this->datec = 0;
 		$this->tms = 0;
 		
-		if(!empty($this->__fields)) {
-			foreach ($this->__fields as $field=>$info) {
-		
-		        if($this->is_date($info)){
-					$this->{$field} = time();
-		        }
-		        elseif($this->is_array($info)){
-					$this->{$field} = array();
-		        }
-		        elseif($this->is_int($info)){
-					$this->{$field} = (int)0;
-		        }
-		        elseif($this->is_float($info)) {
-					$this->{$field} = (double)0;
-				}
-		        else{
-					$this->{$field} = '';
-		        }
+		if (!empty($this->__fields))
+		{
+			foreach ($this->__fields as $field=>$info)
+			{
+		        if ($this->is_date($info)) $this->{$field} = time();
+		        elseif ($this->is_array($info)) $this->{$field} = array();
+		        elseif ($this->is_int($info)) $this->{$field} = (int) 0;
+		        elseif ($this->is_float($info)) $this->{$field} = (double) 0;
+				else $this->{$field} = '';
 		    }
-			
-		    $this->to_delete=false;
+
+            $this->to_delete=false;
+            $this->is_clone=false;
 			
 			return true;
 		}
-		else{
+		else
+        {
 			return false;
 		}
 			
 	}
-	
-	private function checkFieldType($field, $type) {
-		
-		if( isset($this->__fields[$field]) && method_exists($this, 'is_'.$type)) {
+
+    /**
+     * Test type of field
+     *
+     * @param   string  $field  name of field
+     * @param   string  $type   type of field to test
+     * @return                  value of field or false
+     */
+    private function checkFieldType($field, $type)
+    {
+		if (isset($this->__fields[$field]) && method_exists($this, 'is_'.$type))
+		{
 			return $this->{'is_'.$type}($this->__fields[$field]);
 		}
-		else return false;
-		
+		else
+        {
+            return false;
+        }
 	}
-	
-	private function is_date(Array &$info){
-	
+
+    /**
+     * Function test if type is date
+     *
+     * @param   array   $info   content informations of field
+     * @return                  bool
+     */
+    private function is_date($info)
+    {
 		if(isset($info['type']) && $info['type']=='date') return true;
 		else return false;
-		
 	}
-	
-	private function is_array($info) {
-		
-	  	if(is_array($info)) {
+
+    /**
+     * Function test if type is array
+     *
+     * @param   array   $info   content informations of field
+     * @return                  bool
+     */
+	private function is_array($info)
+    {
+	  	if(is_array($info))
+	  	{
 			if(isset($info['type']) && $info['type']=='array') return true;
 			else return false;
 		}
 		else return false;
 	}
-	
-	
-	private function is_null($info){
-		if(is_array($info)) {
+
+    /**
+     * Function test if type is null
+     *
+     * @param   array   $info   content informations of field
+     * @return                  bool
+     */
+	private function is_null($info)
+    {
+		if(is_array($info))
+		{
 			if(isset($info['type']) && $info['type']=='null') return true;
 			else return false;
 		}
 		else return false;
 	}
-	
-	private function is_int($info){
-	
-		if(is_array($info)) {
+
+    /**
+     * Function test if type is integer
+     *
+     * @param   array   $info   content informations of field
+     * @return                  bool
+     */
+	private function is_int($info)
+    {
+		if(is_array($info))
+		{
 			if(isset($info['type']) && ($info['type']=='int' || $info['type']=='integer' )) return true;
 			else return false;
 		}
 		else return false;
 	}
-	private function is_float($info){
-		if(is_array($info)) {
+
+    /**
+     * Function test if type is float
+     *
+     * @param   array   $info   content informations of field
+     * @return                  bool
+     */
+	private function is_float($info)
+    {
+		if(is_array($info))
+		{
 			if(isset($info['type']) && $info['type']=='float') return true;
 			else return false;
-		} else return false;
+		}
+		else return false;
 	}
-	
-	private function is_text($info){
-	  	if(is_array($info)) {
+
+    /**
+     * Function test if type is text
+     *
+     * @param   array   $info   content informations of field
+     * @return                  bool
+     */
+	private function is_text($info)
+    {
+	  	if(is_array($info))
+	  	{
 			if(isset($info['type']) && $info['type']=='text') return true;
 			else return false;
-		} else return false;
+		}
+		else return false;
 	}
-	private function is_index($info){
-	  	if(is_array($info)) {
+
+    /**
+     * Function test if is indexed
+     *
+     * @param   array   $info   content informations of field
+     * @return                  bool
+     */
+	private function is_index($info)
+    {
+	  	if(is_array($info))
+	  	{
 			if(isset($info['index']) && $info['index']==true) return true;
 			else return false;
-		} else return false;
+		}
+		else return false;
 	}
-		
-	private function set_save_query(){
-		
+
+
+    /**
+     * Function to prepare the values to insert
+     *
+     * @return array
+     */
+    private function set_save_query()
+    {
 		$query=array();
-		
-		foreach ($this->__fields as $field=>$info) {
-	
-			if($this->is_date($info)){
-				if(empty($this->{$field})){
+		foreach ($this->__fields as $field=>$info)
+		{
+			if($this->is_date($info))
+			{
+				if(empty($this->{$field}))
+				{
 					$query[$field] = NULL;
 				}
-				else{
+				else
+                {
 					$query[$field] = $this->db->idate($this->{$field});
 				}
 		  	}
-		  	else if($this->is_array($info)){
-		  		    $query[$field] = serialize($this->{$field});
+		  	else if($this->is_array($info))
+		  	{
+                $query[$field] = serialize($this->{$field});
 		  	}
-		
-		  	else if($this->is_int($info)){
-		    	$query[$field] = (int)price2num($this->{$field});
+		  	else if($this->is_int($info))
+		  	{
+		    	$query[$field] = (int) price2num($this->{$field});
 		  	}
-		
-		  	else if($this->is_float($info)){
-		    	$query[$field] = (double)price2num($this->{$field});
+		  	else if($this->is_float($info))
+		  	{
+		    	$query[$field] = (double) price2num($this->{$field});
 		  	}
-		
-		  	elseif($this->is_null($info)) {
-		  		$query[$field] = (is_null($this->{$field}) || (empty($this->{$field}) && $this->{$field}!==0 && $this->{$field}!=='0')?null:$this->{$field});
+		  	elseif($this->is_null($info))
+            {
+		  		$query[$field] = (is_null($this->{$field}) || (empty($this->{$field}) && $this->{$field}!==0 && $this->{$field}!=='0') ? null : $this->{$field});
 		    }
-		    else{
+		    else
+            {
 		       $query[$field] = $this->{$field};
 		    }
-		
 	    }
 	
 		return $query;
 	}
-		
-	private function get_field_list(){
-			
+
+
+    /**
+     * Function to concat keys of fields
+     *
+     * @return string
+     */
+    private function get_field_list()
+    {
 		$keys = array_keys($this->__fields);
-		
 	    return implode(',', $keys);
 	}
-	
-	private function set_vars_by_db(&$obj){
 
-		foreach ($this->__fields as $field=>$info) {
-			if($this->is_date($info)){
-				if(empty($obj->{$field}) || $obj->{$field} === '0000-00-00 00:00:00' || $obj->{$field} === '1000-01-01 00:00:00')$this->{$field} = 0;
+
+    /**
+     * Function to load data into current object this
+     *
+     * @param   stdClass    $obj    Contain data of object from database
+     */
+    private function set_vars_by_db(&$obj)
+    {
+		foreach ($this->__fields as $field => $info)
+		{
+			if($this->is_date($info))
+			{
+				if(empty($obj->{$field}) || $obj->{$field} === '0000-00-00 00:00:00' || $obj->{$field} === '1000-01-01 00:00:00') $this->{$field} = 0;
 				else $this->{$field} = strtotime($obj->{$field});
 			}
-			elseif($this->is_array($info)){
+			elseif($this->is_array($info))
+            {
 				$this->{$field} = @unserialize($obj->{$field});
-				//HACK POUR LES DONNES NON UTF8
-				if($this->{$field}===FALSE)@unserialize(utf8_decode($obj->{$field}));
+				// Hack for data not in UTF8
+				if($this->{$field } === FALSE) @unserialize(utf8_decode($obj->{$field}));
 			}
-			elseif($this->is_int($info)){
+			elseif($this->is_int($info))
+            {
 				$this->{$field} = (int)$obj->{$field};
 			}
-			elseif($this->is_float($info)){
+			elseif($this->is_float($info))
+            {
 				$this->{$field} = (double)$obj->{$field};
 			}
-			elseif($this->is_null($info)){
+			elseif($this->is_null($info))
+            {
 				$val = $obj->{$field};
 				// zero is not null 
-				$this->{$field} = (is_null($val) || (empty($val) && $val!==0 && $val!=='0')?null:$val);
+				$this->{$field} = (is_null($val) || (empty($val) && $val!==0 && $val!=='0') ? null : $val);
 			}
-			else{
+			else
+            {
 				$this->{$field} = $obj->{$field};
 			}
 
 		}
 	}
-	
-	public function fetch($id, $loadChild = true) {
+
+    /**
+     *	Get object and children from database
+     *
+     *	@param      int			$id       		Id of object to load
+     * 	@param		bool		$loadChild		used to load children from database
+     *	@return     int         				>0 if OK, <0 if KO, 0 if not found
+     */
+	public function fetch($id, $loadChild = true)
+    {
+		if (empty($id)) return false;
+
+		$sql = 'SELECT '.$this->get_field_list().', datec, tms';
+		$sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element;
+        $sql.= ' WHERE rowid = '.$id;
 		
-		if(empty($id)) return false;
+		$res = $this->db->query($sql);
+		if($obj = $this->db->fetch_object($res))
+		{
+            $this->id = $id;
+            $this->set_vars_by_db($obj);
 
-		$sql = 'SELECT '.$this->get_field_list().',datec,tms
-						FROM '.MAIN_DB_PREFIX.$this->table_element.'
-						WHERE rowid='.$id;
-		
-		$res = $this->db->query( $sql );
-		if($obj = $this->db->fetch_object($res)) {
-				$this->id=$id;
-			
-				$this->set_vars_by_db($obj);
+            $this->datec = $this->db->idate($obj->datec);
+            $this->tms = $this->db->idate($obj->tms);
 
-				$this->datec=$this->db->idate($obj->datec);
-				$this->tms=$this->db->idate($obj->tms);
-				
-				if($loadChild) $this->fetchChild();
+            if ($loadChild) $this->fetchChild();
 
-				return $this->id;
+            return $this->id;
 		}
-		else {
-				$this->error = $this->db->lasterror();
-				
-				return false;
+		else
+        {
+            $this->error = $this->db->lasterror();
+            return false;
 		}
-		
 	}
-	public function addChild($tabName, $id='', $key='id', $try_to_load = false) {
-		if(!empty($id)) {
-			foreach($this->{$tabName} as $k=>&$object) {
+
+
+    /**
+     * Function to instantiate a new child
+     *
+     * @param   string  $tabName        Table name of child
+     * @param   int     $id             If id is given, we try to return his key if exist or load if we try_to_load
+     * @param   string  $key            Attribute name of the object id
+     * @param   bool    $try_to_load    Force the fetch if an id is given
+     * @return                          int
+     */
+    public function addChild($tabName, $id=0, $key='id', $try_to_load = false)
+    {
+		if(!empty($id))
+		{
+			foreach($this->{$tabName} as $k=>&$object)
+			{
 				if($object->{$key} === $id) return $k;
-	
 			}
 		}
 	
@@ -259,28 +366,39 @@ class CoreObject extends CommonObject {
 	
 		$className = ucfirst($tabName);
 		$this->{$tabName}[$k] = new $className($this->db);
-		if($id>0 && $key==='id' && $try_to_load) { 
+		if($id>0 && $key==='id' && $try_to_load)
+		{
 			$this->{$tabName}[$k]->fetch($id); 
 		}
-	
-	
+
 		return $k;
 	}
-	
-	public function removeChild($tabName, $id, $key='id') {
-		foreach($this->{$tabName} as &$object) {
-	
-			if($object->{$key} == $id) {
+
+
+    /**
+     * Function to set a child as to delete
+     *
+     * @param   string  $tabName        Table name of child
+     * @param   int     $id             Id of child to set as to delete
+     * @param   string  $key            Attribute name of the object id
+     * @return                          bool
+     */
+    public function removeChild($tabName, $id, $key='id')
+    {
+		foreach ($this->{$tabName} as &$object)
+		{
+			if ($object->{$key} == $id)
+			{
 				$object->to_delete = true;
 				return true;
 			}
-	
-	
 		}
 		return false;
 	}
-	
-	public function fetchChild() {
+
+
+	public function fetchChild()
+    {
 
 		if($this->withChild && !empty($this->childtables) && !empty($this->fk_element)) {
 			foreach($this->childtables as &$childTable) {
@@ -390,76 +508,108 @@ class CoreObject extends CommonObject {
 		}
 	
 	}
-	public function delete(User &$user){
-		if($this->id>0){
-			$this->call_trigger(strtoupper($this->element). '_DELETE', $user);
-			
-			$this->db->delete($this->table_element,array('rowid'=>$this->id),array('rowid'));
-			
-			if($this->withChild && !empty($this->childtables)) {
-				foreach($this->childtables as &$childTable) {
-						
-					$className = ucfirst($childTable);
-					if(!empty($this->{$className})) {
-						foreach($this->{$className} as &$object) {
-				
-							$object->delete($user);
-				
-						}
-					}
-			
-				}
-			}
-			
-		
-			
+	public function delete(User &$user)
+    {
+		if($this->id>0)
+		{
+            $error = 0;
+
+            $result = $this->call_trigger(strtoupper($this->element). '_DELETE', $user);
+            if ($result < 0) $error++;
+
+
+            if (!$error)
+            {
+                $this->db->delete($this->table_element, array('rowid'=>$this->id), array('rowid'));
+
+                if($this->withChild && !empty($this->childtables))
+                {
+                    foreach($this->childtables as &$childTable)
+                    {
+                        $className = ucfirst($childTable);
+                        if (!empty($this->{$className}))
+                        {
+                            foreach($this->{$className} as &$object)
+                            {
+                                $object->delete($user);
+                            }
+                        }
+                    }
+                }
+            }
+
 		}
-	
-		
-	
 	}
-	public function get_date($field,$format='') {
+
+
+    /**
+     * Function to get a formatted date
+     *
+     * @param   string  $field  Attribute to return
+     * @param   string  $format Output date format
+     * @return          string
+     */
+    public function get_date($field, $format='')
+    {
 		if(empty($this->{$field})) return '';
-		else {
+		else
+        {
 			
 			return dol_print_date($this->{$field}, $format);
 		}
-	
 	}
-	
-	public function set_date($field,$date){
 
-	  	if(empty($date)) {
+    /**
+     * Function to set date in field
+     *
+     * @param   string  $field  field to set
+     * @param   string  $date   formatted date to convert
+     * @return                  mixed
+     */
+    public function set_date($field, $date)
+    {
+	  	if (empty($date))
+	  	{
 	  		$this->{$field} = 0;
 	  	}
-		else {
+		else
+        {
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 			$this->{$field} = dol_stringtotime($date);
 		}
 
 		return $this->{$field};
 	}
-	
-	public function set_values(&$Tab) {
-		
-		foreach ($Tab as $key=>$value) {
-	
-			if($this->checkFieldType($key,'date')) {
+
+
+    /**
+     * Function to update current object
+     *
+     * @param   array   $Tab    Array of values
+     */
+    public function set_values(&$Tab)
+    {
+		foreach ($Tab as $key => $value)
+		{
+			if($this->checkFieldType($key, 'date'))
+			{
 				$this->set_date($key, $value);
 			}
-			else if( $this->checkFieldType($key,'array')){
+			else if( $this->checkFieldType($key, 'array'))
+			{
 				$this->{$key} = $value;
 			}
-			else if( $this->checkFieldType($key,'float') ) {
-				$this->{$key} = (double)price2num($value);
+			else if( $this->checkFieldType($key, 'float') )
+			{
+				$this->{$key} = (double) price2num($value);
 			}
-			else if( $this->checkFieldType($key,'int') ) {
-				$this->{$key} = (int)price2num($value);
+			else if( $this->checkFieldType($key, 'int') ) {
+				$this->{$key} = (int) price2num($value);
 			}
-			else {
+			else
+            {
 				$this->{$key} = @stripslashes($value);
 			}
-			
 		}
 	}
 	

From 269645dfc77143daca1b1f46771460bf3627f6e3 Mon Sep 17 00:00:00 2001
From: atm-ph <phf@atm-consulting.fr>
Date: Sat, 25 Mar 2017 10:48:06 +0100
Subject: [PATCH 025/505] Add method documentations

---
 htdocs/core/class/coreobject.class.php | 280 +++++++++++++++----------
 1 file changed, 172 insertions(+), 108 deletions(-)

diff --git a/htdocs/core/class/coreobject.class.php b/htdocs/core/class/coreobject.class.php
index 5619361547e..92597b40ffd 100644
--- a/htdocs/core/class/coreobject.class.php
+++ b/htdocs/core/class/coreobject.class.php
@@ -28,13 +28,23 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
 class CoreObject extends CommonObject
 {
 	public $withChild = true;
-	
+
+    /**
+     * @var string 		Error string
+     */
 	public $error = '';
-	/*
+
+    /**
+     * @var string[]	Array of error strings
+     */
+    public $errors=array();
+
+	/**
 	 *  @var Array $_fields Fields to synchronize with Database
 	 */
 	protected $__fields=array();
-	 /**
+
+    /**
 	 *  Constructor
 	 *
 	 *  @param      DoliDB		$db      Database handler
@@ -338,6 +348,7 @@ class CoreObject extends CommonObject
 		else
         {
             $this->error = $this->db->lasterror();
+            $this->errors[] = $this->error;
             return false;
 		}
 	}
@@ -397,148 +408,202 @@ class CoreObject extends CommonObject
 	}
 
 
-	public function fetchChild()
+    /**
+     * Function to fetch children objects
+     */
+    public function fetchChild()
     {
+		if($this->withChild && !empty($this->childtables) && !empty($this->fk_element))
+		{
+			foreach($this->childtables as &$childTable)
+			{
+                $className = ucfirst($childTable);
 
-		if($this->withChild && !empty($this->childtables) && !empty($this->fk_element)) {
-			foreach($this->childtables as &$childTable) {
-					
-					$className = ucfirst($childTable);
-					
-					$this->{$className}=array();
-					
-					$sql = " SELECT rowid FROM ".MAIN_DB_PREFIX.$childTable." WHERE ".$this->fk_element."=".$this->id;
-					$res = $this->db->query($sql);
-					
-					if($res) {
-						$Tab=array();
-						while($obj = $this->db->fetch_object($res)) {
-							
-							$o=new $className($this->db);	
-							$o->fetch($obj->rowid);
-							
-							$this->{$className}[] = $o;
-							
-						}
-						
-					}
+                $this->{$className}=array();
 
+                $sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.$childTable.' WHERE '.$this->fk_element.' = '.$this->id;
+                $res = $this->db->query($sql);
+
+                if($res)
+                {
+                    while($obj = $this->db->fetch_object($res))
+                    {
+                        $o=new $className($this->db);
+                        $o->fetch($obj->rowid);
+
+                        $this->{$className}[] = $o;
+                    }
+                }
+                else
+                {
+                    $this->errors[] = $this->db->lasterror();
+                }
 			}
-
 		}
-
 	}
-	
-	public function saveChild(User &$user) {
-	
-		if($this->withChild && !empty($this->childtables) && !empty($this->fk_element)) {
-			foreach($this->childtables as &$childTable) {
-	
+
+    /**
+     * Function to update children data
+     *
+     * @param   User    $user   user object
+     */
+	public function saveChild(User &$user)
+    {
+		if($this->withChild && !empty($this->childtables) && !empty($this->fk_element))
+		{
+			foreach($this->childtables as &$childTable)
+			{
 				$className = ucfirst($childTable);
-				if(!empty($this->{$className})) {
-					foreach($this->{$className} as $i => &$object) {
-		
+				if(!empty($this->{$className}))
+				{
+					foreach($this->{$className} as $i => &$object)
+					{
 						$object->{$this->fk_element} = $this->id;
 						
 						$object->update($user);
 						if($this->unsetChildDeleted && isset($object->to_delete) && $object->to_delete==true) unset($this->{$className}[$i]);
 					}
 				}
-	
 			}
 		}
 	}
-	public function update(User &$user) {
-		if(empty($this->id )) return $this->create($user); // To test, with that, no need to test on high level object, the core decide it, update just needed
-		
-		if(isset($this->to_delete) && $this->to_delete==true) {
-			$this->delete($user);
-		}
-		else {
-		
-			$query = array();
-			
-			$query = $this->set_save_query();
-			$query['rowid']=$this->id;
-				
-			$res = $this->db->update($this->table_element,$query,array('rowid'));
-			
-			if($res) {
-			
-				$result = $this->call_trigger(strtoupper($this->element). '_UPDATE', $user);
-				
-				$this->saveChild($user);
-			
-				return true;
-			}
-			else{
-				$this->error = $this->db->lasterror();
-				
-				return false;
-			}
-		
-		}
-		return $this->id;
-		
-		
+
+
+    /**
+     * Function to update object or create or delete if needed
+     *
+     * @param   User    $user   user object
+     * @return                  < 0 if ko, > 0 if ok
+     */
+    public function update(User &$user)
+    {
+		if (empty($this->id)) return $this->create($user); // To test, with that, no need to test on high level object, the core decide it, update just needed
+        elseif (isset($this->to_delete) && $this->to_delete==true) return $this->delete($user);
+
+        $error = 0;
+        $this->db->begin();
+
+        $query = $this->set_save_query();
+        $query['rowid'] = $this->id;
+
+        $res = $this->db->update($this->table_element, $query, array('rowid'));
+        if ($res)
+        {
+            $result = $this->call_trigger(strtoupper($this->element). '_UPDATE', $user);
+            if ($result < 0) $error++;
+            else $this->saveChild($user);
+        }
+        else
+        {
+            $error++;
+            $this->error = $this->db->lasterror();
+            $this->errors[] = $this->error;
+        }
+
+        if (empty($error))
+        {
+            $this->db->commit();
+            return $this->id;
+        }
+        else
+        {
+            $this->db->rollback();
+            return -1;
+        }
+
 	}
-	public function create(User &$user) {
-		if($this->id>0) return $this->update($user);
-		
-		$query = array();
+
+    /**
+     * Function to create object in database
+     *
+     * @param   User    $user   user object
+     * @return                  < 0 if ko, > 0 if ok
+     */
+    public function create(User &$user)
+    {
+		if($this->id > 0) return $this->update($user);
+
+        $error = 0;
+        $this->db->begin();
+
 		$query = $this->set_save_query();
-		$query['datec'] = date("Y-m-d H:i:s",$this->datec);
+		$query['datec'] = date("Y-m-d H:i:s", $this->datec);
 		
-		$res = $this->db->insert($this->table_element,$query);
-	
-		if($res) {
+		$res = $this->db->insert($this->table_element, $query);
+		if($res)
+		{
 			$this->id = $this->db->last_insert_id($this->table_element);
-			
+
 			$result = $this->call_trigger(strtoupper($this->element). '_CREATE', $user);
-			
-			$this->saveChild($user);
-			
-			return $this->id;
+            if ($result < 0) $error++;
+            else $this->saveChild($user);
 		}
-		else{
-			
-			$this->error = $this->db->lasterror();
-			
-			return false;
+		else
+        {
+            $error++;
+            $this->error = $this->db->lasterror();
+            $this->errors[] = $this->error;
 		}
-	
+
+        if (empty($error))
+        {
+            $this->db->commit();
+            return $this->id;
+        }
+        else
+        {
+            $this->db->rollback();
+            return -1;
+        }
 	}
+
+    /**
+     * Function to delete object in database
+     *
+     * @param   User    $user   user object
+     * @return                  < 0 if ko, > 0 if ok
+     */
 	public function delete(User &$user)
     {
-		if($this->id>0)
-		{
-            $error = 0;
+		if ($this->id <= 0) return 0;
 
-            $result = $this->call_trigger(strtoupper($this->element). '_DELETE', $user);
-            if ($result < 0) $error++;
+        $error = 0;
+        $this->db->begin();
 
+        $result = $this->call_trigger(strtoupper($this->element). '_DELETE', $user);
+        if ($result < 0) $error++;
 
-            if (!$error)
+        if (!$error)
+        {
+            $this->db->delete($this->table_element, array('rowid' => $this->id), array('rowid'));
+            if($this->withChild && !empty($this->childtables))
             {
-                $this->db->delete($this->table_element, array('rowid'=>$this->id), array('rowid'));
-
-                if($this->withChild && !empty($this->childtables))
+                foreach($this->childtables as &$childTable)
                 {
-                    foreach($this->childtables as &$childTable)
+                    $className = ucfirst($childTable);
+                    if (!empty($this->{$className}))
                     {
-                        $className = ucfirst($childTable);
-                        if (!empty($this->{$className}))
+                        foreach($this->{$className} as &$object)
                         {
-                            foreach($this->{$className} as &$object)
-                            {
-                                $object->delete($user);
-                            }
+                            $object->delete($user);
                         }
                     }
                 }
             }
+        }
 
-		}
+        if (empty($error))
+        {
+            $this->db->commit();
+            return 1;
+        }
+        else
+        {
+            $this->error = $this->db->lasterror();
+            $this->errors[] = $this->error;
+            $this->db->rollback();
+            return -1;
+        }
 	}
 
 
@@ -554,7 +619,6 @@ class CoreObject extends CommonObject
 		if(empty($this->{$field})) return '';
 		else
         {
-			
 			return dol_print_date($this->{$field}, $format);
 		}
 	}

From ae33e40dc872f1d37f99df04e0d1cd2413a413ea Mon Sep 17 00:00:00 2001
From: atm-ph <phf@atm-consulting.fr>
Date: Sat, 25 Mar 2017 17:32:42 +0100
Subject: [PATCH 026/505] Refactoring and add method comments

---
 htdocs/core/class/coreobject.class.php     |  15 +-
 htdocs/inventory/class/inventory.class.php | 567 +++++++++++++--------
 2 files changed, 370 insertions(+), 212 deletions(-)

diff --git a/htdocs/core/class/coreobject.class.php b/htdocs/core/class/coreobject.class.php
index 92597b40ffd..ec6442c2302 100644
--- a/htdocs/core/class/coreobject.class.php
+++ b/htdocs/core/class/coreobject.class.php
@@ -29,16 +29,6 @@ class CoreObject extends CommonObject
 {
 	public $withChild = true;
 
-    /**
-     * @var string 		Error string
-     */
-	public $error = '';
-
-    /**
-     * @var string[]	Array of error strings
-     */
-    public $errors=array();
-
 	/**
 	 *  @var Array $_fields Fields to synchronize with Database
 	 */
@@ -349,7 +339,7 @@ class CoreObject extends CommonObject
         {
             $this->error = $this->db->lasterror();
             $this->errors[] = $this->error;
-            return false;
+            return -1;
 		}
 	}
 
@@ -650,6 +640,7 @@ class CoreObject extends CommonObject
      * Function to update current object
      *
      * @param   array   $Tab    Array of values
+     * @return                  int
      */
     public function set_values(&$Tab)
     {
@@ -675,6 +666,8 @@ class CoreObject extends CommonObject
 				$this->{$key} = @stripslashes($value);
 			}
 		}
+
+		return 1;
 	}
 	
 }
diff --git a/htdocs/inventory/class/inventory.class.php b/htdocs/inventory/class/inventory.class.php
index 344252f4dc4..05996d02489 100644
--- a/htdocs/inventory/class/inventory.class.php
+++ b/htdocs/inventory/class/inventory.class.php
@@ -26,7 +26,6 @@ require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 
 class Inventory extends CoreObject
 {
-	
 	public $element='inventory';
 	public $table_element='inventory';
 	public $fk_element='fk_inventory';
@@ -60,7 +59,11 @@ class Inventory extends CoreObject
 	 * @var string
 	 */
 	public $title;
-	
+
+    /**
+     * Attribute object linked with database
+     * @var array
+     */
 	protected $__fields=array(
 		'fk_warehouse'=>array('type'=>'integer','index'=>true)
 		,'entity'=>array('type'=>'integer','index'=>true)
@@ -68,58 +71,70 @@ class Inventory extends CoreObject
 		,'date_inventory'=>array('type'=>'date')
 		,'title'=>array('type'=>'string')
 	);
-	
-	public $db;
-	
+
+    /**
+     *  Constructor
+     *
+     *  @param      DoliDB		$db      Database handler
+     */
 	public function __construct(DoliDB &$db) 
 	{
 		global $conf;
-		
-		$this->db = &$db;
-		
+
+        parent::__construct($db);
 		parent::init();
 		
        	$this->status = 0;
 		$this->entity = $conf->entity;
 		$this->errors = array();
 		$this->amount = 0;
-		
 	}
-	
+
+    /**
+     * Function to sort children object
+     */
 	public function sort_det() 
 	{
-
 		if(!empty($this->Inventorydet))	usort($this->Inventorydet, array('Inventory', 'customSort'));
 	}
-	
-	public function fetch($id,$annexe = true) 
+
+    /**
+     *	Get object and children from database
+     *
+     *	@param      int			$id       		Id of object to load
+     * 	@param		bool		$loadChild		used to load children from database
+     *	@return     int         				>0 if OK, <0 if KO, 0 if not found
+     */
+	public function fetch($id, $loadChild = true)
 	{
-	    
-        if(!$annexe) $this->withChild = false;
+        if(!$loadChild) $this->withChild = false;
         
-		$res = parent::fetch($id);
-		
-		if($res>0) {
+		$res = parent::fetch($id, $loadChild);
+		if($res > 0)
+		{
 			$this->sort_det();
-			
 			$this->amount = 0;
-			
-			if(!empty($this->Inventorydet ))  {
-				foreach($this->Inventorydet as &$det){
-					$this->amount+=$det->qty_view * $det->pmp;
+			if(!empty($this->Inventorydet ))
+			{
+				foreach($this->Inventorydet as &$det)
+				{
+					$this->amount += $det->qty_view * $det->pmp;
 				}
-				
 			}
 		}
 				
 		return $res;
 	}
-	
-	
+
+    /**
+     * Custom function call by usort
+     *
+     * @param   Inventorydet    $objA   first Inventorydet object
+     * @param   Inventorydet    $objB   second Inventorydet object
+     * @return                          int
+     */
 	private function customSort(&$objA, &$objB)
 	{
-		global $db;
-		
 		$r = strcmp(strtoupper(trim($objA->product->ref)), strtoupper(trim($objB->product->ref)));
 		
 		if ($r < 0) $r = -1;
@@ -128,42 +143,109 @@ class Inventory extends CoreObject
 		
 		return $r;
 	}
-	
-	public function changePMP(User &$user) {
-		if(!empty($this->Inventorydet)) {
+
+    /**
+     * @param   User    $user   user object
+     * @return                  int
+     */
+    public function changePMP(User &$user)
+    {
+        $error = 0;
+        $this->db->begin();
+
+		if(!empty($this->Inventorydet))
+		{
 			foreach ($this->Inventorydet as $k => &$Inventorydet)
 			{
-				
-				if($Inventorydet->new_pmp>0) {
+				if($Inventorydet->new_pmp>0)
+				{
 					$Inventorydet->pmp = $Inventorydet->new_pmp; 
 					$Inventorydet->new_pmp = 0;
 				
-					$this->db->query("UPDATE ".MAIN_DB_PREFIX."product as p SET pmp = ".$Inventorydet->pmp."
-					WHERE rowid = ".$Inventorydet->fk_product );
-					
+					$res = $this->db->query('UPDATE '.MAIN_DB_PREFIX.'product as p SET pmp = '.$Inventorydet->pmp.' WHERE rowid = '.$Inventorydet->fk_product );
+					if (!$res)
+                    {
+                        $error++;
+                        $this->error = $this->db->lasterror();
+                        $this->errors[] = $this->db->lasterror();
+                    }
 				}
 			}
 		}
 		
-		return parent::update($user);
-		
+		$res = parent::update($user);
+        if (!$res)
+        {
+            $error++;
+            $this->error = $this->db->lasterror();
+            $this->errors[] = $this->db->lasterror();
+        }
+
+
+        if (!$error)
+        {
+            $this->db->commit();
+            return 1;
+        }
+        else
+        {
+            $this->db->rollback();
+            return -1;
+        }
 	}
-	
+
+    /**
+     * Function to update object or create or delete if needed
+     *
+     * @param   User    $user   user object
+     * @return                  < 0 if ko, > 0 if ok
+     */
 	public function update(User &$user)
 	{
-		
-		//si on valide l'inventaire on sauvegarde le stock à cette instant
+		$error = 0;
+		$this->db->begin();
+
+        // if we valid the inventory we save the stock at the same time
 		if ($this->status)
 		{
-			 $this->regulate();
+		    $res = $this->regulate();
+            if ($res < 0)
+            {
+                $error++;
+                $this->error = $this->db->lasterror();
+                $this->errors[] = $this->db->lasterror();
+            }
 		}
-		
-		parent::update($user);
+
+        $res = parent::update($user);
+        if (!$res)
+        {
+            $error++;
+            $this->error = $this->db->lasterror();
+            $this->errors[] = $this->db->lasterror();
+        }
+
+		if (!$error)
+        {
+            $this->db->commit();
+            return $this->id;
+        }
+        else
+        {
+            $this->db->rollback();
+            return -1;
+        }
 	}
-	
+
+    /**
+     * Function to update current object
+     *
+     * @param   array   $Tab    Array of values
+     * @return                  int
+     */
 	public function set_values(&$Tab)
 	{
-		global $db,$langs;
+		global $langs;
 		
 		if (isset($Tab['qty_to_add']))
 		{
@@ -174,10 +256,10 @@ class Inventory extends CoreObject
 				if ($qty < 0) 
 				{
 					$this->errors[] = $langs->trans('inventoryErrorQtyAdd');
-					return 0;
+					return -1;
 				} 
 				
-				$product = new Product($db);
+				$product = new Product($this->db);
 				$product->fetch($this->Inventorydet[$k]->fk_product);
 				
 				$this->Inventorydet[$k]->pmp = $product->pmp;
@@ -185,47 +267,73 @@ class Inventory extends CoreObject
 			}	
 		}
 		
-		parent::set_values($Tab);
+		return parent::set_values($Tab);
 	}
-	
-    public function deleteAllLine(User &$user) {
-        
-        foreach($this->Inventorydet as &$det) {
+
+    /**
+     * Function to delete all Inventorydet
+     *
+     * @param   User    $user   user object
+     * @return                  < 0 if ko, > 0 if ok
+     */
+    public function deleteAllLine(User &$user)
+    {
+        foreach($this->Inventorydet as &$det)
+        {
             $det->to_delete = true;
         }
         
-        $this->update($user);
-      
-        $this->Inventorydet=array();
-        
+        $res = $this->update($user);
+
+        if ($res > 0) $this->Inventorydet = array();
+        else return -1;
     }
-    
-    public function add_product($fk_product, $fk_entrepot='') {
-        
+
+    /**
+     * Function to add Inventorydet
+     *
+     * @param   int     $fk_product     fk_product of Inventorydet
+     * @param   int     $fk_warehouse   fk_warehouse target
+     * @return                          bool
+     */
+    public function add_product($fk_product, $fk_warehouse=0)
+    {
         $k = $this->addChild('Inventorydet');
         $det =  &$this->Inventorydet[$k];
         
         $det->fk_inventory = $this->id;
         $det->fk_product = $fk_product;
-		$det->fk_warehouse = empty($fk_entrepot) ? $this->fk_warehouse : $fk_entrepot;
+		$det->fk_warehouse = empty($fk_warehouse) ? $this->fk_warehouse : $fk_warehouse;
         
         $det->load_product();
                 
         $date = $this->get_date('date_inventory', 'Y-m-d');
-        if(empty($date))$date = $this->get_date('datec', 'Y-m-d'); 
-        $det->setStockDate( $date , $fk_entrepot);
+        if(empty($date)) $date = $this->get_date('datec', 'Y-m-d');
+        $det->setStockDate( $date , $fk_warehouse);
         
         return true;
     }
-    
+
+    /**
+     *  Duplication method product to add datem
+     *  Adjust stock in a warehouse for product
+     *
+     *  @param  	int     $fk_product     id of product
+     *  @param  	int		$fk_warehouse   id of warehouse
+     *  @param  	double	$nbpiece        nb of units
+     *  @param  	int		$movement       0 = add, 1 = remove
+     * 	@param		string	$label			Label of stock movement
+     * 	@param		double	$price			Unit price HT of product, used to calculate average weighted price (PMP in french). If 0, average weighted price is not changed.
+     *  @param		string	$inventorycode	Inventory code
+     * 	@return     int     				<0 if KO, >0 if OK
+     */
     public function correct_stock($fk_product, $fk_warehouse, $nbpiece, $movement, $label='', $price=0, $inventorycode='')
 	{
-		global $conf, $db, $langs, $user;
-		
-		/* duplication method product to add datem */
+		global $conf, $user;
+
 		if ($fk_warehouse)
 		{
-			$db->begin();
+			$this->db->begin();
 
 			require_once DOL_DOCUMENT_ROOT .'/product/stock/class/mouvementstock.class.php';
 
@@ -234,7 +342,7 @@ class Inventory extends CoreObject
 
 			$datem = empty($conf->global->INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT) ? dol_now() : $this->date_inventory;
 
-			$movementstock=new MouvementStock($db);
+			$movementstock=new MouvementStock($this->db);
 			$movementstock->origin = new stdClass();
 			$movementstock->origin->element = 'inventory';
 			$movementstock->origin->id = $this->id;
@@ -242,7 +350,7 @@ class Inventory extends CoreObject
 			
 			if ($result >= 0)
 			{
-				$db->commit();
+				$this->db->commit();
 				return 1;
 			}
 			else
@@ -250,19 +358,25 @@ class Inventory extends CoreObject
 			    $this->error=$movementstock->error;
 			    $this->errors=$movementstock->errors;
 
-				$db->rollback();
+				$this->db->rollback();
 				return -1;
 			}
 		}
 	}
-	
+
+    /**
+     * Function to regulate stock
+     *
+     * @return      int
+     */
 	public function regulate()
 	{
-		global $db,$user,$langs,$conf;
+		global $langs,$conf;
 		
-		if($conf->global->INVENTORY_DISABLE_VIRTUAL){
+		if($conf->global->INVENTORY_DISABLE_VIRTUAL)
+		{
 			$pdt_virtuel = false;
-			// Test si pdt virtuel est activé
+			// Test if virtual product is enabled
 			if($conf->global->PRODUIT_SOUSPRODUITS)
 			{
 				$pdt_virtuel = true;
@@ -272,106 +386,138 @@ class Inventory extends CoreObject
 		
 		foreach ($this->Inventorydet as $k => $Inventorydet)
 		{
-			$product = new Product($db);
+			$product = new Product($this->db);
 			$product->fetch($Inventorydet->fk_product);
-			
-			/*
-			 * Ancien code qui était pourri et qui modifié la valeur du stock théorique si le parent était déstocké le même jour que l'enfant
-			 * 
-			 * $product->load_stock();
-			$Inventorydet->qty_stock = $product->stock_warehouse[$this->fk_warehouse]->real;
-			
-			if(date('Y-m-d', $this->date_inventory) < date('Y-m-d')) {
-				$TRes = $Inventorydet->getPmpStockFromDate($PDOdb, date('Y-m-d', $this->date_inventory), $this->fk_warehouse);
-				$Inventorydet->qty_stock = $TRes[1];
-			}
-			*/
+
 			if ($Inventorydet->qty_view != $Inventorydet->qty_stock)
 			{
 				$Inventorydet->qty_regulated = $Inventorydet->qty_view - $Inventorydet->qty_stock;
 				$nbpiece = abs($Inventorydet->qty_regulated);
 				$movement = (int) ($Inventorydet->qty_view < $Inventorydet->qty_stock); // 0 = add ; 1 = remove
 						
-				$href = dol_buildpath('/inventory/inventory.php?id='.$this->id.'&action=view', 1);
+				//$href = dol_buildpath('/inventory/inventory.php?id='.$this->id.'&action=view', 1);
 				
-				$this->correct_stock($product->id, $Inventorydet->fk_warehouse, $nbpiece, $movement, $langs->trans('inventoryMvtStock'));
+				$res = $this->correct_stock($product->id, $Inventorydet->fk_warehouse, $nbpiece, $movement, $langs->trans('inventoryMvtStock'));
+				if ($res < 0) return -1;
 			}
 		}
 
-		if($conf->global->INVENTORY_DISABLE_VIRTUAL){
-			// Test si pdt virtuel était activé avant la régule
+		if($conf->global->INVENTORY_DISABLE_VIRTUAL)
+		{
+            // Test if virtual product was enabled before regulate
 			if($pdt_virtuel) $conf->global->PRODUIT_SOUSPRODUITS = 1;
 		}
 		
 		return 1;
 	}
-    
-	public function getTitle() {
+
+    /**
+     * Get the title
+     * @return  string
+     */
+	public function getTitle()
+    {
 		global $langs;
 		
 		return !empty($this->title) ? $this->title : $langs->trans('inventoryTitle').' '.$this->id;
 	}
-	
-	public function getNomUrl($picto = 1) {
-		
-        return '<a href="'.dol_buildpath('/inventory/inventory.php?id='.$this->id, 1).'">'.($picto ? img_picto('','object_list.png','',0).' ' : '').$this->getTitle().'</a>';
-        
-	} 
-	
-	public function add_products_for($fk_warehouse,$fk_category=0,$fk_supplier=0,$only_prods_in_stock=0) {
-		$e = new Entrepot($this->db);
-		$e->fetch($fk_warehouse);
+
+
+    /**
+     * Return clicable link of object (with eventually picto)
+     *
+     * @param   int     $withpicto  Add picto into link
+     * @return                      string
+     */
+	public function getNomUrl($withpicto = 1)
+    {
+        return '<a href="'.dol_buildpath('/inventory/inventory.php?id='.$this->id, 1).'">'.($withpicto ? img_picto('','object_list.png','',0).' ' : '').$this->getTitle().'</a>';
+	}
+
+    /**
+     * Function to add products by default from warehouse and children
+     *
+     * @param $fk_warehouse
+     * @param int $fk_category
+     * @param int $fk_supplier
+     * @param int $only_prods_in_stock
+     *
+     * @return int
+     */
+	public function add_products_for($fk_warehouse,$fk_category=0,$fk_supplier=0,$only_prods_in_stock=0)
+    {
+        $warehouse = new Entrepot($this->db);
+        $warehouse->fetch($fk_warehouse);
 		$TChildWarehouses = array($fk_warehouse);
-		$e->get_children_warehouses($fk_warehouse, $TChildWarehouses);
+        $warehouse->get_children_warehouses($fk_warehouse, $TChildWarehouses);
 			
-		$sql = 'SELECT ps.fk_product, ps.fk_entrepot
-			     FROM '.MAIN_DB_PREFIX.'product_stock ps
-			     INNER JOIN '.MAIN_DB_PREFIX.'product p ON (p.rowid = ps.fk_product)
-                 LEFT JOIN '.MAIN_DB_PREFIX.'categorie_product cp ON (cp.fk_product = p.rowid)
-				 LEFT JOIN '.MAIN_DB_PREFIX.'product_fournisseur_price pfp ON (pfp.fk_product = p.rowid)
-			     WHERE ps.fk_entrepot IN ('.implode(', ', $TChildWarehouses).')';
+		$sql = 'SELECT ps.fk_product, ps.fk_entrepot';
+		$sql.= ' FROM '.MAIN_DB_PREFIX.'product_stock ps';
+        $sql.= ' INNER JOIN '.MAIN_DB_PREFIX.'product p ON (p.rowid = ps.fk_product)';
+        $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_product cp ON (cp.fk_product = p.rowid)';
+        $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_fournisseur_price pfp ON (pfp.fk_product = p.rowid)';
+        $sql.= ' WHERE ps.fk_entrepot IN ('.implode(', ', $TChildWarehouses).')';
 			
-		if($fk_category>0) $sql.= " AND cp.fk_categorie=".$fk_category;
-		if($fk_supplier>0) $sql.= " AND pfp.fk_soc=".$fk_supplier;
-		if(!empty($only_prods_in_stock)) $sql.= ' AND ps.reel > 0';
+		if ($fk_category>0) $sql.= ' AND cp.fk_categorie='.$fk_category;
+		if ($fk_supplier>0) $sql.= ' AND pfp.fk_soc = '.$fk_supplier;
+		if (!empty($only_prods_in_stock)) $sql.= ' AND ps.reel > 0';
 			
-		$sql.=' GROUP BY ps.fk_product, ps.fk_entrepot
-					ORDER BY p.ref ASC,p.label ASC';
+		$sql.=' GROUP BY ps.fk_product, ps.fk_entrepot ORDER BY p.ref ASC,p.label ASC';
 		 
 		$res = $this->db->query($sql);
-		if($res) {
-			while($obj = $this->db->fetch_object($res)){
+		if($res)
+		{
+			while($obj = $this->db->fetch_object($res))
+            {
 				$this->add_product($obj->fk_product, $obj->fk_entrepot);
 			}
+
+			return 1;
 		}
-			
-		
+		else
+        {
+            $this->error = $this->db->lasterror();
+            $this->errors[] = $this->db->lasterror();
+            return -1;
+        }
 	}
-	
-    static function getLink($id) {
+
+    /**
+     * Return clicable link of inventory object
+     *
+     * @param   int     $id         id of inventory
+     * @param   int     $withpicto  Add picto into link
+     * @return  string
+     */
+    static function getLink($id, $withpicto=1)
+    {
         global $langs,$db;
         
-        $i = new Inventory($db);
-        if($i->fetch($id, false)>0) return $i->getNomUrl();
+        $inventory = new Inventory($db);
+        if($inventory->fetch($id, false) > 0) return $inventory->getNomUrl($withpicto);
         else return $langs->trans('InventoryUnableToFetchObject');
-        
     }
-	
-	static function getSQL($type) {
+
+    /**
+     * Function to get the sql select of inventory
+     * @param   string  $type
+     * @return  string
+     */
+	static function getSQL($type)
+    {
 		global $conf;
-		
-		if($type=='All') {
-			
-			$sql="SELECT i.rowid,i.title, e.label, i.date_inventory, i.fk_warehouse, i.datec, i.tms, i.status
-				  FROM ".MAIN_DB_PREFIX."inventory i
-				  LEFT JOIN ".MAIN_DB_PREFIX."entrepot e ON (e.rowid = i.fk_warehouse)
-				  WHERE i.entity=".(int) $conf->entity;
-			
+
+        $sql = '';
+		if($type == 'All')
+		{
+			$sql = 'SELECT i.rowid,i.title, e.label, i.date_inventory, i.fk_warehouse, i.datec, i.tms, i.status';
+            $sql.= ' FROM '.MAIN_DB_PREFIX.'inventory i';
+            $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'entrepot e ON (e.rowid = i.fk_warehouse)';
+            $sql.= ' WHERE i.entity = '.(int) $conf->entity;
 		}
 	
 		return $sql;	
 	}
-	
 }
 
 class Inventorydet extends CoreObject
@@ -404,138 +550,157 @@ class Inventorydet extends CoreObject
 		,'pa'=>array('type'=>'float')
 		,'new_pmp'=>array('type'=>'float')
 	);
-	
-	
-	function __construct(&$db)
+
+    /**
+     *  Constructor
+     *
+     *  @param      DoliDB		$db      Database handler
+     */
+	function __construct(DoliDB &$db)
 	{
 		global $conf;
-		
-		$this->db = &$db;
-		
+
+		parent::__construct($db);
 		parent::init();
 				
 		$this->entity = $conf->entity;
 		$this->errors = array();
 		
 		$this->product = null;
-		
 		$this->current_pa = 0;
-		
 	}
-	
+
+    /**
+     * Get object and children from database
+     *
+     * @param   int   $id   id of inventorydet object
+     * @return  int
+     */
 	function fetch($id) 
 	{
-		global $conf;
-		
 		$res = parent::fetch($id);
 		$this->load_product();
         $this->fetch_current_pa();
 			
 		return $res;
 	}
-	
-	function fetch_current_pa() {
+
+    /**
+     * Function to get the unit buy price
+     *
+     * @return bool
+     */
+    function fetch_current_pa()
+    {
 		global $db,$conf;
 		
 		if(empty($conf->global->INVENTORY_USE_MIN_PA_IF_NO_LAST_PA)) return false;
 		
-		if($this->pa>0){ 
+		if($this->pa > 0)
+		{
 			$this->current_pa = $this->pa;
 		}
-		else {
-			
+		else
+        {
 			dol_include_once('/fourn/class/fournisseur.product.class.php');
 			$p= new ProductFournisseur($db);
 			$p->find_min_price_product_fournisseur($this->fk_product);
 			
 			if($p->fourn_qty>0)	$this->current_pa = $p->fourn_price / $p->fourn_qty;
 		}
+
 		return true;
 	}
-	
-    function setStockDate($date, $fk_warehouse) {
-        
-		list($pmp,$stock) = $this->getPmpStockFromDate($date, $fk_warehouse);
-		
+
+    /**
+     * Function to set pa attribute from date en fk_warehouse
+     *
+     * @param   date    $date           date value
+     * @param   int     $fk_warehouse   fk_warehouse target
+     */
+    function setStockDate($date, $fk_warehouse)
+    {
+		list($pmp, $stock) = $this->getPmpStockFromDate($date, $fk_warehouse);
+
         $this->qty_stock = $stock;
         $this->pmp = $pmp;
-        
+
         $last_pa = 0;
-        $sql = "SELECT price FROM ".MAIN_DB_PREFIX."stock_mouvement 
-                WHERE fk_entrepot=".$fk_warehouse." 
-                AND fk_product=".$this->fk_product." 
-                AND (origintype='order_supplier' || origintype='invoice_supplier')
-                AND price>0 
-                AND datem<='".$date." 23:59:59'
-                ORDER BY datem DESC LIMIT 1";
-               
+        $sql = 'SELECT price FROM '.MAIN_DB_PREFIX.'stock_mouvement';
+        $sql.= ' WHERE fk_entrepot = '.$fk_warehouse;
+        $sql.= ' AND fk_product = '.$this->fk_product;
+        $sql.= ' AND (origintype=\'order_supplier\' || origintype=\'invoice_supplier\')';
+        $sql.= ' AND price > 0';
+        $sql.= ' AND datem <= \''.$date.' 23:59:59\'';
+        $sql.= ' ORDER BY datem DESC LIMIT 1';
+
         $res = $this->db->query($sql);
-       
-        if($res && $obj = $this->db->fetch_object($res)) {
+        if($res && $obj = $this->db->fetch_object($res))
+        {
             $last_pa = $obj->price;
         }
-        
+
         $this->pa = $last_pa;
-      
     }
 
-	function getPmpStockFromDate( $date, $fk_warehouse){
-		
+
+    /**
+     * Get the last pmp and last stock from date and warehouse
+     *
+     * @param   date    $date           date to check
+     * @param   int     $fk_warehouse   id of warehouse
+     * @return array
+     */
+    function getPmpStockFromDate($date, $fk_warehouse)
+    {
 		$res = $this->product->load_stock();
 		
-		if($res>0) {
+		if($res>0)
+		{
 			$stock = isset($this->product->stock_warehouse[$fk_warehouse]->real) ? $this->product->stock_warehouse[$fk_warehouse]->real : 0;
-			
-			if((float)DOL_VERSION<4.0) {
-				$pmp = isset($this->product->stock_warehouse[$fk_warehouse]->pmp) ? $this->product->stock_warehouse[$fk_warehouse]->pmp : 0; 
-			}
-			else{
-				$pmp = $this->product->pmp;
-			}
-			
+            $pmp = $this->product->pmp;
 		}
 		
 		//All Stock mouvement between now and inventory date
-		$sql = "SELECT value, price
-				FROM ".MAIN_DB_PREFIX."stock_mouvement
-				WHERE fk_product = ".$this->product->id."
-					AND fk_entrepot = ".$fk_warehouse."
-					AND datem > '".date('Y-m-d 23:59:59',strtotime($date))."'
-				ORDER BY datem DESC";
+		$sql = 'SELECT value, price';
+        $sql.= ' FROM '.MAIN_DB_PREFIX.'stock_mouvement';
+        $sql.= ' WHERE fk_product = '.$this->product->id;
+        $sql.= ' AND fk_entrepot = '.$fk_warehouse;
+        $sql.= ' AND datem > \''.date('Y-m-d 23:59:59', strtotime($date)).'\'';
+        $sql.= ' ORDER BY datem DESC';
 
-		
 		$res = $this->db->query($sql);
 		
 		$laststock = $stock;
 		$lastpmp = $pmp;
 		
-		if($res) {
-			while($mouvement = $this->db->fetch_object($res)) {
-				$price = ($mouvement->price>0 && $mouvement->value>0) ? $mouvement->price : $lastpmp;
-				
+		if($res)
+		{
+			while($mouvement = $this->db->fetch_object($res))
+            {
+				$price = ($mouvement->price > 0 && $mouvement->value > 0) ? $mouvement->price : $lastpmp;
 				$stock_value = $laststock * $lastpmp;
-					
 				$laststock -= $mouvement->value;
-					
 				$last_stock_value = $stock_value - ($mouvement->value * $price);
-					
 				$lastpmp = ($laststock != 0) ? $last_stock_value / $laststock : $lastpmp;
 			}
-			
 		}
 		
-		return array($lastpmp,$laststock);
+		return array($lastpmp, $laststock);
 	}
-    
+
+    /**
+     * Fetch the product linked with the line
+     * @return  void
+     */
 	function load_product() 
 	{
 		global $db;
 		
-		if($this->fk_product>0) {
+		if($this->fk_product>0)
+		{
 			$this->product = new Product($db);
 			$this->product->fetch($this->fk_product);
 		}
-		
 	}
-	
 }

From e3afa06cf310878b586c12fb7f771b9a9da5bf54 Mon Sep 17 00:00:00 2001
From: atm-ph <phf@atm-consulting.fr>
Date: Sat, 25 Mar 2017 18:01:43 +0100
Subject: [PATCH 027/505] Fix inventory sql

---
 htdocs/install/mysql/migration/5.0.0-6.0.0.sql       | 12 ++++++------
 htdocs/install/mysql/tables/llx_inventory.key.sql    |  2 +-
 htdocs/install/mysql/tables/llx_inventory.sql        |  4 ++--
 htdocs/install/mysql/tables/llx_inventorydet.key.sql |  2 +-
 htdocs/install/mysql/tables/llx_inventorydet.sql     |  4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index 365d367b3f7..986faf2a74c 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -129,20 +129,20 @@ ALTER TABLE llx_chargesociales ADD COLUMN fk_projet integer DEFAULT NULL;
 CREATE TABLE llx_inventory 
 ( 
 rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY, 
-datec DATETIME DEFAULT NULL, 
+datec datetime DEFAULT NULL,
 tms timestamp, 
 fk_warehouse integer DEFAULT 0, 
 entity integer DEFAULT 0, 
 status integer DEFAULT 0, 
 title varchar(255) NOT NULL, 
-date_inventory datetime DATETIME DEFAULT NULL
+date_inventory datetime DEFAULT NULL
 ) 
 ENGINE=InnoDB;
 
 CREATE TABLE llx_inventorydet 
 ( 
 rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY, 
-datec DATETIME DEFAULT NULL, 
+datec datetime DEFAULT NULL,
 tms timestamp, 
 fk_inventory integer DEFAULT 0, 
 fk_warehouse integer DEFAULT 0,
@@ -153,12 +153,12 @@ qty_stock double DEFAULT 0,
 qty_regulated double DEFAULT 0, 
 pmp double DEFAULT 0, 
 pa double DEFAULT 0, 
-new_pmp double DEFAULT 0, 
+new_pmp double DEFAULT 0
 ) 
 ENGINE=InnoDB;
 
 ALTER TABLE llx_inventory ADD INDEX idx_inventory_tms (tms);
-ALTER TABLE llx_inventory ADD INDEX idx_inventory_datec (date_cre);
+ALTER TABLE llx_inventory ADD INDEX idx_inventory_datec (datec);
 ALTER TABLE llx_inventorydet ADD INDEX idx_inventorydet_tms (tms);
-ALTER TABLE llx_inventorydet ADD INDEX idx_inventorydet_datec (date_cre);
+ALTER TABLE llx_inventorydet ADD INDEX idx_inventorydet_datec (datec);
 ALTER TABLE llx_inventorydet ADD INDEX idx_inventorydet_fk_inventory (fk_inventory);
diff --git a/htdocs/install/mysql/tables/llx_inventory.key.sql b/htdocs/install/mysql/tables/llx_inventory.key.sql
index 6596e88d817..bf76381e108 100644
--- a/htdocs/install/mysql/tables/llx_inventory.key.sql
+++ b/htdocs/install/mysql/tables/llx_inventory.key.sql
@@ -18,4 +18,4 @@
 -- ===================================================================
 
 ALTER TABLE llx_inventory ADD INDEX idx_inventory_tms (tms);
-ALTER TABLE llx_inventory ADD INDEX idx_inventory_datec (date_cre);
+ALTER TABLE llx_inventory ADD INDEX idx_inventory_datec (datec);
diff --git a/htdocs/install/mysql/tables/llx_inventory.sql b/htdocs/install/mysql/tables/llx_inventory.sql
index dc4b66f1be2..f906699f5dd 100644
--- a/htdocs/install/mysql/tables/llx_inventory.sql
+++ b/htdocs/install/mysql/tables/llx_inventory.sql
@@ -20,12 +20,12 @@
 CREATE TABLE llx_inventory 
 ( 
 rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY, 
-datec DATETIME DEFAULT NULL, 
+datec datetime DEFAULT NULL,
 tms timestamp, 
 fk_warehouse integer DEFAULT 0, 
 entity integer DEFAULT 0, 
 status integer DEFAULT 0, 
 title varchar(255) NOT NULL, 
-date_inventory datetime DATETIME DEFAULT NULL
+date_inventory datetime DEFAULT NULL
 ) 
 ENGINE=InnoDB;
diff --git a/htdocs/install/mysql/tables/llx_inventorydet.key.sql b/htdocs/install/mysql/tables/llx_inventorydet.key.sql
index 31c5884f60b..3cef44ba52a 100644
--- a/htdocs/install/mysql/tables/llx_inventorydet.key.sql
+++ b/htdocs/install/mysql/tables/llx_inventorydet.key.sql
@@ -18,5 +18,5 @@
 -- ===================================================================
 
 ALTER TABLE llx_inventorydet ADD INDEX idx_inventorydet_tms (tms);
-ALTER TABLE llx_inventorydet ADD INDEX idx_inventorydet_datec (date_cre);
+ALTER TABLE llx_inventorydet ADD INDEX idx_inventorydet_datec (datec);
 ALTER TABLE llx_inventorydet ADD INDEX idx_inventorydet_fk_inventory (fk_inventory);
diff --git a/htdocs/install/mysql/tables/llx_inventorydet.sql b/htdocs/install/mysql/tables/llx_inventorydet.sql
index c67ccd32a3f..20e48b877b5 100644
--- a/htdocs/install/mysql/tables/llx_inventorydet.sql
+++ b/htdocs/install/mysql/tables/llx_inventorydet.sql
@@ -20,7 +20,7 @@
 CREATE TABLE llx_inventorydet 
 ( 
 rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY, 
-datec DATETIME DEFAULT NULL, 
+datec datetime DEFAULT NULL,
 tms timestamp, 
 fk_inventory integer DEFAULT 0, 
 fk_warehouse integer DEFAULT 0,
@@ -31,6 +31,6 @@ qty_stock double DEFAULT 0,
 qty_regulated double DEFAULT 0, 
 pmp double DEFAULT 0, 
 pa double DEFAULT 0, 
-new_pmp double DEFAULT 0, 
+new_pmp double DEFAULT 0
 ) 
 ENGINE=InnoDB;

From fce8e08b51a7d6a0160c925778e0e4458cd45330 Mon Sep 17 00:00:00 2001
From: atm-ph <phf@atm-consulting.fr>
Date: Sat, 25 Mar 2017 18:13:39 +0100
Subject: [PATCH 028/505] Refactoring and fix

---
 htdocs/core/class/coreobject.class.php     |   2 +-
 htdocs/core/class/listview.class.php       |  31 +++---
 htdocs/inventory/ajax/ajax.inventory.php   |  18 ++--
 htdocs/inventory/class/inventory.class.php |   5 +-
 htdocs/inventory/inventory.php             |   6 +-
 htdocs/inventory/list.php                  | 108 ++++++++++-----------
 6 files changed, 83 insertions(+), 87 deletions(-)

diff --git a/htdocs/core/class/coreobject.class.php b/htdocs/core/class/coreobject.class.php
index ec6442c2302..6454c6e814b 100644
--- a/htdocs/core/class/coreobject.class.php
+++ b/htdocs/core/class/coreobject.class.php
@@ -517,7 +517,7 @@ class CoreObject extends CommonObject
         $this->db->begin();
 
 		$query = $this->set_save_query();
-		$query['datec'] = date("Y-m-d H:i:s", $this->datec);
+		$query['datec'] = date("Y-m-d H:i:s", dol_now());
 		
 		$res = $this->db->insert($this->table_element, $query);
 		if($res)
diff --git a/htdocs/core/class/listview.class.php b/htdocs/core/class/listview.class.php
index 46a766a1206..c0579a47850 100644
--- a/htdocs/core/class/listview.class.php
+++ b/htdocs/core/class/listview.class.php
@@ -19,21 +19,19 @@
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-class Listview {
+class Listview
+{
 	
-	function __construct(&$db, $id ) {
-			
+	function __construct(&$db, $id)
+    {
 		$this->db = &$db;
-			
 		$this->id = $id;
-		
 		$this->TTotalTmp=array();
-		
 		$this->sql = '';
-
 	}
-	private function init(&$TParam) {
-		
+
+	private function init(&$TParam)
+    {
 		global $conf, $langs;
 		
 		if(!isset($TParam['hide']))$TParam['hide']=array();
@@ -574,7 +572,7 @@ class Listview {
 		
 		$this->init($TParam);
 		
-		$this->parse_array($THeader, $TField, $TParam,$TField);
+		$this->parse_array($THeader, $TField, $TParam);
 		list($TTotal, $TTotalGroup)=$this->get_total($TField, $TParam);
 		
 		$this->renderList($THeader, $TField,$TTotal,$TTotalGroup, $TParam);	
@@ -610,13 +608,14 @@ class Listview {
 		return $sql;
 	}
 	
-	private function parse_array(&$THeader, &$TField, &$TParam, $TField) {
-		$first=true;
-		
-		 $this->THideFlip = array_flip($TParam['hide']);
+	private function parse_array(&$THeader, &$TField, &$TParam)
+    {
+		$first = true;
+
+		$this->THideFlip = array_flip($TParam['hide']);
 		$this->TTotalTmp=array();
 		
-		if(empty($TField)) return false;
+		if (empty($TField)) return false;
 		
 		foreach($TField as $row) {
 			if($first) {
@@ -844,7 +843,7 @@ class Listview {
 		$this->TTotalTmp=array();
 		
 		$this->THideFlip = array_flip($TParam['hide']);
-var_dump($this->sql);
+
 		$res = $this->db->query($this->sql);
 		if($res!==false) {
 			
diff --git a/htdocs/inventory/ajax/ajax.inventory.php b/htdocs/inventory/ajax/ajax.inventory.php
index f2f5ef54903..c1f372806c8 100644
--- a/htdocs/inventory/ajax/ajax.inventory.php
+++ b/htdocs/inventory/ajax/ajax.inventory.php
@@ -6,20 +6,23 @@
     $get = GETPOST('get');
     $put = GETPOST('put');
     
-    switch ($put) {
+    switch ($put)
+    {
         case 'qty':
-            if (!$user->rights->inventory->write) { echo -1; exit; }
+            if (empty($user->rights->inventory->write)) { echo -1; exit; }
             
             $fk_det_inventory = GETPOST('fk_det_inventory');
             
             $det = new Inventorydet($db);
-            if( $det->fetch( $fk_det_inventory)) {
+            if( $det->fetch( $fk_det_inventory))
+            {
                 $det->qty_view+=GETPOST('qty');
                 $det->update($user);
                 
                 echo $det->qty_view;
             }
-            else {
+            else
+            {
                 echo -2;
             }            
             
@@ -31,17 +34,18 @@
             $fk_det_inventory = GETPOST('fk_det_inventory');
             
             $det = new Inventorydet($db);
-            if( $det->fetch( $fk_det_inventory)) {
+            if( $det->fetch( $fk_det_inventory))
+            {
                 $det->new_pmp=price2num(GETPOST('pmp'));
                 $det->update($user);
                 
                 echo $det->new_pmp;
             }
-            else {
+            else
+            {
                 echo -2;
             }            
             
             break;
-        
     }
  
diff --git a/htdocs/inventory/class/inventory.class.php b/htdocs/inventory/class/inventory.class.php
index 05996d02489..46f27906cc9 100644
--- a/htdocs/inventory/class/inventory.class.php
+++ b/htdocs/inventory/class/inventory.class.php
@@ -573,10 +573,11 @@ class Inventorydet extends CoreObject
     /**
      * Get object and children from database
      *
-     * @param   int   $id   id of inventorydet object
+     * @param   int   $id           id of inventorydet object
+     * @param   bool  $loadChild    load children
      * @return  int
      */
-	function fetch($id) 
+	function fetch($id, $loadChild = true)
 	{
 		$res = parent::fetch($id);
 		$this->load_product();
diff --git a/htdocs/inventory/inventory.php b/htdocs/inventory/inventory.php
index 7e43c3ce44e..403b148ec2c 100644
--- a/htdocs/inventory/inventory.php
+++ b/htdocs/inventory/inventory.php
@@ -36,7 +36,7 @@ require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 $langs->load("stock");
 $langs->load("inventory");
 
-if(!$user->rights->inventory->read) accessforbidden();
+if(empty($user->rights->inventory->read)) accessforbidden();
 
 _action();
 
@@ -54,7 +54,7 @@ function _action()
 	
 	switch($action) {
 		case 'create':
-			if (!$user->rights->inventory->create) accessforbidden();
+			if (empty($user->rights->inventory->create)) accessforbidden();
 			
 			$inventory = new Inventory($db);
 			
@@ -63,7 +63,7 @@ function _action()
 			break;
 		
 		case 'confirmCreate':
-			if (!$user->rights->inventory->create) accessforbidden();
+			if (empty($user->rights->inventory->create)) accessforbidden();
 		
 			$inventory = new Inventory($db);
 			$inventory->set_values($_POST);
diff --git a/htdocs/inventory/list.php b/htdocs/inventory/list.php
index c6846cfc618..2fb1a2b7f31 100644
--- a/htdocs/inventory/list.php
+++ b/htdocs/inventory/list.php
@@ -36,67 +36,59 @@ require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 $langs->load("stock");
 $langs->load("inventory");
 
-if(!$user->rights->inventory->read) accessforbidden();
-
-_list();
-
-
-function _list() 
-{
-	
-	global $db, $conf, $langs, $user;
+if (empty($user->rights->inventory->read)) accessforbidden();
 		
-	llxHeader('',$langs->trans('inventoryListTitle'),'','');
-	
-	echo '<form name="formListInvetory" action="'.$_SERVER['PHP_SELF'].'" method="post" >';
-	
-	$inventory = new Inventory($db);
-	$l = new ListView($db,'listInventory');
+llxHeader('',$langs->trans('inventoryListTitle'),'','');
 
-	$THide = array('label','title');
+echo '<form name="formListInvetory" action="'.$_SERVER['PHP_SELF'].'" method="post" >';
 
-	echo $l->render(Inventory::getSQL('All'), array(
-		'link'=>array(
-			'fk_warehouse'=>'<a href="'.DOL_URL_ROOT.'/product/stock/card.php?id=@val@">'.img_picto('','object_stock.png','',0).' @label@</a>'
-		)
-		,'translate'=>array()
-		,'hide'=>$THide
-		,'type'=>array(
-			'datec'=>'date'
-			,'tms'=>'datetime'
-			,'date_inventory'=>'date'
-		)
-		,'list'=>array(
-			'title'=>$langs->trans('inventoryListTitle')
-			,'messageNothing'=>$langs->trans('inventoryListEmpty')
-		)
-		,'title'=>array(
-			'rowid'=>$langs->trans('Title')
-			,'fk_warehouse'=>$langs->trans('Warehouse')
-			,'date_inventory'=>$langs->trans('InventoryDate')
-			,'datec'=>$langs->trans('DateCreation')
-			,'tms'=>$langs->trans('DateUpdate')
-			,'status'=>$langs->trans('Status')
-		)
-		,'eval'=>array(
-			'status' => '(@val@ ? img_picto("'.$langs->trans("inventoryValidate").'", "statut4") : img_picto("'.$langs->trans("inventoryDraft").'", "statut3"))'
-			,'rowid'=>'Inventory::getLink(@val@)'
-		)
-		,'search'=>array(
-				'date_inventory'=>'calendars'
-				,'status'=>array(1=>$langs->trans("inventoryValidate"), 0=>$langs->trans("inventoryDraft"))
-		)
-	));
+$inventory = new Inventory($db);
+$list = new ListView($db,'listInventory');
+
+$THide = array('label','title');
+
+echo $list->render(Inventory::getSQL('All'), array(
+    'link'=>array(
+        'fk_warehouse'=>'<a href="'.DOL_URL_ROOT.'/product/stock/card.php?id=@val@">'.img_picto('','object_stock.png','',0).' @label@</a>'
+    )
+    ,'translate'=>array()
+    ,'hide'=>$THide
+    ,'type'=>array(
+        'datec'=>'date'
+        ,'tms'=>'datetime'
+        ,'date_inventory'=>'date'
+    )
+    ,'list'=>array(
+        'title'=>$langs->trans('inventoryListTitle')
+        ,'messageNothing'=>$langs->trans('inventoryListEmpty')
+    )
+    ,'title'=>array(
+        'rowid'=>$langs->trans('Title')
+        ,'fk_warehouse'=>$langs->trans('Warehouse')
+        ,'date_inventory'=>$langs->trans('InventoryDate')
+        ,'datec'=>$langs->trans('DateCreation')
+        ,'tms'=>$langs->trans('DateUpdate')
+        ,'status'=>$langs->trans('Status')
+    )
+    ,'eval'=>array(
+        'status' => '(@val@ ? img_picto("'.$langs->trans("inventoryValidate").'", "statut4") : img_picto("'.$langs->trans("inventoryDraft").'", "statut3"))'
+        ,'rowid'=>'Inventory::getLink(@val@)'
+    )
+    ,'search'=>array(
+        'date_inventory'=>'calendars'
+        ,'status'=>array(1=>$langs->trans("inventoryValidate"), 0=>$langs->trans("inventoryDraft"))
+    )
+));
 
 
-	if ($user->rights->inventory->create)
-	{
-		print '<div class="tabsAction">';
-		print '<a class="butAction" href="inventory.php?action=create">'.$langs->trans('inventoryCreate').'</a>';
-		print '</div>';
-	}
+if (!empty($user->rights->inventory->create))
+{
+    print '<div class="tabsAction">';
+    print '<a class="butAction" href="inventory.php?action=create">'.$langs->trans('inventoryCreate').'</a>';
+    print '</div>';
+}
 
-	echo '</form>';
-	
-	llxFooter('');
-}
\ No newline at end of file
+echo '</form>';
+
+llxFooter('');
+$db->close();
\ No newline at end of file

From cb576e6c9932b814ebfe0ad5b686d35d287c1c33 Mon Sep 17 00:00:00 2001
From: atm-ph <phf@atm-consulting.fr>
Date: Sat, 25 Mar 2017 18:26:10 +0100
Subject: [PATCH 029/505] Refactoring class

---
 htdocs/core/class/listview.class.php | 117 +++++++++++++++++++--------
 htdocs/inventory/list.php            |   2 +-
 2 files changed, 83 insertions(+), 36 deletions(-)

diff --git a/htdocs/core/class/listview.class.php b/htdocs/core/class/listview.class.php
index c0579a47850..11a948472e4 100644
--- a/htdocs/core/class/listview.class.php
+++ b/htdocs/core/class/listview.class.php
@@ -21,7 +21,12 @@
 
 class Listview
 {
-	
+    /**
+     *  Constructor
+     *
+     *  @param      DoliDB		$db      Database handler
+     *  @param      string		$id      html id
+     */
 	function __construct(&$db, $id)
     {
 		$this->db = &$db;
@@ -30,6 +35,12 @@ class Listview
 		$this->sql = '';
 	}
 
+    /**
+     * Function to init fields
+     *
+     * @param   array   $TParam     array of configuration of list
+     * @return bool
+     */
 	private function init(&$TParam)
     {
 		global $conf, $langs;
@@ -51,87 +62,123 @@ class Listview
 			,'orderUp'=>''
 			,'id'=>$this->id
 			,'head_search'=>''
-			,'export'=>array() //TODO include native export
-			,'view_type'=>'' //TODO to include graph or kanban instead of list
+			,'export'=>array()
+			,'view_type'=>''
 		),$TParam['list']);
 		
 		$POSTList = GETPOST('Listview');
 		
-		if(empty($TParam['limit']))$TParam['limit']=array();
-		if(!empty($POSTList[$this->id]['page'])) $TParam['limit']['page'] = $POSTList[$this->id]['page'];
+		if (empty($TParam['limit']))$TParam['limit'] = array();
+		if (!empty($POSTList[$this->id]['page'])) $TParam['limit']['page'] = $POSTList[$this->id]['page'];
 		
-		$TParam['limit']=array_merge(array('page'=>1, 'nbLine'=>$conf->liste_limit, 'global'=>0), $TParam['limit']);
+		$TParam['limit'] = array_merge(array('page'=>1, 'nbLine'=>$conf->liste_limit, 'global'=>0), $TParam['limit']);
 		
-		if(!empty($POSTList[$this->id]['orderBy'])) {
+		if(!empty($POSTList[$this->id]['orderBy']))
+		{
 			$TParam['orderBy'] = $POSTList[$this->id]['orderBy']; 
 		}
-		
 	}
-	private function getSearchNull($key, &$TParam) {
+
+
+    /**
+     * Function to know if we can search on null value
+     * @param   string  $key    field name
+     * @param   array   $TParam array of configuration
+     * @return bool
+     */
+    private function getSearchNull($key, &$TParam)
+    {
 		return !empty($TParam['search'][$key]['allow_is_null']);
-	} 
-	private function getSearchKey($key, &$TParam) {
-		
-		$TPrefixe=array();
-		if(!empty($TParam['search'][$key]['table'])) {
+	}
+
+    /**
+     * @param $key
+     * @param $TParam
+     * @return array
+     */
+	private function getSearchKey($key, &$TParam)
+    {
+		$TPrefixe = array();
+		if(!empty($TParam['search'][$key]['table']))
+		{
 			if (!is_array($TParam['search'][$key]['table'])) $TParam['search'][$key]['table'] = array($TParam['search'][$key]['table']);
 			
-			foreach ($TParam['search'][$key]['table'] as $prefix_table) {
+			foreach ($TParam['search'][$key]['table'] as $prefix_table)
+			{
 				$TPrefixe[] = $prefix_table.'.'; 
 			}
 		}
 		
 		$TKey=array();
-		if(!empty($TParam['search'][$key]['field'])) {
+		if(!empty($TParam['search'][$key]['field']))
+		{
 			if (!is_array($TParam['search'][$key]['field'])) $TParam['search'][$key]['field'] = array($TParam['search'][$key]['field']);
 			
-			foreach ($TParam['search'][$key]['field'] as $i => $field) {
+			foreach ($TParam['search'][$key]['field'] as $i => $field)
+			{
 				$prefixe = !empty($TPrefixe[$i]) ? $TPrefixe[$i] : $TPrefixe[0];
 				$TKey[] = $prefixe. $field ;
 			}
-		} else {
-			$TKey[] =$TPrefixe[0].$key;
+		}
+		else
+		{
+			$TKey[] = $TPrefixe[0].$key;
 		}
 		
 		return $TKey;
-	} 
-	
-	private function dateToSQLDate($date) {
-		
+	}
+
+    /**
+     * @param $date
+     * @return int|string   Date TMS or ''
+     */
+    private function dateToSQLDate($date)
+    {
 		return $this->db->jdate($date);
 	}
-	
-	private function addSqlFromTypeDate(&$TSQLMore, &$value, $sKey)
+
+
+    /**
+     * @param $TSQLMore
+     * @param $value
+     * @param $sKey
+     */
+    private function addSqlFromTypeDate(&$TSQLMore, &$value, $sKey)
 	{
 		if(is_array($value))
 		{
-			
 			$TSQLDate=array();
 			if(!empty($value['start']))
 			{
 				$valueDeb = $this->dateToSQLDate($value['start']);
 				$TSQLDate[]=$sKey." >= '".$valueDeb." 00:00:00'" ;
-				
 			}
-			
+
 			if(!empty($value['end']))
 			{
 				$valueFin = $this->dateToSQLDate($value['end']);
-				$TSQLDate[]=$sKey." <= '".$valueFin." 23:59:59'" ;	
-				
+				$TSQLDate[]=$sKey." <= '".$valueFin." 23:59:59'" ;
 			}
-			
+
 			if(!empty($TSQLDate)) $TSQLMore[] = implode(' AND ', $TSQLDate);
 		}
 		else
 		{
 			$value = $this->dateToSQLDate($value);
 			$TSQLMore[]=$sKey." LIKE '".$value."%'" ;
-			
 		}
 	}
-	
-	private function addSqlFromOther(&$TSQLMore, &$value, &$TParam, $sKey, $key)
+
+
+    /**
+     * @param $TSQLMore
+     * @param $value
+     * @param $TParam
+     * @param $sKey
+     * @param $key
+     * @return bool
+     */
+    private function addSqlFromOther(&$TSQLMore, &$value, &$TParam, $sKey, $key)
 	{
 		if($value==-1) return false;
 			
@@ -363,7 +410,7 @@ class Listview
 					$TTotal[$field]=count($this->TTotalTmp[$targetField]);
 				}
 				else {
-					$TTotal[$field]=array_sum($this->TTotalTmp[$targetField]);	
+					$TTotal[$field]=array_sum($this->TTotalTmp[$targetField]);
 				}
 								
 			}
diff --git a/htdocs/inventory/list.php b/htdocs/inventory/list.php
index 2fb1a2b7f31..23d25913ccd 100644
--- a/htdocs/inventory/list.php
+++ b/htdocs/inventory/list.php
@@ -43,7 +43,7 @@ llxHeader('',$langs->trans('inventoryListTitle'),'','');
 echo '<form name="formListInvetory" action="'.$_SERVER['PHP_SELF'].'" method="post" >';
 
 $inventory = new Inventory($db);
-$list = new ListView($db,'listInventory');
+$list = new ListView($db, 'listInventory');
 
 $THide = array('label','title');
 

From 2fc74b496278394b4b5bca76aa13b5b4d811a04c Mon Sep 17 00:00:00 2001
From: atm-ph <phf@atm-consulting.fr>
Date: Sat, 25 Mar 2017 18:53:14 +0100
Subject: [PATCH 030/505] Refactoring class

---
 htdocs/core/class/listview.class.php | 685 +++++++++++++++------------
 htdocs/inventory/list.php            |  54 +--
 2 files changed, 420 insertions(+), 319 deletions(-)

diff --git a/htdocs/core/class/listview.class.php b/htdocs/core/class/listview.class.php
index 11a948472e4..38645dbca0a 100644
--- a/htdocs/core/class/listview.class.php
+++ b/htdocs/core/class/listview.class.php
@@ -200,52 +200,51 @@ class Listview
 		}
 		else
 		{
-				if(strpos($value,'%')===false) $value = '%'.$value.'%';
-				$TSQLMore[]=$sKey." LIKE '".addslashes($value)."'" ;
+            if(strpos($value,'%')===false) $value = '%'.$value.'%';
+            $TSQLMore[]=$sKey." LIKE '".addslashes($value)."'" ;
 		}
 		
 		return true;
 	}
 
-	private function search($sql,&$TParam) {
-	
+
+    /**
+     * @param $sql
+     * @param $TParam
+     * @return string
+     */
+    private function search($sql, &$TParam)
+    {
 		$ListPOST = GETPOST('Listview');
 		
-		if(!empty($ListPOST[$this->id]['search'])) {
+		if(!empty($ListPOST[$this->id]['search']))
+		{
 			$sqlGROUPBY='';
-			if(strpos($sql,'GROUP BY')!==false) { //TODO regex
+			if(strpos($sql,'GROUP BY')!==false)
+			{
 				list($sql, $sqlGROUPBY) = explode('GROUP BY', $sql);
 			}
 			
-			if(strpos($sql,'WHERE ')===false)$sql.=' WHERE 1 '; //TODO regex
-			//TODO	$value = GETPOST('Listview_'.$this->id.'_search_'.$key) ? mktime(0,0,0, (int)GETPOST('Listview_'.$this->id.'_search_'.$key.'month'), (int)GETPOST('Listview_'.$this->id.'_search_'.$key.'day'), (int)GETPOST('Listview_'.$this->id.'_search_'.$key.'year') ) : '';
+			if(strpos($sql,'WHERE ')===false) $sql.=' WHERE 1 ';
 			
-			foreach($ListPOST[$this->id]['search'] as $key=>$value)
+			foreach($ListPOST[$this->id]['search'] as $key => $value)
 			{
 				$TsKey = $this->getSearchKey($key, $TParam);
-				
-				//if (!empty($value)) var_dump($TsKey, $TsBindKey, '==================================');
 				$TSQLMore = array();
 				
 				$allow_is_null = $this->getSearchNull($key,$TParam);
-				$search_on_null = false; //TODO useless
 				
 				foreach ($TsKey as $i => &$sKey)
 				{
 					if($allow_is_null && !empty($ListPOST[$this->id]['search_on_null'][$key]))
 					{
 						$TSQLMore[] = $sKey.' IS NULL ';
-						$search_on_null = true;
-						
 						$value = '';
 					}
-					elseif($allow_is_null)
+
+					// Do not use empty() function, statut 0 exist
+					if($value != '')
 					{
-						null;
-					}
-					
-					if($value!='') { // pas empty car biensûr le statut = 0 existe dans de nombreux cas
-						
 						if(isset($TParam['type'][$key]) && ($TParam['type'][$key]==='date' || $TParam['type'][$key]==='datetime'))
 						{
 							$this->addSqlFromTypeDate($TSQLMore, $value, $sKey);
@@ -265,15 +264,18 @@ class Listview
 			}
 			
 			if($sqlGROUPBY!='')	$sql.=' GROUP BY '.$sqlGROUPBY;
-			
 		}
 
-		
 		return $sql;
 	}
 
-	public function render($sql,$TParam=array()) {
-
+    /**
+     * @param $sql
+     * @param array $TParam
+     * @return string
+     */
+    public function render($sql, $TParam=array())
+    {
 		$THeader=array();
 		$TField=array();	
 		
@@ -286,11 +288,16 @@ class Listview
 		
 		list($TTotal, $TTotalGroup)=$this->get_total($TField, $TParam);
 		
-		return $this->renderList($THeader, $TField,$TTotal,$TTotalGroup, $TParam);	
-		
+		return $this->renderList($THeader, $TField,$TTotal,$TTotalGroup, $TParam);
 	}
 
-	private function setSearch(&$THeader, &$TParam) {
+    /**
+     * @param $THeader
+     * @param $TParam
+     * @return array
+     */
+    private function setSearch(&$THeader, &$TParam)
+    {
 		global $langs, $form;
 		
 		if(empty($TParam['search'])) return array();
@@ -299,32 +306,33 @@ class Listview
 		
 		$nb_search_in_bar = 0;
 		
-		if(!empty($TParam['search'])) {
-			foreach($THeader as $key=>$libelle) { // init
+		if(!empty($TParam['search']))
+		{
+			foreach($THeader as $key => $libelle)
+			{
 				if(empty($TSearch[$key]))$TSearch[$key]='';
 			}
 		}	
 		
 		$ListPOST = GETPOST('Listview');
-		
-		foreach($TParam['search'] as $key=>$param_search) {
-			
+		foreach($TParam['search'] as $key => $param_search)
+		{
 			$value = isset($ListPOST[$this->id]['search'][$key]) ? $ListPOST[$this->id]['search'][$key] : '';
 			
 			$typeRecherche = (is_array($param_search) && isset($param_search['recherche'])) ? $param_search['recherche'] : $param_search;  
 			
-			if(is_array($typeRecherche)) {
+			if(is_array($typeRecherche))
+			{
 				$fsearch=$form->selectarray('Listview['.$this->id.'][search]['.$key.']', $typeRecherche,$value,1);
 			}
-			else if($typeRecherche==='calendar') {
-				
+			else if($typeRecherche==='calendar')
+			{
 				$value = GETPOST('Listview_'.$this->id.'_search_'.$key) ? mktime(0,0,0, (int)GETPOST('Listview_'.$this->id.'_search_'.$key.'month'), (int)GETPOST('Listview_'.$this->id.'_search_'.$key.'day'), (int)GETPOST('Listview_'.$this->id.'_search_'.$key.'year') ) : '';
 				
 				$fsearch = $form->select_date($value, 'Listview_'.$this->id.'_search_'.$key,0, 0, 1, "", 1, 0, 1);
-				//$fsearch=$form->calendrier('','Listview['.$this->id.'][search]['.$key.']',$value,10,10,' listviewtbs="calendar" ');	
 			}
-			else if($typeRecherche==='calendars') {
-				
+			else if($typeRecherche==='calendars')
+			{
 				$value_start = GETPOST('Listview_'.$this->id.'_search_'.$key.'_start') ? mktime(0,0,0, (int)GETPOST('Listview_'.$this->id.'_search_'.$key.'_startmonth'), (int)GETPOST('Listview_'.$this->id.'_search_'.$key.'_startday'), (int)GETPOST('Listview_'.$this->id.'_search_'.$key.'_startyear') ) : '';
 				$value_end = GETPOST('Listview_'.$this->id.'_search_'.$key.'_end') ? mktime(0,0,0, (int)GETPOST('Listview_'.$this->id.'_search_'.$key.'_endmonth'), (int)GETPOST('Listview_'.$this->id.'_search_'.$key.'_endday'), (int)GETPOST('Listview_'.$this->id.'_search_'.$key.'_endyear') ) : '';
 			
@@ -332,96 +340,113 @@ class Listview
 						 . $form->select_date($value_end, 'Listview_'.$this->id.'_search_'.$key.'_end',0, 0, 1, "", 1, 0, 1);
 				
 			}
-			else if(is_string($typeRecherche)) {
+			else if(is_string($typeRecherche))
+			{
 				$fsearch=$TParam['search'][$key];	
 			}
-			else {
+			else
+            {
 				$fsearch='<input type="text" name="Listview['.$this->id.'][search]['.$key.']" id="Listview['.$this->id.'][search]['.$key.']" value="'.$value.'" size="15" />';
 			}
 
-			if(!empty($param_search['allow_is_null'])) {
+			if(!empty($param_search['allow_is_null']))
+			{
 				$valueNull = isset($ListPOST[$this->id]['search_on_null'][$key]) ? 1 : 0;
 				$fsearch.=' '.$form->checkbox1('', 'Listview['.$this->id.'][search_on_null]['.$key.']',1, $valueNull,' onclick=" if($(this).is(\':checked\')){ $(this).prev().val(\'\'); }" ').img_help(1, $langs->trans('SearchOnNUllValue'));
 			}
-			
 
-			if(!empty($THeader[$key])) {
+			if(!empty($THeader[$key]))
+			{
 				$TSearch[$key] = $fsearch;
 				$nb_search_in_bar++;
 			}
-			else {
+			else
+            {
 				
 				$label = !empty($TParam['title'][$key]) ? $TParam['title'][$key] : $key ;
 				$TParam['list']['head_search'].='<div><span style="min-width:200px;display:inline-block;">'.$libelle.'</span> '.$fsearch.'</div>';	
 			}
-				
 		}
 		
 		$search_button = ' <a href="#" onclick="Listview_submitSearch(this);" class="list-search-link">'.img_search().'</a>';
 
-		if(!empty($TParam['list']['head_search'])) {
+		if(!empty($TParam['list']['head_search']))
+		{
 			$TParam['list']['head_search']='<div style="float:right;">'.$search_button.'</div>'.$TParam['list']['head_search'];
 		}
 		
-		if($nb_search_in_bar>0) {
+		if($nb_search_in_bar>0)
+		{
 			end($TSearch);
 			list($key,$v) = each($TSearch);
 			$TSearch[$key].=$search_button;
 		}
-		else{
+		else
+        {
 			$TSearch=array();
 		}
 		
 		return $TSearch;
 	}
 
-	/*
-	 * Function analysant et totalisant une colonne
-	 * Supporté : sum, average
-	 */
-	private function get_total(&$TField, &$TParam) {
+    /**
+     * Function to analyse and calculate the total from a column
+     *
+     * @param $TField
+     * @param $TParam
+     * @return array
+     */
+    private function get_total(&$TField, &$TParam)
+    {
 		$TTotal=$TTotalGroup=array();	
 		
-		if(!empty($TParam['math']) && !empty($TField[0])) {
-			
-			foreach($TField[0] as $field=>$value) {
+		if(!empty($TParam['math']) && !empty($TField[0]))
+		{
+			foreach($TField[0] as $field=>$value)
+			{
 				$TTotal[$field]='';	
 				$TTotalGroup[$field] = '';
 			}
 		
-			foreach($TParam['math'] as $field=>$typeMath){
-
-				if(is_array($typeMath)) {
+			foreach($TParam['math'] as $field=>$typeMath)
+			{
+				if(is_array($typeMath))
+				{
 					$targetField = $typeMath[1];
 					$typeMath = $typeMath[0];
 				}
-				else {
+				else
+                {
 					$targetField = $field;
 				}
 
-				if($typeMath == 'groupsum') {
+				if($typeMath == 'groupsum')
+				{
 					$TTotalGroup[$field] = array('target'=>$targetField, 'values'=> $this->TTotalTmp['@groupsum'][$targetField]);
-					
 				}
-				else if($typeMath=='average') {
+				else if($typeMath=='average')
+				{
 					$TTotal[$field]=array_sum($this->TTotalTmp[$targetField]) / count($this->TTotalTmp[$targetField]);
 				}
-				elseif($typeMath=='count') {
+				elseif($typeMath=='count')
+                {
 					$TTotal[$field]=count($this->TTotalTmp[$targetField]);
 				}
-				else {
+				else
+                {
 					$TTotal[$field]=array_sum($this->TTotalTmp[$targetField]);
 				}
-								
 			}
-			
-		
 		}
 		
 		return array($TTotal,$TTotalGroup);
 	}
 
-	private function getJS() {
+    /**
+     * @return string
+     */
+    private function getJS()
+    {
 		$javaScript = '<script language="javascript">
 		if(typeof(Listview_include)=="undefined") {
 			document.write("<script type=\"text/javascript\" src=\"'.DOL_URL_ROOT.'/core/js/listview.js?version='.DOL_VERSION.'\"></scr");
@@ -432,55 +457,66 @@ class Listview
 		return $javaScript;
 	}
 
-	private function setExport(&$TParam,$TField,$THeader) {
+    /**
+     * @param $TParam
+     * @param $TField
+     * @param $THeader
+     * @return array
+     */
+    private function setExport(&$TParam, $TField, $THeader)
+    {
 		global $langs;
 		
 		$Tab=array();
-		if(!empty($TParam['export'])) {
+		if(!empty($TParam['export']))
+		{
 			$token = GETPOST('token');
 			if(empty($token)) $token = md5($this->id.time().rand(1,9999));
 
-			$_SESSION['token_list_'.$token] = gzdeflate( serialize( array(
-				'title'=>$this->title
-				,'sql'=>$this->sql
-				,'TBind'=>$this->TBind
-				,'TChamps'=>$TField
-				,'TEntete'=>$THeader
-			) ) );
+            $_SESSION['token_list_'.$token] = gzdeflate( serialize( array(
+                'title'=>$this->title,
+                'sql'=>$this->sql,
+                'TBind'=>$this->TBind,
+                'TChamps'=>$TField,
+                'TEntete'=>$THeader
+            )));
 
-			foreach($TParam['export'] as $mode_export) {
-				
-				$Tab[] = array(
-						'label'=>$langs->trans('Export'.$mode_export)
-						,'url'=>dol_buildpath('/abricot/downlist.php',1)
-						,'mode'=>$mode_export
-						,'token'=>$token
-						,'session_name'=>session_name()
-				);
-				
+            foreach($TParam['export'] as $mode_export)
+            {
+                $Tab[] = array(
+                    'label'=>$langs->trans('Export'.$mode_export),
+                    'url'=>dol_buildpath('/abricot/downlist.php',1),
+                    'mode'=>$mode_export,
+                    'token'=>$token,
+                    'session_name'=>session_name()
+                );
 			}
 			
 		}
 		
-		
 		return $Tab;
 	}
 
-	private function addTotalGroup($TField,$TTotalGroup) {
+    /**
+     * @param $TField
+     * @param $TTotalGroup
+     * @return array
+     */
+    private function addTotalGroup($TField, $TTotalGroup)
+    {
 		global $langs;
 		
 		$Tab=array();
-		
 		$proto_total_line = array();
-		
 		$tagbase = $old_tagbase = null;
-		
 		$addGroupLine = false;
 		
-		foreach($TField as $k=>&$line) {
-				
-			if(empty($proto_total_line)) {
-				foreach($line as $field=>$value) {
+		foreach($TField as $k=>&$line)
+		{
+			if(empty($proto_total_line))
+			{
+				foreach($line as $field=>$value)
+				{
 					$proto_total_line[$field] = '';
 				}
 				$group_line = $proto_total_line;	
@@ -489,19 +525,19 @@ class Listview
 			$addGroupLine = false;
 			
 			$tagbase = '';
-			foreach($line as $field=>$value) {
-				
-				if(!empty($TTotalGroup[$field])) {
+			foreach($line as $field=>$value)
+			{
+				if(!empty($TTotalGroup[$field]))
+				{
 					$tagbase.=$value.'|';
 					$group_line[$field] = '<div style="text-align:right; font-weight:bold; color:#552266;">'.(empty($value) ? $langs->trans('Empty') : $value ).' : </div>';
 					$group_line[$TTotalGroup[$field]['target']] = '<div style="text-align:right; font-weight:bold; color:#552266;">'.price($TTotalGroup[$field]['values'][$value]).'</div>';
 					$addGroupLine = true;
 				}
-				
 			}
 			
-			if(!is_null($old_tagbase) && $old_tagbase!=$tagbase && $addGroupLine) {
-			//	var_dump(array($k,$tagbase,$old_tagbase,$empty_line));
+			if(!is_null($old_tagbase) && $old_tagbase!=$tagbase && $addGroupLine)
+			{
 				$Tab[] = $previous_group_line;
 			}
 			
@@ -510,30 +546,36 @@ class Listview
 			$group_line = $proto_total_line;
 			
 			$Tab[] = $line;
-			
-			
-			
 		}
-		if($addGroupLine) {
+
+		if($addGroupLine)
+		{
 			$Tab[] = $previous_group_line;
 		}
 		
-		
 		return $Tab;
 	}
-	
-	private function renderList(&$THeader, &$TField, &$TTotal,&$TTotalGroup, &$TParam) {
-		
+
+    /**
+     * @param $THeader
+     * @param $TField
+     * @param $TTotal
+     * @param $TTotalGroup
+     * @param $TParam
+     * @return string
+     */
+    private function renderList(&$THeader, &$TField, &$TTotal, &$TTotalGroup, &$TParam)
+    {
 		$TSearch = $this->setSearch($THeader, $TParam);
 		$TExport=$this->setExport($TParam, $TField, $THeader);
 		$TField = $this->addTotalGroup($TField,$TTotalGroup);
 		
 		$out = $this->getJS();
 		$out.=load_fiche_titre($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $TParam['limit']['page'], count($TField), 'title_products.png', 0, '', '', $limit);
-		$out.='<table id="'.$this->id.'" class="liste" width="100%">
-			<thead>';
+		$out.='<table id="'.$this->id.'" class="liste" width="100%"><thead>';
 		
-		if(!empty($TParam['list']['head_search'])) {
+		if(!empty($TParam['list']['head_search']))
+		{
 			$out.='<tr class="liste_titre barre-recherche-head">
 					<td colspan="'.count($THeader).'">'.$TParam['list']['head_search'].'</td>
 				</tr>';
@@ -541,7 +583,8 @@ class Listview
 			
 		$out.='<tr class="liste_titre">';
 		
-		foreach($THeader as $field=>$head) {
+		foreach($THeader as $field=>$head)
+		{
 			if(empty($head['width']))$head['width']='auto';
 			
 			$out.='<th style="width:'.$head['width'].';text-align:'.$head['text-align'].'" class="liste_titre">'.$head['libelle'];
@@ -557,12 +600,14 @@ class Listview
 		
 		$out.='</tr>';
 			
-		if(count($TSearch)>0) {
+		if(count($TSearch)>0)
+		{
 			$out.='<tr class="liste_titre barre-recherche">';
-			foreach($TSearch as $field=>$search) {
+			foreach($TSearch as $field=>$search)
+			{
 				$out.='<td class="liste_titre">'.$search.'</td>';
-				
 			}
+
 			$out.='</tr>';
 		}
 				
@@ -570,50 +615,54 @@ class Listview
 		
 		$class='pair';
 		
-		if(empty($TField)) {
-			$out.='<tr class="'.$class.'">
-					<td colspan="'.$TParam['list']['nb_columns'].'">'.$TParam['list']['messageNothing'].'</td></tr>';
-			
+		if(empty($TField))
+		{
+			$out.='<tr class="'.$class.'"><td colspan="'.$TParam['list']['nb_columns'].'">'.$TParam['list']['messageNothing'].'</td></tr>';
 		}
-		else{
-			
-			foreach($TField as $fields) { //TODO pagination limit
-					
+		else
+        {
+			foreach($TField as $fields)
+			{
 				$class = ($class=='pair') ? 'impair' : 'pair';
 				$out.='<tr class="'.$class.'"> <!-- '.$field.' -->';
 			
-				foreach($fields as $field=>$value) {
+				foreach($fields as $field=>$value)
+				{
 					$out.='<td field="'.$field.'">'.$value.'</td>';
 				}
 					
 				$out.='</tr>';
-					
 			}
 			
 			$out.='</tbody>';
 			
-			if(!empty($TParam['list']['haveTotal'])) {
-				$out.='<tfoot>
-				<tr class="liste_total">';
+			if(!empty($TParam['list']['haveTotal']))
+			{
+				$out.='<tfoot><tr class="liste_total">';
 			
-				foreach($TTotal as $field=>$total) {
+				foreach($TTotal as $field=>$total)
+				{
 					$out.='<td align="right" field="'.$field.'">'.price($total).'</td>';
 				}
 					
 				$out.='</tr></tfoot>';
 			}
-				
 		}
-		
-			
+
 		$out.='</table>';
 		
 		return $out;
 	}
-	
-	public function renderArray(&$db,$TField, $TParam=array()) {
+
+    /**
+     * @param $db
+     * @param $TField
+     * @param array $TParam
+     */
+    public function renderArray(&$db, $TField, $TParam=array())
+    {
 		$this->typeRender = 'array';
-		// on conserve db pour le traitement ultérieur des subQuery
+
 		$THeader=array();
 		$TField=array();	
 		
@@ -622,21 +671,28 @@ class Listview
 		$this->parse_array($THeader, $TField, $TParam);
 		list($TTotal, $TTotalGroup)=$this->get_total($TField, $TParam);
 		
-		$this->renderList($THeader, $TField,$TTotal,$TTotalGroup, $TParam);	
-		
+		$this->renderList($THeader, $TField,$TTotal,$TTotalGroup, $TParam);
 	}
 
-	private function order_by($sql, &$TParam) {
-		$first = true;	
-		//	print_r($TParam['orderBy']);
-		if(!empty($TParam['orderBy'])) {
-			
-			if(strpos($sql,'LIMIT ')!==false) { //TODO regex
+
+    /**
+     * @param $sql
+     * @param $TParam
+     * @return string
+     */
+    private function order_by($sql, &$TParam)
+    {
+		$first = true;
+		if(!empty($TParam['orderBy']))
+		{
+			if(strpos($sql,'LIMIT ')!==false)
+			{
 				list($sql, $sqlLIMIT) = explode('LIMIT ', $sql);
 			}
 			
 			$sql.=' ORDER BY '; 
-			foreach($TParam['orderBy'] as $field=>$order) {
+			foreach($TParam['orderBy'] as $field=>$order)
+			{
 				if(!$first) $sql.=',';
 				
 				if($order=='DESC')$TParam['list']['orderDown'] = $field;
@@ -649,13 +705,18 @@ class Listview
 			}
 			
 			if(!empty($sqlLIMIT))$sql.=' LIMIT '.$sqlLIMIT;
-			
 		}
 		
 		return $sql;
 	}
-	
-	private function parse_array(&$THeader, &$TField, &$TParam)
+
+    /**
+     * @param $THeader
+     * @param $TField
+     * @param $TParam
+     * @return bool
+     */
+    private function parse_array(&$THeader, &$TField, &$TParam)
     {
 		$first = true;
 
@@ -664,38 +725,42 @@ class Listview
 		
 		if (empty($TField)) return false;
 		
-		foreach($TField as $row) {
-			if($first) {
+		foreach($TField as $row)
+		{
+			if($first)
+			{
 				$this->initHeader($THeader, $TParam, $row);
 				$first=false;
 			}	
 			
 			$this->set_line($TField, $TParam, $row);
-		}		
-
+		}
 	}
-	
-	private function initHeader(&$THeader, &$TParam, $currentLine) {
-		
+
+    /**
+     * @param $THeader
+     * @param $TParam
+     * @param $currentLine
+     */
+    private function initHeader(&$THeader, &$TParam, $currentLine)
+    {
+        global $db,$conf,$user;
+
 		$TField=$TFieldVisibility=array();
-		
-		foreach ($currentLine as $field => $value) {
+		foreach ($currentLine as $field => $value)
+		{
 			$TField[$field]=true;
 		}
 		
-		global $user;
-		
 		$contextpage=md5($_SERVER['PHP_SELF']);
-		if(!empty($TParam['allow-field-select'])) {
-			
+		if(!empty($TParam['allow-field-select']))
+		{
 			include_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
-			
-			global $db,$conf,$user;
 			$form=new Form($db);
-				
 			$selectedfields = GETPOST('Listview'.$this->id.'_selectedfields');
 			
-			if(!empty($selectedfields)) {
+			if(!empty($selectedfields))
+			{
 				include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 				$tabparam['MAIN_SELECTEDFIELDS_'.$contextpage]=$selectedfields;
 	    		$result=dol_set_user_param($db, $conf, $user, $tabparam);
@@ -721,54 +786,58 @@ class Listview
 						'label'=>$libelle
 						,'checked'=>$visible
 					);
-					
-					
 		        }
 			}
-			else{
+			else
+            {
 				foreach($TField as $field=>$dummy)
 		        {
 		        	$libelle = isset($TParam['title'][$field]) ? $TParam['title'][$field] : $field;
-					$visible = (!in_array($field,$TParam['hide'])) ? 1 : 0;	
+					$visible = (!in_array($field, $TParam['hide'])) ? 1 : 0;
 					$TFieldVisibility[$field]=array(
-						'label'=>$libelle
-						,'checked'=>$visible
+						'label'=>$libelle,
+						'checked'=>$visible
 					);
 				}
 			}	
 
 			$selectedfields=$form->multiSelectArrayWithCheckbox('Listview'.$this->id.'_selectedfields', $TFieldVisibility, $contextpage);	// This also change content of $arrayfields_0
-			
 		}
 		
-		foreach ($currentLine as $field => $value) {
+		foreach ($currentLine as $field => $value)
+		{
 			$libelle = isset($TParam['title'][$field]) ? $TParam['title'][$field] : $field;
 			$visible = (!in_array($field,$TParam['hide'])) ? 1 : 0;	
 			
-			if($visible) {
+			if($visible)
+			{
 				$lastfield = $field;
 				$THeader[$field] = array(
-					'libelle'=>$libelle
-					,'order'=>(in_array($field, $TParam['orderby']['noOrder']) ? 0 : 1)
-					,'width'=>(!empty($TParam['size']['width'][$field]) ? $TParam['size']['width'][$field] : 'auto')
-					,'text-align'=>(!empty($TParam['position']['text-align'][$field]) ? $TParam['position']['text-align'][$field] : 'auto')
-					,'more'=>''
+					'libelle'=>$libelle,
+					'order'=>(in_array($field, $TParam['orderby']['noOrder']) ? 0 : 1),
+					'width'=>(!empty($TParam['size']['width'][$field]) ? $TParam['size']['width'][$field] : 'auto'),
+					'text-align'=>(!empty($TParam['position']['text-align'][$field]) ? $TParam['position']['text-align'][$field] : 'auto'),
+					'more'=>''
 				);
-				  
 			}
 		}
 		
-		if(!empty($selectedfields) && !empty($lastfield)) {
+		if(!empty($selectedfields) && !empty($lastfield))
+		{
 			$THeader[$lastfield]['more']='<div style="float:right">'.$selectedfields.'</div>';
 		}
-		
-		
 	}
-	
-	private function in_view(&$TParam, $line_number) {
+
+    /**
+     * @param $TParam
+     * @param $line_number
+     * @return bool
+     */
+    private function in_view(&$TParam, $line_number)
+    {
 		global $conf;
 
-		if(!empty($_REQUEST['get-all-for-export'])) return true; // doit être dans la vue
+		if(!empty($_REQUEST['get-all-for-export'])) return true;
 
 		$page_number = !empty($TParam['limit']['page']) ? $TParam['limit']['page'] : 1;
 		$line_per_page = !empty($TParam['limit']['nbLine']) ? $TParam['limit']['nbLine'] : $conf->liste_limit;
@@ -779,112 +848,143 @@ class Listview
 		if($line_number>=$start && $line_number<=$end) return true;
 		else return false;
 	}
-	
-	private function set_line(&$TField, &$TParam, $currentLine) {
-		
-			global $conf;
-		
-			$line_number = count($TField);
-			
-			if($this->in_view($TParam,$line_number)) {
-				
-				$row=array(); $trans = array();
-				foreach($currentLine as $field=>$value) {
-					
-					if(is_object($value)) {
-						if(get_class($value)=='stdClass') {$value=print_r($value, true);}
-						else $value=(string)$value;
-					} 
-					
-					$trans['@'.$field.'@'] = $value;
-					
-					if(!empty($TParam['math'][$field])) {
-						$float_value = (double)strip_tags($value);
-						$this->TTotalTmp[$field][] = $float_value;
-					}
-					
-					if(!in_array($field,$TParam['hide'])) {
-						$row[$field]=$value;
-						
-						if(isset($TParam['eval'][$field]) && in_array($field,array_keys($row))) {
-							$strToEval = 'return '.strtr( $TParam['eval'][$field] ,  array_merge( $trans, array('@val@'=>$row[$field])  )).';';
-							$row[$field] = eval($strToEval);
-						}
-						
-						if(isset($TParam['type'][$field]) && !isset($TParam['eval'][$field])) {
-							if($TParam['type'][$field]=='date' 
-								|| $TParam['type'][$field]=='datetime' ) {
 
-								if($row[$field] != '0000-00-00 00:00:00' && $row[$field] != '1000-01-01 00:00:00' && $row[$field] != '0000-00-00' && !empty($row[$field])) {
-									if($TParam['type'][$field]=='datetime')$row[$field] = dol_print_date(strtotime($row[$field]),'dayhoursec');
-									else $row[$field] = dol_print_date(strtotime($row[$field]),'day');
-								} else {
-									$row[$field] = '';
-								}
-							}
-							if($TParam['type'][$field]=='hour') { $row[$field] = date('H:i', strtotime($row[$field])); }
-							if($TParam['type'][$field]=='money') { $row[$field] = '<div align="right">'.price($row[$field],0,'',1,-1,2).'</div>'; }
-							if($TParam['type'][$field]=='number') { $row[$field] = '<div align="right">'.price($row[$field]).'</div>'; }
-							if($TParam['type'][$field]=='integer') { $row[$field] = '<div align="right">'.(int)$row[$field].'</div>'; }
-						}
-	
-	                                        if(isset($TParam['link'][$field])) {
-	                                                if(empty($row[$field]) && $row[$field]!==0 && $row[$field]!=='0')$row[$field]='(vide)';
-	                                                $row[$field]= strtr( $TParam['link'][$field],  array_merge( $trans, array('@val@'=>$row[$field])  )) ;
-	                                        }
-	                                        
-	                                        if(isset($TParam['translate'][$field])) {
-							if(isset($TParam['translate'][$field][''])) unset($TParam['translate'][$field]['']);
-	                                                $row[$field] = strtr( $row[$field] , $TParam['translate'][$field]);
-	                                        }
-	
-	
-					} 
-					
-					
-				} 
-			}
-			else{
-				$row=array(); 
+    /**
+     * @param $TField
+     * @param $TParam
+     * @param $currentLine
+     */
+    private function set_line(&$TField, &$TParam, $currentLine)
+    {
+        global $conf;
 
-				foreach($currentLine as $field=>&$value) {
-					if(!isset($this->THideFlip[$field])) {
-						if(isset($TParam['math'][$field]) && !empty($TParam['math'][$field])) {
-							$float_value = (double)strip_tags($value);
-							$this->TTotalTmp[$field][] = $float_value;
-						}
-						
-						$row[$field] = $value;
-					}
-				}
-			}
+        $line_number = count($TField);
 
-			if(!empty($TParam['math'][$field])) {
-			foreach($row as $field=>$value) {
-				if(!empty($TParam['math'][$field]) && is_array($TParam['math'][$field])) {
-						$toField = $TParam['math'][$field][1];
-						$float_value = (double)strip_tags($row[$toField]);
-						$this->TTotalTmp['@groupsum'][$toField][ $row[$field]  ] +=$float_value;
-						
-				}
-			}
-			}
-			$TField[] = $row;	
+        if($this->in_view($TParam,$line_number))
+        {
+
+            $row=array(); $trans = array();
+            foreach($currentLine as $field=>$value)
+            {
+                if(is_object($value))
+                {
+                    if(get_class($value)=='stdClass') {$value=print_r($value, true);}
+                    else $value=(string)$value;
+                }
+
+                $trans['@'.$field.'@'] = $value;
+
+                if(!empty($TParam['math'][$field]))
+                {
+                    $float_value = (double)strip_tags($value);
+                    $this->TTotalTmp[$field][] = $float_value;
+                }
+
+                if(!in_array($field,$TParam['hide']))
+                {
+                    $row[$field]=$value;
+
+                    if(isset($TParam['eval'][$field]) && in_array($field,array_keys($row)))
+                    {
+                        $strToEval = 'return '.strtr( $TParam['eval'][$field] ,  array_merge( $trans, array('@val@'=>$row[$field])  )).';';
+                        $row[$field] = eval($strToEval);
+                    }
+
+                    if(isset($TParam['type'][$field]) && !isset($TParam['eval'][$field]))
+                    {
+                        if($TParam['type'][$field]=='date' || $TParam['type'][$field]=='datetime' )
+                        {
+
+                            if($row[$field] != '0000-00-00 00:00:00' && $row[$field] != '1000-01-01 00:00:00' && $row[$field] != '0000-00-00' && !empty($row[$field]))
+                            {
+                                if($TParam['type'][$field]=='datetime')$row[$field] = dol_print_date(strtotime($row[$field]),'dayhoursec');
+                                else $row[$field] = dol_print_date(strtotime($row[$field]),'day');
+                            }
+                            else
+                            {
+                                $row[$field] = '';
+                            }
+                        }
+
+                        if($TParam['type'][$field]=='hour') { $row[$field] = date('H:i', strtotime($row[$field])); }
+                        if($TParam['type'][$field]=='money') { $row[$field] = '<div align="right">'.price($row[$field],0,'',1,-1,2).'</div>'; }
+                        if($TParam['type'][$field]=='number') { $row[$field] = '<div align="right">'.price($row[$field]).'</div>'; }
+                        if($TParam['type'][$field]=='integer') { $row[$field] = '<div align="right">'.(int)$row[$field].'</div>'; }
+                    }
+
+                    if(isset($TParam['link'][$field]))
+                    {
+                        if(empty($row[$field]) && $row[$field]!==0 && $row[$field]!=='0')$row[$field]='(vide)';
+                        $row[$field]= strtr( $TParam['link'][$field],  array_merge( $trans, array('@val@'=>$row[$field]))) ;
+                    }
+
+                    if(isset($TParam['translate'][$field]))
+                    {
+                        if(isset($TParam['translate'][$field][''])) unset($TParam['translate'][$field]['']);
+
+                        $row[$field] = strtr( $row[$field] , $TParam['translate'][$field]);
+                    }
+                }
+            }
+        }
+        else
+        {
+            $row = array();
+
+            foreach($currentLine as $field=>&$value)
+            {
+                if(!isset($this->THideFlip[$field]))
+                {
+                    if(isset($TParam['math'][$field]) && !empty($TParam['math'][$field]))
+                    {
+                        $float_value = (double)strip_tags($value);
+                        $this->TTotalTmp[$field][] = $float_value;
+                    }
+
+                    $row[$field] = $value;
+                }
+            }
+        }
+
+        if(!empty($TParam['math'][$field]))
+        {
+            foreach($row as $field=>$value)
+            {
+                if(!empty($TParam['math'][$field]) && is_array($TParam['math'][$field]))
+                {
+                    $toField = $TParam['math'][$field][1];
+                    $float_value = (double)strip_tags($row[$toField]);
+                    $this->TTotalTmp['@groupsum'][$toField][ $row[$field]  ] +=$float_value;
+                }
+            }
+        }
+
+        $TField[] = $row;
 	}
-	
-	private function limitSQL($sql,&$TParam) {
-		
-		if(!empty($TParam['limit']['global']) && strpos($sql,'LIMIT ')===false ) {
-			
+
+    /**
+     * @param $sql
+     * @param $TParam
+     * @return string
+     */
+    private function limitSQL($sql, &$TParam)
+    {
+		if(!empty($TParam['limit']['global']) && strpos($sql,'LIMIT ')===false )
+		{
 			$sql.=' LIMIT '.(int)$TParam['limit']['global'];
-			
 		}
 		
 		return $sql;
 	}
-	
-	private function parse_sql( &$THeader, &$TField,&$TParam, $sql) {
-		
+
+    /**
+     * @param $THeader
+     * @param $TField
+     * @param $TParam
+     * @param $sql
+     */
+    private function parse_sql(&$THeader, &$TField, &$TParam, $sql)
+    {
 		$this->sql = $this->limitSQL($sql, $TParam);
 		
 		$this->TTotalTmp=array();
@@ -892,25 +992,26 @@ class Listview
 		$this->THideFlip = array_flip($TParam['hide']);
 
 		$res = $this->db->query($this->sql);
-		if($res!==false) {
-			
+		if($res!==false)
+		{
 			dol_syslog(get_class($this)."::parse_sql id=".$this->id." sql=".$this->sql, LOG_DEBUG);
 			
 			$first=true;
-			while($currentLine = $this->db->fetch_object($res)) {
-				if($first) {
+			while($currentLine = $this->db->fetch_object($res))
+            {
+				if($first)
+				{
 					$this->initHeader($THeader, $TParam, $currentLine);
 					$first = false;
 				}
 				
 				$this->set_line($TField, $TParam, $currentLine);
-				
 			}
 			
 		}
-		else {
+		else
+        {
 			dol_syslog(get_class($this)."::parse_sql id=".$this->id." sql=".$this->sql, LOG_ERR);
 		}
-		
 	}	
 }
diff --git a/htdocs/inventory/list.php b/htdocs/inventory/list.php
index 23d25913ccd..7efc1fae342 100644
--- a/htdocs/inventory/list.php
+++ b/htdocs/inventory/list.php
@@ -50,33 +50,33 @@ $THide = array('label','title');
 echo $list->render(Inventory::getSQL('All'), array(
     'link'=>array(
         'fk_warehouse'=>'<a href="'.DOL_URL_ROOT.'/product/stock/card.php?id=@val@">'.img_picto('','object_stock.png','',0).' @label@</a>'
-    )
-    ,'translate'=>array()
-    ,'hide'=>$THide
-    ,'type'=>array(
-        'datec'=>'date'
-        ,'tms'=>'datetime'
-        ,'date_inventory'=>'date'
-    )
-    ,'list'=>array(
-        'title'=>$langs->trans('inventoryListTitle')
-        ,'messageNothing'=>$langs->trans('inventoryListEmpty')
-    )
-    ,'title'=>array(
-        'rowid'=>$langs->trans('Title')
-        ,'fk_warehouse'=>$langs->trans('Warehouse')
-        ,'date_inventory'=>$langs->trans('InventoryDate')
-        ,'datec'=>$langs->trans('DateCreation')
-        ,'tms'=>$langs->trans('DateUpdate')
-        ,'status'=>$langs->trans('Status')
-    )
-    ,'eval'=>array(
-        'status' => '(@val@ ? img_picto("'.$langs->trans("inventoryValidate").'", "statut4") : img_picto("'.$langs->trans("inventoryDraft").'", "statut3"))'
-        ,'rowid'=>'Inventory::getLink(@val@)'
-    )
-    ,'search'=>array(
-        'date_inventory'=>'calendars'
-        ,'status'=>array(1=>$langs->trans("inventoryValidate"), 0=>$langs->trans("inventoryDraft"))
+    ),
+    'translate'=>array(),
+    'hide'=>$THide,
+    'type'=>array(
+        'datec'=>'date',
+        'tms'=>'datetime',
+        'date_inventory'=>'date'
+    ),
+    'list'=>array(
+        'title'=>$langs->trans('inventoryListTitle'),
+        'messageNothing'=>$langs->trans('inventoryListEmpty')
+    ),
+    'title'=>array(
+        'rowid'=>$langs->trans('Title'),
+        'fk_warehouse'=>$langs->trans('Warehouse'),
+        'date_inventory'=>$langs->trans('InventoryDate'),
+        'datec'=>$langs->trans('DateCreation'),
+        'tms'=>$langs->trans('DateUpdate'),
+        'status'=>$langs->trans('Status')
+    ),
+    'eval'=>array(
+        'status' => '(@val@ ? img_picto("'.$langs->trans("inventoryValidate").'", "statut4") : img_picto("'.$langs->trans("inventoryDraft").'", "statut3"))',
+        'rowid'=>'Inventory::getLink(@val@)'
+    ),
+    'search'=>array(
+        'date_inventory'=>'calendars',
+        'status'=>array(1=>$langs->trans("inventoryValidate"), 0=>$langs->trans("inventoryDraft"))
     )
 ));
 

From 4197254209e505b4f48bf8fb742925958769a90d Mon Sep 17 00:00:00 2001
From: atm-ph <phf@atm-consulting.fr>
Date: Sat, 25 Mar 2017 19:09:58 +0100
Subject: [PATCH 031/505] Fix remove button on list to create a new inventory

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

diff --git a/htdocs/inventory/list.php b/htdocs/inventory/list.php
index 7efc1fae342..bcea7794f7a 100644
--- a/htdocs/inventory/list.php
+++ b/htdocs/inventory/list.php
@@ -81,12 +81,12 @@ echo $list->render(Inventory::getSQL('All'), array(
 ));
 
 
-if (!empty($user->rights->inventory->create))
+/*if (!empty($user->rights->inventory->create))
 {
     print '<div class="tabsAction">';
     print '<a class="butAction" href="inventory.php?action=create">'.$langs->trans('inventoryCreate').'</a>';
     print '</div>';
-}
+}*/
 
 echo '</form>';
 

From 21e30e43d96cd90a041461d4cbab72aad800eec3 Mon Sep 17 00:00:00 2001
From: atm-ph <phf@atm-consulting.fr>
Date: Sat, 25 Mar 2017 19:10:16 +0100
Subject: [PATCH 032/505] Update entries menus

---
 htdocs/core/modules/modInventory.class.php | 100 ++++++++++-----------
 1 file changed, 45 insertions(+), 55 deletions(-)

diff --git a/htdocs/core/modules/modInventory.class.php b/htdocs/core/modules/modInventory.class.php
index d3ee39c89ff..11b4c992e6a 100644
--- a/htdocs/core/modules/modInventory.class.php
+++ b/htdocs/core/modules/modInventory.class.php
@@ -214,64 +214,54 @@ class modinventory extends DolibarrModules
 		$this->menu = array();			// List of menus to add
 		$r=0;
 
-		// Add here entries to declare new menus
-		//
-		// Example to declare a new Top Menu entry and its Left menu entry:
-		// $this->menu[$r]=array(	'fk_menu'=>0,			                // Put 0 if this is a top menu
-		//							'type'=>'top',			                // This is a Top menu entry
-		//							'titre'=>'inventory top menu',
-		//							'mainmenu'=>'inventory',
-		//							'leftmenu'=>'inventory',
-		//							'url'=>'/inventory/pagetop.php',
-		//							'langs'=>'mylangfile@inventory',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-		//							'position'=>100,
-		//							'enabled'=>'$conf->inventory->enabled',	// Define condition to show or hide menu entry. Use '$conf->inventory->enabled' if entry must be visible if module is enabled.
-		//							'perms'=>'1',			                // Use 'perms'=>'$user->rights->inventory->level1->level2' if you want your menu with a permission rules
-		//							'target'=>'',
-		//							'user'=>2);				                // 0=Menu for internal users, 1=external users, 2=both
-		// $r++;
-		//
-		// Example to declare a Left Menu entry into an existing Top menu entry:
-		// $this->menu[$r]=array(	'fk_menu'=>'fk_mainmenu=xxx',		    // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-		//							'type'=>'left',			                // This is a Left menu entry
-		//							'titre'=>'inventory left menu',
-		//							'mainmenu'=>'xxx',
-		//							'leftmenu'=>'inventory',
-		//							'url'=>'/inventory/pagelevel2.php',
-		//							'langs'=>'mylangfile@inventory',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-		//							'position'=>100,
-		//							'enabled'=>'$conf->inventory->enabled',  // Define condition to show or hide menu entry. Use '$conf->inventory->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-		//							'perms'=>'1',			                // Use 'perms'=>'$user->rights->inventory->level1->level2' if you want your menu with a permission rules
-		//							'target'=>'',
-		//							'user'=>2);				                // 0=Menu for internal users, 1=external users, 2=both
-		// $r++;
-		$this->menu[$r]=array(	'fk_menu'=>'fk_mainmenu=products,fk_leftmenu=stock',			                // Put 0 if this is a top menu
-								'type'=>'left',			                // This is a Top menu entry
-								'titre'=>'ListInventory',
-								'mainmenu'=>'inventory',
-								'leftmenu'=>'inventory',
-								'url'=>'/inventory/list.php',
-								'langs'=>'inventory',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-								'position'=>100,
-								'enabled'=>'$conf->inventory->enabled',	// Define condition to show or hide menu entry. Use '$conf->inventory->enabled' if entry must be visible if module is enabled.
-								'perms'=>'$user->rights->inventory->read',			                // Use 'perms'=>'$user->rights->inventory->level1->level2' if you want your menu with a permission rules
-								'target'=>'',
-								'user'=>2);				                // 0=Menu for internal users, 1=external users, 2=both
-		$r++;
+
+        $this->menu[$r]=array(
+            'fk_menu'=>'fk_mainmenu=products',			                // Put 0 if this is a top menu
+            'type'=>'left',			                // This is a Top menu entry
+            'titre'=>'Inventory',
+            'mainmenu'=>'products',
+            'leftmenu'=>'inventory_left',
+            'url'=>'/inventory/list.php',
+            'langs'=>'inventory',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+            'position'=>100+$r,
+            'enabled'=>'$conf->inventory->enabled',	// Define condition to show or hide menu entry. Use '$conf->inventory->enabled' if entry must be visible if module is enabled.
+            'perms'=>'$user->rights->inventory->read',			                // Use 'perms'=>'$user->rights->inventory->level1->level2' if you want your menu with a permission rules
+            'target'=>'',
+            'user'=>2
+        );				                // 0=Menu for internal users, 1=external users, 2=both
+        $r++;
 		
-		$this->menu[$r]=array(	'fk_menu'=>'fk_mainmenu=products,fk_leftmenu=stock',			                // Put 0 if this is a top menu
-								'type'=>'left',			                // This is a Top menu entry
-								'titre'=>'NewInventory',
-								'mainmenu'=>'inventory',
-								'leftmenu'=>'inventory',
-								'url'=>'/inventory/inventory.php?action=create',
-								'position'=>100,
-								'enabled'=>'$conf->inventory->enabled',	// Define condition to show or hide menu entry. Use '$conf->inventory->enabled' if entry must be visible if module is enabled.
-								'perms'=>'$user->rights->inventory->create',			                // Use 'perms'=>'$user->rights->inventory->level1->level2' if you want your menu with a permission rules
-								'target'=>'',
-								'user'=>2);				                // 0=Menu for internal users, 1=external users, 2=both
+		$this->menu[$r]=array(
+		    'fk_menu'=>'fk_mainmenu=products,fk_leftmenu=inventory_left',			                // Put 0 if this is a top menu
+            'type'=>'left',			                // This is a Top menu entry
+            'titre'=>'NewInventory',
+            'mainmenu'=>'products',
+            'leftmenu'=>'inventory_left_create',
+            'url'=>'/inventory/inventory.php?action=create',
+            'position'=>100+$r,
+            'enabled'=>'$conf->inventory->enabled',	// Define condition to show or hide menu entry. Use '$conf->inventory->enabled' if entry must be visible if module is enabled.
+            'perms'=>'$user->rights->inventory->create',			                // Use 'perms'=>'$user->rights->inventory->level1->level2' if you want your menu with a permission rules
+            'target'=>'',
+            'user'=>2
+        );				                // 0=Menu for internal users, 1=external users, 2=both
 		$r++;
 
+        $this->menu[$r]=array(
+            'fk_menu'=>'fk_mainmenu=products,fk_leftmenu=inventory_left',			                // Put 0 if this is a top menu
+            'type'=>'left',			                // This is a Top menu entry
+            'titre'=>'ListInventory',
+            'mainmenu'=>'products',
+            'leftmenu'=>'inventory_left_list',
+            'url'=>'/inventory/list.php',
+            'langs'=>'inventory',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+            'position'=>100+$r,
+            'enabled'=>'$conf->inventory->enabled',	// Define condition to show or hide menu entry. Use '$conf->inventory->enabled' if entry must be visible if module is enabled.
+            'perms'=>'$user->rights->inventory->read',			                // Use 'perms'=>'$user->rights->inventory->level1->level2' if you want your menu with a permission rules
+            'target'=>'',
+            'user'=>2
+        );				                // 0=Menu for internal users, 1=external users, 2=both
+        $r++;
+
 		// Exports
 		$r=1;
 

From 09f645fc9fe3801ca59c0a24f0ff512d1f23f3b6 Mon Sep 17 00:00:00 2001
From: atm-ph <phf@atm-consulting.fr>
Date: Sat, 25 Mar 2017 23:21:49 +0100
Subject: [PATCH 033/505] Fix travis

---
 htdocs/core/class/coreobject.class.php     |   2 +-
 htdocs/core/js/listview.js                 |   7 +-
 htdocs/inventory/class/inventory.class.php |  30 ++---
 htdocs/inventory/inventory.php             | 129 +++++++++------------
 htdocs/inventory/lib/inventory.lib.php     |   1 -
 5 files changed, 74 insertions(+), 95 deletions(-)

diff --git a/htdocs/core/class/coreobject.class.php b/htdocs/core/class/coreobject.class.php
index 6454c6e814b..92da1604dca 100644
--- a/htdocs/core/class/coreobject.class.php
+++ b/htdocs/core/class/coreobject.class.php
@@ -642,7 +642,7 @@ class CoreObject extends CommonObject
      * @param   array   $Tab    Array of values
      * @return                  int
      */
-    public function set_values(&$Tab)
+    public function setValues(&$Tab)
     {
 		foreach ($Tab as $key => $value)
 		{
diff --git a/htdocs/core/js/listview.js b/htdocs/core/js/listview.js
index 0affb264474..d68a7993218 100644
--- a/htdocs/core/js/listview.js
+++ b/htdocs/core/js/listview.js
@@ -90,11 +90,6 @@ function Listview_submitSearch(obj) {
 	if($form.length>0){
 		$form.submit();
 	}
-	else{
-		//There is no form for search action
-		null;
-	}
-
 }
 function Listview_launch_downloadAs(mode,url,token,session_name) {
 	 $('#listviewdAS_export_form').remove();
@@ -145,7 +140,7 @@ $(document).ready(function() {
 	});
 	
 	if(typeof $_GET["get-all-for-export"] != "undefined") {
-		Listview_launch_downloadAs($_GET["mode"],$_GET["url"],$_GET["token"],$_GET["session_name"]);
+		Listview_launch_downloadAs($_GET['mode'],$_GET['url'],$_GET['token'],$_GET['session_name']);
 	}
 	
 });
diff --git a/htdocs/inventory/class/inventory.class.php b/htdocs/inventory/class/inventory.class.php
index 46f27906cc9..5f172c7c697 100644
--- a/htdocs/inventory/class/inventory.class.php
+++ b/htdocs/inventory/class/inventory.class.php
@@ -93,7 +93,7 @@ class Inventory extends CoreObject
     /**
      * Function to sort children object
      */
-	public function sort_det() 
+	public function sortDet()
 	{
 		if(!empty($this->Inventorydet))	usort($this->Inventorydet, array('Inventory', 'customSort'));
 	}
@@ -112,7 +112,7 @@ class Inventory extends CoreObject
 		$res = parent::fetch($id, $loadChild);
 		if($res > 0)
 		{
-			$this->sort_det();
+			$this->sortDet();
 			$this->amount = 0;
 			if(!empty($this->Inventorydet ))
 			{
@@ -243,7 +243,7 @@ class Inventory extends CoreObject
      * @param   array   $Tab    Array of values
      * @return                  int
      */
-	public function set_values(&$Tab)
+	public function setValues(&$Tab)
 	{
 		global $langs;
 		
@@ -267,7 +267,7 @@ class Inventory extends CoreObject
 			}	
 		}
 		
-		return parent::set_values($Tab);
+		return parent::setValues($Tab);
 	}
 
     /**
@@ -296,7 +296,7 @@ class Inventory extends CoreObject
      * @param   int     $fk_warehouse   fk_warehouse target
      * @return                          bool
      */
-    public function add_product($fk_product, $fk_warehouse=0)
+    public function addProduct($fk_product, $fk_warehouse=0)
     {
         $k = $this->addChild('Inventorydet');
         $det =  &$this->Inventorydet[$k];
@@ -309,7 +309,7 @@ class Inventory extends CoreObject
                 
         $date = $this->get_date('date_inventory', 'Y-m-d');
         if(empty($date)) $date = $this->get_date('datec', 'Y-m-d');
-        $det->setStockDate( $date , $fk_warehouse);
+        $det->setStockDate($date, $fk_warehouse);
         
         return true;
     }
@@ -327,7 +327,7 @@ class Inventory extends CoreObject
      *  @param		string	$inventorycode	Inventory code
      * 	@return     int     				<0 if KO, >0 if OK
      */
-    public function correct_stock($fk_product, $fk_warehouse, $nbpiece, $movement, $label='', $price=0, $inventorycode='')
+    public function correctStock($fk_product, $fk_warehouse, $nbpiece, $movement, $label='', $price=0, $inventorycode='')
 	{
 		global $conf, $user;
 
@@ -397,7 +397,7 @@ class Inventory extends CoreObject
 						
 				//$href = dol_buildpath('/inventory/inventory.php?id='.$this->id.'&action=view', 1);
 				
-				$res = $this->correct_stock($product->id, $Inventorydet->fk_warehouse, $nbpiece, $movement, $langs->trans('inventoryMvtStock'));
+				$res = $this->correctStock($product->id, $Inventorydet->fk_warehouse, $nbpiece, $movement, $langs->trans('inventoryMvtStock'));
 				if ($res < 0) return -1;
 			}
 		}
@@ -437,14 +437,14 @@ class Inventory extends CoreObject
     /**
      * Function to add products by default from warehouse and children
      *
-     * @param $fk_warehouse
-     * @param int $fk_category
-     * @param int $fk_supplier
-     * @param int $only_prods_in_stock
+     * @param int $fk_warehouse         id of warehouse
+     * @param int $fk_category          id of category
+     * @param int $fk_supplier          id of supplier
+     * @param int $only_prods_in_stock  only product with stock
      *
      * @return int
      */
-	public function add_products_for($fk_warehouse,$fk_category=0,$fk_supplier=0,$only_prods_in_stock=0)
+	public function addProductsFor($fk_warehouse,$fk_category=0,$fk_supplier=0,$only_prods_in_stock=0)
     {
         $warehouse = new Entrepot($this->db);
         $warehouse->fetch($fk_warehouse);
@@ -469,7 +469,7 @@ class Inventory extends CoreObject
 		{
 			while($obj = $this->db->fetch_object($res))
             {
-				$this->add_product($obj->fk_product, $obj->fk_entrepot);
+				$this->addProduct($obj->fk_product, $obj->fk_entrepot);
 			}
 
 			return 1;
@@ -500,7 +500,7 @@ class Inventory extends CoreObject
 
     /**
      * Function to get the sql select of inventory
-     * @param   string  $type
+     * @param   string  $type   'All' to get all data
      * @return  string
      */
 	static function getSQL($type)
diff --git a/htdocs/inventory/inventory.php b/htdocs/inventory/inventory.php
index 403b148ec2c..f9297951c22 100644
--- a/htdocs/inventory/inventory.php
+++ b/htdocs/inventory/inventory.php
@@ -33,8 +33,8 @@ require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 include_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 
-$langs->load("stock");
-$langs->load("inventory");
+$langs->load('stock');
+$langs->load('inventory');
 
 if(empty($user->rights->inventory->read)) accessforbidden();
 
@@ -58,7 +58,7 @@ function _action()
 			
 			$inventory = new Inventory($db);
 			
-			_card_warehouse( $inventory);
+			card_warehouse( $inventory);
 
 			break;
 		
@@ -66,17 +66,17 @@ function _action()
 			if (empty($user->rights->inventory->create)) accessforbidden();
 		
 			$inventory = new Inventory($db);
-			$inventory->set_values($_POST);
+			$inventory->setValues($_POST);
 			
             $fk_inventory = $inventory->create($user);
 			if($fk_inventory>0) {
             	
-            	$fk_category = (int)GETPOST('fk_category');
-            	$fk_supplier = (int)GETPOST('fk_supplier');
-            	$fk_warehouse = (int)GETPOST('fk_warehouse');
-            	$only_prods_in_stock = (int)GETPOST('OnlyProdsInStock');
+            	$fk_category = (int) GETPOST('fk_category');
+            	$fk_supplier = (int) GETPOST('fk_supplier');
+            	$fk_warehouse = (int) GETPOST('fk_warehouse');
+            	$only_prods_in_stock = (int) GETPOST('OnlyProdsInStock');
             	
-            	$inventory->add_products_for($fk_warehouse,$fk_category,$fk_supplier,$only_prods_in_stock);
+            	$inventory->addProductsFor($fk_warehouse,$fk_category,$fk_supplier,$only_prods_in_stock);
             	$inventory->update($user);
             	
             	header('Location: '.dol_buildpath('/inventory/inventory.php?id='.$inventory->id.'&action=edit', 1));
@@ -97,7 +97,7 @@ function _action()
 			$inventory = new Inventory($db);
 			$inventory->fetch(GETPOST('id'));
 			
-			_card($inventory, GETPOST('action'));
+			card($inventory, GETPOST('action'));
 			
 			break;
 			
@@ -110,12 +110,12 @@ function _action()
 			$inventory = new Inventory($db);
 			$inventory->fetch($id);
 			
-			$inventory->set_values($_REQUEST);
+			$inventory->setValues($_REQUEST);
 			
 			if ($inventory->errors)
 			{
 				setEventMessage($inventory->errors, 'errors');
-				_card( $inventory, 'edit');
+				card( $inventory, 'edit');
 			}
 			else 
 			{
@@ -136,12 +136,12 @@ function _action()
                 $inventory->status = 1;
                 $inventory->update($user);
                 
-                _card( $inventory, 'view');
+                card( $inventory, 'view');
                 
             
             }
             else {
-               _card( $inventory, 'view');
+               card( $inventory, 'view');
             }
             
 			break;
@@ -155,7 +155,7 @@ function _action()
 			
 			$inventory->changePMP($user);
 			
-			_card( $inventory, 'view');
+			card( $inventory, 'view');
 			
 			break;
 			
@@ -192,7 +192,7 @@ function _action()
 					}
 					if (!$alreadyExists)
 					{
-					    if($inventory->add_product($product->id, $fk_warehouse)) {
+					    if($inventory->addProduct($product->id, $fk_warehouse)) {
 					    	setEventMessage($langs->trans('ProductAdded'));
 					    }
 					}
@@ -204,10 +204,10 @@ function _action()
 				}
 				
 				$inventory->update($user);
-				$inventory->sort_det();
+				$inventory->sortDet();
 			}
 			
-			_card( $inventory, 'edit');
+			card( $inventory, 'edit');
 			
 			break;
 			
@@ -226,7 +226,7 @@ function _action()
 			$inventory = new Inventory($db);
 			$inventory->fetch( $id);
 			
-			_card($inventory, 'edit');
+			card($inventory, 'edit');
 			
 			break;
         case 'confirm_flush':
@@ -242,7 +242,7 @@ function _action()
             
             setEventMessage($langs->trans('InventoryFlushed'));
             
-            _card( $inventory, 'edit');
+            card( $inventory, 'edit');
            
             
             break;
@@ -283,7 +283,7 @@ function _action()
 			$inventory = new Inventory($db);
 			$inventory->fetch($id);
 				
-			_card($inventory, $action );
+			card($inventory, $action );
 				
 			
 			break;
@@ -291,7 +291,7 @@ function _action()
 	
 }
 
-function _card_warehouse(&$inventory)
+function card_warehouse(&$inventory)
 {
 	global $langs,$conf,$db, $user, $form;
 	
@@ -346,44 +346,31 @@ function _card_warehouse(&$inventory)
 	llxFooter('');
 }
 
-function _card(&$inventory, $action='edit')
+function card(&$inventory, $action='edit')
 {
 	global $langs, $conf, $db, $user,$form;
 	
 	llxHeader('',$langs->trans('inventoryEdit'),'','');
 	
-	if($action == 'changePMP') {
-	
-		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$inventory->id,$langs->trans('ApplyNewPMP')
-				,$langs->trans('ConfirmApplyNewPMP',$inventory->getTitle()),'confirm_changePMP'
-				,array(),'no',1);
-	
+	if($action == 'changePMP')
+	{
+		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$inventory->id, $langs->trans('ApplyNewPMP'), $langs->trans('ConfirmApplyNewPMP', $inventory->getTitle()), 'confirm_changePMP', array(),'no',1);
 	}
-	else if($action == 'flush') {
-	
-		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$inventory->id,$langs->trans('FlushInventory')
-				,$langs->trans('ConfirmFlushInventory',$inventory->getTitle()),'confirm_flush'
-				,array(),'no',1);
-	
+	else if($action == 'flush')
+	{
+		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$inventory->id,$langs->trans('FlushInventory'),$langs->trans('ConfirmFlushInventory',$inventory->getTitle()),'confirm_flush',array(),'no',1);
 	}
-	else if($action == 'delete') {
-	
-		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$inventory->id,$langs->trans('Delete')
-				,$langs->trans('ConfirmDelete',$inventory->getTitle()),'confirm_delete'
-				,array(),'no',1);
-	
+	else if($action == 'delete')
+	{
+		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$inventory->id,$langs->trans('Delete'),$langs->trans('ConfirmDelete',$inventory->getTitle()),'confirm_delete',array(),'no',1);
 	}
-	else if($action == 'delete_line') {
-		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$inventory->id.'&rowid='.GETPOST('rowid'),$langs->trans('DeleteLine')
-				,$langs->trans('ConfirmDeleteLine',$inventory->getTitle()),'confirm_delete_line'
-				,array(),'no',1);
-	
+	else if($action == 'delete_line')
+	{
+		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$inventory->id.'&rowid='.GETPOST('rowid'),$langs->trans('DeleteLine'),$langs->trans('ConfirmDeleteLine',$inventory->getTitle()),'confirm_delete_line',array(),'no',1);
 	}
-	else if($action == 'regulate') {
-		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$inventory->id,$langs->trans('RegulateStock')
-				,$langs->trans('ConfirmRegulateStock',$inventory->getTitle()),'confirm_regulate'
-				,array(),'no',1);
-	
+	else if($action == 'regulate')
+	{
+		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$inventory->id,$langs->trans('RegulateStock'),$langs->trans('ConfirmRegulateStock',$inventory->getTitle()),'confirm_regulate',array(),'no',1);
 	}
 	
 	$warehouse = new Entrepot($db);
@@ -392,7 +379,7 @@ function _card(&$inventory, $action='edit')
 	print dol_get_fiche_head(inventoryPrepareHead($inventory, $langs->trans('inventoryOfWarehouse', $warehouse->libelle), empty($action) ? '': '&action='.$action));
 	
 	$lines = array();
-	_card_line($inventory, $lines, $action);
+	card_line($inventory, $lines, $action);
 	
 	print '<b>'.$langs->trans('inventoryOnDate')." ".$inventory->get_date('date_inventory').'</b><br><br>';
 	
@@ -425,7 +412,7 @@ function _card(&$inventory, $action='edit')
 }
 
 
-function _card_line(&$inventory, &$lines, $mode)
+function card_line(&$inventory, &$lines, $mode)
 {
 	global $db,$langs,$user,$conf;
 	$inventory->amount_actual = 0;
@@ -452,25 +439,23 @@ function _card_line(&$inventory, &$lines, $mode)
 		$qty = (float)GETPOST('qty_to_add')[$k];
 		
 		$lines[]=array(
-			'produit' => $product->getNomUrl(1).'&nbsp;-&nbsp;'.$product->label
-			,'entrepot'=>$e->getNomUrl(1)
-			,'barcode' => $product->barcode
-			,'qty' =>($mode == 'edit' ? '<input type="text" name="qty_to_add['.$k.']" value="'.$qty.'" size="8" style="text-align:center;" /> <a id="a_save_qty_'.$k.'" href="javascript:save_qty('.$k.')">'.img_picto($langs->trans('Add'), 'plus16@inventory').'</a>' : '' )
-			,'qty_view' => $Inventorydet->qty_view ? $Inventorydet->qty_view : 0
-			,'qty_stock' => $stock
-			,'qty_regulated' => $Inventorydet->qty_regulated ? $Inventorydet->qty_regulated : 0
-			,'action' => ($user->rights->inventory->write && $mode=='edit' ? '<a href="'.dol_buildpath('inventory/inventory.php?id='.$inventory->id.'&action=delete_line&rowid='.$Inventorydet->id, 1).'">'.img_picto($langs->trans('inventoryDeleteLine'), 'delete').'</a>' : '')
-			,'pmp_stock'=>round($pmp_actual,2)
-            ,'pmp_actual'=> round($pmp * $Inventorydet->qty_view,2)
-			,'pmp_new'=>(!empty($user->rights->inventory->changePMP && $mode =='edit') ? '<input type="text" name="new_pmp['.$k.']" value="'.$Inventorydet->new_pmp.'" size="8" style="text-align:right;" /> <a id="a_save_new_pmp_'.$k.'" href="javascript:save_pmp('.$k.')">'.img_picto($langs->trans('Save'), 'bt-save.png@inventory').'</a>' :  price($Inventorydet->new_pmp))
-            ,'pa_stock'=>round($last_pa * $stock,2)
-            ,'pa_actual'=>round($last_pa * $Inventorydet->qty_view,2)
-			,'current_pa_stock'=>round($current_pa * $stock,2)
-			,'current_pa_actual'=>round($current_pa * $Inventorydet->qty_view,2)
-          
-            ,'k'=>$k
-            ,'id'=>$Inventorydet->id
-				
+			'produit' => $product->getNomUrl(1).'&nbsp;-&nbsp;'.$product->label,
+			'entrepot'=>$e->getNomUrl(1),
+			'barcode' => $product->barcode,
+			'qty' =>($mode == 'edit' ? '<input type="text" name="qty_to_add['.$k.']" value="'.$qty.'" size="8" style="text-align:center;" /> <a id="a_save_qty_'.$k.'" href="javascript:save_qty('.$k.')">'.img_picto($langs->trans('Add'), 'plus16@inventory').'</a>' : '' ),
+			'qty_view' => ($Inventorydet->qty_view ? $Inventorydet->qty_view : 0),
+			'qty_stock' => $stock,
+			'qty_regulated' => ($Inventorydet->qty_regulated ? $Inventorydet->qty_regulated : 0),
+			'action' => ($user->rights->inventory->write && $mode=='edit' ? '<a href="'.dol_buildpath('inventory/inventory.php?id='.$inventory->id.'&action=delete_line&rowid='.$Inventorydet->id, 1).'">'.img_picto($langs->trans('inventoryDeleteLine'), 'delete').'</a>' : ''),
+			'pmp_stock'=>round($pmp_actual,2),
+            'pmp_actual'=> round($pmp * $Inventorydet->qty_view,2),
+			'pmp_new'=>(!empty($user->rights->inventory->changePMP) && $mode == 'edit' ? '<input type="text" name="new_pmp['.$k.']" value="'.$Inventorydet->new_pmp.'" size="8" style="text-align:right;" /> <a id="a_save_new_pmp_'.$k.'" href="javascript:save_pmp('.$k.')">'.img_picto($langs->trans('Save'), 'bt-save.png@inventory').'</a>' :  price($Inventorydet->new_pmp)),
+            'pa_stock'=>round($last_pa * $stock,2),
+            'pa_actual'=>round($last_pa * $Inventorydet->qty_view,2),
+			'current_pa_stock'=>round($current_pa * $stock,2),
+			'current_pa_actual'=>round($current_pa * $Inventorydet->qty_view,2),
+            'k'=>$k,
+            'id'=>$Inventorydet->id
 		);
 	}
 
diff --git a/htdocs/inventory/lib/inventory.lib.php b/htdocs/inventory/lib/inventory.lib.php
index 3cbf03a67c7..767d7416fc7 100644
--- a/htdocs/inventory/lib/inventory.lib.php
+++ b/htdocs/inventory/lib/inventory.lib.php
@@ -20,7 +20,6 @@
  *	\file		lib/inventory.lib.php
  *	\ingroup	inventory
  *	\brief		This file is an example module library
- *				Put some comments here
  */
 
 function inventoryAdminPrepareHead()

From ae2ab3276da65f894435fe8626b03e64185ba72c Mon Sep 17 00:00:00 2001
From: atm-ph <phf@atm-consulting.fr>
Date: Sun, 26 Mar 2017 14:37:25 +0200
Subject: [PATCH 034/505] Refactoring and class/method documentation

---
 htdocs/core/class/coreobject.class.php     | 10 +++---
 htdocs/core/class/listview.class.php       | 37 ++++++++++++----------
 htdocs/inventory/class/inventory.class.php |  7 ++--
 htdocs/inventory/inventory.php             |  6 ++--
 htdocs/inventory/lib/inventory.lib.php     |  5 +++
 5 files changed, 38 insertions(+), 27 deletions(-)

diff --git a/htdocs/core/class/coreobject.class.php b/htdocs/core/class/coreobject.class.php
index 92da1604dca..396caf029cc 100644
--- a/htdocs/core/class/coreobject.class.php
+++ b/htdocs/core/class/coreobject.class.php
@@ -287,11 +287,11 @@ class CoreObject extends CommonObject
 			}
 			elseif($this->is_int($info))
             {
-				$this->{$field} = (int)$obj->{$field};
+				$this->{$field} = (int) $obj->{$field};
 			}
 			elseif($this->is_float($info))
             {
-				$this->{$field} = (double)$obj->{$field};
+				$this->{$field} = (double) $obj->{$field};
 			}
 			elseif($this->is_null($info))
             {
@@ -604,7 +604,7 @@ class CoreObject extends CommonObject
      * @param   string  $format Output date format
      * @return          string
      */
-    public function get_date($field, $format='')
+    public function getDate($field, $format='')
     {
 		if(empty($this->{$field})) return '';
 		else
@@ -620,7 +620,7 @@ class CoreObject extends CommonObject
      * @param   string  $date   formatted date to convert
      * @return                  mixed
      */
-    public function set_date($field, $date)
+    public function setDate($field, $date)
     {
 	  	if (empty($date))
 	  	{
@@ -648,7 +648,7 @@ class CoreObject extends CommonObject
 		{
 			if($this->checkFieldType($key, 'date'))
 			{
-				$this->set_date($key, $value);
+				$this->setDate($key, $value);
 			}
 			else if( $this->checkFieldType($key, 'array'))
 			{
diff --git a/htdocs/core/class/listview.class.php b/htdocs/core/class/listview.class.php
index 38645dbca0a..4394a1230da 100644
--- a/htdocs/core/class/listview.class.php
+++ b/htdocs/core/class/listview.class.php
@@ -19,6 +19,9 @@
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+/**
+ *	Class to manage the lists view
+ */
 class Listview
 {
     /**
@@ -92,8 +95,8 @@ class Listview
 	}
 
     /**
-     * @param $key
-     * @param $TParam
+     * @param string    $key    field name
+     * @param array     $TParam array of configuration
      * @return array
      */
 	private function getSearchKey($key, &$TParam)
@@ -129,7 +132,7 @@ class Listview
 	}
 
     /**
-     * @param $date
+     * @param string    $date   date to convert
      * @return int|string   Date TMS or ''
      */
     private function dateToSQLDate($date)
@@ -139,9 +142,9 @@ class Listview
 
 
     /**
-     * @param $TSQLMore
-     * @param $value
-     * @param $sKey
+     * @param array     $TSQLMore   contain some additional sql instructions
+     * @param string    $value      date with read format
+     * @param string    $sKey       field name
      */
     private function addSqlFromTypeDate(&$TSQLMore, &$value, $sKey)
 	{
@@ -171,11 +174,11 @@ class Listview
 
 
     /**
-     * @param $TSQLMore
-     * @param $value
-     * @param $TParam
-     * @param $sKey
-     * @param $key
+     * @param array     $TSQLMore   contain some additional sql instructions
+     * @param string    $value      value to filter
+     * @param array     $TParam     array of configuration
+     * @param string    $sKey       field name
+     * @param string    $key        reference of sKey to find value into TParam
      * @return bool
      */
     private function addSqlFromOther(&$TSQLMore, &$value, &$TParam, $sKey, $key)
@@ -209,8 +212,8 @@ class Listview
 
 
     /**
-     * @param $sql
-     * @param $TParam
+     * @param string    $sql    standard select sql
+     * @param array     $TParam array of configuration
      * @return string
      */
     private function search($sql, &$TParam)
@@ -270,8 +273,8 @@ class Listview
 	}
 
     /**
-     * @param $sql
-     * @param array $TParam
+     * @param string    $sql    standard select sql
+     * @param array     $TParam array of configuration
      * @return string
      */
     public function render($sql, $TParam=array())
@@ -292,8 +295,8 @@ class Listview
 	}
 
     /**
-     * @param $THeader
-     * @param $TParam
+     * @param array     $THeader    the configuration of header
+     * @param array     $TParam     array of configuration
      * @return array
      */
     private function setSearch(&$THeader, &$TParam)
diff --git a/htdocs/inventory/class/inventory.class.php b/htdocs/inventory/class/inventory.class.php
index 5f172c7c697..14230d90893 100644
--- a/htdocs/inventory/class/inventory.class.php
+++ b/htdocs/inventory/class/inventory.class.php
@@ -24,6 +24,9 @@
 require_once DOL_DOCUMENT_ROOT.'/core/class/coreobject.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 
+/**
+ *	Class to manage inventories
+ */
 class Inventory extends CoreObject
 {
 	public $element='inventory';
@@ -307,8 +310,8 @@ class Inventory extends CoreObject
         
         $det->load_product();
                 
-        $date = $this->get_date('date_inventory', 'Y-m-d');
-        if(empty($date)) $date = $this->get_date('datec', 'Y-m-d');
+        $date = $this->getDate('date_inventory', 'Y-m-d');
+        if(empty($date)) $date = $this->getDate('datec', 'Y-m-d');
         $det->setStockDate($date, $fk_warehouse);
         
         return true;
diff --git a/htdocs/inventory/inventory.php b/htdocs/inventory/inventory.php
index f9297951c22..c10cbd1ab20 100644
--- a/htdocs/inventory/inventory.php
+++ b/htdocs/inventory/inventory.php
@@ -381,12 +381,12 @@ function card(&$inventory, $action='edit')
 	$lines = array();
 	card_line($inventory, $lines, $action);
 	
-	print '<b>'.$langs->trans('inventoryOnDate')." ".$inventory->get_date('date_inventory').'</b><br><br>';
+	print '<b>'.$langs->trans('inventoryOnDate')." ".$inventory->getDate('date_inventory').'</b><br><br>';
 	
 	$inventoryTPL = array(
 		'id'=> $inventory->id
-		,'date_cre' => $inventory->get_date('date_cre', 'd/m/Y')
-		,'date_maj' => $inventory->get_date('date_maj', 'd/m/Y H:i')
+		,'date_cre' => $inventory->getDate('date_cre', 'd/m/Y')
+		,'date_maj' => $inventory->getDate('date_maj', 'd/m/Y H:i')
 		,'fk_warehouse' => $inventory->fk_warehouse
 		,'status' => $inventory->status
 		,'entity' => $inventory->entity
diff --git a/htdocs/inventory/lib/inventory.lib.php b/htdocs/inventory/lib/inventory.lib.php
index 767d7416fc7..eb79ae67cc4 100644
--- a/htdocs/inventory/lib/inventory.lib.php
+++ b/htdocs/inventory/lib/inventory.lib.php
@@ -22,6 +22,11 @@
  *	\brief		This file is an example module library
  */
 
+/**
+ *  Define head array for tabs of inventory tools setup pages
+ *
+ *  @return			Array of head
+ */
 function inventoryAdminPrepareHead()
 {
     global $langs, $conf;

From ed27b44f62e04a80ae8419db40586927ebdb57df Mon Sep 17 00:00:00 2001
From: atm-ph <phf@atm-consulting.fr>
Date: Sun, 26 Mar 2017 14:58:59 +0200
Subject: [PATCH 035/505] Add TODO to print header table as Dolibarr

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

diff --git a/htdocs/core/class/listview.class.php b/htdocs/core/class/listview.class.php
index 4394a1230da..15510f58e9c 100644
--- a/htdocs/core/class/listview.class.php
+++ b/htdocs/core/class/listview.class.php
@@ -589,14 +589,17 @@ class Listview
 		foreach($THeader as $field=>$head)
 		{
 			if(empty($head['width']))$head['width']='auto';
-			
+
+
 			$out.='<th style="width:'.$head['width'].';text-align:'.$head['text-align'].'" class="liste_titre">'.$head['libelle'];
-				
+			// TODO replace the actual html by this function call to print a standard output as Dolibarr then add extrafields
+//            $out .= getTitleFieldOfList($head, $_SERVER["PHP_SELF"],"p.ref");
+
 			if($head['order']) $out.='<span class="nowrap">
 					<a href="javascript:Listview_OrderDown(\''.$this->id.'\',\''.$field.'\')">'.img_down().'</a>
 					<a href="javascript:Listview_OrderUp(\''.$this->id.'\', \''.$field.'\')">'.img_up().'</a>
 			</span>';
-			
+
 			$out.=$head['more'];
 			$out.='</th>';
 		}

From 4354820689f35911799c94ee15facf84aceea4b4 Mon Sep 17 00:00:00 2001
From: phf <phf@atm-consulting.fr>
Date: Tue, 28 Mar 2017 09:39:26 +0200
Subject: [PATCH 036/505] Fix call function get_date instead getDate

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

diff --git a/htdocs/inventory/tpl/inventory.tpl.php b/htdocs/inventory/tpl/inventory.tpl.php
index d707ec581b1..e3fa8e5421d 100644
--- a/htdocs/inventory/tpl/inventory.tpl.php
+++ b/htdocs/inventory/tpl/inventory.tpl.php
@@ -198,8 +198,8 @@
 		</div>
 	<?php } ?>
 </form>
-<p>Date de création : <?php echo $inventory->get_date('datec') ?>
-<br />Dernière mise à jour : <?php echo $inventory->get_date('tms') ?></p>
+<p>Date de création : <?php echo $inventory->getDate('datec') ?>
+<br />Dernière mise à jour : <?php echo $inventory->getDate('tms') ?></p>
 	
 
 	

From 70743e1f687887bed905f83d7554ace39b9007ab Mon Sep 17 00:00:00 2001
From: phf <phf@atm-consulting.fr>
Date: Tue, 28 Mar 2017 13:48:33 +0200
Subject: [PATCH 037/505] Update list header to be print with Dolibarr
 functions

---
 htdocs/core/class/listview.class.php | 259 +++++++++++++--------------
 htdocs/inventory/list.php            |  12 +-
 2 files changed, 131 insertions(+), 140 deletions(-)

diff --git a/htdocs/core/class/listview.class.php b/htdocs/core/class/listview.class.php
index 15510f58e9c..312ef749671 100644
--- a/htdocs/core/class/listview.class.php
+++ b/htdocs/core/class/listview.class.php
@@ -36,6 +36,7 @@ class Listview
 		$this->id = $id;
 		$this->TTotalTmp=array();
 		$this->sql = '';
+		$this->form = null;
 	}
 
     /**
@@ -46,12 +47,12 @@ class Listview
      */
 	private function init(&$TParam)
     {
-		global $conf, $langs;
+		global $conf, $langs, $user;
 		
-		if(!isset($TParam['hide']))$TParam['hide']=array();
-		if(!isset($TParam['link']))$TParam['link']=array();
-		if(!isset($TParam['type']))$TParam['type']=array();
-		if(!isset($TParam['orderby']['noOrder']))$TParam['orderby']['noOrder']=array();
+		if(!isset($TParam['hide'])) $TParam['hide']=array();
+		if(!isset($TParam['link'])) $TParam['link']=array();
+		if(!isset($TParam['type'])) $TParam['type']=array();
+		if(!isset($TParam['orderby']['noOrder'])) $TParam['orderby']['noOrder']=array();
 		if(!isset($TParam['allow-fields-select'])) $TParam['allow-fields-select'] = 0;
 		
 		if(!isset($TParam['list']))$TParam['list']=array();
@@ -74,12 +75,17 @@ class Listview
 		if (empty($TParam['limit']))$TParam['limit'] = array();
 		if (!empty($POSTList[$this->id]['page'])) $TParam['limit']['page'] = $POSTList[$this->id]['page'];
 		
-		$TParam['limit'] = array_merge(array('page'=>1, 'nbLine'=>$conf->liste_limit, 'global'=>0), $TParam['limit']);
+		$nbLine = !empty($user->conf->MAIN_SIZE_LISTE_LIMIT) ? $user->conf->MAIN_SIZE_LISTE_LIMIT : $conf->global->MAIN_SIZE_LISTE_LIMIT;
+		$TParam['limit'] = array_merge(array('page'=>1, 'nbLine' => $nbLine, 'global'=>0), $TParam['limit']);
 		
-		if(!empty($POSTList[$this->id]['orderBy']))
+		if (GETPOST('sortfield'))
 		{
-			$TParam['orderBy'] = $POSTList[$this->id]['orderBy']; 
+			$TParam['sortfield'] = GETPOST('sortfield');
+			$TParam['sortorder'] = GETPOST('sortorder');
 		}
+		
+		include_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
+		$this->form = new Form($this->db);
 	}
 
 
@@ -279,19 +285,18 @@ class Listview
      */
     public function render($sql, $TParam=array())
     {
-		$THeader=array();
-		$TField=array();	
+		$TField=array();
 		
 		$this->init($TParam);
+		$THeader = $this->initHeader($TParam);
 		
 		$sql = $this->search($sql,$TParam);
 		$sql = $this->order_by($sql, $TParam);		
 		
 		$this->parse_sql($THeader, $TField, $TParam, $sql);	
-		
 		list($TTotal, $TTotalGroup)=$this->get_total($TField, $TParam);
 		
-		return $this->renderList($THeader, $TField,$TTotal,$TTotalGroup, $TParam);
+		return $this->renderList($THeader, $TField, $TTotal, $TTotalGroup, $TParam);
 	}
 
     /**
@@ -365,9 +370,9 @@ class Listview
 			}
 			else
             {
-				
 				$label = !empty($TParam['title'][$key]) ? $TParam['title'][$key] : $key ;
-				$TParam['list']['head_search'].='<div><span style="min-width:200px;display:inline-block;">'.$libelle.'</span> '.$fsearch.'</div>';	
+				$TParam['list']['head_search'].= '<th>'.$label.'</th>';
+//				$TParam['list']['head_search'].='<div><span style="min-width:200px;display:inline-block;">'.$label.'</span> '.$fsearch.'</div>';	
 			}
 		}
 		
@@ -569,72 +574,84 @@ class Listview
      */
     private function renderList(&$THeader, &$TField, &$TTotal, &$TTotalGroup, &$TParam)
     {
+		global $bc;
+		
 		$TSearch = $this->setSearch($THeader, $TParam);
-		$TExport=$this->setExport($TParam, $TField, $THeader);
+		$TExport = $this->setExport($TParam, $TField, $THeader);
 		$TField = $this->addTotalGroup($TField,$TTotalGroup);
 		
 		$out = $this->getJS();
-		$out.=load_fiche_titre($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $TParam['limit']['page'], count($TField), 'title_products.png', 0, '', '', $limit);
-		$out.='<table id="'.$this->id.'" class="liste" width="100%"><thead>';
-		
-		if(!empty($TParam['list']['head_search']))
-		{
-			$out.='<tr class="liste_titre barre-recherche-head">
-					<td colspan="'.count($THeader).'">'.$TParam['list']['head_search'].'</td>
-				</tr>';
-		}
+		$out.= load_fiche_titre($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $TParam['limit']['page'], count($TField), 'title_products.png', 0, '', '', $limit);
+		$out.= '<table id="'.$this->id.'" class="liste" width="100%"><thead>';
 			
-		$out.='<tr class="liste_titre">';
-		
-		foreach($THeader as $field=>$head)
+		$out.= '<tr class="liste_titre">';
+		foreach($THeader as $field => $head)
 		{
-			if(empty($head['width']))$head['width']='auto';
+			$moreattrib = '';
+			$search = '';
+			$prefix = '';
 
+			if ($field === 'selectedfields')
+			{
+				$moreattrib = 'align="right" ';
+				$prefix = 'maxwidthsearch ';
+			}
 
-			$out.='<th style="width:'.$head['width'].';text-align:'.$head['text-align'].'" class="liste_titre">'.$head['libelle'];
-			// TODO replace the actual html by this function call to print a standard output as Dolibarr then add extrafields
-//            $out .= getTitleFieldOfList($head, $_SERVER["PHP_SELF"],"p.ref");
+			if (empty($head['width'])) $head['width'] = 'auto';
+			if (!empty($head['width']) && !empty($head['text-align'])) $moreattrib .= 'style="width:'.$head['width'].';text-align:'.$head['text-align'].'"';
 
-			if($head['order']) $out.='<span class="nowrap">
-					<a href="javascript:Listview_OrderDown(\''.$this->id.'\',\''.$field.'\')">'.img_down().'</a>
-					<a href="javascript:Listview_OrderUp(\''.$this->id.'\', \''.$field.'\')">'.img_up().'</a>
-			</span>';
+			if (isset($TParam['search'][$field]['recherche']) && $TParam['search'][$field]['recherche'] !== false)
+			{
+				$TsKey = $this->getSearchKey($field, $TParam);
+				if (!empty($TsKey)) $search = implode(',', $TsKey);
+				else $search = $field;
+			}
 
-			$out.=$head['more'];
-			$out.='</th>';
+			$out .= getTitleFieldOfList($head['label'], 0, $_SERVER["PHP_SELF"], $search, '', $moreparam, $moreattrib, $TParam['sortfield'], $TParam['sortorder'], $prefix);
+			$out .= $head['more'];
 		}
 		
-		$out.='</tr>';
-			
+		//$out .= '<th aligne="right" class="maxwidthsearch liste_titre">--</th>';
+		$out .= '</tr>';
+		
 		if(count($TSearch)>0)
 		{
 			$out.='<tr class="liste_titre barre-recherche">';
-			foreach($TSearch as $field=>$search)
+//			foreach($TSearch as $field => $search)
+			foreach ($THeader as $field => $head)
 			{
-				$out.='<td class="liste_titre">'.$search.'</td>';
+				if ($field === 'selectedfields')
+				{
+					$out.= '<td class="liste_titre" align="right">'.$this->form->showFilterAndCheckAddButtons(0).'</td>';
+				}
+				else
+				{
+					$moreattrib = 'style="width:'.$head['width'].';text-align:'.$head['text-align'].'"';
+					$out .= '<td class="liste_titre" '.$moreattrib.'>'.$TSearch[$field].'</td>';
+				}
 			}
-
+			
 			$out.='</tr>';
 		}
 				
 		$out.='</thead><tbody>';
 		
-		$class='pair';
-		
 		if(empty($TField))
 		{
-			$out.='<tr class="'.$class.'"><td colspan="'.$TParam['list']['nb_columns'].'">'.$TParam['list']['messageNothing'].'</td></tr>';
+			if (!empty($TParam['list']['messageNothing'])) $out .= '<tr class="'.$class.'"><td colspan="'.$TParam['list']['nb_columns'].'">'.$TParam['list']['messageNothing'].'</td></tr>';
 		}
 		else
         {
+			$var=true;
 			foreach($TField as $fields)
 			{
-				$class = ($class=='pair') ? 'impair' : 'pair';
-				$out.='<tr class="'.$class.'"> <!-- '.$field.' -->';
+				$var=!$var;
+				$out.='<tr '.$bc[$var].'> <!-- '.$field.' -->';
 			
-				foreach($fields as $field=>$value)
+				foreach ($THeader as $field => $head)
 				{
-					$out.='<td field="'.$field.'">'.$value.'</td>';
+					$moreattrib = 'style="width:'.$head['width'].';text-align:'.$head['text-align'].'"';
+					$out.='<td class="'.$field.'" '.$moreattrib.'>'.$fields[$field].'</td>';
 				}
 					
 				$out.='</tr>';
@@ -642,20 +659,24 @@ class Listview
 			
 			$out.='</tbody>';
 			
-			if(!empty($TParam['list']['haveTotal']))
+			if (!empty($TParam['list']['haveTotal']))
 			{
 				$out.='<tfoot><tr class="liste_total">';
 			
-				foreach($TTotal as $field=>$total)
+				foreach ($THeader as $field => $head)
 				{
-					$out.='<td align="right" field="'.$field.'">'.price($total).'</td>';
+					if (isset($TTotal[$field]))
+					{
+						$moreattrib = 'style="width:'.$head['width'].';text-align:'.$head['text-align'].'"';
+						$out.='<td align="right" class="'.$field.'" '.$moreattrib.'>'.price($TTotal[$field]).'</td>';
+					}
 				}
 					
 				$out.='</tr></tfoot>';
 			}
 		}
 
-		$out.='</table>';
+		$out .= '</table>';
 		
 		return $out;
 	}
@@ -669,15 +690,15 @@ class Listview
     {
 		$this->typeRender = 'array';
 
-		$THeader=array();
 		$TField=array();	
 		
 		$this->init($TParam);
+		$THeader = $this->initHeader($TParam);
 		
 		$this->parse_array($THeader, $TField, $TParam);
 		list($TTotal, $TTotalGroup)=$this->get_total($TField, $TParam);
 		
-		$this->renderList($THeader, $TField,$TTotal,$TTotalGroup, $TParam);
+		$this->renderList($THeader, $TField, $TTotal, $TTotalGroup, $TParam);
 	}
 
 
@@ -688,29 +709,15 @@ class Listview
      */
     private function order_by($sql, &$TParam)
     {
-		$first = true;
-		if(!empty($TParam['orderBy']))
+		global $db;
+		
+		if (!empty($TParam['sortfield']))
 		{
-			if(strpos($sql,'LIMIT ')!==false)
-			{
-				list($sql, $sqlLIMIT) = explode('LIMIT ', $sql);
-			}
+			if(strpos($sql,'LIMIT ') !== false) list($sql, $sqlLIMIT) = explode('LIMIT ', $sql);
 			
-			$sql.=' ORDER BY '; 
-			foreach($TParam['orderBy'] as $field=>$order)
-			{
-				if(!$first) $sql.=',';
-				
-				if($order=='DESC')$TParam['list']['orderDown'] = $field;
-				else $TParam['list']['orderUp'] = $field;
-				
-				if(strpos($field,'.')===false)	$sql.='`'.$field.'` '.$order;
-				else $sql.=$field.' '.$order;
-				
-				$first=false;
-			}
+			$sql .= $db->order($TParam['sortfield'], $TParam['sortorder']);
 			
-			if(!empty($sqlLIMIT))$sql.=' LIMIT '.$sqlLIMIT;
+			if (!empty($sqlLIMIT)) $sql .= ' LIMIT '.$sqlLIMIT;
 		}
 		
 		return $sql;
@@ -724,8 +731,6 @@ class Listview
      */
     private function parse_array(&$THeader, &$TField, &$TParam)
     {
-		$first = true;
-
 		$this->THideFlip = array_flip($TParam['hide']);
 		$this->TTotalTmp=array();
 		
@@ -733,27 +738,19 @@ class Listview
 		
 		foreach($TField as $row)
 		{
-			if($first)
-			{
-				$this->initHeader($THeader, $TParam, $row);
-				$first=false;
-			}	
-			
 			$this->set_line($TField, $TParam, $row);
 		}
 	}
 
-    /**
-     * @param $THeader
-     * @param $TParam
-     * @param $currentLine
-     */
-    private function initHeader(&$THeader, &$TParam, $currentLine)
-    {
-        global $db,$conf,$user;
-
+	
+	private function initHeader(&$TParam)
+	{
+		global $user,$conf;
+		
+		$THeader = array();
+		
 		$TField=$TFieldVisibility=array();
-		foreach ($currentLine as $field => $value)
+		foreach ($TParam['title'] as $field => $value)
 		{
 			$TField[$field]=true;
 		}
@@ -761,35 +758,35 @@ class Listview
 		$contextpage=md5($_SERVER['PHP_SELF']);
 		if(!empty($TParam['allow-field-select']))
 		{
-			include_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
-			$form=new Form($db);
 			$selectedfields = GETPOST('Listview'.$this->id.'_selectedfields');
 			
 			if(!empty($selectedfields))
 			{
 				include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-				$tabparam['MAIN_SELECTEDFIELDS_'.$contextpage]=$selectedfields;
-	    		$result=dol_set_user_param($db, $conf, $user, $tabparam);
+				$tabparam['MAIN_SELECTEDFIELDS_'.$contextpage] = $selectedfields;
+	    		$result=dol_set_user_param($this->db, $conf, $user, $tabparam);
 			}
 			
 			$tmpvar='MAIN_SELECTEDFIELDS_'.$contextpage;
-			if (! empty($user->conf->$tmpvar)) {
-				$tmparray=explode(',', $user->conf->$tmpvar);
-				$TParam['hide']=array();
-		        foreach($TField as $field=>$dummy)
+			if (! empty($user->conf->{$tmpvar}))
+			{
+				$tmparray = explode(',', $user->conf->{$tmpvar});
+				$TParam['hide'] = array();
+		        foreach($TField as $field => $dummy)
 		        {
-		          	$libelle = isset($TParam['title'][$field]) ? $TParam['title'][$field] : $field;
-
-					if(!in_array($field,$tmparray)) {
+		          	$label = $TParam['title'][$field];
+					if(!in_array($field, $tmparray))
+					{
 				  		$TParam['hide'][] = $field;
 						$visible = 0;
 				  	}
-					else{
+					else
+					{
 						$visible = 1;
 					}
 		            
-					$TFieldVisibility[$field]=array(
-						'label'=>$libelle
+					$TFieldVisibility[$field] = array(
+						'label'=>$label
 						,'checked'=>$visible
 					);
 		        }
@@ -798,28 +795,25 @@ class Listview
             {
 				foreach($TField as $field=>$dummy)
 		        {
-		        	$libelle = isset($TParam['title'][$field]) ? $TParam['title'][$field] : $field;
+		        	$label = isset($TParam['title'][$field]) ? $TParam['title'][$field] : $field;
 					$visible = (!in_array($field, $TParam['hide'])) ? 1 : 0;
 					$TFieldVisibility[$field]=array(
-						'label'=>$libelle,
+						'label'=>$label,
 						'checked'=>$visible
 					);
 				}
 			}	
 
-			$selectedfields=$form->multiSelectArrayWithCheckbox('Listview'.$this->id.'_selectedfields', $TFieldVisibility, $contextpage);	// This also change content of $arrayfields_0
+			$selectedfields = $this->form->multiSelectArrayWithCheckbox('Listview'.$this->id.'_selectedfields', $TFieldVisibility, $contextpage);	// This also change content of $arrayfields_0
 		}
-		
-		foreach ($currentLine as $field => $value)
+
+		foreach ($TParam['title'] as $field => $label)
 		{
-			$libelle = isset($TParam['title'][$field]) ? $TParam['title'][$field] : $field;
-			$visible = (!in_array($field,$TParam['hide'])) ? 1 : 0;	
-			
+			$visible = (!in_array($field, $TParam['hide'])) ? 1 : 0;
 			if($visible)
 			{
-				$lastfield = $field;
 				$THeader[$field] = array(
-					'libelle'=>$libelle,
+					'label'=>$label,
 					'order'=>(in_array($field, $TParam['orderby']['noOrder']) ? 0 : 1),
 					'width'=>(!empty($TParam['size']['width'][$field]) ? $TParam['size']['width'][$field] : 'auto'),
 					'text-align'=>(!empty($TParam['position']['text-align'][$field]) ? $TParam['position']['text-align'][$field] : 'auto'),
@@ -828,10 +822,12 @@ class Listview
 			}
 		}
 		
-		if(!empty($selectedfields) && !empty($lastfield))
+		if(!empty($selectedfields))
 		{
-			$THeader[$lastfield]['more']='<div style="float:right">'.$selectedfields.'</div>';
+			$THeader['selectedfields']['label']='<div style="float:right">'.$selectedfields.'</div>';
 		}
+		
+		return $THeader;
 	}
 
     /**
@@ -868,21 +864,20 @@ class Listview
 
         if($this->in_view($TParam,$line_number))
         {
-
             $row=array(); $trans = array();
             foreach($currentLine as $field=>$value)
             {
                 if(is_object($value))
                 {
                     if(get_class($value)=='stdClass') {$value=print_r($value, true);}
-                    else $value=(string)$value;
+                    else $value=(string) $value;
                 }
 
                 $trans['@'.$field.'@'] = $value;
 
                 if(!empty($TParam['math'][$field]))
                 {
-                    $float_value = (double)strip_tags($value);
+                    $float_value = (double) strip_tags($value);
                     $this->TTotalTmp[$field][] = $float_value;
                 }
 
@@ -900,7 +895,6 @@ class Listview
                     {
                         if($TParam['type'][$field]=='date' || $TParam['type'][$field]=='datetime' )
                         {
-
                             if($row[$field] != '0000-00-00 00:00:00' && $row[$field] != '1000-01-01 00:00:00' && $row[$field] != '0000-00-00' && !empty($row[$field]))
                             {
                                 if($TParam['type'][$field]=='datetime')$row[$field] = dol_print_date(strtotime($row[$field]),'dayhoursec');
@@ -943,7 +937,7 @@ class Listview
                 {
                     if(isset($TParam['math'][$field]) && !empty($TParam['math'][$field]))
                     {
-                        $float_value = (double)strip_tags($value);
+                        $float_value = (double) strip_tags($value);
                         $this->TTotalTmp[$field][] = $float_value;
                     }
 
@@ -959,8 +953,8 @@ class Listview
                 if(!empty($TParam['math'][$field]) && is_array($TParam['math'][$field]))
                 {
                     $toField = $TParam['math'][$field][1];
-                    $float_value = (double)strip_tags($row[$toField]);
-                    $this->TTotalTmp['@groupsum'][$toField][ $row[$field]  ] +=$float_value;
+                    $float_value = (double) strip_tags($row[$toField]);
+                    $this->TTotalTmp['@groupsum'][$toField][ $row[$field]  ] += $float_value;
                 }
             }
         }
@@ -977,7 +971,7 @@ class Listview
     {
 		if(!empty($TParam['limit']['global']) && strpos($sql,'LIMIT ')===false )
 		{
-			$sql.=' LIMIT '.(int)$TParam['limit']['global'];
+			$sql.=' LIMIT '.(int) $TParam['limit']['global'];
 		}
 		
 		return $sql;
@@ -994,26 +988,17 @@ class Listview
 		$this->sql = $this->limitSQL($sql, $TParam);
 		
 		$this->TTotalTmp=array();
-		
 		$this->THideFlip = array_flip($TParam['hide']);
-
+		
 		$res = $this->db->query($this->sql);
 		if($res!==false)
 		{
 			dol_syslog(get_class($this)."::parse_sql id=".$this->id." sql=".$this->sql, LOG_DEBUG);
 			
-			$first=true;
 			while($currentLine = $this->db->fetch_object($res))
             {
-				if($first)
-				{
-					$this->initHeader($THeader, $TParam, $currentLine);
-					$first = false;
-				}
-				
 				$this->set_line($TField, $TParam, $currentLine);
 			}
-			
 		}
 		else
         {
diff --git a/htdocs/inventory/list.php b/htdocs/inventory/list.php
index bcea7794f7a..1f1150fb158 100644
--- a/htdocs/inventory/list.php
+++ b/htdocs/inventory/list.php
@@ -48,6 +48,7 @@ $list = new ListView($db, 'listInventory');
 $THide = array('label','title');
 
 echo $list->render(Inventory::getSQL('All'), array(
+	'allow-field-select' => true,
     'link'=>array(
         'fk_warehouse'=>'<a href="'.DOL_URL_ROOT.'/product/stock/card.php?id=@val@">'.img_picto('','object_stock.png','',0).' @label@</a>'
     ),
@@ -64,9 +65,9 @@ echo $list->render(Inventory::getSQL('All'), array(
     ),
     'title'=>array(
         'rowid'=>$langs->trans('Title'),
-        'fk_warehouse'=>$langs->trans('Warehouse'),
-        'date_inventory'=>$langs->trans('InventoryDate'),
+		'date_inventory'=>$langs->trans('InventoryDate'),
         'datec'=>$langs->trans('DateCreation'),
+        'fk_warehouse'=>$langs->trans('Warehouse'),
         'tms'=>$langs->trans('DateUpdate'),
         'status'=>$langs->trans('Status')
     ),
@@ -74,8 +75,13 @@ echo $list->render(Inventory::getSQL('All'), array(
         'status' => '(@val@ ? img_picto("'.$langs->trans("inventoryValidate").'", "statut4") : img_picto("'.$langs->trans("inventoryDraft").'", "statut3"))',
         'rowid'=>'Inventory::getLink(@val@)'
     ),
+	'position' => array(
+		'text-align' => array('status' => 'right')
+		
+	),
     'search'=>array(
-        'date_inventory'=>'calendars',
+		'rowid' => array('recherche' => true, 'table' => array('i'), 'field' => array('title')),
+        'date_inventory'=>array('recherche' => 'calendars'),
         'status'=>array(1=>$langs->trans("inventoryValidate"), 0=>$langs->trans("inventoryDraft"))
     )
 ));

From df170769c93d6132a79c1796c8832167a00ac3ed Mon Sep 17 00:00:00 2001
From: phf <phf@atm-consulting.fr>
Date: Tue, 28 Mar 2017 16:05:18 +0200
Subject: [PATCH 038/505] Update function module inventory

---
 htdocs/core/class/listview.class.php | 106 ++++++++++++++++-----------
 htdocs/inventory/list.php            |   5 +-
 htdocs/langs/en_US/inventory.lang    |   4 +-
 htdocs/langs/fr_FR/inventory.lang    |  52 -------------
 4 files changed, 68 insertions(+), 99 deletions(-)
 delete mode 100644 htdocs/langs/fr_FR/inventory.lang

diff --git a/htdocs/core/class/listview.class.php b/htdocs/core/class/listview.class.php
index 312ef749671..cb41ffd32d6 100644
--- a/htdocs/core/class/listview.class.php
+++ b/htdocs/core/class/listview.class.php
@@ -37,6 +37,8 @@ class Listview
 		$this->TTotalTmp=array();
 		$this->sql = '';
 		$this->form = null;
+		$this->totalRowToShow=0;
+		$this->totalRow=0;
 	}
 
     /**
@@ -70,13 +72,12 @@ class Listview
 			,'view_type'=>''
 		),$TParam['list']);
 		
-		$POSTList = GETPOST('Listview');
+		if (empty($TParam['limit'])) $TParam['limit'] = array();
 		
-		if (empty($TParam['limit']))$TParam['limit'] = array();
-		if (!empty($POSTList[$this->id]['page'])) $TParam['limit']['page'] = $POSTList[$this->id]['page'];
+		$page = GETPOST('page');
+		if (!empty($page)) $TParam['limit']['page'] = $page+1; // TODO dolibarr start page at 0 instead 1
 		
-		$nbLine = !empty($user->conf->MAIN_SIZE_LISTE_LIMIT) ? $user->conf->MAIN_SIZE_LISTE_LIMIT : $conf->global->MAIN_SIZE_LISTE_LIMIT;
-		$TParam['limit'] = array_merge(array('page'=>1, 'nbLine' => $nbLine, 'global'=>0), $TParam['limit']);
+		$TParam['limit'] = array_merge(array('page'=>1, 'nbLine' => $conf->liste_limit, 'global'=>0), $TParam['limit']);
 		
 		if (GETPOST('sortfield'))
 		{
@@ -226,7 +227,7 @@ class Listview
     {
 		$ListPOST = GETPOST('Listview');
 		
-		if(!empty($ListPOST[$this->id]['search']))
+		if (!empty($ListPOST[$this->id]['search']))
 		{
 			$sqlGROUPBY='';
 			if(strpos($sql,'GROUP BY')!==false)
@@ -236,43 +237,45 @@ class Listview
 			
 			if(strpos($sql,'WHERE ')===false) $sql.=' WHERE 1 ';
 			
-			foreach($ListPOST[$this->id]['search'] as $key => $value)
+			if (!GETPOST("button_removefilter_x") && !GETPOST("button_removefilter.x") && !GETPOST("button_removefilter"))
 			{
-				$TsKey = $this->getSearchKey($key, $TParam);
-				$TSQLMore = array();
-				
-				$allow_is_null = $this->getSearchNull($key,$TParam);
-				
-				foreach ($TsKey as $i => &$sKey)
+				// TODO input date are not supported yet
+				foreach($ListPOST[$this->id]['search'] as $key => $value)
 				{
-					if($allow_is_null && !empty($ListPOST[$this->id]['search_on_null'][$key]))
-					{
-						$TSQLMore[] = $sKey.' IS NULL ';
-						$value = '';
-					}
+					$TsKey = $this->getSearchKey($key, $TParam);
+					$TSQLMore = array();
+					$allow_is_null = $this->getSearchNull($key,$TParam);
 
-					// Do not use empty() function, statut 0 exist
-					if($value != '')
+					foreach ($TsKey as $i => &$sKey)
 					{
-						if(isset($TParam['type'][$key]) && ($TParam['type'][$key]==='date' || $TParam['type'][$key]==='datetime'))
+						if($allow_is_null && !empty($ListPOST[$this->id]['search_on_null'][$key]))
 						{
-							$this->addSqlFromTypeDate($TSQLMore, $value, $sKey);
+							$TSQLMore[] = $sKey.' IS NULL ';
+							$value = '';
 						}
-						else
+
+						// Do not use empty() function, statut 0 exist
+						if($value != '')
 						{
-							$this->addSqlFromOther($TSQLMore, $value, $TParam, $sKey, $key);
+							if(isset($TParam['type'][$key]) && ($TParam['type'][$key]==='date' || $TParam['type'][$key]==='datetime'))
+							{
+								$this->addSqlFromTypeDate($TSQLMore, $value, $sKey);
+							}
+							else
+							{
+								$this->addSqlFromOther($TSQLMore, $value, $TParam, $sKey, $key);
+							}
 						}
 					}
-				}
 
-				if(!empty($TSQLMore))
-				{
-					$sql.=' AND ( '.implode(' OR ',$TSQLMore).' ) ';
+					if(!empty($TSQLMore))
+					{
+						$sql.=' AND ( '.implode(' OR ',$TSQLMore).' ) ';
+					}
 				}
-				
 			}
 			
-			if($sqlGROUPBY!='')	$sql.=' GROUP BY '.$sqlGROUPBY;
+			if ($sqlGROUPBY!='')	$sql.=' GROUP BY '.$sqlGROUPBY;
 		}
 
 		return $sql;
@@ -326,6 +329,7 @@ class Listview
 		foreach($TParam['search'] as $key => $param_search)
 		{
 			$value = isset($ListPOST[$this->id]['search'][$key]) ? $ListPOST[$this->id]['search'][$key] : '';
+			if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) $value = '';
 			
 			$typeRecherche = (is_array($param_search) && isset($param_search['recherche'])) ? $param_search['recherche'] : $param_search;  
 			
@@ -335,14 +339,14 @@ class Listview
 			}
 			else if($typeRecherche==='calendar')
 			{
-				$value = GETPOST('Listview_'.$this->id.'_search_'.$key) ? mktime(0,0,0, (int)GETPOST('Listview_'.$this->id.'_search_'.$key.'month'), (int)GETPOST('Listview_'.$this->id.'_search_'.$key.'day'), (int)GETPOST('Listview_'.$this->id.'_search_'.$key.'year') ) : '';
+				$value = GETPOST('Listview_'.$this->id.'_search_'.$key) ? mktime(0,0,0, (int) GETPOST('Listview_'.$this->id.'_search_'.$key.'month'), (int) GETPOST('Listview_'.$this->id.'_search_'.$key.'day'), (int) GETPOST('Listview_'.$this->id.'_search_'.$key.'year') ) : '';
 				
 				$fsearch = $form->select_date($value, 'Listview_'.$this->id.'_search_'.$key,0, 0, 1, "", 1, 0, 1);
 			}
 			else if($typeRecherche==='calendars')
 			{
-				$value_start = GETPOST('Listview_'.$this->id.'_search_'.$key.'_start') ? mktime(0,0,0, (int)GETPOST('Listview_'.$this->id.'_search_'.$key.'_startmonth'), (int)GETPOST('Listview_'.$this->id.'_search_'.$key.'_startday'), (int)GETPOST('Listview_'.$this->id.'_search_'.$key.'_startyear') ) : '';
-				$value_end = GETPOST('Listview_'.$this->id.'_search_'.$key.'_end') ? mktime(0,0,0, (int)GETPOST('Listview_'.$this->id.'_search_'.$key.'_endmonth'), (int)GETPOST('Listview_'.$this->id.'_search_'.$key.'_endday'), (int)GETPOST('Listview_'.$this->id.'_search_'.$key.'_endyear') ) : '';
+				$value_start = GETPOST('Listview_'.$this->id.'_search_'.$key.'_start') ? mktime(0,0,0, (int) GETPOST('Listview_'.$this->id.'_search_'.$key.'_startmonth'), (int) GETPOST('Listview_'.$this->id.'_search_'.$key.'_startday'), (int) GETPOST('Listview_'.$this->id.'_search_'.$key.'_startyear') ) : '';
+				$value_end = GETPOST('Listview_'.$this->id.'_search_'.$key.'_end') ? mktime(0,0,0, (int) GETPOST('Listview_'.$this->id.'_search_'.$key.'_endmonth'), (int) GETPOST('Listview_'.$this->id.'_search_'.$key.'_endday'), (int) GETPOST('Listview_'.$this->id.'_search_'.$key.'_endyear') ) : '';
 			
 				$fsearch = $form->select_date($value_start, 'Listview_'.$this->id.'_search_'.$key.'_start',0, 0, 1, "", 1, 0, 1)
 						 . $form->select_date($value_end, 'Listview_'.$this->id.'_search_'.$key.'_end',0, 0, 1, "", 1, 0, 1);
@@ -581,7 +585,13 @@ class Listview
 		$TField = $this->addTotalGroup($TField,$TTotalGroup);
 		
 		$out = $this->getJS();
-		$out.= load_fiche_titre($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $TParam['limit']['page'], count($TField), 'title_products.png', 0, '', '', $limit);
+		
+		$dolibarr_decalage = $this->totalRow > $this->totalRowToShow ? 1 : 0;
+		ob_start();
+		print_barre_liste($TParam['list']['title'], $TParam['limit']['page']-1, $_SERVER["PHP_SELF"], '&param', $TParam['sortfield'], $TParam['sortorder'], '', $this->totalRowToShow+$dolibarr_decalage, $this->totalRow, $TParam['list']['image'], 0, '', '', $TParam['limit']['nbLine']);
+		$out .= ob_get_clean();
+		
+	
 		$out.= '<table id="'.$this->id.'" class="liste" width="100%"><thead>';
 			
 		$out.= '<tr class="liste_titre">';
@@ -617,7 +627,7 @@ class Listview
 		if(count($TSearch)>0)
 		{
 			$out.='<tr class="liste_titre barre-recherche">';
-//			foreach($TSearch as $field => $search)
+			
 			foreach ($THeader as $field => $head)
 			{
 				if ($field === 'selectedfields')
@@ -643,18 +653,24 @@ class Listview
 		else
         {
 			$var=true;
+			$line_number = 0;
 			foreach($TField as $fields)
 			{
-				$var=!$var;
-				$out.='<tr '.$bc[$var].'> <!-- '.$field.' -->';
-			
-				foreach ($THeader as $field => $head)
+				if($this->in_view($TParam, $line_number))
 				{
-					$moreattrib = 'style="width:'.$head['width'].';text-align:'.$head['text-align'].'"';
-					$out.='<td class="'.$field.'" '.$moreattrib.'>'.$fields[$field].'</td>';
+					$var=!$var;
+					$out.='<tr '.$bc[$var].'> <!-- '.$field.' -->';
+
+					foreach ($THeader as $field => $head)
+					{
+						$moreattrib = 'style="width:'.$head['width'].';text-align:'.$head['text-align'].'"';
+						$out.='<td class="'.$field.'" '.$moreattrib.'>'.$fields[$field].'</td>';
+					}
+
+					$out.='</tr>';
 				}
-					
-				$out.='</tr>';
+				
+				$line_number++;
 			}
 			
 			$out.='</tbody>';
@@ -731,6 +747,8 @@ class Listview
      */
     private function parse_array(&$THeader, &$TField, &$TParam)
     {
+		$this->totalRow = count($TField);
+		
 		$this->THideFlip = array_flip($TParam['hide']);
 		$this->TTotalTmp=array();
 		
@@ -864,6 +882,7 @@ class Listview
 
         if($this->in_view($TParam,$line_number))
         {
+			$this->totalRowToShow++;
             $row=array(); $trans = array();
             foreach($currentLine as $field=>$value)
             {
@@ -993,6 +1012,7 @@ class Listview
 		$res = $this->db->query($this->sql);
 		if($res!==false)
 		{
+			$this->totalRow = $this->db->num_rows($res);
 			dol_syslog(get_class($this)."::parse_sql id=".$this->id." sql=".$this->sql, LOG_DEBUG);
 			
 			while($currentLine = $this->db->fetch_object($res))
diff --git a/htdocs/inventory/list.php b/htdocs/inventory/list.php
index 1f1150fb158..cb5b2593c32 100644
--- a/htdocs/inventory/list.php
+++ b/htdocs/inventory/list.php
@@ -61,7 +61,8 @@ echo $list->render(Inventory::getSQL('All'), array(
     ),
     'list'=>array(
         'title'=>$langs->trans('inventoryListTitle'),
-        'messageNothing'=>$langs->trans('inventoryListEmpty')
+        'messageNothing'=>$langs->trans('inventoryListEmpty'),
+		'image' => 'inventory.png@inventory'
     ),
     'title'=>array(
         'rowid'=>$langs->trans('Title'),
@@ -81,7 +82,7 @@ echo $list->render(Inventory::getSQL('All'), array(
 	),
     'search'=>array(
 		'rowid' => array('recherche' => true, 'table' => array('i'), 'field' => array('title')),
-        'date_inventory'=>array('recherche' => 'calendars'),
+        'date_inventory'=>array('recherche' => 'calendars', 'table' => array('i'), 'field' => array('date_inventory')),
         'status'=>array(1=>$langs->trans("inventoryValidate"), 0=>$langs->trans("inventoryDraft"))
     )
 ));
diff --git a/htdocs/langs/en_US/inventory.lang b/htdocs/langs/en_US/inventory.lang
index 152aceed862..db92cb9a14a 100644
--- a/htdocs/langs/en_US/inventory.lang
+++ b/htdocs/langs/en_US/inventory.lang
@@ -11,7 +11,7 @@ inventoryWritePermission=Update inventories
 inventoryValidatePermission=Validate inventory
 
 inventoryTitle=Inventory
-inventoryListTitle=List
+inventoryListTitle=Inventories
 inventoryListEmpty=No inventory in progress
 
 inventoryCreateDelete=Create/Delete inventory
@@ -50,5 +50,5 @@ InventoryFlushed=Inventory flushed
 ExitEditMode=Exit edition
 inventoryDeleteLine=Delete line
 RegulateStock=Regulate Stock
-ListInventory=Inventories list
+ListInventory=List
 NewInventory=New inventory
\ No newline at end of file
diff --git a/htdocs/langs/fr_FR/inventory.lang b/htdocs/langs/fr_FR/inventory.lang
deleted file mode 100644
index 546a5202976..00000000000
--- a/htdocs/langs/fr_FR/inventory.lang
+++ /dev/null
@@ -1,52 +0,0 @@
-Module104420Name = Inventory
-Module104420Desc = Create and manage your inventory
-
-inventorySetup = Inventory Setup
-
-inventoryCreatePermission=Create new inventory
-inventoryReadPermission=View inventories
-inventoryWritePermission=Update inventories
-inventoryValidatePermission=Validate inventory
-
-inventoryTitle=Inventory
-inventoryListTitle=List
-inventoryListEmpty=No inventory in progress
-
-inventoryCreateDelete=Create/Delete inventory
-inventoryCreate=Create new
-inventoryEdit=Edit
-inventoryValidate=Validated
-inventoryDraft=Running
-inventorySelectWarehouse=Warehouse choice
-inventoryConfirmCreate=Create
-inventoryOfWarehouse=Inventory for warehouse : %s
-inventoryErrorQtyAdd=Error : one quantity is leaser than zero
-inventoryMvtStock=By inventory
-inventoryWarningProductAlreadyExists=This product is already into list
-SelectCategory=Category filter
-SelectFournisseur=Supplier filter
-inventoryOnDate=Inventory 
-INVENTORY_DISABLE_VIRTUAL=Allow to not destock child product from a kit on inventory
-INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Use the buy price if no last buy price can be found
-INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT=Stock mouvment have date of inventory
-inventoryChangePMPPermission=Allow to change PMP value for a product
-ColumnNewPMP=New unit PMP
-OnlyProdsInStock=Do not add product without stock
-TheoricalQty=Theorique qty
-TheoricalValue=Theorique qty
-LastPA=Last BP
-CurrentPA=Curent BP
-RealQty=Real Qty
-RealValue=Real Value
-RegulatedQty=Regulated Qty
-AddInventoryProduct=Add product to inventory
-AddProduct=Add
-ApplyPMP=Apply PMP
-FlushInventory=Flush inventory
-ConfirmFlushInventory=Do you confirm this action ?
-InventoryFlushed=Inventory flushed
-ExitEditMode=Exit edition
-inventoryDeleteLine=Delete line
-RegulateStock=Regulate Stock
-InventoryDate=Inventory date
-DateUpdate=Last update
\ No newline at end of file

From 5decbde79bd8b9204167010bf8acbf5d3b3bf138 Mon Sep 17 00:00:00 2001
From: phf <phf@atm-consulting.fr>
Date: Tue, 28 Mar 2017 17:06:22 +0200
Subject: [PATCH 039/505] Fix search by date does not work

---
 htdocs/core/class/listview.class.php | 102 ++++++++++++++-------------
 1 file changed, 54 insertions(+), 48 deletions(-)

diff --git a/htdocs/core/class/listview.class.php b/htdocs/core/class/listview.class.php
index cb41ffd32d6..1fcb63fa8a2 100644
--- a/htdocs/core/class/listview.class.php
+++ b/htdocs/core/class/listview.class.php
@@ -139,12 +139,12 @@ class Listview
 	}
 
     /**
-     * @param string    $date   date to convert
+     * @param timestamp    $date   date to convert
      * @return int|string   Date TMS or ''
      */
     private function dateToSQLDate($date)
     {
-		return $this->db->jdate($date);
+		return $this->db->idate($date);
 	}
 
 
@@ -160,21 +160,21 @@ class Listview
 			$TSQLDate=array();
 			if(!empty($value['start']))
 			{
-				$valueDeb = $this->dateToSQLDate($value['start']);
-				$TSQLDate[]=$sKey." >= '".$valueDeb." 00:00:00'" ;
+//				$valueDeb = $this->dateToSQLDate($value['start'].' 00:00:00');
+				$TSQLDate[]=$sKey." >= '".$value['start']."'" ;
 			}
 
 			if(!empty($value['end']))
 			{
-				$valueFin = $this->dateToSQLDate($value['end']);
-				$TSQLDate[]=$sKey." <= '".$valueFin." 23:59:59'" ;
+//				$valueFin = $this->dateToSQLDate($value['end'].' 23:59:59');
+				$TSQLDate[]=$sKey." <= '".$value['end']."'" ;
 			}
 
 			if(!empty($TSQLDate)) $TSQLMore[] = implode(' AND ', $TSQLDate);
 		}
 		else
 		{
-			$value = $this->dateToSQLDate($value);
+//			$value = $this->dateToSQLDate($value);
 			$TSQLMore[]=$sKey." LIKE '".$value."%'" ;
 		}
 	}
@@ -190,7 +190,9 @@ class Listview
      */
     private function addSqlFromOther(&$TSQLMore, &$value, &$TParam, $sKey, $key)
 	{
-		if($value==-1) return false;
+		// Do not use empty() function, statut 0 exist
+		if ($value == '') return false;
+		elseif($value==-1) return false;
 			
 		if(isset($TParam['operator'][$key]))
 		{
@@ -227,56 +229,60 @@ class Listview
     {
 		$ListPOST = GETPOST('Listview');
 		
-		if (!empty($ListPOST[$this->id]['search']))
+		if (!GETPOST("button_removefilter_x") && !GETPOST("button_removefilter.x") && !GETPOST("button_removefilter"))
 		{
-			$sqlGROUPBY='';
-			if(strpos($sql,'GROUP BY')!==false)
+			foreach ($TParam['search'] as $field => $info)
 			{
-				list($sql, $sqlGROUPBY) = explode('GROUP BY', $sql);
-			}
-			
-			if(strpos($sql,'WHERE ')===false) $sql.=' WHERE 1 ';
-			
-			if (!GETPOST("button_removefilter_x") && !GETPOST("button_removefilter.x") && !GETPOST("button_removefilter"))
-			{
-				// TODO input date are not supported yet
-				foreach($ListPOST[$this->id]['search'] as $key => $value)
+				$TsKey = $this->getSearchKey($field, $TParam);
+				$TSQLMore = array();
+				$allow_is_null = $this->getSearchNull($field,$TParam);
+				
+				foreach ($TsKey as $i => &$sKey)
 				{
-					$TsKey = $this->getSearchKey($key, $TParam);
-					$TSQLMore = array();
-					$allow_is_null = $this->getSearchNull($key,$TParam);
-
-					foreach ($TsKey as $i => &$sKey)
+					$value = '';
+					if (isset($ListPOST[$this->id]['search'][$field])) $value = $ListPOST[$this->id]['search'][$field];
+					
+					if ($allow_is_null && !empty($ListPOST[$this->id]['search_on_null'][$field]))
 					{
-						if($allow_is_null && !empty($ListPOST[$this->id]['search_on_null'][$key]))
-						{
-							$TSQLMore[] = $sKey.' IS NULL ';
-							$value = '';
-						}
-
-						// Do not use empty() function, statut 0 exist
-						if($value != '')
-						{
-							if(isset($TParam['type'][$key]) && ($TParam['type'][$key]==='date' || $TParam['type'][$key]==='datetime'))
-							{
-								$this->addSqlFromTypeDate($TSQLMore, $value, $sKey);
-							}
-							else
-							{
-								$this->addSqlFromOther($TSQLMore, $value, $TParam, $sKey, $key);
-							}
-						}
+						$TSQLMore[] = $sKey.' IS NULL ';
+						$value = '';
 					}
-
-					if(!empty($TSQLMore))
+					
+					if (isset($TParam['type'][$field]) && ($TParam['type'][$field]==='date' || $TParam['type'][$field]==='datetime'))
 					{
-						$sql.=' AND ( '.implode(' OR ',$TSQLMore).' ) ';
+						$k = 'Listview_'.$this->id.'_search_'.$field;
+						if ($info['recherche'] === 'calendars')
+						{
+							$value = array();
+							
+							$timestart = dol_mktime(0, 0, 0, GETPOST($k.'_startmonth'), GETPOST($k.'_startday'), GETPOST($k.'_startyear'));
+							if ($timestart) $value['start'] = date('Y-m-d', $timestart);
+							
+							$timeend = dol_mktime(23, 59, 59, GETPOST($k.'_endmonth'), GETPOST($k.'_endday'), GETPOST($k.'_endyear'));
+							if ($timeend) $value['end'] = date('Y-m-d', $timeend);
+						}
+						else
+						{
+							$time = dol_mktime(12, 0, 0, GETPOST($k.'month'), GETPOST($k.'day'), GETPOST($k.'year'));
+							if ($time) $value = date('Y-m-d', $time);
+						}
+						
+						if (!empty($value)) $this->addSqlFromTypeDate($TSQLMore, $value, $sKey);
+					}
+					else
+					{
+						$this->addSqlFromOther($TSQLMore, $value, $TParam, $sKey, $field);
 					}
 				}
+				
+				if (!empty($TSQLMore))
+				{
+					$sql.=' AND ( '.implode(' OR ',$TSQLMore).' ) ';
+				}
 			}
-			
-			if ($sqlGROUPBY!='')	$sql.=' GROUP BY '.$sqlGROUPBY;
 		}
+		
+		if ($sqlGROUPBY!='') $sql.=' GROUP BY '.$sqlGROUPBY;
 
 		return $sql;
 	}

From 466b6518b25d0a7e6ec0fb22e0d3514963b63b32 Mon Sep 17 00:00:00 2001
From: phf <phf@atm-consulting.fr>
Date: Tue, 28 Mar 2017 17:18:55 +0200
Subject: [PATCH 040/505] Update add the custom value "limit" for the list

---
 htdocs/inventory/list.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/htdocs/inventory/list.php b/htdocs/inventory/list.php
index cb5b2593c32..ff2c5e4d8d4 100644
--- a/htdocs/inventory/list.php
+++ b/htdocs/inventory/list.php
@@ -48,6 +48,9 @@ $list = new ListView($db, 'listInventory');
 $THide = array('label','title');
 
 echo $list->render(Inventory::getSQL('All'), array(
+	'limit' => array(
+		'nbLine' => GETPOST('limit')
+	),
 	'allow-field-select' => true,
     'link'=>array(
         'fk_warehouse'=>'<a href="'.DOL_URL_ROOT.'/product/stock/card.php?id=@val@">'.img_picto('','object_stock.png','',0).' @label@</a>'

From fe1b1ede0f14fb39f11f136ce88326cc5c6acbe2 Mon Sep 17 00:00:00 2001
From: phf <phf@atm-consulting.fr>
Date: Tue, 28 Mar 2017 17:35:51 +0200
Subject: [PATCH 041/505] Fix remove filter on date

---
 htdocs/core/class/listview.class.php | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/class/listview.class.php b/htdocs/core/class/listview.class.php
index 1fcb63fa8a2..a5af2d6f758 100644
--- a/htdocs/core/class/listview.class.php
+++ b/htdocs/core/class/listview.class.php
@@ -332,10 +332,11 @@ class Listview
 		}	
 		
 		$ListPOST = GETPOST('Listview');
+		$removeFilter = (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter"));
 		foreach($TParam['search'] as $key => $param_search)
 		{
 			$value = isset($ListPOST[$this->id]['search'][$key]) ? $ListPOST[$this->id]['search'][$key] : '';
-			if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) $value = '';
+			if ($removeFilter) $value = '';
 			
 			$typeRecherche = (is_array($param_search) && isset($param_search['recherche'])) ? $param_search['recherche'] : $param_search;  
 			
@@ -345,14 +346,18 @@ class Listview
 			}
 			else if($typeRecherche==='calendar')
 			{
-				$value = GETPOST('Listview_'.$this->id.'_search_'.$key) ? mktime(0,0,0, (int) GETPOST('Listview_'.$this->id.'_search_'.$key.'month'), (int) GETPOST('Listview_'.$this->id.'_search_'.$key.'day'), (int) GETPOST('Listview_'.$this->id.'_search_'.$key.'year') ) : '';
+				if (!$removeFilter) $value = GETPOST('Listview_'.$this->id.'_search_'.$key) ? mktime(0,0,0, (int) GETPOST('Listview_'.$this->id.'_search_'.$key.'month'), (int) GETPOST('Listview_'.$this->id.'_search_'.$key.'day'), (int) GETPOST('Listview_'.$this->id.'_search_'.$key.'year') ) : '';
 				
 				$fsearch = $form->select_date($value, 'Listview_'.$this->id.'_search_'.$key,0, 0, 1, "", 1, 0, 1);
 			}
 			else if($typeRecherche==='calendars')
 			{
-				$value_start = GETPOST('Listview_'.$this->id.'_search_'.$key.'_start') ? mktime(0,0,0, (int) GETPOST('Listview_'.$this->id.'_search_'.$key.'_startmonth'), (int) GETPOST('Listview_'.$this->id.'_search_'.$key.'_startday'), (int) GETPOST('Listview_'.$this->id.'_search_'.$key.'_startyear') ) : '';
-				$value_end = GETPOST('Listview_'.$this->id.'_search_'.$key.'_end') ? mktime(0,0,0, (int) GETPOST('Listview_'.$this->id.'_search_'.$key.'_endmonth'), (int) GETPOST('Listview_'.$this->id.'_search_'.$key.'_endday'), (int) GETPOST('Listview_'.$this->id.'_search_'.$key.'_endyear') ) : '';
+				$value_start = $value_end = '';
+				if (!$removeFilter)
+				{
+					$value_start = GETPOST('Listview_'.$this->id.'_search_'.$key.'_start') ? mktime(0,0,0, (int) GETPOST('Listview_'.$this->id.'_search_'.$key.'_startmonth'), (int) GETPOST('Listview_'.$this->id.'_search_'.$key.'_startday'), (int) GETPOST('Listview_'.$this->id.'_search_'.$key.'_startyear') ) : '';
+					$value_end = GETPOST('Listview_'.$this->id.'_search_'.$key.'_end') ? mktime(0,0,0, (int) GETPOST('Listview_'.$this->id.'_search_'.$key.'_endmonth'), (int) GETPOST('Listview_'.$this->id.'_search_'.$key.'_endday'), (int) GETPOST('Listview_'.$this->id.'_search_'.$key.'_endyear') ) : '';
+				}
 			
 				$fsearch = $form->select_date($value_start, 'Listview_'.$this->id.'_search_'.$key.'_start',0, 0, 1, "", 1, 0, 1)
 						 . $form->select_date($value_end, 'Listview_'.$this->id.'_search_'.$key.'_end',0, 0, 1, "", 1, 0, 1);
@@ -654,7 +659,7 @@ class Listview
 		
 		if(empty($TField))
 		{
-			if (!empty($TParam['list']['messageNothing'])) $out .= '<tr class="'.$class.'"><td colspan="'.$TParam['list']['nb_columns'].'">'.$TParam['list']['messageNothing'].'</td></tr>';
+			if (!empty($TParam['list']['messageNothing'])) $out .= '<tr class="pair" align="center"><td colspan="'.(count($TParam['title'])+1).'">'.$TParam['list']['messageNothing'].'</td></tr>';
 		}
 		else
         {

From 736800dd669e8827d316f3218f09052860af529c Mon Sep 17 00:00:00 2001
From: Alexis ALGOUD <alexis@atm-consulting.fr>
Date: Wed, 5 Apr 2017 12:16:10 +0200
Subject: [PATCH 042/505] little fix

for param into list pagination
---
 htdocs/core/class/listview.class.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/class/listview.class.php b/htdocs/core/class/listview.class.php
index a5af2d6f758..dc2dbbcd161 100644
--- a/htdocs/core/class/listview.class.php
+++ b/htdocs/core/class/listview.class.php
@@ -251,7 +251,7 @@ class Listview
 					if (isset($TParam['type'][$field]) && ($TParam['type'][$field]==='date' || $TParam['type'][$field]==='datetime'))
 					{
 						$k = 'Listview_'.$this->id.'_search_'.$field;
-						if ($info['recherche'] === 'calendars')
+						if ($info['search_type'] === 'calendars')
 						{
 							$value = array();
 							
@@ -338,7 +338,7 @@ class Listview
 			$value = isset($ListPOST[$this->id]['search'][$key]) ? $ListPOST[$this->id]['search'][$key] : '';
 			if ($removeFilter) $value = '';
 			
-			$typeRecherche = (is_array($param_search) && isset($param_search['recherche'])) ? $param_search['recherche'] : $param_search;  
+			$typeRecherche = (is_array($param_search) && isset($param_search['search_type'])) ? $param_search['search_type'] : $param_search;  
 			
 			if(is_array($typeRecherche))
 			{
@@ -599,7 +599,7 @@ class Listview
 		
 		$dolibarr_decalage = $this->totalRow > $this->totalRowToShow ? 1 : 0;
 		ob_start();
-		print_barre_liste($TParam['list']['title'], $TParam['limit']['page']-1, $_SERVER["PHP_SELF"], '&param', $TParam['sortfield'], $TParam['sortorder'], '', $this->totalRowToShow+$dolibarr_decalage, $this->totalRow, $TParam['list']['image'], 0, '', '', $TParam['limit']['nbLine']);
+		print_barre_liste($TParam['list']['title'], $TParam['limit']['page']-1, $_SERVER["PHP_SELF"], '&'.$TParam['list']['param_url'], $TParam['sortfield'], $TParam['sortorder'], '', $this->totalRowToShow+$dolibarr_decalage, $this->totalRow, $TParam['list']['image'], 0, '', '', $TParam['limit']['nbLine']);
 		$out .= ob_get_clean();
 		
 	
@@ -621,7 +621,7 @@ class Listview
 			if (empty($head['width'])) $head['width'] = 'auto';
 			if (!empty($head['width']) && !empty($head['text-align'])) $moreattrib .= 'style="width:'.$head['width'].';text-align:'.$head['text-align'].'"';
 
-			if (isset($TParam['search'][$field]['recherche']) && $TParam['search'][$field]['recherche'] !== false)
+			if (isset($TParam['search'][$field]['search_type']) && $TParam['search'][$field]['search_type'] !== false)
 			{
 				$TsKey = $this->getSearchKey($field, $TParam);
 				if (!empty($TsKey)) $search = implode(',', $TsKey);

From 22503da8b4499a6f385d1d7f383233b0ca8842fd Mon Sep 17 00:00:00 2001
From: phf <phf@atm-consulting.fr>
Date: Wed, 5 Apr 2017 12:25:00 +0200
Subject: [PATCH 043/505] Fix search_type on inventory list

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

diff --git a/htdocs/inventory/list.php b/htdocs/inventory/list.php
index ff2c5e4d8d4..d55996d0407 100644
--- a/htdocs/inventory/list.php
+++ b/htdocs/inventory/list.php
@@ -84,9 +84,9 @@ echo $list->render(Inventory::getSQL('All'), array(
 		
 	),
     'search'=>array(
-		'rowid' => array('recherche' => true, 'table' => array('i'), 'field' => array('title')),
-        'date_inventory'=>array('recherche' => 'calendars', 'table' => array('i'), 'field' => array('date_inventory')),
-        'status'=>array(1=>$langs->trans("inventoryValidate"), 0=>$langs->trans("inventoryDraft"))
+		'rowid' => array('search_type' => true, 'table' => array('i'), 'field' => array('title')),
+		'date_inventory'=>array('search_type' => 'calendars', 'table' => array('i'), 'field' => array('date_inventory')),
+		'status'=>array('search_type' => array(1=>$langs->trans("inventoryValidate"), 0=>$langs->trans("inventoryDraft")))
     )
 ));
 

From f460d2e705ede1ee91420f48fb0a92606f01ee78 Mon Sep 17 00:00:00 2001
From: mikee2 <mikee2@users.noreply.github.com>
Date: Sun, 9 Apr 2017 21:39:15 +0200
Subject: [PATCH 044/505] Update Segment.php

---
 htdocs/includes/odtphp/Segment.php | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/htdocs/includes/odtphp/Segment.php b/htdocs/includes/odtphp/Segment.php
index 39761aa4d04..2ef40b2cd66 100644
--- a/htdocs/includes/odtphp/Segment.php
+++ b/htdocs/includes/odtphp/Segment.php
@@ -139,6 +139,8 @@ class Segment implements IteratorAggregate, Countable
         }
         $reg = "/\[!--\sBEGIN\s$this->name\s--\](.*)\[!--\sEND\s$this->name\s--\]/sm";
         $this->xmlParsed = preg_replace($reg, '$1', $this->xmlParsed);
+	// Miguel Erill 09704/2017 - Add macro replacement to invoice lines
+        $this->xmlParsed = $this->macroReplace($this->xmlParsed);
         $this->file->open($this->odf->getTmpfile());
         foreach ($this->images as $imageKey => $imageValue) {
 			if ($this->file->getFromName('Pictures/' . $imageValue) === false) {
@@ -152,6 +154,29 @@ class Segment implements IteratorAggregate, Countable
         
         return $this->xmlParsed;
     }
+   /**
+    * Function to replace macros for invoice short and long month, invoice year
+    * 
+    * Substitution occur when the invoice is generated, not considering the invoice date
+    * so do not (re)generate in a diferent date than the one that the invoice belongs to
+    * Perhaps it would be better to use the invoice issued date but I still do not know
+    * how to get it here
+    *
+    * Miguel Erill 09/04/2017
+    * 
+    * @param	string	$value	String to convert
+    */
+    public function macroReplace($text)
+    {
+        global $langs;
+
+        $patterns=array( '/\[%M\]/','/\[%F\]/','/\[%Y\]/' );
+        $values=array( $langs->trans(date('M')), $langs->trans(date('F')), date('Y') );
+
+        $text=preg_replace($patterns, $values, $text);
+
+	return $text;
+    }
     /**
      * Analyse the XML code in order to find children
      *

From 30d58f77db555c807251c4dfe1e0eb7ba1a7d486 Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.verdol@atm-consulting.fr>
Date: Tue, 11 Apr 2017 11:33:05 +0200
Subject: [PATCH 045/505] FIX : forgotten parameter for right multicompany use

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

diff --git a/htdocs/contact/document.php b/htdocs/contact/document.php
index 81f9b2a29be..2d8fe5b1d2e 100644
--- a/htdocs/contact/document.php
+++ b/htdocs/contact/document.php
@@ -39,7 +39,7 @@ $confirm = GETPOST('confirm', 'alpha');
 
 // Security check
 if ($user->societe_id) $socid=$user->societe_id;
-$result = restrictedArea($user, 'contact', $id, '','');
+$result = restrictedArea($user, 'contact', $id, 'socpeople&societe');
 
 // Get parameters
 $sortfield = GETPOST("sortfield",'alpha');

From 8a373b25ba04c33300ccd38fc5b02ad5c0ce1bd2 Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.verdol@atm-consulting.fr>
Date: Tue, 11 Apr 2017 12:41:19 +0200
Subject: [PATCH 046/505] FIX : global $dateSelector isn't the good one, then
 date selector on objectline_create tpl was hidden

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

diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index c43380a9e7a..c6f6a638c6c 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -37,7 +37,7 @@ if (! empty($conf->margin->enabled) && ! empty($object->element) && in_array($ob
     $usemargins=1;
 }
 
-global $dateSelector, $forceall, $senderissupplier, $inputalsopricewithtax;
+global $forceall, $senderissupplier, $inputalsopricewithtax;
 if (empty($dateSelector)) $dateSelector=0;
 if (empty($forceall)) $forceall=0;
 if (empty($senderissupplier)) $senderissupplier=0;

From 4d31759ff989e1baaa1066fd1a64f926f03aeab7 Mon Sep 17 00:00:00 2001
From: philippe grand <philippe.grand@atoo-net.com>
Date: Tue, 11 Apr 2017 14:35:10 +0200
Subject: [PATCH 047/505] Update code using new css class

---
 htdocs/accountancy/bookkeeping/card.php              | 6 ++----
 htdocs/accountancy/bookkeeping/listbyaccount.php     | 3 +--
 htdocs/accountancy/bookkeeping/listbyyear.php        | 3 +--
 htdocs/accountancy/customer/index.php                | 6 ++----
 htdocs/accountancy/customer/list.php                 | 3 +--
 htdocs/accountancy/expensereport/index.php           | 6 ++----
 htdocs/accountancy/expensereport/lines.php           | 3 +--
 htdocs/accountancy/expensereport/list.php            | 3 +--
 htdocs/accountancy/journal/bankjournal.php           | 8 +++-----
 htdocs/accountancy/journal/expensereportsjournal.php | 9 +++------
 htdocs/accountancy/journal/purchasesjournal.php      | 9 +++------
 htdocs/accountancy/journal/sellsjournal.php          | 9 +++------
 htdocs/accountancy/report/result.php                 | 3 +--
 htdocs/accountancy/supplier/index.php                | 6 ++----
 htdocs/accountancy/supplier/list.php                 | 3 +--
 15 files changed, 27 insertions(+), 53 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php
index 0ec4fb07a12..116e071e42f 100644
--- a/htdocs/accountancy/bookkeeping/card.php
+++ b/htdocs/accountancy/bookkeeping/card.php
@@ -369,8 +369,7 @@ if ($action == 'create') {
 				print "</tr>\n";
 
 				foreach ($book->linesmvt as $line) {
-					$var = ! $var;
-					print '<tr ' . $bc[$var] . '>';
+					print '<tr class="oddeven">';
 
 					$total_debit += $line->debit;
 					$total_credit += $line->credit;
@@ -420,8 +419,7 @@ if ($action == 'create') {
 				}
 
 				if ($action == "" || $action == 'add') {
-					$var = ! $var;
-					print '<tr ' . $bc[$var] . '>';
+					print '<tr class="oddeven">';
 					print '<td>';
 					print $formventilation->select_account($account_number, 'account_number', 0, array (), 1, 1, '');
 					print '</td>';
diff --git a/htdocs/accountancy/bookkeeping/listbyaccount.php b/htdocs/accountancy/bookkeeping/listbyaccount.php
index 61753d1c39d..cbb83ba269e 100644
--- a/htdocs/accountancy/bookkeeping/listbyaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbyaccount.php
@@ -265,7 +265,6 @@ $sous_total_credit = 0;
 $displayed_account_number = null;       // Start with undefined to be able to distinguish with empty 
 
 foreach ( $object->lines as $line ) {
-	$var = ! $var;
 
 	$total_debit += $line->debit;
 	$total_credit += $line->credit;
@@ -298,7 +297,7 @@ foreach ( $object->lines as $line ) {
         $sous_total_credit = 0;
     }
 
-	print '<tr '. $bc[$var].'>';
+	print '<tr class="oddeven">';
 	print '<td>&nbsp;</td>';
 	print '<td align="right">'.$line->piece_num.'</td>';
 	print '<td align="center">' . dol_print_date($line->doc_date, 'day') . '</td>';
diff --git a/htdocs/accountancy/bookkeeping/listbyyear.php b/htdocs/accountancy/bookkeeping/listbyyear.php
index f716339bdc8..263f293043a 100644
--- a/htdocs/accountancy/bookkeeping/listbyyear.php
+++ b/htdocs/accountancy/bookkeeping/listbyyear.php
@@ -267,9 +267,8 @@ print "</tr>\n";
 $var = True;
 
 foreach ( $object->lines as $line ) {
-	$var = ! $var;
 
-	print '<tr '. $bc[$var].'>';
+	print '<tr class="oddeven">';
 	print '<td>' . $line->piece_num . '</td>' . "\n";
 	print '<td>' . $line->doc_type . '</td>' . "\n";
 	print '<td align="center">' . dol_print_date($line->doc_date) . '</td>';
diff --git a/htdocs/accountancy/customer/index.php b/htdocs/accountancy/customer/index.php
index dddc7c896c0..82a406d4a0b 100644
--- a/htdocs/accountancy/customer/index.php
+++ b/htdocs/accountancy/customer/index.php
@@ -244,8 +244,7 @@ if ($resql) {
 
 	while ( $row = $db->fetch_row($resql)) {
 
-		$var = ! $var;
-		print '<tr ' . $bc[$var] . '><td>' . length_accountg($row[0]) . '</td>';
+		print '<tr class="oddeven"><td>' . length_accountg($row[0]) . '</td>';
 		print '<td align="left">' . $row[1] . '</td>';
 		for($i = 2; $i <= 12; $i ++) {
 			print '<td align="right">' . price($row[$i]) . '</td>';
@@ -301,8 +300,7 @@ if ($resql) {
 
     while ( $row = $db->fetch_row($resql)) {
 
-        $var = ! $var;
-        print '<tr ' . $bc[$var] . '><td>' . length_accountg($row[0]) . '</td>';
+        print '<tr class="oddeven"><td>' . length_accountg($row[0]) . '</td>';
         print '<td align="left">' . $row[1] . '</td>';
         for($i = 2; $i <= 12; $i ++) {
             print '<td align="right">' . price($row[$i]) . '</td>';
diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php
index e8e10b4a0be..845e0a62540 100644
--- a/htdocs/accountancy/customer/list.php
+++ b/htdocs/accountancy/customer/list.php
@@ -313,7 +313,6 @@ if ($result) {
 	$var = true;
 	while ( $i < min($num_lines, $limit) ) {
 		$objp = $db->fetch_object($result);
-		$var = ! $var;
 
 		$objp->code_sell_l = '';
 		$objp->code_sell_p = '';
@@ -354,7 +353,7 @@ if ($result) {
 		// $objp->code_sell_p is now code of product/service
 		// $objp->code_sell_l is now default code of product/service
 					
-		print '<tr '. $bc[$var].'>';
+		print '<tr class="oddeven">';
 
 		// Line id
 		print '<td>' . $objp->rowid . '</td>';
diff --git a/htdocs/accountancy/expensereport/index.php b/htdocs/accountancy/expensereport/index.php
index b4d7c0bbb7a..4bfeb630b02 100644
--- a/htdocs/accountancy/expensereport/index.php
+++ b/htdocs/accountancy/expensereport/index.php
@@ -217,8 +217,7 @@ if ($resql) {
 
     while ( $row = $db->fetch_row($resql)) {
 
-        $var = ! $var;
-        print '<tr ' . $bc[$var] . '><td>' . length_accountg($row[0]) . '</td>';
+        print '<tr class="oddeven"><td>' . length_accountg($row[0]) . '</td>';
         print '<td align="left">' . $row[1] . '</td>';
         for($i = 2; $i <= 12; $i ++) {
             print '<td align="right">' . price($row[$i]) . '</td>';
@@ -271,8 +270,7 @@ if ($resql) {
 
     while ( $row = $db->fetch_row($resql)) {
 
-        $var = ! $var;
-        print '<tr ' . $bc[$var] . '><td>' . length_accountg($row[0]) . '</td>';
+        print '<tr class="oddeven"><td>' . length_accountg($row[0]) . '</td>';
         print '<td align="left">' . $row[1] . '</td>';
         for($i = 2; $i <= 12; $i ++) {
             print '<td align="right">' . price($row[$i]) . '</td>';
diff --git a/htdocs/accountancy/expensereport/lines.php b/htdocs/accountancy/expensereport/lines.php
index 20994d76a93..4205a497c1a 100644
--- a/htdocs/accountancy/expensereport/lines.php
+++ b/htdocs/accountancy/expensereport/lines.php
@@ -268,13 +268,12 @@ if ($result) {
 	$var = True;
 	while ( $i < min($num_lines, $limit) ) {
 		$objp = $db->fetch_object($result);
-		$var = ! $var;
 		$codeCompta = length_accountg($objp->account_number) . ' - ' . $objp->label;
 
 		$expensereport_static->ref = $objp->ref;
 		$expensereport_static->id = $objp->erid;
 		
-		print '<tr '. $bc[$var].'>';
+		print '<tr class="oddeven">';
 
 		print '<td>' . $objp->rowid . '</td>';
 
diff --git a/htdocs/accountancy/expensereport/list.php b/htdocs/accountancy/expensereport/list.php
index 49a63a15698..114fd2c99ea 100644
--- a/htdocs/accountancy/expensereport/list.php
+++ b/htdocs/accountancy/expensereport/list.php
@@ -299,7 +299,6 @@ if ($result) {
 	$var = true;
 	while ( $i < min($num_lines, $limit) ) {
 		$objp = $db->fetch_object($result);
-		$var = ! $var;
 
 		$objp->aarowid_suggest = '';
 		$objp->aarowid_suggest = $objp->aarowid;
@@ -307,7 +306,7 @@ if ($result) {
 		$expensereport_static->ref = $objp->ref;
 		$expensereport_static->id = $objp->erid;
 
-		print '<tr '. $bc[$var].'>';
+		print '<tr class="oddeven">';
 
 		// Line id
 		print '<td>' . $objp->rowid . '</td>';
diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index dc18a3417e8..b9567cd50a7 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -749,7 +749,6 @@ if (empty($action) || $action == 'view') {
 	print "<td align='right'>" . $langs->trans("Credit") . "</td>";
 	print "</tr>\n";
 
-	$var = true;
 	$r = '';
 
 	foreach ( $tabpay as $key => $val ) {      // $key is rowid in llx_bank
@@ -826,7 +825,7 @@ if (empty($action) || $action == 'view') {
 		// Bank
 		foreach ( $tabbq[$key] as $k => $mt ) 
 		{
-		    print "<tr " . $bc[$var] . ">";
+		    print '<tr class="oddeven">';
 		    print "<td><!-- Bank bank.rowid=".$key."--></td>";
 		    print "<td>" . $date . "</td>";
 			print "<td>" . $ref . "</td>";
@@ -853,7 +852,7 @@ if (empty($action) || $action == 'view') {
 		if (is_array($tabtp[$key])) {
 			foreach ( $tabtp[$key] as $k => $mt ) {
 				if ($k != 'type') {
-					print "<tr " . $bc[$var] . ">";
+					print '<tr class="oddeven">';
 					print "<td><!-- Thirdparty bank.rowid=".$key." --></td>";
 					print "<td>" . $date . "</td>";
 					print "<td>" . $ref . "</td>";
@@ -874,7 +873,7 @@ if (empty($action) || $action == 'view') {
 			}
 		} else {
 			foreach ( $tabbq[$key] as $k => $mt ) {
-				print "<tr " . $bc[$var] . ">";
+				print '<tr class="oddeven">';
 				print "<td><!-- Wait bank.rowid=".$key." --></td>";
 				print "<td>" . $date . "</td>";
 				print "<td>" . $ref . "</td>";
@@ -892,7 +891,6 @@ if (empty($action) || $action == 'view') {
 				print "</tr>";
 			}
 		}
-		$var = ! $var;
 	}
 
 	print "</table>";
diff --git a/htdocs/accountancy/journal/expensereportsjournal.php b/htdocs/accountancy/journal/expensereportsjournal.php
index 8d657ee6d11..a281b7fef8d 100644
--- a/htdocs/accountancy/journal/expensereportsjournal.php
+++ b/htdocs/accountancy/journal/expensereportsjournal.php
@@ -449,7 +449,6 @@ if (empty($action) || $action == 'view') {
 	print "<td align='right'>" . $langs->trans("Credit") . "</td>";
 	print "</tr>\n";
 
-	$var = true;
 	$r = '';
 
 	$expensereportstatic = new ExpenseReport($db);
@@ -468,7 +467,7 @@ if (empty($action) || $action == 'view') {
 			$accountingaccount->fetch(null, $k, true);
 
 			if ($mt) {
-				print "<tr " . $bc[$var] . " >";
+				print '<tr class="oddeven">';
 				print "<td><!-- Fees --></td>";
 				print "<td>" . $date . "</td>";
 				print "<td>" . $expensereportstatic->getNomUrl(1) . "</td>";
@@ -494,7 +493,7 @@ if (empty($action) || $action == 'view') {
 		// VAT
 		foreach ( $tabtva[$key] as $k => $mt ) {
 			if ($mt) {
-				print "<tr " . $bc[$var] . " >";
+				print '<tr class="oddeven">';
 				print "<td><!-- VAT --></td>";
 				print "<td>" . $date . "</td>";
 				print "<td>" . $expensereportstatic->getNomUrl(1) . "</td>";
@@ -512,7 +511,7 @@ if (empty($action) || $action == 'view') {
 				print "</tr>";
 			}
 		}
-		print "<tr " . $bc[$var] . ">";
+		print '<tr class="oddeven">';
 
 		// Third party
 		foreach ( $tabttc[$key] as $k => $mt ) {
@@ -534,8 +533,6 @@ if (empty($action) || $action == 'view') {
 			print '<td align="right">' . ($mt >= 0 ? price($mt) : '') . "</td>";
 		}
 		print "</tr>";
-
-		$var = ! $var;
 	}
 
 	print "</table>";
diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php
index 9790d124d56..a00fc9a70d8 100644
--- a/htdocs/accountancy/journal/purchasesjournal.php
+++ b/htdocs/accountancy/journal/purchasesjournal.php
@@ -498,7 +498,6 @@ if (empty($action) || $action == 'view') {
 	print "<t><td>" . $langs->trans("Type") . "</td><td align='right'>" . $langs->trans("Debit") . "</td><td align='right'>" . $langs->trans("Credit") . "</td>";
 	print "</tr>\n";
 
-	$var = true;
 	$r = '';
 
 	$invoicestatic = new FactureFournisseur($db);
@@ -521,7 +520,7 @@ if (empty($action) || $action == 'view') {
 			$accountingaccount->fetch(null, $k, true);
 
 			if ($mt) {
-				print "<tr " . $bc[$var] . " >";
+				print '<tr class="oddeven">';
 				print "<td><!-- Product --></td>";
 				print "<td>" . $date . "</td>";
 				print "<td>" . $invoicestatic->getNomUrl(1) . "</td>";
@@ -545,7 +544,7 @@ if (empty($action) || $action == 'view') {
 		// VAT
 		foreach ( $tabtva[$key] as $k => $mt ) {
 			if ($mt) {
-				print "<tr " . $bc[$var] . " >";
+				print '<tr class="oddeven">';
 				print "<td><!-- VAT --></td>";
 				print "<td>" . $date . "</td>";
 				print "<td>" . $invoicestatic->getNomUrl(1) . "</td>";
@@ -563,7 +562,7 @@ if (empty($action) || $action == 'view') {
 				print "</tr>";
 			}
 		}
-		print "<tr " . $bc[$var] . ">";
+		print '<tr class="oddeven">';
 
 		// Third party
 		foreach ( $tabttc[$key] as $k => $mt ) {
@@ -588,8 +587,6 @@ if (empty($action) || $action == 'view') {
 			print '<td align="right">' . ($mt >= 0 ? price($mt) : '') . "</td>";
 		}
 		print "</tr>";
-
-		$var = ! $var;
 	}
 
 	print "</table>";
diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php
index fc3a511d670..235af8eeb41 100644
--- a/htdocs/accountancy/journal/sellsjournal.php
+++ b/htdocs/accountancy/journal/sellsjournal.php
@@ -517,7 +517,6 @@ if (empty($action) || $action == 'view') {
 	print "<td align='right'>" . $langs->trans("Credit") . "</td>";
 	print "</tr>\n";
 
-	$var = true;
 	$r = '';
 
 	$invoicestatic = new Facture($db);
@@ -532,7 +531,7 @@ if (empty($action) || $action == 'view') {
 
 		// Third party
 		foreach ( $tabttc[$key] as $k => $mt ) {
-			print "<tr " . $bc[$var] . ">";
+			print '<tr class="oddeven">';
 			print "<td><!-- Thirdparty --></td>";
 			print "<td>" . $date . "</td>";
 			print "<td>" . $invoicestatic->getNomUrl(1) . "</td>";
@@ -562,7 +561,7 @@ if (empty($action) || $action == 'view') {
 			$accountingaccount->fetch(null, $k, true);
 
 			if ($mt) {
-				print "<tr " . $bc[$var] . ">";
+				print '<tr class="oddeven">';
 				print "<td><!-- Product --></td>";
 				print "<td>" . $date . "</td>";
 				print "<td>" . $invoicestatic->getNomUrl(1) . "</td>";
@@ -585,7 +584,7 @@ if (empty($action) || $action == 'view') {
 		// VAT
 		foreach ( $tabtva[$key] as $k => $mt ) {
 			if ($mt) {
-				print "<tr " . $bc[$var] . ">";
+				print '<tr class="oddeven">';
 				print "<td><!-- VAT --></td>";
 				print "<td>" . $date . "</td>";
 				print "<td>" . $invoicestatic->getNomUrl(1) . "</td>";
@@ -604,8 +603,6 @@ if (empty($action) || $action == 'view') {
 				print "</tr>";
 			}
 		}
-
-		$var = ! $var;
 	}
 
 	print "</table>";
diff --git a/htdocs/accountancy/report/result.php b/htdocs/accountancy/report/result.php
index 317b7193ff3..a487cb641ff 100644
--- a/htdocs/accountancy/report/result.php
+++ b/htdocs/accountancy/report/result.php
@@ -127,7 +127,6 @@ if (!empty($cats))
 		$position = -1;
 		$code = -1;
 		foreach($cpts as $i => $cpt){
-			$var = ! $var;
 
 			$position = $cpt['position'];
 			$code = $cpt['code'];
@@ -149,7 +148,7 @@ if (!empty($cats))
 			}
 			$sommes[$code]['NP'] += $resultNP;
 			$sommes[$code]['N'] += $resultN;
-			print '<tr'. $bc[$var].'>';
+			print '<tr class="oddeven">';
 			print '<td>' . $cpt['account_number'] . '</td>';
 			print '<td>' . $cpt['name_cpt'] . '</td>';
 			print '<td>' . price($resultNP)  . '</td>';
diff --git a/htdocs/accountancy/supplier/index.php b/htdocs/accountancy/supplier/index.php
index a747342a508..2d36399c9b5 100644
--- a/htdocs/accountancy/supplier/index.php
+++ b/htdocs/accountancy/supplier/index.php
@@ -215,8 +215,7 @@ if ($resql) {
 
 	while ( $row = $db->fetch_row($resql)) {
 
-		$var = ! $var;
-		print '<tr ' . $bc[$var] . '><td>' . length_accountg($row[0]) . '</td>';
+		print '<tr class="oddeven"><td>' . length_accountg($row[0]) . '</td>';
 		print '<td align="left">' . $row[1] . '</td>';
 		for($i = 2; $i <= 12; $i ++) {
 			print '<td align="right">' . price($row[$i]) . '</td>';
@@ -270,8 +269,7 @@ if ($resql) {
 
     while ( $row = $db->fetch_row($resql)) {
 
-        $var = ! $var;
-        print '<tr ' . $bc[$var] . '><td>' . length_accountg($row[0]) . '</td>';
+        print '<tr class="oddeven"><td>' . length_accountg($row[0]) . '</td>';
         print '<td align="left">' . $row[1] . '</td>';
         for($i = 2; $i <= 12; $i ++) {
             print '<td align="right">' . price($row[$i]) . '</td>';
diff --git a/htdocs/accountancy/supplier/list.php b/htdocs/accountancy/supplier/list.php
index 9b42337852c..beae148c01b 100644
--- a/htdocs/accountancy/supplier/list.php
+++ b/htdocs/accountancy/supplier/list.php
@@ -313,7 +313,6 @@ if ($result) {
 	$var = true;
 	while ( $i < min($num_lines, $limit) ) {
 		$objp = $db->fetch_object($result);
-		$var = ! $var;
 
 		// product_type: 0 = service ? 1 = product
 		// if product does not exist we use the value of product_type provided in facturedet to define if this is a product or service
@@ -355,7 +354,7 @@ if ($result) {
 		// $objp->code_buy_p is now code of product/service
 		// $objp->code_buy_l is now default code of product/service
 					
-		print '<tr '. $bc[$var].'>';
+		print '<tr class="oddeven">';
 
 		// Line id
 		print '<td>' . $objp->rowid . '</td>';

From 06c91cdaf20f19baf5fcd86c0fab8b0cb804622d Mon Sep 17 00:00:00 2001
From: philippe grand <philippe.grand@atoo-net.com>
Date: Tue, 11 Apr 2017 14:47:11 +0200
Subject: [PATCH 048/505] ref column was missing for specimen and some update

---
 htdocs/comm/propal/class/propal.class.php | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 3489860e1dd..9aad218e66f 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -7,7 +7,7 @@
  * Copyright (C) 2006      Andre Cianfarani			<acianfa@free.fr>
  * Copyright (C) 2008      Raphael Bertrand			<raphael.bertrand@resultic.fr>
  * Copyright (C) 2010-2014 Juanjo Menent			<jmenent@2byte.es>
- * Copyright (C) 2010-2016 Philippe Grand			<philippe.grand@atoo-net.com>
+ * Copyright (C) 2010-2017 Philippe Grand			<philippe.grand@atoo-net.com>
  * Copyright (C) 2012-2014 Christophe Battarel  	<christophe.battarel@altairis.fr>
  * Copyright (C) 2012      Cedric Salvador          <csalvador@gpcsolutions.fr>
  * Copyright (C) 2013      Florian Henry		  	<florian.henry@open-concept.pro>
@@ -3113,21 +3113,21 @@ class Propal extends CommonObject
             $line->qty=1;
             $line->subprice=100;
             $line->price=100;
-            $line->tva_tx=19.6;
+            $line->tva_tx=20;
             $line->localtax1_tx=0;
             $line->localtax2_tx=0;
             if ($xnbp == 2)
             {
                 $line->total_ht=50;
-                $line->total_ttc=59.8;
-                $line->total_tva=9.8;
+                $line->total_ttc=60;
+                $line->total_tva=10;
                 $line->remise_percent=50;
             }
             else
             {
                 $line->total_ht=100;
-                $line->total_ttc=119.6;
-                $line->total_tva=19.6;
+                $line->total_ttc=120;
+                $line->total_tva=20;
                 $line->remise_percent=00;
             }
 
@@ -3135,6 +3135,7 @@ class Propal extends CommonObject
             {
             	$prodid = mt_rand(1, $num_prods);
             	$line->fk_product=$prodids[$prodid];
+				$line->product_ref='SPECIMEN';
             }
 
             $this->lines[$xnbp]=$line;

From c3387cb4e64704e958d39320d27e76ddecea287e Mon Sep 17 00:00:00 2001
From: philippe grand <philippe.grand@atoo-net.com>
Date: Tue, 11 Apr 2017 14:54:34 +0200
Subject: [PATCH 049/505] ref column was missing for specimen and some update

---
 htdocs/commande/class/commande.class.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index e87923beb8c..bf1f993bcdc 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -3541,25 +3541,26 @@ class Commande extends CommonOrder
             $line->qty=1;
             $line->subprice=100;
             $line->price=100;
-            $line->tva_tx=19.6;
+            $line->tva_tx=20;
             if ($xnbp == 2)
             {
                 $line->total_ht=50;
-                $line->total_ttc=59.8;
-                $line->total_tva=9.8;
+                $line->total_ttc=60;
+                $line->total_tva=10;
                 $line->remise_percent=50;
             }
             else
             {
                 $line->total_ht=100;
-                $line->total_ttc=119.6;
-                $line->total_tva=19.6;
+                $line->total_ttc=120;
+                $line->total_tva=20;
                 $line->remise_percent=0;
             }
             if ($num_prods > 0)
             {
             	$prodid = mt_rand(1, $num_prods);
             	$line->fk_product=$prodids[$prodid];
+				$line->product_ref='SPECIMEN';
             }
 
             $this->lines[$xnbp]=$line;

From 551d79f1e22dad34d7595b97d7195e9999d685f2 Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.verdol@atm-consulting.fr>
Date: Tue, 11 Apr 2017 17:36:21 +0200
Subject: [PATCH 050/505] FIX : close supplier makes no sense. we just need to
 know if it is accepted or not

---
 htdocs/supplier_proposal/card.php | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index 9ed38461180..b306a7149e2 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -452,14 +452,6 @@ if (empty($reshook))
 		}
 	}
 
-	// Close proposal
-	else if ($action == 'close' && $user->rights->supplier_proposal->cloturer && ! GETPOST('cancel')) {
-		// prevent browser refresh from reopening proposal several times
-		if ($object->statut == 2) {
-			$object->setStatut(4);
-		}
-	}
-
 	// Set accepted/refused
 	else if ($action == 'setstatut' && $user->rights->supplier_proposal->cloturer && ! GETPOST('cancel')) {
 		if (! GETPOST('statut')) {
@@ -1779,12 +1771,6 @@ if ($action == 'create')
 					print '>' . $langs->trans('SetAcceptedRefused') . '</a></div>';
 				}
 
-				// Close
-				if ($object->statut == 2 && $user->rights->supplier_proposal->cloturer) {
-				    print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=close' . (empty($conf->global->MAIN_JUMP_TAG) ? '' : '#close') . '"';
-				    print '>' . $langs->trans('Close') . '</a></div>';
-				}
-
 				// Clone
 				if ($user->rights->supplier_proposal->creer) {
 					print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&amp;socid=' . $object->socid . '&amp;action=clone&amp;object=' . $object->element . '">' . $langs->trans("ToClone") . '</a></div>';

From b0f2d2310b106454fce2cc06a899df78c078c425 Mon Sep 17 00:00:00 2001
From: philippe grand <philippe.grand@atoo-net.com>
Date: Wed, 12 Apr 2017 10:28:05 +0200
Subject: [PATCH 051/505] Update code using new css class

---
 htdocs/adherents/admin/adherent.php     | 19 ++++++-------------
 htdocs/adherents/admin/public.php       | 19 ++++++-------------
 htdocs/adherents/index.php              | 17 ++++-------------
 htdocs/adherents/stats/byproperties.php |  4 +---
 htdocs/adherents/stats/geo.php          |  4 +---
 htdocs/adherents/stats/index.php        |  7 ++-----
 htdocs/adherents/subscription.php       |  4 +---
 htdocs/adherents/type.php               |  8 ++------
 8 files changed, 23 insertions(+), 59 deletions(-)

diff --git a/htdocs/adherents/admin/adherent.php b/htdocs/adherents/admin/adherent.php
index 8e265eb70f7..2754c2d3690 100644
--- a/htdocs/adherents/admin/adherent.php
+++ b/htdocs/adherents/admin/adherent.php
@@ -125,15 +125,13 @@ print '<td>'.$langs->trans("Description").'</td>';
 print '<td>'.$langs->trans("Value").'</td>';
 print '<td align="center">'.$langs->trans("Action").'</td>';
 print "</tr>\n";
-$var=true;
 
 // Login/Pass required for members
-$var=!$var;
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="action" value="update">';
 print '<input type="hidden" name="constname" value="ADHERENT_LOGIN_NOT_REQUIRED">';
-print '<tr '.$bc[$var].'><td>'.$langs->trans("AdherentLoginRequired").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("AdherentLoginRequired").'</td><td>';
 print $form->selectyesno('constvalue',(! empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)?0:1),1);
 print '</td><td align="center" width="80">';
 print '<input type="submit" class="button" value="'.$langs->trans("Update").'" name="Button">';
@@ -141,12 +139,11 @@ print "</td></tr>\n";
 print '</form>';
 
 // Mail required for members
-$var=!$var;
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="action" value="update">';
 print '<input type="hidden" name="constname" value="ADHERENT_MAIL_REQUIRED">';
-print '<tr '.$bc[$var].'><td>'.$langs->trans("AdherentMailRequired").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("AdherentMailRequired").'</td><td>';
 print $form->selectyesno('constvalue',(! empty($conf->global->ADHERENT_MAIL_REQUIRED)?$conf->global->ADHERENT_MAIL_REQUIRED:0),1);
 print '</td><td align="center" width="80">';
 print '<input type="submit" class="button" value="'.$langs->trans("Update").'" name="Button">';
@@ -154,12 +151,11 @@ print "</td></tr>\n";
 print '</form>';
 
 // Send mail information is on by default
-$var=!$var;
 print '<form action="adherent.php" method="POST">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="action" value="update">';
 print '<input type="hidden" name="constname" value="ADHERENT_DEFAULT_SENDINFOBYMAIL">';
-print '<tr '.$bc[$var].'><td>'.$langs->trans("MemberSendInformationByMailByDefault").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("MemberSendInformationByMailByDefault").'</td><td>';
 print $form->selectyesno('constvalue',(! empty($conf->global->ADHERENT_DEFAULT_SENDINFOBYMAIL)?$conf->global->ADHERENT_DEFAULT_SENDINFOBYMAIL:0),1);
 print '</td><td align="center" width="80">';
 print '<input type="submit" class="button" value="'.$langs->trans("Update").'" name="Button">';
@@ -167,12 +163,11 @@ print "</td></tr>\n";
 print '</form>';
 
 // Insert subscription into bank account
-$var=!$var;
 print '<form action="adherent.php" method="POST">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="action" value="update">';
 print '<input type="hidden" name="constname" value="ADHERENT_BANK_USE">';
-print '<tr '.$bc[$var].'><td>'.$langs->trans("MoreActionsOnSubscription").'</td>';
+print '<tr class="oddeven"><td>'.$langs->trans("MoreActionsOnSubscription").'</td>';
 $arraychoices=array('0'=>$langs->trans("None"));
 if (! empty($conf->banque->enabled)) $arraychoices['bankdirect']=$langs->trans("MoreActionBankDirect");
 if (! empty($conf->banque->enabled) && ! empty($conf->societe->enabled) && ! empty($conf->facture->enabled)) $arraychoices['invoiceonly']=$langs->trans("MoreActionInvoiceOnly");
@@ -188,12 +183,11 @@ print '</form>';
 // Use vat for invoice creation
 if ($conf->facture->enabled)
 {
-	$var=!$var;
 	print '<form action="adherent.php" method="POST">';
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	print '<input type="hidden" name="action" value="update">';
 	print '<input type="hidden" name="constname" value="ADHERENT_VAT_FOR_SUBSCRIPTIONS">';
-	print '<tr '.$bc[$var].'><td>'.$langs->trans("VATToUseForSubscriptions").'</td>';
+	print '<tr class="oddeven"><td>'.$langs->trans("VATToUseForSubscriptions").'</td>';
 	if (! empty($conf->banque->enabled))
 	{
 		print '<td>';
@@ -213,12 +207,11 @@ if ($conf->facture->enabled)
 
 	if (! empty($conf->product->enabled) || ! empty($conf->service->enabled))
 	{
-		$var=!$var;
 		print '<form action="adherent.php" method="POST">';
 		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 		print '<input type="hidden" name="action" value="update">';
 		print '<input type="hidden" name="constname" value="ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS">';
-		print '<tr '.$bc[$var].'><td>'.$langs->trans("ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS").'</td>';
+		print '<tr class="oddeven"><td>'.$langs->trans("ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS").'</td>';
 		print '<td>';
 		$form->select_produits($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS, 'constvalue_ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS');
 		print '</td><td align="center" width="80">';
diff --git a/htdocs/adherents/admin/public.php b/htdocs/adherents/admin/public.php
index 47ad7a00a97..5c16a34793c 100644
--- a/htdocs/adherents/admin/public.php
+++ b/htdocs/adherents/admin/public.php
@@ -145,22 +145,19 @@ print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Parameter").'</td>';
 print '<td align="right">'.$langs->trans("Value").'</td>';
 print "</tr>\n";
-$var=true;
 
 // Allow public form
-$var=! $var;
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print '<tr '.$bc[$var].'><td>';
+print '<tr class="oddeven"><td>';
 print $langs->trans("EnablePublicSubscriptionForm");
 print '</td><td align="right">';
 print $form->selectyesno("MEMBER_ENABLE_PUBLIC",(! empty($conf->global->MEMBER_ENABLE_PUBLIC)?$conf->global->MEMBER_ENABLE_PUBLIC:0),1);
 print "</td></tr>\n";
 
 // Force Type
-$var=! $var;
 $adht = new AdherentType($db);
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print '<tr '.$bc[$var].' class="drag"><td>';
+print '<tr class="oddeven drag"><td>';
 print $langs->trans("ForceMemberType");
 print '</td><td width="60" align="center">';
 $listofval = array(-1 => $langs->trans("Undefined"));
@@ -170,18 +167,16 @@ print $form->selectarray("MEMBER_NEWFORM_FORCETYPE", $listofval, $forcetype, cou
 print "</td></tr>\n";
 
 // Amount
-$var=! $var;
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print '<tr '.$bc[$var].' id="tramount"><td>';
+print '<tr class="oddeven" id="tramount"><td>';
 print $langs->trans("DefaultAmount");
 print '</td><td align="right">';
 print '<input type="text" id="MEMBER_NEWFORM_AMOUNT" name="MEMBER_NEWFORM_AMOUNT" size="5" value="'.(! empty($conf->global->MEMBER_NEWFORM_AMOUNT)?$conf->global->MEMBER_NEWFORM_AMOUNT:'').'">';
 print "</td></tr>\n";
 
 // Can edit
-$var=! $var;
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print '<tr '.$bc[$var].' id="tredit"><td>';
+print '<tr class="oddeven" id="tredit"><td>';
 print $langs->trans("CanEditAmount");
 print '</td><td align="right">';
 print $form->selectyesno("MEMBER_NEWFORM_EDITAMOUNT",(! empty($conf->global->MEMBER_NEWFORM_EDITAMOUNT)?$conf->global->MEMBER_NEWFORM_EDITAMOUNT:0),1);
@@ -190,8 +185,7 @@ print "</td></tr>\n";
 if (! empty($conf->paybox->enabled) || ! empty($conf->paypal->enabled))
 {
 	// Jump to an online payment page
-	$var=! $var;
-	print '<tr '.$bc[$var].' id="trpayment"><td>';
+	print '<tr class="oddeven" id="trpayment"><td>';
 	print $langs->trans("MEMBER_NEWFORM_PAYONLINE");
 	print '</td><td align="right">';
 	$listofval=array();
@@ -204,8 +198,7 @@ if (! empty($conf->paybox->enabled) || ! empty($conf->paypal->enabled))
 if (! empty($conf->paybox->enabled) || ! empty($conf->paypal->enabled))
 {
     // Jump to an online payment page
-    $var=! $var;
-    print '<tr '.$bc[$var].' id="tremail"><td>';
+    print '<tr class="oddeven" id="tremail"><td>';
     print $langs->trans("MEMBER_PAYONLINE_SENDEMAIL");
     print '</td><td align="right">';
     print '<input type="text" id="MEMBER_PAYONLINE_SENDEMAIL" name="MEMBER_PAYONLINE_SENDEMAIL" size="24" value="'.(! empty($conf->global->MEMBER_PAYONLINE_SENDEMAIL)?$conf->global->MEMBER_PAYONLINE_SENDEMAIL:'').'">';
diff --git a/htdocs/adherents/index.php b/htdocs/adherents/index.php
index 9c1b0bb01e1..76368fc5673 100644
--- a/htdocs/adherents/index.php
+++ b/htdocs/adherents/index.php
@@ -246,8 +246,7 @@ $var=true;
 krsort($Total);
 foreach ($Total as $key=>$value)
 {
-    $var=!$var;
-    print "<tr ".$bc[$var].">";
+    print '<tr class="oddeven">';
     print "<td><a href=\"./subscription/list.php?date_select=$key\">$key</a></td>";
     print "<td align=\"right\">".$Number[$key]."</td>";
     print "<td align=\"right\">".price($value)."</td>";
@@ -267,9 +266,6 @@ print "</table><br>\n";
 
 print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
-
-$var=true;
-
 /*
  * Last modified members
  */
@@ -295,12 +291,10 @@ if ($resql)
 	if ($num)
 	{
 		$i = 0;
-		$var = True;
 		while ($i < $num)
 		{
-			$var=!$var;
 			$obj = $db->fetch_object($resql);
-			print "<tr ".$bc[$var].">";
+			print '<tr class="oddeven">';
 			$staticmember->id=$obj->rowid;
 			$staticmember->lastname=$obj->lastname;
 			$staticmember->firstname=$obj->firstname;
@@ -358,12 +352,10 @@ if ($resql)
 	if ($num)
 	{
 		$i = 0;
-		$var = True;
 		while ($i < $num)
 		{
-			$var=!$var;
 			$obj = $db->fetch_object($resql);
-			print "<tr ".$bc[$var].">";
+			print '<tr class="oddeven">';
 			$subscriptionstatic->id=$obj->cid;
 			$subscriptionstatic->ref=$obj->cid;
 			$staticmember->id=$obj->rowid;
@@ -407,8 +399,7 @@ print "</tr>\n";
 
 foreach ($AdherentType as $key => $adhtype)
 {
-	$var=!$var;
-	print "<tr ".$bc[$var].">";
+	print '<tr class="oddeven">';
 	print '<td>'.$adhtype->getNomUrl(1, dol_size(32)).'</td>';
 	print '<td align="right">'.(isset($MemberToValidate[$key]) && $MemberToValidate[$key] > 0?$MemberToValidate[$key]:'').' '.$staticmember->LibStatut(-1,$adhtype->subscription,0,3).'</td>';
 	print '<td align="right">'.(isset($MembersValidated[$key]) && ($MembersValidated[$key]-(isset($MemberUpToDate[$key])?$MemberUpToDate[$key]:0) > 0) ? $MembersValidated[$key]-(isset($MemberUpToDate[$key])?$MemberUpToDate[$key]:0):'').' '.$staticmember->LibStatut(1,$adhtype->subscription,0,3).'</td>';
diff --git a/htdocs/adherents/stats/byproperties.php b/htdocs/adherents/stats/byproperties.php
index c717d20be84..6f896e186bb 100644
--- a/htdocs/adherents/stats/byproperties.php
+++ b/htdocs/adherents/stats/byproperties.php
@@ -127,12 +127,10 @@ if (! $foundphy) $data[]=array('label'=>'phy','nb'=>'0','lastdate'=>'');
 if (! $foundmor) $data[]=array('label'=>'mor','nb'=>'0','lastdate'=>'');
 
 $oldyear=0;
-$var=true;
 foreach ($data as $val)
 {
 	$year = $val['year'];
-	$var=!$var;
-	print '<tr '.$bc[$var].'>';
+	print '<tr class="oddeven">';
 	print '<td>'.$memberstatic->getmorphylib($val['label']).'</td>';
 	print '<td align="right">'.$val['nb'].'</td>';
 	print '<td align="center">'.dol_print_date($val['lastdate'],'dayhour').'</td>';
diff --git a/htdocs/adherents/stats/geo.php b/htdocs/adherents/stats/geo.php
index ae128d940e8..8e3d0862490 100644
--- a/htdocs/adherents/stats/geo.php
+++ b/htdocs/adherents/stats/geo.php
@@ -291,12 +291,10 @@ if ($mode)
     print '</tr>';
 
     $oldyear=0;
-    $var=true;
     foreach ($data as $val)
     {
         $year = $val['year'];
-        $var=!$var;
-        print '<tr '.$bc[$var].'>';
+        print '<tr class="oddeven">';
         print '<td>'.$val['label'].'</td>';
         if ($label2) print '<td align="center">'.$val['label2'].'</td>';
         print '<td align="right">'.$val['nb'].'</td>';
diff --git a/htdocs/adherents/stats/index.php b/htdocs/adherents/stats/index.php
index aec8cd588f6..4126fc6e68c 100644
--- a/htdocs/adherents/stats/index.php
+++ b/htdocs/adherents/stats/index.php
@@ -176,15 +176,13 @@ print '<td align="right">'.$langs->trans("AmountAverage").'</td>';
 print '</tr>';
 
 $oldyear=0;
-$var=true;
 foreach ($data as $val)
 {
     $year = $val['year'];
     while ($oldyear > $year+1)
     {	// If we have empty year
         $oldyear--;
-        $var=!$var;
-        print '<tr '.$bc[$var].' height="24">';
+        print '<tr class="oddeven" height="24">';
         print '<td align="center">';
         print '<a href="month.php?year='.$oldyear.'&amp;mode='.$mode.'">';
         print $oldyear;
@@ -195,8 +193,7 @@ foreach ($data as $val)
         print '<td align="right">0</td>';
         print '</tr>';
     }
-    $var=!$var;
-    print '<tr '.$bc[$var].' height="24">';
+    print '<tr class="oddeven" height="24">';
     print '<td align="center">';
     //print '<a href="month.php?year='.$year.'">';
     print $year;
diff --git a/htdocs/adherents/subscription.php b/htdocs/adherents/subscription.php
index 0c9c8467f1f..dc66e080f48 100644
--- a/htdocs/adherents/subscription.php
+++ b/htdocs/adherents/subscription.php
@@ -821,12 +821,10 @@ if ($rowid > 0)
             }
             print "</tr>\n";
 
-            $var=True;
             while ($i < $num)
             {
                 $objp = $db->fetch_object($result);
-                $var=!$var;
-                print "<tr ".$bc[$var].">";
+                print '<tr class="oddeven">';
                 $subscriptionstatic->ref=$objp->crowid;
                 $subscriptionstatic->id=$objp->crowid;
                 print '<td>'.$subscriptionstatic->getNomUrl(1).'</td>';
diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index 846b0dab7a9..ab6bfcc0704 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -206,12 +206,10 @@ if (! $rowid && $action != 'create' && $action != 'edit')
 		print '<th>&nbsp;</th>';
 		print "</tr>\n";
 
-		$var=True;
 		while ($i < $num)
 		{
 			$objp = $db->fetch_object($result);
-			$var=!$var;
-			print "<tr ".$bc[$var].">";
+			print '<tr class="oddeven">';
 			print '<td><a href="'.$_SERVER["PHP_SELF"].'?rowid='.$objp->rowid.'">'.img_object($langs->trans("ShowType"),'group').' '.$objp->rowid.'</a></td>';
 			print '<td>'.dol_escape_htmltag($objp->libelle).'</td>';
 			print '<td align="center">'.yn($objp->subscription).'</td>';
@@ -518,7 +516,6 @@ if ($rowid > 0)
 
 			print "</tr>\n";
 
-		    $var=True;
 		    while ($i < $num && $i < $conf->liste_limit)
 		    {
 		        $objp = $db->fetch_object($resql);
@@ -530,8 +527,7 @@ if ($rowid > 0)
 		        $adh->firstname=$objp->firstname;
 
 		        // Lastname
-		        $var=!$var;
-		        print '<tr '.$bc[$var].'>';
+		        print '<tr class="oddeven">';
 		        if ($objp->societe != '')
 		        {
 		            print '<td><a href="card.php?rowid='.$objp->rowid.'">'.img_object($langs->trans("ShowMember"),"user").' '.$adh->getFullName($langs,0,-1,20).' / '.dol_trunc($objp->societe,12).'</a></td>'."\n";

From 396ea5489419f61b936510c49b010e6abb95974e Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Wed, 12 Apr 2017 11:09:49 +0200
Subject: [PATCH 052/505] Subprice was null in supplier proposal and line was
 not transfered to supplier order

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

diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index d14591b6b9f..8cbc3882fc4 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -2781,7 +2781,7 @@ class SupplierProposalLine  extends CommonObject
         $sql.= " ".price2num($this->localtax2_tx).",";
 		$sql.= " '".$this->localtax1_type."',";
 		$sql.= " '".$this->localtax2_type."',";
-        $sql.= " ".($this->subprice?price2num($this->subprice):"null").",";
+        $sql.= " ".price2num($this->subprice).",";
         $sql.= " ".price2num($this->remise_percent).",";
         $sql.= " ".(isset($this->info_bits)?"'".$this->info_bits."'":"null").",";
         $sql.= " ".price2num($this->total_ht).",";

From edaa3ae67213b9bb41114756ee54c4a8daebb48c Mon Sep 17 00:00:00 2001
From: philippe grand <philippe.grand@atoo-net.com>
Date: Wed, 12 Apr 2017 17:44:01 +0200
Subject: [PATCH 053/505] Update code using new css class

---
 htdocs/admin/menus/other.php            |   4 +-
 htdocs/admin/system/browser.php         |  28 +++----
 htdocs/admin/system/constall.php        |   7 +-
 htdocs/admin/system/database-tables.php |  12 +--
 htdocs/admin/system/database.php        |   4 +-
 htdocs/admin/system/dbtable.php         |   4 +-
 htdocs/admin/system/dolibarr.php        | 101 ++++++++----------------
 7 files changed, 49 insertions(+), 111 deletions(-)

diff --git a/htdocs/admin/menus/other.php b/htdocs/admin/menus/other.php
index 0a3cb6b99bc..7789c3fb21c 100644
--- a/htdocs/admin/menus/other.php
+++ b/htdocs/admin/menus/other.php
@@ -81,7 +81,6 @@ dol_fiche_head($head, 'misc', $langs->trans("Menus"), -1);
 
 
 // Other Options
-$var=true;
 
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
@@ -90,8 +89,7 @@ print '<td align="center" width="80">'.$langs->trans("Status").'</td>';
 print '</tr>';
 
 // Hide unauthorized menu
-$var=!$var;
-print "<tr ".$bc[$var].">";
+print '<tr class="oddeven">';
 print '<td colspan="3">'.$langs->trans("HideUnauthorizedMenu").'</td>';
 print '<td align="center">';
 if (empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED))
diff --git a/htdocs/admin/system/browser.php b/htdocs/admin/system/browser.php
index b2b5499d298..32d342df121 100644
--- a/htdocs/admin/system/browser.php
+++ b/htdocs/admin/system/browser.php
@@ -47,28 +47,18 @@ print load_fiche_titre($langs->trans("InfoBrowser"),'','title_setup');
 $tmp=getBrowserInfo($_SERVER["HTTP_USER_AGENT"]);
 
 // Browser
-$var=true;
 print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td colspan="2">'.$langs->trans("Value").'</td></tr>'."\n";
-$var=!$var;
-print '<tr '.$bc[$var].'><td width="300">'.$langs->trans("UserAgent").'</td><td colspan="2">'.$_SERVER['HTTP_USER_AGENT'].'</td></tr>'."\n";
-$var=!$var;
-print '<tr '.$bc[$var].'><td width="300">'.$langs->trans("BrowserName").'</td><td colspan="2">'.$tmp['browsername'].'</td></tr>'."\n";
-$var=!$var;
-print '<tr '.$bc[$var].'><td width="300">'.$langs->trans("BrowserOS").'</td><td colspan="2">'.$tmp['browseros'].'</td></tr>'."\n";
-$var=!$var;
-print '<tr '.$bc[$var].'><td width="300">'.$langs->trans("Version").'</td><td colspan="2">'.$tmp['browserversion'].'</td></tr>'."\n";
-$var=!$var;
-print '<tr '.$bc[$var].'><td width="300">'.$langs->trans("Layout").' (phone/tablet/classic)</td><td colspan="2">'.$tmp['layout'].'</td></tr>'."\n";
-$var=!$var;
-print '<tr '.$bc[$var].'><td width="300">'.$langs->trans("IPAddress").'</td><td colspan="2">'.$_SERVER['REMOTE_ADDR'].'</td></tr>'."\n";
-$var=!$var;
-print '<tr '.$bc[$var].'><td width="300">'.$langs->trans("SessionName").'</td><td colspan="2">'.session_name().'</td></tr>'."\n";
-$var=!$var;
-print '<tr '.$bc[$var].'><td width="300">'.$langs->trans("SessionId").'</td><td colspan="2">'.session_id().'</td></tr>'."\n";
-$var=!$var;
-print '<tr '.$bc[$var].'><td width="300">'.$langs->trans("Screen").'</td><td colspan="2">';
+print '<tr class="oddeven"><td width="300">'.$langs->trans("UserAgent").'</td><td colspan="2">'.$_SERVER['HTTP_USER_AGENT'].'</td></tr>'."\n";
+print '<tr class="oddeven"><td width="300">'.$langs->trans("BrowserName").'</td><td colspan="2">'.$tmp['browsername'].'</td></tr>'."\n";
+print '<tr class="oddeven"><td width="300">'.$langs->trans("BrowserOS").'</td><td colspan="2">'.$tmp['browseros'].'</td></tr>'."\n";
+print '<tr class="oddeven"><td width="300">'.$langs->trans("Version").'</td><td colspan="2">'.$tmp['browserversion'].'</td></tr>'."\n";
+print '<tr class="oddeven"><td width="300">'.$langs->trans("Layout").' (phone/tablet/classic)</td><td colspan="2">'.$tmp['layout'].'</td></tr>'."\n";
+print '<tr class="oddeven"><td width="300">'.$langs->trans("IPAddress").'</td><td colspan="2">'.$_SERVER['REMOTE_ADDR'].'</td></tr>'."\n";
+print '<tr class="oddeven"><td width="300">'.$langs->trans("SessionName").'</td><td colspan="2">'.session_name().'</td></tr>'."\n";
+print '<tr class="oddeven"><td width="300">'.$langs->trans("SessionId").'</td><td colspan="2">'.session_id().'</td></tr>'."\n";
+print '<tr class="oddeven"><td width="300">'.$langs->trans("Screen").'</td><td colspan="2">';
 print $_SESSION['dol_screenwidth'].' x '.$_SESSION['dol_screenheight'];
 print '</td></tr>'."\n";
 print '</table>';
diff --git a/htdocs/admin/system/constall.php b/htdocs/admin/system/constall.php
index 0fb3a6c9a7b..c7c7542ccaa 100644
--- a/htdocs/admin/system/constall.php
+++ b/htdocs/admin/system/constall.php
@@ -170,8 +170,7 @@ foreach($configfileparameters as $key)
             continue;
         }
 
-		$var=!$var;
-		print "<tr ".$bc[$var].">";
+		print '<tr class="oddeven">';
 		if ($newkey == 'separator')
 		{
 			print '<td colspan="3">&nbsp;</td>';
@@ -233,14 +232,12 @@ if ($resql)
 {
 	$num = $db->num_rows($resql);
 	$i = 0;
-	$var=True;
 
 	while ($i < $num)
     {
     	$obj = $db->fetch_object($resql);
-    	$var=!$var;
 
-    	print '<tr '.$bc[$var].'>';
+    	print '<tr class="oddeven">';
     	print '<td>'.$obj->name.'</td>'."\n";
     	print '<td>'.$obj->value.'</td>'."\n";
     	if (empty($conf->multicompany->enabled) || !$user->entity) print '<td>'.$obj->entity.'</td>'."\n";	// If superadmin or multicompany disabled
diff --git a/htdocs/admin/system/database-tables.php b/htdocs/admin/system/database-tables.php
index 6e528c73094..b625b69d8ff 100644
--- a/htdocs/admin/system/database-tables.php
+++ b/htdocs/admin/system/database-tables.php
@@ -103,13 +103,11 @@ else
 		if ($resql)
 		{
 			$num = $db->num_rows($resql);
-			$var=True;
 			$i=0;
 			while ($i < $num)
 			{
 				$obj = $db->fetch_object($resql);
-				$var=!$var;
-				print "<tr ".$bc[$var].">";
+				print '<tr class="oddeven">';
 
 				print '<td><a href="dbtable.php?table='.$obj->Name.'">'.$obj->Name.'</a></td>';
 				print '<td>'.$obj->Engine.'</td>';
@@ -158,13 +156,10 @@ else
 		if ($resql)
 		{
 			$num = $db->num_rows($resql);
-			$var=True;
 			$i=0;
 			while ($i < $num)
 			{
-				$row = $db->fetch_row($resql);
-				$var=!$var;
-				print "<tr ".$bc[$var].">";
+				print '<tr class="oddeven">';
 				print '<td>'.$row[0].'</td>';
 				print '<td align="right">'.$row[1].'</td>';
 				print '<td align="right">'.$row[2].'</td>';
@@ -194,7 +189,6 @@ else
 
 		if ($resql)
 		{
-			$var=True;
 			while ($row = $db->fetch_row($resql)) {
 
 				$rescount = $db->query("SELECT COUNT(*) FROM " . $row[0]);
@@ -205,7 +199,7 @@ else
 					$count = '?';
 				}
 
-				print "<tr ".$bc[$var].">";
+				print '<tr class="oddeven">';
 				print '<td>'.$row[0].'</td>';
 				print '<td>'.$count.'</td>';
 				print '</tr>';
diff --git a/htdocs/admin/system/database.php b/htdocs/admin/system/database.php
index c50e6ca9e4c..45ce3c087e6 100644
--- a/htdocs/admin/system/database.php
+++ b/htdocs/admin/system/database.php
@@ -100,11 +100,9 @@ else
 		if ($listname == 'listofvars') $listtouse=$listofvars;
 		if ($listname == 'listofstatus') $listtouse=$listofstatus;
 
-		$var=true;
 		foreach($listtouse as $param => $paramval)
 		{
-			$var=!$var;
-			print '<tr '.$bc[$var].'>';
+			print '<tr class="oddeven">';
 			print '<td>';
 			print $param;
 			print '</td>';
diff --git a/htdocs/admin/system/dbtable.php b/htdocs/admin/system/dbtable.php
index 3fc10bb0f3f..2e7d5b3f8aa 100644
--- a/htdocs/admin/system/dbtable.php
+++ b/htdocs/admin/system/dbtable.php
@@ -106,13 +106,11 @@ else
 		if ($resql)
 		{
 			$num = $db->num_rows($resql);
-			$var=True;
 			$i=0;
 			while ($i < $num)
 			{
 				$row = $db->fetch_row($resql);
-				$var=!$var;
-				print "<tr ".$bc[$var].">";
+				print '<tr class="oddeven">';
 
 				print "<td>$row[0]</td>";
 				print "<td>$row[1]</td>";
diff --git a/htdocs/admin/system/dolibarr.php b/htdocs/admin/system/dolibarr.php
index 6a5384da69a..36260c0a228 100644
--- a/htdocs/admin/system/dolibarr.php
+++ b/htdocs/admin/system/dolibarr.php
@@ -68,12 +68,10 @@ llxHeader('', $title);
 print load_fiche_titre($title,'','title_setup');
 
 // Version
-$var=true;
 print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Version").'</td><td>'.$langs->trans("Value").'</td></tr>'."\n";
-$var=!$var;
-print '<tr '.$bc[$var].'><td>'.$langs->trans("CurrentVersion").' ('.$langs->trans("Programs").')</td><td>'.DOL_VERSION;
+print '<tr class="oddeven"><td>'.$langs->trans("CurrentVersion").' ('.$langs->trans("Programs").')</td><td>'.DOL_VERSION;
 // If current version differs from last upgrade
 if (empty($conf->global->MAIN_VERSION_LAST_UPGRADE))
 {
@@ -123,42 +121,31 @@ if (function_exists('curl_init'))
 }
 
 print '</td></tr>'."\n";
-$var=!$var;
-print '<tr '.$bc[$var].'><td>'.$langs->trans("VersionLastUpgrade").' ('.$langs->trans("Database").')</td><td>'.$conf->global->MAIN_VERSION_LAST_UPGRADE.'</td></tr>'."\n";
-$var=!$var;
-print '<tr '.$bc[$var].'><td>'.$langs->trans("VersionLastInstall").'</td><td>'.$conf->global->MAIN_VERSION_LAST_INSTALL.'</td></tr>'."\n";
+print '<tr class="oddeven"><td>'.$langs->trans("VersionLastUpgrade").' ('.$langs->trans("Database").')</td><td>'.$conf->global->MAIN_VERSION_LAST_UPGRADE.'</td></tr>'."\n";
+print '<tr class="oddeven"><td>'.$langs->trans("VersionLastInstall").'</td><td>'.$conf->global->MAIN_VERSION_LAST_INSTALL.'</td></tr>'."\n";
 print '</table>';
 print '</div>';
 print '<br>';
 
 // Session
-$var=true;
 print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Session").'</td><td colspan="2">'.$langs->trans("Value").'</td></tr>'."\n";
-$var=!$var;
-print '<tr '.$bc[$var].'><td>'.$langs->trans("SessionSavePath").'</td><td colspan="2">'.session_save_path().'</td></tr>'."\n";
-$var=!$var;
-print '<tr '.$bc[$var].'><td>'.$langs->trans("SessionName").'</td><td colspan="2">'.session_name().'</td></tr>'."\n";
-$var=!$var;
-print '<tr '.$bc[$var].'><td>'.$langs->trans("SessionId").'</td><td colspan="2">'.session_id().'</td></tr>'."\n";
-$var=!$var;
-print '<tr '.$bc[$var].'><td>'.$langs->trans("CurrentSessionTimeOut").'</td><td>'.ini_get('session.gc_maxlifetime').' '.$langs->trans("seconds");
+print '<tr class="oddeven"><td>'.$langs->trans("SessionSavePath").'</td><td colspan="2">'.session_save_path().'</td></tr>'."\n";
+print '<tr class="oddeven"><td>'.$langs->trans("SessionName").'</td><td colspan="2">'.session_name().'</td></tr>'."\n";
+print '<tr class="oddeven"><td>'.$langs->trans("SessionId").'</td><td colspan="2">'.session_id().'</td></tr>'."\n";
+print '<tr class="oddeven"><td>'.$langs->trans("CurrentSessionTimeOut").'</td><td>'.ini_get('session.gc_maxlifetime').' '.$langs->trans("seconds");
 print '</td><td align="right">';
 print $form->textwithpicto('',$langs->trans("SessionExplanation",ini_get("session.gc_probability"),ini_get("session.gc_divisor")));
 print "</td></tr>\n";
-$var=!$var;
-print '<tr '.$bc[$var].'><td>'.$langs->trans("CurrentTheme").'</td><td colspan="2">'.$conf->theme.'</td></tr>'."\n";
-$var=!$var;
-print '<tr '.$bc[$var].'><td>'.$langs->trans("CurrentMenuHandler").'</td><td colspan="2">';
+print '<tr class="oddeven"><td>'.$langs->trans("CurrentTheme").'</td><td colspan="2">'.$conf->theme.'</td></tr>'."\n";
+print '<tr class="oddeven"><td>'.$langs->trans("CurrentMenuHandler").'</td><td colspan="2">';
 print $conf->standard_menu;
 print '</td></tr>'."\n";
-$var=!$var;
-print '<tr '.$bc[$var].'><td>'.$langs->trans("Screen").'</td><td colspan="2">';
+print '<tr class="oddeven"><td>'.$langs->trans("Screen").'</td><td colspan="2">';
 print $_SESSION['dol_screenwidth'].' x '.$_SESSION['dol_screenheight'];
 print '</td></tr>'."\n";
-$var=!$var;
-print '<tr '.$bc[$var].'><td>'.$langs->trans("Session").'</td><td colspan="2">';
+print '<tr class="oddeven"><td>'.$langs->trans("Session").'</td><td colspan="2">';
 $i=0;
 foreach($_SESSION as $key => $val)
 {
@@ -177,7 +164,6 @@ if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_S
 {
 	$shmoparray=dol_listshmop();
 
-	$var=true;
     print '<div class="div-table-responsive-no-min">';
 	print '<table class="noborder" width="100%">';
 	print '<tr class="liste_titre">';
@@ -188,8 +174,7 @@ if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_S
 
 	foreach($shmoparray as $key => $val)
 	{
-		$var=!$var;
-		print '<tr '.$bc[$var].'><td>'.$key.'</td>';
+		print '<tr class="oddeven"><td>'.$key.'</td>';
 		print '<td>'.count($val).'</td>';
 		print '<td align="right">'.dol_getshmopaddress($key).'</td>';
 		print '</tr>'."\n";
@@ -202,44 +187,34 @@ if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_S
 
 
 // Localisation
-$var=true;
 print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("LocalisationDolibarrParameters").'</td><td>'.$langs->trans("Value").'</td></tr>'."\n";
-$var=!$var;
-print '<tr '.$bc[$var].'><td>'.$langs->trans("LanguageBrowserParameter","HTTP_ACCEPT_LANGUAGE").'</td><td>'.$_SERVER["HTTP_ACCEPT_LANGUAGE"].'</td></tr>'."\n";
-$var=!$var;
-print '<tr '.$bc[$var].'><td>'.$langs->trans("CurrentUserLanguage").'</td><td>'.$langs->getDefaultLang().'</td></tr>'."\n";
+print '<tr class="oddeven"><td>'.$langs->trans("LanguageBrowserParameter","HTTP_ACCEPT_LANGUAGE").'</td><td>'.$_SERVER["HTTP_ACCEPT_LANGUAGE"].'</td></tr>'."\n";
+print '<tr class="oddeven"><td>'.$langs->trans("CurrentUserLanguage").'</td><td>'.$langs->getDefaultLang().'</td></tr>'."\n";
 // Thousands
-$var=!$var;
 $thousand=$langs->transnoentitiesnoconv("SeparatorThousand");
 if ($thousand == 'SeparatorThousand') $thousand=' ';	// ' ' does not work on trans method
 if ($thousand == 'None') $thousand='';
-print '<tr '.$bc[$var].'><td>'.$langs->trans("CurrentValueSeparatorThousand").'</td><td>'.($thousand==' '?$langs->transnoentitiesnoconv("Space"):$thousand).'</td></tr>'."\n";
+print '<tr class="oddeven"><td>'.$langs->trans("CurrentValueSeparatorThousand").'</td><td>'.($thousand==' '?$langs->transnoentitiesnoconv("Space"):$thousand).'</td></tr>'."\n";
 // Decimals
-$var=!$var;
 $dec=$langs->transnoentitiesnoconv("SeparatorDecimal");
-print '<tr '.$bc[$var].'><td>'.$langs->trans("CurrentValueSeparatorDecimal").'</td><td>'.$dec.'</td></tr>'."\n";
+print '<tr class="oddeven"><td>'.$langs->trans("CurrentValueSeparatorDecimal").'</td><td>'.$dec.'</td></tr>'."\n";
 // Show results of functions to see if everything works
-$var=!$var;
-print '<tr '.$bc[$var].'><td>&nbsp; => price2num(1233.56+1)</td><td>'.price2num(1233.56+1,'2').'</td></tr>'."\n";
-$var=!$var;
-print "<tr ".$bc[$var].'><td>&nbsp; => price2num('."'1".$thousand."234".$dec."56')</td><td>".price2num("1".$thousand."234".$dec."56",'2')."</td></tr>\n";
+print '<tr class="oddeven"><td>&nbsp; => price2num(1233.56+1)</td><td>'.price2num(1233.56+1,'2').'</td></tr>'."\n";
+print '<tr class="oddeven"><td>&nbsp; => price2num('."'1".$thousand."234".$dec."56')</td><td>".price2num("1".$thousand."234".$dec."56",'2')."</td></tr>\n";
 if (($thousand != ',' && $thousand != '.') || ($thousand != ' '))
 {
-	$var=!$var;
-	print "<tr ".$bc[$var].'><td>&nbsp; => price2num('."'1 234.56')</td><td>".price2num("1 234.56",'2')."</td>";
+	print '<tr class="oddeven"><td>&nbsp; => price2num('."'1 234.56')</td><td>".price2num("1 234.56",'2')."</td>";
 	print "</tr>\n";
 }
-$var=!$var;
-print '<tr '.$bc[$var].'><td>&nbsp; => price(1234.56)</td><td>'.price(1234.56).'</td></tr>'."\n";
+print '<tr class="oddeven"><td>&nbsp; => price(1234.56)</td><td>'.price(1234.56).'</td></tr>'."\n";
 // Timezone
 $txt =$langs->trans("OSTZ").' (variable system TZ): '.(! empty($_ENV["TZ"])?$_ENV["TZ"]:$langs->trans("NotDefined")).'<br>'."\n";
 $txt.=$langs->trans("PHPTZ").' (php.ini date.timezone): '.(ini_get("date.timezone")?ini_get("date.timezone"):$langs->trans("NotDefined")).''."<br>\n"; // date.timezone must be in valued defined in http://fr3.php.net/manual/en/timezones.europe.php
 $txt.=$langs->trans("Dolibarr constant MAIN_SERVER_TZ").': '.(empty($conf->global->MAIN_SERVER_TZ)?$langs->trans("NotDefined"):$conf->global->MAIN_SERVER_TZ);
 //$txt.=$langs->trans("YouCanEditPHPTZ"); // deprecated
-$var=!$var;
-print '<tr '.$bc[$var].'><td>'.$langs->trans("CurrentTimeZone").'</td><td>';	// Timezone server PHP
+print '<tr class="oddeven"><td>'.$langs->trans("CurrentTimeZone").'</td><td>';	// Timezone server PHP
 $a=getServerTimeZoneInt('now');
 $b=getServerTimeZoneInt('winter');
 $c=getServerTimeZoneInt('summer');
@@ -251,19 +226,14 @@ $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(''));
 print '</td></tr>'."\n";	// value defined in http://fr3.php.net/manual/en/timezones.europe.php
-$var=!$var;
-print '<tr '.$bc[$var].'><td>&nbsp; => '.$langs->trans("CurrentHour").'</td><td>'.dol_print_date(dol_now(),'dayhour','tzserver').'</td></tr>'."\n";
-$var=!$var;
-print '<tr '.$bc[$var].'><td>&nbsp; => dol_print_date(0,"dayhourtext")</td><td>'.dol_print_date(0,"dayhourtext").'</td>';
-$var=!$var;
-print '<tr '.$bc[$var].'><td>&nbsp; => dol_get_first_day(1970,1,false)</td><td>'.dol_get_first_day(1970,1,false).' &nbsp; &nbsp; (=> dol_print_date() or idate() of this value = '.dol_print_date(dol_get_first_day(1970,1,false),'dayhour').')</td>';
-$var=!$var;
-print '<tr '.$bc[$var].'><td>&nbsp; => dol_get_first_day(1970,1,true)</td><td>'.dol_get_first_day(1970,1,true).' &nbsp; &nbsp; (=> dol_print_date() or idate() of this value = '.dol_print_date(dol_get_first_day(1970,1,true),'dayhour').')</td>';
+print '<tr class="oddeven"><td>&nbsp; => '.$langs->trans("CurrentHour").'</td><td>'.dol_print_date(dol_now(),'dayhour','tzserver').'</td></tr>'."\n";
+print '<tr class="oddeven"><td>&nbsp; => dol_print_date(0,"dayhourtext")</td><td>'.dol_print_date(0,"dayhourtext").'</td>';
+print '<tr class="oddeven"><td>&nbsp; => dol_get_first_day(1970,1,false)</td><td>'.dol_get_first_day(1970,1,false).' &nbsp; &nbsp; (=> dol_print_date() or idate() of this value = '.dol_print_date(dol_get_first_day(1970,1,false),'dayhour').')</td>';
+print '<tr class="oddeven"><td>&nbsp; => dol_get_first_day(1970,1,true)</td><td>'.dol_get_first_day(1970,1,true).' &nbsp; &nbsp; (=> dol_print_date() or idate() of this value = '.dol_print_date(dol_get_first_day(1970,1,true),'dayhour').')</td>';
 // Database timezone
 if ($conf->db->type == 'mysql' || $conf->db->type == 'mysqli')
 {
-	$var=!$var;
-	print '<tr '.$bc[$var].'><td>'.$langs->trans("MySQLTimeZone").' (database)</td><td>';	// Timezone server base
+	print '<tr class="oddeven"><td>'.$langs->trans("MySQLTimeZone").' (database)</td><td>';	// Timezone server base
 	$sql="SHOW VARIABLES where variable_name = 'system_time_zone'";
 	$resql = $db->query($sql);
 	if ($resql)
@@ -274,9 +244,8 @@ if ($conf->db->type == 'mysql' || $conf->db->type == 'mysqli')
 	print '</td></tr>'."\n";
 }
 // Client
-$var=!$var;
 $tz=(int) $_SESSION['dol_tz'] + (int) $_SESSION['dol_dst'];
-print '<tr '.$bc[$var].'><td>'.$langs->trans("ClientTZ").'</td><td>'.($tz?($tz>=0?'+':'').$tz:'').' ('.($tz>=0?'+':'').($tz*60*60).')';
+print '<tr class="oddeven"><td>'.$langs->trans("ClientTZ").'</td><td>'.($tz?($tz>=0?'+':'').$tz:'').' ('.($tz>=0?'+':'').($tz*60*60).')';
 print ' &nbsp; &nbsp; &nbsp; '.$_SESSION['dol_tz_string'];
 print ' &nbsp; &nbsp; &nbsp; '.$langs->trans("DaylingSavingTime").': ';
 if ($_SESSION['dol_dst']>0) print yn(1);
@@ -284,19 +253,16 @@ else print yn(0);
 if (! empty($_SESSION['dol_dst_first'])) print ' &nbsp; &nbsp; ('.dol_print_date(dol_stringtotime($_SESSION['dol_dst_first']),'dayhour','gmt').' - '.dol_print_date(dol_stringtotime($_SESSION['dol_dst_second']),'dayhour','gmt').')';
 print '</td></tr>'."\n";
 print '</td></tr>'."\n";
-$var=!$var;
-print '<tr '.$bc[$var].'><td>&nbsp; => '.$langs->trans("ClientHour").'</td><td>'.dol_print_date(dol_now(),'dayhour','tzuser').'</td></tr>'."\n";
+print '<tr class="oddeven"><td>&nbsp; => '.$langs->trans("ClientHour").'</td><td>'.dol_print_date(dol_now(),'dayhour','tzuser').'</td></tr>'."\n";
 
-$var=!$var;
 $filesystemencoding=ini_get("unicode.filesystem_encoding");	// Disponible avec PHP 6.0
-print '<tr '.$bc[$var].'><td>'.$langs->trans("File encoding").' (php.ini unicode.filesystem_encoding)</td><td>'.$filesystemencoding.'</td></tr>'."\n";	// date.timezone must be in valued defined in http://fr3.php.net/manual/en/timezones.europe.php
+print '<tr class="oddeven"><td>'.$langs->trans("File encoding").' (php.ini unicode.filesystem_encoding)</td><td>'.$filesystemencoding.'</td></tr>'."\n";	// date.timezone must be in valued defined in http://fr3.php.net/manual/en/timezones.europe.php
 
-$var=!$var;
 $tmp=ini_get("unicode.filesystem_encoding");						// Disponible avec PHP 6.0
 if (empty($tmp) && ! empty($_SERVER["WINDIR"])) $tmp='iso-8859-1';	// By default for windows
 if (empty($tmp)) $tmp='utf-8';										// By default for other
 if (! empty($conf->global->MAIN_FILESYSTEM_ENCODING)) $tmp=$conf->global->MAIN_FILESYSTEM_ENCODING;
-print '<tr '.$bc[$var].'><td>&nbsp; => '.$langs->trans("File encoding").'</td><td>'.$tmp.'</td></tr>'."\n";	// date.timezone must be in valued defined in http://fr3.php.net/manual/en/timezones.europe.php
+print '<tr class="oddeven"><td>&nbsp; => '.$langs->trans("File encoding").'</td><td>'.$tmp.'</td></tr>'."\n";	// date.timezone must be in valued defined in http://fr3.php.net/manual/en/timezones.europe.php
 
 print '</table>';
 print '</div>';
@@ -384,8 +350,7 @@ foreach($configfileparameters as $key => $value)
 		}
 		if (strpos($newkey, 'separator') !== false && $lastkeyshown == 'separator') continue;
 
-		$var=!$var;
-		print "<tr ".$bc[$var].">";
+		print '<tr class="oddeven">';
 		if (strpos($newkey, 'separator') !== false)
 		{
 			print '<td colspan="3">&nbsp;</td>';
@@ -463,14 +428,12 @@ if ($resql)
 {
 	$num = $db->num_rows($resql);
 	$i = 0;
-	$var=True;
 
 	while ($i < $num)
 	{
 		$obj = $db->fetch_object($resql);
-		$var=!$var;
 
-		print '<tr '.$bc[$var].'>';
+		print '<tr class="oddeven">';
 		print '<td class="tdoverflow">'.$obj->name.'</td>'."\n";
 		print '<td class="tdoverflow">'.$obj->value.'</td>'."\n";
 		if (empty($conf->multicompany->enabled) || !$user->entity) print '<td align="center" width="80px">'.$obj->entity.'</td>'."\n";	// If superadmin or multicompany disabled

From 1d546462dd31a558bd6f767eef9f48f48eab6267 Mon Sep 17 00:00:00 2001
From: philippe grand <philippe.grand@atoo-net.com>
Date: Thu, 13 Apr 2017 15:59:51 +0200
Subject: [PATCH 054/505] Update code using new css class

---
 htdocs/admin/system/filecheck.php | 34 ++++++++++---------------------
 htdocs/admin/system/modules.php   |  3 +--
 htdocs/admin/system/phpinfo.php   |  9 +++-----
 3 files changed, 15 insertions(+), 31 deletions(-)

diff --git a/htdocs/admin/system/filecheck.php b/htdocs/admin/system/filecheck.php
index 62d0999170f..4d32e10b174 100644
--- a/htdocs/admin/system/filecheck.php
+++ b/htdocs/admin/system/filecheck.php
@@ -46,15 +46,11 @@ print load_fiche_titre($langs->trans("FileCheckDolibarr"),'','title_setup');
 print $langs->trans("FileCheckDesc").'<br><br>';
 
 // Version
-$var = true;
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre"><td>'.$langs->trans("Version").'</td><td>'.$langs->trans("Value").'</td></tr>'."\n";
-$var = ! $var;
-print '<tr '.$bc[$var].'><td width="300">'.$langs->trans("VersionLastInstall").'</td><td>'.$conf->global->MAIN_VERSION_LAST_INSTALL.'</td></tr>'."\n";
-$var = ! $var;
-print '<tr '.$bc[$var].'><td width="300">'.$langs->trans("VersionLastUpgrade").'</td><td>'.$conf->global->MAIN_VERSION_LAST_UPGRADE.'</td></tr>'."\n";
-$var = ! $var;
-print '<tr '.$bc[$var].'><td width="300">'.$langs->trans("VersionProgram").'</td><td>'.DOL_VERSION;
+print '<tr class="oddeven"><td width="300">'.$langs->trans("VersionLastInstall").'</td><td>'.$conf->global->MAIN_VERSION_LAST_INSTALL.'</td></tr>'."\n";
+print '<tr class="oddeven"><td width="300">'.$langs->trans("VersionLastUpgrade").'</td><td>'.$conf->global->MAIN_VERSION_LAST_UPGRADE.'</td></tr>'."\n";
+print '<tr class="oddeven"><td width="300">'.$langs->trans("VersionProgram").'</td><td>'.DOL_VERSION;
 // If current version differs from last upgrade
 if (empty($conf->global->MAIN_VERSION_LAST_UPGRADE)) {
     // Compare version with last install database version (upgrades never occured)
@@ -172,7 +168,6 @@ if ($xml)
         $out.='<td align="center">' . $langs->trans("ExpectedValue") . '</td>';
         $out.='<td align="center">' . $langs->trans("Value") . '</td>';
         $out.='</tr>'."\n";
-        $var = true;
 
         $i = 0;
         foreach ($xml->dolibarr_constants[0]->constant as $constant)    // $constant is a simpleXMLElement
@@ -188,8 +183,7 @@ if ($xml)
             $checksumconcat[]=$valueforchecksum;
             
             $i++;
-            $var = !$var;
-            $out.='<tr ' . $bc[$var] . '>';
+            $out.='<tr class="oddeven">';
             $out.='<td>'.$i.'</td>' . "\n";
             $out.='<td>'.$constname.'</td>' . "\n";
             $out.='<td align="center">'.$constvalue.'</td>' . "\n";
@@ -199,7 +193,7 @@ if ($xml)
 
         if ($i==0)
         {
-            $out.='<tr ' . $bc[false] . '><td colspan="4" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+            $out.='<tr class="oddeven"><td colspan="4" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
         }
         $out.='</table>';
         
@@ -239,7 +233,6 @@ if ($xml)
         $out.='<td>' . $langs->trans("Filename") . '</td>';
         $out.='<td align="center">' . $langs->trans("ExpectedChecksum") . '</td>';
         $out.='</tr>'."\n";
-        $var = true;
         $tmpfilelist = dol_sort_array($file_list['missing'], 'filename');
         if (is_array($tmpfilelist) && count($tmpfilelist))
         {
@@ -247,8 +240,7 @@ if ($xml)
 	        foreach ($tmpfilelist as $file)
 	        {
 	            $i++;
-	            $var = !$var;
-	            $out.='<tr ' . $bc[$var] . '>';
+	            $out.='<tr class="oddeven">';
 	            $out.='<td>'.$i.'</td>' . "\n";
 	            $out.='<td>'.$file['filename'].'</td>' . "\n";
 	            $out.='<td align="center">'.$file['expectedmd5'].'</td>' . "\n";
@@ -257,7 +249,7 @@ if ($xml)
         }
         else 
         {
-            $out.='<tr ' . $bc[false] . '><td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+            $out.='<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
         }            
         $out.='</table>';
 
@@ -276,7 +268,6 @@ if ($xml)
         $out.='<td align="right">' . $langs->trans("Size") . '</td>';
         $out.='<td align="right">' . $langs->trans("DateModification") . '</td>';
         $out.='</tr>'."\n";
-        $var = true;
         $tmpfilelist2 = dol_sort_array($file_list['updated'], 'filename');
         if (is_array($tmpfilelist2) && count($tmpfilelist2))
         {
@@ -284,8 +275,7 @@ if ($xml)
 	        foreach ($tmpfilelist2 as $file)
 	        {
 	            $i++;
-	            $var = !$var;
-	            $out.='<tr ' . $bc[$var] . '>';
+	            $out.='<tr class="oddeven">';
 	            $out.='<td>'.$i.'</td>' . "\n";
 	            $out.='<td>'.$file['filename'].'</td>' . "\n";
 	            $out.='<td align="center">'.$file['expectedmd5'].'</td>' . "\n";
@@ -307,7 +297,7 @@ if ($xml)
         }
         else 
         {
-            $out.='<tr ' . $bc[false] . '><td colspan="5" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+            $out.='<tr class="oddeven"><td colspan="5" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
         }
         $out.='</table>';
         
@@ -326,7 +316,6 @@ if ($xml)
         $out.='<td align="right">' . $langs->trans("Size") . '</td>';
         $out.='<td align="right">' . $langs->trans("DateModification") . '</td>';
         $out.='</tr>'."\n";
-        $var = true;
         $tmpfilelist3 = dol_sort_array($file_list['added'], 'filename');
         if (is_array($tmpfilelist3) && count($tmpfilelist3))
         {
@@ -334,8 +323,7 @@ if ($xml)
             foreach ($tmpfilelist3 as $file)
             {
                 $i++;
-                $var = !$var;
-                $out.='<tr ' . $bc[$var] . '>';
+                $out.='<tr class="oddeven">';
                 $out.='<td>'.$i.'</td>' . "\n";
                 $out.='<td>'.$file['filename'].'</td>' . "\n";
                 $out.='<td align="center">'.$file['expectedmd5'].'</td>' . "\n";
@@ -357,7 +345,7 @@ if ($xml)
         }
         else
         {
-            $out.='<tr ' . $bc[false] . '><td colspan="5" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+            $out.='<tr class="oddeven"><td colspan="5" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
         }
         $out.='</table>';
         
diff --git a/htdocs/admin/system/modules.php b/htdocs/admin/system/modules.php
index 706e0215059..4a6967089e2 100644
--- a/htdocs/admin/system/modules.php
+++ b/htdocs/admin/system/modules.php
@@ -118,9 +118,8 @@ $rights_ids = array();
 foreach($sortorder as $numero=>$name)
 {
 	$idperms="";
-	$var=!$var;
 	// Module
-	print "<tr ".$bc[$var].'><td width="300" class="nowrap">';
+	print '<tr class="oddeven"><td width="300" class="nowrap">';
 	$alt=$name.' - '.$modules_files[$numero];
     if (! empty($picto[$numero]))
     {
diff --git a/htdocs/admin/system/phpinfo.php b/htdocs/admin/system/phpinfo.php
index 3e9ccbc895f..8664a28b28a 100644
--- a/htdocs/admin/system/phpinfo.php
+++ b/htdocs/admin/system/phpinfo.php
@@ -57,7 +57,7 @@ $var=false;
 
 // Recupere la version de PHP
 $phpversion=version_php();
-print "<tr ".$bc[$var].'><td  width="220px">'.$langs->trans("Version")."</td><td>".$phpversion."</td></tr>\n";
+print '<tr class="oddeven"><td  width="220px">'.$langs->trans("Version")."</td><td>".$phpversion."</td></tr>\n";
 
 print '</table>';
 print '<br>';
@@ -76,14 +76,12 @@ foreach($phparray as $key => $value)
 	print '<td colspan="2">'.$langs->trans("Value").'</td>';
 	print "</tr>\n";
 
-	$var=true;
 	//var_dump($value);
 	foreach($value as $keyparam => $keyvalue)
 	{
 		if (! is_array($keyvalue))
 		{
-			$var=!$var;
-			print '<tr '.$bc[$var].'>';
+			print '<tr class="oddeven">';
 			print '<td>'.$keyparam.'</td>';
 			$valtoshow=$keyvalue;
 			if ($keyparam == 'X-ChromePhp-Data') $valtoshow=dol_trunc($keyvalue,80);
@@ -97,8 +95,7 @@ foreach($phparray as $key => $value)
 		}
 		else
 		{
-			$var=!$var;
-			print '<tr '.$bc[$var].'>';
+			print '<tr class="oddeven">';
 			print '<td>'.$keyparam.'</td>';
 			$i=0;
 			foreach($keyvalue as $keyparam2 => $keyvalue2)

From 196156a21eb0974a9459fe45a4599cc0b4952b2a Mon Sep 17 00:00:00 2001
From: florian HENRY <florian.henry@atm-consulting.fr>
Date: Thu, 13 Apr 2017 16:35:29 +0200
Subject: [PATCH 055/505] fix setEventMessages error insteads of errors

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

diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index dcc0fc85ecc..5afc6c3583b 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -117,7 +117,7 @@ if ($action == 'add')
     
     if ($conf->global->MAIN_BANK_ACCOUNTANCY_CODE_ALWAYS_REQUIRED && empty($object->account_number))
     {
-        setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired",$langs->transnoentitiesnoconv("AccountancyCode")), null, 'error');
+        setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired",$langs->transnoentitiesnoconv("AccountancyCode")), null, 'errors');
         $action='create';       // Force chargement page en mode creation
         $error++;
     }

From e6b20840a3d66db0bcf8053fcc2aa7540cd46b63 Mon Sep 17 00:00:00 2001
From: mikee2 <mikee2@users.noreply.github.com>
Date: Fri, 14 Apr 2017 11:49:30 +0200
Subject: [PATCH 056/505] Update Segment.php

---
 htdocs/includes/odtphp/Segment.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/includes/odtphp/Segment.php b/htdocs/includes/odtphp/Segment.php
index 2ef40b2cd66..81e9dad9f97 100644
--- a/htdocs/includes/odtphp/Segment.php
+++ b/htdocs/includes/odtphp/Segment.php
@@ -170,8 +170,8 @@ class Segment implements IteratorAggregate, Countable
     {
         global $langs;
 
-        $patterns=array( '/\[%M\]/','/\[%F\]/','/\[%Y\]/' );
-        $values=array( $langs->trans(date('M')), $langs->trans(date('F')), date('Y') );
+        $patterns=array( '__CURRENTDAY__','__CURRENTDAYTEXT__','__CURRENTMONTHSHORT__','__CURRENTMONTH__','__CURRENTYEAR__' );
+        $values=array( date('j'), $langs->trans(date('l')), $langs->trans(date('M')), $langs->trans(date('F')), date('Y') );
 
         $text=preg_replace($patterns, $values, $text);
 

From 24962863744aad5a3062c8690ec6206d469b24d9 Mon Sep 17 00:00:00 2001
From: florian HENRY <florian.henry@atm-consulting.fr>
Date: Fri, 14 Apr 2017 12:27:53 +0200
Subject: [PATCH 057/505] fix :missing mainmenu and leftmenu into accoutancy
 menu descriptor

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

diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index d3e777b13ba..b981686d7c7 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -791,7 +791,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 			if (! empty($conf->facture->enabled))
 			{
 				$langs->load("bills");
-				$newmenu->add("/compta/facture/list.php?leftmenu=customers_bills",$langs->trans("BillsCustomers"),0,$user->rights->facture->lire);
+				$newmenu->add("/compta/facture/list.php?leftmenu=customers_bills",$langs->trans("BillsCustomers"),0,$user->rights->facture->lire, '', $mainmenu, 'customers_bills');
 				$newmenu->add("/compta/facture.php?action=create",$langs->trans("NewBill"),1,$user->rights->facture->creer);
 				$newmenu->add("/compta/facture/list.php?leftmenu=customers_bills",$langs->trans("List"),1,$user->rights->facture->lire);
 

From 6c5b329dd17bbb69c3089d017d72b6ee6354e948 Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Fri, 14 Apr 2017 14:51:39 +0200
Subject: [PATCH 058/505] Fix : display bank on supplier payment as on customer
 payment

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

diff --git a/htdocs/fourn/paiement/card.php b/htdocs/fourn/paiement/card.php
index 3b93eb85cc9..9d030035d76 100644
--- a/htdocs/fourn/paiement/card.php
+++ b/htdocs/fourn/paiement/card.php
@@ -227,9 +227,8 @@ if ($result > 0)
 	    	print '<td colspan="2">'.$langs->trans('BankAccount').'</td>';
 			print '<td colspan="3">';
 			$accountstatic=new Account($db);
-	        $accountstatic->id=$bankline->fk_account;
-	        $accountstatic->label=$bankline->bank_account_ref.' - '.$bankline->bank_account_label;
-	        print $accountstatic->getNomUrl(0);
+			$accountstatic->fetch($bankline->fk_account);
+	        print $accountstatic->getNomUrl(1);
 	    	print '</td>';
 	    	print '</tr>';
         }

From 402924f6d7b6d073957e06321bc49e83638f2d5d Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Fri, 14 Apr 2017 15:12:32 +0200
Subject: [PATCH 059/505] Fix : no origin on stock mvmt when order set back to
 draft

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

diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index e1b59f34772..462ba4756c5 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -464,6 +464,7 @@ class Commande extends CommonOrder
                     if ($this->lines[$i]->fk_product > 0)
                     {
                         $mouvP = new MouvementStock($this->db);
+                        $mouvP->origin = &$this;
                         // We increment stock of product (and sub-products)
                         $result=$mouvP->reception($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, 0, $langs->trans("OrderBackToDraftInDolibarr",$this->ref));
                         if ($result < 0) { $error++; $this->error=$mouvP->error; break; }

From f68c408dbc528ce0381414c1c05f298467e6658c Mon Sep 17 00:00:00 2001
From: rassakali <rezki.assakali@gmail.com>
Date: Sat, 15 Apr 2017 08:35:23 +0200
Subject: [PATCH 060/505] Update subscription.php

Fix issue #6694
---
 htdocs/adherents/subscription.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/adherents/subscription.php b/htdocs/adherents/subscription.php
index cc7fbef58f5..3d22ae336fb 100644
--- a/htdocs/adherents/subscription.php
+++ b/htdocs/adherents/subscription.php
@@ -89,14 +89,14 @@ if ($rowid)
     $caneditfieldmember=$user->rights->adherent->creer;
 }
 
+// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+$hookmanager->initHooks(array('subscription'));
+
 // PDF
 $hidedetails = (GETPOST('hidedetails', 'int') ? GETPOST('hidedetails', 'int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS) ? 1 : 0));
 $hidedesc = (GETPOST('hidedesc', 'int') ? GETPOST('hidedesc', 'int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC) ? 1 : 0));
 $hideref = (GETPOST('hideref', 'int') ? GETPOST('hideref', 'int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF) ? 1 : 0));
 
-
-
-
 /*
  * 	Actions
  */

From 006ad4cef82264d5d1044709dbc058c9a3cdc20f Mon Sep 17 00:00:00 2001
From: Juanjo Menent <jmenent@2byte.es>
Date: Sat, 15 Apr 2017 20:04:45 +0200
Subject: [PATCH 061/505] FIX #6718 Bug: Discount amount is not locally
 formatted in CommonObject View

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

diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php
index bb34806965a..07d7509c80b 100644
--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2014       Marcos García               <marcosgdf@gmail.com>
  * Copyright (C) 2015       Ferran Marcet               <fmarcet@2byte.es>
  * Copyright (C) 2015-2016  Raphaël Doursenaud          <rdoursenaud@gpcsolutions.fr>
+ * Copyright (C) 2017       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
@@ -1439,7 +1440,7 @@ function dol_print_reduction($reduction,$langs)
     }
     else
     {
-        $string = $reduction.'%';
+        $string = price($reduction).'%';
     }
 
     return $string;

From e23a44bcdf49d8e15062ec04d233ae3968604db1 Mon Sep 17 00:00:00 2001
From: Christian Seiler <Christian-Seiler@users.noreply.github.com>
Date: Sun, 16 Apr 2017 11:09:18 +0200
Subject: [PATCH 062/505] Added missing Slashes

fixed line where two slashes were missing, that caused an error when creating barcodes.
---
 htdocs/core/lib/functions2.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php
index 82449ac63cb..6d72a668269 100644
--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@@ -1074,7 +1074,7 @@ function check_value($mask,$value)
 
     // If an offset is asked
     if (! empty($reg[2]) && preg_match('/^\+/',$reg[2])) $maskoffset=preg_replace('/^\+/','',$reg[2]);
-    if (! empty($reg[3]) && preg_match('^\+',$reg[3])) $maskoffset=preg_replace('/^\+/','',$reg[3]);
+    if (! empty($reg[3]) && preg_match('/^\+/',$reg[3])) $maskoffset=preg_replace('/^\+/','',$reg[3]);
 
     // Define $sqlwhere
 

From e1ea6e2b534fd8d634aec9ece49ff2738140ebcb Mon Sep 17 00:00:00 2001
From: rassakali <rezki.assakali@gmail.com>
Date: Sun, 16 Apr 2017 12:04:36 +0200
Subject: [PATCH 063/505] Update card.php

---
 htdocs/adherents/subscription/card.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/adherents/subscription/card.php b/htdocs/adherents/subscription/card.php
index c8f68d2151c..5cb10e31e6d 100644
--- a/htdocs/adherents/subscription/card.php
+++ b/htdocs/adherents/subscription/card.php
@@ -145,7 +145,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->adherent-
     $result=$object->delete($user);
     if ($result > 0)
     {
-    	header("Location: card_subscriptions.php?rowid=".$object->fk_adherent);
+    	header("Location: ".DOL_URL_ROOT."/adherents/card.php?rowid=".$object->fk_adherent);
     	exit;
     }
     else

From e97e202debdc80f3242985ac016b81c6be3122c0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 17 Apr 2017 04:22:53 +0200
Subject: [PATCH 064/505] NEW Can import users

---
 htdocs/core/modules/modUser.class.php         | 39 ++++++++++-
 htdocs/core/tpl/login.tpl.php                 | 33 +++++----
 htdocs/core/tpl/passwordforgotten.tpl.php     | 28 ++++----
 htdocs/imports/import.php                     | 69 ++++++++++++++-----
 .../install/mysql/migration/5.0.0-6.0.0.sql   |  3 +-
 .../mysql/tables/llx_product_price_by_qty.sql |  2 +-
 htdocs/install/mysql/tables/llx_user.sql      |  4 +-
 htdocs/langs/en_US/exports.lang               |  4 +-
 htdocs/theme/eldy/style.css.php               |  3 +-
 htdocs/theme/md/style.css.php                 |  3 +-
 10 files changed, 131 insertions(+), 57 deletions(-)

diff --git a/htdocs/core/modules/modUser.class.php b/htdocs/core/modules/modUser.class.php
index f4e9b0d7356..55d4d45d28e 100644
--- a/htdocs/core/modules/modUser.class.php
+++ b/htdocs/core/modules/modUser.class.php
@@ -68,7 +68,7 @@ class modUser extends DolibarrModules
 		// Dependancies
 		$this->depends = array();
 		$this->requiredby = array();
-		$this->langfiles = array("main","users","companies","members");
+		$this->langfiles = array("main","users","companies","members",'salaries');
 
 		// Constants
 		$this->const = array();
@@ -230,6 +230,43 @@ class modUser extends DolibarrModules
 		$this->export_sql_start[$r]='SELECT DISTINCT ';
 		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'user as u';
 		$this->export_sql_end[$r] .=' WHERE u.entity IN ('.getEntity('user',1).')';
+		
+		// Imports
+		//--------
+		$r=0;
+
+		// Import list of users attributes
+		$r++;
+		$this->import_code[$r]=$this->rights_class.'_'.$r;
+		$this->import_label[$r]='ImportDataset_user_1';
+		$this->import_icon[$r]='user';
+		$this->import_entities_array[$r]=array();		// We define here only fields that use another icon that the one defined into import_icon
+		$this->import_tables_array[$r]=array('u'=>MAIN_DB_PREFIX.'user','extra'=>MAIN_DB_PREFIX.'user_extrafields');	// List of tables to insert into (insert done in same order)
+		$this->import_fields_array[$r]=array('u.lastname'=>"Name*",'u.firstname'=>"Firstname",'u.employee'=>"Employee*",'u.job'=>"Job",'u.gender'=>"Gender",'u.login'=>"Login*",'u.pass_crypted'=>"Password",'u.admin'=>"Administrator",'u.fk_soc'=>"Company*",'u.address'=>"Address",'u.zip'=>"Zip",'u.town'=>"Town",'u.fk_state'=>"StateId",'u.fk_country'=>"CountryCode",'u.office_phone'=>"Phone",'u.user_mobile'=>"Mobile",'u.office_fax'=>"Fax",'u.email'=>"Email",'u.note'=>"Note",'u.signature'=>'Signature','u.fk_user'=>'Supervisor','u.thm'=>'THM','u.tjm'=>'TJM','u.dateemployment'=>'DateEmployment','u.salary'=>'Salary','u.color'=>'Color','u.api_key'=>'ApiKey','u.datec'=>"DateCreation");
+		// Add extra fields
+		$sql="SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'user' AND entity = ".$conf->entity;
+		$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='extra.'.$obj->name;
+		        $fieldlabel=ucfirst($obj->label);
+		        $this->import_fields_array[$r][$fieldname]=$fieldlabel.($obj->fieldrequired?'*':'');
+		    }
+		}
+		// End add extra fields
+		$this->import_fieldshidden_array[$r]=array('u.fk_user_creat'=>'user->id','extra.fk_object'=>'lastrowid-'.MAIN_DB_PREFIX.'user');    // aliastable.field => ('user->id' or 'lastrowid-'.tableparent)
+		$this->import_convertvalue_array[$r]=array(
+			'u.fk_state'=>array('rule'=>'fetchidfromcodeid','classfile'=>'/core/class/cstate.class.php','class'=>'Cstate','method'=>'fetch','dict'=>'DictionaryState'),
+		    'u.fk_country'=>array('rule'=>'fetchidfromcodeid','classfile'=>'/core/class/ccountry.class.php','class'=>'Ccountry','method'=>'fetch','dict'=>'DictionaryCountry'),
+		    'u.salary'=>array('rule'=>'numeric')
+		);
+		//$this->import_convertvalue_array[$r]=array('s.fk_soc'=>array('rule'=>'lastrowid',table='t');
+		$this->import_regex_array[$r]=array('u.employee'=>'^[0|1]','u.datec'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]( [0-9][0-9]:[0-9][0-9]:[0-9][0-9])?$');
+		$this->import_examplevalues_array[$r]=array('u.lastname'=>"Doe",'u.firstname'=>'John','u.login'=>'jdoe','u.employee'=>'0 or 1','u.status'=>"0 (closed) or 1 (active)",'u.fk_soc'=>'0 (internal user) or company name (external user)','u.datec'=>dol_print_date(dol_now(),'%Y-%m-%d'),'u.address'=>"61 jump street",'u.zip'=>"123456",'u.town'=>"Big town",'u.fk_country'=>'US, FR, DE...','u.office_phone'=>"0101010101",'u.office_fax'=>"0101010102",'u.email'=>"test@mycompany.com",'u.salary'=>"10000",'u.note'=>"This is an example of note for record",'u.datec'=>"2015-01-01 or 2015-01-01 12:30:00");
+		$this->import_updatekeys_array[$r]=array('u.lastname'=>'Lastname','u.firstname'=>'Firstname','u.login'=>'Login');
+		
 	}
 
 
diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php
index a23d14a979d..1245041d98a 100644
--- a/htdocs/core/tpl/login.tpl.php
+++ b/htdocs/core/tpl/login.tpl.php
@@ -77,18 +77,27 @@ $(document).ready(function () {
 <input type="hidden" name="dol_use_jmobile" id="dol_use_jmobile" value="<?php echo $dol_use_jmobile; ?>" />
 
 
+
+<!-- Title with version -->
+<div class="login_table_title center" title="<?php echo dol_escape_htmltag($title); ?>">
+<?php
+if ($disablenofollow) echo '<a class="login_table_title" href="https://www.dolibarr.org" target="_blank">';
+echo dol_escape_htmltag($title); 
+if ($disablenofollow) echo '</a>';
+?>
+</div>
+
+
+
 <div class="login_table">
 
 <div id="login_line1">
 
 <div id="login_left">
-
 <img alt="" src="<?php echo $urllogo; ?>" id="img_logo" />
-
 </div>
 
 
-
 <div id="login_right">
 
 <table class="left centpercent" title="<?php echo $langs->trans("EnterLoginDetail"); ?>">
@@ -146,10 +155,10 @@ if (! empty($hookmanager->resArray['options'])) {
 <?php } ?>
 </table>
 
-</div> <!-- end div left -->
+</div> <!-- end div login-right -->
 
+</div> <!-- end div login-line1 -->
 
-</div>
 
 <div id="login_line2" style="clear: both">
 
@@ -209,19 +218,9 @@ if (isset($conf->file->main_authentication) && preg_match('/openid/',$conf->file
 
 ?>
 
-</div>
+</div> <!-- end login line 2 -->
 
-</div>
-
-
-<!-- Title with version -->
-<div class="login_table_title center" title="<?php echo dol_escape_htmltag($title); ?>">
-<?php
-if ($disablenofollow) echo '<a class="login_table_title" href="https://www.dolibarr.org" target="_blank">';
-echo dol_escape_htmltag($title); 
-if ($disablenofollow) echo '</a>';
-?>
-</div>
+</div> <!-- end login table -->
 
 
 </form>
diff --git a/htdocs/core/tpl/passwordforgotten.tpl.php b/htdocs/core/tpl/passwordforgotten.tpl.php
index 8a403d675d7..bdc38b08873 100644
--- a/htdocs/core/tpl/passwordforgotten.tpl.php
+++ b/htdocs/core/tpl/passwordforgotten.tpl.php
@@ -52,18 +52,25 @@ $(document).ready(function () {
 <input type="hidden" name="action" value="buildnewpassword">
 
 
+<!-- Title with version -->
+<div class="login_table_title center" title="<?php echo dol_escape_htmltag($title); ?>">
+<?php
+if ($disablenofollow) echo '<a class="login_table_title" href="https://www.dolibarr.org" target="_blank">';
+echo dol_escape_htmltag($title); 
+if ($disablenofollow) echo '</a>';
+?>
+</div>
+
+
 
 <div class="login_table">
 
 <div id="login_line1">
 
 <div id="login_left">
-
 <img alt="Logo" title="" src="<?php echo $urllogo; ?>" id="img_logo" />
-
 </div>
 
-
 <div id="login_right">
 
 <table summary="Login pass" class="centpercent">
@@ -114,13 +121,11 @@ if (! empty($hookmanager->resArray['options'])) {
 
 </table>
 
-</div> <!-- end div left -->
+</div> <!-- end div login right -->
 
+</div> <!-- end div login_line1 -->
 
 
-
-</div>
-
 <div id="login_line2" style="clear: both">
 
 <!-- Button "Regenerate and Send password" -->
@@ -143,15 +148,6 @@ if (! empty($hookmanager->resArray['options'])) {
 
 </div>
 
-<!-- Title with version -->
-<div class="login_table_title center" title="<?php echo dol_escape_htmltag($title); ?>">
-<?php
-if ($disablenofollow) echo '<a class="login_table_title" href="https://www.dolibarr.org" target="_blank">';
-echo dol_escape_htmltag($title); 
-if ($disablenofollow) echo '</a>';
-?>
-</div>
-
 </form>
 
 
diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php
index 3916770de8a..82ecad62417 100644
--- a/htdocs/imports/import.php
+++ b/htdocs/imports/import.php
@@ -340,7 +340,7 @@ if ($step == 1 || ! $datatoimport)
 
     $head = import_prepare_head($param, 1);
 
-	dol_fiche_head($head, 'step1', $langs->trans("NewImport"));
+	dol_fiche_head($head, 'step1', $langs->trans("NewImport"), -1);
 
 
 	print $langs->trans("SelectImportDataSet").'<br>';
@@ -403,8 +403,10 @@ if ($step == 2 && $datatoimport)
 
     $head = import_prepare_head($param,2);
 
-	dol_fiche_head($head, 'step2', $langs->trans("NewImport"));
+	dol_fiche_head($head, 'step2', $langs->trans("NewImport"), -1);
 
+	print '<div class="underbanner clearboth"></div>';
+	print '<div class="fichecenter">';
 
 	print '<table width="100%" class="border">';
 
@@ -426,6 +428,8 @@ if ($step == 2 && $datatoimport)
 
 	print '</table>';
 
+	print '</div><br>';
+	
 	dol_fiche_end();
 	
 
@@ -478,7 +482,7 @@ if ($step == 3 && $datatoimport)
 
     $head = import_prepare_head($param, 3);
 
-	dol_fiche_head($head, 'step3', $langs->trans("NewImport"));
+	dol_fiche_head($head, 'step3', $langs->trans("NewImport"), -1);
 
 	/*
 	 * Confirm delete file
@@ -489,6 +493,9 @@ if ($step == 3 && $datatoimport)
 
 	}
 
+	print '<div class="underbanner clearboth"></div>';
+	print '<div class="fichecenter">';
+	
 	print '<table width="100%" class="border">';
 
 	// Module
@@ -508,10 +515,14 @@ if ($step == 3 && $datatoimport)
 	print '</td></tr>';
 
 	print '</table>';
+	print '</div>';
 	
 	print '<br>';
 	
-	print '<b>'.$langs->trans("InformationOnSourceFile").'</b><hr>';
+	print '<b>'.$langs->trans("InformationOnSourceFile").'</b>';
+	
+	print '<div class="underbanner clearboth"></div>';
+	print '<div class="fichecenter">';
 	print '<table width="100%" class="border">';
 	//print '<tr><td colspan="2"><b>'.$langs->trans("InformationOnSourceFile").'</b></td></tr>';
 
@@ -525,6 +536,7 @@ if ($step == 3 && $datatoimport)
 	print '</td></tr>';
 
 	print '</table>';
+	print '</div>';
 	
 	dol_fiche_end();
 
@@ -735,7 +747,10 @@ if ($step == 4 && $datatoimport)
 
     $head = import_prepare_head($param,4);
 
-	dol_fiche_head($head, 'step4', $langs->trans("NewImport"));
+	dol_fiche_head($head, 'step4', $langs->trans("NewImport"), -1);
+
+	print '<div class="underbanner clearboth"></div>';
+	print '<div class="fichecenter">';
 
 	print '<table width="100%" class="border">';
 
@@ -756,10 +771,13 @@ if ($step == 4 && $datatoimport)
 	print '</td></tr>';
 
 	print '</table>';
-	
+	print '</div>';
+		
 	print '<br>';
 	
-	print '<b>'.$langs->trans("InformationOnSourceFile").'</b><hr>';
+	print '<b>'.$langs->trans("InformationOnSourceFile").'</b>';
+	print '<div class="underbanner clearboth"></div>';
+	print '<div class="fichecenter">';
 	print '<table width="100%" class="border">';
 	//print '<tr><td colspan="2"><b>'.$langs->trans("InformationOnSourceFile").'</b></td></tr>';
 
@@ -801,6 +819,7 @@ if ($step == 4 && $datatoimport)
 	print '</td></tr>';
 
 	print '</table>';
+	print '</div>';
 	
 	dol_fiche_end();
 	
@@ -1204,8 +1223,10 @@ if ($step == 5 && $datatoimport)
     print '<input type="hidden" name="step" value="5">';    // step 5
     print '<input type="hidden" name="action" value="launchsimu">';    // step 5
     
-	dol_fiche_head($head, 'step5', $langs->trans("NewImport"));
+	dol_fiche_head($head, 'step5', $langs->trans("NewImport"), -1);
 
+	print '<div class="underbanner clearboth"></div>';
+	print '<div class="fichecenter">';
 
 	print '<table width="100%" class="border">';
 
@@ -1226,10 +1247,13 @@ if ($step == 5 && $datatoimport)
 	print '</td></tr>';
 
 	print '</table>';
-	
+	print '</div>';
+		
 	print '<br>';
 	
-	print '<b>'.$langs->trans("InformationOnSourceFile").'</b><hr>';
+	print '<b>'.$langs->trans("InformationOnSourceFile").'</b>';
+	print '<div class="underbanner clearboth"></div>';
+	print '<div class="fichecenter">';
 	print '<table width="100%" class="border">';
 	//print '<tr><td colspan="2"><b>'.$langs->trans("InformationOnSourceFile").'</b></td></tr>';
 
@@ -1276,7 +1300,6 @@ if ($step == 5 && $datatoimport)
 	{
 	    print '<input type="number" class="maxwidth50" name="excludefirstlinebis" disabled="disabled" value="'.$excludefirstline.'">';
 	    print '<input type="hidden" name="excludefirstline" value="'.$excludefirstline.'">';
-        print ' &nbsp; <a href="'.$_SERVER["PHP_SELF"].'?step=5'.$param.'">'.$langs->trans("Modify").'</a>';
 	}
 	else
 	{
@@ -1288,20 +1311,27 @@ if ($step == 5 && $datatoimport)
 	{
 	    print '<input type="text" class="maxwidth50" name="endatlinenbbis" disabled="disabled" value="'.$endatlinenb.'">';
 	    print '<input type="hidden" name="endatlinenb" value="'.$endatlinenb.'">';
-        print ' &nbsp; <a href="'.$_SERVER["PHP_SELF"].'?step=5'.$param.'">'.$langs->trans("Modify").'</a>';
 	}
 	else
 	{
 	    print '<input type="text" class="maxwidth50" name="endatlinenb" value="'.$endatlinenb.'">';
 	    print $form->textwithpicto("", $langs->trans("KeepEmptyToGoToEndOfFile"));
 	}
+    if ($action == 'launchsimu') print ' &nbsp; <a href="'.$_SERVER["PHP_SELF"].'?step=5'.$param.'">'.$langs->trans("Modify").'</a>';
 	print '</td></tr>';
 
 	print '<tr><td>';
 	print $langs->trans("KeysToUseForUpdates");
 	print '</td><td>';
 	if($action=='launchsimu') {
-		print $form->multiselectarray('updatekeysbis', $objimport->array_import_updatekeys[0], $updatekeys, 0, 0, '', 1, '', 'disabled');
+		if (count($updatekeys))
+		{
+			print $form->multiselectarray('updatekeysbis', $objimport->array_import_updatekeys[0], $updatekeys, 0, 0, '', 1, '', 'disabled');
+		}
+		else
+		{
+			print '<span class="opacitymedium">'.$langs->trans("NoUpdateAttempt").'</span> &nbsp; -';
+		}
 		foreach($updatekeys as $val) {
 			print '<input type="hidden" name="updatekeys[]" value="'.$val.'">';
 		}
@@ -1323,15 +1353,19 @@ if ($step == 5 && $datatoimport)
 	print '</td></tr>';
 	
 	print '</table>';
-
+	print '</div>';
+	
 	print '<br>';
 
-	print '<b>'.$langs->trans("InformationOnTargetTables").'</b><hr>';
+	print '<b>'.$langs->trans("InformationOnTargetTables").'</b>';
+	print '<div class="underbanner clearboth"></div>';
+	print '<div class="fichecenter">';
+	
 	print '<table width="100%" class="border">';
 	//print '<tr><td colspan="2"><b>'.$langs->trans("InformationOnTargetTables").'</b></td></tr>';
 
 	// Tables imported
-	print '<tr><td width="25%">';
+	print '<tr><td class="titlefield">';
 	print $langs->trans("TablesTarget");
 	print '</td><td>';
 	$listtables=array();
@@ -1391,7 +1425,8 @@ if ($step == 5 && $datatoimport)
 	print '</td></tr>';
 
 	print '</table>';
-
+	print '</div>';
+	
     dol_fiche_end();
 
 
diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index 91a0c36aaeb..e73c0df2add 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -59,8 +59,9 @@ ALTER TABLE llx_product_price_by_qty ADD COLUMN fk_user_creat integer;
 ALTER TABLE llx_product_price_by_qty ADD COLUMN fk_user_modif integer;
 ALTER TABLE llx_product_price_by_qty DROP COLUMN date_price;
 ALTER TABLE llx_product_price_by_qty ADD COLUMN tms timestamp;
-ALTER TABLE llx_product_price_by_qty ADD COLUMN import_key integer;
+ALTER TABLE llx_product_price_by_qty ADD COLUMN import_key varchar(14);
 
+ALTER TABLE llx_user ADD COLUMN import_key varchar(14);
 
 
 CREATE TABLE llx_product_attribute
diff --git a/htdocs/install/mysql/tables/llx_product_price_by_qty.sql b/htdocs/install/mysql/tables/llx_product_price_by_qty.sql
index 8543f1720b2..2b91647b80a 100644
--- a/htdocs/install/mysql/tables/llx_product_price_by_qty.sql
+++ b/htdocs/install/mysql/tables/llx_product_price_by_qty.sql
@@ -31,5 +31,5 @@ create table llx_product_price_by_qty
   fk_user_creat 	integer,
   fk_user_modif 	integer,
   tms				timestamp,
-  import_key    	integer
+  import_key    	varchar(14)
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_user.sql b/htdocs/install/mysql/tables/llx_user.sql
index e711c1e9ad9..d033ba5eca4 100644
--- a/htdocs/install/mysql/tables/llx_user.sql
+++ b/htdocs/install/mysql/tables/llx_user.sql
@@ -83,5 +83,7 @@ create table llx_user
   salary			double(24,8),			-- denormalized value coming from llx_user_employment
   salaryextra		double(24,8),			-- denormalized value coming from llx_user_employment
   dateemployment	date,					-- denormalized value coming from llx_user_employment
-  weeklyhours		double(16,8)			-- denormalized value coming from llx_user_employment
+  weeklyhours		double(16,8),			-- denormalized value coming from llx_user_employment
+
+  import_key        varchar(14)                          		-- import key
 )ENGINE=innodb;
diff --git a/htdocs/langs/en_US/exports.lang b/htdocs/langs/en_US/exports.lang
index 139b3e463b8..a2e208673bd 100644
--- a/htdocs/langs/en_US/exports.lang
+++ b/htdocs/langs/en_US/exports.lang
@@ -117,7 +117,9 @@ ImportFromToLine=Import line numbers (from - to)
 SetThisValueTo2ToExcludeFirstLine=For example, set this value to 3 to exclude the 2 first lines
 KeepEmptyToGoToEndOfFile=Keep this field empty to go up to the end of file
 SelectPrimaryColumnsForUpdateAttempt=Select column(s) to use as primary key for update attempt
-UpdateNotYetSupportedForThisImport=Update is not supported for this type of import (only insert) 
+UpdateNotYetSupportedForThisImport=Update is not supported for this type of import (only insert)
+NoUpdateAttempt=No update attempt was performed, only insert 
+ImportDataset_user_1=Users (employees or not) and properties
 ## filters
 SelectFilterFields=If you want to filter on some values, just input values here.
 FilteredFields=Filtered fields
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 9fe43395c5e..971a4d2ed40 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -1526,6 +1526,7 @@ foreach($mainmenuusedarray as $val)
 }
 .login_vertical_align {
 	padding: 10px;
+	padding-bottom: 80px;
 }
 form#login {
 	padding-bottom: 30px;
@@ -1535,7 +1536,7 @@ form#login {
 .login_table_title {
 	max-width: 530px;
 	color: #aaa !important;
-	padding-top: 30px;
+	padding-bottom: 20px;
 	/* text-shadow: 1px 1px 1px #FFF; */
 }
 .login_table label {
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 852b729bba9..27c4713742a 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -1562,6 +1562,7 @@ foreach($mainmenuusedarray as $val)
 }	
 .login_vertical_align {
 	padding: 10px;
+	padding-bottom: 80px;
 }
 form#login {
 	padding-bottom: 30px;
@@ -1571,7 +1572,7 @@ form#login {
 .login_table_title {
 	max-width: 530px;
 	color: #aaa !important;
-	padding-top: 30px;
+	padding-bottom: 20px;
 	/* text-shadow: 1px 1px 1px #FFF; */
 }
 .login_table label {

From 0994622bf88b8ee49abd5c61f274a65cca66f892 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 17 Apr 2017 13:02:40 +0200
Subject: [PATCH 065/505] NEW Can use translations into all substitutions
 (watermark, freetext...)

---
 htdocs/adherents/class/adherent.class.php     | 28 +++++--
 htdocs/admin/commande.php                     | 12 ++-
 htdocs/admin/facture.php                      | 10 ++-
 htdocs/admin/order_extrafields.php            |  2 +-
 htdocs/admin/orderdet_extrafields.php         |  2 +-
 htdocs/admin/propal.php                       | 23 +++---
 htdocs/comm/admin/propal_extrafields.php      |  2 +-
 htdocs/comm/admin/propaldet_extrafields.php   |  2 +-
 htdocs/comm/mailing/card.php                  | 29 ++++---
 htdocs/comm/mailing/cibles.php                | 28 ++-----
 htdocs/comm/mailing/info.php                  |  6 +-
 htdocs/compta/facture/class/facture.class.php |  1 -
 htdocs/compta/facture/fiche-rec.php           |  6 +-
 htdocs/core/lib/functions.lib.php             | 82 +++++++++++++------
 htdocs/core/lib/pdf.lib.php                   | 50 ++++++++---
 .../modules/facture/doc/pdf_crabe.modules.php | 10 ++-
 htdocs/core/modules/modCommande.class.php     |  7 ++
 htdocs/core/modules/modFacture.class.php      |  7 ++
 htdocs/core/modules/modPropale.class.php      |  9 +-
 htdocs/langs/en_US/main.lang                  |  1 +
 htdocs/main.inc.php                           |  2 +-
 htdocs/theme/eldy/style.css.php               | 22 ++---
 htdocs/theme/md/style.css.php                 | 21 ++---
 23 files changed, 239 insertions(+), 123 deletions(-)

diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 020dbc58474..852b051e3dd 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -209,6 +209,23 @@ class Adherent extends CommonObject
 
 		// Substitutions
 		$substitutionarray=array(
+				'__DOL_MAIN_URL_ROOT__'=>DOL_MAIN_URL_ROOT,
+				'__ID__'=>$msgishtml?dol_htmlentitiesbr($this->id):$this->id,
+				'__CIVILITY__'=>$this->getCivilityLabel(),
+				'__FIRSTNAME__'=>$msgishtml?dol_htmlentitiesbr($this->firstname):$this->firstname,
+				'__LASTNAME__'=>$msgishtml?dol_htmlentitiesbr($this->lastname):$this->lastname,
+				'__FULLNAME__'=>$msgishtml?dol_htmlentitiesbr($this->getFullName($langs)):$this->getFullName($langs),
+				'__COMPANY__'=>$msgishtml?dol_htmlentitiesbr($this->societe):$this->societe,
+				'__ADDRESS__'=>$msgishtml?dol_htmlentitiesbr($this->address):$this->address,
+				'__ZIP__'=>$msgishtml?dol_htmlentitiesbr($this->zip):$this->zip,
+				'__TOWN_'=>$msgishtml?dol_htmlentitiesbr($this->town):$this->town,
+				'__COUNTRY__'=>$msgishtml?dol_htmlentitiesbr($this->country):$this->country,
+				'__EMAIL__'=>$msgishtml?dol_htmlentitiesbr($this->email):$this->email,
+				'__BIRTH__'=>$msgishtml?dol_htmlentitiesbr($birthday):$birthday,
+				'__PHOTO__'=>$msgishtml?dol_htmlentitiesbr($this->photo):$this->photo,
+				'__LOGIN__'=>$msgishtml?dol_htmlentitiesbr($this->login):$this->login,
+				'__PASSWORD__'=>$msgishtml?dol_htmlentitiesbr($this->pass):$this->pass,
+				// For backward compatibility
 				'%DOL_MAIN_URL_ROOT%'=>DOL_MAIN_URL_ROOT,
 				'%ID%'=>$msgishtml?dol_htmlentitiesbr($this->id):$this->id,
 				'%CIVILITY%'=>$this->getCivilityLabel(),
@@ -225,7 +242,6 @@ class Adherent extends CommonObject
 				'%PHOTO%'=>$msgishtml?dol_htmlentitiesbr($this->photo):$this->photo,
 				'%LOGIN%'=>$msgishtml?dol_htmlentitiesbr($this->login):$this->login,
 				'%PASSWORD%'=>$msgishtml?dol_htmlentitiesbr($this->pass):$this->pass,
-				// For backward compatibility
 				'%INFOS%'=>$msgishtml?dol_htmlentitiesbr($infos):$infos,
 				'%SOCIETE%'=>$msgishtml?dol_htmlentitiesbr($this->societe):$this->societe,
 				'%PRENOM%'=>$msgishtml?dol_htmlentitiesbr($this->firstname):$this->firstname,
@@ -234,16 +250,10 @@ class Adherent extends CommonObject
 				'%VILLE%'=>$msgishtml?dol_htmlentitiesbr($this->town):$this->town,
 				'%PAYS%'=>$msgishtml?dol_htmlentitiesbr($this->country):$this->country,
 		);
-		// Add extrafields as substitution key %EXTRA_XXX%
-		foreach($this->array_options as $key => $val)
-		{
-			$keyshort=preg_replace('/^(options|extra)_/','',$key);
-			$substitutionarray['%EXTRA_'.$keyshort.'%']=$val;
-		}
 
-		complete_substitutions_array($substitutionarray, $langs);
+		complete_substitutions_array($substitutionarray, $langs, $this);
 
-		return make_substitutions($text,$substitutionarray);
+		return make_substitutions($text, $substitutionarray, $langs);
 	}
 
 
diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php
index a6ca7871ae4..3933f5d00ab 100644
--- a/htdocs/admin/commande.php
+++ b/htdocs/admin/commande.php
@@ -284,7 +284,7 @@ print load_fiche_titre($langs->trans("OrdersSetup"),$linkback,'title_setup');
 
 $head = order_admin_prepare_head();
 
-dol_fiche_head($head, 'general', $langs->trans("Orders"), 0, 'order');
+dol_fiche_head($head, 'general', $langs->trans("Orders"), -1, 'order');
 
 /*
  * Orders Numbering model
@@ -593,8 +593,14 @@ print "<form method=\"post\" action=\"".$_SERVER["PHP_SELF"]."\">";
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print "<input type=\"hidden\" name=\"action\" value=\"set_COMMANDE_DRAFT_WATERMARK\">";
 print '<tr class="oddeven"><td>';
-print $langs->trans("WatermarkOnDraftOrders").'</td><td>';
-print '<input size="50" class="flat" type="text" name="COMMANDE_DRAFT_WATERMARK" value="'.$conf->global->COMMANDE_DRAFT_WATERMARK.'">';
+$substitutionarray=pdf_getSubstitutionArray($langs);
+$substitutionarray['__(AnyTranslationKey)__']=$langs->trans("Translation");
+$htmltext = '<i>'.$langs->trans("AvailableVariables").':<br>';
+foreach($substitutionarray as $key => $val) $htmltext.=$key.'<br>';
+$htmltext.='</i>';
+print $form->textwithpicto($langs->trans("WatermarkOnDraftOrders"), $htmltext);
+print '</td><td>';
+print '<input class="flat minwidth200" type="text" name="COMMANDE_DRAFT_WATERMARK" value="'.$conf->global->COMMANDE_DRAFT_WATERMARK.'">';
 print '</td><td align="right">';
 print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
 print "</td></tr>\n";
diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php
index 4e9b007ee14..e7f74f85e5e 100644
--- a/htdocs/admin/facture.php
+++ b/htdocs/admin/facture.php
@@ -279,7 +279,7 @@ $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToM
 print load_fiche_titre($langs->trans("BillsSetup"),$linkback,'title_setup');
 
 $head = invoice_admin_prepare_head();
-dol_fiche_head($head, 'general', $langs->trans("Invoices"), 0, 'invoice');
+dol_fiche_head($head, 'general', $langs->trans("Invoices"), -1, 'invoice');
 
 /*
  *  Numbering module
@@ -760,7 +760,13 @@ print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'" />';
 print '<input type="hidden" name="action" value="set_FACTURE_DRAFT_WATERMARK" />';
 print '<tr class="oddeven"><td>';
-print $langs->trans("WatermarkOnDraftBill").'</td>';
+$substitutionarray=pdf_getSubstitutionArray($langs);
+$substitutionarray['__(AnyTranslationKey)__']=$langs->trans("Translation");
+$htmltext = '<i>'.$langs->trans("AvailableVariables").':<br>';
+foreach($substitutionarray as $key => $val)	$htmltext.=$key.'<br>';
+$htmltext.='</i>';
+print $form->textwithpicto($langs->trans("WatermarkOnDraftBill"), $htmltext);
+print '</td>';
 print '<td><input size="50" class="flat" type="text" name="FACTURE_DRAFT_WATERMARK" value="'.$conf->global->FACTURE_DRAFT_WATERMARK.'" />';
 print '</td><td align="right">';
 print '<input type="submit" class="button" value="'.$langs->trans("Modify").'" />';
diff --git a/htdocs/admin/order_extrafields.php b/htdocs/admin/order_extrafields.php
index 5d7358ae051..043d6bbadd9 100644
--- a/htdocs/admin/order_extrafields.php
+++ b/htdocs/admin/order_extrafields.php
@@ -75,7 +75,7 @@ print "<br>\n";
 
 $head = order_admin_prepare_head();
 
-dol_fiche_head($head, 'attributes', $langs->trans("Orders"), 0, 'order');
+dol_fiche_head($head, 'attributes', $langs->trans("Orders"), -1, 'order');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
diff --git a/htdocs/admin/orderdet_extrafields.php b/htdocs/admin/orderdet_extrafields.php
index f966af78bf3..5120fd5c931 100644
--- a/htdocs/admin/orderdet_extrafields.php
+++ b/htdocs/admin/orderdet_extrafields.php
@@ -76,7 +76,7 @@ print "<br>\n";
 
 $head = order_admin_prepare_head();
 
-dol_fiche_head($head, 'attributeslines', $langs->trans("OrderLines"), 0, 'order');
+dol_fiche_head($head, 'attributeslines', $langs->trans("OrderLines"), -1, 'order');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
diff --git a/htdocs/admin/propal.php b/htdocs/admin/propal.php
index bff56b4f776..76179fac66c 100644
--- a/htdocs/admin/propal.php
+++ b/htdocs/admin/propal.php
@@ -248,16 +248,15 @@ else if ($action == 'setmod')
 
 
 /*
- * Affiche page
+ * View
  */
 
+$form=new Form($db);
+
 $dirmodels=array_merge(array('/'),(array) $conf->modules_parts['models']);
 
-
 llxHeader('',$langs->trans("PropalSetup"));
 
-$form=new Form($db);
-
 //if ($mesg) print $mesg;
 
 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
@@ -265,7 +264,7 @@ print load_fiche_titre($langs->trans("PropalSetup"),$linkback,'title_setup');
 
 $head = propal_admin_prepare_head();
 
-dol_fiche_head($head, 'general', $langs->trans("Proposals"), 0, 'propal');
+dol_fiche_head($head, 'general', $langs->trans("Proposals"), -1, 'propal');
 
 /*
  *  Module numerotation
@@ -534,11 +533,10 @@ print '<br>';
 
 /*
  * Other options
- *
  */
+
 print load_fiche_titre($langs->trans("OtherOptions"),'','');
 
-$var=true;
 print "<table class=\"noborder\" width=\"100%\">";
 print "<tr class=\"liste_titre\">";
 print "<td>".$langs->trans("Parameter")."</td>\n";
@@ -572,7 +570,6 @@ print "</td></tr>\n";
 print '</form>';
 */
 
-$var=! $var;
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="action" value="set_PROPOSAL_FREE_TEXT">';
@@ -599,8 +596,14 @@ print "<form method=\"post\" action=\"".$_SERVER["PHP_SELF"]."\">";
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print "<input type=\"hidden\" name=\"action\" value=\"set_PROPALE_DRAFT_WATERMARK\">";
 print '<tr class="oddeven"><td>';
-print $langs->trans("WatermarkOnDraftProposal").'</td><td>';
-print '<input size="50" class="flat" type="text" name="PROPALE_DRAFT_WATERMARK" value="'.$conf->global->PROPALE_DRAFT_WATERMARK.'">';
+$substitutionarray=pdf_getSubstitutionArray($langs);
+$substitutionarray['__(AnyTranslationKey)__']=$langs->trans("Translation");
+$htmltext = '<i>'.$langs->trans("AvailableVariables").':<br>';
+foreach($substitutionarray as $key => $val)	$htmltext.=$key.'<br>';
+$htmltext.='</i>';
+print $form->textwithpicto($langs->trans("WatermarkOnDraftProposal"), $htmltext);
+print '</td><td>';
+print '<input class="flat minwidth200" type="text" name="PROPALE_DRAFT_WATERMARK" value="'.$conf->global->PROPALE_DRAFT_WATERMARK.'">';
 print '</td><td align="right">';
 print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
 print "</td></tr>\n";
diff --git a/htdocs/comm/admin/propal_extrafields.php b/htdocs/comm/admin/propal_extrafields.php
index 784512d6d1e..8d2ecd88277 100644
--- a/htdocs/comm/admin/propal_extrafields.php
+++ b/htdocs/comm/admin/propal_extrafields.php
@@ -69,7 +69,7 @@ print load_fiche_titre($langs->trans("PropalSetup"),$linkback,'title_setup');
 
 $head = propal_admin_prepare_head();
 
-dol_fiche_head($head, 'attributes', $langs->trans("Proposals"), 0, 'propal');
+dol_fiche_head($head, 'attributes', $langs->trans("Proposals"), -1, 'propal');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
diff --git a/htdocs/comm/admin/propaldet_extrafields.php b/htdocs/comm/admin/propaldet_extrafields.php
index 633c4fab581..80f5afdaeed 100644
--- a/htdocs/comm/admin/propaldet_extrafields.php
+++ b/htdocs/comm/admin/propaldet_extrafields.php
@@ -76,7 +76,7 @@ print load_fiche_titre($langs->trans("PropalSetup"),$linkback,'title_setup');
 
 $head = propal_admin_prepare_head();
 
-dol_fiche_head($head, 'attributeslines', $langs->trans("Proposals"), 0, 'propal');
+dol_fiche_head($head, 'attributeslines', $langs->trans("Proposals"), -1, 'propal');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index 13ea930dc5e..7f22898a458 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -57,6 +57,7 @@ $hookmanager->initHooks(array('mailingcard','globalcard'));
 
 // Array of possible substitutions (See also file mailing-send.php that should manage same substitutions)
 $object->substitutionarray=FormMail::getAvailableSubstitKey('emailing');
+$object->substitutionarray['__(AnyTranslationKey)__']=$langs->trans("Translation");
 
 $object->substitutionarrayfortest=array(
     '__ID__' => 'TESTIdRecord',
@@ -72,7 +73,7 @@ $object->substitutionarrayfortest=array(
 	'__SIGNATURE__' => (($user->signature && empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN))?$user->signature:''),
     '__CHECK_READ__' => 'TagCheckMail',
 	'__UNSUBSCRIBE__' => 'TagUnsubscribe'
-	//,'__PERSONALIZED__' => 'TESTPersonalized'	// Not used yet
+		//,'__PERSONALIZED__' => 'TESTPersonalized'	// Not used yet
 );
 
 // List of sending methods
@@ -237,7 +238,7 @@ if (empty($reshook))
 							if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $substitutionarray['__SECUREKEYPAYPAL_CONTRACTLINE__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
 							else $substitutionarray['__SECUREKEYPAYPAL_CONTRACTLINE__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . 'contractline' . $obj->source_id, 2);
 						}
-						$substitutionisok=true;
+						//$substitutionisok=true;
 	                    complete_substitutions_array($substitutionarray, $langs);
 						$newsubject=make_substitutions($subject,$substitutionarray);
 						$newmessage=make_substitutions($message,$substitutionarray);
@@ -266,11 +267,11 @@ if (empty($reshook))
 						{
 							$res=0;
 						}
-						if (! $substitutionisok)
+						/*if (! $substitutionisok)
 						{
 							$mail->error='Some substitution failed';
 							$res=0;
-						}
+						}*/
 
 						// Send mail
 						if ($res)
@@ -754,8 +755,6 @@ else
 
 		$head = emailing_prepare_head($object);
 
-		dol_fiche_head($head, 'card', $langs->trans("Mailing"), 0, 'email');
-
 		// Confirmation back to draft
 		if ($action == 'settodraft')
 		{
@@ -780,6 +779,8 @@ else
 
 		if ($action != 'edit')
 		{
+			dol_fiche_head($head, 'card', $langs->trans("Mailing"), -1, 'email');
+
 			/*
 			 * Mailing en mode visu
 			 */
@@ -842,7 +843,8 @@ else
 			if ($object->statut == 2) $morehtmlright.=' ('.$object->countNbOfTargets('alreadysent').'/'.$object->nbemail.') ';
 			
 			dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', '', '', 0, '', $morehtmlright);
-			
+
+			print '<div class="fichecenter">';
 			print '<div class="underbanner clearboth"></div>';
 			
 			print '<table class="border" width="100%">';
@@ -903,8 +905,10 @@ else
 			print '</table>';
 
 			print "</div>";
+			
+			dol_fiche_end();
 
-
+			
 			// Clone confirmation
 			if ($action == 'clone')
 			{
@@ -1106,7 +1110,9 @@ else
 			/*
 			 * Mailing en mode edition
 			 */
-
+			
+			dol_fiche_head($head, 'card', $langs->trans("Mailing"), -1, 'email');
+			
 			$linkback = '<a href="'.DOL_URL_ROOT.'/comm/mailing/list.php">'.$langs->trans("BackToList").'</a>';
 
 			$morehtmlright='';
@@ -1114,6 +1120,7 @@ else
 			
 			dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', '', '', 0, '', $morehtmlright);
 			
+			print '<div class="fichecenter">';
 			print '<div class="underbanner clearboth"></div>';
 
 			print '<table class="border" width="100%">';
@@ -1132,9 +1139,6 @@ else
 			// To
 			print '<tr><td>'.$langs->trans("MailErrorsTo").'</td><td colspan="3">'.dol_print_email($object->email_errorsto,0,0,0,0,1).'</td></tr>';
 
-			// Status
-			print '<tr><td>'.$langs->trans("Status").'</td><td colspan="3">'.$object->getLibStatut(4).'</td></tr>';
-
 			// Nb of distinct emails
 			print '<tr><td>';
 			print $langs->trans("TotalNbOfDistinctRecipients");
@@ -1160,6 +1164,7 @@ else
 			}
 
 			print '</table>';
+			print '</div>';
 
 			dol_fiche_end();
 
diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index 16f3f4db561..d3642c50393 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -177,7 +177,7 @@ if ($object->fetch($id) >= 0)
 {
 	$head = emailing_prepare_head($object);
 
-	dol_fiche_head($head, 'targets', $langs->trans("Mailing"), 0, 'email');
+	dol_fiche_head($head, 'targets', $langs->trans("Mailing"), -1, 'email');
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/comm/mailing/list.php">'.$langs->trans("BackToList").'</a>';
 
@@ -186,16 +186,11 @@ if ($object->fetch($id) >= 0)
 	
 	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', '', '', 0, '', $morehtmlright);
 
-	
+	print '<div class="fichecenter">';
 	print '<div class="underbanner clearboth"></div>';
 	
 	print '<table class="border" width="100%">';
-/*
-	print '<tr><td class="titlefield">'.$langs->trans("Ref").'</td>';
-	print '<td colspan="3">';
-	print $form->showrefnav($object,'id', $linkback);
-	print '</td></tr>';
-*/
+
 	print '<tr><td class="titlefield">'.$langs->trans("MailTitle").'</td><td colspan="3">'.$object->titre.'</td></tr>';
 
 	print '<tr><td>'.$langs->trans("MailFrom").'</td><td colspan="3">'.dol_print_email($object->email_from,0,0,0,0,1).'</td></tr>';
@@ -204,11 +199,6 @@ if ($object->fetch($id) >= 0)
 	print '<tr><td>'.$langs->trans("MailErrorsTo").'</td><td colspan="3">'.dol_print_email($object->email_errorsto,0,0,0,0,1);
 	print '</td></tr>';
 
-	// Status
-/*	print '<tr><td>'.$langs->trans("Status").'</td><td colspan="3">'.$object->getLibStatut(4);
-	if ($object->statut == 2) print ' ('.$object->countNbOfTargets('alreadysent').'/'.$object->nbemail.')';
-	print '</td></tr>';
-*/
 	// Nb of distinct emails
 	print '<tr><td>';
 	print $langs->trans("TotalNbOfDistinctRecipients");
@@ -229,6 +219,7 @@ if ($object->fetch($id) >= 0)
 
 	print "</div>";
 
+	dol_fiche_end();
 	
 
 	$allowaddtarget=($object->statut == 0);
@@ -256,8 +247,8 @@ if ($object->fetch($id) >= 0)
 		
 		clearstatcache();
 
-		$var=true;
-
+		$var = true;
+		
 		foreach ($modulesdir as $dir)
 		{
 		    $modulenames=array();
@@ -316,7 +307,7 @@ if ($object->fetch($id) >= 0)
 
 					if ($allowaddtarget)
 					{
-						print '<form '.$bctag[$var].' name="'.$modulename.'" action="'.$_SERVER['PHP_SELF'].'?action=add&id='.$object->id.'&module='.$modulename.'" method="POST" enctype="multipart/form-data">';
+						print '<form aa '.$bctag[$var].' name="'.$modulename.'" action="'.$_SERVER['PHP_SELF'].'?action=add&id='.$object->id.'&module='.$modulename.'" method="POST" enctype="multipart/form-data">';
 						print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 					}
 					else
@@ -514,7 +505,6 @@ if ($object->fetch($id) >= 0)
 		print '</td>';
 		print '</tr>';
 
-		$var = true;
 		$i = 0;
 
 		if ($num)
@@ -523,8 +513,6 @@ if ($object->fetch($id) >= 0)
 			{
 				$obj = $db->fetch_object($resql);
 
-				
-
 				print '<tr class="oddeven">';
 				print '<td>'.$obj->email.'</td>';
 				print '<td>'.$obj->lastname.'</td>';
@@ -599,7 +587,7 @@ if ($object->fetch($id) >= 0)
 		{
 			if ($object->statut < 2) 
 			{
-			    print '<tr '.$bc[false].'><td colspan="8" class="opacitymedium">';
+			    print '<tr><td colspan="8" class="opacitymedium">';
     			print $langs->trans("NoTargetYet");
     			print '</td></tr>';
 			}
diff --git a/htdocs/comm/mailing/info.php b/htdocs/comm/mailing/info.php
index 5280fcfad59..ddb0d4a8fc6 100644
--- a/htdocs/comm/mailing/info.php
+++ b/htdocs/comm/mailing/info.php
@@ -27,6 +27,8 @@ require_once DOL_DOCUMENT_ROOT .'/comm/mailing/class/mailing.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/emailing.lib.php';
 
+$id=GETPOST('id');
+
 $langs->load("mails");
 
 // Security check
@@ -45,11 +47,11 @@ $form = new Form($db);
 
 $object = new Mailing($db);
 
-if ($object->fetch($_REQUEST["id"]) >= 0)
+if ($object->fetch($id) >= 0)
 {
 	$head = emailing_prepare_head($object);
 
-	dol_fiche_head($head, 'info', $langs->trans("Mailing"), 0, 'email');
+	dol_fiche_head($head, 'info', $langs->trans("Mailing"), -1, 'email');
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/comm/mailing/list.php">'.$langs->trans("BackToList").'</a>';
 
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 5838bb9bcf3..4b9ced1c4c0 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -359,7 +359,6 @@ class Facture extends CommonInvoice
 			    '__INVOICE_NEXT_YEAR__' => dol_print_date(dol_time_plus_duree($this->date, 1, 'y'), '%Y'),
 			);
 			
-			$substitutionisok=true;
 			complete_substitutions_array($substitutionarray, $outputlangs);
 			
 			$this->note_public=make_substitutions($this->note_public,$substitutionarray);
diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php
index 392ba507036..706807c8f02 100644
--- a/htdocs/compta/facture/fiche-rec.php
+++ b/htdocs/compta/facture/fiche-rec.php
@@ -938,7 +938,8 @@ if ($action == 'create')
 		    '__INVOICE_YEAR__' =>  $langs->trans("PreviousYearOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date($object->date,'%Y').')',
 		    '__INVOICE_NEXT_YEAR__' => $langs->trans("NextYearOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date(dol_time_plus_duree($object->date, 1, 'y'),'%Y').')'
 		);
-
+		$substitutionarray['__(TRANSKEY)__']=$langs->trans("TransKey");
+		
 		$htmltext = '<i>'.$langs->trans("FollowingConstantsWillBeSubstituted").':<br>';
 		foreach($substitutionarray as $key => $val)
 		{
@@ -1241,7 +1242,8 @@ else
 		    '__INVOICE_YEAR__' =>  $langs->trans("PreviousYearOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date($dateexample,'%Y').')',
 		    '__INVOICE_NEXT_YEAR__' => $langs->trans("NextYearOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date(dol_time_plus_duree($dateexample, 1, 'y'),'%Y').')'
 		);
-
+		$substitutionarray['__(TRANSKEY)__']=$langs->trans("TransKey");
+		
 		$htmltext = '<i>'.$langs->trans("FollowingConstantsWillBeSubstituted").':<br>';
 		foreach($substitutionarray as $key => $val)
 		{
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 87039a3d454..d430a8ea53b 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1025,11 +1025,15 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
 	if ($object->element == 'member')    $modulepart='memberphoto';
 	if ($object->element == 'user')      $modulepart='userphoto';
 	if ($object->element == 'product')   $modulepart='product';
-	if ($object->element == 'propal')    $modulepart='propal';
-	if ($object->element == 'commande')  $modulepart='commande';
-	if ($object->element == 'facture')   $modulepart='facture';
-	if ($object->element == 'fichinter') $modulepart='ficheinter';
-	
+	if (class_exists("Imagick"))
+	{
+		if ($object->element == 'propal')    $modulepart='propal';
+		if ($object->element == 'commande')  $modulepart='commande';
+		if ($object->element == 'facture')   $modulepart='facture';
+		if ($object->element == 'fichinter') $modulepart='ficheinter';
+		if ($object->element == 'contrat')   $modulepart='contract';
+	}
+
 	if ($object->element == 'product')
 	{
 	    $width=80; $cssclass='photoref';
@@ -1051,14 +1055,14 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
 	}
 	else
 	{
-        if ($showimage)
+		if ($showimage)
         {
-            if ($modulepart != 'unknown')
+        	if ($modulepart != 'unknown')
             {
                 $phototoshow='';
                 
                 // Check if a preview file is available
-                if (in_array($modulepart, array('propal', 'commande', 'facture', 'ficheinter')) && class_exists("Imagick"))
+                if (in_array($modulepart, array('propal', 'commande', 'facture', 'ficheinter', 'contract')) && class_exists("Imagick"))
                 {
                     $objectref = dol_sanitizeFileName($object->ref);
                     $dir_output = $conf->$modulepart->dir_output . "/";
@@ -1083,7 +1087,7 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
                             $ret = dol_convert_file($file, 'png', $fileimage);
                             if ($ret < 0) $error++;
                         }
-    
+
                         // Si fichier png PDF d'1 page trouve
                         if (file_exists($fileimage))
                         {
@@ -4865,45 +4869,77 @@ function dol_concatdesc($text1,$text2,$forxml=false)
 /**
  *  Make substition into a string replacing key with vals from $substitutionarray (oldval=>newval)
  *
- *  @param	string	$chaine      			Source string in which we must do substitution
- *  @param  array	$substitutionarray		Array with key->val to substitute
- * 	@return string  		    			Output string after subsitutions
+ *  @param	string		$text	      			Source string in which we must do substitution
+ *  @param  array		$substitutionarray		Array with key->val to substitute
+ *  @param	Translate	$outputlangs			Output language
+ * 	@return string  		    				Output string after substitutions
  *  @see	complete_substitutions_array
  */
-function make_substitutions($chaine,$substitutionarray)
+function make_substitutions($text, $substitutionarray, $outputlangs=null)
 {
-	global $conf;
+	global $conf, $langs;
 
 	if (! is_array($substitutionarray)) return 'ErrorBadParameterSubstitutionArrayWhenCalling_make_substitutions';
-
-	// Make substitition
+	
+	if (empty($outputlangs)) $outputlangs=$langs;
+	
+	// Make substitution for language keys
+	if (is_object($outputlangs))
+	{
+		while (preg_match('/__\((.*)\)__/', $text, $reg))
+		{
+			$msgishtml = 0;
+			if (dol_textishtml($text,1)) $msgishtml = 1;
+			$text = preg_replace('/__\('.preg_quote($reg[1]).'\)__/', $msgishtml?dol_htmlentitiesbr($outputlangs->transnoentitiesnoconv($reg[1])):$outputlangs->transnoentitiesnoconv($reg[1]), $text);	
+		}
+	}
+		
+	// Make substitition for array $substitutionarray
 	foreach ($substitutionarray as $key => $value)
 	{
 		if ($key == '__SIGNATURE__' && (! empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN))) $value='';
-		$chaine=str_replace("$key","$value",$chaine);	// We must keep the " to work when value is 123.5 for example
+		$text=str_replace("$key","$value",$text);	// We must keep the " to work when value is 123.5 for example
 	}
 
-	return $chaine;
+	return $text;
 }
 
 /**
  *  Complete the $substitutionarray with more entries
  *
  *  @param  array		$substitutionarray		Array substitution old value => new value value
- *  @param  Translate	$outputlangs            If we want substitution from special constants, we provide a language
- *  @param  object		$object                 If we want substitution from special constants, we provide data in a source object
- *  @param  Mixed		$parameters       		Add more parameters (useful to pass product lines)
+ *  @param  Translate	$outputlangs            Output language
+ *  @param  Object		$object                 Source object
+ *  @param  mixed		$parameters       		Add more parameters (useful to pass product lines)
  *  @param  string      $callfunc               What is the name of the custom function that will be called? (default: completesubstitutionarray)
  *  @return	void
  *  @see 	make_substitutions
  */
-function complete_substitutions_array(&$substitutionarray,$outputlangs,$object='',$parameters=null,$callfunc="completesubstitutionarray")
+function complete_substitutions_array(&$substitutionarray, $outputlangs, $object=null, $parameters=null, $callfunc="completesubstitutionarray")
 {
 	global $conf,$user;
 
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-	// Check if there is external substitution to do asked by plugins
+	// Add a substitution key for each object property
+	if (is_object($object))
+	{
+		// TODO
+	}
+	
+	// Add a substitution key for each extrafields, using key __EXTRA_XXX__
+	if (is_object($object) && is_array($object->array_options))
+	{
+		foreach($object->array_options as $key => $val)
+		{
+			$keyshort=preg_replace('/^(options|extra)_/','',$key);
+			$substitutionarray['__EXTRA_'.$keyshort.'__']=$val;
+			// For backward compatibiliy
+			$substitutionarray['%EXTRA_'.$keyshort.'%']=$val;
+		}
+	}
+	
+	// Check if there is external substitution to do, requested by plugins
 	$dirsubstitutions=array_merge(array(),(array) $conf->modules_parts['substitutions']);
 
 	foreach($dirsubstitutions as $reldir)
diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index 6855cef5f1a..282bdec690e 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -586,6 +586,29 @@ function pdf_pagehead(&$pdf,$outputlangs,$page_height)
 	}
 }
 
+
+/**
+ *   	Return array of possible substitutions
+ *
+ *		@param	Translate	$outputlangs	Output language
+ *      @return	array						Array of substitutions
+ */
+function pdf_getSubstitutionArray($outputlangs)
+{
+	global $conf, $mysoc, $user;
+	$substitutionarray=array(
+		'__MYCOMPANY_NAME__' => $mysoc->name,
+		'__MYCOMPANY_EMAIL__' => $mysoc->email,
+		'__USER_ID__' => $user->id,
+		'__USER_LOGIN__' => $user->login,
+		'__USER_LASTNAME__' => $user->lastname,
+		'__USER_FIRSTNAME__' => $user->firstname,
+		'__USER_FULLNAME__' => $user->getFullName($outputlangs)
+	);
+	return $substitutionarray;
+}
+
+
 /**
  *      Add a draft watermark on PDF files
  *
@@ -599,12 +622,20 @@ function pdf_pagehead(&$pdf,$outputlangs,$page_height)
  */
 function pdf_watermark(&$pdf, $outputlangs, $h, $w, $unit, $text)
 {
+	global $langs, $mysoc, $user;
+	
 	// Print Draft Watermark
 	if ($unit=='pt') $k=1;
 	elseif ($unit=='mm') $k=72/25.4;
 	elseif ($unit=='cm') $k=72/2.54;
 	elseif ($unit=='in') $k=72;
 
+	// Make substitution
+	$substitutionarray=pdf_getSubstitutionArray($outputlangs);
+	complete_substitutions_array($substitutionarray,$outputlangs,$object);
+	$text=make_substitutions($text,$substitutionarray,$outputlangs);
+	$text=$outputlangs->convToOutputCharset($text);
+	
 	$savx=$pdf->getX(); $savy=$pdf->getY();
 
 	$watermark_angle=atan($h/$w)/2;
@@ -819,7 +850,7 @@ function pdf_bank(&$pdf,$outputlangs,$curx,$cury,$account,$onlynumber=0,$default
  */
 function pdf_pagefoot(&$pdf,$outputlangs,$paramfreetext,$fromcompany,$marge_basse,$marge_gauche,$page_hauteur,$object,$showdetails=0,$hidefreetext=0)
 {
-	global $conf,$user;
+	global $conf,$user,$mysoc;
 
 	$outputlangs->load("dict");
 	$line='';
@@ -829,16 +860,15 @@ function pdf_pagefoot(&$pdf,$outputlangs,$paramfreetext,$fromcompany,$marge_bass
 	// Line of free text
 	if (empty($hidefreetext) && ! empty($conf->global->$paramfreetext))
 	{
-		// Make substitution
-		$substitutionarray=array(
-			'__FROM_NAME__' => $fromcompany->name,
-			'__FROM_EMAIL__' => $fromcompany->email,
-			'__TOTAL_TTC__' => $object->total_ttc,
-			'__TOTAL_HT__' => $object->total_ht,
-			'__TOTAL_VAT__' => $object->total_vat
-		);
+		$substitutionarray=pdf_getSubstitutionArray($outputlangs);
+		// More substitution keys
+		$substitutionarray['__FROM_NAME__']=$fromcompany->name;
+		$substitutionarray['__FROM_EMAIL__']=$fromcompany->email;
+		$substitutionarray['__TOTAL_TTC__']=$object->total_ttc;
+		$substitutionarray['__TOTAL_HT__']=$object->total_ht;
+		$substitutionarray['__TOTAL_VAT__']=$object->total_vat;
 		complete_substitutions_array($substitutionarray,$outputlangs,$object);
-		$newfreetext=make_substitutions($conf->global->$paramfreetext,$substitutionarray);
+		$newfreetext=make_substitutions($conf->global->$paramfreetext,$substitutionarray,$outputlangs);
 		$line.=$outputlangs->convToOutputCharset($newfreetext);
 	}
 
diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
index 9ee00df696e..693dd2e412f 100644
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -1499,7 +1499,7 @@ class pdf_crabe extends ModelePDFFactures
 		pdf_pagehead($pdf,$outputlangs,$this->page_hauteur);
 
 		// Show Draft Watermark
-		if($object->statut==0 && (! empty($conf->global->FACTURE_DRAFT_WATERMARK)) )
+		if($object->statut==Facture::STATUS_DRAFT && (! empty($conf->global->FACTURE_DRAFT_WATERMARK)) )
         {
 		      pdf_watermark($pdf,$outputlangs,$this->page_hauteur,$this->page_largeur,'mm',$conf->global->FACTURE_DRAFT_WATERMARK);
         }
@@ -1553,7 +1553,13 @@ class pdf_crabe extends ModelePDFFactures
 		$posy+=5;
 		$pdf->SetXY($posx,$posy);
 		$pdf->SetTextColor(0,0,60);
-		$pdf->MultiCell($w, 4, $outputlangs->transnoentities("Ref")." : " . $outputlangs->convToOutputCharset($object->ref), '', 'R');
+		$textref=$outputlangs->transnoentities("Ref")." : " . $outputlangs->convToOutputCharset($object->ref);
+		if ($object->statut == Facture::STATUS_DRAFT) 
+		{
+			$pdf->SetTextColor(128,0,0);
+			$textref.=' - '.$outputlangs->trans("NotValidated");
+		}
+		$pdf->MultiCell($w, 4, $textref, '', 'R');
 
 		$posy+=1;
 		$pdf->SetFont('','', $default_font_size - 2);
diff --git a/htdocs/core/modules/modCommande.class.php b/htdocs/core/modules/modCommande.class.php
index 810bc7f3364..f9c10eef6de 100644
--- a/htdocs/core/modules/modCommande.class.php
+++ b/htdocs/core/modules/modCommande.class.php
@@ -98,6 +98,13 @@ class modCommande extends DolibarrModules
 		$this->const[$r][3] = "";
 		$this->const[$r][4] = 0;
 
+		/*$r++;
+		$this->const[$r][0] = "COMMANDE_DRAFT_WATERMARK";
+		$this->const[$r][1] = "chaine";
+		$this->const[$r][2] = "__(Draft)__";
+		$this->const[$r][3] = 'Watermark to show on draft orders';
+		$this->const[$r][4] = 0;*/
+		
 		// Boxes
 		$this->boxes = array(
 			0=>array('file'=>'box_commandes.php','enabledbydefaulton'=>'Home'),
diff --git a/htdocs/core/modules/modFacture.class.php b/htdocs/core/modules/modFacture.class.php
index 8022b21279f..148dd965abb 100644
--- a/htdocs/core/modules/modFacture.class.php
+++ b/htdocs/core/modules/modFacture.class.php
@@ -100,6 +100,13 @@ class modFacture extends DolibarrModules
 		$this->const[$r][4] = 0;
 		$r++;
 		
+		/*$this->const[$r][0] = "FACTURE_DRAFT_WATERMARK";
+		$this->const[$r][1] = "chaine";
+		$this->const[$r][2] = "__(Draft)__";
+		$this->const[$r][3] = 'Watermark to show on draft invoices';
+		$this->const[$r][4] = 0;
+		$r++;*/
+
 		
 		// Boxes
 		//$this->boxes = array(0=>array(1=>'box_factures_imp.php'),1=>array(1=>'box_factures.php'));
diff --git a/htdocs/core/modules/modPropale.class.php b/htdocs/core/modules/modPropale.class.php
index fe520e00925..ce23e996e0a 100644
--- a/htdocs/core/modules/modPropale.class.php
+++ b/htdocs/core/modules/modPropale.class.php
@@ -100,7 +100,14 @@ class modPropale extends DolibarrModules
 		$this->const[$r][2] = "DOL_DATA_ROOT/doctemplates/proposals";
 		$this->const[$r][3] = "";
 		$this->const[$r][4] = 0;
-
+		$r++;
+		
+		/*$this->const[$r][0] = "PROPALE_DRAFT_WATERMARK";
+		$this->const[$r][2] = "__(Draft)__";
+		$this->const[$r][3] = 'Watermark to show on draft proposals';
+		$this->const[$r][4] = 0;
+		$r++;*/
+				
 		// Boxes
 		$this->boxes = array(
            	0=>array('file'=>'box_graph_propales_permonth.php','enabledbydefaulton'=>'Home'),
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 73c34f7101e..71788071a2d 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -153,6 +153,7 @@ Edit=Edit
 Validate=Validate
 ValidateAndApprove=Validate and Approve
 ToValidate=To validate
+NotValidated=Not validated
 Save=Save
 SaveAs=Save As
 TestConnection=Test connection
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index f5acdeac02b..72a5f39e02c 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -849,7 +849,7 @@ if (! defined('NOREQUIRETRAN'))
 $bc=array(0=>'class="impair"',1=>'class="pair"');
 $bcdd=array(0=>'class="drag drop oddeven"',1=>'class="drag drop oddeven"');
 $bcnd=array(0=>'class="nodrag nodrop nohover"',1=>'class="nodrag nodrop nohoverpair"');		// Used for tr to add new lines
-$bctag=array(0=>'class="tagtr"',1=>'class="pair tagtr"');
+$bctag=array(0=>'class="impair tagtr"',1=>'class="pair tagtr"');
 
 // Define messages variables
 $mesg=''; $warning=''; $error=0;
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 971a4d2ed40..5c7f1f446ae 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -2501,21 +2501,20 @@ div.pagination li.paginationafterarrows {
 
 
 /* Set the color for hover lines */
-.oddeven:hover, .odd:hover, .impair:hover, .even:hover, .pair:hover, .even:hover, .pair:hover,
-table.dataTable tr.even:hover, table.dataTable tr.odd:hover
+.oddeven:hover, .evenodd:hover, .impair:hover, .pair:hover
 {
 <?php if ($colorbacklinepairhover) { ?>
 	background: rgb(<?php echo $colorbacklinepairhover; ?>) !important;		/* Must be background to be stronger than background of odd or even */
 <?php } ?>
 }
 
-.oddeven, .odd, .impair, .nohover .odd:hover, .nohover .impair:hover, tr.odd td.nohover, tr.impair td.nohover
+.oddeven, .evenodd, .impair, .nohover .impair:hover, tr.impair td.nohover
 {
 	font-family: <?php print $fontlist ?>;
 	margin-bottom: 1px;
 	color: #202020;
 }
-.odd, .impair, .nohover .odd:hover, .nohover .impair:hover, tr.odd td.nohover, tr.impair td.nohover
+.impair, .nohover .impair:hover, tr.impair td.nohover
 {
 	background: #<?php echo colorArrayToHex(colorStringToArray($colorbacklineimpair1)); ?>;
 }
@@ -2523,16 +2522,16 @@ table.dataTable tr.even:hover, table.dataTable tr.odd:hover
 	background-color: #<?php echo colorArrayToHex(colorStringToArray($colorbacklineimpair1)); ?>;
 }
 
-.oddeven, .even, .pair, .nohover .even:hover, .nohover .pair:hover, tr.even td.nohover, tr.pair td.nohover {
+.oddeven, .evenodd, .pair, .nohover .pair:hover, tr.pair td.nohover {
 	font-family: <?php print $fontlist ?>;
 	margin-bottom: 1px;
 	color: #202020;
 }
-.even, .pair, .nohover .even:hover, .nohover .pair:hover, tr.even td.nohover, tr.pair td.nohover {
+.pair, .nohover .pair:hover, tr.pair td.nohover {
 	background-color: #<?php echo colorArrayToHex(colorStringToArray($colorbacklinepair1)); ?>;
 }
 
-table.dataTable tr.odd, table.dataTable tr.oddeven {
+table.dataTable tr.oddeven {
 	background-color: #<?php echo colorArrayToHex(colorStringToArray($colorbacklinepair1)); ?> !important;
 }
 
@@ -2541,7 +2540,7 @@ td.oddeven, table.nohover tr.impair, table.nohover tr.pair, table.nohover tr.imp
 	background-color: #<?php echo colorArrayToHex(colorStringToArray($colorbacklineimpair1)); ?> !important;
 	background: #<?php echo colorArrayToHex(colorStringToArray($colorbacklineimpair1)); ?> !important;
 }
-tr.nohoverpair td {
+td.evenodd, tr.nohoverpair td {
 	background-color: #<?php echo colorArrayToHex(colorStringToArray($colorbacklinepair1)); ?> !important;
 	background: #<?php echo colorArrayToHex(colorStringToArray($colorbacklinepair1)); ?> !important;
 }
@@ -2550,17 +2549,17 @@ tr.nohoverpair td {
 table.dataTable td {
     padding: 5px 2px 5px 3px !important;
 }
-tr.even td, tr.pair td, tr.odd td, tr.impair td, form.odd div.tagtd, form.impair div.tagtd, form.pair div.tagtd, div.impair div.tagtd, div.pair div.tagtd, div.liste_titre div.tagtd {
+tr.pair td, tr.impair td, form.impair div.tagtd, form.pair div.tagtd, div.impair div.tagtd, div.pair div.tagtd, div.liste_titre div.tagtd {
     padding: 7px 2px 7px 3px;
     border-bottom: 1px solid #ddd;
 }
 form.pair, form.impair {
 	font-weight: normal;
 }
-form.tagtr:last-of-type div.tagtd, tr.even:last-of-type td, tr.pair:last-of-type td, tr.odd:last-of-type td, tr.impair:last-of-type td {
+form.tagtr:last-of-type div.tagtd, tr.pair:last-of-type td, tr.impair:last-of-type td {
     border-bottom: 0px !important;
 }
-tr.even td .nobordernopadding tr td, tr.pair td .nobordernopadding tr td, tr.impair td .nobordernopadding tr td, tr.odd td .nobordernopadding tr td {
+tr.pair td .nobordernopadding tr td, tr.impair td .nobordernopadding tr td {
     border-bottom: 0px !important;
 }
 td.nobottom, td.nobottom {
@@ -2620,6 +2619,7 @@ tr.liste_titre th, th.liste_titre, tr.liste_titre td, td.liste_titre, form.liste
     font-family: <?php print $fontlist ?>;
     font-weight: <?php echo $useboldtitle?'bold':'normal'; ?>;
     vertical-align: middle;
+    height: 24px;
 }
 tr.liste_titre th a, th.liste_titre a, tr.liste_titre td a, td.liste_titre a, form.liste_titre div a, div.liste_titre a {
 	text-shadow: none !important;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 27c4713742a..8cc95628561 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -2596,21 +2596,21 @@ div.pagination li.paginationafterarrows {
 */
 
 /* Set the color for hover lines */
-.oddeven:hover, .odd:hover, .impair:hover, .even:hover, .pair:hover, .even:hover, .pair:hover, table.dataTable tr.even:hover, table.dataTable tr.odd:hover
+.oddeven:hover, .evenodd:hover, .impair:hover, .pair:hover
 {
 <?php if ($colorbacklinepairhover) { ?>
 	background: rgb(<?php echo $colorbacklinepairhover; ?>) !important;
 <?php } ?>
 }
 
-.oddeven, .odd, .impair, .nohover .odd:hover, .nohover .impair:hover, tr.odd td.nohover, tr.impair td.nohover
+.oddeven, .evenodd, .impair, .nohover .impair:hover, tr.impair td.nohover
 {
 	font-family: <?php print $fontlist ?>;
 	border: 0px;
 	margin-bottom: 1px;
 	color: #202020;
 }
-.odd, .impair, .nohover .odd:hover, .nohover .impair:hover, tr.odd td.nohover, tr.impair td.nohover
+.impair, .nohover .impair:hover, tr.impair td.nohover
 {
 	background: #<?php echo colorArrayToHex(colorStringToArray($colorbacklineimpair1)); ?>;
 }
@@ -2618,15 +2618,15 @@ div.pagination li.paginationafterarrows {
 	background: #<?php echo colorArrayToHex(colorStringToArray($colorbacklineimpair1)); ?>;
 }
 
-.oddeven, .even, .pair, .nohover .even:hover, .nohover .pair:hover, tr.even td.nohover, tr.pair td.nohover {
+.oddeven, .evenodd, .pair, .nohover .pair:hover, tr.pair td.nohover {
 	font-family: <?php print $fontlist ?>;
 	margin-bottom: 1px;
 	color: #202020;
 }
-.even, .pair, .nohover .even:hover, .nohover .pair:hover, tr.even td.nohover, tr.pair td.nohover {
+.pair, .nohover .pair:hover, tr.pair td.nohover {
 	background-color: #<?php echo colorArrayToHex(colorStringToArray($colorbacklinepair1)); ?>;
 }
-table.dataTable tr.odd, table.dataTable tr.oddeven {
+table.dataTable tr.oddeven {
 	background-color: #<?php echo colorArrayToHex(colorStringToArray($colorbacklinepair1)); ?> !important;
 }
 
@@ -2635,7 +2635,7 @@ td.oddeven, table.nohover tr.impair, table.nohover tr.pair, table.nohover tr.imp
 	background-color: #<?php echo colorArrayToHex(colorStringToArray($colorbacklineimpair1)); ?> !important;
 	background: #<?php echo colorArrayToHex(colorStringToArray($colorbacklineimpair1)); ?> !important;
 }
-tr.nohoverpair td {
+td.evenodd, tr.nohoverpair td {
 	background-color: #<?php echo colorArrayToHex(colorStringToArray($colorbacklinepair1)); ?> !important;
 	background: #<?php echo colorArrayToHex(colorStringToArray($colorbacklinepair1)); ?> !important;
 }
@@ -2643,17 +2643,17 @@ tr.nohoverpair td {
 table.dataTable td {
     padding: 5px 2px 5px 3px !important;
 }
-tr.even td, tr.pair td, tr.odd td, tr.impair td, form.odd div.tagtd, form.impair div.tagtd, form.pair div.tagtd, div.impair div.tagtd, div.pair div.tagtd, div.liste_titre div.tagtd {
+tr.pair td, tr.impair td, form.impair div.tagtd, form.pair div.tagtd, div.impair div.tagtd, div.pair div.tagtd, div.liste_titre div.tagtd {
     padding: 5px 2px 5px 3px;
     border-bottom: 1px solid #eee;
 }
 form.pair, form.impair {
 	font-weight: normal;
 }
-tr.even:last-of-type td, tr.pair:last-of-type td, tr.odd:last-of-type td, tr.impair:last-of-type td {
+tr.pair:last-of-type td, tr.impair:last-of-type td {
     border-bottom: 0px !important;
 }
-tr.even td .nobordernopadding tr td, tr.pair td .nobordernopadding tr td, tr.impair td .nobordernopadding tr td, tr.odd td .nobordernopadding tr td {
+tr.pair td .nobordernopadding tr td, tr.impair td .nobordernopadding tr td {
     border-bottom: 0px !important;
 }
 td.nobottom, td.nobottom {
@@ -2726,6 +2726,7 @@ tr.liste_titre th, th.liste_titre, tr.liste_titre td, td.liste_titre, form.liste
     font-family: <?php print $fontlist ?>;
     font-weight: <?php echo $useboldtitle?'bold':'normal'; ?>;
     vertical-align: middle;
+    height: 24px;
 }
 tr.liste_titre th a, th.liste_titre a, tr.liste_titre td a, td.liste_titre a, form.liste_titre div a, div.liste_titre a {
 	text-shadow: none !important;

From 82f9555c6b96fe4298064e1d2584a2c688f6586a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 18 Apr 2017 01:35:58 +0200
Subject: [PATCH 066/505] Translation

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

diff --git a/htdocs/langs/en_US/mails.lang b/htdocs/langs/en_US/mails.lang
index 61dddb46691..1c10623a75b 100644
--- a/htdocs/langs/en_US/mails.lang
+++ b/htdocs/langs/en_US/mails.lang
@@ -35,7 +35,7 @@ MailingStatusSentPartialy=Sent partialy
 MailingStatusSentCompletely=Sent completely
 MailingStatusError=Error
 MailingStatusNotSent=Not sent
-MailSuccessfulySent=Email successfully accepted for delivery (from %s to %s)
+MailSuccessfulySent=Email (from %s to %s) successfully accepted for delivery
 MailingSuccessfullyValidated=EMailing successfully validated
 MailUnsubcribe=Unsubscribe
 MailingStatusNotContact=Don't contact anymore

From 3da0aea1683e41f8bceb5857d254b501804d3c89 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 18 Apr 2017 01:39:06 +0200
Subject: [PATCH 067/505] Prepare code to use different SMTP servers.

---
 htdocs/admin/mails_templates.php      |   4 +-
 htdocs/comm/mailing/card.php          |   4 +-
 htdocs/core/class/CMailFile.class.php | 681 +++++++++++++-------------
 3 files changed, 351 insertions(+), 338 deletions(-)

diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php
index 90949c7980d..f0bf5609adf 100644
--- a/htdocs/admin/mails_templates.php
+++ b/htdocs/admin/mails_templates.php
@@ -27,7 +27,7 @@
  */
 
 /**
- *	    \file       htdocs/admin/dict.php
+ *	    \file       htdocs/admin/mails_templates.php
  *		\ingroup    setup
  *		\brief      Page to administer data tables
  */
@@ -119,12 +119,14 @@ $formmail=new FormMail($db);
 if (empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES))
 {
     $tmp=$formmail->getAvailableSubstitKey('form');
+    $tmp['__(AnyTransKey)__']='__(AnyTransKey)__';
     $helpsubstit = $langs->trans("AvailableVariables").':<br>'.implode('<br>', $tmp);
     $helpsubstitforlines = $langs->trans("AvailableVariables").':<br>'.implode('<br>', $tmp);
 }
 else
 {
     $tmp=$formmail->getAvailableSubstitKey('formwithlines');
+    $tmp['__(AnyTransKey)__']='__(AnyTransKey)__';
     $helpsubstit = $langs->trans("AvailableVariables").':<br>'.implode('<br>', $tmp);
     $tmp=$formmail->getAvailableSubstitKey('formforlines');
     $helpsubstitforlines = $langs->trans("AvailableVariables").':<br>'.implode('<br>', $tmp);
diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index 7f22898a458..fe582d56656 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -787,8 +787,8 @@ else
 			if ($action == 'sendall')
 			{
                 // Define message to recommand from command line
-
-				$sendingmode=$conf->global->MAIN_MAIL_SENDMODE;
+				$sendingmode=$conf->global->EMAILING_MAIL_SENDMODE;
+				if (empty($sendingmode)) $sendingmode=$conf->global->MAIN_MAIL_SENDMODE;
 				if (empty($sendingmode)) $sendingmode='mail';	// If not defined, we use php mail function
 
 				// MAILING_NO_USING_PHPMAIL may be defined or not.
diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php
index 3acdc342284..3da7f3abcf3 100644
--- a/htdocs/core/class/CMailFile.class.php
+++ b/htdocs/core/class/CMailFile.class.php
@@ -31,16 +31,20 @@
 
 /**
  *	Class to send emails (with attachments or not)
- *  Usage: $mailfile = new CMailFile($subject,$sendto,$replyto,$message,$filepath,$mimetype,$filename,$cc,$ccc,$deliveryreceipt,$msgishtml,$errors_to,$css,$trackid);
+ *  Usage: $mailfile = new CMailFile($subject,$sendto,$replyto,$message,$filepath,$mimetype,$filename,$cc,$ccc,$deliveryreceipt,$msgishtml,$errors_to,$css,$trackid,$moreinheader,$sendcontext);
  *         $mailfile->sendfile();
  */
 class CMailFile
 {
+	public $sendcontext;
+	public $sendmode;
+	public $sendsetup;
+	
 	var $subject;      	// Topic:       Subject of email
 	var $addr_from;    	// From:		Label and EMail of sender (must include '<>'). For example '<myemail@example.com>' or 'John Doe <myemail@example.com>' or '<myemail+trackingid@example.com>'). Note that with gmail smtps, value here is forced by google to account (but not the reply-to).
-	                   	// Sender:      Who send the email ("Sender" has sent emails on behalf of "From").
-	                   	//              Use it when the "From" is an email of a domain that is a SPF protected domain, and sending smtp server is not this domain. In such case, add Sender field with an email of the protected domain.
-	                   	// Return-Path: Email where to send bounds.
+	// Sender:      Who send the email ("Sender" has sent emails on behalf of "From").
+	//              Use it when the "From" is an email of a domain that is a SPF protected domain, and sending smtp server is not this domain. In such case, add Sender field with an email of the protected domain.
+	// Return-Path: Email where to send bounds.
 	var $reply_to;		// Reply-To:	Email where to send replies from mailer software (mailer use From if reply-to not defined, Gmail use gmail account if reply-to not defined)
 	var $errors_to;		// Errors-To:	Email where to send errors.
 	var $addr_to;
@@ -77,13 +81,13 @@ class CMailFile
 	var $html_images=array();
 	var $images_encoded=array();
 	var $image_types = array('gif'  => 'image/gif',
-                           'jpg'  => 'image/jpeg',
-                           'jpeg' => 'image/jpeg',
-                           'jpe'  => 'image/jpeg',
-                           'bmp'  => 'image/bmp',
-                           'png'  => 'image/png',
-                           'tif'  => 'image/tiff',
-                           'tiff' => 'image/tiff');
+			'jpg'  => 'image/jpeg',
+			'jpeg' => 'image/jpeg',
+			'jpe'  => 'image/jpeg',
+			'bmp'  => 'image/bmp',
+			'png'  => 'image/png',
+			'tif'  => 'image/tiff',
+			'tiff' => 'image/tiff');
 
 
 	/**
@@ -104,14 +108,22 @@ class CMailFile
 	 *	@param	string	$css                 Css option
 	 *	@param	string	$trackid             Tracking string (contains type and id of related element)
 	 *  @param  string  $moreinheader        More in header. $moreinheader must contains the "\r\n" (TODO not supported for other MAIL_SEND_MODE different than 'phpmail' and 'smtps' for the moment)
-	 *  @param  string  $sendingcontext      'standard', 'emailing', ...
+	 *  @param  string  $sendcontext      	 'standard', 'emailing', ...
 	 */
-	function __construct($subject,$to,$from,$msg,$filename_list=array(),$mimetype_list=array(),$mimefilename_list=array(),$addr_cc="",$addr_bcc="",$deliveryreceipt=0,$msgishtml=0,$errors_to='',$css='',$trackid='',$moreinheader='',$sendingcontext='standard')
+	function __construct($subject,$to,$from,$msg,$filename_list=array(),$mimetype_list=array(),$mimefilename_list=array(),$addr_cc="",$addr_bcc="",$deliveryreceipt=0,$msgishtml=0,$errors_to='',$css='',$trackid='',$moreinheader='',$sendcontext='standard')
 	{
 		global $conf, $dolibarr_main_data_root;
 
-		$this->sendingcontext = $sendingcontext;
+		$this->sendcontext = $sendcontext;
 		
+		$this->sendmode = '';
+		if ($this->sendcontext == 'emailing') $this->sendmode = $conf->global->EMAILING_MAIL_SENDMODE;	
+		if (empty($this->sendmode)) $this->sendmode=$conf->global->MAIN_MAIL_SENDMODE;
+		if (empty($this->sendmode)) $this->sendmode='mail';
+		
+		$this->sendsetup = array();
+		
+
 		// We define end of line (RFC 821).
 		$this->eol="\r\n";
 		// We define end of line for header fields (RFC 822bis section 2.3 says header must contains \r\n).
@@ -132,17 +144,14 @@ class CMailFile
 		// On defini alternative_boundary
 		$this->alternative_boundary = 'mul_'.dol_hash(uniqid("dolibarr3"), 3);	// Force md5 hash (does not contains special chars)
 
-		// If ending method not defined
-		if (empty($conf->global->MAIN_MAIL_SENDMODE)) $conf->global->MAIN_MAIL_SENDMODE='mail';
-
-		dol_syslog("CMailFile::CMailfile: MAIN_MAIL_SENDMODE=".$conf->global->MAIN_MAIL_SENDMODE." charset=".$conf->file->character_set_client." from=$from, to=$to, addr_cc=$addr_cc, addr_bcc=$addr_bcc, errors_to=$errors_to, trackid=$trackid sendingcontext=$sendingcontext", LOG_DEBUG);
+		dol_syslog("CMailFile::CMailfile: sendmode=".$this->sendmode." charset=".$conf->file->character_set_client." from=$from, to=$to, addr_cc=$addr_cc, addr_bcc=$addr_bcc, errors_to=$errors_to, trackid=$trackid sendcontext=$sendcontext", LOG_DEBUG);
 		dol_syslog("CMailFile::CMailfile: subject=$subject, deliveryreceipt=$deliveryreceipt, msgishtml=$msgishtml", LOG_DEBUG);
 
 		if (empty($subject))
 		{
-            dol_syslog("CMailFile::CMailfile: Try to send an email with empty subject");
-            $this->error='ErrorSubjectIsRequired';
-            return;
+			dol_syslog("CMailFile::CMailfile: Try to send an email with empty subject");
+			$this->error='ErrorSubjectIsRequired';
+			return;
 		}
 
 		// Detect if message is HTML (use fast method)
@@ -163,11 +172,11 @@ class CMailFile
 		{
 			$this->html = $msg;
 
-            if (! empty($conf->global->MAIN_MAIL_ADD_INLINE_IMAGES_IF_IN_MEDIAS))
-            {
-                $findimg = $this->findHtmlImages($dolibarr_main_data_root.'/medias');
-            }
-            
+			if (! empty($conf->global->MAIN_MAIL_ADD_INLINE_IMAGES_IF_IN_MEDIAS))
+			{
+				$findimg = $this->findHtmlImages($dolibarr_main_data_root.'/medias');
+			}
+
 			// Define if there is at least one file
 			if ($findimg)
 			{
@@ -196,7 +205,7 @@ class CMailFile
 		if (! empty($conf->global->MAIN_MAIL_AUTOCOPY_TO)) $addr_bcc.=($addr_bcc?', ':'').$conf->global->MAIN_MAIL_AUTOCOPY_TO;
 
 		// Action according to choosed sending method
-		if ($conf->global->MAIN_MAIL_SENDMODE == 'mail')
+		if ($this->sendmode == 'mail')
 		{
 			// Use mail php function (default PHP method)
 			// ------------------------------------------
@@ -216,9 +225,9 @@ class CMailFile
 			$this->addr_bcc = $addr_bcc;
 			$this->deliveryreceipt = $deliveryreceipt;
 			$this->trackid = $trackid;
-			
+				
 			$smtp_headers = $this->write_smtpheaders();
-            if (! empty($moreinheader)) $smtp_headers.=$moreinheader;   // $moreinheader contains the \r\n
+			if (! empty($moreinheader)) $smtp_headers.=$moreinheader;   // $moreinheader contains the \r\n
 
 			// Define mime_headers
 			$mime_headers = $this->write_mimeheaders($filename_list, $mimefilename_list);
@@ -254,7 +263,7 @@ class CMailFile
 			$this->message.= $text_body . $files_encoded;
 			$this->message.= "--" . $this->mixed_boundary . "--" . $this->eol;
 		}
-		else if ($conf->global->MAIN_MAIL_SENDMODE == 'smtps')
+		else if ($this->sendmode == 'smtps')
 		{
 			// Use SMTPS library
 			// ------------------------------------------
@@ -310,7 +319,7 @@ class CMailFile
 			$this->smtps=$smtps;
 		}
 		// TODO not stable, in progress
-		else if ($conf->global->MAIN_MAIL_SENDMODE == 'phpmailer')
+		else if ($this->sendmode == 'phpmailer')
 		{
 			// Use PHPMailer library
 			// ------------------------------------------
@@ -325,7 +334,7 @@ class CMailFile
 			$this->phpmailer->SetReplyTo($this->getValidAddress($from,0,1));   // Set property with this->phpmailer->setReplyTo after constructor if you want to use another value than the From
 			// TODO Add trackid into smtp header
 			// TODO if (! empty($moreinheader)) ...
-					
+				
 			if (! empty($this->html))
 			{
 				if (!empty($css))
@@ -362,94 +371,94 @@ class CMailFile
 			$this->phpmailer->setErrorsTo($errors_to);
 			$this->phpmailer->setDeliveryReceipt($deliveryreceipt);
 		}
-        else if ($conf->global->MAIN_MAIL_SENDMODE == 'swiftmailer')
-        {
-            // Use Swift Mailer library
-            // ------------------------------------------
-            
-            $host = dol_getprefix('email');
-            
-            require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/lib/swift_required.php';
-            // Create the message
-            $this->message = Swift_Message::newInstance();
+		else if ($this->sendmode == 'swiftmailer')
+		{
+			// Use Swift Mailer library
+			// ------------------------------------------
 
-            // Adding a trackid header to a message
-            $headers = $this->message->getHeaders();
-            $headers->addTextHeader('X-Dolibarr-TRACKID', $trackid);
-            $headerID = time() . '.swiftmailer-dolibarr-' . $trackid . '@' . $host;
-            $msgid = $headers->get('Message-ID');
-            $msgid->setId($headerID);
-            $headers->addIdHeader('References', $headerID);
-            // TODO if (! empty($moreinheader)) ...
-            
-            // Give the message a subject
-            $this->message->setSubject($this->encodetorfc2822($subject));
+			$host = dol_getprefix('email');
 
-            // Set the From address with an associative array
-            //$this->message->setFrom(array('john@doe.com' => 'John Doe'));
-            if (! empty($from)) $this->message->setFrom($this->getArrayAddress($from));
+			require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/lib/swift_required.php';
+			// Create the message
+			$this->message = Swift_Message::newInstance();
 
-            // Set the To addresses with an associative array
-            if (! empty($to)) $this->message->setTo($this->getArrayAddress($to));
+			// Adding a trackid header to a message
+			$headers = $this->message->getHeaders();
+			$headers->addTextHeader('X-Dolibarr-TRACKID', $trackid);
+			$headerID = time() . '.swiftmailer-dolibarr-' . $trackid . '@' . $host;
+			$msgid = $headers->get('Message-ID');
+			$msgid->setId($headerID);
+			$headers->addIdHeader('References', $headerID);
+			// TODO if (! empty($moreinheader)) ...
 
-            if (! empty($from)) $this->message->SetReplyTo($this->getArrayAddress($from));
+			// Give the message a subject
+			$this->message->setSubject($this->encodetorfc2822($subject));
 
-            $this->message->setCharSet($conf->file->character_set_client);
+			// Set the From address with an associative array
+			//$this->message->setFrom(array('john@doe.com' => 'John Doe'));
+			if (! empty($from)) $this->message->setFrom($this->getArrayAddress($from));
 
-            if (! empty($this->html))
-            {
-                if (!empty($css))
-                {
-                    $this->css = $css;
-                    $this->buildCSS();
-                }
-                $msg = $this->html;
-                $msg = $this->checkIfHTML($msg);
-            }
+			// Set the To addresses with an associative array
+			if (! empty($to)) $this->message->setTo($this->getArrayAddress($to));
 
-            if ($this->atleastoneimage)
-            {
-                foreach ($this->images_encoded as $img)
-                {
-                    //$img['fullpath'],$img['image_encoded'],$img['name'],$img['content_type'],$img['cid']
-                    $attachment = Swift_Image::fromPath($img['fullpath'], $img['content_type']);
-                    // embed image
-                    $imgcid = $this->message->embed($attachment);
-                    // replace cid by the one created by swiftmail in html message
-                    $msg = str_replace("cid:".$img['cid'], $imgcid, $msg);
-                }
-            }
+			if (! empty($from)) $this->message->SetReplyTo($this->getArrayAddress($from));
 
-            if ($this->msgishtml) {
-                $this->message->setBody($msg,'text/html');
-                // And optionally an alternative body
-                //$this->message->addPart('Here is the message itself', 'text/plain');
-            } else {
-                $this->message->setBody($msg,'text/plain');
-                // And optionally an alternative body
-                //$this->message->addPart('<q>Here is the message itself</q>', 'text/html');
-            }
+			$this->message->setCharSet($conf->file->character_set_client);
 
-            if ($this->atleastonefile)
-            {
-                foreach ($filename_list as $i => $val)
-                {
-                    //$this->message->attach(Swift_Attachment::fromPath($filename_list[$i],$mimetype_list[$i]));
-                    $attachment = Swift_Attachment::fromPath($filename_list[$i],$mimetype_list[$i]);
-                    $this->message->attach($attachment);
-                }
-            }
+			if (! empty($this->html))
+			{
+				if (!empty($css))
+				{
+					$this->css = $css;
+					$this->buildCSS();
+				}
+				$msg = $this->html;
+				$msg = $this->checkIfHTML($msg);
+			}
 
-            if (! empty($addr_cc)) $this->message->setCc($this->getArrayAddress($addr_cc));
-            if (! empty($addr_bcc)) $this->message->setBcc($this->getArrayAddress($addr_bcc));
-            //if (! empty($errors_to)) $this->message->setErrorsTo($this->getArrayAddress($errors_to);
-            if (isset($this->deliveryreceipt) && $this->deliveryreceipt == 1) $this->message->setReadReceiptTo($this->getArrayAddress($from));
-        }
+			if ($this->atleastoneimage)
+			{
+				foreach ($this->images_encoded as $img)
+				{
+					//$img['fullpath'],$img['image_encoded'],$img['name'],$img['content_type'],$img['cid']
+					$attachment = Swift_Image::fromPath($img['fullpath'], $img['content_type']);
+					// embed image
+					$imgcid = $this->message->embed($attachment);
+					// replace cid by the one created by swiftmail in html message
+					$msg = str_replace("cid:".$img['cid'], $imgcid, $msg);
+				}
+			}
+
+			if ($this->msgishtml) {
+				$this->message->setBody($msg,'text/html');
+				// And optionally an alternative body
+				//$this->message->addPart('Here is the message itself', 'text/plain');
+			} else {
+				$this->message->setBody($msg,'text/plain');
+				// And optionally an alternative body
+				//$this->message->addPart('<q>Here is the message itself</q>', 'text/html');
+			}
+
+			if ($this->atleastonefile)
+			{
+				foreach ($filename_list as $i => $val)
+				{
+					//$this->message->attach(Swift_Attachment::fromPath($filename_list[$i],$mimetype_list[$i]));
+					$attachment = Swift_Attachment::fromPath($filename_list[$i],$mimetype_list[$i]);
+					$this->message->attach($attachment);
+				}
+			}
+
+			if (! empty($addr_cc)) $this->message->setCc($this->getArrayAddress($addr_cc));
+			if (! empty($addr_bcc)) $this->message->setBcc($this->getArrayAddress($addr_bcc));
+			//if (! empty($errors_to)) $this->message->setErrorsTo($this->getArrayAddress($errors_to);
+			if (isset($this->deliveryreceipt) && $this->deliveryreceipt == 1) $this->message->setReadReceiptTo($this->getArrayAddress($from));
+		}
 		else
 		{
 			// Send mail method not correctly defined
 			// --------------------------------------
-            $this->error = 'Bad value for MAIN_MAIL_SENDMODE constant';
+			$this->error = 'Bad value for sendmode';
 		}
 
 	}
@@ -471,55 +480,55 @@ class CMailFile
 
 		if (empty($conf->global->MAIN_DISABLE_ALL_MAILS))
 		{
-            require_once DOL_DOCUMENT_ROOT . '/core/class/hookmanager.class.php';
-            $hookmanager = new HookManager($db);
-            $hookmanager->initHooks(array(
-                'maildao'
-            ));
-            $reshook = $hookmanager->executeHooks('doactions', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-            if (! empty($reshook))
-            {
-                $this->error = "Error in hook maildao doactions " . $reshook;
-                dol_syslog("CMailFile::sendfile: mail end error=" . $this->error, LOG_ERR);
+			require_once DOL_DOCUMENT_ROOT . '/core/class/hookmanager.class.php';
+			$hookmanager = new HookManager($db);
+			$hookmanager->initHooks(array(
+					'maildao'
+			));
+			$reshook = $hookmanager->executeHooks('doactions', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+			if (! empty($reshook))
+			{
+				$this->error = "Error in hook maildao doactions " . $reshook;
+				dol_syslog("CMailFile::sendfile: mail end error=" . $this->error, LOG_ERR);
 
-                return $reshook;
-            }
+				return $reshook;
+			}
 
-            // Check number of recipient is lower or equal than MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL
-            if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_TO_IN_SAME_EMAIL)) $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_TO_IN_SAME_EMAIL=10;
-            $tmparray1 = explode(',', $this->addr_to);
-            if (count($tmparray1) > $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_TO_IN_SAME_EMAIL)
-            {
-                $this->error = 'Too much recipients in to:';
-                dol_syslog("CMailFile::sendfile: mail end error=" . $this->error, LOG_WARNING);
-                return false;
-            }
-            if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_CC_IN_SAME_EMAIL)) $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_CC_IN_SAME_EMAIL=10;
-            $tmparray2 = explode(',', $this->addr_cc);
-            if (count($tmparray2) > $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_CC_IN_SAME_EMAIL)
-            {
-                $this->error = 'Too much recipients in cc:';
-                dol_syslog("CMailFile::sendfile: mail end error=" . $this->error, LOG_WARNING);
-                return false;
-            }
-            if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_BCC_IN_SAME_EMAIL)) $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_BCC_IN_SAME_EMAIL=10;
-            $tmparray3 = explode(',', $this->addr_bcc);
-            if (count($tmparray3) > $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_BCC_IN_SAME_EMAIL)
-            {
-                $this->error = 'Too much recipients in bcc:';
-                dol_syslog("CMailFile::sendfile: mail end error=" . $this->error, LOG_WARNING);
-                return false;
-            }
-            if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL)) $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL=10;
-            if ((count($tmparray1)+count($tmparray2)+count($tmparray3)) > $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL)
-            {
-                $this->error = 'Too much recipients in to:, cc:, bcc:';
-                dol_syslog("CMailFile::sendfile: mail end error=" . $this->error, LOG_WARNING);
-                return false;
-            }
+			// Check number of recipient is lower or equal than MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL
+			if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_TO_IN_SAME_EMAIL)) $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_TO_IN_SAME_EMAIL=10;
+			$tmparray1 = explode(',', $this->addr_to);
+			if (count($tmparray1) > $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_TO_IN_SAME_EMAIL)
+			{
+				$this->error = 'Too much recipients in to:';
+				dol_syslog("CMailFile::sendfile: mail end error=" . $this->error, LOG_WARNING);
+				return false;
+			}
+			if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_CC_IN_SAME_EMAIL)) $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_CC_IN_SAME_EMAIL=10;
+			$tmparray2 = explode(',', $this->addr_cc);
+			if (count($tmparray2) > $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_CC_IN_SAME_EMAIL)
+			{
+				$this->error = 'Too much recipients in cc:';
+				dol_syslog("CMailFile::sendfile: mail end error=" . $this->error, LOG_WARNING);
+				return false;
+			}
+			if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_BCC_IN_SAME_EMAIL)) $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_BCC_IN_SAME_EMAIL=10;
+			$tmparray3 = explode(',', $this->addr_bcc);
+			if (count($tmparray3) > $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_BCC_IN_SAME_EMAIL)
+			{
+				$this->error = 'Too much recipients in bcc:';
+				dol_syslog("CMailFile::sendfile: mail end error=" . $this->error, LOG_WARNING);
+				return false;
+			}
+			if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL)) $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL=10;
+			if ((count($tmparray1)+count($tmparray2)+count($tmparray3)) > $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL)
+			{
+				$this->error = 'Too much recipients in to:, cc:, bcc:';
+				dol_syslog("CMailFile::sendfile: mail end error=" . $this->error, LOG_WARNING);
+				return false;
+			}
 
 			// Action according to choosed sending method
-			if ($conf->global->MAIN_MAIL_SENDMODE == 'mail')
+			if ($this->sendmode == 'mail')
 			{
 				// Use mail php function (default PHP method)
 				// ------------------------------------------
@@ -555,15 +564,15 @@ class CMailFile
 						// Having this variable not defined may create problems with some other sendmail (option -f required)
 						$additionnalparam .= ($additionnalparam?' ':'').(! empty($conf->global->MAIN_MAIL_ERRORS_TO) ? '-f' . $this->getValidAddress($conf->global->MAIN_MAIL_ERRORS_TO,2) : ($this->addr_from != '' ? '-f' . $this->getValidAddress($this->addr_from,2) : '') );
 					}
-                    if (! empty($conf->global->MAIN_MAIL_SENDMAIL_FORCE_BA))    // To force usage of -ba option. This option tells sendmail to read From: or Sender: to setup sender
-                    {
-                        $additionnalparam .= ($additionnalparam?' ':'').'-ba';
-                    }
+					if (! empty($conf->global->MAIN_MAIL_SENDMAIL_FORCE_BA))    // To force usage of -ba option. This option tells sendmail to read From: or Sender: to setup sender
+					{
+						$additionnalparam .= ($additionnalparam?' ':'').'-ba';
+					}
+
+					if (! empty($conf->global->MAIN_MAIL_SENDMAIL_FORCE_ADDPARAM)) $additionnalparam .= ($additionnalparam?' ':'').'-U '.$additionnalparam; // Use -U to add additionnal params
+
+					dol_syslog("CMailFile::sendfile: mail start HOST=".ini_get('SMTP').", PORT=".ini_get('smtp_port').", additionnal_parameters=".$additionnalparam, LOG_DEBUG);
 
-                    if (! empty($conf->global->MAIN_MAIL_SENDMAIL_FORCE_ADDPARAM)) $additionnalparam .= ($additionnalparam?' ':'').'-U '.$additionnalparam; // Use -U to add additionnal params
-                    
-                    dol_syslog("CMailFile::sendfile: mail start HOST=".ini_get('SMTP').", PORT=".ini_get('smtp_port').", additionnal_parameters=".$additionnalparam, LOG_DEBUG);
-                    
 					$this->message=stripslashes($this->message);
 
 					if (! empty($conf->global->MAIN_MAIL_DEBUG)) $this->dump_mail();
@@ -600,7 +609,7 @@ class CMailFile
 				if (! empty($conf->global->MAIN_MAIL_SMTP_SERVER))	ini_restore('SMTP');
 				if (! empty($conf->global->MAIN_MAIL_SMTP_PORT)) 	ini_restore('smtp_port');
 			}
-			else if ($conf->global->MAIN_MAIL_SENDMODE == 'smtps')
+			else if ($this->sendmode == 'smtps')
 			{
 
 				// Use SMTPS library
@@ -612,25 +621,25 @@ class CMailFile
 				if (empty($conf->global->MAIN_MAIL_SMTP_PORT))   $conf->global->MAIN_MAIL_SMTP_PORT=ini_get('smtp_port');
 
 				// TODO Manage alternative parameters
-				
+
 				// If we use SSL/TLS
 				$server=$conf->global->MAIN_MAIL_SMTP_SERVER;
 				if (! empty($conf->global->MAIN_MAIL_EMAIL_TLS) && function_exists('openssl_open')) $server='ssl://'.$server;
-                $port=$conf->global->MAIN_MAIL_SMTP_PORT;
-                
+				$port=$conf->global->MAIN_MAIL_SMTP_PORT;
+
 				$this->smtps->setHost($server);
 				$this->smtps->setPort($port); // 25, 465...;
 
 				$loginid=''; $loginpass='';
-				if (! empty($conf->global->MAIN_MAIL_SMTPS_ID)) 
+				if (! empty($conf->global->MAIN_MAIL_SMTPS_ID))
 				{
-				    $loginid = $conf->global->MAIN_MAIL_SMTPS_ID;
-				    $this->smtps->setID($loginid);
+					$loginid = $conf->global->MAIN_MAIL_SMTPS_ID;
+					$this->smtps->setID($loginid);
 				}
-				if (! empty($conf->global->MAIN_MAIL_SMTPS_PW)) 
+				if (! empty($conf->global->MAIN_MAIL_SMTPS_PW))
 				{
-				    $loginpass = $conf->global->MAIN_MAIL_SMTPS_PW;
-				    $this->smtps->setPW($loginpass);
+					$loginpass = $conf->global->MAIN_MAIL_SMTPS_PW;
+					$this->smtps->setPW($loginpass);
 				}
 
 				$res=true;
@@ -652,7 +661,7 @@ class CMailFile
 				if ($res)
 				{
 					if (! empty($conf->global->MAIN_MAIL_DEBUG)) $this->smtps->setDebug(true);
-					
+						
 					$result=$this->smtps->sendMsg();
 					//print $result;
 
@@ -668,63 +677,63 @@ class CMailFile
 					}
 				}
 			}
-            else if ($conf->global->MAIN_MAIL_SENDMODE == 'swiftmailer')
-            {
+			else if ($this->sendmode == 'swiftmailer')
+			{
 
-                // Use Swift Mailer library
-                // ------------------------------------------
-                require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/lib/swift_required.php';
+				// Use Swift Mailer library
+				// ------------------------------------------
+				require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/lib/swift_required.php';
 
-                // Forcage parametres
-                if (empty($conf->global->MAIN_MAIL_SMTP_SERVER)) $conf->global->MAIN_MAIL_SMTP_SERVER=ini_get('SMTP');
-                if (empty($conf->global->MAIN_MAIL_SMTP_PORT))   $conf->global->MAIN_MAIL_SMTP_PORT=ini_get('smtp_port');
+				// Forcage parametres
+				if (empty($conf->global->MAIN_MAIL_SMTP_SERVER)) $conf->global->MAIN_MAIL_SMTP_SERVER=ini_get('SMTP');
+				if (empty($conf->global->MAIN_MAIL_SMTP_PORT))   $conf->global->MAIN_MAIL_SMTP_PORT=ini_get('smtp_port');
 
-                // If we use SSL/TLS
-                $server=$conf->global->MAIN_MAIL_SMTP_SERVER;
-                $secure='';
-                //var_dump(stream_get_transports());
-                if (! empty($conf->global->MAIN_MAIL_EMAIL_TLS) && function_exists('openssl_open')) $secure='ssl';
-                if (! empty($conf->global->MAIN_MAIL_EMAIL_STARTTLS) && function_exists('openssl_open')) $secure='tls';
+				// If we use SSL/TLS
+				$server=$conf->global->MAIN_MAIL_SMTP_SERVER;
+				$secure='';
+				//var_dump(stream_get_transports());
+				if (! empty($conf->global->MAIN_MAIL_EMAIL_TLS) && function_exists('openssl_open')) $secure='ssl';
+				if (! empty($conf->global->MAIN_MAIL_EMAIL_STARTTLS) && function_exists('openssl_open')) $secure='tls';
 
-                $this->transport = Swift_SmtpTransport::newInstance($server, $conf->global->MAIN_MAIL_SMTP_PORT, $secure);
+				$this->transport = Swift_SmtpTransport::newInstance($server, $conf->global->MAIN_MAIL_SMTP_PORT, $secure);
 
-                if (! empty($conf->global->MAIN_MAIL_SMTPS_ID)) $this->transport->setUsername($conf->global->MAIN_MAIL_SMTPS_ID);
-                if (! empty($conf->global->MAIN_MAIL_SMTPS_PW)) $this->transport->setPassword($conf->global->MAIN_MAIL_SMTPS_PW);
-                //$smtps->_msgReplyTo  = 'reply@web.com';
+				if (! empty($conf->global->MAIN_MAIL_SMTPS_ID)) $this->transport->setUsername($conf->global->MAIN_MAIL_SMTPS_ID);
+				if (! empty($conf->global->MAIN_MAIL_SMTPS_PW)) $this->transport->setPassword($conf->global->MAIN_MAIL_SMTPS_PW);
+				//$smtps->_msgReplyTo  = 'reply@web.com';
 
-                // Create the Mailer using your created Transport
-                $this->mailer = Swift_Mailer::newInstance($this->transport);
+				// Create the Mailer using your created Transport
+				$this->mailer = Swift_Mailer::newInstance($this->transport);
 
-                if (! empty($conf->global->MAIN_MAIL_DEBUG)) {
-                    // To use the ArrayLogger
-                    $this->logger = new Swift_Plugins_Loggers_ArrayLogger();
-                    // Or to use the Echo Logger
-                    //$this->logger = new Swift_Plugins_Loggers_EchoLogger();
-                    $this->mailer->registerPlugin(new Swift_Plugins_LoggerPlugin($this->logger));
-                }
-                // send mail
-                try {
-                    $result = $this->mailer->send($this->message);
-                } catch (Exception $e) {
-                    $this->error =  $e->getMessage();
-                }
-                if (! empty($conf->global->MAIN_MAIL_DEBUG)) $this->dump_mail();
+				if (! empty($conf->global->MAIN_MAIL_DEBUG)) {
+					// To use the ArrayLogger
+					$this->logger = new Swift_Plugins_Loggers_ArrayLogger();
+					// Or to use the Echo Logger
+					//$this->logger = new Swift_Plugins_Loggers_EchoLogger();
+					$this->mailer->registerPlugin(new Swift_Plugins_LoggerPlugin($this->logger));
+				}
+				// send mail
+				try {
+					$result = $this->mailer->send($this->message);
+				} catch (Exception $e) {
+					$this->error =  $e->getMessage();
+				}
+				if (! empty($conf->global->MAIN_MAIL_DEBUG)) $this->dump_mail();
 
-                $res = true;
-                if (! empty($this->error) && ! $result) {
-                    dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
-                    $res=false;
-                } else {
-                    $this->error = sprintf ("Sent %d messages\n", $result);
-                }
-            }
+				$res = true;
+				if (! empty($this->error) && ! $result) {
+					dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
+					$res=false;
+				} else {
+					$this->error = sprintf ("Sent %d messages\n", $result);
+				}
+			}
 			else
 			{
 
 				// Send mail method not correctly defined
 				// --------------------------------------
 
-				return 'Bad value for MAIN_MAIL_SENDMODE constant';
+				return 'Bad value for sendmode';
 			}
 
 		}
@@ -792,81 +801,81 @@ class CMailFile
 			$outputfile=$dolibarr_main_data_root."/dolibarr_mail.log";
 			$fp = fopen($outputfile,"w");
 
-			if ($conf->global->MAIN_MAIL_SENDMODE == 'mail')
+			if ($this->sendmode == 'mail')
 			{
 				fputs($fp, $this->headers);
 				fputs($fp, $this->eol);			// This eol is added by the mail function, so we add it in log
 				fputs($fp, $this->message);
 			}
-			elseif ($conf->global->MAIN_MAIL_SENDMODE == 'smtps')
+			elseif ($this->sendmode == 'smtps')
 			{
 				fputs($fp, $this->smtps->log);	// this->smtps->log is filled only if MAIN_MAIL_DEBUG was set to on
 			}
-            elseif ($conf->global->MAIN_MAIL_SENDMODE == 'swiftmailer')
-            {
-                fputs($fp, $this->logger->dump());	// this->logger is filled only if MAIN_MAIL_DEBUG was set to on
-            }
+			elseif ($this->sendmode == 'swiftmailer')
+			{
+				fputs($fp, $this->logger->dump());	// this->logger is filled only if MAIN_MAIL_DEBUG was set to on
+			}
 
 			fclose($fp);
 			if (! empty($conf->global->MAIN_UMASK))
-			@chmod($outputfile, octdec($conf->global->MAIN_UMASK));
+				@chmod($outputfile, octdec($conf->global->MAIN_UMASK));
 		}
 	}
 
 
-    /**
-     * Correct an uncomplete html string
-     *
-     * @param	string	$msg	String
-     * @return	string			Completed string
-     */
-    function checkIfHTML($msg)
-    {
-        if (!preg_match('/^[\s\t]*<html/i',$msg))
-        {
-            $out = "<html><head><title></title>";
-            if (!empty($this->styleCSS)) $out.= $this->styleCSS;
-            $out.= "</head><body";
-            if (!empty($this->bodyCSS)) $out.= $this->bodyCSS;
-            $out.= ">";
-            $out.= $msg;
-            $out.= "</body></html>";
-        }
-        else
-        {
-            $out = $msg;
-        }
+	/**
+	 * Correct an uncomplete html string
+	 *
+	 * @param	string	$msg	String
+	 * @return	string			Completed string
+	 */
+	function checkIfHTML($msg)
+	{
+		if (!preg_match('/^[\s\t]*<html/i',$msg))
+		{
+			$out = "<html><head><title></title>";
+			if (!empty($this->styleCSS)) $out.= $this->styleCSS;
+			$out.= "</head><body";
+			if (!empty($this->bodyCSS)) $out.= $this->bodyCSS;
+			$out.= ">";
+			$out.= $msg;
+			$out.= "</body></html>";
+		}
+		else
+		{
+			$out = $msg;
+		}
 
-        return $out;
-    }
+		return $out;
+	}
 
-    /**
-     * Build a css style (mode = all) into this->styleCSS and this->bodyCSS
-     *
-     * @return css
-     */
-    function buildCSS()
-    {
-        if (! empty($this->css))
-        {
-            // Style CSS
-            $this->styleCSS = '<style type="text/css">';
-            $this->styleCSS.= 'body {';
+	/**
+	 * Build a css style (mode = all) into this->styleCSS and this->bodyCSS
+	 *
+	 * @return css
+	 */
+	function buildCSS()
+	{
+		if (! empty($this->css))
+		{
+			// Style CSS
+			$this->styleCSS = '<style type="text/css">';
+			$this->styleCSS.= 'body {';
 
-            if ($this->css['bgcolor'])
-            {
-                $this->styleCSS.= '  background-color: '.$this->css['bgcolor'].';';
-                $this->bodyCSS.= ' bgcolor="'.$this->css['bgcolor'].'"';
-            }
-            if ($this->css['bgimage'])
-            {
-                // TODO recuperer cid
-                $this->styleCSS.= ' background-image: url("cid:'.$this->css['bgimage_cid'].'");';
-            }
-            $this->styleCSS.= '}';
-            $this->styleCSS.= '</style>';
-        }
-    }
+			if ($this->css['bgcolor'])
+			{
+				$this->styleCSS.= '  background-color: '.$this->css['bgcolor'].';';
+				$this->bodyCSS.= ' bgcolor="'.$this->css['bgcolor'].'"';
+			}
+			if ($this->css['bgimage'])
+			{
+				// TODO recuperer cid
+				$this->styleCSS.= ' background-image: url("cid:'.$this->css['bgimage_cid'].'");';
+			}
+			$this->styleCSS.= '}';
+			$this->styleCSS.= '</style>';
+		}
+	}
 
 
 	/**
@@ -924,7 +933,7 @@ class CMailFile
 
 		$out.= "Content-Type: multipart/mixed; boundary=\"".$this->mixed_boundary."\"".$this->eol2;
 		$out.= "Content-Transfer-Encoding: 8bit".$this->eol2;
-		
+
 		dol_syslog("CMailFile::write_smtpheaders smtp_header=\n".$out);
 		return $out;
 	}
@@ -992,14 +1001,14 @@ class CMailFile
 		{
 			$strContentAltText = html_entity_decode(strip_tags($strContent));
 			$strContentAltText = rtrim(wordwrap($strContentAltText, 75, "\r\n"));
-		    
-		    // Check if html header already in message, if not complete the message
+
+			// Check if html header already in message, if not complete the message
 			$strContent = $this->checkIfHTML($strContent);
 		}
 
 		// Make RFC2045 Compliant, split lines
-        //$strContent = rtrim(chunk_split($strContent));    // Function chunck_split seems ko if not used on a base64 content
-        $strContent = rtrim(wordwrap($strContent));   // TODO Using this method creates unexpected line break on text/plain content.
+		//$strContent = rtrim(chunk_split($strContent));    // Function chunck_split seems ko if not used on a base64 content
+		$strContent = rtrim(wordwrap($strContent));   // TODO Using this method creates unexpected line break on text/plain content.
 
 		if ($this->msgishtml)
 		{
@@ -1012,23 +1021,23 @@ class CMailFile
 				$out.= $this->eol;
 				$out.= "--" . $this->related_boundary . $this->eol;
 			}
-			
+				
 			if (! $this->atleastoneimage && $strContentAltText && ! empty($conf->global->MAIN_MAIL_USE_MULTI_PART))    // Add plain text message part before html part
 			{
 				$out.= "Content-Type: multipart/alternative; boundary=\"".$this->alternative_boundary."\"".$this->eol;
 				$out.= $this->eol;
 				$out.= "--" . $this->alternative_boundary . $this->eol;
 				$out.= "Content-Type: text/plain; charset=".$conf->file->character_set_client.$this->eol;
-			    $out.= $this->eol.$strContentAltText.$this->eol;
-			    $out.= "--" . $this->alternative_boundary . $this->eol;
+				$out.= $this->eol.$strContentAltText.$this->eol;
+				$out.= "--" . $this->alternative_boundary . $this->eol;
 			}
-			
+				
 			$out.= "Content-Type: text/html; charset=".$conf->file->character_set_client.$this->eol;
 			$out.= $this->eol.$strContent.$this->eol;
-		
+
 			if (! $this->atleastoneimage && $strContentAltText && ! empty($conf->global->MAIN_MAIL_USE_MULTI_PART))    // Add plain text message part after html part
 			{
-			    $out.= "--" . $this->alternative_boundary . "--". $this->eol;
+				$out.= "--" . $this->alternative_boundary . "--". $this->eol;
 			}
 		}
 		else
@@ -1042,13 +1051,13 @@ class CMailFile
 		// Encode images
 		if ($this->atleastoneimage)
 		{
-		    $out .= $this->write_images($this->images_encoded);
-		    // always end related and end alternative after inline images
-		    $out .= "--" . $this->related_boundary . "--" . $this->eol;
-		    $out .= $this->eol . "--" . $this->alternative_boundary . "--" . $this->eol;
-		    $out .= $this->eol;
+			$out .= $this->write_images($this->images_encoded);
+			// always end related and end alternative after inline images
+			$out .= "--" . $this->related_boundary . "--" . $this->eol;
+			$out .= $this->eol . "--" . $this->alternative_boundary . "--" . $this->eol;
+			$out .= $this->eol;
 		}
-		
+
 		return $out;
 	}
 
@@ -1074,10 +1083,12 @@ class CMailFile
 				if ($encoded >= 0)
 				{
 					if ($mimefilename_list[$i]) $filename_list[$i] = $mimefilename_list[$i];
-					if (! $mimetype_list[$i]) { $mimetype_list[$i] = "application/octet-stream"; }
+					if (! $mimetype_list[$i]) {
+						$mimetype_list[$i] = "application/octet-stream";
+					}
 
 					$out.= "--" . $this->mixed_boundary . $this->eol;
-                    $out.= "Content-Disposition: attachment; filename=\"".$filename_list[$i]."\"".$this->eol;
+					$out.= "Content-Disposition: attachment; filename=\"".$filename_list[$i]."\"".$this->eol;
 					$out.= "Content-Type: " . $mimetype_list[$i] . "; name=\"".$filename_list[$i]."\"".$this->eol;
 					$out.= "Content-Transfer-Encoding: base64".$this->eol;
 					$out.= "Content-Description: File Attachment".$this->eol;
@@ -1137,25 +1148,25 @@ class CMailFile
 	 */
 	function check_server_port($host,$port)
 	{
-        global $conf;
+		global $conf;
 		$_retVal=0;
 		$timeout=5;	// Timeout in seconds
 
 		if (function_exists('fsockopen'))
 		{
-            // If we use SSL/TLS
-            if (! empty($conf->global->MAIN_MAIL_EMAIL_TLS) && function_exists('openssl_open')) $host='ssl://'.$host;
-            // tls smtp start with no encryption
-            //if (! empty($conf->global->MAIN_MAIL_EMAIL_STARTTLS) && function_exists('openssl_open')) $host='tls://'.$host;
+			// If we use SSL/TLS
+			if (! empty($conf->global->MAIN_MAIL_EMAIL_TLS) && function_exists('openssl_open')) $host='ssl://'.$host;
+			// tls smtp start with no encryption
+			//if (! empty($conf->global->MAIN_MAIL_EMAIL_STARTTLS) && function_exists('openssl_open')) $host='tls://'.$host;
 
 			dol_syslog("Try socket connection to host=".$host." port=".$port);
 			//See if we can connect to the SMTP server
 			if ($socket = @fsockopen(
-			    $host,       // Host to test, IP or domain. Add ssl:// for SSL/TLS.
-			    $port,       // which Port number to use
-			    $errno,      // actual system level error
-			    $errstr,     // and any text that goes with the error
-			    $timeout
+					$host,       // Host to test, IP or domain. Add ssl:// for SSL/TLS.
+					$port,       // which Port number to use
+					$errno,      // actual system level error
+					$errstr,     // and any text that goes with the error
+					$timeout
 			))  // timeout for reading/writing data over the socket
 			{
 				// Windows still does not have support for this timeout function
@@ -1225,7 +1236,7 @@ class CMailFile
 			foreach ($matches[1] as $full)
 			{
 
-                if (preg_match('/file=([A-Za-z0-9_\-\/]+[\.]?[A-Za-z0-9]+)?$/i',$full,$regs))   // If xxx is 'file=aaa'
+				if (preg_match('/file=([A-Za-z0-9_\-\/]+[\.]?[A-Za-z0-9]+)?$/i',$full,$regs))   // If xxx is 'file=aaa'
 				{
 					$img = $regs[1];
 
@@ -1306,7 +1317,7 @@ class CMailFile
 	 * @param	string		$address		     Example: 'John Doe <john@doe.com>, Alan Smith <alan@smith.com>' or 'john@doe.com, alan@smith.com'
 	 * @param	int			$format			     0=auto, 1=emails with <>, 2=emails without <>, 3=auto + label between "
 	 * @param	int			$encode			     0=No encode name, 1=Encode name to RFC2822
-	 * @param   int         $maxnumberofemail    0=No limit. Otherwise, maximum number of emails returned ($address may contains several email separated with ','). Add '...' if there is more. 
+	 * @param   int         $maxnumberofemail    0=No limit. Otherwise, maximum number of emails returned ($address may contains several email separated with ','). Add '...' if there is more.
 	 * @return	string						     If format 0: '<john@doe.com>' or 'John Doe <john@doe.com>' or '=?UTF-8?B?Sm9obiBEb2U=?= <john@doe.com>'
 	 * 										     If format 1: '<john@doe.com>'
 	 *										     If format 2: 'john@doe.com'
@@ -1338,12 +1349,12 @@ class CMailFile
 
 			if ($email)
 			{
-			    $i++;
-			    
+				$i++;
+				 
 				$newemail='';
 				if ($format == 4)
 				{
-				    $newemail = $name?$name:$email;
+					$newemail = $name?$name:$email;
 				}
 				if ($format == 2)
 				{
@@ -1361,12 +1372,12 @@ class CMailFile
 				}
 
 				$ret=($ret ? $ret.',' : '').$newemail;
-				
+
 				// Stop if we have too much records
 				if ($maxnumberofemail && $i >= $maxnumberofemail)
 				{
-				    if (count($arrayaddress) > $maxnumberofemail) $ret.='...';
-				    break;
+					if (count($arrayaddress) > $maxnumberofemail) $ret.='...';
+					break;
 				}
 			}
 		}
@@ -1374,38 +1385,38 @@ class CMailFile
 		return $ret;
 	}
 
-    /**
-     * Return a formatted array of address string for SMTP protocol
-     *
-     * @param   string      $address        Example: 'John Doe <john@doe.com>, Alan Smith <alan@smith.com>' or 'john@doe.com, alan@smith.com'
-     * @return  array                       array of email => name
-     */
-    function getArrayAddress($address)
-    {
-        global $conf;
+	/**
+	 * Return a formatted array of address string for SMTP protocol
+	 *
+	 * @param   string      $address        Example: 'John Doe <john@doe.com>, Alan Smith <alan@smith.com>' or 'john@doe.com, alan@smith.com'
+	 * @return  array                       array of email => name
+	 */
+	function getArrayAddress($address)
+	{
+		global $conf;
 
-        $ret=array();
+		$ret=array();
 
-        $arrayaddress=explode(',',$address);
+		$arrayaddress=explode(',',$address);
 
-        // Boucle sur chaque composant de l'adresse
-        foreach($arrayaddress as $val)
-        {
-            if (preg_match('/^(.*)<(.*)>$/i',trim($val),$regs))
-            {
-                $name  = trim($regs[1]);
-                $email = trim($regs[2]);
-            }
-            else
-            {
-                $name  = null;
-                $email = trim($val);
-            }
+		// Boucle sur chaque composant de l'adresse
+		foreach($arrayaddress as $val)
+		{
+			if (preg_match('/^(.*)<(.*)>$/i',trim($val),$regs))
+			{
+				$name  = trim($regs[1]);
+				$email = trim($regs[2]);
+			}
+			else
+			{
+				$name  = null;
+				$email = trim($val);
+			}
 
-            $ret[$email]=empty($conf->global->MAIN_MAIL_NO_FULL_EMAIL)?$name:null;
-        }
+			$ret[$email]=empty($conf->global->MAIN_MAIL_NO_FULL_EMAIL)?$name:null;
+		}
 
-        return $ret;
-    }
+		return $ret;
+	}
 }
 

From d0e27f67e719395e7cb1f8f1b72ed7e308fc7831 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Tue, 18 Apr 2017 05:44:08 +0200
Subject: [PATCH 068/505] Add plugins Stripe

---
 COPYRIGHT                                     |    1 +
 htdocs/core/modules/modStripe.class.php       |    5 +-
 htdocs/includes/stripe/.coveralls.yml         |    4 +
 htdocs/includes/stripe/.gitignore             |   14 +
 htdocs/includes/stripe/.travis.yml            |   18 +
 htdocs/includes/stripe/CHANGELOG.md           |  430 ++
 htdocs/includes/stripe/LICENSE                |   21 +
 htdocs/includes/stripe/README.md              |  153 +
 htdocs/includes/stripe/VERSION                |    1 +
 htdocs/includes/stripe/build.php              |   36 +
 htdocs/includes/stripe/composer.json          |   36 +
 .../includes/stripe/data/ca-certificates.crt  | 3919 +++++++++++++++++
 htdocs/includes/stripe/data/test.png          |  Bin 0 -> 95 bytes
 htdocs/includes/stripe/init.php               |   73 +
 htdocs/includes/stripe/lib/Account.php        |  132 +
 htdocs/includes/stripe/lib/AlipayAccount.php  |   13 +
 htdocs/includes/stripe/lib/ApiRequestor.php   |  292 ++
 htdocs/includes/stripe/lib/ApiResource.php    |  203 +
 htdocs/includes/stripe/lib/ApiResponse.php    |   32 +
 htdocs/includes/stripe/lib/ApplePayDomain.php |   65 +
 htdocs/includes/stripe/lib/ApplicationFee.php |   69 +
 .../stripe/lib/ApplicationFeeRefund.php       |   44 +
 htdocs/includes/stripe/lib/AttachedObject.php |   31 +
 htdocs/includes/stripe/lib/Balance.php        |   26 +
 .../stripe/lib/BalanceTransaction.php         |   57 +
 htdocs/includes/stripe/lib/BankAccount.php    |   25 +
 .../includes/stripe/lib/BitcoinReceiver.php   |   85 +
 .../stripe/lib/BitcoinTransaction.php         |   13 +
 htdocs/includes/stripe/lib/Card.php           |   13 +
 htdocs/includes/stripe/lib/Charge.php         |  184 +
 htdocs/includes/stripe/lib/Collection.php     |   87 +
 htdocs/includes/stripe/lib/CountrySpec.php    |   44 +
 htdocs/includes/stripe/lib/Coupon.php         |   77 +
 htdocs/includes/stripe/lib/Customer.php       |  190 +
 htdocs/includes/stripe/lib/Dispute.php        |   83 +
 htdocs/includes/stripe/lib/Error/Api.php      |    7 +
 .../stripe/lib/Error/ApiConnection.php        |    7 +
 .../stripe/lib/Error/Authentication.php       |    7 +
 htdocs/includes/stripe/lib/Error/Base.php     |   60 +
 htdocs/includes/stripe/lib/Error/Card.php     |   41 +
 .../stripe/lib/Error/InvalidRequest.php       |   23 +
 .../includes/stripe/lib/Error/Permission.php  |    7 +
 .../includes/stripe/lib/Error/RateLimit.php   |    7 +
 htdocs/includes/stripe/lib/Event.php          |   43 +
 .../includes/stripe/lib/ExternalAccount.php   |   89 +
 htdocs/includes/stripe/lib/FileUpload.php     |   61 +
 .../stripe/lib/HttpClient/ClientInterface.php |   18 +
 .../stripe/lib/HttpClient/CurlClient.php      |  282 ++
 htdocs/includes/stripe/lib/Invoice.php        |   92 +
 htdocs/includes/stripe/lib/InvoiceItem.php    |   77 +
 .../includes/stripe/lib/JsonSerializable.php  |   18 +
 htdocs/includes/stripe/lib/Order.php          |   87 +
 htdocs/includes/stripe/lib/OrderReturn.php    |   33 +
 htdocs/includes/stripe/lib/Payout.php         |   97 +
 htdocs/includes/stripe/lib/Plan.php           |   90 +
 htdocs/includes/stripe/lib/Product.php        |   77 +
 htdocs/includes/stripe/lib/Recipient.php      |   92 +
 .../includes/stripe/lib/RecipientTransfer.php |   38 +
 htdocs/includes/stripe/lib/Refund.php         |   79 +
 htdocs/includes/stripe/lib/SKU.php            |   77 +
 .../stripe/lib/SingletonApiResource.php       |   36 +
 htdocs/includes/stripe/lib/Source.php         |  115 +
 htdocs/includes/stripe/lib/Stripe.php         |  126 +
 htdocs/includes/stripe/lib/StripeObject.php   |  294 ++
 htdocs/includes/stripe/lib/Subscription.php   |   97 +
 .../includes/stripe/lib/SubscriptionItem.php  |   88 +
 htdocs/includes/stripe/lib/ThreeDSecure.php   |   36 +
 htdocs/includes/stripe/lib/Token.php          |   43 +
 htdocs/includes/stripe/lib/Transfer.php       |  104 +
 .../includes/stripe/lib/TransferReversal.php  |   53 +
 .../stripe/lib/Util/AutoPagingIterator.php    |   61 +
 .../stripe/lib/Util/RequestOptions.php        |   79 +
 htdocs/includes/stripe/lib/Util/Set.php       |   44 +
 htdocs/includes/stripe/lib/Util/Util.php      |  146 +
 .../includes/stripe/phpunit.no_autoload.xml   |   15 +
 htdocs/includes/stripe/phpunit.xml            |   15 +
 htdocs/includes/stripe/tests/AccountTest.php  |  300 ++
 .../stripe/tests/ApiRequestorTest.php         |   68 +
 .../stripe/tests/ApplePayDomainTest.php       |   72 +
 .../stripe/tests/ApplicationFeeRefundTest.php |   18 +
 .../stripe/tests/ApplicationFeeTest.php       |   22 +
 .../stripe/tests/AuthenticationErrorTest.php  |   16 +
 htdocs/includes/stripe/tests/BalanceTest.php  |   15 +
 .../stripe/tests/BalanceTransactionTest.php   |   13 +
 .../includes/stripe/tests/BankAccountTest.php |   32 +
 .../stripe/tests/BitcoinReceiverTest.php      |  120 +
 .../includes/stripe/tests/CardErrorTest.php   |   41 +
 htdocs/includes/stripe/tests/ChargeTest.php   |  204 +
 .../includes/stripe/tests/CollectionTest.php  |  105 +
 .../includes/stripe/tests/CountrySpecTest.php |   31 +
 htdocs/includes/stripe/tests/CouponTest.php   |   29 +
 .../includes/stripe/tests/CurlClientTest.php  |  100 +
 htdocs/includes/stripe/tests/CustomerTest.php |  278 ++
 htdocs/includes/stripe/tests/DiscountTest.php |   31 +
 htdocs/includes/stripe/tests/DisputeTest.php  |   96 +
 htdocs/includes/stripe/tests/ErrorTest.php    |   61 +
 .../stripe/tests/ExternalAccountTest.php      |   30 +
 .../includes/stripe/tests/FileUploadTest.php  |   44 +
 .../stripe/tests/InvalidRequestErrorTest.php  |   26 +
 htdocs/includes/stripe/tests/InvoiceTest.php  |   56 +
 htdocs/includes/stripe/tests/PayoutTest.php   |   94 +
 .../stripe/tests/PermissionsErrorTest.php     |   22 +
 htdocs/includes/stripe/tests/PlanTest.php     |   51 +
 htdocs/includes/stripe/tests/ProductTest.php  |  158 +
 .../stripe/tests/RateLimitErrorTest.php       |   22 +
 .../includes/stripe/tests/RecipientTest.php   |  112 +
 htdocs/includes/stripe/tests/RefundTest.php   |  131 +
 .../stripe/tests/RequestOptionsTest.php       |   69 +
 htdocs/includes/stripe/tests/SourceTest.php   |  218 +
 .../stripe/tests/StripeObjectTest.php         |  108 +
 .../stripe/tests/SubscriptionItemTest.php     |   38 +
 .../stripe/tests/SubscriptionTest.php         |  132 +
 htdocs/includes/stripe/tests/TestCase.php     |  271 ++
 .../stripe/tests/ThreeDSecureTest.php         |   46 +
 htdocs/includes/stripe/tests/TokenTest.php    |   13 +
 .../stripe/tests/TransferReversalTest.php     |   19 +
 htdocs/includes/stripe/tests/TransferTest.php |   46 +
 htdocs/includes/stripe/tests/UtilTest.php     |   45 +
 .../stripe/tests/bootstrap.no_autoload.php    |    4 +
 htdocs/includes/stripe/tests/bootstrap.php    |    3 +
 htdocs/stripe/admin/stripe.php                |    1 +
 htdocs/stripe/checkout.php                    |  241 +
 htdocs/stripe/config.php                      |   36 +
 htdocs/stripe/paymnt_link.php                 |   72 +
 124 files changed, 13094 insertions(+), 3 deletions(-)
 create mode 100644 htdocs/includes/stripe/.coveralls.yml
 create mode 100644 htdocs/includes/stripe/.gitignore
 create mode 100644 htdocs/includes/stripe/.travis.yml
 create mode 100644 htdocs/includes/stripe/CHANGELOG.md
 create mode 100644 htdocs/includes/stripe/LICENSE
 create mode 100644 htdocs/includes/stripe/README.md
 create mode 100644 htdocs/includes/stripe/VERSION
 create mode 100644 htdocs/includes/stripe/build.php
 create mode 100644 htdocs/includes/stripe/composer.json
 create mode 100644 htdocs/includes/stripe/data/ca-certificates.crt
 create mode 100644 htdocs/includes/stripe/data/test.png
 create mode 100644 htdocs/includes/stripe/init.php
 create mode 100644 htdocs/includes/stripe/lib/Account.php
 create mode 100644 htdocs/includes/stripe/lib/AlipayAccount.php
 create mode 100644 htdocs/includes/stripe/lib/ApiRequestor.php
 create mode 100644 htdocs/includes/stripe/lib/ApiResource.php
 create mode 100644 htdocs/includes/stripe/lib/ApiResponse.php
 create mode 100644 htdocs/includes/stripe/lib/ApplePayDomain.php
 create mode 100644 htdocs/includes/stripe/lib/ApplicationFee.php
 create mode 100644 htdocs/includes/stripe/lib/ApplicationFeeRefund.php
 create mode 100644 htdocs/includes/stripe/lib/AttachedObject.php
 create mode 100644 htdocs/includes/stripe/lib/Balance.php
 create mode 100644 htdocs/includes/stripe/lib/BalanceTransaction.php
 create mode 100644 htdocs/includes/stripe/lib/BankAccount.php
 create mode 100644 htdocs/includes/stripe/lib/BitcoinReceiver.php
 create mode 100644 htdocs/includes/stripe/lib/BitcoinTransaction.php
 create mode 100644 htdocs/includes/stripe/lib/Card.php
 create mode 100644 htdocs/includes/stripe/lib/Charge.php
 create mode 100644 htdocs/includes/stripe/lib/Collection.php
 create mode 100644 htdocs/includes/stripe/lib/CountrySpec.php
 create mode 100644 htdocs/includes/stripe/lib/Coupon.php
 create mode 100644 htdocs/includes/stripe/lib/Customer.php
 create mode 100644 htdocs/includes/stripe/lib/Dispute.php
 create mode 100644 htdocs/includes/stripe/lib/Error/Api.php
 create mode 100644 htdocs/includes/stripe/lib/Error/ApiConnection.php
 create mode 100644 htdocs/includes/stripe/lib/Error/Authentication.php
 create mode 100644 htdocs/includes/stripe/lib/Error/Base.php
 create mode 100644 htdocs/includes/stripe/lib/Error/Card.php
 create mode 100644 htdocs/includes/stripe/lib/Error/InvalidRequest.php
 create mode 100644 htdocs/includes/stripe/lib/Error/Permission.php
 create mode 100644 htdocs/includes/stripe/lib/Error/RateLimit.php
 create mode 100644 htdocs/includes/stripe/lib/Event.php
 create mode 100644 htdocs/includes/stripe/lib/ExternalAccount.php
 create mode 100644 htdocs/includes/stripe/lib/FileUpload.php
 create mode 100644 htdocs/includes/stripe/lib/HttpClient/ClientInterface.php
 create mode 100644 htdocs/includes/stripe/lib/HttpClient/CurlClient.php
 create mode 100644 htdocs/includes/stripe/lib/Invoice.php
 create mode 100644 htdocs/includes/stripe/lib/InvoiceItem.php
 create mode 100644 htdocs/includes/stripe/lib/JsonSerializable.php
 create mode 100644 htdocs/includes/stripe/lib/Order.php
 create mode 100644 htdocs/includes/stripe/lib/OrderReturn.php
 create mode 100644 htdocs/includes/stripe/lib/Payout.php
 create mode 100644 htdocs/includes/stripe/lib/Plan.php
 create mode 100644 htdocs/includes/stripe/lib/Product.php
 create mode 100644 htdocs/includes/stripe/lib/Recipient.php
 create mode 100644 htdocs/includes/stripe/lib/RecipientTransfer.php
 create mode 100644 htdocs/includes/stripe/lib/Refund.php
 create mode 100644 htdocs/includes/stripe/lib/SKU.php
 create mode 100644 htdocs/includes/stripe/lib/SingletonApiResource.php
 create mode 100644 htdocs/includes/stripe/lib/Source.php
 create mode 100644 htdocs/includes/stripe/lib/Stripe.php
 create mode 100644 htdocs/includes/stripe/lib/StripeObject.php
 create mode 100644 htdocs/includes/stripe/lib/Subscription.php
 create mode 100644 htdocs/includes/stripe/lib/SubscriptionItem.php
 create mode 100644 htdocs/includes/stripe/lib/ThreeDSecure.php
 create mode 100644 htdocs/includes/stripe/lib/Token.php
 create mode 100644 htdocs/includes/stripe/lib/Transfer.php
 create mode 100644 htdocs/includes/stripe/lib/TransferReversal.php
 create mode 100644 htdocs/includes/stripe/lib/Util/AutoPagingIterator.php
 create mode 100644 htdocs/includes/stripe/lib/Util/RequestOptions.php
 create mode 100644 htdocs/includes/stripe/lib/Util/Set.php
 create mode 100644 htdocs/includes/stripe/lib/Util/Util.php
 create mode 100644 htdocs/includes/stripe/phpunit.no_autoload.xml
 create mode 100644 htdocs/includes/stripe/phpunit.xml
 create mode 100644 htdocs/includes/stripe/tests/AccountTest.php
 create mode 100644 htdocs/includes/stripe/tests/ApiRequestorTest.php
 create mode 100644 htdocs/includes/stripe/tests/ApplePayDomainTest.php
 create mode 100644 htdocs/includes/stripe/tests/ApplicationFeeRefundTest.php
 create mode 100644 htdocs/includes/stripe/tests/ApplicationFeeTest.php
 create mode 100644 htdocs/includes/stripe/tests/AuthenticationErrorTest.php
 create mode 100644 htdocs/includes/stripe/tests/BalanceTest.php
 create mode 100644 htdocs/includes/stripe/tests/BalanceTransactionTest.php
 create mode 100644 htdocs/includes/stripe/tests/BankAccountTest.php
 create mode 100644 htdocs/includes/stripe/tests/BitcoinReceiverTest.php
 create mode 100644 htdocs/includes/stripe/tests/CardErrorTest.php
 create mode 100644 htdocs/includes/stripe/tests/ChargeTest.php
 create mode 100644 htdocs/includes/stripe/tests/CollectionTest.php
 create mode 100644 htdocs/includes/stripe/tests/CountrySpecTest.php
 create mode 100644 htdocs/includes/stripe/tests/CouponTest.php
 create mode 100644 htdocs/includes/stripe/tests/CurlClientTest.php
 create mode 100644 htdocs/includes/stripe/tests/CustomerTest.php
 create mode 100644 htdocs/includes/stripe/tests/DiscountTest.php
 create mode 100644 htdocs/includes/stripe/tests/DisputeTest.php
 create mode 100644 htdocs/includes/stripe/tests/ErrorTest.php
 create mode 100644 htdocs/includes/stripe/tests/ExternalAccountTest.php
 create mode 100644 htdocs/includes/stripe/tests/FileUploadTest.php
 create mode 100644 htdocs/includes/stripe/tests/InvalidRequestErrorTest.php
 create mode 100644 htdocs/includes/stripe/tests/InvoiceTest.php
 create mode 100644 htdocs/includes/stripe/tests/PayoutTest.php
 create mode 100644 htdocs/includes/stripe/tests/PermissionsErrorTest.php
 create mode 100644 htdocs/includes/stripe/tests/PlanTest.php
 create mode 100644 htdocs/includes/stripe/tests/ProductTest.php
 create mode 100644 htdocs/includes/stripe/tests/RateLimitErrorTest.php
 create mode 100644 htdocs/includes/stripe/tests/RecipientTest.php
 create mode 100644 htdocs/includes/stripe/tests/RefundTest.php
 create mode 100644 htdocs/includes/stripe/tests/RequestOptionsTest.php
 create mode 100644 htdocs/includes/stripe/tests/SourceTest.php
 create mode 100644 htdocs/includes/stripe/tests/StripeObjectTest.php
 create mode 100644 htdocs/includes/stripe/tests/SubscriptionItemTest.php
 create mode 100644 htdocs/includes/stripe/tests/SubscriptionTest.php
 create mode 100644 htdocs/includes/stripe/tests/TestCase.php
 create mode 100644 htdocs/includes/stripe/tests/ThreeDSecureTest.php
 create mode 100644 htdocs/includes/stripe/tests/TokenTest.php
 create mode 100644 htdocs/includes/stripe/tests/TransferReversalTest.php
 create mode 100644 htdocs/includes/stripe/tests/TransferTest.php
 create mode 100644 htdocs/includes/stripe/tests/UtilTest.php
 create mode 100644 htdocs/includes/stripe/tests/bootstrap.no_autoload.php
 create mode 100644 htdocs/includes/stripe/tests/bootstrap.php
 create mode 100644 htdocs/stripe/checkout.php
 create mode 100644 htdocs/stripe/config.php
 create mode 100644 htdocs/stripe/paymnt_link.php

diff --git a/COPYRIGHT b/COPYRIGHT
index 6f8a595897d..61a0f2de6bd 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -31,6 +31,7 @@ Restler                3.0.0RC6      LGPL-3+                     Yes
 TCPDF                  6.2.12        LGPL-3+                     Yes             PDF generation
 TCPDI                  1.0.0         LGPL-3+ / Apache 2.0        Yes             FPDI replacement
 Swift Mailer           5.4.2-DEV     MIT license                 Yes             Comprehensive mailing tools for PHP
+Stripe                 4.7.0         MIT licence                 Yes             Library for Stripe module
 
 JS libraries:
 jQuery                 1.11.3        MIT License                 Yes             JS library
diff --git a/htdocs/core/modules/modStripe.class.php b/htdocs/core/modules/modStripe.class.php
index 11dd6ee68e4..4b498629017 100644
--- a/htdocs/core/modules/modStripe.class.php
+++ b/htdocs/core/modules/modStripe.class.php
@@ -1,7 +1,6 @@
 <?php
-/* Copyright (C) 2003		Rodolphe Quiedeville	<rodolphe@quiedeville.org>
- * Copyright (C) 2004-2009	Laurent Destailleur		<eldy@users.sourceforge.net>
- * Copyright (C) 2016		Alexandre Spangaro		<aspangaro.dolibarr@gmail.com>
+/* Copyright (C) 2017		Alexandre Spangaro		<aspangaro@zendsi.com>
+ * Copyright (C) 2017		Saasprov				<saasprov@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
diff --git a/htdocs/includes/stripe/.coveralls.yml b/htdocs/includes/stripe/.coveralls.yml
new file mode 100644
index 00000000000..a343c9a7466
--- /dev/null
+++ b/htdocs/includes/stripe/.coveralls.yml
@@ -0,0 +1,4 @@
+service_name: travis-ci
+src_dir: .
+coverage_clover: clover.xml
+json_path: coveralls-upload.json
diff --git a/htdocs/includes/stripe/.gitignore b/htdocs/includes/stripe/.gitignore
new file mode 100644
index 00000000000..93251c95077
--- /dev/null
+++ b/htdocs/includes/stripe/.gitignore
@@ -0,0 +1,14 @@
+# Mac OS X dumps these all over the place.
+.DS_Store
+
+# Ignore the SimpleTest library if it is installed to /test/.
+/test/simpletest/
+
+# Ignore the /vendor/ directory for people using composer
+/vendor/
+
+# If the vendor directory isn't being commited the composer.lock file should also be ignored
+composer.lock
+
+# Ignore PHPUnit coverage file
+clover.xml
diff --git a/htdocs/includes/stripe/.travis.yml b/htdocs/includes/stripe/.travis.yml
new file mode 100644
index 00000000000..934b517bfea
--- /dev/null
+++ b/htdocs/includes/stripe/.travis.yml
@@ -0,0 +1,18 @@
+language: php
+
+php:
+  - 5.3
+  - 5.4
+  - 5.5
+  - 5.6
+  - 7.0
+  - 7.1
+  - hhvm
+
+env:
+  - AUTOLOAD=1
+  - AUTOLOAD=0
+
+script: ./build.php ${AUTOLOAD}
+after_script: ./vendor/bin/coveralls -v
+sudo: false
diff --git a/htdocs/includes/stripe/CHANGELOG.md b/htdocs/includes/stripe/CHANGELOG.md
new file mode 100644
index 00000000000..3650c21d1c2
--- /dev/null
+++ b/htdocs/includes/stripe/CHANGELOG.md
@@ -0,0 +1,430 @@
+### 4.7.0 2017-04-10
+
+* Add support for payouts and recipient transfers
+
+### 4.6.0 2017-04-06
+
+* Please see 4.7.0 instead (no-op release)	
+
+### 4.5.1 2017-03-22
+
+* Remove hard dependency on cURL
+
+### 4.5.0 2017-03-20
+
+* Support for detaching sources from customers
+
+### 4.4.2 2017-02-27
+
+* Correct handling of `owner` parameter when updating sources
+
+### 4.4.1 2017-02-24
+
+* Correct the error check on a bad JSON decoding
+
+### 4.4.0 2017-01-18
+
+* Add support for updating sources
+
+### 4.3.0 2016-11-30
+
+* Add support for verifying sources
+
+### 4.2.0 2016-11-21
+
+* Add retrieve method for 3-D Secure resources
+
+### 4.1.1 2016-10-21
+
+* Add docblock with model properties for `Plan`
+
+### 4.1.0 2016-10-18
+
+* Support for 403 status codes (permission denied)
+
+### 4.0.1 2016-10-17
+
+* Fix transfer reversal materialization
+* Fixes for some property definitions in docblocks
+
+### 4.0.0 2016-09-28
+
+* Support for subscription items
+* Drop attempt to force TLS 1.2: please note that this could be breaking if you're using old OS distributions or packages and upgraded recently (so please make sure to test your integration!)
+
+### 3.23.0 2016-09-15
+
+* Add support for Apple Pay domains
+
+### 3.22.0 2016-09-13
+
+* Add `Stripe::setAppInfo` to allow plugins to register user agent information
+
+### 3.21.0 2016-08-25
+
+* Add `Source` model for generic payment sources
+
+### 3.20.0 2016-08-08
+
+* Add `getDeclineCode` to card errors
+
+### 3.19.0 2016-07-29
+
+* Opt requests directly into TLS 1.2 where OpenSSL >= 1.0.1 (see #277 for context)
+
+### 3.18.0 2016-07-28
+
+* Add new `STATUS_` constants for subscriptions
+
+### 3.17.1 2016-07-28
+
+* Fix auto-paging iterator so that it plays nicely with `iterator_to_array`
+
+### 3.17.0 2016-07-14
+
+* Add field annotations to model classes for better editor hinting
+
+### 3.16.0 2016-07-12
+
+* Add `ThreeDSecure` model for 3-D secure payments
+
+### 3.15.0 2016-06-29
+
+* Add static `update` method to all resources that can be changed.
+
+### 3.14.3 2016-06-20
+
+* Make sure that cURL never sends `Expects: 100-continue`, even on large request bodies
+
+### 3.14.2 2016-06-03
+
+* Add `inventory` under `SKU` to list of keys that have nested data and can be updated
+
+### 3.14.1 2016-05-27
+
+* Fix some inconsistencies in PHPDoc
+
+### 3.14.0 2016-05-25
+
+* Add support for returning Relay orders
+
+### 3.13.0 2016-05-04
+
+* Add `list`, `create`, `update`, `retrieve`, and `delete` methods to the Subscription class
+
+### 3.12.1 2016-04-07
+
+* Additional check on value arrays for some extra safety
+
+### 3.12.0 2016-03-31
+
+* Fix bug `refreshFrom` on `StripeObject` would not take an `$opts` array
+* Fix bug where `$opts` not passed to parent `save` method in `Account`
+* Fix bug where non-existent variable was referenced in `reverse` in `Transfer`
+* Update CA cert bundle for compatibility with OpenSSL versions below 1.0.1
+
+### 3.11.0 2016-03-22
+
+* Allow `CurlClient` to be initialized with default `CURLOPT_*` options
+
+### 3.10.1 2016-03-22
+
+* Fix bug where request params and options were ignored in `ApplicationFee`'s `refund.`
+
+### 3.10.0 2016-03-15
+
+* Add `reject` on `Account` to support the new API feature
+
+### 3.9.2 2016-03-04
+
+* Fix error when an object's metadata is set more than once
+
+### 3.9.1 2016-02-24
+
+* Fix encoding behavior of nested arrays for requests (see #227)
+
+### 3.9.0 2016-02-09
+
+* Add automatic pagination mechanism with `autoPagingIterator()`
+* Allow global account ID to be set with `Stripe::setAccountId()`
+
+### 3.8.0 2016-02-08
+
+* Add `CountrySpec` model for looking up country payment information
+
+### 3.7.1 2016-02-01
+
+* Update bundled CA certs
+
+### 3.7.0 2016-01-27
+
+* Support deleting Relay products and SKUs
+
+### 3.6.0 2016-01-05
+
+* Allow configuration of HTTP client timeouts
+
+### 3.5.0 2015-12-01
+
+* Add a verification routine for external accounts
+
+### 3.4.0 2015-09-14
+
+* Products, SKUs, and Orders -- https://stripe.com/relay
+
+### 3.3.0 2015-09-11
+
+* Add support for 429 Rate Limit response
+
+### 3.2.0 2015-08-17
+
+* Add refund listing and retrieval without an associated charge
+
+### 3.1.0 2015-08-03
+
+* Add dispute listing and retrieval
+* Add support for manage account deletion
+
+### 3.0.0 2015-07-28
+
+* Rename `\Stripe\Object` to `\Stripe\StripeObject` (PHP 7 compatibility)
+* Rename `getCode` and `getParam` in exceptions to `getStripeCode` and `getStripeParam`
+* Add support for calling `json_encode` on Stripe objects in PHP 5.4+
+* Start supporting/testing PHP 7
+
+### 2.3.0 2015-07-06
+
+* Add request ID to all Stripe exceptions
+
+### 2.2.0 2015-06-01
+
+* Add support for Alipay accounts as sources
+* Add support for bank accounts as sources (private beta)
+* Add support for bank accounts and cards as external_accounts on Account objects
+
+### 2.1.4 2015-05-13
+
+* Fix CA certificate file path (thanks @lphilps & @matthewarkin)
+
+### 2.1.3 2015-05-12
+
+* Fix to account updating to permit `tos_acceptance` and `personal_address` to be set properly
+* Fix to Transfer reversal creation (thanks @neatness!)
+* Network requests are now done through a swappable class for easier mocking
+
+### 2.1.2 2015-04-10
+
+* Remove SSL cert revokation checking (all pre-Heartbleed certs have expired)
+* Bug fixes to account updating
+
+### 2.1.1 2015-02-27
+* Support transfer reversals
+
+### 2.1.0 2015-02-19
+
+* Support new API version (2015-02-18)
+* Added Bitcoin Receiever update and delete actions
+* Edited tests to prefer "source" over "card" as per new API version
+
+### 2.0.1 2015-02-16
+
+* Fix to fetching endpoints that use a non-default baseUrl (`FileUpload`)
+
+### 2.0.0 2015-02-14
+
+* Bumped minimum version to 5.3.3
+* Switched to Stripe namespace instead of Stripe_ class name prefiexes (thanks @chadicus!)
+* Switched tests to PHPUnit (thanks @chadicus!)
+* Switched style guide to PSR2 (thanks @chadicus!)
+* Added $opts hash to the end of most methods: this permits passing 'idempotency_key', 'stripe_account', or 'stripe_version'. The last 2 will persist across multiple object loads.
+* Added support for retrieving Account by ID
+
+### 1.18.0 2015-01-21
+
+* Support making bitcoin charges through BitcoinReceiver source object
+
+### 1.17.5 2014-12-23
+
+* Adding support for creating file uploads.
+
+### 1.17.4 2014-12-15
+
+* Saving objects fetched with a custom key now works (thanks @JustinHook & @jpasilan)
+* Added methods for reporting charges as safe or fraudulent and for specifying the reason for refunds
+
+### 1.17.3 2014-11-06
+
+* Better handling of HHVM support for SSL certificate blacklist checking.
+
+### 1.17.2 2014-09-23
+
+* Coupons now are backed by a `Stripe_Coupon` instead of `Stripe_Object`, and support updating metadata
+* Running operations (`create`, `retrieve`, `all`) on upcoming invoice items now works
+
+### 1.17.1 2014-07-31
+
+* Requests now send Content-Type header
+
+### 1.17.0 2014-07-29
+
+* Application Fee refunds now a list instead of array
+* HHVM now works
+* Small bug fixes (thanks @bencromwell & @fastest963)
+* __toString now returns the name of the object in addition to its JSON representation
+
+### 1.16.0 2014-06-17
+
+* Add metadata for refunds and disputes
+
+### 1.15.0 2014-05-28
+
+* Support canceling transfers
+
+### 1.14.1 2014-05-21
+
+* Support cards for recipients.
+
+### 1.13.1 2014-05-15
+
+* Fix bug in account resource where `id` wasn't in the result
+
+### 1.13.0 2014-04-10
+
+* Add support for certificate blacklisting
+* Update ca bundle
+* Drop support for HHVM (Temporarily)
+
+### 1.12.0 2014-04-01
+
+* Add Stripe_RateLimitError for catching rate limit errors.
+* Update to Zend coding style (thanks,  @jpiasetz)
+
+### 1.11.0 2014-01-29
+
+* Add support for multiple subscriptions per customer
+
+### 1.10.1 2013-12-02
+
+* Add new ApplicationFee
+
+### 1.9.1 2013-11-08
+
+* Fix a bug where a null nestable object causes warnings to fire.
+
+### 1.9.0 2013-10-16
+
+* Add support for metadata API.
+
+### 1.8.4 2013-09-18
+
+* Add support for closing disputes.
+
+### 1.8.3 2013-08-13
+
+* Add new Balance and BalanceTransaction
+
+### 1.8.2 2013-08-12
+
+* Add support for unsetting attributes by updating to NULL.
+  Setting properties to a blank string is now an error.
+
+### 1.8.1 2013-07-12
+
+* Add support for multiple cards API (Stripe API version 2013-07-12: https://stripe.com/docs/upgrades#2013-07-05)
+
+### 1.8.0 2013-04-11
+
+* Allow Transfers to be creatable
+* Add new Recipient resource
+
+### 1.7.15 2013-02-21
+
+* Add 'id' to the list of permanent object attributes
+
+### 1.7.14 2013-02-20
+
+* Don't re-encode strings that are already encoded in UTF-8. If you
+  were previously using plan or coupon objects with UTF-8 IDs, they
+  may have been treated as ISO-8859-1 (Latin-1) and encoded to UTF-8 a
+  2nd time. You may now need to pass the IDs to utf8_encode before
+  passing them to Stripe_Plan::retrieve or Stripe_Coupon::retrieve.
+* Ensure that all input is encoded in UTF-8 before submitting it to
+  Stripe's servers. (github issue #27)
+
+### 1.7.13 2013-02-01
+
+* Add support for passing options when retrieving Stripe objects
+  e.g., Stripe_Charge::retrieve(array("id"=>"foo", "expand" => array("customer")))
+  Stripe_Charge::retrieve("foo") will continue to work
+
+### 1.7.12 2013-01-15
+
+* Add support for setting a Stripe API version override
+
+### 1.7.11 2012-12-30
+
+* Version bump to cleanup constants and such (github issue #26)
+
+### 1.7.10 2012-11-08
+
+* Add support for updating charge disputes.
+* Fix bug preventing retrieval of null attributes
+
+### 1.7.9 2012-11-08
+
+* Fix usage under autoloaders such as the one generated by composer
+  (github issue #22)
+
+### 1.7.8 2012-10-30
+* Add support for creating invoices.
+* Add support for new invoice lines return format
+* Add support for new list objects
+
+### 1.7.7 2012-09-14
+
+* Get all of the various version numbers in the repo in sync (no other
+  changes)
+
+### 1.7.6 2012-08-31
+
+* Add update and pay methods to Invoice resource
+
+### 1.7.5 2012-08-23
+
+* Change internal function names so that Stripe_SingletonApiRequest is
+  E_STRICT-clean (github issue #16)
+
+### 1.7.4 2012-08-21
+
+* Bugfix so that Stripe objects (e.g. Customer, Charge objects) used
+  in API calls are transparently converted to their object IDs
+
+### 1.7.3 2012-08-15
+
+* Add new Account resource
+
+### 1.7.2 2012-06-26
+
+* Make clearer that you should be including lib/Stripe.php, not
+  test/Stripe.php (github issue #14)
+
+### 1.7.1 2012-05-24
+
+* Add missing argument to Stripe_InvalidRequestError constructor in
+  Stripe_ApiResource::instanceUrl. Fixes a warning when
+  Stripe_ApiResource::instanceUrl is called on a resource with no ID
+  (github issue #12)
+
+### 1.7.0 2012-05-17
+
+* Support Composer and Packagist (github issue #9)
+
+* Add new deleteDiscount method to Stripe_Customer
+
+* Add new Transfer resource
+
+* Switch from using HTTP Basic auth to Bearer auth. (Note: Stripe will
+  support Basic auth for the indefinite future, but recommends Bearer
+  auth when possible going forward)
+
+* Numerous test suite improvements
diff --git a/htdocs/includes/stripe/LICENSE b/htdocs/includes/stripe/LICENSE
new file mode 100644
index 00000000000..a21757e4fcd
--- /dev/null
+++ b/htdocs/includes/stripe/LICENSE
@@ -0,0 +1,21 @@
+The MIT License
+
+Copyright (c) 2010-2015 Stripe
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/htdocs/includes/stripe/README.md b/htdocs/includes/stripe/README.md
new file mode 100644
index 00000000000..16642900a1f
--- /dev/null
+++ b/htdocs/includes/stripe/README.md
@@ -0,0 +1,153 @@
+# Stripe PHP bindings
+
+[![Build Status](https://travis-ci.org/stripe/stripe-php.svg?branch=master)](https://travis-ci.org/stripe/stripe-php)
+[![Latest Stable Version](https://poser.pugx.org/stripe/stripe-php/v/stable.svg)](https://packagist.org/packages/stripe/stripe-php)
+[![Total Downloads](https://poser.pugx.org/stripe/stripe-php/downloads.svg)](https://packagist.org/packages/stripe/stripe-php)
+[![License](https://poser.pugx.org/stripe/stripe-php/license.svg)](https://packagist.org/packages/stripe/stripe-php)
+[![Code Coverage](https://coveralls.io/repos/stripe/stripe-php/badge.svg?branch=master)](https://coveralls.io/r/stripe/stripe-php?branch=master)
+
+You can sign up for a Stripe account at https://stripe.com.
+
+## Requirements
+
+PHP 5.3.3 and later.
+
+## Composer
+
+You can install the bindings via [Composer](http://getcomposer.org/). Run the following command:
+
+```bash
+composer require stripe/stripe-php
+```
+
+To use the bindings, use Composer's [autoload](https://getcomposer.org/doc/00-intro.md#autoloading):
+
+```php
+require_once('vendor/autoload.php');
+```
+
+## Manual Installation
+
+If you do not wish to use Composer, you can download the [latest release](https://github.com/stripe/stripe-php/releases). Then, to use the bindings, include the `init.php` file.
+
+```php
+require_once('/path/to/stripe-php/init.php');
+```
+
+## Dependencies
+
+The bindings require the following extension in order to work properly:
+
+- [`curl`](https://secure.php.net/manual/en/book.curl.php), although you can use your own non-cURL client if you prefer
+- [`json`](https://secure.php.net/manual/en/book.json.php)
+- [`mbstring`](https://secure.php.net/manual/en/book.mbstring.php) (Multibyte String)
+
+If you use Composer, these dependencies should be handled automatically. If you install manually, you'll want to make sure that these extensions are available.
+
+## Getting Started
+
+Simple usage looks like:
+
+```php
+\Stripe\Stripe::setApiKey('sk_test_BQokikJOvBiI2HlWgH4olfQ2');
+$charge = \Stripe\Charge::create(array('amount' => 2000, 'currency' => 'usd', 'source' => 'tok_189fqt2eZvKYlo2CTGBeg6Uq' ));
+echo $charge;
+```
+
+## Documentation
+
+Please see https://stripe.com/docs/api for up-to-date documentation.
+
+## Legacy Version Support
+
+If you are using PHP 5.2, you can download v1.18.0 ([zip](https://github.com/stripe/stripe-php/archive/v1.18.0.zip), [tar.gz](https://github.com/stripe/stripe-php/archive/v1.18.0.tar.gz)) from our [releases page](https://github.com/stripe/stripe-php/releases). This version will continue to work with new versions of the Stripe API for all common uses.
+
+This legacy version may be included via `require_once("/path/to/stripe-php/lib/Stripe.php");`, and used like:
+
+```php
+Stripe::setApiKey('d8e8fca2dc0f896fd7cb4cb0031ba249');
+$myCard = array('number' => '4242424242424242', 'exp_month' => 8, 'exp_year' => 2018);
+$charge = Stripe_Charge::create(array('card' => $myCard, 'amount' => 2000, 'currency' => 'usd'));
+echo $charge;
+```
+
+## Custom Request Timeouts
+
+*NOTE:* We do not recommend decreasing the timeout for non-read-only calls (e.g. charge creation), since even if you locally timeout, the request on Stripe's side can still complete. If you are decreasing timeouts on these calls, make sure to use [idempotency tokens](https://stripe.com/docs/api/php#idempotent_requests) to avoid executing the same transaction twice as a result of timeout retry logic.
+
+To modify request timeouts (connect or total, in seconds) you'll need to tell the API client to use a CurlClient other than its default. You'll set the timeouts in that CurlClient.
+
+```php
+// set up your tweaked Curl client
+$curl = new \Stripe\HttpClient\CurlClient();
+$curl->setTimeout(10); // default is \Stripe\HttpClient\CurlClient::DEFAULT_TIMEOUT
+$curl->setConnectTimeout(5); // default is \Stripe\HttpClient\CurlClient::DEFAULT_CONNECT_TIMEOUT
+
+echo $curl->getTimeout(); // 10
+echo $curl->getConnectTimeout(); // 5
+
+// tell Stripe to use the tweaked client
+\Stripe\ApiRequestor::setHttpClient($curl);
+
+// use the Stripe API client as you normally would
+```
+
+## Custom cURL Options (e.g. proxies)
+
+Need to set a proxy for your requests? Pass in the requisite `CURLOPT_*` array to the CurlClient constructor, using the same syntax as `curl_stopt_array()`. This will set the default cURL options for each HTTP request made by the SDK, though many more common options (e.g. timeouts; see above on how to set those) will be overridden by the client even if set here.
+
+```php
+// set up your tweaked Curl client
+$curl = new \Stripe\HttpClient\CurlClient(array(CURLOPT_PROXY => 'proxy.local:80'));
+// tell Stripe to use the tweaked client
+\Stripe\ApiRequestor::setHttpClient($curl);
+```
+
+Alternately, a callable can be passed to the CurlClient constructor that returns the above array based on request inputs. See `testDefaultOptions()` in `tests/CurlClientTest.php` for an example of this behavior. Note that the callable is called at the beginning of every API request, before the request is sent.
+
+### SSL / TLS compatibility issues
+
+Stripe's API now requires that [all connections use TLS 1.2](https://stripe.com/blog/upgrading-tls). Some systems (most notably some older CentOS and RHEL versions) are capable of using TLS 1.2 but will use TLS 1.0 or 1.1 by default. In this case, you'd get an `invalid_request_error` with the following error message: "Stripe no longer supports API requests made with TLS 1.0. Please initiate HTTPS connections with TLS 1.2 or later. You can learn more about this at [https://stripe.com/blog/upgrading-tls](https://stripe.com/blog/upgrading-tls).".
+
+The recommended course of action is to [upgrade your cURL and OpenSSL packages](https://support.stripe.com/questions/how-do-i-upgrade-my-stripe-integration-from-tls-1-0-to-tls-1-2#php) so that TLS 1.2 is used by default, but if that is not possible, you might be able to solve the issue by setting the `CURLOPT_SSLVERSION` option to either `CURL_SSLVERSION_TLSv1` or `CURL_SSLVERSION_TLSv1_2`:
+
+```php
+$curl = new \Stripe\HttpClient\CurlClient(array(CURLOPT_SSLVERSION => CURL_SSLVERSION_TLSv1));
+\Stripe\ApiRequestor::setHttpClient($curl);
+```
+
+## Development
+
+Install dependencies:
+
+``` bash
+composer install
+```
+
+## Tests
+
+Install dependencies as mentioned above (which will resolve [PHPUnit](http://packagist.org/packages/phpunit/phpunit)), then you can run the test suite:
+
+```bash
+./vendor/bin/phpunit
+```
+
+Or to run an individual test file:
+
+```bash
+./vendor/bin/phpunit tests/UtilTest.php
+```
+
+## Attention plugin developers
+
+Are you writing a plugin that integrates Stripe and embeds our library? Then please use the `setAppInfo` function to identify your plugin. For example:
+
+```php
+\Stripe\Stripe::setAppInfo("MyAwesomePlugin", "1.2.34", "https://myawesomeplugin.info");
+```
+
+The method should be called once, before any request is sent to the API. The second and third parameters are optional.
+
+### SSL / TLS configuration option
+
+See the "SSL / TLS compatibility issues" paragraph above for full context. If you want to ensure that your plugin can be used on all systems, you should add a configuration option to let your users choose between different values for `CURLOPT_SSLVERSION`: none (default), `CURL_SSLVERSION_TLSv1` and `CURL_SSLVERSION_TLSv1_2`.
diff --git a/htdocs/includes/stripe/VERSION b/htdocs/includes/stripe/VERSION
new file mode 100644
index 00000000000..f6cdf40983f
--- /dev/null
+++ b/htdocs/includes/stripe/VERSION
@@ -0,0 +1 @@
+4.7.0
diff --git a/htdocs/includes/stripe/build.php b/htdocs/includes/stripe/build.php
new file mode 100644
index 00000000000..4401bb4b81f
--- /dev/null
+++ b/htdocs/includes/stripe/build.php
@@ -0,0 +1,36 @@
+#!/usr/bin/env php
+<?php
+chdir(dirname(__FILE__));
+
+$autoload = (int)$argv[1];
+$returnStatus = null;
+
+if (!$autoload) {
+    // Modify composer to not autoload Stripe
+    $composer = json_decode(file_get_contents('composer.json'), true);
+    unset($composer['autoload']);
+    unset($composer['require-dev']['squizlabs/php_codesniffer']);
+    file_put_contents('composer.json', json_encode($composer));
+}
+
+passthru('composer install', $returnStatus);
+if ($returnStatus !== 0) {
+    exit(1);
+}
+
+if ($autoload) {
+    // Only run CS on 1 of the 2 environments
+    passthru(
+        './vendor/bin/phpcs --standard=PSR2 -n lib tests *.php',
+        $returnStatus
+    );
+    if ($returnStatus !== 0) {
+        exit(1);
+    }
+}
+
+$config = $autoload ? 'phpunit.xml' : 'phpunit.no_autoload.xml';
+passthru("./vendor/bin/phpunit -c $config", $returnStatus);
+if ($returnStatus !== 0) {
+    exit(1);
+}
diff --git a/htdocs/includes/stripe/composer.json b/htdocs/includes/stripe/composer.json
new file mode 100644
index 00000000000..8cfc38a048d
--- /dev/null
+++ b/htdocs/includes/stripe/composer.json
@@ -0,0 +1,36 @@
+{
+  "name": "stripe/stripe-php",
+  "description": "Stripe PHP Library",
+  "keywords": [
+    "stripe",
+    "payment processing",
+    "api"
+  ],
+  "homepage": "https://stripe.com/",
+  "license": "MIT",
+  "authors": [
+    {
+      "name": "Stripe and contributors",
+      "homepage": "https://github.com/stripe/stripe-php/contributors"
+    }
+  ],
+  "require": {
+    "php": ">=5.3.3",
+    "ext-curl": "*",
+    "ext-json": "*",
+    "ext-mbstring": "*"
+  },
+  "require-dev": {
+    "phpunit/phpunit": "~4.0",
+    "satooshi/php-coveralls": "~0.6.1",
+    "squizlabs/php_codesniffer": "~2.0"
+  },
+  "autoload": {
+    "psr-4": { "Stripe\\" : "lib/" }
+  },
+  "extra": {
+    "branch-alias": {
+      "dev-master": "2.0-dev"
+    }
+  }
+}
diff --git a/htdocs/includes/stripe/data/ca-certificates.crt b/htdocs/includes/stripe/data/ca-certificates.crt
new file mode 100644
index 00000000000..1c4e5b22673
--- /dev/null
+++ b/htdocs/includes/stripe/data/ca-certificates.crt
@@ -0,0 +1,3919 @@
+##
+## Bundle of CA Root Certificates
+##
+## Certificate data from Mozilla as of: Fri Jan 22 20:39:57 2016
+##
+## This is a bundle of X.509 certificates of public Certificate Authorities
+## (CA). These were automatically extracted from Mozilla's root certificates
+## file (certdata.txt).  This file can be found in the mozilla source tree:
+## http://hg.mozilla.org/releases/mozilla-release/raw-file/default/security/nss/lib/ckfw/builtins/certdata.txt
+##
+## It contains the certificates in PEM format and therefore
+## can be directly used with curl / libcurl / php_curl, or with
+## an Apache+mod_ssl webserver for SSL client authentication.
+## Just configure this file as the SSLCACertificateFile.
+##
+## Conversion done with mk-ca-bundle.pl version 1.25.
+## SHA1: 0ab47e2f41518f8d223eab517cb799e5b071231e
+##
+
+
+GlobalSign Root CA
+==================
+-----BEGIN CERTIFICATE-----
+MIIDdTCCAl2gAwIBAgILBAAAAAABFUtaw5QwDQYJKoZIhvcNAQEFBQAwVzELMAkGA1UEBhMCQkUx
+GTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYtc2ExEDAOBgNVBAsTB1Jvb3QgQ0ExGzAZBgNVBAMTEkds
+b2JhbFNpZ24gUm9vdCBDQTAeFw05ODA5MDExMjAwMDBaFw0yODAxMjgxMjAwMDBaMFcxCzAJBgNV
+BAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMRAwDgYDVQQLEwdSb290IENBMRswGQYD
+VQQDExJHbG9iYWxTaWduIFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDa
+DuaZjc6j40+Kfvvxi4Mla+pIH/EqsLmVEQS98GPR4mdmzxzdzxtIK+6NiY6arymAZavpxy0Sy6sc
+THAHoT0KMM0VjU/43dSMUBUc71DuxC73/OlS8pF94G3VNTCOXkNz8kHp1Wrjsok6Vjk4bwY8iGlb
+Kk3Fp1S4bInMm/k8yuX9ifUSPJJ4ltbcdG6TRGHRjcdGsnUOhugZitVtbNV4FpWi6cgKOOvyJBNP
+c1STE4U6G7weNLWLBYy5d4ux2x8gkasJU26Qzns3dLlwR5EiUWMWea6xrkEmCMgZK9FGqkjWZCrX
+gzT/LCrBbBlDSgeF59N89iFo7+ryUp9/k5DPAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNV
+HRMBAf8EBTADAQH/MB0GA1UdDgQWBBRge2YaRQ2XyolQL30EzTSo//z9SzANBgkqhkiG9w0BAQUF
+AAOCAQEA1nPnfE920I2/7LqivjTFKDK1fPxsnCwrvQmeU79rXqoRSLblCKOzyj1hTdNGCbM+w6Dj
+Y1Ub8rrvrTnhQ7k4o+YviiY776BQVvnGCv04zcQLcFGUl5gE38NflNUVyRRBnMRddWQVDf9VMOyG
+j/8N7yy5Y0b2qvzfvGn9LhJIZJrglfCm7ymPAbEVtQwdpf5pLGkkeB6zpxxxYu7KyJesF12KwvhH
+hm4qxFYxldBniYUr+WymXUadDKqC5JlR3XC321Y9YeRq4VzW9v493kHMB65jUr9TU/Qr6cf9tveC
+X4XSQRjbgbMEHMUfpIBvFSDJ3gyICh3WZlXi/EjJKSZp4A==
+-----END CERTIFICATE-----
+
+GlobalSign Root CA - R2
+=======================
+-----BEGIN CERTIFICATE-----
+MIIDujCCAqKgAwIBAgILBAAAAAABD4Ym5g0wDQYJKoZIhvcNAQEFBQAwTDEgMB4GA1UECxMXR2xv
+YmFsU2lnbiBSb290IENBIC0gUjIxEzARBgNVBAoTCkdsb2JhbFNpZ24xEzARBgNVBAMTCkdsb2Jh
+bFNpZ24wHhcNMDYxMjE1MDgwMDAwWhcNMjExMjE1MDgwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxT
+aWduIFJvb3QgQ0EgLSBSMjETMBEGA1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2ln
+bjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKbPJA6+Lm8omUVCxKs+IVSbC9N/hHD6
+ErPLv4dfxn+G07IwXNb9rfF73OX4YJYJkhD10FPe+3t+c4isUoh7SqbKSaZeqKeMWhG8eoLrvozp
+s6yWJQeXSpkqBy+0Hne/ig+1AnwblrjFuTosvNYSuetZfeLQBoZfXklqtTleiDTsvHgMCJiEbKjN
+S7SgfQx5TfC4LcshytVsW33hoCmEofnTlEnLJGKRILzdC9XZzPnqJworc5HGnRusyMvo4KD0L5CL
+TfuwNhv2GXqF4G3yYROIXJ/gkwpRl4pazq+r1feqCapgvdzZX99yqWATXgAByUr6P6TqBwMhAo6C
+ygPCm48CAwEAAaOBnDCBmTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4E
+FgQUm+IHV2ccHsBqBt5ZtJot39wZhi4wNgYDVR0fBC8wLTAroCmgJ4YlaHR0cDovL2NybC5nbG9i
+YWxzaWduLm5ldC9yb290LXIyLmNybDAfBgNVHSMEGDAWgBSb4gdXZxwewGoG3lm0mi3f3BmGLjAN
+BgkqhkiG9w0BAQUFAAOCAQEAmYFThxxol4aR7OBKuEQLq4GsJ0/WwbgcQ3izDJr86iw8bmEbTUsp
+9Z8FHSbBuOmDAGJFtqkIk7mpM0sYmsL4h4hO291xNBrBVNpGP+DTKqttVCL1OmLNIG+6KYnX3ZHu
+01yiPqFbQfXf5WRDLenVOavSot+3i9DAgBkcRcAtjOj4LaR0VknFBbVPFd5uRHg5h6h+u/N5GJG7
+9G+dwfCMNYxdAfvDbbnvRG15RjF+Cv6pgsH/76tuIMRQyV+dTZsXjAzlAcmgQWpzU/qlULRuJQ/7
+TBj0/VLZjmmx6BEP3ojY+x1J96relc8geMJgEtslQIxq/H5COEBkEveegeGTLg==
+-----END CERTIFICATE-----
+
+Verisign Class 3 Public Primary Certification Authority - G3
+============================================================
+-----BEGIN CERTIFICATE-----
+MIIEGjCCAwICEQCbfgZJoz5iudXukEhxKe9XMA0GCSqGSIb3DQEBBQUAMIHKMQswCQYDVQQGEwJV
+UzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0IE5ldHdv
+cmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNl
+IG9ubHkxRTBDBgNVBAMTPFZlcmlTaWduIENsYXNzIDMgUHVibGljIFByaW1hcnkgQ2VydGlmaWNh
+dGlvbiBBdXRob3JpdHkgLSBHMzAeFw05OTEwMDEwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMIHKMQsw
+CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRy
+dXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhv
+cml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWduIENsYXNzIDMgUHVibGljIFByaW1hcnkg
+Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAMu6nFL8eB8aHm8bN3O9+MlrlBIwT/A2R/XQkQr1F8ilYcEWQE37imGQ5XYgwREGfassbqb1
+EUGO+i2tKmFZpGcmTNDovFJbcCAEWNF6yaRpvIMXZK0Fi7zQWM6NjPXr8EJJC52XJ2cybuGukxUc
+cLwgTS8Y3pKI6GyFVxEa6X7jJhFUokWWVYPKMIno3Nij7SqAP395ZVc+FSBmCC+Vk7+qRy+oRpfw
+EuL+wgorUeZ25rdGt+INpsyow0xZVYnm6FNcHOqd8GIWC6fJXwzw3sJ2zq/3avL6QaaiMxTJ5Xpj
+055iN9WFZZ4O5lMkdBteHRJTW8cs54NJOxWuimi5V5cCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
+ERSWwauSCPc/L8my/uRan2Te2yFPhpk0djZX3dAVL8WtfxUfN2JzPtTnX84XA9s1+ivbrmAJXx5f
+j267Cz3qWhMeDGBvtcC1IyIuBwvLqXTLR7sdwdela8wv0kL9Sd2nic9TutoAWii/gt/4uhMdUIaC
+/Y4wjylGsB49Ndo4YhYYSq3mtlFs3q9i6wHQHiT+eo8SGhJouPtmmRQURVyu565pF4ErWjfJXir0
+xuKhXFSbplQAz/DxwceYMBo7Nhbbo27q/a2ywtrvAkcTisDxszGtTxzhT5yvDwyd93gN2PQ1VoDa
+t20Xj50egWTh/sVFuq1ruQp6Tk9LhO5L8X3dEQ==
+-----END CERTIFICATE-----
+
+Entrust.net Premium 2048 Secure Server CA
+=========================================
+-----BEGIN CERTIFICATE-----
+MIIEKjCCAxKgAwIBAgIEOGPe+DANBgkqhkiG9w0BAQUFADCBtDEUMBIGA1UEChMLRW50cnVzdC5u
+ZXQxQDA+BgNVBAsUN3d3dy5lbnRydXN0Lm5ldC9DUFNfMjA0OCBpbmNvcnAuIGJ5IHJlZi4gKGxp
+bWl0cyBsaWFiLikxJTAjBgNVBAsTHChjKSAxOTk5IEVudHJ1c3QubmV0IExpbWl0ZWQxMzAxBgNV
+BAMTKkVudHJ1c3QubmV0IENlcnRpZmljYXRpb24gQXV0aG9yaXR5ICgyMDQ4KTAeFw05OTEyMjQx
+NzUwNTFaFw0yOTA3MjQxNDE1MTJaMIG0MRQwEgYDVQQKEwtFbnRydXN0Lm5ldDFAMD4GA1UECxQ3
+d3d3LmVudHJ1c3QubmV0L0NQU18yMDQ4IGluY29ycC4gYnkgcmVmLiAobGltaXRzIGxpYWIuKTEl
+MCMGA1UECxMcKGMpIDE5OTkgRW50cnVzdC5uZXQgTGltaXRlZDEzMDEGA1UEAxMqRW50cnVzdC5u
+ZXQgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgKDIwNDgpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEArU1LqRKGsuqjIAcVFmQqK0vRvwtKTY7tgHalZ7d4QMBzQshowNtTK91euHaYNZOL
+Gp18EzoOH1u3Hs/lJBQesYGpjX24zGtLA/ECDNyrpUAkAH90lKGdCCmziAv1h3edVc3kw37XamSr
+hRSGlVuXMlBvPci6Zgzj/L24ScF2iUkZ/cCovYmjZy/Gn7xxGWC4LeksyZB2ZnuU4q941mVTXTzW
+nLLPKQP5L6RQstRIzgUyVYr9smRMDuSYB3Xbf9+5CFVghTAp+XtIpGmG4zU/HoZdenoVve8AjhUi
+VBcAkCaTvA5JaJG/+EfTnZVCwQ5N328mz8MYIWJmQ3DW1cAH4QIDAQABo0IwQDAOBgNVHQ8BAf8E
+BAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUVeSB0RGAvtiJuQijMfmhJAkWuXAwDQYJ
+KoZIhvcNAQEFBQADggEBADubj1abMOdTmXx6eadNl9cZlZD7Bh/KM3xGY4+WZiT6QBshJ8rmcnPy
+T/4xmf3IDExoU8aAghOY+rat2l098c5u9hURlIIM7j+VrxGrD9cv3h8Dj1csHsm7mhpElesYT6Yf
+zX1XEC+bBAlahLVu2B064dae0Wx5XnkcFMXj0EyTO2U87d89vqbllRrDtRnDvV5bu/8j72gZyxKT
+J1wDLW8w0B62GqzeWvfRqqgnpv55gcR5mTNXuhKwqeBCbJPKVt7+bYQLCIt+jerXmCHG8+c8eS9e
+nNFMFY3h7CI3zJpDC5fcgJCNs2ebb0gIFVbPv/ErfF6adulZkMV8gzURZVE=
+-----END CERTIFICATE-----
+
+Baltimore CyberTrust Root
+=========================
+-----BEGIN CERTIFICATE-----
+MIIDdzCCAl+gAwIBAgIEAgAAuTANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQGEwJJRTESMBAGA1UE
+ChMJQmFsdGltb3JlMRMwEQYDVQQLEwpDeWJlclRydXN0MSIwIAYDVQQDExlCYWx0aW1vcmUgQ3li
+ZXJUcnVzdCBSb290MB4XDTAwMDUxMjE4NDYwMFoXDTI1MDUxMjIzNTkwMFowWjELMAkGA1UEBhMC
+SUUxEjAQBgNVBAoTCUJhbHRpbW9yZTETMBEGA1UECxMKQ3liZXJUcnVzdDEiMCAGA1UEAxMZQmFs
+dGltb3JlIEN5YmVyVHJ1c3QgUm9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKME
+uyKrmD1X6CZymrV51Cni4eiVgLGw41uOKymaZN+hXe2wCQVt2yguzmKiYv60iNoS6zjrIZ3AQSsB
+UnuId9Mcj8e6uYi1agnnc+gRQKfRzMpijS3ljwumUNKoUMMo6vWrJYeKmpYcqWe4PwzV9/lSEy/C
+G9VwcPCPwBLKBsua4dnKM3p31vjsufFoREJIE9LAwqSuXmD+tqYF/LTdB1kC1FkYmGP1pWPgkAx9
+XbIGevOF6uvUA65ehD5f/xXtabz5OTZydc93Uk3zyZAsuT3lySNTPx8kmCFcB5kpvcY67Oduhjpr
+l3RjM71oGDHweI12v/yejl0qhqdNkNwnGjkCAwEAAaNFMEMwHQYDVR0OBBYEFOWdWTCCR1jMrPoI
+VDaGezq1BE3wMBIGA1UdEwEB/wQIMAYBAf8CAQMwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEB
+BQUAA4IBAQCFDF2O5G9RaEIFoN27TyclhAO992T9Ldcw46QQF+vaKSm2eT929hkTI7gQCvlYpNRh
+cL0EYWoSihfVCr3FvDB81ukMJY2GQE/szKN+OMY3EU/t3WgxjkzSswF07r51XgdIGn9w/xZchMB5
+hbgF/X++ZRGjD8ACtPhSNzkE1akxehi/oCr0Epn3o0WC4zxe9Z2etciefC7IpJ5OCBRLbf1wbWsa
+Y71k5h+3zvDyny67G7fyUIhzksLi4xaNmjICq44Y3ekQEe5+NauQrz4wlHrQMz2nZQ/1/I6eYs9H
+RCwBXbsdtTLSR9I4LtD+gdwyah617jzV/OeBHRnDJELqYzmp
+-----END CERTIFICATE-----
+
+AddTrust Low-Value Services Root
+================================
+-----BEGIN CERTIFICATE-----
+MIIEGDCCAwCgAwIBAgIBATANBgkqhkiG9w0BAQUFADBlMQswCQYDVQQGEwJTRTEUMBIGA1UEChML
+QWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3b3JrMSEwHwYDVQQDExhBZGRU
+cnVzdCBDbGFzcyAxIENBIFJvb3QwHhcNMDAwNTMwMTAzODMxWhcNMjAwNTMwMTAzODMxWjBlMQsw
+CQYDVQQGEwJTRTEUMBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBO
+ZXR3b3JrMSEwHwYDVQQDExhBZGRUcnVzdCBDbGFzcyAxIENBIFJvb3QwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQCWltQhSWDia+hBBwzexODcEyPNwTXH+9ZOEQpnXvUGW2ulCDtbKRY6
+54eyNAbFvAWlA3yCyykQruGIgb3WntP+LVbBFc7jJp0VLhD7Bo8wBN6ntGO0/7Gcrjyvd7ZWxbWr
+oulpOj0OM3kyP3CCkplhbY0wCI9xP6ZIVxn4JdxLZlyldI+Yrsj5wAYi56xz36Uu+1LcsRVlIPo1
+Zmne3yzxbrww2ywkEtvrNTVokMsAsJchPXQhI2U0K7t4WaPW4XY5mqRJjox0r26kmqPZm9I4XJui
+GMx1I4S+6+JNM3GOGvDC+Mcdoq0Dlyz4zyXG9rgkMbFjXZJ/Y/AlyVMuH79NAgMBAAGjgdIwgc8w
+HQYDVR0OBBYEFJWxtPCUtr3H2tERCSG+wa9J/RB7MAsGA1UdDwQEAwIBBjAPBgNVHRMBAf8EBTAD
+AQH/MIGPBgNVHSMEgYcwgYSAFJWxtPCUtr3H2tERCSG+wa9J/RB7oWmkZzBlMQswCQYDVQQGEwJT
+RTEUMBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3b3JrMSEw
+HwYDVQQDExhBZGRUcnVzdCBDbGFzcyAxIENBIFJvb3SCAQEwDQYJKoZIhvcNAQEFBQADggEBACxt
+ZBsfzQ3duQH6lmM0MkhHma6X7f1yFqZzR1r0693p9db7RcwpiURdv0Y5PejuvE1Uhh4dbOMXJ0Ph
+iVYrqW9yTkkz43J8KiOavD7/KCrto/8cI7pDVwlnTUtiBi34/2ydYB7YHEt9tTEv2dB8Xfjea4MY
+eDdXL+gzB2ffHsdrKpV2ro9Xo/D0UrSpUwjP4E/TelOL/bscVjby/rK25Xa71SJlpz/+0WatC7xr
+mYbvP33zGDLKe8bjq2RGlfgmadlVg3sslgf/WSxEo8bl6ancoWOAWiFeIc9TVPC6b4nbqKqVz4vj
+ccweGyBECMB6tkD9xOQ14R0WHNC8K47Wcdk=
+-----END CERTIFICATE-----
+
+AddTrust External Root
+======================
+-----BEGIN CERTIFICATE-----
+MIIENjCCAx6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBvMQswCQYDVQQGEwJTRTEUMBIGA1UEChML
+QWRkVHJ1c3QgQUIxJjAkBgNVBAsTHUFkZFRydXN0IEV4dGVybmFsIFRUUCBOZXR3b3JrMSIwIAYD
+VQQDExlBZGRUcnVzdCBFeHRlcm5hbCBDQSBSb290MB4XDTAwMDUzMDEwNDgzOFoXDTIwMDUzMDEw
+NDgzOFowbzELMAkGA1UEBhMCU0UxFDASBgNVBAoTC0FkZFRydXN0IEFCMSYwJAYDVQQLEx1BZGRU
+cnVzdCBFeHRlcm5hbCBUVFAgTmV0d29yazEiMCAGA1UEAxMZQWRkVHJ1c3QgRXh0ZXJuYWwgQ0Eg
+Um9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALf3GjPm8gAELTngTlvtH7xsD821
++iO2zt6bETOXpClMfZOfvUq8k+0DGuOPz+VtUFrWlymUWoCwSXrbLpX9uMq/NzgtHj6RQa1wVsfw
+Tz/oMp50ysiQVOnGXw94nZpAPA6sYapeFI+eh6FqUNzXmk6vBbOmcZSccbNQYArHE504B4YCqOmo
+aSYYkKtMsE8jqzpPhNjfzp/haW+710LXa0Tkx63ubUFfclpxCDezeWWkWaCUN/cALw3CknLa0Dhy
+2xSoRcRdKn23tNbE7qzNE0S3ySvdQwAl+mG5aWpYIxG3pzOPVnVZ9c0p10a3CitlttNCbxWyuHv7
+7+ldU9U0WicCAwEAAaOB3DCB2TAdBgNVHQ4EFgQUrb2YejS0Jvf6xCZU7wO94CTLVBowCwYDVR0P
+BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wgZkGA1UdIwSBkTCBjoAUrb2YejS0Jvf6xCZU7wO94CTL
+VBqhc6RxMG8xCzAJBgNVBAYTAlNFMRQwEgYDVQQKEwtBZGRUcnVzdCBBQjEmMCQGA1UECxMdQWRk
+VHJ1c3QgRXh0ZXJuYWwgVFRQIE5ldHdvcmsxIjAgBgNVBAMTGUFkZFRydXN0IEV4dGVybmFsIENB
+IFJvb3SCAQEwDQYJKoZIhvcNAQEFBQADggEBALCb4IUlwtYj4g+WBpKdQZic2YR5gdkeWxQHIzZl
+j7DYd7usQWxHYINRsPkyPef89iYTx4AWpb9a/IfPeHmJIZriTAcKhjW88t5RxNKWt9x+Tu5w/Rw5
+6wwCURQtjr0W4MHfRnXnJK3s9EK0hZNwEGe6nQY1ShjTK3rMUUKhemPR5ruhxSvCNr4TDea9Y355
+e6cJDUCrat2PisP29owaQgVR1EX1n6diIWgVIEM8med8vSTYqZEXc4g/VhsxOBi0cQ+azcgOno4u
+G+GMmIPLHzHxREzGBHNJdmAPx/i9F4BrLunMTA5amnkPIAou1Z5jJh5VkpTYghdae9C8x49OhgQ=
+-----END CERTIFICATE-----
+
+AddTrust Public Services Root
+=============================
+-----BEGIN CERTIFICATE-----
+MIIEFTCCAv2gAwIBAgIBATANBgkqhkiG9w0BAQUFADBkMQswCQYDVQQGEwJTRTEUMBIGA1UEChML
+QWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3b3JrMSAwHgYDVQQDExdBZGRU
+cnVzdCBQdWJsaWMgQ0EgUm9vdDAeFw0wMDA1MzAxMDQxNTBaFw0yMDA1MzAxMDQxNTBaMGQxCzAJ
+BgNVBAYTAlNFMRQwEgYDVQQKEwtBZGRUcnVzdCBBQjEdMBsGA1UECxMUQWRkVHJ1c3QgVFRQIE5l
+dHdvcmsxIDAeBgNVBAMTF0FkZFRydXN0IFB1YmxpYyBDQSBSb290MIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEA6Rowj4OIFMEg2Dybjxt+A3S72mnTRqX4jsIMEZBRpS9mVEBV6tsfSlbu
+nyNu9DnLoblv8n75XYcmYZ4c+OLspoH4IcUkzBEMP9smcnrHAZcHF/nXGCwwfQ56HmIexkvA/X1i
+d9NEHif2P0tEs7c42TkfYNVRknMDtABp4/MUTu7R3AnPdzRGULD4EfL+OHn3Bzn+UZKXC1sIXzSG
+Aa2Il+tmzV7R/9x98oTaunet3IAIx6eH1lWfl2royBFkuucZKT8Rs3iQhCBSWxHveNCD9tVIkNAw
+HM+A+WD+eeSI8t0A65RF62WUaUC6wNW0uLp9BBGo6zEFlpROWCGOn9Bg/QIDAQABo4HRMIHOMB0G
+A1UdDgQWBBSBPjfYkrAfd59ctKtzquf2NGAv+jALBgNVHQ8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB
+/zCBjgYDVR0jBIGGMIGDgBSBPjfYkrAfd59ctKtzquf2NGAv+qFopGYwZDELMAkGA1UEBhMCU0Ux
+FDASBgNVBAoTC0FkZFRydXN0IEFCMR0wGwYDVQQLExRBZGRUcnVzdCBUVFAgTmV0d29yazEgMB4G
+A1UEAxMXQWRkVHJ1c3QgUHVibGljIENBIFJvb3SCAQEwDQYJKoZIhvcNAQEFBQADggEBAAP3FUr4
+JNojVhaTdt02KLmuG7jD8WS6IBh4lSknVwW8fCr0uVFV2ocC3g8WFzH4qnkuCRO7r7IgGRLlk/lL
++YPoRNWyQSW/iHVv/xD8SlTQX/D67zZzfRs2RcYhbbQVuE7PnFylPVoAjgbjPGsye/Kf8Lb93/Ao
+GEjwxrzQvzSAlsJKsW2Ox5BF3i9nrEUEo3rcVZLJR2bYGozH7ZxOmuASu7VqTITh4SINhwBk/ox9
+Yjllpu9CtoAlEmEBqCQTcAARJl/6NVDFSMwGR+gn2HCNX2TmoUQmXiLsks3/QppEIW1cxeMiHV9H
+EufOX1362KqxMy3ZdvJOOjMMK7MtkAY=
+-----END CERTIFICATE-----
+
+AddTrust Qualified Certificates Root
+====================================
+-----BEGIN CERTIFICATE-----
+MIIEHjCCAwagAwIBAgIBATANBgkqhkiG9w0BAQUFADBnMQswCQYDVQQGEwJTRTEUMBIGA1UEChML
+QWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3b3JrMSMwIQYDVQQDExpBZGRU
+cnVzdCBRdWFsaWZpZWQgQ0EgUm9vdDAeFw0wMDA1MzAxMDQ0NTBaFw0yMDA1MzAxMDQ0NTBaMGcx
+CzAJBgNVBAYTAlNFMRQwEgYDVQQKEwtBZGRUcnVzdCBBQjEdMBsGA1UECxMUQWRkVHJ1c3QgVFRQ
+IE5ldHdvcmsxIzAhBgNVBAMTGkFkZFRydXN0IFF1YWxpZmllZCBDQSBSb290MIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5B6a/twJWoekn0e+EV+vhDTbYjx5eLfpMLXsDBwqxBb/4Oxx
+64r1EW7tTw2R0hIYLUkVAcKkIhPHEWT/IhKauY5cLwjPcWqzZwFZ8V1G87B4pfYOQnrjfxvM0PC3
+KP0q6p6zsLkEqv32x7SxuCqg+1jxGaBvcCV+PmlKfw8i2O+tCBGaKZnhqkRFmhJePp1tUvznoD1o
+L/BLcHwTOK28FSXx1s6rosAx1i+f4P8UWfyEk9mHfExUE+uf0S0R+Bg6Ot4l2ffTQO2kBhLEO+GR
+wVY18BTcZTYJbqukB8c10cIDMzZbdSZtQvESa0NvS3GU+jQd7RNuyoB/mC9suWXY6QIDAQABo4HU
+MIHRMB0GA1UdDgQWBBQ5lYtii1zJ1IC6WA+XPxUIQ8yYpzALBgNVHQ8EBAMCAQYwDwYDVR0TAQH/
+BAUwAwEB/zCBkQYDVR0jBIGJMIGGgBQ5lYtii1zJ1IC6WA+XPxUIQ8yYp6FrpGkwZzELMAkGA1UE
+BhMCU0UxFDASBgNVBAoTC0FkZFRydXN0IEFCMR0wGwYDVQQLExRBZGRUcnVzdCBUVFAgTmV0d29y
+azEjMCEGA1UEAxMaQWRkVHJ1c3QgUXVhbGlmaWVkIENBIFJvb3SCAQEwDQYJKoZIhvcNAQEFBQAD
+ggEBABmrder4i2VhlRO6aQTvhsoToMeqT2QbPxj2qC0sVY8FtzDqQmodwCVRLae/DLPt7wh/bDxG
+GuoYQ992zPlmhpwsaPXpF/gxsxjE1kh9I0xowX67ARRvxdlu3rsEQmr49lx95dr6h+sNNVJn0J6X
+dgWTP5XHAeZpVTh/EGGZyeNfpso+gmNIquIISD6q8rKFYqa0p9m9N5xotS1WfbC3P6CxB9bpT9ze
+RXEwMn8bLgn5v1Kh7sKAPgZcLlVAwRv1cEWw3F369nJad9Jjzc9YiQBCYz95OdBEsIJuQRno3eDB
+iFrRHnGTHyQwdOUeqN48Jzd/g66ed8/wMLH/S5noxqE=
+-----END CERTIFICATE-----
+
+Entrust Root Certification Authority
+====================================
+-----BEGIN CERTIFICATE-----
+MIIEkTCCA3mgAwIBAgIERWtQVDANBgkqhkiG9w0BAQUFADCBsDELMAkGA1UEBhMCVVMxFjAUBgNV
+BAoTDUVudHJ1c3QsIEluYy4xOTA3BgNVBAsTMHd3dy5lbnRydXN0Lm5ldC9DUFMgaXMgaW5jb3Jw
+b3JhdGVkIGJ5IHJlZmVyZW5jZTEfMB0GA1UECxMWKGMpIDIwMDYgRW50cnVzdCwgSW5jLjEtMCsG
+A1UEAxMkRW50cnVzdCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA2MTEyNzIwMjM0
+MloXDTI2MTEyNzIwNTM0MlowgbAxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1FbnRydXN0LCBJbmMu
+MTkwNwYDVQQLEzB3d3cuZW50cnVzdC5uZXQvQ1BTIGlzIGluY29ycG9yYXRlZCBieSByZWZlcmVu
+Y2UxHzAdBgNVBAsTFihjKSAyMDA2IEVudHJ1c3QsIEluYy4xLTArBgNVBAMTJEVudHJ1c3QgUm9v
+dCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+ALaVtkNC+sZtKm9I35RMOVcF7sN5EUFoNu3s/poBj6E4KPz3EEZmLk0eGrEaTsbRwJWIsMn/MYsz
+A9u3g3s+IIRe7bJWKKf44LlAcTfFy0cOlypowCKVYhXbR9n10Cv/gkvJrT7eTNuQgFA/CYqEAOww
+Cj0Yzfv9KlmaI5UXLEWeH25DeW0MXJj+SKfFI0dcXv1u5x609mhF0YaDW6KKjbHjKYD+JXGIrb68
+j6xSlkuqUY3kEzEZ6E5Nn9uss2rVvDlUccp6en+Q3X0dgNmBu1kmwhH+5pPi94DkZfs0Nw4pgHBN
+rziGLp5/V6+eF67rHMsoIV+2HNjnogQi+dPa2MsCAwEAAaOBsDCBrTAOBgNVHQ8BAf8EBAMCAQYw
+DwYDVR0TAQH/BAUwAwEB/zArBgNVHRAEJDAigA8yMDA2MTEyNzIwMjM0MlqBDzIwMjYxMTI3MjA1
+MzQyWjAfBgNVHSMEGDAWgBRokORnpKZTgMeGZqTx90tD+4S9bTAdBgNVHQ4EFgQUaJDkZ6SmU4DH
+hmak8fdLQ/uEvW0wHQYJKoZIhvZ9B0EABBAwDhsIVjcuMTo0LjADAgSQMA0GCSqGSIb3DQEBBQUA
+A4IBAQCT1DCw1wMgKtD5Y+iRDAUgqV8ZyntyTtSx29CW+1RaGSwMCPeyvIWonX9tO1KzKtvn1ISM
+Y/YPyyYBkVBs9F8U4pN0wBOeMDpQ47RgxRzwIkSNcUesyBrJ6ZuaAGAT/3B+XxFNSRuzFVJ7yVTa
+v52Vr2ua2J7p8eRDjeIRRDq/r72DQnNSi6q7pynP9WQcCk3RvKqsnyrQ/39/2n3qse0wJcGE2jTS
+W3iDVuycNsMm4hH2Z0kdkquM++v/eu6FSqdQgPCnXEqULl8FmTxSQeDNtGPPAUO6nIPcj2A781q0
+tHuu2guQOHXvgR1m0vdXcDazv/wor3ElhVsT/h5/WrQ8
+-----END CERTIFICATE-----
+
+RSA Security 2048 v3
+====================
+-----BEGIN CERTIFICATE-----
+MIIDYTCCAkmgAwIBAgIQCgEBAQAAAnwAAAAKAAAAAjANBgkqhkiG9w0BAQUFADA6MRkwFwYDVQQK
+ExBSU0EgU2VjdXJpdHkgSW5jMR0wGwYDVQQLExRSU0EgU2VjdXJpdHkgMjA0OCBWMzAeFw0wMTAy
+MjIyMDM5MjNaFw0yNjAyMjIyMDM5MjNaMDoxGTAXBgNVBAoTEFJTQSBTZWN1cml0eSBJbmMxHTAb
+BgNVBAsTFFJTQSBTZWN1cml0eSAyMDQ4IFYzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAt49VcdKA3XtpeafwGFAyPGJn9gqVB93mG/Oe2dJBVGutn3y+Gc37RqtBaB4Y6lXIL5F4iSj7
+Jylg/9+PjDvJSZu1pJTOAeo+tWN7fyb9Gd3AIb2E0S1PRsNO3Ng3OTsor8udGuorryGlwSMiuLgb
+WhOHV4PR8CDn6E8jQrAApX2J6elhc5SYcSa8LWrg903w8bYqODGBDSnhAMFRD0xS+ARaqn1y07iH
+KrtjEAMqs6FPDVpeRrc9DvV07Jmf+T0kgYim3WBU6JU2PcYJk5qjEoAAVZkZR73QpXzDuvsf9/UP
++Ky5tfQ3mBMY3oVbtwyCO4dvlTlYMNpuAWgXIszACwIDAQABo2MwYTAPBgNVHRMBAf8EBTADAQH/
+MA4GA1UdDwEB/wQEAwIBBjAfBgNVHSMEGDAWgBQHw1EwpKrpRa41JPr/JCwz0LGdjDAdBgNVHQ4E
+FgQUB8NRMKSq6UWuNST6/yQsM9CxnYwwDQYJKoZIhvcNAQEFBQADggEBAF8+hnZuuDU8TjYcHnmY
+v/3VEhF5Ug7uMYm83X/50cYVIeiKAVQNOvtUudZj1LGqlk2iQk3UUx+LEN5/Zb5gEydxiKRz44Rj
+0aRV4VCT5hsOedBnvEbIvz8XDZXmxpBp3ue0L96VfdASPz0+f00/FGj1EVDVwfSQpQgdMWD/YIwj
+VAqv/qFuxdF6Kmh4zx6CCiC0H63lhbJqaHVOrSU3lIW+vaHU6rcMSzyd6BIA8F+sDeGscGNz9395
+nzIlQnQFgCi/vcEkllgVsRch6YlL2weIZ/QVrXA+L02FO8K32/6YaCOJ4XQP3vTFhGMpG8zLB8kA
+pKnXwiJPZ9d37CAFYd4=
+-----END CERTIFICATE-----
+
+GeoTrust Global CA
+==================
+-----BEGIN CERTIFICATE-----
+MIIDVDCCAjygAwIBAgIDAjRWMA0GCSqGSIb3DQEBBQUAMEIxCzAJBgNVBAYTAlVTMRYwFAYDVQQK
+Ew1HZW9UcnVzdCBJbmMuMRswGQYDVQQDExJHZW9UcnVzdCBHbG9iYWwgQ0EwHhcNMDIwNTIxMDQw
+MDAwWhcNMjIwNTIxMDQwMDAwWjBCMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5j
+LjEbMBkGA1UEAxMSR2VvVHJ1c3QgR2xvYmFsIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEA2swYYzD99BcjGlZ+W988bDjkcbd4kdS8odhM+KhDtgPpTSEHCIjaWC9mOSm9BXiLnTjo
+BbdqfnGk5sRgprDvgOSJKA+eJdbtg/OtppHHmMlCGDUUna2YRpIuT8rxh0PBFpVXLVDviS2Aelet
+8u5fa9IAjbkU+BQVNdnARqN7csiRv8lVK83Qlz6cJmTM386DGXHKTubU1XupGc1V3sjs0l44U+Vc
+T4wt/lAjNvxm5suOpDkZALeVAjmRCw7+OC7RHQWa9k0+bw8HHa8sHo9gOeL6NlMTOdReJivbPagU
+vTLrGAMoUgRx5aszPeE4uwc2hGKceeoWMPRfwCvocWvk+QIDAQABo1MwUTAPBgNVHRMBAf8EBTAD
+AQH/MB0GA1UdDgQWBBTAephojYn7qwVkDBF9qn1luMrMTjAfBgNVHSMEGDAWgBTAephojYn7qwVk
+DBF9qn1luMrMTjANBgkqhkiG9w0BAQUFAAOCAQEANeMpauUvXVSOKVCUn5kaFOSPeCpilKInZ57Q
+zxpeR+nBsqTP3UEaBU6bS+5Kb1VSsyShNwrrZHYqLizz/Tt1kL/6cdjHPTfStQWVYrmm3ok9Nns4
+d0iXrKYgjy6myQzCsplFAMfOEVEiIuCl6rYVSAlk6l5PdPcFPseKUgzbFbS9bZvlxrFUaKnjaZC2
+mqUPuLk/IH2uSrW4nOQdtqvmlKXBx4Ot2/Unhw4EbNX/3aBd7YdStysVAq45pmp06drE57xNNB6p
+XE0zX5IJL4hmXXeXxx12E6nV5fEWCRE11azbJHFwLJhWC9kXtNHjUStedejV0NxPNO3CBWaAocvm
+Mw==
+-----END CERTIFICATE-----
+
+GeoTrust Global CA 2
+====================
+-----BEGIN CERTIFICATE-----
+MIIDZjCCAk6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBEMQswCQYDVQQGEwJVUzEWMBQGA1UEChMN
+R2VvVHJ1c3QgSW5jLjEdMBsGA1UEAxMUR2VvVHJ1c3QgR2xvYmFsIENBIDIwHhcNMDQwMzA0MDUw
+MDAwWhcNMTkwMzA0MDUwMDAwWjBEMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5j
+LjEdMBsGA1UEAxMUR2VvVHJ1c3QgR2xvYmFsIENBIDIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQDvPE1APRDfO1MA4Wf+lGAVPoWI8YkNkMgoI5kF6CsgncbzYEbYwbLVjDHZ3CB5JIG/
+NTL8Y2nbsSpr7iFY8gjpeMtvy/wWUsiRxP89c96xPqfCfWbB9X5SJBri1WeR0IIQ13hLTytCOb1k
+LUCgsBDTOEhGiKEMuzozKmKY+wCdE1l/bztyqu6mD4b5BWHqZ38MN5aL5mkWRxHCJ1kDs6ZgwiFA
+Vvqgx306E+PsV8ez1q6diYD3Aecs9pYrEw15LNnA5IZ7S4wMcoKK+xfNAGw6EzywhIdLFnopsk/b
+HdQL82Y3vdj2V7teJHq4PIu5+pIaGoSe2HSPqht/XvT+RSIhAgMBAAGjYzBhMA8GA1UdEwEB/wQF
+MAMBAf8wHQYDVR0OBBYEFHE4NvICMVNHK266ZUapEBVYIAUJMB8GA1UdIwQYMBaAFHE4NvICMVNH
+K266ZUapEBVYIAUJMA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQUFAAOCAQEAA/e1K6tdEPx7
+srJerJsOflN4WT5CBP51o62sgU7XAotexC3IUnbHLB/8gTKY0UvGkpMzNTEv/NgdRN3ggX+d6Yvh
+ZJFiCzkIjKx0nVnZellSlxG5FntvRdOW2TF9AjYPnDtuzywNA0ZF66D0f0hExghAzN4bcLUprbqL
+OzRldRtxIR0sFAqwlpW41uryZfspuk/qkZN0abby/+Ea0AzRdoXLiiW9l14sbxWZJue2Kf8i7MkC
+x1YAzUm5s2x7UwQa4qjJqhIFI8LO57sEAszAR6LkxCkvW0VXiVHuPOtSCP8HNR6fNWpHSlaY0VqF
+H4z1Ir+rzoPz4iIprn2DQKi6bA==
+-----END CERTIFICATE-----
+
+GeoTrust Universal CA
+=====================
+-----BEGIN CERTIFICATE-----
+MIIFaDCCA1CgAwIBAgIBATANBgkqhkiG9w0BAQUFADBFMQswCQYDVQQGEwJVUzEWMBQGA1UEChMN
+R2VvVHJ1c3QgSW5jLjEeMBwGA1UEAxMVR2VvVHJ1c3QgVW5pdmVyc2FsIENBMB4XDTA0MDMwNDA1
+MDAwMFoXDTI5MDMwNDA1MDAwMFowRTELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IElu
+Yy4xHjAcBgNVBAMTFUdlb1RydXN0IFVuaXZlcnNhbCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIP
+ADCCAgoCggIBAKYVVaCjxuAfjJ0hUNfBvitbtaSeodlyWL0AG0y/YckUHUWCq8YdgNY96xCcOq9t
+JPi8cQGeBvV8Xx7BDlXKg5pZMK4ZyzBIle0iN430SppyZj6tlcDgFgDgEB8rMQ7XlFTTQjOgNB0e
+RXbdT8oYN+yFFXoZCPzVx5zw8qkuEKmS5j1YPakWaDwvdSEYfyh3peFhF7em6fgemdtzbvQKoiFs
+7tqqhZJmr/Z6a4LauiIINQ/PQvE1+mrufislzDoR5G2vc7J2Ha3QsnhnGqQ5HFELZ1aD/ThdDc7d
+8Lsrlh/eezJS/R27tQahsiFepdaVaH/wmZ7cRQg+59IJDTWU3YBOU5fXtQlEIGQWFwMCTFMNaN7V
+qnJNk22CDtucvc+081xdVHppCZbW2xHBjXWotM85yM48vCR85mLK4b19p71XZQvk/iXttmkQ3Cga
+Rr0BHdCXteGYO8A3ZNY9lO4L4fUorgtWv3GLIylBjobFS1J72HGrH4oVpjuDWtdYAVHGTEHZf9hB
+Z3KiKN9gg6meyHv8U3NyWfWTehd2Ds735VzZC1U0oqpbtWpU5xPKV+yXbfReBi9Fi1jUIxaS5BZu
+KGNZMN9QAZxjiRqf2xeUgnA3wySemkfWWspOqGmJch+RbNt+nhutxx9z3SxPGWX9f5NAEC7S8O08
+ni4oPmkmM8V7AgMBAAGjYzBhMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFNq7LqqwDLiIJlF0
+XG0D08DYj3rWMB8GA1UdIwQYMBaAFNq7LqqwDLiIJlF0XG0D08DYj3rWMA4GA1UdDwEB/wQEAwIB
+hjANBgkqhkiG9w0BAQUFAAOCAgEAMXjmx7XfuJRAyXHEqDXsRh3ChfMoWIawC/yOsjmPRFWrZIRc
+aanQmjg8+uUfNeVE44B5lGiku8SfPeE0zTBGi1QrlaXv9z+ZhP015s8xxtxqv6fXIwjhmF7DWgh2
+qaavdy+3YL1ERmrvl/9zlcGO6JP7/TG37FcREUWbMPEaiDnBTzynANXH/KttgCJwpQzgXQQpAvvL
+oJHRfNbDflDVnVi+QTjruXU8FdmbyUqDWcDaU/0zuzYYm4UPFd3uLax2k7nZAY1IEKj79TiG8dsK
+xr2EoyNB3tZ3b4XUhRxQ4K5RirqNPnbiucon8l+f725ZDQbYKxek0nxru18UGkiPGkzns0ccjkxF
+KyDuSN/n3QmOGKjaQI2SJhFTYXNd673nxE0pN2HrrDktZy4W1vUAg4WhzH92xH3kt0tm7wNFYGm2
+DFKWkoRepqO1pD4r2czYG0eq8kTaT/kD6PAUyz/zg97QwVTjt+gKN02LIFkDMBmhLMi9ER/frslK
+xfMnZmaGrGiR/9nmUxwPi1xpZQomyB40w11Re9epnAahNt3ViZS82eQtDF4JbAiXfKM9fJP/P6EU
+p8+1Xevb2xzEdt+Iub1FBZUbrvxGakyvSOPOrg/SfuvmbJxPgWp6ZKy7PtXny3YuxadIwVyQD8vI
+P/rmMuGNG2+k5o7Y+SlIis5z/iw=
+-----END CERTIFICATE-----
+
+GeoTrust Universal CA 2
+=======================
+-----BEGIN CERTIFICATE-----
+MIIFbDCCA1SgAwIBAgIBATANBgkqhkiG9w0BAQUFADBHMQswCQYDVQQGEwJVUzEWMBQGA1UEChMN
+R2VvVHJ1c3QgSW5jLjEgMB4GA1UEAxMXR2VvVHJ1c3QgVW5pdmVyc2FsIENBIDIwHhcNMDQwMzA0
+MDUwMDAwWhcNMjkwMzA0MDUwMDAwWjBHMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3Qg
+SW5jLjEgMB4GA1UEAxMXR2VvVHJ1c3QgVW5pdmVyc2FsIENBIDIwggIiMA0GCSqGSIb3DQEBAQUA
+A4ICDwAwggIKAoICAQCzVFLByT7y2dyxUxpZKeexw0Uo5dfR7cXFS6GqdHtXr0om/Nj1XqduGdt0
+DE81WzILAePb63p3NeqqWuDW6KFXlPCQo3RWlEQwAx5cTiuFJnSCegx2oG9NzkEtoBUGFF+3Qs17
+j1hhNNwqCPkuwwGmIkQcTAeC5lvO0Ep8BNMZcyfwqph/Lq9O64ceJHdqXbboW0W63MOhBW9Wjo8Q
+JqVJwy7XQYci4E+GymC16qFjwAGXEHm9ADwSbSsVsaxLse4YuU6W3Nx2/zu+z18DwPw76L5GG//a
+QMJS9/7jOvdqdzXQ2o3rXhhqMcceujwbKNZrVMaqW9eiLBsZzKIC9ptZvTdrhrVtgrrY6slWvKk2
+WP0+GfPtDCapkzj4T8FdIgbQl+rhrcZV4IErKIM6+vR7IVEAvlI4zs1meaj0gVbi0IMJR1FbUGrP
+20gaXT73y/Zl92zxlfgCOzJWgjl6W70viRu/obTo/3+NjN8D8WBOWBFM66M/ECuDmgFz2ZRthAAn
+ZqzwcEAJQpKtT5MNYQlRJNiS1QuUYbKHsu3/mjX/hVTK7URDrBs8FmtISgocQIgfksILAAX/8sgC
+SqSqqcyZlpwvWOB94b67B9xfBHJcMTTD7F8t4D1kkCLm0ey4Lt1ZrtmhN79UNdxzMk+MBB4zsslG
+8dhcyFVQyWi9qLo2CQIDAQABo2MwYTAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBR281Xh+qQ2
++/CfXGJx7Tz0RzgQKzAfBgNVHSMEGDAWgBR281Xh+qQ2+/CfXGJx7Tz0RzgQKzAOBgNVHQ8BAf8E
+BAMCAYYwDQYJKoZIhvcNAQEFBQADggIBAGbBxiPz2eAubl/oz66wsCVNK/g7WJtAJDday6sWSf+z
+dXkzoS9tcBc0kf5nfo/sm+VegqlVHy/c1FEHEv6sFj4sNcZj/NwQ6w2jqtB8zNHQL1EuxBRa3ugZ
+4T7GzKQp5y6EqgYweHZUcyiYWTjgAA1i00J9IZ+uPTqM1fp3DRgrFg5fNuH8KrUwJM/gYwx7WBr+
+mbpCErGR9Hxo4sjoryzqyX6uuyo9DRXcNJW2GHSoag/HtPQTxORb7QrSpJdMKu0vbBKJPfEncKpq
+A1Ihn0CoZ1Dy81of398j9tx4TuaYT1U6U+Pv8vSfx3zYWK8pIpe44L2RLrB27FcRz+8pRPPphXpg
+Y+RdM4kX2TGq2tbzGDVyz4crL2MjhF2EjD9XoIj8mZEoJmmZ1I+XRL6O1UixpCgp8RW04eWe3fiP
+pm8m1wk8OhwRDqZsN/etRIcsKMfYdIKz0G9KV7s1KSegi+ghp4dkNl3M2Basx7InQJJVOCiNUW7d
+FGdTbHFcJoRNdVq2fmBWqU2t+5sel/MN2dKXVHfaPRK34B7vCAas+YWH6aLcr34YEoP9VhdBLtUp
+gn2Z9DH2canPLAEnpQW5qrJITirvn5NSUZU8UnOOVkwXQMAJKOSLakhT2+zNVVXxxvjpoixMptEm
+X36vWkzaH6byHCx+rgIW0lbQL1dTR+iS
+-----END CERTIFICATE-----
+
+Visa eCommerce Root
+===================
+-----BEGIN CERTIFICATE-----
+MIIDojCCAoqgAwIBAgIQE4Y1TR0/BvLB+WUF1ZAcYjANBgkqhkiG9w0BAQUFADBrMQswCQYDVQQG
+EwJVUzENMAsGA1UEChMEVklTQTEvMC0GA1UECxMmVmlzYSBJbnRlcm5hdGlvbmFsIFNlcnZpY2Ug
+QXNzb2NpYXRpb24xHDAaBgNVBAMTE1Zpc2EgZUNvbW1lcmNlIFJvb3QwHhcNMDIwNjI2MDIxODM2
+WhcNMjIwNjI0MDAxNjEyWjBrMQswCQYDVQQGEwJVUzENMAsGA1UEChMEVklTQTEvMC0GA1UECxMm
+VmlzYSBJbnRlcm5hdGlvbmFsIFNlcnZpY2UgQXNzb2NpYXRpb24xHDAaBgNVBAMTE1Zpc2EgZUNv
+bW1lcmNlIFJvb3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvV95WHm6h2mCxlCfL
+F9sHP4CFT8icttD0b0/Pmdjh28JIXDqsOTPHH2qLJj0rNfVIsZHBAk4ElpF7sDPwsRROEW+1QK8b
+RaVK7362rPKgH1g/EkZgPI2h4H3PVz4zHvtH8aoVlwdVZqW1LS7YgFmypw23RuwhY/81q6UCzyr0
+TP579ZRdhE2o8mCP2w4lPJ9zcc+U30rq299yOIzzlr3xF7zSujtFWsan9sYXiwGd/BmoKoMWuDpI
+/k4+oKsGGelT84ATB+0tvz8KPFUgOSwsAGl0lUq8ILKpeeUYiZGo3BxN77t+Nwtd/jmliFKMAGzs
+GHxBvfaLdXe6YJ2E5/4tAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEG
+MB0GA1UdDgQWBBQVOIMPPyw/cDMezUb+B4wg4NfDtzANBgkqhkiG9w0BAQUFAAOCAQEAX/FBfXxc
+CLkr4NWSR/pnXKUTwwMhmytMiUbPWU3J/qVAtmPN3XEolWcRzCSs00Rsca4BIGsDoo8Ytyk6feUW
+YFN4PMCvFYP3j1IzJL1kk5fui/fbGKhtcbP3LBfQdCVp9/5rPJS+TUtBjE7ic9DjkCJzQ83z7+pz
+zkWKsKZJ/0x9nXGIxHYdkFsd7v3M9+79YKWxehZx0RbQfBI8bGmX265fOZpwLwU8GUYEmSA20GBu
+YQa7FkKMcPcw++DbZqMAAb3mLNqRX6BGi01qnD093QVG/na/oAo85ADmJ7f/hC3euiInlhBx6yLt
+398znM/jra6O1I7mT1GvFpLgXPYHDw==
+-----END CERTIFICATE-----
+
+Certum Root CA
+==============
+-----BEGIN CERTIFICATE-----
+MIIDDDCCAfSgAwIBAgIDAQAgMA0GCSqGSIb3DQEBBQUAMD4xCzAJBgNVBAYTAlBMMRswGQYDVQQK
+ExJVbml6ZXRvIFNwLiB6IG8uby4xEjAQBgNVBAMTCUNlcnR1bSBDQTAeFw0wMjA2MTExMDQ2Mzla
+Fw0yNzA2MTExMDQ2MzlaMD4xCzAJBgNVBAYTAlBMMRswGQYDVQQKExJVbml6ZXRvIFNwLiB6IG8u
+by4xEjAQBgNVBAMTCUNlcnR1bSBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM6x
+wS7TT3zNJc4YPk/EjG+AanPIW1H4m9LcuwBcsaD8dQPugfCI7iNS6eYVM42sLQnFdvkrOYCJ5JdL
+kKWoePhzQ3ukYbDYWMzhbGZ+nPMJXlVjhNWo7/OxLjBos8Q82KxujZlakE403Daaj4GIULdtlkIJ
+89eVgw1BS7Bqa/j8D35in2fE7SZfECYPCE/wpFcozo+47UX2bu4lXapuOb7kky/ZR6By6/qmW6/K
+Uz/iDsaWVhFu9+lmqSbYf5VT7QqFiLpPKaVCjF62/IUgAKpoC6EahQGcxEZjgoi2IrHu/qpGWX7P
+NSzVttpd90gzFFS269lvzs2I1qsb2pY7HVkCAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkq
+hkiG9w0BAQUFAAOCAQEAuI3O7+cUus/usESSbLQ5PqKEbq24IXfS1HeCh+YgQYHu4vgRt2PRFze+
+GXYkHAQaTOs9qmdvLdTN/mUxcMUbpgIKumB7bVjCmkn+YzILa+M6wKyrO7Do0wlRjBCDxjTgxSvg
+GrZgFCdsMneMvLJymM/NzD+5yCRCFNZX/OYmQ6kd5YCQzgNUKD73P9P4Te1qCjqTE5s7FCMTY5w/
+0YcneeVMUeMBrYVdGjux1XMQpNPyvG5k9VpWkKjHDkx0Dy5xO/fIR/RpbxXyEV6DHpx8Uq79AtoS
+qFlnGNu8cN2bsWntgM6JQEhqDjXKKWYVIZQs6GAqm4VKQPNriiTsBhYscw==
+-----END CERTIFICATE-----
+
+Comodo AAA Services root
+========================
+-----BEGIN CERTIFICATE-----
+MIIEMjCCAxqgAwIBAgIBATANBgkqhkiG9w0BAQUFADB7MQswCQYDVQQGEwJHQjEbMBkGA1UECAwS
+R3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRowGAYDVQQKDBFDb21vZG8gQ0Eg
+TGltaXRlZDEhMB8GA1UEAwwYQUFBIENlcnRpZmljYXRlIFNlcnZpY2VzMB4XDTA0MDEwMTAwMDAw
+MFoXDTI4MTIzMTIzNTk1OVowezELMAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hl
+c3RlcjEQMA4GA1UEBwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxITAfBgNV
+BAMMGEFBQSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAL5AnfRu4ep2hxxNRUSOvkbIgwadwSr+GB+O5AL686tdUIoWMQuaBtDFcCLNSS1UY8y2bmhG
+C1Pqy0wkwLxyTurxFa70VJoSCsN6sjNg4tqJVfMiWPPe3M/vg4aijJRPn2jymJBGhCfHdr/jzDUs
+i14HZGWCwEiwqJH5YZ92IFCokcdmtet4YgNW8IoaE+oxox6gmf049vYnMlhvB/VruPsUK6+3qszW
+Y19zjNoFmag4qMsXeDZRrOme9Hg6jc8P2ULimAyrL58OAd7vn5lJ8S3frHRNG5i1R8XlKdH5kBjH
+Ypy+g8cmez6KJcfA3Z3mNWgQIJ2P2N7Sw4ScDV7oL8kCAwEAAaOBwDCBvTAdBgNVHQ4EFgQUoBEK
+Iz6W8Qfs4q8p74Klf9AwpLQwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wewYDVR0f
+BHQwcjA4oDagNIYyaHR0cDovL2NybC5jb21vZG9jYS5jb20vQUFBQ2VydGlmaWNhdGVTZXJ2aWNl
+cy5jcmwwNqA0oDKGMGh0dHA6Ly9jcmwuY29tb2RvLm5ldC9BQUFDZXJ0aWZpY2F0ZVNlcnZpY2Vz
+LmNybDANBgkqhkiG9w0BAQUFAAOCAQEACFb8AvCb6P+k+tZ7xkSAzk/ExfYAWMymtrwUSWgEdujm
+7l3sAg9g1o1QGE8mTgHj5rCl7r+8dFRBv/38ErjHT1r0iWAFf2C3BUrz9vHCv8S5dIa2LX1rzNLz
+Rt0vxuBqw8M0Ayx9lt1awg6nCpnBBYurDC/zXDrPbDdVCYfeU0BsWO/8tqtlbgT2G9w84FoVxp7Z
+8VlIMCFlA2zs6SFz7JsDoeA3raAVGI/6ugLOpyypEBMs1OUIJqsil2D4kF501KKaU73yqWjgom7C
+12yxow+ev+to51byrvLjKzg6CYG1a4XXvi3tPxq3smPi9WIsgtRqAEFQ8TmDn5XpNpaYbg==
+-----END CERTIFICATE-----
+
+Comodo Secure Services root
+===========================
+-----BEGIN CERTIFICATE-----
+MIIEPzCCAyegAwIBAgIBATANBgkqhkiG9w0BAQUFADB+MQswCQYDVQQGEwJHQjEbMBkGA1UECAwS
+R3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRowGAYDVQQKDBFDb21vZG8gQ0Eg
+TGltaXRlZDEkMCIGA1UEAwwbU2VjdXJlIENlcnRpZmljYXRlIFNlcnZpY2VzMB4XDTA0MDEwMTAw
+MDAwMFoXDTI4MTIzMTIzNTk1OVowfjELMAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFu
+Y2hlc3RlcjEQMA4GA1UEBwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxJDAi
+BgNVBAMMG1NlY3VyZSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAMBxM4KK0HDrc4eCQNUd5MvJDkKQ+d40uaG6EfQlhfPMcm3ye5drswfxdySRXyWP
+9nQ95IDC+DwN879A6vfIUtFyb+/Iq0G4bi4XKpVpDM3SHpR7LZQdqnXXs5jLrLxkU0C8j6ysNstc
+rbvd4JQX7NFc0L/vpZXJkMWwrPsbQ996CF23uPJAGysnnlDOXmWCiIxe004MeuoIkbY2qitC++rC
+oznl2yY4rYsK7hljxxwk3wN42ubqwUcaCwtGCd0C/N7Lh1/XMGNooa7cMqG6vv5Eq2i2pRcV/b3V
+p6ea5EQz6YiO/O1R65NxTq0B50SOqy3LqP4BSUjwwN3HaNiS/j0CAwEAAaOBxzCBxDAdBgNVHQ4E
+FgQUPNiTiMLAggnMAZkGkyDpnnAJY08wDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8w
+gYEGA1UdHwR6MHgwO6A5oDeGNWh0dHA6Ly9jcmwuY29tb2RvY2EuY29tL1NlY3VyZUNlcnRpZmlj
+YXRlU2VydmljZXMuY3JsMDmgN6A1hjNodHRwOi8vY3JsLmNvbW9kby5uZXQvU2VjdXJlQ2VydGlm
+aWNhdGVTZXJ2aWNlcy5jcmwwDQYJKoZIhvcNAQEFBQADggEBAIcBbSMdflsXfcFhMs+P5/OKlFlm
+4J4oqF7Tt/Q05qo5spcWxYJvMqTpjOev/e/C6LlLqqP05tqNZSH7uoDrJiiFGv45jN5bBAS0VPmj
+Z55B+glSzAVIqMk/IQQezkhr/IXownuvf7fM+F86/TXGDe+X3EyrEeFryzHRbPtIgKvcnDe4IRRL
+DXE97IMzbtFuMhbsmMcWi1mmNKsFVy2T96oTy9IT4rcuO81rUBcJaD61JlfutuC23bkpgHl9j6Pw
+pCikFcSF9CfUa7/lXORlAnZUtOM3ZiTTGWHIUhDlizeauan5Hb/qmZJhlv8BzaFfDbxxvA6sCx1H
+RR3B7Hzs/Sk=
+-----END CERTIFICATE-----
+
+Comodo Trusted Services root
+============================
+-----BEGIN CERTIFICATE-----
+MIIEQzCCAyugAwIBAgIBATANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJHQjEbMBkGA1UECAwS
+R3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRowGAYDVQQKDBFDb21vZG8gQ0Eg
+TGltaXRlZDElMCMGA1UEAwwcVHJ1c3RlZCBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczAeFw0wNDAxMDEw
+MDAwMDBaFw0yODEyMzEyMzU5NTlaMH8xCzAJBgNVBAYTAkdCMRswGQYDVQQIDBJHcmVhdGVyIE1h
+bmNoZXN0ZXIxEDAOBgNVBAcMB1NhbGZvcmQxGjAYBgNVBAoMEUNvbW9kbyBDQSBMaW1pdGVkMSUw
+IwYDVQQDDBxUcnVzdGVkIENlcnRpZmljYXRlIFNlcnZpY2VzMIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEA33FvNlhTWvI2VFeAxHQIIO0Yfyod5jWaHiWsnOWWfnJSoBVC21ndZHoa0Lh7
+3TkVvFVIxO06AOoxEbrycXQaZ7jPM8yoMa+j49d/vzMtTGo87IvDktJTdyR0nAducPy9C1t2ul/y
+/9c3S0pgePfw+spwtOpZqqPOSC+pw7ILfhdyFgymBwwbOM/JYrc/oJOlh0Hyt3BAd9i+FHzjqMB6
+juljatEPmsbS9Is6FARW1O24zG71++IsWL1/T2sr92AkWCTOJu80kTrV44HQsvAEAtdbtz6SrGsS
+ivnkBbA7kUlcsutT6vifR4buv5XAwAaf0lteERv0xwQ1KdJVXOTt6wIDAQABo4HJMIHGMB0GA1Ud
+DgQWBBTFe1i97doladL3WRaoszLAeydb9DAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB
+/zCBgwYDVR0fBHwwejA8oDqgOIY2aHR0cDovL2NybC5jb21vZG9jYS5jb20vVHJ1c3RlZENlcnRp
+ZmljYXRlU2VydmljZXMuY3JsMDqgOKA2hjRodHRwOi8vY3JsLmNvbW9kby5uZXQvVHJ1c3RlZENl
+cnRpZmljYXRlU2VydmljZXMuY3JsMA0GCSqGSIb3DQEBBQUAA4IBAQDIk4E7ibSvuIQSTI3S8Ntw
+uleGFTQQuS9/HrCoiWChisJ3DFBKmwCL2Iv0QeLQg4pKHBQGsKNoBXAxMKdTmw7pSqBYaWcOrp32
+pSxBvzwGa+RZzG0Q8ZZvH9/0BAKkn0U+yNj6NkZEUD+Cl5EfKNsYEYwq5GWDVxISjBc/lDb+XbDA
+BHcTuPQV1T84zJQ6VdCsmPW6AF/ghhmBeC8owH7TzEIK9a5QoNE+xqFx7D+gIIxmOom0jtTYsU0l
+R+4viMi14QVFwL4Ucd56/Y57fU0IlqUSc/AtyjcndBInTMu2l+nZrghtWjlA3QVHdWpaIbOjGM9O
+9y5Xt5hwXsjEeLBi
+-----END CERTIFICATE-----
+
+QuoVadis Root CA
+================
+-----BEGIN CERTIFICATE-----
+MIIF0DCCBLigAwIBAgIEOrZQizANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJCTTEZMBcGA1UE
+ChMQUXVvVmFkaXMgTGltaXRlZDElMCMGA1UECxMcUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0
+eTEuMCwGA1UEAxMlUXVvVmFkaXMgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wMTAz
+MTkxODMzMzNaFw0yMTAzMTcxODMzMzNaMH8xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRp
+cyBMaW1pdGVkMSUwIwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MS4wLAYDVQQD
+EyVRdW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEAv2G1lVO6V/z68mcLOhrfEYBklbTRvM16z/Ypli4kVEAkOPcahdxYTMuk
+J0KX0J+DisPkBgNbAKVRHnAEdOLB1Dqr1607BxgFjv2DrOpm2RgbaIr1VxqYuvXtdj182d6UajtL
+F8HVj71lODqV0D1VNk7feVcxKh7YWWVJWCCYfqtffp/p1k3sg3Spx2zY7ilKhSoGFPlU5tPaZQeL
+YzcS19Dsw3sgQUSj7cugF+FxZc4dZjH3dgEZyH0DWLaVSR2mEiboxgx24ONmy+pdpibu5cxfvWen
+AScOospUxbF6lR1xHkopigPcakXBpBlebzbNw6Kwt/5cOOJSvPhEQ+aQuwIDAQABo4ICUjCCAk4w
+PQYIKwYBBQUHAQEEMTAvMC0GCCsGAQUFBzABhiFodHRwczovL29jc3AucXVvdmFkaXNvZmZzaG9y
+ZS5jb20wDwYDVR0TAQH/BAUwAwEB/zCCARoGA1UdIASCAREwggENMIIBCQYJKwYBBAG+WAABMIH7
+MIHUBggrBgEFBQcCAjCBxxqBxFJlbGlhbmNlIG9uIHRoZSBRdW9WYWRpcyBSb290IENlcnRpZmlj
+YXRlIGJ5IGFueSBwYXJ0eSBhc3N1bWVzIGFjY2VwdGFuY2Ugb2YgdGhlIHRoZW4gYXBwbGljYWJs
+ZSBzdGFuZGFyZCB0ZXJtcyBhbmQgY29uZGl0aW9ucyBvZiB1c2UsIGNlcnRpZmljYXRpb24gcHJh
+Y3RpY2VzLCBhbmQgdGhlIFF1b1ZhZGlzIENlcnRpZmljYXRlIFBvbGljeS4wIgYIKwYBBQUHAgEW
+Fmh0dHA6Ly93d3cucXVvdmFkaXMuYm0wHQYDVR0OBBYEFItLbe3TKbkGGew5Oanwl4Rqy+/fMIGu
+BgNVHSMEgaYwgaOAFItLbe3TKbkGGew5Oanwl4Rqy+/foYGEpIGBMH8xCzAJBgNVBAYTAkJNMRkw
+FwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMSUwIwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0
+aG9yaXR5MS4wLAYDVQQDEyVRdW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggQ6
+tlCLMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEAitQUtf70mpKnGdSkfnIYj9lo
+fFIk3WdvOXrEql494liwTXCYhGHoG+NpGA7O+0dQoE7/8CQfvbLO9Sf87C9TqnN7Az10buYWnuul
+LsS/VidQK2K6vkscPFVcQR0kvoIgR13VRH56FmjffU1RcHhXHTMe/QKZnAzNCgVPx7uOpHX6Sm2x
+gI4JVrmcGmD+XcHXetwReNDWXcG31a0ymQM6isxUJTkxgXsTIlG6Rmyhu576BGxJJnSP0nPrzDCi
+5upZIof4l/UO/erMkqQWxFIY6iHOsfHmhIHluqmGKPJDWl0Snawe2ajlCmqnf6CHKc/yiU3U7MXi
+5nrQNiOKSnQ2+Q==
+-----END CERTIFICATE-----
+
+QuoVadis Root CA 2
+==================
+-----BEGIN CERTIFICATE-----
+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
+-----END CERTIFICATE-----
+
+QuoVadis Root CA 3
+==================
+-----BEGIN CERTIFICATE-----
+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
+-----END CERTIFICATE-----
+
+Security Communication Root CA
+==============================
+-----BEGIN CERTIFICATE-----
+MIIDWjCCAkKgAwIBAgIBADANBgkqhkiG9w0BAQUFADBQMQswCQYDVQQGEwJKUDEYMBYGA1UEChMP
+U0VDT00gVHJ1c3QubmV0MScwJQYDVQQLEx5TZWN1cml0eSBDb21tdW5pY2F0aW9uIFJvb3RDQTEw
+HhcNMDMwOTMwMDQyMDQ5WhcNMjMwOTMwMDQyMDQ5WjBQMQswCQYDVQQGEwJKUDEYMBYGA1UEChMP
+U0VDT00gVHJ1c3QubmV0MScwJQYDVQQLEx5TZWN1cml0eSBDb21tdW5pY2F0aW9uIFJvb3RDQTEw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCzs/5/022x7xZ8V6UMbXaKL0u/ZPtM7orw
+8yl89f/uKuDp6bpbZCKamm8sOiZpUQWZJtzVHGpxxpp9Hp3dfGzGjGdnSj74cbAZJ6kJDKaVv0uM
+DPpVmDvY6CKhS3E4eayXkmmziX7qIWgGmBSWh9JhNrxtJ1aeV+7AwFb9Ms+k2Y7CI9eNqPPYJayX
+5HA49LY6tJ07lyZDo6G8SVlyTCMwhwFY9k6+HGhWZq/NQV3Is00qVUarH9oe4kA92819uZKAnDfd
+DJZkndwi92SL32HeFZRSFaB9UslLqCHJxrHty8OVYNEP8Ktw+N/LTX7s1vqr2b1/VPKl6Xn62dZ2
+JChzAgMBAAGjPzA9MB0GA1UdDgQWBBSgc0mZaNyFW2XjmygvV5+9M7wHSDALBgNVHQ8EBAMCAQYw
+DwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAaECpqLvkT115swW1F7NgE+vGkl3g
+0dNq/vu+m22/xwVtWSDEHPC32oRYAmP6SBbvT6UL90qY8j+eG61Ha2POCEfrUj94nK9NrvjVT8+a
+mCoQQTlSxN3Zmw7vkwGusi7KaEIkQmywszo+zenaSMQVy+n5Bw+SUEmK3TGXX8npN6o7WWWXlDLJ
+s58+OmJYxUmtYg5xpTKqL8aJdkNAExNnPaJUJRDL8Try2frbSVa7pv6nQTXD4IhhyYjH3zYQIphZ
+6rBK+1YWc26sTfcioU+tHXotRSflMMFe8toTyyVCUZVHA4xsIcx0Qu1T/zOLjw9XARYvz6buyXAi
+FL39vmwLAw==
+-----END CERTIFICATE-----
+
+Sonera Class 2 Root CA
+======================
+-----BEGIN CERTIFICATE-----
+MIIDIDCCAgigAwIBAgIBHTANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQGEwJGSTEPMA0GA1UEChMG
+U29uZXJhMRkwFwYDVQQDExBTb25lcmEgQ2xhc3MyIENBMB4XDTAxMDQwNjA3Mjk0MFoXDTIxMDQw
+NjA3Mjk0MFowOTELMAkGA1UEBhMCRkkxDzANBgNVBAoTBlNvbmVyYTEZMBcGA1UEAxMQU29uZXJh
+IENsYXNzMiBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJAXSjWdyvANlsdE+hY3
+/Ei9vX+ALTU74W+oZ6m/AxxNjG8yR9VBaKQTBME1DJqEQ/xcHf+Js+gXGM2RX/uJ4+q/Tl18GybT
+dXnt5oTjV+WtKcT0OijnpXuENmmz/V52vaMtmdOQTiMofRhj8VQ7Jp12W5dCsv+u8E7s3TmVToMG
+f+dJQMjFAbJUWmYdPfz56TwKnoG4cPABi+QjVHzIrviQHgCWctRUz2EjvOr7nQKV0ba5cTppCD8P
+tOFCx4j1P5iop7oc4HFx71hXgVB6XGt0Rg6DA5jDjqhu8nYybieDwnPz3BjotJPqdURrBGAgcVeH
+nfO+oJAjPYok4doh28MCAwEAAaMzMDEwDwYDVR0TAQH/BAUwAwEB/zARBgNVHQ4ECgQISqCqWITT
+XjwwCwYDVR0PBAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQBazof5FnIVV0sd2ZvnoiYw7JNn39Yt
+0jSv9zilzqsWuasvfDXLrNAPtEwr/IDva4yRXzZ299uzGxnq9LIR/WFxRL8oszodv7ND6J+/3DEI
+cbCdjdY0RzKQxmUk96BKfARzjzlvF4xytb1LyHr4e4PDKE6cCepnP7JnBBvDFNr450kkkdAdavph
+Oe9r5yF1BgfYErQhIHBCcYHaPJo2vqZbDWpsmh+Re/n570K6Tk6ezAyNlNzZRZxe7EJQY670XcSx
+EtzKO6gunRRaBXW37Ndj4ro1tgQIkejanZz2ZrUYrAqmVCY0M9IbwdR/GjqOC6oybtv8TyWf2TLH
+llpwrN9M
+-----END CERTIFICATE-----
+
+Staat der Nederlanden Root CA
+=============================
+-----BEGIN CERTIFICATE-----
+MIIDujCCAqKgAwIBAgIEAJiWijANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJOTDEeMBwGA1UE
+ChMVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSYwJAYDVQQDEx1TdGFhdCBkZXIgTmVkZXJsYW5kZW4g
+Um9vdCBDQTAeFw0wMjEyMTcwOTIzNDlaFw0xNTEyMTYwOTE1MzhaMFUxCzAJBgNVBAYTAk5MMR4w
+HAYDVQQKExVTdGFhdCBkZXIgTmVkZXJsYW5kZW4xJjAkBgNVBAMTHVN0YWF0IGRlciBOZWRlcmxh
+bmRlbiBSb290IENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmNK1URF6gaYUmHFt
+vsznExvWJw56s2oYHLZhWtVhCb/ekBPHZ+7d89rFDBKeNVU+LCeIQGv33N0iYfXCxw719tV2U02P
+jLwYdjeFnejKScfST5gTCaI+Ioicf9byEGW07l8Y1Rfj+MX94p2i71MOhXeiD+EwR+4A5zN9RGca
+C1Hoi6CeUJhoNFIfLm0B8mBF8jHrqTFoKbt6QZ7GGX+UtFE5A3+y3qcym7RHjm+0Sq7lr7HcsBth
+vJly3uSJt3omXdozSVtSnA71iq3DuD3oBmrC1SoLbHuEvVYFy4ZlkuxEK7COudxwC0barbxjiDn6
+22r+I/q85Ej0ZytqERAhSQIDAQABo4GRMIGOMAwGA1UdEwQFMAMBAf8wTwYDVR0gBEgwRjBEBgRV
+HSAAMDwwOgYIKwYBBQUHAgEWLmh0dHA6Ly93d3cucGtpb3ZlcmhlaWQubmwvcG9saWNpZXMvcm9v
+dC1wb2xpY3kwDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSofeu8Y6R0E3QA7Jbg0zTBLL9s+DAN
+BgkqhkiG9w0BAQUFAAOCAQEABYSHVXQ2YcG70dTGFagTtJ+k/rvuFbQvBgwp8qiSpGEN/KtcCFtR
+EytNwiphyPgJWPwtArI5fZlmgb9uXJVFIGzmeafR2Bwp/MIgJ1HI8XxdNGdphREwxgDS1/PTfLbw
+MVcoEoJz6TMvplW0C5GUR5z6u3pCMuiufi3IvKwUv9kP2Vv8wfl6leF9fpb8cbDCTMjfRTTJzg3y
+nGQI0DvDKcWy7ZAEwbEpkcUwb8GpcjPM/l0WFywRaed+/sWDCN+83CI6LiBpIzlWYGeQiy52OfsR
+iJf2fL1LuCAWZwWN4jvBcj+UlTfHXbme2JOhF4//DGYVwSR8MnwDHTuhWEUykw==
+-----END CERTIFICATE-----
+
+UTN USERFirst Hardware Root CA
+==============================
+-----BEGIN CERTIFICATE-----
+MIIEdDCCA1ygAwIBAgIQRL4Mi1AAJLQR0zYq/mUK/TANBgkqhkiG9w0BAQUFADCBlzELMAkGA1UE
+BhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2UgQ2l0eTEeMBwGA1UEChMVVGhl
+IFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExhodHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xHzAd
+BgNVBAMTFlVUTi1VU0VSRmlyc3QtSGFyZHdhcmUwHhcNOTkwNzA5MTgxMDQyWhcNMTkwNzA5MTgx
+OTIyWjCBlzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2UgQ2l0
+eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExhodHRwOi8vd3d3LnVz
+ZXJ0cnVzdC5jb20xHzAdBgNVBAMTFlVUTi1VU0VSRmlyc3QtSGFyZHdhcmUwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQCx98M4P7Sof885glFn0G2f0v9Y8+efK+wNiVSZuTiZFvfgIXlI
+wrthdBKWHTxqctU8EGc6Oe0rE81m65UJM6Rsl7HoxuzBdXmcRl6Nq9Bq/bkqVRcQVLMZ8Jr28bFd
+tqdt++BxF2uiiPsA3/4aMXcMmgF6sTLjKwEHOG7DpV4jvEWbe1DByTCP2+UretNb+zNAHqDVmBe8
+i4fDidNdoI6yqqr2jmmIBsX6iSHzCJ1pLgkzmykNRg+MzEk0sGlRvfkGzWitZky8PqxhvQqIDsjf
+Pe58BEydCl5rkdbux+0ojatNh4lz0G6k0B4WixThdkQDf2Os5M1JnMWS9KsyoUhbAgMBAAGjgbkw
+gbYwCwYDVR0PBAQDAgHGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFKFyXyYbKJhDlV0HN9WF
+lp1L0sNFMEQGA1UdHwQ9MDswOaA3oDWGM2h0dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9VVE4tVVNF
+UkZpcnN0LUhhcmR3YXJlLmNybDAxBgNVHSUEKjAoBggrBgEFBQcDAQYIKwYBBQUHAwUGCCsGAQUF
+BwMGBggrBgEFBQcDBzANBgkqhkiG9w0BAQUFAAOCAQEARxkP3nTGmZev/K0oXnWO6y1n7k57K9cM
+//bey1WiCuFMVGWTYGufEpytXoMs61quwOQt9ABjHbjAbPLPSbtNk28GpgoiskliCE7/yMgUsogW
+XecB5BKV5UU0s4tpvc+0hY91UZ59Ojg6FEgSxvunOxqNDYJAB+gECJChicsZUN/KHAG8HQQZexB2
+lzvukJDKxA4fFm517zP4029bHpbj4HR3dHuKom4t3XbWOTCC8KucUvIqx69JXn7HaOWCgchqJ/kn
+iCrVWFCVH/A7HFe7fRQ5YiuayZSSKqMiDP+JJn1fIytH1xUdqWqeUQ0qUZ6B+dQ7XnASfxAynB67
+nfhmqA==
+-----END CERTIFICATE-----
+
+Camerfirma Chambers of Commerce Root
+====================================
+-----BEGIN CERTIFICATE-----
+MIIEvTCCA6WgAwIBAgIBADANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJFVTEnMCUGA1UEChMe
+QUMgQ2FtZXJmaXJtYSBTQSBDSUYgQTgyNzQzMjg3MSMwIQYDVQQLExpodHRwOi8vd3d3LmNoYW1i
+ZXJzaWduLm9yZzEiMCAGA1UEAxMZQ2hhbWJlcnMgb2YgQ29tbWVyY2UgUm9vdDAeFw0wMzA5MzAx
+NjEzNDNaFw0zNzA5MzAxNjEzNDRaMH8xCzAJBgNVBAYTAkVVMScwJQYDVQQKEx5BQyBDYW1lcmZp
+cm1hIFNBIENJRiBBODI3NDMyODcxIzAhBgNVBAsTGmh0dHA6Ly93d3cuY2hhbWJlcnNpZ24ub3Jn
+MSIwIAYDVQQDExlDaGFtYmVycyBvZiBDb21tZXJjZSBSb290MIIBIDANBgkqhkiG9w0BAQEFAAOC
+AQ0AMIIBCAKCAQEAtzZV5aVdGDDg2olUkfzIx1L4L1DZ77F1c2VHfRtbunXF/KGIJPov7coISjlU
+xFF6tdpg6jg8gbLL8bvZkSM/SAFwdakFKq0fcfPJVD0dBmpAPrMMhe5cG3nCYsS4No41XQEMIwRH
+NaqbYE6gZj3LJgqcQKH0XZi/caulAGgq7YN6D6IUtdQis4CwPAxaUWktWBiP7Zme8a7ileb2R6jW
+DA+wWFjbw2Y3npuRVDM30pQcakjJyfKl2qUMI/cjDpwyVV5xnIQFUZot/eZOKjRa3spAN2cMVCFV
+d9oKDMyXroDclDZK9D7ONhMeU+SsTjoF7Nuucpw4i9A5O4kKPnf+dQIBA6OCAUQwggFAMBIGA1Ud
+EwEB/wQIMAYBAf8CAQwwPAYDVR0fBDUwMzAxoC+gLYYraHR0cDovL2NybC5jaGFtYmVyc2lnbi5v
+cmcvY2hhbWJlcnNyb290LmNybDAdBgNVHQ4EFgQU45T1sU3p26EpW1eLTXYGduHRooowDgYDVR0P
+AQH/BAQDAgEGMBEGCWCGSAGG+EIBAQQEAwIABzAnBgNVHREEIDAegRxjaGFtYmVyc3Jvb3RAY2hh
+bWJlcnNpZ24ub3JnMCcGA1UdEgQgMB6BHGNoYW1iZXJzcm9vdEBjaGFtYmVyc2lnbi5vcmcwWAYD
+VR0gBFEwTzBNBgsrBgEEAYGHLgoDATA+MDwGCCsGAQUFBwIBFjBodHRwOi8vY3BzLmNoYW1iZXJz
+aWduLm9yZy9jcHMvY2hhbWJlcnNyb290Lmh0bWwwDQYJKoZIhvcNAQEFBQADggEBAAxBl8IahsAi
+fJ/7kPMa0QOx7xP5IV8EnNrJpY0nbJaHkb5BkAFyk+cefV/2icZdp0AJPaxJRUXcLo0waLIJuvvD
+L8y6C98/d3tGfToSJI6WjzwFCm/SlCgdbQzALogi1djPHRPH8EjX1wWnz8dHnjs8NMiAT9QUu/wN
+UPf6s+xCX6ndbcj0dc97wXImsQEcXCz9ek60AcUFV7nnPKoF2YjpB0ZBzu9Bga5Y34OirsrXdx/n
+ADydb47kMgkdTXg0eDQ8lJsm7U9xxhl6vSAiSFr+S30Dt+dYvsYyTnQeaN2oaFuzPu5ifdmA6Ap1
+erfutGWaIZDgqtCYvDi1czyL+Nw=
+-----END CERTIFICATE-----
+
+Camerfirma Global Chambersign Root
+==================================
+-----BEGIN CERTIFICATE-----
+MIIExTCCA62gAwIBAgIBADANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJFVTEnMCUGA1UEChMe
+QUMgQ2FtZXJmaXJtYSBTQSBDSUYgQTgyNzQzMjg3MSMwIQYDVQQLExpodHRwOi8vd3d3LmNoYW1i
+ZXJzaWduLm9yZzEgMB4GA1UEAxMXR2xvYmFsIENoYW1iZXJzaWduIFJvb3QwHhcNMDMwOTMwMTYx
+NDE4WhcNMzcwOTMwMTYxNDE4WjB9MQswCQYDVQQGEwJFVTEnMCUGA1UEChMeQUMgQ2FtZXJmaXJt
+YSBTQSBDSUYgQTgyNzQzMjg3MSMwIQYDVQQLExpodHRwOi8vd3d3LmNoYW1iZXJzaWduLm9yZzEg
+MB4GA1UEAxMXR2xvYmFsIENoYW1iZXJzaWduIFJvb3QwggEgMA0GCSqGSIb3DQEBAQUAA4IBDQAw
+ggEIAoIBAQCicKLQn0KuWxfH2H3PFIP8T8mhtxOviteePgQKkotgVvq0Mi+ITaFgCPS3CU6gSS9J
+1tPfnZdan5QEcOw/Wdm3zGaLmFIoCQLfxS+EjXqXd7/sQJ0lcqu1PzKY+7e3/HKE5TWH+VX6ox8O
+by4o3Wmg2UIQxvi1RMLQQ3/bvOSiPGpVeAp3qdjqGTK3L/5cPxvusZjsyq16aUXjlg9V9ubtdepl
+6DJWk0aJqCWKZQbua795B9Dxt6/tLE2Su8CoX6dnfQTyFQhwrJLWfQTSM/tMtgsL+xrJxI0DqX5c
+8lCrEqWhz0hQpe/SyBoT+rB/sYIcd2oPX9wLlY/vQ37mRQklAgEDo4IBUDCCAUwwEgYDVR0TAQH/
+BAgwBgEB/wIBDDA/BgNVHR8EODA2MDSgMqAwhi5odHRwOi8vY3JsLmNoYW1iZXJzaWduLm9yZy9j
+aGFtYmVyc2lnbnJvb3QuY3JsMB0GA1UdDgQWBBRDnDafsJ4wTcbOX60Qq+UDpfqpFDAOBgNVHQ8B
+Af8EBAMCAQYwEQYJYIZIAYb4QgEBBAQDAgAHMCoGA1UdEQQjMCGBH2NoYW1iZXJzaWducm9vdEBj
+aGFtYmVyc2lnbi5vcmcwKgYDVR0SBCMwIYEfY2hhbWJlcnNpZ25yb290QGNoYW1iZXJzaWduLm9y
+ZzBbBgNVHSAEVDBSMFAGCysGAQQBgYcuCgEBMEEwPwYIKwYBBQUHAgEWM2h0dHA6Ly9jcHMuY2hh
+bWJlcnNpZ24ub3JnL2Nwcy9jaGFtYmVyc2lnbnJvb3QuaHRtbDANBgkqhkiG9w0BAQUFAAOCAQEA
+PDtwkfkEVCeR4e3t/mh/YV3lQWVPMvEYBZRqHN4fcNs+ezICNLUMbKGKfKX0j//U2K0X1S0E0T9Y
+gOKBWYi+wONGkyT+kL0mojAt6JcmVzWJdJYY9hXiryQZVgICsroPFOrGimbBhkVVi76SvpykBMdJ
+PJ7oKXqJ1/6v/2j1pReQvayZzKWGVwlnRtvWFsJG8eSpUPWP0ZIV018+xgBJOm5YstHRJw0lyDL4
+IBHNfTIzSJRUTN3cecQwn+uOuFW114hcxWokPbLTBQNRxgfvzBRydD1ucs4YKIxKoHflCStFREes
+t2d/AYoFWpO+ocH/+OcOZ6RHSXZddZAa9SaP8A==
+-----END CERTIFICATE-----
+
+NetLock Notary (Class A) Root
+=============================
+-----BEGIN CERTIFICATE-----
+MIIGfTCCBWWgAwIBAgICAQMwDQYJKoZIhvcNAQEEBQAwga8xCzAJBgNVBAYTAkhVMRAwDgYDVQQI
+EwdIdW5nYXJ5MREwDwYDVQQHEwhCdWRhcGVzdDEnMCUGA1UEChMeTmV0TG9jayBIYWxvemF0Yml6
+dG9uc2FnaSBLZnQuMRowGAYDVQQLExFUYW51c2l0dmFueWtpYWRvazE2MDQGA1UEAxMtTmV0TG9j
+ayBLb3pqZWd5em9pIChDbGFzcyBBKSBUYW51c2l0dmFueWtpYWRvMB4XDTk5MDIyNDIzMTQ0N1oX
+DTE5MDIxOTIzMTQ0N1owga8xCzAJBgNVBAYTAkhVMRAwDgYDVQQIEwdIdW5nYXJ5MREwDwYDVQQH
+EwhCdWRhcGVzdDEnMCUGA1UEChMeTmV0TG9jayBIYWxvemF0Yml6dG9uc2FnaSBLZnQuMRowGAYD
+VQQLExFUYW51c2l0dmFueWtpYWRvazE2MDQGA1UEAxMtTmV0TG9jayBLb3pqZWd5em9pIChDbGFz
+cyBBKSBUYW51c2l0dmFueWtpYWRvMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvHSM
+D7tM9DceqQWC2ObhbHDqeLVu0ThEDaiDzl3S1tWBxdRL51uUcCbbO51qTGL3cfNk1mE7PetzozfZ
+z+qMkjvN9wfcZnSX9EUi3fRc4L9t875lM+QVOr/bmJBVOMTtplVjC7B4BPTjbsE/jvxReB+SnoPC
+/tmwqcm8WgD/qaiYdPv2LD4VOQ22BFWoDpggQrOxJa1+mm9dU7GrDPzr4PN6s6iz/0b2Y6LYOph7
+tqyF/7AlT3Rj5xMHpQqPBffAZG9+pyeAlt7ULoZgx2srXnN7F+eRP2QM2EsiNCubMvJIH5+hCoR6
+4sKtlz2O1cH5VqNQ6ca0+pii7pXmKgOM3wIDAQABo4ICnzCCApswDgYDVR0PAQH/BAQDAgAGMBIG
+A1UdEwEB/wQIMAYBAf8CAQQwEQYJYIZIAYb4QgEBBAQDAgAHMIICYAYJYIZIAYb4QgENBIICURaC
+Ak1GSUdZRUxFTSEgRXplbiB0YW51c2l0dmFueSBhIE5ldExvY2sgS2Z0LiBBbHRhbGFub3MgU3pv
+bGdhbHRhdGFzaSBGZWx0ZXRlbGVpYmVuIGxlaXJ0IGVsamFyYXNvayBhbGFwamFuIGtlc3p1bHQu
+IEEgaGl0ZWxlc2l0ZXMgZm9seWFtYXRhdCBhIE5ldExvY2sgS2Z0LiB0ZXJtZWtmZWxlbG9zc2Vn
+LWJpenRvc2l0YXNhIHZlZGkuIEEgZGlnaXRhbGlzIGFsYWlyYXMgZWxmb2dhZGFzYW5hayBmZWx0
+ZXRlbGUgYXogZWxvaXJ0IGVsbGVub3J6ZXNpIGVsamFyYXMgbWVndGV0ZWxlLiBBeiBlbGphcmFz
+IGxlaXJhc2EgbWVndGFsYWxoYXRvIGEgTmV0TG9jayBLZnQuIEludGVybmV0IGhvbmxhcGphbiBh
+IGh0dHBzOi8vd3d3Lm5ldGxvY2submV0L2RvY3MgY2ltZW4gdmFneSBrZXJoZXRvIGF6IGVsbGVu
+b3J6ZXNAbmV0bG9jay5uZXQgZS1tYWlsIGNpbWVuLiBJTVBPUlRBTlQhIFRoZSBpc3N1YW5jZSBh
+bmQgdGhlIHVzZSBvZiB0aGlzIGNlcnRpZmljYXRlIGlzIHN1YmplY3QgdG8gdGhlIE5ldExvY2sg
+Q1BTIGF2YWlsYWJsZSBhdCBodHRwczovL3d3dy5uZXRsb2NrLm5ldC9kb2NzIG9yIGJ5IGUtbWFp
+bCBhdCBjcHNAbmV0bG9jay5uZXQuMA0GCSqGSIb3DQEBBAUAA4IBAQBIJEb3ulZv+sgoA0BO5TE5
+ayZrU3/b39/zcT0mwBQOxmd7I6gMc90Bu8bKbjc5VdXHjFYgDigKDtIqpLBJUsY4B/6+CgmM0ZjP
+ytoUMaFP0jn8DxEsQ8Pdq5PHVT5HfBgaANzze9jyf1JsIPQLX2lS9O74silg6+NJMSEN1rUQQeJB
+CWziGppWS3cC9qCbmieH6FUpccKQn0V4GuEVZD3QDtigdp+uxdAu6tYPVuxkf1qbFFgBJ34TUMdr
+KuZoPL9coAob4Q566eKAw+np9v1sEZ7Q5SgnK1QyQhSCdeZK8CtmdWOMovsEPoMOmzbwGOQmIMOM
+8CgHrTwXZoi1/baI
+-----END CERTIFICATE-----
+
+XRamp Global CA Root
+====================
+-----BEGIN CERTIFICATE-----
+MIIEMDCCAxigAwIBAgIQUJRs7Bjq1ZxN1ZfvdY+grTANBgkqhkiG9w0BAQUFADCBgjELMAkGA1UE
+BhMCVVMxHjAcBgNVBAsTFXd3dy54cmFtcHNlY3VyaXR5LmNvbTEkMCIGA1UEChMbWFJhbXAgU2Vj
+dXJpdHkgU2VydmljZXMgSW5jMS0wKwYDVQQDEyRYUmFtcCBHbG9iYWwgQ2VydGlmaWNhdGlvbiBB
+dXRob3JpdHkwHhcNMDQxMTAxMTcxNDA0WhcNMzUwMTAxMDUzNzE5WjCBgjELMAkGA1UEBhMCVVMx
+HjAcBgNVBAsTFXd3dy54cmFtcHNlY3VyaXR5LmNvbTEkMCIGA1UEChMbWFJhbXAgU2VjdXJpdHkg
+U2VydmljZXMgSW5jMS0wKwYDVQQDEyRYUmFtcCBHbG9iYWwgQ2VydGlmaWNhdGlvbiBBdXRob3Jp
+dHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCYJB69FbS638eMpSe2OAtp87ZOqCwu
+IR1cRN8hXX4jdP5efrRKt6atH67gBhbim1vZZ3RrXYCPKZ2GG9mcDZhtdhAoWORlsH9KmHmf4MMx
+foArtYzAQDsRhtDLooY2YKTVMIJt2W7QDxIEM5dfT2Fa8OT5kavnHTu86M/0ay00fOJIYRyO82FE
+zG+gSqmUsE3a56k0enI4qEHMPJQRfevIpoy3hsvKMzvZPTeL+3o+hiznc9cKV6xkmxnr9A8ECIqs
+AxcZZPRaJSKNNCyy9mgdEm3Tih4U2sSPpuIjhdV6Db1q4Ons7Be7QhtnqiXtRYMh/MHJfNViPvry
+xS3T/dRlAgMBAAGjgZ8wgZwwEwYJKwYBBAGCNxQCBAYeBABDAEEwCwYDVR0PBAQDAgGGMA8GA1Ud
+EwEB/wQFMAMBAf8wHQYDVR0OBBYEFMZPoj0GY4QJnM5i5ASsjVy16bYbMDYGA1UdHwQvMC0wK6Ap
+oCeGJWh0dHA6Ly9jcmwueHJhbXBzZWN1cml0eS5jb20vWEdDQS5jcmwwEAYJKwYBBAGCNxUBBAMC
+AQEwDQYJKoZIhvcNAQEFBQADggEBAJEVOQMBG2f7Shz5CmBbodpNl2L5JFMn14JkTpAuw0kbK5rc
+/Kh4ZzXxHfARvbdI4xD2Dd8/0sm2qlWkSLoC295ZLhVbO50WfUfXN+pfTXYSNrsf16GBBEYgoyxt
+qZ4Bfj8pzgCT3/3JknOJiWSe5yvkHJEs0rnOfc5vMZnT5r7SHpDwCRR5XCOrTdLaIR9NmXmd4c8n
+nxCbHIgNsIpkQTG4DmyQJKSbXHGPurt+HBvbaoAPIbzp26a3QPSyi6mx5O+aGtA9aZnuqCij4Tyz
+8LIRnM98QObd50N9otg6tamN8jSZxNQQ4Qb9CYQQO+7ETPTsJ3xCwnR8gooJybQDJbw=
+-----END CERTIFICATE-----
+
+Go Daddy Class 2 CA
+===================
+-----BEGIN CERTIFICATE-----
+MIIEADCCAuigAwIBAgIBADANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJVUzEhMB8GA1UEChMY
+VGhlIEdvIERhZGR5IEdyb3VwLCBJbmMuMTEwLwYDVQQLEyhHbyBEYWRkeSBDbGFzcyAyIENlcnRp
+ZmljYXRpb24gQXV0aG9yaXR5MB4XDTA0MDYyOTE3MDYyMFoXDTM0MDYyOTE3MDYyMFowYzELMAkG
+A1UEBhMCVVMxITAfBgNVBAoTGFRoZSBHbyBEYWRkeSBHcm91cCwgSW5jLjExMC8GA1UECxMoR28g
+RGFkZHkgQ2xhc3MgMiBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASAwDQYJKoZIhvcNAQEBBQAD
+ggENADCCAQgCggEBAN6d1+pXGEmhW+vXX0iG6r7d/+TvZxz0ZWizV3GgXne77ZtJ6XCAPVYYYwhv
+2vLM0D9/AlQiVBDYsoHUwHU9S3/Hd8M+eKsaA7Ugay9qK7HFiH7Eux6wwdhFJ2+qN1j3hybX2C32
+qRe3H3I2TqYXP2WYktsqbl2i/ojgC95/5Y0V4evLOtXiEqITLdiOr18SPaAIBQi2XKVlOARFmR6j
+YGB0xUGlcmIbYsUfb18aQr4CUWWoriMYavx4A6lNf4DD+qta/KFApMoZFv6yyO9ecw3ud72a9nmY
+vLEHZ6IVDd2gWMZEewo+YihfukEHU1jPEX44dMX4/7VpkI+EdOqXG68CAQOjgcAwgb0wHQYDVR0O
+BBYEFNLEsNKR1EwRcbNhyz2h/t2oatTjMIGNBgNVHSMEgYUwgYKAFNLEsNKR1EwRcbNhyz2h/t2o
+atTjoWekZTBjMQswCQYDVQQGEwJVUzEhMB8GA1UEChMYVGhlIEdvIERhZGR5IEdyb3VwLCBJbmMu
+MTEwLwYDVQQLEyhHbyBEYWRkeSBDbGFzcyAyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggEAMAwG
+A1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBADJL87LKPpH8EsahB4yOd6AzBhRckB4Y9wim
+PQoZ+YeAEW5p5JYXMP80kWNyOO7MHAGjHZQopDH2esRU1/blMVgDoszOYtuURXO1v0XJJLXVggKt
+I3lpjbi2Tc7PTMozI+gciKqdi0FuFskg5YmezTvacPd+mSYgFFQlq25zheabIZ0KbIIOqPjCDPoQ
+HmyW74cNxA9hi63ugyuV+I6ShHI56yDqg+2DzZduCLzrTia2cyvk0/ZM/iZx4mERdEr/VxqHD3VI
+Ls9RaRegAhJhldXRQLIQTO7ErBBDpqWeCtWVYpoNz4iCxTIM5CufReYNnyicsbkqWletNw+vHX/b
+vZ8=
+-----END CERTIFICATE-----
+
+Starfield Class 2 CA
+====================
+-----BEGIN CERTIFICATE-----
+MIIEDzCCAvegAwIBAgIBADANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJVUzElMCMGA1UEChMc
+U3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEyMDAGA1UECxMpU3RhcmZpZWxkIENsYXNzIDIg
+Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDQwNjI5MTczOTE2WhcNMzQwNjI5MTczOTE2WjBo
+MQswCQYDVQQGEwJVUzElMCMGA1UEChMcU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEyMDAG
+A1UECxMpU3RhcmZpZWxkIENsYXNzIDIgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggEgMA0GCSqG
+SIb3DQEBAQUAA4IBDQAwggEIAoIBAQC3Msj+6XGmBIWtDBFk385N78gDGIc/oav7PKaf8MOh2tTY
+bitTkPskpD6E8J7oX+zlJ0T1KKY/e97gKvDIr1MvnsoFAZMej2YcOadN+lq2cwQlZut3f+dZxkqZ
+JRRU6ybH838Z1TBwj6+wRir/resp7defqgSHo9T5iaU0X9tDkYI22WY8sbi5gv2cOj4QyDvvBmVm
+epsZGD3/cVE8MC5fvj13c7JdBmzDI1aaK4UmkhynArPkPw2vCHmCuDY96pzTNbO8acr1zJ3o/WSN
+F4Azbl5KXZnJHoe0nRrA1W4TNSNe35tfPe/W93bC6j67eA0cQmdrBNj41tpvi/JEoAGrAgEDo4HF
+MIHCMB0GA1UdDgQWBBS/X7fRzt0fhvRbVazc1xDCDqmI5zCBkgYDVR0jBIGKMIGHgBS/X7fRzt0f
+hvRbVazc1xDCDqmI56FspGowaDELMAkGA1UEBhMCVVMxJTAjBgNVBAoTHFN0YXJmaWVsZCBUZWNo
+bm9sb2dpZXMsIEluYy4xMjAwBgNVBAsTKVN0YXJmaWVsZCBDbGFzcyAyIENlcnRpZmljYXRpb24g
+QXV0aG9yaXR5ggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAAWdP4id0ckaVaGs
+afPzWdqbAYcaT1epoXkJKtv3L7IezMdeatiDh6GX70k1PncGQVhiv45YuApnP+yz3SFmH8lU+nLM
+PUxA2IGvd56Deruix/U0F47ZEUD0/CwqTRV/p2JdLiXTAAsgGh1o+Re49L2L7ShZ3U0WixeDyLJl
+xy16paq8U4Zt3VekyvggQQto8PT7dL5WXXp59fkdheMtlb71cZBDzI0fmgAKhynpVSJYACPq4xJD
+KVtHCN2MQWplBqjlIapBtJUhlbl90TSrE9atvNziPTnNvT51cKEYWQPJIrSPnNVeKtelttQKbfi3
+QBFGmh95DmK/D5fs4C8fF5Q=
+-----END CERTIFICATE-----
+
+StartCom Certification Authority
+================================
+-----BEGIN CERTIFICATE-----
+MIIHyTCCBbGgAwIBAgIBATANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJJTDEWMBQGA1UEChMN
+U3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmlu
+ZzEpMCcGA1UEAxMgU3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDYwOTE3MTk0
+NjM2WhcNMzYwOTE3MTk0NjM2WjB9MQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRk
+LjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMg
+U3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw
+ggIKAoICAQDBiNsJvGxGfHiflXu1M5DycmLWwTYgIiRezul38kMKogZkpMyONvg45iPwbm2xPN1y
+o4UcodM9tDMr0y+v/uqwQVlntsQGfQqedIXWeUyAN3rfOQVSWff0G0ZDpNKFhdLDcfN1YjS6LIp/
+Ho/u7TTQEceWzVI9ujPW3U3eCztKS5/CJi/6tRYccjV3yjxd5srhJosaNnZcAdt0FCX+7bWgiA/d
+eMotHweXMAEtcnn6RtYTKqi5pquDSR3l8u/d5AGOGAqPY1MWhWKpDhk6zLVmpsJrdAfkK+F2PrRt
+2PZE4XNiHzvEvqBTViVsUQn3qqvKv3b9bZvzndu/PWa8DFaqr5hIlTpL36dYUNk4dalb6kMMAv+Z
+6+hsTXBbKWWc3apdzK8BMewM69KN6Oqce+Zu9ydmDBpI125C4z/eIT574Q1w+2OqqGwaVLRcJXrJ
+osmLFqa7LH4XXgVNWG4SHQHuEhANxjJ/GP/89PrNbpHoNkm+Gkhpi8KWTRoSsmkXwQqQ1vp5Iki/
+untp+HDH+no32NgN0nZPV/+Qt+OR0t3vwmC3Zzrd/qqc8NSLf3Iizsafl7b4r4qgEKjZ+xjGtrVc
+UjyJthkqcwEKDwOzEmDyei+B26Nu/yYwl/WL3YlXtq09s68rxbd2AvCl1iuahhQqcvbjM4xdCUsT
+37uMdBNSSwIDAQABo4ICUjCCAk4wDAYDVR0TBAUwAwEB/zALBgNVHQ8EBAMCAa4wHQYDVR0OBBYE
+FE4L7xqkQFulF2mHMMo0aEPQQa7yMGQGA1UdHwRdMFswLKAqoCiGJmh0dHA6Ly9jZXJ0LnN0YXJ0
+Y29tLm9yZy9zZnNjYS1jcmwuY3JsMCugKaAnhiVodHRwOi8vY3JsLnN0YXJ0Y29tLm9yZy9zZnNj
+YS1jcmwuY3JsMIIBXQYDVR0gBIIBVDCCAVAwggFMBgsrBgEEAYG1NwEBATCCATswLwYIKwYBBQUH
+AgEWI2h0dHA6Ly9jZXJ0LnN0YXJ0Y29tLm9yZy9wb2xpY3kucGRmMDUGCCsGAQUFBwIBFilodHRw
+Oi8vY2VydC5zdGFydGNvbS5vcmcvaW50ZXJtZWRpYXRlLnBkZjCB0AYIKwYBBQUHAgIwgcMwJxYg
+U3RhcnQgQ29tbWVyY2lhbCAoU3RhcnRDb20pIEx0ZC4wAwIBARqBl0xpbWl0ZWQgTGlhYmlsaXR5
+LCByZWFkIHRoZSBzZWN0aW9uICpMZWdhbCBMaW1pdGF0aW9ucyogb2YgdGhlIFN0YXJ0Q29tIENl
+cnRpZmljYXRpb24gQXV0aG9yaXR5IFBvbGljeSBhdmFpbGFibGUgYXQgaHR0cDovL2NlcnQuc3Rh
+cnRjb20ub3JnL3BvbGljeS5wZGYwEQYJYIZIAYb4QgEBBAQDAgAHMDgGCWCGSAGG+EIBDQQrFilT
+dGFydENvbSBGcmVlIFNTTCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTANBgkqhkiG9w0BAQUFAAOC
+AgEAFmyZ9GYMNPXQhV59CuzaEE44HF7fpiUFS5Eyweg78T3dRAlbB0mKKctmArexmvclmAk8jhvh
+3TaHK0u7aNM5Zj2gJsfyOZEdUauCe37Vzlrk4gNXcGmXCPleWKYK34wGmkUWFjgKXlf2Ysd6AgXm
+vB618p70qSmD+LIU424oh0TDkBreOKk8rENNZEXO3SipXPJzewT4F+irsfMuXGRuczE6Eri8sxHk
+fY+BUZo7jYn0TZNmezwD7dOaHZrzZVD1oNB1ny+v8OqCQ5j4aZyJecRDjkZy42Q2Eq/3JR44iZB3
+fsNrarnDy0RLrHiQi+fHLB5LEUTINFInzQpdn4XBidUaePKVEFMy3YCEZnXZtWgo+2EuvoSoOMCZ
+EoalHmdkrQYuL6lwhceWD3yJZfWOQ1QOq92lgDmUYMA0yZZwLKMS9R9Ie70cfmu3nZD0Ijuu+Pwq
+yvqCUqDvr0tVk+vBtfAii6w0TiYiBKGHLHVKt+V9E9e4DGTANtLJL4YSjCMJwRuCO3NJo2pXh5Tl
+1njFmUNj403gdy3hZZlyaQQaRwnmDwFWJPsfvw55qVguucQJAX6Vum0ABj6y6koQOdjQK/W/7HW/
+lwLFCRsI3FU34oH7N4RDYiDK51ZLZer+bMEkkyShNOsF/5oirpt9P/FlUQqmMGqz9IgcgA38coro
+g14=
+-----END CERTIFICATE-----
+
+Taiwan GRCA
+===========
+-----BEGIN CERTIFICATE-----
+MIIFcjCCA1qgAwIBAgIQH51ZWtcvwgZEpYAIaeNe9jANBgkqhkiG9w0BAQUFADA/MQswCQYDVQQG
+EwJUVzEwMC4GA1UECgwnR292ZXJubWVudCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4X
+DTAyMTIwNTEzMjMzM1oXDTMyMTIwNTEzMjMzM1owPzELMAkGA1UEBhMCVFcxMDAuBgNVBAoMJ0dv
+dmVybm1lbnQgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCAiIwDQYJKoZIhvcNAQEBBQAD
+ggIPADCCAgoCggIBAJoluOzMonWoe/fOW1mKydGGEghU7Jzy50b2iPN86aXfTEc2pBsBHH8eV4qN
+w8XRIePaJD9IK/ufLqGU5ywck9G/GwGHU5nOp/UKIXZ3/6m3xnOUT0b3EEk3+qhZSV1qgQdW8or5
+BtD3cCJNtLdBuTK4sfCxw5w/cP1T3YGq2GN49thTbqGsaoQkclSGxtKyyhwOeYHWtXBiCAEuTk8O
+1RGvqa/lmr/czIdtJuTJV6L7lvnM4T9TjGxMfptTCAtsF/tnyMKtsc2AtJfcdgEWFelq16TheEfO
+htX7MfP6Mb40qij7cEwdScevLJ1tZqa2jWR+tSBqnTuBto9AAGdLiYa4zGX+FVPpBMHWXx1E1wov
+J5pGfaENda1UhhXcSTvxls4Pm6Dso3pdvtUqdULle96ltqqvKKyskKw4t9VoNSZ63Pc78/1Fm9G7
+Q3hub/FCVGqY8A2tl+lSXunVanLeavcbYBT0peS2cWeqH+riTcFCQP5nRhc4L0c/cZyu5SHKYS1t
+B6iEfC3uUSXxY5Ce/eFXiGvviiNtsea9P63RPZYLhY3Naye7twWb7LuRqQoHEgKXTiCQ8P8NHuJB
+O9NAOueNXdpm5AKwB1KYXA6OM5zCppX7VRluTI6uSw+9wThNXo+EHWbNxWCWtFJaBYmOlXqYwZE8
+lSOyDvR5tMl8wUohAgMBAAGjajBoMB0GA1UdDgQWBBTMzO/MKWCkO7GStjz6MmKPrCUVOzAMBgNV
+HRMEBTADAQH/MDkGBGcqBwAEMTAvMC0CAQAwCQYFKw4DAhoFADAHBgVnKgMAAAQUA5vwIhP/lSg2
+09yewDL7MTqKUWUwDQYJKoZIhvcNAQEFBQADggIBAECASvomyc5eMN1PhnR2WPWus4MzeKR6dBcZ
+TulStbngCnRiqmjKeKBMmo4sIy7VahIkv9Ro04rQ2JyftB8M3jh+Vzj8jeJPXgyfqzvS/3WXy6Tj
+Zwj/5cAWtUgBfen5Cv8b5Wppv3ghqMKnI6mGq3ZW6A4M9hPdKmaKZEk9GhiHkASfQlK3T8v+R0F2
+Ne//AHY2RTKbxkaFXeIksB7jSJaYV0eUVXoPQbFEJPPB/hprv4j9wabak2BegUqZIJxIZhm1AHlU
+D7gsL0u8qV1bYH+Mh6XgUmMqvtg7hUAV/h62ZT/FS9p+tXo1KaMuephgIqP0fSdOLeq0dDzpD6Qz
+DxARvBMB1uUO07+1EqLhRSPAzAhuYbeJq4PjJB7mXQfnHyA+z2fI56wwbSdLaG5LKlwCCDTb+Hbk
+Z6MmnD+iMsJKxYEYMRBWqoTvLQr/uB930r+lWKBi5NdLkXWNiYCYfm3LU05er/ayl4WXudpVBrkk
+7tfGOB5jGxI7leFYrPLfhNVfmS8NVVvmONsuP3LpSIXLuykTjx44VbnzssQwmSNOXfJIoRIM3BKQ
+CZBUkQM8R+XVyWXgt0t97EfTsws+rZ7QdAAO671RrcDeLMDDav7v3Aun+kbfYNucpllQdSNpc5Oy
++fwC00fmcc4QAu4njIT/rEUNE1yDMuAlpYYsfPQS
+-----END CERTIFICATE-----
+
+Swisscom Root CA 1
+==================
+-----BEGIN CERTIFICATE-----
+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
+NY6E0F/6MBr1mmz0DlP5OlvRHA==
+-----END CERTIFICATE-----
+
+DigiCert Assured ID Root CA
+===========================
+-----BEGIN CERTIFICATE-----
+MIIDtzCCAp+gAwIBAgIQDOfg5RfYRv6P5WD8G/AwOTANBgkqhkiG9w0BAQUFADBlMQswCQYDVQQG
+EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSQw
+IgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgQ0EwHhcNMDYxMTEwMDAwMDAwWhcNMzEx
+MTEwMDAwMDAwWjBlMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQL
+ExB3d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgQ0Ew
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtDhXO5EOAXLGH87dg+XESpa7cJpSIqvTO
+9SA5KFhgDPiA2qkVlTJhPLWxKISKityfCgyDF3qPkKyK53lTXDGEKvYPmDI2dsze3Tyoou9q+yHy
+UmHfnyDXH+Kx2f4YZNISW1/5WBg1vEfNoTb5a3/UsDg+wRvDjDPZ2C8Y/igPs6eD1sNuRMBhNZYW
+/lmci3Zt1/GiSw0r/wty2p5g0I6QNcZ4VYcgoc/lbQrISXwxmDNsIumH0DJaoroTghHtORedmTpy
+oeb6pNnVFzF1roV9Iq4/AUaG9ih5yLHa5FcXxH4cDrC0kqZWs72yl+2qp/C3xag/lRbQ/6GW6whf
+GHdPAgMBAAGjYzBhMA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRF
+66Kv9JLLgjEtUYunpyGd823IDzAfBgNVHSMEGDAWgBRF66Kv9JLLgjEtUYunpyGd823IDzANBgkq
+hkiG9w0BAQUFAAOCAQEAog683+Lt8ONyc3pklL/3cmbYMuRCdWKuh+vy1dneVrOfzM4UKLkNl2Bc
+EkxY5NM9g0lFWJc1aRqoR+pWxnmrEthngYTffwk8lOa4JiwgvT2zKIn3X/8i4peEH+ll74fg38Fn
+SbNd67IJKusm7Xi+fT8r87cmNW1fiQG2SVufAQWbqz0lwcy2f8Lxb4bG+mRo64EtlOtCt/qMHt1i
+8b5QZ7dsvfPxH2sMNgcWfzd8qVttevESRmCD1ycEvkvOl77DZypoEd+A5wwzZr8TDRRu838fYxAe
++o0bJW1sj6W3YQGx0qMmoRBxna3iw/nDmVG3KwcIzi7mULKn+gpFL6Lw8g==
+-----END CERTIFICATE-----
+
+DigiCert Global Root CA
+=======================
+-----BEGIN CERTIFICATE-----
+MIIDrzCCApegAwIBAgIQCDvgVpBCRrGhdWrJWZHHSjANBgkqhkiG9w0BAQUFADBhMQswCQYDVQQG
+EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSAw
+HgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBDQTAeFw0wNjExMTAwMDAwMDBaFw0zMTExMTAw
+MDAwMDBaMGExCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3
+dy5kaWdpY2VydC5jb20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IENBMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4jvhEXLeqKTTo1eqUKKPC3eQyaKl7hLOllsBCSDMAZOn
+TjC3U/dDxGkAV53ijSLdhwZAAIEJzs4bg7/fzTtxRuLWZscFs3YnFo97nh6Vfe63SKMI2tavegw5
+BmV/Sl0fvBf4q77uKNd0f3p4mVmFaG5cIzJLv07A6Fpt43C/dxC//AH2hdmoRBBYMql1GNXRor5H
+4idq9Joz+EkIYIvUX7Q6hL+hqkpMfT7PT19sdl6gSzeRntwi5m3OFBqOasv+zbMUZBfHWymeMr/y
+7vrTC0LUq7dBMtoM1O/4gdW7jVg/tRvoSSiicNoxBN33shbyTApOB6jtSj1etX+jkMOvJwIDAQAB
+o2MwYTAOBgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUA95QNVbRTLtm
+8KPiGxvDl7I90VUwHwYDVR0jBBgwFoAUA95QNVbRTLtm8KPiGxvDl7I90VUwDQYJKoZIhvcNAQEF
+BQADggEBAMucN6pIExIK+t1EnE9SsPTfrgT1eXkIoyQY/EsrhMAtudXH/vTBH1jLuG2cenTnmCmr
+EbXjcKChzUyImZOMkXDiqw8cvpOp/2PV5Adg06O/nVsJ8dWO41P0jmP6P6fbtGbfYmbW0W5BjfIt
+tep3Sp+dWOIrWcBAI+0tKIJFPnlUkiaY4IBIqDfv8NZ5YBberOgOzW6sRBc4L0na4UU+Krk2U886
+UAb3LujEV0lsYSEY1QSteDwsOoBrp+uvFRTp2InBuThs4pFsiv9kuXclVzDAGySj4dzp30d8tbQk
+CAUw7C29C79Fv1C5qfPrmAESrciIxpg0X40KPMbp1ZWVbd4=
+-----END CERTIFICATE-----
+
+DigiCert High Assurance EV Root CA
+==================================
+-----BEGIN CERTIFICATE-----
+MIIDxTCCAq2gAwIBAgIQAqxcJmoLQJuPC3nyrkYldzANBgkqhkiG9w0BAQUFADBsMQswCQYDVQQG
+EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSsw
+KQYDVQQDEyJEaWdpQ2VydCBIaWdoIEFzc3VyYW5jZSBFViBSb290IENBMB4XDTA2MTExMDAwMDAw
+MFoXDTMxMTExMDAwMDAwMFowbDELMAkGA1UEBhMCVVMxFTATBgNVBAoTDERpZ2lDZXJ0IEluYzEZ
+MBcGA1UECxMQd3d3LmRpZ2ljZXJ0LmNvbTErMCkGA1UEAxMiRGlnaUNlcnQgSGlnaCBBc3N1cmFu
+Y2UgRVYgUm9vdCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMbM5XPm+9S75S0t
+Mqbf5YE/yc0lSbZxKsPVlDRnogocsF9ppkCxxLeyj9CYpKlBWTrT3JTWPNt0OKRKzE0lgvdKpVMS
+OO7zSW1xkX5jtqumX8OkhPhPYlG++MXs2ziS4wblCJEMxChBVfvLWokVfnHoNb9Ncgk9vjo4UFt3
+MRuNs8ckRZqnrG0AFFoEt7oT61EKmEFBIk5lYYeBQVCmeVyJ3hlKV9Uu5l0cUyx+mM0aBhakaHPQ
+NAQTXKFx01p8VdteZOE3hzBWBOURtCmAEvF5OYiiAhF8J2a3iLd48soKqDirCmTCv2ZdlYTBoSUe
+h10aUAsgEsxBu24LUTi4S8sCAwEAAaNjMGEwDgYDVR0PAQH/BAQDAgGGMA8GA1UdEwEB/wQFMAMB
+Af8wHQYDVR0OBBYEFLE+w2kD+L9HAdSYJhoIAu9jZCvDMB8GA1UdIwQYMBaAFLE+w2kD+L9HAdSY
+JhoIAu9jZCvDMA0GCSqGSIb3DQEBBQUAA4IBAQAcGgaX3NecnzyIZgYIVyHbIUf4KmeqvxgydkAQ
+V8GK83rZEWWONfqe/EW1ntlMMUu4kehDLI6zeM7b41N5cdblIZQB2lWHmiRk9opmzN6cN82oNLFp
+myPInngiK3BD41VHMWEZ71jFhS9OMPagMRYjyOfiZRYzy78aG6A9+MpeizGLYAiJLQwGXFK3xPkK
+mNEVX58Svnw2Yzi9RKR/5CYrCsSXaQ3pjOLAEFe4yHYSkVXySGnYvCoCWw9E1CAx2/S6cCZdkGCe
+vEsXCS+0yx5DaMkHJ8HSXPfqIbloEpw8nL+e/IBcm2PN7EeqJSdnoDfzAIJ9VNep+OkuE6N36B9K
+-----END CERTIFICATE-----
+
+Certplus Class 2 Primary CA
+===========================
+-----BEGIN CERTIFICATE-----
+MIIDkjCCAnqgAwIBAgIRAIW9S/PY2uNp9pTXX8OlRCMwDQYJKoZIhvcNAQEFBQAwPTELMAkGA1UE
+BhMCRlIxETAPBgNVBAoTCENlcnRwbHVzMRswGQYDVQQDExJDbGFzcyAyIFByaW1hcnkgQ0EwHhcN
+OTkwNzA3MTcwNTAwWhcNMTkwNzA2MjM1OTU5WjA9MQswCQYDVQQGEwJGUjERMA8GA1UEChMIQ2Vy
+dHBsdXMxGzAZBgNVBAMTEkNsYXNzIDIgUHJpbWFyeSBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBANxQltAS+DXSCHh6tlJw/W/uz7kRy1134ezpfgSN1sxvc0NXYKwzCkTsA18cgCSR
+5aiRVhKC9+Ar9NuuYS6JEI1rbLqzAr3VNsVINyPi8Fo3UjMXEuLRYE2+L0ER4/YXJQyLkcAbmXuZ
+Vg2v7tK8R1fjeUl7NIknJITesezpWE7+Tt9avkGtrAjFGA7v0lPubNCdEgETjdyAYveVqUSISnFO
+YFWe2yMZeVYHDD9jC1yw4r5+FfyUM1hBOHTE4Y+L3yasH7WLO7dDWWuwJKZtkIvEcupdM5i3y95e
+e++U8Rs+yskhwcWYAqqi9lt3m/V+llU0HGdpwPFC40es/CgcZlUCAwEAAaOBjDCBiTAPBgNVHRME
+CDAGAQH/AgEKMAsGA1UdDwQEAwIBBjAdBgNVHQ4EFgQU43Mt38sOKAze3bOkynm4jrvoMIkwEQYJ
+YIZIAYb4QgEBBAQDAgEGMDcGA1UdHwQwMC4wLKAqoCiGJmh0dHA6Ly93d3cuY2VydHBsdXMuY29t
+L0NSTC9jbGFzczIuY3JsMA0GCSqGSIb3DQEBBQUAA4IBAQCnVM+IRBnL39R/AN9WM2K191EBkOvD
+P9GIROkkXe/nFL0gt5o8AP5tn9uQ3Nf0YtaLcF3n5QRIqWh8yfFC82x/xXp8HVGIutIKPidd3i1R
+TtMTZGnkLuPT55sJmabglZvOGtd/vjzOUrMRFcEPF80Du5wlFbqidon8BvEY0JNLDnyCt6X09l/+
+7UCmnYR0ObncHoUW2ikbhiMAybuJfm6AiB4vFLQDJKgybwOaRywwvlbGp0ICcBvqQNi6BQNwB6SW
+//1IMwrh3KWBkJtN3X3n57LNXMhqlfil9o3EXXgIvnsG1knPGTZQIy4I5p4FTUcY1Rbpsda2ENW7
+l7+ijrRU
+-----END CERTIFICATE-----
+
+DST Root CA X3
+==============
+-----BEGIN CERTIFICATE-----
+MIIDSjCCAjKgAwIBAgIQRK+wgNajJ7qJMDmGLvhAazANBgkqhkiG9w0BAQUFADA/MSQwIgYDVQQK
+ExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMTDkRTVCBSb290IENBIFgzMB4X
+DTAwMDkzMDIxMTIxOVoXDTIxMDkzMDE0MDExNVowPzEkMCIGA1UEChMbRGlnaXRhbCBTaWduYXR1
+cmUgVHJ1c3QgQ28uMRcwFQYDVQQDEw5EU1QgUm9vdCBDQSBYMzCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBAN+v6ZdQCINXtMxiZfaQguzH0yxrMMpb7NnDfcdAwRgUi+DoM3ZJKuM/IUmT
+rE4Orz5Iy2Xu/NMhD2XSKtkyj4zl93ewEnu1lcCJo6m67XMuegwGMoOifooUMM0RoOEqOLl5CjH9
+UL2AZd+3UWODyOKIYepLYYHsUmu5ouJLGiifSKOeDNoJjj4XLh7dIN9bxiqKqy69cK3FCxolkHRy
+xXtqqzTWMIn/5WgTe1QLyNau7Fqckh49ZLOMxt+/yUFw7BZy1SbsOFU5Q9D8/RhcQPGX69Wam40d
+utolucbY38EVAjqr2m7xPi71XAicPNaDaeQQmxkqtilX4+U9m5/wAl0CAwEAAaNCMEAwDwYDVR0T
+AQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFMSnsaR7LHH62+FLkHX/xBVghYkQ
+MA0GCSqGSIb3DQEBBQUAA4IBAQCjGiybFwBcqR7uKGY3Or+Dxz9LwwmglSBd49lZRNI+DT69ikug
+dB/OEIKcdBodfpga3csTS7MgROSR6cz8faXbauX+5v3gTt23ADq1cEmv8uXrAvHRAosZy5Q6XkjE
+GB5YGV8eAlrwDPGxrancWYaLbumR9YbK+rlmM6pZW87ipxZzR8srzJmwN0jP41ZL9c8PDHIyh8bw
+RLtTcm1D9SZImlJnt1ir/md2cXjbDaJWFBM5JDGFoqgCWjBH4d1QB7wCCZAA62RjYJsWvIjJEubS
+fZGL+T0yjWW06XyxV3bqxbYoOb8VZRzI9neWagqNdwvYkQsEjgfbKbYK7p2CNTUQ
+-----END CERTIFICATE-----
+
+DST ACES CA X6
+==============
+-----BEGIN CERTIFICATE-----
+MIIECTCCAvGgAwIBAgIQDV6ZCtadt3js2AdWO4YV2TANBgkqhkiG9w0BAQUFADBbMQswCQYDVQQG
+EwJVUzEgMB4GA1UEChMXRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3QxETAPBgNVBAsTCERTVCBBQ0VT
+MRcwFQYDVQQDEw5EU1QgQUNFUyBDQSBYNjAeFw0wMzExMjAyMTE5NThaFw0xNzExMjAyMTE5NTha
+MFsxCzAJBgNVBAYTAlVTMSAwHgYDVQQKExdEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdDERMA8GA1UE
+CxMIRFNUIEFDRVMxFzAVBgNVBAMTDkRTVCBBQ0VTIENBIFg2MIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEAuT31LMmU3HWKlV1j6IR3dma5WZFcRt2SPp/5DgO0PWGSvSMmtWPuktKe1jzI
+DZBfZIGxqAgNTNj50wUoUrQBJcWVHAx+PhCEdc/BGZFjz+iokYi5Q1K7gLFViYsx+tC3dr5BPTCa
+pCIlF3PoHuLTrCq9Wzgh1SpL11V94zpVvddtawJXa+ZHfAjIgrrep4c9oW24MFbCswKBXy314pow
+GCi4ZtPLAZZv6opFVdbgnf9nKxcCpk4aahELfrd755jWjHZvwTvbUJN+5dCOHze4vbrGn2zpfDPy
+MjwmR/onJALJfh1biEITajV8fTXpLmaRcpPVMibEdPVTo7NdmvYJywIDAQABo4HIMIHFMA8GA1Ud
+EwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgHGMB8GA1UdEQQYMBaBFHBraS1vcHNAdHJ1c3Rkc3Qu
+Y29tMGIGA1UdIARbMFkwVwYKYIZIAWUDAgEBATBJMEcGCCsGAQUFBwIBFjtodHRwOi8vd3d3LnRy
+dXN0ZHN0LmNvbS9jZXJ0aWZpY2F0ZXMvcG9saWN5L0FDRVMtaW5kZXguaHRtbDAdBgNVHQ4EFgQU
+CXIGThhDD+XWzMNqizF7eI+og7gwDQYJKoZIhvcNAQEFBQADggEBAKPYjtay284F5zLNAdMEA+V2
+5FYrnJmQ6AgwbN99Pe7lv7UkQIRJ4dEorsTCOlMwiPH1d25Ryvr/ma8kXxug/fKshMrfqfBfBC6t
+Fr8hlxCBPeP/h40y3JTlR4peahPJlJU90u7INJXQgNStMgiAVDzgvVJT11J8smk/f3rPanTK+gQq
+nExaBqXpIK1FZg9p8d2/6eMyi/rgwYZNcjwu2JN4Cir42NInPRmJX1p7ijvMDNpRrscL9yuwNwXs
+vFcj4jjSm2jzVhKIT0J8uDHEtdvkyCE06UgRNe76x5JXxZ805Mf29w4LTJxoeHtxMcfrHuBnQfO3
+oKfN5XozNmr6mis=
+-----END CERTIFICATE-----
+
+SwissSign Gold CA - G2
+======================
+-----BEGIN CERTIFICATE-----
+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
+-----END CERTIFICATE-----
+
+SwissSign Silver CA - G2
+========================
+-----BEGIN CERTIFICATE-----
+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
+-----END CERTIFICATE-----
+
+GeoTrust Primary Certification Authority
+========================================
+-----BEGIN CERTIFICATE-----
+MIIDfDCCAmSgAwIBAgIQGKy1av1pthU6Y2yv2vrEoTANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQG
+EwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjExMC8GA1UEAxMoR2VvVHJ1c3QgUHJpbWFyeSBD
+ZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wNjExMjcwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMFgx
+CzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTEwLwYDVQQDEyhHZW9UcnVzdCBQ
+cmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEAvrgVe//UfH1nrYNke8hCUy3f9oQIIGHWAVlqnEQRr+92/ZV+zmEwu3qDXwK9AWbK7hWN
+b6EwnL2hhZ6UOvNWiAAxz9juapYC2e0DjPt1befquFUWBRaa9OBesYjAZIVcFU2Ix7e64HXprQU9
+nceJSOC7KMgD4TCTZF5SwFlwIjVXiIrxlQqD17wxcwE07e9GceBrAqg1cmuXm2bgyxx5X9gaBGge
+RwLmnWDiNpcB3841kt++Z8dtd1k7j53WkBWUvEI0EME5+bEnPn7WinXFsq+W06Lem+SYvn3h6YGt
+tm/81w7a4DSwDRp35+MImO9Y+pyEtzavwt+s0vQQBnBxNQIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
+AQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQULNVQQZcVi/CPNmFbSvtr2ZnJM5IwDQYJKoZI
+hvcNAQEFBQADggEBAFpwfyzdtzRP9YZRqSa+S7iq8XEN3GHHoOo0Hnp3DwQ16CePbJC/kRYkRj5K
+Ts4rFtULUh38H2eiAkUxT87z+gOneZ1TatnaYzr4gNfTmeGl4b7UVXGYNTq+k+qurUKykG/g/CFN
+NWMziUnWm07Kx+dOCQD32sfvmWKZd7aVIl6KoKv0uHiYyjgZmclynnjNS6yvGaBzEi38wkG6gZHa
+Floxt/m0cYASSJlyc1pZU8FjUjPtp8nSOQJw+uCxQmYpqptR7TBUIhRf2asdweSU8Pj1K/fqynhG
+1riR/aYNKxoUAT6A8EKglQdebc3MS6RFjasS6LPeWuWgfOgPIh1a6Vk=
+-----END CERTIFICATE-----
+
+thawte Primary Root CA
+======================
+-----BEGIN CERTIFICATE-----
+MIIEIDCCAwigAwIBAgIQNE7VVyDV7exJ9C/ON9srbTANBgkqhkiG9w0BAQUFADCBqTELMAkGA1UE
+BhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2
+aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMvKGMpIDIwMDYgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhv
+cml6ZWQgdXNlIG9ubHkxHzAdBgNVBAMTFnRoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EwHhcNMDYxMTE3
+MDAwMDAwWhcNMzYwNzE2MjM1OTU5WjCBqTELMAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwg
+SW5jLjEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMv
+KGMpIDIwMDYgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxHzAdBgNVBAMT
+FnRoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCs
+oPD7gFnUnMekz52hWXMJEEUMDSxuaPFsW0hoSVk3/AszGcJ3f8wQLZU0HObrTQmnHNK4yZc2AreJ
+1CRfBsDMRJSUjQJib+ta3RGNKJpchJAQeg29dGYvajig4tVUROsdB58Hum/u6f1OCyn1PoSgAfGc
+q/gcfomk6KHYcWUNo1F77rzSImANuVud37r8UVsLr5iy6S7pBOhih94ryNdOwUxkHt3Ph1i6Sk/K
+aAcdHJ1KxtUvkcx8cXIcxcBn6zL9yZJclNqFwJu/U30rCfSMnZEfl2pSy94JNqR32HuHUETVPm4p
+afs5SSYeCaWAe0At6+gnhcn+Yf1+5nyXHdWdAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBR7W0XPr87Lev0xkhpqtvNG61dIUDANBgkqhkiG9w0BAQUF
+AAOCAQEAeRHAS7ORtvzw6WfUDW5FvlXok9LOAz/t2iWwHVfLHjp2oEzsUHboZHIMpKnxuIvW1oeE
+uzLlQRHAd9mzYJ3rG9XRbkREqaYB7FViHXe4XI5ISXycO1cRrK1zN44veFyQaEfZYGDm/Ac9IiAX
+xPcW6cTYcvnIc3zfFi8VqT79aie2oetaupgf1eNNZAqdE8hhuvU5HIe6uL17In/2/qxAeeWsEG89
+jxt5dovEN7MhGITlNgDrYyCZuen+MwS7QcjBAvlEYyCegc5C09Y/LHbTY5xZ3Y+m4Q6gLkH3LpVH
+z7z9M/P2C2F+fpErgUfCJzDupxBdN49cOSvkBPB7jVaMaA==
+-----END CERTIFICATE-----
+
+VeriSign Class 3 Public Primary Certification Authority - G5
+============================================================
+-----BEGIN CERTIFICATE-----
+MIIE0zCCA7ugAwIBAgIQGNrRniZ96LtKIVjNzGs7SjANBgkqhkiG9w0BAQUFADCByjELMAkGA1UE
+BhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBO
+ZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVk
+IHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRp
+ZmljYXRpb24gQXV0aG9yaXR5IC0gRzUwHhcNMDYxMTA4MDAwMDAwWhcNMzYwNzE2MjM1OTU5WjCB
+yjELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2ln
+biBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJpU2lnbiwgSW5jLiAtIEZvciBh
+dXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmlt
+YXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQCvJAgIKXo1nmAMqudLO07cfLw8RRy7K+D+KQL5VwijZIUVJ/XxrcgxiV0i6CqqpkKz
+j/i5Vbext0uz/o9+B1fs70PbZmIVYc9gDaTY3vjgw2IIPVQT60nKWVSFJuUrjxuf6/WhkcIzSdhD
+Y2pSS9KP6HBRTdGJaXvHcPaz3BJ023tdS1bTlr8Vd6Gw9KIl8q8ckmcY5fQGBO+QueQA5N06tRn/
+Arr0PO7gi+s3i+z016zy9vA9r911kTMZHRxAy3QkGSGT2RT+rCpSx4/VBEnkjWNHiDxpg8v+R70r
+fk/Fla4OndTRQ8Bnc+MUCH7lP59zuDMKz10/NIeWiu5T6CUVAgMBAAGjgbIwga8wDwYDVR0TAQH/
+BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJaW1hZ2Uv
+Z2lmMCEwHzAHBgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYjaHR0cDovL2xvZ28udmVy
+aXNpZ24uY29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFH/TZafC3ey78DAJ80M5+gKvMzEzMA0GCSqG
+SIb3DQEBBQUAA4IBAQCTJEowX2LP2BqYLz3q3JktvXf2pXkiOOzEp6B4Eq1iDkVwZMXnl2YtmAl+
+X6/WzChl8gGqCBpH3vn5fJJaCGkgDdk+bW48DW7Y5gaRQBi5+MHt39tBquCWIMnNZBU4gcmU7qKE
+KQsTb47bDN0lAtukixlE0kF6BWlKWE9gyn6CagsCqiUXObXbf+eEZSqVir2G3l6BFoMtEMze/aiC
+Km0oHw0LxOXnGiYZ4fQRbxC1lfznQgUy286dUV4otp6F01vvpX1FQHKOtw5rDgb7MzVIcbidJ4vE
+ZV8NhnacRHr2lVz2XTIIM6RUthg/aFzyQkqFOFSDX9HoLPKsEdao7WNq
+-----END CERTIFICATE-----
+
+SecureTrust CA
+==============
+-----BEGIN CERTIFICATE-----
+MIIDuDCCAqCgAwIBAgIQDPCOXAgWpa1Cf/DrJxhZ0DANBgkqhkiG9w0BAQUFADBIMQswCQYDVQQG
+EwJVUzEgMB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24xFzAVBgNVBAMTDlNlY3VyZVRy
+dXN0IENBMB4XDTA2MTEwNzE5MzExOFoXDTI5MTIzMTE5NDA1NVowSDELMAkGA1UEBhMCVVMxIDAe
+BgNVBAoTF1NlY3VyZVRydXN0IENvcnBvcmF0aW9uMRcwFQYDVQQDEw5TZWN1cmVUcnVzdCBDQTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKukgeWVzfX2FI7CT8rU4niVWJxB4Q2ZQCQX
+OZEzZum+4YOvYlyJ0fwkW2Gz4BERQRwdbvC4u/jep4G6pkjGnx29vo6pQT64lO0pGtSO0gMdA+9t
+DWccV9cGrcrI9f4Or2YlSASWC12juhbDCE/RRvgUXPLIXgGZbf2IzIaowW8xQmxSPmjL8xk037uH
+GFaAJsTQ3MBv396gwpEWoGQRS0S8Hvbn+mPeZqx2pHGj7DaUaHp3pLHnDi+BeuK1cobvomuL8A/b
+01k/unK8RCSc43Oz969XL0Imnal0ugBS8kvNU3xHCzaFDmapCJcWNFfBZveA4+1wVMeT4C4oFVmH
+ursCAwEAAaOBnTCBmjATBgkrBgEEAYI3FAIEBh4EAEMAQTALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/
+BAUwAwEB/zAdBgNVHQ4EFgQUQjK2FvoE/f5dS3rD/fdMQB1aQ68wNAYDVR0fBC0wKzApoCegJYYj
+aHR0cDovL2NybC5zZWN1cmV0cnVzdC5jb20vU1RDQS5jcmwwEAYJKwYBBAGCNxUBBAMCAQAwDQYJ
+KoZIhvcNAQEFBQADggEBADDtT0rhWDpSclu1pqNlGKa7UTt36Z3q059c4EVlew3KW+JwULKUBRSu
+SceNQQcSc5R+DCMh/bwQf2AQWnL1mA6s7Ll/3XpvXdMc9P+IBWlCqQVxyLesJugutIxq/3HcuLHf
+mbx8IVQr5Fiiu1cprp6poxkmD5kuCLDv/WnPmRoJjeOnnyvJNjR7JLN4TJUXpAYmHrZkUjZfYGfZ
+nMUFdAvnZyPSCPyI6a6Lf+Ew9Dd+/cYy2i2eRDAwbO4H3tI0/NL/QPZL9GZGBlSm8jIKYyYwa5vR
+3ItHuuG51WLQoqD0ZwV4KWMabwTW+MZMo5qxN7SN5ShLHZ4swrhovO0C7jE=
+-----END CERTIFICATE-----
+
+Secure Global CA
+================
+-----BEGIN CERTIFICATE-----
+MIIDvDCCAqSgAwIBAgIQB1YipOjUiolN9BPI8PjqpTANBgkqhkiG9w0BAQUFADBKMQswCQYDVQQG
+EwJVUzEgMB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24xGTAXBgNVBAMTEFNlY3VyZSBH
+bG9iYWwgQ0EwHhcNMDYxMTA3MTk0MjI4WhcNMjkxMjMxMTk1MjA2WjBKMQswCQYDVQQGEwJVUzEg
+MB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24xGTAXBgNVBAMTEFNlY3VyZSBHbG9iYWwg
+Q0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvNS7YrGxVaQZx5RNoJLNP2MwhR/jx
+YDiJiQPpvepeRlMJ3Fz1Wuj3RSoC6zFh1ykzTM7HfAo3fg+6MpjhHZevj8fcyTiW89sa/FHtaMbQ
+bqR8JNGuQsiWUGMu4P51/pinX0kuleM5M2SOHqRfkNJnPLLZ/kG5VacJjnIFHovdRIWCQtBJwB1g
+8NEXLJXr9qXBkqPFwqcIYA1gBBCWeZ4WNOaptvolRTnIHmX5k/Wq8VLcmZg9pYYaDDUz+kulBAYV
+HDGA76oYa8J719rO+TMg1fW9ajMtgQT7sFzUnKPiXB3jqUJ1XnvUd+85VLrJChgbEplJL4hL/VBi
+0XPnj3pDAgMBAAGjgZ0wgZowEwYJKwYBBAGCNxQCBAYeBABDAEEwCwYDVR0PBAQDAgGGMA8GA1Ud
+EwEB/wQFMAMBAf8wHQYDVR0OBBYEFK9EBMJBfkiD2045AuzshHrmzsmkMDQGA1UdHwQtMCswKaAn
+oCWGI2h0dHA6Ly9jcmwuc2VjdXJldHJ1c3QuY29tL1NHQ0EuY3JsMBAGCSsGAQQBgjcVAQQDAgEA
+MA0GCSqGSIb3DQEBBQUAA4IBAQBjGghAfaReUw132HquHw0LURYD7xh8yOOvaliTFGCRsoTciE6+
+OYo68+aCiV0BN7OrJKQVDpI1WkpEXk5X+nXOH0jOZvQ8QCaSmGwb7iRGDBezUqXbpZGRzzfTb+cn
+CDpOGR86p1hcF895P4vkp9MmI50mD1hp/Ed+stCNi5O/KU9DaXR2Z0vPB4zmAve14bRDtUstFJ/5
+3CYNv6ZHdAbYiNE6KTCEztI5gGIbqMdXSbxqVVFnFUq+NQfk1XWYN3kwFNspnWzFacxHVaIw98xc
+f8LDmBxrThaA63p4ZUWiABqvDA1VZDRIuJK58bRQKfJPIx/abKwfROHdI3hRW8cW
+-----END CERTIFICATE-----
+
+COMODO Certification Authority
+==============================
+-----BEGIN CERTIFICATE-----
+MIIEHTCCAwWgAwIBAgIQToEtioJl4AsC7j41AkblPTANBgkqhkiG9w0BAQUFADCBgTELMAkGA1UE
+BhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgG
+A1UEChMRQ09NT0RPIENBIExpbWl0ZWQxJzAlBgNVBAMTHkNPTU9ETyBDZXJ0aWZpY2F0aW9uIEF1
+dGhvcml0eTAeFw0wNjEyMDEwMDAwMDBaFw0yOTEyMzEyMzU5NTlaMIGBMQswCQYDVQQGEwJHQjEb
+MBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFD
+T01PRE8gQ0EgTGltaXRlZDEnMCUGA1UEAxMeQ09NT0RPIENlcnRpZmljYXRpb24gQXV0aG9yaXR5
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0ECLi3LjkRv3UcEbVASY06m/weaKXTuH
++7uIzg3jLz8GlvCiKVCZrts7oVewdFFxze1CkU1B/qnI2GqGd0S7WWaXUF601CxwRM/aN5VCaTww
+xHGzUvAhTaHYujl8HJ6jJJ3ygxaYqhZ8Q5sVW7euNJH+1GImGEaaP+vB+fGQV+useg2L23IwambV
+4EajcNxo2f8ESIl33rXp+2dtQem8Ob0y2WIC8bGoPW43nOIv4tOiJovGuFVDiOEjPqXSJDlqR6sA
+1KGzqSX+DT+nHbrTUcELpNqsOO9VUCQFZUaTNE8tja3G1CEZ0o7KBWFxB3NH5YoZEr0ETc5OnKVI
+rLsm9wIDAQABo4GOMIGLMB0GA1UdDgQWBBQLWOWLxkwVN6RAqTCpIb5HNlpW/zAOBgNVHQ8BAf8E
+BAMCAQYwDwYDVR0TAQH/BAUwAwEB/zBJBgNVHR8EQjBAMD6gPKA6hjhodHRwOi8vY3JsLmNvbW9k
+b2NhLmNvbS9DT01PRE9DZXJ0aWZpY2F0aW9uQXV0aG9yaXR5LmNybDANBgkqhkiG9w0BAQUFAAOC
+AQEAPpiem/Yb6dc5t3iuHXIYSdOH5EOC6z/JqvWote9VfCFSZfnVDeFs9D6Mk3ORLgLETgdxb8CP
+OGEIqB6BCsAvIC9Bi5HcSEW88cbeunZrM8gALTFGTO3nnc+IlP8zwFboJIYmuNg4ON8qa90SzMc/
+RxdMosIGlgnW2/4/PEZB31jiVg88O8EckzXZOFKs7sjsLjBOlDW0JB9LeGna8gI4zJVSk/BwJVmc
+IGfE7vmLV2H0knZ9P4SNVbfo5azV8fUZVqZa+5Acr5Pr5RzUZ5ddBA6+C4OmF4O5MBKgxTMVBbkN
++8cFduPYSo38NBejxiEovjBFMR7HeL5YYTisO+IBZQ==
+-----END CERTIFICATE-----
+
+Network Solutions Certificate Authority
+=======================================
+-----BEGIN CERTIFICATE-----
+MIID5jCCAs6gAwIBAgIQV8szb8JcFuZHFhfjkDFo4DANBgkqhkiG9w0BAQUFADBiMQswCQYDVQQG
+EwJVUzEhMB8GA1UEChMYTmV0d29yayBTb2x1dGlvbnMgTC5MLkMuMTAwLgYDVQQDEydOZXR3b3Jr
+IFNvbHV0aW9ucyBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcNMDYxMjAxMDAwMDAwWhcNMjkxMjMx
+MjM1OTU5WjBiMQswCQYDVQQGEwJVUzEhMB8GA1UEChMYTmV0d29yayBTb2x1dGlvbnMgTC5MLkMu
+MTAwLgYDVQQDEydOZXR3b3JrIFNvbHV0aW9ucyBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDkvH6SMG3G2I4rC7xGzuAnlt7e+foS0zwzc7MEL7xx
+jOWftiJgPl9dzgn/ggwbmlFQGiaJ3dVhXRncEg8tCqJDXRfQNJIg6nPPOCwGJgl6cvf6UDL4wpPT
+aaIjzkGxzOTVHzbRijr4jGPiFFlp7Q3Tf2vouAPlT2rlmGNpSAW+Lv8ztumXWWn4Zxmuk2GWRBXT
+crA/vGp97Eh/jcOrqnErU2lBUzS1sLnFBgrEsEX1QV1uiUV7PTsmjHTC5dLRfbIR1PtYMiKagMnc
+/Qzpf14Dl847ABSHJ3A4qY5usyd2mFHgBeMhqxrVhSI8KbWaFsWAqPS7azCPL0YCorEMIuDTAgMB
+AAGjgZcwgZQwHQYDVR0OBBYEFCEwyfsA106Y2oeqKtCnLrFAMadMMA4GA1UdDwEB/wQEAwIBBjAP
+BgNVHRMBAf8EBTADAQH/MFIGA1UdHwRLMEkwR6BFoEOGQWh0dHA6Ly9jcmwubmV0c29sc3NsLmNv
+bS9OZXR3b3JrU29sdXRpb25zQ2VydGlmaWNhdGVBdXRob3JpdHkuY3JsMA0GCSqGSIb3DQEBBQUA
+A4IBAQC7rkvnt1frf6ott3NHhWrB5KUd5Oc86fRZZXe1eltajSU24HqXLjjAV2CDmAaDn7l2em5Q
+4LqILPxFzBiwmZVRDuwduIj/h1AcgsLj4DKAv6ALR8jDMe+ZZzKATxcheQxpXN5eNK4CtSbqUN9/
+GGUsyfJj4akH/nxxH2szJGoeBfcFaMBqEssuXmHLrijTfsK0ZpEmXzwuJF/LWA/rKOyvEZbz3Htv
+wKeI8lN3s2Berq4o2jUsbzRF0ybh3uxbTydrFny9RAQYgrOJeRcQcT16ohZO9QHNpGxlaKFJdlxD
+ydi8NmdspZS11My5vWo1ViHe2MPr+8ukYEywVaCge1ey
+-----END CERTIFICATE-----
+
+WellsSecure Public Root Certificate Authority
+=============================================
+-----BEGIN CERTIFICATE-----
+MIIEvTCCA6WgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBhTELMAkGA1UEBhMCVVMxIDAeBgNVBAoM
+F1dlbGxzIEZhcmdvIFdlbGxzU2VjdXJlMRwwGgYDVQQLDBNXZWxscyBGYXJnbyBCYW5rIE5BMTYw
+NAYDVQQDDC1XZWxsc1NlY3VyZSBQdWJsaWMgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcN
+MDcxMjEzMTcwNzU0WhcNMjIxMjE0MDAwNzU0WjCBhTELMAkGA1UEBhMCVVMxIDAeBgNVBAoMF1dl
+bGxzIEZhcmdvIFdlbGxzU2VjdXJlMRwwGgYDVQQLDBNXZWxscyBGYXJnbyBCYW5rIE5BMTYwNAYD
+VQQDDC1XZWxsc1NlY3VyZSBQdWJsaWMgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDub7S9eeKPCCGeOARBJe+rWxxTkqxtnt3CxC5FlAM1
+iGd0V+PfjLindo8796jE2yljDpFoNoqXjopxaAkH5OjUDk/41itMpBb570OYj7OeUt9tkTmPOL13
+i0Nj67eT/DBMHAGTthP796EfvyXhdDcsHqRePGj4S78NuR4uNuip5Kf4D8uCdXw1LSLWwr8L87T8
+bJVhHlfXBIEyg1J55oNjz7fLY4sR4r1e6/aN7ZVyKLSsEmLpSjPmgzKuBXWVvYSV2ypcm44uDLiB
+K0HmOFafSZtsdvqKXfcBeYF8wYNABf5x/Qw/zE5gCQ5lRxAvAcAFP4/4s0HvWkJ+We/SlwxlAgMB
+AAGjggE0MIIBMDAPBgNVHRMBAf8EBTADAQH/MDkGA1UdHwQyMDAwLqAsoCqGKGh0dHA6Ly9jcmwu
+cGtpLndlbGxzZmFyZ28uY29tL3dzcHJjYS5jcmwwDgYDVR0PAQH/BAQDAgHGMB0GA1UdDgQWBBQm
+lRkQ2eihl5H/3BnZtQQ+0nMKajCBsgYDVR0jBIGqMIGngBQmlRkQ2eihl5H/3BnZtQQ+0nMKaqGB
+i6SBiDCBhTELMAkGA1UEBhMCVVMxIDAeBgNVBAoMF1dlbGxzIEZhcmdvIFdlbGxzU2VjdXJlMRww
+GgYDVQQLDBNXZWxscyBGYXJnbyBCYW5rIE5BMTYwNAYDVQQDDC1XZWxsc1NlY3VyZSBQdWJsaWMg
+Um9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHmCAQEwDQYJKoZIhvcNAQEFBQADggEBALkVsUSRzCPI
+K0134/iaeycNzXK7mQDKfGYZUMbVmO2rvwNa5U3lHshPcZeG1eMd/ZDJPHV3V3p9+N701NX3leZ0
+bh08rnyd2wIDBSxxSyU+B+NemvVmFymIGjifz6pBA4SXa5M4esowRBskRDPQ5NHcKDj0E0M1NSlj
+qHyita04pO2t/caaH/+Xc/77szWnk4bGdpEA5qxRFsQnMlzbc9qlk1eOPm01JghZ1edE13YgY+es
+E2fDbbFwRnzVlhE9iW9dqKHrjQrawx0zbKPqZxmamX9LPYNRKh3KL4YMon4QLSvUFpULB6ouFJJJ
+tylv2G0xffX8oRAHh84vWdw+WNs=
+-----END CERTIFICATE-----
+
+COMODO ECC Certification Authority
+==================================
+-----BEGIN CERTIFICATE-----
+MIICiTCCAg+gAwIBAgIQH0evqmIAcFBUTAGem2OZKjAKBggqhkjOPQQDAzCBhTELMAkGA1UEBhMC
+R0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UE
+ChMRQ09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBFQ0MgQ2VydGlmaWNhdGlvbiBB
+dXRob3JpdHkwHhcNMDgwMzA2MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBhTELMAkGA1UEBhMCR0Ix
+GzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UEChMR
+Q09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBFQ0MgQ2VydGlmaWNhdGlvbiBBdXRo
+b3JpdHkwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQDR3svdcmCFYX7deSRFtSrYpn1PlILBs5BAH+X
+4QokPB0BBO490o0JlwzgdeT6+3eKKvUDYEs2ixYjFq0JcfRK9ChQtP6IHG4/bC8vCVlbpVsLM5ni
+wz2J+Wos77LTBumjQjBAMB0GA1UdDgQWBBR1cacZSBm8nZ3qQUfflMRId5nTeTAOBgNVHQ8BAf8E
+BAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAKBggqhkjOPQQDAwNoADBlAjEA7wNbeqy3eApyt4jf/7VG
+FAkK+qDmfQjGGoe9GKhzvSbKYAydzpmfz1wPMOG+FDHqAjAU9JM8SaczepBGR7NjfRObTrdvGDeA
+U/7dIOA1mjbRxwG55tzd8/8dLDoWV9mSOdY=
+-----END CERTIFICATE-----
+
+IGC/A
+=====
+-----BEGIN CERTIFICATE-----
+MIIEAjCCAuqgAwIBAgIFORFFEJQwDQYJKoZIhvcNAQEFBQAwgYUxCzAJBgNVBAYTAkZSMQ8wDQYD
+VQQIEwZGcmFuY2UxDjAMBgNVBAcTBVBhcmlzMRAwDgYDVQQKEwdQTS9TR0ROMQ4wDAYDVQQLEwVE
+Q1NTSTEOMAwGA1UEAxMFSUdDL0ExIzAhBgkqhkiG9w0BCQEWFGlnY2FAc2dkbi5wbS5nb3V2LmZy
+MB4XDTAyMTIxMzE0MjkyM1oXDTIwMTAxNzE0MjkyMlowgYUxCzAJBgNVBAYTAkZSMQ8wDQYDVQQI
+EwZGcmFuY2UxDjAMBgNVBAcTBVBhcmlzMRAwDgYDVQQKEwdQTS9TR0ROMQ4wDAYDVQQLEwVEQ1NT
+STEOMAwGA1UEAxMFSUdDL0ExIzAhBgkqhkiG9w0BCQEWFGlnY2FAc2dkbi5wbS5nb3V2LmZyMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsh/R0GLFMzvABIaIs9z4iPf930Pfeo2aSVz2
+TqrMHLmh6yeJ8kbpO0px1R2OLc/mratjUMdUC24SyZA2xtgv2pGqaMVy/hcKshd+ebUyiHDKcMCW
+So7kVc0dJ5S/znIq7Fz5cyD+vfcuiWe4u0dzEvfRNWk68gq5rv9GQkaiv6GFGvm/5P9JhfejcIYy
+HF2fYPepraX/z9E0+X1bF8bc1g4oa8Ld8fUzaJ1O/Id8NhLWo4DoQw1VYZTqZDdH6nfK0LJYBcNd
+frGoRpAxVs5wKpayMLh35nnAvSk7/ZR3TL0gzUEl4C7HG7vupARB0l2tEmqKm0f7yd1GQOGdPDPQ
+tQIDAQABo3cwdTAPBgNVHRMBAf8EBTADAQH/MAsGA1UdDwQEAwIBRjAVBgNVHSAEDjAMMAoGCCqB
+egF5AQEBMB0GA1UdDgQWBBSjBS8YYFDCiQrdKyFP/45OqDAxNjAfBgNVHSMEGDAWgBSjBS8YYFDC
+iQrdKyFP/45OqDAxNjANBgkqhkiG9w0BAQUFAAOCAQEABdwm2Pp3FURo/C9mOnTgXeQp/wYHE4RK
+q89toB9RlPhJy3Q2FLwV3duJL92PoF189RLrn544pEfMs5bZvpwlqwN+Mw+VgQ39FuCIvjfwbF3Q
+MZsyK10XZZOYYLxuj7GoPB7ZHPOpJkL5ZB3C55L29B5aqhlSXa/oovdgoPaN8In1buAKBQGVyYsg
+Crpa/JosPL3Dt8ldeCUFP1YUmwza+zpI/pdpXsoQhvdOlgQITeywvl3cO45Pwf2aNjSaTFR+FwNI
+lQgRHAdvhQh+XU3Endv7rs6y0bO4g2wdsrN58dhwmX7wEwLOXt1R0982gaEbeC9xs/FZTEYYKKuF
+0mBWWg==
+-----END CERTIFICATE-----
+
+Security Communication EV RootCA1
+=================================
+-----BEGIN CERTIFICATE-----
+MIIDfTCCAmWgAwIBAgIBADANBgkqhkiG9w0BAQUFADBgMQswCQYDVQQGEwJKUDElMCMGA1UEChMc
+U0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEqMCgGA1UECxMhU2VjdXJpdHkgQ29tbXVuaWNh
+dGlvbiBFViBSb290Q0ExMB4XDTA3MDYwNjAyMTIzMloXDTM3MDYwNjAyMTIzMlowYDELMAkGA1UE
+BhMCSlAxJTAjBgNVBAoTHFNFQ09NIFRydXN0IFN5c3RlbXMgQ08uLExURC4xKjAoBgNVBAsTIVNl
+Y3VyaXR5IENvbW11bmljYXRpb24gRVYgUm9vdENBMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBALx/7FebJOD+nLpCeamIivqA4PUHKUPqjgo0No0c+qe1OXj/l3X3L+SqawSERMqm4miO
+/VVQYg+kcQ7OBzgtQoVQrTyWb4vVog7P3kmJPdZkLjjlHmy1V4qe70gOzXppFodEtZDkBp2uoQSX
+WHnvIEqCa4wiv+wfD+mEce3xDuS4GBPMVjZd0ZoeUWs5bmB2iDQL87PRsJ3KYeJkHcFGB7hj3R4z
+ZbOOCVVSPbW9/wfrrWFVGCypaZhKqkDFMxRldAD5kd6vA0jFQFTcD4SQaCDFkpbcLuUCRarAX1T4
+bepJz11sS6/vmsJWXMY1VkJqMF/Cq/biPT+zyRGPMUzXn0kCAwEAAaNCMEAwHQYDVR0OBBYEFDVK
+9U2vP9eCOKyrcWUXdYydVZPmMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MA0GCSqG
+SIb3DQEBBQUAA4IBAQCoh+ns+EBnXcPBZsdAS5f8hxOQWsTvoMpfi7ent/HWtWS3irO4G8za+6xm
+iEHO6Pzk2x6Ipu0nUBsCMCRGef4Eh3CXQHPRwMFXGZpppSeZq51ihPZRwSzJIxXYKLerJRO1RuGG
+Av8mjMSIkh1W/hln8lXkgKNrnKt34VFxDSDbEJrbvXZ5B3eZKK2aXtqxT0QsNY6llsf9g/BYxnnW
+mHyojf6GPgcWkuF75x3sM3Z+Qi5KhfmRiWiEA4Glm5q+4zfFVKtWOxgtQaQM+ELbmaDgcm+7XeEW
+T1MKZPlO9L9OVL14bIjqv5wTJMJwaaJ/D8g8rQjJsJhAoyrniIPtd490
+-----END CERTIFICATE-----
+
+OISTE WISeKey Global Root GA CA
+===============================
+-----BEGIN CERTIFICATE-----
+MIID8TCCAtmgAwIBAgIQQT1yx/RrH4FDffHSKFTfmjANBgkqhkiG9w0BAQUFADCBijELMAkGA1UE
+BhMCQ0gxEDAOBgNVBAoTB1dJU2VLZXkxGzAZBgNVBAsTEkNvcHlyaWdodCAoYykgMjAwNTEiMCAG
+A1UECxMZT0lTVEUgRm91bmRhdGlvbiBFbmRvcnNlZDEoMCYGA1UEAxMfT0lTVEUgV0lTZUtleSBH
+bG9iYWwgUm9vdCBHQSBDQTAeFw0wNTEyMTExNjAzNDRaFw0zNzEyMTExNjA5NTFaMIGKMQswCQYD
+VQQGEwJDSDEQMA4GA1UEChMHV0lTZUtleTEbMBkGA1UECxMSQ29weXJpZ2h0IChjKSAyMDA1MSIw
+IAYDVQQLExlPSVNURSBGb3VuZGF0aW9uIEVuZG9yc2VkMSgwJgYDVQQDEx9PSVNURSBXSVNlS2V5
+IEdsb2JhbCBSb290IEdBIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAy0+zAJs9
+Nt350UlqaxBJH+zYK7LG+DKBKUOVTJoZIyEVRd7jyBxRVVuuk+g3/ytr6dTqvirdqFEr12bDYVxg
+Asj1znJ7O7jyTmUIms2kahnBAbtzptf2w93NvKSLtZlhuAGio9RN1AU9ka34tAhxZK9w8RxrfvbD
+d50kc3vkDIzh2TbhmYsFmQvtRTEJysIA2/dyoJaqlYfQjse2YXMNdmaM3Bu0Y6Kff5MTMPGhJ9vZ
+/yxViJGg4E8HsChWjBgbl0SOid3gF27nKu+POQoxhILYQBRJLnpB5Kf+42TMwVlxSywhp1t94B3R
+LoGbw9ho972WG6xwsRYUC9tguSYBBQIDAQABo1EwTzALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/BAUw
+AwEB/zAdBgNVHQ4EFgQUswN+rja8sHnR3JQmthG+IbJphpQwEAYJKwYBBAGCNxUBBAMCAQAwDQYJ
+KoZIhvcNAQEFBQADggEBAEuh/wuHbrP5wUOxSPMowB0uyQlB+pQAHKSkq0lPjz0e701vvbyk9vIm
+MMkQyh2I+3QZH4VFvbBsUfk2ftv1TDI6QU9bR8/oCy22xBmddMVHxjtqD6wU2zz0c5ypBd8A3HR4
++vg1YFkCExh8vPtNsCBtQ7tgMHpnM1zFmdH4LTlSc/uMqpclXHLZCB6rTjzjgTGfA6b7wP4piFXa
+hNVQA7bihKOmNqoROgHhGEvWRGizPflTdISzRpFGlgC3gCy24eMQ4tui5yiPAZZiFj4A4xylNoEY
+okxSdsARo27mHbrjWr42U8U+dY+GaSlYU7Wcu2+fXMUY7N0v4ZjJ/L7fCg0=
+-----END CERTIFICATE-----
+
+Microsec e-Szigno Root CA
+=========================
+-----BEGIN CERTIFICATE-----
+MIIHqDCCBpCgAwIBAgIRAMy4579OKRr9otxmpRwsDxEwDQYJKoZIhvcNAQEFBQAwcjELMAkGA1UE
+BhMCSFUxETAPBgNVBAcTCEJ1ZGFwZXN0MRYwFAYDVQQKEw1NaWNyb3NlYyBMdGQuMRQwEgYDVQQL
+EwtlLVN6aWdubyBDQTEiMCAGA1UEAxMZTWljcm9zZWMgZS1Temlnbm8gUm9vdCBDQTAeFw0wNTA0
+MDYxMjI4NDRaFw0xNzA0MDYxMjI4NDRaMHIxCzAJBgNVBAYTAkhVMREwDwYDVQQHEwhCdWRhcGVz
+dDEWMBQGA1UEChMNTWljcm9zZWMgTHRkLjEUMBIGA1UECxMLZS1Temlnbm8gQ0ExIjAgBgNVBAMT
+GU1pY3Jvc2VjIGUtU3ppZ25vIFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQDtyADVgXvNOABHzNuEwSFpLHSQDCHZU4ftPkNEU6+r+ICbPHiN1I2uuO/TEdyB5s87lozWbxXG
+d36hL+BfkrYn13aaHUM86tnsL+4582pnS4uCzyL4ZVX+LMsvfUh6PXX5qqAnu3jCBspRwn5mS6/N
+oqdNAoI/gqyFxuEPkEeZlApxcpMqyabAvjxWTHOSJ/FrtfX9/DAFYJLG65Z+AZHCabEeHXtTRbjc
+QR/Ji3HWVBTji1R4P770Yjtb9aPs1ZJ04nQw7wHb4dSrmZsqa/i9phyGI0Jf7Enemotb9HI6QMVJ
+PqW+jqpx62z69Rrkav17fVVA71hu5tnVvCSrwe+3AgMBAAGjggQ3MIIEMzBnBggrBgEFBQcBAQRb
+MFkwKAYIKwYBBQUHMAGGHGh0dHBzOi8vcmNhLmUtc3ppZ25vLmh1L29jc3AwLQYIKwYBBQUHMAKG
+IWh0dHA6Ly93d3cuZS1zemlnbm8uaHUvUm9vdENBLmNydDAPBgNVHRMBAf8EBTADAQH/MIIBcwYD
+VR0gBIIBajCCAWYwggFiBgwrBgEEAYGoGAIBAQEwggFQMCgGCCsGAQUFBwIBFhxodHRwOi8vd3d3
+LmUtc3ppZ25vLmh1L1NaU1ovMIIBIgYIKwYBBQUHAgIwggEUHoIBEABBACAAdABhAG4A+gBzAO0A
+dAB2AOEAbgB5ACAA6QByAHQAZQBsAG0AZQB6AOkAcwDpAGgAZQB6ACAA6QBzACAAZQBsAGYAbwBn
+AGEAZADhAHMA4QBoAG8AegAgAGEAIABTAHoAbwBsAGcA4QBsAHQAYQB0APMAIABTAHoAbwBsAGcA
+4QBsAHQAYQB0AOEAcwBpACAAUwB6AGEAYgDhAGwAeQB6AGEAdABhACAAcwB6AGUAcgBpAG4AdAAg
+AGsAZQBsAGwAIABlAGwAagDhAHIAbgBpADoAIABoAHQAdABwADoALwAvAHcAdwB3AC4AZQAtAHMA
+egBpAGcAbgBvAC4AaAB1AC8AUwBaAFMAWgAvMIHIBgNVHR8EgcAwgb0wgbqggbeggbSGIWh0dHA6
+Ly93d3cuZS1zemlnbm8uaHUvUm9vdENBLmNybIaBjmxkYXA6Ly9sZGFwLmUtc3ppZ25vLmh1L0NO
+PU1pY3Jvc2VjJTIwZS1Temlnbm8lMjBSb290JTIwQ0EsT1U9ZS1Temlnbm8lMjBDQSxPPU1pY3Jv
+c2VjJTIwTHRkLixMPUJ1ZGFwZXN0LEM9SFU/Y2VydGlmaWNhdGVSZXZvY2F0aW9uTGlzdDtiaW5h
+cnkwDgYDVR0PAQH/BAQDAgEGMIGWBgNVHREEgY4wgYuBEGluZm9AZS1zemlnbm8uaHWkdzB1MSMw
+IQYDVQQDDBpNaWNyb3NlYyBlLVN6aWduw7MgUm9vdCBDQTEWMBQGA1UECwwNZS1TemlnbsOzIEhT
+WjEWMBQGA1UEChMNTWljcm9zZWMgS2Z0LjERMA8GA1UEBxMIQnVkYXBlc3QxCzAJBgNVBAYTAkhV
+MIGsBgNVHSMEgaQwgaGAFMegSXUWYYTbMUuE0vE3QJDvTtz3oXakdDByMQswCQYDVQQGEwJIVTER
+MA8GA1UEBxMIQnVkYXBlc3QxFjAUBgNVBAoTDU1pY3Jvc2VjIEx0ZC4xFDASBgNVBAsTC2UtU3pp
+Z25vIENBMSIwIAYDVQQDExlNaWNyb3NlYyBlLVN6aWdubyBSb290IENBghEAzLjnv04pGv2i3Gal
+HCwPETAdBgNVHQ4EFgQUx6BJdRZhhNsxS4TS8TdAkO9O3PcwDQYJKoZIhvcNAQEFBQADggEBANMT
+nGZjWS7KXHAM/IO8VbH0jgdsZifOwTsgqRy7RlRw7lrMoHfqaEQn6/Ip3Xep1fvj1KcExJW4C+FE
+aGAHQzAxQmHl7tnlJNUb3+FKG6qfx1/4ehHqE5MAyopYse7tDk2016g2JnzgOsHVV4Lxdbb9iV/a
+86g4nzUGCM4ilb7N1fy+W955a9x6qWVmvrElWl/tftOsRm1M9DKHtCAE4Gx4sHfRhUZLphK3dehK
+yVZs15KrnfVJONJPU+NVkBHbmJbGSfI+9J8b4PeI3CVimUTYc78/MPMMNz7UwiiAc7EBt51alhQB
+S6kRnSlqLtBdgcDPsiBDxwPgN05dCtxZICU=
+-----END CERTIFICATE-----
+
+Certigna
+========
+-----BEGIN CERTIFICATE-----
+MIIDqDCCApCgAwIBAgIJAP7c4wEPyUj/MA0GCSqGSIb3DQEBBQUAMDQxCzAJBgNVBAYTAkZSMRIw
+EAYDVQQKDAlEaGlteW90aXMxETAPBgNVBAMMCENlcnRpZ25hMB4XDTA3MDYyOTE1MTMwNVoXDTI3
+MDYyOTE1MTMwNVowNDELMAkGA1UEBhMCRlIxEjAQBgNVBAoMCURoaW15b3RpczERMA8GA1UEAwwI
+Q2VydGlnbmEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDIaPHJ1tazNHUmgh7stL7q
+XOEm7RFHYeGifBZ4QCHkYJ5ayGPhxLGWkv8YbWkj4Sti993iNi+RB7lIzw7sebYs5zRLcAglozyH
+GxnygQcPOJAZ0xH+hrTy0V4eHpbNgGzOOzGTtvKg0KmVEn2lmsxryIRWijOp5yIVUxbwzBfsV1/p
+ogqYCd7jX5xv3EjjhQsVWqa6n6xI4wmy9/Qy3l40vhx4XUJbzg4ij02Q130yGLMLLGq/jj8UEYkg
+DncUtT2UCIf3JR7VsmAA7G8qKCVuKj4YYxclPz5EIBb2JsglrgVKtOdjLPOMFlN+XPsRGgjBRmKf
+Irjxwo1p3Po6WAbfAgMBAAGjgbwwgbkwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUGu3+QTmQ
+tCRZvgHyUtVF9lo53BEwZAYDVR0jBF0wW4AUGu3+QTmQtCRZvgHyUtVF9lo53BGhOKQ2MDQxCzAJ
+BgNVBAYTAkZSMRIwEAYDVQQKDAlEaGlteW90aXMxETAPBgNVBAMMCENlcnRpZ25hggkA/tzjAQ/J
+SP8wDgYDVR0PAQH/BAQDAgEGMBEGCWCGSAGG+EIBAQQEAwIABzANBgkqhkiG9w0BAQUFAAOCAQEA
+hQMeknH2Qq/ho2Ge6/PAD/Kl1NqV5ta+aDY9fm4fTIrv0Q8hbV6lUmPOEvjvKtpv6zf+EwLHyzs+
+ImvaYS5/1HI93TDhHkxAGYwP15zRgzB7mFncfca5DClMoTOi62c6ZYTTluLtdkVwj7Ur3vkj1klu
+PBS1xp81HlDQwY9qcEQCYsuuHWhBp6pX6FOqB9IG9tUUBguRA3UsbHK1YZWaDYu5Def131TN3ubY
+1gkIl2PlwS6wt0QmwCbAr1UwnjvVNioZBPRcHv/PLLf/0P2HQBHVESO7SMAhqaQoLf0V+LBOK/Qw
+WyH8EZE0vkHve52Xdf+XlcCWWC/qu0bXu+TZLg==
+-----END CERTIFICATE-----
+
+Deutsche Telekom Root CA 2
+==========================
+-----BEGIN CERTIFICATE-----
+MIIDnzCCAoegAwIBAgIBJjANBgkqhkiG9w0BAQUFADBxMQswCQYDVQQGEwJERTEcMBoGA1UEChMT
+RGV1dHNjaGUgVGVsZWtvbSBBRzEfMB0GA1UECxMWVC1UZWxlU2VjIFRydXN0IENlbnRlcjEjMCEG
+A1UEAxMaRGV1dHNjaGUgVGVsZWtvbSBSb290IENBIDIwHhcNOTkwNzA5MTIxMTAwWhcNMTkwNzA5
+MjM1OTAwWjBxMQswCQYDVQQGEwJERTEcMBoGA1UEChMTRGV1dHNjaGUgVGVsZWtvbSBBRzEfMB0G
+A1UECxMWVC1UZWxlU2VjIFRydXN0IENlbnRlcjEjMCEGA1UEAxMaRGV1dHNjaGUgVGVsZWtvbSBS
+b290IENBIDIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrC6M14IspFLEUha88EOQ5
+bzVdSq7d6mGNlUn0b2SjGmBmpKlAIoTZ1KXleJMOaAGtuU1cOs7TuKhCQN/Po7qCWWqSG6wcmtoI
+KyUn+WkjR/Hg6yx6m/UTAtB+NHzCnjwAWav12gz1MjwrrFDa1sPeg5TKqAyZMg4ISFZbavva4VhY
+AUlfckE8FQYBjl2tqriTtM2e66foai1SNNs671x1Udrb8zH57nGYMsRUFUQM+ZtV7a3fGAigo4aK
+Se5TBY8ZTNXeWHmb0mocQqvF1afPaA+W5OFhmHZhyJF81j4A4pFQh+GdCuatl9Idxjp9y7zaAzTV
+jlsB9WoHtxa2bkp/AgMBAAGjQjBAMB0GA1UdDgQWBBQxw3kbuvVT1xfgiXotF2wKsyudMzAPBgNV
+HRMECDAGAQH/AgEFMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEAlGRZrTlk5ynr
+E/5aw4sTV8gEJPB0d8Bg42f76Ymmg7+Wgnxu1MM9756AbrsptJh6sTtU6zkXR34ajgv8HzFZMQSy
+zhfzLMdiNlXiItiJVbSYSKpk+tYcNthEeFpaIzpXl/V6ME+un2pMSyuOoAPjPuCp1NJ70rOo4nI8
+rZ7/gFnkm0W09juwzTkZmDLl6iFhkOQxIY40sfcvNUqFENrnijchvllj4PKFiDFT1FQUhXB59C4G
+dyd1Lx+4ivn+xbrYNuSD7Odlt79jWvNGr4GUN9RBjNYj1h7P9WgbRGOiWrqnNVmh5XAFmw4jV5mU
+Cm26OWMohpLzGITY+9HPBVZkVw==
+-----END CERTIFICATE-----
+
+Cybertrust Global Root
+======================
+-----BEGIN CERTIFICATE-----
+MIIDoTCCAomgAwIBAgILBAAAAAABD4WqLUgwDQYJKoZIhvcNAQEFBQAwOzEYMBYGA1UEChMPQ3li
+ZXJ0cnVzdCwgSW5jMR8wHQYDVQQDExZDeWJlcnRydXN0IEdsb2JhbCBSb290MB4XDTA2MTIxNTA4
+MDAwMFoXDTIxMTIxNTA4MDAwMFowOzEYMBYGA1UEChMPQ3liZXJ0cnVzdCwgSW5jMR8wHQYDVQQD
+ExZDeWJlcnRydXN0IEdsb2JhbCBSb290MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
++Mi8vRRQZhP/8NN57CPytxrHjoXxEnOmGaoQ25yiZXRadz5RfVb23CO21O1fWLE3TdVJDm71aofW
+0ozSJ8bi/zafmGWgE07GKmSb1ZASzxQG9Dvj1Ci+6A74q05IlG2OlTEQXO2iLb3VOm2yHLtgwEZL
+AfVJrn5GitB0jaEMAs7u/OePuGtm839EAL9mJRQr3RAwHQeWP032a7iPt3sMpTjr3kfb1V05/Iin
+89cqdPHoWqI7n1C6poxFNcJQZZXcY4Lv3b93TZxiyWNzFtApD0mpSPCzqrdsxacwOUBdrsTiXSZT
+8M4cIwhhqJQZugRiQOwfOHB3EgZxpzAYXSUnpQIDAQABo4GlMIGiMA4GA1UdDwEB/wQEAwIBBjAP
+BgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBS2CHsNesysIEyGVjJez6tuhS1wVzA/BgNVHR8EODA2
+MDSgMqAwhi5odHRwOi8vd3d3Mi5wdWJsaWMtdHJ1c3QuY29tL2NybC9jdC9jdHJvb3QuY3JsMB8G
+A1UdIwQYMBaAFLYIew16zKwgTIZWMl7Pq26FLXBXMA0GCSqGSIb3DQEBBQUAA4IBAQBW7wojoFRO
+lZfJ+InaRcHUowAl9B8Tq7ejhVhpwjCt2BWKLePJzYFa+HMjWqd8BfP9IjsO0QbE2zZMcwSO5bAi
+5MXzLqXZI+O4Tkogp24CJJ8iYGd7ix1yCcUxXOl5n4BHPa2hCwcUPUf/A2kaDAtE52Mlp3+yybh2
+hO0j9n0Hq0V+09+zv+mKts2oomcrUtW3ZfA5TGOgkXmTUg9U3YO7n9GPp1Nzw8v/MOx8BLjYRB+T
+X3EJIrduPuocA06dGiBh+4E37F78CkWr1+cXVdCg6mCbpvbjjFspwgZgFJ0tl0ypkxWdYcQBX0jW
+WL1WMRJOEcgh4LMRkWXbtKaIOM5V
+-----END CERTIFICATE-----
+
+ePKI Root Certification Authority
+=================================
+-----BEGIN CERTIFICATE-----
+MIIFsDCCA5igAwIBAgIQFci9ZUdcr7iXAF7kBtK8nTANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQG
+EwJUVzEjMCEGA1UECgwaQ2h1bmdod2EgVGVsZWNvbSBDby4sIEx0ZC4xKjAoBgNVBAsMIWVQS0kg
+Um9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wNDEyMjAwMjMxMjdaFw0zNDEyMjAwMjMx
+MjdaMF4xCzAJBgNVBAYTAlRXMSMwIQYDVQQKDBpDaHVuZ2h3YSBUZWxlY29tIENvLiwgTHRkLjEq
+MCgGA1UECwwhZVBLSSBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIICIjANBgkqhkiG9w0B
+AQEFAAOCAg8AMIICCgKCAgEA4SUP7o3biDN1Z82tH306Tm2d0y8U82N0ywEhajfqhFAHSyZbCUNs
+IZ5qyNUD9WBpj8zwIuQf5/dqIjG3LBXy4P4AakP/h2XGtRrBp0xtInAhijHyl3SJCRImHJ7K2RKi
+lTza6We/CKBk49ZCt0Xvl/T29de1ShUCWH2YWEtgvM3XDZoTM1PRYfl61dd4s5oz9wCGzh1NlDiv
+qOx4UXCKXBCDUSH3ET00hl7lSM2XgYI1TBnsZfZrxQWh7kcT1rMhJ5QQCtkkO7q+RBNGMD+XPNjX
+12ruOzjjK9SXDrkb5wdJfzcq+Xd4z1TtW0ado4AOkUPB1ltfFLqfpo0kR0BZv3I4sjZsN/+Z0V0O
+WQqraffAsgRFelQArr5T9rXn4fg8ozHSqf4hUmTFpmfwdQcGlBSBVcYn5AGPF8Fqcde+S/uUWH1+
+ETOxQvdibBjWzwloPn9s9h6PYq2lY9sJpx8iQkEeb5mKPtf5P0B6ebClAZLSnT0IFaUQAS2zMnao
+lQ2zepr7BxB4EW/hj8e6DyUadCrlHJhBmd8hh+iVBmoKs2pHdmX2Os+PYhcZewoozRrSgx4hxyy/
+vv9haLdnG7t4TY3OZ+XkwY63I2binZB1NJipNiuKmpS5nezMirH4JYlcWrYvjB9teSSnUmjDhDXi
+Zo1jDiVN1Rmy5nk3pyKdVDECAwEAAaNqMGgwHQYDVR0OBBYEFB4M97Zn8uGSJglFwFU5Lnc/Qkqi
+MAwGA1UdEwQFMAMBAf8wOQYEZyoHAAQxMC8wLQIBADAJBgUrDgMCGgUAMAcGBWcqAwAABBRFsMLH
+ClZ87lt4DJX5GFPBphzYEDANBgkqhkiG9w0BAQUFAAOCAgEACbODU1kBPpVJufGBuvl2ICO1J2B0
+1GqZNF5sAFPZn/KmsSQHRGoqxqWOeBLoR9lYGxMqXnmbnwoqZ6YlPwZpVnPDimZI+ymBV3QGypzq
+KOg4ZyYr8dW1P2WT+DZdjo2NQCCHGervJ8A9tDkPJXtoUHRVnAxZfVo9QZQlUgjgRywVMRnVvwdV
+xrsStZf0X4OFunHB2WyBEXYKCrC/gpf36j36+uwtqSiUO1bd0lEursC9CBWMd1I0ltabrNMdjmEP
+NXubrjlpC2JgQCA2j6/7Nu4tCEoduL+bXPjqpRugc6bY+G7gMwRfaKonh+3ZwZCc7b3jajWvY9+r
+GNm65ulK6lCKD2GTHuItGeIwlDWSXQ62B68ZgI9HkFFLLk3dheLSClIKF5r8GrBQAuUBo2M3IUxE
+xJtRmREOc5wGj1QupyheRDmHVi03vYVElOEMSyycw5KFNGHLD7ibSkNS/jQ6fbjpKdx2qcgw+BRx
+gMYeNkh0IkFch4LoGHGLQYlE535YW6i4jRPpp2zDR+2zGp1iro2C6pSe3VkQw63d4k3jMdXH7Ojy
+sP6SHhYKGvzZ8/gntsm+HbRsZJB/9OTEW9c3rkIO3aQab3yIVMUWbuF6aC74Or8NpDyJO3inTmOD
+BCEIZ43ygknQW/2xzQ+DhNQ+IIX3Sj0rnP0qCglN6oH4EZw=
+-----END CERTIFICATE-----
+
+T\xc3\x9c\x42\xC4\xB0TAK UEKAE K\xC3\xB6k Sertifika Hizmet Sa\xC4\x9Flay\xc4\xb1\x63\xc4\xb1s\xc4\xb1 - S\xC3\xBCr\xC3\xBCm 3
+=============================================================================================================================
+-----BEGIN CERTIFICATE-----
+MIIFFzCCA/+gAwIBAgIBETANBgkqhkiG9w0BAQUFADCCASsxCzAJBgNVBAYTAlRSMRgwFgYDVQQH
+DA9HZWJ6ZSAtIEtvY2FlbGkxRzBFBgNVBAoMPlTDvHJraXllIEJpbGltc2VsIHZlIFRla25vbG9q
+aWsgQXJhxZ90xLFybWEgS3VydW11IC0gVMOcQsSwVEFLMUgwRgYDVQQLDD9VbHVzYWwgRWxla3Ry
+b25payB2ZSBLcmlwdG9sb2ppIEFyYcWfdMSxcm1hIEVuc3RpdMO8c8O8IC0gVUVLQUUxIzAhBgNV
+BAsMGkthbXUgU2VydGlmaWthc3lvbiBNZXJrZXppMUowSAYDVQQDDEFUw5xCxLBUQUsgVUVLQUUg
+S8O2ayBTZXJ0aWZpa2EgSGl6bWV0IFNhxJ9sYXnEsWPEsXPEsSAtIFPDvHLDvG0gMzAeFw0wNzA4
+MjQxMTM3MDdaFw0xNzA4MjExMTM3MDdaMIIBKzELMAkGA1UEBhMCVFIxGDAWBgNVBAcMD0dlYnpl
+IC0gS29jYWVsaTFHMEUGA1UECgw+VMO8cmtpeWUgQmlsaW1zZWwgdmUgVGVrbm9sb2ppayBBcmHF
+n3TEsXJtYSBLdXJ1bXUgLSBUw5xCxLBUQUsxSDBGBgNVBAsMP1VsdXNhbCBFbGVrdHJvbmlrIHZl
+IEtyaXB0b2xvamkgQXJhxZ90xLFybWEgRW5zdGl0w7xzw7wgLSBVRUtBRTEjMCEGA1UECwwaS2Ft
+dSBTZXJ0aWZpa2FzeW9uIE1lcmtlemkxSjBIBgNVBAMMQVTDnELEsFRBSyBVRUtBRSBLw7ZrIFNl
+cnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxIC0gU8O8csO8bSAzMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAim1L/xCIOsP2fpTo6iBkcK4hgb46ezzb8R1Sf1n68yJMlaCQvEhO
+Eav7t7WNeoMojCZG2E6VQIdhn8WebYGHV2yKO7Rm6sxA/OOqbLLLAdsyv9Lrhc+hDVXDWzhXcLh1
+xnnRFDDtG1hba+818qEhTsXOfJlfbLm4IpNQp81McGq+agV/E5wrHur+R84EpW+sky58K5+eeROR
+6Oqeyjh1jmKwlZMq5d/pXpduIF9fhHpEORlAHLpVK/swsoHvhOPc7Jg4OQOFCKlUAwUp8MmPi+oL
+hmUZEdPpCSPeaJMDyTYcIW7OjGbxmTDY17PDHfiBLqi9ggtm/oLL4eAagsNAgQIDAQABo0IwQDAd
+BgNVHQ4EFgQUvYiHyY/2pAoLquvF/pEjnatKijIwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQF
+MAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAB18+kmPNOm3JpIWmgV050vQbTlswyb2zrgxvMTfvCr4
+N5EY3ATIZJkrGG2AA1nJrvhY0D7twyOfaTyGOBye79oneNGEN3GKPEs5z35FBtYt2IpNeBLWrcLT
+y9LQQfMmNkqblWwM7uXRQydmwYj3erMgbOqwaSvHIOgMA8RBBZniP+Rr+KCGgceExh/VS4ESshYh
+LBOhgLJeDEoTniDYYkCrkOpkSi+sDQESeUWoL4cZaMjihccwsnX5OD+ywJO0a+IDRM5noN+J1q2M
+dqMTw5RhK2vZbMEHCiIHhWyFJEapvj+LeISCfiQMnf2BN+MlqO02TpUsyZyQ2uypQjyttgI=
+-----END CERTIFICATE-----
+
+Buypass Class 2 CA 1
+====================
+-----BEGIN CERTIFICATE-----
+MIIDUzCCAjugAwIBAgIBATANBgkqhkiG9w0BAQUFADBLMQswCQYDVQQGEwJOTzEdMBsGA1UECgwU
+QnV5cGFzcyBBUy05ODMxNjMzMjcxHTAbBgNVBAMMFEJ1eXBhc3MgQ2xhc3MgMiBDQSAxMB4XDTA2
+MTAxMzEwMjUwOVoXDTE2MTAxMzEwMjUwOVowSzELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1eXBh
+c3MgQVMtOTgzMTYzMzI3MR0wGwYDVQQDDBRCdXlwYXNzIENsYXNzIDIgQ0EgMTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAIs8B0XY9t/mx8q6jUPFR42wWsE425KEHK8T1A9vNkYgxC7M
+cXA0ojTTNy7Y3Tp3L8DrKehc0rWpkTSHIln+zNvnma+WwajHQN2lFYxuyHyXA8vmIPLXl18xoS83
+0r7uvqmtqEyeIWZDO6i88wmjONVZJMHCR3axiFyCO7srpgTXjAePzdVBHfCuuCkslFJgNJQ72uA4
+0Z0zPhX0kzLFANq1KWYOOngPIVJfAuWSeyXTkh4vFZ2B5J2O6O+JzhRMVB0cgRJNcKi+EAUXfh/R
+uFdV7c27UsKwHnjCTTZoy1YmwVLBvXb3WNVyfh9EdrsAiR0WnVE1703CVu9r4Iw7DekCAwEAAaNC
+MEAwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUP42aWYv8e3uco684sDntkHGA1sgwDgYDVR0P
+AQH/BAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQAVGn4TirnoB6NLJzKyQJHyIdFkhb5jatLPgcIV
+1Xp+DCmsNx4cfHZSldq1fyOhKXdlyTKdqC5Wq2B2zha0jX94wNWZUYN/Xtm+DKhQ7SLHrQVMdvvt
+7h5HZPb3J31cKA9FxVxiXqaakZG3Uxcu3K1gnZZkOb1naLKuBctN518fV4bVIJwo+28TOPX2EZL2
+fZleHwzoq0QkKXJAPTZSr4xYkHPB7GEseaHsh7U/2k3ZIQAw3pDaDtMaSKk+hQsUi4y8QZ5q9w5w
+wDX3OaJdZtB7WZ+oRxKaJyOkLY4ng5IgodcVf/EuGO70SH8vf/GhGLWhC5SgYiAynB321O+/TIho
+-----END CERTIFICATE-----
+
+EBG Elektronik Sertifika Hizmet Sa\xC4\x9Flay\xc4\xb1\x63\xc4\xb1s\xc4\xb1
+==========================================================================
+-----BEGIN CERTIFICATE-----
+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
+-----END CERTIFICATE-----
+
+certSIGN ROOT CA
+================
+-----BEGIN CERTIFICATE-----
+MIIDODCCAiCgAwIBAgIGIAYFFnACMA0GCSqGSIb3DQEBBQUAMDsxCzAJBgNVBAYTAlJPMREwDwYD
+VQQKEwhjZXJ0U0lHTjEZMBcGA1UECxMQY2VydFNJR04gUk9PVCBDQTAeFw0wNjA3MDQxNzIwMDRa
+Fw0zMTA3MDQxNzIwMDRaMDsxCzAJBgNVBAYTAlJPMREwDwYDVQQKEwhjZXJ0U0lHTjEZMBcGA1UE
+CxMQY2VydFNJR04gUk9PVCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALczuX7I
+JUqOtdu0KBuqV5Do0SLTZLrTk+jUrIZhQGpgV2hUhE28alQCBf/fm5oqrl0Hj0rDKH/v+yv6efHH
+rfAQUySQi2bJqIirr1qjAOm+ukbuW3N7LBeCgV5iLKECZbO9xSsAfsT8AzNXDe3i+s5dRdY4zTW2
+ssHQnIFKquSyAVwdj1+ZxLGt24gh65AIgoDzMKND5pCCrlUoSe1b16kQOA7+j0xbm0bqQfWwCHTD
+0IgztnzXdN/chNFDDnU5oSVAKOp4yw4sLjmdjItuFhwvJoIQ4uNllAoEwF73XVv4EOLQunpL+943
+AAAaWyjj0pxzPjKHmKHJUS/X3qwzs08CAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8B
+Af8EBAMCAcYwHQYDVR0OBBYEFOCMm9slSbPxfIbWskKHC9BroNnkMA0GCSqGSIb3DQEBBQUAA4IB
+AQA+0hyJLjX8+HXd5n9liPRyTMks1zJO890ZeUe9jjtbkw9QSSQTaxQGcu8J06Gh40CEyecYMnQ8
+SG4Pn0vU9x7Tk4ZkVJdjclDVVc/6IJMCopvDI5NOFlV2oHB5bc0hH88vLbwZ44gx+FkagQnIl6Z0
+x2DEW8xXjrJ1/RsCCdtZb3KTafcxQdaIOL+Hsr0Wefmq5L6IJd1hJyMctTEHBDa0GpC9oHRxUIlt
+vBTjD4au8as+x6AJzKNI0eDbZOeStc+vckNwi/nDhDwTqn6Sm1dTk/pwwpEOMfmbZ13pljheX7Nz
+TogVZ96edhBiIL5VaZVDADlN9u6wWk5JRFRYX0KD
+-----END CERTIFICATE-----
+
+CNNIC ROOT
+==========
+-----BEGIN CERTIFICATE-----
+MIIDVTCCAj2gAwIBAgIESTMAATANBgkqhkiG9w0BAQUFADAyMQswCQYDVQQGEwJDTjEOMAwGA1UE
+ChMFQ05OSUMxEzARBgNVBAMTCkNOTklDIFJPT1QwHhcNMDcwNDE2MDcwOTE0WhcNMjcwNDE2MDcw
+OTE0WjAyMQswCQYDVQQGEwJDTjEOMAwGA1UEChMFQ05OSUMxEzARBgNVBAMTCkNOTklDIFJPT1Qw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDTNfc/c3et6FtzF8LRb+1VvG7q6KR5smzD
+o+/hn7E7SIX1mlwhIhAsxYLO2uOabjfhhyzcuQxauohV3/2q2x8x6gHx3zkBwRP9SFIhxFXf2tiz
+VHa6dLG3fdfA6PZZxU3Iva0fFNrfWEQlMhkqx35+jq44sDB7R3IJMfAw28Mbdim7aXZOV/kbZKKT
+VrdvmW7bCgScEeOAH8tjlBAKqeFkgjH5jCftppkA9nCTGPihNIaj3XrCGHn2emU1z5DrvTOTn1Or
+czvmmzQgLx3vqR1jGqCA2wMv+SYahtKNu6m+UjqHZ0gNv7Sg2Ca+I19zN38m5pIEo3/PIKe38zrK
+y5nLAgMBAAGjczBxMBEGCWCGSAGG+EIBAQQEAwIABzAfBgNVHSMEGDAWgBRl8jGtKvf33VKWCscC
+wQ7vptU7ETAPBgNVHRMBAf8EBTADAQH/MAsGA1UdDwQEAwIB/jAdBgNVHQ4EFgQUZfIxrSr3991S
+lgrHAsEO76bVOxEwDQYJKoZIhvcNAQEFBQADggEBAEs17szkrr/Dbq2flTtLP1se31cpolnKOOK5
+Gv+e5m4y3R6u6jW39ZORTtpC4cMXYFDy0VwmuYK36m3knITnA3kXr5g9lNvHugDnuL8BV8F3RTIM
+O/G0HAiw/VGgod2aHRM2mm23xzy54cXZF/qD1T0VoDy7HgviyJA/qIYM/PmLXoXLT1tLYhFHxUV8
+BS9BsZ4QaRuZluBVeftOhpm4lNqGOGqTo+fLbuXf6iFViZx9fX+Y9QCJ7uOEwFyWtcVG6kbghVW2
+G8kS1sHNzYDzAgE8yGnLRUhj2JTQ7IUOO04RZfSCjKY9ri4ilAnIXOo8gV0WKgOXFlUJ24pBgp5m
+mxE=
+-----END CERTIFICATE-----
+
+ApplicationCA - Japanese Government
+===================================
+-----BEGIN CERTIFICATE-----
+MIIDoDCCAoigAwIBAgIBMTANBgkqhkiG9w0BAQUFADBDMQswCQYDVQQGEwJKUDEcMBoGA1UEChMT
+SmFwYW5lc2UgR292ZXJubWVudDEWMBQGA1UECxMNQXBwbGljYXRpb25DQTAeFw0wNzEyMTIxNTAw
+MDBaFw0xNzEyMTIxNTAwMDBaMEMxCzAJBgNVBAYTAkpQMRwwGgYDVQQKExNKYXBhbmVzZSBHb3Zl
+cm5tZW50MRYwFAYDVQQLEw1BcHBsaWNhdGlvbkNBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEAp23gdE6Hj6UG3mii24aZS2QNcfAKBZuOquHMLtJqO8F6tJdhjYq+xpqcBrSGUeQ3DnR4
+fl+Kf5Sk10cI/VBaVuRorChzoHvpfxiSQE8tnfWuREhzNgaeZCw7NCPbXCbkcXmP1G55IrmTwcrN
+wVbtiGrXoDkhBFcsovW8R0FPXjQilbUfKW1eSvNNcr5BViCH/OlQR9cwFO5cjFW6WY2H/CPek9AE
+jP3vbb3QesmlOmpyM8ZKDQUXKi17safY1vC+9D/qDihtQWEjdnjDuGWk81quzMKq2edY3rZ+nYVu
+nyoKb58DKTCXKB28t89UKU5RMfkntigm/qJj5kEW8DOYRwIDAQABo4GeMIGbMB0GA1UdDgQWBBRU
+WssmP3HMlEYNllPqa0jQk/5CdTAOBgNVHQ8BAf8EBAMCAQYwWQYDVR0RBFIwUKROMEwxCzAJBgNV
+BAYTAkpQMRgwFgYDVQQKDA/ml6XmnKzlm73mlL/lupwxIzAhBgNVBAsMGuOCouODl+ODquOCseOD
+vOOCt+ODp+ODs0NBMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBADlqRHZ3ODrs
+o2dGD/mLBqj7apAxzn7s2tGJfHrrLgy9mTLnsCTWw//1sogJhyzjVOGjprIIC8CFqMjSnHH2HZ9g
+/DgzE+Ge3Atf2hZQKXsvcJEPmbo0NI2VdMV+eKlmXb3KIXdCEKxmJj3ekav9FfBv7WxfEPjzFvYD
+io+nEhEMy/0/ecGc/WLuo89UDNErXxc+4z6/wCs+CZv+iKZ+tJIX/COUgb1up8WMwusRRdv4QcmW
+dupwX3kSa+SjB1oF7ydJzyGfikwJcGapJsErEU4z0g781mzSDjJkaP+tBXhfAx2o45CsJOAPQKdL
+rosot4LKGAfmt1t06SAZf7IbiVQ=
+-----END CERTIFICATE-----
+
+GeoTrust Primary Certification Authority - G3
+=============================================
+-----BEGIN CERTIFICATE-----
+MIID/jCCAuagAwIBAgIQFaxulBmyeUtB9iepwxgPHzANBgkqhkiG9w0BAQsFADCBmDELMAkGA1UE
+BhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xOTA3BgNVBAsTMChjKSAyMDA4IEdlb1RydXN0
+IEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTE2MDQGA1UEAxMtR2VvVHJ1c3QgUHJpbWFy
+eSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEczMB4XDTA4MDQwMjAwMDAwMFoXDTM3MTIwMTIz
+NTk1OVowgZgxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTkwNwYDVQQLEzAo
+YykgMjAwOCBHZW9UcnVzdCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxNjA0BgNVBAMT
+LUdlb1RydXN0IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMzCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBANziXmJYHTNXOTIz+uvLh4yn1ErdBojqZI4xmKU4kB6Yzy5j
+K/BGvESyiaHAKAxJcCGVn2TAppMSAmUmhsalifD614SgcK9PGpc/BkTVyetyEH3kMSj7HGHmKAdE
+c5IiaacDiGydY8hS2pgn5whMcD60yRLBxWeDXTPzAxHsatBT4tG6NmCUgLthY2xbF37fQJQeqw3C
+IShwiP/WJmxsYAQlTlV+fe+/lEjetx3dcI0FX4ilm/LC7urRQEFtYjgdVgbFA0dRIBn8exALDmKu
+dlW/X3e+PkkBUz2YJQN2JFodtNuJ6nnltrM7P7pMKEF/BqxqjsHQ9gUdfeZChuOl1UcCAwEAAaNC
+MEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFMR5yo6hTgMdHNxr
+2zFblD4/MH8tMA0GCSqGSIb3DQEBCwUAA4IBAQAtxRPPVoB7eni9n64smefv2t+UXglpp+duaIy9
+cr5HqQ6XErhK8WTTOd8lNNTBzU6B8A8ExCSzNJbGpqow32hhc9f5joWJ7w5elShKKiePEI4ufIbE
+Ap7aDHdlDkQNkv39sxY2+hENHYwOB4lqKVb3cvTdFZx3NWZXqxNT2I7BQMXXExZacse3aQHEerGD
+AWh9jUGhlBjBJVz88P6DAod8DQ3PLghcSkANPuyBYeYk28rgDi0Hsj5W3I31QYUHSJsMC8tJP33s
+t/3LjWeJGqvtux6jAAgIFyqCXDFdRootD4abdNlF+9RAsXqqaC2Gspki4cErx5z481+oghLrGREt
+-----END CERTIFICATE-----
+
+thawte Primary Root CA - G2
+===========================
+-----BEGIN CERTIFICATE-----
+MIICiDCCAg2gAwIBAgIQNfwmXNmET8k9Jj1Xm67XVjAKBggqhkjOPQQDAzCBhDELMAkGA1UEBhMC
+VVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjE4MDYGA1UECxMvKGMpIDIwMDcgdGhhd3RlLCBJbmMu
+IC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxJDAiBgNVBAMTG3RoYXd0ZSBQcmltYXJ5IFJvb3Qg
+Q0EgLSBHMjAeFw0wNzExMDUwMDAwMDBaFw0zODAxMTgyMzU5NTlaMIGEMQswCQYDVQQGEwJVUzEV
+MBMGA1UEChMMdGhhd3RlLCBJbmMuMTgwNgYDVQQLEy8oYykgMjAwNyB0aGF3dGUsIEluYy4gLSBG
+b3IgYXV0aG9yaXplZCB1c2Ugb25seTEkMCIGA1UEAxMbdGhhd3RlIFByaW1hcnkgUm9vdCBDQSAt
+IEcyMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEotWcgnuVnfFSeIf+iha/BebfowJPDQfGAFG6DAJS
+LSKkQjnE/o/qycG+1E3/n3qe4rF8mq2nhglzh9HnmuN6papu+7qzcMBniKI11KOasf2twu8x+qi5
+8/sIxpHR+ymVo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU
+mtgAMADna3+FGO6Lts6KDPgR4bswCgYIKoZIzj0EAwMDaQAwZgIxAN344FdHW6fmCsO99YCKlzUN
+G4k8VIZ3KMqh9HneteY4sPBlcIx/AlTCv//YoT7ZzwIxAMSNlPzcU9LcnXgWHxUzI1NS41oxXZ3K
+rr0TKUQNJ1uo52icEvdYPy5yAlejj6EULg==
+-----END CERTIFICATE-----
+
+thawte Primary Root CA - G3
+===========================
+-----BEGIN CERTIFICATE-----
+MIIEKjCCAxKgAwIBAgIQYAGXt0an6rS0mtZLL/eQ+zANBgkqhkiG9w0BAQsFADCBrjELMAkGA1UE
+BhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2
+aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMvKGMpIDIwMDggdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhv
+cml6ZWQgdXNlIG9ubHkxJDAiBgNVBAMTG3RoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EgLSBHMzAeFw0w
+ODA0MDIwMDAwMDBaFw0zNzEyMDEyMzU5NTlaMIGuMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMdGhh
+d3RlLCBJbmMuMSgwJgYDVQQLEx9DZXJ0aWZpY2F0aW9uIFNlcnZpY2VzIERpdmlzaW9uMTgwNgYD
+VQQLEy8oYykgMjAwOCB0aGF3dGUsIEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTEkMCIG
+A1UEAxMbdGhhd3RlIFByaW1hcnkgUm9vdCBDQSAtIEczMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAsr8nLPvb2FvdeHsbnndmgcs+vHyu86YnmjSjaDFxODNi5PNxZnmxqWWjpYvVj2At
+P0LMqmsywCPLLEHd5N/8YZzic7IilRFDGF/Eth9XbAoFWCLINkw6fKXRz4aviKdEAhN0cXMKQlkC
++BsUa0Lfb1+6a4KinVvnSr0eAXLbS3ToO39/fR8EtCab4LRarEc9VbjXsCZSKAExQGbY2SS99irY
+7CFJXJv2eul/VTV+lmuNk5Mny5K76qxAwJ/C+IDPXfRa3M50hqY+bAtTyr2SzhkGcuYMXDhpxwTW
+vGzOW/b3aJzcJRVIiKHpqfiYnODz1TEoYRFsZ5aNOZnLwkUkOQIDAQABo0IwQDAPBgNVHRMBAf8E
+BTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUrWyqlGCc7eT/+j4KdCtjA/e2Wb8wDQYJ
+KoZIhvcNAQELBQADggEBABpA2JVlrAmSicY59BDlqQ5mU1143vokkbvnRFHfxhY0Cu9qRFHqKweK
+A3rD6z8KLFIWoCtDuSWQP3CpMyVtRRooOyfPqsMpQhvfO0zAMzRbQYi/aytlryjvsvXDqmbOe1bu
+t8jLZ8HJnBoYuMTDSQPxYA5QzUbF83d597YV4Djbxy8ooAw/dyZ02SUS2jHaGh7cKUGRIjxpp7sC
+8rZcJwOJ9Abqm+RyguOhCcHpABnTPtRwa7pxpqpYrvS76Wy274fMm7v/OeZWYdMKp8RcTGB7BXcm
+er/YB1IsYvdwY9k5vG8cwnncdimvzsUsZAReiDZuMdRAGmI0Nj81Aa6sY6A=
+-----END CERTIFICATE-----
+
+GeoTrust Primary Certification Authority - G2
+=============================================
+-----BEGIN CERTIFICATE-----
+MIICrjCCAjWgAwIBAgIQPLL0SAoA4v7rJDteYD7DazAKBggqhkjOPQQDAzCBmDELMAkGA1UEBhMC
+VVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xOTA3BgNVBAsTMChjKSAyMDA3IEdlb1RydXN0IElu
+Yy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTE2MDQGA1UEAxMtR2VvVHJ1c3QgUHJpbWFyeSBD
+ZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcyMB4XDTA3MTEwNTAwMDAwMFoXDTM4MDExODIzNTk1
+OVowgZgxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTkwNwYDVQQLEzAoYykg
+MjAwNyBHZW9UcnVzdCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxNjA0BgNVBAMTLUdl
+b1RydXN0IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMjB2MBAGByqGSM49AgEG
+BSuBBAAiA2IABBWx6P0DFUPlrOuHNxFi79KDNlJ9RVcLSo17VDs6bl8VAsBQps8lL33KSLjHUGMc
+KiEIfJo22Av+0SbFWDEwKCXzXV2juLaltJLtbCyf691DiaI8S0iRHVDsJt/WYC69IaNCMEAwDwYD
+VR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFBVfNVdRVfslsq0DafwBo/q+
+EVXVMAoGCCqGSM49BAMDA2cAMGQCMGSWWaboCd6LuvpaiIjwH5HTRqjySkwCY/tsXzjbLkGTqQ7m
+ndwxHLKgpxgceeHHNgIwOlavmnRs9vuD4DPTCF+hnMJbn0bWtsuRBmOiBuczrD6ogRLQy7rQkgu2
+npaqBA+K
+-----END CERTIFICATE-----
+
+VeriSign Universal Root Certification Authority
+===============================================
+-----BEGIN CERTIFICATE-----
+MIIEuTCCA6GgAwIBAgIQQBrEZCGzEyEDDrvkEhrFHTANBgkqhkiG9w0BAQsFADCBvTELMAkGA1UE
+BhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBO
+ZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwOCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVk
+IHVzZSBvbmx5MTgwNgYDVQQDEy9WZXJpU2lnbiBVbml2ZXJzYWwgUm9vdCBDZXJ0aWZpY2F0aW9u
+IEF1dGhvcml0eTAeFw0wODA0MDIwMDAwMDBaFw0zNzEyMDEyMzU5NTlaMIG9MQswCQYDVQQGEwJV
+UzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0IE5ldHdv
+cmsxOjA4BgNVBAsTMShjKSAyMDA4IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNl
+IG9ubHkxODA2BgNVBAMTL1ZlcmlTaWduIFVuaXZlcnNhbCBSb290IENlcnRpZmljYXRpb24gQXV0
+aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx2E3XrEBNNti1xWb/1hajCMj
+1mCOkdeQmIN65lgZOIzF9uVkhbSicfvtvbnazU0AtMgtc6XHaXGVHzk8skQHnOgO+k1KxCHfKWGP
+MiJhgsWHH26MfF8WIFFE0XBPV+rjHOPMee5Y2A7Cs0WTwCznmhcrewA3ekEzeOEz4vMQGn+HLL72
+9fdC4uW/h2KJXwBL38Xd5HVEMkE6HnFuacsLdUYI0crSK5XQz/u5QGtkjFdN/BMReYTtXlT2NJ8I
+AfMQJQYXStrxHXpma5hgZqTZ79IugvHw7wnqRMkVauIDbjPTrJ9VAMf2CGqUuV/c4DPxhGD5WycR
+tPwW8rtWaoAljQIDAQABo4GyMIGvMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMG0G
+CCsGAQUFBwEMBGEwX6FdoFswWTBXMFUWCWltYWdlL2dpZjAhMB8wBwYFKw4DAhoEFI/l0xqGrI2O
+a8PPgGrUSBgsexkuMCUWI2h0dHA6Ly9sb2dvLnZlcmlzaWduLmNvbS92c2xvZ28uZ2lmMB0GA1Ud
+DgQWBBS2d/ppSEefUxLVwuoHMnYH0ZcHGTANBgkqhkiG9w0BAQsFAAOCAQEASvj4sAPmLGd75JR3
+Y8xuTPl9Dg3cyLk1uXBPY/ok+myDjEedO2Pzmvl2MpWRsXe8rJq+seQxIcaBlVZaDrHC1LGmWazx
+Y8u4TB1ZkErvkBYoH1quEPuBUDgMbMzxPcP1Y+Oz4yHJJDnp/RVmRvQbEdBNc6N9Rvk97ahfYtTx
+P/jgdFcrGJ2BtMQo2pSXpXDrrB2+BxHw1dvd5Yzw1TKwg+ZX4o+/vqGqvz0dtdQ46tewXDpPaj+P
+wGZsY6rp2aQW9IHRlRQOfc2VNNnSj3BzgXucfr2YYdhFh5iQxeuGMMY1v/D/w1WIg0vvBZIGcfK4
+mJO37M2CYfE45k+XmCpajQ==
+-----END CERTIFICATE-----
+
+VeriSign Class 3 Public Primary Certification Authority - G4
+============================================================
+-----BEGIN CERTIFICATE-----
+MIIDhDCCAwqgAwIBAgIQL4D+I4wOIg9IZxIokYesszAKBggqhkjOPQQDAzCByjELMAkGA1UEBhMC
+VVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3
+b3JrMTowOAYDVQQLEzEoYykgMjAwNyBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVz
+ZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmlj
+YXRpb24gQXV0aG9yaXR5IC0gRzQwHhcNMDcxMTA1MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCByjEL
+MAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBU
+cnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNyBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRo
+b3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5
+IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzQwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAASnVnp8
+Utpkmw4tXNherJI9/gHmGUo9FANL+mAnINmDiWn6VMaaGF5VKmTeBvaNSjutEDxlPZCIBIngMGGz
+rl0Bp3vefLK+ymVhAIau2o970ImtTR1ZmkGxvEeA3J5iw/mjgbIwga8wDwYDVR0TAQH/BAUwAwEB
+/zAOBgNVHQ8BAf8EBAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJaW1hZ2UvZ2lmMCEw
+HzAHBgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYjaHR0cDovL2xvZ28udmVyaXNpZ24u
+Y29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFLMWkf3upm7ktS5Jj4d4gYDs5bG1MAoGCCqGSM49BAMD
+A2gAMGUCMGYhDBgmYFo4e1ZC4Kf8NoRRkSAsdk1DPcQdhCPQrNZ8NQbOzWm9kA3bbEhCHQ6qQgIx
+AJw9SDkjOVgaFRJZap7v1VmyHVIsmXHNxynfGyphe3HR3vPA5Q06Sqotp9iGKt0uEA==
+-----END CERTIFICATE-----
+
+NetLock Arany (Class Gold) Főtanúsítvány
+============================================
+-----BEGIN CERTIFICATE-----
+MIIEFTCCAv2gAwIBAgIGSUEs5AAQMA0GCSqGSIb3DQEBCwUAMIGnMQswCQYDVQQGEwJIVTERMA8G
+A1UEBwwIQnVkYXBlc3QxFTATBgNVBAoMDE5ldExvY2sgS2Z0LjE3MDUGA1UECwwuVGFuw7pzw610
+dsOhbnlraWFkw7NrIChDZXJ0aWZpY2F0aW9uIFNlcnZpY2VzKTE1MDMGA1UEAwwsTmV0TG9jayBB
+cmFueSAoQ2xhc3MgR29sZCkgRsWRdGFuw7pzw610dsOhbnkwHhcNMDgxMjExMTUwODIxWhcNMjgx
+MjA2MTUwODIxWjCBpzELMAkGA1UEBhMCSFUxETAPBgNVBAcMCEJ1ZGFwZXN0MRUwEwYDVQQKDAxO
+ZXRMb2NrIEtmdC4xNzA1BgNVBAsMLlRhbsO6c8OtdHbDoW55a2lhZMOzayAoQ2VydGlmaWNhdGlv
+biBTZXJ2aWNlcykxNTAzBgNVBAMMLE5ldExvY2sgQXJhbnkgKENsYXNzIEdvbGQpIEbFkXRhbsO6
+c8OtdHbDoW55MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxCRec75LbRTDofTjl5Bu
+0jBFHjzuZ9lk4BqKf8owyoPjIMHj9DrTlF8afFttvzBPhCf2nx9JvMaZCpDyD/V/Q4Q3Y1GLeqVw
+/HpYzY6b7cNGbIRwXdrzAZAj/E4wqX7hJ2Pn7WQ8oLjJM2P+FpD/sLj916jAwJRDC7bVWaaeVtAk
+H3B5r9s5VA1lddkVQZQBr17s9o3x/61k/iCa11zr/qYfCGSji3ZVrR47KGAuhyXoqq8fxmRGILdw
+fzzeSNuWU7c5d+Qa4scWhHaXWy+7GRWF+GmF9ZmnqfI0p6m2pgP8b4Y9VHx2BJtr+UBdADTHLpl1
+neWIA6pN+APSQnbAGwIDAKiLo0UwQzASBgNVHRMBAf8ECDAGAQH/AgEEMA4GA1UdDwEB/wQEAwIB
+BjAdBgNVHQ4EFgQUzPpnk/C2uNClwB7zU/2MU9+D15YwDQYJKoZIhvcNAQELBQADggEBAKt/7hwW
+qZw8UQCgwBEIBaeZ5m8BiFRhbvG5GK1Krf6BQCOUL/t1fC8oS2IkgYIL9WHxHG64YTjrgfpioTta
+YtOUZcTh5m2C+C8lcLIhJsFyUR+MLMOEkMNaj7rP9KdlpeuY0fsFskZ1FSNqb4VjMIDw1Z4fKRzC
+bLBQWV2QWzuoDTDPv31/zvGdg73JRm4gpvlhUbohL3u+pRVjodSVh/GeufOJ8z2FuLjbvrW5Kfna
+NwUASZQDhETnv0Mxz3WLJdH0pmT1kvarBes96aULNmLazAZfNou2XjG4Kvte9nHfRCaexOYNkbQu
+dZWAUWpLMKawYqGT8ZvYzsRjdT9ZR7E=
+-----END CERTIFICATE-----
+
+Staat der Nederlanden Root CA - G2
+==================================
+-----BEGIN CERTIFICATE-----
+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
+66+KAQ==
+-----END CERTIFICATE-----
+
+CA Disig
+========
+-----BEGIN CERTIFICATE-----
+MIIEDzCCAvegAwIBAgIBATANBgkqhkiG9w0BAQUFADBKMQswCQYDVQQGEwJTSzETMBEGA1UEBxMK
+QnJhdGlzbGF2YTETMBEGA1UEChMKRGlzaWcgYS5zLjERMA8GA1UEAxMIQ0EgRGlzaWcwHhcNMDYw
+MzIyMDEzOTM0WhcNMTYwMzIyMDEzOTM0WjBKMQswCQYDVQQGEwJTSzETMBEGA1UEBxMKQnJhdGlz
+bGF2YTETMBEGA1UEChMKRGlzaWcgYS5zLjERMA8GA1UEAxMIQ0EgRGlzaWcwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQCS9jHBfYj9mQGp2HvycXXxMcbzdWb6UShGhJd4NLxs/LxFWYgm
+GErENx+hSkS943EE9UQX4j/8SFhvXJ56CbpRNyIjZkMhsDxkovhqFQ4/61HhVKndBpnXmjxUizkD
+Pw/Fzsbrg3ICqB9x8y34dQjbYkzo+s7552oftms1grrijxaSfQUMbEYDXcDtab86wYqg6I7ZuUUo
+hwjstMoVvoLdtUSLLa2GDGhibYVW8qwUYzrG0ZmsNHhWS8+2rT+MitcE5eN4TPWGqvWP+j1scaMt
+ymfraHtuM6kMgiioTGohQBUgDCZbg8KpFhXAJIJdKxatymP2dACw30PEEGBWZ2NFAgMBAAGjgf8w
+gfwwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUjbJJaJ1yCCW5wCf1UJNWSEZx+Y8wDgYDVR0P
+AQH/BAQDAgEGMDYGA1UdEQQvMC2BE2Nhb3BlcmF0b3JAZGlzaWcuc2uGFmh0dHA6Ly93d3cuZGlz
+aWcuc2svY2EwZgYDVR0fBF8wXTAtoCugKYYnaHR0cDovL3d3dy5kaXNpZy5zay9jYS9jcmwvY2Ff
+ZGlzaWcuY3JsMCygKqAohiZodHRwOi8vY2EuZGlzaWcuc2svY2EvY3JsL2NhX2Rpc2lnLmNybDAa
+BgNVHSAEEzARMA8GDSuBHpGT5goAAAABAQEwDQYJKoZIhvcNAQEFBQADggEBAF00dGFMrzvY/59t
+WDYcPQuBDRIrRhCA/ec8J9B6yKm2fnQwM6M6int0wHl5QpNt/7EpFIKrIYwvF/k/Ji/1WcbvgAa3
+mkkp7M5+cTxqEEHA9tOasnxakZzArFvITV734VP/Q3f8nktnbNfzg9Gg4H8l37iYC5oyOGwwoPP/
+CBUz91BKez6jPiCp3C9WgArtQVCwyfTssuMmRAAOb54GvCKWU3BlxFAKRmukLyeBEicTXxChds6K
+ezfqwzlhA5WYOudsiCUI/HloDYd9Yvi0X/vF2Ey9WLw/Q1vUHgFNPGO+I++MzVpQuGhU+QqZMxEA
+4Z7CRneC9VkGjCFMhwnN5ag=
+-----END CERTIFICATE-----
+
+Juur-SK
+=======
+-----BEGIN CERTIFICATE-----
+MIIE5jCCA86gAwIBAgIEO45L/DANBgkqhkiG9w0BAQUFADBdMRgwFgYJKoZIhvcNAQkBFglwa2lA
+c2suZWUxCzAJBgNVBAYTAkVFMSIwIAYDVQQKExlBUyBTZXJ0aWZpdHNlZXJpbWlza2Vza3VzMRAw
+DgYDVQQDEwdKdXVyLVNLMB4XDTAxMDgzMDE0MjMwMVoXDTE2MDgyNjE0MjMwMVowXTEYMBYGCSqG
+SIb3DQEJARYJcGtpQHNrLmVlMQswCQYDVQQGEwJFRTEiMCAGA1UEChMZQVMgU2VydGlmaXRzZWVy
+aW1pc2tlc2t1czEQMA4GA1UEAxMHSnV1ci1TSzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAIFxNj4zB9bjMI0TfncyRsvPGbJgMUaXhvSYRqTCZUXP00B841oiqBB4M8yIsdOBSvZiF3tf
+TQou0M+LI+5PAk676w7KvRhj6IAcjeEcjT3g/1tf6mTll+g/mX8MCgkzABpTpyHhOEvWgxutr2TC
++Rx6jGZITWYfGAriPrsfB2WThbkasLnE+w0R9vXW+RvHLCu3GFH+4Hv2qEivbDtPL+/40UceJlfw
+UR0zlv/vWT3aTdEVNMfqPxZIe5EcgEMPPbgFPtGzlc3Yyg/CQ2fbt5PgIoIuvvVoKIO5wTtpeyDa
+Tpxt4brNj3pssAki14sL2xzVWiZbDcDq5WDQn/413z8CAwEAAaOCAawwggGoMA8GA1UdEwEB/wQF
+MAMBAf8wggEWBgNVHSAEggENMIIBCTCCAQUGCisGAQQBzh8BAQEwgfYwgdAGCCsGAQUFBwICMIHD
+HoHAAFMAZQBlACAAcwBlAHIAdABpAGYAaQBrAGEAYQB0ACAAbwBuACAAdgDkAGwAagBhAHMAdABh
+AHQAdQBkACAAQQBTAC0AaQBzACAAUwBlAHIAdABpAGYAaQB0AHMAZQBlAHIAaQBtAGkAcwBrAGUA
+cwBrAHUAcwAgAGEAbABhAG0ALQBTAEsAIABzAGUAcgB0AGkAZgBpAGsAYQBhAHQAaQBkAGUAIABr
+AGkAbgBuAGkAdABhAG0AaQBzAGUAawBzMCEGCCsGAQUFBwIBFhVodHRwOi8vd3d3LnNrLmVlL2Nw
+cy8wKwYDVR0fBCQwIjAgoB6gHIYaaHR0cDovL3d3dy5zay5lZS9qdXVyL2NybC8wHQYDVR0OBBYE
+FASqekej5ImvGs8KQKcYP2/v6X2+MB8GA1UdIwQYMBaAFASqekej5ImvGs8KQKcYP2/v6X2+MA4G
+A1UdDwEB/wQEAwIB5jANBgkqhkiG9w0BAQUFAAOCAQEAe8EYlFOiCfP+JmeaUOTDBS8rNXiRTHyo
+ERF5TElZrMj3hWVcRrs7EKACr81Ptcw2Kuxd/u+gkcm2k298gFTsxwhwDY77guwqYHhpNjbRxZyL
+abVAyJRld/JXIWY7zoVAtjNjGr95HvxcHdMdkxuLDF2FvZkwMhgJkVLpfKG6/2SSmuz+Ne6ML678
+IIbsSt4beDI3poHSna9aEhbKmVv8b20OxaAehsmR0FyYgl9jDIpaq9iVpszLita/ZEuOyoqysOkh
+Mp6qqIWYNIE5ITuoOlIyPfZrN4YGWhWY3PARZv40ILcD9EEQfTmEeZZyY7aWAuVrua0ZTbvGRNs2
+yyqcjg==
+-----END CERTIFICATE-----
+
+Hongkong Post Root CA 1
+=======================
+-----BEGIN CERTIFICATE-----
+MIIDMDCCAhigAwIBAgICA+gwDQYJKoZIhvcNAQEFBQAwRzELMAkGA1UEBhMCSEsxFjAUBgNVBAoT
+DUhvbmdrb25nIFBvc3QxIDAeBgNVBAMTF0hvbmdrb25nIFBvc3QgUm9vdCBDQSAxMB4XDTAzMDUx
+NTA1MTMxNFoXDTIzMDUxNTA0NTIyOVowRzELMAkGA1UEBhMCSEsxFjAUBgNVBAoTDUhvbmdrb25n
+IFBvc3QxIDAeBgNVBAMTF0hvbmdrb25nIFBvc3QgUm9vdCBDQSAxMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEArP84tulmAknjorThkPlAj3n54r15/gK97iSSHSL22oVyaf7XPwnU3ZG1
+ApzQjVrhVcNQhrkpJsLj2aDxaQMoIIBFIi1WpztUlVYiWR8o3x8gPW2iNr4joLFutbEnPzlTCeqr
+auh0ssJlXI6/fMN4hM2eFvz1Lk8gKgifd/PFHsSaUmYeSF7jEAaPIpjhZY4bXSNmO7ilMlHIhqqh
+qZ5/dpTCpmy3QfDVyAY45tQM4vM7TG1QjMSDJ8EThFk9nnV0ttgCXjqQesBCNnLsak3c78QA3xMY
+V18meMjWCnl3v/evt3a5pQuEF10Q6m/hq5URX208o1xNg1vysxmKgIsLhwIDAQABoyYwJDASBgNV
+HRMBAf8ECDAGAQH/AgEDMA4GA1UdDwEB/wQEAwIBxjANBgkqhkiG9w0BAQUFAAOCAQEADkbVPK7i
+h9legYsCmEEIjEy82tvuJxuC52pF7BaLT4Wg87JwvVqWuspube5Gi27nKi6Wsxkz67SfqLI37pio
+l7Yutmcn1KZJ/RyTZXaeQi/cImyaT/JaFTmxcdcrUehtHJjA2Sr0oYJ71clBoiMBdDhViw+5Lmei
+IAQ32pwL0xch4I+XeTRvhEgCIDMb5jREn5Fw9IBehEPCKdJsEhTkYY2sEJCehFC78JZvRZ+K88ps
+T/oROhUVRsPNH4NbLUES7VBnQRM9IauUiqpOfMGx+6fWtScvl6tu4B3i0RwsH0Ti/L6RoZz71ilT
+c4afU9hDDl3WY4JxHYB0yvbiAmvZWg==
+-----END CERTIFICATE-----
+
+SecureSign RootCA11
+===================
+-----BEGIN CERTIFICATE-----
+MIIDbTCCAlWgAwIBAgIBATANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQGEwJKUDErMCkGA1UEChMi
+SmFwYW4gQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcywgSW5jLjEcMBoGA1UEAxMTU2VjdXJlU2lnbiBS
+b290Q0ExMTAeFw0wOTA0MDgwNDU2NDdaFw0yOTA0MDgwNDU2NDdaMFgxCzAJBgNVBAYTAkpQMSsw
+KQYDVQQKEyJKYXBhbiBDZXJ0aWZpY2F0aW9uIFNlcnZpY2VzLCBJbmMuMRwwGgYDVQQDExNTZWN1
+cmVTaWduIFJvb3RDQTExMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA/XeqpRyQBTvL
+TJszi1oURaTnkBbR31fSIRCkF/3frNYfp+TbfPfs37gD2pRY/V1yfIw/XwFndBWW4wI8h9uuywGO
+wvNmxoVF9ALGOrVisq/6nL+k5tSAMJjzDbaTj6nU2DbysPyKyiyhFTOVMdrAG/LuYpmGYz+/3ZMq
+g6h2uRMft85OQoWPIucuGvKVCbIFtUROd6EgvanyTgp9UK31BQ1FT0Zx/Sg+U/sE2C3XZR1KG/rP
+O7AxmjVuyIsG0wCR8pQIZUyxNAYAeoni8McDWc/V1uinMrPmmECGxc0nEovMe863ETxiYAcjPitA
+bpSACW22s293bzUIUPsCh8U+iQIDAQABo0IwQDAdBgNVHQ4EFgQUW/hNT7KlhtQ60vFjmqC+CfZX
+t94wDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAKCh
+OBZmLqdWHyGcBvod7bkixTgm2E5P7KN/ed5GIaGHd48HCJqypMWvDzKYC3xmKbabfSVSSUOrTC4r
+bnpwrxYO4wJs+0LmGJ1F2FXI6Dvd5+H0LgscNFxsWEr7jIhQX5Ucv+2rIrVls4W6ng+4reV6G4pQ
+Oh29Dbx7VFALuUKvVaAYga1lme++5Jy/xIWrQbJUb9wlze144o4MjQlJ3WN7WmmWAiGovVJZ6X01
+y8hSyn+B/tlr0/cR7SXf+Of5pPpyl4RTDaXQMhhRdlkUbA/r7F+AjHVDg8OFmP9Mni0N5HeDk061
+lgeLKBObjBmNQSdJQO7e5iNEOdyhIta6A/I=
+-----END CERTIFICATE-----
+
+ACEDICOM Root
+=============
+-----BEGIN CERTIFICATE-----
+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
+-----END CERTIFICATE-----
+
+Microsec e-Szigno Root CA 2009
+==============================
+-----BEGIN CERTIFICATE-----
+MIIECjCCAvKgAwIBAgIJAMJ+QwRORz8ZMA0GCSqGSIb3DQEBCwUAMIGCMQswCQYDVQQGEwJIVTER
+MA8GA1UEBwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xJzAlBgNVBAMMHk1pY3Jv
+c2VjIGUtU3ppZ25vIFJvb3QgQ0EgMjAwOTEfMB0GCSqGSIb3DQEJARYQaW5mb0BlLXN6aWduby5o
+dTAeFw0wOTA2MTYxMTMwMThaFw0yOTEyMzAxMTMwMThaMIGCMQswCQYDVQQGEwJIVTERMA8GA1UE
+BwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xJzAlBgNVBAMMHk1pY3Jvc2VjIGUt
+U3ppZ25vIFJvb3QgQ0EgMjAwOTEfMB0GCSqGSIb3DQEJARYQaW5mb0BlLXN6aWduby5odTCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOn4j/NjrdqG2KfgQvvPkd6mJviZpWNwrZuuyjNA
+fW2WbqEORO7hE52UQlKavXWFdCyoDh2Tthi3jCyoz/tccbna7P7ofo/kLx2yqHWH2Leh5TvPmUpG
+0IMZfcChEhyVbUr02MelTTMuhTlAdX4UfIASmFDHQWe4oIBhVKZsTh/gnQ4H6cm6M+f+wFUoLAKA
+pxn1ntxVUwOXewdI/5n7N4okxFnMUBBjjqqpGrCEGob5X7uxUG6k0QrM1XF+H6cbfPVTbiJfyyvm
+1HxdrtbCxkzlBQHZ7Vf8wSN5/PrIJIOV87VqUQHQd9bpEqH5GoP7ghu5sJf0dgYzQ0mg/wu1+rUC
+AwEAAaOBgDB+MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTLD8bf
+QkPMPcu1SCOhGnqmKrs0aDAfBgNVHSMEGDAWgBTLD8bfQkPMPcu1SCOhGnqmKrs0aDAbBgNVHREE
+FDASgRBpbmZvQGUtc3ppZ25vLmh1MA0GCSqGSIb3DQEBCwUAA4IBAQDJ0Q5eLtXMs3w+y/w9/w0o
+lZMEyL/azXm4Q5DwpL7v8u8hmLzU1F0G9u5C7DBsoKqpyvGvivo/C3NqPuouQH4frlRheesuCDfX
+I/OMn74dseGkddug4lQUsbocKaQY9hK6ohQU4zE1yED/t+AFdlfBHFny+L/k7SViXITwfn4fs775
+tyERzAMBVnCnEJIeGzSBHq2cGsMEPO0CYdYeBvNfOofyK/FFh+U9rNHHV4S9a67c2Pm2G2JwCz02
+yULyMtd6YebS2z3PyKnJm9zbWETXbzivf3jTo60adbocwTZ8jx5tHMN1Rq41Bab2XD0h7lbwyYIi
+LXpUq3DDfSJlgnCW
+-----END CERTIFICATE-----
+
+GlobalSign Root CA - R3
+=======================
+-----BEGIN CERTIFICATE-----
+MIIDXzCCAkegAwIBAgILBAAAAAABIVhTCKIwDQYJKoZIhvcNAQELBQAwTDEgMB4GA1UECxMXR2xv
+YmFsU2lnbiBSb290IENBIC0gUjMxEzARBgNVBAoTCkdsb2JhbFNpZ24xEzARBgNVBAMTCkdsb2Jh
+bFNpZ24wHhcNMDkwMzE4MTAwMDAwWhcNMjkwMzE4MTAwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxT
+aWduIFJvb3QgQ0EgLSBSMzETMBEGA1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2ln
+bjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMwldpB5BngiFvXAg7aEyiie/QV2EcWt
+iHL8RgJDx7KKnQRfJMsuS+FggkbhUqsMgUdwbN1k0ev1LKMPgj0MK66X17YUhhB5uzsTgHeMCOFJ
+0mpiLx9e+pZo34knlTifBtc+ycsmWQ1z3rDI6SYOgxXG71uL0gRgykmmKPZpO/bLyCiR5Z2KYVc3
+rHQU3HTgOu5yLy6c+9C7v/U9AOEGM+iCK65TpjoWc4zdQQ4gOsC0p6Hpsk+QLjJg6VfLuQSSaGjl
+OCZgdbKfd/+RFO+uIEn8rUAVSNECMWEZXriX7613t2Saer9fwRPvm2L7DWzgVGkWqQPabumDk3F2
+xmmFghcCAwEAAaNCMEAwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYE
+FI/wS3+oLkUkrk1Q+mOai97i3Ru8MA0GCSqGSIb3DQEBCwUAA4IBAQBLQNvAUKr+yAzv95ZURUm7
+lgAJQayzE4aGKAczymvmdLm6AC2upArT9fHxD4q/c2dKg8dEe3jgr25sbwMpjjM5RcOO5LlXbKr8
+EpbsU8Yt5CRsuZRj+9xTaGdWPoO4zzUhw8lo/s7awlOqzJCK6fBdRoyV3XpYKBovHd7NADdBj+1E
+bddTKJd+82cEHhXXipa0095MJ6RMG3NzdvQXmcIfeg7jLQitChws/zyrVQ4PkX4268NXSb7hLi18
+YIvDQVETI53O9zJrlAGomecsMx86OyXShkDOOyyGeMlhLxS67ttVb9+E7gUJTb0o2HLO02JQZR7r
+kpeDMdmztcpHWD9f
+-----END CERTIFICATE-----
+
+Autoridad de Certificacion Firmaprofesional CIF A62634068
+=========================================================
+-----BEGIN CERTIFICATE-----
+MIIGFDCCA/ygAwIBAgIIU+w77vuySF8wDQYJKoZIhvcNAQEFBQAwUTELMAkGA1UEBhMCRVMxQjBA
+BgNVBAMMOUF1dG9yaWRhZCBkZSBDZXJ0aWZpY2FjaW9uIEZpcm1hcHJvZmVzaW9uYWwgQ0lGIEE2
+MjYzNDA2ODAeFw0wOTA1MjAwODM4MTVaFw0zMDEyMzEwODM4MTVaMFExCzAJBgNVBAYTAkVTMUIw
+QAYDVQQDDDlBdXRvcmlkYWQgZGUgQ2VydGlmaWNhY2lvbiBGaXJtYXByb2Zlc2lvbmFsIENJRiBB
+NjI2MzQwNjgwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDKlmuO6vj78aI14H9M2uDD
+Utd9thDIAl6zQyrET2qyyhxdKJp4ERppWVevtSBC5IsP5t9bpgOSL/UR5GLXMnE42QQMcas9UX4P
+B99jBVzpv5RvwSmCwLTaUbDBPLutN0pcyvFLNg4kq7/DhHf9qFD0sefGL9ItWY16Ck6WaVICqjaY
+7Pz6FIMMNx/Jkjd/14Et5cS54D40/mf0PmbR0/RAz15iNA9wBj4gGFrO93IbJWyTdBSTo3OxDqqH
+ECNZXyAFGUftaI6SEspd/NYrspI8IM/hX68gvqB2f3bl7BqGYTM+53u0P6APjqK5am+5hyZvQWyI
+plD9amML9ZMWGxmPsu2bm8mQ9QEM3xk9Dz44I8kvjwzRAv4bVdZO0I08r0+k8/6vKtMFnXkIoctX
+MbScyJCyZ/QYFpM6/EfY0XiWMR+6KwxfXZmtY4laJCB22N/9q06mIqqdXuYnin1oKaPnirjaEbsX
+LZmdEyRG98Xi2J+Of8ePdG1asuhy9azuJBCtLxTa/y2aRnFHvkLfuwHb9H/TKI8xWVvTyQKmtFLK
+bpf7Q8UIJm+K9Lv9nyiqDdVF8xM6HdjAeI9BZzwelGSuewvF6NkBiDkal4ZkQdU7hwxu+g/GvUgU
+vzlN1J5Bto+WHWOWk9mVBngxaJ43BjuAiUVhOSPHG0SjFeUc+JIwuwIDAQABo4HvMIHsMBIGA1Ud
+EwEB/wQIMAYBAf8CAQEwDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRlzeurNR4APn7VdMActHNH
+DhpkLzCBpgYDVR0gBIGeMIGbMIGYBgRVHSAAMIGPMC8GCCsGAQUFBwIBFiNodHRwOi8vd3d3LmZp
+cm1hcHJvZmVzaW9uYWwuY29tL2NwczBcBggrBgEFBQcCAjBQHk4AUABhAHMAZQBvACAAZABlACAA
+bABhACAAQgBvAG4AYQBuAG8AdgBhACAANAA3ACAAQgBhAHIAYwBlAGwAbwBuAGEAIAAwADgAMAAx
+ADcwDQYJKoZIhvcNAQEFBQADggIBABd9oPm03cXF661LJLWhAqvdpYhKsg9VSytXjDvlMd3+xDLx
+51tkljYyGOylMnfX40S2wBEqgLk9am58m9Ot/MPWo+ZkKXzR4Tgegiv/J2Wv+xYVxC5xhOW1//qk
+R71kMrv2JYSiJ0L1ILDCExARzRAVukKQKtJE4ZYm6zFIEv0q2skGz3QeqUvVhyj5eTSSPi5E6PaP
+T481PyWzOdxjKpBrIF/EUhJOlywqrJ2X3kjyo2bbwtKDlaZmp54lD+kLM5FlClrD2VQS3a/DTg4f
+Jl4N3LON7NWBcN7STyQF82xO9UxJZo3R/9ILJUFI/lGExkKvgATP0H5kSeTy36LssUzAKh3ntLFl
+osS88Zj0qnAHY7S42jtM+kAiMFsRpvAFDsYCA0irhpuF3dvd6qJ2gHN99ZwExEWN57kci57q13XR
+crHedUTnQn3iV2t93Jm8PYMo6oCTjcVMZcFwgbg4/EMxsvYDNEeyrPsiBsse3RdHHF9mudMaotoR
+saS8I8nkvof/uZS2+F0gStRf571oe2XyFR7SOqkt6dhrJKyXWERHrVkY8SFlcN7ONGCoQPHzPKTD
+KCOM/iczQ0CgFzzr6juwcqajuUpLXhZI9LK8yIySxZ2frHI2vDSANGupi5LAuBft7HZT9SQBjLMi
+6Et8Vcad+qMUu2WFbm5PEn4KPJ2V
+-----END CERTIFICATE-----
+
+Izenpe.com
+==========
+-----BEGIN CERTIFICATE-----
+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
+-----END CERTIFICATE-----
+
+Chambers of Commerce Root - 2008
+================================
+-----BEGIN CERTIFICATE-----
+MIIHTzCCBTegAwIBAgIJAKPaQn6ksa7aMA0GCSqGSIb3DQEBBQUAMIGuMQswCQYDVQQGEwJFVTFD
+MEEGA1UEBxM6TWFkcmlkIChzZWUgY3VycmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNv
+bS9hZGRyZXNzKTESMBAGA1UEBRMJQTgyNzQzMjg3MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMu
+QS4xKTAnBgNVBAMTIENoYW1iZXJzIG9mIENvbW1lcmNlIFJvb3QgLSAyMDA4MB4XDTA4MDgwMTEy
+Mjk1MFoXDTM4MDczMTEyMjk1MFowga4xCzAJBgNVBAYTAkVVMUMwQQYDVQQHEzpNYWRyaWQgKHNl
+ZSBjdXJyZW50IGFkZHJlc3MgYXQgd3d3LmNhbWVyZmlybWEuY29tL2FkZHJlc3MpMRIwEAYDVQQF
+EwlBODI3NDMyODcxGzAZBgNVBAoTEkFDIENhbWVyZmlybWEgUy5BLjEpMCcGA1UEAxMgQ2hhbWJl
+cnMgb2YgQ29tbWVyY2UgUm9vdCAtIDIwMDgwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoIC
+AQCvAMtwNyuAWko6bHiUfaN/Gh/2NdW928sNRHI+JrKQUrpjOyhYb6WzbZSm891kDFX29ufyIiKA
+XuFixrYp4YFs8r/lfTJqVKAyGVn+H4vXPWCGhSRv4xGzdz4gljUha7MI2XAuZPeEklPWDrCQiorj
+h40G072QDuKZoRuGDtqaCrsLYVAGUvGef3bsyw/QHg3PmTA9HMRFEFis1tPo1+XqxQEHd9ZR5gN/
+ikilTWh1uem8nk4ZcfUyS5xtYBkL+8ydddy/Js2Pk3g5eXNeJQ7KXOt3EgfLZEFHcpOrUMPrCXZk
+NNI5t3YRCQ12RcSprj1qr7V9ZS+UWBDsXHyvfuK2GNnQm05aSd+pZgvMPMZ4fKecHePOjlO+Bd5g
+D2vlGts/4+EhySnB8esHnFIbAURRPHsl18TlUlRdJQfKFiC4reRB7noI/plvg6aRArBsNlVq5331
+lubKgdaX8ZSD6e2wsWsSaR6s+12pxZjptFtYer49okQ6Y1nUCyXeG0+95QGezdIp1Z8XGQpvvwyQ
+0wlf2eOKNcx5Wk0ZN5K3xMGtr/R5JJqyAQuxr1yW84Ay+1w9mPGgP0revq+ULtlVmhduYJ1jbLhj
+ya6BXBg14JC7vjxPNyK5fuvPnnchpj04gftI2jE9K+OJ9dC1vX7gUMQSibMjmhAxhduub+84Mxh2
+EQIDAQABo4IBbDCCAWgwEgYDVR0TAQH/BAgwBgEB/wIBDDAdBgNVHQ4EFgQU+SSsD7K1+HnA+mCI
+G8TZTQKeFxkwgeMGA1UdIwSB2zCB2IAU+SSsD7K1+HnA+mCIG8TZTQKeFxmhgbSkgbEwga4xCzAJ
+BgNVBAYTAkVVMUMwQQYDVQQHEzpNYWRyaWQgKHNlZSBjdXJyZW50IGFkZHJlc3MgYXQgd3d3LmNh
+bWVyZmlybWEuY29tL2FkZHJlc3MpMRIwEAYDVQQFEwlBODI3NDMyODcxGzAZBgNVBAoTEkFDIENh
+bWVyZmlybWEgUy5BLjEpMCcGA1UEAxMgQ2hhbWJlcnMgb2YgQ29tbWVyY2UgUm9vdCAtIDIwMDiC
+CQCj2kJ+pLGu2jAOBgNVHQ8BAf8EBAMCAQYwPQYDVR0gBDYwNDAyBgRVHSAAMCowKAYIKwYBBQUH
+AgEWHGh0dHA6Ly9wb2xpY3kuY2FtZXJmaXJtYS5jb20wDQYJKoZIhvcNAQEFBQADggIBAJASryI1
+wqM58C7e6bXpeHxIvj99RZJe6dqxGfwWPJ+0W2aeaufDuV2I6A+tzyMP3iU6XsxPpcG1Lawk0lgH
+3qLPaYRgM+gQDROpI9CF5Y57pp49chNyM/WqfcZjHwj0/gF/JM8rLFQJ3uIrbZLGOU8W6jx+ekbU
+RWpGqOt1glanq6B8aBMz9p0w8G8nOSQjKpD9kCk18pPfNKXG9/jvjA9iSnyu0/VU+I22mlaHFoI6
+M6taIgj3grrqLuBHmrS1RaMFO9ncLkVAO+rcf+g769HsJtg1pDDFOqxXnrN2pSB7+R5KBWIBpih1
+YJeSDW4+TTdDDZIVnBgizVGZoCkaPF+KMjNbMMeJL0eYD6MDxvbxrN8y8NmBGuScvfaAFPDRLLmF
+9dijscilIeUcE5fuDr3fKanvNFNb0+RqE4QGtjICxFKuItLcsiFCGtpA8CnJ7AoMXOLQusxI0zcK
+zBIKinmwPQN/aUv0NCB9szTqjktk9T79syNnFQ0EuPAtwQlRPLJsFfClI9eDdOTlLsn+mCdCxqvG
+nrDQWzilm1DefhiYtUU79nm06PcaewaD+9CL2rvHvRirCG88gGtAPxkZumWK5r7VXNM21+9AUiRg
+OGcEMeyP84LG3rlV8zsxkVrctQgVrXYlCg17LofiDKYGvCYQbTed7N14jHyAxfDZd0jQ
+-----END CERTIFICATE-----
+
+Global Chambersign Root - 2008
+==============================
+-----BEGIN CERTIFICATE-----
+MIIHSTCCBTGgAwIBAgIJAMnN0+nVfSPOMA0GCSqGSIb3DQEBBQUAMIGsMQswCQYDVQQGEwJFVTFD
+MEEGA1UEBxM6TWFkcmlkIChzZWUgY3VycmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNv
+bS9hZGRyZXNzKTESMBAGA1UEBRMJQTgyNzQzMjg3MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMu
+QS4xJzAlBgNVBAMTHkdsb2JhbCBDaGFtYmVyc2lnbiBSb290IC0gMjAwODAeFw0wODA4MDExMjMx
+NDBaFw0zODA3MzExMjMxNDBaMIGsMQswCQYDVQQGEwJFVTFDMEEGA1UEBxM6TWFkcmlkIChzZWUg
+Y3VycmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNvbS9hZGRyZXNzKTESMBAGA1UEBRMJ
+QTgyNzQzMjg3MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMuQS4xJzAlBgNVBAMTHkdsb2JhbCBD
+aGFtYmVyc2lnbiBSb290IC0gMjAwODCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMDf
+VtPkOpt2RbQT2//BthmLN0EYlVJH6xedKYiONWwGMi5HYvNJBL99RDaxccy9Wglz1dmFRP+RVyXf
+XjaOcNFccUMd2drvXNL7G706tcuto8xEpw2uIRU/uXpbknXYpBI4iRmKt4DS4jJvVpyR1ogQC7N0
+ZJJ0YPP2zxhPYLIj0Mc7zmFLmY/CDNBAspjcDahOo7kKrmCgrUVSY7pmvWjg+b4aqIG7HkF4ddPB
+/gBVsIdU6CeQNR1MM62X/JcumIS/LMmjv9GYERTtY/jKmIhYF5ntRQOXfjyGHoiMvvKRhI9lNNgA
+TH23MRdaKXoKGCQwoze1eqkBfSbW+Q6OWfH9GzO1KTsXO0G2Id3UwD2ln58fQ1DJu7xsepeY7s2M
+H/ucUa6LcL0nn3HAa6x9kGbo1106DbDVwo3VyJ2dwW3Q0L9R5OP4wzg2rtandeavhENdk5IMagfe
+Ox2YItaswTXbo6Al/3K1dh3ebeksZixShNBFks4c5eUzHdwHU1SjqoI7mjcv3N2gZOnm3b2u/GSF
+HTynyQbehP9r6GsaPMWis0L7iwk+XwhSx2LE1AVxv8Rk5Pihg+g+EpuoHtQ2TS9x9o0o9oOpE9Jh
+wZG7SMA0j0GMS0zbaRL/UJScIINZc+18ofLx/d33SdNDWKBWY8o9PeU1VlnpDsogzCtLkykPAgMB
+AAGjggFqMIIBZjASBgNVHRMBAf8ECDAGAQH/AgEMMB0GA1UdDgQWBBS5CcqcHtvTbDprru1U8VuT
+BjUuXjCB4QYDVR0jBIHZMIHWgBS5CcqcHtvTbDprru1U8VuTBjUuXqGBsqSBrzCBrDELMAkGA1UE
+BhMCRVUxQzBBBgNVBAcTOk1hZHJpZCAoc2VlIGN1cnJlbnQgYWRkcmVzcyBhdCB3d3cuY2FtZXJm
+aXJtYS5jb20vYWRkcmVzcykxEjAQBgNVBAUTCUE4Mjc0MzI4NzEbMBkGA1UEChMSQUMgQ2FtZXJm
+aXJtYSBTLkEuMScwJQYDVQQDEx5HbG9iYWwgQ2hhbWJlcnNpZ24gUm9vdCAtIDIwMDiCCQDJzdPp
+1X0jzjAOBgNVHQ8BAf8EBAMCAQYwPQYDVR0gBDYwNDAyBgRVHSAAMCowKAYIKwYBBQUHAgEWHGh0
+dHA6Ly9wb2xpY3kuY2FtZXJmaXJtYS5jb20wDQYJKoZIhvcNAQEFBQADggIBAICIf3DekijZBZRG
+/5BXqfEv3xoNa/p8DhxJJHkn2EaqbylZUohwEurdPfWbU1Rv4WCiqAm57OtZfMY18dwY6fFn5a+6
+ReAJ3spED8IXDneRRXozX1+WLGiLwUePmJs9wOzL9dWCkoQ10b42OFZyMVtHLaoXpGNR6woBrX/s
+dZ7LoR/xfxKxueRkf2fWIyr0uDldmOghp+G9PUIadJpwr2hsUF1Jz//7Dl3mLEfXgTpZALVza2Mg
+9jFFCDkO9HB+QHBaP9BrQql0PSgvAm11cpUJjUhjxsYjV5KTXjXBjfkK9yydYhz2rXzdpjEetrHH
+foUm+qRqtdpjMNHvkzeyZi99Bffnt0uYlDXA2TopwZ2yUDMdSqlapskD7+3056huirRXhOukP9Du
+qqqHW2Pok+JrqNS4cnhrG+055F3Lm6qH1U9OAP7Zap88MQ8oAgF9mOinsKJknnn4SPIVqczmyETr
+P3iZ8ntxPjzxmKfFGBI/5rsoM0LpRQp8bfKGeS/Fghl9CYl8slR2iK7ewfPM4W7bMdaTrpmg7yVq
+c5iJWzouE4gev8CSlDQb4ye3ix5vQv/n6TebUB0tovkC7stYWDpxvGjjqsGvHCgfotwjZT+B6q6Z
+09gwzxMNTxXJhLynSC34MCN32EZLeW32jO06f2ARePTpm67VVMB0gNELQp/B
+-----END CERTIFICATE-----
+
+Go Daddy Root Certificate Authority - G2
+========================================
+-----BEGIN CERTIFICATE-----
+MIIDxTCCAq2gAwIBAgIBADANBgkqhkiG9w0BAQsFADCBgzELMAkGA1UEBhMCVVMxEDAOBgNVBAgT
+B0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxGjAYBgNVBAoTEUdvRGFkZHkuY29tLCBJbmMu
+MTEwLwYDVQQDEyhHbyBEYWRkeSBSb290IENlcnRpZmljYXRlIEF1dGhvcml0eSAtIEcyMB4XDTA5
+MDkwMTAwMDAwMFoXDTM3MTIzMTIzNTk1OVowgYMxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6
+b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMRowGAYDVQQKExFHb0RhZGR5LmNvbSwgSW5jLjExMC8G
+A1UEAxMoR28gRGFkZHkgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgLSBHMjCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAL9xYgjx+lk09xvJGKP3gElY6SKDE6bFIEMBO4Tx5oVJnyfq
+9oQbTqC023CYxzIBsQU+B07u9PpPL1kwIuerGVZr4oAH/PMWdYA5UXvl+TW2dE6pjYIT5LY/qQOD
++qK+ihVqf94Lw7YZFAXK6sOoBJQ7RnwyDfMAZiLIjWltNowRGLfTshxgtDj6AozO091GB94KPutd
+fMh8+7ArU6SSYmlRJQVhGkSBjCypQ5Yj36w6gZoOKcUcqeldHraenjAKOc7xiID7S13MMuyFYkMl
+NAJWJwGRtDtwKj9useiciAF9n9T521NtYJ2/LOdYq7hfRvzOxBsDPAnrSTFcaUaz4EcCAwEAAaNC
+MEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFDqahQcQZyi27/a9
+BUFuIMGU2g/eMA0GCSqGSIb3DQEBCwUAA4IBAQCZ21151fmXWWcDYfF+OwYxdS2hII5PZYe096ac
+vNjpL9DbWu7PdIxztDhC2gV7+AJ1uP2lsdeu9tfeE8tTEH6KRtGX+rcuKxGrkLAngPnon1rpN5+r
+5N9ss4UXnT3ZJE95kTXWXwTrgIOrmgIttRD02JDHBHNA7XIloKmf7J6raBKZV8aPEjoJpL1E/QYV
+N8Gb5DKj7Tjo2GTzLH4U/ALqn83/B2gX2yKQOC16jdFU8WnjXzPKej17CuPKf1855eJ1usV2GDPO
+LPAvTK33sefOT6jEm0pUBsV/fdUID+Ic/n4XuKxe9tQWskMJDE32p2u0mYRlynqI4uJEvlz36hz1
+-----END CERTIFICATE-----
+
+Starfield Root Certificate Authority - G2
+=========================================
+-----BEGIN CERTIFICATE-----
+MIID3TCCAsWgAwIBAgIBADANBgkqhkiG9w0BAQsFADCBjzELMAkGA1UEBhMCVVMxEDAOBgNVBAgT
+B0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxJTAjBgNVBAoTHFN0YXJmaWVsZCBUZWNobm9s
+b2dpZXMsIEluYy4xMjAwBgNVBAMTKVN0YXJmaWVsZCBSb290IENlcnRpZmljYXRlIEF1dGhvcml0
+eSAtIEcyMB4XDTA5MDkwMTAwMDAwMFoXDTM3MTIzMTIzNTk1OVowgY8xCzAJBgNVBAYTAlVTMRAw
+DgYDVQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxTdGFyZmllbGQg
+VGVjaG5vbG9naWVzLCBJbmMuMTIwMAYDVQQDEylTdGFyZmllbGQgUm9vdCBDZXJ0aWZpY2F0ZSBB
+dXRob3JpdHkgLSBHMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL3twQP89o/8ArFv
+W59I2Z154qK3A2FWGMNHttfKPTUuiUP3oWmb3ooa/RMgnLRJdzIpVv257IzdIvpy3Cdhl+72WoTs
+bhm5iSzchFvVdPtrX8WJpRBSiUZV9Lh1HOZ/5FSuS/hVclcCGfgXcVnrHigHdMWdSL5stPSksPNk
+N3mSwOxGXn/hbVNMYq/NHwtjuzqd+/x5AJhhdM8mgkBj87JyahkNmcrUDnXMN/uLicFZ8WJ/X7Nf
+ZTD4p7dNdloedl40wOiWVpmKs/B/pM293DIxfJHP4F8R+GuqSVzRmZTRouNjWwl2tVZi4Ut0HZbU
+JtQIBFnQmA4O5t78w+wfkPECAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
+AQYwHQYDVR0OBBYEFHwMMh+n2TB/xH1oo2Kooc6rB1snMA0GCSqGSIb3DQEBCwUAA4IBAQARWfol
+TwNvlJk7mh+ChTnUdgWUXuEok21iXQnCoKjUsHU48TRqneSfioYmUeYs0cYtbpUgSpIB7LiKZ3sx
+4mcujJUDJi5DnUox9g61DLu34jd/IroAow57UvtruzvE03lRTs2Q9GcHGcg8RnoNAX3FWOdt5oUw
+F5okxBDgBPfg8n/Uqgr/Qh037ZTlZFkSIHc40zI+OIF1lnP6aI+xy84fxez6nH7PfrHxBy22/L/K
+pL/QlwVKvOoYKAKQvVR4CSFx09F9HdkWsKlhPdAKACL8x3vLCWRFCztAgfd9fDL1mMpYjn0q7pBZ
+c2T5NnReJaH1ZgUufzkVqSr7UIuOhWn0
+-----END CERTIFICATE-----
+
+Starfield Services Root Certificate Authority - G2
+==================================================
+-----BEGIN CERTIFICATE-----
+MIID7zCCAtegAwIBAgIBADANBgkqhkiG9w0BAQsFADCBmDELMAkGA1UEBhMCVVMxEDAOBgNVBAgT
+B0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxJTAjBgNVBAoTHFN0YXJmaWVsZCBUZWNobm9s
+b2dpZXMsIEluYy4xOzA5BgNVBAMTMlN0YXJmaWVsZCBTZXJ2aWNlcyBSb290IENlcnRpZmljYXRl
+IEF1dGhvcml0eSAtIEcyMB4XDTA5MDkwMTAwMDAwMFoXDTM3MTIzMTIzNTk1OVowgZgxCzAJBgNV
+BAYTAlVTMRAwDgYDVQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxT
+dGFyZmllbGQgVGVjaG5vbG9naWVzLCBJbmMuMTswOQYDVQQDEzJTdGFyZmllbGQgU2VydmljZXMg
+Um9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgLSBHMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBANUMOsQq+U7i9b4Zl1+OiFOxHz/Lz58gE20pOsgPfTz3a3Y4Y9k2YKibXlwAgLIvWX/2
+h/klQ4bnaRtSmpDhcePYLQ1Ob/bISdm28xpWriu2dBTrz/sm4xq6HZYuajtYlIlHVv8loJNwU4Pa
+hHQUw2eeBGg6345AWh1KTs9DkTvnVtYAcMtS7nt9rjrnvDH5RfbCYM8TWQIrgMw0R9+53pBlbQLP
+LJGmpufehRhJfGZOozptqbXuNC66DQO4M99H67FrjSXZm86B0UVGMpZwh94CDklDhbZsc7tk6mFB
+rMnUVN+HL8cisibMn1lUaJ/8viovxFUcdUBgF4UCVTmLfwUCAwEAAaNCMEAwDwYDVR0TAQH/BAUw
+AwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFJxfAN+qAdcwKziIorhtSpzyEZGDMA0GCSqG
+SIb3DQEBCwUAA4IBAQBLNqaEd2ndOxmfZyMIbw5hyf2E3F/YNoHN2BtBLZ9g3ccaaNnRbobhiCPP
+E95Dz+I0swSdHynVv/heyNXBve6SbzJ08pGCL72CQnqtKrcgfU28elUSwhXqvfdqlS5sdJ/PHLTy
+xQGjhdByPq1zqwubdQxtRbeOlKyWN7Wg0I8VRw7j6IPdj/3vQQF3zCepYoUz8jcI73HPdwbeyBkd
+iEDPfUYd/x7H4c7/I9vG+o1VTqkC50cRRj70/b17KSa7qWFiNyi2LSr2EIZkyXCn0q23KXB56jza
+YyWf/Wi3MOxw+3WKt21gZ7IeyLnp2KhvAotnDU0mV3HaIPzBSlCNsSi6
+-----END CERTIFICATE-----
+
+AffirmTrust Commercial
+======================
+-----BEGIN CERTIFICATE-----
+MIIDTDCCAjSgAwIBAgIId3cGJyapsXwwDQYJKoZIhvcNAQELBQAwRDELMAkGA1UEBhMCVVMxFDAS
+BgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVzdCBDb21tZXJjaWFsMB4XDTEw
+MDEyOTE0MDYwNloXDTMwMTIzMTE0MDYwNlowRDELMAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmly
+bVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVzdCBDb21tZXJjaWFsMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEA9htPZwcroRX1BiLLHwGy43NFBkRJLLtJJRTWzsO3qyxPxkEylFf6Eqdb
+DuKPHx6GGaeqtS25Xw2Kwq+FNXkyLbscYjfysVtKPcrNcV/pQr6U6Mje+SJIZMblq8Yrba0F8PrV
+C8+a5fBQpIs7R6UjW3p6+DM/uO+Zl+MgwdYoic+U+7lF7eNAFxHUdPALMeIrJmqbTFeurCA+ukV6
+BfO9m2kVrn1OIGPENXY6BwLJN/3HR+7o8XYdcxXyl6S1yHp52UKqK39c/s4mT6NmgTWvRLpUHhww
+MmWd5jyTXlBOeuM61G7MGvv50jeuJCqrVwMiKA1JdX+3KNp1v47j3A55MQIDAQABo0IwQDAdBgNV
+HQ4EFgQUnZPGU4teyq8/nx4P5ZmVvCT2lI8wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
+AQYwDQYJKoZIhvcNAQELBQADggEBAFis9AQOzcAN/wr91LoWXym9e2iZWEnStB03TX8nfUYGXUPG
+hi4+c7ImfU+TqbbEKpqrIZcUsd6M06uJFdhrJNTxFq7YpFzUf1GO7RgBsZNjvbz4YYCanrHOQnDi
+qX0GJX0nof5v7LMeJNrjS1UaADs1tDvZ110w/YETifLCBivtZ8SOyUOyXGsViQK8YvxO8rUzqrJv
+0wqiUOP2O+guRMLbZjipM1ZI8W0bM40NjD9gN53Tym1+NH4Nn3J2ixufcv1SNUFFApYvHLKac0kh
+sUlHRUe072o0EclNmsxZt9YCnlpOZbWUrhvfKbAW8b8Angc6F2S1BLUjIZkKlTuXfO8=
+-----END CERTIFICATE-----
+
+AffirmTrust Networking
+======================
+-----BEGIN CERTIFICATE-----
+MIIDTDCCAjSgAwIBAgIIfE8EORzUmS0wDQYJKoZIhvcNAQEFBQAwRDELMAkGA1UEBhMCVVMxFDAS
+BgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVzdCBOZXR3b3JraW5nMB4XDTEw
+MDEyOTE0MDgyNFoXDTMwMTIzMTE0MDgyNFowRDELMAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmly
+bVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVzdCBOZXR3b3JraW5nMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEAtITMMxcua5Rsa2FSoOujz3mUTOWUgJnLVWREZY9nZOIG41w3SfYvm4SE
+Hi3yYJ0wTsyEheIszx6e/jarM3c1RNg1lho9Nuh6DtjVR6FqaYvZ/Ls6rnla1fTWcbuakCNrmreI
+dIcMHl+5ni36q1Mr3Lt2PpNMCAiMHqIjHNRqrSK6mQEubWXLviRmVSRLQESxG9fhwoXA3hA/Pe24
+/PHxI1Pcv2WXb9n5QHGNfb2V1M6+oF4nI979ptAmDgAp6zxG8D1gvz9Q0twmQVGeFDdCBKNwV6gb
+h+0t+nvujArjqWaJGctB+d1ENmHP4ndGyH329JKBNv3bNPFyfvMMFr20FQIDAQABo0IwQDAdBgNV
+HQ4EFgQUBx/S55zawm6iQLSwelAQUHTEyL0wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
+AQYwDQYJKoZIhvcNAQEFBQADggEBAIlXshZ6qML91tmbmzTCnLQyFE2npN/svqe++EPbkTfOtDIu
+UFUaNU52Q3Eg75N3ThVwLofDwR1t3Mu1J9QsVtFSUzpE0nPIxBsFZVpikpzuQY0x2+c06lkh1QF6
+12S4ZDnNye2v7UsDSKegmQGA3GWjNq5lWUhPgkvIZfFXHeVZLgo/bNjR9eUJtGxUAArgFU2HdW23
+WJZa3W3SAKD0m0i+wzekujbgfIeFlxoVot4uolu9rxj5kFDNcFn4J2dHy8egBzp90SxdbBk6ZrV9
+/ZFvgrG+CJPbFEfxojfHRZ48x3evZKiT3/Zpg4Jg8klCNO1aAFSFHBY2kgxc+qatv9s=
+-----END CERTIFICATE-----
+
+AffirmTrust Premium
+===================
+-----BEGIN CERTIFICATE-----
+MIIFRjCCAy6gAwIBAgIIbYwURrGmCu4wDQYJKoZIhvcNAQEMBQAwQTELMAkGA1UEBhMCVVMxFDAS
+BgNVBAoMC0FmZmlybVRydXN0MRwwGgYDVQQDDBNBZmZpcm1UcnVzdCBQcmVtaXVtMB4XDTEwMDEy
+OTE0MTAzNloXDTQwMTIzMTE0MTAzNlowQTELMAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmlybVRy
+dXN0MRwwGgYDVQQDDBNBZmZpcm1UcnVzdCBQcmVtaXVtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8A
+MIICCgKCAgEAxBLfqV/+Qd3d9Z+K4/as4Tx4mrzY8H96oDMq3I0gW64tb+eT2TZwamjPjlGjhVtn
+BKAQJG9dKILBl1fYSCkTtuG+kU3fhQxTGJoeJKJPj/CihQvL9Cl/0qRY7iZNyaqoe5rZ+jjeRFcV
+5fiMyNlI4g0WJx0eyIOFJbe6qlVBzAMiSy2RjYvmia9mx+n/K+k8rNrSs8PhaJyJ+HoAVt70VZVs
++7pk3WKL3wt3MutizCaam7uqYoNMtAZ6MMgpv+0GTZe5HMQxK9VfvFMSF5yZVylmd2EhMQcuJUmd
+GPLu8ytxjLW6OQdJd/zvLpKQBY0tL3d770O/Nbua2Plzpyzy0FfuKE4mX4+QaAkvuPjcBukumj5R
+p9EixAqnOEhss/n/fauGV+O61oV4d7pD6kh/9ti+I20ev9E2bFhc8e6kGVQa9QPSdubhjL08s9NI
+S+LI+H+SqHZGnEJlPqQewQcDWkYtuJfzt9WyVSHvutxMAJf7FJUnM7/oQ0dG0giZFmA7mn7S5u04
+6uwBHjxIVkkJx0w3AJ6IDsBz4W9m6XJHMD4Q5QsDyZpCAGzFlH5hxIrff4IaC1nEWTJ3s7xgaVY5
+/bQGeyzWZDbZvUjthB9+pSKPKrhC9IK31FOQeE4tGv2Bb0TXOwF0lkLgAOIua+rF7nKsu7/+6qqo
++Nz2snmKtmcCAwEAAaNCMEAwHQYDVR0OBBYEFJ3AZ6YMItkm9UWrpmVSESfYRaxjMA8GA1UdEwEB
+/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBDAUAA4ICAQCzV00QYk465KzquByv
+MiPIs0laUZx2KI15qldGF9X1Uva3ROgIRL8YhNILgM3FEv0AVQVhh0HctSSePMTYyPtwni94loMg
+Nt58D2kTiKV1NpgIpsbfrM7jWNa3Pt668+s0QNiigfV4Py/VpfzZotReBA4Xrf5B8OWycvpEgjNC
+6C1Y91aMYj+6QrCcDFx+LmUmXFNPALJ4fqENmS2NuB2OosSw/WDQMKSOyARiqcTtNd56l+0OOF6S
+L5Nwpamcb6d9Ex1+xghIsV5n61EIJenmJWtSKZGc0jlzCFfemQa0W50QBuHCAKi4HEoCChTQwUHK
++4w1IX2COPKpVJEZNZOUbWo6xbLQu4mGk+ibyQ86p3q4ofB4Rvr8Ny/lioTz3/4E2aFooC8k4gmV
+BtWVyuEklut89pMFu+1z6S3RdTnX5yTb2E5fQ4+e0BQ5v1VwSJlXMbSc7kqYA5YwH2AG7hsj/oFg
+IxpHYoWlzBk0gG+zrBrjn/B7SK3VAdlntqlyk+otZrWyuOQ9PLLvTIzq6we/qzWaVYa8GKa1qF60
+g2xraUDTn9zxw2lrueFtCfTxqlB2Cnp9ehehVZZCmTEJ3WARjQUwfuaORtGdFNrHF+QFlozEJLUb
+zxQHskD4o55BhrwE0GuWyCqANP2/7waj3VjFhT0+j/6eKeC2uAloGRwYQw==
+-----END CERTIFICATE-----
+
+AffirmTrust Premium ECC
+=======================
+-----BEGIN CERTIFICATE-----
+MIIB/jCCAYWgAwIBAgIIdJclisc/elQwCgYIKoZIzj0EAwMwRTELMAkGA1UEBhMCVVMxFDASBgNV
+BAoMC0FmZmlybVRydXN0MSAwHgYDVQQDDBdBZmZpcm1UcnVzdCBQcmVtaXVtIEVDQzAeFw0xMDAx
+MjkxNDIwMjRaFw00MDEyMzExNDIwMjRaMEUxCzAJBgNVBAYTAlVTMRQwEgYDVQQKDAtBZmZpcm1U
+cnVzdDEgMB4GA1UEAwwXQWZmaXJtVHJ1c3QgUHJlbWl1bSBFQ0MwdjAQBgcqhkjOPQIBBgUrgQQA
+IgNiAAQNMF4bFZ0D0KF5Nbc6PJJ6yhUczWLznCZcBz3lVPqj1swS6vQUX+iOGasvLkjmrBhDeKzQ
+N8O9ss0s5kfiGuZjuD0uL3jET9v0D6RoTFVya5UdThhClXjMNzyR4ptlKymjQjBAMB0GA1UdDgQW
+BBSaryl6wBE1NSZRMADDav5A1a7WPDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAK
+BggqhkjOPQQDAwNnADBkAjAXCfOHiFBar8jAQr9HX/VsaobgxCd05DhT1wV/GzTjxi+zygk8N53X
+57hG8f2h4nECMEJZh0PUUd+60wkyWs6Iflc9nF9Ca/UHLbXwgpP5WW+uZPpY5Yse42O+tYHNbwKM
+eQ==
+-----END CERTIFICATE-----
+
+Certum Trusted Network CA
+=========================
+-----BEGIN CERTIFICATE-----
+MIIDuzCCAqOgAwIBAgIDBETAMA0GCSqGSIb3DQEBBQUAMH4xCzAJBgNVBAYTAlBMMSIwIAYDVQQK
+ExlVbml6ZXRvIFRlY2hub2xvZ2llcyBTLkEuMScwJQYDVQQLEx5DZXJ0dW0gQ2VydGlmaWNhdGlv
+biBBdXRob3JpdHkxIjAgBgNVBAMTGUNlcnR1bSBUcnVzdGVkIE5ldHdvcmsgQ0EwHhcNMDgxMDIy
+MTIwNzM3WhcNMjkxMjMxMTIwNzM3WjB+MQswCQYDVQQGEwJQTDEiMCAGA1UEChMZVW5pemV0byBU
+ZWNobm9sb2dpZXMgUy5BLjEnMCUGA1UECxMeQ2VydHVtIENlcnRpZmljYXRpb24gQXV0aG9yaXR5
+MSIwIAYDVQQDExlDZXJ0dW0gVHJ1c3RlZCBOZXR3b3JrIENBMIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEA4/t9o3K6wvDJFIf1awFO4W5AB7ptJ11/91sts1rHUV+rpDKmYYe2bg+G0jAC
+l/jXaVehGDldamR5xgFZrDwxSjh80gTSSyjoIF87B6LMTXPb865Px1bVWqeWifrzq2jUI4ZZJ88J
+J7ysbnKDHDBy3+Ci6dLhdHUZvSqeexVUBBvXQzmtVSjF4hq79MDkrjhJM8x2hZ85RdKknvISjFH4
+fOQtf/WsX+sWn7Et0brMkUJ3TCXJkDhv2/DM+44el1k+1WBO5gUo7Ul5E0u6SNsv+XLTOcr+H9g0
+cvW0QM8xAcPs3hEtF10fuFDRXhmnad4HMyjKUJX5p1TLVIZQRan5SQIDAQABo0IwQDAPBgNVHRMB
+Af8EBTADAQH/MB0GA1UdDgQWBBQIds3LB/8k9sXN7buQvOKEN0Z19zAOBgNVHQ8BAf8EBAMCAQYw
+DQYJKoZIhvcNAQEFBQADggEBAKaorSLOAT2mo/9i0Eidi15ysHhE49wcrwn9I0j6vSrEuVUEtRCj
+jSfeC4Jj0O7eDDd5QVsisrCaQVymcODU0HfLI9MA4GxWL+FpDQ3Zqr8hgVDZBqWo/5U30Kr+4rP1
+mS1FhIrlQgnXdAIv94nYmem8J9RHjboNRhx3zxSkHLmkMcScKHQDNP8zGSal6Q10tz6XxnboJ5aj
+Zt3hrvJBW8qYVoNzcOSGGtIxQbovvi0TWnZvTuhOgQ4/WwMioBK+ZlgRSssDxLQqKi2WF+A5VLxI
+03YnnZotBqbJ7DnSq9ufmgsnAjUpsUCV5/nonFWIGUbWtzT1fs45mtk48VH3Tyw=
+-----END CERTIFICATE-----
+
+Certinomis - Autorité Racine
+=============================
+-----BEGIN CERTIFICATE-----
+MIIFnDCCA4SgAwIBAgIBATANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJGUjETMBEGA1UEChMK
+Q2VydGlub21pczEXMBUGA1UECxMOMDAwMiA0MzM5OTg5MDMxJjAkBgNVBAMMHUNlcnRpbm9taXMg
+LSBBdXRvcml0w6kgUmFjaW5lMB4XDTA4MDkxNzA4Mjg1OVoXDTI4MDkxNzA4Mjg1OVowYzELMAkG
+A1UEBhMCRlIxEzARBgNVBAoTCkNlcnRpbm9taXMxFzAVBgNVBAsTDjAwMDIgNDMzOTk4OTAzMSYw
+JAYDVQQDDB1DZXJ0aW5vbWlzIC0gQXV0b3JpdMOpIFJhY2luZTCCAiIwDQYJKoZIhvcNAQEBBQAD
+ggIPADCCAgoCggIBAJ2Fn4bT46/HsmtuM+Cet0I0VZ35gb5j2CN2DpdUzZlMGvE5x4jYF1AMnmHa
+wE5V3udauHpOd4cN5bjr+p5eex7Ezyh0x5P1FMYiKAT5kcOrJ3NqDi5N8y4oH3DfVS9O7cdxbwly
+Lu3VMpfQ8Vh30WC8Tl7bmoT2R2FFK/ZQpn9qcSdIhDWerP5pqZ56XjUl+rSnSTV3lqc2W+HN3yNw
+2F1MpQiD8aYkOBOo7C+ooWfHpi2GR+6K/OybDnT0K0kCe5B1jPyZOQE51kqJ5Z52qz6WKDgmi92N
+jMD2AR5vpTESOH2VwnHu7XSu5DaiQ3XV8QCb4uTXzEIDS3h65X27uK4uIJPT5GHfceF2Z5c/tt9q
+c1pkIuVC28+BA5PY9OMQ4HL2AHCs8MF6DwV/zzRpRbWT5BnbUhYjBYkOjUjkJW+zeL9i9Qf6lSTC
+lrLooyPCXQP8w9PlfMl1I9f09bze5N/NgL+RiH2nE7Q5uiy6vdFrzPOlKO1Enn1So2+WLhl+HPNb
+xxaOu2B9d2ZHVIIAEWBsMsGoOBvrbpgT1u449fCfDu/+MYHB0iSVL1N6aaLwD4ZFjliCK0wi1F6g
+530mJ0jfJUaNSih8hp75mxpZuWW/Bd22Ql095gBIgl4g9xGC3srYn+Y3RyYe63j3YcNBZFgCQfna
+4NH4+ej9Uji29YnfAgMBAAGjWzBZMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0G
+A1UdDgQWBBQNjLZh2kS40RR9w759XkjwzspqsDAXBgNVHSAEEDAOMAwGCiqBegFWAgIAAQEwDQYJ
+KoZIhvcNAQEFBQADggIBACQ+YAZ+He86PtvqrxyaLAEL9MW12Ukx9F1BjYkMTv9sov3/4gbIOZ/x
+WqndIlgVqIrTseYyCYIDbNc/CMf4uboAbbnW/FIyXaR/pDGUu7ZMOH8oMDX/nyNTt7buFHAAQCva
+R6s0fl6nVjBhK4tDrP22iCj1a7Y+YEq6QpA0Z43q619FVDsXrIvkxmUP7tCMXWY5zjKn2BCXwH40
+nJ+U8/aGH88bc62UeYdocMMzpXDn2NU4lG9jeeu/Cg4I58UvD0KgKxRA/yHgBcUn4YQRE7rWhh1B
+CxMjidPJC+iKunqjo3M3NYB9Ergzd0A4wPpeMNLytqOx1qKVl4GbUu1pTP+A5FPbVFsDbVRfsbjv
+JL1vnxHDx2TCDyhihWZeGnuyt++uNckZM6i4J9szVb9o4XVIRFb7zdNIu0eJOqxp9YDG5ERQL1TE
+qkPFMTFYvZbF6nVsmnWxTfj3l/+WFvKXTej28xH5On2KOG4Ey+HTRRWqpdEdnV1j6CTmNhTih60b
+WfVEm/vXd3wfAXBioSAaosUaKPQhA+4u2cGA6rnZgtZbdsLLO7XSAPCjDuGtbkD326C00EauFddE
+wk01+dIL8hf2rGbVJLJP0RyZwG71fet0BLj5TXcJ17TPBzAJ8bgAVtkXFhYKK4bfjwEZGuW7gmP/
+vgt2Fl43N+bYdJeimUV5
+-----END CERTIFICATE-----
+
+Root CA Generalitat Valenciana
+==============================
+-----BEGIN CERTIFICATE-----
+MIIGizCCBXOgAwIBAgIEO0XlaDANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJFUzEfMB0GA1UE
+ChMWR2VuZXJhbGl0YXQgVmFsZW5jaWFuYTEPMA0GA1UECxMGUEtJR1ZBMScwJQYDVQQDEx5Sb290
+IENBIEdlbmVyYWxpdGF0IFZhbGVuY2lhbmEwHhcNMDEwNzA2MTYyMjQ3WhcNMjEwNzAxMTUyMjQ3
+WjBoMQswCQYDVQQGEwJFUzEfMB0GA1UEChMWR2VuZXJhbGl0YXQgVmFsZW5jaWFuYTEPMA0GA1UE
+CxMGUEtJR1ZBMScwJQYDVQQDEx5Sb290IENBIEdlbmVyYWxpdGF0IFZhbGVuY2lhbmEwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDGKqtXETcvIorKA3Qdyu0togu8M1JAJke+WmmmO3I2
+F0zo37i7L3bhQEZ0ZQKQUgi0/6iMweDHiVYQOTPvaLRfX9ptI6GJXiKjSgbwJ/BXufjpTjJ3Cj9B
+ZPPrZe52/lSqfR0grvPXdMIKX/UIKFIIzFVd0g/bmoGlu6GzwZTNVOAydTGRGmKy3nXiz0+J2ZGQ
+D0EbtFpKd71ng+CT516nDOeB0/RSrFOyA8dEJvt55cs0YFAQexvba9dHq198aMpunUEDEO5rmXte
+JajCq+TA81yc477OMUxkHl6AovWDfgzWyoxVjr7gvkkHD6MkQXpYHYTqWBLI4bft75PelAgxAgMB
+AAGjggM7MIIDNzAyBggrBgEFBQcBAQQmMCQwIgYIKwYBBQUHMAGGFmh0dHA6Ly9vY3NwLnBraS5n
+dmEuZXMwEgYDVR0TAQH/BAgwBgEB/wIBAjCCAjQGA1UdIASCAiswggInMIICIwYKKwYBBAG/VQIB
+ADCCAhMwggHoBggrBgEFBQcCAjCCAdoeggHWAEEAdQB0AG8AcgBpAGQAYQBkACAAZABlACAAQwBl
+AHIAdABpAGYAaQBjAGEAYwBpAPMAbgAgAFIAYQDtAHoAIABkAGUAIABsAGEAIABHAGUAbgBlAHIA
+YQBsAGkAdABhAHQAIABWAGEAbABlAG4AYwBpAGEAbgBhAC4ADQAKAEwAYQAgAEQAZQBjAGwAYQBy
+AGEAYwBpAPMAbgAgAGQAZQAgAFAAcgDhAGMAdABpAGMAYQBzACAAZABlACAAQwBlAHIAdABpAGYA
+aQBjAGEAYwBpAPMAbgAgAHEAdQBlACAAcgBpAGcAZQAgAGUAbAAgAGYAdQBuAGMAaQBvAG4AYQBt
+AGkAZQBuAHQAbwAgAGQAZQAgAGwAYQAgAHAAcgBlAHMAZQBuAHQAZQAgAEEAdQB0AG8AcgBpAGQA
+YQBkACAAZABlACAAQwBlAHIAdABpAGYAaQBjAGEAYwBpAPMAbgAgAHMAZQAgAGUAbgBjAHUAZQBu
+AHQAcgBhACAAZQBuACAAbABhACAAZABpAHIAZQBjAGMAaQDzAG4AIAB3AGUAYgAgAGgAdAB0AHAA
+OgAvAC8AdwB3AHcALgBwAGsAaQAuAGcAdgBhAC4AZQBzAC8AYwBwAHMwJQYIKwYBBQUHAgEWGWh0
+dHA6Ly93d3cucGtpLmd2YS5lcy9jcHMwHQYDVR0OBBYEFHs100DSHHgZZu90ECjcPk+yeAT8MIGV
+BgNVHSMEgY0wgYqAFHs100DSHHgZZu90ECjcPk+yeAT8oWykajBoMQswCQYDVQQGEwJFUzEfMB0G
+A1UEChMWR2VuZXJhbGl0YXQgVmFsZW5jaWFuYTEPMA0GA1UECxMGUEtJR1ZBMScwJQYDVQQDEx5S
+b290IENBIEdlbmVyYWxpdGF0IFZhbGVuY2lhbmGCBDtF5WgwDQYJKoZIhvcNAQEFBQADggEBACRh
+TvW1yEICKrNcda3FbcrnlD+laJWIwVTAEGmiEi8YPyVQqHxK6sYJ2fR1xkDar1CdPaUWu20xxsdz
+Ckj+IHLtb8zog2EWRpABlUt9jppSCS/2bxzkoXHPjCpaF3ODR00PNvsETUlR4hTJZGH71BTg9J63
+NI8KJr2XXPR5OkowGcytT6CYirQxlyric21+eLj4iIlPsSKRZEv1UN4D2+XFducTZnV+ZfsBn5OH
+iJ35Rld8TWCvmHMTI6QgkYH60GFmuH3Rr9ZvHmw96RH9qfmCIoaZM3Fa6hlXPZHNqcCjbgcTpsnt
++GijnsNacgmHKNHEc8RzGF9QdRYxn7fofMM=
+-----END CERTIFICATE-----
+
+TWCA Root Certification Authority
+=================================
+-----BEGIN CERTIFICATE-----
+MIIDezCCAmOgAwIBAgIBATANBgkqhkiG9w0BAQUFADBfMQswCQYDVQQGEwJUVzESMBAGA1UECgwJ
+VEFJV0FOLUNBMRAwDgYDVQQLDAdSb290IENBMSowKAYDVQQDDCFUV0NBIFJvb3QgQ2VydGlmaWNh
+dGlvbiBBdXRob3JpdHkwHhcNMDgwODI4MDcyNDMzWhcNMzAxMjMxMTU1OTU5WjBfMQswCQYDVQQG
+EwJUVzESMBAGA1UECgwJVEFJV0FOLUNBMRAwDgYDVQQLDAdSb290IENBMSowKAYDVQQDDCFUV0NB
+IFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQCwfnK4pAOU5qfeCTiRShFAh6d8WWQUe7UREN3+v9XAu1bihSX0NXIP+FPQQeFEAcK0HMMx
+QhZHhTMidrIKbw/lJVBPhYa+v5guEGcevhEFhgWQxFnQfHgQsIBct+HHK3XLfJ+utdGdIzdjp9xC
+oi2SBBtQwXu4PhvJVgSLL1KbralW6cH/ralYhzC2gfeXRfwZVzsrb+RH9JlF/h3x+JejiB03HFyP
+4HYlmlD4oFT/RJB2I9IyxsOrBr/8+7/zrX2SYgJbKdM1o5OaQ2RgXbL6Mv87BK9NQGr5x+PvI/1r
+y+UPizgN7gr8/g+YnzAx3WxSZfmLgb4i4RxYA7qRG4kHAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIB
+BjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRqOFsmjd6LWvJPelSDGRjjCDWmujANBgkqhkiG
+9w0BAQUFAAOCAQEAPNV3PdrfibqHDAhUaiBQkr6wQT25JmSDCi/oQMCXKCeCMErJk/9q56YAf4lC
+mtYR5VPOL8zy2gXE/uJQxDqGfczafhAJO5I1KlOy/usrBdlsXebQ79NqZp4VKIV66IIArB6nCWlW
+QtNoURi+VJq/REG6Sb4gumlc7rh3zc5sH62Dlhh9DrUUOYTxKOkto557HnpyWoOzeW/vtPzQCqVY
+T0bf+215WfKEIlKuD8z7fDvnaspHYcN6+NOSBB+4IIThNlQWx0DeO4pz3N/GCUzf7Nr/1FNCocny
+Yh0igzyXxfkZYiesZSLX0zzG5Y6yU8xJzrww/nsOM5D77dIUkR8Hrw==
+-----END CERTIFICATE-----
+
+Security Communication RootCA2
+==============================
+-----BEGIN CERTIFICATE-----
+MIIDdzCCAl+gAwIBAgIBADANBgkqhkiG9w0BAQsFADBdMQswCQYDVQQGEwJKUDElMCMGA1UEChMc
+U0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEnMCUGA1UECxMeU2VjdXJpdHkgQ29tbXVuaWNh
+dGlvbiBSb290Q0EyMB4XDTA5MDUyOTA1MDAzOVoXDTI5MDUyOTA1MDAzOVowXTELMAkGA1UEBhMC
+SlAxJTAjBgNVBAoTHFNFQ09NIFRydXN0IFN5c3RlbXMgQ08uLExURC4xJzAlBgNVBAsTHlNlY3Vy
+aXR5IENvbW11bmljYXRpb24gUm9vdENBMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+ANAVOVKxUrO6xVmCxF1SrjpDZYBLx/KWvNs2l9amZIyoXvDjChz335c9S672XewhtUGrzbl+dp++
++T42NKA7wfYxEUV0kz1XgMX5iZnK5atq1LXaQZAQwdbWQonCv/Q4EpVMVAX3NuRFg3sUZdbcDE3R
+3n4MqzvEFb46VqZab3ZpUql6ucjrappdUtAtCms1FgkQhNBqyjoGADdH5H5XTz+L62e4iKrFvlNV
+spHEfbmwhRkGeC7bYRr6hfVKkaHnFtWOojnflLhwHyg/i/xAXmODPIMqGplrz95Zajv8bxbXH/1K
+EOtOghY6rCcMU/Gt1SSwawNQwS08Ft1ENCcadfsCAwEAAaNCMEAwHQYDVR0OBBYEFAqFqXdlBZh8
+QIH4D5csOPEK7DzPMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEB
+CwUAA4IBAQBMOqNErLlFsceTfsgLCkLfZOoc7llsCLqJX2rKSpWeeo8HxdpFcoJxDjrSzG+ntKEj
+u/Ykn8sX/oymzsLS28yN/HH8AynBbF0zX2S2ZTuJbxh2ePXcokgfGT+Ok+vx+hfuzU7jBBJV1uXk
+3fs+BXziHV7Gp7yXT2g69ekuCkO2r1dcYmh8t/2jioSgrGK+KwmHNPBqAbubKVY8/gA3zyNs8U6q
+tnRGEmyR7jTV7JqR50S+kDFy1UkC9gLl9B/rfNmWVan/7Ir5mUf/NVoCqgTLiluHcSmRvaS0eg29
+mvVXIwAHIRc/SjnRBUkLp7Y3gaVdjKozXoEofKd9J+sAro03
+-----END CERTIFICATE-----
+
+EC-ACC
+======
+-----BEGIN CERTIFICATE-----
+MIIFVjCCBD6gAwIBAgIQ7is969Qh3hSoYqwE893EATANBgkqhkiG9w0BAQUFADCB8zELMAkGA1UE
+BhMCRVMxOzA5BgNVBAoTMkFnZW5jaWEgQ2F0YWxhbmEgZGUgQ2VydGlmaWNhY2lvIChOSUYgUS0w
+ODAxMTc2LUkpMSgwJgYDVQQLEx9TZXJ2ZWlzIFB1YmxpY3MgZGUgQ2VydGlmaWNhY2lvMTUwMwYD
+VQQLEyxWZWdldSBodHRwczovL3d3dy5jYXRjZXJ0Lm5ldC92ZXJhcnJlbCAoYykwMzE1MDMGA1UE
+CxMsSmVyYXJxdWlhIEVudGl0YXRzIGRlIENlcnRpZmljYWNpbyBDYXRhbGFuZXMxDzANBgNVBAMT
+BkVDLUFDQzAeFw0wMzAxMDcyMzAwMDBaFw0zMTAxMDcyMjU5NTlaMIHzMQswCQYDVQQGEwJFUzE7
+MDkGA1UEChMyQWdlbmNpYSBDYXRhbGFuYSBkZSBDZXJ0aWZpY2FjaW8gKE5JRiBRLTA4MDExNzYt
+SSkxKDAmBgNVBAsTH1NlcnZlaXMgUHVibGljcyBkZSBDZXJ0aWZpY2FjaW8xNTAzBgNVBAsTLFZl
+Z2V1IGh0dHBzOi8vd3d3LmNhdGNlcnQubmV0L3ZlcmFycmVsIChjKTAzMTUwMwYDVQQLEyxKZXJh
+cnF1aWEgRW50aXRhdHMgZGUgQ2VydGlmaWNhY2lvIENhdGFsYW5lczEPMA0GA1UEAxMGRUMtQUND
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsyLHT+KXQpWIR4NA9h0X84NzJB5R85iK
+w5K4/0CQBXCHYMkAqbWUZRkiFRfCQ2xmRJoNBD45b6VLeqpjt4pEndljkYRm4CgPukLjbo73FCeT
+ae6RDqNfDrHrZqJyTxIThmV6PttPB/SnCWDaOkKZx7J/sxaVHMf5NLWUhdWZXqBIoH7nF2W4onW4
+HvPlQn2v7fOKSGRdghST2MDk/7NQcvJ29rNdQlB50JQ+awwAvthrDk4q7D7SzIKiGGUzE3eeml0a
+E9jD2z3Il3rucO2n5nzbcc8tlGLfbdb1OL4/pYUKGbio2Al1QnDE6u/LDsg0qBIimAy4E5S2S+zw
+0JDnJwIDAQABo4HjMIHgMB0GA1UdEQQWMBSBEmVjX2FjY0BjYXRjZXJ0Lm5ldDAPBgNVHRMBAf8E
+BTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUoMOLRKo3pUW/l4Ba0fF4opvpXY0wfwYD
+VR0gBHgwdjB0BgsrBgEEAfV4AQMBCjBlMCwGCCsGAQUFBwIBFiBodHRwczovL3d3dy5jYXRjZXJ0
+Lm5ldC92ZXJhcnJlbDA1BggrBgEFBQcCAjApGidWZWdldSBodHRwczovL3d3dy5jYXRjZXJ0Lm5l
+dC92ZXJhcnJlbCAwDQYJKoZIhvcNAQEFBQADggEBAKBIW4IB9k1IuDlVNZyAelOZ1Vr/sXE7zDkJ
+lF7W2u++AVtd0x7Y/X1PzaBB4DSTv8vihpw3kpBWHNzrKQXlxJ7HNd+KDM3FIUPpqojlNcAZQmNa
+Al6kSBg6hW/cnbw/nZzBh7h6YQjpdwt/cKt63dmXLGQehb+8dJahw3oS7AwaboMMPOhyRp/7SNVe
+l+axofjk70YllJyJ22k4vuxcDlbHZVHlUIiIv0LVKz3l+bqeLrPK9HOSAgu+TGbrIP65y7WZf+a2
+E/rKS03Z7lNGBjvGTq2TWoF+bCpLagVFjPIhpDGQh2xlnJ2lYJU6Un/10asIbvPuW/mIPX64b24D
+5EI=
+-----END CERTIFICATE-----
+
+Hellenic Academic and Research Institutions RootCA 2011
+=======================================================
+-----BEGIN CERTIFICATE-----
+MIIEMTCCAxmgAwIBAgIBADANBgkqhkiG9w0BAQUFADCBlTELMAkGA1UEBhMCR1IxRDBCBgNVBAoT
+O0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1dGlvbnMgQ2VydC4gQXV0aG9y
+aXR5MUAwPgYDVQQDEzdIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25z
+IFJvb3RDQSAyMDExMB4XDTExMTIwNjEzNDk1MloXDTMxMTIwMTEzNDk1MlowgZUxCzAJBgNVBAYT
+AkdSMUQwQgYDVQQKEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25z
+IENlcnQuIEF1dGhvcml0eTFAMD4GA1UEAxM3SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNo
+IEluc3RpdHV0aW9ucyBSb290Q0EgMjAxMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+AKlTAOMupvaO+mDYLZU++CwqVE7NuYRhlFhPjz2L5EPzdYmNUeTDN9KKiE15HrcS3UN4SoqS5tdI
+1Q+kOilENbgH9mgdVc04UfCMJDGFr4PJfel3r+0ae50X+bOdOFAPplp5kYCvN66m0zH7tSYJnTxa
+71HFK9+WXesyHgLacEnsbgzImjeN9/E2YEsmLIKe0HjzDQ9jpFEw4fkrJxIH2Oq9GGKYsFk3fb7u
+8yBRQlqD75O6aRXxYp2fmTmCobd0LovUxQt7L/DICto9eQqakxylKHJzkUOap9FNhYS5qXSPFEDH
+3N6sQWRstBmbAmNtJGSPRLIl6s5ddAxjMlyNh+UCAwEAAaOBiTCBhjAPBgNVHRMBAf8EBTADAQH/
+MAsGA1UdDwQEAwIBBjAdBgNVHQ4EFgQUppFC/RNhSiOeCKQp5dgTBCPuQSUwRwYDVR0eBEAwPqA8
+MAWCAy5ncjAFggMuZXUwBoIELmVkdTAGggQub3JnMAWBAy5ncjAFgQMuZXUwBoEELmVkdTAGgQQu
+b3JnMA0GCSqGSIb3DQEBBQUAA4IBAQAf73lB4XtuP7KMhjdCSk4cNx6NZrokgclPEg8hwAOXhiVt
+XdMiKahsog2p6z0GW5k6x8zDmjR/qw7IThzh+uTczQ2+vyT+bOdrwg3IBp5OjWEopmr95fZi6hg8
+TqBTnbI6nOulnJEWtk2C4AwFSKls9cz4y51JtPACpf1wA+2KIaWuE4ZJwzNzvoc7dIsXRSZMFpGD
+/md9zU1jZ/rzAxKWeAaNsWftjj++n08C9bMJL/NMh98qy5V8AcysNnq/onN694/BtZqhFLKPM58N
+7yLcZnuEvUUXBj08yrl3NI/K6s8/MT7jiOOASSXIl7WdmplNsDz4SgCbZN2fOUvRJ9e4
+-----END CERTIFICATE-----
+
+Actalis Authentication Root CA
+==============================
+-----BEGIN CERTIFICATE-----
+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
+-----END CERTIFICATE-----
+
+Trustis FPS Root CA
+===================
+-----BEGIN CERTIFICATE-----
+MIIDZzCCAk+gAwIBAgIQGx+ttiD5JNM2a/fH8YygWTANBgkqhkiG9w0BAQUFADBFMQswCQYDVQQG
+EwJHQjEYMBYGA1UEChMPVHJ1c3RpcyBMaW1pdGVkMRwwGgYDVQQLExNUcnVzdGlzIEZQUyBSb290
+IENBMB4XDTAzMTIyMzEyMTQwNloXDTI0MDEyMTExMzY1NFowRTELMAkGA1UEBhMCR0IxGDAWBgNV
+BAoTD1RydXN0aXMgTGltaXRlZDEcMBoGA1UECxMTVHJ1c3RpcyBGUFMgUm9vdCBDQTCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAMVQe547NdDfxIzNjpvto8A2mfRC6qc+gIMPpqdZh8mQ
+RUN+AOqGeSoDvT03mYlmt+WKVoaTnGhLaASMk5MCPjDSNzoiYYkchU59j9WvezX2fihHiTHcDnlk
+H5nSW7r+f2C/revnPDgpai/lkQtV/+xvWNUtyd5MZnGPDNcE2gfmHhjjvSkCqPoc4Vu5g6hBSLwa
+cY3nYuUtsuvffM/bq1rKMfFMIvMFE/eC+XN5DL7XSxzA0RU8k0Fk0ea+IxciAIleH2ulrG6nS4zt
+o3Lmr2NNL4XSFDWaLk6M6jKYKIahkQlBOrTh4/L68MkKokHdqeMDx4gVOxzUGpTXn2RZEm0CAwEA
+AaNTMFEwDwYDVR0TAQH/BAUwAwEB/zAfBgNVHSMEGDAWgBS6+nEleYtXQSUhhgtx67JkDoshZzAd
+BgNVHQ4EFgQUuvpxJXmLV0ElIYYLceuyZA6LIWcwDQYJKoZIhvcNAQEFBQADggEBAH5Y//01GX2c
+GE+esCu8jowU/yyg2kdbw++BLa8F6nRIW/M+TgfHbcWzk88iNVy2P3UnXwmWzaD+vkAMXBJV+JOC
+yinpXj9WV4s4NvdFGkwozZ5BuO1WTISkQMi4sKUraXAEasP41BIy+Q7DsdwyhEQsb8tGD+pmQQ9P
+8Vilpg0ND2HepZ5dfWWhPBfnqFVO76DH7cZEf1T1o+CP8HxVIo8ptoGj4W1OLBuAZ+ytIJ8MYmHV
+l/9D7S3B2l0pKoU/rGXuhg8FjZBf3+6f9L/uHfuY5H+QK4R4EA5sSVPvFVtlRkpdr7r7OnIdzfYl
+iB6XzCGcKQENZetX2fNXlrtIzYE=
+-----END CERTIFICATE-----
+
+StartCom Certification Authority
+================================
+-----BEGIN CERTIFICATE-----
+MIIHhzCCBW+gAwIBAgIBLTANBgkqhkiG9w0BAQsFADB9MQswCQYDVQQGEwJJTDEWMBQGA1UEChMN
+U3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmlu
+ZzEpMCcGA1UEAxMgU3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDYwOTE3MTk0
+NjM3WhcNMzYwOTE3MTk0NjM2WjB9MQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRk
+LjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMg
+U3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw
+ggIKAoICAQDBiNsJvGxGfHiflXu1M5DycmLWwTYgIiRezul38kMKogZkpMyONvg45iPwbm2xPN1y
+o4UcodM9tDMr0y+v/uqwQVlntsQGfQqedIXWeUyAN3rfOQVSWff0G0ZDpNKFhdLDcfN1YjS6LIp/
+Ho/u7TTQEceWzVI9ujPW3U3eCztKS5/CJi/6tRYccjV3yjxd5srhJosaNnZcAdt0FCX+7bWgiA/d
+eMotHweXMAEtcnn6RtYTKqi5pquDSR3l8u/d5AGOGAqPY1MWhWKpDhk6zLVmpsJrdAfkK+F2PrRt
+2PZE4XNiHzvEvqBTViVsUQn3qqvKv3b9bZvzndu/PWa8DFaqr5hIlTpL36dYUNk4dalb6kMMAv+Z
+6+hsTXBbKWWc3apdzK8BMewM69KN6Oqce+Zu9ydmDBpI125C4z/eIT574Q1w+2OqqGwaVLRcJXrJ
+osmLFqa7LH4XXgVNWG4SHQHuEhANxjJ/GP/89PrNbpHoNkm+Gkhpi8KWTRoSsmkXwQqQ1vp5Iki/
+untp+HDH+no32NgN0nZPV/+Qt+OR0t3vwmC3Zzrd/qqc8NSLf3Iizsafl7b4r4qgEKjZ+xjGtrVc
+UjyJthkqcwEKDwOzEmDyei+B26Nu/yYwl/WL3YlXtq09s68rxbd2AvCl1iuahhQqcvbjM4xdCUsT
+37uMdBNSSwIDAQABo4ICEDCCAgwwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYD
+VR0OBBYEFE4L7xqkQFulF2mHMMo0aEPQQa7yMB8GA1UdIwQYMBaAFE4L7xqkQFulF2mHMMo0aEPQ
+Qa7yMIIBWgYDVR0gBIIBUTCCAU0wggFJBgsrBgEEAYG1NwEBATCCATgwLgYIKwYBBQUHAgEWImh0
+dHA6Ly93d3cuc3RhcnRzc2wuY29tL3BvbGljeS5wZGYwNAYIKwYBBQUHAgEWKGh0dHA6Ly93d3cu
+c3RhcnRzc2wuY29tL2ludGVybWVkaWF0ZS5wZGYwgc8GCCsGAQUFBwICMIHCMCcWIFN0YXJ0IENv
+bW1lcmNpYWwgKFN0YXJ0Q29tKSBMdGQuMAMCAQEagZZMaW1pdGVkIExpYWJpbGl0eSwgcmVhZCB0
+aGUgc2VjdGlvbiAqTGVnYWwgTGltaXRhdGlvbnMqIG9mIHRoZSBTdGFydENvbSBDZXJ0aWZpY2F0
+aW9uIEF1dGhvcml0eSBQb2xpY3kgYXZhaWxhYmxlIGF0IGh0dHA6Ly93d3cuc3RhcnRzc2wuY29t
+L3BvbGljeS5wZGYwEQYJYIZIAYb4QgEBBAQDAgAHMDgGCWCGSAGG+EIBDQQrFilTdGFydENvbSBG
+cmVlIFNTTCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTANBgkqhkiG9w0BAQsFAAOCAgEAjo/n3JR5
+fPGFf59Jb2vKXfuM/gTFwWLRfUKKvFO3lANmMD+x5wqnUCBVJX92ehQN6wQOQOY+2IirByeDqXWm
+N3PH/UvSTa0XQMhGvjt/UfzDtgUx3M2FIk5xt/JxXrAaxrqTi3iSSoX4eA+D/i+tLPfkpLst0OcN
+Org+zvZ49q5HJMqjNTbOx8aHmNrs++myziebiMMEofYLWWivydsQD032ZGNcpRJvkrKTlMeIFw6T
+tn5ii5B/q06f/ON1FE8qMt9bDeD1e5MNq6HPh+GlBEXoPBKlCcWw0bdT82AUuoVpaiF8H3VhFyAX
+e2w7QSlc4axa0c2Mm+tgHRns9+Ww2vl5GKVFP0lDV9LdJNUso/2RjSe15esUBppMeyG7Oq0wBhjA
+2MFrLH9ZXF2RsXAiV+uKa0hK1Q8p7MZAwC+ITGgBF3f0JBlPvfrhsiAhS90a2Cl9qrjeVOwhVYBs
+HvUwyKMQ5bLmKhQxw4UtjJixhlpPiVktucf3HMiKf8CdBUrmQk9io20ppB+Fq9vlgcitKj1MXVuE
+JnHEhV5xJMqlG2zYYdMa4FTbzrqpMrUi9nNBCV24F10OD5mQ1kfabwo6YigUZ4LZ8dCAWZvLMdib
+D4x3TrVoivJs9iQOLWxwxXPR3hTQcY+203sC9uO41Alua551hDnmfyWl8kgAwKQB2j8=
+-----END CERTIFICATE-----
+
+StartCom Certification Authority G2
+===================================
+-----BEGIN CERTIFICATE-----
+MIIFYzCCA0ugAwIBAgIBOzANBgkqhkiG9w0BAQsFADBTMQswCQYDVQQGEwJJTDEWMBQGA1UEChMN
+U3RhcnRDb20gTHRkLjEsMCoGA1UEAxMjU3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkg
+RzIwHhcNMTAwMTAxMDEwMDAxWhcNMzkxMjMxMjM1OTAxWjBTMQswCQYDVQQGEwJJTDEWMBQGA1UE
+ChMNU3RhcnRDb20gTHRkLjEsMCoGA1UEAxMjU3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3Jp
+dHkgRzIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC2iTZbB7cgNr2Cu+EWIAOVeq8O
+o1XJJZlKxdBWQYeQTSFgpBSHO839sj60ZwNq7eEPS8CRhXBF4EKe3ikj1AENoBB5uNsDvfOpL9HG
+4A/LnooUCri99lZi8cVytjIl2bLzvWXFDSxu1ZJvGIsAQRSCb0AgJnooD/Uefyf3lLE3PbfHkffi
+Aez9lInhzG7TNtYKGXmu1zSCZf98Qru23QumNK9LYP5/Q0kGi4xDuFby2X8hQxfqp0iVAXV16iul
+Q5XqFYSdCI0mblWbq9zSOdIxHWDirMxWRST1HFSr7obdljKF+ExP6JV2tgXdNiNnvP8V4so75qbs
+O+wmETRIjfaAKxojAuuKHDp2KntWFhxyKrOq42ClAJ8Em+JvHhRYW6Vsi1g8w7pOOlz34ZYrPu8H
+vKTlXcxNnw3h3Kq74W4a7I/htkxNeXJdFzULHdfBR9qWJODQcqhaX2YtENwvKhOuJv4KHBnM0D4L
+nMgJLvlblnpHnOl68wVQdJVznjAJ85eCXuaPOQgeWeU1FEIT/wCc976qUM/iUUjXuG+v+E5+M5iS
+FGI6dWPPe/regjupuznixL0sAA7IF6wT700ljtizkC+p2il9Ha90OrInwMEePnWjFqmveiJdnxMa
+z6eg6+OGCtP95paV1yPIN93EfKo2rJgaErHgTuixO/XWb/Ew1wIDAQABo0IwQDAPBgNVHRMBAf8E
+BTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUS8W0QGutHLOlHGVuRjaJhwUMDrYwDQYJ
+KoZIhvcNAQELBQADggIBAHNXPyzVlTJ+N9uWkusZXn5T50HsEbZH77Xe7XRcxfGOSeD8bpkTzZ+K
+2s06Ctg6Wgk/XzTQLwPSZh0avZyQN8gMjgdalEVGKua+etqhqaRpEpKwfTbURIfXUfEpY9Z1zRbk
+J4kd+MIySP3bmdCPX1R0zKxnNBFi2QwKN4fRoxdIjtIXHfbX/dtl6/2o1PXWT6RbdejF0mCy2wl+
+JYt7ulKSnj7oxXehPOBKc2thz4bcQ///If4jXSRK9dNtD2IEBVeC2m6kMyV5Sy5UGYvMLD0w6dEG
+/+gyRr61M3Z3qAFdlsHB1b6uJcDJHgoJIIihDsnzb02CVAAgp9KP5DlUFy6NHrgbuxu9mk47EDTc
+nIhT76IxW1hPkWLIwpqazRVdOKnWvvgTtZ8SafJQYqz7Fzf07rh1Z2AQ+4NQ+US1dZxAF7L+/Xld
+blhYXzD8AK6vM8EOTmy6p6ahfzLbOOCxchcKK5HsamMm7YnUeMx0HgX4a/6ManY5Ka5lIxKVCCIc
+l85bBu4M4ru8H0ST9tg4RQUh7eStqxK2A6RCLi3ECToDZ2mEmuFZkIoohdVddLHRDiBYmxOlsGOm
+7XtH/UVVMKTumtTm4ofvmMkyghEpIrwACjFeLQ/Ajulrso8uBtjRkcfGEvRM/TAXw8HaOFvjqerm
+obp573PYtlNXLfbQ4ddI
+-----END CERTIFICATE-----
+
+Buypass Class 2 Root CA
+=======================
+-----BEGIN CERTIFICATE-----
+MIIFWTCCA0GgAwIBAgIBAjANBgkqhkiG9w0BAQsFADBOMQswCQYDVQQGEwJOTzEdMBsGA1UECgwU
+QnV5cGFzcyBBUy05ODMxNjMzMjcxIDAeBgNVBAMMF0J1eXBhc3MgQ2xhc3MgMiBSb290IENBMB4X
+DTEwMTAyNjA4MzgwM1oXDTQwMTAyNjA4MzgwM1owTjELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1
+eXBhc3MgQVMtOTgzMTYzMzI3MSAwHgYDVQQDDBdCdXlwYXNzIENsYXNzIDIgUm9vdCBDQTCCAiIw
+DQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANfHXvfBB9R3+0Mh9PT1aeTuMgHbo4Yf5FkNuud1
+g1Lr6hxhFUi7HQfKjK6w3Jad6sNgkoaCKHOcVgb/S2TwDCo3SbXlzwx87vFKu3MwZfPVL4O2fuPn
+9Z6rYPnT8Z2SdIrkHJasW4DptfQxh6NR/Md+oW+OU3fUl8FVM5I+GC911K2GScuVr1QGbNgGE41b
+/+EmGVnAJLqBcXmQRFBoJJRfuLMR8SlBYaNByyM21cHxMlAQTn/0hpPshNOOvEu/XAFOBz3cFIqU
+CqTqc/sLUegTBxj6DvEr0VQVfTzh97QZQmdiXnfgolXsttlpF9U6r0TtSsWe5HonfOV116rLJeff
+awrbD02TTqigzXsu8lkBarcNuAeBfos4GzjmCleZPe4h6KP1DBbdi+w0jpwqHAAVF41og9JwnxgI
+zRFo1clrUs3ERo/ctfPYV3Me6ZQ5BL/T3jjetFPsaRyifsSP5BtwrfKi+fv3FmRmaZ9JUaLiFRhn
+Bkp/1Wy1TbMz4GHrXb7pmA8y1x1LPC5aAVKRCfLf6o3YBkBjqhHk/sM3nhRSP/TizPJhk9H9Z2vX
+Uq6/aKtAQ6BXNVN48FP4YUIHZMbXb5tMOA1jrGKvNouicwoN9SG9dKpN6nIDSdvHXx1iY8f93ZHs
+M+71bbRuMGjeyNYmsHVee7QHIJihdjK4TWxPAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wHQYD
+VR0OBBYEFMmAd+BikoL1RpzzuvdMw964o605MA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQsF
+AAOCAgEAU18h9bqwOlI5LJKwbADJ784g7wbylp7ppHR/ehb8t/W2+xUbP6umwHJdELFx7rxP462s
+A20ucS6vxOOto70MEae0/0qyexAQH6dXQbLArvQsWdZHEIjzIVEpMMpghq9Gqx3tOluwlN5E40EI
+osHsHdb9T7bWR9AUC8rmyrV7d35BH16Dx7aMOZawP5aBQW9gkOLo+fsicdl9sz1Gv7SEr5AcD48S
+aq/v7h56rgJKihcrdv6sVIkkLE8/trKnToyokZf7KcZ7XC25y2a2t6hbElGFtQl+Ynhw/qlqYLYd
+DnkM/crqJIByw5c/8nerQyIKx+u2DISCLIBrQYoIwOula9+ZEsuK1V6ADJHgJgg2SMX6OBE1/yWD
+LfJ6v9r9jv6ly0UsH8SIU653DtmadsWOLB2jutXsMq7Aqqz30XpN69QH4kj3Io6wpJ9qzo6ysmD0
+oyLQI+uUWnpp3Q+/QFesa1lQ2aOZ4W7+jQF5JyMV3pKdewlNWudLSDBaGOYKbeaP4NK75t98biGC
+wWg5TbSYWGZizEqQXsP6JwSxeRV0mcy+rSDeJmAc61ZRpqPq5KM/p/9h3PFaTWwyI0PurKju7koS
+CTxdccK+efrCh2gdC/1cacwG0Jp9VJkqyTkaGa9LKkPzY11aWOIv4x3kqdbQCtCev9eBCfHJxyYN
+rJgWVqA=
+-----END CERTIFICATE-----
+
+Buypass Class 3 Root CA
+=======================
+-----BEGIN CERTIFICATE-----
+MIIFWTCCA0GgAwIBAgIBAjANBgkqhkiG9w0BAQsFADBOMQswCQYDVQQGEwJOTzEdMBsGA1UECgwU
+QnV5cGFzcyBBUy05ODMxNjMzMjcxIDAeBgNVBAMMF0J1eXBhc3MgQ2xhc3MgMyBSb290IENBMB4X
+DTEwMTAyNjA4Mjg1OFoXDTQwMTAyNjA4Mjg1OFowTjELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1
+eXBhc3MgQVMtOTgzMTYzMzI3MSAwHgYDVQQDDBdCdXlwYXNzIENsYXNzIDMgUm9vdCBDQTCCAiIw
+DQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAKXaCpUWUOOV8l6ddjEGMnqb8RB2uACatVI2zSRH
+sJ8YZLya9vrVediQYkwiL944PdbgqOkcLNt4EemOaFEVcsfzM4fkoF0LXOBXByow9c3EN3coTRiR
+5r/VUv1xLXA+58bEiuPwKAv0dpihi4dVsjoT/Lc+JzeOIuOoTyrvYLs9tznDDgFHmV0ST9tD+leh
+7fmdvhFHJlsTmKtdFoqwNxxXnUX/iJY2v7vKB3tvh2PX0DJq1l1sDPGzbjniazEuOQAnFN44wOwZ
+ZoYS6J1yFhNkUsepNxz9gjDthBgd9K5c/3ATAOux9TN6S9ZV+AWNS2mw9bMoNlwUxFFzTWsL8TQH
+2xc519woe2v1n/MuwU8XKhDzzMro6/1rqy6any2CbgTUUgGTLT2G/H783+9CHaZr77kgxve9oKeV
+/afmiSTYzIw0bOIjL9kSGiG5VZFvC5F5GQytQIgLcOJ60g7YaEi7ghM5EFjp2CoHxhLbWNvSO1UQ
+RwUVZ2J+GGOmRj8JDlQyXr8NYnon74Do29lLBlo3WiXQCBJ31G8JUJc9yB3D34xFMFbG02SrZvPA
+Xpacw8Tvw3xrizp5f7NJzz3iiZ+gMEuFuZyUJHmPfWupRWgPK9Dx2hzLabjKSWJtyNBjYt1gD1iq
+j6G8BaVmos8bdrKEZLFMOVLAMLrwjEsCsLa3AgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wHQYD
+VR0OBBYEFEe4zf/lb+74suwvTg75JbCOPGvDMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQsF
+AAOCAgEAACAjQTUEkMJAYmDv4jVM1z+s4jSQuKFvdvoWFqRINyzpkMLyPPgKn9iB5btb2iUspKdV
+cSQy9sgL8rxq+JOssgfCX5/bzMiKqr5qb+FJEMwx14C7u8jYog5kV+qi9cKpMRXSIGrs/CIBKM+G
+uIAeqcwRpTzyFrNHnfzSgCHEy9BHcEGhyoMZCCxt8l13nIoUE9Q2HJLw5QY33KbmkJs4j1xrG0aG
+Q0JfPgEHU1RdZX33inOhmlRaHylDFCfChQ+1iHsaO5S3HWCntZznKWlXWpuTekMwGwPXYshApqr8
+ZORK15FTAaggiG6cX0S5y2CBNOxv033aSF/rtJC8LakcC6wc1aJoIIAE1vyxjy+7SjENSoYc6+I2
+KSb12tjE8nVhz36udmNKekBlk4f4HoCMhuWG1o8O/FMsYOgWYRqiPkN7zTlgVGr18okmAWiDSKIz
+6MkEkbIRNBE+6tBDGR8Dk5AM/1E9V/RBbuHLoL7ryWPNbczk+DaqaJ3tvV2XcEQNtg413OEMXbug
+UZTLfhbrES+jkkXITHHZvMmZUldGL1DPvTVp9D0VzgalLA8+9oG6lLvDu79leNKGef9JOxqDDPDe
+eOzI8k1MGt6CKfjBWtrt7uYnXuhF0J0cUahoq0Tj0Itq4/g7u9xN12TyUb7mqqta6THuBrxzvxNi
+Cp/HuZc=
+-----END CERTIFICATE-----
+
+T-TeleSec GlobalRoot Class 3
+============================
+-----BEGIN CERTIFICATE-----
+MIIDwzCCAqugAwIBAgIBATANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UEBhMCREUxKzApBgNVBAoM
+IlQtU3lzdGVtcyBFbnRlcnByaXNlIFNlcnZpY2VzIEdtYkgxHzAdBgNVBAsMFlQtU3lzdGVtcyBU
+cnVzdCBDZW50ZXIxJTAjBgNVBAMMHFQtVGVsZVNlYyBHbG9iYWxSb290IENsYXNzIDMwHhcNMDgx
+MDAxMTAyOTU2WhcNMzMxMDAxMjM1OTU5WjCBgjELMAkGA1UEBhMCREUxKzApBgNVBAoMIlQtU3lz
+dGVtcyBFbnRlcnByaXNlIFNlcnZpY2VzIEdtYkgxHzAdBgNVBAsMFlQtU3lzdGVtcyBUcnVzdCBD
+ZW50ZXIxJTAjBgNVBAMMHFQtVGVsZVNlYyBHbG9iYWxSb290IENsYXNzIDMwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQC9dZPwYiJvJK7genasfb3ZJNW4t/zN8ELg63iIVl6bmlQdTQyK
+9tPPcPRStdiTBONGhnFBSivwKixVA9ZIw+A5OO3yXDw/RLyTPWGrTs0NvvAgJ1gORH8EGoel15YU
+NpDQSXuhdfsaa3Ox+M6pCSzyU9XDFES4hqX2iys52qMzVNn6chr3IhUciJFrf2blw2qAsCTz34ZF
+iP0Zf3WHHx+xGwpzJFu5ZeAsVMhg02YXP+HMVDNzkQI6pn97djmiH5a2OK61yJN0HZ65tOVgnS9W
+0eDrXltMEnAMbEQgqxHY9Bn20pxSN+f6tsIxO0rUFJmtxxr1XV/6B7h8DR/Wgx6zAgMBAAGjQjBA
+MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBS1A/d2O2GCahKqGFPr
+AyGUv/7OyjANBgkqhkiG9w0BAQsFAAOCAQEAVj3vlNW92nOyWL6ukK2YJ5f+AbGwUgC4TeQbIXQb
+fsDuXmkqJa9c1h3a0nnJ85cp4IaH3gRZD/FZ1GSFS5mvJQQeyUapl96Cshtwn5z2r3Ex3XsFpSzT
+ucpH9sry9uetuUg/vBa3wW306gmv7PO15wWeph6KU1HWk4HMdJP2udqmJQV0eVp+QD6CSyYRMG7h
+P0HHRwA11fXT91Q+gT3aSWqas+8QPebrb9HIIkfLzM8BMZLZGOMivgkeGj5asuRrDFR6fUNOuIml
+e9eiPZaGzPImNC1qkp2aGtAw4l1OBLBfiyB+d8E9lYLRRpo7PHi4b6HQDWSieB4pTpPDpFQUWw==
+-----END CERTIFICATE-----
+
+EE Certification Centre Root CA
+===============================
+-----BEGIN CERTIFICATE-----
+MIIEAzCCAuugAwIBAgIQVID5oHPtPwBMyonY43HmSjANBgkqhkiG9w0BAQUFADB1MQswCQYDVQQG
+EwJFRTEiMCAGA1UECgwZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czEoMCYGA1UEAwwfRUUgQ2Vy
+dGlmaWNhdGlvbiBDZW50cmUgUm9vdCBDQTEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVlMCIYDzIw
+MTAxMDMwMTAxMDMwWhgPMjAzMDEyMTcyMzU5NTlaMHUxCzAJBgNVBAYTAkVFMSIwIAYDVQQKDBlB
+UyBTZXJ0aWZpdHNlZXJpbWlza2Vza3VzMSgwJgYDVQQDDB9FRSBDZXJ0aWZpY2F0aW9uIENlbnRy
+ZSBSb290IENBMRgwFgYJKoZIhvcNAQkBFglwa2lAc2suZWUwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQDIIMDs4MVLqwd4lfNE7vsLDP90jmG7sWLqI9iroWUyeuuOF0+W2Ap7kaJjbMeM
+TC55v6kF/GlclY1i+blw7cNRfdCT5mzrMEvhvH2/UpvObntl8jixwKIy72KyaOBhU8E2lf/slLo2
+rpwcpzIP5Xy0xm90/XsY6KxX7QYgSzIwWFv9zajmofxwvI6Sc9uXp3whrj3B9UiHbCe9nyV0gVWw
+93X2PaRka9ZP585ArQ/dMtO8ihJTmMmJ+xAdTX7Nfh9WDSFwhfYggx/2uh8Ej+p3iDXE/+pOoYtN
+P2MbRMNE1CV2yreN1x5KZmTNXMWcg+HCCIia7E6j8T4cLNlsHaFLAgMBAAGjgYowgYcwDwYDVR0T
+AQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFBLyWj7qVhy/zQas8fElyalL1BSZ
+MEUGA1UdJQQ+MDwGCCsGAQUFBwMCBggrBgEFBQcDAQYIKwYBBQUHAwMGCCsGAQUFBwMEBggrBgEF
+BQcDCAYIKwYBBQUHAwkwDQYJKoZIhvcNAQEFBQADggEBAHv25MANqhlHt01Xo/6tu7Fq1Q+e2+Rj
+xY6hUFaTlrg4wCQiZrxTFGGVv9DHKpY5P30osxBAIWrEr7BSdxjhlthWXePdNl4dp1BUoMUq5KqM
+lIpPnTX/dqQGE5Gion0ARD9V04I8GtVbvFZMIi5GQ4okQC3zErg7cBqklrkar4dBGmoYDQZPxz5u
+uSlNDUmJEYcyW+ZLBMjkXOZ0c5RdFpgTlf7727FE5TpwrDdr5rMzcijJs1eg9gIWiAYLtqZLICjU
+3j2LrTcFU3T+bsy8QxdxXvnFzBqpYe73dgzzcvRyrc9yAjYHR8/vGVCJYMzpJJUPwssd8m92kMfM
+dcGWxZ0=
+-----END CERTIFICATE-----
+
+TURKTRUST Certificate Services Provider Root 2007
+=================================================
+-----BEGIN CERTIFICATE-----
+MIIEPTCCAyWgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBvzE/MD0GA1UEAww2VMOcUktUUlVTVCBF
+bGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxMQswCQYDVQQGEwJUUjEP
+MA0GA1UEBwwGQW5rYXJhMV4wXAYDVQQKDFVUw5xSS1RSVVNUIEJpbGdpIMSwbGV0acWfaW0gdmUg
+QmlsacWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWeLiAoYykgQXJhbMSxayAyMDA3MB4X
+DTA3MTIyNTE4MzcxOVoXDTE3MTIyMjE4MzcxOVowgb8xPzA9BgNVBAMMNlTDnFJLVFJVU1QgRWxl
+a3Ryb25payBTZXJ0aWZpa2EgSGl6bWV0IFNhxJ9sYXnEsWPEsXPEsTELMAkGA1UEBhMCVFIxDzAN
+BgNVBAcMBkFua2FyYTFeMFwGA1UECgxVVMOcUktUUlVTVCBCaWxnaSDEsGxldGnFn2ltIHZlIEJp
+bGnFn2ltIEfDvHZlbmxpxJ9pIEhpem1ldGxlcmkgQS7Fni4gKGMpIEFyYWzEsWsgMjAwNzCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKu3PgqMyKVYFeaK7yc9SrToJdPNM8Ig3BnuiD9N
+YvDdE3ePYakqtdTyuTFYKTsvP2qcb3N2Je40IIDu6rfwxArNK4aUyeNgsURSsloptJGXg9i3phQv
+KUmi8wUG+7RP2qFsmmaf8EMJyupyj+sA1zU511YXRxcw9L6/P8JorzZAwan0qafoEGsIiveGHtya
+KhUG9qPw9ODHFNRRf8+0222vR5YXm3dx2KdxnSQM9pQ/hTEST7ruToK4uT6PIzdezKKqdfcYbwnT
+rqdUKDT74eA7YH2gvnmJhsifLfkKS8RQouf9eRbHegsYz85M733WB2+Y8a+xwXrXgTW4qhe04MsC
+AwEAAaNCMEAwHQYDVR0OBBYEFCnFkKslrxHkYb+j/4hhkeYO/pyBMA4GA1UdDwEB/wQEAwIBBjAP
+BgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAQDdr4Ouwo0RSVgrESLFF6QSU2TJ/s
+Px+EnWVUXKgWAkD6bho3hO9ynYYKVZ1WKKxmLNA6VpM0ByWtCLCPyA8JWcqdmBzlVPi5RX9ql2+I
+aE1KBiY3iAIOtsbWcpnOa3faYjGkVh+uX4132l32iPwa2Z61gfAyuOOI0JzzaqC5mxRZNTZPz/OO
+Xl0XrRWV2N2y1RVuAE6zS89mlOTgzbUF2mNXi+WzqtvALhyQRNsaXRik7r4EW5nVcV9VZWRi1aKb
+BFmGyGJ353yCRWo9F7/snXUMrqNvWtMvmDb08PUZqxFdyKbjKlhqQgnDvZImZjINXQhVdP+MmNAK
+poRq0Tl9
+-----END CERTIFICATE-----
+
+D-TRUST Root Class 3 CA 2 2009
+==============================
+-----BEGIN CERTIFICATE-----
+MIIEMzCCAxugAwIBAgIDCYPzMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNVBAYTAkRFMRUwEwYDVQQK
+DAxELVRydXN0IEdtYkgxJzAlBgNVBAMMHkQtVFJVU1QgUm9vdCBDbGFzcyAzIENBIDIgMjAwOTAe
+Fw0wOTExMDUwODM1NThaFw0yOTExMDUwODM1NThaME0xCzAJBgNVBAYTAkRFMRUwEwYDVQQKDAxE
+LVRydXN0IEdtYkgxJzAlBgNVBAMMHkQtVFJVU1QgUm9vdCBDbGFzcyAzIENBIDIgMjAwOTCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANOySs96R+91myP6Oi/WUEWJNTrGa9v+2wBoqOAD
+ER03UAifTUpolDWzU9GUY6cgVq/eUXjsKj3zSEhQPgrfRlWLJ23DEE0NkVJD2IfgXU42tSHKXzlA
+BF9bfsyjxiupQB7ZNoTWSPOSHjRGICTBpFGOShrvUD9pXRl/RcPHAY9RySPocq60vFYJfxLLHLGv
+KZAKyVXMD9O0Gu1HNVpK7ZxzBCHQqr0ME7UAyiZsxGsMlFqVlNpQmvH/pStmMaTJOKDfHR+4CS7z
+p+hnUquVH+BGPtikw8paxTGA6Eian5Rp/hnd2HN8gcqW3o7tszIFZYQ05ub9VxC1X3a/L7AQDcUC
+AwEAAaOCARowggEWMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFP3aFMSfMN4hvR5COfyrYyNJ
+4PGEMA4GA1UdDwEB/wQEAwIBBjCB0wYDVR0fBIHLMIHIMIGAoH6gfIZ6bGRhcDovL2RpcmVjdG9y
+eS5kLXRydXN0Lm5ldC9DTj1ELVRSVVNUJTIwUm9vdCUyMENsYXNzJTIwMyUyMENBJTIwMiUyMDIw
+MDksTz1ELVRydXN0JTIwR21iSCxDPURFP2NlcnRpZmljYXRlcmV2b2NhdGlvbmxpc3QwQ6BBoD+G
+PWh0dHA6Ly93d3cuZC10cnVzdC5uZXQvY3JsL2QtdHJ1c3Rfcm9vdF9jbGFzc18zX2NhXzJfMjAw
+OS5jcmwwDQYJKoZIhvcNAQELBQADggEBAH+X2zDI36ScfSF6gHDOFBJpiBSVYEQBrLLpME+bUMJm
+2H6NMLVwMeniacfzcNsgFYbQDfC+rAF1hM5+n02/t2A7nPPKHeJeaNijnZflQGDSNiH+0LS4F9p0
+o3/U37CYAqxva2ssJSRyoWXuJVrl5jLn8t+rSfrzkGkj2wTZ51xY/GXUl77M/C4KzCUqNQT4YJEV
+dT1B/yMfGchs64JTBKbkTCJNjYy6zltz7GRUUG3RnFX7acM2w4y8PIWmawomDeCTmGCufsYkl4ph
+X5GOZpIJhzbNi5stPvZR1FDUWSi9g/LMKHtThm3YJohw1+qRzT65ysCQblrGXnRl11z+o+I=
+-----END CERTIFICATE-----
+
+D-TRUST Root Class 3 CA 2 EV 2009
+=================================
+-----BEGIN CERTIFICATE-----
+MIIEQzCCAyugAwIBAgIDCYP0MA0GCSqGSIb3DQEBCwUAMFAxCzAJBgNVBAYTAkRFMRUwEwYDVQQK
+DAxELVRydXN0IEdtYkgxKjAoBgNVBAMMIUQtVFJVU1QgUm9vdCBDbGFzcyAzIENBIDIgRVYgMjAw
+OTAeFw0wOTExMDUwODUwNDZaFw0yOTExMDUwODUwNDZaMFAxCzAJBgNVBAYTAkRFMRUwEwYDVQQK
+DAxELVRydXN0IEdtYkgxKjAoBgNVBAMMIUQtVFJVU1QgUm9vdCBDbGFzcyAzIENBIDIgRVYgMjAw
+OTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJnxhDRwui+3MKCOvXwEz75ivJn9gpfS
+egpnljgJ9hBOlSJzmY3aFS3nBfwZcyK3jpgAvDw9rKFs+9Z5JUut8Mxk2og+KbgPCdM03TP1YtHh
+zRnp7hhPTFiu4h7WDFsVWtg6uMQYZB7jM7K1iXdODL/ZlGsTl28So/6ZqQTMFexgaDbtCHu39b+T
+7WYxg4zGcTSHThfqr4uRjRxWQa4iN1438h3Z0S0NL2lRp75mpoo6Kr3HGrHhFPC+Oh25z1uxav60
+sUYgovseO3Dvk5h9jHOW8sXvhXCtKSb8HgQ+HKDYD8tSg2J87otTlZCpV6LqYQXY+U3EJ/pure35
+11H3a6UCAwEAAaOCASQwggEgMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFNOUikxiEyoZLsyv
+cop9NteaHNxnMA4GA1UdDwEB/wQEAwIBBjCB3QYDVR0fBIHVMIHSMIGHoIGEoIGBhn9sZGFwOi8v
+ZGlyZWN0b3J5LmQtdHJ1c3QubmV0L0NOPUQtVFJVU1QlMjBSb290JTIwQ2xhc3MlMjAzJTIwQ0El
+MjAyJTIwRVYlMjAyMDA5LE89RC1UcnVzdCUyMEdtYkgsQz1ERT9jZXJ0aWZpY2F0ZXJldm9jYXRp
+b25saXN0MEagRKBChkBodHRwOi8vd3d3LmQtdHJ1c3QubmV0L2NybC9kLXRydXN0X3Jvb3RfY2xh
+c3NfM19jYV8yX2V2XzIwMDkuY3JsMA0GCSqGSIb3DQEBCwUAA4IBAQA07XtaPKSUiO8aEXUHL7P+
+PPoeUSbrh/Yp3uDx1MYkCenBz1UbtDDZzhr+BlGmFaQt77JLvyAoJUnRpjZ3NOhk31KxEcdzes05
+nsKtjHEh8lprr988TlWvsoRlFIm5d8sqMb7Po23Pb0iUMkZv53GMoKaEGTcH8gNFCSuGdXzfX2lX
+ANtu2KZyIktQ1HWYVt+3GP9DQ1CuekR78HlR10M9p9OB0/DJT7naxpeG0ILD5EJt/rDiZE4OJudA
+NCa1CInXCGNjOCd1HjPqbqjdn5lPdE2BiYBL3ZqXKVwvvoFBuYz/6n1gBp7N1z3TLqMVvKjmJuVv
+w9y4AyHqnxbxLFS1
+-----END CERTIFICATE-----
+
+PSCProcert
+==========
+-----BEGIN CERTIFICATE-----
+MIIJhjCCB26gAwIBAgIBCzANBgkqhkiG9w0BAQsFADCCAR4xPjA8BgNVBAMTNUF1dG9yaWRhZCBk
+ZSBDZXJ0aWZpY2FjaW9uIFJhaXogZGVsIEVzdGFkbyBWZW5lem9sYW5vMQswCQYDVQQGEwJWRTEQ
+MA4GA1UEBxMHQ2FyYWNhczEZMBcGA1UECBMQRGlzdHJpdG8gQ2FwaXRhbDE2MDQGA1UEChMtU2lz
+dGVtYSBOYWNpb25hbCBkZSBDZXJ0aWZpY2FjaW9uIEVsZWN0cm9uaWNhMUMwQQYDVQQLEzpTdXBl
+cmludGVuZGVuY2lhIGRlIFNlcnZpY2lvcyBkZSBDZXJ0aWZpY2FjaW9uIEVsZWN0cm9uaWNhMSUw
+IwYJKoZIhvcNAQkBFhZhY3JhaXpAc3VzY2VydGUuZ29iLnZlMB4XDTEwMTIyODE2NTEwMFoXDTIw
+MTIyNTIzNTk1OVowgdExJjAkBgkqhkiG9w0BCQEWF2NvbnRhY3RvQHByb2NlcnQubmV0LnZlMQ8w
+DQYDVQQHEwZDaGFjYW8xEDAOBgNVBAgTB01pcmFuZGExKjAoBgNVBAsTIVByb3ZlZWRvciBkZSBD
+ZXJ0aWZpY2Fkb3MgUFJPQ0VSVDE2MDQGA1UEChMtU2lzdGVtYSBOYWNpb25hbCBkZSBDZXJ0aWZp
+Y2FjaW9uIEVsZWN0cm9uaWNhMQswCQYDVQQGEwJWRTETMBEGA1UEAxMKUFNDUHJvY2VydDCCAiIw
+DQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANW39KOUM6FGqVVhSQ2oh3NekS1wwQYalNo97BVC
+wfWMrmoX8Yqt/ICV6oNEolt6Vc5Pp6XVurgfoCfAUFM+jbnADrgV3NZs+J74BCXfgI8Qhd19L3uA
+3VcAZCP4bsm+lU/hdezgfl6VzbHvvnpC2Mks0+saGiKLt38GieU89RLAu9MLmV+QfI4tL3czkkoh
+RqipCKzx9hEC2ZUWno0vluYC3XXCFCpa1sl9JcLB/KpnheLsvtF8PPqv1W7/U0HU9TI4seJfxPmO
+EO8GqQKJ/+MMbpfg353bIdD0PghpbNjU5Db4g7ayNo+c7zo3Fn2/omnXO1ty0K+qP1xmk6wKImG2
+0qCZyFSTXai20b1dCl53lKItwIKOvMoDKjSuc/HUtQy9vmebVOvh+qBa7Dh+PsHMosdEMXXqP+UH
+0quhJZb25uSgXTcYOWEAM11G1ADEtMo88aKjPvM6/2kwLkDd9p+cJsmWN63nOaK/6mnbVSKVUyqU
+td+tFjiBdWbjxywbk5yqjKPK2Ww8F22c3HxT4CAnQzb5EuE8XL1mv6JpIzi4mWCZDlZTOpx+FIyw
+Bm/xhnaQr/2v/pDGj59/i5IjnOcVdo/Vi5QTcmn7K2FjiO/mpF7moxdqWEfLcU8UC17IAggmosvp
+r2uKGcfLFFb14dq12fy/czja+eevbqQ34gcnAgMBAAGjggMXMIIDEzASBgNVHRMBAf8ECDAGAQH/
+AgEBMDcGA1UdEgQwMC6CD3N1c2NlcnRlLmdvYi52ZaAbBgVghl4CAqASDBBSSUYtRy0yMDAwNDAz
+Ni0wMB0GA1UdDgQWBBRBDxk4qpl/Qguk1yeYVKIXTC1RVDCCAVAGA1UdIwSCAUcwggFDgBStuyId
+xuDSAaj9dlBSk+2YwU2u06GCASakggEiMIIBHjE+MDwGA1UEAxM1QXV0b3JpZGFkIGRlIENlcnRp
+ZmljYWNpb24gUmFpeiBkZWwgRXN0YWRvIFZlbmV6b2xhbm8xCzAJBgNVBAYTAlZFMRAwDgYDVQQH
+EwdDYXJhY2FzMRkwFwYDVQQIExBEaXN0cml0byBDYXBpdGFsMTYwNAYDVQQKEy1TaXN0ZW1hIE5h
+Y2lvbmFsIGRlIENlcnRpZmljYWNpb24gRWxlY3Ryb25pY2ExQzBBBgNVBAsTOlN1cGVyaW50ZW5k
+ZW5jaWEgZGUgU2VydmljaW9zIGRlIENlcnRpZmljYWNpb24gRWxlY3Ryb25pY2ExJTAjBgkqhkiG
+9w0BCQEWFmFjcmFpekBzdXNjZXJ0ZS5nb2IudmWCAQowDgYDVR0PAQH/BAQDAgEGME0GA1UdEQRG
+MESCDnByb2NlcnQubmV0LnZloBUGBWCGXgIBoAwMClBTQy0wMDAwMDKgGwYFYIZeAgKgEgwQUklG
+LUotMzE2MzUzNzMtNzB2BgNVHR8EbzBtMEagRKBChkBodHRwOi8vd3d3LnN1c2NlcnRlLmdvYi52
+ZS9sY3IvQ0VSVElGSUNBRE8tUkFJWi1TSEEzODRDUkxERVIuY3JsMCOgIaAfhh1sZGFwOi8vYWNy
+YWl6LnN1c2NlcnRlLmdvYi52ZTA3BggrBgEFBQcBAQQrMCkwJwYIKwYBBQUHMAGGG2h0dHA6Ly9v
+Y3NwLnN1c2NlcnRlLmdvYi52ZTBBBgNVHSAEOjA4MDYGBmCGXgMBAjAsMCoGCCsGAQUFBwIBFh5o
+dHRwOi8vd3d3LnN1c2NlcnRlLmdvYi52ZS9kcGMwDQYJKoZIhvcNAQELBQADggIBACtZ6yKZu4Sq
+T96QxtGGcSOeSwORR3C7wJJg7ODU523G0+1ng3dS1fLld6c2suNUvtm7CpsR72H0xpkzmfWvADmN
+g7+mvTV+LFwxNG9s2/NkAZiqlCxB3RWGymspThbASfzXg0gTB1GEMVKIu4YXx2sviiCtxQuPcD4q
+uxtxj7mkoP3YldmvWb8lK5jpY5MvYB7Eqvh39YtsL+1+LrVPQA3uvFd359m21D+VJzog1eWuq2w1
+n8GhHVnchIHuTQfiSLaeS5UtQbHh6N5+LwUeaO6/u5BlOsju6rEYNxxik6SgMexxbJHmpHmJWhSn
+FFAFTKQAVzAswbVhltw+HoSvOULP5dAssSS830DD7X9jSr3hTxJkhpXzsOfIt+FTvZLm8wyWuevo
+5pLtp4EJFAv8lXrPj9Y0TzYS3F7RNHXGRoAvlQSMx4bEqCaJqD8Zm4G7UaRKhqsLEQ+xrmNTbSjq
+3TNWOByyrYDT13K9mmyZY+gAu0F2BbdbmRiKw7gSXFbPVgx96OLP7bx0R/vu0xdOIk9W/1DzLuY5
+poLWccret9W6aAjtmcz9opLLabid+Qqkpj5PkygqYWwHJgD/ll9ohri4zspV4KuxPX+Y1zMOWj3Y
+eMLEYC/HYvBhkdI4sPaeVdtAgAUSM84dkpvRabP/v/GSCmE1P93+hvS84Bpxs2Km
+-----END CERTIFICATE-----
+
+China Internet Network Information Center EV Certificates Root
+==============================================================
+-----BEGIN CERTIFICATE-----
+MIID9zCCAt+gAwIBAgIESJ8AATANBgkqhkiG9w0BAQUFADCBijELMAkGA1UEBhMCQ04xMjAwBgNV
+BAoMKUNoaW5hIEludGVybmV0IE5ldHdvcmsgSW5mb3JtYXRpb24gQ2VudGVyMUcwRQYDVQQDDD5D
+aGluYSBJbnRlcm5ldCBOZXR3b3JrIEluZm9ybWF0aW9uIENlbnRlciBFViBDZXJ0aWZpY2F0ZXMg
+Um9vdDAeFw0xMDA4MzEwNzExMjVaFw0zMDA4MzEwNzExMjVaMIGKMQswCQYDVQQGEwJDTjEyMDAG
+A1UECgwpQ2hpbmEgSW50ZXJuZXQgTmV0d29yayBJbmZvcm1hdGlvbiBDZW50ZXIxRzBFBgNVBAMM
+PkNoaW5hIEludGVybmV0IE5ldHdvcmsgSW5mb3JtYXRpb24gQ2VudGVyIEVWIENlcnRpZmljYXRl
+cyBSb290MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAm35z7r07eKpkQ0H1UN+U8i6y
+jUqORlTSIRLIOTJCBumD1Z9S7eVnAztUwYyZmczpwA//DdmEEbK40ctb3B75aDFk4Zv6dOtouSCV
+98YPjUesWgbdYavi7NifFy2cyjw1l1VxzUOFsUcW9SxTgHbP0wBkvUCZ3czY28Sf1hNfQYOL+Q2H
+klY0bBoQCxfVWhyXWIQ8hBouXJE0bhlffxdpxWXvayHG1VA6v2G5BY3vbzQ6sm8UY78WO5upKv23
+KzhmBsUs4qpnHkWnjQRmQvaPK++IIGmPMowUc9orhpFjIpryp9vOiYurXccUwVswah+xt54ugQEC
+7c+WXmPbqOY4twIDAQABo2MwYTAfBgNVHSMEGDAWgBR8cks5x8DbYqVPm6oYNJKiyoOCWTAPBgNV
+HRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUfHJLOcfA22KlT5uqGDSSosqD
+glkwDQYJKoZIhvcNAQEFBQADggEBACrDx0M3j92tpLIM7twUbY8opJhJywyA6vPtI2Z1fcXTIWd5
+0XPFtQO3WKwMVC/GVhMPMdoG52U7HW8228gd+f2ABsqjPWYWqJ1MFn3AlUa1UeTiH9fqBk1jjZaM
+7+czV0I664zBechNdn3e9rG3geCg+aF4RhcaVpjwTj2rHO3sOdwHSPdj/gauwqRcalsyiMXHM4Ws
+ZkJHwlgkmeHlPuV1LI5D1l08eB6olYIpUNHRFrrvwb562bTYzB5MRuF3sTGrvSrIzo9uoV1/A3U0
+5K2JRVRevq4opbs/eHnrc7MKDf2+yfdWrPa37S+bISnHOLaVxATywy39FCqQmbkHzJ8=
+-----END CERTIFICATE-----
+
+Swisscom Root CA 2
+==================
+-----BEGIN CERTIFICATE-----
+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
+5OfNeOI5wSsSnqaeG8XmDtkx2Q==
+-----END CERTIFICATE-----
+
+Swisscom Root EV CA 2
+=====================
+-----BEGIN CERTIFICATE-----
+MIIF4DCCA8igAwIBAgIRAPL6ZOJ0Y9ON/RAdBB92ylgwDQYJKoZIhvcNAQELBQAwZzELMAkGA1UE
+BhMCY2gxETAPBgNVBAoTCFN3aXNzY29tMSUwIwYDVQQLExxEaWdpdGFsIENlcnRpZmljYXRlIFNl
+cnZpY2VzMR4wHAYDVQQDExVTd2lzc2NvbSBSb290IEVWIENBIDIwHhcNMTEwNjI0MDk0NTA4WhcN
+MzEwNjI1MDg0NTA4WjBnMQswCQYDVQQGEwJjaDERMA8GA1UEChMIU3dpc3Njb20xJTAjBgNVBAsT
+HERpZ2l0YWwgQ2VydGlmaWNhdGUgU2VydmljZXMxHjAcBgNVBAMTFVN3aXNzY29tIFJvb3QgRVYg
+Q0EgMjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMT3HS9X6lds93BdY7BxUglgRCgz
+o3pOCvrY6myLURYaVa5UJsTMRQdBTxB5f3HSek4/OE6zAMaVylvNwSqD1ycfMQ4jFrclyxy0uYAy
+Xhqdk/HoPGAsp15XGVhRXrwsVgu42O+LgrQ8uMIkqBPHoCE2G3pXKSinLr9xJZDzRINpUKTk4Rti
+GZQJo/PDvO/0vezbE53PnUgJUmfANykRHvvSEaeFGHR55E+FFOtSN+KxRdjMDUN/rhPSays/p8Li
+qG12W0OfvrSdsyaGOx9/5fLoZigWJdBLlzin5M8J0TbDC77aO0RYjb7xnglrPvMyxyuHxuxenPaH
+Za0zKcQvidm5y8kDnftslFGXEBuGCxobP/YCfnvUxVFkKJ3106yDgYjTdLRZncHrYTNaRdHLOdAG
+alNgHa/2+2m8atwBz735j9m9W8E6X47aD0upm50qKGsaCnw8qyIL5XctcfaCNYGu+HuB5ur+rPQa
+m3Rc6I8k9l2dRsQs0h4rIWqDJ2dVSqTjyDKXZpBy2uPUZC5f46Fq9mDU5zXNysRojddxyNMkM3Ox
+bPlq4SjbX8Y96L5V5jcb7STZDxmPX2MYWFCBUWVv8p9+agTnNCRxunZLWB4ZvRVgRaoMEkABnRDi
+xzgHcgplwLa7JSnaFp6LNYth7eVxV4O1PHGf40+/fh6Bn0GXAgMBAAGjgYYwgYMwDgYDVR0PAQH/
+BAQDAgGGMB0GA1UdIQQWMBQwEgYHYIV0AVMCAgYHYIV0AVMCAjASBgNVHRMBAf8ECDAGAQH/AgED
+MB0GA1UdDgQWBBRF2aWBbj2ITY1x0kbBbkUe88SAnTAfBgNVHSMEGDAWgBRF2aWBbj2ITY1x0kbB
+bkUe88SAnTANBgkqhkiG9w0BAQsFAAOCAgEAlDpzBp9SSzBc1P6xXCX5145v9Ydkn+0UjrgEjihL
+j6p7jjm02Vj2e6E1CqGdivdj5eu9OYLU43otb98TPLr+flaYC/NUn81ETm484T4VvwYmneTwkLbU
+wp4wLh/vx3rEUMfqe9pQy3omywC0Wqu1kx+AiYQElY2NfwmTv9SoqORjbdlk5LgpWgi/UOGED1V7
+XwgiG/W9mR4U9s70WBCCswo9GcG/W6uqmdjyMb3lOGbcWAXH7WMaLgqXfIeTK7KK4/HsGOV1timH
+59yLGn602MnTihdsfSlEvoqq9X46Lmgxk7lq2prg2+kupYTNHAq4Sgj5nPFhJpiTt3tm7JFe3VE/
+23MPrQRYCd0EApUKPtN236YQHoA96M2kZNEzx5LH4k5E4wnJTsJdhw4Snr8PyQUQ3nqjsTzyP6Wq
+J3mtMX0f/fwZacXduT98zca0wjAefm6S139hdlqP65VNvBFuIXxZN5nQBrz5Bm0yFqXZaajh3DyA
+HmBR3NdUIR7KYndP+tiPsys6DXhyyWhBWkdKwqPrGtcKqzwyVcgKEZzfdNbwQBUdyLmPtTbFr/gi
+uMod89a2GQ+fYWVq6nTIfI/DT11lgh/ZDYnadXL77/FHZxOzyNEZiCcmmpl5fx7kLD977vHeTYuW
+l8PVP3wbI+2ksx0WckNLIOFZfsLorSa/ovc=
+-----END CERTIFICATE-----
+
+CA Disig Root R1
+================
+-----BEGIN CERTIFICATE-----
+MIIFaTCCA1GgAwIBAgIJAMMDmu5QkG4oMA0GCSqGSIb3DQEBBQUAMFIxCzAJBgNVBAYTAlNLMRMw
+EQYDVQQHEwpCcmF0aXNsYXZhMRMwEQYDVQQKEwpEaXNpZyBhLnMuMRkwFwYDVQQDExBDQSBEaXNp
+ZyBSb290IFIxMB4XDTEyMDcxOTA5MDY1NloXDTQyMDcxOTA5MDY1NlowUjELMAkGA1UEBhMCU0sx
+EzARBgNVBAcTCkJyYXRpc2xhdmExEzARBgNVBAoTCkRpc2lnIGEucy4xGTAXBgNVBAMTEENBIERp
+c2lnIFJvb3QgUjEwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCqw3j33Jijp1pedxiy
+3QRkD2P9m5YJgNXoqqXinCaUOuiZc4yd39ffg/N4T0Dhf9Kn0uXKE5Pn7cZ3Xza1lK/oOI7bm+V8
+u8yN63Vz4STN5qctGS7Y1oprFOsIYgrY3LMATcMjfF9DCCMyEtztDK3AfQ+lekLZWnDZv6fXARz2
+m6uOt0qGeKAeVjGu74IKgEH3G8muqzIm1Cxr7X1r5OJeIgpFy4QxTaz+29FHuvlglzmxZcfe+5nk
+CiKxLU3lSCZpq+Kq8/v8kiky6bM+TR8noc2OuRf7JT7JbvN32g0S9l3HuzYQ1VTW8+DiR0jm3hTa
+YVKvJrT1cU/J19IG32PK/yHoWQbgCNWEFVP3Q+V8xaCJmGtzxmjOZd69fwX3se72V6FglcXM6pM6
+vpmumwKjrckWtc7dXpl4fho5frLABaTAgqWjR56M6ly2vGfb5ipN0gTco65F97yLnByn1tUD3AjL
+LhbKXEAz6GfDLuemROoRRRw1ZS0eRWEkG4IupZ0zXWX4Qfkuy5Q/H6MMMSRE7cderVC6xkGbrPAX
+ZcD4XW9boAo0PO7X6oifmPmvTiT6l7Jkdtqr9O3jw2Dv1fkCyC2fg69naQanMVXVz0tv/wQFx1is
+XxYb5dKj6zHbHzMVTdDypVP1y+E9Tmgt2BLdqvLmTZtJ5cUoobqwWsagtQIDAQABo0IwQDAPBgNV
+HRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUiQq0OJMa5qvum5EY+fU8PjXQ
+04IwDQYJKoZIhvcNAQEFBQADggIBADKL9p1Kyb4U5YysOMo6CdQbzoaz3evUuii+Eq5FLAR0rBNR
+xVgYZk2C2tXck8An4b58n1KeElb21Zyp9HWc+jcSjxyT7Ff+Bw+r1RL3D65hXlaASfX8MPWbTx9B
+LxyE04nH4toCdu0Jz2zBuByDHBb6lM19oMgY0sidbvW9adRtPTXoHqJPYNcHKfyyo6SdbhWSVhlM
+CrDpfNIZTUJG7L399ldb3Zh+pE3McgODWF3vkzpBemOqfDqo9ayk0d2iLbYq/J8BjuIQscTK5Gfb
+VSUZP/3oNn6z4eGBrxEWi1CXYBmCAMBrTXO40RMHPuq2MU/wQppt4hF05ZSsjYSVPCGvxdpHyN85
+YmLLW1AL14FABZyb7bq2ix4Eb5YgOe2kfSnbSM6C3NQCjR0EMVrHS/BsYVLXtFHCgWzN4funodKS
+ds+xDzdYpPJScWc/DIh4gInByLUfkmO+p3qKViwaqKactV2zY9ATIKHrkWzQjX2v3wvkF7mGnjix
+lAxYjOBVqjtjbZqJYLhkKpLGN/R+Q0O3c+gB53+XD9fyexn9GtePyfqFa3qdnom2piiZk4hA9z7N
+UaPK6u95RyG1/jLix8NRb76AdPCkwzryT+lf3xkK8jsTQ6wxpLPn6/wY1gGp8yqPNg7rtLG8t0zJ
+a7+h89n07eLw4+1knj0vllJPgFOL
+-----END CERTIFICATE-----
+
+CA Disig Root R2
+================
+-----BEGIN CERTIFICATE-----
+MIIFaTCCA1GgAwIBAgIJAJK4iNuwisFjMA0GCSqGSIb3DQEBCwUAMFIxCzAJBgNVBAYTAlNLMRMw
+EQYDVQQHEwpCcmF0aXNsYXZhMRMwEQYDVQQKEwpEaXNpZyBhLnMuMRkwFwYDVQQDExBDQSBEaXNp
+ZyBSb290IFIyMB4XDTEyMDcxOTA5MTUzMFoXDTQyMDcxOTA5MTUzMFowUjELMAkGA1UEBhMCU0sx
+EzARBgNVBAcTCkJyYXRpc2xhdmExEzARBgNVBAoTCkRpc2lnIGEucy4xGTAXBgNVBAMTEENBIERp
+c2lnIFJvb3QgUjIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCio8QACdaFXS1tFPbC
+w3OeNcJxVX6B+6tGUODBfEl45qt5WDza/3wcn9iXAng+a0EE6UG9vgMsRfYvZNSrXaNHPWSb6Wia
+xswbP7q+sos0Ai6YVRn8jG+qX9pMzk0DIaPY0jSTVpbLTAwAFjxfGs3Ix2ymrdMxp7zo5eFm1tL7
+A7RBZckQrg4FY8aAamkw/dLukO8NJ9+flXP04SXabBbeQTg06ov80egEFGEtQX6sx3dOy1FU+16S
+GBsEWmjGycT6txOgmLcRK7fWV8x8nhfRyyX+hk4kLlYMeE2eARKmK6cBZW58Yh2EhN/qwGu1pSqV
+g8NTEQxzHQuyRpDRQjrOQG6Vrf/GlK1ul4SOfW+eioANSW1z4nuSHsPzwfPrLgVv2RvPN3YEyLRa
+5Beny912H9AZdugsBbPWnDTYltxhh5EF5EQIM8HauQhl1K6yNg3ruji6DOWbnuuNZt2Zz9aJQfYE
+koopKW1rOhzndX0CcQ7zwOe9yxndnWCywmZgtrEE7snmhrmaZkCo5xHtgUUDi/ZnWejBBhG93c+A
+Ak9lQHhcR1DIm+YfgXvkRKhbhZri3lrVx/k6RGZL5DJUfORsnLMOPReisjQS1n6yqEm70XooQL6i
+Fh/f5DcfEXP7kAplQ6INfPgGAVUzfbANuPT1rqVCV3w2EYx7XsQDnYx5nQIDAQABo0IwQDAPBgNV
+HRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUtZn4r7CU9eMg1gqtzk5WpC5u
+Qu0wDQYJKoZIhvcNAQELBQADggIBACYGXnDnZTPIgm7ZnBc6G3pmsgH2eDtpXi/q/075KMOYKmFM
+tCQSin1tERT3nLXK5ryeJ45MGcipvXrA1zYObYVybqjGom32+nNjf7xueQgcnYqfGopTpti72TVV
+sRHFqQOzVju5hJMiXn7B9hJSi+osZ7z+Nkz1uM/Rs0mSO9MpDpkblvdhuDvEK7Z4bLQjb/D907Je
+dR+Zlais9trhxTF7+9FGs9K8Z7RiVLoJ92Owk6Ka+elSLotgEqv89WBW7xBci8QaQtyDW2QOy7W8
+1k/BfDxujRNt+3vrMNDcTa/F1balTFtxyegxvug4BkihGuLq0t4SOVga/4AOgnXmt8kHbA7v/zjx
+mHHEt38OFdAlab0inSvtBfZGR6ztwPDUO+Ls7pZbkBNOHlY667DvlruWIxG68kOGdGSVyCh13x01
+utI3gzhTODY7z2zp+WsO0PsE6E9312UBeIYMej4hYvF/Y3EMyZ9E26gnonW+boE+18DrG5gPcFw0
+sorMwIUY6256s/daoQe/qUKS82Ail+QUoQebTnbAjn39pCXHR+3/H3OszMOl6W8KjptlwlCFtaOg
+UxLMVYdh84GuEEZhvUQhuMI9dM9+JDX6HAcOmz0iyu8xL4ysEr3vQCj8KWefshNPZiTEUxnpHikV
+7+ZtsH8tZ/3zbBt1RqPlShfppNcL
+-----END CERTIFICATE-----
+
+ACCVRAIZ1
+=========
+-----BEGIN CERTIFICATE-----
+MIIH0zCCBbugAwIBAgIIXsO3pkN/pOAwDQYJKoZIhvcNAQEFBQAwQjESMBAGA1UEAwwJQUNDVlJB
+SVoxMRAwDgYDVQQLDAdQS0lBQ0NWMQ0wCwYDVQQKDARBQ0NWMQswCQYDVQQGEwJFUzAeFw0xMTA1
+MDUwOTM3MzdaFw0zMDEyMzEwOTM3MzdaMEIxEjAQBgNVBAMMCUFDQ1ZSQUlaMTEQMA4GA1UECwwH
+UEtJQUNDVjENMAsGA1UECgwEQUNDVjELMAkGA1UEBhMCRVMwggIiMA0GCSqGSIb3DQEBAQUAA4IC
+DwAwggIKAoICAQCbqau/YUqXry+XZpp0X9DZlv3P4uRm7x8fRzPCRKPfmt4ftVTdFXxpNRFvu8gM
+jmoYHtiP2Ra8EEg2XPBjs5BaXCQ316PWywlxufEBcoSwfdtNgM3802/J+Nq2DoLSRYWoG2ioPej0
+RGy9ocLLA76MPhMAhN9KSMDjIgro6TenGEyxCQ0jVn8ETdkXhBilyNpAlHPrzg5XPAOBOp0KoVdD
+aaxXbXmQeOW1tDvYvEyNKKGno6e6Ak4l0Squ7a4DIrhrIA8wKFSVf+DuzgpmndFALW4ir50awQUZ
+0m/A8p/4e7MCQvtQqR0tkw8jq8bBD5L/0KIV9VMJcRz/RROE5iZe+OCIHAr8Fraocwa48GOEAqDG
+WuzndN9wrqODJerWx5eHk6fGioozl2A3ED6XPm4pFdahD9GILBKfb6qkxkLrQaLjlUPTAYVtjrs7
+8yM2x/474KElB0iryYl0/wiPgL/AlmXz7uxLaL2diMMxs0Dx6M/2OLuc5NF/1OVYm3z61PMOm3WR
+5LpSLhl+0fXNWhn8ugb2+1KoS5kE3fj5tItQo05iifCHJPqDQsGH+tUtKSpacXpkatcnYGMN285J
+9Y0fkIkyF/hzQ7jSWpOGYdbhdQrqeWZ2iE9x6wQl1gpaepPluUsXQA+xtrn13k/c4LOsOxFwYIRK
+Q26ZIMApcQrAZQIDAQABo4ICyzCCAscwfQYIKwYBBQUHAQEEcTBvMEwGCCsGAQUFBzAChkBodHRw
+Oi8vd3d3LmFjY3YuZXMvZmlsZWFkbWluL0FyY2hpdm9zL2NlcnRpZmljYWRvcy9yYWl6YWNjdjEu
+Y3J0MB8GCCsGAQUFBzABhhNodHRwOi8vb2NzcC5hY2N2LmVzMB0GA1UdDgQWBBTSh7Tj3zcnk1X2
+VuqB5TbMjB4/vTAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFNKHtOPfNyeTVfZW6oHlNsyM
+Hj+9MIIBcwYDVR0gBIIBajCCAWYwggFiBgRVHSAAMIIBWDCCASIGCCsGAQUFBwICMIIBFB6CARAA
+QQB1AHQAbwByAGkAZABhAGQAIABkAGUAIABDAGUAcgB0AGkAZgBpAGMAYQBjAGkA8wBuACAAUgBh
+AO0AegAgAGQAZQAgAGwAYQAgAEEAQwBDAFYAIAAoAEEAZwBlAG4AYwBpAGEAIABkAGUAIABUAGUA
+YwBuAG8AbABvAGcA7QBhACAAeQAgAEMAZQByAHQAaQBmAGkAYwBhAGMAaQDzAG4AIABFAGwAZQBj
+AHQAcgDzAG4AaQBjAGEALAAgAEMASQBGACAAUQA0ADYAMAAxADEANQA2AEUAKQAuACAAQwBQAFMA
+IABlAG4AIABoAHQAdABwADoALwAvAHcAdwB3AC4AYQBjAGMAdgAuAGUAczAwBggrBgEFBQcCARYk
+aHR0cDovL3d3dy5hY2N2LmVzL2xlZ2lzbGFjaW9uX2MuaHRtMFUGA1UdHwROMEwwSqBIoEaGRGh0
+dHA6Ly93d3cuYWNjdi5lcy9maWxlYWRtaW4vQXJjaGl2b3MvY2VydGlmaWNhZG9zL3JhaXphY2N2
+MV9kZXIuY3JsMA4GA1UdDwEB/wQEAwIBBjAXBgNVHREEEDAOgQxhY2N2QGFjY3YuZXMwDQYJKoZI
+hvcNAQEFBQADggIBAJcxAp/n/UNnSEQU5CmH7UwoZtCPNdpNYbdKl02125DgBS4OxnnQ8pdpD70E
+R9m+27Up2pvZrqmZ1dM8MJP1jaGo/AaNRPTKFpV8M9xii6g3+CfYCS0b78gUJyCpZET/LtZ1qmxN
+YEAZSUNUY9rizLpm5U9EelvZaoErQNV/+QEnWCzI7UiRfD+mAM/EKXMRNt6GGT6d7hmKG9Ww7Y49
+nCrADdg9ZuM8Db3VlFzi4qc1GwQA9j9ajepDvV+JHanBsMyZ4k0ACtrJJ1vnE5Bc5PUzolVt3OAJ
+TS+xJlsndQAJxGJ3KQhfnlmstn6tn1QwIgPBHnFk/vk4CpYY3QIUrCPLBhwepH2NDd4nQeit2hW3
+sCPdK6jT2iWH7ehVRE2I9DZ+hJp4rPcOVkkO1jMl1oRQQmwgEh0q1b688nCBpHBgvgW1m54ERL5h
+I6zppSSMEYCUWqKiuUnSwdzRp+0xESyeGabu4VXhwOrPDYTkF7eifKXeVSUG7szAh1xA2syVP1Xg
+Nce4hL60Xc16gwFy7ofmXx2utYXGJt/mwZrpHgJHnyqobalbz+xFd3+YJ5oyXSrjhO7FmGYvliAd
+3djDJ9ew+f7Zfc3Qn48LFFhRny+Lwzgt3uiP1o2HpPVWQxaZLPSkVrQ0uGE3ycJYgBugl6H8WY3p
+EfbRD0tVNEYqi4Y7
+-----END CERTIFICATE-----
+
+TWCA Global Root CA
+===================
+-----BEGIN CERTIFICATE-----
+MIIFQTCCAymgAwIBAgICDL4wDQYJKoZIhvcNAQELBQAwUTELMAkGA1UEBhMCVFcxEjAQBgNVBAoT
+CVRBSVdBTi1DQTEQMA4GA1UECxMHUm9vdCBDQTEcMBoGA1UEAxMTVFdDQSBHbG9iYWwgUm9vdCBD
+QTAeFw0xMjA2MjcwNjI4MzNaFw0zMDEyMzExNTU5NTlaMFExCzAJBgNVBAYTAlRXMRIwEAYDVQQK
+EwlUQUlXQU4tQ0ExEDAOBgNVBAsTB1Jvb3QgQ0ExHDAaBgNVBAMTE1RXQ0EgR2xvYmFsIFJvb3Qg
+Q0EwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCwBdvI64zEbooh745NnHEKH1Jw7W2C
+nJfF10xORUnLQEK1EjRsGcJ0pDFfhQKX7EMzClPSnIyOt7h52yvVavKOZsTuKwEHktSz0ALfUPZV
+r2YOy+BHYC8rMjk1Ujoog/h7FsYYuGLWRyWRzvAZEk2tY/XTP3VfKfChMBwqoJimFb3u/Rk28OKR
+Q4/6ytYQJ0lM793B8YVwm8rqqFpD/G2Gb3PpN0Wp8DbHzIh1HrtsBv+baz4X7GGqcXzGHaL3SekV
+tTzWoWH1EfcFbx39Eb7QMAfCKbAJTibc46KokWofwpFFiFzlmLhxpRUZyXx1EcxwdE8tmx2RRP1W
+KKD+u4ZqyPpcC1jcxkt2yKsi2XMPpfRaAok/T54igu6idFMqPVMnaR1sjjIsZAAmY2E2TqNGtz99
+sy2sbZCilaLOz9qC5wc0GZbpuCGqKX6mOL6OKUohZnkfs8O1CWfe1tQHRvMq2uYiN2DLgbYPoA/p
+yJV/v1WRBXrPPRXAb94JlAGD1zQbzECl8LibZ9WYkTunhHiVJqRaCPgrdLQABDzfuBSO6N+pjWxn
+kjMdwLfS7JLIvgm/LCkFbwJrnu+8vyq8W8BQj0FwcYeyTbcEqYSjMq+u7msXi7Kx/mzhkIyIqJdI
+zshNy/MGz19qCkKxHh53L46g5pIOBvwFItIm4TFRfTLcDwIDAQABoyMwITAOBgNVHQ8BAf8EBAMC
+AQYwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAgEAXzSBdu+WHdXltdkCY4QWwa6g
+cFGn90xHNcgL1yg9iXHZqjNB6hQbbCEAwGxCGX6faVsgQt+i0trEfJdLjbDorMjupWkEmQqSpqsn
+LhpNgb+E1HAerUf+/UqdM+DyucRFCCEK2mlpc3INvjT+lIutwx4116KD7+U4x6WFH6vPNOw/KP4M
+8VeGTslV9xzU2KV9Bnpv1d8Q34FOIWWxtuEXeZVFBs5fzNxGiWNoRI2T9GRwoD2dKAXDOXC4Ynsg
+/eTb6QihuJ49CcdP+yz4k3ZB3lLg4VfSnQO8d57+nile98FRYB/e2guyLXW3Q0iT5/Z5xoRdgFlg
+lPx4mI88k1HtQJAH32RjJMtOcQWh15QaiDLxInQirqWm2BJpTGCjAu4r7NRjkgtevi92a6O2JryP
+A9gK8kxkRr05YuWW6zRjESjMlfGt7+/cgFhI6Uu46mWs6fyAtbXIRfmswZ/ZuepiiI7E8UuDEq3m
+i4TWnsLrgxifarsbJGAzcMzs9zLzXNl5fe+epP7JI8Mk7hWSsT2RTyaGvWZzJBPqpK5jwa19hAM8
+EHiGG3njxPPyBJUgriOCxLM6AGK/5jYk4Ve6xx6QddVfP5VhK8E7zeWzaGHQRiapIVJpLesux+t3
+zqY6tQMzT3bR51xUAV3LePTJDL/PEo4XLSNolOer/qmyKwbQBM0=
+-----END CERTIFICATE-----
+
+TeliaSonera Root CA v1
+======================
+-----BEGIN CERTIFICATE-----
+MIIFODCCAyCgAwIBAgIRAJW+FqD3LkbxezmCcvqLzZYwDQYJKoZIhvcNAQEFBQAwNzEUMBIGA1UE
+CgwLVGVsaWFTb25lcmExHzAdBgNVBAMMFlRlbGlhU29uZXJhIFJvb3QgQ0EgdjEwHhcNMDcxMDE4
+MTIwMDUwWhcNMzIxMDE4MTIwMDUwWjA3MRQwEgYDVQQKDAtUZWxpYVNvbmVyYTEfMB0GA1UEAwwW
+VGVsaWFTb25lcmEgUm9vdCBDQSB2MTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMK+
+6yfwIaPzaSZVfp3FVRaRXP3vIb9TgHot0pGMYzHw7CTww6XScnwQbfQ3t+XmfHnqjLWCi65ItqwA
+3GV17CpNX8GH9SBlK4GoRz6JI5UwFpB/6FcHSOcZrr9FZ7E3GwYq/t75rH2D+1665I+XZ75Ljo1k
+B1c4VWk0Nj0TSO9P4tNmHqTPGrdeNjPUtAa9GAH9d4RQAEX1jF3oI7x+/jXh7VB7qTCNGdMJjmhn
+Xb88lxhTuylixcpecsHHltTbLaC0H2kD7OriUPEMPPCs81Mt8Bz17Ww5OXOAFshSsCPN4D7c3TxH
+oLs1iuKYaIu+5b9y7tL6pe0S7fyYGKkmdtwoSxAgHNN/Fnct7W+A90m7UwW7XWjH1Mh1Fj+JWov3
+F0fUTPHSiXk+TT2YqGHeOh7S+F4D4MHJHIzTjU3TlTazN19jY5szFPAtJmtTfImMMsJu7D0hADnJ
+oWjiUIMusDor8zagrC/kb2HCUQk5PotTubtn2txTuXZZNp1D5SDgPTJghSJRt8czu90VL6R4pgd7
+gUY2BIbdeTXHlSw7sKMXNeVzH7RcWe/a6hBle3rQf5+ztCo3O3CLm1u5K7fsslESl1MpWtTwEhDc
+TwK7EpIvYtQ/aUN8Ddb8WHUBiJ1YFkveupD/RwGJBmr2X7KQarMCpgKIv7NHfirZ1fpoeDVNAgMB
+AAGjPzA9MA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0PBAQDAgEGMB0GA1UdDgQWBBTwj1k4ALP1j5qW
+DNXr+nuqF+gTEjANBgkqhkiG9w0BAQUFAAOCAgEAvuRcYk4k9AwI//DTDGjkk0kiP0Qnb7tt3oNm
+zqjMDfz1mgbldxSR651Be5kqhOX//CHBXfDkH1e3damhXwIm/9fH907eT/j3HEbAek9ALCI18Bmx
+0GtnLLCo4MBANzX2hFxc469CeP6nyQ1Q6g2EdvZR74NTxnr/DlZJLo961gzmJ1TjTQpgcmLNkQfW
+pb/ImWvtxBnmq0wROMVvMeJuScg/doAmAyYp4Db29iBT4xdwNBedY2gea+zDTYa4EzAvXUYNR0PV
+G6pZDrlcjQZIrXSHX8f8MVRBE+LHIQ6e4B4N4cB7Q4WQxYpYxmUKeFfyxiMPAdkgS94P+5KFdSpc
+c41teyWRyu5FrgZLAMzTsVlQ2jqIOylDRl6XK1TOU2+NSueW+r9xDkKLfP0ooNBIytrEgUy7onOT
+JsjrDNYmiLbAJM+7vVvrdX3pCI6GMyx5dwlppYn8s3CQh3aP0yK7Qs69cwsgJirQmz1wHiRszYd2
+qReWt88NkvuOGKmYSdGe/mBEciG5Ge3C9THxOUiIkCR1VBatzvT4aRRkOfujuLpwQMcnHL/EVlP6
+Y2XQ8xwOFvVrhlhNGNTkDY6lnVuR3HYkUD/GKvvZt5y11ubQ2egZixVxSK236thZiNSQvxaz2ems
+WWFUyBy6ysHK4bkgTI86k4mloMy/0/Z1pHWWbVY=
+-----END CERTIFICATE-----
+
+E-Tugra Certification Authority
+===============================
+-----BEGIN CERTIFICATE-----
+MIIGSzCCBDOgAwIBAgIIamg+nFGby1MwDQYJKoZIhvcNAQELBQAwgbIxCzAJBgNVBAYTAlRSMQ8w
+DQYDVQQHDAZBbmthcmExQDA+BgNVBAoMN0UtVHXEn3JhIEVCRyBCaWxpxZ9pbSBUZWtub2xvamls
+ZXJpIHZlIEhpem1ldGxlcmkgQS7Fni4xJjAkBgNVBAsMHUUtVHVncmEgU2VydGlmaWthc3lvbiBN
+ZXJrZXppMSgwJgYDVQQDDB9FLVR1Z3JhIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTEzMDMw
+NTEyMDk0OFoXDTIzMDMwMzEyMDk0OFowgbIxCzAJBgNVBAYTAlRSMQ8wDQYDVQQHDAZBbmthcmEx
+QDA+BgNVBAoMN0UtVHXEn3JhIEVCRyBCaWxpxZ9pbSBUZWtub2xvamlsZXJpIHZlIEhpem1ldGxl
+cmkgQS7Fni4xJjAkBgNVBAsMHUUtVHVncmEgU2VydGlmaWthc3lvbiBNZXJrZXppMSgwJgYDVQQD
+DB9FLVR1Z3JhIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIICIjANBgkqhkiG9w0BAQEFAAOCAg8A
+MIICCgKCAgEA4vU/kwVRHoViVF56C/UYB4Oufq9899SKa6VjQzm5S/fDxmSJPZQuVIBSOTkHS0vd
+hQd2h8y/L5VMzH2nPbxHD5hw+IyFHnSOkm0bQNGZDbt1bsipa5rAhDGvykPL6ys06I+XawGb1Q5K
+CKpbknSFQ9OArqGIW66z6l7LFpp3RMih9lRozt6Plyu6W0ACDGQXwLWTzeHxE2bODHnv0ZEoq1+g
+ElIwcxmOj+GMB6LDu0rw6h8VqO4lzKRG+Bsi77MOQ7osJLjFLFzUHPhdZL3Dk14opz8n8Y4e0ypQ
+BaNV2cvnOVPAmJ6MVGKLJrD3fY185MaeZkJVgkfnsliNZvcHfC425lAcP9tDJMW/hkd5s3kc91r0
+E+xs+D/iWR+V7kI+ua2oMoVJl0b+SzGPWsutdEcf6ZG33ygEIqDUD13ieU/qbIWGvaimzuT6w+Gz
+rt48Ue7LE3wBf4QOXVGUnhMMti6lTPk5cDZvlsouDERVxcr6XQKj39ZkjFqzAQqptQpHF//vkUAq
+jqFGOjGY5RH8zLtJVor8udBhmm9lbObDyz51Sf6Pp+KJxWfXnUYTTjF2OySznhFlhqt/7x3U+Lzn
+rFpct1pHXFXOVbQicVtbC/DP3KBhZOqp12gKY6fgDT+gr9Oq0n7vUaDmUStVkhUXU8u3Zg5mTPj5
+dUyQ5xJwx0UCAwEAAaNjMGEwHQYDVR0OBBYEFC7j27JJ0JxUeVz6Jyr+zE7S6E5UMA8GA1UdEwEB
+/wQFMAMBAf8wHwYDVR0jBBgwFoAULuPbsknQnFR5XPonKv7MTtLoTlQwDgYDVR0PAQH/BAQDAgEG
+MA0GCSqGSIb3DQEBCwUAA4ICAQAFNzr0TbdF4kV1JI+2d1LoHNgQk2Xz8lkGpD4eKexd0dCrfOAK
+kEh47U6YA5n+KGCRHTAduGN8qOY1tfrTYXbm1gdLymmasoR6d5NFFxWfJNCYExL/u6Au/U5Mh/jO
+XKqYGwXgAEZKgoClM4so3O0409/lPun++1ndYYRP0lSWE2ETPo+Aab6TR7U1Q9Jauz1c77NCR807
+VRMGsAnb/WP2OogKmW9+4c4bU2pEZiNRCHu8W1Ki/QY3OEBhj0qWuJA3+GbHeJAAFS6LrVE1Uweo
+a2iu+U48BybNCAVwzDk/dr2l02cmAYamU9JgO3xDf1WKvJUawSg5TB9D0pH0clmKuVb8P7Sd2nCc
+dlqMQ1DujjByTd//SffGqWfZbawCEeI6FiWnWAjLb1NBnEg4R2gz0dfHj9R0IdTDBZB6/86WiLEV
+KV0jq9BgoRJP3vQXzTLlyb/IQ639Lo7xr+L0mPoSHyDYwKcMhcWQ9DstliaxLL5Mq+ux0orJ23gT
+Dx4JnW2PAJ8C2sH6H3p6CcRK5ogql5+Ji/03X186zjhZhkuvcQu02PJwT58yE+Owp1fl2tpDy4Q0
+8ijE6m30Ku/Ba3ba+367hTzSU8JNvnHhRdH9I2cNE3X7z2VnIp2usAnRCf8dNL/+I5c30jn6PQ0G
+C7TbO6Orb1wdtn7os4I07QZcJA==
+-----END CERTIFICATE-----
+
+T-TeleSec GlobalRoot Class 2
+============================
+-----BEGIN CERTIFICATE-----
+MIIDwzCCAqugAwIBAgIBATANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UEBhMCREUxKzApBgNVBAoM
+IlQtU3lzdGVtcyBFbnRlcnByaXNlIFNlcnZpY2VzIEdtYkgxHzAdBgNVBAsMFlQtU3lzdGVtcyBU
+cnVzdCBDZW50ZXIxJTAjBgNVBAMMHFQtVGVsZVNlYyBHbG9iYWxSb290IENsYXNzIDIwHhcNMDgx
+MDAxMTA0MDE0WhcNMzMxMDAxMjM1OTU5WjCBgjELMAkGA1UEBhMCREUxKzApBgNVBAoMIlQtU3lz
+dGVtcyBFbnRlcnByaXNlIFNlcnZpY2VzIEdtYkgxHzAdBgNVBAsMFlQtU3lzdGVtcyBUcnVzdCBD
+ZW50ZXIxJTAjBgNVBAMMHFQtVGVsZVNlYyBHbG9iYWxSb290IENsYXNzIDIwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQCqX9obX+hzkeXaXPSi5kfl82hVYAUdAqSzm1nzHoqvNK38DcLZ
+SBnuaY/JIPwhqgcZ7bBcrGXHX+0CfHt8LRvWurmAwhiCFoT6ZrAIxlQjgeTNuUk/9k9uN0goOA/F
+vudocP05l03Sx5iRUKrERLMjfTlH6VJi1hKTXrcxlkIF+3anHqP1wvzpesVsqXFP6st4vGCvx970
+2cu+fjOlbpSD8DT6IavqjnKgP6TeMFvvhk1qlVtDRKgQFRzlAVfFmPHmBiiRqiDFt1MmUUOyCxGV
+WOHAD3bZwI18gfNycJ5v/hqO2V81xrJvNHy+SE/iWjnX2J14np+GPgNeGYtEotXHAgMBAAGjQjBA
+MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBS/WSA2AHmgoCJrjNXy
+YdK4LMuCSjANBgkqhkiG9w0BAQsFAAOCAQEAMQOiYQsfdOhyNsZt+U2e+iKo4YFWz827n+qrkRk4
+r6p8FU3ztqONpfSO9kSpp+ghla0+AGIWiPACuvxhI+YzmzB6azZie60EI4RYZeLbK4rnJVM3YlNf
+vNoBYimipidx5joifsFvHZVwIEoHNN/q/xWA5brXethbdXwFeilHfkCoMRN3zUA7tFFHei4R40cR
+3p1m0IvVVGb6g1XqfMIpiRvpb7PO4gWEyS8+eIVibslfwXhjdFjASBgMmTnrpMwatXlajRWc2BQN
+9noHV8cigwUtPJslJj0Ys6lDfMjIq2SPDqO/nBudMNva0Bkuqjzx+zOAduTNrRlPBSeOE6Fuwg==
+-----END CERTIFICATE-----
+
+Atos TrustedRoot 2011
+=====================
+-----BEGIN CERTIFICATE-----
+MIIDdzCCAl+gAwIBAgIIXDPLYixfszIwDQYJKoZIhvcNAQELBQAwPDEeMBwGA1UEAwwVQXRvcyBU
+cnVzdGVkUm9vdCAyMDExMQ0wCwYDVQQKDARBdG9zMQswCQYDVQQGEwJERTAeFw0xMTA3MDcxNDU4
+MzBaFw0zMDEyMzEyMzU5NTlaMDwxHjAcBgNVBAMMFUF0b3MgVHJ1c3RlZFJvb3QgMjAxMTENMAsG
+A1UECgwEQXRvczELMAkGA1UEBhMCREUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCV
+hTuXbyo7LjvPpvMpNb7PGKw+qtn4TaA+Gke5vJrf8v7MPkfoepbCJI419KkM/IL9bcFyYie96mvr
+54rMVD6QUM+A1JX76LWC1BTFtqlVJVfbsVD2sGBkWXppzwO3bw2+yj5vdHLqqjAqc2K+SZFhyBH+
+DgMq92og3AIVDV4VavzjgsG1xZ1kCWyjWZgHJ8cblithdHFsQ/H3NYkQ4J7sVaE3IqKHBAUsR320
+HLliKWYoyrfhk/WklAOZuXCFteZI6o1Q/NnezG8HDt0Lcp2AMBYHlT8oDv3FdU9T1nSatCQujgKR
+z3bFmx5VdJx4IbHwLfELn8LVlhgf8FQieowHAgMBAAGjfTB7MB0GA1UdDgQWBBSnpQaxLKYJYO7R
+l+lwrrw7GWzbITAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFKelBrEspglg7tGX6XCuvDsZ
+bNshMBgGA1UdIAQRMA8wDQYLKwYBBAGwLQMEAQEwDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEB
+CwUAA4IBAQAmdzTblEiGKkGdLD4GkGDEjKwLVLgfuXvTBznk+j57sj1O7Z8jvZfza1zv7v1Apt+h
+k6EKhqzvINB5Ab149xnYJDE0BAGmuhWawyfc2E8PzBhj/5kPDpFrdRbhIfzYJsdHt6bPWHJxfrrh
+TZVHO8mvbaG0weyJ9rQPOLXiZNwlz6bb65pcmaHFCN795trV1lpFDMS3wrUU77QR/w4VtfX128a9
+61qn8FYiqTxlVMYVqL2Gns2Dlmh6cYGJ4Qvh6hEbaAjMaZ7snkGeRDImeuKHCnE96+RapNLbxc3G
+3mB/ufNPRJLvKrcYPqcZ2Qt9sTdBQrC6YB3y/gkRsPCHe6ed
+-----END CERTIFICATE-----
+
+QuoVadis Root CA 1 G3
+=====================
+-----BEGIN CERTIFICATE-----
+MIIFYDCCA0igAwIBAgIUeFhfLq0sGUvjNwc1NBMotZbUZZMwDQYJKoZIhvcNAQELBQAwSDELMAkG
+A1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHjAcBgNVBAMTFVF1b1ZhZGlzIFJv
+b3QgQ0EgMSBHMzAeFw0xMjAxMTIxNzI3NDRaFw00MjAxMTIxNzI3NDRaMEgxCzAJBgNVBAYTAkJN
+MRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMR4wHAYDVQQDExVRdW9WYWRpcyBSb290IENBIDEg
+RzMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCgvlAQjunybEC0BJyFuTHK3C3kEakE
+PBtVwedYMB0ktMPvhd6MLOHBPd+C5k+tR4ds7FtJwUrVu4/sh6x/gpqG7D0DmVIB0jWerNrwU8lm
+PNSsAgHaJNM7qAJGr6Qc4/hzWHa39g6QDbXwz8z6+cZM5cOGMAqNF34168Xfuw6cwI2H44g4hWf6
+Pser4BOcBRiYz5P1sZK0/CPTz9XEJ0ngnjybCKOLXSoh4Pw5qlPafX7PGglTvF0FBM+hSo+LdoIN
+ofjSxxR3W5A2B4GbPgb6Ul5jxaYA/qXpUhtStZI5cgMJYr2wYBZupt0lwgNm3fME0UDiTouG9G/l
+g6AnhF4EwfWQvTA9xO+oabw4m6SkltFi2mnAAZauy8RRNOoMqv8hjlmPSlzkYZqn0ukqeI1RPToV
+7qJZjqlc3sX5kCLliEVx3ZGZbHqfPT2YfF72vhZooF6uCyP8Wg+qInYtyaEQHeTTRCOQiJ/GKubX
+9ZqzWB4vMIkIG1SitZgj7Ah3HJVdYdHLiZxfokqRmu8hqkkWCKi9YSgxyXSthfbZxbGL0eUQMk1f
+iyA6PEkfM4VZDdvLCXVDaXP7a3F98N/ETH3Goy7IlXnLc6KOTk0k+17kBL5yG6YnLUlamXrXXAkg
+t3+UuU/xDRxeiEIbEbfnkduebPRq34wGmAOtzCjvpUfzUwIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
+AQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUo5fW816iEOGrRZ88F2Q87gFwnMwwDQYJKoZI
+hvcNAQELBQADggIBABj6W3X8PnrHX3fHyt/PX8MSxEBd1DKquGrX1RUVRpgjpeaQWxiZTOOtQqOC
+MTaIzen7xASWSIsBx40Bz1szBpZGZnQdT+3Btrm0DWHMY37XLneMlhwqI2hrhVd2cDMT/uFPpiN3
+GPoajOi9ZcnPP/TJF9zrx7zABC4tRi9pZsMbj/7sPtPKlL92CiUNqXsCHKnQO18LwIE6PWThv6ct
+Tr1NxNgpxiIY0MWscgKCP6o6ojoilzHdCGPDdRS5YCgtW2jgFqlmgiNR9etT2DGbe+m3nUvriBbP
++V04ikkwj+3x6xn0dxoxGE1nVGwvb2X52z3sIexe9PSLymBlVNFxZPT5pqOBMzYzcfCkeF9OrYMh
+3jRJjehZrJ3ydlo28hP0r+AJx2EqbPfgna67hkooby7utHnNkDPDs3b69fBsnQGQ+p6Q9pxyz0fa
+wx/kNSBT8lTR32GDpgLiJTjehTItXnOQUl1CxM49S+H5GYQd1aJQzEH7QRTDvdbJWqNjZgKAvQU6
+O0ec7AAmTPWIUb+oI38YB7AL7YsmoWTTYUrrXJ/es69nA7Mf3W1daWhpq1467HxpvMc7hU6eFbm0
+FU/DlXpY18ls6Wy58yljXrQs8C097Vpl4KlbQMJImYFtnh8GKjwStIsPm6Ik8KaN1nrgS7ZklmOV
+hMJKzRwuJIczYOXD
+-----END CERTIFICATE-----
+
+QuoVadis Root CA 2 G3
+=====================
+-----BEGIN CERTIFICATE-----
+MIIFYDCCA0igAwIBAgIURFc0JFuBiZs18s64KztbpybwdSgwDQYJKoZIhvcNAQELBQAwSDELMAkG
+A1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHjAcBgNVBAMTFVF1b1ZhZGlzIFJv
+b3QgQ0EgMiBHMzAeFw0xMjAxMTIxODU5MzJaFw00MjAxMTIxODU5MzJaMEgxCzAJBgNVBAYTAkJN
+MRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMR4wHAYDVQQDExVRdW9WYWRpcyBSb290IENBIDIg
+RzMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQChriWyARjcV4g/Ruv5r+LrI3HimtFh
+ZiFfqq8nUeVuGxbULX1QsFN3vXg6YOJkApt8hpvWGo6t/x8Vf9WVHhLL5hSEBMHfNrMWn4rjyduY
+NM7YMxcoRvynyfDStNVNCXJJ+fKH46nafaF9a7I6JaltUkSs+L5u+9ymc5GQYaYDFCDy54ejiK2t
+oIz/pgslUiXnFgHVy7g1gQyjO/Dh4fxaXc6AcW34Sas+O7q414AB+6XrW7PFXmAqMaCvN+ggOp+o
+MiwMzAkd056OXbxMmO7FGmh77FOm6RQ1o9/NgJ8MSPsc9PG/Srj61YxxSscfrf5BmrODXfKEVu+l
+V0POKa2Mq1W/xPtbAd0jIaFYAI7D0GoT7RPjEiuA3GfmlbLNHiJuKvhB1PLKFAeNilUSxmn1uIZo
+L1NesNKqIcGY5jDjZ1XHm26sGahVpkUG0CM62+tlXSoREfA7T8pt9DTEceT/AFr2XK4jYIVz8eQQ
+sSWu1ZK7E8EM4DnatDlXtas1qnIhO4M15zHfeiFuuDIIfR0ykRVKYnLP43ehvNURG3YBZwjgQQvD
+6xVu+KQZ2aKrr+InUlYrAoosFCT5v0ICvybIxo/gbjh9Uy3l7ZizlWNof/k19N+IxWA1ksB8aRxh
+lRbQ694Lrz4EEEVlWFA4r0jyWbYW8jwNkALGcC4BrTwV1wIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
+AQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU7edvdlq/YOxJW8ald7tyFnGbxD0wDQYJKoZI
+hvcNAQELBQADggIBAJHfgD9DCX5xwvfrs4iP4VGyvD11+ShdyLyZm3tdquXK4Qr36LLTn91nMX66
+AarHakE7kNQIXLJgapDwyM4DYvmL7ftuKtwGTTwpD4kWilhMSA/ohGHqPHKmd+RCroijQ1h5fq7K
+pVMNqT1wvSAZYaRsOPxDMuHBR//47PERIjKWnML2W2mWeyAMQ0GaW/ZZGYjeVYg3UQt4XAoeo0L9
+x52ID8DyeAIkVJOviYeIyUqAHerQbj5hLja7NQ4nlv1mNDthcnPxFlxHBlRJAHpYErAK74X9sbgz
+dWqTHBLmYF5vHX/JHyPLhGGfHoJE+V+tYlUkmlKY7VHnoX6XOuYvHxHaU4AshZ6rNRDbIl9qxV6X
+U/IyAgkwo1jwDQHVcsaxfGl7w/U2Rcxhbl5MlMVerugOXou/983g7aEOGzPuVBj+D77vfoRrQ+Nw
+mNtddbINWQeFFSM51vHfqSYP1kjHs6Yi9TM3WpVHn3u6GBVv/9YUZINJ0gpnIdsPNWNgKCLjsZWD
+zYWm3S8P52dSbrsvhXz1SnPnxT7AvSESBT/8twNJAlvIJebiVDj1eYeMHVOyToV7BjjHLPj4sHKN
+JeV3UvQDHEimUF+IIDBu8oJDqz2XhOdT+yHBTw8imoa4WSr2Rz0ZiC3oheGe7IUIarFsNMkd7Egr
+O3jtZsSOeWmD3n+M
+-----END CERTIFICATE-----
+
+QuoVadis Root CA 3 G3
+=====================
+-----BEGIN CERTIFICATE-----
+MIIFYDCCA0igAwIBAgIULvWbAiin23r/1aOp7r0DoM8Sah0wDQYJKoZIhvcNAQELBQAwSDELMAkG
+A1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHjAcBgNVBAMTFVF1b1ZhZGlzIFJv
+b3QgQ0EgMyBHMzAeFw0xMjAxMTIyMDI2MzJaFw00MjAxMTIyMDI2MzJaMEgxCzAJBgNVBAYTAkJN
+MRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMR4wHAYDVQQDExVRdW9WYWRpcyBSb290IENBIDMg
+RzMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCzyw4QZ47qFJenMioKVjZ/aEzHs286
+IxSR/xl/pcqs7rN2nXrpixurazHb+gtTTK/FpRp5PIpM/6zfJd5O2YIyC0TeytuMrKNuFoM7pmRL
+Mon7FhY4futD4tN0SsJiCnMK3UmzV9KwCoWdcTzeo8vAMvMBOSBDGzXRU7Ox7sWTaYI+FrUoRqHe
+6okJ7UO4BUaKhvVZR74bbwEhELn9qdIoyhA5CcoTNs+cra1AdHkrAj80//ogaX3T7mH1urPnMNA3
+I4ZyYUUpSFlob3emLoG+B01vr87ERRORFHAGjx+f+IdpsQ7vw4kZ6+ocYfx6bIrc1gMLnia6Et3U
+VDmrJqMz6nWB2i3ND0/kA9HvFZcba5DFApCTZgIhsUfei5pKgLlVj7WiL8DWM2fafsSntARE60f7
+5li59wzweyuxwHApw0BiLTtIadwjPEjrewl5qW3aqDCYz4ByA4imW0aucnl8CAMhZa634RylsSqi
+Md5mBPfAdOhx3v89WcyWJhKLhZVXGqtrdQtEPREoPHtht+KPZ0/l7DxMYIBpVzgeAVuNVejH38DM
+dyM0SXV89pgR6y3e7UEuFAUCf+D+IOs15xGsIs5XPd7JMG0QA4XN8f+MFrXBsj6IbGB/kE+V9/Yt
+rQE5BwT6dYB9v0lQ7e/JxHwc64B+27bQ3RP+ydOc17KXqQIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
+AQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUxhfQvKjqAkPyGwaZXSuQILnXnOQwDQYJKoZI
+hvcNAQELBQADggIBADRh2Va1EodVTd2jNTFGu6QHcrxfYWLopfsLN7E8trP6KZ1/AvWkyaiTt3px
+KGmPc+FSkNrVvjrlt3ZqVoAh313m6Tqe5T72omnHKgqwGEfcIHB9UqM+WXzBusnIFUBhynLWcKzS
+t/Ac5IYp8M7vaGPQtSCKFWGafoaYtMnCdvvMujAWzKNhxnQT5WvvoxXqA/4Ti2Tk08HS6IT7SdEQ
+TXlm66r99I0xHnAUrdzeZxNMgRVhvLfZkXdxGYFgu/BYpbWcC/ePIlUnwEsBbTuZDdQdm2NnL9Du
+DcpmvJRPpq3t/O5jrFc/ZSXPsoaP0Aj/uHYUbt7lJ+yreLVTubY/6CD50qi+YUbKh4yE8/nxoGib
+Ih6BJpsQBJFxwAYf3KDTuVan45gtf4Od34wrnDKOMpTwATwiKp9Dwi7DmDkHOHv8XgBCH/MyJnmD
+hPbl8MFREsALHgQjDFSlTC9JxUrRtm5gDWv8a4uFJGS3iQ6rJUdbPM9+Sb3H6QrG2vd+DhcI00iX
+0HGS8A85PjRqHH3Y8iKuu2n0M7SmSFXRDw4m6Oy2Cy2nhTXN/VnIn9HNPlopNLk9hM6xZdRZkZFW
+dSHBd575euFgndOtBBj0fOtek49TSiIp+EgrPk2GrFt/ywaZWWDYWGWVjUTR939+J399roD1B0y2
+PpxxVJkES/1Y+Zj0
+-----END CERTIFICATE-----
+
+DigiCert Assured ID Root G2
+===========================
+-----BEGIN CERTIFICATE-----
+MIIDljCCAn6gAwIBAgIQC5McOtY5Z+pnI7/Dr5r0SzANBgkqhkiG9w0BAQsFADBlMQswCQYDVQQG
+EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSQw
+IgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgRzIwHhcNMTMwODAxMTIwMDAwWhcNMzgw
+MTE1MTIwMDAwWjBlMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQL
+ExB3d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgRzIw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDZ5ygvUj82ckmIkzTz+GoeMVSAn61UQbVH
+35ao1K+ALbkKz3X9iaV9JPrjIgwrvJUXCzO/GU1BBpAAvQxNEP4HteccbiJVMWWXvdMX0h5i89vq
+bFCMP4QMls+3ywPgym2hFEwbid3tALBSfK+RbLE4E9HpEgjAALAcKxHad3A2m67OeYfcgnDmCXRw
+VWmvo2ifv922ebPynXApVfSr/5Vh88lAbx3RvpO704gqu52/clpWcTs/1PPRCv4o76Pu2ZmvA9OP
+YLfykqGxvYmJHzDNw6YuYjOuFgJ3RFrngQo8p0Quebg/BLxcoIfhG69Rjs3sLPr4/m3wOnyqi+Rn
+lTGNAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMB0GA1UdDgQWBBTO
+w0q5mVXyuNtgv6l+vVa1lzan1jANBgkqhkiG9w0BAQsFAAOCAQEAyqVVjOPIQW5pJ6d1Ee88hjZv
+0p3GeDgdaZaikmkuOGybfQTUiaWxMTeKySHMq2zNixya1r9I0jJmwYrA8y8678Dj1JGG0VDjA9tz
+d29KOVPt3ibHtX2vK0LRdWLjSisCx1BL4GnilmwORGYQRI+tBev4eaymG+g3NJ1TyWGqolKvSnAW
+hsI6yLETcDbYz+70CjTVW0z9B5yiutkBclzzTcHdDrEcDcRjvq30FPuJ7KJBDkzMyFdA0G4Dqs0M
+jomZmWzwPDCvON9vvKO+KSAnq3T/EyJ43pdSVR6DtVQgA+6uwE9W3jfMw3+qBCe703e4YtsXfJwo
+IhNzbM8m9Yop5w==
+-----END CERTIFICATE-----
+
+DigiCert Assured ID Root G3
+===========================
+-----BEGIN CERTIFICATE-----
+MIICRjCCAc2gAwIBAgIQC6Fa+h3foLVJRK/NJKBs7DAKBggqhkjOPQQDAzBlMQswCQYDVQQGEwJV
+UzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSQwIgYD
+VQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgRzMwHhcNMTMwODAxMTIwMDAwWhcNMzgwMTE1
+MTIwMDAwWjBlMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
+d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgRzMwdjAQ
+BgcqhkjOPQIBBgUrgQQAIgNiAAQZ57ysRGXtzbg/WPuNsVepRC0FFfLvC/8QdJ+1YlJfZn4f5dwb
+RXkLzMZTCp2NXQLZqVneAlr2lSoOjThKiknGvMYDOAdfVdp+CW7if17QRSAPWXYQ1qAk8C3eNvJs
+KTmjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMB0GA1UdDgQWBBTL0L2p4ZgF
+UaFNN6KDec6NHSrkhDAKBggqhkjOPQQDAwNnADBkAjAlpIFFAmsSS3V0T8gj43DydXLefInwz5Fy
+YZ5eEJJZVrmDxxDnOOlYJjZ91eQ0hjkCMHw2U/Aw5WJjOpnitqM7mzT6HtoQknFekROn3aRukswy
+1vUhZscv6pZjamVFkpUBtA==
+-----END CERTIFICATE-----
+
+DigiCert Global Root G2
+=======================
+-----BEGIN CERTIFICATE-----
+MIIDjjCCAnagAwIBAgIQAzrx5qcRqaC7KGSxHQn65TANBgkqhkiG9w0BAQsFADBhMQswCQYDVQQG
+EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSAw
+HgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBHMjAeFw0xMzA4MDExMjAwMDBaFw0zODAxMTUx
+MjAwMDBaMGExCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3
+dy5kaWdpY2VydC5jb20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IEcyMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuzfNNNx7a8myaJCtSnX/RrohCgiN9RlUyfuI2/Ou8jqJ
+kTx65qsGGmvPrC3oXgkkRLpimn7Wo6h+4FR1IAWsULecYxpsMNzaHxmx1x7e/dfgy5SDN67sH0NO
+3Xss0r0upS/kqbitOtSZpLYl6ZtrAGCSYP9PIUkY92eQq2EGnI/yuum06ZIya7XzV+hdG82MHauV
+BJVJ8zUtluNJbd134/tJS7SsVQepj5WztCO7TG1F8PapspUwtP1MVYwnSlcUfIKdzXOS0xZKBgyM
+UNGPHgm+F6HmIcr9g+UQvIOlCsRnKPZzFBQ9RnbDhxSJITRNrw9FDKZJobq7nMWxM4MphQIDAQAB
+o0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjAdBgNVHQ4EFgQUTiJUIBiV5uNu
+5g/6+rkS7QYXjzkwDQYJKoZIhvcNAQELBQADggEBAGBnKJRvDkhj6zHd6mcY1Yl9PMWLSn/pvtsr
+F9+wX3N3KjITOYFnQoQj8kVnNeyIv/iPsGEMNKSuIEyExtv4NeF22d+mQrvHRAiGfzZ0JFrabA0U
+WTW98kndth/Jsw1HKj2ZL7tcu7XUIOGZX1NGFdtom/DzMNU+MeKNhJ7jitralj41E6Vf8PlwUHBH
+QRFXGU7Aj64GxJUTFy8bJZ918rGOmaFvE7FBcf6IKshPECBV1/MUReXgRPTqh5Uykw7+U0b6LJ3/
+iyK5S9kJRaTepLiaWN0bfVKfjllDiIGknibVb63dDcY3fe0Dkhvld1927jyNxF1WW6LZZm6zNTfl
+MrY=
+-----END CERTIFICATE-----
+
+DigiCert Global Root G3
+=======================
+-----BEGIN CERTIFICATE-----
+MIICPzCCAcWgAwIBAgIQBVVWvPJepDU1w6QP1atFcjAKBggqhkjOPQQDAzBhMQswCQYDVQQGEwJV
+UzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSAwHgYD
+VQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBHMzAeFw0xMzA4MDExMjAwMDBaFw0zODAxMTUxMjAw
+MDBaMGExCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5k
+aWdpY2VydC5jb20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IEczMHYwEAYHKoZIzj0C
+AQYFK4EEACIDYgAE3afZu4q4C/sLfyHS8L6+c/MzXRq8NOrexpu80JX28MzQC7phW1FGfp4tn+6O
+YwwX7Adw9c+ELkCDnOg/QW07rdOkFFk2eJ0DQ+4QE2xy3q6Ip6FrtUPOZ9wj/wMco+I+o0IwQDAP
+BgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjAdBgNVHQ4EFgQUs9tIpPmhxdiuNkHMEWNp
+Yim8S8YwCgYIKoZIzj0EAwMDaAAwZQIxAK288mw/EkrRLTnDCgmXc/SINoyIJ7vmiI1Qhadj+Z4y
+3maTD/HMsQmP3Wyr+mt/oAIwOWZbwmSNuJ5Q3KjVSaLtx9zRSX8XAbjIho9OjIgrqJqpisXRAL34
+VOKa5Vt8sycX
+-----END CERTIFICATE-----
+
+DigiCert Trusted Root G4
+========================
+-----BEGIN CERTIFICATE-----
+MIIFkDCCA3igAwIBAgIQBZsbV56OITLiOQe9p3d1XDANBgkqhkiG9w0BAQwFADBiMQswCQYDVQQG
+EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSEw
+HwYDVQQDExhEaWdpQ2VydCBUcnVzdGVkIFJvb3QgRzQwHhcNMTMwODAxMTIwMDAwWhcNMzgwMTE1
+MTIwMDAwWjBiMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
+d3cuZGlnaWNlcnQuY29tMSEwHwYDVQQDExhEaWdpQ2VydCBUcnVzdGVkIFJvb3QgRzQwggIiMA0G
+CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC/5pBzaN675F1KPDAiMGkz7MKnJS7JIT3yithZwuEp
+pz1Yq3aaza57G4QNxDAf8xukOBbrVsaXbR2rsnnyyhHS5F/WBTxSD1Ifxp4VpX6+n6lXFllVcq9o
+k3DCsrp1mWpzMpTREEQQLt+C8weE5nQ7bXHiLQwb7iDVySAdYyktzuxeTsiT+CFhmzTrBcZe7Fsa
+vOvJz82sNEBfsXpm7nfISKhmV1efVFiODCu3T6cw2Vbuyntd463JT17lNecxy9qTXtyOj4DatpGY
+QJB5w3jHtrHEtWoYOAMQjdjUN6QuBX2I9YI+EJFwq1WCQTLX2wRzKm6RAXwhTNS8rhsDdV14Ztk6
+MUSaM0C/CNdaSaTC5qmgZ92kJ7yhTzm1EVgX9yRcRo9k98FpiHaYdj1ZXUJ2h4mXaXpI8OCiEhtm
+mnTK3kse5w5jrubU75KSOp493ADkRSWJtppEGSt+wJS00mFt6zPZxd9LBADMfRyVw4/3IbKyEbe7
+f/LVjHAsQWCqsWMYRJUadmJ+9oCw++hkpjPRiQfhvbfmQ6QYuKZ3AeEPlAwhHbJUKSWJbOUOUlFH
+dL4mrLZBdd56rF+NP8m800ERElvlEFDrMcXKchYiCd98THU/Y+whX8QgUWtvsauGi0/C1kVfnSD8
+oR7FwI+isX4KJpn15GkvmB0t9dmpsh3lGwIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1Ud
+DwEB/wQEAwIBhjAdBgNVHQ4EFgQU7NfjgtJxXWRM3y5nP+e6mK4cD08wDQYJKoZIhvcNAQEMBQAD
+ggIBALth2X2pbL4XxJEbw6GiAI3jZGgPVs93rnD5/ZpKmbnJeFwMDF/k5hQpVgs2SV1EY+CtnJYY
+ZhsjDT156W1r1lT40jzBQ0CuHVD1UvyQO7uYmWlrx8GnqGikJ9yd+SeuMIW59mdNOj6PWTkiU0Tr
+yF0Dyu1Qen1iIQqAyHNm0aAFYF/opbSnr6j3bTWcfFqK1qI4mfN4i/RN0iAL3gTujJtHgXINwBQy
+7zBZLq7gcfJW5GqXb5JQbZaNaHqasjYUegbyJLkJEVDXCLG4iXqEI2FCKeWjzaIgQdfRnGTZ6iah
+ixTXTBmyUEFxPT9NcCOGDErcgdLMMpSEDQgJlxxPwO5rIHQw0uA5NBCFIRUBCOhVMt5xSdkoF1BN
+5r5N0XWs0Mr7QbhDparTwwVETyw2m+L64kW4I1NsBm9nVX9GtUw/bihaeSbSpKhil9Ie4u1Ki7wb
+/UdKDd9nZn6yW0HQO+T0O/QEY+nvwlQAUaCKKsnOeMzV6ocEGLPOr0mIr/OSmbaz5mEP0oUA51Aa
+5BuVnRmhuZyxm7EAHu/QD09CbMkKvO5D+jpxpchNJqU1/YldvIViHTLSoCtU7ZpXwdv6EM8Zt4tK
+G48BtieVU+i2iW1bvGjUI+iLUaJW+fCmgKDWHrO8Dw9TdSmq6hN35N6MgSGtBxBHEa2HPQfRdbzP
+82Z+
+-----END CERTIFICATE-----
+
+WoSign
+======
+-----BEGIN CERTIFICATE-----
+MIIFdjCCA16gAwIBAgIQXmjWEXGUY1BWAGjzPsnFkTANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQG
+EwJDTjEaMBgGA1UEChMRV29TaWduIENBIExpbWl0ZWQxKjAoBgNVBAMTIUNlcnRpZmljYXRpb24g
+QXV0aG9yaXR5IG9mIFdvU2lnbjAeFw0wOTA4MDgwMTAwMDFaFw0zOTA4MDgwMTAwMDFaMFUxCzAJ
+BgNVBAYTAkNOMRowGAYDVQQKExFXb1NpZ24gQ0EgTGltaXRlZDEqMCgGA1UEAxMhQ2VydGlmaWNh
+dGlvbiBBdXRob3JpdHkgb2YgV29TaWduMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA
+vcqNrLiRFVaXe2tcesLea9mhsMMQI/qnobLMMfo+2aYpbxY94Gv4uEBf2zmoAHqLoE1UfcIiePyO
+CbiohdfMlZdLdNiefvAA5A6JrkkoRBoQmTIPJYhTpA2zDxIIFgsDcSccf+Hb0v1naMQFXQoOXXDX
+2JegvFNBmpGN9J42Znp+VsGQX+axaCA2pIwkLCxHC1l2ZjC1vt7tj/id07sBMOby8w7gLJKA84X5
+KIq0VC6a7fd2/BVoFutKbOsuEo/Uz/4Mx1wdC34FMr5esAkqQtXJTpCzWQ27en7N1QhatH/YHGkR
++ScPewavVIMYe+HdVHpRaG53/Ma/UkpmRqGyZxq7o093oL5d//xWC0Nyd5DKnvnyOfUNqfTq1+ez
+EC8wQjchzDBwyYaYD8xYTYO7feUapTeNtqwylwA6Y3EkHp43xP901DfA4v6IRmAR3Qg/UDaruHqk
+lWJqbrDKaiFaafPz+x1wOZXzp26mgYmhiMU7ccqjUu6Du/2gd/Tkb+dC221KmYo0SLwX3OSACCK2
+8jHAPwQ+658geda4BmRkAjHXqc1S+4RFaQkAKtxVi8QGRkvASh0JWzko/amrzgD5LkhLJuYwTKVY
+yrREgk/nkR4zw7CT/xH8gdLKH3Ep3XZPkiWvHYG3Dy+MwwbMLyejSuQOmbp8HkUff6oZRZb9/D0C
+AwEAAaNCMEAwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFOFmzw7R
+8bNLtwYgFP6HEtX2/vs+MA0GCSqGSIb3DQEBBQUAA4ICAQCoy3JAsnbBfnv8rWTjMnvMPLZdRtP1
+LOJwXcgu2AZ9mNELIaCJWSQBnfmvCX0KI4I01fx8cpm5o9dU9OpScA7F9dY74ToJMuYhOZO9sxXq
+T2r09Ys/L3yNWC7F4TmgPsc9SnOeQHrAK2GpZ8nzJLmzbVUsWh2eJXLOC62qx1ViC777Y7NhRCOj
+y+EaDveaBk3e1CNOIZZbOVtXHS9dCF4Jef98l7VNg64N1uajeeAz0JmWAjCnPv/So0M/BVoG6kQC
+2nz4SNAzqfkHx5Xh9T71XXG68pWpdIhhWeO/yloTunK0jF02h+mmxTwTv97QRCbut+wucPrXnbes
+5cVAWubXbHssw1abR80LzvobtCHXt2a49CUwi1wNuepnsvRtrtWhnk/Yn+knArAdBtaP4/tIEp9/
+EaEQPkxROpaw0RPxx9gmrjrKkcRpnd8BKWRRb2jaFOwIQZeQjdCygPLPwj2/kWjFgGcexGATVdVh
+mVd8upUPYUk6ynW8yQqTP2cOEvIo4jEbwFcW3wh8GcF+Dx+FHgo2fFt+J7x6v+Db9NpSvd4MVHAx
+kUOVyLzwPt0JfjBkUO1/AaQzZ01oT74V77D2AhGiGxMlOtzCWfHjXEa7ZywCRuoeSKbmW9m1vFGi
+kpbbqsY3Iqb+zCB0oy2pLmvLwIIRIbWTee5Ehr7XHuQe+w==
+-----END CERTIFICATE-----
+
+WoSign China
+============
+-----BEGIN CERTIFICATE-----
+MIIFWDCCA0CgAwIBAgIQUHBrzdgT/BtOOzNy0hFIjTANBgkqhkiG9w0BAQsFADBGMQswCQYDVQQG
+EwJDTjEaMBgGA1UEChMRV29TaWduIENBIExpbWl0ZWQxGzAZBgNVBAMMEkNBIOayg+mAmuagueiv
+geS5pjAeFw0wOTA4MDgwMTAwMDFaFw0zOTA4MDgwMTAwMDFaMEYxCzAJBgNVBAYTAkNOMRowGAYD
+VQQKExFXb1NpZ24gQ0EgTGltaXRlZDEbMBkGA1UEAwwSQ0Eg5rKD6YCa5qC56K+B5LmmMIICIjAN
+BgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA0EkhHiX8h8EqwqzbdoYGTufQdDTc7WU1/FDWiD+k
+8H/rD195L4mx/bxjWDeTmzj4t1up+thxx7S8gJeNbEvxUNUqKaqoGXqW5pWOdO2XCld19AXbbQs5
+uQF/qvbW2mzmBeCkTVL829B0txGMe41P/4eDrv8FAxNXUDf+jJZSEExfv5RxadmWPgxDT74wwJ85
+dE8GRV2j1lY5aAfMh09Qd5Nx2UQIsYo06Yms25tO4dnkUkWMLhQfkWsZHWgpLFbE4h4TV2TwYeO5
+Ed+w4VegG63XX9Gv2ystP9Bojg/qnw+LNVgbExz03jWhCl3W6t8Sb8D7aQdGctyB9gQjF+BNdeFy
+b7Ao65vh4YOhn0pdr8yb+gIgthhid5E7o9Vlrdx8kHccREGkSovrlXLp9glk3Kgtn3R46MGiCWOc
+76DbT52VqyBPt7D3h1ymoOQ3OMdc4zUPLK2jgKLsLl3Az+2LBcLmc272idX10kaO6m1jGx6KyX2m
++Jzr5dVjhU1zZmkR/sgO9MHHZklTfuQZa/HpelmjbX7FF+Ynxu8b22/8DU0GAbQOXDBGVWCvOGU6
+yke6rCzMRh+yRpY/8+0mBe53oWprfi1tWFxK1I5nuPHa1UaKJ/kR8slC/k7e3x9cxKSGhxYzoacX
+GKUN5AXlK8IrC6KVkLn9YDxOiT7nnO4fuwECAwEAAaNCMEAwDgYDVR0PAQH/BAQDAgEGMA8GA1Ud
+EwEB/wQFMAMBAf8wHQYDVR0OBBYEFOBNv9ybQV0T6GTwp+kVpOGBwboxMA0GCSqGSIb3DQEBCwUA
+A4ICAQBqinA4WbbaixjIvirTthnVZil6Xc1bL3McJk6jfW+rtylNpumlEYOnOXOvEESS5iVdT2H6
+yAa+Tkvv/vMx/sZ8cApBWNromUuWyXi8mHwCKe0JgOYKOoICKuLJL8hWGSbueBwj/feTZU7n85iY
+r83d2Z5AiDEoOqsuC7CsDCT6eiaY8xJhEPRdF/d+4niXVOKM6Cm6jBAyvd0zaziGfjk9DgNyp115
+j0WKWa5bIW4xRtVZjc8VX90xJc/bYNaBRHIpAlf2ltTW/+op2znFuCyKGo3Oy+dCMYYFaA6eFN0A
+kLppRQjbbpCBhqcqBT/mhDn4t/lXX0ykeVoQDF7Va/81XwVRHmyjdanPUIPTfPRm94KNPQx96N97
+qA4bLJyuQHCH2u2nFoJavjVsIE4iYdm8UXrNemHcSxH5/mc0zy4EZmFcV5cjjPOGG0jfKq+nwf/Y
+jj4Du9gqsPoUJbJRa4ZDhS4HIxaAjUz7tGM7zMN07RujHv41D198HRaG9Q7DlfEvr10lO1Hm13ZB
+ONFLAzkopR6RctR9q5czxNM+4Gm2KHmgCY0c0f9BckgG/Jou5yD5m6Leie2uPAmvylezkolwQOQv
+T8Jwg0DXJCxr5wkf09XHwQj02w47HAcLQxGEIYbpgNR12KvxAmLBsX5VYc8T1yaw15zLKYs4SgsO
+kI26oQ==
+-----END CERTIFICATE-----
+
+COMODO RSA Certification Authority
+==================================
+-----BEGIN CERTIFICATE-----
+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
+LaZRfyHBNVOFBkpdn627G190
+-----END CERTIFICATE-----
+
+USERTrust RSA Certification Authority
+=====================================
+-----BEGIN CERTIFICATE-----
+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
+Q+6IHdfGjjxDah2nGN59PRbxYvnKkKj9
+-----END CERTIFICATE-----
+
+USERTrust ECC Certification Authority
+=====================================
+-----BEGIN CERTIFICATE-----
+MIICjzCCAhWgAwIBAgIQXIuZxVqUxdJxVt7NiYDMJjAKBggqhkjOPQQDAzCBiDELMAkGA1UEBhMC
+VVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0plcnNleSBDaXR5MR4wHAYDVQQKExVU
+aGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNVBAMTJVVTRVJUcnVzdCBFQ0MgQ2VydGlmaWNhdGlv
+biBBdXRob3JpdHkwHhcNMTAwMjAxMDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBiDELMAkGA1UEBhMC
+VVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0plcnNleSBDaXR5MR4wHAYDVQQKExVU
+aGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNVBAMTJVVTRVJUcnVzdCBFQ0MgQ2VydGlmaWNhdGlv
+biBBdXRob3JpdHkwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQarFRaqfloI+d61SRvU8Za2EurxtW2
+0eZzca7dnNYMYf3boIkDuAUU7FfO7l0/4iGzzvfUinngo4N+LZfQYcTxmdwlkWOrfzCjtHDix6Ez
+nPO/LlxTsV+zfTJ/ijTjeXmjQjBAMB0GA1UdDgQWBBQ64QmG1M8ZwpZ2dEl23OA1xmNjmjAOBgNV
+HQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAKBggqhkjOPQQDAwNoADBlAjA2Z6EWCNzklwBB
+HU6+4WMBzzuqQhFkoJ2UOQIReVx7Hfpkue4WQrO/isIJxOzksU0CMQDpKmFHjFJKS04YcPbWRNZu
+9YO6bVi9JNlWSOrvxKJGgYhqOkbRqZtNyWHa0V1Xahg=
+-----END CERTIFICATE-----
+
+GlobalSign ECC Root CA - R4
+===========================
+-----BEGIN CERTIFICATE-----
+MIIB4TCCAYegAwIBAgIRKjikHJYKBN5CsiilC+g0mAIwCgYIKoZIzj0EAwIwUDEkMCIGA1UECxMb
+R2xvYmFsU2lnbiBFQ0MgUm9vdCBDQSAtIFI0MRMwEQYDVQQKEwpHbG9iYWxTaWduMRMwEQYDVQQD
+EwpHbG9iYWxTaWduMB4XDTEyMTExMzAwMDAwMFoXDTM4MDExOTAzMTQwN1owUDEkMCIGA1UECxMb
+R2xvYmFsU2lnbiBFQ0MgUm9vdCBDQSAtIFI0MRMwEQYDVQQKEwpHbG9iYWxTaWduMRMwEQYDVQQD
+EwpHbG9iYWxTaWduMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEuMZ5049sJQ6fLjkZHAOkrprl
+OQcJFspjsbmG+IpXwVfOQvpzofdlQv8ewQCybnMO/8ch5RikqtlxP6jUuc6MHaNCMEAwDgYDVR0P
+AQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFFSwe61FuOJAf/sKbvu+M8k8o4TV
+MAoGCCqGSM49BAMCA0gAMEUCIQDckqGgE6bPA7DmxCGXkPoUVy0D7O48027KqGx2vKLeuwIgJ6iF
+JzWbVsaj8kfSt24bAgAXqmemFZHe+pTsewv4n4Q=
+-----END CERTIFICATE-----
+
+GlobalSign ECC Root CA - R5
+===========================
+-----BEGIN CERTIFICATE-----
+MIICHjCCAaSgAwIBAgIRYFlJ4CYuu1X5CneKcflK2GwwCgYIKoZIzj0EAwMwUDEkMCIGA1UECxMb
+R2xvYmFsU2lnbiBFQ0MgUm9vdCBDQSAtIFI1MRMwEQYDVQQKEwpHbG9iYWxTaWduMRMwEQYDVQQD
+EwpHbG9iYWxTaWduMB4XDTEyMTExMzAwMDAwMFoXDTM4MDExOTAzMTQwN1owUDEkMCIGA1UECxMb
+R2xvYmFsU2lnbiBFQ0MgUm9vdCBDQSAtIFI1MRMwEQYDVQQKEwpHbG9iYWxTaWduMRMwEQYDVQQD
+EwpHbG9iYWxTaWduMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAER0UOlvt9Xb/pOdEh+J8LttV7HpI6
+SFkc8GIxLcB6KP4ap1yztsyX50XUWPrRd21DosCHZTQKH3rd6zwzocWdTaRvQZU4f8kehOvRnkmS
+h5SHDDqFSmafnVmTTZdhBoZKo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAd
+BgNVHQ4EFgQUPeYpSJvqB8ohREom3m7e0oPQn1kwCgYIKoZIzj0EAwMDaAAwZQIxAOVpEslu28Yx
+uglB4Zf4+/2a4n0Sye18ZNPLBSWLVtmg515dTguDnFt2KaAJJiFqYgIwcdK1j1zqO+F4CYWodZI7
+yFz9SO8NdCKoCOJuxUnOxwy8p2Fp8fc74SrL+SvzZpA3
+-----END CERTIFICATE-----
+
+Staat der Nederlanden Root CA - G3
+==================================
+-----BEGIN CERTIFICATE-----
+MIIFdDCCA1ygAwIBAgIEAJiiOTANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJOTDEeMBwGA1UE
+CgwVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSswKQYDVQQDDCJTdGFhdCBkZXIgTmVkZXJsYW5kZW4g
+Um9vdCBDQSAtIEczMB4XDTEzMTExNDExMjg0MloXDTI4MTExMzIzMDAwMFowWjELMAkGA1UEBhMC
+TkwxHjAcBgNVBAoMFVN0YWF0IGRlciBOZWRlcmxhbmRlbjErMCkGA1UEAwwiU3RhYXQgZGVyIE5l
+ZGVybGFuZGVuIFJvb3QgQ0EgLSBHMzCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAL4y
+olQPcPssXFnrbMSkUeiFKrPMSjTysF/zDsccPVMeiAho2G89rcKezIJnByeHaHE6n3WWIkYFsO2t
+x1ueKt6c/DrGlaf1F2cY5y9JCAxcz+bMNO14+1Cx3Gsy8KL+tjzk7FqXxz8ecAgwoNzFs21v0IJy
+EavSgWhZghe3eJJg+szeP4TrjTgzkApyI/o1zCZxMdFyKJLZWyNtZrVtB0LrpjPOktvA9mxjeM3K
+Tj215VKb8b475lRgsGYeCasH/lSJEULR9yS6YHgamPfJEf0WwTUaVHXvQ9Plrk7O53vDxk5hUUur
+mkVLoR9BvUhTFXFkC4az5S6+zqQbwSmEorXLCCN2QyIkHxcE1G6cxvx/K2Ya7Irl1s9N9WMJtxU5
+1nus6+N86U78dULI7ViVDAZCopz35HCz33JvWjdAidiFpNfxC95DGdRKWCyMijmev4SH8RY7Ngzp
+07TKbBlBUgmhHbBqv4LvcFEhMtwFdozL92TkA1CvjJFnq8Xy7ljY3r735zHPbMk7ccHViLVlvMDo
+FxcHErVc0qsgk7TmgoNwNsXNo42ti+yjwUOH5kPiNL6VizXtBznaqB16nzaeErAMZRKQFWDZJkBE
+41ZgpRDUajz9QdwOWke275dhdU/Z/seyHdTtXUmzqWrLZoQT1Vyg3N9udwbRcXXIV2+vD3dbAgMB
+AAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRUrfrHkleu
+yjWcLhL75LpdINyUVzANBgkqhkiG9w0BAQsFAAOCAgEAMJmdBTLIXg47mAE6iqTnB/d6+Oea31BD
+U5cqPco8R5gu4RV78ZLzYdqQJRZlwJ9UXQ4DO1t3ApyEtg2YXzTdO2PCwyiBwpwpLiniyMMB8jPq
+KqrMCQj3ZWfGzd/TtiunvczRDnBfuCPRy5FOCvTIeuXZYzbB1N/8Ipf3YF3qKS9Ysr1YvY2WTxB1
+v0h7PVGHoTx0IsL8B3+A3MSs/mrBcDCw6Y5p4ixpgZQJut3+TcCDjJRYwEYgr5wfAvg1VUkvRtTA
+8KCWAg8zxXHzniN9lLf9OtMJgwYh/WA9rjLA0u6NpvDntIJ8CsxwyXmA+P5M9zWEGYox+wrZ13+b
+8KKaa8MFSu1BYBQw0aoRQm7TIwIEC8Zl3d1Sd9qBa7Ko+gE4uZbqKmxnl4mUnrzhVNXkanjvSr0r
+mj1AfsbAddJu+2gw7OyLnflJNZoaLNmzlTnVHpL3prllL+U9bTpITAjc5CgSKL59NVzq4BZ+Extq
+1z7XnvwtdbLBFNUjA9tbbws+eC8N3jONFrdI54OagQ97wUNNVQQXOEpR1VmiiXTTn74eS9fGbbeI
+JG9gkaSChVtWQbzQRKtqE77RLFi3EjNYsjdj3BP1lB0/QFH1T/U67cjF68IeHRaVesd+QnGTbksV
+tzDfqu1XhUisHWrdOWnk4Xl4vs4Fv6EM94B7IWcnMFk=
+-----END CERTIFICATE-----
+
+Staat der Nederlanden EV Root CA
+================================
+-----BEGIN CERTIFICATE-----
+MIIFcDCCA1igAwIBAgIEAJiWjTANBgkqhkiG9w0BAQsFADBYMQswCQYDVQQGEwJOTDEeMBwGA1UE
+CgwVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSkwJwYDVQQDDCBTdGFhdCBkZXIgTmVkZXJsYW5kZW4g
+RVYgUm9vdCBDQTAeFw0xMDEyMDgxMTE5MjlaFw0yMjEyMDgxMTEwMjhaMFgxCzAJBgNVBAYTAk5M
+MR4wHAYDVQQKDBVTdGFhdCBkZXIgTmVkZXJsYW5kZW4xKTAnBgNVBAMMIFN0YWF0IGRlciBOZWRl
+cmxhbmRlbiBFViBSb290IENBMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA48d+ifkk
+SzrSM4M1LGns3Amk41GoJSt5uAg94JG6hIXGhaTK5skuU6TJJB79VWZxXSzFYGgEt9nCUiY4iKTW
+O0Cmws0/zZiTs1QUWJZV1VD+hq2kY39ch/aO5ieSZxeSAgMs3NZmdO3dZ//BYY1jTw+bbRcwJu+r
+0h8QoPnFfxZpgQNH7R5ojXKhTbImxrpsX23Wr9GxE46prfNeaXUmGD5BKyF/7otdBwadQ8QpCiv8
+Kj6GyzyDOvnJDdrFmeK8eEEzduG/L13lpJhQDBXd4Pqcfzho0LKmeqfRMb1+ilgnQ7O6M5HTp5gV
+XJrm0w912fxBmJc+qiXbj5IusHsMX/FjqTf5m3VpTCgmJdrV8hJwRVXj33NeN/UhbJCONVrJ0yPr
+08C+eKxCKFhmpUZtcALXEPlLVPxdhkqHz3/KRawRWrUgUY0viEeXOcDPusBCAUCZSCELa6fS/ZbV
+0b5GnUngC6agIk440ME8MLxwjyx1zNDFjFE7PZQIZCZhfbnDZY8UnCHQqv0XcgOPvZuM5l5Tnrmd
+74K74bzickFbIZTTRTeU0d8JOV3nI6qaHcptqAqGhYqCvkIH1vI4gnPah1vlPNOePqc7nvQDs/nx
+fRN0Av+7oeX6AHkcpmZBiFxgV6YuCcS6/ZrPpx9Aw7vMWgpVSzs4dlG4Y4uElBbmVvMCAwEAAaNC
+MEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFP6rAJCYniT8qcwa
+ivsnuL8wbqg7MA0GCSqGSIb3DQEBCwUAA4ICAQDPdyxuVr5Os7aEAJSrR8kN0nbHhp8dB9O2tLsI
+eK9p0gtJ3jPFrK3CiAJ9Brc1AsFgyb/E6JTe1NOpEyVa/m6irn0F3H3zbPB+po3u2dfOWBfoqSmu
+c0iH55vKbimhZF8ZE/euBhD/UcabTVUlT5OZEAFTdfETzsemQUHSv4ilf0X8rLiltTMMgsT7B/Zq
+5SWEXwbKwYY5EdtYzXc7LMJMD16a4/CrPmEbUCTCwPTxGfARKbalGAKb12NMcIxHowNDXLldRqAN
+b/9Zjr7dn3LDWyvfjFvO5QxGbJKyCqNMVEIYFRIYvdr8unRu/8G2oGTYqV9Vrp9canaW2HNnh/tN
+f1zuacpzEPuKqf2evTY4SUmH9A4U8OmHuD+nT3pajnnUk+S7aFKErGzp85hwVXIy+TSrK0m1zSBi
+5Dp6Z2Orltxtrpfs/J92VoguZs9btsmksNcFuuEnL5O7Jiqik7Ab846+HUCjuTaPPoIaGl6I6lD4
+WeKDRikL40Rc4ZW2aZCaFG+XroHPaO+Zmr615+F/+PoTRxZMzG0IQOeLeG9QgkRQP2YGiqtDhFZK
+DyAthg710tvSeopLzaXoTvFeJiUBWSOgftL2fiFX1ye8FVdMpEbB4IMeDExNH08GGeL5qPQ6gqGy
+eUN51q1veieQA6TqJIc/2b3Z6fJfUEkc7uzXLg==
+-----END CERTIFICATE-----
+
+IdenTrust Commercial Root CA 1
+==============================
+-----BEGIN CERTIFICATE-----
+MIIFYDCCA0igAwIBAgIQCgFCgAAAAUUjyES1AAAAAjANBgkqhkiG9w0BAQsFADBKMQswCQYDVQQG
+EwJVUzESMBAGA1UEChMJSWRlblRydXN0MScwJQYDVQQDEx5JZGVuVHJ1c3QgQ29tbWVyY2lhbCBS
+b290IENBIDEwHhcNMTQwMTE2MTgxMjIzWhcNMzQwMTE2MTgxMjIzWjBKMQswCQYDVQQGEwJVUzES
+MBAGA1UEChMJSWRlblRydXN0MScwJQYDVQQDEx5JZGVuVHJ1c3QgQ29tbWVyY2lhbCBSb290IENB
+IDEwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCnUBneP5k91DNG8W9RYYKyqU+PZ4ld
+hNlT3Qwo2dfw/66VQ3KZ+bVdfIrBQuExUHTRgQ18zZshq0PirK1ehm7zCYofWjK9ouuU+ehcCuz/
+mNKvcbO0U59Oh++SvL3sTzIwiEsXXlfEU8L2ApeN2WIrvyQfYo3fw7gpS0l4PJNgiCL8mdo2yMKi
+1CxUAGc1bnO/AljwpN3lsKImesrgNqUZFvX9t++uP0D1bVoE/c40yiTcdCMbXTMTEl3EASX2MN0C
+XZ/g1Ue9tOsbobtJSdifWwLziuQkkORiT0/Br4sOdBeo0XKIanoBScy0RnnGF7HamB4HWfp1IYVl
+3ZBWzvurpWCdxJ35UrCLvYf5jysjCiN2O/cz4ckA82n5S6LgTrx+kzmEB/dEcH7+B1rlsazRGMzy
+NeVJSQjKVsk9+w8YfYs7wRPCTY/JTw436R+hDmrfYi7LNQZReSzIJTj0+kuniVyc0uMNOYZKdHzV
+WYfCP04MXFL0PfdSgvHqo6z9STQaKPNBiDoT7uje/5kdX7rL6B7yuVBgwDHTc+XvvqDtMwt0viAg
+xGds8AgDelWAf0ZOlqf0Hj7h9tgJ4TNkK2PXMl6f+cB7D3hvl7yTmvmcEpB4eoCHFddydJxVdHix
+uuFucAS6T6C6aMN7/zHwcz09lCqxC0EOoP5NiGVreTO01wIDAQABo0IwQDAOBgNVHQ8BAf8EBAMC
+AQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU7UQZwNPwBovupHu+QucmVMiONnYwDQYJKoZI
+hvcNAQELBQADggIBAA2ukDL2pkt8RHYZYR4nKM1eVO8lvOMIkPkp165oCOGUAFjvLi5+U1KMtlwH
+6oi6mYtQlNeCgN9hCQCTrQ0U5s7B8jeUeLBfnLOic7iPBZM4zY0+sLj7wM+x8uwtLRvM7Kqas6pg
+ghstO8OEPVeKlh6cdbjTMM1gCIOQ045U8U1mwF10A0Cj7oV+wh93nAbowacYXVKV7cndJZ5t+qnt
+ozo00Fl72u1Q8zW/7esUTTHHYPTa8Yec4kjixsU3+wYQ+nVZZjFHKdp2mhzpgq7vmrlR94gjmmmV
+YjzlVYA211QC//G5Xc7UI2/YRYRKW2XviQzdFKcgyxilJbQN+QHwotL0AMh0jqEqSI5l2xPE4iUX
+feu+h1sXIFRRk0pTAwvsXcoz7WL9RccvW9xYoIA55vrX/hMUpu09lEpCdNTDd1lzzY9GvlU47/ro
+kTLql1gEIt44w8y8bckzOmoKaT+gyOpyj4xjhiO9bTyWnpXgSUyqorkqG5w2gXjtw+hG4iZZRHUe
+2XWJUc0QhJ1hYMtd+ZciTY6Y5uN/9lu7rs3KSoFrXgvzUeF0K+l+J6fZmUlO+KWA2yUPHGNiiskz
+Z2s8EIPGrd6ozRaOjfAHN3Gf8qv8QfXBi+wAN10J5U6A7/qxXDgGpRtK4dw4LTzcqx+QGtVKnO7R
+cGzM7vRX+Bi6hG6H
+-----END CERTIFICATE-----
+
+IdenTrust Public Sector Root CA 1
+=================================
+-----BEGIN CERTIFICATE-----
+MIIFZjCCA06gAwIBAgIQCgFCgAAAAUUjz0Z8AAAAAjANBgkqhkiG9w0BAQsFADBNMQswCQYDVQQG
+EwJVUzESMBAGA1UEChMJSWRlblRydXN0MSowKAYDVQQDEyFJZGVuVHJ1c3QgUHVibGljIFNlY3Rv
+ciBSb290IENBIDEwHhcNMTQwMTE2MTc1MzMyWhcNMzQwMTE2MTc1MzMyWjBNMQswCQYDVQQGEwJV
+UzESMBAGA1UEChMJSWRlblRydXN0MSowKAYDVQQDEyFJZGVuVHJ1c3QgUHVibGljIFNlY3RvciBS
+b290IENBIDEwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC2IpT8pEiv6EdrCvsnduTy
+P4o7ekosMSqMjbCpwzFrqHd2hCa2rIFCDQjrVVi7evi8ZX3yoG2LqEfpYnYeEe4IFNGyRBb06tD6
+Hi9e28tzQa68ALBKK0CyrOE7S8ItneShm+waOh7wCLPQ5CQ1B5+ctMlSbdsHyo+1W/CD80/HLaXI
+rcuVIKQxKFdYWuSNG5qrng0M8gozOSI5Cpcu81N3uURF/YTLNiCBWS2ab21ISGHKTN9T0a9SvESf
+qy9rg3LvdYDaBjMbXcjaY8ZNzaxmMc3R3j6HEDbhuaR672BQssvKplbgN6+rNBM5Jeg5ZuSYeqoS
+mJxZZoY+rfGwyj4GD3vwEUs3oERte8uojHH01bWRNszwFcYr3lEXsZdMUD2xlVl8BX0tIdUAvwFn
+ol57plzy9yLxkA2T26pEUWbMfXYD62qoKjgZl3YNa4ph+bz27nb9cCvdKTz4Ch5bQhyLVi9VGxyh
+LrXHFub4qjySjmm2AcG1hp2JDws4lFTo6tyePSW8Uybt1as5qsVATFSrsrTZ2fjXctscvG29ZV/v
+iDUqZi/u9rNl8DONfJhBaUYPQxxp+pu10GFqzcpL2UyQRqsVWaFHVCkugyhfHMKiq3IXAAaOReyL
+4jM9f9oZRORicsPfIsbyVtTdX5Vy7W1f90gDW/3FKqD2cyOEEBsB5wIDAQABo0IwQDAOBgNVHQ8B
+Af8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU43HgntinQtnbcZFrlJPrw6PRFKMw
+DQYJKoZIhvcNAQELBQADggIBAEf63QqwEZE4rU1d9+UOl1QZgkiHVIyqZJnYWv6IAcVYpZmxI1Qj
+t2odIFflAWJBF9MJ23XLblSQdf4an4EKwt3X9wnQW3IV5B4Jaj0z8yGa5hV+rVHVDRDtfULAj+7A
+mgjVQdZcDiFpboBhDhXAuM/FSRJSzL46zNQuOAXeNf0fb7iAaJg9TaDKQGXSc3z1i9kKlT/YPyNt
+GtEqJBnZhbMX73huqVjRI9PHE+1yJX9dsXNw0H8GlwmEKYBhHfpe/3OsoOOJuBxxFcbeMX8S3OFt
+m6/n6J91eEyrRjuazr8FGF1NFTwWmhlQBJqymm9li1JfPFgEKCXAZmExfrngdbkaqIHWchezxQMx
+NRF4eKLg6TCMf4DfWN88uieW4oA0beOY02QnrEh+KHdcxiVhJfiFDGX6xDIvpZgF5PgLZxYWxoK4
+Mhn5+bl53B/N66+rDt0b20XkeucC4pVd/GnwU2lhlXV5C15V5jgclKlZM57IcXR5f1GJtshquDDI
+ajjDbp7hNxbqBWJMWxJH7ae0s1hWx0nzfxJoCTFx8G34Tkf71oXuxVhAGaQdp/lLQzfcaFpPz+vC
+ZHTetBXZ9FRUGi8c15dxVJCO2SCdUyt/q4/i6jC8UDfv8Ue1fXwsBOxonbRJRBD0ckscZOf85muQ
+3Wl9af0AVqW3rLatt8o+Ae+c
+-----END CERTIFICATE-----
+
+Entrust Root Certification Authority - G2
+=========================================
+-----BEGIN CERTIFICATE-----
+MIIEPjCCAyagAwIBAgIESlOMKDANBgkqhkiG9w0BAQsFADCBvjELMAkGA1UEBhMCVVMxFjAUBgNV
+BAoTDUVudHJ1c3QsIEluYy4xKDAmBgNVBAsTH1NlZSB3d3cuZW50cnVzdC5uZXQvbGVnYWwtdGVy
+bXMxOTA3BgNVBAsTMChjKSAyMDA5IEVudHJ1c3QsIEluYy4gLSBmb3IgYXV0aG9yaXplZCB1c2Ug
+b25seTEyMDAGA1UEAxMpRW50cnVzdCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzIw
+HhcNMDkwNzA3MTcyNTU0WhcNMzAxMjA3MTc1NTU0WjCBvjELMAkGA1UEBhMCVVMxFjAUBgNVBAoT
+DUVudHJ1c3QsIEluYy4xKDAmBgNVBAsTH1NlZSB3d3cuZW50cnVzdC5uZXQvbGVnYWwtdGVybXMx
+OTA3BgNVBAsTMChjKSAyMDA5IEVudHJ1c3QsIEluYy4gLSBmb3IgYXV0aG9yaXplZCB1c2Ugb25s
+eTEyMDAGA1UEAxMpRW50cnVzdCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzIwggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6hLZy254Ma+KZ6TABp3bqMriVQRrJ2mFOWHLP
+/vaCeb9zYQYKpSfYs1/TRU4cctZOMvJyig/3gxnQaoCAAEUesMfnmr8SVycco2gvCoe9amsOXmXz
+HHfV1IWNcCG0szLni6LVhjkCsbjSR87kyUnEO6fe+1R9V77w6G7CebI6C1XiUJgWMhNcL3hWwcKU
+s/Ja5CeanyTXxuzQmyWC48zCxEXFjJd6BmsqEZ+pCm5IO2/b1BEZQvePB7/1U1+cPvQXLOZprE4y
+TGJ36rfo5bs0vBmLrpxR57d+tVOxMyLlbc9wPBr64ptntoP0jaWvYkxN4FisZDQSA/i2jZRjJKRx
+AgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRqciZ6
+0B7vfec7aVHUbI2fkBJmqzANBgkqhkiG9w0BAQsFAAOCAQEAeZ8dlsa2eT8ijYfThwMEYGprmi5Z
+iXMRrEPR9RP/jTkrwPK9T3CMqS/qF8QLVJ7UG5aYMzyorWKiAHarWWluBh1+xLlEjZivEtRh2woZ
+Rkfz6/djwUAFQKXSt/S1mja/qYh2iARVBCuch38aNzx+LaUa2NSJXsq9rD1s2G2v1fN2D807iDgi
+nWyTmsQ9v4IbZT+mD12q/OWyFcq1rca8PdCE6OoGcrBNOTJ4vz4RnAuknZoh8/CbCzB428Hch0P+
+vGOaysXCHMnHjf87ElgI5rY97HosTvuDls4MPGmHVHOkc8KT/1EQrBVUAdj8BbGJoX90g5pJ19xO
+e4pIb4tF9g==
+-----END CERTIFICATE-----
+
+Entrust Root Certification Authority - EC1
+==========================================
+-----BEGIN CERTIFICATE-----
+MIIC+TCCAoCgAwIBAgINAKaLeSkAAAAAUNCR+TAKBggqhkjOPQQDAzCBvzELMAkGA1UEBhMCVVMx
+FjAUBgNVBAoTDUVudHJ1c3QsIEluYy4xKDAmBgNVBAsTH1NlZSB3d3cuZW50cnVzdC5uZXQvbGVn
+YWwtdGVybXMxOTA3BgNVBAsTMChjKSAyMDEyIEVudHJ1c3QsIEluYy4gLSBmb3IgYXV0aG9yaXpl
+ZCB1c2Ugb25seTEzMDEGA1UEAxMqRW50cnVzdCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5
+IC0gRUMxMB4XDTEyMTIxODE1MjUzNloXDTM3MTIxODE1NTUzNlowgb8xCzAJBgNVBAYTAlVTMRYw
+FAYDVQQKEw1FbnRydXN0LCBJbmMuMSgwJgYDVQQLEx9TZWUgd3d3LmVudHJ1c3QubmV0L2xlZ2Fs
+LXRlcm1zMTkwNwYDVQQLEzAoYykgMjAxMiBFbnRydXN0LCBJbmMuIC0gZm9yIGF1dGhvcml6ZWQg
+dXNlIG9ubHkxMzAxBgNVBAMTKkVudHJ1c3QgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAt
+IEVDMTB2MBAGByqGSM49AgEGBSuBBAAiA2IABIQTydC6bUF74mzQ61VfZgIaJPRbiWlH47jCffHy
+AsWfoPZb1YsGGYZPUxBtByQnoaD41UcZYUx9ypMn6nQM72+WCf5j7HBdNq1nd67JnXxVRDqiY1Ef
+9eNi1KlHBz7MIKNCMEAwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYE
+FLdj5xrdjekIplWDpOBqUEFlEUJJMAoGCCqGSM49BAMDA2cAMGQCMGF52OVCR98crlOZF7ZvHH3h
+vxGU0QOIdeSNiaSKd0bebWHvAvX7td/M/k7//qnmpwIwW5nXhTcGtXsI/esni0qU+eH6p44mCOh8
+kmhtc9hvJqwhAriZtyZBWyVgrtBIGu4G
+-----END CERTIFICATE-----
+
+CFCA EV ROOT
+============
+-----BEGIN CERTIFICATE-----
+MIIFjTCCA3WgAwIBAgIEGErM1jANBgkqhkiG9w0BAQsFADBWMQswCQYDVQQGEwJDTjEwMC4GA1UE
+CgwnQ2hpbmEgRmluYW5jaWFsIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MRUwEwYDVQQDDAxDRkNB
+IEVWIFJPT1QwHhcNMTIwODA4MDMwNzAxWhcNMjkxMjMxMDMwNzAxWjBWMQswCQYDVQQGEwJDTjEw
+MC4GA1UECgwnQ2hpbmEgRmluYW5jaWFsIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MRUwEwYDVQQD
+DAxDRkNBIEVWIFJPT1QwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDXXWvNED8fBVnV
+BU03sQ7smCuOFR36k0sXgiFxEFLXUWRwFsJVaU2OFW2fvwwbwuCjZ9YMrM8irq93VCpLTIpTUnrD
+7i7es3ElweldPe6hL6P3KjzJIx1qqx2hp/Hz7KDVRM8Vz3IvHWOX6Jn5/ZOkVIBMUtRSqy5J35DN
+uF++P96hyk0g1CXohClTt7GIH//62pCfCqktQT+x8Rgp7hZZLDRJGqgG16iI0gNyejLi6mhNbiyW
+ZXvKWfry4t3uMCz7zEasxGPrb382KzRzEpR/38wmnvFyXVBlWY9ps4deMm/DGIq1lY+wejfeWkU7
+xzbh72fROdOXW3NiGUgthxwG+3SYIElz8AXSG7Ggo7cbcNOIabla1jj0Ytwli3i/+Oh+uFzJlU9f
+py25IGvPa931DfSCt/SyZi4QKPaXWnuWFo8BGS1sbn85WAZkgwGDg8NNkt0yxoekN+kWzqotaK8K
+gWU6cMGbrU1tVMoqLUuFG7OA5nBFDWteNfB/O7ic5ARwiRIlk9oKmSJgamNgTnYGmE69g60dWIol
+hdLHZR4tjsbftsbhf4oEIRUpdPA+nJCdDC7xij5aqgwJHsfVPKPtl8MeNPo4+QgO48BdK4PRVmrJ
+tqhUUy54Mmc9gn900PvhtgVguXDbjgv5E1hvcWAQUhC5wUEJ73IfZzF4/5YFjQIDAQABo2MwYTAf
+BgNVHSMEGDAWgBTj/i39KNALtbq2osS/BqoFjJP7LzAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB
+/wQEAwIBBjAdBgNVHQ4EFgQU4/4t/SjQC7W6tqLEvwaqBYyT+y8wDQYJKoZIhvcNAQELBQADggIB
+ACXGumvrh8vegjmWPfBEp2uEcwPenStPuiB/vHiyz5ewG5zz13ku9Ui20vsXiObTej/tUxPQ4i9q
+ecsAIyjmHjdXNYmEwnZPNDatZ8POQQaIxffu2Bq41gt/UP+TqhdLjOztUmCypAbqTuv0axn96/Ua
+4CUqmtzHQTb3yHQFhDmVOdYLO6Qn+gjYXB74BGBSESgoA//vU2YApUo0FmZ8/Qmkrp5nGm9BC2sG
+E5uPhnEFtC+NiWYzKXZUmhH4J/qyP5Hgzg0b8zAarb8iXRvTvyUFTeGSGn+ZnzxEk8rUQElsgIfX
+BDrDMlI1Dlb4pd19xIsNER9Tyx6yF7Zod1rg1MvIB671Oi6ON7fQAUtDKXeMOZePglr4UeWJoBjn
+aH9dCi77o0cOPaYjesYBx4/IXr9tgFa+iiS6M+qf4TIRnvHST4D2G0CvOJ4RUHlzEhLN5mydLIhy
+PDCBBpEi6lmt2hkuIsKNuYyH4Ga8cyNfIWRjgEj1oDwYPZTISEEdQLpe/v5WOaHIz16eGWRGENoX
+kbcFgKyLmZJ956LYBws2J+dIeWCKw9cTXPhyQN9Ky8+ZAAoACxGV2lZFA4gKn2fQ1XmxqI1AbQ3C
+ekD6819kR5LLU7m7Wc5P/dAVUwHY3+vZ5nbv0CO7O6l5s9UCKc2Jo5YPSjXnTkLAdc0Hz+Ys63su
+-----END CERTIFICATE-----
+
+TÜRKTRUST Elektronik Sertifika Hizmet Sağlayıcısı H5
+=========================================================
+-----BEGIN CERTIFICATE-----
+MIIEJzCCAw+gAwIBAgIHAI4X/iQggTANBgkqhkiG9w0BAQsFADCBsTELMAkGA1UEBhMCVFIxDzAN
+BgNVBAcMBkFua2FyYTFNMEsGA1UECgxEVMOcUktUUlVTVCBCaWxnaSDEsGxldGnFn2ltIHZlIEJp
+bGnFn2ltIEfDvHZlbmxpxJ9pIEhpem1ldGxlcmkgQS7Fni4xQjBABgNVBAMMOVTDnFJLVFJVU1Qg
+RWxla3Ryb25payBTZXJ0aWZpa2EgSGl6bWV0IFNhxJ9sYXnEsWPEsXPEsSBINTAeFw0xMzA0MzAw
+ODA3MDFaFw0yMzA0MjgwODA3MDFaMIGxMQswCQYDVQQGEwJUUjEPMA0GA1UEBwwGQW5rYXJhMU0w
+SwYDVQQKDERUw5xSS1RSVVNUIEJpbGdpIMSwbGV0acWfaW0gdmUgQmlsacWfaW0gR8O8dmVubGnE
+n2kgSGl6bWV0bGVyaSBBLsWeLjFCMEAGA1UEAww5VMOcUktUUlVTVCBFbGVrdHJvbmlrIFNlcnRp
+ZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxIEg1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEApCUZ4WWe60ghUEoI5RHwWrom/4NZzkQqL/7hzmAD/I0Dpe3/a6i6zDQGn1k19uwsu537
+jVJp45wnEFPzpALFp/kRGml1bsMdi9GYjZOHp3GXDSHHmflS0yxjXVW86B8BSLlg/kJK9siArs1m
+ep5Fimh34khon6La8eHBEJ/rPCmBp+EyCNSgBbGM+42WAA4+Jd9ThiI7/PS98wl+d+yG6w8z5UNP
+9FR1bSmZLmZaQ9/LXMrI5Tjxfjs1nQ/0xVqhzPMggCTTV+wVunUlm+hkS7M0hO8EuPbJbKoCPrZV
+4jI3X/xml1/N1p7HIL9Nxqw/dV8c7TKcfGkAaZHjIxhT6QIDAQABo0IwQDAdBgNVHQ4EFgQUVpkH
+HtOsDGlktAxQR95DLL4gwPswDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZI
+hvcNAQELBQADggEBAJ5FdnsXSDLyOIspve6WSk6BGLFRRyDN0GSxDsnZAdkJzsiZ3GglE9Rc8qPo
+BP5yCccLqh0lVX6Wmle3usURehnmp349hQ71+S4pL+f5bFgWV1Al9j4uPqrtd3GqqpmWRgqujuwq
+URawXs3qZwQcWDD1YIq9pr1N5Za0/EKJAWv2cMhQOQwt1WbZyNKzMrcbGW3LM/nfpeYVhDfwwvJl
+lpKQd/Ct9JDpEXjXk4nAPQu6KfTomZ1yju2dL+6SfaHx/126M2CFYv4HAqGEVka+lgqaE9chTLd8
+B59OTj+RdPsnnRHM3eaxynFNExc5JsUpISuTKWqW+qtB4Uu2NQvAmxU=
+-----END CERTIFICATE-----
+
+TÜRKTRUST Elektronik Sertifika Hizmet Sağlayıcısı H6
+=========================================================
+-----BEGIN CERTIFICATE-----
+MIIEJjCCAw6gAwIBAgIGfaHyZeyKMA0GCSqGSIb3DQEBCwUAMIGxMQswCQYDVQQGEwJUUjEPMA0G
+A1UEBwwGQW5rYXJhMU0wSwYDVQQKDERUw5xSS1RSVVNUIEJpbGdpIMSwbGV0acWfaW0gdmUgQmls
+acWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWeLjFCMEAGA1UEAww5VMOcUktUUlVTVCBF
+bGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxIEg2MB4XDTEzMTIxODA5
+MDQxMFoXDTIzMTIxNjA5MDQxMFowgbExCzAJBgNVBAYTAlRSMQ8wDQYDVQQHDAZBbmthcmExTTBL
+BgNVBAoMRFTDnFJLVFJVU1QgQmlsZ2kgxLBsZXRpxZ9pbSB2ZSBCaWxpxZ9pbSBHw7x2ZW5sacSf
+aSBIaXptZXRsZXJpIEEuxZ4uMUIwQAYDVQQDDDlUw5xSS1RSVVNUIEVsZWt0cm9uaWsgU2VydGlm
+aWthIEhpem1ldCBTYcSfbGF5xLFjxLFzxLEgSDYwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQCdsGjW6L0UlqMACprx9MfMkU1xeHe59yEmFXNRFpQJRwXiM/VomjX/3EsvMsew7eKC5W/a
+2uqsxgbPJQ1BgfbBOCK9+bGlprMBvD9QFyv26WZV1DOzXPhDIHiTVRZwGTLmiddk671IUP320EED
+wnS3/faAz1vFq6TWlRKb55cTMgPp1KtDWxbtMyJkKbbSk60vbNg9tvYdDjTu0n2pVQ8g9P0pu5Fb
+HH3GQjhtQiht1AH7zYiXSX6484P4tZgvsycLSF5W506jM7NE1qXyGJTtHB6plVxiSvgNZ1GpryHV
++DKdeboaX+UEVU0TRv/yz3THGmNtwx8XEsMeED5gCLMxAgMBAAGjQjBAMB0GA1UdDgQWBBTdVRcT
+9qzoSCHK77Wv0QAy7Z6MtTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG
+9w0BAQsFAAOCAQEAb1gNl0OqFlQ+v6nfkkU/hQu7VtMMUszIv3ZnXuaqs6fvuay0EBQNdH49ba3R
+fdCaqaXKGDsCQC4qnFAUi/5XfldcEQlLNkVS9z2sFP1E34uXI9TDwe7UU5X+LEr+DXCqu4svLcsy
+o4LyVN/Y8t3XSHLuSqMplsNEzm61kod2pLv0kmzOLBQJZo6NrRa1xxsJYTvjIKIDgI6tflEATseW
+hvtDmHd9KMeP2Cpu54Rvl0EpABZeTeIT6lnAY2c6RPuY/ATTMHKm9ocJV612ph1jmv3XZch4gyt1
+O6VbuA1df74jrlZVlFjvH4GMKrLN5ptjnhi85WsGtAuYSyher4hYyw==
+-----END CERTIFICATE-----
+
+Certinomis - Root CA
+====================
+-----BEGIN CERTIFICATE-----
+MIIFkjCCA3qgAwIBAgIBATANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJGUjETMBEGA1UEChMK
+Q2VydGlub21pczEXMBUGA1UECxMOMDAwMiA0MzM5OTg5MDMxHTAbBgNVBAMTFENlcnRpbm9taXMg
+LSBSb290IENBMB4XDTEzMTAyMTA5MTcxOFoXDTMzMTAyMTA5MTcxOFowWjELMAkGA1UEBhMCRlIx
+EzARBgNVBAoTCkNlcnRpbm9taXMxFzAVBgNVBAsTDjAwMDIgNDMzOTk4OTAzMR0wGwYDVQQDExRD
+ZXJ0aW5vbWlzIC0gUm9vdCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANTMCQos
+P5L2fxSeC5yaah1AMGT9qt8OHgZbn1CF6s2Nq0Nn3rD6foCWnoR4kkjW4znuzuRZWJflLieY6pOo
+d5tK8O90gC3rMB+12ceAnGInkYjwSond3IjmFPnVAy//ldu9n+ws+hQVWZUKxkd8aRi5pwP5ynap
+z8dvtF4F/u7BUrJ1Mofs7SlmO/NKFoL21prbcpjp3vDFTKWrteoB4owuZH9kb/2jJZOLyKIOSY00
+8B/sWEUuNKqEUL3nskoTuLAPrjhdsKkb5nPJWqHZZkCqqU2mNAKthH6yI8H7KsZn9DS2sJVqM09x
+RLWtwHkziOC/7aOgFLScCbAK42C++PhmiM1b8XcF4LVzbsF9Ri6OSyemzTUK/eVNfaoqoynHWmgE
+6OXWk6RiwsXm9E/G+Z8ajYJJGYrKWUM66A0ywfRMEwNvbqY/kXPLynNvEiCL7sCCeN5LLsJJwx3t
+FvYk9CcbXFcx3FXuqB5vbKziRcxXV4p1VxngtViZSTYxPDMBbRZKzbgqg4SGm/lg0h9tkQPTYKbV
+PZrdd5A9NaSfD171UkRpucC63M9933zZxKyGIjK8e2uR73r4F2iw4lNVYC2vPsKD2NkJK/DAZNuH
+i5HMkesE/Xa0lZrmFAYb1TQdvtj/dBxThZngWVJKYe2InmtJiUZ+IFrZ50rlau7SZRFDAgMBAAGj
+YzBhMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTvkUz1pcMw6C8I
+6tNxIqSSaHh02TAfBgNVHSMEGDAWgBTvkUz1pcMw6C8I6tNxIqSSaHh02TANBgkqhkiG9w0BAQsF
+AAOCAgEAfj1U2iJdGlg+O1QnurrMyOMaauo++RLrVl89UM7g6kgmJs95Vn6RHJk/0KGRHCwPT5iV
+WVO90CLYiF2cN/z7ZMF4jIuaYAnq1fohX9B0ZedQxb8uuQsLrbWwF6YSjNRieOpWauwK0kDDPAUw
+Pk2Ut59KA9N9J0u2/kTO+hkzGm2kQtHdzMjI1xZSg081lLMSVX3l4kLr5JyTCcBMWwerx20RoFAX
+lCOotQqSD7J6wWAsOMwaplv/8gzjqh8c3LigkyfeY+N/IZ865Z764BNqdeuWXGKRlI5nU7aJ+BIJ
+y29SWwNyhlCVCNSNh4YVH5Uk2KRvms6knZtt0rJ2BobGVgjF6wnaNsIbW0G+YSrjcOa4pvi2WsS9
+Iff/ql+hbHY5ZtbqTFXhADObE5hjyW/QASAJN1LnDE8+zbz1X5YnpyACleAu6AdBBR8Vbtaw5Bng
+DwKTACdyxYvRVB9dSsNAl35VpnzBMwQUAR1JIGkLGZOdblgi90AMRgwjY/M50n92Uaf0yKHxDHYi
+I0ZSKS3io0EHVmmY0gUJvGnHWmHNj4FgFU2A3ZDifcRQ8ow7bkrHxuaAKzyBvBGAFhAn1/DNP3nM
+cyrDflOR1m749fPH0FFNjkulW+YZFzvWgQncItzujrnEj1PhZ7szuIgVRs/taTX/dQ1G885x4cVr
+hkIGuUE=
+-----END CERTIFICATE-----
+
+OISTE WISeKey Global Root GB CA
+===============================
+-----BEGIN CERTIFICATE-----
+MIIDtTCCAp2gAwIBAgIQdrEgUnTwhYdGs/gjGvbCwDANBgkqhkiG9w0BAQsFADBtMQswCQYDVQQG
+EwJDSDEQMA4GA1UEChMHV0lTZUtleTEiMCAGA1UECxMZT0lTVEUgRm91bmRhdGlvbiBFbmRvcnNl
+ZDEoMCYGA1UEAxMfT0lTVEUgV0lTZUtleSBHbG9iYWwgUm9vdCBHQiBDQTAeFw0xNDEyMDExNTAw
+MzJaFw0zOTEyMDExNTEwMzFaMG0xCzAJBgNVBAYTAkNIMRAwDgYDVQQKEwdXSVNlS2V5MSIwIAYD
+VQQLExlPSVNURSBGb3VuZGF0aW9uIEVuZG9yc2VkMSgwJgYDVQQDEx9PSVNURSBXSVNlS2V5IEds
+b2JhbCBSb290IEdCIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2Be3HEokKtaX
+scriHvt9OO+Y9bI5mE4nuBFde9IllIiCFSZqGzG7qFshISvYD06fWvGxWuR51jIjK+FTzJlFXHtP
+rby/h0oLS5daqPZI7H17Dc0hBt+eFf1Biki3IPShehtX1F1Q/7pn2COZH8g/497/b1t3sWtuuMlk
+9+HKQUYOKXHQuSP8yYFfTvdv37+ErXNku7dCjmn21HYdfp2nuFeKUWdy19SouJVUQHMD9ur06/4o
+Qnc/nSMbsrY9gBQHTC5P99UKFg29ZkM3fiNDecNAhvVMKdqOmq0NpQSHiB6F4+lT1ZvIiwNjeOvg
+GUpuuy9rM2RYk61pv48b74JIxwIDAQABo1EwTzALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB
+/zAdBgNVHQ4EFgQUNQ/INmNe4qPs+TtmFc5RUuORmj0wEAYJKwYBBAGCNxUBBAMCAQAwDQYJKoZI
+hvcNAQELBQADggEBAEBM+4eymYGQfp3FsLAmzYh7KzKNbrghcViXfa43FK8+5/ea4n32cZiZBKpD
+dHij40lhPnOMTZTg+XHEthYOU3gf1qKHLwI5gSk8rxWYITD+KJAAjNHhy/peyP34EEY7onhCkRd0
+VQreUGdNZtGn//3ZwLWoo4rOZvUPQ82nK1d7Y0Zqqi5S2PTt4W2tKZB4SLrhI6qjiey1q5bAtEui
+HZeeevJuQHHfaPFlTc58Bd9TZaml8LGXBHAVRgOY1NK/VLSgWH1Sb9pWJmLU2NuJMW8c8CLC02Ic
+Nc1MaRVUGpCY3useX8p3x8uOPUNpnJpY0CQ73xtAln41rYHHTnG6iBM=
+-----END CERTIFICATE-----
+
+Certification Authority of WoSign G2
+====================================
+-----BEGIN CERTIFICATE-----
+MIIDfDCCAmSgAwIBAgIQayXaioidfLwPBbOxemFFRDANBgkqhkiG9w0BAQsFADBYMQswCQYDVQQG
+EwJDTjEaMBgGA1UEChMRV29TaWduIENBIExpbWl0ZWQxLTArBgNVBAMTJENlcnRpZmljYXRpb24g
+QXV0aG9yaXR5IG9mIFdvU2lnbiBHMjAeFw0xNDExMDgwMDU4NThaFw00NDExMDgwMDU4NThaMFgx
+CzAJBgNVBAYTAkNOMRowGAYDVQQKExFXb1NpZ24gQ0EgTGltaXRlZDEtMCsGA1UEAxMkQ2VydGlm
+aWNhdGlvbiBBdXRob3JpdHkgb2YgV29TaWduIEcyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEAvsXEoCKASU+/2YcRxlPhuw+9YH+v9oIOH9ywjj2X4FA8jzrvZjtFB5sg+OPXJYY1kBai
+XW8wGQiHC38Gsp1ij96vkqVg1CuAmlI/9ZqD6TRay9nVYlzmDuDfBpgOgHzKtB0TiGsOqCR3A9Du
+W/PKaZE1OVbFbeP3PU9ekzgkyhjpJMuSA93MHD0JcOQg5PGurLtzaaNjOg9FD6FKmsLRY6zLEPg9
+5k4ot+vElbGs/V6r+kHLXZ1L3PR8du9nfwB6jdKgGlxNIuG12t12s9R23164i5jIFFTMaxeSt+BK
+v0mUYQs4kI9dJGwlezt52eJ+na2fmKEG/HgUYFf47oB3sQIDAQABo0IwQDAOBgNVHQ8BAf8EBAMC
+AQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU+mCp62XF3RYUCE4MD42b4Pdkr2cwDQYJKoZI
+hvcNAQELBQADggEBAFfDejaCnI2Y4qtAqkePx6db7XznPWZaOzG73/MWM5H8fHulwqZm46qwtyeY
+P0nXYGdnPzZPSsvxFPpahygc7Y9BMsaV+X3avXtbwrAh449G3CE4Q3RM+zD4F3LBMvzIkRfEzFg3
+TgvMWvchNSiDbGAtROtSjFA9tWwS1/oJu2yySrHFieT801LYYRf+epSEj3m2M1m6D8QL4nCgS3gu
++sif/a+RZQp4OBXllxcU3fngLDT4ONCEIgDAFFEYKwLcMFrw6AF8NTojrwjkr6qOKEJJLvD1mTS+
+7Q9LGOHSJDy7XUe3IfKN0QqZjuNuPq1w4I+5ysxugTH2e5x6eeRncRg=
+-----END CERTIFICATE-----
+
+CA WoSign ECC Root
+==================
+-----BEGIN CERTIFICATE-----
+MIICCTCCAY+gAwIBAgIQaEpYcIBr8I8C+vbe6LCQkDAKBggqhkjOPQQDAzBGMQswCQYDVQQGEwJD
+TjEaMBgGA1UEChMRV29TaWduIENBIExpbWl0ZWQxGzAZBgNVBAMTEkNBIFdvU2lnbiBFQ0MgUm9v
+dDAeFw0xNDExMDgwMDU4NThaFw00NDExMDgwMDU4NThaMEYxCzAJBgNVBAYTAkNOMRowGAYDVQQK
+ExFXb1NpZ24gQ0EgTGltaXRlZDEbMBkGA1UEAxMSQ0EgV29TaWduIEVDQyBSb290MHYwEAYHKoZI
+zj0CAQYFK4EEACIDYgAE4f2OuEMkq5Z7hcK6C62N4DrjJLnSsb6IOsq/Srj57ywvr1FQPEd1bPiU
+t5v8KB7FVMxjnRZLU8HnIKvNrCXSf4/CwVqCXjCLelTOA7WRf6qU0NGKSMyCBSah1VES1ns2o0Iw
+QDAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUqv3VWqP2h4syhf3R
+MluARZPzA7gwCgYIKoZIzj0EAwMDaAAwZQIxAOSkhLCB1T2wdKyUpOgOPQB0TKGXa/kNUTyh2Tv0
+Daupn75OcsqF1NnstTJFGG+rrQIwfcf3aWMvoeGY7xMQ0Xk/0f7qO3/eVvSQsRUR2LIiFdAvwyYu
+a/GRspBl9JrmkO5K
+-----END CERTIFICATE-----
+
+================================================================
+C: US
+O: GTE Corporation
+OU: GTE CyberTrust Solutions, Inc.
+CN: GTE CyberTrust Global Root
+--
+Not Before: 1998-08-13
+Not After:  2018-08-13
+Signature: md5WithRSAEncryption
+Key: RSA:1024
+-----BEGIN CERTIFICATE-----
+MIICWjCCAcMCAgGlMA0GCSqGSIb3DQEBBAUAMHUxCzAJBgNVBAYTAlVTMRgwFgYD
+VQQKEw9HVEUgQ29ycG9yYXRpb24xJzAlBgNVBAsTHkdURSBDeWJlclRydXN0IFNv
+bHV0aW9ucywgSW5jLjEjMCEGA1UEAxMaR1RFIEN5YmVyVHJ1c3QgR2xvYmFsIFJv
+b3QwHhcNOTgwODEzMDAyOTAwWhcNMTgwODEzMjM1OTAwWjB1MQswCQYDVQQGEwJV
+UzEYMBYGA1UEChMPR1RFIENvcnBvcmF0aW9uMScwJQYDVQQLEx5HVEUgQ3liZXJU
+cnVzdCBTb2x1dGlvbnMsIEluYy4xIzAhBgNVBAMTGkdURSBDeWJlclRydXN0IEds
+b2JhbCBSb290MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCVD6C28FCc6HrH
+iM3dFw4usJTQGz0O9pTAipTHBsiQl8i4ZBp6fmw8U+E3KHNgf7KXUwefU/ltWJTS
+r41tiGeA5u2ylc9yMcqlHHK6XALnZELn+aks1joNrI1CqiQBOeacPwGFVw1Yh0X4
+04Wqk2kmhXBIgD8SFcd5tB8FLztimQIDAQABMA0GCSqGSIb3DQEBBAUAA4GBAG3r
+GwnpXtlR22ciYaQqPEh346B8pt5zohQDhT37qw4wxYMWM4ETCJ57NE7fQMh017l9
+3PR2VX2bY1QY6fDq81yx2YtCHrnAlU66+tXifPVoYb+O7AWXX1uw16OFNMQkpw0P
+lZPvy5TYnh+dXIVtx6quTx8itc2VrbqnzPmrC3p/
+-----END CERTIFICATE-----
diff --git a/htdocs/includes/stripe/data/test.png b/htdocs/includes/stripe/data/test.png
new file mode 100644
index 0000000000000000000000000000000000000000..1914264c08781d1f30ee0b8482bccf44586f2dc1
GIT binary patch
literal 95
zcmeAS@N?(olHy`uVBq!ia0vp^j3CU&3?x-=hn)ga%mF?ju0VQumF+E%TuG2$FoVOh
l8)-lem#2$k2*>s01R$G<f$@>z9%CSj!PC{xWt~$(697H@6ZHT9

literal 0
HcmV?d00001

diff --git a/htdocs/includes/stripe/init.php b/htdocs/includes/stripe/init.php
new file mode 100644
index 00000000000..3e7f93e4e85
--- /dev/null
+++ b/htdocs/includes/stripe/init.php
@@ -0,0 +1,73 @@
+<?php
+
+// Stripe singleton
+require(dirname(__FILE__) . '/lib/Stripe.php');
+
+// Utilities
+require(dirname(__FILE__) . '/lib/Util/AutoPagingIterator.php');
+require(dirname(__FILE__) . '/lib/Util/RequestOptions.php');
+require(dirname(__FILE__) . '/lib/Util/Set.php');
+require(dirname(__FILE__) . '/lib/Util/Util.php');
+
+// HttpClient
+require(dirname(__FILE__) . '/lib/HttpClient/ClientInterface.php');
+require(dirname(__FILE__) . '/lib/HttpClient/CurlClient.php');
+
+// Errors
+require(dirname(__FILE__) . '/lib/Error/Base.php');
+require(dirname(__FILE__) . '/lib/Error/Api.php');
+require(dirname(__FILE__) . '/lib/Error/ApiConnection.php');
+require(dirname(__FILE__) . '/lib/Error/Authentication.php');
+require(dirname(__FILE__) . '/lib/Error/Card.php');
+require(dirname(__FILE__) . '/lib/Error/InvalidRequest.php');
+require(dirname(__FILE__) . '/lib/Error/Permission.php');
+require(dirname(__FILE__) . '/lib/Error/RateLimit.php');
+
+// Plumbing
+require(dirname(__FILE__) . '/lib/ApiResponse.php');
+require(dirname(__FILE__) . '/lib/JsonSerializable.php');
+require(dirname(__FILE__) . '/lib/StripeObject.php');
+require(dirname(__FILE__) . '/lib/ApiRequestor.php');
+require(dirname(__FILE__) . '/lib/ApiResource.php');
+require(dirname(__FILE__) . '/lib/SingletonApiResource.php');
+require(dirname(__FILE__) . '/lib/AttachedObject.php');
+require(dirname(__FILE__) . '/lib/ExternalAccount.php');
+
+// Stripe API Resources
+require(dirname(__FILE__) . '/lib/Account.php');
+require(dirname(__FILE__) . '/lib/AlipayAccount.php');
+require(dirname(__FILE__) . '/lib/ApplePayDomain.php');
+require(dirname(__FILE__) . '/lib/ApplicationFee.php');
+require(dirname(__FILE__) . '/lib/ApplicationFeeRefund.php');
+require(dirname(__FILE__) . '/lib/Balance.php');
+require(dirname(__FILE__) . '/lib/BalanceTransaction.php');
+require(dirname(__FILE__) . '/lib/BankAccount.php');
+require(dirname(__FILE__) . '/lib/BitcoinReceiver.php');
+require(dirname(__FILE__) . '/lib/BitcoinTransaction.php');
+require(dirname(__FILE__) . '/lib/Card.php');
+require(dirname(__FILE__) . '/lib/Charge.php');
+require(dirname(__FILE__) . '/lib/Collection.php');
+require(dirname(__FILE__) . '/lib/CountrySpec.php');
+require(dirname(__FILE__) . '/lib/Coupon.php');
+require(dirname(__FILE__) . '/lib/Customer.php');
+require(dirname(__FILE__) . '/lib/Dispute.php');
+require(dirname(__FILE__) . '/lib/Event.php');
+require(dirname(__FILE__) . '/lib/FileUpload.php');
+require(dirname(__FILE__) . '/lib/Invoice.php');
+require(dirname(__FILE__) . '/lib/InvoiceItem.php');
+require(dirname(__FILE__) . '/lib/Order.php');
+require(dirname(__FILE__) . '/lib/OrderReturn.php');
+require(dirname(__FILE__) . '/lib/Payout.php');
+require(dirname(__FILE__) . '/lib/Plan.php');
+require(dirname(__FILE__) . '/lib/Product.php');
+require(dirname(__FILE__) . '/lib/Recipient.php');
+require(dirname(__FILE__) . '/lib/RecipientTransfer.php');
+require(dirname(__FILE__) . '/lib/Refund.php');
+require(dirname(__FILE__) . '/lib/SKU.php');
+require(dirname(__FILE__) . '/lib/Source.php');
+require(dirname(__FILE__) . '/lib/Subscription.php');
+require(dirname(__FILE__) . '/lib/SubscriptionItem.php');
+require(dirname(__FILE__) . '/lib/ThreeDSecure.php');
+require(dirname(__FILE__) . '/lib/Token.php');
+require(dirname(__FILE__) . '/lib/Transfer.php');
+require(dirname(__FILE__) . '/lib/TransferReversal.php');
diff --git a/htdocs/includes/stripe/lib/Account.php b/htdocs/includes/stripe/lib/Account.php
new file mode 100644
index 00000000000..3899b8233a6
--- /dev/null
+++ b/htdocs/includes/stripe/lib/Account.php
@@ -0,0 +1,132 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class Account
+ *
+ * @property string $id
+ * @property string $object
+ * @property mixed $business_logo
+ * @property string $business_name
+ * @property mixed $business_url
+ * @property bool $charges_enabled
+ * @property string $country
+ * @property bool $debit_negative_balances
+ * @property mixed $decline_charge_on
+ * @property string $default_currency
+ * @property bool $details_submitted
+ * @property string $display_name
+ * @property string $email
+ * @property mixed $external_accounts
+ * @property mixed $legal_entity
+ * @property bool $managed
+ * @property mixed $payout_schedule
+ * @property mixed $payout_statement_descriptor
+ * @property bool $payouts_enabled
+ * @property mixed $product_description
+ * @property mixed $statement_descriptor
+ * @property mixed $support_email
+ * @property mixed $support_phone
+ * @property string $timezone
+ * @property mixed $tos_acceptance
+ * @property mixed $verification
+ * @property mixed $keys
+ *
+ * @package Stripe
+ */
+class Account extends ApiResource
+{
+    public function instanceUrl()
+    {
+        if ($this['id'] === null) {
+            return '/v1/account';
+        } else {
+            return parent::instanceUrl();
+        }
+    }
+
+    /**
+     * @param string|null $id
+     * @param array|string|null $opts
+     *
+     * @return Account
+     */
+    public static function retrieve($id = null, $opts = null)
+    {
+        if (!$opts && is_string($id) && substr($id, 0, 3) === 'sk_') {
+            $opts = $id;
+            $id = null;
+        }
+        return self::_retrieve($id, $opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return Account
+     */
+    public static function create($params = null, $opts = null)
+    {
+        return self::_create($params, $opts);
+    }
+
+    /**
+     * @param string $id The ID of the account to update.
+     * @param array|null $params
+     * @param array|string|null $options
+     *
+     * @return Account The updated account.
+     */
+    public static function update($id, $params = null, $options = null)
+    {
+        return self::_update($id, $params, $options);
+    }
+
+    /**
+     * @param array|string|null $opts
+     *
+     * @return Account
+     */
+    public function save($opts = null)
+    {
+        return $this->_save($opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return Account The deleted account.
+     */
+    public function delete($params = null, $opts = null)
+    {
+        return $this->_delete($params, $opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return Account The rejected account.
+     */
+    public function reject($params = null, $opts = null)
+    {
+        $url = $this->instanceUrl() . '/reject';
+        list($response, $opts) = $this->_request('post', $url, $params, $opts);
+        $this->refreshFrom($response, $opts);
+        return $this;
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return Collection of Accounts
+     */
+    public static function all($params = null, $opts = null)
+    {
+        return self::_all($params, $opts);
+    }
+}
diff --git a/htdocs/includes/stripe/lib/AlipayAccount.php b/htdocs/includes/stripe/lib/AlipayAccount.php
new file mode 100644
index 00000000000..1ba34bfa646
--- /dev/null
+++ b/htdocs/includes/stripe/lib/AlipayAccount.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class AlipayAccount
+ *
+ * @package Stripe
+ */
+class AlipayAccount extends ExternalAccount
+{
+
+}
diff --git a/htdocs/includes/stripe/lib/ApiRequestor.php b/htdocs/includes/stripe/lib/ApiRequestor.php
new file mode 100644
index 00000000000..03c718f4e1e
--- /dev/null
+++ b/htdocs/includes/stripe/lib/ApiRequestor.php
@@ -0,0 +1,292 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class ApiRequestor
+ *
+ * @package Stripe
+ */
+class ApiRequestor
+{
+    private $_apiKey;
+
+    private $_apiBase;
+
+    private static $_httpClient;
+
+    public function __construct($apiKey = null, $apiBase = null)
+    {
+        $this->_apiKey = $apiKey;
+        if (!$apiBase) {
+            $apiBase = Stripe::$apiBase;
+        }
+        $this->_apiBase = $apiBase;
+    }
+
+    private static function _encodeObjects($d)
+    {
+        if ($d instanceof ApiResource) {
+            return Util\Util::utf8($d->id);
+        } elseif ($d === true) {
+            return 'true';
+        } elseif ($d === false) {
+            return 'false';
+        } elseif (is_array($d)) {
+            $res = array();
+            foreach ($d as $k => $v) {
+                $res[$k] = self::_encodeObjects($v);
+            }
+            return $res;
+        } else {
+            return Util\Util::utf8($d);
+        }
+    }
+
+    /**
+     * @param string $method
+     * @param string $url
+     * @param array|null $params
+     * @param array|null $headers
+     *
+     * @return array An array whose first element is an API response and second
+     *    element is the API key used to make the request.
+     */
+    public function request($method, $url, $params = null, $headers = null)
+    {
+        if (!$params) {
+            $params = array();
+        }
+        if (!$headers) {
+            $headers = array();
+        }
+        list($rbody, $rcode, $rheaders, $myApiKey) =
+        $this->_requestRaw($method, $url, $params, $headers);
+        $json = $this->_interpretResponse($rbody, $rcode, $rheaders);
+        $resp = new ApiResponse($rbody, $rcode, $rheaders, $json);
+        return array($resp, $myApiKey);
+    }
+
+    /**
+     * @param string $rbody A JSON string.
+     * @param int $rcode
+     * @param array $rheaders
+     * @param array $resp
+     *
+     * @throws Error\InvalidRequest if the error is caused by the user.
+     * @throws Error\Authentication if the error is caused by a lack of
+     *    permissions.
+     * @throws Error\Permission if the error is caused by insufficient
+     *    permissions.
+     * @throws Error\Card if the error is the error code is 402 (payment
+     *    required)
+     * @throws Error\RateLimit if the error is caused by too many requests
+     *    hitting the API.
+     * @throws Error\Api otherwise.
+     */
+    public function handleApiError($rbody, $rcode, $rheaders, $resp)
+    {
+        if (!is_array($resp) || !isset($resp['error'])) {
+            $msg = "Invalid response object from API: $rbody "
+              . "(HTTP response code was $rcode)";
+            throw new Error\Api($msg, $rcode, $rbody, $resp, $rheaders);
+        }
+
+        $error = $resp['error'];
+        $msg = isset($error['message']) ? $error['message'] : null;
+        $param = isset($error['param']) ? $error['param'] : null;
+        $code = isset($error['code']) ? $error['code'] : null;
+
+        switch ($rcode) {
+            case 400:
+                // 'rate_limit' code is deprecated, but left here for backwards compatibility
+                // for API versions earlier than 2015-09-08
+                if ($code == 'rate_limit') {
+                    throw new Error\RateLimit($msg, $param, $rcode, $rbody, $resp, $rheaders);
+                }
+
+                // intentional fall-through
+            case 404:
+                throw new Error\InvalidRequest($msg, $param, $rcode, $rbody, $resp, $rheaders);
+            case 401:
+                throw new Error\Authentication($msg, $rcode, $rbody, $resp, $rheaders);
+            case 402:
+                throw new Error\Card($msg, $param, $code, $rcode, $rbody, $resp, $rheaders);
+            case 403:
+                throw new Error\Permission($msg, $rcode, $rbody, $resp, $rheaders);
+            case 429:
+                throw new Error\RateLimit($msg, $param, $rcode, $rbody, $resp, $rheaders);
+            default:
+                throw new Error\Api($msg, $rcode, $rbody, $resp, $rheaders);
+        }
+    }
+
+    private static function _formatAppInfo($appInfo)
+    {
+        if ($appInfo !== null) {
+            $string = $appInfo['name'];
+            if ($appInfo['version'] !== null) {
+                $string .= '/' . $appInfo['version'];
+            }
+            if ($appInfo['url'] !== null) {
+                $string .= ' (' . $appInfo['url'] . ')';
+            }
+            return $string;
+        } else {
+            return null;
+        }
+    }
+
+    private static function _defaultHeaders($apiKey)
+    {
+        $appInfo = Stripe::getAppInfo();
+
+        $uaString = 'Stripe/v1 PhpBindings/' . Stripe::VERSION;
+
+        $langVersion = phpversion();
+        $uname = php_uname();
+
+        $httplib = 'unknown';
+        $ssllib = 'unknown';
+
+        if (function_exists('curl_version')) {
+            $curlVersion = curl_version();
+            $httplib = 'curl ' . $curlVersion['version'];
+            $ssllib = $curlVersion['ssl_version'];
+        }
+
+        $appInfo = Stripe::getAppInfo();
+        $ua = array(
+            'bindings_version' => Stripe::VERSION,
+            'lang' => 'php',
+            'lang_version' => $langVersion,
+            'publisher' => 'stripe',
+            'uname' => $uname,
+            'httplib' => $httplib,
+            'ssllib' => $ssllib,
+        );
+        if ($appInfo !== null) {
+            $uaString .= ' ' . self::_formatAppInfo($appInfo);
+            $ua['application'] = $appInfo;
+        }
+
+        $defaultHeaders = array(
+            'X-Stripe-Client-User-Agent' => json_encode($ua),
+            'User-Agent' => $uaString,
+            'Authorization' => 'Bearer ' . $apiKey,
+        );
+        return $defaultHeaders;
+    }
+
+    private function _requestRaw($method, $url, $params, $headers)
+    {
+        $myApiKey = $this->_apiKey;
+        if (!$myApiKey) {
+            $myApiKey = Stripe::$apiKey;
+        }
+
+        if (!$myApiKey) {
+            $msg = 'No API key provided.  (HINT: set your API key using '
+              . '"Stripe::setApiKey(<API-KEY>)".  You can generate API keys from '
+              . 'the Stripe web interface.  See https://stripe.com/api for '
+              . 'details, or email support@stripe.com if you have any questions.';
+            throw new Error\Authentication($msg);
+        }
+
+        $absUrl = $this->_apiBase.$url;
+        $params = self::_encodeObjects($params);
+        $defaultHeaders = $this->_defaultHeaders($myApiKey);
+        if (Stripe::$apiVersion) {
+            $defaultHeaders['Stripe-Version'] = Stripe::$apiVersion;
+        }
+
+        if (Stripe::$accountId) {
+            $defaultHeaders['Stripe-Account'] = Stripe::$accountId;
+        }
+
+        $hasFile = false;
+        $hasCurlFile = class_exists('\CURLFile', false);
+        foreach ($params as $k => $v) {
+            if (is_resource($v)) {
+                $hasFile = true;
+                $params[$k] = self::_processResourceParam($v, $hasCurlFile);
+            } elseif ($hasCurlFile && $v instanceof \CURLFile) {
+                $hasFile = true;
+            }
+        }
+
+        if ($hasFile) {
+            $defaultHeaders['Content-Type'] = 'multipart/form-data';
+        } else {
+            $defaultHeaders['Content-Type'] = 'application/x-www-form-urlencoded';
+        }
+
+        $combinedHeaders = array_merge($defaultHeaders, $headers);
+        $rawHeaders = array();
+
+        foreach ($combinedHeaders as $header => $value) {
+            $rawHeaders[] = $header . ': ' . $value;
+        }
+
+        list($rbody, $rcode, $rheaders) = $this->httpClient()->request(
+            $method,
+            $absUrl,
+            $rawHeaders,
+            $params,
+            $hasFile
+        );
+        return array($rbody, $rcode, $rheaders, $myApiKey);
+    }
+
+    private function _processResourceParam($resource, $hasCurlFile)
+    {
+        if (get_resource_type($resource) !== 'stream') {
+            throw new Error\Api(
+                'Attempted to upload a resource that is not a stream'
+            );
+        }
+
+        $metaData = stream_get_meta_data($resource);
+        if ($metaData['wrapper_type'] !== 'plainfile') {
+            throw new Error\Api(
+                'Only plainfile resource streams are supported'
+            );
+        }
+
+        if ($hasCurlFile) {
+            // We don't have the filename or mimetype, but the API doesn't care
+            return new \CURLFile($metaData['uri']);
+        } else {
+            return '@'.$metaData['uri'];
+        }
+    }
+
+    private function _interpretResponse($rbody, $rcode, $rheaders)
+    {
+        $resp = json_decode($rbody, true);
+        $jsonError = json_last_error();
+        if ($resp === null && $jsonError !== JSON_ERROR_NONE) {
+            $msg = "Invalid response body from API: $rbody "
+              . "(HTTP response code was $rcode, json_last_error() was $jsonError)";
+            throw new Error\Api($msg, $rcode, $rbody);
+        }
+
+        if ($rcode < 200 || $rcode >= 300) {
+            $this->handleApiError($rbody, $rcode, $rheaders, $resp);
+        }
+        return $resp;
+    }
+
+    public static function setHttpClient($client)
+    {
+        self::$_httpClient = $client;
+    }
+
+    private function httpClient()
+    {
+        if (!self::$_httpClient) {
+            self::$_httpClient = HttpClient\CurlClient::instance();
+        }
+        return self::$_httpClient;
+    }
+}
diff --git a/htdocs/includes/stripe/lib/ApiResource.php b/htdocs/includes/stripe/lib/ApiResource.php
new file mode 100644
index 00000000000..0c03d49c3b9
--- /dev/null
+++ b/htdocs/includes/stripe/lib/ApiResource.php
@@ -0,0 +1,203 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class ApiResource
+ *
+ * @package Stripe
+ */
+abstract class ApiResource extends StripeObject
+{
+    private static $HEADERS_TO_PERSIST = array('Stripe-Account' => true, 'Stripe-Version' => true);
+
+    public static function baseUrl()
+    {
+        return Stripe::$apiBase;
+    }
+
+    /**
+     * @return ApiResource The refreshed resource.
+     */
+    public function refresh()
+    {
+        $requestor = new ApiRequestor($this->_opts->apiKey, static::baseUrl());
+        $url = $this->instanceUrl();
+
+        list($response, $this->_opts->apiKey) = $requestor->request(
+            'get',
+            $url,
+            $this->_retrieveOptions,
+            $this->_opts->headers
+        );
+        $this->setLastResponse($response);
+        $this->refreshFrom($response->json, $this->_opts);
+        return $this;
+    }
+
+    /**
+     * @return string The name of the class, with namespacing and underscores
+     *    stripped.
+     */
+    public static function className()
+    {
+        $class = get_called_class();
+        // Useful for namespaces: Foo\Charge
+        if ($postfixNamespaces = strrchr($class, '\\')) {
+            $class = substr($postfixNamespaces, 1);
+        }
+        // Useful for underscored 'namespaces': Foo_Charge
+        if ($postfixFakeNamespaces = strrchr($class, '')) {
+            $class = $postfixFakeNamespaces;
+        }
+        if (substr($class, 0, strlen('Stripe')) == 'Stripe') {
+            $class = substr($class, strlen('Stripe'));
+        }
+        $class = str_replace('_', '', $class);
+        $name = urlencode($class);
+        $name = strtolower($name);
+        return $name;
+    }
+
+    /**
+     * @return string The endpoint URL for the given class.
+     */
+    public static function classUrl()
+    {
+        $base = static::className();
+        return "/v1/${base}s";
+    }
+
+    /**
+     * @return string The instance endpoint URL for the given class.
+     */
+    public static function resourceUrl($id)
+    {
+        if ($id === null) {
+            $class = get_called_class();
+            $message = "Could not determine which URL to request: "
+               . "$class instance has invalid ID: $id";
+            throw new Error\InvalidRequest($message, null);
+        }
+        $id = Util\Util::utf8($id);
+        $base = static::classUrl();
+        $extn = urlencode($id);
+        return "$base/$extn";
+    }
+
+    /**
+     * @return string The full API URL for this API resource.
+     */
+    public function instanceUrl()
+    {
+        return static::resourceUrl($this['id']);
+    }
+
+    protected static function _validateParams($params = null)
+    {
+        if ($params && !is_array($params)) {
+            $message = "You must pass an array as the first argument to Stripe API "
+               . "method calls.  (HINT: an example call to create a charge "
+               . "would be: \"Stripe\\Charge::create(array('amount' => 100, "
+               . "'currency' => 'usd', 'card' => array('number' => "
+               . "4242424242424242, 'exp_month' => 5, 'exp_year' => 2015)))\")";
+            throw new Error\Api($message);
+        }
+    }
+
+    protected function _request($method, $url, $params = array(), $options = null)
+    {
+        $opts = $this->_opts->merge($options);
+        list($resp, $options) = static::_staticRequest($method, $url, $params, $opts);
+        $this->setLastResponse($resp);
+        return array($resp->json, $options);
+    }
+
+    protected static function _staticRequest($method, $url, $params, $options)
+    {
+        $opts = Util\RequestOptions::parse($options);
+        $requestor = new ApiRequestor($opts->apiKey, static::baseUrl());
+        list($response, $opts->apiKey) = $requestor->request($method, $url, $params, $opts->headers);
+        foreach ($opts->headers as $k => $v) {
+            if (!array_key_exists($k, self::$HEADERS_TO_PERSIST)) {
+                unset($opts->headers[$k]);
+            }
+        }
+        return array($response, $opts);
+    }
+
+    protected static function _retrieve($id, $options = null)
+    {
+        $opts = Util\RequestOptions::parse($options);
+        $instance = new static($id, $opts);
+        $instance->refresh();
+        return $instance;
+    }
+
+    protected static function _all($params = null, $options = null)
+    {
+        self::_validateParams($params);
+        $url = static::classUrl();
+
+        list($response, $opts) = static::_staticRequest('get', $url, $params, $options);
+        $obj = Util\Util::convertToStripeObject($response->json, $opts);
+        if (!is_a($obj, 'Stripe\\Collection')) {
+            $class = get_class($obj);
+            $message = "Expected type \"Stripe\\Collection\", got \"$class\" instead";
+            throw new Error\Api($message);
+        }
+        $obj->setLastResponse($response);
+        $obj->setRequestParams($params);
+        return $obj;
+    }
+
+    protected static function _create($params = null, $options = null)
+    {
+        self::_validateParams($params);
+        $url = static::classUrl();
+
+        list($response, $opts) = static::_staticRequest('post', $url, $params, $options);
+        $obj = Util\Util::convertToStripeObject($response->json, $opts);
+        $obj->setLastResponse($response);
+        return $obj;
+    }
+
+    /**
+     * @param string $id The ID of the API resource to update.
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return ApiResource the updated API resource
+     */
+    protected static function _update($id, $params = null, $options = null)
+    {
+        self::_validateParams($params);
+        $url = static::resourceUrl($id);
+
+        list($response, $opts) = static::_staticRequest('post', $url, $params, $options);
+        $obj = Util\Util::convertToStripeObject($response->json, $opts);
+        $obj->setLastResponse($response);
+        return $obj;
+    }
+
+    protected function _save($options = null)
+    {
+        $params = $this->serializeParameters();
+        if (count($params) > 0) {
+            $url = $this->instanceUrl();
+            list($response, $opts) = $this->_request('post', $url, $params, $options);
+            $this->refreshFrom($response, $opts);
+        }
+        return $this;
+    }
+
+    protected function _delete($params = null, $options = null)
+    {
+        self::_validateParams($params);
+
+        $url = $this->instanceUrl();
+        list($response, $opts) = $this->_request('delete', $url, $params, $options);
+        $this->refreshFrom($response, $opts);
+        return $this;
+    }
+}
diff --git a/htdocs/includes/stripe/lib/ApiResponse.php b/htdocs/includes/stripe/lib/ApiResponse.php
new file mode 100644
index 00000000000..31f54a50df0
--- /dev/null
+++ b/htdocs/includes/stripe/lib/ApiResponse.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class ApiResponse
+ *
+ * @package Stripe
+ */
+class ApiResponse
+{
+    public $headers;
+    public $body;
+    public $json;
+    public $code;
+
+    /**
+     * @param string $body
+     * @param integer $code
+     * @param array|null $headers
+     * @param array|null $json
+     *
+     * @return obj An APIResponse
+     */
+    public function __construct($body, $code, $headers, $json)
+    {
+        $this->body = $body;
+        $this->code = $code;
+        $this->headers = $headers;
+        $this->json = $json;
+    }
+}
diff --git a/htdocs/includes/stripe/lib/ApplePayDomain.php b/htdocs/includes/stripe/lib/ApplePayDomain.php
new file mode 100644
index 00000000000..8c522c8b933
--- /dev/null
+++ b/htdocs/includes/stripe/lib/ApplePayDomain.php
@@ -0,0 +1,65 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class ApplePayDomain
+ *
+ * @package Stripe
+ */
+class ApplePayDomain extends ApiResource
+{
+    
+    /**
+     * @return string The class URL for this resource. It needs to be special
+     *    cased because it doesn't fit into the standard resource pattern.
+     */
+    public static function classUrl()
+    {
+        return '/v1/apple_pay/domains';
+    }
+
+    /**
+     * @param string $id The ID of the domain to retrieve.
+     * @param array|string|null $opts
+     *
+     * @return ApplePayDomain
+     */
+    public static function retrieve($id, $opts = null)
+    {
+        return self::_retrieve($id, $opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return ApplePayDomain The created domain.
+     */
+    public static function create($params = null, $opts = null)
+    {
+        return self::_create($params, $opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return ApplePayDomain The deleted domain.
+     */
+    public function delete($params = null, $opts = null)
+    {
+        return $this->_delete($params, $opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return Collection of ApplePayDomains
+     */
+    public static function all($params = null, $opts = null)
+    {
+        return self::_all($params, $opts);
+    }
+}
diff --git a/htdocs/includes/stripe/lib/ApplicationFee.php b/htdocs/includes/stripe/lib/ApplicationFee.php
new file mode 100644
index 00000000000..8145541c17e
--- /dev/null
+++ b/htdocs/includes/stripe/lib/ApplicationFee.php
@@ -0,0 +1,69 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class ApplicationFee
+ *
+ * @package Stripe
+ */
+class ApplicationFee extends ApiResource
+{
+    /**
+     * This is a special case because the application fee endpoint has an
+     *    underscore in it. The parent `className` function strips underscores.
+     *
+     * @return string The name of the class.
+     */
+    public static function className()
+    {
+        return 'application_fee';
+    }
+
+    /**
+     * @param string $id The ID of the application fee to retrieve.
+     * @param array|string|null $opts
+     *
+     * @return ApplicationFee
+     */
+    public static function retrieve($id, $opts = null)
+    {
+        return self::_retrieve($id, $opts);
+    }
+
+    /**
+     * @param string $id The ID of the application fee to update.
+     * @param array|null $params
+     * @param array|string|null $options
+     *
+     * @return ApplicationFee The updated application fee.
+     */
+    public static function update($id, $params = null, $options = null)
+    {
+        return self::_update($id, $params, $options);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return Collection of ApplicationFees
+     */
+    public static function all($params = null, $opts = null)
+    {
+        return self::_all($params, $opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return ApplicationFee The refunded application fee.
+     */
+    public function refund($params = null, $opts = null)
+    {
+        $this->refunds->create($params, $opts);
+        $this->refresh();
+        return $this;
+    }
+}
diff --git a/htdocs/includes/stripe/lib/ApplicationFeeRefund.php b/htdocs/includes/stripe/lib/ApplicationFeeRefund.php
new file mode 100644
index 00000000000..44695ef88cd
--- /dev/null
+++ b/htdocs/includes/stripe/lib/ApplicationFeeRefund.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class ApplicationFeeRefund
+ *
+ * @package Stripe
+ */
+class ApplicationFeeRefund extends ApiResource
+{
+    /**
+     * @return string The API URL for this Stripe refund.
+     */
+    public function instanceUrl()
+    {
+        $id = $this['id'];
+        $fee = $this['fee'];
+        if (!$id) {
+            throw new Error\InvalidRequest(
+                "Could not determine which URL to request: " .
+                "class instance has invalid ID: $id",
+                null
+            );
+        }
+        $id = Util\Util::utf8($id);
+        $fee = Util\Util::utf8($fee);
+
+        $base = ApplicationFee::classUrl();
+        $feeExtn = urlencode($fee);
+        $extn = urlencode($id);
+        return "$base/$feeExtn/refunds/$extn";
+    }
+
+    /**
+     * @param array|string|null $opts
+     *
+     * @return ApplicationFeeRefund The saved refund.
+     */
+    public function save($opts = null)
+    {
+        return $this->_save($opts);
+    }
+}
diff --git a/htdocs/includes/stripe/lib/AttachedObject.php b/htdocs/includes/stripe/lib/AttachedObject.php
new file mode 100644
index 00000000000..489517d6693
--- /dev/null
+++ b/htdocs/includes/stripe/lib/AttachedObject.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class AttachedObject
+ *
+ * e.g. metadata on Stripe objects.
+ *
+ * @package Stripe
+ */
+class AttachedObject extends StripeObject
+{
+    /**
+     * Updates this object.
+     *
+     * @param array $properties A mapping of properties to update on this object.
+     */
+    public function replaceWith($properties)
+    {
+        $removed = array_diff(array_keys($this->_values), array_keys($properties));
+        // Don't unset, but rather set to null so we send up '' for deletion.
+        foreach ($removed as $k) {
+            $this->$k = null;
+        }
+
+        foreach ($properties as $k => $v) {
+            $this->$k = $v;
+        }
+    }
+}
diff --git a/htdocs/includes/stripe/lib/Balance.php b/htdocs/includes/stripe/lib/Balance.php
new file mode 100644
index 00000000000..3b551eb84df
--- /dev/null
+++ b/htdocs/includes/stripe/lib/Balance.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class Balance
+ *
+ * @property string $object
+ * @property mixed $available
+ * @property bool $livedmode
+ * @property mixed $pending
+ *
+ * @package Stripe
+ */
+class Balance extends SingletonApiResource
+{
+    /**
+     * @param array|string|null $opts
+     *
+     * @return Balance
+     */
+    public static function retrieve($opts = null)
+    {
+        return self::_singletonRetrieve($opts);
+    }
+}
diff --git a/htdocs/includes/stripe/lib/BalanceTransaction.php b/htdocs/includes/stripe/lib/BalanceTransaction.php
new file mode 100644
index 00000000000..b84619ece81
--- /dev/null
+++ b/htdocs/includes/stripe/lib/BalanceTransaction.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class BalanceTransaction
+ *
+ * @property string $id
+ * @property string $object
+ * @property int $amount
+ * @property int $available_on
+ * @property int $created
+ * @property string $currency
+ * @property string $description
+ * @property int $fee
+ * @property mixed $fee_details
+ * @property int $net
+ * @property string $source
+ * @property mixed $sourced_transfers
+ * @property string $status
+ * @property string $type
+ *
+ * @package Stripe
+ */
+class BalanceTransaction extends ApiResource
+{
+    /**
+     * @return string The class URL for this resource. It needs to be special
+     *    cased because it doesn't fit into the standard resource pattern.
+     */
+    public static function classUrl()
+    {
+        return "/v1/balance/history";
+    }
+
+    /**
+     * @param string $id The ID of the balance transaction to retrieve.
+     * @param array|string|null $opts
+     *
+     * @return BalanceTransaction
+     */
+    public static function retrieve($id, $opts = null)
+    {
+        return self::_retrieve($id, $opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return Collection of BalanceTransactions
+     */
+    public static function all($params = null, $opts = null)
+    {
+        return self::_all($params, $opts);
+    }
+}
diff --git a/htdocs/includes/stripe/lib/BankAccount.php b/htdocs/includes/stripe/lib/BankAccount.php
new file mode 100644
index 00000000000..2f11c067c36
--- /dev/null
+++ b/htdocs/includes/stripe/lib/BankAccount.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class BankAccount
+ *
+ * @package Stripe
+ */
+class BankAccount extends ExternalAccount
+{
+    /**
+     * @param array|null $params
+     * @param array|string|null $options
+     *
+     * @return BankAccount The verified bank account.
+     */
+    public function verify($params = null, $options = null)
+    {
+        $url = $this->instanceUrl() . '/verify';
+        list($response, $opts) = $this->_request('post', $url, $params, $options);
+        $this->refreshFrom($response, $opts);
+        return $this;
+    }
+}
diff --git a/htdocs/includes/stripe/lib/BitcoinReceiver.php b/htdocs/includes/stripe/lib/BitcoinReceiver.php
new file mode 100644
index 00000000000..3f2c835b96f
--- /dev/null
+++ b/htdocs/includes/stripe/lib/BitcoinReceiver.php
@@ -0,0 +1,85 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class BitcoinReceiver
+ *
+ * @package Stripe
+ */
+class BitcoinReceiver extends ExternalAccount
+{
+    /**
+     * @return string The class URL for this resource. It needs to be special
+     *    cased because it doesn't fit into the standard resource pattern.
+     */
+    public static function classUrl()
+    {
+        return "/v1/bitcoin/receivers";
+    }
+
+    /**
+     * @return string The instance URL for this resource. It needs to be special
+     *    cased because it doesn't fit into the standard resource pattern.
+     */
+    public function instanceUrl()
+    {
+        $result = parent::instanceUrl();
+        if ($result) {
+            return $result;
+        } else {
+            $id = $this['id'];
+            $id = Util\Util::utf8($id);
+            $extn = urlencode($id);
+            $base = BitcoinReceiver::classUrl();
+            return "$base/$extn";
+        }
+    }
+
+    /**
+     * @param string $id The ID of the Bitcoin Receiver to retrieve.
+     * @param array|string|null $opts
+     *
+     * @return BitcoinReceiver
+     */
+    public static function retrieve($id, $opts = null)
+    {
+        return self::_retrieve($id, $opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return Collection of BitcoinReceivers
+     */
+    public static function all($params = null, $opts = null)
+    {
+        return self::_all($params, $opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return BitcoinReceiver The created Bitcoin Receiver item.
+     */
+    public static function create($params = null, $opts = null)
+    {
+        return self::_create($params, $opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $options
+     *
+     * @return BitcoinReceiver The refunded Bitcoin Receiver item.
+     */
+    public function refund($params = null, $options = null)
+    {
+        $url = $this->instanceUrl() . '/refund';
+        list($response, $opts) = $this->_request('post', $url, $params, $options);
+        $this->refreshFrom($response, $opts);
+        return $this;
+    }
+}
diff --git a/htdocs/includes/stripe/lib/BitcoinTransaction.php b/htdocs/includes/stripe/lib/BitcoinTransaction.php
new file mode 100644
index 00000000000..6b8e5421124
--- /dev/null
+++ b/htdocs/includes/stripe/lib/BitcoinTransaction.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class BitcoinTransaction
+ *
+ * @package Stripe
+ */
+class BitcoinTransaction extends ApiResource
+{
+
+}
diff --git a/htdocs/includes/stripe/lib/Card.php b/htdocs/includes/stripe/lib/Card.php
new file mode 100644
index 00000000000..227bee13873
--- /dev/null
+++ b/htdocs/includes/stripe/lib/Card.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class Card
+ *
+ * @package Stripe
+ */
+class Card extends ExternalAccount
+{
+
+}
diff --git a/htdocs/includes/stripe/lib/Charge.php b/htdocs/includes/stripe/lib/Charge.php
new file mode 100644
index 00000000000..ab1d5a33f8a
--- /dev/null
+++ b/htdocs/includes/stripe/lib/Charge.php
@@ -0,0 +1,184 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class Charge
+ *
+ * @property string $id
+ * @property string $object
+ * @property int $amount
+ * @property int $amount_refunded
+ * @property mixed $application_fee
+ * @property string $balance_transaction
+ * @property bool $captured
+ * @property int $created
+ * @property string $currency
+ * @property string $customer
+ * @property mixed $description
+ * @property mixed $destination
+ * @property string|null $dispute
+ * @property mixed $failure_code
+ * @property mixed $failure_message
+ * @property mixed $fraud_details
+ * @property mixed $invoice
+ * @property bool $livemode
+ * @property mixed $metadata
+ * @property mixed $order
+ * @property bool $paid
+ * @property mixed $receipt_email
+ * @property mixed $receipt_number
+ * @property bool $refunded
+ * @property mixed $refunds
+ * @property mixed $shipping
+ * @property mixed $source
+ * @property mixed $source_transfer
+ * @property mixed $statement_descriptor
+ * @property string $status
+ *
+ * @package Stripe
+ */
+class Charge extends ApiResource
+{
+    /**
+     * @param string $id The ID of the charge to retrieve.
+     * @param array|string|null $options
+     *
+     * @return Charge
+     */
+    public static function retrieve($id, $options = null)
+    {
+        return self::_retrieve($id, $options);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $options
+     *
+     * @return Collection of Charges
+     */
+    public static function all($params = null, $options = null)
+    {
+        return self::_all($params, $options);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $options
+     *
+     * @return Charge The created charge.
+     */
+    public static function create($params = null, $options = null)
+    {
+        return self::_create($params, $options);
+    }
+
+    /**
+     * @param string $id The ID of the charge to update.
+     * @param array|null $params
+     * @param array|string|null $options
+     *
+     * @return Charge The updated charge.
+     */
+    public static function update($id, $params = null, $options = null)
+    {
+        return self::_update($id, $params, $options);
+    }
+
+    /**
+     * @param array|string|null $options
+     *
+     * @return Charge The saved charge.
+     */
+    public function save($options = null)
+    {
+        return $this->_save($options);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $options
+     *
+     * @return Charge The refunded charge.
+     */
+    public function refund($params = null, $options = null)
+    {
+        $url = $this->instanceUrl() . '/refund';
+        list($response, $opts) = $this->_request('post', $url, $params, $options);
+        $this->refreshFrom($response, $opts);
+        return $this;
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $options
+     *
+     * @return Charge The captured charge.
+     */
+    public function capture($params = null, $options = null)
+    {
+        $url = $this->instanceUrl() . '/capture';
+        list($response, $opts) = $this->_request('post', $url, $params, $options);
+        $this->refreshFrom($response, $opts);
+        return $this;
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $options
+     *
+     * @deprecated Use the `save` method on the Dispute object
+     *
+     * @return array The updated dispute.
+     */
+    public function updateDispute($params = null, $options = null)
+    {
+        $url = $this->instanceUrl() . '/dispute';
+        list($response, $opts) = $this->_request('post', $url, $params, $options);
+        $this->refreshFrom(array('dispute' => $response), $opts, true);
+        return $this->dispute;
+    }
+
+    /**
+     * @param array|string|null $options
+     *
+     * @deprecated Use the `close` method on the Dispute object
+     *
+     * @return Charge The updated charge.
+     */
+    public function closeDispute($options = null)
+    {
+        $url = $this->instanceUrl() . '/dispute/close';
+        list($response, $opts) = $this->_request('post', $url, null, $options);
+        $this->refreshFrom($response, $opts);
+        return $this;
+    }
+
+    /**
+     * @param array|string|null $opts
+     *
+     * @return Charge The updated charge.
+     */
+    public function markAsFraudulent($opts = null)
+    {
+        $params = array('fraud_details' => array('user_report' => 'fraudulent'));
+        $url = $this->instanceUrl();
+        list($response, $opts) = $this->_request('post', $url, $params, $opts);
+        $this->refreshFrom($response, $opts);
+        return $this;
+    }
+
+    /**
+     * @param array|string|null $opts
+     *
+     * @return Charge The updated charge.
+     */
+    public function markAsSafe($opts = null)
+    {
+        $params = array('fraud_details' => array('user_report' => 'safe'));
+        $url = $this->instanceUrl();
+        list($response, $opts) = $this->_request('post', $url, $params, $opts);
+        $this->refreshFrom($response, $opts);
+        return $this;
+    }
+}
diff --git a/htdocs/includes/stripe/lib/Collection.php b/htdocs/includes/stripe/lib/Collection.php
new file mode 100644
index 00000000000..0beb3a18918
--- /dev/null
+++ b/htdocs/includes/stripe/lib/Collection.php
@@ -0,0 +1,87 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class Collection
+ *
+ * @property string $object
+ * @property string $url
+ * @property bool $has_more
+ * @property mixed $data
+ *
+ * @package Stripe
+ */
+class Collection extends ApiResource
+{
+    protected $_requestParams = array();
+
+    public function setRequestParams($params)
+    {
+        $this->_requestParams = $params;
+    }
+
+    public function all($params = null, $opts = null)
+    {
+        list($url, $params) = $this->extractPathAndUpdateParams($params);
+
+        list($response, $opts) = $this->_request('get', $url, $params, $opts);
+        $this->_requestParams = $params;
+        return Util\Util::convertToStripeObject($response, $opts);
+    }
+
+    public function create($params = null, $opts = null)
+    {
+        list($url, $params) = $this->extractPathAndUpdateParams($params);
+
+        list($response, $opts) = $this->_request('post', $url, $params, $opts);
+        $this->_requestParams = $params;
+        return Util\Util::convertToStripeObject($response, $opts);
+    }
+
+    public function retrieve($id, $params = null, $opts = null)
+    {
+        list($url, $params) = $this->extractPathAndUpdateParams($params);
+
+        $id = Util\Util::utf8($id);
+        $extn = urlencode($id);
+        list($response, $opts) = $this->_request(
+            'get',
+            "$url/$extn",
+            $params,
+            $opts
+        );
+        $this->_requestParams = $params;
+        return Util\Util::convertToStripeObject($response, $opts);
+    }
+
+    /**
+     * @return AutoPagingIterator An iterator that can be used to iterate
+     *    across all objects across all pages. As page boundaries are
+     *    encountered, the next page will be fetched automatically for
+     *    continued iteration.
+     */
+    public function autoPagingIterator()
+    {
+        return new Util\AutoPagingIterator($this, $this->_requestParams);
+    }
+
+    private function extractPathAndUpdateParams($params)
+    {
+        $url = parse_url($this->url);
+        if (!isset($url['path'])) {
+            throw new Error\Api("Could not parse list url into parts: $url");
+        }
+
+        if (isset($url['query'])) {
+            // If the URL contains a query param, parse it out into $params so they
+            // don't interact weirdly with each other.
+            $query = array();
+            parse_str($url['query'], $query);
+            // PHP 5.2 doesn't support the ?: operator :(
+            $params = array_merge($params ? $params : array(), $query);
+        }
+
+        return array($url['path'], $params);
+    }
+}
diff --git a/htdocs/includes/stripe/lib/CountrySpec.php b/htdocs/includes/stripe/lib/CountrySpec.php
new file mode 100644
index 00000000000..dabb88b4522
--- /dev/null
+++ b/htdocs/includes/stripe/lib/CountrySpec.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class CountrySpec
+ *
+ * @package Stripe
+ */
+class CountrySpec extends ApiResource
+{
+    /**
+     * This is a special case because the country specs endpoint has an
+     *    underscore in it. The parent `className` function strips underscores.
+     *
+     * @return string The name of the class.
+     */
+    public static function className()
+    {
+        return 'country_spec';
+    }
+
+    /**
+     * @param string $country The ISO country code of the country we retrieve the CountrySpec for.
+     * @param array|string|null $opts
+     *
+     * @return CountrySpec
+     */
+    public static function retrieve($country, $opts = null)
+    {
+        return self::_retrieve($country, $opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return Collection of CountrySpecs
+     */
+    public static function all($params = null, $opts = null)
+    {
+        return self::_all($params, $opts);
+    }
+}
diff --git a/htdocs/includes/stripe/lib/Coupon.php b/htdocs/includes/stripe/lib/Coupon.php
new file mode 100644
index 00000000000..079cc10b478
--- /dev/null
+++ b/htdocs/includes/stripe/lib/Coupon.php
@@ -0,0 +1,77 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class Coupon
+ *
+ * @package Stripe
+ */
+class Coupon extends ApiResource
+{
+    /**
+     * @param string $id The ID of the coupon to retrieve.
+     * @param array|string|null $opts
+     *
+     * @return Coupon
+     */
+    public static function retrieve($id, $opts = null)
+    {
+        return self::_retrieve($id, $opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return Coupon The created coupon.
+     */
+    public static function create($params = null, $opts = null)
+    {
+        return self::_create($params, $opts);
+    }
+
+    /**
+     * @param string $id The ID of the coupon to update.
+     * @param array|null $params
+     * @param array|string|null $options
+     *
+     * @return Coupon The updated coupon.
+     */
+    public static function update($id, $params = null, $options = null)
+    {
+        return self::_update($id, $params, $options);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return Coupon The deleted coupon.
+     */
+    public function delete($params = null, $opts = null)
+    {
+        return $this->_delete($params, $opts);
+    }
+
+    /**
+     * @param array|string|null $opts
+     *
+     * @return Coupon The saved coupon.
+     */
+    public function save($opts = null)
+    {
+        return $this->_save($opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return Collection of Coupons
+     */
+    public static function all($params = null, $opts = null)
+    {
+        return self::_all($params, $opts);
+    }
+}
diff --git a/htdocs/includes/stripe/lib/Customer.php b/htdocs/includes/stripe/lib/Customer.php
new file mode 100644
index 00000000000..1dfbfc6a16b
--- /dev/null
+++ b/htdocs/includes/stripe/lib/Customer.php
@@ -0,0 +1,190 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class Customer
+ *
+ * @property string $id
+ * @property string $object
+ * @property int $account_balance
+ * @property string $business_vat_id
+ * @property string $created
+ * @property string $currency
+ * @property string $default_source
+ * @property bool $delinquent
+ * @property string $description
+ * @property mixed $discount
+ * @property string $email
+ * @property bool $livemode
+ * @property array $metadata
+ * @property mixed $shipping
+ * @property Collection $sources
+ * @property Collection $subscriptions
+ *
+ * @package Stripe
+ */
+class Customer extends ApiResource
+{
+    /**
+     * @param string $id The ID of the customer to retrieve.
+     * @param array|string|null $opts
+     *
+     * @return Customer
+     */
+    public static function retrieve($id, $opts = null)
+    {
+        return self::_retrieve($id, $opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return Collection of Customers
+     */
+    public static function all($params = null, $opts = null)
+    {
+        return self::_all($params, $opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return Customer The created customer.
+     */
+    public static function create($params = null, $opts = null)
+    {
+        return self::_create($params, $opts);
+    }
+
+    /**
+     * @param string $id The ID of the customer to update.
+     * @param array|null $params
+     * @param array|string|null $options
+     *
+     * @return Customer The updated customer.
+     */
+    public static function update($id, $params = null, $options = null)
+    {
+        return self::_update($id, $params, $options);
+    }
+
+    /**
+     * @param array|string|null $opts
+     *
+     * @return Customer The saved customer.
+     */
+    public function save($opts = null)
+    {
+        return $this->_save($opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return Customer The deleted customer.
+     */
+    public function delete($params = null, $opts = null)
+    {
+        return $this->_delete($params, $opts);
+    }
+
+    /**
+     * @param array|null $params
+     *
+     * @return InvoiceItem The resulting invoice item.
+     */
+    public function addInvoiceItem($params = null)
+    {
+        if (!$params) {
+            $params = array();
+        }
+        $params['customer'] = $this->id;
+        $ii = InvoiceItem::create($params, $this->_opts);
+        return $ii;
+    }
+
+    /**
+     * @param array|null $params
+     *
+     * @return array An array of the customer's Invoices.
+     */
+    public function invoices($params = null)
+    {
+        if (!$params) {
+            $params = array();
+        }
+        $params['customer'] = $this->id;
+        $invoices = Invoice::all($params, $this->_opts);
+        return $invoices;
+    }
+
+    /**
+     * @param array|null $params
+     *
+     * @return array An array of the customer's InvoiceItems.
+     */
+    public function invoiceItems($params = null)
+    {
+        if (!$params) {
+            $params = array();
+        }
+        $params['customer'] = $this->id;
+        $iis = InvoiceItem::all($params, $this->_opts);
+        return $iis;
+    }
+
+    /**
+     * @param array|null $params
+     *
+     * @return array An array of the customer's Charges.
+     */
+    public function charges($params = null)
+    {
+        if (!$params) {
+            $params = array();
+        }
+        $params['customer'] = $this->id;
+        $charges = Charge::all($params, $this->_opts);
+        return $charges;
+    }
+
+    /**
+     * @param array|null $params
+     *
+     * @return Subscription The updated subscription.
+     */
+    public function updateSubscription($params = null)
+    {
+        $url = $this->instanceUrl() . '/subscription';
+        list($response, $opts) = $this->_request('post', $url, $params);
+        $this->refreshFrom(array('subscription' => $response), $opts, true);
+        return $this->subscription;
+    }
+
+    /**
+     * @param array|null $params
+     *
+     * @return Subscription The cancelled subscription.
+     */
+    public function cancelSubscription($params = null)
+    {
+        $url = $this->instanceUrl() . '/subscription';
+        list($response, $opts) = $this->_request('delete', $url, $params);
+        $this->refreshFrom(array('subscription' => $response), $opts, true);
+        return $this->subscription;
+    }
+
+    /**
+     * @return Customer The updated customer.
+     */
+    public function deleteDiscount()
+    {
+        $url = $this->instanceUrl() . '/discount';
+        list($response, $opts) = $this->_request('delete', $url);
+        $this->refreshFrom(array('discount' => null), $opts, true);
+    }
+}
diff --git a/htdocs/includes/stripe/lib/Dispute.php b/htdocs/includes/stripe/lib/Dispute.php
new file mode 100644
index 00000000000..ce70d499b35
--- /dev/null
+++ b/htdocs/includes/stripe/lib/Dispute.php
@@ -0,0 +1,83 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class Dispute
+ *
+ * @property string $id
+ * @property string $object
+ * @property int $amount
+ * @property mixed $balance_transactions
+ * @property string $charge
+ * @property int $created
+ * @property string $currency
+ * @property mixed $evidence
+ * @property mixed $evidence_details
+ * @property bool $is_charge_refundable
+ * @property bool $livemode
+ * @property mixed $metadata
+ * @property string $reason
+ * @property string $status
+ *
+ * @package Stripe
+ */
+class Dispute extends ApiResource
+{
+    /**
+     * @param string $id The ID of the dispute to retrieve.
+     * @param array|string|null $options
+     *
+     * @return Dispute
+     */
+    public static function retrieve($id, $options = null)
+    {
+        return self::_retrieve($id, $options);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $options
+     *
+     * @return array An array of Disputes.
+     */
+    public static function all($params = null, $options = null)
+    {
+        return self::_all($params, $options);
+    }
+
+    /**
+     * @param string $id The ID of the dispute to update.
+     * @param array|null $params
+     * @param array|string|null $options
+     *
+     * @return Dispute The updated dispute.
+     */
+    public static function update($id, $params = null, $options = null)
+    {
+        return self::_update($id, $params, $options);
+    }
+
+    /**
+     * @param array|string|null $options
+     *
+     * @return Dispute The saved charge.
+     */
+    public function save($options = null)
+    {
+        return $this->_save($options);
+    }
+
+    /**
+     * @param array|string|null $options
+     *
+     * @return Dispute The closed dispute.
+     */
+    public function close($options = null)
+    {
+        $url = $this->instanceUrl() . '/close';
+        list($response, $opts) = $this->_request('post', $url, null, $options);
+        $this->refreshFrom($response, $opts);
+        return $this;
+    }
+}
diff --git a/htdocs/includes/stripe/lib/Error/Api.php b/htdocs/includes/stripe/lib/Error/Api.php
new file mode 100644
index 00000000000..dc7d069efde
--- /dev/null
+++ b/htdocs/includes/stripe/lib/Error/Api.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Stripe\Error;
+
+class Api extends Base
+{
+}
diff --git a/htdocs/includes/stripe/lib/Error/ApiConnection.php b/htdocs/includes/stripe/lib/Error/ApiConnection.php
new file mode 100644
index 00000000000..06d097eac58
--- /dev/null
+++ b/htdocs/includes/stripe/lib/Error/ApiConnection.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Stripe\Error;
+
+class ApiConnection extends Base
+{
+}
diff --git a/htdocs/includes/stripe/lib/Error/Authentication.php b/htdocs/includes/stripe/lib/Error/Authentication.php
new file mode 100644
index 00000000000..c50b4f09552
--- /dev/null
+++ b/htdocs/includes/stripe/lib/Error/Authentication.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Stripe\Error;
+
+class Authentication extends Base
+{
+}
diff --git a/htdocs/includes/stripe/lib/Error/Base.php b/htdocs/includes/stripe/lib/Error/Base.php
new file mode 100644
index 00000000000..44106ecca50
--- /dev/null
+++ b/htdocs/includes/stripe/lib/Error/Base.php
@@ -0,0 +1,60 @@
+<?php
+
+namespace Stripe\Error;
+
+use Exception;
+
+abstract class Base extends Exception
+{
+    public function __construct(
+        $message,
+        $httpStatus = null,
+        $httpBody = null,
+        $jsonBody = null,
+        $httpHeaders = null
+    ) {
+        parent::__construct($message);
+        $this->httpStatus = $httpStatus;
+        $this->httpBody = $httpBody;
+        $this->jsonBody = $jsonBody;
+        $this->httpHeaders = $httpHeaders;
+        $this->requestId = null;
+
+        if ($httpHeaders && isset($httpHeaders['Request-Id'])) {
+            $this->requestId = $httpHeaders['Request-Id'];
+        }
+    }
+
+    public function getHttpStatus()
+    {
+        return $this->httpStatus;
+    }
+
+    public function getHttpBody()
+    {
+        return $this->httpBody;
+    }
+
+    public function getJsonBody()
+    {
+        return $this->jsonBody;
+    }
+
+    public function getHttpHeaders()
+    {
+        return $this->httpHeaders;
+    }
+
+    public function getRequestId()
+    {
+        return $this->requestId;
+    }
+
+    public function __toString()
+    {
+        $id = $this->requestId ? " from API request '{$this->requestId}'": "";
+        $message = explode("\n", parent::__toString());
+        $message[0] .= $id;
+        return implode("\n", $message);
+    }
+}
diff --git a/htdocs/includes/stripe/lib/Error/Card.php b/htdocs/includes/stripe/lib/Error/Card.php
new file mode 100644
index 00000000000..9004db271e3
--- /dev/null
+++ b/htdocs/includes/stripe/lib/Error/Card.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace Stripe\Error;
+
+class Card extends Base
+{
+    public function __construct(
+        $message,
+        $stripeParam,
+        $stripeCode,
+        $httpStatus,
+        $httpBody,
+        $jsonBody,
+        $httpHeaders = null
+    ) {
+        parent::__construct($message, $httpStatus, $httpBody, $jsonBody, $httpHeaders);
+        $this->stripeParam = $stripeParam;
+        $this->stripeCode = $stripeCode;
+
+        // This one is not like the others because it was added later and we're
+        // trying to do our best not to change the public interface of this class'
+        // constructor. We should consider changing its implementation on the
+        // next major version bump of this library.
+        $this->declineCode = isset($jsonBody["error"]["decline_code"]) ? $jsonBody["error"]["decline_code"] : null;
+    }
+
+    public function getDeclineCode()
+    {
+        return $this->declineCode;
+    }
+
+    public function getStripeCode()
+    {
+        return $this->stripeCode;
+    }
+
+    public function getStripeParam()
+    {
+        return $this->stripeParam;
+    }
+}
diff --git a/htdocs/includes/stripe/lib/Error/InvalidRequest.php b/htdocs/includes/stripe/lib/Error/InvalidRequest.php
new file mode 100644
index 00000000000..493bc184cbd
--- /dev/null
+++ b/htdocs/includes/stripe/lib/Error/InvalidRequest.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Stripe\Error;
+
+class InvalidRequest extends Base
+{
+    public function __construct(
+        $message,
+        $stripeParam,
+        $httpStatus = null,
+        $httpBody = null,
+        $jsonBody = null,
+        $httpHeaders = null
+    ) {
+        parent::__construct($message, $httpStatus, $httpBody, $jsonBody, $httpHeaders);
+        $this->stripeParam = $stripeParam;
+    }
+
+    public function getStripeParam()
+    {
+        return $this->stripeParam;
+    }
+}
diff --git a/htdocs/includes/stripe/lib/Error/Permission.php b/htdocs/includes/stripe/lib/Error/Permission.php
new file mode 100644
index 00000000000..df2b7874842
--- /dev/null
+++ b/htdocs/includes/stripe/lib/Error/Permission.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Stripe\Error;
+
+class Permission extends Base
+{
+}
diff --git a/htdocs/includes/stripe/lib/Error/RateLimit.php b/htdocs/includes/stripe/lib/Error/RateLimit.php
new file mode 100644
index 00000000000..2fa3be4ecdc
--- /dev/null
+++ b/htdocs/includes/stripe/lib/Error/RateLimit.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Stripe\Error;
+
+class RateLimit extends InvalidRequest
+{
+}
diff --git a/htdocs/includes/stripe/lib/Event.php b/htdocs/includes/stripe/lib/Event.php
new file mode 100644
index 00000000000..6a1ed6c44ba
--- /dev/null
+++ b/htdocs/includes/stripe/lib/Event.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class Event
+ *
+ * @property string $id
+ * @property string $object
+ * @property string $api_version
+ * @property int $created
+ * @property mixed $data
+ * @property bool $livemode
+ * @property int $pending_webhooks
+ * @property string $request
+ * @property string $type
+ *
+ * @package Stripe
+ */
+class Event extends ApiResource
+{
+    /**
+     * @param string $id The ID of the event to retrieve.
+     * @param array|string|null $opts
+     *
+     * @return Event
+     */
+    public static function retrieve($id, $opts = null)
+    {
+        return self::_retrieve($id, $opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return Collection of Events
+     */
+    public static function all($params = null, $opts = null)
+    {
+        return self::_all($params, $opts);
+    }
+}
diff --git a/htdocs/includes/stripe/lib/ExternalAccount.php b/htdocs/includes/stripe/lib/ExternalAccount.php
new file mode 100644
index 00000000000..23ddf9b2e82
--- /dev/null
+++ b/htdocs/includes/stripe/lib/ExternalAccount.php
@@ -0,0 +1,89 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class ExternalAccount
+ *
+ * @package Stripe
+ */
+abstract class ExternalAccount extends ApiResource
+{
+    /**
+     * @return string The instance URL for this resource. It needs to be special
+     *    cased because it doesn't fit into the standard resource pattern.
+     */
+    public function instanceUrl()
+    {
+        $id = $this['id'];
+        if (!$id) {
+            $class = get_class($this);
+            $msg = "Could not determine which URL to request: $class instance "
+             . "has invalid ID: $id";
+            throw new Error\InvalidRequest($msg, null);
+        }
+
+        if ($this['customer']) {
+            $parent = $this['customer'];
+            $base = Customer::classUrl();
+            $path = 'sources';
+        } elseif ($this['account']) {
+            $parent = $this['account'];
+            $base = Account::classUrl();
+            $path = 'external_accounts';
+        } elseif ($this['recipient']) {
+            $parent = $this['recipient'];
+            $base = Recipient::classUrl();
+            $path = 'cards';
+        } else {
+            return null;
+        }
+
+        $parent = Util\Util::utf8($parent);
+        $id = Util\Util::utf8($id);
+
+        $parentExtn = urlencode($parent);
+        $extn = urlencode($id);
+        return "$base/$parentExtn/$path/$extn";
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return ExternalAccount The deleted external account.
+     */
+    public function delete($params = null, $opts = null)
+    {
+        return $this->_delete($params, $opts);
+    }
+
+    /**
+     * @param array|string|null $opts
+     *
+     * @return ExternalAccount The saved external account.
+     */
+    public function save($opts = null)
+    {
+        return $this->_save($opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return ExternalAccount The verified (or not) external account.
+     */
+    public function verify($params = null, $opts = null)
+    {
+        if ($this['customer']) {
+            $url = $this->instanceUrl() . '/verify';
+            list($response, $options) = $this->_request('post', $url, $params, $opts);
+            $this->refreshFrom($response, $options);
+            return $this;
+        } else {
+            $message = 'Only customer external accounts can be verified in this manner.';
+            throw new Error\Api($message);
+        }
+    }
+}
diff --git a/htdocs/includes/stripe/lib/FileUpload.php b/htdocs/includes/stripe/lib/FileUpload.php
new file mode 100644
index 00000000000..7dc98c78d1c
--- /dev/null
+++ b/htdocs/includes/stripe/lib/FileUpload.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class FileUpload
+ *
+ * @property string $id
+ * @property string $object
+ * @property int $created
+ * @property string $purpose
+ * @property int $size
+ * @property string $type
+ *
+ * @package Stripe
+ */
+class FileUpload extends ApiResource
+{
+    public static function baseUrl()
+    {
+        return Stripe::$apiUploadBase;
+    }
+
+    public static function className()
+    {
+        return 'file';
+    }
+
+    /**
+     * @param string $id The ID of the file upload to retrieve.
+     * @param array|string|null $opts
+     *
+     * @return FileUpload
+     */
+    public static function retrieve($id, $opts = null)
+    {
+        return self::_retrieve($id, $opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return FileUpload The created file upload.
+     */
+    public static function create($params = null, $opts = null)
+    {
+        return self::_create($params, $opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return Collection of FileUploads
+     */
+    public static function all($params = null, $opts = null)
+    {
+        return self::_all($params, $opts);
+    }
+}
diff --git a/htdocs/includes/stripe/lib/HttpClient/ClientInterface.php b/htdocs/includes/stripe/lib/HttpClient/ClientInterface.php
new file mode 100644
index 00000000000..dc4af5d1dc2
--- /dev/null
+++ b/htdocs/includes/stripe/lib/HttpClient/ClientInterface.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Stripe\HttpClient;
+
+interface ClientInterface
+{
+    /**
+     * @param string $method The HTTP method being used
+     * @param string $absUrl The URL being requested, including domain and protocol
+     * @param array $headers Headers to be used in the request (full strings, not KV pairs)
+     * @param array $params KV pairs for parameters. Can be nested for arrays and hashes
+     * @param boolean $hasFile Whether or not $params references a file (via an @ prefix or
+     *                         CurlFile)
+     * @throws Error\Api & Error\ApiConnection
+     * @return array($rawBody, $httpStatusCode, $httpHeader)
+     */
+    public function request($method, $absUrl, $headers, $params, $hasFile);
+}
diff --git a/htdocs/includes/stripe/lib/HttpClient/CurlClient.php b/htdocs/includes/stripe/lib/HttpClient/CurlClient.php
new file mode 100644
index 00000000000..e070d324d72
--- /dev/null
+++ b/htdocs/includes/stripe/lib/HttpClient/CurlClient.php
@@ -0,0 +1,282 @@
+<?php
+
+namespace Stripe\HttpClient;
+
+use Stripe\Stripe;
+use Stripe\Error;
+use Stripe\Util;
+
+// cURL constants are not defined in PHP < 5.5
+
+// @codingStandardsIgnoreStart
+// PSR2 requires all constants be upper case. Sadly, the CURL_SSLVERSION
+// constants do not abide by those rules.
+
+// Note the values 1 and 6 come from their position in the enum that
+// defines them in cURL's source code.
+if (!defined('CURL_SSLVERSION_TLSv1')) {
+    define('CURL_SSLVERSION_TLSv1', 1);
+}
+if (!defined('CURL_SSLVERSION_TLSv1_2')) {
+    define('CURL_SSLVERSION_TLSv1_2', 6);
+}
+// @codingStandardsIgnoreEnd
+
+class CurlClient implements ClientInterface
+{
+    private static $instance;
+
+    public static function instance()
+    {
+        if (!self::$instance) {
+            self::$instance = new self();
+        }
+        return self::$instance;
+    }
+
+    protected $defaultOptions;
+
+    /**
+     * CurlClient constructor.
+     *
+     * Pass in a callable to $defaultOptions that returns an array of CURLOPT_* values to start
+     * off a request with, or an flat array with the same format used by curl_setopt_array() to
+     * provide a static set of options. Note that many options are overridden later in the request
+     * call, including timeouts, which can be set via setTimeout() and setConnectTimeout().
+     *
+     * Note that request() will silently ignore a non-callable, non-array $defaultOptions, and will
+     * throw an exception if $defaultOptions returns a non-array value.
+     *
+     * @param array|callable|null $defaultOptions
+     */
+    public function __construct($defaultOptions = null)
+    {
+        $this->defaultOptions = $defaultOptions;
+    }
+
+    public function getDefaultOptions()
+    {
+        return $this->defaultOptions;
+    }
+
+    // USER DEFINED TIMEOUTS
+
+    const DEFAULT_TIMEOUT = 80;
+    const DEFAULT_CONNECT_TIMEOUT = 30;
+
+    private $timeout = self::DEFAULT_TIMEOUT;
+    private $connectTimeout = self::DEFAULT_CONNECT_TIMEOUT;
+
+    public function setTimeout($seconds)
+    {
+        $this->timeout = (int) max($seconds, 0);
+        return $this;
+    }
+
+    public function setConnectTimeout($seconds)
+    {
+        $this->connectTimeout = (int) max($seconds, 0);
+        return $this;
+    }
+
+    public function getTimeout()
+    {
+        return $this->timeout;
+    }
+
+    public function getConnectTimeout()
+    {
+        return $this->connectTimeout;
+    }
+
+    // END OF USER DEFINED TIMEOUTS
+
+    public function request($method, $absUrl, $headers, $params, $hasFile)
+    {
+        $curl = curl_init();
+        $method = strtolower($method);
+
+        $opts = array();
+        if (is_callable($this->defaultOptions)) { // call defaultOptions callback, set options to return value
+            $opts = call_user_func_array($this->defaultOptions, func_get_args());
+            if (!is_array($opts)) {
+                throw new Error\Api("Non-array value returned by defaultOptions CurlClient callback");
+            }
+        } elseif (is_array($this->defaultOptions)) { // set default curlopts from array
+            $opts = $this->defaultOptions;
+        }
+
+        if ($method == 'get') {
+            if ($hasFile) {
+                throw new Error\Api(
+                    "Issuing a GET request with a file parameter"
+                );
+            }
+            $opts[CURLOPT_HTTPGET] = 1;
+            if (count($params) > 0) {
+                $encoded = self::encode($params);
+                $absUrl = "$absUrl?$encoded";
+            }
+        } elseif ($method == 'post') {
+            $opts[CURLOPT_POST] = 1;
+            $opts[CURLOPT_POSTFIELDS] = $hasFile ? $params : self::encode($params);
+        } elseif ($method == 'delete') {
+            $opts[CURLOPT_CUSTOMREQUEST] = 'DELETE';
+            if (count($params) > 0) {
+                $encoded = self::encode($params);
+                $absUrl = "$absUrl?$encoded";
+            }
+        } else {
+            throw new Error\Api("Unrecognized method $method");
+        }
+
+        // Create a callback to capture HTTP headers for the response
+        $rheaders = array();
+        $headerCallback = function ($curl, $header_line) use (&$rheaders) {
+            // Ignore the HTTP request line (HTTP/1.1 200 OK)
+            if (strpos($header_line, ":") === false) {
+                return strlen($header_line);
+            }
+            list($key, $value) = explode(":", trim($header_line), 2);
+            $rheaders[trim($key)] = trim($value);
+            return strlen($header_line);
+        };
+
+        // By default for large request body sizes (> 1024 bytes), cURL will
+        // send a request without a body and with a `Expect: 100-continue`
+        // header, which gives the server a chance to respond with an error
+        // status code in cases where one can be determined right away (say
+        // on an authentication problem for example), and saves the "large"
+        // request body from being ever sent.
+        //
+        // Unfortunately, the bindings don't currently correctly handle the
+        // success case (in which the server sends back a 100 CONTINUE), so
+        // we'll error under that condition. To compensate for that problem
+        // for the time being, override cURL's behavior by simply always
+        // sending an empty `Expect:` header.
+        array_push($headers, 'Expect: ');
+
+        $absUrl = Util\Util::utf8($absUrl);
+        $opts[CURLOPT_URL] = $absUrl;
+        $opts[CURLOPT_RETURNTRANSFER] = true;
+        $opts[CURLOPT_CONNECTTIMEOUT] = $this->connectTimeout;
+        $opts[CURLOPT_TIMEOUT] = $this->timeout;
+        $opts[CURLOPT_HEADERFUNCTION] = $headerCallback;
+        $opts[CURLOPT_HTTPHEADER] = $headers;
+        if (!Stripe::$verifySslCerts) {
+            $opts[CURLOPT_SSL_VERIFYPEER] = false;
+        }
+
+        curl_setopt_array($curl, $opts);
+        $rbody = curl_exec($curl);
+
+        if (!defined('CURLE_SSL_CACERT_BADFILE')) {
+            define('CURLE_SSL_CACERT_BADFILE', 77);  // constant not defined in PHP
+        }
+
+        $errno = curl_errno($curl);
+        if ($errno == CURLE_SSL_CACERT ||
+            $errno == CURLE_SSL_PEER_CERTIFICATE ||
+            $errno == CURLE_SSL_CACERT_BADFILE
+        ) {
+            array_push(
+                $headers,
+                'X-Stripe-Client-Info: {"ca":"using Stripe-supplied CA bundle"}'
+            );
+            $cert = self::caBundle();
+            curl_setopt($curl, CURLOPT_HTTPHEADER, $headers);
+            curl_setopt($curl, CURLOPT_CAINFO, $cert);
+            $rbody = curl_exec($curl);
+        }
+
+        if ($rbody === false) {
+            $errno = curl_errno($curl);
+            $message = curl_error($curl);
+            curl_close($curl);
+            $this->handleCurlError($absUrl, $errno, $message);
+        }
+
+        $rcode = curl_getinfo($curl, CURLINFO_HTTP_CODE);
+        curl_close($curl);
+        return array($rbody, $rcode, $rheaders);
+    }
+
+    /**
+     * @param number $errno
+     * @param string $message
+     * @throws Error\ApiConnection
+     */
+    private function handleCurlError($url, $errno, $message)
+    {
+        switch ($errno) {
+            case CURLE_COULDNT_CONNECT:
+            case CURLE_COULDNT_RESOLVE_HOST:
+            case CURLE_OPERATION_TIMEOUTED:
+                $msg = "Could not connect to Stripe ($url).  Please check your "
+                 . "internet connection and try again.  If this problem persists, "
+                 . "you should check Stripe's service status at "
+                 . "https://twitter.com/stripestatus, or";
+                break;
+            case CURLE_SSL_CACERT:
+            case CURLE_SSL_PEER_CERTIFICATE:
+                $msg = "Could not verify Stripe's SSL certificate.  Please make sure "
+                 . "that your network is not intercepting certificates.  "
+                 . "(Try going to $url in your browser.)  "
+                 . "If this problem persists,";
+                break;
+            default:
+                $msg = "Unexpected error communicating with Stripe.  "
+                 . "If this problem persists,";
+        }
+        $msg .= " let us know at support@stripe.com.";
+
+        $msg .= "\n\n(Network error [errno $errno]: $message)";
+        throw new Error\ApiConnection($msg);
+    }
+
+    private static function caBundle()
+    {
+        return dirname(__FILE__) . '/../../data/ca-certificates.crt';
+    }
+
+    /**
+     * @param array $arr An map of param keys to values.
+     * @param string|null $prefix
+     *
+     * Only public for testability, should not be called outside of CurlClient
+     *
+     * @return string A querystring, essentially.
+     */
+    public static function encode($arr, $prefix = null)
+    {
+        if (!is_array($arr)) {
+            return $arr;
+        }
+
+        $r = array();
+        foreach ($arr as $k => $v) {
+            if (is_null($v)) {
+                continue;
+            }
+
+            if ($prefix) {
+                if ($k !== null && (!is_int($k) || is_array($v))) {
+                    $k = $prefix."[".$k."]";
+                } else {
+                    $k = $prefix."[]";
+                }
+            }
+
+            if (is_array($v)) {
+                $enc = self::encode($v, $k);
+                if ($enc) {
+                    $r[] = $enc;
+                }
+            } else {
+                $r[] = urlencode($k)."=".urlencode($v);
+            }
+        }
+
+        return implode("&", $r);
+    }
+}
diff --git a/htdocs/includes/stripe/lib/Invoice.php b/htdocs/includes/stripe/lib/Invoice.php
new file mode 100644
index 00000000000..e994566cd96
--- /dev/null
+++ b/htdocs/includes/stripe/lib/Invoice.php
@@ -0,0 +1,92 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class Invoice
+ *
+ * @package Stripe
+ */
+class Invoice extends ApiResource
+{
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return Invoice The created invoice.
+     */
+    public static function create($params = null, $opts = null)
+    {
+        return self::_create($params, $opts);
+    }
+
+    /**
+     * @param string $id The ID of the invoice to retrieve.
+     * @param array|string|null $opts
+     *
+     * @return Invoice
+     */
+    public static function retrieve($id, $opts = null)
+    {
+        return self::_retrieve($id, $opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return Collection of Invoices
+     */
+    public static function all($params = null, $opts = null)
+    {
+        return self::_all($params, $opts);
+    }
+
+    /**
+     * @param string $id The ID of the invoice to update.
+     * @param array|null $params
+     * @param array|string|null $options
+     *
+     * @return Invoice The updated invoice.
+     */
+    public static function update($id, $params = null, $options = null)
+    {
+        return self::_update($id, $params, $options);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return Invoice The upcoming invoice.
+     */
+    public static function upcoming($params = null, $opts = null)
+    {
+        $url = static::classUrl() . '/upcoming';
+        list($response, $opts) = static::_staticRequest('get', $url, $params, $opts);
+        $obj = Util\Util::convertToStripeObject($response->json, $opts);
+        $obj->setLastResponse($response);
+        return $obj;
+    }
+
+    /**
+     * @param array|string|null $opts
+     *
+     * @return Invoice The saved invoice.
+     */
+    public function save($opts = null)
+    {
+        return $this->_save($opts);
+    }
+
+    /**
+     * @return Invoice The paid invoice.
+     */
+    public function pay($opts = null)
+    {
+        $url = $this->instanceUrl() . '/pay';
+        list($response, $opts) = $this->_request('post', $url, null, $opts);
+        $this->refreshFrom($response, $opts);
+        return $this;
+    }
+}
diff --git a/htdocs/includes/stripe/lib/InvoiceItem.php b/htdocs/includes/stripe/lib/InvoiceItem.php
new file mode 100644
index 00000000000..ab9c4ba3327
--- /dev/null
+++ b/htdocs/includes/stripe/lib/InvoiceItem.php
@@ -0,0 +1,77 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class InvoiceItem
+ *
+ * @package Stripe
+ */
+class InvoiceItem extends ApiResource
+{
+    /**
+     * @param string $id The ID of the invoice item to retrieve.
+     * @param array|string|null $opts
+     *
+     * @return InvoiceItem
+     */
+    public static function retrieve($id, $opts = null)
+    {
+        return self::_retrieve($id, $opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return Collection of InvoiceItems
+     */
+    public static function all($params = null, $opts = null)
+    {
+        return self::_all($params, $opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return InvoiceItem The created invoice item.
+     */
+    public static function create($params = null, $opts = null)
+    {
+        return self::_create($params, $opts);
+    }
+
+    /**
+     * @param string $id The ID of the invoice item to update.
+     * @param array|null $params
+     * @param array|string|null $options
+     *
+     * @return InvoiceItem The updated invoice item.
+     */
+    public static function update($id, $params = null, $options = null)
+    {
+        return self::_update($id, $params, $options);
+    }
+
+    /**
+     * @param array|string|null $opts
+     *
+     * @return InvoiceItem The saved invoice item.
+     */
+    public function save($opts = null)
+    {
+        return $this->_save($opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return InvoiceItem The deleted invoice item.
+     */
+    public function delete($params = null, $opts = null)
+    {
+        return $this->_delete($params, $opts);
+    }
+}
diff --git a/htdocs/includes/stripe/lib/JsonSerializable.php b/htdocs/includes/stripe/lib/JsonSerializable.php
new file mode 100644
index 00000000000..2fdf8526703
--- /dev/null
+++ b/htdocs/includes/stripe/lib/JsonSerializable.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Stripe;
+
+// JsonSerializable only exists in PHP 5.4+. Stub if out if it doesn't exist
+if (interface_exists('\JsonSerializable', false)) {
+    interface JsonSerializable extends \JsonSerializable
+    {
+    }
+} else {
+    // PSR2 wants each interface to have its own file.
+    // @codingStandardsIgnoreStart
+    interface JsonSerializable
+    {
+        // @codingStandardsIgnoreEnd
+        public function jsonSerialize();
+    }
+}
diff --git a/htdocs/includes/stripe/lib/Order.php b/htdocs/includes/stripe/lib/Order.php
new file mode 100644
index 00000000000..9fc65e2e166
--- /dev/null
+++ b/htdocs/includes/stripe/lib/Order.php
@@ -0,0 +1,87 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class Order
+ *
+ * @package Stripe
+ */
+class Order extends ApiResource
+{
+    /**
+     * @param string $id The ID of the Order to retrieve.
+     * @param array|string|null $opts
+     *
+     * @return Order
+     */
+    public static function retrieve($id, $opts = null)
+    {
+        return self::_retrieve($id, $opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return Order The created Order.
+     */
+    public static function create($params = null, $opts = null)
+    {
+        return self::_create($params, $opts);
+    }
+
+    /**
+     * @param string $id The ID of the order to update.
+     * @param array|null $params
+     * @param array|string|null $options
+     *
+     * @return Order The updated order.
+     */
+    public static function update($id, $params = null, $options = null)
+    {
+        return self::_update($id, $params, $options);
+    }
+
+    /**
+     * @param array|string|null $opts
+     *
+     * @return Order The saved Order.
+     */
+    public function save($opts = null)
+    {
+        return $this->_save($opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return Collection of Orders
+     */
+    public static function all($params = null, $opts = null)
+    {
+        return self::_all($params, $opts);
+    }
+
+    /**
+     * @return Order The paid order.
+     */
+    public function pay($params = null, $opts = null)
+    {
+        $url = $this->instanceUrl() . '/pay';
+        list($response, $opts) = $this->_request('post', $url, $params, $opts);
+        $this->refreshFrom($response, $opts);
+        return $this;
+    }
+
+    /**
+     * @return OrderReturn The newly created return.
+     */
+    public function returnOrder($params = null, $opts = null)
+    {
+        $url = $this->instanceUrl() . '/returns';
+        list($response, $opts) = $this->_request('post', $url, $params, $opts);
+        return Util\Util::convertToStripeObject($response, $opts);
+    }
+}
diff --git a/htdocs/includes/stripe/lib/OrderReturn.php b/htdocs/includes/stripe/lib/OrderReturn.php
new file mode 100644
index 00000000000..aa7fd4e9b99
--- /dev/null
+++ b/htdocs/includes/stripe/lib/OrderReturn.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class OrderReturn
+ *
+ * @package Stripe
+ */
+class OrderReturn extends ApiResource
+{
+    /**
+     * @param string $id The ID of the OrderReturn to retrieve.
+     * @param array|string|null $opts
+     *
+     * @return Order
+     */
+    public static function retrieve($id, $opts = null)
+    {
+        return self::_retrieve($id, $opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return Collection of OrderReturns
+     */
+    public static function all($params = null, $opts = null)
+    {
+        return self::_all($params, $opts);
+    }
+}
diff --git a/htdocs/includes/stripe/lib/Payout.php b/htdocs/includes/stripe/lib/Payout.php
new file mode 100644
index 00000000000..90dd0fcecc3
--- /dev/null
+++ b/htdocs/includes/stripe/lib/Payout.php
@@ -0,0 +1,97 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class Payout
+ *
+ * @property string $id
+ * @property string $object
+ * @property int $amount
+ * @property string $balance_transaction
+ * @property string $cancellation_balance_transaction
+ * @property int $created
+ * @property string $currency
+ * @property int $arrival_date
+ * @property string $destination
+ * @property string $failure_code
+ * @property string $failure_message
+ * @property bool $livemode
+ * @property mixed $metadata
+ * @property string $method
+ * @property string $recipient
+ * @property string $source_type
+ * @property string $statement_descriptor
+ * @property string $status
+ * @property string $type
+ *
+ * @package Stripe
+ */
+class Payout extends ApiResource
+{
+    /**
+     * @param string $id The ID of the payout to retrieve.
+     * @param array|string|null $opts
+     *
+     * @return Payout
+     */
+    public static function retrieve($id, $opts = null)
+    {
+        return self::_retrieve($id, $opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return Collection of Payouts
+     */
+    public static function all($params = null, $opts = null)
+    {
+        return self::_all($params, $opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return Payout The created payout.
+     */
+    public static function create($params = null, $opts = null)
+    {
+        return self::_create($params, $opts);
+    }
+
+    /**
+     * @param string $id The ID of the payout to update.
+     * @param array|null $params
+     * @param array|string|null $options
+     *
+     * @return Payout The updated payout.
+     */
+    public static function update($id, $params = null, $options = null)
+    {
+        return self::_update($id, $params, $options);
+    }
+
+    /**
+     * @return Payout The canceled payout.
+     */
+    public function cancel()
+    {
+        $url = $this->instanceUrl() . '/cancel';
+        list($response, $opts) = $this->_request('post', $url);
+        $this->refreshFrom($response, $opts);
+        return $this;
+    }
+
+    /**
+     * @param array|string|null $opts
+     *
+     * @return Payout The saved payout.
+     */
+    public function save($opts = null)
+    {
+        return $this->_save($opts);
+    }
+}
diff --git a/htdocs/includes/stripe/lib/Plan.php b/htdocs/includes/stripe/lib/Plan.php
new file mode 100644
index 00000000000..b911e17cbe6
--- /dev/null
+++ b/htdocs/includes/stripe/lib/Plan.php
@@ -0,0 +1,90 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class Plan
+ *
+ * @package Stripe
+ *
+ * @property $id
+ * @property $object
+ * @property $amount
+ * @property $created
+ * @property $currency
+ * @property $interval
+ * @property $interval_count
+ * @property $livemode
+ * @property AttachedObject $metadata
+ * @property $name
+ * @property $statement_descriptor
+ * @property $trial_period_days
+ */
+class Plan extends ApiResource
+{
+    /**
+     * @param string $id The ID of the plan to retrieve.
+     * @param array|string|null $opts
+     *
+     * @return Plan
+     */
+    public static function retrieve($id, $opts = null)
+    {
+        return self::_retrieve($id, $opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return Plan The created plan.
+     */
+    public static function create($params = null, $opts = null)
+    {
+        return self::_create($params, $opts);
+    }
+
+    /**
+     * @param string $id The ID of the plan to update.
+     * @param array|null $params
+     * @param array|string|null $options
+     *
+     * @return Plan The updated plan.
+     */
+    public static function update($id, $params = null, $options = null)
+    {
+        return self::_update($id, $params, $options);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return Plan The deleted plan.
+     */
+    public function delete($params = null, $opts = null)
+    {
+        return $this->_delete($params, $opts);
+    }
+
+    /**
+     * @param array|string|null $opts
+     *
+     * @return Plan The saved plan.
+     */
+    public function save($opts = null)
+    {
+        return $this->_save($opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return Collection of Plans
+     */
+    public static function all($params = null, $opts = null)
+    {
+        return self::_all($params, $opts);
+    }
+}
diff --git a/htdocs/includes/stripe/lib/Product.php b/htdocs/includes/stripe/lib/Product.php
new file mode 100644
index 00000000000..2fdd22a0827
--- /dev/null
+++ b/htdocs/includes/stripe/lib/Product.php
@@ -0,0 +1,77 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class Product
+ *
+ * @package Stripe
+ */
+class Product extends ApiResource
+{
+    /**
+     * @param string $id The ID of the Product to retrieve.
+     * @param array|string|null $opts
+     *
+     * @return Product
+     */
+    public static function retrieve($id, $opts = null)
+    {
+        return self::_retrieve($id, $opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return Product The created Product.
+     */
+    public static function create($params = null, $opts = null)
+    {
+        return self::_create($params, $opts);
+    }
+
+    /**
+     * @param string $id The ID of the product to update.
+     * @param array|null $params
+     * @param array|string|null $options
+     *
+     * @return Product The updated product.
+     */
+    public static function update($id, $params = null, $options = null)
+    {
+        return self::_update($id, $params, $options);
+    }
+
+    /**
+     * @param array|string|null $opts
+     *
+     * @return Product The saved Product.
+     */
+    public function save($opts = null)
+    {
+        return $this->_save($opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return Collection of Products
+     */
+    public static function all($params = null, $opts = null)
+    {
+        return self::_all($params, $opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return Product The deleted product.
+     */
+    public function delete($params = null, $opts = null)
+    {
+        return $this->_delete($params, $opts);
+    }
+}
diff --git a/htdocs/includes/stripe/lib/Recipient.php b/htdocs/includes/stripe/lib/Recipient.php
new file mode 100644
index 00000000000..04bcb7bb289
--- /dev/null
+++ b/htdocs/includes/stripe/lib/Recipient.php
@@ -0,0 +1,92 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class Recipient
+ *
+ * @package Stripe
+ */
+class Recipient extends ApiResource
+{
+    /**
+     * @param string $id The ID of the recipient to retrieve.
+     * @param array|string|null $opts
+     *
+     * @return Recipient
+     */
+    public static function retrieve($id, $opts = null)
+    {
+        return self::_retrieve($id, $opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return Collection of Recipients
+     */
+    public static function all($params = null, $opts = null)
+    {
+        return self::_all($params, $opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return Recipient The created recipient.
+     */
+    public static function create($params = null, $opts = null)
+    {
+        return self::_create($params, $opts);
+    }
+
+    /**
+     * @param string $id The ID of the recipient to update.
+     * @param array|null $params
+     * @param array|string|null $options
+     *
+     * @return Recipient The updated recipient.
+     */
+    public static function update($id, $params = null, $options = null)
+    {
+        return self::_update($id, $params, $options);
+    }
+
+    /**
+     * @param array|string|null $opts
+     *
+     * @return Recipient The saved recipient.
+     */
+    public function save($opts = null)
+    {
+        return $this->_save($opts);
+    }
+
+    /**
+     * @param array|null $params
+     *
+     * @return Recipient The deleted recipient.
+     */
+    public function delete($params = null, $opts = null)
+    {
+        return $this->_delete($params, $opts);
+    }
+
+
+    /**
+     * @param array|null $params
+     *
+     * @return Collection of the Recipient's Transfers
+     */
+    public function transfers($params = null)
+    {
+        if ($params === null) {
+            $params = array();
+        }
+        $params['recipient'] = $this->id;
+        $transfers = Transfer::all($params, $this->_opts);
+        return $transfers;
+    }
+}
diff --git a/htdocs/includes/stripe/lib/RecipientTransfer.php b/htdocs/includes/stripe/lib/RecipientTransfer.php
new file mode 100644
index 00000000000..f4e46db38dd
--- /dev/null
+++ b/htdocs/includes/stripe/lib/RecipientTransfer.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class RecipientTransfer
+ *
+ * @property string $id
+ * @property string $object
+ * @property int $amount
+ * @property int $amount_reversed
+ * @property string $balance_transaction
+ * @property string $bank_account
+ * @property string $card
+ * @property int $created
+ * @property string $currency
+ * @property int $date
+ * @property string $description
+ * @property string $destination
+ * @property string $failure_code
+ * @property string $failure_message
+ * @property bool $livemode
+ * @property mixed $metadata
+ * @property string $method
+ * @property string $recipient
+ * @property mixed $reversals
+ * @property bool $reversed
+ * @property string $source_type
+ * @property string $statement_descriptor
+ * @property string $status
+ * @property string $type
+ *
+ * @package Stripe
+ */
+class RecipientTransfer extends ApiResource
+{
+
+}
diff --git a/htdocs/includes/stripe/lib/Refund.php b/htdocs/includes/stripe/lib/Refund.php
new file mode 100644
index 00000000000..b4e0e76a7b0
--- /dev/null
+++ b/htdocs/includes/stripe/lib/Refund.php
@@ -0,0 +1,79 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class Refund
+ *
+ * @property string $id
+ * @property string $object
+ * @property int $amount
+ * @property mixed $balance_transaction
+ * @property string $charge
+ * @property int $created
+ * @property string $currency
+ * @property mixed $metadata
+ * @property mixed $reason
+ * @property mixed $receipt_number
+ * @property string $status
+ *
+ * @package Stripe
+ */
+class Refund extends ApiResource
+{
+
+    /**
+     * @param string $id The ID of the refund to retrieve.
+     * @param array|string|null $options
+     *
+     * @return Refund
+     */
+    public static function retrieve($id, $options = null)
+    {
+        return self::_retrieve($id, $options);
+    }
+
+    /**
+     * @param string $id The ID of the refund to update.
+     * @param array|null $params
+     * @param array|string|null $options
+     *
+     * @return Refund The updated refund.
+     */
+    public static function update($id, $params = null, $options = null)
+    {
+        return self::_update($id, $params, $options);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $options
+     *
+     * @return Collection of Refunds
+     */
+    public static function all($params = null, $options = null)
+    {
+        return self::_all($params, $options);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $options
+     *
+     * @return Refund The created refund.
+     */
+    public static function create($params = null, $options = null)
+    {
+        return self::_create($params, $options);
+    }
+
+    /**
+     * @param array|string|null $opts
+     *
+     * @return Refund The saved refund.
+     */
+    public function save($opts = null)
+    {
+        return $this->_save($opts);
+    }
+}
diff --git a/htdocs/includes/stripe/lib/SKU.php b/htdocs/includes/stripe/lib/SKU.php
new file mode 100644
index 00000000000..7089604e62a
--- /dev/null
+++ b/htdocs/includes/stripe/lib/SKU.php
@@ -0,0 +1,77 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class SKU
+ *
+ * @package Stripe
+ */
+class SKU extends ApiResource
+{
+    /**
+     * @param string $id The ID of the SKU to retrieve.
+     * @param array|string|null $opts
+     *
+     * @return SKU
+     */
+    public static function retrieve($id, $opts = null)
+    {
+        return self::_retrieve($id, $opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return SKU The created SKU.
+     */
+    public static function create($params = null, $opts = null)
+    {
+        return self::_create($params, $opts);
+    }
+
+    /**
+     * @param string $id The ID of the SKU to update.
+     * @param array|null $params
+     * @param array|string|null $options
+     *
+     * @return SKU The updated SKU.
+     */
+    public static function update($id, $params = null, $options = null)
+    {
+        return self::_update($id, $params, $options);
+    }
+
+    /**
+     * @param array|string|null $opts
+     *
+     * @return SKU The saved SKU.
+     */
+    public function save($opts = null)
+    {
+        return $this->_save($opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return Collection of SKUs
+     */
+    public static function all($params = null, $opts = null)
+    {
+        return self::_all($params, $opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return SKU The deleted sku.
+     */
+    public function delete($params = null, $opts = null)
+    {
+        return $this->_delete($params, $opts);
+    }
+}
diff --git a/htdocs/includes/stripe/lib/SingletonApiResource.php b/htdocs/includes/stripe/lib/SingletonApiResource.php
new file mode 100644
index 00000000000..c6de4448332
--- /dev/null
+++ b/htdocs/includes/stripe/lib/SingletonApiResource.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class SingletonApiResource
+ *
+ * @package Stripe
+ */
+abstract class SingletonApiResource extends ApiResource
+{
+    protected static function _singletonRetrieve($options = null)
+    {
+        $opts = Util\RequestOptions::parse($options);
+        $instance = new static(null, $opts);
+        $instance->refresh();
+        return $instance;
+    }
+
+    /**
+     * @return string The endpoint associated with this singleton class.
+     */
+    public static function classUrl()
+    {
+        $base = static::className();
+        return "/v1/${base}";
+    }
+
+    /**
+     * @return string The endpoint associated with this singleton API resource.
+     */
+    public function instanceUrl()
+    {
+        return static::classUrl();
+    }
+}
diff --git a/htdocs/includes/stripe/lib/Source.php b/htdocs/includes/stripe/lib/Source.php
new file mode 100644
index 00000000000..946586dec45
--- /dev/null
+++ b/htdocs/includes/stripe/lib/Source.php
@@ -0,0 +1,115 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class Source
+ *
+ * @package Stripe
+ */
+class Source extends ApiResource
+{
+    /**
+     * @param string $id The ID of the Source to retrieve.
+     * @param array|string|null $opts
+     *
+     * @return Source
+     */
+    public static function retrieve($id, $opts = null)
+    {
+        return self::_retrieve($id, $opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return Collection of Sources
+     */
+    public static function all($params = null, $opts = null)
+    {
+        return self::_all($params, $opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return Source The created Source.
+     */
+    public static function create($params = null, $opts = null)
+    {
+        return self::_create($params, $opts);
+    }
+
+    /**
+     * @param string $id The ID of the source to update.
+     * @param array|null $params
+     * @param array|string|null $options
+     *
+     * @return Source The updated source.
+     */
+    public static function update($id, $params = null, $options = null)
+    {
+        return self::_update($id, $params, $options);
+    }
+
+    /**
+     * @param array|string|null $opts
+     *
+     * @return Source The saved source.
+     */
+    public function save($opts = null)
+    {
+        return $this->_save($opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return Source The deleted source.
+     */
+    public function delete($params = null, $options = null)
+    {
+        self::_validateParams($params);
+
+        $id = $this['id'];
+        if (!$id) {
+            $class = get_class($this);
+            $msg = "Could not determine which URL to request: $class instance "
+             . "has invalid ID: $id";
+            throw new Error\InvalidRequest($msg, null);
+        }
+
+        if ($this['customer']) {
+            $base = Customer::classUrl();
+            $parentExtn = urlencode(Util\Util::utf8($this['customer']));
+            $extn = urlencode(Util\Util::utf8($id));
+            $url = "$base/$parentExtn/sources/$extn";
+
+            list($response, $opts) = $this->_request('delete', $url, $params, $options);
+            $this->refreshFrom($response, $opts);
+            return $this;
+        } else {
+            $message = "Source objects cannot be deleted, they can only be "
+               . "detached from customer objects. This source object does not "
+               . "appear to be currently attached to a customer object.";
+            throw new Error\Api($message);
+        }
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $options
+     *
+     * @return BankAccount The verified bank account.
+     */
+    public function verify($params = null, $options = null)
+    {
+        $url = $this->instanceUrl() . '/verify';
+        list($response, $opts) = $this->_request('post', $url, $params, $options);
+        $this->refreshFrom($response, $opts);
+        return $this;
+    }
+}
diff --git a/htdocs/includes/stripe/lib/Stripe.php b/htdocs/includes/stripe/lib/Stripe.php
new file mode 100644
index 00000000000..9c85c08ea04
--- /dev/null
+++ b/htdocs/includes/stripe/lib/Stripe.php
@@ -0,0 +1,126 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class Stripe
+ *
+ * @package Stripe
+ */
+class Stripe
+{
+    // @var string The Stripe API key to be used for requests.
+    public static $apiKey;
+
+    // @var string The base URL for the Stripe API.
+    public static $apiBase = 'https://api.stripe.com';
+
+    // @var string The base URL for the Stripe API uploads endpoint.
+    public static $apiUploadBase = 'https://uploads.stripe.com';
+
+    // @var string|null The version of the Stripe API to use for requests.
+    public static $apiVersion = null;
+
+    // @var string|null The account ID for connected accounts requests.
+    public static $accountId = null;
+
+    // @var boolean Defaults to true.
+    public static $verifySslCerts = true;
+
+    // @var array The application's information (name, version, URL)
+    public static $appInfo = null;
+
+    const VERSION = '4.7.0';
+
+    /**
+     * @return string The API key used for requests.
+     */
+    public static function getApiKey()
+    {
+        return self::$apiKey;
+    }
+
+    /**
+     * Sets the API key to be used for requests.
+     *
+     * @param string $apiKey
+     */
+    public static function setApiKey($apiKey)
+    {
+        self::$apiKey = $apiKey;
+    }
+
+    /**
+     * @return string The API version used for requests. null if we're using the
+     *    latest version.
+     */
+    public static function getApiVersion()
+    {
+        return self::$apiVersion;
+    }
+
+    /**
+     * @param string $apiVersion The API version to use for requests.
+     */
+    public static function setApiVersion($apiVersion)
+    {
+        self::$apiVersion = $apiVersion;
+    }
+
+    /**
+     * @return boolean
+     */
+    public static function getVerifySslCerts()
+    {
+        return self::$verifySslCerts;
+    }
+
+    /**
+     * @param boolean $verify
+     */
+    public static function setVerifySslCerts($verify)
+    {
+        self::$verifySslCerts = $verify;
+    }
+
+    /**
+     * @return string | null The Stripe account ID for connected account
+     *   requests.
+     */
+    public static function getAccountId()
+    {
+        return self::$accountId;
+    }
+
+    /**
+     * @param string $accountId The Stripe account ID to set for connected
+     *   account requests.
+     */
+    public static function setAccountId($accountId)
+    {
+        self::$accountId = $accountId;
+    }
+
+    /**
+     * @return array | null The application's information
+     */
+    public static function getAppInfo()
+    {
+        return self::$appInfo;
+    }
+
+    /**
+     * @param string $appName The application's name
+     * @param string $appVersion The application's version
+     * @param string $appUrl The application's URL
+     */
+    public static function setAppInfo($appName, $appVersion = null, $appUrl = null)
+    {
+        if (self::$appInfo === null) {
+            self::$appInfo = array();
+        }
+        self::$appInfo['name'] = $appName;
+        self::$appInfo['version'] = $appVersion;
+        self::$appInfo['url'] = $appUrl;
+    }
+}
diff --git a/htdocs/includes/stripe/lib/StripeObject.php b/htdocs/includes/stripe/lib/StripeObject.php
new file mode 100644
index 00000000000..42e37f694e8
--- /dev/null
+++ b/htdocs/includes/stripe/lib/StripeObject.php
@@ -0,0 +1,294 @@
+<?php
+
+namespace Stripe;
+
+use ArrayAccess;
+use InvalidArgumentException;
+
+/**
+ * Class StripeObject
+ *
+ * @package Stripe
+ */
+class StripeObject implements ArrayAccess, JsonSerializable
+{
+    /**
+     * @var Util\Set Attributes that should not be sent to the API because
+     *    they're not updatable (e.g. API key, ID).
+     */
+    public static $permanentAttributes;
+    /**
+     * @var Util\Set Attributes that are nested but still updatable from
+     *    the parent class's URL (e.g. metadata).
+     */
+    public static $nestedUpdatableAttributes;
+
+    public static function init()
+    {
+        self::$permanentAttributes = new Util\Set(array('_opts', 'id'));
+        self::$nestedUpdatableAttributes = new Util\Set(array(
+            'metadata', 'legal_entity', 'address', 'dob', 'transfer_schedule', 'verification',
+            'tos_acceptance', 'personal_address',
+            // will make the array into an AttachedObject: weird, but works for now
+            'additional_owners', 0, 1, 2, 3, 4, // Max 3, but leave the 4th so errors work properly
+            'inventory',
+            'owner',
+        ));
+    }
+
+    /**
+     * @return object The last response from the Stripe API
+     */
+    public function getLastResponse()
+    {
+        return $this->_lastResponse;
+    }
+
+    /**
+     * @param ApiResponse
+     *
+     * @return void Set the last response from the Stripe API
+     */
+    public function setLastResponse($resp)
+    {
+        $this->_lastResponse = $resp;
+    }
+
+    protected $_opts;
+    protected $_values;
+    protected $_unsavedValues;
+    protected $_transientValues;
+    protected $_retrieveOptions;
+    protected $_lastResponse;
+
+    public function __construct($id = null, $opts = null)
+    {
+        $this->_opts = $opts ? $opts : new Util\RequestOptions();
+        $this->_values = array();
+        $this->_unsavedValues = new Util\Set();
+        $this->_transientValues = new Util\Set();
+
+        $this->_retrieveOptions = array();
+        if (is_array($id)) {
+            foreach ($id as $key => $value) {
+                if ($key != 'id') {
+                    $this->_retrieveOptions[$key] = $value;
+                }
+            }
+            $id = $id['id'];
+        }
+
+        if ($id !== null) {
+            $this->id = $id;
+        }
+    }
+
+    // Standard accessor magic methods
+    public function __set($k, $v)
+    {
+        if ($v === "") {
+            throw new InvalidArgumentException(
+                'You cannot set \''.$k.'\'to an empty string. '
+                .'We interpret empty strings as NULL in requests. '
+                .'You may set obj->'.$k.' = NULL to delete the property'
+            );
+        }
+
+        if (self::$nestedUpdatableAttributes->includes($k)
+                && isset($this->$k) && $this->$k instanceof AttachedObject && is_array($v)) {
+            $this->$k->replaceWith($v);
+        } else {
+            // TODO: may want to clear from $_transientValues (Won't be user-visible).
+            $this->_values[$k] = $v;
+        }
+        if (!self::$permanentAttributes->includes($k)) {
+            $this->_unsavedValues->add($k);
+        }
+    }
+
+    public function __isset($k)
+    {
+        return isset($this->_values[$k]);
+    }
+    public function __unset($k)
+    {
+        unset($this->_values[$k]);
+        $this->_transientValues->add($k);
+        $this->_unsavedValues->discard($k);
+    }
+    public function &__get($k)
+    {
+        // function should return a reference, using $nullval to return a reference to null
+        $nullval = null;
+        if (!empty($this->_values) && array_key_exists($k, $this->_values)) {
+            return $this->_values[$k];
+        } else if (!empty($this->_transientValues) && $this->_transientValues->includes($k)) {
+            $class = get_class($this);
+            $attrs = join(', ', array_keys($this->_values));
+            $message = "Stripe Notice: Undefined property of $class instance: $k. "
+                    . "HINT: The $k attribute was set in the past, however. "
+                    . "It was then wiped when refreshing the object "
+                    . "with the result returned by Stripe's API, "
+                    . "probably as a result of a save(). The attributes currently "
+                    . "available on this object are: $attrs";
+            error_log($message);
+            return $nullval;
+        } else {
+            $class = get_class($this);
+            error_log("Stripe Notice: Undefined property of $class instance: $k");
+            return $nullval;
+        }
+    }
+
+    // ArrayAccess methods
+    public function offsetSet($k, $v)
+    {
+        $this->$k = $v;
+    }
+
+    public function offsetExists($k)
+    {
+        return array_key_exists($k, $this->_values);
+    }
+
+    public function offsetUnset($k)
+    {
+        unset($this->$k);
+    }
+    public function offsetGet($k)
+    {
+        return array_key_exists($k, $this->_values) ? $this->_values[$k] : null;
+    }
+
+    public function keys()
+    {
+        return array_keys($this->_values);
+    }
+
+    /**
+     * This unfortunately needs to be public to be used in Util\Util
+     *
+     * @param array $values
+     * @param array $opts
+     *
+     * @return StripeObject The object constructed from the given values.
+     */
+    public static function constructFrom($values, $opts)
+    {
+        $obj = new static(isset($values['id']) ? $values['id'] : null);
+        $obj->refreshFrom($values, $opts);
+        return $obj;
+    }
+
+    /**
+     * Refreshes this object using the provided values.
+     *
+     * @param array $values
+     * @param array|Util\RequestOptions $opts
+     * @param boolean $partial Defaults to false.
+     */
+    public function refreshFrom($values, $opts, $partial = false)
+    {
+        if (is_array($opts)) {
+            $opts = Util\RequestOptions::parse($opts);
+        }
+
+        $this->_opts = $opts;
+
+        // Wipe old state before setting new.  This is useful for e.g. updating a
+        // customer, where there is no persistent card parameter.  Mark those values
+        // which don't persist as transient
+        if ($partial) {
+            $removed = new Util\Set();
+        } else {
+            $removed = array_diff(array_keys($this->_values), array_keys($values));
+        }
+
+        foreach ($removed as $k) {
+            if (self::$permanentAttributes->includes($k)) {
+                continue;
+            }
+
+            unset($this->$k);
+        }
+
+        foreach ($values as $k => $v) {
+            if (self::$permanentAttributes->includes($k) && isset($this[$k])) {
+                continue;
+            }
+
+            if (self::$nestedUpdatableAttributes->includes($k) && is_array($v)) {
+                $this->_values[$k] = AttachedObject::constructFrom($v, $opts);
+            } else {
+                $this->_values[$k] = Util\Util::convertToStripeObject($v, $opts);
+            }
+
+            $this->_transientValues->discard($k);
+            $this->_unsavedValues->discard($k);
+        }
+    }
+
+    /**
+     * @return array A recursive mapping of attributes to values for this object,
+     *    including the proper value for deleted attributes.
+     */
+    public function serializeParameters()
+    {
+        $params = array();
+        if ($this->_unsavedValues) {
+            foreach ($this->_unsavedValues->toArray() as $k) {
+                $v = $this->$k;
+                if ($v === null) {
+                    $v = '';
+                }
+
+                $params[$k] = $v;
+            }
+        }
+
+        // Get nested updates.
+        foreach (self::$nestedUpdatableAttributes->toArray() as $property) {
+            if (isset($this->$property)) {
+                if ($this->$property instanceof StripeObject) {
+                    $serialized = $this->$property->serializeParameters();
+                    if ($serialized) {
+                        $params[$property] = $serialized;
+                    }
+                }
+            }
+        }
+
+        return $params;
+    }
+
+    public function jsonSerialize()
+    {
+        return $this->__toArray(true);
+    }
+
+    public function __toJSON()
+    {
+        if (defined('JSON_PRETTY_PRINT')) {
+            return json_encode($this->__toArray(true), JSON_PRETTY_PRINT);
+        } else {
+            return json_encode($this->__toArray(true));
+        }
+    }
+
+    public function __toString()
+    {
+        $class = get_class($this);
+        return $class . ' JSON: ' . $this->__toJSON();
+    }
+
+    public function __toArray($recursive = false)
+    {
+        if ($recursive) {
+            return Util\Util::convertStripeObjectToArray($this->_values);
+        } else {
+            return $this->_values;
+        }
+    }
+}
+
+StripeObject::init();
diff --git a/htdocs/includes/stripe/lib/Subscription.php b/htdocs/includes/stripe/lib/Subscription.php
new file mode 100644
index 00000000000..a95ab0911c9
--- /dev/null
+++ b/htdocs/includes/stripe/lib/Subscription.php
@@ -0,0 +1,97 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class Subscription
+ *
+ * @package Stripe
+ */
+class Subscription extends ApiResource
+{
+    /**
+     * These constants are possible representations of the status field.
+     *
+     * @link https://stripe.com/docs/api#subscription_object-status
+     */
+    const STATUS_ACTIVE = 'active';
+    const STATUS_CANCELED = 'canceled';
+    const STATUS_PAST_DUE = 'past_due';
+    const STATUS_TRIALING = 'trialing';
+    const STATUS_UNPAID = 'unpaid';
+
+    /**
+     * @param string $id The ID of the subscription to retrieve.
+     * @param array|string|null $opts
+     *
+     * @return Subscription
+     */
+    public static function retrieve($id, $opts = null)
+    {
+        return self::_retrieve($id, $opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return Collection of Subscriptions
+     */
+    public static function all($params = null, $opts = null)
+    {
+        return self::_all($params, $opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return Subscription The created subscription.
+     */
+    public static function create($params = null, $opts = null)
+    {
+        return self::_create($params, $opts);
+    }
+
+    /**
+     * @param string $id The ID of the subscription to retrieve.
+     * @param array|null $params
+     * @param array|string|null $options
+     *
+     * @return Subscription The updated subscription.
+     */
+    public static function update($id, $params = null, $options = null)
+    {
+        return self::_update($id, $params, $options);
+    }
+
+    /**
+     * @param array|null $params
+     *
+     * @return Subscription The deleted subscription.
+     */
+    public function cancel($params = null, $opts = null)
+    {
+        return $this->_delete($params, $opts);
+    }
+
+    /**
+     * @param array|string|null $opts
+     *
+     * @return Subscription The saved subscription.
+     */
+    public function save($opts = null)
+    {
+        return $this->_save($opts);
+    }
+
+    /**
+     * @return Subscription The updated subscription.
+     */
+    public function deleteDiscount()
+    {
+        $url = $this->instanceUrl() . '/discount';
+        list($response, $opts) = $this->_request('delete', $url);
+        $this->refreshFrom(array('discount' => null), $opts, true);
+    }
+}
diff --git a/htdocs/includes/stripe/lib/SubscriptionItem.php b/htdocs/includes/stripe/lib/SubscriptionItem.php
new file mode 100644
index 00000000000..947d83fcb5f
--- /dev/null
+++ b/htdocs/includes/stripe/lib/SubscriptionItem.php
@@ -0,0 +1,88 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class SubscriptionItem
+ *
+ * @package Stripe
+ */
+class SubscriptionItem extends ApiResource
+{
+    /**
+     * This is a special case because the subscription items endpoint has an
+     *    underscore in it. The parent `className` function strips underscores.
+     *
+     * @return string The name of the class.
+     */
+    public static function className()
+    {
+        return 'subscription_item';
+    }
+
+    /**
+     * @param string $id The ID of the subscription item to retrieve.
+     * @param array|string|null $opts
+     *
+     * @return SubscriptionItem
+     */
+    public static function retrieve($id, $opts = null)
+    {
+        return self::_retrieve($id, $opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return Collection of SubscriptionItems
+     */
+    public static function all($params = null, $opts = null)
+    {
+        return self::_all($params, $opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return SubscriptionItem The created subscription item.
+     */
+    public static function create($params = null, $opts = null)
+    {
+        return self::_create($params, $opts);
+    }
+
+    /**
+     * @param string $id The ID of the subscription item to update.
+     * @param array|null $params
+     * @param array|string|null $options
+     *
+     * @return SubscriptionItem The updated subscription item.
+     */
+    public static function update($id, $params = null, $options = null)
+    {
+        return self::_update($id, $params, $options);
+    }
+
+    /**
+     * @param array|string|null $opts
+     *
+     * @return SubscriptionItem The saved subscription item.
+     */
+    public function save($opts = null)
+    {
+        return $this->_save($opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return SubscriptionItem The deleted subscription item.
+     */
+    public function delete($params = null, $opts = null)
+    {
+        return $this->_delete($params, $opts);
+    }
+}
diff --git a/htdocs/includes/stripe/lib/ThreeDSecure.php b/htdocs/includes/stripe/lib/ThreeDSecure.php
new file mode 100644
index 00000000000..1f189b7daeb
--- /dev/null
+++ b/htdocs/includes/stripe/lib/ThreeDSecure.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace Stripe;
+
+class ThreeDSecure extends ApiResource
+{
+    /**
+     * @return string The endpoint URL for the given class.
+     */
+    public static function classUrl()
+    {
+        return "/v1/3d_secure";
+    }
+
+    /**
+     * @param string $id The ID of the 3DS auth to retrieve.
+     * @param array|string|null $options
+     *
+     * @return ThreeDSecure
+     */
+    public static function retrieve($id, $options = null)
+    {
+        return self::_retrieve($id, $options);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return ThreeDSecure The created 3D Secure object.
+     */
+    public static function create($params = null, $opts = null)
+    {
+        return self::_create($params, $opts);
+    }
+}
diff --git a/htdocs/includes/stripe/lib/Token.php b/htdocs/includes/stripe/lib/Token.php
new file mode 100644
index 00000000000..d3e5a4bcef9
--- /dev/null
+++ b/htdocs/includes/stripe/lib/Token.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class Token
+ *
+ * @property string $id
+ * @property string $object
+ * @property mixed $bank_account
+ * @property mixed $card
+ * @property mixed $client_ip
+ * @property int $created
+ * @property bool $livemode
+ * @property string $type
+ * @property bool $used
+ *
+ * @package Stripe
+ */
+class Token extends ApiResource
+{
+    /**
+     * @param string $id The ID of the token to retrieve.
+     * @param array|string|null $opts
+     *
+     * @return Token
+     */
+    public static function retrieve($id, $opts = null)
+    {
+        return self::_retrieve($id, $opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return Token The created token.
+     */
+    public static function create($params = null, $opts = null)
+    {
+        return self::_create($params, $opts);
+    }
+}
diff --git a/htdocs/includes/stripe/lib/Transfer.php b/htdocs/includes/stripe/lib/Transfer.php
new file mode 100644
index 00000000000..2f483f30169
--- /dev/null
+++ b/htdocs/includes/stripe/lib/Transfer.php
@@ -0,0 +1,104 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class Transfer
+ *
+ * @property string $id
+ * @property string $object
+ * @property int $amount
+ * @property int $amount_reversed
+ * @property string $balance_transaction
+ * @property int $created
+ * @property string $currency
+ * @property int $date
+ * @property mixed $destination
+ * @property mixed $destination_payment
+ * @property bool $livemode
+ * @property mixed $metadata
+ * @property mixed $reversals
+ * @property bool $reversed
+ * @property mixed $source_transaction
+ *
+ * @package Stripe
+ */
+class Transfer extends ApiResource
+{
+    /**
+     * @param string $id The ID of the transfer to retrieve.
+     * @param array|string|null $opts
+     *
+     * @return Transfer
+     */
+    public static function retrieve($id, $opts = null)
+    {
+        return self::_retrieve($id, $opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return Collection of Transfers
+     */
+    public static function all($params = null, $opts = null)
+    {
+        return self::_all($params, $opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return Transfer The created transfer.
+     */
+    public static function create($params = null, $opts = null)
+    {
+        return self::_create($params, $opts);
+    }
+
+    /**
+     * @param string $id The ID of the transfer to update.
+     * @param array|null $params
+     * @param array|string|null $options
+     *
+     * @return Transfer The updated transfer.
+     */
+    public static function update($id, $params = null, $options = null)
+    {
+        return self::_update($id, $params, $options);
+    }
+
+    /**
+     * @return TransferReversal The created transfer reversal.
+     */
+    public function reverse($params = null, $opts = null)
+    {
+        $url = $this->instanceUrl() . '/reversals';
+        list($response, $opts) = $this->_request('post', $url, $params, $opts);
+        $this->refreshFrom($response, $opts);
+        return $this;
+    }
+
+    /**
+     * @return Transfer The canceled transfer.
+     */
+    public function cancel()
+    {
+        $url = $this->instanceUrl() . '/cancel';
+        list($response, $opts) = $this->_request('post', $url);
+        $this->refreshFrom($response, $opts);
+        return $this;
+    }
+
+    /**
+     * @param array|string|null $opts
+     *
+     * @return Transfer The saved transfer.
+     */
+    public function save($opts = null)
+    {
+        return $this->_save($opts);
+    }
+}
diff --git a/htdocs/includes/stripe/lib/TransferReversal.php b/htdocs/includes/stripe/lib/TransferReversal.php
new file mode 100644
index 00000000000..33948c93e14
--- /dev/null
+++ b/htdocs/includes/stripe/lib/TransferReversal.php
@@ -0,0 +1,53 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class TransferReversal
+ *
+ * @property string $id
+ * @property string $object
+ * @property int $amount
+ * @property string $balance_transaction
+ * @property int $created
+ * @property string $currency
+ * @property mixed $metadata
+ * @property string $transfer
+ *
+ * @package Stripe
+ */
+class TransferReversal extends ApiResource
+{
+    /**
+     * @return string The API URL for this Stripe transfer reversal.
+     */
+    public function instanceUrl()
+    {
+        $id = $this['id'];
+        $transfer = $this['transfer'];
+        if (!$id) {
+            throw new Error\InvalidRequest(
+                "Could not determine which URL to request: " .
+                "class instance has invalid ID: $id",
+                null
+            );
+        }
+        $id = Util\Util::utf8($id);
+        $transfer = Util\Util::utf8($transfer);
+
+        $base = Transfer::classUrl();
+        $transferExtn = urlencode($transfer);
+        $extn = urlencode($id);
+        return "$base/$transferExtn/reversals/$extn";
+    }
+
+    /**
+     * @param array|string|null $opts
+     *
+     * @return TransferReversal The saved reversal.
+     */
+    public function save($opts = null)
+    {
+        return $this->_save($opts);
+    }
+}
diff --git a/htdocs/includes/stripe/lib/Util/AutoPagingIterator.php b/htdocs/includes/stripe/lib/Util/AutoPagingIterator.php
new file mode 100644
index 00000000000..80877e6742e
--- /dev/null
+++ b/htdocs/includes/stripe/lib/Util/AutoPagingIterator.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace Stripe\Util;
+
+class AutoPagingIterator implements \Iterator
+{
+    private $lastId = null;
+    private $page = null;
+    private $pageOffset = 0;
+    private $params = array();
+
+    public function __construct($collection, $params)
+    {
+        $this->page = $collection;
+        $this->params = $params;
+    }
+
+    public function rewind()
+    {
+        // Actually rewinding would require making a copy of the original page.
+    }
+
+    public function current()
+    {
+        $item = current($this->page->data);
+        $this->lastId = $item !== false ? $item['id'] : null;
+
+        return $item;
+    }
+
+    public function key()
+    {
+        return key($this->page->data) + $this->pageOffset;
+    }
+
+    public function next()
+    {
+        $item = next($this->page->data);
+        if ($item === false) {
+            // If we've run out of data on the current page, try to fetch another one
+            // and increase the offset the new page would start at
+            $this->pageOffset += count($this->page->data);
+            if ($this->page['has_more']) {
+                $this->params = array_merge(
+                    $this->params ? $this->params : array(),
+                    array('starting_after' => $this->lastId)
+                );
+                $this->page = $this->page->all($this->params);
+            } else {
+                return false;
+            }
+        }
+    }
+
+    public function valid()
+    {
+        $key = key($this->page->data);
+        $valid = ($key !== null && $key !== false);
+        return $valid;
+    }
+}
diff --git a/htdocs/includes/stripe/lib/Util/RequestOptions.php b/htdocs/includes/stripe/lib/Util/RequestOptions.php
new file mode 100644
index 00000000000..14af2b8a0e8
--- /dev/null
+++ b/htdocs/includes/stripe/lib/Util/RequestOptions.php
@@ -0,0 +1,79 @@
+<?php
+
+namespace Stripe\Util;
+
+use Stripe\Error;
+
+class RequestOptions
+{
+    public $headers;
+    public $apiKey;
+
+    public function __construct($key = null, $headers = array())
+    {
+        $this->apiKey = $key;
+        $this->headers = $headers;
+    }
+
+    /**
+     * Unpacks an options array and merges it into the existing RequestOptions
+     * object.
+     * @param array|string|null $options a key => value array
+     *
+     * @return RequestOptions
+     */
+    public function merge($options)
+    {
+        $other_options = self::parse($options);
+        if ($other_options->apiKey === null) {
+            $other_options->apiKey = $this->apiKey;
+        }
+        $other_options->headers = array_merge($this->headers, $other_options->headers);
+        return $other_options;
+    }
+
+    /**
+     * Unpacks an options array into an RequestOptions object
+     * @param array|string|null $options a key => value array
+     *
+     * @return RequestOptions
+     */
+    public static function parse($options)
+    {
+        if ($options instanceof self) {
+            return $options;
+        }
+
+        if (is_null($options)) {
+            return new RequestOptions(null, array());
+        }
+
+        if (is_string($options)) {
+            return new RequestOptions($options, array());
+        }
+
+        if (is_array($options)) {
+            $headers = array();
+            $key = null;
+            if (array_key_exists('api_key', $options)) {
+                $key = $options['api_key'];
+            }
+            if (array_key_exists('idempotency_key', $options)) {
+                $headers['Idempotency-Key'] = $options['idempotency_key'];
+            }
+            if (array_key_exists('stripe_account', $options)) {
+                $headers['Stripe-Account'] = $options['stripe_account'];
+            }
+            if (array_key_exists('stripe_version', $options)) {
+                $headers['Stripe-Version'] = $options['stripe_version'];
+            }
+            return new RequestOptions($key, $headers);
+        }
+
+        $message = 'The second argument to Stripe API method calls is an '
+           . 'optional per-request apiKey, which must be a string, or '
+           . 'per-request options, which must be an array. (HINT: you can set '
+           . 'a global apiKey by "Stripe::setApiKey(<apiKey>)")';
+        throw new Error\Api($message);
+    }
+}
diff --git a/htdocs/includes/stripe/lib/Util/Set.php b/htdocs/includes/stripe/lib/Util/Set.php
new file mode 100644
index 00000000000..2a500cd639b
--- /dev/null
+++ b/htdocs/includes/stripe/lib/Util/Set.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace Stripe\Util;
+
+use IteratorAggregate;
+use ArrayIterator;
+
+class Set implements IteratorAggregate
+{
+    private $_elts;
+
+    public function __construct($members = array())
+    {
+        $this->_elts = array();
+        foreach ($members as $item) {
+            $this->_elts[$item] = true;
+        }
+    }
+
+    public function includes($elt)
+    {
+        return isset($this->_elts[$elt]);
+    }
+
+    public function add($elt)
+    {
+        $this->_elts[$elt] = true;
+    }
+
+    public function discard($elt)
+    {
+        unset($this->_elts[$elt]);
+    }
+
+    public function toArray()
+    {
+        return array_keys($this->_elts);
+    }
+
+    public function getIterator()
+    {
+        return new ArrayIterator($this->toArray());
+    }
+}
diff --git a/htdocs/includes/stripe/lib/Util/Util.php b/htdocs/includes/stripe/lib/Util/Util.php
new file mode 100644
index 00000000000..1c8235df9bd
--- /dev/null
+++ b/htdocs/includes/stripe/lib/Util/Util.php
@@ -0,0 +1,146 @@
+<?php
+
+namespace Stripe\Util;
+
+use Stripe\StripeObject;
+
+abstract class Util
+{
+    private static $isMbstringAvailable = null;
+
+    /**
+     * Whether the provided array (or other) is a list rather than a dictionary.
+     *
+     * @param array|mixed $array
+     * @return boolean True if the given object is a list.
+     */
+    public static function isList($array)
+    {
+        if (!is_array($array)) {
+            return false;
+        }
+
+      // TODO: generally incorrect, but it's correct given Stripe's response
+        foreach (array_keys($array) as $k) {
+            if (!is_numeric($k)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Recursively converts the PHP Stripe object to an array.
+     *
+     * @param array $values The PHP Stripe object to convert.
+     * @return array
+     */
+    public static function convertStripeObjectToArray($values)
+    {
+        $results = array();
+        foreach ($values as $k => $v) {
+            // FIXME: this is an encapsulation violation
+            if ($k[0] == '_') {
+                continue;
+            }
+            if ($v instanceof StripeObject) {
+                $results[$k] = $v->__toArray(true);
+            } elseif (is_array($v)) {
+                $results[$k] = self::convertStripeObjectToArray($v);
+            } else {
+                $results[$k] = $v;
+            }
+        }
+        return $results;
+    }
+
+    /**
+     * Converts a response from the Stripe API to the corresponding PHP object.
+     *
+     * @param array $resp The response from the Stripe API.
+     * @param array $opts
+     * @return StripeObject|array
+     */
+    public static function convertToStripeObject($resp, $opts)
+    {
+        $types = array(
+            'account' => 'Stripe\\Account',
+            'alipay_account' => 'Stripe\\AlipayAccount',
+            'apple_pay_domain' => 'Stripe\\ApplePayDomain',
+            'bank_account' => 'Stripe\\BankAccount',
+            'balance_transaction' => 'Stripe\\BalanceTransaction',
+            'card' => 'Stripe\\Card',
+            'charge' => 'Stripe\\Charge',
+            'country_spec' => 'Stripe\\CountrySpec',
+            'coupon' => 'Stripe\\Coupon',
+            'customer' => 'Stripe\\Customer',
+            'dispute' => 'Stripe\\Dispute',
+            'list' => 'Stripe\\Collection',
+            'invoice' => 'Stripe\\Invoice',
+            'invoiceitem' => 'Stripe\\InvoiceItem',
+            'event' => 'Stripe\\Event',
+            'file' => 'Stripe\\FileUpload',
+            'token' => 'Stripe\\Token',
+            'transfer' => 'Stripe\\Transfer',
+            'transfer_reversal' => 'Stripe\\TransferReversal',
+            'order' => 'Stripe\\Order',
+            'order_return' => 'Stripe\\OrderReturn',
+            'payout' => 'Stripe\\Payout',
+            'plan' => 'Stripe\\Plan',
+            'product' => 'Stripe\\Product',
+            'recipient' => 'Stripe\\Recipient',
+            'recipient_transfer' => 'Stripe\\RecipientTransfer',
+            'refund' => 'Stripe\\Refund',
+            'sku' => 'Stripe\\SKU',
+            'source' => 'Stripe\\Source',
+            'subscription' => 'Stripe\\Subscription',
+            'subscription_item' => 'Stripe\\SubscriptionItem',
+            'three_d_secure' => 'Stripe\\ThreeDSecure',
+            'fee_refund' => 'Stripe\\ApplicationFeeRefund',
+            'bitcoin_receiver' => 'Stripe\\BitcoinReceiver',
+            'bitcoin_transaction' => 'Stripe\\BitcoinTransaction',
+        );
+        if (self::isList($resp)) {
+            $mapped = array();
+            foreach ($resp as $i) {
+                array_push($mapped, self::convertToStripeObject($i, $opts));
+            }
+            return $mapped;
+        } elseif (is_array($resp)) {
+            if (isset($resp['object']) && is_string($resp['object']) && isset($types[$resp['object']])) {
+                $class = $types[$resp['object']];
+            } else {
+                $class = 'Stripe\\StripeObject';
+            }
+            return $class::constructFrom($resp, $opts);
+        } else {
+            return $resp;
+        }
+    }
+
+    /**
+     * @param string|mixed $value A string to UTF8-encode.
+     *
+     * @return string|mixed The UTF8-encoded string, or the object passed in if
+     *    it wasn't a string.
+     */
+    public static function utf8($value)
+    {
+        if (self::$isMbstringAvailable === null) {
+            self::$isMbstringAvailable = function_exists('mb_detect_encoding');
+
+            if (!self::$isMbstringAvailable) {
+                trigger_error("It looks like the mbstring extension is not enabled. " .
+                    "UTF-8 strings will not properly be encoded. Ask your system " .
+                    "administrator to enable the mbstring extension, or write to " .
+                    "support@stripe.com if you have any questions.", E_USER_WARNING);
+            }
+        }
+
+        if (is_string($value) && self::$isMbstringAvailable && mb_detect_encoding($value, "UTF-8", true) != "UTF-8") {
+            return utf8_encode($value);
+        } else {
+            return $value;
+        }
+    }
+}
diff --git a/htdocs/includes/stripe/phpunit.no_autoload.xml b/htdocs/includes/stripe/phpunit.no_autoload.xml
new file mode 100644
index 00000000000..f418611df5e
--- /dev/null
+++ b/htdocs/includes/stripe/phpunit.no_autoload.xml
@@ -0,0 +1,15 @@
+<phpunit bootstrap="tests/bootstrap.no_autoload.php" colors="true">
+    <testsuites>
+        <testsuite name="Stripe PHP Test Suite">
+            <directory suffix="Test.php">tests</directory>
+        </testsuite>
+    </testsuites>
+    <filter>
+        <whitelist>
+            <directory>lib</directory>
+        </whitelist>
+    </filter>
+    <logging>
+        <log type="coverage-clover" target="clover.xml"/>
+    </logging>
+</phpunit>
diff --git a/htdocs/includes/stripe/phpunit.xml b/htdocs/includes/stripe/phpunit.xml
new file mode 100644
index 00000000000..7a73276d0b1
--- /dev/null
+++ b/htdocs/includes/stripe/phpunit.xml
@@ -0,0 +1,15 @@
+<phpunit bootstrap="tests/bootstrap.php" colors="true">
+    <testsuites>
+        <testsuite name="Stripe PHP Test Suite">
+            <directory suffix="Test.php">tests</directory>
+        </testsuite>
+    </testsuites>
+    <filter>
+        <whitelist>
+            <directory>lib</directory>
+        </whitelist>
+    </filter>
+    <logging>
+        <log type="coverage-clover" target="clover.xml"/>
+    </logging>
+</phpunit>
diff --git a/htdocs/includes/stripe/tests/AccountTest.php b/htdocs/includes/stripe/tests/AccountTest.php
new file mode 100644
index 00000000000..994ba6f6a8a
--- /dev/null
+++ b/htdocs/includes/stripe/tests/AccountTest.php
@@ -0,0 +1,300 @@
+<?php
+
+namespace Stripe;
+
+class AccountTest extends TestCase
+{
+    private function managedAccountResponse($id)
+    {
+        return array(
+            'id' => $id,
+            'currencies_supported' => array('usd', 'aed', 'afn', '...'),
+            'object' => 'account',
+            'business_name' => 'Stripe.com',
+            'bank_accounts' => array(
+                'object' => 'list',
+                'total_count' => 0,
+                'has_more' => false,
+                'url' => '/v1/accounts/' . $id . '/bank_accounts',
+                'data' => array()
+            ),
+            'verification' => array(
+                'fields_needed' => array(
+                    'product_description',
+                    'business_url',
+                    'support_phone',
+                    'bank_account',
+                    'tos_acceptance.ip',
+                    'tos_acceptance.date'
+                ),
+                'due_by' => null,
+                'contacted' => false
+            ),
+            'tos_acceptance' => array(
+                'ip' => null,
+                'date' => null,
+                'user_agent' => null
+            ),
+            'legal_entity' => array(
+                'type' => null,
+                'business_name' => null,
+                'address' => array(
+                    'line1' => null,
+                    'line2' => null,
+                    'city' => null,
+                    'state' => null,
+                    'postal_code' => null,
+                    'country' => 'US'
+                ),
+                'first_name' => null,
+                'last_name' => null,
+                'additional_owners' => null,
+                'verification' => array(
+                    'status' => 'unverified',
+                    'document' => null,
+                    'details' => null
+                )
+            )
+        );
+    }
+
+    private function deletedAccountResponse($id)
+    {
+        return array(
+            'id' => $id,
+            'deleted' => true
+        );
+    }
+
+    public function testBasicRetrieve()
+    {
+        $this->mockRequest('GET', '/v1/account', array(), $this->managedAccountResponse('acct_ABC'));
+        $account = Account::retrieve();
+        $this->assertSame($account->id, 'acct_ABC');
+    }
+
+    public function testIDRetrieve()
+    {
+        $this->mockRequest('GET', '/v1/accounts/acct_DEF', array(), $this->managedAccountResponse('acct_DEF'));
+        $account = Account::retrieve('acct_DEF');
+        $this->assertSame($account->id, 'acct_DEF');
+    }
+
+    public function testCreate()
+    {
+        $this->mockRequest(
+            'POST',
+            '/v1/accounts',
+            array('managed' => 'true'),
+            $this->managedAccountResponse('acct_ABC')
+        );
+        $account = Account::create(array(
+            'managed' => true
+        ));
+        $this->assertSame($account->id, 'acct_ABC');
+    }
+
+    public function testDelete()
+    {
+        $account = self::createTestAccount();
+
+        $this->mockRequest(
+            'DELETE',
+            '/v1/accounts/' . $account->id,
+            array(),
+            $this->deletedAccountResponse('acct_ABC')
+        );
+        $deleted = $account->delete();
+        $this->assertSame($deleted->id, $account->id);
+        $this->assertTrue($deleted->deleted);
+    }
+
+    public function testReject()
+    {
+        $account = self::createTestAccount();
+
+        $this->mockRequest(
+            'POST',
+            '/v1/accounts/' . $account->id . '/reject',
+            array('reason' => 'fraud'),
+            $this->deletedAccountResponse('acct_ABC')
+        );
+        $rejected = $account->reject(array('reason' => 'fraud'));
+        $this->assertSame($rejected->id, $account->id);
+    }
+
+    public function testSaveLegalEntity()
+    {
+        $response = $this->managedAccountResponse('acct_ABC');
+        $this->mockRequest('POST', '/v1/accounts', array('managed' => 'true'), $response);
+
+        $response['legal_entity']['first_name'] = 'Bob';
+        $this->mockRequest(
+            'POST',
+            '/v1/accounts/acct_ABC',
+            array('legal_entity' => array('first_name' => 'Bob')),
+            $response
+        );
+
+        $account = Account::create(array('managed' => true));
+        $account->legal_entity->first_name = 'Bob';
+        $account->save();
+
+        $this->assertSame('Bob', $account->legal_entity->first_name);
+    }
+
+    public function testUpdateLegalEntity()
+    {
+        $response = $this->managedAccountResponse('acct_ABC');
+        $this->mockRequest('POST', '/v1/accounts', array('managed' => 'true'), $response);
+
+        $response['legal_entity']['first_name'] = 'Bob';
+        $this->mockRequest(
+            'POST',
+            '/v1/accounts/acct_ABC',
+            array('legal_entity' => array('first_name' => 'Bob')),
+            $response
+        );
+
+        $account = Account::create(array('managed' => true));
+        $account = Account::update($account['id'], array(
+          'legal_entity' => array(
+            'first_name' => 'Bob'
+          )
+        ));
+
+        $this->assertSame('Bob', $account->legal_entity->first_name);
+    }
+
+    public function testCreateAdditionalOwners()
+    {
+        $request = array(
+            'managed' => true,
+            'country' => 'GB',
+            'legal_entity' => array(
+                'additional_owners' => array(
+                    0 => array(
+                        'dob' => array(
+                            'day' => 12,
+                            'month' => 5,
+                            'year' => 1970,
+                        ),
+                        'first_name' => 'xgvukvfrde',
+                        'last_name' => 'rtcyvubhy',
+                    ),
+                    1 => array(
+                        'dob' => array(
+                            'day' => 8,
+                            'month' => 4,
+                            'year' => 1979,
+                        ),
+                        'first_name' => 'yutreuk',
+                        'last_name' => 'dfcgvhbjihmv',
+                    ),
+                ),
+            ),
+        );
+
+        $acct = Account::create($request);
+        $response = $acct->__toArray(true);
+
+        $req_ao = $request['legal_entity']['additional_owners'];
+        $resp_ao = $response['legal_entity']['additional_owners'];
+
+        $this->assertSame($req_ao[0]['dob'], $resp_ao[0]['dob']);
+        $this->assertSame($req_ao[1]['dob'], $resp_ao[1]['dob']);
+
+        $this->assertSame($req_ao[0]['first_name'], $resp_ao[0]['first_name']);
+        $this->assertSame($req_ao[1]['first_name'], $resp_ao[1]['first_name']);
+    }
+
+    public function testUpdateAdditionalOwners()
+    {
+        $response = $this->managedAccountResponse('acct_ABC');
+        $this->mockRequest('POST', '/v1/accounts', array('managed' => 'true'), $response);
+
+        $response['legal_entity']['additional_owners'] = array(array(
+            'first_name' => 'Bob',
+            'last_name' => null,
+            'address' => array(
+                'line1' => null,
+                'line2' => null,
+                'city' => null,
+                'state' => null,
+                'postal_code' => null,
+                'country' => null
+            ),
+            'verification' => array(
+                'status' => 'unverified',
+                'document' => null,
+                'details' => null
+            )
+        ));
+
+        $this->mockRequest(
+            'POST',
+            '/v1/accounts/acct_ABC',
+            array('legal_entity' => array('additional_owners' => array(array('first_name' => 'Bob')))),
+            $response
+        );
+
+        $response['legal_entity']['additional_owners'][0]['last_name'] = 'Smith';
+        $this->mockRequest(
+            'POST',
+            '/v1/accounts/acct_ABC',
+            array('legal_entity' => array('additional_owners' => array(array('last_name' => 'Smith')))),
+            $response
+        );
+
+        $response['legal_entity']['additional_owners'][0]['last_name'] = 'Johnson';
+        $this->mockRequest(
+            'POST',
+            '/v1/accounts/acct_ABC',
+            array('legal_entity' => array('additional_owners' => array(array('last_name' => 'Johnson')))),
+            $response
+        );
+
+        $response['legal_entity']['additional_owners'][0]['verification']['document'] = 'file_123';
+        $this->mockRequest(
+            'POST',
+            '/v1/accounts/acct_ABC',
+            array('legal_entity' => array('additional_owners' => array(array('verification' => array('document' => 'file_123'))))),
+            $response
+        );
+
+        $response['legal_entity']['additional_owners'][1] = array(
+            'first_name' => 'Jane',
+            'last_name' => 'Doe'
+        );
+        $this->mockRequest(
+            'POST',
+            '/v1/accounts/acct_ABC',
+            array('legal_entity' => array('additional_owners' => array(1 => array('first_name' => 'Jane')))),
+            $response
+        );
+
+        $account = Account::create(array('managed' => true));
+        $account->legal_entity->additional_owners = array(array('first_name' => 'Bob'));
+        $account->save();
+        $this->assertSame(1, count($account->legal_entity->additional_owners));
+        $this->assertSame('Bob', $account->legal_entity->additional_owners[0]->first_name);
+
+        $account->legal_entity->additional_owners[0]->last_name = 'Smith';
+        $account->save();
+        $this->assertSame(1, count($account->legal_entity->additional_owners));
+        $this->assertSame('Smith', $account->legal_entity->additional_owners[0]->last_name);
+
+        $account['legal_entity']['additional_owners'][0]['last_name'] = 'Johnson';
+        $account->save();
+        $this->assertSame(1, count($account->legal_entity->additional_owners));
+        $this->assertSame('Johnson', $account->legal_entity->additional_owners[0]->last_name);
+
+        $account->legal_entity->additional_owners[0]->verification->document = 'file_123';
+        $account->save();
+        $this->assertSame('file_123', $account->legal_entity->additional_owners[0]->verification->document);
+
+        $account->legal_entity->additional_owners[1] = array('first_name' => 'Jane');
+        $account->save();
+        $this->assertSame('Jane', $account->legal_entity->additional_owners[1]->first_name);
+    }
+}
diff --git a/htdocs/includes/stripe/tests/ApiRequestorTest.php b/htdocs/includes/stripe/tests/ApiRequestorTest.php
new file mode 100644
index 00000000000..859fb63a347
--- /dev/null
+++ b/htdocs/includes/stripe/tests/ApiRequestorTest.php
@@ -0,0 +1,68 @@
+<?php
+
+namespace Stripe;
+
+use Stripe\HttpClient\CurlClient;
+
+class ApiRequestorTest extends TestCase
+{
+    public function testEncodeObjects()
+    {
+        $reflector = new \ReflectionClass('Stripe\\ApiRequestor');
+        $method = $reflector->getMethod('_encodeObjects');
+        $method->setAccessible(true);
+
+        $a = array('customer' => new Customer('abcd'));
+        $enc = $method->invoke(null, $a);
+        $this->assertSame($enc, array('customer' => 'abcd'));
+
+        // Preserves UTF-8
+        $v = array('customer' => "☃");
+        $enc = $method->invoke(null, $v);
+        $this->assertSame($enc, $v);
+
+        // Encodes latin-1 -> UTF-8
+        $v = array('customer' => "\xe9");
+        $enc = $method->invoke(null, $v);
+        $this->assertSame($enc, array('customer' => "\xc3\xa9"));
+    }
+
+    public function testHttpClientInjection()
+    {
+        $reflector = new \ReflectionClass('Stripe\\ApiRequestor');
+        $method = $reflector->getMethod('httpClient');
+        $method->setAccessible(true);
+
+        $curl = new CurlClient();
+        $curl->setTimeout(10);
+        ApiRequestor::setHttpClient($curl);
+
+        $injectedCurl = $method->invoke(new ApiRequestor());
+        $this->assertSame($injectedCurl, $curl);
+    }
+
+    public function testDefaultHeaders()
+    {
+        $reflector = new \ReflectionClass('Stripe\\ApiRequestor');
+        $method = $reflector->getMethod('_defaultHeaders');
+        $method->setAccessible(true);
+
+        // no way to stub static methods with PHPUnit 4.x :(
+        Stripe::setAppInfo('MyTestApp', '1.2.34', 'https://mytestapp.example');
+        $apiKey = 'sk_test_notarealkey';
+
+        $headers = $method->invoke(null, $apiKey);
+
+        $ua = json_decode($headers['X-Stripe-Client-User-Agent']);
+        $this->assertSame($ua->application->name, 'MyTestApp');
+        $this->assertSame($ua->application->version, '1.2.34');
+        $this->assertSame($ua->application->url, 'https://mytestapp.example');
+
+        $this->assertSame(
+            $headers['User-Agent'],
+            'Stripe/v1 PhpBindings/' . Stripe::VERSION . ' MyTestApp/1.2.34 (https://mytestapp.example)'
+        );
+
+        $this->assertSame($headers['Authorization'], 'Bearer ' . $apiKey);
+    }
+}
diff --git a/htdocs/includes/stripe/tests/ApplePayDomainTest.php b/htdocs/includes/stripe/tests/ApplePayDomainTest.php
new file mode 100644
index 00000000000..ebb3e7cfa9d
--- /dev/null
+++ b/htdocs/includes/stripe/tests/ApplePayDomainTest.php
@@ -0,0 +1,72 @@
+<?php
+
+namespace Stripe;
+
+class ApplePayDomainTest extends TestCase
+{
+    public function testCreation()
+    {
+        $this->mockRequest(
+            'POST',
+            '/v1/apple_pay/domains',
+            array('domain_name' => 'test.com'),
+            array(
+                'id' => 'apwc_create',
+                'object' => 'apple_pay_domain'
+            )
+        );
+        $d = ApplePayDomain::create(array(
+            'domain_name' => 'test.com'
+        ));
+        $this->assertSame('apwc_create', $d->id);
+        $this->assertInstanceOf('Stripe\\ApplePayDomain', $d);
+    }
+
+    public function testRetrieve()
+    {
+        $this->mockRequest(
+            'GET',
+            '/v1/apple_pay/domains/apwc_retrieve',
+            array(),
+            array(
+                'id' => 'apwc_retrieve',
+                'object' => 'apple_pay_domain'
+            )
+        );
+        $d = ApplePayDomain::retrieve('apwc_retrieve');
+        $this->assertSame('apwc_retrieve', $d->id);
+        $this->assertInstanceOf('Stripe\\ApplePayDomain', $d);
+    }
+
+    public function testDeletion()
+    {
+        self::authorizeFromEnv();
+        $d = ApplePayDomain::create(array(
+            'domain_name' => 'jackshack.website'
+        ));
+        $this->assertInstanceOf('Stripe\\ApplePayDomain', $d);
+        $this->mockRequest(
+            'DELETE',
+            '/v1/apple_pay/domains/' . $d->id,
+            array(),
+            array('deleted' => true)
+        );
+        $d->delete();
+        $this->assertTrue($d->deleted);
+    }
+
+    public function testList()
+    {
+        $this->mockRequest(
+            'GET',
+            '/v1/apple_pay/domains',
+            array(),
+            array(
+                'url' => '/v1/apple_pay/domains',
+                'object' => 'list'
+            )
+        );
+        $all = ApplePayDomain::all();
+        $this->assertSame($all->url, '/v1/apple_pay/domains');
+    }
+}
diff --git a/htdocs/includes/stripe/tests/ApplicationFeeRefundTest.php b/htdocs/includes/stripe/tests/ApplicationFeeRefundTest.php
new file mode 100644
index 00000000000..b8d266ad1eb
--- /dev/null
+++ b/htdocs/includes/stripe/tests/ApplicationFeeRefundTest.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Stripe;
+
+class ApplicationFeeRefundTest extends TestCase
+{
+    public function testUrls()
+    {
+        $refund = new ApplicationFeeRefund();
+        $refund->id = 'refund_id';
+        $refund->fee = 'fee_id';
+
+        $this->assertSame(
+            $refund->instanceUrl(),
+            '/v1/application_fees/fee_id/refunds/refund_id'
+        );
+    }
+}
diff --git a/htdocs/includes/stripe/tests/ApplicationFeeTest.php b/htdocs/includes/stripe/tests/ApplicationFeeTest.php
new file mode 100644
index 00000000000..fe6df923084
--- /dev/null
+++ b/htdocs/includes/stripe/tests/ApplicationFeeTest.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace Stripe;
+
+class ApplicationFeeTest extends TestCase
+{
+    public function testUrls()
+    {
+        $applicationFee = new ApplicationFee('abcd/efgh');
+        $this->assertSame(
+            $applicationFee->instanceUrl(),
+            '/v1/application_fees/abcd%2Fefgh'
+        );
+    }
+
+    public function testList()
+    {
+        self::authorizeFromEnv();
+        $d = ApplicationFee::all();
+        $this->assertSame($d->url, '/v1/application_fees');
+    }
+}
diff --git a/htdocs/includes/stripe/tests/AuthenticationErrorTest.php b/htdocs/includes/stripe/tests/AuthenticationErrorTest.php
new file mode 100644
index 00000000000..1003d6990c8
--- /dev/null
+++ b/htdocs/includes/stripe/tests/AuthenticationErrorTest.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Stripe;
+
+class AuthenticationErrorTest extends TestCase
+{
+    public function testInvalidCredentials()
+    {
+        Stripe::setApiKey('invalid');
+        try {
+            Customer::create();
+        } catch (Error\Authentication $e) {
+            $this->assertSame(401, $e->getHttpStatus());
+        }
+    }
+}
diff --git a/htdocs/includes/stripe/tests/BalanceTest.php b/htdocs/includes/stripe/tests/BalanceTest.php
new file mode 100644
index 00000000000..3d6a2a668f0
--- /dev/null
+++ b/htdocs/includes/stripe/tests/BalanceTest.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace Stripe;
+
+class BalanceTest extends TestCase
+{
+    public function testRetrieve()
+    {
+        self::authorizeFromEnv();
+        $d = Balance::retrieve();
+        $this->assertSame($d->object, "balance");
+        $this->assertTrue(Util\Util::isList($d->available));
+        $this->assertTrue(Util\Util::isList($d->pending));
+    }
+}
diff --git a/htdocs/includes/stripe/tests/BalanceTransactionTest.php b/htdocs/includes/stripe/tests/BalanceTransactionTest.php
new file mode 100644
index 00000000000..b196a288014
--- /dev/null
+++ b/htdocs/includes/stripe/tests/BalanceTransactionTest.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Stripe;
+
+class BalanceTransactionTest extends TestCase
+{
+    public function testList()
+    {
+        self::authorizeFromEnv();
+        $d = BalanceTransaction::all();
+        $this->assertSame($d->url, '/v1/balance/history');
+    }
+}
diff --git a/htdocs/includes/stripe/tests/BankAccountTest.php b/htdocs/includes/stripe/tests/BankAccountTest.php
new file mode 100644
index 00000000000..285078f00ad
--- /dev/null
+++ b/htdocs/includes/stripe/tests/BankAccountTest.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace Stripe;
+
+class BankAccountTest extends TestCase
+{
+    public function testVerify()
+    {
+        self::authorizeFromEnv();
+
+        $customer = self::createTestCustomer();
+
+        $bankAccount = $customer->sources->create(array(
+            'source' => array(
+                'object' => 'bank_account',
+                'account_holder_type' => 'individual',
+                'account_number' => '000123456789',
+                'account_holder_name' => 'John Doe',
+                'routing_number' => '110000000',
+                'country' => 'US'
+            )
+        ));
+
+        $this->assertSame($bankAccount->status, 'new');
+
+        $bankAccount = $bankAccount->verify(array(
+            'amounts' => array(32, 45)
+        ));
+
+        $this->assertSame($bankAccount->status, 'verified');
+    }
+}
diff --git a/htdocs/includes/stripe/tests/BitcoinReceiverTest.php b/htdocs/includes/stripe/tests/BitcoinReceiverTest.php
new file mode 100644
index 00000000000..fc71cf973a5
--- /dev/null
+++ b/htdocs/includes/stripe/tests/BitcoinReceiverTest.php
@@ -0,0 +1,120 @@
+<?php
+
+namespace Stripe;
+
+class BitcoinReceiverTest extends TestCase
+{
+    public function testUrls()
+    {
+        $classUrl = BitcoinReceiver::classUrl('Stripe_BitcoinReceiver');
+        $this->assertSame($classUrl, '/v1/bitcoin/receivers');
+        $receiver = new BitcoinReceiver('abcd/efgh');
+        $instanceUrl = $receiver->instanceUrl();
+        $this->assertSame($instanceUrl, '/v1/bitcoin/receivers/abcd%2Fefgh');
+    }
+
+    public function testCreate()
+    {
+        self::authorizeFromEnv();
+
+        $receiver = $this->createTestBitcoinReceiver("do+fill_now@stripe.com");
+
+        $this->assertSame(100, $receiver->amount);
+        $this->assertNotNull($receiver->id);
+    }
+
+    public function testRetrieve()
+    {
+        self::authorizeFromEnv();
+
+        $receiver = $this->createTestBitcoinReceiver("do+fill_now@stripe.com");
+
+        $r = BitcoinReceiver::retrieve($receiver->id);
+        $this->assertSame($receiver->id, $r->id);
+
+        $this->assertInstanceOf('Stripe\\BitcoinTransaction', $r->transactions->data[0]);
+    }
+
+    public function testList()
+    {
+        self::authorizeFromEnv();
+
+        $receiver = $this->createTestBitcoinReceiver("do+fill_now@stripe.com");
+
+        $receivers = BitcoinReceiver::all();
+        $this->assertGreaterThan(0, count($receivers->data));
+    }
+
+    public function testListTransactions()
+    {
+        self::authorizeFromEnv();
+
+        $receiver = $this->createTestBitcoinReceiver("do+fill_now@stripe.com");
+        $this->assertSame(0, count($receiver->transactions->data));
+
+        $transactions = $receiver->transactions->all(array("limit" => 1));
+        $this->assertSame(1, count($transactions->data));
+    }
+
+    public function testDeleteWithCustomer()
+    {
+        self::authorizeFromEnv();
+        $receiver = $this->createTestBitcoinReceiver("do+fill_now@stripe.com");
+        $customer = Customer::create(array("source" => $receiver->id));
+        $charge = Charge::create(array(
+            "customer" => $customer->id,
+            "amount" => $receiver->amount,
+            "currency" => $receiver->currency
+        ));
+        $receiver = BitcoinReceiver::retrieve($receiver->id);
+        $response = $receiver->delete();
+        $this->assertTrue($response->deleted);
+    }
+
+    public function testUpdateWithCustomer()
+    {
+        self::authorizeFromEnv();
+        $receiver = $this->createTestBitcoinReceiver("do+fill_now@stripe.com");
+        $customer = Customer::create(array("source" => $receiver->id));
+        $receiver = BitcoinReceiver::retrieve($receiver->id);
+
+        $receiver->description = "a new description";
+        $receiver->save();
+
+        $base = Customer::classUrl();
+        $parentExtn = $receiver['customer'];
+        $extn = $receiver['id'];
+        $this->assertEquals("$base/$parentExtn/sources/$extn", $receiver->instanceUrl());
+
+        $updatedReceiver = BitcoinReceiver::retrieve($receiver->id);
+        $this->assertEquals($receiver["description"], $updatedReceiver["description"]);
+    }
+
+    public function testUpdateWithoutCustomer()
+    {
+        self::authorizeFromEnv();
+        $receiver = $this->createTestBitcoinReceiver("do+fill_now@stripe.com");
+
+        $receiver->description = "a new description";
+        $receiver->save();
+
+        $this->assertEquals(BitcoinReceiver::classUrl() . "/" . $receiver['id'], $receiver->instanceUrl());
+
+        $updatedReceiver = BitcoinReceiver::retrieve($receiver->id);
+        $this->assertEquals($receiver["description"], $updatedReceiver["description"]);
+    }
+
+    public function testRefund()
+    {
+        self::authorizeFromEnv();
+        $receiver = $this->createTestBitcoinReceiver("do+fill_now@stripe.com");
+
+        $receiver = BitcoinReceiver::retrieve($receiver->id);
+        $this->assertNull($receiver->refund_address);
+
+        $refundAddress = "REFUNDHERE";
+        $receiver->refund(array("refund_address" => $refundAddress));
+
+        $this->assertSame($refundAddress, $receiver->refund_address);
+    }
+}
diff --git a/htdocs/includes/stripe/tests/CardErrorTest.php b/htdocs/includes/stripe/tests/CardErrorTest.php
new file mode 100644
index 00000000000..a0de752e512
--- /dev/null
+++ b/htdocs/includes/stripe/tests/CardErrorTest.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace Stripe;
+
+class CardErrorTest extends TestCase
+{
+    public function testDecline()
+    {
+        self::authorizeFromEnv();
+
+        $card = array(
+            'number' => '4000000000000002',
+            'exp_month' => '3',
+            'exp_year' => '2020'
+        );
+
+        $charge = array(
+            'amount' => 100,
+            'currency' => 'usd',
+            'card' => $card
+        );
+
+        try {
+            Charge::create($charge);
+        } catch (Error\Card $e) {
+            $this->assertSame(402, $e->getHttpStatus());
+            $this->assertTrue(strpos($e->getRequestId(), "req_") === 0, $e->getRequestId());
+            $actual = $e->getJsonBody();
+            $this->assertSame(
+                array('error' => array(
+                    'message' => 'Your card was declined.',
+                    'type' => 'card_error',
+                    'code' => 'card_declined',
+                    'decline_code' => 'generic_decline',
+                    'charge' => $actual['error']['charge'],
+                )),
+                $actual
+            );
+        }
+    }
+}
diff --git a/htdocs/includes/stripe/tests/ChargeTest.php b/htdocs/includes/stripe/tests/ChargeTest.php
new file mode 100644
index 00000000000..6ec0fa1f1d4
--- /dev/null
+++ b/htdocs/includes/stripe/tests/ChargeTest.php
@@ -0,0 +1,204 @@
+<?php
+
+namespace Stripe;
+
+class ChargeTest extends TestCase
+{
+    public function testUrls()
+    {
+        $this->assertSame(Charge::classUrl(), '/v1/charges');
+        $charge = new Charge('abcd/efgh');
+        $this->assertSame($charge->instanceUrl(), '/v1/charges/abcd%2Fefgh');
+    }
+
+    public function testCreate()
+    {
+        self::authorizeFromEnv();
+
+        $card = array(
+            'number' => '4242424242424242',
+            'exp_month' => 5,
+            'exp_year' => date('Y') + 1
+        );
+
+        $c = Charge::create(
+            array(
+                'amount' => 100,
+                'currency' => 'usd',
+                'card' => $card
+            )
+        );
+        $this->assertTrue($c->paid);
+        $this->assertFalse($c->refunded);
+    }
+
+    public function testIdempotentCreate()
+    {
+        self::authorizeFromEnv();
+
+        $card = array(
+            'number' => '4242424242424242',
+            'exp_month' => 5,
+            'exp_year' => date('Y') + 1
+        );
+
+        $c = Charge::create(
+            array(
+                'amount' => 100,
+                'currency' => 'usd',
+                'card' => $card
+            ),
+            array(
+                'idempotency_key' => self::generateRandomString(),
+            )
+        );
+
+        $this->assertTrue($c->paid);
+        $this->assertSame(200, $c->getLastResponse()->code);
+    }
+
+    public function testRetrieve()
+    {
+        self::authorizeFromEnv();
+
+        $card = array(
+            'number' => '4242424242424242',
+            'exp_month' => 5,
+            'exp_year' => date('Y') + 1
+        );
+
+        $c = Charge::create(
+            array(
+                'amount' => 100,
+                'currency' => 'usd',
+                'card' => $card
+            )
+        );
+        $d = Charge::retrieve($c->id);
+        $this->assertSame(200, $d->getLastResponse()->code);
+        $this->assertSame($d->id, $c->id);
+    }
+
+    public function testUpdateMetadata()
+    {
+        self::authorizeFromEnv();
+
+        $card = array(
+            'number' => '4242424242424242',
+            'exp_month' => 5,
+            'exp_year' => date('Y') + 1
+        );
+
+        $charge = Charge::create(
+            array(
+                'amount' => 100,
+                'currency' => 'usd',
+                'card' => $card
+            )
+        );
+
+        $charge->metadata['test'] = 'foo bar';
+        $charge->save();
+
+        $updatedCharge = Charge::retrieve($charge->id);
+        $this->assertSame('foo bar', $updatedCharge->metadata['test']);
+    }
+
+    public function testUpdateMetadataAll()
+    {
+        self::authorizeFromEnv();
+
+        $card = array(
+            'number' => '4242424242424242',
+            'exp_month' => 5,
+            'exp_year' => date('Y') + 1
+        );
+
+        $charge = Charge::create(
+            array(
+                'amount' => 100,
+                'currency' => 'usd',
+                'card' => $card
+            )
+        );
+
+        $charge->metadata = array('test' => 'foo bar');
+        $charge->save();
+        $this->assertSame(200, $charge->getLastResponse()->code);
+
+        $updatedCharge = Charge::retrieve($charge->id);
+        $this->assertSame('foo bar', $updatedCharge->metadata['test']);
+    }
+
+    public function testMarkAsFraudulent()
+    {
+        self::authorizeFromEnv();
+
+        $card = array(
+            'number' => '4242424242424242',
+            'exp_month' => 5,
+            'exp_year' => date('Y') + 1
+        );
+
+        $charge = Charge::create(
+            array(
+                'amount' => 100,
+                'currency' => 'usd',
+                'card' => $card
+            )
+        );
+
+        $charge->refunds->create();
+        $charge->markAsFraudulent();
+
+        $updatedCharge = Charge::retrieve($charge->id);
+        $this->assertSame(
+            'fraudulent',
+            $updatedCharge['fraud_details']['user_report']
+        );
+    }
+
+    public function testCreateWithBitcoinReceiverSource()
+    {
+        self::authorizeFromEnv();
+
+        $receiver = $this->createTestBitcoinReceiver("do+fill_now@stripe.com");
+
+        $charge = Charge::create(
+            array(
+                'amount' => 100,
+                'currency' => 'usd',
+                'source' => $receiver->id
+            )
+        );
+
+        $this->assertSame($receiver->id, $charge->source->id);
+        $this->assertSame("bitcoin_receiver", $charge->source->object);
+        $this->assertSame("succeeded", $charge->status);
+        $this->assertInstanceOf('Stripe\\BitcoinReceiver', $charge->source);
+    }
+
+    public function markAsSafe()
+    {
+        self::authorizeFromEnv();
+
+        $card = array(
+            'number' => '4242424242424242',
+            'exp_month' => 5,
+            'exp_year' => date('Y') + 1
+        );
+
+        $charge = Charge::create(
+            array(
+                'amount' => 100,
+                'currency' => 'usd',
+                'card' => $card
+            )
+        );
+
+        $charge->markAsSafe();
+
+        $updatedCharge = Charge::retrieve($charge->id);
+        $this->assertSame('safe', $updatedCharge['fraud_details']['user_report']);
+    }
+}
diff --git a/htdocs/includes/stripe/tests/CollectionTest.php b/htdocs/includes/stripe/tests/CollectionTest.php
new file mode 100644
index 00000000000..f8f923ff00d
--- /dev/null
+++ b/htdocs/includes/stripe/tests/CollectionTest.php
@@ -0,0 +1,105 @@
+<?php
+
+namespace Stripe;
+
+class CollectionTest extends TestCase
+{
+    private function pageableModelResponse($ids, $hasMore)
+    {
+        $data = array();
+        foreach ($ids as $id) {
+            array_push($data, array(
+                'id' => $id,
+                'object' => 'pageablemodel'
+            ));
+        }
+        return array(
+            'object' => 'list',
+            'url' => '/v1/pageablemodels',
+            'data' => $data,
+            'has_more' => $hasMore
+        );
+    }
+
+    public function testAutoPagingOnePage()
+    {
+        $collection = Collection::constructFrom(
+            $this->pageableModelResponse(array('pm_123', 'pm_124'), false),
+            new Util\RequestOptions()
+        );
+
+        $seen = array();
+        foreach ($collection->autoPagingIterator() as $item) {
+            array_push($seen, $item['id']);
+        }
+
+        $this->assertSame($seen, array('pm_123', 'pm_124'));
+    }
+
+    public function testAutoPagingThreePages()
+    {
+        $collection = Collection::constructFrom(
+            $this->pageableModelResponse(array('pm_123', 'pm_124'), true),
+            new Util\RequestOptions()
+        );
+        $collection->setRequestParams(array('foo' => 'bar'));
+
+        $this->mockRequest(
+            'GET',
+            '/v1/pageablemodels',
+            array(
+                  'foo' => 'bar',
+                  'starting_after' => 'pm_124'
+            ),
+            $this->pageableModelResponse(array('pm_125', 'pm_126'), true)
+        );
+        $this->mockRequest(
+            'GET',
+            '/v1/pageablemodels',
+            array(
+                  'foo' => 'bar',
+                  'starting_after' => 'pm_126'
+            ),
+            $this->pageableModelResponse(array('pm_127'), false)
+        );
+
+        $seen = array();
+        foreach ($collection->autoPagingIterator() as $item) {
+            array_push($seen, $item['id']);
+        }
+
+        $this->assertSame($seen, array('pm_123', 'pm_124', 'pm_125', 'pm_126', 'pm_127'));
+    }
+
+    public function testIteratorToArray()
+    {
+        $collection = Collection::constructFrom(
+            $this->pageableModelResponse(array('pm_123', 'pm_124'), true),
+            new Util\RequestOptions()
+        );
+
+        $this->mockRequest(
+            'GET',
+            '/v1/pageablemodels',
+            array(
+                  'starting_after' => 'pm_124'
+            ),
+            $this->pageableModelResponse(array('pm_125', 'pm_126'), true)
+        );
+        $this->mockRequest(
+            'GET',
+            '/v1/pageablemodels',
+            array(
+                  'starting_after' => 'pm_126'
+            ),
+            $this->pageableModelResponse(array('pm_127'), false)
+        );
+
+        $seen = array();
+        foreach (iterator_to_array($collection->autoPagingIterator()) as $item) {
+            array_push($seen, $item['id']);
+        }
+
+        $this->assertSame($seen, array('pm_123', 'pm_124', 'pm_125', 'pm_126', 'pm_127'));
+    }
+}
diff --git a/htdocs/includes/stripe/tests/CountrySpecTest.php b/htdocs/includes/stripe/tests/CountrySpecTest.php
new file mode 100644
index 00000000000..19dc37062e5
--- /dev/null
+++ b/htdocs/includes/stripe/tests/CountrySpecTest.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace Stripe;
+
+class CountrySpecTest extends TestCase
+{
+    public function testRetrieve()
+    {
+        self::authorizeFromEnv();
+
+        $country = "US";
+        $d = CountrySpec::retrieve($country);
+        $this->assertSame($d->object, "country_spec");
+        $this->assertSame($d->id, $country);
+        $this->assertGreaterThan(0, count($d->supported_bank_account_currencies));
+        $this->assertGreaterThan(0, count($d->supported_payment_currencies));
+        $this->assertGreaterThan(0, count($d->supported_payment_methods));
+        $this->assertGreaterThan(0, count($d->verification_fields));
+    }
+
+    public function testList()
+    {
+        self::authorizeFromEnv();
+
+        $d = CountrySpec::all();
+        $this->assertSame($d->object, "list");
+        $this->assertGreaterThan(0, count($d->data));
+        $this->assertSame($d->data[0]->object, "country_spec");
+        $this->assertInstanceOf("Stripe\\CountrySpec", $d->data[0]);
+    }
+}
diff --git a/htdocs/includes/stripe/tests/CouponTest.php b/htdocs/includes/stripe/tests/CouponTest.php
new file mode 100644
index 00000000000..d23163e338e
--- /dev/null
+++ b/htdocs/includes/stripe/tests/CouponTest.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Stripe;
+
+class CouponTest extends TestCase
+{
+    public function testSave()
+    {
+        self::authorizeFromEnv();
+        $id = 'test_coupon-' . self::generateRandomString(20);
+        $c = Coupon::create(
+            array(
+                'percent_off' => 25,
+                'duration' => 'repeating',
+                'duration_in_months' => 5,
+                'id' => $id,
+            )
+        );
+        $this->assertSame($id, $c->id);
+        // @codingStandardsIgnoreStart
+        $this->assertSame(25, $c->percent_off);
+        // @codingStandardsIgnoreEnd
+        $c->metadata['foo'] = 'bar';
+        $c->save();
+
+        $stripeCoupon = Coupon::retrieve($id);
+        $this->assertEquals($c->metadata, $stripeCoupon->metadata);
+    }
+}
diff --git a/htdocs/includes/stripe/tests/CurlClientTest.php b/htdocs/includes/stripe/tests/CurlClientTest.php
new file mode 100644
index 00000000000..864607f088c
--- /dev/null
+++ b/htdocs/includes/stripe/tests/CurlClientTest.php
@@ -0,0 +1,100 @@
+<?php
+
+namespace Stripe;
+
+use Stripe\HttpClient\CurlClient;
+
+class CurlClientTest extends TestCase
+{
+    public function testTimeout()
+    {
+        $curl = new CurlClient();
+        $this->assertSame(CurlClient::DEFAULT_TIMEOUT, $curl->getTimeout());
+        $this->assertSame(CurlClient::DEFAULT_CONNECT_TIMEOUT, $curl->getConnectTimeout());
+
+        // implicitly tests whether we're returning the CurlClient instance
+        $curl = $curl->setConnectTimeout(1)->setTimeout(10);
+        $this->assertSame(1, $curl->getConnectTimeout());
+        $this->assertSame(10, $curl->getTimeout());
+
+        $curl->setTimeout(-1);
+        $curl->setConnectTimeout(-999);
+        $this->assertSame(0, $curl->getTimeout());
+        $this->assertSame(0, $curl->getConnectTimeout());
+    }
+
+    public function testDefaultOptions()
+    {
+        // make sure options array loads/saves properly
+        $optionsArray = array(CURLOPT_PROXY => 'localhost:80');
+        $withOptionsArray = new CurlClient($optionsArray);
+        $this->assertSame($withOptionsArray->getDefaultOptions(), $optionsArray);
+
+        // make sure closure-based options work properly, including argument passing
+        $ref = null;
+        $withClosure = new CurlClient(function ($method, $absUrl, $headers, $params, $hasFile) use (&$ref) {
+            $ref = func_get_args();
+            return array();
+        });
+
+        $withClosure->request('get', 'https://httpbin.org/status/200', array(), array(), false);
+        $this->assertSame($ref, array('get', 'https://httpbin.org/status/200', array(), array(), false));
+
+        // this is the last test case that will run, since it'll throw an exception at the end
+        $withBadClosure = new CurlClient(function () {
+            return 'thisShouldNotWork';
+        });
+        $this->setExpectedException('Stripe\Error\Api', "Non-array value returned by defaultOptions CurlClient callback");
+        $withBadClosure->request('get', 'https://httpbin.org/status/200', array(), array(), false);
+    }
+
+    public function testEncode()
+    {
+        $a = array(
+            'my' => 'value',
+            'that' => array('your' => 'example'),
+            'bar' => 1,
+            'baz' => null
+        );
+
+        $enc = CurlClient::encode($a);
+        $this->assertSame('my=value&that%5Byour%5D=example&bar=1', $enc);
+
+        $a = array('that' => array('your' => 'example', 'foo' => null));
+        $enc = CurlClient::encode($a);
+        $this->assertSame('that%5Byour%5D=example', $enc);
+
+        $a = array('that' => 'example', 'foo' => array('bar', 'baz'));
+        $enc = CurlClient::encode($a);
+        $this->assertSame('that=example&foo%5B%5D=bar&foo%5B%5D=baz', $enc);
+
+        $a = array(
+            'my' => 'value',
+            'that' => array('your' => array('cheese', 'whiz', null)),
+            'bar' => 1,
+            'baz' => null
+        );
+
+        $enc = CurlClient::encode($a);
+        $expected = 'my=value&that%5Byour%5D%5B%5D=cheese'
+              . '&that%5Byour%5D%5B%5D=whiz&bar=1';
+        $this->assertSame($expected, $enc);
+
+        // Ignores an empty array
+        $enc = CurlClient::encode(array('foo' => array(), 'bar' => 'baz'));
+        $expected = 'bar=baz';
+        $this->assertSame($expected, $enc);
+
+        $a = array('foo' => array(array('bar' => 'baz'), array('bar' => 'bin')));
+        $enc = CurlClient::encode($a);
+        $this->assertSame('foo%5B0%5D%5Bbar%5D=baz&foo%5B1%5D%5Bbar%5D=bin', $enc);
+    }
+
+    public function testSslOption()
+    {
+        // make sure options array loads/saves properly
+        $optionsArray = array(CURLOPT_SSLVERSION => CURL_SSLVERSION_TLSv1);
+        $withOptionsArray = new CurlClient($optionsArray);
+        $this->assertSame($withOptionsArray->getDefaultOptions(), $optionsArray);
+    }
+}
diff --git a/htdocs/includes/stripe/tests/CustomerTest.php b/htdocs/includes/stripe/tests/CustomerTest.php
new file mode 100644
index 00000000000..606536ee86f
--- /dev/null
+++ b/htdocs/includes/stripe/tests/CustomerTest.php
@@ -0,0 +1,278 @@
+<?php
+
+namespace Stripe;
+
+class CustomerTest extends TestCase
+{
+    public function testDeletion()
+    {
+        $customer = self::createTestCustomer();
+        $customer->delete();
+
+        $this->assertTrue($customer->deleted);
+        $this->assertNull($customer['active_card']);
+    }
+
+    public function testSave()
+    {
+        $customer = self::createTestCustomer();
+
+        $customer->email = 'gdb@stripe.com';
+        $customer->save();
+        $this->assertSame($customer->email, 'gdb@stripe.com');
+
+        $stripeCustomer = Customer::retrieve($customer->id);
+        $this->assertSame($customer->email, $stripeCustomer->email);
+
+        Stripe::setApiKey(null);
+        $customer = Customer::create(null, self::API_KEY);
+        $customer->email = 'gdb@stripe.com';
+        $customer->save();
+
+        self::authorizeFromEnv();
+        $updatedCustomer = Customer::retrieve($customer->id);
+        $this->assertSame($updatedCustomer->email, 'gdb@stripe.com');
+    }
+
+    /**
+     * @expectedException Stripe\Error\InvalidRequest
+     */
+    public function testBogusAttribute()
+    {
+        $customer = self::createTestCustomer();
+        $customer->bogus = 'bogus';
+        $customer->save();
+    }
+
+    /**
+     * @expectedException InvalidArgumentException
+     */
+    public function testUpdateDescriptionEmpty()
+    {
+        $customer = self::createTestCustomer();
+        $customer->description = '';
+    }
+
+    public function testUpdateDescriptionNull()
+    {
+        $customer = self::createTestCustomer(array('description' => 'foo bar'));
+        $customer->description = null;
+
+        $customer->save();
+
+        $updatedCustomer = Customer::retrieve($customer->id);
+        $this->assertSame(null, $updatedCustomer->description);
+    }
+
+    public function testUpdateMetadata()
+    {
+        $customer = self::createTestCustomer();
+
+        $customer->metadata['test'] = 'foo bar';
+        $customer->save();
+
+        $updatedCustomer = Customer::retrieve($customer->id);
+        $this->assertSame('foo bar', $updatedCustomer->metadata['test']);
+    }
+
+    public function testDeleteMetadata()
+    {
+        $customer = self::createTestCustomer();
+
+        $customer->metadata = null;
+        $customer->save();
+
+        $updatedCustomer = Customer::retrieve($customer->id);
+        $this->assertSame(0, count($updatedCustomer->metadata->keys()));
+    }
+
+    public function testUpdateSomeMetadata()
+    {
+        $customer = self::createTestCustomer();
+        $customer->metadata['shoe size'] = '7';
+        $customer->metadata['shirt size'] = 'XS';
+        $customer->save();
+
+        $customer->metadata['shoe size'] = '9';
+        $customer->save();
+
+        $updatedCustomer = Customer::retrieve($customer->id);
+        $this->assertSame('XS', $updatedCustomer->metadata['shirt size']);
+        $this->assertSame('9', $updatedCustomer->metadata['shoe size']);
+    }
+
+    public function testUpdateAllMetadata()
+    {
+        $customer = self::createTestCustomer();
+        $customer->metadata['shoe size'] = '7';
+        $customer->metadata['shirt size'] = 'XS';
+        $customer->save();
+
+        $customer->metadata = array('shirt size' => 'XL');
+        $customer->save();
+
+        $updatedCustomer = Customer::retrieve($customer->id);
+        $this->assertSame('XL', $updatedCustomer->metadata['shirt size']);
+        $this->assertFalse(isset($updatedCustomer->metadata['shoe size']));
+    }
+
+    /**
+     * @expectedException Stripe\Error\InvalidRequest
+     */
+    public function testUpdateInvalidMetadata()
+    {
+        $customer = self::createTestCustomer();
+        $customer->metadata = 'something';
+        $customer->save();
+    }
+
+    public function testCancelSubscription()
+    {
+        $planID = 'gold-' . self::generateRandomString(20);
+        self::retrieveOrCreatePlan($planID);
+
+        $customer = self::createTestCustomer(
+            array(
+                'plan' => $planID,
+            )
+        );
+
+        $customer->cancelSubscription(array('at_period_end' => true));
+        $this->assertSame($customer->subscription->status, 'active');
+        $this->assertTrue($customer->subscription->cancel_at_period_end);
+        $customer->cancelSubscription();
+        $this->assertSame($customer->subscription->status, 'canceled');
+    }
+
+    public function testCustomerAddCard()
+    {
+        $token = Token::create(
+            array("card" => array(
+                "number" => "4242424242424242",
+                "exp_month" => 5,
+                "exp_year" => date('Y') + 3,
+                "cvc" => "314"
+            ))
+        );
+
+        $customer = $this->createTestCustomer();
+        $createdCard = $customer->sources->create(array("card" => $token->id));
+        $customer->save();
+
+        $updatedCustomer = Customer::retrieve($customer->id);
+        $updatedCards = $updatedCustomer->sources->all();
+        $this->assertSame(count($updatedCards["data"]), 2);
+    }
+
+    public function testCustomerUpdateCard()
+    {
+        $customer = $this->createTestCustomer();
+        $customer->save();
+
+        $sources = $customer->sources->all();
+        $this->assertSame(count($sources["data"]), 1);
+
+        $card = $sources['data'][0];
+        $card->name = "Jane Austen";
+        $card->save();
+
+        $updatedCustomer = Customer::retrieve($customer->id);
+        $updatedCards = $updatedCustomer->sources->all();
+        $this->assertSame($updatedCards["data"][0]->name, "Jane Austen");
+    }
+
+    public function testCustomerDeleteCard()
+    {
+        $token = Token::create(
+            array("card" => array(
+                "number" => "4242424242424242",
+                "exp_month" => 5,
+                "exp_year" => date('Y') + 3,
+                "cvc" => "314"
+            ))
+        );
+
+        $customer = $this->createTestCustomer();
+        $createdCard = $customer->sources->create(array("card" => $token->id));
+        $customer->save();
+
+        $updatedCustomer = Customer::retrieve($customer->id);
+        $updatedCards = $updatedCustomer->sources->all();
+        $this->assertSame(count($updatedCards["data"]), 2);
+
+        $deleteStatus = $updatedCustomer->sources->retrieve($createdCard->id)->delete();
+        $this->assertTrue($deleteStatus->deleted);
+        $updatedCustomer->save();
+
+        $postDeleteCustomer = Customer::retrieve($customer->id);
+        $postDeleteCards = $postDeleteCustomer->sources->all();
+        $this->assertSame(count($postDeleteCards["data"]), 1);
+    }
+
+    public function testCustomerAddSource()
+    {
+        self::authorizeFromEnv();
+        $token = Token::create(
+            array("card" => array(
+                "number" => "4242424242424242",
+                "exp_month" => 5,
+                "exp_year" => date('Y') + 3,
+                "cvc" => "314"
+            ))
+        );
+
+        $customer = $this->createTestCustomer();
+        $createdSource = $customer->sources->create(array("source" => $token->id));
+        $customer->save();
+
+        $updatedCustomer = Customer::retrieve($customer->id);
+        $updatedSources = $updatedCustomer->sources->all();
+        $this->assertSame(count($updatedSources["data"]), 2);
+    }
+
+    public function testCustomerUpdateSource()
+    {
+        $customer = $this->createTestCustomer();
+        $customer->save();
+
+        $sources = $customer->sources->all();
+        $this->assertSame(count($sources["data"]), 1);
+
+        $source = $sources['data'][0];
+        $source->name = "Jane Austen";
+        $source->save();
+
+        $updatedCustomer = Customer::retrieve($customer->id);
+        $updatedSources = $updatedCustomer->sources->all();
+        $this->assertSame($updatedSources["data"][0]->name, "Jane Austen");
+    }
+
+    public function testCustomerDeleteSource()
+    {
+        self::authorizeFromEnv();
+        $token = Token::create(
+            array("card" => array(
+                "number" => "4242424242424242",
+                "exp_month" => 5,
+                "exp_year" => date('Y') + 3,
+                "cvc" => "314"
+            ))
+        );
+
+        $customer = $this->createTestCustomer();
+        $createdSource = $customer->sources->create(array("source" => $token->id));
+        $customer->save();
+
+        $updatedCustomer = Customer::retrieve($customer->id);
+        $updatedSources = $updatedCustomer->sources->all();
+        $this->assertSame(count($updatedSources["data"]), 2);
+
+        $deleteStatus = $updatedCustomer->sources->retrieve($createdSource->id)->delete();
+        $this->assertTrue($deleteStatus->deleted);
+        $updatedCustomer->save();
+
+        $postDeleteCustomer = Customer::retrieve($customer->id);
+        $postDeleteSources = $postDeleteCustomer->sources->all();
+        $this->assertSame(count($postDeleteSources["data"]), 1);
+    }
+}
diff --git a/htdocs/includes/stripe/tests/DiscountTest.php b/htdocs/includes/stripe/tests/DiscountTest.php
new file mode 100644
index 00000000000..1e77029ad2d
--- /dev/null
+++ b/htdocs/includes/stripe/tests/DiscountTest.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace Stripe;
+
+class DiscountTest extends TestCase
+{
+    public function testDeletion()
+    {
+        self::authorizeFromEnv();
+        $id = 'test-coupon-' . self::generateRandomString(20);
+        $coupon = Coupon::create(
+            array(
+                'percent_off' => 25,
+                'duration' => 'repeating',
+                'duration_in_months' => 5,
+                'id' => $id,
+            )
+        );
+        $customer = self::createTestCustomer(array('coupon' => $id));
+
+        $this->assertTrue(isset($customer->discount));
+        $this->assertTrue(isset($customer->discount->coupon));
+        $this->assertSame($id, $customer->discount->coupon->id);
+
+        $customer->deleteDiscount();
+        $this->assertFalse(isset($customer->discount));
+
+        $customer = Customer::retrieve($customer->id);
+        $this->assertFalse(isset($customer->discount));
+    }
+}
diff --git a/htdocs/includes/stripe/tests/DisputeTest.php b/htdocs/includes/stripe/tests/DisputeTest.php
new file mode 100644
index 00000000000..3c4f29678ea
--- /dev/null
+++ b/htdocs/includes/stripe/tests/DisputeTest.php
@@ -0,0 +1,96 @@
+<?php
+
+namespace Stripe;
+
+class DisputeTest extends TestCase
+{
+    public function testUrls()
+    {
+        $this->assertSame(Dispute::classUrl(), '/v1/disputes');
+        $dispute = new Dispute('dp_123');
+        $this->assertSame($dispute->instanceUrl(), '/v1/disputes/dp_123');
+    }
+
+    private function createDisputedCharge()
+    {
+        $card = array(
+            'number' => '4000000000000259',
+            'exp_month' => 5,
+            'exp_year' => date('Y') + 1
+        );
+
+        $c = Charge::create(
+            array(
+                'amount' => 100,
+                'currency' => 'usd',
+                'card' => $card
+            )
+        );
+        $c = Charge::retrieve($c->id);
+
+        $attempts = 0;
+
+        while ($c->dispute === null) {
+            if ($attempts > 5) {
+                throw new \Exception("Charge is taking too long to be disputed");
+            }
+            sleep(1);
+            $c = Charge::retrieve($c->id);
+            $attempts += 1;
+        }
+
+        return $c;
+    }
+
+    public function testAll()
+    {
+        self::authorizeFromEnv();
+
+        $sublist = Dispute::all(
+            array(
+                'limit' => 3,
+            )
+        );
+        $this->assertSame(3, count($sublist->data));
+    }
+
+
+    public function testUpdate()
+    {
+        self::authorizeFromEnv();
+
+        $c = $this->createDisputedCharge();
+
+        $d = Dispute::retrieve($c->dispute);
+        $d->evidence["customer_name"] = "Bob";
+        $s = $d->save();
+
+        $this->assertSame($c->dispute, $s->id);
+        $this->assertSame("Bob", $s->evidence["customer_name"]);
+    }
+
+    public function testClose()
+    {
+        self::authorizeFromEnv();
+
+        $c = $this->createDisputedCharge();
+        $d = Dispute::retrieve($c->dispute);
+
+        $this->assertNotSame("lost", $d->status);
+
+        $d->close();
+
+        $this->assertSame("lost", $d->status);
+    }
+
+    public function testRetrieve()
+    {
+        self::authorizeFromEnv();
+
+        $c = $this->createDisputedCharge();
+
+        $d = Dispute::retrieve($c->dispute);
+
+        $this->assertSame($c->dispute, $d->id);
+    }
+}
diff --git a/htdocs/includes/stripe/tests/ErrorTest.php b/htdocs/includes/stripe/tests/ErrorTest.php
new file mode 100644
index 00000000000..75362427510
--- /dev/null
+++ b/htdocs/includes/stripe/tests/ErrorTest.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace Stripe;
+
+class ErrorTest extends TestCase
+{
+    public function testCreation()
+    {
+        try {
+            throw new Error\Api(
+                "hello",
+                500,
+                "{'foo':'bar'}",
+                array('foo' => 'bar')
+            );
+            $this->fail("Did not raise error");
+        } catch (Error\Api $e) {
+            $this->assertSame("hello", $e->getMessage());
+            $this->assertSame(500, $e->getHttpStatus());
+            $this->assertSame("{'foo':'bar'}", $e->getHttpBody());
+            $this->assertSame(array('foo' => 'bar'), $e->getJsonBody());
+            $this->assertSame(null, $e->getHttpHeaders());
+            $this->assertSame(null, $e->getRequestId());
+        }
+    }
+
+    public function testResponseHeaders()
+    {
+        try {
+            throw new Error\Api(
+                "hello",
+                500,
+                "{'foo':'bar'}",
+                array('foo' => 'bar'),
+                array('Request-Id' => 'req_bar')
+            );
+            $this->fail("Did not raise error");
+        } catch (Error\Api $e) {
+            $this->assertSame(array('Request-Id' => 'req_bar'), $e->getHttpHeaders());
+            $this->assertSame('req_bar', $e->getRequestId());
+        }
+    }
+
+    public function testCode()
+    {
+        try {
+            throw new Error\Card(
+                "hello",
+                "some_param",
+                "some_code",
+                400,
+                "{'foo':'bar'}",
+                array('foo' => 'bar')
+            );
+            $this->fail("Did not raise error");
+        } catch (Error\Card $e) {
+            $this->assertSame("some_param", $e->getStripeParam());
+            $this->assertSame('some_code', $e->getStripeCode());
+        }
+    }
+}
diff --git a/htdocs/includes/stripe/tests/ExternalAccountTest.php b/htdocs/includes/stripe/tests/ExternalAccountTest.php
new file mode 100644
index 00000000000..70c0068bc45
--- /dev/null
+++ b/htdocs/includes/stripe/tests/ExternalAccountTest.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace Stripe;
+
+class ExternalAccountTest extends TestCase
+{
+    public function testVerify()
+    {
+        self::authorizeFromEnv();
+        $bankAccountToken = Token::create(
+            array(
+                'bank_account' => array(
+                'country' => 'US',
+                'routing_number' => '110000000',
+                'account_number' => '000123456789',
+                'account_holder_name' => 'Jane Austen',
+                'account_holder_type' => 'company'
+                )
+            )
+        );
+        $customer = Customer::create();
+        $externalAccount = $customer->sources->create(array('bank_account' => $bankAccountToken->id));
+        $verifiedAccount = $externalAccount->verify(array('amounts' => array(32, 45)), null);
+
+        $base = Customer::classUrl();
+        $parentExtn = $externalAccount['customer'];
+        $extn = $externalAccount['id'];
+        $this->assertEquals("$base/$parentExtn/sources/$extn", $externalAccount->instanceUrl());
+    }
+}
diff --git a/htdocs/includes/stripe/tests/FileUploadTest.php b/htdocs/includes/stripe/tests/FileUploadTest.php
new file mode 100644
index 00000000000..7d1faf3b00f
--- /dev/null
+++ b/htdocs/includes/stripe/tests/FileUploadTest.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace Stripe;
+
+class FileUploadTest extends TestCase
+{
+    public function testCreateFile()
+    {
+        $fp = fopen(dirname(__FILE__).'/../data/test.png', 'r');
+        self::authorizeFromEnv();
+        $file = FileUpload::create(
+            array(
+                'purpose' => 'dispute_evidence',
+                'file' => $fp,
+            )
+        );
+        fclose($fp);
+        $this->assertSame(95, $file->size);
+        $this->assertSame('png', $file->type);
+    }
+
+    public function testCreateAndRetrieveCurlFile()
+    {
+        if (!class_exists('\CurlFile', false)) {
+            // Older PHP versions don't support this
+            return;
+        }
+
+        $curlFile = new \CurlFile(dirname(__FILE__).'/../data/test.png');
+        self::authorizeFromEnv();
+        $file = FileUpload::create(
+            array(
+                'purpose' => 'dispute_evidence',
+                'file' => $curlFile,
+            )
+        );
+        $this->assertSame(95, $file->size);
+        $this->assertSame('png', $file->type);
+
+        // Just check that we don't get exceptions
+        $file = FileUpload::retrieve($file->id);
+        $file->refresh();
+    }
+}
diff --git a/htdocs/includes/stripe/tests/InvalidRequestErrorTest.php b/htdocs/includes/stripe/tests/InvalidRequestErrorTest.php
new file mode 100644
index 00000000000..6cc6d682911
--- /dev/null
+++ b/htdocs/includes/stripe/tests/InvalidRequestErrorTest.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace Stripe;
+
+class InvalidRequestErrorTest extends TestCase
+{
+    public function testInvalidObject()
+    {
+        self::authorizeFromEnv();
+        try {
+            Customer::retrieve('invalid');
+        } catch (Error\InvalidRequest $e) {
+            $this->assertSame(404, $e->getHttpStatus());
+        }
+    }
+
+    public function testBadData()
+    {
+        self::authorizeFromEnv();
+        try {
+            Charge::create();
+        } catch (Error\InvalidRequest $e) {
+            $this->assertSame(400, $e->getHttpStatus());
+        }
+    }
+}
diff --git a/htdocs/includes/stripe/tests/InvoiceTest.php b/htdocs/includes/stripe/tests/InvoiceTest.php
new file mode 100644
index 00000000000..a55ab83e4ac
--- /dev/null
+++ b/htdocs/includes/stripe/tests/InvoiceTest.php
@@ -0,0 +1,56 @@
+<?php
+
+namespace Stripe;
+
+class InvoiceTest extends TestCase
+{
+    public function testUpcoming()
+    {
+        self::authorizeFromEnv();
+        $customer = self::createTestCustomer();
+
+        InvoiceItem::create(array(
+            'customer'  => $customer->id,
+            'amount'    => 0,
+            'currency'  => 'usd',
+        ));
+
+        $invoice = Invoice::upcoming(array(
+            'customer' => $customer->id,
+        ));
+        $this->assertSame($invoice->customer, $customer->id);
+        $this->assertSame($invoice->attempted, false);
+    }
+
+    public function testItemsAccessWithParameter()
+    {
+        self::authorizeFromEnv();
+        $customer = self::createTestCustomer();
+
+        InvoiceItem::create(array(
+            'customer'  => $customer->id,
+            'amount'    => 100,
+            'currency'  => 'usd',
+        ));
+
+        $invoice = Invoice::upcoming(
+            array(
+            'customer' => $customer->id,
+            )
+        );
+
+        $lines = $invoice->lines->all(array('limit' => 10));
+
+        $this->assertSame(count($lines->data), 1);
+        $this->assertSame($lines->data[0]->amount, 100);
+    }
+
+    // This is really just making sure that this operation does not trigger any
+    // warnings, as it's highly nested.
+    public function testAll()
+    {
+        self::authorizeFromEnv();
+        $invoices = Invoice::all();
+        $this->assertGreaterThan(0, count($invoices));
+    }
+}
diff --git a/htdocs/includes/stripe/tests/PayoutTest.php b/htdocs/includes/stripe/tests/PayoutTest.php
new file mode 100644
index 00000000000..5e99faede87
--- /dev/null
+++ b/htdocs/includes/stripe/tests/PayoutTest.php
@@ -0,0 +1,94 @@
+<?php
+
+namespace Stripe;
+
+class PayoutTest extends TestCase
+{
+    private $managedAccount = null;
+
+    /**
+     * Create a managed account and put enough funds in the balance
+     * to be able to create a payout afterwards. Also try to re-use
+     * the managed account across the tests to avoid hitting the
+     * rate limit for account creation.
+     */
+    private function createAccountWithBalance()
+    {
+        if ($this->managedAccount === null) {
+            self::authorizeFromEnv();
+            $account = self::createTestManagedAccount();
+
+            $charge = \Stripe\Charge::create(array(
+                'currency' => 'usd',
+                'amount' => '10000',
+                'source' => array(
+                    'object' => 'card',
+                    'number' => '4000000000000077',
+                    'exp_month' => '09',
+                    'exp_year' => date('Y') + 3,
+                ),
+                'destination' => array(
+                    'account' => $account->id
+                )
+            ));
+
+            $this->managedAccount = $account;
+        }
+
+        return $this->managedAccount;
+    }
+
+    private function createPayoutFromManagedAccount($accountId)
+    {
+        $payout = Payout::create(
+            array(
+                'amount' => 100,
+                'currency' => 'usd',
+            ),
+            array(
+                'stripe_account' => $accountId
+            )
+        );
+
+        return $payout;
+    }
+
+    public function testCreate()
+    {
+        $account = self::createAccountWithBalance();
+        $payout =  self::createPayoutFromManagedAccount($account->id);
+
+        $this->assertSame('pending', $payout->status);
+    }
+
+    public function testRetrieve()
+    {
+        $account = self::createAccountWithBalance();
+        $payout =  self::createPayoutFromManagedAccount($account->id);
+        $reloaded = Payout::retrieve($payout->id, array('stripe_account' => $account->id));
+        $this->assertSame($reloaded->id, $payout->id);
+    }
+
+    public function testPayoutUpdateMetadata()
+    {
+        $account = self::createAccountWithBalance();
+        $payout =  self::createPayoutFromManagedAccount($account->id);
+        $payout->metadata['test'] = 'foo bar';
+        $payout->save();
+
+        $updatedPayout = Payout::retrieve($payout->id, array('stripe_account' => $account->id));
+        $this->assertSame('foo bar', $updatedPayout->metadata['test']);
+    }
+
+    public function testPayoutUpdateMetadataAll()
+    {
+        $account = self::createAccountWithBalance();
+        $payout =  self::createPayoutFromManagedAccount($account->id);
+
+        $payout->metadata = array('test' => 'foo bar');
+        $payout->save();
+
+        $updatedPayout = Payout::retrieve($payout->id, array('stripe_account' => $account->id));
+        $this->assertSame('foo bar', $updatedPayout->metadata['test']);
+    }
+}
diff --git a/htdocs/includes/stripe/tests/PermissionsErrorTest.php b/htdocs/includes/stripe/tests/PermissionsErrorTest.php
new file mode 100644
index 00000000000..cc8a5cd0be0
--- /dev/null
+++ b/htdocs/includes/stripe/tests/PermissionsErrorTest.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace Stripe;
+
+class PermissionErrorTest extends TestCase
+{
+    private function permissionErrorResponse()
+    {
+        return array(
+            'error' => array(),
+        );
+    }
+
+    /**
+     * @expectedException Stripe\Error\Permission
+     */
+    public function testPermission()
+    {
+        $this->mockRequest('GET', '/v1/accounts/acct_DEF', array(), $this->permissionErrorResponse(), 403);
+        Account::retrieve('acct_DEF');
+    }
+}
diff --git a/htdocs/includes/stripe/tests/PlanTest.php b/htdocs/includes/stripe/tests/PlanTest.php
new file mode 100644
index 00000000000..9aa3589c719
--- /dev/null
+++ b/htdocs/includes/stripe/tests/PlanTest.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace Stripe;
+
+class PlanTest extends TestCase
+{
+    public function testDeletion()
+    {
+        self::authorizeFromEnv();
+        $p = Plan::create(array(
+            'amount' => 2000,
+            'interval' => 'month',
+            'currency' => 'usd',
+            'name' => 'Plan',
+            'id' => 'gold-' . self::generateRandomString(20)
+        ));
+        $p->delete();
+        $this->assertTrue($p->deleted);
+    }
+
+    public function testFalseyId()
+    {
+        try {
+            $retrievedPlan = Plan::retrieve('0');
+        } catch (Error\InvalidRequest $e) {
+            // Can either succeed or 404, all other errors are bad
+            if ($e->httpStatus !== 404) {
+                $this->fail();
+            }
+        }
+    }
+
+    public function testSave()
+    {
+        self::authorizeFromEnv();
+        $planID = 'gold-' . self::generateRandomString(20);
+        $p = Plan::create(array(
+            'amount'   => 2000,
+            'interval' => 'month',
+            'currency' => 'usd',
+            'name'     => 'Plan',
+            'id'       => $planID
+        ));
+        $p->name = 'A new plan name';
+        $p->save();
+        $this->assertSame($p->name, 'A new plan name');
+
+        $stripePlan = Plan::retrieve($planID);
+        $this->assertSame($p->name, $stripePlan->name);
+    }
+}
diff --git a/htdocs/includes/stripe/tests/ProductTest.php b/htdocs/includes/stripe/tests/ProductTest.php
new file mode 100644
index 00000000000..668d015e380
--- /dev/null
+++ b/htdocs/includes/stripe/tests/ProductTest.php
@@ -0,0 +1,158 @@
+<?php
+
+namespace Stripe;
+
+class ProductSKUOrderTest extends TestCase
+{
+    public function testProductFalseyId()
+    {
+        try {
+            Stripe::setApiKey('sk_test_JieJALRz7rPz7boV17oMma7a');
+            $retrievedProduct = Product::retrieve('0');
+        } catch (Error\InvalidRequest $e) {
+            // Can either succeed or 404, all other errors are bad
+            if ($e->httpStatus !== 404) {
+                $this->fail();
+            }
+        }
+    }
+
+    public function testProductCreateUpdateRead()
+    {
+
+        Stripe::setApiKey('sk_test_JieJALRz7rPz7boV17oMma7a');
+        $ProductID = 'gold-' . self::generateRandomString(20);
+        $p = Product::create(array(
+            'name'     => 'Gold Product',
+            'id'       => $ProductID,
+            'url'      => 'www.stripe.com/gold'
+        ));
+        $this->assertSame($p->url, 'www.stripe.com/gold');
+
+        $p->name = 'A new Product name';
+        $p->save();
+        $this->assertSame($p->name, 'A new Product name');
+        $this->assertSame($p->url, 'www.stripe.com/gold');
+
+        $stripeProduct = Product::retrieve($ProductID);
+        $this->assertSame($p->name, $stripeProduct->name);
+        $this->assertSame($stripeProduct->url, 'www.stripe.com/gold');
+    }
+
+    public function testSKUCreateUpdateRead()
+    {
+        Stripe::setApiKey('sk_test_JieJALRz7rPz7boV17oMma7a');
+        $ProductID = 'silver-' . self::generateRandomString(20);
+        $p = Product::create(array(
+            'name'     => 'Silver Product',
+            'id'       => $ProductID,
+            'url'      => 'www.stripe.com/silver'
+        ));
+
+        $SkuID = 'silver-sku-' . self::generateRandomString(20);
+        $sku = SKU::create(array(
+            'price'     => 500,
+            'currency'  => 'usd',
+            'id'        => $SkuID,
+            'inventory' => array(
+                'type'     => 'finite',
+                'quantity' => 40
+            ),
+            'product'   => $ProductID
+        ));
+
+        $sku->price = 600;
+        $sku->inventory->quantity = 50;
+        $sku->save();
+        $this->assertSame($sku->price, 600);
+        $this->assertSame(50, $sku->inventory->quantity);
+
+        $stripeSku = SKU::retrieve($SkuID);
+        $this->assertSame($sku->price, 600);
+        $this->assertSame('finite', $sku->inventory->type);
+        $this->assertSame(50, $sku->inventory->quantity);
+    }
+
+    public function testSKUProductDelete()
+    {
+        Stripe::setApiKey('sk_test_JieJALRz7rPz7boV17oMma7a');
+        $ProductID = 'silver-' . self::generateRandomString(20);
+        $p = Product::create(array(
+            'name'     => 'Silver Product',
+            'id'       => $ProductID,
+            'url'      => 'stripe.com/silver'
+        ));
+
+        $SkuID = 'silver-sku-' . self::generateRandomString(20);
+        $sku = SKU::create(array(
+            'price'     => 500,
+            'currency'  => 'usd',
+            'id'        => $SkuID,
+            'inventory' => array(
+                'type'     => 'finite',
+                'quantity' => 40
+            ),
+            'product'   => $ProductID
+        ));
+
+        $deletedSku = $sku->delete();
+        $this->assertTrue($deletedSku->deleted);
+
+        $deletedProduct = $p->delete();
+        $this->assertTrue($deletedProduct->deleted);
+    }
+
+    public function testOrderCreateUpdateRetrievePayReturn()
+    {
+        Stripe::setApiKey('sk_test_JieJALRz7rPz7boV17oMma7a');
+        $ProductID = 'silver-' . self::generateRandomString(20);
+        $p = Product::create(array(
+            'name'      => 'Silver Product',
+            'id'        => $ProductID,
+            'url'       => 'www.stripe.com/silver',
+            'shippable' => false,
+        ));
+
+        $SkuID = 'silver-sku-' . self::generateRandomString(20);
+        $sku = SKU::create(array(
+            'price'     => 500,
+            'currency'  => 'usd',
+            'id'        => $SkuID,
+            'inventory' => array(
+                'type'     => 'finite',
+                'quantity' => 40
+            ),
+            'product'   => $ProductID
+        ));
+
+        $order = Order::create(array(
+            'items' => array(
+                0 => array(
+                    'type' => 'sku',
+                    'parent' => $SkuID,
+                ),
+            ),
+            'currency' => 'usd',
+            'email' => 'foo@bar.com',
+        ));
+
+        $order->metadata->foo = "bar";
+        $order->save();
+
+        $stripeOrder = Order::retrieve($order->id);
+        $this->assertSame($order->metadata->foo, "bar");
+
+        $order->pay(array(
+            'source' => array(
+                'object' => 'card',
+                'number' => '4242424242424242',
+                'exp_month' => '05',
+                'exp_year' => '2017'
+            ),
+        ));
+        $this->assertSame($order->status, 'paid');
+
+        $orderReturn = $order->returnOrder();
+        $this->assertSame($orderReturn->order, $order->id);
+    }
+}
diff --git a/htdocs/includes/stripe/tests/RateLimitErrorTest.php b/htdocs/includes/stripe/tests/RateLimitErrorTest.php
new file mode 100644
index 00000000000..2d6a6b22a2b
--- /dev/null
+++ b/htdocs/includes/stripe/tests/RateLimitErrorTest.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace Stripe;
+
+class RateLimitErrorTest extends TestCase
+{
+    private function rateLimitErrorResponse()
+    {
+        return array(
+            'error' => array(),
+        );
+    }
+
+    /**
+     * @expectedException Stripe\Error\RateLimit
+     */
+    public function testRateLimit()
+    {
+        $this->mockRequest('GET', '/v1/accounts/acct_DEF', array(), $this->rateLimitErrorResponse(), 429);
+        Account::retrieve('acct_DEF');
+    }
+}
diff --git a/htdocs/includes/stripe/tests/RecipientTest.php b/htdocs/includes/stripe/tests/RecipientTest.php
new file mode 100644
index 00000000000..e26bfe8cddd
--- /dev/null
+++ b/htdocs/includes/stripe/tests/RecipientTest.php
@@ -0,0 +1,112 @@
+<?php
+
+namespace Stripe;
+
+class RecipientTest extends TestCase
+{
+    public function testDeletion()
+    {
+        $recipient = self::createTestRecipient();
+        $recipient->delete();
+
+        $this->assertTrue($recipient->deleted);
+    }
+
+    public function testSave()
+    {
+        $recipient = self::createTestRecipient();
+
+        $recipient->email = 'gdb@stripe.com';
+        $recipient->save();
+        $this->assertSame($recipient->email, 'gdb@stripe.com');
+
+        $stripeRecipient = Recipient::retrieve($recipient->id);
+        $this->assertSame($recipient->email, $stripeRecipient->email);
+    }
+
+    /**
+     * @expectedException Stripe\Error\InvalidRequest
+     */
+    public function testBogusAttribute()
+    {
+        $recipient = self::createTestRecipient();
+        $recipient->bogus = 'bogus';
+        $recipient->save();
+    }
+
+    public function testRecipientAddCard()
+    {
+        $token = Token::create(
+            array("card" => array(
+                "number" => "4000056655665556",
+                "exp_month" => 5,
+                "exp_year" => date('Y') + 3,
+                "cvc" => "314"
+            ))
+        );
+
+        $recipient = $this->createTestRecipient();
+        $createdCard = $recipient->cards->create(array("card" => $token->id));
+        $recipient->save();
+
+        $updatedRecipient = Recipient::retrieve($recipient->id);
+        $updatedCards = $updatedRecipient->cards->all();
+        $this->assertSame(count($updatedCards["data"]), 1);
+    }
+
+    public function testRecipientUpdateCard()
+    {
+        $token = Token::create(
+            array("card" => array(
+                "number" => "4000056655665556",
+                "exp_month" => 5,
+                "exp_year" => date('Y') + 3,
+                "cvc" => "314"
+            ))
+        );
+
+        $recipient = $this->createTestRecipient();
+        $createdCard = $recipient->cards->create(array("card" => $token->id));
+        $recipient->save();
+
+        $createdCards = $recipient->cards->all();
+        $this->assertSame(count($createdCards["data"]), 1);
+
+        $card = $createdCards['data'][0];
+        $card->name = "Jane Austen";
+        $card->save();
+
+        $updatedRecipient = Recipient::retrieve($recipient->id);
+        $updatedCards = $updatedRecipient->cards->all();
+        $this->assertSame($updatedCards["data"][0]->name, "Jane Austen");
+    }
+
+    public function testRecipientDeleteCard()
+    {
+        $token = Token::create(
+            array("card" => array(
+                "number" => "4000056655665556",
+                "exp_month" => 5,
+                "exp_year" => date('Y') + 3,
+                "cvc" => "314"
+            ))
+        );
+
+        $recipient = $this->createTestRecipient();
+        $createdCard = $recipient->cards->create(array("card" => $token->id));
+        $recipient->save();
+
+        $updatedRecipient = Recipient::retrieve($recipient->id);
+        $updatedCards = $updatedRecipient->cards->all();
+        $this->assertSame(count($updatedCards["data"]), 1);
+
+        $deleteStatus =
+        $updatedRecipient->cards->retrieve($createdCard->id)->delete();
+        $this->assertTrue($deleteStatus->deleted);
+        $updatedRecipient->save();
+
+        $postDeleteRecipient = Recipient::retrieve($recipient->id);
+        $postDeleteCards = $postDeleteRecipient->cards->all();
+        $this->assertSame(count($postDeleteCards["data"]), 0);
+    }
+}
diff --git a/htdocs/includes/stripe/tests/RefundTest.php b/htdocs/includes/stripe/tests/RefundTest.php
new file mode 100644
index 00000000000..e9dd8509cd3
--- /dev/null
+++ b/htdocs/includes/stripe/tests/RefundTest.php
@@ -0,0 +1,131 @@
+<?php
+
+namespace Stripe;
+
+class RefundTest extends TestCase
+{
+
+    public function testCreate()
+    {
+        $charge = self::createTestCharge();
+        $refund = Refund::create(array('amount' => 100, 'charge' => $charge->id));
+        $this->assertSame(100, $refund->amount);
+        $this->assertSame($charge->id, $refund->charge);
+    }
+
+    public function testUpdateAndRetrieve()
+    {
+        $charge = self::createTestCharge();
+        $ref = Refund::create(array('amount' => 100, 'charge' => $charge->id));
+        $ref->metadata["key"] = "value";
+        $ref->save();
+        $ref = Refund::retrieve($ref->id);
+        $this->assertSame("value", $ref->metadata["key"], "value");
+    }
+
+    public function testListForCharge()
+    {
+        $charge = self::createTestCharge();
+        $refA = Refund::create(array('amount' => 100, 'charge' => $charge->id));
+        $refB = Refund::create(array('amount' => 50, 'charge' => $charge->id));
+
+        $all = Refund::all(array('charge' => $charge));
+        $this->assertSame(false, $all['has_more']);
+        $this->assertSame(2, count($all->data));
+        $this->assertSame($refB->id, $all->data[0]->id);
+        $this->assertSame($refA->id, $all->data[1]->id);
+    }
+
+    public function testList()
+    {
+        $all = Refund::all();
+
+        // Fetches all refunds on this test account.
+        $this->assertSame(true, $all['has_more']);
+        $this->assertSame(10, count($all->data));
+    }
+
+    public function testCreateForBitcoin()
+    {
+        self::authorizeFromEnv();
+
+        $receiver = $this->createTestBitcoinReceiver("do+fill_now@stripe.com");
+
+        $charge = Charge::create(
+            array(
+                'amount' => $receiver->amount,
+                'currency' => $receiver->currency,
+                'description' => $receiver->description,
+                'source' => $receiver->id
+            )
+        );
+
+        $ref = Refund::create(
+            array(
+                'amount' => $receiver->amount,
+                'refund_address' => 'ABCDEF',
+                'charge' => $charge->id
+            )
+        );
+        $this->assertSame($receiver->amount, $ref->amount);
+        $this->assertNotNull($ref->id);
+    }
+
+    // Deprecated charge endpoints:
+
+    public function testCreateViaCharge()
+    {
+        $charge = self::createTestCharge();
+        $ref = $charge->refunds->create(array('amount' => 100));
+        $this->assertSame(100, $ref->amount);
+        $this->assertSame($charge->id, $ref->charge);
+    }
+
+    public function testUpdateAndRetrieveViaCharge()
+    {
+        $charge = self::createTestCharge();
+        $ref = $charge->refunds->create(array('amount' => 100));
+        $ref->metadata["key"] = "value";
+        $ref->save();
+        $ref = $charge->refunds->retrieve($ref->id);
+        $this->assertSame("value", $ref->metadata["key"], "value");
+    }
+
+    public function testListViaCharge()
+    {
+        $charge = self::createTestCharge();
+        $refA = $charge->refunds->create(array('amount' => 50));
+        $refB = $charge->refunds->create(array('amount' => 50));
+
+        $all = $charge->refunds->all();
+        $this->assertSame(false, $all['has_more']);
+        $this->assertSame(2, count($all->data));
+        $this->assertSame($refB->id, $all->data[0]->id);
+        $this->assertSame($refA->id, $all->data[1]->id);
+    }
+
+    public function testCreateForBitcoinViaCharge()
+    {
+        self::authorizeFromEnv();
+
+        $receiver = $this->createTestBitcoinReceiver("do+fill_now@stripe.com");
+
+        $charge = Charge::create(
+            array(
+                'amount' => $receiver->amount,
+                'currency' => $receiver->currency,
+                'description' => $receiver->description,
+                'source' => $receiver->id
+            )
+        );
+
+        $ref = $charge->refunds->create(
+            array(
+                'amount' => $receiver->amount,
+                'refund_address' => 'ABCDEF'
+            )
+        );
+        $this->assertSame($receiver->amount, $ref->amount);
+        $this->assertNotNull($ref->id);
+    }
+}
diff --git a/htdocs/includes/stripe/tests/RequestOptionsTest.php b/htdocs/includes/stripe/tests/RequestOptionsTest.php
new file mode 100644
index 00000000000..11546dd6ece
--- /dev/null
+++ b/htdocs/includes/stripe/tests/RequestOptionsTest.php
@@ -0,0 +1,69 @@
+<?php
+
+namespace Stripe;
+
+class RequestOptionsTest extends TestCase
+{
+    public function testStringAPIKey()
+    {
+        $opts = Util\RequestOptions::parse("foo");
+        $this->assertSame("foo", $opts->apiKey);
+        $this->assertSame(array(), $opts->headers);
+    }
+
+    public function testNull()
+    {
+        $opts = Util\RequestOptions::parse(null);
+        $this->assertSame(null, $opts->apiKey);
+        $this->assertSame(array(), $opts->headers);
+    }
+
+    public function testEmptyArray()
+    {
+        $opts = Util\RequestOptions::parse(array());
+        $this->assertSame(null, $opts->apiKey);
+        $this->assertSame(array(), $opts->headers);
+    }
+
+    public function testAPIKeyArray()
+    {
+        $opts = Util\RequestOptions::parse(
+            array(
+                'api_key' => 'foo',
+            )
+        );
+        $this->assertSame('foo', $opts->apiKey);
+        $this->assertSame(array(), $opts->headers);
+    }
+
+    public function testIdempotentKeyArray()
+    {
+        $opts = Util\RequestOptions::parse(
+            array(
+                'idempotency_key' => 'foo',
+            )
+        );
+        $this->assertSame(null, $opts->apiKey);
+        $this->assertSame(array('Idempotency-Key' => 'foo'), $opts->headers);
+    }
+
+    public function testKeyArray()
+    {
+        $opts = Util\RequestOptions::parse(
+            array(
+                'idempotency_key' => 'foo',
+                'api_key' => 'foo'
+            )
+        );
+        $this->assertSame('foo', $opts->apiKey);
+        $this->assertSame(array('Idempotency-Key' => 'foo'), $opts->headers);
+    }
+
+    /**
+     * @expectedException Stripe\Error\Api
+     */
+    public function testWrongType()
+    {
+        $opts = Util\RequestOptions::parse(5);
+    }
+}
diff --git a/htdocs/includes/stripe/tests/SourceTest.php b/htdocs/includes/stripe/tests/SourceTest.php
new file mode 100644
index 00000000000..5ba142b9be2
--- /dev/null
+++ b/htdocs/includes/stripe/tests/SourceTest.php
@@ -0,0 +1,218 @@
+<?php
+
+namespace Stripe;
+
+class SourceTest extends TestCase
+{
+    public function testRetrieve()
+    {
+        $this->mockRequest(
+            'GET',
+            '/v1/sources/src_foo',
+            array(),
+            array(
+                'id' => 'src_foo',
+                'object' => 'source',
+            )
+        );
+        $source = Source::retrieve('src_foo');
+        $this->assertSame($source->id, 'src_foo');
+    }
+
+    public function testCreate()
+    {
+        $this->mockRequest(
+            'POST',
+            '/v1/sources',
+            array(
+                'type' => 'bitcoin',
+                'amount' => 1000,
+                'currency' => 'usd',
+                'owner' => array('email' => 'jenny.rosen@example.com'),
+            ),
+            array(
+                'id' => 'src_foo',
+                'object' => 'source'
+            )
+        );
+        $source = Source::create(array(
+            'type' => 'bitcoin',
+            'amount' => 1000,
+            'currency' => 'usd',
+            'owner' => array('email' => 'jenny.rosen@example.com'),
+        ));
+        $this->assertSame($source->id, 'src_foo');
+    }
+
+    public function testSave()
+    {
+        $response = array(
+            'id' => 'src_foo',
+            'object' => 'source',
+            'metadata' => array(),
+        );
+        $this->mockRequest(
+            'GET',
+            '/v1/sources/src_foo',
+            array(),
+            $response
+        );
+
+        $response['metadata'] = array('foo' => 'bar');
+        $this->mockRequest(
+            'POST',
+            '/v1/sources/src_foo',
+            array(
+                'metadata' => array('foo' => 'bar'),
+            ),
+            $response
+        );
+
+        $source = Source::retrieve('src_foo');
+        $source->metadata['foo'] = 'bar';
+        $source->save();
+        $this->assertSame($source->metadata['foo'], 'bar');
+    }
+
+    public function testSaveOwner()
+    {
+        $response = array(
+            'id' => 'src_foo',
+            'object' => 'source',
+            'owner' => array(
+                'name' => null,
+                'address' => null,
+            ),
+        );
+        $this->mockRequest(
+            'GET',
+            '/v1/sources/src_foo',
+            array(),
+            $response
+        );
+
+        $response['owner'] = array(
+            'name' => "Stripey McStripe",
+            'address' => array(
+                'line1' => "Test Address",
+                'city' => "Test City",
+                'postal_code' => "12345",
+                'state' => "Test State",
+                'country' => "Test Country",
+            )
+        );
+        $this->mockRequest(
+            'POST',
+            '/v1/sources/src_foo',
+            array(
+                'owner' => array(
+                    'name' => "Stripey McStripe",
+                    'address' => array(
+                        'line1' => "Test Address",
+                        'city' => "Test City",
+                        'postal_code' => "12345",
+                        'state' => "Test State",
+                        'country' => "Test Country",
+                    ),
+                ),
+            ),
+            $response
+        );
+
+        $source = Source::retrieve('src_foo');
+        $source->owner['name'] = "Stripey McStripe";
+        $source->owner['address'] = array(
+            'line1' => "Test Address",
+            'city' => "Test City",
+            'postal_code' => "12345",
+            'state' => "Test State",
+            'country' => "Test Country",
+        );
+        $source->save();
+        $this->assertSame($source->owner['name'], "Stripey McStripe");
+        $this->assertSame($source->owner['address']['line1'], "Test Address");
+        $this->assertSame($source->owner['address']['city'], "Test City");
+        $this->assertSame($source->owner['address']['postal_code'], "12345");
+        $this->assertSame($source->owner['address']['state'], "Test State");
+        $this->assertSame($source->owner['address']['country'], "Test Country");
+    }
+
+    public function testDeleteAttached()
+    {
+        $response = array(
+            'id' => 'src_foo',
+            'object' => 'source',
+            'customer' => 'cus_bar',
+        );
+        $this->mockRequest(
+            'GET',
+            '/v1/sources/src_foo',
+            array(),
+            $response
+        );
+
+        unset($response['customer']);
+        $this->mockRequest(
+            'DELETE',
+            '/v1/customers/cus_bar/sources/src_foo',
+            array(),
+            $response
+        );
+
+        $source = Source::retrieve('src_foo');
+        $source->delete();
+        $this->assertFalse(array_key_exists('customer', $source));
+    }
+
+    /**
+     * @expectedException Stripe\Error\Api
+     */
+    public function testDeleteUnattached()
+    {
+        $response = array(
+            'id' => 'src_foo',
+            'object' => 'source',
+        );
+        $this->mockRequest(
+            'GET',
+            '/v1/sources/src_foo',
+            array(),
+            $response
+        );
+
+        $source = Source::retrieve('src_foo');
+        $source->delete();
+    }
+
+    public function testVerify()
+    {
+        $response = array(
+            'id' => 'src_foo',
+            'object' => 'source',
+            'verification' => array('status' => 'pending'),
+        );
+        $this->mockRequest(
+            'GET',
+            '/v1/sources/src_foo',
+            array(),
+            $response
+        );
+
+        $response['verification']['status'] = 'succeeded';
+        $this->mockRequest(
+            'POST',
+            '/v1/sources/src_foo/verify',
+            array(
+                'values' => array(32, 45),
+            ),
+            $response
+        );
+
+        $source = Source::retrieve('src_foo');
+        $this->assertSame($source->verification->status, 'pending');
+        $source->verify(array(
+            'values' => array(32, 45),
+        ));
+        $this->assertSame($source->verification->status, 'succeeded');
+    }
+}
diff --git a/htdocs/includes/stripe/tests/StripeObjectTest.php b/htdocs/includes/stripe/tests/StripeObjectTest.php
new file mode 100644
index 00000000000..5f922228270
--- /dev/null
+++ b/htdocs/includes/stripe/tests/StripeObjectTest.php
@@ -0,0 +1,108 @@
+<?php
+
+namespace Stripe;
+
+class StripeObjectTest extends TestCase
+{
+    public function testArrayAccessorsSemantics()
+    {
+        $s = new StripeObject();
+        $s['foo'] = 'a';
+        $this->assertSame($s['foo'], 'a');
+        $this->assertTrue(isset($s['foo']));
+        unset($s['foo']);
+        $this->assertFalse(isset($s['foo']));
+    }
+
+    public function testNormalAccessorsSemantics()
+    {
+        $s = new StripeObject();
+        $s->foo = 'a';
+        $this->assertSame($s->foo, 'a');
+        $this->assertTrue(isset($s->foo));
+        unset($s->foo);
+        $this->assertFalse(isset($s->foo));
+    }
+
+    public function testArrayAccessorsMatchNormalAccessors()
+    {
+        $s = new StripeObject();
+        $s->foo = 'a';
+        $this->assertSame($s['foo'], 'a');
+
+        $s['bar'] = 'b';
+        $this->assertSame($s->bar, 'b');
+    }
+
+    public function testKeys()
+    {
+        $s = new StripeObject();
+        $s->foo = 'a';
+        $this->assertSame($s->keys(), array('foo'));
+    }
+
+    public function testToArray()
+    {
+        $s = new StripeObject();
+        $s->foo = 'a';
+
+        $converted = $s->__toArray();
+
+        $this->assertInternalType('array', $converted);
+        $this->assertArrayHasKey('foo', $converted);
+        $this->assertEquals('a', $converted['foo']);
+    }
+
+    public function testRecursiveToArray()
+    {
+        $s = new StripeObject();
+        $z = new StripeObject();
+
+        $s->child = $z;
+        $z->foo = 'a';
+
+        $converted = $s->__toArray(true);
+
+        $this->assertInternalType('array', $converted);
+        $this->assertArrayHasKey('child', $converted);
+        $this->assertInternalType('array', $converted['child']);
+        $this->assertArrayHasKey('foo', $converted['child']);
+        $this->assertEquals('a', $converted['child']['foo']);
+    }
+
+    public function testNonexistentProperty()
+    {
+        $s = new StripeObject();
+        $this->assertNull($s->nonexistent);
+    }
+
+    public function testPropertyDoesNotExists()
+    {
+        $s = new StripeObject();
+        $this->assertNull($s['nonexistent']);
+    }
+
+    public function testJsonEncode()
+    {
+        // We can only JSON encode our objects in PHP 5.4+. 5.3 must use ->__toJSON()
+        if (version_compare(phpversion(), '5.4.0', '<')) {
+            return;
+        }
+
+        $s = new StripeObject();
+        $s->foo = 'a';
+
+        $this->assertEquals('{"foo":"a"}', json_encode($s->__toArray()));
+    }
+
+    public function testReplaceNewNestedUpdatable()
+    {
+        StripeObject::init(); // Populate the $nestedUpdatableAttributes Set
+        $s = new StripeObject();
+
+        $s->metadata = array('bar');
+        $this->assertSame($s->metadata, array('bar'));
+        $s->metadata = array('baz', 'qux');
+        $this->assertSame($s->metadata, array('baz', 'qux'));
+    }
+}
diff --git a/htdocs/includes/stripe/tests/SubscriptionItemTest.php b/htdocs/includes/stripe/tests/SubscriptionItemTest.php
new file mode 100644
index 00000000000..4e4a545a5b1
--- /dev/null
+++ b/htdocs/includes/stripe/tests/SubscriptionItemTest.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace Stripe;
+
+class SubscriptionItemTest extends TestCase
+{
+    public function testCreateUpdateRetrieveListCancel()
+    {
+        $plan0ID = 'gold-' . self::generateRandomString(20);
+        self::retrieveOrCreatePlan($plan0ID);
+
+        $customer = self::createTestCustomer();
+        $sub = Subscription::create(array('plan' => $plan0ID, 'customer' => $customer->id));
+
+        $plan1ID = 'gold-' . self::generateRandomString(20);
+        self::retrieveOrCreatePlan($plan1ID);
+
+        $subItem = SubscriptionItem::create(array('plan' => $plan1ID, 'subscription' => $sub->id));
+        $this->assertSame($subItem->plan->id, $plan1ID);
+
+        $subItem->quantity = 2;
+        $subItem->save();
+
+        $subItem = SubscriptionItem::retrieve($subItem->id);
+        $this->assertSame($subItem->quantity, 2);
+
+        // Update the quantity parameter one more time
+        $subItem = SubscriptionItem::update($subItem->id, array('quantity' => 3));
+        $this->assertSame($subItem->quantity, 3);
+
+        $subItems = SubscriptionItem::all(array('subscription'=>$sub->id, 'limit'=>3));
+        $this->assertSame(get_class($subItems->data[0]), 'Stripe\SubscriptionItem');
+        $this->assertSame(2, count($subItems->data));
+
+        $subItem->delete();
+        $this->assertTrue($subItem->deleted);
+    }
+}
diff --git a/htdocs/includes/stripe/tests/SubscriptionTest.php b/htdocs/includes/stripe/tests/SubscriptionTest.php
new file mode 100644
index 00000000000..08f74108061
--- /dev/null
+++ b/htdocs/includes/stripe/tests/SubscriptionTest.php
@@ -0,0 +1,132 @@
+<?php
+
+namespace Stripe;
+
+class SubscriptionTest extends TestCase
+{
+
+    public function testCustomerCreateUpdateListCancel()
+    {
+        $planID = 'gold-' . self::generateRandomString(20);
+        self::retrieveOrCreatePlan($planID);
+
+        $customer = self::createTestCustomer();
+
+        $sub = $customer->subscriptions->create(array('plan' => $planID));
+
+        $this->assertSame($sub->status, 'active');
+        $this->assertSame($sub->plan->id, $planID);
+
+        $sub->quantity = 2;
+        $sub->save();
+
+        $sub = $customer->subscriptions->retrieve($sub->id);
+        $this->assertSame($sub->status, 'active');
+        $this->assertSame($sub->plan->id, $planID);
+        $this->assertSame($sub->quantity, 2);
+
+        $subs = $customer->subscriptions->all(array('limit'=>3));
+        $this->assertSame(get_class($subs->data[0]), 'Stripe\Subscription');
+
+        $sub->cancel(array('at_period_end' => true));
+
+        $sub = $customer->subscriptions->retrieve($sub->id);
+        $this->assertSame($sub->status, 'active');
+        // @codingStandardsIgnoreStart
+        $this->assertTrue($sub->cancel_at_period_end);
+        // @codingStandardsIgnoreEnd
+    }
+
+    public function testCreateUpdateListCancel()
+    {
+        $planID = 'gold-' . self::generateRandomString(20);
+        self::retrieveOrCreatePlan($planID);
+
+        $customer = self::createTestCustomer();
+
+        $sub = Subscription::create(array('plan' => $planID, 'customer' => $customer->id));
+
+        $this->assertSame($sub->status, 'active');
+        $this->assertSame($sub->plan->id, $planID);
+
+        $sub->quantity = 2;
+        $sub->save();
+
+        $sub = Subscription::retrieve($sub->id);
+        $this->assertSame($sub->status, 'active');
+        $this->assertSame($sub->plan->id, $planID);
+        $this->assertSame($sub->quantity, 2);
+
+        // Update the quantity parameter one more time
+        $sub = Subscription::update($sub->id, array("quantity" => 3));
+        $this->assertSame($sub->status, 'active');
+        $this->assertSame($sub->plan->id, $planID);
+        $this->assertSame($sub->quantity, 3);
+
+        $subs = Subscription::all(array('customer'=>$customer->id, 'plan'=>$planID, 'limit'=>3));
+        $this->assertSame(get_class($subs->data[0]), 'Stripe\Subscription');
+
+        $sub->cancel(array('at_period_end' => true));
+
+        $sub = Subscription::retrieve($sub->id);
+        $this->assertSame($sub->status, 'active');
+        $this->assertTrue($sub->cancel_at_period_end);
+    }
+
+    public function testCreateUpdateListCancelWithItems()
+    {
+        $plan0ID = 'gold-' . self::generateRandomString(20);
+        self::retrieveOrCreatePlan($plan0ID);
+
+        $customer = self::createTestCustomer();
+
+        $sub = Subscription::create(array(
+          'customer' => $customer->id,
+          'items' => array(
+            array('plan' => $plan0ID),
+          ),
+        ));
+
+        $this->assertSame(count($sub->items->data), 1);
+        $this->assertSame($sub->items->data[0]->plan->id, $plan0ID);
+
+        $plan1ID = 'gold-' . self::generateRandomString(20);
+        self::retrieveOrCreatePlan($plan1ID);
+
+        $sub = Subscription::update($sub->id, array(
+          'items' => array(
+            array('plan' => $plan1ID),
+          ),
+        ));
+
+        $this->assertSame(count($sub->items->data), 2);
+        $this->assertSame($sub->items->data[0]->plan->id, $plan0ID);
+        $this->assertSame($sub->items->data[1]->plan->id, $plan1ID);
+    }
+
+    public function testDeleteDiscount()
+    {
+        $planID = 'gold-' . self::generateRandomString(20);
+        self::retrieveOrCreatePlan($planID);
+
+        $couponID = '25off-' . self::generateRandomString(20);
+        self::retrieveOrCreateCoupon($couponID);
+
+        $customer = self::createTestCustomer();
+
+        $sub = $customer->subscriptions->create(
+            array(
+                'plan' => $planID,
+                'coupon' => $couponID
+            )
+        );
+
+        $this->assertSame($sub->status, 'active');
+        $this->assertSame($sub->plan->id, $planID);
+        $this->assertSame($sub->discount->coupon->id, $couponID);
+
+        $sub->deleteDiscount();
+        $sub = $customer->subscriptions->retrieve($sub->id);
+        $this->assertNull($sub->discount);
+    }
+}
diff --git a/htdocs/includes/stripe/tests/TestCase.php b/htdocs/includes/stripe/tests/TestCase.php
new file mode 100644
index 00000000000..a1fdc94f917
--- /dev/null
+++ b/htdocs/includes/stripe/tests/TestCase.php
@@ -0,0 +1,271 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Base class for Stripe test cases, provides some utility methods for creating
+ * objects.
+ */
+class TestCase extends \PHPUnit_Framework_TestCase
+{
+    const API_KEY = 'tGN0bIwXnHdwOa85VABjPdSn8nWY7G7I';
+
+    private $mock;
+
+    protected static function authorizeFromEnv()
+    {
+        $apiKey = getenv('STRIPE_API_KEY');
+        if (!$apiKey) {
+            $apiKey = self::API_KEY;
+        }
+
+        Stripe::setApiKey($apiKey);
+    }
+
+    protected function setUp()
+    {
+        ApiRequestor::setHttpClient(HttpClient\CurlClient::instance());
+
+        // Peg the API version so that it can be varied independently of the
+        // one set on the test account.
+        Stripe::setApiVersion('2017-04-06');
+
+        $this->mock = null;
+        $this->call = 0;
+    }
+
+    protected function mockRequest($method, $path, $params = array(), $return = array('id' => 'myId'), $rcode = 200)
+    {
+        $mock = $this->setUpMockRequest();
+        $mock->expects($this->at($this->call++))
+             ->method('request')
+             ->with(strtolower($method), 'https://api.stripe.com' . $path, $this->anything(), $params, false)
+             ->willReturn(array(json_encode($return), $rcode, array()));
+    }
+
+    private function setUpMockRequest()
+    {
+        if (!$this->mock) {
+            self::authorizeFromEnv();
+            $this->mock = $this->getMock('\Stripe\HttpClient\ClientInterface');
+            ApiRequestor::setHttpClient($this->mock);
+        }
+        return $this->mock;
+    }
+
+    /**
+     * Create a valid test charge.
+     */
+    protected static function createTestCharge(array $attributes = array())
+    {
+        self::authorizeFromEnv();
+
+        return Charge::create(
+            $attributes + array(
+                'amount' => 2000,
+                'currency' => 'usd',
+                'description' => 'Charge for test@example.com',
+                'card' => array(
+                    'number' => '4242424242424242',
+                    'exp_month' => 5,
+                    'exp_year' => date('Y') + 3,
+                ),
+            )
+        );
+    }
+
+    /**
+     * Create a valid test transfer.
+     */
+    protected static function createTestTransfer(array $attributes = array(), $opts = null)
+    {
+        self::authorizeFromEnv();
+
+        $recipient = self::createTestRecipient();
+
+        return Transfer::create(
+            $attributes + array(
+                'amount' => 2000,
+                'currency' => 'usd',
+                'description' => 'Transfer to test@example.com',
+                'recipient' => $recipient->id
+            ),
+            $opts
+        );
+    }
+
+    /**
+     * Create a valid test customer.
+     */
+    protected static function createTestCustomer(array $attributes = array())
+    {
+        self::authorizeFromEnv();
+
+        return Customer::create(
+            $attributes + array(
+                'card' => array(
+                    'number' => '4242424242424242',
+                    'exp_month' => 5,
+                    'exp_year' => date('Y') + 3,
+                ),
+            )
+        );
+    }
+
+    /**
+     * Create a valid test recipient
+     */
+    protected static function createTestRecipient(array $attributes = array())
+    {
+        self::authorizeFromEnv();
+
+        return Recipient::create(
+            $attributes + array(
+                'name' => 'PHP Test',
+                'type' => 'individual',
+                'tax_id' => '000000000',
+                'bank_account' => array(
+                    'country' => 'US',
+                    'routing_number' => '110000000',
+                    'account_number' => '000123456789'
+                ),
+            )
+        );
+    }
+
+    /**
+     * Create a test account
+     */
+    protected static function createTestAccount(array $attributes = array())
+    {
+        self::authorizeFromEnv();
+
+        return Account::create(
+            $attributes + array(
+                'managed' => false,
+                'country' => 'US',
+                'email' => self::generateRandomEmail(),
+            )
+        );
+    }
+
+    /**
+     * Create a test account
+     */
+    protected static function createTestManagedAccount(array $attributes = array())
+    {
+        self::authorizeFromEnv();
+
+        return Account::create(
+            $attributes + array(
+                'managed' => true,
+                'country' => 'US',
+                'external_account' => array(
+                    'object' => 'bank_account',
+                    'country' => 'US',
+                    'currency' => 'usd',
+                    'routing_number' => '110000000',
+                    'account_number' => '000123456789'
+                ),
+                'legal_entity' => array(
+                    'type'               => 'individual',
+                    'personal_id_number' => '000000000',
+                    'type'               => 'individual',
+                    'dob'                => array('year' => '1980', 'month' => '01', 'day' => '01'),
+                    'first_name'         => 'John',
+                    'last_name'          => 'Doe',
+                    'address'            => array(
+                        'line1'          => '1234 Main Street',
+                        'postal_code'    => '94110',
+                        'city'           => 'San Francisco'
+                    ),
+                    'personal_address'   => array(
+                        'line1'          => '1234 Main Street',
+                        'postal_code'    => '94110',
+                        'city'           => 'San Francisco'
+                    )
+                ),
+                'tos_acceptance' => array('date' => time(), 'ip' => '127.0.0.1')
+            )
+        );
+    }
+
+    /**
+     * Verify that a plan with a given ID exists, or create a new one if it does
+     * not.
+     */
+    protected static function retrieveOrCreatePlan($id)
+    {
+        self::authorizeFromEnv();
+
+        try {
+            $plan = Plan::retrieve($id);
+        } catch (Error\InvalidRequest $exception) {
+            $plan = Plan::create(
+                array(
+                    'id' => $id,
+                    'amount' => 0,
+                    'currency' => 'usd',
+                    'interval' => 'month',
+                    'name' => 'Gold Test Plan',
+                )
+            );
+        }
+    }
+
+    /**
+     * Verify that a coupon with a given ID exists, or create a new one if it
+     * does not.
+     */
+    protected static function retrieveOrCreateCoupon($id)
+    {
+        self::authorizeFromEnv();
+
+        try {
+            $coupon = Coupon::retrieve($id);
+        } catch (Error\InvalidRequest $exception) {
+            $coupon = Coupon::create(
+                array(
+                    'id' => $id,
+                    'duration' => 'forever',
+                    'percent_off' => 25,
+                )
+            );
+        }
+    }
+
+    /**
+     * Generate a semi-random string
+     */
+    protected static function generateRandomString($length = 24)
+    {
+        $characters = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTU';
+        $charactersLength = strlen($characters);
+        $randomString = '';
+        for ($i = 0; $i < $length; $i++) {
+            $randomString .= $characters[rand(0, $charactersLength - 1)];
+        }
+        return $randomString;
+    }
+
+    /**
+     * Generate a semi-random email.
+     */
+    protected static function generateRandomEmail()
+    {
+        return 'dev-platform-bots+php-'.self::generateRandomString(12).'@stripe.com';
+    }
+
+    protected static function createTestBitcoinReceiver($email)
+    {
+        $receiver = BitcoinReceiver::create(
+            array(
+                'amount' => 100,
+                'currency' => 'usd',
+                'description' => 'some details',
+                'email' => $email
+            )
+        );
+        return $receiver;
+    }
+}
diff --git a/htdocs/includes/stripe/tests/ThreeDSecureTest.php b/htdocs/includes/stripe/tests/ThreeDSecureTest.php
new file mode 100644
index 00000000000..ebdd62335ee
--- /dev/null
+++ b/htdocs/includes/stripe/tests/ThreeDSecureTest.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace Stripe;
+
+class ThreeDSecureTest extends TestCase
+{
+    public function testRetrieve()
+    {
+        $this->mockRequest(
+            'GET',
+            '/v1/3d_secure/tdsrc_test',
+            array(),
+            array(
+                'id' => 'tdsrc_test',
+                'object' => 'three_d_secure'
+            )
+        );
+        $three_d_secure = ThreeDSecure::retrieve('tdsrc_test');
+        $this->assertSame($three_d_secure->id, 'tdsrc_test');
+    }
+
+    public function testCreate()
+    {
+        $this->mockRequest(
+            'POST',
+            '/v1/3d_secure',
+            array(
+                'card' => 'tok_test',
+                'amount' => 1500,
+                'currency' => 'usd',
+                'return_url' => 'https://example.org/3d-secure-result'
+            ),
+            array(
+                'id' => 'tdsrc_test',
+                'object' => 'three_d_secure'
+            )
+        );
+        $three_d_secure = ThreeDSecure::create(array(
+                'card' => 'tok_test',
+                'amount' => 1500,
+                'currency' => 'usd',
+                'return_url' => 'https://example.org/3d-secure-result'
+        ));
+        $this->assertSame($three_d_secure->id, 'tdsrc_test');
+    }
+}
diff --git a/htdocs/includes/stripe/tests/TokenTest.php b/htdocs/includes/stripe/tests/TokenTest.php
new file mode 100644
index 00000000000..60ec76a1544
--- /dev/null
+++ b/htdocs/includes/stripe/tests/TokenTest.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Stripe;
+
+class TokenTest extends TestCase
+{
+    public function testUrls()
+    {
+        $this->assertSame(Token::classUrl(), '/v1/tokens');
+        $token = new Token('abcd/efgh');
+        $this->assertSame($token->instanceUrl(), '/v1/tokens/abcd%2Fefgh');
+    }
+}
diff --git a/htdocs/includes/stripe/tests/TransferReversalTest.php b/htdocs/includes/stripe/tests/TransferReversalTest.php
new file mode 100644
index 00000000000..86d746650f5
--- /dev/null
+++ b/htdocs/includes/stripe/tests/TransferReversalTest.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Stripe;
+
+class TransferReversalTest extends TestCase
+{
+    // The resource that was traditionally called "transfer" became a "payout"
+    // in API version 2017-04-06. We're testing traditional transfers here, so
+    // we force the API version just prior anywhere that we need to.
+    private $opts = array('stripe_version' => '2017-02-14');
+
+    public function testList()
+    {
+        $transfer = self::createTestTransfer(array(), $this->opts);
+        $all = $transfer->reversals->all();
+        $this->assertSame(false, $all['has_more']);
+        $this->assertSame(0, count($all->data));
+    }
+}
diff --git a/htdocs/includes/stripe/tests/TransferTest.php b/htdocs/includes/stripe/tests/TransferTest.php
new file mode 100644
index 00000000000..f4fd347dc4e
--- /dev/null
+++ b/htdocs/includes/stripe/tests/TransferTest.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace Stripe;
+
+class TransferTest extends TestCase
+{
+    // The resource that was traditionally called "transfer" became a "payout"
+    // in API version 2017-04-06. We're testing traditional transfers here, so
+    // we force the API version just prior anywhere that we need to.
+    private $opts = array('stripe_version' => '2017-02-14');
+
+    public function testCreate()
+    {
+        $transfer = self::createTestTransfer(array(), $this->opts);
+        $this->assertSame('transfer', $transfer->object);
+    }
+
+    public function testRetrieve()
+    {
+        $transfer = self::createTestTransfer(array(), $this->opts);
+        $reloaded = Transfer::retrieve($transfer->id, $this->opts);
+        $this->assertSame($reloaded->id, $transfer->id);
+    }
+
+    public function testTransferUpdateMetadata()
+    {
+        $transfer = self::createTestTransfer(array(), $this->opts);
+
+        $transfer->metadata['test'] = 'foo bar';
+        $transfer->save();
+
+        $updatedTransfer = Transfer::retrieve($transfer->id, $this->opts);
+        $this->assertSame('foo bar', $updatedTransfer->metadata['test']);
+    }
+
+    public function testTransferUpdateMetadataAll()
+    {
+        $transfer = self::createTestTransfer(array(), $this->opts);
+
+        $transfer->metadata = array('test' => 'foo bar');
+        $transfer->save();
+
+        $updatedTransfer = Transfer::retrieve($transfer->id, $this->opts);
+        $this->assertSame('foo bar', $updatedTransfer->metadata['test']);
+    }
+}
diff --git a/htdocs/includes/stripe/tests/UtilTest.php b/htdocs/includes/stripe/tests/UtilTest.php
new file mode 100644
index 00000000000..a1206d698f7
--- /dev/null
+++ b/htdocs/includes/stripe/tests/UtilTest.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace Stripe;
+
+class UtilTest extends TestCase
+{
+    public function testIsList()
+    {
+        $list = array(5, 'nstaoush', array());
+        $this->assertTrue(Util\Util::isList($list));
+
+        $notlist = array(5, 'nstaoush', array(), 'bar' => 'baz');
+        $this->assertFalse(Util\Util::isList($notlist));
+    }
+
+    public function testThatPHPHasValueSemanticsForArrays()
+    {
+        $original = array('php-arrays' => 'value-semantics');
+        $derived = $original;
+        $derived['php-arrays'] = 'reference-semantics';
+
+        $this->assertSame('value-semantics', $original['php-arrays']);
+    }
+
+    public function testConvertStripeObjectToArrayIncludesId()
+    {
+        $customer = self::createTestCustomer();
+        $this->assertTrue(array_key_exists("id", $customer->__toArray(true)));
+    }
+
+    public function testUtf8()
+    {
+        // UTF-8 string
+        $x = "\xc3\xa9";
+        $this->assertSame(Util\Util::utf8($x), $x);
+
+        // Latin-1 string
+        $x = "\xe9";
+        $this->assertSame(Util\Util::utf8($x), "\xc3\xa9");
+
+        // Not a string
+        $x = true;
+        $this->assertSame(Util\Util::utf8($x), $x);
+    }
+}
diff --git a/htdocs/includes/stripe/tests/bootstrap.no_autoload.php b/htdocs/includes/stripe/tests/bootstrap.no_autoload.php
new file mode 100644
index 00000000000..7358058780a
--- /dev/null
+++ b/htdocs/includes/stripe/tests/bootstrap.no_autoload.php
@@ -0,0 +1,4 @@
+<?php
+
+require_once __DIR__ . '/../init.php';
+require_once __DIR__ . '/TestCase.php';
diff --git a/htdocs/includes/stripe/tests/bootstrap.php b/htdocs/includes/stripe/tests/bootstrap.php
new file mode 100644
index 00000000000..de6ff4e253c
--- /dev/null
+++ b/htdocs/includes/stripe/tests/bootstrap.php
@@ -0,0 +1,3 @@
+<?php
+
+require_once __DIR__ . '/TestCase.php';
diff --git a/htdocs/stripe/admin/stripe.php b/htdocs/stripe/admin/stripe.php
index 481f6634227..719c623e146 100644
--- a/htdocs/stripe/admin/stripe.php
+++ b/htdocs/stripe/admin/stripe.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2017		Alexandre Spangaro		<aspangaro@zendsi.com>
+ * Copyright (C) 2017		Saasprov				<saasprov@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
diff --git a/htdocs/stripe/checkout.php b/htdocs/stripe/checkout.php
new file mode 100644
index 00000000000..0989d55b76f
--- /dev/null
+++ b/htdocs/stripe/checkout.php
@@ -0,0 +1,241 @@
+<?php
+/* <one line to give the program's name and a brief idea of what it does.>
+ * Copyright (C) <2016> SaaSprov.ma  <saasprov@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
+ * 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/>.
+ */
+
+
+// Load Dolibarr environment
+
+
+require_once('config.php');
+require_once('stripe/init.php');
+
+define("NOLOGIN",1);
+define("NOCSRFCHECK",1);
+
+$langs->load("main");
+$langs->load("other");
+$langs->load("stripe");
+
+$SOURCE=GETPOST("source",'alpha');
+$ref=$REF=GETPOST('ref','alpha');
+
+$form = new Form($db);
+
+/**
+ * Header empty
+ *
+ * @return	void
+ */
+function llxHeader() { }
+/**
+ * Footer empty
+ *
+ * @return	void
+ */
+function llxFooter() { }
+
+$invoice = null;
+
+// Payment on customer invoice
+if (GETPOST("source") == 'invoice')
+{
+	$found=true;
+	$langs->load("bills");
+
+	require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+
+	$invoice=new Facture($db);
+	$result=$invoice->fetch('',$ref);
+	if ($result < 0)
+	{
+		$mesg=$invoice->error;
+		$error++;
+	}
+	else
+	{
+		$result=$invoice->fetch_thirdparty($invoice->socid);
+	}
+
+
+}
+
+$pay = false;
+$ttc = $invoice->total_ttc ;
+$ttc = $ttc * 100;
+if (GETPOST("action") == 'charge')
+{
+  $token = GETPOST("stripeToken");
+  $email = GETPOST("stripeEmail");
+
+  $customer = \Stripe\Customer::create(array(
+      'email' => $email,
+      'card'  => $token
+  ));
+	
+	$ttc = round($ttc, 2);
+  $charge = \Stripe\Charge::create(array(
+      'customer' => $customer->id,
+      'amount'   => $ttc,
+      'currency' => $conf->currency,
+      'description' => 'Invoice payment N: '.$ref
+  ));
+
+	$pay = true;
+	
+}
+
+
+
+?>
+
+<!doctype html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <title><?php echo $langs->trans('PaymentForm'); ?></title>
+    <link rel='stylesheet' type='text/css' href='css/style.css' />
+</head>
+
+<body>
+    <div class="invoice-box">		
+        <table cellpadding="0" cellspacing="0">
+            <tr class="top">
+                <td colspan="2">
+                    <table>
+                        <tr>
+                            <td class="title">                                
+								<?php 
+									if(empty($pay)):
+									print '<form  action="' . $_SERVER['REQUEST_URI'] . '" method="POST">';
+									print '<input type="hidden" name="action" value="charge" />';
+									
+								?>
+								  <script src="https://checkout.stripe.com/checkout.js" 
+										class="stripe-button"
+										data-key="<?php echo $stripe['publishable_key']; ?>"
+										data-amount="<?php echo $ttc; ?>"
+										data-currency="<?php echo $conf->currency; ?>"
+										data-description="<?php echo 'Invoice payment N: '.$ref; ?>">
+									</script>
+								</form>
+								<?php endif; ?>
+                            </td>
+                            
+                            <td>
+                                Invoice #: <?php echo $invoice->ref; ?><br>
+                                <?php echo $langs->trans('Date') . ' : ' . dol_print_date($invoice->date, 'day'); ?><br>
+                                <?php echo $langs->trans('DateMaxPayment') . ' : ' . dol_print_date($invoice->date_validation, 'day'); ?>
+                            </td>
+                        </tr>
+                    </table>
+                </td>
+            </tr>
+            
+            <tr class="information">
+                <td colspan="2">
+                    <table>
+                        <tr>
+                            <td>
+                                <?php echo $invoice->thirdparty->name; ?><br>
+                                <?php echo $invoice->thirdparty->address; ?><br>
+								<?php echo $invoice->thirdparty->zip . ', ' . $invoice->thirdparty->town .' '. $invoice->thirdparty->country_code ; ?>
+                            </td>
+                            
+                            <td>
+                               
+                            </td>
+                        </tr>
+                    </table>
+                </td>
+            </tr>
+            
+            <tr class="heading">
+                <td>
+                    <?php echo $langs->trans('PaymentConditionsShort'); ?>
+                </td>
+                
+                <td>
+                    <?php echo $form->form_conditions_reglement('', $invoice->cond_reglement_id, 'none'); ?>
+                </td>
+            </tr>
+            
+            
+            <tr class="heading">
+                <td>
+                    TOTAL
+                </td>
+                
+                <td>
+                </td>
+            </tr>
+            
+            <tr class="item">
+                <td>
+                   <?php echo $langs->trans('AmountHT'); ?>
+                </td>
+                
+                <td>
+                    <?php echo price($invoice->total_ht, 1, '', 1, - 1, - 1, $conf->currency); ?>
+                </td>
+            </tr>
+            
+            <tr class="item">
+                <td>
+                    <?php echo $langs->trans('AmountVAT'); ?>
+                </td>
+                
+                <td>
+                    <?php echo price($invoice->total_tva, 1, '', 1, - 1, - 1, $conf->currency); ?>
+                </td>
+            </tr>
+            
+            <tr class="item last">
+                <td>
+                    <?php echo $langs->trans('AmountTTC'); ?>
+                </td>
+                
+                <td>
+                   <?php echo price($invoice->total_ttc, 1, '', 1, - 1, - 1, $conf->currency); ?>
+                </td>
+            </tr>
+            
+            <tr class="total">
+                <td></td>
+                
+                <td>
+                   Total: <?php echo price($invoice->total_ttc, 1, '', 1, - 1, - 1, $conf->currency); ?>
+                </td>
+            </tr>
+			
+			
+        </table>
+		<?php //var_dump($mysoc); ?>
+		
+		<span class="center">
+			<?php html_print_paypal_footer($mysoc,$langs); ?>
+		</span>
+		
+		<?php //echo var_dump($mysoc); ?>
+		
+    </div>
+
+</body>
+</html>
+
+
+
+
diff --git a/htdocs/stripe/config.php b/htdocs/stripe/config.php
new file mode 100644
index 00000000000..9cc083051ec
--- /dev/null
+++ b/htdocs/stripe/config.php
@@ -0,0 +1,36 @@
+<?php
+/* <one line to give the program's name and a brief idea of what it does.>
+ * Copyright (C) <2016>  <jamelbaz@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
+ * 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/>.
+ */
+
+
+// Load Dolibarr environment
+if (false === (@include '../main.inc.php')) {  // From htdocs directory
+	require '../../main.inc.php'; // From "custom" directory
+}
+
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+dol_include_once('/stripe/lib/stripe.lib.php');
+require_once('stripe/init.php');
+
+//use \Stripe\Stripe as Stripe;
+$stripe = array(
+  "secret_key"      => $conf->global->TEST_SECRET_KEY,
+  "publishable_key" => $conf->global->TEST_PUBLISHABLE_KEY
+);
+
+\Stripe\Stripe::setApiKey($stripe['secret_key']);
+?>
\ No newline at end of file
diff --git a/htdocs/stripe/paymnt_link.php b/htdocs/stripe/paymnt_link.php
new file mode 100644
index 00000000000..68adbf47a3c
--- /dev/null
+++ b/htdocs/stripe/paymnt_link.php
@@ -0,0 +1,72 @@
+<?php
+/* Copyright (C) 2007-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) ---Put here your own copyright and developer email---
+ *
+ * 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/>.
+ */
+
+
+// Load Dolibarr environment
+if (false === (@include '../main.inc.php')) {  // From htdocs directory
+	require '../../main.inc.php'; // From "custom" directory
+}
+require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
+
+// Load traductions files requiredby by page
+$langs->load("mymodule");
+$langs->load("other");
+
+// Get parameters
+$id = GETPOST('id', 'int'); // For backward compatibility
+
+$object = new Facture($db);
+// Load object
+if ($id > 0 || ! empty($ref)) {
+	$ret = $object->fetch($id, $ref, '', '', $conf->global->INVOICE_USE_SITUATION);
+}
+
+
+
+
+/***************************************************
+* VIEW
+*
+* Put here all code to build page
+****************************************************/
+
+llxHeader('','StripePaymentLink','');
+
+
+// Part to show record
+if ($id)
+{
+	print load_fiche_titre($langs->trans("StripePaymentLink"));
+    
+	dol_fiche_head();
+	
+	$link = $dolibarr_main_url_root . '/custom/stripe/checkout.php?source=invoice&ref=' . $object->ref;
+	print '<table class="border centpercent">'."\n";
+	print '<tr><td class="fieldrequired">'.$langs->trans("PaymentLink").'</td><td><input class="flat" type="text" size="100%" name="label" value="'.$link.'"></td></tr>';
+	// LIST_OF_TD_LABEL_FIELDS_VIEW
+	print '</table>';
+	
+	dol_fiche_end();
+
+
+
+
+}
+
+llxFooter();
+$db->close();

From 04e119d7a67e9b679a9fedbb6977e405a4e00964 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Tue, 18 Apr 2017 07:03:57 +0200
Subject: [PATCH 069/505] New : Add search of accountancy code in main
 thirdparty search

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

diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 1799fadf9bd..ef162beb750 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -118,7 +118,9 @@ $fieldstosearchall = array(
 	's.nom'=>"ThirdPartyName",
 	's.name_alias'=>"AliasNameShort",
 	's.code_client'=>"CustomerCode",
-    "s.code_fournisseur"=>"SupplierCode",
+    's.code_fournisseur'=>"SupplierCode",
+	's.code_compta'=>"CustomerAccountancyCodeShort",
+	's.code_compta_fournisseur'=>"SupplierAccountancyCodeShort",
 	's.email'=>"EMail",
 	's.url'=>"URL",
     's.tva_intra'=>"VATIntra",

From a52db08cd6d0620b6069b8e89e04722874c48cb6 Mon Sep 17 00:00:00 2001
From: florian HENRY <florian.henry@atm-consulting.fr>
Date: Tue, 18 Apr 2017 15:25:04 +0200
Subject: [PATCH 070/505] NEW : Add module resources import/export

---
 htdocs/core/class/ctyperesource.class.php | 500 ++++++++++++++++++++++
 htdocs/core/modules/modResource.class.php | 163 +++----
 htdocs/langs/en_US/resource.lang          |   5 +
 3 files changed, 561 insertions(+), 107 deletions(-)
 create mode 100644 htdocs/core/class/ctyperesource.class.php

diff --git a/htdocs/core/class/ctyperesource.class.php b/htdocs/core/class/ctyperesource.class.php
new file mode 100644
index 00000000000..ee899ad6b86
--- /dev/null
+++ b/htdocs/core/class/ctyperesource.class.php
@@ -0,0 +1,500 @@
+<?php
+/* Copyright (C) 2007-2012  Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2014-2016  Juanjo Menent       <jmenent@2byte.es>
+ * Copyright (C) 2015       Florian Henry       <florian.henry@open-concept.pro>
+ * Copyright (C) 2015       Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
+ * Copyright (C) ---Put here your own copyright and developer email---
+ *
+ * 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    resource/ctyperesource.class.php
+ * \ingroup resource
+ */
+
+/**
+ * Class Ctyperesource
+ *
+ * Put here description of your class
+ *
+ * @see CommonObject
+ */
+class Ctyperesource
+{
+	/**
+	 * @var string Id to identify managed objects
+	 */
+	public $element = 'ctyperesource';
+	/**
+	 * @var string Name of table without prefix where object is stored
+	 */
+	public $table_element = 'c_type_resource';
+
+	/**
+	 * @var CtyperesourceLine[] Lines
+	 */
+	public $lines = array();
+
+	/**
+	 */
+	
+	public $code;
+	public $label;
+	public $active;
+
+	/**
+	 */
+	
+
+	/**
+	 * Constructor
+	 *
+	 * @param DoliDb $db Database handler
+	 */
+	public function __construct(DoliDB $db)
+	{
+		$this->db = $db;
+	}
+
+	/**
+	 * Create object into database
+	 *
+	 * @param  User $user      User that creates
+	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 *
+	 * @return int <0 if KO, Id of created object if OK
+	 */
+	public function create(User $user, $notrigger = false)
+	{
+		dol_syslog(__METHOD__, LOG_DEBUG);
+
+		$error = 0;
+
+		// Clean parameters
+		
+		if (isset($this->code)) {
+			 $this->code = trim($this->code);
+		}
+		if (isset($this->label)) {
+			 $this->label = trim($this->label);
+		}
+		if (isset($this->active)) {
+			 $this->active = trim($this->active);
+		}
+
+		
+
+		// Check parameters
+		// Put here code to add control on parameters values
+
+		// Insert request
+		$sql = 'INSERT INTO ' . MAIN_DB_PREFIX . $this->table_element . '(';
+		
+		$sql.= 'code,';
+		$sql.= 'label';
+		$sql.= 'active';
+
+		
+		$sql .= ') VALUES (';
+		
+		$sql .= ' '.(! isset($this->code)?'NULL':"'".$this->db->escape($this->code)."'").',';
+		$sql .= ' '.(! isset($this->label)?'NULL':"'".$this->db->escape($this->label)."'").',';
+		$sql .= ' '.(! isset($this->active)?'NULL':$this->active);
+
+		
+		$sql .= ')';
+
+		$this->db->begin();
+
+		$resql = $this->db->query($sql);
+		if (!$resql) {
+			$error ++;
+			$this->errors[] = 'Error ' . $this->db->lasterror();
+			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+		}
+
+		if (!$error) {
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . $this->table_element);
+
+			if (!$notrigger) {
+				// Uncomment this and change MYOBJECT to your own tag if you
+				// want this action to call a trigger.
+
+				//// Call triggers
+				//$result=$this->call_trigger('MYOBJECT_CREATE',$user);
+				//if ($result < 0) $error++;
+				//// End call triggers
+			}
+		}
+
+		// Commit or rollback
+		if ($error) {
+			$this->db->rollback();
+
+			return - 1 * $error;
+		} else {
+			$this->db->commit();
+
+			return $this->id;
+		}
+	}
+
+	/**
+	 * Load object in memory from the database
+	 *
+	 * @param int    $id  Id object
+	 * @param string $ref Ref
+	 *
+	 * @return int <0 if KO, 0 if not found, >0 if OK
+	 */
+	public function fetch($id,$code='',$label='')
+	{
+		dol_syslog(__METHOD__, LOG_DEBUG);
+
+		$sql = 'SELECT';
+		$sql .= ' t.rowid,';
+		
+		$sql .= " t.code,";
+		$sql .= " t.label,";
+		$sql .= " t.active";
+
+		
+		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t';
+		if ($id)   $sql.= " WHERE t.id = ".$id;
+		elseif ($code) $sql.= " WHERE t.code = '".$this->db->escape($code)."'";
+		elseif ($label) $sql.= " WHERE t.label = '".$this->db->escape($label)."'";
+		
+		
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$numrows = $this->db->num_rows($resql);
+			if ($numrows) {
+				$obj = $this->db->fetch_object($resql);
+
+				$this->id = $obj->rowid;
+				
+				$this->code = $obj->code;
+				$this->label = $obj->label;
+				$this->active = $obj->active;
+
+				
+			}
+			
+			// Retrieve all extrafields for invoice
+			// fetch optionals attributes and labels
+			/*
+			require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+			$extrafields=new ExtraFields($this->db);
+			$extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true);
+			$this->fetch_optionals($this->id,$extralabels);
+            */
+			
+			// $this->fetch_lines();
+			
+			$this->db->free($resql);
+
+			if ($numrows) {
+				return 1;
+			} else {
+				return 0;
+			}
+		} else {
+			$this->errors[] = 'Error ' . $this->db->lasterror();
+			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+
+			return - 1;
+		}
+	}
+
+	/**
+	 * Load object in memory from the database
+	 *
+	 * @param string $sortorder Sort Order
+	 * @param string $sortfield Sort field
+	 * @param int    $limit     offset limit
+	 * @param int    $offset    offset limit
+	 * @param array  $filter    filter array
+	 * @param string $filtermode filter mode (AND or OR)
+	 *
+	 * @return int <0 if KO, >0 if OK
+	 */
+	public function fetchAll($sortorder='', $sortfield='', $limit=0, $offset=0, array $filter = array(), $filtermode='AND')
+	{
+		dol_syslog(__METHOD__, LOG_DEBUG);
+
+		$sql = 'SELECT';
+		$sql .= ' t.rowid,';
+		
+		$sql .= " t.code,";
+		$sql .= " t.label,";
+		$sql .= " t.active";
+
+		
+		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element. ' as t';
+
+		// Manage filter
+		$sqlwhere = array();
+		if (count($filter) > 0) {
+			foreach ($filter as $key => $value) {
+				$sqlwhere [] = $key . ' LIKE \'%' . $this->db->escape($value) . '%\'';
+			}
+		}
+		
+		if (count($sqlwhere) > 0) {
+			$sql .= ' WHERE ' . implode(' '.$filtermode.' ', $sqlwhere);
+		}
+		if (!empty($sortfield)) {
+			$sql .= $this->db->order($sortfield,$sortorder);
+		}
+		if (!empty($limit)) {
+		 $sql .=  ' ' . $this->db->plimit($limit, $offset);
+		}
+
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$num = $this->db->num_rows($resql);
+
+			while ($obj = $this->db->fetch_object($resql)) {
+				$line = new self($this->db);
+
+				$line->id = $obj->rowid;
+				
+				$line->code = $obj->code;
+				$line->label = $obj->label;
+				$line->active = $obj->active;
+
+				
+			}
+			$this->db->free($resql);
+
+			return $num;
+		} else {
+			$this->errors[] = 'Error ' . $this->db->lasterror();
+			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+
+			return - 1;
+		}
+	}
+
+	/**
+	 * Update object into database
+	 *
+	 * @param  User $user      User that modifies
+	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 *
+	 * @return int <0 if KO, >0 if OK
+	 */
+	public function update(User $user, $notrigger = false)
+	{
+		$error = 0;
+
+		dol_syslog(__METHOD__, LOG_DEBUG);
+
+		// Clean parameters
+		
+		if (isset($this->code)) {
+			 $this->code = trim($this->code);
+		}
+		if (isset($this->label)) {
+			 $this->label = trim($this->label);
+		}
+		if (isset($this->active)) {
+			 $this->active = trim($this->active);
+		}
+
+		// Check parameters
+		// Put here code to add a control on parameters values
+
+		// Update request
+		$sql = 'UPDATE ' . MAIN_DB_PREFIX . $this->table_element . ' SET';
+		
+		$sql .= ' code = '.(isset($this->code)?"'".$this->db->escape($this->code)."'":"null").',';
+		$sql .= ' label = '.(isset($this->label)?"'".$this->db->escape($this->label)."'":"null").',';
+		$sql .= ' active = '.(isset($this->active)?$this->active:"null");
+
+        
+		$sql .= ' WHERE rowid=' . $this->id;
+
+		$this->db->begin();
+
+		$resql = $this->db->query($sql);
+		if (!$resql) {
+			$error ++;
+			$this->errors[] = 'Error ' . $this->db->lasterror();
+			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+		}
+
+		if (!$error && !$notrigger) {
+			// Uncomment this and change MYOBJECT to your own tag if you
+			// want this action calls a trigger.
+
+			//// Call triggers
+			//$result=$this->call_trigger('MYOBJECT_MODIFY',$user);
+			//if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
+			//// End call triggers
+		}
+
+		// Commit or rollback
+		if ($error) {
+			$this->db->rollback();
+
+			return - 1 * $error;
+		} else {
+			$this->db->commit();
+
+			return 1;
+		}
+	}
+
+	/**
+	 * Delete object in database
+	 *
+	 * @param User $user      User that deletes
+	 * @param bool $notrigger false=launch triggers after, true=disable triggers
+	 *
+	 * @return int <0 if KO, >0 if OK
+	 */
+	public function delete(User $user, $notrigger = false)
+	{
+		dol_syslog(__METHOD__, LOG_DEBUG);
+
+		$error = 0;
+
+		$this->db->begin();
+
+		if (!$error) {
+			if (!$notrigger) {
+				// Uncomment this and change MYOBJECT to your own tag if you
+				// want this action calls a trigger.
+
+				//// Call triggers
+				//$result=$this->call_trigger('MYOBJECT_DELETE',$user);
+				//if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
+				//// End call triggers
+			}
+		}
+
+		// If you need to delete child tables to, you can insert them here
+		
+		if (!$error) {
+			$sql = 'DELETE FROM ' . MAIN_DB_PREFIX . $this->table_element;
+			$sql .= ' WHERE rowid=' . $this->id;
+
+			$resql = $this->db->query($sql);
+			if (!$resql) {
+				$error ++;
+				$this->errors[] = 'Error ' . $this->db->lasterror();
+				dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+			}
+		}
+
+		// Commit or rollback
+		if ($error) {
+			$this->db->rollback();
+
+			return - 1 * $error;
+		} else {
+			$this->db->commit();
+
+			return 1;
+		}
+	}
+
+	/**
+	 * Load an object from its id and create a new one in database
+	 *
+	 * @param int $fromid Id of object to clone
+	 *
+	 * @return int New id of clone
+	 */
+	public function createFromClone($fromid)
+	{
+		dol_syslog(__METHOD__, LOG_DEBUG);
+
+		global $user;
+		$error = 0;
+		$object = new Ctyperesource($this->db);
+
+		$this->db->begin();
+
+		// Load source object
+		$object->fetch($fromid);
+		// Reset object
+		$object->id = 0;
+
+		// Clear fields
+		// ...
+
+		// Create clone
+		$result = $object->create($user);
+
+		// Other options
+		if ($result < 0) {
+			$error ++;
+			$this->errors = $object->errors;
+			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+		}
+
+		// End
+		if (!$error) {
+			$this->db->commit();
+
+			return $object->id;
+		} else {
+			$this->db->rollback();
+
+			return - 1;
+		}
+	}
+
+	/**
+	 * Initialise object with example values
+	 * Id must be 0 if object instance is a specimen
+	 *
+	 * @return void
+	 */
+	public function initAsSpecimen()
+	{
+		$this->id = 0;
+		
+		$this->code = '';
+		$this->label = '';
+		$this->active = '';
+	}
+
+}
+
+/**
+ * Class CtyperesourceLine
+ */
+class CtyperesourceLine
+{
+	/**
+	 * @var int ID
+	 */
+	public $id;
+	/**
+	 * @var mixed Sample line property 1
+	 */
+	
+	public $code;
+	public $label;
+	public $active;
+
+	/**
+	 * @var mixed Sample line property 2
+	 */
+	
+}
diff --git a/htdocs/core/modules/modResource.class.php b/htdocs/core/modules/modResource.class.php
index d3aa3405d0b..f6674bdcfd7 100644
--- a/htdocs/core/modules/modResource.class.php
+++ b/htdocs/core/modules/modResource.class.php
@@ -201,22 +201,6 @@ class modResource extends DolibarrModules
 		$this->menu = 1;        // This module add menu entries. They are coded into menu manager.
 
 
-		// Add here list of permission defined by
-		// an id, a label, a boolean and two constant strings.
-		// Example:
-		//// Permission id (must not be already used)
-		//$this->rights[$r][0] = 2000;
-		//// Permission label
-		//$this->rights[$r][1] = 'Permision label';
-		//// Permission by default for new user (0/1)
-		//$this->rights[$r][3] = 0;
-		//// In php code, permission will be checked by test
-		//// if ($user->rights->permkey->level1->level2)
-		//$this->rights[$r][4] = 'level1';
-		//// In php code, permission will be checked by test
-		//// if ($user->rights->permkey->level1->level2)
-		//$this->rights[$r][5] = 'level2';
-		//$r++;
 		// Main menu entries
 		$this->menu = array(); // List of menus to add
 		$r = 0;
@@ -267,98 +251,63 @@ class modResource extends DolibarrModules
 			'user'=> 0
 		);
 
-		// Exports
-		$r = 1;
 
-		// Example:
-		//$this->export_code[$r]=$this->rights_class.'_'.$r;
-		//// Translation key (used only if key ExportDataset_xxx_z not found)
-		//$this->export_label[$r]='CustomersInvoicesAndInvoiceLines';
-		//// Condition to show export in list (ie: '$user->id==3').
-		//// Set to 1 to always show when module is enabled.
-		//$this->export_enabled[$r]='1';
-		//$this->export_permission[$r]=array(array("facture","facture","export"));
-		//$this->export_fields_array[$r]=array(
-		//	's.rowid'=>"IdCompany",
-		//	's.nom'=>'CompanyName',
-		//	's.address'=>'Address',
-		//	's.cp'=>'Zip',
-		//	's.ville'=>'Town',
-		//	's.fk_pays'=>'Country',
-		//	's.tel'=>'Phone',
-		//	's.siren'=>'ProfId1',
-		//	's.siret'=>'ProfId2',
-		//	's.ape'=>'ProfId3',
-		//	's.idprof4'=>'ProfId4',
-		//	's.code_compta'=>'CustomerAccountancyCode',
-		//	's.code_compta_fournisseur'=>'SupplierAccountancyCode',
-		//	'f.rowid'=>"InvoiceId",
-		//	'f.facnumber'=>"InvoiceRef",
-		//	'f.datec'=>"InvoiceDateCreation",
-		//	'f.datef'=>"DateInvoice",
-		//	'f.total'=>"TotalHT",
-		//	'f.total_ttc'=>"TotalTTC",
-		//	'f.tva'=>"TotalVAT",
-		//	'f.paye'=>"InvoicePaid",
-		//	'f.fk_statut'=>'InvoiceStatus',
-		//	'f.note'=>"InvoiceNote",
-		//	'fd.rowid'=>'LineId',
-		//	'fd.description'=>"LineDescription",
-		//	'fd.price'=>"LineUnitPrice",
-		//	'fd.tva_tx'=>"LineVATRate",
-		//	'fd.qty'=>"LineQty",
-		//	'fd.total_ht'=>"LineTotalHT",
-		//	'fd.total_tva'=>"LineTotalTVA",
-		//	'fd.total_ttc'=>"LineTotalTTC",
-		//	'fd.date_start'=>"DateStart",
-		//	'fd.date_end'=>"DateEnd",
-		//	'fd.fk_product'=>'ProductId',
-		//	'p.ref'=>'ProductRef'
-		//);
-		//$this->export_entities_array[$r]=array('s.rowid'=>"company",
-		//	's.nom'=>'company',
-		//	's.address'=>'company',
-		//	's.cp'=>'company',
-		//	's.ville'=>'company',
-		//	's.fk_pays'=>'company',
-		//	's.tel'=>'company',
-		//	's.siren'=>'company',
-		//	's.siret'=>'company',
-		//	's.ape'=>'company',
-		//	's.idprof4'=>'company',
-		//	's.code_compta'=>'company',
-		//	's.code_compta_fournisseur'=>'company',
-		//	'f.rowid'=>"invoice",
-		//	'f.facnumber'=>"invoice",
-		//	'f.datec'=>"invoice",
-		//	'f.datef'=>"invoice",
-		//	'f.total'=>"invoice",
-		//	'f.total_ttc'=>"invoice",
-		//	'f.tva'=>"invoice",
-		//	'f.paye'=>"invoice",
-		//	'f.fk_statut'=>'invoice',
-		//	'f.note'=>"invoice",
-		//	'fd.rowid'=>'invoice_line',
-		//	'fd.description'=>"invoice_line",
-		//	'fd.price'=>"invoice_line",
-		//	'fd.total_ht'=>"invoice_line",
-		//	'fd.total_tva'=>"invoice_line",
-		//	'fd.total_ttc'=>"invoice_line",
-		//	'fd.tva_tx'=>"invoice_line",
-		//	'fd.qty'=>"invoice_line",
-		//	'fd.date_start'=>"invoice_line",
-		//	'fd.date_end'=>"invoice_line",
-		//	'fd.fk_product'=>'product',
-		//	'p.ref'=>'product'
-		//);
-		//$this->export_sql_start[$r] = 'SELECT DISTINCT ';
-		//$this->export_sql_end[$r] = ' FROM (' . MAIN_DB_PREFIX . 'facture as f, '
-		//	. MAIN_DB_PREFIX . 'facturedet as fd, ' . MAIN_DB_PREFIX . 'societe as s)';
-		//$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';
-		//$r++;
+		// Exports
+		//--------
+		$r=0;
+		
+		$r++;
+		$this->export_code[$r]=$this->rights_class.'_'.$r;
+		$this->export_label[$r]="ResourceSingular";	// Translation key (used only if key ExportDataset_xxx_z not found)
+		$this->export_permission[$r]=array(array("resource","read"));
+		$this->export_fields_array[$r]=array('r.rowid'=>'IdResource','r.ref'=>'ResourceFormLabel_ref','c.code'=>'ResourceTypeCode','c.label'=>'ResourceType','r.description'=>'ResourceFormLabel_description','r.note_private'=>"NotePrivate",'r.note_public'=>"NotePublic",'r.asset_number'=>'AssetNumber','r.datec'=>"DateCreation",'r.tms'=>"DateLastModification");
+		$this->export_TypeFields_array[$r]=array('r.rowid'=>'List:resource:ref','r.ref'=>'Text','r.asset_number'=>'Text','r.description'=>'Text','c.code'=>'Text','c.label'=>'List:c_type_resource:label','r.datec'=>'Date','r.tms'=>'Date','r.note_private'=>'Text','r.note_public'=>'Text');
+		$this->export_entities_array[$r]=array('r.rowid'=>'resource','r.ref'=>'resource','c.code'=>'resource','c.label'=>'resource','r.description'=>'resource','r.note_private'=>"resource",'r.resource'=>"resource",'r.asset_number'=>'resource','r.datec'=>"resource",'r.tms'=>"resource");
+		$keyforselect='resource'; $keyforelement='resource'; $keyforaliasextra='extra';
+		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
+		
+		$this->export_dependencies_array[$r]=array('resource'=>array('r.rowid')); // We must keep this until the aggregate_array is used. To add unique key if we ask a field of a child to avoid the DISTINCT to discard them.
+		$this->export_sql_start[$r]='SELECT DISTINCT ';
+		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'resource as r ';
+		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_type_resource as c ON c.rowid=r.fk_code_type_resource';
+		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'resource_extrafields as extra ON extra.fk_object = c.rowid';
+		$this->export_sql_end[$r] .=' AND r.entity IN ('.getEntity('resource',1).')';
+		
+
+		// Imports
+		//--------
+		$r=0;
+		
+		// Import list of third parties and attributes
+		$r++;
+		$this->import_code[$r]=$this->rights_class.'_'.$r;
+		$this->import_label[$r]='ImportDataset_resource_1';
+		$this->import_icon[$r]='resource';
+		$this->import_entities_array[$r]=array();		// We define here only fields that use another icon that the one defined into import_icon
+		$this->import_tables_array[$r]=array('r'=>MAIN_DB_PREFIX.'resource','extra'=>MAIN_DB_PREFIX.'resource_extrafields');	// List of tables to insert into (insert done in same order)
+		$this->import_fields_array[$r]=array('r.ref'=>"ResourceFormLabel_ref*",'r.fk_code_type_resource'=>'ResourceTypeCode','r.description'=>'ResourceFormLabel_description','r.note_private'=>"NotePrivate",'r.note_public'=>"NotePublic",'r.asset_number'=>'AssetNumber','r.datec'=>'DateCreation');
+		// Add extra fields
+		$sql="SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'resource' AND entity = ".$conf->entity;
+		$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='extra.'.$obj->name;
+				$fieldlabel=ucfirst($obj->label);
+				$this->import_fields_array[$r][$fieldname]=$fieldlabel.($obj->fieldrequired?'*':'');
+			}
+		}
+		// End add extra fields
+		$this->import_fieldshidden_array[$r]=array('r.fk_user_author'=>'user->id','extra.fk_object'=>'lastrowid-'.MAIN_DB_PREFIX.'resource');    // aliastable.field => ('user->id' or 'lastrowid-'.tableparent)
+		$this->import_convertvalue_array[$r]=array(
+				'r.fk_code_type_resource'=>array('rule'=>'fetchidfromcodeorlabel','classfile'=>'/core/class/ctyperesource.class.php','class'=>'Ctyperesource','method'=>'fetch','dict'=>'DictionaryResourceType'),
+		);
+		//$this->import_convertvalue_array[$r]=array('s.fk_soc'=>array('rule'=>'lastrowid',table='t');
+		$this->import_regex_array[$r]=array('s.datec'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]( [0-9][0-9]:[0-9][0-9]:[0-9][0-9])?$');
+		$this->import_examplevalues_array[$r]=array('r.ref'=>"REF1",'r.fk_code_type_resource'=>"Code from dictionnary resource type",'r.datec'=>"2017-01-01 or 2017-01-01 12:30:00");
+		$this->import_updatekeys_array[$r]=array('r.rf'=>'ResourceFormLabel_ref');
+		
 	}
 
 	/**
diff --git a/htdocs/langs/en_US/resource.lang b/htdocs/langs/en_US/resource.lang
index f95121db351..5a907f6ba23 100644
--- a/htdocs/langs/en_US/resource.lang
+++ b/htdocs/langs/en_US/resource.lang
@@ -29,3 +29,8 @@ RessourceSuccessfullyDeleted=Resource successfully deleted
 DictionaryResourceType=Type of resources
 
 SelectResource=Select resource
+
+IdResource=Id resource
+AssetNumber=Serial number
+ResourceTypeCode=Resource type code
+ImportDataset_resource_1=Resources

From 4efb1ba23a2193df98529da643a8848d30ffbdf7 Mon Sep 17 00:00:00 2001
From: florian HENRY <florian.henry@atm-consulting.fr>
Date: Tue, 18 Apr 2017 15:27:18 +0200
Subject: [PATCH 071/505] update credentials

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

diff --git a/htdocs/core/class/ctyperesource.class.php b/htdocs/core/class/ctyperesource.class.php
index ee899ad6b86..553c0f0d0cd 100644
--- a/htdocs/core/class/ctyperesource.class.php
+++ b/htdocs/core/class/ctyperesource.class.php
@@ -1,9 +1,8 @@
 <?php
 /* Copyright (C) 2007-2012  Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) 2014-2016  Juanjo Menent       <jmenent@2byte.es>
- * Copyright (C) 2015       Florian Henry       <florian.henry@open-concept.pro>
+ * Copyright (C) 2016       Florian Henry       <florian.henry@atm-consulting.fr>
  * Copyright (C) 2015       Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
- * Copyright (C) ---Put here your own copyright and developer email---
  *
  * 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

From 433b9e6fe17840ba401415bff7d4f62d1200cec0 Mon Sep 17 00:00:00 2001
From: fappels <francis.appels@yahoo.com>
Date: Tue, 18 Apr 2017 16:22:39 +0200
Subject: [PATCH 072/505] Fix typo in en_US admin tag

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

diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index be60fc5db7c..068e44d920d 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -286,7 +286,7 @@ FindPackageFromWebSite=Find a package that provides feature you want (for exampl
 DownloadPackageFromWebSite=Download package (for example from official web site %s).
 UnpackPackageInDolibarrRoot=Unpack package files into Dolibarr server directory dedicated to Dolibarr: <b>%s</b>
 UnpackPackageInModulesRoot=Unpack package files into Dolibarr server directory dedicated to modules: <b>%s</b>
-oiSetupIsReadyForUse=Module deployement is finished. You must however enable and setup the module in your application by going on the page to setup modules: <a href="%s">%s</a>.
+SetupIsReadyForUse=Module deployement is finished. You must however enable and setup the module in your application by going on the page to setup modules: <a href="%s">%s</a>.
 NotExistsDirect=The alternative root directory is not defined.<br>
 InfDirAlt=Since version 3 it is possible to define an alternative root directory.This allows you to store, same place, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
 InfDirExample=<br>Then declare it in the file conf.php<br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>*These lines are commented with "#", to uncomment only remove the character.

From 8bb7f858d96c7eca0ab038a760cac031732e22c7 Mon Sep 17 00:00:00 2001
From: David <dvasseur@users.noreply.github.com>
Date: Tue, 18 Apr 2017 16:47:06 +0200
Subject: [PATCH 073/505] fix params order for tha addline() function

please check to last param "$request_data->fk_remise_except", I couldn't find a corresponding parameter name in the addline() function
---
 htdocs/comm/propal/class/api_proposals.class.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/htdocs/comm/propal/class/api_proposals.class.php b/htdocs/comm/propal/class/api_proposals.class.php
index 0440793ceac..ec7ca53357a 100644
--- a/htdocs/comm/propal/class/api_proposals.class.php
+++ b/htdocs/comm/propal/class/api_proposals.class.php
@@ -260,12 +260,9 @@ class Proposals extends DolibarrApi
                         $request_data->localtax2_tx,
                         $request_data->fk_product,
                         $request_data->remise_percent,
-                        $request_data->info_bits,
-                        $request_data->fk_remise_except,
                         'HT',
                         0,
-                        $request_data->date_start,
-                        $request_data->date_end,
+                        $request_data->info_bits,
                         $request_data->product_type,
                         $request_data->rang,
                         $request_data->special_code,
@@ -273,10 +270,14 @@ class Proposals extends DolibarrApi
                         $request_data->fk_fournprice,
                         $request_data->pa_ht,
                         $request_data->label,
+                        $request_data->date_start,
+                        $request_data->date_end,
                         $request_data->array_options,
                         $request_data->fk_unit,
                         $this->element,
                         $request_data->id
+                        // not used anymore ?
+                        // $request_data->fk_remise_except
       );
 
       if ($updateRes > 0) {

From d89a89f8ea5730171c1b84ff3b369d0d44c9ec43 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 18 Apr 2017 17:03:34 +0200
Subject: [PATCH 074/505] Fix error message

---
 htdocs/expedition/card.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 29f2b7fab48..0077338aae5 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -1246,8 +1246,11 @@ if ($action == 'create')
 						print '<td align="left">';
 						if ($line->product_type == 0 || ! empty($conf->global->STOCK_SUPPORTS_SERVICES))
 						{
-    						if ($warehouseObject) 
+							$warehouse_selected_id = GETPOST('entrepot_id','int');							
+    						if ($warehouse_selected_id > 0) 
     						{
+    							$warehouseObject=new Entrepot($db);
+    							$warehouseObject->fetch($warehouse_selected_id);
     							print img_warning().' '.$langs->trans("NoProductToShipFoundIntoStock", $warehouseObject->libelle);
     						}
     						else

From 50210d0dd6dfec45185770d60a047e7fece7015f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 18 Apr 2017 17:04:56 +0200
Subject: [PATCH 075/505] NEW Add tooltip help on shipment weight and volume
 calculation

---
 htdocs/expedition/card.php       | 30 +++++++++++++++++++-----------
 htdocs/langs/en_US/products.lang |  1 +
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index c7893aefd2f..cbe602f7313 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -726,7 +726,9 @@ if ($action == 'create')
             print '<tr><td>';
             print $langs->trans("Weight");
             print '</td><td><input name="weight" size="4" value="'.GETPOST('weight','int').'"> ';
-            print $formproduct->select_measuring_units("weight_units","weight",GETPOST('weight_units','int'));
+            $text=$formproduct->select_measuring_units("weight_units","weight",GETPOST('weight_units','int'));
+            $htmltext=$langs->trans("KeepEmptyForAutoCalculation");
+            print $form->textwithpicto($text, $htmltext);
             print '</td></tr>';
             // Dim
             print '<tr><td>';
@@ -735,7 +737,9 @@ if ($action == 'create')
             print ' x <input name="sizeH" size="4" value="'.GETPOST('sizeH','int').'">';
             print ' x <input name="sizeS" size="4" value="'.GETPOST('sizeS','int').'">';
             print ' ';
-            print $formproduct->select_measuring_units("size_units","size");
+            $text=$formproduct->select_measuring_units("size_units","size");
+            $htmltext=$langs->trans("KeepEmptyForAutoCalculation");
+            print $form->textwithpicto($text, $htmltext);
             print '</td></tr>';
 
             // Delivery method
@@ -865,7 +869,7 @@ if ($action == 'create')
                 if (! empty($line->date_start)) $type=1;
                 if (! empty($line->date_end)) $type=1;
 
-                print "<tr ".$bc[$var].">\n";
+                print '<tr class="oddeven">'."\n";
                 
                 // Product label
                 if ($line->fk_product > 0)  // If predefined product
@@ -1096,10 +1100,10 @@ if ($action == 'create')
                                 $nbofsuggested++;
 						    }
 						}
+						$tmpwarehouseObject=new Entrepot($db);
 						foreach ($product->stock_warehouse as $warehouse_id=>$stock_warehouse)    // $stock_warehouse is product_stock
 						{
-							$warehouseObject=new Entrepot($db);
-							$warehouseObject->fetch($warehouse_id);
+							$tmpwarehouseObject->fetch($warehouse_id);
 							if ($stock_warehouse->real > 0) 
 							{
 								$stock = + $stock_warehouse->real; // Convert it to number
@@ -1122,7 +1126,7 @@ if ($action == 'create')
 									print '<td align="left">';
 									if ($line->product_type == 0 || ! empty($conf->global->STOCK_SUPPORTS_SERVICES))
 									{
-										print $warehouseObject->getNomUrl(0).' ';
+										print $tmpwarehouseObject->getNomUrl(0).' ';
 										 
 										print '<!-- Show details of stock -->';
 										print '('.$stock.')';
@@ -1158,7 +1162,7 @@ if ($action == 'create')
 									{
 										$img=img_warning($langs->trans("StockTooLow"));
 									}
-									print "<tr ".$bc[$var]."><td>";
+									print '<tr class"oddeven"><td>';
 									print "&nbsp; &nbsp; &nbsp; ->
 									<a href=\"".DOL_URL_ROOT."/product/card.php?id=".$value['id']."\">".$value['fullpath']."
 									</a> (".$value['nb'].")</td><td align=\"center\"> ".$value['nb_total']."</td><td>&nbsp</td><td>&nbsp</td>
@@ -1175,7 +1179,7 @@ if ($action == 'create')
 						$subj=0;
 						print '<input name="idl'.$indiceAsked.'" type="hidden" value="'.$line->id.'">';
 						
-						$warehouseObject=new Entrepot($db);
+						$tmpwarehouseObject=new Entrepot($db);
 						$productlotObject=new Productlot($db);
 						// Define nb of lines suggested for this order line
 						$nbofsuggested=0;
@@ -1190,7 +1194,7 @@ if ($action == 'create')
 						}
 						foreach ($product->stock_warehouse as $warehouse_id=>$stock_warehouse) 
 						{
-							$warehouseObject->fetch($warehouse_id);
+							$tmpwarehouseObject->fetch($warehouse_id);
 							if (($stock_warehouse->real > 0) && (count($stock_warehouse->detail_batch))) {
 						        foreach ($stock_warehouse->detail_batch as $dbatch)
 								{
@@ -1203,7 +1207,7 @@ if ($action == 'create')
 									 
 									print '<td align="left">';
 									 
-									print $warehouseObject->getNomUrl(0).' / ';
+									print $tmpwarehouseObject->getNomUrl(0).' / ';
 									 
 									print '<!-- Show details of lot -->';
 									print '<input name="batchl'.$indiceAsked.'_'.$subj.'" type="hidden" value="'.$dbatch->id.'">';
@@ -1223,6 +1227,7 @@ if ($action == 'create')
 								}
 							}
 						}
+						
 					}
 					if ($subj == 0) // Line not shown yet, we show it
 					{
@@ -1246,8 +1251,11 @@ if ($action == 'create')
 						print '<td align="left">';
 						if ($line->product_type == 0 || ! empty($conf->global->STOCK_SUPPORTS_SERVICES))
 						{
-    						if ($warehouseObject) 
+							$warehouse_selected_id = GETPOST('entrepot_id','int');							
+    						if ($warehouse_selected_id > 0) 
     						{
+    							$warehouseObject=new Entrepot($db);
+    							$warehouseObject->fetch($warehouse_selected_id);
     							print img_warning().' '.$langs->trans("NoProductToShipFoundIntoStock", $warehouseObject->libelle);
     						}
     						else
diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang
index 48ced509c47..0ab21cae322 100644
--- a/htdocs/langs/en_US/products.lang
+++ b/htdocs/langs/en_US/products.lang
@@ -198,6 +198,7 @@ MultipriceRules=Price segment rules
 UseMultipriceRules=Use price segment rules (defined into product module setup) to autocalculate prices of all other segment according to first segment
 PercentVariationOver=%% variation over %s
 PercentDiscountOver=%% discount over %s
+KeepEmptyForAutoCalculation=Keep empty to have this calculated automatically from weight or volume of products
 ### composition fabrication
 Build=Produce
 ProductsMultiPrice=Products and prices for each price segment

From cfc31e91e87064cf73931e18e3ff496da7a2ce27 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 18 Apr 2017 18:13:43 +0200
Subject: [PATCH 076/505] FIX overwrapping of weight/volume on rouget template

---
 .../expedition/doc/pdf_rouget.modules.php     | 47 ++++++++++---------
 1 file changed, 24 insertions(+), 23 deletions(-)

diff --git a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
index dab925eef1d..d1697b767bd 100644
--- a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
@@ -69,19 +69,18 @@ class pdf_rouget extends ModelePdfExpedition
 
 		// Define position of columns
 		$this->posxdesc=$this->marge_gauche+1;
-		$this->posxweightvol=$this->page_largeur - $this->marge_droite - 76;
+		$this->posxweightvol=$this->page_largeur - $this->marge_droite - 78;
 		$this->posxqtyordered=$this->page_largeur - $this->marge_droite - 56;
 		$this->posxqtytoship=$this->page_largeur - $this->marge_droite - 28;
 		$this->posxpuht=$this->page_largeur - $this->marge_droite;
 
-		if(!empty($conf->global->MAIN_PDF_SHIPPING_DISPLAY_AMOUNT_HT)) {
+		if (!empty($conf->global->MAIN_PDF_SHIPPING_DISPLAY_AMOUNT_HT)) {
 
-			$this->posxweightvol=$this->page_largeur - $this->marge_droite - 130;
-			$this->posxqtyordered=$this->page_largeur - $this->marge_droite - 100;
-			$this->posxqtytoship=$this->page_largeur - $this->marge_droite - 70;
+			$this->posxweightvol=$this->page_largeur - $this->marge_droite - 118;
+			$this->posxqtyordered=$this->page_largeur - $this->marge_droite - 96;
+			$this->posxqtytoship=$this->page_largeur - $this->marge_droite - 68;
 			$this->posxpuht=$this->page_largeur - $this->marge_droite - 40;
 			$this->posxtotalht=$this->page_largeur - $this->marge_droite - 20;
-
 		}
 
 		$this->posxpicture=$this->posxweightvol - (empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH)?20:$conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH);	// width of images
@@ -344,7 +343,7 @@ class pdf_rouget extends ModelePdfExpedition
 					// Rect prend une longueur en 3eme param
 					$pdf->SetDrawColor(192,192,192);
 					$pdf->Rect($this->marge_gauche, $tab_top-1, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $height_note+1);
-
+					
 					$tab_height = $tab_height - $height_note;
 					$tab_top = $nexY+6;
 				}
@@ -459,16 +458,17 @@ class pdf_rouget extends ModelePdfExpedition
 					$weighttxt='';
 					if ($object->lines[$i]->fk_product_type == 0 && $object->lines[$i]->weight) 
 					{
-					    $weighttxt=$object->lines[$i]->weight*$object->lines[$i]->qty_shipped.' '.measuring_units_string($object->lines[$i]->weight_units,"weight");
+					    $weighttxt=round($object->lines[$i]->weight * $object->lines[$i]->qty_shipped, 5).' '.measuring_units_string($object->lines[$i]->weight_units,"weight");
 					}
 					$voltxt='';
 					if ($object->lines[$i]->fk_product_type == 0 && $object->lines[$i]->volume) 
 					{
-					    $voltxt=$object->lines[$i]->volume*$object->lines[$i]->qty_shipped.' '.measuring_units_string($object->lines[$i]->volume_units?$object->lines[$i]->volume_units:0,"volume");
+					    $voltxt=round($object->lines[$i]->volume * $object->lines[$i]->qty_shipped, 5).' '.measuring_units_string($object->lines[$i]->volume_units?$object->lines[$i]->volume_units:0,"volume");
 					}
-					
-					$pdf->MultiCell(($this->posxqtyordered - $this->posxweightvol), 3, $weighttxt.(($weighttxt && $voltxt)?', ':'').$voltxt,'','C');
-					
+	
+					$pdf->writeHTMLCell($this->posxqtyordered - $this->posxweightvol + 2, 3, $this->posxweightvol - 1, $curY, $weighttxt.(($weighttxt && $voltxt)?'<br>':'').$voltxt, 0, 0, false, true, 'C');
+					//$pdf->MultiCell(($this->posxqtyordered - $this->posxweightvol), 3, $weighttxt.(($weighttxt && $voltxt)?'<br>':'').$voltxt,'','C');
+				
 					if (empty($conf->global->SHIPPING_PDF_HIDE_ORDERED))
 					{
 					   $pdf->SetXY($this->posxqtyordered, $curY);
@@ -479,27 +479,27 @@ class pdf_rouget extends ModelePdfExpedition
 					$pdf->MultiCell(($this->posxpuht - $this->posxqtytoship), 3, $object->lines[$i]->qty_shipped,'','C');
 
 					if(!empty($conf->global->MAIN_PDF_SHIPPING_DISPLAY_AMOUNT_HT)) 
-{
+					{
 						$pdf->SetXY($this->posxpuht, $curY);
 						$pdf->MultiCell(($this->posxtotalht - $this->posxpuht-1), 3, price($object->lines[$i]->subprice, 0, $outputlangs),'','R');
 
 						$pdf->SetXY($this->posxtotalht, $curY);
 						$pdf->MultiCell(($this->page_largeur - $this->marge_droite - $this->posxtotalht), 3, price($object->lines[$i]->total_ht, 0, $outputlangs),'','R');
-
 					}
 
+					$nexY+=3;
+					if ($weighttxt && $voltxt) $nexY+=2;
+					
 					// Add line
 					if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1))
 					{
 						$pdf->setPage($pageposafter);
 						$pdf->SetLineStyle(array('dash'=>'1,1','color'=>array(80,80,80)));
 						//$pdf->SetDrawColor(190,190,200);
-						$pdf->line($this->marge_gauche, $nexY+1, $this->page_largeur - $this->marge_droite, $nexY+1);
+						$pdf->line($this->marge_gauche, $nexY-1, $this->page_largeur - $this->marge_droite, $nexY-1);
 						$pdf->SetLineStyle(array('dash'=>0));
 					}
 
-					$nexY+=2;    // Passe espace entre les lignes
-
 					// Detect if some page were added automatically and output _tableau for past pages
 					while ($pagenb < $pageposafter)
 					{
@@ -650,7 +650,7 @@ class pdf_rouget extends ModelePdfExpedition
     	$pdf->SetXY($this->posxqtytoship, $tab2_top + $tab2_hl * $index);
     	$pdf->MultiCell($this->posxpuht - $this->posxqtytoship, $tab2_hl, $totalToShip, 0, 'C', 1);
         
-	if(!empty($conf->global->MAIN_PDF_SHIPPING_DISPLAY_AMOUNT_HT)) {
+		if(!empty($conf->global->MAIN_PDF_SHIPPING_DISPLAY_AMOUNT_HT)) {
 
 	    	$pdf->SetXY($this->posxpuht, $tab2_top + $tab2_hl * $index);
 	    	$pdf->MultiCell($this->posxtotalht - $this->posxpuht, $tab2_hl, '', 0, 'C', 1);
@@ -658,20 +658,20 @@ class pdf_rouget extends ModelePdfExpedition
 	    	$pdf->SetXY($this->posxtotalht, $tab2_top + $tab2_hl * $index);
 	    	$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxtotalht, $tab2_hl, price($object->total_ht, 0, $outputlangs), 0, 'C', 1);
 
-	}
+		}
     	 
 		// Total Weight
 		if ($totalWeighttoshow)
 		{
-    		$pdf->SetXY($col2x-20, $tab2_top + $tab2_hl * $index);
-    		$pdf->MultiCell($largcol2+20, $tab2_hl, $totalWeighttoshow, 0, 'R', 1);
+    		$pdf->SetXY($this->posxweightvol, $tab2_top + $tab2_hl * $index);
+    		$pdf->MultiCell(($this->posxqtyordered - $this->posxweightvol), $tab2_hl, $totalWeighttoshow, 0, 'C', 1);
     		
     		$index++;
 		}
 		if ($totalVolumetoshow)
 		{
-    		$pdf->SetXY($col2x-20, $tab2_top + $tab2_hl * $index);
-    		$pdf->MultiCell($largcol2+20, $tab2_hl, $totalVolumetoshow, 0, 'R', 1);
+    		$pdf->SetXY($this->posxweightvol, $tab2_top + $tab2_hl * $index);
+    		$pdf->MultiCell(($this->posxqtyordered - $this->posxweightvol), $tab2_hl, $totalVolumetoshow, 0, 'C', 1);
 		
 		    $index++;
 		}
@@ -949,6 +949,7 @@ class pdf_rouget extends ModelePdfExpedition
 			$pdf->SetFillColor(230,230,230);
 			$pdf->MultiCell($widthrecbox, $hautcadre, "", 0, 'R', 1);
 			$pdf->SetTextColor(0,0,60);
+			$pdf->SetFillColor(255,255,255);
 			
 			// Show sender name
 			$pdf->SetXY($posx+2,$posy+3);

From 529ae1fa92b4da7f3baae2cc3a13bfdb4f8f1dc4 Mon Sep 17 00:00:00 2001
From: Philippe Grand <philippe.grand@atoo-net.com>
Date: Wed, 19 Apr 2017 10:01:43 +0200
Subject: [PATCH 077/505] Update propal.class.php

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

diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 9aad218e66f..46c6a55cf2f 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -3135,7 +3135,7 @@ class Propal extends CommonObject
             {
             	$prodid = mt_rand(1, $num_prods);
             	$line->fk_product=$prodids[$prodid];
-				$line->product_ref='SPECIMEN';
+		$line->product_ref='SPECIMEN';
             }
 
             $this->lines[$xnbp]=$line;

From 213e0d28708d7997e8eec1653dfc3a1db2fb27d6 Mon Sep 17 00:00:00 2001
From: florian HENRY <florian.henry@atm-consulting.fr>
Date: Wed, 19 Apr 2017 14:49:12 +0200
Subject: [PATCH 078/505] fix travis

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

diff --git a/htdocs/core/class/ctyperesource.class.php b/htdocs/core/class/ctyperesource.class.php
index 553c0f0d0cd..1de616210e4 100644
--- a/htdocs/core/class/ctyperesource.class.php
+++ b/htdocs/core/class/ctyperesource.class.php
@@ -154,7 +154,8 @@ class Ctyperesource
 	 * Load object in memory from the database
 	 *
 	 * @param int    $id  Id object
-	 * @param string $ref Ref
+	 * @param string $code code
+	 * @param string $label Label
 	 *
 	 * @return int <0 if KO, 0 if not found, >0 if OK
 	 */

From b7f1e74f6f347697bb4b1e7efe3723cf0701f7d4 Mon Sep 17 00:00:00 2001
From: BENKE Charlie <charles.fr@benke.fr>
Date: Thu, 20 Apr 2017 10:27:44 +0200
Subject: [PATCH 079/505] New SITUATION_DISPLAY_DIFF_ON_PDF feature
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

allow to display or
the progress situation percent value
the diférential situation percent value
---
 htdocs/core/lib/pdf.lib.php | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index 282bdec690e..d1a5e64dce2 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -1808,8 +1808,17 @@ function pdf_getlineprogress($object, $i, $outputlangs, $hidedetails = 0, $hookm
 	}
 	if (empty($reshook))
 	{
-        if ($object->lines[$i]->special_code == 3) return '';
-	    if (empty($hidedetails) || $hidedetails > 1) $result.=$object->lines[$i]->situation_percent . '%';
+        	if ($object->lines[$i]->special_code == 3) return '';
+		if (empty($hidedetails) || $hidedetails > 1)
+		{
+			if($conf->global->SITUATION_DISPLAY_DIFF_ON_PDF)
+			{
+			 	$prev_progress = $object->lines[$i]->get_prev_progress($object->id);
+			 	$result = ($prev_progress - $object->lines[$i]->situation_percent) . '%';
+			}
+			else
+				$result = $object->lines[$i]->situation_percent . '%';
+	  	}
 	}
 	return $result;
 }

From 1792ff2d3b77ef56e80fa23bb84a767dfb9b799a Mon Sep 17 00:00:00 2001
From: BENKE Charlie <charles.fr@benke.fr>
Date: Fri, 21 Apr 2017 09:41:08 +0200
Subject: [PATCH 080/505] oups inverted value

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

diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index d1a5e64dce2..c490a2f66c5 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -1814,7 +1814,7 @@ function pdf_getlineprogress($object, $i, $outputlangs, $hidedetails = 0, $hookm
 			if($conf->global->SITUATION_DISPLAY_DIFF_ON_PDF)
 			{
 			 	$prev_progress = $object->lines[$i]->get_prev_progress($object->id);
-			 	$result = ($prev_progress - $object->lines[$i]->situation_percent) . '%';
+			 	$result = ( $object->lines[$i]->situation_percent - $prev_progress) . '%';
 			}
 			else
 				$result = $object->lines[$i]->situation_percent . '%';

From 54256773c558f5599a2111c6010fc1ab1a8f6335 Mon Sep 17 00:00:00 2001
From: hugome <hugomeyronneinc@gmail.com>
Date: Fri, 21 Apr 2017 10:27:48 +0200
Subject: [PATCH 081/505] FIX: length_accounta return variable name

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

diff --git a/htdocs/core/lib/accounting.lib.php b/htdocs/core/lib/accounting.lib.php
index 8ec0713b01a..4d32aa899b3 100644
--- a/htdocs/core/lib/accounting.lib.php
+++ b/htdocs/core/lib/accounting.lib.php
@@ -151,7 +151,7 @@ function length_accounta($accounta)
 
 	if ($accounta < 0 || empty($accounta)) return '';
 	
-	if (! empty($conf->global->ACCOUNTING_MANAGE_ZERO)) return $account;
+	if (! empty($conf->global->ACCOUNTING_MANAGE_ZERO)) return $accounta;
 	
 	$a = $conf->global->ACCOUNTING_LENGTH_AACCOUNT;
 	if (! empty($a)) {

From 3b626b75c42a1ad6ce05b5dcbf650bdd0a72e0c5 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Sat, 22 Apr 2017 06:58:44 +0200
Subject: [PATCH 082/505] Update works

---
 htdocs/{stripe => core}/lib/stripe.lib.php |  0
 htdocs/core/modules/modStripe.class.php    |  4 +-
 htdocs/stripe/checkout.php                 | 23 ++++---
 htdocs/stripe/config.php                   | 25 ++++----
 htdocs/stripe/lib/index.html               |  0
 htdocs/stripe/paymnt_link.php              | 72 ----------------------
 6 files changed, 26 insertions(+), 98 deletions(-)
 rename htdocs/{stripe => core}/lib/stripe.lib.php (100%)
 delete mode 100644 htdocs/stripe/lib/index.html
 delete mode 100644 htdocs/stripe/paymnt_link.php

diff --git a/htdocs/stripe/lib/stripe.lib.php b/htdocs/core/lib/stripe.lib.php
similarity index 100%
rename from htdocs/stripe/lib/stripe.lib.php
rename to htdocs/core/lib/stripe.lib.php
diff --git a/htdocs/core/modules/modStripe.class.php b/htdocs/core/modules/modStripe.class.php
index 4b498629017..4f4b15fa0a4 100644
--- a/htdocs/core/modules/modStripe.class.php
+++ b/htdocs/core/modules/modStripe.class.php
@@ -73,8 +73,8 @@ class modStripe extends DolibarrModules
         // Dependencies
         $this->depends = array();		// List of modules id that must be enabled if this module is enabled
         $this->requiredby = array();	// List of modules id to disable if this one is disabled
-        $this->phpmin = array(4,1);					// Minimum version of PHP required by module
-        $this->need_dolibarr_version = array(2,6);	// Minimum version of Dolibarr required by module
+        $this->phpmin = array(5,3);					// Minimum version of PHP required by module
+        $this->need_dolibarr_version = array(5,0);	// Minimum version of Dolibarr required by module
         $this->langfiles = array("stripe");
 
         // Constants
diff --git a/htdocs/stripe/checkout.php b/htdocs/stripe/checkout.php
index 0989d55b76f..f7f547afae9 100644
--- a/htdocs/stripe/checkout.php
+++ b/htdocs/stripe/checkout.php
@@ -1,6 +1,6 @@
 <?php
-/* <one line to give the program's name and a brief idea of what it does.>
- * Copyright (C) <2016> SaaSprov.ma  <saasprov@gmail.com>
+/* Copyright (C) 2017		Alexandre Spangaro		<aspangaro@zendsi.com>
+ * Copyright (C) 2017		Saasprov				<saasprov@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
@@ -16,12 +16,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
+require '../main.inc.php';
+ 
 // Load Dolibarr environment
-
-
-require_once('config.php');
-require_once('stripe/init.php');
+require_once DOL_DOCUMENT_ROOT.'/stripe/config.php');
+require_once DOL_DOCUMENT_ROOT.'/includes/stripe/init.php');
 
 define("NOLOGIN",1);
 define("NOCSRFCHECK",1);
@@ -30,8 +29,8 @@ $langs->load("main");
 $langs->load("other");
 $langs->load("stripe");
 
-$SOURCE=GETPOST("source",'alpha');
-$ref=$REF=GETPOST('ref','alpha');
+$source=GETPOST("source",'alpha');
+$ref=GETPOST('ref','alpha');
 
 $form = new Form($db);
 
@@ -40,18 +39,18 @@ $form = new Form($db);
  *
  * @return	void
  */
-function llxHeader() { }
+function llxHeader() {}
 /**
  * Footer empty
  *
  * @return	void
  */
-function llxFooter() { }
+function llxFooter() {}
 
 $invoice = null;
 
 // Payment on customer invoice
-if (GETPOST("source") == 'invoice')
+if ($source == 'invoice')
 {
 	$found=true;
 	$langs->load("bills");
diff --git a/htdocs/stripe/config.php b/htdocs/stripe/config.php
index 9cc083051ec..78d394feb53 100644
--- a/htdocs/stripe/config.php
+++ b/htdocs/stripe/config.php
@@ -1,6 +1,6 @@
 <?php
-/* <one line to give the program's name and a brief idea of what it does.>
- * Copyright (C) <2016>  <jamelbaz@gmail.com>
+/* Copyright (C) 2017		Alexandre Spangaro		<aspangaro@zendsi.com>
+ * Copyright (C) 2017		Saasprov				<saasprov@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
@@ -16,21 +16,22 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+/**
+*  \file       stripe/config.php
+*  \ingroup    Stripe
+*  \brief      Page to move config in api
+*/
 
-// Load Dolibarr environment
-if (false === (@include '../main.inc.php')) {  // From htdocs directory
-	require '../../main.inc.php'; // From "custom" directory
-}
+require '../main.inc.php';
 
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 dol_include_once('/stripe/lib/stripe.lib.php');
-require_once('stripe/init.php');
+require_once DOL_DOCUMENT_ROOT.'/includes/stripe/init.php');
 
-//use \Stripe\Stripe as Stripe;
+//use \includes\stripe as stripe;
 $stripe = array(
-  "secret_key"      => $conf->global->TEST_SECRET_KEY,
-  "publishable_key" => $conf->global->TEST_PUBLISHABLE_KEY
+  "secret_key"      => $conf->global->STRIPE_TEST_SECRET_KEY,
+  "publishable_key" => $conf->global->STRIPE_TEST_PUBLISHABLE_KEY
 );
 
-\Stripe\Stripe::setApiKey($stripe['secret_key']);
-?>
\ No newline at end of file
+\includes\stripe::setApiKey($stripe['secret_key']);
\ No newline at end of file
diff --git a/htdocs/stripe/lib/index.html b/htdocs/stripe/lib/index.html
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/htdocs/stripe/paymnt_link.php b/htdocs/stripe/paymnt_link.php
deleted file mode 100644
index 68adbf47a3c..00000000000
--- a/htdocs/stripe/paymnt_link.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-/* Copyright (C) 2007-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) ---Put here your own copyright and developer email---
- *
- * 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/>.
- */
-
-
-// Load Dolibarr environment
-if (false === (@include '../main.inc.php')) {  // From htdocs directory
-	require '../../main.inc.php'; // From "custom" directory
-}
-require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
-
-// Load traductions files requiredby by page
-$langs->load("mymodule");
-$langs->load("other");
-
-// Get parameters
-$id = GETPOST('id', 'int'); // For backward compatibility
-
-$object = new Facture($db);
-// Load object
-if ($id > 0 || ! empty($ref)) {
-	$ret = $object->fetch($id, $ref, '', '', $conf->global->INVOICE_USE_SITUATION);
-}
-
-
-
-
-/***************************************************
-* VIEW
-*
-* Put here all code to build page
-****************************************************/
-
-llxHeader('','StripePaymentLink','');
-
-
-// Part to show record
-if ($id)
-{
-	print load_fiche_titre($langs->trans("StripePaymentLink"));
-    
-	dol_fiche_head();
-	
-	$link = $dolibarr_main_url_root . '/custom/stripe/checkout.php?source=invoice&ref=' . $object->ref;
-	print '<table class="border centpercent">'."\n";
-	print '<tr><td class="fieldrequired">'.$langs->trans("PaymentLink").'</td><td><input class="flat" type="text" size="100%" name="label" value="'.$link.'"></td></tr>';
-	// LIST_OF_TD_LABEL_FIELDS_VIEW
-	print '</table>';
-	
-	dol_fiche_end();
-
-
-
-
-}
-
-llxFooter();
-$db->close();

From fbdfbed02c0a77175846139c31ba5cc67e472f63 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 23 Apr 2017 02:44:38 +0200
Subject: [PATCH 083/505] Add code to prepare a generic payment solution

---
 htdocs/public/payment/index.php      |   28 +
 htdocs/public/payment/newpayment.php | 1002 ++++++++++++++++++++++++++
 htdocs/public/payment/paymentko.php  |  146 ++++
 htdocs/public/payment/paymentok.php  |  308 ++++++++
 4 files changed, 1484 insertions(+)
 create mode 100644 htdocs/public/payment/index.php
 create mode 100644 htdocs/public/payment/newpayment.php
 create mode 100644 htdocs/public/payment/paymentko.php
 create mode 100644 htdocs/public/payment/paymentok.php

diff --git a/htdocs/public/payment/index.php b/htdocs/public/payment/index.php
new file mode 100644
index 00000000000..cc491b860d3
--- /dev/null
+++ b/htdocs/public/payment/index.php
@@ -0,0 +1,28 @@
+<?php
+/* Copyright (C) 2009 Laurent Destailleur  <eldy@users.sourceforge.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *     	\file       htdocs/public/payment/index.php
+ *		\ingroup    core
+ *		\brief      A redirect page to an error
+ *		\author	    Laurent Destailleur
+ */
+
+require '../../master.inc.php';
+
+header("Location: ".DOL_URL_ROOT.'/public/error-404.php');
+
diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
new file mode 100644
index 00000000000..4c4b6863aaa
--- /dev/null
+++ b/htdocs/public/payment/newpayment.php
@@ -0,0 +1,1002 @@
+<?php
+/* Copyright (C) 2001-2002	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2006-2012	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2009-2012	Regis Houssin			<regis.houssin@capnetworks.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * For test: https://developer.paypal.com/
+ */
+
+/**
+ *     	\file       htdocs/public/payment/newpayment.php
+ *		\ingroup    core
+ *		\brief      File to offer a way to make a payment for a particular Dolibarr entity
+ *		\author	    Laurent Destailleur
+ */
+
+define("NOLOGIN",1);		// This means this output page does not require to be logged.
+define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.
+
+// For MultiCompany module.
+// Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
+// TODO This should be useless. Because entity must be retreive from object ref and not from url.
+$entity=(! empty($_GET['entity']) ? (int) $_GET['entity'] : (! empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
+if (is_numeric($entity)) define("DOLENTITY", $entity);
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+
+// Security check
+//if (empty($conf->paypal->enabled)) accessforbidden('',0,0,1);
+
+$langs->load("main");
+$langs->load("other");
+$langs->load("dict");
+$langs->load("bills");
+$langs->load("companies");
+$langs->load("errors");
+
+// Input are:
+// type ('invoice','order','contractline'),
+// id (object id),
+// amount (required if id is empty),
+// tag (a free text, required if type is empty)
+// currency (iso code)
+
+$suffix=GETPOST("suffix",'alpha');
+$amount=price2num(GETPOST("amount"));
+if (! GETPOST("currency",'alpha')) $currency=$conf->currency;
+else $currency=GETPOST("currency",'alpha');
+
+if (! GETPOST("action"))
+{
+    if (! GETPOST("amount") && ! GETPOST("source"))
+    {
+    	dol_print_error('',$langs->trans('ErrorBadParameters')." - amount or source");
+    	exit;
+    }
+    if (is_numeric($amount) && ! GETPOST("tag") && ! GETPOST("source"))
+    {
+    	dol_print_error('',$langs->trans('ErrorBadParameters')." - tag or source");
+    	exit;
+    }
+    if (GETPOST("source") && ! GETPOST("ref"))
+    {
+    	dol_print_error('',$langs->trans('ErrorBadParameters')." - ref");
+    	exit;
+    }
+}
+
+// Define $urlwithroot
+//$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
+//$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
+$urlwithroot=DOL_MAIN_URL_ROOT;						// This is to use same domain name than current
+
+$urlok=$urlwithroot.'/public/payment/paymentok.php?';
+$urlko=$urlwithroot.'/public/payment/paymentko.php?';
+
+// Complete urls for post treatment
+$SOURCE=GETPOST("source",'alpha');
+$ref=$REF=GETPOST('ref','alpha');
+$TAG=GETPOST("tag",'alpha');
+$FULLTAG=GETPOST("fulltag",'alpha');		// fulltag is tag with more informations
+$SECUREKEY=GETPOST("securekey");	        // Secure key
+
+if (! empty($SOURCE))
+{
+    $urlok.='source='.urlencode($SOURCE).'&';
+    $urlko.='source='.urlencode($SOURCE).'&';
+}
+if (! empty($REF))
+{
+    $urlok.='ref='.urlencode($REF).'&';
+    $urlko.='ref='.urlencode($REF).'&';
+}
+if (! empty($TAG))
+{
+    $urlok.='tag='.urlencode($TAG).'&';
+    $urlko.='tag='.urlencode($TAG).'&';
+}
+if (! empty($FULLTAG))
+{
+    $urlok.='fulltag='.urlencode($FULLTAG).'&';
+    $urlko.='fulltag='.urlencode($FULLTAG).'&';
+}
+if (! empty($SECUREKEY))
+{
+    $urlok.='securekey='.urlencode($SECUREKEY).'&';
+    $urlko.='securekey='.urlencode($SECUREKEY).'&';
+}
+if (! empty($entity))
+{
+	$urlok.='entity='.urlencode($entity).'&';
+	$urlko.='entity='.urlencode($entity).'&';
+}
+$urlok=preg_replace('/&$/','',$urlok);  // Remove last &
+$urlko=preg_replace('/&$/','',$urlko);  // Remove last &
+
+$paymentmethod=array();
+
+// Check parameters
+if (! empty($conf->paypal->enabled))
+{
+	$langs->load("paypal");
+	
+	require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypal.lib.php';
+	require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypalfunctions.lib.php';
+	
+	$PAYPAL_API_OK="";
+	if ($urlok) $PAYPAL_API_OK=$urlok;
+	$PAYPAL_API_KO="";
+	if ($urlko) $PAYPAL_API_KO=$urlko;
+	if (empty($PAYPAL_API_USER))
+	{
+	    dol_print_error('',"Paypal setup param PAYPAL_API_USER not defined");
+	    return -1;
+	}
+	if (empty($PAYPAL_API_PASSWORD))
+	{
+	    dol_print_error('',"Paypal setup param PAYPAL_API_PASSWORD not defined");
+	    return -1;
+	}
+	if (empty($PAYPAL_API_SIGNATURE))
+	{
+	    dol_print_error('',"Paypal setup param PAYPAL_API_SIGNATURE not defined");
+	    return -1;
+	}
+	
+	// Check security token
+	$valid=true;
+	if (! empty($conf->global->PAYPAL_SECURITY_TOKEN))
+	{
+	    if (! empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE))
+	    {
+		    if ($SOURCE && $REF) $token = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . $SOURCE . $REF, 2);    // Use the source in the hash to avoid duplicates if the references are identical
+		    else $token = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
+	    }
+	    else
+	    {
+	        $token = $conf->global->PAYPAL_SECURITY_TOKEN;
+	    }
+		if ($SECUREKEY != $token) $valid=false;
+	
+		if (! $valid)
+		{
+	    	print '<div class="error">Bad value for key.</div>';
+		    //print 'SECUREKEY='.$SECUREKEY.' token='.$token.' valid='.$valid;
+	    	exit;
+		}
+		else
+		{
+			$paymentmethod[]='paypal';
+		}
+	}
+}
+if (! empty($conf->paybox->enabled))
+{
+	$langs->load("paybox");
+	
+}
+// TODO Add check of other payment mode
+
+
+if (empty($paymentmethod)) accessforbidden('', 0, 0, 1);
+
+
+
+/*
+ * Actions
+ */
+
+if (GETPOST("action") == 'dopayment')
+{
+	if (GETPOST('paymentmethod') == 'paypal')
+	{ 
+		$PAYPAL_API_PRICE=price2num(GETPOST("newamount"),'MT');
+	    $PAYPAL_PAYMENT_TYPE='Sale';
+	
+	    $shipToName=GETPOST("shipToName");
+	    $shipToStreet=GETPOST("shipToStreet");
+	    $shipToCity=GETPOST("shipToCity");
+	    $shipToState=GETPOST("shipToState");
+	    $shipToCountryCode=GETPOST("shipToCountryCode");
+	    $shipToZip=GETPOST("shipToZip");
+	    $shipToStreet2=GETPOST("shipToStreet2");
+	    $phoneNum=GETPOST("phoneNum");
+	    $email=GETPOST("email");
+	    $desc=GETPOST("desc");
+	
+		$mesg='';
+		if (empty($PAYPAL_API_PRICE) || ! is_numeric($PAYPAL_API_PRICE))   $mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Amount"));
+		//elseif (empty($EMAIL))          $mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("YourEMail"));
+		//elseif (! isValidEMail($EMAIL)) $mesg=$langs->trans("ErrorBadEMail",$EMAIL);
+		elseif (empty($FULLTAG))        $mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("PaymentCode"));
+	
+	    //var_dump($_POST);
+		if (empty($mesg))
+		{
+			dol_syslog("newpayment.php call paypal api and do redirect", LOG_DEBUG);
+	
+			// Other
+			$PAYPAL_API_DEVISE="USD";
+			//if ($currency == 'EUR') $PAYPAL_API_DEVISE="EUR";
+			//if ($currency == 'USD') $PAYPAL_API_DEVISE="USD";
+	        if (! empty($currency)) $PAYPAL_API_DEVISE=$currency;
+	
+		    dol_syslog("Submit Paypal form", LOG_DEBUG);
+		    dol_syslog("PAYPAL_API_USER: $PAYPAL_API_USER", LOG_DEBUG);
+		    //dol_syslog("PAYPAL_API_PASSWORD: $PAYPAL_API_PASSWORD", LOG_DEBUG);  // No password into log files
+		    dol_syslog("PAYPAL_API_SIGNATURE: $PAYPAL_API_SIGNATURE", LOG_DEBUG);
+		    dol_syslog("PAYPAL_API_SANDBOX: $PAYPAL_API_SANDBOX", LOG_DEBUG);
+		    dol_syslog("PAYPAL_API_OK: $PAYPAL_API_OK", LOG_DEBUG);
+		    dol_syslog("PAYPAL_API_KO: $PAYPAL_API_KO", LOG_DEBUG);
+		    dol_syslog("PAYPAL_API_PRICE: $PAYPAL_API_PRICE", LOG_DEBUG);
+		    dol_syslog("PAYPAL_API_DEVISE: $PAYPAL_API_DEVISE", LOG_DEBUG);
+	        dol_syslog("shipToName: $shipToName", LOG_DEBUG);
+	        dol_syslog("shipToStreet: $shipToStreet", LOG_DEBUG);
+	        dol_syslog("shipToCity: $shipToCity", LOG_DEBUG);
+	        dol_syslog("shipToState: $shipToState", LOG_DEBUG);
+	        dol_syslog("shipToCountryCode: $shipToCountryCode", LOG_DEBUG);
+	        dol_syslog("shipToZip: $shipToZip", LOG_DEBUG);
+	        dol_syslog("shipToStreet2: $shipToStreet2", LOG_DEBUG);
+	        dol_syslog("phoneNum: $phoneNum", LOG_DEBUG);
+	        dol_syslog("email: $email", LOG_DEBUG);
+	        dol_syslog("desc: $desc", LOG_DEBUG);
+	
+	        dol_syslog("SCRIPT_URI: ".(empty($_SERVER["SCRIPT_URI"])?'':$_SERVER["SCRIPT_URI"]), LOG_DEBUG);	// If defined script uri must match domain of PAYPAL_API_OK and PAYPAL_API_KO
+		    //$_SESSION["PaymentType"]=$PAYPAL_PAYMENT_TYPE;
+		    //$_SESSION["currencyCodeType"]=$PAYPAL_API_DEVISE;
+		    //$_SESSION["Payment_Amount"]=$PAYPAL_API_PRICE;
+	
+		    // A redirect is added if API call successfull
+	        print_paypal_redirect($PAYPAL_API_PRICE,$PAYPAL_API_DEVISE,$PAYPAL_PAYMENT_TYPE,$PAYPAL_API_OK,$PAYPAL_API_KO, $FULLTAG);
+	
+			exit;
+		}
+	}
+}
+
+
+/*
+ * View
+ */
+
+llxHeaderPaypal($langs->trans("PaymentForm"));
+
+if (! empty($conf->paypal->enabled))
+{
+	if (! empty($PAYPAL_API_SANDBOX))
+	{
+		dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode'),'','warning');
+	}
+
+	// Common variables
+	$creditor=$mysoc->name;
+	$paramcreditor='PAYPAL_CREDITOR_'.$suffix;
+	if (! empty($conf->global->$paramcreditor)) $creditor=$conf->global->$paramcreditor;
+	else if (! empty($conf->global->PAYPAL_CREDITOR)) $creditor=$conf->global->PAYPAL_CREDITOR;
+}
+
+print '<span id="dolpaymentspan"></span>'."\n";
+print '<div class="center">'."\n";
+print '<form id="dolpaymentform" class="center" name="paymentform" action="'.$_SERVER["PHP_SELF"].'" method="POST">'."\n";
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'."\n";
+print '<input type="hidden" name="action" value="dopayment">'."\n";
+print '<input type="hidden" name="tag" value="'.GETPOST("tag",'alpha').'">'."\n";
+print '<input type="hidden" name="suffix" value="'.GETPOST("suffix",'alpha').'">'."\n";
+print '<input type="hidden" name="securekey" value="'.$SECUREKEY.'">'."\n";
+print '<input type="hidden" name="entity" value="'.$entity.'" />';
+print "\n";
+print '<!-- Form to send a payment -->'."\n";
+if (! empty($conf->paypal->enabled))
+{
+	print '<!-- PAYPAL_API_SANDBOX = '.$conf->global->PAYPAL_API_SANDBOX.' -->'."\n";
+	print '<!-- PAYPAL_API_INTEGRAL_OR_PAYPALONLY = '.$conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY.' -->'."\n";
+	print '<!-- creditor = '.$creditor.' -->'."\n";
+}
+print '<!-- urlok = '.$urlok.' -->'."\n";
+print '<!-- urlko = '.$urlko.' -->'."\n";
+print "\n";
+
+print '<table id="dolpaymenttable" summary="Payment form" class="center">'."\n";
+
+// Show logo (search order: logo defined by PAYBOX_LOGO_suffix, then PAYBOX_LOGO, then small company logo, large company logo, theme logo, common logo)
+$width=0;
+// Define logo and logosmall
+$logosmall=$mysoc->logo_small;
+$logo=$mysoc->logo;
+$paramlogo='PAYMENT_LOGO_'.$suffix;
+if (! empty($conf->global->$paramlogo)) $logosmall=$conf->global->$paramlogo;
+else if (! empty($conf->global->PAYMENT_LOGO)) $logosmall=$conf->global->PAYBOX_LOGO;
+//print '<!-- Show logo (logosmall='.$logosmall.' logo='.$logo.') -->'."\n";
+// Define urllogo
+$urllogo='';
+if (! empty($logosmall) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$logosmall))
+{
+	$urllogo=DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode('thumbs/'.$logosmall);
+}
+elseif (! empty($logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$logo))
+{
+	$urllogo=DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode($logo);
+	$width=96;
+}
+// Output html code for logo
+if ($urllogo)
+{
+	print '<tr>';
+	print '<td align="center"><img id="dolpaymentlogo" title="'.$title.'" src="'.$urllogo.'"';
+	if ($width) print ' width="'.$width.'"';
+	print '></td>';
+	print '</tr>'."\n";
+}
+
+// Output introduction text
+$text='';
+if (! empty($conf->global->PAYPAL_NEWFORM_TEXT))
+{
+    $langs->load("members");
+    if (preg_match('/^\((.*)\)$/',$conf->global->PAYPAL_NEWFORM_TEXT,$reg)) $text.=$langs->trans($reg[1])."<br>\n";
+    else $text.=$conf->global->PAYPAL_NEWFORM_TEXT."<br>\n";
+    $text='<tr><td align="center"><br>'.$text.'<br></td></tr>'."\n";
+}
+if (empty($text))
+{
+    $text.='<tr><td class="textpublicpayment"><br><strong>'.$langs->trans("WelcomeOnPaymentPage").'</strong><br></td></tr>'."\n";
+    $text.='<tr><td class="textpublicpayment"><br>'.$langs->trans("ThisScreenAllowsYouToPay",$creditor).'<br><br></td></tr>'."\n";
+}
+print $text;
+
+// Output payment summary form
+print '<tr><td align="center">';
+print '<table with="100%" id="tablepublicpayment">';
+print '<tr class="liste_total"><td align="left" colspan="2">'.$langs->trans("ThisIsInformationOnPayment").' :</td></tr>'."\n";
+
+$found=false;
+$error=0;
+$var=false;
+
+// Free payment
+if (! GETPOST("source") && $valid)
+{
+	$found=true;
+	$tag=GETPOST("tag");
+	$fulltag=$tag;
+
+	// Creditor
+	
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
+    print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
+    print '<input type="hidden" name="creditor" value="'.$creditor.'">';
+    print '</td></tr>'."\n";
+
+	// Amount
+	
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
+	if (empty($amount)) print ' ('.$langs->trans("ToComplete").')';
+	print '</td><td class="CTableRow'.($var?'1':'2').'">';
+	if (empty($amount) || ! is_numeric($amount))
+	{
+        print '<input type="hidden" name="amount" value="'.GETPOST("amount",'int').'">';
+	    print '<input class="flat" size=8 type="text" name="newamount" value="'.GETPOST("newamount","int").'">';
+	}
+	else {
+		print '<b>'.price($amount).'</b>';
+        print '<input type="hidden" name="amount" value="'.$amount.'">';
+		print '<input type="hidden" name="newamount" value="'.$amount.'">';
+	}
+	// Currency
+	print ' <b>'.$langs->trans("Currency".$currency).'</b>';
+	print '<input type="hidden" name="currency" value="'.$currency.'">';
+	print '</td></tr>'."\n";
+
+	// Tag
+	
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
+	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
+	print '<input type="hidden" name="tag" value="'.$tag.'">';
+	print '<input type="hidden" name="fulltag" value="'.$fulltag.'">';
+	print '</td></tr>'."\n";
+
+    // We do not add fields shipToName, shipToStreet, shipToCity, shipToState, shipToCountryCode, shipToZip, shipToStreet2, phoneNum
+    // as they don't exists (buyer is unknown, tag is free).
+}
+
+
+// Payment on customer order
+if (GETPOST("source") == 'order' && $valid)
+{
+	$found=true;
+	$langs->load("orders");
+
+	require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+
+	$order=new Commande($db);
+	$result=$order->fetch('',$ref);
+	if ($result < 0)
+	{
+		$mesg=$order->error;
+		$error++;
+	}
+	else
+	{
+		$result=$order->fetch_thirdparty($order->socid);
+	}
+
+	$amount=$order->total_ttc;
+    if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
+    $amount=price2num($amount);
+
+	$fulltag='ORD='.$order->ref.'.CUS='.$order->thirdparty->id;
+	//$fulltag.='.NAM='.strtr($order->thirdparty->name,"-"," ");
+	if (! empty($TAG)) { $tag=$TAG; $fulltag.='.TAG='.$TAG; }
+	$fulltag=dol_string_unaccent($fulltag);
+
+	// Creditor
+	
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
+    print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
+    print '<input type="hidden" name="creditor" value="'.$creditor.'">';
+    print '</td></tr>'."\n";
+
+	// Debitor
+	
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("ThirdParty");
+	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$order->thirdparty->name.'</b>';
+
+	// Object
+	
+	$text='<b>'.$langs->trans("PaymentOrderRef",$order->ref).'</b>';
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Designation");
+	print '</td><td class="CTableRow'.($var?'1':'2').'">'.$text;
+	print '<input type="hidden" name="source" value="'.GETPOST("source",'alpha').'">';
+	print '<input type="hidden" name="ref" value="'.$order->ref.'">';
+	print '</td></tr>'."\n";
+
+	// Amount
+	
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
+	if (empty($amount)) print ' ('.$langs->trans("ToComplete").')';
+	print '</td><td class="CTableRow'.($var?'1':'2').'">';
+	if (empty($amount) || ! is_numeric($amount))
+	{
+        print '<input type="hidden" name="amount" value="'.GETPOST("amount",'int').'">';
+	    print '<input class="flat" size=8 type="text" name="newamount" value="'.GETPOST("newamount","int").'">';
+	}
+	else {
+		print '<b>'.price($amount).'</b>';
+        print '<input type="hidden" name="amount" value="'.$amount.'">';
+		print '<input type="hidden" name="newamount" value="'.$amount.'">';
+	}
+	// Currency
+	print ' <b>'.$langs->trans("Currency".$currency).'</b>';
+	print '<input type="hidden" name="currency" value="'.$currency.'">';
+	print '</td></tr>'."\n";
+
+	// Tag
+	
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
+	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
+	print '<input type="hidden" name="tag" value="'.$tag.'">';
+	print '<input type="hidden" name="fulltag" value="'.$fulltag.'">';
+	print '</td></tr>'."\n";
+
+	// Shipping address
+	$shipToName=$order->thirdparty->name;
+    $shipToStreet=$order->thirdparty->address;
+    $shipToCity=$order->thirdparty->town;
+    $shipToState=$order->thirdparty->state_code;
+    $shipToCountryCode=$order->thirdparty->country_code;
+    $shipToZip=$order->thirdparty->zip;
+    $shipToStreet2='';
+    $phoneNum=$order->thirdparty->phone;
+    if ($shipToName && $shipToStreet && $shipToCity && $shipToCountryCode && $shipToZip)
+    {
+        print '<input type="hidden" name="shipToName" value="'.$shipToName.'">'."\n";
+        print '<input type="hidden" name="shipToStreet" value="'.$shipToStreet.'">'."\n";
+        print '<input type="hidden" name="shipToCity" value="'.$shipToCity.'">'."\n";
+        print '<input type="hidden" name="shipToState" value="'.$shipToState.'">'."\n";
+        print '<input type="hidden" name="shipToCountryCode" value="'.$shipToCountryCode.'">'."\n";
+        print '<input type="hidden" name="shipToZip" value="'.$shipToZip.'">'."\n";
+        print '<input type="hidden" name="shipToStreet2" value="'.$shipToStreet2.'">'."\n";
+        print '<input type="hidden" name="phoneNum" value="'.$phoneNum.'">'."\n";
+    }
+    else
+    {
+        print '<!-- Shipping address not complete, so we don t use it -->'."\n";
+    }
+    print '<input type="hidden" name="email" value="'.$order->thirdparty->email.'">'."\n";
+    print '<input type="hidden" name="desc" value="'.$langs->trans("Order").' '.$order->ref.'">'."\n";
+}
+
+
+// Payment on customer invoice
+if (GETPOST("source") == 'invoice' && $valid)
+{
+	$found=true;
+	$langs->load("bills");
+
+	require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+
+	$invoice=new Facture($db);
+	$result=$invoice->fetch('',$ref);
+	if ($result < 0)
+	{
+		$mesg=$invoice->error;
+		$error++;
+	}
+	else
+	{
+		$result=$invoice->fetch_thirdparty($invoice->socid);
+	}
+
+	$amount=price2num($invoice->total_ttc - $invoice->getSommePaiement());
+    if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
+    $amount=price2num($amount);
+
+	$fulltag='INV='.$invoice->ref.'.CUS='.$invoice->thirdparty->id;
+	//$fulltag.='.NAM='.strtr($invoice->thirdparty->name,"-"," ");
+	if (! empty($TAG)) { $tag=$TAG; $fulltag.='.TAG='.$TAG; }
+	$fulltag=dol_string_unaccent($fulltag);
+
+	// Creditor
+	
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
+    print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
+    print '<input type="hidden" name="creditor" value="'.$creditor.'">';
+    print '</td></tr>'."\n";
+
+	// Debitor
+	
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("ThirdParty");
+	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$invoice->thirdparty->name.'</b>';
+
+	// Object
+	
+	$text='<b>'.$langs->trans("PaymentInvoiceRef",$invoice->ref).'</b>';
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Designation");
+	print '</td><td class="CTableRow'.($var?'1':'2').'">'.$text;
+	print '<input type="hidden" name="source" value="'.GETPOST("source",'alpha').'">';
+	print '<input type="hidden" name="ref" value="'.$invoice->ref.'">';
+	print '</td></tr>'."\n";
+
+	// Amount
+	
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
+	if (empty($amount)) print ' ('.$langs->trans("ToComplete").')';
+	print '</td><td class="CTableRow'.($var?'1':'2').'">';
+	if (empty($amount) || ! is_numeric($amount))
+	{
+        print '<input type="hidden" name="amount" value="'.GETPOST("amount",'int').'">';
+	    print '<input class="flat" size=8 type="text" name="newamount" value="'.GETPOST("newamount","int").'">';
+	}
+	else {
+		print '<b>'.price($amount).'</b>';
+        print '<input type="hidden" name="amount" value="'.$amount.'">';
+		print '<input type="hidden" name="newamount" value="'.$amount.'">';
+	}
+	// Currency
+	print ' <b>'.$langs->trans("Currency".$currency).'</b>';
+	print '<input type="hidden" name="currency" value="'.$currency.'">';
+	print '</td></tr>'."\n";
+
+	// Tag
+	
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
+	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
+	print '<input type="hidden" name="tag" value="'.$tag.'">';
+	print '<input type="hidden" name="fulltag" value="'.$fulltag.'">';
+	print '</td></tr>'."\n";
+
+    // Shipping address
+    $shipToName=$invoice->thirdparty->name;
+    $shipToStreet=$invoice->thirdparty->address;
+    $shipToCity=$invoice->thirdparty->town;
+    $shipToState=$invoice->thirdparty->state_code;
+    $shipToCountryCode=$invoice->thirdparty->country_code;
+    $shipToZip=$invoice->thirdparty->zip;
+    $shipToStreet2='';
+    $phoneNum=$invoice->thirdparty->phone;
+    if ($shipToName && $shipToStreet && $shipToCity && $shipToCountryCode && $shipToZip)
+    {
+        print '<input type="hidden" name="shipToName" value="'.$shipToName.'">'."\n";
+        print '<input type="hidden" name="shipToStreet" value="'.$shipToStreet.'">'."\n";
+        print '<input type="hidden" name="shipToCity" value="'.$shipToCity.'">'."\n";
+        print '<input type="hidden" name="shipToState" value="'.$shipToState.'">'."\n";
+        print '<input type="hidden" name="shipToCountryCode" value="'.$shipToCountryCode.'">'."\n";
+        print '<input type="hidden" name="shipToZip" value="'.$shipToZip.'">'."\n";
+        print '<input type="hidden" name="shipToStreet2" value="'.$shipToStreet2.'">'."\n";
+        print '<input type="hidden" name="phoneNum" value="'.$phoneNum.'">'."\n";
+    }
+    else
+    {
+        print '<!-- Shipping address not complete, so we don t use it -->'."\n";
+    }
+    print '<input type="hidden" name="email" value="'.$invoice->thirdparty->email.'">'."\n";
+    print '<input type="hidden" name="desc" value="'.$langs->trans("Invoice").' '.$invoice->ref.'">'."\n";
+}
+
+// Payment on contract line
+if (GETPOST("source") == 'contractline' && $valid)
+{
+	$found=true;
+	$langs->load("contracts");
+
+	require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
+
+	$contractline=new ContratLigne($db);
+	$result=$contractline->fetch('',$ref);
+	if ($result < 0)
+	{
+		$mesg=$contractline->error;
+		$error++;
+	}
+	else
+	{
+		if ($contractline->fk_contrat > 0)
+		{
+			$contract=new Contrat($db);
+			$result=$contract->fetch($contractline->fk_contrat);
+			if ($result > 0)
+			{
+				$result=$contract->fetch_thirdparty($contract->socid);
+			}
+			else
+			{
+				$mesg=$contract->error;
+				$error++;
+			}
+		}
+		else
+		{
+			$mesg='ErrorRecordNotFound';
+			$error++;
+		}
+	}
+
+	$amount=$contractline->total_ttc;
+	if ($contractline->fk_product)
+	{
+		$product=new Product($db);
+		$result=$product->fetch($contractline->fk_product);
+
+		// We define price for product (TODO Put this in a method in product class)
+		if (! empty($conf->global->PRODUIT_MULTIPRICES))
+		{
+			$pu_ht = $product->multiprices[$contract->thirdparty->price_level];
+			$pu_ttc = $product->multiprices_ttc[$contract->thirdparty->price_level];
+			$price_base_type = $product->multiprices_base_type[$contract->thirdparty->price_level];
+		}
+		else
+		{
+			$pu_ht = $product->price;
+			$pu_ttc = $product->price_ttc;
+			$price_base_type = $product->price_base_type;
+		}
+
+		$amount=$pu_ttc;
+		if (empty($amount))
+		{
+			dol_print_error('','ErrorNoPriceDefinedForThisProduct');
+			exit;
+		}
+	}
+    if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
+    $amount=price2num($amount);
+
+	$fulltag='COL='.$contractline->ref.'.CON='.$contract->ref.'.CUS='.$contract->thirdparty->id.'.DAT='.dol_print_date(dol_now(),'%Y%m%d%H%M');
+	//$fulltag.='.NAM='.strtr($contract->thirdparty->name,"-"," ");
+	if (! empty($TAG)) { $tag=$TAG; $fulltag.='.TAG='.$TAG; }
+	$fulltag=dol_string_unaccent($fulltag);
+
+	$qty=1;
+	if (GETPOST('qty')) $qty=GETPOST('qty');
+
+	// Creditor
+	
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
+	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
+    print '<input type="hidden" name="creditor" value="'.$creditor.'">';
+	print '</td></tr>'."\n";
+
+	// Debitor
+	
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("ThirdParty");
+	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$contract->thirdparty->name.'</b>';
+
+	// Object
+	
+	$text='<b>'.$langs->trans("PaymentRenewContractId",$contract->ref,$contractline->ref).'</b>';
+	if ($contractline->fk_product)
+	{
+		$text.='<br>'.$product->ref.($product->label?' - '.$product->label:'');
+	}
+	if ($contractline->description) $text.='<br>'.dol_htmlentitiesbr($contractline->description);
+	//if ($contractline->date_fin_validite) {
+	//	$text.='<br>'.$langs->trans("DateEndPlanned").': ';
+	//	$text.=dol_print_date($contractline->date_fin_validite);
+	//}
+	if ($contractline->date_fin_validite)
+	{
+		$text.='<br>'.$langs->trans("ExpiredSince").': '.dol_print_date($contractline->date_fin_validite);
+	}
+
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Designation");
+	print '</td><td class="CTableRow'.($var?'1':'2').'">'.$text;
+	print '<input type="hidden" name="source" value="'.GETPOST("source",'alpha').'">';
+	print '<input type="hidden" name="ref" value="'.$contractline->ref.'">';
+	print '</td></tr>'."\n";
+
+	// Quantity
+	
+	$label=$langs->trans("Quantity");
+	$qty=1;
+	$duration='';
+	if ($contractline->fk_product)
+	{
+		if ($product->isService() && $product->duration_value > 0)
+		{
+			$label=$langs->trans("Duration");
+
+			// TODO Put this in a global method
+			if ($product->duration_value > 1)
+			{
+				$dur=array("h"=>$langs->trans("Hours"),"d"=>$langs->trans("DurationDays"),"w"=>$langs->trans("DurationWeeks"),"m"=>$langs->trans("DurationMonths"),"y"=>$langs->trans("DurationYears"));
+			}
+			else
+			{
+				$dur=array("h"=>$langs->trans("Hour"),"d"=>$langs->trans("DurationDay"),"w"=>$langs->trans("DurationWeek"),"m"=>$langs->trans("DurationMonth"),"y"=>$langs->trans("DurationYear"));
+			}
+			$duration=$product->duration_value.' '.$dur[$product->duration_unit];
+		}
+	}
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$label.'</td>';
+	print '<td class="CTableRow'.($var?'1':'2').'"><b>'.($duration?$duration:$qty).'</b>';
+	print '<input type="hidden" name="newqty" value="'.dol_escape_htmltag($qty).'">';
+	print '</b></td></tr>'."\n";
+
+	// Amount
+	
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
+	if (empty($amount)) print ' ('.$langs->trans("ToComplete").')';
+	print '</td><td class="CTableRow'.($var?'1':'2').'">';
+	if (empty($amount) || ! is_numeric($amount))
+	{
+        print '<input type="hidden" name="amount" value="'.GETPOST("amount",'int').'">';
+	    print '<input class="flat" size=8 type="text" name="newamount" value="'.GETPOST("newamount","int").'">';
+	}
+	else {
+		print '<b>'.price($amount).'</b>';
+        print '<input type="hidden" name="amount" value="'.$amount.'">';
+		print '<input type="hidden" name="newamount" value="'.$amount.'">';
+	}
+	// Currency
+	print ' <b>'.$langs->trans("Currency".$currency).'</b>';
+	print '<input type="hidden" name="currency" value="'.$currency.'">';
+	print '</td></tr>'."\n";
+
+	// Tag
+	
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
+	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
+	print '<input type="hidden" name="tag" value="'.$tag.'">';
+	print '<input type="hidden" name="fulltag" value="'.$fulltag.'">';
+	print '</td></tr>'."\n";
+
+    // Shipping address
+    $shipToName=$contract->thirdparty->name;
+    $shipToStreet=$contract->thirdparty->address;
+    $shipToCity=$contract->thirdparty->town;
+    $shipToState=$contract->thirdparty->state_code;
+    $shipToCountryCode=$contract->thirdparty->country_code;
+    $shipToZip=$contract->thirdparty->zip;
+    $shipToStreet2='';
+    $phoneNum=$contract->thirdparty->phone;
+    if ($shipToName && $shipToStreet && $shipToCity && $shipToCountryCode && $shipToZip)
+    {
+        print '<input type="hidden" name="shipToName" value="'.$shipToName.'">'."\n";
+        print '<input type="hidden" name="shipToStreet" value="'.$shipToStreet.'">'."\n";
+        print '<input type="hidden" name="shipToCity" value="'.$shipToCity.'">'."\n";
+        print '<input type="hidden" name="shipToState" value="'.$shipToState.'">'."\n";
+        print '<input type="hidden" name="shipToCountryCode" value="'.$shipToCountryCode.'">'."\n";
+        print '<input type="hidden" name="shipToZip" value="'.$shipToZip.'">'."\n";
+        print '<input type="hidden" name="shipToStreet2" value="'.$shipToStreet2.'">'."\n";
+        print '<input type="hidden" name="phoneNum" value="'.$phoneNum.'">'."\n";
+    }
+    else
+    {
+        print '<!-- Shipping address not complete, so we don t use it -->'."\n";
+    }
+    print '<input type="hidden" name="email" value="'.$contract->thirdparty->email.'">'."\n";
+    print '<input type="hidden" name="desc" value="'.$langs->trans("Contract").' '.$contract->ref.'">'."\n";
+}
+
+// Payment on member subscription
+if (GETPOST("source") == 'membersubscription' && $valid)
+{
+	$found=true;
+	$langs->load("members");
+
+	require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/adherents/class/subscription.class.php';
+
+	$member=new Adherent($db);
+	$result=$member->fetch('',$ref);
+	if ($result < 0)
+	{
+		$mesg=$member->error;
+		$error++;
+	}
+	else
+	{
+		$subscription=new Subscription($db);
+	}
+
+	$amount=$subscription->total_ttc;
+    if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
+    $amount=price2num($amount);
+
+	$fulltag='MEM='.$member->id.'.DAT='.dol_print_date(dol_now(),'%Y%m%d%H%M');
+	if (! empty($TAG)) { $tag=$TAG; $fulltag.='.TAG='.$TAG; }
+	$fulltag=dol_string_unaccent($fulltag);
+
+	// Creditor
+	
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
+    print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
+    print '<input type="hidden" name="creditor" value="'.$creditor.'">';
+    print '</td></tr>'."\n";
+
+	// Debitor
+	
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Member");
+	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>';
+	if ($member->morphy == 'mor' && ! empty($member->societe)) print $member->societe;
+	else print $member->getFullName($langs);
+	print '</b>';
+
+	// Object
+	
+	$text='<b>'.$langs->trans("PaymentSubscription").'</b>';
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Designation");
+	print '</td><td class="CTableRow'.($var?'1':'2').'">'.$text;
+	print '<input type="hidden" name="source" value="'.GETPOST("source",'alpha').'">';
+	print '<input type="hidden" name="ref" value="'.$member->ref.'">';
+	print '</td></tr>'."\n";
+
+	if ($member->last_subscription_date || $member->last_subscription_amount)
+	{
+		// Last subscription date
+		
+		print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("LastSubscriptionDate");
+		print '</td><td class="CTableRow'.($var?'1':'2').'">'.dol_print_date($member->last_subscription_date,'day');
+		print '</td></tr>'."\n";
+
+		// Last subscription amount
+		
+		print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("LastSubscriptionAmount");
+		print '</td><td class="CTableRow'.($var?'1':'2').'">'.price($member->last_subscription_amount);
+		print '</td></tr>'."\n";
+
+		if (empty($amount) && ! GETPOST('newamount')) $_GET['newamount']=$member->last_subscription_amount;
+	}
+
+	// Amount
+	
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
+	if (empty($amount))
+	{
+		print ' ('.$langs->trans("ToComplete");
+		if (! empty($conf->global->MEMBER_EXT_URL_SUBSCRIPTION_INFO)) print ' - <a href="'.$conf->global->MEMBER_EXT_URL_SUBSCRIPTION_INFO.'" rel="external" target="_blank">'.$langs->trans("SeeHere").'</a>';
+		print ')';
+	}
+	print '</td><td class="CTableRow'.($var?'1':'2').'">';
+	if (empty($amount) || ! is_numeric($amount))
+	{
+	    $valtoshow=GETPOST("newamount",'int');
+	    if (! empty($conf->global->MEMBER_MIN_AMOUNT) && $valtoshow) $valtoshow=max($conf->global->MEMBER_MIN_AMOUNT,$valtoshow);
+        print '<input type="hidden" name="amount" value="'.GETPOST("amount",'int').'">';
+	    print '<input class="flat" size="8" type="text" name="newamount" value="'.$valtoshow.'">';
+	}
+	else {
+	    $valtoshow=$amount;
+	    if (! empty($conf->global->MEMBER_MIN_AMOUNT) && $valtoshow) $valtoshow=max($conf->global->MEMBER_MIN_AMOUNT,$valtoshow);
+	    print '<b>'.price($valtoshow).'</b>';
+        print '<input type="hidden" name="amount" value="'.$valtoshow.'">';
+		print '<input type="hidden" name="newamount" value="'.$valtoshow.'">';
+	}
+	// Currency
+	print ' <b>'.$langs->trans("Currency".$currency).'</b>';
+	print '<input type="hidden" name="currency" value="'.$currency.'">';
+	print '</td></tr>'."\n";
+
+	// Tag
+	
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
+	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
+	print '<input type="hidden" name="tag" value="'.$tag.'">';
+	print '<input type="hidden" name="fulltag" value="'.$fulltag.'">';
+	print '</td></tr>'."\n";
+
+    // Shipping address
+    $shipToName=$member->getFullName($langs);
+    $shipToStreet=$member->address;
+    $shipToCity=$member->town;
+    $shipToState=$member->state_code;
+    $shipToCountryCode=$member->country_code;
+    $shipToZip=$member->zip;
+    $shipToStreet2='';
+    $phoneNum=$member->phone;
+    if ($shipToName && $shipToStreet && $shipToCity && $shipToCountryCode && $shipToZip)
+    {
+        print '<input type="hidden" name="shipToName" value="'.$shipToName.'">'."\n";
+        print '<input type="hidden" name="shipToStreet" value="'.$shipToStreet.'">'."\n";
+        print '<input type="hidden" name="shipToCity" value="'.$shipToCity.'">'."\n";
+        print '<input type="hidden" name="shipToState" value="'.$shipToState.'">'."\n";
+        print '<input type="hidden" name="shipToCountryCode" value="'.$shipToCountryCode.'">'."\n";
+        print '<input type="hidden" name="shipToZip" value="'.$shipToZip.'">'."\n";
+        print '<input type="hidden" name="shipToStreet2" value="'.$shipToStreet2.'">'."\n";
+        print '<input type="hidden" name="phoneNum" value="'.$phoneNum.'">'."\n";
+    }
+    else
+    {
+        print '<!-- Shipping address not complete, so we don t use it -->'."\n";
+    }
+    print '<input type="hidden" name="email" value="'.$member->email.'">'."\n";
+    print '<input type="hidden" name="desc" value="'.$langs->trans("PaymentSubscription").'">'."\n";
+}
+
+
+
+
+if (! $found && ! $mesg) $mesg=$langs->trans("ErrorBadParameters");
+
+if ($mesg) print '<tr><td align="center" colspan="2"><br><div class="warning">'.$mesg.'</div></td></tr>'."\n";
+
+print '</table>'."\n";
+print "\n";
+
+if ($found && ! $error)	// We are in a management option and no error
+{
+	if (empty($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY)) $conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY='integral';
+
+	if ($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY == 'integral')
+	{
+		print '<br><input class="button" type="submit" name="dopayment" value="'.$langs->trans("PaypalOrCBDoPayment").'">';
+	}
+	if ($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY == 'paypalonly')
+	{
+		print '<br><input class="button" type="submit" name="dopayment" value="'.$langs->trans("PaypalDoPayment").'">';
+	}
+}
+else
+{
+	dol_print_error_email('ERRORNEWPAYMENTPAYPAL');
+}
+
+print '</td></tr>'."\n";
+
+print '</table>'."\n";
+print '</form>'."\n";
+print '</div>'."\n";
+print '<br>';
+
+
+html_print_paypal_footer($mysoc,$langs);
+
+llxFooterPaypal();
+
+$db->close();
diff --git a/htdocs/public/payment/paymentko.php b/htdocs/public/payment/paymentko.php
new file mode 100644
index 00000000000..70dac3c960b
--- /dev/null
+++ b/htdocs/public/payment/paymentko.php
@@ -0,0 +1,146 @@
+<?php
+/* Copyright (C) 2001-2002	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2006-2013	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2012		Regis Houssin			<regis.houssin@capnetworks.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * 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/public/payment/paymentko.php
+ *		\ingroup    core
+ *		\brief      File to show page after a failed payment.
+ *                  This page is called by payment system with url provided to it competed with parameter TOKEN=xxx
+ *                  This token can be used to get more informations.
+ *		\author	    Laurent Destailleur
+ */
+
+define("NOLOGIN",1);		// This means this output page does not require to be logged.
+define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.
+
+// For MultiCompany module.
+// Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
+// TODO This should be useless. Because entity must be retreive from object ref and not from url.
+$entity=(! empty($_GET['entity']) ? (int) $_GET['entity'] : (! empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
+if (is_numeric($entity)) define("DOLENTITY", $entity);
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+if (! empty($conf->paypal->enabled))
+{
+	require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypal.lib.php';
+	require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypalfunctions.lib.php';
+}
+
+$langs->load("main");
+$langs->load("other");
+$langs->load("dict");
+$langs->load("bills");
+$langs->load("companies");
+$langs->load("paybox");
+$langs->load("paypal");
+
+$PAYPALTOKEN=GETPOST('TOKEN');
+if (empty($PAYPALTOKEN)) $PAYPALTOKEN=GETPOST('token');
+$PAYPALPAYERID=GETPOST('PAYERID');
+if (empty($PAYPALPAYERID)) $PAYPALPAYERID=GETPOST('PayerID');
+$PAYPALFULLTAG=GETPOST('FULLTAG');
+if (empty($PAYPALFULLTAG)) $PAYPALFULLTAG=GETPOST('fulltag');
+
+$paymentmethod=array();
+if (! empty($conf->paypal->enabled)) $paymentmethod['paypal']='paypal';
+if (! empty($conf->paybox->enabled)) $paymentmethod['paybox']='paybox';
+
+
+// Security check
+if (empty($paymentmethod)) accessforbidden('', 0, 0, 1);
+
+
+/*
+ * Actions
+ */
+
+
+
+
+/*
+ * View
+ */
+
+dol_syslog("Callback url when a PayPal payment was canceled. query_string=".(empty($_SERVER["QUERY_STRING"])?'':$_SERVER["QUERY_STRING"])." script_uri=".(empty($_SERVER["SCRIPT_URI"])?'':$_SERVER["SCRIPT_URI"]), LOG_DEBUG, 0, '_payment');
+
+$tracepost = "";
+foreach($_POST as $k => $v) $tracepost .= "{$k} - {$v}\n";
+dol_syslog("POST=".$tracepost, LOG_DEBUG, 0, '_payment');
+
+
+// Send an email
+if (! empty($conf->paypal->enabled))
+{
+	if (! empty($conf->global->PAYPAL_PAYONLINE_SENDEMAIL))
+	{
+	    // Get on url call
+	    $token              = $PAYPALTOKEN;
+	    $fulltag            = $PAYPALFULLTAG;
+	    $payerID            = $PAYPALPAYERID;
+	    // Set by newpayment.php
+	    $paymentType        = $_SESSION['PaymentType'];
+	    $currencyCodeType   = $_SESSION['currencyCodeType'];
+	    $FinalPaymentAmt    = $_SESSION["Payment_Amount"];
+	    // From env
+	    $ipaddress          = $_SESSION['ipaddress'];
+	    
+	    
+		$sendto=$conf->global->PAYPAL_PAYONLINE_SENDEMAIL;
+		$from=$conf->global->MAILING_EMAIL_FROM;
+	
+		$urlback=$_SERVER["REQUEST_URI"];
+		$topic='['.$conf->global->MAIN_APPLICATION_TITLE.'] '.$langs->transnoentitiesnoconv("NewPaypalPaymentFailed");
+		$content=$langs->transnoentitiesnoconv("NewPaypalPaymentFailed")."\ntag=".$fulltag."\ntoken=".$token." paymentType=".$paymentType." currencycodeType=".$currencyCodeType." payerId=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt;
+		require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+		$mailfile = new CMailFile($topic, $sendto, $from, $content);
+	
+		$result=$mailfile->sendfile();
+		if ($result)
+		{
+			dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_payment');
+		}
+		else
+		{
+			dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_payment');
+		}
+	}
+}
+
+$head='';
+if (! empty($conf->global->PAYMENT_CSS_URL)) $head='<link rel="stylesheet" type="text/css" href="'.$conf->global->PAYMENT_CSS_URL.'?lang='.$langs->defaultlang.'">'."\n";
+
+llxHeader($head, $langs->trans("PaymentForm"));
+
+
+// Show ko message
+print '<span id="dolpaymentspan"></span>'."\n";
+print '<div id="dolpaymentdiv" align="center">'."\n";
+print $langs->trans("YourPaymentHasNotBeenRecorded")."<br><br>";
+
+if (! empty($conf->global->PAYPAL_MESSAGE_KO)) print $conf->global->PAYPAL_MESSAGE_KO;
+print "\n</div>\n";
+
+
+html_print_paypal_footer($mysoc,$langs);
+
+
+llxFooter();
+
+$db->close();
diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
new file mode 100644
index 00000000000..ce3fcd8bb29
--- /dev/null
+++ b/htdocs/public/payment/paymentok.php
@@ -0,0 +1,308 @@
+<?php
+/* Copyright (C) 2001-2002	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2006-2013	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2012		Regis Houssin			<regis.houssin@capnetworks.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * 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/public/payment/paymentok.php
+ *		\ingroup    core
+ *		\brief      File to show page after a successful payment
+ *                  This page is called by payment system with url provided to it completed with parameter TOKEN=xxx
+ *                  This token can be used to get more informations.
+ *		\author	    Laurent Destailleur
+ */
+
+define("NOLOGIN",1);		// This means this output page does not require to be logged.
+define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.
+
+// For MultiCompany module.
+// Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
+// TODO This should be useless. Because entity must be retreive from object ref and not from url.
+$entity=(! empty($_GET['entity']) ? (int) $_GET['entity'] : (! empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
+if (is_numeric($entity)) define("DOLENTITY", $entity);
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+if (! empty($conf->paypal->enabled))
+{
+	require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypal.lib.php';
+	require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypalfunctions.lib.php';
+}
+
+// Security check
+//if (empty($conf->paypal->enabled)) accessforbidden('',0,0,1);
+
+$langs->load("main");
+$langs->load("other");
+$langs->load("dict");
+$langs->load("bills");
+$langs->load("companies");
+$langs->load("paybox");
+$langs->load("paypal");
+
+// Clean parameters
+if (! empty($conf->paypal->enabled))
+{
+	$PAYPAL_API_USER="";
+	if (! empty($conf->global->PAYPAL_API_USER)) $PAYPAL_API_USER=$conf->global->PAYPAL_API_USER;
+	$PAYPAL_API_PASSWORD="";
+	if (! empty($conf->global->PAYPAL_API_PASSWORD)) $PAYPAL_API_PASSWORD=$conf->global->PAYPAL_API_PASSWORD;
+	$PAYPAL_API_SIGNATURE="";
+	if (! empty($conf->global->PAYPAL_API_SIGNATURE)) $PAYPAL_API_SIGNATURE=$conf->global->PAYPAL_API_SIGNATURE;
+	$PAYPAL_API_SANDBOX="";
+	if (! empty($conf->global->PAYPAL_API_SANDBOX)) $PAYPAL_API_SANDBOX=$conf->global->PAYPAL_API_SANDBOX;
+	$PAYPAL_API_OK="";
+	if ($urlok) $PAYPAL_API_OK=$urlok;
+	$PAYPAL_API_KO="";
+	if ($urlko) $PAYPAL_API_KO=$urlko;
+	if (empty($PAYPAL_API_USER))
+	{
+	    dol_print_error('',"Paypal setup param PAYPAL_API_USER not defined");
+	    return -1;
+	}
+	if (empty($PAYPAL_API_PASSWORD))
+	{
+	    dol_print_error('',"Paypal setup param PAYPAL_API_PASSWORD not defined");
+	    return -1;
+	}
+	if (empty($PAYPAL_API_SIGNATURE))
+	{
+	    dol_print_error('',"Paypal setup param PAYPAL_API_SIGNATURE not defined");
+	    return -1;
+	}
+}
+
+$source=GETPOST('source');
+$ref=GETPOST('ref');
+$PAYPALTOKEN=GETPOST('TOKEN');
+if (empty($PAYPALTOKEN)) $PAYPALTOKEN=GETPOST('token');
+$PAYPALPAYERID=GETPOST('PAYERID');
+if (empty($PAYPALPAYERID)) $PAYPALPAYERID=GETPOST('PayerID');
+$PAYPALFULLTAG=GETPOST('FULLTAG');
+if (empty($PAYPALFULLTAG)) $PAYPALFULLTAG=GETPOST('fulltag');
+
+$paymentmethod=array();
+if (! empty($conf->paypal->enabled)) $paymentmethod['paypal']='paypal';
+if (! empty($conf->paybox->enabled)) $paymentmethod['paybox']='paybox';
+
+
+// Security check
+if (empty($paymentmethod)) accessforbidden('', 0, 0, 1);
+
+
+/*
+ * Actions
+ */
+
+
+
+/*
+ * View
+ */
+
+dol_syslog("Callback url when a payment was done. query_string=".(empty($_SERVER["QUERY_STRING"])?'':$_SERVER["QUERY_STRING"])." script_uri=".(empty($_SERVER["SCRIPT_URI"])?'':$_SERVER["SCRIPT_URI"]), LOG_DEBUG, 0, '_payment');
+
+$tracepost = "";
+foreach($_POST as $k => $v) $tracepost .= "{$k} - {$v}\n";
+dol_syslog("POST=".$tracepost, LOG_DEBUG, 0, '_payment');
+
+$head='';
+if (! empty($conf->global->PAYMENT_CSS_URL)) $head='<link rel="stylesheet" type="text/css" href="'.$conf->global->PAYMENT_CSS_URL.'?lang='.$langs->defaultlang.'">'."\n";
+
+llxHeader($head, $langs->trans("PaymentForm"));
+
+
+// Show message
+print '<span id="dolpaymentspan"></span>'."\n";
+print '<div id="dolpaymentdiv" align="center">'."\n";
+
+if (! empty($conf->paypal->enabled))
+{
+	if ($PAYPALTOKEN)
+	{
+	    // Get on url call
+	    $token              = $PAYPALTOKEN;
+	    $fulltag            = $PAYPALFULLTAG;
+	    $payerID            = $PAYPALPAYERID;
+	    // Set by newpayment.php
+	    $paymentType        = $_SESSION['PaymentType'];
+	    $currencyCodeType   = $_SESSION['currencyCodeType'];
+	    $FinalPaymentAmt    = $_SESSION["Payment_Amount"];
+	    // From env
+	    $ipaddress          = $_SESSION['ipaddress'];
+	
+		dol_syslog("Call paymentok with token=".$token." paymentType=".$paymentType." currencyCodeType=".$currencyCodeType." payerID=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt." fulltag=".$fulltag, LOG_DEBUG, 0, '_paypal');
+	
+	
+		// Validate record
+	    if (! empty($paymentType))
+	    {
+	        dol_syslog("We call GetExpressCheckoutDetails", LOG_DEBUG, 0, '_payment');
+	        $resArray=getDetails($token);
+	        //var_dump($resarray);
+	
+	        dol_syslog("We call DoExpressCheckoutPayment token=".$token." paymentType=".$paymentType." currencyCodeType=".$currencyCodeType." payerID=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt." fulltag=".$fulltag, LOG_DEBUG, 0, '_payment');
+	        $resArray=confirmPayment($token, $paymentType, $currencyCodeType, $payerID, $ipaddress, $FinalPaymentAmt, $fulltag);
+	
+	        $ack = strtoupper($resArray["ACK"]);
+	        if($ack=="SUCCESS" || $ack=="SUCCESSWITHWARNING")
+	        {
+	        	$object = new stdClass();
+	
+	        	$object->source		= $source;
+	        	$object->ref		= $ref;
+	        	$object->payerID	= $payerID;
+	        	$object->fulltag	= $fulltag;
+	        	$object->resArray	= $resArray;
+	
+	            // resArray was built from a string like that
+	            // TOKEN=EC%2d1NJ057703V9359028&TIMESTAMP=2010%2d11%2d01T11%3a40%3a13Z&CORRELATIONID=1efa8c6a36bd8&ACK=Success&VERSION=56&BUILD=1553277&TRANSACTIONID=9B994597K9921420R&TRANSACTIONTYPE=expresscheckout&PAYMENTTYPE=instant&ORDERTIME=2010%2d11%2d01T11%3a40%3a12Z&AMT=155%2e57&FEEAMT=5%2e54&TAXAMT=0%2e00&CURRENCYCODE=EUR&PAYMENTSTATUS=Completed&PENDINGREASON=None&REASONCODE=None
+	            $PAYMENTSTATUS=urldecode($resArray["PAYMENTSTATUS"]);   // Should contains 'Completed'
+	            $TRANSACTIONID=urldecode($resArray["TRANSACTIONID"]);
+	            $TAXAMT=urldecode($resArray["TAXAMT"]);
+	            $NOTE=urldecode($resArray["NOTE"]);
+	
+	            print $langs->trans("YourPaymentHasBeenRecorded")."<br>\n";
+	            print $langs->trans("ThisIsTransactionId",$TRANSACTIONID)."<br><br>\n";
+	            if (! empty($conf->global->PAYPAL_MESSAGE_OK)) print $conf->global->PAYPAL_MESSAGE_OK;
+	
+	            // Appel des triggers
+	            include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+	            $interface=new Interfaces($db);
+	            $result=$interface->run_triggers('PAYPAL_PAYMENT_OK',$object,$user,$langs,$conf);
+	            if ($result < 0) { $error++; $errors=$interface->errors; }
+	            // Fin appel triggers
+	
+	        	// Send an email
+				if (! empty($conf->global->PAYPAL_PAYONLINE_SENDEMAIL))
+				{
+					$sendto=$conf->global->PAYPAL_PAYONLINE_SENDEMAIL;
+					$from=$conf->global->MAILING_EMAIL_FROM;
+					// Define $urlwithroot
+					$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
+					$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
+					//$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
+	
+					$urlback=$_SERVER["REQUEST_URI"];
+					$topic='['.$conf->global->MAIN_APPLICATION_TITLE.'] '.$langs->transnoentitiesnoconv("NewPaypalPaymentReceived");
+					$tmptag=dolExplodeIntoArray($fulltag,'.','=');
+					$content="";
+					if (! empty($tmptag['MEM']))
+					{
+						$langs->load("members");
+						$url=$urlwithroot."/adherents/card_subscriptions.php?rowid=".$tmptag['MEM'];
+						$content.=$langs->trans("PaymentSubscription")."<br>\n";
+						$content.=$langs->trans("MemberId").': '.$tmptag['MEM']."<br>\n";
+						$content.=$langs->trans("Link").': <a href="'.$url.'">'.$url.'</a>'."<br>\n";
+					}
+					else
+					{
+						$content.=$langs->transnoentitiesnoconv("NewPaypalPaymentReceived")."<br>\n";
+					}
+					$content.="<br>\n";
+					$content.=$langs->transnoentitiesnoconv("TechnicalInformation").":<br>\n";
+					$content.=$langs->transnoentitiesnoconv("ReturnURLAfterPayment").': '.$urlback."<br>\n";
+					$content.="tag=".$fulltag." token=".$token." paymentType=".$paymentType." currencycodeType=".$currencyCodeType." payerId=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt;
+	
+					$ishtml=dol_textishtml($content);	// May contain urls
+	
+					require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+					$mailfile = new CMailFile($topic, $sendto, $from, $content, array(), array(), array(), '', '', 0, $ishtml);
+	
+					$result=$mailfile->sendfile();
+					if ($result)
+					{
+						dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_payment');
+					}
+					else
+					{
+						dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_payment');
+					}
+				}
+	        }
+	        else
+			{
+	            //Display a user friendly Error on the page using any of the following error information returned by PayPal
+	            $ErrorCode = urldecode($resArray["L_ERRORCODE0"]);
+	            $ErrorShortMsg = urldecode($resArray["L_SHORTMESSAGE0"]);
+	            $ErrorLongMsg = urldecode($resArray["L_LONGMESSAGE0"]);
+	            $ErrorSeverityCode = urldecode($resArray["L_SEVERITYCODE0"]);
+	
+	            echo $langs->trans('DoExpressCheckoutPaymentAPICallFailed') . "<br>\n";
+	            echo $langs->trans('DetailedErrorMessage') . ": " . $ErrorLongMsg."<br>\n";
+	            echo $langs->trans('ShortErrorMessage') . ": " . $ErrorShortMsg."<br>\n";
+	            echo $langs->trans('ErrorCode') . ": " . $ErrorCode."<br>\n";
+	            echo $langs->trans('ErrorSeverityCode') . ": " . $ErrorSeverityCode."<br>\n";
+	
+	            if ($mysoc->email) echo "\nPlease, send a screenshot of this page to ".$mysoc->email."<br>\n";
+	
+	           	// Send an email
+				if (! empty($conf->global->PAYPAL_PAYONLINE_SENDEMAIL))
+				{
+					$sendto=$conf->global->PAYPAL_PAYONLINE_SENDEMAIL;
+					$from=$conf->global->MAILING_EMAIL_FROM;
+					// Define $urlwithroot
+					$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
+					$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
+					//$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
+	
+					$urlback=$_SERVER["REQUEST_URI"];
+					$topic='['.$conf->global->MAIN_APPLICATION_TITLE.'] '.$langs->transnoentitiesnoconv("ValidationOfPaypalPaymentFailed");
+					$content="";
+					$content.=$langs->transnoentitiesnoconv("PaypalConfirmPaymentPageWasCalledButFailed")."\n";
+					$content.="\n";
+					$content.=$langs->transnoentitiesnoconv("TechnicalInformation").":\n";
+					$content.=$langs->transnoentitiesnoconv("ReturnURLAfterPayment").': '.$urlback."\n";
+					$content.="tag=".$fulltag."\ntoken=".$token." paymentType=".$paymentType." currencycodeType=".$currencyCodeType." payerId=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt;
+	
+					$ishtml=dol_textishtml($content);	// May contain urls
+	
+					require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+					$mailfile = new CMailFile($topic, $sendto, $from, $content, array(), array(), array(), '', '', 0, $ishtml);
+	
+					$result=$mailfile->sendfile();
+					if ($result)
+					{
+						dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_payment');
+					}
+					else
+					{
+						dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_payment');
+					}
+				}
+	        }
+	    }
+	    else
+	    {
+	        dol_print_error('','Session expired');
+	    }
+	}
+}
+else
+{
+    // No TOKEN parameter in URL
+    dol_print_error('','No TOKEN parameter in URL');
+}
+
+print "\n</div>\n";
+
+html_print_paypal_footer($mysoc,$langs);
+
+
+llxFooter();
+
+$db->close();

From 0080821dc5b4a3c40f7f5ddf5b8cd12f267c4983 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 23 Apr 2017 16:05:54 +0200
Subject: [PATCH 084/505] Fix no invoice if not a customer

---
 htdocs/comm/card.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index 4d4d50a1979..d5d11941b23 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -1030,11 +1030,14 @@ if ($id > 0)
     
     				if (! empty($conf->commande->enabled))
     				{
-    					if (! empty($orders2invoice) && $orders2invoice > 0) print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/commande/orderstoinvoice.php?socid='.$object->id.'">'.$langs->trans("CreateInvoiceForThisCustomer").'</a></div>';
-    					else print '<div class="inline-block divButAction"><a class="butActionRefused" title="'.dol_escape_js($langs->trans("NoOrdersToInvoice")).'" href="#">'.$langs->trans("CreateInvoiceForThisCustomer").'</a></div>';
+    				    if ($object->client != 0 && $object->client != 2)
+    				    {
+    					   if (! empty($orders2invoice) && $orders2invoice > 0) print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/commande/orderstoinvoice.php?socid='.$object->id.'">'.$langs->trans("CreateInvoiceForThisCustomer").'</a></div>';
+    					   else print '<div class="inline-block divButAction"><a class="butActionRefused" title="'.dol_escape_js($langs->trans("NoOrdersToInvoice")).'" href="#">'.$langs->trans("CreateInvoiceForThisCustomer").'</a></div>';
+    				    }
+    				    else print '<div class="inline-block divButAction"><a class="butActionRefused" title="'.dol_escape_js($langs->trans("ThirdPartyMustBeEditAsCustomer")).'" href="#">'.$langs->trans("AddBill").'</a></div>';
     				}
-    
-    				if ($object->client != 0) print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture.php?action=create&socid='.$object->id.'">'.$langs->trans("AddBill").'</a></div>';
+    				if ($object->client != 0 && $object->client != 2) print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture.php?action=create&socid='.$object->id.'">'.$langs->trans("AddBill").'</a></div>';
     				else print '<div class="inline-block divButAction"><a class="butActionRefused" title="'.dol_escape_js($langs->trans("ThirdPartyMustBeEditAsCustomer")).'" href="#">'.$langs->trans("AddBill").'</a></div>';
     
     			}

From ec59f08e419dc3c81df14ffcd5a71f231331b9ba Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 24 Apr 2017 00:46:27 +0200
Subject: [PATCH 085/505] FIX extrafield css for boolean type

---
 htdocs/core/class/extrafields.class.php        | 4 ++++
 htdocs/core/tpl/admin_extrafields_view.tpl.php | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index 673f069d1b3..def56c5203a 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -728,6 +728,10 @@ class ExtraFields
     		{
     		    $showsize='minwidth400imp';
     		}
+    		elseif ($type == 'boolean')
+    		{
+    		    $showsize='';
+    		}
     		else
     		{
     			if (round($size) < 12)
diff --git a/htdocs/core/tpl/admin_extrafields_view.tpl.php b/htdocs/core/tpl/admin_extrafields_view.tpl.php
index d20184c70b4..2143fc294c7 100644
--- a/htdocs/core/tpl/admin_extrafields_view.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_view.tpl.php
@@ -34,7 +34,7 @@ print '<br>';
 $extrafields->fetch_name_optionals_label($elementtype);
 
 print '<div class="div-table-responsive">';
-print "<table summary=\"listofattributes\" class=\"noborder\" width=\"100%\">";
+print '<table summary="listofattributes" class="noborder" width="100%">';
 
 print '<tr class="liste_titre">';
 print '<td align="left">'.$langs->trans("Position").'</td>';

From af56c85057c9201f7a6a10abf9f400a36b4aca6a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 24 Apr 2017 03:11:19 +0200
Subject: [PATCH 086/505] Fix perms on file

---
 .../swiftmailer/lib/swiftmailer_generate_mimes_config.php         | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 htdocs/includes/swiftmailer/lib/swiftmailer_generate_mimes_config.php

diff --git a/htdocs/includes/swiftmailer/lib/swiftmailer_generate_mimes_config.php b/htdocs/includes/swiftmailer/lib/swiftmailer_generate_mimes_config.php
old mode 100644
new mode 100755

From 65fec95458f17fdd87673fb737fabd2f04b4e5f0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 24 Apr 2017 03:15:03 +0200
Subject: [PATCH 087/505] Fix debian package

---
 build/debian/dolibarr.postinst                     | 2 +-
 build/debian/install.forced.php.install            | 2 +-
 build/makepack-dolibarr.pl                         | 3 ++-
 htdocs/core/modules/import/import_xlsx.modules.php | 2 +-
 htdocs/install/fileconf.php                        | 8 ++++----
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/build/debian/dolibarr.postinst b/build/debian/dolibarr.postinst
index 4b946fda433..6ee2a89931f 100644
--- a/build/debian/dolibarr.postinst
+++ b/build/debian/dolibarr.postinst
@@ -61,7 +61,7 @@ apache_install() {
 	# Enable dolibarr conf
 	if which a2enconf >/dev/null 2>&1 ;then
 		# a2enconf exists for ubuntu only
-		echo "Enable link for Apache config file with a3enconf"
+		echo "Enable link for Apache config file with a2enconf"
 		a2enconf dolibarr
 	else 
 		if [ -d /etc/$webserver/conf.d ] && [ ! -e /etc/$webserver/conf.d/dolibarr.conf ]; then
diff --git a/build/debian/install.forced.php.install b/build/debian/install.forced.php.install
index 56eef3287a6..e55ffae138e 100644
--- a/build/debian/install.forced.php.install
+++ b/build/debian/install.forced.php.install
@@ -7,7 +7,7 @@
 //
 
 $force_install_packager='deb';
-$force_install_noedit=2;
+$force_install_noedit=1;
 $force_install_message='KeepDefaultValuesDeb';
 #$force_install_main_data_root='/usr/share/dolibarr/documents';
 $force_install_main_data_root='/var/lib/dolibarr/documents';
diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl
index c06d8f0730f..f465cf51234 100755
--- a/build/makepack-dolibarr.pl
+++ b/build/makepack-dolibarr.pl
@@ -509,7 +509,7 @@ if ($nboftargetok) {
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/documents`;
 
 		# Removed known external modules to avoid any error when packaging from env where external modules are tested 
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom/*`;	# For custom we want to keep dir
+	    #$ret=`find $BUILDROOT/$PROJECT/htdocs/custom/* -type d -exec rm -fr {} \;`;	# For custom we want to keep dir
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/allscreens*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/ancotec*`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/cabinetmed*`;
@@ -554,6 +554,7 @@ if ($nboftargetok) {
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/mike42/escpos-php/doc`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/mike42/escpos-php/example`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/mike42/escpos-php/test`;
+        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/mobiledetect/mobiledetectlib/.gitmodules`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/nusoap/lib/Mail`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/nusoap/samples`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/php-iban/docs`;
diff --git a/htdocs/core/modules/import/import_xlsx.modules.php b/htdocs/core/modules/import/import_xlsx.modules.php
index 627fcfd6fd9..917760dc900 100644
--- a/htdocs/core/modules/import/import_xlsx.modules.php
+++ b/htdocs/core/modules/import/import_xlsx.modules.php
@@ -31,7 +31,7 @@ require_once DOL_DOCUMENT_ROOT .'/core/modules/import/modules_import.php';
 /**
  *	Class to import Excel files
  */
-class Importxlsx extends ModeleImports
+class ImportXlsx extends ModeleImports
 {
     var $db;
     var $datatoimport;
diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php
index 2b8f57d9d3c..cdd639ad50b 100644
--- a/htdocs/install/fileconf.php
+++ b/htdocs/install/fileconf.php
@@ -45,13 +45,13 @@ dolibarr_install_syslog("--- fileconf: entering fileconf.php page");
 // install.forced.php into directory htdocs/install (This is the case with some wizard
 // installer like DoliWamp, DoliMamp or DoliBuntu).
 // We first init "forced values" to nothing.
-if (! isset($force_install_noedit))			$force_install_noedit='';	// 1=To block var specific to distrib, 2 to block all technical parameters
+if (! isset($force_install_noedit))			    $force_install_noedit='';	// 1=To block vars specific to distrib, 2 to block all technical parameters
 if (! isset($force_install_type))				$force_install_type='';
 if (! isset($force_install_dbserver))			$force_install_dbserver='';
 if (! isset($force_install_port))				$force_install_port='';
 if (! isset($force_install_database))			$force_install_database='';
-if (! isset($force_install_prefix))			$force_install_prefix='';
-if (! isset($force_install_createdatabase))	$force_install_createdatabase='';
+if (! isset($force_install_prefix))			    $force_install_prefix='';
+if (! isset($force_install_createdatabase))	    $force_install_createdatabase='';
 if (! isset($force_install_databaselogin))		$force_install_databaselogin='';
 if (! isset($force_install_databasepass))		$force_install_databasepass='';
 if (! isset($force_install_databaserootlogin))	$force_install_databaserootlogin='';
@@ -324,7 +324,7 @@ if (! empty($force_install_message))
 		?>
 			<select id="db_type"
 			        name="db_type"
-				<?php if ($force_install_noedit && $force_install_type !== null) {
+				<?php if ($force_install_noedit == 2 && $force_install_type !== null) {
 					print ' disabled';
 				} ?>
 			>

From 10e2b128d1f2f2d9e786a1c92a54009cb926398e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 24 Apr 2017 05:20:45 +0200
Subject: [PATCH 088/505] Fix warning during install

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

diff --git a/htdocs/core/modules/syslog/mod_syslog_file.php b/htdocs/core/modules/syslog/mod_syslog_file.php
index 91af81ef178..195cab19f7f 100644
--- a/htdocs/core/modules/syslog/mod_syslog_file.php
+++ b/htdocs/core/modules/syslog/mod_syslog_file.php
@@ -104,8 +104,10 @@ class mod_syslog_file extends LogHandler implements LogHandlerInterface
 	private function getFilename($suffixinfilename='')
 	{
 	    global $conf;
-	    if (! empty($conf->global->SYSLOG_FILE)) $tmp=str_replace('DOL_DATA_ROOT', DOL_DATA_ROOT, $conf->global->SYSLOG_FILE);
-	    else $tmp='dolibarr.log';
+
+	    if (empty($conf->global->SYSLOG_FILE)) $tmp=DOL_DATA_ROOT.'/dolibarr.log';
+	    else $tmp=str_replace('DOL_DATA_ROOT', DOL_DATA_ROOT, $conf->global->SYSLOG_FILE);
+
 	    return $suffixinfilename?preg_replace('/\.log$/i', $suffixinfilename.'.log', $tmp):$tmp;
 	}
 

From 86338d1781f812ebae2d584330fdd9e33cdef831 Mon Sep 17 00:00:00 2001
From: florian HENRY <florian.henry@atm-consulting.fr>
Date: Mon, 24 Apr 2017 09:03:25 +0200
Subject: [PATCH 089/505] FIX : #6747

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

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 0b5778a512a..7f10fca51f8 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -1435,8 +1435,8 @@ class Form
        {
         	if (! empty($conf->multicompany->transverse_mode))
         	{
-        		$sql.= ", ".MAIN_DB_PREFIX."usergroup_user as ug";
-        		$sql.= " WHERE ug.fk_user = u.rowid";
+        		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ug";
+        		$sql.= " ON ug.fk_user = u.rowid";
         		$sql.= " AND ug.entity = ".$conf->entity;
         	}
         	else

From cd099bf3b1f02681176ec6e384825bb312e6ab32 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 24 Apr 2017 12:42:54 +0200
Subject: [PATCH 090/505] Fix bad update of prices

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

diff --git a/htdocs/product/admin/product_tools.php b/htdocs/product/admin/product_tools.php
index 0d3ea7584f1..7e66181fdbc 100644
--- a/htdocs/product/admin/product_tools.php
+++ b/htdocs/product/admin/product_tools.php
@@ -42,8 +42,6 @@ $oldvatrate=GETPOST('oldvatrate');
 $newvatrate=GETPOST('newvatrate');
 //$price_base_type=GETPOST('price_base_type');
 
-$objectstatic = new Product($db);
-$objectstatic2 = new ProductFournisseur($db);
 
 
 /*
@@ -87,6 +85,7 @@ if ($action == 'convert')
 				{
 					$obj = $db->fetch_object($resql);
 
+					$objectstatic = new Product($db);          // Object init must be into loop to avoid to get value of previous step
 					$ret=$objectstatic->fetch($obj->rowid);
 					if ($ret > 0)
 					{
@@ -150,7 +149,8 @@ if ($action == 'convert')
 						if ($ret < 0 || $retm < 0) $error++;
 						else $nbrecordsmodified++;
 					}
-
+                    unset($objectstatic);
+                    
 					$i++;
 				}
 			}
@@ -176,6 +176,7 @@ if ($action == 'convert')
 			{
 				$obj = $db->fetch_object($resql);
 
+                $objectstatic2 = new ProductFournisseur($db);          // Object init must be into loop to avoid to get value of previous step
 				$ret=$objectstatic2->fetch_product_fournisseur_price($obj->rowid);
 				if ($ret > 0)
 				{
@@ -207,6 +208,8 @@ if ($action == 'convert')
 					if ($ret < 0 || $retm < 0) $error++;
 					else $nbrecordsmodified++;
 				}
+				unset($objectstatic2);
+				
 				$i++;
 			}
 		}

From a2287fd1830083b998c5274212563c78bf5c1b44 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 24 Apr 2017 13:46:41 +0200
Subject: [PATCH 091/505] Add example of sql request to fix llx_product_price

---
 htdocs/install/mysql/migration/repair.sql | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/htdocs/install/mysql/migration/repair.sql b/htdocs/install/mysql/migration/repair.sql
index 6b9ea2a16f7..b5ed611ea51 100755
--- a/htdocs/install/mysql/migration/repair.sql
+++ b/htdocs/install/mysql/migration/repair.sql
@@ -257,3 +257,14 @@ delete from llx_commande_fournisseur_dispatch where fk_commandefourndet = 0 or f
 delete from llx_menu where menu_handler = 'smartphone';
 
 
+-- Clean product prices
+--delete from llx_product_price where date_price between '2017-04-20 06:51:00' and '2017-04-20 06:51:05'; 
+-- Set product prices into llx_product with last price into llx_product_prices
+--update llx_product as p set 
+-- p.price = (select pp.price from llx_product_price as pp where pp.price_level = 1 and pp.fk_product = p.rowid order by pp.tms desc limit 1),
+-- p.price_ttc = (select pp.price_ttc from llx_product_price as pp where pp.price_level = 1 and pp.fk_product = p.rowid order by pp.tms desc limit 1),
+-- p.price_min = (select pp.price_min from llx_product_price as pp where pp.price_level = 1 and pp.fk_product = p.rowid order by pp.tms desc limit 1),
+-- p.price_min_ttc = (select pp.price_min_ttc from llx_product_price as pp where pp.price_level = 1 and pp.fk_product = p.rowid order by pp.tms desc limit 1),
+-- p.tva_tx = 0
+-- where price = 17.5
+

From 8f97177dae03aca9df07fc2171d32df608f04bee Mon Sep 17 00:00:00 2001
From: florian HENRY <florian.henry@atm-consulting.fr>
Date: Mon, 24 Apr 2017 14:44:44 +0200
Subject: [PATCH 092/505] FIX 6614

---
 htdocs/compta/facture/fiche-rec.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php
index 7217e1eedf7..4adfc24b4dc 100644
--- a/htdocs/compta/facture/fiche-rec.php
+++ b/htdocs/compta/facture/fiche-rec.php
@@ -889,7 +889,6 @@ if ($action == 'create')
 
 	$object = new Facture($db);   // Source invoice
 	$product_static = new Product($db);
-	$formproject = new FormProjets($db);
 
 	if ($object->fetch($id, $ref) > 0)
 	{

From d9cdaeb851671771c6a7ef483ebfe9fba03a0c9b Mon Sep 17 00:00:00 2001
From: AlainRnet <alainrihs@sunrise.ch>
Date: Mon, 24 Apr 2017 15:43:36 +0200
Subject: [PATCH 093/505] without html.formprojet.class.php called, not
 possible create invoice template

cf. https://github.com/Dolibarr/dolibarr/issues/6614
without this class AND module Projects disabled, it's not possible to create an invoice template. So I pulled out the call of the class from the condition.
---
 htdocs/compta/facture/fiche-rec.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php
index 706807c8f02..d164019b64d 100644
--- a/htdocs/compta/facture/fiche-rec.php
+++ b/htdocs/compta/facture/fiche-rec.php
@@ -35,8 +35,9 @@ require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 if (! empty($conf->projet->enabled)) {
     require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
-    require_once DOL_DOCUMENT_ROOT . '/core/class/html.formprojet.class.php';
+    //require_once DOL_DOCUMENT_ROOT . '/core/class/html.formprojet.class.php';
 }
+require_once DOL_DOCUMENT_ROOT . '/core/class/html.formprojet.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/invoice.lib.php';
 

From 0c7cfdb03753bcf5ab5550d94eb848c33e4c5921 Mon Sep 17 00:00:00 2001
From: philippe grand <philippe.grand@atoo-net.com>
Date: Mon, 24 Apr 2017 16:36:58 +0200
Subject: [PATCH 094/505] Update code using new css class

---
 htdocs/admin/agenda.php       |  3 +--
 htdocs/admin/agenda_other.php | 11 ++---------
 htdocs/admin/bank.php         |  4 +---
 htdocs/admin/company.php      | 36 +++++++++++++----------------------
 htdocs/admin/compta.php       |  9 ++++-----
 htdocs/admin/events.php       |  2 +-
 htdocs/admin/fichinter.php    |  9 ++-------
 7 files changed, 24 insertions(+), 50 deletions(-)

diff --git a/htdocs/admin/agenda.php b/htdocs/admin/agenda.php
index d076fcf7e26..051179d61ca 100644
--- a/htdocs/admin/agenda.php
+++ b/htdocs/admin/agenda.php
@@ -150,7 +150,6 @@ print $langs->trans("AgendaAutoActionDesc")."<br>\n";
 print $langs->trans("OnlyActiveElementsAreShown").'<br>';
 print "<br>\n";
 
-$var=true;
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
 print '<td colspan="2">'.$langs->trans("ActionsEvents").'</td>';
@@ -180,7 +179,7 @@ if (! empty($triggers))
 			print '<td align="right" width="40">';
 			$key='MAIN_AGENDA_ACTIONAUTO_'.$trigger['code'];
 			$value=$conf->global->$key;
-			print '<input '.$bc[$var].' type="checkbox" name="'.$key.'" value="1"'.((($action=='selectall'||$value) && $action!="selectnone")?' checked':'').'>';
+			print '<input class="oddeven" type="checkbox" name="'.$key.'" value="1"'.((($action=='selectall'||$value) && $action!="selectnone")?' checked':'').'>';
 			print '</td></tr>'."\n";
 		}
 	}
diff --git a/htdocs/admin/agenda_other.php b/htdocs/admin/agenda_other.php
index 6e0a62610aa..17ccd64d000 100644
--- a/htdocs/admin/agenda_other.php
+++ b/htdocs/admin/agenda_other.php
@@ -245,7 +245,6 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
     
     clearstatcache();
     
-    $var=true;
     foreach ($dirmodels as $reldir)
     {
     	$dir = dol_buildpath($reldir."core/modules/action/doc/");
@@ -263,10 +262,9 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
             			$classname = substr($file, 0, dol_strlen($file) -12);
             			
             			require_once $dir.'/'.$file;
-            			$module = new $classname($db, new ActionComm($db));
+            			$module = new $classname($db, new ActionComm($db));           			
             			
-            			
-            			print "<tr ".$bc[$var].">\n";
+            			print '<tr class="oddeven">\n';
             			print "<td>";
             			print (empty($module->name)?$name:$module->name);
             			print "</td>\n";
@@ -338,8 +336,6 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
     print '</table><br>';
 }
 
-$var=true;
-
 print '<form action="'.$_SERVER["PHP_SELF"].'" name="agenda">';
 print '<input type="hidden" name="action" value="set">';
 
@@ -380,7 +376,6 @@ if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))
 }
 
 // AGENDA_DEFAULT_FILTER_TYPE
-
 print '<tr class="oddeven">'."\n";
 print '<td>'.$langs->trans("AGENDA_DEFAULT_FILTER_TYPE").'</td>'."\n";
 print '<td align="center">&nbsp;</td>'."\n";
@@ -389,7 +384,6 @@ $formactions->select_type_actions($conf->global->AGENDA_DEFAULT_FILTER_TYPE, "AG
 print '</td></tr>'."\n";
 
 // AGENDA_DEFAULT_FILTER_STATUS
-
 print '<tr class="oddeven">'."\n";
 print '<td>'.$langs->trans("AGENDA_DEFAULT_FILTER_STATUS").'</td>'."\n";
 print '<td align="center">&nbsp;</td>'."\n";
@@ -398,7 +392,6 @@ $formactions->form_select_status_action('agenda', $conf->global->AGENDA_DEFAULT_
 print '</td></tr>'."\n";
 
 // AGENDA_DEFAULT_VIEW
-
 print '<tr class="oddeven">'."\n";
 print '<td>'.$langs->trans("AGENDA_DEFAULT_VIEW").'</td>'."\n";
 print '<td align="center">&nbsp;</td>'."\n";
diff --git a/htdocs/admin/bank.php b/htdocs/admin/bank.php
index 98cecb2f44b..8ed1e3cd9ac 100644
--- a/htdocs/admin/bank.php
+++ b/htdocs/admin/bank.php
@@ -273,7 +273,6 @@ print "</tr>\n";
 
 clearstatcache();
 
-$var = true;
 foreach ($dirmodels as $reldir) 
 {
     foreach (array('', '/doc') as $valdir) {
@@ -305,8 +304,7 @@ foreach ($dirmodels as $reldir)
                                 $modulequalified = 0;
                             
                             if ($modulequalified) {
-                                $var = ! $var;
-                                print '<tr ' . $bc[$var] . '><td width="100">';
+                                print '<tr class="oddeven"><td width="100">';
                                 print(empty($module->name) ? $name : $module->name);
                                 print "</td><td>\n";
                                 if (method_exists($module, 'info'))
diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php
index 8c29fe67a1c..ef22d8ecb4a 100644
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2004-2013	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@capnetworks.com>
  * Copyright (C) 2010-2014	Juanjo Menent			<jmenent@2byte.es>
- * Copyright (C) 2011-2016	Philippe Grand			<philippe.grand@atoo-net.com>
+ * Copyright (C) 2011-2017	Philippe Grand			<philippe.grand@atoo-net.com>
  * Copyright (C) 2015       Alexandre Spangaro      <aspangaro.dolibarr@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -545,7 +545,6 @@ if ($action == 'edit' || $action == 'updateedit')
 	print '<tr class="liste_titre">';
 	print '<td class="titlefield">'.$langs->trans("FiscalYearInformation").'</td><td>'.$langs->trans("Value").'</td>';
 	print "</tr>\n";
-	$var=true;
 
 	
 	print '<tr class="oddeven"><td><label for="fiscalmonthstart">'.$langs->trans("FiscalMonthStart").'</label></td><td>';
@@ -561,10 +560,9 @@ if ($action == 'edit' || $action == 'updateedit')
 	print '<td class="titlefield">'.$langs->trans("VATManagement").'</td><td>'.$langs->trans("Description").'</td>';
 	print '<td align="right">&nbsp;</td>';
 	print "</tr>\n";
-	$var=true;
 
 	
-	print "<tr ".$bc[$var]."><td width=\"140\"><label><input type=\"radio\" name=\"optiontva\" id=\"use_vat\" value=\"1\"".(empty($conf->global->FACTURE_TVAOPTION)?"":" checked")."> ".$langs->trans("VATIsUsed")."</label></td>";
+	print "<tr class=\"oddeven\"><td width=\"140\"><label><input type=\"radio\" name=\"optiontva\" id=\"use_vat\" value=\"1\"".(empty($conf->global->FACTURE_TVAOPTION)?"":" checked")."> ".$langs->trans("VATIsUsed")."</label></td>";
 	print '<td colspan="2">';
 	print "<table>";
 	print "<tr><td><label for=\"use_vat\">".$langs->trans("VATIsUsedDesc")."</label></td></tr>";
@@ -573,7 +571,7 @@ if ($action == 'edit' || $action == 'updateedit')
 	print "</td></tr>\n";
 
 	
-	print "<tr ".$bc[$var]."><td width=\"140\"><label><input type=\"radio\" name=\"optiontva\" id=\"no_vat\" value=\"0\"".(empty($conf->global->FACTURE_TVAOPTION)?" checked":"")."> ".$langs->trans("VATIsNotUsed")."</label></td>";
+	print "<tr class=\"oddeven\"><td width=\"140\"><label><input type=\"radio\" name=\"optiontva\" id=\"no_vat\" value=\"0\"".(empty($conf->global->FACTURE_TVAOPTION)?" checked":"")."> ".$langs->trans("VATIsNotUsed")."</label></td>";
 	print '<td colspan="2">';
 	print "<table>";
 	print "<tr><td><label for=\"no_vat\">".$langs->trans("VATIsNotUsedDesc")."</label></td></tr>";
@@ -595,10 +593,9 @@ if ($action == 'edit' || $action == 'updateedit')
 		print '<td>'.$langs->transcountry("LocalTax1Management",$mysoc->country_code).'</td><td>'.$langs->trans("Description").'</td>';
 		print '<td align="right">&nbsp;</td>';
 		print "</tr>\n";
-		$var=true;
 		
 		// Note: When option is not set, it must not appears as set on on, because there is no default value for this option
-		print "<tr ".$bc[$var]."><td width=\"140\"><input type=\"radio\" name=\"optionlocaltax1\" id=\"lt1\" value=\"localtax1on\"".(($conf->global->FACTURE_LOCAL_TAX1_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1on")?" checked":"")."> ".$langs->transcountry("LocalTax1IsUsed",$mysoc->country_code)."</td>";
+		print "<tr class=\"oddeven\"><td width=\"140\"><input type=\"radio\" name=\"optionlocaltax1\" id=\"lt1\" value=\"localtax1on\"".(($conf->global->FACTURE_LOCAL_TAX1_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1on")?" checked":"")."> ".$langs->transcountry("LocalTax1IsUsed",$mysoc->country_code)."</td>";
 		print '<td colspan="2">';
 		print '<table class="nobordernopadding">';
 		print "<tr><td><label for=\"lt1\">".$langs->transcountry("LocalTax1IsUsedDesc",$mysoc->country_code)."</label></td></tr>";
@@ -620,7 +617,7 @@ if ($action == 'edit' || $action == 'updateedit')
 		print "</td></tr>\n";
 
 		
-		print "<tr ".$bc[$var]."><td width=\"140\"><input type=\"radio\" name=\"optionlocaltax1\" id=\"nolt1\" value=\"localtax1off\"".((empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) || $conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1off")?" checked":"")."> ".$langs->transcountry("LocalTax1IsNotUsed",$mysoc->country_code)."</td>";
+		print "<tr class=\"oddeven\"><td width=\"140\"><input type=\"radio\" name=\"optionlocaltax1\" id=\"nolt1\" value=\"localtax1off\"".((empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) || $conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1off")?" checked":"")."> ".$langs->transcountry("LocalTax1IsNotUsed",$mysoc->country_code)."</td>";
 		print '<td colspan="2">';
 		print "<table>";
 		print "<tr><td><label for=\"nolt1\">".$langs->transcountry("LocalTax1IsNotUsedDesc",$mysoc->country_code)."</label></td></tr>";
@@ -639,11 +636,10 @@ if ($action == 'edit' || $action == 'updateedit')
 		print '<td>'.$langs->transcountry("LocalTax2Management",$mysoc->country_code).'</td><td>'.$langs->trans("Description").'</td>';
 		print '<td align="right">&nbsp;</td>';
 		print "</tr>\n";
-		$var=true;
 
 		
 		// Note: When option is not set, it must not appears as set on on, because there is no default value for this option
-		print "<tr ".$bc[$var]."><td width=\"140\"><input type=\"radio\" name=\"optionlocaltax2\" id=\"lt2\" value=\"localtax2on\"".(($conf->global->FACTURE_LOCAL_TAX2_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2on")?" checked":"")."> ".$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code)."</td>";
+		print "<tr class=\"oddeven\"><td width=\"140\"><input type=\"radio\" name=\"optionlocaltax2\" id=\"lt2\" value=\"localtax2on\"".(($conf->global->FACTURE_LOCAL_TAX2_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2on")?" checked":"")."> ".$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code)."</td>";
 		print '<td colspan="2">';
 		print '<table class="nobordernopadding">';
 		print "<tr><td><label for=\"lt2\">".$langs->transcountry("LocalTax2IsUsedDesc",$mysoc->country_code)."</label></td></tr>";
@@ -662,7 +658,7 @@ if ($action == 'edit' || $action == 'updateedit')
 		print "</td></tr>\n";
 
 		
-		print "<tr ".$bc[$var]."><td width=\"140\"><input type=\"radio\" name=\"optionlocaltax2\" id=\"nolt2\" value=\"localtax2off\"".((empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) || $conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2off")?" checked":"")."> ".$langs->transcountry("LocalTax2IsNotUsed",$mysoc->country_code)."</td>";
+		print "<tr class=\"oddeven\"><td width=\"140\"><input type=\"radio\" name=\"optionlocaltax2\" id=\"nolt2\" value=\"localtax2off\"".((empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) || $conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2off")?" checked":"")."> ".$langs->transcountry("LocalTax2IsNotUsed",$mysoc->country_code)."</td>";
 		print '<td colspan="2">';
 		print "<table>";
 		print "<tr><td><label for=\"nolt2\">".$langs->transcountry("LocalTax2IsNotUsedDesc",$mysoc->country_code)."</label></td></tr>";
@@ -696,7 +692,6 @@ else
 
 	print '<table class="noborder" width="100%">';
 	print '<tr class="liste_titre"><td>'.$langs->trans("CompanyInfo").'</td><td>'.$langs->trans("Value").'</td></tr>';
-	$var=true;
 
 	
 	print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("CompanyName").'</td><td>';
@@ -799,7 +794,6 @@ else
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	print '<table class="noborder" width="100%">';
 	print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("CompanyIds").'</td><td>'.$langs->trans("Value").'</td></tr>';
-	$var=true;
 
 	// Managing Director(s)
 	
@@ -965,7 +959,6 @@ else
 	print '<tr class="liste_titre">';
 	print '<td class="titlefield">'.$langs->trans("FiscalYearInformation").'</td><td>'.$langs->trans("Value").'</td>';
 	print "</tr>\n";
-	$var=true;
 
 	
 	print '<tr class="oddeven"><td>'.$langs->trans("FiscalMonthStart").'</td><td>';
@@ -983,10 +976,9 @@ else
 	print '<td>'.$langs->trans("VATManagement").'</td><td>'.$langs->trans("Description").'</td>';
 	print '<td align="right">&nbsp;</td>';
 	print "</tr>\n";
-	$var=true;
 
 	
-	print "<tr ".$bc[$var]."><td width=\"160\"><input ".$bc[$var]." type=\"radio\" name=\"optiontva\" id=\"use_vat\" disabled value=\"1\"".(empty($conf->global->FACTURE_TVAOPTION)?"":" checked")."> ".$langs->trans("VATIsUsed")."</td>";
+	print "<tr class=\"oddeven\"><td width=\"160\"><input class=\"oddeven\" type=\"radio\" name=\"optiontva\" id=\"use_vat\" disabled value=\"1\"".(empty($conf->global->FACTURE_TVAOPTION)?"":" checked")."> ".$langs->trans("VATIsUsed")."</td>";
 	print '<td colspan="2">';
 	print "<table>";
 	print "<tr><td><label for=\"use_vat\">".$langs->trans("VATIsUsedDesc")."</label></td></tr>";
@@ -995,7 +987,7 @@ else
 	print "</td></tr>\n";
 
 	
-	print "<tr ".$bc[$var]."><td width=\"160\"><input ".$bc[$var]." type=\"radio\" name=\"optiontva\" id=\"no_vat\" disabled value=\"0\"".(empty($conf->global->FACTURE_TVAOPTION)?" checked":"")."> ".$langs->trans("VATIsNotUsed")."</td>";
+	print "<tr class=\"oddeven\"><td width=\"160\"><input class=\"oddeven\" type=\"radio\" name=\"optiontva\" id=\"no_vat\" disabled value=\"0\"".(empty($conf->global->FACTURE_TVAOPTION)?" checked":"")."> ".$langs->trans("VATIsNotUsed")."</td>";
 	print '<td colspan="2">';
 	print "<table>";
 	print "<tr><td><label=\"no_vat\">".$langs->trans("VATIsNotUsedDesc")."</label></td></tr>";
@@ -1018,10 +1010,9 @@ else
 		print '<td>'.$langs->transcountry("LocalTax1Management",$mysoc->country_code).'</td><td>'.$langs->trans("Description").'</td>';
 		print '<td align="right">&nbsp;</td>';
 		print "</tr>\n";
-		$var=true;
 
 		
-		print "<tr ".$bc[$var]."><td width=\"160\"><input ".$bc[$var]." type=\"radio\" name=\"optionlocaltax1\" id=\"lt1\" disabled value=\"localtax1on\"".(($conf->global->FACTURE_LOCAL_TAX1_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1on")?" checked":"")."> ".$langs->transcountry("LocalTax1IsUsed",$mysoc->country_code)."</td>";
+		print "<tr class=\"oddeven\"><td width=\"160\"><input class=\"oddeven\" type=\"radio\" name=\"optionlocaltax1\" id=\"lt1\" disabled value=\"localtax1on\"".(($conf->global->FACTURE_LOCAL_TAX1_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1on")?" checked":"")."> ".$langs->transcountry("LocalTax1IsUsed",$mysoc->country_code)."</td>";
 		print '<td colspan="2">';
 		print "<table>";
 		print "<tr><td></label for=\"lt1\">".$langs->transcountry("LocalTax1IsUsedDesc",$mysoc->country_code)."</label></td></tr>";
@@ -1049,7 +1040,7 @@ else
 		print "</td></tr>\n";
 
 		
-		print "<tr ".$bc[$var]."><td width=\"160\"><input ".$bc[$var]." type=\"radio\" name=\"optionlocaltax1\" id=\"nolt1\" disabled value=\"localtax1off\"".((empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) || $conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1off")?" checked":"")."> ".$langs->transcountry("LocalTax1IsNotUsed",$mysoc->country_code)."</td>";
+		print "<tr class=\"oddeven\"><td width=\"160\"><input class=\"oddeven\" type=\"radio\" name=\"optionlocaltax1\" id=\"nolt1\" disabled value=\"localtax1off\"".((empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) || $conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1off")?" checked":"")."> ".$langs->transcountry("LocalTax1IsNotUsed",$mysoc->country_code)."</td>";
 		print '<td colspan="2">';
 		print "<table>";
 		print "<tr><td><label for=\"no_lt1\">".$langs->transcountry("LocalTax1IsNotUsedDesc",$mysoc->country_code)."</label></td></tr>";
@@ -1069,10 +1060,9 @@ else
 		print '<td>'.$langs->transcountry("LocalTax2Management",$mysoc->country_code).'</td><td>'.$langs->trans("Description").'</td>';
 		print '<td align="right">&nbsp;</td>';
 		print "</tr>\n";
-		$var=true;
 
 		
-		print "<tr ".$bc[$var]."><td width=\"160\"><input ".$bc[$var]." type=\"radio\" name=\"optionlocaltax2\" id=\"lt2\" disabled value=\"localtax2on\"".(($conf->global->FACTURE_LOCAL_TAX2_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2on")?" checked":"")."> ".$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code)."</td>";
+		print "<tr class=\"oddeven\"><td width=\"160\"><input class=\"oddeven\" type=\"radio\" name=\"optionlocaltax2\" id=\"lt2\" disabled value=\"localtax2on\"".(($conf->global->FACTURE_LOCAL_TAX2_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2on")?" checked":"")."> ".$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code)."</td>";
 		print '<td colspan="2">';
 		print "<table>";
 		print "<tr><td><label for=\"lt2\">".$langs->transcountry("LocalTax2IsUsedDesc",$mysoc->country_code)."</label></td></tr>";
@@ -1101,7 +1091,7 @@ else
 		print "</td></tr>\n";
 
 		
-		print "<tr ".$bc[$var]."><td width=\"160\"><input ".$bc[$var]." type=\"radio\" name=\"optionlocaltax2\" id=\"nolt2\" disabled value=\"localtax2off\"".((empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) || $conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2off")?" checked":"")."> ".$langs->transcountry("LocalTax2IsNotUsed",$mysoc->country_code)."</td>";
+		print "<tr class=\"oddeven\"><td width=\"160\"><input class=\"oddeven\" type=\"radio\" name=\"optionlocaltax2\" id=\"nolt2\" disabled value=\"localtax2off\"".((empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) || $conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2off")?" checked":"")."> ".$langs->transcountry("LocalTax2IsNotUsed",$mysoc->country_code)."</td>";
 		print '<td colspan="2">';
 		print "<table>";
 		print "<tr><td><label for=\"nolt2\">".$langs->transcountry("LocalTax2IsNotUsedDesc",$mysoc->country_code)."</label></td></tr>";
diff --git a/htdocs/admin/compta.php b/htdocs/admin/compta.php
index c097b9f39b1..0c42659357a 100644
--- a/htdocs/admin/compta.php
+++ b/htdocs/admin/compta.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2011-2013 Juanjo Menent	    <jmenent@2byte.es>
- * Copyright (C) 2013-2016 Philippe Grand	    <philippe.grand@atoo-net.com>
+ * Copyright (C) 2013-2017 Philippe Grand	    <philippe.grand@atoo-net.com>
  * Copyright (C) 2014      Marcos García        <marcosgdf@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -119,7 +119,7 @@ print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans('OptionMode').'</td><td>'.$langs->trans('Description').'</td>';
 print "</tr>\n";
-print '<tr '.$bc[false].'><td width="200"><input type="radio" name="accounting_mode" value="RECETTES-DEPENSES"'.($accounting_mode != 'CREANCES-DETTES' ? ' checked' : '').'> '.$langs->trans('OptionModeTrue').'</td>';
+print '<tr class="oddeven"><td width="200"><input type="radio" name="accounting_mode" value="RECETTES-DEPENSES"'.($accounting_mode != 'CREANCES-DETTES' ? ' checked' : '').'> '.$langs->trans('OptionModeTrue').'</td>';
 print '<td colspan="2">'.nl2br($langs->trans('OptionModeTrueDesc'));
 // Write info on way to count VAT
 //if (! empty($conf->global->MAIN_MODULE_COMPTABILITE))
@@ -133,7 +133,7 @@ print '<td colspan="2">'.nl2br($langs->trans('OptionModeTrueDesc'));
 //	//	print nl2br($langs->trans('OptionModeTrueInfoExpert'));
 //}
 print "</td></tr>\n";
-print '<tr '.$bc[true].'><td width="200"><input type="radio" name="accounting_mode" value="CREANCES-DETTES"'.($accounting_mode == 'CREANCES-DETTES' ? ' checked' : '').'> '.$langs->trans('OptionModeVirtual').'</td>';
+print '<tr class="oddeven"><td width="200"><input type="radio" name="accounting_mode" value="CREANCES-DETTES"'.($accounting_mode == 'CREANCES-DETTES' ? ' checked' : '').'> '.$langs->trans('OptionModeVirtual').'</td>';
 print '<td colspan="2">'.nl2br($langs->trans('OptionModeVirtualDesc'))."</td></tr>\n";
 
 print "</table>\n";
@@ -149,8 +149,7 @@ print "</tr>\n";
 foreach ($list as $key)
 {
 	
-
-	print '<tr '.$bc[$var].' class="value">';
+	print '<tr class="oddeven value">';
 
 	// Param
 	$libelle = $langs->trans($key);
diff --git a/htdocs/admin/events.php b/htdocs/admin/events.php
index 161b1aac45d..74525a6855b 100644
--- a/htdocs/admin/events.php
+++ b/htdocs/admin/events.php
@@ -105,7 +105,7 @@ foreach ($eventstolog as $key => $arr)
 		print '<td>';
 		$key='MAIN_LOGEVENTS_'.$arr['id'];
 		$value=$conf->global->$key;
-		print '<input '.$bc[$var].' type="checkbox" name="'.$key.'" value="1"'.($value?' checked':'').'>';
+		print '<input class="oddeven" type="checkbox" name="'.$key.'" value="1"'.($value?' checked':'').'>';
 		print '</td></tr>'."\n";
 	}
 }
diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php
index 6c73afcf8f5..3695a593ece 100644
--- a/htdocs/admin/fichinter.php
+++ b/htdocs/admin/fichinter.php
@@ -6,7 +6,7 @@
  * Copyright (C) 2005-2014 Regis Houssin                <regis.houssin@capnetworks.com>
  * Copyright (C) 2008      Raphael Bertrand (Resultic)  <raphael.bertrand@resultic.fr>
  * Copyright (C) 2011-2013 Juanjo Menent			    <jmenent@2byte.es>
- * Copyright (C) 2011-2015 Philippe Grand			    <philippe.grand@atoo-net.com>
+ * Copyright (C) 2011-2017 Philippe Grand			    <philippe.grand@atoo-net.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -291,7 +291,6 @@ foreach ($dirmodels as $reldir)
 		$handle = opendir($dir);
 		if (is_resource($handle))
 		{
-			$var=true;
 
 			while (($file = readdir($handle))!==false)
 			{
@@ -410,7 +409,6 @@ print "</tr>\n";
 
 clearstatcache();
 
-$var=true;
 foreach ($dirmodels as $reldir)
 {
 	$dir = dol_buildpath($reldir."core/modules/fichinter/doc/");
@@ -532,9 +530,7 @@ print '<td>'.$langs->trans("Parameter").'</td>';
 print '<td align="center" width="60">'.$langs->trans("Value").'</td>';
 print "<td>&nbsp;</td>\n";
 print "</tr>\n";
-$var=true;
 
-$var=! $var;
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="action" value="set_FICHINTER_FREE_TEXT">';
@@ -583,11 +579,10 @@ print '</td><td align="right">';
 print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
 print "</td></tr>\n";
 // Use services duration
-$var = !$var;
 print '<form action="' . $_SERVER["PHP_SELF"] . '" method="post">';
 print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
 print '<input type="hidden" name="action" value="set_FICHINTER_USE_SERVICE_DURATION">';
-print '<tr ' . $bc[$var] . '>';
+print '<tr class="oddeven">';
 print '<td>';
 print $langs->trans("UseServicesDurationOnFichinter");
 print '</td>';

From 113d4d1665dd76ab40d0aed3870af2c4d853eab8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 25 Apr 2017 10:29:13 +0200
Subject: [PATCH 095/505] FIX spaces not allowed into vat code

---
 htdocs/admin/dict.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 046a1cb9b27..3427382ea9f 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -680,7 +680,11 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
 	if ($_POST["accountancy_code"] <= 0) $_POST["accountancy_code"]='';	// If empty, we force to null
 	if ($_POST["accountancy_code_sell"] <= 0) $_POST["accountancy_code_sell"]='';	// If empty, we force to null
 	if ($_POST["accountancy_code_buy"] <= 0) $_POST["accountancy_code_buy"]='';	// If empty, we force to null
-
+    if ($id == 10 && isset($_POST["code"]))  // Spaces are not allowed into code 
+    {
+        $_POST["code"]=preg_replace('/\s/','',$_POST["code"]);
+    }
+    
     // Si verif ok et action add, on ajoute la ligne
     if ($ok && GETPOST('actionadd'))
     {

From e2dbcb2b5a68083711a373f2eaee78513eb20fcb Mon Sep 17 00:00:00 2001
From: philippe grand <philippe.grand@atoo-net.com>
Date: Tue, 25 Apr 2017 11:59:18 +0200
Subject: [PATCH 096/505] Update code using new css class

---
 htdocs/admin/loan.php             |  4 +---
 htdocs/admin/mails_templates.php  |  9 ++++-----
 htdocs/admin/modules.php          |  6 ++----
 htdocs/admin/oauth.php            | 13 ++++---------
 htdocs/admin/perms.php            |  4 +---
 htdocs/admin/salaries.php         |  2 +-
 htdocs/admin/supplier_invoice.php |  5 ++---
 htdocs/admin/supplier_order.php   |  5 ++---
 htdocs/admin/supplier_payment.php |  3 +--
 htdocs/admin/syslog.php           |  3 +--
 htdocs/admin/taxes.php            | 10 +++++-----
 htdocs/admin/websites.php         |  4 +---
 htdocs/admin/workflow.php         |  3 +--
 13 files changed, 26 insertions(+), 45 deletions(-)

diff --git a/htdocs/admin/loan.php b/htdocs/admin/loan.php
index ee6b9ef74ee..86d963ed54f 100644
--- a/htdocs/admin/loan.php
+++ b/htdocs/admin/loan.php
@@ -96,9 +96,7 @@ print "</tr>\n";
 
 foreach ($list as $key)
 {
-	
-
-	print '<tr '.$bc[$var].' class="value">';
+	print '<tr class="oddeven value">';
 
 	// Param
 	$label = $langs->trans($key); 
diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php
index f0bf5609adf..a4ec423b42f 100644
--- a/htdocs/admin/mails_templates.php
+++ b/htdocs/admin/mails_templates.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2004       Benoit Mortier          <benoit.mortier@opensides.be>
  * Copyright (C) 2005-2012  Regis Houssin           <regis.houssin@capnetworks.com>
  * Copyright (C) 2010-2016  Juanjo Menent           <jmenent@2byte.es>
- * Copyright (C) 2011-2015  Philippe Grand          <philippe.grand@atoo-net.com>
+ * Copyright (C) 2011-2017  Philippe Grand          <philippe.grand@atoo-net.com>
  * Copyright (C) 2011       Remy Younes             <ryounes@gmail.com>
  * Copyright (C) 2012-2015  Marcos García           <marcosgdf@gmail.com>
  * Copyright (C) 2012       Christophe Battarel     <christophe.battarel@ltairis.fr>
@@ -651,11 +651,10 @@ if ($resql)
         // Lines with values
         while ($i < $num)
         {
-            $var = ! $var;
 
             $obj = $db->fetch_object($resql);
             //print_r($obj);
-            print '<tr '.$bc[$var].' id="rowid-'.$obj->rowid.'">';
+            print '<tr class="oddeven" id="rowid-'.$obj->rowid.'">';
             if ($action == 'edit' && ($rowid == (! empty($obj->rowid)?$obj->rowid:$obj->code)))
             {
                 $tmpaction='edit';
@@ -689,7 +688,7 @@ if ($resql)
                     // Show value for field
                     if ($showfield) {
                 
-                        print '</tr><tr '.$bc[$var].' nohover tr-'.$tmpfieldlist.'-'.$rowid.' "><td colspan="5">'; // To create an artificial CR for the current tr we are on
+                        print '</tr><tr class="oddeven" nohover tr-'.$tmpfieldlist.'-'.$rowid.' "><td colspan="5">'; // To create an artificial CR for the current tr we are on
                         $okforextended = true;
                         if (empty($conf->global->FCKEDITOR_ENABLE_MAIL))
                             $okforextended = false;
@@ -781,7 +780,7 @@ if ($resql)
                     // Show value for field
                     if ($showfield) {
                         
-                        print '</tr><tr '.$bc[$var].' nohover tr-'.$tmpfieldlist.'-'.$i.' "><td colspan="5">'; // To create an artificial CR for the current tr we are on
+                        print '</tr><tr class="oddeven" nohover tr-'.$tmpfieldlist.'-'.$i.' "><td colspan="5">'; // To create an artificial CR for the current tr we are on
                         $okforextended = true;
                         if (empty($conf->global->FCKEDITOR_ENABLE_MAIL))
                             $okforextended = false;
diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index 4eb82e6183c..c47586b2b2a 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -428,8 +428,6 @@ $h++;
 print "<br>\n";
 
 
-$var=true;
-
 if ($mode == 'common')
 {
     
@@ -782,7 +780,7 @@ if ($mode == 'marketplace')
     print '</tr>';
 
     
-    print "<tr ".$bc[$var].">\n";
+    print "<tr class=\"oddeven\">\n";
     $url='https://www.dolistore.com';
     print '<td align="left"><a href="'.$url.'" target="_blank" rel="external"><img border="0" class="imgautosize imgmaxwidth180" src="'.DOL_URL_ROOT.'/theme/dolistore_logo.png"></a></td>';
     print '<td>'.$langs->trans("DoliStoreDesc").'</td>';
@@ -790,7 +788,7 @@ if ($mode == 'marketplace')
     print '</tr>';
 
     
-    print "<tr ".$bc[$var].">\n";
+    print "<tr class=\"oddeven\">\n";
     $url='https://partners.dolibarr.org';
     print '<td align="left"><a href="'.$url.'" target="_blank" rel="external"><img border="0" class="imgautosize imgmaxwidth180" src="'.DOL_URL_ROOT.'/theme/dolibarr_preferred_partner_int.png"></a></td>';
     print '<td>'.$langs->trans("DoliPartnersDesc").'</td>';
diff --git a/htdocs/admin/oauth.php b/htdocs/admin/oauth.php
index 34aa49ea237..c1bb5909e15 100644
--- a/htdocs/admin/oauth.php
+++ b/htdocs/admin/oauth.php
@@ -93,7 +93,6 @@ print $langs->trans("ListOfSupportedOauthProviders").'<br><br>';
 
 print '<table class="noborder" width="100%">';
 
-$var = true;
 $i=0;
 
 foreach ($list as $key)
@@ -116,31 +115,27 @@ foreach ($list as $key)
     if ($supported)
     {
         $redirect_uri=$urlwithroot.'/core/modules/oauth/'.$supportedoauth2array[$key[0]].'_oauthcallback.php';
-        $var = !$var;
-        print '<tr '.$bc[$var].' class="value">';
+        print '<tr class="oddeven value">';
         print '<td>'.$langs->trans("UseTheFollowingUrlAsRedirectURI").'</td>';
         print '<td><input style="width: 80%" type"text" name="uri'.$key[0].'" value="'.$redirect_uri.'">';
         print '</td></tr>';
     }
     else
     {
-        $var = !$var;
-        print '<tr '.$bc[$var].' class="value">';
+        print '<tr class="oddeven value">';
         print '<td>'.$langs->trans("UseTheFollowingUrlAsRedirectURI").'</td>';
         print '<td>'.$langs->trans("FeatureNotYetSupported").'</td>';
         print '</td></tr>';
     }
         
     // Api Id
-    $var = !$var;
-    print '<tr '.$bc[$var].' class="value">';
+    print '<tr class="oddeven value">';
     print '<td><label for="'.$key[1].'">'.$langs->trans($key[1]).'</label></td>';
     print '<td><input type="text" size="100" id="'.$key[1].'" name="'.$key[1].'" value="'.$conf->global->{$key[1]}.'">';
     print '</td></tr>';
 
     // Api Secret
-    $var = !$var;
-    print '<tr '.$bc[$var].' class="value">';
+    print '<tr class="oddeven value">';
     print '<td><label for="'.$key[2].'">'.$langs->trans($key[2]).'</label></td>';
     print '<td><input type="password" size="100" id="'.$key[2].'" name="'.$key[2].'" value="'.$conf->global->{$key[2]}.'">';
     print '</td></tr>';
diff --git a/htdocs/admin/perms.php b/htdocs/admin/perms.php
index daafab71053..5acbeb2e627 100644
--- a/htdocs/admin/perms.php
+++ b/htdocs/admin/perms.php
@@ -140,7 +140,6 @@ if ($result)
 {
     $num	= $db->num_rows($result);
     $i		= 0;
-    $var	= True;
     $oldmod	= "";
 
     while ($i < $num)
@@ -187,8 +186,7 @@ if ($result)
         }
 
         
-        print '<tr '. $bc[$var].'>';
-
+        print '<tr class="oddeven">';
         print '<td>'.img_object('',$picto).' '.$objMod->getName();
         print '<a name="'.$objMod->getName().'">&nbsp;</a>';
 
diff --git a/htdocs/admin/salaries.php b/htdocs/admin/salaries.php
index a04b23ce4fe..52470be4106 100644
--- a/htdocs/admin/salaries.php
+++ b/htdocs/admin/salaries.php
@@ -99,7 +99,7 @@ foreach ($list as $key)
 {
 	
 
-	print '<tr '.$bc[$var].' class="value">';
+	print '<tr class="oddeven value">';
 
 	// Param
 	$label = $langs->trans($key);
diff --git a/htdocs/admin/supplier_invoice.php b/htdocs/admin/supplier_invoice.php
index 2619951e1b5..9e717ee125a 100644
--- a/htdocs/admin/supplier_invoice.php
+++ b/htdocs/admin/supplier_invoice.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2004      Sebastien Di Cintio     <sdicintio@ressource-toi.org>
  * Copyright (C) 2004      Benoit Mortier          <benoit.mortier@opensides.be>
  * Copyright (C) 2010-2013 Juanjo Menent           <jmenent@2byte.es>
- * Copyright (C) 2011-2015 Philippe Grand          <philippe.grand@atoo-net.com>
+ * Copyright (C) 2011-2017 Philippe Grand          <philippe.grand@atoo-net.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -361,7 +361,6 @@ foreach ($dirmodels as $reldir)
 
     if (is_dir($dir))
     {
-        $var=true;
 
         $handle=opendir($dir);
 
@@ -379,7 +378,7 @@ foreach ($dirmodels as $reldir)
 	                $module = new $classname($db, new FactureFournisseur($db));
 
                     
-                    print "<tr ".$bc[$var].">\n";
+                    print "<tr class=\"oddeven\">\n";
                     print "<td>";
 	                print (empty($module->name)?$name:$module->name);
 	                print "</td>\n";
diff --git a/htdocs/admin/supplier_order.php b/htdocs/admin/supplier_order.php
index d54f0e367aa..7bca2418df3 100644
--- a/htdocs/admin/supplier_order.php
+++ b/htdocs/admin/supplier_order.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2004      Sebastien Di Cintio     <sdicintio@ressource-toi.org>
  * Copyright (C) 2004      Benoit Mortier          <benoit.mortier@opensides.be>
  * Copyright (C) 2010-2013 Juanjo Menent           <jmenent@2byte.es>
- * Copyright (C) 2011-2015 Philippe Grand          <philippe.grand@atoo-net.com>
+ * Copyright (C) 2011-2017 Philippe Grand          <philippe.grand@atoo-net.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -382,7 +382,6 @@ print '</tr>'."\n";
 
 clearstatcache();
 
-$var=true;
 foreach ($dirmodels as $reldir)
 {
 	$dir = dol_buildpath($reldir."core/modules/supplier_order/pdf/");
@@ -403,7 +402,7 @@ foreach ($dirmodels as $reldir)
 	                $module = new $classname($db, new CommandeFournisseur($db));
 
                     
-                    print "<tr ".$bc[$var].">\n";
+                    print "<tr class=\"oddeven\">\n";
                     print "<td>";
 	                print (empty($module->name)?$name:$module->name);
 	                print "</td>\n";
diff --git a/htdocs/admin/supplier_payment.php b/htdocs/admin/supplier_payment.php
index 40caa94c8a8..0f6cbff6179 100644
--- a/htdocs/admin/supplier_payment.php
+++ b/htdocs/admin/supplier_payment.php
@@ -367,7 +367,6 @@ foreach ($dirmodels as $reldir)
 
     if (is_dir($dir))
     {
-        $var=true;
 
         $handle=opendir($dir);
 
@@ -385,7 +384,7 @@ foreach ($dirmodels as $reldir)
 	                $module = new $classname($db, new PaiementFourn($db));
 
                     
-                    print "<tr ".$bc[$var].">\n";
+                    print "<tr class=\"oddeven\">\n";
                     print "<td>";
 	                print (empty($module->name)?$name:$module->name);
 	                print "</td>\n";
diff --git a/htdocs/admin/syslog.php b/htdocs/admin/syslog.php
index 71d06ae8e64..40a94bffc71 100644
--- a/htdocs/admin/syslog.php
+++ b/htdocs/admin/syslog.php
@@ -194,7 +194,6 @@ print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Type").'</td><td>'.$langs->trans("Value").'</td>';
 print '<td align="right" colspan="2"><input type="submit" class="button" '.$option.' value="'.$langs->trans("Modify").'"></td>';
 print "</tr>\n";
-$var=true;
 
 foreach ($syslogModules as $moduleName)
 {
@@ -207,7 +206,7 @@ foreach ($syslogModules as $moduleName)
 	
 	print '<tr class="oddeven">';
 	print '<td width="140">';
-	print '<input '.$bc[$var].' type="checkbox" name="SYSLOG_HANDLERS[]" value="'.$moduleName.'" '.(in_array($moduleName, $activeModules) ? 'checked' : '').($moduleactive <= 0 ? 'disabled' : '').'> ';
+	print '<input class="oddeven" type="checkbox" name="SYSLOG_HANDLERS[]" value="'.$moduleName.'" '.(in_array($moduleName, $activeModules) ? 'checked' : '').($moduleactive <= 0 ? 'disabled' : '').'> ';
 	print $module->getName();
 	print '</td>';
 
diff --git a/htdocs/admin/taxes.php b/htdocs/admin/taxes.php
index 788d8604584..dbdce59c3c5 100644
--- a/htdocs/admin/taxes.php
+++ b/htdocs/admin/taxes.php
@@ -136,10 +136,10 @@ else
     print '<tr class="liste_titre">';
     print '<td colspan="2">'.$langs->trans('OptionVatMode').'</td><td>'.$langs->trans('Description').'</td>';
     print "</tr>\n";
-    print '<tr '.$bc[false].'><td width="200"><input type="radio" name="tax_mode" value="0"'.($tax_mode != 1 ? ' checked' : '').'> '.$langs->trans('OptionVATDefault').'</td>';
+    print '<tr class="oddeven"><td width="200"><input type="radio" name="tax_mode" value="0"'.($tax_mode != 1 ? ' checked' : '').'> '.$langs->trans('OptionVATDefault').'</td>';
     print '<td colspan="2">'.nl2br($langs->trans('OptionVatDefaultDesc'));
     print "</td></tr>\n";
-    print '<tr '.$bc[true].'><td width="200"><input type="radio" name="tax_mode" value="1"'.($tax_mode == 1 ? ' checked' : '').'> '.$langs->trans('OptionVATDebitOption').'</td>';
+    print '<tr class="oddeven"><td width="200"><input type="radio" name="tax_mode" value="1"'.($tax_mode == 1 ? ' checked' : '').'> '.$langs->trans('OptionVATDebitOption').'</td>';
     print '<td colspan="2">'.nl2br($langs->trans('OptionVatDebitOptionDesc'))."</td></tr>\n";
 
     print "</table>\n";
@@ -152,7 +152,7 @@ else
     print '<tr class="liste_titre"><td>&nbsp;</td><td>'.$langs->trans("Buy").'</td><td>'.$langs->trans("Sell").'</td></tr>';
 
     // Products
-    print '<tr '.$bc[false].'><td>'.$langs->trans("Product").'</td>';
+    print '<tr class="oddeven"><td>'.$langs->trans("Product").'</td>';
     print '<td>';
     print $langs->trans("OnDelivery");
     print ' ('.$langs->trans("SupposedToBeInvoiceDate").')';
@@ -163,7 +163,7 @@ else
     print '</td></tr>';
 
     // Services
-    print '<tr '.$bc[true].'><td>'.$langs->trans("Services").'</td>';
+    print '<tr class="oddeven"><td>'.$langs->trans("Services").'</td>';
     print '<td>';
     if ($tax_mode == 0)
     {
@@ -206,7 +206,7 @@ foreach ($list as $key)
 {
 	
 
-	print '<tr '.$bc[$var].' class="value">';
+	print '<tr class="oddeven value">';
 
 	// Param
 	$label = $langs->trans($key); 
diff --git a/htdocs/admin/websites.php b/htdocs/admin/websites.php
index b0c81ec18af..f7e71555943 100644
--- a/htdocs/admin/websites.php
+++ b/htdocs/admin/websites.php
@@ -450,7 +450,6 @@ if ($id)
     {
         $num = $db->num_rows($resql);
         $i = 0;
-        $var=true;
         if ($num)
         {
             // There is several pages
@@ -499,11 +498,10 @@ if ($id)
             // Lines with values
             while ($i < $num)
             {
-                $var = ! $var;
 
                 $obj = $db->fetch_object($resql);
                 //print_r($obj);
-                print '<tr '.$bc[$var].' id="rowid-'.$obj->rowid.'">';
+                print '<tr class="oddeven" id="rowid-'.$obj->rowid.'">';
                 if ($action == 'edit' && ($rowid == (! empty($obj->rowid)?$obj->rowid:$obj->code)))
                 {
                     print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'" method="POST">';
diff --git a/htdocs/admin/workflow.php b/htdocs/admin/workflow.php
index d9595cd7fb0..af104fd4bfe 100644
--- a/htdocs/admin/workflow.php
+++ b/htdocs/admin/workflow.php
@@ -120,8 +120,7 @@ foreach($workflowcodes as $key => $params)
 		$oldfamily = $family;
    	}
 
-   	$var = !$var;
-   	print "<tr ".$bc[$var].">\n";
+   	print "<tr class=\"oddeven\">\n";
    	print "<td>".img_object('', $picto).$langs->trans('desc'.$key);
    	if (! empty($params['warning']))
    	{

From 84e774ff32aa0147ef6ac1b8b4c17294b3203933 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 25 Apr 2017 12:57:20 +0200
Subject: [PATCH 097/505] Better translation

---
 htdocs/install/check.php          | 4 ++--
 htdocs/install/default.css        | 9 +++++----
 htdocs/langs/en_US/bookmarks.lang | 2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/htdocs/install/check.php b/htdocs/install/check.php
index b37837df663..bc7082b8d9d 100644
--- a/htdocs/install/check.php
+++ b/htdocs/install/check.php
@@ -363,7 +363,7 @@ else
 		// Show first install line
 		$choice = '<tr class="listofchoices"><td class="listofchoices nowrap" align="center"><b>'.$langs->trans("FreshInstall").'</b>';
 		$choice .= '</td>';
-		$choice .= '<td class="listofchoices">';
+		$choice .= '<td class="listofchoices listofchoicesdesc">';
 		$choice .= $langs->trans("FreshInstallDesc");
 		if (empty($dolibarr_main_db_host))	// This means install process was not run
 		{
@@ -459,7 +459,7 @@ else
 
             $choice .= '<tr class="listofchoices '.($recommended_choice ? 'choiceselected' : '').'">';
             $choice .= '<td class="listofchoices nowrap" align="center"><b>'.$langs->trans("Upgrade").'<br>'.$newversionfrom.$newversionfrombis.' -> '.$newversionto.'</b></td>';
-            $choice .= '<td class="listofchoices">';
+            $choice .= '<td class="listofchoices listofchoicesdesc">';
             $choice .= $langs->trans("UpgradeDesc");
 
             if ($recommended_choice)
diff --git a/htdocs/install/default.css b/htdocs/install/default.css
index 257f2d99af8..9725b06b8bc 100644
--- a/htdocs/install/default.css
+++ b/htdocs/install/default.css
@@ -1,5 +1,5 @@
 /* Copyright (C) 2004      Rodolphe Quiedeville <rodolphe@quiedeville.org> 
- * Copyright (C) 2009-2016 Laurent Destailleur  <eldy@users.sourceforge.net> 
+ * Copyright (C) 2009-2017 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
@@ -210,7 +210,9 @@ table.listofchoices, tr.listofchoices, td.listofchoices {
 tr.listofchoices {
     height: 42px;	
 }
-
+.listofchoicesdesc {
+	color: #999 !important;
+}
 .blinkwait {
 	font-weight: bold;
 	text-decoration:blink !important;	
@@ -244,9 +246,8 @@ font.warning {
 div.error {
 	color: #550000;
 	font-weight: bold;
-	padding: 0.2em 0.2em 0.2em 0.2em;
+	padding: 0.2em 0.2em 0.2em 0;
 	margin: 0.5em 0 0.5em 0;
-	border: 1px solid #6C7C8B;
 }
 font.error {
 	color: #550000;
diff --git a/htdocs/langs/en_US/bookmarks.lang b/htdocs/langs/en_US/bookmarks.lang
index d15ed3e1148..9d2003f34d3 100644
--- a/htdocs/langs/en_US/bookmarks.lang
+++ b/htdocs/langs/en_US/bookmarks.lang
@@ -12,7 +12,7 @@ BookmarkTargetNewWindowShort=New window
 BookmarkTargetReplaceWindowShort=Current window
 BookmarkTitle=Bookmark title
 UrlOrLink=URL
-BehaviourOnClick=Behaviour when a URL is clicked
+BehaviourOnClick=Behaviour when a bookmark URL is selected
 CreateBookmark=Create bookmark
 SetHereATitleForLink=Set a title for the bookmark
 UseAnExternalHttpLinkOrRelativeDolibarrLink=Use an external http URL or a relative Dolibarr URL

From 4ab5674ffbbeb8af8ada5cc8c2a5b4b7ccd39bee Mon Sep 17 00:00:00 2001
From: Quentin Vial-Gouteyron <quentin@mail.atm-consulting.fr>
Date: Tue, 25 Apr 2017 15:10:46 +0200
Subject: [PATCH 098/505] FIX ajax autocomplete on clone

---
 htdocs/core/class/html.form.class.php | 13 +++++++++----
 htdocs/core/lib/ajax.lib.php          |  2 ++
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 0b5778a512a..b29f7bc5bf3 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -965,18 +965,23 @@ class Form
     		}
     		// mode 1
     		$urloption='htmlname='.$htmlname.'&outjson=1&filter='.$filter;
-    		print ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT.'/societe/ajax/company.php', $urloption, $conf->global->COMPANY_USE_SEARCH_TO_SELECT, 0, $ajaxoptions);
+    		$out.=  ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT.'/societe/ajax/company.php', $urloption, $conf->global->COMPANY_USE_SEARCH_TO_SELECT, 0, $ajaxoptions);
+			$out.='<style type="text/css">
+					.ui-autocomplete {
+						z-index: 150;
+					}
+				</style>';
     		if (empty($hidelabel)) print $langs->trans("RefOrLabel").' : ';
     		else if ($hidelabel > 1) {
     			if (! empty($conf->global->MAIN_HTML5_PLACEHOLDER)) $placeholder=' placeholder="'.$langs->trans("RefOrLabel").'"';
     			else $placeholder=' title="'.$langs->trans("RefOrLabel").'"';
     			if ($hidelabel == 2) {
-    				print img_picto($langs->trans("Search"), 'search');
+    				$out.=  img_picto($langs->trans("Search"), 'search');
     			}
     		}
-            print '<input type="text" class="minwidth100" name="search_'.$htmlname.'" id="search_'.$htmlname.'" value="'.$selected_input_value.'"'.$placeholder.' '.(!empty($conf->global->THIRDPARTY_SEARCH_AUTOFOCUS) ? 'autofocus' : '').' />';
+            $out.=  '<input type="text" class="minwidth100" name="search_'.$htmlname.'" id="search_'.$htmlname.'" value="'.$selected_input_value.'"'.$placeholder.' '.(!empty($conf->global->THIRDPARTY_SEARCH_AUTOFOCUS) ? 'autofocus' : '').' />';
     		if ($hidelabel == 3) {
-    			print img_picto($langs->trans("Search"), 'search');
+    			$out.=  img_picto($langs->trans("Search"), 'search');
     		}
     	}
     	else
diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php
index 0193a33b305..e7d8a7cf538 100644
--- a/htdocs/core/lib/ajax.lib.php
+++ b/htdocs/core/lib/ajax.lib.php
@@ -181,10 +181,12 @@ function ajax_autocompleter($selected, $htmlname, $url, $urloption='', $minLengt
     							});
     						}
     						console.log("ajax_autocompleter new value selected, we trigger change on original component so field #search_'.$htmlname.'");
+							
     						$("#search_'.$htmlname.'").trigger("change");	// We have changed value of the combo select, we must be sure to trigger all js hook binded on this event. This is required to trigger other javascript change method binded on original field by other code.
     					}
     					,delay: 500
 					}).data("ui-autocomplete")._renderItem = function( ul, item ) {
+						  
 						return $("<li>")
 						.data( "ui-autocomplete-item", item ) // jQuery UI > 1.10.0
 						.append( \'<a><span class="tag">\' + item.label + "</span></a>" )

From aa4b967e172c1a5d4d306d968648ba1b5cb73dab Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 26 Apr 2017 11:46:12 +0200
Subject: [PATCH 099/505] FIX image of rss when link is relative Fix regression
 after disabling constant init.

---
 htdocs/admin/external_rss.php | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/htdocs/admin/external_rss.php b/htdocs/admin/external_rss.php
index 7f81a5d0fef..30646b749fa 100644
--- a/htdocs/admin/external_rss.php
+++ b/htdocs/admin/external_rss.php
@@ -206,13 +206,13 @@ print '<td>'.$langs->trans("Example").'</td>';
 print '</tr>';
 print '<tr class="impair">';
 print '<td width="100">'.$langs->trans("Title").'</td>';
-print '<td><input type="text" name="external_rss_title_'.($lastexternalrss+1).'" value="'.@constant("EXTERNAL_RSS_TITLE_" . ($lastexternalrss+1)).'" size="64"></td>';
+print '<td><input type="text" class="flat minwidth300" name="external_rss_title_'.($lastexternalrss+1).'" value=""></td>';
 print '<td>'.$langs->trans('RSSUrlExample').'</td>';
 print '</tr>';
 
 print '<tr class="pair">';
 print '<td>'.$langs->trans('RSSUrl').'</td>';
-print '<td><input type="text" name="external_rss_urlrss_'.($lastexternalrss+1).'" value="'.@constant("EXTERNAL_RSS_URLRSS_" . ($lastexternalrss+1)).'" size="64"></td>';
+print '<td><input type="text" class="flat minwidth300" name="external_rss_urlrss_'.($lastexternalrss+1).'" value=""></td>';
 print '<td>http://news.google.com/news?ned=us&topic=h&output=rss<br>http://www.dolibarr.org/rss</td>';
 print '</tr>';
 print '</table>';
@@ -243,10 +243,12 @@ if ($resql)
 
 	    preg_match('/^([0-9]+)/i',$obj->note,$reg);
 		$idrss = $reg[1];
-		//print "x".$idrss;
+        $keyrssurl="EXTERNAL_RSS_URLRSS_".$idrss;
+        $keyrsstitle="EXTERNAL_RSS_URLRSS_".$idrss;
+        //print "x".$idrss;
 
         $rssparser=new RssParser($db);
-		$result = $rssparser->parser(@constant("EXTERNAL_RSS_URLRSS_".$idrss), 5, 300, $conf->externalrss->dir_temp);
+		$result = $rssparser->parser($conf->global->$keyrssurl, 5, 300, $conf->externalrss->dir_temp);
 
 		$var=true;
 
@@ -269,13 +271,13 @@ if ($resql)
 		
 		print '<tr class="oddeven">';
 		print "<td width=\"100px\">".$langs->trans("Title")."</td>";
-		print "<td><input type=\"text\" class=\"flat\" name=\"external_rss_title_" . $idrss . "\" value=\"" . @constant("EXTERNAL_RSS_TITLE_" . $idrss) . "\" size=\"64\"></td>";
+		print "<td><input type=\"text\" class=\"flat minwidth300\" name=\"external_rss_title_" . $idrss . "\" value=\"" . $conf->global->$keyrsstitle . "\"></td>";
 		print "</tr>";
 
 		
 		print '<tr class="oddeven">';
 		print "<td>".$langs->trans("URL")."</td>";
-		print "<td><input type=\"text\" class=\"flat\" name=\"external_rss_urlrss_" . $idrss . "\" value=\"" . @constant("EXTERNAL_RSS_URLRSS_" . $idrss) . "\" size=\"64\"></td>";
+		print "<td><input type=\"text\" class=\"flat minwidth300\" name=\"external_rss_urlrss_" . $idrss . "\" value=\"" . $conf->global->$keyrssurl . "\"></td>";
 		print "</tr>";
 
 		
@@ -304,6 +306,8 @@ if ($resql)
 			print "<td>".$langs->trans("Logo")."</td>";
 			print '<td>';
 			$imageurl=$rssparser->getImageUrl();
+			$linkrss=$rssparser->getLink();
+			if (! preg_match('/^http/', $imageurl)) $imageurl=$linkrss.$imageurl;
 			if ($imageurl) print '<img height="32" src="'.$imageurl.'">';
 			else print $langs->trans("None");
 			print '</td>';

From 1c20bbb2871808e3e6ee4d5ecf7874a3721c5f4e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 26 Apr 2017 12:07:32 +0200
Subject: [PATCH 100/505] NEW Add index and constraints keys on supplier
 proposal detail table

---
 .../install/mysql/migration/5.0.0-6.0.0.sql   |  5 ++++
 .../tables/llx_supplier_proposaldet.key.sql   | 26 +++++++++++++++++++
 2 files changed, 31 insertions(+)
 create mode 100644 htdocs/install/mysql/tables/llx_supplier_proposaldet.key.sql

diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index e73c0df2add..9ff9de4e70d 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -173,4 +173,9 @@ create table llx_default_values
 ALTER TABLE llx_default_values ADD UNIQUE INDEX uk_default_values(type, entity, user_id, page, param);
 
 
+ALTER TABLE llx_supplier_proposaldet ADD INDEX idx_supplier_proposaldet_fk_supplier_proposal (fk_supplier_proposal);
+ALTER TABLE llx_supplier_proposaldet ADD INDEX idx_supplier_proposaldet_fk_product (fk_product);
+
+ALTER TABLE llx_supplier_proposaldet ADD CONSTRAINT fk_supplier_proposaldet_fk_unit FOREIGN KEY (fk_unit) REFERENCES llx_c_units (rowid);
+ALTER TABLE llx_supplier_proposaldet ADD CONSTRAINT fk_supplier_proposaldet_fk_supplier_proposal FOREIGN KEY (fk_supplier_proposal) REFERENCES llx_supplier_proposal (rowid);
 
diff --git a/htdocs/install/mysql/tables/llx_supplier_proposaldet.key.sql b/htdocs/install/mysql/tables/llx_supplier_proposaldet.key.sql
new file mode 100644
index 00000000000..e6af3c7e515
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_supplier_proposaldet.key.sql
@@ -0,0 +1,26 @@
+-- ===================================================================
+-- Copyright (C) 2009-2011 Regis Houssin  <regis.houssin@capnetworks.com>
+-- Copyright (C) 2012      Cédric Salvador      <csalvador@gpcsolutions.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
+-- 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/>.
+--
+-- ===================================================================
+
+
+
+ALTER TABLE llx_supplier_proposaldet ADD INDEX idx_supplier_proposaldet_fk_supplier_proposal (fk_supplier_proposal);
+ALTER TABLE llx_supplier_proposaldet ADD INDEX idx_supplier_proposaldet_fk_product (fk_product);
+
+ALTER TABLE llx_supplier_proposaldet ADD CONSTRAINT fk_supplier_proposaldet_fk_unit FOREIGN KEY (fk_unit) REFERENCES llx_c_units (rowid);
+ALTER TABLE llx_supplier_proposaldet ADD CONSTRAINT fk_supplier_proposaldet_fk_supplier_proposal FOREIGN KEY (fk_supplier_proposal) REFERENCES llx_supplier_proposal (rowid);

From 56e749df9f26a82dc988d9d3228b9f99966f8957 Mon Sep 17 00:00:00 2001
From: Marc de Lima Lucio <marc.delimalucio@atm-consulting.fr>
Date: Wed, 26 Apr 2017 16:12:27 +0200
Subject: [PATCH 101/505] FIX: supplier order line were always created with
 rang = 0

---
 htdocs/fourn/class/fournisseur.commande.class.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 11d755b50a4..03898da3943 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -1372,10 +1372,13 @@ class CommandeFournisseur extends CommonOrder
 			$localtax2_type=$localtaxes_type[2];
 
             $subprice = price2num($pu,'MU');
+            
+            $rangmax = $this->line_max();
+            $rang = $rangmax + 1;
 
             $sql = "INSERT INTO ".MAIN_DB_PREFIX."commande_fournisseurdet";
             $sql.= " (fk_commande, label, description, date_start, date_end,";
-            $sql.= " fk_product, product_type,";
+            $sql.= " fk_product, product_type, rang,";
             $sql.= " qty, tva_tx, localtax1_tx, localtax2_tx, localtax1_type, localtax2_type, remise_percent, subprice, ref,";
             $sql.= " total_ht, total_tva, total_localtax1, total_localtax2, total_ttc, fk_unit";
             $sql.= ")";
@@ -1384,7 +1387,7 @@ class CommandeFournisseur extends CommonOrder
             $sql.= " ".($date_end?"'".$this->db->idate($date_end)."'":"null").",";
             if ($fk_product) { $sql.= $fk_product.","; }
             else { $sql.= "null,"; }
-            $sql.= "'".$product_type."',";
+            $sql.= "'".$product_type."', ".$rang.",";
             $sql.= "'".$qty."', ".$txtva.", ".$txlocaltax1.", ".$txlocaltax2;
 
            	$sql.= ", '".$localtax1_type."',";

From c69a1205c001b42ce9acaa7cdf62cc8c0f6caee4 Mon Sep 17 00:00:00 2001
From: fappels <francis.appels@yahoo.com>
Date: Wed, 26 Apr 2017 19:06:41 +0200
Subject: [PATCH 102/505] Fix download delivery document

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

diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 21344f5eca9..f029a569968 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -2148,7 +2148,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 	}
 
 	// Wrapping pour les bons de livraison
-	else if ($modulepart == 'livraison' && !empty($conf->livraison->dir_output))
+	else if ($modulepart == 'livraison' && !empty($conf->expedition->dir_output))
 	{
 		if ($fuser->rights->expedition->livraison->lire || preg_match('/^specimen/i',$original_file))
 		{

From 508109d5b1201c925fde31cbf35fab0df65f6c36 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 27 Apr 2017 00:21:00 +0200
Subject: [PATCH 103/505] Translation

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

diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 4653a22d814..42c6eedae08 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1527,7 +1527,7 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa
 ApiSetup=API module setup
 ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
 ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
-ApiExporerIs=You can explore the APIs at url
+ApiExporerIs=You can explore and test the APIs at URL
 OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
 ApiKey=Key for API
 WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it. 

From 95788c96994980b12bf13464795bb9b6fc1e294f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 27 Apr 2017 00:53:13 +0200
Subject: [PATCH 104/505] FIX A non admin user can not download files attached
 to user.

---
 htdocs/core/lib/files.lib.php | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index d27d6c1cdb1..87a587a7460 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -1385,7 +1385,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 	$sqlprotectagainstexternals='';
 	$ret=array();
 
-	// find the subdirectory name as the reference
+    // Find the subdirectory name as the reference. For exemple original_file='10/myfile.pdf' -> refname='10'
 	if (empty($refname)) $refname=basename(dirname($original_file)."/");
 
 	$relative_original_file = $original_file;
@@ -1553,6 +1553,18 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 		$original_file=$conf->fckeditor->dir_output.'/'.$original_file;
 	}
 
+	// Wrapping for users
+	else if ($modulepart == 'user' && !empty($conf->user->dir_output))
+	{
+        $canreaduser=(! empty($fuser->admin) || $fuser->rights->user->user->lire);
+        if ($user->id == (int) $refname) { $canreaduser=1; } // A user can always read its own card
+        if ($canreaduser || preg_match('/^specimen/i',$original_file))
+	    {
+	        $accessallowed=1;
+	    }
+	    $original_file=$conf->user->dir_output.'/'.$original_file;
+	}
+	
 	// Wrapping for third parties
 	else if (($modulepart == 'company' || $modulepart == 'societe') && !empty($conf->societe->dir_output))
 	{

From d390acc8886a7f48899e5bf180b1d4f42d9c45c5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 27 Apr 2017 02:03:59 +0200
Subject: [PATCH 105/505] FIX A non admin user can not download files attached
 to user.

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

diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 87a587a7460..2faa3ae1a8f 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -1557,7 +1557,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 	else if ($modulepart == 'user' && !empty($conf->user->dir_output))
 	{
         $canreaduser=(! empty($fuser->admin) || $fuser->rights->user->user->lire);
-        if ($user->id == (int) $refname) { $canreaduser=1; } // A user can always read its own card
+        if ($fuser->id == (int) $refname) { $canreaduser=1; } // A user can always read its own card
         if ($canreaduser || preg_match('/^specimen/i',$original_file))
 	    {
 	        $accessallowed=1;

From e97fae0c43f0cbfd0cc53dfdadd5e49ef0913835 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 27 Apr 2017 12:10:08 +0200
Subject: [PATCH 106/505] Fix typo

---
 htdocs/install/mysql/migration/repair.sql | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/install/mysql/migration/repair.sql b/htdocs/install/mysql/migration/repair.sql
index 03c1ab07dfd..32696ecf593 100755
--- a/htdocs/install/mysql/migration/repair.sql
+++ b/htdocs/install/mysql/migration/repair.sql
@@ -15,8 +15,8 @@
 
 -- Requests to change character set and collation of a column
 
--- ALTER TABLE llx_accountingaccount MODIFY account_number VARCHAR(20) CHARACTER SET utf8;
--- ALTER TABLE llx_accountingaccount MODIFY account_number VARCHAR(20) COLLATE utf8_unicode_ci;
+-- ALTER TABLE llx_accounting_account MODIFY account_number VARCHAR(20) CHARACTER SET utf8;
+-- ALTER TABLE llx_accounting_account MODIFY account_number VARCHAR(20) COLLATE utf8_unicode_ci;
 -- You can check with "show full columns from llx_accountingaccount";
 
 

From 1a98c4a3ffcc8e7201c45ed3021f40c6ec71eb9a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 27 Apr 2017 12:48:13 +0200
Subject: [PATCH 107/505] Fix error management in adding translation key

---
 htdocs/admin/translation.php   | 20 ++++++++++++++++----
 htdocs/langs/en_US/admin.lang  |  1 +
 htdocs/langs/en_US/errors.lang |  1 +
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php
index 7d07f7ead94..789e85d167d 100644
--- a/htdocs/admin/translation.php
+++ b/htdocs/admin/translation.php
@@ -75,7 +75,7 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
 // Purge search criteria
-if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // All test are required to be compatible with all browsers
+if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // All tests are required to be compatible with all browsers
 {
     $transkey='';
     $transvalue='';
@@ -116,7 +116,11 @@ if ($action == 'add' || (GETPOST('add') && $action != 'update'))
 		}
 		else
 		{
-			dol_print_error($db);
+		    if ($db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
+		    {
+		        setEventMessages($langs->trans("WarningAnEntryAlreadyExistForTransKey"), null, 'warnings');
+		    }
+		    else dol_print_error($db);
 			$action='';
 		}
 	}
@@ -422,9 +426,17 @@ if ($mode == 'searchkey')
         print '<tr '.$bc[$var].'><td>'.$langcode.'</td><td>'.$key.'</td><td>';
         print dol_escape_htmltag($val);
         print '</td><td align="right">';
-        if ($val != $newlangfileonly->tab_translate[$key]) 
+        if (! empty($newlangfileonly->tab_translate[$key]))
         {
-            $htmltext = $langs->trans("OriginalValueWas", $newlangfileonly->tab_translate[$key]);
+            if ($val != $newlangfileonly->tab_translate[$key]) 
+            {
+                $htmltext = $langs->trans("OriginalValueWas", $newlangfileonly->tab_translate[$key]);
+                print $form->textwithpicto('', $htmltext, 1, 'info');
+            }
+        }
+        else
+        {
+            $htmltext = $langs->trans("TransKeyWithoutOriginalValue", $key);
             print $form->textwithpicto('', $htmltext, 1, 'warning');
         }
         /*if (! empty($conf->multicompany->enabled) && !$user->entity)
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index be60fc5db7c..504470b203d 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1075,6 +1075,7 @@ CurrentTranslationString=Current translation string
 WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
 NewTranslationStringToShow=New translation string to show
 OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
+TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exists in any language files
 TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found into PHP path
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index af18693f9d4..72912ca2b1f 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -205,3 +205,4 @@ WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice
 WarningTooManyDataPleaseUseMoreFilters=Too many data (more than %s lines). Please use more filters or set the constant %s to a higher limit. 
 WarningSomeLinesWithNullHourlyRate=Some times were recorded by some users while their hourly rate was not defined. A value of 0 %s per hour was used but this may result in wrong valuation of time spent.
 WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security purpose you will have to login with your new login before next action.
+WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
\ No newline at end of file

From 9c2ce0202da0799a8994fef2921e0e887cd8cb82 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 27 Apr 2017 13:19:07 +0200
Subject: [PATCH 108/505] Translation

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

diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 504470b203d..bae07caa381 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -298,12 +298,12 @@ LastActivationDate=Latest activation date
 UpdateServerOffline=Update server offline
 WithCounter=Manage a counter
 GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
-GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany done 2007-01-31:</u><br>
+GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
 GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b>
+GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b><br><b>IN{yy}{mm}-{0000}-{t}</b> will give <b>IN0701-0099-A</b> if the type of company is 'Responsable Inscripto' with code for type that is 'A_RI'
 GenericNumRefModelDesc=Returns a customizable number according to a defined mask. 
 ServerAvailableOnIPOrPort=Server is available at address <b>%s</b> on port <b>%s</b>
 ServerNotAvailableOnIPOrPort=Server is not available at address <b>%s</b> on port <b>%s</b>

From 1758b836042a3e1776af77a655bb2bc866e99b69 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 27 Apr 2017 13:50:13 +0200
Subject: [PATCH 109/505] Clean explanation for accounting module setup.

---
 htdocs/accountancy/index.php        |  9 ++++++---
 htdocs/langs/en_US/accountancy.lang | 18 +++++++++---------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/htdocs/accountancy/index.php b/htdocs/accountancy/index.php
index 54772ebf1a4..ff9ca6fa1a3 100644
--- a/htdocs/accountancy/index.php
+++ b/htdocs/accountancy/index.php
@@ -129,15 +129,18 @@ if (! empty($conf->don->enabled))
     print "<br>\n";
     print "<br>\n";
 }*/
+
 $step++;
-$textlink='<strong>'.$langs->transnoentitiesnoconv("Home").'-'.$langs->transnoentitiesnoconv("MenuBankCash").'</strong>';
-print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBank", $step, $textlink);
+print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescProd", $step, '<strong>'.$langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("ProductsBinding").'</strong>');
 print "<br>\n";
 print "<br>\n";
 
 $step++;
-print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescProd", $step, '<strong>'.$langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("ProductsBinding").'</strong>')."<br>\n";
+$textlink='<strong>'.$langs->transnoentitiesnoconv("MenuBankCash").'</strong>';
+print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBank", $step, $textlink);
 print "<br>\n";
+print "<br>\n";
+
 
 print "<br>\n";
 print_fiche_titre($langs->trans("AccountancyAreaDescActionFreq"), '', 'object_calendarweek');
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index 42c5c519d2c..57f220f943c 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -36,15 +36,15 @@ AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in f
 AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
 AccountancyAreaDescChartModel=STEP %s: Create a model of chart of account from menu %s
 AccountancyAreaDescChart=STEP %s: Create or check content of your chart of account from menu %s
-AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. For this, go on the card of each financial account. You can start from page %s.
-AccountancyAreaDescVat=STEP %s: Check the binding between vat rates and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.    
-AccountancyAreaDescExpenseReport=STEP %s: Check the binding between type of expense report and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.    
-AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (miscellaneous taxes) and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.    
-AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. You can set the account dedicated for that from the menu entry %s.
-AccountancyAreaDescMisc=STEP %s: Check the default binding between miscellaneous transaction lines and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescLoan=STEP %s: Check the binding between loans payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s. 
+AccountancyAreaDescVat=STEP %s: Define accounting accounts for each VAT Rates. For this you can use the menu entry %s.    
+AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for type of expense report. For this you can use the menu entry %s.
+AccountancyAreaDescSal=STEP %s: Define default accounting accounts for payment of salaries. For this you can use the menu entry %s.    
+AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for special expences (miscellaneous taxes). For this you can use the menu entry %s.    
+AccountancyAreaDescDonation=STEP %s: Define default accounting accounts for donation. For this you can use the menu entry %s.
+AccountancyAreaDescMisc=STEP %s: Define default accounting accounts for miscellaneous transactions. For this you can use the menu entry %s.
+AccountancyAreaDescLoan=STEP %s: Define default accounting accounts for loans. For this you can use the menu entry %s. 
+AccountancyAreaDescBank=STEP %s: Define accounting accounts for each bank and financial accounts. For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescProd=STEP %s: Define accounting accounts on your products. For this you can use the menu entry %s.
 
 AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
 AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.

From 2f23b36ca1b4d31d92822332201c084844dad3d6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 27 Apr 2017 14:20:06 +0200
Subject: [PATCH 110/505] Fix typo in var name picto

---
 htdocs/accountancy/admin/accountmodel.php | 4 ++--
 htdocs/accountancy/customer/list.php      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/accountancy/admin/accountmodel.php b/htdocs/accountancy/admin/accountmodel.php
index d2b039a28e0..0b4aa70e548 100644
--- a/htdocs/accountancy/admin/accountmodel.php
+++ b/htdocs/accountancy/admin/accountmodel.php
@@ -901,8 +901,8 @@ if ($id)
         if ($id == 4) print '<td></td>';
         print '<td class="liste_titre"></td>';
     	print '<td class="liste_titre" colspan="2" align="right">';
-    	$searchpitco=$form->showFilterAndCheckAddButtons(0);
-    	print $searchpitco;
+    	$searchpicto=$form->showFilterAndCheckAddButtons(0);
+    	print $searchpicto;
     	print '</td>';
         print '</tr>';
             
diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php
index 845e0a62540..c5830b0b003 100644
--- a/htdocs/accountancy/customer/list.php
+++ b/htdocs/accountancy/customer/list.php
@@ -285,7 +285,7 @@ if ($result) {
 	print '<td class="liste_titre"></td>';
 	print '<td class="liste_titre"></td>';
 	print '<td align="center" class="liste_titre">';
-	$searchpicto=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
+	$searchpicto=$form->showFilterButtons();
 	print $searchpicto;
 	print '</td>';
 	print '</tr>';
@@ -303,7 +303,7 @@ if ($result) {
 	print_liste_field_titre($langs->trans("IntoAccount"), '', '', '', '', 'align="center"');
 	$checkpicto='';
 	if ($massactionbutton) $checkpicto=$form->showCheckAddButtons('checkforselect', 1);
-	print_liste_field_titre($checkpitco, '', '', '', '', 'align="center"');
+	print_liste_field_titre($checkpicto, '', '', '', '', 'align="center"');
 	print "</tr>\n";
 	
 	$facture_static = new Facture($db);

From 4c5e78a2cee5c883c7718e8152fbede3554d1b5d Mon Sep 17 00:00:00 2001
From: alexis Algoud <alexis@atm-consulting.fr>
Date: Thu, 27 Apr 2017 16:30:57 +0200
Subject: [PATCH 111/505] NEW use pdktk to concat mass pdf because tcpdf
 generate avoid to split large file into multiple smaller file (all have same
 size) encounter issue with mailer provider virtual delivery service

---
 htdocs/core/actions_massactions.inc.php | 141 ++++++++++++++++--------
 1 file changed, 93 insertions(+), 48 deletions(-)

diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php
index 74badc6daae..58e47a29ec8 100644
--- a/htdocs/core/actions_massactions.inc.php
+++ b/htdocs/core/actions_massactions.inc.php
@@ -406,60 +406,105 @@ if (! $error && $massaction == "builddoc" && $permtoread && ! GETPOST('button_se
         $outputlangs->setDefaultLang($newlang);
     }
 
-    // Create empty PDF
-    $pdf=pdf_getInstance();
-    if (class_exists('TCPDF'))
-    {
-        $pdf->setPrintHeader(false);
-        $pdf->setPrintFooter(false);
+    if(!empty($conf->global->USE_PDFTK_FOR_PDF_CONCAT)) {
+    	// Create output dir if not exists
+	dol_mkdir($diroutputmassaction);
+
+	// Defined name of merged file
+	$filename=strtolower(dol_sanitizeFileName($langs->transnoentities($objectlabel)));
+	$filename=preg_replace('/\s/','_',$filename);
+
+	// Save merged file
+	if ($filter=='paye:0')
+	{
+	if ($option=='late') $filename.='_'.strtolower(dol_sanitizeFileName($langs->transnoentities("Unpaid"))).'_'.strtolower(dol_sanitizeFileName($langs->transnoentities("Late")));
+	else $filename.='_'.strtolower(dol_sanitizeFileName($langs->transnoentities("Unpaid")));
+	}
+	if ($year) $filename.='_'.$year;
+	if ($month) $filename.='_'.$month;
+
+    	if (count($files)>0)
+    	{
+    	
+    		$now=dol_now();
+    		$file=$diroutputmassaction.'/'.$filename.'_'.dol_print_date($now,'dayhourlog').'.pdf';
+    		
+    		$input_files = '';
+    		foreach($files as $f) {
+    			$input_files.=' '.escapeshellarg($f);
+    		}
+    		
+    		$cmd = 'pdftk '.$input_files.' cat output '.escapeshellarg($file);
+    		exec($cmd);
+    		
+    		if (! empty($conf->global->MAIN_UMASK))
+    			@chmod($file, octdec($conf->global->MAIN_UMASK));
+    			
+    			$langs->load("exports");
+    			setEventMessages($langs->trans('FileSuccessfullyBuilt',$filename.'_'.dol_print_date($now,'dayhourlog')), null, 'mesgs');
+    	}
+    	else
+    	{
+    		setEventMessages($langs->trans('NoPDFAvailableForDocGenAmongChecked'), null, 'errors');
+    	}
+    	
     }
-    $pdf->SetFont(pdf_getPDFFont($outputlangs));
+    else {
+	    // Create empty PDF
+	    $pdf=pdf_getInstance();
+	    if (class_exists('TCPDF'))
+	    {
+		$pdf->setPrintHeader(false);
+		$pdf->setPrintFooter(false);
+	    }
+	    $pdf->SetFont(pdf_getPDFFont($outputlangs));
 
-    if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+	    if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
 
-    // Add all others
-    foreach($files as $file)
-    {
-        // Charge un document PDF depuis un fichier.
-        $pagecount = $pdf->setSourceFile($file);
-        for ($i = 1; $i <= $pagecount; $i++)
-        {
-            $tplidx = $pdf->importPage($i);
-            $s = $pdf->getTemplatesize($tplidx);
-            $pdf->AddPage($s['h'] > $s['w'] ? 'P' : 'L');
-            $pdf->useTemplate($tplidx);
-        }
-    }
+	    // Add all others
+	    foreach($files as $file)
+	    {
+		// Charge un document PDF depuis un fichier.
+		$pagecount = $pdf->setSourceFile($file);
+		for ($i = 1; $i <= $pagecount; $i++)
+		{
+		    $tplidx = $pdf->importPage($i);
+		    $s = $pdf->getTemplatesize($tplidx);
+		    $pdf->AddPage($s['h'] > $s['w'] ? 'P' : 'L');
+		    $pdf->useTemplate($tplidx);
+		}
+	    }
 
-    // Create output dir if not exists
-    dol_mkdir($diroutputmassaction);
+	    // Create output dir if not exists
+	    dol_mkdir($diroutputmassaction);
 
-    // Defined name of merged file
-    $filename=strtolower(dol_sanitizeFileName($langs->transnoentities($objectlabel)));
-    $filename=preg_replace('/\s/','_',$filename);
-    
-    // Save merged file
-    if ($filter=='paye:0')
-    {
-        if ($option=='late') $filename.='_'.strtolower(dol_sanitizeFileName($langs->transnoentities("Unpaid"))).'_'.strtolower(dol_sanitizeFileName($langs->transnoentities("Late")));
-        else $filename.='_'.strtolower(dol_sanitizeFileName($langs->transnoentities("Unpaid")));
-    }
-    if ($year) $filename.='_'.$year;
-    if ($month) $filename.='_'.$month;
-    if ($pagecount)
-    {
-        $now=dol_now();
-        $file=$diroutputmassaction.'/'.$filename.'_'.dol_print_date($now,'dayhourlog').'.pdf';
-        $pdf->Output($file,'F');
-        if (! empty($conf->global->MAIN_UMASK))
-            @chmod($file, octdec($conf->global->MAIN_UMASK));
+	    // Defined name of merged file
+	    $filename=strtolower(dol_sanitizeFileName($langs->transnoentities($objectlabel)));
+	    $filename=preg_replace('/\s/','_',$filename);
+	    
+	    // Save merged file
+	    if ($filter=='paye:0')
+	    {
+		if ($option=='late') $filename.='_'.strtolower(dol_sanitizeFileName($langs->transnoentities("Unpaid"))).'_'.strtolower(dol_sanitizeFileName($langs->transnoentities("Late")));
+		else $filename.='_'.strtolower(dol_sanitizeFileName($langs->transnoentities("Unpaid")));
+	    }
+	    if ($year) $filename.='_'.$year;
+	    if ($month) $filename.='_'.$month;
+	    if ($pagecount)
+	    {
+		$now=dol_now();
+		$file=$diroutputmassaction.'/'.$filename.'_'.dol_print_date($now,'dayhourlog').'.pdf';
+		$pdf->Output($file,'F');
+		if (! empty($conf->global->MAIN_UMASK))
+		    @chmod($file, octdec($conf->global->MAIN_UMASK));
 
-            $langs->load("exports");
-            setEventMessages($langs->trans('FileSuccessfullyBuilt',$filename.'_'.dol_print_date($now,'dayhourlog')), null, 'mesgs');
-    }
-    else
-    {
-        setEventMessages($langs->trans('NoPDFAvailableForDocGenAmongChecked'), null, 'errors');
+		    $langs->load("exports");
+		    setEventMessages($langs->trans('FileSuccessfullyBuilt',$filename.'_'.dol_print_date($now,'dayhourlog')), null, 'mesgs');
+	    }
+	    else
+	    {
+		setEventMessages($langs->trans('NoPDFAvailableForDocGenAmongChecked'), null, 'errors');
+	    }
     }
 }
 

From 5e856e692369eaf33c5ffa327b63a70792357397 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 27 Apr 2017 17:16:19 +0200
Subject: [PATCH 112/505] More complete tooltip help to describe available
 substitution vars

---
 htdocs/admin/chequereceipts.php                   |  8 +++++++-
 htdocs/admin/commande.php                         | 13 +++++++------
 htdocs/admin/contract.php                         | 11 +++++++++--
 htdocs/admin/expedition.php                       | 10 ++++++++--
 htdocs/admin/expensereport.php                    | 10 ++++++++--
 htdocs/admin/facture.php                          | 13 +++++++------
 htdocs/admin/fichinter.php                        | 11 +++++++++--
 htdocs/admin/livraison.php                        |  8 +++++++-
 htdocs/admin/payment.php                          |  2 +-
 htdocs/admin/propal.php                           | 15 ++++++++-------
 htdocs/admin/supplier_invoice.php                 |  8 +++++++-
 htdocs/admin/supplier_order.php                   |  9 ++++++++-
 htdocs/admin/supplier_proposal.php                | 11 +++++++++--
 .../facture/admin/facture_cust_extrafields.php    |  2 +-
 .../facture/admin/facturedet_cust_extrafields.php |  2 +-
 htdocs/fourn/card.php                             |  1 -
 htdocs/langs/en_US/companies.lang                 |  8 ++++----
 htdocs/societe/agenda.php                         |  8 +-------
 htdocs/theme/eldy/style.css.php                   |  4 ++++
 htdocs/theme/md/style.css.php                     |  3 +++
 20 files changed, 109 insertions(+), 48 deletions(-)

diff --git a/htdocs/admin/chequereceipts.php b/htdocs/admin/chequereceipts.php
index 3b205f49cd2..fd1da0c328b 100644
--- a/htdocs/admin/chequereceipts.php
+++ b/htdocs/admin/chequereceipts.php
@@ -257,8 +257,14 @@ $var=true;
 
 $var=! $var;
 
+$substitutionarray=pdf_getSubstitutionArray($langs);
+$substitutionarray['__(AnyTranslationKey)__']=$langs->trans("Translation");
+$htmltext = '<i>'.$langs->trans("AvailableVariables").':<br>';
+foreach($substitutionarray as $key => $val)	$htmltext.=$key.'<br>';
+$htmltext.='</i>';
+
 print '<tr class="oddeven"><td colspan="2">';
-print $langs->trans("FreeLegalTextOnChequeReceipts").' ('.$langs->trans("AddCRIfTooLong").')<br>';
+print $form->textwithpicto($langs->trans("FreeLegalTextOnChequeReceipts"), $langs->trans("AddCRIfTooLong").'<br><br>'.$htmltext).'<br>';
 $variablename='BANK_CHEQUERECEIPT_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php
index 3933f5d00ab..a4680f4d16e 100644
--- a/htdocs/admin/commande.php
+++ b/htdocs/admin/commande.php
@@ -565,12 +565,18 @@ print "<td>&nbsp;</td>\n";
 print "</tr>\n";
 $var=true;
 
+$substitutionarray=pdf_getSubstitutionArray($langs);
+$substitutionarray['__(AnyTranslationKey)__']=$langs->trans("Translation");
+$htmltext = '<i>'.$langs->trans("AvailableVariables").':<br>';
+foreach($substitutionarray as $key => $val)	$htmltext.=$key.'<br>';
+$htmltext.='</i>';
+
 $var=! $var;
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="action" value="set_ORDER_FREE_TEXT">';
 print '<tr class="oddeven"><td colspan="2">';
-print $langs->trans("FreeLegalTextOnOrders").' '.img_info($langs->trans("AddCRIfTooLong")).'<br>';
+print $form->textwithpicto($langs->trans("FreeLegalTextOnOrders"), $langs->trans("AddCRIfTooLong").'<br><br>'.$htmltext).'<br>';
 $variablename='ORDER_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
@@ -593,11 +599,6 @@ print "<form method=\"post\" action=\"".$_SERVER["PHP_SELF"]."\">";
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print "<input type=\"hidden\" name=\"action\" value=\"set_COMMANDE_DRAFT_WATERMARK\">";
 print '<tr class="oddeven"><td>';
-$substitutionarray=pdf_getSubstitutionArray($langs);
-$substitutionarray['__(AnyTranslationKey)__']=$langs->trans("Translation");
-$htmltext = '<i>'.$langs->trans("AvailableVariables").':<br>';
-foreach($substitutionarray as $key => $val) $htmltext.=$key.'<br>';
-$htmltext.='</i>';
 print $form->textwithpicto($langs->trans("WatermarkOnDraftOrders"), $htmltext);
 print '</td><td>';
 print '<input class="flat minwidth200" type="text" name="COMMANDE_DRAFT_WATERMARK" value="'.$conf->global->COMMANDE_DRAFT_WATERMARK.'">';
diff --git a/htdocs/admin/contract.php b/htdocs/admin/contract.php
index bc3ea402704..ddd8c6f1c00 100644
--- a/htdocs/admin/contract.php
+++ b/htdocs/admin/contract.php
@@ -502,9 +502,15 @@ print '<td align="center" width="60">'.$langs->trans("Value").'</td>';
 print "</tr>\n";
 $var=true;
 
+$substitutionarray=pdf_getSubstitutionArray($langs);
+$substitutionarray['__(AnyTranslationKey)__']=$langs->trans("Translation");
+$htmltext = '<i>'.$langs->trans("AvailableVariables").':<br>';
+foreach($substitutionarray as $key => $val)	$htmltext.=$key.'<br>';
+$htmltext.='</i>';
+
 $var=! $var;
 print '<tr class="oddeven"><td colspan="2">';
-print $langs->trans("FreeLegalTextOnContracts").' '.img_info($langs->trans("AddCRIfTooLong")).'<br>';
+print $form->textwithpicto($langs->trans("FreeLegalTextOnContracts"), $langs->trans("AddCRIfTooLong").'<br><br>'.$htmltext).'<br>';
 $variablename='CONTRACT_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
@@ -521,7 +527,8 @@ print '</td></tr>'."\n";
 //Use draft Watermark
 
 print '<tr class="oddeven"><td>';
-print $langs->trans("WatermarkOnDraftContractCards").'</td><td>';
+print $form->textwithpicto($langs->trans("WatermarkOnDraftContractCards"), $htmltext);
+print '</td><td>';
 print '<input size="50" class="flat" type="text" name="CONTRACT_DRAFT_WATERMARK" value="'.$conf->global->CONTRACT_DRAFT_WATERMARK.'">';
 print '</td></tr>'."\n";
 
diff --git a/htdocs/admin/expedition.php b/htdocs/admin/expedition.php
index ef8b10c411f..d31b788a1ab 100644
--- a/htdocs/admin/expedition.php
+++ b/htdocs/admin/expedition.php
@@ -502,8 +502,14 @@ print "<tr class=\"liste_titre\">";
 print "<td>".$langs->trans("Parameter")."</td>\n";
 print "</tr>";
 
+$substitutionarray=pdf_getSubstitutionArray($langs);
+$substitutionarray['__(AnyTranslationKey)__']=$langs->trans("Translation");
+$htmltext = '<i>'.$langs->trans("AvailableVariables").':<br>';
+foreach($substitutionarray as $key => $val)	$htmltext.=$key.'<br>';
+$htmltext.='</i>';
+
 print '<tr><td>';
-print $langs->trans("FreeLegalTextOnShippings").' ('.$langs->trans("AddCRIfTooLong").')<br>';
+print $form->textwithpicto($langs->trans("FreeLegalTextOnShippings"), $langs->trans("AddCRIfTooLong").'<br><br>'.$htmltext).'<br>';
 $variablename='SHIPPING_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
@@ -518,7 +524,7 @@ else
 print "</td></tr>\n";
 
 print '<tr><td>';
-print $langs->trans("WatermarkOnDraft").'<br>';
+print $form->textwithpicto($langs->trans("WatermarkOnDraftContractCards"), $htmltext).'<br>';
 print '<input size="50" class="flat" type="text" name="SHIPPING_DRAFT_WATERMARK" value="'.$conf->global->SHIPPING_DRAFT_WATERMARK.'">';
 print "</td></tr>\n";
 
diff --git a/htdocs/admin/expensereport.php b/htdocs/admin/expensereport.php
index eda3c6bd6ae..dad17585e2e 100644
--- a/htdocs/admin/expensereport.php
+++ b/htdocs/admin/expensereport.php
@@ -505,9 +505,15 @@ print '<td align="center" width="60"></td>';
 print "</tr>\n";
 $var=true;
 
+$substitutionarray=pdf_getSubstitutionArray($langs);
+$substitutionarray['__(AnyTranslationKey)__']=$langs->trans("Translation");
+$htmltext = '<i>'.$langs->trans("AvailableVariables").':<br>';
+foreach($substitutionarray as $key => $val)	$htmltext.=$key.'<br>';
+$htmltext.='</i>';
+
 $var=! $var;
 print '<tr class="oddeven"><td colspan="2">';
-print $langs->trans("FreeLegalTextOnExpenseReports").' ('.$langs->trans("AddCRIfTooLong").')<br>';
+print $form->textwithpicto($langs->trans("FreeLegalTextOnExpenseReports"), $langs->trans("AddCRIfTooLong").'<br><br>'.$htmltext).'<br>';
 $variablename='EXPENSEREPORT_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
@@ -524,7 +530,7 @@ print '</td></tr>'."\n";
 //Use draft Watermark
 
 print '<tr class="oddeven"><td colspan="2">';
-print $langs->trans("WatermarkOnDraftOrders").'<br>';
+print $form->textwithpicto($langs->trans("WatermarkOnDraftExpenseReports"), $htmltext).'<br>';
 print '<input size="50" class="flat" type="text" name="EXPENSEREPORT_DRAFT_WATERMARK" value="'.$conf->global->EXPENSEREPORT_DRAFT_WATERMARK.'">';
 print '</td></tr>'."\n";
 
diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php
index e7f74f85e5e..d89c9711e3f 100644
--- a/htdocs/admin/facture.php
+++ b/htdocs/admin/facture.php
@@ -733,12 +733,18 @@ print '<input type="submit" class="button" value="'.$langs->trans("Modify").'" /
 print "</td></tr>\n";
 print '</form>';
 
+$substitutionarray=pdf_getSubstitutionArray($langs);
+$substitutionarray['__(AnyTranslationKey)__']=$langs->trans("Translation");
+$htmltext = '<i>'.$langs->trans("AvailableVariables").':<br>';
+foreach($substitutionarray as $key => $val)	$htmltext.=$key.'<br>';
+$htmltext.='</i>';
+
 $var=! $var;
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'" />';
 print '<input type="hidden" name="action" value="set_INVOICE_FREE_TEXT" />';
 print '<tr class="oddeven"><td colspan="2">';
-print $langs->trans("FreeLegalTextOnInvoices").' '.img_info($langs->trans("AddCRIfTooLong")).'<br>';
+print $form->textwithpicto($langs->trans("FreeLegalTextOnInvoices"), $langs->trans("AddCRIfTooLong").'<br><br>'.$htmltext).'<br>';
 $variablename='INVOICE_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
@@ -760,11 +766,6 @@ print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'" />';
 print '<input type="hidden" name="action" value="set_FACTURE_DRAFT_WATERMARK" />';
 print '<tr class="oddeven"><td>';
-$substitutionarray=pdf_getSubstitutionArray($langs);
-$substitutionarray['__(AnyTranslationKey)__']=$langs->trans("Translation");
-$htmltext = '<i>'.$langs->trans("AvailableVariables").':<br>';
-foreach($substitutionarray as $key => $val)	$htmltext.=$key.'<br>';
-$htmltext.='</i>';
 print $form->textwithpicto($langs->trans("WatermarkOnDraftBill"), $htmltext);
 print '</td>';
 print '<td><input size="50" class="flat" type="text" name="FACTURE_DRAFT_WATERMARK" value="'.$conf->global->FACTURE_DRAFT_WATERMARK.'" />';
diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php
index 6c73afcf8f5..0b01f56857e 100644
--- a/htdocs/admin/fichinter.php
+++ b/htdocs/admin/fichinter.php
@@ -534,12 +534,18 @@ print "<td>&nbsp;</td>\n";
 print "</tr>\n";
 $var=true;
 
+$substitutionarray=pdf_getSubstitutionArray($langs);
+$substitutionarray['__(AnyTranslationKey)__']=$langs->trans("Translation");
+$htmltext = '<i>'.$langs->trans("AvailableVariables").':<br>';
+foreach($substitutionarray as $key => $val)	$htmltext.=$key.'<br>';
+$htmltext.='</i>';
+
 $var=! $var;
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="action" value="set_FICHINTER_FREE_TEXT">';
 print '<tr class="oddeven"><td colspan="2">';
-print $langs->trans("FreeLegalTextOnInterventions").' '.img_info($langs->trans("AddCRIfTooLong")).'<br>';
+print $form->textwithpicto($langs->trans("FreeLegalTextOnInterventions"), $langs->trans("AddCRIfTooLong").'<br><br>'.$htmltext).'<br>';
 $variablename='FICHINTER_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
@@ -562,7 +568,8 @@ print "<form method=\"post\" action=\"".$_SERVER["PHP_SELF"]."\">";
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print "<input type=\"hidden\" name=\"action\" value=\"set_FICHINTER_DRAFT_WATERMARK\">";
 print '<tr class="oddeven"><td>';
-print $langs->trans("WatermarkOnDraftInterventionCards").'</td><td>';
+print $form->textwithpicto($langs->trans("WatermarkOnDraftInterventionCards"), $htmltext).'<br>';
+print '</td><td>';
 print '<input size="50" class="flat" type="text" name="FICHINTER_DRAFT_WATERMARK" value="'.$conf->global->FICHINTER_DRAFT_WATERMARK.'">';
 print '</td><td align="right">';
 print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
diff --git a/htdocs/admin/livraison.php b/htdocs/admin/livraison.php
index 281f1934296..143c54ec24d 100644
--- a/htdocs/admin/livraison.php
+++ b/htdocs/admin/livraison.php
@@ -479,12 +479,18 @@ print '<td width="80">&nbsp;</td>';
 print "</tr>\n";
 $var=true;
 
+$substitutionarray=pdf_getSubstitutionArray($langs);
+$substitutionarray['__(AnyTranslationKey)__']=$langs->trans("Translation");
+$htmltext = '<i>'.$langs->trans("AvailableVariables").':<br>';
+foreach($substitutionarray as $key => $val)	$htmltext.=$key.'<br>';
+$htmltext.='</i>';
+
 $var=! $var;
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="action" value="set_DELIVERY_FREE_TEXT">';
 print '<tr class="oddeven"><td colspan="2">';
-print $langs->trans("FreeLegalTextOnDeliveryReceipts").' ('.$langs->trans("AddCRIfTooLong").')<br>';
+print $form->textwithpicto($langs->trans("FreeLegalTextOnDeliveryReceipts"), $langs->trans("AddCRIfTooLong").'<br><br>'.$htmltext).'<br>';
 $variablename='DELIVERY_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
diff --git a/htdocs/admin/payment.php b/htdocs/admin/payment.php
index a5166ec69f2..88f2d8cd1c1 100644
--- a/htdocs/admin/payment.php
+++ b/htdocs/admin/payment.php
@@ -117,7 +117,7 @@ $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToM
 print load_fiche_titre($langs->trans("BillsSetup"),$linkback,'title_setup');
 
 $head = invoice_admin_prepare_head();
-dol_fiche_head($head, 'payment', $langs->trans("Invoices"), 0, 'invoice');
+dol_fiche_head($head, 'payment', $langs->trans("Invoices"), -1, 'invoice');
 
 /*
  *  Numbering module
diff --git a/htdocs/admin/propal.php b/htdocs/admin/propal.php
index 76179fac66c..6a9884e263c 100644
--- a/htdocs/admin/propal.php
+++ b/htdocs/admin/propal.php
@@ -570,11 +570,17 @@ print "</td></tr>\n";
 print '</form>';
 */
 
+$substitutionarray=pdf_getSubstitutionArray($langs);
+$substitutionarray['__(AnyTranslationKey)__']=$langs->trans("Translation");
+$htmltext = '<i>'.$langs->trans("AvailableVariables").':<br>';
+foreach($substitutionarray as $key => $val)	$htmltext.=$key.'<br>';
+$htmltext.='</i>';
+
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="action" value="set_PROPOSAL_FREE_TEXT">';
 print '<tr class="oddeven"><td colspan="2">';
-print $langs->trans("FreeLegalTextOnProposal").' '.img_info($langs->trans("AddCRIfTooLong")).'<br>';
+print $form->textwithpicto($langs->trans("FreeLegalTextOnProposal"), $langs->trans("AddCRIfTooLong").'<br><br>'.$htmltext).'<br>';
 $variablename='PROPOSAL_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
@@ -596,12 +602,7 @@ print "<form method=\"post\" action=\"".$_SERVER["PHP_SELF"]."\">";
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print "<input type=\"hidden\" name=\"action\" value=\"set_PROPALE_DRAFT_WATERMARK\">";
 print '<tr class="oddeven"><td>';
-$substitutionarray=pdf_getSubstitutionArray($langs);
-$substitutionarray['__(AnyTranslationKey)__']=$langs->trans("Translation");
-$htmltext = '<i>'.$langs->trans("AvailableVariables").':<br>';
-foreach($substitutionarray as $key => $val)	$htmltext.=$key.'<br>';
-$htmltext.='</i>';
-print $form->textwithpicto($langs->trans("WatermarkOnDraftProposal"), $htmltext);
+print $form->textwithpicto($langs->trans("WatermarkOnDraftProposal"), $htmltext).'<br>';
 print '</td><td>';
 print '<input class="flat minwidth200" type="text" name="PROPALE_DRAFT_WATERMARK" value="'.$conf->global->PROPALE_DRAFT_WATERMARK.'">';
 print '</td><td align="right">';
diff --git a/htdocs/admin/supplier_invoice.php b/htdocs/admin/supplier_invoice.php
index 2619951e1b5..19f0e6fc8e2 100644
--- a/htdocs/admin/supplier_invoice.php
+++ b/htdocs/admin/supplier_invoice.php
@@ -471,8 +471,14 @@ print '<td align="center" width="60">'.$langs->trans("Value").'</td>';
 print '<td width="80">&nbsp;</td>';
 print "</tr>\n";
 
+$substitutionarray=pdf_getSubstitutionArray($langs);
+$substitutionarray['__(AnyTranslationKey)__']=$langs->trans("Translation");
+$htmltext = '<i>'.$langs->trans("AvailableVariables").':<br>';
+foreach($substitutionarray as $key => $val)	$htmltext.=$key.'<br>';
+$htmltext.='</i>';
+
 print '<tr class="oddeven"><td colspan="2">';
-print $langs->trans("FreeLegalTextOnInvoices").' '.img_info($langs->trans("AddCRIfTooLong")).'</br>';
+print $form->textwithpicto($langs->trans("FreeLegalTextOnInvoices"), $langs->trans("AddCRIfTooLong").'<br><br>'.$htmltext).'<br>';
 $variablename='SUPPLIER_INVOICE_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
diff --git a/htdocs/admin/supplier_order.php b/htdocs/admin/supplier_order.php
index d54f0e367aa..a30e7de2654 100644
--- a/htdocs/admin/supplier_order.php
+++ b/htdocs/admin/supplier_order.php
@@ -491,6 +491,7 @@ print '<td align="center" width="60">'.$langs->trans("Value").'</td>';
 print '<td width="80">&nbsp;</td>';
 print "</tr>\n";
 $var=false;
+
 //if ($conf->global->MAIN_FEATURES_LEVEL > 0)
 //{
 	print '<tr class="oddeven"><td>';
@@ -536,8 +537,14 @@ else
 }
 */
 
+$substitutionarray=pdf_getSubstitutionArray($langs);
+$substitutionarray['__(AnyTranslationKey)__']=$langs->trans("Translation");
+$htmltext = '<i>'.$langs->trans("AvailableVariables").':<br>';
+foreach($substitutionarray as $key => $val)	$htmltext.=$key.'<br>';
+$htmltext.='</i>';
+
 print '<tr class="oddeven"><td colspan="2">';
-print $langs->trans("FreeLegalTextOnOrders").' '.img_info($langs->trans("AddCRIfTooLong")).'<br>';
+print $form->textwithpicto($langs->trans("FreeLegalTextOnOrders"), $langs->trans("AddCRIfTooLong").'<br><br>'.$htmltext).'<br>';
 $variablename='SUPPLIER_ORDER_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
diff --git a/htdocs/admin/supplier_proposal.php b/htdocs/admin/supplier_proposal.php
index 703fbc482e9..345f622a533 100644
--- a/htdocs/admin/supplier_proposal.php
+++ b/htdocs/admin/supplier_proposal.php
@@ -523,12 +523,18 @@ print '<td width="60" align="center">'.$langs->trans("Value")."</td>\n";
 print "<td>&nbsp;</td>\n";
 print "</tr>";
 
+$substitutionarray=pdf_getSubstitutionArray($langs);
+$substitutionarray['__(AnyTranslationKey)__']=$langs->trans("Translation");
+$htmltext = '<i>'.$langs->trans("AvailableVariables").':<br>';
+foreach($substitutionarray as $key => $val)	$htmltext.=$key.'<br>';
+$htmltext.='</i>';
+
 $var=! $var;
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="action" value="set_SUPPLIER_PROPOSAL_FREE_TEXT">';
 print '<tr class="oddeven"><td colspan="2">';
-print $langs->trans("FreeLegalTextOnSupplierProposal").' '.img_info($langs->trans("AddCRIfTooLong")).'</br>';
+print $form->textwithpicto($langs->trans("FreeLegalTextOnSupplierProposal"), $langs->trans("AddCRIfTooLong").'<br><br>'.$htmltext).'<br>';
 $variablename='SUPPLIER_PROPOSAL_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
@@ -550,7 +556,8 @@ print "<form method=\"post\" action=\"".$_SERVER["PHP_SELF"]."\">";
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print "<input type=\"hidden\" name=\"action\" value=\"set_SUPPLIER_PROPOSAL_DRAFT_WATERMARK\">";
 print '<tr class="oddeven"><td>';
-print $langs->trans("WatermarkOnDraftSupplierProposal").'</td><td>';
+print $form->textwithpicto($langs->trans("WatermarkOnDraftProposal"), $htmltext).'<br>';
+print '</td><td>';
 print '<input size="50" class="flat" type="text" name="SUPPLIER_PROPOSAL_DRAFT_WATERMARK" value="'.$conf->global->SUPPLIER_PROPOSAL_DRAFT_WATERMARK.'">';
 print '</td><td align="right">';
 print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
diff --git a/htdocs/compta/facture/admin/facture_cust_extrafields.php b/htdocs/compta/facture/admin/facture_cust_extrafields.php
index ae545c695c3..c7a43c737de 100644
--- a/htdocs/compta/facture/admin/facture_cust_extrafields.php
+++ b/htdocs/compta/facture/admin/facture_cust_extrafields.php
@@ -70,7 +70,7 @@ print load_fiche_titre($langs->trans("BillsSetup"),$linkback,'title_setup');
 
 $head = invoice_admin_prepare_head();
 
-dol_fiche_head($head, 'attributes', $langs->trans("Invoices"), 0, 'invoice');
+dol_fiche_head($head, 'attributes', $langs->trans("Invoices"), -1, 'invoice');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
diff --git a/htdocs/compta/facture/admin/facturedet_cust_extrafields.php b/htdocs/compta/facture/admin/facturedet_cust_extrafields.php
index d7fd3367b67..3a5f8c3387f 100644
--- a/htdocs/compta/facture/admin/facturedet_cust_extrafields.php
+++ b/htdocs/compta/facture/admin/facturedet_cust_extrafields.php
@@ -71,7 +71,7 @@ print load_fiche_titre($langs->trans("BillsSetup"),$linkback,'title_setup');
 
 $head = invoice_admin_prepare_head();
 
-dol_fiche_head($head, 'attributeslines', $langs->trans("Invoices"), 0, 'invoice');
+dol_fiche_head($head, 'attributeslines', $langs->trans("Invoices"), -1, 'invoice');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php
index a9ba1ef80aa..4c2716e311a 100644
--- a/htdocs/fourn/card.php
+++ b/htdocs/fourn/card.php
@@ -753,7 +753,6 @@ if ($object->id > 0)
 	
 	print '</div>';
 	
-	print '<br>';
 
 	if (! empty($conf->global->MAIN_REPEATCONTACTONEACHTAB))
 	{
diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang
index 38d7a81ab9a..12d1ea188e6 100644
--- a/htdocs/langs/en_US/companies.lang
+++ b/htdocs/langs/en_US/companies.lang
@@ -77,10 +77,10 @@ VATIsNotUsed=VAT is not used
 CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
 PaymentBankAccount=Payment bank account
-OverAllProposals=Total proposals
-OverAllOrders=Total orders
-OverAllInvoices=Total invoices
-OverAllSupplierProposals=Total price requests
+OverAllProposals=Proposals
+OverAllOrders=Orders
+OverAllInvoices=Invoices
+OverAllSupplierProposals=Price requests
 ##### Local Taxes #####
 LocalTax1IsUsed=Use second tax
 LocalTax1IsUsedES= RE is used
diff --git a/htdocs/societe/agenda.php b/htdocs/societe/agenda.php
index e1dc1c12671..32d13356654 100644
--- a/htdocs/societe/agenda.php
+++ b/htdocs/societe/agenda.php
@@ -83,7 +83,7 @@ if (empty($reshook))
     }
 
     // Purge search criteria
-    if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // All test are required to be compatible with all browsers
+    if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // All tests are required to be compatible with all browsers
     {
         $actioncode='';
         $search_agenda_label='';
@@ -180,12 +180,6 @@ if ($socid > 0)
         
 		print load_fiche_titre($langs->trans("ActionsOnCompany"),'','');
 		
-        // List of todo actions
-        //show_actions_todo($conf,$langs,$db,$object,null,0,$actioncode);
-
-        // List of done actions
-        //show_actions_done($conf,$langs,$db,$object,null,0,$actioncode);
-     
         // List of all actions
 		$filters=array();
         $filters['search_agenda_label']=$search_agenda_label;
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 5c7f1f446ae..f0e615f29ce 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -1973,6 +1973,10 @@ div.tabBar {
 	width: auto;
 	background: rgb(<?php echo $colorbacktabcard1; ?>);
 }
+div.tabBar div.titre {
+	padding-top: 10px;    
+}
+
 div.tabBarWithBottom {
 	padding-bottom: 18px;
 	border-bottom: 1px solid #aaa; 
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 8cc95628561..d38391504fa 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -1992,6 +1992,9 @@ div.tabBar {
 	padding-bottom: 12px;
 	border-bottom: 1px solid #aaa; 
 }
+div.tabBar div.titre {
+	padding-top: 10px;    
+}
 div.tabBarWithBottom {
 	padding-bottom: 18px;
 	border-bottom: 1px solid #aaa; 

From b87eb07b08963056e9da19b20e9599b95b784a42 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 27 Apr 2017 17:51:11 +0200
Subject: [PATCH 113/505] Look and feel v6

---
 htdocs/accountancy/admin/export.php   | 2 +-
 htdocs/accountancy/admin/index.php    | 4 ++--
 htdocs/accountancy/admin/journals.php | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/accountancy/admin/export.php b/htdocs/accountancy/admin/export.php
index f7bbbb97969..eaf69f34f1f 100644
--- a/htdocs/accountancy/admin/export.php
+++ b/htdocs/accountancy/admin/export.php
@@ -130,7 +130,7 @@ print '<form action="' . $_SERVER["PHP_SELF"] . '" method="post">';
 print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
 print '<input type="hidden" name="action" value="update">';
 
-dol_fiche_head($head, 'export', $langs->trans("Configuration"), 0, 'cron');
+dol_fiche_head($head, 'export', $langs->trans("Configuration"), -1, 'cron');
 
 $var = true;
 
diff --git a/htdocs/accountancy/admin/index.php b/htdocs/accountancy/admin/index.php
index 3ea77a24b43..899aaa1a3d2 100644
--- a/htdocs/accountancy/admin/index.php
+++ b/htdocs/accountancy/admin/index.php
@@ -171,7 +171,7 @@ print '<form action="' . $_SERVER["PHP_SELF"] . '" method="post">';
 print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
 print '<input type="hidden" name="action" value="update">';
 
-dol_fiche_head($head, 'general', $langs->trans("Configuration"), 0, 'cron');
+dol_fiche_head($head, 'general', $langs->trans("Configuration"), -1, 'cron');
 
 
 // Default mode for calculating turnover (parameter ACCOUNTING_MODE)
@@ -299,7 +299,7 @@ print '<div class="center"><input type="submit" class="button" value="' . $langs
 print '<br>';
 print '<br>';
 
-print $langs->trans("AccountancySetupDoneFromAccountancyMenu", $langs->transnoentitiesnoconv("Home").'-'.$langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("MenuAccountancy"));
+print '<div class="opacitymedium">'.$langs->trans("AccountancySetupDoneFromAccountancyMenu", $langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("MenuAccountancy")).'</div>';
 
 print '<br>';
 print '</form>';
diff --git a/htdocs/accountancy/admin/journals.php b/htdocs/accountancy/admin/journals.php
index 03b51089d9a..677f2a743e5 100644
--- a/htdocs/accountancy/admin/journals.php
+++ b/htdocs/accountancy/admin/journals.php
@@ -94,7 +94,7 @@ print load_fiche_titre($langs->trans('ConfigAccountingExpert'), $linkback, 'titl
 
 $head = admin_accounting_prepare_head(null);
 
-dol_fiche_head($head, 'journal', $langs->trans("Configuration"), 0, 'cron');
+dol_fiche_head($head, 'journal', $langs->trans("Configuration"), -1, 'cron');
 
 $sql = "SELECT j.rowid, j.code, j.label, j.nature, j.active";
 $sql .= " FROM " . MAIN_DB_PREFIX . "accounting_journal as j";

From 853c8a8e07661edce38393dc2e31d9bbd81baf61 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 27 Apr 2017 18:05:53 +0200
Subject: [PATCH 114/505] Fix typo

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

diff --git a/htdocs/langs/en_US/sendings.lang b/htdocs/langs/en_US/sendings.lang
index ef6fe44856b..ac180cb5fe6 100644
--- a/htdocs/langs/en_US/sendings.lang
+++ b/htdocs/langs/en_US/sendings.lang
@@ -53,7 +53,7 @@ ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is do
 ShipmentLine=Shipment line
 ProductQtyInCustomersOrdersRunning=Product quantity into open customers orders
 ProductQtyInSuppliersOrdersRunning=Product quantity into open suppliers orders
-ProductQtyInShipmentAlreadySent=Product quantity from oped customer order already sent
+ProductQtyInShipmentAlreadySent=Product quantity from open customer order already sent
 ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from open supplier order already received
 NoProductToShipFoundIntoStock=No product to ship found into warehouse <b>%s</b>. Correct stock or go back to choose another warehouse. 
 WeightVolShort=Weight/Vol.

From 18981ab0c9e9c716aa7d31cf9f6eafab3ff2cd23 Mon Sep 17 00:00:00 2001
From: fappels <francis.appels@yahoo.com>
Date: Fri, 28 Apr 2017 11:39:33 +0200
Subject: [PATCH 115/505] Fix download donation document

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

diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index f029a569968..f1dd6dc6e43 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -2199,7 +2199,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 	}
 
 	// Wrapping pour les dons
-	else if ($modulepart == 'donation' && !empty($conf->donation->dir_output))
+	else if ($modulepart == 'donation' && !empty($conf->don->dir_output))
 	{
 		if ($fuser->rights->don->lire || preg_match('/^specimen/i',$original_file))
 		{

From 0ba6433a6166853b4b8a7a4d019c0b9e29a2b68f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 28 Apr 2017 13:10:08 +0200
Subject: [PATCH 116/505] Work on module website

---
 htdocs/admin/websites.php                     |  49 +++++--------
 .../install/mysql/migration/5.0.0-6.0.0.sql   |   3 +
 htdocs/install/mysql/tables/llx_website.sql   |   7 +-
 .../mysql/tables/llx_website_pages.sql        |   6 +-
 htdocs/langs/en_US/website.lang               |   4 +-
 htdocs/theme/eldy/img/save.png                | Bin 0 -> 264 bytes
 htdocs/theme/md/img/save.png                  | Bin 0 -> 264 bytes
 htdocs/websites/class/website.class.php       |  47 +++++-------
 htdocs/websites/class/websitepage.class.php   |  13 ++--
 htdocs/websites/index.php                     |  68 +++++++++++++-----
 10 files changed, 105 insertions(+), 92 deletions(-)
 create mode 100644 htdocs/theme/eldy/img/save.png
 create mode 100644 htdocs/theme/md/img/save.png

diff --git a/htdocs/admin/websites.php b/htdocs/admin/websites.php
index b0c81ec18af..06e9a7b93a4 100644
--- a/htdocs/admin/websites.php
+++ b/htdocs/admin/websites.php
@@ -375,11 +375,11 @@ if ($id)
             // dans les dictionnaires de donnees
             $valuetoshow=ucfirst($fieldlist[$field]);   // Par defaut
             $valuetoshow=$langs->trans($valuetoshow);   // try to translate
-            $align="left";
+            $align='';
             if ($fieldlist[$field]=='lang')            { $valuetoshow=$langs->trans("Language"); }
             if ($valuetoshow != '')
             {
-                print '<td align="'.$align.'">';
+                print '<td class="'.$align.'">';
             	if (! empty($tabhelp[$id][$value]) && preg_match('/^http(s*):/i',$tabhelp[$id][$value])) print '<a href="'.$tabhelp[$id][$value].'" target="_blank">'.$valuetoshow.' '.img_help(1,$valuetoshow).'</a>';
             	else if (! empty($tabhelp[$id][$value])) print $form->textwithpicto($valuetoshow,$tabhelp[$id][$value]);
             	else print $valuetoshow;
@@ -413,14 +413,11 @@ if ($id)
         $reshook=$hookmanager->executeHooks('createDictionaryFieldlist',$parameters, $obj, $tmpaction);    // Note that $action and $object may have been modified by some hooks
         $error=$hookmanager->error; $errors=$hookmanager->errors;
 
-        if ($id == 3) unset($fieldlist[2]);
-
         if (empty($reshook))
         {
        		fieldListWebsites($fieldlist,$obj,$tabname[$id],'add');
         }
 
-        if ($id == 4) print '<td></td>';
         print '<td colspan="3" align="right">';
         if ($action != 'edit')
         {
@@ -430,15 +427,9 @@ if ($id)
         print "</tr>";
 
         $colspan=count($fieldlist)+2;
-        if ($id == 4) $colspan++;
-
-        if (! empty($alabelisused) && $id != 25)  // If there is one label among fields, we show legend of *
-        {
-        	print '<tr><td colspan="'.$colspan.'">* '.$langs->trans("LabelUsedByDefault").'.</td></tr>';
-        }
-        print '<tr><td colspan="'.$colspan.'">&nbsp;</td></tr>';	// Keep &nbsp; to have a line with enough height
     }
 
+    print '</table>';
     print '</form>';
 
 
@@ -453,6 +444,15 @@ if ($id)
         $var=true;
         if ($num)
         {
+            print '<br>';
+            
+            print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'" method="POST">';
+            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+            print '<input type="hidden" name="page" value="'.$page.'">';
+            print '<input type="hidden" name="rowid" value="'.$rowid.'">';
+            
+            print '<table class="noborder" width="100%">';
+        
             // There is several pages
             if ($num > $listlimit)
             {
@@ -503,14 +503,9 @@ if ($id)
 
                 $obj = $db->fetch_object($resql);
                 //print_r($obj);
-                print '<tr '.$bc[$var].' id="rowid-'.$obj->rowid.'">';
+                print '<tr class="oddeven" id="rowid-'.$obj->rowid.'">';
                 if ($action == 'edit' && ($rowid == (! empty($obj->rowid)?$obj->rowid:$obj->code)))
                 {
-                    print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'" method="POST">';
-                    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-                    print '<input type="hidden" name="page" value="'.$page.'">';
-                    print '<input type="hidden" name="rowid" value="'.$rowid.'">';
-
                     $tmpaction='edit';
                     $parameters=array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
                     $reshook=$hookmanager->executeHooks('editDictionaryFieldlist',$parameters,$obj, $tmpaction);    // Note that $action and $object may have been modified by some hooks
@@ -548,16 +543,6 @@ if ($id)
 
                     $url = $_SERVER["PHP_SELF"].'?'.($page?'page='.$page.'&':'').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.(! empty($obj->rowid)?$obj->rowid:(! empty($obj->code)?$obj->code:'')).'&amp;code='.(! empty($obj->code)?urlencode($obj->code):'').'&amp;id='.$id.'&amp;';
 
-					// Favorite
-					// Only activated on country dictionary
-                    if ($id == 4)
-					{
-						print '<td align="center" class="nowrap">';
-						if ($iserasable) print '<a href="'.$url.'action='.$acts[$obj->favorite].'_favorite">'.$actl[$obj->favorite].'</a>';
-						else print $langs->trans("AlwaysActive");
-						print '</td>';
-					}
-
                     // Active
                     print '<td align="center" class="nowrap">';
                     print '<a href="'.$url.'action='.$acts[$obj->status].'">'.$actl[$obj->status].'</a>';
@@ -575,15 +560,15 @@ if ($id)
                 }
                 $i++;
             }
+            
+            print '</table>';
+            
+            print '</form>';
         }
     }
     else {
         dol_print_error($db);
     }
-
-    print '</table>';
-
-    print '</form>';
 }
 
 print '<br>';
diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index 9ff9de4e70d..c2edae8b592 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -137,6 +137,9 @@ ALTER TABLE llx_chargesociales ADD COLUMN fk_projet integer DEFAULT NULL;
 
 ALTER TABLE llx_cronjob ADD COLUMN processing integer NOT NULL DEFAULT 0;
 
+ALTER TABLE llx_website ADD COLUMN fk_user_create integer;
+ALTER TABLE llx_website ADD COLUMN fk_user_modif integer;
+
 
 create table llx_payment_various
 (
diff --git a/htdocs/install/mysql/tables/llx_website.sql b/htdocs/install/mysql/tables/llx_website.sql
index 331e6b085bd..84a9dd47188 100644
--- a/htdocs/install/mysql/tables/llx_website.sql
+++ b/htdocs/install/mysql/tables/llx_website.sql
@@ -26,7 +26,8 @@ CREATE TABLE llx_website
 	status		  integer,
 	fk_default_home integer, 
 	virtualhost   varchar(255), 
-    date_creation     datetime,
-    date_modification datetime,
-	tms           timestamp
+    fk_user_create integer,
+    fk_user_modif  integer,
+    date_creation  datetime,
+	tms            timestamp
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_website_pages.sql b/htdocs/install/mysql/tables/llx_website_pages.sql
index 982420dd507..69b6c417528 100644
--- a/htdocs/install/mysql/tables/llx_website_pages.sql
+++ b/htdocs/install/mysql/tables/llx_website_pages.sql
@@ -27,6 +27,8 @@ CREATE TABLE llx_website_page
 	keywords      varchar(255),
 	content		  mediumtext,		-- text is not enough in size
     status        integer,
-    date_creation     datetime,
-	tms           timestamp
+    fk_user_create integer,
+    fk_user_modif  integer,
+    date_creation  datetime,
+	tms            timestamp
 ) ENGINE=innodb;
diff --git a/htdocs/langs/en_US/website.lang b/htdocs/langs/en_US/website.lang
index fcb09c8d5c1..03069d6f649 100644
--- a/htdocs/langs/en_US/website.lang
+++ b/htdocs/langs/en_US/website.lang
@@ -24,5 +24,5 @@ SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
 SetHereVirtualHost=If you can set, on your web server, a dedicated virtual host with a root directory on <strong>%s</strong>, define here the virtual hostname so the preview can be done also using this direct web server access and not only using Dolibarr server.
-PreviewSiteServedByWebServer=Preview %s in a new tab. The %s will be served by an external web server (like Apache, Nginx, IIS). You must instal and setup this server before.<br>URL of %s served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=Preview %s in a new tab. The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL of %s served by Dolibarr:<br><strong>%s</strong>
+PreviewSiteServedByWebServer=Preview %s in a new tab.<br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=Preview %s in a new tab.<br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and clicking on the other preview button.  
diff --git a/htdocs/theme/eldy/img/save.png b/htdocs/theme/eldy/img/save.png
new file mode 100644
index 0000000000000000000000000000000000000000..eca2d92eccc5665b070d3c04e7241fbc2cbb71d5
GIT binary patch
literal 264
zcmV+j0r&oiP)<h;3K|Lk000e1NJLTq001xm001xu1ONa4{R=S+0002bNkl<ZcmeI#
zO=^Qc9ER~{CtgGfq69zgmkWsEMKnE9vD;E=K(m^-$RZ4r!H{<oI?ucR|H2RgL0%~I
z!N?!x$sPBf|Mi>^5To~qfUqA&PMF*F<|kx;Md$&W&;x!#4;TRufSvnyKmY=;&`=O<
zD`{EPz!xd^WlTz7A;m7|q5~RSbvmHHRiy(WT*Yq$l(?#OK#Qwh2dre+9fV)gZ4<e5
z{#*T1vC>fyZ>#A&pWX|cF@nuJ>{9{^+CL!nen`MaoS0vDoPmT;NZb{N*U=t-36Ko{
O0000<MNUMnLSTYx4QnL;

literal 0
HcmV?d00001

diff --git a/htdocs/theme/md/img/save.png b/htdocs/theme/md/img/save.png
new file mode 100644
index 0000000000000000000000000000000000000000..eca2d92eccc5665b070d3c04e7241fbc2cbb71d5
GIT binary patch
literal 264
zcmV+j0r&oiP)<h;3K|Lk000e1NJLTq001xm001xu1ONa4{R=S+0002bNkl<ZcmeI#
zO=^Qc9ER~{CtgGfq69zgmkWsEMKnE9vD;E=K(m^-$RZ4r!H{<oI?ucR|H2RgL0%~I
z!N?!x$sPBf|Mi>^5To~qfUqA&PMF*F<|kx;Md$&W&;x!#4;TRufSvnyKmY=;&`=O<
zD`{EPz!xd^WlTz7A;m7|q5~RSbvmHHRiy(WT*Yq$l(?#OK#Qwh2dre+9fV)gZ4<e5
z{#*T1vC>fyZ>#A&pWX|cF@nuJ>{9{^+CL!nen`MaoS0vDoPmT;NZb{N*U=t-36Ko{
O0000<MNUMnLSTYx4QnL;

literal 0
HcmV?d00001

diff --git a/htdocs/websites/class/website.class.php b/htdocs/websites/class/website.class.php
index 51a61d90112..a77079c94a6 100644
--- a/htdocs/websites/class/website.class.php
+++ b/htdocs/websites/class/website.class.php
@@ -73,10 +73,6 @@ class Website extends CommonObject
 	 * @var mixed
 	 */
 	public $date_creation;
-	/**
-	 * @var mixed
-	 */
-	public $date_modification;
 	/**
 	 * @var mixed
 	 */
@@ -123,7 +119,6 @@ class Website extends CommonObject
 		$error = 0;
 
 		// Clean parameters
-		
 		if (isset($this->entity)) {
 			 $this->entity = trim($this->entity);
 		}
@@ -136,36 +131,30 @@ class Website extends CommonObject
 		if (isset($this->status)) {
 			 $this->status = trim($this->status);
 		}
-
-		
+		if (empty($this->date_creation)) $this->date_creation = dol_now();
 
 		// Check parameters
 		// Put here code to add control on parameters values
 
 		// Insert request
 		$sql = 'INSERT INTO ' . MAIN_DB_PREFIX . $this->table_element . '(';
-		
 		$sql.= 'entity,';
 		$sql.= 'ref,';
 		$sql.= 'description,';
 		$sql.= 'status,';
 		$sql.= 'fk_default_home,';
 		$sql.= 'virtualhost,';
-		$sql.= 'date_creation,';
-		$sql.= 'date_modification';
-		
+		$sql.= 'fk_user_create';
+		$sql.= 'date_creation';
 		$sql .= ') VALUES (';
-		
 		$sql .= ' '.(! isset($this->entity)?'NULL':$this->entity).',';
 		$sql .= ' '.(! isset($this->ref)?'NULL':"'".$this->db->escape($this->ref)."'").',';
 		$sql .= ' '.(! isset($this->description)?'NULL':"'".$this->db->escape($this->description)."'").',';
 		$sql .= ' '.(! isset($this->status)?'NULL':$this->status).',';
 		$sql .= ' '.(! isset($this->fk_default_home)?'NULL':$this->fk_default_home).',';
 		$sql .= ' '.(! isset($this->virtualhost)?'NULL':$this->virtualhost).',';
-		$sql .= ' '.(! isset($this->date_creation) || dol_strlen($this->date_creation)==0?'NULL':"'".$this->db->idate($this->date_creation)."'").',';
-		$sql .= ' '.(! isset($this->date_modification) || dol_strlen($this->date_modification)==0?'NULL':"'".$this->db->idate($this->date_modification)."'");
-
-		
+		$sql .= ' '.(! isset($this->fk_user_create)?$user->id:$this->fk_user_create).',';
+		$sql .= ' '.(! isset($this->date_creation) || dol_strlen($this->date_creation)==0?'NULL':"'".$this->db->idate($this->date_creation)."'");
 		$sql .= ')';
 
 		$this->db->begin();
@@ -223,8 +212,9 @@ class Website extends CommonObject
 		$sql .= " t.status,";
 		$sql .= " t.fk_default_home,";
 		$sql .= " t.virtualhost,";
+		$sql .= " t.fk_user_create,";
+		$sql .= " t.fk_user_modif,";
 		$sql .= " t.date_creation,";
-		$sql .= " t.date_modification,";
 		$sql .= " t.tms";
 		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t';
 		if (null !== $ref) {
@@ -247,11 +237,10 @@ class Website extends CommonObject
 				$this->status = $obj->status;
 				$this->fk_default_home = $obj->fk_default_home;
 				$this->virtualhost = $obj->virtualhost;
+				$this->fk_user_create = $obj->fk_user_create;
+				$this->fk_user_modif = $obj->fk_user_modif;
 				$this->date_creation = $this->db->jdate($obj->date_creation);
-				$this->date_modification = $this->db->jdate($obj->date_modification);
 				$this->tms = $this->db->jdate($obj->tms);
-
-				
 			}
 			$this->db->free($resql);
 
@@ -292,8 +281,9 @@ class Website extends CommonObject
 		$sql .= " t.status,";
 		$sql .= " t.fk_default_home,";
 		$sql .= " t.virtualhost,";
+		$sql .= " t.fk_user_create,";
+		$sql .= " t.fk_user_modif,";
 		$sql .= " t.date_creation,";
-		$sql .= " t.date_modification,";
 		$sql .= " t.tms";
 		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element. ' as t';
 
@@ -331,8 +321,9 @@ class Website extends CommonObject
 				$line->status = $obj->status;
 				$line->fk_default_home = $obj->fk_default_home;
 				$line->virtualhost = $obj->virtualhost;
+				$this->fk_user_create = $obj->fk_user_create;
+				$this->fk_user_modif = $obj->fk_user_modif;
 				$line->date_creation = $this->db->jdate($obj->date_creation);
-				$line->date_modification = $this->db->jdate($obj->date_modification);
 				$line->tms = $this->db->jdate($obj->tms);
 
 				$this->records[$line->id] = $line;
@@ -377,25 +368,20 @@ class Website extends CommonObject
 			 $this->status = trim($this->status);
 		}
 
-		
-
 		// Check parameters
 		// Put here code to add a control on parameters values
 
 		// Update request
 		$sql = 'UPDATE ' . MAIN_DB_PREFIX . $this->table_element . ' SET';
-		
 		$sql .= ' entity = '.(isset($this->entity)?$this->entity:"null").',';
 		$sql .= ' ref = '.(isset($this->ref)?"'".$this->db->escape($this->ref)."'":"null").',';
 		$sql .= ' description = '.(isset($this->description)?"'".$this->db->escape($this->description)."'":"null").',';
 		$sql .= ' status = '.(isset($this->status)?$this->status:"null").',';
 		$sql .= ' fk_default_home = '.(($this->fk_default_home > 0)?$this->fk_default_home:"null").',';
 		$sql .= ' virtualhost = '.(($this->virtualhost != '')?"'".$this->db->escape($this->virtualhost)."'":"null").',';
+		$sql .= ' fk_user_modif = '.(! isset($this->fk_user_modif) ? $user->id : $this->fk_user_modif).',';
 		$sql .= ' date_creation = '.(! isset($this->date_creation) || dol_strlen($this->date_creation) != 0 ? "'".$this->db->idate($this->date_creation)."'" : 'null').',';
-		$sql .= ' date_modification = '.(! isset($this->date_modification) || dol_strlen($this->date_modification) != 0 ? "'".$this->db->idate($this->date_modification)."'" : 'null').',';
 		$sql .= ' tms = '.(dol_strlen($this->tms) != 0 ? "'".$this->db->idate($this->tms)."'" : "'".$this->db->idate(dol_now())."'");
-
-        
 		$sql .= ' WHERE rowid=' . $this->id;
 
 		$this->db->begin();
@@ -631,6 +617,8 @@ class Website extends CommonObject
 	 */
 	public function initAsSpecimen()
 	{
+	    global $user;
+	    
 		$this->id = 0;
 		
 		$this->entity = 1;
@@ -639,8 +627,9 @@ class Website extends CommonObject
 		$this->status = '';
 		$this->fk_default_home = null;
 		$this->virtualhost = 'http://myvirtualhost';
+		$this->fk_user_create = $user->id;
+		$this->fk_user_modif = $user->id;
 		$this->date_creation = dol_now();
-		$this->date_modification = dol_now();
 		$this->tms = dol_now();
 
 		
diff --git a/htdocs/websites/class/websitepage.class.php b/htdocs/websites/class/websitepage.class.php
index 883b6495c53..c80d20fe44b 100644
--- a/htdocs/websites/class/websitepage.class.php
+++ b/htdocs/websites/class/websitepage.class.php
@@ -181,7 +181,7 @@ class WebsitePage extends CommonObject
 	/**
 	 * Load object in memory from the database
 	 *
-	 * @param int    $id           Id object
+	 * @param int    $id           Id object. If this is 0, the default page of website_id will be used, if not defined, the first one. found
 	 * @param string $website_id   Web site id
 	 * @param string $page         Page name
 	 *
@@ -205,13 +205,16 @@ class WebsitePage extends CommonObject
 		$sql .= " t.tms as date_modification";
 
 		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t';
+		//$sql .= ' WHERE entity IN ('.getEntity('website', 1).')';       // entity is on website level
+		$sql .= ' WHERE 1 = 1';
 		if (null !== $website_id) {
-		    $sql .= ' WHERE t.fk_website = ' . '\'' . $website_id . '\'';
-		    $sql .= ' AND t.pageurl = ' . '\'' . $page . '\'';
+		    $sql .= " AND t.fk_website = '" . $this->db->escape($website_id) . "'";
+		    if ($page) $sql .= " AND t.pageurl = '" . $this->db->escape($page) . "'";
 		} else {
-			$sql .= ' WHERE t.rowid = ' . $id;
+			$sql .= ' AND t.rowid = ' . $id;
 		}
-
+        $sql .= $this->db->plimit(1);
+        
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$numrows = $this->db->num_rows($resql);
diff --git a/htdocs/websites/index.php b/htdocs/websites/index.php
index b55f81f5b7f..b78a172e01f 100644
--- a/htdocs/websites/index.php
+++ b/htdocs/websites/index.php
@@ -438,16 +438,34 @@ if ($action == 'updatemeta')
 // Update page
 if ($action == 'updatecontent' || GETPOST('refreshsite') || GETPOST('refreshpage') || GETPOST('preview'))
 {
-    $db->begin();
     $object->fetch(0, $website);
 
+    /*if (GETPOST('savevirtualhost') && $object->virtualhost != GETPOST('previewsite'))
+    {
+        $object->virtualhost = GETPOST('previewsite', 'alpha');
+        $object->update($user);
+    }*/
+    
     $objectpage->fk_website = $object->id;
 
-    $res = $objectpage->fetch($pageid, $object->fk_website);
+    if ($pageid > 0) 
+    {
+        $res = $objectpage->fetch($pageid);
+    }
+    else 
+    {
+        $res = $objectpage->fetch($object->fk_default_home);
+        if (! $res > 0)
+        {
+            $res = $objectpage->fetch(0, $object->fk_website);
+        }
+    }
     if ($res > 0)
     {
         if ($action == 'updatecontent')
         {
+            $db->begin();
+            
             $objectpage->content = GETPOST('PAGE_CONTENT');
     
             // Clean data. We remove all the head section.
@@ -632,7 +650,7 @@ if (count($object->records) > 0)
     // List of websites
     print '<div class="websiteselection">';
     $out='';
-    $out.='<select name="website" id="website">';
+    $out.='<select name="website" class="minwidth100" id="website">';
     if (empty($object->records)) $out.='<option value="-1">&nbsp;</option>';
     // Loop on each sites
     $i=0;
@@ -654,9 +672,9 @@ if (count($object->records) > 0)
 
     if ($website)
     {
-        $realurl=$urlwithroot.'/public/websites/index.php?website='.$website;
+        $virtualurl='';
         $dataroot=DOL_DATA_ROOT.'/websites/'.$website;
-        if (! empty($object->virtualhost)) $realurl=$object->virtualhost; 
+        if (! empty($object->virtualhost)) $virtualurl=$object->virtualhost;
     }
     
     if ($website && $action == 'preview')
@@ -680,20 +698,23 @@ if (count($object->records) > 0)
     if ($action == 'preview')
     {
         print '<div class="websiteinputurl">';
-        print '<input type="text" id="previewsiteurl" class="minwidth200imp" name="previewsite" value="'.$realurl.'">';
+        print '<input type="text" id="previewsiteurl" class="minwidth200imp" name="previewsite" placeholder="'.$langs->trans("http://myvirtualhost").'" value="'.$virtualurl.'">';
         //print '<input type="submit" class="button" name="previewwebsite" target="tab'.$website.'" value="'.$langs->trans("ViewSiteInNewTab").'">';
         $htmltext=$langs->trans("SetHereVirtualHost", $dataroot);
         print $form->textwithpicto('', $htmltext);
         print '</div>';
         
-        $urlext=$realurl;
-        $urlint=DOL_URL_ROOT.'/public/websites/index.php?website='.$website;
-        print '<a class="websitebuttonsitepreview" id="previewsiteext" href="'.$urlext.'" target="tab'.$website.'" alt="'.dol_escape_htmltag($langs->trans("PreviewSiteServedByWebServer")).'">';
-        print $form->textwithpicto('', $langs->trans("PreviewSiteServedByWebServer", $langs->transnoentitiesnoconv("Page"), $langs->transnoentitiesnoconv("Page"), $langs->transnoentitiesnoconv("Page"), $urlext), 1, 'preview_ext');
-        print '</a>';
+        $urlext=$virtualurl;
+        $urlint=$urlwithroot.'/public/websites/index.php?website='.$website;
+        //if (! empty($object->virtualhost))
+        //{
+            print '<a class="websitebuttonsitepreview" id="previewsiteext" href="'.$urlext.'" target="tab'.$website.'" alt="'.dol_escape_htmltag($langs->trans("PreviewSiteServedByWebServer", $langs->transnoentitiesnoconv("Site"), $langs->transnoentitiesnoconv("Site"), $dataroot, $urlext)).'">';
+            print $form->textwithpicto('', $langs->trans("PreviewSiteServedByWebServer", $langs->transnoentitiesnoconv("Site"), $langs->transnoentitiesnoconv("Site"), $dataroot, $urlext?$urlext:$langs->trans("VirtualHostUrlNotDefined")), 1, 'preview_ext');
+            print '</a>';
+        //}
         
-        print '<a class="websitebuttonsitepreview" id="previewsite" href="'.DOL_URL_ROOT.'/public/websites/index.php?website='.$website.'" target="tab'.$website.'" alt="'.dol_escape_htmltag($langs->trans("PreviewSiteServedByDolibarr")).'">';
-        print $form->textwithpicto('', $langs->trans("PreviewSiteServedByDolibarr", $langs->transnoentitiesnoconv("Page"), $langs->transnoentitiesnoconv("Page"), $langs->transnoentitiesnoconv("Page"), $urlint), 1, 'preview');
+        print '<a class="websitebuttonsitepreview" id="previewsite" href="'.$urlwithroot.'/public/websites/index.php?website='.$website.'" target="tab'.$website.'" alt="'.dol_escape_htmltag($langs->trans("PreviewSiteServedByDolibarr", $langs->transnoentitiesnoconv("Site"), $langs->transnoentitiesnoconv("Site"), $urlint)).'">';
+        print $form->textwithpicto('', $langs->trans("PreviewSiteServedByDolibarr", $langs->transnoentitiesnoconv("Site"), $langs->transnoentitiesnoconv("Site"), $urlint, $dataroot), 1, 'preview');
         print '</a>';
     }
 
@@ -803,13 +824,22 @@ if (count($object->records) > 0)
             print $form->textwithpicto('', $htmltext);
             print '</div>';
             
-            $urlext=$realurl.'/'.$pagealias.'.php';
-            print '<a class="websitebuttonsitepreview" id="previewpageext" href="'.$urlext.'" target="tab'.$website.'" alt="'.dol_escape_htmltag($langs->trans("PreviewSiteServedByWebServer")).'">';
-            print $form->textwithpicto('', $langs->trans("PreviewSiteServedByWebServer", $langs->transnoentitiesnoconv("Page"), $langs->transnoentitiesnoconv("Page"), $langs->transnoentitiesnoconv("Page"), $urlext), 1, 'preview_ext');
-            print '</a>';
+            if (! empty($object->virtualhost))
+            {
+                $urlext=$virtualurl.'/'.$pagealias.'.php';
+                print '<a class="websitebuttonsitepreview" id="previewpageext" href="'.$urlext.'" target="tab'.$website.'" alt="'.dol_escape_htmltag($langs->trans("PreviewSiteServedByWebServer", $langs->transnoentitiesnoconv("Page"), $langs->transnoentitiesnoconv("Page"), $dataroot, $urlext)).'">';
+                print $form->textwithpicto('', $langs->trans("PreviewSiteServedByWebServer", $langs->transnoentitiesnoconv("Page"), $langs->transnoentitiesnoconv("Page"), $dataroot, $urlext?$urlext:$langs->trans("VirtualHostUrlNotDefined")), 1, 'preview_ext');
+                print '</a>';
+            }
+            else
+            {
+                print '<a class="websitebuttonsitepreview" id="previewpageextnoclick" href="#">';
+                print $form->textwithpicto('', $langs->trans("PreviewSiteServedByWebServer", $langs->transnoentitiesnoconv("Page"), $langs->transnoentitiesnoconv("Page"), $dataroot, $urlext?$urlext:$langs->trans("VirtualHostUrlNotDefined")), 1, 'preview_ext');
+                print '</a>';
+            }
             
-            print '<a class="websitebuttonsitepreview" id="previewpage" href="'.$realpage.'&nocache='.dol_now().'" class="button" target="tab'.$website.'">';
-            print $form->textwithpicto('', $langs->trans("PreviewSiteServedByDolibarr", $langs->transnoentitiesnoconv("Page"), $langs->transnoentitiesnoconv("Page"), $langs->transnoentitiesnoconv("Page"), $realpage), 1, 'preview'); 
+            print '<a class="websitebuttonsitepreview" id="previewpage" href="'.$realpage.'&nocache='.dol_now().'" class="button" target="tab'.$website.'" alt="'.dol_escape_htmltag($langs->trans("PreviewSiteServedByDolibarr", $langs->transnoentitiesnoconv("Page"), $langs->transnoentitiesnoconv("Page"), $realpage)).'">';
+            print $form->textwithpicto('', $langs->trans("PreviewSiteServedByDolibarr", $langs->transnoentitiesnoconv("Page"), $langs->transnoentitiesnoconv("Page"), $realpage, $dataroot), 1, 'preview'); 
             print '</a>';       // View page in new Tab
             //print '<input type="submit" class="button" name="previewpage" target="tab'.$website.'"value="'.$langs->trans("ViewPageInNewTab").'">';
             

From c722286bcb584868d7603f16571299fa327c04a0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 28 Apr 2017 13:37:36 +0200
Subject: [PATCH 117/505] Fix regressions

---
 htdocs/comm/card.php                  | 2 +-
 htdocs/compta/facture/card.php        | 2 +-
 htdocs/core/class/html.form.class.php | 2 +-
 htdocs/langs/en_US/main.lang          | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index 67ab40f4946..aae1398109d 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -1098,7 +1098,7 @@ if ($id > 0)
     				    else print '<div class="inline-block divButAction"><a class="butActionRefused" title="'.dol_escape_js($langs->trans("ThirdPartyMustBeEditAsCustomer")).'" href="#">'.$langs->trans("AddBill").'</a></div>';
     				}
 
-    				if ($object->client != 0 && $object->client != 2) print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture.php?action=create&socid='.$object->id.'">'.$langs->trans("AddBill").'</a></div>';
+    				if ($object->client != 0 && $object->client != 2) print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture/card.php?action=create&socid='.$object->id.'">'.$langs->trans("AddBill").'</a></div>';
     				else print '<div class="inline-block divButAction"><a class="butActionRefused" title="'.dol_escape_js($langs->trans("ThirdPartyMustBeEditAsCustomer")).'" href="#">'.$langs->trans("AddBill").'</a></div>';
     
     			}
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 6e8c3b6d895..70eea532a79 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -2191,7 +2191,7 @@ if ($action == 'create')
 	else
 	{
 		print '<td colspan="2">';
-		print $form->select_company($soc->id, 'socid', '(s.client = 1 OR s.client = 3) AND status=1', 'SelectThirdParty');
+		print $form->select_company($soc->id, 'socid', '(s.client = 1 OR s.client = 3) AND status=1', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300');
 		// Option to reload page to retrieve customer informations. Note, this clear other input
 		if (!empty($conf->global->RELOAD_PAGE_ON_CUSTOMER_CHANGE))
 		{
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index b839e46dc8b..3275ee0f303 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -994,7 +994,7 @@ class Form
     				print img_picto($langs->trans("Search"), 'search');
     			}
     		}
-            print '<input type="text" class="minwidth100" name="search_'.$htmlname.'" id="search_'.$htmlname.'" value="'.$selected_input_value.'"'.$placeholder.' '.(!empty($conf->global->THIRDPARTY_SEARCH_AUTOFOCUS) ? 'autofocus' : '').' />';
+            print '<input type="text" class="'.$morecss.'" name="search_'.$htmlname.'" id="search_'.$htmlname.'" value="'.$selected_input_value.'"'.$placeholder.' '.(!empty($conf->global->THIRDPARTY_SEARCH_AUTOFOCUS) ? 'autofocus' : '').' />';
     		if ($hidelabel == 3) {
     			print img_picto($langs->trans("Search"), 'search');
     		}
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 71788071a2d..1a3eea413df 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -823,5 +823,5 @@ SearchIntoContracts=Contracts
 SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Expense reports
 SearchIntoLeaves=Leaves
-
+SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
\ No newline at end of file

From defce63a24456d2f57e14bdfa09faa282ed138aa Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 28 Apr 2017 14:05:28 +0200
Subject: [PATCH 118/505] Work on management of default values

---
 htdocs/admin/defaultvalues.php    |  9 ++++---
 htdocs/core/lib/functions.lib.php | 43 ++++++++++++++++++++++++-------
 htdocs/langs/en_US/admin.lang     |  2 +-
 htdocs/master.inc.php             |  2 +-
 htdocs/user/class/user.class.php  |  4 +--
 5 files changed, 42 insertions(+), 18 deletions(-)

diff --git a/htdocs/admin/defaultvalues.php b/htdocs/admin/defaultvalues.php
index 0bc620c41bf..96fef57e7cf 100644
--- a/htdocs/admin/defaultvalues.php
+++ b/htdocs/admin/defaultvalues.php
@@ -187,29 +187,30 @@ $texthelp=$langs->trans("PageUrlForDefaultValues");
 if ($mode == 'createform') $texthelp.=$langs->trans("PageUrlForDefaultValuesCreate", 'societe/card.php');
 else $texthelp.=$langs->trans("PageUrlForDefaultValuesList", 'societe/list.php');
 $texturl=$form->textwithpicto($langs->trans("Url"), $texthelp);
-print_liste_field_titre($texturl,$_SERVER["PHP_SELF"],'defaulturl','',$param,'',$sortfield,$sortorder);
+print_liste_field_titre($texturl,$_SERVER["PHP_SELF"],'page,param','',$param,'',$sortfield,$sortorder);
 $texthelp=$langs->trans("TheKeyIsTheNameOfHtmlField");
 if ($mode != 'sortorder') $textkey=$form->textwithpicto($langs->trans("Key"), $texthelp);
 else $textkey=$form->textwithpicto($langs->trans("Key"), $texthelp);
-print_liste_field_titre($textkey,$_SERVER["PHP_SELF"],'defaultkey','',$param,'',$sortfield,$sortorder);
+print_liste_field_titre($textkey,$_SERVER["PHP_SELF"],'param','',$param,'',$sortfield,$sortorder);
 if ($mode != 'sortorder')
 {
     $texthelp=$langs->trans("FollowingConstantsWillBeSubstituted").'<br>';
     // See list into GETPOST
     $texthelp.='__USERID__<br>';
+    $texthelp.='__SUPERVISORID__<br>';
     $texthelp.='__MYCOUNTRYID__<br>';
     $texthelp.='__DAY__<br>';
     $texthelp.='__MONTH__<br>';
     $texthelp.='__YEAR__<br>';
     if (! empty($conf->multicompany->enabled)) $texthelp.='__ENTITYID__<br>';
-    $textvalue=$form->textwithpicto($langs->trans("Value"), $texthelp);
+    $textvalue=$form->textwithpicto($langs->trans("Value"), $texthelp, 1, 'help', '', 0, 2, '');
 }
 else
 {
     $texthelp='ASC or DESC';
     $textvalue=$form->textwithpicto($langs->trans("SortOrder"), $texthelp);
 }
-print_liste_field_titre($textvalue, $_SERVER["PHP_SELF"], 'defaultvalue', '', $param, '', $sortfield, $sortorder);
+print_liste_field_titre($textvalue, $_SERVER["PHP_SELF"], 'value', '', $param, '', $sortfield, $sortorder);
 if (! empty($conf->multicompany->enabled) && !$user->entity) print_liste_field_titre($langs->trans("Entity"),$_SERVER["PHP_SELF"],'entity,page','',$param,'',$sortfield,$sortorder);
 print '<td align="center"></td>';
 print "</tr>\n";
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index d430a8ea53b..7743da27c2d 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -253,17 +253,35 @@ function GETPOST($paramname,$check='',$method=0,$filter=NULL,$options=NULL)
 		$out = isset($_GET[$paramname])?$_GET[$paramname]:(isset($_POST[$paramname])?$_POST[$paramname]:'');
 		
 		// Management of default values
-		if (! empty($_GET['action']) && $_GET['action'] == 'create' && ! empty($paramname) && ! isset($_GET[$paramname]) && ! isset($_POST[$paramname]))
+		if (! isset($_GET['sortfield']))	// If we did a click on a field so sort, we do no appl default values
 		{
-			$relativepathstring = preg_replace('/\.[a-z]+$/', '', $_SERVER["PHP_SELF"]);
-			if (constant('DOL_URL_ROOT')) $relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_URL_ROOT'),'/').'/', '', $relativepathstring);
-			$relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
-			$relativepathstring = preg_replace('/^\//', '', $relativepathstring);
-			$relativepathstring=dol_string_nospecial($relativepathstring, '-');
-			// $relativepathstring is now string that identify the page: '_societe_card', '_agenda_card', ...
-			$keyfordefaultvalue = 'MAIN_DEFAULT_FOR_'.$relativepathstring.'_'.$paramname;
-			global $conf;
-			if (isset($conf->global->$keyfordefaultvalue)) $out = $conf->global->$keyfordefaultvalue;
+			if (! empty($_GET['action']) && $_GET['action'] == 'create' && ! empty($paramname) && ! isset($_GET[$paramname]) && ! isset($_POST[$paramname]))
+			{
+				$relativepathstring = $_SERVER["PHP_SELF"];
+				if (constant('DOL_URL_ROOT')) $relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_URL_ROOT'),'/').'/', '', $relativepathstring);
+				$relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
+				$relativepathstring = preg_replace('/^\//', '', $relativepathstring);
+				global $user;
+				if (! empty($user->default_values))		// $user->default_values defined from menu default values, and values loaded not at first 
+				{
+					//var_dump($user->default_values[$relativepathstring]['createform']);
+					if (isset($user->default_values[$relativepathstring]['createform'][$paramname])) $out = $user->default_values[$relativepathstring]['createform'][$paramname];
+				}
+			}
+			// Management of default search_filters
+			elseif (preg_match('/list.php$/', $_SERVER["PHP_SELF"]) && ! empty($paramname) && ! isset($_GET[$paramname]) && ! isset($_POST[$paramname]))
+			{
+				$relativepathstring = $_SERVER["PHP_SELF"];
+				if (constant('DOL_URL_ROOT')) $relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_URL_ROOT'),'/').'/', '', $relativepathstring);
+				$relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
+				$relativepathstring = preg_replace('/^\//', '', $relativepathstring);
+				global $user;
+				if (! empty($user->default_values))		// $user->default_values defined from menu default values, and values loaded not at first 
+				{
+					//var_dump($user->default_values[$relativepathstring]);
+					if (isset($user->default_values[$relativepathstring]['filters'][$paramname])) $out = $user->default_values[$relativepathstring]['filters'][$paramname];
+				}
+			}
 		}
 	}
 	elseif ($method==1) $out = isset($_GET[$paramname])?$_GET[$paramname]:'';
@@ -303,6 +321,11 @@ function GETPOST($paramname,$check='',$method=0,$filter=NULL,$options=NULL)
 	            global $user;
 	            $out = $user->id;
 	        }
+	    	elseif ($reg[1] == 'SUPERVISORID')
+	        {
+	            global $user;
+	            $out = $user->fk_user;
+	        }
 	        elseif ($reg[1] == 'ENTITYID')
 	        {
 	            global $conf;
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index af23343398b..1bfa5c0230c 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -428,7 +428,7 @@ ClickToShowDescription=Click to show description
 DependsOn=This module need the module(s)
 RequiredBy=This module is required by module(s)
 TheKeyIsTheNameOfHtmlField=The key is the name of the html field. This need to have technical knowledges to read the content of the HTML page to get the key name of a field.
-PageUrlForDefaultValues=You must enter here the relative url of the page. Examples:
+PageUrlForDefaultValues=You must enter here the relative url of the page. If you include parameters in URL, the default values will be effective if all parameters are set to same value. Examples:
 PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>
 PageUrlForDefaultValuesList=<br>For page that list thirdparties, it is <strong>%s</strong>
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code, so to change this value, you must edit it fom Home-Setup-translation.
diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php
index ebb99eb9807..61e51999479 100644
--- a/htdocs/master.inc.php
+++ b/htdocs/master.inc.php
@@ -180,7 +180,7 @@ if (! defined('NOREQUIREDB'))
 
 	//print "Will work with data into entity instance number '".$conf->entity."'";
 
-	// Here we read database (llx_const table and llx_default_values) and define $conf->global->XXX var.
+	// Here we read database (llx_const table) and define $conf->global->XXX var.
 	$conf->setValues($db);
 }
 
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index a3006d6ebcd..f23c8aca0b6 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -376,7 +376,7 @@ class User extends CommonObject
 			    {
 			        if (! empty($obj->page) && ! empty($obj->type) && ! empty($obj->param)) 
 			        {
-			            $user->default_values[$obj->page][$obj->type][$obj->param]=$obj->value;
+			            $this->default_values[$obj->page][$obj->type][$obj->param]=$obj->value;
 			        }
 			    }
 			    $this->db->free($resql);
@@ -387,7 +387,7 @@ class User extends CommonObject
 				return -3;
 			}
 		}
-
+		
 		return 1;
 	}
 

From 88515c306fdf759abd5cf97797db7b92a461b97f Mon Sep 17 00:00:00 2001
From: phf <phf@atm-consulting.fr>
Date: Fri, 28 Apr 2017 14:33:06 +0200
Subject: [PATCH 119/505] Fix Propal class doesn't have fetch_lines method yet

---
 htdocs/comm/propal/class/propal.class.php | 204 ++++++++++++----------
 1 file changed, 111 insertions(+), 93 deletions(-)

diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 46c6a55cf2f..348ca1938b0 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -1366,102 +1366,13 @@ class Propal extends CommonObject
                 $this->lines = array();
 
                 /*
-                 * Lignes propales liees a un produit ou non
+                 * Lines
                  */
-                $sql = "SELECT d.rowid, d.fk_propal, d.fk_parent_line, d.label as custom_label, d.description, d.price, d.tva_tx, d.localtax1_tx, d.localtax2_tx, d.qty, d.fk_remise_except, d.remise_percent, d.subprice, d.fk_product,";
-				$sql.= " d.info_bits, d.total_ht, d.total_tva, d.total_localtax1, d.total_localtax2, d.total_ttc, d.fk_product_fournisseur_price as fk_fournprice, d.buy_price_ht as pa_ht, d.special_code, d.rang, d.product_type,";
-	            $sql.= " d.fk_unit,";
-                $sql.= ' p.ref as product_ref, p.description as product_desc, p.fk_product_type, p.label as product_label,';
-                $sql.= ' d.date_start, d.date_end';
-				$sql.= ' ,d.fk_multicurrency, d.multicurrency_code, d.multicurrency_subprice, d.multicurrency_total_ht, d.multicurrency_total_tva, d.multicurrency_total_ttc';
-                $sql.= " FROM ".MAIN_DB_PREFIX."propaldet as d";
-                $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON d.fk_product = p.rowid";
-                $sql.= " WHERE d.fk_propal = ".$this->id;
-                $sql.= " ORDER by d.rang";
-
-                $result = $this->db->query($sql);
-                if ($result)
+                $result=$this->fetch_lines();
+                if ($result < 0)
                 {
-                	require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-                	$extrafieldsline=new ExtraFields($this->db);
-                	$line = new PropaleLigne($this->db);
-                	$extralabelsline=$extrafieldsline->fetch_name_optionals_label($line->table_element,true);
-
-                    $num = $this->db->num_rows($result);
-                    $i = 0;
-
-                    while ($i < $num)
-                    {
-                        $objp                   = $this->db->fetch_object($result);
-
-                        $line                   = new PropaleLigne($this->db);
-
-                        $line->rowid			= $objp->rowid; //Deprecated
-                        $line->id				= $objp->rowid;
-                        $line->fk_propal		= $objp->fk_propal;
-                        $line->fk_parent_line	= $objp->fk_parent_line;
-                        $line->product_type     = $objp->product_type;
-                        $line->label            = $objp->custom_label;
-                        $line->desc             = $objp->description;  // Description ligne
-                        $line->qty              = $objp->qty;
-                        $line->tva_tx           = $objp->tva_tx;
-                        $line->localtax1_tx		= $objp->localtax1_tx;
-                        $line->localtax2_tx		= $objp->localtax2_tx;
-                        $line->subprice         = $objp->subprice;
-                        $line->fk_remise_except = $objp->fk_remise_except;
-                        $line->remise_percent   = $objp->remise_percent;
-                        $line->price            = $objp->price;		// TODO deprecated
-
-                        $line->info_bits        = $objp->info_bits;
-                        $line->total_ht         = $objp->total_ht;
-                        $line->total_tva        = $objp->total_tva;
-                        $line->total_localtax1	= $objp->total_localtax1;
-                        $line->total_localtax2	= $objp->total_localtax2;
-                        $line->total_ttc        = $objp->total_ttc;
-      					$line->fk_fournprice 	= $objp->fk_fournprice;
-						$marginInfos			= getMarginInfos($objp->subprice, $objp->remise_percent, $objp->tva_tx, $objp->localtax1_tx, $objp->localtax2_tx, $line->fk_fournprice, $objp->pa_ht);
-						$line->pa_ht 			= $marginInfos[0];
-						$line->marge_tx			= $marginInfos[1];
-						$line->marque_tx		= $marginInfos[2];
-                        $line->special_code     = $objp->special_code;
-                        $line->rang             = $objp->rang;
-
-                        $line->fk_product       = $objp->fk_product;
-
-                        $line->ref				= $objp->product_ref;		// TODO deprecated
-                        $line->product_ref		= $objp->product_ref;
-                        $line->libelle			= $objp->product_label;		// TODO deprecated
-                        $line->product_label	= $objp->product_label;
-                        $line->product_desc     = $objp->product_desc; 		// Description produit
-                        $line->fk_product_type  = $objp->fk_product_type;
-	                    $line->fk_unit          = $objp->fk_unit;
-
-                        $line->date_start  		= $this->db->jdate($objp->date_start);
-                        $line->date_end  		= $this->db->jdate($objp->date_end);
-
-						// Multicurrency
-						$line->fk_multicurrency 		= $objp->fk_multicurrency;
-						$line->multicurrency_code 		= $objp->multicurrency_code;
-						$line->multicurrency_subprice 	= $objp->multicurrency_subprice;
-						$line->multicurrency_total_ht 	= $objp->multicurrency_total_ht;
-						$line->multicurrency_total_tva 	= $objp->multicurrency_total_tva;
-						$line->multicurrency_total_ttc 	= $objp->multicurrency_total_ttc;
-
-                        $line->fetch_optionals($line->id,$extralabelsline);
-
-                        $this->lines[$i]        = $line;
-                        //dol_syslog("1 ".$line->fk_product);
-                        //print "xx $i ".$this->lines[$i]->fk_product;
-                        $i++;
-                    }
-                    $this->db->free($result);
+                    return -3;
                 }
-                else
-                {
-                    $this->error=$this->db->lasterror();
-                    return -1;
-                }
-
 
                 return 1;
             }
@@ -1475,6 +1386,113 @@ class Propal extends CommonObject
             return -1;
         }
     }
+	
+	/**
+	 * Load array lines
+	 * 
+	 * @param		int		$only_product	Return only physical products
+	 * @return		int						<0 if KO, >0 if OK
+	 */
+	function fetch_lines($only_product=0)
+	{
+		$this->lines=array();
+		
+		$sql = 'SELECT d.rowid, d.fk_propal, d.fk_parent_line, d.label as custom_label, d.description, d.price, d.tva_tx, d.localtax1_tx, d.localtax2_tx, d.qty, d.fk_remise_except, d.remise_percent, d.subprice, d.fk_product,';
+		$sql.= ' d.info_bits, d.total_ht, d.total_tva, d.total_localtax1, d.total_localtax2, d.total_ttc, d.fk_product_fournisseur_price as fk_fournprice, d.buy_price_ht as pa_ht, d.special_code, d.rang, d.product_type,';
+		$sql.= ' d.fk_unit,';
+		$sql.= ' p.ref as product_ref, p.description as product_desc, p.fk_product_type, p.label as product_label,';
+		$sql.= ' d.date_start, d.date_end';
+		$sql.= ' ,d.fk_multicurrency, d.multicurrency_code, d.multicurrency_subprice, d.multicurrency_total_ht, d.multicurrency_total_tva, d.multicurrency_total_ttc';
+		$sql.= ' FROM '.MAIN_DB_PREFIX.'propaldet as d';
+		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON (d.fk_product = p.rowid)';
+		$sql.= ' WHERE d.fk_propal = '.$this->id;
+		if ($only_product) $sql .= ' AND p.fk_product_type = 0';
+		$sql.= ' ORDER by d.rang';
+
+		dol_syslog(get_class($this)."::fetch_lines", LOG_DEBUG);
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+
+			$num = $this->db->num_rows($result);
+			
+			$i = 0;
+			while ($i < $num)
+			{
+				$objp                   = $this->db->fetch_object($result);
+
+				$line                   = new PropaleLigne($this->db);
+
+				$line->rowid			= $objp->rowid; //Deprecated
+				$line->id				= $objp->rowid;
+				$line->fk_propal		= $objp->fk_propal;
+				$line->fk_parent_line	= $objp->fk_parent_line;
+				$line->product_type     = $objp->product_type;
+				$line->label            = $objp->custom_label;
+				$line->desc             = $objp->description;  // Description ligne
+				$line->qty              = $objp->qty;
+				$line->tva_tx           = $objp->tva_tx;
+				$line->localtax1_tx		= $objp->localtax1_tx;
+				$line->localtax2_tx		= $objp->localtax2_tx;
+				$line->subprice         = $objp->subprice;
+				$line->fk_remise_except = $objp->fk_remise_except;
+				$line->remise_percent   = $objp->remise_percent;
+				$line->price            = $objp->price;		// TODO deprecated
+
+				$line->info_bits        = $objp->info_bits;
+				$line->total_ht         = $objp->total_ht;
+				$line->total_tva        = $objp->total_tva;
+				$line->total_localtax1	= $objp->total_localtax1;
+				$line->total_localtax2	= $objp->total_localtax2;
+				$line->total_ttc        = $objp->total_ttc;
+				$line->fk_fournprice 	= $objp->fk_fournprice;
+				$marginInfos			= getMarginInfos($objp->subprice, $objp->remise_percent, $objp->tva_tx, $objp->localtax1_tx, $objp->localtax2_tx, $line->fk_fournprice, $objp->pa_ht);
+				$line->pa_ht 			= $marginInfos[0];
+				$line->marge_tx			= $marginInfos[1];
+				$line->marque_tx		= $marginInfos[2];
+				$line->special_code     = $objp->special_code;
+				$line->rang             = $objp->rang;
+
+				$line->fk_product       = $objp->fk_product;
+
+				$line->ref				= $objp->product_ref;		// TODO deprecated
+				$line->product_ref		= $objp->product_ref;
+				$line->libelle			= $objp->product_label;		// TODO deprecated
+				$line->product_label	= $objp->product_label;
+				$line->product_desc     = $objp->product_desc; 		// Description produit
+				$line->fk_product_type  = $objp->fk_product_type;
+				$line->fk_unit          = $objp->fk_unit;
+
+				$line->date_start  		= $this->db->jdate($objp->date_start);
+				$line->date_end  		= $this->db->jdate($objp->date_end);
+
+				// Multicurrency
+				$line->fk_multicurrency 		= $objp->fk_multicurrency;
+				$line->multicurrency_code 		= $objp->multicurrency_code;
+				$line->multicurrency_subprice 	= $objp->multicurrency_subprice;
+				$line->multicurrency_total_ht 	= $objp->multicurrency_total_ht;
+				$line->multicurrency_total_tva 	= $objp->multicurrency_total_tva;
+				$line->multicurrency_total_ttc 	= $objp->multicurrency_total_ttc;
+
+				$line->fetch_optionals();
+
+				$this->lines[$i]        = $line;
+				//dol_syslog("1 ".$line->fk_product);
+				//print "xx $i ".$this->lines[$i]->fk_product;
+				$i++;
+			}
+			
+			$this->db->free($result);
+			
+			return 1;
+		}
+		else
+		{
+			$this->error=$this->db->lasterror();
+			return -3;
+		}
+	}
 
     /**
      *	Update value of extrafields on the proposal

From 058b43f342e895edde8fb483ca8686371430b9ff Mon Sep 17 00:00:00 2001
From: BENKE Charlie <charles.fr@benke.fr>
Date: Fri, 28 Apr 2017 16:50:30 +0200
Subject: [PATCH 120/505] display the good value on pdf

---
 htdocs/core/lib/pdf.lib.php | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index c490a2f66c5..2fc447daffd 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -1853,7 +1853,7 @@ function pdf_getlinetotalexcltax($object,$i,$outputlangs,$hidedetails=0)
 		if(!empty($hookmanager->resPrint)) $result.=$hookmanager->resPrint;
 	}
     if (empty($reshook))
-	{
+    {
 	    if ($object->lines[$i]->special_code == 3)
     	{
     		return $outputlangs->transnoentities("Option");
@@ -1861,9 +1861,16 @@ function pdf_getlinetotalexcltax($object,$i,$outputlangs,$hidedetails=0)
         if (empty($hidedetails) || $hidedetails > 1)
         {
         	$total_ht = ($conf->multicurrency->enabled && $object->multicurrency_tx != 1 ? $object->lines[$i]->multicurrency_total_ht : $object->lines[$i]->total_ht);
+        	if ($object->lines[$i]->situation_percent > 0 )
+        	{
+		 	$prev_progress = $object->lines[$i]->get_prev_progress($object->id);
+		 	$progress = ( $object->lines[$i]->situation_percent - $prev_progress) /100;
+		 	$result.=price($sign * ($total_ht/($object->lines[$i]->situation_percent/100)) * $progress, 0, $outputlangs);
+		}
+        	else
 			$result.=price($sign * $total_ht, 0, $outputlangs);
-        }
 	}
+    }
 	return $result;
 }
 

From 2e6d865c7d07b48254228cba07e082d42a53ed28 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 29 Apr 2017 00:44:25 +0200
Subject: [PATCH 121/505] NEW Can define default values for create forms. NEW
 Can define default filters for list pages. NEW Can define default sort order
 for list pages.

---
 htdocs/admin/defaultvalues.php    | 95 +++++++++++++++++++++++++------
 htdocs/admin/dict.php             |  2 +-
 htdocs/core/db/DoliDB.class.php   | 17 ++++--
 htdocs/core/lib/functions.lib.php | 53 ++++++++++++-----
 htdocs/langs/en_US/admin.lang     |  4 +-
 htdocs/theme/eldy/style.css.php   |  2 +-
 6 files changed, 135 insertions(+), 38 deletions(-)

diff --git a/htdocs/admin/defaultvalues.php b/htdocs/admin/defaultvalues.php
index 96fef57e7cf..8a9bd4f209b 100644
--- a/htdocs/admin/defaultvalues.php
+++ b/htdocs/admin/defaultvalues.php
@@ -56,6 +56,10 @@ $defaultvalue = GETPOST('defaultvalue');
 
 $defaulturl=preg_replace('/^\//', '', $defaulturl);
 
+$urlpage = GETPOST('urlpage');
+$key = GETPOST('key');
+$value = GETPOST('value');
+
 
 /*
  * Actions
@@ -81,25 +85,51 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETP
 }
 
 
-if ($action == 'add' || (GETPOST('add') && $action != 'update'))
+if (($action == 'add' || (GETPOST('add') && $action != 'update')) || GETPOST('actionmodify'))
 {
 	$error=0;
 
-	if (empty($defaulturl))
+	if (($action == 'add' || (GETPOST('add') && $action != 'update')))
 	{
-		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Url")), null, 'errors');
-		$error++;
+    	if (empty($defaulturl))
+    	{
+    		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Url")), null, 'errors');
+    		$error++;
+    	}
+    	if (empty($defaultkey))
+    	{
+    		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Field")), null, 'errors');
+    		$error++;
+    	}
 	}
-	if (empty($defaultkey))
+	if (GETPOST('actionmodify'))
 	{
-		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Key")), null, 'errors');
-		$error++;
+	    if (empty($urlpage))
+	    {
+	        setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Url")), null, 'errors');
+	        $error++;
+	    }
+	    if (empty($key))
+	    {
+	        setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Field")), null, 'errors');
+	        $error++;
+	    }
 	}
+	
 	if (! $error)
 	{
 	    $db->begin();
-	     
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."default_values(type, user_id, page, param, value, entity) VALUES ('".$db->escape($mode)."', 0, '".$db->escape($defaulturl)."','".$db->escape($defaultkey)."','".$db->escape($defaultvalue)."', ".$db->escape($conf->entity).")";
+	    
+	    if ($action == 'add' || (GETPOST('add') && $action != 'update'))
+	    {
+            $sql = "INSERT INTO ".MAIN_DB_PREFIX."default_values(type, user_id, page, param, value, entity) VALUES ('".$db->escape($mode)."', 0, '".$db->escape($defaulturl)."','".$db->escape($defaultkey)."','".$db->escape($defaultvalue)."', ".$db->escape($conf->entity).")";
+	    }
+	    if (GETPOST('actionmodify'))
+	    {
+		    $sql = "UPDATE ".MAIN_DB_PREFIX."default_values SET page = '".$db->escape($urlpage)."', param = '".$db->escape($key)."', value = '".$db->escape($value)."'";
+		    $sql.= " WHERE rowid = ".$id;
+	    }
+		
 		$result = $db->query($sql);
 		if ($result > 0)
 		{
@@ -176,6 +206,10 @@ $head=defaultvalues_prepare_head();
     
 dol_fiche_head($head, $mode, '', -1, '');
 
+if ($mode == 'sortorder')
+{
+    print info_admin($langs->trans("WarningSettingSortOrder")).'<br>';
+}
 
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" id="action" name="action" value="">';
@@ -189,8 +223,15 @@ else $texthelp.=$langs->trans("PageUrlForDefaultValuesList", 'societe/list.php')
 $texturl=$form->textwithpicto($langs->trans("Url"), $texthelp);
 print_liste_field_titre($texturl,$_SERVER["PHP_SELF"],'page,param','',$param,'',$sortfield,$sortorder);
 $texthelp=$langs->trans("TheKeyIsTheNameOfHtmlField");
-if ($mode != 'sortorder') $textkey=$form->textwithpicto($langs->trans("Key"), $texthelp);
-else $textkey=$form->textwithpicto($langs->trans("Key"), $texthelp);
+if ($mode != 'sortorder') 
+{
+    $textkey=$form->textwithpicto($langs->trans("Field"), $texthelp);
+}
+else 
+{
+    $texthelp='field or alias.field';
+    $textkey=$form->textwithpicto($langs->trans("Field"), $texthelp);
+}
 print_liste_field_titre($textkey,$_SERVER["PHP_SELF"],'param','',$param,'',$sortfield,$sortorder);
 if ($mode != 'sortorder')
 {
@@ -270,9 +311,17 @@ if ($result)
 
 		print '<tr class="oddeven">';
 		
-		print '<td>'.$obj->page.'</td>'."\n";
-   	    print '<td>'.$obj->param.'</td>'."\n";
-        
+		print '<td>';
+		if ($action != 'edit' || GETPOST('rowid') != $obj->rowid) print $obj->page;
+		else print '<input type="text" name="urlpage" value="'.dol_escape_htmltag($obj->page).'">';
+		print '</td>'."\n";
+   	    
+		// Key
+		print '<td>';
+		if ($action != 'edit' || GETPOST('rowid') != $obj->rowid) print $obj->param;
+		else print '<input type="text" name="key" value="'.dol_escape_htmltag($obj->param).'">';
+		print '</td>'."\n";
+
 		// Value
 		print '<td>';
 		/*print '<input type="hidden" name="const['.$i.'][rowid]" value="'.$obj->rowid.'">';
@@ -280,11 +329,25 @@ if ($result)
 		print '<input type="hidden" name="const['.$i.'][name]" value="'.$obj->transkey.'">';
 		print '<input type="text" id="value_'.$i.'" class="flat inputforupdate" size="30" name="const['.$i.'][value]" value="'.dol_escape_htmltag($obj->transvalue).'">';
 		*/
-		print $obj->value;
+		if ($action != 'edit' || GETPOST('rowid') != $obj->rowid) print $obj->value;
+		else print '<input type="text" name="value" value="'.dol_escape_htmltag($obj->value).'">';
 		print '</td>';
 
 		print '<td align="center">';
-		print '<a href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$obj->entity.'&mode='.$mode.'&action=delete'.((empty($user->entity) && $debug)?'&debug=1':'').'">'.img_delete().'</a>';
+		if ($action != 'edit' || GETPOST('rowid') != $obj->rowid)
+		{
+    		print '<a href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$obj->entity.'&mode='.$mode.'&action=edit'.((empty($user->entity) && $debug)?'&debug=1':'').'">'.img_edit().'</a>';
+    		print ' &nbsp; ';
+    		print '<a href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$obj->entity.'&mode='.$mode.'&action=delete'.((empty($user->entity) && $debug)?'&debug=1':'').'">'.img_delete().'</a>';
+		}
+		else
+		{
+		    print '<input type="hidden" name="page" value="'.$page.'">';
+		    print '<input type="hidden" name="rowid" value="'.$id.'">';
+		    print '<div name="'.(! empty($obj->rowid)?$obj->rowid:'none').'"></div>';
+		    print '<input type="submit" class="button" name="actionmodify" value="'.$langs->trans("Modify").'">';
+		    print '<input type="submit" class="button" name="actioncancel" value="'.$langs->trans("Cancel").'">';
+		}
 		print '</td>';
 		
 		print "</tr>\n";
diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index c8632f57772..125f913eb8d 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -1306,10 +1306,10 @@ if ($id)
                     if (empty($reshook)) fieldList($fieldlist,$obj,$tabname[$id],'edit');
 
                     print '<td colspan="3" align="center">';
+                    print '<div name="'.(! empty($obj->rowid)?$obj->rowid:$obj->code).'"></div>';
                     print '<input type="hidden" name="page" value="'.$page.'">';
                     print '<input type="hidden" name="rowid" value="'.$rowid.'">';
                     print '<input type="submit" class="button" name="actionmodify" value="'.$langs->trans("Modify").'">';
-                    print '<div name="'.(! empty($obj->rowid)?$obj->rowid:$obj->code).'"></div>';
                     print '<input type="submit" class="button" name="actioncancel" value="'.$langs->trans("Cancel").'">';
                     print '</td>';
                 }
diff --git a/htdocs/core/db/DoliDB.class.php b/htdocs/core/db/DoliDB.class.php
index c63227e1601..9fc1739334c 100644
--- a/htdocs/core/db/DoliDB.class.php
+++ b/htdocs/core/db/DoliDB.class.php
@@ -220,9 +220,9 @@ abstract class DoliDB implements Database
 	/**
 	 * Define sort criteria of request
 	 *
-	 * @param	string	$sortfield  List of sort fields, separated by comma. Example: 't1.fielda, t2.fieldb'
+	 * @param	string	        $sortfield  List of sort fields, separated by comma. Example: 't1.fielda, t2.fieldb'
 	 * @param	'ASC'|'DESC'	$sortorder  Sort order
-	 * @return	string      		String to provide syntax of a sort sql string
+	 * @return	string      		        String to provide syntax of a sort sql string
 	 */
 	function order($sortfield=null,$sortorder=null)
 	{
@@ -230,18 +230,25 @@ abstract class DoliDB implements Database
 		{
 			$return='';
 			$fields=explode(',',$sortfield);
+			$orders=explode(',',$sortorder);
+			$i=0;
 			foreach($fields as $val)
 			{
 				if (! $return) $return.=' ORDER BY ';
-				else $return.=',';
+				else $return.=', ';
 
 				$return.=preg_replace('/[^0-9a-z_\.]/i','',$val);
+				
+				$tmpsortorder = trim($orders[$i]);
+				
 				// Only ASC and DESC values are valid SQL
-				if (strtoupper($sortorder) === 'ASC') {
+				if (strtoupper($tmpsortorder) === 'ASC') {
 					$return .= ' ASC';
-				} elseif (strtoupper($sortorder) === 'DESC') {
+				} elseif (strtoupper($tmpsortorder) === 'DESC') {
 					$return .= ' DESC';
 				}
+				
+				$i++;
 			}
 			return $return;
 		}
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 7743da27c2d..0d54593f0db 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -246,16 +246,16 @@ function dol_shutdown()
  *  @param  mixed   $options     Options to pass to filter_var when $check is set to custom
  *  @return string|string[]      Value found (string or array), or '' if check fails
  */
-function GETPOST($paramname,$check='',$method=0,$filter=NULL,$options=NULL)
+function GETPOST($paramname, $check='', $method=0, $filter=NULL, $options=NULL)
 {
 	if (empty($method))
 	{
 		$out = isset($_GET[$paramname])?$_GET[$paramname]:(isset($_POST[$paramname])?$_POST[$paramname]:'');
-		
+
 		// Management of default values
-		if (! isset($_GET['sortfield']))	// If we did a click on a field so sort, we do no appl default values
+		if (! isset($_GET['sortfield']))	// If we did a click on a field to sort, we do no apply default values
 		{
-			if (! empty($_GET['action']) && $_GET['action'] == 'create' && ! empty($paramname) && ! isset($_GET[$paramname]) && ! isset($_POST[$paramname]))
+		    if (! empty($_GET['action']) && $_GET['action'] == 'create' && ! empty($paramname) && ! isset($_GET[$paramname]) && ! isset($_POST[$paramname]))
 			{
 				$relativepathstring = $_SERVER["PHP_SELF"];
 				if (constant('DOL_URL_ROOT')) $relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_URL_ROOT'),'/').'/', '', $relativepathstring);
@@ -268,18 +268,40 @@ function GETPOST($paramname,$check='',$method=0,$filter=NULL,$options=NULL)
 					if (isset($user->default_values[$relativepathstring]['createform'][$paramname])) $out = $user->default_values[$relativepathstring]['createform'][$paramname];
 				}
 			}
-			// Management of default search_filters
+			// Management of default search_filters and sort order
 			elseif (preg_match('/list.php$/', $_SERVER["PHP_SELF"]) && ! empty($paramname) && ! isset($_GET[$paramname]) && ! isset($_POST[$paramname]))
 			{
-				$relativepathstring = $_SERVER["PHP_SELF"];
+			    $relativepathstring = $_SERVER["PHP_SELF"];
 				if (constant('DOL_URL_ROOT')) $relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_URL_ROOT'),'/').'/', '', $relativepathstring);
 				$relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
 				$relativepathstring = preg_replace('/^\//', '', $relativepathstring);
 				global $user;
 				if (! empty($user->default_values))		// $user->default_values defined from menu default values, and values loaded not at first 
 				{
-					//var_dump($user->default_values[$relativepathstring]);
-					if (isset($user->default_values[$relativepathstring]['filters'][$paramname])) $out = $user->default_values[$relativepathstring]['filters'][$paramname];
+				    //var_dump($user->default_values[$relativepathstring]);
+        			if ($paramname == 'sortfield')
+        			{
+        			    if (isset($user->default_values[$relativepathstring]['sortorder'])) 
+        			    {
+        			        foreach($user->default_values[$relativepathstring]['sortorder'] as $key => $val)
+        			        {
+        			            if ($out) $out.=', ';
+        			            $out.=$key;
+        			        }
+        			    }
+        			}
+        			elseif ($paramname == 'sortorder')
+        			{
+        			    if (isset($user->default_values[$relativepathstring]['sortorder'])) 
+        			    {
+        			        foreach($user->default_values[$relativepathstring]['sortorder'] as $key => $val)
+        			        {
+        			            if ($out) $out.=', ';
+        			            $out.=$val;
+        			        }
+        			    }
+        			}
+				    elseif (isset($user->default_values[$relativepathstring]['filters'][$paramname])) $out = $user->default_values[$relativepathstring]['filters'][$paramname];
 				}
 			}
 		}
@@ -3178,6 +3200,9 @@ function getTitleFieldOfList($name, $thead=0, $file="", $field="", $begin="", $m
 	$tag='th';
 	if ($thead==2) $tag='div';
 
+	$tmpsortfield=explode(',',$sortfield);
+	$sortfield=trim($tmpsortfield[0]);
+	
 	// If field is used as sort criteria we use a specific class
 	// Example if (sortfield,field)=("nom","xxx.nom") or (sortfield,field)=("nom","nom")
 	if ($field && ($sortfield == $field || $sortfield == preg_replace("/^[^\.]+\./","",$field))) $out.= '<'.$tag.' class="'.$prefix.'liste_titre_sel" '. $moreattrib.'>';
@@ -3192,13 +3217,13 @@ function getTitleFieldOfList($name, $thead=0, $file="", $field="", $begin="", $m
 
 		if ($field != $sortfield)
 		{
-            if ($sortorder == 'DESC') $out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=desc&begin='.$begin.$options.'">';
-            if ($sortorder == 'ASC' || ! $sortorder) $out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=asc&begin='.$begin.$options.'">';
+            if (preg_match('/^DESC/', $sortorder)) $out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=desc&begin='.$begin.$options.'">';
+            else $out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=asc&begin='.$begin.$options.'">';
 		}
 		else
 		{
-            if ($sortorder == 'DESC' || ! $sortorder) $out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=asc&begin='.$begin.$options.'">';
-            if ($sortorder == 'ASC') $out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=desc&begin='.$begin.$options.'">';
+            if (preg_match('/^ASC/', $sortorder)) $out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=desc&begin='.$begin.$options.'">';
+		    else $out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=asc&begin='.$begin.$options.'">';
 		}
 	}
 
@@ -3227,12 +3252,12 @@ function getTitleFieldOfList($name, $thead=0, $file="", $field="", $begin="", $m
 		}
 		else
 		{
-			if ($sortorder == 'DESC' ) {
+			if (preg_match('/^DESC/', $sortorder)) {
 				//$out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=asc&begin='.$begin.$options.'">'.img_down("A-Z",0).'</a>';
 				//$out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=desc&begin='.$begin.$options.'">'.img_up("Z-A",1).'</a>';
 				$sortimg.= '<span class="nowrap">'.img_up("Z-A",0).'</span>';
 			}
-			if ($sortorder == 'ASC' ) {
+			if (preg_match('/^ASC/', $sortorder)) {
 				//$out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=asc&begin='.$begin.$options.'">'.img_down("A-Z",1).'</a>';
 				//$out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=desc&begin='.$begin.$options.'">'.img_up("Z-A",0).'</a>';
 				$sortimg.= '<span class="nowrap">'.img_down("A-Z",0).'</span>';
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 1bfa5c0230c..69c72fc7aad 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -427,11 +427,13 @@ WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to
 ClickToShowDescription=Click to show description
 DependsOn=This module need the module(s)
 RequiredBy=This module is required by module(s)
-TheKeyIsTheNameOfHtmlField=The key is the name of the html field. This need to have technical knowledges to read the content of the HTML page to get the key name of a field.
+TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. This need to have technical knowledges to read the content of the HTML page to get the key name of a field.
 PageUrlForDefaultValues=You must enter here the relative url of the page. If you include parameters in URL, the default values will be effective if all parameters are set to same value. Examples:
 PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>
 PageUrlForDefaultValuesList=<br>For page that list thirdparties, it is <strong>%s</strong>
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code, so to change this value, you must edit it fom Home-Setup-translation.
+WarningSettingSortOrder=Warning, setting a default sort order may result in a technical error when going on the list page if field is an unknown field. If you experience such an error, come back to this page to remove the default sort order to retreive default behavior. 
+Field=Field
 # Modules
 Module0Name=Users & groups
 Module0Desc=Users / Employees and Groups management
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index f0e615f29ce..4d711599992 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -253,7 +253,7 @@ a.tab { font-weight: bold !important; }
 a:link, a:visited, a:hover, a:active { font-family: <?php print $fontlist ?>; font-weight: normal; color: rgb(<?php print $colortextlink; ?>); text-decoration: none;  }
 a:hover { text-decoration: underline; color: rgb(<?php print $colortextlink; ?>); }
 a.commonlink { color: rgb(<?php print $colortextlink; ?>) !important; text-decoration: none; }
-
+th.liste_titre a div div:hover, th.liste_titre_sel a div div:hover { text-decoration: underline; }
 input, input.flat, textarea, textarea.flat, form.flat select, select, select.flat, .dataTables_length label select {
     background-color: #FFF;
 }

From 05fe0d7fcdcefb15970d1a470e75c9e4187b54ec Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 29 Apr 2017 01:01:12 +0200
Subject: [PATCH 122/505] Fix doxygen

---
 htdocs/includes/odtphp/Segment.php | 30 +++++++++++++++---------
 htdocs/includes/odtphp/odf.php     | 37 +++++++++++++++++++-----------
 2 files changed, 42 insertions(+), 25 deletions(-)

diff --git a/htdocs/includes/odtphp/Segment.php b/htdocs/includes/odtphp/Segment.php
index 39761aa4d04..d8a14d09df9 100644
--- a/htdocs/includes/odtphp/Segment.php
+++ b/htdocs/includes/odtphp/Segment.php
@@ -1,14 +1,16 @@
 <?php
 require 'SegmentIterator.php';
 class SegmentException extends Exception
-{}
+{
+}
+
 /**
  * Class for handling templating segments with odt files
  * You need PHP 5.2 at least
  * You need Zip Extension or PclZip library
  *
- * @copyright  GPL License 2008 - Julien Pauli - Cyril PIERRE de GEYER - Anaska (http://www.anaska.com)
- * @copyright  GPL License 2012 - Stephen Larroque - lrq3000@gmail.com
+ * @copyright  2008 - Julien Pauli - Cyril PIERRE de GEYER - Anaska (http://www.anaska.com)
+ * @copyright  2012 - Stephen Larroque - lrq3000@gmail.com
  * @license    http://www.gnu.org/copyleft/gpl.html  GPL License
  * @version 1.4.5 (last update 2013-04-07)
  */
@@ -22,11 +24,13 @@ class Segment implements IteratorAggregate, Countable
 	protected $images = array();
 	protected $odf;
 	protected $file;
+	
     /**
      * Constructor
      *
-     * @param string $name name of the segment to construct
-     * @param string $xml XML tree of the segment
+     * @param string $name  name of the segment to construct
+     * @param string $xml   XML tree of the segment
+     * @param string $odf   odf
      */
     public function __construct($name, $xml, $odf)
     {
@@ -152,10 +156,11 @@ class Segment implements IteratorAggregate, Countable
         
         return $this->xmlParsed;
     }
+    
     /**
      * Analyse the XML code in order to find children
      *
-     * @param string $xml
+     * @param string $xml   Xml
      * @return Segment
      */
     protected function _analyseChildren($xml)
@@ -172,11 +177,14 @@ class Segment implements IteratorAggregate, Countable
         }
         return $this;
     }
+    
     /**
      * Assign a template variable to replace
      *
-     * @param string $key
-     * @param string $value
+     * @param string $key       Key
+     * @param string $value     Value
+     * @param string $encode    Encode
+     * @param string $charset   Charset
      * @throws SegmentException
      * @return Segment
      */
@@ -230,7 +238,7 @@ IMG;
     /**
      * Shortcut to retrieve a child
      *
-     * @param string $prop
+     * @param string $prop      Prop
      * @return Segment
      * @throws SegmentException
      */
@@ -245,8 +253,8 @@ IMG;
     /**
      * Proxy for setVars
      *
-     * @param string $meth
-     * @param array $args
+     * @param string $meth      Meth
+     * @param array $args       Args
      * @return Segment
      */
     public function __call($meth, $args)
diff --git a/htdocs/includes/odtphp/odf.php b/htdocs/includes/odtphp/odf.php
index d052482845c..01633634705 100644
--- a/htdocs/includes/odtphp/odf.php
+++ b/htdocs/includes/odtphp/odf.php
@@ -1,16 +1,20 @@
 <?php
+
 require 'Segment.php';
+
 class OdfException extends Exception
-{}
+{
+}
+
 /**
  * Templating class for odt file
  * You need PHP 5.2 at least
  * You need Zip Extension or PclZip library
  *
- * @copyright  GPL License 2008 - Julien Pauli - Cyril PIERRE de GEYER - Anaska (http://www.anaska.com)
- * @copyright  GPL License 2010-2015 - Laurent Destailleur - eldy@users.sourceforge.net
- * @copyright  GPL License 2010 - Vikas Mahajan - http://vikasmahajan.wordpress.com
- * @copyright  GPL License 2012 - Stephen Larroque - lrq3000@gmail.com
+ * @copyright  2008 - Julien Pauli - Cyril PIERRE de GEYER - Anaska (http://www.anaska.com)
+ * @copyright  2010-2015 - Laurent Destailleur - eldy@users.sourceforge.net
+ * @copyright  2010 - Vikas Mahajan - http://vikasmahajan.wordpress.com
+ * @copyright  2012 - Stephen Larroque - lrq3000@gmail.com
  * @license    http://www.gnu.org/copyleft/gpl.html  GPL License
  * @version 1.5.0
  */
@@ -43,7 +47,8 @@ class Odf
 	/**
 	 * Class constructor
 	 *
-	 * @param string $filename the name of the odt file
+	 * @param string $filename     The name of the odt file
+	 * @param string $config       Array of config data
 	 * @throws OdfException
 	 */
 	public function __construct($filename, $config = array())
@@ -116,9 +121,10 @@ class Odf
 	/**
 	 * Assing a template variable
 	 *
-	 * @param string $key name of the variable within the template
-	 * @param string $value replacement value
-	 * @param bool $encode if true, special XML characters are encoded
+	 * @param string   $key        Name of the variable within the template
+	 * @param string   $value      Replacement value
+	 * @param bool     $encode     If true, special XML characters are encoded
+	 * @param string   $charset    Charset  
 	 * @throws OdfException
 	 * @return odf
 	 */
@@ -129,7 +135,7 @@ class Odf
 		// <text:span text:style-name="T13">{</text:span><text:span text:style-name="T12">aaa</text:span><text:span text:style-name="T13">}</text:span>
 		// instead of {aaa} so we should enhance this function.
 		//print $key.'-'.$value.'-'.strpos($this->contentXml, $this->config['DELIMITER_LEFT'] . $key . $this->config['DELIMITER_RIGHT']).'<br>';
-		if (strpos($this->contentXml, $tag) === false && strpos($this->stylesXml , $tag) === false) {
+		if (strpos($this->contentXml, $tag) === false && strpos($this->stylesXml, $tag) === false) {
 			//if (strpos($this->contentXml, '">'. $key . '</text;span>') === false) {
 			throw new OdfException("var $key not found in the document");
 			//}
@@ -577,6 +583,7 @@ IMG;
 		}
 		else
 		{
+		    dol_syslog(get_class($this).'::exportAsAttachedPDF is used but the constant MAIN_DOL_SCRIPTS_ROOT with path to script directory was not defined.', LOG_WARNING);
 			$command = '../../scripts/odt2pdf/odt2pdf.sh '.escapeshellcmd($name).' '.(is_numeric($conf->global->MAIN_ODT_AS_PDF)?'jodconverter':$conf->global->MAIN_ODT_AS_PDF);
 		}
 
@@ -642,7 +649,8 @@ IMG;
 	/**
 	 * Returns a variable of configuration
 	 *
-	 * @return string The requested variable of configuration
+	 * @param  string  $configKey  Config key
+	 * @return string              The requested variable of configuration
 	 */
 	public function getConfig($configKey)
 	{
@@ -678,7 +686,8 @@ IMG;
 
 	/**
 	 * Empty the temporary working directory recursively
-	 * @param $dir the temporary working directory
+	 * 
+	 * @param  string  $dir    The temporary working directory
 	 * @return void
 	 */
 	private function _rrmdir($dir)
@@ -701,8 +710,8 @@ IMG;
 	/**
 	 * return the value present on odt in [valuename][/valuename]
 	 * 
-	 * @param  string $value   name balise in the template
-	 * @return string          the value inside the balise
+	 * @param  string $valuename   Balise in the template
+	 * @return string              The value inside the balise
 	 */
 	public function getvalue($valuename)
 	{

From 47089a4d550517aef1a166848151f9996cac641e Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Sat, 29 Apr 2017 07:04:34 +0200
Subject: [PATCH 123/505] Modle Stripe : Work in progress

---
 htdocs/core/lib/stripe.lib.php          | 147 ----
 htdocs/{ => public}/stripe/checkout.php |  31 +-
 htdocs/{ => public}/stripe/config.php   |   6 +-
 htdocs/public/stripe/newpayment.php     | 977 ------------------------
 htdocs/public/stripe/paymentko.php      | 115 ---
 htdocs/public/stripe/paymentok.php      | 172 -----
 htdocs/stripe/admin/stripe.php          |  22 +-
 7 files changed, 27 insertions(+), 1443 deletions(-)
 rename htdocs/{ => public}/stripe/checkout.php (94%)
 rename htdocs/{ => public}/stripe/config.php (88%)
 delete mode 100644 htdocs/public/stripe/newpayment.php
 delete mode 100644 htdocs/public/stripe/paymentko.php
 delete mode 100644 htdocs/public/stripe/paymentok.php

diff --git a/htdocs/core/lib/stripe.lib.php b/htdocs/core/lib/stripe.lib.php
index d2d138cc8b3..175df3554ce 100644
--- a/htdocs/core/lib/stripe.lib.php
+++ b/htdocs/core/lib/stripe.lib.php
@@ -229,153 +229,6 @@ function getStripePaymentUrl($mode,$type,$ref='',$amount='9.99',$freetag='your_f
 }
 
 
-/**
- * Create a redirect form to paybox form
- *
- * @param	int   	$PRICE		Price
- * @param   string	$CURRENCY	Currency
- * @param   string	$EMAIL		EMail
- * @param   string	$urlok		Url to go back if payment is OK
- * @param   string	$urlko		Url to go back if payment is KO
- * @param   string	$TAG		Tag
- * @return  int              	1 if OK, -1 if ERROR
- */
-function print_stripe_redirect($PRICE,$CURRENCY,$EMAIL,$urlok,$urlko,$TAG)
-{
-	global $conf, $langs, $db;
-
-	dol_syslog("Stripe.lib::print_paybox_redirect", LOG_DEBUG);
-
-	// Clean parameters
-	$PBX_IDENTIFIANT="2";	// Identifiant pour v2 test
-	if (! empty($conf->global->PAYBOX_PBX_IDENTIFIANT)) $PBX_IDENTIFIANT=$conf->global->PAYBOX_PBX_IDENTIFIANT;
-	$IBS_SITE="1999888";    // Site test
-	if (! empty($conf->global->PAYBOX_IBS_SITE)) $IBS_SITE=$conf->global->PAYBOX_IBS_SITE;
-	$IBS_RANG="99";         // Rang test
-	if (! empty($conf->global->PAYBOX_IBS_RANG)) $IBS_RANG=$conf->global->PAYBOX_IBS_RANG;
-	$IBS_DEVISE="840";		// Currency (Dollar US by default)
-	if ($CURRENCY == 'EUR') $IBS_DEVISE="978";
-	if ($CURRENCY == 'USD') $IBS_DEVISE="840";
-
-	$URLPAYBOX="";
-	if ($conf->global->PAYBOX_CGI_URL_V1) $URLPAYBOX=$conf->global->PAYBOX_CGI_URL_V1;
-	if ($conf->global->PAYBOX_CGI_URL_V2) $URLPAYBOX=$conf->global->PAYBOX_CGI_URL_V2;
-
-	if (empty($IBS_DEVISE))
-	{
-		dol_print_error('',"Paybox setup param PAYBOX_IBS_DEVISE not defined");
-		return -1;
-	}
-	if (empty($URLPAYBOX))
-	{
-		dol_print_error('',"Paybox setup param PAYBOX_CGI_URL_V1 and PAYBOX_CGI_URL_V2 undefined");
-		return -1;
-	}
-	if (empty($IBS_SITE))
-	{
-		dol_print_error('',"Paybox setup param PAYBOX_IBS_SITE not defined");
-		return -1;
-	}
-	if (empty($IBS_RANG))
-	{
-		dol_print_error('',"Paybox setup param PAYBOX_IBS_RANG not defined");
-		return -1;
-	}
-
-	// Definition des parametres vente produit pour paybox
-    $IBS_CMD=$TAG;
-    $IBS_TOTAL=$PRICE*100;     	// En centimes
-    $IBS_MODE=1;            	// Mode formulaire
-    $IBS_PORTEUR=$EMAIL;
-	$IBS_RETOUR="montant:M;ref:R;auto:A;trans:T";   // Format des parametres du get de validation en reponse (url a definir sous paybox)
-    $IBS_TXT=' ';	// Use a space
-    $IBS_BOUTPI=$langs->trans("Wait");
-    //$IBS_BOUTPI='';
-    $IBS_EFFECTUE=$urlok;
-    $IBS_ANNULE=$urlko;
-    $IBS_REFUSE=$urlko;
-    $IBS_BKGD="#FFFFFF";
-    $IBS_WAIT="2000";
-	$IBS_LANG="GBR"; 	// By default GBR=english (FRA, GBR, ESP, ITA et DEU...)
-	if (preg_match('/^FR/i',$langs->defaultlang)) $IBS_LANG="FRA";
-	if (preg_match('/^ES/i',$langs->defaultlang)) $IBS_LANG="ESP";
-	if (preg_match('/^IT/i',$langs->defaultlang)) $IBS_LANG="ITA";
-	if (preg_match('/^DE/i',$langs->defaultlang)) $IBS_LANG="DEU";
-	if (preg_match('/^NL/i',$langs->defaultlang)) $IBS_LANG="NLD";
-	if (preg_match('/^SE/i',$langs->defaultlang)) $IBS_LANG="SWE";
-	$IBS_OUTPUT='E';
-	$PBX_SOURCE='HTML';
-	$PBX_TYPEPAIEMENT='CARTE';
-
-    dol_syslog("Soumission Paybox", LOG_DEBUG);
-    dol_syslog("IBS_MODE: $IBS_MODE", LOG_DEBUG);
-    dol_syslog("IBS_SITE: $IBS_SITE", LOG_DEBUG);
-    dol_syslog("IBS_RANG: $IBS_RANG", LOG_DEBUG);
-    dol_syslog("IBS_TOTAL: $IBS_TOTAL", LOG_DEBUG);
-    dol_syslog("IBS_DEVISE: $IBS_DEVISE", LOG_DEBUG);
-    dol_syslog("IBS_CMD: $IBS_CMD", LOG_DEBUG);
-    dol_syslog("IBS_PORTEUR: $IBS_PORTEUR", LOG_DEBUG);
-    dol_syslog("IBS_RETOUR: $IBS_RETOUR", LOG_DEBUG);
-    dol_syslog("IBS_EFFECTUE: $IBS_EFFECTUE", LOG_DEBUG);
-    dol_syslog("IBS_ANNULE: $IBS_ANNULE", LOG_DEBUG);
-    dol_syslog("IBS_REFUSE: $IBS_REFUSE", LOG_DEBUG);
-    dol_syslog("IBS_BKGD: $IBS_BKGD", LOG_DEBUG);
-    dol_syslog("IBS_WAIT: $IBS_WAIT", LOG_DEBUG);
-    dol_syslog("IBS_LANG: $IBS_LANG", LOG_DEBUG);
-    dol_syslog("IBS_OUTPUT: $IBS_OUTPUT", LOG_DEBUG);
-    dol_syslog("PBX_IDENTIFIANT: $PBX_IDENTIFIANT", LOG_DEBUG);
-    dol_syslog("PBX_SOURCE: $PBX_SOURCE", LOG_DEBUG);
-    dol_syslog("PBX_TYPEPAIEMENT: $PBX_TYPEPAIEMENT", LOG_DEBUG);
-
-    header("Content-type: text/html; charset=".$conf->file->character_set_client);
-
-    print '<html>'."\n";
-    print '<head>'."\n";
-    print "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=".$conf->file->character_set_client."\">\n";
-    print '</head>'."\n";
-    print '<body>'."\n";
-    print "\n";
-
-    // Formulaire pour module Paybox
-    print '<form action="'.$URLPAYBOX.'" NAME="Submit" method="POST">'."\n";
-
-    // For Paybox V2 (PBX_xxx)
-    print '<!-- Param for Paybox v2 -->'."\n";
-    print '<input type="hidden" name="PBX_IDENTIFIANT" value="'.$PBX_IDENTIFIANT.'">'."\n";
-    print '<input type="hidden" name="PBX_MODE" value="'.$IBS_MODE.'">'."\n";
-    print '<input type="hidden" name="PBX_SITE" value="'.$IBS_SITE.'">'."\n";
-    print '<input type="hidden" name="PBX_RANG" value="'.$IBS_RANG.'">'."\n";
-    print '<input type="hidden" name="PBX_TOTAL" value="'.$IBS_TOTAL.'">'."\n";
-    print '<input type="hidden" name="PBX_DEVISE" value="'.$IBS_DEVISE.'">'."\n";
-    print '<input type="hidden" name="PBX_CMD" value="'.$IBS_CMD.'">'."\n";
-    print '<input type="hidden" name="PBX_PORTEUR" value="'.$IBS_PORTEUR.'">'."\n";
-    print '<input type="hidden" name="PBX_RETOUR" value="'.$IBS_RETOUR.'">'."\n";
-    print '<input type="hidden" name="PBX_EFFECTUE" value="'.$IBS_EFFECTUE.'">'."\n";
-    print '<input type="hidden" name="PBX_ANNULE" value="'.$IBS_ANNULE.'">'."\n";
-    print '<input type="hidden" name="PBX_REFUSE" value="'.$IBS_REFUSE.'">'."\n";
-    print '<input type="hidden" name="PBX_TXT" value="'.$IBS_TXT.'">'."\n";
-    print '<input type="hidden" name="PBX_BKGD" value="'.$IBS_BKGD.'">'."\n";
-    print '<input type="hidden" name="PBX_WAIT" value="'.$IBS_WAIT.'">'."\n";
-    print '<input type="hidden" name="PBX_LANGUE" value="'.$IBS_LANG.'">'."\n";
-    print '<input type="hidden" name="PBX_OUTPUT" value="'.$IBS_OUTPUT.'">'."\n";
-    print '<input type="hidden" name="PBX_SOURCE" value="'.$PBX_SOURCE.'">'."\n";
-    print '<input type="hidden" name="PBX_TYPEPAIEMENT" value="'.$PBX_TYPEPAIEMENT.'">'."\n";
-
-    print '</form>'."\n";
-
-
-    print "\n";
-    print '<script type="text/javascript" language="javascript">'."\n";
-    print '	document.Submit.submit();'."\n";
-    print '</script>'."\n";
-    print "\n";
-    print '</body></html>'."\n";
-    print "\n";
-
-	return;
-}
-
-
 /**
  * Show footer of company in HTML pages
  *
diff --git a/htdocs/stripe/checkout.php b/htdocs/public/stripe/checkout.php
similarity index 94%
rename from htdocs/stripe/checkout.php
rename to htdocs/public/stripe/checkout.php
index f7f547afae9..4bea80bce6c 100644
--- a/htdocs/stripe/checkout.php
+++ b/htdocs/public/stripe/checkout.php
@@ -16,15 +16,17 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-require '../main.inc.php';
- 
-// Load Dolibarr environment
-require_once DOL_DOCUMENT_ROOT.'/stripe/config.php');
-require_once DOL_DOCUMENT_ROOT.'/includes/stripe/init.php');
-
 define("NOLOGIN",1);
 define("NOCSRFCHECK",1);
 
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/stripe.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/public/stripe/config.php';
+require_once DOL_DOCUMENT_ROOT.'/includes/stripe/init.php';
+
+// Security check
+if (empty($conf->paypal->enabled)) accessforbidden('',0,0,1);
+
 $langs->load("main");
 $langs->load("other");
 $langs->load("stripe");
@@ -34,19 +36,6 @@ $ref=GETPOST('ref','alpha');
 
 $form = new Form($db);
 
-/**
- * Header empty
- *
- * @return	void
- */
-function llxHeader() {}
-/**
- * Footer empty
- *
- * @return	void
- */
-function llxFooter() {}
-
 $invoice = null;
 
 // Payment on customer invoice
@@ -68,8 +57,6 @@ if ($source == 'invoice')
 	{
 		$result=$invoice->fetch_thirdparty($invoice->socid);
 	}
-
-
 }
 
 $pay = false;
@@ -225,7 +212,7 @@ if (GETPOST("action") == 'charge')
 		<?php //var_dump($mysoc); ?>
 		
 		<span class="center">
-			<?php html_print_paypal_footer($mysoc,$langs); ?>
+			<?php html_print_stripe_footer($mysoc,$langs); ?>
 		</span>
 		
 		<?php //echo var_dump($mysoc); ?>
diff --git a/htdocs/stripe/config.php b/htdocs/public/stripe/config.php
similarity index 88%
rename from htdocs/stripe/config.php
rename to htdocs/public/stripe/config.php
index 78d394feb53..ac315762b29 100644
--- a/htdocs/stripe/config.php
+++ b/htdocs/public/stripe/config.php
@@ -22,11 +22,11 @@
 *  \brief      Page to move config in api
 */
 
-require '../main.inc.php';
+require '../../main.inc.php';
 
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-dol_include_once('/stripe/lib/stripe.lib.php');
-require_once DOL_DOCUMENT_ROOT.'/includes/stripe/init.php');
+require_once DOL_DOCUMENT_ROOT.'/core/lib/stripe.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/includes/stripe/init.php';
 
 //use \includes\stripe as stripe;
 $stripe = array(
diff --git a/htdocs/public/stripe/newpayment.php b/htdocs/public/stripe/newpayment.php
deleted file mode 100644
index 33499fe7098..00000000000
--- a/htdocs/public/stripe/newpayment.php
+++ /dev/null
@@ -1,977 +0,0 @@
-<?php
-/* Copyright (C) 2001-2002	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
- * Copyright (C) 2006-2012	Laurent Destailleur		<eldy@users.sourceforge.net>
- * Copyright (C) 2009-2012	Regis Houssin			<regis.houssin@capnetworks.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * For test: https://stripe.com/docs
- */
-
-/**
- *     	\file       htdocs/public/stripe/newpayment.php
- *		\ingroup    stripe
- *		\brief      File to offer a way to make a payment for a particular Dolibarr entity
- */
-
-define("NOLOGIN",1);		// This means this output page does not require to be logged.
-define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.
-
-// For MultiCompany module.
-// Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
-// TODO This should be useless. Because entity must be retreive from object ref and not from url.
-$entity=(! empty($_GET['entity']) ? (int) $_GET['entity'] : (! empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
-if (is_numeric($entity)) define("DOLENTITY", $entity);
-
-require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/stripe/lib/stripe.lib.php';
-// require_once DOL_DOCUMENT_ROOT.'/stripe/lib/stripefunctions.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
-
-// Security check
-if (empty($conf->stripe->enabled)) accessforbidden('',0,0,1);
-
-$langs->load("main");
-$langs->load("other");
-$langs->load("dict");
-$langs->load("bills");
-$langs->load("companies");
-$langs->load("errors");
-$langs->load("paybox");
-$langs->load("paypal");
-$langs->load("stripe");
-
-// Input are:
-// type ('invoice','order','contractline'),
-// id (object id),
-// amount (required if id is empty),
-// tag (a free text, required if type is empty)
-// currency (iso code)
-
-$suffix=GETPOST("suffix",'alpha');
-$amount=price2num(GETPOST("amount"));
-if (! GETPOST("currency",'alpha')) $currency=$conf->currency;
-else $currency=GETPOST("currency",'alpha');
-
-if (! GETPOST("action"))
-{
-    if (! GETPOST("amount") && ! GETPOST("source"))
-    {
-    	dol_print_error('',$langs->trans('ErrorBadParameters')." - amount or source");
-    	exit;
-    }
-    if (is_numeric($amount) && ! GETPOST("tag") && ! GETPOST("source"))
-    {
-    	dol_print_error('',$langs->trans('ErrorBadParameters')." - tag or source");
-    	exit;
-    }
-    if (GETPOST("source") && ! GETPOST("ref"))
-    {
-    	dol_print_error('',$langs->trans('ErrorBadParameters')." - ref");
-    	exit;
-    }
-}
-
-// Define $urlwithroot
-//$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
-//$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
-$urlwithroot=DOL_MAIN_URL_ROOT;						// This is to use same domain name than current
-
-$urlok=$urlwithroot.'/public/stripe/paymentok.php?';
-$urlko=$urlwithroot.'/public/stripe/paymentko.php?';
-
-// Complete urls for post treatment
-$SOURCE=GETPOST("source",'alpha');
-$ref=$REF=GETPOST('ref','alpha');
-$TAG=GETPOST("tag",'alpha');
-$FULLTAG=GETPOST("fulltag",'alpha');		// fulltag is tag with more informations
-$SECUREKEY=GETPOST("securekey");	        // Secure key
-
-if (! empty($SOURCE))
-{
-    $urlok.='source='.urlencode($SOURCE).'&';
-    $urlko.='source='.urlencode($SOURCE).'&';
-}
-if (! empty($REF))
-{
-    $urlok.='ref='.urlencode($REF).'&';
-    $urlko.='ref='.urlencode($REF).'&';
-}
-if (! empty($TAG))
-{
-    $urlok.='tag='.urlencode($TAG).'&';
-    $urlko.='tag='.urlencode($TAG).'&';
-}
-if (! empty($FULLTAG))
-{
-    $urlok.='fulltag='.urlencode($FULLTAG).'&';
-    $urlko.='fulltag='.urlencode($FULLTAG).'&';
-}
-if (! empty($SECUREKEY))
-{
-    $urlok.='securekey='.urlencode($SECUREKEY).'&';
-    $urlko.='securekey='.urlencode($SECUREKEY).'&';
-}
-if (! empty($entity))
-{
-	$urlok.='entity='.urlencode($entity).'&';
-	$urlko.='entity='.urlencode($entity).'&';
-}
-$urlok=preg_replace('/&$/','',$urlok);  // Remove last &
-$urlko=preg_replace('/&$/','',$urlko);  // Remove last &
-
-// Check parameters
-$PAYPAL_API_OK="";
-if ($urlok) $PAYPAL_API_OK=$urlok;
-$PAYPAL_API_KO="";
-if ($urlko) $PAYPAL_API_KO=$urlko;
-/*
-if (empty($PAYPAL_API_USER))
-{
-    dol_print_error('',"Paypal setup param PAYPAL_API_USER not defined");
-    return -1;
-}
-if (empty($PAYPAL_API_PASSWORD))
-{
-    dol_print_error('',"Paypal setup param PAYPAL_API_PASSWORD not defined");
-    return -1;
-}
-if (empty($PAYPAL_API_SIGNATURE))
-{
-    dol_print_error('',"Paypal setup param PAYPAL_API_SIGNATURE not defined");
-    return -1;
-}
-*/
-
-// Check security token
-$valid=true;
-if (! empty($conf->global->PAYPAL_SECURITY_TOKEN))
-{
-    if (! empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE))
-    {
-	    if ($SOURCE && $REF) $token = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . $SOURCE . $REF, 2);    // Use the source in the hash to avoid duplicates if the references are identical
-	    else $token = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
-    }
-    else
-    {
-        $token = $conf->global->PAYPAL_SECURITY_TOKEN;
-    }
-	if ($SECUREKEY != $token) $valid=false;
-
-	if (! $valid)
-	{
-    	print '<div class="error">Bad value for key.</div>';
-	    //print 'SECUREKEY='.$SECUREKEY.' token='.$token.' valid='.$valid;
-    	exit;
-	}
-}
-
-
-
-/*
- * Actions
- */
-
-if (GETPOST("action") == 'dopayment')
-{
-	$PAYPAL_API_PRICE=price2num(GETPOST("newamount"),'MT');
-    $PAYPAL_PAYMENT_TYPE='Sale';
-
-    $shipToName=GETPOST("shipToName");
-    $shipToStreet=GETPOST("shipToStreet");
-    $shipToCity=GETPOST("shipToCity");
-    $shipToState=GETPOST("shipToState");
-    $shipToCountryCode=GETPOST("shipToCountryCode");
-    $shipToZip=GETPOST("shipToZip");
-    $shipToStreet2=GETPOST("shipToStreet2");
-    $phoneNum=GETPOST("phoneNum");
-    $email=GETPOST("email");
-    $desc=GETPOST("desc");
-
-	$mesg='';
-	if (empty($PAYPAL_API_PRICE) || ! is_numeric($PAYPAL_API_PRICE))   $mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Amount"));
-	//elseif (empty($EMAIL))          $mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("YourEMail"));
-	//elseif (! isValidEMail($EMAIL)) $mesg=$langs->trans("ErrorBadEMail",$EMAIL);
-	elseif (empty($FULLTAG))        $mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("PaymentCode"));
-
-    //var_dump($_POST);
-	if (empty($mesg))
-	{
-		dol_syslog("newpayment.php call paypal api and do redirect", LOG_DEBUG);
-
-		// Other
-		$PAYPAL_API_DEVISE="USD";
-		//if ($currency == 'EUR') $PAYPAL_API_DEVISE="EUR";
-		//if ($currency == 'USD') $PAYPAL_API_DEVISE="USD";
-        if (! empty($currency)) $PAYPAL_API_DEVISE=$currency;
-
-	    dol_syslog("Submit Paypal form", LOG_DEBUG);
-	    dol_syslog("PAYPAL_API_USER: $PAYPAL_API_USER", LOG_DEBUG);
-	    //dol_syslog("PAYPAL_API_PASSWORD: $PAYPAL_API_PASSWORD", LOG_DEBUG);  // No password into log files
-	    dol_syslog("PAYPAL_API_SIGNATURE: $PAYPAL_API_SIGNATURE", LOG_DEBUG);
-	    dol_syslog("PAYPAL_API_SANDBOX: $PAYPAL_API_SANDBOX", LOG_DEBUG);
-	    dol_syslog("PAYPAL_API_OK: $PAYPAL_API_OK", LOG_DEBUG);
-	    dol_syslog("PAYPAL_API_KO: $PAYPAL_API_KO", LOG_DEBUG);
-	    dol_syslog("PAYPAL_API_PRICE: $PAYPAL_API_PRICE", LOG_DEBUG);
-	    dol_syslog("PAYPAL_API_DEVISE: $PAYPAL_API_DEVISE", LOG_DEBUG);
-        dol_syslog("shipToName: $shipToName", LOG_DEBUG);
-        dol_syslog("shipToStreet: $shipToStreet", LOG_DEBUG);
-        dol_syslog("shipToCity: $shipToCity", LOG_DEBUG);
-        dol_syslog("shipToState: $shipToState", LOG_DEBUG);
-        dol_syslog("shipToCountryCode: $shipToCountryCode", LOG_DEBUG);
-        dol_syslog("shipToZip: $shipToZip", LOG_DEBUG);
-        dol_syslog("shipToStreet2: $shipToStreet2", LOG_DEBUG);
-        dol_syslog("phoneNum: $phoneNum", LOG_DEBUG);
-        dol_syslog("email: $email", LOG_DEBUG);
-        dol_syslog("desc: $desc", LOG_DEBUG);
-
-        dol_syslog("SCRIPT_URI: ".(empty($_SERVER["SCRIPT_URI"])?'':$_SERVER["SCRIPT_URI"]), LOG_DEBUG);	// If defined script uri must match domain of PAYPAL_API_OK and PAYPAL_API_KO
-	    //$_SESSION["PaymentType"]=$PAYPAL_PAYMENT_TYPE;
-	    //$_SESSION["currencyCodeType"]=$PAYPAL_API_DEVISE;
-	    //$_SESSION["Payment_Amount"]=$PAYPAL_API_PRICE;
-
-	    // A redirect is added if API call successfull
-        print_paypal_redirect($PAYPAL_API_PRICE,$PAYPAL_API_DEVISE,$PAYPAL_PAYMENT_TYPE,$PAYPAL_API_OK,$PAYPAL_API_KO, $FULLTAG);
-
-		exit;
-	}
-}
-
-
-
-/*
- * View
- */
-
-llxHeaderStripe($langs->trans("PaymentForm"));
-
-if (! empty($PAYPAL_API_SANDBOX))
-{
-	dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode'),'','warning');
-}
-
-// Common variables
-$creditor=$mysoc->name;
-$paramcreditor='PAYPAL_CREDITOR_'.$suffix;
-if (! empty($conf->global->$paramcreditor)) $creditor=$conf->global->$paramcreditor;
-else if (! empty($conf->global->PAYPAL_CREDITOR)) $creditor=$conf->global->PAYPAL_CREDITOR;
-
-print '<span id="dolpaymentspan"></span>'."\n";
-print '<div class="center">'."\n";
-print '<form id="dolpaymentform" class="center" name="paymentform" action="'.$_SERVER["PHP_SELF"].'" method="POST">'."\n";
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'."\n";
-print '<input type="hidden" name="action" value="dopayment">'."\n";
-print '<input type="hidden" name="tag" value="'.GETPOST("tag",'alpha').'">'."\n";
-print '<input type="hidden" name="suffix" value="'.GETPOST("suffix",'alpha').'">'."\n";
-print '<input type="hidden" name="securekey" value="'.$SECUREKEY.'">'."\n";
-print '<input type="hidden" name="entity" value="'.$entity.'" />';
-print "\n";
-print '<!-- Form to send a Paypal payment -->'."\n";
-print '<!-- PAYPAL_API_SANDBOX = '.$conf->global->PAYPAL_API_SANDBOX.' -->'."\n";
-print '<!-- PAYPAL_API_INTEGRAL_OR_PAYPALONLY = '.$conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY.' -->'."\n";
-print '<!-- creditor = '.$creditor.' -->'."\n";
-print '<!-- urlok = '.$urlok.' -->'."\n";
-print '<!-- urlko = '.$urlko.' -->'."\n";
-print "\n";
-
-print '<table id="dolpaymenttable" summary="Payment form" class="center">'."\n";
-
-// Show logo (search order: logo defined by PAYBOX_LOGO_suffix, then PAYBOX_LOGO, then small company logo, large company logo, theme logo, common logo)
-$width=0;
-// Define logo and logosmall
-$logosmall=$mysoc->logo_small;
-$logo=$mysoc->logo;
-$paramlogo='PAYBOX_LOGO_'.$suffix;
-if (! empty($conf->global->$paramlogo)) $logosmall=$conf->global->$paramlogo;
-else if (! empty($conf->global->PAYBOX_LOGO)) $logosmall=$conf->global->PAYBOX_LOGO;
-//print '<!-- Show logo (logosmall='.$logosmall.' logo='.$logo.') -->'."\n";
-// Define urllogo
-$urllogo='';
-if (! empty($logosmall) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$logosmall))
-{
-	$urllogo=DOL_URL_ROOT.'/viewimage.php?modulepart=companylogo&amp;file='.urlencode('thumbs/'.$logosmall);
-}
-elseif (! empty($logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$logo))
-{
-	$urllogo=DOL_URL_ROOT.'/viewimage.php?modulepart=companylogo&amp;file='.urlencode($logo);
-	$width=96;
-}
-// Output html code for logo
-if ($urllogo)
-{
-	print '<tr>';
-	print '<td align="center"><img id="dolpaymentlogo" title="'.$title.'" src="'.$urllogo.'"';
-	if ($width) print ' width="'.$width.'"';
-	print '></td>';
-	print '</tr>'."\n";
-}
-
-// Output introduction text
-$text='';
-if (! empty($conf->global->PAYPAL_NEWFORM_TEXT))
-{
-    $langs->load("members");
-    if (preg_match('/^\((.*)\)$/',$conf->global->PAYPAL_NEWFORM_TEXT,$reg)) $text.=$langs->trans($reg[1])."<br>\n";
-    else $text.=$conf->global->PAYPAL_NEWFORM_TEXT."<br>\n";
-    $text='<tr><td align="center"><br>'.$text.'<br></td></tr>'."\n";
-}
-if (empty($text))
-{
-    $text.='<tr><td class="textpublicpayment"><br><strong>'.$langs->trans("WelcomeOnPaymentPage").'</strong><br></td></tr>'."\n";
-    $text.='<tr><td class="textpublicpayment"><br>'.$langs->trans("ThisScreenAllowsYouToPay",$creditor).'<br><br></td></tr>'."\n";
-}
-print $text;
-
-// Output payment summary form
-print '<tr><td align="center">';
-print '<table with="100%" id="tablepublicpayment">';
-print '<tr class="liste_total"><td align="left" colspan="2">'.$langs->trans("ThisIsInformationOnPayment").' :</td></tr>'."\n";
-
-$found=false;
-$error=0;
-$var=false;
-
-// Free payment
-if (! GETPOST("source") && $valid)
-{
-	$found=true;
-	$tag=GETPOST("tag");
-	$fulltag=$tag;
-
-	// Creditor
-	$var=!$var;
-	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
-    print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
-    print '<input type="hidden" name="creditor" value="'.$creditor.'">';
-    print '</td></tr>'."\n";
-
-	// Amount
-	$var=!$var;
-	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
-	if (empty($amount)) print ' ('.$langs->trans("ToComplete").')';
-	print '</td><td class="CTableRow'.($var?'1':'2').'">';
-	if (empty($amount) || ! is_numeric($amount))
-	{
-        print '<input type="hidden" name="amount" value="'.GETPOST("amount",'int').'">';
-	    print '<input class="flat" size=8 type="text" name="newamount" value="'.GETPOST("newamount","int").'">';
-	}
-	else {
-		print '<b>'.price($amount).'</b>';
-        print '<input type="hidden" name="amount" value="'.$amount.'">';
-		print '<input type="hidden" name="newamount" value="'.$amount.'">';
-	}
-	// Currency
-	print ' <b>'.$langs->trans("Currency".$currency).'</b>';
-	print '<input type="hidden" name="currency" value="'.$currency.'">';
-	print '</td></tr>'."\n";
-
-	// Tag
-	$var=!$var;
-	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
-	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
-	print '<input type="hidden" name="tag" value="'.$tag.'">';
-	print '<input type="hidden" name="fulltag" value="'.$fulltag.'">';
-	print '</td></tr>'."\n";
-
-    // We do not add fields shipToName, shipToStreet, shipToCity, shipToState, shipToCountryCode, shipToZip, shipToStreet2, phoneNum
-    // as they don't exists (buyer is unknown, tag is free).
-}
-
-
-// Payment on customer order
-if (GETPOST("source") == 'order' && $valid)
-{
-	$found=true;
-	$langs->load("orders");
-
-	require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
-
-	$order=new Commande($db);
-	$result=$order->fetch('',$ref);
-	if ($result < 0)
-	{
-		$mesg=$order->error;
-		$error++;
-	}
-	else
-	{
-		$result=$order->fetch_thirdparty($order->socid);
-	}
-
-	$amount=$order->total_ttc;
-    if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
-    $amount=price2num($amount);
-
-	$fulltag='ORD='.$order->ref.'.CUS='.$order->thirdparty->id;
-	//$fulltag.='.NAM='.strtr($order->thirdparty->name,"-"," ");
-	if (! empty($TAG)) { $tag=$TAG; $fulltag.='.TAG='.$TAG; }
-	$fulltag=dol_string_unaccent($fulltag);
-
-	// Creditor
-	$var=!$var;
-	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
-    print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
-    print '<input type="hidden" name="creditor" value="'.$creditor.'">';
-    print '</td></tr>'."\n";
-
-	// Debitor
-	$var=!$var;
-	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("ThirdParty");
-	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$order->thirdparty->name.'</b>';
-
-	// Object
-	$var=!$var;
-	$text='<b>'.$langs->trans("PaymentOrderRef",$order->ref).'</b>';
-	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Designation");
-	print '</td><td class="CTableRow'.($var?'1':'2').'">'.$text;
-	print '<input type="hidden" name="source" value="'.GETPOST("source",'alpha').'">';
-	print '<input type="hidden" name="ref" value="'.$order->ref.'">';
-	print '</td></tr>'."\n";
-
-	// Amount
-	$var=!$var;
-	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
-	if (empty($amount)) print ' ('.$langs->trans("ToComplete").')';
-	print '</td><td class="CTableRow'.($var?'1':'2').'">';
-	if (empty($amount) || ! is_numeric($amount))
-	{
-        print '<input type="hidden" name="amount" value="'.GETPOST("amount",'int').'">';
-	    print '<input class="flat" size=8 type="text" name="newamount" value="'.GETPOST("newamount","int").'">';
-	}
-	else {
-		print '<b>'.price($amount).'</b>';
-        print '<input type="hidden" name="amount" value="'.$amount.'">';
-		print '<input type="hidden" name="newamount" value="'.$amount.'">';
-	}
-	// Currency
-	print ' <b>'.$langs->trans("Currency".$currency).'</b>';
-	print '<input type="hidden" name="currency" value="'.$currency.'">';
-	print '</td></tr>'."\n";
-
-	// Tag
-	$var=!$var;
-	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
-	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
-	print '<input type="hidden" name="tag" value="'.$tag.'">';
-	print '<input type="hidden" name="fulltag" value="'.$fulltag.'">';
-	print '</td></tr>'."\n";
-
-	// Shipping address
-	$shipToName=$order->thirdparty->name;
-    $shipToStreet=$order->thirdparty->address;
-    $shipToCity=$order->thirdparty->town;
-    $shipToState=$order->thirdparty->state_code;
-    $shipToCountryCode=$order->thirdparty->country_code;
-    $shipToZip=$order->thirdparty->zip;
-    $shipToStreet2='';
-    $phoneNum=$order->thirdparty->phone;
-    if ($shipToName && $shipToStreet && $shipToCity && $shipToCountryCode && $shipToZip)
-    {
-        print '<input type="hidden" name="shipToName" value="'.$shipToName.'">'."\n";
-        print '<input type="hidden" name="shipToStreet" value="'.$shipToStreet.'">'."\n";
-        print '<input type="hidden" name="shipToCity" value="'.$shipToCity.'">'."\n";
-        print '<input type="hidden" name="shipToState" value="'.$shipToState.'">'."\n";
-        print '<input type="hidden" name="shipToCountryCode" value="'.$shipToCountryCode.'">'."\n";
-        print '<input type="hidden" name="shipToZip" value="'.$shipToZip.'">'."\n";
-        print '<input type="hidden" name="shipToStreet2" value="'.$shipToStreet2.'">'."\n";
-        print '<input type="hidden" name="phoneNum" value="'.$phoneNum.'">'."\n";
-    }
-    else
-    {
-        print '<!-- Shipping address not complete, so we don t use it -->'."\n";
-    }
-    print '<input type="hidden" name="email" value="'.$order->thirdparty->email.'">'."\n";
-    print '<input type="hidden" name="desc" value="'.$langs->trans("Order").' '.$order->ref.'">'."\n";
-}
-
-
-// Payment on customer invoice
-if (GETPOST("source") == 'invoice' && $valid)
-{
-	$found=true;
-	$langs->load("bills");
-
-	require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-
-	$invoice=new Facture($db);
-	$result=$invoice->fetch('',$ref);
-	if ($result < 0)
-	{
-		$mesg=$invoice->error;
-		$error++;
-	}
-	else
-	{
-		$result=$invoice->fetch_thirdparty($invoice->socid);
-	}
-
-	$amount=price2num($invoice->total_ttc - $invoice->getSommePaiement());
-    if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
-    $amount=price2num($amount);
-
-	$fulltag='INV='.$invoice->ref.'.CUS='.$invoice->thirdparty->id;
-	//$fulltag.='.NAM='.strtr($invoice->thirdparty->name,"-"," ");
-	if (! empty($TAG)) { $tag=$TAG; $fulltag.='.TAG='.$TAG; }
-	$fulltag=dol_string_unaccent($fulltag);
-
-	// Creditor
-	$var=!$var;
-	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
-    print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
-    print '<input type="hidden" name="creditor" value="'.$creditor.'">';
-    print '</td></tr>'."\n";
-
-	// Debitor
-	$var=!$var;
-	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("ThirdParty");
-	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$invoice->thirdparty->name.'</b>';
-
-	// Object
-	$var=!$var;
-	$text='<b>'.$langs->trans("PaymentInvoiceRef",$invoice->ref).'</b>';
-	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Designation");
-	print '</td><td class="CTableRow'.($var?'1':'2').'">'.$text;
-	print '<input type="hidden" name="source" value="'.GETPOST("source",'alpha').'">';
-	print '<input type="hidden" name="ref" value="'.$invoice->ref.'">';
-	print '</td></tr>'."\n";
-
-	// Amount
-	$var=!$var;
-	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
-	if (empty($amount)) print ' ('.$langs->trans("ToComplete").')';
-	print '</td><td class="CTableRow'.($var?'1':'2').'">';
-	if (empty($amount) || ! is_numeric($amount))
-	{
-        print '<input type="hidden" name="amount" value="'.GETPOST("amount",'int').'">';
-	    print '<input class="flat" size=8 type="text" name="newamount" value="'.GETPOST("newamount","int").'">';
-	}
-	else {
-		print '<b>'.price($amount).'</b>';
-        print '<input type="hidden" name="amount" value="'.$amount.'">';
-		print '<input type="hidden" name="newamount" value="'.$amount.'">';
-	}
-	// Currency
-	print ' <b>'.$langs->trans("Currency".$currency).'</b>';
-	print '<input type="hidden" name="currency" value="'.$currency.'">';
-	print '</td></tr>'."\n";
-
-	// Tag
-	$var=!$var;
-	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
-	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
-	print '<input type="hidden" name="tag" value="'.$tag.'">';
-	print '<input type="hidden" name="fulltag" value="'.$fulltag.'">';
-	print '</td></tr>'."\n";
-
-    // Shipping address
-    $shipToName=$invoice->thirdparty->name;
-    $shipToStreet=$invoice->thirdparty->address;
-    $shipToCity=$invoice->thirdparty->town;
-    $shipToState=$invoice->thirdparty->state_code;
-    $shipToCountryCode=$invoice->thirdparty->country_code;
-    $shipToZip=$invoice->thirdparty->zip;
-    $shipToStreet2='';
-    $phoneNum=$invoice->thirdparty->phone;
-    if ($shipToName && $shipToStreet && $shipToCity && $shipToCountryCode && $shipToZip)
-    {
-        print '<input type="hidden" name="shipToName" value="'.$shipToName.'">'."\n";
-        print '<input type="hidden" name="shipToStreet" value="'.$shipToStreet.'">'."\n";
-        print '<input type="hidden" name="shipToCity" value="'.$shipToCity.'">'."\n";
-        print '<input type="hidden" name="shipToState" value="'.$shipToState.'">'."\n";
-        print '<input type="hidden" name="shipToCountryCode" value="'.$shipToCountryCode.'">'."\n";
-        print '<input type="hidden" name="shipToZip" value="'.$shipToZip.'">'."\n";
-        print '<input type="hidden" name="shipToStreet2" value="'.$shipToStreet2.'">'."\n";
-        print '<input type="hidden" name="phoneNum" value="'.$phoneNum.'">'."\n";
-    }
-    else
-    {
-        print '<!-- Shipping address not complete, so we don t use it -->'."\n";
-    }
-    print '<input type="hidden" name="email" value="'.$invoice->thirdparty->email.'">'."\n";
-    print '<input type="hidden" name="desc" value="'.$langs->trans("Invoice").' '.$invoice->ref.'">'."\n";
-}
-
-// Payment on contract line
-if (GETPOST("source") == 'contractline' && $valid)
-{
-	$found=true;
-	$langs->load("contracts");
-
-	require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
-
-	$contractline=new ContratLigne($db);
-	$result=$contractline->fetch('',$ref);
-	if ($result < 0)
-	{
-		$mesg=$contractline->error;
-		$error++;
-	}
-	else
-	{
-		if ($contractline->fk_contrat > 0)
-		{
-			$contract=new Contrat($db);
-			$result=$contract->fetch($contractline->fk_contrat);
-			if ($result > 0)
-			{
-				$result=$contract->fetch_thirdparty($contract->socid);
-			}
-			else
-			{
-				$mesg=$contract->error;
-				$error++;
-			}
-		}
-		else
-		{
-			$mesg='ErrorRecordNotFound';
-			$error++;
-		}
-	}
-
-	$amount=$contractline->total_ttc;
-	if ($contractline->fk_product)
-	{
-		$product=new Product($db);
-		$result=$product->fetch($contractline->fk_product);
-
-		// We define price for product (TODO Put this in a method in product class)
-		if (! empty($conf->global->PRODUIT_MULTIPRICES))
-		{
-			$pu_ht = $product->multiprices[$contract->thirdparty->price_level];
-			$pu_ttc = $product->multiprices_ttc[$contract->thirdparty->price_level];
-			$price_base_type = $product->multiprices_base_type[$contract->thirdparty->price_level];
-		}
-		else
-		{
-			$pu_ht = $product->price;
-			$pu_ttc = $product->price_ttc;
-			$price_base_type = $product->price_base_type;
-		}
-
-		$amount=$pu_ttc;
-		if (empty($amount))
-		{
-			dol_print_error('','ErrorNoPriceDefinedForThisProduct');
-			exit;
-		}
-	}
-    if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
-    $amount=price2num($amount);
-
-	$fulltag='COL='.$contractline->ref.'.CON='.$contract->ref.'.CUS='.$contract->thirdparty->id.'.DAT='.dol_print_date(dol_now(),'%Y%m%d%H%M');
-	//$fulltag.='.NAM='.strtr($contract->thirdparty->name,"-"," ");
-	if (! empty($TAG)) { $tag=$TAG; $fulltag.='.TAG='.$TAG; }
-	$fulltag=dol_string_unaccent($fulltag);
-
-	$qty=1;
-	if (GETPOST('qty')) $qty=GETPOST('qty');
-
-	// Creditor
-	$var=!$var;
-	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
-	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
-    print '<input type="hidden" name="creditor" value="'.$creditor.'">';
-	print '</td></tr>'."\n";
-
-	// Debitor
-	$var=!$var;
-	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("ThirdParty");
-	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$contract->thirdparty->name.'</b>';
-
-	// Object
-	$var=!$var;
-	$text='<b>'.$langs->trans("PaymentRenewContractId",$contract->ref,$contractline->ref).'</b>';
-	if ($contractline->fk_product)
-	{
-		$text.='<br>'.$product->ref.($product->label?' - '.$product->label:'');
-	}
-	if ($contractline->description) $text.='<br>'.dol_htmlentitiesbr($contractline->description);
-	//if ($contractline->date_fin_validite) {
-	//	$text.='<br>'.$langs->trans("DateEndPlanned").': ';
-	//	$text.=dol_print_date($contractline->date_fin_validite);
-	//}
-	if ($contractline->date_fin_validite)
-	{
-		$text.='<br>'.$langs->trans("ExpiredSince").': '.dol_print_date($contractline->date_fin_validite);
-	}
-
-	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Designation");
-	print '</td><td class="CTableRow'.($var?'1':'2').'">'.$text;
-	print '<input type="hidden" name="source" value="'.GETPOST("source",'alpha').'">';
-	print '<input type="hidden" name="ref" value="'.$contractline->ref.'">';
-	print '</td></tr>'."\n";
-
-	// Quantity
-	$var=!$var;
-	$label=$langs->trans("Quantity");
-	$qty=1;
-	$duration='';
-	if ($contractline->fk_product)
-	{
-		if ($product->isService() && $product->duration_value > 0)
-		{
-			$label=$langs->trans("Duration");
-
-			// TODO Put this in a global method
-			if ($product->duration_value > 1)
-			{
-				$dur=array("h"=>$langs->trans("Hours"),"d"=>$langs->trans("DurationDays"),"w"=>$langs->trans("DurationWeeks"),"m"=>$langs->trans("DurationMonths"),"y"=>$langs->trans("DurationYears"));
-			}
-			else
-			{
-				$dur=array("h"=>$langs->trans("Hour"),"d"=>$langs->trans("DurationDay"),"w"=>$langs->trans("DurationWeek"),"m"=>$langs->trans("DurationMonth"),"y"=>$langs->trans("DurationYear"));
-			}
-			$duration=$product->duration_value.' '.$dur[$product->duration_unit];
-		}
-	}
-	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$label.'</td>';
-	print '<td class="CTableRow'.($var?'1':'2').'"><b>'.($duration?$duration:$qty).'</b>';
-	print '<input type="hidden" name="newqty" value="'.dol_escape_htmltag($qty).'">';
-	print '</b></td></tr>'."\n";
-
-	// Amount
-	$var=!$var;
-	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
-	if (empty($amount)) print ' ('.$langs->trans("ToComplete").')';
-	print '</td><td class="CTableRow'.($var?'1':'2').'">';
-	if (empty($amount) || ! is_numeric($amount))
-	{
-        print '<input type="hidden" name="amount" value="'.GETPOST("amount",'int').'">';
-	    print '<input class="flat" size=8 type="text" name="newamount" value="'.GETPOST("newamount","int").'">';
-	}
-	else {
-		print '<b>'.price($amount).'</b>';
-        print '<input type="hidden" name="amount" value="'.$amount.'">';
-		print '<input type="hidden" name="newamount" value="'.$amount.'">';
-	}
-	// Currency
-	print ' <b>'.$langs->trans("Currency".$currency).'</b>';
-	print '<input type="hidden" name="currency" value="'.$currency.'">';
-	print '</td></tr>'."\n";
-
-	// Tag
-	$var=!$var;
-	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
-	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
-	print '<input type="hidden" name="tag" value="'.$tag.'">';
-	print '<input type="hidden" name="fulltag" value="'.$fulltag.'">';
-	print '</td></tr>'."\n";
-
-    // Shipping address
-    $shipToName=$contract->thirdparty->name;
-    $shipToStreet=$contract->thirdparty->address;
-    $shipToCity=$contract->thirdparty->town;
-    $shipToState=$contract->thirdparty->state_code;
-    $shipToCountryCode=$contract->thirdparty->country_code;
-    $shipToZip=$contract->thirdparty->zip;
-    $shipToStreet2='';
-    $phoneNum=$contract->thirdparty->phone;
-    if ($shipToName && $shipToStreet && $shipToCity && $shipToCountryCode && $shipToZip)
-    {
-        print '<input type="hidden" name="shipToName" value="'.$shipToName.'">'."\n";
-        print '<input type="hidden" name="shipToStreet" value="'.$shipToStreet.'">'."\n";
-        print '<input type="hidden" name="shipToCity" value="'.$shipToCity.'">'."\n";
-        print '<input type="hidden" name="shipToState" value="'.$shipToState.'">'."\n";
-        print '<input type="hidden" name="shipToCountryCode" value="'.$shipToCountryCode.'">'."\n";
-        print '<input type="hidden" name="shipToZip" value="'.$shipToZip.'">'."\n";
-        print '<input type="hidden" name="shipToStreet2" value="'.$shipToStreet2.'">'."\n";
-        print '<input type="hidden" name="phoneNum" value="'.$phoneNum.'">'."\n";
-    }
-    else
-    {
-        print '<!-- Shipping address not complete, so we don t use it -->'."\n";
-    }
-    print '<input type="hidden" name="email" value="'.$contract->thirdparty->email.'">'."\n";
-    print '<input type="hidden" name="desc" value="'.$langs->trans("Contract").' '.$contract->ref.'">'."\n";
-}
-
-// Payment on member subscription
-if (GETPOST("source") == 'membersubscription' && $valid)
-{
-	$found=true;
-	$langs->load("members");
-
-	require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
-	require_once DOL_DOCUMENT_ROOT.'/adherents/class/subscription.class.php';
-
-	$member=new Adherent($db);
-	$result=$member->fetch('',$ref);
-	if ($result < 0)
-	{
-		$mesg=$member->error;
-		$error++;
-	}
-	else
-	{
-		$subscription=new Subscription($db);
-	}
-
-	$amount=$subscription->total_ttc;
-    if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
-    $amount=price2num($amount);
-
-	$fulltag='MEM='.$member->id.'.DAT='.dol_print_date(dol_now(),'%Y%m%d%H%M');
-	if (! empty($TAG)) { $tag=$TAG; $fulltag.='.TAG='.$TAG; }
-	$fulltag=dol_string_unaccent($fulltag);
-
-	// Creditor
-	$var=!$var;
-	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
-    print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
-    print '<input type="hidden" name="creditor" value="'.$creditor.'">';
-    print '</td></tr>'."\n";
-
-	// Debitor
-	$var=!$var;
-	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Member");
-	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>';
-	if ($member->morphy == 'mor' && ! empty($member->societe)) print $member->societe;
-	else print $member->getFullName($langs);
-	print '</b>';
-
-	// Object
-	$var=!$var;
-	$text='<b>'.$langs->trans("PaymentSubscription").'</b>';
-	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Designation");
-	print '</td><td class="CTableRow'.($var?'1':'2').'">'.$text;
-	print '<input type="hidden" name="source" value="'.GETPOST("source",'alpha').'">';
-	print '<input type="hidden" name="ref" value="'.$member->ref.'">';
-	print '</td></tr>'."\n";
-
-	if ($member->last_subscription_date || $member->last_subscription_amount)
-	{
-		// Last subscription date
-		$var=!$var;
-		print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("LastSubscriptionDate");
-		print '</td><td class="CTableRow'.($var?'1':'2').'">'.dol_print_date($member->last_subscription_date,'day');
-		print '</td></tr>'."\n";
-
-		// Last subscription amount
-		$var=!$var;
-		print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("LastSubscriptionAmount");
-		print '</td><td class="CTableRow'.($var?'1':'2').'">'.price($member->last_subscription_amount);
-		print '</td></tr>'."\n";
-
-		if (empty($amount) && ! GETPOST('newamount')) $_GET['newamount']=$member->last_subscription_amount;
-	}
-
-	// Amount
-	$var=!$var;
-	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
-	if (empty($amount))
-	{
-		print ' ('.$langs->trans("ToComplete");
-		if (! empty($conf->global->MEMBER_EXT_URL_SUBSCRIPTION_INFO)) print ' - <a href="'.$conf->global->MEMBER_EXT_URL_SUBSCRIPTION_INFO.'" rel="external" target="_blank">'.$langs->trans("SeeHere").'</a>';
-		print ')';
-	}
-	print '</td><td class="CTableRow'.($var?'1':'2').'">';
-	if (empty($amount) || ! is_numeric($amount))
-	{
-	    $valtoshow=GETPOST("newamount",'int');
-	    if (! empty($conf->global->MEMBER_MIN_AMOUNT) && $valtoshow) $valtoshow=max($conf->global->MEMBER_MIN_AMOUNT,$valtoshow);
-        print '<input type="hidden" name="amount" value="'.GETPOST("amount",'int').'">';
-	    print '<input class="flat" size="8" type="text" name="newamount" value="'.$valtoshow.'">';
-	}
-	else {
-	    $valtoshow=$amount;
-	    if (! empty($conf->global->MEMBER_MIN_AMOUNT) && $valtoshow) $valtoshow=max($conf->global->MEMBER_MIN_AMOUNT,$valtoshow);
-	    print '<b>'.price($valtoshow).'</b>';
-        print '<input type="hidden" name="amount" value="'.$valtoshow.'">';
-		print '<input type="hidden" name="newamount" value="'.$valtoshow.'">';
-	}
-	// Currency
-	print ' <b>'.$langs->trans("Currency".$currency).'</b>';
-	print '<input type="hidden" name="currency" value="'.$currency.'">';
-	print '</td></tr>'."\n";
-
-	// Tag
-	$var=!$var;
-	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
-	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
-	print '<input type="hidden" name="tag" value="'.$tag.'">';
-	print '<input type="hidden" name="fulltag" value="'.$fulltag.'">';
-	print '</td></tr>'."\n";
-
-    // Shipping address
-    $shipToName=$member->getFullName($langs);
-    $shipToStreet=$member->address;
-    $shipToCity=$member->town;
-    $shipToState=$member->state_code;
-    $shipToCountryCode=$member->country_code;
-    $shipToZip=$member->zip;
-    $shipToStreet2='';
-    $phoneNum=$member->phone;
-    if ($shipToName && $shipToStreet && $shipToCity && $shipToCountryCode && $shipToZip)
-    {
-        print '<input type="hidden" name="shipToName" value="'.$shipToName.'">'."\n";
-        print '<input type="hidden" name="shipToStreet" value="'.$shipToStreet.'">'."\n";
-        print '<input type="hidden" name="shipToCity" value="'.$shipToCity.'">'."\n";
-        print '<input type="hidden" name="shipToState" value="'.$shipToState.'">'."\n";
-        print '<input type="hidden" name="shipToCountryCode" value="'.$shipToCountryCode.'">'."\n";
-        print '<input type="hidden" name="shipToZip" value="'.$shipToZip.'">'."\n";
-        print '<input type="hidden" name="shipToStreet2" value="'.$shipToStreet2.'">'."\n";
-        print '<input type="hidden" name="phoneNum" value="'.$phoneNum.'">'."\n";
-    }
-    else
-    {
-        print '<!-- Shipping address not complete, so we don t use it -->'."\n";
-    }
-    print '<input type="hidden" name="email" value="'.$member->email.'">'."\n";
-    print '<input type="hidden" name="desc" value="'.$langs->trans("PaymentSubscription").'">'."\n";
-}
-
-
-
-
-if (! $found && ! $mesg) $mesg=$langs->trans("ErrorBadParameters");
-
-if ($mesg) print '<tr><td align="center" colspan="2"><br><div class="warning">'.$mesg.'</div></td></tr>'."\n";
-
-print '</table>'."\n";
-print "\n";
-
-if ($found && ! $error)	// We are in a management option and no error
-{
-	if (empty($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY)) $conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY='integral';
-
-	if ($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY == 'integral')
-	{
-		print '<br><input class="button" type="submit" name="dopayment" value="'.$langs->trans("StripeOrCBDoPayment").'">';
-	}
-	if ($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY == 'stripeonly')
-	{
-		print '<br><input class="button" type="submit" name="dopayment" value="'.$langs->trans("StripeDoPayment").'">';
-	}
-}
-else
-{
-	dol_print_error_email('ERRORNEWPAYMENTPAYPAL');
-}
-
-print '</td></tr>'."\n";
-
-print '</table>'."\n";
-print '</form>'."\n";
-print '</div>'."\n";
-print '<br>';
-
-
-html_print_stripe_footer($mysoc,$langs);
-
-llxFooterStripe();
-
-$db->close();
diff --git a/htdocs/public/stripe/paymentko.php b/htdocs/public/stripe/paymentko.php
deleted file mode 100644
index 09de4525b39..00000000000
--- a/htdocs/public/stripe/paymentko.php
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-/* Copyright (C) 2001-2002 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2006-2013 Laurent Destailleur  <eldy@users.sourceforge.net>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- *     	\file       htdocs/public/paybox/paymentko.php
- *		\ingroup    paybox
- *		\brief      File to show page after a failed payment
- *		\author	    Laurent Destailleur
- */
-
-define("NOLOGIN",1);		// This means this output page does not require to be logged.
-define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.
-
-// For MultiCompany module.
-// Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
-// TODO This should be useless. Because entity must be retreive from object ref and not from url.
-$entity=(! empty($_GET['entity']) ? (int) $_GET['entity'] : (! empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
-if (is_numeric($entity)) define("DOLENTITY", $entity);
-
-require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/paybox/lib/paybox.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-
-// Security check
-if (empty($conf->paybox->enabled)) accessforbidden('',0,0,1);
-
-$langs->load("main");
-$langs->load("other");
-$langs->load("dict");
-$langs->load("bills");
-$langs->load("companies");
-$langs->load("paybox");
-$langs->load("paypal");
-
-
-
-
-/*
- * Actions
- */
-
-
-
-
-
-/*
- * View
- */
-
-dol_syslog("Callback url when a PayBox payment was canceled. query_string=".(empty($_SERVER["QUERY_STRING"])?'':$_SERVER["QUERY_STRING"])." script_uri=".(empty($_SERVER["SCRIPT_URI"])?'':$_SERVER["SCRIPT_URI"]), LOG_DEBUG, 0, '_paybox');
-
-$tracepost = "";
-foreach($_POST as $k => $v) $tracepost .= "{$k} - {$v}\n";
-dol_syslog("POST=".$tracepost, LOG_DEBUG, 0, '_paybox');
-
-
-// Send an email
-if (! empty($conf->global->PAYBOX_PAYONLINE_SENDEMAIL))
-{
-	$sendto=$conf->global->PAYBOX_PAYONLINE_SENDEMAIL;
-	$from=$conf->global->MAILING_EMAIL_FROM;
-
-	$urlback=$_SERVER["REQUEST_URI"];
-	$topic='['.$conf->global->MAIN_APPLICATION_TITLE.'] '.$langs->transnoentitiesnoconv("NewPayboxPaymentFailed");
-	$content=$langs->transnoentitiesnoconv("NewPayboxPaymentFailed")."\n".$fulltag;
-	require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-	$mailfile = new CMailFile($topic, $sendto, $from, $content);
-
-	$result=$mailfile->sendfile();
-	if ($result)
-	{
-		dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_paybox');
-	}
-	else
-	{
-		dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_paybox');
-	}
-}
-
-
-llxHeaderPayBox($langs->trans("PaymentForm"));
-
-
-// Show message
-print '<span id="dolpaymentspan"></span>'."\n";
-print '<div id="dolpaymentdiv" align="center">'."\n";
-
-print $langs->trans("YourPaymentHasNotBeenRecorded")."<br><br>\n";
-
-if (! empty($conf->global->PAYBOX_MESSAGE_KO)) print $conf->global->PAYBOX_MESSAGE_KO;
-
-print "\n</div>\n";
-
-
-html_print_paybox_footer($mysoc,$langs);
-
-
-llxFooterPayBox();
-
-$db->close();
diff --git a/htdocs/public/stripe/paymentok.php b/htdocs/public/stripe/paymentok.php
deleted file mode 100644
index 9c3030a86ba..00000000000
--- a/htdocs/public/stripe/paymentok.php
+++ /dev/null
@@ -1,172 +0,0 @@
-<?php
-/* Copyright (C) 2001-2002 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2006-2013 Laurent Destailleur  <eldy@users.sourceforge.net>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- *     	\file       htdocs/public/paybox/paymentok.php
- *		\ingroup    paybox
- *		\brief      File to show page after a successful payment
- *		\author	    Laurent Destailleur
- */
-
-define("NOLOGIN",1);		// This means this output page does not require to be logged.
-define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.
-
-// For MultiCompany module.
-// Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
-// TODO This should be useless. Because entity must be retreive from object ref and not from url.
-$entity=(! empty($_GET['entity']) ? (int) $_GET['entity'] : (! empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
-if (is_numeric($entity)) define("DOLENTITY", $entity);
-
-require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/paybox/lib/paybox.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-
-// Security check
-if (empty($conf->paybox->enabled)) accessforbidden('',0,0,1);
-
-$langs->load("main");
-$langs->load("other");
-$langs->load("dict");
-$langs->load("bills");
-$langs->load("companies");
-$langs->load("paybox");
-$langs->load("paypal");
-
-/*$source=GETPOST('source');
-$ref=GETPOST('ref');
-$PAYBOXTOKEN=GETPOST('TOKEN');
-if (empty($PAYBOXTOKEN)) $PAYBOXTOKEN=GETPOST('token');
-$PAYBOXPAYERID=GETPOST('PAYERID');
-if (empty($PAYBOXPAYERID)) $PAYBOXPAYERID=GETPOST('PayerID');
-*/
-$PAYBOXFULLTAG=GETPOST('FULLTAG');
-if (empty($PAYBOXFULLTAG)) $PAYBOXFULLTAG=GETPOST('fulltag');
-
-
-/*
- * Actions
- */
-
-
-
-
-
-/*
- * View
- */
-
-dol_syslog("Callback url when a PayBox payment was done. query_string=".(empty($_SERVER["QUERY_STRING"])?'':$_SERVER["QUERY_STRING"])." script_uri=".(empty($_SERVER["SCRIPT_URI"])?'':$_SERVER["SCRIPT_URI"]), LOG_DEBUG, 0, '_paybox');
-
-$tracepost = "";
-foreach($_POST as $k => $v) $tracepost .= "{$k} - {$v}\n";
-dol_syslog("POST=".$tracepost, LOG_DEBUG, 0, '_paybox');
-
-llxHeaderPayBox($langs->trans("PaymentForm"));
-
-
-// Show message
-print '<span id="dolpaymentspan"></span>'."\n";
-print '<div id="dolpaymentdiv" align="center">'."\n";
-
-// Get on url call
-/*
-$token              = $PAYBOXTOKEN;
-*/
-$fulltag            = $PAYBOXFULLTAG;
-/*$payerID            = $PAYBOXPAYERID;
-// Set by newpayment.php
-$paymentType        = $_SESSION['PaymentType'];
-$currencyCodeType   = $_SESSION['currencyCodeType'];
-$FinalPaymentAmt    = $_SESSION["Payment_Amount"];
-// From env
-$ipaddress          = $_SESSION['ipaddress'];
-
-dol_syslog("Call newpaymentok with token=".$token." paymentType=".$paymentType." currencyCodeType=".$currencyCodeType." payerID=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt." fulltag=".$fulltag);
-*/
-
-
-print $langs->trans("YourPaymentHasBeenRecorded")."<br><br>\n";
-
-if (! empty($conf->global->PAYBOX_MESSAGE_OK)) print $conf->global->PAYBOX_MESSAGE_OK;
-
-// Appel des triggers
-include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-$interface=new Interfaces($db);
-$result=$interface->run_triggers('PAYBOX_PAYMENT_OK',$object,$user,$langs,$conf);
-if ($result < 0) { $error++; $errors=$interface->errors; }
-// Fin appel triggers
-
-
-// Send an email
-if (! empty($conf->global->PAYBOX_PAYONLINE_SENDEMAIL))
-{
-	$sendto=$conf->global->PAYBOX_PAYONLINE_SENDEMAIL;
-	$from=$conf->global->MAILING_EMAIL_FROM;
-	// Define $urlwithroot
-	$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
-	$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
-	//$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
-
-	$urlback=$_SERVER["REQUEST_URI"];
-	$topic='['.$conf->global->MAIN_APPLICATION_TITLE.'] '.$langs->transnoentitiesnoconv("NewPayboxPaymentReceived");
-	$tmptag=dolExplodeIntoArray($fulltag,'.','=');
-	$content="";
-	if (! empty($tmptag['MEM']))
-	{
-		$langs->load("members");
-		$url=$urlwithroot."/adherents/card_subscriptions.php?rowid=".$tmptag['MEM'];
-		$content.=$langs->trans("PaymentSubscription")."<br>\n";
-		$content.=$langs->trans("MemberId").': '.$tmptag['MEM']."<br>\n";
-		$content.=$langs->trans("Link").': <a href="'.$url.'">'.$url.'</a>'."<br>\n";
-	}
-	else
-	{
-		$content.=$langs->transnoentitiesnoconv("NewPayboxPaymentReceived")."<br>\n";
-	}
-	$content.="<br>\n";
-	$content.=$langs->transnoentitiesnoconv("TechnicalInformation").":<br>\n";
-	$content.=$langs->transnoentitiesnoconv("ReturnURLAfterPayment").': '.$urlback."<br>\n";
-	$content.="tag=".$fulltag."<br>\n";
-
-	$ishtml=dol_textishtml($content);	// May contain urls
-
-	require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-	$mailfile = new CMailFile($topic, $sendto, $from, $content, array(), array(), array(), '', '', 0, $ishtml);
-
-	// Send an email
-	$result=$mailfile->sendfile();
-	if ($result)
-	{
-		dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_paybox');
-	}
-	else
-	{
-		dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_paybox');
-	}
-}
-
-
-
-print "\n</div>\n";
-
-html_print_paybox_footer($mysoc,$langs);
-
-
-llxFooterPayBox();
-
-$db->close();
diff --git a/htdocs/stripe/admin/stripe.php b/htdocs/stripe/admin/stripe.php
index 719c623e146..4da06e61de8 100644
--- a/htdocs/stripe/admin/stripe.php
+++ b/htdocs/stripe/admin/stripe.php
@@ -23,7 +23,7 @@
  */
 
 require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/stripe/lib/stripe.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/stripe.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 
@@ -31,6 +31,8 @@ $servicename='Stripe';
 
 $langs->load("admin");
 $langs->load("other");
+$langs->load("paypal");
+$langs->load("paybox");
 $langs->load("stripe");
 
 if (!$user->admin)
@@ -43,7 +45,7 @@ if ($action == 'setvalue' && $user->admin)
 {
 	$db->begin();
 
-    $result=dolibarr_set_const($db, "STRIPE_API_SANDBOX",GETPOST('STRIPE_API_SANDBOX','alpha'),'chaine',0,'',$conf->entity);
+    $result=dolibarr_set_const($db, "STRIPE_TEST",GETPOST('STRIPE_TEST','alpha'),'chaine',0,'',$conf->entity);
     if (! $result > 0) $error++;
 	$result=dolibarr_set_const($db, "STRIPE_TEST_SECRET_KEY",GETPOST('STRIPE_TEST_SECRET_KEY','alpha'),'chaine',0,'',$conf->entity);
 	if (! $result > 0) $error++;
@@ -118,8 +120,8 @@ print "</tr>\n";
 
 $var=!$var;
 print '<tr '.$bc[$var].'><td class="fieldrequired">';
-print $langs->trans("STRIPE_API_SANDBOX").'</td><td>';
-print $form->selectyesno("STRIPE_API_SANDBOX",$conf->global->STRIPE_API_SANDBOX,1);
+print $langs->trans("STRIPE_TEST").'</td><td>';
+print $form->selectyesno("STRIPE_TEST",$conf->global->STRIPE_TEST,1);
 print '</td></tr>';
 
 $var=!$var;
@@ -150,7 +152,11 @@ print '<input size="32" type="text" name="STRIPE_LIVE_PUBLISHABLE_KEY" value="'.
 print '<br>'.$langs->trans("Example").': pk_live_xxxxxxxxxxxxxxxxxxxxxxxx';
 print '</td></tr>';
 
-$var=true;
+print '</table>';
+
+print '<br>';
+
+print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("UsageParameter").'</td>';
 print '<td>'.$langs->trans("Value").'</td>';
@@ -173,14 +179,14 @@ print '</td></tr>';
 $var=!$var;
 print '<tr '.$bc[$var].'><td>';
 print $langs->trans("MessageOK").'</td><td>';
-$doleditor=new DolEditor('STRIPE_MESSAGE_OK',$conf->global->STRIPE_MESSAGE_OK,'',100,'dolibarr_details','In',false,true,true,ROWS_2,60);
+$doleditor=new DolEditor('STRIPE_MESSAGE_OK',$conf->global->STRIPE_MESSAGE_OK,'',100,'dolibarr_details','In',false,true,true,ROWS_2,'90%');
 $doleditor->Create();
 print '</td></tr>';
 
 $var=!$var;
 print '<tr '.$bc[$var].'><td>';
 print $langs->trans("MessageKO").'</td><td>';
-$doleditor=new DolEditor('STRIPE_MESSAGE_KO',$conf->global->STRIPE_MESSAGE_KO,'',100,'dolibarr_details','In',false,true,true,ROWS_2,60);
+$doleditor=new DolEditor('STRIPE_MESSAGE_KO',$conf->global->STRIPE_MESSAGE_KO,'',100,'dolibarr_details','In',false,true,true,ROWS_2,'90%');
 $doleditor->Create();
 print '</td></tr>';
 
@@ -194,6 +200,7 @@ print '</form>';
 
 print '<br><br>';
 
+/*
 print '<u>'.$langs->trans("FollowingUrlAreAvailableToMakePayments").':</u><br>';
 print img_picto('','object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnFreeAmount",$servicename).':<br>';
 print '<b>'.DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?amount=<i>9.99</i>&tag=<i>your_free_tag</i></b>'."<br>\n";
@@ -220,6 +227,7 @@ if (! empty($conf->adherent->enabled))
 
 print "<br>";
 print info_admin($langs->trans("YouCanAddTagOnUrl"));
+*/
 
 llxFooter();
 

From d73374cc5b2865ee9eabfff0a29dc00b3a20f7c8 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Sat, 29 Apr 2017 07:34:30 +0200
Subject: [PATCH 124/505] Uniformize link to stripe.lib

---
 htdocs/public/stripe/checkout.php          |  2 +-
 htdocs/public/stripe/config.php            |  2 +-
 htdocs/stripe/admin/stripe.php             |  2 +-
 htdocs/stripe/lib/index.html               |  0
 htdocs/{core => stripe}/lib/stripe.lib.php | 60 ++++++++++------------
 5 files changed, 31 insertions(+), 35 deletions(-)
 create mode 100644 htdocs/stripe/lib/index.html
 rename htdocs/{core => stripe}/lib/stripe.lib.php (99%)

diff --git a/htdocs/public/stripe/checkout.php b/htdocs/public/stripe/checkout.php
index 4bea80bce6c..3f0b6f84016 100644
--- a/htdocs/public/stripe/checkout.php
+++ b/htdocs/public/stripe/checkout.php
@@ -20,7 +20,7 @@ define("NOLOGIN",1);
 define("NOCSRFCHECK",1);
 
 require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/stripe.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/stripe/lib/stripe.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/public/stripe/config.php';
 require_once DOL_DOCUMENT_ROOT.'/includes/stripe/init.php';
 
diff --git a/htdocs/public/stripe/config.php b/htdocs/public/stripe/config.php
index ac315762b29..b94617b4c69 100644
--- a/htdocs/public/stripe/config.php
+++ b/htdocs/public/stripe/config.php
@@ -25,7 +25,7 @@
 require '../../main.inc.php';
 
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/stripe.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/stripe/lib/stripe.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/includes/stripe/init.php';
 
 //use \includes\stripe as stripe;
diff --git a/htdocs/stripe/admin/stripe.php b/htdocs/stripe/admin/stripe.php
index 4da06e61de8..1882d1065b0 100644
--- a/htdocs/stripe/admin/stripe.php
+++ b/htdocs/stripe/admin/stripe.php
@@ -23,7 +23,7 @@
  */
 
 require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/stripe.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/stripe/lib/stripe.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 
diff --git a/htdocs/stripe/lib/index.html b/htdocs/stripe/lib/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/core/lib/stripe.lib.php b/htdocs/stripe/lib/stripe.lib.php
similarity index 99%
rename from htdocs/core/lib/stripe.lib.php
rename to htdocs/stripe/lib/stripe.lib.php
index 175df3554ce..0ab73437e17 100644
--- a/htdocs/core/lib/stripe.lib.php
+++ b/htdocs/stripe/lib/stripe.lib.php
@@ -21,7 +21,35 @@
  *  \brief			Library for common stripe functions
  */
 
+/**
+ *  Define head array for tabs of stripe tools setup pages
+ *
+ *  @return			Array of head
+ */
+function stripeadmin_prepare_head()
+{
+	global $langs, $conf;
 
+	$h = 0;
+	$head = array();
+
+	$head[$h][0] = DOL_URL_ROOT."/stripe/admin/stripe.php";
+	$head[$h][1] = $langs->trans("Stripe");
+	$head[$h][2] = 'stripeaccount';
+	$h++;
+
+	$object=new stdClass();
+
+    // Show more tabs from modules
+    // Entries must be declared in modules descriptor with line
+    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
+    // $this->tabs = array('entity:-tabname);   												to remove a tab
+	complete_head_from_modules($conf,$langs,$object,$head,$h,'stripeadmin');
+
+	complete_head_from_modules($conf,$langs,$object,$head,$h,'stripeadmin','remove');
+
+    return $head;
+}
 
 /**
  * Show header
@@ -70,38 +98,6 @@ function llxFooterStripe()
 	print "</html>\n";
 }
 
-/**
- *  Define head array for tabs of stripe tools setup pages
- *
- *  @return			Array of head
- */
-function stripeadmin_prepare_head()
-{
-	global $langs, $conf;
-
-	$h = 0;
-	$head = array();
-
-	$head[$h][0] = DOL_URL_ROOT."/stripe/admin/stripe.php";
-	$head[$h][1] = $langs->trans("Stripe");
-	$head[$h][2] = 'stripeaccount';
-	$h++;
-
-	$object=new stdClass();
-
-    // Show more tabs from modules
-    // Entries must be declared in modules descriptor with line
-    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
-    // $this->tabs = array('entity:-tabname);   												to remove a tab
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'stripeadmin');
-
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'stripeadmin','remove');
-
-    return $head;
-}
-
-
-
 /**
  * Return string with full Url
  *

From ce62736e6b46e9442d4aa01133339895c9630474 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Sat, 29 Apr 2017 07:57:36 +0200
Subject: [PATCH 125/505] Correct link and renamed checkout by newpayment

---
 .../stripe/{checkout.php => newpayment.php}   | 14 ++++--
 htdocs/stripe/lib/stripe.lib.php              | 50 +------------------
 2 files changed, 11 insertions(+), 53 deletions(-)
 rename htdocs/public/stripe/{checkout.php => newpayment.php} (94%)

diff --git a/htdocs/public/stripe/checkout.php b/htdocs/public/stripe/newpayment.php
similarity index 94%
rename from htdocs/public/stripe/checkout.php
rename to htdocs/public/stripe/newpayment.php
index 3f0b6f84016..71f581000b2 100644
--- a/htdocs/public/stripe/checkout.php
+++ b/htdocs/public/stripe/newpayment.php
@@ -16,6 +16,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+/**
+*  \file       htdocs/public/stripe/newpayment.php
+*  \ingroup    Stripe
+*  \brief      Page to do payment with Stripe
+*/
+
 define("NOLOGIN",1);
 define("NOCSRFCHECK",1);
 
@@ -25,7 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/public/stripe/config.php';
 require_once DOL_DOCUMENT_ROOT.'/includes/stripe/init.php';
 
 // Security check
-if (empty($conf->paypal->enabled)) accessforbidden('',0,0,1);
+if (empty($conf->stripe->enabled)) accessforbidden('',0,0,1);
 
 $langs->load("main");
 $langs->load("other");
@@ -67,13 +73,13 @@ if (GETPOST("action") == 'charge')
   $token = GETPOST("stripeToken");
   $email = GETPOST("stripeEmail");
 
-  $customer = \Stripe\Customer::create(array(
+  $customer = \stripe\Customer::create(array(
       'email' => $email,
       'card'  => $token
   ));
 	
 	$ttc = round($ttc, 2);
-  $charge = \Stripe\Charge::create(array(
+  $charge = \stripe\Charge::create(array(
       'customer' => $customer->id,
       'amount'   => $ttc,
       'currency' => $conf->currency,
@@ -122,7 +128,7 @@ if (GETPOST("action") == 'charge')
                             </td>
                             
                             <td>
-                                Invoice #: <?php echo $invoice->ref; ?><br>
+                                <?php echo $langs->trans("Invoice") . ' : ' . $invoice->ref; ?><br>
                                 <?php echo $langs->trans('Date') . ' : ' . dol_print_date($invoice->date, 'day'); ?><br>
                                 <?php echo $langs->trans('DateMaxPayment') . ' : ' . dol_print_date($invoice->date_validation, 'day'); ?>
                             </td>
diff --git a/htdocs/stripe/lib/stripe.lib.php b/htdocs/stripe/lib/stripe.lib.php
index 0ab73437e17..c454296a304 100644
--- a/htdocs/stripe/lib/stripe.lib.php
+++ b/htdocs/stripe/lib/stripe.lib.php
@@ -112,6 +112,7 @@ function showStripePaymentUrl($type,$ref)
 	$langs->load("paypal");
     $langs->load("paybox");
 	$langs->load("stripe");
+
     $servicename='Stripe';
     $out='<br><br>';
     $out.=img_picto('','object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePayment",$servicename).'<br>';
@@ -139,11 +140,6 @@ function getStripePaymentUrl($mode,$type,$ref='',$amount='9.99',$freetag='your_f
     if ($type == 'free')
     {
 	    $out=DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?amount='.($mode?'<font color="#666666">':'').$amount.($mode?'</font>':'').'&tag='.($mode?'<font color="#666666">':'').$freetag.($mode?'</font>':'');
-	    if (! empty($conf->global->PAYPAL_SECURITY_TOKEN))
-	    {
-	    	if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $out.='&securekey='.$conf->global->PAYPAL_SECURITY_TOKEN;
-	    	else $out.='&securekey='.dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
-	    }
     }
     if ($type == 'order')
     {
@@ -151,17 +147,6 @@ function getStripePaymentUrl($mode,$type,$ref='',$amount='9.99',$freetag='your_f
         if ($mode == 1) $out.='order_ref';
         if ($mode == 0) $out.=urlencode($ref);
 	    $out.=($mode?'</font>':'');
-        if (! empty($conf->global->PAYPAL_SECURITY_TOKEN))
-        {
-    	    if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $out.='&securekey='.$conf->global->PAYPAL_SECURITY_TOKEN;
-            else
-            {
-                $out.='&securekey='.($mode?'<font color="#666666">':'');
-                if ($mode == 1) $out.="hash('".$conf->global->PAYPAL_SECURITY_TOKEN."' + '".$type."' + order_ref)";
-                if ($mode == 0) $out.= dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . $type . $ref, 2);
-                $out.=($mode?'</font>':'');
-            }
-        }
     }
     if ($type == 'invoice')
     {
@@ -169,17 +154,6 @@ function getStripePaymentUrl($mode,$type,$ref='',$amount='9.99',$freetag='your_f
         if ($mode == 1) $out.='invoice_ref';
         if ($mode == 0) $out.=urlencode($ref);
 	    $out.=($mode?'</font>':'');
-        if (! empty($conf->global->PAYPAL_SECURITY_TOKEN))
-        {
-    	    if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $out.='&securekey='.$conf->global->PAYPAL_SECURITY_TOKEN;
-            else
-            {
-                $out.='&securekey='.($mode?'<font color="#666666">':'');
-                if ($mode == 1) $out.="hash('".$conf->global->PAYPAL_SECURITY_TOKEN."' + '".$type."' + invoice_ref)";
-                if ($mode == 0) $out.= dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . $type . $ref, 2);
-                $out.=($mode?'</font>':'');
-            }
-        }
     }
     if ($type == 'contractline')
     {
@@ -187,17 +161,6 @@ function getStripePaymentUrl($mode,$type,$ref='',$amount='9.99',$freetag='your_f
         if ($mode == 1) $out.='contractline_ref';
         if ($mode == 0) $out.=urlencode($ref);
 	    $out.=($mode?'</font>':'');
-        if (! empty($conf->global->PAYPAL_SECURITY_TOKEN))
-        {
-    	    if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $out.='&securekey='.$conf->global->PAYPAL_SECURITY_TOKEN;
-            else
-            {
-                $out.='&securekey='.($mode?'<font color="#666666">':'');
-                if ($mode == 1) $out.="hash('".$conf->global->PAYPAL_SECURITY_TOKEN."' + '".$type."' + contractline_ref)";
-                if ($mode == 0) $out.= dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . $type . $ref, 2);
-                $out.=($mode?'</font>':'');
-            }
-        }
     }
     if ($type == 'membersubscription')
     {
@@ -205,17 +168,6 @@ function getStripePaymentUrl($mode,$type,$ref='',$amount='9.99',$freetag='your_f
         if ($mode == 1) $out.='member_ref';
         if ($mode == 0) $out.=urlencode($ref);
 	    $out.=($mode?'</font>':'');
-        if (! empty($conf->global->PAYPAL_SECURITY_TOKEN))
-        {
-    	    if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $out.='&securekey='.$conf->global->PAYPAL_SECURITY_TOKEN;
-            else
-            {
-                $out.='&securekey='.($mode?'<font color="#666666">':'');
-                if ($mode == 1) $out.="hash('".$conf->global->PAYPAL_SECURITY_TOKEN."' + '".$type."' + member_ref)";
-                if ($mode == 0) $out.= dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . $type . $ref, 2);
-                $out.=($mode?'</font>':'');
-            }
-        }
     }
 
     // For multicompany

From faddcb28ac9fafb54ad8124f0eef77f2561926f1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 29 Apr 2017 14:53:29 +0200
Subject: [PATCH 126/505] FIX serious bugs in accounting (error management,
 transactions, bad values set)

---
 .../accountancy/class/bookkeeping.class.php   |  15 +-
 htdocs/accountancy/customer/lines.php         |  16 +-
 htdocs/accountancy/customer/list.php          |   9 +-
 htdocs/accountancy/journal/bankjournal.php    | 291 +++++++++---------
 .../journal/expensereportsjournal.php         | 250 ++++++++-------
 .../accountancy/journal/purchasesjournal.php  | 259 +++++++++-------
 htdocs/accountancy/journal/sellsjournal.php   | 240 +++++++++------
 htdocs/accountancy/supplier/lines.php         |   9 +-
 htdocs/accountancy/supplier/list.php          |   9 +-
 htdocs/core/lib/accounting.lib.php            |  92 ++++++
 htdocs/core/lib/functions.lib.php             |   2 +-
 11 files changed, 731 insertions(+), 461 deletions(-)

diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index 754dd262369..8f31b40bc54 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -169,7 +169,15 @@ class BookKeeping extends CommonObject
 		if (empty($this->numero_compte) || $this->numero_compte == '-1')
 		{
 		    $langs->load("errors");
-            $this->errors[]=$langs->trans('ErrorFieldAccountNotDefinedForBankLine', $this->fk_docdet);		    
+            if (in_array($this->doc_type, array('bank', 'expense_report')))
+            {
+		        $this->errors[]=$langs->trans('ErrorFieldAccountNotDefinedForBankLine', $this->fk_docdet,  $this->doc_type);
+            }
+            else
+            {
+                $this->errors[]=$langs->trans('ErrorFieldAccountNotDefinedForInvoiceLine', $this->fk_doc,  $this->doc_type);		    
+            }
+		    
 		    return -1;
 		}
 		
@@ -178,11 +186,12 @@ class BookKeeping extends CommonObject
 		
 		$this->piece_num = 0;
 		
-		// first check if line not yet in bookkeeping
+		// First check if line not yet already in bookkeeping
 		$sql = "SELECT count(*) as nb";
 		$sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element;
 		$sql .= " WHERE doc_type = '" . $this->doc_type . "'";
-		$sql .= " AND fk_docdet = " . $this->fk_docdet;
+		$sql .= " AND fk_doc = " . $this->fk_doc;
+		$sql .= " AND fk_docdet = " . $this->fk_docdet;                   // This field can be 0 is record is for several lines 
 		$sql .= " AND numero_compte = '" . $this->numero_compte . "'";
 	    $sql .= " AND entity IN (" . getEntity("accountancy", 1) . ")";
 		
diff --git a/htdocs/accountancy/customer/lines.php b/htdocs/accountancy/customer/lines.php
index a015fa05929..428e490aff7 100644
--- a/htdocs/accountancy/customer/lines.php
+++ b/htdocs/accountancy/customer/lines.php
@@ -43,6 +43,7 @@ $langs->load("productbatch");
 $account_parent = GETPOST('account_parent');
 $changeaccount = GETPOST('changeaccount');
 // Search Getpost
+$search_lineid = GETPOST('search_lineid', 'int');
 $search_ref = GETPOST('search_ref', 'alpha');
 $search_invoice = GETPOST('search_invoice', 'alpha');
 $search_label = GETPOST('search_label', 'alpha');
@@ -86,6 +87,7 @@ $formventilation = new FormVentilation($db);
 // Purge search criteria
 if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // All tests are required to be compatible with all browsers
 {
+    $search_lineid = '';
 	$search_ref = '';
 	$search_invoice = '';
 	$search_label = '';
@@ -151,7 +153,7 @@ print '<script type="text/javascript">
  * Customer Invoice lines
  */
 $sql = "SELECT f.rowid, f.facnumber, f.type, f.datef, f.ref_client,";
-$sql .= " fd.rowid as fdid, fd.description, fd.product_type, fd.total_ht, fd.total_tva, fd.tva_tx, fd.total_ttc,";
+$sql .= " fd.rowid, fd.description, fd.product_type, fd.total_ht, fd.total_tva, fd.tva_tx, fd.total_ttc,";
 $sql .= " s.rowid as socid, s.nom as name, s.code_compta, s.code_client,";
 $sql .= " p.rowid as product_id, p.ref as product_ref, p.label as product_label, p.accountancy_code_sell, aa.rowid as fk_compte, aa.account_number, aa.label as label_compte,";
 $sql .= " fd.situation_percent, co.label as country, s.tva_intra";
@@ -169,6 +171,9 @@ if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
 } else {
 	$sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_STANDARD . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_DEPOSIT . "," . Facture::TYPE_SITUATION . ")";
 }
+if ($search_lineid) {
+    $sql .= natural_search("fd.rowid", $search_lineid, 1);
+}
 if (strlen(trim($search_invoice))) {
 	$sql .= natural_search("f.facnumber", $search_invoice);
 }
@@ -257,7 +262,7 @@ if ($result) {
 	print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
 	
 	print '<tr class="liste_titre_filter">';
-	print '<td class="liste_titre"></td>';
+	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_lineid" value="' . dol_escape_htmltag($search_lineid) . '""></td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_invoice" value="' . dol_escape_htmltag($search_invoice) . '"></td>';
 	print '<td class="liste_titre"></td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_ref" value="' . dol_escape_htmltag($search_ref) . '"></td>';
@@ -328,13 +333,16 @@ if ($result) {
 		print '<td align="right">' . price($objp->total_ht) . '</td>';
 		print '<td align="center">' . price($objp->tva_tx) . '</td>';
 		print '<td>';
-		print $codecompta . ' <a href="./card.php?id=' . $objp->fdid . '">';
+		print $codecompta . ' <a href="./card.php?id=' . $objp->rowid . '">';
 		print img_edit();
 		print '</a>';
 		print '</td>';
+		
 		print '<td>' . $objp->country .'</td>';
+		
 		print '<td>' . $objp->tva_intra . '</td>';
-		print '<td class="center"><input type="checkbox" class="checkforaction" name="changeaccount[]" value="' . $objp->fdid . '"/></td>';
+		
+		print '<td class="center"><input type="checkbox" class="checkforaction" name="changeaccount[]" value="' . $objp->rowid . '"/></td>';
 
 		print "</tr>";
 		$i ++;
diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php
index c5830b0b003..46cb19c2ae1 100644
--- a/htdocs/accountancy/customer/list.php
+++ b/htdocs/accountancy/customer/list.php
@@ -52,6 +52,7 @@ $toselect = GETPOST('toselect', 'array');
 $mesCasesCochees = GETPOST('toselect', 'array');
 
 // Search Getpost
+$search_lineid = GETPOST('search_lineid', 'int');
 $search_invoice = GETPOST('search_invoice', 'alpha');
 $search_ref = GETPOST('search_ref', 'alpha');
 $search_label = GETPOST('search_label', 'alpha');
@@ -100,6 +101,7 @@ if (! GETPOST('confirmmassaction') && $massaction != 'presend' && $massaction !=
 // Purge search criteria
 if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // All test are required to be compatible with all browsers
 {
+    $search_lineid = '';
 	$search_ref = '';
 	$search_invoice = '';
 	$search_label = '';
@@ -177,7 +179,7 @@ llxHeader('', $langs->trans("Ventilation"));
 
 // Customer Invoice lines
 $sql = "SELECT f.facnumber, f.rowid as facid, f.datef, f.type as ftype,";
-$sql .= " l.fk_product, l.description, l.total_ht, l.rowid, l.fk_code_ventilation, l.product_type as type_l, l.tva_tx as tva_tx_line,";
+$sql .= " l.rowid, l.fk_product, l.description, l.total_ht, l.fk_code_ventilation, l.product_type as type_l, l.tva_tx as tva_tx_line,";
 $sql .= " p.rowid as product_id, p.ref as product_ref, p.label as product_label, p.fk_product_type as type, p.accountancy_code_sell as code_sell, p.tva_tx as tva_tx_prod,";
 $sql .= " aa.rowid as aarowid";
 $sql .= " FROM " . MAIN_DB_PREFIX . "facture as f";
@@ -189,6 +191,9 @@ $sql .= " WHERE f.fk_statut > 0 AND l.fk_code_ventilation <= 0";
 $sql .= " AND product_type <= 2";
 $sql .= " AND (accsys.rowid='" . $conf->global->CHARTOFACCOUNTS . "' OR p.accountancy_code_sell IS NULL OR p.accountancy_code_sell ='')";
 // Add search filter like
+if ($search_lineid) {
+    $sql .= natural_search("l.rowid", $search_lineid, 1);
+}
 if (strlen(trim($search_invoice))) {
     $sql .= natural_search("f.facnumber",$search_invoice);
 }
@@ -274,7 +279,7 @@ if ($result) {
 
 	// We add search filter
 	print '<tr class="liste_titre_filter">';
-	print '<td class="liste_titre"></td>';
+	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_lineid" value="' . dol_escape_htmltag($search_lineid) . '""></td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_invoice" value="' . dol_escape_htmltag($search_invoice) . '"></td>';
 	print '<td class="liste_titre"></td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_ref" value="' . dol_escape_htmltag($search_ref) . '"></td>';
diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index b9567cd50a7..7dc6f652c73 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -106,7 +106,7 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 $p = explode(":", $conf->global->MAIN_INFO_SOCIETE_COUNTRY);
 $idpays = $p[0];
 
-$sql  = "SELECT b.rowid , b.dateo as do, b.datev as dv, b.amount, b.label, b.rappro, b.num_releve, b.num_chq, b.fk_type,";
+$sql  = "SELECT b.rowid, b.dateo as do, b.datev as dv, b.amount, b.label, b.rappro, b.num_releve, b.num_chq, b.fk_type,";
 $sql .= " ba.courant, ba.ref as baref, ba.account_number,";
 $sql .= " soc.code_compta, soc.code_compta_fournisseur, soc.rowid as socid, soc.nom as name, bu1.type as typeop,";
 $sql .= " u.accountancy_code, u.rowid as userid, u.lastname as name, u.firstname as firstname, bu2.type as typeop";
@@ -341,79 +341,81 @@ if (! $error && $action == 'writebookkeeping') {
 		    // Line into bank account
     		foreach ( $tabbq[$key] as $k => $mt ) 
     		{
-    			$bookkeeping = new BookKeeping($db);
-    			$bookkeeping->doc_date = $val["date"];
-    			$bookkeeping->doc_ref = $val["ref"];
-    			$bookkeeping->doc_type = 'bank';
-    			$bookkeeping->fk_doc = $key;
-    			$bookkeeping->fk_docdet = $val["fk_bank"];
-    			$bookkeeping->numero_compte = $k;
-    			$bookkeeping->label_compte = $compte->label;
-    			$bookkeeping->montant = ($mt < 0 ? - $mt : $mt);
-    			$bookkeeping->sens = ($mt >= 0) ? 'D' : 'C';
-    			$bookkeeping->debit = ($mt >= 0 ? $mt : 0);
-    			$bookkeeping->credit = ($mt < 0 ? - $mt : 0);
-    			$bookkeeping->code_journal = $journal;
-    			$bookkeeping->fk_user_author = $user->id;
-    			$bookkeeping->date_create = $now;
+    			if ($mt) {
+        		    $bookkeeping = new BookKeeping($db);
+        			$bookkeeping->doc_date = $val["date"];
+        			$bookkeeping->doc_ref = $val["ref"];
+        			$bookkeeping->doc_type = 'bank';
+        			$bookkeeping->fk_doc = $key;
+        			$bookkeeping->fk_docdet = $val["fk_bank"];
+        			$bookkeeping->numero_compte = $k;
+        			$bookkeeping->label_compte = $compte->label;
+        			$bookkeeping->montant = ($mt < 0 ? - $mt : $mt);
+        			$bookkeeping->sens = ($mt >= 0) ? 'D' : 'C';
+        			$bookkeeping->debit = ($mt >= 0 ? $mt : 0);
+        			$bookkeeping->credit = ($mt < 0 ? - $mt : 0);
+        			$bookkeeping->code_journal = $journal;
+        			$bookkeeping->fk_user_author = $user->id;
+        			$bookkeeping->date_create = $now;
+        
+        			if ($tabtype[$key] == 'payment') {
+        			    $bookkeeping->code_tiers = $tabcompany[$key]['code_compta'];
     
-    			if ($tabtype[$key] == 'payment') {
-    			    $bookkeeping->code_tiers = $tabcompany[$key]['code_compta'];
-
-    				$sqlmid = 'SELECT fac.facnumber';
-    				$sqlmid .= " FROM " . MAIN_DB_PREFIX . "facture fac";
-    				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiement_facture as payfac ON payfac.fk_facture=fac.rowid";
-    				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiement as pay ON  payfac.fk_paiement=pay.rowid";
-    				$sqlmid .= " WHERE pay.fk_bank=" . $key;
-    				dol_syslog("accountancy/journal/bankjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
-    				$resultmid = $db->query($sqlmid);
-    				if ($resultmid) {
-    					$objmid = $db->fetch_object($resultmid);
-    					$bookkeeping->doc_ref = $objmid->facnumber;    // Ref of invoice
-    				}
-    			} else if ($tabtype[$key] == 'payment_supplier') {
-    			    $bookkeeping->code_tiers = $tabcompany[$key]['code_compta'];
-
-    				$sqlmid = 'SELECT facf.ref_supplier, facf.ref';
-    				$sqlmid .= " FROM " . MAIN_DB_PREFIX . "facture_fourn facf";
-    				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiementfourn_facturefourn as payfacf ON payfacf.fk_facturefourn=facf.rowid";
-    				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiementfourn as payf ON  payfacf.fk_paiementfourn=payf.rowid";
-    				$sqlmid .= " WHERE payf.fk_bank=" . $key;
-    				dol_syslog("accountancy/journal/bankjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
-    				$resultmid = $db->query($sqlmid);
-    				if ($resultmid) {
-    					$objmid = $db->fetch_object($resultmid);
-    					$bookkeeping->doc_ref = $objmid->ref_supplier . ' (' . $objmid->ref . ')'; // Ref on invoice
-    				}
-    			} else if ($tabtype[$key] == 'payment_expensereport') {
-    			    $bookkeeping->code_tiers = $tabuser[$key]['accountancy_code'];
-
-    				$sqlmid = 'SELECT e.ref';
-    				$sqlmid .= " FROM " . MAIN_DB_PREFIX . "expensereport as e";
-    				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "payment_expensereport as payer ON payer.fk_expensereport=e.rowid";
-    				$sqlmid .= " WHERE payer.fk_expensereport=" . $val["fk_expensereport"];
-    				dol_syslog("accountancy/journal/bankjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
-    				$resultmid = $db->query($sqlmid);
-    				if ($resultmid) {
-    					$objmid = $db->fetch_object($resultmid);
-    					$bookkeeping->doc_ref = $objmid->ref; // Ref of expensereport
-    				}
-    			}
+        				$sqlmid = 'SELECT fac.facnumber';
+        				$sqlmid .= " FROM " . MAIN_DB_PREFIX . "facture fac";
+        				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiement_facture as payfac ON payfac.fk_facture=fac.rowid";
+        				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiement as pay ON  payfac.fk_paiement=pay.rowid";
+        				$sqlmid .= " WHERE pay.fk_bank=" . $key;
+        				dol_syslog("accountancy/journal/bankjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
+        				$resultmid = $db->query($sqlmid);
+        				if ($resultmid) {
+        					$objmid = $db->fetch_object($resultmid);
+        					$bookkeeping->doc_ref = $objmid->facnumber;    // Ref of invoice
+        				}
+        			} else if ($tabtype[$key] == 'payment_supplier') {
+        			    $bookkeeping->code_tiers = $tabcompany[$key]['code_compta'];
     
-    			$result = $bookkeeping->create($user);
-    			if ($result < 0) {
-    				if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
-    				{
-    					$error++;
-    					$errorforline++;
-    					//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
-    				}
-    				else
-    				{
-	    				$error++;
-	    				$errorforline++;
-	    				setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
-    				}
+        				$sqlmid = 'SELECT facf.ref_supplier, facf.ref';
+        				$sqlmid .= " FROM " . MAIN_DB_PREFIX . "facture_fourn facf";
+        				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiementfourn_facturefourn as payfacf ON payfacf.fk_facturefourn=facf.rowid";
+        				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiementfourn as payf ON  payfacf.fk_paiementfourn=payf.rowid";
+        				$sqlmid .= " WHERE payf.fk_bank=" . $key;
+        				dol_syslog("accountancy/journal/bankjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
+        				$resultmid = $db->query($sqlmid);
+        				if ($resultmid) {
+        					$objmid = $db->fetch_object($resultmid);
+        					$bookkeeping->doc_ref = $objmid->ref_supplier . ' (' . $objmid->ref . ')'; // Ref on invoice
+        				}
+        			} else if ($tabtype[$key] == 'payment_expensereport') {
+        			    $bookkeeping->code_tiers = $tabuser[$key]['accountancy_code'];
+    
+        				$sqlmid = 'SELECT e.ref';
+        				$sqlmid .= " FROM " . MAIN_DB_PREFIX . "expensereport as e";
+        				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "payment_expensereport as payer ON payer.fk_expensereport=e.rowid";
+        				$sqlmid .= " WHERE payer.fk_expensereport=" . $val["fk_expensereport"];
+        				dol_syslog("accountancy/journal/bankjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
+        				$resultmid = $db->query($sqlmid);
+        				if ($resultmid) {
+        					$objmid = $db->fetch_object($resultmid);
+        					$bookkeeping->doc_ref = $objmid->ref; // Ref of expensereport
+        				}
+        			}
+        
+        			$result = $bookkeeping->create($user);
+        			if ($result < 0) {
+        				if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
+        				{
+        					$error++;
+        					$errorforline++;
+        					//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
+        				}
+        				else
+        				{
+    	    				$error++;
+    	    				$errorforline++;
+    	    				setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
+        				}
+        			}
     			}
     		}
 		}
@@ -423,65 +425,76 @@ if (! $error && $action == 'writebookkeeping') {
 		{
 		    // Line into thirdparty account
     		foreach ( $tabtp[$key] as $k => $mt ) {
-    			$bookkeeping = new BookKeeping($db);
-    			$bookkeeping->doc_date = $val["date"];
-    			$bookkeeping->doc_ref = $val["ref"];
-    			$bookkeeping->doc_type = 'bank';
-    			$bookkeeping->fk_doc = $key;
-    			$bookkeeping->fk_docdet = $val["fk_bank"];
-    			$bookkeeping->label_compte = $tabcompany[$key]['name'];
-    			$bookkeeping->montant = ($mt < 0 ? - $mt : $mt);
-    			$bookkeeping->sens = ($mt < 0) ? 'D' : 'C';
-    			$bookkeeping->debit = ($mt < 0 ? - $mt : 0);
-    			$bookkeeping->credit = ($mt >= 0) ? $mt : 0;
-    			$bookkeeping->code_journal = $journal;
-    			$bookkeeping->fk_user_author = $user->id;
-    			$bookkeeping->date_create = $now;
-    
-    			if (in_array($tabtype[$key], array('sc', 'payment_sc'))) {   // If payment is payment of social contribution
-    				$bookkeeping->code_tiers = '';
-    				$bookkeeping->numero_compte = $k;
-    			} else if ($tabtype[$key] == 'payment') {    // If payment is payment of customer invoice, we get ref of invoice
-    				$sqlmid = 'SELECT fac.facnumber';
-    				$sqlmid .= " FROM " . MAIN_DB_PREFIX . "facture fac ";
-    				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiement_facture as payfac ON  payfac.fk_facture=fac.rowid";
-    				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiement as pay ON  payfac.fk_paiement=pay.rowid";
-    				$sqlmid .= " WHERE pay.fk_bank=" . $key;
-    				dol_syslog("accountancy/journal/bankjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
-    				$resultmid = $db->query($sqlmid);
-    				if ($resultmid) {
-    					$objmid = $db->fetch_object($resultmid);
-    					$bookkeeping->doc_ref = $objmid->facnumber;
-    				}
-    				$bookkeeping->code_tiers = $tabcompany[$key]['code_compta'];
-    				$bookkeeping->numero_compte = $k;
-    			} else if ($tabtype[$key] == 'payment_supplier') {           // If payment is payment of supplier invoice, we get ref of invoice
-    
-    				$sqlmid = 'SELECT facf.ref_supplier,facf.ref';
-    				$sqlmid .= " FROM " . MAIN_DB_PREFIX . "facture_fourn facf ";
-    				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiementfourn_facturefourn as payfacf ON  payfacf.fk_facturefourn=facf.rowid";
-    				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiementfourn as payf ON  payfacf.fk_paiementfourn=payf.rowid";
-    				$sqlmid .= " WHERE payf.fk_bank=" . $key;
-    				dol_syslog("accountancy/journal/bankjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
-    				$resultmid = $db->query($sqlmid);
-    				if ($resultmid) {
-    					$objmid = $db->fetch_object($resultmid);
-    					$bookkeeping->doc_ref = $objmid->ref_supplier . ' (' . $objmid->ref . ')';
-    				}
-                    $bookkeeping->code_tiers = $tabcompany[$key]['code_compta'];
-    				$bookkeeping->numero_compte = $k;
-    			} else {
-    			    // FIXME Should be a temporary account ???
-    				$bookkeeping->doc_ref = $k;
-    				//$bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER;
-    				$bookkeeping->numero_compte = 'CodeNotDef';
-    			}
-    
-    			$result = $bookkeeping->create($user);
-    			if ($result < 0) {
-    				$error++;
-    				$errorforline++;
-    				setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
+    			if ($mt) {
+        		    $bookkeeping = new BookKeeping($db);
+        			$bookkeeping->doc_date = $val["date"];
+        			$bookkeeping->doc_ref = $val["ref"];
+        			$bookkeeping->doc_type = 'bank';
+        			$bookkeeping->fk_doc = $key;
+        			$bookkeeping->fk_docdet = $val["fk_bank"];
+        			$bookkeeping->label_compte = $tabcompany[$key]['name'];
+        			$bookkeeping->montant = ($mt < 0 ? - $mt : $mt);
+        			$bookkeeping->sens = ($mt < 0) ? 'D' : 'C';
+        			$bookkeeping->debit = ($mt < 0 ? - $mt : 0);
+        			$bookkeeping->credit = ($mt >= 0) ? $mt : 0;
+        			$bookkeeping->code_journal = $journal;
+        			$bookkeeping->fk_user_author = $user->id;
+        			$bookkeeping->date_create = $now;
+        
+        			if (in_array($tabtype[$key], array('sc', 'payment_sc'))) {   // If payment is payment of social contribution
+        				$bookkeeping->code_tiers = '';
+        				$bookkeeping->numero_compte = $k;
+        			} else if ($tabtype[$key] == 'payment') {    // If payment is payment of customer invoice, we get ref of invoice
+        				$sqlmid = 'SELECT fac.facnumber';
+        				$sqlmid .= " FROM " . MAIN_DB_PREFIX . "facture fac ";
+        				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiement_facture as payfac ON  payfac.fk_facture=fac.rowid";
+        				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiement as pay ON  payfac.fk_paiement=pay.rowid";
+        				$sqlmid .= " WHERE pay.fk_bank=" . $key;
+        				dol_syslog("accountancy/journal/bankjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
+        				$resultmid = $db->query($sqlmid);
+        				if ($resultmid) {
+        					$objmid = $db->fetch_object($resultmid);
+        					$bookkeeping->doc_ref = $objmid->facnumber;
+        				}
+        				$bookkeeping->code_tiers = $tabcompany[$key]['code_compta'];
+        				$bookkeeping->numero_compte = $k;
+        			} else if ($tabtype[$key] == 'payment_supplier') {           // If payment is payment of supplier invoice, we get ref of invoice
+        
+        				$sqlmid = 'SELECT facf.ref_supplier,facf.ref';
+        				$sqlmid .= " FROM " . MAIN_DB_PREFIX . "facture_fourn facf ";
+        				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiementfourn_facturefourn as payfacf ON  payfacf.fk_facturefourn=facf.rowid";
+        				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiementfourn as payf ON  payfacf.fk_paiementfourn=payf.rowid";
+        				$sqlmid .= " WHERE payf.fk_bank=" . $key;
+        				dol_syslog("accountancy/journal/bankjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
+        				$resultmid = $db->query($sqlmid);
+        				if ($resultmid) {
+        					$objmid = $db->fetch_object($resultmid);
+        					$bookkeeping->doc_ref = $objmid->ref_supplier . ' (' . $objmid->ref . ')';
+        				}
+                        $bookkeeping->code_tiers = $tabcompany[$key]['code_compta'];
+        				$bookkeeping->numero_compte = $k;
+        			} else {
+        			    // FIXME Should be a temporary account ???
+        				$bookkeeping->doc_ref = $k;
+        				//$bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER;
+        				$bookkeeping->numero_compte = 'CodeNotDef';
+        			}
+        
+        			$result = $bookkeeping->create($user);
+        			if ($result < 0) {
+        				if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
+        				{
+        					$error++;
+        					$errorforline++;
+        					//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
+        				}
+        				else
+        				{
+    	    				$error++;
+    	    				$errorforline++;
+    	    				setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
+        				}
+        			}
     			}
     		}
 		}
@@ -512,6 +525,7 @@ if (! $error && $action == 'writebookkeeping') {
 }
 
 // Export
+/*
 if ($action == 'export_csv') {
 	$sep = $conf->global->ACCOUNTING_EXPORT_SEPARATORCSV;
 
@@ -678,7 +692,7 @@ if ($action == 'export_csv') {
 		}
 	}
 }
-
+*/
 
 
 
@@ -702,18 +716,19 @@ if (empty($action) || $action == 'view') {
 	$period = $form->select_date($date_start, 'date_start', 0, 0, 0, '', 1, 0, 1) . ' - ' . $form->select_date($date_end, 'date_end', 0, 0, 0, '', 1, 0, 1);
 
 	$varlink = 'id_account=' . $id_bank_account;
-	report_header($nom, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, array (
-			'action' => ''
-	), '', $varlink);
+	
+	journalHead($nom, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, array('action' => ''), '', $varlink);
 
-	if ($conf->global->ACCOUNTING_EXPORT_MODELCSV != 1 && $conf->global->ACCOUNTING_EXPORT_MODELCSV != 2) {
+	/*if ($conf->global->ACCOUNTING_EXPORT_MODELCSV != 1 && $conf->global->ACCOUNTING_EXPORT_MODELCSV != 2) {
 		print '<input type="button" class="butActionRefused" style="float: right;" value="' . $langs->trans('Export') . '" disabled="disabled" title="' . $langs->trans('ExportNotSupported') . '"/>';
 	} else {
 		print '<input type="button" class="butAction" style="float: right;" value="' . $langs->trans("Export") . '" onclick="launch_export();" />';
-	}
+	}*/
 
+    print '<div class="tabsAction">';
 	print '<input type="button" class="butAction" value="' . $langs->trans("WriteBookKeeping") . '" onclick="writebookkeeping();" />';
-
+    print '</div>';
+    
 	// TODO Avoid using js. We can use a direct link with $param
 	print '
 	<script type="text/javascript">
diff --git a/htdocs/accountancy/journal/expensereportsjournal.php b/htdocs/accountancy/journal/expensereportsjournal.php
index a281b7fef8d..6488c6c4fd3 100644
--- a/htdocs/accountancy/journal/expensereportsjournal.php
+++ b/htdocs/accountancy/journal/expensereportsjournal.php
@@ -157,100 +157,140 @@ if ($action == 'writebookkeeping') {
 	{
 		$errorforline = 0;
 
-		foreach ( $tabttc[$key] as $k => $mt ) {
-			// get compte id and label
-
-			$bookkeeping = new BookKeeping($db);
-			$bookkeeping->doc_date = $val["date"];
-			$bookkeeping->doc_ref = $val["ref"];
-			$bookkeeping->date_create = $now;
-			$bookkeeping->doc_type = 'expense_report';
-			$bookkeeping->fk_doc = $key;
-			$bookkeeping->fk_docdet = $val["fk_expensereportdet"];
-			$bookkeeping->code_tiers = $tabuser[$key]['user_accountancy_code'];
-			$bookkeeping->label_compte = $tabuser[$key]['name'];
-			$bookkeeping->numero_compte = $conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT;
-			$bookkeeping->montant = $mt;
-			$bookkeeping->sens = ($mt >= 0) ? 'C' : 'D';
-			$bookkeeping->debit = ($mt <= 0) ? $mt : 0;
-			$bookkeeping->credit = ($mt > 0) ? $mt : 0;
-			$bookkeeping->code_journal = $conf->global->ACCOUNTING_EXPENSEREPORT_JOURNAL;
-			$bookkeeping->fk_user_author = $user->id;
-
-			$result = $bookkeeping->create($user);
-			if ($result < 0) {
-				$error++;
-				$errorforline++;
-				setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
-			}
-		}
-
-		// Fees
-		foreach ( $tabht[$key] as $k => $mt ) {
-			$accountingaccount = new AccountingAccount($db);
-			$accountingaccount->fetch(null, $k, true);
-			if ($mt) {
-				// get compte id and label
-				$accountingaccount = new AccountingAccount($db);
-				if ($accountingaccount->fetch(null, $k, true)) {
-					$bookkeeping = new BookKeeping($db);
-					$bookkeeping->doc_date = $val["date"];
-					$bookkeeping->doc_ref = $val["ref"];
-					$bookkeeping->date_create = $now;
-					$bookkeeping->doc_type = 'expense_report';
-					$bookkeeping->fk_doc = $key;
-					$bookkeeping->fk_docdet = $val["fk_expensereportdet"];
-					$bookkeeping->code_tiers = '';
-					$bookkeeping->label_compte = $accountingaccount->label;
-					$bookkeeping->numero_compte = $k;
-					$bookkeeping->montant = $mt;
-					$bookkeeping->sens = ($mt < 0) ? 'C' : 'D';
-					$bookkeeping->debit = ($mt > 0) ? $mt : 0;
-					$bookkeeping->credit = ($mt <= 0) ? $mt : 0;
-					$bookkeeping->code_journal = $conf->global->ACCOUNTING_EXPENSEREPORT_JOURNAL;
-					$bookkeeping->fk_user_author = $user->id;
-
-					$result = $bookkeeping->create($user);
-					if ($result < 0) {
-						$error++;
-						$errorforline++;
-						setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
-					}
-				}
-			}
-		}
-
-		// VAT
-		// var_dump($tabtva);
-		foreach ( $tabtva[$key] as $k => $mt ) {
-			if ($mt) {
-				// get compte id and label
-				$bookkeeping = new BookKeeping($db);
-				$bookkeeping->doc_date = $val["date"];
-				$bookkeeping->doc_ref = $val["ref"];
-				$bookkeeping->date_create = $now;
-				$bookkeeping->doc_type = 'expense_report';
-				$bookkeeping->fk_doc = $key;
-				$bookkeeping->fk_docdet = $val["fk_expensereportdet"];
-				$bookkeeping->code_tiers = '';
-				$bookkeeping->label_compte = $langs->trans("VAT"). ' '.$def_tva[$key];
-				$bookkeeping->numero_compte = $k;
-				$bookkeeping->montant = $mt;
-				$bookkeeping->sens = ($mt < 0) ? 'C' : 'D';
-				$bookkeeping->debit = ($mt > 0) ? $mt : 0;
-				$bookkeeping->credit = ($mt <= 0) ? $mt : 0;
-				$bookkeeping->code_journal = $conf->global->ACCOUNTING_EXPENSEREPORT_JOURNAL;
-				$bookkeeping->fk_user_author = $user->id;
-
-				$result = $bookkeeping->create($user);
-				if ($result < 0) {
-					$error++;
-					$errorforline++;
-					setEventMessages($object->error, $object->errors, 'errors');
-				}
-			}
-		}
-
+	    $db->begin();
+	     
+        if (! $errorforline)
+        {
+    	    foreach ( $tabttc[$key] as $k => $mt ) {
+    			if ($mt) {
+        	        // get compte id and label
+        
+        			$bookkeeping = new BookKeeping($db);
+        			$bookkeeping->doc_date = $val["date"];
+        			$bookkeeping->doc_ref = $val["ref"];
+        			$bookkeeping->date_create = $now;
+        			$bookkeeping->doc_type = 'expense_report';
+        			$bookkeeping->fk_doc = $key;
+        			$bookkeeping->fk_docdet = $val["fk_expensereportdet"];
+        			$bookkeeping->code_tiers = $tabuser[$key]['user_accountancy_code'];
+        			$bookkeeping->label_compte = $tabuser[$key]['name'];
+        			$bookkeeping->numero_compte = $conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT;
+        			$bookkeeping->montant = $mt;
+        			$bookkeeping->sens = ($mt >= 0) ? 'C' : 'D';
+        			$bookkeeping->debit = ($mt <= 0) ? $mt : 0;
+        			$bookkeeping->credit = ($mt > 0) ? $mt : 0;
+        			$bookkeeping->code_journal = $conf->global->ACCOUNTING_EXPENSEREPORT_JOURNAL;
+        			$bookkeeping->fk_user_author = $user->id;
+        
+        			$result = $bookkeeping->create($user);
+        			if ($result < 0) {
+        			    if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
+        			    {
+        			        $error++;
+        			        $errorforline++;
+        			        //setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
+        			    }
+        			    else
+        			    {
+        			        $error++;
+        			        $errorforline++;
+        			        setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
+        			    }
+        			}
+    			}
+    		}
+        }
+        
+        if (! $errorforline)
+        {
+            // Fees
+    		foreach ( $tabht[$key] as $k => $mt ) {
+    			$accountingaccount = new AccountingAccount($db);
+    			$accountingaccount->fetch(null, $k, true);
+    			if ($mt) {
+    				// get compte id and label
+    				$accountingaccount = new AccountingAccount($db);
+    				if ($accountingaccount->fetch(null, $k, true)) {
+    					$bookkeeping = new BookKeeping($db);
+    					$bookkeeping->doc_date = $val["date"];
+    					$bookkeeping->doc_ref = $val["ref"];
+    					$bookkeeping->date_create = $now;
+    					$bookkeeping->doc_type = 'expense_report';
+    					$bookkeeping->fk_doc = $key;
+    					$bookkeeping->fk_docdet = $val["fk_expensereportdet"];
+    					$bookkeeping->code_tiers = '';
+    					$bookkeeping->label_compte = $accountingaccount->label;
+    					$bookkeeping->numero_compte = $k;
+    					$bookkeeping->montant = $mt;
+    					$bookkeeping->sens = ($mt < 0) ? 'C' : 'D';
+    					$bookkeeping->debit = ($mt > 0) ? $mt : 0;
+    					$bookkeeping->credit = ($mt <= 0) ? $mt : 0;
+    					$bookkeeping->code_journal = $conf->global->ACCOUNTING_EXPENSEREPORT_JOURNAL;
+    					$bookkeeping->fk_user_author = $user->id;
+    
+    					$result = $bookkeeping->create($user);
+	        			if ($result < 0) {
+            			    if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
+            			    {
+            			        $error++;
+            			        $errorforline++;
+            			        //setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
+            			    }
+            			    else
+            			    {
+            			        $error++;
+            			        $errorforline++;
+            			        setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
+            			    }
+	        			}
+    				}
+    			}
+    		}
+        }
+        
+        if (! $errorforline)
+        {
+            // VAT
+    		// var_dump($tabtva);
+    		foreach ( $tabtva[$key] as $k => $mt ) {
+    			if ($mt) {
+    				// get compte id and label
+    				$bookkeeping = new BookKeeping($db);
+    				$bookkeeping->doc_date = $val["date"];
+    				$bookkeeping->doc_ref = $val["ref"];
+    				$bookkeeping->date_create = $now;
+    				$bookkeeping->doc_type = 'expense_report';
+    				$bookkeeping->fk_doc = $key;
+    				$bookkeeping->fk_docdet = $val["fk_expensereportdet"];
+    				$bookkeeping->code_tiers = '';
+    				$bookkeeping->label_compte = $langs->trans("VAT"). ' '.$def_tva[$key];
+    				$bookkeeping->numero_compte = $k;
+    				$bookkeeping->montant = $mt;
+    				$bookkeeping->sens = ($mt < 0) ? 'C' : 'D';
+    				$bookkeeping->debit = ($mt > 0) ? $mt : 0;
+    				$bookkeeping->credit = ($mt <= 0) ? $mt : 0;
+    				$bookkeeping->code_journal = $conf->global->ACCOUNTING_EXPENSEREPORT_JOURNAL;
+    				$bookkeeping->fk_user_author = $user->id;
+    
+    				$result = $bookkeeping->create($user);
+    				if ($result < 0) {
+           			    if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
+        			    {
+        			        $error++;
+        			        $errorforline++;
+        			        //setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
+        			    }
+        			    else
+        			    {
+        			        $error++;
+        			        $errorforline++;
+        			        setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
+        			    }
+    				}
+    			}
+    		}
+        }
+        
 		if (! $errorforline)
 		{
 		    $db->commit();
@@ -286,7 +326,7 @@ $form = new Form($db);
 $userstatic = new User($db);
 
 // Export
-if ($action == 'export_csv') {
+/*if ($action == 'export_csv') {
 	$sep = $conf->global->ACCOUNTING_EXPORT_SEPARATORCSV;
 	$journal = $conf->global->ACCOUNTING_EXPENSEREPORT_JOURNAL;
 
@@ -393,6 +433,7 @@ if ($action == 'export_csv') {
 		}
 	}
 }
+*/
 
 if (empty($action) || $action == 'view') {
 
@@ -406,18 +447,19 @@ if (empty($action) || $action == 'view') {
 	$description.= $langs->trans("DescJournalOnlyBindedVisible").'<br>';
 
 	$period = $form->select_date($date_start, 'date_start', 0, 0, 0, '', 1, 0, 1) . ' - ' . $form->select_date($date_end, 'date_end', 0, 0, 0, '', 1, 0, 1);
-	report_header($nom, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, array (
-			'action' => ''
-	));
 
-	if ($conf->global->ACCOUNTING_EXPORT_MODELCSV != 1 && $conf->global->ACCOUNTING_EXPORT_MODELCSV != 2) {
+	journalHead($nom, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, array('action' => ''));
+
+	/*if ($conf->global->ACCOUNTING_EXPORT_MODELCSV != 1 && $conf->global->ACCOUNTING_EXPORT_MODELCSV != 2) {
 		print '<input type="button" class="butActionRefused" style="float: right;" value="' . $langs->trans("Export") . '" disabled="disabled" title="' . $langs->trans('ExportNotSupported') . '"/>';
 	} else {
 		print '<input type="button" class="butAction" style="float: right;" value="' . $langs->trans("Export") . '" onclick="launch_export();" />';
-	}
+	}*/
 
+    print '<div class="tabsAction">';
 	print '<input type="button" class="butAction" value="' . $langs->trans("WriteBookKeeping") . '" onclick="writebookkeeping();" />';
-
+    print '</div>';
+    
 	print '
 	<script type="text/javascript">
 		function launch_export() {
@@ -511,11 +553,11 @@ if (empty($action) || $action == 'view') {
 				print "</tr>";
 			}
 		}
-		print '<tr class="oddeven">';
 
 		// Third party
 		foreach ( $tabttc[$key] as $k => $mt ) {
-			print "<td><!-- Thirdparty --></td>";
+		    print '<tr class="oddeven">';
+		    print "<td><!-- Thirdparty --></td>";
 		    print "<td>" . $date . "</td>";
 			print "<td>" . $expensereportstatic->getNomUrl(1) . "</td>";
 			$userstatic->id = $tabuser[$key]['id'];
@@ -531,8 +573,8 @@ if (empty($action) || $action == 'view') {
 			print "<td>" . $userstatic->getNomUrl(0, 'user', 16) . ' - ' . $langs->trans("Code_tiers") . "</td>";
 			print '<td align="right">' . ($mt < 0 ? - price(- $mt) : '') . "</td>";
 			print '<td align="right">' . ($mt >= 0 ? price($mt) : '') . "</td>";
+		    print "</tr>";
 		}
-		print "</tr>";
 	}
 
 	print "</table>";
diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php
index a00fc9a70d8..c5069644cef 100644
--- a/htdocs/accountancy/journal/purchasesjournal.php
+++ b/htdocs/accountancy/journal/purchasesjournal.php
@@ -109,6 +109,7 @@ dol_syslog('accountancy/journal/purchasesjournal.php:: $sql=' . $sql);
 $result = $db->query($sql);
 if ($result) {
 	$num = $db->num_rows($result);
+
 	// les variables
 	$cptfour = (! empty($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER)) ? $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER : $langs->trans("CodeNotDef");
 	$cpttva = (! empty($conf->global->ACCOUNTING_VAT_BUY_ACCOUNT)) ? $conf->global->ACCOUNTING_VAT_BUY_ACCOUNT : $langs->trans("CodeNotDef");
@@ -123,8 +124,10 @@ if ($result) {
 	$i = 0;
 	while ( $i < $num ) {
 		$obj = $db->fetch_object($result);
+
 		// contrôles
 		$compta_soc = (! empty($obj->code_compta_fournisseur)) ? $obj->code_compta_fournisseur : $cptfour;
+		
 		$compta_prod = $obj->compte;
 		if (empty($compta_prod)) {
 			if ($obj->product_type == 0)
@@ -144,14 +147,21 @@ if ($result) {
 
 		$tabfac[$obj->rowid]["type"] = $obj->type;
 		$tabfac[$obj->rowid]["description"] = $obj->description;
-		$tabfac[$obj->rowid]["fk_facturefourndet"] = $obj->fdid;
+		//$tabfac[$obj->rowid]["fk_facturefourndet"] = $obj->fdid;
+		
+        // Avoid warnings
+        if (! isset($tabttc[$obj->rowid][$compta_soc])) $tabttc[$obj->rowid][$compta_soc] = 0;
+        if (! isset($tabht[$obj->rowid][$compta_prod])) $tabht[$obj->rowid][$compta_prod] = 0;
+        if (! isset($tabtva[$obj->rowid][$compta_tva])) $tabtva[$obj->rowid][$compta_tva] = 0;
+
 		$tabttc[$obj->rowid][$compta_soc] += $obj->total_ttc;
 		$tabht[$obj->rowid][$compta_prod] += $obj->total_ht;
 		$tabtva[$obj->rowid][$compta_tva] += $obj->total_tva;
 		$tabcompany[$obj->rowid] = array (
 				'id' => $obj->socid,
 				'name' => $obj->name,
-				'code_fournisseur' => $obj->code_compta_fournisseur
+				'code_fournisseur' => $obj->code_fournisseur,
+				'code_compta_fournisseur' => $compta_soc
 		);
 
 		$i ++;
@@ -165,7 +175,7 @@ if ($action == 'writebookkeeping') {
 	$now = dol_now();
 	$error = 0;
 
-	foreach ($tabfac as $key => $val)
+	foreach ($tabfac as $key => $val)  // Loop on each invoice
 	{
 	    $errorforline = 0;
 	     
@@ -188,101 +198,136 @@ if ($action == 'writebookkeeping') {
 		$companystatic->code_fournisseur = $tabcompany[$key]['code_fournisseur'];
 		$companystatic->client = $tabcompany[$key]['code_client'];
 
-		foreach ( $tabttc[$key] as $k => $mt ) {
-			// get compte id and label
-
-			$bookkeeping = new BookKeeping($db);
-			$bookkeeping->doc_date = $val["date"];
-			$bookkeeping->doc_ref = $val["ref"];
-			$bookkeeping->date_create = $now;
-			$bookkeeping->doc_type = 'supplier_invoice';
-			$bookkeeping->fk_doc = $key;
-			$bookkeeping->fk_docdet = $val["fk_facturefourndet"];
-			$bookkeeping->code_tiers = $tabcompany[$key]['code_fournisseur'];
-			$bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $langs->trans("Code_tiers");
-			$bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER;
-			$bookkeeping->montant = $mt;
-			$bookkeeping->sens = ($mt >= 0) ? 'C' : 'D';
-			$bookkeeping->debit = ($mt <= 0) ? $mt : 0;
-			$bookkeeping->credit = ($mt > 0) ? $mt : 0;
-			$bookkeeping->code_journal = $conf->global->ACCOUNTING_PURCHASE_JOURNAL;
-			$bookkeeping->fk_user_author = $user->id;
-
-			$result = $bookkeeping->create($user);
-			if ($result < 0) {
-			    $error++;
-			    $errorforline++;
-			    setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
-			}
-		}
-
+        if (! $errorforline)
+        {
+    		foreach ( $tabttc[$key] as $k => $mt ) {
+    			// get compte id and label
+    		    if ($mt) {
+        			$bookkeeping = new BookKeeping($db);
+        			$bookkeeping->doc_date = $val["date"];
+        			$bookkeeping->doc_ref = $val["ref"];
+        			$bookkeeping->date_create = $now;
+        			$bookkeeping->doc_type = 'supplier_invoice';
+        			$bookkeeping->fk_doc = $key;
+        			$bookkeeping->fk_docdet = 0;    // Useless, can be several lines that are source of this record to add
+        			$bookkeeping->code_tiers = $tabcompany[$key]['code_fournisseur'];
+        			$bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $langs->trans("Code_tiers");
+        			$bookkeeping->numero_compte = $tabcompany[$key]['code_compta_fournisseur'];
+        			$bookkeeping->montant = $mt;
+        			$bookkeeping->sens = ($mt >= 0) ? 'C' : 'D';
+        			$bookkeeping->debit = ($mt <= 0) ? $mt : 0;
+        			$bookkeeping->credit = ($mt > 0) ? $mt : 0;
+        			$bookkeeping->code_journal = $conf->global->ACCOUNTING_PURCHASE_JOURNAL;
+        			$bookkeeping->fk_user_author = $user->id;
+        
+        			$result = $bookkeeping->create($user);
+           			if ($result < 0) {
+                        if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
+                        {
+                            $error++;
+                            $errorforline++;
+                            //setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
+                        }
+                        else
+                        {
+                            $error++;
+                            $errorforline++;
+                            setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
+                        }
+        			}
+    		    }
+    		}
+        }
+        
 		// Product / Service
-		foreach ( $tabht[$key] as $k => $mt ) {
-			$accountingaccount = new AccountingAccount($db);
-			$accountingaccount->fetch(null, $k, true);
-			if ($mt) {
-				// get compte id and label
-				$accountingaccount = new AccountingAccount($db);
-				if ($accountingaccount->fetch(null, $k, true)) {
-					$bookkeeping = new BookKeeping($db);
-					$bookkeeping->doc_date = $val["date"];
-					$bookkeeping->doc_ref = $val["ref"];
-					$bookkeeping->date_create = $now;
-					$bookkeeping->doc_type = 'supplier_invoice';
-					$bookkeeping->fk_doc = $key;
-					$bookkeeping->fk_docdet = $val["fk_facturefourndet"];
-					$bookkeeping->code_tiers = '';
-					$bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $accountingaccount->label;
-					$bookkeeping->numero_compte = $k;
-					$bookkeeping->montant = $mt;
-					$bookkeeping->sens = ($mt < 0) ? 'C' : 'D';
-					$bookkeeping->debit = ($mt > 0) ? $mt : 0;
-					$bookkeeping->credit = ($mt <= 0) ? $mt : 0;
-					$bookkeeping->code_journal = $conf->global->ACCOUNTING_PURCHASE_JOURNAL;
-					$bookkeeping->fk_user_author = $user->id;
-
-					$result = $bookkeeping->create($user);
-					if ($result < 0) {
-						$error++;
-						$errorforline++;
-						setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
-					}
-				}
-			}
-		}
-
+        if (! $errorforline)
+        {
+            foreach ( $tabht[$key] as $k => $mt ) {
+    			$accountingaccount = new AccountingAccount($db);
+    			$accountingaccount->fetch(null, $k, true);
+    			if ($mt) {
+    				// get compte id and label
+    				$accountingaccount = new AccountingAccount($db);
+    				if ($accountingaccount->fetch(null, $k, true)) {
+    					$bookkeeping = new BookKeeping($db);
+    					$bookkeeping->doc_date = $val["date"];
+    					$bookkeeping->doc_ref = $val["ref"];
+    					$bookkeeping->date_create = $now;
+    					$bookkeeping->doc_type = 'supplier_invoice';
+    					$bookkeeping->fk_doc = $key;
+    					$bookkeeping->fk_docdet = 0;    // Useless, can be several lines that are source of this record to add
+    					$bookkeeping->code_tiers = '';
+    					$bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $accountingaccount->label;
+    					$bookkeeping->numero_compte = $k;
+    					$bookkeeping->montant = $mt;
+    					$bookkeeping->sens = ($mt < 0) ? 'C' : 'D';
+    					$bookkeeping->debit = ($mt > 0) ? $mt : 0;
+    					$bookkeeping->credit = ($mt <= 0) ? $mt : 0;
+    					$bookkeeping->code_journal = $conf->global->ACCOUNTING_PURCHASE_JOURNAL;
+    					$bookkeeping->fk_user_author = $user->id;
+    
+    					$result = $bookkeeping->create($user);
+    					if ($result < 0) {
+    					    if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
+            			    {
+            			        $error++;
+            			        $errorforline++;
+            			        //setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
+            			    }
+            			    else
+            			    {
+            			        $error++;
+            			        $errorforline++;
+            			        setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
+            			    }
+    					}
+    				}
+    			}
+    		}
+        }
+        
 		// VAT
 		// var_dump($tabtva);
-		foreach ( $tabtva[$key] as $k => $mt ) {
-			if ($mt) {
-				// get compte id and label
-				$bookkeeping = new BookKeeping($db);
-				$bookkeeping->doc_date = $val["date"];
-				$bookkeeping->doc_ref = $val["ref"];
-				$bookkeeping->date_create = $now;
-				$bookkeeping->doc_type = 'supplier_invoice';
-				$bookkeeping->fk_doc = $key;
-				$bookkeeping->fk_docdet = $val["fk_facturefourndet"];
-				$bookkeeping->code_tiers = '';
-				$bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $langs->trans("VAT"). ' '.$def_tva[$key];
-				$bookkeeping->numero_compte = $k;
-				$bookkeeping->montant = $mt;
-				$bookkeeping->sens = ($mt < 0) ? 'C' : 'D';
-				$bookkeeping->debit = ($mt > 0) ? $mt : 0;
-				$bookkeeping->credit = ($mt <= 0) ? $mt : 0;
-				$bookkeeping->code_journal = $conf->global->ACCOUNTING_PURCHASE_JOURNAL;
-				$bookkeeping->fk_user_author = $user->id;
-
-				$result = $bookkeeping->create($user);
-				if ($result < 0) {
-					$error++;
-					$errorforline++;
-					setEventMessages($object->error, $object->errors, 'errors');
-				}
-			}
-		}
-		
-
+        if (! $errorforline)
+        {
+            foreach ( $tabtva[$key] as $k => $mt ) {
+    			if ($mt) {
+    				// get compte id and label
+    				$bookkeeping = new BookKeeping($db);
+    				$bookkeeping->doc_date = $val["date"];
+    				$bookkeeping->doc_ref = $val["ref"];
+    				$bookkeeping->date_create = $now;
+    				$bookkeeping->doc_type = 'supplier_invoice';
+    				$bookkeeping->fk_doc = $key;
+    				$bookkeeping->fk_docdet = 0;    // Useless, can be several lines that are source of this record to add
+    				$bookkeeping->code_tiers = '';
+    				$bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $langs->trans("VAT"). ' '.$def_tva[$key];
+    				$bookkeeping->numero_compte = $k;
+    				$bookkeeping->montant = $mt;
+    				$bookkeeping->sens = ($mt < 0) ? 'C' : 'D';
+    				$bookkeeping->debit = ($mt > 0) ? $mt : 0;
+    				$bookkeeping->credit = ($mt <= 0) ? $mt : 0;
+    				$bookkeeping->code_journal = $conf->global->ACCOUNTING_PURCHASE_JOURNAL;
+    				$bookkeeping->fk_user_author = $user->id;
+    
+    				$result = $bookkeeping->create($user);
+    				if ($result < 0) {
+    				    if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
+    				    {
+    				        $error++;
+    				        $errorforline++;
+    				        //setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
+    				    }
+    				    else
+    				    {
+    				        $error++;
+    				        $errorforline++;
+    				        setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
+    				    }
+    				}
+    			}
+    		}
+        }
 
 		if (! $errorforline)
 		{
@@ -319,7 +364,7 @@ $form = new Form($db);
 $companystatic = new Fournisseur($db);
 
 // Export
-if ($action == 'export_csv') {
+/*if ($action == 'export_csv') {
 	$sep = $conf->global->ACCOUNTING_EXPORT_SEPARATORCSV;
 	$journal = $conf->global->ACCOUNTING_PURCHASE_JOURNAL;
 
@@ -437,6 +482,7 @@ if ($action == 'export_csv') {
 		}
 	}
 }
+*/
 
 if (empty($action) || $action == 'view') {
 
@@ -456,18 +502,19 @@ if (empty($action) || $action == 'view') {
 	}
 
 	$period = $form->select_date($date_start, 'date_start', 0, 0, 0, '', 1, 0, 1) . ' - ' . $form->select_date($date_end, 'date_end', 0, 0, 0, '', 1, 0, 1);
-	report_header($nom, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, array (
-			'action' => ''
-	));
+	
+	journalHead($nom, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, array('action' => ''));
 
-	if ($conf->global->ACCOUNTING_EXPORT_MODELCSV != 1 && $conf->global->ACCOUNTING_EXPORT_MODELCSV != 2) {
+	/*if ($conf->global->ACCOUNTING_EXPORT_MODELCSV != 1 && $conf->global->ACCOUNTING_EXPORT_MODELCSV != 2) {
 		print '<input type="button" class="butActionRefused" style="float: right;" value="' . $langs->trans("Export") . '" disabled="disabled" title="' . $langs->trans('ExportNotSupported') . '"/>';
 	} else {
 		print '<input type="button" class="butAction" style="float: right;" value="' . $langs->trans("Export") . '" onclick="launch_export();" />';
-	}
+	}*/
 
+    print '<div class="tabsAction">';
 	print '<input type="button" class="butAction" value="' . $langs->trans("WriteBookKeeping") . '" onclick="writebookkeeping();" />';
-
+    print '</div>';
+    
 	print '
 	<script type="text/javascript">
 		function launch_export() {
@@ -485,7 +532,7 @@ if (empty($action) || $action == 'view') {
 	/*
 	 * Show result array
 	 */
-	print '<br><br>';
+	print '<br>';
 
 	$i = 0;
 	print "<table class=\"noborder\" width=\"100%\">";
@@ -562,11 +609,11 @@ if (empty($action) || $action == 'view') {
 				print "</tr>";
 			}
 		}
-		print '<tr class="oddeven">';
 
 		// Third party
 		foreach ( $tabttc[$key] as $k => $mt ) {
-			print "<td><!-- Thirdparty --></td>";
+		    print '<tr class="oddeven">';
+		    print "<td><!-- Thirdparty --></td>";
 		    print "<td>" . $date . "</td>";
 			print "<td>" . $invoicestatic->getNomUrl(1) . "</td>";
 			$companystatic->id = $tabcompany[$key]['id'];
@@ -585,8 +632,8 @@ if (empty($action) || $action == 'view') {
 			// print "</td>";
 			print '<td align="right">' . ($mt < 0 ? - price(- $mt) : '') . "</td>";
 			print '<td align="right">' . ($mt >= 0 ? price($mt) : '') . "</td>";
+		    print "</tr>";
 		}
-		print "</tr>";
 	}
 
 	print "</table>";
diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php
index 235af8eeb41..b16c71d2f7b 100644
--- a/htdocs/accountancy/journal/sellsjournal.php
+++ b/htdocs/accountancy/journal/sellsjournal.php
@@ -100,7 +100,7 @@ $sql .= " JOIN " . MAIN_DB_PREFIX . "societe as s ON s.rowid = f.fk_soc";
 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_tva as ct ON fd.tva_tx = ct.taux AND ct.fk_pays = '" . $idpays . "'";
 $sql .= " WHERE fd.fk_code_ventilation > 0";
 $sql .= " AND f.entity IN (".getEntity('facture', 0).')';    // We don't share object for accountancy
-$sql .= " AND f.fk_statut > 0";
+$sql .= " AND f.fk_statut > 0"; // TODO Facture annulée ?
 if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
     $sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_REPLACEMENT . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_SITUATION . ")";
 } else {
@@ -124,10 +124,12 @@ if ($result) {
     $num = $db->num_rows($result);
     $i = 0;
 
+    $cptcli = (! empty($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER)) ? $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER : $langs->trans("CodeNotDef");
+    
     while ( $i < $num ) {
         $obj = $db->fetch_object($result);
+        
         // les variables
-        $cptcli = (! empty($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER)) ? $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER : $langs->trans("CodeNotDef");
         $compta_soc = (! empty($obj->code_compta)) ? $obj->code_compta : $cptcli;
 
         $compta_prod = $obj->compte;
@@ -164,23 +166,24 @@ if ($result) {
         $tabfac[$obj->rowid]["ref"] = $obj->facnumber;
         $tabfac[$obj->rowid]["type"] = $obj->type;
         $tabfac[$obj->rowid]["description"] = $obj->label_compte;
-        $tabfac[$obj->rowid]["fk_facturedet"] = $obj->fdid;
-        if (! isset($tabttc[$obj->rowid][$compta_soc]))
-            $tabttc[$obj->rowid][$compta_soc] = 0;
-            if (! isset($tabht[$obj->rowid][$compta_prod]))
-                $tabht[$obj->rowid][$compta_prod] = 0;
-                if (! isset($tabtva[$obj->rowid][$compta_tva]))
-                    $tabtva[$obj->rowid][$compta_tva] = 0;
-                    $tabttc[$obj->rowid][$compta_soc] += $obj->total_ttc * $situation_ratio;
-                    $tabht[$obj->rowid][$compta_prod] += $obj->total_ht * $situation_ratio;
-                    $tabtva[$obj->rowid][$compta_tva] += $obj->total_tva * $situation_ratio;
-                    $tabcompany[$obj->rowid] = array (
-                        'id' => $obj->socid,
-                        'name' => $obj->name,
-                        'code_client' => $obj->code_compta
-                    );
+        //$tabfac[$obj->rowid]["fk_facturedet"] = $obj->fdid;
+       
+        // Avoid warnings
+        if (! isset($tabttc[$obj->rowid][$compta_soc])) $tabttc[$obj->rowid][$compta_soc] = 0;
+        if (! isset($tabht[$obj->rowid][$compta_prod])) $tabht[$obj->rowid][$compta_prod] = 0;
+        if (! isset($tabtva[$obj->rowid][$compta_tva])) $tabtva[$obj->rowid][$compta_tva] = 0;
 
-                    $i ++;
+        $tabttc[$obj->rowid][$compta_soc] += $obj->total_ttc * $situation_ratio;
+        $tabht[$obj->rowid][$compta_prod] += $obj->total_ht * $situation_ratio;
+        $tabtva[$obj->rowid][$compta_tva] += $obj->total_tva * $situation_ratio;
+        $tabcompany[$obj->rowid] = array (
+            'id' => $obj->socid,
+            'name' => $obj->name,
+            'code_client' => $obj->code_client,
+            'code_compta' => $compta_soc
+        );
+
+        $i ++;
     }
 } else {
     dol_print_error($db);
@@ -191,7 +194,7 @@ if ($action == 'writebookkeeping') {
     $now = dol_now();
     $error = 0;
 
-    foreach ( $tabfac as $key => $val ) {
+    foreach ( $tabfac as $key => $val ) {   // Loop on each invoice
          
         $errorforline = 0;
 
@@ -211,97 +214,135 @@ if ($action == 'writebookkeeping') {
         $invoicestatic->id = $key;
         $invoicestatic->ref = (string) $val["ref"];
 
-        foreach ( $tabttc[$key] as $k => $mt ) {
-            $bookkeeping = new BookKeeping($db);
-            $bookkeeping->doc_date = $val["date"];
-            $bookkeeping->doc_ref = $val["ref"];
-            $bookkeeping->date_create = $now;
-            $bookkeeping->doc_type = 'customer_invoice';
-            $bookkeeping->fk_doc = $key;
-            $bookkeeping->fk_docdet = $val["fk_facturedet"];
-            $bookkeeping->code_tiers = $tabcompany[$key]['code_client'];
-            $bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER;
-            // $bookkeeping->label_compte = $tabcompany[$key]['name'];
-            $bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("Code_tiers");
-            $bookkeeping->montant = $mt;
-            $bookkeeping->sens = ($mt >= 0) ? 'D' : 'C';
-            $bookkeeping->debit = ($mt >= 0) ? $mt : 0;
-            $bookkeeping->credit = ($mt < 0) ? $mt : 0;
-            $bookkeeping->code_journal = $conf->global->ACCOUNTING_SELL_JOURNAL;
-            $bookkeeping->fk_user_author = $user->id;
-
-            $result = $bookkeeping->create($user);
-            if ($result < 0) {
-                $error++;
-                $errorforline++;
-                setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
-            }
-        }
-
-        // Product / Service
-        foreach ( $tabht[$key] as $k => $mt ) {
-            if ($mt) {
-                // get compte id and label
-                $accountingaccount = new AccountingAccount($db);
-                if ($accountingaccount->fetch(null, $k, true)) {
+        // Thirdparty
+        if (! $errorforline)
+        {
+            foreach ( $tabttc[$key] as $k => $mt ) {
+                if ($mt) {
                     $bookkeeping = new BookKeeping($db);
                     $bookkeeping->doc_date = $val["date"];
                     $bookkeeping->doc_ref = $val["ref"];
                     $bookkeeping->date_create = $now;
                     $bookkeeping->doc_type = 'customer_invoice';
                     $bookkeeping->fk_doc = $key;
-                    $bookkeeping->fk_docdet = $val["fk_facturedet"];
+                    $bookkeeping->fk_docdet = 0;    // Useless, can be several lines that are source of this record to add
+                    $bookkeeping->code_tiers = $tabcompany[$key]['code_client'];
+                    $bookkeeping->numero_compte = $tabcompany[$key]['code_compta'];
+                    // $bookkeeping->label_compte = $tabcompany[$key]['name'];
+                    $bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("Code_tiers");
+                    $bookkeeping->montant = $mt;
+                    $bookkeeping->sens = ($mt >= 0) ? 'D' : 'C';
+                    $bookkeeping->debit = ($mt >= 0) ? $mt : 0;
+                    $bookkeeping->credit = ($mt < 0) ? $mt : 0;
+                    $bookkeeping->code_journal = $conf->global->ACCOUNTING_SELL_JOURNAL;
+                    $bookkeeping->fk_user_author = $user->id;
+    
+                    $result = $bookkeeping->create($user);
+           			if ($result < 0) {
+                        if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
+                        {
+                            $error++;
+                            $errorforline++;
+                            //setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
+                        }
+                        else
+                        {
+                            $error++;
+                            $errorforline++;
+                            setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
+                        }
+        			}
+                }
+            }
+        }
+        
+        // Product / Service
+        if (! $errorforline)
+        {
+            foreach ( $tabht[$key] as $k => $mt ) {
+                if ($mt) {
+                    // get compte id and label
+                    $accountingaccount = new AccountingAccount($db);
+                    if ($accountingaccount->fetch(null, $k, true)) {
+                        $bookkeeping = new BookKeeping($db);
+                        $bookkeeping->doc_date = $val["date"];
+                        $bookkeeping->doc_ref = $val["ref"];
+                        $bookkeeping->date_create = $now;
+                        $bookkeeping->doc_type = 'customer_invoice';
+                        $bookkeeping->fk_doc = $key;
+                        $bookkeeping->fk_docdet = 0;    // Useless, can be several lines that are source of this record to add;
+                        $bookkeeping->code_tiers = '';
+                        $bookkeeping->numero_compte = $k;
+                        $bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $accountingaccount->label;
+                        $bookkeeping->montant = $mt;
+                        $bookkeeping->sens = ($mt < 0) ? 'D' : 'C';
+                        $bookkeeping->debit = ($mt < 0) ? $mt : 0;
+                        $bookkeeping->credit = ($mt >= 0) ? $mt : 0;
+                        $bookkeeping->code_journal = $conf->global->ACCOUNTING_SELL_JOURNAL;
+                        $bookkeeping->fk_user_author = $user->id;
+    
+                        $result = $bookkeeping->create($user);
+            			if ($result < 0) {
+                            if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
+                            {
+                                $error++;
+                                $errorforline++;
+                                //setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
+                            }
+                            else
+                            {
+                                $error++;
+                                $errorforline++;
+                                setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
+                            }
+            			}                        
+                    }
+                }
+            }
+        }
+        
+        // VAT
+        // var_dump($tabtva);
+        if (! $errorforline)
+        {
+            foreach ( $tabtva[$key] as $k => $mt ) {
+                if ($mt) {
+                    $bookkeeping = new BookKeeping($db);
+                    $bookkeeping->doc_date = $val["date"];
+                    $bookkeeping->doc_ref = $val["ref"];
+                    $bookkeeping->date_create = $now;
+                    $bookkeeping->doc_type = 'customer_invoice';
+                    $bookkeeping->fk_doc = $key;
+                    $bookkeeping->fk_docdet = 0;    // Useless, can be several lines that are source of this record to add
                     $bookkeeping->code_tiers = '';
                     $bookkeeping->numero_compte = $k;
-                    $bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $accountingaccount->label;
+                    $bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("VAT").' '.$def_tva[$key];
                     $bookkeeping->montant = $mt;
                     $bookkeeping->sens = ($mt < 0) ? 'D' : 'C';
                     $bookkeeping->debit = ($mt < 0) ? $mt : 0;
                     $bookkeeping->credit = ($mt >= 0) ? $mt : 0;
                     $bookkeeping->code_journal = $conf->global->ACCOUNTING_SELL_JOURNAL;
                     $bookkeeping->fk_user_author = $user->id;
-
+    
                     $result = $bookkeeping->create($user);
                     if ($result < 0) {
-                        $error++;
-                        $errorforline++;
-                        setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
+           			    if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
+        			    {
+        			        $error++;
+        			        $errorforline++;
+        			        //setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
+        			    }
+        			    else
+        			    {
+        			        $error++;
+        			        $errorforline++;
+        			        setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
+        			    }
                     }
                 }
             }
         }
 
-        // VAT
-        // var_dump($tabtva);
-        foreach ( $tabtva[$key] as $k => $mt ) {
-            if ($mt) {
-                $bookkeeping = new BookKeeping($db);
-                $bookkeeping->doc_date = $val["date"];
-                $bookkeeping->doc_ref = $val["ref"];
-                $bookkeeping->date_create = $now;
-                $bookkeeping->doc_type = 'customer_invoice';
-                $bookkeeping->fk_doc = $key;
-                $bookkeeping->fk_docdet = $val["fk_facturedet"];
-                $bookkeeping->code_tiers = '';
-                $bookkeeping->numero_compte = $k;
-                $bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("VAT").' '.$def_tva[$key];
-                $bookkeeping->montant = $mt;
-                $bookkeeping->sens = ($mt < 0) ? 'D' : 'C';
-                $bookkeeping->debit = ($mt < 0) ? $mt : 0;
-                $bookkeeping->credit = ($mt >= 0) ? $mt : 0;
-                $bookkeeping->code_journal = $conf->global->ACCOUNTING_SELL_JOURNAL;
-                $bookkeeping->fk_user_author = $user->id;
-
-                $result = $bookkeeping->create($user);
-                if ($result < 0) {
-                    $error++;
-                    $errorforline++;
-                    setEventMessages($object->error, $object->errors, 'errors');
-                }
-            }
-        }
-
-
         if (! $errorforline)
         {
             $db->commit();
@@ -337,7 +378,7 @@ if ($action == 'writebookkeeping') {
 $form = new Form($db);
 
 // Export
-if ($action == 'export_csv') {
+/*if ($action == 'export_csv') {
 
     $sep = $conf->global->ACCOUNTING_EXPORT_SEPARATORCSV;
     $sell_journal = $conf->global->ACCOUNTING_SELL_JOURNAL;
@@ -457,6 +498,7 @@ if ($action == 'export_csv') {
         }
     }
 }
+*/
 
 if (empty($action) || $action == 'view') {
 
@@ -474,18 +516,18 @@ if (empty($action) || $action == 'view') {
 	else
 		$description .= $langs->trans("DepositsAreIncluded");
 	$period = $form->select_date($date_start, 'date_start', 0, 0, 0, '', 1, 0, 1) . ' - ' . $form->select_date($date_end, 'date_end', 0, 0, 0, '', 1, 0, 1);
-	report_header($nom, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, array (
-			'action' => ''
-	));
+	
+	journalHead($nom, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, array('action' => ''));
 
-	if ($conf->global->ACCOUNTING_EXPORT_MODELCSV != 1 && $conf->global->ACCOUNTING_EXPORT_MODELCSV != 2) {
+	/*if ($conf->global->ACCOUNTING_EXPORT_MODELCSV != 1 && $conf->global->ACCOUNTING_EXPORT_MODELCSV != 2) {
 		print '<input type="button" class="butActionRefused" style="float: right;" value="' . $langs->trans("Export") . '" disabled="disabled" title="' . $langs->trans('ExportNotSupported') . '"/>';
 	} else {
 		print '<input type="button" class="butAction" style="float: right;" value="' . $langs->trans("Export") . '" onclick="launch_export();" />';
-	}
-
+	}*/
+    print '<div class="tabsAction">';
 	print '<input type="button" class="butAction" value="' . $langs->trans("WriteBookKeeping") . '" onclick="writebookkeeping();" />';
-
+    print '</div>';
+    
 	print '
 	<script type="text/javascript">
 		function launch_export() {
@@ -503,7 +545,7 @@ if (empty($action) || $action == 'view') {
 	/*
 	 * Show result array
 	 */
-	print '<br><br>';
+	print '<br>';
 
 	$i = 0;
 	print "<table class=\"noborder\" width=\"100%\">";
@@ -552,8 +594,8 @@ if (empty($action) || $action == 'view') {
 			print "<td>" . $companystatic->getNomUrl(0, 'customer', 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("Code_tiers") . "</td>";
 			print "</td><td align='right'>" . ($mt >= 0 ? price($mt) : '') . "</td>";
 			print "<td align='right'>" . ($mt < 0 ? price(- $mt) : '') . "</td>";
+		    print "</tr>";
 		}
-		print "</tr>";
 
 		// Product / Service
 		foreach ( $tabht[$key] as $k => $mt ) {
diff --git a/htdocs/accountancy/supplier/lines.php b/htdocs/accountancy/supplier/lines.php
index 1f0d06fbec6..09cf552c7bb 100644
--- a/htdocs/accountancy/supplier/lines.php
+++ b/htdocs/accountancy/supplier/lines.php
@@ -44,6 +44,7 @@ $langs->load("productbatch");
 $account_parent = GETPOST('account_parent');
 $changeaccount = GETPOST('changeaccount');
 // Search Getpost
+$search_lineid = GETPOST('search_lineid', 'int');
 $search_ref = GETPOST('search_ref', 'alpha');
 $search_invoice = GETPOST('search_invoice', 'alpha');
 $search_label = GETPOST('search_label', 'alpha');
@@ -85,6 +86,7 @@ $formventilation = new FormVentilation($db);
 // Purge search criteria
 if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // All tests are required to be compatible with all browsers
 {
+    $search_lineid = '';
 	$search_ref = '';
 	$search_invoice = '';
 	$search_label = '';
@@ -148,7 +150,7 @@ print '<script type="text/javascript">
  * Supplier Invoice lines
  */
 $sql = "SELECT f.rowid as facid, f.ref as facnumber, f.ref_supplier, f.libelle as invoice_label, f.datef,";
-$sql.= " l.fk_product, l.description, l.total_ht , l.qty, l.rowid, l.tva_tx, aa.label, aa.account_number, ";
+$sql.= " l.rowid, l.fk_product, l.description, l.total_ht , l.qty, l.tva_tx, aa.label, aa.account_number, ";
 $sql.= " p.rowid as product_id, p.ref as product_ref, p.label as product_label, p.fk_product_type as type";
 $sql.= " FROM " . MAIN_DB_PREFIX . "facture_fourn as f";
 $sql.= " , " . MAIN_DB_PREFIX . "accounting_account as aa";
@@ -156,6 +158,9 @@ $sql.= " , " . MAIN_DB_PREFIX . "facture_fourn_det as l";
 $sql.= " LEFT JOIN " . MAIN_DB_PREFIX . "product as p ON p.rowid = l.fk_product";
 $sql.= " WHERE f.rowid = l.fk_facture_fourn and f.fk_statut >= 1 AND l.fk_code_ventilation <> 0 ";
 $sql.= " AND aa.rowid = l.fk_code_ventilation";
+if ($search_lineid) {
+    $sql .= natural_search("l.rowid", $search_lineid, 1);
+}
 if (strlen(trim($search_invoice))) {
 	$sql .= natural_search("f.ref", $search_invoice);
 }
@@ -240,7 +245,7 @@ if ($result) {
 	print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
 	
 	print '<tr class="liste_titre_filter">';
-    print '<td class="liste_titre"></td>';
+	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_lineid" value="' . dol_escape_htmltag($search_lineid) . '""></td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_invoice" value="' . dol_escape_htmltag($search_invoice) . '"></td>';
 	print '<td class="liste_titre"></td>';
 	print '<td class="liste_titre"></td>';
diff --git a/htdocs/accountancy/supplier/list.php b/htdocs/accountancy/supplier/list.php
index beae148c01b..e702aa8add8 100644
--- a/htdocs/accountancy/supplier/list.php
+++ b/htdocs/accountancy/supplier/list.php
@@ -52,6 +52,7 @@ $toselect = GETPOST('toselect', 'array');
 $mesCasesCochees = GETPOST('toselect', 'array');
 
 // Search Getpost
+$search_lineid = GETPOST('search_lineid', 'int');
 $search_invoice = GETPOST('search_invoice', 'alpha');
 $search_ref = GETPOST('search_ref', 'alpha');
 $search_label = GETPOST('search_label', 'alpha');
@@ -101,6 +102,7 @@ if (! GETPOST('confirmmassaction') && $massaction != 'presend' && $massaction !=
 // Purge search criteria
 if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // All test are required to be compatible with all browsers
 {
+    $search_lineid = '';
     $search_ref = '';
     $search_invoice = '';    
     $search_label = '';
@@ -179,7 +181,7 @@ llxHeader('', $langs->trans("SuppliersVentilation"));
 
 // Supplier Invoice Lines
 $sql = "SELECT f.rowid as facid, f.ref, f.ref_supplier, f.libelle as invoice_label, f.datef,";
-$sql.= " l.fk_product, l.description, l.total_ht as price, l.rowid, l.fk_code_ventilation, l.product_type as type_l, l.tva_tx as tva_tx_line, ";
+$sql.= " l.rowid, l.fk_product, l.description, l.total_ht as price, l.fk_code_ventilation, l.product_type as type_l, l.tva_tx as tva_tx_line, ";
 $sql.= " p.rowid as product_id, p.ref as product_ref, p.label as product_label, p.fk_product_type as type, p.accountancy_code_buy as code_buy, p.tva_tx as tva_tx_prod,";
 $sql.= " aa.rowid as aarowid";
 $sql.= " FROM " . MAIN_DB_PREFIX . "facture_fourn as f";
@@ -191,6 +193,9 @@ $sql.= " WHERE f.fk_statut > 0 AND l.fk_code_ventilation <= 0";
 $sql.= " AND product_type <= 2";
 $sql.= " AND (accsys.rowid='" . $conf->global->CHARTOFACCOUNTS . "' OR p.accountancy_code_buy IS NULL OR p.accountancy_code_buy ='')";
 // Add search filter like
+if ($search_lineid) {
+    $sql .= natural_search("l.rowid", $search_lineid, 1);
+}
 if (strlen(trim($search_invoice))) {
     $sql .= natural_search("f.ref",$search_invoice);
 }
@@ -272,7 +277,7 @@ if ($result) {
 
 	// We add search filter
 	print '<tr class="liste_titre_filter">';
-	print '<td class="liste_titre"></td>';
+	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_lineid" value="' . dol_escape_htmltag($search_lineid) . '""></td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_invoice" value="' . dol_escape_htmltag($search_invoice) . '"></td>';
 	print '<td class="liste_titre"></td>';
 	print '<td class="liste_titre"></td>';
diff --git a/htdocs/core/lib/accounting.lib.php b/htdocs/core/lib/accounting.lib.php
index 56fdc8e6de9..dc112cc4e33 100644
--- a/htdocs/core/lib/accounting.lib.php
+++ b/htdocs/core/lib/accounting.lib.php
@@ -202,3 +202,95 @@ function length_accounta($accounta)
 		return $accounta;
 	}
 }
+
+
+
+/**
+ *	Show header of a VAT report
+ *
+ *	@param	string				$nom            Name of report
+ *	@param 	string				$variante       Link for alternate report
+ *	@param 	string				$period         Period of report
+ *	@param 	string				$periodlink     Link to switch period
+ *	@param 	string				$description    Description
+ *	@param 	timestamp|integer	$builddate      Date generation
+ *	@param 	string				$exportlink     Link for export or ''
+ *	@param	array				$moreparam		Array with list of params to add into form
+ *	@param	string				$calcmode		Calculation mode
+ *  @param  string              $varlink        Add a variable into the address of the page
+ *	@return	void
+ */
+function journalHead($nom,$variante,$period,$periodlink,$description,$builddate,$exportlink='',$moreparam=array(),$calcmode='', $varlink='')
+{
+    global $langs;
+
+    if (empty($hselected)) $hselected='report';
+
+    print "\n\n<!-- debut cartouche journal -->\n";
+
+    if(! empty($varlink)) $varlink = '?'.$varlink;
+
+    $h=0;
+    $head[$h][0] = $_SERVER["PHP_SELF"].$varlink;
+    $head[$h][1] = $langs->trans("Journal");
+    $head[$h][2] = 'journal';
+
+    dol_fiche_head($head, 'journal');
+
+    print '<form method="POST" action="'.$_SERVER["PHP_SELF"].$varlink.'">';
+    foreach($moreparam as $key => $value)
+    {
+        print '<input type="hidden" name="'.$key.'" value="'.$value.'">';
+    }
+    print '<table width="100%" class="border">';
+
+    // Ligne de titre
+    print '<tr>';
+    print '<td width="110">'.$langs->trans("Name").'</td>';
+    if (! $variantexxx) print '<td colspan="3">';
+    else print '<td>';
+    print $nom;
+    if ($variantexxx) print '</td><td colspan="2">'.$variantexxx;
+    print '</td>';
+    print '</tr>';
+
+    // Calculation mode
+    if ($calcmode)
+    {
+        print '<tr>';
+        print '<td width="110">'.$langs->trans("CalculationMode").'</td>';
+        if (! $variante) print '<td colspan="3">';
+        else print '<td>';
+        print $calcmode;
+        if ($variante) print '</td><td colspan="2">'.$variante;
+        print '</td>';
+        print '</tr>';
+    }
+
+    // Ligne de la periode d'analyse du rapport
+    print '<tr>';
+    print '<td>'.$langs->trans("ReportPeriod").'</td>';
+    if (! $periodlink) print '<td colspan="3">';
+    else print '<td>';
+    if ($period) print $period;
+    if ($periodlink) print '</td><td colspan="2">'.$periodlink;
+    print '</td>';
+    print '</tr>';
+
+    // Ligne de description
+    print '<tr>';
+    print '<td>'.$langs->trans("ReportDescription").'</td>';
+    print '<td colspan="3">'.$description.'</td>';
+    print '</tr>';
+
+    print '</table>';
+
+    print '<br><div class="center"><input type="submit" class="button" name="submit" value="'.$langs->trans("Refresh").'"></div>';
+
+    print '</form>';
+
+    dol_fiche_end();
+
+    print "\n<!-- fin cartouche journal -->\n\n";
+}
+
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 0d54593f0db..2620a3b3efc 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3328,7 +3328,7 @@ function load_fiche_titre($titre, $morehtmlright='', $picto='title_generic.png',
 
 	$return.= "\n";
 	$return.= '<table '.($id?'id="'.$id.'" ':'').'summary="" class="centpercent notopnoleftnoright'.($morecssontable?' '.$morecssontable:'').'" style="margin-bottom: 2px;"><tr>';
-	if ($picto) $return.= '<td class="nobordernopadding widthpictotitle" valign="middle">'.img_picto('',$picto, 'id="pictotitle"', $pictoisfullpath).'</td>';
+	if ($picto) $return.= '<td class="nobordernopadding widthpictotitle" valign="middle">'.img_picto('',$picto, 'class="valignmiddle" id="pictotitle"', $pictoisfullpath).'</td>';
 	$return.= '<td class="nobordernopadding" valign="middle">';
 	$return.= '<div class="titre">'.$titre.'</div>';
 	$return.= '</td>';

From 8ec44615cdd4b328e36aae62c47f4dae5bf97986 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 29 Apr 2017 14:54:21 +0200
Subject: [PATCH 127/505] FIX serious bugs in accounting (error management,
 transactions, bad values set)

---
 htdocs/core/lib/report.lib.php      | 28 ++++++++++++++--------------
 htdocs/langs/en_US/accountancy.lang |  4 ++--
 htdocs/langs/en_US/errors.lang      |  3 ++-
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/htdocs/core/lib/report.lib.php b/htdocs/core/lib/report.lib.php
index f58aa180d88..2c13485d0e9 100644
--- a/htdocs/core/lib/report.lib.php
+++ b/htdocs/core/lib/report.lib.php
@@ -24,20 +24,20 @@
 
 
 /**
-*	Show header of a VAT report
-*
-*	@param	string				$nom            Name of report
-*	@param 	string				$variante       Link for alternate report
-*	@param 	string				$period         Period of report
-*	@param 	string				$periodlink     Link to switch period
-*	@param 	string				$description    Description
-*	@param 	timestamp|integer	$builddate      Date generation
-*	@param 	string				$exportlink     Link for export or ''
-*	@param	array				$moreparam		Array with list of params to add into form
-*	@param	string				$calcmode		Calculation mode
-*   @param  string              $varlink        Add a variable into the address of the page
-*	@return	void
-*/
+ *	Show header of a VAT report
+ *
+ *	@param	string				$nom            Name of report
+ *	@param 	string				$variante       Link for alternate report
+ *	@param 	string				$period         Period of report
+ *	@param 	string				$periodlink     Link to switch period
+ *	@param 	string				$description    Description
+ *	@param 	timestamp|integer	$builddate      Date generation
+ *	@param 	string				$exportlink     Link for export or ''
+ *	@param	array				$moreparam		Array with list of params to add into form
+ *	@param	string				$calcmode		Calculation mode
+ *   @param  string              $varlink        Add a variable into the address of the page
+ *	@return	void
+ */
 function report_header($nom,$variante,$period,$periodlink,$description,$builddate,$exportlink='',$moreparam=array(),$calcmode='', $varlink='')
 {
 	global $langs;
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index 57f220f943c..bd1e41c5464 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -189,8 +189,8 @@ ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting accoun
 MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
 FicheVentilation=Binding card
 GeneralLedgerIsWritten=Transactions are written in the general ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
-NoNewRecordSaved=No new record saved
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
+NoNewRecordSaved=No new record dispatched
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
 
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index 8aeb8dab65c..4f700109c33 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -177,7 +177,8 @@ ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enough for product %s t
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enough for product %s to add it into a new proposal.
 ErrorFailedToLoadLoginFileForMode=Failed to get the login key for mode '%s'.
 ErrorModuleNotFound=File of module was not found.
-ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source bank line %s
+ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source line id %s (%s)
+ErrorFieldAccountNotDefinedForInvoiceLine=Value for Accounting account not defined for invoice id %s (%s)
 ErrorBankStatementNameMustFollowRegex=Error, bank statement name must follow the following syntax rule %s
 ErrorPhpMailDelivery=Check that you don't use a too high number of recipients and that your email content is not similar to a Spam. Ask also your administrator to check firewall and server logs files for a more complete information.
 ErrorUserNotAssignedToTask=User must be assigned to task to be able to enter time consumed.

From 983c72c91874e07ac232862d59e4505db330c337 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 29 Apr 2017 14:55:23 +0200
Subject: [PATCH 128/505] Look and feel v6

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

diff --git a/htdocs/user/param_ihm.php b/htdocs/user/param_ihm.php
index 473c06e7368..9ffeb05f280 100644
--- a/htdocs/user/param_ihm.php
+++ b/htdocs/user/param_ihm.php
@@ -181,7 +181,7 @@ if ($action == 'edit')
 
 if ($action == 'edit')
 {
-    dol_fiche_head($head, 'guisetup', $title, 0, 'user');
+    dol_fiche_head($head, 'guisetup', $title, -1, 'user');
 
 	$linkback = '';
 

From 04b1535b12e8ec2049b4a73a5a614f8642fdfbf3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 29 Apr 2017 14:59:40 +0200
Subject: [PATCH 129/505] FIX Found duplicate line when it is not.

---
 htdocs/accountancy/class/bookkeeping.class.php | 15 ++++++++++++---
 htdocs/langs/en_US/errors.lang                 |  6 ++++--
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index 754dd262369..8f31b40bc54 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -169,7 +169,15 @@ class BookKeeping extends CommonObject
 		if (empty($this->numero_compte) || $this->numero_compte == '-1')
 		{
 		    $langs->load("errors");
-            $this->errors[]=$langs->trans('ErrorFieldAccountNotDefinedForBankLine', $this->fk_docdet);		    
+            if (in_array($this->doc_type, array('bank', 'expense_report')))
+            {
+		        $this->errors[]=$langs->trans('ErrorFieldAccountNotDefinedForBankLine', $this->fk_docdet,  $this->doc_type);
+            }
+            else
+            {
+                $this->errors[]=$langs->trans('ErrorFieldAccountNotDefinedForInvoiceLine', $this->fk_doc,  $this->doc_type);		    
+            }
+		    
 		    return -1;
 		}
 		
@@ -178,11 +186,12 @@ class BookKeeping extends CommonObject
 		
 		$this->piece_num = 0;
 		
-		// first check if line not yet in bookkeeping
+		// First check if line not yet already in bookkeeping
 		$sql = "SELECT count(*) as nb";
 		$sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element;
 		$sql .= " WHERE doc_type = '" . $this->doc_type . "'";
-		$sql .= " AND fk_docdet = " . $this->fk_docdet;
+		$sql .= " AND fk_doc = " . $this->fk_doc;
+		$sql .= " AND fk_docdet = " . $this->fk_docdet;                   // This field can be 0 is record is for several lines 
 		$sql .= " AND numero_compte = '" . $this->numero_compte . "'";
 	    $sql .= " AND entity IN (" . getEntity("accountancy", 1) . ")";
 		
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index 72912ca2b1f..4f700109c33 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -11,6 +11,7 @@ ErrorLoginAlreadyExists=Login %s already exists.
 ErrorGroupAlreadyExists=Group %s already exists.
 ErrorRecordNotFound=Record not found.
 ErrorFailToCopyFile=Failed to copy file '<b>%s</b>' into '<b>%s</b>'.
+ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToRenameFile=Failed to rename file '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToDeleteFile=Failed to remove file '<b>%s</b>'.
 ErrorFailToCreateFile=Failed to create file '<b>%s</b>'.
@@ -115,7 +116,7 @@ ErrorNoActivatedBarcode=No barcode type activated
 ErrUnzipFails=Failed to unzip %s with ZipArchive
 ErrNoZipEngine=No engine to unzip %s file in this PHP
 ErrorFileMustBeADolibarrPackage=The file %s must be a Dolibarr zip package
-ErrorFileRequired=It takes a package Dolibarr file
+ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=The PHP CURL is not installed, this is essential to talk with Paypal
 ErrorFailedToAddToMailmanList=Failed to add record %s to Mailman list %s or SPIP base
 ErrorFailedToRemoveToMailmanList=Failed to remove record %s to Mailman list %s or SPIP base
@@ -176,7 +177,8 @@ ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enough for product %s t
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enough for product %s to add it into a new proposal.
 ErrorFailedToLoadLoginFileForMode=Failed to get the login key for mode '%s'.
 ErrorModuleNotFound=File of module was not found.
-ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source bank line %s
+ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source line id %s (%s)
+ErrorFieldAccountNotDefinedForInvoiceLine=Value for Accounting account not defined for invoice id %s (%s)
 ErrorBankStatementNameMustFollowRegex=Error, bank statement name must follow the following syntax rule %s
 ErrorPhpMailDelivery=Check that you don't use a too high number of recipients and that your email content is not similar to a Spam. Ask also your administrator to check firewall and server logs files for a more complete information.
 ErrorUserNotAssignedToTask=User must be assigned to task to be able to enter time consumed.

From c9bfb6e945e248d4953100378b0d40e48c6ba32f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 29 Apr 2017 15:04:15 +0200
Subject: [PATCH 130/505] FIX Several bugs in accounting module.

---
 .../accountancy/journal/purchasesjournal.php  | 259 ++++++++++--------
 htdocs/accountancy/journal/sellsjournal.php   | 240 +++++++++-------
 2 files changed, 293 insertions(+), 206 deletions(-)

diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php
index 9790d124d56..81b45c6f82e 100644
--- a/htdocs/accountancy/journal/purchasesjournal.php
+++ b/htdocs/accountancy/journal/purchasesjournal.php
@@ -109,6 +109,7 @@ dol_syslog('accountancy/journal/purchasesjournal.php:: $sql=' . $sql);
 $result = $db->query($sql);
 if ($result) {
 	$num = $db->num_rows($result);
+
 	// les variables
 	$cptfour = (! empty($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER)) ? $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER : $langs->trans("CodeNotDef");
 	$cpttva = (! empty($conf->global->ACCOUNTING_VAT_BUY_ACCOUNT)) ? $conf->global->ACCOUNTING_VAT_BUY_ACCOUNT : $langs->trans("CodeNotDef");
@@ -123,8 +124,10 @@ if ($result) {
 	$i = 0;
 	while ( $i < $num ) {
 		$obj = $db->fetch_object($result);
+
 		// contrôles
 		$compta_soc = (! empty($obj->code_compta_fournisseur)) ? $obj->code_compta_fournisseur : $cptfour;
+		
 		$compta_prod = $obj->compte;
 		if (empty($compta_prod)) {
 			if ($obj->product_type == 0)
@@ -144,14 +147,21 @@ if ($result) {
 
 		$tabfac[$obj->rowid]["type"] = $obj->type;
 		$tabfac[$obj->rowid]["description"] = $obj->description;
-		$tabfac[$obj->rowid]["fk_facturefourndet"] = $obj->fdid;
+		//$tabfac[$obj->rowid]["fk_facturefourndet"] = $obj->fdid;
+		
+        // Avoid warnings
+        if (! isset($tabttc[$obj->rowid][$compta_soc])) $tabttc[$obj->rowid][$compta_soc] = 0;
+        if (! isset($tabht[$obj->rowid][$compta_prod])) $tabht[$obj->rowid][$compta_prod] = 0;
+        if (! isset($tabtva[$obj->rowid][$compta_tva])) $tabtva[$obj->rowid][$compta_tva] = 0;
+
 		$tabttc[$obj->rowid][$compta_soc] += $obj->total_ttc;
 		$tabht[$obj->rowid][$compta_prod] += $obj->total_ht;
 		$tabtva[$obj->rowid][$compta_tva] += $obj->total_tva;
 		$tabcompany[$obj->rowid] = array (
 				'id' => $obj->socid,
 				'name' => $obj->name,
-				'code_fournisseur' => $obj->code_compta_fournisseur
+				'code_fournisseur' => $obj->code_fournisseur,
+				'code_compta_fournisseur' => $compta_soc
 		);
 
 		$i ++;
@@ -165,7 +175,7 @@ if ($action == 'writebookkeeping') {
 	$now = dol_now();
 	$error = 0;
 
-	foreach ($tabfac as $key => $val)
+	foreach ($tabfac as $key => $val)  // Loop on each invoice
 	{
 	    $errorforline = 0;
 	     
@@ -188,101 +198,136 @@ if ($action == 'writebookkeeping') {
 		$companystatic->code_fournisseur = $tabcompany[$key]['code_fournisseur'];
 		$companystatic->client = $tabcompany[$key]['code_client'];
 
-		foreach ( $tabttc[$key] as $k => $mt ) {
-			// get compte id and label
-
-			$bookkeeping = new BookKeeping($db);
-			$bookkeeping->doc_date = $val["date"];
-			$bookkeeping->doc_ref = $val["ref"];
-			$bookkeeping->date_create = $now;
-			$bookkeeping->doc_type = 'supplier_invoice';
-			$bookkeeping->fk_doc = $key;
-			$bookkeeping->fk_docdet = $val["fk_facturefourndet"];
-			$bookkeeping->code_tiers = $tabcompany[$key]['code_fournisseur'];
-			$bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $langs->trans("Code_tiers");
-			$bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER;
-			$bookkeeping->montant = $mt;
-			$bookkeeping->sens = ($mt >= 0) ? 'C' : 'D';
-			$bookkeeping->debit = ($mt <= 0) ? $mt : 0;
-			$bookkeeping->credit = ($mt > 0) ? $mt : 0;
-			$bookkeeping->code_journal = $conf->global->ACCOUNTING_PURCHASE_JOURNAL;
-			$bookkeeping->fk_user_author = $user->id;
-
-			$result = $bookkeeping->create($user);
-			if ($result < 0) {
-			    $error++;
-			    $errorforline++;
-			    setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
-			}
-		}
-
+        if (! $errorforline)
+        {
+    		foreach ( $tabttc[$key] as $k => $mt ) {
+    			// get compte id and label
+    		    if ($mt) {
+        			$bookkeeping = new BookKeeping($db);
+        			$bookkeeping->doc_date = $val["date"];
+        			$bookkeeping->doc_ref = $val["ref"];
+        			$bookkeeping->date_create = $now;
+        			$bookkeeping->doc_type = 'supplier_invoice';
+        			$bookkeeping->fk_doc = $key;
+        			$bookkeeping->fk_docdet = 0;    // Useless, can be several lines that are source of this record to add
+        			$bookkeeping->code_tiers = $tabcompany[$key]['code_fournisseur'];
+        			$bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $langs->trans("Code_tiers");
+        			$bookkeeping->numero_compte = $tabcompany[$key]['code_compta_fournisseur'];
+        			$bookkeeping->montant = $mt;
+        			$bookkeeping->sens = ($mt >= 0) ? 'C' : 'D';
+        			$bookkeeping->debit = ($mt <= 0) ? $mt : 0;
+        			$bookkeeping->credit = ($mt > 0) ? $mt : 0;
+        			$bookkeeping->code_journal = $conf->global->ACCOUNTING_PURCHASE_JOURNAL;
+        			$bookkeeping->fk_user_author = $user->id;
+        
+        			$result = $bookkeeping->create($user);
+           			if ($result < 0) {
+                        if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
+                        {
+                            $error++;
+                            $errorforline++;
+                            //setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
+                        }
+                        else
+                        {
+                            $error++;
+                            $errorforline++;
+                            setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
+                        }
+        			}
+    		    }
+    		}
+        }
+        
 		// Product / Service
-		foreach ( $tabht[$key] as $k => $mt ) {
-			$accountingaccount = new AccountingAccount($db);
-			$accountingaccount->fetch(null, $k, true);
-			if ($mt) {
-				// get compte id and label
-				$accountingaccount = new AccountingAccount($db);
-				if ($accountingaccount->fetch(null, $k, true)) {
-					$bookkeeping = new BookKeeping($db);
-					$bookkeeping->doc_date = $val["date"];
-					$bookkeeping->doc_ref = $val["ref"];
-					$bookkeeping->date_create = $now;
-					$bookkeeping->doc_type = 'supplier_invoice';
-					$bookkeeping->fk_doc = $key;
-					$bookkeeping->fk_docdet = $val["fk_facturefourndet"];
-					$bookkeeping->code_tiers = '';
-					$bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $accountingaccount->label;
-					$bookkeeping->numero_compte = $k;
-					$bookkeeping->montant = $mt;
-					$bookkeeping->sens = ($mt < 0) ? 'C' : 'D';
-					$bookkeeping->debit = ($mt > 0) ? $mt : 0;
-					$bookkeeping->credit = ($mt <= 0) ? $mt : 0;
-					$bookkeeping->code_journal = $conf->global->ACCOUNTING_PURCHASE_JOURNAL;
-					$bookkeeping->fk_user_author = $user->id;
-
-					$result = $bookkeeping->create($user);
-					if ($result < 0) {
-						$error++;
-						$errorforline++;
-						setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
-					}
-				}
-			}
-		}
-
+        if (! $errorforline)
+        {
+            foreach ( $tabht[$key] as $k => $mt ) {
+    			$accountingaccount = new AccountingAccount($db);
+    			$accountingaccount->fetch(null, $k, true);
+    			if ($mt) {
+    				// get compte id and label
+    				$accountingaccount = new AccountingAccount($db);
+    				if ($accountingaccount->fetch(null, $k, true)) {
+    					$bookkeeping = new BookKeeping($db);
+    					$bookkeeping->doc_date = $val["date"];
+    					$bookkeeping->doc_ref = $val["ref"];
+    					$bookkeeping->date_create = $now;
+    					$bookkeeping->doc_type = 'supplier_invoice';
+    					$bookkeeping->fk_doc = $key;
+    					$bookkeeping->fk_docdet = 0;    // Useless, can be several lines that are source of this record to add
+    					$bookkeeping->code_tiers = '';
+    					$bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $accountingaccount->label;
+    					$bookkeeping->numero_compte = $k;
+    					$bookkeeping->montant = $mt;
+    					$bookkeeping->sens = ($mt < 0) ? 'C' : 'D';
+    					$bookkeeping->debit = ($mt > 0) ? $mt : 0;
+    					$bookkeeping->credit = ($mt <= 0) ? $mt : 0;
+    					$bookkeeping->code_journal = $conf->global->ACCOUNTING_PURCHASE_JOURNAL;
+    					$bookkeeping->fk_user_author = $user->id;
+    
+    					$result = $bookkeeping->create($user);
+    					if ($result < 0) {
+    					    if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
+            			    {
+            			        $error++;
+            			        $errorforline++;
+            			        //setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
+            			    }
+            			    else
+            			    {
+            			        $error++;
+            			        $errorforline++;
+            			        setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
+            			    }
+    					}
+    				}
+    			}
+    		}
+        }
+        
 		// VAT
 		// var_dump($tabtva);
-		foreach ( $tabtva[$key] as $k => $mt ) {
-			if ($mt) {
-				// get compte id and label
-				$bookkeeping = new BookKeeping($db);
-				$bookkeeping->doc_date = $val["date"];
-				$bookkeeping->doc_ref = $val["ref"];
-				$bookkeeping->date_create = $now;
-				$bookkeeping->doc_type = 'supplier_invoice';
-				$bookkeeping->fk_doc = $key;
-				$bookkeeping->fk_docdet = $val["fk_facturefourndet"];
-				$bookkeeping->code_tiers = '';
-				$bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $langs->trans("VAT"). ' '.$def_tva[$key];
-				$bookkeeping->numero_compte = $k;
-				$bookkeeping->montant = $mt;
-				$bookkeeping->sens = ($mt < 0) ? 'C' : 'D';
-				$bookkeeping->debit = ($mt > 0) ? $mt : 0;
-				$bookkeeping->credit = ($mt <= 0) ? $mt : 0;
-				$bookkeeping->code_journal = $conf->global->ACCOUNTING_PURCHASE_JOURNAL;
-				$bookkeeping->fk_user_author = $user->id;
-
-				$result = $bookkeeping->create($user);
-				if ($result < 0) {
-					$error++;
-					$errorforline++;
-					setEventMessages($object->error, $object->errors, 'errors');
-				}
-			}
-		}
-		
-
+        if (! $errorforline)
+        {
+            foreach ( $tabtva[$key] as $k => $mt ) {
+    			if ($mt) {
+    				// get compte id and label
+    				$bookkeeping = new BookKeeping($db);
+    				$bookkeeping->doc_date = $val["date"];
+    				$bookkeeping->doc_ref = $val["ref"];
+    				$bookkeeping->date_create = $now;
+    				$bookkeeping->doc_type = 'supplier_invoice';
+    				$bookkeeping->fk_doc = $key;
+    				$bookkeeping->fk_docdet = 0;    // Useless, can be several lines that are source of this record to add
+    				$bookkeeping->code_tiers = '';
+    				$bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $langs->trans("VAT"). ' '.$def_tva[$key];
+    				$bookkeeping->numero_compte = $k;
+    				$bookkeeping->montant = $mt;
+    				$bookkeeping->sens = ($mt < 0) ? 'C' : 'D';
+    				$bookkeeping->debit = ($mt > 0) ? $mt : 0;
+    				$bookkeeping->credit = ($mt <= 0) ? $mt : 0;
+    				$bookkeeping->code_journal = $conf->global->ACCOUNTING_PURCHASE_JOURNAL;
+    				$bookkeeping->fk_user_author = $user->id;
+    
+    				$result = $bookkeeping->create($user);
+    				if ($result < 0) {
+    				    if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
+    				    {
+    				        $error++;
+    				        $errorforline++;
+    				        //setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
+    				    }
+    				    else
+    				    {
+    				        $error++;
+    				        $errorforline++;
+    				        setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
+    				    }
+    				}
+    			}
+    		}
+        }
 
 		if (! $errorforline)
 		{
@@ -456,18 +501,19 @@ if (empty($action) || $action == 'view') {
 	}
 
 	$period = $form->select_date($date_start, 'date_start', 0, 0, 0, '', 1, 0, 1) . ' - ' . $form->select_date($date_end, 'date_end', 0, 0, 0, '', 1, 0, 1);
-	report_header($nom, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, array (
-			'action' => ''
-	));
+	
+	report_header($nom, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, array('action' => ''));
 
-	if ($conf->global->ACCOUNTING_EXPORT_MODELCSV != 1 && $conf->global->ACCOUNTING_EXPORT_MODELCSV != 2) {
+	/*if ($conf->global->ACCOUNTING_EXPORT_MODELCSV != 1 && $conf->global->ACCOUNTING_EXPORT_MODELCSV != 2) {
 		print '<input type="button" class="butActionRefused" style="float: right;" value="' . $langs->trans("Export") . '" disabled="disabled" title="' . $langs->trans('ExportNotSupported') . '"/>';
 	} else {
 		print '<input type="button" class="butAction" style="float: right;" value="' . $langs->trans("Export") . '" onclick="launch_export();" />';
-	}
+	}*/
 
+    print '<div class="tabsAction">';
 	print '<input type="button" class="butAction" value="' . $langs->trans("WriteBookKeeping") . '" onclick="writebookkeeping();" />';
-
+    print '</div>';
+    
 	print '
 	<script type="text/javascript">
 		function launch_export() {
@@ -485,7 +531,7 @@ if (empty($action) || $action == 'view') {
 	/*
 	 * Show result array
 	 */
-	print '<br><br>';
+	print '<br>';
 
 	$i = 0;
 	print "<table class=\"noborder\" width=\"100%\">";
@@ -498,7 +544,6 @@ if (empty($action) || $action == 'view') {
 	print "<t><td>" . $langs->trans("Type") . "</td><td align='right'>" . $langs->trans("Debit") . "</td><td align='right'>" . $langs->trans("Credit") . "</td>";
 	print "</tr>\n";
 
-	$var = true;
 	$r = '';
 
 	$invoicestatic = new FactureFournisseur($db);
@@ -563,11 +608,11 @@ if (empty($action) || $action == 'view') {
 				print "</tr>";
 			}
 		}
-		print "<tr " . $bc[$var] . ">";
 
 		// Third party
 		foreach ( $tabttc[$key] as $k => $mt ) {
-			print "<td><!-- Thirdparty --></td>";
+		    print "<tr " . $bc[$var] . ">";
+		    print "<td><!-- Thirdparty --></td>";
 		    print "<td>" . $date . "</td>";
 			print "<td>" . $invoicestatic->getNomUrl(1) . "</td>";
 			$companystatic->id = $tabcompany[$key]['id'];
@@ -586,9 +631,9 @@ if (empty($action) || $action == 'view') {
 			// print "</td>";
 			print '<td align="right">' . ($mt < 0 ? - price(- $mt) : '') . "</td>";
 			print '<td align="right">' . ($mt >= 0 ? price($mt) : '') . "</td>";
+		    print "</tr>";
 		}
-		print "</tr>";
-
+		
 		$var = ! $var;
 	}
 
diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php
index fc3a511d670..7f097387bb5 100644
--- a/htdocs/accountancy/journal/sellsjournal.php
+++ b/htdocs/accountancy/journal/sellsjournal.php
@@ -100,7 +100,7 @@ $sql .= " JOIN " . MAIN_DB_PREFIX . "societe as s ON s.rowid = f.fk_soc";
 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_tva as ct ON fd.tva_tx = ct.taux AND ct.fk_pays = '" . $idpays . "'";
 $sql .= " WHERE fd.fk_code_ventilation > 0";
 $sql .= " AND f.entity IN (".getEntity('facture', 0).')';    // We don't share object for accountancy
-$sql .= " AND f.fk_statut > 0";
+$sql .= " AND f.fk_statut > 0"; // TODO Facture annulée ?
 if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
     $sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_REPLACEMENT . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_SITUATION . ")";
 } else {
@@ -124,10 +124,12 @@ if ($result) {
     $num = $db->num_rows($result);
     $i = 0;
 
+    $cptcli = (! empty($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER)) ? $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER : $langs->trans("CodeNotDef");
+    
     while ( $i < $num ) {
         $obj = $db->fetch_object($result);
+        
         // les variables
-        $cptcli = (! empty($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER)) ? $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER : $langs->trans("CodeNotDef");
         $compta_soc = (! empty($obj->code_compta)) ? $obj->code_compta : $cptcli;
 
         $compta_prod = $obj->compte;
@@ -164,23 +166,24 @@ if ($result) {
         $tabfac[$obj->rowid]["ref"] = $obj->facnumber;
         $tabfac[$obj->rowid]["type"] = $obj->type;
         $tabfac[$obj->rowid]["description"] = $obj->label_compte;
-        $tabfac[$obj->rowid]["fk_facturedet"] = $obj->fdid;
-        if (! isset($tabttc[$obj->rowid][$compta_soc]))
-            $tabttc[$obj->rowid][$compta_soc] = 0;
-            if (! isset($tabht[$obj->rowid][$compta_prod]))
-                $tabht[$obj->rowid][$compta_prod] = 0;
-                if (! isset($tabtva[$obj->rowid][$compta_tva]))
-                    $tabtva[$obj->rowid][$compta_tva] = 0;
-                    $tabttc[$obj->rowid][$compta_soc] += $obj->total_ttc * $situation_ratio;
-                    $tabht[$obj->rowid][$compta_prod] += $obj->total_ht * $situation_ratio;
-                    $tabtva[$obj->rowid][$compta_tva] += $obj->total_tva * $situation_ratio;
-                    $tabcompany[$obj->rowid] = array (
-                        'id' => $obj->socid,
-                        'name' => $obj->name,
-                        'code_client' => $obj->code_compta
-                    );
+        //$tabfac[$obj->rowid]["fk_facturedet"] = $obj->fdid;
+       
+        // Avoid warnings
+        if (! isset($tabttc[$obj->rowid][$compta_soc])) $tabttc[$obj->rowid][$compta_soc] = 0;
+        if (! isset($tabht[$obj->rowid][$compta_prod])) $tabht[$obj->rowid][$compta_prod] = 0;
+        if (! isset($tabtva[$obj->rowid][$compta_tva])) $tabtva[$obj->rowid][$compta_tva] = 0;
 
-                    $i ++;
+        $tabttc[$obj->rowid][$compta_soc] += $obj->total_ttc * $situation_ratio;
+        $tabht[$obj->rowid][$compta_prod] += $obj->total_ht * $situation_ratio;
+        $tabtva[$obj->rowid][$compta_tva] += $obj->total_tva * $situation_ratio;
+        $tabcompany[$obj->rowid] = array (
+            'id' => $obj->socid,
+            'name' => $obj->name,
+            'code_client' => $obj->code_client,
+            'code_compta' => $compta_soc
+        );
+
+        $i ++;
     }
 } else {
     dol_print_error($db);
@@ -191,7 +194,7 @@ if ($action == 'writebookkeeping') {
     $now = dol_now();
     $error = 0;
 
-    foreach ( $tabfac as $key => $val ) {
+    foreach ( $tabfac as $key => $val ) {   // Loop on each invoice
          
         $errorforline = 0;
 
@@ -211,97 +214,135 @@ if ($action == 'writebookkeeping') {
         $invoicestatic->id = $key;
         $invoicestatic->ref = (string) $val["ref"];
 
-        foreach ( $tabttc[$key] as $k => $mt ) {
-            $bookkeeping = new BookKeeping($db);
-            $bookkeeping->doc_date = $val["date"];
-            $bookkeeping->doc_ref = $val["ref"];
-            $bookkeeping->date_create = $now;
-            $bookkeeping->doc_type = 'customer_invoice';
-            $bookkeeping->fk_doc = $key;
-            $bookkeeping->fk_docdet = $val["fk_facturedet"];
-            $bookkeeping->code_tiers = $tabcompany[$key]['code_client'];
-            $bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER;
-            // $bookkeeping->label_compte = $tabcompany[$key]['name'];
-            $bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("Code_tiers");
-            $bookkeeping->montant = $mt;
-            $bookkeeping->sens = ($mt >= 0) ? 'D' : 'C';
-            $bookkeeping->debit = ($mt >= 0) ? $mt : 0;
-            $bookkeeping->credit = ($mt < 0) ? $mt : 0;
-            $bookkeeping->code_journal = $conf->global->ACCOUNTING_SELL_JOURNAL;
-            $bookkeeping->fk_user_author = $user->id;
-
-            $result = $bookkeeping->create($user);
-            if ($result < 0) {
-                $error++;
-                $errorforline++;
-                setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
-            }
-        }
-
-        // Product / Service
-        foreach ( $tabht[$key] as $k => $mt ) {
-            if ($mt) {
-                // get compte id and label
-                $accountingaccount = new AccountingAccount($db);
-                if ($accountingaccount->fetch(null, $k, true)) {
+        // Thirdparty
+        if (! $errorforline)
+        {
+            foreach ( $tabttc[$key] as $k => $mt ) {
+                if ($mt) {
                     $bookkeeping = new BookKeeping($db);
                     $bookkeeping->doc_date = $val["date"];
                     $bookkeeping->doc_ref = $val["ref"];
                     $bookkeeping->date_create = $now;
                     $bookkeeping->doc_type = 'customer_invoice';
                     $bookkeeping->fk_doc = $key;
-                    $bookkeeping->fk_docdet = $val["fk_facturedet"];
+                    $bookkeeping->fk_docdet = 0;    // Useless, can be several lines that are source of this record to add
+                    $bookkeeping->code_tiers = $tabcompany[$key]['code_client'];
+                    $bookkeeping->numero_compte = $tabcompany[$key]['code_compta'];
+                    // $bookkeeping->label_compte = $tabcompany[$key]['name'];
+                    $bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("Code_tiers");
+                    $bookkeeping->montant = $mt;
+                    $bookkeeping->sens = ($mt >= 0) ? 'D' : 'C';
+                    $bookkeeping->debit = ($mt >= 0) ? $mt : 0;
+                    $bookkeeping->credit = ($mt < 0) ? $mt : 0;
+                    $bookkeeping->code_journal = $conf->global->ACCOUNTING_SELL_JOURNAL;
+                    $bookkeeping->fk_user_author = $user->id;
+    
+                    $result = $bookkeeping->create($user);
+           			if ($result < 0) {
+                        if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
+                        {
+                            $error++;
+                            $errorforline++;
+                            //setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
+                        }
+                        else
+                        {
+                            $error++;
+                            $errorforline++;
+                            setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
+                        }
+        			}
+                }
+            }
+        }
+        
+        // Product / Service
+        if (! $errorforline)
+        {
+            foreach ( $tabht[$key] as $k => $mt ) {
+                if ($mt) {
+                    // get compte id and label
+                    $accountingaccount = new AccountingAccount($db);
+                    if ($accountingaccount->fetch(null, $k, true)) {
+                        $bookkeeping = new BookKeeping($db);
+                        $bookkeeping->doc_date = $val["date"];
+                        $bookkeeping->doc_ref = $val["ref"];
+                        $bookkeeping->date_create = $now;
+                        $bookkeeping->doc_type = 'customer_invoice';
+                        $bookkeeping->fk_doc = $key;
+                        $bookkeeping->fk_docdet = 0;    // Useless, can be several lines that are source of this record to add;
+                        $bookkeeping->code_tiers = '';
+                        $bookkeeping->numero_compte = $k;
+                        $bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $accountingaccount->label;
+                        $bookkeeping->montant = $mt;
+                        $bookkeeping->sens = ($mt < 0) ? 'D' : 'C';
+                        $bookkeeping->debit = ($mt < 0) ? $mt : 0;
+                        $bookkeeping->credit = ($mt >= 0) ? $mt : 0;
+                        $bookkeeping->code_journal = $conf->global->ACCOUNTING_SELL_JOURNAL;
+                        $bookkeeping->fk_user_author = $user->id;
+    
+                        $result = $bookkeeping->create($user);
+            			if ($result < 0) {
+                            if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
+                            {
+                                $error++;
+                                $errorforline++;
+                                //setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
+                            }
+                            else
+                            {
+                                $error++;
+                                $errorforline++;
+                                setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
+                            }
+            			}                        
+                    }
+                }
+            }
+        }
+        
+        // VAT
+        // var_dump($tabtva);
+        if (! $errorforline)
+        {
+            foreach ( $tabtva[$key] as $k => $mt ) {
+                if ($mt) {
+                    $bookkeeping = new BookKeeping($db);
+                    $bookkeeping->doc_date = $val["date"];
+                    $bookkeeping->doc_ref = $val["ref"];
+                    $bookkeeping->date_create = $now;
+                    $bookkeeping->doc_type = 'customer_invoice';
+                    $bookkeeping->fk_doc = $key;
+                    $bookkeeping->fk_docdet = 0;    // Useless, can be several lines that are source of this record to add
                     $bookkeeping->code_tiers = '';
                     $bookkeeping->numero_compte = $k;
-                    $bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $accountingaccount->label;
+                    $bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("VAT").' '.$def_tva[$key];
                     $bookkeeping->montant = $mt;
                     $bookkeeping->sens = ($mt < 0) ? 'D' : 'C';
                     $bookkeeping->debit = ($mt < 0) ? $mt : 0;
                     $bookkeeping->credit = ($mt >= 0) ? $mt : 0;
                     $bookkeeping->code_journal = $conf->global->ACCOUNTING_SELL_JOURNAL;
                     $bookkeeping->fk_user_author = $user->id;
-
+    
                     $result = $bookkeeping->create($user);
                     if ($result < 0) {
-                        $error++;
-                        $errorforline++;
-                        setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
+           			    if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
+        			    {
+        			        $error++;
+        			        $errorforline++;
+        			        //setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
+        			    }
+        			    else
+        			    {
+        			        $error++;
+        			        $errorforline++;
+        			        setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
+        			    }
                     }
                 }
             }
         }
 
-        // VAT
-        // var_dump($tabtva);
-        foreach ( $tabtva[$key] as $k => $mt ) {
-            if ($mt) {
-                $bookkeeping = new BookKeeping($db);
-                $bookkeeping->doc_date = $val["date"];
-                $bookkeeping->doc_ref = $val["ref"];
-                $bookkeeping->date_create = $now;
-                $bookkeeping->doc_type = 'customer_invoice';
-                $bookkeeping->fk_doc = $key;
-                $bookkeeping->fk_docdet = $val["fk_facturedet"];
-                $bookkeeping->code_tiers = '';
-                $bookkeeping->numero_compte = $k;
-                $bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("VAT").' '.$def_tva[$key];
-                $bookkeeping->montant = $mt;
-                $bookkeeping->sens = ($mt < 0) ? 'D' : 'C';
-                $bookkeeping->debit = ($mt < 0) ? $mt : 0;
-                $bookkeeping->credit = ($mt >= 0) ? $mt : 0;
-                $bookkeeping->code_journal = $conf->global->ACCOUNTING_SELL_JOURNAL;
-                $bookkeeping->fk_user_author = $user->id;
-
-                $result = $bookkeeping->create($user);
-                if ($result < 0) {
-                    $error++;
-                    $errorforline++;
-                    setEventMessages($object->error, $object->errors, 'errors');
-                }
-            }
-        }
-
-
         if (! $errorforline)
         {
             $db->commit();
@@ -458,6 +499,7 @@ if ($action == 'export_csv') {
     }
 }
 
+
 if (empty($action) || $action == 'view') {
 
 	llxHeader('', $langs->trans("SellsJournal"));
@@ -474,18 +516,18 @@ if (empty($action) || $action == 'view') {
 	else
 		$description .= $langs->trans("DepositsAreIncluded");
 	$period = $form->select_date($date_start, 'date_start', 0, 0, 0, '', 1, 0, 1) . ' - ' . $form->select_date($date_end, 'date_end', 0, 0, 0, '', 1, 0, 1);
-	report_header($nom, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, array (
-			'action' => ''
-	));
+	
+	report_header($nom, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, array('action' => ''));
 
-	if ($conf->global->ACCOUNTING_EXPORT_MODELCSV != 1 && $conf->global->ACCOUNTING_EXPORT_MODELCSV != 2) {
+	/*if ($conf->global->ACCOUNTING_EXPORT_MODELCSV != 1 && $conf->global->ACCOUNTING_EXPORT_MODELCSV != 2) {
 		print '<input type="button" class="butActionRefused" style="float: right;" value="' . $langs->trans("Export") . '" disabled="disabled" title="' . $langs->trans('ExportNotSupported') . '"/>';
 	} else {
 		print '<input type="button" class="butAction" style="float: right;" value="' . $langs->trans("Export") . '" onclick="launch_export();" />';
-	}
-
+	}*/
+    print '<div class="tabsAction">';
 	print '<input type="button" class="butAction" value="' . $langs->trans("WriteBookKeeping") . '" onclick="writebookkeeping();" />';
-
+    print '</div>';
+    
 	print '
 	<script type="text/javascript">
 		function launch_export() {
@@ -503,7 +545,7 @@ if (empty($action) || $action == 'view') {
 	/*
 	 * Show result array
 	 */
-	print '<br><br>';
+	print '<br>';
 
 	$i = 0;
 	print "<table class=\"noborder\" width=\"100%\">";
@@ -553,8 +595,8 @@ if (empty($action) || $action == 'view') {
 			print "<td>" . $companystatic->getNomUrl(0, 'customer', 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("Code_tiers") . "</td>";
 			print "</td><td align='right'>" . ($mt >= 0 ? price($mt) : '') . "</td>";
 			print "<td align='right'>" . ($mt < 0 ? price(- $mt) : '') . "</td>";
+		    print "</tr>";
 		}
-		print "</tr>";
 
 		// Product / Service
 		foreach ( $tabht[$key] as $k => $mt ) {
@@ -604,7 +646,7 @@ if (empty($action) || $action == 'view') {
 				print "</tr>";
 			}
 		}
-
+		
 		$var = ! $var;
 	}
 

From afc5ab024205f128961a4da70b4e8f8b8a257dd0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 29 Apr 2017 15:10:24 +0200
Subject: [PATCH 131/505] Fix label

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

diff --git a/htdocs/core/lib/accounting.lib.php b/htdocs/core/lib/accounting.lib.php
index dc112cc4e33..b7ceaa0982e 100644
--- a/htdocs/core/lib/accounting.lib.php
+++ b/htdocs/core/lib/accounting.lib.php
@@ -232,7 +232,7 @@ function journalHead($nom,$variante,$period,$periodlink,$description,$builddate,
 
     $h=0;
     $head[$h][0] = $_SERVER["PHP_SELF"].$varlink;
-    $head[$h][1] = $langs->trans("Journal");
+    $head[$h][1] = $langs->trans("Journalization");
     $head[$h][2] = 'journal';
 
     dol_fiche_head($head, 'journal');

From 04c05efafed4f83c786adae2883f7e1709b60cca Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 29 Apr 2017 15:12:45 +0200
Subject: [PATCH 132/505] FIX Several bugs in accounting module.

---
 htdocs/accountancy/journal/bankjournal.php    | 291 +++++++++---------
 .../journal/expensereportsjournal.php         | 251 ++++++++-------
 2 files changed, 298 insertions(+), 244 deletions(-)

diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index dc18a3417e8..cba6f5b3987 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -106,7 +106,7 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 $p = explode(":", $conf->global->MAIN_INFO_SOCIETE_COUNTRY);
 $idpays = $p[0];
 
-$sql  = "SELECT b.rowid , b.dateo as do, b.datev as dv, b.amount, b.label, b.rappro, b.num_releve, b.num_chq, b.fk_type,";
+$sql  = "SELECT b.rowid, b.dateo as do, b.datev as dv, b.amount, b.label, b.rappro, b.num_releve, b.num_chq, b.fk_type,";
 $sql .= " ba.courant, ba.ref as baref, ba.account_number,";
 $sql .= " soc.code_compta, soc.code_compta_fournisseur, soc.rowid as socid, soc.nom as name, bu1.type as typeop,";
 $sql .= " u.accountancy_code, u.rowid as userid, u.lastname as name, u.firstname as firstname, bu2.type as typeop";
@@ -341,79 +341,81 @@ if (! $error && $action == 'writebookkeeping') {
 		    // Line into bank account
     		foreach ( $tabbq[$key] as $k => $mt ) 
     		{
-    			$bookkeeping = new BookKeeping($db);
-    			$bookkeeping->doc_date = $val["date"];
-    			$bookkeeping->doc_ref = $val["ref"];
-    			$bookkeeping->doc_type = 'bank';
-    			$bookkeeping->fk_doc = $key;
-    			$bookkeeping->fk_docdet = $val["fk_bank"];
-    			$bookkeeping->numero_compte = $k;
-    			$bookkeeping->label_compte = $compte->label;
-    			$bookkeeping->montant = ($mt < 0 ? - $mt : $mt);
-    			$bookkeeping->sens = ($mt >= 0) ? 'D' : 'C';
-    			$bookkeeping->debit = ($mt >= 0 ? $mt : 0);
-    			$bookkeeping->credit = ($mt < 0 ? - $mt : 0);
-    			$bookkeeping->code_journal = $journal;
-    			$bookkeeping->fk_user_author = $user->id;
-    			$bookkeeping->date_create = $now;
+    			if ($mt) {
+        		    $bookkeeping = new BookKeeping($db);
+        			$bookkeeping->doc_date = $val["date"];
+        			$bookkeeping->doc_ref = $val["ref"];
+        			$bookkeeping->doc_type = 'bank';
+        			$bookkeeping->fk_doc = $key;
+        			$bookkeeping->fk_docdet = $val["fk_bank"];
+        			$bookkeeping->numero_compte = $k;
+        			$bookkeeping->label_compte = $compte->label;
+        			$bookkeeping->montant = ($mt < 0 ? - $mt : $mt);
+        			$bookkeeping->sens = ($mt >= 0) ? 'D' : 'C';
+        			$bookkeeping->debit = ($mt >= 0 ? $mt : 0);
+        			$bookkeeping->credit = ($mt < 0 ? - $mt : 0);
+        			$bookkeeping->code_journal = $journal;
+        			$bookkeeping->fk_user_author = $user->id;
+        			$bookkeeping->date_create = $now;
+        
+        			if ($tabtype[$key] == 'payment') {
+        			    $bookkeeping->code_tiers = $tabcompany[$key]['code_compta'];
     
-    			if ($tabtype[$key] == 'payment') {
-    			    $bookkeeping->code_tiers = $tabcompany[$key]['code_compta'];
-
-    				$sqlmid = 'SELECT fac.facnumber';
-    				$sqlmid .= " FROM " . MAIN_DB_PREFIX . "facture fac";
-    				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiement_facture as payfac ON payfac.fk_facture=fac.rowid";
-    				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiement as pay ON  payfac.fk_paiement=pay.rowid";
-    				$sqlmid .= " WHERE pay.fk_bank=" . $key;
-    				dol_syslog("accountancy/journal/bankjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
-    				$resultmid = $db->query($sqlmid);
-    				if ($resultmid) {
-    					$objmid = $db->fetch_object($resultmid);
-    					$bookkeeping->doc_ref = $objmid->facnumber;    // Ref of invoice
-    				}
-    			} else if ($tabtype[$key] == 'payment_supplier') {
-    			    $bookkeeping->code_tiers = $tabcompany[$key]['code_compta'];
-
-    				$sqlmid = 'SELECT facf.ref_supplier, facf.ref';
-    				$sqlmid .= " FROM " . MAIN_DB_PREFIX . "facture_fourn facf";
-    				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiementfourn_facturefourn as payfacf ON payfacf.fk_facturefourn=facf.rowid";
-    				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiementfourn as payf ON  payfacf.fk_paiementfourn=payf.rowid";
-    				$sqlmid .= " WHERE payf.fk_bank=" . $key;
-    				dol_syslog("accountancy/journal/bankjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
-    				$resultmid = $db->query($sqlmid);
-    				if ($resultmid) {
-    					$objmid = $db->fetch_object($resultmid);
-    					$bookkeeping->doc_ref = $objmid->ref_supplier . ' (' . $objmid->ref . ')'; // Ref on invoice
-    				}
-    			} else if ($tabtype[$key] == 'payment_expensereport') {
-    			    $bookkeeping->code_tiers = $tabuser[$key]['accountancy_code'];
-
-    				$sqlmid = 'SELECT e.ref';
-    				$sqlmid .= " FROM " . MAIN_DB_PREFIX . "expensereport as e";
-    				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "payment_expensereport as payer ON payer.fk_expensereport=e.rowid";
-    				$sqlmid .= " WHERE payer.fk_expensereport=" . $val["fk_expensereport"];
-    				dol_syslog("accountancy/journal/bankjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
-    				$resultmid = $db->query($sqlmid);
-    				if ($resultmid) {
-    					$objmid = $db->fetch_object($resultmid);
-    					$bookkeeping->doc_ref = $objmid->ref; // Ref of expensereport
-    				}
-    			}
+        				$sqlmid = 'SELECT fac.facnumber';
+        				$sqlmid .= " FROM " . MAIN_DB_PREFIX . "facture fac";
+        				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiement_facture as payfac ON payfac.fk_facture=fac.rowid";
+        				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiement as pay ON  payfac.fk_paiement=pay.rowid";
+        				$sqlmid .= " WHERE pay.fk_bank=" . $key;
+        				dol_syslog("accountancy/journal/bankjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
+        				$resultmid = $db->query($sqlmid);
+        				if ($resultmid) {
+        					$objmid = $db->fetch_object($resultmid);
+        					$bookkeeping->doc_ref = $objmid->facnumber;    // Ref of invoice
+        				}
+        			} else if ($tabtype[$key] == 'payment_supplier') {
+        			    $bookkeeping->code_tiers = $tabcompany[$key]['code_compta'];
     
-    			$result = $bookkeeping->create($user);
-    			if ($result < 0) {
-    				if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
-    				{
-    					$error++;
-    					$errorforline++;
-    					//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
-    				}
-    				else
-    				{
-	    				$error++;
-	    				$errorforline++;
-	    				setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
-    				}
+        				$sqlmid = 'SELECT facf.ref_supplier, facf.ref';
+        				$sqlmid .= " FROM " . MAIN_DB_PREFIX . "facture_fourn facf";
+        				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiementfourn_facturefourn as payfacf ON payfacf.fk_facturefourn=facf.rowid";
+        				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiementfourn as payf ON  payfacf.fk_paiementfourn=payf.rowid";
+        				$sqlmid .= " WHERE payf.fk_bank=" . $key;
+        				dol_syslog("accountancy/journal/bankjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
+        				$resultmid = $db->query($sqlmid);
+        				if ($resultmid) {
+        					$objmid = $db->fetch_object($resultmid);
+        					$bookkeeping->doc_ref = $objmid->ref_supplier . ' (' . $objmid->ref . ')'; // Ref on invoice
+        				}
+        			} else if ($tabtype[$key] == 'payment_expensereport') {
+        			    $bookkeeping->code_tiers = $tabuser[$key]['accountancy_code'];
+    
+        				$sqlmid = 'SELECT e.ref';
+        				$sqlmid .= " FROM " . MAIN_DB_PREFIX . "expensereport as e";
+        				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "payment_expensereport as payer ON payer.fk_expensereport=e.rowid";
+        				$sqlmid .= " WHERE payer.fk_expensereport=" . $val["fk_expensereport"];
+        				dol_syslog("accountancy/journal/bankjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
+        				$resultmid = $db->query($sqlmid);
+        				if ($resultmid) {
+        					$objmid = $db->fetch_object($resultmid);
+        					$bookkeeping->doc_ref = $objmid->ref; // Ref of expensereport
+        				}
+        			}
+        
+        			$result = $bookkeeping->create($user);
+        			if ($result < 0) {
+        				if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
+        				{
+        					$error++;
+        					$errorforline++;
+        					//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
+        				}
+        				else
+        				{
+    	    				$error++;
+    	    				$errorforline++;
+    	    				setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
+        				}
+        			}
     			}
     		}
 		}
@@ -423,65 +425,76 @@ if (! $error && $action == 'writebookkeeping') {
 		{
 		    // Line into thirdparty account
     		foreach ( $tabtp[$key] as $k => $mt ) {
-    			$bookkeeping = new BookKeeping($db);
-    			$bookkeeping->doc_date = $val["date"];
-    			$bookkeeping->doc_ref = $val["ref"];
-    			$bookkeeping->doc_type = 'bank';
-    			$bookkeeping->fk_doc = $key;
-    			$bookkeeping->fk_docdet = $val["fk_bank"];
-    			$bookkeeping->label_compte = $tabcompany[$key]['name'];
-    			$bookkeeping->montant = ($mt < 0 ? - $mt : $mt);
-    			$bookkeeping->sens = ($mt < 0) ? 'D' : 'C';
-    			$bookkeeping->debit = ($mt < 0 ? - $mt : 0);
-    			$bookkeeping->credit = ($mt >= 0) ? $mt : 0;
-    			$bookkeeping->code_journal = $journal;
-    			$bookkeeping->fk_user_author = $user->id;
-    			$bookkeeping->date_create = $now;
-    
-    			if (in_array($tabtype[$key], array('sc', 'payment_sc'))) {   // If payment is payment of social contribution
-    				$bookkeeping->code_tiers = '';
-    				$bookkeeping->numero_compte = $k;
-    			} else if ($tabtype[$key] == 'payment') {    // If payment is payment of customer invoice, we get ref of invoice
-    				$sqlmid = 'SELECT fac.facnumber';
-    				$sqlmid .= " FROM " . MAIN_DB_PREFIX . "facture fac ";
-    				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiement_facture as payfac ON  payfac.fk_facture=fac.rowid";
-    				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiement as pay ON  payfac.fk_paiement=pay.rowid";
-    				$sqlmid .= " WHERE pay.fk_bank=" . $key;
-    				dol_syslog("accountancy/journal/bankjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
-    				$resultmid = $db->query($sqlmid);
-    				if ($resultmid) {
-    					$objmid = $db->fetch_object($resultmid);
-    					$bookkeeping->doc_ref = $objmid->facnumber;
-    				}
-    				$bookkeeping->code_tiers = $tabcompany[$key]['code_compta'];
-    				$bookkeeping->numero_compte = $k;
-    			} else if ($tabtype[$key] == 'payment_supplier') {           // If payment is payment of supplier invoice, we get ref of invoice
-    
-    				$sqlmid = 'SELECT facf.ref_supplier,facf.ref';
-    				$sqlmid .= " FROM " . MAIN_DB_PREFIX . "facture_fourn facf ";
-    				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiementfourn_facturefourn as payfacf ON  payfacf.fk_facturefourn=facf.rowid";
-    				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiementfourn as payf ON  payfacf.fk_paiementfourn=payf.rowid";
-    				$sqlmid .= " WHERE payf.fk_bank=" . $key;
-    				dol_syslog("accountancy/journal/bankjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
-    				$resultmid = $db->query($sqlmid);
-    				if ($resultmid) {
-    					$objmid = $db->fetch_object($resultmid);
-    					$bookkeeping->doc_ref = $objmid->ref_supplier . ' (' . $objmid->ref . ')';
-    				}
-                    $bookkeeping->code_tiers = $tabcompany[$key]['code_compta'];
-    				$bookkeeping->numero_compte = $k;
-    			} else {
-    			    // FIXME Should be a temporary account ???
-    				$bookkeeping->doc_ref = $k;
-    				//$bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER;
-    				$bookkeeping->numero_compte = 'CodeNotDef';
-    			}
-    
-    			$result = $bookkeeping->create($user);
-    			if ($result < 0) {
-    				$error++;
-    				$errorforline++;
-    				setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
+    			if ($mt) {
+        		    $bookkeeping = new BookKeeping($db);
+        			$bookkeeping->doc_date = $val["date"];
+        			$bookkeeping->doc_ref = $val["ref"];
+        			$bookkeeping->doc_type = 'bank';
+        			$bookkeeping->fk_doc = $key;
+        			$bookkeeping->fk_docdet = $val["fk_bank"];
+        			$bookkeeping->label_compte = $tabcompany[$key]['name'];
+        			$bookkeeping->montant = ($mt < 0 ? - $mt : $mt);
+        			$bookkeeping->sens = ($mt < 0) ? 'D' : 'C';
+        			$bookkeeping->debit = ($mt < 0 ? - $mt : 0);
+        			$bookkeeping->credit = ($mt >= 0) ? $mt : 0;
+        			$bookkeeping->code_journal = $journal;
+        			$bookkeeping->fk_user_author = $user->id;
+        			$bookkeeping->date_create = $now;
+        
+        			if (in_array($tabtype[$key], array('sc', 'payment_sc'))) {   // If payment is payment of social contribution
+        				$bookkeeping->code_tiers = '';
+        				$bookkeeping->numero_compte = $k;
+        			} else if ($tabtype[$key] == 'payment') {    // If payment is payment of customer invoice, we get ref of invoice
+        				$sqlmid = 'SELECT fac.facnumber';
+        				$sqlmid .= " FROM " . MAIN_DB_PREFIX . "facture fac ";
+        				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiement_facture as payfac ON  payfac.fk_facture=fac.rowid";
+        				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiement as pay ON  payfac.fk_paiement=pay.rowid";
+        				$sqlmid .= " WHERE pay.fk_bank=" . $key;
+        				dol_syslog("accountancy/journal/bankjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
+        				$resultmid = $db->query($sqlmid);
+        				if ($resultmid) {
+        					$objmid = $db->fetch_object($resultmid);
+        					$bookkeeping->doc_ref = $objmid->facnumber;
+        				}
+        				$bookkeeping->code_tiers = $tabcompany[$key]['code_compta'];
+        				$bookkeeping->numero_compte = $k;
+        			} else if ($tabtype[$key] == 'payment_supplier') {           // If payment is payment of supplier invoice, we get ref of invoice
+        
+        				$sqlmid = 'SELECT facf.ref_supplier,facf.ref';
+        				$sqlmid .= " FROM " . MAIN_DB_PREFIX . "facture_fourn facf ";
+        				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiementfourn_facturefourn as payfacf ON  payfacf.fk_facturefourn=facf.rowid";
+        				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiementfourn as payf ON  payfacf.fk_paiementfourn=payf.rowid";
+        				$sqlmid .= " WHERE payf.fk_bank=" . $key;
+        				dol_syslog("accountancy/journal/bankjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
+        				$resultmid = $db->query($sqlmid);
+        				if ($resultmid) {
+        					$objmid = $db->fetch_object($resultmid);
+        					$bookkeeping->doc_ref = $objmid->ref_supplier . ' (' . $objmid->ref . ')';
+        				}
+                        $bookkeeping->code_tiers = $tabcompany[$key]['code_compta'];
+        				$bookkeeping->numero_compte = $k;
+        			} else {
+        			    // FIXME Should be a temporary account ???
+        				$bookkeeping->doc_ref = $k;
+        				//$bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER;
+        				$bookkeeping->numero_compte = 'CodeNotDef';
+        			}
+        
+        			$result = $bookkeeping->create($user);
+        			if ($result < 0) {
+        				if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
+        				{
+        					$error++;
+        					$errorforline++;
+        					//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
+        				}
+        				else
+        				{
+    	    				$error++;
+    	    				$errorforline++;
+    	    				setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
+        				}
+        			}
     			}
     		}
 		}
@@ -681,7 +694,6 @@ if ($action == 'export_csv') {
 
 
 
-
 /*
  * View
  */
@@ -702,18 +714,19 @@ if (empty($action) || $action == 'view') {
 	$period = $form->select_date($date_start, 'date_start', 0, 0, 0, '', 1, 0, 1) . ' - ' . $form->select_date($date_end, 'date_end', 0, 0, 0, '', 1, 0, 1);
 
 	$varlink = 'id_account=' . $id_bank_account;
-	report_header($nom, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, array (
-			'action' => ''
-	), '', $varlink);
+	
+	report_header($nom, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, array('action' => ''), '', $varlink);
 
-	if ($conf->global->ACCOUNTING_EXPORT_MODELCSV != 1 && $conf->global->ACCOUNTING_EXPORT_MODELCSV != 2) {
+	/*if ($conf->global->ACCOUNTING_EXPORT_MODELCSV != 1 && $conf->global->ACCOUNTING_EXPORT_MODELCSV != 2) {
 		print '<input type="button" class="butActionRefused" style="float: right;" value="' . $langs->trans('Export') . '" disabled="disabled" title="' . $langs->trans('ExportNotSupported') . '"/>';
 	} else {
 		print '<input type="button" class="butAction" style="float: right;" value="' . $langs->trans("Export") . '" onclick="launch_export();" />';
-	}
+	}*/
 
+    print '<div class="tabsAction">';
 	print '<input type="button" class="butAction" value="' . $langs->trans("WriteBookKeeping") . '" onclick="writebookkeeping();" />';
-
+    print '</div>';
+    
 	// TODO Avoid using js. We can use a direct link with $param
 	print '
 	<script type="text/javascript">
@@ -734,7 +747,7 @@ if (empty($action) || $action == 'view') {
 	/*
 	 * Show result array
 	 */
-	print '<br><br>';
+	print '<br>';
 
 	$i = 0;
 	print "<table class=\"noborder\" width=\"100%\">";
diff --git a/htdocs/accountancy/journal/expensereportsjournal.php b/htdocs/accountancy/journal/expensereportsjournal.php
index 8d657ee6d11..5ef6ab8a2c4 100644
--- a/htdocs/accountancy/journal/expensereportsjournal.php
+++ b/htdocs/accountancy/journal/expensereportsjournal.php
@@ -157,100 +157,140 @@ if ($action == 'writebookkeeping') {
 	{
 		$errorforline = 0;
 
-		foreach ( $tabttc[$key] as $k => $mt ) {
-			// get compte id and label
-
-			$bookkeeping = new BookKeeping($db);
-			$bookkeeping->doc_date = $val["date"];
-			$bookkeeping->doc_ref = $val["ref"];
-			$bookkeeping->date_create = $now;
-			$bookkeeping->doc_type = 'expense_report';
-			$bookkeeping->fk_doc = $key;
-			$bookkeeping->fk_docdet = $val["fk_expensereportdet"];
-			$bookkeeping->code_tiers = $tabuser[$key]['user_accountancy_code'];
-			$bookkeeping->label_compte = $tabuser[$key]['name'];
-			$bookkeeping->numero_compte = $conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT;
-			$bookkeeping->montant = $mt;
-			$bookkeeping->sens = ($mt >= 0) ? 'C' : 'D';
-			$bookkeeping->debit = ($mt <= 0) ? $mt : 0;
-			$bookkeeping->credit = ($mt > 0) ? $mt : 0;
-			$bookkeeping->code_journal = $conf->global->ACCOUNTING_EXPENSEREPORT_JOURNAL;
-			$bookkeeping->fk_user_author = $user->id;
-
-			$result = $bookkeeping->create($user);
-			if ($result < 0) {
-				$error++;
-				$errorforline++;
-				setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
-			}
-		}
-
-		// Fees
-		foreach ( $tabht[$key] as $k => $mt ) {
-			$accountingaccount = new AccountingAccount($db);
-			$accountingaccount->fetch(null, $k, true);
-			if ($mt) {
-				// get compte id and label
-				$accountingaccount = new AccountingAccount($db);
-				if ($accountingaccount->fetch(null, $k, true)) {
-					$bookkeeping = new BookKeeping($db);
-					$bookkeeping->doc_date = $val["date"];
-					$bookkeeping->doc_ref = $val["ref"];
-					$bookkeeping->date_create = $now;
-					$bookkeeping->doc_type = 'expense_report';
-					$bookkeeping->fk_doc = $key;
-					$bookkeeping->fk_docdet = $val["fk_expensereportdet"];
-					$bookkeeping->code_tiers = '';
-					$bookkeeping->label_compte = $accountingaccount->label;
-					$bookkeeping->numero_compte = $k;
-					$bookkeeping->montant = $mt;
-					$bookkeeping->sens = ($mt < 0) ? 'C' : 'D';
-					$bookkeeping->debit = ($mt > 0) ? $mt : 0;
-					$bookkeeping->credit = ($mt <= 0) ? $mt : 0;
-					$bookkeeping->code_journal = $conf->global->ACCOUNTING_EXPENSEREPORT_JOURNAL;
-					$bookkeeping->fk_user_author = $user->id;
-
-					$result = $bookkeeping->create($user);
-					if ($result < 0) {
-						$error++;
-						$errorforline++;
-						setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
-					}
-				}
-			}
-		}
-
-		// VAT
-		// var_dump($tabtva);
-		foreach ( $tabtva[$key] as $k => $mt ) {
-			if ($mt) {
-				// get compte id and label
-				$bookkeeping = new BookKeeping($db);
-				$bookkeeping->doc_date = $val["date"];
-				$bookkeeping->doc_ref = $val["ref"];
-				$bookkeeping->date_create = $now;
-				$bookkeeping->doc_type = 'expense_report';
-				$bookkeeping->fk_doc = $key;
-				$bookkeeping->fk_docdet = $val["fk_expensereportdet"];
-				$bookkeeping->code_tiers = '';
-				$bookkeeping->label_compte = $langs->trans("VAT"). ' '.$def_tva[$key];
-				$bookkeeping->numero_compte = $k;
-				$bookkeeping->montant = $mt;
-				$bookkeeping->sens = ($mt < 0) ? 'C' : 'D';
-				$bookkeeping->debit = ($mt > 0) ? $mt : 0;
-				$bookkeeping->credit = ($mt <= 0) ? $mt : 0;
-				$bookkeeping->code_journal = $conf->global->ACCOUNTING_EXPENSEREPORT_JOURNAL;
-				$bookkeeping->fk_user_author = $user->id;
-
-				$result = $bookkeeping->create($user);
-				if ($result < 0) {
-					$error++;
-					$errorforline++;
-					setEventMessages($object->error, $object->errors, 'errors');
-				}
-			}
-		}
-
+	    $db->begin();
+	     
+        if (! $errorforline)
+        {
+    	    foreach ( $tabttc[$key] as $k => $mt ) {
+    			if ($mt) {
+        	        // get compte id and label
+        
+        			$bookkeeping = new BookKeeping($db);
+        			$bookkeeping->doc_date = $val["date"];
+        			$bookkeeping->doc_ref = $val["ref"];
+        			$bookkeeping->date_create = $now;
+        			$bookkeeping->doc_type = 'expense_report';
+        			$bookkeeping->fk_doc = $key;
+        			$bookkeeping->fk_docdet = $val["fk_expensereportdet"];
+        			$bookkeeping->code_tiers = $tabuser[$key]['user_accountancy_code'];
+        			$bookkeeping->label_compte = $tabuser[$key]['name'];
+        			$bookkeeping->numero_compte = $conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT;
+        			$bookkeeping->montant = $mt;
+        			$bookkeeping->sens = ($mt >= 0) ? 'C' : 'D';
+        			$bookkeeping->debit = ($mt <= 0) ? $mt : 0;
+        			$bookkeeping->credit = ($mt > 0) ? $mt : 0;
+        			$bookkeeping->code_journal = $conf->global->ACCOUNTING_EXPENSEREPORT_JOURNAL;
+        			$bookkeeping->fk_user_author = $user->id;
+        
+        			$result = $bookkeeping->create($user);
+        			if ($result < 0) {
+        			    if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
+        			    {
+        			        $error++;
+        			        $errorforline++;
+        			        //setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
+        			    }
+        			    else
+        			    {
+        			        $error++;
+        			        $errorforline++;
+        			        setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
+        			    }
+        			}
+    			}
+    		}
+        }
+        
+        if (! $errorforline)
+        {
+            // Fees
+    		foreach ( $tabht[$key] as $k => $mt ) {
+    			$accountingaccount = new AccountingAccount($db);
+    			$accountingaccount->fetch(null, $k, true);
+    			if ($mt) {
+    				// get compte id and label
+    				$accountingaccount = new AccountingAccount($db);
+    				if ($accountingaccount->fetch(null, $k, true)) {
+    					$bookkeeping = new BookKeeping($db);
+    					$bookkeeping->doc_date = $val["date"];
+    					$bookkeeping->doc_ref = $val["ref"];
+    					$bookkeeping->date_create = $now;
+    					$bookkeeping->doc_type = 'expense_report';
+    					$bookkeeping->fk_doc = $key;
+    					$bookkeeping->fk_docdet = $val["fk_expensereportdet"];
+    					$bookkeeping->code_tiers = '';
+    					$bookkeeping->label_compte = $accountingaccount->label;
+    					$bookkeeping->numero_compte = $k;
+    					$bookkeeping->montant = $mt;
+    					$bookkeeping->sens = ($mt < 0) ? 'C' : 'D';
+    					$bookkeeping->debit = ($mt > 0) ? $mt : 0;
+    					$bookkeeping->credit = ($mt <= 0) ? $mt : 0;
+    					$bookkeeping->code_journal = $conf->global->ACCOUNTING_EXPENSEREPORT_JOURNAL;
+    					$bookkeeping->fk_user_author = $user->id;
+    
+    					$result = $bookkeeping->create($user);
+	        			if ($result < 0) {
+            			    if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
+            			    {
+            			        $error++;
+            			        $errorforline++;
+            			        //setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
+            			    }
+            			    else
+            			    {
+            			        $error++;
+            			        $errorforline++;
+            			        setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
+            			    }
+	        			}
+    				}
+    			}
+    		}
+        }
+        
+        if (! $errorforline)
+        {
+            // VAT
+    		// var_dump($tabtva);
+    		foreach ( $tabtva[$key] as $k => $mt ) {
+    			if ($mt) {
+    				// get compte id and label
+    				$bookkeeping = new BookKeeping($db);
+    				$bookkeeping->doc_date = $val["date"];
+    				$bookkeeping->doc_ref = $val["ref"];
+    				$bookkeeping->date_create = $now;
+    				$bookkeeping->doc_type = 'expense_report';
+    				$bookkeeping->fk_doc = $key;
+    				$bookkeeping->fk_docdet = $val["fk_expensereportdet"];
+    				$bookkeeping->code_tiers = '';
+    				$bookkeeping->label_compte = $langs->trans("VAT"). ' '.$def_tva[$key];
+    				$bookkeeping->numero_compte = $k;
+    				$bookkeeping->montant = $mt;
+    				$bookkeeping->sens = ($mt < 0) ? 'C' : 'D';
+    				$bookkeeping->debit = ($mt > 0) ? $mt : 0;
+    				$bookkeeping->credit = ($mt <= 0) ? $mt : 0;
+    				$bookkeeping->code_journal = $conf->global->ACCOUNTING_EXPENSEREPORT_JOURNAL;
+    				$bookkeeping->fk_user_author = $user->id;
+    
+    				$result = $bookkeeping->create($user);
+    				if ($result < 0) {
+           			    if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
+        			    {
+        			        $error++;
+        			        $errorforline++;
+        			        //setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
+        			    }
+        			    else
+        			    {
+        			        $error++;
+        			        $errorforline++;
+        			        setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
+        			    }
+    				}
+    			}
+    		}
+        }
+        
 		if (! $errorforline)
 		{
 		    $db->commit();
@@ -406,18 +446,19 @@ if (empty($action) || $action == 'view') {
 	$description.= $langs->trans("DescJournalOnlyBindedVisible").'<br>';
 
 	$period = $form->select_date($date_start, 'date_start', 0, 0, 0, '', 1, 0, 1) . ' - ' . $form->select_date($date_end, 'date_end', 0, 0, 0, '', 1, 0, 1);
-	report_header($nom, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, array (
-			'action' => ''
-	));
 
-	if ($conf->global->ACCOUNTING_EXPORT_MODELCSV != 1 && $conf->global->ACCOUNTING_EXPORT_MODELCSV != 2) {
+	report_header($nom, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, array('action' => ''));
+
+	/*if ($conf->global->ACCOUNTING_EXPORT_MODELCSV != 1 && $conf->global->ACCOUNTING_EXPORT_MODELCSV != 2) {
 		print '<input type="button" class="butActionRefused" style="float: right;" value="' . $langs->trans("Export") . '" disabled="disabled" title="' . $langs->trans('ExportNotSupported') . '"/>';
 	} else {
 		print '<input type="button" class="butAction" style="float: right;" value="' . $langs->trans("Export") . '" onclick="launch_export();" />';
-	}
+	}*/
 
+    print '<div class="tabsAction">';
 	print '<input type="button" class="butAction" value="' . $langs->trans("WriteBookKeeping") . '" onclick="writebookkeeping();" />';
-
+    print '</div>';
+    
 	print '
 	<script type="text/javascript">
 		function launch_export() {
@@ -435,7 +476,7 @@ if (empty($action) || $action == 'view') {
 	/*
 	 * Show result array
 	 */
-	print '<br><br>';
+	print '<br>';
 
 	$i = 0;
 	print "<table class=\"noborder\" width=\"100%\">";
@@ -512,11 +553,11 @@ if (empty($action) || $action == 'view') {
 				print "</tr>";
 			}
 		}
-		print "<tr " . $bc[$var] . ">";
 
 		// Third party
 		foreach ( $tabttc[$key] as $k => $mt ) {
-			print "<td><!-- Thirdparty --></td>";
+		    print "<tr " . $bc[$var] . ">";
+		    print "<td><!-- Thirdparty --></td>";
 		    print "<td>" . $date . "</td>";
 			print "<td>" . $expensereportstatic->getNomUrl(1) . "</td>";
 			$userstatic->id = $tabuser[$key]['id'];
@@ -532,9 +573,9 @@ if (empty($action) || $action == 'view') {
 			print "<td>" . $userstatic->getNomUrl(0, 'user', 16) . ' - ' . $langs->trans("Code_tiers") . "</td>";
 			print '<td align="right">' . ($mt < 0 ? - price(- $mt) : '') . "</td>";
 			print '<td align="right">' . ($mt >= 0 ? price($mt) : '') . "</td>";
+		    print "</tr>";
 		}
-		print "</tr>";
-
+		
 		$var = ! $var;
 	}
 

From cc8e66d079d66d94c3703fefe1c2fc9de48223b7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 29 Apr 2017 15:30:40 +0200
Subject: [PATCH 133/505] FIX Journal code of bank must be visible of
 accountaing module on.

---
 htdocs/compta/bank/index.php | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/htdocs/compta/bank/index.php b/htdocs/compta/bank/index.php
index 29877302104..012dfe42175 100644
--- a/htdocs/compta/bank/index.php
+++ b/htdocs/compta/bank/index.php
@@ -33,6 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 $langs->load("banks");
 $langs->load("categories");
 $langs->load("accountancy");
+$langs->load("compta");
 
 $action=GETPOST('action','alpha');
 $massaction=GETPOST('massaction','alpha');
@@ -87,6 +88,7 @@ $arrayfields=array(
     'b.label'=>array('label'=>$langs->trans("Label"), 'checked'=>1),
     'b.number'=>array('label'=>$langs->trans("AccountIdShort"), 'checked'=>1),
     'b.account_number'=>array('label'=>$langs->trans("AccountAccounting"), 'checked'=>$conf->accountancy->enabled),
+    'b.accountancy_journal'=>array('label'=>$langs->trans("AccountancyJournal"), 'checked'=>$conf->accountancy->enabled),
     'toreconcile'=>array('label'=>$langs->trans("TransactionsToConciliate"), 'checked'=>1),
     'b.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
     'b.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500),
@@ -139,7 +141,7 @@ $title=$langs->trans('BankAccounts');
 // Load array of financial accounts (opened by default)
 $accounts = array();
 
-$sql  = "SELECT rowid, label, courant, rappro, account_number, datec as date_creation, tms as date_update";
+$sql  = "SELECT rowid, label, courant, rappro, account_number, accountancy_journal, datec as date_creation, tms as date_update";
 // Add fields from extrafields
 foreach ($extrafields->attribute_label as $key => $val) $sql.=($extrafields->attribute_type[$key] != 'separate' ? ",ef.".$key.' as options_'.$key : '');
 // Add fields from hooks
@@ -292,6 +294,7 @@ if (! empty($arrayfields['b.label']['checked']))          print_liste_field_titr
 if (! empty($arrayfields['accountype']['checked']))       print_liste_field_titre($arrayfields['accountype']['label'],$_SERVER["PHP_SELF"],'','',$param,'',$sortfield,$sortorder);
 if (! empty($arrayfields['b.number']['checked']))         print_liste_field_titre($arrayfields['b.number']['label'],$_SERVER["PHP_SELF"],'b.number','',$param,'',$sortfield,$sortorder);
 if (! empty($arrayfields['b.account_number']['checked'])) print_liste_field_titre($arrayfields['b.account_number']['label'],$_SERVER["PHP_SELF"],'b.account_number','',$param,'',$sortfield,$sortorder);
+if (! empty($arrayfields['b.accountancy_journal']['checked'])) print_liste_field_titre($arrayfields['b.accountancy_journal']['label'],$_SERVER["PHP_SELF"],'b.accountancy_journal','',$param,'',$sortfield,$sortorder);
 if (! empty($arrayfields['toreconcile']['checked']))      print_liste_field_titre($arrayfields['toreconcile']['label'],$_SERVER["PHP_SELF"],'','',$param,'align="center"',$sortfield,$sortorder);
 // Extra fields
 if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
@@ -338,19 +341,25 @@ if (! empty($arrayfields['accountype']['checked']))
     print '<td class="liste_titre">';
     print '</td>';
 }
-// Number
+// Bank number
 if (! empty($arrayfields['b.number']['checked']))
 {
     print '<td class="liste_titre">';
     print '<input class="flat" size="6" type="text" name="search_number" value="'.$search_number.'">';
     print '</td>';
 }
-// Number
+// Account number
 if (! empty($arrayfields['b.account_number']['checked']))
 {
     print '<td class="liste_titre">';
     print '</td>';
 }
+// Accountancy journal
+if (! empty($arrayfields['b.accountancy_journal']['checked']))
+{
+    print '<td class="liste_titre">';
+    print '</td>';
+}
 // Transactions to reconcile
 if (! empty($arrayfields['toreconcile']['checked']))
 {
@@ -484,6 +493,14 @@ foreach ($accounts as $key=>$type)
 	    if (! $i) $totalarray['nbfield']++;
     }
     
+    // Accountancy journal
+    if (! empty($arrayfields['b.accountancy_journal']['checked']))
+    {
+        include_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
+        print '<td>'.length_accountg($acc->accountancy_journal).'</td>';
+	    if (! $i) $totalarray['nbfield']++;
+    }
+    
     // Transactions to reconcile
     if (! empty($arrayfields['toreconcile']['checked']))
     {

From ff0f40ab3709dca11dadda28536299583a460785 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 29 Apr 2017 16:07:34 +0200
Subject: [PATCH 134/505] Look and feel v6

---
 htdocs/accountancy/bookkeeping/card.php       |  8 +++-
 htdocs/accountancy/bookkeeping/list.php       |  4 +-
 .../accountancy/bookkeeping/listbyaccount.php | 48 ++++++++++---------
 htdocs/theme/eldy/style.css.php               |  4 ++
 htdocs/theme/md/style.css.php                 |  3 ++
 5 files changed, 41 insertions(+), 26 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php
index 116e071e42f..ce0bd4d3aa2 100644
--- a/htdocs/accountancy/bookkeeping/card.php
+++ b/htdocs/accountancy/bookkeeping/card.php
@@ -305,6 +305,8 @@ if ($action == 'create') {
 
 		dol_fiche_head();
 		
+		print '<div class="fichecenter">';
+		
 		print '<table class="border" width="100%">';
 		print '<tr class="pair">';
 		print '<td class="titlefield">' . $langs->trans("NumMvts") . '</td>';
@@ -328,6 +330,8 @@ if ($action == 'create') {
 		print '</tr>';
 		print '</table>';
 		
+		print '</div>';
+		
 		dol_fiche_end();
 
 		print '<br>';
@@ -427,8 +431,8 @@ if ($action == 'create') {
 					print $formventilation->select_auxaccount($code_tiers, 'code_tiers', 1);
 					print '</td>';
 					print '<td><input type="text" size="15" name="label_compte" value="' . $label_compte . '"/></td>';
-					print '<td align="right"><input type="text" size="6" name="debit" value="' . price($debit) . '"/></td>';
-					print '<td align="right"><input type="text" size="6" name="credit" value="' . price($credit) . '"/></td>';
+					print '<td align="right"><input type="text" class="right maxwidth50" name="debit" value="' . price($debit) . '"/></td>';
+					print '<td align="right"><input type="text" class="right maxwidth50" name="credit" value="' . price($credit) . '"/></td>';
 					print '<td></td>';
 					print '<td></td>';
 					print '<td><input type="submit" class="button" name="save" value="' . $langs->trans("Add") . '"></td>';
diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index 9cd649ce4be..75d0a63bf39 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -360,7 +360,7 @@ if (count($filter)) $button.= $langs->trans("ExportFilteredList");
 else $button.= $langs->trans("ExportList");
 $button.= '</a>';
 
-$groupby = ' <a href="./listbyaccount.php">' . $langs->trans("GroupByAccountAccounting") . '</a>';
+$groupby = ' <a class="nohover" href="'.DOL_URL_ROOT.'/accountancy/bookkeeping/listbyaccount.php"">' . $langs->trans("GroupByAccountAccounting") . '</a>';
 
 print_barre_liste($title_page, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $button, $result, $nbtotalofrecords, 'title_accountancy', 0, $groupby, '', $limit);
 
@@ -437,7 +437,7 @@ foreach ($object->lines as $line ) {
 
 	print '<td><a href="./card.php?piece_num=' . $line->piece_num . '">' . $line->piece_num . '</a></td>';
 	print '<td align="center">' . dol_print_date($line->doc_date, 'day') . '</td>';
-	print '<td>' . $line->doc_ref . '</td>';
+	print '<td class="nowrap">' . $line->doc_ref . '</td>';
 	print '<td>' . length_accountg($line->numero_compte) . '</td>';
 	print '<td>' . length_accounta($line->code_tiers) . '</td>';
 	print '<td>' . $line->label_compte . '</td>';
diff --git a/htdocs/accountancy/bookkeeping/listbyaccount.php b/htdocs/accountancy/bookkeeping/listbyaccount.php
index cbb83ba269e..2323f3afcb8 100644
--- a/htdocs/accountancy/bookkeeping/listbyaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbyaccount.php
@@ -207,7 +207,7 @@ if ($action == 'delbookkeepingyear') {
 
 print '<form method="GET" id="searchFormList" action="' . $_SERVER["PHP_SELF"] . '">';
 
-$viewflat = ' <a href="./list.php">' . $langs->trans("ViewFlatList") . '</a>';
+$viewflat = ' <a class="nohover" href="'.DOL_URL_ROOT.'/accountancy/bookkeeping/list.php">' . $langs->trans("ViewFlatList") . '</a>';
 
 print_barre_liste($title_page, $page, $_SERVER["PHP_SELF"], $options, $sortfield, $sortorder, '', $result, $nbtotalofrecords,'title_accountancy',0,$viewflat,'',$limit);
 
@@ -222,17 +222,6 @@ print '<div class="inline-block divButAction"><a class="butAction" href="./card.
 print '</div>';
 
 print '<table class="noborder" width="100%">';
-print '<tr class="liste_titre">';
-print '<td>' . $langs->trans("AccountAccounting") . '</td>';
-print_liste_field_titre($langs->trans("TransactionNumShort"), $_SERVER['PHP_SELF'], "t.piece_num", "", $options, 'align="right"', $sortfield, $sortorder);
-print_liste_field_titre($langs->trans("Docdate"), $_SERVER['PHP_SELF'], "t.doc_date", "", $options, 'align="center"', $sortfield, $sortorder);
-print_liste_field_titre($langs->trans("Docref"), $_SERVER['PHP_SELF'], "t.doc_ref", "", $options, "", $sortfield, $sortorder);
-print_liste_field_titre($langs->trans("SuppliersInvoices") . ' / ' . $langs->trans("CustomersInvoices"));
-print_liste_field_titre($langs->trans("Debit"), $_SERVER['PHP_SELF'], "t.debit", "", $options, 'align="right"', $sortfield, $sortorder);
-print_liste_field_titre($langs->trans("Credit"), $_SERVER['PHP_SELF'], "t.credit", "", $options, 'align="right"', $sortfield, $sortorder);
-print_liste_field_titre($langs->trans("Codejournal"), $_SERVER['PHP_SELF'], "t.code_journal", "", $options, 'align="right"', $sortfield, $sortorder);
-print_liste_field_titre('', $_SERVER["PHP_SELF"], "", $options, "", 'width="60" align="center"', $sortfield, $sortorder);
-print "</tr>\n";
 
 print '<tr class="liste_titre">';
 print '<td class="liste_titre">' . $object->select_account($search_accountancy_code_start, 'search_accountancy_code_start', 1, array (), 1, 1, '') . '</td>';
@@ -254,6 +243,18 @@ $searchpitco=$form->showFilterAndCheckAddButtons(0);
 print $searchpitco;
 print '</td>';
 
+print '<tr class="liste_titre">';
+print_liste_field_titre($langs->trans("AccountAccountingShort"), $_SERVER['PHP_SELF']);
+print_liste_field_titre($langs->trans("TransactionNumShort"), $_SERVER['PHP_SELF'], "t.piece_num", "", $options, 'align="right"', $sortfield, $sortorder);
+print_liste_field_titre($langs->trans("Docdate"), $_SERVER['PHP_SELF'], "t.doc_date", "", $options, 'align="center"', $sortfield, $sortorder);
+print_liste_field_titre($langs->trans("Docref"), $_SERVER['PHP_SELF'], "t.doc_ref", "", $options, "", $sortfield, $sortorder);
+print_liste_field_titre($langs->trans("Label"));
+print_liste_field_titre($langs->trans("Debit"), $_SERVER['PHP_SELF'], "t.debit", "", $options, 'align="right"', $sortfield, $sortorder);
+print_liste_field_titre($langs->trans("Credit"), $_SERVER['PHP_SELF'], "t.credit", "", $options, 'align="right"', $sortfield, $sortorder);
+print_liste_field_titre($langs->trans("Codejournal"), $_SERVER['PHP_SELF'], "t.code_journal", "", $options, 'align="right"', $sortfield, $sortorder);
+print_liste_field_titre('', $_SERVER["PHP_SELF"], "", $options, "", 'width="60" align="center"', $sortfield, $sortorder);
+print "</tr>\n";
+
 print '</tr>';
 
 $var = True;
@@ -277,9 +278,10 @@ foreach ( $object->lines as $line ) {
         
         // Affiche un Sous-Total par compte comptable
         if (isset($displayed_account_number)) {
-          print '<tr class="liste_total"><td align="right" colspan="4">'.$langs->trans("SubTotal").':</td><td class="nowrap" align="right">'.price($sous_total_debit).'</td><td class="nowrap" align="right">'.price($sous_total_credit).'</td>';
-          print "<td>&nbsp;</td>\n";
-          print '</tr>';
+            print '<tr class="liste_total"><td align="right" colspan="5">'.$langs->trans("SubTotal").':</td><td class="nowrap" align="right">'.price($sous_total_debit).'</td><td class="nowrap" align="right">'.price($sous_total_credit).'</td>';
+            print "<td>&nbsp;</td>\n";
+            print "<td>&nbsp;</td>\n";
+            print '</tr>';
         }
         
         // Show the break account
@@ -299,17 +301,18 @@ foreach ( $object->lines as $line ) {
 
 	print '<tr class="oddeven">';
 	print '<td>&nbsp;</td>';
-	print '<td align="right">'.$line->piece_num.'</td>';
+	print '<td align="right"><a href="./card.php?piece_num=' . $line->piece_num . '">'.$line->piece_num.'</a></td>';
 	print '<td align="center">' . dol_print_date($line->doc_date, 'day') . '</td>';
-	print '<td><a href="./card.php?piece_num=' . $line->piece_num . '">' . $line->doc_ref . '</a></td>';
+	
+	// TODO Add a link according to doc_type and fk_doc
+	print '<td class="nowrap">';
+    //if ($line->doc_type == 'supplier_invoice')
+    //if ($line->doc_type == 'customer_invoice')
+	print $line->doc_ref;
+    print '</td>';
     
     // Affiche un lien vers la facture client/fournisseur
     $doc_ref = preg_replace('/\(.*\)/', '', $line->doc_ref);
-    if ($line->doc_type == 'supplier_invoice')
-     print strlen(length_accounta($line->code_tiers)) == 0 ? '<td><a href="/fourn/facture/list.php?search_ref_supplier=' . $doc_ref . '">' . $line->label_compte . '</a></td>' : '<td><a href="/fourn/facture/list.php?search_ref_supplier=' . $doc_ref . '">' . $line->label_compte . '</a><br /><span style="font-size:0.8em">(' . length_accounta($line->code_tiers) . ')</span></td>';
-    elseif ($line->doc_type == 'customer_invoice')
-    print strlen(length_accounta($line->code_tiers)) == 0 ? '<td><a href="/compta/facture/list.php?search_ref=' . $doc_ref . '">' . $line->label_compte . '</a></td>' : '<td><a href="/compta/facture/list.php?search_ref=' . $doc_ref . '">' . $line->label_compte . '</a><br /><span style="font-size:0.8em">(' . length_accounta($line->code_tiers) . ')</span></td>';
-    else
     print strlen(length_accounta($line->code_tiers)) == 0 ? '<td>' . $line->label_compte . '</td>' : '<td>' . $line->label_compte . '<br /><span style="font-size:0.8em">(' . length_accounta($line->code_tiers) . ')</span></td>';
 
 
@@ -332,6 +335,7 @@ foreach ( $object->lines as $line ) {
 print '<tr class="liste_total">';
 print '<td align="right" colspan="5">'.$langs->trans("SubTotal").':</td><td class="nowrap" align="right">'.price($sous_total_debit).'</td><td class="nowrap" align="right">'.price($sous_total_credit).'</td>';
 print "<td>&nbsp;</td>\n";
+print "<td>&nbsp;</td>\n";
 print '</tr>';
 
 
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 4d711599992..41744ae0037 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -2494,6 +2494,10 @@ div.pagination li.pagination .active {
   text-decoration: underline;
   box-shadow: none;
 }
+.paginationafterarrows .nohover {
+  box-shadow: none !important;
+}
+
 div.pagination li.paginationafterarrows {
 	margin-left: 10px;
 }
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index d38391504fa..53e3ec0154c 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -2564,6 +2564,9 @@ div.pagination li.pagination .active {
   text-decoration: underline;
   box-shadow: none;
 }
+.paginationafterarrows .nohover {
+  box-shadow: none !important;
+}
 div.pagination li.paginationafterarrows {
 	margin-left: 10px;
 }

From a8c775dcbda7b8d3c20d12d883d874e24d73c4e0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 29 Apr 2017 18:30:36 +0200
Subject: [PATCH 135/505] Fix compatibility with the removal of "constant".

---
 htdocs/admin/syslog.php                       | 19 ++++++++++++------
 htdocs/core/boxes/box_external_rss.php        |  7 +++++--
 htdocs/core/class/conf.class.php              |  2 +-
 htdocs/core/lib/files.lib.php                 |  6 +++---
 htdocs/core/lib/functions.lib.php             |  4 ++--
 htdocs/core/lib/security2.lib.php             |  4 ++--
 .../modules/syslog/mod_syslog_chromephp.php   |  4 ++--
 .../core/modules/syslog/mod_syslog_file.php   |  3 ++-
 .../modules/syslog/mod_syslog_firephp.php     |  4 ++--
 .../core/modules/syslog/mod_syslog_syslog.php |  8 +++++---
 htdocs/ftp/admin/ftpclient.php                | 20 ++++++++++++-------
 htdocs/main.inc.php                           |  2 +-
 12 files changed, 51 insertions(+), 32 deletions(-)

diff --git a/htdocs/admin/syslog.php b/htdocs/admin/syslog.php
index 71d06ae8e64..e3ad8a3616c 100644
--- a/htdocs/admin/syslog.php
+++ b/htdocs/admin/syslog.php
@@ -40,7 +40,7 @@ $action = GETPOST("action");
 $syslogModules = array();
 $activeModules = array();
 
-if (defined('SYSLOG_HANDLERS')) $activeModules = json_decode(constant('SYSLOG_HANDLERS'));
+if (! empty($conf->global->SYSLOG_HANDLERS)) $activeModules = json_decode($conf->global->SYSLOG_HANDLERS);
 
 $dirsyslogs = array_merge(array('/core/modules/syslog/'), $conf->modules_parts['syslog']);
 foreach ($dirsyslogs as $reldir) {
@@ -88,7 +88,8 @@ if ($action == 'set')
 
 	$newActiveModules = array();
 	$selectedModules = (isset($_POST['SYSLOG_HANDLERS']) ? $_POST['SYSLOG_HANDLERS'] : array());
-	//var_dump($selectedModules);
+	
+	// Save options of handler
 	foreach ($syslogModules as $syslogHandler)
 	{
 		if (in_array($syslogHandler, $syslogModules))
@@ -101,7 +102,7 @@ if ($action == 'set')
 				if (isset($_POST[$option['constant']]))
 				{
 					$_POST[$option['constant']] = trim($_POST[$option['constant']]);
-					dolibarr_del_const($db, $option['constant'], 0);
+					dolibarr_del_const($db, $option['constant'], -1);
 					dolibarr_set_const($db, $option['constant'], $_POST[$option['constant']], 'chaine',0, '', 0);
 				}
 			}
@@ -109,7 +110,9 @@ if ($action == 'set')
 	}
 
 	$activeModules = $newActiveModules;
-	dolibarr_set_const($db, 'SYSLOG_HANDLERS', json_encode($activeModules), 'chaine',0,'',0);
+
+    dolibarr_del_const($db, 'SYSLOG_HANDLERS', -1);  // To be sure ther is not a setup into another entity	
+    dolibarr_set_const($db, 'SYSLOG_HANDLERS', json_encode($activeModules), 'chaine',0,'',0);
 
 	// Check configuration
 	foreach ($activeModules as $modulename) {
@@ -217,8 +220,12 @@ foreach ($syslogModules as $moduleName)
 	{
 		foreach ($setuparray as $option)
 		{
-			if (isset($_POST[$option['constant']])) $value=$_POST[$option['constant']];
-			else if (defined($option['constant'])) $value = constant($option['constant']);
+		    $tmpoption=$option['constant'];
+		    if (! empty($tmpoption))
+		    {
+    			if (isset($_POST[$tmpoption])) $value=$_POST[$tmpoption];
+    			else if (! empty($conf->global->$tmpoption)) $value = $conf->global->$tmpoption;
+		    }
 			else $value = (isset($option['default']) ? $option['default'] : '');
 
 			print $option['name'].': <input type="text" class="flat" name="'.$option['constant'].'" value="'.$value.'"'.(isset($option['attr']) ? ' '.$option['attr'] : '').'>';
diff --git a/htdocs/core/boxes/box_external_rss.php b/htdocs/core/boxes/box_external_rss.php
index 71b643665b3..14e542ff101 100644
--- a/htdocs/core/boxes/box_external_rss.php
+++ b/htdocs/core/boxes/box_external_rss.php
@@ -80,8 +80,11 @@ class box_external_rss extends ModeleBoxes
 		// documents/externalrss is created by module activation
 		// documents/externalrss/tmp is created by rssparser
 
+		$keyforparamurl="EXTERNAL_RSS_URLRSS_".$site;
+		$keyforparamtitle="EXTERNAL_RSS_TITLE_".$site;
+		
 		// Get RSS feed
-        $url=@constant("EXTERNAL_RSS_URLRSS_".$site);
+		$url=$conf->global->$keyforparamurl;
 
         $rssparser=new RssParser($this->db);
 		$result = $rssparser->parser($url, $this->max, $cachedelay, $conf->externalrss->dir_temp);
@@ -90,7 +93,7 @@ class box_external_rss extends ModeleBoxes
 		$description=$rssparser->getDescription();
 		$link=$rssparser->getLink();
 
-        $title=$langs->trans("BoxTitleLastRssInfos",$max, @constant("EXTERNAL_RSS_TITLE_". $site));
+        $title=$langs->trans("BoxTitleLastRssInfos", $max, $conf->global->$keyforparamtitle);
         if ($result < 0 || ! empty($rssparser->error))
         {
             // Show warning
diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index 9446020e3ff..6bca5b7d5a4 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -210,7 +210,7 @@ class Conf
                 $file=dol_sanitizeFileName($file);
                 include_once DOL_DOCUMENT_ROOT . "/".$file."/".$file."_consts.php";
                 foreach ($file2bddconsts as $key=>$value) {
-                    $this->global->$key=constant($value);
+                    $this->global->$key=$value;
                 }
             }
         }
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 77da09b3d64..cbf4af402ae 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -1495,10 +1495,10 @@ function dol_uncompress($inputfile,$outputdir)
 {
     global $conf, $langs;
 
-    if (defined('ODTPHP_PATHTOPCLZIP'))
+    if (! empty($conf->global->ODTPHP_PATHTOPCLZIP))
     {
-    	dol_syslog("Constant ODTPHP_PATHTOPCLZIP for pclzip library is set to ".constant('ODTPHP_PATHTOPCLZIP').", so we use Pclzip to unzip into ".$outputdir);
-        include_once ODTPHP_PATHTOPCLZIP.'/pclzip.lib.php';
+    	dol_syslog("Constant ODTPHP_PATHTOPCLZIP for pclzip library is set to ".$conf->global->ODTPHP_PATHTOPCLZIP.", so we use Pclzip to unzip into ".$outputdir);
+        include_once $conf->global->ODTPHP_PATHTOPCLZIP.'/pclzip.lib.php';
         $archive = new PclZip($inputfile);
         $result=$archive->extract(PCLZIP_OPT_PATH, $outputdir);
         //var_dump($result);
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 2620a3b3efc..857ddc6eec2 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3570,14 +3570,14 @@ function vatrate($rate, $addpercent=false, $info_bits=0, $usestarfornpr=0)
 	    $morelabel=' ('.$reg[1].')';
 	    $rate=preg_replace('/\s*'.preg_quote($morelabel,'/').'/','',$rate);
 	}
-	if (preg_match('/\*/',$rate) || preg_match('/'.constant('MAIN_LABEL_MENTION_NPR').'/i',$rate))
+	if (preg_match('/\*/',$rate))
 	{
 		$rate=str_replace('*','',$rate);
 		$info_bits |= 1;
 	}
 
 	$ret=price($rate,0,'',0,0).($addpercent?'%':'');
-	if ($info_bits & 1) $ret.=' '.($usestarfornpr?'*':constant('MAIN_LABEL_MENTION_NPR'));
+	if ($info_bits & 1) $ret.=' *';
 	$ret.=$morelabel;
 	return $ret;
 }
diff --git a/htdocs/core/lib/security2.lib.php b/htdocs/core/lib/security2.lib.php
index cadf133169d..5139128a5d8 100644
--- a/htdocs/core/lib/security2.lib.php
+++ b/htdocs/core/lib/security2.lib.php
@@ -150,9 +150,9 @@ function dol_loginfunction($langs,$conf,$mysoc)
 
 	// Title
 	$appli=constant('DOL_APPLICATION_TITLE');
-	$title=$appli.' '.DOL_VERSION;
+	$title=$appli.' '.constant('DOL_VERSION');
 	if (! empty($conf->global->MAIN_APPLICATION_TITLE)) $title=$conf->global->MAIN_APPLICATION_TITLE;
-	$titletruedolibarrversion=DOL_VERSION;	// $title used by login template after the @ to inform of true Dolibarr version
+	$titletruedolibarrversion=constant('DOL_VERSION');	// $title used by login template after the @ to inform of true Dolibarr version
 
 	// Note: $conf->css looks like '/theme/eldy/style.css.php'
 	$conf->css = "/theme/".(GETPOST('theme')?GETPOST('theme','alpha'):$conf->theme)."/style.css.php";
diff --git a/htdocs/core/modules/syslog/mod_syslog_chromephp.php b/htdocs/core/modules/syslog/mod_syslog_chromephp.php
index 42a660ab0ae..a9b9ccd5836 100644
--- a/htdocs/core/modules/syslog/mod_syslog_chromephp.php
+++ b/htdocs/core/modules/syslog/mod_syslog_chromephp.php
@@ -48,7 +48,7 @@ class mod_syslog_chromephp extends LogHandler implements LogHandlerInterface
 	{
 		global $langs;
 
-		return $this->isActive()?'':$langs->trans('ClassNotFoundIntoPathWarning','ChromePhp.class.php');
+		return ($this->isActive() == 1)?'':$langs->trans('ClassNotFoundIntoPathWarning','ChromePhp.class.php');
 	}
 	
 	/**
@@ -73,7 +73,7 @@ class mod_syslog_chromephp extends LogHandler implements LogHandlerInterface
 
 		    if ($res)
 		    {
-		        return 1;
+        		return empty($conf->global->SYSLOG_DISABLE_LOGHANDLER_CHROMEPHP)?1:0;    // Set SYSLOG_DISABLE_LOGHANDLER_CHROMEPHP to 1 to disable this loghandler
 		    }
 		    else
 		    {
diff --git a/htdocs/core/modules/syslog/mod_syslog_file.php b/htdocs/core/modules/syslog/mod_syslog_file.php
index 195cab19f7f..68493fd4eb4 100644
--- a/htdocs/core/modules/syslog/mod_syslog_file.php
+++ b/htdocs/core/modules/syslog/mod_syslog_file.php
@@ -51,7 +51,8 @@ class mod_syslog_file extends LogHandler implements LogHandlerInterface
 	 */
 	public function isActive()
 	{
-		return 1;
+	    global $conf;
+		return empty($conf->global->SYSLOG_DISABLE_LOGHANDLER_FILE)?1:0;    // Set SYSLOG_DISABLE_LOGHANDLER_FILE to 1 to disable this loghandler
 	}
 
 	/**
diff --git a/htdocs/core/modules/syslog/mod_syslog_firephp.php b/htdocs/core/modules/syslog/mod_syslog_firephp.php
index fa6111c80a3..69bc98230af 100644
--- a/htdocs/core/modules/syslog/mod_syslog_firephp.php
+++ b/htdocs/core/modules/syslog/mod_syslog_firephp.php
@@ -56,7 +56,7 @@ class mod_syslog_firephp extends LogHandler implements LogHandlerInterface
 	{
 		global $langs;
 
-		return $this->isActive()?'':$langs->trans('ClassNotFoundIntoPathWarning', self::$firephp_class_path);
+		return ($this->isActive() == 1)?'':$langs->trans('ClassNotFoundIntoPathWarning', self::$firephp_class_path);
 	}
 
 	/**
@@ -76,7 +76,7 @@ class mod_syslog_firephp extends LogHandler implements LogHandlerInterface
 			$res = @include_once self::$firephp_class_path;
 			restore_include_path();
 			if ($res) {
-				return 1;
+        		return empty($conf->global->SYSLOG_DISABLE_LOGHANDLER_FIREPHP)?1:0;    // Set SYSLOG_DISABLE_LOGHANDLER_FIREPHP to 1 to disable this loghandler
 			} else {
 				return 0;
 			}
diff --git a/htdocs/core/modules/syslog/mod_syslog_syslog.php b/htdocs/core/modules/syslog/mod_syslog_syslog.php
index c2885f1c89a..e0283ac9a9f 100644
--- a/htdocs/core/modules/syslog/mod_syslog_syslog.php
+++ b/htdocs/core/modules/syslog/mod_syslog_syslog.php
@@ -48,10 +48,12 @@ class mod_syslog_syslog extends LogHandler implements LogHandlerInterface
 	 */
 	public function isActive()
 	{
+	    global $conf;
+	    
 		// This function does not exists on some ISP (Ex: Free in France)
 		if (!function_exists('openlog')) return 0;
 
-		return 1;
+		return empty($conf->global->SYSLOG_DISABLE_LOGHANDLER_SYSLOG)?1:0;    // Set SYSLOG_DISABLE_LOGHANDLER_SYSLOG to 1 to disable this loghandler
 	}
 
 	/**
@@ -111,11 +113,11 @@ class mod_syslog_syslog extends LogHandler implements LogHandlerInterface
 
 		if (! empty($conf->global->MAIN_SYSLOG_DISABLE_SYSLOG)) return;	// Global option to disable output of this handler
 
-		if (! empty($conf->global->SYSLOG_FACILITY))
+		if (! empty($conf->global->SYSLOG_FACILITY))  // Example LOG_USER
 		{
 			$facility = constant($conf->global->SYSLOG_FACILITY);
 		}
-		else $facility = LOG_USER;
+		else $facility = constant('LOG_USER');
 
 		// (int) is required to avoid error parameter 3 expected to be long
 		openlog('dolibarr', LOG_PID | LOG_PERROR, (int) $facility);
diff --git a/htdocs/ftp/admin/ftpclient.php b/htdocs/ftp/admin/ftpclient.php
index 158d9fed3da..845760c26b7 100644
--- a/htdocs/ftp/admin/ftpclient.php
+++ b/htdocs/ftp/admin/ftpclient.php
@@ -247,40 +247,46 @@ else
 			print '<td></td>';
 			print "</tr>";
 
-			
+			$keyforname="FTP_NAME_" . $idrss;
+			$keyforserver="FTP_SERVER_" . $idrss;
+			$keyforport="FTP_PORT_" . $idrss;
+			$keyforuser="FTP_USER_" . $idrss;
+			$keyforpassword="FTP_PASSWORD_" . $idrss;
+			$keyforpassive="FTP_PASSIVE_" . $idrss;
+				
 			print '<tr class="oddeven">';
 			print "<td>".$langs->trans("Name")."</td>";
-			print "<td><input type=\"text\" class=\"flat\" name=\"FTP_NAME_" . $idrss . "\" value=\"" . @constant("FTP_NAME_" . $idrss) . "\" size=\"64\"></td>";
+			print "<td><input type=\"text\" class=\"flat\" name=\"FTP_NAME_" . $idrss . "\" value=\"" . $conf->global->$keyforname . "\" size=\"64\"></td>";
 			print "</tr>";
 
 			
 			print '<tr class="oddeven">';
 			print "<td>".$langs->trans("Server")."</td>";
-			print "<td><input type=\"text\" class=\"flat\" name=\"FTP_SERVER_" . $idrss . "\" value=\"" . @constant("FTP_SERVER_" . $idrss) . "\" size=\"64\"></td>";
+			print "<td><input type=\"text\" class=\"flat\" name=\"FTP_SERVER_" . $idrss . "\" value=\"" . $conf->global->$keyforserver . "\" size=\"64\"></td>";
 			print "</tr>";
 
 			
 			print '<tr class="oddeven">';
 			print "<td width=\"100\">".$langs->trans("Port")."</td>";
-			print "<td><input type=\"text\" class=\"flat\" name=\"FTP_PORT_" . $idrss . "\" value=\"" . @constant("FTP_PORT_" . $idrss) . "\" size=\"64\"></td>";
+			print "<td><input type=\"text\" class=\"flat\" name=\"FTP_PORT_" . $idrss . "\" value=\"" . $conf->global->$keyforport . "\" size=\"64\"></td>";
 			print "</tr>";
 
 			
 			print '<tr class="oddeven">';
 			print "<td width=\"100\">".$langs->trans("User")."</td>";
-			print "<td><input type=\"text\" class=\"flat\" name=\"FTP_USER_" . $idrss . "\" value=\"" . @constant("FTP_USER_" . $idrss) . "\" size=\"24\"></td>";
+			print "<td><input type=\"text\" class=\"flat\" name=\"FTP_USER_" . $idrss . "\" value=\"" . $conf->global->$keyforuser . "\" size=\"24\"></td>";
 			print "</tr>";
 
 			
 			print '<tr class="oddeven">';
 			print "<td width=\"100\">".$langs->trans("Password")."</td>";
-			print "<td><input type=\"password\" class=\"flat\" name=\"FTP_PASSWORD_" . $idrss . "\" value=\"" . @constant("FTP_PASSWORD_" . $idrss) . "\" size=\"24\"></td>";
+			print "<td><input type=\"password\" class=\"flat\" name=\"FTP_PASSWORD_" . $idrss . "\" value=\"" . $conf->global->$keyforpassword . "\" size=\"24\"></td>";
 			print "</tr>";
 
 			
 			print '<tr class="oddeven">';
 			print "<td width=\"100\">".$langs->trans("FTPPassiveMode")."</td>";
-			print '<td>'.$form->selectyesno('FTP_PASSIVE_'.$idrss, @constant("FTP_PASSIVE_" . $idrss), 1).'</td>';
+			print '<td>'.$form->selectyesno('FTP_PASSIVE_'.$idrss, $conf->global->$keyforpassive, 1).'</td>';
 			print "</tr>";
 
 			print "<tr>";
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 72a5f39e02c..6a92e0f4eed 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1865,7 +1865,7 @@ if (! function_exists("llxFooter"))
         dol_htmloutput_events();
 
         // Core error message
-        if (defined("MAIN_CORE_ERROR") && constant("MAIN_CORE_ERROR") == 1)
+        if (! empty($conf->global->MAIN_CORE_ERROR))
         {
             // Ajax version
             if ($conf->use_javascript_ajax)

From 92b5f8d85e7ebd5dfacd05177bf59dd92913c21e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 29 Apr 2017 21:53:01 +0200
Subject: [PATCH 136/505] Move new feature inventory into module stock.

---
 htdocs/core/class/coreobject.class.php        |   4 +-
 htdocs/core/menus/standard/eldy.lib.php       |   9 +
 htdocs/core/modules/modInventory.class.php    | 316 ------------------
 htdocs/core/modules/modStock.class.php        |  84 +++++
 htdocs/langs/en_US/inventory.lang             |  54 ---
 htdocs/langs/en_US/stocks.lang                |  49 +++
 .../inventory/ajax/ajax.inventory.php         |   4 +-
 .../inventory/card.php}                       |  52 +--
 .../inventory/class/inventory.class.php       |   4 +-
 .../{ => product}/inventory/img/bt-save.png   | Bin
 .../{ => product}/inventory/img/inventory.png | Bin
 htdocs/{ => product}/inventory/img/plus.png   | Bin
 htdocs/{ => product}/inventory/img/plus16.png | Bin
 .../inventory/lib/inventory.lib.php           |   6 +-
 htdocs/{ => product}/inventory/list.php       |  12 +-
 .../inventory/tpl/inventory.tpl.php           |   4 +-
 16 files changed, 185 insertions(+), 413 deletions(-)
 delete mode 100644 htdocs/core/modules/modInventory.class.php
 delete mode 100644 htdocs/langs/en_US/inventory.lang
 rename htdocs/{ => product}/inventory/ajax/ajax.inventory.php (86%)
 rename htdocs/{inventory/inventory.php => product/inventory/card.php} (90%)
 rename htdocs/{ => product}/inventory/class/inventory.class.php (98%)
 rename htdocs/{ => product}/inventory/img/bt-save.png (100%)
 rename htdocs/{ => product}/inventory/img/inventory.png (100%)
 rename htdocs/{ => product}/inventory/img/plus.png (100%)
 rename htdocs/{ => product}/inventory/img/plus16.png (100%)
 rename htdocs/{ => product}/inventory/lib/inventory.lib.php (92%)
 rename htdocs/{ => product}/inventory/list.php (91%)
 rename htdocs/{ => product}/inventory/tpl/inventory.tpl.php (98%)

diff --git a/htdocs/core/class/coreobject.class.php b/htdocs/core/class/coreobject.class.php
index 396caf029cc..384374b1893 100644
--- a/htdocs/core/class/coreobject.class.php
+++ b/htdocs/core/class/coreobject.class.php
@@ -18,7 +18,7 @@
  */
 
 /**
- *	\file       htdocs/core/class/coreobject.inventory.php
+ *	\file       htdocs/core/class/coreobject.class.php
  *	\ingroup    core
  *	\brief      File of class to manage all object. Might be replace or merge into commonobject
  */
@@ -663,7 +663,7 @@ class CoreObject extends CommonObject
 			}
 			else
             {
-				$this->{$key} = @stripslashes($value);
+				$this->{$key} = $value;
 			}
 		}
 
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 360a93cf61b..10d1e53475b 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -1252,6 +1252,15 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
                 if ($conf->supplier_order->enabled) $newmenu->add("/product/stock/replenish.php", $langs->trans("Replenishment"), 1, $user->rights->stock->mouvement->creer && $user->rights->fournisseur->lire);
 			}
 
+			// Inventory
+			if (! empty($conf->stock->enabled))
+			{
+				$langs->load("stocks");
+				$newmenu->add("/product/inventory/list.php?leftmenu=stock", $langs->trans("Inventory"), 0, $user->rights->stock->lire, '', $mainmenu, 'stock');
+				$newmenu->add("/product/inventory/card.php?action=create", $langs->trans("NewInventory"), 1, $user->rights->stock->creer);
+				$newmenu->add("/product/inventory/list.php", $langs->trans("List"), 1, $user->rights->stock->lire);
+			}
+			
 			// Expeditions
 			if (! empty($conf->expedition->enabled))
 			{
diff --git a/htdocs/core/modules/modInventory.class.php b/htdocs/core/modules/modInventory.class.php
deleted file mode 100644
index 11b4c992e6a..00000000000
--- a/htdocs/core/modules/modInventory.class.php
+++ /dev/null
@@ -1,316 +0,0 @@
-<?php
-/* Copyright (C) 2003      Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
- *
- * 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/>.
- */
-
-/**
- * 	\defgroup   inventory     Module inventory
- *  \brief      Example of a module descriptor.
- *				Such a file must be copied into htdocs/inventory/core/modules directory.
- *  \file       htdocs/inventory/core/modules/modinventory.class.php
- *  \ingroup    inventory
- *  \brief      Description and activation file for module inventory
- */
-include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
-
-
-/**
- *  Description and activation class for module inventory
- */
-class modinventory extends DolibarrModules
-{
-	/**
-	 *   Constructor. Define names, constants, directories, boxes, permissions
-	 *
-	 *   @param      DoliDB		$db      Database handler
-	 */
-	function __construct($db)
-	{
-        global $langs,$conf;
-
-        $this->db = $db;
-
-		// Id for module (must be unique).
-		// Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id).
-		$this->numero = 104420; // 104000 to 104999 for ATM CONSULTING
-		// Key text used to identify module (for permissions, menus, etc...)
-		$this->rights_class = 'inventory';
-
-		// Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
-		// It is used to group modules in module setup page
-		$this->family = "products";
-		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-		$this->name = preg_replace('/^mod/i','',get_class($this));
-		// Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
-		$this->description = "Description of module inventory";
-		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
-		$this->version = 'dolibarr';
-		// Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
-		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		// Where to store the module in setup page (0=common,1=interface,2=others,3=very specific)
-		$this->special = 0;
-		// Name of image file used for this module.
-		// If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
-		// If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
-		$this->picto='inventory';
-
-		// Defined all module parts (triggers, login, substitutions, menus, css, etc...)
-		// for default path (eg: /inventory/core/xxxxx) (0=disable, 1=enable)
-		// for specific path of parts (eg: /inventory/core/modules/barcode)
-		// for specific css file (eg: /inventory/css/inventory.css.php)
-		//$this->module_parts = array(
-		//                        	'triggers' => 0,                                 	// Set this to 1 if module has its own trigger directory (core/triggers)
-		//							'login' => 0,                                    	// Set this to 1 if module has its own login method directory (core/login)
-		//							'substitutions' => 0,                            	// Set this to 1 if module has its own substitution function file (core/substitutions)
-		//							'menus' => 0,                                    	// Set this to 1 if module has its own menus handler directory (core/menus)
-		//							'theme' => 0,                                    	// Set this to 1 if module has its own theme directory (theme)
-		//                        	'tpl' => 0,                                      	// Set this to 1 if module overwrite template dir (core/tpl)
-		//							'barcode' => 0,                                  	// Set this to 1 if module has its own barcode directory (core/modules/barcode)
-		//							'models' => 0,                                   	// Set this to 1 if module has its own models directory (core/modules/xxx)
-		//							'css' => array('/inventory/css/inventory.css.php'),	// Set this to relative path of css file if module has its own css file
-	 	//							'js' => array('/inventory/js/inventory.js'),          // Set this to relative path of js file if module must load a js on all pages
-		//							'hooks' => array('hookcontext1','hookcontext2')  	// Set here all hooks context managed by module
-		//							'dir' => array('output' => 'othermodulename'),      // To force the default directories names
-		//							'workflow' => array('WORKFLOW_MODULE1_YOURACTIONTYPE_MODULE2'=>array('enabled'=>'! empty($conf->module1->enabled) && ! empty($conf->module2->enabled)', 'picto'=>'yourpicto@inventory')) // Set here all workflow context managed by module
-		//                        );
-		$this->module_parts = array();
-
-		// Data directories to create when module is enabled.
-		// Example: this->dirs = array("/inventory/temp");
-		$this->dirs = array();
-
-		// Config pages. Put here list of php page, stored into inventory/admin directory, to use to setup module.
-		$this->config_page_url = array("inventory.php");
-
-		// Dependencies
-		$this->hidden = false;			// A condition to hide module
-		$this->depends = array('modStock');		// List of modules id that must be enabled if this module is enabled
-		$this->requiredby = array();	// List of modules id to disable if this one is disabled
-		$this->conflictwith = array();	// List of modules id this module is in conflict with
-		$this->phpmin = array(5,0);					// Minimum version of PHP required by module
-		$this->need_dolibarr_version = array(3,0);	// Minimum version of Dolibarr required by module
-		$this->langfiles = array("inventory");
-
-		// Constants
-		// List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 'current' or 'allentities', deleteonunactive)
-		// Example: $this->const=array(0=>array('MYMODULE_MYNEWCONST1','chaine','myvalue','This is a constant to add',1),
-		//                             1=>array('MYMODULE_MYNEWCONST2','chaine','myvalue','This is another constant to add',0, 'current', 1)
-		// );
-		$this->const = array();
-
-		// Array to add new pages in new tabs
-		// Example: $this->tabs = array('objecttype:+tabname1:Title1:mylangfile@inventory:$user->rights->inventory->read:/inventory/mynewtab1.php?id=__ID__',  	// To add a new tab identified by code tabname1
-        //                              'objecttype:+tabname2:Title2:mylangfile@inventory:$user->rights->othermodule->read:/inventory/mynewtab2.php?id=__ID__',  	// To add another new tab identified by code tabname2
-        //                              'objecttype:-tabname:NU:conditiontoremove');                                                     						// To remove an existing tab identified by code tabname
-		// where objecttype can be
-		// 'categories_x'	  to add a tab in category view (replace 'x' by type of category (0=product, 1=supplier, 2=customer, 3=member)
-		// 'contact'          to add a tab in contact view
-		// 'contract'         to add a tab in contract view
-		// 'group'            to add a tab in group view
-		// 'intervention'     to add a tab in intervention view
-		// 'invoice'          to add a tab in customer invoice view
-		// 'invoice_supplier' to add a tab in supplier invoice view
-		// 'member'           to add a tab in fundation member view
-		// 'opensurveypoll'	  to add a tab in opensurvey poll view
-		// 'order'            to add a tab in customer order view
-		// 'order_supplier'   to add a tab in supplier order view
-		// 'payment'		  to add a tab in payment view
-		// 'payment_supplier' to add a tab in supplier payment view
-		// 'product'          to add a tab in product view
-		// 'propal'           to add a tab in propal view
-		// 'project'          to add a tab in project view
-		// 'stock'            to add a tab in stock view
-		// 'thirdparty'       to add a tab in third party view
-		// 'user'             to add a tab in user view
-        $this->tabs = array();
-
-        // Dictionaries
-	    if (! isset($conf->inventory->enabled))
-        {
-        	$conf->inventory=new stdClass();
-        	$conf->inventory->enabled=0;
-        }
-		$this->dictionaries=array();
-        /* Example:
-        if (! isset($conf->inventory->enabled)) $conf->inventory->enabled=0;	// This is to avoid warnings
-        $this->dictionaries=array(
-            'langs'=>'mylangfile@inventory',
-            'tabname'=>array(MAIN_DB_PREFIX."table1",MAIN_DB_PREFIX."table2",MAIN_DB_PREFIX."table3"),		// List of tables we want to see into dictonnary editor
-            'tablib'=>array("Table1","Table2","Table3"),													// Label of tables
-            'tabsql'=>array('SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table1 as f','SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table2 as f','SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table3 as f'),	// Request to select fields
-            'tabsqlsort'=>array("label ASC","label ASC","label ASC"),																					// Sort order
-            'tabfield'=>array("code,label","code,label","code,label"),																					// List of fields (result of select to show dictionary)
-            'tabfieldvalue'=>array("code,label","code,label","code,label"),																				// List of fields (list of fields to edit a record)
-            'tabfieldinsert'=>array("code,label","code,label","code,label"),																			// List of fields (list of fields for insert)
-            'tabrowid'=>array("rowid","rowid","rowid"),																									// Name of columns with primary key (try to always name it 'rowid')
-            'tabcond'=>array($conf->inventory->enabled,$conf->inventory->enabled,$conf->inventory->enabled)												// Condition to show each dictionary
-        );
-        */
-
-        // Boxes
-		// Add here list of php file(s) stored in core/boxes that contains class to show a box.
-        $this->boxes = array();			// List of boxes
-		// Example:
-		//$this->boxes=array(array(0=>array('file'=>'myboxa.php','note'=>'','enabledbydefaulton'=>'Home'),1=>array('file'=>'myboxb.php','note'=>''),2=>array('file'=>'myboxc.php','note'=>'')););
-
-		// Permissions
-		$this->rights = array();		// Permission array used by this module
-		$r=0;
-
-		// Add here list of permission defined by an id, a label, a boolean and two constant strings.
-		// Example:
-		// $this->rights[$r][0] = $this->numero + $r;	// Permission id (must not be already used)
-		// $this->rights[$r][1] = 'Permision label';	// Permission label
-		// $this->rights[$r][3] = 1; 					// Permission by default for new user (0/1)
-		// $this->rights[$r][4] = 'level1';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-		// $this->rights[$r][5] = 'level2';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-		// $r++;
-		
-		$this->rights[$r][0] = $this->numero + $r;	// Permission id (must not be already used)
-		$this->rights[$r][1] = 'inventoryReadPermission';	// Permission label
-		$this->rights[$r][3] = 1; 					// Permission by default for new user (0/1)
-		$this->rights[$r][4] = 'read';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-		$r++;
-		
-		$this->rights[$r][0] = $this->numero + $r;	// Permission id (must not be already used)
-		$this->rights[$r][1] = 'inventoryCreatePermission';	// Permission label
-		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
-		$this->rights[$r][4] = 'create';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-		$r++;
-	
-		$this->rights[$r][0] = $this->numero + $r;	// Permission id (must not be already used)
-		$this->rights[$r][1] = 'inventoryWritePermission';	// Permission label
-		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
-		$this->rights[$r][4] = 'write';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-		$r++;
-		
-		$this->rights[$r][0] = $this->numero + $r;	// Permission id (must not be already used)
-		$this->rights[$r][1] = 'inventoryValidatePermission';	// Permission label
-		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
-		$this->rights[$r][4] = 'validate';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-		$r++;
-
-		$this->rights[$r][0] = $this->numero + $r;	// Permission id (must not be already used)
-		$this->rights[$r][1] = 'inventoryChangePMPPermission';	// Permission label
-		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
-		$this->rights[$r][4] = 'changePMP';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-		$r++;
-
-		// Main menu entries
-		$this->menu = array();			// List of menus to add
-		$r=0;
-
-
-        $this->menu[$r]=array(
-            'fk_menu'=>'fk_mainmenu=products',			                // Put 0 if this is a top menu
-            'type'=>'left',			                // This is a Top menu entry
-            'titre'=>'Inventory',
-            'mainmenu'=>'products',
-            'leftmenu'=>'inventory_left',
-            'url'=>'/inventory/list.php',
-            'langs'=>'inventory',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-            'position'=>100+$r,
-            'enabled'=>'$conf->inventory->enabled',	// Define condition to show or hide menu entry. Use '$conf->inventory->enabled' if entry must be visible if module is enabled.
-            'perms'=>'$user->rights->inventory->read',			                // Use 'perms'=>'$user->rights->inventory->level1->level2' if you want your menu with a permission rules
-            'target'=>'',
-            'user'=>2
-        );				                // 0=Menu for internal users, 1=external users, 2=both
-        $r++;
-		
-		$this->menu[$r]=array(
-		    'fk_menu'=>'fk_mainmenu=products,fk_leftmenu=inventory_left',			                // Put 0 if this is a top menu
-            'type'=>'left',			                // This is a Top menu entry
-            'titre'=>'NewInventory',
-            'mainmenu'=>'products',
-            'leftmenu'=>'inventory_left_create',
-            'url'=>'/inventory/inventory.php?action=create',
-            'position'=>100+$r,
-            'enabled'=>'$conf->inventory->enabled',	// Define condition to show or hide menu entry. Use '$conf->inventory->enabled' if entry must be visible if module is enabled.
-            'perms'=>'$user->rights->inventory->create',			                // Use 'perms'=>'$user->rights->inventory->level1->level2' if you want your menu with a permission rules
-            'target'=>'',
-            'user'=>2
-        );				                // 0=Menu for internal users, 1=external users, 2=both
-		$r++;
-
-        $this->menu[$r]=array(
-            'fk_menu'=>'fk_mainmenu=products,fk_leftmenu=inventory_left',			                // Put 0 if this is a top menu
-            'type'=>'left',			                // This is a Top menu entry
-            'titre'=>'ListInventory',
-            'mainmenu'=>'products',
-            'leftmenu'=>'inventory_left_list',
-            'url'=>'/inventory/list.php',
-            'langs'=>'inventory',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-            'position'=>100+$r,
-            'enabled'=>'$conf->inventory->enabled',	// Define condition to show or hide menu entry. Use '$conf->inventory->enabled' if entry must be visible if module is enabled.
-            'perms'=>'$user->rights->inventory->read',			                // Use 'perms'=>'$user->rights->inventory->level1->level2' if you want your menu with a permission rules
-            'target'=>'',
-            'user'=>2
-        );				                // 0=Menu for internal users, 1=external users, 2=both
-        $r++;
-
-		// Exports
-		$r=1;
-
-		// Example:
-		// $this->export_code[$r]=$this->rights_class.'_'.$r;
-		// $this->export_label[$r]='CustomersInvoicesAndInvoiceLines';	// Translation key (used only if key ExportDataset_xxx_z not found)
-        // $this->export_enabled[$r]='1';                               // Condition to show export in list (ie: '$user->id==3'). Set to 1 to always show when module is enabled.
-		// $this->export_permission[$r]=array(array("facture","facture","export"));
-		// $this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','s.fk_pays'=>'Country','s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.code_compta'=>'CustomerAccountancyCode','s.code_compta_fournisseur'=>'SupplierAccountancyCode','f.rowid'=>"InvoiceId",'f.facnumber'=>"InvoiceRef",'f.datec'=>"InvoiceDateCreation",'f.datef'=>"DateInvoice",'f.total'=>"TotalHT",'f.total_ttc'=>"TotalTTC",'f.tva'=>"TotalVAT",'f.paye'=>"InvoicePaid",'f.fk_statut'=>'InvoiceStatus','f.note'=>"InvoiceNote",'fd.rowid'=>'LineId','fd.description'=>"LineDescription",'fd.price'=>"LineUnitPrice",'fd.tva_tx'=>"LineVATRate",'fd.qty'=>"LineQty",'fd.total_ht'=>"LineTotalHT",'fd.total_tva'=>"LineTotalTVA",'fd.total_ttc'=>"LineTotalTTC",'fd.date_start'=>"DateStart",'fd.date_end'=>"DateEnd",'fd.fk_product'=>'ProductId','p.ref'=>'ProductRef');
-		// $this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','s.fk_pays'=>'company','s.phone'=>'company','s.siren'=>'company','s.siret'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.code_compta'=>'company','s.code_compta_fournisseur'=>'company','f.rowid'=>"invoice",'f.facnumber'=>"invoice",'f.datec'=>"invoice",'f.datef'=>"invoice",'f.total'=>"invoice",'f.total_ttc'=>"invoice",'f.tva'=>"invoice",'f.paye'=>"invoice",'f.fk_statut'=>'invoice','f.note'=>"invoice",'fd.rowid'=>'invoice_line','fd.description'=>"invoice_line",'fd.price'=>"invoice_line",'fd.total_ht'=>"invoice_line",'fd.total_tva'=>"invoice_line",'fd.total_ttc'=>"invoice_line",'fd.tva_tx'=>"invoice_line",'fd.qty'=>"invoice_line",'fd.date_start'=>"invoice_line",'fd.date_end'=>"invoice_line",'fd.fk_product'=>'product','p.ref'=>'product');
-		// $this->export_sql_start[$r]='SELECT DISTINCT ';
-		// $this->export_sql_end[$r]  =' FROM ('.MAIN_DB_PREFIX.'facture as f, '.MAIN_DB_PREFIX.'facturedet as fd, '.MAIN_DB_PREFIX.'societe as s)';
-		// $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';
-		// $this->export_sql_order[$r] .=' ORDER BY s.nom';
-		// $r++;
-	}
-
-	/**
-	 *		Function called when module is enabled.
-	 *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
-	 *		It also creates data directories
-	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-	 */
-	function init($options='')
-	{
-		$sql = array();
-		define('INC_FROM_DOLIBARR', true);
-		dol_include_once('/inventory/config.php');
-		dol_include_once("/inventory/script/create-maj-base.php");
-		
-		return $this->_init($sql, $options);
-	}
-
-	/**
-	 *		Function called when module is disabled.
-	 *      Remove from database constants, boxes and permissions from Dolibarr database.
-	 *		Data directories are not deleted
-	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-	 */
-	function remove($options='')
-	{
-		$sql = array();
-
-		return $this->_remove($sql, $options);
-	}
-
-}
diff --git a/htdocs/core/modules/modStock.class.php b/htdocs/core/modules/modStock.class.php
index 8fe4eb52abe..cfdc6db298c 100644
--- a/htdocs/core/modules/modStock.class.php
+++ b/htdocs/core/modules/modStock.class.php
@@ -117,6 +117,90 @@ class modStock extends DolibarrModules
 		$this->rights[4][4] = 'mouvement';
 		$this->rights[4][5] = 'creer';
 
+		/*
+		$this->rights[$r][0] = $this->numero + $r;	// Permission id (must not be already used)
+		$this->rights[$r][1] = 'inventoryReadPermission';	// Permission label
+		$this->rights[$r][3] = 1; 					// Permission by default for new user (0/1)
+		$this->rights[$r][4] = 'read';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		$r++;
+		
+		$this->rights[$r][0] = $this->numero + $r;	// Permission id (must not be already used)
+		$this->rights[$r][1] = 'inventoryCreatePermission';	// Permission label
+		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
+		$this->rights[$r][4] = 'create';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		$r++;
+		
+		$this->rights[$r][0] = $this->numero + $r;	// Permission id (must not be already used)
+		$this->rights[$r][1] = 'inventoryWritePermission';	// Permission label
+		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
+		$this->rights[$r][4] = 'write';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		$r++;
+		
+		$this->rights[$r][0] = $this->numero + $r;	// Permission id (must not be already used)
+		$this->rights[$r][1] = 'inventoryValidatePermission';	// Permission label
+		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
+		$this->rights[$r][4] = 'validate';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		$r++;
+		
+		$this->rights[$r][0] = $this->numero + $r;	// Permission id (must not be already used)
+		$this->rights[$r][1] = 'inventoryChangePMPPermission';	// Permission label
+		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
+		$this->rights[$r][4] = 'changePMP';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		$r++;
+		*/
+		
+		// Main menu entries
+		$this->menu = array();			// List of menus to add
+		$r=0;
+		
+		/*
+		$this->menu[$r]=array(
+		    'fk_menu'=>'fk_mainmenu=products',			                // Put 0 if this is a top menu
+		    'type'=>'left',			                // This is a Top menu entry
+		    'titre'=>'Inventory',
+		    'mainmenu'=>'products',
+		    'leftmenu'=>'inventory_left',
+		    'url'=>'/inventory/list.php',
+		    'langs'=>'inventory',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+		    'position'=>100+$r,
+		    'enabled'=>'$conf->inventory->enabled',	// Define condition to show or hide menu entry. Use '$conf->inventory->enabled' if entry must be visible if module is enabled.
+		    'perms'=>'$user->rights->inventory->read',			                // Use 'perms'=>'$user->rights->inventory->level1->level2' if you want your menu with a permission rules
+		    'target'=>'',
+		    'user'=>2
+		);				                // 0=Menu for internal users, 1=external users, 2=both
+		$r++;
+		
+		$this->menu[$r]=array(
+		    'fk_menu'=>'fk_mainmenu=products,fk_leftmenu=inventory_left',			                // Put 0 if this is a top menu
+		    'type'=>'left',			                // This is a Top menu entry
+		    'titre'=>'NewInventory',
+		    'mainmenu'=>'products',
+		    'leftmenu'=>'inventory_left_create',
+		    'url'=>'/inventory/inventory.php?action=create',
+		    'position'=>100+$r,
+		    'enabled'=>'$conf->inventory->enabled',	// Define condition to show or hide menu entry. Use '$conf->inventory->enabled' if entry must be visible if module is enabled.
+		    'perms'=>'$user->rights->inventory->create',			                // Use 'perms'=>'$user->rights->inventory->level1->level2' if you want your menu with a permission rules
+		    'target'=>'',
+		    'user'=>2
+		);				                // 0=Menu for internal users, 1=external users, 2=both
+		$r++;
+		
+		$this->menu[$r]=array(
+		    'fk_menu'=>'fk_mainmenu=products,fk_leftmenu=inventory_left',			                // Put 0 if this is a top menu
+		    'type'=>'left',			                // This is a Top menu entry
+		    'titre'=>'ListInventory',
+		    'mainmenu'=>'products',
+		    'leftmenu'=>'inventory_left_list',
+		    'url'=>'/inventory/list.php',
+		    'langs'=>'inventory',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+		    'position'=>100+$r,
+		    'enabled'=>'$conf->inventory->enabled',	// Define condition to show or hide menu entry. Use '$conf->inventory->enabled' if entry must be visible if module is enabled.
+		    'perms'=>'$user->rights->inventory->read',			                // Use 'perms'=>'$user->rights->inventory->level1->level2' if you want your menu with a permission rules
+		    'target'=>'',
+		    'user'=>2
+		);				                // 0=Menu for internal users, 1=external users, 2=both
+		$r++;
+		*/
 		
 		// Menus
 		//-------
diff --git a/htdocs/langs/en_US/inventory.lang b/htdocs/langs/en_US/inventory.lang
deleted file mode 100644
index db92cb9a14a..00000000000
--- a/htdocs/langs/en_US/inventory.lang
+++ /dev/null
@@ -1,54 +0,0 @@
-# Dolibarr language file - Source file is en_US - inventory
-
-Module104420Name = Inventory
-Module104420Desc = Create and manage your inventory
-
-inventorySetup = Inventory Setup
-
-inventoryCreatePermission=Create new inventory
-inventoryReadPermission=View inventories
-inventoryWritePermission=Update inventories
-inventoryValidatePermission=Validate inventory
-
-inventoryTitle=Inventory
-inventoryListTitle=Inventories
-inventoryListEmpty=No inventory in progress
-
-inventoryCreateDelete=Create/Delete inventory
-inventoryCreate=Create new
-inventoryEdit=Edit
-inventoryValidate=Validated
-inventoryDraft=Running
-inventorySelectWarehouse=Warehouse choice
-inventoryConfirmCreate=Create
-inventoryOfWarehouse=Inventory for warehouse : %s
-inventoryErrorQtyAdd=Error : one quantity is leaser than zero
-inventoryMvtStock=By inventory
-inventoryWarningProductAlreadyExists=This product is already into list
-SelectCategory=Category filter
-SelectFournisseur=Supplier filter
-inventoryOnDate=Inventory 
-INVENTORY_DISABLE_VIRTUAL=Allow to not destock child product from a kit on inventory
-INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Use the buy price if no last buy price can be found
-INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT=Stock mouvment have date of inventory
-inventoryChangePMPPermission=Allow to change PMP value for a product
-ColumnNewPMP=New unit PMP
-OnlyProdsInStock=Do not add product without stock
-TheoricalQty=Theorique qty
-TheoricalValue=Theorique qty
-LastPA=Last BP
-CurrentPA=Curent BP
-RealQty=Real Qty
-RealValue=Real Value
-RegulatedQty=Regulated Qty
-AddInventoryProduct=Add product to inventory
-AddProduct=Add
-ApplyPMP=Apply PMP
-FlushInventory=Flush inventory
-ConfirmFlushInventory=Do you confirm this action ?
-InventoryFlushed=Inventory flushed
-ExitEditMode=Exit edition
-inventoryDeleteLine=Delete line
-RegulateStock=Regulate Stock
-ListInventory=List
-NewInventory=New inventory
\ No newline at end of file
diff --git a/htdocs/langs/en_US/stocks.lang b/htdocs/langs/en_US/stocks.lang
index aeb83b925bd..943debdd14c 100644
--- a/htdocs/langs/en_US/stocks.lang
+++ b/htdocs/langs/en_US/stocks.lang
@@ -146,3 +146,52 @@ ProductStockWarehouseUpdated=Stock limit for alert and desired optimal stock cor
 ProductStockWarehouseDeleted=Stock limit for alert and desired optimal stock correctly deleted
 AddNewProductStockWarehouse=Set new limit for alert and desired optimal stock
 AddStockLocationLine=Decrease quantity then click to add another warehouse for this product
+
+Module104420Name = Inventory
+Module104420Desc = Create and manage your inventory
+NewInventory=New inventory
+inventorySetup = Inventory Setup
+inventoryCreatePermission=Create new inventory
+inventoryReadPermission=View inventories
+inventoryWritePermission=Update inventories
+inventoryValidatePermission=Validate inventory
+inventoryTitle=Inventory
+inventoryListTitle=Inventories
+inventoryListEmpty=No inventory in progress
+inventoryCreateDelete=Create/Delete inventory
+inventoryCreate=Create new
+inventoryEdit=Edit
+inventoryValidate=Validated
+inventoryDraft=Running
+inventorySelectWarehouse=Warehouse choice
+inventoryConfirmCreate=Create
+inventoryOfWarehouse=Inventory for warehouse : %s
+inventoryErrorQtyAdd=Error : one quantity is leaser than zero
+inventoryMvtStock=By inventory
+inventoryWarningProductAlreadyExists=This product is already into list
+SelectCategory=Category filter
+SelectFournisseur=Supplier filter
+inventoryOnDate=Inventory 
+INVENTORY_DISABLE_VIRTUAL=Allow to not destock child product from a kit on inventory
+INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Use the buy price if no last buy price can be found
+INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT=Stock mouvment have date of inventory
+inventoryChangePMPPermission=Allow to change PMP value for a product
+ColumnNewPMP=New unit PMP
+OnlyProdsInStock=Do not add product without stock
+TheoricalQty=Theorique qty
+TheoricalValue=Theorique qty
+LastPA=Last BP
+CurrentPA=Curent BP
+RealQty=Real Qty
+RealValue=Real Value
+RegulatedQty=Regulated Qty
+AddInventoryProduct=Add product to inventory
+AddProduct=Add
+ApplyPMP=Apply PMP
+FlushInventory=Flush inventory
+ConfirmFlushInventory=Do you confirm this action ?
+InventoryFlushed=Inventory flushed
+ExitEditMode=Exit edition
+inventoryDeleteLine=Delete line
+RegulateStock=Regulate Stock
+ListInventory=List
diff --git a/htdocs/inventory/ajax/ajax.inventory.php b/htdocs/product/inventory/ajax/ajax.inventory.php
similarity index 86%
rename from htdocs/inventory/ajax/ajax.inventory.php
rename to htdocs/product/inventory/ajax/ajax.inventory.php
index c1f372806c8..0d0e7040d97 100644
--- a/htdocs/inventory/ajax/ajax.inventory.php
+++ b/htdocs/product/inventory/ajax/ajax.inventory.php
@@ -9,7 +9,7 @@
     switch ($put)
     {
         case 'qty':
-            if (empty($user->rights->inventory->write)) { echo -1; exit; }
+            if (empty($user->rights->stock->write)) { echo -1; exit; }
             
             $fk_det_inventory = GETPOST('fk_det_inventory');
             
@@ -29,7 +29,7 @@
             break;
 			
         case 'pmp':
-            if (!$user->rights->inventory->write || !$user->rights->inventory->changePMP) { echo -1; exit; }
+            if (!$user->rights->stock->write || !$user->rights->stock->changePMP) { echo -1; exit; }
             
             $fk_det_inventory = GETPOST('fk_det_inventory');
             
diff --git a/htdocs/inventory/inventory.php b/htdocs/product/inventory/card.php
similarity index 90%
rename from htdocs/inventory/inventory.php
rename to htdocs/product/inventory/card.php
index c10cbd1ab20..eb1ad21a8a0 100644
--- a/htdocs/inventory/inventory.php
+++ b/htdocs/product/inventory/card.php
@@ -16,27 +16,27 @@
  */
 
 /**
- *	\file       htdocs/inventory/inventory.php
+ *	\file       htdocs/inventory/card.php
  *	\ingroup    product
  *	\brief      File of class to manage inventory
  */
  
-require_once '../main.inc.php';
+require_once '../../main.inc.php';
 
 require_once DOL_DOCUMENT_ROOT.'/core/class/listview.class.php';
-require_once DOL_DOCUMENT_ROOT.'/inventory/class/inventory.class.php';
-require_once DOL_DOCUMENT_ROOT.'/inventory/lib/inventory.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 include_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/inventory/class/inventory.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/inventory/lib/inventory.lib.php';
 
 $langs->load('stock');
 $langs->load('inventory');
 
-if(empty($user->rights->inventory->read)) accessforbidden();
+if(empty($user->rights->stock->read)) accessforbidden();
 
 _action();
 
@@ -54,7 +54,7 @@ function _action()
 	
 	switch($action) {
 		case 'create':
-			if (empty($user->rights->inventory->create)) accessforbidden();
+			if (empty($user->rights->stock->create)) accessforbidden();
 			
 			$inventory = new Inventory($db);
 			
@@ -63,7 +63,7 @@ function _action()
 			break;
 		
 		case 'confirmCreate':
-			if (empty($user->rights->inventory->create)) accessforbidden();
+			if (empty($user->rights->stock->create)) accessforbidden();
 		
 			$inventory = new Inventory($db);
 			$inventory->setValues($_POST);
@@ -79,19 +79,19 @@ function _action()
             	$inventory->addProductsFor($fk_warehouse,$fk_category,$fk_supplier,$only_prods_in_stock);
             	$inventory->update($user);
             	
-            	header('Location: '.dol_buildpath('/inventory/inventory.php?id='.$inventory->id.'&action=edit', 1));
+            	header('Location: '.dol_buildpath('/product/inventory/card.php?id='.$inventory->id.'&action=edit', 1));
             	
             }
             else{
             	
             	setEventMessage($inventory->error,'errors');
-            	header('Location: '.dol_buildpath('/inventory/inventory.php?action=create', 1));
+            	header('Location: '.dol_buildpath('/product/inventory/card.php?action=create', 1));
             }
             
 			break;
 			
 		case 'edit':
-			if (!$user->rights->inventory->write) accessforbidden();
+			if (!$user->rights->stock->write) accessforbidden();
 			
 			
 			$inventory = new Inventory($db);
@@ -102,7 +102,7 @@ function _action()
 			break;
 			
 		case 'save':
-			if (!$user->rights->inventory->write) accessforbidden();
+			if (!$user->rights->stock->write) accessforbidden();
 			
 			
 			$id = GETPOST('id');
@@ -120,13 +120,13 @@ function _action()
 			else 
 			{
 				$inventory->udpate($user);
-				header('Location: '.dol_buildpath('inventory/inventory.php?id='.$inventory->getId().'&action=view', 1));
+				header('Location: '.dol_buildpath('/product/inventory/card.php?id='.$inventory->getId().'&action=view', 1));
 			}
 			
 			break;
 			
 		case 'confirm_regulate':
-			if (!$user->rights->inventory->write) accessforbidden();
+			if (!$user->rights->stock->write) accessforbidden();
 			$id = GETPOST('id');
 			
 			$inventory = new Inventory($db);
@@ -160,7 +160,7 @@ function _action()
 			break;
 			
 		case 'add_line':
-			if (!$user->rights->inventory->write) accessforbidden();
+			if (!$user->rights->stock->write) accessforbidden();
 			
 			$id = GETPOST('id');
 			$fk_warehouse = GETPOST('fk_warehouse');
@@ -212,7 +212,7 @@ function _action()
 			break;
 			
 		case 'confirm_delete_line':
-			if (!$user->rights->inventory->write) accessforbidden();
+			if (!$user->rights->stock->write) accessforbidden();
 			
 			
 			//Cette action devrais se faire uniquement si le status de l'inventaire est à 0 mais aucune vérif
@@ -230,7 +230,7 @@ function _action()
 			
 			break;
         case 'confirm_flush':
-            if (!$user->rights->inventory->create) accessforbidden();
+            if (!$user->rights->stock->create) accessforbidden();
             
             
             $id = GETPOST('id');
@@ -247,7 +247,7 @@ function _action()
             
             break;
 		case 'confirm_delete':
-			if (!$user->rights->inventory->create) accessforbidden();
+			if (!$user->rights->stock->create) accessforbidden();
             
 			
 			$id = GETPOST('id');
@@ -276,7 +276,7 @@ function _action()
 			break;
 			
 		default:
-			if (!$user->rights->inventory->write) accessforbidden();
+			if (!$user->rights->stock->write) accessforbidden();
 				
 			$id = GETPOST('id');
 				
@@ -395,13 +395,13 @@ function card(&$inventory, $action='edit')
 		
 	);
 	
-	$can_validate = !empty($user->rights->inventory->validate);
-	$view_url = dol_buildpath('/inventory/inventory.php', 1);
+	$can_validate = !empty($user->rights->stock->validate);
+	$view_url = dol_buildpath('/product/inventory/card.php', 1);
 	
 	$view = array(
 		'mode' => $action
-		,'url' => dol_buildpath('/inventory/inventory.php', 1)
-		,'can_validate' => (int) $user->rights->inventory->validate
+		,'url' => dol_buildpath('/product/inventory/card.php', 1)
+		,'can_validate' => (int) $user->rights->stock->validate
 		,'is_already_validate' => (int) $inventory->status
 		,'token'=>$_SESSION['newtoken']
 	);
@@ -446,10 +446,10 @@ function card_line(&$inventory, &$lines, $mode)
 			'qty_view' => ($Inventorydet->qty_view ? $Inventorydet->qty_view : 0),
 			'qty_stock' => $stock,
 			'qty_regulated' => ($Inventorydet->qty_regulated ? $Inventorydet->qty_regulated : 0),
-			'action' => ($user->rights->inventory->write && $mode=='edit' ? '<a href="'.dol_buildpath('inventory/inventory.php?id='.$inventory->id.'&action=delete_line&rowid='.$Inventorydet->id, 1).'">'.img_picto($langs->trans('inventoryDeleteLine'), 'delete').'</a>' : ''),
+			'action' => ($user->rights->stock->write && $mode=='edit' ? '<a href="'.dol_buildpath('/product/inventory/card.php?id='.$inventory->id.'&action=delete_line&rowid='.$Inventorydet->id, 1).'">'.img_picto($langs->trans('inventoryDeleteLine'), 'delete').'</a>' : ''),
 			'pmp_stock'=>round($pmp_actual,2),
             'pmp_actual'=> round($pmp * $Inventorydet->qty_view,2),
-			'pmp_new'=>(!empty($user->rights->inventory->changePMP) && $mode == 'edit' ? '<input type="text" name="new_pmp['.$k.']" value="'.$Inventorydet->new_pmp.'" size="8" style="text-align:right;" /> <a id="a_save_new_pmp_'.$k.'" href="javascript:save_pmp('.$k.')">'.img_picto($langs->trans('Save'), 'bt-save.png@inventory').'</a>' :  price($Inventorydet->new_pmp)),
+			'pmp_new'=>(!empty($user->rights->stock->changePMP) && $mode == 'edit' ? '<input type="text" name="new_pmp['.$k.']" value="'.$Inventorydet->new_pmp.'" size="8" style="text-align:right;" /> <a id="a_save_new_pmp_'.$k.'" href="javascript:save_pmp('.$k.')">'.img_picto($langs->trans('Save'), 'bt-save.png@inventory').'</a>' :  price($Inventorydet->new_pmp)),
             'pa_stock'=>round($last_pa * $stock,2),
             'pa_actual'=>round($last_pa * $Inventorydet->qty_view,2),
 			'current_pa_stock'=>round($current_pa * $stock,2),
@@ -551,7 +551,7 @@ function _footerList($view,$total_pmp,$total_pmp_actual,$total_pa,$total_pa_actu
             <th>&nbsp;</th>
             <th align="right"><?php echo price($total_pmp_actual) ?></th>
             <?php
-            if(!empty($user->rights->inventory->changePMP)) {
+            if(!empty($user->rights->stock->changePMP)) {
                	echo '<th>&nbsp;</th>';	
 			}
 			?>
@@ -626,7 +626,7 @@ function _headerList($view) {
 	    	    <th>&nbsp;</th>
 	    	    <th><?php echo $langs->trans('PMP'); ?></th>
 	    	    <?php
-	    	    if(!empty($user->rights->inventory->changePMP)) {
+	    	    if(!empty($user->rights->stock->changePMP)) {
 	    	    	echo '<th rel="newPMP">'.$langs->trans('ColumnNewPMP').'</th>';
 	    	    }
 	    	    ?>
diff --git a/htdocs/inventory/class/inventory.class.php b/htdocs/product/inventory/class/inventory.class.php
similarity index 98%
rename from htdocs/inventory/class/inventory.class.php
rename to htdocs/product/inventory/class/inventory.class.php
index 14230d90893..b652066d4a4 100644
--- a/htdocs/inventory/class/inventory.class.php
+++ b/htdocs/product/inventory/class/inventory.class.php
@@ -16,7 +16,7 @@
  */
 
 /**
- *	\file       htdocs/inventory/class/product.inventory.php
+ *	\file       htdocs/inventory/class/product.class.php
  *	\ingroup    product
  *	\brief      File of class to manage predefined products stock
  */
@@ -434,7 +434,7 @@ class Inventory extends CoreObject
      */
 	public function getNomUrl($withpicto = 1)
     {
-        return '<a href="'.dol_buildpath('/inventory/inventory.php?id='.$this->id, 1).'">'.($withpicto ? img_picto('','object_list.png','',0).' ' : '').$this->getTitle().'</a>';
+        return '<a href="'.DOL_URL_ROOT.'/product/inventory/card.php?id='.$this->id.'">'.($withpicto ? img_picto('','object_list.png','',0).' ' : '').$this->getTitle().'</a>';
 	}
 
     /**
diff --git a/htdocs/inventory/img/bt-save.png b/htdocs/product/inventory/img/bt-save.png
similarity index 100%
rename from htdocs/inventory/img/bt-save.png
rename to htdocs/product/inventory/img/bt-save.png
diff --git a/htdocs/inventory/img/inventory.png b/htdocs/product/inventory/img/inventory.png
similarity index 100%
rename from htdocs/inventory/img/inventory.png
rename to htdocs/product/inventory/img/inventory.png
diff --git a/htdocs/inventory/img/plus.png b/htdocs/product/inventory/img/plus.png
similarity index 100%
rename from htdocs/inventory/img/plus.png
rename to htdocs/product/inventory/img/plus.png
diff --git a/htdocs/inventory/img/plus16.png b/htdocs/product/inventory/img/plus16.png
similarity index 100%
rename from htdocs/inventory/img/plus16.png
rename to htdocs/product/inventory/img/plus16.png
diff --git a/htdocs/inventory/lib/inventory.lib.php b/htdocs/product/inventory/lib/inventory.lib.php
similarity index 92%
rename from htdocs/inventory/lib/inventory.lib.php
rename to htdocs/product/inventory/lib/inventory.lib.php
index eb79ae67cc4..aa8c9c9677d 100644
--- a/htdocs/inventory/lib/inventory.lib.php
+++ b/htdocs/product/inventory/lib/inventory.lib.php
@@ -31,12 +31,12 @@ function inventoryAdminPrepareHead()
 {
     global $langs, $conf;
 
-    $langs->load("inventory@inventory");
+    $langs->load("inventory");
 
     $h = 0;
     $head = array();
 
-    $head[$h][0] = dol_buildpath("/admin/inventory.php", 1);
+    $head[$h][0] = DOL_URL_ROOT."/admin/inventory.php";
     $head[$h][1] = $langs->trans("Parameters");
     $head[$h][2] = 'settings';
     $h++;
@@ -60,7 +60,7 @@ function inventoryPrepareHead(&$inventory, $title='Inventory', $get='')
 	global $langs;
 	
 	return array(
-		array(dol_buildpath('/inventory/inventory.php?id='.$inventory->id.$get, 1), $langs->trans($title),'inventory')
+		array(dol_buildpath('/product/inventory/card.php?id='.$inventory->id.$get, 1), $langs->trans($title),'inventory')
 	);
 }
 
diff --git a/htdocs/inventory/list.php b/htdocs/product/inventory/list.php
similarity index 91%
rename from htdocs/inventory/list.php
rename to htdocs/product/inventory/list.php
index d55996d0407..46c41637da0 100644
--- a/htdocs/inventory/list.php
+++ b/htdocs/product/inventory/list.php
@@ -16,27 +16,27 @@
  */
 
 /**
- *	\file       htdocs/inventory/inventory.php
+ *	\file       htdocs/inventory/list.php
  *	\ingroup    product
  *	\brief      File of class to manage inventory
  */
  
-require_once '../main.inc.php';
+require_once '../../main.inc.php';
 
 require_once DOL_DOCUMENT_ROOT.'/core/class/listview.class.php';
-require_once DOL_DOCUMENT_ROOT.'/inventory/class/inventory.class.php';
-require_once DOL_DOCUMENT_ROOT.'/inventory/lib/inventory.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 include_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/inventory/class/inventory.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/inventory/lib/inventory.lib.php';
 
 $langs->load("stock");
 $langs->load("inventory");
 
-if (empty($user->rights->inventory->read)) accessforbidden();
+if (empty($user->rights->stock->read)) accessforbidden();
 		
 llxHeader('',$langs->trans('inventoryListTitle'),'','');
 
@@ -91,7 +91,7 @@ echo $list->render(Inventory::getSQL('All'), array(
 ));
 
 
-/*if (!empty($user->rights->inventory->create))
+/*if (!empty($user->rights->stock->create))
 {
     print '<div class="tabsAction">';
     print '<a class="butAction" href="inventory.php?action=create">'.$langs->trans('inventoryCreate').'</a>';
diff --git a/htdocs/inventory/tpl/inventory.tpl.php b/htdocs/product/inventory/tpl/inventory.tpl.php
similarity index 98%
rename from htdocs/inventory/tpl/inventory.tpl.php
rename to htdocs/product/inventory/tpl/inventory.tpl.php
index e3fa8e5421d..d55454bd39a 100644
--- a/htdocs/inventory/tpl/inventory.tpl.php
+++ b/htdocs/product/inventory/tpl/inventory.tpl.php
@@ -136,7 +136,7 @@
                 <?php if ($can_validate == 1) { ?>
                     <td align="right"><?php echo price($row['pmp_actual']); ?></td>
                     <?php
-                    if(!empty($user->rights->inventory->changePMP)) {
+                    if(!empty($user->rights->stock->changePMP)) {
                     	echo '<td align="right">'.$row['pmp_new'].'</td>';	
 					}
                     ?>
@@ -169,7 +169,7 @@
 				<a href="<?php echo $view_url; ?>?id=<?php echo $inventory->id; ?>&action=exportCSV" class="butAction"><?php echo $langs->trans('ExportCSV') ?></a>
 				<a href="<?php echo $view_url; ?>?id=<?php echo $inventory->id; ?>&action=edit" class="butAction"><?php echo $langs->trans('Modify') ?></a>
 				<?php 
-				 if(!empty($user->rights->inventory->changePMP)) {
+				 if(!empty($user->rights->stock->changePMP)) {
 				 	echo '<a href="'.$view_url.'?id='.$inventory->id.'&action=changePMP" class="butAction">'.$langs->trans('ApplyPMP').'</a>';
 				 }
 				

From 4993a43025467973b725f45320e577f4edfd75c2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 30 Apr 2017 02:15:13 +0200
Subject: [PATCH 137/505] Move new feature inventory into module stock.

---
 htdocs/core/class/coreobject.class.php        |  16 +-
 htdocs/core/class/listview.class.php          |  87 ++-
 htdocs/core/js/listview.js                    |  20 +
 htdocs/core/menus/standard/eldy.lib.php       |  13 +-
 htdocs/langs/en_US/stocks.lang                |   4 +-
 .../modulebuilder/skeletons/skeleton_card.php |  12 +-
 .../product/inventory/ajax/ajax.inventory.php |   4 +-
 htdocs/product/inventory/card.php             | 576 ++++++++++--------
 .../inventory/class/inventory.class.php       |   7 +-
 htdocs/product/inventory/list.php             |  44 +-
 .../product/inventory/tpl/inventory.tpl.php   |  34 +-
 11 files changed, 450 insertions(+), 367 deletions(-)

diff --git a/htdocs/core/class/coreobject.class.php b/htdocs/core/class/coreobject.class.php
index 384374b1893..8aa0cfe2ad6 100644
--- a/htdocs/core/class/coreobject.class.php
+++ b/htdocs/core/class/coreobject.class.php
@@ -32,7 +32,7 @@ class CoreObject extends CommonObject
 	/**
 	 *  @var Array $_fields Fields to synchronize with Database
 	 */
-	protected $__fields=array();
+	protected $fields=array();
 
     /**
 	 *  Constructor
@@ -55,9 +55,9 @@ class CoreObject extends CommonObject
 		$this->datec = 0;
 		$this->tms = 0;
 		
-		if (!empty($this->__fields))
+		if (!empty($this->fields))
 		{
-			foreach ($this->__fields as $field=>$info)
+			foreach ($this->fields as $field=>$info)
 			{
 		        if ($this->is_date($info)) $this->{$field} = time();
 		        elseif ($this->is_array($info)) $this->{$field} = array();
@@ -87,9 +87,9 @@ class CoreObject extends CommonObject
      */
     private function checkFieldType($field, $type)
     {
-		if (isset($this->__fields[$field]) && method_exists($this, 'is_'.$type))
+		if (isset($this->fields[$field]) && method_exists($this, 'is_'.$type))
 		{
-			return $this->{'is_'.$type}($this->__fields[$field]);
+			return $this->{'is_'.$type}($this->fields[$field]);
 		}
 		else
         {
@@ -214,7 +214,7 @@ class CoreObject extends CommonObject
     private function set_save_query()
     {
 		$query=array();
-		foreach ($this->__fields as $field=>$info)
+		foreach ($this->fields as $field=>$info)
 		{
 			if($this->is_date($info))
 			{
@@ -260,7 +260,7 @@ class CoreObject extends CommonObject
      */
     private function get_field_list()
     {
-		$keys = array_keys($this->__fields);
+		$keys = array_keys($this->fields);
 	    return implode(',', $keys);
 	}
 
@@ -272,7 +272,7 @@ class CoreObject extends CommonObject
      */
     private function set_vars_by_db(&$obj)
     {
-		foreach ($this->__fields as $field => $info)
+		foreach ($this->fields as $field => $info)
 		{
 			if($this->is_date($info))
 			{
diff --git a/htdocs/core/class/listview.class.php b/htdocs/core/class/listview.class.php
index dc2dbbcd161..91dd182fc56 100644
--- a/htdocs/core/class/listview.class.php
+++ b/htdocs/core/class/listview.class.php
@@ -294,15 +294,27 @@ class Listview
      */
     public function render($sql, $TParam=array())
     {
+        global $conf;
+        
 		$TField=array();
 		
 		$this->init($TParam);
-		$THeader = $this->initHeader($TParam);
+
+        $THeader = $this->initHeader($TParam);
 		
 		$sql = $this->search($sql,$TParam);
-		$sql = $this->order_by($sql, $TParam);		
+		$sql.= $this->db->order($TParam['param']['sortfield'], $TParam['param']['sortorder']);
+
+		$nbtotalofrecords = '';
+		if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
+		{
+		    $result = $this->db->query($sql);
+		    $nbtotalofrecords = $this->db->num_rows($result);
+		}
+		$sql.= $this->db->plimit($TParam['param']['limit'] + 1, $TParam['param']['offset']);
+		
+		$this->parse_sql($THeader, $TField, $TParam, $sql);
 		
-		$this->parse_sql($THeader, $TField, $TParam, $sql);	
 		list($TTotal, $TTotalGroup)=$this->get_total($TField, $TParam);
 		
 		return $this->renderList($THeader, $TField, $TTotal, $TTotalGroup, $TParam);
@@ -468,6 +480,7 @@ class Listview
     /**
      * @return string
      */
+	/*
     private function getJS()
     {
 		$javaScript = '<script language="javascript">
@@ -479,7 +492,8 @@ class Listview
 
 		return $javaScript;
 	}
-
+    */
+	
     /**
      * @param $TParam
      * @param $TField
@@ -595,7 +609,7 @@ class Listview
 		$TExport = $this->setExport($TParam, $TField, $THeader);
 		$TField = $this->addTotalGroup($TField,$TTotalGroup);
 		
-		$out = $this->getJS();
+		//$out = $this->getJS();
 		
 		$dolibarr_decalage = $this->totalRow > $this->totalRowToShow ? 1 : 0;
 		ob_start();
@@ -605,6 +619,26 @@ class Listview
 	
 		$out.= '<table id="'.$this->id.'" class="liste" width="100%"><thead>';
 			
+    	if(count($TSearch)>0)
+		{
+			$out.='<tr class="liste_titre liste_titre_search barre-recherche">';
+			
+			foreach ($THeader as $field => $head)
+			{
+				if ($field === 'selectedfields')
+				{
+					$out.= '<td class="liste_titre" align="right">'.$this->form->showFilterAndCheckAddButtons(0).'</td>';
+				}
+				else
+				{
+					$moreattrib = 'style="width:'.$head['width'].';text-align:'.$head['text-align'].'"';
+					$out .= '<td class="liste_titre" '.$moreattrib.'>'.$TSearch[$field].'</td>';
+				}
+			}
+			
+			$out.='</tr>';
+		}
+				
 		$out.= '<tr class="liste_titre">';
 		foreach($THeader as $field => $head)
 		{
@@ -635,31 +669,11 @@ class Listview
 		//$out .= '<th aligne="right" class="maxwidthsearch liste_titre">--</th>';
 		$out .= '</tr>';
 		
-		if(count($TSearch)>0)
-		{
-			$out.='<tr class="liste_titre barre-recherche">';
-			
-			foreach ($THeader as $field => $head)
-			{
-				if ($field === 'selectedfields')
-				{
-					$out.= '<td class="liste_titre" align="right">'.$this->form->showFilterAndCheckAddButtons(0).'</td>';
-				}
-				else
-				{
-					$moreattrib = 'style="width:'.$head['width'].';text-align:'.$head['text-align'].'"';
-					$out .= '<td class="liste_titre" '.$moreattrib.'>'.$TSearch[$field].'</td>';
-				}
-			}
-			
-			$out.='</tr>';
-		}
-				
 		$out.='</thead><tbody>';
 		
 		if(empty($TField))
 		{
-			if (!empty($TParam['list']['messageNothing'])) $out .= '<tr class="pair" align="center"><td colspan="'.(count($TParam['title'])+1).'">'.$TParam['list']['messageNothing'].'</td></tr>';
+			if (!empty($TParam['list']['messageNothing'])) $out .= '<tr class="oddeven"><td colspan="'.(count($TParam['title'])+1).'"><span class="opacitymedium">'.$TParam['list']['messageNothing'].'</span></td></tr>';
 		}
 		else
         {
@@ -729,27 +743,6 @@ class Listview
 	}
 
 
-    /**
-     * @param $sql
-     * @param $TParam
-     * @return string
-     */
-    private function order_by($sql, &$TParam)
-    {
-		global $db;
-		
-		if (!empty($TParam['sortfield']))
-		{
-			if(strpos($sql,'LIMIT ') !== false) list($sql, $sqlLIMIT) = explode('LIMIT ', $sql);
-			
-			$sql .= $db->order($TParam['sortfield'], $TParam['sortorder']);
-			
-			if (!empty($sqlLIMIT)) $sql .= ' LIMIT '.$sqlLIMIT;
-		}
-		
-		return $sql;
-	}
-
     /**
      * @param $THeader
      * @param $TField
diff --git a/htdocs/core/js/listview.js b/htdocs/core/js/listview.js
index d68a7993218..de3113d0fae 100644
--- a/htdocs/core/js/listview.js
+++ b/htdocs/core/js/listview.js
@@ -1,3 +1,23 @@
+// Copyright (C) 2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+// or see http://www.gnu.org/
+
+//
+// \file       htdocs/core/js/listview.js
+// \brief      File that include javascript functions for lists
+//
 var Listview_include = true;
 
 function Listview_OrderDown(idListe, column) {
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 10d1e53475b..1e88601604f 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -1253,12 +1253,15 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 			}
 
 			// Inventory
-			if (! empty($conf->stock->enabled))
+			if ($conf->global->MAIN_LEVEL_FEATURES >= 2)
 			{
-				$langs->load("stocks");
-				$newmenu->add("/product/inventory/list.php?leftmenu=stock", $langs->trans("Inventory"), 0, $user->rights->stock->lire, '', $mainmenu, 'stock');
-				$newmenu->add("/product/inventory/card.php?action=create", $langs->trans("NewInventory"), 1, $user->rights->stock->creer);
-				$newmenu->add("/product/inventory/list.php", $langs->trans("List"), 1, $user->rights->stock->lire);
+    			if (! empty($conf->stock->enabled))
+    			{
+    				$langs->load("stocks");
+    				$newmenu->add("/product/inventory/list.php?leftmenu=stock", $langs->trans("Inventory"), 0, $user->rights->stock->lire, '', $mainmenu, 'stock');
+    				$newmenu->add("/product/inventory/card.php?action=create", $langs->trans("NewInventory"), 1, $user->rights->stock->creer);
+    				$newmenu->add("/product/inventory/list.php", $langs->trans("List"), 1, $user->rights->stock->lire);
+    			}
 			}
 			
 			// Expeditions
diff --git a/htdocs/langs/en_US/stocks.lang b/htdocs/langs/en_US/stocks.lang
index 943debdd14c..9c9f82f6efb 100644
--- a/htdocs/langs/en_US/stocks.lang
+++ b/htdocs/langs/en_US/stocks.lang
@@ -146,9 +146,7 @@ ProductStockWarehouseUpdated=Stock limit for alert and desired optimal stock cor
 ProductStockWarehouseDeleted=Stock limit for alert and desired optimal stock correctly deleted
 AddNewProductStockWarehouse=Set new limit for alert and desired optimal stock
 AddStockLocationLine=Decrease quantity then click to add another warehouse for this product
-
-Module104420Name = Inventory
-Module104420Desc = Create and manage your inventory
+InventoryDate=Inventory date
 NewInventory=New inventory
 inventorySetup = Inventory Setup
 inventoryCreatePermission=Create new inventory
diff --git a/htdocs/modulebuilder/skeletons/skeleton_card.php b/htdocs/modulebuilder/skeletons/skeleton_card.php
index f0a9dd23c26..42fce48e2cb 100644
--- a/htdocs/modulebuilder/skeletons/skeleton_card.php
+++ b/htdocs/modulebuilder/skeletons/skeleton_card.php
@@ -109,9 +109,9 @@ if (empty($reshook))
 	}
 	
 	// Action to add record
-	if ($action == 'add')
+	if ($action == 'add' && ! empty($user->rights->mymodule->create))
 	{
-		if (GETPOST('cancel'))
+		if ($cancel)
 		{
 			$urltogo=$backtopage?$backtopage:dol_buildpath('/mymodule/list.php',1);
 			header("Location: ".$urltogo);
@@ -154,7 +154,7 @@ if (empty($reshook))
 	}
 
 	// Action to update record
-	if ($action == 'update')
+	if ($action == 'update' && ! empty($user->rights->mymodule->create))
 	{
 		$error=0;
 
@@ -189,7 +189,7 @@ if (empty($reshook))
 	}
 
 	// Action to delete
-	if ($action == 'confirm_delete')
+	if ($action == 'confirm_delete' && ! empty($user->rights->mymodule->delete))
 	{
 		$result=$object->delete($user);
 		if ($result > 0)
@@ -216,10 +216,10 @@ if (empty($reshook))
 * Put here all code to build page
 ****************************************************/
 
-llxHeader('','MyPageName','');
-
 $form=new Form($db);
 
+llxHeader('','MyPageName','');
+
 
 // Put here content of your page
 
diff --git a/htdocs/product/inventory/ajax/ajax.inventory.php b/htdocs/product/inventory/ajax/ajax.inventory.php
index 0d0e7040d97..c0d8443f433 100644
--- a/htdocs/product/inventory/ajax/ajax.inventory.php
+++ b/htdocs/product/inventory/ajax/ajax.inventory.php
@@ -1,7 +1,7 @@
 <?php
 
-    require '../../main.inc.php';
-    require_once DOL_DOCUMENT_ROOT.'/inventory/class/inventory.class.php';
+    require '../../../main.inc.php';
+    require_once DOL_DOCUMENT_ROOT.'/product/inventory/class/inventory.class.php';
     
     $get = GETPOST('get');
     $put = GETPOST('put');
diff --git a/htdocs/product/inventory/card.php b/htdocs/product/inventory/card.php
index eb1ad21a8a0..e89a59bb505 100644
--- a/htdocs/product/inventory/card.php
+++ b/htdocs/product/inventory/card.php
@@ -32,277 +32,303 @@ include_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/inventory/class/inventory.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/inventory/lib/inventory.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+
 
 $langs->load('stock');
 $langs->load('inventory');
 
-if(empty($user->rights->stock->read)) accessforbidden();
+$id=GETPOST('id', 'int');
+$ref=GETPOST('ref', 'alpha');
+$action=(GETPOST('action','alpha') ? GETPOST('action','alpha') : 'view');
+$cancel=GETPOST('cancel');
+$confirm=GETPOST('confirm','alpha');
+$socid=GETPOST('socid','int');
+if (! empty($user->societe_id)) $socid=$user->societe_id;
 
-_action();
+if (empty($action) && empty($id) && empty($ref)) $action='view';
 
-function _action() 
+// Protection if external user
+if ($user->societe_id > 0)
 {
-	global $user, $db, $conf, $langs;	
-	
-	/*******************************************************************
-	* ACTIONS
-	*
-	* Put here all code to do according to value of "action" parameter
-	********************************************************************/
+    //accessforbidden();
+}
+$result = restrictedArea($user, 'stock', $id);
 
-	$action=GETPOST('action');
-	
-	switch($action) {
-		case 'create':
-			if (empty($user->rights->stock->create)) accessforbidden();
-			
-			$inventory = new Inventory($db);
-			
-			card_warehouse( $inventory);
 
-			break;
+$object = new Inventory($db);
+$extrafields = new ExtraFields($db);
+
+// fetch optionals attributes and labels
+$extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
+
+// Load object
+include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php';  // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
+
+// Initialize technical object to manage hooks of modules. Note that conf->hooks_modules contains array array
+$hookmanager->initHooks(array('inventory'));
+
+
+
+/*
+ * Actions
+ */
+
+$parameters=array('id'=>$id, 'ref'=>$ref, 'objcanvas'=>$objcanvas);
+$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+if (empty($reshook))
+{
+    if ($cancel)
+    {
+        if ($action != 'addlink')
+        {
+            $urltogo=$backtopage?$backtopage:dol_buildpath('/mymodule/list.php',1);
+            header("Location: ".$urltogo);
+            exit;
+        }
+        if ($id > 0 || ! empty($ref)) $ret = $object->fetch($id,$ref);
+        $action='';
+    }
+    
+    if ($action == 'confirmCreate')
+    {
+		if (empty($user->rights->stock->creer)) accessforbidden();
+	
+		if ($cancel)
+		{
+		    $urltogo=$backtopage?$backtopage:dol_buildpath('/mymodule/list.php',1);
+		    header("Location: ".$urltogo);
+		    exit;
+		}
 		
-		case 'confirmCreate':
-			if (empty($user->rights->stock->create)) accessforbidden();
+		$error=0;
 		
-			$inventory = new Inventory($db);
-			$inventory->setValues($_POST);
-			
-            $fk_inventory = $inventory->create($user);
-			if($fk_inventory>0) {
-            	
-            	$fk_category = (int) GETPOST('fk_category');
-            	$fk_supplier = (int) GETPOST('fk_supplier');
-            	$fk_warehouse = (int) GETPOST('fk_warehouse');
-            	$only_prods_in_stock = (int) GETPOST('OnlyProdsInStock');
-            	
-            	$inventory->addProductsFor($fk_warehouse,$fk_category,$fk_supplier,$only_prods_in_stock);
-            	$inventory->update($user);
-            	
-            	header('Location: '.dol_buildpath('/product/inventory/card.php?id='.$inventory->id.'&action=edit', 1));
-            	
-            }
-            else{
-            	
-            	setEventMessage($inventory->error,'errors');
-            	header('Location: '.dol_buildpath('/product/inventory/card.php?action=create', 1));
-            }
+		$object->setValues($_POST);
+		
+        $fk_inventory = $object->create($user);
+		if ($fk_inventory>0)
+		{
+        	$fk_category = (int) GETPOST('fk_category');
+        	$fk_supplier = (int) GETPOST('fk_supplier');
+        	$fk_warehouse = (int) GETPOST('fk_warehouse');
+        	$only_prods_in_stock = (int) GETPOST('OnlyProdsInStock');
+        	
+        	$object->addProductsFor($fk_warehouse,$fk_category,$fk_supplier,$only_prods_in_stock);
+        	$object->update($user);
+        	
+        	header('Location: '.dol_buildpath('/product/inventory/card.php?id='.$object->id.'&action=edit', 1));
+            exit;        	
+        }
+        else
+        {
+        	setEventMessage($object->error,'errors');
+        	header('Location: '.dol_buildpath('/product/inventory/card.php?action=create', 1));
+        	exit;
+        }
+        
+		break;
+    }
+    
+    switch($action) {
+    	case 'save':
+    		if (!$user->rights->stock->creer) accessforbidden();
+    		
+    		
+    		$id = GETPOST('id');
+    		
+    		$object = new Inventory($db);
+    		$object->fetch($id);
+    		
+    		$object->setValues($_REQUEST);
+    		
+    		if ($object->errors)
+    		{
+    			setEventMessage($object->errors, 'errors');
+    			card( $object, 'edit');
+    		}
+    		else 
+    		{
+    			$object->udpate($user);
+    			header('Location: '.dol_buildpath('/product/inventory/card.php?id='.$object->getId().'&action=view', 1));
+    		}
+    		
+    		break;
+    		
+    	case 'confirm_regulate':
+    		if (!$user->rights->stock->creer) accessforbidden();
+    		$id = GETPOST('id');
+    		
+    		$object = new Inventory($db);
+    		$object->fetch($id);
             
-			break;
-			
-		case 'edit':
-			if (!$user->rights->stock->write) accessforbidden();
-			
-			
-			$inventory = new Inventory($db);
-			$inventory->fetch(GETPOST('id'));
-			
-			card($inventory, GETPOST('action'));
-			
-			break;
-			
-		case 'save':
-			if (!$user->rights->stock->write) accessforbidden();
-			
-			
-			$id = GETPOST('id');
-			
-			$inventory = new Inventory($db);
-			$inventory->fetch($id);
-			
-			$inventory->setValues($_REQUEST);
-			
-			if ($inventory->errors)
-			{
-				setEventMessage($inventory->errors, 'errors');
-				card( $inventory, 'edit');
-			}
-			else 
-			{
-				$inventory->udpate($user);
-				header('Location: '.dol_buildpath('/product/inventory/card.php?id='.$inventory->getId().'&action=view', 1));
-			}
-			
-			break;
-			
-		case 'confirm_regulate':
-			if (!$user->rights->stock->write) accessforbidden();
-			$id = GETPOST('id');
-			
-			$inventory = new Inventory($db);
-			$inventory->fetch($id);
-            
-            if($inventory->status == 0) {
-                $inventory->status = 1;
-                $inventory->update($user);
+            if($object->status == 0) {
+                $object->status = 1;
+                $object->update($user);
                 
-                card( $inventory, 'view');
+                card( $object, 'view');
                 
             
             }
             else {
-               card( $inventory, 'view');
+               card( $object, 'view');
             }
             
-			break;
-			
-		case 'confirm_changePMP':
-			
-			$id = GETPOST('id');
-			
-			$inventory = new Inventory($db);
-			$inventory->fetch( $id );
-			
-			$inventory->changePMP($user);
-			
-			card( $inventory, 'view');
-			
-			break;
-			
-		case 'add_line':
-			if (!$user->rights->stock->write) accessforbidden();
-			
-			$id = GETPOST('id');
-			$fk_warehouse = GETPOST('fk_warehouse');
-			
-			$inventory = new Inventory($db);
-			$inventory->fetch( $id );
-			
-			$fk_product = GETPOST('fk_product');
-			if ($fk_product>0)
-			{
-				$product = new Product($db);
-				if($product->fetch($fk_product)<=0 || $product->type != 0) {
-					setEventMessage($langs->trans('ThisIsNotAProduct'),'errors');
-				}
-				else{
-					
-					//Check product not already exists
-					$alreadyExists = false;
-					if(!empty($inventory->Inventorydet)) {
-						foreach ($inventory->Inventorydet as $invdet)
-						{
-							if ($invdet->fk_product == $product->id
-								&& $invdet->fk_warehouse == $fk_warehouse)
-							{
-								$alreadyExists = true;
-								break;
-							}
-						}
-					}
-					if (!$alreadyExists)
-					{
-					    if($inventory->addProduct($product->id, $fk_warehouse)) {
-					    	setEventMessage($langs->trans('ProductAdded'));
-					    }
-					}
-					else
-					{
-						setEventMessage($langs->trans('inventoryWarningProductAlreadyExists'), 'warnings');
-					}
-					
-				}
-				
-				$inventory->update($user);
-				$inventory->sortDet();
-			}
-			
-			card( $inventory, 'edit');
-			
-			break;
-			
-		case 'confirm_delete_line':
-			if (!$user->rights->stock->write) accessforbidden();
-			
-			
-			//Cette action devrais se faire uniquement si le status de l'inventaire est à 0 mais aucune vérif
-			$rowid = GETPOST('rowid');
-			$Inventorydet = new Inventorydet($db);
-			if($Inventorydet->fetch($rowid)>0) {
-				$Inventorydet->delete($user);
-				setEventMessage("ProductDeletedFromInventory");
-			}
-			$id = GETPOST('id');
-			$inventory = new Inventory($db);
-			$inventory->fetch( $id);
-			
-			card($inventory, 'edit');
-			
-			break;
+    		break;
+    		
+    	case 'confirm_changePMP':
+    		
+    		$id = GETPOST('id');
+    		
+    		$object = new Inventory($db);
+    		$object->fetch( $id );
+    		
+    		$object->changePMP($user);
+    		
+    		card( $object, 'view');
+    		
+    		break;
+    		
+    	case 'add_line':
+    		if (!$user->rights->stock->creer) accessforbidden();
+    		
+    		$id = GETPOST('id');
+    		$fk_warehouse = GETPOST('fk_warehouse');
+    		
+    		$object = new Inventory($db);
+    		$object->fetch( $id );
+    		
+    		$fk_product = GETPOST('fk_product');
+    		if ($fk_product>0)
+    		{
+    			$product = new Product($db);
+    			if($product->fetch($fk_product)<=0 || $product->type != 0) {
+    				setEventMessage($langs->trans('ThisIsNotAProduct'),'errors');
+    			}
+    			else{
+    				
+    				//Check product not already exists
+    				$alreadyExists = false;
+    				if(!empty($object->Inventorydet)) {
+    					foreach ($object->Inventorydet as $invdet)
+    					{
+    						if ($invdet->fk_product == $product->id
+    							&& $invdet->fk_warehouse == $fk_warehouse)
+    						{
+    							$alreadyExists = true;
+    							break;
+    						}
+    					}
+    				}
+    				if (!$alreadyExists)
+    				{
+    				    if($object->addProduct($product->id, $fk_warehouse)) {
+    				    	setEventMessage($langs->trans('ProductAdded'));
+    				    }
+    				}
+    				else
+    				{
+    					setEventMessage($langs->trans('inventoryWarningProductAlreadyExists'), 'warnings');
+    				}
+    				
+    			}
+    			
+    			$object->update($user);
+    			$object->sortDet();
+    		}
+    		
+    		card( $object, 'edit');
+    		
+    		break;
+    		
+    	case 'confirm_delete_line':
+    		if (!$user->rights->stock->creer) accessforbidden();
+    		
+    		
+    		//Cette action devrais se faire uniquement si le status de l'inventaire est à 0 mais aucune vérif
+    		$rowid = GETPOST('rowid');
+    		$objectdet = new Inventorydet($db);
+    		if($objectdet->fetch($rowid)>0) {
+    			$objectdet->delete($user);
+    			setEventMessage("ProductDeletedFromInventory");
+    		}
+    		$id = GETPOST('id');
+    		$object = new Inventory($db);
+    		$object->fetch( $id);
+    		
+    		card($object, 'edit');
+    		
+    		break;
         case 'confirm_flush':
-            if (!$user->rights->stock->create) accessforbidden();
+            if (!$user->rights->stock->creer) accessforbidden();
             
             
             $id = GETPOST('id');
             
-            $inventory = new Inventory($db);
-            $inventory->fetch($id);
+            $object = new Inventory($db);
+            $object->fetch($id);
             
-            $inventory->deleteAllLine($user);
+            $object->deleteAllLine($user);
             
             setEventMessage($langs->trans('InventoryFlushed'));
             
-            card( $inventory, 'edit');
+            card( $object, 'edit');
            
             
             break;
-		case 'confirm_delete':
-			if (!$user->rights->stock->create) accessforbidden();
+    	case 'confirm_delete':
+    		if (!$user->rights->stock->supprimer) accessforbidden();
             
-			
-			$id = GETPOST('id');
-			
-			$inventory = new Inventory($db);
-			$inventory->fetch($id);
-			
-			$inventory->delete($user);
-			
-			setEventMessage($langs->trans('InventoryDeleted'));
-			
-			header('Location: '.dol_buildpath('/inventory/list.php', 1));
-			exit;
-			
-			break;
-		case 'exportCSV':
-			
-			$id = GETPOST('id');
-			
-			$inventory = new Inventory($db);
-			$inventory->fetch($id);
-			
-			_exportCSV($inventory);
-			
-			exit;
-			break;
-			
-		default:
-			if (!$user->rights->stock->write) accessforbidden();
-				
-			$id = GETPOST('id');
-				
-			$inventory = new Inventory($db);
-			$inventory->fetch($id);
-				
-			card($inventory, $action );
-				
-			
-			break;
-	}
-	
+    		
+    		$id = GETPOST('id');
+    		
+    		$object = new Inventory($db);
+    		$object->fetch($id);
+    		
+    		$object->delete($user);
+    		
+    		setEventMessage($langs->trans('InventoryDeleted'));
+    		
+    		header('Location: '.dol_buildpath('/inventory/list.php', 1));
+    		exit;
+    		
+    		break;
+    	/*case 'exportCSV':
+    		
+    		$id = GETPOST('id');
+    		
+    		$object = new Inventory($db);
+    		$object->fetch($id);
+    		
+    		_exportCSV($object);
+    		
+    		exit;
+    		break;
+    		*/
+    }
 }
 
-function card_warehouse(&$inventory)
+
+/*
+ * Views
+ */
+
+$form=new Form($db);
+
+llxHeader('',$langs->trans('Inventory'),'','');
+	
+if ($action == 'create')
 {
-	global $langs,$conf,$db, $user, $form;
+    if (empty($user->rights->stock->creer)) accessforbidden();
+
+    print load_fiche_titre($langs->trans("NewInventory"));
 	
-	dol_include_once('/categories/class/categorie.class.php');    
-        
-	llxHeader('',$langs->trans('inventorySelectWarehouse'),'','');
-	print dol_get_fiche_head(inventoryPrepareHead($inventory));
-	
-	echo '<form name="confirmCreate" action="'.$_SERVER['PHP_SELF'].'" method="post" />';
+    echo '<form name="confirmCreate" action="'.$_SERVER['PHP_SELF'].'" method="post" />';
 	echo '<input type="hidden" name="action" value="confirmCreate" />';
 	
+	dol_fiche_head();
+	
     $formproduct = new FormProduct($db);
     
     ?>
@@ -337,61 +363,63 @@ function card_warehouse(&$inventory)
     </table>
     <?php
     
-	print '<div class="tabsAction">';
-	print '<input type="submit" class="butAction" value="'.$langs->trans('inventoryConfirmCreate').'" />';
-	print '</div>';
-	
+    dol_fiche_end();
+    
+    print '<div class="center">';
+    print '<input type="submit" class="button" value="'.$langs->trans('inventoryConfirmCreate').'" />';
+    print ' &nbsp; &nbsp; ';
+    print '<input type="submit" class="button" value="'.$langs->trans('inventoryConfirmCreate').'" />';
+    print '</div>';
+    
 	echo '</form>';
 	
-	llxFooter('');
 }
 
-function card(&$inventory, $action='edit')
+if ($action == 'view' || $action == 'edit' ||  empty($action))
 {
-	global $langs, $conf, $db, $user,$form;
-	
-	llxHeader('',$langs->trans('inventoryEdit'),'','');
-	
+    $object = new Inventory($db);
+    $object->fetch($id);
+
 	if($action == 'changePMP')
 	{
-		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$inventory->id, $langs->trans('ApplyNewPMP'), $langs->trans('ConfirmApplyNewPMP', $inventory->getTitle()), 'confirm_changePMP', array(),'no',1);
+		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ApplyNewPMP'), $langs->trans('ConfirmApplyNewPMP', $object->getTitle()), 'confirm_changePMP', array(),'no',1);
 	}
 	else if($action == 'flush')
 	{
-		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$inventory->id,$langs->trans('FlushInventory'),$langs->trans('ConfirmFlushInventory',$inventory->getTitle()),'confirm_flush',array(),'no',1);
+		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id,$langs->trans('FlushInventory'),$langs->trans('ConfirmFlushInventory',$object->getTitle()),'confirm_flush',array(),'no',1);
 	}
 	else if($action == 'delete')
 	{
-		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$inventory->id,$langs->trans('Delete'),$langs->trans('ConfirmDelete',$inventory->getTitle()),'confirm_delete',array(),'no',1);
+		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id,$langs->trans('Delete'),$langs->trans('ConfirmDelete',$object->getTitle()),'confirm_delete',array(),'no',1);
 	}
 	else if($action == 'delete_line')
 	{
-		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$inventory->id.'&rowid='.GETPOST('rowid'),$langs->trans('DeleteLine'),$langs->trans('ConfirmDeleteLine',$inventory->getTitle()),'confirm_delete_line',array(),'no',1);
+		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&rowid='.GETPOST('rowid'),$langs->trans('DeleteLine'),$langs->trans('ConfirmDeleteLine',$object->getTitle()),'confirm_delete_line',array(),'no',1);
 	}
 	else if($action == 'regulate')
 	{
-		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$inventory->id,$langs->trans('RegulateStock'),$langs->trans('ConfirmRegulateStock',$inventory->getTitle()),'confirm_regulate',array(),'no',1);
+		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id,$langs->trans('RegulateStock'),$langs->trans('ConfirmRegulateStock',$object->getTitle()),'confirm_regulate',array(),'no',1);
 	}
 	
 	$warehouse = new Entrepot($db);
-	$warehouse->fetch($inventory->fk_warehouse);
+	$warehouse->fetch($object->fk_warehouse);
 	
-	print dol_get_fiche_head(inventoryPrepareHead($inventory, $langs->trans('inventoryOfWarehouse', $warehouse->libelle), empty($action) ? '': '&action='.$action));
+	print dol_get_fiche_head(inventoryPrepareHead($object, $langs->trans('inventoryOfWarehouse', $warehouse->libelle), empty($action) ? '': '&action='.$action));
 	
 	$lines = array();
-	card_line($inventory, $lines, $action);
+	card_line($object, $lines, $action);
 	
-	print '<b>'.$langs->trans('inventoryOnDate')." ".$inventory->getDate('date_inventory').'</b><br><br>';
+	print '<b>'.$langs->trans('inventoryOnDate')." ".$object->getDate('date_inventory').'</b><br><br>';
 	
-	$inventoryTPL = array(
-		'id'=> $inventory->id
-		,'date_cre' => $inventory->getDate('date_cre', 'd/m/Y')
-		,'date_maj' => $inventory->getDate('date_maj', 'd/m/Y H:i')
-		,'fk_warehouse' => $inventory->fk_warehouse
-		,'status' => $inventory->status
-		,'entity' => $inventory->entity
-		,'amount' => price( round($inventory->amount,2) )
-		,'amount_actual'=>price (round($inventory->amount_actual,2))
+	$objectTPL = array(
+		'id'=> $object->id
+		,'date_cre' => $object->getDate('date_cre', 'd/m/Y')
+		,'date_maj' => $object->getDate('date_maj', 'd/m/Y H:i')
+		,'fk_warehouse' => $object->fk_warehouse
+		,'status' => $object->status
+		,'entity' => $object->entity
+		,'amount' => price( round($object->amount,2) )
+		,'amount_actual'=>price (round($object->amount_actual,2))
 		
 	);
 	
@@ -402,15 +430,18 @@ function card(&$inventory, $action='edit')
 		'mode' => $action
 		,'url' => dol_buildpath('/product/inventory/card.php', 1)
 		,'can_validate' => (int) $user->rights->stock->validate
-		,'is_already_validate' => (int) $inventory->status
+		,'is_already_validate' => (int) $object->status
 		,'token'=>$_SESSION['newtoken']
 	);
 	
 	include './tpl/inventory.tpl.php';
-	
-	llxFooter('');
 }
 
+// End of page
+llxFooter();
+$db->close();
+
+
 
 function card_line(&$inventory, &$lines, $mode)
 {
@@ -421,7 +452,6 @@ function card_line(&$inventory, &$lines, $mode)
 
 	foreach ($inventory->Inventorydet as $k => $Inventorydet)
 	{
-	    
         $product = & $Inventorydet->product;
 		$stock = $Inventorydet->qty_stock;
 	
@@ -442,7 +472,7 @@ function card_line(&$inventory, &$lines, $mode)
 			'produit' => $product->getNomUrl(1).'&nbsp;-&nbsp;'.$product->label,
 			'entrepot'=>$e->getNomUrl(1),
 			'barcode' => $product->barcode,
-			'qty' =>($mode == 'edit' ? '<input type="text" name="qty_to_add['.$k.']" value="'.$qty.'" size="8" style="text-align:center;" /> <a id="a_save_qty_'.$k.'" href="javascript:save_qty('.$k.')">'.img_picto($langs->trans('Add'), 'plus16@inventory').'</a>' : '' ),
+			'qty' =>($mode == 'edit' ? '<input type="text" name="qty_to_add['.$k.']" value="'.$qty.'" size="8" style="text-align:center;" /> <a id="a_save_qty_'.$k.'" href="javascript:save_qty('.$k.')">'.img_picto($langs->trans('Add'), 'edit_add').'</a>' : '' ),
 			'qty_view' => ($Inventorydet->qty_view ? $Inventorydet->qty_view : 0),
 			'qty_stock' => $stock,
 			'qty_regulated' => ($Inventorydet->qty_regulated ? $Inventorydet->qty_regulated : 0),
@@ -461,7 +491,10 @@ function card_line(&$inventory, &$lines, $mode)
 
 }
 
-function _exportCSV(&$inventory) {
+
+/*
+function _exportCSV(&$inventory) 
+{
 	global $conf;
 	
 	header('Content-Type: application/octet-stream');
@@ -531,8 +564,10 @@ function _exportCSV(&$inventory) {
 	
 	exit;
 }
+*/
 
-function _footerList($view,$total_pmp,$total_pmp_actual,$total_pa,$total_pa_actual, $total_current_pa,$total_current_pa_actual) {
+function _footerList($view,$total_pmp,$total_pmp_actual,$total_pa,$total_pa_actual, $total_current_pa,$total_current_pa_actual) 
+{
 	global $conf,$user,$langs;
 	
 	    if ($view['can_validate'] == 1) { ?>
@@ -569,7 +604,10 @@ function _footerList($view,$total_pmp,$total_pmp_actual,$total_pa,$total_pa_actu
         </tr>
         <?php } 
 }
-function _headerList($view) {
+
+
+function _headerList($view) 
+{
 	global $conf,$user,$langs;
 	
 	?>
diff --git a/htdocs/product/inventory/class/inventory.class.php b/htdocs/product/inventory/class/inventory.class.php
index b652066d4a4..93bbb38f6e7 100644
--- a/htdocs/product/inventory/class/inventory.class.php
+++ b/htdocs/product/inventory/class/inventory.class.php
@@ -67,7 +67,7 @@ class Inventory extends CoreObject
      * Attribute object linked with database
      * @var array
      */
-	protected $__fields=array(
+	protected $fields=array(
 		'fk_warehouse'=>array('type'=>'integer','index'=>true)
 		,'entity'=>array('type'=>'integer','index'=>true)
 		,'status'=>array('type'=>'integer','index'=>true)
@@ -503,6 +503,7 @@ class Inventory extends CoreObject
 
     /**
      * Function to get the sql select of inventory
+     * 
      * @param   string  $type   'All' to get all data
      * @return  string
      */
@@ -516,7 +517,7 @@ class Inventory extends CoreObject
 			$sql = 'SELECT i.rowid,i.title, e.label, i.date_inventory, i.fk_warehouse, i.datec, i.tms, i.status';
             $sql.= ' FROM '.MAIN_DB_PREFIX.'inventory i';
             $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'entrepot e ON (e.rowid = i.fk_warehouse)';
-            $sql.= ' WHERE i.entity = '.(int) $conf->entity;
+            $sql.= ' WHERE i.entity IN ('.getEntity('inventory', 1).')';
 		}
 	
 		return $sql;	
@@ -541,7 +542,7 @@ class Inventorydet extends CoreObject
 	public $pa;
 	public $new_pmp;
 	
-	protected $__fields=array(
+	protected $fields=array(
 		'fk_inventory'=>array('type'=>'int')
 		,'fk_warehouse'=>array('type'=>'int')
 		,'fk_product'=>array('type'=>'int')
diff --git a/htdocs/product/inventory/list.php b/htdocs/product/inventory/list.php
index 46c41637da0..36a185d7fd1 100644
--- a/htdocs/product/inventory/list.php
+++ b/htdocs/product/inventory/list.php
@@ -36,8 +36,31 @@ require_once DOL_DOCUMENT_ROOT.'/product/inventory/lib/inventory.lib.php';
 $langs->load("stock");
 $langs->load("inventory");
 
-if (empty($user->rights->stock->read)) accessforbidden();
-		
+$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$sortfield = GETPOST("sortfield",'alpha');
+$sortorder = GETPOST("sortorder",'alpha');
+$page = (GETPOST("page",'int')?GETPOST("page", 'int'):0);
+if ($page == -1) { $page = 0; }
+$offset = $limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+if (! $sortfield) $sortfield="i.title";
+if (! $sortorder) $sortorder="ASC";
+
+if (empty($user->rights->stock->lire)) accessforbidden();
+
+
+/*
+ * Actions
+ */
+
+// None
+
+
+/*
+ * View
+ */
+
 llxHeader('',$langs->trans('inventoryListTitle'),'','');
 
 echo '<form name="formListInvetory" action="'.$_SERVER['PHP_SELF'].'" method="post" >';
@@ -48,8 +71,15 @@ $list = new ListView($db, 'listInventory');
 $THide = array('label','title');
 
 echo $list->render(Inventory::getSQL('All'), array(
-	'limit' => array(
-		'nbLine' => GETPOST('limit')
+    'param' => array(
+        'limit' => $limit,
+        'offset' => $offset,
+        'sortfield' => $sortfield,
+        'sortorder'=> $sortorder,
+        'page'=>$page
+    ),
+    'limit' => array(
+	    'nbLine' => $limit,
 	),
 	'allow-field-select' => true,
     'link'=>array(
@@ -65,14 +95,14 @@ echo $list->render(Inventory::getSQL('All'), array(
     'list'=>array(
         'title'=>$langs->trans('inventoryListTitle'),
         'messageNothing'=>$langs->trans('inventoryListEmpty'),
-		'image' => 'inventory.png@inventory'
+		'image' => 'title_products.png'
     ),
     'title'=>array(
         'rowid'=>$langs->trans('Title'),
 		'date_inventory'=>$langs->trans('InventoryDate'),
-        'datec'=>$langs->trans('DateCreation'),
         'fk_warehouse'=>$langs->trans('Warehouse'),
-        'tms'=>$langs->trans('DateUpdate'),
+        'datec'=>$langs->trans('DateCreation'),
+        'tms'=>$langs->trans('DateModification'),
         'status'=>$langs->trans('Status')
     ),
     'eval'=>array(
diff --git a/htdocs/product/inventory/tpl/inventory.tpl.php b/htdocs/product/inventory/tpl/inventory.tpl.php
index d55454bd39a..2a1c3bc3ee4 100644
--- a/htdocs/product/inventory/tpl/inventory.tpl.php
+++ b/htdocs/product/inventory/tpl/inventory.tpl.php
@@ -71,15 +71,15 @@
     }
 </script>
 
-<?php if ($inventory->status != 1) { ?>
+<?php if ($object->status != 1) { ?>
 	<strong><?php echo $langs->trans('AddInventoryProduct'); ?> : </strong>
 	<form action="<?php echo $_SERVER['PHP_SELF']; ?>" method="post">
 		<input type="hidden" name="action" value="add_line" />
-		<input type="hidden" name="id" value="<?php echo $inventory->id; ?>" />
+		<input type="hidden" name="id" value="<?php echo $object->id; ?>" />
 	
-		<?php echo inventorySelectProducts($inventory); ?>
+		<?php echo inventorySelectProducts($object); ?>
 		
-			<input class="butAction" type="submit" value="<?php echo $langs->trans('AddProduct'); ?>" />
+			<input class="button" type="submit" value="<?php echo $langs->trans('AddProduct'); ?>" />
 	</form>
 <?php } ?>
 
@@ -90,7 +90,7 @@
 	<?php } ?>
 	
 	<input type="hidden" name="action" value="save" />
-	<input type="hidden" name="id" value="<?php echo $inventory->id; ?>" />
+	<input type="hidden" name="id" value="<?php echo $object->id; ?>" />
 	
 	<table width="100%" class="border workstation">
 		<?php
@@ -163,43 +163,43 @@
 		?>
 	</table>
 	
-	<?php if ($inventory->status != 1) { ?>
+	<?php if ($object->status != 1) { ?>
 		<div class="tabsAction" style="height:30px;">
 			<?php if ($action!= 'edit') { ?>
-				<a href="<?php echo $view_url; ?>?id=<?php echo $inventory->id; ?>&action=exportCSV" class="butAction"><?php echo $langs->trans('ExportCSV') ?></a>
-				<a href="<?php echo $view_url; ?>?id=<?php echo $inventory->id; ?>&action=edit" class="butAction"><?php echo $langs->trans('Modify') ?></a>
+				<!-- <a href="<?php echo $view_url; ?>?id=<?php echo $object->id; ?>&action=exportCSV" class="butAction"><?php echo $langs->trans('ExportCSV') ?></a> -->
+				<a href="<?php echo $view_url; ?>?id=<?php echo $object->id; ?>&action=edit" class="butAction"><?php echo $langs->trans('Modify') ?></a>
 				<?php 
 				 if(!empty($user->rights->stock->changePMP)) {
-				 	echo '<a href="'.$view_url.'?id='.$inventory->id.'&action=changePMP" class="butAction">'.$langs->trans('ApplyPMP').'</a>';
+				 	echo '<a href="'.$view_url.'?id='.$object->id.'&action=changePMP" class="butAction">'.$langs->trans('ApplyPMP').'</a>';
 				 }
 				
 				if ($can_validate == 1) { ?>
-					<a href="<?php echo $view_url; ?>?id=<?php echo $inventory->id; ?>&action=regulate&token=" class="butAction"><?php echo $langs->trans('RegulateStock') ?></a>
+					<a href="<?php echo $view_url; ?>?id=<?php echo $object->id; ?>&action=regulate&token=" class="butAction"><?php echo $langs->trans('RegulateStock') ?></a>
 				<?php } ?>
 			<?php } ?>
 			<?php if ($action == 'edit') { ?>
-				<input name="back" type="button" class="butAction" value="<?php echo $langs->trans('ExitEditMode'); ?>" onclick="document.location='?id=<?php echo $inventory->id; ?>&action=view';" />
+				<input name="back" type="button" class="butAction" value="<?php echo $langs->trans('ExitEditMode'); ?>" onclick="document.location='?id=<?php echo $object->id; ?>&action=view';" />
 			<?php } ?>
 			<?php if ($can_validate == 1) { ?>
-                <a href="<?php echo $view_url; ?>?id=<?php echo $inventory->id; ?>&action=flush" class="butActionDelete"><?php  echo $langs->trans('Flush'); ?></a>
+                <a href="<?php echo $view_url; ?>?id=<?php echo $object->id; ?>&action=flush" class="butActionDelete"><?php  echo $langs->trans('Flush'); ?></a>
                 &nbsp;&nbsp;&nbsp;
-                <a href="<?php echo $view_url; ?>?id=<?php echo $inventory->id; ?>&action=delete" class="butActionDelete"><?php echo $langs->trans('Delete') ?></a>
+                <a href="<?php echo $view_url; ?>?id=<?php echo $object->id; ?>&action=delete" class="butActionDelete"><?php echo $langs->trans('Delete') ?></a>
         	<?php } ?>
 		</div>
 	<?php } ?>
-	<?php if ($inventory->status == 1) { ?>
+	<?php if ($object->status == 1) { ?>
 		<div class="tabsAction">
 			<?php if ($can_validate == 1) { ?>
 
-				<a href="<?php echo $view_url; ?>?id=<?php echo $inventory->id; ?>&action=exportCSV" class="butAction"><?php echo $langs->trans('ExportCSV') ?></a>
+				<!-- <a href="<?php echo $view_url; ?>?id=<?php echo $object->id; ?>&action=exportCSV" class="butAction"><?php echo $langs->trans('ExportCSV') ?></a> -->
 				<a href="#" title="<?php echo $langs->trans('InventoryAlreadyValidated'); ?>" class="butActionRefused"><?php echo $langs->trans('Delete') ?></a>
 				
 			<?php } ?>
 		</div>
 	<?php } ?>
 </form>
-<p>Date de création : <?php echo $inventory->getDate('datec') ?>
-<br />Dernière mise à jour : <?php echo $inventory->getDate('tms') ?></p>
+<p>Date de création : <?php echo $object->getDate('datec') ?>
+<br />Dernière mise à jour : <?php echo $object->getDate('tms') ?></p>
 	
 
 	

From b57bf6460bd6f73339030ad83ed35de6d6843056 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 30 Apr 2017 02:34:00 +0200
Subject: [PATCH 138/505] Start debug inventory

---
 .../install/mysql/migration/5.0.0-6.0.0.sql   |  2 +-
 .../install/mysql/tables/llx_inventorydet.sql |  2 +-
 htdocs/product/inventory/card.php             | 19 ++++++++-----------
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index 4a383fcb505..b20da8b9b89 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -204,7 +204,7 @@ tms timestamp,
 fk_inventory integer DEFAULT 0, 
 fk_warehouse integer DEFAULT 0,
 fk_product integer DEFAULT 0,  
-entity integer DEFAULT 0, 
+batch varchar(30) DEFAULT NULL,
 qty_view double DEFAULT 0, 
 qty_stock double DEFAULT 0, 
 qty_regulated double DEFAULT 0, 
diff --git a/htdocs/install/mysql/tables/llx_inventorydet.sql b/htdocs/install/mysql/tables/llx_inventorydet.sql
index 20e48b877b5..2b203e0c58b 100644
--- a/htdocs/install/mysql/tables/llx_inventorydet.sql
+++ b/htdocs/install/mysql/tables/llx_inventorydet.sql
@@ -25,7 +25,7 @@ tms timestamp,
 fk_inventory integer DEFAULT 0, 
 fk_warehouse integer DEFAULT 0,
 fk_product integer DEFAULT 0,  
-entity integer DEFAULT 0, 
+batch varchar(30) DEFAULT NULL,		-- Lot or serial number
 qty_view double DEFAULT 0, 
 qty_stock double DEFAULT 0, 
 qty_regulated double DEFAULT 0, 
diff --git a/htdocs/product/inventory/card.php b/htdocs/product/inventory/card.php
index e89a59bb505..f7e4cbecb0a 100644
--- a/htdocs/product/inventory/card.php
+++ b/htdocs/product/inventory/card.php
@@ -146,12 +146,13 @@ if (empty($reshook))
     		if ($object->errors)
     		{
     			setEventMessage($object->errors, 'errors');
-    			card( $object, 'edit');
+    			$action = 'edit';
     		}
     		else 
     		{
     			$object->udpate($user);
     			header('Location: '.dol_buildpath('/product/inventory/card.php?id='.$object->getId().'&action=view', 1));
+    			exit;
     		}
     		
     		break;
@@ -167,12 +168,10 @@ if (empty($reshook))
                 $object->status = 1;
                 $object->update($user);
                 
-                card( $object, 'view');
-                
-            
+                $action='view';
             }
             else {
-               card( $object, 'view');
+               $action='view';
             }
             
     		break;
@@ -186,7 +185,7 @@ if (empty($reshook))
     		
     		$object->changePMP($user);
     		
-    		card( $object, 'view');
+    		$action='view';
     		
     		break;
     		
@@ -238,7 +237,7 @@ if (empty($reshook))
     			$object->sortDet();
     		}
     		
-    		card( $object, 'edit');
+    		$action='edit';
     		
     		break;
     		
@@ -257,7 +256,7 @@ if (empty($reshook))
     		$object = new Inventory($db);
     		$object->fetch( $id);
     		
-    		card($object, 'edit');
+    		$action='edit';
     		
     		break;
         case 'confirm_flush':
@@ -273,14 +272,12 @@ if (empty($reshook))
             
             setEventMessage($langs->trans('InventoryFlushed'));
             
-            card( $object, 'edit');
-           
+            $action='edit';
             
             break;
     	case 'confirm_delete':
     		if (!$user->rights->stock->supprimer) accessforbidden();
             
-    		
     		$id = GETPOST('id');
     		
     		$object = new Inventory($db);

From 865c8140d1bf0900d59906de1b01f4416d360b1b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 30 Apr 2017 03:18:49 +0200
Subject: [PATCH 139/505] Clean code

---
 ChangeLog                                     |   4 +-
 htdocs/comm/propal/contact.php                |   4 +-
 htdocs/commande/contact.php                   |   5 +-
 htdocs/core/class/commonobject.class.php      | 119 +++++++++---------
 htdocs/core/lib/company.lib.php               |  49 ++++++++
 htdocs/expedition/contact.php                 |   4 +-
 htdocs/expedition/shipment.php                |   4 +-
 .../skeletons/skeleton_class.class.php        |  49 +++++---
 htdocs/product/card.php                       |  77 ++++++------
 htdocs/societe/class/societe.class.php        |  12 --
 htdocs/societe/societecontact.php             |   5 +-
 11 files changed, 197 insertions(+), 135 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 31ddbd56bdd..3eb284ccc80 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,7 +13,9 @@ Following changes may create regression for some external modules, but were nece
 * The page compta/facture.php was renamed into compta/facture/card.php to match page naming conventions.
 * The signature of method ->delete() of class Product and PriceExpression was changed from 
   ->delete($id, notrigger) to ->delete(User, notrigger) to match standard dev rules.
-
+* Removed CommonObject::displayMarginInfos (was deprecated in 3.8). Use same method into
+  html.formmargin.class.php
+* Removed Societe::set_commnucation_level (was deprecated in 4.0). Was not used.
 
 ***** ChangeLog for 5.0.1 compared to 5.0.0 *****
 FIX: #6503: SQL error in "Last pending payment invoices"
diff --git a/htdocs/comm/propal/contact.php b/htdocs/comm/propal/contact.php
index 3c3aa6aef88..3e9e5a1205d 100644
--- a/htdocs/comm/propal/contact.php
+++ b/htdocs/comm/propal/contact.php
@@ -130,12 +130,12 @@ else if ($action == 'deletecontact' && $user->rights->propale->creer)
 		dol_print_error($db);
 	}
 }
-
+/*
 else if ($action == 'setaddress' && $user->rights->propale->creer)
 {
 	$result=$object->setDeliveryAddress($_POST['fk_address']);
 	if ($result < 0) dol_print_error($db,$object->error);
-}
+}*/
 
 
 /*
diff --git a/htdocs/commande/contact.php b/htdocs/commande/contact.php
index bc257f3ac05..fe37a630c5d 100644
--- a/htdocs/commande/contact.php
+++ b/htdocs/commande/contact.php
@@ -107,13 +107,14 @@ else if ($action == 'deletecontact' && $user->rights->commande->creer)
 		dol_print_error($db);
 	}
 }
-
+/*
 else if ($action == 'setaddress' && $user->rights->commande->creer)
 {
 	$object->fetch($id);
 	$result=$object->setDeliveryAddress($_POST['fk_address']);
 	if ($result < 0) dol_print_error($db,$object->error);
-}
+}*/
+
 
 /*
  * View
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index e03db1b4773..2526638cee5 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -238,6 +238,7 @@ abstract class CommonObject
 
 	/**
 	 * @var int Delivery address ID
+	 * @deprecated
 	 * @see setDeliveryAddress()
 	 */
 	public $fk_delivery_address;
@@ -1623,7 +1624,8 @@ abstract class CommonObject
 
     /**
      *	Define delivery address
-     *
+     *  @deprecated
+     *  
      *	@param      int		$id		Address id
      *	@return     int				<0 si ko, >0 si ok
      */
@@ -3223,51 +3225,14 @@ abstract class CommonObject
 
     /**
      *  Return if a country is inside the EEC (European Economic Community)
-     *  TODO Add a field into dictionary
+     *  @deprecated
      *
      *  @return     boolean		true = country inside EEC, false = country outside EEC
      */
     function isInEEC()
     {
-        // List of all country codes that are in europe for european vat rules
-        // List found on http://ec.europa.eu/taxation_customs/common/faq/faq_1179_en.htm#9
-        $country_code_in_EEC=array(
-    			'AT',	// Austria
-    			'BE',	// Belgium
-    			'BG',	// Bulgaria
-    			'CY',	// Cyprus
-    			'CZ',	// Czech republic
-    			'DE',	// Germany
-    			'DK',	// Danemark
-    			'EE',	// Estonia
-    			'ES',	// Spain
-    			'FI',	// Finland
-    			'FR',	// France
-    			'GB',	// United Kingdom
-    			'GR',	// Greece
-    			'HR',   // Croatia
-                'NL',	// Holland
-    			'HU',	// Hungary
-    			'IE',	// Ireland
-    			'IM',	// Isle of Man - Included in UK
-    			'IT',	// Italy
-    			'LT',	// Lithuania
-    			'LU',	// Luxembourg
-    			'LV',	// Latvia
-    			'MC',	// Monaco - Included in France
-    			'MT',	// Malta
-                //'NO',	// Norway
-    			'PL',	// Poland
-    			'PT',	// Portugal
-    			'RO',	// Romania
-    			'SE',	// Sweden
-    			'SK',	// Slovakia
-    			'SI',	// Slovenia
-    			'UK',	// United Kingdom
-        //'CH',	// Switzerland - No. Swizerland in not in EEC
-        );
-        //print "dd".$this->country_code;
-        return in_array($this->country_code,$country_code_in_EEC);
+        require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+        return isInEEC($this);
     }
 
 
@@ -3754,21 +3719,6 @@ abstract class CommonObject
     }
 
 
-	/**
-	 * Show the array with all margin infos
-	 *
-	 * @param 		bool	$force_price	Force price
-	 * @return		void
-	 * @deprecated	3.8 Load FormMargin class and make a direct call to displayMarginInfos
-	 */
-	function displayMarginInfos($force_price=false)
-	{
-		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmargin.class.php';
-		$formmargin=new FormMargin($this->db);
-		$formmargin->displayMarginInfos($this, $force_price);
-	}
-
-
 	/**
 	 *	Add resources to the current object : add entry into llx_element_resources
 	 *	Need $this->element & $this->id
@@ -4711,4 +4661,61 @@ abstract class CommonObject
 		}
 		return $buyPrice;
 	}
+	
+	
+
+	/**
+	 * Create object into database
+	 *
+	 * @param  User $user      User that creates
+	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 *
+	 * @return int <0 if KO, Id of created object if OK
+	 */
+	public function createCommon(User $user, $notrigger = false)
+	{
+	    
+	}
+	
+	
+	/**
+	 * Load object in memory from the database
+	 *
+	 * @param int    $id  Id object
+	 * @param string $ref Ref
+	 *
+	 * @return int <0 if KO, 0 if not found, >0 if OK
+	 */
+	public function fetchCommon($id, $ref = null)
+	{
+	    
+	}
+	
+
+	/**
+	 * Update object into database
+	 *
+	 * @param  User $user      User that modifies
+	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 *
+	 * @return int <0 if KO, >0 if OK
+	 */
+	public function updateCommon(User $user, $notrigger = false)
+	{
+	    
+	}
+	
+	
+	/**
+	 * Delete object in database
+	 *
+	 * @param User $user      User that deletes
+	 * @param bool $notrigger false=launch triggers after, true=disable triggers
+	 *
+	 * @return int <0 if KO, >0 if OK
+	 */
+	public function deleteCommon(User $user, $notrigger = false)
+	{
+	    
+	}
 }
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index 809a045bacf..6847cd7b9c2 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -496,6 +496,55 @@ function getFormeJuridiqueLabel($code)
     }
 }
 
+/**
+ *  Return if a country is inside the EEC (European Economic Community)
+ *  TODO Add a field into country dictionary.
+ *  
+ *  @param      Object      $object    Object
+ *  @return     boolean		           true = country inside EEC, false = country outside EEC
+ */
+function isInEEC($object)
+{
+    // List of all country codes that are in europe for european vat rules
+    // List found on http://ec.europa.eu/taxation_customs/common/faq/faq_1179_en.htm#9
+    $country_code_in_EEC=array(
+        'AT',	// Austria
+        'BE',	// Belgium
+        'BG',	// Bulgaria
+        'CY',	// Cyprus
+        'CZ',	// Czech republic
+        'DE',	// Germany
+        'DK',	// Danemark
+        'EE',	// Estonia
+        'ES',	// Spain
+        'FI',	// Finland
+        'FR',	// France
+        'GB',	// United Kingdom
+        'GR',	// Greece
+        'HR',   // Croatia
+        'NL',	// Holland
+        'HU',	// Hungary
+        'IE',	// Ireland
+        'IM',	// Isle of Man - Included in UK
+        'IT',	// Italy
+        'LT',	// Lithuania
+        'LU',	// Luxembourg
+        'LV',	// Latvia
+        'MC',	// Monaco - Included in France
+        'MT',	// Malta
+        //'NO',	// Norway
+        'PL',	// Poland
+        'PT',	// Portugal
+        'RO',	// Romania
+        'SE',	// Sweden
+        'SK',	// Slovakia
+        'SI',	// Slovenia
+        'UK',	// United Kingdom
+        //'CH',	// Switzerland - No. Swizerland in not in EEC
+    );
+    //print "dd".$this->country_code;
+    return in_array($object->country_code, $country_code_in_EEC);
+}
 
 
 /**
diff --git a/htdocs/expedition/contact.php b/htdocs/expedition/contact.php
index 1354b3d49f1..7c721d7cf47 100644
--- a/htdocs/expedition/contact.php
+++ b/htdocs/expedition/contact.php
@@ -123,13 +123,13 @@ else if ($action == 'deletecontact' && $user->rights->expedition->creer)
 		dol_print_error($db);
 	}
 }
-
+/*
 else if ($action == 'setaddress' && $user->rights->expedition->creer)
 {
 	$object->fetch($id);
 	$result=$object->setDeliveryAddress($_POST['fk_address']);
 	if ($result < 0) dol_print_error($db,$object->error);
-}
+}*/
 
 
 /*
diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php
index 57ad04a8a1a..ede1cc6bec9 100644
--- a/htdocs/expedition/shipment.php
+++ b/htdocs/expedition/shipment.php
@@ -113,7 +113,7 @@ if (empty($reshook))
     	if ($result < 0)
     		setEventMessages($object->error, $object->errors, 'errors');
     }
-    
+    /*
     if ($action == 'setdeliveryaddress' && $user->rights->commande->creer)
     {
     	$object = new Commande($db);
@@ -122,7 +122,7 @@ if (empty($reshook))
     	if ($result < 0)
     		setEventMessages($object->error, $object->errors, 'errors');
     }
-    
+    */
     if ($action == 'setmode' && $user->rights->commande->creer)
     {
     	$object = new Commande($db);
diff --git a/htdocs/modulebuilder/skeletons/skeleton_class.class.php b/htdocs/modulebuilder/skeletons/skeleton_class.class.php
index 01b48c35f75..6805a697043 100644
--- a/htdocs/modulebuilder/skeletons/skeleton_class.class.php
+++ b/htdocs/modulebuilder/skeletons/skeleton_class.class.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2007-2012  Laurent Destailleur <eldy@users.sourceforge.net>
+/* Copyright (C) 2007-2017  Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) 2014-2016  Juanjo Menent       <jmenent@2byte.es>
  * Copyright (C) 2015       Florian Henry       <florian.henry@open-concept.pro>
  * Copyright (C) 2015       Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
@@ -20,10 +20,9 @@
  */
 
 /**
- * \file    dev/skeletons/skeleton_class.class.php
- * \ingroup mymodule othermodule1 othermodule2
- * \brief   This file is an example for a CRUD class file (Create/Read/Update/Delete)
- *          Put some comments here
+ * \file        modulebuilder/skeletons/skeleton_class.class.php
+ * \ingroup     mymodule othermodule1 othermodule2
+ * \brief       This file is an example for a CRUD class file (Create/Read/Update/Delete)
  */
 
 // Put here all includes required by your class file
@@ -34,26 +33,27 @@ require_once DOL_DOCUMENT_ROOT . '/core/class/commonobject.class.php';
 /**
  * Class Skeleton_Class
  *
- * Put here description of your class
- *
- * @see CommonObject
+ * Put here description of your class.
  */
 class Skeleton_Class extends CommonObject
 {
 	/**
-	 * @var string Id to identify managed objects
+	 * @var string Id to identify managed object
 	 */
 	public $element = 'skeleton';
 	/**
 	 * @var string Name of table without prefix where object is stored
 	 */
 	public $table_element = 'skeleton';
-
-	/**
-	 * @var Skeleton_ClassLine[] Lines
-	 */
-	public $lines = array();
-
+    /**
+     * @var array Array with all fields and their property
+     */
+	public $picto = 'generic';
+    /**
+     * @var array Array with all fields and their property
+     */
+	public $fields;
+	
 	/**
 	 * @var mixed Sample property 1
 	 */
@@ -62,8 +62,21 @@ class Skeleton_Class extends CommonObject
 	 * @var mixed Sample property 2
 	 */
 	public $prop2;
+	
 	//...
-
+	
+	protected $ismultientitymanaged = 1;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
+	
+	public $table_element_line = 'skeletondet';
+    public $class_element_line = 'SkeletonLine';
+    public $fk_element = 'fk_skeleton';
+    /**
+	 * @var Skeleton_ClassLine[] Lines
+	 */
+	public $lines = array();
+	
+	
+	
 	/**
 	 * Constructor
 	 *
@@ -289,10 +302,10 @@ class Skeleton_Class extends CommonObject
 	 */
 	public function update(User $user, $notrigger = false)
 	{
-		$error = 0;
-
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
+		$error = 0;
+		
 		// Clean parameters
 		if (isset($this->prop1)) {
 			$this->prop1 = trim($this->prop1);
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 536bcece10f..71f7cd8e7f6 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -1801,60 +1801,61 @@ if (($action == 'clone' && (empty($conf->use_javascript_ajax) || ! empty($conf->
 /* Barre d'action                                                             */
 /*                                                                            */
 /* ************************************************************************** */
-
-print "\n".'<div class="tabsAction">'."\n";
-
-$parameters=array();
-$reshook=$hookmanager->executeHooks('addMoreActionsButtons',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-if (empty($reshook))
+if ($action != 'create' && $action != 'edit')
 {
-    if (($object->type == Product::TYPE_PRODUCT && $user->rights->produit->creer ) || 
-       ($object->type == Product::TYPE_SERVICE && $user->rights->service->creer))
+    print "\n".'<div class="tabsAction">'."\n";
+    
+    $parameters=array();
+    $reshook=$hookmanager->executeHooks('addMoreActionsButtons',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+    if (empty($reshook))
     {
-        if (! isset($object->no_button_edit) || $object->no_button_edit <> 1) print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&amp;id='.$object->id.'">'.$langs->trans("Modify").'</a></div>';
-
-        if (! isset($object->no_button_copy) || $object->no_button_copy <> 1)
+        if (($object->type == Product::TYPE_PRODUCT && $user->rights->produit->creer ) || 
+           ($object->type == Product::TYPE_SERVICE && $user->rights->service->creer))
         {
-            if (! empty($conf->use_javascript_ajax) && empty($conf->dol_use_jmobile))
+            if (! isset($object->no_button_edit) || $object->no_button_edit <> 1) print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&amp;id='.$object->id.'">'.$langs->trans("Modify").'</a></div>';
+    
+            if (! isset($object->no_button_copy) || $object->no_button_copy <> 1)
             {
-                print '<div class="inline-block divButAction"><span id="action-clone" class="butAction">'.$langs->trans('ToClone').'</span></div>'."\n";
-            }
-            else
-			{
-                print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=clone&amp;id='.$object->id.'">'.$langs->trans("ToClone").'</a></div>';
+                if (! empty($conf->use_javascript_ajax) && empty($conf->dol_use_jmobile))
+                {
+                    print '<div class="inline-block divButAction"><span id="action-clone" class="butAction">'.$langs->trans('ToClone').'</span></div>'."\n";
+                }
+                else
+    			{
+                    print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=clone&amp;id='.$object->id.'">'.$langs->trans("ToClone").'</a></div>';
+                }
             }
         }
-    }
-    $object_is_used = $object->isObjectUsed($object->id);
-
-    if (($object->type == Product::TYPE_PRODUCT && $user->rights->produit->supprimer)
-    || ($object->type == Product::TYPE_SERVICE && $user->rights->service->supprimer))
-    {
-        if (empty($object_is_used) && (! isset($object->no_button_delete) || $object->no_button_delete <> 1))
+        $object_is_used = $object->isObjectUsed($object->id);
+    
+        if (($object->type == Product::TYPE_PRODUCT && $user->rights->produit->supprimer)
+        || ($object->type == Product::TYPE_SERVICE && $user->rights->service->supprimer))
         {
-            if (! empty($conf->use_javascript_ajax) && empty($conf->dol_use_jmobile))
+            if (empty($object_is_used) && (! isset($object->no_button_delete) || $object->no_button_delete <> 1))
             {
-                print '<div class="inline-block divButAction"><span id="action-delete" class="butActionDelete">'.$langs->trans('Delete').'</span></div>'."\n";
+                if (! empty($conf->use_javascript_ajax) && empty($conf->dol_use_jmobile))
+                {
+                    print '<div class="inline-block divButAction"><span id="action-delete" class="butActionDelete">'.$langs->trans('Delete').'</span></div>'."\n";
+                }
+                else
+    			{
+                    print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?action=delete&amp;id='.$object->id.'">'.$langs->trans("Delete").'</a></div>';
+                }
             }
             else
-			{
-                print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?action=delete&amp;id='.$object->id.'">'.$langs->trans("Delete").'</a></div>';
+    		{
+                print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.$langs->trans("ProductIsUsed").'">'.$langs->trans("Delete").'</a></div>';
             }
         }
         else
-		{
-            print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.$langs->trans("ProductIsUsed").'">'.$langs->trans("Delete").'</a></div>';
+    	{
+            print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("Delete").'</a></div>';
         }
     }
-    else
-	{
-        print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("Delete").'</a></div>';
-    }
+    
+    print "\n</div>\n";
 }
 
-print "\n</div>\n";
-
-
 /*
  * All the "Add to" areas
  */
@@ -1974,7 +1975,7 @@ if (! empty($conf->global->PRODUCT_ADD_FORM_ADD_TO) && $object->id && ($action =
  * Documents generes
  */
 
-if ($action != 'edit' && $action != 'delete')
+if ($action != 'create' && $action != 'edit' && $action != 'delete')
 {
     print '<div class="fichecenter"><div class="fichehalfleft">';
     print '<a name="builddoc"></a>'; // ancre
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 74aef09e7a9..0581ed1960e 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -3326,18 +3326,6 @@ class Societe extends CommonObject
 		return "Error, mode/status not found";
 	}
 
-	/**
-	 *  Set commnunication level
-	 *
-	 *  @param  User	$user		User making change
-	 *	@return	int					<0 if KO, >0 if OK
-     * @deprecated Use update function instead
-	 */
-	function set_commnucation_level($user)
-	{
-		return $this->update($this->id, $user);
-	}
-
 	/**
 	 *  Set outstanding value
 	 *
diff --git a/htdocs/societe/societecontact.php b/htdocs/societe/societecontact.php
index 2bda75867dc..b5ffc87517f 100644
--- a/htdocs/societe/societecontact.php
+++ b/htdocs/societe/societecontact.php
@@ -107,13 +107,14 @@ else if ($action == 'deletecontact' && $user->rights->societe->creer)
 		dol_print_error($db);
 	}
 }
-
+/*
 else if ($action == 'setaddress' && $user->rights->societe->creer)
 {
 	$object->fetch($id);
 	$result=$object->setDeliveryAddress($_POST['fk_address']);
 	if ($result < 0) dol_print_error($db,$object->error);
-}
+}*/
+
 
 /*
  * View

From 60951cf30743e0fb12a1991aae063b6eeba8c7b2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 30 Apr 2017 04:09:50 +0200
Subject: [PATCH 140/505] Less data example

---
 htdocs/admin/dict.php                          |  7 ++++---
 htdocs/core/menus/standard/eldy.lib.php        |  2 +-
 .../mysql/data/llx_c_hrm_department.sql        | 18 +++++++-----------
 htdocs/langs/en_US/admin.lang                  |  2 +-
 4 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 125f913eb8d..d4aa0ce6989 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -1073,7 +1073,7 @@ if ($id)
         print '</tr>';
 
         // Line to enter new values
-        print '<tr class="oddeven nodrag nodrop nohover">';
+        print '<!-- line to add new entry --><tr class="oddeven nodrag nodrop nohover">';
 
         $obj = new stdClass();
         // If data was already input, we define them in obj to populate input fields.
@@ -1814,13 +1814,14 @@ function fieldList($fieldlist, $obj='', $tabname='', $context='')
 			if ($fieldlist[$field]=='affect') $class='maxwidth50';
 			if ($fieldlist[$field]=='delay') $class='maxwidth50';
 			if ($fieldlist[$field]=='position') $class='maxwidth50';
-			if ($fieldlist[$field]=='libelle') $class='quatrevingtpercent';
+			if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label') $class='quatrevingtpercent';
 			if ($fieldlist[$field]=='tracking') $class='quatrevingtpercent';
 			if ($fieldlist[$field]=='sortorder' || $fieldlist[$field]=='sens' || $fieldlist[$field]=='category_type') $class='maxwidth50';
 			print '<td class="'.$classtd.'">';
 			$transfound=0;
 			if (in_array($fieldlist[$field], array('label','libelle')))
 			{
+			    $transkey='';
 			    // Special case for labels
 			    if ($tabname == MAIN_DB_PREFIX.'c_civility') {
 			        $transkey="Civility".strtoupper($obj->code);
@@ -1829,7 +1830,7 @@ function fieldList($fieldlist, $obj='', $tabname='', $context='')
 			        $langs->load("bills");
 			        $transkey="PaymentCondition".strtoupper($obj->code);
 			    }
-			    if ($langs->trans($transkey) != $transkey)
+			    if ($transkey && $langs->trans($transkey) != $transkey)
 			    {
 			        $transfound=1;
 			        print $form->textwithpicto($langs->trans($transkey), $langs->trans("GoIntoTranslationMenuToChangeThis"));
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 1e88601604f..dffc5f9af1b 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -545,7 +545,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 				$newmenu->add("/admin/ihm.php?mainmenu=home", $langs->trans("GUISetup"),1);
 
 				$newmenu->add("/admin/translation.php?mainmenu=home", $langs->trans("Translation"),1);
-				$newmenu->add("/admin/defaultvalues.php?mainmenu=home", $langs->trans("DefaultValues"),1, $conf->global->MAIN_FEATURES_LEVEL);
+				$newmenu->add("/admin/defaultvalues.php?mainmenu=home", $langs->trans("DefaultValues"),1);
 				$newmenu->add("/admin/boxes.php?mainmenu=home", $langs->trans("Boxes"),1);
 				$newmenu->add("/admin/delais.php?mainmenu=home",$langs->trans("MenuWarnings"),1);
 				$newmenu->add("/admin/security_other.php?mainmenu=home", $langs->trans("Security"),1);
diff --git a/htdocs/install/mysql/data/llx_c_hrm_department.sql b/htdocs/install/mysql/data/llx_c_hrm_department.sql
index e6e4921f372..c4865ad9e30 100644
--- a/htdocs/install/mysql/data/llx_c_hrm_department.sql
+++ b/htdocs/install/mysql/data/llx_c_hrm_department.sql
@@ -24,20 +24,16 @@
 --
 
 INSERT INTO llx_c_hrm_department (rowid, pos, code, label, active) VALUES(1, 5,'MANAGEMENT', 'Management', 1);
-INSERT INTO llx_c_hrm_department (rowid, pos, code, label, active) VALUES(2, 10,'GESTION', 'Gestion', 1);
 INSERT INTO llx_c_hrm_department (rowid, pos, code, label, active) VALUES(3, 15,'TRAINING', 'Training', 1);
-INSERT INTO llx_c_hrm_department (rowid, pos, code, label, active) VALUES(4, 20,'IT', 'Inform. Technology (IT)', 1);
-INSERT INTO llx_c_hrm_department (rowid, pos, code, label, active) VALUES(5, 25,'MARKETING', 'Marketing', 1);
+INSERT INTO llx_c_hrm_department (rowid, pos, code, label, active) VALUES(4, 20,'IT', 'Inform. Technology (IT)', 0);
+INSERT INTO llx_c_hrm_department (rowid, pos, code, label, active) VALUES(5, 25,'MARKETING', 'Marketing', 0);
 INSERT INTO llx_c_hrm_department (rowid, pos, code, label, active) VALUES(6, 30,'SALES', 'Sales', 1);
-INSERT INTO llx_c_hrm_department (rowid, pos, code, label, active) VALUES(7, 35,'LEGAL', 'Legal', 1);
+INSERT INTO llx_c_hrm_department (rowid, pos, code, label, active) VALUES(7, 35,'LEGAL', 'Legal', 0);
 INSERT INTO llx_c_hrm_department (rowid, pos, code, label, active) VALUES(8, 40,'FINANCIAL', 'Financial accounting', 1);
 INSERT INTO llx_c_hrm_department (rowid, pos, code, label, active) VALUES(9, 45,'HUMANRES', 'Human resources', 1);
 INSERT INTO llx_c_hrm_department (rowid, pos, code, label, active) VALUES(10, 50,'PURCHASING', 'Purchasing', 1);
-INSERT INTO llx_c_hrm_department (rowid, pos, code, label, active) VALUES(11, 55,'SERVICES', 'Services', 1);
-INSERT INTO llx_c_hrm_department (rowid, pos, code, label, active) VALUES(12, 60,'CUSTOMSERV', 'Customer service', 1);
-INSERT INTO llx_c_hrm_department (rowid, pos, code, label, active) VALUES(13, 65,'CONSULTING', 'Consulting', 1);
+INSERT INTO llx_c_hrm_department (rowid, pos, code, label, active) VALUES(12, 60,'CUSTOMSERV', 'Customer service', 0);
 INSERT INTO llx_c_hrm_department (rowid, pos, code, label, active) VALUES(14, 70,'LOGISTIC', 'Logistics', 1);
-INSERT INTO llx_c_hrm_department (rowid, pos, code, label, active) VALUES(15, 75,'CONSTRUCT', 'Engineering/design', 1);
-INSERT INTO llx_c_hrm_department (rowid, pos, code, label, active) VALUES(16, 80,'PRODUCTION', 'Manufacturing', 1);
-INSERT INTO llx_c_hrm_department (rowid, pos, code, label, active) VALUES(17, 85,'QUALITY', 'Quality assurance', 1);
-INSERT INTO llx_c_hrm_department (rowid, pos, code, label, active) VALUES(18, 85,'MAINT', 'Plant assurance', 1);
+INSERT INTO llx_c_hrm_department (rowid, pos, code, label, active) VALUES(15, 75,'CONSTRUCT', 'Engineering/design', 0);
+INSERT INTO llx_c_hrm_department (rowid, pos, code, label, active) VALUES(16, 80,'PRODUCTION', 'Production', 1);
+INSERT INTO llx_c_hrm_department (rowid, pos, code, label, active) VALUES(17, 85,'QUALITY', 'Quality assurance', 0);
\ No newline at end of file
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 69c72fc7aad..02ff5740986 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -432,7 +432,7 @@ PageUrlForDefaultValues=You must enter here the relative url of the page. If you
 PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>
 PageUrlForDefaultValuesList=<br>For page that list thirdparties, it is <strong>%s</strong>
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code, so to change this value, you must edit it fom Home-Setup-translation.
-WarningSettingSortOrder=Warning, setting a default sort order may result in a technical error when going on the list page if field is an unknown field. If you experience such an error, come back to this page to remove the default sort order to retreive default behavior. 
+WarningSettingSortOrder=Warning, setting a default sort order may result in a technical error when going on the list page if field is an unknown field. If you experience such an error, come back to this page to remove the default sort order and restore default behavior. 
 Field=Field
 # Modules
 Module0Name=Users & groups

From a9eeb823bd25d81f1979db1a99f92fd16328b522 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 30 Apr 2017 04:32:03 +0200
Subject: [PATCH 141/505] Fix browser notif

---
 htdocs/admin/agenda.php                  |  2 +-
 htdocs/admin/agenda_extrafields.php      |  2 +-
 htdocs/admin/agenda_extsites.php         |  2 +-
 htdocs/admin/agenda_other.php            |  2 +-
 htdocs/admin/agenda_xcal.php             |  2 +-
 htdocs/core/ajax/check_notifications.php |  7 ++++++-
 htdocs/core/js/lib_notification.js.php   | 12 +++++++-----
 7 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/htdocs/admin/agenda.php b/htdocs/admin/agenda.php
index d076fcf7e26..c5fc1c55793 100644
--- a/htdocs/admin/agenda.php
+++ b/htdocs/admin/agenda.php
@@ -144,7 +144,7 @@ print '<input type="hidden" name="action" value="save">';
 
 $head=agenda_prepare_head();
 
-dol_fiche_head($head, 'autoactions', $langs->trans("Agenda"), 0, 'action');
+dol_fiche_head($head, 'autoactions', $langs->trans("Agenda"), -1, 'action');
 
 print $langs->trans("AgendaAutoActionDesc")."<br>\n";
 print $langs->trans("OnlyActiveElementsAreShown").'<br>';
diff --git a/htdocs/admin/agenda_extrafields.php b/htdocs/admin/agenda_extrafields.php
index 2cf3a323c21..74ae6cb2d95 100644
--- a/htdocs/admin/agenda_extrafields.php
+++ b/htdocs/admin/agenda_extrafields.php
@@ -75,7 +75,7 @@ print "<br>\n";
 
 $head=agenda_prepare_head();
 
-dol_fiche_head($head, 'attributes', $langs->trans("Agenda"), 0, 'action');
+dol_fiche_head($head, 'attributes', $langs->trans("Agenda"), -1, 'action');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
diff --git a/htdocs/admin/agenda_extsites.php b/htdocs/admin/agenda_extsites.php
index 1e595b5088e..0b69b947a38 100644
--- a/htdocs/admin/agenda_extsites.php
+++ b/htdocs/admin/agenda_extsites.php
@@ -137,7 +137,7 @@ print '<input type="hidden" name="action" value="save">';
 
 $head=agenda_prepare_head();
 
-dol_fiche_head($head, 'extsites', $langs->trans("Agenda"), 0, 'action');
+dol_fiche_head($head, 'extsites', $langs->trans("Agenda"), -1, 'action');
 
 print $langs->trans("AgendaExtSitesDesc")."<br>\n";
 print "<br>\n";
diff --git a/htdocs/admin/agenda_other.php b/htdocs/admin/agenda_other.php
index 6e0a62610aa..f652829a80c 100644
--- a/htdocs/admin/agenda_other.php
+++ b/htdocs/admin/agenda_other.php
@@ -196,7 +196,7 @@ print "<br>\n";
 
 $head=agenda_prepare_head();
 
-dol_fiche_head($head, 'other', $langs->trans("Agenda"), 0, 'action');
+dol_fiche_head($head, 'other', $langs->trans("Agenda"), -1, 'action');
 
 
 /*
diff --git a/htdocs/admin/agenda_xcal.php b/htdocs/admin/agenda_xcal.php
index cd2406e6fdc..0e66125ba7c 100644
--- a/htdocs/admin/agenda_xcal.php
+++ b/htdocs/admin/agenda_xcal.php
@@ -83,7 +83,7 @@ print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 
 $head=agenda_prepare_head();
 
-dol_fiche_head($head, 'xcal', $langs->trans("Agenda"), 0, 'action');
+dol_fiche_head($head, 'xcal', $langs->trans("Agenda"), -1, 'action');
 
 print $langs->trans("AgendaSetupOtherDesc")."<br>\n";
 print "<br>\n";
diff --git a/htdocs/core/ajax/check_notifications.php b/htdocs/core/ajax/check_notifications.php
index 4db67aef939..fa3edd7a4be 100644
--- a/htdocs/core/ajax/check_notifications.php
+++ b/htdocs/core/ajax/check_notifications.php
@@ -21,7 +21,6 @@ if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');
 if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');
 if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
 if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
-if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
 
 require '../../main.inc.php';
 
@@ -88,9 +87,11 @@ if ($time >= $_SESSION['auto_check_events_not_before'])
         while ($obj = $db->fetch_object($resql)) 
         {
             $langs->load("agenda");
+            $langs->load("commercial");
             
             $actionmod->fetch($obj->id);
 
+            // Message must be formated and translated to be used with javascript directly
             $event = array();
             $event['type'] = 'agenda';
             $event['id'] = $actionmod->id;
@@ -101,6 +102,10 @@ if ($time >= $_SESSION['auto_check_events_not_before'])
             $eventfound[] = $event;
         }
     }
+    else
+    {
+        dol_syslog("Error sql = ".$db->lasterror(), LOG_ERR);
+    }
 
 }
 
diff --git a/htdocs/core/js/lib_notification.js.php b/htdocs/core/js/lib_notification.js.php
index af4452dfb39..a3b90a35db6 100644
--- a/htdocs/core/js/lib_notification.js.php
+++ b/htdocs/core/js/lib_notification.js.php
@@ -65,7 +65,7 @@ if (! ($_SERVER['HTTP_REFERER'] === $dolibarr_main_url_root . '/' || $_SERVER['H
    	// We set a delay before launching first test so next check will arrive after the time_auto_update compared to previous one.
     var time_first_execution = (time_auto_update - (nowtime - time_js_next_test)) * 1000;	//need milliseconds
     if (login != '') { 
-    	console.log("Launch browser notif check: setTimeout to wait time_first_execution="+time_first_execution+" before first check - nowtime = "+nowtime+" auto_check_events_not_before = "+auto_check_events_not_before+" time_js_next_test = "+time_js_next_test+" time_auto_update="+time_auto_update);
+    	console.log("Launch browser notif check: setTimeout is set to launch 'first_execution' function after a wait of time_first_execution="+time_first_execution+". nowtime (time php page generation) = "+nowtime+" auto_check_events_not_before (val in session)= "+auto_check_events_not_before+" time_js_next_test (max now,auto_check_events_not_before) = "+time_js_next_test+" time_auto_update="+time_auto_update);
     	setTimeout(first_execution, time_first_execution); 
     } //first run auto check
 
@@ -79,17 +79,18 @@ if (! ($_SERVER['HTTP_REFERER'] === $dolibarr_main_url_root . '/' || $_SERVER['H
     function check_events() {
     	if (Notification.permission === "granted")
     	{
-    		console.log("Call check_events time_js_next_test="+time_js_next_test);
-            $.ajax("<?php print dol_buildpath('/core/ajax/check_notifications.php', 1); ?>", {
-                type: "post",   // Usually post o get
+    		console.log("Call check_events time_js_next_test = date we are looking for event after ="+time_js_next_test);
+            $.ajax("<?php print DOL_URL_ROOT.'/core/ajax/check_notifications.php'; ?>", {
+                type: "post",   // Usually post or get
                 async: true,
                 data: {time: time_js_next_test},
                 success: function (result) {
                     var arr = JSON.parse(result);
                     if (arr.length > 0) {
+                    	var audio = null; 
                         <?php
                         if (! empty($conf->global->AGENDA_NOTIFICATION_SOUND)) {
-                            print 'var audio = new Audio(\''.DOL_URL_ROOT.'/theme/common/sound/notification_agenda.wav'.'\');';
+                            print 'audio = new Audio(\''.DOL_URL_ROOT.'/theme/common/sound/notification_agenda.wav'.'\');';
                         }
                         ?>
     
@@ -136,6 +137,7 @@ if (! ($_SERVER['HTTP_REFERER'] === $dolibarr_main_url_root . '/' || $_SERVER['H
         }
 
         time_js_next_test += time_auto_update;
+		console.log('Updated time_js_next_test. New value is '+time_js_next_test);
     }
 <?php 
 }

From fed1b152d9aca07b0236b5f18939391ee5c0e485 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Sun, 30 Apr 2017 07:41:47 +0200
Subject: [PATCH 142/505] Correct multi-journals

---
 htdocs/accountancy/admin/journals_card.php    | 12 +++++++-----
 .../admin/{journals.php => journals_list.php} |  4 ++--
 htdocs/core/menus/standard/eldy.lib.php       | 19 ++++++++++---------
 3 files changed, 19 insertions(+), 16 deletions(-)
 rename htdocs/accountancy/admin/{journals.php => journals_list.php} (97%)

diff --git a/htdocs/accountancy/admin/journals_card.php b/htdocs/accountancy/admin/journals_card.php
index 9e04d75ce9f..aae3f8b2cb1 100644
--- a/htdocs/accountancy/admin/journals_card.php
+++ b/htdocs/accountancy/admin/journals_card.php
@@ -64,7 +64,7 @@ $object = new AccountingJournal($db);
 if ($action == 'confirm_delete' && $confirm == "yes") {
 	$result = $object->delete($id);
 	if ($result >= 0) {
-		header("Location: journals.php");
+		header("Location: journals_list.php");
 		exit();
 	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
@@ -108,7 +108,7 @@ else if ($action == 'add') {
 			$action = 'create';
 		}
 	} else {
-		header("Location: ./journals.php");
+		header("Location: journals_list.php");
 		exit();
 	}
 } 
@@ -227,7 +227,9 @@ if ($action == 'create')
 
 			print '</table>';
 
-			print '<br><div class="center">';
+			dol_fiche_end();
+
+			print '<div class="center">';
 			print '<input type="submit" class="button" value="' . $langs->trans("Save") . '">';
 			print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
 			print '<input type="submit" name="cancel" class="button" value="' . $langs->trans("Cancel") . '">';
@@ -248,7 +250,7 @@ if ($action == 'create')
 
 			print '<table class="border" width="100%">';
 
-			$linkback = '<a href="' . DOL_URL_ROOT . '/accountancy/admin/journals.php">' . $langs->trans("BackToList") . '</a>';
+			$linkback = '<a href="' . DOL_URL_ROOT . '/accountancy/admin/journals_list.php">' . $langs->trans("BackToList") . '</a>';
 
 			// Ref
 			print '<tr><td class="titlefield">' . $langs->trans("Code") . '</td><td width="50%">';
@@ -271,7 +273,7 @@ if ($action == 'create')
 
 			dol_fiche_end();
 
-			if (! empty($user->rights->accounting->fiscalyear))
+			if (! empty($user->rights->accounting->chartofaccount))
 			{
     			/*
     			 * Barre d'actions
diff --git a/htdocs/accountancy/admin/journals.php b/htdocs/accountancy/admin/journals_list.php
similarity index 97%
rename from htdocs/accountancy/admin/journals.php
rename to htdocs/accountancy/admin/journals_list.php
index 677f2a743e5..f7ba79457a8 100644
--- a/htdocs/accountancy/admin/journals.php
+++ b/htdocs/accountancy/admin/journals_list.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * \file		htdocs/accountancy/admin/journals.php
+ * \file		htdocs/accountancy/admin/journals_list.php
  * \ingroup		Advanced accountancy
  * \brief		Setup page to configure journals
  */
@@ -154,7 +154,7 @@ dol_fiche_end();
 
 // Buttons
 print '<div class="tabsAction">';
-if (! empty($user->rights->accounting->fiscalyear))
+if (! empty($user->rights->accounting->chartofaccount))
 {
     print '<a class="butAction" href="journals_card.php?action=create">' . $langs->trans("NewAccountingJournal") . '</a>';
 }
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index dffc5f9af1b..f715061d562 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -165,7 +165,7 @@ function print_eldy_menu($db,$atarget,$type_user,&$tabMenu,&$menu,$noout=0,$mode
 	if (! empty($conf->loan->enabled)) $menuqualified++;
 	$tmpentry=array(
 	   'enabled'=>$menuqualified,
-	   'perms'=>(! empty($user->rights->compta->resultat->lire) || ! empty($user->rights->accounting->plancompte->lire) || ! empty($user->rights->facture->lire) || ! empty($user->rights->don->lire) || ! empty($user->rights->tax->charges->lire) || ! empty($user->rights->salaries->read) || ! empty($user->rights->fournisseur->facture->lire) || ! empty($user->rights->loan->read)),
+	   'perms'=>(! empty($user->rights->compta->resultat->lire) || ! empty($user->rights->accounting->mouvements->lire) || ! empty($user->rights->facture->lire) || ! empty($user->rights->don->lire) || ! empty($user->rights->tax->charges->lire) || ! empty($user->rights->salaries->read) || ! empty($user->rights->fournisseur->facture->lire) || ! empty($user->rights->loan->read)),
 	   'module'=>'comptabilite|accounting|facture|supplier_invoice|don|tax|salaries|loan');
 	$showmode=dol_eldy_showmenu($type_user, $tmpentry, $listofmodulesforexternal);
 	if ($showmode)
@@ -947,26 +947,27 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 			{
 				$langs->load("accountancy");
 
-				$permtoshowmenu=(! empty($conf->accounting->enabled) || $user->rights->accounting->bind->write || $user->rights->accounting->bind->write || $user->rights->compta->resultat->lire);
+				$permtoshowmenu=(! empty($conf->accounting->enabled) || $user->rights->accounting->bind->write || $user->rights->compta->resultat->lire);
 				$newmenu->add("/accountancy/index.php?leftmenu=accountancy",$langs->trans("MenuAccountancy"), 0, $permtoshowmenu, '', $mainmenu, 'accountancy');
 
 				// Chart of account
 				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy/',$leftmenu)) $newmenu->add("/accountancy/index.php?leftmenu=accountancy_admin", $langs->trans("Setup"),1,$user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin', 1);
-				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/accountancy/admin/accountmodel.php?id=31&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("Pcg_version"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_chartmodel', 10);
-				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/accountancy/admin/account.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("Chartofaccounts"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_chart', 20);
-				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/accountancy/admin/categories_list.php?id=32&search_country_id=".$mysoc->country_id."&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("AccountingCategory"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_chart', 22);
+				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/accountancy/admin/journals_list.php?id=33&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("AccountingJournals"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_journal', 10);
+				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/accountancy/admin/accountmodel.php?id=31&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("Pcg_version"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_chartmodel', 20);
+				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/accountancy/admin/account.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("Chartofaccounts"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_chart', 30);
+				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/accountancy/admin/categories_list.php?id=32&search_country_id=".$mysoc->country_id."&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("AccountingCategory"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_chart', 31);
 				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/accountancy/admin/defaultaccounts.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuDefaultAccounts"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_default', 40);
 				if (! empty($conf->facture->enabled) || ! empty($conf->fournisseur->enabled)) 
 				{
-				    if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/admin/dict.php?id=10&from=accountancy&search_country_id=".$mysoc->country_id."&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuVatAccounts"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_default', 30);
+				    if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/admin/dict.php?id=10&from=accountancy&search_country_id=".$mysoc->country_id."&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuVatAccounts"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_default', 50);
 				}
 				if (! empty($conf->tax->enabled)) 
 				{
-				    if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/admin/dict.php?id=7&from=accountancy&search_country_id=".$mysoc->country_id."&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuTaxAccounts"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_default', 30);
+				    if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/admin/dict.php?id=7&from=accountancy&search_country_id=".$mysoc->country_id."&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuTaxAccounts"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_default', 50);
 				}
 				if (! empty($conf->expensereport->enabled)) 
 				{
-				    if (preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/admin/dict.php?id=17&from=accountancy&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuExpenseReportAccounts"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_default', 30);
+				    if (preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/admin/dict.php?id=17&from=accountancy&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuExpenseReportAccounts"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_default', 50);
 				}
 				/* not required yet, already supported by default account
 				if (! empty($conf->loan->enabled)) 
@@ -977,7 +978,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 				{
 				    if (preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/don/admin/donation.php?from=accountancy&mainmenu=accountancy&amp;leftmenu=accountancy_admin", $langs->trans("MenuDonationAccounts"), 2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_donation', 47);
 				}*/
-				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/accountancy/admin/productaccount.php?mainmenu=accountancy&amp;leftmenu=accountancy_admin", $langs->trans("MenuProductsAccounts"), 2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_product', 50);
+				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/accountancy/admin/productaccount.php?mainmenu=accountancy&amp;leftmenu=accountancy_admin", $langs->trans("MenuProductsAccounts"), 2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_product', 60);
 				
 				// Binding
 				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy/',$leftmenu)) $newmenu->add("/accountancy/customer/index.php?leftmenu=accountancy_dispatch_customer&amp;mainmenu=accountancy",$langs->trans("CustomersVentilation"),1,$user->rights->accounting->bind->write, '', $mainmenu, 'dispatch_customer');

From 7c2b3b8df0cb9b99456ac4010b1d0de913e6176f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 30 Apr 2017 12:55:11 +0200
Subject: [PATCH 143/505] NEW When down payment is entered, discount to reuse
 into final invoice is automatically created. This save one click into invoice
 workflow.

---
 htdocs/compta/facture/card.php                | 18 +++---
 htdocs/compta/paiement.php                    | 38 ++++++------
 .../compta/paiement/class/paiement.class.php  | 60 +++++++++++++++++--
 htdocs/langs/en_US/bills.lang                 |  2 +-
 4 files changed, 85 insertions(+), 33 deletions(-)

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 70eea532a79..6f5ef85310d 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -611,7 +611,9 @@ if (empty($reshook))
 		{
 			$db->begin();
 
-			// Boucle sur chaque taux de tva
+			$amount_ht = $amount_tva = $amount_ttc = array();
+			
+			// Loop on each vat rate
 			$i = 0;
 			foreach ($object->lines as $line)
 			{
@@ -630,20 +632,19 @@ if (empty($reshook))
 				$discount->description = '(CREDIT_NOTE)';
 			elseif ($object->type == Facture::TYPE_DEPOSIT)
 				$discount->description = '(DEPOSIT)';
-			elseif ($object->type == Facture::TYPE_STANDARD)
+			elseif ($object->type == Facture::TYPE_STANDARD || $object->type == Facture::TYPE_REPLACEMENT || $object->type == Facture::TYPE_SITUATION)
 				$discount->description = '(EXCESS RECEIVED)';
 			else {
 				setEventMessages($langs->trans('CantConvertToReducAnInvoiceOfThisType'), null, 'errors');
 			}
-			$discount->tva_tx = abs($object->total_ttc);
 			$discount->fk_soc = $object->socid;
 			$discount->fk_facture_source = $object->id;
 
 			$error = 0;
 			
-			if ($object->type == Facture::TYPE_STANDARD) {
-				
-				// If we're on a standard invoice, we have to get excess received to create it in TTC wuthout VAT
+			if ($object->type == Facture::TYPE_STANDARD || $object->type == Facture::TYPE_REPLACEMENT || $object->type == Facture::TYPE_SITUATION) 
+			{
+				// If we're on a standard invoice, we have to get excess received to create a discount in TTC without VAT
 				
 				$sql = 'SELECT SUM(pf.amount) as total_paiements
 						FROM llx_c_paiement as c, llx_paiement_facture as pf, llx_paiement as p
@@ -663,8 +664,9 @@ if (empty($reshook))
 					$error++;
 				}
 				
-			} else {
-			
+			}
+			if ($object->type == Facture::TYPE_CREDIT_NOTE || $object->type == Facture::TYPE_DEPOSIT)
+			{
 				foreach ($amount_ht as $tva_tx => $xxx)
 				{
 					$discount->amount_ht = abs($amount_ht[$tva_tx]);
diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php
index 96f77e85758..8cd924a0df8 100644
--- a/htdocs/compta/paiement.php
+++ b/htdocs/compta/paiement.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2001-2006 Rodolphe Quiedeville  <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2016 Laurent Destailleur   <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2017 Laurent Destailleur   <eldy@users.sourceforge.net>
  * Copyright (C) 2005      Marc Barilley / Ocebo <marc@ocebo.com>
  * Copyright (C) 2005-2012 Regis Houssin         <regis.houssin@capnetworks.com>
  * Copyright (C) 2007      Franky Van Liedekerke <franky.van.liedekerke@telenet.be>
@@ -221,7 +221,7 @@ if (empty($reshook))
 	    $db->begin();
 
 	    // Clean parameters amount if payment is for a credit note
-	    if (GETPOST('type') == 2)
+	    if (GETPOST('type') == Facture::TYPE_CREDIT_NOTE)
 	    {
 		    foreach ($amounts as $key => $value)	// How payment is dispatch
 		    {
@@ -249,7 +249,7 @@ if (empty($reshook))
 	    // Creation of payment line
 	    $paiement = new Paiement($db);
 	    $paiement->datepaye     = $datepaye;
-	    $paiement->amounts      = $amounts;   // Array with all payments dispatching
+	    $paiement->amounts      = $amounts;   // Array with all payments dispatching with invoice id
 	    $paiement->multicurrency_amounts = $multicurrency_amounts;   // Array with all payments dispatching
 	    $paiement->paiementid   = dol_getIdFromCode($db,GETPOST('paiementcode'),'c_paiement');
 	    $paiement->num_paiement = GETPOST('num_paiement');
@@ -257,7 +257,7 @@ if (empty($reshook))
 
 	    if (! $error)
 	    {
-	    	$paiement_id = $paiement->create($user, (GETPOST('closepaidinvoices')=='on'?1:0));
+	    	$paiement_id = $paiement->create($user, (GETPOST('closepaidinvoices')=='on'?1:0));    // This include closing invoices
 	    	if ($paiement_id < 0)
 	        {
 	            setEventMessages($paiement->error, $paiement->errors, 'errors');
@@ -268,7 +268,7 @@ if (empty($reshook))
 	    if (! $error)
 	    {
 	    	$label='(CustomerInvoicePayment)';
-	    	if (GETPOST('type') == 2) $label='(CustomerInvoicePaymentBack)';
+	    	if (GETPOST('type') == Facture::TYPE_CREDIT_NOTE) $label='(CustomerInvoicePaymentBack)';  // Refund of a credit note
 	        $result=$paiement->addPaymentToBank($user,'payment',$label,GETPOST('accountid'),GETPOST('chqemetteur'),GETPOST('chqbank'));
 	        if ($result < 0)
 	        {
@@ -281,7 +281,7 @@ if (empty($reshook))
 	    {
 	        $db->commit();
 
-	        // If payment dispatching on more than one invoice, we keep on summary page, otherwise go on invoice card
+	        // If payment dispatching on more than one invoice, we keep on summary page, otherwise jump on invoice card
 	        $invoiceid=0;
 	        foreach ($paiement->amounts as $key => $amount)
 	        {
@@ -309,7 +309,7 @@ if (empty($reshook))
  * View
  */
 
-llxHeader();
+llxHeader('', $langs->trans("Payment"));
 
 $form=new Form($db);
 
@@ -324,8 +324,8 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 		$facture->fetch_thirdparty();
 
 		$title='';
-		if ($facture->type != 2) $title.=$langs->trans("EnterPaymentReceivedFromCustomer");
-		if ($facture->type == 2) $title.=$langs->trans("EnterPaymentDueToCustomer");
+		if ($facture->type != Facture::TYPE_CREDIT_NOTE) $title.=$langs->trans("EnterPaymentReceivedFromCustomer");
+		if ($facture->type == Facture::TYPE_CREDIT_NOTE) $title.=$langs->trans("EnterPaymentDueToCustomer");
 		print load_fiche_titre($title);
 
 		// Initialize data for confirmation (this is used because data can be change during confirmation)
@@ -347,7 +347,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 		}
 
 		// Add realtime total information
-		if ($conf->use_javascript_ajax)
+		if (! empty($conf->use_javascript_ajax))
 		{
 			print "\n".'<script type="text/javascript" language="javascript">';
 			print '$(document).ready(function () {
@@ -369,7 +369,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 			                    }
             					if ($(\'#fieldchqemetteur\').val() == \'\')
             					{
-            						var emetteur = ('.$facture->type.' == 2) ? \''.dol_escape_js(dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_NOM)).'\' : jQuery(\'#thirdpartylabel\').val();
+            						var emetteur = ('.$facture->type.' == '.Facture::TYPE_CREDIT_NOTE.') ? \''.dol_escape_js(dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_NOM)).'\' : jQuery(\'#thirdpartylabel\').val();
             						$(\'#fieldchqemetteur\').val(emetteur);
             					}
             				}
@@ -437,14 +437,14 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 			';
 
 			print '	});'."\n";
-			if (!empty($conf->use_javascript_ajax)){
-				//Add js for AutoFill
-				print ' $(document).ready(function () {';
-				print ' 	$(".AutoFillAmout").on(\'click touchstart\', function(){
-								$("input[name="+$(this).data(\'rowname\')+"]").val($(this).data("value")).trigger("change");
-							});';
-				print '	});'."\n";
-			}
+
+			//Add js for AutoFill
+			print ' $(document).ready(function () {';
+			print ' 	$(".AutoFillAmout").on(\'click touchstart\', function(){
+							$("input[name="+$(this).data(\'rowname\')+"]").val($(this).data("value")).trigger("change");
+						});';
+			print '	});'."\n";
+
 			print '	</script>'."\n";
 		}
 
diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php
index 53035dca96f..03a7759e52c 100644
--- a/htdocs/compta/paiement/class/paiement.class.php
+++ b/htdocs/compta/paiement/class/paiement.class.php
@@ -255,7 +255,7 @@ class Paiement extends CommonObject
                                 {
                                     if (! empty($conf->prelevement->enabled))
                                     {
-                                        // TODO Check if this payment has a withdraw request
+                                        // FIXME Check if this invoice has a withdraw request
                                         // if not, $mustwait++;      // This will disable automatic close on invoice to allow to process
                                     }
                                 }
@@ -275,11 +275,61 @@ class Paiement extends CommonObject
                             else if ($mustwait) dol_syslog("There is ".$mustwait." differed payment to process, we do nothing more.");
                             else
                             {
-                                $result=$invoice->set_paid($user,'','');
-                                if ($result<0)
+                                // If invoice is a down payment, we also convert down payment to discount
+                                if ($invoice->type == Facture::TYPE_DEPOSIT)
                                 {
-                                    $this->error=$invoice->error;
-                                    $error++;
+			                        $amount_ht = $amount_tva = $amount_ttc = array();
+			                         
+                                    // Loop on each vat rate
+                                    $i = 0;
+                                    foreach ($invoice->lines as $line)
+                                    {
+                                        if ($line->total_ht!=0)
+                                        { 	// no need to create discount if amount is null
+                                            $amount_ht[$line->tva_tx] += $line->total_ht;
+                                            $amount_tva[$line->tva_tx] += $line->total_tva;
+                                            $amount_ttc[$line->tva_tx] += $line->total_ttc;
+                                            $i ++;
+                                        }
+                                    }
+                                    
+                                    // Insert one discount by VAT rate category
+                                    $discount = new DiscountAbsolute($this->db);
+                                    $discount->description = '(DEPOSIT)';
+                                    $discount->fk_soc = $invoice->socid;
+                                    $discount->fk_facture_source = $invoice->id;
+                                
+                                    foreach ($amount_ht as $tva_tx => $xxx)
+                                    {
+                                        $discount->amount_ht = abs($amount_ht[$tva_tx]);
+                                        $discount->amount_tva = abs($amount_tva[$tva_tx]);
+                                        $discount->amount_ttc = abs($amount_ttc[$tva_tx]);
+                                        $discount->tva_tx = abs($tva_tx);
+                            
+                                        $result = $discount->create($user);
+                                        if ($result < 0)
+                                        {
+                                            $error++;
+                                            break;
+                                        }
+                                    }
+                                    
+                                    if ($error)
+                                    {
+                                        setEventMessages($discount->error, $discount->errors, 'errors');
+                                        $error++;
+                                    }                                   
+                                }
+                                
+                                // Set invoice to paid
+                                if (! $error)
+                                {
+                                    $result=$invoice->set_paid($user,'','');
+                                    if ($result<0)
+                                    {
+                                        $this->error=$invoice->error;
+                                        $error++;
+                                    }
                                 }
                             }
 					    }
diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang
index 7432f0e2412..189ef5c1fe2 100644
--- a/htdocs/langs/en_US/bills.lang
+++ b/htdocs/langs/en_US/bills.lang
@@ -447,7 +447,7 @@ CantRemovePaymentWithOneInvoicePaid=Can't remove payment since there is at least
 ExpectedToPay=Expected payment
 CantRemoveConciliatedPayment=Can't remove conciliated payment
 PayedByThisPayment=Paid by this payment
-ClosePaidInvoicesAutomatically=Classify "Paid" all standard, situation or replacement invoices entirely paid.
+ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices entirely paid.
 ClosePaidCreditNotesAutomatically=Classify "Paid" all credit notes entirely paid back.
 ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions entirely paid.
 AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remain to pay will be automatically closed to status "Paid".

From 58e2b49b1c2c59392e0453f479a9af43b95d6f5b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 30 Apr 2017 13:49:06 +0200
Subject: [PATCH 144/505] Clean code

---
 htdocs/compta/facture/card.php            | 13 -------------
 htdocs/core/class/commoninvoice.class.php |  3 ++-
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 6f5ef85310d..7e08bdc7fae 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -873,19 +873,6 @@ if (empty($reshook))
 	                    $object->addline($langs->trans('invoiceAvoirLineWithPaymentRestAmount'),$remain_to_pay,1,0,0,0,0,0,'','','TTC');
 	                }
 	            }
-
-				// Add predefined lines
-				/*
-	             TODO delete
-	             for($i = 1; $i <= $NBLINES; $i ++) {
-					if ($_POST['idprod' . $i]) {
-						$product = new Product($db);
-						$product->fetch($_POST['idprod' . $i]);
-						$startday = dol_mktime(12, 0, 0, $_POST['date_start' . $i . 'month'], $_POST['date_start' . $i . 'day'], $_POST['date_start' . $i . 'year']);
-						$endday = dol_mktime(12, 0, 0, $_POST['date_end' . $i . 'month'], $_POST['date_end' . $i . 'day'], $_POST['date_end' . $i . 'year']);
-						$result = $object->addline($product->description, $product->price, $_POST['qty' . $i], $product->tva_tx, $product->localtax1_tx, $product->localtax2_tx, $_POST['idprod' . $i], $_POST['remise_percent' . $i], $startday, $endday, 0, 0, '', $product->price_base_type, $product->price_ttc, $product->type);
-					}
-				}*/
 			}
 		}
 
diff --git a/htdocs/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php
index 3e9d56f8f8c..4d9fa7a72af 100644
--- a/htdocs/core/class/commoninvoice.class.php
+++ b/htdocs/core/class/commoninvoice.class.php
@@ -51,7 +51,8 @@ abstract class CommonInvoice extends CommonObject
     const TYPE_DEPOSIT = 3;
 
     /**
-     * Proforma invoice
+     * Proforma invoice. 
+     * @deprectad Remove this. A "proforma invoice" is an order with a look of invoice, not an invoice !
      */
     const TYPE_PROFORMA = 4;
 

From 072eb740c713bef7210a5474409b274a175f6a22 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 30 Apr 2017 13:57:13 +0200
Subject: [PATCH 145/505] Fix php compatibility

---
 htdocs/product/inventory/card.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/product/inventory/card.php b/htdocs/product/inventory/card.php
index f7e4cbecb0a..026bd37e743 100644
--- a/htdocs/product/inventory/card.php
+++ b/htdocs/product/inventory/card.php
@@ -463,7 +463,8 @@ function card_line(&$inventory, &$lines, $mode)
 		if(!empty($TCacheEntrepot[$Inventorydet->fk_warehouse])) $e = $TCacheEntrepot[$Inventorydet->fk_warehouse];
 		elseif($e->fetch($Inventorydet->fk_warehouse) > 0) $TCacheEntrepot[$e->id] = $e;
 		
-		$qty = (float)GETPOST('qty_to_add')[$k];
+		$qtytoadd = GETPOST('qty_to_add', 'array');
+		$qty = (float) $qtytoadd[$k];
 		
 		$lines[]=array(
 			'produit' => $product->getNomUrl(1).'&nbsp;-&nbsp;'.$product->label,

From 1e3384a842d11f490ca81654e608d629229911bd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 30 Apr 2017 14:04:01 +0200
Subject: [PATCH 146/505] Fix travis

---
 htdocs/core/class/commonobject.class.php      |  64 +++++++++-
 htdocs/core/db/DoliDB.class.php               | 117 ------------------
 htdocs/product/inventory/card.php             |   2 +-
 htdocs/product/inventory/list.php             |   2 +-
 .../inventory}/listview.class.php             |  80 ++++++------
 5 files changed, 104 insertions(+), 161 deletions(-)
 rename htdocs/{core/class => product/inventory}/listview.class.php (93%)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 2526638cee5..5e5c13056e7 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -4674,7 +4674,26 @@ abstract class CommonObject
 	 */
 	public function createCommon(User $user, $notrigger = false)
 	{
+	    foreach ($this->fields as $k => $v) {
 	    
+	        $keys[] = $k;
+	        $values[] = $this->quote($v);
+	         
+	    }
+	    
+	    $sql = 'INSERT INTO '.MAIN_DB_PREFIX.$table.'
+					( '.implode( ",", $keys ).' )
+					VALUES ( '.implode( ",", $values ).' ) ';
+	    
+	    $res = $this->query($sql);
+	    if($res===false) {
+	    
+	        return false;
+	    }
+	    
+	    // TODO Add triggers
+	    	  
+	    return true;	    
 	}
 	
 	
@@ -4690,7 +4709,6 @@ abstract class CommonObject
 	{
 	    
 	}
-	
 
 	/**
 	 * Update object into database
@@ -4702,10 +4720,36 @@ abstract class CommonObject
 	 */
 	public function updateCommon(User $user, $notrigger = false)
 	{
+	    foreach ($this->fields as $k => $v) {
 	    
+	        if (is_array($key)){
+	            $i=array_search($k, $key);
+	            if ( $i !== false) {
+	                $where[] = $key[$i].'=' . $this->quote( $v ) ;
+	                continue;
+	            }
+	        } else {
+	            if ( $k == $key) {
+	                $where[] = $k.'=' .$this->quote( $v ) ;
+	                continue;
+	            }
+	        }
+	    
+	        $tmp[] = $k.'='.$this->quote($v);
+	    }
+	    $sql = 'UPDATE '.MAIN_DB_PREFIX.$table.' SET '.implode( ',', $tmp ).' WHERE ' . implode(' AND ',$where) ;
+	    $res = $this->query( $sql );
+	    
+	    if($res===false) {
+	        //error
+	        return false;
+	    }
+	    
+	    // TODO Add triggers
+	    
+	    return true;	    
 	}
 	
-	
 	/**
 	 * Delete object in database
 	 *
@@ -4718,4 +4762,20 @@ abstract class CommonObject
 	{
 	    
 	}
+
+	/**
+	 * Add quote to field value if necessary
+	 *
+	 * @param string|int	$value	value to protect
+	 * @return string|int
+	 */
+	function quote($value) {
+	
+	    if(is_null($value)) return 'NULL';
+	    else if(is_numeric($value)) return $value;
+	    else return "'".$this->escape( $value )."'";
+	
+	}
+	
 }
+
diff --git a/htdocs/core/db/DoliDB.class.php b/htdocs/core/db/DoliDB.class.php
index fb398270fa6..9fc1739334c 100644
--- a/htdocs/core/db/DoliDB.class.php
+++ b/htdocs/core/db/DoliDB.class.php
@@ -295,122 +295,5 @@ abstract class DoliDB implements Database
 	{
 		return $this->lastqueryerror;
 	}
-	/*
-	 * Add quote to field value if necessary
-	 * 
-	 * @param string|int	$value	value to protect
-	 * @return string|int 
-	*/
-	function quote($value) {
-		
-		if(is_null($value)) return 'NULL';
-		else if(is_numeric($value)) return $value;
-		else return "'".$this->escape( $value )."'";
-		
-	}
-	
-	/**
-	 *	Generate and execute Update SQL commande
-	 *
-	 * 	@param	string				$table		table to update
-	 *	@param	array				$values		array of values to update
-	 *	@param  int|string|array	$key		key of value to select row to update
-	 *	@return	bool|result						false or boolean
-	 */
-	function update($table,$fields,$key){
-	
-		foreach ($fields as $k => $v) {
-				
-			if (is_array($key)){
-				$i=array_search($k , $key );
-				if ( $i !== false) {
-					$where[] = $key[$i].'=' . $this->quote( $v ) ;
-					continue;
-				}
-			} else {
-				if ( $k == $key) {
-					$where[] = $k.'=' .$this->quote( $v ) ;
-					continue;
-				}
-			}
-	
-			$tmp[] = $k.'='.$this->quote($v);
-		}
-		$sql = 'UPDATE '.MAIN_DB_PREFIX.$table.' SET '.implode( ',', $tmp ).' WHERE ' . implode(' AND ',$where) ;
-		$res = $this->query( $sql );
-	
-		if($res===false) {
-			//error
-			return false;
-		}
-	
-		return true;
-	}
-	
-	/**
-	 *	Generate and execute Insert SQL commande
-	 *
-	 * 	@param	string				$table		table to update
-	 *	@param	array				$values		array of values to update
-	 *	@return	bool|result						false or boolean
-	 */
-	function insert($table,$fields){
-		 
-		foreach ($fields as $k => $v) {
-	
-			$keys[] = $k;
-			$values[] = $this->quote($v);
-			
-		}
-
-		$sql = 'INSERT INTO '.MAIN_DB_PREFIX.$table.' 
-					( '.implode( ",", $keys ).' ) 
-					VALUES ( '.implode( ",", $values ).' ) ';
-
-		$res = $this->query($sql);
-		if($res===false) {
-	
-			return false;
-		}
-		
-		return true;
-	}
-	
-	/**
-	 *	Generate and execute Delete SQL commande
-	 *
-	 * 	@param	string				$table		table for the delete
-	 *	@param	array				$values		array of values to delete
-	 *	@param  int|string|array	$key		key of value to select row to update
-	 *	@return	bool|result						false or boolean
-	 */
-	function delete($table,$fields,$key){
-		foreach ($fields as $k => $v) {
-			if (is_array($key)){
-				$i=array_search($k , $key );
-				if ( $i !== false) {
-					$where[] = $key[$i].'=' . $this->quote( $v ) ;
-					continue;
-				}
-			} else {
-				if ( $k == $key) {
-					$where[] = $k.'='.$this->quote( $v ) ;
-					continue;
-				}
-			}
-			
-		}
-	
-		$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$table.' WHERE '.implode(' AND ',$where);
-	
-		$res = $this->query( $sql );
-		if($res===false) {
-			return false;
-		}
-		
-		return true;
-		
-	}
-	
 }
 
diff --git a/htdocs/product/inventory/card.php b/htdocs/product/inventory/card.php
index 026bd37e743..dc279cc0929 100644
--- a/htdocs/product/inventory/card.php
+++ b/htdocs/product/inventory/card.php
@@ -23,7 +23,7 @@
  
 require_once '../../main.inc.php';
 
-require_once DOL_DOCUMENT_ROOT.'/core/class/listview.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/inventory/listview.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
diff --git a/htdocs/product/inventory/list.php b/htdocs/product/inventory/list.php
index 36a185d7fd1..57545b07948 100644
--- a/htdocs/product/inventory/list.php
+++ b/htdocs/product/inventory/list.php
@@ -23,7 +23,7 @@
  
 require_once '../../main.inc.php';
 
-require_once DOL_DOCUMENT_ROOT.'/core/class/listview.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/inventory/listview.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
diff --git a/htdocs/core/class/listview.class.php b/htdocs/product/inventory/listview.class.php
similarity index 93%
rename from htdocs/core/class/listview.class.php
rename to htdocs/product/inventory/listview.class.php
index 91dd182fc56..51855629686 100644
--- a/htdocs/core/class/listview.class.php
+++ b/htdocs/product/inventory/listview.class.php
@@ -103,7 +103,7 @@ class Listview
 
     /**
      * @param string    $key    field name
-     * @param array     $TParam array of configuration
+     * @param string     $TParam array of configuration
      * @return array
      */
 	private function getSearchKey($key, &$TParam)
@@ -149,7 +149,7 @@ class Listview
 
 
     /**
-     * @param array     $TSQLMore   contain some additional sql instructions
+     * @param string     $TSQLMore   contain some additional sql instructions
      * @param string    $value      date with read format
      * @param string    $sKey       field name
      */
@@ -181,9 +181,9 @@ class Listview
 
 
     /**
-     * @param array     $TSQLMore   contain some additional sql instructions
+     * @param string     $TSQLMore   contain some additional sql instructions
      * @param string    $value      value to filter
-     * @param array     $TParam     array of configuration
+     * @param string     $TParam     array of configuration
      * @param string    $sKey       field name
      * @param string    $key        reference of sKey to find value into TParam
      * @return bool
@@ -222,7 +222,7 @@ class Listview
 
     /**
      * @param string    $sql    standard select sql
-     * @param array     $TParam array of configuration
+     * @param string     $TParam array of configuration
      * @return string
      */
     private function search($sql, &$TParam)
@@ -289,7 +289,7 @@ class Listview
 
     /**
      * @param string    $sql    standard select sql
-     * @param array     $TParam array of configuration
+     * @param string     $TParam array of configuration
      * @return string
      */
     public function render($sql, $TParam=array())
@@ -321,8 +321,8 @@ class Listview
 	}
 
     /**
-     * @param array     $THeader    the configuration of header
-     * @param array     $TParam     array of configuration
+     * @param string     $THeader    the configuration of header
+     * @param string     $TParam     array of configuration
      * @return array
      */
     private function setSearch(&$THeader, &$TParam)
@@ -427,8 +427,8 @@ class Listview
     /**
      * Function to analyse and calculate the total from a column
      *
-     * @param $TField
-     * @param $TParam
+     * @param string $TField    TField
+     * @param string $TParam    TParam
      * @return array
      */
     private function get_total(&$TField, &$TParam)
@@ -495,9 +495,9 @@ class Listview
     */
 	
     /**
-     * @param $TParam
-     * @param $TField
-     * @param $THeader
+     * @param string $TParam    TParam
+     * @param string $TField    TField
+     * @param string $THeader   THeader
      * @return array
      */
     private function setExport(&$TParam, $TField, $THeader)
@@ -535,8 +535,8 @@ class Listview
 	}
 
     /**
-     * @param $TField
-     * @param $TTotalGroup
+     * @param string $TField        TField
+     * @param string $TTotalGroup   TTotalGroup
      * @return array
      */
     private function addTotalGroup($TField, $TTotalGroup)
@@ -594,11 +594,11 @@ class Listview
 	}
 
     /**
-     * @param $THeader
-     * @param $TField
-     * @param $TTotal
-     * @param $TTotalGroup
-     * @param $TParam
+     * @param string $THeader   THeader
+     * @param string $TField    TField
+     * @param string $TTotal    TTotal
+     * @param string $TTotalGroup   TTotalGroup
+     * @param string $TParam        TParam
      * @return string
      */
     private function renderList(&$THeader, &$TField, &$TTotal, &$TTotalGroup, &$TParam)
@@ -723,9 +723,9 @@ class Listview
 	}
 
     /**
-     * @param $db
-     * @param $TField
-     * @param array $TParam
+     * @param string $db        Db
+     * @param string $TField    TField
+     * @param string $TParam    TParam
      */
     public function renderArray(&$db, $TField, $TParam=array())
     {
@@ -744,9 +744,9 @@ class Listview
 
 
     /**
-     * @param $THeader
-     * @param $TField
-     * @param $TParam
+     * @param string $THeader   THeader
+     * @param string $TField    TField
+     * @param string $TParam    TParam
      * @return bool
      */
     private function parse_array(&$THeader, &$TField, &$TParam)
@@ -853,8 +853,8 @@ class Listview
 	}
 
     /**
-     * @param $TParam
-     * @param $line_number
+     * @param string $TParam        TParam
+     * @param string $line_number   aaa
      * @return bool
      */
     private function in_view(&$TParam, $line_number)
@@ -874,9 +874,9 @@ class Listview
 	}
 
     /**
-     * @param $TField
-     * @param $TParam
-     * @param $currentLine
+     * @param string $TField        TField
+     * @param string $TParam        TParam
+     * @param string $currentLine   aaa
      */
     private function set_line(&$TField, &$TParam, $currentLine)
     {
@@ -910,7 +910,7 @@ class Listview
 
                     if(isset($TParam['eval'][$field]) && in_array($field,array_keys($row)))
                     {
-                        $strToEval = 'return '.strtr( $TParam['eval'][$field] ,  array_merge( $trans, array('@val@'=>$row[$field])  )).';';
+                        $strToEval = 'return '.strtr( $TParam['eval'][$field],  array_merge( $trans, array('@val@'=>$row[$field])  )).';';
                         $row[$field] = eval($strToEval);
                     }
 
@@ -932,7 +932,7 @@ class Listview
                         if($TParam['type'][$field]=='hour') { $row[$field] = date('H:i', strtotime($row[$field])); }
                         if($TParam['type'][$field]=='money') { $row[$field] = '<div align="right">'.price($row[$field],0,'',1,-1,2).'</div>'; }
                         if($TParam['type'][$field]=='number') { $row[$field] = '<div align="right">'.price($row[$field]).'</div>'; }
-                        if($TParam['type'][$field]=='integer') { $row[$field] = '<div align="right">'.(int)$row[$field].'</div>'; }
+                        if($TParam['type'][$field]=='integer') { $row[$field] = '<div align="right">'.((int) $row[$field]).'</div>'; }
                     }
 
                     if(isset($TParam['link'][$field]))
@@ -945,7 +945,7 @@ class Listview
                     {
                         if(isset($TParam['translate'][$field][''])) unset($TParam['translate'][$field]['']);
 
-                        $row[$field] = strtr( $row[$field] , $TParam['translate'][$field]);
+                        $row[$field] = strtr( $row[$field], $TParam['translate'][$field]);
                     }
                 }
             }
@@ -986,8 +986,8 @@ class Listview
 	}
 
     /**
-     * @param $sql
-     * @param $TParam
+     * @param string $sql       sql
+     * @param string $TParam    TParam
      * @return string
      */
     private function limitSQL($sql, &$TParam)
@@ -1001,10 +1001,10 @@ class Listview
 	}
 
     /**
-     * @param $THeader
-     * @param $TField
-     * @param $TParam
-     * @param $sql
+     * @param string $THeader   THeader
+     * @param string $TField    TField
+     * @param string $TParam    TParam
+     * @param string $sql       sql
      */
     private function parse_sql(&$THeader, &$TField, &$TParam, $sql)
     {

From e11254a9bf8cc5f23974db3b91b1065ca2610a65 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Sun, 30 Apr 2017 15:04:51 +0200
Subject: [PATCH 147/505] Add option on accounting account getNomUrl

---
 .../class/accountingaccount.class.php         | 55 ++++++++++++++-----
 htdocs/langs/en_US/accountancy.lang           |  1 +
 2 files changed, 42 insertions(+), 14 deletions(-)

diff --git a/htdocs/accountancy/class/accountingaccount.class.php b/htdocs/accountancy/class/accountingaccount.class.php
index 4174ee7809f..dfb29be6323 100644
--- a/htdocs/accountancy/class/accountingaccount.class.php
+++ b/htdocs/accountancy/class/accountingaccount.class.php
@@ -364,28 +364,55 @@ class AccountingAccount extends CommonObject
 	/**
 	 * Return clicable name (with picto eventually)
 	 *
-	 * @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto
-	 * @return string Chaine avec URL
+	 * @param	int		$withpicto		0=No picto, 1=Include picto into link, 2=Only picto
+	 * @param	int		$withlabel		0=No label, 1=Include label of account
+	 * @param	string  $moretitle		Add more text to title tooltip
+	 * @param	int  	$notooltip		1=Disable tooltip
+	 * @return	string	String with URL
 	 */
-	function getNomUrl($withpicto = 0) {
-		global $langs;
+	function getNomUrl($withpicto = 0, $withlabel = 0, $moretitle='',$notooltip=0)
+	{
+		global $langs, $conf, $user;
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
+		
+		if (! empty($conf->dol_no_mouse_hover)) $notooltip=1;   // Force disable tooltips
 
 		$result = '';
 
-		$link = '<a href="' . DOL_URL_ROOT . '/accountancy/admin/card.php?id=' . $this->id . '">';
-		$linkend = '</a>';
+		$url = DOL_URL_ROOT . '/accountancy/admin/card.php?id=' . $this->id;
 
 		$picto = 'billr';
+		$label='';
 
-		$label = $langs->trans("Show") . ': ' . $this->account_number . ' - ' . $this->label;
+		$label = '<u>' . $langs->trans("ShowAccountingAccount") . '</u>';
+		if (! empty($this->account_number))
+			$label .= '<br><b>'.$langs->trans('AccountAccounting') . ':</b> ' . length_accountg($this->account_number);
+		if (! empty($this->label))
+			$label .= '<br><b>'.$langs->trans('Label') . ':</b> ' . $this->label;
+		if ($moretitle) $label.=' - '.$moretitle;
 
-		if ($withpicto)
-			$result .= ($link . img_object($label, $picto) . $linkend);
-		if ($withpicto && $withpicto != 2)
-			$result .= ' ';
-		if ($withpicto != 2)
-			require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
-			$result .= $link . length_accountg($this->account_number) . ' - ' . $this->label . $linkend;
+		$linkclose='';
+		if (empty($notooltip))
+		{
+		    if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+		    {
+		        $label=$langs->trans("ShowAccoutingAccount");
+		        $linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
+		    }
+		    $linkclose.= ' title="'.dol_escape_htmltag($label, 1).'"';
+		    $linkclose.=' class="classfortooltip"';
+		}
+
+        $linkstart='<a href="'.$url.'"';
+        $linkstart.=$linkclose.'>';
+		$linkend='</a>';
+
+		$label_link = length_accountg($this->account_number);
+		if ($withlabel) $label_link .= ' - ' . $this->label;
+
+		if ($withpicto) $result.=($linkstart.img_object(($notooltip?'':$label), $picto, ($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).$linkend);
+		if ($withpicto && $withpicto != 2) $result .= ' ';
+		if ($withpicto != 2) $result.=$linkstart . $label_link . $linkend;
 		return $result;
 	}
 	
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index bd1e41c5464..f9162c5ca21 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -59,6 +59,7 @@ ChangeAndLoad=Change and load
 Addanaccount=Add an accounting account
 AccountAccounting=Accounting account
 AccountAccountingShort=Account
+ShowAccoutingAccount=Show accounting account
 AccountAccountingSuggest=Accounting account suggested
 MenuDefaultAccounts=Default accounts
 MenuVatAccounts=Vat accounts

From 1dd462d94783bc972ba8fc08daf80db5b49dc5dd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 30 Apr 2017 23:39:35 +0200
Subject: [PATCH 148/505] Fix disable notification on smartphone

---
 htdocs/main.inc.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 6a92e0f4eed..ab92df9ca12 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1271,9 +1271,10 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
             {
                 $enablebrowsernotif=false;
                 if (! empty($conf->agenda->enabled) && ! empty($conf->global->AGENDA_NOTIFICATION)) $enablebrowsernotif=true;
+                if ($conf->browser->layout == 'phone') $enablebrowsernotif=false;
                 if ($enablebrowsernotif)
                 {
-                    print '<!-- Includes JS of Dolibarr -->'."\n";
+                    print '<!-- Includes JS of Dolibarr (brwoser layout = '.$conf->browser->layout.')-->'."\n";
                     print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/lib_notification.js.php?version='.urlencode(DOL_VERSION).($ext?'&amp;'.$ext:'').'"></script>'."\n";
                 }
             }

From 6afd0d642a7bc6a70278f93b35273364609e64a3 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Mon, 1 May 2017 08:16:09 +0200
Subject: [PATCH 149/505] Finish to move accountancy journals list to page like
 dictionnary

---
 htdocs/accountancy/admin/journals_card.php    | 296 -------
 htdocs/accountancy/admin/journals_list.php    | 808 +++++++++++++++---
 .../class/accountingjournal.class.php         | 260 ------
 htdocs/core/menus/init_menu_auguria.sql       |  17 +-
 htdocs/core/menus/standard/eldy.lib.php       |   2 +-
 htdocs/install/mysql/data/llx_accounting.sql  |   8 +-
 .../mysql/tables/llx_accounting_journal.sql   |   2 +-
 htdocs/langs/en_US/accountancy.lang           |  10 +-
 htdocs/langs/en_US/admin.lang                 |   1 +
 9 files changed, 720 insertions(+), 684 deletions(-)
 delete mode 100644 htdocs/accountancy/admin/journals_card.php

diff --git a/htdocs/accountancy/admin/journals_card.php b/htdocs/accountancy/admin/journals_card.php
deleted file mode 100644
index aae3f8b2cb1..00000000000
--- a/htdocs/accountancy/admin/journals_card.php
+++ /dev/null
@@ -1,296 +0,0 @@
-<?php
-/* Copyright (C) 2017		Alexandre Spangaro	<aspangaro@zendsi.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/accountancy/admin/journals_card.php
- * \ingroup     Advanced accountancy
- * \brief       Page to show an accounting journal
- */
-require '../../main.inc.php';
-
-require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php';
-
-$langs->load("admin");
-$langs->load("compta");
-$langs->load("accountancy");
-
-// Security check
-if ($user->societe_id > 0)
-	accessforbidden();
-if (empty($user->rights->accounting->fiscalyear))
-	accessforbidden();
-
-$error = 0;
-
-$action = GETPOST('action', 'alpha');
-$confirm = GETPOST('confirm', 'alpha');
-$id = GETPOST('id', 'int');
-
-// List of status
-static $tmptype2label = array (
-		'0' => 'AccountingJournalTypeVariousOperation',
-		'1' => 'AccountingJournalTypeSale',
-		'2' => 'AccountingJournalTypePurchase',
-		'3' => 'AccountingJournalTypeBank',
-		'9' => 'AccountingJournalTypeHasNew'
-);
-$type2label = array (
-		'' 
-);
-foreach ( $tmptype2label as $key => $val )
-	$type2label[$key] = $langs->trans($val);
-
-$object = new AccountingJournal($db);
-
-/*
- * Actions
- */
-
-if ($action == 'confirm_delete' && $confirm == "yes") {
-	$result = $object->delete($id);
-	if ($result >= 0) {
-		header("Location: journals_list.php");
-		exit();
-	} else {
-		setEventMessages($object->error, $object->errors, 'errors');
-	}
-} 
-
-else if ($action == 'add') {
-	if (! GETPOST('cancel', 'alpha')) {
-		$error = 0;
-
-		$object->code = GETPOST('code', 'alpha');
-		$object->label = GETPOST('label', 'alpha');
-		$object->nature = GETPOST('nature', 'int');
-
-		if (empty($object->code)) {
-			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Code")), null, 'errors');
-			$error ++;
-		}
-		if (empty($object->label)) {
-			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Label")), null, 'errors');
-			$error ++;
-		}
-
-		if (! $error) {
-			$db->begin();
-
-			$id = $object->create($user);
-
-			if ($id > 0) {
-				$db->commit();
-
-				header("Location: " . $_SERVER["PHP_SELF"] . "?id=" . $id);
-				exit();
-			} else {
-				$db->rollback();
-
-				setEventMessages($object->error, $object->errors, 'errors');
-				$action = 'create';
-			}
-		} else {
-			$action = 'create';
-		}
-	} else {
-		header("Location: journals_list.php");
-		exit();
-	}
-} 
-
-// Update record
-else if ($action == 'update') {
-	if (! GETPOST('cancel', 'alpha')) {
-		$result = $object->fetch($id);
-
-		$object->code = GETPOST('code', 'alpha');
-		$object->label = GETPOST('label', 'alpha');
-		$object->nature = GETPOST('nature', 'int');
-
-		if (empty($object->code)) {
-			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Code")), null, 'errors');
-			$error ++;
-		}
-		if (empty($object->label)) {
-			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Label")), null, 'errors');
-			$error ++;
-		}
-
-		$result = $object->update($user);
-		
-		if ($result > 0) {
-			header("Location: " . $_SERVER["PHP_SELF"] . "?id=" . $id);
-			exit();
-		} else {
-			setEventMessages($object->error, $object->errors, 'errors');
-		}
-	} else {
-		header("Location: " . $_SERVER["PHP_SELF"] . "?id=" . $id);
-		exit();
-	}
-}
-
-
-
-/*
- * View
- */
-
-$title = $langs->trans("Journal") . " - " . $langs->trans("Card");
-$helpurl = "";
-llxHeader("",$title,$helpurl);
-
-$form = new Form($db);
-
-if ($action == 'create') 
-{
-	print load_fiche_titre($langs->trans("NewAccountingJournal"));
-
-	print '<form action="' . $_SERVER["PHP_SELF"] . '" method="POST">';
-	print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
-	print '<input type="hidden" name="action" value="add">';
-
-	dol_fiche_head();
-
-	print '<table class="border" width="100%">';
-
-	// Code
-	print '<tr><td class="titlefieldcreate fieldrequired">' . $langs->trans("Code") . '</td><td><input name="code" size="10" value="' . GETPOST("code") . '"></td></tr>';
-
-
-	// Label
-	print '<tr><td class="fieldrequired">' . $langs->trans("Label") . '</td><td><input name="label" size="32" value="' . GETPOST("label") . '"></td></tr>';
-
-	// Nature
-	print '<tr>';
-	print '<td class="fieldrequired">' . $langs->trans("Type") . '</td>';
-	print '<td class="valeur">';
-	print $form->selectarray('nature', $type2label, GETPOST('nature'));
-	print '</td></tr>';
-	
-	print '</table>';
-
-	dol_fiche_end();
-
-	print '<div class="center">';
-	print '<input class="button" type="submit" value="' . $langs->trans("Save") . '">';
-	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input class="button" type="submit" name="cancel" value="' . $langs->trans("Cancel") . '">';
-	print '</div>';
-
-	print '</form>';
-} else if ($id) {
-	$result = $object->fetch($id);
-	if ($result > 0) {
-		$head = accounting_journal_prepare_head($object);
-
-		if ($action == 'edit') {
-			dol_fiche_head($head, 'card', $langs->trans("AccountingJournal"), 0, 'cron');
-
-			print '<form name="update" action="' . $_SERVER["PHP_SELF"] . '" method="POST">' . "\n";
-			print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
-			print '<input type="hidden" name="action" value="update">';
-			print '<input type="hidden" name="id" value="' . $id . '">';
-
-			print '<table class="border" width="100%">';
-
-			// Code
-			print "<tr>";
-			print '<td class="titlefieldcreate fieldrequired">' . $langs->trans("Code") . '</td><td>';
-			print '<input name="code" class="flat" size="8" value="' . $object->code . '">';
-			print '</td></tr>';
-
-			// Label
-			print '<tr><td class="fieldrequired">' . $langs->trans("Label") . '</td><td>';
-			print '<input name="label" class="flat" size="32" value="' . $object->label . '">';
-			print '</td></tr>';
-
-			// Nature
-			print '<tr><td>' . $langs->trans("Type") . '</td><td>';
-			print $form->selectarray('nature', $type2label, $object->nature);
-			print '</td></tr>';
-
-			print '</table>';
-
-			dol_fiche_end();
-
-			print '<div class="center">';
-			print '<input type="submit" class="button" value="' . $langs->trans("Save") . '">';
-			print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-			print '<input type="submit" name="cancel" class="button" value="' . $langs->trans("Cancel") . '">';
-			print '</div>';
-
-			print '</form>';
-
-			dol_fiche_end();
-		} else {
-			/*
-			 * Confirm delete
-			 */
-			if ($action == 'delete') {
-				print $form->formconfirm($_SERVER["PHP_SELF"] . "?id=" . $id, $langs->trans("DeleteFiscalYear"), $langs->trans("ConfirmDeleteFiscalYear"), "confirm_delete");
-			}
-
-			dol_fiche_head($head, 'card', $langs->trans("AccountingJournal"), 0, 'cron');
-
-			print '<table class="border" width="100%">';
-
-			$linkback = '<a href="' . DOL_URL_ROOT . '/accountancy/admin/journals_list.php">' . $langs->trans("BackToList") . '</a>';
-
-			// Ref
-			print '<tr><td class="titlefield">' . $langs->trans("Code") . '</td><td width="50%">';
-			print $object->code;
-			print '</td><td>';
-			print $linkback;
-			print '</td></tr>';
-
-			// Label
-			print '<tr><td class="tdtop">';
-			print $form->editfieldkey("Label", 'label', $object->label, $object, $conf->global->MAIN_EDIT_ALSO_INLINE, 'alpha:32');
-			print '</td><td colspan="2">';
-			print $form->editfieldval("Label", 'label', $object->label, $object, $conf->global->MAIN_EDIT_ALSO_INLINE, 'alpha:32');
-			print "</td></tr>";
-
-			// Nature
-			print '<tr><td>' . $langs->trans("Type") . '</td><td colspan="2">' . $object->getLibType(0) . '</td></tr>';
-
-			print "</table>";
-
-			dol_fiche_end();
-
-			if (! empty($user->rights->accounting->chartofaccount))
-			{
-    			/*
-    			 * Barre d'actions
-    			 */
-    			print '<div class="tabsAction">';
-
-    			print '<a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?action=edit&id=' . $id . '">' . $langs->trans('Modify') . '</a>';
-
-    			print '<a class="butActionDelete" href="' . $_SERVER["PHP_SELF"] . '?action=delete&id=' . $id . '">' . $langs->trans('Delete') . '</a>';
-
-    			print '</div>';
-			}
-		}
-	} else {
-		dol_print_error($db);
-	}
-}
-
-llxFooter();
-$db->close();
diff --git a/htdocs/accountancy/admin/journals_list.php b/htdocs/accountancy/admin/journals_list.php
index f7ba79457a8..be532c7c25f 100644
--- a/htdocs/accountancy/admin/journals_list.php
+++ b/htdocs/accountancy/admin/journals_list.php
@@ -22,147 +22,737 @@
  * \brief		Setup page to configure journals
  */
 require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/admin.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php';
-
-$action = GETPOST('action');
-
-// Load variable for pagination
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
-$sortfield = GETPOST('sortfield','alpha');
-$sortorder = GETPOST('sortorder','alpha');
-$page = GETPOST('page','int');
-if ($page == -1) { $page = 0; }
-$offset = $limit * $page;
-$pageprev = $page - 1;
-$pagenext = $page + 1;
-if (! $sortfield) $sortfield="j.rowid"; // Set here default search field
-if (! $sortorder) $sortorder="ASC";
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
 
 $langs->load("admin");
 $langs->load("compta");
 $langs->load("accountancy");
 
-// Security check
-if ($user->societe_id > 0)
+$action=GETPOST('action','alpha')?GETPOST('action','alpha'):'view';
+$confirm=GETPOST('confirm','alpha');
+$id=GETPOST('id','int');
+$rowid=GETPOST('rowid','alpha');
+
+// Security access
+if (! empty($user->rights->accountancy->chartofaccount))
+{
 	accessforbidden();
-if (! $user->rights->accounting->fiscalyear)              // If we can read accounting records, we shoul be able to see fiscal year.
-    accessforbidden();
-	
+}
+
+$acts[0] = "activate";
+$acts[1] = "disable";
+$actl[0] = img_picto($langs->trans("Disabled"),'switch_off');
+$actl[1] = img_picto($langs->trans("Activated"),'switch_on');
+
+$listoffset=GETPOST('listoffset');
+$listlimit=GETPOST('listlimit')>0?GETPOST('listlimit'):1000;
+$active = 1;
+
+$sortfield = GETPOST("sortfield",'alpha');
+$sortorder = GETPOST("sortorder",'alpha');
+$page = GETPOST("page",'int');
+if ($page == -1) { $page = 0 ; }
+$offset = $listlimit * $page ;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+
 $error = 0;
 
-// List of status
-/*
-static $tmptype2label = array (
-		'0' => 'AccountingJournalTypeVariousOperation',
-		'1' => 'AccountingJournalTypeSale',
-		'2' => 'AccountingJournalTypePurchase',
-		'3' => 'AccountingJournalTypeBank',
-		'9' => 'AccountingJournalTypeHasNew'
-);
-$type2label = array (
-		'' 
-);
-foreach ( $tmptype2label as $key => $val )
-	$type2label[$key] = $langs->trans($val);
-*/
+// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+$hookmanager->initHooks(array('admin'));
 
-$errors = array ();
+// This page is a generic page to edit dictionaries
+// Put here declaration of dictionaries properties
 
-$object = new AccountingJournal($db);
+// Sort order to show dictionary (0 is space). All other dictionaries (added by modules) will be at end of this.
+$taborder=array(35);
 
+// Name of SQL tables of dictionaries
+$tabname=array();
+$tabname[35]= MAIN_DB_PREFIX."accounting_journal";
+
+// Dictionary labels
+$tablib=array();
+$tablib[35]= "DictionaryAccountancyJournal";
+
+// Requests to extract data
+$tabsql=array();
+$tabsql[35]= "SELECT a.rowid as rowid, a.code as code, a.label, a.nature, a.active FROM ".MAIN_DB_PREFIX."accounting_journal as a";
+
+// Criteria to sort dictionaries
+$tabsqlsort=array();
+$tabsqlsort[35]="code ASC";
+
+// Nom des champs en resultat de select pour affichage du dictionnaire
+$tabfield=array();
+$tabfield[35]= "code,label,nature";
+
+// Nom des champs d'edition pour modification d'un enregistrement
+$tabfieldvalue=array();
+$tabfieldvalue[35]= "code,label,nature";
+
+// Nom des champs dans la table pour insertion d'un enregistrement
+$tabfieldinsert=array();
+$tabfieldinsert[35]= "code,label,nature";
+
+// Nom du rowid si le champ n'est pas de type autoincrement
+// Example: "" if id field is "rowid" and has autoincrement on
+//          "nameoffield" if id field is not "rowid" or has not autoincrement on
+$tabrowid=array();
+$tabrowid[35]= "";
+
+// Condition to show dictionary in setup page
+$tabcond=array();
+$tabcond[35]= ! empty($conf->accounting->enabled);
+
+// List of help for fields
+$tabhelp=array();
+$tabhelp[35] = array('code'=>$langs->trans("EnterAnyCode"));
+
+// List of check for fields (NOT USED YET)
+$tabfieldcheck=array();
+$tabfieldcheck[35] = array();
+
+// Complete all arrays with entries found into modules
+complete_dictionary_with_modules($taborder,$tabname,$tablib,$tabsql,$tabsqlsort,$tabfield,$tabfieldvalue,$tabfieldinsert,$tabrowid,$tabcond,$tabhelp,$tabfieldcheck);
+
+
+// Define elementList and sourceList (used for dictionary type of contacts "llx_c_type_contact")
+$elementList = array();
+	$sourceList = array(
+			'1' => $langs->trans('AccountingJournalType0'),
+			'2' => $langs->trans('AccountingJournalType1'),
+			'3' => $langs->trans('AccountingJournalType2'),
+			'4' => $langs->trans('AccountingJournalType3'),
+			'9' => $langs->trans('AccountingJournalType9')
+	);
 
 /*
  * Actions
  */
 
+if (GETPOST('button_removefilter') || GETPOST('button_removefilter.x') || GETPOST('button_removefilter_x'))
+{
+    $search_country_id = '';    
+}
 
+// Actions add or modify an entry into a dictionary
+if (GETPOST('actionadd') || GETPOST('actionmodify'))
+{
+    $listfield=explode(',', str_replace(' ', '',$tabfield[$id]));
+    $listfieldinsert=explode(',',$tabfieldinsert[$id]);
+    $listfieldmodify=explode(',',$tabfieldinsert[$id]);
+    $listfieldvalue=explode(',',$tabfieldvalue[$id]);
+
+    // Check that all fields are filled
+    $ok=1;
+    foreach ($listfield as $f => $value)
+    {
+		if ($fieldnamekey == 'libelle' || ($fieldnamekey == 'label'))  $fieldnamekey='Label';
+        if ($fieldnamekey == 'code') $fieldnamekey = 'Code';
+		if ($fieldnamekey == 'nature') $fieldnamekey = 'Nature';
+    }
+    // Other checks
+    if (isset($_POST["code"]))
+    {
+    	if ($_POST["code"]=='0')
+    	{
+        	$ok=0;
+    		setEventMessages($langs->transnoentities('ErrorCodeCantContainZero'), null, 'errors');
+        }
+        /*if (!is_numeric($_POST['code']))	// disabled, code may not be in numeric base
+    	{
+	    	$ok = 0;
+	    	$msg .= $langs->transnoentities('ErrorFieldFormat', $langs->transnoentities('Code')).'<br />';
+	    }*/
+    }
+
+	// Clean some parameters
+    if ($_POST["accountancy_code"] <= 0) $_POST["accountancy_code"]='';	// If empty, we force to null
+	if ($_POST["accountancy_code_sell"] <= 0) $_POST["accountancy_code_sell"]='';	// If empty, we force to null
+	if ($_POST["accountancy_code_buy"] <= 0) $_POST["accountancy_code_buy"]='';	// If empty, we force to null
+
+    // Si verif ok et action add, on ajoute la ligne
+    if ($ok && GETPOST('actionadd'))
+    {
+        if ($tabrowid[$id])
+        {
+            // Recupere id libre pour insertion
+            $newid=0;
+            $sql = "SELECT max(".$tabrowid[$id].") newid from ".$tabname[$id];
+            $result = $db->query($sql);
+            if ($result)
+            {
+                $obj = $db->fetch_object($result);
+                $newid=($obj->newid + 1);
+
+            } else {
+                dol_print_error($db);
+            }
+        }
+
+        // Add new entry
+        $sql = "INSERT INTO ".$tabname[$id]." (";
+        // List of fields
+        if ($tabrowid[$id] && ! in_array($tabrowid[$id],$listfieldinsert))
+        	$sql.= $tabrowid[$id].",";
+        $sql.= $tabfieldinsert[$id];
+        $sql.=",active)";
+        $sql.= " VALUES(";
+
+        // List of values
+        if ($tabrowid[$id] && ! in_array($tabrowid[$id],$listfieldinsert))
+        	$sql.= $newid.",";
+        $i=0;
+        foreach ($listfieldinsert as $f => $value)
+        {
+            if ($value == 'price' || preg_match('/^amount/i',$value) || $value == 'taux') {
+            	$_POST[$listfieldvalue[$i]] = price2num($_POST[$listfieldvalue[$i]],'MU');
+            }
+            else if ($value == 'entity') {
+            	$_POST[$listfieldvalue[$i]] = $conf->entity;
+            }
+            if ($i) $sql.=",";
+            if ($_POST[$listfieldvalue[$i]] == '' && ! ($listfieldvalue[$i] == 'code' && $id == 10)) $sql.="null";  // For vat, we want/accept code = ''
+            else $sql.="'".$db->escape($_POST[$listfieldvalue[$i]])."'";
+            $i++;
+        }
+        $sql.=",1)";
+
+        dol_syslog("actionadd", LOG_DEBUG);
+        $result = $db->query($sql);
+        if ($result)	// Add is ok
+        {
+            setEventMessages($langs->transnoentities("RecordSaved"), null, 'mesgs');
+        	$_POST=array('id'=>$id);	// Clean $_POST array, we keep only
+        }
+        else
+        {
+            if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
+                setEventMessages($langs->transnoentities("ErrorRecordAlreadyExists"), null, 'errors');
+            }
+            else {
+                dol_print_error($db);
+            }
+        }
+    }
+
+    // Si verif ok et action modify, on modifie la ligne
+    if ($ok && GETPOST('actionmodify'))
+    {
+        if ($tabrowid[$id]) { $rowidcol=$tabrowid[$id]; }
+        else { $rowidcol="rowid"; }
+
+        // Modify entry
+        $sql = "UPDATE ".$tabname[$id]." SET ";
+        // Modifie valeur des champs
+        if ($tabrowid[$id] && ! in_array($tabrowid[$id],$listfieldmodify))
+        {
+            $sql.= $tabrowid[$id]."=";
+            $sql.= "'".$db->escape($rowid)."', ";
+        }
+        $i = 0;
+        foreach ($listfieldmodify as $field)
+        {
+            if ($field == 'price' || preg_match('/^amount/i',$field) || $field == 'taux') {
+            	$_POST[$listfieldvalue[$i]] = price2num($_POST[$listfieldvalue[$i]],'MU');
+            }
+            else if ($field == 'entity') {
+            	$_POST[$listfieldvalue[$i]] = $conf->entity;
+            }
+            if ($i) $sql.=",";
+            $sql.= $field."=";
+            if ($_POST[$listfieldvalue[$i]] == '' && ! ($listfieldvalue[$i] == 'code' && $id == 10)) $sql.="null";  // For vat, we want/accept code = ''
+            else $sql.="'".$db->escape($_POST[$listfieldvalue[$i]])."'";
+            $i++;
+        }
+        $sql.= " WHERE ".$rowidcol." = '".$rowid."'";
+
+        dol_syslog("actionmodify", LOG_DEBUG);
+        //print $sql;
+        $resql = $db->query($sql);
+        if (! $resql)
+        {
+            setEventMessages($db->error(), null, 'errors');
+        }
+    }
+    //$_GET["id"]=GETPOST('id', 'int');       // Force affichage dictionnaire en cours d'edition
+}
+
+if (GETPOST('actioncancel'))
+{
+    //$_GET["id"]=GETPOST('id', 'int');       // Force affichage dictionnaire en cours d'edition
+}
+
+if ($action == 'confirm_delete' && $confirm == 'yes')       // delete
+{
+    if ($tabrowid[$id]) { $rowidcol=$tabrowid[$id]; }
+    else { $rowidcol="rowid"; }
+
+    $sql = "DELETE from ".$tabname[$id]." WHERE ".$rowidcol."='".$rowid."'";
+
+    dol_syslog("delete", LOG_DEBUG);
+    $result = $db->query($sql);
+    if (! $result)
+    {
+        if ($db->errno() == 'DB_ERROR_CHILD_EXISTS')
+        {
+            setEventMessages($langs->transnoentities("ErrorRecordIsUsedByChild"), null, 'errors');
+        }
+        else
+        {
+            dol_print_error($db);
+        }
+    }
+}
+
+// activate
+if ($action == $acts[0])
+{
+    if ($tabrowid[$id]) { $rowidcol=$tabrowid[$id]; }
+    else { $rowidcol="rowid"; }
+
+    if ($rowid) {
+        $sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE ".$rowidcol."='".$rowid."'";
+    }
+    elseif ($_GET["code"]) {
+        $sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE code='".$_GET["code"]."'";
+    }
+
+    $result = $db->query($sql);
+    if (!$result)
+    {
+        dol_print_error($db);
+    }
+}
+
+// disable
+if ($action == $acts[1])
+{
+    if ($tabrowid[$id]) { $rowidcol=$tabrowid[$id]; }
+    else { $rowidcol="rowid"; }
+
+    if ($rowid) {
+        $sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE ".$rowidcol."='".$rowid."'";
+    }
+    elseif ($_GET["code"]) {
+        $sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE code='".$_GET["code"]."'";
+    }
+
+    $result = $db->query($sql);
+    if (!$result)
+    {
+        dol_print_error($db);
+    }
+}
 
 /*
  * View
  */
-$title = $langs->trans('AccountingJournals');
-$helpurl = "";
-llxHeader('', $title, $helpurl);
 
-$max = 100;
 $form = new Form($db);
+$formadmin=new FormAdmin($db);
 
-$linkback = '<a href="' . DOL_URL_ROOT . '/admin/modules.php">' . $langs->trans("BackToModuleList") . '</a>';
-print load_fiche_titre($langs->trans('ConfigAccountingExpert'), $linkback, 'title_setup');
+llxHeader();
 
-$head = admin_accounting_prepare_head(null);
-
-dol_fiche_head($head, 'journal', $langs->trans("Configuration"), -1, 'cron');
-
-$sql = "SELECT j.rowid, j.code, j.label, j.nature, j.active";
-$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_journal as j";
-// $sql .= " WHERE j.entity = " . $conf->entity;
-$sql.=$db->order($sortfield,$sortorder);
-
-// Count total nb of records
-$nbtotalofrecords = '';
-if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
+$titre=$langs->trans("DictionarySetup");
+$linkback='';
+if ($id)
 {
-	$result = $db->query($sql);
-	$nbtotalofrecords = $db->num_rows($result);
+    $titre.=' - '.$langs->trans($tablib[$id]);
+    $titlepicto='title_accountancy';
 }
 
-$sql.= $db->plimit($limit+1, $offset);
+print load_fiche_titre($titre,$linkback,$titlepicto);
 
-$result = $db->query($sql);
-if ($result) {
-	$num = $db->num_rows($result);
-
-	$i = 0;
-
-	// $title = $langs->trans('AccountingJournals');
-	// print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $params, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_accountancy', 0, '', '', $limit, 1);
-
-	// Load attribute_label
-	print '<table class="noborder" width="100%">';
-	print '<tr class="liste_titre">';
-	// print '<td>' . $langs->trans("Ref") . '</td>';
-	print '<td>' . $langs->trans("Code") . '</td>';
-	print '<td>' . $langs->trans("Label") . '</td>';
-	print '<td>' . $langs->trans("Nature") . '</td>';
-	print '</tr>';
-
-	if ($num) {
-		$accountingjournalstatic = new AccountingJournal($db);
-
-		while ( $i < $num && $i < $max ) {
-			$obj = $db->fetch_object($result);
-			$accountingjournalstatic->id = $obj->rowid;
-			print '<tr class="oddeven">';
-			print '<td><a href="journals_card.php?id=' . $obj->rowid . '">' . img_object($langs->trans("ShowJournal"), "technic") . ' ' . $obj->code . '</a></td>';
-			print '<td align="left">' . $obj->label . '</td>';
-			print '<td>' . $accountingjournalstatic->LibType($obj->nature, 0) . '</td>';
-			print '</tr>';
-			$i ++;
-		}
-	} else {
-		print '<tr class="oddeven"><td colspan="3" class="opacitymedium">' . $langs->trans("None") . '</td></tr>';
-	}
-	print '</table>';
-} else {
-	dol_print_error($db);
-}
-
-dol_fiche_end();
-
-// Buttons
-print '<div class="tabsAction">';
-if (! empty($user->rights->accounting->chartofaccount))
+if (empty($id))
 {
-    print '<a class="butAction" href="journals_card.php?action=create">' . $langs->trans("NewAccountingJournal") . '</a>';
+    print $langs->trans("DictionaryDesc");
+    print " ".$langs->trans("OnlyActiveElementsAreShown")."<br>\n";
 }
-else
+print "<br>\n";
+
+
+// Confirmation de la suppression de la ligne
+if ($action == 'delete')
 {
-    print '<a class="butActionRefused" href="#">' . $langs->trans("NewAccountingJournal") . '</a>';
+    print $form->formconfirm($_SERVER["PHP_SELF"].'?'.($page?'page='.$page.'&':'').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.$rowid.'&code='.$_GET["code"].'&id='.$id, $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_delete','',0,1);
 }
-print '</div>';
+//var_dump($elementList);
+
+/*
+ * Show a dictionary
+ */
+if ($id)
+{
+    // Complete requete recherche valeurs avec critere de tri
+    $sql=$tabsql[$id];
+
+    if ($search_country_id > 0)
+    {
+        if (preg_match('/ WHERE /',$sql)) $sql.= " AND ";
+        else $sql.=" WHERE ";
+        $sql.= " c.rowid = ".$search_country_id;
+    }
+    
+    if ($sortfield)
+    {
+        // If sort order is "country", we use country_code instead
+    	if ($sortfield == 'country') $sortfield='country_code';
+        $sql.= " ORDER BY ".$sortfield;
+        if ($sortorder)
+        {
+            $sql.=" ".strtoupper($sortorder);
+        }
+        $sql.=", ";
+        // Clear the required sort criteria for the tabsqlsort to be able to force it with selected value
+        $tabsqlsort[$id]=preg_replace('/([a-z]+\.)?'.$sortfield.' '.$sortorder.',/i','',$tabsqlsort[$id]);
+        $tabsqlsort[$id]=preg_replace('/([a-z]+\.)?'.$sortfield.',/i','',$tabsqlsort[$id]);
+    }
+    else {
+        $sql.=" ORDER BY ";
+    }
+    $sql.=$tabsqlsort[$id];
+    $sql.=$db->plimit($listlimit+1,$offset);
+    //print $sql;
+
+    $fieldlist=explode(',',$tabfield[$id]);
+
+    print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'" method="POST">';
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    print '<input type="hidden" name="from" value="'.dol_escape_htmltag(GETPOST('from','alpha')).'">';
+    
+    print '<table class="noborder" width="100%">';
+
+    // Form to add a new line
+    if ($tabname[$id])
+    {
+        $alabelisused=0;
+        $var=false;
+
+        $fieldlist=explode(',',$tabfield[$id]);
+
+        // Line for title
+        print '<tr class="liste_titre">';
+        foreach ($fieldlist as $field => $value)
+        {
+            // Determine le nom du champ par rapport aux noms possibles
+            // dans les dictionnaires de donnees
+            $valuetoshow=ucfirst($fieldlist[$field]);   // Par defaut
+            $valuetoshow=$langs->trans($valuetoshow);   // try to translate
+            $align="left";
+            if ($fieldlist[$field]=='code')            { $valuetoshow=$langs->trans("Code"); }
+            if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label')
+            {
+            	$valuetoshow=$langs->trans("Label");
+            }
+            if ($fieldlist[$field]=='nature')          { $valuetoshow=$langs->trans("Nature"); }
+				
+            if ($valuetoshow != '')
+            {
+                print '<td align="'.$align.'">';
+            	if (! empty($tabhelp[$id][$value]) && preg_match('/^http(s*):/i',$tabhelp[$id][$value])) print '<a href="'.$tabhelp[$id][$value].'" target="_blank">'.$valuetoshow.' '.img_help(1,$valuetoshow).'</a>';
+            	else if (! empty($tabhelp[$id][$value])) print $form->textwithpicto($valuetoshow,$tabhelp[$id][$value]);
+            	else print $valuetoshow;
+                print '</td>';
+             }
+             if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label') $alabelisused=1;
+        }
+
+        if ($id == 4) print '<td></td>';
+        print '<td>';
+        print '<input type="hidden" name="id" value="'.$id.'">';
+        print '</td>';
+        print '<td style="min-width: 26px;"></td>';
+        print '<td style="min-width: 26px;"></td>';
+        print '<td style="min-width: 26px;"></td>';
+        print '</tr>';
+
+        // Line to enter new values
+        print "<tr ".$bcnd[$var].">";
+
+        $obj = new stdClass();
+        // If data was already input, we define them in obj to populate input fields.
+        if (GETPOST('actionadd'))
+        {
+            foreach ($fieldlist as $key=>$val)
+            {
+                if (GETPOST($val) != '')
+                	$obj->$val=GETPOST($val);
+            }
+        }
+
+        $tmpaction = 'create';
+        $parameters=array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
+        $reshook=$hookmanager->executeHooks('createDictionaryFieldlist',$parameters, $obj, $tmpaction);    // Note that $action and $object may have been modified by some hooks
+        $error=$hookmanager->error; $errors=$hookmanager->errors;
+
+        if (empty($reshook))
+        {
+       		fieldList($fieldlist,$obj,$tabname[$id],'add');
+        }
+
+        print '<td colspan="4" align="right">';
+       	print '<input type="submit" class="button" name="actionadd" value="'.$langs->trans("Add").'">';
+        print '</td>';
+        print "</tr>";
+
+        $colspan=count($fieldlist)+3;
+
+        if (! empty($alabelisused))  // If there is one label among fields, we show legend of *
+        {
+        	print '<tr><td colspan="'.$colspan.'">* '.$langs->trans("LabelUsedByDefault").'.</td></tr>';
+        }
+        print '<tr><td colspan="'.$colspan.'">&nbsp;</td></tr>';	// Keep &nbsp; to have a line with enough height
+    }
+
+
+
+    // List of available record in database
+    dol_syslog("htdocs/admin/dict", LOG_DEBUG);
+    $resql=$db->query($sql);
+    if ($resql)
+    {
+        $num = $db->num_rows($resql);
+        $i = 0;
+        $var=true;
+
+        $param = '&id='.$id;
+        if ($search_country_id > 0) $param.= '&search_country_id='.$search_country_id;
+        $paramwithsearch = $param;
+        if ($sortorder) $paramwithsearch.= '&sortorder='.$sortorder;
+        if ($sortfield) $paramwithsearch.= '&sortfield='.$sortfield;
+        if (GETPOST('from')) $paramwithsearch.= '&from='.GETPOST('from','alpha');
+        
+        // There is several pages
+        if ($num > $listlimit)
+        {
+            print '<tr class="none"><td align="right" colspan="'.(3+count($fieldlist)).'">';
+            print_fleche_navigation($page, $_SERVER["PHP_SELF"], $paramwithsearch, ($num > $listlimit), '<li class="pagination"><span>'.$langs->trans("Page").' '.($page+1).'</span></li>');
+            print '</td></tr>';
+        }
+
+        // Title of lines
+        print '<tr class="liste_titre liste_titre_add">';
+        foreach ($fieldlist as $field => $value)
+        {
+            // Determine le nom du champ par rapport aux noms possibles
+            // dans les dictionnaires de donnees
+            $showfield=1;							  	// By defaut
+            $align="left";
+            $sortable=1;
+            $valuetoshow='';
+            /*
+            $tmparray=getLabelOfField($fieldlist[$field]);
+            $showfield=$tmp['showfield'];
+            $valuetoshow=$tmp['valuetoshow'];
+            $align=$tmp['align'];
+            $sortable=$tmp['sortable'];
+			*/
+            $valuetoshow=ucfirst($fieldlist[$field]);   // By defaut
+            $valuetoshow=$langs->trans($valuetoshow);   // try to translate
+            if ($fieldlist[$field]=='code')            { $valuetoshow=$langs->trans("Code"); }
+            if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label') { $valuetoshow=$langs->trans("Label"); }
+            if ($fieldlist[$field]=='nature')          { $valuetoshow=$langs->trans("Nature"); }
+
+            // Affiche nom du champ
+            if ($showfield)
+            {
+                print getTitleFieldOfList($valuetoshow, 0, $_SERVER["PHP_SELF"], ($sortable?$fieldlist[$field]:''), ($page?'page='.$page.'&':''), $param, "align=".$align, $sortfield, $sortorder);
+            }
+        }
+		print getTitleFieldOfList($langs->trans("Status"), 0, $_SERVER["PHP_SELF"], "active", ($page?'page='.$page.'&':''), $param, 'align="center"', $sortfield, $sortorder);
+        print getTitleFieldOfList('');
+        print getTitleFieldOfList('');
+        print getTitleFieldOfList('');
+        print '</tr>';
+
+        // Title line with search boxes
+        print '<tr class="liste_titre_filter">';
+        print '<td class="liste_titre"></td>';
+        print '<td class="liste_titre"></td>';
+        print '<td class="liste_titre"></td>';
+        print '<td class="liste_titre" align="center">';
+    	if ($filterfound)
+    	{
+        	$searchpitco=$form->showFilterAndCheckAddButtons(0);
+        	print $searchpitco;
+    	}
+    	print '</td>';
+    	print '</tr>';
+            
+        if ($num)
+        {
+            // Lines with values
+            while ($i < $num)
+            {
+                $obj = $db->fetch_object($resql);
+                //print_r($obj);
+                print '<tr class="oddeven" id="rowid-'.$obj->rowid.'">';
+                if ($action == 'edit' && ($rowid == (! empty($obj->rowid)?$obj->rowid:$obj->code)))
+                {
+                    $tmpaction='edit';
+                    $parameters=array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
+                    $reshook=$hookmanager->executeHooks('editDictionaryFieldlist',$parameters,$obj, $tmpaction);    // Note that $action and $object may have been modified by some hooks
+                    $error=$hookmanager->error; $errors=$hookmanager->errors;
+
+                    // Show fields
+                    if (empty($reshook)) fieldList($fieldlist,$obj,$tabname[$id],'edit');
+
+                    print '<td></td>';
+                    print '<td></td>';
+                    print '<td align="center">';
+                    print '<input type="hidden" name="page" value="'.$page.'">';
+                    print '<input type="hidden" name="rowid" value="'.$rowid.'">';
+                    print '<input type="submit" class="button" name="actionmodify" value="'.$langs->trans("Modify").'">';
+                    print '<div name="'.(! empty($obj->rowid)?$obj->rowid:$obj->code).'"></div>';
+                    print '<input type="submit" class="button" name="actioncancel" value="'.$langs->trans("Cancel").'">';
+                    print '</td>';
+                }
+                else
+                {
+	              	$tmpaction = 'view';
+                    $parameters=array('var'=>$var, 'fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
+                    $reshook=$hookmanager->executeHooks('viewDictionaryFieldlist',$parameters,$obj, $tmpaction);    // Note that $action and $object may have been modified by some hooks
+
+                    $error=$hookmanager->error; $errors=$hookmanager->errors;
+
+                    if (empty($reshook))
+                    {
+                        foreach ($fieldlist as $field => $value)
+                        {
+                            
+                            $showfield=1;
+                        	$align="left";
+                            $valuetoshow=$obj->{$fieldlist[$field]};
+                            if ($valuetoshow=='all') {
+                                $valuetoshow=$langs->trans('All');
+                            }
+                            else if ($fieldlist[$field]=='nature' && $tabname[$id]==MAIN_DB_PREFIX.'accounting_journal') {
+                                $langs->load("accountancy");
+                                $key=$langs->trans("AccountingJournalType".strtoupper($obj->nature));
+                                $valuetoshow=($obj->nature && $key != "AccountingJournalType".strtoupper($obj->nature)?$key:$obj->{$fieldlist[$field]});
+                            }
+
+                            $class='tddict';
+							// Show value for field
+							if ($showfield) print '<!-- '.$fieldlist[$field].' --><td align="'.$align.'" class="'.$class.'">'.$valuetoshow.'</td>';
+                        }
+                    }
+
+                    // Can an entry be erased or disabled ?
+                    $iserasable=1;$canbedisabled=1;$canbemodified=1;	// true by default
+                    if (isset($obj->code) && $id != 10)
+                    {
+                    	if (($obj->code == '0' || $obj->code == '' || preg_match('/unknown/i',$obj->code))) { $iserasable = 0; $canbedisabled = 0; }
+                    	else if ($obj->code == 'RECEP') { $iserasable = 0; $canbedisabled = 0; }
+                    	else if ($obj->code == 'EF0')   { $iserasable = 0; $canbedisabled = 0; }
+                    }
+
+                    if (isset($obj->type) && in_array($obj->type, array('system', 'systemauto'))) { $iserasable=0; }
+                    if (in_array($obj->code, array('AC_OTH','AC_OTH_AUTO')) || in_array($obj->type, array('systemauto'))) { $canbedisabled=0; $canbedisabled = 0; }
+                    $canbemodified=$iserasable;
+                    if ($obj->code == 'RECEP') $canbemodified=1;
+
+                    $url = $_SERVER["PHP_SELF"].'?'.($page?'page='.$page.'&':'').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.(! empty($obj->rowid)?$obj->rowid:(! empty($obj->code)?$obj->code:'')).'&code='.(! empty($obj->code)?urlencode($obj->code):'');
+                    if ($param) $url .= '&'.$param;
+                    $url.='&';
+
+                    // Active
+                    print '<td align="center" class="nowrap">';
+                    if ($canbedisabled) print '<a href="'.$url.'action='.$acts[$obj->active].'">'.$actl[$obj->active].'</a>';
+                    else
+                 	{
+                 		if (in_array($obj->code, array('AC_OTH','AC_OTH_AUTO'))) print $langs->trans("AlwaysActive");
+                 		else if (isset($obj->type) && in_array($obj->type, array('systemauto')) && empty($obj->active)) print $langs->trans("Deprecated");
+                  		else if (isset($obj->type) && in_array($obj->type, array('system')) && ! empty($obj->active) && $obj->code != 'AC_OTH') print $langs->trans("UsedOnlyWithTypeOption");
+                    	else print $langs->trans("AlwaysActive");
+                    }
+                    print "</td>";
+
+                    // Modify link
+                    if ($canbemodified) print '<td align="center"><a class="reposition" href="'.$url.'action=edit">'.img_edit().'</a></td>';
+                    else print '<td>&nbsp;</td>';
+
+                    // Delete link
+                    if ($iserasable)
+                    {
+                        print '<td align="center">';
+                        if ($user->admin) print '<a href="'.$url.'action=delete">'.img_delete().'</a>';
+                        //else print '<a href="#">'.img_delete().'</a>';    // Some dictionnary can be edited by other profile than admin
+                        print '</td>';
+                    }
+                    else print '<td>&nbsp;</td>';
+
+                    print '</td>';
+                    print "</tr>\n";
+                }
+                $i++;
+            }
+        }
+    }
+    else {
+        dol_print_error($db);
+    }
+
+    print '</table>';
+
+    print '</form>';
+}
+
+print '<br>';
+
 
 llxFooter();
-$db->close();
\ No newline at end of file
+$db->close();
+
+
+/**
+ *	Show fields in insert/edit mode
+ *
+ * 	@param		array	$fieldlist		Array of fields
+ * 	@param		Object	$obj			If we show a particular record, obj is filled with record fields
+ *  @param		string	$tabname		Name of SQL table
+ *  @param		string	$context		'add'=Output field for the "add form", 'edit'=Output field for the "edit form", 'hide'=Output field for the "add form" but we dont want it to be rendered
+ *	@return		void
+ */
+function fieldList($fieldlist, $obj='', $tabname='', $context='')
+{
+	global $conf,$langs,$db;
+	global $form, $mysoc;
+	global $region_id;
+	global $elementList,$sourceList,$localtax_typeList;
+	global $bc;
+
+	$formadmin = new FormAdmin($db);
+	$formcompany = new FormCompany($db);
+
+	foreach ($fieldlist as $field => $value)
+	{
+		if ($fieldlist[$field] == 'nature')
+		{
+			print '<td>';
+			print $form->selectarray('nature', $sourceList,(! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:''));
+			print '</td>';
+		}
+		elseif ($fieldlist[$field] == 'code' && isset($obj->{$fieldlist[$field]})) {
+			print '<td><input type="text" class="flat minwidth100" value="'.(! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:'').'" name="'.$fieldlist[$field].'"></td>';
+		}
+		else
+		{
+			print '<td>';
+			$size=''; $class='';
+			if ($fieldlist[$field]=='code')  $class='maxwidth100';
+			if ($fieldlist[$field]=='label') $class='quatrevingtpercent';
+			if ($fieldlist[$field]=='sortorder' || $fieldlist[$field]=='sens' || $fieldlist[$field]=='category_type') $size='size="2" ';
+			print '<input type="text" '.$size.'class="flat'.($class?' '.$class:'').'" value="'.(isset($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:'').'" name="'.$fieldlist[$field].'">';
+			print '</td>';
+		}
+	}
+}
\ No newline at end of file
diff --git a/htdocs/accountancy/class/accountingjournal.class.php b/htdocs/accountancy/class/accountingjournal.class.php
index d7cc61d6418..064f56bddd6 100644
--- a/htdocs/accountancy/class/accountingjournal.class.php
+++ b/htdocs/accountancy/class/accountingjournal.class.php
@@ -82,208 +82,6 @@ class AccountingJournal extends CommonObject
 		}
 	}
 	
-	/**
-	 * Insert journal in database
-	 *
-	 * @param	User	$user		Use making action
-	 * @param	int		$notrigger	Disable triggers
-	 * @return 	int 				<0 if KO, >0 if OK
-	 */
-	function create($user, $notrigger = 0)
-	{
-		global $conf;
-		$error = 0;
-		$now = dol_now();
-		
-		// Clean parameters
-		if (isset($this->code))
-			$this->code = trim($this->code);
-		if (isset($this->label))
-			$this->label = trim($this->label);
-
-		// Check parameters
-		if (empty($this->nature) || $this->nature == '-1')
-		{
-		    $this->nature = '0';
-		}
-
-		// Insert request
-		$sql = "INSERT INTO " . MAIN_DB_PREFIX . "accounting_journal(";
-		$sql .= "code";
-		$sql .= ", label";
-		$sql .= ", nature";
-		$sql .= ", active";
-		$sql .= ") VALUES (";
-		$sql .= " " . (empty($this->code) ? 'NULL' : "'" . $this->db->escape($this->code) . "'");
-		$sql .= ", " . (empty($this->label) ? 'NULL' : "'" . $this->db->escape($this->label) . "'");
-		$sql .= ", " . (empty($this->nature) ? '0' : "'" . $this->db->escape($this->nature) . "'");
-		$sql .= ", " . (! isset($this->active) ? 'NULL' : $this->db->escape($this->active));
-		$sql .= ")";
-		
-		$this->db->begin();
-		
-		dol_syslog(get_class($this) . "::create sql=" . $sql, LOG_DEBUG);
-		$resql = $this->db->query($sql);
-		if (! $resql) {
-			$error ++;
-			$this->errors[] = "Error " . $this->db->lasterror();
-		}
-		
-		if (! $error) {
-			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . "accounting_journal");
-			
-			// if (! $notrigger) {
-			// Uncomment this and change MYOBJECT to your own tag if you
-			// want this action calls a trigger.
-			
-			// // Call triggers
-			// include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-			// $interface=new Interfaces($this->db);
-			// $result=$interface->run_triggers('MYOBJECT_CREATE',$this,$user,$langs,$conf);
-			// if ($result < 0) { $error++; $this->errors=$interface->errors; }
-			// // End call triggers
-			// }
-		}
-		
-		// Commit or rollback
-		if ($error) {
-			foreach ( $this->errors as $errmsg ) {
-				dol_syslog(get_class($this) . "::create " . $errmsg, LOG_ERR);
-				$this->error .= ($this->error ? ', ' . $errmsg : $errmsg);
-			}
-			$this->db->rollback();
-			return - 1 * $error;
-		} else {
-			$this->db->commit();
-			return $this->id;
-		}
-	}
-	
-	/**
-	 * Update record
-	 *
-	 * @param  User $user      Use making update
-	 * @return int             <0 if KO, >0 if OK
-	 */
-	function update($user) 
-	{
-	    // Check parameters
-	    if (empty($this->nature) || $this->nature == '-1')
-	    {
-	        $this->nature = '0';
-	    }
-
-	    $this->db->begin();
-		
-		$sql = "UPDATE " . MAIN_DB_PREFIX . "accounting_journal ";
-		$sql .= " SET code = " . ($this->code ? "'" . $this->db->escape($this->code) . "'" : "null");
-		$sql .= " , label = " . ($this->label ? "'" . $this->db->escape($this->label) . "'" : "null");
-		$sql .= " , nature = " . ($this->nature ? "'" . $this->db->escape($this->nature) . "'" : "0");
-		$sql .= " , active = '" . $this->active . "'";
-		$sql .= " WHERE rowid = " . $this->id;
-		
-		dol_syslog(get_class($this) . "::update sql=" . $sql, LOG_DEBUG);
-		$result = $this->db->query($sql);
-		if ($result) {
-			$this->db->commit();
-			return 1;
-		} else {
-			$this->error = $this->db->lasterror();
-			$this->db->rollback();
-			return - 1;
-		}
-	}
-	
-	/**
-	 * Check usage of accounting journal
-	 *
-	 * @return int <0 if KO, >0 if OK
-	 */
-	function checkUsage() {
-		global $langs;
-		
-		$sql = "(SELECT fk_code_ventilation FROM " . MAIN_DB_PREFIX . "facturedet";
-		$sql .= " WHERE  fk_code_ventilation=" . $this->id . ")";
-		$sql .= "UNION";
-		$sql .= "(SELECT fk_code_ventilation FROM " . MAIN_DB_PREFIX . "facture_fourn_det";
-		$sql .= " WHERE  fk_code_ventilation=" . $this->id . ")";
-		
-		dol_syslog(get_class($this) . "::checkUsage sql=" . $sql, LOG_DEBUG);
-		$resql = $this->db->query($sql);
-		
-		if ($resql) {
-			$num = $this->db->num_rows($resql);
-			if ($num > 0) {
-				$this->error = $langs->trans('ErrorAccountingJournalIsAlreadyUse');
-				return 0;
-			} else {
-				return 1;
-			}
-		} else {
-			$this->error = $this->db->lasterror();
-			return - 1;
-		}
-	}
-	
-	/**
-	 * Delete object in database
-	 *
-	 * @param User $user User that deletes
-	 * @param int $notrigger 0=triggers after, 1=disable triggers
-	 * @return int <0 if KO, >0 if OK
-	 */
-	function delete($user, $notrigger = 0) {
-		$error = 0;
-		
-		$result = $this->checkUsage();
-		
-		if ($result > 0) {
-			
-			$this->db->begin();
-			
-			// if (! $error) {
-			// if (! $notrigger) {
-			// Uncomment this and change MYOBJECT to your own tag if you
-			// want this action calls a trigger.
-			
-			// // Call triggers
-			// include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-			// $interface=new Interfaces($this->db);
-			// $result=$interface->run_triggers('ACCOUNTANCY_ACCOUNT_DELETE',$this,$user,$langs,$conf);
-			// if ($result < 0) { $error++; $this->errors=$interface->errors; }
-			// // End call triggers
-			// }
-			// }
-			
-			if (! $error) {
-				$sql = "DELETE FROM " . MAIN_DB_PREFIX . "accounting_journal";
-				$sql .= " WHERE rowid=" . $this->id;
-				
-				dol_syslog(get_class($this) . "::delete sql=" . $sql);
-				$resql = $this->db->query($sql);
-				if (! $resql) {
-					$error ++;
-					$this->errors[] = "Error " . $this->db->lasterror();
-				}
-			}
-			
-			// Commit or rollback
-			if ($error) {
-				foreach ( $this->errors as $errmsg ) {
-					dol_syslog(get_class($this) . "::delete " . $errmsg, LOG_ERR);
-					$this->error .= ($this->error ? ', ' . $errmsg : $errmsg);
-				}
-				$this->db->rollback();
-				return - 1 * $error;
-			} else {
-				$this->db->commit();
-				return 1;
-			}
-		} else {
-			return - 1;
-		}
-	}
-	
 	/**
 	 * Return clicable name (with picto eventually)
 	 *
@@ -311,64 +109,6 @@ class AccountingJournal extends CommonObject
 		return $result;
 	}
 	
-	/**
-	 * Deactivate journal
-	 *
-	 * @param int $id Id
-	 * @return int <0 if KO, >0 if OK
-	 */
-	function journal_deactivate($id) {
-		$result = $this->checkUsage();
-		
-		if ($result > 0) {
-			$this->db->begin();
-			
-			$sql = "UPDATE " . MAIN_DB_PREFIX . "accounting_journal ";
-			$sql .= "SET active = '0'";
-			$sql .= " WHERE rowid = " . $this->db->escape($id);
-			
-			dol_syslog(get_class($this) . "::deactivate sql=" . $sql, LOG_DEBUG);
-			$result = $this->db->query($sql);
-			
-			if ($result) {
-				$this->db->commit();
-				return 1;
-			} else {
-				$this->error = $this->db->lasterror();
-				$this->db->rollback();
-				return - 1;
-			}
-		} else {
-			return - 1;
-		}
-	}
-	
-	/**
-	 * Activate journal
-	 *
-	 * @param int $id Id
-	 * @return int <0 if KO, >0 if OK
-	 */
-	function journal_activate($id) {
-		$this->db->begin();
-		
-		$sql = "UPDATE " . MAIN_DB_PREFIX . "accounting_journal ";
-		$sql .= "SET active = '1'";
-		$sql .= " WHERE rowid = " . $this->db->escape($id);
-		
-		dol_syslog(get_class($this) . "::activate sql=" . $sql, LOG_DEBUG);
-		$result = $this->db->query($sql);
-		if ($result) {
-			$this->db->commit();
-			return 1;
-		} else {
-			$this->error = $this->db->lasterror();
-			$this->db->rollback();
-			return - 1;
-		}
-	}
-	
-	
 	/**
 	 *  Retourne le libelle du statut d'un user (actif, inactif)
 	 *
diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql
index 54cddfcaa96..9106c345fda 100644
--- a/htdocs/core/menus/init_menu_auguria.sql
+++ b/htdocs/core/menus/init_menu_auguria.sql
@@ -211,14 +211,15 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2400__+MAX_llx_menu__, 'accountancy', 'accounting', 6__+MAX_llx_menu__, '/accountancy/index.php?leftmenu=accountancy', 'MenuAccountancy', 0, 'accountancy', '! empty($conf->accounting->enabled) || $user->rights->accounting->bind->write || $user->rights->accounting->bind->write || $user->rights->compta->resultat->lire', '', 0, 7, __ENTITY__);
 	-- Setup
 	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2451__+MAX_llx_menu__, 'accountancy', 'accountancy_admin',            2400__+MAX_llx_menu__, '/accountancy/index.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'Setup', 1, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 1, __ENTITY__);
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2455__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_chartmodel',    2451__+MAX_llx_menu__, '/accountancy/admin/account.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'Pcg_version', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 10, __ENTITY__);
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2456__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_chart',         2451__+MAX_llx_menu__, '/accountancy/admin/account.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'Chartofaccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 20, __ENTITY__);
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2457__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_chart_group',   2451__+MAX_llx_menu__, '/accountancy/admin/categories_list.php?id=32&mainmenu=accountancy&leftmenu=accountancy_admin', 'AccountingCategory', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 22, __ENTITY__);
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2458__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_default',       2451__+MAX_llx_menu__, '/accountancy/admin/defaultaccounts.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'MenuDefaultAccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 30, __ENTITY__);
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2459__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_vat',           2451__+MAX_llx_menu__, '/admin/dict.php?id=10&from=accountancy&search_country_id=__MYCOUNTRYID__&mainmenu=accountancy&leftmenu=accountancy_admin', 'MenuVatAccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 40, __ENTITY__);
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2460__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_tax',           2451__+MAX_llx_menu__, '/admin/dict.php?id=7&from=accountancy&search_country_id=__MYCOUNTRYID__&mainmenu=accountancy&leftmenu=accountancy_admin', 'MenuTaxAccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 50, __ENTITY__);
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2461__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_expensereport', 2451__+MAX_llx_menu__, '/admin/dict.php?id=17&from=accountancy&mainmenu=accountancy&leftmenu=accountancy_admin', 'MenuExpenseReportAccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 60, __ENTITY__);
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2462__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_product',       2451__+MAX_llx_menu__, '/accountancy/admin/productaccount.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'MenuProductsAccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 70, __ENTITY__);
+	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2457__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_journal',       2451__+MAX_llx_menu__, '/accountancy/admin/journals_list.php?id=35&mainmenu=accountancy&leftmenu=accountancy_admin', 'AccountingJournals', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 10, __ENTITY__);
+	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2455__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_chartmodel',    2451__+MAX_llx_menu__, '/accountancy/admin/account.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'Pcg_version', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 20, __ENTITY__);
+	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2456__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_chart',         2451__+MAX_llx_menu__, '/accountancy/admin/account.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'Chartofaccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 30, __ENTITY__);
+	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2457__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_chart_group',   2451__+MAX_llx_menu__, '/accountancy/admin/categories_list.php?id=32&mainmenu=accountancy&leftmenu=accountancy_admin', 'AccountingCategory', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 40, __ENTITY__);
+	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2458__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_default',       2451__+MAX_llx_menu__, '/accountancy/admin/defaultaccounts.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'MenuDefaultAccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 50, __ENTITY__);
+	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2459__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_vat',           2451__+MAX_llx_menu__, '/admin/dict.php?id=10&from=accountancy&search_country_id=__MYCOUNTRYID__&mainmenu=accountancy&leftmenu=accountancy_admin', 'MenuVatAccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 60, __ENTITY__);
+	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2460__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_tax',           2451__+MAX_llx_menu__, '/admin/dict.php?id=7&from=accountancy&search_country_id=__MYCOUNTRYID__&mainmenu=accountancy&leftmenu=accountancy_admin', 'MenuTaxAccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 70, __ENTITY__);
+	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2461__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_expensereport', 2451__+MAX_llx_menu__, '/admin/dict.php?id=17&from=accountancy&mainmenu=accountancy&leftmenu=accountancy_admin', 'MenuExpenseReportAccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 80, __ENTITY__);
+	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2462__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_product',       2451__+MAX_llx_menu__, '/accountancy/admin/productaccount.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'MenuProductsAccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 90, __ENTITY__);
 	-- Binding
 	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2401__+MAX_llx_menu__, 'accountancy', 'dispatch_customer', 2400__+MAX_llx_menu__, '/accountancy/customer/index.php?leftmenu=dispatch_customer', 'CustomersVentilation', 1, 'accountancy', '$user->rights->accounting->bind->write', '', 0, 2, __ENTITY__);
 	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="dispatch_customer"', __HANDLER__, 'left', 2402__+MAX_llx_menu__, 'accountancy', '', 2401__+MAX_llx_menu__, '/accountancy/customer/list.php', 'ToDispatch', 2, 'accountancy', '$user->rights->accounting->bind->write', '', 0, 3, __ENTITY__);
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index f715061d562..aa905b4ef93 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -952,7 +952,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 
 				// Chart of account
 				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy/',$leftmenu)) $newmenu->add("/accountancy/index.php?leftmenu=accountancy_admin", $langs->trans("Setup"),1,$user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin', 1);
-				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/accountancy/admin/journals_list.php?id=33&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("AccountingJournals"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_journal', 10);
+				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/accountancy/admin/journals_list.php?id=35&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("AccountingJournals"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_journal', 10);
 				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/accountancy/admin/accountmodel.php?id=31&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("Pcg_version"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_chartmodel', 20);
 				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/accountancy/admin/account.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("Chartofaccounts"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_chart', 30);
 				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/accountancy/admin/categories_list.php?id=32&search_country_id=".$mysoc->country_id."&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("AccountingCategory"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_chart', 31);
diff --git a/htdocs/install/mysql/data/llx_accounting.sql b/htdocs/install/mysql/data/llx_accounting.sql
index 5f0e8dd5416..c468e4c3968 100644
--- a/htdocs/install/mysql/data/llx_accounting.sql
+++ b/htdocs/install/mysql/data/llx_accounting.sql
@@ -31,10 +31,10 @@ delete from llx_accounting_account;
 delete from llx_accounting_system;
 delete from llx_accounting_journal;
 
-INSERT INTO llx_accounting_journal (rowid, code, label, nature, active) VALUES (1,'VT', 'Journal des ventes', 1, 1);
-INSERT INTO llx_accounting_journal (rowid, code, label, nature, active) VALUES (2,'AC', 'Journal des achats', 2, 1);
-INSERT INTO llx_accounting_journal (rowid, code, label, nature, active) VALUES (3,'BQ', 'Journal de banque', 3, 1);
-INSERT INTO llx_accounting_journal (rowid, code, label, nature, active) VALUES (4,'OD', 'Journal des opérations diverses', 0, 1);
+INSERT INTO llx_accounting_journal (rowid, code, label, nature, active) VALUES (1,'VT', 'Journal des ventes', 2, 1);
+INSERT INTO llx_accounting_journal (rowid, code, label, nature, active) VALUES (2,'AC', 'Journal des achats', 3, 1);
+INSERT INTO llx_accounting_journal (rowid, code, label, nature, active) VALUES (3,'BQ', 'Journal de banque', 4, 1);
+INSERT INTO llx_accounting_journal (rowid, code, label, nature, active) VALUES (4,'OD', 'Journal des opérations diverses', 1, 1);
 INSERT INTO llx_accounting_journal (rowid, code, label, nature, active) VALUES (5,'AN', 'Journal des à-nouveaux', 9, 1);
 --
 -- Descriptif des plans comptables FR PCG99-ABREGE
diff --git a/htdocs/install/mysql/tables/llx_accounting_journal.sql b/htdocs/install/mysql/tables/llx_accounting_journal.sql
index d9c6ea76e3e..bccfb234c3e 100644
--- a/htdocs/install/mysql/tables/llx_accounting_journal.sql
+++ b/htdocs/install/mysql/tables/llx_accounting_journal.sql
@@ -22,6 +22,6 @@ create table llx_accounting_journal
   rowid             integer AUTO_INCREMENT PRIMARY KEY,
   code       		varchar(32) NOT NULL,
   label             varchar(128) NOT NULL,
-  nature			smallint DEFAULT 0 NOT NULL,			-- type of journals (0:various operations / 1:sale / 2:purchase / 3:bank / 9: has-new)
+  nature			smallint DEFAULT 0 NOT NULL,			-- type of journals (1:various operations / 2:sale / 3:purchase / 4:bank / 9: has-new)
   active            smallint DEFAULT 0
 )ENGINE=innodb;
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index bd1e41c5464..84ac021d041 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -204,11 +204,11 @@ NewAccountingJournal=New accounting journal
 ShowAccoutingJournal=Show accounting journal
 Code=Code
 Nature=Nature
-AccountingJournalTypeVariousOperation=Various operation
-AccountingJournalTypeSale=Sale
-AccountingJournalTypePurchase=Purchase
-AccountingJournalTypeBank=Bank
-AccountingJournalTypeHasNew=Has-new
+AccountingJournalType1=Various operation
+AccountingJournalType2=Sales
+AccountingJournalType3=Purchases
+AccountingJournalType4=Bank
+AccountingJournalType9=Has-new
 ErrorAccountingJournalIsAlreadyUse=This journal is already use
 
 ## Export
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 02ff5740986..e432a57bb9d 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -856,6 +856,7 @@ DictionaryOrderMethods=Ordering methods
 DictionarySource=Origin of proposals/orders
 DictionaryAccountancyCategory=Accounting account groups
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryAccountancyJournal=Accounting journals
 DictionaryEMailTemplates=Emails templates
 DictionaryUnits=Units
 DictionaryProspectStatus=Prospection status

From d658a833c98fad5e2b21ca4c5f3ad44e51ad4717 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Mon, 1 May 2017 12:05:52 +0200
Subject: [PATCH 150/505] FIX #6677 Expired contracts dashboard box does not
 show the name of the thirdparty

Close #6677
---
 htdocs/core/boxes/box_services_expired.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/boxes/box_services_expired.php b/htdocs/core/boxes/box_services_expired.php
index f2bc86cdac5..52ccb694dd3 100644
--- a/htdocs/core/boxes/box_services_expired.php
+++ b/htdocs/core/boxes/box_services_expired.php
@@ -104,7 +104,7 @@ class box_services_expired extends ModeleBoxes
     				'logo' => 'company',
     				'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid);
 
-    				$this->info_box_contents[$i][3] = array('td' => 'class="tdoverflow maxwidth100onsmartphone" align="left"',
+    				$this->info_box_contents[$i][3] = array('td' => 'class="tdoverflowmax200 maxwidth100onsmartphone" align="left"',
     				'text' => $objp->name,
     				'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid);
 

From 5af5c23a987f9d0025653da691120c6e8e3516e5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 1 May 2017 12:46:40 +0200
Subject: [PATCH 151/505] Look and feel v6

---
 .../core/tpl/admin_extrafields_view.tpl.php   | 43 ++++++++++++-------
 1 file changed, 28 insertions(+), 15 deletions(-)

diff --git a/htdocs/core/tpl/admin_extrafields_view.tpl.php b/htdocs/core/tpl/admin_extrafields_view.tpl.php
index c14927ec048..3242a388a3d 100644
--- a/htdocs/core/tpl/admin_extrafields_view.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_view.tpl.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2010-2016	Laurent Destailleur	<eldy@users.sourceforge.net>
+/* Copyright (C) 2010-2017	Laurent Destailleur	<eldy@users.sourceforge.net>
  * Copyright (C) 2012		Regis Houssin		<regis.houssin@capnetworks.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -49,23 +49,36 @@ if (! empty($conf->global->MAIN_CAN_HIDE_EXTRAFIELDS)) print '<td align="center"
 print '<td width="80">&nbsp;</td>';
 print "</tr>\n";
 
-$var=True;
-foreach($extrafields->attribute_type as $key => $value)
+if (count($extrafields->attribute_type))
 {
+    foreach($extrafields->attribute_type as $key => $value)
+    {
+        
+        print '<tr class="oddeven">';
+        print "<td>".$extrafields->attribute_pos[$key]."</td>\n";
+        print "<td>".$extrafields->attribute_label[$key]."</td>\n";
+        print "<td>".$key."</td>\n";
+        print "<td>".$type2label[$extrafields->attribute_type[$key]]."</td>\n";
+        print '<td align="right">'.$extrafields->attribute_size[$key]."</td>\n";
+        print '<td align="center">'.yn($extrafields->attribute_unique[$key])."</td>\n";
+        print '<td align="center">'.yn($extrafields->attribute_required[$key])."</td>\n";
+        print '<td align="center">'.yn($extrafields->attribute_alwayseditable[$key])."</td>\n";
+    	if (! empty($conf->global->MAIN_CAN_HIDE_EXTRAFIELDS)) print '<td align="center">'.yn($extrafields->attribute_hidden[$key])."</td>\n";	// Add hidden option on not working feature. Why hide if user can't see it.
+        print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=edit&attrname='.$key.'">'.img_edit().'</a>';
+        print "&nbsp; <a href=\"".$_SERVER["PHP_SELF"]."?action=delete&attrname=$key\">".img_delete()."</a></td>\n";
+        print "</tr>";
+    }
+}
+else
+{
+    $colspan=9;
+    if (! empty($conf->global->MAIN_CAN_HIDE_EXTRAFIELDS)) $colspan++;
     
     print '<tr class="oddeven">';
-    print "<td>".$extrafields->attribute_pos[$key]."</td>\n";
-    print "<td>".$extrafields->attribute_label[$key]."</td>\n";
-    print "<td>".$key."</td>\n";
-    print "<td>".$type2label[$extrafields->attribute_type[$key]]."</td>\n";
-    print '<td align="right">'.$extrafields->attribute_size[$key]."</td>\n";
-    print '<td align="center">'.yn($extrafields->attribute_unique[$key])."</td>\n";
-    print '<td align="center">'.yn($extrafields->attribute_required[$key])."</td>\n";
-    print '<td align="center">'.yn($extrafields->attribute_alwayseditable[$key])."</td>\n";
-	if (! empty($conf->global->MAIN_CAN_HIDE_EXTRAFIELDS)) print '<td align="center">'.yn($extrafields->attribute_hidden[$key])."</td>\n";	// Add hidden option on not working feature. Why hide if user can't see it.
-    print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=edit&attrname='.$key.'">'.img_edit().'</a>';
-    print "&nbsp; <a href=\"".$_SERVER["PHP_SELF"]."?action=delete&attrname=$key\">".img_delete()."</a></td>\n";
-    print "</tr>";
+    print '<td class="opacitymedium" colspan="'.$colspan.'">';
+    print $langs->trans("None");
+    print '</td>';
+    print '</tr>';
 }
 
 print "</table>";

From 6e1f82519020ac0a38532438df32a8481eb63f1c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 1 May 2017 13:01:05 +0200
Subject: [PATCH 152/505] Look and feel v6

---
 htdocs/admin/clicktodial.php  | 3 ++-
 htdocs/core/lib/ajax.lib.php  | 2 +-
 htdocs/langs/en_US/admin.lang | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/htdocs/admin/clicktodial.php b/htdocs/admin/clicktodial.php
index 060c910753a..86b94d8ecf0 100644
--- a/htdocs/admin/clicktodial.php
+++ b/htdocs/admin/clicktodial.php
@@ -91,7 +91,8 @@ print '</td></tr>';
 
 print '<tr class="oddeven"><td>';
 print $langs->trans("DefaultLink").'</td><td>';
-print '<input style="width: 90%" type="text" name="CLICKTODIAL_URL"'.($conf->global->CLICKTODIAL_USE_TEL_LINK_ON_PHONE_NUMBERS?' disabled="disabled"':'').' value="'.$conf->global->CLICKTODIAL_URL.'"><br>';
+print '<input class="quatrevingtpercent" type="text" id="CLICKTODIAL_URL" name="CLICKTODIAL_URL"'.($conf->global->CLICKTODIAL_USE_TEL_LINK_ON_PHONE_NUMBERS?' disabled="disabled"':'').' value="'.$conf->global->CLICKTODIAL_URL.'"><br>';
+print ajax_autoselect('CLICKTODIAL_URL');
 print '<br>';
 print $langs->trans("ClickToDialUrlDesc").'<br>';
 print $langs->trans("Example").':<br>http://myphoneserver/mypage?login=__LOGIN__&password=__PASS__&caller=__PHONEFROM__&called=__PHONETO__';
diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php
index 942c17f5df9..49218ddf141 100644
--- a/htdocs/core/lib/ajax.lib.php
+++ b/htdocs/core/lib/ajax.lib.php
@@ -349,7 +349,7 @@ function ajax_dialog($title,$message,$w=350,$h=150)
 
 
 /**
- * Make a input box content all selected
+ * Make content of an input box selected when we click into input field.
  * 
  * @param string	$htmlname	Id of html object 
  * @param int		$addlink	Add a link to after
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 02ff5740986..35037387c1f 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1501,7 +1501,7 @@ AGENDA_NOTIFICATION=Enable event notification on user browsers when event date i
 AGENDA_NOTIFICATION_SOUND=Enable sound notification
 ##### Clicktodial #####
 ClickToDialSetup=Click To Dial module setup
-ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
+ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
 ClickToDialDesc=This module allows to make phone numbers clickable. A click on this icon will call make your phone to call the phone number. This can be used to call a call center system from Dolibarr that can call the phone number on a SIP system for example.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
 ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on same computer than the browser, and called when you click on a link in your browser that start with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.

From 8730add15f70eab2a1f458f047f4f2df7c797358 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 1 May 2017 16:01:39 +0200
Subject: [PATCH 153/505] Better message for api key return

---
 build/debian/README.howto            | 29 +++++++++++++++++++++-------
 htdocs/api/class/api_login.class.php |  2 +-
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/build/debian/README.howto b/build/debian/README.howto
index 705899d47c4..399c4f07a1f 100644
--- a/build/debian/README.howto
+++ b/build/debian/README.howto
@@ -385,13 +385,14 @@ http://packages.qa.debian.org
 * Package will be into release when test will be moved as stable.
 
 
-##### Send an unblock request 
+
+##### Send an unblock request to make a full update of a stable package 
 
 Use this to move from unstable to testing.
 
 reportbug -B debian --smtphost=smtp.gmail.com:587 --smtpuser=xxxx --smtppasswd=yyyy --tls
 Choose package "release.debian.org"
-Then "unblock"
+Then usertag "unblock"
 Then name of package "dolibarr"
 Fill message, for example:
 "Please unblock package dolibarr
@@ -400,12 +401,11 @@ Note that package 3.5.7 contains not only fixed for bugs reported to debian. It
 so it is a better solution to validate this maintenance release than applying a patch of the only CVE-2015-3935. 
 After discussion with ..., it appears that security holes are enough to request this unblock request."
 
-
-Use this to request an update of a stable package
+Use this to request an full update of a stable package
 
 reportbug -B debian --smtphost=smtp.gmail.com:587 --smtpuser=xxxx --smtppasswd=yyyy --tls
 Choose package "release.debian.org"
-Then "unblock"
+Then usertag "unblock"
 Then name of package "dolibarr"
 Fill message, for example:
 "
@@ -417,11 +417,26 @@ Pro are:
 - It fixes also stability bugs
 - Patches were already tested because deployed and used by several thousands of users.
 - It is easier for package maintener to include this official set of fixes than applying one patch after one patch for each debian report or backported each patch into a dedicated version.
-- Debian maintenance version matches with official project maintenance version (better when all fixes are not related to the way the software is packaged)
+- Debian maintenance version is inline with official project maintenance version (better when all fixes are not related to the way the software is packaged)
 Cons are: 
-- The patch include more than the only one security reported fxes
+- The patch include more than the only one security reported fixes
 
 So I just need to know if it's ok to push such a version 3.5.7 (fixes for 3.5.* branch) instead of only one fix for only the few (the only) reported debian bugs,
 since it provides more stability and is for me a more secured process.
 "
 
+##### Send an request to ask a simple fix of a stable package 
+
+Use this to ask to apply patches on a stable version.
+
+reportbug -B debian --smtphost=smtp.gmail.com:587 --smtpuser=xxxx --smtppasswd=yyyy --tls
+Choose package "release.debian.org"
+Then usertag "jessie-pu"
+Then name of package "dolibarr"
+Fill message, for example:
+"Please unblock package dolibarr
+A security error CVE-2015-3935 was reported and is fixed into package 3.5.7.
+Note that package 3.5.7 contains not only fixed for bugs reported to debian. It includes other fixes, but they are all related to stability or security,
+so it is a better solution to validate this maintenance release than applying a patch of the only CVE-2015-3935. 
+After discussion with ..., it appears that security holes are enough to request this unblock request."
+
diff --git a/htdocs/api/class/api_login.class.php b/htdocs/api/class/api_login.class.php
index 704ec1b6874..76a9befebc9 100644
--- a/htdocs/api/class/api_login.class.php
+++ b/htdocs/api/class/api_login.class.php
@@ -102,7 +102,7 @@ class Login
 			'success' => array(
 				'code' => 200,
 				'token' => $token,
-				'message' => 'Welcome ' . $login.($reset?' - Token is new':' - This is your token (generated by a previous call)')
+				'message' => 'Welcome ' . $login.($reset?' - Token is new':' - This is your token (generated by a previous call). You can use it to make any REST API call, or enter it into the DOLAPIKEY field to use the Dolibarr API explorer.')
 			)
 		);
 	}

From 94b69844f2a57a021ac311b78a6285f1724c6081 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Mon, 1 May 2017 20:39:46 +0200
Subject: [PATCH 154/505] Add option no url

---
 htdocs/accountancy/class/accountingaccount.class.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/htdocs/accountancy/class/accountingaccount.class.php b/htdocs/accountancy/class/accountingaccount.class.php
index dfb29be6323..8bf7dfe0c44 100644
--- a/htdocs/accountancy/class/accountingaccount.class.php
+++ b/htdocs/accountancy/class/accountingaccount.class.php
@@ -366,11 +366,12 @@ class AccountingAccount extends CommonObject
 	 *
 	 * @param	int		$withpicto		0=No picto, 1=Include picto into link, 2=Only picto
 	 * @param	int		$withlabel		0=No label, 1=Include label of account
+	 * @param	int  	$nourl			1=Disable url
 	 * @param	string  $moretitle		Add more text to title tooltip
 	 * @param	int  	$notooltip		1=Disable tooltip
 	 * @return	string	String with URL
 	 */
-	function getNomUrl($withpicto = 0, $withlabel = 0, $moretitle='',$notooltip=0)
+	function getNomUrl($withpicto = 0, $withlabel = 0, $nourl = 0, $moretitle='',$notooltip=0)
 	{
 		global $langs, $conf, $user;
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
@@ -407,6 +408,13 @@ class AccountingAccount extends CommonObject
         $linkstart.=$linkclose.'>';
 		$linkend='</a>';
 
+		if ($nourl)
+		{
+			$linkstart = '';
+			$linkclose = '';
+			$linkend = '';			
+		}
+
 		$label_link = length_accountg($this->account_number);
 		if ($withlabel) $label_link .= ' - ' . $this->label;
 

From 102deccba74cf8846e4568f9dd0fea8946c8b42e Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Mon, 1 May 2017 21:06:31 +0200
Subject: [PATCH 155/505] Use getnomUrl on bank accountancy number

---
 htdocs/compta/bank/card.php | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index df6e6b1c8c8..6576b12d494 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -1,11 +1,11 @@
 <?php
 /* Copyright (C) 2002-2003	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
- * Copyright (C) 2003		Jean-Louis Bergamo	<jlb@j1b.org>
- * Copyright (C) 2004-2016	Laurent Destailleur	<eldy@users.sourceforge.net>
- * Copyright (C) 2005-2009	Regis Houssin		<regis.houssin@capnetworks.com>
- * Copyright (C) 2014-2016	Alexandre Spangaro	<aspangaro.dolibarr@gmail.com>
- * Copyright (C) 2015       Jean-François Ferry	<jfefe@aternatik.fr>
- * Copyright (C) 2016       Marcos García       <marcosgdf@gmail.com>
+ * Copyright (C) 2003		Jean-Louis Bergamo		<jlb@j1b.org>
+ * Copyright (C) 2004-2016	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009	Regis Houssin			<regis.houssin@capnetworks.com>
+ * Copyright (C) 2014-2017	Alexandre Spangaro		<aspangaro@zendsi.com>
+ * Copyright (C) 2015		Jean-François Ferry		<jfefe@aternatik.fr>
+ * Copyright (C) 2016		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
@@ -37,6 +37,7 @@ require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php';
 if (! empty($conf->categorie->enabled)) require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
 if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
 if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
+if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php';
 
 $langs->load("banks");
 $langs->load("bills");
@@ -664,7 +665,10 @@ else
 		print '<tr class="liste_titre_add"><td class="titlefield">'.$langs->trans("AccountancyCode").'</td>';
 		print '<td>';
 		if (! empty($conf->accounting->enabled)) {
-		    print length_accountg($object->account_number).'</td></tr>';
+			$accountingaccount = new AccountingAccount($db);
+			$accountingaccount->fetch('',$object->account_number);
+
+			print $accountingaccount->getNomUrl(1,1,1,'',1);
 		} else {
 		    print $object->account_number;
 		}
@@ -683,13 +687,11 @@ else
 		
 		print '</table>';
 
-		
 		print '</div>';
 		print '<div class="fichehalfright">';
 		print '<div class="ficheaddleft">';
 		print '<div class="underbanner clearboth"></div>';
 
-
 		print '<table class="border centpercent">';
 		
         // Categories
@@ -703,8 +705,7 @@ else
 		print '<td>'.dol_htmlentitiesbr($object->comment).'</td></tr>';
 
 		print '</table>';
-		
-		
+
 		if ($object->type == Account::TYPE_SAVINGS || $object->type == Account::TYPE_CURRENT)
 		{
 		    print '<br>';

From e1e2481e3791b5bf2b87dc467d52e2369f46b149 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Mon, 1 May 2017 21:09:09 +0200
Subject: [PATCH 156/505] Remove picto

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

diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index 6576b12d494..802c37a6946 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -668,7 +668,7 @@ else
 			$accountingaccount = new AccountingAccount($db);
 			$accountingaccount->fetch('',$object->account_number);
 
-			print $accountingaccount->getNomUrl(1,1,1,'',1);
+			print $accountingaccount->getNomUrl(0,1,1,'',1);
 		} else {
 		    print $object->account_number;
 		}

From fa4bb4e80a5e98c1312b0f319261fee07043a696 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Mon, 1 May 2017 21:12:52 +0200
Subject: [PATCH 157/505] Remove accounting.lib.php

---
 htdocs/compta/bank/card.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index 802c37a6946..5b3bb3a58fe 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -35,7 +35,6 @@ require_once DOL_DOCUMENT_ROOT . '/core/class/html.formbank.class.php';
 require_once DOL_DOCUMENT_ROOT . '/compta/bank/class/account.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php';
 if (! empty($conf->categorie->enabled)) require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
-if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
 if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
 if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php';
 

From 9641a240ead9a444c6555b3f807736980315ac5f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 2 May 2017 11:27:35 +0200
Subject: [PATCH 158/505] Complete vat dictionnary

---
 htdocs/admin/dict.php                   | 19 ++++++++++---------
 htdocs/install/mysql/data/llx_c_tva.sql |  6 ++++--
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index d4aa0ce6989..c2730e6c034 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -918,10 +918,19 @@ if (empty($id))
 print "<br>\n";
 
 
+$param = '&id='.$id;
+if ($search_country_id > 0) $param.= '&search_country_id='.$search_country_id;
+if ($search_code != '')     $param.= '&search_code='.urlencode($search_country_id);
+$paramwithsearch = $param;
+if ($sortorder) $paramwithsearch.= '&sortorder='.$sortorder;
+if ($sortfield) $paramwithsearch.= '&sortfield='.$sortfield;
+if (GETPOST('from')) $paramwithsearch.= '&from='.GETPOST('from','alpha');
+
+
 // Confirmation de la suppression de la ligne
 if ($action == 'delete')
 {
-    print $form->formconfirm($_SERVER["PHP_SELF"].'?'.($page?'page='.$page.'&':'').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.$rowid.'&code='.urlencode($_GET["code"]).'&id='.$id, $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_delete','',0,1);
+    print $form->formconfirm($_SERVER["PHP_SELF"].'?'.($page?'page='.$page.'&':'').'rowid='.$rowid.'&code='.urlencode($_GET["code"]).$paramwithsearch, $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_delete','',0,1);
 }
 //var_dump($elementList);
 
@@ -1134,14 +1143,6 @@ if ($id)
         $num = $db->num_rows($resql);
         $i = 0;
 
-        $param = '&id='.$id;
-        if ($search_country_id > 0) $param.= '&search_country_id='.$search_country_id;
-        if ($search_code != '')     $param.= '&search_code='.urlencode($search_country_id);
-        $paramwithsearch = $param;
-        if ($sortorder) $paramwithsearch.= '&sortorder='.$sortorder;
-        if ($sortfield) $paramwithsearch.= '&sortfield='.$sortfield;
-        if (GETPOST('from')) $paramwithsearch.= '&from='.GETPOST('from','alpha');
-        
         // There is several pages
         if ($num > $listlimit)
         {
diff --git a/htdocs/install/mysql/data/llx_c_tva.sql b/htdocs/install/mysql/data/llx_c_tva.sql
index 81c72eccb8f..34842ed324e 100644
--- a/htdocs/install/mysql/data/llx_c_tva.sql
+++ b/htdocs/install/mysql/data/llx_c_tva.sql
@@ -96,12 +96,14 @@ insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (80
 
 -- FRANCE (id country=1)
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 11,  1,  '20','0','VAT standard rate (France hors DOM-TOM)',1);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 12,  1, '8.5','0','VAT standard rate (DOM sauf Guyane et Saint-Martin)',0);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 13,  1, '8.5','1','VAT standard rate (DOM sauf Guyane et Saint-Martin), non perçu par le vendeur mais récupérable par acheteur',0);
+insert into llx_c_tva(rowid,fk_pays,taux,code,recuperableonly,note,active) values ( 12,  1, '8.5', '8.5', '0','VAT standard rate (DOM sauf Guyane et Saint-Martin)',0);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 14,  1, '5.5','0','VAT reduced rate (France hors DOM-TOM)',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 15,  1,   '0','0','VAT Rate 0 ou non applicable',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 16,  1, '2.1','0','VAT super-reduced rate',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 17,  1,  '10','0','VAT reduced rate',1);
+insert into llx_c_tva(fk_pays,taux,code,recuperableonly,note,active)                                                   values (1, '8.5', '85NPR', '1','VAT standard rate (DOM sauf Guyane et Saint-Martin), non perçu par le vendeur mais récupérable par acheteur',0);
+insert into llx_c_tva(fk_pays,taux,code,recuperableonly,localtax1,localtax1_type,note,active)                          values (1, '8.5', '85NPROM', '1', 2, 3, 'VAT standard rate (DOM sauf Guyane et Saint-Martin), NPR, Octroi de Mer',0);
+insert into llx_c_tva(fk_pays,taux,code,recuperableonly,localtax1,localtax1_type,localtax2,localtax2_type,note,active) values (1, '8.5', '85NPROMOMR', '1', 2, 3, 2.5, 3, 'VAT standard rate (DOM sauf Guyane et Saint-Martin), NPR, Octroi de Mer et Octroi de Mer Regional',0);
 
 -- GERMANY (id country=5)
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 51,  5,  '19.0','0','allgemeine Ust.',1);

From 31d99bbfe6c0956c4b9633e2f4127808602366ff Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 2 May 2017 11:28:40 +0200
Subject: [PATCH 159/505] Complete event tracked automatically

---
 ...terface_50_modAgenda_ActionsAuto.class.php |  73 +--
 htdocs/expensereport/card.php                 | 478 ++++++++++--------
 .../mysql/data/llx_c_action_trigger.sql       |   4 +
 .../install/mysql/migration/5.0.0-6.0.0.sql   |  22 +
 htdocs/install/mysql/tables/llx_holiday.sql   |   4 +-
 5 files changed, 304 insertions(+), 277 deletions(-)

diff --git a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
index 84517e36c08..bce6d69b2fa 100644
--- a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
+++ b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
@@ -87,7 +87,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("NewCompanyToDolibarr",$object->name);
             $object->actionmsg=$langs->transnoentities("NewCompanyToDolibarr",$object->name);
             if (! empty($object->prefix)) $object->actionmsg.=" (".$object->prefix.")";
-            $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
 			$object->sendtoid=0;
 			$object->socid=$object->id;
@@ -100,7 +99,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
             if (empty($object->actiontypecode)) $object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) dol_syslog('Trigger called with property actionmsg2 on object not defined', LOG_ERR);
-            $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
             // Parameters $object->sendtoid defined by caller
             //$object->sendtoid=0;
@@ -114,7 +112,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ContractValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
             $object->actionmsg=$langs->transnoentities("ContractValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
-            $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
             $object->sendtoid=0;
 		}
@@ -127,7 +124,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("PropalValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
             $object->actionmsg=$langs->transnoentities("PropalValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
-            $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
 			$object->sendtoid=0;
 		}
@@ -142,7 +138,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             if (empty($object->actionmsg))
             {
                 $object->actionmsg=$langs->transnoentities("ProposalSentByEMail",$object->ref);
-                $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
             }
 
             // Parameters $object->sendtoid defined by caller
@@ -157,7 +152,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("PropalClosedSignedInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("PropalClosedSignedInDolibarr",$object->ref);
-            $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
 			$object->sendtoid=0;
 		}
@@ -170,7 +164,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("PropalClassifiedBilledInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("PropalClassifiedBilledInDolibarr",$object->ref);
-            $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
 			$object->sendtoid=0;
 		}
@@ -183,7 +176,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("PropalClosedRefusedInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("PropalClosedRefusedInDolibarr",$object->ref);
-            $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
 			$object->sendtoid=0;
 		}
@@ -195,7 +187,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
             $object->actionmsg=$langs->transnoentities("OrderValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
-            $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
 			$object->sendtoid=0;
 		}
@@ -208,7 +199,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderDeliveredInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("OrderDeliveredInDolibarr",$object->ref);
-            $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
 			$object->sendtoid=0;
 		}
@@ -221,7 +211,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderBilledInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("OrderBilledInDolibarr",$object->ref);
-            $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
 			$object->sendtoid=0;
 		}
@@ -234,7 +223,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderCanceledInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("OrderCanceledInDolibarr",$object->ref);
-            $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
 			$object->sendtoid=0;
 		}
@@ -249,7 +237,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             if (empty($object->actionmsg))
             {
                 $object->actionmsg=$langs->transnoentities("OrderSentByEMail",$object->ref);
-                $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
             }
 
             // Parameters $object->sendtoid defined by caller
@@ -264,7 +251,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InvoiceValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
             $object->actionmsg=$langs->transnoentities("InvoiceValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
-            $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
 			$object->sendtoid=0;
 		}
@@ -277,7 +263,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InvoiceBackToDraftInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("InvoiceBackToDraftInDolibarr",$object->ref);
-            $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
 			$object->sendtoid=0;
 		}
@@ -292,7 +277,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             if (empty($object->actionmsg))
             {
                 $object->actionmsg=$langs->transnoentities("InvoiceSentByEMail",$object->ref);
-                $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
             }
 
             // Parameters $object->sendtoid defined by caller
@@ -308,7 +292,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actiontypecode='AC_OTH_AUTO';
             $object->actionmsg2=$langs->transnoentities("InvoicePaidInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("InvoicePaidInDolibarr",$object->ref);
-            $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
             $object->sendtoid=0;
 		}
@@ -321,7 +304,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InvoiceCanceledInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("InvoiceCanceledInDolibarr",$object->ref);
-            $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
             $object->sendtoid=0;
 		}
@@ -334,7 +316,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InterventionCreatedInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("InterventionCreatedInDolibarr",$object->ref);
-            $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
             $object->sendtoid=0;
 			$object->fk_element=0;
@@ -349,7 +330,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InterventionValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
             $object->actionmsg=$langs->transnoentities("InterventionValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
-            $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
             $object->sendtoid=0;
 			$object->fk_element=0;
@@ -364,7 +344,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InterventionModifiedInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("InterventionModifiedInDolibarr",$object->ref);
-            $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
             $object->sendtoid=0;
 			$object->fk_element=0;
@@ -379,7 +358,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InterventionSentByEMail",$object->ref);
             $object->actionmsg=$langs->transnoentities("InterventionSentByEMail",$object->ref);
-            $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
+
             // Parameters $object->sendtoid defined by caller
             //$object->sendtoid=0;
         }
@@ -392,7 +371,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $object->actiontypecode='AC_OTH_AUTO';
            	if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InterventionClassifiedBilledInDolibarr",$object->ref);
            	$object->actionmsg=$langs->transnoentities("InterventionClassifiedBilledInDolibarr",$object->ref);
-            $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
             $object->sendtoid=0;
         }
@@ -405,7 +383,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $object->actiontypecode='AC_OTH_AUTO';
            	if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InterventionClassifiedUnbilledInDolibarr",$object->ref);
            	$object->actionmsg=$langs->transnoentities("InterventionClassifiedUnbilledInDolibarr",$object->ref);
-            $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
             $object->sendtoid=0;
         }
@@ -418,7 +395,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InterventionDeletedInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("InterventionDeletedInDolibarr",$object->ref);
-            $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
             $object->sendtoid=0;
 			$object->fk_element=0;
@@ -435,7 +411,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
         	if (empty($object->actionmsg))
         	{
         		$object->actionmsg=$langs->transnoentities("ShippingValidated",($object->newref?$object->newref:$object->ref));
-        		$object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
         	}
 
         	// Parameters $object->sendtoid defined by caller
@@ -452,7 +427,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             if (empty($object->actionmsg))
             {
                 $object->actionmsg=$langs->transnoentities("ShippingSentByEMail",$object->ref);
-                $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
             }
 
             // Parameters $object->sendtoid defined by caller
@@ -467,7 +441,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderCreatedInDolibarr",($object->newref?$object->newref:$object->ref));
             $object->actionmsg=$langs->transnoentities("OrderCreatedInDolibarr",($object->newref?$object->newref:$object->ref));
-            $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
             $object->sendtoid=0;
 		}
@@ -480,7 +453,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
             $object->actionmsg=$langs->transnoentities("OrderValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
-            $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
             $object->sendtoid=0;
 		}
@@ -493,7 +465,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actiontypecode='AC_OTH_AUTO';
 			if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderApprovedInDolibarr",$object->ref);
 			$object->actionmsg=$langs->transnoentities("OrderApprovedInDolibarr",$object->ref);
-			$object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
 			$object->sendtoid=0;
 		}
@@ -506,7 +477,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actiontypecode='AC_OTH_AUTO';
 			if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderRefusedInDolibarr",$object->ref);
 			$object->actionmsg=$langs->transnoentities("OrderRefusedInDolibarr",$object->ref);
-			$object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
 			$object->sendtoid=0;
 		}
@@ -519,7 +489,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("SupplierOrderSubmitedInDolibarr",($object->newref?$object->newref:$object->ref));
             $object->actionmsg=$langs->transnoentities("SupplierOrderSubmitedInDolibarr",($object->newref?$object->newref:$object->ref));
-            $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
             $object->sendtoid=0;
 		}
@@ -532,7 +501,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("SupplierOrderReceivedInDolibarr",($object->newref?$object->newref:$object->ref));
             $object->actionmsg=$langs->transnoentities("SupplierOrderReceivedInDolibarr",($object->newref?$object->newref:$object->ref));
-            $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
             $object->sendtoid=0;
 		}
@@ -548,7 +516,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             if (empty($object->actionmsg))
             {
                 $object->actionmsg=$langs->transnoentities("SupplierOrderSentByEMail",$object->ref);
-                $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
             }
 
             // Parameters $object->sendtoid defined by caller
@@ -566,7 +533,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             if (empty($object->actionmsg))
             {
                 $object->actionmsg=$langs->transnoentities("SupplierOrderClassifiedBilled",$object->ref);
-                $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
             }
 
             $object->sendtoid=0;
@@ -580,7 +546,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InvoiceValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
             $object->actionmsg=$langs->transnoentities("InvoiceValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
-            $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
             $object->sendtoid=0;
 		}
@@ -593,7 +558,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InvoiceBackToDraftInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("InvoiceBackToDraftInDolibarr",$object->ref);
-            $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
             $object->sendtoid=0;
 		}
@@ -609,7 +573,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             if (empty($object->actionmsg))
             {
                 $object->actionmsg=$langs->transnoentities("SupplierInvoiceSentByEMail",$object->ref);
-                $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
             }
 
             // Parameters $object->sendtoid defined by caller
@@ -624,7 +587,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InvoicePaidInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("InvoicePaidInDolibarr",$object->ref);
-            $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
 			$object->sendtoid=0;
 		}
@@ -637,7 +599,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InvoiceCanceledInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("InvoiceCanceledInDolibarr",$object->ref);
-            $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
 			$object->sendtoid=0;
 		}
@@ -654,7 +615,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $object->actionmsg=$langs->transnoentities("MemberValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
             $object->actionmsg.="\n".$langs->transnoentities("Member").': '.$object->getFullName($langs);
             $object->actionmsg.="\n".$langs->transnoentities("Type").': '.$object->type;
-            $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
 			$object->sendtoid=0;
         }
@@ -669,7 +629,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $object->actionmsg=$langs->transnoentities("MemberModifiedInDolibarr",$object->ref);
             $object->actionmsg.="\n".$langs->transnoentities("Member").': '.$object->getFullName($langs);
             $object->actionmsg.="\n".$langs->transnoentities("Type").': '.$object->type;
-            $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
             $object->sendtoid=0;
 		}
@@ -686,7 +645,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $object->actionmsg.="\n".$langs->transnoentities("Type").': '.$object->type;
             $object->actionmsg.="\n".$langs->transnoentities("Amount").': '.$object->last_subscription_amount;
             $object->actionmsg.="\n".$langs->transnoentities("Period").': '.dol_print_date($object->last_subscription_date_start,'day').' - '.dol_print_date($object->last_subscription_date_end,'day');
-            $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
 			$object->sendtoid=0;
         }
@@ -701,7 +659,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $object->actionmsg=$langs->transnoentities("MemberResiliatedInDolibarr",$object->ref);
             $object->actionmsg.="\n".$langs->transnoentities("Member").': '.$object->getFullName($langs);
             $object->actionmsg.="\n".$langs->transnoentities("Type").': '.$object->type;
-            $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
 			$object->sendtoid=0;
         }
@@ -716,7 +673,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $object->actionmsg=$langs->transnoentities("MemberDeletedInDolibarr",$object->ref);
             $object->actionmsg.="\n".$langs->transnoentities("Member").': '.$object->getFullName($langs);
             $object->actionmsg.="\n".$langs->transnoentities("Type").': '.$object->type;
-            $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
 			$object->sendtoid=0;
         }
@@ -732,7 +688,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
         	if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ProjectCreatedInDolibarr",$object->ref);
         	$object->actionmsg=$langs->transnoentities("ProjectCreatedInDolibarr",$object->ref);
         	$object->actionmsg.="\n".$langs->transnoentities("Project").': '.$object->ref;
-        	$object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
         	$object->sendtoid=0;
         }
@@ -746,7 +701,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ProjectValidatedInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("ProjectValidatedInDolibarr",$object->ref);
             $object->actionmsg.="\n".$langs->transnoentities("Project").': '.$object->ref;
-            $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
         
             $object->sendtoid=0;
         }
@@ -759,7 +713,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ProjectModifiedInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("ProjectModifieddInDolibarr",$object->ref);
             $object->actionmsg.="\n".$langs->transnoentities("Task").': '.$object->ref;
-            $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
         
             $object->sendtoid=0;
         }
@@ -775,7 +728,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("TaskCreatedInDolibarr",$object->ref);
 			$object->actionmsg=$langs->transnoentities("TaskCreatedInDolibarr",$object->ref);
 			$object->actionmsg.="\n".$langs->transnoentities("Task").': '.$object->ref;
-			$object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
 			$object->sendtoid=0;
 		}
@@ -789,7 +741,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("TaskModifiedInDolibarr",$object->ref);
 			$object->actionmsg=$langs->transnoentities("TaskModifieddInDolibarr",$object->ref);
 			$object->actionmsg.="\n".$langs->transnoentities("Task").': '.$object->ref;
-			$object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
 			$object->sendtoid=0;
 		}
@@ -803,18 +754,24 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("TaskDeletedInDolibarr",$object->ref);
 			$object->actionmsg=$langs->transnoentities("TaskDeletedInDolibarr",$object->ref);
 			$object->actionmsg.="\n".$langs->transnoentities("Task").': '.$object->ref;
-			$object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
 			$object->sendtoid=0;
 		}
-
-		// The trigger was enabled but we are missing the implementation, let the log know
-		else
-		{
-			dol_syslog("Trigger '".$this->name."' for action '$action' was ran by ".__FILE__." but no handler found for this action.", LOG_WARNING);
-			return 0;
+		// TODO Merge all previous cases into this generic one
+		else {
+		    // Note: We are here only if $conf->global->MAIN_AGENDA_ACTIONAUTO_action is on (tested at begining of this function) 
+		    $langs->load("agenda");
+		    $langs->load("other");
+		    
+		    $object->actiontypecode='AC_OTH_AUTO';
+		    if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities($action."InDolibarr",$object->ref);
+		    $object->actionmsg=$langs->transnoentities($action."InDolibarr",$object->ref);
+		    
+		    $object->sendtoid=0;
 		}
-
+		
+		$object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
+		
 		dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
         // Add entry in event table
diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index db2328cdfb4..9a2433994bd 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -444,14 +444,16 @@ if (empty($reshook))
    			$destinataire->fetch($object->fk_user_validator);
    			$emailTo = $destinataire->email;
     
-   			if ($emailTo)
-   			{
-   				// FROM
-   				$expediteur = new User($db);
-   				$expediteur->fetch($object->fk_user_author);
-   				$emailFrom = $expediteur->email;
+			// FROM
+			$expediteur = new User($db);
+			$expediteur->fetch($object->fk_user_author);
+			$emailFrom = $expediteur->email;
 
-    			// SUBJECT
+   			if ($emailFrom && $emailTo)
+   			{
+    			$filename=array(); $filedir=array(); $mimetype=array();
+   			    
+   			    // SUBJECT
     			$subject = $langs->transnoentities("ExpenseReportWaitingForReApproval");
     
     			// CONTENT
@@ -561,73 +563,83 @@ if (empty($reshook))
 
    			// CC
    			$emailCC = $conf->global->NDF_CC_EMAILS;
+            if (empty($emailTo)) $emailTo=$emailCC;
 
 			// FROM
    			$expediteur = new User($db);
    			$expediteur->fetch($object->fk_user_valid);
    			$emailFrom = $expediteur->email;
 
-			// SUBJECT
-   			$subject = $langs->transnoentities("ExpenseReportApproved");
-
-   			// CONTENT
-   			$link = $urlwithroot.'/expensereport/card.php?id='.$object->id;
-   			$message = $langs->transnoentities("ExpenseReportApprovedMessage", $object->ref, $destinataire->getFullName($langs), $expediteur->getFullName($langs), $link);
-
-   			// Rebuilt pdf
-			/*
-    		$object->setDocModel($user,"");
-    		$resultPDF = expensereport_pdf_create($db,$object,'',"",$langs);
-    
-    		if($resultPDF
-			{
-    			// ATTACHMENT
+   			if ($emailFrom && $emailTo)
+   			{
     			$filename=array(); $filedir=array(); $mimetype=array();
-    			array_push($filename,dol_sanitizeFileName($object->ref).".pdf");
-    			array_push($filedir, $conf->expensereport->dir_output."/".dol_sanitizeFileName($object->ref)."/".dol_sanitizeFileName($object->ref).".pdf");
-    			array_push($mimetype,"application/pdf");
-			}
-			*/
+   			    
+   			    // SUBJECT
+       			$subject = $langs->transnoentities("ExpenseReportApproved");
+    
+       			// CONTENT
+       			$link = $urlwithroot.'/expensereport/card.php?id='.$object->id;
+       			$message = $langs->transnoentities("ExpenseReportApprovedMessage", $object->ref, $destinataire->getFullName($langs), $expediteur->getFullName($langs), $link);
+    
+       			// Rebuilt pdf
+    			/*
+        		$object->setDocModel($user,"");
+        		$resultPDF = expensereport_pdf_create($db,$object,'',"",$langs);
+        
+        		if($resultPDF
+    			{
+        			// ATTACHMENT
+        			$filename=array(); $filedir=array(); $mimetype=array();
+        			array_push($filename,dol_sanitizeFileName($object->ref).".pdf");
+        			array_push($filedir, $conf->expensereport->dir_output."/".dol_sanitizeFileName($object->ref)."/".dol_sanitizeFileName($object->ref).".pdf");
+        			array_push($mimetype,"application/pdf");
+    			}
+    			*/
 
-        	// PREPARE SEND
-    		$mailfile = new CMailFile($subject,$emailTo,$emailFrom,$message,$filedir,$mimetype,$filename);
-
-   			if ($mailfile)
-   			{
-   				// SEND
-   				$result=$mailfile->sendfile();
-   				if ($result)
-   				{
-   					$mesg=$langs->trans('MailSuccessfulySent',$mailfile->getValidAddress($emailFrom,2),$mailfile->getValidAddress($emailTo,2));
-   					setEventMessages($mesg, null, 'mesgs');
-   					header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
-   					exit;
-   				}
-   				else
-   				{
-   					$langs->load("other");
-   					if ($mailfile->error)
-   					{
-   						$mesg='';
-   						$mesg.=$langs->trans('ErrorFailedToSendMail', $emailFrom, $emailTo);
-   						$mesg.='<br>'.$mailfile->error;
-   						setEventMessages($mesg, null, 'errors');
-   					}
-   					else
-   					{
-   						setEventMessages('No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS', null, 'warnings');
-   					}
-   				}
+        		$mailfile = new CMailFile($subject,$emailTo,$emailFrom,$message,$filedir,$mimetype,$filename);
+    
+       			if ($mailfile)
+       			{
+       				// SEND
+       				$result=$mailfile->sendfile();
+       				if ($result)
+       				{
+       					$mesg=$langs->trans('MailSuccessfulySent',$mailfile->getValidAddress($emailFrom,2),$mailfile->getValidAddress($emailTo,2));
+       					setEventMessages($mesg, null, 'mesgs');
+       					header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
+       					exit;
+       				}
+       				else
+       				{
+       					$langs->load("other");
+       					if ($mailfile->error)
+       					{
+       						$mesg='';
+       						$mesg.=$langs->trans('ErrorFailedToSendMail', $emailFrom, $emailTo);
+       						$mesg.='<br>'.$mailfile->error;
+       						setEventMessages($mesg, null, 'errors');
+       					}
+       					else
+       					{
+       						setEventMessages('No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS', null, 'warnings');
+       					}
+       				}
+       			}
+       			else
+       			{
+       				setEventMessages($mailfile->error,$mailfile->errors,'errors');
+       				$action='';
+       			}
    			}
-   			else
-   			{
-   				setEventMessages($mailfile->error,$mailfile->errors,'errors');
-   				$action='';
-   			}
-   		}
+    		else
+    		{
+    			setEventMessages($langs->trans("NoEmailSentBadSenderOrRecipientEmail"), null, 'warnings');
+    			$action='';
+    		}
+    	}
    		else
    		{
-   			setEventMessages($langs->trans("NoEmailSentBadSenderOrRecipientEmail"), null, 'warnings');
+   			setEventMessages($langs->trans("FailedtoSetToApprove"), null, 'warnings');
    			$action='';
    		}
    	}
@@ -677,68 +689,78 @@ if (empty($reshook))
     		$expediteur->fetch($object->fk_user_refuse);
     		$emailFrom = $expediteur->email;
     
-			// SUBJECT
-   			$subject = $langs->transnoentities("ExpenseReportRefused");
-
-   			// CONTENT
-   			$link = $urlwithroot.'/expensereport/card.php?id='.$object->id;
-			$message = $langs->transnoentities("ExpenseReportRefusedMessage", $object->ref, $destinataire->getFullName($langs), $expediteur->getFullName($langs), $_POST['detail_refuse'], $link);
-
-   			// Rebuilt pdf
-			/*
-    		$object->setDocModel($user,"");
-    		$resultPDF = expensereport_pdf_create($db,$object,'',"",$langs);
-    
-    		if($resultPDF
-			{
-    			// ATTACHMENT
+    		if ($emailFrom && $emailTo)
+    		{
     			$filename=array(); $filedir=array(); $mimetype=array();
-    			array_push($filename,dol_sanitizeFileName($object->ref).".pdf");
-    			array_push($filedir, $conf->expensereport->dir_output."/".dol_sanitizeFileName($object->ref)."/".dol_sanitizeFileName($object->ref).".pdf");
-    			array_push($mimetype,"application/pdf");
-			}
-			*/
+    		    
+    		    // SUBJECT
+       			$subject = $langs->transnoentities("ExpenseReportRefused");
     
-    		// PREPARE SEND
-    		$mailfile = new CMailFile($subject,$emailTo,$emailFrom,$message,$filedir,$mimetype,$filename);
+       			// CONTENT
+       			$link = $urlwithroot.'/expensereport/card.php?id='.$object->id;
+    			$message = $langs->transnoentities("ExpenseReportRefusedMessage", $object->ref, $destinataire->getFullName($langs), $expediteur->getFullName($langs), $_POST['detail_refuse'], $link);
     
-    		if ($mailfile)
-    		{
-    			// SEND
-    			$result=$mailfile->sendfile();
-    			if ($result)
+       			// Rebuilt pdf
+    			/*
+        		$object->setDocModel($user,"");
+        		$resultPDF = expensereport_pdf_create($db,$object,'',"",$langs);
+        
+        		if($resultPDF
     			{
-    				$mesg=$langs->trans('MailSuccessfulySent',$mailfile->getValidAddress($emailFrom,2),$mailfile->getValidAddress($emailTo,2));
-    				setEventMessages($mesg, null, 'mesgs');
-    				header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
-    				exit;
+        			// ATTACHMENT
+        			$filename=array(); $filedir=array(); $mimetype=array();
+        			array_push($filename,dol_sanitizeFileName($object->ref).".pdf");
+        			array_push($filedir, $conf->expensereport->dir_output."/".dol_sanitizeFileName($object->ref)."/".dol_sanitizeFileName($object->ref).".pdf");
+        			array_push($mimetype,"application/pdf");
     			}
-    			else
-    			{
-    				$langs->load("other");
-    				if ($mailfile->error)
-    				{
-    					$mesg='';
-    					$mesg.=$langs->trans('ErrorFailedToSendMail', $emailFrom, $emailTo);
-    					$mesg.='<br>'.$mailfile->error;
-    					setEventMessages($mesg, null, 'errors');
-    				}
-    				else
-    				{
-    					setEventMessages('No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS', null, 'warnings');
-    				}
-    			}
-    		}
-    		else
-    		{
-    			setEventMessages($mailfile->error,$mailfile->errors,'errors');
-    			$action='';
-    		}
+    			*/
+        
+        		// PREPARE SEND
+        		$mailfile = new CMailFile($subject,$emailTo,$emailFrom,$message,$filedir,$mimetype,$filename);
+        
+        		if ($mailfile)
+        		{
+        			// SEND
+        			$result=$mailfile->sendfile();
+        			if ($result)
+        			{
+        				$mesg=$langs->trans('MailSuccessfulySent',$mailfile->getValidAddress($emailFrom,2),$mailfile->getValidAddress($emailTo,2));
+        				setEventMessages($mesg, null, 'mesgs');
+        				header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
+        				exit;
+        			}
+        			else
+        			{
+        				$langs->load("other");
+        				if ($mailfile->error)
+        				{
+        					$mesg='';
+        					$mesg.=$langs->trans('ErrorFailedToSendMail', $emailFrom, $emailTo);
+        					$mesg.='<br>'.$mailfile->error;
+        					setEventMessages($mesg, null, 'errors');
+        				}
+        				else
+        				{
+        					setEventMessages('No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS', null, 'warnings');
+        				}
+        			}
+        		}
+        		else
+        		{
+        			setEventMessages($mailfile->error,$mailfile->errors,'errors');
+        			$action='';
+        		}
+        	}
+        	else
+        	{
+        		setEventMessages($langs->trans("NoEmailSentBadSenderOrRecipientEmail"), null, 'warnings');
+        		$action='';
+        	}
     	}
     	else
     	{
-    		setEventMessages($langs->trans("NoEmailSentBadSenderOrRecipientEmail"), null, 'warnings');
-    		$action='';
+    	    setEventMessages($langs->trans("FailedtoSetToDeny"), null, 'warnings');
+    	    $action='';
     	}
     }
     else
@@ -790,67 +812,77 @@ if (empty($reshook))
     			$expediteur->fetch($object->fk_user_cancel);
     			$emailFrom = $expediteur->email;
     
-				// SUBJECT
-				$subject = $langs->transnoentities("ExpenseReportCanceled");
-
-				// CONTENT
-				$link = $urlwithroot.'/expensereport/card.php?id='.$object->id;
-				$message = $langs->transnoentities("ExpenseReportCanceledMessage", $object->ref, $destinataire->getFullName($langs), $expediteur->getFullName($langs), $_POST['detail_cancel'], $link);
-
-				// Rebuilt pdf
-				/*
-				$object->setDocModel($user,"");
-				$resultPDF = expensereport_pdf_create($db,$object,'',"",$langs);
-		
-				if($resultPDF
-				{
-					// ATTACHMENT
-					$filename=array(); $filedir=array(); $mimetype=array();
-					array_push($filename,dol_sanitizeFileName($object->ref).".pdf");
-					array_push($filedir, $conf->expensereport->dir_output."/".dol_sanitizeFileName($object->ref)."/".dol_sanitizeFileName($object->ref).".pdf");
-					array_push($mimetype,"application/pdf");
-				}
-				*/
-
-    			// PREPARE SEND
-    			$mailfile = new CMailFile($subject,$emailTo,$emailFrom,$message,$filedir,$mimetype,$filename);
-    
-    			if ($mailfile)
+    			if ($emailFrom && $emailTo)
     			{
-    				// SEND
-    				$result=$mailfile->sendfile();
-    				if ($result)
+    			    $filename=array(); $filedir=array(); $mimetype=array();
+    			    
+    			    // SUBJECT
+    				$subject = $langs->transnoentities("ExpenseReportCanceled");
+    
+    				// CONTENT
+    				$link = $urlwithroot.'/expensereport/card.php?id='.$object->id;
+    				$message = $langs->transnoentities("ExpenseReportCanceledMessage", $object->ref, $destinataire->getFullName($langs), $expediteur->getFullName($langs), $_POST['detail_cancel'], $link);
+    
+    				// Rebuilt pdf
+    				/*
+    				$object->setDocModel($user,"");
+    				$resultPDF = expensereport_pdf_create($db,$object,'',"",$langs);
+    		
+    				if($resultPDF
     				{
-    					$mesg=$langs->trans('MailSuccessfulySent',$mailfile->getValidAddress($emailFrom,2),$mailfile->getValidAddress($emailTo,2));
-    					setEventMessages($mesg, null, 'mesgs');
-    					header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
-    					exit;
-    				}
-    				else
-    				{
-    					$langs->load("other");
-    					if ($mailfile->error)
-    					{
-    						$mesg='';
-    						$mesg.=$langs->trans('ErrorFailedToSendMail', $emailFrom, $emailTo);
-    						$mesg.='<br>'.$mailfile->error;
-    						setEventMessages($mesg, null, 'errors');
-    					}
-    					else
-    					{
-    						setEventMessages('No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS', null, 'warnings');
-    					}
+    					// ATTACHMENT
+    					$filename=array(); $filedir=array(); $mimetype=array();
+    					array_push($filename,dol_sanitizeFileName($object->ref).".pdf");
+    					array_push($filedir, $conf->expensereport->dir_output."/".dol_sanitizeFileName($object->ref)."/".dol_sanitizeFileName($object->ref).".pdf");
+    					array_push($mimetype,"application/pdf");
     				}
+    				*/
+    
+        			// PREPARE SEND
+        			$mailfile = new CMailFile($subject,$emailTo,$emailFrom,$message,$filedir,$mimetype,$filename);
+        
+        			if ($mailfile)
+        			{
+        				// SEND
+        				$result=$mailfile->sendfile();
+        				if ($result)
+        				{
+        					$mesg=$langs->trans('MailSuccessfulySent',$mailfile->getValidAddress($emailFrom,2),$mailfile->getValidAddress($emailTo,2));
+        					setEventMessages($mesg, null, 'mesgs');
+        					header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
+        					exit;
+        				}
+        				else
+        				{
+        					$langs->load("other");
+        					if ($mailfile->error)
+        					{
+        						$mesg='';
+        						$mesg.=$langs->trans('ErrorFailedToSendMail', $emailFrom, $emailTo);
+        						$mesg.='<br>'.$mailfile->error;
+        						setEventMessages($mesg, null, 'errors');
+        					}
+        					else
+        					{
+        						setEventMessages('No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS', null, 'warnings');
+        					}
+        				}
+        			}
+        			else
+        			{
+        				setEventMessages($mailfile->error,$mailfile->errors,'errors');
+        				$action='';
+        			}
     			}
     			else
     			{
-    				setEventMessages($mailfile->error,$mailfile->errors,'errors');
-    				$action='';
-    			}
+    			    setEventMessages($langs->trans("NoEmailSentBadSenderOrRecipientEmail"), null, 'warnings');
+    			    $action='';
+    			}        			
     		}
     		else
     		{
-    			setEventMessages($langs->trans("NoEmailSentBadSenderOrRecipientEmail"), null, 'warnings');
+    			setEventMessages($langs->trans("FailedToSetToCancel"), null, 'warnings');
     			$action='';
     		}
     	}
@@ -945,63 +977,73 @@ if (empty($reshook))
     		$expediteur->fetch($user->id);
     		$emailFrom = $expediteur->email;
     
-			// SUBJECT
-			$subject = $langs->transnoentities("ExpenseReportPaid");
-
-			// CONTENT
-			$link = $urlwithroot.'/expensereport/card.php?id='.$object->id;
-			$message = $langs->transnoentities("ExpenseReportPaidMessage", $object->ref, $destinataire->getFullName($langs), $expediteur->getFullName($langs), $link);
-    
-    		// CONTENT
-    		$message = "Bonjour {$destinataire->firstname},\n\n";
-    		$message.= "Votre note de frais \"{$object->ref}\" vient d'être payée.\n";
-    		$message.= "- Payeur : {$expediteur->firstname} {$expediteur->lastname}\n";
-    		$message.= "- Lien : {$dolibarr_main_url_root}/expensereport/card.php?id={$object->id}\n\n";
-    		$message.= "Bien cordialement,\n' SI";
-    
-    		// Generate pdf before attachment
-    		$object->setDocModel($user,"");
-    		$resultPDF = expensereport_pdf_create($db,$object,'',"",$langs);
-    
-    		// PREPARE SEND
-    		$mailfile = new CMailFile($subject,$emailTo,$emailFrom,$message,$filedir,$mimetype,$filename);
-    
-    		if ($mailfile)
+    		if ($emailFrom && $emailTo)
     		{
-    			// SEND
-				$result=$mailfile->sendfile();
-    			if ($result)
-    			{
-    				$mesg=$langs->trans('MailSuccessfulySent',$mailfile->getValidAddress($emailFrom,2),$mailfile->getValidAddress($emailTo,2));
-    				setEventMessages($mesg, null, 'mesgs');
-    				header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
-    				exit;
-    			}
-    			else
-    			{
-					$langs->load("other");
-    				if ($mailfile->error)
-    				{
-    					$mesg='';
-    					$mesg.=$langs->trans('ErrorFailedToSendMail', $emailFrom, $emailTo);
-    					$mesg.='<br>'.$mailfile->error;
-    					setEventMessages($mesg, null, 'errors');
-    				}
-    				else
-    				{
-    					setEventMessages('No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS', null, 'warnings');
-    				}
-    			}
+    			$filename=array(); $filedir=array(); $mimetype=array();
+    		    
+    		    // SUBJECT
+    			$subject = $langs->transnoentities("ExpenseReportPaid");
+    
+    			// CONTENT
+    			$link = $urlwithroot.'/expensereport/card.php?id='.$object->id;
+    			$message = $langs->transnoentities("ExpenseReportPaidMessage", $object->ref, $destinataire->getFullName($langs), $expediteur->getFullName($langs), $link);
+        
+        		// CONTENT
+        		$message = "Bonjour {$destinataire->firstname},\n\n";
+        		$message.= "Votre note de frais \"{$object->ref}\" vient d'être payée.\n";
+        		$message.= "- Payeur : {$expediteur->firstname} {$expediteur->lastname}\n";
+        		$message.= "- Lien : {$dolibarr_main_url_root}/expensereport/card.php?id={$object->id}\n\n";
+        		$message.= "Bien cordialement,\n' SI";
+        
+        		// Generate pdf before attachment
+        		$object->setDocModel($user,"");
+        		$resultPDF = expensereport_pdf_create($db,$object,'',"",$langs);
+        
+        		// PREPARE SEND
+        		$mailfile = new CMailFile($subject,$emailTo,$emailFrom,$message,$filedir,$mimetype,$filename);
+        
+        		if ($mailfile)
+        		{
+        			// SEND
+    				$result=$mailfile->sendfile();
+        			if ($result)
+        			{
+        				$mesg=$langs->trans('MailSuccessfulySent',$mailfile->getValidAddress($emailFrom,2),$mailfile->getValidAddress($emailTo,2));
+        				setEventMessages($mesg, null, 'mesgs');
+        				header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
+        				exit;
+        			}
+        			else
+        			{
+    					$langs->load("other");
+        				if ($mailfile->error)
+        				{
+        					$mesg='';
+        					$mesg.=$langs->trans('ErrorFailedToSendMail', $emailFrom, $emailTo);
+        					$mesg.='<br>'.$mailfile->error;
+        					setEventMessages($mesg, null, 'errors');
+        				}
+        				else
+        				{
+        					setEventMessages('No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS', null, 'warnings');
+        				}
+        			}
+        		}
+        		else
+        		{
+        			setEventMessages($mailfile->error,$mailfile->errors,'errors');
+        			$action='';
+        		}
     		}
     		else
     		{
-    			setEventMessages($mailfile->error,$mailfile->errors,'errors');
-    			$action='';
+    		    setEventMessages($langs->trans("NoEmailSentBadSenderOrRecipientEmail"), null, 'warnings');
+    		    $action='';
     		}
     	}
     	else
     	{
-    		setEventMessages($langs->trans("NoEmailSentBadSenderOrRecipientEmail"), null, 'warnings');
+    		setEventMessages($langs->trans("FailedToSetPaid"), null, 'warnings');
     		$action='';
     	}
     }
diff --git a/htdocs/install/mysql/data/llx_c_action_trigger.sql b/htdocs/install/mysql/data/llx_c_action_trigger.sql
index 9aadb0c083e..d25963e8c3a 100644
--- a/htdocs/install/mysql/data/llx_c_action_trigger.sql
+++ b/htdocs/install/mysql/data/llx_c_action_trigger.sql
@@ -78,6 +78,10 @@ insert into llx_c_action_trigger (code,label,description,elementtype,rang) value
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_SENTBYMAIL','Intervention sent by mail','Executed when a intervention is sent by mail','ficheinter',35);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PRODUCT_CREATE','Product or service created','Executed when a product or sevice is created','product',40);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PRODUCT_DELETE','Product or service deleted','Executed when a product or sevice is deleted','product',42);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('EXPENSE_REPORT_CREATE','Expense report created','Executed when an expense report is created','expensereport',201);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('EXPENSE_REPORT_VALIDATE','Expense report validated','Executed when an expense report is validated','expensereport',202);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('EXPENSE_REPORT_APPROVE','Expense report approved','Executed when an expense report is approved','expensereport',203);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('EXPENSE_REPORT_PAYED','Expense report billed','Executed when an expense report is set as billed','expensereport',204);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROJECT_VALIDATE','Project validation','Executed when a project is validated','project',141);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROJECT_DELETE','Project deleted','Executed when a project is deleted','project',143);
 -- actions not enabled by default (no constant created for that) when we enable module agenda 
diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index b20da8b9b89..71f9a17273c 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -42,10 +42,22 @@ ALTER TABLE llx_ecm_files ADD UNIQUE INDEX uk_ecm_files (filepath, filename, ent
 ALTER TABLE llx_ecm_files ADD INDEX idx_ecm_files_label (label);
 
 
+ALTER TABLE llx_holiday ADD COLUMN import_key				varchar(14);
+ALTER TABLE llx_holiday ADD COLUMN extraparams				varchar(255);	
+
+ALTER TABLE llx_expensereport ADD COLUMN import_key			varchar(14);
+ALTER TABLE llx_expensereport ADD COLUMN extraparams		varchar(255);	
+
+
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PRODUCT_CREATE','Product or service created','Executed when a product or sevice is created','product',30);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PRODUCT_MODIFY','Product or service modified','Executed when a product or sevice is modified','product',30);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PRODUCT_DELETE','Product or service deleted','Executed when a product or sevice is deleted','product',30);
 
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('EXPENSE_REPORT_CREATE','Expense report created','Executed when an expense report is created','expense_report',201);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('EXPENSE_REPORT_VALIDATE','Expense report validated','Executed when an expense report is validated','expense_report',202);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('EXPENSE_REPORT_APPROVE','Expense report approved','Executed when an expense report is approved','expense_report',203);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('EXPENSE_REPORT_PAYED','Expense report billed','Executed when an expense report is set as billed','expense_report',204);
+
 ALTER TABLE llx_c_email_templates ADD COLUMN content_lines text;
 
 ALTER TABLE llx_loan ADD COLUMN fk_projet integer DEFAULT NULL;
@@ -111,6 +123,16 @@ INSERT INTO llx_accounting_journal (rowid, code, label, nature, active) VALUES (
 ALTER TABLE llx_paiementfourn ADD COLUMN model_pdf varchar(255);
 
 
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('EXPENSE_REPORT_CREATE','Expense report created','Executed when an expense report is created','expensereport',201);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('EXPENSE_REPORT_VALIDATE','Expense report validated','Executed when an expense report is validated','expensereport',202);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('EXPENSE_REPORT_APPROVE','Expense report approved','Executed when an expense report is approved','expensereport',203);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('EXPENSE_REPORT_PAYED','Expense report billed','Executed when an expense report is set as billed','expensereport',204);
+
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('HOLIDAY_CREATE'  ,'Leave request created','Executed when a leave request is created','holiday',221);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('HOLIDAY_VALIDATE','Leave request validated','Executed when a leave request is validated','holiday',222);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('HOLIDAY_APPROVE' ,'Leave request approved','Executed when a leave request is approved','holiday',223);
+
+
 ALTER TABLE llx_societe_remise_except ADD COLUMN fk_invoice_supplier_line	integer;
 ALTER TABLE llx_societe_remise_except ADD COLUMN fk_invoice_supplier		integer;
 ALTER TABLE llx_societe_remise_except ADD COLUMN fk_invoice_supplier_source	integer;
diff --git a/htdocs/install/mysql/tables/llx_holiday.sql b/htdocs/install/mysql/tables/llx_holiday.sql
index 2a981444df3..2091dea9541 100644
--- a/htdocs/install/mysql/tables/llx_holiday.sql
+++ b/htdocs/install/mysql/tables/llx_holiday.sql
@@ -40,6 +40,8 @@ fk_user_cancel integer DEFAULT NULL,
 detail_refuse  varchar( 250 ) DEFAULT NULL,
 note_private   text,
 note_public    text,
-tms            timestamp
+tms            timestamp,
+import_key			varchar(14),
+extraparams			varchar(255)				-- for other parameters with json format
 ) 
 ENGINE=innodb;

From 166f2d262d7d3c4664ae1eb21d3f597906e3daa0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Tue, 2 May 2017 14:00:27 +0200
Subject: [PATCH 160/505] Corrected PHP7 warnings for function
 CommonObject::getTotalWeightVolume

---
 htdocs/core/class/commonobject.class.php | 33 ++++++++++++++----------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 60247186734..f2e8f75f796 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -2953,24 +2953,31 @@ abstract class CommonObject
      */
     function getTotalWeightVolume()
     {
-        $weightUnit=0;
-        $volumeUnit=0;
-        $totalWeight = '';
-        $totalVolume = '';
-        $totalOrdered = '';     // defined for shipment only
-        $totalToShip = '';      // defined for shipment only
+        $totalWeight = 0;
+        $totalVolume = 0;
+	    // defined for shipment only
+        $totalOrdered = 0;
+	    // defined for shipment only
+        $totalToShip = 0;
 
         foreach ($this->lines as $line)
         {
 
-            $totalOrdered+=$line->qty_asked;    // defined for shipment only
-            $totalToShip+=$line->qty_shipped;   // defined for shipment only
+            $totalOrdered+=$line->qty_asked ?: 0;    // defined for shipment only
+            $totalToShip+= $line->qty_shipped ?: 0;   // defined for shipment only
+
+	        // Define qty, weight, volume, weight_units, volume_units
+	        if ($this->element == 'shipping') {
+		        // for shipments
+		        $qty = $line->qty_shipped ?: 0;
+	        }
+	        else {
+		        $qty = $line->qty ?: 0;
+	        }
+
+            $weight = $line->weight ?: 0;
+            $volume = $line->volume ?: 0;
 
-            // Define qty, weight, volume, weight_units, volume_units
-            if ($this->element == 'shipping') $qty=$line->qty_shipped;     // for shipments
-            else $qty=$line->qty;
-            $weight=$line->weight;
-            $volume=$line->volume;
             $weight_units=$line->weight_units;
             $volume_units=$line->volume_units;
 

From 6e7fddee7d10cc2244f42a9d80f3eb5c6fe386ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Tue, 2 May 2017 14:07:04 +0200
Subject: [PATCH 161/505] Corrected PHP7 warnings for function
 pdf_einstein::write_file

---
 htdocs/core/modules/commande/doc/pdf_einstein.modules.php | 2 +-
 htdocs/theme/eldy/style.css.php                           | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
index 7d38fe03d2d..244e78caacb 100644
--- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
@@ -483,7 +483,7 @@ class pdf_einstein extends ModelePDFCommandes
 						$this->localtax2[$localtax2_type][$localtax2_rate]+=$localtax2ligne;
 
 					if (($object->lines[$i]->info_bits & 0x01) == 0x01) $vatrate.='*';
-					if (! isset($this->tva[$vatrate])) 				$this->tva[$vatrate]='';
+					if (! isset($this->tva[$vatrate])) 				$this->tva[$vatrate]= 0;
 					$this->tva[$vatrate] += $tvaligne;
 
 					// Add line
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 76cbad28f00..d03ff95a50f 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -158,25 +158,25 @@ if (! empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED))
 
 // Set text color to black or white
 $tmppart=explode(',',$colorbackhmenu1);
-$tmpval=(! empty($tmppart[1]) ? $tmppart[1] : '')+(! empty($tmppart[2]) ? $tmppart[2] : '')+(! empty($tmppart[3]) ? $tmppart[3] : '');
+$tmpval=(! empty($tmppart[1]) ? $tmppart[1] : 0)+(! empty($tmppart[2]) ? $tmppart[2] : 0)+(! empty($tmppart[3]) ? $tmppart[3] : 0);
 if ($tmpval <= 360) $colortextbackhmenu='FFFFFF';
 else $colortextbackhmenu='000000';
 
 $tmppart=explode(',',$colorbackvmenu1);
-$tmpval=(! empty($tmppart[1]) ? $tmppart[1] : '')+(! empty($tmppart[2]) ? $tmppart[2] : '')+(! empty($tmppart[3]) ? $tmppart[3] : '');
+$tmpval=(! empty($tmppart[1]) ? $tmppart[1] : 0)+(! empty($tmppart[2]) ? $tmppart[2] : 0)+(! empty($tmppart[3]) ? $tmppart[3] : 0);
 if ($tmpval <= 360) { $colortextbackvmenu='FFFFFF'; }
 else { $colortextbackvmenu='000000'; }
 
 $tmppart=explode(',',$colorbacktitle1);
 if ($colortexttitle == '')
 {
-    $tmpval=(! empty($tmppart[1]) ? $tmppart[1] : '')+(! empty($tmppart[2]) ? $tmppart[2] : '')+(! empty($tmppart[3]) ? $tmppart[3] : '');
+    $tmpval=(! empty($tmppart[1]) ? $tmppart[1] : 0)+(! empty($tmppart[2]) ? $tmppart[2] : 0)+(! empty($tmppart[3]) ? $tmppart[3] : 0);
     if ($tmpval <= 360) { $colortexttitle='FFFFFF'; $colorshadowtitle='888888'; }
     else { $colortexttitle='000000'; $colorshadowtitle='FFFFFF'; }
 }
 
 $tmppart=explode(',',$colorbacktabcard1);
-$tmpval=(! empty($tmppart[1]) ? $tmppart[1] : '')+(! empty($tmppart[2]) ? $tmppart[2] : '')+(! empty($tmppart[3]) ? $tmppart[3] : '');
+$tmpval=(! empty($tmppart[1]) ? $tmppart[1] : 0)+(! empty($tmppart[2]) ? $tmppart[2] : 0)+(! empty($tmppart[3]) ? $tmppart[3] : 0);
 if ($tmpval <= 340) { $colortextbacktab='FFFFFF'; }
 else { $colortextbacktab='111111'; }
 

From 7ae405a254fb028b735faa9191a19529b8b7d5a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Tue, 2 May 2017 14:08:20 +0200
Subject: [PATCH 162/505] Corrected PHP7 warnings for several PDF document
 models

---
 htdocs/core/modules/facture/doc/pdf_crabe.modules.php           | 2 +-
 htdocs/core/modules/propale/doc/pdf_azur.modules.php            | 2 +-
 htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php | 2 +-
 .../core/modules/supplier_proposal/doc/pdf_aurore.modules.php   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
index d50ddcfb2a0..52971f76770 100644
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -585,7 +585,7 @@ class pdf_crabe extends ModelePDFFactures
 						$this->localtax2[$localtax2_type][$localtax2_rate]+=$localtax2ligne;
 
 					if (($object->lines[$i]->info_bits & 0x01) == 0x01) $vatrate.='*';
-					if (! isset($this->tva[$vatrate])) 				$this->tva[$vatrate]='';
+					if (! isset($this->tva[$vatrate])) 				$this->tva[$vatrate]=0;
 					$this->tva[$vatrate] += $tvaligne;
 
 					if ($posYAfterImage > $posYAfterDescription) $nexY=$posYAfterImage;
diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
index 000395a4fd4..f0fe0c33c51 100644
--- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
@@ -574,7 +574,7 @@ class pdf_azur extends ModelePDFPropales
 						$this->localtax2[$localtax2_type][$localtax2_rate]+=$localtax2ligne;
 
 					if (($object->lines[$i]->info_bits & 0x01) == 0x01) $vatrate.='*';
-					if (! isset($this->tva[$vatrate]))				$this->tva[$vatrate]='';
+					if (! isset($this->tva[$vatrate]))				$this->tva[$vatrate]=0;
 					$this->tva[$vatrate] += $tvaligne;
 
 					if ($posYAfterImage > $posYAfterDescription) $nexY=$posYAfterImage;
diff --git a/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php b/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
index ba9e53bcc4d..fdf4f07cc86 100644
--- a/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
+++ b/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
@@ -466,7 +466,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 						$this->localtax2[$localtax2_type][$localtax2_rate]+=$localtax2ligne;
 
 					if (($object->lines[$i]->info_bits & 0x01) == 0x01) $vatrate.='*';
-					if (! isset($this->tva[$vatrate])) 				$this->tva[$vatrate]='';
+					if (! isset($this->tva[$vatrate])) 				$this->tva[$vatrate]=0;
 					$this->tva[$vatrate] += $tvaligne;
 
 
diff --git a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
index bc78730ba57..3a3c904e74a 100644
--- a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
+++ b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
@@ -489,7 +489,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 						$this->localtax2[$localtax2_type][$localtax2_rate]+=$localtax2ligne;
 
 					if (($object->lines[$i]->info_bits & 0x01) == 0x01) $vatrate.='*';
-					if (! isset($this->tva[$vatrate]))				$this->tva[$vatrate]='';
+					if (! isset($this->tva[$vatrate]))				$this->tva[$vatrate]=0;
 					$this->tva[$vatrate] += $tvaligne;
 
 					if ($posYAfterImage > $posYAfterDescription) $nexY=$posYAfterImage;

From ad095d7fb24752c60085f54c44ce9604545970bd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 2 May 2017 14:26:51 +0200
Subject: [PATCH 163/505] NEW Can set margins of PDFs

---
 htdocs/admin/pdf.php | 45 +++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 42 insertions(+), 3 deletions(-)

diff --git a/htdocs/admin/pdf.php b/htdocs/admin/pdf.php
index b0c32a344ff..2e650c75696 100644
--- a/htdocs/admin/pdf.php
+++ b/htdocs/admin/pdf.php
@@ -42,15 +42,25 @@ $langs->load("members");
 if (! $user->admin) accessforbidden();
 
 $action = GETPOST('action','alpha');
+$cancel = GETPOST('cancel','alpha');
+
 
 /*
  * Actions
  */
 
+if ($cancel) {
+    $action='';
+}
+
 if ($action == 'update')
 {
 	dolibarr_set_const($db, "MAIN_PDF_FORMAT",    $_POST["MAIN_PDF_FORMAT"],'chaine',0,'',$conf->entity);
-
+	
+	dolibarr_set_const($db, "MAIN_PDF_MARGIN_LEFT",    $_POST["MAIN_PDF_MARGIN_LEFT"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_PDF_MARGIN_RIGHT",   $_POST["MAIN_PDF_MARGIN_RIGHT"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_PDF_MARGIN_TOP",     $_POST["MAIN_PDF_MARGIN_TOP"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_PDF_MARGIN_BOTTOM",  $_POST["MAIN_PDF_MARGIN_BOTTOM"],'chaine',0,'',$conf->entity);
 
     dolibarr_set_const($db, "MAIN_PROFID1_IN_ADDRESS",    $_POST["MAIN_PROFID1_IN_ADDRESS"],'chaine',0,'',$conf->entity);
 	dolibarr_set_const($db, "MAIN_PROFID2_IN_ADDRESS",    $_POST["MAIN_PROFID2_IN_ADDRESS"],'chaine',0,'',$conf->entity);
@@ -133,7 +143,20 @@ if ($action == 'edit')	// Edit
     print $formadmin->select_paper_format($selected,'MAIN_PDF_FORMAT');
     print '</td></tr>';
 
-	print '</table>';
+    print '<tr class="oddeven"><td>'.$langs->trans("MAIN_PDF_MARGIN_LEFT").'</td><td>';
+    print '<input type="text" class="maxwidth50" name="MAIN_PDF_MARGIN_LEFT" value="'.(empty($conf->global->MAIN_PDF_MARGIN_LEFT)?10:$conf->global->MAIN_PDF_MARGIN_LEFT).'">';
+    print '</td></tr>';
+    print '<tr class="oddeven"><td>'.$langs->trans("MAIN_PDF_MARGIN_RIGHT").'</td><td>';
+    print '<input type="text" class="maxwidth50" name="MAIN_PDF_MARGIN_RIGHT" value="'.(empty($conf->global->MAIN_PDF_MARGIN_RIGHT)?10:$conf->global->MAIN_PDF_MARGIN_RIGHT).'">';
+    print '</td></tr>';
+    print '<tr class="oddeven"><td>'.$langs->trans("MAIN_PDF_MARGIN_TOP").'</td><td>';
+    print '<input type="text" class="maxwidth50" name="MAIN_PDF_MARGIN_TOP" value="'.(empty($conf->global->MAIN_PDF_MARGIN_TOP)?10:$conf->global->MAIN_PDF_MARGIN_TOP).'">';
+    print '</td></tr>';
+    print '<tr class="oddeven"><td>'.$langs->trans("MAIN_PDF_MARGIN_BOTTOM").'</td><td>';
+    print '<input type="text" class="maxwidth50" name="MAIN_PDF_MARGIN_BOTTOM" value="'.(empty($conf->global->MAIN_PDF_MARGIN_BOTTOM)?10:$conf->global->MAIN_PDF_MARGIN_BOTTOM).'">';
+    print '</td></tr>';
+    
+    print '</table>';
 
 	print '<br>';
 
@@ -270,7 +293,9 @@ if ($action == 'edit')	// Edit
 	print '</table>';
 
     print '<br><div class="center">';
-    print '<input class="button" type="submit" value="'.$langs->trans("Save").'">';
+    print '<input class="button" type="submit" name="save" value="'.$langs->trans("Save").'">';
+    print ' &nbsp; ';
+    print '<input class="button" type="submit" name="cancel" value="'.$langs->trans("Cancel").'">';
     print '</div>';
 
     print '</form>';
@@ -314,6 +339,20 @@ else	// Show
     print $pdfformatlabel;
     print '</td></tr>';
 
+    print '<tr class="oddeven"><td>'.$langs->trans("MAIN_PDF_MARGIN_LEFT").'</td><td>';
+    print empty($conf->global->MAIN_PDF_MARGIN_LEFT)?10:$conf->global->MAIN_PDF_MARGIN_LEFT;
+    print '</td></tr>';
+    print '<tr class="oddeven"><td>'.$langs->trans("MAIN_PDF_MARGIN_RIGHT").'</td><td>';
+    print empty($conf->global->MAIN_PDF_MARGIN_RIGHT)?10:$conf->global->MAIN_PDF_MARGIN_RIGHT;
+    print '</td></tr>';
+    print '<tr class="oddeven"><td>'.$langs->trans("MAIN_PDF_MARGIN_TOP").'</td><td>';
+    print empty($conf->global->MAIN_PDF_MARGIN_TOP)?10:$conf->global->MAIN_PDF_MARGIN_TOP;
+    print '</td></tr>';
+    print '<tr class="oddeven"><td>'.$langs->trans("MAIN_PDF_MARGIN_BOTTOM").'</td><td>';
+    print empty($conf->global->MAIN_PDF_MARGIN_BOTTOM)?10:$conf->global->MAIN_PDF_MARGIN_BOTTOM;
+    print '</td></tr>';
+    
+    
 	print '</table>';
 
 	print '<br>';

From 6138d197e4c7290e0a7a5ca3f5ecef45facff734 Mon Sep 17 00:00:00 2001
From: alexis Algoud <alexis@atm-consulting.fr>
Date: Tue, 2 May 2017 15:19:55 +0200
Subject: [PATCH 164/505] FIX major issues for inventory - Move all needed
 declaration from coreobject to commonobject for updateCommon, fetchCommon,
 deleteCommon, createCommon - Just leave method for child object into
 coreobject, check later if is useless - debug inventory card, PHP 7.0
 compatibility - activate rights for inventory into stock module - add
 inventory options into stock admin module

---
 htdocs/admin/inventory.php                    | 152 --------
 htdocs/admin/stock.php                        |  56 +++
 htdocs/core/class/commonobject.class.php      | 330 +++++++++++++++---
 htdocs/core/class/coreobject.class.php        | 255 +-------------
 htdocs/core/modules/modStock.class.php        |  65 +---
 .../product/inventory/ajax/ajax.inventory.php |  10 +-
 htdocs/product/inventory/card.php             |   7 +-
 7 files changed, 370 insertions(+), 505 deletions(-)
 delete mode 100644 htdocs/admin/inventory.php

diff --git a/htdocs/admin/inventory.php b/htdocs/admin/inventory.php
deleted file mode 100644
index 2548494fc79..00000000000
--- a/htdocs/admin/inventory.php
+++ /dev/null
@@ -1,152 +0,0 @@
-<?php
-/* <one line to give the program's name and a brief idea of what it does.>
- * Copyright (C) 2015 ATM Consulting <support@atm-consulting.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
- * 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		admin/inventory.php
- * 	\ingroup	inventory
- * 	\brief		This file is an example module setup page
- * 				Put some comments here
- */
-// Dolibarr environment
-require '../main.inc.php';
-
-
-// Libraries
-require_once DOL_DOCUMENT_ROOT . "/core/lib/admin.lib.php";
-require_once DOL_DOCUMENT_ROOT .'/inventory/lib/inventory.lib.php';
-
-// Translations
-$langs->load("stock");
-$langs->load("inventory");
-
-// Access control
-if (! $user->admin) {
-    accessforbidden();
-}
-
-// Parameters
-$action = GETPOST('action', 'alpha');
-
-/*
- * Actions
- */
-if (preg_match('/set_(.*)/',$action,$reg))
-{
-	$code=$reg[1];
-	if (dolibarr_set_const($db, $code, GETPOST($code), 'chaine', 0, '', $conf->entity) > 0)
-	{
-		header("Location: ".$_SERVER["PHP_SELF"]);
-		exit;
-	}
-	else
-	{
-		dol_print_error($db);
-	}
-}
-	
-if (preg_match('/del_(.*)/',$action,$reg))
-{
-	$code=$reg[1];
-	if (dolibarr_del_const($db, $code, 0) > 0)
-	{
-		Header("Location: ".$_SERVER["PHP_SELF"]);
-		exit;
-	}
-	else
-	{
-		dol_print_error($db);
-	}
-}
-
-/*
- * View
- */
-$page_name = "inventorySetup";
-llxHeader('', $langs->trans($page_name));
-
-// Subheader
-$linkback = '<a href="' . DOL_URL_ROOT . '/admin/modules.php">'
-    . $langs->trans("BackToModuleList") . '</a>';
-print_fiche_titre($langs->trans($page_name), $linkback);
-
-// Configuration header
-$head = inventoryAdminPrepareHead();
-dol_fiche_head(
-    $head,
-    'settings',
-    $langs->trans("Module104420Name"),
-    0,
-    "inventory@inventory"
-);
-
-// Setup page goes here
-$form=new Form($db);
-$var=false;
-print '<table class="noborder" width="100%">';
-print '<tr class="liste_titre">';
-print '<td>'.$langs->trans("Parameters").'</td>'."\n";
-print '<td align="center" width="20">&nbsp;</td>';
-print '<td align="center" width="100">'.$langs->trans("Value").'</td>'."\n";
-
-// Example with a yes / no select
-$var=!$var;
-print '<tr '.$bc[$var].'>';
-print '<td>'.$langs->trans("INVENTORY_DISABLE_VIRTUAL").'</td>';
-print '<td align="center" width="20">&nbsp;</td>';
-print '<td align="right" width="300">';
-print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print '<input type="hidden" name="action" value="set_INVENTORY_DISABLE_VIRTUAL">';
-print $form->selectyesno("INVENTORY_DISABLE_VIRTUAL",$conf->global->INVENTORY_DISABLE_VIRTUAL,1);
-print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
-print '</form>';
-print '</td></tr>';
-
-// Example with a yes / no select
-$var=!$var;
-print '<tr '.$bc[$var].'>';
-print '<td>'.$langs->trans("INVENTORY_USE_MIN_PA_IF_NO_LAST_PA").'</td>';
-print '<td align="center" width="20">&nbsp;</td>';
-print '<td align="right" width="300">';
-print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print '<input type="hidden" name="action" value="set_INVENTORY_USE_MIN_PA_IF_NO_LAST_PA">';
-print $form->selectyesno("INVENTORY_USE_MIN_PA_IF_NO_LAST_PA",$conf->global->INVENTORY_USE_MIN_PA_IF_NO_LAST_PA,1);
-print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
-print '</form>';
-print '</td></tr>';
-
-// Example with a yes / no select
-$var=!$var;
-print '<tr '.$bc[$var].'>';
-print '<td>'.$langs->trans("INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT").'</td>';
-print '<td align="center" width="20">&nbsp;</td>';
-print '<td align="right" width="300">';
-print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print '<input type="hidden" name="action" value="set_INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT">';
-print $form->selectyesno("INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT",$conf->global->INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT,1);
-print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
-print '</form>';
-print '</td></tr>';
-
-print '</table>';
-
-llxFooter();
-
-$db->close();
\ No newline at end of file
diff --git a/htdocs/admin/stock.php b/htdocs/admin/stock.php
index 1c5a92fb0e8..c8204f213c2 100644
--- a/htdocs/admin/stock.php
+++ b/htdocs/admin/stock.php
@@ -432,6 +432,61 @@ if ($virtualdiffersfromphysical)
 }
 
 
+print '<br />';
+if ($conf->global->MAIN_LEVEL_FEATURES >= 2)
+{
+	$var=false;
+	print '<table class="noborder" width="100%">';
+	print '<tr class="liste_titre">';
+	print '<td>'.$langs->trans("Inventory").'</td>'."\n";
+	print '<td align="center" width="20">&nbsp;</td>';
+	print '<td align="center" width="100">&nbsp;</td>'."\n";
+	
+	// Example with a yes / no select
+	$var=!$var;
+	print '<tr '.$bc[$var].'>';
+	print '<td>'.$langs->trans("INVENTORY_DISABLE_VIRTUAL").'</td>';
+	print '<td align="center" width="20">&nbsp;</td>';
+	print '<td align="right" width="300">';
+	print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
+	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+	print '<input type="hidden" name="action" value="set_INVENTORY_DISABLE_VIRTUAL">';
+	print $form->selectyesno("INVENTORY_DISABLE_VIRTUAL",$conf->global->INVENTORY_DISABLE_VIRTUAL,1);
+	print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+	print '</form>';
+	print '</td></tr>';
+	
+	// Example with a yes / no select
+	$var=!$var;
+	print '<tr '.$bc[$var].'>';
+	print '<td>'.$langs->trans("INVENTORY_USE_MIN_PA_IF_NO_LAST_PA").'</td>';
+	print '<td align="center" width="20">&nbsp;</td>';
+	print '<td align="right" width="300">';
+	print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
+	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+	print '<input type="hidden" name="action" value="set_INVENTORY_USE_MIN_PA_IF_NO_LAST_PA">';
+	print $form->selectyesno("INVENTORY_USE_MIN_PA_IF_NO_LAST_PA",$conf->global->INVENTORY_USE_MIN_PA_IF_NO_LAST_PA,1);
+	print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+	print '</form>';
+	print '</td></tr>';
+	
+	// Example with a yes / no select
+	$var=!$var;
+	print '<tr '.$bc[$var].'>';
+	print '<td>'.$langs->trans("INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT").'</td>';
+	print '<td align="center" width="20">&nbsp;</td>';
+	print '<td align="right" width="300">';
+	print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
+	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+	print '<input type="hidden" name="action" value="set_INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT">';
+	print $form->selectyesno("INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT",$conf->global->INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT,1);
+	print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+	print '</form>';
+	print '</td></tr>';
+	
+	print '</table>';
+}
+
 $var=true;
 print '<table class="noborder" width="100%">';
 
@@ -508,6 +563,7 @@ if ($conf->global->PRODUIT_SOUSPRODUITS)
 
 print '</table>';
 
+
 llxFooter();
 
 $db->close();
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 5e5c13056e7..582e00d29fa 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -11,6 +11,7 @@
  * Copyright (C) 2012      Cedric Salvador      <csalvador@gpcsolutions.fr>
  * Copyright (C) 2015      Alexandre Spangaro   <aspangaro.dolibarr@gmail.com>
  * Copyright (C) 2016      Bahfir abbes         <dolipar@dolipar.org>
+ * Copyright (C) 2017      ATM Consulting       <support@atm-consulting.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
@@ -4662,7 +4663,159 @@ abstract class CommonObject
 		return $buyPrice;
 	}
 	
+	/**
+	 * Function test if type is date
+	 *
+	 * @param   array   $info   content informations of field
+	 * @return                  bool
+	 */
+	protected function is_date($info)
+	{
+		if(isset($info['type']) && $info['type']=='date') return true;
+		else return false;
+	}
 	
+	/**
+	 * Function test if type is array
+	 *
+	 * @param   array   $info   content informations of field
+	 * @return                  bool
+	 */
+	protected function is_array($info)
+	{
+		if(is_array($info))
+		{
+			if(isset($info['type']) && $info['type']=='array') return true;
+			else return false;
+		}
+		else return false;
+	}
+	
+	/**
+	 * Function test if type is null
+	 *
+	 * @param   array   $info   content informations of field
+	 * @return                  bool
+	 */
+	protected function is_null($info)
+	{
+		if(is_array($info))
+		{
+			if(isset($info['type']) && $info['type']=='null') return true;
+			else return false;
+		}
+		else return false;
+	}
+	
+	/**
+	 * Function test if type is integer
+	 *
+	 * @param   array   $info   content informations of field
+	 * @return                  bool
+	 */
+	protected function is_int($info)
+	{
+		if(is_array($info))
+		{
+			if(isset($info['type']) && ($info['type']=='int' || $info['type']=='integer' )) return true;
+			else return false;
+		}
+		else return false;
+	}
+	
+	/**
+	 * Function test if type is float
+	 *
+	 * @param   array   $info   content informations of field
+	 * @return                  bool
+	 */
+	protected function is_float($info)
+	{
+		if(is_array($info))
+		{
+			if(isset($info['type']) && $info['type']=='float') return true;
+			else return false;
+		}
+		else return false;
+	}
+	
+	/**
+	 * Function test if type is text
+	 *
+	 * @param   array   $info   content informations of field
+	 * @return                  bool
+	 */
+	protected function is_text($info)
+	{
+		if(is_array($info))
+		{
+			if(isset($info['type']) && $info['type']=='text') return true;
+			else return false;
+		}
+		else return false;
+	}
+	
+	/**
+	 * Function test if is indexed
+	 *
+	 * @param   array   $info   content informations of field
+	 * @return                  bool
+	 */
+	protected function is_index($info)
+	{
+		if(is_array($info))
+		{
+			if(isset($info['index']) && $info['index']==true) return true;
+			else return false;
+		}
+		else return false;
+	}
+	
+	/**
+	 * Function to prepare the values to insert
+	 *
+	 * @return array
+	 */
+	private function set_save_query()
+	{
+		$query=array();
+		foreach ($this->fields as $field=>$info)
+		{
+			if($this->is_date($info))
+			{
+				if(empty($this->{$field}))
+				{
+					$query[$field] = NULL;
+				}
+				else
+				{
+					$query[$field] = $this->db->idate($this->{$field});
+				}
+			}
+			else if($this->is_array($info))
+			{
+				$query[$field] = serialize($this->{$field});
+			}
+			else if($this->is_int($info))
+			{
+				$query[$field] = (int) price2num($this->{$field});
+			}
+			else if($this->is_float($info))
+			{
+				$query[$field] = (double) price2num($this->{$field});
+			}
+			elseif($this->is_null($info))
+			{
+				$query[$field] = (is_null($this->{$field}) || (empty($this->{$field}) && $this->{$field}!==0 && $this->{$field}!=='0') ? null : $this->{$field});
+			}
+			else
+			{
+				$query[$field] = $this->{$field};
+			}
+		}
+		
+		return $query;
+	}
 
 	/**
 	 * Create object into database
@@ -4674,28 +4827,82 @@ abstract class CommonObject
 	 */
 	public function createCommon(User $user, $notrigger = false)
 	{
-	    foreach ($this->fields as $k => $v) {
 	    
-	        $keys[] = $k;
-	        $values[] = $this->quote($v);
-	         
+	    $fields = array_merge(array('datec'=>$this->db->idate(dol_now())), $this->set_save_query());
+	    
+	    foreach ($fields as $k => $v) {
+	    	
+	    	$keys[] = $k;
+	    	$values[] = $this->quote($v);
+	    	
 	    }
-	    
-	    $sql = 'INSERT INTO '.MAIN_DB_PREFIX.$table.'
+	    $sql = 'INSERT INTO '.MAIN_DB_PREFIX.$this->table_element.'
 					( '.implode( ",", $keys ).' )
 					VALUES ( '.implode( ",", $values ).' ) ';
-	    
-	    $res = $this->query($sql);
+	    $res = $this->db->query( $sql );
 	    if($res===false) {
-	    
-	        return false;
+	    	
+	    	return false;
 	    }
 	    
 	    // TODO Add triggers
-	    	  
-	    return true;	    
+	    
+	    return true;
+	    
 	}
 	
+	/**
+	 * Function to load data into current object this
+	 *
+	 * @param   stdClass    $obj    Contain data of object from database
+	 */
+	private function set_vars_by_db(&$obj)
+	{
+		foreach ($this->fields as $field => $info)
+		{
+			if($this->is_date($info))
+			{
+				if(empty($obj->{$field}) || $obj->{$field} === '0000-00-00 00:00:00' || $obj->{$field} === '1000-01-01 00:00:00') $this->{$field} = 0;
+				else $this->{$field} = strtotime($obj->{$field});
+			}
+			elseif($this->is_array($info))
+			{
+				$this->{$field} = @unserialize($obj->{$field});
+				// Hack for data not in UTF8
+				if($this->{$field } === FALSE) @unserialize(utf8_decode($obj->{$field}));
+			}
+			elseif($this->is_int($info))
+			{
+				$this->{$field} = (int) $obj->{$field};
+			}
+			elseif($this->is_float($info))
+			{
+				$this->{$field} = (double) $obj->{$field};
+			}
+			elseif($this->is_null($info))
+			{
+				$val = $obj->{$field};
+				// zero is not null
+				$this->{$field} = (is_null($val) || (empty($val) && $val!==0 && $val!=='0') ? null : $val);
+			}
+			else
+			{
+				$this->{$field} = $obj->{$field};
+			}
+			
+		}
+	}
+	
+	/**
+	 * Function to concat keys of fields
+	 *
+	 * @return string
+	 */
+	private function get_field_list()
+	{
+		$keys = array_keys($this->fields);
+		return implode(',', $keys);
+	}
 	
 	/**
 	 * Load object in memory from the database
@@ -4708,6 +4915,32 @@ abstract class CommonObject
 	public function fetchCommon($id, $ref = null)
 	{
 	    
+		if (empty($id) && empty($ref)) return false;
+		
+		$sql = 'SELECT '.$this->get_field_list().', datec, tms';
+		$sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element;
+		
+		if(!empty($id)) $sql.= ' WHERE rowid = '.$id;
+		else  $sql.= ' WHERE ref = \''.$this->quote($ref).'\'';
+		
+		$res = $this->db->query($sql);
+		if($obj = $this->db->fetch_object($res))
+		{
+			$this->id = $id;
+			$this->set_vars_by_db($obj);
+			
+			$this->datec = $this->db->idate($obj->datec);
+			$this->tms = $this->db->idate($obj->tms);
+			
+			return $this->id;
+		}
+		else
+		{
+			$this->error = $this->db->lasterror();
+			$this->errors[] = $this->error;
+			return -1;
+		}
+		
 	}
 
 	/**
@@ -4720,34 +4953,36 @@ abstract class CommonObject
 	 */
 	public function updateCommon(User $user, $notrigger = false)
 	{
-	    foreach ($this->fields as $k => $v) {
-	    
-	        if (is_array($key)){
-	            $i=array_search($k, $key);
-	            if ( $i !== false) {
-	                $where[] = $key[$i].'=' . $this->quote( $v ) ;
-	                continue;
-	            }
-	        } else {
-	            if ( $k == $key) {
-	                $where[] = $k.'=' .$this->quote( $v ) ;
-	                continue;
-	            }
-	        }
-	    
-	        $tmp[] = $k.'='.$this->quote($v);
-	    }
-	    $sql = 'UPDATE '.MAIN_DB_PREFIX.$table.' SET '.implode( ',', $tmp ).' WHERE ' . implode(' AND ',$where) ;
-	    $res = $this->query( $sql );
-	    
-	    if($res===false) {
-	        //error
-	        return false;
-	    }
-	    
-	    // TODO Add triggers
-	    
-	    return true;	    
+		$fields = $this->set_save_query();
+		
+		foreach ($fields as $k => $v) {
+			
+			if (is_array($key)){
+				$i=array_search($k , $key );
+				if ( $i !== false) {
+					$where[] = $key[$i].'=' . $this->quote( $v ) ;
+					continue;
+				}
+			} else {
+				if ( $k == $key) {
+					$where[] = $k.'=' .$this->quote( $v ) ;
+					continue;
+				}
+			}
+			
+			$tmp[] = $k.'='.$this->quote($v);
+		}
+		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element.' SET '.implode( ',', $tmp ).' WHERE rowid='.$this->id ;
+		$res = $this->db->query( $sql );
+		
+		if($res===false) {
+			//error
+			return false;
+		}
+		
+		// TODO Add triggers
+		
+		return true;
 	}
 	
 	/**
@@ -4760,7 +4995,16 @@ abstract class CommonObject
 	 */
 	public function deleteCommon(User $user, $notrigger = false)
 	{
-	    
+		$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$this->table_element.' WHERE rowid='.$this->id;
+		
+		$res = $this->db->query( $sql );
+		if($res===false) {
+			return false;
+		}
+		
+		// TODO Add triggers
+		
+		return true;
 	}
 
 	/**
@@ -4769,11 +5013,11 @@ abstract class CommonObject
 	 * @param string|int	$value	value to protect
 	 * @return string|int
 	 */
-	function quote($value) {
+	protected function quote($value) {
 	
 	    if(is_null($value)) return 'NULL';
 	    else if(is_numeric($value)) return $value;
-	    else return "'".$this->escape( $value )."'";
+	    else return "'".$this->db->escape( $value )."'";
 	
 	}
 	
diff --git a/htdocs/core/class/coreobject.class.php b/htdocs/core/class/coreobject.class.php
index 8aa0cfe2ad6..c86a1083519 100644
--- a/htdocs/core/class/coreobject.class.php
+++ b/htdocs/core/class/coreobject.class.php
@@ -97,216 +97,6 @@ class CoreObject extends CommonObject
         }
 	}
 
-    /**
-     * Function test if type is date
-     *
-     * @param   array   $info   content informations of field
-     * @return                  bool
-     */
-    private function is_date($info)
-    {
-		if(isset($info['type']) && $info['type']=='date') return true;
-		else return false;
-	}
-
-    /**
-     * Function test if type is array
-     *
-     * @param   array   $info   content informations of field
-     * @return                  bool
-     */
-	private function is_array($info)
-    {
-	  	if(is_array($info))
-	  	{
-			if(isset($info['type']) && $info['type']=='array') return true;
-			else return false;
-		}
-		else return false;
-	}
-
-    /**
-     * Function test if type is null
-     *
-     * @param   array   $info   content informations of field
-     * @return                  bool
-     */
-	private function is_null($info)
-    {
-		if(is_array($info))
-		{
-			if(isset($info['type']) && $info['type']=='null') return true;
-			else return false;
-		}
-		else return false;
-	}
-
-    /**
-     * Function test if type is integer
-     *
-     * @param   array   $info   content informations of field
-     * @return                  bool
-     */
-	private function is_int($info)
-    {
-		if(is_array($info))
-		{
-			if(isset($info['type']) && ($info['type']=='int' || $info['type']=='integer' )) return true;
-			else return false;
-		}
-		else return false;
-	}
-
-    /**
-     * Function test if type is float
-     *
-     * @param   array   $info   content informations of field
-     * @return                  bool
-     */
-	private function is_float($info)
-    {
-		if(is_array($info))
-		{
-			if(isset($info['type']) && $info['type']=='float') return true;
-			else return false;
-		}
-		else return false;
-	}
-
-    /**
-     * Function test if type is text
-     *
-     * @param   array   $info   content informations of field
-     * @return                  bool
-     */
-	private function is_text($info)
-    {
-	  	if(is_array($info))
-	  	{
-			if(isset($info['type']) && $info['type']=='text') return true;
-			else return false;
-		}
-		else return false;
-	}
-
-    /**
-     * Function test if is indexed
-     *
-     * @param   array   $info   content informations of field
-     * @return                  bool
-     */
-	private function is_index($info)
-    {
-	  	if(is_array($info))
-	  	{
-			if(isset($info['index']) && $info['index']==true) return true;
-			else return false;
-		}
-		else return false;
-	}
-
-
-    /**
-     * Function to prepare the values to insert
-     *
-     * @return array
-     */
-    private function set_save_query()
-    {
-		$query=array();
-		foreach ($this->fields as $field=>$info)
-		{
-			if($this->is_date($info))
-			{
-				if(empty($this->{$field}))
-				{
-					$query[$field] = NULL;
-				}
-				else
-                {
-					$query[$field] = $this->db->idate($this->{$field});
-				}
-		  	}
-		  	else if($this->is_array($info))
-		  	{
-                $query[$field] = serialize($this->{$field});
-		  	}
-		  	else if($this->is_int($info))
-		  	{
-		    	$query[$field] = (int) price2num($this->{$field});
-		  	}
-		  	else if($this->is_float($info))
-		  	{
-		    	$query[$field] = (double) price2num($this->{$field});
-		  	}
-		  	elseif($this->is_null($info))
-            {
-		  		$query[$field] = (is_null($this->{$field}) || (empty($this->{$field}) && $this->{$field}!==0 && $this->{$field}!=='0') ? null : $this->{$field});
-		    }
-		    else
-            {
-		       $query[$field] = $this->{$field};
-		    }
-	    }
-	
-		return $query;
-	}
-
-
-    /**
-     * Function to concat keys of fields
-     *
-     * @return string
-     */
-    private function get_field_list()
-    {
-		$keys = array_keys($this->fields);
-	    return implode(',', $keys);
-	}
-
-
-    /**
-     * Function to load data into current object this
-     *
-     * @param   stdClass    $obj    Contain data of object from database
-     */
-    private function set_vars_by_db(&$obj)
-    {
-		foreach ($this->fields as $field => $info)
-		{
-			if($this->is_date($info))
-			{
-				if(empty($obj->{$field}) || $obj->{$field} === '0000-00-00 00:00:00' || $obj->{$field} === '1000-01-01 00:00:00') $this->{$field} = 0;
-				else $this->{$field} = strtotime($obj->{$field});
-			}
-			elseif($this->is_array($info))
-            {
-				$this->{$field} = @unserialize($obj->{$field});
-				// Hack for data not in UTF8
-				if($this->{$field } === FALSE) @unserialize(utf8_decode($obj->{$field}));
-			}
-			elseif($this->is_int($info))
-            {
-				$this->{$field} = (int) $obj->{$field};
-			}
-			elseif($this->is_float($info))
-            {
-				$this->{$field} = (double) $obj->{$field};
-			}
-			elseif($this->is_null($info))
-            {
-				$val = $obj->{$field};
-				// zero is not null 
-				$this->{$field} = (is_null($val) || (empty($val) && $val!==0 && $val!=='0') ? null : $val);
-			}
-			else
-            {
-				$this->{$field} = $obj->{$field};
-			}
-
-		}
-	}
-
     /**
      *	Get object and children from database
      *
@@ -316,31 +106,14 @@ class CoreObject extends CommonObject
      */
 	public function fetch($id, $loadChild = true)
     {
-		if (empty($id)) return false;
-
-		$sql = 'SELECT '.$this->get_field_list().', datec, tms';
-		$sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element;
-        $sql.= ' WHERE rowid = '.$id;
 		
-		$res = $this->db->query($sql);
-		if($obj = $this->db->fetch_object($res))
-		{
-            $this->id = $id;
-            $this->set_vars_by_db($obj);
-
-            $this->datec = $this->db->idate($obj->datec);
-            $this->tms = $this->db->idate($obj->tms);
-
-            if ($loadChild) $this->fetchChild();
-
-            return $this->id;
-		}
-		else
-        {
-            $this->error = $this->db->lasterror();
-            $this->errors[] = $this->error;
-            return -1;
-		}
+    	$res = $this->fetchCommon($id);
+    	if($res>0) {
+    		if ($loadChild) $this->fetchChild();
+    	}
+    	
+    	return $res;
+		
 	}
 
 
@@ -473,10 +246,7 @@ class CoreObject extends CommonObject
         $error = 0;
         $this->db->begin();
 
-        $query = $this->set_save_query();
-        $query['rowid'] = $this->id;
-
-        $res = $this->db->update($this->table_element, $query, array('rowid'));
+        $res = $this->updateCommon($user);
         if ($res)
         {
             $result = $this->call_trigger(strtoupper($this->element). '_UPDATE', $user);
@@ -516,10 +286,7 @@ class CoreObject extends CommonObject
         $error = 0;
         $this->db->begin();
 
-		$query = $this->set_save_query();
-		$query['datec'] = date("Y-m-d H:i:s", dol_now());
-		
-		$res = $this->db->insert($this->table_element, $query);
+        $res = $this->createCommon($user);
 		if($res)
 		{
 			$this->id = $this->db->last_insert_id($this->table_element);
@@ -565,7 +332,7 @@ class CoreObject extends CommonObject
 
         if (!$error)
         {
-            $this->db->delete($this->table_element, array('rowid' => $this->id), array('rowid'));
+            $this->deleteCommon($user);
             if($this->withChild && !empty($this->childtables))
             {
                 foreach($this->childtables as &$childTable)
@@ -669,5 +436,5 @@ class CoreObject extends CommonObject
 
 		return 1;
 	}
-	
+
 }
diff --git a/htdocs/core/modules/modStock.class.php b/htdocs/core/modules/modStock.class.php
index cfdc6db298c..ea181f72a41 100644
--- a/htdocs/core/modules/modStock.class.php
+++ b/htdocs/core/modules/modStock.class.php
@@ -117,91 +117,42 @@ class modStock extends DolibarrModules
 		$this->rights[4][4] = 'mouvement';
 		$this->rights[4][5] = 'creer';
 
-		/*
-		$this->rights[$r][0] = $this->numero + $r;	// Permission id (must not be already used)
+		
+		$this->rights[$r][0] = 1006;
 		$this->rights[$r][1] = 'inventoryReadPermission';	// Permission label
-		$this->rights[$r][3] = 1; 					// Permission by default for new user (0/1)
+		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
 		$this->rights[$r][4] = 'read';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		$r++;
 		
-		$this->rights[$r][0] = $this->numero + $r;	// Permission id (must not be already used)
+		$this->rights[$r][0] = 1007;
 		$this->rights[$r][1] = 'inventoryCreatePermission';	// Permission label
 		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
 		$this->rights[$r][4] = 'create';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		$r++;
 		
-		$this->rights[$r][0] = $this->numero + $r;	// Permission id (must not be already used)
+		$this->rights[$r][0] = 1008;
 		$this->rights[$r][1] = 'inventoryWritePermission';	// Permission label
 		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
 		$this->rights[$r][4] = 'write';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		$r++;
 		
-		$this->rights[$r][0] = $this->numero + $r;	// Permission id (must not be already used)
+		$this->rights[$r][0] = 1009;
 		$this->rights[$r][1] = 'inventoryValidatePermission';	// Permission label
 		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
 		$this->rights[$r][4] = 'validate';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		$r++;
 		
-		$this->rights[$r][0] = $this->numero + $r;	// Permission id (must not be already used)
+		$this->rights[$r][0] = 1010;
 		$this->rights[$r][1] = 'inventoryChangePMPPermission';	// Permission label
 		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
 		$this->rights[$r][4] = 'changePMP';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		$r++;
-		*/
+		
 		
 		// Main menu entries
 		$this->menu = array();			// List of menus to add
 		$r=0;
 		
-		/*
-		$this->menu[$r]=array(
-		    'fk_menu'=>'fk_mainmenu=products',			                // Put 0 if this is a top menu
-		    'type'=>'left',			                // This is a Top menu entry
-		    'titre'=>'Inventory',
-		    'mainmenu'=>'products',
-		    'leftmenu'=>'inventory_left',
-		    'url'=>'/inventory/list.php',
-		    'langs'=>'inventory',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-		    'position'=>100+$r,
-		    'enabled'=>'$conf->inventory->enabled',	// Define condition to show or hide menu entry. Use '$conf->inventory->enabled' if entry must be visible if module is enabled.
-		    'perms'=>'$user->rights->inventory->read',			                // Use 'perms'=>'$user->rights->inventory->level1->level2' if you want your menu with a permission rules
-		    'target'=>'',
-		    'user'=>2
-		);				                // 0=Menu for internal users, 1=external users, 2=both
-		$r++;
-		
-		$this->menu[$r]=array(
-		    'fk_menu'=>'fk_mainmenu=products,fk_leftmenu=inventory_left',			                // Put 0 if this is a top menu
-		    'type'=>'left',			                // This is a Top menu entry
-		    'titre'=>'NewInventory',
-		    'mainmenu'=>'products',
-		    'leftmenu'=>'inventory_left_create',
-		    'url'=>'/inventory/inventory.php?action=create',
-		    'position'=>100+$r,
-		    'enabled'=>'$conf->inventory->enabled',	// Define condition to show or hide menu entry. Use '$conf->inventory->enabled' if entry must be visible if module is enabled.
-		    'perms'=>'$user->rights->inventory->create',			                // Use 'perms'=>'$user->rights->inventory->level1->level2' if you want your menu with a permission rules
-		    'target'=>'',
-		    'user'=>2
-		);				                // 0=Menu for internal users, 1=external users, 2=both
-		$r++;
-		
-		$this->menu[$r]=array(
-		    'fk_menu'=>'fk_mainmenu=products,fk_leftmenu=inventory_left',			                // Put 0 if this is a top menu
-		    'type'=>'left',			                // This is a Top menu entry
-		    'titre'=>'ListInventory',
-		    'mainmenu'=>'products',
-		    'leftmenu'=>'inventory_left_list',
-		    'url'=>'/inventory/list.php',
-		    'langs'=>'inventory',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-		    'position'=>100+$r,
-		    'enabled'=>'$conf->inventory->enabled',	// Define condition to show or hide menu entry. Use '$conf->inventory->enabled' if entry must be visible if module is enabled.
-		    'perms'=>'$user->rights->inventory->read',			                // Use 'perms'=>'$user->rights->inventory->level1->level2' if you want your menu with a permission rules
-		    'target'=>'',
-		    'user'=>2
-		);				                // 0=Menu for internal users, 1=external users, 2=both
-		$r++;
-		*/
-		
 		// Menus
 		//-------
 		$this->menu = 1;        // This module add menu entries. They are coded into menu manager.
diff --git a/htdocs/product/inventory/ajax/ajax.inventory.php b/htdocs/product/inventory/ajax/ajax.inventory.php
index c0d8443f433..4884d7ab065 100644
--- a/htdocs/product/inventory/ajax/ajax.inventory.php
+++ b/htdocs/product/inventory/ajax/ajax.inventory.php
@@ -2,14 +2,14 @@
 
     require '../../../main.inc.php';
     require_once DOL_DOCUMENT_ROOT.'/product/inventory/class/inventory.class.php';
-    
+  
     $get = GETPOST('get');
     $put = GETPOST('put');
     
     switch ($put)
     {
         case 'qty':
-            if (empty($user->rights->stock->write)) { echo -1; exit; }
+        	if (empty($user->rights->stock->creer)) { echo -1; exit; }
             
             $fk_det_inventory = GETPOST('fk_det_inventory');
             
@@ -17,7 +17,7 @@
             if( $det->fetch( $fk_det_inventory))
             {
                 $det->qty_view+=GETPOST('qty');
-                $det->update($user);
+                $res = $det->update($user);
                 
                 echo $det->qty_view;
             }
@@ -25,11 +25,11 @@
             {
                 echo -2;
             }            
-            
+           
             break;
 			
         case 'pmp':
-            if (!$user->rights->stock->write || !$user->rights->stock->changePMP) { echo -1; exit; }
+        	if (empty($user->rights->stock->creer) || empty($user->rights->stock->changePMP)) { echo -1; exit; }
             
             $fk_det_inventory = GETPOST('fk_det_inventory');
             
diff --git a/htdocs/product/inventory/card.php b/htdocs/product/inventory/card.php
index dc279cc0929..ad539532901 100644
--- a/htdocs/product/inventory/card.php
+++ b/htdocs/product/inventory/card.php
@@ -66,7 +66,7 @@ $extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php';  // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
 
 // Initialize technical object to manage hooks of modules. Note that conf->hooks_modules contains array array
-$hookmanager->initHooks(array('inventory'));
+$hookmanager->initHooks(array('inventorycard'));
 
 
 
@@ -84,7 +84,7 @@ if (empty($reshook))
     {
         if ($action != 'addlink')
         {
-            $urltogo=$backtopage?$backtopage:dol_buildpath('/mymodule/list.php',1);
+            $urltogo=$backtopage?$backtopage:dol_buildpath('/product/inventory/list.php',1);
             header("Location: ".$urltogo);
             exit;
         }
@@ -98,7 +98,7 @@ if (empty($reshook))
 	
 		if ($cancel)
 		{
-		    $urltogo=$backtopage?$backtopage:dol_buildpath('/mymodule/list.php',1);
+		    $urltogo=$backtopage?$backtopage:dol_buildpath('/product/inventory/list.php',1);
 		    header("Location: ".$urltogo);
 		    exit;
 		}
@@ -128,7 +128,6 @@ if (empty($reshook))
         	exit;
         }
         
-		break;
     }
     
     switch($action) {

From 12e91f1c1b9f5c02f0e47f6c33ea0cce7b26fafa Mon Sep 17 00:00:00 2001
From: alexis Algoud <alexis@atm-consulting.fr>
Date: Tue, 2 May 2017 15:25:30 +0200
Subject: [PATCH 165/505] fix rights inventory only for MAIN_LEVEL_FEATURES = 2

---
 htdocs/core/modules/modStock.class.php | 47 ++++++++++++--------------
 1 file changed, 22 insertions(+), 25 deletions(-)

diff --git a/htdocs/core/modules/modStock.class.php b/htdocs/core/modules/modStock.class.php
index ea181f72a41..e80966afb81 100644
--- a/htdocs/core/modules/modStock.class.php
+++ b/htdocs/core/modules/modStock.class.php
@@ -117,37 +117,34 @@ class modStock extends DolibarrModules
 		$this->rights[4][4] = 'mouvement';
 		$this->rights[4][5] = 'creer';
 
+		if ($conf->global->MAIN_LEVEL_FEATURES >= 2) {
 		
-		$this->rights[$r][0] = 1006;
-		$this->rights[$r][1] = 'inventoryReadPermission';	// Permission label
-		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
-		$this->rights[$r][4] = 'read';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-		$r++;
+		$this->rights[5][0] = 1006;
+		$this->rights[5][1] = 'inventoryReadPermission';	// Permission label
+		$this->rights[5][3] = 0; 					// Permission by default for new user (0/1)
+		$this->rights[5][4] = 'read';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		
-		$this->rights[$r][0] = 1007;
-		$this->rights[$r][1] = 'inventoryCreatePermission';	// Permission label
-		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
-		$this->rights[$r][4] = 'create';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-		$r++;
+		$this->rights[6][0] = 1007;
+		$this->rights[6][1] = 'inventoryCreatePermission';	// Permission label
+		$this->rights[6][3] = 0; 					// Permission by default for new user (0/1)
+		$this->rights[6][4] = 'create';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		
-		$this->rights[$r][0] = 1008;
-		$this->rights[$r][1] = 'inventoryWritePermission';	// Permission label
-		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
-		$this->rights[$r][4] = 'write';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-		$r++;
+		$this->rights[7][0] = 1008;
+		$this->rights[7][1] = 'inventoryWritePermission';	// Permission label
+		$this->rights[7][3] = 0; 					// Permission by default for new user (0/1)
+		$this->rights[7][4] = 'write';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		
-		$this->rights[$r][0] = 1009;
-		$this->rights[$r][1] = 'inventoryValidatePermission';	// Permission label
-		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
-		$this->rights[$r][4] = 'validate';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-		$r++;
+		$this->rights[7][0] = 1009;
+		$this->rights[7][1] = 'inventoryValidatePermission';	// Permission label
+		$this->rights[7][3] = 0; 					// Permission by default for new user (0/1)
+		$this->rights[7][4] = 'validate';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		
-		$this->rights[$r][0] = 1010;
-		$this->rights[$r][1] = 'inventoryChangePMPPermission';	// Permission label
-		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
-		$this->rights[$r][4] = 'changePMP';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-		$r++;
+		$this->rights[7][0] = 1010;
+		$this->rights[7][1] = 'inventoryChangePMPPermission';	// Permission label
+		$this->rights[7][3] = 0; 					// Permission by default for new user (0/1)
+		$this->rights[7][4] = 'changePMP';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		
+		}
 		
 		// Main menu entries
 		$this->menu = array();			// List of menus to add

From c673d283e01e41a6292875dce4b9a8bb07bcf817 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 2 May 2017 18:21:50 +0200
Subject: [PATCH 166/505] Fix script to send emailings

---
 ...terface_50_modAgenda_ActionsAuto.class.php |  2 +-
 scripts/emailings/mailing-send.php            | 41 ++++++++++++++-----
 2 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
index bce6d69b2fa..9da1ada59ad 100644
--- a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
+++ b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
@@ -48,7 +48,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 	 *      $object->actionmsg (note, long text)
 	 *      $object->actionmsg2 (label, short text)
 	 *      $object->sendtoid (id of contact or array of ids)
-	 *      $object->socid
+	 *      $object->socid (id of thirdparty)
 	 *      $object->fk_project
 	 *      $object->fk_element
 	 *      $object->elementtype
diff --git a/scripts/emailings/mailing-send.php b/scripts/emailings/mailing-send.php
index 27cc22448e6..6465e765cfe 100755
--- a/scripts/emailings/mailing-send.php
+++ b/scripts/emailings/mailing-send.php
@@ -41,11 +41,12 @@ if (! isset($argv[1]) || ! $argv[1]) {
 	exit(-1);
 }
 $id=$argv[1];
-if (! isset($argv[2]) || !empty($argv[2])) $login = $argv[2];
+if (isset($argv[2]) || !empty($argv[2])) $login = $argv[2];
 else $login = '';
 
 require_once ($path."../../htdocs/master.inc.php");
 require_once (DOL_DOCUMENT_ROOT."/core/class/CMailFile.class.php");
+require_once (DOL_DOCUMENT_ROOT."/comm/mailing/class/mailing.class.php");
 
 
 // Global variables
@@ -70,9 +71,8 @@ $user = new User($db);
 // for signature, we use user send as parameter
 if (! empty($login)) $user->fetch('',$login);
 
-// We get list of emailing to process
-$sql = "SELECT m.rowid, m.titre, m.sujet, m.body,";
-$sql.= " m.email_from, m.email_replyto, m.email_errorsto";
+// We get list of emailing id to process
+$sql = "SELECT m.rowid";
 $sql.= " FROM ".MAIN_DB_PREFIX."mailing as m";
 $sql.= " WHERE m.statut IN (1,2)";
 if ($id != 'all')
@@ -96,12 +96,15 @@ if ($resql)
 			dol_syslog("Process mailing with id ".$obj->rowid);
 			print "Process mailing with id ".$obj->rowid."\n";
 
-			$id       = $obj->rowid;
-			$subject  = $obj->sujet;
-			$message  = $obj->body;
-			$from     = $obj->email_from;
-			$replyto  = $obj->email_replyto;
-			$errorsto = $obj->email_errorsto;
+			$emailing = new Mailing($db);
+			$emailing->fetch($obj->rowid);
+			
+			$id       = $emailing->id;
+			$subject  = $emailing->sujet;
+			$message  = $emailing->body;
+			$from     = $emailing->email_from;
+			$replyto  = $emailing->email_replyto;
+			$errorsto = $emailing->email_errorsto;
 			// Le message est-il en html
 			$msgishtml=-1;  // Unknown by default
 			if (preg_match('/[\s\t]*<html>/i',$message)) $msgishtml=1;
@@ -232,6 +235,24 @@ if ($resql)
 
 							dol_syslog("ok for emailing id ".$id." #".$i.($mail->error?' - '.$mail->error:''), LOG_DEBUG);
 
+							// Note: If emailing is 100 000 targets, 100 000 entries are added, so we don't enter events for each target here
+							// We must union table llx_mailing_taget for event tab OR enter 1 event with a special table link (id of email in event)
+							// Run trigger
+							/*
+							if ($obj2->source_type == 'contact')
+							{
+							    $emailing->sendtoid = $obj2->source_id;
+							}
+							if ($obj2->source_type == 'thirdparty')
+							{
+							    $emailing->socid = $obj2->source_id;
+							}
+                            // Call trigger
+                            $result=$emailing->call_trigger('EMAILING_SENTBYMAIL',$user);
+                            if ($result < 0) $error++;
+                            // End call triggers
+						    */
+							
 							$sqlok ="UPDATE ".MAIN_DB_PREFIX."mailing_cibles";
 							$sqlok.=" SET statut=1, date_envoi='".$db->idate($now)."' WHERE rowid=".$obj2->rowid;
 							$resqlok=$db->query($sqlok);

From 0bc46facd75af8117780da5e4b30af9011645bd1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 2 May 2017 21:24:18 +0200
Subject: [PATCH 167/505] Add missing vat_src_code on recurring invoices

---
 htdocs/install/mysql/migration/5.0.0-6.0.0.sql  | 2 ++
 htdocs/install/mysql/tables/llx_facture_rec.sql | 1 +
 2 files changed, 3 insertions(+)

diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index 71f9a17273c..991381cb432 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -141,6 +141,8 @@ ALTER TABLE llx_societe_remise_except ADD CONSTRAINT fk_soc_remise_fk_invoice_su
 ALTER TABLE llx_societe_remise_except ADD CONSTRAINT fk_societe_remise_fk_invoice_supplier        FOREIGN KEY (fk_invoice_supplier)      REFERENCES llx_facture_fourn (rowid);
 ALTER TABLE llx_societe_remise_except ADD CONSTRAINT fk_societe_remise_fk_invoice_supplier_source FOREIGN KEY (fk_invoice_supplier)      REFERENCES llx_facture_fourn (rowid);
 
+ALTER TABLE llx_facture_rec ADD COLUMN vat_src_code	varchar(10) DEFAULT '';
+
 UPDATE llx_const set value='moono-lisa' where value = 'moono' AND name = 'FCKEDITOR_SKIN';
 
 ALTER TABLE llx_product_price ADD COLUMN default_vat_code	varchar(10) after tva_tx;
diff --git a/htdocs/install/mysql/tables/llx_facture_rec.sql b/htdocs/install/mysql/tables/llx_facture_rec.sql
index d0d79ef57dc..0e25100386b 100644
--- a/htdocs/install/mysql/tables/llx_facture_rec.sql
+++ b/htdocs/install/mysql/tables/llx_facture_rec.sql
@@ -32,6 +32,7 @@ create table llx_facture_rec
   remise_percent     real     DEFAULT 0,
   remise_absolue     real     DEFAULT 0,
   
+  vat_src_code		 varchar(10)  DEFAULT '',			-- Vat code used as source of vat fields. Not strict foreign key here.
   tva                double(24,8)     DEFAULT 0,
   localtax1			 double(24,8)     DEFAULT 0,           -- amount localtax1
   localtax2          double(24,8)     DEFAULT 0,           -- amount localtax2

From b8f5e93ab0b56157dbfa83d95da42df84ff57487 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 2 May 2017 21:40:18 +0200
Subject: [PATCH 168/505] Debug inventory data model

---
 htdocs/install/mysql/data/llx_c_tva.sql          |  2 +-
 htdocs/install/mysql/migration/5.0.0-6.0.0.sql   | 13 +++++++++----
 htdocs/install/mysql/tables/llx_inventorydet.sql |  8 ++++----
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/htdocs/install/mysql/data/llx_c_tva.sql b/htdocs/install/mysql/data/llx_c_tva.sql
index 34842ed324e..3b401abd37d 100644
--- a/htdocs/install/mysql/data/llx_c_tva.sql
+++ b/htdocs/install/mysql/data/llx_c_tva.sql
@@ -96,11 +96,11 @@ insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (80
 
 -- FRANCE (id country=1)
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 11,  1,  '20','0','VAT standard rate (France hors DOM-TOM)',1);
-insert into llx_c_tva(rowid,fk_pays,taux,code,recuperableonly,note,active) values ( 12,  1, '8.5', '8.5', '0','VAT standard rate (DOM sauf Guyane et Saint-Martin)',0);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 14,  1, '5.5','0','VAT reduced rate (France hors DOM-TOM)',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 15,  1,   '0','0','VAT Rate 0 ou non applicable',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 16,  1, '2.1','0','VAT super-reduced rate',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 17,  1,  '10','0','VAT reduced rate',1);
+insert into llx_c_tva(fk_pays,taux,code,recuperableonly,note,active)                                                   values (1, '8.5', '85', '0','VAT standard rate (DOM sauf Guyane et Saint-Martin)',0);
 insert into llx_c_tva(fk_pays,taux,code,recuperableonly,note,active)                                                   values (1, '8.5', '85NPR', '1','VAT standard rate (DOM sauf Guyane et Saint-Martin), non perçu par le vendeur mais récupérable par acheteur',0);
 insert into llx_c_tva(fk_pays,taux,code,recuperableonly,localtax1,localtax1_type,note,active)                          values (1, '8.5', '85NPROM', '1', 2, 3, 'VAT standard rate (DOM sauf Guyane et Saint-Martin), NPR, Octroi de Mer',0);
 insert into llx_c_tva(fk_pays,taux,code,recuperableonly,localtax1,localtax1_type,localtax2,localtax2_type,note,active) values (1, '8.5', '85NPROMOMR', '1', 2, 3, 2.5, 3, 'VAT standard rate (DOM sauf Guyane et Saint-Martin), NPR, Octroi de Mer et Octroi de Mer Regional',0);
diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index 991381cb432..1982ef6aff8 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -229,9 +229,9 @@ fk_inventory integer DEFAULT 0,
 fk_warehouse integer DEFAULT 0,
 fk_product integer DEFAULT 0,  
 batch varchar(30) DEFAULT NULL,
-qty_view double DEFAULT 0, 
-qty_stock double DEFAULT 0, 
-qty_regulated double DEFAULT 0, 
+qty_view double DEFAULT NULL,
+qty_stock double DEFAULT NULL,
+qty_regulated double DEFAULT NULL,
 pmp double DEFAULT 0, 
 pa double DEFAULT 0, 
 new_pmp double DEFAULT 0
@@ -242,4 +242,9 @@ ALTER TABLE llx_inventory ADD INDEX idx_inventory_tms (tms);
 ALTER TABLE llx_inventory ADD INDEX idx_inventory_datec (datec);
 ALTER TABLE llx_inventorydet ADD INDEX idx_inventorydet_tms (tms);
 ALTER TABLE llx_inventorydet ADD INDEX idx_inventorydet_datec (datec);
-ALTER TABLE llx_inventorydet ADD INDEX idx_inventorydet_fk_inventory (fk_inventory);
\ No newline at end of file
+ALTER TABLE llx_inventorydet ADD INDEX idx_inventorydet_fk_inventory (fk_inventory);
+
+insert into llx_c_tva(fk_pays,taux,code,recuperableonly,note,active)                                                   values (1, '8.5', '85', '0','VAT standard rate (DOM sauf Guyane et Saint-Martin)',0);
+insert into llx_c_tva(fk_pays,taux,code,recuperableonly,note,active)                                                   values (1, '8.5', '85NPR', '1','VAT standard rate (DOM sauf Guyane et Saint-Martin), non perçu par le vendeur mais récupérable par acheteur',0);
+insert into llx_c_tva(fk_pays,taux,code,recuperableonly,localtax1,localtax1_type,note,active)                          values (1, '8.5', '85NPROM', '1', 2, 3, 'VAT standard rate (DOM sauf Guyane et Saint-Martin), NPR, Octroi de Mer',0);
+insert into llx_c_tva(fk_pays,taux,code,recuperableonly,localtax1,localtax1_type,localtax2,localtax2_type,note,active) values (1, '8.5', '85NPROMOMR', '1', 2, 3, 2.5, 3, 'VAT standard rate (DOM sauf Guyane et Saint-Martin), NPR, Octroi de Mer et Octroi de Mer Regional',0);
diff --git a/htdocs/install/mysql/tables/llx_inventorydet.sql b/htdocs/install/mysql/tables/llx_inventorydet.sql
index 2b203e0c58b..ce40d03939c 100644
--- a/htdocs/install/mysql/tables/llx_inventorydet.sql
+++ b/htdocs/install/mysql/tables/llx_inventorydet.sql
@@ -25,10 +25,10 @@ tms timestamp,
 fk_inventory integer DEFAULT 0, 
 fk_warehouse integer DEFAULT 0,
 fk_product integer DEFAULT 0,  
-batch varchar(30) DEFAULT NULL,		-- Lot or serial number
-qty_view double DEFAULT 0, 
-qty_stock double DEFAULT 0, 
-qty_regulated double DEFAULT 0, 
+batch varchar(30) DEFAULT NULL,	 -- Lot or serial number
+qty_view double DEFAULT NULL, 	     -- must be filled once regulation is done
+qty_stock double DEFAULT NULL,   -- can be filled during draft edition
+qty_regulated double DEFAULT NULL,  -- must be filled once regulation is done
 pmp double DEFAULT 0, 
 pa double DEFAULT 0, 
 new_pmp double DEFAULT 0

From a115d4877b9903dfb137e9ecb2d0cd2fb03db4c7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 2 May 2017 22:37:23 +0200
Subject: [PATCH 169/505] Fix for new property array fields

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

diff --git a/htdocs/api/class/api.class.php b/htdocs/api/class/api.class.php
index 7aef2671c8d..9228c71ccbf 100644
--- a/htdocs/api/class/api.class.php
+++ b/htdocs/api/class/api.class.php
@@ -90,6 +90,8 @@ class DolibarrApi
         // Remove linkedObjects. We should already have linkedObjectIds that avoid huge responses
         unset($object->linkedObjects);
         
+        unset($object->fields);
+        
         unset($object->oldline);
         
         unset($object->error);

From 3917bdfc7941e4dad37ddfc65383bcc44f62e3d1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 2 May 2017 21:27:56 +0200
Subject: [PATCH 170/505] Fix vat_src_code propagation.

---
 htdocs/comm/propal/card.php                   |  5 ++++-
 htdocs/comm/propal/class/propal.class.php     | 14 ++++++++++----
 htdocs/commande/card.php                      |  5 ++++-
 htdocs/commande/class/commande.class.php      |  8 +++++++-
 htdocs/compta/facture.php                     | 17 ++++++++++++-----
 htdocs/compta/facture/class/facture.class.php |  7 +++++--
 htdocs/core/class/commoninvoice.class.php     |  6 ++++++
 htdocs/core/class/commonobject.class.php      |  5 ++++-
 htdocs/societe/soc.php                        |  4 ++--
 9 files changed, 54 insertions(+), 17 deletions(-)

diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 8c1c579b0c2..150abdf5f46 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -492,7 +492,10 @@ if (empty($reshook))
 											$array_options = $lines[$i]->array_options;
 										}
 
-										$result = $object->addline($desc, $lines[$i]->subprice, $lines[$i]->qty, $lines[$i]->tva_tx, $lines[$i]->localtax1_tx, $lines[$i]->localtax2_tx, $lines[$i]->fk_product, $lines[$i]->remise_percent, 'HT', 0, $lines[$i]->info_bits, $product_type, $lines[$i]->rang, $lines[$i]->special_code, $fk_parent_line, $lines[$i]->fk_fournprice, $lines[$i]->pa_ht, $label, $date_start, $date_end, $array_options, $lines[$i]->fk_unit);
+										$tva_tx = $lines[$i]->tva_tx;
+										if (! empty($lines[$i]->vat_src_code) && ! preg_match('/\(/', $tva_tx)) $tva_tx .= ' ('.$lines[$i]->vat_src_code.')';
+										
+										$result = $object->addline($desc, $lines[$i]->subprice, $lines[$i]->qty, $tva_tx, $lines[$i]->localtax1_tx, $lines[$i]->localtax2_tx, $lines[$i]->fk_product, $lines[$i]->remise_percent, 'HT', 0, $lines[$i]->info_bits, $product_type, $lines[$i]->rang, $lines[$i]->special_code, $fk_parent_line, $lines[$i]->fk_fournprice, $lines[$i]->pa_ht, $label, $date_start, $date_end, $array_options, $lines[$i]->fk_unit);
 
 										if ($result > 0) {
 											$lineid = $result;
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index b63c59ecad4..4587e960c4c 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -253,6 +253,8 @@ class Propal extends CommonObject
             $tva_tx = get_default_tva($mysoc,$this->thirdparty,$prod->id);
             $tva_npr = get_default_npr($mysoc,$this->thirdparty,$prod->id);
             if (empty($tva_tx)) $tva_npr=0;
+            $vat_src_code = '';     // May be defined into tva_tx
+            
             $localtax1_tx = get_localtax($tva_tx,1,$mysoc,$this->thirdparty,$tva_npr);
             $localtax2_tx = get_localtax($tva_tx,2,$mysoc,$this->thirdparty,$tva_npr);
 
@@ -273,6 +275,7 @@ class Propal extends CommonObject
             $line->qty=$qty;
             $line->subprice=$price;
             $line->remise_percent=$remise_percent;
+            $line->vat_src_code=$vat_src_code;
             $line->tva_tx=$tva_tx;
 	        $line->fk_unit=$prod->fk_unit;
 			if ($tva_npr) $line->info_bits = 1;
@@ -315,6 +318,7 @@ class Propal extends CommonObject
             $line->fk_propal=$this->id;
             $line->fk_remise_except=$remise->id;
             $line->desc=$remise->description;   	// Description ligne
+            $line->vat_src_code=$remise->vat_src_code;
             $line->tva_tx=$remise->tva_tx;
             $line->subprice=-$remise->amount_ht;
             $line->fk_product=0;					// Id produit predefined
@@ -698,7 +702,8 @@ class Propal extends CommonObject
             $this->line->label				= $label;
             $this->line->desc				= $desc;
             $this->line->qty				= $qty;
-            $this->line->product_type			= $type;
+            $this->line->product_type		= $type;
+            $this->line->vat_src_code		= $vat_src_code;
             $this->line->tva_tx				= $txtva;
             $this->line->localtax1_tx		= $txlocaltax1;
             $this->line->localtax2_tx		= $txlocaltax2;
@@ -708,7 +713,6 @@ class Propal extends CommonObject
             $this->line->subprice			= $pu_ht;
             $this->line->info_bits			= $info_bits;
 
-            $this->line->vat_src_code		= $vat_src_code;
             $this->line->total_ht			= $total_ht;
             $this->line->total_tva			= $total_tva;
             $this->line->total_localtax1	= $total_localtax1;
@@ -1368,7 +1372,7 @@ class Propal extends CommonObject
                 /*
                  * Lignes propales liees a un produit ou non
                  */
-                $sql = "SELECT d.rowid, d.fk_propal, d.fk_parent_line, d.label as custom_label, d.description, d.price, d.tva_tx, d.localtax1_tx, d.localtax2_tx, d.qty, d.fk_remise_except, d.remise_percent, d.subprice, d.fk_product,";
+                $sql = "SELECT d.rowid, d.fk_propal, d.fk_parent_line, d.label as custom_label, d.description, d.price, d.vat_src_code, d.tva_tx, d.localtax1_tx, d.localtax2_tx, d.qty, d.fk_remise_except, d.remise_percent, d.subprice, d.fk_product,";
 				$sql.= " d.info_bits, d.total_ht, d.total_tva, d.total_localtax1, d.total_localtax2, d.total_ttc, d.fk_product_fournisseur_price as fk_fournprice, d.buy_price_ht as pa_ht, d.special_code, d.rang, d.product_type,";
 	            $sql.= " d.fk_unit,";
                 $sql.= ' p.ref as product_ref, p.description as product_desc, p.fk_product_type, p.label as product_label,';
@@ -1404,6 +1408,7 @@ class Propal extends CommonObject
                         $line->label            = $objp->custom_label;
                         $line->desc             = $objp->description;  // Description ligne
                         $line->qty              = $objp->qty;
+                        $line->vat_src_code     = $objp->vat_src_code;
                         $line->tva_tx           = $objp->tva_tx;
                         $line->localtax1_tx		= $objp->localtax1_tx;
                         $line->localtax2_tx		= $objp->localtax2_tx;
@@ -3591,7 +3596,7 @@ class PropaleLigne  extends CommonObjectLine
      */
 	function fetch($rowid)
 	{
-		$sql = 'SELECT pd.rowid, pd.fk_propal, pd.fk_parent_line, pd.fk_product, pd.label as custom_label, pd.description, pd.price, pd.qty, pd.tva_tx,';
+		$sql = 'SELECT pd.rowid, pd.fk_propal, pd.fk_parent_line, pd.fk_product, pd.label as custom_label, pd.description, pd.price, pd.qty, pd.vat_src_code, pd.tva_tx,';
 		$sql.= ' pd.remise, pd.remise_percent, pd.fk_remise_except, pd.subprice,';
 		$sql.= ' pd.info_bits, pd.total_ht, pd.total_tva, pd.total_ttc, pd.fk_product_fournisseur_price as fk_fournprice, pd.buy_price_ht as pa_ht, pd.special_code, pd.rang,';
 		$sql.= ' pd.fk_unit,';
@@ -3617,6 +3622,7 @@ class PropaleLigne  extends CommonObjectLine
 			$this->qty				= $objp->qty;
 			$this->price			= $objp->price;		// deprecated
 			$this->subprice			= $objp->subprice;
+			$this->vat_src_code		= $objp->vat_src_code;
 			$this->tva_tx			= $objp->tva_tx;
 			$this->remise			= $objp->remise;    // deprecated
 			$this->remise_percent	= $objp->remise_percent;
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 749f40fef4e..d99aa6a4f46 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -373,7 +373,10 @@ if (empty($reshook))
 									$array_options = $lines[$i]->array_options;
 								}
 
-								$result = $object->addline($desc, $lines[$i]->subprice, $lines[$i]->qty, $lines[$i]->tva_tx, $lines[$i]->localtax1_tx, $lines[$i]->localtax2_tx, $lines[$i]->fk_product, $lines[$i]->remise_percent, $lines[$i]->info_bits, $lines[$i]->fk_remise_except, 'HT', 0, $date_start, $date_end, $product_type, $lines[$i]->rang, $lines[$i]->special_code, $fk_parent_line, $lines[$i]->fk_fournprice, $lines[$i]->pa_ht, $label, $array_options, $lines[$i]->fk_unit, $object->origin, $lines[$i]->rowid);
+								$tva_tx = $lines[$i]->tva_tx;
+								if (! empty($lines[$i]->vat_src_code) && ! preg_match('/\(/', $tva_tx)) $tva_tx .= ' ('.$lines[$i]->vat_src_code.')';
+								
+								$result = $object->addline($desc, $lines[$i]->subprice, $lines[$i]->qty, $tva_tx, $lines[$i]->localtax1_tx, $lines[$i]->localtax2_tx, $lines[$i]->fk_product, $lines[$i]->remise_percent, $lines[$i]->info_bits, $lines[$i]->fk_remise_except, 'HT', 0, $date_start, $date_end, $product_type, $lines[$i]->rang, $lines[$i]->special_code, $fk_parent_line, $lines[$i]->fk_fournprice, $lines[$i]->pa_ht, $label, $array_options, $lines[$i]->fk_unit, $object->origin, $lines[$i]->rowid);
 
 								if ($result < 0) {
 									$error++;
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 462ba4756c5..c89fc8d11da 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -1103,6 +1103,7 @@ class Commande extends CommonOrder
             $line->desc              = $object->lines[$i]->desc;
             $line->price             = $object->lines[$i]->price;
             $line->subprice          = $object->lines[$i]->subprice;
+            $line->vat_src_code      = $object->lines[$i]->vat_src_code;
             $line->tva_tx            = $object->lines[$i]->tva_tx;
             $line->localtax1_tx      = $object->lines[$i]->localtax1_tx;
             $line->localtax2_tx      = $object->lines[$i]->localtax2_tx;
@@ -1466,7 +1467,8 @@ class Commande extends CommonOrder
             $tva_tx = get_default_tva($mysoc,$this->thirdparty,$prod->id);
             $tva_npr = get_default_npr($mysoc,$this->thirdparty,$prod->id);
             if (empty($tva_tx)) $tva_npr=0;
-
+            $vat_src_code = '';     // May be defined into tva_tx
+            
             $localtax1_tx=get_localtax($tva_tx,1,$this->thirdparty,$mysoc,$tva_npr);
             $localtax2_tx=get_localtax($tva_tx,2,$this->thirdparty,$mysoc,$tva_npr);
 
@@ -1485,6 +1487,7 @@ class Commande extends CommonOrder
             $line->qty=$qty;
             $line->subprice=$price;
             $line->remise_percent=$remise_percent;
+            $line->vat_src_code=$vat_src_code;
             $line->tva_tx=$tva_tx;
             $line->localtax1_tx=$localtax1_tx;
             $line->localtax2_tx=$localtax2_tx;
@@ -1703,6 +1706,7 @@ class Commande extends CommonOrder
             $line->fk_commande=$this->id;
             $line->fk_remise_except=$remise->id;
             $line->desc=$remise->description;   	// Description ligne
+            $line->vat_src_code=$remise->vat_src_code;
             $line->tva_tx=$remise->tva_tx;
             $line->subprice=-$remise->amount_ht;
             $line->price=-$remise->amount_ht;
@@ -3809,6 +3813,7 @@ class OrderLine extends CommonOrderLine
             $this->qty              = $objp->qty;
             $this->price            = $objp->price;
             $this->subprice         = $objp->subprice;
+            $this->vat_src_code     = $objp->vat_src_code;
             $this->tva_tx           = $objp->tva_tx;
             $this->localtax1_tx		= $objp->localtax1_tx;
             $this->localtax2_tx		= $objp->localtax2_tx;
@@ -4120,6 +4125,7 @@ class OrderLine extends CommonOrderLine
 		$sql = "UPDATE ".MAIN_DB_PREFIX."commandedet SET";
 		$sql.= " description='".$this->db->escape($this->desc)."'";
 		$sql.= " , label=".(! empty($this->label)?"'".$this->db->escape($this->label)."'":"null");
+		$sql.= " , vat_src_code=".(! empty($this->vat_src_code)?"'".$this->db->escape($this->vat_src_code)."'":"''");
 		$sql.= " , tva_tx=".price2num($this->tva_tx);
 		$sql.= " , localtax1_tx=".price2num($this->localtax1_tx);
 		$sql.= " , localtax2_tx=".price2num($this->localtax2_tx);
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index b71dbe0cc70..05174fd940b 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -1050,11 +1050,14 @@ if (empty($reshook))
 								}
 							}
 
+							$tva_tx = $lines[$i]->tva_tx;
+							if (! empty($lines[$i]->vat_src_code) && ! preg_match('/\(/', $tva_tx)) $tva_tx .= ' ('.$lines[$i]->vat_src_code.')';
+								
 							$result = $object->addline(
 									$langs->trans('Deposit'),
 									$amountdeposit,		 	// subprice
 									1, 						// quantity
-									$lines[$i]->tva_tx,     // vat rate
+									$tva_tx,                // vat rate
 							        0,                      // localtax1_tx
 									0, 						// localtax2_tx
 									(empty($conf->global->INVOICE_PRODUCTID_DEPOSIT)?0:$conf->global->INVOICE_PRODUCTID_DEPOSIT), 	// fk_product
@@ -1150,11 +1153,15 @@ if (empty($reshook))
 											$array_options = $lines[$i]->array_options;
 										}
 
-										// View third's localtaxes for now
-										$localtax1_tx = get_localtax($lines[$i]->tva_tx, 1, $object->thirdparty);
-										$localtax2_tx = get_localtax($lines[$i]->tva_tx, 2, $object->thirdparty);
+										$tva_tx = $lines[$i]->tva_tx;
+										if (! empty($lines[$i]->vat_src_code) && ! preg_match('/\(/', $tva_tx)) $tva_tx .= ' ('.$lines[$i]->vat_src_code.')';
+										
+										// View third's localtaxes for NOW and do not use value from origin.
+										// TODO Is this really what we want ? Yes if source if template invoice but what if proposal or order ?
+										$localtax1_tx = get_localtax($tva_tx, 1, $object->thirdparty);
+										$localtax2_tx = get_localtax($tva_tx, 2, $object->thirdparty);
 
-										$result = $object->addline($desc, $lines[$i]->subprice, $lines[$i]->qty, $lines[$i]->tva_tx, $localtax1_tx, $localtax2_tx, $lines[$i]->fk_product, $lines[$i]->remise_percent, $date_start, $date_end, 0, $lines[$i]->info_bits, $lines[$i]->fk_remise_except, 'HT', 0, $product_type, $lines[$i]->rang, $lines[$i]->special_code, $object->origin, $lines[$i]->rowid, $fk_parent_line, $lines[$i]->fk_fournprice, $lines[$i]->pa_ht, $label, $array_options, $lines[$i]->situation_percent, $lines[$i]->fk_prev_id, $lines[$i]->fk_unit);
+										$result = $object->addline($desc, $lines[$i]->subprice, $lines[$i]->qty, $tva_tx, $localtax1_tx, $localtax2_tx, $lines[$i]->fk_product, $lines[$i]->remise_percent, $date_start, $date_end, 0, $lines[$i]->info_bits, $lines[$i]->fk_remise_except, 'HT', 0, $product_type, $lines[$i]->rang, $lines[$i]->special_code, $object->origin, $lines[$i]->rowid, $fk_parent_line, $lines[$i]->fk_fournprice, $lines[$i]->pa_ht, $label, $array_options, $lines[$i]->situation_percent, $lines[$i]->fk_prev_id, $lines[$i]->fk_unit);
 
 										if ($result > 0) {
 											$lineid = $result;
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index b80919c48b4..bc4cf3626a4 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -952,6 +952,7 @@ class Facture extends CommonInvoice
 			$line->total_ht			= $object->lines[$i]->total_ht;
 			$line->total_tva		= $object->lines[$i]->total_tva;
 			$line->total_ttc		= $object->lines[$i]->total_ttc;
+			$line->vat_src_code  	= $object->lines[$i]->vat_src_code;
 			$line->tva_tx			= $object->lines[$i]->tva_tx;
 			$line->localtax1_tx		= $object->lines[$i]->localtax1_tx;
 			$line->localtax2_tx		= $object->lines[$i]->localtax2_tx;
@@ -1551,6 +1552,7 @@ class Facture extends CommonInvoice
 			$facligne->fk_facture=$this->id;
 			$facligne->fk_remise_except=$remise->id;
 			$facligne->desc=$remise->description;   	// Description ligne
+			$facligne->vat_src_code=$remise->vat_src_code;
 			$facligne->tva_tx=$remise->tva_tx;
 			$facligne->subprice=-$remise->amount_ht;
 			$facligne->fk_product=0;					// Id produit predefini
@@ -2399,7 +2401,7 @@ class Facture extends CommonInvoice
 	 * 		@param    	string		$desc            	Description of line
 	 * 		@param    	double		$pu_ht              Unit price without tax (> 0 even for credit note)
 	 * 		@param    	double		$qty             	Quantity
-	 * 		@param    	double		$txtva           	Force Vat rate, -1 for auto
+	 * 		@param    	double		$txtva           	Force Vat rate, -1 for auto (Can contain the vat_src_code too with syntax '9.9 (CODE)')
 	 * 		@param		double		$txlocaltax1		Local tax 1 rate (deprecated)
 	 *  	@param		double		$txlocaltax2		Local tax 2 rate (deprecated)
 	 *		@param    	int			$fk_product      	Id of predefined product/service
@@ -4276,7 +4278,7 @@ class FactureLigne extends CommonInvoiceLine
 	 */
 	function fetch($rowid)
 	{
-		$sql = 'SELECT fd.rowid, fd.fk_facture, fd.fk_parent_line, fd.fk_product, fd.product_type, fd.label as custom_label, fd.description, fd.price, fd.qty, fd.tva_tx,';
+		$sql = 'SELECT fd.rowid, fd.fk_facture, fd.fk_parent_line, fd.fk_product, fd.product_type, fd.label as custom_label, fd.description, fd.price, fd.qty, fd.vat_src_code, fd.tva_tx,';
 		$sql.= ' fd.localtax1_tx, fd. localtax2_tx, fd.remise, fd.remise_percent, fd.fk_remise_except, fd.subprice,';
 		$sql.= ' fd.date_start as date_start, fd.date_end as date_end, fd.fk_product_fournisseur_price as fk_fournprice, fd.buy_price_ht as pa_ht,';
 		$sql.= ' fd.info_bits, fd.special_code, fd.total_ht, fd.total_tva, fd.total_ttc, fd.total_localtax1, fd.total_localtax2, fd.rang,';
@@ -4304,6 +4306,7 @@ class FactureLigne extends CommonInvoiceLine
 			$this->desc					= $objp->description;
 			$this->qty					= $objp->qty;
 			$this->subprice				= $objp->subprice;
+			$this->vat_src_code  		= $objp->vat_src_code;
 			$this->tva_tx				= $objp->tva_tx;
 			$this->localtax1_tx			= $objp->localtax1_tx;
 			$this->localtax2_tx			= $objp->localtax2_tx;
diff --git a/htdocs/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php
index 05cf0b4c3cb..4dc330544ee 100644
--- a/htdocs/core/class/commoninvoice.class.php
+++ b/htdocs/core/class/commoninvoice.class.php
@@ -471,6 +471,12 @@ abstract class CommonInvoiceLine extends CommonObjectLine
 	 */
 	public $fk_product;
 
+	/**
+	 * VAT code
+	 * @var string
+	 */
+	public $vat_src_code;
+
 	/**
 	 * VAT %
 	 * @var float
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index c9acc1f310e..1bf4a95a2c9 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -3567,7 +3567,7 @@ abstract class CommonObject
         print '<tr class="liste_titre">';
         print '<td>'.$langs->trans('Ref').'</td>';
         print '<td>'.$langs->trans('Description').'</td>';
-        print '<td align="right">'.$langs->trans('VAT').'</td>';
+        print '<td align="right">'.$langs->trans('VATRate').'</td>';
         print '<td align="right">'.$langs->trans('PriceUHT').'</td>';
 		if (!empty($conf->multicurrency->enabled)) print '<td align="right">'.$langs->trans('PriceUHTCurrency').'</td>';
         print '<td align="right">'.$langs->trans('Qty').'</td>';
@@ -3698,7 +3698,10 @@ abstract class CommonObject
             $this->tpl['description'] = '&nbsp;';
         }
 
+        // VAT Rate
         $this->tpl['vat_rate'] = vatrate($line->tva_tx, true);
+        if (! empty($line->vat_src_code) && ! preg_match('/\(/', $this->tpl['vat_rate'])) $this->tpl['vat_rate'].=' ('.$line->vat_src_code.')';
+        
         $this->tpl['price'] = price($line->subprice);
 		$this->tpl['multicurrency_price'] = price($line->multicurrency_subprice);
         $this->tpl['qty'] = (($line->info_bits & 2) != 2) ? $line->qty : '&nbsp;';
diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php
index b5bda51b4ba..b9c962a5168 100644
--- a/htdocs/societe/soc.php
+++ b/htdocs/societe/soc.php
@@ -1743,7 +1743,7 @@ else
             //TODO: Place into a function to control showing by country or study better option
             if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1")
             {
-                print '<tr><td>'.fieldLabel($langs->transcountry("LocalTax1IsUsed",$mysoc->country_code),'localtax1assuj_value').'</td><td colspan="3">';
+                print '<tr><td>'.fieldLabel($langs->transcountry("LocalTax1IsUsed",$mysoc->country_code),'localtax1assuj_value').'</td><td>';
                 print $form->selectyesno('localtax1assuj_value',$object->localtax1_assuj,1);
                 if(! isOnlyOneLocalTax(1))
                 {
@@ -1752,7 +1752,7 @@ else
                     print '</span>';
                 }
             
-                print '</td><td>'.fieldLabel($langs->transcountry("LocalTax2IsUsed",$mysoc->country_code),'localtax2assuj_value').'</td><td colspan="3">';
+                print '</td><td>'.fieldLabel($langs->transcountry("LocalTax2IsUsed",$mysoc->country_code),'localtax2assuj_value').'</td><td>';
                 print $form->selectyesno('localtax2assuj_value',$object->localtax2_assuj,1);
                 if  (! isOnlyOneLocalTax(2))
                 {

From d1a443f0f042c939a491c9d7cdc30632bf9b64c8 Mon Sep 17 00:00:00 2001
From: alexis portable <alexis@atm-consulting.fr>
Date: Tue, 2 May 2017 23:11:05 +0200
Subject: [PATCH 171/505] fix camelcase for travis

---
 htdocs/core/class/commonobject.class.php | 34 ++++++++++++------------
 htdocs/core/class/coreobject.class.php   |  8 +++---
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 582e00d29fa..97c8da3f316 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -4669,7 +4669,7 @@ abstract class CommonObject
 	 * @param   array   $info   content informations of field
 	 * @return                  bool
 	 */
-	protected function is_date($info)
+	protected function isDate($info)
 	{
 		if(isset($info['type']) && $info['type']=='date') return true;
 		else return false;
@@ -4681,7 +4681,7 @@ abstract class CommonObject
 	 * @param   array   $info   content informations of field
 	 * @return                  bool
 	 */
-	protected function is_array($info)
+	protected function isArray($info)
 	{
 		if(is_array($info))
 		{
@@ -4697,7 +4697,7 @@ abstract class CommonObject
 	 * @param   array   $info   content informations of field
 	 * @return                  bool
 	 */
-	protected function is_null($info)
+	protected function isNull($info)
 	{
 		if(is_array($info))
 		{
@@ -4713,7 +4713,7 @@ abstract class CommonObject
 	 * @param   array   $info   content informations of field
 	 * @return                  bool
 	 */
-	protected function is_int($info)
+	protected function isInt($info)
 	{
 		if(is_array($info))
 		{
@@ -4729,7 +4729,7 @@ abstract class CommonObject
 	 * @param   array   $info   content informations of field
 	 * @return                  bool
 	 */
-	protected function is_float($info)
+	protected function isFloat($info)
 	{
 		if(is_array($info))
 		{
@@ -4745,7 +4745,7 @@ abstract class CommonObject
 	 * @param   array   $info   content informations of field
 	 * @return                  bool
 	 */
-	protected function is_text($info)
+	protected function isText($info)
 	{
 		if(is_array($info))
 		{
@@ -4761,7 +4761,7 @@ abstract class CommonObject
 	 * @param   array   $info   content informations of field
 	 * @return                  bool
 	 */
-	protected function is_index($info)
+	protected function isIndex($info)
 	{
 		if(is_array($info))
 		{
@@ -4781,7 +4781,7 @@ abstract class CommonObject
 		$query=array();
 		foreach ($this->fields as $field=>$info)
 		{
-			if($this->is_date($info))
+			if($this->isDate($info))
 			{
 				if(empty($this->{$field}))
 				{
@@ -4792,19 +4792,19 @@ abstract class CommonObject
 					$query[$field] = $this->db->idate($this->{$field});
 				}
 			}
-			else if($this->is_array($info))
+			else if($this->isArray($info))
 			{
 				$query[$field] = serialize($this->{$field});
 			}
-			else if($this->is_int($info))
+			else if($this->isInt($info))
 			{
 				$query[$field] = (int) price2num($this->{$field});
 			}
-			else if($this->is_float($info))
+			else if($this->isFloat($info))
 			{
 				$query[$field] = (double) price2num($this->{$field});
 			}
-			elseif($this->is_null($info))
+			elseif($this->isNull($info))
 			{
 				$query[$field] = (is_null($this->{$field}) || (empty($this->{$field}) && $this->{$field}!==0 && $this->{$field}!=='0') ? null : $this->{$field});
 			}
@@ -4860,26 +4860,26 @@ abstract class CommonObject
 	{
 		foreach ($this->fields as $field => $info)
 		{
-			if($this->is_date($info))
+			if($this->isDate($info))
 			{
 				if(empty($obj->{$field}) || $obj->{$field} === '0000-00-00 00:00:00' || $obj->{$field} === '1000-01-01 00:00:00') $this->{$field} = 0;
 				else $this->{$field} = strtotime($obj->{$field});
 			}
-			elseif($this->is_array($info))
+			elseif($this->isArray($info))
 			{
 				$this->{$field} = @unserialize($obj->{$field});
 				// Hack for data not in UTF8
 				if($this->{$field } === FALSE) @unserialize(utf8_decode($obj->{$field}));
 			}
-			elseif($this->is_int($info))
+			elseif($this->isInt($info))
 			{
 				$this->{$field} = (int) $obj->{$field};
 			}
-			elseif($this->is_float($info))
+			elseif($this->isFloat($info))
 			{
 				$this->{$field} = (double) $obj->{$field};
 			}
-			elseif($this->is_null($info))
+			elseif($this->isNull($info))
 			{
 				$val = $obj->{$field};
 				// zero is not null
diff --git a/htdocs/core/class/coreobject.class.php b/htdocs/core/class/coreobject.class.php
index c86a1083519..021213594f7 100644
--- a/htdocs/core/class/coreobject.class.php
+++ b/htdocs/core/class/coreobject.class.php
@@ -59,10 +59,10 @@ class CoreObject extends CommonObject
 		{
 			foreach ($this->fields as $field=>$info)
 			{
-		        if ($this->is_date($info)) $this->{$field} = time();
-		        elseif ($this->is_array($info)) $this->{$field} = array();
-		        elseif ($this->is_int($info)) $this->{$field} = (int) 0;
-		        elseif ($this->is_float($info)) $this->{$field} = (double) 0;
+		        if ($this->isDate($info)) $this->{$field} = time();
+		        elseif ($this->isArray($info)) $this->{$field} = array();
+		        elseif ($this->isInt($info)) $this->{$field} = (int) 0;
+		        elseif ($this->isFloat($info)) $this->{$field} = (double) 0;
 				else $this->{$field} = '';
 		    }
 

From da4d179d36789551eb31490f107f7abd3c6a0c92 Mon Sep 17 00:00:00 2001
From: alexis portable <alexis@atm-consulting.fr>
Date: Tue, 2 May 2017 23:20:23 +0200
Subject: [PATCH 172/505] fix travis

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

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 97c8da3f316..16bff11b5fd 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -4958,7 +4958,7 @@ abstract class CommonObject
 		foreach ($fields as $k => $v) {
 			
 			if (is_array($key)){
-				$i=array_search($k , $key );
+				$i=array_search($k, $key);
 				if ( $i !== false) {
 					$where[] = $key[$i].'=' . $this->quote( $v ) ;
 					continue;

From 98b2e83bfb657b3528c028c31f8945afd56e4062 Mon Sep 17 00:00:00 2001
From: Laurent Dinclaux <laurent@gecka.nc>
Date: Wed, 3 May 2017 15:58:36 +1100
Subject: [PATCH 173/505] Fix localtaxes type not retrieved in proposals. Fixes
 Dolibarr/dolibarr/#6786

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

diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index b63c59ecad4..1ab2ae113cb 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -1368,7 +1368,7 @@ class Propal extends CommonObject
                 /*
                  * Lignes propales liees a un produit ou non
                  */
-                $sql = "SELECT d.rowid, d.fk_propal, d.fk_parent_line, d.label as custom_label, d.description, d.price, d.tva_tx, d.localtax1_tx, d.localtax2_tx, d.qty, d.fk_remise_except, d.remise_percent, d.subprice, d.fk_product,";
+                $sql = "SELECT d.rowid, d.fk_propal, d.fk_parent_line, d.label as custom_label, d.description, d.price, d.tva_tx, d.localtax1_tx, d.localtax2_tx, d.localtax1_type, d.localtax2_type, d.qty, d.fk_remise_except, d.remise_percent, d.subprice, d.fk_product,";
 				$sql.= " d.info_bits, d.total_ht, d.total_tva, d.total_localtax1, d.total_localtax2, d.total_ttc, d.fk_product_fournisseur_price as fk_fournprice, d.buy_price_ht as pa_ht, d.special_code, d.rang, d.product_type,";
 	            $sql.= " d.fk_unit,";
                 $sql.= ' p.ref as product_ref, p.description as product_desc, p.fk_product_type, p.label as product_label,';
@@ -1407,6 +1407,8 @@ class Propal extends CommonObject
                         $line->tva_tx           = $objp->tva_tx;
                         $line->localtax1_tx		= $objp->localtax1_tx;
                         $line->localtax2_tx		= $objp->localtax2_tx;
+                        $line->localtax1_type	= $objp->localtax1_type;
+                        $line->localtax2_type	= $objp->localtax2_type;
                         $line->subprice         = $objp->subprice;
                         $line->fk_remise_except = $objp->fk_remise_except;
                         $line->remise_percent   = $objp->remise_percent;

From f63f28c7febedd41e200c5274d2925494f7b1935 Mon Sep 17 00:00:00 2001
From: Laurent Dinclaux <laurent@gecka.nc>
Date: Wed, 3 May 2017 21:34:57 +1100
Subject: [PATCH 174/505] Fix vat_src_code propagation between post types

---
 htdocs/comm/propal/class/propal.class.php | 6 ++++--
 htdocs/commande/class/commande.class.php  | 1 +
 htdocs/core/class/commonobject.class.php  | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 1ab2ae113cb..6443d3bcf4e 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -1368,7 +1368,7 @@ class Propal extends CommonObject
                 /*
                  * Lignes propales liees a un produit ou non
                  */
-                $sql = "SELECT d.rowid, d.fk_propal, d.fk_parent_line, d.label as custom_label, d.description, d.price, d.tva_tx, d.localtax1_tx, d.localtax2_tx, d.localtax1_type, d.localtax2_type, d.qty, d.fk_remise_except, d.remise_percent, d.subprice, d.fk_product,";
+                $sql = "SELECT d.rowid, d.fk_propal, d.fk_parent_line, d.label as custom_label, d.description, d.price, d.vat_src_code, d.tva_tx, d.localtax1_tx, d.localtax2_tx, d.localtax1_type, d.localtax2_type, d.qty, d.fk_remise_except, d.remise_percent, d.subprice, d.fk_product,";
 				$sql.= " d.info_bits, d.total_ht, d.total_tva, d.total_localtax1, d.total_localtax2, d.total_ttc, d.fk_product_fournisseur_price as fk_fournprice, d.buy_price_ht as pa_ht, d.special_code, d.rang, d.product_type,";
 	            $sql.= " d.fk_unit,";
                 $sql.= ' p.ref as product_ref, p.description as product_desc, p.fk_product_type, p.label as product_label,';
@@ -1404,6 +1404,7 @@ class Propal extends CommonObject
                         $line->label            = $objp->custom_label;
                         $line->desc             = $objp->description;  // Description ligne
                         $line->qty              = $objp->qty;
+                        $line->vat_src_code     = $objp->vat_src_code;
                         $line->tva_tx           = $objp->tva_tx;
                         $line->localtax1_tx		= $objp->localtax1_tx;
                         $line->localtax2_tx		= $objp->localtax2_tx;
@@ -3593,7 +3594,7 @@ class PropaleLigne  extends CommonObjectLine
      */
 	function fetch($rowid)
 	{
-		$sql = 'SELECT pd.rowid, pd.fk_propal, pd.fk_parent_line, pd.fk_product, pd.label as custom_label, pd.description, pd.price, pd.qty, pd.tva_tx,';
+		$sql = 'SELECT pd.rowid, pd.fk_propal, pd.fk_parent_line, pd.fk_product, pd.label as custom_label, pd.description, pd.price, pd.qty, pd.vat_src_code, pd.tva_tx,';
 		$sql.= ' pd.remise, pd.remise_percent, pd.fk_remise_except, pd.subprice,';
 		$sql.= ' pd.info_bits, pd.total_ht, pd.total_tva, pd.total_ttc, pd.fk_product_fournisseur_price as fk_fournprice, pd.buy_price_ht as pa_ht, pd.special_code, pd.rang,';
 		$sql.= ' pd.fk_unit,';
@@ -3619,6 +3620,7 @@ class PropaleLigne  extends CommonObjectLine
 			$this->qty				= $objp->qty;
 			$this->price			= $objp->price;		// deprecated
 			$this->subprice			= $objp->subprice;
+			$this->vat_src_code     = $objp->vat_src_code;
 			$this->tva_tx			= $objp->tva_tx;
 			$this->remise			= $objp->remise;    // deprecated
 			$this->remise_percent	= $objp->remise_percent;
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 462ba4756c5..1a0aef2ae48 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -4120,6 +4120,7 @@ class OrderLine extends CommonOrderLine
 		$sql = "UPDATE ".MAIN_DB_PREFIX."commandedet SET";
 		$sql.= " description='".$this->db->escape($this->desc)."'";
 		$sql.= " , label=".(! empty($this->label)?"'".$this->db->escape($this->label)."'":"null");
+		$sql.= " , vat_src_code = '".(empty($this->vat_src_code)?'':$this->vat_src_code)."'";
 		$sql.= " , tva_tx=".price2num($this->tva_tx);
 		$sql.= " , localtax1_tx=".price2num($this->localtax1_tx);
 		$sql.= " , localtax2_tx=".price2num($this->localtax2_tx);
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index c9acc1f310e..35b7ddc98ae 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -3698,7 +3698,7 @@ abstract class CommonObject
             $this->tpl['description'] = '&nbsp;';
         }
 
-        $this->tpl['vat_rate'] = vatrate($line->tva_tx, true);
+        $this->tpl['vat_rate'] = vatrate($line->tva_tx.($line->vat_src_code?(' ('.$line->vat_src_code.')'):''), '%', $line->info_bits);
         $this->tpl['price'] = price($line->subprice);
 		$this->tpl['multicurrency_price'] = price($line->multicurrency_subprice);
         $this->tpl['qty'] = (($line->info_bits & 2) != 2) ? $line->qty : '&nbsp;';

From b93df2d6b5af7d0e7c5d185e62a27ef0a418dc8b Mon Sep 17 00:00:00 2001
From: Laurent Dinclaux <laurent@gecka.nc>
Date: Wed, 3 May 2017 23:13:21 +1100
Subject: [PATCH 175/505] Fixes localtax propagation to new invoice

---
 htdocs/compta/facture.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index b71dbe0cc70..c1c14b7110d 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -1150,11 +1150,13 @@ if (empty($reshook))
 											$array_options = $lines[$i]->array_options;
 										}
 
-										// View third's localtaxes for now
-										$localtax1_tx = get_localtax($lines[$i]->tva_tx, 1, $object->thirdparty);
-										$localtax2_tx = get_localtax($lines[$i]->tva_tx, 2, $object->thirdparty);
+										$txtva = $lines[$i]->vat_src_code ? $lines[$i]->tva_tx . ' (' .  $lines[$i]->vat_src_code . ')' : $lines[$i]->tva_tx;
 
-										$result = $object->addline($desc, $lines[$i]->subprice, $lines[$i]->qty, $lines[$i]->tva_tx, $localtax1_tx, $localtax2_tx, $lines[$i]->fk_product, $lines[$i]->remise_percent, $date_start, $date_end, 0, $lines[$i]->info_bits, $lines[$i]->fk_remise_except, 'HT', 0, $product_type, $lines[$i]->rang, $lines[$i]->special_code, $object->origin, $lines[$i]->rowid, $fk_parent_line, $lines[$i]->fk_fournprice, $lines[$i]->pa_ht, $label, $array_options, $lines[$i]->situation_percent, $lines[$i]->fk_prev_id, $lines[$i]->fk_unit);
+										// View third's localtaxes for now
+										$localtax1_tx = get_localtax($txtva, 1, $object->thirdparty);
+										$localtax2_tx = get_localtax($txtva, 2, $object->thirdparty);
+
+										$result = $object->addline($desc, $lines[$i]->subprice, $lines[$i]->qty, $txtva, $localtax1_tx, $localtax2_tx, $lines[$i]->fk_product, $lines[$i]->remise_percent, $date_start, $date_end, 0, $lines[$i]->info_bits, $lines[$i]->fk_remise_except, 'HT', 0, $product_type, $lines[$i]->rang, $lines[$i]->special_code, $object->origin, $lines[$i]->rowid, $fk_parent_line, $lines[$i]->fk_fournprice, $lines[$i]->pa_ht, $label, $array_options, $lines[$i]->situation_percent, $lines[$i]->fk_prev_id, $lines[$i]->fk_unit);
 
 										if ($result > 0) {
 											$lineid = $result;

From 421843e693c5c948c86bfb1d214c3cdee7dd4cdb Mon Sep 17 00:00:00 2001
From: Laurent Dinclaux <laurent@gecka.nc>
Date: Wed, 3 May 2017 23:35:57 +1100
Subject: [PATCH 176/505] Fix missing localtaxes lines in "commande" PDF

---
 htdocs/commande/class/commande.class.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 1a0aef2ae48..0955fd18481 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -1758,7 +1758,7 @@ class Commande extends CommonOrder
         $this->lines=array();
 
         $sql = 'SELECT l.rowid, l.fk_product, l.fk_parent_line, l.product_type, l.fk_commande, l.label as custom_label, l.description, l.price, l.qty, l.vat_src_code, l.tva_tx,';
-        $sql.= ' l.localtax1_tx, l.localtax2_tx, l.fk_remise_except, l.remise_percent, l.subprice, l.fk_product_fournisseur_price as fk_fournprice, l.buy_price_ht as pa_ht, l.rang, l.info_bits, l.special_code,';
+        $sql.= ' l.localtax1_tx, l.localtax2_tx, l.localtax1_type, l.localtax2_type, l.fk_remise_except, l.remise_percent, l.subprice, l.fk_product_fournisseur_price as fk_fournprice, l.buy_price_ht as pa_ht, l.rang, l.info_bits, l.special_code,';
         $sql.= ' l.total_ht, l.total_ttc, l.total_tva, l.total_localtax1, l.total_localtax2, l.date_start, l.date_end,';
 	    $sql.= ' l.fk_unit,';
 		$sql.= ' l.fk_multicurrency, l.multicurrency_code, l.multicurrency_subprice, l.multicurrency_total_ht, l.multicurrency_total_tva, l.multicurrency_total_ttc,';
@@ -1795,9 +1795,11 @@ class Commande extends CommonOrder
 
                 $line->vat_src_code     = $objp->vat_src_code; 
                 $line->tva_tx           = $objp->tva_tx;
-                $line->localtax1_tx     = $objp->localtax1_tx;
+	            $line->localtax1_tx     = $objp->localtax1_tx;
                 $line->localtax2_tx     = $objp->localtax2_tx;
-                $line->total_ht         = $objp->total_ht;
+	            $line->localtax1_type	= $objp->localtax1_type;
+	            $line->localtax2_type	= $objp->localtax2_type;
+	            $line->total_ht         = $objp->total_ht;
                 $line->total_ttc        = $objp->total_ttc;
                 $line->total_tva        = $objp->total_tva;
                 $line->total_localtax1  = $objp->total_localtax1;

From 909b489d1f9fb74f4c9680e6a9fb0ff46c8797e8 Mon Sep 17 00:00:00 2001
From: Laurent Dinclaux <laurent@gecka.nc>
Date: Thu, 4 May 2017 10:05:55 +1100
Subject: [PATCH 177/505] More fixes regarding localtaxes not being diplayed in
 generated PDF and vat_src_code not being propagating properly when generating
 posts from type to type.

---
 htdocs/commande/card.php               |  8 +++++++-
 htdocs/contrat/card.php                | 12 +++++++++---
 htdocs/contrat/class/contrat.class.php |  8 +++++++-
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 749f40fef4e..05288f72f0e 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -373,7 +373,13 @@ if (empty($reshook))
 									$array_options = $lines[$i]->array_options;
 								}
 
-								$result = $object->addline($desc, $lines[$i]->subprice, $lines[$i]->qty, $lines[$i]->tva_tx, $lines[$i]->localtax1_tx, $lines[$i]->localtax2_tx, $lines[$i]->fk_product, $lines[$i]->remise_percent, $lines[$i]->info_bits, $lines[$i]->fk_remise_except, 'HT', 0, $date_start, $date_end, $product_type, $lines[$i]->rang, $lines[$i]->special_code, $fk_parent_line, $lines[$i]->fk_fournprice, $lines[$i]->pa_ht, $label, $array_options, $lines[$i]->fk_unit, $object->origin, $lines[$i]->rowid);
+								$txtva = $lines[$i]->vat_src_code ? $lines[$i]->tva_tx . ' (' .  $lines[$i]->vat_src_code . ')' : $lines[$i]->tva_tx;
+
+								// View third's localtaxes for now
+								$localtax1_tx = get_localtax($txtva, 1, $object->thirdparty);
+								$localtax2_tx = get_localtax($txtva, 2, $object->thirdparty);
+
+								$result = $object->addline($desc, $lines[$i]->subprice, $lines[$i]->qty, $txtva, $localtax1_tx, $localtax2_tx, $lines[$i]->fk_product, $lines[$i]->remise_percent, $lines[$i]->info_bits, $lines[$i]->fk_remise_except, 'HT', 0, $date_start, $date_end, $product_type, $lines[$i]->rang, $lines[$i]->special_code, $fk_parent_line, $lines[$i]->fk_fournprice, $lines[$i]->pa_ht, $label, $array_options, $lines[$i]->fk_unit, $object->origin, $lines[$i]->rowid);
 
 								if ($result < 0) {
 									$error++;
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 7a89ba9886f..322220c5d4f 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -332,14 +332,20 @@ if (empty($reshook))
 								else {
 								    $desc = dol_htmlentitiesbr($lines[$i]->desc);
 						        }
+
+								$txtva = $lines[$i]->vat_src_code ? $lines[$i]->tva_tx . ' (' .  $lines[$i]->vat_src_code . ')' : $lines[$i]->tva_tx;
+
+								// View third's localtaxes for now
+								$localtax1_tx = get_localtax($txtva, 1, $object->thirdparty);
+								$localtax2_tx = get_localtax($txtva, 2, $object->thirdparty);
 	
 			                    $result = $object->addline(
 					                $desc,
 					                $lines[$i]->subprice,
 					                $lines[$i]->qty,
-					                $lines[$i]->tva_tx,
-					                $lines[$i]->localtax1_tx,
-					                $lines[$i]->localtax2_tx,
+                                    $txtva,
+                                    $localtax1_tx,
+                                    $localtax2_tx,
 					                $lines[$i]->fk_product,
 					                $lines[$i]->remise_percent,
 					                $lines[$i]->date_start,
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index aa15fbea86b..85c9d0d158f 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -612,7 +612,7 @@ class Contrat extends CommonObject
 		
 		// Selectionne les lignes contrats liees a un produit
 		$sql = "SELECT p.label as product_label, p.description as product_desc, p.ref as product_ref,";
-		$sql.= " d.rowid, d.fk_contrat, d.statut, d.description, d.price_ht, d.tva_tx, d.localtax1_tx, d.localtax2_tx, d.qty, d.remise_percent, d.subprice, d.fk_product_fournisseur_price as fk_fournprice, d.buy_price_ht as pa_ht,";
+		$sql.= " d.rowid, d.fk_contrat, d.statut, d.description, d.price_ht, d.vat_src_code, d.tva_tx, d.localtax1_tx, d.localtax2_tx, d.localtax1_type, d.localtax2_type, d.qty, d.remise_percent, d.subprice, d.fk_product_fournisseur_price as fk_fournprice, d.buy_price_ht as pa_ht,";
 		$sql.= " d.total_ht,";
 		$sql.= " d.total_tva,";
 		$sql.= " d.total_localtax1,";
@@ -646,9 +646,12 @@ class Contrat extends CommonObject
 				$line->fk_contrat		= $objp->fk_contrat;
 				$line->desc				= $objp->description;  // Description ligne
 				$line->qty				= $objp->qty;
+				$line->vat_src_code 	q= $objp->vat_src_code ;
 				$line->tva_tx			= $objp->tva_tx;
 				$line->localtax1_tx		= $objp->localtax1_tx;
 				$line->localtax2_tx		= $objp->localtax2_tx;
+				$line->localtax1_type	= $objp->localtax1_type;
+				$line->localtax2_type	= $objp->localtax2_type;
 				$line->subprice			= $objp->subprice;
 				$line->statut			= $objp->statut;
 				$line->remise_percent	= $objp->remise_percent;
@@ -2715,6 +2718,7 @@ class ContratLigne extends CommonObjectLine
 		$this->statut=(int) $this->statut;
 		$this->label=trim($this->label);
 		$this->description=trim($this->description);
+		$this->vat_src_code=trim($this->vat_src_code);
 		$this->tva_tx=trim($this->tva_tx);
 		$this->localtax1_tx=trim($this->localtax1_tx);
 		$this->localtax2_tx=trim($this->localtax2_tx);
@@ -2786,6 +2790,7 @@ class ContratLigne extends CommonObjectLine
 		$sql.= " date_ouverture=".($this->date_ouverture!=''?"'".$this->db->idate($this->date_ouverture)."'":"null").",";
 		$sql.= " date_fin_validite=".($this->date_fin_validite!=''?"'".$this->db->idate($this->date_fin_validite)."'":"null").",";
 		$sql.= " date_cloture=".($this->date_cloture!=''?"'".$this->db->idate($this->date_cloture)."'":"null").",";
+		$sql.= " vat_src_code='".$this->vat_src_code."',";
 		$sql.= " tva_tx='".$this->tva_tx."',";
 		$sql.= " localtax1_tx='".$this->localtax1_tx."',";
 		$sql.= " localtax2_tx='".$this->localtax2_tx."',";
@@ -2914,6 +2919,7 @@ class ContratLigne extends CommonObjectLine
 		$sql.= ") VALUES ($this->fk_contrat, '', '" . $this->db->escape($this->description) . "',";
 		$sql.= ($this->fk_product>0 ? $this->fk_product : "null").",";
 		$sql.= " '".$this->qty."',";
+		$sql.= " '".$this->vat_src_code."',";
 		$sql.= " '".$this->tva_tx."',";
 		$sql.= " '".$this->localtax1_tx."',";
 		$sql.= " '".$this->localtax2_tx."',";

From 29bede28f05a3004a55de6ad10b5001cae0cc92e Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Thu, 4 May 2017 06:49:29 +0200
Subject: [PATCH 178/505] New : Accountancy - Add export model towards Agiris

---
 .../class/accountancyexport.class.php         | 51 +++++++++++++++++--
 htdocs/langs/en_US/accountancy.lang           |  1 +
 2 files changed, 49 insertions(+), 3 deletions(-)

diff --git a/htdocs/accountancy/class/accountancyexport.class.php b/htdocs/accountancy/class/accountancyexport.class.php
index 524326e320c..b59d8ca51a6 100644
--- a/htdocs/accountancy/class/accountancyexport.class.php
+++ b/htdocs/accountancy/class/accountancyexport.class.php
@@ -47,6 +47,7 @@ class AccountancyExport
 	public static $EXPORT_TYPE_QUADRATUS = 6;
 	public static $EXPORT_TYPE_EBP = 7;
 	public static $EXPORT_TYPE_COGILOG = 8;
+	public static $EXPORT_TYPE_AGIRIS = 9;
 
 	/**
 	 *
@@ -96,6 +97,7 @@ class AccountancyExport
 				self::$EXPORT_TYPE_QUADRATUS => $langs->trans('Modelcsv_quadratus'),
 				self::$EXPORT_TYPE_EBP => $langs->trans('Modelcsv_ebp'),
 				self::$EXPORT_TYPE_COGILOG => $langs->trans('Modelcsv_cogilog'),
+				self::$EXPORT_TYPE_AGIRIS => $langs->trans('Modelcsv_agiris')
 		);
 	}
 
@@ -145,6 +147,9 @@ class AccountancyExport
 			case self::$EXPORT_TYPE_COGILOG :
 				$this->exportCogilog($TData);
 				break;
+			case self::$EXPORT_TYPE_AGIRIS :
+				$this->exportAgiris($TData);
+				break;
 			default:
 				$this->errors[] = $langs->trans('accountancy_error_modelnotfound');
 				break;
@@ -382,7 +387,7 @@ class AccountancyExport
 
 
 	/**
-	 * Export format : Normal
+	 * Export format : EBP
 	 *
 	 * @param array $objectLines data
 	 *
@@ -401,8 +406,7 @@ class AccountancyExport
 			print $line->code_journal . $this->separator;
 			print length_accountg($line->numero_compte) . $this->separator;
 			print substr(length_accountg($line->numero_compte),0,2) . $this->separator;
-			print '"'.dol_trunc($line->label_compte,40,'right','UTF-8',1).'"' . $this->separator;
-			print '"'.dol_trunc($line->piece_num,15,'right','UTF-8',1).'"'.$this->separator;
+			print substr(length_accounta($line->code_tiers),0,2) . $this->separator;
 			print price2num($line->montant).$this->separator;
 			print $line->sens.$this->separator;
 			print $date . $this->separator;
@@ -412,6 +416,47 @@ class AccountancyExport
 	}
 
 
+	/**
+	 * Export format : Agiris
+	 *
+	 * @param array $objectLines data
+	 *
+	 * @return void
+	 */
+	public function exportAgiris($objectLines) {
+
+		$this->separator = ';';
+
+		foreach ( $objectLines as $line ) {
+
+			$date = dol_print_date($line->doc_date, '%d%m%Y');
+
+			print $line->id . $this->separator;
+			print '"'.dol_trunc($line->piece_num,15,'right','UTF-8',1).'"'.$this->separator;
+			print $date . $this->separator;
+			print '"'.dol_trunc($line->piece_num,15,'right','UTF-8',1).'"'.$this->separator;
+			
+			if (empty($line->code_tiers)) {
+				print length_accountg($line->numero_compte) . $this->separator;
+			} else {
+				if (substr($line->numero_compte, 0, 1) == 'C' || substr($line->numero_compte, 0, 1) == '9') {
+					print '411' . substr(str_replace(" ", "", $line->code_tiers), 0, 5) . $this->separator;
+				}
+				if (substr($line->numero_compte, 0, 1) == 'F' || substr($line->numero_compte, 0, 1) == '0') {
+					print '401' . substr(str_replace(" ", "", $line->code_tiers), 0, 5) . $this->separator;
+				}
+			}
+			
+			print length_accounta($line->code_tiers) . $this->separator;
+			print price($line->debit) . $this->separator;
+			print price($line->credit) . $this->separator;
+			print price($line->montant).$this->separator;
+			print $line->sens.$this->separator;
+			print $line->code_journal . $this->separator;
+			print $this->end_line;
+		}
+	}
+
 
 	/**
 	 *
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index bd1e41c5464..e84f85898c8 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -225,6 +225,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution
 Modelcsv_quadratus=Export towards Quadratus QuadraCompta
 Modelcsv_ebp=Export towards EBP
 Modelcsv_cogilog=Export towards Cogilog
+Modelcsv_agiris=Export towards Agiris (Test)
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service

From 76f2cc3f1e3a3e4bef4831ca9b76d331664ea0e2 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Thu, 4 May 2017 06:52:07 +0200
Subject: [PATCH 179/505] False operation

---
 htdocs/accountancy/class/accountancyexport.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/accountancy/class/accountancyexport.class.php b/htdocs/accountancy/class/accountancyexport.class.php
index b59d8ca51a6..1af9e5d1a6b 100644
--- a/htdocs/accountancy/class/accountancyexport.class.php
+++ b/htdocs/accountancy/class/accountancyexport.class.php
@@ -406,7 +406,8 @@ class AccountancyExport
 			print $line->code_journal . $this->separator;
 			print length_accountg($line->numero_compte) . $this->separator;
 			print substr(length_accountg($line->numero_compte),0,2) . $this->separator;
-			print substr(length_accounta($line->code_tiers),0,2) . $this->separator;
+			print '"'.dol_trunc($line->label_compte,40,'right','UTF-8',1).'"' . $this->separator;
+			print '"'.dol_trunc($line->piece_num,15,'right','UTF-8',1).'"'.$this->separator;
 			print price2num($line->montant).$this->separator;
 			print $line->sens.$this->separator;
 			print $date . $this->separator;

From 85bf4b742b15ca267431530cb8eb3ab932002d18 Mon Sep 17 00:00:00 2001
From: Laurent Dinclaux <laurent@gecka.nc>
Date: Thu, 4 May 2017 17:21:59 +1100
Subject: [PATCH 180/505] Fix typo

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

diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 85c9d0d158f..3187fcaba42 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -646,7 +646,7 @@ class Contrat extends CommonObject
 				$line->fk_contrat		= $objp->fk_contrat;
 				$line->desc				= $objp->description;  // Description ligne
 				$line->qty				= $objp->qty;
-				$line->vat_src_code 	q= $objp->vat_src_code ;
+				$line->vat_src_code 	= $objp->vat_src_code ;
 				$line->tva_tx			= $objp->tva_tx;
 				$line->localtax1_tx		= $objp->localtax1_tx;
 				$line->localtax2_tx		= $objp->localtax2_tx;

From 694efca32ac10f666b59b57b7a53d48e20ba0e4c Mon Sep 17 00:00:00 2001
From: "Guillaume T. (Arck Consulting)" <guillaume@arckconsulting.fr>
Date: Thu, 4 May 2017 09:32:06 +0200
Subject: [PATCH 181/505] [FIX] Credit Note for fourn doesn't work, missing
 filed in create method & attribut

---
 htdocs/fourn/class/fournisseur.facture.class.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 42daafe9c2d..1798eb19059 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -128,7 +128,9 @@ class FactureFournisseur extends CommonInvoice
     public $multicurrency_total_ht;
     public $multicurrency_total_tva;
     public $multicurrency_total_ttc;
-
+    //! id of source invoice if replacement invoice or credit note
+    public $fk_facture_source;
+    
     /**
      * Standard invoice
      */
@@ -263,6 +265,7 @@ class FactureFournisseur extends CommonInvoice
         $sql.= ", fk_multicurrency";
         $sql.= ", multicurrency_code";
         $sql.= ", multicurrency_tx";
+        $sql.= ", fk_facture_source";
         $sql.= ")";
         $sql.= " VALUES (";
 		$sql.= "'(PROV)'";
@@ -286,6 +289,7 @@ class FactureFournisseur extends CommonInvoice
 		$sql.= ", ".(int) $this->fk_multicurrency;
 		$sql.= ", '".$this->db->escape($this->multicurrency_code)."'";
 		$sql.= ", ".(double) $this->multicurrency_tx;
+        $sql.= ", ".(isset($this->fk_facture_source)?$this->fk_facture_source:"NULL");
         $sql.= ")";
 
         dol_syslog(get_class($this)."::create", LOG_DEBUG);

From 270c3db32ebc861d6714321465a5379f4f6d71d0 Mon Sep 17 00:00:00 2001
From: David <dvasseur@users.noreply.github.com>
Date: Tue, 18 Apr 2017 16:47:06 +0200
Subject: [PATCH 182/505] fix params order for tha addline() function

please check to last param "$request_data->fk_remise_except", I couldn't find a corresponding parameter name in the addline() function
---
 htdocs/comm/propal/class/api_proposals.class.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/htdocs/comm/propal/class/api_proposals.class.php b/htdocs/comm/propal/class/api_proposals.class.php
index 0440793ceac..ec7ca53357a 100644
--- a/htdocs/comm/propal/class/api_proposals.class.php
+++ b/htdocs/comm/propal/class/api_proposals.class.php
@@ -260,12 +260,9 @@ class Proposals extends DolibarrApi
                         $request_data->localtax2_tx,
                         $request_data->fk_product,
                         $request_data->remise_percent,
-                        $request_data->info_bits,
-                        $request_data->fk_remise_except,
                         'HT',
                         0,
-                        $request_data->date_start,
-                        $request_data->date_end,
+                        $request_data->info_bits,
                         $request_data->product_type,
                         $request_data->rang,
                         $request_data->special_code,
@@ -273,10 +270,14 @@ class Proposals extends DolibarrApi
                         $request_data->fk_fournprice,
                         $request_data->pa_ht,
                         $request_data->label,
+                        $request_data->date_start,
+                        $request_data->date_end,
                         $request_data->array_options,
                         $request_data->fk_unit,
                         $this->element,
                         $request_data->id
+                        // not used anymore ?
+                        // $request_data->fk_remise_except
       );
 
       if ($updateRes > 0) {

From 8318ebc1096d464b6427d0812c6d32c79265b233 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 4 May 2017 10:45:20 +0200
Subject: [PATCH 183/505] Fix missing field into addline of proposals

---
 htdocs/comm/propal/class/api_proposals.class.php | 11 ++++++-----
 htdocs/comm/propal/class/propal.class.php        | 10 ++++++----
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/htdocs/comm/propal/class/api_proposals.class.php b/htdocs/comm/propal/class/api_proposals.class.php
index ec7ca53357a..fd508b03256 100644
--- a/htdocs/comm/propal/class/api_proposals.class.php
+++ b/htdocs/comm/propal/class/api_proposals.class.php
@@ -16,9 +16,10 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
- use Luracast\Restler\RestException;
+use Luracast\Restler\RestException;
+
+require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 
- require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 
 /**
  * API class for orders
@@ -275,9 +276,9 @@ class Proposals extends DolibarrApi
                         $request_data->array_options,
                         $request_data->fk_unit,
                         $this->element,
-                        $request_data->id
-                        // not used anymore ?
-                        // $request_data->fk_remise_except
+                        $request_data->id,
+                        $request_data->pu_ht_devise,
+                        $request_data->fk_remise_except
       );
 
       if ($updateRes > 0) {
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 4587e960c4c..a18dbfb86b0 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -395,15 +395,16 @@ class Propal extends CommonObject
      * 		@param 		string		$fk_unit 			Code of the unit to use. Null to use the default one
      *      @param		string		$origin				'order', ...
      *      @param		int			$origin_id			Id of origin object
-     *    	@return    	int         	    			>0 if OK, <0 if KO
      * 		@param		double		$pu_ht_devise		Unit price in currency
+     * 		@param		int    		$fk_remise_except	Id discount if line is from a discount
+     *    	@return    	int         	    			>0 if OK, <0 if KO
      *    	@see       	add_product
      */
-	function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1=0.0, $txlocaltax2=0.0, $fk_product=0, $remise_percent=0.0, $price_base_type='HT', $pu_ttc=0.0, $info_bits=0, $type=0, $rang=-1, $special_code=0, $fk_parent_line=0, $fk_fournprice=0, $pa_ht=0, $label='',$date_start='', $date_end='',$array_options=0, $fk_unit=null, $origin='', $origin_id=0, $pu_ht_devise = 0)
+	function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1=0.0, $txlocaltax2=0.0, $fk_product=0, $remise_percent=0.0, $price_base_type='HT', $pu_ttc=0.0, $info_bits=0, $type=0, $rang=-1, $special_code=0, $fk_parent_line=0, $fk_fournprice=0, $pa_ht=0, $label='',$date_start='', $date_end='',$array_options=0, $fk_unit=null, $origin='', $origin_id=0, $pu_ht_devise=0, $fk_remise_except=0)
     {
     	global $mysoc, $conf, $langs;
 
-        dol_syslog(get_class($this)."::addline propalid=$this->id, desc=$desc, pu_ht=$pu_ht, qty=$qty, txtva=$txtva, fk_product=$fk_product, remise_except=$remise_percent, price_base_type=$price_base_type, pu_ttc=$pu_ttc, info_bits=$info_bits, type=$type");
+        dol_syslog(get_class($this)."::addline propalid=$this->id, desc=$desc, pu_ht=$pu_ht, qty=$qty, txtva=$txtva, fk_product=$fk_product, remise_except=$remise_percent, price_base_type=$price_base_type, pu_ttc=$pu_ttc, info_bits=$info_bits, type=$type, fk_remise_except=".$fk_remise_except);
         include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 
         // Clean parameters
@@ -519,6 +520,8 @@ class Propal extends CommonObject
 			$this->line->localtax1_type = $localtaxes_type[0];
 			$this->line->localtax2_type = $localtaxes_type[2];
             $this->line->fk_product=$fk_product;
+            $this->line->product_type=$type;
+            $this->line->fk_remise_except=$fk_remise_except;
             $this->line->remise_percent=$remise_percent;
             $this->line->subprice=$pu_ht;
             $this->line->rang=$rangtouse;
@@ -528,7 +531,6 @@ class Propal extends CommonObject
             $this->line->total_localtax1=$total_localtax1;
             $this->line->total_localtax2=$total_localtax2;
             $this->line->total_ttc=$total_ttc;
-            $this->line->product_type=$type;
             $this->line->special_code=$special_code;
             $this->line->fk_parent_line=$fk_parent_line;
             $this->line->fk_unit=$fk_unit;

From f543461e9b084de70e84ba06a5ed15c4f2943394 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 4 May 2017 11:21:28 +0200
Subject: [PATCH 184/505] Complete the substitution array with substitution
 array with all possible keys

---
 htdocs/core/class/html.formmail.class.php | 3 +++
 htdocs/core/lib/functions.lib.php         | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index d7ab17e60c4..6c411b60e66 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -1133,6 +1133,9 @@ class FormMail extends Form
 				$vars['__SECUREKEYPAYPAL_MEMBER__']='';
 			}
 		}
+		
+		$vars=complete_substitutions_array($vars, $langs, null, null);
+		
 		return $vars;
 	}
 
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 857ddc6eec2..b6cf92aa81d 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -4953,7 +4953,8 @@ function make_substitutions($text, $substitutionarray, $outputlangs=null)
 }
 
 /**
- *  Complete the $substitutionarray with more entries
+ *  Complete the $substitutionarray with more entries.
+ *  Can also add substitution keys coming from external module that had set the "substitutions=1" into module_part array. In this case, method completesubstitutionarray provided by module is called. 
  *
  *  @param  array		$substitutionarray		Array substitution old value => new value value
  *  @param  Translate	$outputlangs            Output language

From 7ec46b3bd6ace90a7e91e51198d874f484ff1e0b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 4 May 2017 12:35:45 +0200
Subject: [PATCH 185/505] Finished work to have substitution keys code
 mutualized.

---
 htdocs/accountancy/admin/accountmodel.php |  3 +--
 htdocs/admin/mails_templates.php          | 22 +++++++++++++++-------
 htdocs/core/class/html.formmail.class.php | 18 ++++++++++++------
 3 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/htdocs/accountancy/admin/accountmodel.php b/htdocs/accountancy/admin/accountmodel.php
index 0b4aa70e548..55c194cd416 100644
--- a/htdocs/accountancy/admin/accountmodel.php
+++ b/htdocs/accountancy/admin/accountmodel.php
@@ -757,8 +757,7 @@ if ($id)
         {
         	print '<tr><td colspan="8">* '.$langs->trans("AvailableVariables").": ";
         	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
-        	$formmail=new FormMail($db);
-        	$tmp=$formmail->getAvailableSubstitKey('form');
+        	$tmp=FormMail::getAvailableSubstitKey('formemail');
         	print implode(', ', $tmp);
         	print '</td></tr>';
         }
diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php
index f0bf5609adf..08ba76dca99 100644
--- a/htdocs/admin/mails_templates.php
+++ b/htdocs/admin/mails_templates.php
@@ -118,17 +118,17 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
 $formmail=new FormMail($db);
 if (empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES))
 {
-    $tmp=$formmail->getAvailableSubstitKey('form');
+    $tmp=FormMail::getAvailableSubstitKey('formemail');
     $tmp['__(AnyTransKey)__']='__(AnyTransKey)__';
     $helpsubstit = $langs->trans("AvailableVariables").':<br>'.implode('<br>', $tmp);
     $helpsubstitforlines = $langs->trans("AvailableVariables").':<br>'.implode('<br>', $tmp);
 }
 else
 {
-    $tmp=$formmail->getAvailableSubstitKey('formwithlines');
+    $tmp=FormMail::getAvailableSubstitKey('formemailwithlines');
     $tmp['__(AnyTransKey)__']='__(AnyTransKey)__';
     $helpsubstit = $langs->trans("AvailableVariables").':<br>'.implode('<br>', $tmp);
-    $tmp=$formmail->getAvailableSubstitKey('formforlines');
+    $tmp=FormMail::getAvailableSubstitKey('formemailforlines');
     $helpsubstitforlines = $langs->trans("AvailableVariables").':<br>'.implode('<br>', $tmp);
 }
 
@@ -484,7 +484,11 @@ if ($action != 'edit')
         {
             print '<td align="'.$align.'">';
         	if (! empty($tabhelp[$id][$value]) && preg_match('/^http(s*):/i',$tabhelp[$id][$value])) print '<a href="'.$tabhelp[$id][$value].'" target="_blank">'.$valuetoshow.' '.img_help(1,$valuetoshow).'</a>';
-        	else if (! empty($tabhelp[$id][$value])) print $form->textwithpicto($valuetoshow,$tabhelp[$id][$value]);
+        	else if (! empty($tabhelp[$id][$value])) 
+        	{
+        	    if (in_array($value, array('topic'))) print $form->textwithpicto($valuetoshow, $tabhelp[$id][$value], 1, 'help', '', 0, 2, $value);   // Tooltip on click
+        	    else print $form->textwithpicto($valuetoshow, $tabhelp[$id][$value], 1, 'help', '', 0, 2);                             // Tooltip on hover
+        	}
         	else print $valuetoshow;
             print '</td>';
          }
@@ -539,8 +543,8 @@ if ($action != 'edit')
     foreach ($fieldsforcontent as $tmpfieldlist)
     {
         print '<tr class="impair nodrag nodrop nohover"><td colspan="5">';
-        if ($tmpfieldlist == 'content') print '<strong>'.$form->textwithpicto($langs->trans("Content"),$tabhelp[$id][$tmpfieldlist]).'</strong><br>';
-        if ($tmpfieldlist == 'content_lines') print '<strong>'.$form->textwithpicto($langs->trans("ContentForLines"),$tabhelp[$id][$tmpfieldlist]).'</strong><br>';
+        if ($tmpfieldlist == 'content') print '<strong>'.$form->textwithpicto($langs->trans("Content"), $tabhelp[$id][$tmpfieldlist], 1, 'help', '', 0, 2, $tmpfieldlist).'</strong><br>';
+        if ($tmpfieldlist == 'content_lines') print '<strong>'.$form->textwithpicto($langs->trans("ContentForLines"), $tabhelp[$id][$tmpfieldlist], 1, 'help', '', 0, 2, $tmpfieldlist).'</strong><br>';
     
         if ($context != 'hide')
         {
@@ -624,7 +628,11 @@ if ($resql)
         // Affiche nom du champ
         if ($showfield)
         {
-            if (! empty($tabhelp[$id][$value])) $valuetoshow = $form->textwithpicto($valuetoshow,$tabhelp[$id][$value]);
+            if (! empty($tabhelp[$id][$value])) 
+            {
+                if (in_array($value, array('topic'))) $valuetoshow = $form->textwithpicto($valuetoshow, $tabhelp[$id][$value], 1, 'help', '', 0, 2);   // Tooltip on hover
+                else $valuetoshow = $form->textwithpicto($valuetoshow, $tabhelp[$id][$value], 1, 'help', '', 0, 2);                             // Tooltip on hover
+            }
             print getTitleFieldOfList($valuetoshow, 0, $_SERVER["PHP_SELF"], ($sortable?$fieldlist[$field]:''), ($page?'page='.$page.'&':''), $param, "align=".$align, $sortfield, $sortorder);
         }
     }
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 6c411b60e66..6988fb4b992 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -1059,18 +1059,18 @@ class FormMail extends Form
 	}
 	
 	/**
-	 * Set substit array from object
+	 * Get list of substition keys available.
 	 * 
-	 * @param	string	$mode		'form', 'formwithlines', 'formforlines' or 'emailing'
+	 * @param	string	$mode		'formemail', 'formemailwithlines', 'formemailforlines', 'emailing', ...
 	 * @return	void
 	 */
-	function getAvailableSubstitKey($mode='form')
+	static function getAvailableSubstitKey($mode='formemail')
 	{
-		global $conf;
+		global $conf, $langs;
 		
 		$vars=array();
 		
-		if ($mode == 'form' || $mode == 'formwithlines' || $mode == 'formforlines')
+		if ($mode == 'formemail' || $mode == 'formemailwithlines' || $mode == 'formemailforlines')
 		{
 			$vars=array(
 				'__REF__', 
@@ -1134,7 +1134,13 @@ class FormMail extends Form
 			}
 		}
 		
-		$vars=complete_substitutions_array($vars, $langs, null, null);
+		$tmparray=array();
+		$parameters=array('mode'=>$mode);
+		complete_substitutions_array($tmparray, $langs, null, $parameters);
+		foreach($tmparray as $key => $val)
+		{
+		    $vars[]=$key;
+		}
 		
 		return $vars;
 	}

From 1a6c118a5dfa001a8dd5cda90402d543cd067902 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 4 May 2017 12:41:29 +0200
Subject: [PATCH 186/505] Fix travis warning

---
 htdocs/product/inventory/card.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/htdocs/product/inventory/card.php b/htdocs/product/inventory/card.php
index dc279cc0929..827354b864c 100644
--- a/htdocs/product/inventory/card.php
+++ b/htdocs/product/inventory/card.php
@@ -127,8 +127,6 @@ if (empty($reshook))
         	header('Location: '.dol_buildpath('/product/inventory/card.php?action=create', 1));
         	exit;
         }
-        
-		break;
     }
     
     switch($action) {

From 7d5b5cf86a1da58fad3a006cdee9f2ec079d2eb9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 4 May 2017 13:09:42 +0200
Subject: [PATCH 187/505] Better behavior for tooltip on click

---
 htdocs/core/class/html.form.class.php | 5 +++--
 htdocs/langs/en_US/main.lang          | 7 ++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 3275ee0f303..cab420fe888 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -492,10 +492,11 @@ class Form
      */
     function textwithpicto($text, $htmltext, $direction = 1, $type = 'help', $extracss = '', $noencodehtmltext = 0, $notabs = 2, $tooltiptrigger='')
     {
-        global $conf;
+        global $conf, $langs;
 
         $alt = '';
-
+        if ($tooltiptrigger) $alt=$langs->trans("ClickToShowHelp");
+        
         //For backwards compatibility
         if ($type == '0') $type = 'info';
         elseif ($type == '1') $type = 'help';
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 1a3eea413df..c567890730a 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -766,6 +766,9 @@ Download=Download
 ActualizeCurrency=Update currency rate
 Fiscalyear=Fiscal year
 ModuleBuilder=Module Builder
+SetMultiCurrencyCode=Set currency
+BulkActions=Bulk actions
+ClickToShowHelp=Click to show tooltip help
 # Week day
 Monday=Monday
 Tuesday=Tuesday
@@ -822,6 +825,4 @@ SearchIntoInterventions=Interventions
 SearchIntoContracts=Contracts
 SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Expense reports
-SearchIntoLeaves=Leaves
-SetMultiCurrencyCode=Set currency
-BulkActions=Bulk actions
\ No newline at end of file
+SearchIntoLeaves=Leaves
\ No newline at end of file

From 0c76db7973ef2f410f08a4551e36bff48720b5dc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 4 May 2017 13:41:37 +0200
Subject: [PATCH 188/505] FIX #6698 #6742

---
 htdocs/comm/mailing/cibles.php               | 51 +++++++++++---------
 htdocs/comm/mailing/class/mailing.class.php  |  2 +-
 htdocs/core/class/html.formmail.class.php    |  2 +-
 htdocs/core/class/html.formmailing.class.php | 14 +++---
 4 files changed, 36 insertions(+), 33 deletions(-)

diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index d3642c50393..118cc336fb7 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -161,6 +161,7 @@ if ($_POST["button_removefilter"])
 	$search_lastname='';
 	$search_firstname='';
 	$search_email='';
+	$search_dest_status='';
 }
 
 
@@ -399,7 +400,7 @@ if ($object->fetch($id) >= 0)
 	if ($search_lastname)    $sql.= " AND mc.lastname    LIKE '%".$db->escape($search_lastname)."%'";
 	if ($search_firstname) $sql.= " AND mc.firstname LIKE '%".$db->escape($search_firstname)."%'";
 	if ($search_email)  $sql.= " AND mc.email  LIKE '%".$db->escape($search_email)."%'";
-	if (!empty($search_dest_status)) $sql.= " AND mc.statut=".$db->escape($search_dest_status)." ";
+	if ($search_dest_status != '' && $search_dest_status >= -1) $sql.= " AND mc.statut=".$db->escape($search_dest_status)." ";
 	$sql .= $db->order($sortfield,$sortorder);
 
 	// Count total nb of records
@@ -411,7 +412,7 @@ if ($object->fetch($id) >= 0)
 	}
 	//$nbtotalofrecords=$object->nbemail;     // nbemail is a denormalized field storing nb of targets
 	$sql .= $db->plimit($limit+1, $offset);
-
+	
 	$resql=$db->query($sql);
 	if ($resql)
 	{
@@ -446,29 +447,12 @@ if ($object->fetch($id) >= 0)
 		print '<input type="hidden" name="limit" value="'.$limit.'">';
 		
 
-		if ($page)			$param.= "&amp;page=".$page;
+		if ($page)	$param.= "&amp;page=".$page;
+		
 		print '<table class="noborder" width="100%">';
-		print '<tr class="liste_titre">';
-		print_liste_field_titre($langs->trans("EMail"),$_SERVER["PHP_SELF"],"mc.email",$param,"","",$sortfield,$sortorder);
-		print_liste_field_titre($langs->trans("Lastname"),$_SERVER["PHP_SELF"],"mc.lastname",$param,"","",$sortfield,$sortorder);
-		print_liste_field_titre($langs->trans("Firstname"),$_SERVER["PHP_SELF"],"mc.firstname",$param,"","",$sortfield,$sortorder);
-		print_liste_field_titre($langs->trans("OtherInformations"),$_SERVER["PHP_SELF"],"",$param,"","",$sortfield,$sortorder);
-		print_liste_field_titre($langs->trans("Source"),$_SERVER["PHP_SELF"],"",$param,"",'align="center"',$sortfield,$sortorder);
-		// Date sending
-		if ($object->statut < 2)
-		{
-			print_liste_field_titre('');
-		}
-		else
-		{
-			print_liste_field_titre($langs->trans("DateSending"),$_SERVER["PHP_SELF"],"mc.date_envoi",$param,'','align="center"',$sortfield,$sortorder);
-		}
-		print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"mc.statut",$param,'','align="right"',$sortfield,$sortorder);
-		print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,'maxwidthsearch ');
-		print '</tr>';
-
+		
 		// Ligne des champs de filtres
-		print '<tr class="liste_titre">';
+		print '<tr class="liste_titre_filter">';
 		// EMail
 		print '<td class="liste_titre">';
 		print '<input class="flat maxwidth100" type="text" name="search_email" value="'.dol_escape_htmltag($search_email).'">';
@@ -489,7 +473,7 @@ if ($object->fetch($id) >= 0)
 		print '<td class="liste_titre">';
 		print '&nbsp';
 		print '</td>';
-
+		
 		// Date sending
 		print '<td class="liste_titre">';
 		print '&nbsp';
@@ -504,6 +488,25 @@ if ($object->fetch($id) >= 0)
 		print $searchpitco;
 		print '</td>';
 		print '</tr>';
+		
+		print '<tr class="liste_titre">';
+		print_liste_field_titre($langs->trans("EMail"),$_SERVER["PHP_SELF"],"mc.email",$param,"","",$sortfield,$sortorder);
+		print_liste_field_titre($langs->trans("Lastname"),$_SERVER["PHP_SELF"],"mc.lastname",$param,"","",$sortfield,$sortorder);
+		print_liste_field_titre($langs->trans("Firstname"),$_SERVER["PHP_SELF"],"mc.firstname",$param,"","",$sortfield,$sortorder);
+		print_liste_field_titre($langs->trans("OtherInformations"),$_SERVER["PHP_SELF"],"",$param,"","",$sortfield,$sortorder);
+		print_liste_field_titre($langs->trans("Source"),$_SERVER["PHP_SELF"],"",$param,"",'align="center"',$sortfield,$sortorder);
+		// Date sending
+		if ($object->statut < 2)
+		{
+			print_liste_field_titre('');
+		}
+		else
+		{
+			print_liste_field_titre($langs->trans("DateSending"),$_SERVER["PHP_SELF"],"mc.date_envoi",$param,'','align="center"',$sortfield,$sortorder);
+		}
+		print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"mc.statut",$param,'','align="right"',$sortfield,$sortorder);
+		print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,'maxwidthsearch ');
+		print '</tr>';
 
 		$i = 0;
 
diff --git a/htdocs/comm/mailing/class/mailing.class.php b/htdocs/comm/mailing/class/mailing.class.php
index b0dff81332c..43a3cdcb78d 100644
--- a/htdocs/comm/mailing/class/mailing.class.php
+++ b/htdocs/comm/mailing/class/mailing.class.php
@@ -80,8 +80,8 @@ class Mailing extends CommonObject
 		$this->statuts[2] = 'MailingStatusSentPartialy';
 		$this->statuts[3] = 'MailingStatusSentCompletely';
 
-		$this->statut_dest[0] = 'MailingStatusNotSent';
 		$this->statut_dest[-1] = 'MailingStatusError';
+		$this->statut_dest[0] = 'MailingStatusNotSent';
 		$this->statut_dest[1] = 'MailingStatusSent';
 		$this->statut_dest[2] = 'MailingStatusRead';
 		$this->statut_dest[3] = 'MailingStatusReadAndUnsubscribe';    // Read but ask to not be contacted anymore
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 6988fb4b992..ab58854f2c4 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -1139,7 +1139,7 @@ class FormMail extends Form
 		complete_substitutions_array($tmparray, $langs, null, $parameters);
 		foreach($tmparray as $key => $val)
 		{
-		    $vars[]=$key;
+		    $vars[$key]=$key;
 		}
 		
 		return $vars;
diff --git a/htdocs/core/class/html.formmailing.class.php b/htdocs/core/class/html.formmailing.class.php
index 0c63049f9d8..9fb4e4eea86 100644
--- a/htdocs/core/class/html.formmailing.class.php
+++ b/htdocs/core/class/html.formmailing.class.php
@@ -32,9 +32,9 @@ class FormMailing  extends Form
 	/**
 	 * Output a select with destinaries status
 	 * 
-	 * @param string $selectedid the selected id
-	 * @param string $htmlname name of controm
-	 * @param integer $show_empty show empty option
+	 * @param string   $selectedid     The selected id
+	 * @param string   $htmlname       Name of controm
+	 * @param integer  $show_empty     Show empty option
 	 * @return string HTML select
 	 */
 	public function selectDestinariesStatus($selectedid='',$htmlname='dest_status', $show_empty=0) {
@@ -46,13 +46,13 @@ class FormMailing  extends Form
 		$mailing = new Mailing($this->db);
 
 		$options = array();
-
+        
 		if ($show_empty) {
-			$options[''] = '';
+			$options[-2] = '';   // Note -1 is used for error
 		}
 
-		$options = array_merge($options, $mailing->statut_dest);
+        $options = $options + $mailing->statut_dest;
 
-		return Form::selectarray($htmlname, $options, $selectedid, 0, 0, 0, '', 1);
+        return Form::selectarray($htmlname, $options, $selectedid, 0, 0, 0, '', 1);
 	}
 }

From b8d63ae6c0c927326cd31e37c0b85f7d73070c1e Mon Sep 17 00:00:00 2001
From: florian HENRY <florian.henry@atm-consulting.fr>
Date: Thu, 4 May 2017 14:04:30 +0200
Subject: [PATCH 189/505] Better fix

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

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 7f10fca51f8..3687a070dbb 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -1437,7 +1437,7 @@ class Form
         	{
         		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ug";
         		$sql.= " ON ug.fk_user = u.rowid";
-        		$sql.= " AND ug.entity = ".$conf->entity;
+        		$sql.= " WHERE ug.entity = ".$conf->entity;
         	}
         	else
         	{

From ea58fb0b50b947e623abc439cb0fb93c4f8f4c7f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 4 May 2017 15:52:12 +0200
Subject: [PATCH 190/505] Fix triggered error

---
 .../class/fournisseur.commande.class.php      | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 04f50e9fbcb..fb43b68de95 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -2669,21 +2669,22 @@ class CommandeFournisseur extends CommonOrder
             $sql.= " FROM ".MAIN_DB_PREFIX.'c_input_method';
             $sql.= " WHERE active=1 AND rowid = ".$db->escape($this->methode_commande_id);
 
-            $query = $db->query($sql);
-            if ($query && $db->num_rows($query))
+            $resql = $db->query($sql);
+            if ($resql)
             {
-                $obj = $db->fetch_object($query);
-
-                $string = $langs->trans($obj->code);
-                if ($string == $obj->code)
+                if ($db->num_rows($query))
                 {
-                    $string = $obj->label != '-' ? $obj->label : '';
-                }
-
-                return $string;
+                    $obj = $db->fetch_object($query);
+    
+                    $string = $langs->trans($obj->code);
+                    if ($string == $obj->code)
+                    {
+                        $string = $obj->label != '-' ? $obj->label : '';
+                    }
+                    return $string;
+                }    
             }
-
-            dol_print_error($db);
+            else dol_print_error($db);
         }
 
         return '';

From ce05c74e47859f0ec78d3a3c616d4a0b7784d738 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 4 May 2017 17:48:52 +0200
Subject: [PATCH 191/505] NEW SUPPLIER_ORDER_EDIT_BUYINGPRICE_DURING_RECEIPT

---
 .../class/fournisseur.commande.class.php      |  2 +-
 htdocs/fourn/commande/dispatch.php            | 37 ++++++++++++++-----
 2 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index fb43b68de95..c326d033de8 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -2818,7 +2818,7 @@ class CommandeFournisseur extends CommonOrder
 
     
     /**
-     * Calc status regarding dispatch stock
+     * Calc status regarding to dispatched stock
      *
      * @param 		User 	$user                   User action
      * @param       int     $closeopenorder         Close if received
diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php
index c87b3a62bed..b7e3830ad5c 100644
--- a/htdocs/fourn/commande/dispatch.php
+++ b/htdocs/fourn/commande/dispatch.php
@@ -467,16 +467,14 @@ if ($id > 0 || ! empty($ref)) {
 					if ($remaintodispatch || empty($conf->global->SUPPLIER_ORDER_DISABLE_STOCK_DISPATCH_WHEN_TOTAL_REACHED)) {
 						$nbproduct++;
 
-						$var = ! $var;
-
 						// To show detail cref and description value, we must make calculation by cref
 						// print ($objp->cref?' ('.$objp->cref.')':'');
 						// if ($objp->description) print '<br>'.nl2br($objp->description);
 						$suffix = '_0_' . $i;
 
 						print "\n";
-						print '<!-- Line ' . $suffix . ' -->' . "\n";
-						print "<tr " . $bc[$var] . ">";
+						print '<!-- Line to dispatch ' . $suffix . ' -->' . "\n";
+						print '<tr class="oddeven">';
 
 						$linktoprod = '<a href="' . DOL_URL_ROOT . '/product/fournisseurs.php?id=' . $objp->fk_product . '">' . img_object($langs->trans("ShowProduct"), 'product') . ' ' . $objp->ref . '</a>';
 						$linktoprod .= ' - ' . $objp->label . "\n";
@@ -500,7 +498,7 @@ if ($id > 0 || ! empty($ref)) {
 							print "</td>";
 						}
 
-						$var = ! $var;
+						// Define unit price for PMP calculation
 						$up_ht_disc = $objp->subprice;
 						if (! empty($objp->remise_percent) && empty($conf->global->STOCK_EXCLUDE_DISCOUNT_FOR_PMP))
 							$up_ht_disc = price2num($up_ht_disc * (100 - $objp->remise_percent) / 100, 'MU');
@@ -517,11 +515,21 @@ if ($id > 0 || ! empty($ref)) {
 							print '<td></td>'; // Warehouse column
 							print '</tr>';
 
-							print '<tr ' . $bc[$var] . ' name="' . $type . $suffix . '">';
+							print '<tr class="oddeven" name="' . $type . $suffix . '">';
 							print '<td>';
 							print '<input name="fk_commandefourndet' . $suffix . '" type="hidden" value="' . $objp->rowid . '">';
 							print '<input name="product_batch' . $suffix . '" type="hidden" value="' . $objp->fk_product . '">';
-							print '<input name="pu' . $suffix . '" type="hidden" value="' . $up_ht_disc . '"><!-- This is a up including discount -->';
+							
+							print '<!-- This is a up (may include discount or not depending on STOCK_EXCLUDE_DISCOUNT_FOR_PMP. will be used for PMP calculation) -->';
+							if (! empty($conf->global->SUPPLIER_ORDER_EDIT_BUYINGPRICE_DURING_RECEIPT)) // Not tested !
+							{
+							    print $langs->trans("BuyingPrice").': <input class="maxwidth75" name="pu' . $suffix . '" type="text" value="' . price2num($up_ht_disc, 'MU') . '">';
+							}
+							else
+							{
+							    print '<input class="maxwidth75" name="pu' . $suffix . '" type="hidden" value="' . price2num($up_ht_disc, 'MU') . '">';
+							}
+
 							// hidden fields for js function
 							print '<input id="qty_ordered' . $suffix . '" type="hidden" value="' . $objp->qty . '">';
 							print '<input id="qty_dispatched' . $suffix . '" type="hidden" value="' . ( float ) $products_dispatched[$objp->rowid] . '">';
@@ -544,11 +552,22 @@ if ($id > 0 || ! empty($ref)) {
 							print '<td align="right">' . img_picto($langs->trans('AddStockLocationLine'), 'split.png', 'onClick="addDispatchLine(' . $i . ',\'' . $type . '\')"') . '</td>'; // Dispatch column
 							print '<td></td>';
 							print '</tr>';
-							print '<tr ' . $bc[$var] . ' name="' . $type . $suffix . '">';
+
+							print '<tr class="oddeven" name="' . $type . $suffix . '">';
 							print '<td colspan="6">';
 							print '<input name="fk_commandefourndet' . $suffix . '" type="hidden" value="' . $objp->rowid . '">';
 							print '<input name="product' . $suffix . '" type="hidden" value="' . $objp->fk_product . '">';
-							print '<input name="pu' . $suffix . '" type="hidden" value="' . $up_ht_disc . '"><!-- This is a up including discount -->';
+							
+							print '<!-- This is a up (may include discount or not depending on STOCK_EXCLUDE_DISCOUNT_FOR_PMP. will be used for PMP calculation) -->';
+							if (! empty($conf->global->SUPPLIER_ORDER_EDIT_BUYINGPRICE_DURING_RECEIPT)) // Not tested !
+							{
+							    print $langs->trans("BuyingPrice").': <input class="maxwidth75" name="pu' . $suffix . '" type="text" value="' . price2num($up_ht_disc, 'MU') . '">';
+							}
+							else
+							{
+							    print '<input class="maxwidth75" name="pu' . $suffix . '" type="hidden" value="' . price2num($up_ht_disc, 'MU') . '">';
+							}
+							
 							// hidden fields for js function
 							print '<input id="qty_ordered' . $suffix . '" type="hidden" value="' . $objp->qty . '">';
 							print '<input id="qty_dispatched' . $suffix . '" type="hidden" value="' . ( float ) $products_dispatched[$objp->rowid] . '">';

From 2de335e2dc29194671f67eb4146bbdf3ba447e5c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 4 May 2017 18:49:58 +0200
Subject: [PATCH 192/505] Action must be a verb

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

diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 216c9187b0f..ec4e218a11e 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -171,7 +171,7 @@ SearchOf=Search
 Valid=Valid
 Approve=Approve
 Disapprove=Disapprove
-ReOpen=Re-Opened
+ReOpen=Re-Open
 Upload=Send file
 ToLink=Link
 Select=Select

From bf616cbe05437e89e4f9140e600ddd3593e61929 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 4 May 2017 19:05:02 +0200
Subject: [PATCH 193/505] Fix bad var

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

diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index 6bca5b7d5a4..28a287971a8 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -358,8 +358,8 @@ class Conf
     			$this->supplier_order->dir_temp=$rootfordata."/fournisseur/commande/temp";
     			$this->supplier_invoice=new stdClass();
     			$this->supplier_invoice->enabled=1;
-    			$this->supplier_order->dir_output=$rootfordata."/fournisseur/facture";
-    			$this->supplier_order->dir_temp=$rootfordata."/fournisseur/facture/temp";
+    			$this->supplier_invoice->dir_output=$rootfordata."/fournisseur/facture";
+    			$this->supplier_invoice->dir_temp=$rootfordata."/fournisseur/facture/temp";
 			}
 		}
 

From 39d9a0f979c8163608120c7d668f57968a625aac Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 4 May 2017 19:11:19 +0200
Subject: [PATCH 194/505] Support of pdf preview on supplier orders

---
 htdocs/core/lib/files.lib.php     | 10 ++++++++--
 htdocs/core/lib/functions.lib.php | 23 +++++++++++------------
 htdocs/theme/eldy/style.css.php   |  3 +++
 htdocs/theme/md/style.css.php     |  6 ++----
 4 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index cbf4af402ae..18f1e30edc7 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -1628,8 +1628,14 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 	// Wrapping pour les apercu intervention
 	elseif (($modulepart == 'apercufichinter' || $modulepart == 'apercuficheinter') && !empty($conf->ficheinter->dir_output))
 	{
-		if ($fuser->rights->ficheinter->lire) $accessallowed=1;
-		$original_file=$conf->ficheinter->dir_output.'/'.$original_file;
+	    if ($fuser->rights->ficheinter->lire) $accessallowed=1;
+	    $original_file=$conf->ficheinter->dir_output.'/'.$original_file;
+	}
+	// Wrapping pour les apercu commande
+	elseif (($modulepart == 'apercusupplier_order' || $modulepart == 'apercusupplier_order') && !empty($conf->fournisseur->commande->dir_output))
+	{
+	    if ($fuser->rights->fournisseur->commande->lire) $accessallowed=1;
+	    $original_file=$conf->fournisseur->commande->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les images des stats propales
 	elseif ($modulepart == 'propalstats' && !empty($conf->propal->dir_temp))
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index b6cf92aa81d..da0a33e7ef1 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1065,11 +1065,11 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
 	if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance)) $showbarcode=0;
 	$modulepart='unknown';
 
-	if ($object->element == 'societe')   $modulepart='societe';
-	if ($object->element == 'contact')   $modulepart='contact';
-	if ($object->element == 'member')    $modulepart='memberphoto';
-	if ($object->element == 'user')      $modulepart='userphoto';
-	if ($object->element == 'product')   $modulepart='product';
+	if ($object->element == 'societe')         $modulepart='societe';
+	if ($object->element == 'contact')         $modulepart='contact';
+	if ($object->element == 'member')          $modulepart='memberphoto';
+	if ($object->element == 'user')            $modulepart='userphoto';
+	if ($object->element == 'product')         $modulepart='product';
 	if (class_exists("Imagick"))
 	{
 		if ($object->element == 'propal')    $modulepart='propal';
@@ -1077,6 +1077,7 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
 		if ($object->element == 'facture')   $modulepart='facture';
 		if ($object->element == 'fichinter') $modulepart='ficheinter';
 		if ($object->element == 'contrat')   $modulepart='contract';
+	    if ($object->element == 'order_supplier')  $modulepart='supplier_order';
 	}
 
 	if ($object->element == 'product')
@@ -1102,12 +1103,11 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
 	{
 		if ($showimage)
         {
-        	if ($modulepart != 'unknown')
+            if ($modulepart != 'unknown')
             {
                 $phototoshow='';
-                
                 // Check if a preview file is available
-                if (in_array($modulepart, array('propal', 'commande', 'facture', 'ficheinter', 'contract')) && class_exists("Imagick"))
+                if (in_array($modulepart, array('propal', 'commande', 'facture', 'ficheinter', 'contract', 'supplier_order')) && class_exists("Imagick"))
                 {
                     $objectref = dol_sanitizeFileName($object->ref);
                     $dir_output = $conf->$modulepart->dir_output . "/";
@@ -1137,7 +1137,7 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
                         if (file_exists($fileimage))
                         {
                             $phototoshow = '<div class="floatleft inline-block valignmiddle divphotoref"><div class="photoref">';
-                            $phototoshow.= '<img height="70" class="photo photowithmargin" src="'.DOL_URL_ROOT . '/viewimage.php?modulepart=apercu'.$modulepart.'&amp;file='.urlencode($relativepathimage).'">';
+                            $phototoshow.= '<img height="70" class="photo photowithmargin photowithborder" src="'.DOL_URL_ROOT . '/viewimage.php?modulepart=apercu'.$modulepart.'&amp;file='.urlencode($relativepathimage).'">';
                             $phototoshow.= '</div></div>';
                         }
                         // Si fichier png PDF de plus d'1 page trouve
@@ -1145,7 +1145,7 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
                         {
                             $preview = preg_replace('/\.png/','',$relativepathimage) . "-0.png";
                             $phototoshow = '<div class="floatleft inline-block valignmiddle divphotoref"><div class="photoref">';
-                            $phototoshow.= '<img height="70" class="photo photowithmargin" src="'.DOL_URL_ROOT . '/viewimage.php?modulepart=apercu'.$modulepart.'&amp;file='.urlencode($preview).'"><p>';
+                            $phototoshow.= '<img height="70" class="photo photowithmargin photowithborder" src="'.DOL_URL_ROOT . '/viewimage.php?modulepart=apercu'.$modulepart.'&amp;file='.urlencode($preview).'"><p>';
                             $phototoshow.= '</div></div>';
                         }
                     }
@@ -1171,7 +1171,6 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
                     $width=80;
                     $cssclass='photorefcenter';
                     $nophoto=img_picto('', 'title_agenda', '', false, 1);
-                    $morehtmlleft.='<div class="floatleft inline-block valignmiddle divphotoref"><div class="photoref"><img class="photo'.$modulepart.($cssclass?' '.$cssclass:'').'" alt="No photo" border="0"'.($width?' width="'.$width.'"':'').' src="'.$nophoto.'"></div></div>';
                 }
                 else
                 {
@@ -1179,8 +1178,8 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
                     $picto = $object->picto;
                     if ($object->element == 'project' && ! $object->public) $picto = 'project'; // instead of projectpub
     				$nophoto=img_picto('', 'object_'.$picto, '', false, 1);
-    				$morehtmlleft.='<div class="floatleft inline-block valignmiddle divphotoref"><div class="photoref"><img class="photo'.$modulepart.($cssclass?' '.$cssclass:'').'" alt="No photo" border="0"'.($width?' width="'.$width.'"':'').' src="'.$nophoto.'"></div></div>';
                 }
+                $morehtmlleft.='<!-- No photo to show --><div class="floatleft inline-block valignmiddle divphotoref"><div class="photoref"><img class="photo'.$modulepart.($cssclass?' '.$cssclass:'').'" alt="No photo" border="0"'.($width?' width="'.$width.'"':'').' src="'.$nophoto.'"></div></div>';
                 $morehtmlleft.='</div>';
             }
         }
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 41744ae0037..d0fae6d89a8 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -3002,6 +3002,9 @@ td.legendLabel { padding: 2px 2px 2px 0 !important; }
 	margin-bottom: 2px;
 	margin-top: 10px;
 }
+.photowithborder {
+	border: 1px solid #f0f0f0;
+}
 .photointooltip {
 	margin-top: 6px;
 	margin-bottom: 6px;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 53e3ec0154c..48670ffb637 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -3115,10 +3115,8 @@ td.legendLabel { padding: 2px 2px 2px 0 !important; }
 	margin-bottom: 2px;
 	margin-top: 2px;
 }
-.photowithmargin {
-/*	-webkit-box-shadow: 0px 0px 3px #777;
-	-moz-box-shadow: 0px 0px 3px #777;
-	box-shadow: 0px 0px 3px #777;*/
+.photowithborder {
+	border: 1px solid #f0f0f0;
 }
 .photointoolitp {
 	margin-top: 8px;

From 768df56c07072c32daed2f9ae3cd918d01892968 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 4 May 2017 20:16:55 +0200
Subject: [PATCH 195/505] Uniformize name of standard PDF template

---
 htdocs/admin/fichinter.php                    |  2 +-
 .../expedition/doc/pdf_rouget.modules.php     |  2 +-
 .../fichinter/doc/pdf_soleil.modules.php      |  2 +-
 htdocs/core/modules/modProduct.class.php      | 11 +++++++++--
 htdocs/core/modules/modService.class.php      |  2 +-
 .../product/doc/pdf_standard.modules.php      | 14 ++++----------
 .../fichinter/admin/fichinter_extrafields.php |  2 +-
 .../admin/fichinterdet_extrafields.php        |  2 +-
 htdocs/langs/en_US/main.lang                  |  1 +
 htdocs/langs/en_US/sendings.lang              |  1 -
 htdocs/product/admin/product.php              |  3 ---
 htdocs/product/class/product.class.php        | 19 ++++++++++++++++++-
 12 files changed, 38 insertions(+), 23 deletions(-)

diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php
index 0b01f56857e..2b9dee321a6 100644
--- a/htdocs/admin/fichinter.php
+++ b/htdocs/admin/fichinter.php
@@ -265,7 +265,7 @@ print load_fiche_titre($langs->trans("InterventionsSetup"),$linkback,'title_setu
 
 $head=fichinter_admin_prepare_head();
 
-dol_fiche_head($head, 'ficheinter', $langs->trans("Interventions"), 0, 'intervention');
+dol_fiche_head($head, 'ficheinter', $langs->trans("Interventions"), -1, 'intervention');
 
 // Interventions numbering model
 
diff --git a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
index d1697b767bd..3f7a73a650c 100644
--- a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
@@ -49,7 +49,7 @@ class pdf_rouget extends ModelePdfExpedition
 
 		$this->db = $db;
 		$this->name = "rouget";
-		$this->description = $langs->trans("DocumentModelSimple");
+		$this->description = $langs->trans("DocumentModelStandardPDF");
 
 		$this->type = 'pdf';
 		$formatarray=pdf_getFormat();
diff --git a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
index 83306b95adb..4d889f84902 100644
--- a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
+++ b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
@@ -65,7 +65,7 @@ class pdf_soleil extends ModelePDFFicheinter
 
 		$this->db = $db;
 		$this->name = 'soleil';
-		$this->description = $langs->trans("DocumentModelStandard");
+		$this->description = $langs->trans("DocumentModelStandardPDF");
 
 		// Dimension page pour format A4
 		$this->type = 'pdf';
diff --git a/htdocs/core/modules/modProduct.class.php b/htdocs/core/modules/modProduct.class.php
index b2349ab77a0..30e64b5de2c 100644
--- a/htdocs/core/modules/modProduct.class.php
+++ b/htdocs/core/modules/modProduct.class.php
@@ -53,7 +53,7 @@ class modProduct extends DolibarrModules
 		$this->module_position = 20;
 		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
 		$this->name = preg_replace('/^mod/i','',get_class($this));
-		$this->description = "Gestion des produits";
+		$this->description = "Product management";
 
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
 		$this->version = 'dolibarr';
@@ -83,7 +83,14 @@ class modProduct extends DolibarrModules
 		$this->const[$r][3] = 'Module to control product codes';
 		$this->const[$r][4] = 0;
 		$r++;
-
+		
+		/*$this->const[$r][0] = "PRODUCT_ADDON_PDF";
+		$this->const[$r][1] = "chaine";
+		$this->const[$r][2] = "standard";
+		$this->const[$r][3] = 'Default module for document generation';
+		$this->const[$r][4] = 0;
+		$r++;*/
+		
 		// Boxes
 		$this->boxes = array(
 			0=>array('file'=>'box_produits.php','enabledbydefaulton'=>'Home'),
diff --git a/htdocs/core/modules/modService.class.php b/htdocs/core/modules/modService.class.php
index 7a5db7fcffd..c385ece4b26 100644
--- a/htdocs/core/modules/modService.class.php
+++ b/htdocs/core/modules/modService.class.php
@@ -51,7 +51,7 @@ class modService extends DolibarrModules
 		$this->module_position = 30;
 		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
 		$this->name = preg_replace('/^mod/i','',get_class($this));
-		$this->description = "Gestion des services";
+		$this->description = "Service management";
 
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
 		$this->version = 'dolibarr';
diff --git a/htdocs/core/modules/product/doc/pdf_standard.modules.php b/htdocs/core/modules/product/doc/pdf_standard.modules.php
index 5dca2b8378e..29df1127242 100644
--- a/htdocs/core/modules/product/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/product/doc/pdf_standard.modules.php
@@ -92,8 +92,8 @@ class pdf_standard extends ModelePDFProduct
 		$langs->load("companies");
 
 		$this->db = $db;
-		$this->name = "PDF template";
-		$this->description = $langs->trans("DocumentModelPdf");
+		$this->name = "standard";
+		$this->description = $langs->trans("DocumentModelStandardPDF");
 
 		// Dimension page pour format A4
 		$this->type = 'pdf';
@@ -107,15 +107,9 @@ class pdf_standard extends ModelePDFProduct
 		$this->marge_basse =isset($conf->global->MAIN_PDF_MARGIN_BOTTOM)?$conf->global->MAIN_PDF_MARGIN_BOTTOM:10;
 		
 		$this->option_logo = 1;                    // Affiche logo
-		$this->option_tva = 0;                     // Gere option tva PRODUCT_TVAOPTION
-		$this->option_modereg = 0;                 // Affiche mode reglement
-		$this->option_condreg = 0;                 // Affiche conditions reglement
 		$this->option_codeproduitservice = 0;      // Affiche code produit-service
 		$this->option_multilang = 1;               // Dispo en plusieurs langues
-		$this->option_escompte = 0;                // Affiche si il y a eu escompte
-		$this->option_credit_note = 0;             // Support credit notes
-		$this->option_freetext = 1;				   // Support add of a personalised text
-		$this->option_draft_watermark = 1;		   // Support add of a watermark on drafts
+		$this->option_freetext = 0;				   // Support add of a personalised text
 
 		// Recupere emetteur
 		$this->emetteur=$mysoc;
@@ -262,7 +256,7 @@ class pdf_standard extends ModelePDFProduct
 				}
 				if ($object->weight)
 				{
-				    $pdf->writeHTMLCell(190, 3, $this->marge_gauche, $nexY, $langs->trans("Length").' x '.$langs->trans("Width").' x '.$langs->trans("Height").': '.$object->length.'x'.$object->width.'x'.$object->height, 0, 1);
+				    $pdf->writeHTMLCell(190, 3, $this->marge_gauche, $nexY, $langs->trans("Length").' x '.$langs->trans("Width").' x '.$langs->trans("Height").': '.($object->length != ''?$object->length:'?').' x '.($object->width != ''?$object->width:'?').' x '.($object->height != ''?$object->height:'?'), 0, 1);
 				    $nexY = $pdf->GetY();
 				}
 				if ($object->surface)
diff --git a/htdocs/fichinter/admin/fichinter_extrafields.php b/htdocs/fichinter/admin/fichinter_extrafields.php
index b7b809d277d..bab7572e60a 100644
--- a/htdocs/fichinter/admin/fichinter_extrafields.php
+++ b/htdocs/fichinter/admin/fichinter_extrafields.php
@@ -71,7 +71,7 @@ print load_fiche_titre($langs->trans("InterventionsSetup"),$linkback,'title_setu
 
 $head=fichinter_admin_prepare_head();
 
-dol_fiche_head($head, 'attributes', $langs->trans("Interventions"), 0, 'intervention');
+dol_fiche_head($head, 'attributes', $langs->trans("Interventions"), -1, 'intervention');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
diff --git a/htdocs/fichinter/admin/fichinterdet_extrafields.php b/htdocs/fichinter/admin/fichinterdet_extrafields.php
index 776229a4c29..5fadc3f4c2c 100644
--- a/htdocs/fichinter/admin/fichinterdet_extrafields.php
+++ b/htdocs/fichinter/admin/fichinterdet_extrafields.php
@@ -72,7 +72,7 @@ print load_fiche_titre($langs->trans("InterventionsSetup"),$linkback,'title_setu
 
 $head=fichinter_admin_prepare_head();
 
-dol_fiche_head($head, 'attributesdet', $langs->trans("Interventions"), 0, 'intervention');
+dol_fiche_head($head, 'attributesdet', $langs->trans("Interventions"), -1, 'intervention');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index c567890730a..bc7c864b279 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -647,6 +647,7 @@ FreeLineOfType=Free entry of type
 CloneMainAttributes=Clone object with its main attributes
 PDFMerge=PDF Merge
 Merge=Merge
+DocumentModelStandardPDF=Standard PDF template
 PrintContentArea=Show page to print main content area
 MenuManager=Menu manager
 WarningYouAreInMaintenanceMode=Warning, you are in a maintenance mode, so only login <b>%s</b> is allowed to use application at the moment.
diff --git a/htdocs/langs/en_US/sendings.lang b/htdocs/langs/en_US/sendings.lang
index ac180cb5fe6..fcd28cc9f56 100644
--- a/htdocs/langs/en_US/sendings.lang
+++ b/htdocs/langs/en_US/sendings.lang
@@ -37,7 +37,6 @@ SendingSheet=Shipment sheet
 ConfirmDeleteSending=Are you sure you want to delete this shipment?
 ConfirmValidateSending=Are you sure you want to validate this shipment with reference <b>%s</b>?
 ConfirmCancelSending=Are you sure you want to cancel this shipment?
-DocumentModelSimple=Simple document model
 DocumentModelMerou=Merou A5 model
 WarningNoQtyLeftToSend=Warning, no products waiting to be shipped.
 StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
diff --git a/htdocs/product/admin/product.php b/htdocs/product/admin/product.php
index 3582f8b25b6..5183eeb3382 100644
--- a/htdocs/product/admin/product.php
+++ b/htdocs/product/admin/product.php
@@ -512,10 +512,7 @@ foreach ($dirmodels as $reldir)
 			                    }
 					    		$htmltooltip.='<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
 					    		$htmltooltip.='<br>'.$langs->trans("Logo").': '.yn($module->option_logo,1,1);
-					    		$htmltooltip.='<br>'.$langs->trans("PaymentMode").': '.yn($module->option_modereg,1,1);
-					    		$htmltooltip.='<br>'.$langs->trans("PaymentConditions").': '.yn($module->option_condreg,1,1);
 					    		$htmltooltip.='<br>'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang,1,1);
-					    		$htmltooltip.='<br>'.$langs->trans("WatermarkOnDraftOrders").': '.yn($module->option_draft_watermark,1,1);
 
 
 	                            print '<td align="center">';
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index e25ad186369..76a609e0a44 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -4367,14 +4367,31 @@ class Product extends CommonObject
         $this->id=0;
         $this->ref = 'PRODUCT_SPEC';
         $this->label = 'PRODUCT SPECIMEN';
-        $this->description = 'PRODUCT SPECIMEN '.dol_print_date($now,'dayhourlog');
+        $this->description = 'This is description of this product specimen that was created the '.dol_print_date($now,'dayhourlog').'.';
         $this->specimen=1;
         $this->country_id=1;
         $this->tosell=1;
         $this->tobuy=1;
 		$this->tobatch=0;
         $this->note='This is a comment (private)';
+        $this->date_creation = $now;
+        $this->date_modification = $now;
+        
+        $this->weight = 4;
+        $this->weight_unit = 1;
 
+        $this->length = 5;
+        $this->length_unit = 1;
+        $this->width = 6;
+        $this->width_unit = 0;
+        $this->height = null;
+        $this->height_unit = null;
+        
+        $this->surface = 30;
+        $this->surface_unit = 0;
+        $this->volume = 300;
+        $this->volume_unit = 0;
+        
         $this->barcode=-1;	// Create barcode automatically
     }
 

From 626c0d6d5e9308656777a9ff300dba88f0a3a054 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 4 May 2017 20:40:13 +0200
Subject: [PATCH 196/505] Add more substitution keys for PDFs.

---
 htdocs/admin/expensereport.php             | 2 +-
 htdocs/admin/expensereport_extrafields.php | 2 +-
 htdocs/core/lib/pdf.lib.php                | 9 ++++++++-
 htdocs/langs/en_US/admin.lang              | 3 +++
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/htdocs/admin/expensereport.php b/htdocs/admin/expensereport.php
index dad17585e2e..b8626827595 100644
--- a/htdocs/admin/expensereport.php
+++ b/htdocs/admin/expensereport.php
@@ -230,7 +230,7 @@ print load_fiche_titre($langs->trans("ExpenseReportsSetup"),$linkback,'title_set
 
 $head=expensereport_admin_prepare_head();
 
-dol_fiche_head($head, 'expensereport', $langs->trans("ExpenseReports"), 0, 'trip');
+dol_fiche_head($head, 'expensereport', $langs->trans("ExpenseReports"), -1, 'trip');
 
 // Interventions numbering model
 /*
diff --git a/htdocs/admin/expensereport_extrafields.php b/htdocs/admin/expensereport_extrafields.php
index 65e1592eff8..d1d3aacc9cc 100644
--- a/htdocs/admin/expensereport_extrafields.php
+++ b/htdocs/admin/expensereport_extrafields.php
@@ -74,7 +74,7 @@ print load_fiche_titre($langs->trans("ExpenseReportsSetup"),$linkback,'title_set
 
 $head = expensereport_admin_prepare_head();
 
-dol_fiche_head($head, 'attributes', $langs->trans("ExpenseReports"), 0, 'trip');
+dol_fiche_head($head, 'attributes', $langs->trans("ExpenseReports"), -1, 'trip');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index 2fc447daffd..e83faee6c8d 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -599,7 +599,14 @@ function pdf_getSubstitutionArray($outputlangs)
 	$substitutionarray=array(
 		'__MYCOMPANY_NAME__' => $mysoc->name,
 		'__MYCOMPANY_EMAIL__' => $mysoc->email,
-		'__USER_ID__' => $user->id,
+		'__MYCOMPANY_PROFID1__' => $mysoc->idprof1,
+		'__MYCOMPANY_PROFID2__' => $mysoc->idprof2,
+		'__MYCOMPANY_PROFID3__' => $mysoc->idprof3,
+		'__MYCOMPANY_PROFID4__' => $mysoc->idprof4,
+		'__MYCOMPANY_PROFID5__' => $mysoc->idprof5,
+		'__MYCOMPANY_PROFID6__' => $mysoc->idprof6,
+		'__MYCOMPANY_CAPITAL__' => $mysoc->capital,
+	    '__USER_ID__' => $user->id,
 		'__USER_LOGIN__' => $user->login,
 		'__USER_LASTNAME__' => $user->lastname,
 		'__USER_FIRSTNAME__' => $user->firstname,
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 35037387c1f..1356a980164 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -434,6 +434,9 @@ PageUrlForDefaultValuesList=<br>For page that list thirdparties, it is <strong>%
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code, so to change this value, you must edit it fom Home-Setup-translation.
 WarningSettingSortOrder=Warning, setting a default sort order may result in a technical error when going on the list page if field is an unknown field. If you experience such an error, come back to this page to remove the default sort order and restore default behavior. 
 Field=Field
+ProductDocumentTemplates=Document templates to generate product document
+FreeLegalTextOnExpenseReports=Free legal text on expense reports
+WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 # Modules
 Module0Name=Users & groups
 Module0Desc=Users / Employees and Groups management

From ffe4e4830454cba55fb558c5168e238b5460d44b Mon Sep 17 00:00:00 2001
From: Philippe Grand <philippe.grand@atoo-net.com>
Date: Thu, 4 May 2017 21:37:27 +0200
Subject: [PATCH 197/505] Update agenda_other.php

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

diff --git a/htdocs/admin/agenda_other.php b/htdocs/admin/agenda_other.php
index 17ccd64d000..e70339b47c8 100644
--- a/htdocs/admin/agenda_other.php
+++ b/htdocs/admin/agenda_other.php
@@ -264,7 +264,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
             			require_once $dir.'/'.$file;
             			$module = new $classname($db, new ActionComm($db));           			
             			
-            			print '<tr class="oddeven">\n';
+            			print '<tr class="oddeven">'."\n";
             			print "<td>";
             			print (empty($module->name)?$name:$module->name);
             			print "</td>\n";

From a1e92467947074c5feef8d2199b6177be4c7cb4b Mon Sep 17 00:00:00 2001
From: Laurent Dinclaux <laurent@gecka.nc>
Date: Fri, 5 May 2017 10:34:38 +1100
Subject: [PATCH 198/505] Resolved merge conflict [2]

---
 htdocs/comm/propal/class/propal.class.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 3df1c82b4ad..7b05adf1fb6 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -3626,11 +3626,7 @@ class PropaleLigne  extends CommonObjectLine
 			$this->qty				= $objp->qty;
 			$this->price			= $objp->price;		// deprecated
 			$this->subprice			= $objp->subprice;
-<<<<<<< HEAD
-			$this->vat_src_code     = $objp->vat_src_code;
-=======
 			$this->vat_src_code		= $objp->vat_src_code;
->>>>>>> upstream/5.0
 			$this->tva_tx			= $objp->tva_tx;
 			$this->remise			= $objp->remise;    // deprecated
 			$this->remise_percent	= $objp->remise_percent;

From f32d19fb73abdbe2cfed02ef37af34dc473eca6e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 5 May 2017 09:15:14 +0200
Subject: [PATCH 199/505] FIX #6767 serious critical error no login possible

---
 htdocs/install/mysql/migration/4.0.0-5.0.0.sql | 1 +
 htdocs/install/mysql/tables/llx_events.sql     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/install/mysql/migration/4.0.0-5.0.0.sql b/htdocs/install/mysql/migration/4.0.0-5.0.0.sql
index 81191e7a84e..afda09aa785 100644
--- a/htdocs/install/mysql/migration/4.0.0-5.0.0.sql
+++ b/htdocs/install/mysql/migration/4.0.0-5.0.0.sql
@@ -262,3 +262,4 @@ ALTER TABLE llx_product_price ALTER COLUMN date_price SET DEFAULT NULL;
 ALTER TABLE llx_product_price ADD COLUMN default_vat_code	varchar(10) after tva_tx;
 ALTER TABLE llx_product_fournisseur_price ADD COLUMN default_vat_code	varchar(10) after tva_tx;
 
+ALTER TABLE llx_events MODIFY COLUMN ip varchar(250);
diff --git a/htdocs/install/mysql/tables/llx_events.sql b/htdocs/install/mysql/tables/llx_events.sql
index 29a369269c3..c153522cb09 100644
--- a/htdocs/install/mysql/tables/llx_events.sql
+++ b/htdocs/install/mysql/tables/llx_events.sql
@@ -30,7 +30,7 @@ create table llx_events
   dateevent      datetime,                    -- date event
   fk_user        integer,                     -- id user
   description    varchar(250) NOT NULL,       -- full description of action
-  ip             varchar(32) NOT NULL,        -- ip
+  ip             varchar(250) NOT NULL,       -- ip (must contains ip v4 and v6 or dns names)
   user_agent     varchar(255) NULL,           -- user agent
   fk_object      integer                      -- id of related object
 ) ENGINE=innodb;

From f069ef98445e651a37487ae900730a5b2b550c20 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 4 May 2017 20:40:13 +0200
Subject: [PATCH 200/505] FIX #6767

---
 htdocs/admin/expensereport.php                 | 2 +-
 htdocs/admin/expensereport_extrafields.php     | 2 +-
 htdocs/core/lib/pdf.lib.php                    | 9 ++++++++-
 htdocs/install/mysql/migration/5.0.0-6.0.0.sql | 3 +++
 htdocs/langs/en_US/admin.lang                  | 3 +++
 5 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/htdocs/admin/expensereport.php b/htdocs/admin/expensereport.php
index dad17585e2e..b8626827595 100644
--- a/htdocs/admin/expensereport.php
+++ b/htdocs/admin/expensereport.php
@@ -230,7 +230,7 @@ print load_fiche_titre($langs->trans("ExpenseReportsSetup"),$linkback,'title_set
 
 $head=expensereport_admin_prepare_head();
 
-dol_fiche_head($head, 'expensereport', $langs->trans("ExpenseReports"), 0, 'trip');
+dol_fiche_head($head, 'expensereport', $langs->trans("ExpenseReports"), -1, 'trip');
 
 // Interventions numbering model
 /*
diff --git a/htdocs/admin/expensereport_extrafields.php b/htdocs/admin/expensereport_extrafields.php
index 65e1592eff8..d1d3aacc9cc 100644
--- a/htdocs/admin/expensereport_extrafields.php
+++ b/htdocs/admin/expensereport_extrafields.php
@@ -74,7 +74,7 @@ print load_fiche_titre($langs->trans("ExpenseReportsSetup"),$linkback,'title_set
 
 $head = expensereport_admin_prepare_head();
 
-dol_fiche_head($head, 'attributes', $langs->trans("ExpenseReports"), 0, 'trip');
+dol_fiche_head($head, 'attributes', $langs->trans("ExpenseReports"), -1, 'trip');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index 2fc447daffd..e83faee6c8d 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -599,7 +599,14 @@ function pdf_getSubstitutionArray($outputlangs)
 	$substitutionarray=array(
 		'__MYCOMPANY_NAME__' => $mysoc->name,
 		'__MYCOMPANY_EMAIL__' => $mysoc->email,
-		'__USER_ID__' => $user->id,
+		'__MYCOMPANY_PROFID1__' => $mysoc->idprof1,
+		'__MYCOMPANY_PROFID2__' => $mysoc->idprof2,
+		'__MYCOMPANY_PROFID3__' => $mysoc->idprof3,
+		'__MYCOMPANY_PROFID4__' => $mysoc->idprof4,
+		'__MYCOMPANY_PROFID5__' => $mysoc->idprof5,
+		'__MYCOMPANY_PROFID6__' => $mysoc->idprof6,
+		'__MYCOMPANY_CAPITAL__' => $mysoc->capital,
+	    '__USER_ID__' => $user->id,
 		'__USER_LOGIN__' => $user->login,
 		'__USER_LASTNAME__' => $user->lastname,
 		'__USER_FIRSTNAME__' => $user->firstname,
diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index 1982ef6aff8..a6666d37ee0 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -248,3 +248,6 @@ insert into llx_c_tva(fk_pays,taux,code,recuperableonly,note,active)
 insert into llx_c_tva(fk_pays,taux,code,recuperableonly,note,active)                                                   values (1, '8.5', '85NPR', '1','VAT standard rate (DOM sauf Guyane et Saint-Martin), non perçu par le vendeur mais récupérable par acheteur',0);
 insert into llx_c_tva(fk_pays,taux,code,recuperableonly,localtax1,localtax1_type,note,active)                          values (1, '8.5', '85NPROM', '1', 2, 3, 'VAT standard rate (DOM sauf Guyane et Saint-Martin), NPR, Octroi de Mer',0);
 insert into llx_c_tva(fk_pays,taux,code,recuperableonly,localtax1,localtax1_type,localtax2,localtax2_type,note,active) values (1, '8.5', '85NPROMOMR', '1', 2, 3, 2.5, 3, 'VAT standard rate (DOM sauf Guyane et Saint-Martin), NPR, Octroi de Mer et Octroi de Mer Regional',0);
+
+ALTER TABLE llx_events MODIFY COLUMN ip varchar(250);
+
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 35037387c1f..1356a980164 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -434,6 +434,9 @@ PageUrlForDefaultValuesList=<br>For page that list thirdparties, it is <strong>%
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code, so to change this value, you must edit it fom Home-Setup-translation.
 WarningSettingSortOrder=Warning, setting a default sort order may result in a technical error when going on the list page if field is an unknown field. If you experience such an error, come back to this page to remove the default sort order and restore default behavior. 
 Field=Field
+ProductDocumentTemplates=Document templates to generate product document
+FreeLegalTextOnExpenseReports=Free legal text on expense reports
+WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 # Modules
 Module0Name=Users & groups
 Module0Desc=Users / Employees and Groups management

From ef0d395a1a536fb75f8acdcfdbf8c04ce54086a4 Mon Sep 17 00:00:00 2001
From: "Guillaume T. (Arck Consulting)" <guillaume@arckconsulting.fr>
Date: Thu, 4 May 2017 09:32:06 +0200
Subject: [PATCH 201/505] [FIX] Credit Note for fourn doesn't work, missing
 filed in create method & attribut

---
 htdocs/fourn/class/fournisseur.facture.class.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 42daafe9c2d..1798eb19059 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -128,7 +128,9 @@ class FactureFournisseur extends CommonInvoice
     public $multicurrency_total_ht;
     public $multicurrency_total_tva;
     public $multicurrency_total_ttc;
-
+    //! id of source invoice if replacement invoice or credit note
+    public $fk_facture_source;
+    
     /**
      * Standard invoice
      */
@@ -263,6 +265,7 @@ class FactureFournisseur extends CommonInvoice
         $sql.= ", fk_multicurrency";
         $sql.= ", multicurrency_code";
         $sql.= ", multicurrency_tx";
+        $sql.= ", fk_facture_source";
         $sql.= ")";
         $sql.= " VALUES (";
 		$sql.= "'(PROV)'";
@@ -286,6 +289,7 @@ class FactureFournisseur extends CommonInvoice
 		$sql.= ", ".(int) $this->fk_multicurrency;
 		$sql.= ", '".$this->db->escape($this->multicurrency_code)."'";
 		$sql.= ", ".(double) $this->multicurrency_tx;
+        $sql.= ", ".(isset($this->fk_facture_source)?$this->fk_facture_source:"NULL");
         $sql.= ")";
 
         dol_syslog(get_class($this)."::create", LOG_DEBUG);

From 9785e9b2988529c3e8bd626828866a7dd1194ce7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 5 May 2017 09:57:51 +0200
Subject: [PATCH 202/505] Update commonobject.class.php

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

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index f2e8f75f796..4b6c1263026 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -2963,20 +2963,20 @@ abstract class CommonObject
         foreach ($this->lines as $line)
         {
 
-            $totalOrdered+=$line->qty_asked ?: 0;    // defined for shipment only
-            $totalToShip+= $line->qty_shipped ?: 0;   // defined for shipment only
+            $totalOrdered+=($line->qty_asked ? $line->qty_asked : 0);    // defined for shipment only
+            $totalToShip+=($line->qty_shipped ? $line->qty_shipped : 0);   // defined for shipment only
 
 	        // Define qty, weight, volume, weight_units, volume_units
 	        if ($this->element == 'shipping') {
 		        // for shipments
-		        $qty = $line->qty_shipped ?: 0;
+		        $qty = $line->qty_shipped ? $line->qty_shipped : 0;
 	        }
 	        else {
-		        $qty = $line->qty ?: 0;
+		        $qty = $line->qty ? $line->qty : 0;
 	        }
 
-            $weight = $line->weight ?: 0;
-            $volume = $line->volume ?: 0;
+            $weight = $line->weight ? $line->weight : 0;
+            $volume = $line->volume ? $line->volume : 0;
 
             $weight_units=$line->weight_units;
             $volume_units=$line->volume_units;

From 68b63927e0cdfafd6df75cd92008de89c88eb9c9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 5 May 2017 12:33:49 +0200
Subject: [PATCH 203/505] Maxi miscellaneous debug

---
 htdocs/admin/supplier_invoice.php             |   2 +-
 htdocs/admin/supplier_order.php               |   2 +-
 htdocs/admin/supplier_payment.php             |  24 +-
 htdocs/admin/supplierinvoice_extrafields.php  |   2 +-
 .../admin/supplierinvoicedet_extrafields.php  |   2 +-
 htdocs/admin/supplierorder_extrafields.php    |   2 +-
 htdocs/admin/supplierorderdet_extrafields.php |   2 +-
 htdocs/categories/index.php                   |   8 +-
 htdocs/compta/paiement/cheque/card.php        | 225 +++++++++---------
 htdocs/compta/paiement/cheque/index.php       |  14 +-
 htdocs/core/lib/files.lib.php                 |  14 +-
 htdocs/core/lib/functions.lib.php             |  26 +-
 .../supplier_payment/{pdf => doc}/index.html  |   0
 .../pdf_standard.modules.php}                 |  10 +-
 htdocs/fourn/facture/card.php                 |  55 +----
 htdocs/fourn/facture/contact.php              |   2 +-
 htdocs/fourn/facture/document.php             |   4 +-
 htdocs/fourn/facture/info.php                 |   2 +-
 htdocs/fourn/facture/note.php                 |   9 +-
 htdocs/langs/en_US/admin.lang                 |   1 +
 htdocs/supplier_proposal/card.php             |  11 +-
 .../class/supplier_proposal.class.php         |   6 +-
 22 files changed, 203 insertions(+), 220 deletions(-)
 rename htdocs/core/modules/supplier_payment/{pdf => doc}/index.html (100%)
 rename htdocs/core/modules/supplier_payment/{pdf/pdf_cow.modules.php => doc/pdf_standard.modules.php} (98%)

diff --git a/htdocs/admin/supplier_invoice.php b/htdocs/admin/supplier_invoice.php
index dd8210611e9..de128184d18 100644
--- a/htdocs/admin/supplier_invoice.php
+++ b/htdocs/admin/supplier_invoice.php
@@ -205,7 +205,7 @@ print "<br>";
 
 $head = supplierorder_admin_prepare_head();
 
-dol_fiche_head($head, 'invoice', $langs->trans("Suppliers"), 0, 'company');
+dol_fiche_head($head, 'invoice', $langs->trans("Suppliers"), -1, 'company');
 
 
 // Supplier invoice numbering module
diff --git a/htdocs/admin/supplier_order.php b/htdocs/admin/supplier_order.php
index a170f7ccd37..030a507ce20 100644
--- a/htdocs/admin/supplier_order.php
+++ b/htdocs/admin/supplier_order.php
@@ -234,7 +234,7 @@ print "<br>";
 
 $head = supplierorder_admin_prepare_head();
 
-dol_fiche_head($head, 'order', $langs->trans("Suppliers"), 0, 'company');
+dol_fiche_head($head, 'order', $langs->trans("Suppliers"), -1, 'company');
 
 
 // Supplier order numbering module
diff --git a/htdocs/admin/supplier_payment.php b/htdocs/admin/supplier_payment.php
index 0f6cbff6179..adaa114b1ca 100644
--- a/htdocs/admin/supplier_payment.php
+++ b/htdocs/admin/supplier_payment.php
@@ -65,7 +65,7 @@ if ($action == 'updateMask')
     }
 }else  if ($action == 'setmod')
 {
-    dolibarr_set_const($db, "SUPPLIER_PAYMENT_ADDON",$value,'chaine',0,'',$conf->entity);
+    dolibarr_set_const($db, "SUPPLIER_PAYMENT_ADDON", $value, 'chaine', 0, '', $conf->entity);
 }
 
 // define constants for models generator that need parameters
@@ -138,7 +138,7 @@ else if ($action == 'specimen')
 	$dirmodels=array_merge(array('/'),(array) $conf->modules_parts['models']);
 	foreach($dirmodels as $reldir)
 	{
-	    $file=dol_buildpath($reldir."core/modules/supplier_payment/pdf/pdf_".$modele.".modules.php",0);
+	    $file=dol_buildpath($reldir."core/modules/supplier_payment/doc/pdf_".$modele.".modules.php",0);
     	if (file_exists($file))
     	{
     		$filefound=1;
@@ -188,7 +188,7 @@ print load_fiche_titre($langs->trans("SupplierPaymentSetup"),$linkback,'title_se
 print "<br>";
 
 $head = supplierorder_admin_prepare_head();
-dol_fiche_head($head, 'supplierpayment', $langs->trans("Suppliers"), 0, 'company');
+dol_fiche_head($head, 'supplierpayment', $langs->trans("Suppliers"), -1, 'company');
 
 /*
  *  Numbering module
@@ -198,12 +198,6 @@ if (empty($conf->global->SUPPLIER_PAYMENT_ADDON)) $conf->global->SUPPLIER_PAYMEN
     
 print load_fiche_titre($langs->trans("PaymentsNumberingModule"), '', '');
 
-/*
- *  Document templates generators
- */
-print '<br>';
-print load_fiche_titre($langs->trans("BillsPDFModules"),'','');
-
 // Load array def with activated templates
 $def = array();
 $sql = "SELECT nom";
@@ -349,6 +343,12 @@ foreach ($dirmodels as $reldir)
 print '</table>';
 
 
+/*
+ *  Document templates generators
+ */
+print '<br>';
+print load_fiche_titre($langs->trans("PaymentsPDFModules"),'','');
+
 print '<table class="noborder" width="100%">'."\n";
 print '<tr class="liste_titre">'."\n";
 print '<td width="100">'.$langs->trans("Name").'</td>'."\n";
@@ -363,7 +363,7 @@ clearstatcache();
 
 foreach ($dirmodels as $reldir)
 {
-	$dir = dol_buildpath($reldir."core/modules/supplier_payment/pdf/");
+	$dir = dol_buildpath($reldir."core/modules/supplier_payment/doc/");
 
     if (is_dir($dir))
     {
@@ -440,8 +440,6 @@ foreach ($dirmodels as $reldir)
                     $htmltooltip.='<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
                     $htmltooltip.='<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
                     $htmltooltip.='<br>'.$langs->trans("Logo").': '.yn($module->option_logo,1,1);
-                    $htmltooltip.='<br>'.$langs->trans("PaymentMode").': '.yn($module->option_modereg,1,1);
-                    $htmltooltip.='<br>'.$langs->trans("PaymentConditions").': '.yn($module->option_condreg,1,1);
                     print '<td align="center">';
                     print $form->textwithpicto('',$htmltooltip,1,0);
                     print '</td>';
@@ -458,7 +456,7 @@ foreach ($dirmodels as $reldir)
     }
 }
 
-print '</table><br>';
+print '</table>';
 
 dol_fiche_end();
 
diff --git a/htdocs/admin/supplierinvoice_extrafields.php b/htdocs/admin/supplierinvoice_extrafields.php
index 701362e38f4..4e0bd1d0dd2 100644
--- a/htdocs/admin/supplierinvoice_extrafields.php
+++ b/htdocs/admin/supplierinvoice_extrafields.php
@@ -79,7 +79,7 @@ print "<br>\n";
 
 $head = supplierorder_admin_prepare_head();
 
-dol_fiche_head($head, 'supplierinvoice', $langs->trans("Suppliers"), 0, 'company');
+dol_fiche_head($head, 'supplierinvoice', $langs->trans("Suppliers"), -1, 'company');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
diff --git a/htdocs/admin/supplierinvoicedet_extrafields.php b/htdocs/admin/supplierinvoicedet_extrafields.php
index e741eb6cd75..26b3b42e970 100644
--- a/htdocs/admin/supplierinvoicedet_extrafields.php
+++ b/htdocs/admin/supplierinvoicedet_extrafields.php
@@ -79,7 +79,7 @@ print "<br>\n";
 
 $head = supplierorder_admin_prepare_head();
 
-dol_fiche_head($head, 'supplierinvoicedet', $langs->trans("Suppliers"), 0, 'company');
+dol_fiche_head($head, 'supplierinvoicedet', $langs->trans("Suppliers"), -1, 'company');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
diff --git a/htdocs/admin/supplierorder_extrafields.php b/htdocs/admin/supplierorder_extrafields.php
index 00550995d19..bcad8121afc 100644
--- a/htdocs/admin/supplierorder_extrafields.php
+++ b/htdocs/admin/supplierorder_extrafields.php
@@ -75,7 +75,7 @@ print "<br>\n";
 
 $head = supplierorder_admin_prepare_head();
 
-dol_fiche_head($head, 'supplierorder', $langs->trans("Suppliers"), 0, 'company');
+dol_fiche_head($head, 'supplierorder', $langs->trans("Suppliers"), -1, 'company');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
diff --git a/htdocs/admin/supplierorderdet_extrafields.php b/htdocs/admin/supplierorderdet_extrafields.php
index f83ad1348fc..97d505144bb 100644
--- a/htdocs/admin/supplierorderdet_extrafields.php
+++ b/htdocs/admin/supplierorderdet_extrafields.php
@@ -76,7 +76,7 @@ print "<br>\n";
 
 $head = supplierorder_admin_prepare_head();
 
-dol_fiche_head($head, 'supplierorderdet', $langs->trans("Suppliers"), 0, 'company');
+dol_fiche_head($head, 'supplierorderdet', $langs->trans("Suppliers"), -1, 'company');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
diff --git a/htdocs/categories/index.php b/htdocs/categories/index.php
index d44407324c0..ca2b7b5c76f 100644
--- a/htdocs/categories/index.php
+++ b/htdocs/categories/index.php
@@ -125,7 +125,7 @@ if ($catname || $id > 0)
 		print '</span>';
 		print "</td>\n";
 		print "\t\t<td>";
-		print $cat->description;
+		print dolGetFirstLineOfText($cat->description);
 		print "</td>\n";
 		print "\t</tr>\n";
 	}
@@ -162,7 +162,7 @@ foreach($fulltree as $key => $val)
 	'rowid'=>$val['rowid'],
 	'fk_menu'=>$val['fk_parent'],
 	'entry'=>'<table class="nobordernopadding centpercent"><tr><td><span class="noborderoncategories" '.($categstatic->color?' style="background: #'.$categstatic->color.';"':' style="background: #aaa"').'>'.$li.'</span></td>'.
-	'<td width="50%">'.dolGetFirstLineOfText($desc).'</td>'.
+	//'<td width="50%">'.dolGetFirstLineOfText($desc).'</td>'.
 	'<td align="right" width="20px;"><a href="'.DOL_URL_ROOT.'/categories/viewcat.php?id='.$val['id'].'&type='.$type.'">'.img_view().'</a></td>'.
 	'</tr></table>'
 	);
@@ -181,13 +181,13 @@ $nbofentries=(count($data) - 1);
 
 if ($nbofentries > 0)
 {
-	print '<tr '.$bc[0].'><td colspan="3">';
+	print '<tr class="pair"><td colspan="3">';
 	tree_recur($data,$data[0],0);
 	print '</td></tr>';
 }
 else
 {
-	print '<tr '.$bc[0].'>';
+	print '<tr class="pair">';
 	print '<td colspan="3"><table class="nobordernopadding"><tr class="nobordernopadding"><td>'.img_picto_common('','treemenu/branchbottom.gif').'</td>';
 	print '<td valign="middle">';
 	print $langs->trans("NoCategoryYet");
diff --git a/htdocs/compta/paiement/cheque/card.php b/htdocs/compta/paiement/cheque/card.php
index 625b2be518e..eed3a79335c 100644
--- a/htdocs/compta/paiement/cheque/card.php
+++ b/htdocs/compta/paiement/cheque/card.php
@@ -334,7 +334,7 @@ else
 	//  $head[$h][1] = $langs->trans("Info");
 	//  $h++;
 
-	dol_fiche_head($head, $hselected, $langs->trans("Cheques"),0,'payment');
+	dol_fiche_head($head, $hselected, $langs->trans("Cheques"), -1, 'payment');
 
 	/*
 	 * Confirmation de la suppression du bordereau
@@ -476,8 +476,7 @@ if ($action == 'new')
         print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
 		
 		print '<tr class="liste_titre">';
-		print '<td style="min-width: 120px">'.$langs->trans("DateChequeReceived").' ';
-		print "</td>\n";
+		print '<td style="min-width: 120px">'.$langs->trans("DateChequeReceived").'</td>'."\n";
 		print '<td style="min-width: 120px">'.$langs->trans("ChequeNumber")."</td>\n";
 		print '<td style="min-width: 200px">'.$langs->trans("CheckTransmitter")."</td>\n";
 		print '<td style="min-width: 200px">'.$langs->trans("Bank")."</td>\n";
@@ -487,59 +486,57 @@ if ($action == 'new')
 		print '<td align="center" width="100px">'.$langs->trans("Select")."<br>";
 		if ($conf->use_javascript_ajax) print '<a href="#" id="checkall_'.$bid.'">'.$langs->trans("All").'</a> / <a href="#" id="checknone_'.$bid.'">'.$langs->trans("None").'</a>';
 		print '</td>';
-
 		print "</tr>\n";
 
-		$var=true;
-
-		foreach ($lines[$bid] as $lid => $value)
+		if (count($lines[$bid]))
 		{
-			
+    		foreach ($lines[$bid] as $lid => $value)
+    		{
+    			$account_id = $bid;
+    			if (! isset($accounts[$bid]))
+    				$accounts[$bid]=0;
+    			$accounts[$bid] += 1;
 
-			$account_id = $bid;
-			if (! isset($accounts[$bid]))
-				$accounts[$bid]=0;
-			$accounts[$bid] += 1;
+    			print '<tr class="oddeven">';
+    			print '<td>'.dol_print_date($value["date"],'day').'</td>';
+    			print '<td>'.$value["numero"]."</td>\n";
+    			print '<td>'.$value["emetteur"]."</td>\n";
+    			print '<td>'.$value["banque"]."</td>\n";
+    			print '<td align="right">'.price($value["amount"], 0, $langs, 1, -1, -1, $conf->currency).'</td>';
 
-			print '<tr class="oddeven">';
-			print '<td>'.dol_print_date($value["date"],'day').'</td>';
-			print '<td>'.$value["numero"]."</td>\n";
-			print '<td>'.$value["emetteur"]."</td>\n";
-			print '<td>'.$value["banque"]."</td>\n";
-			print '<td align="right">'.price($value["amount"], 0, $langs, 1, -1, -1, $conf->currency).'</td>';
-
-			// Link to payment
-			print '<td align="center">';
-			$paymentstatic->id=$value["paymentid"];
-			$paymentstatic->ref=$value["paymentid"];
-			if ($paymentstatic->id)
-			{
-				print $paymentstatic->getNomUrl(1);
-			}
-			else
-			{
-				print '&nbsp;';
-			}
-			print '</td>';
-			// Link to bank transaction
-			print '<td align="center">';
-			$accountlinestatic->rowid=$value["id"];
-			if ($accountlinestatic->rowid)
-			{
-				print $accountlinestatic->getNomUrl(1);
-			}
-			else
-			{
-				print '&nbsp;';
-			}
-			print '</td>';
-
-			print '<td align="center">';
-			print '<input id="'.$value["id"].'" class="flat checkforremise_'.$bid.'" checked type="checkbox" name="toRemise[]" value="'.$value["id"].'">';
-			print '</td>' ;
-			print '</tr>';
-
-			$i++;
+    			// Link to payment
+    			print '<td align="center">';
+    			$paymentstatic->id=$value["paymentid"];
+    			$paymentstatic->ref=$value["paymentid"];
+    			if ($paymentstatic->id)
+    			{
+    				print $paymentstatic->getNomUrl(1);
+    			}
+    			else
+    			{
+    				print '&nbsp;';
+    			}
+    			print '</td>';
+    			// Link to bank transaction
+    			print '<td align="center">';
+    			$accountlinestatic->rowid=$value["id"];
+    			if ($accountlinestatic->rowid)
+    			{
+    				print $accountlinestatic->getNomUrl(1);
+    			}
+    			else
+    			{
+    				print '&nbsp;';
+    			}
+    			print '</td>';
+    
+    			print '<td align="center">';
+    			print '<input id="'.$value["id"].'" class="flat checkforremise_'.$bid.'" checked type="checkbox" name="toRemise[]" value="'.$value["id"].'">';
+    			print '</td>' ;
+    			print '</tr>';
+    
+    			$i++;
+    		}
 		}
 		print "</table>";
         print '</div>';
@@ -686,65 +683,75 @@ else
 		print_liste_field_titre('');
 		print "</tr>\n";
 		$i=1;
-		$var=false;
-		while ($objp = $db->fetch_object($resql))
-		{
-			$account_id = $objp->bid;
-			if (! isset($accounts[$objp->bid]))
-				$accounts[$objp->bid]=0;
-			$accounts[$objp->bid] += 1;
 
-			print '<tr class="oddeven">';
-			print '<td align="center">'.$i.'</td>';
-			print '<td align="center">'.dol_print_date($db->jdate($objp->date),'day').'</td>';	// Date operation
-			print '<td align="center">'.($objp->num_chq?$objp->num_chq:'&nbsp;').'</td>';
-			print '<td>'.dol_trunc($objp->emetteur,24).'</td>';
-			print '<td>'.dol_trunc($objp->banque,24).'</td>';
-			print '<td align="right">'.price($objp->amount).'</td>';
-			// Link to payment
-			print '<td align="center">';
-			$paymentstatic->id=$objp->pid;
-			$paymentstatic->ref=$objp->pid;
-			if ($paymentstatic->id)
-			{
-				print $paymentstatic->getNomUrl(1);
-			}
-			else
-			{
-				print '&nbsp;';
-			}
-			print '</td>';
-			// Link to bank transaction
-			print '<td align="center">';
-			$accountlinestatic->rowid=$objp->rowid;
-			if ($accountlinestatic->rowid)
-			{
-				print $accountlinestatic->getNomUrl(1);
-			}
-			else
-			{
-				print '&nbsp;';
-			}
-			print '</td>';
-			// Action button
-			print '<td align="right">';
-			if ($object->statut == 0)
-			{
-				print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=remove&amp;lineid='.$objp->rowid.'">'.img_delete().'</a>';
-			}
-   			if ($object->statut == 1 && $objp->statut != 2)
-   			{
-   				print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=reject_check&amp;lineid='.$objp->rowid.'">'.img_picto($langs->trans("RejectCheck"),'disable').'</a>';
-   			}
-			if ($objp->statut == 2) 
-			{
-				print ' &nbsp; '.img_picto($langs->trans('CheckRejected'),'statut8').'</a>';
-			}
-		    print '</td>';
-			print '</tr>';
-			
-			$i++;
-		}
+        if ($num > 0)
+        {
+    		while ($objp = $db->fetch_object($resql))
+    		{
+    			$account_id = $objp->bid;
+    			if (! isset($accounts[$objp->bid]))
+    				$accounts[$objp->bid]=0;
+    			$accounts[$objp->bid] += 1;
+    
+    			print '<tr class="oddeven">';
+    			print '<td align="center">'.$i.'</td>';
+    			print '<td align="center">'.dol_print_date($db->jdate($objp->date),'day').'</td>';	// Date operation
+    			print '<td align="center">'.($objp->num_chq?$objp->num_chq:'&nbsp;').'</td>';
+    			print '<td>'.dol_trunc($objp->emetteur,24).'</td>';
+    			print '<td>'.dol_trunc($objp->banque,24).'</td>';
+    			print '<td align="right">'.price($objp->amount).'</td>';
+    			// Link to payment
+    			print '<td align="center">';
+    			$paymentstatic->id=$objp->pid;
+    			$paymentstatic->ref=$objp->pid;
+    			if ($paymentstatic->id)
+    			{
+    				print $paymentstatic->getNomUrl(1);
+    			}
+    			else
+    			{
+    				print '&nbsp;';
+    			}
+    			print '</td>';
+    			// Link to bank transaction
+    			print '<td align="center">';
+    			$accountlinestatic->rowid=$objp->rowid;
+    			if ($accountlinestatic->rowid)
+    			{
+    				print $accountlinestatic->getNomUrl(1);
+    			}
+    			else
+    			{
+    				print '&nbsp;';
+    			}
+    			print '</td>';
+    			// Action button
+    			print '<td align="right">';
+    			if ($object->statut == 0)
+    			{
+    				print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=remove&amp;lineid='.$objp->rowid.'">'.img_delete().'</a>';
+    			}
+       			if ($object->statut == 1 && $objp->statut != 2)
+       			{
+       				print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=reject_check&amp;lineid='.$objp->rowid.'">'.img_picto($langs->trans("RejectCheck"),'disable').'</a>';
+       			}
+    			if ($objp->statut == 2) 
+    			{
+    				print ' &nbsp; '.img_picto($langs->trans('CheckRejected'),'statut8').'</a>';
+    			}
+    		    print '</td>';
+    			print '</tr>';
+    			
+    			$i++;
+    		}
+        }
+        else
+        {
+            print '<td colspan="8" class="opacitymedium">';
+            print $langs->trans("None");
+            print '</td>';
+        }
+                
 		print "</table>";
 		print "</div>";
 	}
diff --git a/htdocs/compta/paiement/cheque/index.php b/htdocs/compta/paiement/cheque/index.php
index 2d77cb71061..97dc3c1674f 100644
--- a/htdocs/compta/paiement/cheque/index.php
+++ b/htdocs/compta/paiement/cheque/index.php
@@ -50,8 +50,6 @@ llxHeader('',$langs->trans("ChequesArea"));
 
 print load_fiche_titre($langs->trans("ChequesArea"));
 
-//print '<table border="0" width="100%" class="notopnoleftnoright">';
-//print '<tr><td valign="top" width="30%" class="notopnoleft">';
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
 $sql = "SELECT count(b.rowid)";
@@ -90,7 +88,6 @@ else
 }
 
 
-//print '</td><td valign="top" width="70%" class="notopnoleftnoright">';
 print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
 $max=10;
@@ -98,15 +95,13 @@ $max=10;
 $sql = "SELECT bc.rowid, bc.date_bordereau as db, bc.amount, bc.ref as ref";
 $sql.= ", bc.statut, bc.nbcheque";
 $sql.= ", ba.label, ba.rowid as bid";
-$sql.= " FROM ".MAIN_DB_PREFIX."bordereau_cheque as bc";
-$sql.= ", ".MAIN_DB_PREFIX."bank_account as ba";
+$sql.= " FROM ".MAIN_DB_PREFIX."bordereau_cheque as bc, ".MAIN_DB_PREFIX."bank_account as ba";
 $sql.= " WHERE ba.rowid = bc.fk_bank_account";
 $sql.= " AND bc.entity = ".$conf->entity;
 $sql.= " ORDER BY bc.date_bordereau DESC, rowid DESC";
 $sql.= $db->plimit($max);
 
 $resql = $db->query($sql);
-
 if ($resql)
 {
 	print '<table class="noborder" width="100%">';
@@ -128,9 +123,8 @@ if ($resql)
 
 		$accountstatic->id=$objp->bid;
 		$accountstatic->label=$objp->label;
-
 		
-		print "<tr ".$bc[$var].">\n";
+		print '<tr class="oddeven">'."\n";
 
 		print '<td>'.$checkdepositstatic->getNomUrl(1).'</td>';
 		print '<td>'.dol_print_date($db->jdate($objp->db),'day').'</td>';
@@ -142,15 +136,15 @@ if ($resql)
 		print '</tr>';
 	}
 	print "</table>";
+
 	$db->free($resql);
 }
 else
 {
-  dol_print_error($db);
+    dol_print_error($db);
 }
 
 
-//print "</td></tr></table>\n";
 print '</div></div></div>';
 
 llxFooter();
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 18f1e30edc7..8a85212a0ff 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -1631,12 +1631,24 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 	    if ($fuser->rights->ficheinter->lire) $accessallowed=1;
 	    $original_file=$conf->ficheinter->dir_output.'/'.$original_file;
 	}
-	// Wrapping pour les apercu commande
+	// Wrapping pour les apercu supplier proposal
+	elseif (($modulepart == 'apercusupplier_proposal' || $modulepart == 'apercusupplier_proposal') && !empty($conf->supplier_proposal->dir_output))
+	{
+	    if ($fuser->rights->supplier_proposal->lire) $accessallowed=1;
+	    $original_file=$conf->supplier_proposal->dir_output.'/'.$original_file;
+	}
+	// Wrapping pour les apercu supplier order
 	elseif (($modulepart == 'apercusupplier_order' || $modulepart == 'apercusupplier_order') && !empty($conf->fournisseur->commande->dir_output))
 	{
 	    if ($fuser->rights->fournisseur->commande->lire) $accessallowed=1;
 	    $original_file=$conf->fournisseur->commande->dir_output.'/'.$original_file;
 	}
+	// Wrapping pour les apercu supplier invoice
+	elseif (($modulepart == 'apercusupplier_invoice' || $modulepart == 'apercusupplier_invoice') && !empty($conf->fournisseur->facture->dir_output))
+	{
+	    if ($fuser->rights->fournisseur->facture->lire) $accessallowed=1;
+	    $original_file=$conf->fournisseur->facture->dir_output.'/'.$original_file;
+	}
 	// Wrapping pour les images des stats propales
 	elseif ($modulepart == 'propalstats' && !empty($conf->propal->dir_temp))
 	{
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index da0a33e7ef1..275bbae8c36 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1070,6 +1070,7 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
 	if ($object->element == 'member')          $modulepart='memberphoto';
 	if ($object->element == 'user')            $modulepart='userphoto';
 	if ($object->element == 'product')         $modulepart='product';
+
 	if (class_exists("Imagick"))
 	{
 		if ($object->element == 'propal')    $modulepart='propal';
@@ -1077,7 +1078,9 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
 		if ($object->element == 'facture')   $modulepart='facture';
 		if ($object->element == 'fichinter') $modulepart='ficheinter';
 		if ($object->element == 'contrat')   $modulepart='contract';
-	    if ($object->element == 'order_supplier')  $modulepart='supplier_order';
+	    if ($object->element == 'supplier_proposal') $modulepart='supplier_proposal';
+		if ($object->element == 'order_supplier')    $modulepart='supplier_order';
+	    if ($object->element == 'invoice_supplier')  $modulepart='supplier_invoice';
 	}
 
 	if ($object->element == 'product')
@@ -1107,14 +1110,22 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
             {
                 $phototoshow='';
                 // Check if a preview file is available
-                if (in_array($modulepart, array('propal', 'commande', 'facture', 'ficheinter', 'contract', 'supplier_order')) && class_exists("Imagick"))
+                if (in_array($modulepart, array('propal', 'commande', 'facture', 'ficheinter', 'contract', 'supplier_order', 'supplier_proposal', 'supplier_invoice')) && class_exists("Imagick"))
                 {
                     $objectref = dol_sanitizeFileName($object->ref);
                     $dir_output = $conf->$modulepart->dir_output . "/";
-                    $filepath = $dir_output . $objectref . "/";
+                    if (in_array($modulepart, array('invoice_supplier', 'supplier_invoice')))
+                    {
+                        $subdir = get_exdir($object->id, 2, 0, 0, $object, $modulepart).$objectref;
+                    }
+                    else
+                    {
+                        $subdir = get_exdir($object->id, 0, 0, 0, $object, $modulepart).$objectref;
+                    }
+                    $filepath = $dir_output . $subdir . "/";
                     $file = $filepath . $objectref . ".pdf";
-                    $relativepath = $objectref.'/'.$objectref.'.pdf';
-                    
+                    $relativepath = $subdir.'/'.$objectref.'.pdf';
+
                     // Define path to preview pdf file (preview precompiled "file.ext" are "file.ext_preview.png")
                     $fileimage = $file.'_preview.png';              // If PDF has 1 page
                     $fileimagebis = $file.'_preview-0.png';         // If PDF has more than one page
@@ -4465,7 +4476,8 @@ function yn($yesno, $case=1, $color=0)
 
 /**
  *	Return a path to have a directory according to object.
- *  New usage:       $conf->product->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 1, $object, 'modulepart')
+ *  New usage:       $conf->module->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 1, $object, 'modulepart')
+ *         or:       $conf->module->dir_output.'/'.get_exdir(0, 0, 0, 1, $object, 'modulepart')     if multidir_output not defined.
  *  Old usage:       '015' with level 3->"0/1/5/", '015' with level 1->"5/", 'ABC-1' with level 3 ->"0/0/1/"
  *
  *	@param	string	$num            Id of object (deprecated, $object will be used in future)
@@ -4486,7 +4498,7 @@ function get_exdir($num, $level, $alpha, $withoutslash, $object, $modulepart)
 	if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) $arrayforoldpath[]='product';
 	if (! empty($level) && in_array($modulepart, $arrayforoldpath))
 	{
-		// This part should be removed once all code is using "get_exdir" to forge path, with all parameters provided
+		// This part should be removed once all code is using "get_exdir" to forge path, with all parameters provided.
 		if (empty($alpha)) $num = preg_replace('/([^0-9])/i','',$num);
 		else $num = preg_replace('/^.*\-/i','',$num);
 		$num = substr("000".$num, -$level);
diff --git a/htdocs/core/modules/supplier_payment/pdf/index.html b/htdocs/core/modules/supplier_payment/doc/index.html
similarity index 100%
rename from htdocs/core/modules/supplier_payment/pdf/index.html
rename to htdocs/core/modules/supplier_payment/doc/index.html
diff --git a/htdocs/core/modules/supplier_payment/pdf/pdf_cow.modules.php b/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
similarity index 98%
rename from htdocs/core/modules/supplier_payment/pdf/pdf_cow.modules.php
rename to htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
index edb37ddcdde..2b645e4a263 100644
--- a/htdocs/core/modules/supplier_payment/pdf/pdf_cow.modules.php
+++ b/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
@@ -36,7 +36,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functionsnumtoword.lib.php';
 /**
  *	Class to generate the supplier invoices with the canelle model
  */
-class pdf_cow extends ModelePDFSuppliersPayments
+class pdf_standard extends ModelePDFSuppliersPayments
 {
     var $db;
     var $name;
@@ -70,8 +70,8 @@ class pdf_cow extends ModelePDFSuppliersPayments
 		$langs->load("bills");
 
 		$this->db = $db;
-		$this->name = "cow";
-		$this->description = $langs->trans('SuppliersPaymentModel');
+		$this->name = "standard";
+		$this->description = $langs->trans('DocumentModelStandardPDF');
 
 		// Dimension page pour format A4
 		$this->type = 'pdf';
@@ -85,10 +85,6 @@ class pdf_cow extends ModelePDFSuppliersPayments
 		$this->marge_basse =isset($conf->global->MAIN_PDF_MARGIN_BOTTOM)?$conf->global->MAIN_PDF_MARGIN_BOTTOM:10;
 
 		$this->option_logo = 1;                    // Affiche logo
-		$this->option_tva = 1;                     // Gere option tva FACTURE_TVAOPTION
-		$this->option_modereg = 1;                 // Affiche mode reglement
-		$this->option_condreg = 1;                 // Affiche conditions reglement
-		$this->option_codeproduitservice = 1;      // Affiche code produit-service
 		$this->option_multilang = 1;               // Dispo en plusieurs langues
 
 		$this->franchise=!$mysoc->tva_assuj;
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 04af9470e6d..f930ad87979 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -70,7 +70,7 @@ $projectid	= GETPOST('projectid','int');
 $origin		= GETPOST('origin', 'alpha');
 $originid	= GETPOST('originid', 'int');
 
-//PDF
+// PDF
 $hidedetails = (GETPOST('hidedetails','int') ? GETPOST('hidedetails','int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS) ? 1 : 0));
 $hidedesc 	 = (GETPOST('hidedesc','int') ? GETPOST('hidedesc','int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC) ?  1 : 0));
 $hideref 	 = (GETPOST('hideref','int') ? GETPOST('hideref','int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF) ? 1 : 0));
@@ -1194,32 +1194,11 @@ if (empty($reshook))
 	$trackid='sin'.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
 
-
-	// Build document
-	if ($action == 'builddoc')
-	{
-		// Save modele used
-	    $object->fetch($id);
-	    $object->fetch_thirdparty();
-
-		// Save last template used to generate document
-		if (GETPOST('model')) $object->setDocModel($user, GETPOST('model','alpha'));
-
-	    $outputlangs = $langs;
-	    $newlang=GETPOST('lang_id','alpha');
-	    if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->thirdparty->default_lang;
-	    if (! empty($newlang))
-	    {
-	        $outputlangs = new Translate("",$conf);
-	        $outputlangs->setDefaultLang($newlang);
-	    }
-		$result = $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-	    if ($result	< 0)
-	    {
-			setEventMessages($object->error, $object->errors, 'errors');
-    	    $action='';
-	    }
-	}
+	// Actions to build doc
+	$upload_dir = $conf->fournisseur->facture->dir_output;
+	$permissioncreate = $user->rights->fournisseur->facture->creer;
+	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
+	
 	// Make calculation according to calculationrule
 	if ($action == 'calculate')
 	{
@@ -1234,22 +1213,6 @@ if (empty($reshook))
 	        exit;
 	    }
 	}
-	// Delete file in doc form
-	if ($action == 'remove_file')
-	{
-	    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-
-	    if ($object->fetch($id))
-	    {
-	    	$object->fetch_thirdparty();
-	        $upload_dir =	$conf->fournisseur->facture->dir_output . "/";
-	        $file =	$upload_dir	. '/' .	GETPOST('file');
-	        $ret=dol_delete_file($file,0,0,0,$object);
-	        if ($ret) setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs');
-	        else setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), null, 'errors');
-	    }
-	}
-
 	if ($action == 'update_extras')
 	{
 		// Fill array 'array_options' with data from add form
@@ -1924,7 +1887,7 @@ else
         $head = facturefourn_prepare_head($object);
         $titre=$langs->trans('SupplierInvoice');
 
-        dol_fiche_head($head, 'card', $titre, 0, 'bill');
+        dol_fiche_head($head, 'card', $titre, -1, 'bill');
 
         // Clone confirmation
         if ($action == 'clone')
@@ -2792,8 +2755,8 @@ else
 	                 * Documents generes
 	                 */
 	                $ref=dol_sanitizeFileName($object->ref);
-	                $subdir = get_exdir($object->id,2,0,0,$object,'invoice_supplier').$ref;
-	                $filedir = $conf->fournisseur->facture->dir_output.'/'.get_exdir($object->id,2,0,0,$object,'invoice_supplier').$ref;
+	                $subdir = get_exdir($object->id, 2, 0, 0, $object, 'invoice_supplier').$ref;
+	                $filedir = $conf->fournisseur->facture->dir_output.'/'.$subdir;
 	                $urlsource=$_SERVER['PHP_SELF'].'?id='.$object->id;
 	                $genallowed=$user->rights->fournisseur->facture->creer;
 	                $delallowed=$user->rights->fournisseur->facture->supprimer;
diff --git a/htdocs/fourn/facture/contact.php b/htdocs/fourn/facture/contact.php
index cafc6c1a496..0f56c5f7bae 100644
--- a/htdocs/fourn/facture/contact.php
+++ b/htdocs/fourn/facture/contact.php
@@ -138,7 +138,7 @@ if ($id > 0 || ! empty($ref))
 		
 		$head = facturefourn_prepare_head($object);
 
-		dol_fiche_head($head, 'contact', $langs->trans('SupplierInvoice'), 0, 'bill');
+		dol_fiche_head($head, 'contact', $langs->trans('SupplierInvoice'), -1, 'bill');
 
 		$linkback = '<a href="' . DOL_URL_ROOT . '/compta/facture/list.php' . (! empty($socid) ? '?socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
 
diff --git a/htdocs/fourn/facture/document.php b/htdocs/fourn/facture/document.php
index 2563a176346..ab56a66d8a7 100644
--- a/htdocs/fourn/facture/document.php
+++ b/htdocs/fourn/facture/document.php
@@ -89,7 +89,7 @@ llxHeader('', $title, $helpurl);
 if ($object->id > 0)
 {
 	$head = facturefourn_prepare_head($object);
-	dol_fiche_head($head, 'documents', $langs->trans('SupplierInvoice'), 0, 'bill');
+	dol_fiche_head($head, 'documents', $langs->trans('SupplierInvoice'), -1, 'bill');
     
 	$totalpaye = $object->getSommePaiement();
 
@@ -230,6 +230,8 @@ if ($object->id > 0)
 
 	print '</table><br>';
 
+	print '<div class="underbanner clearboth"></div>';
+	
 	print '<table class="border" width="100%">';
 
 	// Nb of files
diff --git a/htdocs/fourn/facture/info.php b/htdocs/fourn/facture/info.php
index af98c4f9b66..f5ab9164042 100644
--- a/htdocs/fourn/facture/info.php
+++ b/htdocs/fourn/facture/info.php
@@ -59,7 +59,7 @@ $alreadypaid=$object->getSommePaiement();
 
 $head = facturefourn_prepare_head($object);
 $titre=$langs->trans('SupplierInvoice');
-dol_fiche_head($head, 'info', $langs->trans('SupplierInvoice'), 0, 'bill');
+dol_fiche_head($head, 'info', $langs->trans('SupplierInvoice'), -1, 'bill');
 
 $linkback = '<a href="' . DOL_URL_ROOT . '/compta/facture/list.php' . (! empty($socid) ? '?socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
 
diff --git a/htdocs/fourn/facture/note.php b/htdocs/fourn/facture/note.php
index cd009e394f6..9df425040e1 100644
--- a/htdocs/fourn/facture/note.php
+++ b/htdocs/fourn/facture/note.php
@@ -79,11 +79,9 @@ if ($object->id > 0)
 	
 	$head = facturefourn_prepare_head($object);
 	$titre=$langs->trans('SupplierInvoice');
-	dol_fiche_head($head, 'note', $titre, 0, 'bill');
+	dol_fiche_head($head, 'note', $titre, -1, 'bill');
 
 
-	print '<table class="border" width="100%">';
-
 	// Supplier invoice card
     $linkback = '<a href="'.DOL_URL_ROOT.'/fourn/facture/list.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
 
@@ -135,7 +133,9 @@ if ($object->id > 0)
     print '<div class="fichecenter">';
     print '<div class="underbanner clearboth"></div>';
 
-	// Type
+	print '<table class="border" width="100%">';
+
+    // Type
 	print '<tr><td class="titlefield">'.$langs->trans('Type').'</td><td>';
 	print $object->getLibType();
 	if ($object->type == FactureFournisseur::TYPE_REPLACEMENT)
@@ -203,6 +203,7 @@ if ($object->id > 0)
 
 	print '<br>';
 
+    print '<div class="underbanner clearboth"></div>';
 	$cssclass="titlefield";
 	include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
 
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 1356a980164..7f0596d33cd 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1154,6 +1154,7 @@ WebCalUrlForVCalExport=An export link to <b>%s</b> format is available at follow
 BillsSetup=Invoices module setup
 BillsNumberingModule=Invoices and credit notes numbering model
 BillsPDFModules=Invoice documents models
+PaymentsPDFModules=Payment documents models
 CreditNote=Credit note
 CreditNotes=Credit notes
 ForceInvoiceDate=Force invoice date to validation date
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index 0bac6dab14f..7e63dad93e9 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2001-2007 Rodolphe Quiedeville  <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2016 Laurent Destailleur   <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2017 Laurent Destailleur   <eldy@users.sourceforge.net>
  * Copyright (C) 2004      Eric Seigne           <eric.seigne@ryxeo.com>
  * Copyright (C) 2005      Marc Barilley / Ocebo <marc@ocebo.com>
  * Copyright (C) 2005-2012 Regis Houssin         <regis.houssin@capnetworks.com>
@@ -462,13 +462,9 @@ if (empty($reshook))
 		}
 	}
 
+	// Action for direct print
 	include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
 
-
-	/*
-	 * Send mail
-	 */
-
 	// Actions to send emails
 	$actiontypecode='AC_ASKPRICE';
 	$trigger_name='SUPPLIER_PROPOSAL_SENTBYMAIL';
@@ -1530,6 +1526,7 @@ if ($action == 'create')
 		print '</td></tr>';
 	}
 
+	/* Not for supplier proposals
 	if ($soc->outstanding_limit)
 	{
 		// Outstanding Bill
@@ -1540,7 +1537,7 @@ if ($action == 'create')
 		print price($soc->outstanding_limit, 0, '', 1, - 1, - 1, $conf->currency);
 		print '</td>';
 		print '</tr>';
-	}
+	}*/
 
 	if (! empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL) && ! empty($conf->banque->enabled))
 	{
diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index 65efb97f824..58ff9dd3ded 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -2855,7 +2855,7 @@ class SupplierProposalLine  extends CommonObjectLine
 		$sql.= ", ".$this->multicurrency_total_ht;
 		$sql.= ", ".$this->multicurrency_total_tva;
 		$sql.= ", ".$this->multicurrency_total_ttc;
-		$sql.= ", ".$this->fk_unit;
+        $sql.= ", fk_unit=".($this->fk_unit?$this->fk_unit:'null');
 		$sql.= ')';
 
         dol_syslog(get_class($this).'::insert', LOG_DEBUG);
@@ -3025,13 +3025,13 @@ class SupplierProposalLine  extends CommonObjectLine
         $sql.= " , fk_parent_line=".($this->fk_parent_line>0?$this->fk_parent_line:"null");
         if (! empty($this->rang)) $sql.= ", rang=".$this->rang;
         $sql.= " , ref_fourn=".(! empty($this->ref_fourn)?"'".$this->db->escape($this->ref_fourn)."'":"null");
-		
+        $sql.= " , fk_unit=".($this->fk_unit?$this->fk_unit:'null');
+        
 		// Multicurrency
 		$sql.= " , multicurrency_subprice=".price2num($this->multicurrency_subprice)."";
         $sql.= " , multicurrency_total_ht=".price2num($this->multicurrency_total_ht)."";
         $sql.= " , multicurrency_total_tva=".price2num($this->multicurrency_total_tva)."";
         $sql.= " , multicurrency_total_ttc=".price2num($this->multicurrency_total_ttc)."";
-        $sql.= " , fk_unit=".$this->fk_unit;
 		
 		$sql.= " WHERE rowid = ".$this->rowid;
 

From de356a318586d8927caabd9d28b336d4a7967536 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 5 May 2017 12:41:31 +0200
Subject: [PATCH 204/505] =?UTF-8?q?Revert=20"FIX=20:=20close=20supplier=20?=
 =?UTF-8?q?makes=20no=20sense.=20we=20just=20need=20to=20know=20if=20it=20?=
 =?UTF-8?q?is=20ac=E2=80=A6"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/supplier_proposal/card.php | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index 86813222b6d..7e63dad93e9 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -441,6 +441,14 @@ if (empty($reshook))
 		}
 	}
 
+	// Close proposal
+	else if ($action == 'close' && $user->rights->supplier_proposal->cloturer && ! GETPOST('cancel')) {
+		// prevent browser refresh from reopening proposal several times
+		if ($object->statut == 2) {
+			$object->setStatut(4);
+		}
+	}
+
 	// Set accepted/refused
 	else if ($action == 'setstatut' && $user->rights->supplier_proposal->cloturer && ! GETPOST('cancel')) {
 		if (! GETPOST('statut')) {
@@ -1768,6 +1776,12 @@ if ($action == 'create')
 					print '>' . $langs->trans('SetAcceptedRefused') . '</a></div>';
 				}
 
+				// Close
+				if ($object->statut == 2 && $user->rights->supplier_proposal->cloturer) {
+				    print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=close' . (empty($conf->global->MAIN_JUMP_TAG) ? '' : '#close') . '"';
+				    print '>' . $langs->trans('Close') . '</a></div>';
+				}
+
 				// Clone
 				if ($user->rights->supplier_proposal->creer) {
 					print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&amp;socid=' . $object->socid . '&amp;action=clone&amp;object=' . $object->element . '">' . $langs->trans("ToClone") . '</a></div>';

From 884b261df518c622470d0ec19ebfe2f40d7652a8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 5 May 2017 12:51:47 +0200
Subject: [PATCH 205/505] Code comment

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

diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index 58ff9dd3ded..7d5997c849e 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -154,7 +154,7 @@ class SupplierProposal extends CommonObject
 	 */
 	const STATUS_SIGNED = 2;
 	/**
-	 * Not signed quote
+	 * Not signed quote, canceled
 	 */
 	const STATUS_NOTSIGNED = 3;
 	/**

From 90542d119a17ab92048f0e9da7acb03e9e9f04c0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 5 May 2017 13:25:30 +0200
Subject: [PATCH 206/505] FIX trigger name and status set of setStatus for
 commercial proposal

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

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 16bff11b5fd..d732e8b9b69 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -2790,6 +2790,8 @@ abstract class CommonObject
     {
     	global $user,$langs,$conf;
 
+    	$savElementId=$elementId;  // To be used later to know if we were using the method using the id of this or not.
+    	
         $elementId = (!empty($elementId)?$elementId:$this->id);
         $elementTable = (!empty($elementType)?$elementType:$this->table_element);
 
@@ -2813,11 +2815,13 @@ abstract class CommonObject
             $error = 0;
 
             $trigkey='';
-            if ($this->element == 'supplier_proposal' && $status == 2) $trigkey='SUPPLIER_PROPOSAL_CLOSE';
+            if ($this->element == 'supplier_proposal' && $status == 2) $trigkey='SUPPLIER_PROPOSAL_SIGN';   // 2 = SupplierProposal::STATUS_SIGNED. Can't use constant into this generic class
+            if ($this->element == 'supplier_proposal' && $status == 3) $trigkey='SUPPLIER_PROPOSAL_REFUSE'; // 3 = SupplierProposal::STATUS_REFUSED. Can't use constant into this generic class
+            if ($this->element == 'supplier_proposal' && $status == 4) $trigkey='SUPPLIER_PROPOSAL_CLOSE';  // 4 = SupplierProposal::STATUS_CLOSED. Can't use constant into this generic class
             if ($this->element == 'fichinter' && $status == 3) $trigkey='FICHINTER_CLASSIFY_DONE';
             if ($this->element == 'fichinter' && $status == 2) $trigkey='FICHINTER_CLASSIFY_BILLED';
             if ($this->element == 'fichinter' && $status == 1) $trigkey='FICHINTER_CLASSIFY_UNBILLED';
-
+            
             if ($trigkey)
             {
                 // Appel des triggers
@@ -2833,12 +2837,14 @@ abstract class CommonObject
 			if (! $error)
 			{
 				$this->db->commit();
-        		if (empty($elementId))    // If the element we update was $this (so $elementId is null)
+				
+        		if (empty($savElementId))    // If the element we update was $this (so $elementId is null)
         		{
         		    $this->statut = $status;
         		    $this->status = $status;
         		}
-				return 1;
+
+                return 1;
 			}
 			else
 			{

From 0bffac6dc4c4891f033b3a759ddd82ca5e0244b7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 5 May 2017 13:43:43 +0200
Subject: [PATCH 207/505] Use constant vor status.

---
 htdocs/comm/propal/class/propal.class.php     |  4 +-
 .../mysql/tables/llx_supplier_proposal.sql    | 12 +++---
 htdocs/supplier_proposal/card.php             | 40 +++++++++----------
 .../class/supplier_proposal.class.php         |  7 ++--
 4 files changed, 29 insertions(+), 34 deletions(-)

diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 348ca1938b0..8b594d57631 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -187,7 +187,7 @@ class Propal extends CommonObject
 	/**
 	 * Billed or processed quote
 	 */
-	const STATUS_BILLED = 4;
+	const STATUS_BILLED = 4;   // Todo rename into STATUS_CLOSE ?
 
     /**
      *	Constructor
@@ -1301,7 +1301,7 @@ class Propal extends CommonObject
                 $this->note                 = $obj->note_private; // TODO deprecated
                 $this->note_private         = $obj->note_private;
                 $this->note_public          = $obj->note_public;
-                $this->statut               = $obj->fk_statut;
+                $this->statut               = (int) $obj->fk_statut;
                 $this->statut_libelle       = $obj->statut_label;
 
                 $this->datec                = $this->db->jdate($obj->datec); // TODO deprecated
diff --git a/htdocs/install/mysql/tables/llx_supplier_proposal.sql b/htdocs/install/mysql/tables/llx_supplier_proposal.sql
index 43f26ee0459..13d9ba3a59a 100644
--- a/htdocs/install/mysql/tables/llx_supplier_proposal.sql
+++ b/htdocs/install/mysql/tables/llx_supplier_proposal.sql
@@ -18,7 +18,7 @@
 CREATE TABLE llx_supplier_proposal (
   rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY,
   ref varchar(30) NOT NULL,
-  entity integer NOT NULL DEFAULT '1',
+  entity integer NOT NULL DEFAULT 1,
   ref_ext varchar(255) DEFAULT NULL,
   ref_int varchar(255) DEFAULT NULL,
   fk_soc integer DEFAULT NULL,
@@ -31,11 +31,11 @@ CREATE TABLE llx_supplier_proposal (
   fk_user_modif integer DEFAULT NULL,
   fk_user_valid integer DEFAULT NULL,
   fk_user_cloture integer DEFAULT NULL,
-  fk_statut smallint NOT NULL DEFAULT '0',		-- 0=draft, 1=validated, 2=accepted, 3=refused, 4=closed
-  price double DEFAULT '0',
-  remise_percent double DEFAULT '0',
-  remise_absolue double DEFAULT '0',
-  remise double DEFAULT '0',
+  fk_statut	smallint DEFAULT 0 NOT NULL,	-- 0=draft, 1=validated, 2=accepted, 3=refused, 4=billed/closed
+  price double DEFAULT 0,
+  remise_percent double DEFAULT 0,
+  remise_absolue double DEFAULT 0,
+  remise double DEFAULT 0,
   total_ht double(24,8) DEFAULT 0,
   tva double(24,8) DEFAULT 0,
   localtax1 double(24,8) DEFAULT 0,
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index 7e63dad93e9..b230133d7b8 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -261,7 +261,7 @@ if (empty($reshook))
 					$object->modelpdf = GETPOST('model');
 					$object->author = $user->id; // deprecated
 					$object->note = GETPOST('note');
-					$object->statut = 0;
+					$object->statut = SupplierProposal::STATUS_DRAFT;
 
 					$id = $object->create_from($user);
 				} else {
@@ -436,16 +436,16 @@ if (empty($reshook))
 	// Reopen proposal
 	else if ($action == 'confirm_reopen' && $user->rights->supplier_proposal->cloturer && ! GETPOST('cancel')) {
 		// prevent browser refresh from reopening proposal several times
-		if ($object->statut == 2 || $object->statut == 3 || $object->statut == 4) {
-			$object->reopen($user, 1);
+		if ($object->statut == SupplierProposal::STATUS_SIGNED || $object->statut == SupplierProposal::STATUS_NOTSIGNED || $object->statut == SupplierProposal::STATUS_CLOSE) {
+			$object->reopen($user, SupplierProposal::STATUS_VALIDATED);
 		}
 	}
 
 	// Close proposal
 	else if ($action == 'close' && $user->rights->supplier_proposal->cloturer && ! GETPOST('cancel')) {
-		// prevent browser refresh from reopening proposal several times
-		if ($object->statut == 2) {
-			$object->setStatut(4);
+	    // prevent browser refresh from reopening proposal several times
+	    if ($object->statut == SupplierProposal::STATUS_SIGNED) {
+			$object->setStatut(SupplierProposal::STATUS_CLOSE);
 		}
 	}
 
@@ -456,7 +456,7 @@ if (empty($reshook))
 			$action = 'statut';
 		} else {
 			// prevent browser refresh from closing proposal several times
-			if ($object->statut == 1) {
+			if ($object->statut == SupplierProposal::STATUS_VALIDATED) {
                 $object->cloture($user, GETPOST('statut'), GETPOST('note'));
 			}
 		}
@@ -1239,7 +1239,7 @@ if ($action == 'create')
 		$sql .= ", " . MAIN_DB_PREFIX . "societe s";
 		$sql .= " WHERE s.rowid = p.fk_soc";
 		$sql .= " AND p.entity = " . $conf->entity;
-		$sql .= " AND p.fk_statut <> 0";
+		$sql .= " AND p.fk_statut <> ".SupplierProposal::STATUS_DRAFT;
 		$sql .= " ORDER BY Id";
 
 		$resql = $db->query($sql);
@@ -1658,7 +1658,7 @@ if ($action == 'create')
 	<input type="hidden" name="id" value="' . $object->id . '">
 	';
 
-	if (! empty($conf->use_javascript_ajax) && $object->statut == 0) {
+	if (! empty($conf->use_javascript_ajax) && $object->statut == SupplierProposal::STATUS_DRAFT) {
 		include DOL_DOCUMENT_ROOT . '/core/tpl/ajaxrow.tpl.php';
 	}
 
@@ -1673,12 +1673,10 @@ if ($action == 'create')
 		$ret = $object->printObjectLines($action, $soc, $mysoc, $lineid, 1);
 
 	// Form to add new line
-	if ($object->statut == 0 && $user->rights->supplier_proposal->creer)
+	if ($object->statut == SupplierProposal::STATUS_DRAFT && $user->rights->supplier_proposal->creer)
 	{
 		if ($action != 'editline')
 		{
-			$var = true;
-
 			// Add products/services form
 			$object->formAddObjectLine(1, $soc, $mysoc);
 
@@ -1735,7 +1733,7 @@ if ($action == 'create')
 			if ($action != 'statut' && $action != 'editline')
 			{
 				// Validate
-				if ($object->statut == 0 && $object->total_ttc >= 0 && count($object->lines) > 0 &&
+				if ($object->statut == SupplierProposal::STATUS_DRAFT && $object->total_ttc >= 0 && count($object->lines) > 0 &&
 			        ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->supplier_proposal->creer))
        				|| (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->supplier_proposal->validate_advance)))
 				) {
@@ -1745,18 +1743,18 @@ if ($action == 'create')
 				}
 
 				// Edit
-				if ($object->statut == 1 && $user->rights->supplier_proposal->creer) {
+				if ($object->statut == SupplierProposal::STATUS_VALIDATED && $user->rights->supplier_proposal->creer) {
 					print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=modif">' . $langs->trans('Modify') . '</a></div>';
 				}
 
 				// ReOpen
-				if (($object->statut == 2 || $object->statut == 3 || $object->statut == 4) && $user->rights->supplier_proposal->cloturer) {
+				if (($object->statut == SupplierProposal::STATUS_SIGNED || $object->statut == SupplierProposal::STATUS_NOTSIGNED || $object->statut == SupplierProposal::STATUS_CLOSE) && $user->rights->supplier_proposal->cloturer) {
 					print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=reopen' . (empty($conf->global->MAIN_JUMP_TAG) ? '' : '#reopen') . '"';
 					print '>' . $langs->trans('ReOpen') . '</a></div>';
 				}
 
 				// Send
-				if ($object->statut == 1 || $object->statut == 2) {
+				if ($object->statut == SupplierProposal::STATUS_VALIDATED || $object->statut == SupplierProposal::STATUS_SIGNED) {
 					if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->supplier_proposal->send_advance) {
 						print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=presend&amp;mode=init">' . $langs->trans('SendByMail') . '</a></div>';
 					} else
@@ -1764,20 +1762,20 @@ if ($action == 'create')
 				}
 
 				// Create an order
-				if (! empty($conf->commande->enabled) && $object->statut == 2) {
+				if (! empty($conf->commande->enabled) && $object->statut == SupplierProposal::STATUS_SIGNED) {
 					if ($user->rights->fournisseur->commande->creer) {
 						print '<div class="inline-block divButAction"><a class="butAction" href="' . DOL_URL_ROOT . '/fourn/commande/card.php?action=create&amp;origin=' . $object->element . '&amp;originid=' . $object->id . '&amp;socid=' . $object->socid . '">' . $langs->trans("AddOrder") . '</a></div>';
 					}
 				}
 
 				// Set accepted/refused
-				if ($object->statut == 1 && $user->rights->supplier_proposal->cloturer) {
+				if ($object->statut == SupplierProposal::STATUS_VALIDATED && $user->rights->supplier_proposal->cloturer) {
 					print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=statut' . (empty($conf->global->MAIN_JUMP_TAG) ? '' : '#acceptedrefused') . '"';
 					print '>' . $langs->trans('SetAcceptedRefused') . '</a></div>';
 				}
 
 				// Close
-				if ($object->statut == 2 && $user->rights->supplier_proposal->cloturer) {
+				if ($object->statut == SupplierProposal::STATUS_SIGNED && $user->rights->supplier_proposal->cloturer) {
 				    print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=close' . (empty($conf->global->MAIN_JUMP_TAG) ? '' : '#close') . '"';
 				    print '>' . $langs->trans('Close') . '</a></div>';
 				}
@@ -1788,7 +1786,7 @@ if ($action == 'create')
 				}
 
 				// Delete
-				if (($object->statut == 0 && $user->rights->supplier_proposal->creer) || $user->rights->supplier_proposal->supprimer) {
+				if (($object->statut == SupplierProposal::STATUS_DRAFT && $user->rights->supplier_proposal->creer) || $user->rights->supplier_proposal->supprimer) {
 					print '<div class="inline-block divButAction"><a class="butActionDelete" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=delete"';
 					print '>' . $langs->trans('Delete') . '</a></div>';
 				}
@@ -1811,8 +1809,6 @@ if ($action == 'create')
 		$genallowed = $user->rights->supplier_proposal->creer;
 		$delallowed = $user->rights->supplier_proposal->supprimer;
 
-		$var = true;
-
 		print $formfile->showdocuments('supplier_proposal', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', 0, '', $soc->default_lang);
 
 		
diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index 7d5997c849e..b140daa280c 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -158,9 +158,9 @@ class SupplierProposal extends CommonObject
 	 */
 	const STATUS_NOTSIGNED = 3;
 	/**
-	 * Billed or processed quote
+	 * Billed or closed/processed quote
 	 */
-	const STATUS_BILLED = 4;	
+	const STATUS_CLOSE = 4;	
 	
 	
 	
@@ -1143,9 +1143,8 @@ class SupplierProposal extends CommonObject
                 $this->note                 = $obj->note_private; // TODO deprecated
                 $this->note_private         = $obj->note_private;
                 $this->note_public          = $obj->note_public;
-                $this->statut               = $obj->fk_statut;
+                $this->statut               = (int) $obj->fk_statut;
                 $this->statut_libelle       = $obj->statut_label;
-
                 $this->datec                = $this->db->jdate($obj->datec); // TODO deprecated
                 $this->datev                = $this->db->jdate($obj->datev); // TODO deprecated
                 $this->date_creation		= $this->db->jdate($obj->datec); //Creation date

From d60e98a7976ff87f4b1984850c33c83aae2c6f66 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 5 May 2017 13:48:40 +0200
Subject: [PATCH 208/505] No payment information on a supplier proposal by
 default.

---
 .../supplier_proposal/doc/pdf_aurore.modules.php   | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
index 3b2812c7b90..6efe3ead81c 100644
--- a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
+++ b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
@@ -635,16 +635,6 @@ class pdf_aurore extends ModelePDFSupplierProposal
 
 		$pdf->SetFont('','', $default_font_size - 1);
 
-		// If France, show VAT mention if not applicable
-		if ($this->emetteur->country_code == 'FR' && $this->franchise == 1)
-		{
-			$pdf->SetFont('','B', $default_font_size - 2);
-			$pdf->SetXY($this->marge_gauche, $posy);
-			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("VATIsNotUsedForInvoice"), 0, 'L', 0);
-
-			$posy=$pdf->GetY()+4;
-		}
-
 		$posxval=52;
 
         // Show shipping date
@@ -723,7 +713,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 			$posy=$pdf->GetY()+3;
 		}
 
-		if (empty($conf->global->SUPPLIER_PROPOSAL_PDF_HIDE_PAYMENTTERMCOND))
+		if (! empty($conf->global->SUPPLIER_PROPOSAL_PDF_SHOW_PAYMENTTERMCOND))
 		{
 			// Show payment mode
 			if ($object->mode_reglement_code
@@ -1037,7 +1027,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 		$resteapayer = $object->total_ttc - $deja_regle;
 		if (! empty($object->paye)) $resteapayer=0;
 		*/
-
+        
 		if ($deja_regle > 0)
 		{
 			$index++;

From a1ac3b470bb8a3a93f95c987672a1fa6a13e3b2e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 5 May 2017 14:01:20 +0200
Subject: [PATCH 209/505] Change menu for setup of predefined emails

---
 htdocs/core/class/html.formmail.class.php | 4 ++--
 htdocs/langs/en_US/main.lang              | 3 ++-
 htdocs/langs/en_US/other.lang             | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index ab58854f2c4..1d5e8714aad 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -327,7 +327,7 @@ class FormMail extends Form
         	{
 	        	$out.= '<div class="center" style="padding: 0px 0 12px 0">'."\n";
         	    $out.= $langs->trans('SelectMailModel').': '.$this->selectarray('modelmailselected', $modelmail_array, 0, 1);
-	        	if ($user->admin) $out.= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+	        	if ($user->admin) $out.= info_admin($langs->trans("YouCanChangeValuesForThisListFrom", $langs->transnoentitiesnoconv('Setup').' - '.$langs->transnoentitiesnoconv('EMails')),1);
 	        	$out.= ' &nbsp; ';
 	        	$out.= '<input class="button" type="submit" value="'.$langs->trans('Apply').'" name="modelselected" id="modelselected">';
 	        	$out.= ' &nbsp; ';
@@ -341,7 +341,7 @@ class FormMail extends Form
         	{
 	        	$out.= '<div class="center" style="padding: 0px 0 12px 0">'."\n";
         	    $out.= $langs->trans('SelectMailModel').': <select name="modelmailselected" disabled="disabled"><option value="none">'.$langs->trans("NoTemplateDefined").'</option></select>';    // Do not put disabled on option, it is already on select and it makes chrome crazy.
-        	    if ($user->admin) $out.= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+        	    if ($user->admin) $out.= info_admin($langs->trans("YouCanChangeValuesForThisListFrom", $langs->transnoentitiesnoconv('Setup').' - '.$langs->transnoentitiesnoconv('EMails')),1);
         	    $out.= ' &nbsp; ';
         	    $out.= '<input class="button" type="submit" value="'.$langs->trans('Apply').'" name="modelselected" disabled="disabled" id="modelselected">';
         	    $out.= ' &nbsp; ';
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index bc7c864b279..9453c1522e9 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -611,7 +611,8 @@ PartialWoman=Partial
 TotalWoman=Total
 NeverReceived=Never received
 Canceled=Canceled
-YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu setup - dictionary
+YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu Setup - Dictionaries
+YouCanChangeValuesForThisListFrom=You can change values for this list from menu %s
 YouCanSetDefaultValueInModuleSetup=You can set the default value used when creating a new record into module setup
 Color=Color
 Documents=Linked files
diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang
index ab937ff3bab..a37927566e3 100644
--- a/htdocs/langs/en_US/other.lang
+++ b/htdocs/langs/en_US/other.lang
@@ -61,7 +61,7 @@ PredefinedMailTestHtml=This is a <b>test</b> mail (the word test must be in bold
 PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice  __REF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__

From 919d5b2ef3b16e59d48c00fbc6f9a5461e4b0a95 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 5 May 2017 14:01:32 +0200
Subject: [PATCH 210/505] Fix missing translation

---
 htdocs/supplier_proposal/card.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index b230133d7b8..d36b471a721 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -1855,6 +1855,7 @@ if ($action == 'create')
 			$outputlangs = new Translate('', $conf);
 			$outputlangs->setDefaultLang($newlang);
 			$outputlangs->load('commercial');
+			$outputlangs->load('supplier_proposal');
 		}
 
 		// Build document if it not exists

From 91c505c9c970f09029f75b40f4715b2f362c60af Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 5 May 2017 14:20:59 +0200
Subject: [PATCH 211/505] Update llx_accounting.sql

---
 htdocs/install/mysql/data/llx_accounting.sql | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/htdocs/install/mysql/data/llx_accounting.sql b/htdocs/install/mysql/data/llx_accounting.sql
index c468e4c3968..e81d13dd2b8 100644
--- a/htdocs/install/mysql/data/llx_accounting.sql
+++ b/htdocs/install/mysql/data/llx_accounting.sql
@@ -27,15 +27,11 @@
 -- de l'install et tous les sigles '--' sont supprimés.
 --
 
-delete from llx_accounting_account;
-delete from llx_accounting_system;
-delete from llx_accounting_journal;
-
-INSERT INTO llx_accounting_journal (rowid, code, label, nature, active) VALUES (1,'VT', 'Journal des ventes', 2, 1);
-INSERT INTO llx_accounting_journal (rowid, code, label, nature, active) VALUES (2,'AC', 'Journal des achats', 3, 1);
-INSERT INTO llx_accounting_journal (rowid, code, label, nature, active) VALUES (3,'BQ', 'Journal de banque', 4, 1);
-INSERT INTO llx_accounting_journal (rowid, code, label, nature, active) VALUES (4,'OD', 'Journal des opérations diverses', 1, 1);
-INSERT INTO llx_accounting_journal (rowid, code, label, nature, active) VALUES (5,'AN', 'Journal des à-nouveaux', 9, 1);
+INSERT INTO llx_accounting_journal (code, label, nature, active) VALUES ('VT', 'Journal des ventes', 2, 1);
+INSERT INTO llx_accounting_journal (code, label, nature, active) VALUES ('AC', 'Journal des achats', 3, 1);
+INSERT INTO llx_accounting_journal (code, label, nature, active) VALUES ('BQ', 'Journal de banque', 4, 1);
+INSERT INTO llx_accounting_journal (code, label, nature, active) VALUES ('OD', 'Journal des opérations diverses', 1, 1);
+INSERT INTO llx_accounting_journal (code, label, nature, active) VALUES ('AN', 'Journal des à-nouveaux', 9, 1);
 --
 -- Descriptif des plans comptables FR PCG99-ABREGE
 --

From 885a63635181150ae3b5bc3c880b1f83cda4bc11 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 5 May 2017 16:35:05 +0200
Subject: [PATCH 212/505] Debug new journal list page

---
 htdocs/accountancy/admin/journals_list.php    | 41 ++++++++-----------
 htdocs/accountancy/index.php                  | 16 +++++---
 htdocs/core/class/translate.class.php         |  1 +
 .../install/mysql/migration/5.0.0-6.0.0.sql   |  7 ++++
 htdocs/langs/en_US/accountancy.lang           | 28 +++++++------
 5 files changed, 50 insertions(+), 43 deletions(-)

diff --git a/htdocs/accountancy/admin/journals_list.php b/htdocs/accountancy/admin/journals_list.php
index be532c7c25f..065d750ca82 100644
--- a/htdocs/accountancy/admin/journals_list.php
+++ b/htdocs/accountancy/admin/journals_list.php
@@ -126,10 +126,10 @@ complete_dictionary_with_modules($taborder,$tabname,$tablib,$tabsql,$tabsqlsort,
 // Define elementList and sourceList (used for dictionary type of contacts "llx_c_type_contact")
 $elementList = array();
 	$sourceList = array(
-			'1' => $langs->trans('AccountingJournalType0'),
-			'2' => $langs->trans('AccountingJournalType1'),
-			'3' => $langs->trans('AccountingJournalType2'),
-			'4' => $langs->trans('AccountingJournalType3'),
+			'1' => $langs->trans('AccountingJournalType1'),
+			'2' => $langs->trans('AccountingJournalType2'),
+			'3' => $langs->trans('AccountingJournalType3'),
+			'4' => $langs->trans('AccountingJournalType4'),
 			'9' => $langs->trans('AccountingJournalType9')
 	);
 
@@ -212,10 +212,7 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
         $i=0;
         foreach ($listfieldinsert as $f => $value)
         {
-            if ($value == 'price' || preg_match('/^amount/i',$value) || $value == 'taux') {
-            	$_POST[$listfieldvalue[$i]] = price2num($_POST[$listfieldvalue[$i]],'MU');
-            }
-            else if ($value == 'entity') {
+            if ($value == 'entity') {
             	$_POST[$listfieldvalue[$i]] = $conf->entity;
             }
             if ($i) $sql.=",";
@@ -465,7 +462,6 @@ if ($id)
              if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label') $alabelisused=1;
         }
 
-        if ($id == 4) print '<td></td>';
         print '<td>';
         print '<input type="hidden" name="id" value="'.$id.'">';
         print '</td>';
@@ -475,7 +471,7 @@ if ($id)
         print '</tr>';
 
         // Line to enter new values
-        print "<tr ".$bcnd[$var].">";
+        print '<tr class="oddeven nodrag nodrap nohover">';
 
         $obj = new stdClass();
         // If data was already input, we define them in obj to populate input fields.
@@ -503,13 +499,7 @@ if ($id)
         print '</td>';
         print "</tr>";
 
-        $colspan=count($fieldlist)+3;
-
-        if (! empty($alabelisused))  // If there is one label among fields, we show legend of *
-        {
-        	print '<tr><td colspan="'.$colspan.'">* '.$langs->trans("LabelUsedByDefault").'.</td></tr>';
-        }
-        print '<tr><td colspan="'.$colspan.'">&nbsp;</td></tr>';	// Keep &nbsp; to have a line with enough height
+        print '<tr><td colspan="7">&nbsp;</td></tr>';	// Keep &nbsp; to have a line with enough height
     }
 
 
@@ -578,6 +568,9 @@ if ($id)
         print '<td class="liste_titre"></td>';
         print '<td class="liste_titre"></td>';
         print '<td class="liste_titre"></td>';
+        print '<td class="liste_titre"></td>';
+        print '<td class="liste_titre"></td>';
+        print '<td class="liste_titre"></td>';
         print '<td class="liste_titre" align="center">';
     	if ($filterfound)
     	{
@@ -605,14 +598,12 @@ if ($id)
                     // Show fields
                     if (empty($reshook)) fieldList($fieldlist,$obj,$tabname[$id],'edit');
 
-                    print '<td></td>';
-                    print '<td></td>';
-                    print '<td align="center">';
+                    print '<td align="center" colspan="4">';
                     print '<input type="hidden" name="page" value="'.$page.'">';
                     print '<input type="hidden" name="rowid" value="'.$rowid.'">';
                     print '<input type="submit" class="button" name="actionmodify" value="'.$langs->trans("Modify").'">';
-                    print '<div name="'.(! empty($obj->rowid)?$obj->rowid:$obj->code).'"></div>';
                     print '<input type="submit" class="button" name="actioncancel" value="'.$langs->trans("Cancel").'">';
+                    print '<div name="'.(! empty($obj->rowid)?$obj->rowid:$obj->code).'"></div>';
                     print '</td>';
                 }
                 else
@@ -655,10 +646,7 @@ if ($id)
                     	else if ($obj->code == 'EF0')   { $iserasable = 0; $canbedisabled = 0; }
                     }
 
-                    if (isset($obj->type) && in_array($obj->type, array('system', 'systemauto'))) { $iserasable=0; }
-                    if (in_array($obj->code, array('AC_OTH','AC_OTH_AUTO')) || in_array($obj->type, array('systemauto'))) { $canbedisabled=0; $canbedisabled = 0; }
                     $canbemodified=$iserasable;
-                    if ($obj->code == 'RECEP') $canbemodified=1;
 
                     $url = $_SERVER["PHP_SELF"].'?'.($page?'page='.$page.'&':'').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.(! empty($obj->rowid)?$obj->rowid:(! empty($obj->code)?$obj->code:'')).'&code='.(! empty($obj->code)?urlencode($obj->code):'');
                     if ($param) $url .= '&'.$param;
@@ -690,9 +678,12 @@ if ($id)
                     }
                     else print '<td>&nbsp;</td>';
 
+                    print '<td></td>';
+                                         
                     print '</td>';
-                    print "</tr>\n";
                 }
+                
+                print "</tr>\n";
                 $i++;
             }
         }
diff --git a/htdocs/accountancy/index.php b/htdocs/accountancy/index.php
index ff9ca6fa1a3..c7caa5daac3 100644
--- a/htdocs/accountancy/index.php
+++ b/htdocs/accountancy/index.php
@@ -71,6 +71,10 @@ print "<br>\n";
 
 // STEPS
 $step++;
+print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescJournalSetup", $step, '<strong>'.$langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("AccountingJournals").'</strong>');
+print "<br>\n";
+print "<br>\n";
+$step++;
 print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescChartModel", $step, '<strong>'.$langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("Pcg_version").'</strong>');
 print "<br>\n";
 print "<br>\n";
@@ -148,24 +152,26 @@ print '<hr>';
 print "<br>\n";
 $step = 0;
 
+$langs->loadLangs(array('bills', 'trips'));
+
 $step++;
-print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescCustomer", $step, '<strong>'.$langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("MenuAccountancy")."-".$langs->transnoentitiesnoconv("CustomersVentilation").'</strong>')."<br>\n";
+print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBind", chr(64+$step), $langs->transnoentitiesnoconv("BillsCustomers"), '<strong>'.$langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("MenuAccountancy")."-".$langs->transnoentitiesnoconv("CustomersVentilation").'</strong>')."<br>\n";
 print "<br>\n";
 
 $step++;
-print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescSupplier", $step, '<strong>'.$langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("MenuAccountancy")."-".$langs->transnoentitiesnoconv("SuppliersVentilation").'</strong>')."<br>\n";
+print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBind", chr(64+$step), $langs->transnoentitiesnoconv("BillsSuppliers"), '<strong>'.$langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("MenuAccountancy")."-".$langs->transnoentitiesnoconv("SuppliersVentilation").'</strong>')."<br>\n";
 print "<br>\n";
 
 $step++;
-print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescExpenseReport", $step, '<strong>'.$langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("MenuAccountancy")."-".$langs->transnoentitiesnoconv("ExpenseReportsVentilation").'</strong>')."<br>\n";
+print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBind", chr(64+$step), $langs->transnoentitiesnoconv("ExpenseReports"), '<strong>'.$langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("MenuAccountancy")."-".$langs->transnoentitiesnoconv("ExpenseReportsVentilation").'</strong>')."<br>\n";
 print "<br>\n";
 
 $step++;
-print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescWriteRecords", $step)."<br>\n";
+print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescWriteRecords", chr(64+$step), $langs->transnoentitiesnoconv("Journalization"), $langs->transnoentitiesnoconv("WriteBookKeeping"))."<br>\n";
 print "<br>\n";
 
 $step++;
-print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescAnalyze", $step)."<br>\n";
+print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescAnalyze", chr(64+$step))."<br>\n";
 print "<br>\n";
 
 llxFooter();
diff --git a/htdocs/core/class/translate.class.php b/htdocs/core/class/translate.class.php
index 30cedf57d51..0f2e6a837ef 100644
--- a/htdocs/core/class/translate.class.php
+++ b/htdocs/core/class/translate.class.php
@@ -170,6 +170,7 @@ class Translate
 	 * 	@param	int		$forcelangdir		To force a different lang directory
 	 *  @param  int     $loadfromfileonly   1=Do not load overwritten translation from file or old conf.
 	 *	@return	int							<0 if KO, 0 if already loaded or loading not required, >0 if OK
+	 *  @see loadLangs
 	 */
 	function load($domain,$alt=0,$stopafterdirection=0,$forcelangdir='',$loadfromfileonly=0)
 	{
diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index a6666d37ee0..f88ffd05687 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -251,3 +251,10 @@ insert into llx_c_tva(fk_pays,taux,code,recuperableonly,localtax1,localtax1_type
 
 ALTER TABLE llx_events MODIFY COLUMN ip varchar(250);
 
+UPDATE llx_accounting_journal SET nature = 1 where code = 'OD' and nature = 0;
+UPDATE llx_accounting_journal SET nature = 2 where code = 'VT' and nature = 1;
+UPDATE llx_accounting_journal SET nature = 3 where code = 'AC' and nature = 2;
+UPDATE llx_accounting_journal SET nature = 4 where (code = 'BK' or code = 'BQ') and nature = 3;
+
+
+
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index a5788736fbd..9eb4135397f 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -32,23 +32,25 @@ ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account
 AccountancyArea=Accountancy area
 AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
 AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
-AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making thee journalization (writing record in Journals and General ledger)
+AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
 AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+
+AccountancyAreaDescJournalSetup=STEP %s: Create or check content of your journal list from menu %s
 AccountancyAreaDescChartModel=STEP %s: Create a model of chart of account from menu %s
 AccountancyAreaDescChart=STEP %s: Create or check content of your chart of account from menu %s
-AccountancyAreaDescVat=STEP %s: Define accounting accounts for each VAT Rates. For this you can use the menu entry %s.    
-AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for type of expense report. For this you can use the menu entry %s.
-AccountancyAreaDescSal=STEP %s: Define default accounting accounts for payment of salaries. For this you can use the menu entry %s.    
-AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for special expences (miscellaneous taxes). For this you can use the menu entry %s.    
-AccountancyAreaDescDonation=STEP %s: Define default accounting accounts for donation. For this you can use the menu entry %s.
-AccountancyAreaDescMisc=STEP %s: Define default accounting accounts for miscellaneous transactions. For this you can use the menu entry %s.
-AccountancyAreaDescLoan=STEP %s: Define default accounting accounts for loans. For this you can use the menu entry %s. 
-AccountancyAreaDescBank=STEP %s: Define accounting accounts for each bank and financial accounts. For this, go on the card of each financial account. You can start from page %s.
-AccountancyAreaDescProd=STEP %s: Define accounting accounts on your products. For this you can use the menu entry %s.
 
-AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. For this, go into each Journal, and click into button "Journalize transactions in General Ledger". 
+AccountancyAreaDescVat=STEP %s: Define accounting accounts for each VAT Rates. For this, use the menu entry %s.    
+AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of expense report. For this, use the menu entry %s.
+AccountancyAreaDescSal=STEP %s: Define default accounting accounts for payment of salaries. For this, use the menu entry %s.    
+AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for special expences (miscellaneous taxes). For this, use the menu entry %s.    
+AccountancyAreaDescDonation=STEP %s: Define default accounting accounts for donation. For this, use the menu entry %s.
+AccountancyAreaDescMisc=STEP %s: Define default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
+AccountancyAreaDescLoan=STEP %s: Define default accounting accounts for loans. For this, use the menu entry %s. 
+AccountancyAreaDescBank=STEP %s: Define accounting accounts for each bank and financial accounts. For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescProd=STEP %s: Define accounting accounts on your products/services. For this, use the menu entry %s.
+
+AccountancyAreaDescBind=STEP %s: Check the binding between existing %s lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this, use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. For this, go into menu <strong>%s</strong>, and click into button <strong>%s</strong>. 
 AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and generate reports and exports.
 
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.

From fc5f4007a12e3e1cffb93f928d9d2bc02dbd9aef Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 5 May 2017 16:54:05 +0200
Subject: [PATCH 213/505] Debug accountancy module. Page for bank
 journalization is still KO.

---
 htdocs/accountancy/admin/journals_list.php    |  5 +++-
 htdocs/core/menus/standard/eldy.lib.php       | 29 +++++++++++++------
 .../install/mysql/migration/5.0.0-6.0.0.sql   |  2 ++
 .../mysql/tables/llx_accounting_journal.sql   |  1 +
 4 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/htdocs/accountancy/admin/journals_list.php b/htdocs/accountancy/admin/journals_list.php
index 065d750ca82..0b13bfc7d4d 100644
--- a/htdocs/accountancy/admin/journals_list.php
+++ b/htdocs/accountancy/admin/journals_list.php
@@ -61,6 +61,8 @@ if ($page == -1) { $page = 0 ; }
 $offset = $listlimit * $page ;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
+if (empty($sortfield)) $sortfield='code';
+if (empty($sortorder)) $sortorder='ASC';
 
 $error = 0;
 
@@ -125,7 +127,8 @@ complete_dictionary_with_modules($taborder,$tabname,$tablib,$tabsql,$tabsqlsort,
 
 // Define elementList and sourceList (used for dictionary type of contacts "llx_c_type_contact")
 $elementList = array();
-	$sourceList = array(
+    // Must match ids defined into eldy.lib.php 
+    $sourceList = array(
 			'1' => $langs->trans('AccountingJournalType1'),
 			'2' => $langs->trans('AccountingJournalType2'),
 			'3' => $langs->trans('AccountingJournalType3'),
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index aa905b4ef93..4c873830948 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -1007,8 +1007,8 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 					// Multi journal
 					$sql = "SELECT rowid, code, label, nature";
 					$sql.= " FROM ".MAIN_DB_PREFIX."accounting_journal";
-					// $sql.= " WHERE entity = ".$conf->entity;
-					$sql.= " ORDER BY code";
+					$sql.= " WHERE entity = ".$conf->entity;
+					$sql.= " ORDER BY nature";
 
 					$resql = $db->query($sql);
 					if ($resql)
@@ -1021,14 +1021,25 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
     						while ($i < $numr)
     						{
     							$objp = $db->fetch_object($resql);
-    
-    							if ($objp->nature == 1) $nature="sells";
-    							if ($objp->nature == 2) $nature="purchases";
-    							if ($objp->nature == 3) $nature="bank";
-    							if ($objp->nature == 4) $nature="various";
+
+    							$nature='';
+    							// Must match array $sourceList defined into journals_list.php 
+    							if ($objp->nature == 2) $nature="sells";
+    							if ($objp->nature == 3) $nature="purchases";
+    							if ($objp->nature == 4) $nature="bank";
+    							if ($objp->nature == 1) $nature="various";
     							if ($objp->nature == 9) $nature="hasnew";
-    
-    							if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy/',$leftmenu)) $newmenu->add('/accountancy/journal/'.$nature.'journal.php?mainmenu=accountancy&leftmenu=accountancy_journal&code_journal='.$objp->code,dol_trunc($objp->label,25),2,$user->rights->accounting->comptarapport->lire);
+    							
+    							// To enable when page exists
+    							if (empty($conf->global->MAIN_FEATURES_LEVEL))
+    							{
+    							    if ($nature == 'various' || $nature == 'hasnew') $nature='';	
+    							}
+    								
+    							if ($nature)
+    							{
+                                    if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy/',$leftmenu)) $newmenu->add('/accountancy/journal/'.$nature.'journal.php?mainmenu=accountancy&leftmenu=accountancy_journal&code_journal='.$objp->code,dol_trunc($objp->label,25),2,$user->rights->accounting->comptarapport->lire);
+    							}
     							$i++;
     						}
 						}
diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index f88ffd05687..d96210dcbfe 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -120,6 +120,8 @@ INSERT INTO llx_accounting_journal (rowid, code, label, nature, active) VALUES (
 INSERT INTO llx_accounting_journal (rowid, code, label, nature, active) VALUES (4,'OD', 'Journal des opérations diverses', 0, 1);
 INSERT INTO llx_accounting_journal (rowid, code, label, nature, active) VALUES (5,'AN', 'Journal des à-nouveaux', 9, 1);
 
+ALTER TABLE llx_accounting_journal ADD COLUMN entity integer DEFAULT 1;
+
 ALTER TABLE llx_paiementfourn ADD COLUMN model_pdf varchar(255);
 
 
diff --git a/htdocs/install/mysql/tables/llx_accounting_journal.sql b/htdocs/install/mysql/tables/llx_accounting_journal.sql
index bccfb234c3e..a435de3cd80 100644
--- a/htdocs/install/mysql/tables/llx_accounting_journal.sql
+++ b/htdocs/install/mysql/tables/llx_accounting_journal.sql
@@ -20,6 +20,7 @@
 create table llx_accounting_journal
 (
   rowid             integer AUTO_INCREMENT PRIMARY KEY,
+  entity            integer DEFAULT 1,
   code       		varchar(32) NOT NULL,
   label             varchar(128) NOT NULL,
   nature			smallint DEFAULT 0 NOT NULL,			-- type of journals (1:various operations / 2:sale / 3:purchase / 4:bank / 9: has-new)

From dc9cbed8664f66d028f68a90c6fb3d46a66bcf95 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 5 May 2017 17:04:35 +0200
Subject: [PATCH 214/505] Look and feel v6

---
 htdocs/margin/productMargins.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/margin/productMargins.php b/htdocs/margin/productMargins.php
index efcb35b802f..f5e84dd5c04 100644
--- a/htdocs/margin/productMargins.php
+++ b/htdocs/margin/productMargins.php
@@ -204,6 +204,7 @@ if ($result)
 	print '<br>';
 	print_barre_liste($langs->trans("MarginDetails"),$page,$_SERVER["PHP_SELF"],"&amp;id=".$id,$sortfield,$sortorder,'',$num,$num,'');
 
+	//var_dump($conf->global->MARGIN_TYPE);
 	if ($conf->global->MARGIN_TYPE == "1")
 	    $labelcostprice=$langs->trans('BuyingPrice');
 	else   // value is 'costprice' or 'pmp'
@@ -285,7 +286,7 @@ if ($result)
 				}
 				else
 				{
-				    print $langs->trans("NotPredefinedProducts");
+				    print img_object('', 'product').' '.$langs->trans("NotPredefinedProducts");
 				}
 				print "</td>\n";
 				//print "<td>".$product_static->getNomUrl(1)."</td>\n";

From a8292ce990f53be1fd6a298d324d2187dfa03c0e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 5 May 2017 17:27:16 +0200
Subject: [PATCH 215/505] Code comment

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

diff --git a/htdocs/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php
index a8b248dd38e..2e2a26dd9ae 100644
--- a/htdocs/core/class/commoninvoice.class.php
+++ b/htdocs/core/class/commoninvoice.class.php
@@ -91,8 +91,8 @@ abstract class CommonInvoice extends CommonObject
 
 	
 	/**
-	 * 	Return remain amount to pay.
-	 *  Property ->id and ->total_ttc must be set.
+	 * 	Return remain amount to pay. Property ->id and ->total_ttc must be set.
+	 *  This does not include open direct debit requests.
 	 *
 	 *  @param 		int 	$multicurrency 	Return multicurrency_amount instead of amount
 	 *	@return		int						Remain of amount to pay

From 15d20497c878b29ab5c1be27d6f8a230dcb26cad Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 5 May 2017 17:28:33 +0200
Subject: [PATCH 216/505] FIX #6795 #6796

---
 htdocs/compta/facture/class/facture.class.php |  7 +++---
 .../core/class/commondocgenerator.class.php   | 23 ++++++++++++++-----
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index bc4cf3626a4..912a18979bc 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -3560,10 +3560,11 @@ class Facture extends CommonInvoice
 
 
 	/**
-	 *	Create a withdrawal request for a standing order
+	 *	Create a withdrawal request for a standing order.
+	 *  Use the remain to pay excluding all existing open direct debit requests.
 	 *
-	 *	@param      User	$fuser       User asking standing order
-	 *  @param		float	$amount		Amount we request withdraw for
+	 *	@param      User	$fuser      User asking the direct debit transfer
+	 *  @param		float	$amount		Amount we request direct debit for
 	 *	@return     int         		<0 if KO, >0 if OK
 	 */
 	function demande_prelevement($fuser, $amount=0)
diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index f338aca7be8..bb806257d01 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -333,7 +333,7 @@ abstract class CommonDocGenerator
 	{
 		global $conf;
 
-		$sumpayed=''; $alreadypayed='';
+		$sumpayed=$sumdeposit=$sumcreditnote='';
 		if ($object->element == 'facture')
 		{
 			$invoice_source=new Facture($this->db);
@@ -342,7 +342,8 @@ abstract class CommonDocGenerator
 				$invoice_source->fetch($object->fk_facture_source);
 			}
 			$sumpayed = $object->getSommePaiement();
-			$alreadypayed=price($sumpayed,0,$outputlangs);
+			$sumdeposit = $object->getSumDepositsUsed();
+			$sumcreditnote = $object->getSumCreditNotesUsed();
 		}
 
 		$resarray=array(
@@ -385,11 +386,21 @@ abstract class CommonDocGenerator
 		$array_key.'_note_private'=>$object->note,
 		$array_key.'_note_public'=>$object->note_public,
 		$array_key.'_note'=>$object->note_public,			// For backward compatibility
+		
 		// Payments
-		$array_key.'_already_payed_locale'=>price($alreadypayed, 0, $outputlangs),
-		$array_key.'_remain_to_pay_locale'=>price($object->total_ttc - $sumpayed, 0, $outputlangs),
-		$array_key.'_already_payed'=>$alreadypayed,
-		$array_key.'_remain_to_pay'=>price2num($object->total_ttc - $sumpayed)
+		$array_key.'_already_payed_locale'=>price($sumpayed, 0, $outputlangs),
+		$array_key.'_already_payed'=>price2num($sumpayed),
+		$array_key.'_already_deposit_locale'=>price($sumdeposit, 0, $outputlangs),
+		$array_key.'_already_deposit'=>price2num($sumdeposit),
+		$array_key.'_already_creditnote_locale'=>price($sumcreditnote, 0, $outputlangs),
+		$array_key.'_already_creditnote'=>price2num($sumcreditnote),
+		
+		$array_key.'_already_payed_all_locale'=>price(price2num($sumpayed + $sumdeposit + $sumcreditnote, 'MT'), 0, $outputlangs),
+		$array_key.'already_payed_all'=> price2num(($sumpayed + $sumdeposit + $sumcreditnote), 'MT'),
+		    
+		// Remain to pay with all know infrmation (except open direct debit requests)
+		$array_key.'_remain_to_pay_locale'=>price(price2num($object->total_ttc - $sumpayed - $sumdeposit - $sumcreditnote, 'MT'), 0, $outputlangs),
+		$array_key.'_remain_to_pay'=>price2num($object->total_ttc - $sumpayed - $sumdeposit - $sumcreditnote, 'MT')
 		);
 
 		// Add vat by rates

From 57e540af5374ce5a719ccdabdc0532da7af06ae1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 5 May 2017 17:46:40 +0200
Subject: [PATCH 217/505] For better compatibility with module for 6.0

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index c05d9268b74..8d14a377c75 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -802,6 +802,8 @@ function dol_get_fiche_head($links=array(), $active='', $title='', $notab=0, $pi
 {
 	global $conf, $langs, $hookmanager;
 
+	if ($notab == -1) $notab = 0;  // For better compatiblity with modules for 6.0
+	
 	$out="\n".'<div class="tabs" data-role="controlgroup" data-type="horizontal">'."\n";
 
 	// Show title

From d7e10085b8782f3261b3c717e8e5b0dd36f84021 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 5 May 2017 18:42:11 +0200
Subject: [PATCH 218/505] Clean code. Using 2 different key for a param is not
 more allowed.

---
 htdocs/comm/action/card.php                   |   2 +-
 htdocs/comm/action/index.php                  |  19 +--
 htdocs/comm/action/listactions.php            |   4 +-
 htdocs/comm/action/pertype.php                |   8 +-
 htdocs/comm/action/peruser.php                |   9 +-
 htdocs/core/lib/agenda.lib.php                |   2 +-
 htdocs/core/lib/functions.lib.php             | 120 +++++++++---------
 .../demo_wsclient_actioncomm.php-NORUN        |   3 +-
 htdocs/webservices/server_actioncomm.php      |  12 +-
 9 files changed, 80 insertions(+), 99 deletions(-)

diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index fc4fc218971..73d015d7db9 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -337,7 +337,7 @@ if ($action == 'add')
 				unset($_SESSION['assignedtouser']);
 
 				$moreparam='';
-				if ($user->id != $object->userownerid) $moreparam="usertodo=-1";	// We force to remove filter so created record is visible when going back to per user view.
+				if ($user->id != $object->userownerid) $moreparam="filtert=-1";	// We force to remove filter so created record is visible when going back to per user view.
 
 				$db->commit();
 				if (! empty($backtopage))
diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index d365acef38b..47ef8093c1a 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -43,8 +43,8 @@ if (! isset($conf->global->AGENDA_MAX_EVENTS_DAY_VIEW)) $conf->global->AGENDA_MA
 if (empty($conf->global->AGENDA_EXT_NB)) $conf->global->AGENDA_EXT_NB=5;
 $MAXAGENDA=$conf->global->AGENDA_EXT_NB;
 
-$filter=GETPOST("filter",'',3);
-$filtert = GETPOST("usertodo","int",3)?GETPOST("usertodo","int",3):GETPOST("filtert","int",3);
+$filter = GETPOST("filter",'',3);
+$filtert = GETPOST("filtert","int",3);
 $usergroup = GETPOST("usergroup","int",3);
 $showbirthday = empty($conf->use_javascript_ajax)?GETPOST("showbirthday","int"):1;
 
@@ -1155,21 +1155,6 @@ else    // View by day
     echo '</table>';
 }
 
-
-/* TODO Export
- print '
-<a href="" id="actionagenda_ical_link"><img src="'.DOL_URL_ROOT.'/theme/common/ical.gif" border="0"/></a>
-<a href="" id="actionagenda_vcal_link"><img src="'.DOL_URL_ROOT.'/theme/common/vcal.gif" border="0"/></a>
-<a href="" id="actionagenda_rss_link"><img src="'.DOL_URL_ROOT.'/theme/common/rss.gif"  border="0"/></a>
-
-<script>
-$("#actionagenda_rss_link").attr("href","/public/agenda/agendaexport.php?format=rss&type=ActionAgenda&exportkey=dolibarr&token="+getToken()+"&status="+getStatus()+"&userasked="+getUserasked()+"&usertodo="+getUsertodo()+"&userdone="+getUserdone()+"&year="+getYear()+"&month="+getMonth()+"&day="+getDay()+"&showbirthday="+getShowbirthday()+"&action="+getAction()+"&projectid="+getProjectid()+"");
-$("#actionagenda_ical_link").attr("href","/public/agenda/agendaexport.php?format=ical&type=ActionAgenda&exportkey=dolibarr&token="+getToken()+"&status="+getStatus()+"&userasked="+getUserasked()+"&usertodo="+getUsertodo()+"&userdone="+getUserdone()+"&year="+getYear()+"&month="+getMonth()+"&day="+getDay()+"&showbirthday="+getShowbirthday()+"&action="+getAction()+"&projectid="+getProjectid()+"");
-$("#actionagenda_vcal_link").attr("href","/public/agenda/agendaexport.php?format=vcal&type=ActionAgenda&exportkey=dolibarr&token="+getToken()+"&status="+getStatus()+"&userasked="+getUserasked()+"&usertodo="+getUsertodo()+"&userdone="+getUserdone()+"&year="+getYear()+"&month="+getMonth()+"&day="+getDay()+"&showbirthday="+getShowbirthday()+"&action="+getAction()+"&projectid="+getProjectid()+"");
-</script>
-';
-*/
-
 llxFooter();
 
 $db->close();
diff --git a/htdocs/comm/action/listactions.php b/htdocs/comm/action/listactions.php
index 8b1dc424239..3e6224e0c41 100644
--- a/htdocs/comm/action/listactions.php
+++ b/htdocs/comm/action/listactions.php
@@ -64,8 +64,8 @@ $dateend=dol_mktime(0, 0, 0, GETPOST('dateendmonth'), GETPOST('dateendday'), GET
 if ($status == ''   && ! isset($_GET['status']) && ! isset($_POST['status'])) $status=(empty($conf->global->AGENDA_DEFAULT_FILTER_STATUS)?'':$conf->global->AGENDA_DEFAULT_FILTER_STATUS);
 if (empty($action) && ! isset($_GET['action']) && ! isset($_POST['action'])) $action=(empty($conf->global->AGENDA_DEFAULT_VIEW)?'show_month':$conf->global->AGENDA_DEFAULT_VIEW);
 
-$filter=GETPOST("filter",'',3);
-$filtert = GETPOST("usertodo","int",3)?GETPOST("usertodo","int",3):GETPOST("filtert","int",3);
+$filter = GETPOST("filter",'',3);
+$filtert = GETPOST("filtert","int",3);
 $usergroup = GETPOST("usergroup","int",3);
 $showbirthday = empty($conf->use_javascript_ajax)?GETPOST("showbirthday","int"):1;
 
diff --git a/htdocs/comm/action/pertype.php b/htdocs/comm/action/pertype.php
index 4f4ef6a580c..544da904cdc 100644
--- a/htdocs/comm/action/pertype.php
+++ b/htdocs/comm/action/pertype.php
@@ -38,8 +38,8 @@ if (! empty($conf->projet->enabled)) require_once DOL_DOCUMENT_ROOT.'/core/class
 
 if (! isset($conf->global->AGENDA_MAX_EVENTS_DAY_VIEW)) $conf->global->AGENDA_MAX_EVENTS_DAY_VIEW=3;
 
-$filter=GETPOST("filter",'',3);
-$filtert = GETPOST("usertodo","int",3)?GETPOST("usertodo","int",3):GETPOST("filtert","int",3);
+$filter = GETPOST("filter",'',3);
+$filtert = GETPOST("filtert","int",3);
 $usergroup = GETPOST("usergroup","int",3);
 //if (! ($usergroup > 0) && ! ($filtert > 0)) $filtert = $user->id;
 //$showbirthday = empty($conf->use_javascript_ajax)?GETPOST("showbirthday","int"):1;
@@ -250,7 +250,7 @@ $picto='calendarweek';
 $nav.=' &nbsp; <form name="dateselect" action="'.$_SERVER["PHP_SELF"].'?action=show_peruser'.$param.'">';
 $nav.='<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">';
 $nav.='<input type="hidden" name="action" value="' . $action . '">';
-$nav.='<input type="hidden" name="usertodo" value="' . $filtert . '">';
+$nav.='<input type="hidden" name="filtert" value="' . $filtert . '">';
 $nav.='<input type="hidden" name="usergroup" value="' . $usergroup . '">';
 $nav.='<input type="hidden" name="actioncode" value="' . $actioncode . '">';
 $nav.='<input type="hidden" name="resourceid" value="' . $resourceid . '">';
@@ -714,7 +714,7 @@ jQuery(document).ready(function() {
 		else if (ids.indexOf(",") > -1)	/* There is several events */
 		{
 			/* alert(\'several events\'); */
-			url = "'.DOL_URL_ROOT.'/comm/action/listactions.php?usertodo="+userid+"&dateselectyear="+year+"&dateselectmonth="+month+"&dateselectday="+day;
+			url = "'.DOL_URL_ROOT.'/comm/action/listactions.php?filtert="+userid+"&dateselectyear="+year+"&dateselectmonth="+month+"&dateselectday="+day;
 			window.location.href = url;
 		}
 		else	/* One event */
diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php
index 61bf98634c4..2a707cd2d8f 100644
--- a/htdocs/comm/action/peruser.php
+++ b/htdocs/comm/action/peruser.php
@@ -38,8 +38,8 @@ if (! empty($conf->projet->enabled)) require_once DOL_DOCUMENT_ROOT.'/core/class
 
 if (! isset($conf->global->AGENDA_MAX_EVENTS_DAY_VIEW)) $conf->global->AGENDA_MAX_EVENTS_DAY_VIEW=3;
 
-$filter=GETPOST("filter",'',3);
-$filtert = GETPOST("usertodo","int",3)?GETPOST("usertodo","int",3):GETPOST("filtert","int",3);
+$filter = GETPOST("filter",'',3);
+$filtert = GETPOST("filtert","int",3);
 $usergroup = GETPOST("usergroup","int",3);
 //if (! ($usergroup > 0) && ! ($filtert > 0)) $filtert = $user->id;
 //$showbirthday = empty($conf->use_javascript_ajax)?GETPOST("showbirthday","int"):1;
@@ -252,7 +252,7 @@ $picto='calendarweek';
 $nav.=' &nbsp; <form name="dateselect" action="'.$_SERVER["PHP_SELF"].'?action=show_peruser'.$param.'">';
 $nav.='<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">';
 $nav.='<input type="hidden" name="action" value="' . $action . '">';
-$nav.='<input type="hidden" name="usertodo" value="' . $filtert . '">';
+$nav.='<input type="hidden" name="filtert" value="' . $filtert . '">';
 $nav.='<input type="hidden" name="usergroup" value="' . $usergroup . '">';
 $nav.='<input type="hidden" name="actioncode" value="' . $actioncode . '">';
 $nav.='<input type="hidden" name="resourceid" value="' . $resourceid . '">';
@@ -663,7 +663,6 @@ else
 	if ($usergroup > 0)	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ug ON u.rowid = ug.fk_user";
 	$sql.= " WHERE u.statut = 1 AND 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);
 	//print $sql;
 	$resql=$db->query($sql);
 	if ($resql)
@@ -816,7 +815,7 @@ jQuery(document).ready(function() {
 		else if (ids.indexOf(",") > -1)	/* There is several events */
 		{
 			/* alert(\'several events\'); */
-			url = "'.DOL_URL_ROOT.'/comm/action/listactions.php?usertodo="+userid+"&dateselectyear="+year+"&dateselectmonth="+month+"&dateselectday="+day;
+			url = "'.DOL_URL_ROOT.'/comm/action/listactions.php?filtert="+userid+"&dateselectyear="+year+"&dateselectmonth="+month+"&dateselectday="+day;
 			window.location.href = url;
 		}
 		else	/* One event */
diff --git a/htdocs/core/lib/agenda.lib.php b/htdocs/core/lib/agenda.lib.php
index 1f83690b096..4e9b458c3d0 100644
--- a/htdocs/core/lib/agenda.lib.php
+++ b/htdocs/core/lib/agenda.lib.php
@@ -76,7 +76,7 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
 		print '<td class="nowrap" style="padding-bottom: 2px; padding-right: 4px;">';
 		print $langs->trans("ActionsToDoBy").' &nbsp; ';
 		print '</td><td style="padding-bottom: 2px; padding-right: 4px;">';
-		print $form->select_dolusers($filtert, 'usertodo', 1, '', ! $canedit, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
+		print $form->select_dolusers($filtert, 'filtert', 1, '', ! $canedit, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
 		if (empty($conf->dol_optimize_smallscreen)) print ' &nbsp; '.$langs->trans("or") . ' '.$langs->trans("ToUserOfGroup").' &nbsp; ';
 		print $form->select_dolgroups($usergroupid, 'usergroup', 1, '', ! $canedit);
 		print '</td></tr>';
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 275bbae8c36..31f29ff611c 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -248,70 +248,72 @@ function dol_shutdown()
  */
 function GETPOST($paramname, $check='', $method=0, $filter=NULL, $options=NULL)
 {
-	if (empty($method))
-	{
-		$out = isset($_GET[$paramname])?$_GET[$paramname]:(isset($_POST[$paramname])?$_POST[$paramname]:'');
-
-		// Management of default values
-		if (! isset($_GET['sortfield']))	// If we did a click on a field to sort, we do no apply default values
-		{
-		    if (! empty($_GET['action']) && $_GET['action'] == 'create' && ! empty($paramname) && ! isset($_GET[$paramname]) && ! isset($_POST[$paramname]))
-			{
-				$relativepathstring = $_SERVER["PHP_SELF"];
-				if (constant('DOL_URL_ROOT')) $relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_URL_ROOT'),'/').'/', '', $relativepathstring);
-				$relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
-				$relativepathstring = preg_replace('/^\//', '', $relativepathstring);
-				global $user;
-				if (! empty($user->default_values))		// $user->default_values defined from menu default values, and values loaded not at first 
-				{
-					//var_dump($user->default_values[$relativepathstring]['createform']);
-					if (isset($user->default_values[$relativepathstring]['createform'][$paramname])) $out = $user->default_values[$relativepathstring]['createform'][$paramname];
-				}
-			}
-			// Management of default search_filters and sort order
-			elseif (preg_match('/list.php$/', $_SERVER["PHP_SELF"]) && ! empty($paramname) && ! isset($_GET[$paramname]) && ! isset($_POST[$paramname]))
-			{
-			    $relativepathstring = $_SERVER["PHP_SELF"];
-				if (constant('DOL_URL_ROOT')) $relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_URL_ROOT'),'/').'/', '', $relativepathstring);
-				$relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
-				$relativepathstring = preg_replace('/^\//', '', $relativepathstring);
-				global $user;
-				if (! empty($user->default_values))		// $user->default_values defined from menu default values, and values loaded not at first 
-				{
-				    //var_dump($user->default_values[$relativepathstring]);
-        			if ($paramname == 'sortfield')
-        			{
-        			    if (isset($user->default_values[$relativepathstring]['sortorder'])) 
-        			    {
-        			        foreach($user->default_values[$relativepathstring]['sortorder'] as $key => $val)
-        			        {
-        			            if ($out) $out.=', ';
-        			            $out.=$key;
-        			        }
-        			    }
-        			}
-        			elseif ($paramname == 'sortorder')
-        			{
-        			    if (isset($user->default_values[$relativepathstring]['sortorder'])) 
-        			    {
-        			        foreach($user->default_values[$relativepathstring]['sortorder'] as $key => $val)
-        			        {
-        			            if ($out) $out.=', ';
-        			            $out.=$val;
-        			        }
-        			    }
-        			}
-				    elseif (isset($user->default_values[$relativepathstring]['filters'][$paramname])) $out = $user->default_values[$relativepathstring]['filters'][$paramname];
-				}
-			}
-		}
-	}
+    if (empty($method)) $out = isset($_GET[$paramname])?$_GET[$paramname]:(isset($_POST[$paramname])?$_POST[$paramname]:'');
 	elseif ($method==1) $out = isset($_GET[$paramname])?$_GET[$paramname]:'';
 	elseif ($method==2) $out = isset($_POST[$paramname])?$_POST[$paramname]:'';
 	elseif ($method==3) $out = isset($_POST[$paramname])?$_POST[$paramname]:(isset($_GET[$paramname])?$_GET[$paramname]:'');
 	elseif ($method==4) $out = isset($_POST[$paramname])?$_POST[$paramname]:(isset($_GET[$paramname])?$_GET[$paramname]:(isset($_COOKIE[$paramname])?$_COOKIE[$paramname]:''));
 	else return 'BadThirdParameterForGETPOST';
-
+	
+	if (empty($method) || $method == 3 || $method == 4)
+	{
+	    // Management of default values
+	    if (! isset($_GET['sortfield']))	// If we did a click on a field to sort, we do no apply default values
+	    {
+	        if (! empty($_GET['action']) && $_GET['action'] == 'create' && ! empty($paramname) && ! isset($_GET[$paramname]) && ! isset($_POST[$paramname]))
+	        {
+	            $relativepathstring = $_SERVER["PHP_SELF"];
+	            if (constant('DOL_URL_ROOT')) $relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_URL_ROOT'),'/').'/', '', $relativepathstring);
+	            $relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
+	            $relativepathstring = preg_replace('/^\//', '', $relativepathstring);
+	            global $user;
+	            if (! empty($user->default_values))		// $user->default_values defined from menu default values, and values loaded not at first
+	            {
+	                //var_dump($user->default_values[$relativepathstring]['createform']);
+	                if (isset($user->default_values[$relativepathstring]['createform'][$paramname])) $out = $user->default_values[$relativepathstring]['createform'][$paramname];
+	            }
+	        }
+	        // Management of default search_filters and sort order
+	        //elseif (preg_match('/list.php$/', $_SERVER["PHP_SELF"]) && ! empty($paramname) && ! isset($_GET[$paramname]) && ! isset($_POST[$paramname]))
+	        elseif (! empty($paramname) && ! isset($_GET[$paramname]) && ! isset($_POST[$paramname]))
+	        {
+	            $relativepathstring = $_SERVER["PHP_SELF"];
+	            if (constant('DOL_URL_ROOT')) $relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_URL_ROOT'),'/').'/', '', $relativepathstring);
+	            $relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
+	            $relativepathstring = preg_replace('/^\//', '', $relativepathstring);
+	            global $user;
+	            if (! empty($user->default_values))		// $user->default_values defined from menu default values
+	            {
+	                //var_dump($user->default_values[$relativepathstring]);
+	                if ($paramname == 'sortfield')
+	                {
+	                    if (isset($user->default_values[$relativepathstring]['sortorder']))
+	                    {
+	                        foreach($user->default_values[$relativepathstring]['sortorder'] as $key => $val)
+	                        {
+	                            if ($out) $out.=', ';
+	                            $out.=dol_string_nospecial($key, '');
+	                        }
+	                    }
+	                }
+	                elseif ($paramname == 'sortorder')
+	                {
+	                    if (isset($user->default_values[$relativepathstring]['sortorder']))
+	                    {
+	                        foreach($user->default_values[$relativepathstring]['sortorder'] as $key => $val)
+	                        {
+	                            if ($out) $out.=', ';
+	                            $out.=dol_string_nospecial($val, '');
+	                        }
+	                    }
+	                }
+	                elseif (isset($user->default_values[$relativepathstring]['filters'][$paramname]))
+	                $out = dol_string_nospecial($user->default_values[$relativepathstring]['filters'][$paramname], '');
+	            }
+	        }
+	    }
+	}	
+	
 	if (! empty($check))
 	{
 	    // Replace vars like __DAY__, __MONTH__, __YEAR__, __MYCOUNTRYID__, __USERID__, __ENTITYID__
diff --git a/htdocs/webservices/demo_wsclient_actioncomm.php-NORUN b/htdocs/webservices/demo_wsclient_actioncomm.php-NORUN
index d3044fc9bd8..d8ad49945bd 100755
--- a/htdocs/webservices/demo_wsclient_actioncomm.php-NORUN
+++ b/htdocs/webservices/demo_wsclient_actioncomm.php-NORUN
@@ -107,8 +107,7 @@ if ($action=='create')
 	'projectid'=>'',
 	'note'=>'This is note',
 	'contactid'=>'',
-	'usertodo'=>'1',
-	'userdone'=>'1',
+	'userownerod'=>'1',
 	'label'=>'Ceci est les titre de l\'envenement',
 	'percentage'=>'100',
 	'location'=>'Location1'
diff --git a/htdocs/webservices/server_actioncomm.php b/htdocs/webservices/server_actioncomm.php
index 99e8ea59e6f..c7e1f769d9a 100644
--- a/htdocs/webservices/server_actioncomm.php
+++ b/htdocs/webservices/server_actioncomm.php
@@ -101,8 +101,7 @@ $actioncomm_fields= array(
 	'percentage' => array('name'=>'percentage','type'=>'xsd:string'),
 	'author' => array('name'=>'author','type'=>'xsd:string'),
 	'usermod' => array('name'=>'usermod','type'=>'xsd:string'),
-	'usertodo' => array('name'=>'usertodo','type'=>'xsd:string'),
-	'userdone' => array('name'=>'userdone','type'=>'xsd:string'),
+	'userownerid' => array('name'=>'userownerid','type'=>'xsd:string'),
 	'priority' => array('name'=>'priority','type'=>'xsd:string'),
 	'fulldayevent' => array('name'=>'fulldayevent','type'=>'xsd:string'),
 	'location' => array('name'=>'location','type'=>'xsd:string'),
@@ -291,8 +290,7 @@ function getActionComm($authentication,$id)
 			        	'percentage'=> $actioncomm->percentage,
 			        	'author'=> $actioncomm->authorid,
 			        	'usermod'=> $actioncomm->usermodid,
-			        	'usertodo'=> $actioncomm->userownerid,
-			        	'userdone'=> $actioncomm->userdoneid,
+			        	'userownerid'=> $actioncomm->userownerid,
 			        	'priority'=> $actioncomm->priority,
 			        	'fulldayevent'=> $actioncomm->fulldayevent,
 			        	'location'=> $actioncomm->location,
@@ -437,8 +435,7 @@ function createActionComm($authentication,$actioncomm)
 		$newobject->fk_project=$actioncomm['projectid'];
 		$newobject->note=$actioncomm['note'];
 		$newobject->contactid=$actioncomm['contactid'];
-		$newobject->userownerid=$actioncomm['usertodo'];
-		$newobject->userdoneid=$actioncomm['userdone'];
+		$newobject->userownerid=$actioncomm['userownerid'];
 		$newobject->label=$actioncomm['label'];
 		$newobject->percentage=$actioncomm['percentage'];
 		$newobject->priority=$actioncomm['priority'];
@@ -532,8 +529,7 @@ function updateActionComm($authentication,$actioncomm)
 			$object->contactid=$actioncomm['contactid'];
 			$object->fk_project=$actioncomm['projectid'];
 			$object->note=$actioncomm['note'];
-			$object->userownerid=$actioncomm['usertodo'];
-			$object->userdoneid=$actioncomm['userdone'];
+			$object->userownerid=$actioncomm['userownerid'];
 			$object->label=$actioncomm['label'];
 			$object->percentage=$actioncomm['percentage'];
 			$object->priority=$actioncomm['priority'];

From d93552c8c5311ba7a4853aa0993105d9322894e7 Mon Sep 17 00:00:00 2001
From: Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
Date: Fri, 5 May 2017 17:13:29 +0000
Subject: [PATCH 219/505] Scrutinizer Auto-Fixes

This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
---
 htdocs/core/class/commoninvoice.class.php                     | 2 +-
 .../modules/supplier_payment/doc/pdf_standard.modules.php     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php
index 2e2a26dd9ae..4b6d70b1366 100644
--- a/htdocs/core/class/commoninvoice.class.php
+++ b/htdocs/core/class/commoninvoice.class.php
@@ -95,7 +95,7 @@ abstract class CommonInvoice extends CommonObject
 	 *  This does not include open direct debit requests.
 	 *
 	 *  @param 		int 	$multicurrency 	Return multicurrency_amount instead of amount
-	 *	@return		int						Remain of amount to pay
+	 *	@return		double						Remain of amount to pay
 	 */
 	function getRemainToPay($multicurrency=0)
 	{
diff --git a/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php b/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
index 2b645e4a263..6fbfb4b1bf4 100644
--- a/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
@@ -520,8 +520,8 @@ class pdf_standard extends ModelePDFSuppliersPayments
 	 *   Show table for lines
 	 *
 	 *   @param		PDF			$pdf     		Object PDF
-	 *   @param		string		$tab_top		Top position of table
-	 *   @param		string		$tab_height		Height of table (rectangle)
+	 *   @param		integer		$tab_top		Top position of table
+	 *   @param		integer		$tab_height		Height of table (rectangle)
 	 *   @param		int			$nexY			Y (not used)
 	 *   @param		Translate	$outputlangs	Langs object
 	 *   @param		int			$hidetop		Hide top bar of array

From d53654e64f46ff71aa5f4b87f62557371471b614 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 5 May 2017 20:41:44 +0200
Subject: [PATCH 220/505] Look and feel v6

---
 htdocs/admin/ihm.php                         |  44 -------------------
 htdocs/admin/pdf.php                         |   9 ++--
 htdocs/comm/action/card.php                  |   8 ++--
 htdocs/core/class/html.formactions.class.php |   5 ++-
 htdocs/core/lib/functions.lib.php            |   4 +-
 htdocs/core/lib/security2.lib.php            |   6 ---
 htdocs/core/lib/usergroups.lib.php           |  13 ++++--
 htdocs/holiday/list.php                      |   1 +
 htdocs/projet/activity/perday.php            |  38 ++++++++--------
 htdocs/projet/activity/perweek.php           |  40 ++++++++---------
 htdocs/theme/doliforge_logo.png              | Bin 16587 -> 0 bytes
 htdocs/theme/eldy/style.css.php              |  22 +++++-----
 htdocs/theme/md/style.css.php                |   7 ++-
 htdocs/user/note.php                         |   1 +
 htdocs/user/passwordforgotten.php            |   9 ----
 15 files changed, 80 insertions(+), 127 deletions(-)
 delete mode 100644 htdocs/theme/doliforge_logo.png

diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php
index 193ee35a80f..739a6fa4c88 100644
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -50,18 +50,6 @@ $action = GETPOST('action');
 
 if (! defined("MAIN_MOTD")) define("MAIN_MOTD","");
 
-// List of supported permanent search area
-$searchform=array();
-/* deprecated
-if (empty($conf->use_javascript_ajax))
-{
-    $searchform=array("MAIN_SEARCHFORM_SOCIETE", "MAIN_SEARCHFORM_CONTACT", "MAIN_SEARCHFORM_PRODUITSERVICE", "MAIN_SEARCHFORM_ADHERENT", "MAIN_SEARCHFORM_PROJECT", "MAIN_SEARCHFORM_EMPLOYEE");
-    $searchformconst=array($conf->global->MAIN_SEARCHFORM_SOCIETE,$conf->global->MAIN_SEARCHFORM_CONTACT,$conf->global->MAIN_SEARCHFORM_PRODUITSERVICE,$conf->global->MAIN_SEARCHFORM_ADHERENT,$conf->global->MAIN_SEARCHFORM_PROJECT,$conf->global->MAIN_SEARCHFORM_EMPLOYEE);
-    $searchformtitle=array($langs->trans("Companies"), $langs->trans("Contacts"), $langs->trans("ProductsAndServices"), $langs->trans("Members"), $langs->trans("Projects"), $langs->trans("Users"));
-    $searchformmodule=array('Module1Name','Module1Name','Module50Name','Module310Name','Module400Name');
-}
-*/
-
 
 /*
  * Action
@@ -275,21 +263,6 @@ if ($action == 'edit')	// Edit
     show_theme(null,1);
     print '<br>';
 
-    // List of permanent supported search box
-    if (! empty($searchform))
-    {
-        print '<table summary="search" class="noborder" width="100%">';
-        print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("PermanentLeftSearchForm").'</td><td colspan="2">'.$langs->trans("Activated").'</td></tr>';
-        foreach ($searchform as $key => $value)
-        {
-            print '<tr><td class="titlefield">'.$searchformtitle[$key].'</td><td colspan="2">';
-            print $form->selectyesno($searchform[$key],$searchformconst[$key],1);
-            print '</td></tr>';
-        }
-        print '</table>';
-        print '<br>';
-    }
-    
     // Other
     print '<table summary="edit" class="noborder" width="100%">';
     print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameters").'</td><td>'.$langs->trans("Value").'</td>';
@@ -476,23 +449,6 @@ else	// Show
     print '<br>';
 
 
-    // List of search forms to show
-    if (! empty($searchform))
-    {
-        print '<table class="noborder" width="100%">';
-        print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("PermanentLeftSearchForm").'</td><td>'.$langs->trans("Activated").'</td><td>&nbsp;</td></tr>';
-        foreach ($searchform as $key => $value)
-        {
-            
-            print '<tr class="oddeven"><td class="titlefield">'.$searchformtitle[$key].'</td><td>'.yn($searchformconst[$key]).'</td>';
-    		print '<td align="left">';
-    		if (! empty($searchformmodule[$key])) print $langs->trans("IfModuleEnabled",$langs->transnoentitiesnoconv($searchformmodule[$key]));
-            print '</td></tr>';
-        }
-        print '</table>';
-        print '<br>';
-    }
-
     // Other
     print '<table class="noborder" width="100%">';
     print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameters").'</td><td colspan="2">'.$langs->trans("Value").'</td></tr>';
diff --git a/htdocs/admin/pdf.php b/htdocs/admin/pdf.php
index 2e650c75696..6698be8b01f 100644
--- a/htdocs/admin/pdf.php
+++ b/htdocs/admin/pdf.php
@@ -306,8 +306,9 @@ else	// Show
     $var=true;
 
     // Misc options
-    print load_fiche_titre($langs->trans("DictionaryPaperFormat"),'','').'<br>';
-	$var=true;
+    print load_fiche_titre($langs->trans("DictionaryPaperFormat"),'','');
+	
+    
     print '<table summary="more" class="noborder" width="100%">';
     print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
 
@@ -357,7 +358,7 @@ else	// Show
 
 	print '<br>';
 
-	print load_fiche_titre($langs->trans("PDFAddressForging"),'','').'<br>';
+	print load_fiche_titre($langs->trans("PDFAddressForging"),'','');
     print '<table class="noborder" width="100%">';
     print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
 
@@ -444,7 +445,7 @@ else	// Show
     print '<br>';
 
     // Other
-    print load_fiche_titre($langs->trans("Other"),'','').'<br>';
+    print load_fiche_titre($langs->trans("Other"),'','');
 	$var=true;
     print '<table summary="more" class="noborder" width="100%">';
     print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="200px" colspan="2">'.$langs->trans("Value").'</td></tr>';
diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index 73d015d7db9..30b13bc3007 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -706,7 +706,7 @@ if ($action == 'create')
 		if (GETPOST('complete') == '0' || GETPOST("afaire") == 1) $percent='0';
 		else if (GETPOST('complete') == 100 || GETPOST("afaire") == 2) $percent=100;
 	}
-	$formactions->form_select_status_action('formaction',$percent,1,'complete');
+	$formactions->form_select_status_action('formaction', $percent, 1, 'complete', 0, 0, 'maxwidth200');
 	print '</td></tr>';
 
     // Location
@@ -1428,7 +1428,7 @@ if ($id > 0)
 				} else {
 					$value = $object->array_options["options_" . $key];
 				}
-				print '<tr><td width="30%">'.$label.'</td><td>';
+				print '<tr><td class="titlefield">'.$label.'</td><td>';
 				print $extrafields->showOutputField($key,$value);
 				print "</td></tr>\n";
 			}
@@ -1491,7 +1491,7 @@ if ($id > 0)
 	{
 		if (empty($conf->global->AGENDA_DISABLE_BUILDDOC))
 		{
-			print '<div style="clear:both;">&nbsp;<br><br></div><div class="fichecenter"><div class="fichehalfleft">';
+			print '<div style="clear:both;"></div><div class="fichecenter"><div class="fichehalfleft">';
             print '<a name="builddoc"></a>'; // ancre
 
             /*
@@ -1512,8 +1512,6 @@ if ($id > 0)
 
 
 			print '</div></div></div>';
-
-            print '<div style="clear:both;">&nbsp;</div>';
 	    }
 	}
 }
diff --git a/htdocs/core/class/html.formactions.class.php b/htdocs/core/class/html.formactions.class.php
index b799e0e2359..452ff89d914 100644
--- a/htdocs/core/class/html.formactions.class.php
+++ b/htdocs/core/class/html.formactions.class.php
@@ -54,9 +54,10 @@ class FormActions
      *  @param  string	$htmlname   	Name of html prefix for html fields (selectX and valX)
      *  @param	integer	$showempty		Show an empty line if select is used
      *  @param	integer	$onlyselect		0=Standard, 1=Hide percent of completion and force usage of a select list, 2=Same than 1 and add "Incomplete (Todo+Running)
+     *  @param  string  $morecss        More css on select field
      * 	@return	void
      */
-    function form_select_status_action($formname,$selected,$canedit=1,$htmlname='complete',$showempty=0,$onlyselect=0)
+    function form_select_status_action($formname, $selected, $canedit=1, $htmlname='complete', $showempty=0, $onlyselect=0, $morecss='maxwidth100')
     {
         global $langs,$conf;
 
@@ -120,7 +121,7 @@ class FormActions
         {
         	//var_dump($selected);
         	if ($selected == 'done') $selected='100';
-            print '<select '.($canedit?'':'disabled ').'name="'.$htmlname.'" id="select'.$htmlname.'" class="flat maxwidth100">';
+            print '<select '.($canedit?'':'disabled ').'name="'.$htmlname.'" id="select'.$htmlname.'" class="flat'.($morecss?' '.$morecss:'').'">';
             if ($showempty) print '<option value=""'.($selected == ''?' selected':'').'></option>';
             foreach($listofstatus as $key => $val)
             {
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 31f29ff611c..262204b9f72 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -257,8 +257,10 @@ function GETPOST($paramname, $check='', $method=0, $filter=NULL, $options=NULL)
 	
 	if (empty($method) || $method == 3 || $method == 4)
 	{
+	    global $conf;
+	    
 	    // Management of default values
-	    if (! isset($_GET['sortfield']))	// If we did a click on a field to sort, we do no apply default values
+	    if (! isset($_GET['sortfield']) && empty($conf->global->MAIN_DISABLE_DEFAULT_VALUES))	// If we did a click on a field to sort, we do no apply default values. Same if option MAIN_DISABLE_DEFAULT_VALUES is on
 	    {
 	        if (! empty($_GET['action']) && $_GET['action'] == 'create' && ! empty($paramname) && ! isset($_GET[$paramname]) && ! isset($_POST[$paramname]))
 	        {
diff --git a/htdocs/core/lib/security2.lib.php b/htdocs/core/lib/security2.lib.php
index 5139128a5d8..a14645a3152 100644
--- a/htdocs/core/lib/security2.lib.php
+++ b/htdocs/core/lib/security2.lib.php
@@ -197,12 +197,6 @@ function dol_loginfunction($langs,$conf,$mysoc)
 	if (! GETPOST("username")) $focus_element='username';
 	else $focus_element='password';
 
-	$login_background=DOL_URL_ROOT.'/theme/login_background.png';
-	if (file_exists(DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/img/login_background.png'))
-	{
-		$login_background=DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/login_background.png';
-	}
-
 	$demologin='';
 	$demopassword='';
 	if (! empty($dolibarr_main_demo))
diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php
index 4350edc3797..8936cf98623 100644
--- a/htdocs/core/lib/usergroups.lib.php
+++ b/htdocs/core/lib/usergroups.lib.php
@@ -426,7 +426,7 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
 
     print '</td></tr>';
 
-	// BackgroundColor
+	// Background color THEME_ELDY_BACKBODY
     if ($foruserprofile)
 	{
 	    /*
@@ -609,7 +609,7 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
 	    {
 	        print $formother->showColor($conf->global->THEME_ELDY_TEXTTITLENOTAB, $langs->trans("Default"));
 	    }
-	    print ' &nbsp; ('.$langs->trans("Default").': <strong>3c3c14</strong>) ';
+	    print ' &nbsp; ('.$langs->trans("Default").': <strong><span style="color: #3c3c14">3c3c14</span></strong>) ';
     	print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
 	    
 	    print '</td>';
@@ -654,9 +654,14 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
 	    {
 	        $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTLINK,array()),'');
 	        if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
-	        else print $langs->trans("Default");
+	        else 
+	        {
+	            //print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$defaultcolor.'" value="'.$langs->trans("Default").'">';
+	            //print '<span style="color: #000078">'.$langs->trans("Default").'</span>';
+	            print $langs->trans("Default");
+	        }
 	    }
-	    print ' &nbsp; ('.$langs->trans("Default").': <strong>000078</strong>) ';
+	    print ' &nbsp; ('.$langs->trans("Default").': <strong><span style="color: #000078">000078</span></strong>) ';
     	print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
 	    print '</td>';
 	}
diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php
index d9c5fdf43c0..f91616d0b9a 100644
--- a/htdocs/holiday/list.php
+++ b/htdocs/holiday/list.php
@@ -282,6 +282,7 @@ print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="action" value="list">';
 print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+if ($id > 0) print '<input type="hidden" name="id" value="'.$id.'">';
 
 if ($sall)
 {
diff --git a/htdocs/projet/activity/perday.php b/htdocs/projet/activity/perday.php
index c50cbd014f7..c1aa8aaa469 100644
--- a/htdocs/projet/activity/perday.php
+++ b/htdocs/projet/activity/perday.php
@@ -407,25 +407,7 @@ print '<div class="clearboth" style="padding-bottom: 8px;"></div>';
 print '<div class="div-table-responsive">';
 print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'" id="tablelines3">'."\n";
 
-print '<tr class="liste_titre">';
-print '<td>'.$langs->trans("RefTask").'</td>';
-print '<td>'.$langs->trans("LabelTask").'</td>';
-print '<td>'.$langs->trans("ProjectRef").'</td>';
-if (! empty($conf->global->PROJECT_LINES_PERDAY_SHOW_THIRDPARTY))
-{
-    print '<td>'.$langs->trans("ThirdParty").'</td>';
-}
-print '<td align="right" class="maxwidth100">'.$langs->trans("PlannedWorkload").'</td>';
-print '<td align="right" class="maxwidth100">'.$langs->trans("ProgressDeclared").'</td>';
-print '<td align="right" class="maxwidth100">'.$langs->trans("TimeSpent").'</td>';
-if ($usertoprocess->id == $user->id) print '<td align="right" class="maxwidth100">'.$langs->trans("TimeSpentByYou").'</td>';
-else print '<td align="right" class="maxwidth100">'.$langs->trans("TimeSpentByUser").'</td>';
-print '<td align="center">'.$langs->trans("HourStart").'</td>';
-print '<td align="center" colspan="2">'.$langs->trans("Duration").'</td>';
-print '<td align="right">'.$langs->trans("Note").'</td>';
-print "</tr>\n";
-
-print '<tr class="liste_titre">';
+print '<tr class="liste_titre_filter">';
 print '<td class="liste_titre"><input type="text" size="4" name="search_task_ref" value="'.dol_escape_htmltag($search_task_ref).'"></td>';
 print '<td class="liste_titre"><input type="text" size="4" name="search_task_label" value="'.dol_escape_htmltag($search_task_label).'"></td>';
 print '<td class="liste_titre"><input type="text" size="4" name="search_project_ref" value="'.dol_escape_htmltag($search_project_ref).'"></td>';
@@ -444,6 +426,24 @@ print $searchpitco;
 print '</td>';
 print "</tr>\n";
 
+print '<tr class="liste_titre">';
+print '<td>'.$langs->trans("RefTask").'</td>';
+print '<td>'.$langs->trans("LabelTask").'</td>';
+print '<td>'.$langs->trans("ProjectRef").'</td>';
+if (! empty($conf->global->PROJECT_LINES_PERDAY_SHOW_THIRDPARTY))
+{
+    print '<td>'.$langs->trans("ThirdParty").'</td>';
+}
+print '<td align="right" class="maxwidth100">'.$langs->trans("PlannedWorkload").'</td>';
+print '<td align="right" class="maxwidth100">'.$langs->trans("ProgressDeclared").'</td>';
+print '<td align="right" class="maxwidth100">'.$langs->trans("TimeSpent").'</td>';
+if ($usertoprocess->id == $user->id) print '<td align="right" class="maxwidth100">'.$langs->trans("TimeSpentByYou").'</td>';
+else print '<td align="right" class="maxwidth100">'.$langs->trans("TimeSpentByUser").'</td>';
+print '<td align="center">'.$langs->trans("HourStart").'</td>';
+print '<td align="center" colspan="2">'.$langs->trans("Duration").'</td>';
+print '<td align="right">'.$langs->trans("Note").'</td>';
+print "</tr>\n";
+
 
 // By default, we can edit only tasks we are assigned to
 $restrictviewformytask=(empty($conf->global->PROJECT_TIME_SHOW_TASK_NOT_ASSIGNED)?1:0);
diff --git a/htdocs/projet/activity/perweek.php b/htdocs/projet/activity/perweek.php
index 989424afd67..905b93393dd 100644
--- a/htdocs/projet/activity/perweek.php
+++ b/htdocs/projet/activity/perweek.php
@@ -402,6 +402,26 @@ print '<div class="clearboth" style="padding-bottom: 8px;"></div>';
 print '<div class="div-table-responsive">';
 print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'" id="tablelines3">'."\n";
 
+print '<tr class="liste_titre_filter">';
+print '<td class="liste_titre"><input type="text" size="4" name="search_task_ref" value="'.dol_escape_htmltag($search_task_ref).'"></td>';
+print '<td class="liste_titre"><input type="text" size="4" name="search_task_label" value="'.dol_escape_htmltag($search_task_label).'"></td>';
+print '<td class="liste_titre"><input type="text" size="4" name="search_project_ref" value="'.dol_escape_htmltag($search_project_ref).'"></td>';
+if (! empty($conf->global->PROJECT_LINES_PERWEEK_SHOW_THIRDPARTY)) print '<td class="liste_titre"><input type="text" size="4" name="search_thirdparty" value="'.dol_escape_htmltag($search_thirdparty).'"></td>';
+print '<td class="liste_titre"></td>';
+print '<td class="liste_titre"></td>';
+print '<td class="liste_titre"></td>';
+print '<td class="liste_titre"></td>';
+for($i=0;$i<7;$i++)
+{
+    print '<td class="liste_titre"></td>';
+}
+// Action column
+print '<td class="liste_titre nowrap" align="right">';
+$searchpitco=$form->showFilterAndCheckAddButtons(0);
+print $searchpitco;
+print '</td>';
+print "</tr>\n";
+
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("RefTask").'</td>';
 print '<td>'.$langs->trans("LabelTask").'</td>';
@@ -425,26 +445,6 @@ for($i=0;$i<7;$i++)
 print '<td></td>';
 print "</tr>\n";
 
-print '<tr class="liste_titre">';
-print '<td class="liste_titre"><input type="text" size="4" name="search_task_ref" value="'.dol_escape_htmltag($search_task_ref).'"></td>';
-print '<td class="liste_titre"><input type="text" size="4" name="search_task_label" value="'.dol_escape_htmltag($search_task_label).'"></td>';
-print '<td class="liste_titre"><input type="text" size="4" name="search_project_ref" value="'.dol_escape_htmltag($search_project_ref).'"></td>';
-if (! empty($conf->global->PROJECT_LINES_PERWEEK_SHOW_THIRDPARTY)) print '<td class="liste_titre"><input type="text" size="4" name="search_thirdparty" value="'.dol_escape_htmltag($search_thirdparty).'"></td>';
-print '<td class="liste_titre"></td>';
-print '<td class="liste_titre"></td>';
-print '<td class="liste_titre"></td>';
-print '<td class="liste_titre"></td>';
-for($i=0;$i<7;$i++)
-{
-    print '<td class="liste_titre"></td>';
-}
-// Action column
-print '<td class="liste_titre nowrap" align="right">';
-$searchpitco=$form->showFilterAndCheckAddButtons(0);
-print $searchpitco;
-print '</td>';
-print "</tr>\n";
-
 // By default, we can edit only tasks we are assigned to
 $restrictviewformytask=(empty($conf->global->PROJECT_TIME_SHOW_TASK_NOT_ASSIGNED)?1:0);
 
diff --git a/htdocs/theme/doliforge_logo.png b/htdocs/theme/doliforge_logo.png
deleted file mode 100644
index c9de1b5012c45670d346b4f699a01ab8d257d415..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 16587
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
O0000<MNUMnLSTaMow+Ii

diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 658b63c1370..4b42a47f1cf 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -935,7 +935,7 @@ div.blockvmenuend, div.blockvmenubookmarks {
 	padding-left: 0 !important;
 }
 div.vmenu, td.vmenu {
-	padding-right: 6px !important;
+	padding-right: 10px !important;
 }
 
 
@@ -989,6 +989,7 @@ div.fiche {
 	<?php if (! empty($conf->dol_hide_leftmenu)) print 'margin-bottom: 12px;'."\n"; ?>
 }
 div.fichecenter {
+	/* margin-top: 10px; */
 	width: 100%;
 	clear: both;	/* This is to have div fichecenter that are true rectangles */
 }
@@ -1737,7 +1738,7 @@ div.vmenu, td.vmenu {
 
 .vmenu {
     width: 190px;
-	margin-left: 4px;
+	margin-left: 6px;
 	<?php if (GETPOST("optioncss") == 'print') { ?>
     display: none;
 	<?php } ?>
@@ -1953,10 +1954,11 @@ img.toolbarbutton {
 /* ============================================================================== */
 div.tabs {
     text-align: <?php print $left; ?>;
-    margin-left: 6px !important;
-    margin-right: 6px !important;
+    padding-left: 6px !important;
+    padding-right: 6px !important;
 	clear:both;
 	height:100%;
+	/* background-image: linear-gradient(to top,#f6f6f6 0,#fff 8px);  */	
 }
 div.tabsElem {
 	margin-top: 1px;
@@ -2018,7 +2020,7 @@ a.tabTitle {
 
 a.tab:link, a.tab:visited, a.tab:hover, a.tab#active {
 	font-family: <?php print $fontlist ?>;
-	padding: 8px 9px 8px;
+	padding: 12px 9px 12px;
     margin: 0em 0.2em;
     text-decoration: none;
     white-space: nowrap;
@@ -2027,11 +2029,6 @@ a.tab:link, a.tab:visited, a.tab:hover, a.tab#active {
 	border-left: 1px solid transparent;
 	border-top: 1px solid transparent;
 	border-bottom: 0px !important;
-	/*
-	-moz-border-radius:4px 4px 0 0;
-    -webkit-border-radius: 4px 4px 0 0;
-	border-radius: 4px 4px 0 0;
-	*/
 
 	background-image: none !important;
 }
@@ -3036,9 +3033,12 @@ td.legendLabel { padding: 2px 2px 2px 0 !important; }
 
 div.titre {
 	font-family: <?php print $fontlist ?>;
-	font-weight: bold;
+	font-size: 14px;
+	/* font-weight: bold; */
 	color: rgb(<?php print $colortexttitlenotab; ?>);
 	text-decoration: none;
+	padding-top: 5px;
+    padding-bottom: 5px;
 	/* text-shadow: 1px 1px 2px #FFFFFF; */
 }
 
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 6513210a1a9..52fb9d3ab1a 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -241,7 +241,7 @@ body {
 <?php } ?>
 	color: rgb(<?php echo $colortext; ?>);
 	font-size: <?php print $fontsize ?>px;
-	line-height: 130%;
+	line-height: 1.3;
 	font-family: <?php print $fontlist ?>;
     margin-top: 0;
     margin-bottom: 0;
@@ -3146,9 +3146,12 @@ td.legendLabel { padding: 2px 2px 2px 0 !important; }
 
 div.titre {
 	font-family: <?php print $fontlist ?>;
-	font-weight: bold;
+	font-size: 14px;
+	/* font-weight: bold; */
 	color: rgb(<?php print $colortexttitlenotab; ?>);
 	text-decoration: none;
+	padding-top: 5px;
+    padding-bottom: 5px;
 	/* text-shadow: 1px 1px 2px #FFFFFF; */
 	<?php print (empty($conf->dol_optimize_smallscreen)?'':'margin-top: 4px;'); ?>
 }
diff --git a/htdocs/user/note.php b/htdocs/user/note.php
index ae685391299..ca9f821d14c 100644
--- a/htdocs/user/note.php
+++ b/htdocs/user/note.php
@@ -52,6 +52,7 @@ $result = restrictedArea($user, 'user', $id, 'user&user', $feature2);
 // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
 $hookmanager->initHooks(array('usercard','globalcard'));
 
+
 /******************************************************************************/
 /*                     Actions                                                */
 /******************************************************************************/
diff --git a/htdocs/user/passwordforgotten.php b/htdocs/user/passwordforgotten.php
index f7acc3609c7..e59e26efd0b 100644
--- a/htdocs/user/passwordforgotten.php
+++ b/htdocs/user/passwordforgotten.php
@@ -191,15 +191,6 @@ $conf_css = $themepath."?lang=".$langs->defaultlang;
 $jquerytheme = 'smoothness';
 if (! empty($conf->global->MAIN_USE_JQUERY_THEME)) $jquerytheme = $conf->global->MAIN_USE_JQUERY_THEME;
 
-if (file_exists(DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/img/login_background.png'))
-{
-    $login_background = DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/login_background.png';
-}
-else
-{
-    $login_background = DOL_URL_ROOT.'/theme/login_background.png';
-}
-
 if (! $username) $focus_element = 'username';
 else $focus_element = 'password';
 

From e28dff19eeca36c6245c7924f3ed321d9822c46f Mon Sep 17 00:00:00 2001
From: Benoit <benoit@fixit-cs.com>
Date: Fri, 5 May 2017 22:21:46 +0200
Subject: [PATCH 221/505] Fix bug xhen insert new bankline

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

diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index 897fd5de496..97dacf34386 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -471,9 +471,9 @@ class Account extends CommonObject
 
 		if ($accline->insert() > 0) {
 
-			if ($categorie) {
-				$sql = "INSERT INTO ".MAIN_DB_PREFIX."categorie_account (";
-				$sql .= "fk_account, fk_categorie";
+			if ($categorie>0) {
+				$sql = "INSERT INTO ".MAIN_DB_PREFIX."bank_class (";
+				$sql .= "lineid, fk_categ;
 				$sql .= ") VALUES (";
 				$sql .= " ".$accline->id.", ".$categorie;
 				$sql .= ")";

From 0fbf27895ad891ee9889e3e8a80a172dead1e975 Mon Sep 17 00:00:00 2001
From: Benoit <benoit@fixit-cs.com>
Date: Fri, 5 May 2017 22:33:34 +0200
Subject: [PATCH 222/505] Add fk_facture_fourn element to fetch lines objects

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

diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 1798eb19059..496c4660895 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -640,7 +640,7 @@ class FactureFournisseur extends CommonInvoice
     function fetch_lines()
     {
         $sql = 'SELECT f.rowid, f.ref as ref_supplier, f.description, f.pu_ht, f.pu_ttc, f.qty, f.remise_percent, f.vat_src_code, f.tva_tx';
-        $sql.= ', f.localtax1_tx, f.localtax2_tx, f.total_localtax1, f.total_localtax2 ';
+        $sql.= ', f.localtax1_tx, f.localtax2_tx, f.total_localtax1, f.total_localtax2, f.fk_facture_fourn ';
         $sql.= ', f.total_ht, f.tva as total_tva, f.total_ttc, f.fk_product, f.product_type, f.info_bits, f.rang, f.special_code, f.fk_parent_line, f.fk_unit';
         $sql.= ', p.rowid as product_id, p.ref as product_ref, p.label as label, p.description as product_desc';
 		$sql.= ', f.fk_multicurrency, f.multicurrency_code, f.multicurrency_subprice, f.multicurrency_total_ht, f.multicurrency_total_tva, f.multicurrency_total_ttc';
@@ -649,6 +649,7 @@ class FactureFournisseur extends CommonInvoice
         $sql.= ' WHERE fk_facture_fourn='.$this->id;
         $sql.= ' ORDER BY f.rang, f.rowid';
 
+
         dol_syslog(get_class($this)."::fetch_lines", LOG_DEBUG);
         $resql_rows = $this->db->query($sql);
         if ($resql_rows)
@@ -687,6 +688,7 @@ class FactureFournisseur extends CommonInvoice
                     $line->total_tva		= $obj->total_tva;
                     $line->total_localtax1	= $obj->total_localtax1;
                     $line->total_localtax2	= $obj->total_localtax2;
+                    $line->fk_facture_fourn     = $obj->fk_facture_fourn;
                     $line->total_ttc		= $obj->total_ttc;
                     $line->fk_product		= $obj->fk_product;
                     $line->product_type		= $obj->product_type;

From cea835744c61486f2cadafec2e589fe6578fc628 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 5 May 2017 23:06:46 +0200
Subject: [PATCH 223/505] Look and feel v6

---
 htdocs/theme/md/style.css.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 52fb9d3ab1a..7818422d192 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -1137,6 +1137,9 @@ table.noborder tr.liste_titre td {
 .pictoedit, .pictowarning, .pictodelete {
     vertical-align: text-bottom;
 }
+img.hideonsmartphone.pictoactionview {
+    vertical-align: bottom;
+}
 .colorthumb {
 	padding-left: 1px !important;
 	padding-right: 1px;
@@ -4680,7 +4683,7 @@ border-top-right-radius: 6px;
 	}
 	.mainmenuaspan {
     	/*display: none;*/
-  		font-size: 10px;
+  		font-size: 12px;
     }
     .topmenuimage {
     	background-size: 26px auto;

From 56140ae5729df78af81b174631f8156e85c5c94e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 6 May 2017 01:09:22 +0200
Subject: [PATCH 224/505] Work on default focus

---
 build/debian/README.howto      |  9 ++--
 htdocs/admin/defaultvalues.php | 89 +++++++++++++++++++++-------------
 htdocs/core/lib/admin.lib.php  |  5 ++
 htdocs/langs/en_US/admin.lang  |  7 +--
 4 files changed, 71 insertions(+), 39 deletions(-)

diff --git a/build/debian/README.howto b/build/debian/README.howto
index 399c4f07a1f..e040cd6dced 100644
--- a/build/debian/README.howto
+++ b/build/debian/README.howto
@@ -152,7 +152,7 @@ tag 729538 -moreinfo
 
 
 
-##### Testing a package into unstable env
+##### Testing a package into a chroot environment
 
 Check you have a mysql server available from another interface than "localhost".
 Set line in /etc/mysql/my.cnf if required and restart mysql
@@ -160,9 +160,11 @@ Set line in /etc/mysql/my.cnf if required and restart mysql
 [mysqld]
 bind-address           = *
 
-Create a chroot called "unstable-amd64-sbuild".
+Create a chroot called "jessie" or "unstable".
 Chroot env is stored into /srv/chroot directory.
 > sudo sbuild-createchroot --keyring=unstable /srv/chroot/unstable http://ftp.uk.debian.org/debian
+or
+> sudo sbuild-createchroot jessie /srv/chroot/jessie http://ftp.uk.debian.org/debian
 
 Pour lister les env chroot
 > schroot -l
@@ -170,8 +172,9 @@ or
 > ls /srv/chroot
 
 Puis pour se connecter et préparer l'environnement 
-> schroot -c name_of_chroot
+> schroot -c name_of_chroot  (exemple schroot -c unstable-amd64-sbuild)
 > cat /etc/debian_chroot       to check which debian branch we are into
+> apt-get install vi 
 > vi /usr/sbin/policy-rc.d     and replace return code 101 (not allowed) into 0 (ok)
 > apt-get update
 > apt-get upgrade
diff --git a/htdocs/admin/defaultvalues.php b/htdocs/admin/defaultvalues.php
index 8a9bd4f209b..ec4c5fd4605 100644
--- a/htdocs/admin/defaultvalues.php
+++ b/htdocs/admin/defaultvalues.php
@@ -37,7 +37,7 @@ if (!$user->admin) accessforbidden();
 $id=GETPOST('rowid','int');
 $action=GETPOST('action','alpha');
 
-$mode = GETPOST('mode')?GETPOST('mode'):'createform';   // 'createform', 'filters', 'sortorder'
+$mode = GETPOST('mode')?GETPOST('mode'):'createform';   // 'createform', 'filters', 'sortorder', 'focus'
 
 $limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
@@ -210,6 +210,10 @@ if ($mode == 'sortorder')
 {
     print info_admin($langs->trans("WarningSettingSortOrder")).'<br>';
 }
+if ($mode == 'focus')
+{
+    print info_admin($langs->trans("FeatureNotYetAvailable")).'<br>';
+}
 
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" id="action" name="action" value="">';
@@ -217,11 +221,13 @@ print '<input type="hidden" id="mode" name="mode" value="'.dol_escape_htmltag($m
 
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
+// Page
 $texthelp=$langs->trans("PageUrlForDefaultValues");
 if ($mode == 'createform') $texthelp.=$langs->trans("PageUrlForDefaultValuesCreate", 'societe/card.php');
 else $texthelp.=$langs->trans("PageUrlForDefaultValuesList", 'societe/list.php');
 $texturl=$form->textwithpicto($langs->trans("Url"), $texthelp);
 print_liste_field_titre($texturl,$_SERVER["PHP_SELF"],'page,param','',$param,'',$sortfield,$sortorder);
+// Field
 $texthelp=$langs->trans("TheKeyIsTheNameOfHtmlField");
 if ($mode != 'sortorder') 
 {
@@ -233,26 +239,32 @@ else
     $textkey=$form->textwithpicto($langs->trans("Field"), $texthelp);
 }
 print_liste_field_titre($textkey,$_SERVER["PHP_SELF"],'param','',$param,'',$sortfield,$sortorder);
-if ($mode != 'sortorder')
+// Value
+if ($mode != 'focus')
 {
-    $texthelp=$langs->trans("FollowingConstantsWillBeSubstituted").'<br>';
-    // See list into GETPOST
-    $texthelp.='__USERID__<br>';
-    $texthelp.='__SUPERVISORID__<br>';
-    $texthelp.='__MYCOUNTRYID__<br>';
-    $texthelp.='__DAY__<br>';
-    $texthelp.='__MONTH__<br>';
-    $texthelp.='__YEAR__<br>';
-    if (! empty($conf->multicompany->enabled)) $texthelp.='__ENTITYID__<br>';
-    $textvalue=$form->textwithpicto($langs->trans("Value"), $texthelp, 1, 'help', '', 0, 2, '');
+    if ($mode != 'sortorder')
+    {
+        $texthelp=$langs->trans("FollowingConstantsWillBeSubstituted").'<br>';
+        // See list into GETPOST
+        $texthelp.='__USERID__<br>';
+        $texthelp.='__SUPERVISORID__<br>';
+        $texthelp.='__MYCOUNTRYID__<br>';
+        $texthelp.='__DAY__<br>';
+        $texthelp.='__MONTH__<br>';
+        $texthelp.='__YEAR__<br>';
+        if (! empty($conf->multicompany->enabled)) $texthelp.='__ENTITYID__<br>';
+        $textvalue=$form->textwithpicto($langs->trans("Value"), $texthelp, 1, 'help', '', 0, 2, '');
+    }
+    else
+    {
+        $texthelp='ASC or DESC';
+        $textvalue=$form->textwithpicto($langs->trans("SortOrder"), $texthelp);
+    }
+    print_liste_field_titre($textvalue, $_SERVER["PHP_SELF"], 'value', '', $param, '', $sortfield, $sortorder);
 }
-else
-{
-    $texthelp='ASC or DESC';
-    $textvalue=$form->textwithpicto($langs->trans("SortOrder"), $texthelp);
-}
-print_liste_field_titre($textvalue, $_SERVER["PHP_SELF"], 'value', '', $param, '', $sortfield, $sortorder);
+// Entity
 if (! empty($conf->multicompany->enabled) && !$user->entity) print_liste_field_titre($langs->trans("Entity"),$_SERVER["PHP_SELF"],'entity,page','',$param,'',$sortfield,$sortorder);
+// Actions
 print '<td align="center"></td>';
 print "</tr>\n";
 
@@ -261,15 +273,21 @@ print "</tr>\n";
 print "\n";
 
 print '<tr class="oddeven">';
+// Page
 print '<td>';
 print '<input type="text" class="flat minwidth200 maxwidthonsmartphone" name="defaulturl" value="">';
 print '</td>'."\n";
+// Field
 print '<td>';
 print '<input type="text" class="flat maxwidth100" name="defaultkey" value="">';
 print '</td>';
-print '<td>';
-print '<input type="text" class="flat maxwidthonsmartphone" name="defaultvalue" value="">';
-print '</td>';
+// Value
+if ($mode != 'focus')
+{
+    print '<td>';
+    print '<input type="text" class="flat maxwidthonsmartphone" name="defaultvalue" value="">';
+    print '</td>';
+}
 // Limit to superadmin
 if (! empty($conf->multicompany->enabled) && !$user->entity)
 {
@@ -311,28 +329,33 @@ if ($result)
 
 		print '<tr class="oddeven">';
 		
+		// Page
 		print '<td>';
 		if ($action != 'edit' || GETPOST('rowid') != $obj->rowid) print $obj->page;
 		else print '<input type="text" name="urlpage" value="'.dol_escape_htmltag($obj->page).'">';
 		print '</td>'."\n";
    	    
-		// Key
+		// Field
 		print '<td>';
 		if ($action != 'edit' || GETPOST('rowid') != $obj->rowid) print $obj->param;
 		else print '<input type="text" name="key" value="'.dol_escape_htmltag($obj->param).'">';
 		print '</td>'."\n";
 
 		// Value
-		print '<td>';
-		/*print '<input type="hidden" name="const['.$i.'][rowid]" value="'.$obj->rowid.'">';
-		print '<input type="hidden" name="const['.$i.'][lang]" value="'.$obj->lang.'">';
-		print '<input type="hidden" name="const['.$i.'][name]" value="'.$obj->transkey.'">';
-		print '<input type="text" id="value_'.$i.'" class="flat inputforupdate" size="30" name="const['.$i.'][value]" value="'.dol_escape_htmltag($obj->transvalue).'">';
-		*/
-		if ($action != 'edit' || GETPOST('rowid') != $obj->rowid) print $obj->value;
-		else print '<input type="text" name="value" value="'.dol_escape_htmltag($obj->value).'">';
-		print '</td>';
-
+		if ($mode != 'focus')
+		{
+    		print '<td>';
+    		/*print '<input type="hidden" name="const['.$i.'][rowid]" value="'.$obj->rowid.'">';
+    		print '<input type="hidden" name="const['.$i.'][lang]" value="'.$obj->lang.'">';
+    		print '<input type="hidden" name="const['.$i.'][name]" value="'.$obj->transkey.'">';
+    		print '<input type="text" id="value_'.$i.'" class="flat inputforupdate" size="30" name="const['.$i.'][value]" value="'.dol_escape_htmltag($obj->transvalue).'">';
+    		*/
+    		if ($action != 'edit' || GETPOST('rowid') != $obj->rowid) print $obj->value;
+    		else print '<input type="text" name="value" value="'.dol_escape_htmltag($obj->value).'">';
+    		print '</td>';
+		}
+		
+		// Actions
 		print '<td align="center">';
 		if ($action != 'edit' || GETPOST('rowid') != $obj->rowid)
 		{
@@ -349,7 +372,7 @@ if ($result)
 		    print '<input type="submit" class="button" name="actioncancel" value="'.$langs->trans("Cancel").'">';
 		}
 		print '</td>';
-		
+        
 		print "</tr>\n";
 		print "\n";
 		$i++;
diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php
index 2a734b5f161..4beb49107d2 100644
--- a/htdocs/core/lib/admin.lib.php
+++ b/htdocs/core/lib/admin.lib.php
@@ -624,6 +624,11 @@ function defaultvalues_prepare_head()
     $head[$h][2] = 'sortorder';
     $h++;
 
+    $head[$h][0] = DOL_URL_ROOT."/admin/defaultvalues.php?mode=focus";
+    $head[$h][1] = $langs->trans("DefaultFocus");
+    $head[$h][2] = 'focus';
+    $h++;
+
     /*$head[$h][0] = DOL_URL_ROOT."/admin/translation.php?mode=searchkey";
     $head[$h][1] = $langs->trans("TranslationKeySearch");
     $head[$h][2] = 'searchkey';
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 4b56ef00ae1..14131bddd2c 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1352,9 +1352,10 @@ CacheByClient=Cache by browser
 CompressionOfResources=Compression of HTTP responses
 TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers 
 DefaultValuesDesc=You can define/force here the default value you want to get when your create a new record, and/or defaut filters or sort order when your list record. 
-DefaultCreateForm=Create forms
-DefaultSearchFilters=Search filters
-DefaultSortOrder=Sort orders
+DefaultCreateForm=Default values for new objects
+DefaultSearchFilters=Default search filters
+DefaultSortOrder=Default sort orders
+DefaultFocus=Default focus fields
 ##### Products #####
 ProductSetup=Products module setup
 ServiceSetup=Services module setup

From 9b90e7aa095bff665604d541ef14976f3ae605a1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 6 May 2017 01:41:56 +0200
Subject: [PATCH 225/505] Minor fix

---
 build/debian/README.howto          | 5 +++--
 htdocs/bookmarks/bookmarks.lib.php | 2 +-
 htdocs/theme/eldy/style.css.php    | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/build/debian/README.howto b/build/debian/README.howto
index e040cd6dced..c94309ec2ef 100644
--- a/build/debian/README.howto
+++ b/build/debian/README.howto
@@ -174,7 +174,7 @@ or
 Puis pour se connecter et préparer l'environnement 
 > schroot -c name_of_chroot  (exemple schroot -c unstable-amd64-sbuild)
 > cat /etc/debian_chroot       to check which debian branch we are into
-> apt-get install vi 
+> apt-get install vi dialog
 > vi /usr/sbin/policy-rc.d     and replace return code 101 (not allowed) into 0 (ok)
 > apt-get update
 > apt-get upgrade
@@ -404,6 +404,7 @@ Note that package 3.5.7 contains not only fixed for bugs reported to debian. It
 so it is a better solution to validate this maintenance release than applying a patch of the only CVE-2015-3935. 
 After discussion with ..., it appears that security holes are enough to request this unblock request."
 
+
 Use this to request an full update of a stable package
 
 reportbug -B debian --smtphost=smtp.gmail.com:587 --smtpuser=xxxx --smtppasswd=yyyy --tls
@@ -434,7 +435,7 @@ Use this to ask to apply patches on a stable version.
 
 reportbug -B debian --smtphost=smtp.gmail.com:587 --smtpuser=xxxx --smtppasswd=yyyy --tls
 Choose package "release.debian.org"
-Then usertag "jessie-pu"
+Then usertag "jessie-pu" (if tags is not available in list, choose another one, and change it later into email content text)
 Then name of package "dolibarr"
 Fill message, for example:
 "Please unblock package dolibarr
diff --git a/htdocs/bookmarks/bookmarks.lib.php b/htdocs/bookmarks/bookmarks.lib.php
index d84713d1e62..26089c3d07c 100644
--- a/htdocs/bookmarks/bookmarks.lib.php
+++ b/htdocs/bookmarks/bookmarks.lib.php
@@ -62,7 +62,7 @@ function printBookmarksList($aDb, $aLangs)
     */
 	$ret.= '<div class="menu_top"></div>'."\n";
 
-	$ret.= '<form id="actionbookmark" name="actionbookmark" method="POST" action="">';
+	$ret.= '<!-- form with GET method --><form id="actionbookmark" name="actionbookmark" method="GET" action="">';
 	$ret.= '<select name="bookmark" id="boxbookmark" class="flat boxcombo vmenusearchselectcombo">';
 	$ret.= '<option hidden value="listbookmarks" class="optiongrey" selected rel="'.DOL_URL_ROOT.'/bookmarks/list.php">'.$langs->trans('Bookmarks').'</option>';
     $ret.= '<option value="listbookmark" class="optionblue" rel="'.dol_escape_js(DOL_URL_ROOT.'/bookmarks/list.php').'">'.dol_escape_htmltag($user->rights->bookmark->creer ? $langs->trans('EditBookmarks') : $langs->trans('ListOfBookmarks')).'...</option>';
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 4b42a47f1cf..f4d5c5c32bd 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -1767,10 +1767,10 @@ a.vmenu:link, a.vmenu:visited, a.vmenu:hover, a.vmenu:active { white-space: nowr
 font.vmenudisabled  { font-size:<?php print $fontsize ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: bold; color: #aaa; margin-left: 4px; }
 a.vmenu:link, a.vmenu:visited { color: #<?php echo $colortextbackvmenu; ?>; }
 
-a.vsmenu:link, a.vsmenu:visited, a.vsmenu:hover, a.vsmenu:active, span.vsmenu { font-size:<?php print $fontsize ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: normal; color: #202020; margin: 1px 1px 1px 8px; }
+a.vsmenu:link, a.vsmenu:visited, a.vsmenu:hover, a.vsmenu:active, span.vsmenu { font-size:<?php print $fontsize ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: normal; color: #202020; margin: 1px 1px 1px 6px; }
 font.vsmenudisabled { font-size:<?php print $fontsize ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: normal; color: #aaa; }
 a.vsmenu:link, a.vsmenu:visited { color: #<?php echo $colortextbackvmenu; ?>; white-space: nowrap; }
-font.vsmenudisabledmargin { margin: 1px 1px 1px 8px; }
+font.vsmenudisabledmargin { margin: 1px 1px 1px 6px; }
 
 a.help:link, a.help:visited, a.help:hover, a.help:active, span.help { font-size:<?php print $fontsizesmaller ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: normal; color: #666666; text-decoration: none; }
 

From e8c60642e6564050963ae6740110bdd7bc9c0744 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 6 May 2017 03:21:47 +0200
Subject: [PATCH 226/505] Translation fix

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

diff --git a/htdocs/langs/en_US/cron.lang b/htdocs/langs/en_US/cron.lang
index 01b69b3b839..76b1a92a365 100644
--- a/htdocs/langs/en_US/cron.lang
+++ b/htdocs/langs/en_US/cron.lang
@@ -58,11 +58,11 @@ CronStatusInactiveBtn=Disable
 CronTaskInactive=This job is disabled
 CronId=Id
 CronClassFile=Classes (filename.class.php)
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
-CronClassFileHelp=The file name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is <i>fecth</i>
-CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is <i>product</i>
+CronClassFileHelp=The file name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value for class file name is <i>product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is <i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is <i>fecth</i>
+CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be <i>0, ProductRef</i>
 CronCommandHelp=The system command line to execute.
 CronCreateJob=Create new Scheduled Job
 CronFrom=From

From a4defb8102db6376afc91d59dbbd9f48b91bc525 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Sat, 6 May 2017 07:02:34 +0200
Subject: [PATCH 227/505] Add html form for accountancy journals list

---
 .../core/class/html.formaccounting.class.php  | 59 ++++++++++++++++++-
 1 file changed, 57 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/html.formaccounting.class.php b/htdocs/core/class/html.formaccounting.class.php
index e1bf1645de0..cb988a511cd 100644
--- a/htdocs/core/class/html.formaccounting.class.php
+++ b/htdocs/core/class/html.formaccounting.class.php
@@ -25,12 +25,14 @@
 /**
  *	Class to manage generation of HTML components for accounting management
  */
-class FormAccounting
+class FormAccounting extends Form
 {
+
+    private $options_cache = array();
+
 	var $db;
 	var $error;
 
-
 	/**
 	* Constructor
 	*
@@ -41,6 +43,59 @@ class FormAccounting
 	    $this->db = $db;
 	}
 
+	/**
+	 * Return list of journals with label by nature
+	 *
+	 * @param	string	$selectid	Preselected pcg_type
+	 * @param	string	$htmlname	Name of field in html form
+	 * @param	int		$nature		Limit the list to a particular type of journals (1:various operations / 2:sale / 3:purchase / 4:bank / 9: has-new)
+	 * @param	int		$showempty	Add an empty field
+	 * @param	array	$event		Event options
+	 * @param	string	$morecss	More css non HTML object
+	 * @param	string	$usecache	Key to use to store result into a cache. Next call with same key will reuse the cache.
+	 *
+	 * @return	string				String with HTML select
+	 */
+	function select_journal($selectid, $htmlname = 'journal', $nature=0, $showempty = 0, $event = array(), $morecss='maxwidth300 maxwidthonsmartphone', $usecache='')
+	{
+		global $conf;
+
+		$sql = "SELECT rowid, code, label, nature, entity, active";
+		$sql.= " FROM " . MAIN_DB_PREFIX . "accounting_journal";
+		$sql.= " WHERE entity = ".$conf->entity;
+		$sql.= " AND active = 1";
+		if (empty($nature)) $sql.= " AND nature = ".$nature;
+		$sql.= " ORDER BY code";
+
+		dol_syslog(get_class($this) . "::select_journal", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+
+		if (!$resql) {
+			$this->error = "Error ".$this->db->lasterror();
+			dol_syslog(get_class($this)."::select_journal ".$this->error, LOG_ERR);
+			return -1;
+		}
+
+		$options = array();
+		$out = ajax_combobox($htmlname, $event);
+
+    	$selected = 0;
+    	while ($obj = $this->db->fetch_object($resql))
+    	{
+		    $label = $obj->code . ' - ' . $obj->label;
+		}
+    	$this->db->free($resql);
+
+    	if ($usecache)
+    	{
+            $this->options_cache[$usecache] = $options;
+    	}
+		
+		$out .= Form::selectarray($htmlname, $options, $selectid, $showempty, 0, 0, '', 0, 0, 0, '', $morecss, 1);
+
+		return $out;
+	}
+
     /**
      *	Return list of accounting category.
      * 	Use mysoc->country_id or mysoc->country_code so they must be defined.

From 68aaef2f66737e5e9e24ea4c897a6e3a369c44cd Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Sat, 6 May 2017 08:06:01 +0200
Subject: [PATCH 228/505] Add list to select journal in bank

---
 .../class/accountingjournal.class.php         | 20 +++---
 htdocs/compta/bank/card.php                   | 12 +++-
 .../core/class/html.formaccounting.class.php  | 66 ++++++++++-------
 .../install/mysql/migration/5.0.0-6.0.0.sql   |  7 ++
 .../mysql/tables/llx_accounting_journal.sql   |  2 +-
 .../mysql/tables/llx_bank_account.key.sql     |  2 +
 .../install/mysql/tables/llx_bank_account.sql | 70 +++++++++----------
 7 files changed, 103 insertions(+), 76 deletions(-)

diff --git a/htdocs/accountancy/class/accountingjournal.class.php b/htdocs/accountancy/class/accountingjournal.class.php
index 064f56bddd6..9bff37560d7 100644
--- a/htdocs/accountancy/class/accountingjournal.class.php
+++ b/htdocs/accountancy/class/accountingjournal.class.php
@@ -136,19 +136,19 @@ class AccountingJournal extends CommonObject
 	    if ($mode == 0)
 	    {
 	        $prefix='';
-			if ($nature == 9) return $langs->trans('AccountingJournalTypeHasNew');
-			if ($nature == 3) return $langs->trans('AccountingJournalTypeBank');
-			if ($nature == 2) return $langs->trans('AccountingJournalTypePurchase');
-	        if ($nature == 1) return $langs->trans('AccountingJournalTypeSale');
-	        if ($nature == 0) return $langs->trans('AccountingJournalTypeVariousOperation');
+			if ($nature == 9) return $langs->trans('AccountingJournalType9');
+			if ($nature == 4) return $langs->trans('AccountingJournalType4');
+			if ($nature == 3) return $langs->trans('AccountingJournalType3');
+	        if ($nature == 2) return $langs->trans('AccountingJournalType2');
+	        if ($nature == 1) return $langs->trans('AccountingJournalType1');
 	    }
 	    if ($mode == 1)
 	    {
-			if ($nature == 9) return $langs->trans('AccountingJournalTypeHasNew');
-			if ($nature == 3) return $langs->trans('AccountingJournalTypeBank');
-			if ($nature == 2) return $langs->trans('AccountingJournalTypePurchase');
-	        if ($nature == 1) return $langs->trans('AccountingJournalTypeSale');
-	        if ($nature == 0) return $langs->trans('AccountingJournalTypeVariousOperation');
+			if ($nature == 9) return $langs->trans('AccountingJournalType9');
+			if ($nature == 4) return $langs->trans('AccountingJournalType4');
+			if ($nature == 3) return $langs->trans('AccountingJournalType3');
+	        if ($nature == 2) return $langs->trans('AccountingJournalType2');
+	        if ($nature == 1) return $langs->trans('AccountingJournalType1');
 	    }
 	}
 }
diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index 5b3bb3a58fe..75ba80052bc 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -36,6 +36,7 @@ require_once DOL_DOCUMENT_ROOT . '/compta/bank/class/account.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php';
 if (! empty($conf->categorie->enabled)) require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
 if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
+if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
 if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php';
 
 $langs->load("banks");
@@ -278,6 +279,7 @@ $form = new Form($db);
 $formbank = new FormBank($db);
 $formcompany = new FormCompany($db);
 if (! empty($conf->accounting->enabled)) $formaccountancy = New FormVentilation($db);
+if (! empty($conf->accounting->enabled)) $formaccountancy2 = New FormAccounting($db);
 
 $countrynotdefined=$langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')';
 
@@ -534,7 +536,9 @@ if ($action == 'create')
 	if (! empty($conf->accounting->enabled))
 	{
 		print '<tr><td>'.$langs->trans("AccountancyJournal").'</td>';
-	    print '<td colspan="3"><input type="text" name="accountancy_journal" value="'.(GETPOST("accountancy_journal")?GETPOST('accountancy_journal', 'alpha'):$object->accountancy_journal).'"></td></tr>';
+	    print '<td>';
+		print $formaccountancy2->select_journal($object->accountancy_journal, 'accountancy_journal', 4, 1, '', 1, 1);
+		print '</td></tr>';
 	}
 
 	print '</table>';
@@ -980,8 +984,10 @@ else
 		// Accountancy journal
 		if (! empty($conf->accounting->enabled))
 		{
-		    print '<tr><td>'.$langs->trans("AccountancyJournal").'</td>';
-		    print '<td><input type="text" name="accountancy_journal" value="'.(isset($_POST["accountancy_journal"])?GETPOST("accountancy_journal"):$object->accountancy_journal).'"></td></tr>';
+			print '<tr><td>'.$langs->trans("AccountancyJournal").'</td>';
+			print '<td>';
+			print $formaccountancy2->select_journal($object->accountancy_journal, 'accountancy_journal', 4, 1, '', 1, 1);
+			print '</td></tr>';
 		}
 		
 		print '</table>';
diff --git a/htdocs/core/class/html.formaccounting.class.php b/htdocs/core/class/html.formaccounting.class.php
index cb988a511cd..1a33f0fce60 100644
--- a/htdocs/core/class/html.formaccounting.class.php
+++ b/htdocs/core/class/html.formaccounting.class.php
@@ -60,37 +60,49 @@ class FormAccounting extends Form
 	{
 		global $conf;
 
-		$sql = "SELECT rowid, code, label, nature, entity, active";
-		$sql.= " FROM " . MAIN_DB_PREFIX . "accounting_journal";
-		$sql.= " WHERE entity = ".$conf->entity;
-		$sql.= " AND active = 1";
-		if (empty($nature)) $sql.= " AND nature = ".$nature;
-		$sql.= " ORDER BY code";
+		$out = '';
 
-		dol_syslog(get_class($this) . "::select_journal", LOG_DEBUG);
-		$resql = $this->db->query($sql);
+    	$options = array();
+		if ($usecache && ! empty($this->options_cache[$usecache]))
+		{
+		    $options = $this->options_cache[$usecache];
+		    $selected=$selectid;
+		}
+		else
+		{
+			$sql = "SELECT rowid, code, label, nature, entity, active";
+			$sql.= " FROM " . MAIN_DB_PREFIX . "accounting_journal";
+			$sql.= " WHERE active = 1";
+			$sql.= " AND entity = ".$conf->entity;
+			//if ($nature && is_numeric($nature))   $sql .= " AND nature = ".$nature;
+			$sql.= " ORDER BY code";
 
-		if (!$resql) {
-			$this->error = "Error ".$this->db->lasterror();
-			dol_syslog(get_class($this)."::select_journal ".$this->error, LOG_ERR);
-			return -1;
+			dol_syslog(get_class($this) . "::select_journal", LOG_DEBUG);
+			$resql = $this->db->query($sql);
+
+			if (!$resql) {
+				$this->error = "Error ".$this->db->lasterror();
+				dol_syslog(get_class($this)."::select_journal ".$this->error, LOG_ERR);
+				return -1;
+			}
+
+			$out = ajax_combobox($htmlname, $event);
+
+			while ($obj = $this->db->fetch_object($resql))
+			{
+				$label = $obj->code . ' - ' . $obj->label;
+				$select_value_out = $obj->rowid;
+
+				$options[$select_value_out] = $label;
+			}
+			$this->db->free($resql);
+
+			if ($usecache)
+			{
+				$this->options_cache[$usecache] = $options;
+			}
 		}
 
-		$options = array();
-		$out = ajax_combobox($htmlname, $event);
-
-    	$selected = 0;
-    	while ($obj = $this->db->fetch_object($resql))
-    	{
-		    $label = $obj->code . ' - ' . $obj->label;
-		}
-    	$this->db->free($resql);
-
-    	if ($usecache)
-    	{
-            $this->options_cache[$usecache] = $options;
-    	}
-		
 		$out .= Form::selectarray($htmlname, $options, $selectid, $showempty, 0, 0, '', 0, 0, 0, '', $morecss, 1);
 
 		return $out;
diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index d96210dcbfe..9e4699b2e4b 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -259,4 +259,11 @@ UPDATE llx_accounting_journal SET nature = 3 where code = 'AC' and nature = 2;
 UPDATE llx_accounting_journal SET nature = 4 where (code = 'BK' or code = 'BQ') and nature = 3;
 
 
+ALTER TABLE llx_bank_account CHANGE COLUMN accountancy_journal fk_accountancy_journal integer;
+ALTER TABLE llx_bank_account ADD CONSTRAINT bank_fk_accountancy_journal FOREIGN KEY (fk_accountancy_journal) REFERENCES llx_accounting_journal (rowid);
+
+
+
+
+
 
diff --git a/htdocs/install/mysql/tables/llx_accounting_journal.sql b/htdocs/install/mysql/tables/llx_accounting_journal.sql
index a435de3cd80..348654b56dc 100644
--- a/htdocs/install/mysql/tables/llx_accounting_journal.sql
+++ b/htdocs/install/mysql/tables/llx_accounting_journal.sql
@@ -23,6 +23,6 @@ create table llx_accounting_journal
   entity            integer DEFAULT 1,
   code       		varchar(32) NOT NULL,
   label             varchar(128) NOT NULL,
-  nature			smallint DEFAULT 0 NOT NULL,			-- type of journals (1:various operations / 2:sale / 3:purchase / 4:bank / 9: has-new)
+  nature			smallint DEFAULT 1 NOT NULL,			-- type of journals (1:various operations / 2:sale / 3:purchase / 4:bank / 9: has-new)
   active            smallint DEFAULT 0
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_bank_account.key.sql b/htdocs/install/mysql/tables/llx_bank_account.key.sql
index c91762a322e..0a168d63990 100644
--- a/htdocs/install/mysql/tables/llx_bank_account.key.sql
+++ b/htdocs/install/mysql/tables/llx_bank_account.key.sql
@@ -19,3 +19,5 @@
 
 
 ALTER TABLE llx_bank_account ADD UNIQUE uk_bank_account_label (label,entity);
+
+ALTER TABLE llx_bank_account ADD CONSTRAINT bank_fk_accountancy_journal FOREIGN KEY (fk_accountancy_journal) REFERENCES llx_accounting_journal (rowid);
diff --git a/htdocs/install/mysql/tables/llx_bank_account.sql b/htdocs/install/mysql/tables/llx_bank_account.sql
index 7730ab79ef6..6db2857ddae 100644
--- a/htdocs/install/mysql/tables/llx_bank_account.sql
+++ b/htdocs/install/mysql/tables/llx_bank_account.sql
@@ -24,39 +24,39 @@
 
 create table llx_bank_account
 (
-  rowid					integer AUTO_INCREMENT PRIMARY KEY,
-  datec					datetime,
-  tms					timestamp,
-  ref					varchar(12) NOT NULL,
-  label					varchar(30) NOT NULL,
-  entity				integer DEFAULT 1 NOT NULL,	-- multi company id
-  fk_user_author		integer,
-  fk_user_modif			integer,
-  bank					varchar(60),
-  code_banque			varchar(128),
-  code_guichet			varchar(6),
-  number				varchar(255),
-  cle_rib				varchar(5),
-  bic					varchar(11),
-  iban_prefix			varchar(34),				-- full iban. 34 according to ISO 13616
-  country_iban			varchar(2),					-- deprecated
-  cle_iban				varchar(2),
-  domiciliation			varchar(255),
-  state_id				integer        DEFAULT NULL,
-  fk_pays				integer        NOT NULL,
-  proprio				varchar(60),
-  owner_address     	varchar(255),
-  courant				smallint DEFAULT 0 NOT NULL,
-  clos					smallint DEFAULT 0 NOT NULL,
-  rappro				smallint DEFAULT 1,
-  url					varchar(128),
-  account_number		varchar(32),				-- bank accountancy number
-  accountancy_journal	varchar(16) DEFAULT NULL,	-- bank accountancy journal
-  currency_code			varchar(3) NOT NULL,
-  min_allowed			integer DEFAULT 0,
-  min_desired			integer DEFAULT 0,
-  comment				text,						-- TODO rename in note_private
-  note_public     		text,
-  model_pdf       		varchar(255),
-  import_key      		varchar(14)
+  rowid						integer AUTO_INCREMENT PRIMARY KEY,
+  datec						datetime,
+  tms						timestamp,
+  ref						varchar(12) NOT NULL,
+  label						varchar(30) NOT NULL,
+  entity					integer DEFAULT 1 NOT NULL,	-- multi company id
+  fk_user_author			integer,
+  fk_user_modif				integer,
+  bank						varchar(60),
+  code_banque				varchar(128),
+  code_guichet				varchar(6),
+  number					varchar(255),
+  cle_rib					varchar(5),
+  bic						varchar(11),
+  iban_prefix				varchar(34),				-- full iban. 34 according to ISO 13616
+  country_iban				varchar(2),					-- deprecated
+  cle_iban					varchar(2),
+  domiciliation				varchar(255),
+  state_id					integer        DEFAULT NULL,
+  fk_pays					integer        NOT NULL,
+  proprio					varchar(60),
+  owner_address				varchar(255),
+  courant					smallint DEFAULT 0 NOT NULL,
+  clos						smallint DEFAULT 0 NOT NULL,
+  rappro					smallint DEFAULT 1,
+  url						varchar(128),
+  account_number			varchar(32),				-- bank accountancy number
+  fk_accountancy_journal	integer,					-- bank accountancy journal
+  currency_code				varchar(3) NOT NULL,
+  min_allowed				integer DEFAULT 0,
+  min_desired				integer DEFAULT 0,
+  comment					text,						-- TODO rename in note_private
+  note_public				text,
+  model_pdf					varchar(255),
+  import_key				varchar(14)
 )ENGINE=innodb;

From 8113e6c2f21714e81dc1a4132325129fd999f4b7 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Sat, 6 May 2017 08:11:07 +0200
Subject: [PATCH 229/505] Update Accounting journal getNomUrl

---
 .../class/accountingjournal.class.php         | 61 +++++++++++++++----
 1 file changed, 48 insertions(+), 13 deletions(-)

diff --git a/htdocs/accountancy/class/accountingjournal.class.php b/htdocs/accountancy/class/accountingjournal.class.php
index 9bff37560d7..91924f08592 100644
--- a/htdocs/accountancy/class/accountingjournal.class.php
+++ b/htdocs/accountancy/class/accountingjournal.class.php
@@ -85,27 +85,62 @@ class AccountingJournal extends CommonObject
 	/**
 	 * Return clicable name (with picto eventually)
 	 *
-	 * @param	int		$withpicto	0=No picto, 1=Include picto into link, 2=Only picto
-	 * @return	string				Chaine avec URL
+	 * @param	int		$withpicto		0=No picto, 1=Include picto into link, 2=Only picto
+	 * @param	int		$withlabel		0=No label, 1=Include label of account
+	 * @param	int  	$nourl			1=Disable url
+	 * @param	string  $moretitle		Add more text to title tooltip
+	 * @param	int  	$notooltip		1=Disable tooltip
+	 * @return	string	String with URL
 	 */
-	function getNomUrl($withpicto = 0) {
-		global $langs;
+	function getNomUrl($withpicto = 0, $withlabel = 0, $nourl = 0, $moretitle='',$notooltip=0)
+	{
+		global $langs, $conf, $user;
+
+		if (! empty($conf->dol_no_mouse_hover)) $notooltip=1;   // Force disable tooltips
 
 		$result = '';
 
-		$link = '<a href="' . DOL_URL_ROOT . '/accountancy/admin/journals_card.php?id=' . $this->id . '">';
-		$linkend = '</a>';
+		$url = DOL_URL_ROOT . '/accountancy/admin/journals_list.php';
 
 		$picto = 'billr';
+		$label='';
 
-		$label = $langs->trans("Show") . ': ' . $this->code . ' - ' . $this->label;
+		$label = '<u>' . $langs->trans("ShowAccountingJournal") . '</u>';
+		if (! empty($this->code))
+			$label .= '<br><b>'.$langs->trans('Code') . ':</b> ' . $this->code;
+		if (! empty($this->label))
+			$label .= '<br><b>'.$langs->trans('Label') . ':</b> ' . $this->label;
+		if ($moretitle) $label.=' - '.$moretitle;
 
-		if ($withpicto)
-			$result .= ($link . img_object($label, $picto) . $linkend);
-		if ($withpicto && $withpicto != 2)
-			$result .= ' ';
-		if ($withpicto != 2)
-			$result .= $link . $this->code . ' - ' . $this->label . $linkend;
+		$linkclose='';
+		if (empty($notooltip))
+		{
+		    if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+		    {
+		        $label=$langs->trans("ShowAccoutingJournal");
+		        $linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
+		    }
+		    $linkclose.= ' title="'.dol_escape_htmltag($label, 1).'"';
+		    $linkclose.=' class="classfortooltip"';
+		}
+
+        $linkstart='<a href="'.$url.'"';
+        $linkstart.=$linkclose.'>';
+		$linkend='</a>';
+
+		if ($nourl)
+		{
+			$linkstart = '';
+			$linkclose = '';
+			$linkend = '';			
+		}
+
+		$label_link = $this->code;
+		if ($withlabel) $label_link .= ' - ' . $this->label;
+
+		if ($withpicto) $result.=($linkstart.img_object(($notooltip?'':$label), $picto, ($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).$linkend);
+		if ($withpicto && $withpicto != 2) $result .= ' ';
+		if ($withpicto != 2) $result.=$linkstart . $label_link . $linkend;
 		return $result;
 	}
 	

From 7c4b47f20d9e32fe753a433a5cae606c2e897854 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Sat, 6 May 2017 08:33:12 +0200
Subject: [PATCH 230/505] Update works

---
 htdocs/compta/bank/card.php                   | 18 +++++++++----
 htdocs/compta/bank/class/account.class.php    | 14 +++++-----
 htdocs/compta/bank/index.php                  | 27 ++++++++++++-------
 htdocs/compta/bank/various_payment/index.php  |  4 +--
 .../install/mysql/migration/5.0.0-6.0.0.sql   |  2 +-
 .../mysql/tables/llx_bank_account.key.sql     |  2 +-
 htdocs/langs/en_US/accountancy.lang           |  3 ++-
 7 files changed, 44 insertions(+), 26 deletions(-)

diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index 75ba80052bc..804d2c5511d 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -38,6 +38,7 @@ if (! empty($conf->categorie->enabled)) require_once DOL_DOCUMENT_ROOT . '/categ
 if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
 if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
 if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php';
+if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php';
 
 $langs->load("banks");
 $langs->load("bills");
@@ -100,7 +101,7 @@ if ($action == 'add')
 
 	$account_number 		 = GETPOST('account_number','alpha');
 	if ($account_number <= 0) { $object->account_number = ''; } else { $object->account_number = $account_number; }
-	$object->accountancy_journal  = trim($_POST["accountancy_journal"]);
+	$object->fk_accountancy_journal  = trim($_POST["fk_accountancy_journal"]);
 
     $object->solde           = $_POST["solde"];
     $object->date_solde      = dol_mktime(12,0,0,$_POST["remonth"],$_POST["reday"],$_POST["reyear"]);
@@ -198,7 +199,7 @@ if ($action == 'update')
 
 	$account_number 		 = GETPOST('account_number', 'int');
 	if ($account_number <= 0) { $object->account_number = ''; } else { $object->account_number = $account_number; }
-	$object->accountancy_journal = trim($_POST["accountancy_journal"]);
+	$object->fk_accountancy_journal = trim($_POST["fk_accountancy_journal"]);
 
     $object->currency_code   = trim($_POST["account_currency_code"]);
 
@@ -537,7 +538,7 @@ if ($action == 'create')
 	{
 		print '<tr><td>'.$langs->trans("AccountancyJournal").'</td>';
 	    print '<td>';
-		print $formaccountancy2->select_journal($object->accountancy_journal, 'accountancy_journal', 4, 1, '', 1, 1);
+		print $formaccountancy2->select_journal($object->fk_accountancy_journal, 'fk_accountancy_journal', 4, 1, '', 1, 1);
 		print '</td></tr>';
 	}
 
@@ -681,7 +682,14 @@ else
 		if (! empty($conf->accounting->enabled))
 		{
 		    print '<tr><td>'.$langs->trans("AccountancyJournal").'</td>';
-		    print '<td>'.$object->accountancy_journal.'</td></tr>';
+		    print '<td>';
+			
+			$accountingjournal = new AccountingJournal($db);
+			$accountingjournal->fetch($object->fk_accountancy_journal);
+
+			print $accountingjournal->getNomUrl(0,1,1,'',1);
+			
+			print '</td></tr>';
 		}
 		
 		// Other attributes
@@ -986,7 +994,7 @@ else
 		{
 			print '<tr><td>'.$langs->trans("AccountancyJournal").'</td>';
 			print '<td>';
-			print $formaccountancy2->select_journal($object->accountancy_journal, 'accountancy_journal', 4, 1, '', 1, 1);
+			print $formaccountancy2->select_journal($object->fk_accountancy_journal, 'fk_accountancy_journal', 4, 1, '', 1, 1);
 			print '</td></tr>';
 		}
 		
diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index 897fd5de496..33181f666d7 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -160,7 +160,7 @@ class Account extends CommonObject
      * @var string
      */
     public $account_number;
-	public $accountancy_journal;
+	public $fk_accountancy_journal;
 
     /**
      * Currency code
@@ -545,7 +545,7 @@ class Account extends CommonObject
         $sql.= ", label";
         $sql.= ", entity";
         $sql.= ", account_number";
-		$sql.= ", accountancy_journal";
+		$sql.= ", fk_accountancy_journal";
 		$sql.= ", bank";
         $sql.= ", code_banque";
         $sql.= ", code_guichet";
@@ -569,7 +569,7 @@ class Account extends CommonObject
         $sql.= ", '".$this->db->escape($this->label)."'";
         $sql.= ", ".$conf->entity;
         $sql.= ", '".$this->db->escape($this->account_number)."'";
-		$sql.= ", '".$this->db->escape($this->accountancy_journal)."'";
+		$sql.= ", '".$this->db->escape($this->fk_accountancy_journal)."'";
 		$sql.= ", '".$this->db->escape($this->bank)."'";
         $sql.= ", '".$this->code_banque."'";
         $sql.= ", '".$this->code_guichet."'";
@@ -702,7 +702,7 @@ class Account extends CommonObject
         $sql.= ",rappro = ".$this->rappro;
         $sql.= ",url = ".($this->url?"'".$this->url."'":"null");
         $sql.= ",account_number = '".$this->account_number."'";
-		$sql.= ",accountancy_journal = '".$this->accountancy_journal."'";
+		$sql.= ",fk_accountancy_journal = '".$this->fk_accountancy_journal."'";
 
 		$sql.= ",bank  = '".$this->db->escape($this->bank)."'";
         $sql.= ",code_banque='".$this->code_banque."'";
@@ -847,7 +847,7 @@ class Account extends CommonObject
         $sql = "SELECT ba.rowid, ba.ref, ba.label, ba.bank, ba.number, ba.courant, ba.clos, ba.rappro, ba.url,";
         $sql.= " ba.code_banque, ba.code_guichet, ba.cle_rib, ba.bic, ba.iban_prefix as iban,";
         $sql.= " ba.domiciliation, ba.proprio, ba.owner_address, ba.state_id, ba.fk_pays as country_id,";
-        $sql.= " ba.account_number, ba.accountancy_journal, ba.currency_code,";
+        $sql.= " ba.account_number, ba.fk_accountancy_journal, ba.currency_code,";
         $sql.= " ba.min_allowed, ba.min_desired, ba.comment,";
         $sql.= " ba.datec as date_creation, ba.tms as date_update,";
         $sql.= ' c.code as country_code, c.label as country,';
@@ -897,7 +897,7 @@ class Account extends CommonObject
                 $this->country       = $obj->country;
 
                 $this->account_number = $obj->account_number;
-				$this->accountancy_journal = $obj->accountancy_journal;
+				$this->fk_accountancy_journal = $obj->fk_accountancy_journal;
 
                 $this->currency_code  = $obj->currency_code;
                 $this->account_currency_code  = $obj->currency_code;
@@ -1259,7 +1259,7 @@ class Account extends CommonObject
             include_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
             $langs->load("accountancy");
             $label .= '<br><b>' . $langs->trans('AccountAccounting') . ':</b> ' . length_accountg($this->account_number);
-            $label .= '<br><b>' . $langs->trans('AccountancyJournal') . ':</b> ' . $this->accountancy_journal;
+            $label .= '<br><b>' . $langs->trans('AccountancyJournal') . ':</b> ' . $this->fk_accountancy_journal;
         }
         $linkclose = '" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
 
diff --git a/htdocs/compta/bank/index.php b/htdocs/compta/bank/index.php
index b808fa8f596..19ec335cac5 100644
--- a/htdocs/compta/bank/index.php
+++ b/htdocs/compta/bank/index.php
@@ -29,6 +29,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php';
+if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php';
 
 $langs->load("banks");
 $langs->load("categories");
@@ -88,7 +90,7 @@ $arrayfields=array(
     'b.label'=>array('label'=>$langs->trans("Label"), 'checked'=>1),
     'b.number'=>array('label'=>$langs->trans("AccountIdShort"), 'checked'=>1),
     'b.account_number'=>array('label'=>$langs->trans("AccountAccounting"), 'checked'=>$conf->accountancy->enabled),
-    'b.accountancy_journal'=>array('label'=>$langs->trans("AccountancyJournal"), 'checked'=>$conf->accountancy->enabled),
+    'b.fk_accountancy_journal'=>array('label'=>$langs->trans("AccountancyJournal"), 'checked'=>$conf->accountancy->enabled),
     'toreconcile'=>array('label'=>$langs->trans("TransactionsToConciliate"), 'checked'=>1),
     'b.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
     'b.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500),
@@ -141,7 +143,7 @@ $title=$langs->trans('BankAccounts');
 // Load array of financial accounts (opened by default)
 $accounts = array();
 
-$sql  = "SELECT rowid, label, courant, rappro, account_number, accountancy_journal, datec as date_creation, tms as date_update";
+$sql  = "SELECT rowid, label, courant, rappro, account_number, fk_accountancy_journal, datec as date_creation, tms as date_update";
 // Add fields from extrafields
 foreach ($extrafields->attribute_label as $key => $val) $sql.=($extrafields->attribute_type[$key] != 'separate' ? ",ef.".$key.' as options_'.$key : '');
 // Add fields from hooks
@@ -323,7 +325,7 @@ if (! empty($arrayfields['b.account_number']['checked']))
     print '</td>';
 }
 // Accountancy journal
-if (! empty($arrayfields['b.accountancy_journal']['checked']))
+if (! empty($arrayfields['b.fk_accountancy_journal']['checked']))
 {
     print '<td class="liste_titre">';
     print '</td>';
@@ -403,7 +405,7 @@ if (! empty($arrayfields['b.label']['checked']))          print_liste_field_titr
 if (! empty($arrayfields['accountype']['checked']))       print_liste_field_titre($arrayfields['accountype']['label'],$_SERVER["PHP_SELF"],'','',$param,'',$sortfield,$sortorder);
 if (! empty($arrayfields['b.number']['checked']))         print_liste_field_titre($arrayfields['b.number']['label'],$_SERVER["PHP_SELF"],'b.number','',$param,'',$sortfield,$sortorder);
 if (! empty($arrayfields['b.account_number']['checked'])) print_liste_field_titre($arrayfields['b.account_number']['label'],$_SERVER["PHP_SELF"],'b.account_number','',$param,'',$sortfield,$sortorder);
-if (! empty($arrayfields['b.accountancy_journal']['checked'])) print_liste_field_titre($arrayfields['b.accountancy_journal']['label'],$_SERVER["PHP_SELF"],'b.accountancy_journal','',$param,'',$sortfield,$sortorder);
+if (! empty($arrayfields['b.fk_accountancy_journal']['checked'])) print_liste_field_titre($arrayfields['b.fk_accountancy_journal']['label'],$_SERVER["PHP_SELF"],'b.fk_accountancy_journal','',$param,'',$sortfield,$sortorder);
 if (! empty($arrayfields['toreconcile']['checked']))      print_liste_field_titre($arrayfields['toreconcile']['label'],$_SERVER["PHP_SELF"],'','',$param,'align="center"',$sortfield,$sortorder);
 // Extra fields
 if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
@@ -488,16 +490,23 @@ foreach ($accounts as $key=>$type)
     if (! empty($arrayfields['b.account_number']['checked']))
     {
         include_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
-        print '<td>'.length_accountg($acc->account_number).'</td>';
+
+		$accountingaccount = new AccountingAccount($db);
+		$accountingaccount->fetch('',$acc->account_number);
+
+		print '<td>'.length_accountg($accountingaccount->getNomUrl(0,1,1,'',1)).'</td>';
+
 	    if (! $i) $totalarray['nbfield']++;
     }
     
     // Accountancy journal
-    if (! empty($arrayfields['b.accountancy_journal']['checked']))
+    if (! empty($arrayfields['b.fk_accountancy_journal']['checked']))
     {
-        include_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
-        print '<td>'.length_accountg($acc->accountancy_journal).'</td>';
-	    if (! $i) $totalarray['nbfield']++;
+		$accountingjournal = new AccountingJournal($db);
+		$accountingjournal->fetch($acc->fk_accountancy_journal);
+
+		print '<td>'.$accountingjournal->getNomUrl(0,1,1,'',1).'</td>';
+		if (! $i) $totalarray['nbfield']++;
     }
     
     // Transactions to reconcile
diff --git a/htdocs/compta/bank/various_payment/index.php b/htdocs/compta/bank/various_payment/index.php
index 6c4b41333f1..abf6d23d22e 100644
--- a/htdocs/compta/bank/various_payment/index.php
+++ b/htdocs/compta/bank/various_payment/index.php
@@ -89,7 +89,7 @@ $variousstatic = new PaymentVarious($db);
 $accountstatic = new Account($db);
 
 $sql = "SELECT v.rowid, v.amount, v.label, v.datep as datep, v.datev as datev, v.fk_typepayment as type, v.num_payment, v.fk_bank,";
-$sql.= " ba.rowid as bid, ba.ref as bref, ba.number as bnumber, ba.account_number, ba.accountancy_journal, ba.label as blabel,";
+$sql.= " ba.rowid as bid, ba.ref as bref, ba.number as bnumber, ba.account_number, ba.fk_accountancy_journal, ba.label as blabel,";
 $sql.= " pst.code as payment_code";
 $sql.= " FROM ".MAIN_DB_PREFIX."payment_various as v";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as pst ON v.fk_typepayment = pst.id";
@@ -217,7 +217,7 @@ if ($result)
 	            $accountstatic->ref=$obj->bref;
 	            $accountstatic->number=$obj->bnumber;
 	            $accountstatic->accountancy_number=$obj->account_number;
-	            $accountstatic->accountancy_journal=$obj->accountancy_journal;
+	            $accountstatic->fk_accountancy_journal=$obj->fk_accountancy_journal;
 	            $accountstatic->label=$obj->blabel;
 	        	print $accountstatic->getNomUrl(1);
 	        }
diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index 9e4699b2e4b..a9293ea6915 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -260,7 +260,7 @@ UPDATE llx_accounting_journal SET nature = 4 where (code = 'BK' or code = 'BQ')
 
 
 ALTER TABLE llx_bank_account CHANGE COLUMN accountancy_journal fk_accountancy_journal integer;
-ALTER TABLE llx_bank_account ADD CONSTRAINT bank_fk_accountancy_journal FOREIGN KEY (fk_accountancy_journal) REFERENCES llx_accounting_journal (rowid);
+--ALTER TABLE llx_bank_account ADD CONSTRAINT bank_fk_accountancy_journal FOREIGN KEY (fk_accountancy_journal) REFERENCES llx_accounting_journal (rowid);
 
 
 
diff --git a/htdocs/install/mysql/tables/llx_bank_account.key.sql b/htdocs/install/mysql/tables/llx_bank_account.key.sql
index 0a168d63990..986ca7ea550 100644
--- a/htdocs/install/mysql/tables/llx_bank_account.key.sql
+++ b/htdocs/install/mysql/tables/llx_bank_account.key.sql
@@ -20,4 +20,4 @@
 
 ALTER TABLE llx_bank_account ADD UNIQUE uk_bank_account_label (label,entity);
 
-ALTER TABLE llx_bank_account ADD CONSTRAINT bank_fk_accountancy_journal FOREIGN KEY (fk_accountancy_journal) REFERENCES llx_accounting_journal (rowid);
+-- ALTER TABLE llx_bank_account ADD CONSTRAINT bank_fk_accountancy_journal FOREIGN KEY (fk_accountancy_journal) REFERENCES llx_accounting_journal (rowid);
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index 9eb4135397f..92fe19676c0 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -61,7 +61,8 @@ ChangeAndLoad=Change and load
 Addanaccount=Add an accounting account
 AccountAccounting=Accounting account
 AccountAccountingShort=Account
-ShowAccoutingAccount=Show accounting account
+ShowAccountingAccount=Show accounting account
+ShowAccountingJournal=Show accounting journal
 AccountAccountingSuggest=Accounting account suggested
 MenuDefaultAccounts=Default accounts
 MenuVatAccounts=Vat accounts

From 55feea5d9816a3a37042fe43ea790df7cfe1f613 Mon Sep 17 00:00:00 2001
From: philippe grand <philippe.grand@atoo-net.com>
Date: Sat, 6 May 2017 10:54:28 +0200
Subject: [PATCH 231/505] Update code using new css class

---
 htdocs/admin/stock.php             | 17 +++---------
 htdocs/categories/index.php        |  3 +--
 htdocs/categories/viewcat.php      | 43 ++++++++++--------------------
 htdocs/comm/card.php               |  3 +--
 htdocs/comm/index.php              | 11 ++------
 htdocs/comm/propal/stats/index.php |  5 ++--
 6 files changed, 24 insertions(+), 58 deletions(-)

diff --git a/htdocs/admin/stock.php b/htdocs/admin/stock.php
index c8204f213c2..164e4fd6bc8 100644
--- a/htdocs/admin/stock.php
+++ b/htdocs/admin/stock.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2008-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2012-2013 Juanjo Menent		<jmenent@2byte.es>
- * Copyright (C) 2013      Philippe Grand       <philippe.grand@atoo-net.com>
+ * Copyright (C) 2013-2017 Philippe Grand       <philippe.grand@atoo-net.com>
  * Copyright (C) 2013      Florian Henry        <florian.henry@open-concept.pro>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -435,7 +435,6 @@ if ($virtualdiffersfromphysical)
 print '<br />';
 if ($conf->global->MAIN_LEVEL_FEATURES >= 2)
 {
-	$var=false;
 	print '<table class="noborder" width="100%">';
 	print '<tr class="liste_titre">';
 	print '<td>'.$langs->trans("Inventory").'</td>'."\n";
@@ -443,8 +442,7 @@ if ($conf->global->MAIN_LEVEL_FEATURES >= 2)
 	print '<td align="center" width="100">&nbsp;</td>'."\n";
 	
 	// Example with a yes / no select
-	$var=!$var;
-	print '<tr '.$bc[$var].'>';
+	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("INVENTORY_DISABLE_VIRTUAL").'</td>';
 	print '<td align="center" width="20">&nbsp;</td>';
 	print '<td align="right" width="300">';
@@ -457,8 +455,7 @@ if ($conf->global->MAIN_LEVEL_FEATURES >= 2)
 	print '</td></tr>';
 	
 	// Example with a yes / no select
-	$var=!$var;
-	print '<tr '.$bc[$var].'>';
+	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("INVENTORY_USE_MIN_PA_IF_NO_LAST_PA").'</td>';
 	print '<td align="center" width="20">&nbsp;</td>';
 	print '<td align="right" width="300">';
@@ -471,8 +468,7 @@ if ($conf->global->MAIN_LEVEL_FEATURES >= 2)
 	print '</td></tr>';
 	
 	// Example with a yes / no select
-	$var=!$var;
-	print '<tr '.$bc[$var].'>';
+	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT").'</td>';
 	print '<td align="center" width="20">&nbsp;</td>';
 	print '<td align="right" width="300">';
@@ -487,7 +483,6 @@ if ($conf->global->MAIN_LEVEL_FEATURES >= 2)
 	print '</table>';
 }
 
-$var=true;
 print '<table class="noborder" width="100%">';
 
 print '<tr class="liste_titre">';
@@ -509,8 +504,6 @@ if (! empty($conf->fournisseur->enabled) && !empty($conf->global->STOCK_CALCULAT
     print "</td>\n</tr>\n";
 }
 
-
-
 print '<tr class="oddeven">';
 print '<td width="60%">'.$langs->trans("UserWarehouseAutoCreate").'</td>';
 print '<td width="160" align="right">';
@@ -523,8 +516,6 @@ print '</form>';
 print "</td>\n";
 print "</tr>\n";
 
-
-
 print '<tr class="oddeven">';
 print '<td width="60%">'.$langs->trans("AllowAddLimitStockByWarehouse").'</td>';
 
diff --git a/htdocs/categories/index.php b/htdocs/categories/index.php
index ca2b7b5c76f..b68da6fd597 100644
--- a/htdocs/categories/index.php
+++ b/htdocs/categories/index.php
@@ -112,8 +112,7 @@ if ($catname || $id > 0)
 	$var=true;
 	foreach ($cats as $cat)
 	{
-		$var = ! $var;
-		print "\t<tr ".$bc[$var].">\n";
+		print "\t".'<tr class="oddeven">'."\n";
 		print "\t\t<td>";
 		$categstatic->id=$cat->id;
 		$categstatic->ref=$cat->label;
diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php
index ebd5fa9991c..d04d0baebd2 100644
--- a/htdocs/categories/viewcat.php
+++ b/htdocs/categories/viewcat.php
@@ -289,11 +289,9 @@ else
 	print "</tr>\n";
 	if (count($cats) > 0)
 	{
-		$var=true;
 		foreach ($cats as $cat)
-		{
-			
-			print "\t<tr ".$bc[$var].">\n";
+		{			
+			print "\t".'<tr class="oddeven">'."\n";
 			print "\t\t".'<td class="nowrap">';
 			print "<a href='viewcat.php?id=".$cat->id."&amp;type=".$type."'>".$cat->label."</a>";
 			print "</td>\n";
@@ -360,11 +358,9 @@ if ($object->type == Categorie::TYPE_PRODUCT)
 
 		if (count($prods) > 0)
 		{
-			$var=true;
 			foreach ($prods as $prod)
-			{
-				
-				print "\t<tr ".$bc[$var].">\n";
+			{				
+				print "\t".'<tr class="oddeven">'."\n";
 				print '<td class="nowrap" valign="top">';
 				print $prod->getNomUrl(1);
 				print "</td>\n";
@@ -411,12 +407,9 @@ if ($object->type == Categorie::TYPE_SUPPLIER)
 
 		if (count($socs) > 0)
 		{
-			$var=true;
 			foreach ($socs as $soc)
-			{
-				
-				print "\t<tr ".$bc[$var].">\n";
-
+			{				
+				print "\t".'<tr class="oddeven">'."\n";
 				print '<td class="nowrap" valign="top">';
 				print $soc->getNomUrl(1);
 				print "</td>\n";
@@ -464,14 +457,13 @@ if($object->type == Categorie::TYPE_CUSTOMER)
 		if (count($socs) > 0)
 		{
 			$i = 0;
-			$var=true;
 			foreach ($socs as $key => $soc)
 			{
 				if ($user->societe_id > 0 && $soc->id != $user->societe_id)	continue; 	// External user always see only themself
 
 				$i++;
 				
-				print "\t<tr ".$bc[$var].">\n";
+				print "\t".'<tr class="oddeven">'."\n";
 				print '<td class="nowrap" valign="top">';
 				print $soc->getNomUrl(1);
 				print "</td>\n";
@@ -520,11 +512,9 @@ if ($object->type == Categorie::TYPE_MEMBER)
 
 		if (count($prods) > 0)
 		{
-			$var=true;
 			foreach ($prods as $key => $member)
-			{
-				
-				print "\t<tr ".$bc[$var].">\n";
+			{				
+				print "\t".'<tr class="oddeven">'."\n";
 				print '<td class="nowrap" valign="top">';
 				$member->ref=$member->login;
 				print $member->getNomUrl(1,0);
@@ -574,12 +564,11 @@ if($object->type == Categorie::TYPE_CONTACT)
 		if (count($contacts) > 0)
 		{
 			$i = 0;
-			$var=true;
 			foreach ($contacts as $key => $contact)
 			{
 				$i++;
 				
-				print "\t<tr ".$bc[$var].">\n";
+				print "\t".'<tr class="oddeven">'."\n";
 				print '<td class="nowrap" valign="top">';
 				print $contact->getNomUrl(1,'category');
 				print "</td>\n";
@@ -629,11 +618,9 @@ if ($object->type == Categorie::TYPE_ACCOUNT)
 
         if (count($accounts) > 0)
         {
-            $var=true;
             foreach ($accounts as $key => $account)
-            {
-                
-                print "\t<tr ".$bc[$var].">\n";
+            {              
+                print "\t".'<tr class="oddeven">'."\n";
                 print '<td class="nowrap" valign="top">';
                 print $account->getNomUrl(1,0);
                 print "</td>\n";
@@ -684,11 +671,9 @@ if ($object->type == Categorie::TYPE_PROJECT)
 
 		if (count($projects) > 0)
 		{
-			$var=true;
 			foreach ($projects as $key => $project)
-			{
-				
-				print "\t<tr ".$bc[$var].">\n";
+			{				
+				print "\t".'<tr class="oddeven">'."\n";
 				print '<td class="nowrap" valign="top">';
 				print $project->getNomUrl(1,0);
 				print "</td>\n";
diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index aae1398109d..b933289be4f 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -788,8 +788,7 @@ if ($id > 0)
 
             while ($i < $num && $i < $MAXLIST) {
                 $objp = $db->fetch_object($resql);
-                $var = ! $var;
-                print "<tr " . $bc[$var] . ">";
+                print '<tr class="oddeven">';
                 print '<td class="nowrap">';
                 $sendingstatic->id = $objp->id;
                 $sendingstatic->ref = $objp->ref;
diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php
index 4bd999b1d5a..24bccbf9c9c 100644
--- a/htdocs/comm/index.php
+++ b/htdocs/comm/index.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C) 2015       Jean-François Ferry	<jfefe@aternatik.fr>
+ * Copyright (C) 2015      Jean-François Ferry	<jfefe@aternatik.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
@@ -479,7 +479,6 @@ if (! empty($conf->societe->enabled) && $user->rights->societe->lire)
 	$resql = $db->query($sql);
 	if ($resql)
 	{
-		$var=false;
 		$num = $db->num_rows($resql);
 		$i = 0;
 
@@ -544,7 +543,6 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->societe->lire)
 	$result = $db->query($sql);
 	if ($result)
 	{
-		$var=false;
 		$num = $db->num_rows($result);
 		$i = 0;
 
@@ -633,11 +631,10 @@ if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire && 0) // TO
 
 			$staticcontrat=new Contrat($db);
 
-			$var=false;
 			while ($i < $num)
 			{
 				$obj = $db->fetch_object($resql);
-				print "<tr ".$bc[$var]."><td><a href=\"../contrat/card.php?id=".$obj->contratid."\">".img_object($langs->trans("ShowContract","contract"), 'contract')." ".$obj->ref."</a></td>";
+				print '<tr class="oddeven"><td><a href=\"../contrat/card.php?id=".$obj->contratid."\">".img_object($langs->trans("ShowContract","contract"), "contract")." ".$obj->ref."</a></td>';
 				print '<td>';
                 $companystatic->id=$objp->rowid;
                 $companystatic->name=$objp->name;
@@ -686,8 +683,6 @@ if (! empty($conf->propal->enabled) && $user->rights->propal->lire)
 		$i = 0;
 		if ($num > 0)
 		{
-			$var=true;
-
 			print '<table class="noborder" width="100%">';
 			print '<tr class="liste_titre"><th colspan="5">'.$langs->trans("ProposalsOpened").' <a href="'.DOL_URL_ROOT.'/comm/propal/list.php?viewstatut=1"><span class="badge">'.$num.'</span></th></tr>';
 
@@ -785,8 +780,6 @@ if (! empty($conf->commande->enabled) && $user->rights->commande->lire)
 		$i = 0;
 		if ($num > 0)
 		{
-			$var=true;
-
 			print '<table class="noborder" width="100%">';
 			print '<tr class="liste_titre"><th class="liste_titre" colspan="5">'.$langs->trans("OrdersOpened").' <a href="'.DOL_URL_ROOT.'/commande/list.php?viewstatut=1"><span class="badge">'.$num.'</span></th></tr>';
 
diff --git a/htdocs/comm/propal/stats/index.php b/htdocs/comm/propal/stats/index.php
index abb24b8ffa4..5c74c8374a0 100644
--- a/htdocs/comm/propal/stats/index.php
+++ b/htdocs/comm/propal/stats/index.php
@@ -293,7 +293,6 @@ print '<td align="right">%</td>';
 print '</tr>';
 
 $oldyear=0;
-$var=true;
 foreach ($data as $val)
 {
     $year = $val['year'];
@@ -301,7 +300,7 @@ foreach ($data as $val)
     {	// If we have empty year
         $oldyear--;
         
-        print '<tr '.$bc[$var].' height="24">';
+        print '<tr class="oddeven" height="24">';
         print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$oldyear.'&amp;mode='.$mode.($socid>0?'&socid='.$socid:'').($userid>0?'&userid='.$userid:'').'">'.$oldyear.'</a></td>';
         print '<td align="right">0</td>';
         print '<td align="right"></td>';
@@ -311,7 +310,7 @@ foreach ($data as $val)
         print '<td align="right"></td>';
         print '</tr>';
     }
-    print '<tr '.$bc[$var].' height="24">';
+    print '<tr class="oddeven" height="24">';
     print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$year.($socid>0?'&socid='.$socid:'').($userid>0?'&userid='.$userid:'').'">'.$year.'</a></td>';
     print '<td align="right">'.$val['nb'].'</td>';
 	print '<td align="right" style="'.(($val['nb_diff'] >= 0) ? 'color: green;':'color: red;').'">'.round($val['nb_diff']).'</td>';

From 44bdf91715d9bf065d9e71de9f24f71299f80556 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 6 May 2017 12:43:45 +0200
Subject: [PATCH 232/505] Add badge with nb of imported calendard on user tab

---
 htdocs/core/lib/usergroups.lib.php | 29 +++++++++++++++++++++++------
 htdocs/holiday/list.php            |  2 +-
 htdocs/user/agenda_extsites.php    | 13 ++++++-------
 htdocs/user/bank.php               |  3 ++-
 htdocs/user/card.php               |  2 +-
 htdocs/user/clicktodial.php        |  3 ++-
 htdocs/user/document.php           |  2 +-
 htdocs/user/info.php               |  2 +-
 htdocs/user/ldap.php               |  2 +-
 htdocs/user/note.php               | 14 +++++++-------
 htdocs/user/notify/card.php        |  3 ++-
 htdocs/user/perms.php              |  2 +-
 12 files changed, 48 insertions(+), 29 deletions(-)

diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php
index 8936cf98623..3b3cde1d66a 100644
--- a/htdocs/core/lib/usergroups.lib.php
+++ b/htdocs/core/lib/usergroups.lib.php
@@ -59,6 +59,11 @@ function user_prepare_head($object)
 	    $h++;
 	}
 
+    $head[$h][0] = DOL_URL_ROOT.'/user/param_ihm.php?id='.$object->id;
+    $head[$h][1] = $langs->trans("UserGUISetup");
+    $head[$h][2] = 'guisetup';
+    $h++;
+
 	if ($canreadperms)
 	{
 		$head[$h][0] = DOL_URL_ROOT.'/user/perms.php?id='.$object->id;
@@ -67,15 +72,27 @@ function user_prepare_head($object)
 		$h++;
 	}
 
-    $head[$h][0] = DOL_URL_ROOT.'/user/param_ihm.php?id='.$object->id;
-    $head[$h][1] = $langs->trans("UserGUISetup");
-    $head[$h][2] = 'guisetup';
-    $h++;
-
     if (! empty($conf->agenda->enabled))
     {
+        if (empty($conf->global->AGENDA_EXT_NB)) $conf->global->AGENDA_EXT_NB=5;
+        $MAXAGENDA=$conf->global->AGENDA_EXT_NB;
+        
+        $i=1;
+        $nbagenda = 0;
+        while ($i <= $MAXAGENDA)
+        {
+            $key=$i;
+            $name='AGENDA_EXT_NAME_'.$object->id.'_'.$key;
+            $src='AGENDA_EXT_SRC_'.$object->id.'_'.$key;
+            $offsettz='AGENDA_EXT_OFFSETTZ_'.$object->id.'_'.$key;
+            $color='AGENDA_EXT_COLOR_'.$object->id.'_'.$key;
+            $i++;
+        
+            if (! empty($object->conf->$name)) $nbagenda++;
+        }
+        
 	    $head[$h][0] = DOL_URL_ROOT.'/user/agenda_extsites.php?id='.$object->id;
-	    $head[$h][1] = $langs->trans("ExtSites");
+	    $head[$h][1] = $langs->trans("ExtSites").($nbagenda ? ' <span class="badge">'.$nbagenda.'</span>' : '');
 	    $head[$h][2] = 'extsites';
 	    $h++;
     }
diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php
index f91616d0b9a..d35fa9293c3 100644
--- a/htdocs/holiday/list.php
+++ b/htdocs/holiday/list.php
@@ -202,7 +202,7 @@ $user_id = $user->id;
 if ($id > 0)
 {
 	// Charge utilisateur edite
-	$fuser->fetch($id);
+	$fuser->fetch($id, '', '', 1);
 	$fuser->getrights();
 	$user_id = $fuser->id;
 }
diff --git a/htdocs/user/agenda_extsites.php b/htdocs/user/agenda_extsites.php
index d8aba34a934..e789a8277f3 100644
--- a/htdocs/user/agenda_extsites.php
+++ b/htdocs/user/agenda_extsites.php
@@ -42,7 +42,7 @@ $actiontest=GETPOST('test','alpha');
 $actionsave=GETPOST('save','alpha');
 
 if (empty($conf->global->AGENDA_EXT_NB)) $conf->global->AGENDA_EXT_NB=5;
-$MAXAGENDA=empty($conf->global->AGENDA_EXT_NB)?5:$conf->global->AGENDA_EXT_NB;
+$MAXAGENDA=$conf->global->AGENDA_EXT_NB;
 
 // List of available colors
 $colorlist=array('BECEDD','DDBECE','BFDDBE','F598B4','F68654','CBF654','A4A4A5');
@@ -50,7 +50,8 @@ $colorlist=array('BECEDD','DDBECE','BFDDBE','F598B4','F68654','CBF654','A4A4A5')
 // Security check
 $id = GETPOST('id','int');
 $object = new User($db);
-$object->fetch($id);
+$object->fetch($id, '', '', 1);
+$object->getrights();
 
 // Security check
 $socid=0;
@@ -81,12 +82,12 @@ if (empty($reshook)) {
 	if ($actionsave) {
 		$db->begin();
 
-		$i = 1;
 		$errorsaved = 0;
 		$error = 0;
 		$tabparam = array();
 
 		// Save agendas
+		$i = 1;
 		while ($i <= $MAXAGENDA) {
 			$name = trim(GETPOST('AGENDA_EXT_NAME_'.$id.'_'.$i, 'alpha'));
 			$src = trim(GETPOST('AGENDA_EXT_SRC_'.$id.'_'.$i, 'alpha'));
@@ -110,7 +111,7 @@ if (empty($reshook)) {
 			$tabparam['AGENDA_EXT_COLOR_'.$id.'_'.$i]=$color;
 			$tabparam['AGENDA_EXT_ENABLED_'.$id.'_'.$i]=$enabled;
 
-			$i ++;
+			$i++;
 		}
 
 		if (!$error) {
@@ -167,7 +168,6 @@ print "<br>\n";
 $selectedvalue=$conf->global->AGENDA_DISABLE_EXT;
 if ($selectedvalue==1) $selectedvalue=0; else $selectedvalue=1;
 
-$var=true;
 print '<div class="div-table-responsive">';
 print "<table class=\"noborder\" width=\"100%\">";
 
@@ -180,7 +180,6 @@ print '<td align="right">'.$langs->trans("Color").'</td>';
 print "</tr>";
 
 $i=1;
-$var=true;
 while ($i <= $MAXAGENDA)
 {
 	$key=$i;
@@ -189,7 +188,7 @@ while ($i <= $MAXAGENDA)
 	$offsettz='AGENDA_EXT_OFFSETTZ_'.$id.'_'.$key;
 	$color='AGENDA_EXT_COLOR_'.$id.'_'.$key;
 
-	
+
 	print '<tr class="oddeven">';
 	// Nb
 	print '<td class="maxwidth50onsmartphone">'.$langs->trans("AgendaExtNb",$key)."</td>";
diff --git a/htdocs/user/bank.php b/htdocs/user/bank.php
index c9551cdbc23..9f36bc91e31 100644
--- a/htdocs/user/bank.php
+++ b/htdocs/user/bank.php
@@ -50,7 +50,8 @@ $result = restrictedArea($user, 'user', $id, 'user&user', $feature2);
 $object = new User($db);
 if ($id > 0 || ! empty($ref))
 {
-	$result = $object->fetch($id, $ref);
+	$result = $object->fetch($id, $ref, '', 1);
+	$object->getrights();
 }
 
 /*
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 3255dc676cf..675f5748842 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -1140,7 +1140,7 @@ else
 
     if ($id > 0)
     {
-        $object->fetch($id);
+        $object->fetch($id, '', '', 1);
         if ($res < 0) { dol_print_error($db,$object->error); exit; }
         $res=$object->fetch_optionals($object->id,$extralabels);
 		
diff --git a/htdocs/user/clicktodial.php b/htdocs/user/clicktodial.php
index 5299f348431..1500a3be55c 100644
--- a/htdocs/user/clicktodial.php
+++ b/htdocs/user/clicktodial.php
@@ -83,7 +83,8 @@ llxHeader("","ClickToDial");
 if ($id > 0)
 {
     $object = new User($db);
-    $object->fetch($id);
+    $object->fetch($id, '', '', 1);
+    $object->getrights();
     $object->fetch_clicktodial();
 
 
diff --git a/htdocs/user/document.php b/htdocs/user/document.php
index a8d5000e809..8b055979992 100644
--- a/htdocs/user/document.php
+++ b/htdocs/user/document.php
@@ -86,7 +86,7 @@ if (! $sortfield) $sortfield="name";
 $object = new User($db);
 if ($id > 0 || ! empty($ref))
 {
-	$result = $object->fetch($id, $ref);
+	$result = $object->fetch($id, $ref, '', 1);
 	$object->getrights();
 	$entitytouseforuserdir = $object->entity;
 	if (empty($entitytouseforuserdir)) $entitytouseforuserdir=1;
diff --git a/htdocs/user/info.php b/htdocs/user/info.php
index 86bff7147ff..d20624063f2 100644
--- a/htdocs/user/info.php
+++ b/htdocs/user/info.php
@@ -34,7 +34,7 @@ $id = GETPOST('id','int');
 $object = new User($db);
 if ($id > 0 || ! empty($ref))
 {
-	$result = $object->fetch($id, $ref);
+	$result = $object->fetch($id, $ref, '', 1);
 	$object->getrights();
 }
 
diff --git a/htdocs/user/ldap.php b/htdocs/user/ldap.php
index 0f0cc6b4ed7..252ed9f82b4 100644
--- a/htdocs/user/ldap.php
+++ b/htdocs/user/ldap.php
@@ -42,7 +42,7 @@ if ($user->id == $id) $feature2=''; // A user can always read its own card
 $result = restrictedArea($user, 'user', $id, 'user&user', $feature2);
 
 $object = new User($db);
-$object->fetch($id);
+$object->fetch($id, '', '', 1);
 $object->getrights();
 
 // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
diff --git a/htdocs/user/note.php b/htdocs/user/note.php
index ca9f821d14c..2844676a465 100644
--- a/htdocs/user/note.php
+++ b/htdocs/user/note.php
@@ -36,7 +36,7 @@ $langs->load("bills");
 $langs->load("users");
 
 $object = new User($db);
-$object->fetch($id);
+$object->fetch($id, '', '', 1);
 $object->getrights();
 
 // If user is not user read and no permission to read other users, we stop
@@ -53,9 +53,9 @@ $result = restrictedArea($user, 'user', $id, 'user&user', $feature2);
 $hookmanager->initHooks(array('usercard','globalcard'));
 
 
-/******************************************************************************/
-/*                     Actions                                                */
-/******************************************************************************/
+/*
+ * Actions
+ */
 
 $parameters=array('id'=>$socid);
 $reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
@@ -76,9 +76,9 @@ if (empty($reshook)) {
 }
 
 
-/******************************************************************************/
-/* Affichage fiche                                                            */
-/******************************************************************************/
+/*
+ * View
+ */
 
 llxHeader();
 
diff --git a/htdocs/user/notify/card.php b/htdocs/user/notify/card.php
index 4f47578f543..2b7c31d75df 100644
--- a/htdocs/user/notify/card.php
+++ b/htdocs/user/notify/card.php
@@ -122,7 +122,8 @@ if ($action == 'delete')
 $form = new Form($db);
 
 $object = new User($db);
-$result=$object->fetch($id);
+$result=$object->fetch($id, '', '', 1);
+$object->getrights();
 
 $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");
diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php
index e84cfe09ca8..b40c79f783e 100644
--- a/htdocs/user/perms.php
+++ b/htdocs/user/perms.php
@@ -68,7 +68,7 @@ $result = restrictedArea($user, 'user', $id, 'user&user', $feature2);
 if ($user->id <> $id && ! $canreaduser) accessforbidden();
 
 $object = new User($db);
-$object->fetch($id);
+$object->fetch($id, '', '', 1);
 $object->getrights();
 
 // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array

From a7e9dc1ce4b1545bc755746217b50e454e6dbcd3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 6 May 2017 13:06:33 +0200
Subject: [PATCH 233/505] Prepare 5.0.2

---
 ChangeLog | 42 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index c9ac46b0f2a..3d4c5a29595 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,48 @@
 English Dolibarr ChangeLog
 --------------------------------------------------------------
 
+
+***** ChangeLog for 5.0.2 compared to 5.0.1 *****
+FIX: #6468 + Fix missing translation
+FIX: #6517 #6525 Autocompletion of thirdparty after n chars not implemented
+FIX: #6613 Default subject for Supplier proposal emails is filled with a non-existing key
+FIX: #6614
+FIX: #6619 Template invoices list do not respect restricted thirdparty user rights
+FIX: #6621 Documents tab shows greyed out upload form even if the option to show actions not available is disabled
+FIX: #6623 User card shows "Return to list" link even if the user has no rights to list users
+FIX: #6636 Complete fix
+FIX: #6669 User with no permission to edit customer invoices can see a edit button in project entry
+FIX: #6671 Cannot remove thirdparty type with "#" in its name
+FIX: #6673 Missing "nature" table header in thirdparty list
+FIX: #6675 Restricted user with no agenda permissions can see a button to create appointment in thirdparty contact list
+FIX: #6679 User with restricted supplier invoice permissions can edit project, payment conditions, payment mode
+FIX: #6680 User with restricted supplier invoice permissions sees "reopen" button even if he has no permission to do it
+FIX: #6718 Bug: Discount amount is not locally formatted in CommonObject View
+FIX: #6767 serious critical error, no login possible with postgresql and ipv6.
+FIX: #6795 #6796
+FIX: Add option MAIN_MAIL_USE_MULTI_PART to include text content into HTML email and add option MAIN_MAIL_ADD_INLINE_IMAGES_IF_IN_MEDIAS to restore the inline images feature.
+FIX: ajax autocomplete on clone
+FIX: A non admin user can not download files attached to user.
+FIX: Can't download delivery receipts (function dol_check_secure_access_document)
+FIX: complete hourly rate when not defined into table of time spent
+FIX: dont get empty "Incoterms : - " string if no incoterm
+FIX: dont lose supplier ref if no supplier price in database
+FIX: Enter a direct bank transaction
+FIX: extrafield css for boolean type
+FIX: forgotten parameter for right multicompany use
+FIX: Found duplicate line when it is not.
+FIX: global $dateSelector isn't the good one, then date selector on objectline_create tpl was hidden
+FIX: Journal code of bank must be visible of accountaing module on.
+FIX: length_accounta return variable name
+FIX: limit+1 dosn't show Total line
+FIX: No filter on company when showing the link to elements.
+FIX: overwrapping of weight/volume on rouget template
+FIX: Several bugs in accounting module.
+FIX: shared bank account with multicompany not visible in invoice setup
+FIX: spaces not allowed into vat code
+FIX: supplier default condition not retrieved on create
+FIX: supplier order line were always created with rang = 0
+
 ***** ChangeLog for 5.0.1 compared to 5.0.0 *****
 FIX: #6503: SQL error in "Last pending payment invoices"
 FIX: #6505 Project elements page shows greyed-out links even if the option to show actions not available is disabled

From c4475ca9462c56eb412592afcbe859dee5e99f57 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 6 May 2017 14:56:16 +0200
Subject: [PATCH 234/505] Add a protection to avoid to take modules into custom
 dir.

---
 build/makepack-dolibarr.pl | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl
index f465cf51234..061e2a18557 100755
--- a/build/makepack-dolibarr.pl
+++ b/build/makepack-dolibarr.pl
@@ -509,7 +509,6 @@ if ($nboftargetok) {
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/documents`;
 
 		# Removed known external modules to avoid any error when packaging from env where external modules are tested 
-	    #$ret=`find $BUILDROOT/$PROJECT/htdocs/custom/* -type d -exec rm -fr {} \;`;	# For custom we want to keep dir
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/allscreens*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/ancotec*`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/cabinetmed*`;
@@ -575,6 +574,10 @@ if ($nboftargetok) {
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/tools`;
         $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/LICENSE.TXT`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/savant`;
+        
+        print "Remove subdir of custom dir\n";
+   	    print "find $BUILDROOT/$PROJECT/htdocs/custom/* -type d -exec rm -fr {} \\;\n";
+   	    $ret=`find $BUILDROOT/$PROJECT/htdocs/custom/* -type d -exec rm -fr {} \\; >/dev/null 2>&1`;	# For custom we want to keep dir
 	}
 
 	# Build package for each target

From 880e2d0f72b951c7d64d1f6d70dd6777b554e818 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 6 May 2017 15:05:24 +0200
Subject: [PATCH 235/505] Fix packaging 5.0.2

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

diff --git a/build/rpm/dolibarr_fedora.spec b/build/rpm/dolibarr_fedora.spec
index e65e6bc3b7d..083c4eb8f14 100755
--- a/build/rpm/dolibarr_fedora.spec
+++ b/build/rpm/dolibarr_fedora.spec
@@ -173,6 +173,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/contrat
 %_datadir/dolibarr/htdocs/core
 %_datadir/dolibarr/htdocs/cron
+%_datadir/dolibarr/htdocs/custom
 %_datadir/dolibarr/htdocs/don
 %_datadir/dolibarr/htdocs/ecm
 %_datadir/dolibarr/htdocs/expedition
diff --git a/build/rpm/dolibarr_generic.spec b/build/rpm/dolibarr_generic.spec
index 655ef87f925..b40a203a71f 100755
--- a/build/rpm/dolibarr_generic.spec
+++ b/build/rpm/dolibarr_generic.spec
@@ -253,6 +253,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/contrat
 %_datadir/dolibarr/htdocs/core
 %_datadir/dolibarr/htdocs/cron
+%_datadir/dolibarr/htdocs/custom
 %_datadir/dolibarr/htdocs/don
 %_datadir/dolibarr/htdocs/ecm
 %_datadir/dolibarr/htdocs/expedition
diff --git a/build/rpm/dolibarr_mandriva.spec b/build/rpm/dolibarr_mandriva.spec
index 55fb7183734..fa3e39f8693 100755
--- a/build/rpm/dolibarr_mandriva.spec
+++ b/build/rpm/dolibarr_mandriva.spec
@@ -170,6 +170,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/contrat
 %_datadir/dolibarr/htdocs/core
 %_datadir/dolibarr/htdocs/cron
+%_datadir/dolibarr/htdocs/custom
 %_datadir/dolibarr/htdocs/don
 %_datadir/dolibarr/htdocs/ecm
 %_datadir/dolibarr/htdocs/expedition
diff --git a/build/rpm/dolibarr_opensuse.spec b/build/rpm/dolibarr_opensuse.spec
index f7e29927ebb..b2f8cf6ede1 100755
--- a/build/rpm/dolibarr_opensuse.spec
+++ b/build/rpm/dolibarr_opensuse.spec
@@ -181,6 +181,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/contrat
 %_datadir/dolibarr/htdocs/core
 %_datadir/dolibarr/htdocs/cron
+%_datadir/dolibarr/htdocs/custom
 %_datadir/dolibarr/htdocs/don
 %_datadir/dolibarr/htdocs/ecm
 %_datadir/dolibarr/htdocs/expedition

From ab8dcbd3665fc8b4f182799dc9f7e5d47169a2fd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 6 May 2017 16:36:05 +0200
Subject: [PATCH 236/505] Use virtual name

---
 build/makepack-dolibarr.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl
index 061e2a18557..6959ae67623 100755
--- a/build/makepack-dolibarr.pl
+++ b/build/makepack-dolibarr.pl
@@ -19,7 +19,7 @@ use Cwd;
 # Change this to defined target for option 98 and 99
 $PROJECT="dolibarr";
 $PUBLISHSTABLE="eldy,dolibarr\@frs.sourceforge.net:/home/frs/project/dolibarr";
-$PUBLISHBETARC="ldestailleur\@asso.dolibarr.org:/home/dolibarr/dolibarr.org/httpdocs/files";
+$PUBLISHBETARC="ldestailleur\@vmprod.dolibarr.org:/home/dolibarr/dolibarr.org/httpdocs/files";
 
 
 #@LISTETARGET=("TGZ","ZIP","RPM_GENERIC","RPM_FEDORA","RPM_MANDRIVA","RPM_OPENSUSE","DEB","APS","EXEDOLIWAMP","SNAPSHOT");   # Possible packages

From d948447600f7d6ab6fd546b6c091bb6bf7b3dd78 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 6 May 2017 17:08:38 +0200
Subject: [PATCH 237/505] Add button to disable all personalized default values
 in one click.

---
 htdocs/admin/defaultvalues.php    | 22 ++++++++++++++++++++++
 htdocs/admin/modules.php          | 20 ++++++++++++--------
 htdocs/admin/stock.php            |  1 +
 htdocs/core/lib/functions.lib.php |  2 +-
 htdocs/langs/en_US/admin.lang     |  1 +
 htdocs/product/traduction.php     |  7 +++----
 6 files changed, 40 insertions(+), 13 deletions(-)

diff --git a/htdocs/admin/defaultvalues.php b/htdocs/admin/defaultvalues.php
index ec4c5fd4605..dd37e4987e5 100644
--- a/htdocs/admin/defaultvalues.php
+++ b/htdocs/admin/defaultvalues.php
@@ -84,6 +84,11 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETP
     $search_array_options=array();
 }
 
+if ($action == 'setMAIN_ENABLE_DEFAULT_VALUES')
+{
+    if (GETPOST('value')) dolibarr_set_const($db, 'MAIN_ENABLE_DEFAULT_VALUES', 1, 'chaine', 0, '', $conf->entity);
+    else dolibarr_set_const($db, 'MAIN_ENABLE_DEFAULT_VALUES', 0, 'chaine', 0, '', $conf->entity);
+}
 
 if (($action == 'add' || (GETPOST('add') && $action != 'update')) || GETPOST('actionmodify'))
 {
@@ -185,6 +190,23 @@ print load_fiche_titre($langs->trans("DefaultValues"),'','title_setup');
 print $langs->trans("DefaultValuesDesc")."<br>\n";
 print "<br>\n";
 
+print $langs->trans("EnableDefaultValues").' ';
+if (empty($conf->global->MAIN_ENABLE_DEFAULT_VALUES))
+{
+    // Button off, click to enable
+    print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setMAIN_ENABLE_DEFAULT_VALUES&amp;value=1">';
+    print img_picto($langs->trans("Disabled"),'switch_off');
+    print '</a>';
+}
+else
+{
+    // Button on, click to disable
+    print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setMAIN_ENABLE_DEFAULT_VALUES&amp;value=0">';
+    print img_picto($langs->trans("Activated"),'switch_on');
+    print '</a>';
+}
+print "<br><br>\n";
+
 $param='&mode='.$mode;
 if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
 if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index c47586b2b2a..88944ee589a 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -640,7 +640,8 @@ if ($mode == 'common')
         {
         	$disableSetup = 0;
 
-        	print '<td class="center valignmiddle" width="80px">';
+        	// Link enable/disabme
+        	print '<td class="center valignmiddle" width="60px">';
         	if (! empty($arrayofwarnings[$modName]))
 	        {
                 print '<!-- This module has a warning to show when we activate it (note: your country is '.$mysoc->country_code.') -->'."\n";
@@ -662,12 +663,12 @@ if ($mode == 'common')
         	}
         	print '</td>'."\n";
 
-        	// Config link
+        	// Link config
         	if (! empty($objMod->config_page_url) && !$disableSetup)
         	{
         		if (is_array($objMod->config_page_url))
         		{
-        			print '<td class="tdsetuppicto right" width="40px"">';
+        			print '<td class="tdsetuppicto right" width="60px">';
         			$i=0;
         			foreach ($objMod->config_page_url as $page)
         			{
@@ -693,22 +694,23 @@ if ($mode == 'common')
         		}
         		else if (preg_match('/^([^@]+)@([^@]+)$/i',$objMod->config_page_url,$regs))
         		{
-        			print '<td class="tdsetuppicto right valignmiddle" width="80px"><a href="'.dol_buildpath('/'.$regs[2].'/admin/'.$regs[1],1).'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"),"setup",'style="padding-right: 6px"').'</a></td>';
+        			print '<td class="tdsetuppicto right valignmiddle" width="60px"><a href="'.dol_buildpath('/'.$regs[2].'/admin/'.$regs[1],1).'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"),"setup",'style="padding-right: 6px"').'</a></td>';
         		}
         		else
         		{
-        			print '<td class="tdsetuppicto right valignmiddle" width="80px"><a href="'.$objMod->config_page_url.'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"),"setup",'style="padding-right: 6px"').'</a></td>';
+        			print '<td class="tdsetuppicto right valignmiddle" width="60px"><a href="'.$objMod->config_page_url.'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"),"setup",'style="padding-right: 6px"').'</a></td>';
         		}
         	}
         	else
         	{
-        		print '<td class="tdsetuppicto right valignmiddle" width="80px">'.img_picto($langs->trans("NothingToSetup"),"setup",'class="opacitytransp" style="padding-right: 6px"').'</td>';
+        		print '<td class="tdsetuppicto right valignmiddle" width="60px">'.img_picto($langs->trans("NothingToSetup"),"setup",'class="opacitytransp" style="padding-right: 6px"').'</td>';
         	}
 
         }
         else	// Module not yet activated
 		{
-        	print '<td class="center valignmiddle" width="80px">';
+		    // Link enable/disable
+        	print '<td class="center valignmiddle" width="60px">';
 		    if (! empty($objMod->always_enabled))
         	{
         		// Should never happened
@@ -754,7 +756,9 @@ if ($mode == 'common')
 	        	print "</a>\n";
         	}
         	print "</td>\n";
-        	print '<td class="tdsetuppicto right valignmiddle" width="80px">'.img_picto($langs->trans("NothingToSetup"),"setup",'class="opacitytransp" style="padding-right: 6px"').'</td>';
+        	
+        	// Link config
+        	print '<td class="tdsetuppicto right valignmiddle" width="60px">'.img_picto($langs->trans("NothingToSetup"),"setup",'class="opacitytransp" style="padding-right: 6px"').'</td>';
         }
 
         print "</tr>\n";
diff --git a/htdocs/admin/stock.php b/htdocs/admin/stock.php
index c8204f213c2..72ff0f17a1b 100644
--- a/htdocs/admin/stock.php
+++ b/htdocs/admin/stock.php
@@ -149,6 +149,7 @@ if (! empty($conf->productbatch->enabled))
 //if (! empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER) || ! empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT))
 //{
 print info_admin($langs->trans("IfYouUsePointOfSaleCheckModule"));
+print '<br>';
 //}
 
 // Title rule for stock decrease
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 262204b9f72..e3c6cb7d5cd 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -260,7 +260,7 @@ function GETPOST($paramname, $check='', $method=0, $filter=NULL, $options=NULL)
 	    global $conf;
 	    
 	    // Management of default values
-	    if (! isset($_GET['sortfield']) && empty($conf->global->MAIN_DISABLE_DEFAULT_VALUES))	// If we did a click on a field to sort, we do no apply default values. Same if option MAIN_DISABLE_DEFAULT_VALUES is on
+	    if (! isset($_GET['sortfield']) && ! empty($conf->global->MAIN_ENABLE_DEFAULT_VALUES))	// If we did a click on a field to sort, we do no apply default values. Same if option MAIN_DISABLE_DEFAULT_VALUES is on
 	    {
 	        if (! empty($_GET['action']) && $_GET['action'] == 'create' && ! empty($paramname) && ! isset($_GET[$paramname]) && ! isset($_POST[$paramname]))
 	        {
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 14131bddd2c..8425aa2c4c6 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -431,6 +431,7 @@ TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. This need to have
 PageUrlForDefaultValues=You must enter here the relative url of the page. If you include parameters in URL, the default values will be effective if all parameters are set to same value. Examples:
 PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>
 PageUrlForDefaultValuesList=<br>For page that list thirdparties, it is <strong>%s</strong>
+EnableDefaultValues=Enable usage of personalized default values
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code, so to change this value, you must edit it fom Home-Setup-translation.
 WarningSettingSortOrder=Warning, setting a default sort order may result in a technical error when going on the list page if field is an unknown field. If you experience such an error, come back to this page to remove the default sort order and restore default behavior. 
 Field=Field
diff --git a/htdocs/product/traduction.php b/htdocs/product/traduction.php
index b5f4b8b34ae..03f7e1c54ac 100644
--- a/htdocs/product/traduction.php
+++ b/htdocs/product/traduction.php
@@ -277,16 +277,14 @@ if ($action == 'edit')
 }
 else if ($action != 'add')
 {
-    //if ($cnt_trans) print '<div class="underbanner clearboth"></div>';
-    
 	if (! empty($object->multilangs))
 	{
 		foreach ($object->multilangs as $key => $value)
 		{
 			$s=picto_from_langcode($key);
-			//print '<tr><td>';
 			print ($s?$s.' ':'')." <b>".$langs->trans('Language_'.$key).":</b> ".'<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&langtodelete='.$key.'">'.img_delete('', 'class="valigntextbottom"').'</a>';
-			//print '</td><td></td></tr>';
+			
+			print '<div class="fichecenter">';
 			print '<div class="underbanner clearboth"></div>';
 			print '<table class="border" width="100%">';
 			print '<tr><td class="titlefieldcreate">'.$langs->trans('Label').'</td><td>'.$object->multilangs[$key]["label"].'</td></tr>';
@@ -296,6 +294,7 @@ else if ($action != 'add')
                 print '<tr><td>'.$langs->trans('Other').' ('.$langs->trans("NotUsed").')</td><td>'.$object->multilangs[$key]["other"].'</td></tr>';
 			}
 			print '</table>';
+			print '</div>';
 		}
 	}
 	if (! $cnt_trans && $action != 'add') print '<div class="opacitymedium">'. $langs->trans('NoTranslation').'</div>';

From 910a92516711a006ad0f7424b4d3f44ce2de7594 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 6 May 2017 20:43:14 +0200
Subject: [PATCH 238/505] NEW Add last activation author and ip of modules

---
 htdocs/admin/modulehelp.php                   |  18 ++++++++
 htdocs/admin/modules.php                      |   6 +--
 htdocs/admin/user.php                         |   4 +-
 htdocs/admin/usergroup.php                    |   2 +-
 htdocs/comm/mailing/card.php                  |   2 +-
 htdocs/core/lib/admin.lib.php                 |   2 +-
 htdocs/core/menus/standard/auguria.lib.php    |   2 +-
 htdocs/core/menus/standard/eldy.lib.php       |   2 +-
 htdocs/core/modules/DolibarrModules.class.php |  42 ++++++++++++++++--
 htdocs/core/tpl/login.tpl.php                 |   2 +-
 htdocs/core/tpl/passwordforgotten.tpl.php     |   2 +-
 htdocs/langs/en_US/admin.lang                 |   4 +-
 htdocs/societe/admin/contact_extrafields.php  |   2 +-
 htdocs/societe/admin/societe.php              |   2 +-
 htdocs/societe/admin/societe_extrafields.php  |   2 +-
 htdocs/theme/dolibarr_logo.png                | Bin 14646 -> 10289 bytes
 htdocs/theme/eldy/style.css.php               |  10 ++++-
 htdocs/user/admin/group_extrafields.php       |   2 +-
 htdocs/user/admin/user_extrafields.php        |   2 +-
 19 files changed, 84 insertions(+), 24 deletions(-)
 mode change 100644 => 100755 htdocs/theme/dolibarr_logo.png

diff --git a/htdocs/admin/modulehelp.php b/htdocs/admin/modulehelp.php
index 94bfa8e05bb..d318566ff61 100644
--- a/htdocs/admin/modulehelp.php
+++ b/htdocs/admin/modulehelp.php
@@ -330,6 +330,24 @@ if ($mode == 'desc')
     else $text.=$langs->trans("Disabled");
     $text.='<br>';
 
+    $tmp = $objMod->getLastActivationInfo();
+    $authorid = $tmp['authorid'];
+    if ($authorid > 0)
+    {
+        $tmpuser = new User($db);
+        $tmpuser->fetch($authorid);
+        $text.='<strong>'.$langs->trans("LastActivationAuthor").':</strong> ';
+        $text.= $tmpuser->getNomUrl(1);
+        $text.='<br>';
+    }
+    $ip = $tmp['ip'];
+    if ($ip)
+    {
+        $text.='<strong>'.$langs->trans("LastActivationIP").':</strong> ';
+        $text.= $ip;
+        $text.='<br>';
+    }    
+    
     $moduledesclong=$objMod->getDescLong();
     if ($moduledesclong) $text.='<br><hr><div class="moduledesclong">'.$moduledesclong.'<div>';
 }
diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index 88944ee589a..433508be908 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -402,9 +402,9 @@ if ($nbofactivatedmodules <= 1) $moreinfo .= ' '.img_warning($langs->trans("YouM
 print load_fiche_titre($langs->trans("ModulesSetup"),$moreinfo,'title_setup');
 
 // Start to show page
-if ($mode=='common')      print $langs->trans("ModulesDesc")."<br>\n";
-if ($mode=='marketplace') print $langs->trans("ModulesMarketPlaceDesc")."<br>\n";
-if ($mode=='deploy')      print $langs->trans("ModulesDeployDesc", $langs->transnoentitiesnoconv("AvailableModules"))."<br>\n";
+if ($mode=='common')      print '<span class="opacitymedium">'.$langs->trans("ModulesDesc")."</span><br>\n";
+if ($mode=='marketplace') print '<span class="opacitymedium">'.$langs->trans("ModulesMarketPlaceDesc")."</span><br>\n";
+if ($mode=='deploy')      print '<span class="opacitymedium">'.$langs->trans("ModulesDeployDesc", $langs->transnoentitiesnoconv("AvailableModules"))."</span><br>\n";
 
 
 $h = 0;
diff --git a/htdocs/admin/user.php b/htdocs/admin/user.php
index 42feea8f8ec..0c7574b7ec4 100644
--- a/htdocs/admin/user.php
+++ b/htdocs/admin/user.php
@@ -167,7 +167,7 @@ print load_fiche_titre($langs->trans("UsersSetup"),$linkback,'title_setup');
 
 $head=user_admin_prepare_head();
 
-dol_fiche_head($head,'card', $langs->trans("MenuUsersAndGroups"), 0, 'user');
+dol_fiche_head($head,'card', $langs->trans("MenuUsersAndGroups"), -1, 'user');
 
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
@@ -205,7 +205,7 @@ print '</td></tr>';
 
 print '</table>';
 
-
+print '<br>';
 
 $dirmodels=array_merge(array('/'),(array) $conf->modules_parts['models']);
 
diff --git a/htdocs/admin/usergroup.php b/htdocs/admin/usergroup.php
index db5ef3cbf59..4642e6d3183 100644
--- a/htdocs/admin/usergroup.php
+++ b/htdocs/admin/usergroup.php
@@ -151,7 +151,7 @@ print load_fiche_titre($langs->trans("UsersSetup"),$linkback,'title_setup');
 
 $head=user_admin_prepare_head();
 
-dol_fiche_head($head,'usergroupcard', $langs->trans("MenuUsersAndGroups"), 0, 'user');
+dol_fiche_head($head,'usergroupcard', $langs->trans("MenuUsersAndGroups"), -1, 'user');
 
 
 $dirmodels=array_merge(array('/'),(array) $conf->modules_parts['models']);
diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index fe582d56656..0b4c3c239f9 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -1057,7 +1057,7 @@ else
 			// Print mail content
 			print load_fiche_titre($langs->trans("EMail"), $form->textwithpicto($langs->trans("AvailableVariables"), $htmltext, 1, 'help', '', 0, 2, 'emailsubstitionhelp'), 'title_generic');
 			
-			dol_fiche_head('');
+			dol_fiche_head('', '', '', -1);
 			
 			print '<table class="border" width="100%">';
 
diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php
index 4beb49107d2..2016807efe9 100644
--- a/htdocs/core/lib/admin.lib.php
+++ b/htdocs/core/lib/admin.lib.php
@@ -812,7 +812,7 @@ function activateModule($value,$withdeps=1)
         return $ret;
     }
 
-    $result=$objMod->init();
+    $result=$objMod->init();    // Enable module
     if ($result <= 0) 
     {
         $ret['errors'][]=$objMod->error;
diff --git a/htdocs/core/menus/standard/auguria.lib.php b/htdocs/core/menus/standard/auguria.lib.php
index e95359e5683..d2d8e36b8ca 100644
--- a/htdocs/core/menus/standard/auguria.lib.php
+++ b/htdocs/core/menus/standard/auguria.lib.php
@@ -269,7 +269,7 @@ function print_left_auguria_menu($db,$menu_array_before,$menu_array_after,&$tabM
 		print '<div class="menu_titre" id="menu_titre_logo"></div>';
 		print '<div class="menu_top" id="menu_top_logo"></div>';
 		print '<div class="menu_contenu" id="menu_contenu_logo">';
-		print '<div class="center"><img title="'.dol_escape_htmltag($title).'" alt="" src="'.$urllogo.'" style="max-width: 80%"></div>'."\n";
+		print '<div class="center"><img title="'.dol_escape_htmltag($title).'" alt="" src="'.$urllogo.'" style="max-width: 70%"></div>'."\n";
 		print '</div>';
 		print '<div class="menu_end" id="menu_end_logo"></div>';
 		print '</div>'."\n";
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 4c873830948..b51292a0bb8 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -478,7 +478,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 		print '<div class="menu_titre" id="menu_titre_logo"></div>';
 		print '<div class="menu_top" id="menu_top_logo"></div>';
 		print '<div class="menu_contenu" id="menu_contenu_logo">';
-		print '<div class="center"><img class="mycompany" title="'.dol_escape_htmltag($title).'" alt="" src="'.$urllogo.'" style="max-width: 80%"></div>'."\n";
+		print '<div class="center"><img class="mycompany" title="'.dol_escape_htmltag($title).'" alt="" src="'.$urllogo.'" style="max-width: 70%"></div>'."\n";
 		print '</div>';
 		print '<div class="menu_end" id="menu_end_logo"></div>';
 		print '</div>'."\n";
diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index 48ce35f1532..d0559268c52 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -795,6 +795,37 @@ class DolibarrModules           // Can not be abstract, because we need to insta
     }
     
     
+    /**
+     * Gives the last author of activation
+     *
+     * @return  array       Array array('authorid'=>Id of last activation user, 'lastactivationdate'=>Date of last activation)
+     */
+    function getLastActivationInfo()
+    {
+        global $conf;
+        
+        $sql = "SELECT tms, note FROM ".MAIN_DB_PREFIX."const";
+        $sql.= " WHERE ".$this->db->decrypt('name')." = '".$this->const_name."'";
+        $sql.= " AND entity IN (0, ".$conf->entity.")";
+        
+        dol_syslog(get_class($this)."::getLastActiveDate", LOG_DEBUG);
+        $resql=$this->db->query($sql);
+        if (! $resql) $err++;
+        else
+        {
+            $obj=$this->db->fetch_object($resql);
+            $tmp=array();
+            if ($obj->note)
+            {
+                $tmp=json_decode($obj->note, true);
+            }
+            if ($obj) return array('authorid'=>$tmp['authorid'], 'ip'=>$tmp['ip'], 'lastactivationdate'=>$this->db->jdate($obj->tms));
+        }
+        
+        return array();
+    }
+    
+    
     /**
      * Insert constants for module activation
      *
@@ -802,7 +833,7 @@ class DolibarrModules           // Can not be abstract, because we need to insta
      */
     function _active()
     {
-        global $conf;
+        global $conf, $user;
 
         $err = 0;
 
@@ -817,10 +848,13 @@ class DolibarrModules           // Can not be abstract, because we need to insta
         $resql=$this->db->query($sql);
         if (! $resql) $err++;
 
-        $sql = "INSERT INTO ".MAIN_DB_PREFIX."const (name,value,visible,entity) VALUES";
+        $note=json_encode(array('authorid'=>$user->id, 'ip'=>$_SERVER['REMOTE_ADDR']));
+        
+        $sql = "INSERT INTO ".MAIN_DB_PREFIX."const (name, value, visible, entity, note) VALUES";
         $sql.= " (".$this->db->encrypt($this->const_name,1);
-        $sql.= ",".$this->db->encrypt('1',1);
-        $sql.= ",0,".$entity.")";
+        $sql.= ", ".$this->db->encrypt('1',1);
+        $sql.= ", 0, ".$entity;
+        $sql.= ", '".$this->db->escape($note)."')";
 
         dol_syslog(get_class($this)."::_active", LOG_DEBUG);
         $resql=$this->db->query($sql);
diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php
index 1245041d98a..81e3936d300 100644
--- a/htdocs/core/tpl/login.tpl.php
+++ b/htdocs/core/tpl/login.tpl.php
@@ -258,7 +258,7 @@ if (!empty($conf->global->MAIN_EASTER_EGG_COMMITSTRIP)) {
 <?php if ($main_home)
 {
 ?>
-	<div class="center login_main_home" style="max-width: 80%">
+	<div class="center login_main_home" style="max-width: 70%">
 	<?php echo $main_home; ?>
 	</div><br>
 <?php
diff --git a/htdocs/core/tpl/passwordforgotten.tpl.php b/htdocs/core/tpl/passwordforgotten.tpl.php
index bdc38b08873..ad29cbfcd3d 100644
--- a/htdocs/core/tpl/passwordforgotten.tpl.php
+++ b/htdocs/core/tpl/passwordforgotten.tpl.php
@@ -151,7 +151,7 @@ if (! empty($hookmanager->resArray['options'])) {
 </form>
 
 
-<div class="center login_main_home" style="max-width: 80%">
+<div class="center login_main_home" style="max-width: 70%">
 <?php if ($mode == 'dolibarr' || ! $disabled) { ?>
 	<font style="font-size: 12px;">
 	<?php echo $langs->trans('SendNewPasswordDesc'); ?>
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 8425aa2c4c6..5fd5cb57c8b 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -302,6 +302,8 @@ CurrentVersion=Dolibarr current version
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
 LastActivationDate=Latest activation date
+LastActivationAuthor=Latest activation author
+LastActivationIP=Latest activation IP
 UpdateServerOffline=Update server offline
 WithCounter=Manage a counter
 GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
@@ -1099,7 +1101,7 @@ WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least fo
 NewTranslationStringToShow=New translation string to show
 OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
 TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exists in any language files
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
+TotalNumberOfActivatedModules=Activated feature/modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found into PHP path
 YesInSummer=Yes in summer
diff --git a/htdocs/societe/admin/contact_extrafields.php b/htdocs/societe/admin/contact_extrafields.php
index 37db7d02e4c..2a60252f7f8 100644
--- a/htdocs/societe/admin/contact_extrafields.php
+++ b/htdocs/societe/admin/contact_extrafields.php
@@ -70,7 +70,7 @@ print load_fiche_titre($langs->trans("CompanySetup"),$linkback,'title_setup');
 
 $head = societe_admin_prepare_head();
 
-dol_fiche_head($head, 'attributes_contacts', $langs->trans("ThirdParties"), 0, 'company');
+dol_fiche_head($head, 'attributes_contacts', $langs->trans("ThirdParties"), -1, 'company');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
diff --git a/htdocs/societe/admin/societe.php b/htdocs/societe/admin/societe.php
index 517672d14ed..63ba12197fd 100644
--- a/htdocs/societe/admin/societe.php
+++ b/htdocs/societe/admin/societe.php
@@ -307,7 +307,7 @@ print load_fiche_titre($langs->trans("CompanySetup"),$linkback,'title_setup');
 
 $head = societe_admin_prepare_head();
 
-dol_fiche_head($head, 'general', $langs->trans("ThirdParties"), 0, 'company');
+dol_fiche_head($head, 'general', $langs->trans("ThirdParties"), -1, 'company');
 
 $dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
 
diff --git a/htdocs/societe/admin/societe_extrafields.php b/htdocs/societe/admin/societe_extrafields.php
index 89f44d53aa7..a722ec61b86 100644
--- a/htdocs/societe/admin/societe_extrafields.php
+++ b/htdocs/societe/admin/societe_extrafields.php
@@ -71,7 +71,7 @@ print load_fiche_titre($langs->trans("CompanySetup"),$linkback,'title_setup');
 
 $head = societe_admin_prepare_head();
 
-dol_fiche_head($head, 'attributes', $langs->trans("ThirdParties"), 0, 'company');
+dol_fiche_head($head, 'attributes', $langs->trans("ThirdParties"), -1, 'company');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
diff --git a/htdocs/theme/dolibarr_logo.png b/htdocs/theme/dolibarr_logo.png
old mode 100644
new mode 100755
index 3ee46b5155303f5f03b05594070a6c076e773636..5287d9dcc25bc48dddcc351dd4aa64fd83322463
GIT binary patch
literal 10289
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
DtGo)<

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

diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index f4d5c5c32bd..b6e1fa0569d 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -90,7 +90,7 @@ $colorbacklinepair1='248,248,248';    // line pair
 $colorbacklinepair2='248,248,248';    // line pair
 $colorbacklinepairhover='238,246,252';    // line pair
 $colorbackbody='255,255,255';
-$colortexttitlenotab='60,60,20';
+$colortexttitlenotab='100,60,20';
 $colortexttitle='0,0,0';
 $colortext='0,0,0';
 $colortextlink='0,0,120';
@@ -988,6 +988,9 @@ div.fiche {
 	<?php if (! empty($conf->dol_hide_leftmenu) && ! empty($conf->dol_hide_topmenu)) print 'margin-top: 4px;'."\n"; ?>
 	<?php if (! empty($conf->dol_hide_leftmenu)) print 'margin-bottom: 12px;'."\n"; ?>
 }
+div.fiche>table:first-child {
+	margin-bottom: 15px !important;
+}
 div.fichecenter {
 	/* margin-top: 10px; */
 	width: 100%;
@@ -2018,6 +2021,9 @@ a.tabTitle {
     white-space: nowrap;
 }
 
+a.tabunactive {
+    color: rgb(<?php print $colortextlink; ?>) !important;
+}
 a.tab:link, a.tab:visited, a.tab:hover, a.tab#active {
 	font-family: <?php print $fontlist ?>;
 	padding: 12px 9px 12px;
@@ -3034,7 +3040,7 @@ td.legendLabel { padding: 2px 2px 2px 0 !important; }
 div.titre {
 	font-family: <?php print $fontlist ?>;
 	font-size: 14px;
-	/* font-weight: bold; */
+	font-weight: bold;
 	color: rgb(<?php print $colortexttitlenotab; ?>);
 	text-decoration: none;
 	padding-top: 5px;
diff --git a/htdocs/user/admin/group_extrafields.php b/htdocs/user/admin/group_extrafields.php
index 99eab0e3a88..8dad702935f 100644
--- a/htdocs/user/admin/group_extrafields.php
+++ b/htdocs/user/admin/group_extrafields.php
@@ -71,7 +71,7 @@ print load_fiche_titre($langs->trans("UsersSetup"),$linkback,'title_setup');
 
 $head = user_admin_prepare_head();
 
-dol_fiche_head($head, 'attributes_group', $langs->trans("MenuUsersAndGroups"), 0, 'user');
+dol_fiche_head($head, 'attributes_group', $langs->trans("MenuUsersAndGroups"), -1, 'user');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
diff --git a/htdocs/user/admin/user_extrafields.php b/htdocs/user/admin/user_extrafields.php
index bb035d9f95f..28bf22da654 100644
--- a/htdocs/user/admin/user_extrafields.php
+++ b/htdocs/user/admin/user_extrafields.php
@@ -70,7 +70,7 @@ print load_fiche_titre($langs->trans("UsersSetup"),$linkback,'title_setup');
 
 $head = user_admin_prepare_head();
 
-dol_fiche_head($head, 'attributes', $langs->trans("MenuUsersAndGroups"), 0, 'user');
+dol_fiche_head($head, 'attributes', $langs->trans("MenuUsersAndGroups"), -1, 'user');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 

From f4447f9c87dc91386960d997c606c185f67d8cf2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 6 May 2017 21:39:00 +0200
Subject: [PATCH 239/505] Fix bookmark jump

---
 htdocs/bookmarks/bookmarks.lib.php | 21 ++++++++++++++++-----
 htdocs/theme/eldy/graph-color.php  |  2 +-
 htdocs/theme/eldy/style.css.php    |  8 ++++----
 3 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/htdocs/bookmarks/bookmarks.lib.php b/htdocs/bookmarks/bookmarks.lib.php
index 26089c3d07c..c1882ce4bf9 100644
--- a/htdocs/bookmarks/bookmarks.lib.php
+++ b/htdocs/bookmarks/bookmarks.lib.php
@@ -62,14 +62,15 @@ function printBookmarksList($aDb, $aLangs)
     */
 	$ret.= '<div class="menu_top"></div>'."\n";
 
-	$ret.= '<!-- form with GET method --><form id="actionbookmark" name="actionbookmark" method="GET" action="">';
+	$ret.= '<!-- form with POST method by default --><form id="actionbookmark" name="actionbookmark" method="POST" action="">';
 	$ret.= '<select name="bookmark" id="boxbookmark" class="flat boxcombo vmenusearchselectcombo">';
 	$ret.= '<option hidden value="listbookmarks" class="optiongrey" selected rel="'.DOL_URL_ROOT.'/bookmarks/list.php">'.$langs->trans('Bookmarks').'</option>';
-    $ret.= '<option value="listbookmark" class="optionblue" rel="'.dol_escape_js(DOL_URL_ROOT.'/bookmarks/list.php').'">'.dol_escape_htmltag($user->rights->bookmark->creer ? $langs->trans('EditBookmarks') : $langs->trans('ListOfBookmarks')).'...</option>';
+    $ret.= '<option value="listbookmark" class="optionblue" rel="'.dol_escape_htmltag(DOL_URL_ROOT.'/bookmarks/list.php').'">'.dol_escape_htmltag($user->rights->bookmark->creer ? $langs->trans('EditBookmarks') : $langs->trans('ListOfBookmarks')).'...</option>';
+	// Url to go on create new bookmark page
 	if ($user->rights->bookmark->creer)
 	{
     	$urltoadd=DOL_URL_ROOT.'/bookmarks/card.php?action=create&amp;urlsource='.urlencode($url).'&amp;url='.urlencode($url);
-    	$ret.= '<option value="newbookmark" class="optionblue" rel="'.dol_escape_js($urltoadd).'">'.dol_escape_htmltag($langs->trans('AddThisPageToBookmarks')).'...</option>';
+    	$ret.= '<option value="newbookmark" class="optionblue" rel="'.dol_escape_htmltag($urltoadd).'">'.dol_escape_htmltag($langs->trans('AddThisPageToBookmarks')).'...</option>';
 	}
 	// Menu with all bookmarks
 	if (! empty($conf->global->BOOKMARKS_SHOW_IN_MENU))
@@ -84,7 +85,7 @@ function printBookmarksList($aDb, $aLangs)
 			while ($i < $conf->global->BOOKMARKS_SHOW_IN_MENU && $obj = $db->fetch_object($resql))
 			{
 				//$ret.='<div class="menu_contenu">';
-			    $ret.='<option name="bookmark'.$obj->rowid.'" value="'.$obj->rowid.'" '.($obj->target == 1?' target="_blank"':'').' rel="'.dol_escape_js($obj->url).'">'.img_picto('','object_bookmark').' '.$obj->title.'</option>';
+			    $ret.='<option name="bookmark'.$obj->rowid.'" value="'.$obj->rowid.'" '.($obj->target == 1?' target="_blank"':'').' rel="'.dol_escape_htmltag($obj->url).'">'.img_picto('','object_bookmark').' '.$obj->title.'</option>';
 				/*$ret.='<a class="vsmenu" title="'.$obj->title.'" href="'.$obj->url.'"'.($obj->target == 1?' target="_blank"':'').'>';
 				if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) $ret.=' '.img_object('','bookmark').' ';
 				$ret.= dol_trunc($obj->title, 20).'</a><br>';*/
@@ -109,9 +110,19 @@ function printBookmarksList($aDb, $aLangs)
 	            var urlselected = jQuery("#boxbookmark option:selected").attr("rel");
 	            var urltarget = jQuery("#boxbookmark option:selected").attr("target");
 	            if (! urltarget) { urltarget=""; }
-	            console.log("We change select bookmark. We choose "+urlselected+" with target "+urltarget);
                 jQuery("form#actionbookmark").attr("target",urltarget);
 	            jQuery("form#actionbookmark").attr("action",urlselected);
+	    
+	            console.log("We change select bookmark. We choose urlselected="+urlselected+" with target="+urltarget);
+	            
+	            // Method is POST for internal link, GET for external
+	            if (urlselected.startsWith(\'http\'))
+	            {
+	                var newmethod=\'GET\';
+	                jQuery("form#actionbookmark").attr("method",newmethod);
+	                console.log("We change method to newmethod="+newmethod);
+	            }
+	    
 	            jQuery("#actionbookmark").submit();
 	       });';
 	$ret.='})</script>';
diff --git a/htdocs/theme/eldy/graph-color.php b/htdocs/theme/eldy/graph-color.php
index 5995303c34a..920fa7833af 100644
--- a/htdocs/theme/eldy/graph-color.php
+++ b/htdocs/theme/eldy/graph-color.php
@@ -28,7 +28,7 @@
 
 global $theme_bordercolor, $theme_datacolor, $theme_bgcolor, $theme_bgcoloronglet;
 $theme_bordercolor = array(235,235,224);
-$theme_datacolor = array(array(136,102,136), array(140,140,220), array(190,120,120), array(0,160,140), array(190,190,100), array(115,125,150), array(100,170,20), array(250,190,30), array(150,135,125), array(85,135,150), array(150,135,80), array(150,80,150));
+$theme_datacolor = array(array(136,102,136), array(0,130,110), array(140,140,220), array(190,120,120), array(190,190,100), array(115,125,150), array(100,170,20), array(250,190,30), array(150,135,125), array(85,135,150), array(150,135,80), array(150,80,150));
 $theme_bgcolor = array(hexdec('F4'),hexdec('F4'),hexdec('F4'));
 $theme_bgcoloronglet = array(hexdec('DE'),hexdec('E7'),hexdec('EC'));
 
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index b6e1fa0569d..3278b685c80 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -93,7 +93,7 @@ $colorbackbody='255,255,255';
 $colortexttitlenotab='100,60,20';
 $colortexttitle='0,0,0';
 $colortext='0,0,0';
-$colortextlink='0,0,120';
+$colortextlink='0,0,100';
 $fontsize='13';
 $fontsizesmaller='12';
 $useboldtitle=(isset($conf->global->THEME_ELDY_USEBOLDTITLE)?$conf->global->THEME_ELDY_USEBOLDTITLE:1);
@@ -2948,15 +2948,15 @@ div.error {
 
 /* Info admin */
 div.info {
-  color: #303035;
+  color: #fff;
   padding: 0.4em 0.4em 0.4em 0.4em;
   margin: 0.5em 0em 0.5em 0em;
   border: 1px solid #e0e0e0;
   -moz-border-radius: 4px;
   -webkit-border-radius: 4px;
   border-radius: 4px;
-  background: #EaE4Ea;
-  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
+  background: #806090;
+  /* text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); */
 }
 
 div.warning a, div.info a, div.error a {

From 46ff62fc871948f00ef1dceea973c9c79bee58bb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 6 May 2017 22:28:07 +0200
Subject: [PATCH 240/505] Work on inventory module debug

---
 htdocs/admin/stock.php                        |  2 +-
 htdocs/core/class/commonobject.class.php      | 34 +++++++++++-------
 htdocs/core/class/coreobject.class.php        |  2 --
 htdocs/core/menus/standard/eldy.lib.php       |  2 +-
 htdocs/core/modules/modStock.class.php        | 35 +++++++++++--------
 htdocs/install/mysql/tables/llx_fichinter.sql |  1 -
 htdocs/install/mysql/tables/llx_inventory.sql | 25 +++++++------
 htdocs/product/inventory/card.php             | 27 ++++++++------
 .../inventory/class/inventory.class.php       |  4 ++-
 .../product/inventory/tpl/inventory.tpl.php   |  4 +--
 10 files changed, 79 insertions(+), 57 deletions(-)

diff --git a/htdocs/admin/stock.php b/htdocs/admin/stock.php
index 72ff0f17a1b..050e00e6278 100644
--- a/htdocs/admin/stock.php
+++ b/htdocs/admin/stock.php
@@ -434,7 +434,7 @@ if ($virtualdiffersfromphysical)
 
 
 print '<br />';
-if ($conf->global->MAIN_LEVEL_FEATURES >= 2)
+if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
 {
 	$var=false;
 	print '<table class="noborder" width="100%">';
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 29dcc413221..947d99af545 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -4938,25 +4938,33 @@ abstract class CommonObject
 		
 		if(!empty($id)) $sql.= ' WHERE rowid = '.$id;
 		else  $sql.= ' WHERE ref = \''.$this->quote($ref).'\'';
-		
+
 		$res = $this->db->query($sql);
-		if($obj = $this->db->fetch_object($res))
+		if ($res)
 		{
-			$this->id = $id;
-			$this->set_vars_by_db($obj);
-			
-			$this->datec = $this->db->idate($obj->datec);
-			$this->tms = $this->db->idate($obj->tms);
-			
-			return $this->id;
+    		if ($obj = $this->db->fetch_object($res))
+    		{
+    			$this->id = $id;
+    			$this->set_vars_by_db($obj);
+    			
+    			$this->datec = $this->db->idate($obj->datec);
+    			$this->tms = $this->db->idate($obj->tms);
+    			
+    			return $this->id;
+    		}
+    		else
+    		{
+    			$this->error = $this->db->lasterror();
+    			$this->errors[] = $this->error;
+    			return -1;
+    		}
 		}
 		else
 		{
-			$this->error = $this->db->lasterror();
-			$this->errors[] = $this->error;
-			return -1;
+		    $this->error = $this->db->lasterror();
+		    $this->errors[] = $this->error;
+		    return -1;
 		}
-		
 	}
 
 	/**
diff --git a/htdocs/core/class/coreobject.class.php b/htdocs/core/class/coreobject.class.php
index 021213594f7..1456fb991c2 100644
--- a/htdocs/core/class/coreobject.class.php
+++ b/htdocs/core/class/coreobject.class.php
@@ -106,14 +106,12 @@ class CoreObject extends CommonObject
      */
 	public function fetch($id, $loadChild = true)
     {
-		
     	$res = $this->fetchCommon($id);
     	if($res>0) {
     		if ($loadChild) $this->fetchChild();
     	}
     	
     	return $res;
-		
 	}
 
 
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index b51292a0bb8..b7a372e50bd 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -1265,7 +1265,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 			}
 
 			// Inventory
-			if ($conf->global->MAIN_LEVEL_FEATURES >= 2)
+			if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
 			{
     			if (! empty($conf->stock->enabled))
     			{
diff --git a/htdocs/core/modules/modStock.class.php b/htdocs/core/modules/modStock.class.php
index e80966afb81..be6817062b6 100644
--- a/htdocs/core/modules/modStock.class.php
+++ b/htdocs/core/modules/modStock.class.php
@@ -117,32 +117,37 @@ class modStock extends DolibarrModules
 		$this->rights[4][4] = 'mouvement';
 		$this->rights[4][5] = 'creer';
 
-		if ($conf->global->MAIN_LEVEL_FEATURES >= 2) {
+		if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
 		
-		$this->rights[5][0] = 1006;
+		$this->rights[5][0] = 1011;
 		$this->rights[5][1] = 'inventoryReadPermission';	// Permission label
 		$this->rights[5][3] = 0; 					// Permission by default for new user (0/1)
-		$this->rights[5][4] = 'read';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		$this->rights[5][4] = 'advance_inventory';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		$this->rights[5][5] = 'read';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		
-		$this->rights[6][0] = 1007;
+		$this->rights[6][0] = 1012;
 		$this->rights[6][1] = 'inventoryCreatePermission';	// Permission label
 		$this->rights[6][3] = 0; 					// Permission by default for new user (0/1)
-		$this->rights[6][4] = 'create';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		$this->rights[6][4] = 'advance_inventory';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		$this->rights[6][5] = 'create';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		
-		$this->rights[7][0] = 1008;
+		$this->rights[7][0] = 1013;
 		$this->rights[7][1] = 'inventoryWritePermission';	// Permission label
 		$this->rights[7][3] = 0; 					// Permission by default for new user (0/1)
-		$this->rights[7][4] = 'write';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		$this->rights[7][4] = 'advance_inventory';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		$this->rights[7][5] = 'write';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		
-		$this->rights[7][0] = 1009;
-		$this->rights[7][1] = 'inventoryValidatePermission';	// Permission label
-		$this->rights[7][3] = 0; 					// Permission by default for new user (0/1)
-		$this->rights[7][4] = 'validate';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		$this->rights[8][0] = 1014;
+		$this->rights[8][1] = 'inventoryValidatePermission';	// Permission label
+		$this->rights[8][3] = 0; 					// Permission by default for new user (0/1)
+		$this->rights[8][4] = 'advance_inventory';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		$this->rights[8][5] = 'validate';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		
-		$this->rights[7][0] = 1010;
-		$this->rights[7][1] = 'inventoryChangePMPPermission';	// Permission label
-		$this->rights[7][3] = 0; 					// Permission by default for new user (0/1)
-		$this->rights[7][4] = 'changePMP';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		$this->rights[9][0] = 1015;
+		$this->rights[9][1] = 'inventoryChangePMPPermission';	// Permission label
+		$this->rights[9][3] = 0; 					// Permission by default for new user (0/1)
+		$this->rights[9][4] = 'advance_inventory';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		$this->rights[9][5] = 'changePMP';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		
 		}
 		
diff --git a/htdocs/install/mysql/tables/llx_fichinter.sql b/htdocs/install/mysql/tables/llx_fichinter.sql
index b3e2001f9c3..926a05a738e 100644
--- a/htdocs/install/mysql/tables/llx_fichinter.sql
+++ b/htdocs/install/mysql/tables/llx_fichinter.sql
@@ -43,5 +43,4 @@ create table llx_fichinter
   note_public		text,
   model_pdf			varchar(255),
   extraparams		varchar(255)				-- for stock other parameters with json format
-  
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_inventory.sql b/htdocs/install/mysql/tables/llx_inventory.sql
index f906699f5dd..ce1a2c93744 100644
--- a/htdocs/install/mysql/tables/llx_inventory.sql
+++ b/htdocs/install/mysql/tables/llx_inventory.sql
@@ -1,6 +1,6 @@
 -- ===================================================================
--- Copyright (C) 2012      Laurent Destailleur  <eldy@users.sourceforge.net>
--- Copyright (C) 2017	ATM Consulting		<support@atm-consulting.fr>
+-- Copyright (C) 2017   Laurent Destailleur  <eldy@users.sourceforge.net>
+-- Copyright (C) 2017	ATM Consulting		 <support@atm-consulting.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
@@ -19,13 +19,18 @@
 
 CREATE TABLE llx_inventory 
 ( 
-rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY, 
-datec datetime DEFAULT NULL,
-tms timestamp, 
-fk_warehouse integer DEFAULT 0, 
-entity integer DEFAULT 0, 
-status integer DEFAULT 0, 
-title varchar(255) NOT NULL, 
-date_inventory datetime DEFAULT NULL
+  rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY, 
+  entity integer DEFAULT 0, 
+  ref varchar(48),
+  datec datetime DEFAULT NULL,
+  tms timestamp, 
+  fk_user_author	integer,					-- user making creation
+  fk_user_modif     integer,                   -- user making last change
+  fk_user_valid		integer,                   -- valideur de la fiche
+  fk_warehouse integer DEFAULT 0, 
+  status integer DEFAULT 0, 
+  title varchar(255) NOT NULL, 
+  date_inventory datetime DEFAULT NULL,
+  import_key               varchar(14)       	-- import key
 ) 
 ENGINE=InnoDB;
diff --git a/htdocs/product/inventory/card.php b/htdocs/product/inventory/card.php
index 34e79da8a69..e47891a6d08 100644
--- a/htdocs/product/inventory/card.php
+++ b/htdocs/product/inventory/card.php
@@ -361,9 +361,9 @@ if ($action == 'create')
     dol_fiche_end();
     
     print '<div class="center">';
-    print '<input type="submit" class="button" value="'.$langs->trans('inventoryConfirmCreate').'" />';
+    print '<input type="submit" class="button" name="create" value="'.$langs->trans('inventoryConfirmCreate').'" />';
     print ' &nbsp; &nbsp; ';
-    print '<input type="submit" class="button" value="'.$langs->trans('inventoryConfirmCreate').'" />';
+    print '<input type="submit" class="button" name="cancel" value="'.$langs->trans('Cancel').'" />';
     print '</div>';
     
 	echo '</form>';
@@ -373,8 +373,14 @@ if ($action == 'create')
 if ($action == 'view' || $action == 'edit' ||  empty($action))
 {
     $object = new Inventory($db);
-    $object->fetch($id);
-
+    $result = $object->fetch($id);
+    if ($result < 0) dol_print_error($db, $object->error, $object->errors);
+    
+    $warehouse = new Entrepot($db);
+    $warehouse->fetch($object->fk_warehouse);
+    
+    
+    
 	if($action == 'changePMP')
 	{
 		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ApplyNewPMP'), $langs->trans('ConfirmApplyNewPMP', $object->getTitle()), 'confirm_changePMP', array(),'no',1);
@@ -396,18 +402,17 @@ if ($action == 'view' || $action == 'edit' ||  empty($action))
 		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id,$langs->trans('RegulateStock'),$langs->trans('ConfirmRegulateStock',$object->getTitle()),'confirm_regulate',array(),'no',1);
 	}
 	
-	$warehouse = new Entrepot($db);
-	$warehouse->fetch($object->fk_warehouse);
-	
 	print dol_get_fiche_head(inventoryPrepareHead($object, $langs->trans('inventoryOfWarehouse', $warehouse->libelle), empty($action) ? '': '&action='.$action));
 	
 	$lines = array();
 	card_line($object, $lines, $action);
 	
-	print '<b>'.$langs->trans('inventoryOnDate')." ".$object->getDate('date_inventory').'</b><br><br>';
+	print $langs->trans('Ref')." ".$object->ref.'<br>';
+	print $langs->trans('Date')." ".$object->getDate('date_inventory').'<br><br>';
 	
 	$objectTPL = array(
-		'id'=> $object->id
+	    'id'=> $object->id
+	    ,'ref'=> $object->ref
 		,'date_cre' => $object->getDate('date_cre', 'd/m/Y')
 		,'date_maj' => $object->getDate('date_maj', 'd/m/Y H:i')
 		,'fk_warehouse' => $object->fk_warehouse
@@ -608,8 +613,8 @@ function _headerList($view)
 	
 	?>
 			<tr style="background-color:#dedede;">
-				<th align="left" width="20%">&nbsp;&nbsp;Produit</th>
-				<th align="center"><?php echo $langs->trans('Warehouse'); ?></th>
+				<th class="titlefield"><?php echo $langs->trans('Product'); ?></th>
+				<th><?php echo $langs->trans('Warehouse'); ?></th>
 				<?php if (! empty($conf->barcode->enabled)) { ?>
 					<th align="center"><?php echo $langs->trans('Barcode'); ?></th>
 				<?php } ?>
diff --git a/htdocs/product/inventory/class/inventory.class.php b/htdocs/product/inventory/class/inventory.class.php
index 93bbb38f6e7..8cb1f56eb9d 100644
--- a/htdocs/product/inventory/class/inventory.class.php
+++ b/htdocs/product/inventory/class/inventory.class.php
@@ -69,6 +69,7 @@ class Inventory extends CoreObject
      */
 	protected $fields=array(
 		'fk_warehouse'=>array('type'=>'integer','index'=>true)
+	    ,'ref'=>array('type'=>'string','index'=>true)
 		,'entity'=>array('type'=>'integer','index'=>true)
 		,'status'=>array('type'=>'integer','index'=>true)
 		,'date_inventory'=>array('type'=>'date')
@@ -113,7 +114,8 @@ class Inventory extends CoreObject
         if(!$loadChild) $this->withChild = false;
         
 		$res = parent::fetch($id, $loadChild);
-		if($res > 0)
+
+		if ($res > 0)
 		{
 			$this->sortDet();
 			$this->amount = 0;
diff --git a/htdocs/product/inventory/tpl/inventory.tpl.php b/htdocs/product/inventory/tpl/inventory.tpl.php
index 2a1c3bc3ee4..05de0f4c002 100644
--- a/htdocs/product/inventory/tpl/inventory.tpl.php
+++ b/htdocs/product/inventory/tpl/inventory.tpl.php
@@ -80,7 +80,7 @@
 		<?php echo inventorySelectProducts($object); ?>
 		
 			<input class="button" type="submit" value="<?php echo $langs->trans('AddProduct'); ?>" />
-	</form>
+	</form><br>
 <?php } ?>
 
 <form action="<?php echo $_SERVER['PHP_SELF']; ?>" method="post">
@@ -92,7 +92,7 @@
 	<input type="hidden" name="action" value="save" />
 	<input type="hidden" name="id" value="<?php echo $object->id; ?>" />
 	
-	<table width="100%" class="border workstation">
+	<table width="100%" class="noborder workstation">
 		<?php
 		
 		_headerList($view); 

From 8c75fc0e52591c7463b8f4d01b3e25166dfef16a Mon Sep 17 00:00:00 2001
From: Laurent Dinclaux <laurent@gecka.nc>
Date: Sun, 7 May 2017 14:11:47 +1100
Subject: [PATCH 241/505] New-Caledonia uses the same bank accounts patterns
 than France

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

diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index 7867f9bd753..7149d5a60a0 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -1359,7 +1359,7 @@ class Account extends CommonObject
     {
         $country_code=$this->getCountryCode();
 
-        if (in_array($country_code,array('CH','FR','ES','GA','IT'))) return 1; // France, Spain, Gabon, ...
+        if (in_array($country_code,array('CH','FR','ES','GA','IT','NC'))) return 1; // France, Spain, Gabon, ...
         if (in_array($country_code,array('AU','BE','CA','DE','DK','GR','GB','ID','IE','IR','KR','NL','NZ','UK','US'))) return 2;      // Australia, England...
         return 0;
     }

From a3602ff6b48170db1f964031565932e5786969a0 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Mon, 8 May 2017 06:20:17 +0200
Subject: [PATCH 242/505] Add journal list in new movement card

---
 htdocs/accountancy/bookkeeping/card.php       | 66 +++++++++--------
 htdocs/accountancy/bookkeeping/list.php       |  9 ++-
 .../class/accountingjournal.class.php         | 71 +++++++++++--------
 .../core/class/html.formaccounting.class.php  | 22 +++++-
 4 files changed, 107 insertions(+), 61 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php
index ce0bd4d3aa2..055451016e9 100644
--- a/htdocs/accountancy/bookkeeping/card.php
+++ b/htdocs/accountancy/bookkeeping/card.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2013-2016 Olivier Geffroy      <jeff@jeffinfo.com>
  * Copyright (C) 2013-2016 Florian Henry        <florian.henry@open-concept.pro>
- * Copyright (C) 2013-2016 Alexandre Spangaro   <aspangaro.dolibarr@gmail.com>
+ * Copyright (C) 2013-2017 Alexandre Spangaro   <aspangaro@zendsi.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
@@ -18,9 +18,9 @@
  */
 
 /**
- * \file htdocs/accountancy/bookkeeping/card.php
+ * \file	htdocs/accountancy/bookkeeping/card.php
  * \ingroup Advanced accountancy
- * \brief Page to show book-entry
+ * \brief	Page to show book-entry
  */
 require '../../main.inc.php';
 
@@ -28,9 +28,14 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/accountancy/class/bookkeeping.class.php';
 require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
+require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php';
 
 // Langs
 $langs->load("accountancy");
+$langs->load("bank");
+$langs->load("bills");
+$langs->load("trips");
 
 // Security check
 $id = GETPOST('id', 'int');
@@ -211,6 +216,7 @@ llxHeader();
 
 $html = new Form($db);
 $formventilation = new FormVentilation($db);
+$formaccountancy = new FormAccounting($db);
 
 /*
  *  Confirmation to delete the command
@@ -223,26 +229,6 @@ if ($action == 'delete') {
 if ($action == 'create') {
 	print load_fiche_titre($langs->trans("CreateMvts"));
 
-	$code_journal_array = array (
-			$conf->global->ACCOUNTING_SELL_JOURNAL => $conf->global->ACCOUNTING_SELL_JOURNAL,
-			$conf->global->ACCOUNTING_PURCHASE_JOURNAL => $conf->global->ACCOUNTING_PURCHASE_JOURNAL,
-			$conf->global->ACCOUNTING_SOCIAL_JOURNAL => $conf->global->ACCOUNTING_SOCIAL_JOURNAL,
-			$conf->global->ACCOUNTING_MISCELLANEOUS_JOURNAL => $conf->global->ACCOUNTING_MISCELLANEOUS_JOURNAL,
-			$conf->global->ACCOUNTING_EXPENSEREPORT_JOURNAL => $conf->global->ACCOUNTING_EXPENSEREPORT_JOURNAL
-	);
-
-	$sql = 'SELECT DISTINCT accountancy_journal FROM ' . MAIN_DB_PREFIX . 'bank_account WHERE clos=0';
-	$resql = $db->query($sql);
-	if (! $resql) {
-		setEventMessages($db->lasterror, null, 'errors');
-	} else {
-		while ( $obj_bank = $db->fetch_object($resql) ) {
-			if (! empty($obj_bank->accountancy_journal)) {
-				$code_journal_array[$obj_bank->accountancy_journal] = $obj_bank->accountancy_journal;
-			}
-		}
-	}
-
 	$book = new BookKeeping($db);
 	$next_num_mvt = $book->getNextNumMvt();
     if (empty($next_num_mvt))
@@ -270,9 +256,10 @@ if ($action == 'create') {
 	print '</tr>';
 
 	print '<tr>';
-	print '<td class="fieldrequired">' . $langs->trans("Codejournal") . '</td>';
-	print '<td>' . $html->selectarray('code_journal', $code_journal_array) . '</td>';
-	print '</tr>';
+	print '<td class="fieldrequired">'.$langs->trans("AccountancyJournal").'</td>';
+	print '<td>';
+	print $formaccountancy->select_journal('', 'code_journal', '', 0, '', 1, 1, 1, 1);
+	print '</td></tr>';
 
 	print '<tr>';
 	print '<td>' . $langs->trans("Docref") . '</td>';
@@ -308,25 +295,46 @@ if ($action == 'create') {
 		print '<div class="fichecenter">';
 		
 		print '<table class="border" width="100%">';
+
 		print '<tr class="pair">';
 		print '<td class="titlefield">' . $langs->trans("NumMvts") . '</td>';
 		print '<td>' . $book->piece_num . '</td>';
 		print '</tr>';
+
 		print '<tr class="impair">';
 		print '<td>' . $langs->trans("Docdate") . '</td>';
 		print '<td>' . dol_print_date($book->doc_date, 'daytextshort') . '</td>';
 		print '</tr>';
+
 		print '<tr class="pair">';
 		print '<td>' . $langs->trans("Codejournal") . '</td>';
-		print '<td>' . $book->code_journal . '</td>';
-		print '</tr>';
+		print '<td>';	
+		$accountingjournal = new AccountingJournal($db);
+		$accountingjournal->fetch('',$book->code_journal);
+		print $accountingjournal->getNomUrl(0,1,1,'',1);	
+		print '</td></tr>';
+		
 		print '<tr class="impair">';
 		print '<td>' . $langs->trans("Docref") . '</td>';
 		print '<td>' . $book->doc_ref . '</td>';
 		print '</tr>';
+
+		$typelabel = $book->doc_type;
+		if ($typelabel == 'bank') {
+			$typelabel = $langs->trans('Bank');
+		}
+		if ($typelabel == 'customer_invoice') {
+			$typelabel = $langs->trans('CustomerInvoice');
+		}
+		if ($typelabel == 'supplier_invoice') {
+			$typelabel = $langs->trans('SupplierInvoice');
+		}
+		if ($typelabel == 'expense_report') {
+			$typelabel = $langs->trans('ExpenseReport');
+		}
 		print '<tr class="pair">';
 		print '<td>' . $langs->trans("Doctype") . '</td>';
-		print '<td>' . $book->doc_type . '</td>';
+		print '<td>' . $typelabel . '</td>';
 		print '</tr>';
 		print '</table>';
 		
diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index 75d0a63bf39..b382d855994 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2013-2016	Olivier Geffroy		<jeff@jeffinfo.com>
  * Copyright (C) 2013-2016	Florian Henry		<florian.henry@open-concept.pro>
- * Copyright (C) 2013-2016	Alexandre Spangaro	<aspangaro.dolibarr@gmail.com>
+ * Copyright (C) 2013-2017	Alexandre Spangaro	<aspangaro@zendsi.com>
  * Copyright (C) 2016	  	Laurent Destailleur <eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -31,6 +31,7 @@ require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
 require_once DOL_DOCUMENT_ROOT . '/accountancy/class/bookkeeping.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php';
+require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php';
 
 // Langs
 $langs->load("accountancy");
@@ -443,7 +444,11 @@ foreach ($object->lines as $line ) {
 	print '<td>' . $line->label_compte . '</td>';
 	print '<td align="right">' . price($line->debit) . '</td>';
 	print '<td align="right">' . price($line->credit) . '</td>';
-	print '<td align="center">' . $line->code_journal . '</td>';
+
+	$accountingjournal = new AccountingJournal($db);
+	$accountingjournal->fetch('',$line->code_journal);
+	print '<td align="center">' . $accountingjournal->getNomUrl(0,0,0,'',0) . '</td>';
+
 	print '<td align="center">';
 	print '<a href="./card.php?piece_num=' . $line->piece_num . '">' . img_edit() . '</a>&nbsp;';
 	print '<a href="' . $_SERVER['PHP_SELF'] . '?action=delmouv&mvt_num=' . $line->piece_num . $param . '&page=' . $page . '">' . img_delete() . '</a>';
diff --git a/htdocs/accountancy/class/accountingjournal.class.php b/htdocs/accountancy/class/accountingjournal.class.php
index 91924f08592..168934ee5a5 100644
--- a/htdocs/accountancy/class/accountingjournal.class.php
+++ b/htdocs/accountancy/class/accountingjournal.class.php
@@ -48,45 +48,60 @@ class AccountingJournal extends CommonObject
 	}
 	
 	/**
-	* Load an object from database
-	*
-	* @param	int		$id		Id of record to load
-	* @return	int				<0 if KO, >0 if OK
-	*/
-	function fetch($id)
+	 * Load an object from database
+	 *
+	 * @param	int		$rowid				Id of record to load
+	 * @param 	string 	$journal_code		Journal code
+	 * @return	int							<0 if KO, Id of record if OK and found
+	 */
+	function fetch($rowid = null, $journal_code = null)
 	{
-		$sql = "SELECT rowid, code, label, nature, active";
-		$sql.= " FROM ".MAIN_DB_PREFIX."accounting_journal";
-		$sql.= " WHERE rowid = ".$id;
-
-		dol_syslog(get_class($this)."::fetch sql=" . $sql, LOG_DEBUG);
-		$result = $this->db->query($sql);
-		if ( $result )
+		if ($rowid || $journal_code)
 		{
-			$obj = $this->db->fetch_object($result);
+			$sql = "SELECT rowid, code, label, nature, active";
+			$sql.= " FROM ".MAIN_DB_PREFIX."accounting_journal";
+			$sql .= " WHERE";
+			if ($rowid) {
+				$sql .= " rowid = '" . $rowid . "'";
+			} elseif ($journal_code) {
+				$sql .= " code = '" . $journal_code . "'";
+			}
 
-			$this->id			= $obj->rowid;
+			dol_syslog(get_class($this)."::fetch sql=" . $sql, LOG_DEBUG);
+			$result = $this->db->query($sql);
+			if ($result)
+			{
+				$obj = $this->db->fetch_object($result);
 
-			$this->code			= $obj->code;
-			$this->ref			= $obj->code;
-			$this->label		= $obj->label;
-			$this->nature	    = $obj->nature;
-			$this->active		= $obj->active;
+				if ($obj) {
+					$this->id			= $obj->rowid;
+					$this->rowid		= $obj->rowid;
 
-			return 1;
-		}
-		else
-		{
-			$this->error=$this->db->lasterror();
-			return -1;
+					$this->code			= $obj->code;
+					$this->ref			= $obj->code;
+					$this->label		= $obj->label;
+					$this->nature	    = $obj->nature;
+					$this->active		= $obj->active;
+
+					return $this->id;
+				} else {
+					return 0;
+				}
+			}
+			else
+			{
+				$this->error = "Error " . $this->db->lasterror();
+				$this->errors[] = "Error " . $this->db->lasterror();
+			}
 		}
+		return -1;
 	}
 	
 	/**
 	 * Return clicable name (with picto eventually)
 	 *
 	 * @param	int		$withpicto		0=No picto, 1=Include picto into link, 2=Only picto
-	 * @param	int		$withlabel		0=No label, 1=Include label of account
+	 * @param	int		$withlabel		0=No label, 1=Include label of journal
 	 * @param	int  	$nourl			1=Disable url
 	 * @param	string  $moretitle		Add more text to title tooltip
 	 * @param	int  	$notooltip		1=Disable tooltip
@@ -100,7 +115,7 @@ class AccountingJournal extends CommonObject
 
 		$result = '';
 
-		$url = DOL_URL_ROOT . '/accountancy/admin/journals_list.php';
+		$url = DOL_URL_ROOT . '/accountancy/admin/journals_list.php?id=35';
 
 		$picto = 'billr';
 		$label='';
diff --git a/htdocs/core/class/html.formaccounting.class.php b/htdocs/core/class/html.formaccounting.class.php
index 1a33f0fce60..a87b566d0d6 100644
--- a/htdocs/core/class/html.formaccounting.class.php
+++ b/htdocs/core/class/html.formaccounting.class.php
@@ -51,12 +51,14 @@ class FormAccounting extends Form
 	 * @param	int		$nature		Limit the list to a particular type of journals (1:various operations / 2:sale / 3:purchase / 4:bank / 9: has-new)
 	 * @param	int		$showempty	Add an empty field
 	 * @param	array	$event		Event options
+	 * @param	int		$select_in	0=selectid value is the journal rowid (default) or 1=selectid is journal code
+	 * @param	int		$select_out	Set value returned by select. 0=rowid (default), 1=code
 	 * @param	string	$morecss	More css non HTML object
 	 * @param	string	$usecache	Key to use to store result into a cache. Next call with same key will reuse the cache.
 	 *
 	 * @return	string				String with HTML select
 	 */
-	function select_journal($selectid, $htmlname = 'journal', $nature=0, $showempty = 0, $event = array(), $morecss='maxwidth300 maxwidthonsmartphone', $usecache='')
+	function select_journal($selectid, $htmlname = 'journal', $nature=0, $showempty = 0, $event = array(), $select_in = 0, $select_out = 0, $morecss='maxwidth300 maxwidthonsmartphone', $usecache='')
 	{
 		global $conf;
 
@@ -88,11 +90,27 @@ class FormAccounting extends Form
 
 			$out = ajax_combobox($htmlname, $event);
 
+    		$selected = 0;
 			while ($obj = $this->db->fetch_object($resql))
 			{
 				$label = $obj->code . ' - ' . $obj->label;
+
+    			$select_value_in = $obj->rowid;
 				$select_value_out = $obj->rowid;
 
+				// Try to guess if we have found default value
+    			if ($select_in == 1) {
+    				$select_value_in = $obj->code;
+    			}
+    			if ($select_out == 1) {
+    				$select_value_out = $obj->code;
+    			}
+    			// Remember guy's we store in database llx_accounting_bookkeeping the code of accounting_journal and not the rowid
+    			if ($selectid != '' && $selectid == $select_value_in) {
+    			    //var_dump("Found ".$selectid." ".$select_value_in);
+    				$selected = $select_value_out;
+    			}
+
 				$options[$select_value_out] = $label;
 			}
 			$this->db->free($resql);
@@ -103,7 +121,7 @@ class FormAccounting extends Form
 			}
 		}
 
-		$out .= Form::selectarray($htmlname, $options, $selectid, $showempty, 0, 0, '', 0, 0, 0, '', $morecss, 1);
+		$out .= Form::selectarray($htmlname, $options, $select, $showempty, 0, 0, '', 0, 0, 0, '', $morecss, 1);
 
 		return $out;
 	}

From b05d2c50e8b236036ba1e944ec72b92cc33603c9 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Mon, 8 May 2017 06:52:30 +0200
Subject: [PATCH 243/505] Add mode live

---
 htdocs/langs/en_US/stripe.lang  |  3 ++-
 htdocs/public/stripe/config.php | 20 ++++++++++++++++----
 htdocs/stripe/admin/stripe.php  | 33 +++++++++++++++++++++++++++++----
 3 files changed, 47 insertions(+), 9 deletions(-)

diff --git a/htdocs/langs/en_US/stripe.lang b/htdocs/langs/en_US/stripe.lang
index f19b4e44a52..3f85dc2d544 100644
--- a/htdocs/langs/en_US/stripe.lang
+++ b/htdocs/langs/en_US/stripe.lang
@@ -37,4 +37,5 @@ NewStripePaymentFailed=New Stripe payment tried but failed
 STRIPE_TEST_SECRET_KEY=Secret test key
 STRIPE_TEST_PUBLISHABLE_KEY=Publishable test key
 STRIPE_LIVE_SECRET_KEY=Secret live key
-STRIPE_LIVE_PUBLISHABLE_KEY=Publishable live key
\ No newline at end of file
+STRIPE_LIVE_PUBLISHABLE_KEY=Publishable live key
+StripeLiveEnabled=Stripe live enabled
\ No newline at end of file
diff --git a/htdocs/public/stripe/config.php b/htdocs/public/stripe/config.php
index b94617b4c69..dfd0ea6aa1a 100644
--- a/htdocs/public/stripe/config.php
+++ b/htdocs/public/stripe/config.php
@@ -29,9 +29,21 @@ require_once DOL_DOCUMENT_ROOT.'/stripe/lib/stripe.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/includes/stripe/init.php';
 
 //use \includes\stripe as stripe;
-$stripe = array(
-  "secret_key"      => $conf->global->STRIPE_TEST_SECRET_KEY,
-  "publishable_key" => $conf->global->STRIPE_TEST_PUBLISHABLE_KEY
-);
+$stripe = array();
+
+if(empty($conf->global->SKYPE_LIVE))
+{
+	$stripe = array(
+		"secret_key"      => $conf->global->STRIPE_TEST_SECRET_KEY,
+		"publishable_key" => $conf->global->STRIPE_TEST_PUBLISHABLE_KEY
+	);
+}
+else 
+{
+	$stripe = array(
+		"secret_key"      => $conf->global->STRIPE_LIVE_SECRET_KEY,
+		"publishable_key" => $conf->global->STRIPE_LIVE_PUBLISHABLE_KEY
+	);	
+}
 
 \includes\stripe::setApiKey($stripe['secret_key']);
\ No newline at end of file
diff --git a/htdocs/stripe/admin/stripe.php b/htdocs/stripe/admin/stripe.php
index 1882d1065b0..6274197a301 100644
--- a/htdocs/stripe/admin/stripe.php
+++ b/htdocs/stripe/admin/stripe.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2017		Alexandre Spangaro		<aspangaro@zendsi.com>
+ * Copyright (C) 2017		Olivier Geffroy			<jeff@jeffinfo.com>
  * Copyright (C) 2017		Saasprov				<saasprov@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -45,7 +46,7 @@ if ($action == 'setvalue' && $user->admin)
 {
 	$db->begin();
 
-    $result=dolibarr_set_const($db, "STRIPE_TEST",GETPOST('STRIPE_TEST','alpha'),'chaine',0,'',$conf->entity);
+    $result=dolibarr_set_const($db, "STRIPE_LIVE",GETPOST('STRIPE_LIVE','alpha'),'chaine',0,'',$conf->entity);
     if (! $result > 0) $error++;
 	$result=dolibarr_set_const($db, "STRIPE_TEST_SECRET_KEY",GETPOST('STRIPE_TEST_SECRET_KEY','alpha'),'chaine',0,'',$conf->entity);
 	if (! $result > 0) $error++;
@@ -76,6 +77,20 @@ if ($action == 'setvalue' && $user->admin)
     }
 }
 
+if ($action=="setlive")
+{
+	$liveenable = GETPOST('value','int');
+	$res = dolibarr_set_const($db, "STRIPE_LIVE", $liveenable,'yesno',0,'',$conf->entity);
+	if (! $res > 0) $error++;
+	if (! $error)
+	{
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	}
+	else
+	{
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
+}
 
 /*
  *	View
@@ -119,9 +134,19 @@ print '<td>'.$langs->trans("Value").'</td>';
 print "</tr>\n";
 
 $var=!$var;
-print '<tr '.$bc[$var].'><td class="fieldrequired">';
-print $langs->trans("STRIPE_TEST").'</td><td>';
-print $form->selectyesno("STRIPE_TEST",$conf->global->STRIPE_TEST,1);
+print '<tr '.$bc[$var].'>';
+print '<td class="titlefield fieldrequired">';
+print $langs->trans("StripeLiveEnabled").'</td><td>';
+if (!empty($conf->global->STRIPE_LIVE))
+{
+	print '<a href="'.$_SERVER['PHP_SELF'].'?action=setlive&value=0">';
+	print img_picto($langs->trans("Activated"),'switch_on');
+}
+else
+{
+	print '<a href="'.$_SERVER['PHP_SELF'].'?action=setlive&value=1">';
+	print img_picto($langs->trans("Disabled"),'switch_off');
+}
 print '</td></tr>';
 
 $var=!$var;

From fd6518182beb1b7fbd627f3c7d567207b2fd4730 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 8 May 2017 12:08:43 +0200
Subject: [PATCH 244/505] Fix can force tls version

---
 htdocs/core/lib/geturl.lib.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/lib/geturl.lib.php b/htdocs/core/lib/geturl.lib.php
index da9e38e6dae..808e4f0ef09 100644
--- a/htdocs/core/lib/geturl.lib.php
+++ b/htdocs/core/lib/geturl.lib.php
@@ -59,9 +59,11 @@ function getURLContent($url,$postorget='GET',$param='',$followlocation=1,$addhea
 	if (count($addheaders)) curl_setopt($ch, CURLOPT_HTTPHEADER, $addheaders);
 	curl_setopt($ch, CURLINFO_HEADER_OUT, true);	// To be able to retrieve request header and log it
 
-	// TLSv1 by default or change to TLSv1.2 in module configuration
-    //curl_setopt($ch, CURLOPT_SSLVERSION, (empty($conf->global->MAIN_CURL_SSLVERSION)?1:$conf->global->MAIN_CURL_SSLVERSION));
-    
+	// By default use tls decied by PHP.
+	// You can force, if supported a version like TLSv1 or TLSv1.2
+	if (! empty($conf->global->MAIN_CURL_SSLVERSION)) curl_setopt($ch, CURLOPT_SSLVERSION, $conf->global->MAIN_CURL_SSLVERSION);
+	//curl_setopt($ch, CURLOPT_SSLVERSION, 6); for tls 1.2
+	
     //turning off the server and peer verification(TrustManager Concept).
     curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, FALSE);
     curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, FALSE);

From d7d212bbe19ecc4fde6eccebe020abdd72186664 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 8 May 2017 12:31:37 +0200
Subject: [PATCH 245/505] Fix bad link to list

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

diff --git a/htdocs/fourn/facture/document.php b/htdocs/fourn/facture/document.php
index 52c44fc67b0..e68604fe092 100644
--- a/htdocs/fourn/facture/document.php
+++ b/htdocs/fourn/facture/document.php
@@ -93,7 +93,7 @@ if ($object->id > 0)
     
 	$totalpaye = $object->getSommePaiement();
 
-    $linkback = '<a href="' . DOL_URL_ROOT . '/compta/facture/list.php' . (! empty($socid) ? '?socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
+    $linkback = '<a href="' . DOL_URL_ROOT . '/fourn/facture/list.php' . (! empty($socid) ? '?socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
 
     $morehtmlref='<div class="refidno">';
     // Ref supplier

From dd71fdc82f26f88c202f86040baf20c753e4cc3d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 8 May 2017 21:00:23 +0200
Subject: [PATCH 246/505] Work on modulebuilder template

---
 htdocs/langs/en_US/modulebuilder.lang         |    4 +-
 htdocs/modulebuilder/index.php                |   62 +-
 htdocs/modulebuilder/template/.editorconfig   |   19 +
 htdocs/modulebuilder/template/.gitattributes  |   23 +
 htdocs/modulebuilder/template/.gitignore      |   16 +
 htdocs/modulebuilder/template/.tx/config      |    9 +
 htdocs/modulebuilder/template/COPYING         |  621 +++++
 htdocs/modulebuilder/template/README.md       |  221 ++
 htdocs/modulebuilder/template/admin/about.php |   94 +
 htdocs/modulebuilder/template/admin/setup.php |   79 +
 .../template/build/doxygen/mymodule.doxyfile  | 2419 +++++++++++++++++
 .../template/build/makepack-dolibarrmodule.pl |  388 +++
 .../template/build/makepack-mymodule.conf     |   26 +
 .../template/class/MyTrigger.php              |   51 +
 .../template/class/ParsedownDolibarr.php      |   48 +
 .../template/class/actions_mymodule.class.php |   85 +
 .../template/class/myclass.class.php          |  361 +++
 .../template/core/boxes/mybox.php             |  195 ++
 .../core/modules/modMyModule.class.php        |  719 +++++
 .../template/core/tpl/mytemplate.tpl.php      |   28 +
 ...terface_99_modMyModule_MyTrigger.class.php |  580 ++++
 .../modulebuilder/template/css/mycss.css.php  |   27 +
 .../template/dev/codesniffer/DolibarrPSR2.xml |   12 +
 .../template/dev/dolistore/README.md          |   87 +
 .../template/dev/dolistore/keywords-de.txt    |    0
 .../template/dev/dolistore/keywords-en.txt    |    0
 .../template/dev/dolistore/keywords-es.txt    |    0
 .../template/dev/dolistore/keywords-fr.txt    |    0
 .../template/dev/dolistore/keywords-it.txt    |    0
 .../template/dev/dolistore/long_desc-de.html  |    0
 .../template/dev/dolistore/long_desc-en.html  |    0
 .../template/dev/dolistore/long_desc-es.html  |    0
 .../template/dev/dolistore/long_desc-fr.html  |    0
 .../template/dev/dolistore/long_desc-it.html  |    0
 .../template/dev/dolistore/name-de.txt        |    1 +
 .../template/dev/dolistore/name-en.txt        |    1 +
 .../template/dev/dolistore/name-es.txt        |    1 +
 .../template/dev/dolistore/name-fr.txt        |    1 +
 .../template/dev/dolistore/name-it.txt        |    1 +
 .../template/dev/dolistore/short_desc-de.html |    0
 .../template/dev/dolistore/short_desc-en.html |    0
 .../template/dev/dolistore/short_desc-es.html |    0
 .../template/dev/dolistore/short_desc-fr.html |    0
 .../template/dev/dolistore/short_desc-it.html |    0
 .../template/dev/git-hooks/post-commit        |    2 +
 .../template/dev/git-hooks/pre-commit         |    2 +
 .../template/dev/git-hooks/pre-push           |    2 +
 .../modulebuilder/template/dev/img/README.md  |   53 +
 .../template/dev/img/gfdl-129x44.png          |  Bin 0 -> 4709 bytes
 .../template/dev/img/gfdl-66x23.png           |  Bin 0 -> 2453 bytes
 .../template/dev/img/gfdl-logo.svg            |  110 +
 .../template/dev/img/gpl-v3-logo.svg          |  389 +++
 .../template/dev/img/gplv3-127x51.png         |  Bin 0 -> 3471 bytes
 .../template/dev/img/gplv3-88x31.png          |  Bin 0 -> 2666 bytes
 .../template/dev/img/mymodule.svg             |   70 +
 .../modulebuilder/template/dev/newmodule.sh   |   68 +
 .../modulebuilder/template/doc/user/Makefile  |  225 ++
 .../modulebuilder/template/doc/user/make.bat  |  281 ++
 .../template/doc/user/source/conf.py          |  428 +++
 .../template/doc/user/source/index.rst        |   22 +
 htdocs/modulebuilder/template/img/gfdl.png    |  Bin 0 -> 4709 bytes
 htdocs/modulebuilder/template/img/gplv3.png   |  Bin 0 -> 2666 bytes
 .../modulebuilder/template/img/mymodule.png   |  Bin 0 -> 683 bytes
 .../template/img/object_mymodule.png          |  Bin 0 -> 360 bytes
 htdocs/modulebuilder/template/js/myjs.js.php  |   27 +
 .../template/langs/en_US/mymodule.lang        |   51 +
 .../template/langs/fr_FR/mymodule.lang        |   51 +
 .../template/lib/mymodule.lib.php             |   61 +
 htdocs/modulebuilder/template/mypage.php      |  135 +
 htdocs/modulebuilder/template/phpdoc.dist.xml |   30 +
 .../template/scripts/myscript.php             |  203 ++
 htdocs/modulebuilder/template/sql/data.sql    |   19 +
 .../template/sql/llx_mytable.key.sql          |   17 +
 .../template/sql/llx_mytable.sql              |   22 +
 .../template/sql/update_x.x.x-y.y.y.sql       |   15 +
 .../functional/MyModuleFunctionalTest.php     |  291 ++
 .../template/test/unit/MyClassTest.php        |  104 +
 htdocs/theme/eldy/style.css.php               |    5 +-
 78 files changed, 8853 insertions(+), 9 deletions(-)
 create mode 100644 htdocs/modulebuilder/template/.editorconfig
 create mode 100644 htdocs/modulebuilder/template/.gitattributes
 create mode 100644 htdocs/modulebuilder/template/.gitignore
 create mode 100644 htdocs/modulebuilder/template/.tx/config
 create mode 100644 htdocs/modulebuilder/template/COPYING
 create mode 100644 htdocs/modulebuilder/template/README.md
 create mode 100644 htdocs/modulebuilder/template/admin/about.php
 create mode 100644 htdocs/modulebuilder/template/admin/setup.php
 create mode 100644 htdocs/modulebuilder/template/build/doxygen/mymodule.doxyfile
 create mode 100644 htdocs/modulebuilder/template/build/makepack-dolibarrmodule.pl
 create mode 100644 htdocs/modulebuilder/template/build/makepack-mymodule.conf
 create mode 100644 htdocs/modulebuilder/template/class/MyTrigger.php
 create mode 100644 htdocs/modulebuilder/template/class/ParsedownDolibarr.php
 create mode 100644 htdocs/modulebuilder/template/class/actions_mymodule.class.php
 create mode 100644 htdocs/modulebuilder/template/class/myclass.class.php
 create mode 100644 htdocs/modulebuilder/template/core/boxes/mybox.php
 create mode 100644 htdocs/modulebuilder/template/core/modules/modMyModule.class.php
 create mode 100644 htdocs/modulebuilder/template/core/tpl/mytemplate.tpl.php
 create mode 100644 htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_MyTrigger.class.php
 create mode 100644 htdocs/modulebuilder/template/css/mycss.css.php
 create mode 100644 htdocs/modulebuilder/template/dev/codesniffer/DolibarrPSR2.xml
 create mode 100644 htdocs/modulebuilder/template/dev/dolistore/README.md
 create mode 100644 htdocs/modulebuilder/template/dev/dolistore/keywords-de.txt
 create mode 100644 htdocs/modulebuilder/template/dev/dolistore/keywords-en.txt
 create mode 100644 htdocs/modulebuilder/template/dev/dolistore/keywords-es.txt
 create mode 100644 htdocs/modulebuilder/template/dev/dolistore/keywords-fr.txt
 create mode 100644 htdocs/modulebuilder/template/dev/dolistore/keywords-it.txt
 create mode 100644 htdocs/modulebuilder/template/dev/dolistore/long_desc-de.html
 create mode 100644 htdocs/modulebuilder/template/dev/dolistore/long_desc-en.html
 create mode 100644 htdocs/modulebuilder/template/dev/dolistore/long_desc-es.html
 create mode 100644 htdocs/modulebuilder/template/dev/dolistore/long_desc-fr.html
 create mode 100644 htdocs/modulebuilder/template/dev/dolistore/long_desc-it.html
 create mode 100644 htdocs/modulebuilder/template/dev/dolistore/name-de.txt
 create mode 100644 htdocs/modulebuilder/template/dev/dolistore/name-en.txt
 create mode 100644 htdocs/modulebuilder/template/dev/dolistore/name-es.txt
 create mode 100644 htdocs/modulebuilder/template/dev/dolistore/name-fr.txt
 create mode 100644 htdocs/modulebuilder/template/dev/dolistore/name-it.txt
 create mode 100644 htdocs/modulebuilder/template/dev/dolistore/short_desc-de.html
 create mode 100644 htdocs/modulebuilder/template/dev/dolistore/short_desc-en.html
 create mode 100644 htdocs/modulebuilder/template/dev/dolistore/short_desc-es.html
 create mode 100644 htdocs/modulebuilder/template/dev/dolistore/short_desc-fr.html
 create mode 100644 htdocs/modulebuilder/template/dev/dolistore/short_desc-it.html
 create mode 100644 htdocs/modulebuilder/template/dev/git-hooks/post-commit
 create mode 100644 htdocs/modulebuilder/template/dev/git-hooks/pre-commit
 create mode 100644 htdocs/modulebuilder/template/dev/git-hooks/pre-push
 create mode 100644 htdocs/modulebuilder/template/dev/img/README.md
 create mode 100644 htdocs/modulebuilder/template/dev/img/gfdl-129x44.png
 create mode 100644 htdocs/modulebuilder/template/dev/img/gfdl-66x23.png
 create mode 100644 htdocs/modulebuilder/template/dev/img/gfdl-logo.svg
 create mode 100644 htdocs/modulebuilder/template/dev/img/gpl-v3-logo.svg
 create mode 100644 htdocs/modulebuilder/template/dev/img/gplv3-127x51.png
 create mode 100644 htdocs/modulebuilder/template/dev/img/gplv3-88x31.png
 create mode 100644 htdocs/modulebuilder/template/dev/img/mymodule.svg
 create mode 100644 htdocs/modulebuilder/template/dev/newmodule.sh
 create mode 100644 htdocs/modulebuilder/template/doc/user/Makefile
 create mode 100644 htdocs/modulebuilder/template/doc/user/make.bat
 create mode 100644 htdocs/modulebuilder/template/doc/user/source/conf.py
 create mode 100644 htdocs/modulebuilder/template/doc/user/source/index.rst
 create mode 100644 htdocs/modulebuilder/template/img/gfdl.png
 create mode 100644 htdocs/modulebuilder/template/img/gplv3.png
 create mode 100644 htdocs/modulebuilder/template/img/mymodule.png
 create mode 100644 htdocs/modulebuilder/template/img/object_mymodule.png
 create mode 100644 htdocs/modulebuilder/template/js/myjs.js.php
 create mode 100644 htdocs/modulebuilder/template/langs/en_US/mymodule.lang
 create mode 100644 htdocs/modulebuilder/template/langs/fr_FR/mymodule.lang
 create mode 100644 htdocs/modulebuilder/template/lib/mymodule.lib.php
 create mode 100644 htdocs/modulebuilder/template/mypage.php
 create mode 100644 htdocs/modulebuilder/template/phpdoc.dist.xml
 create mode 100644 htdocs/modulebuilder/template/scripts/myscript.php
 create mode 100644 htdocs/modulebuilder/template/sql/data.sql
 create mode 100644 htdocs/modulebuilder/template/sql/llx_mytable.key.sql
 create mode 100644 htdocs/modulebuilder/template/sql/llx_mytable.sql
 create mode 100644 htdocs/modulebuilder/template/sql/update_x.x.x-y.y.y.sql
 create mode 100644 htdocs/modulebuilder/template/test/functional/MyModuleFunctionalTest.php
 create mode 100644 htdocs/modulebuilder/template/test/unit/MyClassTest.php

diff --git a/htdocs/langs/en_US/modulebuilder.lang b/htdocs/langs/en_US/modulebuilder.lang
index 9979760bc4f..ef86062bbd0 100644
--- a/htdocs/langs/en_US/modulebuilder.lang
+++ b/htdocs/langs/en_US/modulebuilder.lang
@@ -1,2 +1,4 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tools give you utilites to build your own module. Your modules will be generated into the first alternative directory: <strong>%s</strong>.
+ModuleBuilderDesc=This tools give you utilites to build your own module.
+ModuleBuilderDesc2=Path were modules are generated (first alternative directory defined into %s): <strong>%s</strong>.
+They are detected when the file %s exists in root of module directory.
diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index 182268a5f06..38339d643c1 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2010 Regis Houssin        <regis.houssin@capnetworks.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -29,9 +29,43 @@ $langs->load("admin");
 $langs->load("modulebuilder");
 $langs->load("other");
 
+$action=GETPOST('action','alpha');
+$confirm=GETPOST('confirm','alpha');
+
 // Security check
 if (! $user->admin && empty($conf->global->MODULEBUILDER_FOREVERYONE)) accessforbidden('ModuleBuilderNotAllowed');
 
+$modulename=dol_sanitizeFileName(GETPOST('modulename','alpha'));
+
+// Dir for custom dirs
+$tmp=explode(',', $dolibarr_main_document_root_alt);
+$dircustom = $tmp[0];
+
+
+
+/*
+ * Actions
+ */
+
+if ($dircustom && $action == 'initmodule' && $modulename)
+{
+    $srcfile = DOL_DOCUMENT_ROOT.'/modulebuilder/skeletons';
+    $destfile = $dircustom.'/'.$modulename;
+    //$result = dolCopyDir($srcfile, $destfile, 0, 0);
+    
+    dol_mkdir($destfile);
+    
+    fopen($destfile, $mode)
+    
+    if ($result > 0)
+    {
+        setEventMessages('ModuleInitialized', null);
+    }
+    else
+    {
+        setEventMessages($langs->trans("ErrorFailedToCopyDir"), null, 'errors');
+    }
+}
 
 
 /*
@@ -48,14 +82,24 @@ $text=$langs->trans("ModuleBuilder");
 
 print load_fiche_titre($text, '', 'title_setup');
 
-$tmp=explode(',', $dolibarr_main_document_root_alt);
-$dircustom = $tmp[0];
-
 // Show description of content
-print $langs->trans("ModuleBuilderDesc", $dircustom).'<br><br>';
+print $langs->trans("ModuleBuilderDesc").'<br>';
+print $langs->trans("ModuleBuilderDesc2", 'conf/conf.php', $dircustom).'<br>';
+print '<br>';
 
 
+// New module
+print '<div class="modulebuilderbox">';
+print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<input type="hidden" name="action" value="initmodule">';
+print '<input type="text" name="modulename" value="" placeholder="'.dol_escape_htmltag($langs->trans("ModuleName")).'">';
+print '<input type="submit" class="button" name="create" value="'.dol_escape_htmltag($langs->trans("CreateNewModule")).'">';
+print '</form>';
+print '<div>';
 
+
+$listofmodules=array();
 /*
 if (!empty($conf->modulebuilder->enabled) && $mainmenu == 'modulebuilder')	// Entry for Module builder
 {
@@ -73,7 +117,7 @@ if (!empty($conf->modulebuilder->enabled) && $mainmenu == 'modulebuilder')	// En
                     $fullname = $dircustom['fullname'];
                     if (dol_is_file($fullname.'/modulebuilder.txt'))
                     {
-                        print '<div class="boxstats">'.$module.'</div>';
+                        $listofmodules[$module]=$fullname;
                     }
                 }
             }
@@ -84,7 +128,11 @@ if (!empty($conf->modulebuilder->enabled) && $mainmenu == 'modulebuilder')	// En
         $newmenu->add('', 'NoGeneratedModuleFound', 0, 0);
     }*/
 
-
+foreach($listofmodules as $modules => $fullname)
+{
+    print '<div class="modulebuilderbox>'.$module.'</div>';
+}
+            
 
 llxFooter();
 
diff --git a/htdocs/modulebuilder/template/.editorconfig b/htdocs/modulebuilder/template/.editorconfig
new file mode 100644
index 00000000000..2df455f0d4f
--- /dev/null
+++ b/htdocs/modulebuilder/template/.editorconfig
@@ -0,0 +1,19 @@
+# EditorConfig is awesome: http://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+# Unix-style newlines with a newline ending every file
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+[*.php]
+indent_style = tab
+[*.js]
+indent_style = tab
+[*.css]
+indent_style = tab
+[*.xml]
+indent_style = tab
+[*.md]
+trim_trailing_whitespace = false
diff --git a/htdocs/modulebuilder/template/.gitattributes b/htdocs/modulebuilder/template/.gitattributes
new file mode 100644
index 00000000000..58065c729fc
--- /dev/null
+++ b/htdocs/modulebuilder/template/.gitattributes
@@ -0,0 +1,23 @@
+# Set default behaviour, in case users don't have core.autocrlf set.
+* text=auto
+
+
+# Explicitly declare text files we want to always be normalized and converted 
+# to native line endings on checkout.
+*.php 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
+*.bat text eol=crlf
+
+# Denote all files that are truly binary and should not be modified.
+*.ico binary
+*.png binary
+*.jpg binary
+*.odt binary
+*.odf binary
diff --git a/htdocs/modulebuilder/template/.gitignore b/htdocs/modulebuilder/template/.gitignore
new file mode 100644
index 00000000000..e950cee245d
--- /dev/null
+++ b/htdocs/modulebuilder/template/.gitignore
@@ -0,0 +1,16 @@
+# Generated binaries
+/build/*.zip
+# Doxygen generated documentation
+/build/doxygen/doxygen_warnings.log
+/doc/code/doxygen
+# Composer managed dependencies
+/vendor
+/dev/bin
+# PHPdocumentor generated files
+/build/phpdoc
+/doc/code/phpdoc
+# Sphinx generated files
+/doc/user/build
+/.settings/
+/.buildpath
+/.project
\ No newline at end of file
diff --git a/htdocs/modulebuilder/template/.tx/config b/htdocs/modulebuilder/template/.tx/config
new file mode 100644
index 00000000000..1743c5d00dd
--- /dev/null
+++ b/htdocs/modulebuilder/template/.tx/config
@@ -0,0 +1,9 @@
+[main]
+host = https://www.transifex.com
+lang_map = uz: uz_UZ
+
+[mymodule.mymodule]
+file_filter = langs/<lang>/mymodule.lang
+source_file = langs/en_US/mymodule.lang
+source_lang = en_US
+type = MOZILLAPROPERTIES
diff --git a/htdocs/modulebuilder/template/COPYING b/htdocs/modulebuilder/template/COPYING
new file mode 100644
index 00000000000..94a04532226
--- /dev/null
+++ b/htdocs/modulebuilder/template/COPYING
@@ -0,0 +1,621 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
diff --git a/htdocs/modulebuilder/template/README.md b/htdocs/modulebuilder/template/README.md
new file mode 100644
index 00000000000..5e2af06a430
--- /dev/null
+++ b/htdocs/modulebuilder/template/README.md
@@ -0,0 +1,221 @@
+Dolibarr Module Template (aka My Module)
+========================================
+
+This is a full featured module template for Dolibarr.
+It's a tool for module developers to kickstart their project and give an hands-on sample of which features Dolibarr has to offer for module development.
+
+If you're not a module developer you have no use for this.
+
+Documentation
+-------------
+
+[Module tutorial](http://wiki.dolibarr.org/index.php/Module_development)
+
+[Dolibarr development](http://wiki.dolibarr.org/index.php/Developer_documentation)
+
+### Translations
+
+Dolibarr uses [Transifex](http://transifex.com) to manage it's translations.
+
+This template also contains a sample configuration for Transifex managed translations under the hidden [.tx](.tx) directory.
+
+For more informations, see the [translator's documentation](http://wiki.dolibarr.org/index.php/Translator_documentation).
+
+There is a [Transifex project](http://transifex.com/projects/p/dolibarr-module-template) for this module.
+
+Install
+-------
+
+### Manually
+
+- Make sure Dolibarr (>= 3.3.x) is already installed and configured on your workstation or development server.
+
+- In your Dolibarr installation directory, edit the ```htdocs/conf/conf.php``` file
+
+- Find the following lines:
+    ```php
+    //$dolibarr_main_url_root_alt ...
+    //$dolibarr_main_document_root_alt ...
+    ```
+
+- Uncomment these lines (delete the leading ```//```) and assign a sensible value according to your Dolibarr installation
+
+    For example :
+
+    - UNIX:
+        ```php
+        $dolibarr_main_url_root = 'http://localhost/Dolibarr/htdocs';
+        $dolibarr_main_document_root = '/var/www/Dolibarr/htdocs';
+        $dolibarr_main_url_root_alt = '/custom';
+        $dolibarr_main_document_root_alt = '/var/www/Dolibarr/htdocs/custom';
+        ```
+
+    - Windows:
+        ```php
+        $dolibarr_main_url_root = 'http://localhost/Dolibarr/htdocs';
+        $dolibarr_main_document_root = 'C:/My Web Sites/Dolibarr/htdocs';
+        $dolibarr_main_url_root_alt = '/custom';
+        $dolibarr_main_document_root_alt = 'C:/My Web Sites/Dolibarr/htdocs/custom';
+        ```
+
+    For more information about the ```conf.php``` file take a look at the conf.php.example file.
+
+*Note that for Dolibarr versions before 3.5, the ```$dolibarr_main_url_root_alt``` has to be an absolute path*
+
+- Clone the repository in ```$dolibarr_main_document_root_alt/mymodule```
+
+*(You may have to create the ```htdocs/custom``` directory first if it doesn't exist yet.)*
+```sh
+git clone git@github.com:Dolibarr/dolibarr-module-template.git mymodule
+```
+
+- Install [Composer](https://getcomposer.org) dependencies:
+```sh
+composer install
+```
+
+Follow the [final steps](#final_steps).
+
+### Using [Composer](https://getcomposer.org)
+Require this repository from Dolibarr's composer:
+```json
+{
+  "repositories": [
+    {
+      "type": "vcs",
+      "url": "https://github.com/dolibarr/dolibarr-module-template"
+    }
+  ],
+  "require": {
+    "dolibarr/mymodule": "dev-master"
+  }
+}
+```
+
+Run
+```sh
+composer update
+```
+
+Follow the [final steps](#final_steps).
+
+### <a name="final_steps"></a>Final steps
+
+From your browser:
+
+  - Log into Dolibarr as a super-administrator
+  - Under "Setup" -> "Other setup", set ```MAIN_FEATURES_LEVEL``` to ```2```
+  - Go to "Setup" -> "Modules"
+  - The module is under one of the tabs
+  - You should now be able to enable the new module and start coding ;)
+
+Provided tools
+--------------
+
+### Starting a new module
+
+A [script](dev/newmodule.sh) allows you to rename most of the code to your own module name.  
+It requires ```find```, ```sed``` and ```rename``` commands on your system.  
+Just make sure you provide a CamelCase name.
+```sh
+./dev/newmodule.sh [NewName]
+```
+
+Some work still has to be done manually:
+- Rename the directory holding the code
+- Maybe rename some other bits (Search for 'my' in filenames and code)
+- Update your module ID in the module descriptor
+- Update your language files
+    - Keywords based on the module ID
+    - String referencing the template
+- Remove the features you don't plan to use
+- Fill the copyright notices at the top of each file
+- Add your logo: see [images README](dev/img/README.md) for specifications
+- Start a new GIT history 
+```
+git checkout --orphan [new_branch_name]
+```
+- Build an awesome module ;)
+
+### Composer scripts
+
+Only the main commands are listed here.  
+See the [composer comments](composer-comments.md) or the [composer.json](composer.json) itself for more informations.
+
+#### Check
+
+Run a linter, a PHP compatibility version checker and checks coding style.
+```sh
+composer check
+```
+
+#### Test
+  
+Run unit and functional tests.
+```sh
+composer test
+```
+
+#### Doc
+Build code and user documentation.
+
+#### Release
+
+Run the checks and tests then build a distribution ZIP.
+```sh
+composer release
+```
+
+#### Git hooks
+
+Optional [GIT hooks](https://git-scm.com/book/it/v2/Customizing-Git-Git-Hooks) are provided.
+These are just wrappers calling composer scripts.  
+They ensure best practices are followed during module development.  
+
+Install:
+```sh
+composer git_hooks_install
+```
+
+Remove:
+```sh
+composer git_hooks_remove
+```
+
+## Publishing the module
+The de-facto standard for publishing and marketing modules for Dolibarr is the [Dolistore](https://www.dolistore.com).  
+Templates for required images and texts are [provided](dev/dolistore).  
+Check the dedicated [README](dev/dolistore/README.md) for more informations.
+
+Contributions
+-------------
+
+Feel free to contribute and report defects on our [issue tracker](http://github.com/Dolibarr/dolibarr-module-template/issues).
+
+Licenses
+--------
+
+### Main code
+
+![GPLv3 logo](img/gplv3.png)
+
+GPLv3 or (at your option) any later version.
+
+See [COPYING](COPYING) for more information.
+
+### Other Licenses
+
+#### [Parsedown](http://parsedown.org/)
+
+Used to display this README in the module's about page.  
+Licensed under MIT.
+
+#### [GNU Licenses logos](https://www.gnu.org/graphics/license-logos.html)
+
+Public domain
+
+#### Documentation
+
+All texts and readmes.
+
+![GFDL logo](img/gfdl.png)
diff --git a/htdocs/modulebuilder/template/admin/about.php b/htdocs/modulebuilder/template/admin/about.php
new file mode 100644
index 00000000000..6953af2ef38
--- /dev/null
+++ b/htdocs/modulebuilder/template/admin/about.php
@@ -0,0 +1,94 @@
+<?php
+/* <one line to give the program's name and a brief idea of what it does.>
+ * Copyright (C) <year>  <name of author>
+ *
+ * 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    admin/about.php
+ * \ingroup mymodule
+ * \brief   About page of module MyModule.
+ *
+ * MyModuleDescription.
+ */
+
+// Load Dolibarr environment
+if (false === (@include '../../main.inc.php')) {  // From htdocs directory
+	require '../../../main.inc.php'; // From "custom" directory
+}
+
+// Libraries
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once '../lib/mymodule.lib.php';
+
+// Translations
+$langs->load("errors");
+$langs->load("admin");
+$langs->load("mymodule@mymodule");
+
+// Access control
+if (! $user->admin) {
+	accessforbidden();
+}
+
+// Parameters
+$action = GETPOST('action', 'alpha');
+
+
+/*
+ * Actions
+ */
+
+// None
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+
+$page_name = "MyModuleAbout";
+llxHeader('', $langs->trans($page_name));
+
+// Subheader
+$linkback = '<a href="' . DOL_URL_ROOT . '/admin/modules.php">'
+	. $langs->trans("BackToModuleList") . '</a>';
+print load_fiche_titre($langs->trans($page_name), $linkback);
+
+// Configuration header
+$head = mymoduleAdminPrepareHead();
+dol_fiche_head(
+	$head,
+	'about',
+	$langs->trans("MyModuleName"),
+	0,
+	'mymodule@mymodule'
+);
+
+// About page goes here
+echo $langs->trans("MyModuleAboutPage");
+
+echo '<br>';
+
+require_once '../core/modulebuilder/mymodule/core/modules/modMyModule.class.php';
+$tmpmodule = new MyModule($db);
+print $tmpmodule->getDescLong();
+
+// Page end
+dol_fiche_end();
+llxFooter();
+$db->close();
diff --git a/htdocs/modulebuilder/template/admin/setup.php b/htdocs/modulebuilder/template/admin/setup.php
new file mode 100644
index 00000000000..8bc2c6d9ded
--- /dev/null
+++ b/htdocs/modulebuilder/template/admin/setup.php
@@ -0,0 +1,79 @@
+<?php
+/* <one line to give the program's name and a brief idea of what it does.>
+ * Copyright (C) <year>  <name of author>
+ *
+ * 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    admin/setup.php
+ * \ingroup mymodule
+ * \brief   Example module setup page.
+ *
+ * Put detailed description here.
+ */
+
+// Load Dolibarr environment
+if (false === (@include '../../main.inc.php')) {  // From htdocs directory
+	require '../../../main.inc.php'; // From "custom" directory
+}
+
+global $langs, $user;
+
+// Libraries
+require_once DOL_DOCUMENT_ROOT . "/core/lib/admin.lib.php";
+require_once '../lib/mymodule.lib.php';
+//require_once "../class/myclass.class.php";
+// Translations
+$langs->load("mymodule@mymodule");
+
+// Access control
+if (! $user->admin) {
+	accessforbidden();
+}
+
+// Parameters
+$action = GETPOST('action', 'alpha');
+
+/*
+ * Actions
+ */
+
+/*
+ * View
+ */
+$page_name = "MyModuleSetup";
+llxHeader('', $langs->trans($page_name));
+
+// Subheader
+$linkback = '<a href="' . DOL_URL_ROOT . '/admin/modules.php">'
+	. $langs->trans("BackToModuleList") . '</a>';
+print load_fiche_titre($langs->trans($page_name), $linkback);
+
+// Configuration header
+$head = mymoduleAdminPrepareHead();
+dol_fiche_head(
+	$head,
+	'settings',
+	$langs->trans("Module500000Name"),
+	0,
+	"mymodule@mymodule"
+);
+
+// Setup page goes here
+echo $langs->trans("MyModuleSetupPage");
+
+// Page end
+dol_fiche_end();
+llxFooter();
diff --git a/htdocs/modulebuilder/template/build/doxygen/mymodule.doxyfile b/htdocs/modulebuilder/template/build/doxygen/mymodule.doxyfile
new file mode 100644
index 00000000000..0b4e079a385
--- /dev/null
+++ b/htdocs/modulebuilder/template/build/doxygen/mymodule.doxyfile
@@ -0,0 +1,2419 @@
+# Doxyfile 1.8.12
+
+# This file describes the settings to be used by the documentation system
+# doxygen (www.doxygen.org) for a project.
+#
+# All text after a double hash (##) is considered a comment and is placed in
+# front of the TAG it is preceding.
+#
+# All text after a single hash (#) is considered a comment and will be ignored.
+# The format is:
+# TAG = value [value, ...]
+# For lists, items can also be appended using:
+# TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (\" \").
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+
+# This tag specifies the encoding used for all characters in the config file
+# that follow. The default is UTF-8 which is also the encoding used for all text
+# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv
+# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv
+# for the list of possible encodings.
+# The default value is: UTF-8.
+
+DOXYFILE_ENCODING      = UTF-8
+
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by
+# double-quotes, unless you are using Doxywizard) that should identify the
+# project for which the documentation is generated. This name is used in the
+# title of most generated pages and in a few other places.
+# The default value is: My Project.
+
+PROJECT_NAME           = mymodule
+
+# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
+# could be handy for archiving the generated documentation or if some version
+# control system is used.
+
+PROJECT_NUMBER         = development
+
+# Using the PROJECT_BRIEF tag one can provide an optional one line description
+# for a project that appears at the top of each page and should give viewer a
+# quick idea about the purpose of the project. Keep the description short.
+
+PROJECT_BRIEF          = My module brief.
+
+# With the PROJECT_LOGO tag one can specify a logo or an icon that is included
+# in the documentation. The maximum height of the logo should not exceed 55
+# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
+# the logo to the output directory.
+
+PROJECT_LOGO           = ../../img/mymodule.png
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
+# into which the generated documentation will be written. If a relative path is
+# entered, it will be relative to the location where doxygen was started. If
+# left blank the current directory will be used.
+
+OUTPUT_DIRECTORY       = ../../doc/code/doxygen
+
+# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
+# directories (in 2 levels) under the output directory of each output format and
+# will distribute the generated files over these directories. Enabling this
+# option can be useful when feeding doxygen a huge amount of source files, where
+# putting all generated files in the same directory would otherwise causes
+# performance problems for the file system.
+# The default value is: NO.
+
+CREATE_SUBDIRS         = YES
+
+# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII
+# characters to appear in the names of generated files. If set to NO, non-ASCII
+# characters will be escaped, for example _xE3_x81_x84 will be used for Unicode
+# U+3044.
+# The default value is: NO.
+
+ALLOW_UNICODE_NAMES    = YES
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all constant output in the proper language.
+# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese,
+# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States),
+# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian,
+# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages),
+# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian,
+# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian,
+# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish,
+# Ukrainian and Vietnamese.
+# The default value is: English.
+
+OUTPUT_LANGUAGE        = English
+
+# If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
+# descriptions after the members that are listed in the file and class
+# documentation (similar to Javadoc). Set to NO to disable this.
+# The default value is: YES.
+
+BRIEF_MEMBER_DESC      = YES
+
+# If the REPEAT_BRIEF tag is set to YES, doxygen will prepend the brief
+# description of a member or function before the detailed description
+#
+# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
+# brief descriptions will be completely suppressed.
+# The default value is: YES.
+
+REPEAT_BRIEF           = NO
+
+# This tag implements a quasi-intelligent brief description abbreviator that is
+# used to form the text in various listings. Each string in this list, if found
+# as the leading text of the brief description, will be stripped from the text
+# and the result, after processing the whole list, is used as the annotated
+# text. Otherwise, the brief description is used as-is. If left blank, the
+# following values are used ($name is automatically replaced with the name of
+# the entity):The $name class, The $name widget, The $name file, is, provides,
+# specifies, contains, represents, a, an and the.
+
+ABBREVIATE_BRIEF       =
+
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
+# doxygen will generate a detailed section even if there is only a brief
+# description.
+# The default value is: NO.
+
+ALWAYS_DETAILED_SEC    = NO
+
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
+# inherited members of a class in the documentation of that class as if those
+# members were ordinary class members. Constructors, destructors and assignment
+# operators of the base classes will not be shown.
+# The default value is: NO.
+
+INLINE_INHERITED_MEMB  = NO
+
+# If the FULL_PATH_NAMES tag is set to YES, doxygen will prepend the full path
+# before files name in the file list and in the header files. If set to NO the
+# shortest path that makes the file name unique will be used
+# The default value is: YES.
+
+FULL_PATH_NAMES        = YES
+
+# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path.
+# Stripping is only done if one of the specified strings matches the left-hand
+# part of the path. The tag can be used to show relative paths in the file list.
+# If left blank the directory from which doxygen is run is used as the path to
+# strip.
+#
+# Note that you can specify absolute paths here, but also relative paths, which
+# will be relative from the directory where doxygen is started.
+# This tag requires that the tag FULL_PATH_NAMES is set to YES.
+
+STRIP_FROM_PATH        = "../.."
+
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the
+# path mentioned in the documentation of a class, which tells the reader which
+# header file to include in order to use a class. If left blank only the name of
+# the header file containing the class definition is used. Otherwise one should
+# specify the list of include paths that are normally passed to the compiler
+# using the -I flag.
+
+STRIP_FROM_INC_PATH    =
+
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but
+# less readable) file names. This can be useful is your file systems doesn't
+# support long names like on DOS, Mac, or CD-ROM.
+# The default value is: NO.
+
+SHORT_NAMES            = NO
+
+# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the
+# first line (until the first dot) of a Javadoc-style comment as the brief
+# description. If set to NO, the Javadoc-style will behave just like regular Qt-
+# style comments (thus requiring an explicit @brief command for a brief
+# description.)
+# The default value is: NO.
+
+JAVADOC_AUTOBRIEF      = YES
+
+# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first
+# line (until the first dot) of a Qt-style comment as the brief description. If
+# set to NO, the Qt-style will behave just like regular Qt-style comments (thus
+# requiring an explicit \brief command for a brief description.)
+# The default value is: NO.
+
+QT_AUTOBRIEF           = NO
+
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a
+# multi-line C++ special comment block (i.e. a block of //! or /// comments) as
+# a brief description. This used to be the default behavior. The new default is
+# to treat a multi-line C++ comment block as a detailed description. Set this
+# tag to YES if you prefer the old behavior instead.
+#
+# Note that setting this tag to YES also means that rational rose comments are
+# not recognized any more.
+# The default value is: NO.
+
+MULTILINE_CPP_IS_BRIEF = NO
+
+# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
+# documentation from any documented member that it re-implements.
+# The default value is: YES.
+
+INHERIT_DOCS           = YES
+
+# If the SEPARATE_MEMBER_PAGES tag is set to YES then doxygen will produce a new
+# page for each member. If set to NO, the documentation of a member will be part
+# of the file/class/namespace that contains it.
+# The default value is: NO.
+
+SEPARATE_MEMBER_PAGES  = NO
+
+# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen
+# uses this value to replace tabs by spaces in code fragments.
+# Minimum value: 1, maximum value: 16, default value: 4.
+
+TAB_SIZE               = 4
+
+# This tag can be used to specify a number of aliases that act as commands in
+# the documentation. An alias has the form:
+# name=value
+# For example adding
+# "sideeffect=@par Side Effects:\n"
+# will allow you to put the command \sideeffect (or @sideeffect) in the
+# documentation, which will result in a user-defined paragraph with heading
+# "Side Effects:". You can put \n's in the value part of an alias to insert
+# newlines.
+
+ALIASES                =
+
+# This tag can be used to specify a number of word-keyword mappings (TCL only).
+# A mapping has the form "name=value". For example adding "class=itcl::class"
+# will allow you to use the command class in the itcl::class meaning.
+
+TCL_SUBST              =
+
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
+# only. Doxygen will then generate output that is more tailored for C. For
+# instance, some of the names that are used will be different. The list of all
+# members will be omitted, etc.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_FOR_C  = NO
+
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or
+# Python sources only. Doxygen will then generate output that is more tailored
+# for that language. For instance, namespaces will be presented as packages,
+# qualified scopes will look different, etc.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_JAVA   = NO
+
+# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
+# sources. Doxygen will then generate output that is tailored for Fortran.
+# The default value is: NO.
+
+OPTIMIZE_FOR_FORTRAN   = NO
+
+# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
+# sources. Doxygen will then generate output that is tailored for VHDL.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_VHDL   = NO
+
+# Doxygen selects the parser to use depending on the extension of the files it
+# parses. With this tag you can assign which parser to use for a given
+# extension. Doxygen has a built-in mapping, but you can override or extend it
+# using this tag. The format is ext=language, where ext is a file extension, and
+# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
+# C#, C, C++, D, PHP, Objective-C, Python, Fortran (fixed format Fortran:
+# FortranFixed, free formatted Fortran: FortranFree, unknown formatted Fortran:
+# Fortran. In the later case the parser tries to guess whether the code is fixed
+# or free formatted code, this is the default for Fortran type files), VHDL. For
+# instance to make doxygen treat .inc files as Fortran files (default is PHP),
+# and .f files as C (default is Fortran), use: inc=Fortran f=C.
+#
+# Note: For files without extension you can use no_extension as a placeholder.
+#
+# Note that for custom extensions you also need to set FILE_PATTERNS otherwise
+# the files are not read by doxygen.
+
+EXTENSION_MAPPING      =
+
+# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
+# according to the Markdown format, which allows for more readable
+# documentation. See http://daringfireball.net/projects/markdown/ for details.
+# The output of markdown processing is further processed by doxygen, so you can
+# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in
+# case of backward compatibilities issues.
+# The default value is: YES.
+
+MARKDOWN_SUPPORT       = YES
+
+# When the TOC_INCLUDE_HEADINGS tag is set to a non-zero value, all headings up
+# to that level are automatically included in the table of contents, even if
+# they do not have an id attribute.
+# Note: This feature currently applies only to Markdown headings.
+# Minimum value: 0, maximum value: 99, default value: 0.
+# This tag requires that the tag MARKDOWN_SUPPORT is set to YES.
+
+TOC_INCLUDE_HEADINGS   = 0
+
+# When enabled doxygen tries to link words that correspond to documented
+# classes, or namespaces to their corresponding documentation. Such a link can
+# be prevented in individual cases by putting a % sign in front of the word or
+# globally by setting AUTOLINK_SUPPORT to NO.
+# The default value is: YES.
+
+AUTOLINK_SUPPORT       = YES
+
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
+# to include (a tag file for) the STL sources as input, then you should set this
+# tag to YES in order to let doxygen match functions declarations and
+# definitions whose arguments contain STL classes (e.g. func(std::string);
+# versus func(std::string) {}). This also make the inheritance and collaboration
+# diagrams that involve STL classes more complete and accurate.
+# The default value is: NO.
+
+BUILTIN_STL_SUPPORT    = NO
+
+# If you use Microsoft's C++/CLI language, you should set this option to YES to
+# enable parsing support.
+# The default value is: NO.
+
+CPP_CLI_SUPPORT        = NO
+
+# Set the SIP_SUPPORT tag to YES if your project consists of sip (see:
+# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen
+# will parse them like normal C++ but will assume all classes use public instead
+# of private inheritance when no explicit protection keyword is present.
+# The default value is: NO.
+
+SIP_SUPPORT            = NO
+
+# For Microsoft's IDL there are propget and propput attributes to indicate
+# getter and setter methods for a property. Setting this option to YES will make
+# doxygen to replace the get and set methods by a property in the documentation.
+# This will only work if the methods are indeed getting or setting a simple
+# type. If this is not the case, or you want to show the methods anyway, you
+# should set this option to NO.
+# The default value is: YES.
+
+IDL_PROPERTY_SUPPORT   = YES
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
+# tag is set to YES then doxygen will reuse the documentation of the first
+# member in the group (if any) for the other members of the group. By default
+# all members of a group must be documented explicitly.
+# The default value is: NO.
+
+DISTRIBUTE_GROUP_DOC   = NO
+
+# If one adds a struct or class to a group and this option is enabled, then also
+# any nested class or struct is added to the same group. By default this option
+# is disabled and one has to add nested compounds explicitly via \ingroup.
+# The default value is: NO.
+
+GROUP_NESTED_COMPOUNDS = NO
+
+# Set the SUBGROUPING tag to YES to allow class member groups of the same type
+# (for instance a group of public functions) to be put as a subgroup of that
+# type (e.g. under the Public Functions section). Set it to NO to prevent
+# subgrouping. Alternatively, this can be done per class using the
+# \nosubgrouping command.
+# The default value is: YES.
+
+SUBGROUPING            = YES
+
+# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions
+# are shown inside the group in which they are included (e.g. using \ingroup)
+# instead of on a separate page (for HTML and Man pages) or section (for LaTeX
+# and RTF).
+#
+# Note that this feature does not work in combination with
+# SEPARATE_MEMBER_PAGES.
+# The default value is: NO.
+
+INLINE_GROUPED_CLASSES = NO
+
+# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions
+# with only public data fields or simple typedef fields will be shown inline in
+# the documentation of the scope in which they are defined (i.e. file,
+# namespace, or group documentation), provided this scope is documented. If set
+# to NO, structs, classes, and unions are shown on a separate page (for HTML and
+# Man pages) or section (for LaTeX and RTF).
+# The default value is: NO.
+
+INLINE_SIMPLE_STRUCTS  = NO
+
+# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or
+# enum is documented as struct, union, or enum with the name of the typedef. So
+# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
+# with name TypeT. When disabled the typedef will appear as a member of a file,
+# namespace, or class. And the struct will be named TypeS. This can typically be
+# useful for C code in case the coding convention dictates that all compound
+# types are typedef'ed and only the typedef is referenced, never the tag name.
+# The default value is: NO.
+
+TYPEDEF_HIDES_STRUCT   = NO
+
+# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This
+# cache is used to resolve symbols given their name and scope. Since this can be
+# an expensive process and often the same symbol appears multiple times in the
+# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small
+# doxygen will become slower. If the cache is too large, memory is wasted. The
+# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range
+# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536
+# symbols. At the end of a run doxygen will report the cache usage and suggest
+# the optimal cache size from a speed point of view.
+# Minimum value: 0, maximum value: 9, default value: 0.
+
+LOOKUP_CACHE_SIZE      = 0
+
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+
+# If the EXTRACT_ALL tag is set to YES, doxygen will assume all entities in
+# documentation are documented, even if no documentation was available. Private
+# class members and static file members will be hidden unless the
+# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES.
+# Note: This will also disable the warnings about undocumented members that are
+# normally produced when WARNINGS is set to YES.
+# The default value is: NO.
+
+EXTRACT_ALL            = NO
+
+# If the EXTRACT_PRIVATE tag is set to YES, all private members of a class will
+# be included in the documentation.
+# The default value is: NO.
+
+EXTRACT_PRIVATE        = YES
+
+# If the EXTRACT_PACKAGE tag is set to YES, all members with package or internal
+# scope will be included in the documentation.
+# The default value is: NO.
+
+EXTRACT_PACKAGE        = NO
+
+# If the EXTRACT_STATIC tag is set to YES, all static members of a file will be
+# included in the documentation.
+# The default value is: NO.
+
+EXTRACT_STATIC         = YES
+
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES, classes (and structs) defined
+# locally in source files will be included in the documentation. If set to NO,
+# only classes defined in header files are included. Does not have any effect
+# for Java sources.
+# The default value is: YES.
+
+EXTRACT_LOCAL_CLASSES  = YES
+
+# This flag is only useful for Objective-C code. If set to YES, local methods,
+# which are defined in the implementation section but not in the interface are
+# included in the documentation. If set to NO, only methods in the interface are
+# included.
+# The default value is: NO.
+
+EXTRACT_LOCAL_METHODS  = NO
+
+# If this flag is set to YES, the members of anonymous namespaces will be
+# extracted and appear in the documentation as a namespace called
+# 'anonymous_namespace{file}', where file will be replaced with the base name of
+# the file that contains the anonymous namespace. By default anonymous namespace
+# are hidden.
+# The default value is: NO.
+
+EXTRACT_ANON_NSPACES   = YES
+
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all
+# undocumented members inside documented classes or files. If set to NO these
+# members will be included in the various overviews, but no documentation
+# section is generated. This option has no effect if EXTRACT_ALL is enabled.
+# The default value is: NO.
+
+HIDE_UNDOC_MEMBERS     = YES
+
+# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all
+# undocumented classes that are normally visible in the class hierarchy. If set
+# to NO, these classes will be included in the various overviews. This option
+# has no effect if EXTRACT_ALL is enabled.
+# The default value is: NO.
+
+HIDE_UNDOC_CLASSES     = NO
+
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
+# (class|struct|union) declarations. If set to NO, these declarations will be
+# included in the documentation.
+# The default value is: NO.
+
+HIDE_FRIEND_COMPOUNDS  = NO
+
+# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any
+# documentation blocks found inside the body of a function. If set to NO, these
+# blocks will be appended to the function's detailed documentation block.
+# The default value is: NO.
+
+HIDE_IN_BODY_DOCS      = NO
+
+# The INTERNAL_DOCS tag determines if documentation that is typed after a
+# \internal command is included. If the tag is set to NO then the documentation
+# will be excluded. Set it to YES to include the internal documentation.
+# The default value is: NO.
+
+INTERNAL_DOCS          = NO
+
+# If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file
+# names in lower-case letters. If set to YES, upper-case letters are also
+# allowed. This is useful if you have classes or files whose names only differ
+# in case and if your file system supports case sensitive file names. Windows
+# and Mac users are advised to set this option to NO.
+# The default value is: system dependent.
+
+CASE_SENSE_NAMES       = NO
+
+# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with
+# their full class and namespace scopes in the documentation. If set to YES, the
+# scope will be hidden.
+# The default value is: NO.
+
+HIDE_SCOPE_NAMES       = NO
+
+# If the HIDE_COMPOUND_REFERENCE tag is set to NO (default) then doxygen will
+# append additional text to a page's title, such as Class Reference. If set to
+# YES the compound reference will be hidden.
+# The default value is: NO.
+
+HIDE_COMPOUND_REFERENCE= NO
+
+# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
+# the files that are included by a file in the documentation of that file.
+# The default value is: YES.
+
+SHOW_INCLUDE_FILES     = YES
+
+# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each
+# grouped member an include statement to the documentation, telling the reader
+# which file to include in order to use the member.
+# The default value is: NO.
+
+SHOW_GROUPED_MEMB_INC  = NO
+
+# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include
+# files with double quotes in the documentation rather than with sharp brackets.
+# The default value is: NO.
+
+FORCE_LOCAL_INCLUDES   = NO
+
+# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the
+# documentation for inline members.
+# The default value is: YES.
+
+INLINE_INFO            = YES
+
+# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the
+# (detailed) documentation of file and class members alphabetically by member
+# name. If set to NO, the members will appear in declaration order.
+# The default value is: YES.
+
+SORT_MEMBER_DOCS       = YES
+
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief
+# descriptions of file, namespace and class members alphabetically by member
+# name. If set to NO, the members will appear in declaration order. Note that
+# this will also influence the order of the classes in the class list.
+# The default value is: NO.
+
+SORT_BRIEF_DOCS        = NO
+
+# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the
+# (brief and detailed) documentation of class members so that constructors and
+# destructors are listed first. If set to NO the constructors will appear in the
+# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS.
+# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief
+# member documentation.
+# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting
+# detailed member documentation.
+# The default value is: NO.
+
+SORT_MEMBERS_CTORS_1ST = NO
+
+# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy
+# of group names into alphabetical order. If set to NO the group names will
+# appear in their defined order.
+# The default value is: NO.
+
+SORT_GROUP_NAMES       = NO
+
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by
+# fully-qualified names, including namespaces. If set to NO, the class list will
+# be sorted only by class name, not including the namespace part.
+# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
+# Note: This option applies only to the class list, not to the alphabetical
+# list.
+# The default value is: NO.
+
+SORT_BY_SCOPE_NAME     = NO
+
+# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper
+# type resolution of all parameters of a function it will reject a match between
+# the prototype and the implementation of a member function even if there is
+# only one candidate or it is obvious which candidate to choose by doing a
+# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still
+# accept a match between prototype and implementation in such cases.
+# The default value is: NO.
+
+STRICT_PROTO_MATCHING  = NO
+
+# The GENERATE_TODOLIST tag can be used to enable (YES) or disable (NO) the todo
+# list. This list is created by putting \todo commands in the documentation.
+# The default value is: YES.
+
+GENERATE_TODOLIST      = YES
+
+# The GENERATE_TESTLIST tag can be used to enable (YES) or disable (NO) the test
+# list. This list is created by putting \test commands in the documentation.
+# The default value is: YES.
+
+GENERATE_TESTLIST      = YES
+
+# The GENERATE_BUGLIST tag can be used to enable (YES) or disable (NO) the bug
+# list. This list is created by putting \bug commands in the documentation.
+# The default value is: YES.
+
+GENERATE_BUGLIST       = YES
+
+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or disable (NO)
+# the deprecated list. This list is created by putting \deprecated commands in
+# the documentation.
+# The default value is: YES.
+
+GENERATE_DEPRECATEDLIST= YES
+
+# The ENABLED_SECTIONS tag can be used to enable conditional documentation
+# sections, marked by \if <section_label> ... \endif and \cond <section_label>
+# ... \endcond blocks.
+
+ENABLED_SECTIONS       =
+
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the
+# initial value of a variable or macro / define can have for it to appear in the
+# documentation. If the initializer consists of more lines than specified here
+# it will be hidden. Use a value of 0 to hide initializers completely. The
+# appearance of the value of individual variables and macros / defines can be
+# controlled using \showinitializer or \hideinitializer command in the
+# documentation regardless of this setting.
+# Minimum value: 0, maximum value: 10000, default value: 30.
+
+MAX_INITIALIZER_LINES  = 30
+
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at
+# the bottom of the documentation of classes and structs. If set to YES, the
+# list will mention the files that were used to generate the documentation.
+# The default value is: YES.
+
+SHOW_USED_FILES        = YES
+
+# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This
+# will remove the Files entry from the Quick Index and from the Folder Tree View
+# (if specified).
+# The default value is: YES.
+
+SHOW_FILES             = YES
+
+# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces
+# page. This will remove the Namespaces entry from the Quick Index and from the
+# Folder Tree View (if specified).
+# The default value is: YES.
+
+SHOW_NAMESPACES        = NO
+
+# The FILE_VERSION_FILTER tag can be used to specify a program or script that
+# doxygen should invoke to get the current version for each file (typically from
+# the version control system). Doxygen will invoke the program by executing (via
+# popen()) the command command input-file, where command is the value of the
+# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided
+# by doxygen. Whatever the program writes to standard output is used as the file
+# version. For an example see the documentation.
+
+FILE_VERSION_FILTER    =
+
+# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
+# by doxygen. The layout file controls the global structure of the generated
+# output files in an output format independent way. To create the layout file
+# that represents doxygen's defaults, run doxygen with the -l option. You can
+# optionally specify a file name after the option, if omitted DoxygenLayout.xml
+# will be used as the name of the layout file.
+#
+# Note that if you run doxygen from a directory containing a file called
+# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
+# tag is left empty.
+
+LAYOUT_FILE            =
+
+# The CITE_BIB_FILES tag can be used to specify one or more bib files containing
+# the reference definitions. This must be a list of .bib files. The .bib
+# extension is automatically appended if omitted. This requires the bibtex tool
+# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info.
+# For LaTeX the style of the bibliography can be controlled using
+# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the
+# search path. See also \cite for info how to create references.
+
+CITE_BIB_FILES         =
+
+#---------------------------------------------------------------------------
+# Configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+
+# The QUIET tag can be used to turn on/off the messages that are generated to
+# standard output by doxygen. If QUIET is set to YES this implies that the
+# messages are off.
+# The default value is: NO.
+
+QUIET                  = NO
+
+# The WARNINGS tag can be used to turn on/off the warning messages that are
+# generated to standard error (stderr) by doxygen. If WARNINGS is set to YES
+# this implies that the warnings are on.
+#
+# Tip: Turn warnings on while writing the documentation.
+# The default value is: YES.
+
+WARNINGS               = YES
+
+# If the WARN_IF_UNDOCUMENTED tag is set to YES then doxygen will generate
+# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag
+# will automatically be disabled.
+# The default value is: YES.
+
+WARN_IF_UNDOCUMENTED   = YES
+
+# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
+# potential errors in the documentation, such as not documenting some parameters
+# in a documented function, or documenting parameters that don't exist or using
+# markup commands wrongly.
+# The default value is: YES.
+
+WARN_IF_DOC_ERROR      = YES
+
+# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
+# are documented, but have no documentation for their parameters or return
+# value. If set to NO, doxygen will only warn about wrong or incomplete
+# parameter documentation, but not about the absence of documentation.
+# The default value is: NO.
+
+WARN_NO_PARAMDOC       = YES
+
+# If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when
+# a warning is encountered.
+# The default value is: NO.
+
+WARN_AS_ERROR          = NO
+
+# The WARN_FORMAT tag determines the format of the warning messages that doxygen
+# can produce. The string should contain the $file, $line, and $text tags, which
+# will be replaced by the file and line number from which the warning originated
+# and the warning text. Optionally the format may contain $version, which will
+# be replaced by the version of the file (if it could be obtained via
+# FILE_VERSION_FILTER)
+# The default value is: $file:$line: $text.
+
+WARN_FORMAT            = "$file:$line: $text"
+
+# The WARN_LOGFILE tag can be used to specify a file to which warning and error
+# messages should be written. If left blank the output is written to standard
+# error (stderr).
+
+WARN_LOGFILE           = doxygen_warnings.log
+
+#---------------------------------------------------------------------------
+# Configuration options related to the input files
+#---------------------------------------------------------------------------
+
+# The INPUT tag is used to specify the files and/or directories that contain
+# documented source files. You may enter file names like myfile.cpp or
+# directories like /usr/src/myproject. Separate the files or directories with
+# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
+# Note: If this tag is empty the current directory is searched.
+
+INPUT                  = ../..
+
+# This tag can be used to specify the character encoding of the source files
+# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
+# libiconv (or the iconv built into libc) for the transcoding. See the libiconv
+# documentation (see: http://www.gnu.org/software/libiconv) for the list of
+# possible encodings.
+# The default value is: UTF-8.
+
+INPUT_ENCODING         = UTF-8
+
+# If the value of the INPUT tag contains directories, you can use the
+# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and
+# *.h) to filter out the source-files in the directories.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# read by doxygen.
+#
+# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
+# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
+# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
+# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
+# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf and *.qsf.
+
+FILE_PATTERNS          = *.php \
+                         *.pl
+
+# The RECURSIVE tag can be used to specify whether or not subdirectories should
+# be searched for input files as well.
+# The default value is: NO.
+
+RECURSIVE              = YES
+
+# The EXCLUDE tag can be used to specify files and/or directories that should be
+# excluded from the INPUT source files. This way you can easily exclude a
+# subdirectory from a directory tree whose root is specified with the INPUT tag.
+#
+# Note that relative paths are relative to the directory from which doxygen is
+# run.
+
+EXCLUDE                = ../../build \
+                         ../../dev \
+                         ../../doc \
+                         ../../vendor
+
+# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
+# directories that are symbolic links (a Unix file system feature) are excluded
+# from the input.
+# The default value is: NO.
+
+EXCLUDE_SYMLINKS       = YES
+
+# If the value of the INPUT tag contains directories, you can use the
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
+# certain files from those directories.
+#
+# Note that the wildcards are matched against the file with absolute path, so to
+# exclude all test directories for example use the pattern */test/*
+
+EXCLUDE_PATTERNS       =
+
+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
+# (namespaces, classes, functions, etc.) that should be excluded from the
+# output. The symbol name can be a fully qualified name, a word, or if the
+# wildcard * is used, a substring. Examples: ANamespace, AClass,
+# AClass::ANamespace, ANamespace::*Test
+#
+# Note that the wildcards are matched against the file with absolute path, so to
+# exclude all test directories use the pattern */test/*
+
+EXCLUDE_SYMBOLS        =
+
+# The EXAMPLE_PATH tag can be used to specify one or more files or directories
+# that contain example code fragments that are included (see the \include
+# command).
+
+EXAMPLE_PATH           =
+
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and
+# *.h) to filter out the source-files in the directories. If left blank all
+# files are included.
+
+EXAMPLE_PATTERNS       = *.php
+
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
+# searched for input files to be used with the \include or \dontinclude commands
+# irrespective of the value of the RECURSIVE tag.
+# The default value is: NO.
+
+EXAMPLE_RECURSIVE      = NO
+
+# The IMAGE_PATH tag can be used to specify one or more files or directories
+# that contain images that are to be included in the documentation (see the
+# \image command).
+
+IMAGE_PATH             = ../../doc/images
+
+# The INPUT_FILTER tag can be used to specify a program that doxygen should
+# invoke to filter for each input file. Doxygen will invoke the filter program
+# by executing (via popen()) the command:
+#
+# <filter> <input-file>
+#
+# where <filter> is the value of the INPUT_FILTER tag, and <input-file> is the
+# name of an input file. Doxygen will then use the output that the filter
+# program writes to standard output. If FILTER_PATTERNS is specified, this tag
+# will be ignored.
+#
+# Note that the filter must not add or remove lines; it is applied before the
+# code is scanned, but not when the output code is generated. If lines are added
+# or removed, the anchors will not be placed correctly.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# properly processed by doxygen.
+
+INPUT_FILTER           =
+
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
+# basis. Doxygen will compare the file name with each pattern and apply the
+# filter if there is a match. The filters are a list of the form: pattern=filter
+# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how
+# filters are used. If the FILTER_PATTERNS tag is empty or if none of the
+# patterns match the file name, INPUT_FILTER is applied.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# properly processed by doxygen.
+
+FILTER_PATTERNS        =
+
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
+# INPUT_FILTER) will also be used to filter the input files that are used for
+# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES).
+# The default value is: NO.
+
+FILTER_SOURCE_FILES    = NO
+
+# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
+# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and
+# it is also possible to disable source filtering for a specific pattern using
+# *.ext= (so without naming a filter).
+# This tag requires that the tag FILTER_SOURCE_FILES is set to YES.
+
+FILTER_SOURCE_PATTERNS =
+
+# If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that
+# is part of the input, its contents will be placed on the main page
+# (index.html). This can be useful if you have a project on for instance GitHub
+# and want to reuse the introduction page also for the doxygen output.
+
+USE_MDFILE_AS_MAINPAGE =
+
+#---------------------------------------------------------------------------
+# Configuration options related to source browsing
+#---------------------------------------------------------------------------
+
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will be
+# generated. Documented entities will be cross-referenced with these sources.
+#
+# Note: To get rid of all source code in the generated output, make sure that
+# also VERBATIM_HEADERS is set to NO.
+# The default value is: NO.
+
+SOURCE_BROWSER         = YES
+
+# Setting the INLINE_SOURCES tag to YES will include the body of functions,
+# classes and enums directly into the documentation.
+# The default value is: NO.
+
+INLINE_SOURCES         = NO
+
+# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any
+# special comment blocks from generated source code fragments. Normal C, C++ and
+# Fortran comments will always remain visible.
+# The default value is: YES.
+
+STRIP_CODE_COMMENTS    = YES
+
+# If the REFERENCED_BY_RELATION tag is set to YES then for each documented
+# function all documented functions referencing it will be listed.
+# The default value is: NO.
+
+REFERENCED_BY_RELATION = YES
+
+# If the REFERENCES_RELATION tag is set to YES then for each documented function
+# all documented entities called/used by that function will be listed.
+# The default value is: NO.
+
+REFERENCES_RELATION    = YES
+
+# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set
+# to YES then the hyperlinks from functions in REFERENCES_RELATION and
+# REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will
+# link to the documentation.
+# The default value is: YES.
+
+REFERENCES_LINK_SOURCE = YES
+
+# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the
+# source code will show a tooltip with additional information such as prototype,
+# brief description and links to the definition and documentation. Since this
+# will make the HTML file larger and loading of large files a bit slower, you
+# can opt to disable this feature.
+# The default value is: YES.
+# This tag requires that the tag SOURCE_BROWSER is set to YES.
+
+SOURCE_TOOLTIPS        = YES
+
+# If the USE_HTAGS tag is set to YES then the references to source code will
+# point to the HTML generated by the htags(1) tool instead of doxygen built-in
+# source browser. The htags tool is part of GNU's global source tagging system
+# (see http://www.gnu.org/software/global/global.html). You will need version
+# 4.8.6 or higher.
+#
+# To use it do the following:
+# - Install the latest version of global
+# - Enable SOURCE_BROWSER and USE_HTAGS in the config file
+# - Make sure the INPUT points to the root of the source tree
+# - Run doxygen as normal
+#
+# Doxygen will invoke htags (and that will in turn invoke gtags), so these
+# tools must be available from the command line (i.e. in the search path).
+#
+# The result: instead of the source browser generated by doxygen, the links to
+# source code will now point to the output of htags.
+# The default value is: NO.
+# This tag requires that the tag SOURCE_BROWSER is set to YES.
+
+USE_HTAGS              = NO
+
+# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a
+# verbatim copy of the header file for each class for which an include is
+# specified. Set to NO to disable this.
+# See also: Section \class.
+# The default value is: YES.
+
+VERBATIM_HEADERS       = YES
+
+#---------------------------------------------------------------------------
+# Configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all
+# compounds will be generated. Enable this if the project contains a lot of
+# classes, structs, unions or interfaces.
+# The default value is: YES.
+
+ALPHABETICAL_INDEX     = YES
+
+# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in
+# which the alphabetical index list will be split.
+# Minimum value: 1, maximum value: 20, default value: 5.
+# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
+
+COLS_IN_ALPHA_INDEX    = 5
+
+# In case all classes in a project start with a common prefix, all classes will
+# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag
+# can be used to specify a prefix (or a list of prefixes) that should be ignored
+# while generating the index headers.
+# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
+
+IGNORE_PREFIX          =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the HTML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_HTML tag is set to YES, doxygen will generate HTML output
+# The default value is: YES.
+
+GENERATE_HTML          = YES
+
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_OUTPUT            = ./
+
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each
+# generated HTML page (for example: .htm, .php, .asp).
+# The default value is: .html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FILE_EXTENSION    = .html
+
+# The HTML_HEADER tag can be used to specify a user-defined HTML header file for
+# each generated HTML page. If the tag is left blank doxygen will generate a
+# standard header.
+#
+# To get valid HTML the header file that includes any scripts and style sheets
+# that doxygen needs, which is dependent on the configuration options used (e.g.
+# the setting GENERATE_TREEVIEW). It is highly recommended to start with a
+# default header using
+# doxygen -w html new_header.html new_footer.html new_stylesheet.css
+# YourConfigFile
+# and then modify the file new_header.html. See also section "Doxygen usage"
+# for information on how to generate the default header that doxygen normally
+# uses.
+# Note: The header is subject to change so you typically have to regenerate the
+# default header when upgrading to a newer version of doxygen. For a description
+# of the possible markers and block names see the documentation.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_HEADER            =
+
+# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each
+# generated HTML page. If the tag is left blank doxygen will generate a standard
+# footer. See HTML_HEADER for more information on how to generate a default
+# footer and what special commands can be used inside the footer. See also
+# section "Doxygen usage" for information on how to generate the default footer
+# that doxygen normally uses.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FOOTER            =
+
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style
+# sheet that is used by each HTML page. It can be used to fine-tune the look of
+# the HTML output. If left blank doxygen will generate a default style sheet.
+# See also section "Doxygen usage" for information on how to generate the style
+# sheet that doxygen normally uses.
+# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as
+# it is more robust and this tag (HTML_STYLESHEET) will in the future become
+# obsolete.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_STYLESHEET        =
+
+# The HTML_EXTRA_STYLESHEET tag can be used to specify additional user-defined
+# cascading style sheets that are included after the standard style sheets
+# created by doxygen. Using this option one can overrule certain style aspects.
+# This is preferred over using HTML_STYLESHEET since it does not replace the
+# standard style sheet and is therefore more robust against future updates.
+# Doxygen will copy the style sheet files to the output directory.
+# Note: The order of the extra style sheet files is of importance (e.g. the last
+# style sheet in the list overrules the setting of the previous ones in the
+# list). For an example see the documentation.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_EXTRA_STYLESHEET  =
+
+# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the HTML output directory. Note
+# that these files will be copied to the base HTML output directory. Use the
+# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
+# files. In the HTML_STYLESHEET file, use the file name only. Also note that the
+# files will be copied as-is; there are no commands or markers available.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_EXTRA_FILES       =
+
+# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
+# will adjust the colors in the style sheet and background images according to
+# this color. Hue is specified as an angle on a colorwheel, see
+# http://en.wikipedia.org/wiki/Hue for more information. For instance the value
+# 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
+# purple, and 360 is red again.
+# Minimum value: 0, maximum value: 359, default value: 220.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_HUE    = 220
+
+# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
+# in the HTML output. For a value of 0 the output will use grayscales only. A
+# value of 255 will produce the most vivid colors.
+# Minimum value: 0, maximum value: 255, default value: 100.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_SAT    = 100
+
+# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the
+# luminance component of the colors in the HTML output. Values below 100
+# gradually make the output lighter, whereas values above 100 make the output
+# darker. The value divided by 100 is the actual gamma applied, so 80 represents
+# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not
+# change the gamma.
+# Minimum value: 40, maximum value: 240, default value: 80.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_GAMMA  = 80
+
+# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
+# page will contain the date and time when the page was generated. Setting this
+# to YES can help to show when doxygen was last run and thus if the
+# documentation is up to date.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_TIMESTAMP         = YES
+
+# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
+# documentation will contain sections that can be hidden and shown after the
+# page has loaded.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_DYNAMIC_SECTIONS  = YES
+
+# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries
+# shown in the various tree structured indices initially; the user can expand
+# and collapse entries dynamically later on. Doxygen will expand the tree to
+# such a level that at most the specified number of entries are visible (unless
+# a fully collapsed tree already exceeds this amount). So setting the number of
+# entries 1 will produce a full collapsed tree by default. 0 is a special value
+# representing an infinite number of entries and will result in a full expanded
+# tree by default.
+# Minimum value: 0, maximum value: 9999, default value: 100.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_INDEX_NUM_ENTRIES = 100
+
+# If the GENERATE_DOCSET tag is set to YES, additional index files will be
+# generated that can be used as input for Apple's Xcode 3 integrated development
+# environment (see: http://developer.apple.com/tools/xcode/), introduced with
+# OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a
+# Makefile in the HTML output directory. Running make will produce the docset in
+# that directory and running make install will install the docset in
+# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at
+# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
+# for more information.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_DOCSET        = NO
+
+# This tag determines the name of the docset feed. A documentation feed provides
+# an umbrella under which multiple documentation sets from a single provider
+# (such as a company or product suite) can be grouped.
+# The default value is: Doxygen generated docs.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_FEEDNAME        = "Doxygen generated docs"
+
+# This tag specifies a string that should uniquely identify the documentation
+# set bundle. This should be a reverse domain-name style string, e.g.
+# com.mycompany.MyDocSet. Doxygen will append .docset to the name.
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_BUNDLE_ID       = org.doxygen.Project
+
+# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify
+# the documentation publisher. This should be a reverse domain-name style
+# string, e.g. com.mycompany.MyDocSet.documentation.
+# The default value is: org.doxygen.Publisher.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_PUBLISHER_ID    = org.dolibarr.doc
+
+# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher.
+# The default value is: Publisher.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_PUBLISHER_NAME  = Dolibarrteam
+
+# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
+# additional HTML index files: index.hhp, index.hhc, and index.hhk. The
+# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
+# (see: http://www.microsoft.com/en-us/download/details.aspx?id=21138) on
+# Windows.
+#
+# The HTML Help Workshop contains a compiler that can convert all HTML output
+# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
+# files are now used as the Windows 98 help format, and will replace the old
+# Windows help format (.hlp) on all Windows platforms in the future. Compressed
+# HTML files also contain an index, a table of contents, and you can search for
+# words in the documentation. The HTML workshop also contains a viewer for
+# compressed HTML files.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_HTMLHELP      = NO
+
+# The CHM_FILE tag can be used to specify the file name of the resulting .chm
+# file. You can add a path in front of the file if the result should not be
+# written to the html output directory.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+CHM_FILE               =
+
+# The HHC_LOCATION tag can be used to specify the location (absolute path
+# including file name) of the HTML help compiler (hhc.exe). If non-empty,
+# doxygen will try to run the HTML help compiler on the generated index.hhp.
+# The file has to be specified with full path.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+HHC_LOCATION           =
+
+# The GENERATE_CHI flag controls if a separate .chi index file is generated
+# (YES) or that it should be included in the master .chm file (NO).
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+GENERATE_CHI           = NO
+
+# The CHM_INDEX_ENCODING is used to encode HtmlHelp index (hhk), content (hhc)
+# and project file content.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+CHM_INDEX_ENCODING     =
+
+# The BINARY_TOC flag controls whether a binary table of contents is generated
+# (YES) or a normal table of contents (NO) in the .chm file. Furthermore it
+# enables the Previous and Next buttons.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+BINARY_TOC             = NO
+
+# The TOC_EXPAND flag can be set to YES to add extra items for group members to
+# the table of contents of the HTML help documentation and to the tree view.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+TOC_EXPAND             = NO
+
+# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
+# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that
+# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help
+# (.qch) of the generated HTML documentation.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_QHP           = NO
+
+# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify
+# the file name of the resulting .qch file. The path specified is relative to
+# the HTML output folder.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QCH_FILE               =
+
+# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help
+# Project output. For more information please see Qt Help Project / Namespace
+# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace).
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_NAMESPACE          = org.doxygen.Project
+
+# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt
+# Help Project output. For more information please see Qt Help Project / Virtual
+# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual-
+# folders).
+# The default value is: doc.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_VIRTUAL_FOLDER     = doc
+
+# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom
+# filter to add. For more information please see Qt Help Project / Custom
+# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
+# filters).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_CUST_FILTER_NAME   =
+
+# The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the
+# custom filter to add. For more information please see Qt Help Project / Custom
+# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
+# filters).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_CUST_FILTER_ATTRS  =
+
+# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
+# project's filter section matches. Qt Help Project / Filter Attributes (see:
+# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_SECT_FILTER_ATTRS  =
+
+# The QHG_LOCATION tag can be used to specify the location of Qt's
+# qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the
+# generated .qhp file.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHG_LOCATION           =
+
+# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be
+# generated, together with the HTML files, they form an Eclipse help plugin. To
+# install this plugin and make it available under the help contents menu in
+# Eclipse, the contents of the directory containing the HTML and XML files needs
+# to be copied into the plugins directory of eclipse. The name of the directory
+# within the plugins directory should be the same as the ECLIPSE_DOC_ID value.
+# After copying Eclipse needs to be restarted before the help appears.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_ECLIPSEHELP   = YES
+
+# A unique identifier for the Eclipse help plugin. When installing the plugin
+# the directory name containing the HTML and XML files should also have this
+# name. Each documentation set should have its own identifier.
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES.
+
+ECLIPSE_DOC_ID         = org.doxygen.Project
+
+# If you want full control over the layout of the generated HTML pages it might
+# be necessary to disable the index and replace it with your own. The
+# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top
+# of each HTML page. A value of NO enables the index and the value YES disables
+# it. Since the tabs in the index contain the same information as the navigation
+# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+DISABLE_INDEX          = NO
+
+# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
+# structure should be generated to display hierarchical information. If the tag
+# value is set to YES, a side panel will be generated containing a tree-like
+# index structure (just like the one that is generated for HTML Help). For this
+# to work a browser that supports JavaScript, DHTML, CSS and frames is required
+# (i.e. any modern browser). Windows users are probably better off using the
+# HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can
+# further fine-tune the look of the index. As an example, the default style
+# sheet generated by doxygen has an example that shows how to put an image at
+# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
+# the same information as the tab index, you could consider setting
+# DISABLE_INDEX to YES when enabling this option.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_TREEVIEW      = NO
+
+# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
+# doxygen will group on one line in the generated HTML documentation.
+#
+# Note that a value of 0 will completely suppress the enum values from appearing
+# in the overview section.
+# Minimum value: 0, maximum value: 20, default value: 4.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+ENUM_VALUES_PER_LINE   = 4
+
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used
+# to set the initial width (in pixels) of the frame in which the tree is shown.
+# Minimum value: 0, maximum value: 1500, default value: 250.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+TREEVIEW_WIDTH         = 250
+
+# If the EXT_LINKS_IN_WINDOW option is set to YES, doxygen will open links to
+# external symbols imported via tag files in a separate window.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+EXT_LINKS_IN_WINDOW    = NO
+
+# Use this tag to change the font size of LaTeX formulas included as images in
+# the HTML documentation. When you change the font size after a successful
+# doxygen run you need to manually remove any form_*.png images from the HTML
+# output directory to force them to be regenerated.
+# Minimum value: 8, maximum value: 50, default value: 10.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FORMULA_FONTSIZE       = 10
+
+# Use the FORMULA_TRANPARENT tag to determine whether or not the images
+# generated for formulas are transparent PNGs. Transparent PNGs are not
+# supported properly for IE 6.0, but are supported on all modern browsers.
+#
+# Note that when changing this option you need to delete any form_*.png files in
+# the HTML output directory before the changes have effect.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FORMULA_TRANSPARENT    = YES
+
+# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
+# http://www.mathjax.org) which uses client side Javascript for the rendering
+# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
+# installed or if you want to formulas look prettier in the HTML output. When
+# enabled you may also need to install MathJax separately and configure the path
+# to it using the MATHJAX_RELPATH option.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+USE_MATHJAX            = NO
+
+# When MathJax is enabled you can set the default output format to be used for
+# the MathJax output. See the MathJax site (see:
+# http://docs.mathjax.org/en/latest/output.html) for more details.
+# Possible values are: HTML-CSS (which is slower, but has the best
+# compatibility), NativeMML (i.e. MathML) and SVG.
+# The default value is: HTML-CSS.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_FORMAT         = HTML-CSS
+
+# When MathJax is enabled you need to specify the location relative to the HTML
+# output directory using the MATHJAX_RELPATH option. The destination directory
+# should contain the MathJax.js script. For instance, if the mathjax directory
+# is located at the same level as the HTML output directory, then
+# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
+# Content Delivery Network so you can quickly see the result without installing
+# MathJax. However, it is strongly recommended to install a local copy of
+# MathJax from http://www.mathjax.org before deployment.
+# The default value is: http://cdn.mathjax.org/mathjax/latest.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
+
+# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
+# extension names that should be enabled during MathJax rendering. For example
+# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_EXTENSIONS     =
+
+# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces
+# of code that will be used on startup of the MathJax code. See the MathJax site
+# (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an
+# example see the documentation.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_CODEFILE       =
+
+# When the SEARCHENGINE tag is enabled doxygen will generate a search box for
+# the HTML output. The underlying search engine uses javascript and DHTML and
+# should work on any modern browser. Note that when using HTML help
+# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET)
+# there is already a search function so this one should typically be disabled.
+# For large projects the javascript based search engine can be slow, then
+# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to
+# search using the keyboard; to jump to the search box use <access key> + S
+# (what the <access key> is depends on the OS and browser, but it is typically
+# <CTRL>, <ALT>/<option>, or both). Inside the search box use the <cursor down
+# key> to jump into the search results window, the results can be navigated
+# using the <cursor keys>. Press <Enter> to select an item or <escape> to cancel
+# the search. The filter options can be selected when the cursor is inside the
+# search box by pressing <Shift>+<cursor down>. Also here use the <cursor keys>
+# to select a filter and <Enter> or <escape> to activate or cancel the filter
+# option.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+SEARCHENGINE           = NO
+
+# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
+# implemented using a web server instead of a web client using Javascript. There
+# are two flavors of web server based searching depending on the EXTERNAL_SEARCH
+# setting. When disabled, doxygen will generate a PHP script for searching and
+# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
+# and searching needs to be provided by external tools. See the section
+# "External Indexing and Searching" for details.
+# The default value is: NO.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SERVER_BASED_SEARCH    = NO
+
+# When EXTERNAL_SEARCH tag is enabled doxygen will no longer generate the PHP
+# script for searching. Instead the search results are written to an XML file
+# which needs to be processed by an external indexer. Doxygen will invoke an
+# external search engine pointed to by the SEARCHENGINE_URL option to obtain the
+# search results.
+#
+# Doxygen ships with an example indexer (doxyindexer) and search engine
+# (doxysearch.cgi) which are based on the open source search engine library
+# Xapian (see: http://xapian.org/).
+#
+# See the section "External Indexing and Searching" for details.
+# The default value is: NO.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTERNAL_SEARCH        = NO
+
+# The SEARCHENGINE_URL should point to a search engine hostedc by a web server
+# which will return the search results when EXTERNAL_SEARCH is enabled.
+#
+# Doxygen ships with an example indexer (doxyindexer) and search engine
+# (doxysearch.cgi) which are based on the open source search engine library
+# Xapian (see: http://xapian.org/). See the section "External Indexing and
+# Searching" for details.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SEARCHENGINE_URL       =
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed
+# search data is written to a file for indexing by an external tool. With the
+# SEARCHDATA_FILE tag the name of this file can be specified.
+# The default file is: searchdata.xml.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SEARCHDATA_FILE        = searchdata.xml
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the
+# EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is
+# useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple
+# projects and redirect the results back to the right project.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTERNAL_SEARCH_ID     =
+
+# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen
+# projects other than the one defined by this configuration file, but that are
+# all added to the same external search index. Each project needs to have a
+# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id of
+# to a relative location where the documentation can be found. The format is:
+# EXTRA_SEARCH_MAPPINGS = tagname1=loc1 tagname2=loc2 ...
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTRA_SEARCH_MAPPINGS  =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_LATEX tag is set to YES, doxygen will generate LaTeX output.
+# The default value is: YES.
+
+GENERATE_LATEX         = NO
+
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: latex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_OUTPUT           = latex
+
+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
+# invoked.
+#
+# Note that when enabling USE_PDFLATEX this option is only used for generating
+# bitmaps for formulas in the HTML output, but not in the Makefile that is
+# written to the output directory.
+# The default file is: latex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_CMD_NAME         = latex
+
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to generate
+# index for LaTeX.
+# The default file is: makeindex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+MAKEINDEX_CMD_NAME     = makeindex
+
+# If the COMPACT_LATEX tag is set to YES, doxygen generates more compact LaTeX
+# documents. This may be useful for small projects and may help to save some
+# trees in general.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+COMPACT_LATEX          = NO
+
+# The PAPER_TYPE tag can be used to set the paper type that is used by the
+# printer.
+# Possible values are: a4 (210 x 297 mm), letter (8.5 x 11 inches), legal (8.5 x
+# 14 inches) and executive (7.25 x 10.5 inches).
+# The default value is: a4.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+PAPER_TYPE             = a4
+
+# The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names
+# that should be included in the LaTeX output. The package can be specified just
+# by its name or with the correct syntax as to be used with the LaTeX
+# \usepackage command. To get the times font for instance you can specify :
+# EXTRA_PACKAGES=times or EXTRA_PACKAGES={times}
+# To use the option intlimits with the amsmath package you can specify:
+# EXTRA_PACKAGES=[intlimits]{amsmath}
+# If left blank no extra packages will be included.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+EXTRA_PACKAGES         =
+
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
+# generated LaTeX document. The header should contain everything until the first
+# chapter. If it is left blank doxygen will generate a standard header. See
+# section "Doxygen usage" for information on how to let doxygen write the
+# default header to a separate file.
+#
+# Note: Only use a user-defined header if you know what you are doing! The
+# following commands have a special meaning inside the header: $title,
+# $datetime, $date, $doxygenversion, $projectname, $projectnumber,
+# $projectbrief, $projectlogo. Doxygen will replace $title with the empty
+# string, for the replacement values of the other commands the user is referred
+# to HTML_HEADER.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_HEADER           =
+
+# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
+# generated LaTeX document. The footer should contain everything after the last
+# chapter. If it is left blank doxygen will generate a standard footer. See
+# LATEX_HEADER for more information on how to generate a default footer and what
+# special commands can be used inside the footer.
+#
+# Note: Only use a user-defined footer if you know what you are doing!
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_FOOTER           =
+
+# The LATEX_EXTRA_STYLESHEET tag can be used to specify additional user-defined
+# LaTeX style sheets that are included after the standard style sheets created
+# by doxygen. Using this option one can overrule certain style aspects. Doxygen
+# will copy the style sheet files to the output directory.
+# Note: The order of the extra style sheet files is of importance (e.g. the last
+# style sheet in the list overrules the setting of the previous ones in the
+# list).
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_EXTRA_STYLESHEET =
+
+# The LATEX_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the LATEX_OUTPUT output
+# directory. Note that the files will be copied as-is; there are no commands or
+# markers available.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_EXTRA_FILES      =
+
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated is
+# prepared for conversion to PDF (using ps2pdf or pdflatex). The PDF file will
+# contain links (just like the HTML output) instead of page references. This
+# makes the output suitable for online browsing using a PDF viewer.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+PDF_HYPERLINKS         = YES
+
+# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
+# the PDF file directly from the LaTeX files. Set this option to YES, to get a
+# higher quality PDF documentation.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+USE_PDFLATEX           = YES
+
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
+# command to the generated LaTeX files. This will instruct LaTeX to keep running
+# if errors occur, instead of asking the user for help. This option is also used
+# when generating formulas in HTML.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_BATCHMODE        = NO
+
+# If the LATEX_HIDE_INDICES tag is set to YES then doxygen will not include the
+# index chapters (such as File Index, Compound Index, etc.) in the output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_HIDE_INDICES     = NO
+
+# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
+# code with syntax highlighting in the LaTeX output.
+#
+# Note that which sources are shown also depends on other settings such as
+# SOURCE_BROWSER.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_SOURCE_CODE      = NO
+
+# The LATEX_BIB_STYLE tag can be used to specify the style to use for the
+# bibliography, e.g. plainnat, or ieeetr. See
+# http://en.wikipedia.org/wiki/BibTeX and \cite for more info.
+# The default value is: plain.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_BIB_STYLE        = plain
+
+# If the LATEX_TIMESTAMP tag is set to YES then the footer of each generated
+# page will contain the date and time when the page was generated. Setting this
+# to NO can help when comparing the output of multiple runs.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_TIMESTAMP        = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the RTF output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_RTF tag is set to YES, doxygen will generate RTF output. The
+# RTF output is optimized for Word 97 and may not look too pretty with other RTF
+# readers/editors.
+# The default value is: NO.
+
+GENERATE_RTF           = NO
+
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: rtf.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_OUTPUT             = rtf
+
+# If the COMPACT_RTF tag is set to YES, doxygen generates more compact RTF
+# documents. This may be useful for small projects and may help to save some
+# trees in general.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+COMPACT_RTF            = NO
+
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated will
+# contain hyperlink fields. The RTF file will contain links (just like the HTML
+# output) instead of page references. This makes the output suitable for online
+# browsing using Word or some other Word compatible readers that support those
+# fields.
+#
+# Note: WordPad (write) and others do not support links.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_HYPERLINKS         = NO
+
+# Load stylesheet definitions from file. Syntax is similar to doxygen's config
+# file, i.e. a series of assignments. You only have to provide replacements,
+# missing definitions are set to their default value.
+#
+# See also section "Doxygen usage" for information on how to generate the
+# default style sheet that doxygen normally uses.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_STYLESHEET_FILE    =
+
+# Set optional variables used in the generation of an RTF document. Syntax is
+# similar to doxygen's config file. A template extensions file can be generated
+# using doxygen -e rtf extensionFile.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_EXTENSIONS_FILE    =
+
+# If the RTF_SOURCE_CODE tag is set to YES then doxygen will include source code
+# with syntax highlighting in the RTF output.
+#
+# Note that which sources are shown also depends on other settings such as
+# SOURCE_BROWSER.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_SOURCE_CODE        = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the man page output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_MAN tag is set to YES, doxygen will generate man pages for
+# classes and files.
+# The default value is: NO.
+
+GENERATE_MAN           = NO
+
+# The MAN_OUTPUT tag is used to specify where the man pages will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it. A directory man3 will be created inside the directory specified by
+# MAN_OUTPUT.
+# The default directory is: man.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_OUTPUT             = man
+
+# The MAN_EXTENSION tag determines the extension that is added to the generated
+# man pages. In case the manual section does not start with a number, the number
+# 3 is prepended. The dot (.) at the beginning of the MAN_EXTENSION tag is
+# optional.
+# The default value is: .3.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_EXTENSION          = .3
+
+# The MAN_SUBDIR tag determines the name of the directory created within
+# MAN_OUTPUT in which the man pages are placed. If defaults to man followed by
+# MAN_EXTENSION with the initial . removed.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_SUBDIR             =
+
+# If the MAN_LINKS tag is set to YES and doxygen generates man output, then it
+# will generate one additional man file for each entity documented in the real
+# man page(s). These additional files only source the real man page, but without
+# them the man command would be unable to find the correct page.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_LINKS              = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the XML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_XML tag is set to YES, doxygen will generate an XML file that
+# captures the structure of the code including all documentation.
+# The default value is: NO.
+
+GENERATE_XML           = NO
+
+# The XML_OUTPUT tag is used to specify where the XML pages will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: xml.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
+XML_OUTPUT             = xml
+
+# If the XML_PROGRAMLISTING tag is set to YES, doxygen will dump the program
+# listings (including syntax highlighting and cross-referencing information) to
+# the XML output. Note that enabling this will significantly increase the size
+# of the XML output.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
+XML_PROGRAMLISTING     = YES
+
+#---------------------------------------------------------------------------
+# Configuration options related to the DOCBOOK output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_DOCBOOK tag is set to YES, doxygen will generate Docbook files
+# that can be used to generate PDF.
+# The default value is: NO.
+
+GENERATE_DOCBOOK       = NO
+
+# The DOCBOOK_OUTPUT tag is used to specify where the Docbook pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be put in
+# front of it.
+# The default directory is: docbook.
+# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
+
+DOCBOOK_OUTPUT         = docbook
+
+# If the DOCBOOK_PROGRAMLISTING tag is set to YES, doxygen will include the
+# program listings (including syntax highlighting and cross-referencing
+# information) to the DOCBOOK output. Note that enabling this will significantly
+# increase the size of the DOCBOOK output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
+
+DOCBOOK_PROGRAMLISTING = NO
+
+#---------------------------------------------------------------------------
+# Configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an
+# AutoGen Definitions (see http://autogen.sf.net) file that captures the
+# structure of the code including all documentation. Note that this feature is
+# still experimental and incomplete at the moment.
+# The default value is: NO.
+
+GENERATE_AUTOGEN_DEF   = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_PERLMOD tag is set to YES, doxygen will generate a Perl module
+# file that captures the structure of the code including all documentation.
+#
+# Note that this feature is still experimental and incomplete at the moment.
+# The default value is: NO.
+
+GENERATE_PERLMOD       = NO
+
+# If the PERLMOD_LATEX tag is set to YES, doxygen will generate the necessary
+# Makefile rules, Perl scripts and LaTeX code to be able to generate PDF and DVI
+# output from the Perl module output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_LATEX          = NO
+
+# If the PERLMOD_PRETTY tag is set to YES, the Perl module output will be nicely
+# formatted so it can be parsed by a human reader. This is useful if you want to
+# understand what is going on. On the other hand, if this tag is set to NO, the
+# size of the Perl module output will be much smaller and Perl will parse it
+# just the same.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_PRETTY         = YES
+
+# The names of the make variables in the generated doxyrules.make file are
+# prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. This is useful
+# so different doxyrules.make files included by the same Makefile don't
+# overwrite each other's variables.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_MAKEVAR_PREFIX =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor
+#---------------------------------------------------------------------------
+
+# If the ENABLE_PREPROCESSING tag is set to YES, doxygen will evaluate all
+# C-preprocessor directives found in the sources and include files.
+# The default value is: YES.
+
+ENABLE_PREPROCESSING   = NO
+
+# If the MACRO_EXPANSION tag is set to YES, doxygen will expand all macro names
+# in the source code. If set to NO, only conditional compilation will be
+# performed. Macro expansion can be done in a controlled way by setting
+# EXPAND_ONLY_PREDEF to YES.
+# The default value is: NO.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+MACRO_EXPANSION        = NO
+
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then
+# the macro expansion is limited to the macros specified with the PREDEFINED and
+# EXPAND_AS_DEFINED tags.
+# The default value is: NO.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+EXPAND_ONLY_PREDEF     = YES
+
+# If the SEARCH_INCLUDES tag is set to YES, the include files in the
+# INCLUDE_PATH will be searched if a #include is found.
+# The default value is: YES.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+SEARCH_INCLUDES        = YES
+
+# The INCLUDE_PATH tag can be used to specify one or more directories that
+# contain include files that are not input files but should be processed by the
+# preprocessor.
+# This tag requires that the tag SEARCH_INCLUDES is set to YES.
+
+INCLUDE_PATH           =
+
+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
+# patterns (like *.h and *.hpp) to filter out the header-files in the
+# directories. If left blank, the patterns specified with FILE_PATTERNS will be
+# used.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+INCLUDE_FILE_PATTERNS  =
+
+# The PREDEFINED tag can be used to specify one or more macro names that are
+# defined before the preprocessor is started (similar to the -D option of e.g.
+# gcc). The argument of the tag is a list of macros of the form: name or
+# name=definition (no spaces). If the definition and the "=" are omitted, "=1"
+# is assumed. To prevent a macro definition from being undefined via #undef or
+# recursively expanded use the := operator instead of the = operator.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+PREDEFINED             =
+
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
+# tag can be used to specify a list of macro names that should be expanded. The
+# macro definition that is found in the sources will be used. Use the PREDEFINED
+# tag if you want to use a different macro definition that overrules the
+# definition found in the source code.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+EXPAND_AS_DEFINED      =
+
+# If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
+# remove all references to function-like macros that are alone on a line, have
+# an all uppercase name, and do not end with a semicolon. Such function macros
+# are typically used for boiler-plate code, and will confuse the parser if not
+# removed.
+# The default value is: YES.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+SKIP_FUNCTION_MACROS   = YES
+
+#---------------------------------------------------------------------------
+# Configuration options related to external references
+#---------------------------------------------------------------------------
+
+# The TAGFILES tag can be used to specify one or more tag files. For each tag
+# file the location of the external documentation should be added. The format of
+# a tag file without this location is as follows:
+# TAGFILES = file1 file2 ...
+# Adding location for the tag files is done as follows:
+# TAGFILES = file1=loc1 "file2 = loc2" ...
+# where loc1 and loc2 can be relative or absolute paths or URLs. See the
+# section "Linking to external documentation" for more information about the use
+# of tag files.
+# Note: Each tag file must have a unique name (where the name does NOT include
+# the path). If a tag file is not located in the directory in which doxygen is
+# run, you must also specify the path to the tagfile here.
+
+TAGFILES               =
+
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create a
+# tag file that is based on the input files it reads. See section "Linking to
+# external documentation" for more information about the usage of tag files.
+
+GENERATE_TAGFILE       =
+
+# If the ALLEXTERNALS tag is set to YES, all external class will be listed in
+# the class index. If set to NO, only the inherited external classes will be
+# listed.
+# The default value is: NO.
+
+ALLEXTERNALS           = NO
+
+# If the EXTERNAL_GROUPS tag is set to YES, all external groups will be listed
+# in the modules index. If set to NO, only the current project's groups will be
+# listed.
+# The default value is: YES.
+
+EXTERNAL_GROUPS        = YES
+
+# If the EXTERNAL_PAGES tag is set to YES, all external pages will be listed in
+# the related pages index. If set to NO, only the current project's pages will
+# be listed.
+# The default value is: YES.
+
+EXTERNAL_PAGES         = YES
+
+# The PERL_PATH should be the absolute path and name of the perl script
+# interpreter (i.e. the result of 'which perl').
+# The default file (with absolute path) is: /usr/bin/perl.
+
+PERL_PATH              = /usr/bin/perl
+
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool
+#---------------------------------------------------------------------------
+
+# If the CLASS_DIAGRAMS tag is set to YES, doxygen will generate a class diagram
+# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to
+# NO turns the diagrams off. Note that this option also works with HAVE_DOT
+# disabled, but it is recommended to install and use dot, since it yields more
+# powerful graphs.
+# The default value is: YES.
+
+CLASS_DIAGRAMS         = NO
+
+# You can define message sequence charts within doxygen comments using the \msc
+# command. Doxygen will then run the mscgen tool (see:
+# http://www.mcternan.me.uk/mscgen/)) to produce the chart and insert it in the
+# documentation. The MSCGEN_PATH tag allows you to specify the directory where
+# the mscgen tool resides. If left empty the tool is assumed to be found in the
+# default search path.
+
+MSCGEN_PATH            =
+
+# You can include diagrams made with dia in doxygen documentation. Doxygen will
+# then run dia to produce the diagram and insert it in the documentation. The
+# DIA_PATH tag allows you to specify the directory where the dia binary resides.
+# If left empty dia is assumed to be found in the default search path.
+
+DIA_PATH               =
+
+# If set to YES the inheritance and collaboration graphs will hide inheritance
+# and usage relations if the target is undocumented or is not a class.
+# The default value is: YES.
+
+HIDE_UNDOC_RELATIONS   = NO
+
+# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
+# available from the path. This tool is part of Graphviz (see:
+# http://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent
+# Bell Labs. The other options in this section have no effect if this option is
+# set to NO
+# The default value is: NO.
+
+HAVE_DOT               = YES
+
+# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
+# to run in parallel. When set to 0 doxygen will base this on the number of
+# processors available in the system. You can set it explicitly to a value
+# larger than 0 to get control over the balance between CPU load and processing
+# speed.
+# Minimum value: 0, maximum value: 32, default value: 0.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_NUM_THREADS        = 0
+
+# When you want a differently looking font in the dot files that doxygen
+# generates you can specify the font name using DOT_FONTNAME. You need to make
+# sure dot is able to find the font, which can be done by putting it in a
+# standard location or by setting the DOTFONTPATH environment variable or by
+# setting DOT_FONTPATH to the directory containing the font.
+# The default value is: Helvetica.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTNAME           = FreeSans.ttf
+
+# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of
+# dot graphs.
+# Minimum value: 4, maximum value: 24, default value: 10.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTSIZE           = 10
+
+# By default doxygen will tell dot to use the default font as specified with
+# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set
+# the path where dot can find it using this tag.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTPATH           =
+
+# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for
+# each documented class showing the direct and indirect inheritance relations.
+# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CLASS_GRAPH            = YES
+
+# If the COLLABORATION_GRAPH tag is set to YES then doxygen will generate a
+# graph for each documented class showing the direct and indirect implementation
+# dependencies (inheritance, containment, and class references variables) of the
+# class with other documented classes.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+COLLABORATION_GRAPH    = YES
+
+# If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for
+# groups, showing the direct groups dependencies.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GROUP_GRAPHS           = NO
+
+# If the UML_LOOK tag is set to YES, doxygen will generate inheritance and
+# collaboration diagrams in a style similar to the OMG's Unified Modeling
+# Language.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+UML_LOOK               = NO
+
+# If the UML_LOOK tag is enabled, the fields and methods are shown inside the
+# class node. If there are many fields or methods and many nodes the graph may
+# become too big to be useful. The UML_LIMIT_NUM_FIELDS threshold limits the
+# number of items for each type to make the size more manageable. Set this to 0
+# for no limit. Note that the threshold may be exceeded by 50% before the limit
+# is enforced. So when you set the threshold to 10, up to 15 fields may appear,
+# but if the number exceeds 15, the total amount of fields shown is limited to
+# 10.
+# Minimum value: 0, maximum value: 100, default value: 10.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+UML_LIMIT_NUM_FIELDS   = 10
+
+# If the TEMPLATE_RELATIONS tag is set to YES then the inheritance and
+# collaboration graphs will show the relations between templates and their
+# instances.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+TEMPLATE_RELATIONS     = NO
+
+# If the INCLUDE_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are set to
+# YES then doxygen will generate a graph for each documented file showing the
+# direct and indirect include dependencies of the file with other documented
+# files.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INCLUDE_GRAPH          = YES
+
+# If the INCLUDED_BY_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are
+# set to YES then doxygen will generate a graph for each documented file showing
+# the direct and indirect include dependencies of the file with other documented
+# files.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INCLUDED_BY_GRAPH      = YES
+
+# If the CALL_GRAPH tag is set to YES then doxygen will generate a call
+# dependency graph for every global function or class method.
+#
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable call graphs for selected
+# functions only using the \callgraph command. Disabling a call graph can be
+# accomplished by means of the command \hidecallgraph.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CALL_GRAPH             = NO
+
+# If the CALLER_GRAPH tag is set to YES then doxygen will generate a caller
+# dependency graph for every global function or class method.
+#
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable caller graphs for selected
+# functions only using the \callergraph command. Disabling a caller graph can be
+# accomplished by means of the command \hidecallergraph.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CALLER_GRAPH           = NO
+
+# If the GRAPHICAL_HIERARCHY tag is set to YES then doxygen will graphical
+# hierarchy of all classes instead of a textual one.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GRAPHICAL_HIERARCHY    = YES
+
+# If the DIRECTORY_GRAPH tag is set to YES then doxygen will show the
+# dependencies a directory has on other directories in a graphical way. The
+# dependency relations are determined by the #include relations between the
+# files in the directories.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DIRECTORY_GRAPH        = YES
+
+# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
+# generated by dot. For an explanation of the image formats see the section
+# output formats in the documentation of the dot tool (Graphviz (see:
+# http://www.graphviz.org/)).
+# Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order
+# to make the SVG files visible in IE 9+ (other browsers do not have this
+# requirement).
+# Possible values are: png, jpg, gif, svg, png:gd, png:gd:gd, png:cairo,
+# png:cairo:gd, png:cairo:cairo, png:cairo:gdiplus, png:gdiplus and
+# png:gdiplus:gdiplus.
+# The default value is: png.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_IMAGE_FORMAT       = svg
+
+# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
+# enable generation of interactive SVG images that allow zooming and panning.
+#
+# Note that this requires a modern browser other than Internet Explorer. Tested
+# and working are Firefox, Chrome, Safari, and Opera.
+# Note: For IE 9+ you need to set HTML_FILE_EXTENSION to xhtml in order to make
+# the SVG files visible. Older versions of IE do not have SVG support.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INTERACTIVE_SVG        = YES
+
+# The DOT_PATH tag can be used to specify the path where the dot tool can be
+# found. If left blank, it is assumed the dot tool can be found in the path.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_PATH               =
+
+# The DOTFILE_DIRS tag can be used to specify one or more directories that
+# contain dot files that are included in the documentation (see the \dotfile
+# command).
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOTFILE_DIRS           =
+
+# The MSCFILE_DIRS tag can be used to specify one or more directories that
+# contain msc files that are included in the documentation (see the \mscfile
+# command).
+
+MSCFILE_DIRS           =
+
+# The DIAFILE_DIRS tag can be used to specify one or more directories that
+# contain dia files that are included in the documentation (see the \diafile
+# command).
+
+DIAFILE_DIRS           =
+
+# When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the
+# path where java can find the plantuml.jar file. If left blank, it is assumed
+# PlantUML is not used or called during a preprocessing step. Doxygen will
+# generate a warning when it encounters a \startuml command in this case and
+# will not generate output for the diagram.
+
+PLANTUML_JAR_PATH      =
+
+# When using plantuml, the specified paths are searched for files specified by
+# the !include statement in a plantuml block.
+
+PLANTUML_INCLUDE_PATH  =
+
+# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes
+# that will be shown in the graph. If the number of nodes in a graph becomes
+# larger than this value, doxygen will truncate the graph, which is visualized
+# by representing a node as a red box. Note that doxygen if the number of direct
+# children of the root node in a graph is already larger than
+# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note that
+# the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
+# Minimum value: 0, maximum value: 10000, default value: 50.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_GRAPH_MAX_NODES    = 1024
+
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs
+# generated by dot. A depth value of 3 means that only nodes reachable from the
+# root by following a path via at most 3 edges will be shown. Nodes that lay
+# further from the root node will be omitted. Note that setting this option to 1
+# or 2 may greatly reduce the computation time needed for large code bases. Also
+# note that the size of a graph can be further restricted by
+# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
+# Minimum value: 0, maximum value: 1000, default value: 0.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+MAX_DOT_GRAPH_DEPTH    = 0
+
+# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
+# background. This is disabled by default, because dot on Windows does not seem
+# to support this out of the box.
+#
+# Warning: Depending on the platform used, enabling this option may lead to
+# badly anti-aliased labels on the edges of a graph (i.e. they become hard to
+# read).
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_TRANSPARENT        = YES
+
+# Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output
+# files in one run (i.e. multiple -o and -T options on the command line). This
+# makes dot run faster, but since only newer versions of dot (>1.8.10) support
+# this, this feature is disabled by default.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_MULTI_TARGETS      = NO
+
+# If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page
+# explaining the meaning of the various boxes and arrows in the dot generated
+# graphs.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GENERATE_LEGEND        = YES
+
+# If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate dot
+# files that are used to generate the various graphs.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_CLEANUP            = YES
diff --git a/htdocs/modulebuilder/template/build/makepack-dolibarrmodule.pl b/htdocs/modulebuilder/template/build/makepack-dolibarrmodule.pl
new file mode 100644
index 00000000000..537fead0d40
--- /dev/null
+++ b/htdocs/modulebuilder/template/build/makepack-dolibarrmodule.pl
@@ -0,0 +1,388 @@
+#!/usr/bin/perl
+#----------------------------------------------------------------------------
+# \file         build/makepack-dolibarrmodule.pl
+# \brief        Package builder (tgz, zip, rpm, deb, exe)
+# \author       (c)2005-2006    Laurent Destailleur <eldy@users.sourceforge.net>
+#               (c)2016         Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
+#----------------------------------------------------------------------------
+
+use Cwd;
+
+
+@LISTETARGET=("TGZ");   # Possible packages
+%REQUIREMENTTARGET=(    # Tool requirement for each package
+"TGZ"=>"tar",
+"ZIP"=>"7z"
+);
+%ALTERNATEPATH=(
+);
+
+
+use vars qw/ $REVISION $VERSION /;
+$REVISION='1.20';
+$VERSION="1.0 (build $REVISION)";
+
+
+
+#------------------------------------------------------------------------------
+# MAIN
+#------------------------------------------------------------------------------
+($DIR=$0) =~ s/([^\/\\]+)$//; ($PROG=$1) =~ s/\.([^\.]*)$//; $Extension=$1;
+$DIR||='.'; $DIR =~ s/([^\/\\])[\\\/]+$/$1/;
+
+# Detect OS type
+# --------------
+if ("$^O" =~ /linux/i || (-d "/etc" && -d "/var" && "$^O" !~ /cygwin/i)) { $OS='linux'; $CR=''; }
+elsif (-d "/etc" && -d "/Users") { $OS='macosx'; $CR=''; }
+elsif ("$^O" =~ /cygwin/i || "$^O" =~ /win32/i) { $OS='windows'; $CR="\r"; }
+if (! $OS) {
+    print "makepack-dolbarrmodule.pl was not able to detect your OS.\n";
+	print "Can't continue.\n";
+	print "makepack-dolibarrmodule.pl aborted.\n";
+    sleep 2;
+	exit 1;
+}
+
+# Define buildroot
+# ----------------
+if ($OS =~ /linux/) {
+    $TEMP=$ENV{"TEMP"}||$ENV{"TMP"}||"/tmp";
+}
+if ($OS =~ /macos/) {
+    $TEMP=$ENV{"TEMP"}||$ENV{"TMP"}||"/tmp";
+}
+if ($OS =~ /windows/) {
+    $TEMP=$ENV{"TEMP"}||$ENV{"TMP"}||"c:/temp";
+    $PROGPATH=$ENV{"ProgramFiles"};
+}
+if (! $TEMP || ! -d $TEMP) {
+    print "Error: A temporary directory can not be find.\n";
+    print "Check that TEMP or TMP environment variable is set correctly.\n";
+	print "makepack-dolibarrmodule.pl aborted.\n";
+    sleep 2;
+    exit 2;
+} 
+$BUILDROOT="$TEMP/dolibarr-buildroot";
+
+
+my $copyalreadydone=0;
+my $batch=0;
+
+for (0..@ARGV-1) {
+	if ($ARGV[$_] =~ /^-*target=(\w+)/i)   { $target=$1; $batch=1; }
+	if ($ARGV[$_] =~ /^-*desti=(.+)/i)     { $DESTI=$1; }
+    if ($ARGV[$_] =~ /^-*prefix=(.+)/i)    {
+    	$PREFIX=$1; 
+    	$FILENAMESNAPSHOT.="-".$PREFIX; 
+    }
+}
+$SOURCE="$DIR/..";
+$DESTI="$SOURCE/build";
+if ($ENV{"DESTIMODULES"}) { $DESTI = $ENV{"DESTIMODULES"}; }		# Force output dir if env DESTIMODULES is defined
+$NEWDESTI=$DESTI;
+
+
+print "Makepack for modules version $VERSION\n";
+print "Source directory: $SOURCE\n";
+print "Target directory: $NEWDESTI\n";
+
+# Autodetect version and module name
+$mod_dir = "../core/modules/";
+opendir(DIR, $mod_dir);
+@mod_files=grep { /^mod\w*\.class.php$/ } readdir(DIR);
+foreach $file (@mod_files) {
+	$PROJECTINPUT=lc $1 if $file =~ /^mod(\w*)\.class.php$/;
+	$file = $mod_dir . $file;
+	open FILE, $file or die $!;
+	@file_content = <FILE>;
+	close FILE;
+	foreach $line (@file_content) {
+		# Extracts version number
+		$PROJVERSION=$1 if $line =~ /(?<=version\s=\s')(\d+(\.\d+){1,2})/;
+	}
+}
+
+# Ask and set version $MAJOR, $MINOR and $BUILD
+if ($PROJVERSION eq '')
+{
+	print "Enter value for version: ";
+	$PROJVERSION=<STDIN>;
+}
+chomp($PROJVERSION);
+($MAJOR,$MINOR,$BUILD)=split(/\./,$PROJVERSION,3);
+if ($MINOR eq '')
+{
+    print "Enter value for minor version: ";
+    $MINOR=<STDIN>;
+    chomp($MINOR);
+}
+
+# Ask module
+if ($PROJECTINPUT eq '')
+{
+	print "Enter name for your module (mymodule, mywonderfulmondule, ... or 'all') : ";
+	$PROJECTINPUT=<STDIN>;
+}
+chomp($PROJECTINPUT);
+print "Move to ".$DIR." directory.\n";
+chdir($DIR);
+
+
+my @PROJECTLIST=();
+if ($PROJECTINPUT eq "all")
+{
+    opendir(DIR, $DIR) || return;
+    local @rv = grep { /^makepack\-(.*)\.conf$/ } sort readdir(DIR);
+    closedir(DIR);
+    foreach my $xxx (0..@rv-1) {
+    	if ($rv[$xxx] =~ /^makepack\-(.*)\.conf$/)
+    	{ 
+    	   @PROJECTLIST[$xxx]=$1;
+    	}
+    }
+}
+else
+{
+	@PROJECTLIST=($PROJECTINPUT);
+}
+
+
+# Loop on each projects
+foreach my $PROJECT (@PROJECTLIST) {
+	
+	if (! -f "makepack-".$PROJECT.".conf")
+	{
+	    print "Error: can't open conf file makepack-".$PROJECT.".conf\n";
+		print "\n";
+		print "For help on building a module package, see web page\n";
+		print 
+"http://wiki.dolibarr.org/cindex.php/Module_development#Create_a_package_to_distribute_and_install_your_module\n";
+		print "makepack-dolibarrmodule.pl aborted.\n";
+	    sleep 2;
+	    exit 2;
+	}
+	
+	$FILENAME="$PROJECT";
+	$FILENAMETGZ="module_$PROJECT-$MAJOR.$MINOR".($BUILD ne ''?".$BUILD":"");
+	$FILENAMEZIP="module_$PROJECT-$MAJOR.$MINOR".($BUILD ne ''?".$BUILD":"");
+	if (-d "/usr/src/redhat") {
+	    # redhat
+	    $RPMDIR="/usr/src/redhat";
+	}
+	if (-d "/usr/src/RPM") {
+	    # mandrake
+	    $RPMDIR="/usr/src/RPM";
+	}
+	
+	
+	# Choose package targets
+	#-----------------------
+	$target="ZIP";    # Dolibarr modules are this format
+	$CHOOSEDTARGET{uc($target)}=1;
+	
+	
+	# Test if requirement is ok
+	#--------------------------
+	foreach my $target (keys %CHOOSEDTARGET) {
+	    foreach my $req (split(/[,\s]/,$REQUIREMENTTARGET{$target})) {
+	        # Test    
+	        print "Test requirement for target $target: Search '$req'... ";
+	        $ret=`"$req" 2>&1`;
+	        $coderetour=$?; $coderetour2=$coderetour>>8;
+	        if ($coderetour != 0 && (($coderetour2 == 1 && $OS =~ /windows/ && $ret !~ /Usage/i) || ($coderetour2 == 127 && $OS !~ /windows/)) && $PROGPATH) { 
+	            # Not found error, we try in PROGPATH
+	            $ret=`"$PROGPATH/$ALTERNATEPATH{$req}/$req\" 2>&1`;
+	            $coderetour=$?; $coderetour2=$coderetour>>8;
+	            $REQUIREMENTTARGET{$target}="$PROGPATH/$ALTERNATEPATH{$req}/$req";
+	        }    
+	
+	        if ($coderetour != 0 && (($coderetour2 == 1 && $OS =~ /windows/ && $ret !~ /Usage/i) || ($coderetour2 == 127 && $OS !~ /windows/))) {
+	            # Not found error
+	            print "Not found\nCan't build target $target. Requirement '$req' not found in PATH\n";
+	            $CHOOSEDTARGET{$target}=-1;
+	            last;
+	        } else {
+	            # Pas erreur ou erreur autre que programme absent
+	            print " Found ".$REQUIREMENTTARGET{$target}."\n";
+	        }
+	    }
+	}
+	
+	print "\n";
+	
+	# Check if there is at least on target to build
+	#----------------------------------------------
+	$nboftargetok=0;
+	$nboftargetneedbuildroot=0;
+	$nboftargetneedcvs=0;
+	foreach my $target (keys %CHOOSEDTARGET) {
+	    if ($CHOOSEDTARGET{$target} < 0) { next; }
+		if ($target ne 'EXE' && $target ne 'EXEDOLIWAMP') 
+		{
+			$nboftargetneedbuildroot++;
+		}
+		if ($target eq 'SNAPSHOT')
+		{
+			$nboftargetneedcvs++;
+		}
+		$nboftargetok++;
+	}
+	
+	if ($nboftargetok) {
+	
+	    # Update CVS if required
+	    #-----------------------
+	    if ($nboftargetneedcvs)
+		{
+	    	print "Go to directory $SOURCE\n";
+	   		$olddir=getcwd();
+	   		chdir("$SOURCE");
+	    	print "Run cvs update -P -d\n";
+	    	$ret=`cvs update -P -d 2>&1`;
+	    	chdir("$olddir");
+		}
+		
+	    # Update buildroot if required
+	    #-----------------------------
+	    if ($nboftargetneedbuildroot)
+		{
+		    if (! $copyalreadydone) {
+		    	print "Delete directory $BUILDROOT\n";
+		    	$ret=`rm -fr "$BUILDROOT"`;
+	
+		    	mkdir "$BUILDROOT";
+		    	mkdir "$BUILDROOT/$PROJECT";
+		    	
+				$result=open(IN,"<makepack-".$PROJECT.".conf");
+				if (! $result) { die "Error: Can't open conf file makepack-".$PROJECT.".conf for reading.\n"; }
+			    while(<IN>)
+			    {
+			    	if ($_ =~ /^#/) { next; }	# Do not process comments
+					
+					$_ =~ s/\n//;
+			    	$_ =~ /^(.*)\/[^\/]+/;
+			    	print "Create directory $BUILDROOT/$PROJECT/$1\n";
+			    	$ret=`mkdir -p "$BUILDROOT/$PROJECT/$1"`;
+			    	if ($_ !~ /version\-/)
+			    	{
+			    	    print "Copy $SOURCE/$_ into $BUILDROOT/$PROJECT/$_\n";
+		    		    $ret=`cp -pr "$SOURCE/$_" "$BUILDROOT/$PROJECT/$_"`;
+			    	}
+				}	
+				close IN;
+				
+				@timearray=localtime(time());
+				$fulldate=($timearray[5]+1900).'-'.($timearray[4]+1).'-'.$timearray[3].' '.$timearray[2].':'.$timearray[1];
+#				open(VF,">$BUILDROOT/$PROJECT/build/version-".$PROJECT.".txt");
+#		
+#				print "Create version file $BUILDROOT/$PROJECT/build/version-".$PROJECT.".txt with date ".$fulldate."\n";
+#				$ret=`mkdir -p "$BUILDROOT/$PROJECT/build"`;
+#				print VF "Version: ".$MAJOR.".".$MINOR.($BUILD ne ''?".$BUILD":"")."\n";
+#				print VF "Build  : ".$fulldate."\n";
+#				close VF;
+		    }
+		    print "Clean $BUILDROOT\n";
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/.cache`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/.project`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/.settings`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/build/html`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/documents`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/document`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php.mysql`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php.old`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php.postgres`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf*sav*`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom`;
+	        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom2`;
+	        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/theme/bureau2crea`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/test`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/Thumbs.db $BUILDROOT/$PROJECT/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/*/Thumbs.db`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/CVS* $BUILDROOT/$PROJECT/*/CVS* $BUILDROOT/$PROJECT/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/CVS*`;
+		}    
+	    
+	    # Build package for each target
+	    #------------------------------
+	    foreach my $target (keys %CHOOSEDTARGET) {
+	        if ($CHOOSEDTARGET{$target} < 0) { next; }
+	    
+	        print "\nBuild package for target $target\n";
+	        
+	    	if ($target eq 'TGZ') {
+	    		$NEWDESTI=$DESTI;
+				if (-d $DESTI.'/../modules') { $NEWDESTI=$DESTI.'/../modules'; } 
+
+	    		print "Remove target $FILENAMETGZ.tgz...\n";
+	    		unlink("$NEWDESTI/$FILENAMETGZ.tgz");
+	    		print "Compress $BUILDROOT/* into $FILENAMETGZ.tgz...\n";
+	   		    $cmd="tar --exclude-vcs --exclude *.tgz --directory \"$BUILDROOT\" --mode=go-w --group=500 --owner=500 -czvf \"$FILENAMETGZ.tgz\" .";
+	   		    $ret=`$cmd`;
+	            if ($OS =~ /windows/i) {
+	        		print "Move $FILENAMETGZ.tgz to $NEWDESTI/$FILENAMETGZ.tgz\n";
+	        		$ret=`mv "$FILENAMETGZ.tgz" "$NEWDESTI/$FILENAMETGZ.tgz"`;
+	            }
+	            else
+	            {
+	        		$ret=`mv "$FILENAMETGZ.tgz" "$NEWDESTI/$FILENAMETGZ.tgz"`;
+	            }
+	            next;
+	    	}
+	
+	    	if ($target eq 'ZIP') {
+	    		$NEWDESTI=$DESTI;
+				if (-d $DESTI.'/../modules') { $NEWDESTI=$DESTI.'/../modules'; }
+				 
+	    		print "Remove target $FILENAMEZIP.zip...\n";
+	    		unlink "$NEWDESTI/$FILENAMEZIP.zip";
+	    		print "Compress $FILENAMEZIP into $FILENAMEZIP.zip...\n";
+	
+	            print "Go to directory $BUILDROOT\n";
+	     		$olddir=getcwd();
+	     		chdir("$BUILDROOT");
+	    		$cmd= "7z a -r -tzip -mx $BUILDROOT/$FILENAMEZIP.zip *";
+				print $cmd."\n";
+				$ret= `$cmd`;
+	            chdir("$olddir");
+	
+	            print "Move $FILENAMEZIP.zip to $NEWDESTI/$FILENAMEZIP.zip\n";
+	            $ret=`mv "$BUILDROOT/$FILENAMEZIP.zip" "$NEWDESTI/$FILENAMEZIP.zip"`;
+	    		next;
+	    	}
+	    
+	    	if ($target eq 'EXE') {
+	    		$NEWDESTI=$DESTI;
+				if (-d $DESTI.'/../modules') { $NEWDESTI=$DESTI.'/../modules'; }
+
+	    		print "Remove target $FILENAMEEXE.exe...\n";
+	    		unlink "$NEWDESTI/$FILENAMEEXE.exe";
+	    		print "Compress into $FILENAMEEXE.exe by $FILENAMEEXE.nsi...\n";
+	    		$command="\"$REQUIREMENTTARGET{$target}\" /DMUI_VERSION_DOT=$MAJOR.$MINOR.$BUILD /X\"SetCompressor bzip2\" \"$SOURCE\\build\\exe\\$FILENAME.nsi\"";
+	            print "$command\n";
+	    		$ret=`$command`;
+	    		print "Move $FILENAMEEXE.exe to $NEWDESTI\n";
+	    		rename("$SOURCE\\build\\exe\\$FILENAMEEXE.exe","$NEWDESTI/$FILENAMEEXE.exe");
+	    		next;
+	    	}
+	    
+	    }
+	
+	}
+	
+	print "\n----- Summary -----\n";
+	foreach my $target (keys %CHOOSEDTARGET) {
+	    if ($CHOOSEDTARGET{$target} < 0) {
+	        print "Package $target not built (bad requirement).\n";
+	    } else {
+	        print "Package $target built successfully in $NEWDESTI\n";
+	    }
+	}
+
+
+}
+
+
+if (! $batch) {
+    print "\nPress key to finish...";
+    my $WAITKEY=<STDIN>;
+}
+
+0;
diff --git a/htdocs/modulebuilder/template/build/makepack-mymodule.conf b/htdocs/modulebuilder/template/build/makepack-mymodule.conf
new file mode 100644
index 00000000000..c7a47fbe45e
--- /dev/null
+++ b/htdocs/modulebuilder/template/build/makepack-mymodule.conf
@@ -0,0 +1,26 @@
+# Your module name here
+#
+# Goal:    Goal of module
+# Version: <version>
+# Author:  Copyright <year> - <name of author>
+# License: GPLv3
+# Install: Just unpack content of module package in Dolibarr directory.
+# Setup:   Go on Dolibarr setup - modules to enable module.
+#
+# Files in module
+index.php
+mypage.php
+admin/
+class/
+COPYING
+core/
+css/
+doc/
+img/
+js/
+langs/
+lib/
+scripts/
+sql/
+vendor/
+README.md
diff --git a/htdocs/modulebuilder/template/class/MyTrigger.php b/htdocs/modulebuilder/template/class/MyTrigger.php
new file mode 100644
index 00000000000..61604b7ff72
--- /dev/null
+++ b/htdocs/modulebuilder/template/class/MyTrigger.php
@@ -0,0 +1,51 @@
+<?php
+/* <one line to give the program's name and a brief idea of what it does.>
+ * Copyright (C) <year>  <name of author>
+ *
+ * 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    class/MyTrigger.php
+ * \ingroup mymodule
+ * \brief   Compatibility class for triggers in Dolibarr < 3.7.
+ *
+ * Hack for compatibility with Dolibarr versions < 3.7.
+ * Remove this and extend DolibarrTriggers directly from interface_99_modMyModule_MyTrigger.class.php
+ * if you don't intend to support these versions.
+ */
+
+// We ignore the PSR1.Classes.ClassDeclaration.MultipleClasses rule.
+// @codingStandardsIgnoreStart
+$dolibarr_version = versiondolibarrarray();
+if ($dolibarr_version[0] < 3 || ($dolibarr_version[0] == 3 && $dolibarr_version[1] < 7)) { // DOL_VERSION < 3.7
+	/**
+	 * Class MyTrigger
+	 *
+	 * For Dolibarr < 3.7.
+	 */
+	abstract class MyTrigger
+	{
+	}
+} else {
+	/**
+	 * Class MyTrigger
+	 *
+	 * For Dolibarr >= 3.7
+	 */
+	abstract class MyTrigger extends DolibarrTriggers
+	{
+	}
+}
+// @codingStandardsIgnoreEnd
diff --git a/htdocs/modulebuilder/template/class/ParsedownDolibarr.php b/htdocs/modulebuilder/template/class/ParsedownDolibarr.php
new file mode 100644
index 00000000000..45cf82f4b9c
--- /dev/null
+++ b/htdocs/modulebuilder/template/class/ParsedownDolibarr.php
@@ -0,0 +1,48 @@
+<?php
+/*
+ * Copyright (C) 2016  Raphaël Doursenaud <rdoursenaud@gpcsolutions.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
+ * 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    class/ParsedownDolibarr.php
+ * \ingroup mymodule
+ * \brief   Custom Parsedown class to display inline images from the README.md in the about page
+ */
+
+/** Includes */
+require __DIR__ . '/../vendor/autoload.php';
+
+/**
+ * Class ParsedownDolibarr
+ */
+class ParsedownDolibarr extends Parsedown
+{
+    /**
+     * Resolve inline images relative URLs to the module's path
+     *
+     * @param $Excerpt
+     * @return array|void
+     */
+    protected function inlineImage($Excerpt)
+    {
+        $image = parent::inlineImage($Excerpt);
+        $path = new \Enrise\Uri($image['element']['attributes']['src']);
+        if ($path->isRelative()) {
+            $image['element']['attributes']['src'] = dol_buildpath('/mymodule/' . $path, 1);
+        }
+        return $image;
+    }
+}
diff --git a/htdocs/modulebuilder/template/class/actions_mymodule.class.php b/htdocs/modulebuilder/template/class/actions_mymodule.class.php
new file mode 100644
index 00000000000..1361a7b4897
--- /dev/null
+++ b/htdocs/modulebuilder/template/class/actions_mymodule.class.php
@@ -0,0 +1,85 @@
+<?php
+/* <one line to give the program's name and a brief idea of what it does.>
+ * Copyright (C) <year>  <name of author>
+ *
+ * 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    class/actions_mymodule.class.php
+ * \ingroup mymodule
+ * \brief   Example hook overload.
+ *
+ * Put detailed description here.
+ */
+
+/**
+ * Class ActionsMyModule
+ */
+class ActionsMyModule
+{
+	/**
+	 * @var array Hook results. Propagated to $hookmanager->resArray for later reuse
+	 */
+	public $results = array();
+
+	/**
+	 * @var string String displayed by executeHook() immediately after return
+	 */
+	public $resprints;
+
+	/**
+	 * @var array Errors
+	 */
+	public $errors = array();
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+	}
+
+	/**
+	 * Overloading the doActions function : replacing the parent's function with the one below
+	 *
+	 * @param   array()         $parameters     Hook metadatas (context, etc...)
+	 * @param   CommonObject    &$object        The object to process (an invoice if you are in invoice module, a propale in propale's module, etc...)
+	 * @param   string          &$action        Current action (if set). Generally create or edit or null
+	 * @param   HookManager     $hookmanager    Hook manager propagated to allow calling another hook
+	 * @return  int                             < 0 on error, 0 on success, 1 to replace standard code
+	 */
+	public function doActions($parameters, &$object, &$action, $hookmanager)
+	{
+		$error = 0; // Error counter
+		$myvalue = 'test'; // A result value
+
+		print_r($parameters);
+		echo "action: " . $action;
+		print_r($object);
+
+		if (in_array('somecontext', explode(':', $parameters['context']))) {
+		  // do something only for the context 'somecontext'
+		}
+
+		if (! $error) {
+			$this->results = array('myreturn' => $myvalue);
+			$this->resprints = 'A text to show';
+			return 0; // or return 1 to replace standard code
+		} else {
+			$this->errors[] = 'Error message';
+			return -1;
+		}
+	}
+}
diff --git a/htdocs/modulebuilder/template/class/myclass.class.php b/htdocs/modulebuilder/template/class/myclass.class.php
new file mode 100644
index 00000000000..336ccf7c98a
--- /dev/null
+++ b/htdocs/modulebuilder/template/class/myclass.class.php
@@ -0,0 +1,361 @@
+<?php
+/* <one line to give the program's name and a brief idea of what it does.>
+ * Copyright (C) <year>  <name of author>
+ *
+ * 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    class/myclass.class.php
+ * \ingroup mymodule
+ * \brief   Example CRUD (Create/Read/Update/Delete) class.
+ *
+ * Put detailed description here.
+ */
+
+/** Includes */
+//require_once DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php";
+//require_once DOL_DOCUMENT_ROOT."/societe/class/societe.class.php";
+//require_once DOL_DOCUMENT_ROOT."/product/class/product.class.php";
+
+/**
+ * Put your class' description here
+ */
+class MyClass // extends CommonObject
+{
+
+    /** @var DoliDb Database handler */
+	private $db;
+    /** @var string Error code or message */
+	public $error;
+    /** @var array Several error codes or messages */
+	public $errors = array();
+    /** @var string Id to identify managed object */
+	//public $element='myelement';
+    /** @var string Name of table without prefix where object is stored */
+	//public $table_element='mytable';
+    /** @var int An example ID */
+	public $id;
+    /** @var mixed An example property */
+	public $prop1;
+    /** @var mixed An example property */
+	public $prop2;
+
+	/**
+	 * Constructor
+	 *
+	 * @param DoliDb $db Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+
+		return 1;
+	}
+
+	/**
+	 * Create object into database
+	 *
+	 * @param User $user User that create
+	 * @param int $notrigger 0=launch triggers after, 1=disable triggers
+	 * @return int <0 if KO, Id of created object if OK
+	 */
+	public function create($user, $notrigger = 0)
+	{
+		global $conf, $langs;
+		$error = 0;
+
+		// Clean parameters
+		if (isset($this->prop1)) {
+			$this->prop1 = trim($this->prop1);
+		}
+		if (isset($this->prop2)) {
+			$this->prop2 = trim($this->prop2);
+		}
+
+		// Check parameters
+		// Put here code to add control on parameters values
+		// Insert request
+		$sql = "INSERT INTO " . MAIN_DB_PREFIX . "mytable(";
+		$sql.= " field1,";
+		$sql.= " field2";
+
+		$sql.= ") VALUES (";
+		$sql.= " '" . $this->prop1 . "',";
+		$sql.= " '" . $this->prop2 . "'";
+
+		$sql.= ")";
+
+		$this->db->begin();
+
+		dol_syslog(__METHOD__ . " sql=" . $sql, LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if (! $resql) {
+			$error ++;
+			$this->errors[] = "Error " . $this->db->lasterror();
+		}
+
+		if (! $error) {
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . "mytable");
+
+			if (! $notrigger) {
+				// Uncomment this and change MYOBJECT to your own tag if you
+				// want this action call a trigger.
+				//// Call triggers
+				//include_once DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php";
+				//$interface=new Interfaces($this->db);
+				//$result=$interface->run_triggers('MYOBJECT_CREATE',$this,$user,$langs,$conf);
+				//if ($result < 0) { $error++; $this->errors=$interface->errors; }
+				//// End call triggers
+			}
+		}
+
+		// Commit or rollback
+		if ($error) {
+			foreach ($this->errors as $errmsg) {
+				dol_syslog(__METHOD__ . " " . $errmsg, LOG_ERR);
+				$this->error.=($this->error ? ', ' . $errmsg : $errmsg);
+			}
+			$this->db->rollback();
+
+			return -1 * $error;
+		} else {
+			$this->db->commit();
+
+			return $this->id;
+		}
+	}
+
+	/**
+	 * Load object in memory from database
+	 *
+	 * @param int $id Id object
+	 * @return int <0 if KO, >0 if OK
+	 */
+	public function fetch($id)
+	{
+		global $langs;
+		$sql = "SELECT";
+		$sql.= " t.rowid,";
+		$sql.= " t.field1,";
+		$sql.= " t.field2";
+		//...
+		$sql.= " FROM " . MAIN_DB_PREFIX . "mytable as t";
+		$sql.= " WHERE t.rowid = " . $id;
+
+		dol_syslog(__METHOD__ . " sql=" . $sql, LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			if ($this->db->num_rows($resql)) {
+				$obj = $this->db->fetch_object($resql);
+
+				$this->id = $obj->rowid;
+				$this->prop1 = $obj->field1;
+				$this->prop2 = $obj->field2;
+				//...
+			}
+			$this->db->free($resql);
+
+			return 1;
+		} else {
+			$this->error = "Error " . $this->db->lasterror();
+			dol_syslog(__METHOD__ . " " . $this->error, LOG_ERR);
+
+			return -1;
+		}
+	}
+
+	/**
+	 * Update object into database
+	 *
+	 * @param User $user User that modify
+	 * @param int $notrigger 0=launch triggers after, 1=disable triggers
+	 * @return int <0 if KO, >0 if OK
+	 */
+	public function update($user = 0, $notrigger = 0)
+	{
+		global $conf, $langs;
+		$error = 0;
+
+		// Clean parameters
+		if (isset($this->prop1)) {
+			$this->prop1 = trim($this->prop1);
+		}
+		if (isset($this->prop2)) {
+			$this->prop2 = trim($this->prop2);
+		}
+
+		// Check parameters
+		// Put here code to add control on parameters values
+		// Update request
+		$sql = "UPDATE " . MAIN_DB_PREFIX . "mytable SET";
+		$sql.= " field1=" . (isset($this->field1) ? "'" . $this->db->escape($this->field1) . "'" : "null") . ",";
+		$sql.= " field2=" . (isset($this->field2) ? "'" . $this->db->escape($this->field2) . "'" : "null") . "";
+
+		$sql.= " WHERE rowid=" . $this->id;
+
+		$this->db->begin();
+
+		dol_syslog(__METHOD__ . " sql=" . $sql, LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if (! $resql) {
+			$error ++;
+			$this->errors[] = "Error " . $this->db->lasterror();
+		}
+
+		if (! $error) {
+			if (! $notrigger) {
+				// Uncomment this and change MYOBJECT to your own tag if you
+				// want this action call a trigger.
+				//// Call triggers
+				//include_once DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php";
+				//$interface=new Interfaces($this->db);
+				//$result=$interface->run_triggers('MYOBJECT_MODIFY',$this,$user,$langs,$conf);
+				//if ($result < 0) { $error++; $this->errors=$interface->errors; }
+				//// End call triggers
+			}
+		}
+
+		// Commit or rollback
+		if ($error) {
+			foreach ($this->errors as $errmsg) {
+				dol_syslog(__METHOD__ . " " . $errmsg, LOG_ERR);
+				$this->error.=($this->error ? ', ' . $errmsg : $errmsg);
+			}
+			$this->db->rollback();
+
+			return -1 * $error;
+		} else {
+			$this->db->commit();
+
+			return 1;
+		}
+	}
+
+	/**
+	 * Delete object in database
+	 *
+	 * @param User $user User that delete
+	 * @param int $notrigger 0=launch triggers after, 1=disable triggers
+	 * @return int <0 if KO, >0 if OK
+	 */
+	public function delete($user, $notrigger = 0)
+	{
+		global $conf, $langs;
+		$error = 0;
+
+		$this->db->begin();
+
+		if (! $error) {
+			if (! $notrigger) {
+				// Uncomment this and change MYOBJECT to your own tag if you
+				// want this action call a trigger.
+				//// Call triggers
+				//include_once DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php";
+				//$interface=new Interfaces($this->db);
+				//$result=$interface->run_triggers('MYOBJECT_DELETE',$this,$user,$langs,$conf);
+				//if ($result < 0) { $error++; $this->errors=$interface->errors; }
+				//// End call triggers
+			}
+		}
+
+		if (! $error) {
+			$sql = "DELETE FROM " . MAIN_DB_PREFIX . "mytable";
+			$sql.= " WHERE rowid=" . $this->id;
+
+			dol_syslog(__METHOD__ . " sql=" . $sql);
+			$resql = $this->db->query($sql);
+			if (! $resql) {
+				$error ++;
+				$this->errors[] = "Error " . $this->db->lasterror();
+			}
+		}
+
+		// Commit or rollback
+		if ($error) {
+			foreach ($this->errors as $errmsg) {
+				dol_syslog(__METHOD__ . " " . $errmsg, LOG_ERR);
+				$this->error.=($this->error ? ', ' . $errmsg : $errmsg);
+			}
+			$this->db->rollback();
+
+			return -1 * $error;
+		} else {
+			$this->db->commit();
+
+			return 1;
+		}
+	}
+
+	/**
+	 * Load an object from its id and create a new one in database
+	 *
+	 * @param int $fromid Id of object to clone
+	 * @return int New id of clone
+	 */
+	public function createFromClone($fromid)
+	{
+		global $user, $langs;
+
+		$error = 0;
+
+		$object = new SkeletonClass($this->db);
+
+		$this->db->begin();
+
+		// Load source object
+		$object->fetch($fromid);
+		$object->id = 0;
+		$object->statut = 0;
+
+		// Clear fields
+		// ...
+		// Create clone
+		$result = $object->create($user);
+
+		// Other options
+		if ($result < 0) {
+			$this->error = $object->error;
+			$error ++;
+		}
+
+		if (! $error) {
+			// Do something
+		}
+
+		// End
+		if (! $error) {
+			$this->db->commit();
+
+			return $object->id;
+		} else {
+			$this->db->rollback();
+
+			return -1;
+		}
+	}
+
+	/**
+	 * Initialise object with example values
+	 * Id must be 0 if object instance is a specimen
+	 *
+	 * @return void
+	 */
+	public function initAsSpecimen()
+	{
+		$this->id = 0;
+		$this->prop1 = 'prop1';
+		$this->prop2 = 'prop2';
+	}
+}
diff --git a/htdocs/modulebuilder/template/core/boxes/mybox.php b/htdocs/modulebuilder/template/core/boxes/mybox.php
new file mode 100644
index 00000000000..4fcdd69ae26
--- /dev/null
+++ b/htdocs/modulebuilder/template/core/boxes/mybox.php
@@ -0,0 +1,195 @@
+<?php
+/* <one line to give the program's name and a brief idea of what it does.>
+ * Copyright (C) <year>  <name of author>
+ *
+ * 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    core/boxes/mybox.php
+ * \ingroup mymodule
+ * \brief   Example box definition.
+ *
+ * Put detailed description here.
+ */
+
+/** Includes */
+include_once DOL_DOCUMENT_ROOT . "/core/boxes/modules_boxes.php";
+
+/**
+ * Class to manage the box
+ *
+ * Warning: for the box to be detected correctly by dolibarr,
+ * the filename should be the lowercase classname
+ */
+class MyBox extends ModeleBoxes
+{
+	/**
+	 * @var string Alphanumeric ID. Populated by the constructor.
+	 */
+	public $boxcode = "mybox";
+
+	/**
+	 * @var string Box icon (in configuration page)
+	 * Automatically calls the icon named with the corresponding "object_" prefix
+	 */
+	public $boximg = "mymodule@mymodule";
+
+	/**
+	 * @var string Box label (in configuration page)
+	 */
+	public $boxlabel;
+
+	/**
+	 * @var string[] Module dependencies
+	 */
+	public $depends = array('mymodule');
+
+	/**
+	 * @var DoliDb Database handler
+	 */
+	public $db;
+
+	/**
+	 * @var mixed More parameters
+	 */
+	public $param;
+
+	/**
+	 * @var array Header informations. Usually created at runtime by loadBox().
+	 */
+	public $info_box_head = array();
+
+	/**
+	 * @var array Contents informations. Usually created at runtime by loadBox().
+	 */
+	public $info_box_contents = array();
+
+	/**
+	 * Constructor
+	 *
+	 * @param DoliDB $db Database handler
+	 * @param string $param More parameters
+	 */
+	public function __construct(DoliDB $db, $param = '')
+	{
+		global $langs;
+		$langs->load("boxes");
+		$langs->load('mymodule@mymodule');
+
+		parent::__construct($db, $param);
+
+		$this->boxlabel = $langs->transnoentitiesnoconv("MyBox");
+
+		$this->param = $param;
+	}
+
+	/**
+	 * Load data into info_box_contents array to show array later. Called by Dolibarr before displaying the box.
+	 *
+	 * @param int $max Maximum number of records to load
+	 * @return void
+	 */
+	public function loadBox($max = 5)
+	{
+		global $langs;
+
+		// Use configuration value for max lines count
+		$this->max = $max;
+
+		//include_once DOL_DOCUMENT_ROOT . "/mymodule/class/mymodule.class.php";
+
+		// Populate the head at runtime
+		$text = $langs->trans("MyBoxDescription", $max);
+		$this->info_box_head = array(
+			// Title text
+			'text' => $text,
+			// Add a link
+			'sublink' => 'http://example.com',
+			// Sublink icon placed after the text
+			'subpicto' => 'object_mymodule@mymodule',
+			// Sublink icon HTML alt text
+			'subtext' => '',
+			// Sublink HTML target
+			'target' => '',
+			// HTML class attached to the picto and link
+			'subclass' => 'center',
+			// Limit and truncate with "…" the displayed text lenght, 0 = disabled
+			'limit' => 0,
+			// Adds translated " (Graph)" to a hidden form value's input (?)
+			'graph' => false
+		);
+
+		// Populate the contents at runtime
+		$this->info_box_contents = array(
+			0 => array( // First line
+				0 => array( // First Column
+					//  HTML properties of the TR element. Only available on the first column.
+					'tr'           => 'align="left"',
+					// HTML properties of the TD element
+					'td'           => '',
+					// Fist line logo
+					'logo'         => 'mymodule@mymodule',
+					// Main text
+					'text'         => 'My text',
+					// Secondary text
+					'text2'        => '<p><strong>Another text</strong></p>',
+					// Unformatted text, usefull to load javascript elements
+					'textnoformat' => '',
+					// Link on 'text' and 'logo' elements
+					'url'          => 'http://example.com',
+					// Link's target HTML property
+					'target'       => '_blank',
+					// Truncates 'text' element to the specified character length, 0 = disabled
+					'maxlength'    => 0,
+					// Prevents HTML cleaning (and truncation)
+					'asis'         => false,
+					// Same for 'text2'
+					'asis2'        => true
+				),
+				1 => array( // Another column
+					// No TR for n≠0
+					'td'   => '',
+					'text' => 'Another cell',
+				)
+			),
+			1 => array( // Another line
+				0 => array( // TR
+					'tr'   => 'align="left"',
+					'text' => 'Another line'
+				)
+			),
+			2 => array( // Another line
+				0 => array( // TR
+					'tr'   => 'align="left"',
+					'text' => 'Yet another line'
+				)
+			),
+		);
+	}
+
+	/**
+	 * Method to show box. Called by Dolibarr eatch time it wants to display the box.
+	 *
+	 * @param array $head Array with properties of box title
+	 * @param array $contents Array with properties of box lines
+	 * @return void
+	 */
+	public function showBox($head = null, $contents = null)
+	{
+		// You may make your own code here…
+		// … or use the parent's class function using the provided head and contents templates
+		parent::showBox($this->info_box_head, $this->info_box_contents);
+	}
+}
diff --git a/htdocs/modulebuilder/template/core/modules/modMyModule.class.php b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
new file mode 100644
index 00000000000..152059cd79a
--- /dev/null
+++ b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
@@ -0,0 +1,719 @@
+<?php
+/* <one line to give the program's name and a brief idea of what it does.>
+ * Copyright (C) <year>  <name of author>
+ *
+ * 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/>.
+ */
+
+/**
+ * \defgroup    mymodule    MyModule module
+ * \brief       MyModule module descriptor.
+ *
+ * Put detailed description here.
+ */
+
+/**
+ * \file        core/modules/modMyModule.class.php
+ * \ingroup     mymodule
+ * \brief       Example module description and activation file.
+ *
+ * Put detailed description here.
+ */
+
+include_once DOL_DOCUMENT_ROOT . "/core/modules/DolibarrModules.class.php";
+
+// The class name should start with a lower case mod for Dolibarr to pick it up
+// so we ignore the Squiz.Classes.ValidClassName.NotCamelCaps rule.
+// @codingStandardsIgnoreStart
+/**
+ * Description and activation class for module MyModule
+ */
+class modMyModule extends DolibarrModules
+{
+	/** @var DoliDB Database handler */
+	public $db;
+
+	/**
+	 * @var int numero Module unique ID
+	 * @see http://wiki.dolibarr.org/index.php/List_of_modules_id Available ranges
+	 */
+	public $numero = 500000;
+
+	/** @var string Text key to reference module (for permissions, menus, etc.) */
+	public $rights_class = 'mymodule';
+
+	/**
+	 * @var string Module family.
+	 * Used to group modules in module setup page.
+	 * Can be one of 'crm', 'financial', 'hr', 'projects', 'products', 'ecm', 'technic', 'other'
+	 */
+	public $family = 'other';
+
+	/** @var int Module position in the family */
+	public $module_position = 500;
+
+	/** @var array Provide a custom family and options */
+	public $familyinfo = array(
+//        'myownfamily' => array(
+//            'position' => '001',
+//            'label' => 'MyOwnFamily'
+//        )
+	);
+
+	/** @var string Module name */
+	public $name = "My Module";
+
+	/** @var string Module short description */
+	public $description = "Description of module MyModule";
+
+	/** @var string Module long description */
+	public $descriptionlong = "A very long description. Can be a full HTML content";
+
+	/**
+	 * @var string Module editor name
+	 * @since 4.0
+	 */
+	public $editor_name = "My Company";
+
+	/**
+	 * @var string Module editor website
+	 * @since 4.0
+	 */
+	public $editor_url = "http://www.example.com";
+
+	/**
+	 * @var string Module version string
+	 * Special values to hide the module behind MAIN_FEATURES_LEVEL: development, experimental
+	 * @see https://semver.org
+	 */
+	public $version = 'development';
+
+	/** @var string Key used in llx_const table to save module status enabled/disabled */
+	public $const_name = 'MAIN_MODULE_MYMODULE';
+
+	/**
+	 * @var string Module logo
+	 * Should be named object_mymodule.png and store under mymodule/img
+	 */
+	public $picto = 'mymodule@mymodule';
+
+	/** @var array Define module parts */
+	public $module_parts = array(
+		/** @var bool Module ships triggers in mymodule/core/triggers */
+		'triggers' => true,
+		/**
+		 * @var bool Module ships login in mymodule/core/login
+		 * @todo: example
+		 */
+		'login' => false,
+		/**
+		 * @var bool Module ships substitution functions
+		 * @todo example
+		 */
+		'substitutions' => false,
+		/**
+		 * @var bool Module ships menu handlers
+		 * @todo example
+		 */
+		'menus' => false,
+		/**
+		 * @var bool Module ships theme in mymodule/theme
+		 * @todo example
+		 */
+		'theme' => false,
+		/**
+		 * @var bool Module shipped templates in mymodule/core/tpl overload core ones
+		 * @todo example
+		 */
+		'tpl' => false,
+		/**
+		 * @var bool Module ships barcode functions
+		 * @todo example
+		 */
+		'barcode' => false,
+		/**
+		 * @var bool Module ships models
+		 * @todo example
+		 */
+		'models' => false,
+		/** @var string[] List of module shipped custom CSS relative file paths */
+		'css' => array(
+			'mymodule/css/mycss.css.php'
+		),
+		/** @var string[] List of module shipped custom JavaScript relative file paths */
+		'js' => array(
+			'mymodule/js/myjs.js.php'
+		),
+		/**
+		 * @var string[] List of hook contexts managed by the module
+		 * @ todo example
+		 */
+		'hooks' => array(),
+		/**
+		 * @var array List of default directory names to force
+		 * @todo example
+		 */
+		'dir' => array(),
+		/**
+		 * @var array List of workflow contexts managed by the module
+		 */
+		'workflow' => array(),
+	);
+
+	/** @var string Data directories to create when module is enabled */
+	public $dirs = array(
+		'/mymodule/temp'
+	);
+
+	/** @var array Configuration page declaration */
+	public $config_page_url = 'setup.php@mymodule';
+
+	/** @var bool Control module visibility */
+	public $hidden = false;
+
+	/** @var string[] List of class names of modules to enable when this one is enabled */
+	public $depends = array();
+
+	/** @var string[] List of class names of modules to disable when this one is disabled */
+	public $requiredby = array();
+
+	/** @var string List of class names of modules this module conflicts with */
+	public $conflictwith = array();
+
+	/** @var int[] Minimum PHP version required by this module */
+	public $phpmin = array(5, 3);
+
+	/** @var int[] Minimum Dolibarr version required by this module */
+	public $need_dolibarr_version = array(3, 2);
+
+	/** @var string[] List of language files */
+	public $langfiles = array('mymodule@mymodule');
+
+	/** @var array Indexed list of constants options */
+	public $const = array(
+		0 => array(
+			/** @var string Constant name */
+			'MYMODULE_MYNEWCONST1',
+			/**
+			 * @var string Constant type
+			 * @todo Are there other types than 'chaine'?
+			 */
+			'chaine',
+			/** @var string Constant initial value */
+			'myvalue',
+			/** @var string Constant description */
+			'This is a configuration constant',
+			/** @var bool Constant visibility */
+			true,
+			/**
+			 * @var string Multi-company entities
+			 * 'current' or 'allentities'
+			 */
+			'current',
+			/** @var bool Delete constant when module is disabled */
+			true
+		)
+	);
+
+	/**
+	 * @var string List of pages to add as tab in a specific view
+	 * @todo example
+	 */
+	public $tabs = array();
+
+	/**
+	 * @var array Dictionaries declared by the module
+	 *@todo example
+	 */
+	public $dictionaries = array();
+
+	/** @var array Indexed list of boxes options */
+	public $boxes = array(
+		0 => array(
+			'file' => 'mybox@mymodule',
+			'note' => '',
+			'enabledbydefaulton' => 'Home'
+		)
+	);
+
+	/**
+	 * @var array Indexed list of cronjobs options
+	 * @todo: example
+	 */
+	public $cronjobs = array();
+
+	/**
+	 * @var array Indexed list of permissions options
+	 * @todo example
+	 */
+	public $rights = array();
+
+	/**
+	 * @var array Indexed list of menu options
+	 * @todo example
+	 */
+	public $menu = array();
+
+	/**
+	 * @var array Indexed list of export IDs
+	 * @todo example
+	 */
+	public $export_code = array();
+
+	/**
+	 * @var array Indexed list of export names
+	 * @todo example
+	 */
+	public $export_label = array();
+
+	/**
+	 * @var array Indexed list of export enabling conditions
+	 * @todo example
+	 */
+	public $export_enabled = array();
+
+	/**
+	 * @var array Indexed list of export required permissions
+	 * @todo example
+	 */
+	public $export_permission = array();
+
+	/**
+	 * @var array Indexed list of export fields
+	 * @todo example
+	 */
+	public $export_fields_array = array();
+
+	/**
+	 * @var array Indexed list of export entities
+	 * @todo example
+	 */
+	public $export_entities_array = array();
+
+	/**
+	 * @var array Indexed list of export SQL queries start
+	 * @todo example
+	 */
+	public $export_sql_start = array();
+
+	/**
+	 * @var array Indexed list of export SQL queries end
+	 * @todo example
+	 */
+	public $export_sql_end = array();
+
+	/** @var bool Module only enabled / disabled in main company when multi-company is in use */
+	public $core_enabled = false;
+
+	// @codingStandardsIgnoreEnd
+	/**
+	 * Constructor. Define names, constants, directories, boxes, permissions
+	 *
+	 * @param DoliDB $db Database handler
+	 */
+	public function __construct($db)
+	{
+		global $langs, $conf;
+
+		// DolibarrModules is abstract in Dolibarr < 3.8
+		if (is_callable('parent::__construct')) {
+			parent::__construct($db);
+		} else {
+			global $db;
+			$this->db = $db;
+		}
+
+		// Declare custom family with translated label
+		//$this->familyinfo = array(
+		//	'myownfamily' => array(
+		//		'position' => '001',
+		//		'label' => $langs->trans("MyOwnFamily")
+		//	)
+		//);
+
+		// Lazy automatic module naming from class names
+		//$this->name = preg_replace('/^mod/i', '', get_class($this));
+
+		// Lazy automatic constant naming from module name
+		//$this->const_name = 'MAIN_MODULE_' . strtoupper($this->name);
+
+		// Examples for complex types
+		//$this->module_parts = array(
+			// Set here all hooks context managed by module
+			// 'hooks' => array('hookcontext1','hookcontext2'),
+			// To force the default directories names
+			// 'dir' => array('output' => 'othermodulename'),
+			// Set here all workflow context managed by module
+			// Don't forget to depend on modWorkflow!
+			// The description translation key will be descWORKFLOW_MODULE1_YOURACTIONTYPE_MODULE2
+			// You will be able to check if it is enabled with the $conf->global->WORKFLOW_MODULE1_YOURACTIONTYPE_MODULE2 constant
+			// Implementation is up to you and is usually done in a trigger.
+			// 'workflow' => array(
+			//     'WORKFLOW_MODULE1_YOURACTIONTYPE_MODULE2' => array(
+			//         'enabled' => '! empty($conf->module1->enabled) && ! empty($conf->module2->enabled)',
+			//         'picto' => 'yourpicto@mymodule',
+			//         'warning' => 'WarningTextTranslationKey',
+			//      ),
+			// ),
+		//);
+
+
+		// Array to add new pages in new tabs
+		// Example:
+		//$this->tabs = array(
+			//	// To add a new tab identified by code tabname1
+			//	'objecttype:+tabname1:Title1:langfile@mymodule:$user->rights->mymodule->read:/mymodule/mynewtab1.php?id=__ID__',
+			//	// To add another new tab identified by code tabname2
+			//	'objecttype:+tabname2:Title2:langfile@mymodule:$user->rights->othermodule->read:/mymodule/mynewtab2.php?id=__ID__',
+			//	// To remove an existing tab identified by code tabname
+			//	'objecttype:-tabname'
+		//);
+		// 'categories_x'	  to add a tab in category view (replace 'x' by type of category (0=product, 1=supplier, 2=customer, 3=member)
+		// 'contact'          to add a tab in contact view
+		// 'contract'         to add a tab in contract view
+		// 'group'            to add a tab in group view
+		// 'intervention'     to add a tab in intervention view
+		// 'invoice'          to add a tab in customer invoice view
+		// 'invoice_supplier' to add a tab in supplier invoice view
+		// 'member'           to add a tab in fundation member view
+		// 'opensurveypoll'	  to add a tab in opensurvey poll view
+		// 'order'            to add a tab in customer order view
+		// 'order_supplier'   to add a tab in supplier order view
+		// 'payment'		  to add a tab in payment view
+		// 'payment_supplier' to add a tab in supplier payment view
+		// 'product'          to add a tab in product view
+		// 'propal'           to add a tab in propal view
+		// 'project'          to add a tab in project view
+		// 'stock'            to add a tab in stock view
+		// 'thirdparty'       to add a tab in third party view
+		// 'user'             to add a tab in user view
+
+		// Dictionaries
+		if (! isset($conf->mymodule->enabled)) {
+			$conf->mymodule=new stdClass();
+			$conf->mymodule->enabled = 0;
+		}
+		//$this->dictionaries = array();
+		/* Example:
+		  $this->dictionaries=array(
+			  'langs'=>'mymodule@mymodule',
+			  // List of tables we want to see into dictonary editor
+			  'tabname'=>array(
+				  MAIN_DB_PREFIX."table1",
+				  MAIN_DB_PREFIX."table2",
+				  MAIN_DB_PREFIX."table3"
+			  ),
+			  // Label of tables
+			  'tablib'=>array("Table1","Table2","Table3"),
+			  // Query to select fields
+			  'tabsql'=>array(
+				  'SELECT f.rowid as rowid, f.code, f.label, f.active'
+				  . ' FROM ' . MAIN_DB_PREFIX . 'table1 as f',
+				  'SELECT f.rowid as rowid, f.code, f.label, f.active'
+				  . ' FROM ' . MAIN_DB_PREFIX . 'table2 as f',
+				  'SELECT f.rowid as rowid, f.code, f.label, f.active'
+				  . ' FROM ' . MAIN_DB_PREFIX . 'table3 as f'
+			  ),
+			  // Sort order
+			  'tabsqlsort'=>array("label ASC","label ASC","label ASC"),
+			  // List of fields (result of select to show dictionary)
+			  'tabfield'=>array("code,label","code,label","code,label"),
+			  // List of fields (list of fields to edit a record)
+			  'tabfieldvalue'=>array("code,label","code,label","code,label"),
+			  // List of fields (list of fields for insert)
+			  'tabfieldinsert'=>array("code,label","code,label","code,label"),
+			  // Name of columns with primary key (try to always name it 'rowid')
+			  'tabrowid'=>array("rowid","rowid","rowid"),
+			  // Condition to show each dictionary
+			  'tabcond'=>array(
+				  $conf->mymodule->enabled,
+				  $conf->mymodule->enabled,
+				  $conf->mymodule->enabled
+			  )
+		  );
+		 */
+
+		// Cronjobs
+		// List of cron jobs entries to add
+		//$this->cronjobs = array();
+		// Example:
+		//		$this->cronjobs = array(
+		//			0 => array(
+		//				'label' => 'My label',
+		//				'jobtype' => 'method',
+		//				'class' => '/dir/class/file.class.php',
+		//				'objectname' => 'MyClass',
+		//				'method' => 'myMethod',
+		//				'parameters' => '',
+		//				'comment' => 'Comment',
+		//				'frequency' => 2,
+		//				'unitfrequency' => 3600,
+		//				'test' => true
+		//			),
+		//			1 => array(
+		//				'label' => 'My label',
+		//				'jobtype' => 'command',
+		//				'command' => '',
+		//				'parameters' => '',
+		//				'comment' => 'Comment',
+		//				'frequency' => 1,
+		//				'unitfrequency' => 3600 * 24,
+		//				'test' => true
+		//			)
+		//		);
+
+		// Permissions
+		//$r = 0;
+		// Add here list of permission defined by
+		// an id, a label, a boolean and two constant strings.
+		// Example:
+		//// Permission id (must not be already used)
+		//$this->rights[$r][0] = 2000;
+		//// Permission label
+		//$this->rights[$r][1] = 'Permision label';
+		//// Permission by default for new user (0/1)
+		//$this->rights[$r][3] = 1;
+		//// In php code, permission will be checked by test
+		//// if ($user->rights->permkey->level1->level2)
+		//$this->rights[$r][4] = 'level1';
+		//// In php code, permission will be checked by test
+		//// if ($user->rights->permkey->level1->level2)
+		//$this->rights[$r][5] = 'level2';
+		//$r++;
+		// Main menu entries
+
+		// Menu entries
+		// Example to declare a new Top Menu entry and its Left menu entry:
+		//$this->menu[]=array(
+		//	// Put 0 if this is a top menu
+		//	'fk_menu'=>0,
+		//	// This is a Top menu entry
+		//	'type'=>'top',
+		// Menu's title. FIXME: use a translation key
+		//	'titre'=>'MyModule top menu',
+		// This menu's mainmenu ID
+		//	'mainmenu'=>'mymodule',
+		// This menu's leftmenu ID
+		//	'leftmenu'=>'mymodule',
+		//	'url'=>'/mymodule/pagetop.php',
+		//	// Lang file to use (without .lang) by module.
+		//	// File must be in langs/code_CODE/ directory.
+		//	'langs'=>'mylangfile',
+		//	'position'=>100,
+		//	// Define condition to show or hide menu entry.
+		//	// Use '$conf->mymodule->enabled' if entry must be visible if module is enabled.
+		//	'enabled'=>'$conf->mymodule->enabled',
+		//	// Use 'perms'=>'$user->rights->mymodule->level1->level2'
+		//	// if you want your menu with a permission rules
+		//	'perms'=>'1',
+		//	'target'=>'',
+		//	// 0=Menu for internal users, 1=external users, 2=both
+		//	'user'=>2
+		//);
+		//$this->menu[]=array(
+		//	// Use r=value where r is index key used for the parent menu entry
+		//	// (higher parent must be a top menu entry)
+		//	'fk_menu'=>'r=0',
+		//	// This is a Left menu entry
+		//	'type'=>'left',
+		// Menu's title. FIXME: use a translation key
+		//	'titre'=>'MyModule left menu',
+		// This menu's mainmenu ID
+		//	'mainmenu'=>'mymodule',
+		// This menu's leftmenu ID
+		//	'leftmenu'=>'mymodule',
+		//	'url'=>'/mymodule/pagelevel1.php',
+		//	// Lang file to use (without .lang) by module.
+		//	// File must be in langs/code_CODE/ directory.
+		//	'langs'=>'mylangfile',
+		//	'position'=>100,
+		//	// Define condition to show or hide menu entry.
+		//	// Use '$conf->mymodule->enabled' if entry must be visible if module is enabled.
+		//	'enabled'=>'$conf->mymodule->enabled',
+		//	// Use 'perms'=>'$user->rights->mymodule->level1->level2'
+		//	// if you want your menu with a permission rules
+		//	'perms'=>'1',
+		//	'target'=>'',
+		//	// 0=Menu for internal users, 1=external users, 2=both
+		//	'user'=>2
+		//);
+		//
+		// Example to declare a Left Menu entry into an existing Top menu entry:
+		//$this->menu[]=array(
+		//	// Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy'
+		//	'fk_menu'=>'fk_mainmenu=mainmenucode',
+		//	// This is a Left menu entry
+		//	'type'=>'left',
+		// Menu's title. FIXME: use a translation key
+		//	'titre'=>'MyModule left menu',
+		// This menu's mainmenu ID
+		//	'mainmenu'=>'mainmenucode',
+		// This menu's leftmenu ID
+		//	'leftmenu'=>'mymodule',
+		//	'url'=>'/mymodule/pagelevel2.php',
+		//	// Lang file to use (without .lang) by module.
+		//	// File must be in langs/code_CODE/ directory.
+		//	'langs'=>'mylangfile',
+		//	'position'=>100,
+		//	// Define condition to show or hide menu entry.
+		//	// Use '$conf->mymodule->enabled' if entry must be visible if module is enabled.
+		//	// Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+		//	'enabled'=>'$conf->mymodule->enabled',
+		//	// Use 'perms'=>'$user->rights->mymodule->level1->level2'
+		//	// if you want your menu with a permission rules
+		//	'perms'=>'1',
+		//	'target'=>'',
+		//	// 0=Menu for internal users, 1=external users, 2=both
+		//	'user'=>2
+		//);
+
+		// Exports
+		//$r = 0;
+		// Example:
+		//$this->export_code[$r]=$this->rights_class.'_'.$r;
+		//// Translation key (used only if key ExportDataset_xxx_z not found)
+		//$this->export_label[$r]='CustomersInvoicesAndInvoiceLines';
+		//// Condition to show export in list (ie: '$user->id==3').
+		//// Set to 1 to always show when module is enabled.
+		//$this->export_enabled[$r]='1';
+		//$this->export_permission[$r]=array(array("facture","facture","export"));
+		//$this->export_fields_array[$r]=array(
+		//	's.rowid'=>"IdCompany",
+		//	's.nom'=>'CompanyName',
+		//	's.address'=>'Address',
+		//	's.cp'=>'Zip',
+		//	's.ville'=>'Town',
+		//	's.fk_pays'=>'Country',
+		//	's.tel'=>'Phone',
+		//	's.siren'=>'ProfId1',
+		//	's.siret'=>'ProfId2',
+		//	's.ape'=>'ProfId3',
+		//	's.idprof4'=>'ProfId4',
+		//	's.code_compta'=>'CustomerAccountancyCode',
+		//	's.code_compta_fournisseur'=>'SupplierAccountancyCode',
+		//	'f.rowid'=>"InvoiceId",
+		//	'f.facnumber'=>"InvoiceRef",
+		//	'f.datec'=>"InvoiceDateCreation",
+		//	'f.datef'=>"DateInvoice",
+		//	'f.total'=>"TotalHT",
+		//	'f.total_ttc'=>"TotalTTC",
+		//	'f.tva'=>"TotalVAT",
+		//	'f.paye'=>"InvoicePaid",
+		//	'f.fk_statut'=>'InvoiceStatus',
+		//	'f.note'=>"InvoiceNote",
+		//	'fd.rowid'=>'LineId',
+		//	'fd.description'=>"LineDescription",
+		//	'fd.price'=>"LineUnitPrice",
+		//	'fd.tva_tx'=>"LineVATRate",
+		//	'fd.qty'=>"LineQty",
+		//	'fd.total_ht'=>"LineTotalHT",
+		//	'fd.total_tva'=>"LineTotalTVA",
+		//	'fd.total_ttc'=>"LineTotalTTC",
+		//	'fd.date_start'=>"DateStart",
+		//	'fd.date_end'=>"DateEnd",
+		//	'fd.fk_product'=>'ProductId',
+		//	'p.ref'=>'ProductRef'
+		//);
+		//$this->export_entities_array[$r]=array('s.rowid'=>"company",
+		//	's.nom'=>'company',
+		//	's.address'=>'company',
+		//	's.cp'=>'company',
+		//	's.ville'=>'company',
+		//	's.fk_pays'=>'company',
+		//	's.tel'=>'company',
+		//	's.siren'=>'company',
+		//	's.siret'=>'company',
+		//	's.ape'=>'company',
+		//	's.idprof4'=>'company',
+		//	's.code_compta'=>'company',
+		//	's.code_compta_fournisseur'=>'company',
+		//	'f.rowid'=>"invoice",
+		//	'f.facnumber'=>"invoice",
+		//	'f.datec'=>"invoice",
+		//	'f.datef'=>"invoice",
+		//	'f.total'=>"invoice",
+		//	'f.total_ttc'=>"invoice",
+		//	'f.tva'=>"invoice",
+		//	'f.paye'=>"invoice",
+		//	'f.fk_statut'=>'invoice',
+		//	'f.note'=>"invoice",
+		//	'fd.rowid'=>'invoice_line',
+		//	'fd.description'=>"invoice_line",
+		//	'fd.price'=>"invoice_line",
+		//	'fd.total_ht'=>"invoice_line",
+		//	'fd.total_tva'=>"invoice_line",
+		//	'fd.total_ttc'=>"invoice_line",
+		//	'fd.tva_tx'=>"invoice_line",
+		//	'fd.qty'=>"invoice_line",
+		//	'fd.date_start'=>"invoice_line",
+		//	'fd.date_end'=>"invoice_line",
+		//	'fd.fk_product'=>'product',
+		//	'p.ref'=>'product'
+		//);
+		//$this->export_sql_start[$r] = 'SELECT DISTINCT ';
+		//$this->export_sql_end[$r] = ' FROM (' . MAIN_DB_PREFIX . 'facture as f, '
+		//	. MAIN_DB_PREFIX . 'facturedet as fd, ' . MAIN_DB_PREFIX . 'societe as s)';
+		//$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';
+		//$r++;
+	}
+
+	/**
+	 * Function called when module is enabled.
+	 * The init function add constants, boxes, permissions and menus
+	 * (defined in constructor) into Dolibarr database.
+	 * It also creates data directories
+	 *
+	 * @param string $options Options when enabling module ('', 'noboxes')
+	 * @return int 1 if OK, 0 if KO
+	 */
+	public function init($options = '')
+	{
+		$sql = array();
+
+		$result = $this->loadTables();
+
+		return $this->_init($sql, $options);
+	}
+
+	/**
+	 * Create tables, keys and data required by module
+	 * Files llx_table1.sql, llx_table1.key.sql llx_data.sql with create table, create keys
+	 * and create data commands must be stored in directory /mymodule/sql/
+	 * This function is called by this->init
+	 *
+	 * @return int <=0 if KO, >0 if OK
+	 */
+	private function loadTables()
+	{
+		return $this->_load_tables('/mymodule/sql/');
+	}
+
+	/**
+	 * Function called when module is disabled.
+	 * Remove from database constants, boxes and permissions from Dolibarr database.
+	 * Data directories are not deleted
+	 *
+	 * @param string $options Options when enabling module ('', 'noboxes')
+	 * @return int 1 if OK, 0 if KO
+	 */
+	public function remove($options = '')
+	{
+		$sql = array();
+
+		return $this->_remove($sql, $options);
+	}
+}
diff --git a/htdocs/modulebuilder/template/core/tpl/mytemplate.tpl.php b/htdocs/modulebuilder/template/core/tpl/mytemplate.tpl.php
new file mode 100644
index 00000000000..206494c50f9
--- /dev/null
+++ b/htdocs/modulebuilder/template/core/tpl/mytemplate.tpl.php
@@ -0,0 +1,28 @@
+<?php
+/* <one line to give the program's name and a brief idea of what it does.>
+ * Copyright (C) <year>  <name of author>
+ *
+ * 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    core/tpl/mytemplate.tpl.php
+ * \ingroup mymodule
+ * \brief   Example template.
+ *
+ * Put detailed description here.
+ */
+
+/** Your code here. */
+echo "Hello world!";
diff --git a/htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_MyTrigger.class.php b/htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_MyTrigger.class.php
new file mode 100644
index 00000000000..761a717d944
--- /dev/null
+++ b/htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_MyTrigger.class.php
@@ -0,0 +1,580 @@
+<?php
+/* <one line to give the program's name and a brief idea of what it does.>
+ * Copyright (C) <year>  <name of author>
+ *
+ * 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    core/triggers/interface_99_modMyModule_MyTrigger.class.php
+ * \ingroup mymodule
+ * \brief   Example trigger.
+ *
+ * Put detailed description here.
+ *
+ * \remarks You can create other triggers by copying this one.
+ * - File name should be either:
+ *      - interface_99_modMyModule_MyTrigger.class.php
+ *      - interface_99_all_MyTrigger.class.php
+ * - The file must stay in core/triggers
+ * - The class name must be InterfaceMytrigger
+ * - The constructor method must be named InterfaceMytrigger
+ * - The name property name must be Mytrigger
+ */
+
+/** Includes */
+require_once DOL_DOCUMENT_ROOT . '/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT . dol_buildpath('/mymodule/class/MyTrigger.php', 1);
+
+/**
+ * Class InterfaceMytrigger
+ */
+class InterfaceMytrigger extends MyTrigger
+{
+	/**
+	 * @var DoliDB Database handler
+	 */
+	protected $db;
+
+	/**
+	 * Constructor
+	 *
+	 * @param DoliDB $db Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+
+		$this->name = preg_replace('/^Interface/i', '', get_class($this));
+		$this->family = "demo";
+		$this->description = "Triggers of this module are empty functions."
+			. "They have no effect."
+			. "They are provided for tutorial purpose only.";
+		// 'development', 'experimental', 'dolibarr' or version
+		$this->version = 'development';
+		$this->picto = 'mymodule@mymodule';
+	}
+
+	/**
+	 * Trigger name
+	 *
+	 * @return string Name of trigger file
+	 */
+	public function getName()
+	{
+		return $this->name;
+	}
+
+	/**
+	 * Trigger description
+	 *
+	 * @return string Description of trigger file
+	 */
+	public function getDesc()
+	{
+		return $this->description;
+	}
+
+	/**
+	 * Trigger version
+	 *
+	 * @return string Version of trigger file
+	 */
+	public function getVersion()
+	{
+		global $langs;
+		$langs->load("admin");
+
+		if ($this->version == 'development') {
+			return $langs->trans("Development");
+		} elseif ($this->version == 'experimental') {
+			return $langs->trans("Experimental");
+		} elseif ($this->version == 'dolibarr') {
+			return DOL_VERSION;
+		} elseif ($this->version) {
+			return $this->version;
+		} else {
+			return $langs->trans("Unknown");
+		}
+	}
+
+    // @codingStandardsIgnoreStart
+	/**
+	 * Compatibility trigger function for Dolibarr < 3.7
+	 *
+	 * @param int $action Trigger action
+	 * @param CommonObject $object Object trigged from
+	 * @param User $user User that trigged
+	 * @param Translate $langs Translations handler
+	 * @param Conf $conf Configuration
+	 * @return int                  <0 if KO, 0 if no triggered ran, >0 if OK
+	 * @deprecated Replaced by DolibarrTriggers::runTrigger()
+	 */
+	public function run_trigger($action, $object, $user, $langs, $conf)
+	{
+		return $this->runTrigger($action, $object, $user, $langs, $conf);
+	}
+	// @codingStandardsIgnoreEnd
+
+	/**
+	 * Function called when a Dolibarrr business event is done.
+	 * All functions "runTrigger" are triggered if file
+	 * is inside directory core/triggers
+	 *
+	 * @param string $action Event action code
+	 * @param CommonObject $object Object
+	 * @param User $user Object user
+	 * @param Translate $langs Object langs
+	 * @param Conf $conf Object conf
+	 * @return int              <0 if KO, 0 if no triggered ran, >0 if OK
+	 */
+	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
+	{
+		// Put here code you want to execute when a Dolibarr business events occurs.
+		// Data and type of action are stored into $object and $action
+
+		/** Users */
+		if ($action == 'USER_LOGIN') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'USER_UPDATE_SESSION') {
+			// Warning: To increase performances, this action is triggered only if
+			// constant MAIN_ACTIVATE_UPDATESESSIONTRIGGER is set to 1.
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'USER_CREATE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'USER_CREATE_FROM_CONTACT') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'USER_MODIFY') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'USER_NEW_PASSWORD') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'USER_ENABLEDISABLE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'USER_DELETE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'USER_LOGOUT') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'USER_SETINGROUP') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'USER_REMOVEFROMGROUP') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+
+			/** Groups */
+		} elseif ($action == 'GROUP_CREATE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'GROUP_MODIFY') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'GROUP_DELETE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+
+			/** Companies */
+		} elseif ($action == 'COMPANY_CREATE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'COMPANY_MODIFY') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'COMPANY_DELETE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+
+			/** Contacts */
+		} elseif ($action == 'CONTACT_CREATE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'CONTACT_MODIFY') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'CONTACT_DELETE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+			// Products
+		} elseif ($action == 'PRODUCT_CREATE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'PRODUCT_MODIFY') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'PRODUCT_DELETE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+
+			/** Customer orders */
+		} elseif ($action == 'ORDER_CREATE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'ORDER_CLONE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'ORDER_VALIDATE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'ORDER_DELETE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'ORDER_BUILDDOC') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'ORDER_SENTBYMAIL') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'LINEORDER_INSERT') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'LINEORDER_DELETE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+
+			/** Supplier orders */
+		} elseif ($action == 'ORDER_SUPPLIER_CREATE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'ORDER_SUPPLIER_VALIDATE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'ORDER_SUPPLIER_SENTBYMAIL') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'SUPPLIER_ORDER_BUILDDOC') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+
+			/** Proposals */
+		} elseif ($action == 'PROPAL_CREATE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'PROPAL_CLONE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'PROPAL_MODIFY') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'PROPAL_VALIDATE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'PROPAL_BUILDDOC') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'PROPAL_SENTBYMAIL') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'PROPAL_CLOSE_SIGNED') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'PROPAL_CLOSE_REFUSED') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'PROPAL_DELETE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'LINEPROPAL_INSERT') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'LINEPROPAL_MODIFY') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'LINEPROPAL_DELETE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+
+			/** Contracts */
+		} elseif ($action == 'CONTRACT_CREATE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'CONTRACT_MODIFY') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'CONTRACT_ACTIVATE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'CONTRACT_CANCEL') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'CONTRACT_CLOSE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'CONTRACT_DELETE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+
+			/** Bills */
+		} elseif ($action == 'BILL_CREATE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'BILL_CLONE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'BILL_MODIFY') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'BILL_VALIDATE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'BILL_BUILDDOC') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'BILL_SENTBYMAIL') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'BILL_CANCEL') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'BILL_DELETE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'LINEBILL_INSERT') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'LINEBILL_DELETE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+
+			/** Payments */
+		} elseif ($action == 'PAYMENT_CUSTOMER_CREATE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'PAYMENT_SUPPLIER_CREATE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'PAYMENT_ADD_TO_BANK') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'PAYMENT_DELETE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+
+			/** Interventions */
+		} elseif ($action == 'FICHEINTER_CREATE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'FICHEINTER_MODIFY') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'FICHEINTER_VALIDATE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'FICHEINTER_DELETE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+
+			/** Members */
+		} elseif ($action == 'MEMBER_CREATE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'MEMBER_VALIDATE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'MEMBER_SUBSCRIPTION') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'MEMBER_MODIFY') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'MEMBER_NEW_PASSWORD') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'MEMBER_RESILIATE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'MEMBER_DELETE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+
+			/** Categories */
+		} elseif ($action == 'CATEGORY_CREATE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'CATEGORY_MODIFY') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'CATEGORY_DELETE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+
+			/** Projects */
+		} elseif ($action == 'PROJECT_CREATE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'PROJECT_MODIFY') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'PROJECT_DELETE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+			/** Project tasks */
+		} elseif ($action == 'TASK_CREATE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'TASK_MODIFY') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'TASK_DELETE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+
+			/** Task time spent */
+		} elseif ($action == 'TASK_TIMESPENT_CREATE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'TASK_TIMESPENT_MODIFY') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'TASK_TIMESPENT_DELETE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+
+			/** Shipping */
+		} elseif ($action == 'SHIPPING_CREATE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'SHIPPING_MODIFY') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'SHIPPING_VALIDATE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'SHIPPING_SENTBYMAIL') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'SHIPPING_DELETE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'SHIPPING_BUILDDOC') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+
+			/** File */
+		} elseif ($action == 'FILE_UPLOAD') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'FILE_DELETE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		}
+
+		return 0;
+	}
+}
diff --git a/htdocs/modulebuilder/template/css/mycss.css.php b/htdocs/modulebuilder/template/css/mycss.css.php
new file mode 100644
index 00000000000..eaa248288e8
--- /dev/null
+++ b/htdocs/modulebuilder/template/css/mycss.css.php
@@ -0,0 +1,27 @@
+<?php
+/* <one line to give the program's name and a brief idea of what it does.>
+ * Copyright (C) <year>  <name of author>
+ *
+ * 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    css/mycss.css.php
+ * \ingroup mymodule
+ * \brief   Example CSS.
+ *
+ * Put detailed description here.
+ */
+
+header('Content-Type: text/css');
diff --git a/htdocs/modulebuilder/template/dev/codesniffer/DolibarrPSR2.xml b/htdocs/modulebuilder/template/dev/codesniffer/DolibarrPSR2.xml
new file mode 100644
index 00000000000..48d3f5d8d1d
--- /dev/null
+++ b/htdocs/modulebuilder/template/dev/codesniffer/DolibarrPSR2.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<ruleset name="Dolibarr (PSR2)">
+ <description>The PSR2 standard with Dolibarr quirks.</description>
+
+ <!-- Include the whole PSR2 standard -->
+ <rule ref="PSR2">
+     <!-- Code can be indented with tabs -->
+     <exclude name="Generic.WhiteSpace.DisallowTabIndent" />
+     <!-- Dolibarr don't support namespacing (yet) -->
+     <exclude name="PSR1.Classes.ClassDeclaration.MissingNamespace" />
+ </rule>
+</ruleset>
\ No newline at end of file
diff --git a/htdocs/modulebuilder/template/dev/dolistore/README.md b/htdocs/modulebuilder/template/dev/dolistore/README.md
new file mode 100644
index 00000000000..d322d2c98fe
--- /dev/null
+++ b/htdocs/modulebuilder/template/dev/dolistore/README.md
@@ -0,0 +1,87 @@
+Dolistore
+=========
+
+[Dolistore](https://dolistore.com) is the marketplace for Dolibarr modules.
+
+This directory contains templates assets that may be useful for publication.
+
+Images
+------
+
+### Logo
+
+See [img folder README](../img/README.md).
+
+### Screenshots
+
+Texts
+-----
+
+All texts needs 5 languages versions for:
+- en (English)
+- fr (Français)
+- es (Español)
+- it (Italiano)
+- de (Deutsch)
+
+### Name
+
+The module's marketed name.
+
+### Price
+
+Expressed in Euro (€).  
+Keep in mind that Dolistore will keep a 20% markup.
+
+### Categories
+
+- [x] Modules/Plugins
+- [ ] Skins and Templates
+- [ ] Tools and documentation
+- [ ] Skins
+- [ ] Document templates
+- [ ] System tools
+- [ ] CRM
+- [ ] ECM
+- [ ] Human Relationship
+- [ ] Products, Services or Stock
+- [ ] Project or collaborative
+- [ ] Interfaces
+- [ ] Other
+- [ ] Reporting or search
+- [ ] User's interface
+- [ ] 2Report sub-modules
+- [ ] Accountancy
+
+*The list may change. Check [Dolistore](https://dolistore.com) for up-to-date information.*
+
+### Short description
+
+A short description of the modules main features.  
+400 characters max.
+
+### Keywords
+
+Comma separated lists.
+eg: ```template,dev,module```
+
+### Long description
+
+The long description of your module.
+
+Suggested technical data:
+
+Version: 1.0.0  
+Publisher: MyCompany  
+Licence: GPLv3+  
+User interface language(s): English  
+Help/Support: None / Forum www.dolibarr.org / Mail at contact@example.com  
+Prerequisites:
+- Dolibarr min version: 3.8
+- Dolibarr max version: 3.9.*
+- PHP: ≥5.3  
+Install:
+- Download the module's archive file (.zip file) from DoliStore.com.
+- Put the file into the custom directory of Dolibarr.
+- Uncompress the zip file, for example with ```unzip modulefile_version.zip``` command.
+- Module is then available and can be activated.  
diff --git a/htdocs/modulebuilder/template/dev/dolistore/keywords-de.txt b/htdocs/modulebuilder/template/dev/dolistore/keywords-de.txt
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/modulebuilder/template/dev/dolistore/keywords-en.txt b/htdocs/modulebuilder/template/dev/dolistore/keywords-en.txt
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/modulebuilder/template/dev/dolistore/keywords-es.txt b/htdocs/modulebuilder/template/dev/dolistore/keywords-es.txt
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/modulebuilder/template/dev/dolistore/keywords-fr.txt b/htdocs/modulebuilder/template/dev/dolistore/keywords-fr.txt
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/modulebuilder/template/dev/dolistore/keywords-it.txt b/htdocs/modulebuilder/template/dev/dolistore/keywords-it.txt
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/modulebuilder/template/dev/dolistore/long_desc-de.html b/htdocs/modulebuilder/template/dev/dolistore/long_desc-de.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/modulebuilder/template/dev/dolistore/long_desc-en.html b/htdocs/modulebuilder/template/dev/dolistore/long_desc-en.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/modulebuilder/template/dev/dolistore/long_desc-es.html b/htdocs/modulebuilder/template/dev/dolistore/long_desc-es.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/modulebuilder/template/dev/dolistore/long_desc-fr.html b/htdocs/modulebuilder/template/dev/dolistore/long_desc-fr.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/modulebuilder/template/dev/dolistore/long_desc-it.html b/htdocs/modulebuilder/template/dev/dolistore/long_desc-it.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/modulebuilder/template/dev/dolistore/name-de.txt b/htdocs/modulebuilder/template/dev/dolistore/name-de.txt
new file mode 100644
index 00000000000..d177fbf2ba9
--- /dev/null
+++ b/htdocs/modulebuilder/template/dev/dolistore/name-de.txt
@@ -0,0 +1 @@
+Mein modul
diff --git a/htdocs/modulebuilder/template/dev/dolistore/name-en.txt b/htdocs/modulebuilder/template/dev/dolistore/name-en.txt
new file mode 100644
index 00000000000..bf608d557d4
--- /dev/null
+++ b/htdocs/modulebuilder/template/dev/dolistore/name-en.txt
@@ -0,0 +1 @@
+My module
diff --git a/htdocs/modulebuilder/template/dev/dolistore/name-es.txt b/htdocs/modulebuilder/template/dev/dolistore/name-es.txt
new file mode 100644
index 00000000000..a0ec54ad842
--- /dev/null
+++ b/htdocs/modulebuilder/template/dev/dolistore/name-es.txt
@@ -0,0 +1 @@
+My módulo
diff --git a/htdocs/modulebuilder/template/dev/dolistore/name-fr.txt b/htdocs/modulebuilder/template/dev/dolistore/name-fr.txt
new file mode 100644
index 00000000000..310ebcf10a5
--- /dev/null
+++ b/htdocs/modulebuilder/template/dev/dolistore/name-fr.txt
@@ -0,0 +1 @@
+Mon module
diff --git a/htdocs/modulebuilder/template/dev/dolistore/name-it.txt b/htdocs/modulebuilder/template/dev/dolistore/name-it.txt
new file mode 100644
index 00000000000..a196c1511a1
--- /dev/null
+++ b/htdocs/modulebuilder/template/dev/dolistore/name-it.txt
@@ -0,0 +1 @@
+Il mio modulo
diff --git a/htdocs/modulebuilder/template/dev/dolistore/short_desc-de.html b/htdocs/modulebuilder/template/dev/dolistore/short_desc-de.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/modulebuilder/template/dev/dolistore/short_desc-en.html b/htdocs/modulebuilder/template/dev/dolistore/short_desc-en.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/modulebuilder/template/dev/dolistore/short_desc-es.html b/htdocs/modulebuilder/template/dev/dolistore/short_desc-es.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/modulebuilder/template/dev/dolistore/short_desc-fr.html b/htdocs/modulebuilder/template/dev/dolistore/short_desc-fr.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/modulebuilder/template/dev/dolistore/short_desc-it.html b/htdocs/modulebuilder/template/dev/dolistore/short_desc-it.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/modulebuilder/template/dev/git-hooks/post-commit b/htdocs/modulebuilder/template/dev/git-hooks/post-commit
new file mode 100644
index 00000000000..d44ff23047c
--- /dev/null
+++ b/htdocs/modulebuilder/template/dev/git-hooks/post-commit
@@ -0,0 +1,2 @@
+#!/bin/sh
+composer git_post_commit
diff --git a/htdocs/modulebuilder/template/dev/git-hooks/pre-commit b/htdocs/modulebuilder/template/dev/git-hooks/pre-commit
new file mode 100644
index 00000000000..d8bd735325c
--- /dev/null
+++ b/htdocs/modulebuilder/template/dev/git-hooks/pre-commit
@@ -0,0 +1,2 @@
+#!/bin/sh
+composer git_pre_commit
diff --git a/htdocs/modulebuilder/template/dev/git-hooks/pre-push b/htdocs/modulebuilder/template/dev/git-hooks/pre-push
new file mode 100644
index 00000000000..61848c24831
--- /dev/null
+++ b/htdocs/modulebuilder/template/dev/git-hooks/pre-push
@@ -0,0 +1,2 @@
+#!/bin/sh
+composer git_pre_push
diff --git a/htdocs/modulebuilder/template/dev/img/README.md b/htdocs/modulebuilder/template/dev/img/README.md
new file mode 100644
index 00000000000..f44c37f30c6
--- /dev/null
+++ b/htdocs/modulebuilder/template/dev/img/README.md
@@ -0,0 +1,53 @@
+Source images
+=============
+
+Used to generate icons and publication assets.
+
+Icons
+-----
+
+### Dolibarr
+
+These resides in the [/img](../../img) directory.
+
+#### Small
+
+Required.
+Name must begin by ```object_```.
+
+- Sample:  ![object_mymodule.png](../../img/object_mymodule.png) [object_mymodule.png](../../img/object_mymodule.png)
+- Size: 14×14 pixels
+- Type: PNG
+
+#### Large
+
+Optional.
+
+- Sample: ![mymodule.png](../../img/mymodule.png) [mymodule.png](../../img/mymodule.png)
+- Size: 32×32 pixels
+- Type: PNG
+
+### Dolistore
+
+Designed to fit a 512×512 icon + publisher branding.
+
+- Size: 704×704
+- Type: PNG
+
+Export to 512×512
+
+### Transifex
+
+- Size: 96×96
+- Type: PNG
+
+### Others
+
+To be on the safe side, you may also want to generate all popular sizes:
+- 16×16
+- 32×32
+- 48×48
+- 64×64
+- 128×128
+- 256×256
+- 512×512
diff --git a/htdocs/modulebuilder/template/dev/img/gfdl-129x44.png b/htdocs/modulebuilder/template/dev/img/gfdl-129x44.png
new file mode 100644
index 0000000000000000000000000000000000000000..f2bacfd179a99f051654eaa6ba30089dd8691d7a
GIT binary patch
literal 4709
zcmV-r5}NIaP)<h;3K|Lk000e1NJLTq004mi001lq1^@s6LL%E>00004b3#c}2nYxW
zd<bNS00009a7bBm000mY000mY0jGERSpWb48FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H15#mWiK~#90?VNdZQ&k$ke=loElXOW7-GFYOEUlm*jv&aQfCw(g
zq9UW9plHVhM#lxkaT}KzH<TGv#E}t4MMVS^L_jE5Mkur_r7O^MOIO--N%E36f20jf
zlXQWUnRD##oSgUWefQq)zW2U-@4Kr2ybUY_1bX;?K>%dU$Ce+szoV9OJ5UN#164pJ
za0WO590CqYl2p=>Ff$P7r^@&6|A`4W3~T|`N|IF5`l0|F2QD6e^`*?6HSvE?zuzWy
zyMy#Y+3fr|ot#{w$8|vvh>MLRF(HQFAT4@*Ao`#{g7ksTbDaj8&CYi}{6cX_1=ZDc
z)YjEgS$PJ#-O--t24Fq#t|UnZ!Knn_0@G$(KZf-mukiof_TYiBsGJ!$KgNmd)2_I%
zupp*S8%=UjB1uCNNE#A{R;xjhB#KKaFq<0@MLTx81H0YsJa;&-+Z{wk7>JLH0>Er;
z;H!;4^RM+=*|RqjNs<^kIF5*jFm~)Z&{jb{0u~CuTR_UtA@QW`S$zQ?#cvabLt^BW
z3&}d+RDe+<2eatz8QgTkIC63eIdnLOoLnP$`9;oSUJ;E=mUhe3^iorh^99<#UT*QJ
z`!Y#+=ygtHpJvG5I6nBtpV+u*4<CNCnbNYVmSoQ<fINVcC)@QMdhiolx9@i;z&md~
z!kzQ41K_~H6O5bm0ForR(h7n=bW|9Li81sJ3qg<x$Ye5P%}2T1c|LGJKMw_HvRDby
z2eR~`xjek=Esh>5;IFTL%GwW}<k6+KGj;k>e%XH%;1QP+nClxUFRvjyJoth<jNdA!
zPnWsQ52T;q<{QVM*9UUZz`o3xHIWTp?ZjpiU1?M*B~6W1O3ErxDitUd3REfuN~HpY
zLXKQ6Cv|TIo42G=U1O%ErjD8#Gv@k6H@SU!hjQK2-vMwU`!t6#a#}9+5`aO#F@PQ0
z-sbWVgSzt>{N~xTIhDEdo^gc(H37_?HGxG7Zy-4-fzq-nKHso|^h4QX9?2s+rw~!J
zcdBeb5YXu~gaqpd3DFTB7sY_Y7_Ph`i7}&-*|a5<_dnRgp1m2Zv)Ke70H?<&tXcgy
zbIzfKV6oW9$t~pA@sqCK>B2G$20f7xVMIiPGIVep)23dDPN(t6Z?13T+s&z{RLbU`
z0<}tsAPCs)4n(^hi^WD$lNF1_iq$F-7#M&~r{R+1M4}?Y`1G?MQK^)u)k@SV6)Kei
zheN_9ir8!-qG-ovvm=Tkf*{bpe*^;)`w|kO>(o8|`}6H6l?v2qB>`#`N~Hp;Rm5Vo
zVzJl&xcSC$9hTEt31l(>hvTgIPfUm=IVq9kqy(pPI5eI<y+g5BZHP7zt5tN}Ps_cC
zq8+VPLvT<adc78zOh6Rv<m48Tc_g3AqxocJ=5ZkX1XWeF&5{JbCD)>mB&kUdgd!lO
zpo@NiBuT7UyO}4SSxsGCLx<_rY9*7e8O7Y$lel5}7*~8%RV|B_ywXwA#w#!Wc@Yn$
z%;w$)UUM^}oyA}XVqjtn6UJXg%92~WDk;D{_r2V1{S1bnPANfa4y3K&ll9y9=eqAH
zGgXnBS43`J5nq12%aul})esV_MW@rC*9AI{dJS5w22r$ASJyyoU48Sh0drjgl~rf3
zTD?CDwOZ*?+7<*!k`M%87clnrTd!sHyN`D226FR?c;LamvOCpjT4XYTDc4@XsLKa)
z`G`Tp#Pr5!G;u8JB%gn=qs0jUAV966vUH1Ec@BrfR~vt3@sd~Eyx{=@`Vt)#My~)h
z0Rbv%>l&!2sNv|b0z}cy>USUI_FJz7V8_mbELi*!CR4R5|G2TknL7CjR4N5|c|~OB
z6q21&NTIRJ?OzBG8mi}CYoBK9Rl_{)x4gWDox9Wd(-W&&d)CDEkKm=}?`8Dwk}w#8
zI(%-eEkR}J76Q~NY&Mbax2BQypJQZX=8<_M&+Q)06`4#RAwHVqqy)mkg86#m&y<;}
z35gtyrM{Sk+5!NJqB(sYFt)QTgiV`Mx$Ev1T`x<g)3EmaCz*2XD7SR+aZ!xDY8dz4
zb0h!x^*D3qJws_(6)`d4UMoEFrg1#?(pqwI3SIHbAHS2CH+lZUcBf`A<@!em3p@MZ
z$6tLZ!;%NE^~e3LxQXL0BW1}<kNhT6H4iR*lW)G=<BF@Qs^!L6kF#;Z%Um@&*)4r|
zcrdeW9?zFw?Q+XA_NrmbxPA=hgHowr`n1tZpElYRS7xdrBQuY@{36WeMrv#8F`FBy
zGdH-7a=8q>E)cD@7dov5olb*Jt05#r$Dl#63>h3pLwys^zOaV(KKKTQL&6X<f#{3o
zl6T-$m#o%GKxaM&wYBy9;gL673J?_;#-^`c=HiR`x0`R|h(YYy{thFryqms#`}j;3
z7OE%5=hd?$4~=)GH@LTELPPbP$PK-Fhp_(R75w}2?L7R)w>fjh3^@Ipr=D5Ot{+!=
z%@-W3bqj}tbWUDZ>C-!uYbJ(r&BT#i&fCyv;k)mD;cstz$`9Mpuv$gbns6c#XAu-W
z8~{O(wImnZl%S-vk|v9l0JX}efECZJaWhqqKYB-p3eZAKbU1x_htR)YgwHg=!JTu|
zf`YVYwHl8mZD=PQy%y%onn-<p6DbeB?uz^MKo&o4|CLD-M|jHByAQMIefSVvVbkVR
zzTL7Hy-tH(@9Y}Z=>lEn`k+A9HN8F%l~PG@Nd?9t6Go$nLZb<zvD|qqGLfHO?D~@`
z144*MxSH^O*CNOiXN8_s0(VOwNfM_{m2%O*eqJkkFg=_1)_mg%_wF6y`W|<dUcJ=x
zYsV7EWHO)E+EP~djYnKp^0zSWw#oeE)pZmVm%HL#er=ssB@o(_FO!}B;Oo_6hx5?V
zH{E=Vb4NfG5Q-sYG{JpF5*VC-w*g|oml6Qv7Zm$cf|p-g=jKc;S$q>}wX#c9TyW?0
zTsmxEm-2KsDwTo<Q)cn#<L|oS_N5)gVzG7k{>}xRPQy#j-^*S1yof>-L}cPj>|!Gh
zu@Sr2(CXKSU2H^h*ifoNPzHpe3J66RU~nCk>JYaV><dAVyUrB=k|b3Lf^Y^1YR@k?
zdaS@L{JSfLcKL?ySunlJdD>E3QbA**g@pL%^De7}acx=zk|a@RG?AF#KN;;Y`<4m3
zzh)Du`!Ycg2<tncn<bvL4y{$j=^Pdmd(G0=WZ~55Qn$GF%zAgSa@Ci-`0~eoEi)=I
z%p>k}oBQo<{`P7La=DDs+zmMFP2DO>ke#&zo=V`u66EF@-980!xy<W>yAb5%8Br+Y
z9VhGpp`m&Y(|_{Rg;j!~L*iMqa0WI@4Q2V8x>=g1PXNtIknh71WVIUm28fI>`29tA
z<F9Y5=Zi0Qpi(K2B#E-JYEt)Qa_9W1ewP&$8RqsUsI9H{yNr%l{=}VpwqXaA#-9j{
z8iP78vRmW`!r9M3Yb7uNR8*evnyIwZ-E);BugUz*;f!1kXXJXs%VqvoK&{rjx!1qH
z@1|^b5fr55`4#tYU&?C~Wv?fG_#@pSr?q3)`g711AUevsiI0nQ*T|C6icXJioe$4G
zy^w=xYdCgz9Y@kX=97P}K&@6H+WjxPq_n~<JRmW~?=m{W9k)+r<cL9-tB!NVbg+Ab
zcxfU6B!K73ZsDQ<eci$ihjZFfd(L5Aei2Hg!Z|XiR3HcfHk*jmCStYP2r~qs*S9~%
zH7+*Ft;re}8_ASwNBLa=n=Do;D$ZI#K@f=dW9y?U2!g=hUP)oxr28q!{S2L9C^EV4
z4!m=d;n`yd5DyU7JXftPv9XaT6mqwRUuZP7s|3R@zpLGmw|C!K%J1*!`nNqcHj2{H
z$}Z<?52LZ%EgTtPK+{X@R~cR5(%}R7{T);J@S`o5PHiC~{zm@_Xk`gne-4~V;KLFq
zl?o39IdS5&*R(Bs_1TNO|M$nd_9`w}d=t0K9N*b0yRqz{xxDb_Mdy^)7e=GWEqv+l
z|9ywnv&$C}6r`i#^j55m<sE0}0zz9Q5CkC-&;Z28dbb2{cF?AUH6LwmSJ1=>Be-?W
zHT>h9KN1;XaJzQHjH?LL1az(D&4h;PJ<2;@T8|70g1{4x&G&2h=Yqiy#ERv2;jr5%
z&i>S|WqT+A&Hey5&Au;|J$##6UwQhW?6y;td<Yag28QJF?r&apmNHWnAAS6tD?Iy_
z30#t#=$EqJTKT!N7w{Zec<1#b4Nai7B7@qBj-Pd>@zOd-0A~kKd*Arvqy%oib+TLB
z%6B*TuVP-1E<juK&6Qu!WU&IynKvtzFYsI0ufP2ng@t7uC-gy4aXBTWm9&`>cHRj1
zumpW$dUx0Xv|{-JH#7e2mc6W6{k7jJ*LId{eVeeqS@+2gtbT8!E4=LCTm9A@ZZcJ4
zGFAJWvepr1a|1Weev*oc8X^;Cq7S>oFZBXI@Ekixfc8HHEkyJQ<>{yHa)l*HV%cLW
z`OB;8{8G1?n!0ww9nsN3jTWk^YPoIx3Krl0sw>ZfDYHBD1)3T=S3W>SrgLysuj~3!
zPlrQd{(=`co^_It$kBxNpWJb#F5oeWNV5{e`)D4v<$?QVk`N!w;`?8vvbl%xxfj=R
zFg=^=rd+|evBQarjiji!oYZ}p?A@E$slk}66Q?j1xqHF;e?3lJT|=k;O<7r|+`>Qa
zIYdaX4xL`Z$&)3V$Sx#1=QLSar>Jjm4$|oLfvi}*fW>#;&|&$<vrf8&f7)>Xt5tN(
zkZx?Uay;uKM~)Vdo9A3(crKRU@u&XI58KiR3?4|##q+wHzazZOCvbKY_3wN?_0-8%
zus`)Z7A}5?ox9Qj*!<mIHh;GlaCU#TOxbEd8`z5()5mbzoNE|0a<D7Dq_mRB(;gwe
zpxDC)`1+gOY~8k>e*Gf&`KNb$wkYg&2TLD)+rtU_ar>|QxcyhJc?^aiX3reYW6S1s
zxah{=ka&36Tds+<E$mLs@Q7<m+wSO&ShIFBD_3nmtqCVK`9Aj<LH?q(5(t8z2g1O2
zN0Bcg`h>FS%U9UF=MV?evpJNJL;9f{@(YSFn;VFU4ksqMH~sqdVanuDOuv4N*A5u9
zO39=NBb+O2RL)g4a=FYozh1N>+MILk<#OMXC9F0ZGMS7A?wg51DMzJLy2`NHM8xK`
z2RfaG$jC4TCdM#s?C?$xg0;y1!~M6o)<*zXtu|NrR;%c$M}S&|IzUB$TIqFStuJ=&
zO6Q?vZ=z84A~rb%xl-G4rgNaRB@lpNKsrF`&Q%P%WI(qF?ZJt+Dd#QZ<Qf?_DTOn&
z^~7EB2XuxZ-ByqCQ{PjPy8%Fy(W;N2vpzu&{-?USj+t|w<jk2mq6g0DRs{e&29Oc}
zLPB&M4(9aGJ=km_x6WTdUVagV=y4cgx^HTkB-v>=lSh4Zwkyu11U**Z!Xw&5P^)<I
z>DBDsa~Oac(|+vsCW68*B``Pvg{tFKP3<8$Y*-phn5(leR~@6iCL6oxK6TBd1il82
zdhjp0RxO1>qlrNm$MXEMi<mg!GB$47!?#=ZQdyctO=%hc3YCrkZC?Vk(a06Okja$D
z<SGQ23YkoaAa6bja%`3=tc?{|8!NChmSb(KK(yA<x~DOsPbd?{UqxMA1DiId0+<D$
z0EoRLIgv3}x-Y%z!T*>{)qMWt4gglYy^Q(urnp_V+a2uPm&tcq(?~y*O-5#3mpjZ_
z2o2Q}+dqQX{*hchaxjx7T*jb_W3gIA=FWSDAGW0doD^_wdlqtDch<u>(|WraUuzr+
zjV6vAFQB%r0ZWsWCX2OsnZ9$mev`$DDB6jN3~PSr&KKXdld7n=oDV<R;;~(g0Ne-M
zLC-#h7ZMfD%|Tpy%(ULPDmf{Ep@ZYP+{x6IlF~|!H1AKaFYPElY)fl9$>)9GUg1KF
z()HkpAP7p}W?%_0*2{I`Vk5cuqW%O2YtQaYpwpn!2cpyVLKN-P)-|~8QBYUcK$)qU
zBS-UHUHWbC+`_I$3I6v8f-nTQ8@LikqLqd46YXzi*`oyiUkJ|Oy#Y9Ta);rZ1+H)Y
n1+_VfIJdB^ZFB6>wzmHTwMhFML%JGy00000NkvXXu0mjfK;ap?

literal 0
HcmV?d00001

diff --git a/htdocs/modulebuilder/template/dev/img/gfdl-66x23.png b/htdocs/modulebuilder/template/dev/img/gfdl-66x23.png
new file mode 100644
index 0000000000000000000000000000000000000000..b43479bf3c817b3f780eb453ef3c4e770e1ddc35
GIT binary patch
literal 2453
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
TZ)SHf00000NkvXXu0mjfVgHyi

literal 0
HcmV?d00001

diff --git a/htdocs/modulebuilder/template/dev/img/gfdl-logo.svg b/htdocs/modulebuilder/template/dev/img/gfdl-logo.svg
new file mode 100644
index 00000000000..a0daca0ead8
--- /dev/null
+++ b/htdocs/modulebuilder/template/dev/img/gfdl-logo.svg
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="110.72372"
+   height="37.900333"
+   id="svg3330"
+   version="1.1"
+   inkscape:version="0.48.0 r9654"
+   sodipodi:docname="New document 4">
+  <defs
+     id="defs3332" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="3.959798"
+     inkscape:cx="51.755214"
+     inkscape:cy="19.316583"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1680"
+     inkscape:window-height="950"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata3335">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-319.64995,-513.41138)">
+    <g
+       id="g5424"
+       transform="matrix(1.1204236,0,0,1.1204236,378.23897,-788.71491)">
+      <path
+         sodipodi:nodetypes="cccccc"
+         inkscape:connector-curvature="0"
+         id="rect6744"
+         d="m -51.39745,1163.0948 85,0 0,29.5252 -85,0 2,-14.7626 z"
+         style="fill:#f5efbc;fill-opacity:1;stroke:#000000;stroke-width:1.79999995;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0" />
+      <text
+         transform="scale(0.90245956,1.1080829)"
+         sodipodi:linespacing="125%"
+         id="text6752-6"
+         y="1071.2108"
+         x="-15.68348"
+         style="font-size:24.31293869px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold"
+         xml:space="preserve"><tspan
+           style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:URW Palladio L;-inkscape-font-specification:URW Palladio L Bold"
+           y="1071.2108"
+           x="-15.68348"
+           id="tspan6754-4"
+           sodipodi:role="line">GFDL</tspan></text>
+      <path
+         inkscape:connector-curvature="0"
+         id="path7064-6"
+         d="m 19.61576,1166.8577 0,24 0.1875,0 c -0.12127,0.1989 -0.1875,0.4164 -0.1875,0.625 0,2.002 5.8203,3.625 13,3.625 7.1797,0 13,-1.623 13,-3.625 0,-0.2086 -0.0662,-0.4261 -0.1875,-0.625 l 0.1875,0 0,-24 -26,0 z"
+         style="color:#000000;fill:#f5efbc;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.79999995;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         transform="translate(-321.63424,901.70446)"
+         d="m 367.25,264.98718 c 0,2.00203 -5.8203,3.625 -13,3.625 -7.1797,0 -13,-1.62297 -13,-3.625 0,-2.00203 5.8203,-3.625 13,-3.625 7.1797,0 13,1.62297 13,3.625 z"
+         sodipodi:ry="3.625"
+         sodipodi:rx="13"
+         sodipodi:cy="264.98718"
+         sodipodi:cx="354.25"
+         id="path7064"
+         style="color:#000000;fill:#f5efbc;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.79999995;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         sodipodi:type="arc" />
+      <path
+         sodipodi:nodetypes="cccccc"
+         inkscape:connector-curvature="0"
+         id="path7104"
+         d="m 45.06778,1167.3815 c -2.44864,5.5993 -9.9067,7.192 -21.52831,5.7955 l 5.7779,9.7599 -6.02275,7.2171 c 7.75095,3.1192 17.18643,1.5723 22.07112,-0.1842 z"
+         style="fill:#2e439b;fill-opacity:1;stroke:#000000;stroke-width:1.39999986;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         sodipodi:nodetypes="ccscc"
+         inkscape:connector-curvature="0"
+         id="path7106"
+         d="m 34.45935,1165.7653 c -3.4695,-0.1017 -8.01646,0.018 -10.47747,0.7778 1.2102,0.9782 6.11198,1.5627 9.94714,1.2348 3.20297,-0.2738 6.08198,-0.1311 7.93857,-1.1503 -0.70667,-1.1077 -3.93837,-3.3774 -7.91865,-3.2613"
+         style="fill:none;stroke:#000000;stroke-width:1.39999998;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    </g>
+  </g>
+</svg>
diff --git a/htdocs/modulebuilder/template/dev/img/gpl-v3-logo.svg b/htdocs/modulebuilder/template/dev/img/gpl-v3-logo.svg
new file mode 100644
index 00000000000..6754c994bda
--- /dev/null
+++ b/htdocs/modulebuilder/template/dev/img/gpl-v3-logo.svg
@@ -0,0 +1,389 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="744.09448819"
+   height="1052.3622047"
+   id="svg1341"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   sodipodi:docbase="/home/johns/graphics/logos/gplv3"
+   sodipodi:docname="gpl-v3-logo (copy).svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs1343">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective79" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.56729519"
+     inkscape:cx="372.04724"
+     inkscape:cy="526.18109"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     inkscape:window-width="1439"
+     inkscape:window-height="825"
+     inkscape:window-x="1"
+     inkscape:window-y="49"
+     showgrid="false" />
+  <metadata
+     id="metadata1346">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       id="g3413"
+       transform="translate(1.7627461,148.07106)">
+      <g
+         id="g68"
+         style="fill:#000000;fill-opacity:0.94117647;fill-rule:evenodd;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter"
+         transform="matrix(1.705222,0,0,1.705222,352.86817,563.90874)">
+        <path
+           style="fill:#000000;fill-opacity:0.94117647"
+           id="path70"
+           d="M 3.86,0 C 3.86,0 3.85,0 3.85,0 C 2.91,0 2.08,0.31 1.3,0.94 C 0.72,1.4 0.32,2.02 0,2.71 C 0,2.71 0.04,2.71 0.04,2.71 C 0.36,2.02 0.76,1.4 1.33,0.94 C 2.11,0.31 2.94,0.01 3.86,0 z" />
+      </g>
+      <path
+         style="fill:#000000;fill-opacity:0.94117647;fill-rule:evenodd;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter"
+         d="M 92.93948,358.4642 C 92.9395,358.46419 33.62975,617.23158 33.62975,617.23158 C 33.6468,617.23158 33.64894,617.23158 33.68304,617.23158 C 33.68304,617.23158 308.06385,617.23158 308.06385,617.23158 C 308.06386,617.23158 450.76958,617.23158 450.76958,617.23158 C 433.76851,615.74805 420.34631,609.77976 412.34882,598.90046 C 410.86529,596.88827 409.63964,594.72053 408.56535,592.45258 C 407.88328,590.78148 407.24167,589.09543 406.59368,587.39021 C 404.88844,581.9676 404.20851,575.9503 404.51544,569.53867 C 405.36806,551.66793 413.75349,530.41065 428.28198,508.15069 C 443.71423,484.49413 466.08035,459.6998 493.77314,436.69125 C 499.98013,431.53806 506.39817,426.44926 513.11675,421.50411 C 521.42116,415.39432 529.78956,409.7675 538.1622,404.50518 C 569.00965,385.08441 599.78037,371.49508 627.04687,364.59234 C 600.9911,373.09287 571.71882,387.52374 542.79826,407.1696 C 541.7581,407.87215 540.73068,408.59175 539.70754,409.30112 C 523.66141,420.41917 509.1244,432.22698 496.43756,444.15158 C 455.61453,482.53615 434.0371,522.31042 443.84212,545.61227 C 444.54128,547.21517 445.37468,548.74562 446.34667,550.19506 C 456.88492,565.69553 483.00254,568.37485 516.10089,560.05337 C 518.35178,559.49062 520.60267,558.85333 522.92177,558.18829 C 533.49415,555.13592 544.71877,551.01356 556.28017,545.93201 C 559.05966,544.70424 561.86904,543.44238 564.6997,542.09525 C 564.98958,541.95884 565.26243,541.82242 565.55231,541.66895 C 602.04404,523.53733 630.08856,502.67437 636.15915,490.13928 C 637.48923,487.41266 637.80895,485.08798 636.90518,483.26511 C 632.57394,474.48323 602.26573,480.41611 565.55231,496.32071 C 562.60228,497.59961 559.61814,498.91563 556.5999,500.31732 C 559.05542,498.03746 561.61113,495.74904 564.2201,493.49643 C 568.38085,489.91205 572.68866,486.40698 577.2757,482.94539 C 584.4547,477.50912 591.71255,472.59468 598.85743,468.23785 C 632.31386,442.99718 649.22753,419.12063 645.69773,410.26032 C 645.03268,408.59089 643.61736,407.44243 641.43467,406.74329 C 634.46029,404.52482 621.73084,407.17258 606.26448,413.51089 C 593.50944,418.74253 578.85944,426.50169 564.00696,436.15837 C 564.00696,436.15837 561.98201,437.49057 561.98201,437.49057 C 561.98203,437.49057 561.60899,437.70371 561.60899,437.70371 C 561.60901,437.70373 554.46838,442.44636 554.46838,442.44636 C 554.46836,442.44635 558.57157,434.93273 558.57157,434.93273 C 564.65922,423.78909 574.57507,412.16206 586.92087,401.36119 C 595.9756,393.4643 606.3199,386.02357 617.455,379.51303 C 621.66691,377.0473 625.8724,374.75717 630.08429,372.69215 C 634.39851,370.58449 638.71484,368.7113 642.92675,367.0436 C 655.16357,362.20425 666.84456,359.26379 677.03117,358.4642 C 676.1035,358.46419 648.41543,358.4642 648.41543,358.4642 C 648.41544,358.46419 551.96384,358.4642 551.96384,358.4642 C 551.96385,358.46419 126.67089,358.4642 126.67089,358.4642 C 126.67089,358.46419 92.93948,358.4642 92.93948,358.4642 z M 398.92019,358.83722 C 397.2491,384.34222 402.19422,421.69937 413.41458,463.17546 C 415.40967,470.55567 417.5817,478.06631 419.96902,485.66308 C 421.45258,490.35412 422.98301,494.97189 424.5518,499.518 C 423.631,500.87196 422.70376,502.21737 421.8341,503.5679 C 407.83425,525.02298 399.6513,545.29894 397.58799,562.93093 C 391.67085,543.11625 387.21598,521.41263 384.69225,498.39895 C 383.97606,491.80485 383.41546,485.28453 383.04031,478.8422 C 380.27784,432.04581 386.3868,389.625 398.92019,358.83722 z M 119.53029,392.03576 C 119.84963,392.02822 120.16443,392.03576 120.48947,392.03576 C 120.48947,392.03574 183.52938,392.03576 183.52938,392.03576 C 188.91789,392.03574 193.08502,393.04567 196.0521,395.07318 C 199.00212,397.11264 200.10841,399.75061 199.40925,402.95983 C 199.40927,402.95985 191.89562,436.90439 191.89562,436.90439 C 191.89562,436.90442 169.67446,436.90439 169.67446,436.90439 C 169.67448,436.90442 176.97494,403.86573 176.97494,403.86573 C 176.97492,403.86573 121.34209,403.86573 121.34209,403.86573 C 121.34207,403.86573 101.25244,494.66878 101.25244,494.66878 C 101.25246,494.66878 94.00525,527.54759 94.00525,527.54759 C 94.00525,527.54762 149.58482,527.54759 149.58482,527.54759 C 149.58482,527.54762 149.63811,527.33443 149.63811,527.33443 C 149.63811,527.33445 160.77533,477.03039 160.77533,477.03039 C 160.77533,477.03037 134.66413,477.03039 134.66413,477.03039 C 134.66413,477.03037 137.16867,465.68001 137.16867,465.68001 C 137.16866,465.67999 185.50105,465.68001 185.50105,465.68001 C 185.50105,465.67999 171.64612,528.45349 171.64612,528.45349 C 171.45855,529.34701 171.1303,530.15657 170.68693,530.95802 C 169.54444,533.03839 167.55146,534.82036 164.77195,536.28685 C 160.91817,538.31608 156.30552,539.32427 150.91702,539.32427 C 150.91702,539.32429 87.9304,539.32427 87.9304,539.32427 C 82.54188,539.32429 78.37476,538.31606 75.40768,536.28685 C 72.45767,534.25765 71.33433,531.66612 72.05053,528.45349 C 72.05054,528.45347 99.81366,402.95983 99.81366,402.95983 C 100.52984,399.75062 102.76371,397.11262 106.63455,395.07318 C 106.77097,394.99987 106.92444,394.98323 107.06085,394.91332 C 110.59387,393.14362 114.74022,392.14889 119.53029,392.03576 z M 218.32657,392.03576 C 218.32655,392.03574 297.67265,392.03576 297.67265,392.03576 C 302.99296,392.03574 307.175,393.04567 310.14208,395.07318 C 313.12625,397.11264 314.26874,399.75061 313.55253,402.95983 C 313.55255,402.95985 298.73842,469.88978 298.73842,469.88978 C 298.0393,473.07852 295.75215,475.68028 291.86425,477.72314 C 287.97635,479.7728 283.39995,480.81385 278.06261,480.81385 C 278.06259,480.81385 220.40481,480.81385 220.40481,480.81385 C 220.40481,480.81385 209.26758,531.0646 209.26758,531.0646 C 209.26758,531.06462 207.45578,539.32427 207.45578,539.32427 C 207.45579,539.32429 185.7142,539.32427 185.7142,539.32427 C 185.7142,539.32429 187.36613,531.86393 187.36613,531.86393 C 187.36613,531.86395 218.32657,392.03576 218.32657,392.03576 z M 327.94034,392.03576 C 327.94033,392.03574 349.68192,392.03576 349.68192,392.03576 C 349.68194,392.03574 325.06278,503.24817 325.06278,503.24817 C 325.0628,503.24819 319.68068,527.54759 319.68068,527.54759 C 319.68068,527.54762 371.68994,527.54759 371.68994,527.54759 C 372.23562,531.53613 372.87293,535.45341 373.55502,539.32427 C 373.555,539.32429 295.32797,539.32427 295.32797,539.32427 C 295.32799,539.32429 301.5094,511.40126 301.5094,511.40126 C 301.50942,511.40126 327.94034,392.03576 327.94034,392.03576 z M 237.45702,403.86573 C 237.45704,403.86573 223.01592,468.98387 223.01592,468.98387 C 223.01592,468.98385 277.21,468.98387 277.21,468.98387 C 277.20999,468.98385 291.5978,403.86573 291.5978,403.86573 C 291.59782,403.86573 237.45702,403.86573 237.45702,403.86573 z M 191.89562,549.5556 C 192.10829,549.54845 192.32086,549.5556 192.53509,549.5556 C 195.05882,549.55562 197.26281,549.99896 199.03624,550.83451 C 200.92904,551.72122 202.28256,553.03851 203.03286,554.77784 C 203.76611,556.46603 203.95794,558.38225 203.56573,560.47968 C 203.56573,560.47969 203.40588,561.27901 203.40588,561.27901 C 203.40589,561.27898 197.17116,561.27901 197.17116,561.27901 C 197.17114,561.27898 197.22445,560.53296 197.22445,560.53296 C 197.38563,559.06753 197.20396,557.91517 196.63827,557.12253 C 196.56455,557.02312 196.45774,556.8919 196.37183,556.8028 C 196.23115,556.65917 196.01985,556.495 195.83896,556.37649 C 194.96658,555.82699 193.60193,555.52387 191.84234,555.52387 C 189.50619,555.52389 187.76047,555.93099 186.56682,556.74951 C 185.40726,557.55097 184.67402,558.44621 184.43529,559.52049 C 184.19654,560.61183 184.58875,561.18521 184.8616,561.49215 C 184.8701,561.50064 184.90453,561.53592 184.91487,561.54544 C 185.26039,561.83989 186.46023,562.5302 190.1904,563.41052 C 193.56672,564.22903 195.80272,564.96441 197.06458,565.59534 C 198.97445,566.5673 200.30877,567.82704 201.00792,569.3788 C 201.70703,570.91352 201.86052,572.71037 201.43422,574.65433 C 201.00792,576.54712 200.04233,578.29285 198.60994,579.92987 C 197.19462,581.56687 195.39347,582.86284 193.22783,583.7666 C 191.07923,584.65332 188.72179,585.15209 186.30037,585.15209 C 183.23097,585.15208 180.76694,584.68742 178.84003,583.7666 C 176.82786,582.81169 175.37629,581.3047 174.52369,579.34369 C 173.70518,577.43383 173.53039,575.26607 173.9908,572.89583 C 173.9908,572.8958 174.15067,572.14978 174.15067,572.14978 C 174.15067,572.14978 180.27881,572.14978 180.27881,572.14978 C 180.27881,572.14978 180.22552,572.89583 180.22552,572.89583 C 180.07204,574.31115 180.22339,575.45365 180.59854,576.30626 C 180.95663,577.12479 181.63873,577.80259 182.73006,578.33122 C 183.8896,578.89392 185.33904,579.18382 186.99311,579.18382 C 188.47666,579.18381 189.83232,578.93443 191.04302,578.49109 C 192.23667,578.06479 193.1852,577.50205 193.86729,576.78586 C 194.53231,576.06964 194.9224,575.31298 195.09292,574.49446 C 195.26344,573.76122 195.22294,573.14096 194.93305,572.62938 C 194.60906,572.08374 193.96747,571.59985 192.9614,571.1906 C 192.9614,571.19059 187.73914,569.64524 187.73914,569.64524 C 184.82322,568.91201 182.86009,568.21286 181.71759,567.51372 C 180.16582,566.59291 179.04678,565.41203 178.467,563.9967 C 177.88723,562.59839 177.82542,561.04879 178.20057,559.36062 C 178.59277,557.55309 179.46456,555.83295 180.81168,554.29825 C 182.17588,552.74648 183.9365,551.5294 186.03393,550.72794 C 187.88836,550.03254 189.83989,549.62473 191.89562,549.5556 z M 247.84822,549.66218 C 248.18547,549.63591 248.50258,549.66218 248.86069,549.66218 C 248.8607,549.66218 252.69744,550.08848 252.69744,550.08848 C 252.69743,550.08848 253.97635,550.19506 253.97635,550.19506 C 253.97637,550.19507 252.11127,554.9377 252.11127,554.9377 C 252.11126,554.93772 251.73825,555.68374 251.73825,555.68374 C 251.73825,555.68372 248.80741,555.4173 248.80741,555.4173 C 247.942,555.4173 247.30628,555.55082 246.88903,555.8436 C 246.86132,555.86453 246.80803,555.9278 246.78245,555.95018 C 246.72655,555.99922 246.63254,556.08476 246.5693,556.16334 C 246.31271,556.49985 246.00018,557.1012 245.76998,558.18829 C 245.76996,558.18829 245.65914,558.64869 245.55683,559.0409 C 246.90396,559.04091 250.1396,559.0409 250.1396,559.0409 C 250.1396,559.04091 248.96727,564.31642 248.96727,564.31642 C 248.96727,564.31641 245.61651,564.31642 244.49107,564.31642 C 244.15001,565.85111 239.96157,584.61922 239.96157,584.61922 C 239.96155,584.6192 233.78014,584.61922 233.78014,584.61922 C 233.78012,584.6192 237.79807,566.58437 238.30964,564.31642 C 237.26943,564.31641 234.73933,564.31642 234.73933,564.31642 C 234.73933,564.31641 235.91167,559.0409 235.91167,559.0409 C 235.91168,559.04091 238.45671,559.0409 239.42868,559.0409 C 239.5992,558.30766 239.85498,557.38896 239.85498,557.38896 C 240.23014,555.68374 240.62233,554.45811 241.13389,553.6055 C 241.83306,552.42891 242.81995,551.44413 244.06476,550.72794 C 245.09003,550.13219 246.38674,549.776 247.84822,549.66218 z M 262.60904,549.92862 C 262.60902,549.92861 260.99334,557.19926 260.58409,559.0409 C 261.77773,559.04091 264.5807,559.0409 264.5807,559.0409 C 264.5807,559.04091 263.40837,564.31642 263.40837,564.31642 C 263.40835,564.31641 260.46898,564.31642 259.41175,564.31642 C 259.08774,565.78289 256.53419,577.15888 256.53419,577.15888 C 256.53421,577.15886 256.32103,578.52519 256.32103,578.91739 C 256.32131,578.93044 256.31997,578.96107 256.32103,578.97067 C 256.32187,578.9747 256.31983,579.02064 256.32103,579.02396 C 256.32267,579.02665 256.37218,579.02182 256.37431,579.02396 C 256.37431,579.02394 257.01378,579.07725 257.01378,579.07725 C 257.01378,579.07725 259.94463,578.8641 259.94463,578.8641 C 259.94463,578.8641 259.6249,583.60674 259.6249,583.60674 C 259.62492,583.60674 259.6782,584.45935 259.6782,584.45935 C 259.67818,584.45933 255.46842,584.93895 255.46842,584.93895 C 253.79732,584.93893 252.57167,584.66612 251.68496,584.08635 C 250.74711,583.47243 250.20142,582.65821 249.97974,581.63509 C 249.94563,581.4475 249.87316,581.17467 249.87316,580.78248 C 249.87316,580.01512 250.01811,578.71703 250.51262,576.46614 C 250.51264,576.46616 252.75285,566.4309 253.23032,564.31642 C 252.42889,564.31641 250.29947,564.31642 250.29947,564.31642 C 250.29949,564.31641 251.4718,559.0409 251.4718,559.0409 C 251.47178,559.04091 253.55004,559.0409 254.40266,559.0409 C 254.67547,557.81315 255.62828,553.6055 255.62828,553.6055 C 255.62828,553.60552 260.58409,550.99438 260.58409,550.99438 C 260.58408,550.9944 262.60904,549.92862 262.60904,549.92862 z M 66.24211,550.14177 C 66.24213,550.14177 90.22179,550.14177 90.22179,550.14177 C 90.22179,550.14177 88.88959,556.11005 88.88959,556.11005 C 88.88959,556.11007 72.89248,556.11005 71.35778,556.11005 C 71.08496,557.32078 69.99147,562.22327 69.59927,563.9967 C 71.81607,563.9967 84.7864,563.9967 84.7864,563.9967 C 84.7864,563.9967 83.45419,569.96496 83.45419,569.96496 C 83.45418,569.96496 69.80177,569.96496 68.26706,569.96496 C 67.94307,571.44851 65.01648,584.61922 65.01648,584.61922 C 65.0165,584.6192 58.56862,584.61922 58.56862,584.61922 C 58.56863,584.6192 66.24211,550.14177 66.24211,550.14177 z M 98.37487,558.56131 C 98.61554,558.53175 98.87845,558.56131 99.12091,558.56131 C 100.65561,558.56131 102.07308,559.02811 103.43726,560.00008 C 103.43726,560.0001 104.28986,560.58625 104.28986,560.58625 C 104.28986,560.58625 100.986,566.02165 100.986,566.02165 C 100.986,566.02163 100.08011,565.38219 100.08011,565.38219 C 99.41507,564.9559 98.69888,564.74273 97.94858,564.74273 C 97.30059,564.74275 96.69737,564.97293 96.08349,565.38219 C 95.43552,565.80849 94.89409,566.37334 94.48485,567.1407 C 93.76865,568.45374 93.24429,569.92447 92.8862,571.51033 C 92.8862,571.51034 90.00864,584.61922 90.00864,584.61922 C 90.00864,584.6192 83.82721,584.61922 83.82721,584.61922 C 83.82721,584.6192 89.52905,559.0409 89.52905,559.0409 C 89.52907,559.04091 95.28417,559.0409 95.28417,559.0409 C 95.28417,559.04091 95.08593,559.81678 95.01772,560.10666 C 95.29056,559.90205 95.57831,559.62067 95.81705,559.4672 C 96.64302,558.9743 97.51542,558.66685 98.37487,558.56131 z M 116.70601,558.56131 C 117.0782,558.53316 117.4446,558.56131 117.82507,558.56131 C 121.30373,558.56131 123.93615,559.78053 125.65842,562.1849 C 126.7327,563.73664 127.31037,565.65502 127.31037,567.94002 C 127.31037,569.20187 127.15476,570.55967 126.83078,572.04321 C 126.83078,572.04321 126.35117,573.9083 126.35117,573.9083 C 126.35117,573.90828 110.71856,573.9083 108.97923,573.9083 C 108.94512,574.26638 108.92594,574.65007 108.92594,574.97406 C 108.92594,576.30415 109.19877,577.35071 109.77855,578.11807 C 110.05405,578.4932 110.37345,578.83106 110.73774,579.07725 C 111.42452,579.52514 112.31108,579.77 113.34886,579.77 C 114.61074,579.76998 115.71911,579.42255 116.7593,578.75752 C 117.74835,578.12659 118.69474,577.11838 119.53029,575.7201 C 119.53029,575.72007 126.13802,575.7201 126.13802,575.7201 C 126.13802,575.72007 125.55186,576.99901 125.55186,576.99901 C 124.28999,579.55686 122.52935,581.55195 120.32961,582.96729 C 118.12988,584.38262 115.5017,585.15209 112.60282,585.15209 C 108.83428,585.15208 106.02919,583.93287 104.28986,581.52851 C 102.5676,579.17528 102.19671,575.92258 103.11753,571.83005 C 104.03836,567.66932 105.87573,564.34414 108.55292,562.02503 C 110.9525,559.94441 113.67537,558.79035 116.70601,558.56131 z M 144.46916,558.56131 C 144.84134,558.53316 145.20773,558.56131 145.5882,558.56131 C 149.06687,558.56131 151.6993,559.78053 153.42157,562.1849 C 154.49586,563.73664 155.0735,565.65502 155.0735,567.94002 C 155.0735,569.18482 154.9179,570.52343 154.5939,571.98992 C 154.5939,571.98994 154.11432,573.9083 154.11432,573.9083 C 154.11432,573.90828 138.48169,573.9083 136.74237,573.9083 C 136.7253,574.147 136.70613,574.36232 136.68908,574.60105 C 136.67629,574.69057 136.69468,574.82646 136.68908,574.92077 C 136.68858,574.93615 136.68908,574.95914 136.68908,574.97406 C 136.68908,575.22986 136.72532,575.48136 136.74237,575.7201 C 136.8276,576.69206 137.08129,577.50419 137.54169,578.11807 C 137.62936,578.23743 137.71177,578.38477 137.80813,578.49109 C 138.58914,579.32663 139.69453,579.77 141.112,579.77 C 142.37388,579.76998 143.49931,579.42255 144.52245,578.75752 C 145.51149,578.12659 146.45787,577.11838 147.29343,575.7201 C 147.29343,575.72007 153.95445,575.7201 153.95445,575.7201 C 153.95444,575.72007 153.31499,576.99901 153.31499,576.99901 C 152.05313,579.55686 150.29249,581.55195 148.09275,582.96729 C 145.89301,584.38262 143.26484,585.15209 140.36597,585.15209 C 136.59744,585.15208 133.79234,583.93287 132.05301,581.52851 C 130.92756,579.99379 130.40107,578.0392 130.40107,575.7201 C 130.40107,575.36198 130.42025,574.97619 130.45436,574.60105 C 130.52259,573.71434 130.65899,572.81909 130.88067,571.83005 C 131.80151,567.68637 133.58558,564.34414 136.26277,562.02503 C 138.66234,559.94441 141.43852,558.79035 144.46916,558.56131 z M 220.08507,558.56131 C 220.46591,558.53202 220.81619,558.56131 221.20412,558.56131 C 224.75099,558.56131 227.47722,559.76135 229.25064,562.13161 C 231.00704,564.50184 231.43333,567.69915 230.52955,571.72347 C 229.83042,574.8611 228.82008,577.39547 227.43885,579.23712 C 226.05759,581.07877 224.29697,582.58361 222.21659,583.60674 C 220.15331,584.62988 217.96846,585.15209 215.76873,585.15209 C 212.15366,585.15208 209.46154,583.91581 207.72221,581.52851 C 206.59675,580.01087 206.01699,578.05625 206.01699,575.7201 C 206.01701,574.45823 206.15555,573.1175 206.49659,571.61691 C 207.51974,567.0469 209.60861,563.56613 212.67802,561.33229 C 214.93103,559.70595 217.41916,558.76623 220.08507,558.56131 z M 313.7124,558.56131 C 314.162,558.53356 314.57833,558.56131 315.0446,558.56131 C 317.19319,558.56131 318.88135,558.77871 320.16027,559.30733 C 321.52445,559.85302 322.49216,560.62462 323.03783,561.54544 C 323.56647,562.41507 323.83716,563.483 323.83716,564.79601 C 323.83717,564.79603 323.19768,568.68605 323.19768,568.68605 C 323.19771,568.68605 322.02536,573.96159 322.02536,573.96159 C 321.01925,578.46335 320.7976,580.15154 320.74643,580.78248 C 320.69528,581.6351 320.77414,582.46638 321.01288,583.23373 C 321.0129,583.23371 321.43918,584.61922 321.43918,584.61922 C 321.4392,584.6192 315.15118,584.61922 315.15118,584.61922 C 315.15116,584.6192 314.88473,583.81989 314.88473,583.81989 C 314.78242,583.44477 314.81226,582.96729 314.77816,582.54098 C 313.58451,583.27423 312.38872,583.92434 311.31443,584.29949 C 309.72859,584.84518 308.08304,585.15209 306.41192,585.15209 C 303.51306,585.15208 301.3666,584.39755 300.07062,582.91399 C 299.0816,581.82266 298.63185,580.48832 298.63185,578.97067 C 298.63183,578.3909 298.70858,577.7898 298.84499,577.15888 C 299.13487,575.86291 299.66137,574.66285 300.49693,573.58856 C 301.31544,572.5313 302.28316,571.66167 303.37449,571.03074 C 304.43175,570.39982 305.61047,569.95219 306.83823,569.64524 C 306.83821,569.64524 310.62169,569.00578 310.62169,569.00578 C 313.53763,568.66472 315.7139,568.24057 317.28271,567.78016 C 317.31683,567.60964 317.38928,567.40714 317.38928,567.40714 C 317.63654,566.30996 317.6056,565.48526 317.33599,565.06246 C 317.31615,565.03519 317.25181,564.97932 317.22942,564.95588 C 317.17186,564.89453 317.08339,564.79809 317.01626,564.74273 C 316.37491,564.2352 315.2812,563.9967 313.81898,563.9967 C 312.16491,563.9967 310.94142,564.26741 310.0888,564.79601 C 309.25325,565.32464 308.47949,566.29235 307.79741,567.67357 C 307.7974,567.67356 301.34954,567.67357 301.34954,567.67357 C 301.34956,567.67356 301.93571,566.39466 301.93571,566.39466 C 302.70304,564.62121 303.61749,563.15048 304.75999,562.02503 C 305.90249,560.89956 307.44571,560.02779 309.23619,559.41392 C 310.60835,558.96095 312.10669,558.66038 313.7124,558.56131 z M 340.72951,558.56131 C 340.96997,558.53175 341.23307,558.56131 341.47554,558.56131 C 343.02727,558.56131 344.48099,559.02811 345.84517,560.00008 C 345.84519,560.0001 346.64449,560.58625 346.64449,560.58625 C 346.6445,560.58625 343.34063,566.02165 343.34063,566.02165 C 343.34064,566.02163 342.43473,565.38219 342.43473,565.38219 C 341.7697,564.9559 341.08972,564.74273 340.35649,564.74273 C 339.70848,564.74275 339.06905,564.97293 338.4381,565.38219 C 337.79013,565.80849 337.31906,566.37334 336.89276,567.1407 C 336.1936,568.45374 335.6522,569.92447 335.29411,571.51033 C 335.29409,571.51034 332.36326,584.61922 332.36326,584.61922 C 332.36328,584.6192 326.18184,584.61922 326.18184,584.61922 C 326.18184,584.6192 331.88366,559.0409 331.88366,559.0409 C 331.88365,559.04091 337.63878,559.0409 337.63878,559.0409 C 337.63878,559.04091 337.49384,559.81678 337.42564,560.10666 C 337.69846,559.90205 337.96917,559.62067 338.22496,559.4672 C 339.03759,558.9743 339.87067,558.66685 340.72951,558.56131 z M 359.00734,558.56131 C 359.37919,558.53316 359.74593,558.56131 360.1264,558.56131 C 363.60506,558.56131 366.25453,559.78053 367.95977,562.1849 C 369.05112,563.73664 369.6117,565.65502 369.6117,567.94002 C 369.61168,569.20187 369.4028,570.55967 369.07881,572.04321 C 369.07881,572.04321 368.65251,573.9083 368.65251,573.9083 C 368.6525,573.90828 353.00283,573.9083 351.28057,573.9083 C 351.24646,574.26638 351.17398,574.65007 351.17398,574.97406 C 351.17398,576.30415 351.46387,577.35071 352.0266,578.11807 C 352.11426,578.23743 352.2496,578.38477 352.34632,578.49109 C 352.40234,578.55076 352.50044,578.64882 352.55948,578.70423 C 353.32183,579.39725 354.35929,579.77 355.65018,579.77 C 356.91207,579.76998 358.02045,579.42255 359.06063,578.75752 C 360.04968,578.12659 360.97902,577.11838 361.83162,575.7201 C 361.8316,575.72007 368.49264,575.7201 368.49264,575.7201 C 368.49264,575.72007 367.85318,576.99901 367.85318,576.99901 C 366.59131,579.55686 364.81363,581.55195 362.63094,582.96729 C 360.41417,584.38262 357.82009,585.15209 354.90415,585.15209 C 351.13564,585.15208 348.38381,583.93287 346.64449,581.52851 C 344.92219,579.17528 344.51509,575.92258 345.41886,571.83005 C 346.33967,567.66932 348.12377,564.34414 350.80097,562.02503 C 353.21572,559.94441 355.97949,558.79035 359.00734,558.56131 z M 265.69974,559.0409 C 265.69976,559.04091 272.04105,559.0409 272.04105,559.0409 C 272.04107,559.04091 272.82331,574.21951 272.84036,574.44117 C 273.09614,573.89761 273.2946,573.4403 273.31997,573.37542 C 273.31998,573.37543 280.30071,559.0409 280.30071,559.0409 C 280.30073,559.04091 286.10912,559.0409 286.10912,559.0409 C 286.10911,559.04091 286.642,574.03618 286.642,574.12144 C 286.81255,573.81453 294.58194,559.0409 294.58194,559.0409 C 294.58192,559.04091 300.86995,559.0409 300.86995,559.0409 C 300.86994,559.04091 287.01502,584.61922 287.01502,584.61922 C 287.01504,584.6192 281.31319,584.61922 281.31319,584.61922 C 281.31319,584.6192 280.76113,570.74938 280.72702,569.96496 C 278.37379,574.79076 273.58639,584.61922 273.58639,584.61922 C 273.58639,584.6192 267.72471,584.61922 267.72471,584.61922 C 267.72471,584.6192 265.69974,559.0409 265.69974,559.0409 z M 116.81259,563.89012 C 115.34366,563.95214 114.00964,564.48161 112.7627,565.48876 C 111.77368,566.27317 111.10649,567.3496 110.57787,568.52619 C 110.57787,568.52621 121.07564,568.52619 121.07564,568.52619 C 121.09271,568.33863 121.12893,568.11055 121.12893,567.94002 C 121.12891,566.96807 120.95627,566.21349 120.64934,565.70192 C 119.89906,564.47415 118.78639,563.89012 117.13232,563.89012 C 117.03322,563.89012 116.91052,563.886 116.81259,563.89012 z M 144.57572,563.89012 C 143.1068,563.95214 141.77277,564.48161 140.52582,565.48876 C 139.53678,566.27317 138.88669,567.3496 138.34102,568.52619 C 138.34102,568.52621 148.83878,568.52619 148.83878,568.52619 C 148.85582,568.33863 148.89207,568.11055 148.89207,567.94002 C 148.89206,566.96807 148.73647,566.21349 148.41247,565.70192 C 148.26353,565.45253 148.06204,565.20453 147.87959,565.00918 C 147.1676,564.27346 146.18769,563.89012 144.89546,563.89012 C 144.79635,563.89012 144.67366,563.886 144.57572,563.89012 z M 359.32708,563.89012 C 357.81652,563.93665 356.40583,564.44806 355.11731,565.48876 C 354.14533,566.27317 353.47816,567.3496 352.93249,568.52619 C 352.93251,568.52621 363.37698,568.52619 363.37698,568.52619 C 363.39401,568.33863 363.43027,568.11055 363.43027,567.94002 C 363.43026,566.96807 363.27467,566.21349 362.95067,565.70192 C 362.21743,564.4912 361.08771,563.90718 359.43365,563.89012 C 359.38463,563.89065 359.37581,563.88862 359.32708,563.89012 z M 219.71206,563.9967 C 218.30243,564.16409 216.9917,564.80721 215.76873,565.91507 C 214.30225,567.24516 213.23861,569.33404 212.62474,572.0965 C 212.36895,573.25605 212.25171,574.24721 212.25171,575.13392 C 212.25173,576.34462 212.48404,577.29529 212.94446,578.01148 C 213.06703,578.19532 213.22962,578.38959 213.37077,578.54437 C 214.12881,579.34925 215.18736,579.77 216.51477,579.77 C 218.23703,579.76998 219.75469,579.12841 221.20412,577.79833 C 222.67064,576.45119 223.71719,574.34099 224.34812,571.51033 C 224.92792,568.91838 224.8469,566.98297 224.0284,565.75521 C 223.244,564.56155 222.09724,563.9967 220.51139,563.9967 C 220.24228,563.9967 219.97309,563.96569 219.71206,563.9967 z M 316.00379,573.32213 C 314.55438,573.71431 312.93012,574.04471 310.78155,574.33461 C 309.17866,574.57335 308.03614,574.82485 307.3711,575.08064 C 306.79134,575.31936 306.32452,575.64975 305.93232,576.09312 C 305.55716,576.51939 305.30566,576.96704 305.1863,577.47861 C 305.15221,577.68325 305.133,577.89425 305.133,578.06478 C 305.133,578.07862 305.13269,578.10436 305.133,578.11807 C 305.13479,578.15865 305.12855,578.23877 305.133,578.27792 C 305.14368,578.35529 305.16517,578.47232 305.1863,578.54437 C 305.19392,578.5681 305.23081,578.62776 305.23957,578.65094 C 305.25823,578.69678 305.26972,578.76705 305.29286,578.81081 C 305.31713,578.85407 305.37076,578.9293 305.39944,578.97067 C 305.44408,579.03204 305.50494,579.12627 305.55931,579.18382 C 305.98562,579.66128 306.83609,579.87657 308.06385,579.87657 C 309.411,579.87658 310.70695,579.62079 311.9006,579.02396 C 313.07722,578.44419 314.02573,577.57878 314.72487,576.5727 C 315.23646,575.8565 315.6457,574.7545 316.00379,573.32213 z"
+         id="path74" />
+      <g
+         id="g80"
+         style="fill:#000000;fill-opacity:0.94117647;fill-rule:evenodd;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter"
+         transform="matrix(1.705222,0,0,1.705222,359.45027,563.90874)">
+        <path
+           style="fill:#000000;fill-opacity:0.94117647"
+           id="path82"
+           d="M 0.03,0 C 0.02,0 0.01,0 0,0 C 0.97,0.01 1.61,0.34 2.04,1.05 C 2.23,1.35 2.33,1.8 2.33,2.37 C 2.33,2.47 2.31,2.6 2.3,2.71 C 2.3,2.71 2.34,2.71 2.34,2.71 C 2.34,2.6 2.36,2.47 2.36,2.37 C 2.36,1.8 2.27,1.35 2.08,1.05 C 1.65,0.33 1,0 0.03,0 z" />
+      </g>
+      <g
+         style="fill:#000000;fill-opacity:0.94117647"
+         id="g4966"
+         transform="matrix(1.705222,0,0,1.705222,-200.90733,-129.69426)">
+        <g
+           transform="translate(125.1273,453.3934)"
+           style="fill:#000000;fill-opacity:0.94117647;fill-rule:evenodd;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter"
+           id="g84">
+          <path
+             style="fill:#000000;fill-opacity:0.94117647"
+             d="M 0,36 C 0,36 7.46,36 7.46,36 C 7.46,36 10.81,22 10.81,22 C 10.81,22 22.93,22 22.93,22 C 22.93,22 24.49,16 24.49,16 C 24.49,16 12.32,16 12.32,16 C 12.32,16 14.34,7 14.34,7 C 14.34,7 27.29,7 27.29,7 C 27.29,7 28.85,0 28.85,0 C 28.85,0 8.4,0 8.4,0 C 8.4,0 0,36 0,36 z"
+             id="path86" />
+        </g>
+        <g
+           transform="translate(151.0773,463.3934)"
+           style="fill:#000000;fill-opacity:0.94117647;fill-rule:evenodd;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter"
+           id="g88">
+          <path
+             style="fill:#000000;fill-opacity:0.94117647"
+             d="M 7.51,26 C 7.51,26 9.75,16.6 9.75,16.6 C 10.93,11.51 13.42,7 18.13,7 C 18.55,7 18.96,7.21 19.27,7.26 C 19.27,7.26 21.09,0.05 21.09,0.05 C 20.67,0.05 20.21,0 19.69,0 C 16.22,0 13.31,2.44 11.37,5.94 C 11.37,5.94 11.17,5.94 11.17,5.94 C 11.46,4.23 11.71,2.61 11.9,1 C 11.9,1 5.47,1 5.47,1 C 5.1,3.08 4.53,7.15 3.66,10.82 C 3.66,10.82 0,26 0,26 C 0,26 7.51,26 7.51,26 z"
+             id="path90" />
+        </g>
+        <g
+           transform="translate(171.7073,463.3934)"
+           style="fill:#000000;fill-opacity:0.94117647;fill-rule:evenodd;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter"
+           id="g92">
+          <path
+             style="fill:#000000;fill-opacity:0.94117647"
+             d="M 20.06,19.25 C 17.99,20.26 15.63,20 12.88,20 C 10.71,20 9.03,19.62 8.11,18.88 C 7.63,18.07 7.43,16.81 7.47,16 C 17.6,16.27 23.99,13.93 24.31,7.53 C 24.55,2.7 21.02,0 15.89,0 C 6.73,0 0.73,8.08 0.34,15.86 C 0,22.65 3.52,26 10.78,26 C 13.57,26 17.27,25.68 20.3,24.77 C 20.3,24.77 20.06,19.25 20.06,19.25 z M 17.32,7.53 C 17.2,9.91 14.26,10.05 8.47,10 C 9.1,7.91 11.22,6 14.69,6 C 16.4,6 17.38,6.65 17.32,7.53 z"
+             id="path94" />
+        </g>
+        <g
+           transform="translate(198.2273,463.3934)"
+           style="fill:#000000;fill-opacity:0.94117647;fill-rule:evenodd;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter"
+           id="g96">
+          <path
+             style="fill:#000000;fill-opacity:0.94117647"
+             d="M 20.05,19.25 C 17.98,20.26 15.62,20 12.88,20 C 10.7,20 9.03,19.62 8.11,18.88 C 7.63,18.07 7.42,16.81 7.46,16 C 17.6,16.27 23.98,13.93 24.31,7.53 C 24.55,2.7 21.02,0 15.89,0 C 6.72,0 0.72,8.08 0.33,15.86 C 0,22.65 3.52,26 10.77,26 C 13.57,26 17.27,25.68 20.3,24.77 C 20.3,24.77 20.05,19.25 20.05,19.25 z M 17.32,7.53 C 17.2,9.91 14.26,10.05 8.46,10 C 9.1,7.91 11.21,6 14.68,6 C 16.39,6 17.38,6.65 17.32,7.53 z"
+             id="path98" />
+        </g>
+        <g
+           transform="translate(234.1373,463.3934)"
+           style="fill:#000000;fill-opacity:0.94117647;fill-rule:evenodd;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter"
+           id="g100">
+          <path
+             style="fill:#000000;fill-opacity:0.94117647"
+             d="M 22.74,26 C 22.8,22.83 23.56,17.85 24.35,14.58 C 24.35,14.58 27.56,1 27.56,1 C 25.52,0.31 22.34,0 19.28,0 C 6.86,0 0.7,9.2 0.27,17.82 C 0,23.23 2.93,26 7.49,26 C 10.44,26 13.77,24.57 16.36,20.27 C 16.36,20.27 16.47,20.27 16.47,20.27 C 16.27,22.34 16.03,24.35 15.9,26 C 15.9,26 22.74,26 22.74,26 z M 17.61,11.72 C 16.15,18.08 13.17,20 10.95,20 C 8.88,20 7.98,18.53 8.1,16.39 C 8.34,11.56 12.16,6 16.98,6 C 17.76,6 18.37,5.86 18.94,5.72 C 18.94,5.72 17.61,11.72 17.61,11.72 z"
+             id="path102" />
+        </g>
+        <g
+           transform="translate(261.7673,463.3934)"
+           style="fill:#000000;fill-opacity:0.94117647;fill-rule:evenodd;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter"
+           id="g104">
+          <path
+             style="fill:#000000;fill-opacity:0.94117647"
+             d="M 0,24.82 C 1.44,25.94 4.46,25.95 7.61,26 C 14.34,26.05 19.42,23.11 19.72,17.71 C 19.89,14.11 17.1,11.98 14.37,10.55 C 12.4,9.6 11.41,8.69 11.46,7.63 C 11.53,6.2 12.87,6 14.84,6 C 17.06,6 18.84,6.27 19.86,6.47 C 19.86,6.47 21.88,1.05 21.88,1.05 C 20.73,0.36 18.43,0 15.48,0 C 8.95,0 4.17,3.45 3.9,8.69 C 3.74,11.93 6.07,14.11 8.89,15.59 C 11.17,16.76 11.95,17.66 11.89,18.93 C 11.82,20.21 10.68,20 8.61,20 C 6.18,20 3.49,19.68 2.07,19.46 C 2.07,19.46 0,24.82 0,24.82 z"
+             id="path106" />
+        </g>
+        <g
+           transform="translate(294.2173,452.3934)"
+           style="fill:#000000;fill-opacity:0.94117647;fill-rule:evenodd;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter"
+           id="g108">
+          <path
+             style="fill:#000000;fill-opacity:0.94117647"
+             d="M 7.45,37 C 7.45,37 13.5,12 13.5,12 C 13.5,12 6.09,12 6.09,12 C 6.09,12 0,37 0,37 C 0,37 7.45,37 7.45,37 z M 10.92,9 C 13.46,9 15.72,6.9 15.86,3.3 C 15.98,0.86 14.4,0 12.07,0 C 9.64,0 7.42,1.58 7.29,3.94 C 7.17,6.32 8.75,9 10.92,9 z"
+             id="path110" />
+        </g>
+        <g
+           transform="translate(308.5073,464.0834)"
+           style="fill:#000000;fill-opacity:0.94117647;fill-rule:evenodd;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter"
+           id="g112">
+          <path
+             style="fill:#000000;fill-opacity:0.94117647"
+             d="M 7.46,25.31 C 7.46,25.31 10.1,14.05 10.1,14.05 C 11.47,8.32 14.42,6.31 16.85,6.31 C 18.77,6.31 19.33,7.13 19.24,8.32 C 19.19,9.28 19.04,10.29 18.84,11.19 C 18.84,11.19 15.48,25.31 15.48,25.31 C 15.48,25.31 22.94,25.31 22.94,25.31 C 22.94,25.31 26.48,10.5 26.48,10.5 C 26.75,9.22 27.05,7.31 27.11,6.15 C 27.33,1.64 25.08,0 20.94,0 C 17.62,0 14.39,1.54 11.84,4.88 C 11.84,4.88 11.74,4.88 11.74,4.88 C 11.74,4.88 12.42,0.31 12.42,0.31 C 12.42,0.31 5.84,0.31 5.84,0.31 C 5.41,2.45 4.86,5.04 4.08,8.06 C 4.08,8.06 0,25.31 0,25.31 C 0,25.31 7.46,25.31 7.46,25.31 z"
+             id="path114" />
+        </g>
+        <g
+           transform="translate(348.0673,453.3934)"
+           style="fill:#000000;fill-opacity:0.94117647;fill-rule:evenodd;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter"
+           id="g116">
+          <path
+             style="fill:#000000;fill-opacity:0.94117647"
+             d="M 0,36 C 0,36 7.46,36 7.46,36 C 7.46,36 10.82,22 10.82,22 C 10.82,22 22.93,22 22.93,22 C 22.93,22 24.49,16 24.49,16 C 24.49,16 12.32,16 12.32,16 C 12.32,16 14.34,7 14.34,7 C 14.34,7 27.29,7 27.29,7 C 27.29,7 28.85,0 28.85,0 C 28.85,0 8.4,0 8.4,0 C 8.4,0 0,36 0,36 z"
+             id="path118" />
+        </g>
+        <g
+           transform="translate(374.0173,463.3934)"
+           style="fill:#000000;fill-opacity:0.94117647;fill-rule:evenodd;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter"
+           id="g120">
+          <path
+             style="fill:#000000;fill-opacity:0.94117647"
+             d="M 7.51,26 C 7.51,26 9.75,16.6 9.75,16.6 C 10.93,11.51 13.42,7 18.13,7 C 18.55,7 18.96,7.21 19.27,7.26 C 19.27,7.26 21.09,0.05 21.09,0.05 C 20.67,0.05 20.21,0 19.69,0 C 16.22,0 13.31,2.44 11.37,5.94 C 11.37,5.94 11.17,5.94 11.17,5.94 C 11.46,4.23 11.71,2.61 11.9,1 C 11.9,1 5.47,1 5.47,1 C 5.11,3.08 4.53,7.15 3.66,10.82 C 3.66,10.82 0,26 0,26 C 0,26 7.51,26 7.51,26 z"
+             id="path122" />
+        </g>
+        <g
+           transform="translate(394.6473,463.3934)"
+           style="fill:#000000;fill-opacity:0.94117647;fill-rule:evenodd;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter"
+           id="g124">
+          <path
+             style="fill:#000000;fill-opacity:0.94117647"
+             d="M 20.06,19.25 C 17.99,20.26 15.63,20 12.88,20 C 10.71,20 9.03,19.62 8.11,18.88 C 7.63,18.07 7.43,16.81 7.47,16 C 17.6,16.27 23.99,13.93 24.31,7.53 C 24.55,2.7 21.02,0 15.89,0 C 6.73,0 0.73,8.08 0.34,15.86 C 0,22.65 3.53,26 10.78,26 C 13.57,26 17.28,25.68 20.3,24.77 C 20.3,24.77 20.06,19.25 20.06,19.25 z M 17.32,7.53 C 17.2,9.91 14.26,10.05 8.47,10 C 9.1,7.91 11.22,6 14.69,6 C 16.4,6 17.38,6.65 17.32,7.53 z"
+             id="path126" />
+        </g>
+        <g
+           transform="translate(421.1673,463.3934)"
+           style="fill:#000000;fill-opacity:0.94117647;fill-rule:evenodd;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter"
+           id="g128">
+          <path
+             style="fill:#000000;fill-opacity:0.94117647"
+             d="M 20.05,19.25 C 17.98,20.26 15.62,20 12.88,20 C 10.7,20 9.03,19.62 8.11,18.88 C 7.63,18.07 7.42,16.81 7.46,16 C 17.6,16.27 23.98,13.93 24.31,7.53 C 24.55,2.7 21.02,0 15.89,0 C 6.72,0 0.72,8.08 0.33,15.86 C 0,22.65 3.52,26 10.77,26 C 13.57,26 17.27,25.68 20.3,24.77 C 20.3,24.77 20.05,19.25 20.05,19.25 z M 17.32,7.53 C 17.2,9.91 14.26,10.05 8.46,10 C 9.1,7.91 11.21,6 14.68,6 C 16.39,6 17.38,6.65 17.32,7.53 z"
+             id="path130" />
+        </g>
+        <g
+           transform="translate(447.5473,452.3934)"
+           style="fill:#000000;fill-opacity:0.94117647;fill-rule:evenodd;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter"
+           id="g132">
+          <path
+             style="fill:#000000;fill-opacity:0.94117647"
+             d="M 23.31,0 C 23.31,0 20.5,11.36 20.5,11.36 C 19.48,10.94 18.15,11 17.11,11 C 7.53,11 0.75,19.2 0.3,28.08 C 0,34.34 3.34,37 7.64,37 C 10.65,37 13.82,35.67 16.22,32.23 C 16.22,32.23 16.32,32.23 16.32,32.23 C 16.32,32.23 15.75,37 15.75,37 C 15.75,37 22.53,37 22.53,37 C 22.84,34 23.49,30.43 24.22,27.17 C 24.22,27.17 30.71,0 30.71,0 C 30.71,0 23.31,0 23.31,0 z M 17.47,24.42 C 16.3,29.35 13.54,31 11.36,31 C 9.19,31 7.98,29.49 8.13,26.8 C 8.38,21.82 11.8,17 16.25,17 C 17.5,17 18.57,17.19 19.16,17.47 C 19.16,17.47 17.47,24.42 17.47,24.42 z"
+             id="path134" />
+        </g>
+        <g
+           transform="translate(477.2573,463.3934)"
+           style="fill:#000000;fill-opacity:0.94117647;fill-rule:evenodd;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter"
+           id="g136">
+          <path
+             style="fill:#000000;fill-opacity:0.94117647"
+             d="M 10.61,26 C 19.31,26 26.02,19.41 26.49,10.44 C 26.78,4.5 23.08,0 16.25,0 C 7.23,0 0.76,7.3 0.31,16.12 C 0,22.54 4.14,26 10.61,26 z M 11.78,20 C 9.24,20 7.84,18.38 7.99,15.96 C 8.19,11.93 10.68,6 14.97,6 C 17.93,6 18.84,8.27 18.72,10.5 C 18.5,14.9 15.82,20 11.78,20 z"
+             id="path138" />
+        </g>
+        <g
+           transform="translate(505.8173,463.3934)"
+           style="fill:#000000;fill-opacity:0.94117647;fill-rule:evenodd;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter"
+           id="g140">
+          <path
+             style="fill:#000000;fill-opacity:0.94117647"
+             d="M 7.2,26 C 7.2,26 9.9,14.58 9.9,14.58 C 11.03,9.49 13.85,6 16.38,6 C 18.2,6 18.7,7.33 18.61,9.07 C 18.56,9.97 18.36,10.98 18.15,11.98 C 18.15,11.98 14.81,26 14.81,26 C 14.81,26 22.01,26 22.01,26 C 22.01,26 24.71,14.53 24.71,14.53 C 25.95,9.28 28.61,6 31.09,6 C 32.8,6 33.51,7.22 33.43,8.96 C 33.38,9.97 33.17,11.08 32.91,12.09 C 32.91,12.09 29.67,26 29.67,26 C 29.67,26 36.92,26 36.92,26 C 36.92,26 40.41,11.19 40.41,11.19 C 40.68,9.86 40.99,7.79 41.04,6.73 C 41.26,2.33 39.11,0 35.23,0 C 31.91,0 28.68,1.5 26.23,4.66 C 26.14,2.38 24.51,0 20.47,0 C 17.2,0 14.08,1.48 11.58,4.83 C 11.58,4.83 11.48,4.83 11.48,4.83 C 11.48,4.83 12.15,1 12.15,1 C 12.15,1 5.73,1 5.73,1 C 5.31,3.14 4.8,5.73 4.02,8.75 C 4.02,8.75 0,26 0,26 C 0,26 7.2,26 7.2,26 z"
+             id="path142" />
+        </g>
+      </g>
+      <path
+         style="fill:none;fill-opacity:0.94117647;fill-rule:evenodd;stroke:#000000;stroke-width:8.52610779;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
+         id="path2592"
+         d="M 402.97747,590.4172 C 403.66968,592.19682 404.36192,593.97353 405.08297,595.7113 C 406.19343,598.07207 407.47693,600.3319 409.02001,602.44175 C 417.35558,613.77261 431.31547,619.9767 449.03932,621.52122 C 449.03932,621.52122 468.10438,621.52122 468.10438,621.52122 C 474.13249,621.05108 480.44905,620.17426 486.99636,618.89363 C 498.28829,616.68573 510.25803,613.29383 522.68924,608.76119 C 532.10639,605.32744 541.78314,601.26495 551.60409,596.54341 C 572.99097,586.29126 595.0845,573.06832 616.75984,557.11106 C 623.89841,551.86024 630.74856,546.47243 637.32471,540.99376 C 643.35284,535.978 649.13581,530.88434 654.65917,525.73449 C 670.07562,510.8776 681.71367,495.78852 688.30424,482.53959 C 695.16876,468.74269 696.53885,456.94601 690.91452,449.51466 C 687.46779,444.9532 681.69925,442.50877 674.27224,441.93336 C 707.72977,416.82865 727.22752,386.37503 720.2332,367.17442 C 718.01224,361.04678 713.12339,356.47522 706.11462,353.94714 C 702.99965,352.82662 699.49519,352.11708 695.67352,351.79404 C 695.67352,351.79404 685.37669,351.79404 685.37669,351.79404 C 670.99861,352.83092 650.09005,357.97936 632.35179,366.67256"
+         sodipodi:nodetypes="cccccssccccscccsccc" />
+    </g>
+    <g
+       id="g2486"
+       transform="translate(-10.576504,12.339255)">
+      <path
+         d="M 373.55234,223.69791 C 373.55234,223.69791 373.53528,223.69791 373.53528,223.69791 C 371.93238,223.69791 370.51704,224.22653 369.18697,225.30082 C 368.19794,226.08522 367.51585,227.14246 366.97018,228.31906 C 366.97018,228.31906 367.03839,228.31906 367.03839,228.31906 C 367.58406,227.14246 368.26615,226.08522 369.23813,225.30082 C 370.5682,224.22653 371.98353,223.71496 373.55234,223.69791 z"
+         id="path2577"
+         style="fill:#bd0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter" />
+      <path
+         style="fill:#bd0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter"
+         d="M 107.04146,18.25331 C 107.04148,18.25331 47.731726,277.02073 47.731726,277.02073 C 47.748776,277.02073 47.750916,277.02073 47.785016,277.02073 C 47.785016,277.02073 322.16583,277.02073 322.16583,277.02073 C 322.16584,277.02073 464.87156,277.02073 464.87156,277.02073 C 447.87049,275.5372 434.44829,269.56891 426.4508,258.68961 C 424.96727,256.67742 423.74162,254.50968 422.66733,252.24173 C 421.98526,250.57063 421.34365,248.88458 420.69566,247.17936 C 418.99042,241.75675 418.31049,235.73945 418.61742,229.32782 C 419.47004,211.45708 427.85547,190.1998 442.38396,167.93984 C 457.81621,144.28328 480.18233,119.48895 507.87512,96.4804 C 514.08211,91.32721 520.50015,86.23841 527.21873,81.29326 C 535.52314,75.18347 543.89154,69.55665 552.26418,64.29433 C 583.11163,44.87356 613.88235,31.28421 641.14885,24.38151 C 615.09308,32.88202 585.8208,47.31289 556.90024,66.95875 C 555.86008,67.6613 554.83266,68.3809 553.80952,69.09027 C 537.76339,80.20832 523.22638,92.01613 510.53954,103.94073 C 469.71651,142.3253 448.13908,182.09957 457.9441,205.40142 C 458.64326,207.00432 459.47666,208.53477 460.44865,209.98421 C 470.9869,225.48468 497.10452,228.164 530.20287,219.84252 C 532.45376,219.27977 534.70465,218.64248 537.02375,217.97744 C 547.59613,214.92507 558.82075,210.80271 570.38215,205.72116 C 573.16164,204.49339 575.97102,203.23153 578.80168,201.8844 C 579.09156,201.74799 579.36441,201.61157 579.65429,201.4581 C 616.14602,183.32648 644.19054,162.46352 650.26113,149.92843 C 651.59121,147.20181 651.91093,144.87713 651.00716,143.05426 C 646.67592,134.27238 616.36771,140.20526 579.65429,156.10986 C 576.70426,157.38876 573.72012,158.70478 570.70188,160.10647 C 573.1574,157.82661 575.71311,155.53819 578.32208,153.28558 C 582.48283,149.7012 586.79064,146.19613 591.37768,142.73454 C 598.55668,137.29827 605.81453,132.38383 612.95941,128.027 C 646.41584,102.78633 663.32951,78.90978 659.79971,70.04947 C 659.13466,68.38004 657.71934,67.23158 655.53665,66.53244 C 648.56227,64.31397 635.83282,66.96173 620.36646,73.30004 C 607.61142,78.53168 592.96142,86.29084 578.10894,95.94752 C 578.10894,95.94752 576.08399,97.27972 576.08399,97.27972 C 576.08401,97.27972 575.71097,97.49286 575.71097,97.49286 C 575.71099,97.49288 568.57036,102.23551 568.57036,102.23551 C 568.57034,102.2355 572.67355,94.72188 572.67355,94.72188 C 578.7612,83.57824 588.67705,71.95121 601.02285,61.15034 C 610.07758,53.25345 620.42188,45.81272 631.55698,39.30218 C 635.76889,36.83645 639.97438,34.54632 644.18627,32.4813 C 648.50049,30.37361 652.81682,28.50041 657.02873,26.83271 C 669.26555,21.99341 680.94654,19.05291 691.13315,18.25331 C 690.20548,18.25331 662.51741,18.25331 662.51741,18.25331 C 662.51742,18.25331 566.06582,18.25331 566.06582,18.25331 C 566.06583,18.25331 140.77287,18.25331 140.77287,18.25331 C 140.77287,18.25331 107.04146,18.25331 107.04146,18.25331 z M 413.02217,18.62641 C 411.35108,44.13137 416.2962,81.48852 427.51656,122.96461 C 429.51165,130.34482 431.68368,137.85546 434.071,145.45223 C 435.55456,150.14327 437.08499,154.76104 438.65378,159.30715 C 437.73298,160.66111 436.80574,162.00652 435.93608,163.35705 C 421.93623,184.81213 413.75328,205.08809 411.68997,222.72008 C 405.77283,202.9054 401.31796,181.20178 398.79423,158.1881 C 398.07804,151.594 397.51744,145.07368 397.14229,138.63135 C 394.37982,91.83496 400.48878,49.41415 413.02217,18.62641 z M 133.63227,51.82491 C 133.95161,51.81737 134.26641,51.82491 134.59145,51.82491 C 134.59145,51.82489 197.63136,51.82491 197.63136,51.82491 C 203.01987,51.82489 207.187,52.83482 210.15408,54.86233 C 213.1041,56.90179 214.21039,59.53976 213.51123,62.74898 C 213.51125,62.749 205.9976,96.69354 205.9976,96.69354 C 205.9976,96.69357 183.77644,96.69354 183.77644,96.69354 C 183.77646,96.69357 191.07692,63.65488 191.07692,63.65488 C 191.0769,63.65488 135.44407,63.65488 135.44407,63.65488 C 135.44405,63.65488 115.35442,154.45793 115.35442,154.45793 C 115.35444,154.45793 108.10723,187.33674 108.10723,187.33674 C 108.10723,187.33677 163.6868,187.33674 163.6868,187.33674 C 163.6868,187.33677 163.74009,187.12358 163.74009,187.12358 C 163.74009,187.1236 174.87731,136.81954 174.87731,136.81954 C 174.87731,136.81952 148.76611,136.81954 148.76611,136.81954 C 148.76611,136.81952 151.27065,125.46916 151.27065,125.46916 C 151.27064,125.46914 199.60303,125.46916 199.60303,125.46916 C 199.60303,125.46914 185.7481,188.24264 185.7481,188.24264 C 185.56053,189.13616 185.23228,189.94572 184.78891,190.74717 C 183.64642,192.82754 181.65344,194.60951 178.87393,196.076 C 175.02015,198.10523 170.4075,199.11342 165.019,199.11342 C 165.019,199.11344 102.03238,199.11342 102.03238,199.11342 C 96.643856,199.11344 92.476736,198.10521 89.509656,196.076 C 86.559646,194.0468 85.436306,191.45527 86.152506,188.24264 C 86.152516,188.24262 113.91564,62.74898 113.91564,62.74898 C 114.63182,59.53977 116.86569,56.90177 120.73653,54.86233 C 120.87295,54.78902 121.02642,54.77238 121.16283,54.70247 C 124.69585,52.93277 128.8422,51.93804 133.63227,51.82491 z M 232.42855,51.82491 C 232.42853,51.82489 311.77463,51.82491 311.77463,51.82491 C 317.09494,51.82489 321.27698,52.83482 324.24406,54.86233 C 327.22823,56.90179 328.37072,59.53976 327.65451,62.74898 C 327.65453,62.749 312.8404,129.67893 312.8404,129.67893 C 312.14128,132.86767 309.85413,135.46943 305.96623,137.51229 C 302.07833,139.56195 297.50193,140.603 292.16459,140.603 C 292.16457,140.603 234.50679,140.603 234.50679,140.603 C 234.50679,140.603 223.36956,190.85375 223.36956,190.85375 C 223.36956,190.85377 221.55776,199.11342 221.55776,199.11342 C 221.55777,199.11344 199.81618,199.11342 199.81618,199.11342 C 199.81618,199.11344 201.46811,191.65308 201.46811,191.65308 C 201.46811,191.6531 232.42855,51.82491 232.42855,51.82491 z M 342.04232,51.82491 C 342.04231,51.82489 363.7839,51.82491 363.7839,51.82491 C 363.78392,51.82489 339.16476,163.03732 339.16476,163.03732 C 339.16478,163.03734 333.78266,187.33674 333.78266,187.33674 C 333.78266,187.33677 385.79192,187.33674 385.79192,187.33674 C 386.3376,191.32528 386.97491,195.24256 387.657,199.11342 C 387.65698,199.11344 309.42995,199.11342 309.42995,199.11342 C 309.42997,199.11344 315.61138,171.19041 315.61138,171.19041 C 315.6114,171.19041 342.04232,51.82491 342.04232,51.82491 z M 251.559,63.65488 C 251.55902,63.65488 237.1179,128.77302 237.1179,128.77302 C 237.1179,128.773 291.31198,128.77302 291.31198,128.77302 C 291.31197,128.773 305.69978,63.65488 305.69978,63.65488 C 305.6998,63.65488 251.559,63.65488 251.559,63.65488 z M 205.9976,209.34475 C 206.21027,209.3376 206.42284,209.34475 206.63707,209.34475 C 209.1608,209.34477 211.36479,209.78811 213.13822,210.62366 C 215.03102,211.51037 216.38454,212.82766 217.13484,214.56699 C 217.86809,216.25518 218.05992,218.1714 217.66771,220.26883 C 217.66771,220.26884 217.50786,221.06816 217.50786,221.06816 C 217.50787,221.06813 211.27314,221.06816 211.27314,221.06816 C 211.27312,221.06813 211.32643,220.32211 211.32643,220.32211 C 211.48761,218.85668 211.30594,217.70432 210.74025,216.91168 C 210.66653,216.81227 210.55972,216.68105 210.47381,216.59195 C 210.33313,216.44832 210.12183,216.28415 209.94094,216.16564 C 209.06856,215.61614 207.70391,215.31302 205.94432,215.31302 C 203.60817,215.31304 201.86245,215.72014 200.6688,216.53866 C 199.50924,217.34012 198.776,218.23536 198.53727,219.30964 C 198.29852,220.40098 198.69073,220.97436 198.96358,221.2813 C 198.97208,221.28979 199.00651,221.32507 199.01685,221.33459 C 199.36237,221.62904 200.56221,222.31935 204.29238,223.19967 C 207.6687,224.01818 209.9047,224.75356 211.16656,225.38449 C 213.07643,226.35645 214.41075,227.61619 215.1099,229.16795 C 215.80901,230.70267 215.9625,232.49952 215.5362,234.44348 C 215.1099,236.33627 214.14431,238.082 212.71192,239.71902 C 211.2966,241.35602 209.49545,242.65199 207.32981,243.55575 C 205.18121,244.44247 202.82377,244.94124 200.40235,244.94124 C 197.33295,244.94123 194.86892,244.47657 192.94201,243.55575 C 190.92984,242.60084 189.47827,241.09385 188.62567,239.13284 C 187.80716,237.22298 187.63237,235.05522 188.09278,232.68498 C 188.09278,232.68495 188.25265,231.93893 188.25265,231.93893 C 188.25265,231.93893 194.38079,231.93893 194.38079,231.93893 C 194.38079,231.93893 194.3275,232.68498 194.3275,232.68498 C 194.17402,234.1003 194.32537,235.2428 194.70052,236.09541 C 195.05861,236.91394 195.74071,237.59174 196.83204,238.12037 C 197.99158,238.68307 199.44102,238.97297 201.09509,238.97297 C 202.57864,238.97296 203.9343,238.72358 205.145,238.28024 C 206.33865,237.85394 207.28718,237.2912 207.96927,236.57501 C 208.63429,235.85879 209.02438,235.10213 209.1949,234.28361 C 209.36542,233.55037 209.32492,232.93011 209.03503,232.41853 C 208.71104,231.87289 208.06945,231.389 207.06338,230.97975 C 207.06338,230.97974 201.84112,229.43439 201.84112,229.43439 C 198.9252,228.70116 196.96207,228.00201 195.81957,227.30287 C 194.2678,226.38206 193.14876,225.20118 192.56898,223.78585 C 191.98921,222.38754 191.9274,220.83794 192.30255,219.14977 C 192.69475,217.34224 193.56654,215.6221 194.91366,214.0874 C 196.27786,212.53563 198.03848,211.31855 200.13591,210.51709 C 201.99034,209.82169 203.94187,209.41388 205.9976,209.34475 z M 261.9502,209.45133 C 262.28745,209.42506 262.60456,209.45133 262.96267,209.45133 C 262.96268,209.45133 266.79942,209.87763 266.79942,209.87763 C 266.79941,209.87763 268.07833,209.98421 268.07833,209.98421 C 268.07835,209.98422 266.21325,214.72685 266.21325,214.72685 C 266.21324,214.72687 265.84023,215.47289 265.84023,215.47289 C 265.84023,215.47287 262.90939,215.20645 262.90939,215.20645 C 262.04398,215.20645 261.40826,215.33997 260.99101,215.63275 C 260.9633,215.65368 260.91001,215.71695 260.88443,215.73933 C 260.82853,215.78837 260.73452,215.87391 260.67128,215.95249 C 260.41469,216.289 260.10216,216.89035 259.87196,217.97744 C 259.87194,217.97744 259.76112,218.43784 259.65881,218.83005 C 261.00594,218.83006 264.24158,218.83005 264.24158,218.83005 C 264.24158,218.83006 263.06925,224.10557 263.06925,224.10557 C 263.06925,224.10556 259.71849,224.10557 258.59305,224.10557 C 258.25199,225.64026 254.06355,244.40837 254.06355,244.40837 C 254.06353,244.40835 247.88212,244.40837 247.88212,244.40837 C 247.8821,244.40835 251.90005,226.37352 252.41162,224.10557 C 251.37141,224.10556 248.84131,224.10557 248.84131,224.10557 C 248.84131,224.10556 250.01365,218.83005 250.01365,218.83005 C 250.01366,218.83006 252.55869,218.83005 253.53066,218.83005 C 253.70118,218.09681 253.95696,217.17811 253.95696,217.17811 C 254.33212,215.47289 254.72431,214.24726 255.23587,213.39465 C 255.93504,212.21806 256.92193,211.23328 258.16674,210.51709 C 259.19201,209.92134 260.48872,209.56515 261.9502,209.45133 z M 276.71102,209.71777 C 276.711,209.71776 275.09532,216.98841 274.68607,218.83005 C 275.87971,218.83006 278.68268,218.83005 278.68268,218.83005 C 278.68268,218.83006 277.51035,224.10557 277.51035,224.10557 C 277.51033,224.10556 274.57096,224.10557 273.51373,224.10557 C 273.18972,225.57204 270.63617,236.94803 270.63617,236.94803 C 270.63619,236.94801 270.42301,238.31434 270.42301,238.70654 C 270.42329,238.71959 270.42195,238.75022 270.42301,238.75982 C 270.42385,238.76385 270.42181,238.80979 270.42301,238.81311 C 270.42465,238.8158 270.47416,238.81097 270.47629,238.81311 C 270.47629,238.81309 271.11576,238.8664 271.11576,238.8664 C 271.11576,238.8664 274.04661,238.65325 274.04661,238.65325 C 274.04661,238.65325 273.72688,243.39589 273.72688,243.39589 C 273.7269,243.39589 273.78018,244.2485 273.78018,244.2485 C 273.78016,244.24848 269.5704,244.7281 269.5704,244.7281 C 267.8993,244.72808 266.67365,244.45527 265.78694,243.8755 C 264.84909,243.26158 264.3034,242.44736 264.08172,241.42424 C 264.04761,241.23665 263.97514,240.96382 263.97514,240.57163 C 263.97514,239.80427 264.12009,238.50618 264.6146,236.25529 C 264.61462,236.25531 266.85483,226.22005 267.3323,224.10557 C 266.53087,224.10556 264.40145,224.10557 264.40145,224.10557 C 264.40147,224.10556 265.57378,218.83005 265.57378,218.83005 C 265.57376,218.83006 267.65202,218.83005 268.50464,218.83005 C 268.77745,217.6023 269.73026,213.39465 269.73026,213.39465 C 269.73026,213.39467 274.68607,210.78353 274.68607,210.78353 C 274.68606,210.78355 276.71102,209.71777 276.71102,209.71777 z M 80.344086,209.93092 C 80.344106,209.93092 104.32377,209.93092 104.32377,209.93092 C 104.32377,209.93092 102.99157,215.8992 102.99157,215.8992 C 102.99157,215.89922 86.994456,215.8992 85.459756,215.8992 C 85.186936,217.10993 84.093446,222.01242 83.701246,223.78585 C 85.918046,223.78585 98.888376,223.78585 98.888376,223.78585 C 98.888376,223.78585 97.556166,229.75411 97.556166,229.75411 C 97.556156,229.75411 83.903746,229.75411 82.369036,229.75411 C 82.045046,231.23766 79.118456,244.40837 79.118456,244.40837 C 79.118476,244.40835 72.670596,244.40837 72.670596,244.40837 C 72.670606,244.40835 80.344086,209.93092 80.344086,209.93092 z M 112.47685,218.35046 C 112.71752,218.3209 112.98043,218.35046 113.22289,218.35046 C 114.75759,218.35046 116.17506,218.81726 117.53924,219.78923 C 117.53924,219.78925 118.39184,220.3754 118.39184,220.3754 C 118.39184,220.3754 115.08798,225.8108 115.08798,225.8108 C 115.08798,225.81078 114.18209,225.17134 114.18209,225.17134 C 113.51705,224.74505 112.80086,224.53188 112.05056,224.53188 C 111.40257,224.5319 110.79935,224.76208 110.18547,225.17134 C 109.5375,225.59764 108.99607,226.16249 108.58683,226.92985 C 107.87063,228.24289 107.34627,229.71362 106.98818,231.29948 C 106.98818,231.29949 104.11062,244.40837 104.11062,244.40837 C 104.11062,244.40835 97.929186,244.40837 97.929186,244.40837 C 97.929186,244.40835 103.63103,218.83005 103.63103,218.83005 C 103.63105,218.83006 109.38615,218.83005 109.38615,218.83005 C 109.38615,218.83006 109.18791,219.60593 109.1197,219.89581 C 109.39254,219.6912 109.68029,219.40982 109.91903,219.25635 C 110.745,218.76345 111.6174,218.456 112.47685,218.35046 z M 130.80799,218.35046 C 131.18018,218.32231 131.54658,218.35046 131.92705,218.35046 C 135.40571,218.35046 138.03813,219.56968 139.7604,221.97405 C 140.83468,223.52579 141.41235,225.44417 141.41235,227.72917 C 141.41235,228.99102 141.25674,230.34882 140.93276,231.83236 C 140.93276,231.83236 140.45315,233.69745 140.45315,233.69745 C 140.45315,233.69743 124.82054,233.69745 123.08121,233.69745 C 123.0471,234.05553 123.02792,234.43922 123.02792,234.76321 C 123.02792,236.0933 123.30075,237.13986 123.88053,237.90722 C 124.15603,238.28235 124.47543,238.62021 124.83972,238.8664 C 125.5265,239.31429 126.41306,239.55915 127.45084,239.55915 C 128.71272,239.55913 129.82109,239.2117 130.86128,238.54667 C 131.85033,237.91574 132.79672,236.90753 133.63227,235.50925 C 133.63227,235.50922 140.24,235.50925 140.24,235.50925 C 140.24,235.50922 139.65384,236.78816 139.65384,236.78816 C 138.39197,239.34601 136.63133,241.3411 134.43159,242.75644 C 132.23186,244.17177 129.60368,244.94124 126.7048,244.94124 C 122.93626,244.94123 120.13117,243.72202 118.39184,241.31766 C 116.66958,238.96443 116.29869,235.71173 117.21951,231.6192 C 118.14034,227.45847 119.97771,224.13329 122.6549,221.81418 C 125.05448,219.73356 127.77735,218.5795 130.80799,218.35046 z M 158.57114,218.35046 C 158.94332,218.32231 159.30971,218.35046 159.69018,218.35046 C 163.16885,218.35046 165.80128,219.56968 167.52355,221.97405 C 168.59784,223.52579 169.17548,225.44417 169.17548,227.72917 C 169.17548,228.97397 169.01988,230.31258 168.69588,231.77907 C 168.69588,231.77909 168.2163,233.69745 168.2163,233.69745 C 168.2163,233.69743 152.58367,233.69745 150.84435,233.69745 C 150.82728,233.93615 150.80811,234.15147 150.79106,234.3902 C 150.77827,234.47972 150.79666,234.61561 150.79106,234.70992 C 150.79056,234.7253 150.79106,234.74829 150.79106,234.76321 C 150.79106,235.01901 150.8273,235.27051 150.84435,235.50925 C 150.92958,236.48121 151.18327,237.29334 151.64367,237.90722 C 151.73134,238.02658 151.81375,238.17392 151.91011,238.28024 C 152.69112,239.11578 153.79651,239.55915 155.21398,239.55915 C 156.47586,239.55913 157.60129,239.2117 158.62443,238.54667 C 159.61347,237.91574 160.55985,236.90753 161.39541,235.50925 C 161.39541,235.50922 168.05643,235.50925 168.05643,235.50925 C 168.05642,235.50922 167.41697,236.78816 167.41697,236.78816 C 166.15511,239.34601 164.39447,241.3411 162.19473,242.75644 C 159.99499,244.17177 157.36682,244.94124 154.46795,244.94124 C 150.69942,244.94123 147.89432,243.72202 146.15499,241.31766 C 145.02954,239.78294 144.50305,237.82835 144.50305,235.50925 C 144.50305,235.15113 144.52223,234.76534 144.55634,234.3902 C 144.62457,233.50349 144.76097,232.60824 144.98265,231.6192 C 145.90349,227.47552 147.68756,224.13329 150.36475,221.81418 C 152.76432,219.73356 155.5405,218.5795 158.57114,218.35046 z M 234.18705,218.35046 C 234.56789,218.32117 234.91817,218.35046 235.3061,218.35046 C 238.85297,218.35046 241.5792,219.5505 243.35262,221.92076 C 245.10902,224.29099 245.53531,227.4883 244.63153,231.51262 C 243.9324,234.65025 242.92206,237.18462 241.54083,239.02627 C 240.15957,240.86792 238.39895,242.37276 236.31857,243.39589 C 234.25529,244.41903 232.07044,244.94124 229.87071,244.94124 C 226.25564,244.94123 223.56352,243.70496 221.82419,241.31766 C 220.69873,239.80002 220.11897,237.8454 220.11897,235.50925 C 220.11899,234.24738 220.25753,232.90665 220.59857,231.40606 C 221.62172,226.83605 223.71059,223.35528 226.78,221.12144 C 229.03301,219.4951 231.52114,218.55538 234.18705,218.35046 z M 327.81438,218.35046 C 328.26398,218.32271 328.68031,218.35046 329.14658,218.35046 C 331.29517,218.35046 332.98333,218.56786 334.26225,219.09648 C 335.62643,219.64217 336.59414,220.41377 337.13981,221.33459 C 337.66845,222.20422 337.93914,223.27215 337.93914,224.58516 C 337.93915,224.58518 337.29966,228.4752 337.29966,228.4752 C 337.29969,228.4752 336.12734,233.75074 336.12734,233.75074 C 335.12123,238.2525 334.89958,239.94069 334.84841,240.57163 C 334.79726,241.42425 334.87612,242.25553 335.11486,243.02288 C 335.11488,243.02286 335.54116,244.40837 335.54116,244.40837 C 335.54118,244.40835 329.25316,244.40837 329.25316,244.40837 C 329.25314,244.40835 328.98671,243.60904 328.98671,243.60904 C 328.8844,243.23392 328.91424,242.75644 328.88014,242.33013 C 327.68649,243.06338 326.4907,243.71349 325.41641,244.08864 C 323.83057,244.63433 322.18502,244.94124 320.5139,244.94124 C 317.61504,244.94123 315.46858,244.1867 314.1726,242.70314 C 313.18358,241.61181 312.73383,240.27747 312.73383,238.75982 C 312.73381,238.18005 312.81056,237.57895 312.94697,236.94803 C 313.23685,235.65206 313.76335,234.452 314.59891,233.37771 C 315.41742,232.32045 316.38514,231.45082 317.47647,230.81989 C 318.53373,230.18897 319.71245,229.74134 320.94021,229.43439 C 320.94019,229.43439 324.72367,228.79493 324.72367,228.79493 C 327.63961,228.45387 329.81588,228.02972 331.38469,227.56931 C 331.41881,227.39879 331.49126,227.19629 331.49126,227.19629 C 331.73852,226.09911 331.70758,225.27441 331.43797,224.85161 C 331.41813,224.82434 331.35379,224.76847 331.3314,224.74503 C 331.27384,224.68368 331.18537,224.58724 331.11824,224.53188 C 330.47689,224.02435 329.38318,223.78585 327.92096,223.78585 C 326.26689,223.78585 325.0434,224.05656 324.19078,224.58516 C 323.35523,225.11379 322.58147,226.0815 321.89939,227.46272 C 321.89938,227.46271 315.45152,227.46272 315.45152,227.46272 C 315.45154,227.46271 316.03769,226.18381 316.03769,226.18381 C 316.80502,224.41036 317.71947,222.93963 318.86197,221.81418 C 320.00447,220.68871 321.54769,219.81694 323.33817,219.20307 C 324.71033,218.7501 326.20867,218.44953 327.81438,218.35046 z M 354.83149,218.35046 C 355.07195,218.3209 355.33505,218.35046 355.57752,218.35046 C 357.12925,218.35046 358.58297,218.81726 359.94715,219.78923 C 359.94717,219.78925 360.74647,220.3754 360.74647,220.3754 C 360.74648,220.3754 357.44261,225.8108 357.44261,225.8108 C 357.44262,225.81078 356.53671,225.17134 356.53671,225.17134 C 355.87168,224.74505 355.1917,224.53188 354.45847,224.53188 C 353.81046,224.5319 353.17103,224.76208 352.54008,225.17134 C 351.89211,225.59764 351.42104,226.16249 350.99474,226.92985 C 350.29558,228.24289 349.75418,229.71362 349.39609,231.29948 C 349.39607,231.29949 346.46524,244.40837 346.46524,244.40837 C 346.46526,244.40835 340.28382,244.40837 340.28382,244.40837 C 340.28382,244.40835 345.98564,218.83005 345.98564,218.83005 C 345.98563,218.83006 351.74076,218.83005 351.74076,218.83005 C 351.74076,218.83006 351.59582,219.60593 351.52762,219.89581 C 351.80044,219.6912 352.07115,219.40982 352.32694,219.25635 C 353.13957,218.76345 353.97265,218.456 354.83149,218.35046 z M 373.10932,218.35046 C 373.48117,218.32231 373.84791,218.35046 374.22838,218.35046 C 377.70704,218.35046 380.35651,219.56968 382.06175,221.97405 C 383.1531,223.52579 383.71368,225.44417 383.71368,227.72917 C 383.71366,228.99102 383.50478,230.34882 383.18079,231.83236 C 383.18079,231.83236 382.75449,233.69745 382.75449,233.69745 C 382.75448,233.69743 367.10481,233.69745 365.38255,233.69745 C 365.34844,234.05553 365.27596,234.43922 365.27596,234.76321 C 365.27596,236.0933 365.56585,237.13986 366.12858,237.90722 C 366.21624,238.02658 366.35158,238.17392 366.4483,238.28024 C 366.50432,238.33991 366.60242,238.43797 366.66146,238.49338 C 367.42381,239.1864 368.46127,239.55915 369.75216,239.55915 C 371.01405,239.55913 372.12243,239.2117 373.16261,238.54667 C 374.15166,237.91574 375.081,236.90753 375.9336,235.50925 C 375.93358,235.50922 382.59462,235.50925 382.59462,235.50925 C 382.59462,235.50922 381.95516,236.78816 381.95516,236.78816 C 380.69329,239.34601 378.91561,241.3411 376.73292,242.75644 C 374.51615,244.17177 371.92207,244.94124 369.00613,244.94124 C 365.23762,244.94123 362.48579,243.72202 360.74647,241.31766 C 359.02417,238.96443 358.61707,235.71173 359.52084,231.6192 C 360.44165,227.45847 362.22575,224.13329 364.90295,221.81418 C 367.3177,219.73356 370.08147,218.5795 373.10932,218.35046 z M 279.80172,218.83005 C 279.80174,218.83006 286.14303,218.83005 286.14303,218.83005 C 286.14305,218.83006 286.92529,234.00866 286.94234,234.23032 C 287.19812,233.68676 287.39658,233.22945 287.42195,233.16457 C 287.42196,233.16458 294.40269,218.83005 294.40269,218.83005 C 294.40271,218.83006 300.2111,218.83005 300.2111,218.83005 C 300.21109,218.83006 300.74398,233.82533 300.74398,233.91059 C 300.91453,233.60368 308.68392,218.83005 308.68392,218.83005 C 308.6839,218.83006 314.97193,218.83005 314.97193,218.83005 C 314.97192,218.83006 301.117,244.40837 301.117,244.40837 C 301.11702,244.40835 295.41517,244.40837 295.41517,244.40837 C 295.41517,244.40835 294.86311,230.53853 294.829,229.75411 C 292.47577,234.57991 287.68837,244.40837 287.68837,244.40837 C 287.68837,244.40835 281.82669,244.40837 281.82669,244.40837 C 281.82669,244.40835 279.80172,218.83005 279.80172,218.83005 z M 130.91457,223.67927 C 129.44564,223.74129 128.11162,224.27076 126.86468,225.27791 C 125.87566,226.06232 125.20847,227.13875 124.67985,228.31534 C 124.67985,228.31536 135.17762,228.31534 135.17762,228.31534 C 135.19469,228.12778 135.23091,227.8997 135.23091,227.72917 C 135.23089,226.75722 135.05825,226.00264 134.75132,225.49107 C 134.00104,224.2633 132.88837,223.67927 131.2343,223.67927 C 131.1352,223.67927 131.0125,223.67515 130.91457,223.67927 z M 158.6777,223.67927 C 157.20878,223.74129 155.87475,224.27076 154.6278,225.27791 C 153.63876,226.06232 152.98867,227.13875 152.443,228.31534 C 152.443,228.31536 162.94076,228.31534 162.94076,228.31534 C 162.9578,228.12778 162.99405,227.8997 162.99405,227.72917 C 162.99404,226.75722 162.83845,226.00264 162.51445,225.49107 C 162.36551,225.24168 162.16402,224.99368 161.98157,224.79833 C 161.26958,224.06261 160.28967,223.67927 158.99744,223.67927 C 158.89833,223.67927 158.77564,223.67515 158.6777,223.67927 z M 373.42906,223.67927 C 371.9185,223.7258 370.50781,224.23721 369.21929,225.27791 C 368.24731,226.06232 367.58014,227.13875 367.03447,228.31534 C 367.03449,228.31536 377.47896,228.31534 377.47896,228.31534 C 377.49599,228.12778 377.53225,227.8997 377.53225,227.72917 C 377.53224,226.75722 377.37665,226.00264 377.05265,225.49107 C 376.31941,224.28035 375.18969,223.69633 373.53563,223.67927 C 373.48661,223.6798 373.47779,223.67777 373.42906,223.67927 z M 233.81404,223.78585 C 232.40441,223.95324 231.09368,224.59636 229.87071,225.70422 C 228.40423,227.03431 227.34059,229.12319 226.72672,231.88565 C 226.47093,233.0452 226.35369,234.03636 226.35369,234.92307 C 226.35371,236.13377 226.58602,237.08444 227.04644,237.80063 C 227.16901,237.98447 227.3316,238.17874 227.47275,238.33352 C 228.23079,239.1384 229.28934,239.55915 230.61675,239.55915 C 232.33901,239.55913 233.85667,238.91756 235.3061,237.58748 C 236.77262,236.24034 237.81917,234.13014 238.4501,231.29948 C 239.0299,228.70753 238.94888,226.77212 238.13038,225.54436 C 237.34598,224.3507 236.19922,223.78585 234.61337,223.78585 C 234.34426,223.78585 234.07507,223.75484 233.81404,223.78585 z M 330.10577,233.11128 C 328.65636,233.50346 327.0321,233.83386 324.88353,234.12376 C 323.28064,234.3625 322.13812,234.614 321.47308,234.86979 C 320.89332,235.10851 320.4265,235.4389 320.0343,235.88227 C 319.65914,236.30854 319.40764,236.75619 319.28828,237.26776 C 319.25419,237.4724 319.23498,237.6834 319.23498,237.85393 C 319.23498,237.86777 319.23467,237.89351 319.23498,237.90722 C 319.23677,237.9478 319.23053,238.02792 319.23498,238.06707 C 319.24566,238.14444 319.26715,238.26147 319.28828,238.33352 C 319.2959,238.35725 319.33279,238.41691 319.34155,238.44009 C 319.36021,238.48593 319.3717,238.5562 319.39484,238.59996 C 319.41911,238.64322 319.47274,238.71845 319.50142,238.75982 C 319.54606,238.82119 319.60692,238.91542 319.66129,238.97297 C 320.0876,239.45043 320.93807,239.66572 322.16583,239.66572 C 323.51298,239.66573 324.80893,239.40994 326.00258,238.81311 C 327.1792,238.23334 328.12771,237.36793 328.82685,236.36185 C 329.33844,235.64565 329.74768,234.54365 330.10577,233.11128 z"
+         id="path2579" />
+      <path
+         d="M 373.60344,223.69791 C 373.58638,223.69791 373.56933,223.69791 373.55228,223.69791 C 375.20635,223.71496 376.29769,224.27769 377.03093,225.48839 C 377.35493,225.99996 377.52545,226.76731 377.52545,227.73929 C 377.52545,227.90981 377.49134,228.13149 377.47429,228.31906 C 377.47429,228.31906 377.5425,228.31906 377.5425,228.31906 C 377.5425,228.13149 377.5766,227.90981 377.5766,227.73929 C 377.5766,226.76731 377.42313,225.99996 377.09914,225.48839 C 376.3659,224.26063 375.2575,223.69791 373.60344,223.69791 z"
+         id="path2583"
+         style="fill:#bd0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter" />
+      <g
+         id="g2587"
+         style="fill:#bd0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter"
+         transform="matrix(1.705222,0,0,1.705222,26.564476,303.23111)">
+        <path
+           id="path2589"
+           d="M 0,36 C 0,36 7.46,36 7.46,36 C 7.46,36 10.81,22 10.81,22 C 10.81,22 22.93,22 22.93,22 C 22.93,22 24.49,16 24.49,16 C 24.49,16 12.32,16 12.32,16 C 12.32,16 14.34,7 14.34,7 C 14.34,7 27.29,7 27.29,7 C 27.29,7 28.85,0 28.85,0 C 28.85,0 8.4,0 8.4,0 C 8.4,0 0,36 0,36 z"
+           style="fill:#bd0000;fill-opacity:1" />
+      </g>
+      <g
+         id="g2591"
+         style="fill:#bd0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter"
+         transform="matrix(1.705222,0,0,1.705222,70.814976,320.28331)">
+        <path
+           id="path2593"
+           d="M 7.51,26 C 7.51,26 9.75,16.6 9.75,16.6 C 10.93,11.51 13.42,7 18.13,7 C 18.55,7 18.96,7.21 19.27,7.26 C 19.27,7.26 21.09,0.05 21.09,0.05 C 20.67,0.05 20.21,0 19.69,0 C 16.22,0 13.31,2.44 11.37,5.94 C 11.37,5.94 11.17,5.94 11.17,5.94 C 11.46,4.23 11.71,2.61 11.9,1 C 11.9,1 5.47,1 5.47,1 C 5.1,3.08 4.53,7.15 3.66,10.82 C 3.66,10.82 0,26 0,26 C 0,26 7.51,26 7.51,26 z"
+           style="fill:#bd0000;fill-opacity:1" />
+      </g>
+      <g
+         id="g2595"
+         style="fill:#bd0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter"
+         transform="matrix(1.705222,0,0,1.705222,105.99378,320.28331)">
+        <path
+           id="path2597"
+           d="M 20.06,19.25 C 17.99,20.26 15.63,20 12.88,20 C 10.71,20 9.03,19.62 8.11,18.88 C 7.63,18.07 7.43,16.81 7.47,16 C 17.6,16.27 23.99,13.93 24.31,7.53 C 24.55,2.7 21.02,0 15.89,0 C 6.73,0 0.73,8.08 0.34,15.86 C 0,22.65 3.52,26 10.78,26 C 13.57,26 17.27,25.68 20.3,24.77 C 20.3,24.77 20.06,19.25 20.06,19.25 z M 17.32,7.53 C 17.2,9.91 14.26,10.05 8.47,10 C 9.1,7.91 11.22,6 14.69,6 C 16.4,6 17.38,6.65 17.32,7.53 z"
+           style="fill:#bd0000;fill-opacity:1" />
+      </g>
+      <g
+         id="g2599"
+         style="fill:#bd0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter"
+         transform="matrix(1.705222,0,0,1.705222,151.21628,320.28331)">
+        <path
+           id="path2601"
+           d="M 20.05,19.25 C 17.98,20.26 15.62,20 12.88,20 C 10.7,20 9.03,19.62 8.11,18.88 C 7.63,18.07 7.42,16.81 7.46,16 C 17.6,16.27 23.98,13.93 24.31,7.53 C 24.55,2.7 21.02,0 15.89,0 C 6.72,0 0.72,8.08 0.33,15.86 C 0,22.65 3.52,26 10.77,26 C 13.57,26 17.27,25.68 20.3,24.77 C 20.3,24.77 20.05,19.25 20.05,19.25 z M 17.32,7.53 C 17.2,9.91 14.26,10.05 8.46,10 C 9.1,7.91 11.21,6 14.68,6 C 16.39,6 17.38,6.65 17.32,7.53 z"
+           style="fill:#bd0000;fill-opacity:1" />
+      </g>
+      <g
+         id="g2603"
+         style="fill:#bd0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter"
+         transform="matrix(1.705222,0,0,1.705222,212.45078,320.28331)">
+        <path
+           id="path2605"
+           d="M 22.74,26 C 22.8,22.83 23.56,17.85 24.35,14.58 C 24.35,14.58 27.56,1 27.56,1 C 25.52,0.31 22.34,0 19.28,0 C 6.86,0 0.7,9.2 0.27,17.82 C 0,23.23 2.93,26 7.49,26 C 10.44,26 13.77,24.57 16.36,20.27 C 16.36,20.27 16.47,20.27 16.47,20.27 C 16.27,22.34 16.03,24.35 15.9,26 C 15.9,26 22.74,26 22.74,26 z M 17.61,11.72 C 16.15,18.08 13.17,20 10.95,20 C 8.88,20 7.98,18.53 8.1,16.39 C 8.34,11.56 12.16,6 16.98,6 C 17.76,6 18.37,5.86 18.94,5.72 C 18.94,5.72 17.61,11.72 17.61,11.72 z"
+           style="fill:#bd0000;fill-opacity:1" />
+      </g>
+      <g
+         id="g2607"
+         style="fill:#bd0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter"
+         transform="matrix(1.705222,0,0,1.705222,259.56608,320.28331)">
+        <path
+           id="path2609"
+           d="M 0,24.82 C 1.44,25.94 4.46,25.95 7.61,26 C 14.34,26.05 19.42,23.11 19.72,17.71 C 19.89,14.11 17.1,11.98 14.37,10.55 C 12.4,9.6 11.41,8.69 11.46,7.63 C 11.53,6.2 12.87,6 14.84,6 C 17.06,6 18.84,6.27 19.86,6.47 C 19.86,6.47 21.88,1.05 21.88,1.05 C 20.73,0.36 18.43,0 15.48,0 C 8.95,0 4.17,3.45 3.9,8.69 C 3.74,11.93 6.07,14.11 8.89,15.59 C 11.17,16.76 11.95,17.66 11.89,18.93 C 11.82,20.21 10.68,20 8.61,20 C 6.18,20 3.49,19.68 2.07,19.46 C 2.07,19.46 0,24.82 0,24.82 z"
+           style="fill:#bd0000;fill-opacity:1" />
+      </g>
+      <g
+         id="g2611"
+         style="fill:#bd0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter"
+         transform="matrix(1.705222,0,0,1.705222,314.90048,301.52591)">
+        <path
+           id="path2613"
+           d="M 7.45,37 C 7.45,37 13.5,12 13.5,12 C 13.5,12 6.09,12 6.09,12 C 6.09,12 0,37 0,37 C 0,37 7.45,37 7.45,37 z M 10.92,9 C 13.46,9 15.72,6.9 15.86,3.3 C 15.98,0.86 14.4,0 12.07,0 C 9.64,0 7.42,1.58 7.29,3.94 C 7.17,6.32 8.75,9 10.92,9 z"
+           style="fill:#bd0000;fill-opacity:1" />
+      </g>
+      <g
+         id="g2615"
+         style="fill:#bd0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter"
+         transform="matrix(1.705222,0,0,1.705222,339.26808,321.45991)">
+        <path
+           id="path2617"
+           d="M 7.46,25.31 C 7.46,25.31 10.1,14.05 10.1,14.05 C 11.47,8.32 14.42,6.31 16.85,6.31 C 18.77,6.31 19.33,7.13 19.24,8.32 C 19.19,9.28 19.04,10.29 18.84,11.19 C 18.84,11.19 15.48,25.31 15.48,25.31 C 15.48,25.31 22.94,25.31 22.94,25.31 C 22.94,25.31 26.48,10.5 26.48,10.5 C 26.75,9.22 27.05,7.31 27.11,6.15 C 27.33,1.64 25.08,0 20.94,0 C 17.62,0 14.39,1.54 11.84,4.88 C 11.84,4.88 11.74,4.88 11.74,4.88 C 11.74,4.88 12.42,0.31 12.42,0.31 C 12.42,0.31 5.84,0.31 5.84,0.31 C 5.41,2.45 4.86,5.04 4.08,8.06 C 4.08,8.06 0,25.31 0,25.31 C 0,25.31 7.46,25.31 7.46,25.31 z"
+           style="fill:#bd0000;fill-opacity:1" />
+      </g>
+      <g
+         id="g2619"
+         style="fill:#bd0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter"
+         transform="matrix(1.705222,0,0,1.705222,406.72668,303.23111)">
+        <path
+           id="path2621"
+           d="M 0,36 C 0,36 7.46,36 7.46,36 C 7.46,36 10.82,22 10.82,22 C 10.82,22 22.93,22 22.93,22 C 22.93,22 24.49,16 24.49,16 C 24.49,16 12.32,16 12.32,16 C 12.32,16 14.34,7 14.34,7 C 14.34,7 27.29,7 27.29,7 C 27.29,7 28.85,0 28.85,0 C 28.85,0 8.4,0 8.4,0 C 8.4,0 0,36 0,36 z"
+           style="fill:#bd0000;fill-opacity:1" />
+      </g>
+      <g
+         id="g2623"
+         style="fill:#bd0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter"
+         transform="matrix(1.705222,0,0,1.705222,450.97718,320.28331)">
+        <path
+           id="path2625"
+           d="M 7.51,26 C 7.51,26 9.75,16.6 9.75,16.6 C 10.93,11.51 13.42,7 18.13,7 C 18.55,7 18.96,7.21 19.27,7.26 C 19.27,7.26 21.09,0.05 21.09,0.05 C 20.67,0.05 20.21,0 19.69,0 C 16.22,0 13.31,2.44 11.37,5.94 C 11.37,5.94 11.17,5.94 11.17,5.94 C 11.46,4.23 11.71,2.61 11.9,1 C 11.9,1 5.47,1 5.47,1 C 5.11,3.08 4.53,7.15 3.66,10.82 C 3.66,10.82 0,26 0,26 C 0,26 7.51,26 7.51,26 z"
+           style="fill:#bd0000;fill-opacity:1" />
+      </g>
+      <g
+         id="g2627"
+         style="fill:#bd0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter"
+         transform="matrix(1.705222,0,0,1.705222,486.15598,320.28331)">
+        <path
+           id="path2629"
+           d="M 20.06,19.25 C 17.99,20.26 15.63,20 12.88,20 C 10.71,20 9.03,19.62 8.11,18.88 C 7.63,18.07 7.43,16.81 7.47,16 C 17.6,16.27 23.99,13.93 24.31,7.53 C 24.55,2.7 21.02,0 15.89,0 C 6.73,0 0.73,8.08 0.34,15.86 C 0,22.65 3.53,26 10.78,26 C 13.57,26 17.28,25.68 20.3,24.77 C 20.3,24.77 20.06,19.25 20.06,19.25 z M 17.32,7.53 C 17.2,9.91 14.26,10.05 8.47,10 C 9.1,7.91 11.22,6 14.69,6 C 16.4,6 17.38,6.65 17.32,7.53 z"
+           style="fill:#bd0000;fill-opacity:1" />
+      </g>
+      <g
+         id="g2631"
+         style="fill:#bd0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter"
+         transform="matrix(1.705222,0,0,1.705222,531.37838,320.28331)">
+        <path
+           id="path2633"
+           d="M 20.05,19.25 C 17.98,20.26 15.62,20 12.88,20 C 10.7,20 9.03,19.62 8.11,18.88 C 7.63,18.07 7.42,16.81 7.46,16 C 17.6,16.27 23.98,13.93 24.31,7.53 C 24.55,2.7 21.02,0 15.89,0 C 6.72,0 0.72,8.08 0.33,15.86 C 0,22.65 3.52,26 10.77,26 C 13.57,26 17.27,25.68 20.3,24.77 C 20.3,24.77 20.05,19.25 20.05,19.25 z M 17.32,7.53 C 17.2,9.91 14.26,10.05 8.46,10 C 9.1,7.91 11.21,6 14.68,6 C 16.39,6 17.38,6.65 17.32,7.53 z"
+           style="fill:#bd0000;fill-opacity:1" />
+      </g>
+      <g
+         id="g2635"
+         style="fill:#bd0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter"
+         transform="matrix(1.705222,0,0,1.705222,576.36218,301.52591)">
+        <path
+           id="path2637"
+           d="M 23.31,0 C 23.31,0 20.5,11.36 20.5,11.36 C 19.48,10.94 18.15,11 17.11,11 C 7.53,11 0.75,19.2 0.3,28.08 C 0,34.34 3.34,37 7.64,37 C 10.65,37 13.82,35.67 16.22,32.23 C 16.22,32.23 16.32,32.23 16.32,32.23 C 16.32,32.23 15.75,37 15.75,37 C 15.75,37 22.53,37 22.53,37 C 22.84,34 23.49,30.43 24.22,27.17 C 24.22,27.17 30.71,0 30.71,0 C 30.71,0 23.31,0 23.31,0 z M 17.47,24.42 C 16.3,29.35 13.54,31 11.36,31 C 9.19,31 7.98,29.49 8.13,26.8 C 8.38,21.82 11.8,17 16.25,17 C 17.5,17 18.57,17.19 19.16,17.47 C 19.16,17.47 17.47,24.42 17.47,24.42 z"
+           style="fill:#bd0000;fill-opacity:1" />
+      </g>
+      <g
+         id="g2639"
+         style="fill:#bd0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter"
+         transform="matrix(1.705222,0,0,1.705222,627.02428,320.28331)">
+        <path
+           id="path2641"
+           d="M 10.61,26 C 19.31,26 26.02,19.41 26.49,10.44 C 26.78,4.5 23.08,0 16.25,0 C 7.23,0 0.76,7.3 0.31,16.12 C 0,22.54 4.14,26 10.61,26 z M 11.78,20 C 9.24,20 7.84,18.38 7.99,15.96 C 8.19,11.93 10.68,6 14.97,6 C 17.93,6 18.84,8.27 18.72,10.5 C 18.5,14.9 15.82,20 11.78,20 z"
+           style="fill:#bd0000;fill-opacity:1" />
+      </g>
+      <g
+         id="g2643"
+         style="fill:#bd0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter"
+         transform="matrix(1.705222,0,0,1.705222,675.72548,320.28331)">
+        <path
+           id="path2645"
+           d="M 7.2,26 C 7.2,26 9.9,14.58 9.9,14.58 C 11.03,9.49 13.85,6 16.38,6 C 18.2,6 18.7,7.33 18.61,9.07 C 18.56,9.97 18.36,10.98 18.15,11.98 C 18.15,11.98 14.81,26 14.81,26 C 14.81,26 22.01,26 22.01,26 C 22.01,26 24.71,14.53 24.71,14.53 C 25.95,9.28 28.61,6 31.09,6 C 32.8,6 33.51,7.22 33.43,8.96 C 33.38,9.97 33.17,11.08 32.91,12.09 C 32.91,12.09 29.67,26 29.67,26 C 29.67,26 36.92,26 36.92,26 C 36.92,26 40.41,11.19 40.41,11.19 C 40.68,9.86 40.99,7.79 41.04,6.73 C 41.26,2.33 39.11,0 35.23,0 C 31.91,0 28.68,1.5 26.23,4.66 C 26.14,2.38 24.51,0 20.47,0 C 17.2,0 14.08,1.48 11.58,4.83 C 11.58,4.83 11.48,4.83 11.48,4.83 C 11.48,4.83 12.15,1 12.15,1 C 12.15,1 5.73,1 5.73,1 C 5.31,3.14 4.8,5.73 4.02,8.75 C 4.02,8.75 0,26 0,26 C 0,26 7.2,26 7.2,26 z"
+           style="fill:#bd0000;fill-opacity:1" />
+      </g>
+      <path
+         style="fill:#bd0000;fill-opacity:0;fill-rule:evenodd;stroke:#bd0000;stroke-width:8.52610779;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
+         id="path2647"
+         d="M 417.07944,250.20635 C 417.77165,251.98597 418.46389,253.76268 419.18494,255.50045 C 420.2954,257.86122 421.5789,260.12105 423.12198,262.2309 C 431.45755,273.56176 445.41744,279.76585 463.14129,281.31037 C 463.14129,281.31037 482.20635,281.31037 482.20635,281.31037 C 488.23446,280.84023 494.55102,279.96341 501.09833,278.68278 C 512.39026,276.47488 524.36,273.08298 536.79121,268.55034 C 546.20836,265.11659 555.88511,261.0541 565.70606,256.33256 C 587.09294,246.08041 609.18647,232.85747 630.86181,216.90021 C 638.00038,211.64939 644.85053,206.26158 651.42668,200.78291 C 657.45481,195.76715 663.23778,190.67349 668.76114,185.52364 C 684.17759,170.66675 695.81564,155.57767 702.40621,142.32874 C 709.27073,128.53184 710.64082,116.73516 705.01649,109.30381 C 701.56976,104.74235 695.80122,102.29792 688.37421,101.72251 C 721.83174,76.6178 741.32949,46.16418 734.33517,26.96361 C 732.11421,20.83591 727.22536,16.26441 720.21659,13.73631 C 717.10162,12.61581 713.59716,11.90621 709.77549,11.58321 C 709.77549,11.58321 699.47866,11.58321 699.47866,11.58321 C 685.10058,12.62011 664.19202,17.76851 646.45376,26.46171"
+         sodipodi:nodetypes="cccccssccccscccsccc" />
+    </g>
+  </g>
+</svg>
diff --git a/htdocs/modulebuilder/template/dev/img/gplv3-127x51.png b/htdocs/modulebuilder/template/dev/img/gplv3-127x51.png
new file mode 100644
index 0000000000000000000000000000000000000000..3e9136e626683ac152b73bc8fffcb15d1806091a
GIT binary patch
literal 3471
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

literal 0
HcmV?d00001

diff --git a/htdocs/modulebuilder/template/dev/img/gplv3-88x31.png b/htdocs/modulebuilder/template/dev/img/gplv3-88x31.png
new file mode 100644
index 0000000000000000000000000000000000000000..ba78d4c4941dabf2fcac5409a92ac4c57920c69f
GIT binary patch
literal 2666
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
Y19h*OP%`Tk_W%F@07*qoM6N<$g8#_jNdN!<

literal 0
HcmV?d00001

diff --git a/htdocs/modulebuilder/template/dev/img/mymodule.svg b/htdocs/modulebuilder/template/dev/img/mymodule.svg
new file mode 100644
index 00000000000..f51ead1a94e
--- /dev/null
+++ b/htdocs/modulebuilder/template/dev/img/mymodule.svg
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="14"
+   height="14"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="object_mymodule.svg"
+   inkscape:export-filename="/home/raph/Travail/src/zenfusion-modules/img/object_mymodule.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="3.959798"
+     inkscape:cx="24.310822"
+     inkscape:cy="18.155032"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     inkscape:window-x="1080"
+     inkscape:window-y="867"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Calque 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1038.3622)">
+    <text
+       xml:space="preserve"
+       style="font-size:12.99629784px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:DejaVu Serif;-inkscape-font-specification:DejaVu Serif"
+       x="0.35272363"
+       y="1050.0994"
+       id="text2985"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan2987"
+         x="0.35272363"
+         y="1050.0994">M</tspan></text>
+  </g>
+</svg>
diff --git a/htdocs/modulebuilder/template/dev/newmodule.sh b/htdocs/modulebuilder/template/dev/newmodule.sh
new file mode 100644
index 00000000000..92f4875cbf6
--- /dev/null
+++ b/htdocs/modulebuilder/template/dev/newmodule.sh
@@ -0,0 +1,68 @@
+#!/bin/sh
+# Copyright (C) 2014 Raphaël Doursenaud
+#
+# 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/>.
+
+VERSION=0.0.1
+USAGE="Usage: newmodule.sh NewName"
+
+# TODO: check depedencies presence (find, sed and rename)
+# TODO: allow execution from build directory
+# TODO: validate parameter
+# TODO: use multiple word parameter, for example "My module is awesome" which should lead to "MyModuleIsAwesome" and "mymoduleisawesome" so we can also fix language strings
+# TODO: add module ID management (language files…)
+# TODO: add oneliner description management
+# TODO: add copyright management
+
+if [ $# == 0 ] ; then
+    echo ${USAGE}
+    exit 1;
+fi
+
+ToLower () {
+	echo $(echo $1 | tr '[:upper:]' '[:lower:]')
+}
+ToUpper () {
+	echo $(echo $1 | tr '[:lower:]' '[:upper:]')
+}
+
+CAMELORIG="MyModule"
+LOWERORIG=$(ToLower ${CAMELORIG})
+UPPERORIG=$(ToUpper ${CAMELORIG})
+cameltarget=$(echo $1)
+lowertarget=$(ToLower $1)
+uppertarget=$(ToUpper $1)
+thisscript=`basename $0`
+
+# Rewrite occurences
+find . -not -iwholename '*.git*' -not -name "${thisscript}" -type f -print0 | xargs -0 sed -i'' -e"s/${CAMELORIG}/${cameltarget}/g"
+find . -not -iwholename '*.git*' -not -name "${thisscript}" -type f -print0 | xargs -0 sed -i'' -e"s/${LOWERORIG}/${lowertarget}/g"
+find . -not -iwholename '*.git*' -not -name "${thisscript}" -type f -print0 | xargs -0 sed -i'' -e"s/${UPPERORIG}/${uppertarget}/g"
+
+# Rename files
+for file in $(find . -not -iwholename '*.git*' -name "*${CAMELORIG}*" -type f)
+do
+	rename ${CAMELORIG} ${cameltarget} ${file}
+done
+for file in $(find . -not -iwholename '*.git*' -name "*${LOWERORIG}*" -type f)
+do
+	rename ${LOWERORIG} ${lowertarget} ${file}
+done
+for file in $(find . -not -iwholename '*.git*' -name "*${UPPERORIG}*" -type f)
+do
+	rename ${UPPERORIG} ${uppertarget} ${file}
+done
+
+# TODO: add instructions about renaming vars (ack --php -i my)
+# TODO: add instructions about renaming files (ls -R|grep -i my)
diff --git a/htdocs/modulebuilder/template/doc/user/Makefile b/htdocs/modulebuilder/template/doc/user/Makefile
new file mode 100644
index 00000000000..5c33e8bf0a3
--- /dev/null
+++ b/htdocs/modulebuilder/template/doc/user/Makefile
@@ -0,0 +1,225 @@
+# Makefile for Sphinx documentation
+#
+
+# You can set these variables from the command line.
+SPHINXOPTS    =
+SPHINXBUILD   = sphinx-build
+PAPER         =
+BUILDDIR      = build
+
+# Internal variables.
+PAPEROPT_a4     = -D latex_paper_size=a4
+PAPEROPT_letter = -D latex_paper_size=letter
+ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source
+# the i18n builder cannot share the environment and doctrees with the others
+I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source
+
+.PHONY: help
+help:
+	@echo "Please use \`make <target>' where <target> is one of"
+	@echo "  html       to make standalone HTML files"
+	@echo "  dirhtml    to make HTML files named index.html in directories"
+	@echo "  singlehtml to make a single large HTML file"
+	@echo "  pickle     to make pickle files"
+	@echo "  json       to make JSON files"
+	@echo "  htmlhelp   to make HTML files and a HTML help project"
+	@echo "  qthelp     to make HTML files and a qthelp project"
+	@echo "  applehelp  to make an Apple Help Book"
+	@echo "  devhelp    to make HTML files and a Devhelp project"
+	@echo "  epub       to make an epub"
+	@echo "  epub3      to make an epub3"
+	@echo "  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
+	@echo "  latexpdf   to make LaTeX files and run them through pdflatex"
+	@echo "  latexpdfja to make LaTeX files and run them through platex/dvipdfmx"
+	@echo "  text       to make text files"
+	@echo "  man        to make manual pages"
+	@echo "  texinfo    to make Texinfo files"
+	@echo "  info       to make Texinfo files and run them through makeinfo"
+	@echo "  gettext    to make PO message catalogs"
+	@echo "  changes    to make an overview of all changed/added/deprecated items"
+	@echo "  xml        to make Docutils-native XML files"
+	@echo "  pseudoxml  to make pseudoxml-XML files for display purposes"
+	@echo "  linkcheck  to check all external links for integrity"
+	@echo "  doctest    to run all doctests embedded in the documentation (if enabled)"
+	@echo "  coverage   to run coverage check of the documentation (if enabled)"
+	@echo "  dummy      to check syntax errors of document sources"
+
+.PHONY: clean
+clean:
+	rm -rf $(BUILDDIR)/*
+
+.PHONY: html
+html:
+	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
+	@echo
+	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
+
+.PHONY: dirhtml
+dirhtml:
+	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
+	@echo
+	@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
+
+.PHONY: singlehtml
+singlehtml:
+	$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
+	@echo
+	@echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
+
+.PHONY: pickle
+pickle:
+	$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
+	@echo
+	@echo "Build finished; now you can process the pickle files."
+
+.PHONY: json
+json:
+	$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
+	@echo
+	@echo "Build finished; now you can process the JSON files."
+
+.PHONY: htmlhelp
+htmlhelp:
+	$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
+	@echo
+	@echo "Build finished; now you can run HTML Help Workshop with the" \
+	      ".hhp project file in $(BUILDDIR)/htmlhelp."
+
+.PHONY: qthelp
+qthelp:
+	$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
+	@echo
+	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
+	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
+	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/Mymodule.qhcp"
+	@echo "To view the help file:"
+	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/Mymodule.qhc"
+
+.PHONY: applehelp
+applehelp:
+	$(SPHINXBUILD) -b applehelp $(ALLSPHINXOPTS) $(BUILDDIR)/applehelp
+	@echo
+	@echo "Build finished. The help book is in $(BUILDDIR)/applehelp."
+	@echo "N.B. You won't be able to view it unless you put it in" \
+	      "~/Library/Documentation/Help or install it in your application" \
+	      "bundle."
+
+.PHONY: devhelp
+devhelp:
+	$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
+	@echo
+	@echo "Build finished."
+	@echo "To view the help file:"
+	@echo "# mkdir -p $$HOME/.local/share/devhelp/Mymodule"
+	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/Mymodule"
+	@echo "# devhelp"
+
+.PHONY: epub
+epub:
+	$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
+	@echo
+	@echo "Build finished. The epub file is in $(BUILDDIR)/epub."
+
+.PHONY: epub3
+epub3:
+	$(SPHINXBUILD) -b epub3 $(ALLSPHINXOPTS) $(BUILDDIR)/epub3
+	@echo
+	@echo "Build finished. The epub3 file is in $(BUILDDIR)/epub3."
+
+.PHONY: latex
+latex:
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	@echo
+	@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
+	@echo "Run \`make' in that directory to run these through (pdf)latex" \
+	      "(use \`make latexpdf' here to do that automatically)."
+
+.PHONY: latexpdf
+latexpdf:
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	@echo "Running LaTeX files through pdflatex..."
+	$(MAKE) -C $(BUILDDIR)/latex all-pdf
+	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
+
+.PHONY: latexpdfja
+latexpdfja:
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	@echo "Running LaTeX files through platex and dvipdfmx..."
+	$(MAKE) -C $(BUILDDIR)/latex all-pdf-ja
+	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
+
+.PHONY: text
+text:
+	$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
+	@echo
+	@echo "Build finished. The text files are in $(BUILDDIR)/text."
+
+.PHONY: man
+man:
+	$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
+	@echo
+	@echo "Build finished. The manual pages are in $(BUILDDIR)/man."
+
+.PHONY: texinfo
+texinfo:
+	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
+	@echo
+	@echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo."
+	@echo "Run \`make' in that directory to run these through makeinfo" \
+	      "(use \`make info' here to do that automatically)."
+
+.PHONY: info
+info:
+	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
+	@echo "Running Texinfo files through makeinfo..."
+	make -C $(BUILDDIR)/texinfo info
+	@echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo."
+
+.PHONY: gettext
+gettext:
+	$(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale
+	@echo
+	@echo "Build finished. The message catalogs are in $(BUILDDIR)/locale."
+
+.PHONY: changes
+changes:
+	$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
+	@echo
+	@echo "The overview file is in $(BUILDDIR)/changes."
+
+.PHONY: linkcheck
+linkcheck:
+	$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
+	@echo
+	@echo "Link check complete; look for any errors in the above output " \
+	      "or in $(BUILDDIR)/linkcheck/output.txt."
+
+.PHONY: doctest
+doctest:
+	$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
+	@echo "Testing of doctests in the sources finished, look at the " \
+	      "results in $(BUILDDIR)/doctest/output.txt."
+
+.PHONY: coverage
+coverage:
+	$(SPHINXBUILD) -b coverage $(ALLSPHINXOPTS) $(BUILDDIR)/coverage
+	@echo "Testing of coverage in the sources finished, look at the " \
+	      "results in $(BUILDDIR)/coverage/python.txt."
+
+.PHONY: xml
+xml:
+	$(SPHINXBUILD) -b xml $(ALLSPHINXOPTS) $(BUILDDIR)/xml
+	@echo
+	@echo "Build finished. The XML files are in $(BUILDDIR)/xml."
+
+.PHONY: pseudoxml
+pseudoxml:
+	$(SPHINXBUILD) -b pseudoxml $(ALLSPHINXOPTS) $(BUILDDIR)/pseudoxml
+	@echo
+	@echo "Build finished. The pseudo-XML files are in $(BUILDDIR)/pseudoxml."
+
+.PHONY: dummy
+dummy:
+	$(SPHINXBUILD) -b dummy $(ALLSPHINXOPTS) $(BUILDDIR)/dummy
+	@echo
+	@echo "Build finished. Dummy builder generates no files."
diff --git a/htdocs/modulebuilder/template/doc/user/make.bat b/htdocs/modulebuilder/template/doc/user/make.bat
new file mode 100644
index 00000000000..35018adf3ba
--- /dev/null
+++ b/htdocs/modulebuilder/template/doc/user/make.bat
@@ -0,0 +1,281 @@
+@ECHO OFF
+
+REM Command file for Sphinx documentation
+
+if "%SPHINXBUILD%" == "" (
+	set SPHINXBUILD=sphinx-build
+)
+set BUILDDIR=build
+set ALLSPHINXOPTS=-d %BUILDDIR%/doctrees %SPHINXOPTS% source
+set I18NSPHINXOPTS=%SPHINXOPTS% source
+if NOT "%PAPER%" == "" (
+	set ALLSPHINXOPTS=-D latex_paper_size=%PAPER% %ALLSPHINXOPTS%
+	set I18NSPHINXOPTS=-D latex_paper_size=%PAPER% %I18NSPHINXOPTS%
+)
+
+if "%1" == "" goto help
+
+if "%1" == "help" (
+	:help
+	echo.Please use `make ^<target^>` where ^<target^> is one of
+	echo.  html       to make standalone HTML files
+	echo.  dirhtml    to make HTML files named index.html in directories
+	echo.  singlehtml to make a single large HTML file
+	echo.  pickle     to make pickle files
+	echo.  json       to make JSON files
+	echo.  htmlhelp   to make HTML files and a HTML help project
+	echo.  qthelp     to make HTML files and a qthelp project
+	echo.  devhelp    to make HTML files and a Devhelp project
+	echo.  epub       to make an epub
+	echo.  epub3      to make an epub3
+	echo.  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter
+	echo.  text       to make text files
+	echo.  man        to make manual pages
+	echo.  texinfo    to make Texinfo files
+	echo.  gettext    to make PO message catalogs
+	echo.  changes    to make an overview over all changed/added/deprecated items
+	echo.  xml        to make Docutils-native XML files
+	echo.  pseudoxml  to make pseudoxml-XML files for display purposes
+	echo.  linkcheck  to check all external links for integrity
+	echo.  doctest    to run all doctests embedded in the documentation if enabled
+	echo.  coverage   to run coverage check of the documentation if enabled
+	echo.  dummy      to check syntax errors of document sources
+	goto end
+)
+
+if "%1" == "clean" (
+	for /d %%i in (%BUILDDIR%\*) do rmdir /q /s %%i
+	del /q /s %BUILDDIR%\*
+	goto end
+)
+
+
+REM Check if sphinx-build is available and fallback to Python version if any
+%SPHINXBUILD% 1>NUL 2>NUL
+if errorlevel 9009 goto sphinx_python
+goto sphinx_ok
+
+:sphinx_python
+
+set SPHINXBUILD=python -m sphinx.__init__
+%SPHINXBUILD% 2> nul
+if errorlevel 9009 (
+	echo.
+	echo.The 'sphinx-build' command was not found. Make sure you have Sphinx
+	echo.installed, then set the SPHINXBUILD environment variable to point
+	echo.to the full path of the 'sphinx-build' executable. Alternatively you
+	echo.may add the Sphinx directory to PATH.
+	echo.
+	echo.If you don't have Sphinx installed, grab it from
+	echo.http://sphinx-doc.org/
+	exit /b 1
+)
+
+:sphinx_ok
+
+
+if "%1" == "html" (
+	%SPHINXBUILD% -b html %ALLSPHINXOPTS% %BUILDDIR%/html
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The HTML pages are in %BUILDDIR%/html.
+	goto end
+)
+
+if "%1" == "dirhtml" (
+	%SPHINXBUILD% -b dirhtml %ALLSPHINXOPTS% %BUILDDIR%/dirhtml
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The HTML pages are in %BUILDDIR%/dirhtml.
+	goto end
+)
+
+if "%1" == "singlehtml" (
+	%SPHINXBUILD% -b singlehtml %ALLSPHINXOPTS% %BUILDDIR%/singlehtml
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The HTML pages are in %BUILDDIR%/singlehtml.
+	goto end
+)
+
+if "%1" == "pickle" (
+	%SPHINXBUILD% -b pickle %ALLSPHINXOPTS% %BUILDDIR%/pickle
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished; now you can process the pickle files.
+	goto end
+)
+
+if "%1" == "json" (
+	%SPHINXBUILD% -b json %ALLSPHINXOPTS% %BUILDDIR%/json
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished; now you can process the JSON files.
+	goto end
+)
+
+if "%1" == "htmlhelp" (
+	%SPHINXBUILD% -b htmlhelp %ALLSPHINXOPTS% %BUILDDIR%/htmlhelp
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished; now you can run HTML Help Workshop with the ^
+.hhp project file in %BUILDDIR%/htmlhelp.
+	goto end
+)
+
+if "%1" == "qthelp" (
+	%SPHINXBUILD% -b qthelp %ALLSPHINXOPTS% %BUILDDIR%/qthelp
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished; now you can run "qcollectiongenerator" with the ^
+.qhcp project file in %BUILDDIR%/qthelp, like this:
+	echo.^> qcollectiongenerator %BUILDDIR%\qthelp\Mymodule.qhcp
+	echo.To view the help file:
+	echo.^> assistant -collectionFile %BUILDDIR%\qthelp\Mymodule.ghc
+	goto end
+)
+
+if "%1" == "devhelp" (
+	%SPHINXBUILD% -b devhelp %ALLSPHINXOPTS% %BUILDDIR%/devhelp
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished.
+	goto end
+)
+
+if "%1" == "epub" (
+	%SPHINXBUILD% -b epub %ALLSPHINXOPTS% %BUILDDIR%/epub
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The epub file is in %BUILDDIR%/epub.
+	goto end
+)
+
+if "%1" == "epub3" (
+	%SPHINXBUILD% -b epub3 %ALLSPHINXOPTS% %BUILDDIR%/epub3
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The epub3 file is in %BUILDDIR%/epub3.
+	goto end
+)
+
+if "%1" == "latex" (
+	%SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished; the LaTeX files are in %BUILDDIR%/latex.
+	goto end
+)
+
+if "%1" == "latexpdf" (
+	%SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex
+	cd %BUILDDIR%/latex
+	make all-pdf
+	cd %~dp0
+	echo.
+	echo.Build finished; the PDF files are in %BUILDDIR%/latex.
+	goto end
+)
+
+if "%1" == "latexpdfja" (
+	%SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex
+	cd %BUILDDIR%/latex
+	make all-pdf-ja
+	cd %~dp0
+	echo.
+	echo.Build finished; the PDF files are in %BUILDDIR%/latex.
+	goto end
+)
+
+if "%1" == "text" (
+	%SPHINXBUILD% -b text %ALLSPHINXOPTS% %BUILDDIR%/text
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The text files are in %BUILDDIR%/text.
+	goto end
+)
+
+if "%1" == "man" (
+	%SPHINXBUILD% -b man %ALLSPHINXOPTS% %BUILDDIR%/man
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The manual pages are in %BUILDDIR%/man.
+	goto end
+)
+
+if "%1" == "texinfo" (
+	%SPHINXBUILD% -b texinfo %ALLSPHINXOPTS% %BUILDDIR%/texinfo
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The Texinfo files are in %BUILDDIR%/texinfo.
+	goto end
+)
+
+if "%1" == "gettext" (
+	%SPHINXBUILD% -b gettext %I18NSPHINXOPTS% %BUILDDIR%/locale
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The message catalogs are in %BUILDDIR%/locale.
+	goto end
+)
+
+if "%1" == "changes" (
+	%SPHINXBUILD% -b changes %ALLSPHINXOPTS% %BUILDDIR%/changes
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.The overview file is in %BUILDDIR%/changes.
+	goto end
+)
+
+if "%1" == "linkcheck" (
+	%SPHINXBUILD% -b linkcheck %ALLSPHINXOPTS% %BUILDDIR%/linkcheck
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Link check complete; look for any errors in the above output ^
+or in %BUILDDIR%/linkcheck/output.txt.
+	goto end
+)
+
+if "%1" == "doctest" (
+	%SPHINXBUILD% -b doctest %ALLSPHINXOPTS% %BUILDDIR%/doctest
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Testing of doctests in the sources finished, look at the ^
+results in %BUILDDIR%/doctest/output.txt.
+	goto end
+)
+
+if "%1" == "coverage" (
+	%SPHINXBUILD% -b coverage %ALLSPHINXOPTS% %BUILDDIR%/coverage
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Testing of coverage in the sources finished, look at the ^
+results in %BUILDDIR%/coverage/python.txt.
+	goto end
+)
+
+if "%1" == "xml" (
+	%SPHINXBUILD% -b xml %ALLSPHINXOPTS% %BUILDDIR%/xml
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The XML files are in %BUILDDIR%/xml.
+	goto end
+)
+
+if "%1" == "pseudoxml" (
+	%SPHINXBUILD% -b pseudoxml %ALLSPHINXOPTS% %BUILDDIR%/pseudoxml
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The pseudo-XML files are in %BUILDDIR%/pseudoxml.
+	goto end
+)
+
+if "%1" == "dummy" (
+	%SPHINXBUILD% -b dummy %ALLSPHINXOPTS% %BUILDDIR%/dummy
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. Dummy builder generates no files.
+	goto end
+)
+
+:end
diff --git a/htdocs/modulebuilder/template/doc/user/source/conf.py b/htdocs/modulebuilder/template/doc/user/source/conf.py
new file mode 100644
index 00000000000..130bd5a12e5
--- /dev/null
+++ b/htdocs/modulebuilder/template/doc/user/source/conf.py
@@ -0,0 +1,428 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+#
+# My Module documentation build configuration file, created by
+# sphinx-quickstart on Mon Sep 26 17:54:17 2016.
+#
+# This file is execfile()d with the current directory set to its
+# containing dir.
+#
+# Note that not all possible configuration values are present in this
+# autogenerated file.
+#
+# All configuration values have a default; values that are commented out
+# serve to show the default.
+
+# If extensions (or modules to document with autodoc) are in another directory,
+# add these directories to sys.path here. If the directory is relative to the
+# documentation root, use os.path.abspath to make it absolute, like shown here.
+#
+# import os
+# import sys
+# sys.path.insert(0, os.path.abspath('.'))
+
+# -- General configuration ------------------------------------------------
+
+# If your documentation needs a minimal Sphinx version, state it here.
+#
+# needs_sphinx = '1.0'
+
+# Add any Sphinx extension module names here, as strings. They can be
+# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
+# ones.
+extensions = [
+    'sphinx.ext.todo',
+    'sphinx.ext.imgmath',
+    'sphinx.ext.githubpages',
+]
+
+# Add any paths that contain templates here, relative to this directory.
+templates_path = ['_templates']
+
+# The suffix(es) of source filenames.
+# You can specify multiple suffix as a list of string:
+#
+# source_suffix = ['.rst', '.md']
+source_suffix = '.rst'
+
+# The encoding of source files.
+#
+# source_encoding = 'utf-8-sig'
+
+# The master toctree document.
+master_doc = 'index'
+
+# General information about the project.
+project = 'My Module'
+copyright = '2016, Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr>'
+author = 'Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr>'
+
+# The version info for the project you're documenting, acts as replacement for
+# |version| and |release|, also used in various other places throughout the
+# built documents.
+#
+# The short X.Y version.
+version = 'development'
+# The full version, including alpha/beta/rc tags.
+release = 'development'
+
+# The language for content autogenerated by Sphinx. Refer to documentation
+# for a list of supported languages.
+#
+# This is also used if you do content translation via gettext catalogs.
+# Usually you set "language" from the command line for these cases.
+language = None
+
+# There are two options for replacing |today|: either, you set today to some
+# non-false value, then it is used:
+#
+# today = ''
+#
+# Else, today_fmt is used as the format for a strftime call.
+#
+# today_fmt = '%B %d, %Y'
+
+# List of patterns, relative to source directory, that match files and
+# directories to ignore when looking for source files.
+# This patterns also effect to html_static_path and html_extra_path
+exclude_patterns = []
+
+# The reST default role (used for this markup: `text`) to use for all
+# documents.
+#
+# default_role = None
+
+# If true, '()' will be appended to :func: etc. cross-reference text.
+#
+# add_function_parentheses = True
+
+# If true, the current module name will be prepended to all description
+# unit titles (such as .. function::).
+#
+# add_module_names = True
+
+# If true, sectionauthor and moduleauthor directives will be shown in the
+# output. They are ignored by default.
+#
+# show_authors = False
+
+# The name of the Pygments (syntax highlighting) style to use.
+pygments_style = 'sphinx'
+
+# A list of ignored prefixes for module index sorting.
+# modindex_common_prefix = []
+
+# If true, keep warnings as "system message" paragraphs in the built documents.
+# keep_warnings = False
+
+# If true, `todo` and `todoList` produce output, else they produce nothing.
+todo_include_todos = True
+
+
+# -- Options for HTML output ----------------------------------------------
+
+# The theme to use for HTML and HTML Help pages.  See the documentation for
+# a list of builtin themes.
+#
+html_theme = 'alabaster'
+
+# Theme options are theme-specific and customize the look and feel of a theme
+# further.  For a list of options available for each theme, see the
+# documentation.
+#
+# html_theme_options = {}
+
+# Add any paths that contain custom themes here, relative to this directory.
+# html_theme_path = []
+
+# The name for this set of Sphinx documents.
+# "<project> v<release> documentation" by default.
+#
+# html_title = 'My Module vdevelopment'
+
+# A shorter title for the navigation bar.  Default is the same as html_title.
+#
+# html_short_title = None
+
+# The name of an image file (relative to this directory) to place at the top
+# of the sidebar.
+#
+# html_logo = None
+
+# The name of an image file (relative to this directory) to use as a favicon of
+# the docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
+# pixels large.
+#
+# html_favicon = None
+
+# Add any paths that contain custom static files (such as style sheets) here,
+# relative to this directory. They are copied after the builtin static files,
+# so a file named "default.css" will overwrite the builtin "default.css".
+html_static_path = ['_static']
+
+# Add any extra paths that contain custom files (such as robots.txt or
+# .htaccess) here, relative to this directory. These files are copied
+# directly to the root of the documentation.
+#
+# html_extra_path = []
+
+# If not None, a 'Last updated on:' timestamp is inserted at every page
+# bottom, using the given strftime format.
+# The empty string is equivalent to '%b %d, %Y'.
+#
+# html_last_updated_fmt = None
+
+# If true, SmartyPants will be used to convert quotes and dashes to
+# typographically correct entities.
+#
+# html_use_smartypants = True
+
+# Custom sidebar templates, maps document names to template names.
+#
+# html_sidebars = {}
+
+# Additional templates that should be rendered to pages, maps page names to
+# template names.
+#
+# html_additional_pages = {}
+
+# If false, no module index is generated.
+#
+# html_domain_indices = True
+
+# If false, no index is generated.
+#
+# html_use_index = True
+
+# If true, the index is split into individual pages for each letter.
+#
+# html_split_index = False
+
+# If true, links to the reST sources are added to the pages.
+#
+# html_show_sourcelink = True
+
+# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
+#
+# html_show_sphinx = True
+
+# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
+#
+# html_show_copyright = True
+
+# If true, an OpenSearch description file will be output, and all pages will
+# contain a <link> tag referring to it.  The value of this option must be the
+# base URL from which the finished HTML is served.
+#
+# html_use_opensearch = ''
+
+# This is the file name suffix for HTML files (e.g. ".xhtml").
+# html_file_suffix = None
+
+# Language to be used for generating the HTML full-text search index.
+# Sphinx supports the following languages:
+#   'da', 'de', 'en', 'es', 'fi', 'fr', 'h', 'it', 'ja'
+#   'nl', 'no', 'pt', 'ro', 'r', 'sv', 'tr', 'zh'
+#
+# html_search_language = 'en'
+
+# A dictionary with options for the search language support, empty by default.
+# 'ja' uses this config value.
+# 'zh' user can custom change `jieba` dictionary path.
+#
+# html_search_options = {'type': 'default'}
+
+# The name of a javascript file (relative to the configuration directory) that
+# implements a search results scorer. If empty, the default will be used.
+#
+# html_search_scorer = 'scorer.js'
+
+# Output file base name for HTML help builder.
+htmlhelp_basename = 'Mymoduledoc'
+
+# -- Options for LaTeX output ---------------------------------------------
+
+latex_elements = {
+     # The paper size ('letterpaper' or 'a4paper').
+     #
+     # 'papersize': 'letterpaper',
+
+     # The font size ('10pt', '11pt' or '12pt').
+     #
+     # 'pointsize': '10pt',
+
+     # Additional stuff for the LaTeX preamble.
+     #
+     # 'preamble': '',
+
+     # Latex figure (float) alignment
+     #
+     # 'figure_align': 'htbp',
+}
+
+# Grouping the document tree into LaTeX files. List of tuples
+# (source start file, target name, title,
+#  author, documentclass [howto, manual, or own class]).
+latex_documents = [
+    (master_doc, 'Mymodule.tex', 'My Module Documentation',
+     'Raphaël Doursenaud \\textless{}rdoursenaud@gpcsolutions.fr\\textgreater{}', 'manual'),
+]
+
+# The name of an image file (relative to this directory) to place at the top of
+# the title page.
+#
+# latex_logo = None
+
+# For "manual" documents, if this is true, then toplevel headings are parts,
+# not chapters.
+#
+# latex_use_parts = False
+
+# If true, show page references after internal links.
+#
+# latex_show_pagerefs = False
+
+# If true, show URL addresses after external links.
+#
+# latex_show_urls = False
+
+# Documents to append as an appendix to all manuals.
+#
+# latex_appendices = []
+
+# It false, will not define \strong, \code, 	itleref, \crossref ... but only
+# \sphinxstrong, ..., \sphinxtitleref, ... To help avoid clash with user added
+# packages.
+#
+# latex_keep_old_macro_names = True
+
+# If false, no module index is generated.
+#
+# latex_domain_indices = True
+
+
+# -- Options for manual page output ---------------------------------------
+
+# One entry per manual page. List of tuples
+# (source start file, name, description, authors, manual section).
+man_pages = [
+    (master_doc, 'mymodule', 'My Module Documentation',
+     [author], 1)
+]
+
+# If true, show URL addresses after external links.
+#
+# man_show_urls = False
+
+
+# -- Options for Texinfo output -------------------------------------------
+
+# Grouping the document tree into Texinfo files. List of tuples
+# (source start file, target name, title, author,
+#  dir menu entry, description, category)
+texinfo_documents = [
+    (master_doc, 'Mymodule', 'My Module Documentation',
+     author, 'Mymodule', 'One line description of project.',
+     'Miscellaneous'),
+]
+
+# Documents to append as an appendix to all manuals.
+#
+# texinfo_appendices = []
+
+# If false, no module index is generated.
+#
+# texinfo_domain_indices = True
+
+# How to display URL addresses: 'footnote', 'no', or 'inline'.
+#
+# texinfo_show_urls = 'footnote'
+
+# If true, do not generate a @detailmenu in the "Top" node's menu.
+#
+# texinfo_no_detailmenu = False
+
+
+# -- Options for Epub output ----------------------------------------------
+
+# Bibliographic Dublin Core info.
+epub_title = project
+epub_author = author
+epub_publisher = author
+epub_copyright = copyright
+
+# The basename for the epub file. It defaults to the project name.
+# epub_basename = project
+
+# The HTML theme for the epub output. Since the default themes are not
+# optimized for small screen space, using the same theme for HTML and epub
+# output is usually not wise. This defaults to 'epub', a theme designed to save
+# visual space.
+#
+# epub_theme = 'epub'
+
+# The language of the text. It defaults to the language option
+# or 'en' if the language is not set.
+#
+# epub_language = ''
+
+# The scheme of the identifier. Typical schemes are ISBN or URL.
+# epub_scheme = ''
+
+# The unique identifier of the text. This can be a ISBN number
+# or the project homepage.
+#
+# epub_identifier = ''
+
+# A unique identification for the text.
+#
+# epub_uid = ''
+
+# A tuple containing the cover image and cover page html template filenames.
+#
+# epub_cover = ()
+
+# A sequence of (type, uri, title) tuples for the guide element of content.opf.
+#
+# epub_guide = ()
+
+# HTML files that should be inserted before the pages created by sphinx.
+# The format is a list of tuples containing the path and title.
+#
+# epub_pre_files = []
+
+# HTML files that should be inserted after the pages created by sphinx.
+# The format is a list of tuples containing the path and title.
+#
+# epub_post_files = []
+
+# A list of files that should not be packed into the epub file.
+epub_exclude_files = ['search.html']
+
+# The depth of the table of contents in toc.ncx.
+#
+# epub_tocdepth = 3
+
+# Allow duplicate toc entries.
+#
+# epub_tocdup = True
+
+# Choose between 'default' and 'includehidden'.
+#
+# epub_tocscope = 'default'
+
+# Fix unsupported image types using the Pillow.
+#
+# epub_fix_images = False
+
+# Scale large images.
+#
+# epub_max_image_width = 0
+
+# How to display URL addresses: 'footnote', 'no', or 'inline'.
+#
+# epub_show_urls = 'inline'
+
+# If false, no index is generated.
+#
+# epub_use_index = True
diff --git a/htdocs/modulebuilder/template/doc/user/source/index.rst b/htdocs/modulebuilder/template/doc/user/source/index.rst
new file mode 100644
index 00000000000..48f2a6e49d8
--- /dev/null
+++ b/htdocs/modulebuilder/template/doc/user/source/index.rst
@@ -0,0 +1,22 @@
+.. My Module documentation master file, created by
+   sphinx-quickstart on Mon Sep 26 17:54:17 2016.
+   You can adapt this file completely to your liking, but it should at least
+   contain the root `toctree` directive.
+
+Welcome to My Module's documentation!
+=====================================
+
+Contents:
+
+.. toctree::
+   :maxdepth: 2
+
+
+
+Indices and tables
+==================
+
+* :ref:`genindex`
+* :ref:`modindex`
+* :ref:`search`
+
diff --git a/htdocs/modulebuilder/template/img/gfdl.png b/htdocs/modulebuilder/template/img/gfdl.png
new file mode 100644
index 0000000000000000000000000000000000000000..f2bacfd179a99f051654eaa6ba30089dd8691d7a
GIT binary patch
literal 4709
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

literal 0
HcmV?d00001

diff --git a/htdocs/modulebuilder/template/img/gplv3.png b/htdocs/modulebuilder/template/img/gplv3.png
new file mode 100644
index 0000000000000000000000000000000000000000..ba78d4c4941dabf2fcac5409a92ac4c57920c69f
GIT binary patch
literal 2666
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
Y19h*OP%`Tk_W%F@07*qoM6N<$g8#_jNdN!<

literal 0
HcmV?d00001

diff --git a/htdocs/modulebuilder/template/img/mymodule.png b/htdocs/modulebuilder/template/img/mymodule.png
new file mode 100644
index 0000000000000000000000000000000000000000..2681ccc1d3a7d33593e8502daa447b8c816ddb08
GIT binary patch
literal 683
zcmV;c0#yBpP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004b3#c}2nYxW
zd<bNS00009a7bBm001AO001AO0d^~rqyPW_8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10w_sDK~z|U?U&0-RZ$eif6Gj16oCkZ5<+1}P!UCPF?v7<(OB?*
zXxeiS)Wn8G2q6(fuR#z|P(nEnL85_^ia>&bpol<(u!rW?;H+EQ%enXNbFO(BxM6em
zT6?Xvzwg`ooU^Y<qR7@%=<2Hg{s#cf<$;-<26m*xypnVwPjNFV0moCOrX*biKob5W
z+yy>){|U(ZFQBI!m!$&}L7j!5{;fYTRT7^Ei2`otSo}~$jn`>$_0GV8{|=a0ceV}S
zT##S2)dC>kW)OEac4ad=0PF{D)D5n&1&hE|5*Fn>+!87O7%&6uq>(L<G);0i0oKH*
zU}k;5LEthl+mHf2-bV5y2$%=D>ac(63vU3r8dAUkz5(vJ*$kYi!M+3>2Chh&smne_
z0k^l4oC%S<BQ{sb8wI`sZEiQNfP;Jq+;?*=a4LoUKHvy2Ea^)W`&b3sw<}=t1L&xj
ze+<k4?SXH36mXzZz(Y4%LKVzxFVGKMmGn89eHI1Wzb9by9oXdlN5D5=V@3S(Dd1pV
z08iX(1x}dRZr~_zP146q?6WH1bG-qpIbfWWGx1LpaKMwmGdI@(eZX}|A2PEi|BdK;
zFrEj7a@P5KBg)bwjhopWpa&S0^ln7~IEcZ#xv2om>=;mTvomp7S=zUfMq-Pa*-4U*
z(fYvM9@LwZ^Z;0LC%nYcD^%FWV(tM!t@kx*iR5*SB+L^EYlZ(WSOrixfZrRuvN}?F
RO?LnQ002ovPDHLkV1iP-B{u*7

literal 0
HcmV?d00001

diff --git a/htdocs/modulebuilder/template/img/object_mymodule.png b/htdocs/modulebuilder/template/img/object_mymodule.png
new file mode 100644
index 0000000000000000000000000000000000000000..5a307bfc62f85df909a3cf024f27ee87d44be275
GIT binary patch
literal 360
zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh1|;P@bT0xamSQK*5Dp-y;YjHK@;M7UB8!3Q
zuY)k7lg8`{prB-lYeY$Kep*R+Vo@qXd3m{BW?pu2a$-TMUVc&f>~}U&Kt)eIT^vI+
zChono-m4{0gyqBiz=Ju)w^;&N<{#X1a0!1><Y%Q{d~D5Uw;i2s5YZwkcu^%vjOU;9
z;kxeEpK=W=9!xuY=FUv(?UR0-KJ&M;m376cVx6Rpy(;rBA6R8|OzYm{5|xWL-acNe
zILqe75o^6;yQR|Ctg@T8v309Tyzut9rW>bC%GsW3bBL=<%|p84;9-@5SwA|2OIEL%
zb=QtBT0T9C&(LA{syqXqqW_DHn`b;(x5}@uA-g2{Ncy)Mhpp~Sy0eY()*3IP6|4C4
z(mDEHWvtPCEP7WZe7{4e?P9&>AE%^j|Mz!&9rL?{G_w^d>;^y&GkCiCxvX<aXaWE|
CJd*hU

literal 0
HcmV?d00001

diff --git a/htdocs/modulebuilder/template/js/myjs.js.php b/htdocs/modulebuilder/template/js/myjs.js.php
new file mode 100644
index 00000000000..b2649676f14
--- /dev/null
+++ b/htdocs/modulebuilder/template/js/myjs.js.php
@@ -0,0 +1,27 @@
+<?php
+/* <one line to give the program's name and a brief idea of what it does.>
+ * Copyright (C) <year>  <name of author>
+ *
+ * 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    js/myjs.js.php
+ * \ingroup mymodule
+ * \brief   Example JavaScript.
+ *
+ * Put detailed description here.
+ */
+
+header('Content-Type: application/javascript');
diff --git a/htdocs/modulebuilder/template/langs/en_US/mymodule.lang b/htdocs/modulebuilder/template/langs/en_US/mymodule.lang
new file mode 100644
index 00000000000..53c6205386c
--- /dev/null
+++ b/htdocs/modulebuilder/template/langs/en_US/mymodule.lang
@@ -0,0 +1,51 @@
+# <one line to give the program's name and a brief idea of what it does.>
+# Copyright (C) <year>  <name of author>
+#
+# 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/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleXXXName'
+# (where XXX is value of numeric property 'numero' of module)
+Module500000Name = My module
+# Module description 'ModuleXXXDesc'
+# (where XXX is value of numeric property 'numero' of module)
+Module500000Desc = My module description
+
+#
+# Admin page
+#
+MyModuleSetup = My module setup
+Settings = Settings
+MyModuleSetupPage = My module setup page
+
+#
+# About page
+#
+About = About
+MyModuleAbout = About my module
+MyModuleAboutPage = My module about page
+
+#
+# Sample page
+#
+MyPageName = My page name
+
+#
+# Sample box
+#
+MyBox = My box
+MyBoxDescription = My box description
\ No newline at end of file
diff --git a/htdocs/modulebuilder/template/langs/fr_FR/mymodule.lang b/htdocs/modulebuilder/template/langs/fr_FR/mymodule.lang
new file mode 100644
index 00000000000..d15d37f0ebf
--- /dev/null
+++ b/htdocs/modulebuilder/template/langs/fr_FR/mymodule.lang
@@ -0,0 +1,51 @@
+# <one line to give the program's name and a brief idea of what it does.>
+# Copyright (C) <year>  <name of author>
+#
+# 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/>.
+
+#
+# Générique
+#
+
+# Module label 'ModuleXXXName'
+# (where XXX is value of numeric property 'numero' of module)
+Module500000Name = Mon module
+# Module description 'ModuleXXXDesc'
+# (where XXX is value of numeric property 'numero' of module)
+Module500000Desc = Description de mon module
+
+#
+# Page d'administration
+#
+MyModuleSetup = Configuration du module mon module
+Settings = Réglages
+MyModuleSetupPage = Page de réglage de mon module
+
+#
+# Page À propos
+#
+About = À propos
+MyModuleAbout = À propos de mon module
+MyModuleAboutPage = Page à propos de mon module
+
+#
+# Page d'exemple
+#
+MyPageName = Nom de ma page
+
+#
+# Box d'exemple
+#
+MyBox = Ma boîte
+MyBoxDescription = Description de ma boîte
\ No newline at end of file
diff --git a/htdocs/modulebuilder/template/lib/mymodule.lib.php b/htdocs/modulebuilder/template/lib/mymodule.lib.php
new file mode 100644
index 00000000000..ac4e0bf4a66
--- /dev/null
+++ b/htdocs/modulebuilder/template/lib/mymodule.lib.php
@@ -0,0 +1,61 @@
+<?php
+/* <one line to give the program's name and a brief idea of what it does.>
+ * Copyright (C) <year>  <name of author>
+ *
+ * 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    lib/mymodule.lib.php
+ * \ingroup mymodule
+ * \brief   Example module library.
+ *
+ * Put detailed description here.
+ */
+
+/**
+ * Prepare admin pages header
+ *
+ * @return array
+ */
+function mymoduleAdminPrepareHead()
+{
+	global $langs, $conf;
+
+	$langs->load("mymodule@mymodule");
+
+	$h = 0;
+	$head = array();
+
+	$head[$h][0] = dol_buildpath("/mymodule/admin/setup.php", 1);
+	$head[$h][1] = $langs->trans("Settings");
+	$head[$h][2] = 'settings';
+	$h++;
+	$head[$h][0] = dol_buildpath("/mymodule/admin/about.php", 1);
+	$head[$h][1] = $langs->trans("About");
+	$head[$h][2] = 'about';
+	$h++;
+
+	// Show more tabs from modules
+	// Entries must be declared in modules descriptor with line
+	//$this->tabs = array(
+	//	'entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'
+	//); // to add new tab
+	//$this->tabs = array(
+	//	'entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'
+	//); // to remove a tab
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'mymodule');
+
+	return $head;
+}
diff --git a/htdocs/modulebuilder/template/mypage.php b/htdocs/modulebuilder/template/mypage.php
new file mode 100644
index 00000000000..368fd86c0a4
--- /dev/null
+++ b/htdocs/modulebuilder/template/mypage.php
@@ -0,0 +1,135 @@
+<?php
+/* <one line to give the program's name and a brief idea of what it does.>
+ * Copyright (C) <year>  <name of author>
+ *
+ * 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    mypage.php
+ * \ingroup mymodule
+ * \brief   Example PHP page.
+ *
+ * Put detailed description here.
+ */
+
+//if (! defined('NOREQUIREUSER'))	define('NOREQUIREUSER','1');
+//if (! defined('NOREQUIREDB'))		define('NOREQUIREDB','1');
+//if (! defined('NOREQUIRESOC'))	define('NOREQUIRESOC','1');
+//if (! defined('NOREQUIRETRAN'))	define('NOREQUIRETRAN','1');
+// Do not check anti CSRF attack test
+//if (! defined('NOCSRFCHECK'))		define('NOCSRFCHECK','1');
+// Do not check style html tag into posted data
+//if (! defined('NOSTYLECHECK'))   define('NOSTYLECHECK','1');
+// Do not check anti POST attack test
+//if (! defined('NOTOKENRENEWAL'))	define('NOTOKENRENEWAL','1');
+// If there is no need to load and show top and left menu
+//if (! defined('NOREQUIREMENU'))	define('NOREQUIREMENU','1');
+// If we don't need to load the html.form.class.php
+//if (! defined('NOREQUIREHTML'))	define('NOREQUIREHTML','1');
+//if (! defined('NOREQUIREAJAX'))	define('NOREQUIREAJAX','1');
+// If this page is public (can be called outside logged session)
+//if (! defined("NOLOGIN"))			define("NOLOGIN",'1');
+// Change the following lines to use the correct relative path
+// (../, ../../, etc)
+
+// Load Dolibarr environment
+if (false === (@include '../../main.inc.php')) {  // From htdocs directory
+	require '../../../main.inc.php'; // From "custom" directory
+}
+
+global $db, $langs, $user;
+
+dol_include_once('/mymodule/class/myclass.class.php');
+
+// Load translation files required by the page
+$langs->load("mymodule@mymodule");
+
+// Get parameters
+$id = GETPOST('id', 'int');
+$action = GETPOST('action', 'alpha');
+$myparam = GETPOST('myparam', 'alpha');
+
+// Access control
+if ($user->socid > 0) {
+	// External user
+	accessforbidden();
+}
+
+// Default action
+if (empty($action) && empty($id) && empty($ref)) {
+	$action='create';
+}
+
+// Load object if id or ref is provided as parameter
+$object = new MyClass($db);
+if (($id > 0 || ! empty($ref)) && $action != 'add') {
+	$result = $object->fetch($id, $ref);
+	if ($result < 0) {
+		dol_print_error($db);
+	}
+}
+
+/*
+ * ACTIONS
+ *
+ * Put here all code to do according to value of "action" parameter
+ */
+
+if ($action == 'add') {
+	$myobject = new MyClass($db);
+	$myobject->prop1 = $_POST["field1"];
+	$myobject->prop2 = $_POST["field2"];
+	$result = $myobject->create($user);
+	if ($result > 0) {
+		// Creation OK
+	} {
+		// Creation KO
+		$mesg = $myobject->error;
+	}
+}
+
+/*
+ * VIEW
+ *
+ * Put here all code to build page
+ */
+
+llxHeader('', $langs->trans('MyPageName'), '');
+
+$form = new Form($db);
+
+// Put here content of your page
+// Example 1: Adding jquery code
+echo '<script type=application/javascript" language="javascript">
+	jQuery(document).ready(function() {
+		function init_myfunc()
+		{
+			jQuery("#myid")
+			.removeAttr(\'disabled\')
+			.attr(\'disabled\',\'disabled\');
+		}
+		init_myfunc();
+		jQuery("#mybutton").click(function() {
+			init_needroot();
+		});
+	});
+</script>';
+
+// Example 2: Adding links to objects
+// The class must extend CommonObject for this method to be available
+$somethingshown = $form->showLinkedObjectBlock($myobject);
+
+// End of page
+llxFooter();
diff --git a/htdocs/modulebuilder/template/phpdoc.dist.xml b/htdocs/modulebuilder/template/phpdoc.dist.xml
new file mode 100644
index 00000000000..7f9b9761bd1
--- /dev/null
+++ b/htdocs/modulebuilder/template/phpdoc.dist.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<phpdoc>
+    <title>MyModule</title>
+    <parser>
+        <target>build/phpdoc</target>
+        <encoding>utf8</encoding>
+        <markers>
+            <item>TODO</item>
+            <item>FIXME</item>
+        </markers>
+        <extensions>
+            <extension>php</extension>
+            <extension>css</extension>
+            <extension>js</extension>
+        </extensions>
+    </parser>
+    <transformer>
+        <target>doc/code/phpdoc</target>
+    </transformer>
+    <transformations>
+        <template name="responsive"/>
+    </transformations>
+    <files>
+        <directory>.</directory>
+        <ignore>build/*</ignore>
+        <ignore>dev/*</ignore>
+        <ignore>doc/*</ignore>
+        <ignore>vendor/*</ignore>
+    </files>
+</phpdoc>
\ No newline at end of file
diff --git a/htdocs/modulebuilder/template/scripts/myscript.php b/htdocs/modulebuilder/template/scripts/myscript.php
new file mode 100644
index 00000000000..468729c59f3
--- /dev/null
+++ b/htdocs/modulebuilder/template/scripts/myscript.php
@@ -0,0 +1,203 @@
+#!/usr/bin/env php
+<?php
+/* <one line to give the program's name and a brief idea of what it does.>
+ * Copyright (C) <year>  <name of author>
+ *
+ * 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    scripts/myscript.php
+ * \ingroup mymodule
+ * \brief   Example command line script.
+ *
+ * Put detailed description here.
+ */
+
+$sapi_type = php_sapi_name();
+$script_file = basename(__FILE__);
+$path = dirname(__FILE__) . '/';
+
+// Test if batch mode
+if (substr($sapi_type, 0, 3) == 'cgi') {
+	echo "Error: You are using PHP for CGI. To execute ";
+	echo $script_file;
+	echo " from command line, you must use PHP for CLI mode.\n";
+	exit;
+}
+
+// Global variables
+$version = '1.0.0';
+$error = 0;
+
+
+/*
+ * -------------------- YOUR CODE STARTS HERE --------------------
+ */
+/* Set this define to 0 if you want to allow execution of your script
+ * even if dolibarr setup is "locked to admin user only". */
+define('EVEN_IF_ONLY_LOGIN_ALLOWED', 0);
+
+/* Include Dolibarr environment
+ * Customize to your needs
+ */
+require_once $path . '../../../master.inc.php';
+/* After this $db, $conf, $langs, $mysoc, $user and other Dolibarr utility variables should be defined.
+ * Warning: this still requires a valid htdocs/conf.php file
+ */
+
+global $conf, $db, $langs, $mysoc, $user;
+
+// No timeout for this script
+@set_time_limit(0);
+
+// Set the default language
+//$langs->setDefaultLang('en_US');
+
+// Load translations for the default language
+$langs->load("main");
+
+/* User and permissions loading
+ * Loads user for login 'admin'.
+ * Comment out to run as anonymous user. */
+$result = $user->fetch('', 'admin');
+if (! $result > 0) {
+	dol_print_error('', $user->error);
+	exit;
+}
+$user->getrights();
+
+// Display banner and help
+echo "***** " . $script_file . " (" . $version . ") pid=" . getmypid() . " *****\n";
+dol_syslog($script_file . " launched with arg " . join(',', $argv));
+if (! isset($argv[1])) {
+	// Check parameters
+	echo "Usage: " . $script_file . " param1 param2 ...\n";
+	exit;
+}
+echo '--- start' . "\n";
+echo 'Argument 1=' . $argv[1] . "\n";
+echo 'Argument 2=' . $argv[2] . "\n";
+
+// Start database transaction
+$db->begin();
+
+// Examples for manipulating a class
+require_once '../class/myclass.class.php';
+$myobject = new MyClass($db);
+
+// Example for inserting creating object in database
+/*
+	dol_syslog($script_file . " CREATE", LOG_DEBUG);
+	$myobject->prop1 = 'value_prop1';
+	$myobject->prop2 = 'value_prop2';
+	$id = $myobject->create($user);
+	if ($id < 0) {
+		$error++;
+		dol_print_error($db, $myobject->error);
+	} else {
+		 echo "Object created with id=" . $id . "\n";
+	}
+ */
+
+// Example for reading object from database
+/*
+	dol_syslog($script_file . " FETCH", LOG_DEBUG);
+	$result = $myobject->fetch($id);
+	if ($result < 0) {
+		$error;
+		dol_print_error($db, $myobject->error);
+	} else {
+		echo "Object with id=" . $id . " loaded\n";
+	}
+ */
+
+// Example for updating object in database
+// ($myobject must have been loaded by a fetch before)
+/*
+	dol_syslog($script_file . " UPDATE", LOG_DEBUG);
+	$myobject->prop1 = 'newvalue_prop1';
+	$myobject->prop2 = 'newvalue_prop2';
+	$result = $myobject->update($user);
+	if ($result < 0) {
+		$error++;
+		dol_print_error($db, $myobject->error);
+	} else {
+		echo "Object with id " . $myobject->id . " updated\n";
+	}
+ */
+
+// Example for deleting object in database
+// ($myobject must have been loaded by a fetch before)
+/*
+	dol_syslog($script_file . " DELETE", LOG_DEBUG);
+	$result = $myobject->delete($user);
+	if ($result < 0) {
+		$error++;
+		dol_print_error($db, $myobject->error);
+	} else {
+		echo "Object with id " . $myobject->id . " deleted\n";
+	}
+ */
+
+// An example of a direct SQL read without using the fetch method
+/*
+	$sql = "SELECT field1, field2";
+	$sql.= " FROM " . MAIN_DB_PREFIX . "c_pays";
+	$sql.= " WHERE field3 = 'xxx'";
+	$sql.= " ORDER BY field1 ASC";
+
+	dol_syslog($script_file . " sql=" . $sql, LOG_DEBUG);
+	$resql=$db->query($sql);
+	if ($resql) {
+		$num = $db->num_rows($resql);
+		$i = 0;
+		if ($num) {
+			while ($i < $num) {
+				$obj = $db->fetch_object($resql);
+				if ($obj) {
+					// You can use here results
+					echo $obj->field1;
+					echo $obj->field2;
+				}
+				$i++;
+			}
+		}
+	} else {
+		$error++;
+		dol_print_error($db);
+	}
+ */
+
+
+/*
+ * --------------------- YOUR CODE ENDS HERE ----------------------
+ */
+
+// Error management
+if (! $error) {
+	$db->commit();
+	echo '--- end ok' . "\n";
+	$exit_status = 0; // UNIX no errors exit status
+} else {
+	echo '--- end error code=' . $error . "\n";
+	$db->rollback();
+	$exit_status = 1; // UNIX general error exit status
+}
+
+// Close database handler
+$db->close();
+
+// Return exit status code
+return $exit_status;
diff --git a/htdocs/modulebuilder/template/sql/data.sql b/htdocs/modulebuilder/template/sql/data.sql
new file mode 100644
index 00000000000..90e9e0ced2b
--- /dev/null
+++ b/htdocs/modulebuilder/template/sql/data.sql
@@ -0,0 +1,19 @@
+-- <one line to give the program's name and a brief idea of what it does.>
+-- Copyright (C) <year>  <name of author>
+--
+-- 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/>.
+
+INSERT INTO llx_mytable VALUES (
+	1, 1, 'mydata'
+);
diff --git a/htdocs/modulebuilder/template/sql/llx_mytable.key.sql b/htdocs/modulebuilder/template/sql/llx_mytable.key.sql
new file mode 100644
index 00000000000..56975f55a01
--- /dev/null
+++ b/htdocs/modulebuilder/template/sql/llx_mytable.key.sql
@@ -0,0 +1,17 @@
+-- <one line to give the program's name and a brief idea of what it does.>
+-- Copyright (C) <year>  <name of author>
+--
+-- 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/>.
+
+ALTER TABLE llx_mytable ADD UNIQUE INDEX uk_fk_othertable (fk_othertable);
diff --git a/htdocs/modulebuilder/template/sql/llx_mytable.sql b/htdocs/modulebuilder/template/sql/llx_mytable.sql
new file mode 100644
index 00000000000..2ef08b7fca1
--- /dev/null
+++ b/htdocs/modulebuilder/template/sql/llx_mytable.sql
@@ -0,0 +1,22 @@
+-- <one line to give the program's name and a brief idea of what it does.>
+-- Copyright (C) <year>  <name of author>
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+CREATE TABLE llx_mytable(
+	rowid INTEGER AUTO_INCREMENT PRIMARY KEY,
+	entity INTEGER DEFAULT 1 NOT NULL,
+	fk_othertable INTEGER NOT NULL,
+	name VARCHAR(189)
+);
diff --git a/htdocs/modulebuilder/template/sql/update_x.x.x-y.y.y.sql b/htdocs/modulebuilder/template/sql/update_x.x.x-y.y.y.sql
new file mode 100644
index 00000000000..6d5bb8155b1
--- /dev/null
+++ b/htdocs/modulebuilder/template/sql/update_x.x.x-y.y.y.sql
@@ -0,0 +1,15 @@
+-- <one line to give the program's name and a brief idea of what it does.>
+-- Copyright (C) <year>  <name of author>
+--
+-- 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/>.
diff --git a/htdocs/modulebuilder/template/test/functional/MyModuleFunctionalTest.php b/htdocs/modulebuilder/template/test/functional/MyModuleFunctionalTest.php
new file mode 100644
index 00000000000..3a310e48f66
--- /dev/null
+++ b/htdocs/modulebuilder/template/test/functional/MyModuleFunctionalTest.php
@@ -0,0 +1,291 @@
+<?php
+/* <one line to give the program's name and a brief idea of what it does.>
+ * Copyright (C) <year>  <name of author>
+ *
+ * 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    test/functional/MyModuleFunctionalTest.php
+ * \ingroup mymodule
+ * \brief   Example Selenium test.
+ *
+ * Put detailed description here.
+ */
+
+namespace test\functional;
+
+use PHPUnit_Extensions_Selenium2TestCase_WebDriverException;
+
+/**
+ * Class MyModuleFunctionalTest
+ *
+ * Requires chromedriver for Google Chrome
+ * Requires geckodriver for Mozilla Firefox
+ *
+ * @fixme Firefox (Geckodriver/Marionette) support
+ * @todo Opera linux support
+ * @todo Windows support (IE, Google Chrome, Mozilla Firefox, Safari)
+ * @todo OSX support (Safari, Google Chrome, Mozilla Firefox)
+ *
+ * @package test\functional
+ */
+class MyModuleFunctionalTest extends \PHPUnit_Extensions_Selenium2TestCase
+{
+	// TODO: move to a global configuration file?
+	/** @var string Base URL of the webserver under test */
+	protected static $base_url = 'http://dev.zenfusion.fr';
+	/**
+	 * @var string Dolibarr admin username
+	 * @see authenticate
+	 */
+	protected static $dol_admin_user = 'admin';
+	/**
+	 * @var string Dolibarr admin password
+	 * @see authenticate
+	 */
+	protected static $dol_admin_pass = 'admin';
+	/** @var int Dolibarr module ID */
+	private static $module_id = 500000; // TODO: autodetect?
+
+	/** @var array Browsers to test with */
+	public static $browsers = array(
+		array(
+			'browser' => 'Google Chrome on Linux',
+			'browserName' => 'chrome',
+			'sessionStrategy' => 'shared',
+			'desiredCapabilities' => array()
+		),
+		// Geckodriver does not keep the session at the moment?!
+		// XPath selectors also don't seem to work
+//        array(
+//            'browser' => 'Mozilla Firefox on Linux',
+//            'browserName' => 'firefox',
+//            'sessionStrategy' => 'shared',
+//            'desiredCapabilities' => array(
+//                'marionette' => true
+//            )
+//        )
+	);
+
+	/**
+	 * Helper function to select links by href
+	 *
+	 * @param $value
+	 * @return mixed
+	 */
+	protected function byHref($value)
+	{
+		$anchor = null;
+		$anchors = $this->elements($this->using('tag name')->value('a'));
+		foreach ($anchors as $anchor) {
+			if (strstr($anchor->attribute('href'), $value)) {
+				break;
+			}
+		}
+		return $anchor;
+	}
+
+	/**
+	 * Global test setup
+	 */
+	public static function setUpBeforeClass()
+	{
+	}
+
+	/**
+	 * Unit test setup
+	 */
+	public function setUp()
+	{
+		$this->setSeleniumServerRequestsTimeout(3600);
+		$this->setBrowserUrl(self::$base_url);
+	}
+
+	/**
+	 * Verify pre conditions
+	 */
+	protected function assertPreConditions()
+	{
+	}
+
+	/**
+	 * Handle Dolibarr authentication
+	 */
+	private function authenticate()
+	{
+		try {
+			if ($this->byId('login')) {
+				$login = $this->byId('username');
+				$login->clear();
+				$login->value('admin');
+				$password = $this->byId('password');
+				$password->clear();
+				$password->value('admin');
+				$this->byId('login')->submit();
+			}
+		} catch (PHPUnit_Extensions_Selenium2TestCase_WebDriverException $e) {
+			// Login does not exist. Assume we are already authenticated
+		}
+	}
+
+	/**
+	 * Test enabling developer mode
+	 */
+	public function testEnableDeveloperMode()
+	{
+		$this->url('/admin/const.php');
+		$this->authenticate();
+		$main_features_level_path='//input[@value="MAIN_FEATURES_LEVEL"]/following::input[@type="text"]';
+		$main_features_level = $this->byXPath($main_features_level_path);
+		$main_features_level->clear();
+		$main_features_level->value('2');
+		$this->byName('update')->click();
+		// Page reloaded, we need a new XPath
+		$main_features_level = $this->byXPath($main_features_level_path);
+		return $this->assertEquals('2', $main_features_level->value(), "MAIN_FEATURES_LEVEL value is 2");
+	}
+
+	/**
+	 * Test enabling the module
+	 *
+	 * @depends testEnableDeveloperMode
+	 */
+	public function testModuleEnabled()
+	{
+		$this->url('/admin/modules.php');
+		$this->authenticate();
+		$module_status_image_path='//a[contains(@href, "' . self::$module_id . '")]/img';
+		$module_status_image = $this->byXPath($module_status_image_path);
+		if (strstr($module_status_image->attribute('src'), 'switch_off.png')) {
+			// Enable the module
+			$this->byHref('modMyModule')->click();
+		} else {
+			// Disable the module
+			$this->byHref('modMyModule')->click();
+			// Reenable the module
+			$this->byHref('modMyModule')->click();
+		}
+		// Page reloaded, we need a new Xpath
+		$module_status_image = $this->byXPath($module_status_image_path);
+		return $this->assertContains('switch_on.png', $module_status_image->attribute('src'), "Module enabled");
+	}
+
+	/**
+	 * Test access to the configuration page
+	 *
+	 * @depends testModuleEnabled
+	 */
+	public function testConfigurationPage()
+	{
+		$this->url('/custom/mymodule/admin/setup.php');
+		$this->authenticate();
+		return $this->assertContains('mymodule/admin/setup.php', $this->url(), 'Configuration page');
+	}
+
+	/**
+	 * Test access to the about page
+	 *
+	 * @depends testConfigurationPage
+	 */
+	public function testAboutPage()
+	{
+		$this->url('/custom/mymodule/admin/about.php');
+		$this->authenticate();
+		return $this->assertContains('mymodule/admin/about.php', $this->url(), 'About page');
+	}
+
+	/**
+	 * Test about page is rendering Markdown
+	 *
+	 * @depends testAboutPage
+	 */
+	public function testAboutPageRendersMarkdownReadme()
+	{
+		$this->url('/custom/mymodule/admin/about.php');
+		$this->authenticate();
+		return $this->assertEquals(
+			'Dolibarr Module Template (aka My Module)',
+			$this->byTag('h1')->text(),
+			"Readme title"
+		);
+	}
+
+	/**
+	 * Test box is properly declared
+	 *
+	 * @depends testModuleEnabled
+	 */
+	public function testBoxDeclared()
+	{
+		$this->url('/admin/boxes.php');
+		$this->authenticate();
+		return $this->assertContains('mybox', $this->source(), "Box enabled");
+	}
+
+	/**
+	 * Test trigger is properly enabled
+	 *
+	 * @depends testModuleEnabled
+	 */
+	public function testTriggerDeclared()
+	{
+		$this->url('/admin/triggers.php');
+		$this->authenticate();
+		return $this->assertContains(
+			'interface_99_modMyModule_MyTrigger.class.php',
+			$this->byTag('body')->text(),
+			"Trigger declared"
+		);
+	}
+
+	/**
+	 * Test trigger is properly declared
+	 *
+	 * @depends testTriggerDeclared
+	 */
+	public function testTriggerEnabled()
+	{
+		$this->url('/admin/triggers.php');
+		$this->authenticate();
+		return $this->assertContains(
+			'tick.png',
+			$this
+				->byXPath('//td[text()="interface_99_modMyModule_MyTrigger.class.php"]/following::img')
+				->attribute('src'),
+			"Trigger enabled"
+		);
+	}
+
+	/**
+	 * Verify post conditions
+	 */
+	protected function assertPostConditions()
+	{
+	}
+
+	/**
+	 * Unit test teardown
+	 */
+	public function tearDown()
+	{
+	}
+
+	/**
+	 * Global test teardown
+	 */
+	public static function tearDownAfterClass()
+	{
+	}
+}
diff --git a/htdocs/modulebuilder/template/test/unit/MyClassTest.php b/htdocs/modulebuilder/template/test/unit/MyClassTest.php
new file mode 100644
index 00000000000..16016baf117
--- /dev/null
+++ b/htdocs/modulebuilder/template/test/unit/MyClassTest.php
@@ -0,0 +1,104 @@
+<?php
+/* <one line to give the program's name and a brief idea of what it does.>
+ * Copyright (C) <year>  <name of author>
+ *
+ * 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    test/unit/MyClassTest.php
+ * \ingroup mymodule
+ * \brief   Example PHPUnit test.
+ *
+ * Put detailed description here.
+ */
+
+namespace test\unit;
+
+/**
+ * Class MyClassTest
+ * @package test\unit
+ */
+class MyClassTest extends \PHPUnit_Framework_TestCase
+{
+	/**
+	 * Global test setup
+	 */
+	public static function setUpBeforeClass()
+	{
+		fwrite(STDOUT, __METHOD__ . "\n");
+	}
+
+	/**
+	 * Unit test setup
+	 */
+	protected function setUp()
+	{
+		fwrite(STDOUT, __METHOD__ . "\n");
+	}
+
+	/**
+	 * Verify pre conditions
+	 */
+	protected function assertPreConditions()
+	{
+		fwrite(STDOUT, __METHOD__ . "\n");
+	}
+
+	/**
+	 * A sample test
+	 */
+	public function testSomething()
+	{
+		fwrite(STDOUT, __METHOD__ . "\n");
+		// TODO: test something
+		$this->assertTrue(true);
+	}
+
+	/**
+	 * Verify post conditions
+	 */
+	protected function assertPostConditions()
+	{
+		fwrite(STDOUT, __METHOD__ . "\n");
+	}
+
+	/**
+	 * Unit test teardown
+	 */
+	protected function tearDown()
+	{
+		fwrite(STDOUT, __METHOD__ . "\n");
+	}
+
+	/**
+	 * Global test teardown
+	 */
+	public static function tearDownAfterClass()
+	{
+		fwrite(STDOUT, __METHOD__ . "\n");
+	}
+
+	/**
+	 * Unsuccessful test
+	 *
+	 * @param \Exception $e
+	 * @throws \Exception
+	 */
+	protected function onNotSuccessfulTest(\Exception $e)
+	{
+		fwrite(STDOUT, __METHOD__ . "\n");
+		throw $e;
+	}
+}
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 3278b685c80..4672d99b8ec 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -2914,7 +2914,10 @@ img.boxhandle, img.boxclose {
     vertical-align: middle;
 }
 
-
+.modulebuilderbox {
+	border: 1px solid #888;
+	padding: 16px;
+}
 
 
 /*

From 1371af5f6682747594ce23b27fd97d3ab1a18666 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 8 May 2017 21:04:23 +0200
Subject: [PATCH 247/505] Work on modulebuilder template

---
 htdocs/modulebuilder/index.php                  | 7 +++----
 htdocs/modulebuilder/template/modulebuilder.txt | 2 ++
 2 files changed, 5 insertions(+), 4 deletions(-)
 create mode 100644 htdocs/modulebuilder/template/modulebuilder.txt

diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index 38339d643c1..844d1377b5d 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -49,11 +49,10 @@ $dircustom = $tmp[0];
 
 if ($dircustom && $action == 'initmodule' && $modulename)
 {
-    $srcfile = DOL_DOCUMENT_ROOT.'/modulebuilder/skeletons';
+    $srcfile = DOL_DOCUMENT_ROOT.'/modulebuilder/template';
     $destfile = $dircustom.'/'.$modulename;
-    //$result = dolCopyDir($srcfile, $destfile, 0, 0);
-    
-    dol_mkdir($destfile);
+    $result = dolCopyDir($srcfile, $destfile, 0, 0);
+    //dol_mkdir($destfile);
     
     fopen($destfile, $mode)
     
diff --git a/htdocs/modulebuilder/template/modulebuilder.txt b/htdocs/modulebuilder/template/modulebuilder.txt
new file mode 100644
index 00000000000..4c726c35394
--- /dev/null
+++ b/htdocs/modulebuilder/template/modulebuilder.txt
@@ -0,0 +1,2 @@
+File to flag module build using official module template.
+When this file is present into a module directory, you can edit it with the module builder tool.
\ No newline at end of file

From c26d24e97d798bdc89f07857fbb67cc6ec559f13 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 8 May 2017 23:55:46 +0200
Subject: [PATCH 248/505] Work on module builder

---
 .tx/config                            |  24 +++-
 htdocs/langs/en_US/errors.lang        |   1 +
 htdocs/langs/en_US/modulebuilder.lang |  10 +-
 htdocs/modulebuilder/index.php        | 159 +++++++++++++++++++++-----
 4 files changed, 154 insertions(+), 40 deletions(-)

diff --git a/.tx/config b/.tx/config
index 010227f6e61..02ec4bc8b99 100644
--- a/.tx/config
+++ b/.tx/config
@@ -224,6 +224,18 @@ source_file = htdocs/langs/en_US/members.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
 
+[dolibarr.members]
+file_filter = htdocs/langs/<lang>/modulebuilder.lang
+source_file = htdocs/langs/en_US/modulebuilder.lang
+source_lang = en_US
+type = MOZILLAPROPERTIES
+
+[dolibarr.members]
+file_filter = htdocs/langs/<lang>/multicurrency.lang
+source_file = htdocs/langs/en_US/multicurrency.lang
+source_lang = en_US
+type = MOZILLAPROPERTIES
+
 [dolibarr.oauth]
 file_filter = htdocs/langs/<lang>/oauth.lang
 source_file = htdocs/langs/en_US/oauth.lang
@@ -350,18 +362,18 @@ source_file = htdocs/langs/en_US/users.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
 
-[dolibarr.withdrawals]
-file_filter = htdocs/langs/<lang>/withdrawals.lang
-source_file = htdocs/langs/en_US/withdrawals.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
 [dolibarr.website]
 file_filter = htdocs/langs/<lang>/website.lang
 source_file = htdocs/langs/en_US/website.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
 
+[dolibarr.withdrawals]
+file_filter = htdocs/langs/<lang>/withdrawals.lang
+source_file = htdocs/langs/en_US/withdrawals.lang
+source_lang = en_US
+type = MOZILLAPROPERTIES
+
 [dolibarr.workflow]
 file_filter = htdocs/langs/<lang>/workflow.lang
 source_file = htdocs/langs/en_US/workflow.lang
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index 4f700109c33..79984981e87 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -165,6 +165,7 @@ ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 ErrorOppStatusRequiredIfAmount=You set an estimated amount for this opportunity/lead. So you must also enter its status
+ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has ocurred when saving the changes
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
diff --git a/htdocs/langs/en_US/modulebuilder.lang b/htdocs/langs/en_US/modulebuilder.lang
index ef86062bbd0..81a34b66b85 100644
--- a/htdocs/langs/en_US/modulebuilder.lang
+++ b/htdocs/langs/en_US/modulebuilder.lang
@@ -1,4 +1,8 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tools give you utilites to build your own module.
-ModuleBuilderDesc2=Path were modules are generated (first alternative directory defined into %s): <strong>%s</strong>.
-They are detected when the file %s exists in root of module directory.
+ModuleBuilderDesc=This tools give you utilites to build or edit your own module.
+ModuleBuilderDesc2=Path were modules are generated/edited (first alternative directory defined into %s): <strong>%s</strong>. 
+ModuleBuilderDesc3=Modules found: <strong>%s</strong> (they are detected as editable when the file <strong>%s</strong> exists in root of module directory). 
+NewModule=New module
+ModuleKey=Key for new module
+
+
diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index 844d1377b5d..6ad747a7694 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -31,6 +31,11 @@ $langs->load("other");
 
 $action=GETPOST('action','alpha');
 $confirm=GETPOST('confirm','alpha');
+$module=GETPOST('module');
+$tab=GETPOST('tab');
+if (empty($module)) $module='initmodule';
+if (empty($tab)) $tab='description';
+
 
 // Security check
 if (! $user->admin && empty($conf->global->MODULEBUILDER_FOREVERYONE)) accessforbidden('ModuleBuilderNotAllowed');
@@ -41,6 +46,7 @@ $modulename=dol_sanitizeFileName(GETPOST('modulename','alpha'));
 $tmp=explode(',', $dolibarr_main_document_root_alt);
 $dircustom = $tmp[0];
 
+$FILEFLAG='modulebuilder.txt';
 
 
 /*
@@ -54,8 +60,6 @@ if ($dircustom && $action == 'initmodule' && $modulename)
     $result = dolCopyDir($srcfile, $destfile, 0, 0);
     //dol_mkdir($destfile);
     
-    fopen($destfile, $mode)
-    
     if ($result > 0)
     {
         setEventMessages('ModuleInitialized', null);
@@ -71,9 +75,6 @@ if ($dircustom && $action == 'initmodule' && $modulename)
  * View
  */
 
-$socstatic=new Societe($db);
-
-
 llxHeader("",$langs->trans("ModuleBuilder"),"");
 
 
@@ -81,23 +82,6 @@ $text=$langs->trans("ModuleBuilder");
 
 print load_fiche_titre($text, '', 'title_setup');
 
-// Show description of content
-print $langs->trans("ModuleBuilderDesc").'<br>';
-print $langs->trans("ModuleBuilderDesc2", 'conf/conf.php', $dircustom).'<br>';
-print '<br>';
-
-
-// New module
-print '<div class="modulebuilderbox">';
-print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print '<input type="hidden" name="action" value="initmodule">';
-print '<input type="text" name="modulename" value="" placeholder="'.dol_escape_htmltag($langs->trans("ModuleName")).'">';
-print '<input type="submit" class="button" name="create" value="'.dol_escape_htmltag($langs->trans("CreateNewModule")).'">';
-print '</form>';
-print '<div>';
-
-
 $listofmodules=array();
 /*
 if (!empty($conf->modulebuilder->enabled) && $mainmenu == 'modulebuilder')	// Entry for Module builder
@@ -107,16 +91,16 @@ if (!empty($conf->modulebuilder->enabled) && $mainmenu == 'modulebuilder')	// En
     {
         foreach ($dolibarr_main_document_root_alt as $diralt)
         {*/
-            $dirsincustom=dol_dir_list($dircustom);
+            $dirsincustom=dol_dir_list($dircustom, 'directories');
             
             if (is_array($dirsincustom) && count($dirsincustom) > 0)
             {
-                foreach ($dirsincustom as $dircustom)
+                foreach ($dirsincustom as $dircustomcursor)
                 {
-                    $fullname = $dircustom['fullname'];
-                    if (dol_is_file($fullname.'/modulebuilder.txt'))
+                    $fullname = $dircustomcursor['fullname'];
+                    if (dol_is_file($fullname.'/'.$FILEFLAG))
                     {
-                        $listofmodules[$module]=$fullname;
+                        $listofmodules[$dircustomcursor['name']]=$fullname;
                     }
                 }
             }
@@ -127,11 +111,124 @@ if (!empty($conf->modulebuilder->enabled) && $mainmenu == 'modulebuilder')	// En
         $newmenu->add('', 'NoGeneratedModuleFound', 0, 0);
     }*/
 
-foreach($listofmodules as $modules => $fullname)
-{
-    print '<div class="modulebuilderbox>'.$module.'</div>';
-}
             
+// Show description of content
+print $langs->trans("ModuleBuilderDesc").'<br>';
+print $langs->trans("ModuleBuilderDesc2", 'conf/conf.php', $dircustom).'<br>';
+print $langs->trans("ModuleBuilderDesc3", count($listofmodules), $FILEFLAG).'<br>';
+print '<br>';
+            
+            
+print '<br>';            
+
+$head = array();
+$h=0;
+
+$head[$h][0] = $_SERVER["PHP_SELF"].'?module=initmodule';
+$head[$h][1] = $langs->trans("NewModule");
+$head[$h][2] = 'initmodule';
+$h++;
+    
+foreach($listofmodules as $tmpmodule => $fullname)
+{
+    $head[$h][0] = $_SERVER["PHP_SELF"].'?module='.$tmpmodule;
+    $head[$h][1] = $tmpmodule;
+    $head[$h][2] = $tmpmodule;
+    $h++;
+}
+
+
+
+dol_fiche_head($head, $module, $langs->trans("Modules"), -1, 'generic');
+
+if ($module == 'initmodule')
+{
+    // New module
+    print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    print '<input type="hidden" name="action" value="initmodule">';
+    print '<input type="hidden" name="module" value="initmodule">';
+    print '<input type="text" name="modulename" value="" placeholder="'.dol_escape_htmltag($langs->trans("ModuleKey")).'">';
+    print '<input type="submit" class="button" name="create" value="'.dol_escape_htmltag($langs->trans("Create")).'">';
+    print '</form>';
+}
+elseif (! empty($module))
+{
+    $error=0;
+    
+    // Load module
+    dol_include_once($module.'/core/modules/mod'.ucfirst($module).'.class.php');
+    $class='mod'.ucfirst($module);
+    if (class_exists($class))
+    {
+        try {
+            $moduleobj = new $class($db);
+        }
+        catch(Exception $e)
+        {
+            $error++;
+            print $e->getMessage();
+        }
+    }
+    else
+    {
+        $error++;
+        $langs->load("errors");
+        print img_warning('').' '.$langs->trans("ErrorFailedToLoadModuleDescriptorForXXX", $module);
+    }
+    
+    // Button to delete module
+    
+    
+    // Tabs for module
+    if (! $error)
+    {
+        $head2 = array();
+        $h=0;
+        
+        foreach($listofmodules as $tmpmodule => $fullname)
+        {
+            $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=description';
+            $head2[$h][1] = $langs->trans("Description");
+            $head2[$h][2] = 'description';
+            $h++;
+            
+            $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=objects';
+            $head2[$h][1] = $langs->trans("Objects");
+            $head2[$h][2] = 'objects';
+            $h++;        
+        
+            $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab='.$tmpmodule;
+            $head2[$h][1] = $langs->trans("Menus");
+            $head2[$h][2] = 'menus';
+            $h++;
+            
+            $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab='.$tmpmodule;
+            $head2[$h][1] = $langs->trans("Permissions");
+            $head2[$h][2] = 'permissions';
+            $h++;        
+    
+            $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab='.$tmpmodule;
+            $head2[$h][1] = $langs->trans("Triggers");
+            $head2[$h][2] = 'triggers';
+            $h++;        
+        }
+        
+        dol_fiche_head($head2, $tab, '', -1, '');
+        
+        print $moduleobj->getDescLong();
+    
+        
+        
+        
+        
+        dol_fiche_end();
+    }
+}
+
+dol_fiche_end();
+
+
 
 llxFooter();
 

From 05d6c2cd75fd968fad33f1407a3972dcc4276dac Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 9 May 2017 01:36:20 +0200
Subject: [PATCH 249/505] Fix no more use of constant

---
 htdocs/admin/tools/purge.php      | 4 ++--
 htdocs/core/class/utils.class.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/admin/tools/purge.php b/htdocs/admin/tools/purge.php
index 170c37a79bf..e913d59a4a7 100644
--- a/htdocs/admin/tools/purge.php
+++ b/htdocs/admin/tools/purge.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2006-2012	Laurent Destailleur	<eldy@users.sourceforge.net>
+/* Copyright (C) 2006-2017	Laurent Destailleur	<eldy@users.sourceforge.net>
  * Copyright (C) 2006-2012	Regis Houssin		<regis.houssin@capnetworks.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -38,7 +38,7 @@ $choice=GETPOST('choice');
 $filelog='';
 if (! empty($conf->syslog->enabled))
 {
-	$filelog=SYSLOG_FILE;
+	$filelog=$conf->global->SYSLOG_FILE;
 	$filelog=preg_replace('/DOL_DATA_ROOT/i',DOL_DATA_ROOT,$filelog);
 }
 
diff --git a/htdocs/core/class/utils.class.php b/htdocs/core/class/utils.class.php
index 4e3cf7a0928..3a35bfb2cc2 100644
--- a/htdocs/core/class/utils.class.php
+++ b/htdocs/core/class/utils.class.php
@@ -94,7 +94,7 @@ class Utils
 			$filelog='';
 			if (! empty($conf->syslog->enabled))
 			{
-				$filelog=SYSLOG_FILE;
+				$filelog=$conf->global->SYSLOG_FILE;
 				$filelog=preg_replace('/DOL_DATA_ROOT/i',DOL_DATA_ROOT,$filelog);
 			}
 

From 9fe28c9b2cd770a064f628cc2e298361e3a395c7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 9 May 2017 10:08:04 +0200
Subject: [PATCH 250/505] NEW Can disable all overwrote translations in one
 click.

---
 htdocs/admin/translation.php                  | 24 +++++++++++++++++++
 htdocs/core/class/translate.class.php         |  9 +++++--
 .../install/mysql/migration/5.0.0-6.0.0.sql   |  2 ++
 htdocs/langs/en_US/admin.lang                 |  1 +
 4 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php
index 75f151d45b9..c51d1c2435d 100644
--- a/htdocs/admin/translation.php
+++ b/htdocs/admin/translation.php
@@ -79,6 +79,12 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETP
     $search_array_options=array();
 }
 
+if ($action == 'setMAIN_ENABLE_OVERWRITE_TRANSLATION')
+{
+    if (GETPOST('value')) dolibarr_set_const($db, 'MAIN_ENABLE_OVERWRITE_TRANSLATION', 1, 'chaine', 0, '', $conf->entity);
+    else dolibarr_set_const($db, 'MAIN_ENABLE_OVERWRITE_TRANSLATION', 0, 'chaine', 0, '', $conf->entity);
+}
+
 if ($action == 'add' || (GETPOST('add') && $action != 'update'))
 {
 	$error=0;
@@ -169,6 +175,24 @@ print $langs->trans("CurrentUserLanguage").': <strong>'.$s.' '.$current_language
 
 print '<br>';
 
+print $langs->trans("EnableOverwriteTranslation").' ';
+if (empty($conf->global->MAIN_ENABLE_OVERWRITE_TRANSLATION))
+{
+    // Button off, click to enable
+    print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setMAIN_ENABLE_OVERWRITE_TRANSLATION&amp;value=1">';
+    print img_picto($langs->trans("Disabled"),'switch_off');
+    print '</a>';
+}
+else
+{
+    // Button on, click to disable
+    print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setMAIN_ENABLE_OVERWRITE_TRANSLATION&amp;value=0">';
+    print img_picto($langs->trans("Activated"),'switch_on');
+    print '</a>';
+}
+
+print '<br><br>';
+
 $param='&mode='.$mode;
 if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
 if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
diff --git a/htdocs/core/class/translate.class.php b/htdocs/core/class/translate.class.php
index 0f2e6a837ef..88b001ba093 100644
--- a/htdocs/core/class/translate.class.php
+++ b/htdocs/core/class/translate.class.php
@@ -297,7 +297,12 @@ class Translate
 												$tabtranslatedomain[$key] = $value;
 											}
 										}
-									} else {
+									}
+									elseif ($key[0] == '#')
+									{
+									    continue;
+									}
+									else {
 										$this->tab_translate[$key] = $value;
 										//if ($domain == 'orders') print "$tab[0] value $value<br>";
 										if ($usecachekey) {
@@ -459,7 +464,7 @@ class Translate
 			}
 		}
 
-		if (! $found)
+		if (! $found && ! empty($conf->global->MAIN_ENABLE_OVERWRITE_TRANSLATION))
 		{
     		// Overwrite translation with database read
             $sql="SELECT transkey, transvalue FROM ".MAIN_DB_PREFIX."overwrite_trans where lang='".$this->defaultlang."'";            
diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index d96210dcbfe..d2431186ed7 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -158,6 +158,8 @@ INSERT INTO llx_const (name, entity, value, type, visible, note) VALUES ('CONTRA
 INSERT INTO llx_const (name, entity, value, type, visible, note) VALUES ('USERGROUP_ADDON_PDF_ODT_PATH', 1, 'DOL_DATA_ROOT/doctemplates/usergroups', 'chaine', 0, '');
 INSERT INTO llx_const (name, entity, value, type, visible, note) VALUES ('USER_ADDON_PDF_ODT_PATH', 1, 'DOL_DATA_ROOT/doctemplates/users', 'chaine', 0, '');
 
+INSERT INTO llx_const (name, entity, value, type, visible, note) VALUES ('MAIN_ENABLE_OVERWRITE_TRANSLATION', 1, '1', 'chaine', 0, 'Enable overwrote of translation');
+
 ALTER TABLE llx_chargesociales ADD COLUMN ref varchar(16);
 ALTER TABLE llx_chargesociales ADD COLUMN fk_projet integer DEFAULT NULL;
 
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 5fd5cb57c8b..71e5b614abb 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -434,6 +434,7 @@ PageUrlForDefaultValues=You must enter here the relative url of the page. If you
 PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>
 PageUrlForDefaultValuesList=<br>For page that list thirdparties, it is <strong>%s</strong>
 EnableDefaultValues=Enable usage of personalized default values
+EnableOverwriteTranslation=Enable usage of overwrote translation
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code, so to change this value, you must edit it fom Home-Setup-translation.
 WarningSettingSortOrder=Warning, setting a default sort order may result in a technical error when going on the list page if field is an unknown field. If you experience such an error, come back to this page to remove the default sort order and restore default behavior. 
 Field=Field

From 63259295c6dff9eacd24a5280b0323f52b336fed Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 9 May 2017 10:19:39 +0200
Subject: [PATCH 251/505] Look and feel v6

---
 htdocs/user/card.php                  |  4 --
 htdocs/user/class/usergroup.class.php | 28 +++++++++++++-
 htdocs/user/group/card.php            | 40 +++++++------------
 htdocs/user/group/ldap.php            | 45 +++++++++++-----------
 htdocs/user/group/perms.php           | 55 ++++++++++++++-------------
 5 files changed, 93 insertions(+), 79 deletions(-)

diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 675f5748842..3682088b552 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -1716,8 +1716,6 @@ else
                  */
                 if (! empty($groupslist))
                 {
-                    $var=true;
-
                     foreach($groupslist as $group)
                     {
                         
@@ -2360,8 +2358,6 @@ else
             $genallowed = $user->rights->user->user->creer;
             $delallowed = $user->rights->user->user->supprimer;
     
-            $var = true;
-    
             $somethingshown = $formfile->show_documents('user', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', 0, '', $soc->default_lang);
     
     		// Show links to link elements
diff --git a/htdocs/user/class/usergroup.class.php b/htdocs/user/class/usergroup.class.php
index 907c0cef40d..cd9a16ea2b9 100644
--- a/htdocs/user/class/usergroup.class.php
+++ b/htdocs/user/class/usergroup.class.php
@@ -37,8 +37,9 @@ class UserGroup extends CommonObject
 	public $element='usergroup';
 	public $table_element='usergroup';
 	protected $ismultientitymanaged = 1;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
-
+    public $picto='group';
 	public $entity;		// Entity of group
+	
 	/**
 	 * @deprecated
 	 * @see name
@@ -744,6 +745,31 @@ class UserGroup extends CommonObject
 	}
 
 
+	/**
+	 *  Return label of status of user (active, inactive)
+	 *
+	 *  @param	int		$mode          0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
+	 *  @return	string 			       Label of status
+	 */
+	function getLibStatut($mode=0)
+	{
+	    return $this->LibStatut(0,$mode);
+	}
+	
+	/**
+	 *  Renvoi le libelle d'un statut donne
+	 *
+	 *  @param	int		$statut        	Id statut
+	 *  @param  int		$mode          	0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
+	 *  @return string 			       	Label of status
+	 */
+	function LibStatut($statut,$mode=0)
+	{
+	    global $langs;
+	    $langs->load('users');
+	    return '';
+	}
+	    
 	/**
 	 *	Retourne chaine DN complete dans l'annuaire LDAP pour l'objet
 	 *
diff --git a/htdocs/user/group/card.php b/htdocs/user/group/card.php
index eacb954e007..bbcbd38c168 100644
--- a/htdocs/user/group/card.php
+++ b/htdocs/user/group/card.php
@@ -314,19 +314,17 @@ else
 
 		if ($action != 'edit')
 		{
-        	dol_fiche_head($head, 'group', $title, 0, 'group');
+        	dol_fiche_head($head, 'group', $title, -1, 'group');
 
-			print '<table class="border" width="100%">';
-
-			// Ref
-			print '<tr><td class="titlefield">'.$langs->trans("Ref").'</td>';
-			print '<td>';
-			print $form->showrefnav($object,'id','',$user->rights->user->user->lire || $user->admin);
-			print '</td>';
-			print '</tr>';
+			dol_banner_tab($object,'id','',$user->rights->user->user->lire || $user->admin);
+			
+			print '<div class="fichecenter">';
+			print '<div class="underbanner clearboth"></div>';
+			
+        	print '<table class="border" width="100%">';
 
 			// Name
-			print '<tr><td>'.$langs->trans("Name").'</td>';
+			print '<tr><td class="titlefield">'.$langs->trans("Name").'</td>';
 			print '<td class="valeur">'.$object->name;
 			if (empty($object->entity))
 			{
@@ -357,7 +355,8 @@ else
             }
 
 			print "</table>\n";
-
+            print '</div>';
+            
 			dol_fiche_end();
 
 
@@ -377,11 +376,8 @@ else
 			}
 
 			print "</div>\n";
-			print "<br>\n";
 
-            /*
-             * Liste des utilisateurs dans le groupe
-             */
+            // List users in group
 
             print load_fiche_titre($langs->trans("ListOfUsersInGroup"),'','');
 
@@ -450,8 +446,6 @@ else
 
             if (! empty($object->members))
             {
-            	$var=True;
-
             	foreach($object->members as $useringroup)
             	{
             		
@@ -513,17 +507,11 @@ else
 	        $genallowed = $user->rights->user->user->creer;
 	        $delallowed = $user->rights->user->user->supprimer;
 	
-	        $var = true;
-	
 	        $somethingshown = $formfile->show_documents('usergroup', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', 0, '', $soc->default_lang);
 	
-			// Linked object block
-			$somethingshown = $form->showLinkedObjectBlock($object);
-	
-			// Show links to link elements
-			$linktoelem = $form->showLinkToObjectBlock($object);
-			if ($linktoelem) print '<br>'.$linktoelem;
-	
+	        // Show links to link elements
+	        $linktoelem = $form->showLinkToObjectBlock($object, null, null);
+	        $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
 	
 	        print '</div><div class="fichehalfright"><div class="ficheaddleft">';
 	
diff --git a/htdocs/user/group/ldap.php b/htdocs/user/group/ldap.php
index bf39a128137..2ced8e11d4b 100644
--- a/htdocs/user/group/ldap.php
+++ b/htdocs/user/group/ldap.php
@@ -45,9 +45,9 @@ $action = GETPOST('action', 'alpha');
 $socid=0;
 if ($user->societe_id > 0) $socid = $user->societe_id;
 
-$fgroup = new Usergroup($db);
-$fgroup->fetch($id);
-$fgroup->getrights();
+$object = new Usergroup($db);
+$object->fetch($id);
+$object->getrights();
 
 
 /*
@@ -61,12 +61,12 @@ if ($action == 'dolibarr2ldap')
 	$ldap=new Ldap();
 	$result=$ldap->connect_bind();
 
-	$info=$fgroup->_load_ldap_info();
+	$info=$object->_load_ldap_info();
 	// Get a gid number for objectclass PosixGroup
 	if(in_array('posixGroup',$info['objectclass']))
 		$info['gidNumber'] = $ldap->getNextGroupGid();
 
-	$dn=$fgroup->_load_ldap_dn($info);
+	$dn=$object->_load_ldap_dn($info);
 	$olddn=$dn;	// We can say that old dn = dn as we force synchro
 
 	$result=$ldap->update($dn,$info,$user,$olddn);
@@ -93,23 +93,21 @@ llxHeader();
 $form = new Form($db);
 
 
-$head = group_prepare_head($fgroup);
+$head = group_prepare_head($object);
 
-dol_fiche_head($head, 'ldap', $langs->trans("Group"), 0, 'group');
+dol_fiche_head($head, 'ldap', $langs->trans("Group"), -1, 'group');
+
+dol_banner_tab($object,'id','',$user->rights->user->user->lire || $user->admin);
+ 
+print '<div class="fichecenter">';
+print '<div class="underbanner clearboth"></div>';
 
 print '<table class="border" width="100%">';
 
-// Ref
-print '<tr><td width="25%">'.$langs->trans("Ref").'</td>';
-print '<td colspan="2">';
-print $form->showrefnav($fgroup,'id','',$canreadperms);
-print '</td>';
-print '</tr>';
-
 // Name
-print '<tr><td width="25%">'.$langs->trans("Name").'</td>';
-print '<td width="75%" class="valeur">'.$fgroup->name;
-if (!$fgroup->entity)
+print '<tr><td class="titlefield">'.$langs->trans("Name").'</td>';
+print '<td class="valeur">'.$object->name;
+if (!$object->entity)
 {
 	print img_picto($langs->trans("GlobalGroup"),'redstar');
 }
@@ -117,7 +115,7 @@ print "</td></tr>\n";
 
 // Note
 print '<tr><td width="25%" class="tdtop">'.$langs->trans("Note").'</td>';
-print '<td class="valeur">'.nl2br($fgroup->note).'&nbsp;</td>';
+print '<td class="valeur">'.nl2br($object->note).'&nbsp;</td>';
 print "</tr>\n";
 
 $langs->load("admin");
@@ -137,6 +135,9 @@ print "</table>\n";
 
 print '</div>';
 
+dol_fiche_end();
+
+
 /*
  * Barre d'actions
  */
@@ -145,7 +146,7 @@ print '<div class="tabsAction">';
 
 if ($conf->global->LDAP_SYNCHRO_ACTIVE == 'dolibarr2ldap')
 {
-	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$fgroup->id.'&amp;action=dolibarr2ldap">'.$langs->trans("ForceSynchronize").'</a>';
+	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=dolibarr2ldap">'.$langs->trans("ForceSynchronize").'</a>';
 }
 
 print "</div>\n";
@@ -169,9 +170,9 @@ $ldap=new Ldap();
 $result=$ldap->connect_bind();
 if ($result > 0)
 {
-	$info=$fgroup->_load_ldap_info();
-	$dn=$fgroup->_load_ldap_dn($info,1);
-	$search = "(".$fgroup->_load_ldap_dn($info,2).")";
+	$info=$object->_load_ldap_info();
+	$dn=$object->_load_ldap_dn($info,1);
+	$search = "(".$object->_load_ldap_dn($info,2).")";
 	$records = $ldap->getAttribute($dn,$search);
 
 	//var_dump($records);
diff --git a/htdocs/user/group/perms.php b/htdocs/user/group/perms.php
index 50b1bc56c5e..5262857afb2 100644
--- a/htdocs/user/group/perms.php
+++ b/htdocs/user/group/perms.php
@@ -82,16 +82,16 @@ llxHeader('',$langs->trans("Permissions"));
 
 if ($id)
 {
-    $fgroup = new Usergroup($db);
-    $fgroup->fetch($id);
-    $fgroup->getrights();
+    $object = new Usergroup($db);
+    $object->fetch($id);
+    $object->getrights();
 
     /*
      * Affichage onglets
      */
-    $head = group_prepare_head($fgroup);
+    $head = group_prepare_head($object);
     $title = $langs->trans("Group");
-    dol_fiche_head($head, 'rights', $title, 0, 'group');
+    dol_fiche_head($head, 'rights', $title, -1, 'group');
 
     // Charge les modules soumis a permissions
     $modules = array();
@@ -127,7 +127,7 @@ if ($id)
                         // Load all permissions
                         if ($objMod->rights_class)
                         {
-                        	$entity=((! empty($conf->multicompany->enabled) && ! empty($fgroup->entity)) ? $fgroup->entity : null);
+                        	$entity=((! empty($conf->multicompany->enabled) && ! empty($object->entity)) ? $object->entity : null);
                             $ret=$objMod->insert_permissions(0, $entity);
                             $modules[$objMod->rights_class]=$objMod;
                         }
@@ -150,7 +150,7 @@ if ($id)
     {
         if (empty($conf->multicompany->transverse_mode))
         {
-        	$sql.= " AND r.entity = ".$fgroup->entity;
+        	$sql.= " AND r.entity = ".$object->entity;
         }
         else
         {
@@ -162,7 +162,7 @@ if ($id)
     	$sql.= " AND r.entity IN (0,".$conf->entity.")";
     }
 
-    $sql.= " AND ugr.fk_usergroup = ".$fgroup->id;
+    $sql.= " AND ugr.fk_usergroup = ".$object->id;
 
     $result=$db->query($sql);
 
@@ -183,32 +183,31 @@ if ($id)
         dol_print_error($db);
     }
 
-
+    
+    
+    dol_banner_tab($object,'id','',$user->rights->user->user->lire || $user->admin);
+     
+    print '<div class="fichecenter">';
+    print '<div class="underbanner clearboth"></div>';
+     
     /*
      * Ecran ajout/suppression permission
      */
 
     print '<table class="border" width="100%">';
 
-    // Ref
-    print '<tr><td width="25%">'.$langs->trans("Ref").'</td>';
-    print '<td colspan="2">';
-    print $form->showrefnav($fgroup,'id','',$user->rights->user->user->lire || $user->admin);
-    print '</td>';
-    print '</tr>';
-
     // Nom
-    print '<tr><td width="25%">'.$langs->trans("Name").'</td>';
-    print '<td colspan="2">'.$fgroup->name.'';
-    if (! $fgroup->entity)
+    print '<tr><td class="titlefield">'.$langs->trans("Name").'</td>';
+    print '<td colspan="2">'.$object->name.'';
+    if (! $object->entity)
     {
         print img_picto($langs->trans("GlobalGroup"),'redstar');
     }
     print "</td></tr>\n";
 
     // Note
-    print '<tr><td width="25%" class="tdtop">'.$langs->trans("Note").'</td>';
-    print '<td class="valeur">'.dol_htmlentitiesbr($fgroup->note).'</td>';
+    print '<tr><td class="tdtop">'.$langs->trans("Description").'</td>';
+    print '<td class="valeur">'.dol_htmlentitiesbr($object->note).'</td>';
     print "</tr>\n";
 
     print '</table><br>';
@@ -230,7 +229,7 @@ if ($id)
     {
         if (empty($conf->multicompany->transverse_mode))
         {
-        	$sql.= " AND r.entity = ".$fgroup->entity;
+        	$sql.= " AND r.entity = ".$object->entity;
         }
         else
         {
@@ -280,9 +279,9 @@ if ($id)
                     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='.$langs->trans("All").' alt='.$langs->trans("All").' href="perms.php?id='.$fgroup->id.'&amp;action=addrights&amp;module='.$obj->module.'#'.$objMod->getName().'">'.$langs->trans("All")."</a>";
+                    print '<a title='.$langs->trans("All").' alt='.$langs->trans("All").' href="perms.php?id='.$object->id.'&amp;action=addrights&amp;module='.$obj->module.'#'.$objMod->getName().'">'.$langs->trans("All")."</a>";
                     print '/';
-                    print '<a title='.$langs->trans("None").' alt='.$langs->trans("None").' href="perms.php?id='.$fgroup->id.'&amp;action=delrights&amp;module='.$obj->module.'#'.$objMod->getName().'">'.$langs->trans("None")."</a>";
+                    print '<a title='.$langs->trans("None").' alt='.$langs->trans("None").' href="perms.php?id='.$object->id.'&amp;action=delrights&amp;module='.$obj->module.'#'.$objMod->getName().'">'.$langs->trans("None")."</a>";
                     print '</td>';
                     print '<td colspan="2">&nbsp;</td>';
                     print '</tr>';
@@ -299,7 +298,7 @@ if ($id)
                 // Own permission by group
                 if ($caneditperms)
                 {
-                    print '<td align="center"><a class="reposition" href="perms.php?id='.$fgroup->id.'&amp;action=delrights&amp;rights='.$obj->id.'">'.img_edit_remove($langs->trans("Remove")).'</a></td>';
+                    print '<td align="center"><a class="reposition" href="perms.php?id='.$object->id.'&amp;action=delrights&amp;rights='.$obj->id.'">'.img_edit_remove($langs->trans("Remove")).'</a></td>';
                 }
                 print '<td align="center">';
                 print img_picto($langs->trans("Active"),'tick');
@@ -310,7 +309,7 @@ if ($id)
                 // Do not own permission
                 if ($caneditperms)
                 {
-                    print '<td align="center"><a class="reposition" href="perms.php?id='.$fgroup->id.'&amp;action=addrights&amp;rights='.$obj->id.'">'.img_edit_add($langs->trans("Add")).'</a></td>';
+                    print '<td align="center"><a class="reposition" href="perms.php?id='.$object->id.'&amp;action=addrights&amp;rights='.$obj->id.'">'.img_edit_add($langs->trans("Add")).'</a></td>';
                 }
                 print '<td>&nbsp</td>';
             }
@@ -324,6 +323,10 @@ if ($id)
         }
     }
     print '</table>';
+    
+    print '</div>';
+    
+    dol_fiche_end();
 }
 
 llxFooter();

From cf04e5a6e0c7bb501d31f970e81bfa88ae357162 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 9 May 2017 10:45:49 +0200
Subject: [PATCH 252/505] Fix duplicate id

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

diff --git a/htdocs/core/modules/modCollab.class.php b/htdocs/core/modules/modCollab.class.php
index 490caeccea2..506eb99b540 100644
--- a/htdocs/core/modules/modCollab.class.php
+++ b/htdocs/core/modules/modCollab.class.php
@@ -46,7 +46,7 @@ class modCollab extends DolibarrModules
 		// Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
 		// It is used to group modules in module setup page
         $this->family = "portal";
-        $this->module_position = 50;
+        $this->module_position = 51;
         // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
         $this->name = preg_replace('/^mod/i','',get_class($this));
         $this->description = "Enable the public collaboration features, like shared pad, shared online sheets, etc...";
@@ -87,7 +87,7 @@ class modCollab extends DolibarrModules
 
 		// Permissions
 		$this->rights = array();		// Permission array used by this module
-		$this->rights_class = 'websites';
+		$this->rights_class = 'collab';
 		$r=0;
 
 		/*$this->rights[$r][0] = 30001;

From 081d0e7ec25a17f89d60cf95504833bb75fafa3b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 9 May 2017 11:09:21 +0200
Subject: [PATCH 253/505] Debug module RH. Edition of user bank account is ok.

---
 htdocs/core/lib/usergroups.lib.php          |  2 +-
 htdocs/user/bank.php                        | 41 +++++++++++++--------
 htdocs/user/class/userbankaccount.class.php | 10 +++--
 3 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php
index 3b3cde1d66a..d983f799c0d 100644
--- a/htdocs/core/lib/usergroups.lib.php
+++ b/htdocs/core/lib/usergroups.lib.php
@@ -145,7 +145,7 @@ function user_prepare_head($object)
     {
 		// Bank
     	$head[$h][0] = DOL_URL_ROOT.'/user/bank.php?id='.$object->id;
-    	$head[$h][1] = $langs->trans("Bank");
+    	$head[$h][1] = $langs->trans("BankAccounts");
     	$head[$h][2] = 'bank';
     	$h++;
 	}
diff --git a/htdocs/user/bank.php b/htdocs/user/bank.php
index 9f36bc91e31..c86ca27bf34 100644
--- a/htdocs/user/bank.php
+++ b/htdocs/user/bank.php
@@ -38,7 +38,9 @@ $langs->load("banks");
 $langs->load("bills");
 
 $id = GETPOST('id','int');
-$action = GETPOST("action");
+$bankid = GETPOST('bankid','int');
+$action = GETPOST("action",'alpha');
+$cancel = GETPOST('cancel','alpha');
 
 // Security check
 $socid=0;
@@ -54,16 +56,17 @@ if ($id > 0 || ! empty($ref))
 	$object->getrights();
 }
 
+
 /*
  *	Actions
  */
 
-if ($action == 'update' && ! $_POST["cancel"])
+if ($action == 'update' && ! $cancel)
 {
 	// Modification
 	$account = new UserBankAccount($db);
 
-    $account->fetch($id);
+    $account->fetch($bankid);
 
     $account->userid          = $object->id;
 
@@ -82,54 +85,62 @@ if ($action == 'update' && ! $_POST["cancel"])
 	$account->owner_address   = $_POST["owner_address"];
 
 	$result = $account->update($user);
-	if (! $result)
+
+    if (! $result)
 	{
 		setEventMessages($account->error, $account->errors, 'errors');
-		$_GET["action"]='edit';     // Force chargement page edition
+		$action='edit';     // Force chargement page edition
 	}
 	else
 	{
-		$url=DOL_URL_ROOT.'/user/bank.php?id='.$object->id;
+		$url=DOL_URL_ROOT.'/user/bank.php?id='.$object->id.'&bankid='.$bankid;
         header('Location: '.$url);
         exit;
 	}
 }
 
+
 /*
  *	View
  */
 
 $form = new Form($db);
 
-llxHeader();
+llxHeader(null, $langs->trans("BankAccounts"));
 
 $head = user_prepare_head($object);
 
 $account = new UserBankAccount($db);
-if (! $id)
-    $account->fetch(0,$object->id);
+if (! $bankid)
+{
+    $account->fetch(0, '', $id);
+}
 else
-    $account->fetch($id);
+{
+    $account->fetch($bankid);
+}
 if (empty($account->userid)) $account->userid=$object->id;
 
 
-if ($id && $action == 'edit' && $user->rights->user->user->creer)
+if ($bankid && $action == 'edit' && $user->rights->user->user->creer)
 {
     print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'" method="post">';
     print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
     print '<input type="hidden" name="action" value="update">';
     print '<input type="hidden" name="id" value="'.GETPOST("id",'int').'">';
+    print '<input type="hidden" name="bankid" value="'.$bankid.'">';
 }
-if ($id && $action == 'create' && $user->rights->user->user->creer)
+if ($bankid && $action == 'create' && $user->rights->user->user->creer)
 {
     print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'" method="post">';
     print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
     print '<input type="hidden" name="action" value="add">';
+    print '<input type="hidden" name="bankid" value="'.$bankid.'">';
 }
 
 
 // View
-if ($id && $action != 'edit')
+if ($account->id && $action != 'edit')
 {
 	$title = $langs->trans("User");
 	dol_fiche_head($head, 'bank', $title, -1, 'user');
@@ -223,7 +234,7 @@ if ($id && $action != 'edit')
 
 	if ($user->rights->user->user->creer)
 	{
-		print '<a class="butAction" href="bank.php?id='.$object->id.'&amp;action=edit">'.$langs->trans("Edit").'</a>';
+		print '<a class="butAction" href="bank.php?id='.$object->id.'&bankid='.$account->id.'&action=edit">'.$langs->trans("Edit").'</a>';
 	}
 
 	print '</div>';
@@ -309,8 +320,6 @@ if ($id && $action == 'edit' && $user->rights->user->user->creer)
     print '</div>';
 }
 
-if ($id && $action == 'edit' && $user->rights->user->user->creer) print '</form>';
-
 if ($id && $action == 'edit' && $user->rights->user->user->creer) print '</form>';
     
 llxFooter();
diff --git a/htdocs/user/class/userbankaccount.class.php b/htdocs/user/class/userbankaccount.class.php
index 514e8d0b28c..a7aba35fc64 100644
--- a/htdocs/user/class/userbankaccount.class.php
+++ b/htdocs/user/class/userbankaccount.class.php
@@ -132,16 +132,20 @@ class UserBankAccount extends Account
      * 	Load record from database
      *
      *	@param	int		$id			Id of record
+     *	@param	string	$ref		Ref of record
+     *  @param  int     $userid     User id
      * 	@return	int					<0 if KO, >0 if OK
      */
-    function fetch($id)
+    function fetch($id, $ref='', $userid=0)
     {
-        if (empty($id)) return -1;
+        if (empty($id) && empty($ref) && empty($userid)) return -1;
 
         $sql = "SELECT rowid, fk_user, entity, bank, number, code_banque, code_guichet, cle_rib, bic, iban_prefix as iban, domiciliation, proprio,";
         $sql.= " owner_address, label, datec, tms as datem";
         $sql.= " FROM ".MAIN_DB_PREFIX."user_rib";
-        $sql.= " WHERE rowid = ".$id;
+        if ($id) $sql.= " WHERE rowid = ".$id;
+        if ($ref) $sql.= " WHERE label = '".$this->db->escape($ref)."'";
+        if ($userid) $sql.= " WHERE fk_user = '".$userid."'";
 
         $resql = $this->db->query($sql);
         if ($resql)

From 2b7dcfa56df90332ae589123177fd8e663cb358b Mon Sep 17 00:00:00 2001
From: Laurent Dinclaux <laurent@gecka.nc>
Date: Tue, 9 May 2017 21:07:32 +1100
Subject: [PATCH 254/505] Add missing vat_src_code field to predefined invoices
 table

---
 htdocs/install/mysql/migration/4.0.0-5.0.0.sql     | 1 +
 htdocs/install/mysql/tables/llx_facturedet_rec.sql | 1 +
 2 files changed, 2 insertions(+)

diff --git a/htdocs/install/mysql/migration/4.0.0-5.0.0.sql b/htdocs/install/mysql/migration/4.0.0-5.0.0.sql
index afda09aa785..8835f535d14 100644
--- a/htdocs/install/mysql/migration/4.0.0-5.0.0.sql
+++ b/htdocs/install/mysql/migration/4.0.0-5.0.0.sql
@@ -161,6 +161,7 @@ ALTER TABLE llx_c_payment_term change fdm type_cdr tinyint;
 
 
 ALTER TABLE llx_facturedet ADD COLUMN vat_src_code varchar(10) DEFAULT '' AFTER tva_tx;
+ALTER TABLE llx_facturedet_rec ADD COLUMN vat_src_code varchar(10) DEFAULT '' AFTER tva_tx;
 ALTER TABLE llx_facture_fourn_det ADD COLUMN vat_src_code varchar(10) DEFAULT '' AFTER tva_tx;
 ALTER TABLE llx_commandedet ADD COLUMN vat_src_code varchar(10) DEFAULT '' AFTER tva_tx;
 ALTER TABLE llx_commande_fournisseurdet ADD COLUMN vat_src_code varchar(10) DEFAULT '' AFTER tva_tx;
diff --git a/htdocs/install/mysql/tables/llx_facturedet_rec.sql b/htdocs/install/mysql/tables/llx_facturedet_rec.sql
index cea176b2aa8..8b2c70b09f7 100644
--- a/htdocs/install/mysql/tables/llx_facturedet_rec.sql
+++ b/htdocs/install/mysql/tables/llx_facturedet_rec.sql
@@ -29,6 +29,7 @@ create table llx_facturedet_rec
   product_type		integer DEFAULT 0,
   label				varchar(255) DEFAULT NULL,
   description		text,
+  vat_src_code					varchar(10)  DEFAULT '',			-- Vat code used as source of vat fields. Not strict foreign key here.
   tva_tx			double(6,3),	             	-- taux tva
   localtax1_tx      double(6,3) DEFAULT 0,    		-- localtax1 rate
   localtax1_type	varchar(10) NULL, 				-- localtax1 type

From dbcb60433b5ca60bdb7d50d1a61fcf899edda716 Mon Sep 17 00:00:00 2001
From: Ferran Marcet <fmarcet@2byte.es>
Date: Tue, 9 May 2017 13:31:20 +0200
Subject: [PATCH 255/505] FIX: Correction with author and validator user on
 orders

---
 htdocs/commande/class/commande.class.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 7c4176edac8..0ee6c49a485 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -9,7 +9,7 @@
  * Copyright (C) 2012      Cedric Salvador      <csalvador@gpcsolutions.fr>
  * Copyright (C) 2013      Florian Henry		<florian.henry@open-concept.pro>
  * Copyright (C) 2014-2015 Marcos García        <marcosgdf@gmail.com>
- * Copyright (C) 2016      Ferran Marcet        <fmarcet@2byte.es>
+ * Copyright (C) 2016-2017 Ferran Marcet        <fmarcet@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
@@ -134,6 +134,7 @@ class Commande extends CommonOrder
     var $linked_objects=array();
 
     var $user_author_id;
+    var $user_valid;
 
 	/**
 	 * @var OrderLine[]
@@ -1460,7 +1461,7 @@ class Commande extends CommonOrder
         // Check parameters
         if (empty($id) && empty($ref) && empty($ref_ext) && empty($ref_int)) return -1;
 
-        $sql = 'SELECT c.rowid, c.date_creation, c.ref, c.fk_soc, c.fk_user_author, c.fk_statut';
+        $sql = 'SELECT c.rowid, c.date_creation, c.ref, c.fk_soc, c.fk_user_author, c.fk_user_valid, c.fk_statut';
         $sql.= ', c.amount_ht, c.total_ht, c.total_ttc, c.tva as total_tva, c.localtax1 as total_localtax1, c.localtax2 as total_localtax2, c.fk_cond_reglement, c.fk_mode_reglement, c.fk_availability, c.fk_input_reason';
         $sql.= ', c.fk_account';
         $sql.= ', c.date_commande';
@@ -1502,6 +1503,7 @@ class Commande extends CommonOrder
                 $this->socid				= $obj->fk_soc;
                 $this->statut				= $obj->fk_statut;
                 $this->user_author_id		= $obj->fk_user_author;
+                $this->user_valid           = $obj->fk_user_valid;
                 $this->total_ht				= $obj->total_ht;
                 $this->total_tva			= $obj->total_tva;
                 $this->total_localtax1		= $obj->total_localtax1;
@@ -2692,8 +2694,8 @@ class Commande extends CommonOrder
 		$sql.= " total_ht=".(isset($this->total_ht)?$this->total_ht:"null").",";
 		$sql.= " total_ttc=".(isset($this->total_ttc)?$this->total_ttc:"null").",";
 		$sql.= " fk_statut=".(isset($this->statut)?$this->statut:"null").",";
-		$sql.= " fk_user_author=".(isset($this->user_author)?$this->user_author:"null").",";
-		$sql.= " fk_user_valid=".(isset($this->fk_user_valid)?$this->fk_user_valid:"null").",";
+		$sql.= " fk_user_author=".(isset($this->user_author_id)?$this->user_author_id:"null").",";
+		$sql.= " fk_user_valid=".(isset($this->user_valid)?$this->user_valid:"null").",";
 		$sql.= " fk_projet=".(isset($this->fk_project)?$this->fk_project:"null").",";
 		$sql.= " fk_cond_reglement=".(isset($this->cond_reglement_id)?$this->cond_reglement_id:"null").",";
 		$sql.= " fk_mode_reglement=".(isset($this->mode_reglement_id)?$this->mode_reglement_id:"null").",";

From 6cac627117974495ebc0687a6dce55ee2a87fe4d Mon Sep 17 00:00:00 2001
From: Laurent Dinclaux <laurent@gecka.nc>
Date: Tue, 9 May 2017 23:19:16 +1100
Subject: [PATCH 256/505] Add support for localtaxes to predefined invoices

---
 .../facture/class/facture-rec.class.php       | 94 ++++++++++++++++---
 htdocs/compta/facture/fiche-rec.php           | 20 +++-
 htdocs/filefunc.inc.php                       |  2 +-
 3 files changed, 98 insertions(+), 18 deletions(-)

diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php
index 41c1171ccef..390e9999454 100644
--- a/htdocs/compta/facture/class/facture-rec.class.php
+++ b/htdocs/compta/facture/class/facture-rec.class.php
@@ -169,11 +169,16 @@ class FactureRec extends CommonInvoice
 				$num=count($facsrc->lines);
 				for ($i = 0; $i < $num; $i++)
 				{
-                    $result_insert = $this->addline(
+					$tva_tx = $facsrc->lines[$i]->tva_tx;
+					if (! empty($facsrc->lines[$i]->vat_src_code) && ! preg_match('/\(/', $tva_tx)) $tva_tx .= ' ('.$facsrc->lines[$i]->vat_src_code.')';
+
+					$result_insert = $this->addline(
                         $facsrc->lines[$i]->desc,
                         $facsrc->lines[$i]->subprice,
                         $facsrc->lines[$i]->qty,
-                        $facsrc->lines[$i]->tva_tx,
+						$tva_tx,
+                        $facsrc->lines[$i]->localtax1_tx,
+                        $facsrc->lines[$i]->localtax2_tx,
                         $facsrc->lines[$i]->fk_product,
                         $facsrc->lines[$i]->remise_percent,
                         'HT',
@@ -243,7 +248,8 @@ class FactureRec extends CommonInvoice
 	 */
 	function fetch($rowid, $ref='', $ref_ext='', $ref_int='')
 	{
-		$sql = 'SELECT f.rowid, f.entity, f.titre, f.fk_soc, f.amount, f.tva, f.total, f.total_ttc, f.remise_percent, f.remise_absolue, f.remise';
+		$sql = 'SELECT f.rowid, f.entity, f.titre, f.fk_soc, f.amount, f.tva, f.localtax1, f.localtax2, f.total, f.total_ttc';
+		$sql.= ', f.remise_percent, f.remise_absolue, f.remise';
 		$sql.= ', f.date_lim_reglement as dlr';
 		$sql.= ', f.note_private, f.note_public, f.fk_user_author';
 		$sql.= ', f.fk_mode_reglement, f.fk_cond_reglement, f.fk_projet';
@@ -284,6 +290,8 @@ class FactureRec extends CommonInvoice
 				$this->remise                 = $obj->remise;
 				$this->total_ht               = $obj->total;
 				$this->total_tva              = $obj->tva;
+				$this->total_localtax1        = $obj->localtax1;
+				$this->total_localtax2        = $obj->localtax2;
 				$this->total_ttc              = $obj->total_ttc;
 				$this->paye                   = $obj->paye;
 				$this->close_code             = $obj->close_code;
@@ -364,8 +372,8 @@ class FactureRec extends CommonInvoice
 	{
 		$this->lines=array();
 
-		$sql = 'SELECT l.rowid, l.fk_product, l.product_type, l.label as custom_label, l.description, l.product_type, l.price, l.qty, l.tva_tx, ';
-		$sql.= ' l.remise, l.remise_percent, l.subprice,';
+		$sql = 'SELECT l.rowid, l.fk_product, l.product_type, l.label as custom_label, l.description, l.product_type, l.price, l.qty, l.vat_src_code, l.tva_tx, ';
+		$sql.= ' l.localtax1_tx, l.localtax2_tx, l.localtax1_type, l.localtax2_type, l.remise, l.remise_percent, l.subprice,';
 		$sql.= ' l.info_bits, l.total_ht, l.total_tva, l.total_ttc,';
 		//$sql.= ' l.situation_percent, l.fk_prev_id,';
 		//$sql.= ' l.localtax1_tx, l.localtax2_tx, l.localtax1_type, l.localtax2_type, l.remise_percent, l.fk_remise_except, l.subprice,';
@@ -404,7 +412,13 @@ class FactureRec extends CommonInvoice
 				$line->fk_product_type  = $objp->fk_product_type;	// Type of product
 				$line->qty              = $objp->qty;
 				$line->subprice         = $objp->subprice;
+
+				$line->vat_src_code     = $objp->vat_src_code;
 				$line->tva_tx           = $objp->tva_tx;
+				$line->localtax1_tx     = $objp->localtax1_tx;
+				$line->localtax2_tx     = $objp->localtax2_tx;
+				$line->localtax1_type   = $objp->localtax1_type;
+				$line->localtax2_type   = $objp->localtax2_type;
 				$line->remise_percent   = $objp->remise_percent;
 				$line->fk_remise_except = $objp->fk_remise_except;
 				$line->fk_product       = $objp->fk_product;
@@ -506,29 +520,40 @@ class FactureRec extends CommonInvoice
      *	@param		string		$fk_unit			Unit
      *	@return    	int             				<0 if KO, Id of line if OK
 	 */
-	function addline($desc, $pu_ht, $qty, $txtva, $fk_product=0, $remise_percent=0, $price_base_type='HT', $info_bits=0, $fk_remise_except='', $pu_ttc=0, $type=0, $rang=-1, $special_code=0, $label='', $fk_unit=null)
+	function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1=0, $txlocaltax2=0, $fk_product=0, $remise_percent=0, $price_base_type='HT', $info_bits=0, $fk_remise_except='', $pu_ttc=0, $type=0, $rang=-1, $special_code=0, $label='', $fk_unit=null)
 	{
 	    global $mysoc;
 	    
 		$facid=$this->id;
 
-		dol_syslog(get_class($this)."::addline facid=$facid,desc=$desc,pu_ht=$pu_ht,qty=$qty,txtva=$txtva,fk_product=$fk_product,remise_percent=$remise_percent,info_bits=$info_bits,fk_remise_except=$fk_remise_except,price_base_type=$price_base_type,pu_ttc=$pu_ttc,type=$type,fk_unit=$fk_unit", LOG_DEBUG);
+		dol_syslog(get_class($this)."::addline facid=$facid,desc=$desc,pu_ht=$pu_ht,qty=$qty,txtva=$txtva,txlocaltax1=$txlocaltax1,txlocaltax2=$txlocaltax2,fk_product=$fk_product,remise_percent=$remise_percent,info_bits=$info_bits,fk_remise_except=$fk_remise_except,price_base_type=$price_base_type,pu_ttc=$pu_ttc,type=$type,fk_unit=$fk_unit", LOG_DEBUG);
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 
 		// Check parameters
 		if ($type < 0) return -1;
 
+		$localtaxes_type=getLocalTaxesFromRate($txtva, 0, $this->thirdparty, $mysoc);
+
+		// Clean vat code
+		$vat_src_code='';
+		if (preg_match('/\((.*)\)/', $txtva, $reg))
+		{
+			$vat_src_code = $reg[1];
+			$txtva = preg_replace('/\s*\(.*\)/', '', $txtva);    // Remove code into vatrate.
+		}
+
 		if ($this->brouillon)
 		{
 			// Clean parameters
 			$remise_percent=price2num($remise_percent);
 			if (empty($remise_percent)) $remise_percent=0;
 			$qty=price2num($qty);
-			if (! $qty) $qty=1;
 			if (! $info_bits) $info_bits=0;
 			$pu_ht=price2num($pu_ht);
 			$pu_ttc=price2num($pu_ttc);
 			$txtva=price2num($txtva);
+			$txlocaltax1	= price2num($txlocaltax1);
+			$txlocaltax2	= price2num($txlocaltax2);
 
 			if ($price_base_type=='HT')
 			{
@@ -543,10 +568,14 @@ class FactureRec extends CommonInvoice
 			// qty, pu, remise_percent et txtva
 			// TRES IMPORTANT: C'est au moment de l'insertion ligne qu'on doit stocker
 			// la part ht, tva et ttc, et ce au niveau de la ligne qui a son propre taux tva.
-			$tabprice=calcul_price_total($qty, $pu, $remise_percent, $txtva, 0, 0, 0, $price_base_type, $info_bits, $type, $mysoc);
+
+
+			$tabprice=calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type, $mysoc, $localtaxes_type);
 			$total_ht  = $tabprice[0];
 			$total_tva = $tabprice[1];
 			$total_ttc = $tabprice[2];
+			$total_localtax1=$tabprice[9];
+			$total_localtax2=$tabprice[10];
 			
 			$product_type=$type;
 			if ($fk_product)
@@ -563,6 +592,11 @@ class FactureRec extends CommonInvoice
 			$sql.= ", price";
 			$sql.= ", qty";
 			$sql.= ", tva_tx";
+			$sql.= ", vat_src_code";
+			$sql.= ", localtax1_tx";
+			$sql.= ", localtax1_type";
+			$sql.= ", localtax2_tx";
+			$sql.= ", localtax2_type";
 			$sql.= ", fk_product";
 			$sql.= ", product_type";
 			$sql.= ", remise_percent";
@@ -570,6 +604,8 @@ class FactureRec extends CommonInvoice
 			$sql.= ", remise";
 			$sql.= ", total_ht";
 			$sql.= ", total_tva";
+			$sql.= ", total_localtax1";
+			$sql.= ", total_localtax2";
 			$sql.= ", total_ttc";
 			$sql.= ", rang";
 			$sql.= ", special_code";
@@ -581,6 +617,11 @@ class FactureRec extends CommonInvoice
 			$sql.= ", ".price2num($pu_ht);
 			$sql.= ", ".price2num($qty);
 			$sql.= ", ".price2num($txtva);
+			$sql.= ", '".$this->db->escape($vat_src_code)."'";
+			$sql.= ", ".price2num($txlocaltax1);
+			$sql.= ", '".$this->db->escape($localtaxes_type[0])."'";
+			$sql.= ", ".price2num($txlocaltax2);
+			$sql.= ", '".$this->db->escape($localtaxes_type[2])."'";
 			$sql.= ", ".(! empty($fk_product)?"'".$fk_product."'":"null");
 			$sql.= ", ".$product_type;
 			$sql.= ", ".price2num($remise_percent);
@@ -588,6 +629,8 @@ class FactureRec extends CommonInvoice
 			$sql.= ", null";
 			$sql.= ", ".price2num($total_ht);
 			$sql.= ", ".price2num($total_tva);
+			$sql.= ", ".price2num($total_localtax1);
+			$sql.= ", ".price2num($total_localtax2);
 			$sql.= ", ".price2num($total_ttc);
 			$sql.= ", ".$rang;
 			$sql.= ", ".$special_code;
@@ -629,28 +672,39 @@ class FactureRec extends CommonInvoice
 	 *	@param		string		$fk_unit			Unit
 	 *	@return    	int             				<0 if KO, Id of line if OK
 	 */
-	function updateline($rowid, $desc, $pu_ht, $qty, $txtva, $fk_product=0, $remise_percent=0, $price_base_type='HT', $info_bits=0, $fk_remise_except='', $pu_ttc=0, $type=0, $rang=-1, $special_code=0, $label='', $fk_unit=null)
+	function updateline($rowid, $desc, $pu_ht, $qty, $txtva, $txlocaltax1=0, $txlocaltax2=0, $fk_product=0, $remise_percent=0, $price_base_type='HT', $info_bits=0, $fk_remise_except='', $pu_ttc=0, $type=0, $rang=-1, $special_code=0, $label='', $fk_unit=null)
 	{
 	    global $mysoc;
 	     
 	    $facid=$this->id;
 	
-	    dol_syslog(get_class($this)."::updateline facid=".$facid." rowid=$rowid,desc=$desc,pu_ht=$pu_ht,qty=$qty,txtva=$txtva,fk_product=$fk_product,remise_percent=$remise_percent,info_bits=$info_bits,fk_remise_except=$fk_remise_except,price_base_type=$price_base_type,pu_ttc=$pu_ttc,type=$type,fk_unit=$fk_unit", LOG_DEBUG);
+	    dol_syslog(get_class($this)."::updateline facid=".$facid." rowid=$rowid,desc=$desc,pu_ht=$pu_ht,qty=$qty,txtva=$txtva,txlocaltax1=$txlocaltax1,txlocaltax2=$txlocaltax2,fk_product=$fk_product,remise_percent=$remise_percent,info_bits=$info_bits,fk_remise_except=$fk_remise_except,price_base_type=$price_base_type,pu_ttc=$pu_ttc,type=$type,fk_unit=$fk_unit", LOG_DEBUG);
 	    include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 	
 	    // Check parameters
 	    if ($type < 0) return -1;
-	
+
+		$localtaxes_type=getLocalTaxesFromRate($txtva, 0, $this->thirdparty, $mysoc);
+
+		// Clean vat code
+		$vat_src_code='';
+		if (preg_match('/\((.*)\)/', $txtva, $reg))
+		{
+			$vat_src_code = $reg[1];
+			$txtva = preg_replace('/\s*\(.*\)/', '', $txtva);    // Remove code into vatrate.
+		}
+
 	    if ($this->brouillon)
 	    {
 	        // Clean parameters
 	        $remise_percent=price2num($remise_percent);
 	        $qty=price2num($qty);
-	        if (! $qty) $qty=1;
 	        if (! $info_bits) $info_bits=0;
 	        $pu_ht=price2num($pu_ht);
 	        $pu_ttc=price2num($pu_ttc);
 	        $txtva=price2num($txtva);
+		    $txlocaltax1	= price2num($txlocaltax1);
+		    $txlocaltax2	= price2num($txlocaltax2);
 	
 	        if ($price_base_type=='HT')
 	        {
@@ -665,10 +719,13 @@ class FactureRec extends CommonInvoice
 	        // qty, pu, remise_percent et txtva
 	        // TRES IMPORTANT: C'est au moment de l'insertion ligne qu'on doit stocker
 	        // la part ht, tva et ttc, et ce au niveau de la ligne qui a son propre taux tva.
-	        $tabprice=calcul_price_total($qty, $pu, $remise_percent, $txtva, 0, 0, 0, $price_base_type, $info_bits, $type, $mysoc);
+	        $tabprice=calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type, $mysoc, $localtaxes_type);
+
 	        $total_ht  = $tabprice[0];
 	        $total_tva = $tabprice[1];
 	        $total_ttc = $tabprice[2];
+		    $total_localtax1=$tabprice[9];
+		    $total_localtax2=$tabprice[10];
 	        	
 	        $product_type=$type;
 	        if ($fk_product)
@@ -685,18 +742,25 @@ class FactureRec extends CommonInvoice
 	        $sql.= ", price=".price2num($pu_ht);
 	        $sql.= ", qty=".price2num($qty);
 	        $sql.= ", tva_tx=".price2num($txtva);
+	        $sql.= ", vat_src_code='".$this->db->escape($vat_src_code)."'";
+		    $sql.= ", localtax1_tx=".price2num($txlocaltax1);
+		    $sql.= ", localtax1_type='".$this->db->escape($localtaxes_type[0])."'";
+		    $sql.= ", localtax2_tx=".price2num($txlocaltax2);
+		    $sql.= ", localtax2_type='".$this->db->escape($localtaxes_type[2])."'";
 	        $sql.= ", fk_product=".(! empty($fk_product)?"'".$fk_product."'":"null");
 	        $sql.= ", product_type=".$product_type;
 	        $sql.= ", remise_percent='".price2num($remise_percent)."'";
 	        $sql.= ", subprice='".price2num($pu_ht)."'";
 	        $sql.= ", total_ht='".price2num($total_ht)."'";
 	        $sql.= ", total_tva='".price2num($total_tva)."'";
+	        $sql.= ", total_localtax1='".price2num($total_localtax1)."'";
+	        $sql.= ", total_localtax2='".price2num($total_localtax2)."'";
 	        $sql.= ", total_ttc='".price2num($total_ttc)."'";
 	        $sql.= ", rang=".$rang;
 	        $sql.= ", special_code=".$special_code;
 	        $sql.= ", fk_unit=".($fk_unit?"'".$this->db->escape($fk_unit)."'":"null");
 	        $sql.= " WHERE rowid = ".$rowid;
-	        
+
 	        dol_syslog(get_class($this)."::updateline", LOG_DEBUG);
 	        if ($this->db->query($sql))
 	        {
diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php
index 4adfc24b4dc..d04b4b9e8e6 100644
--- a/htdocs/compta/facture/fiche-rec.php
+++ b/htdocs/compta/facture/fiche-rec.php
@@ -612,7 +612,7 @@ if (empty($reshook))
     	else
     	{
     		// Insert line
-    		$result = $object->addline($desc, $pu_ht, $qty, $tva_tx, $idprod, $remise_percent, $price_base_type, $info_bits, '', $pu_ttc, $type, - 1, $special_code, $label, $fk_unit);
+    		$result = $object->addline($desc, $pu_ht, $qty, $tva_tx,$localtax1_tx, $localtax2_tx, $idprod, $remise_percent, $price_base_type, $info_bits, '', $pu_ttc, $type, - 1, $special_code, $label, $fk_unit);
 
     		if ($result > 0)
     		{
@@ -784,7 +784,9 @@ if (empty($reshook))
     			$description,
     			$pu_ht,
     			$qty,
-                    	$vat_rate,
+			    $vat_rate,
+			    $localtax1_rate,
+			    $localtax1_rate,
     			GETPOST('productid'),
     			GETPOST('remise_percent'),
     			'HT',
@@ -1180,9 +1182,23 @@ else
 
 		print '<tr><td>'.$langs->trans("AmountVAT").'</td><td colspan="3">'.price($object->total_tva,'',$langs,1,-1,-1,$conf->currency).'</td>';
 		print '</tr>';
+
+		// Amount Local Taxes
+		if (($mysoc->localtax1_assuj == "1" && $mysoc->useLocalTax(1)) || $object->total_localtax1 != 0) 	// Localtax1
+		{
+			print '<tr><td>' . $langs->transcountry("AmountLT1", $mysoc->country_code) . '</td>';
+			print '<td class="nowrap">' . price($object->total_localtax1, 1, '', 1, - 1, - 1, $conf->currency) . '</td></tr>';
+		}
+		if (($mysoc->localtax2_assuj == "1" && $mysoc->useLocalTax(2)) || $object->total_localtax2 != 0) 	// Localtax2
+		{
+			print '<tr><td>' . $langs->transcountry("AmountLT2", $mysoc->country_code) . '</td>';
+			print '<td class=nowrap">' . price($object->total_localtax2, 1, '', 1, - 1, - 1, $conf->currency) . '</td></tr>';
+		}
+
 		print '<tr><td>'.$langs->trans("AmountTTC").'</td><td colspan="3">'.price($object->total_ttc,'',$langs,1,-1,-1,$conf->currency).'</td>';
 		print '</tr>';
 
+
 		// Payment term
 		print '<tr><td>';
 		print '<table class="nobordernopadding" width="100%"><tr><td>';
diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php
index 427f428d652..b3d7fca0726 100644
--- a/htdocs/filefunc.inc.php
+++ b/htdocs/filefunc.inc.php
@@ -31,7 +31,7 @@
  */
 
 if (! defined('DOL_APPLICATION_TITLE')) define('DOL_APPLICATION_TITLE','Dolibarr');
-if (! defined('DOL_VERSION')) define('DOL_VERSION','5.0.2');                         // a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c
+if (! defined('DOL_VERSION')) define('DOL_VERSION','5.0.3');                         // a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c
 
 if (! defined('EURO')) define('EURO',chr(128));
 

From 651ea926571ecc954c2caa3c5a109d7462e94945 Mon Sep 17 00:00:00 2001
From: alexis portable <alexis@atm-consulting.fr>
Date: Tue, 9 May 2017 14:26:47 +0200
Subject: [PATCH 257/505] NEW fix listview class and add a demo for product
 list

---
 htdocs/product/inventory/listview.class.php | 221 +++---
 htdocs/product/list-with-listview.php       | 702 ++++++++++++++++++++
 2 files changed, 834 insertions(+), 89 deletions(-)
 create mode 100644 htdocs/product/list-with-listview.php

diff --git a/htdocs/product/inventory/listview.class.php b/htdocs/product/inventory/listview.class.php
index 51855629686..1c03d0b524f 100644
--- a/htdocs/product/inventory/listview.class.php
+++ b/htdocs/product/inventory/listview.class.php
@@ -39,6 +39,8 @@ class Listview
 		$this->form = null;
 		$this->totalRowToShow=0;
 		$this->totalRow=0;
+		
+		$this->TField=array();
 	}
 
     /**
@@ -70,14 +72,15 @@ class Listview
 			,'head_search'=>''
 			,'export'=>array()
 			,'view_type'=>''
+			,'massactions'=>array()
 		),$TParam['list']);
 		
 		if (empty($TParam['limit'])) $TParam['limit'] = array();
 		
 		$page = GETPOST('page');
-		if (!empty($page)) $TParam['limit']['page'] = $page+1; // TODO dolibarr start page at 0 instead 1
+		if (!empty($page)) $TParam['limit']['page'] = $page;
 		
-		$TParam['limit'] = array_merge(array('page'=>1, 'nbLine' => $conf->liste_limit, 'global'=>0), $TParam['limit']);
+		$TParam['limit'] = array_merge(array('page'=>0, 'nbLine' => $conf->liste_limit, 'global'=>0), $TParam['limit']);
 		
 		if (GETPOST('sortfield'))
 		{
@@ -137,17 +140,6 @@ class Listview
 		
 		return $TKey;
 	}
-
-    /**
-     * @param timestamp    $date   date to convert
-     * @return int|string   Date TMS or ''
-     */
-    private function dateToSQLDate($date)
-    {
-		return $this->db->idate($date);
-	}
-
-
     /**
      * @param string     $TSQLMore   contain some additional sql instructions
      * @param string    $value      date with read format
@@ -160,13 +152,11 @@ class Listview
 			$TSQLDate=array();
 			if(!empty($value['start']))
 			{
-//				$valueDeb = $this->dateToSQLDate($value['start'].' 00:00:00');
 				$TSQLDate[]=$sKey." >= '".$value['start']."'" ;
 			}
 
 			if(!empty($value['end']))
 			{
-//				$valueFin = $this->dateToSQLDate($value['end'].' 23:59:59');
 				$TSQLDate[]=$sKey." <= '".$value['end']."'" ;
 			}
 
@@ -174,7 +164,6 @@ class Listview
 		}
 		else
 		{
-//			$value = $this->dateToSQLDate($value);
 			$TSQLMore[]=$sKey." LIKE '".$value."%'" ;
 		}
 	}
@@ -227,9 +216,7 @@ class Listview
      */
     private function search($sql, &$TParam)
     {
-		$ListPOST = GETPOST('Listview');
-		
-		if (!GETPOST("button_removefilter_x") && !GETPOST("button_removefilter.x") && !GETPOST("button_removefilter"))
+		if (empty($TParam['no-auto-sql-search']) && !GETPOST("button_removefilter_x") && !GETPOST("button_removefilter.x") && !GETPOST("button_removefilter"))
 		{
 			foreach ($TParam['search'] as $field => $info)
 			{
@@ -237,12 +224,14 @@ class Listview
 				$TSQLMore = array();
 				$allow_is_null = $this->getSearchNull($field,$TParam);
 				
+				$fieldname = !empty($info['fieldname']) ? $info['fieldname'] : 'Listview_'.$this->id.'_search_'.$field;
+				
 				foreach ($TsKey as $i => &$sKey)
 				{
-					$value = '';
-					if (isset($ListPOST[$this->id]['search'][$field])) $value = $ListPOST[$this->id]['search'][$field];
+					$value = GETPOST($fieldname);
+					$value_null = GETPOST('Listview_'.$this->id.'_search_on_null_'.$field);
 					
-					if ($allow_is_null && !empty($ListPOST[$this->id]['search_on_null'][$field]))
+					if ($allow_is_null && !empty($value_null))
 					{
 						$TSQLMore[] = $sKey.' IS NULL ';
 						$value = '';
@@ -250,7 +239,7 @@ class Listview
 					
 					if (isset($TParam['type'][$field]) && ($TParam['type'][$field]==='date' || $TParam['type'][$field]==='datetime'))
 					{
-						$k = 'Listview_'.$this->id.'_search_'.$field;
+						$k = $fieldname;
 						if ($info['search_type'] === 'calendars')
 						{
 							$value = array();
@@ -296,25 +285,22 @@ class Listview
     {
         global $conf;
         
-		$TField=array();
+        $TField= & $this->TField;
 		
 		$this->init($TParam);
 
         $THeader = $this->initHeader($TParam);
 		
 		$sql = $this->search($sql,$TParam);
-		$sql.= $this->db->order($TParam['param']['sortfield'], $TParam['param']['sortorder']);
-
-		$nbtotalofrecords = '';
+		$sql.= $this->db->order($TParam['sortfield'], $TParam['sortorder']);
+	
 		if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 		{
 		    $result = $this->db->query($sql);
-		    $nbtotalofrecords = $this->db->num_rows($result);
+		    $this->totalRow = $this->db->num_rows($result);
 		}
-		$sql.= $this->db->plimit($TParam['param']['limit'] + 1, $TParam['param']['offset']);
 		
 		$this->parse_sql($THeader, $TField, $TParam, $sql);
-		
 		list($TTotal, $TTotalGroup)=$this->get_total($TField, $TParam);
 		
 		return $this->renderList($THeader, $TField, $TTotal, $TTotalGroup, $TParam);
@@ -335,44 +321,42 @@ class Listview
 		
 		$nb_search_in_bar = 0;
 		
-		if(!empty($TParam['search']))
+		foreach($THeader as $key => $libelle)
 		{
-			foreach($THeader as $key => $libelle)
-			{
-				if(empty($TSearch[$key]))$TSearch[$key]='';
-			}
-		}	
+			if(empty($TSearch[$key]))$TSearch[$key]='';
+		}
 		
-		$ListPOST = GETPOST('Listview');
 		$removeFilter = (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter"));
 		foreach($TParam['search'] as $key => $param_search)
 		{
-			$value = isset($ListPOST[$this->id]['search'][$key]) ? $ListPOST[$this->id]['search'][$key] : '';
 			if ($removeFilter) $value = '';
 			
 			$typeRecherche = (is_array($param_search) && isset($param_search['search_type'])) ? $param_search['search_type'] : $param_search;  
 			
+			$fieldname = !empty($param_search['fieldname']) ? $param_search['fieldname'] : 'Listview_'.$this->id.'_search_'.$key;
+			$value = $removeFilter ? '' : GETPOST($fieldname);
+			
 			if(is_array($typeRecherche))
 			{
-				$fsearch=$form->selectarray('Listview['.$this->id.'][search]['.$key.']', $typeRecherche,$value,1);
+				$fsearch=$form->selectarray($fieldname, $typeRecherche,$value,1);
 			}
 			else if($typeRecherche==='calendar')
 			{
-				if (!$removeFilter) $value = GETPOST('Listview_'.$this->id.'_search_'.$key) ? mktime(0,0,0, (int) GETPOST('Listview_'.$this->id.'_search_'.$key.'month'), (int) GETPOST('Listview_'.$this->id.'_search_'.$key.'day'), (int) GETPOST('Listview_'.$this->id.'_search_'.$key.'year') ) : '';
+				if (!$removeFilter) $value = GETPOST($fieldname) ? mktime(0,0,0, (int) GETPOST($fieldname.'month'), (int) GETPOST($fieldname.$key.'day'), (int) GETPOST($fieldname.'year') ) : '';
 				
-				$fsearch = $form->select_date($value, 'Listview_'.$this->id.'_search_'.$key,0, 0, 1, "", 1, 0, 1);
+				$fsearch = $form->select_date($value, $fieldname,0, 0, 1, "", 1, 0, 1);
 			}
 			else if($typeRecherche==='calendars')
 			{
 				$value_start = $value_end = '';
 				if (!$removeFilter)
 				{
-					$value_start = GETPOST('Listview_'.$this->id.'_search_'.$key.'_start') ? mktime(0,0,0, (int) GETPOST('Listview_'.$this->id.'_search_'.$key.'_startmonth'), (int) GETPOST('Listview_'.$this->id.'_search_'.$key.'_startday'), (int) GETPOST('Listview_'.$this->id.'_search_'.$key.'_startyear') ) : '';
-					$value_end = GETPOST('Listview_'.$this->id.'_search_'.$key.'_end') ? mktime(0,0,0, (int) GETPOST('Listview_'.$this->id.'_search_'.$key.'_endmonth'), (int) GETPOST('Listview_'.$this->id.'_search_'.$key.'_endday'), (int) GETPOST('Listview_'.$this->id.'_search_'.$key.'_endyear') ) : '';
+					$value_start = GETPOST($fieldname.'_start') ? mktime(0,0,0, (int) GETPOST($fieldname.'_startmonth'), (int) GETPOST($fieldname.'_startday'), (int) GETPOST($fieldname.'_startyear') ) : '';
+					$value_end = GETPOST($fieldname.'_end') ? mktime(0,0,0, (int) GETPOST($fieldname.'_endmonth'), (int) GETPOST($fieldname.'_endday'), (int) GETPOST($fieldname.'_endyear') ) : '';
 				}
 			
-				$fsearch = $form->select_date($value_start, 'Listview_'.$this->id.'_search_'.$key.'_start',0, 0, 1, "", 1, 0, 1)
-						 . $form->select_date($value_end, 'Listview_'.$this->id.'_search_'.$key.'_end',0, 0, 1, "", 1, 0, 1);
+				$fsearch = $form->select_date($value_start,$fieldname.'_start',0, 0, 1, "", 1, 0, 1)
+				. $form->select_date($value_end, $fieldname.'_end',0, 0, 1, "", 1, 0, 1);
 				
 			}
 			else if(is_string($typeRecherche))
@@ -381,13 +365,13 @@ class Listview
 			}
 			else
             {
-				$fsearch='<input type="text" name="Listview['.$this->id.'][search]['.$key.']" id="Listview['.$this->id.'][search]['.$key.']" value="'.$value.'" size="15" />';
+            	$fsearch='<input type="text" name="'.$fieldname.'" id="'.$fieldname.'" value="'.$value.'" size="10" />';
 			}
 
 			if(!empty($param_search['allow_is_null']))
 			{
-				$valueNull = isset($ListPOST[$this->id]['search_on_null'][$key]) ? 1 : 0;
-				$fsearch.=' '.$form->checkbox1('', 'Listview['.$this->id.'][search_on_null]['.$key.']',1, $valueNull,' onclick=" if($(this).is(\':checked\')){ $(this).prev().val(\'\'); }" ').img_help(1, $langs->trans('SearchOnNUllValue'));
+				$valueNull = GETPOST($fieldname.'search_on_null_'.$key) ? 1 : 0;
+				$fsearch.=' '.$form->checkbox1('', $fieldname.'search_on_null_'.$key,1, $valueNull,' onclick=" if($(this).is(\':checked\')){ $(this).prev().val(\'\'); }" ').img_help(1, $langs->trans('SearchOnNUllValue'));
 			}
 
 			if(!empty($THeader[$key]))
@@ -395,20 +379,10 @@ class Listview
 				$TSearch[$key] = $fsearch;
 				$nb_search_in_bar++;
 			}
-			else
-            {
-				$label = !empty($TParam['title'][$key]) ? $TParam['title'][$key] : $key ;
-				$TParam['list']['head_search'].= '<th>'.$label.'</th>';
-//				$TParam['list']['head_search'].='<div><span style="min-width:200px;display:inline-block;">'.$label.'</span> '.$fsearch.'</div>';	
-			}
 		}
 		
 		$search_button = ' <a href="#" onclick="Listview_submitSearch(this);" class="list-search-link">'.img_search().'</a>';
-
-		if(!empty($TParam['list']['head_search']))
-		{
-			$TParam['list']['head_search']='<div style="float:right;">'.$search_button.'</div>'.$TParam['list']['head_search'];
-		}
+		$search_button .= ' <a href="#" onclick="Listview_clearSearch(this);" class="list-search-link">'.img_searchclear().'</a>';
 		
 		if($nb_search_in_bar>0)
 		{
@@ -603,7 +577,7 @@ class Listview
      */
     private function renderList(&$THeader, &$TField, &$TTotal, &$TTotalGroup, &$TParam)
     {
-		global $bc;
+		global $bc,$form;
 		
 		$TSearch = $this->setSearch($THeader, $TParam);
 		$TExport = $this->setExport($TParam, $TField, $THeader);
@@ -611,13 +585,24 @@ class Listview
 		
 		//$out = $this->getJS();
 		
+		$massactionbutton= empty($TParam['list']['massactions']) ? '' : $form->selectMassAction('', $TParam['list']['massactions']);
+		
 		$dolibarr_decalage = $this->totalRow > $this->totalRowToShow ? 1 : 0;
 		ob_start();
-		print_barre_liste($TParam['list']['title'], $TParam['limit']['page']-1, $_SERVER["PHP_SELF"], '&'.$TParam['list']['param_url'], $TParam['sortfield'], $TParam['sortorder'], '', $this->totalRowToShow+$dolibarr_decalage, $this->totalRow, $TParam['list']['image'], 0, '', '', $TParam['limit']['nbLine']);
+		print_barre_liste($TParam['list']['title'], $TParam['limit']['page'], $_SERVER["PHP_SELF"], '&'.$TParam['list']['param_url'], $TParam['sortfield'], $TParam['sortorder'], $massactionbutton, $this->totalRowToShow+$dolibarr_decalage, $this->totalRow, $TParam['list']['image'], 0, '', '', $TParam['limit']['nbLine']);
 		$out .= ob_get_clean();
 		
+		$classliste='liste';
+		if(!empty($TParam['head_search'])) {
+			$out.='<div class="liste_titre liste_titre_bydiv centpercent">';
+			$out.=$TParam['head_search'];
+			$out.='</div>';
+			
+			$classliste.=' listwithfilterbefore';
+		}
 	
-		$out.= '<table id="'.$this->id.'" class="liste" width="100%"><thead>';
+		$out.= '<div class="div-table-responsive">';
+		$out.= '<table id="'.$this->id.'" class="'.$classliste.'" width="100%"><thead>';
 			
     	if(count($TSearch)>0)
 		{
@@ -627,12 +612,12 @@ class Listview
 			{
 				if ($field === 'selectedfields')
 				{
-					$out.= '<td class="liste_titre" align="right">'.$this->form->showFilterAndCheckAddButtons(0).'</td>';
+					$out.= '<th class="liste_titre" align="right">'.$this->form->showFilterAndCheckAddButtons(0).'</th>';
 				}
 				else
 				{
 					$moreattrib = 'style="width:'.$head['width'].';text-align:'.$head['text-align'].'"';
-					$out .= '<td class="liste_titre" '.$moreattrib.'>'.$TSearch[$field].'</td>';
+					$out .= '<th class="liste_titre" '.$moreattrib.'>'.$TSearch[$field].'</th>';
 				}
 			}
 			
@@ -646,10 +631,17 @@ class Listview
 			$search = '';
 			$prefix = '';
 
+			$label = $head['label'];
+			
 			if ($field === 'selectedfields')
 			{
 				$moreattrib = 'align="right" ';
 				$prefix = 'maxwidthsearch ';
+
+				if(!empty($TParam['list']['massactions'])) {
+					$label.=$form->showCheckAddButtons('checkforselect', 1);
+				}
+				
 			}
 
 			if (empty($head['width'])) $head['width'] = 'auto';
@@ -662,10 +654,10 @@ class Listview
 				else $search = $field;
 			}
 
-			$out .= getTitleFieldOfList($head['label'], 0, $_SERVER["PHP_SELF"], $search, '', $moreparam, $moreattrib, $TParam['sortfield'], $TParam['sortorder'], $prefix);
+			$out .= getTitleFieldOfList($label, 0, $_SERVER["PHP_SELF"], $search, '', $moreparam, $moreattrib, $TParam['sortfield'], $TParam['sortorder'], $prefix);
 			$out .= $head['more'];
 		}
-		
+
 		//$out .= '<th aligne="right" class="maxwidthsearch liste_titre">--</th>';
 		$out .= '</tr>';
 		
@@ -673,23 +665,34 @@ class Listview
 		
 		if(empty($TField))
 		{
-			if (!empty($TParam['list']['messageNothing'])) $out .= '<tr class="oddeven"><td colspan="'.(count($TParam['title'])+1).'"><span class="opacitymedium">'.$TParam['list']['messageNothing'].'</span></td></tr>';
+			if (!empty($TParam['list']['messageNothing'])) $out .= '<tr class="oddeven"><td colspan="'.(count($THeader)+1).'"><span class="opacitymedium">'.$TParam['list']['messageNothing'].'</span></td></tr>';
 		}
 		else
         {
-			$var=true;
 			$line_number = 0;
 			foreach($TField as $fields)
 			{
 				if($this->in_view($TParam, $line_number))
 				{
-					$var=!$var;
-					$out.='<tr '.$bc[$var].'> <!-- '.$field.' -->';
+					$out.='<tr class="oddeven"> <!-- '.$field.' -->';
 
 					foreach ($THeader as $field => $head)
 					{
+						$value_aff =(isset($fields[$field]) ? $fields[$field] : '&nbsp;');
+						
+						if ($field === 'selectedfields')
+						{
+							$head['text-align']='center';
+							if(!empty($TParam['list']['massactions'])) {
+								$arrayofselected=array(); // TODO get in param
+								$selected=0;
+								if (in_array($obj->rowid, $arrayofselected)) $selected=1;
+								$value_aff.='<input id="cb'.$fields['rowid'].'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$fields['rowid'].'"'.($selected?' checked="checked"':'').'>';
+							}
+						}
+						
 						$moreattrib = 'style="width:'.$head['width'].';text-align:'.$head['text-align'].'"';
-						$out.='<td class="'.$field.'" '.$moreattrib.'>'.$fields[$field].'</td>';
+						$out.='<td class="'.$field.'" '.$moreattrib.'>'.$value_aff.'</td>';
 					}
 
 					$out.='</tr>';
@@ -718,6 +721,7 @@ class Listview
 		}
 
 		$out .= '</table>';
+		$out .= '</div>';
 		
 		return $out;
 	}
@@ -760,7 +764,7 @@ class Listview
 		
 		foreach($TField as $row)
 		{
-			$this->set_line($TField, $TParam, $row);
+			$this->set_line($THeader, $TField, $TParam, $row);
 		}
 	}
 
@@ -778,7 +782,7 @@ class Listview
 		}
 		
 		$contextpage=md5($_SERVER['PHP_SELF']);
-		if(!empty($TParam['allow-field-select']))
+		if(!empty($TParam['allow-fields-select']))
 		{
 			$selectedfields = GETPOST('Listview'.$this->id.'_selectedfields');
 			
@@ -839,18 +843,25 @@ class Listview
 					'order'=>(in_array($field, $TParam['orderby']['noOrder']) ? 0 : 1),
 					'width'=>(!empty($TParam['size']['width'][$field]) ? $TParam['size']['width'][$field] : 'auto'),
 					'text-align'=>(!empty($TParam['position']['text-align'][$field]) ? $TParam['position']['text-align'][$field] : 'auto'),
+					'rank'=>(!empty($TParam['position']['rank'][$field]) ? $TParam['position']['rank'][$field] : 0),
 					'more'=>''
 				);
 			}
 		}
 		
-		if(!empty($selectedfields))
-		{
-			$THeader['selectedfields']['label']='<div style="float:right">'.$selectedfields.'</div>';
-		}
+		uasort($THeader,array('Listview','sortHeaderRank'));
+		
+		$THeader['selectedfields']['label']=$selectedfields;
 		
 		return $THeader;
 	}
+	
+	public function sortHeaderRank(&$a, &$b) {
+		if($a['rank']>$b['rank']) return 1;
+		else if($a['rank']<$b['rank']) return -1;
+		else return 0;
+		
+	}
 
     /**
      * @param string $TParam        TParam
@@ -874,11 +885,14 @@ class Listview
 	}
 
     /**
-     * @param string $TField        TField
-     * @param string $TParam        TParam
-     * @param string $currentLine   aaa
+     * Apply function to result and set fields array
+     * 
+     * @param string $THeader       array of headers
+     * @param string $TField        array of fields
+     * @param string $TParam        array of parameters
+     * @param string $currentLine   object containing current sql result
      */
-    private function set_line(&$TField, &$TParam, $currentLine)
+    private function set_line(&$THeader, &$TField, &$TParam, $currentLine)
     {
         global $conf;
 
@@ -887,16 +901,21 @@ class Listview
         if($this->in_view($TParam,$line_number))
         {
 			$this->totalRowToShow++;
-            $row=array(); $trans = array();
-            foreach($currentLine as $field=>$value)
+            $row=array(); 
+            $trans = array();
+            foreach($currentLine as $kF=>$vF)$trans['@'.$kF.'@'] = addslashes($vF);
+            
+            foreach($THeader as $field=>$dummy)
             {
+            	$value = isset($currentLine->{$field}) ? $currentLine->{$field}: '';
+            	
                 if(is_object($value))
                 {
                     if(get_class($value)=='stdClass') {$value=print_r($value, true);}
                     else $value=(string) $value;
                 }
 
-                $trans['@'.$field.'@'] = $value;
+                $trans['@'.$field.'@'] = addslashes($value);
 
                 if(!empty($TParam['math'][$field]))
                 {
@@ -910,17 +929,19 @@ class Listview
 
                     if(isset($TParam['eval'][$field]) && in_array($field,array_keys($row)))
                     {
-                        $strToEval = 'return '.strtr( $TParam['eval'][$field],  array_merge( $trans, array('@val@'=>$row[$field])  )).';';
+                        $strToEval = 'return '.strtr( $TParam['eval'][$field],  array_merge( $trans, array('@val@'=>addslashes( $row[$field] ))  )).';';
                         $row[$field] = eval($strToEval);
+                        
                     }
 
                     if(isset($TParam['type'][$field]) && !isset($TParam['eval'][$field]))
                     {
                         if($TParam['type'][$field]=='date' || $TParam['type'][$field]=='datetime' )
                         {
+                        
                             if($row[$field] != '0000-00-00 00:00:00' && $row[$field] != '1000-01-01 00:00:00' && $row[$field] != '0000-00-00' && !empty($row[$field]))
                             {
-                                if($TParam['type'][$field]=='datetime')$row[$field] = dol_print_date(strtotime($row[$field]),'dayhoursec');
+                                if($TParam['type'][$field]=='datetime')$row[$field] = dol_print_date(strtotime($row[$field]),'dayhour');
                                 else $row[$field] = dol_print_date(strtotime($row[$field]),'day');
                             }
                             else
@@ -996,6 +1017,8 @@ class Listview
 		{
 			$sql.=' LIMIT '.(int) $TParam['limit']['global'];
 		}
+		else if(!empty($TParam['limit'])) $sql.= $this->db->plimit($TParam['limit']['nbLine']+1, $TParam['limit']['page'] * $TParam['limit']['nbLine']);
+		
 		
 		return $sql;
 	}
@@ -1008,7 +1031,7 @@ class Listview
      */
     private function parse_sql(&$THeader, &$TField, &$TParam, $sql)
     {
-		$this->sql = $this->limitSQL($sql, $TParam);
+    	$this->sql = $this->limitSQL($sql, $TParam);
 		
 		$this->TTotalTmp=array();
 		$this->THideFlip = array_flip($TParam['hide']);
@@ -1016,12 +1039,13 @@ class Listview
 		$res = $this->db->query($this->sql);
 		if($res!==false)
 		{
-			$this->totalRow = $this->db->num_rows($res);
 			dol_syslog(get_class($this)."::parse_sql id=".$this->id." sql=".$this->sql, LOG_DEBUG);
 			
+			if(empty($this->totalRow))$this->totalRow = $this->db->num_rows($res);
+			
 			while($currentLine = $this->db->fetch_object($res))
             {
-				$this->set_line($TField, $TParam, $currentLine);
+				$this->set_line($THeader, $TField, $TParam, $currentLine);
 			}
 		}
 		else
@@ -1029,4 +1053,23 @@ class Listview
 			dol_syslog(get_class($this)."::parse_sql id=".$this->id." sql=".$this->sql, LOG_ERR);
 		}
 	}	
+	
+	static function getCachedOjbect($class_name, $fk_object) {
+		global $db, $TCacheListObject;
+		
+		if(!class_exists($class_name)) return false;
+		
+		if(empty($TCacheListObject)) $TCacheListObject = array();
+		if(empty($TCacheListObject[$class_name])) $TCacheListObject[$class_name]  =array();
+		
+		if(empty($TCacheListObject[$class_name][$fk_object])) {
+			$TCacheListObject[$class_name][$fk_object]= new $class_name($db);
+			if( $TCacheListObject[$class_name][$fk_object]->fetch($fk_object)<0) {
+				return false;
+			}
+		}
+		
+		return $TCacheListObject[$class_name][$fk_object];
+	}
+	
 }
diff --git a/htdocs/product/list-with-listview.php b/htdocs/product/list-with-listview.php
new file mode 100644
index 00000000000..8d53496dbcb
--- /dev/null
+++ b/htdocs/product/list-with-listview.php
@@ -0,0 +1,702 @@
+<?php
+/* Copyright (C) 2001-2006  Rodolphe Quiedeville    <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2016  Laurent Destailleur     <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2012  Regis Houssin           <regis.houssin@capnetworks.com>
+ * Copyright (C) 2012-2016  Marcos García           <marcosgdf@gmail.com>
+ * Copyright (C) 2013-2016	Juanjo Menent           <jmenent@2byte.es>
+ * Copyright (C) 2013-2015  Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
+ * Copyright (C) 2013       Jean Heimburger         <jean@tiaris.info>
+ * Copyright (C) 2013       Cédric Salvador         <csalvador@gpcsolutions.fr>
+ * Copyright (C) 2013       Florian Henry           <florian.henry@open-concept.pro>
+ * Copyright (C) 2013       Adolfo segura           <adolfo.segura@gmail.com>
+ * Copyright (C) 2015       Jean-François Ferry     <jfefe@aternatik.fr>
+ * Copyright (C) 2016       Ferran Marcet		    <fmarcet@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/product/list.php
+ *  \ingroup    produit
+ *  \brief      Page to list products and services
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/inventory/listview.class.php';
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+if (! empty($conf->categorie->enabled))
+	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+
+$langs->load("products");
+$langs->load("stocks");
+$langs->load("suppliers");
+$langs->load("companies");
+if (! empty($conf->productbatch->enabled)) $langs->load("productbatch");
+
+$action=GETPOST('action','alpha');
+$massaction=GETPOST('massaction','alpha');
+$show_files=GETPOST('show_files','int');
+$confirm=GETPOST('confirm','alpha');
+$toselect = GETPOST('toselect', 'array');
+
+$sref=GETPOST("sref");
+$sbarcode=GETPOST("sbarcode");
+$snom=GETPOST("snom");
+$sall=GETPOST("sall");
+$type= (int) GETPOST("type","int");
+$search_sale = GETPOST("search_sale");
+$search_categ = GETPOST("search_categ",'int');
+$tosell = GETPOST("tosell", 'int');
+$tobuy = GETPOST("tobuy", 'int');
+$fourn_id = GETPOST("fourn_id",'int');
+$catid = GETPOST('catid','int');
+$search_tobatch = GETPOST("search_tobatch",'int');
+$search_accountancy_code_sell = GETPOST("search_accountancy_code_sell",'alpha');
+$search_accountancy_code_buy = GETPOST("search_accountancy_code_buy",'alpha');
+$optioncss = GETPOST('optioncss','alpha');
+
+//Show/hide child products. Hidden by default
+if (!$_POST) {
+	$search_hidechildproducts = 'on';
+} else {
+	$search_hidechildproducts = GETPOST('search_hidechildproducts');
+}
+
+$diroutputmassaction=$conf->product->dir_output . '/temp/massgeneration/'.$user->id;
+
+$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$sortfield = GETPOST("sortfield",'alpha');
+$sortorder = GETPOST("sortorder",'alpha');
+$page = (GETPOST("page",'int')?GETPOST("page", 'int'):0);
+if ($page == -1) { $page = 0; }
+$offset = $limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+if (! $sortfield) $sortfield="p.ref";
+if (! $sortorder) $sortorder="ASC";
+
+// Initialize context for list
+$contextpage=GETPOST('contextpage','aZ')?GETPOST('contextpage','aZ'):'productservicelist';
+if ((string) $type == '1') { $contextpage='servicelist'; if ($search_type=='') $search_type='1'; }
+if ((string) $type == '0') { $contextpage='productlist'; if ($search_type=='') $search_type='0'; }
+
+// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+$hookmanager->initHooks(array($contextpage));
+$extrafields = new ExtraFields($db);
+$form=new Form($db);
+
+// fetch optionals attributes and labels
+$extralabels = $extrafields->fetch_name_optionals_label('product');
+$search_array_options=$extrafields->getOptionalsFromPost($extralabels,'','search_');
+
+if (empty($action)) $action='list';
+
+// Get object canvas (By default, this is not defined, so standard usage of dolibarr)
+$canvas=GETPOST("canvas");
+$objcanvas=null;
+if (! empty($canvas))
+{
+    require_once DOL_DOCUMENT_ROOT.'/core/class/canvas.class.php';
+    $objcanvas = new Canvas($db,$action);
+    $objcanvas->getCanvas('product','list',$canvas);
+}
+
+// Security check
+if ($type=='0') $result=restrictedArea($user,'produit','','','','','',$objcanvas);
+else if ($type=='1') $result=restrictedArea($user,'service','','','','','',$objcanvas);
+else $result=restrictedArea($user,'produit|service','','','','','',$objcanvas);
+
+// Define virtualdiffersfromphysical
+$virtualdiffersfromphysical=0;
+if (! empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT) || ! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER))
+{
+    $virtualdiffersfromphysical=1;		// According to increase/decrease stock options, virtual and physical stock may differs.
+}
+
+// List of fields to search into when doing a "search in all"
+$fieldstosearchall = array(
+	'p.ref'=>"Ref",
+    'pfp.ref_fourn'=>"RefSupplier",
+	'p.label'=>"ProductLabel",
+	'p.description'=>"Description",
+    "p.note"=>"Note",
+);
+// multilang
+if (! empty($conf->global->MAIN_MULTILANGS))
+{
+	$fieldstosearchall['pl.label']='ProductLabelTranslated';
+	$fieldstosearchall['pl.description']='ProductDescriptionTranslated';
+	$fieldstosearchall['pl.note']='ProductNoteTranslated';
+}
+if (! empty($conf->barcode->enabled)) {
+	$fieldstosearchall['p.barcode']='Gencod';
+}
+
+if (empty($conf->global->PRODUIT_MULTIPRICES))
+{
+	$titlesellprice=$langs->trans("SellingPrice");
+	if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
+	{
+		$titlesellprice=$form->textwithpicto($langs->trans("SellingPrice"), $langs->trans("DefaultPriceRealPriceMayDependOnCustomer"));
+	}
+}
+
+// Definition of fields for lists
+$arrayfields=array(
+    'p.ref'=>array('label'=>$langs->trans("Ref"), 'checked'=>1),
+    //'pfp.ref_fourn'=>array('label'=>$langs->trans("RefSupplier"), 'checked'=>1, 'enabled'=>(! empty($conf->barcode->enabled))),
+    'p.label'=>array('label'=>$langs->trans("Label"), 'checked'=>1),
+	'p.barcode'=>array('label'=>$langs->trans("Gencod"), 'checked'=>($contextpage != 'servicelist'), 'enabled'=>(! empty($conf->barcode->enabled))),
+    'p.duration'=>array('label'=>$langs->trans("Duration"), 'checked'=>($contextpage != 'productlist'), 'enabled'=>(! empty($conf->service->enabled))),
+	'p.price'=>array('label'=>$langs->trans("SellingPrice"), 'checked'=>1, 'enabled'=>empty($conf->global->PRODUIT_MULTIPRICES)),
+    'p.minbuyprice'=>array('label'=>$langs->trans("BuyingPriceMinShort"), 'checked'=>1, 'enabled'=>(! empty($user->rights->fournisseur->lire))),
+	'p.seuil_stock_alerte'=>array('label'=>$langs->trans("StockLimit"), 'checked'=>0, 'enabled'=>(! empty($conf->stock->enabled) && $user->rights->stock->lire && $contextpage != 'service')),
+    'p.desiredstock'=>array('label'=>$langs->trans("DesiredStock"), 'checked'=>1, 'enabled'=>(! empty($conf->stock->enabled) && $user->rights->stock->lire && $contextpage != 'service')),
+    'p.stock'=>array('label'=>$langs->trans("PhysicalStock"), 'checked'=>1, 'enabled'=>(! empty($conf->stock->enabled) && $user->rights->stock->lire && $contextpage != 'service')),
+    'stock_virtual'=>array('label'=>$langs->trans("VirtualStock"), 'checked'=>1, 'enabled'=>(! empty($conf->stock->enabled) && $user->rights->stock->lire && $contextpage != 'service' && $virtualdiffersfromphysical)),
+    'p.tobatch'=>array('label'=>$langs->trans("ManageLotSerial"), 'checked'=>0, 'enabled'=>(! empty($conf->productbatch->enabled))),
+	'p.accountancy_code_sell'=>array('label'=>$langs->trans("ProductAccountancySellCode"), 'checked'=>0),
+	'p.accountancy_code_buy'=>array('label'=>$langs->trans("ProductAccountancyBuyCode"), 'checked'=>0),
+	'p.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
+    'p.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500),
+    'p.tosell'=>array('label'=>$langs->trans("Status").' ('.$langs->trans("Sell").')', 'checked'=>1, 'position'=>1000),
+    'p.tobuy'=>array('label'=>$langs->trans("Status").' ('.$langs->trans("Buy").')', 'checked'=>1, 'position'=>1000)
+);
+// Extra fields
+if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
+{
+   foreach($extrafields->attribute_label as $key => $val) 
+   {
+       $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>$extrafields->attribute_list[$key], 'position'=>$extrafields->attribute_pos[$key]);
+   }
+}
+
+
+
+/*
+ * Actions
+ */
+
+if (GETPOST('cancel')) { $action='list'; $massaction=''; }
+if (! GETPOST('confirmmassaction') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction=''; }
+
+$parameters=array();
+$reshook=$hookmanager->executeHooks('doActions',$parameters, $object, $action);    // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+if (empty($reshook))
+{
+    // Selection of new fields
+    include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+
+    // Purge search criteria
+    if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // All tests are required to be compatible with all browsers
+    {
+    	$sall="";
+    	$sref="";
+    	$snom="";
+    	$sbarcode="";
+    	$search_categ=0;
+    	$tosell="";
+    	$tobuy="";
+    	$search_tobatch='';
+    	$search_accountancy_code_sell='';
+    	$search_accountancy_code_buy='';
+    	$search_array_options=array();
+    }
+    
+    // Mass actions
+    $objectclass='Product';
+    if ((string) $type == '1') { $objectlabel='Services'; }
+    if ((string) $type == '0') { $objectlabel='Products'; }
+    
+    $permtoread = $user->rights->produit->lire;
+    $permtodelete = $user->rights->produit->supprimer;
+    $uploaddir = $conf->product->dir_output;
+    include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';    
+}
+
+
+/*
+ * View
+ */
+
+$htmlother=new FormOther($db);
+
+if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
+{
+	$objcanvas->assign_values($action);       // This must contains code to load data (must call LoadListDatas($limit, $offset, $sortfield, $sortorder))
+    $objcanvas->display_canvas($action);  	  // This is code to show template
+}
+else
+{
+	$title=$langs->trans("ProductsAndServices");
+
+	if (isset($type))
+	{
+		if ($type==1)
+		{
+			$texte = $langs->trans("Services");
+		}
+		else
+		{
+			$texte = $langs->trans("Products");
+		}
+	}
+	else
+	{
+		$texte = $langs->trans("ProductsAndServices");
+	}
+
+    $sql = 'SELECT DISTINCT p.rowid, p.ref, p.label, p.barcode, p.price, p.price_ttc, p.price_base_type, p.entity,';
+    $sql.= ' p.fk_product_type, p.duration, p.tosell, p.tobuy, p.seuil_stock_alerte, p.desiredstock,';
+    $sql.= ' p.tobatch, p.accountancy_code_sell, p.accountancy_code_buy,';
+    $sql.= ' p.datec, p.tms,';
+    //$sql.= ' pfp.ref_fourn as ref_supplier, ';
+    $sql.= ' MIN(pfp.unitprice) as minsellprice';
+	if (!empty($conf->variants->enabled) && $search_hidechildproducts && ($type === 0)) {
+		$sql .= ', pac.rowid prod_comb_id';
+	}
+	// Add fields from extrafields
+    foreach ($extrafields->attribute_label as $key => $val) $sql.=($extrafields->attribute_type[$key] != 'separate' ? ",ef.".$key.' as options_'.$key : '');
+	// Add fields from hooks
+	$parameters=array();
+	$reshook=$hookmanager->executeHooks('printFieldListSelect',$parameters);    // Note that $action and $object may have been modified by hook
+	$sql.=$hookmanager->resPrint;
+    $sql.= ' FROM '.MAIN_DB_PREFIX.'product as p';
+	if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_extrafields as ef on (p.rowid = ef.fk_object)";
+    if (! empty($search_categ) || ! empty($catid)) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_product as cp ON p.rowid = cp.fk_product"; // We'll need this table joined to the select in order to filter by categ
+   	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as pfp ON p.rowid = pfp.fk_product";
+	// multilang
+	if (! empty($conf->global->MAIN_MULTILANGS)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_lang as pl ON pl.fk_product = p.rowid AND pl.lang = '".$langs->getDefaultLang() ."'";
+	if (!empty($conf->variants->enabled) && $search_hidechildproducts && ($type === 0)) {
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_attribute_combination pac ON pac.fk_product_child = p.rowid";
+	}
+
+	$sql.= ' WHERE p.entity IN ('.getEntity('product', 1).')';
+	if ($sall) $sql .= natural_search(array_keys($fieldstosearchall), $sall);
+    // if the type is not 1, we show all products (type = 0,2,3)
+    if (dol_strlen($type))
+    {
+    	if ($type == 1) $sql.= " AND p.fk_product_type = '1'";
+    	else $sql.= " AND p.fk_product_type <> '1'";
+    }
+	if ($sref)     $sql .= natural_search('p.ref', $sref);
+	if ($snom)     $sql .= natural_search('p.label', $snom);
+	if ($sbarcode) $sql .= natural_search('p.barcode', $sbarcode);
+    if (isset($tosell) && dol_strlen($tosell) > 0  && $tosell!=-1) $sql.= " AND p.tosell = ".$db->escape($tosell);
+    if (isset($tobuy) && dol_strlen($tobuy) > 0  && $tobuy!=-1)   $sql.= " AND p.tobuy = ".$db->escape($tobuy);
+    if (dol_strlen($canvas) > 0)                    $sql.= " AND p.canvas = '".$db->escape($canvas)."'";
+    if ($catid > 0)    $sql.= " AND cp.fk_categorie = ".$catid;
+    if ($catid == -2)  $sql.= " AND cp.fk_categorie IS NULL";
+    if ($search_categ > 0)   $sql.= " AND cp.fk_categorie = ".$db->escape($search_categ);
+    if ($search_categ == -2) $sql.= " AND cp.fk_categorie IS NULL";
+    if ($fourn_id > 0) $sql.= " AND pfp.fk_soc = ".$fourn_id;
+    if ($search_tobatch != '' && $search_tobatch >= 0)   $sql.= " AND p.tobatch = ".$db->escape($search_tobatch);
+    if ($search_accountancy_code_sell)   $sql.= natural_search('p.accountancy_code_sell', $search_accountancy_code_sell);
+    if ($search_accountancy_code_sell)   $sql.= natural_search('p.accountancy_code_buy', $search_accountancy_code_buy);
+    // Add where from extra fields
+
+	if (!empty($conf->variants->enabled) && $search_hidechildproducts && ($type === 0)) {
+		$sql .= " AND pac.rowid IS NULL";
+	}
+
+	// Add where from extra fields
+	foreach ($search_array_options as $key => $val)
+	{
+	    $crit=$val;
+	    $tmpkey=preg_replace('/search_options_/','',$key);
+	    $typ=$extrafields->attribute_type[$tmpkey];
+	    $mode=0;
+	    if (in_array($typ, array('int','double'))) $mode=1;    // Search on a numeric
+	    if ($val && ( ($crit != '' && ! in_array($typ, array('select'))) || ! empty($crit))) 
+	    {
+	        $sql .= natural_search('ef.'.$tmpkey, $crit, $mode);
+	    }
+	}
+	// Add where from hooks
+	$parameters=array();
+	$reshook=$hookmanager->executeHooks('printFieldListWhere',$parameters);    // Note that $action and $object may have been modified by hook
+	$sql.=$hookmanager->resPrint;
+    $sql.= " GROUP BY p.rowid, p.ref, p.label, p.barcode, p.price, p.price_ttc, p.price_base_type,";
+    $sql.= " p.fk_product_type, p.duration, p.tosell, p.tobuy, p.seuil_stock_alerte, p.desiredstock,";
+    $sql.= ' p.datec, p.tms, p.entity, p.tobatch, p.accountancy_code_sell, p.accountancy_code_buy';
+	if (!empty($conf->variants->enabled) && $search_hidechildproducts && ($type === 0)) {
+		$sql .= ', pac.rowid';
+	}
+	// Add fields from extrafields
+    foreach ($extrafields->attribute_label as $key => $val) $sql.=($extrafields->attribute_type[$key] != 'separate' ? ",ef.".$key : '');
+	// Add fields from hooks
+	$parameters=array();
+	$reshook=$hookmanager->executeHooks('printFieldSelect',$parameters);    // Note that $action and $object may have been modified by hook
+	$sql.=$hookmanager->resPrint;
+
+	// TODO put these functions into product.lib.php if this go from demo to core
+	/**
+	 * Function return formated sell price
+	 *
+	 * @param   int 	$fk_object rowid of product
+	 * @return string
+	 */
+	function list_get_product_sellprice($fk_object) {
+		global $langs,$conf, $user;
+		
+		$object = Listview::getCachedOjbect('Product', $fk_object);
+		if($object === false) return '';
+		
+		if ($object->status)
+		{
+			if ($object->price_base_type == 'TTC') return price($object->price_ttc).' '.$langs->trans("TTC");
+			else return price($object->price).' '.$langs->trans("HT");
+		}
+		return '';
+	}
+
+	/**
+	 * Function return formated product status sell or buy
+	 *
+	 * @param   int 	$fk_object 	rowid of product
+	 * @param	string	$field		concerned field status|status_buy
+	 * @param	int		$type		for libstatus
+	 * @return string	
+	 */
+	function list_get_product_status($fk_object, $field, $type) {
+		global $conf, $user;
+		
+		$object = Listview::getCachedOjbect('Product', $fk_object);
+		
+		if($object === false) return '';
+		
+		if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer && ! empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) {
+			return ajax_object_onoff($object, 'status', 'tosell', 'ProductStatusOnSell', 'ProductStatusNotOnSell');
+		} else {
+			return $object->LibStatut($object->{$field},5,$type);
+		}
+		
+	}
+	
+	/**
+	 * Function return formated ref
+	 *
+	 * @param   int $fk_object rowid of product
+	 * @return string
+	 */
+	function list_get_product_ref($fk_object) {
+		global $conf, $user;
+		
+		$object = Listview::getCachedOjbect('Product', $fk_object);
+		
+		if($object === false) return '';
+		
+		return $object->getNomUrl(1,'',24);
+	}
+	
+	/**
+	 * Function return formated extrafield
+	 *
+	 * @param   int 	$fk_object 	rowid of product
+	 * @param	string	$key		extrafield to output
+	 * @return string
+	 */
+	function list_get_product_extrafield($fk_object, $key) {
+		global $extrafields;
+		
+		$object = Listview::getCachedOjbect('Product', $fk_object);
+		if($object === false) return '';
+		
+		return $extrafields->showOutputField($key, $object->array_options['options_'.$key], '', 1);
+	}
+
+	/**
+	 * Function return formated virtual stock
+	 *
+	 * @param   int $fk_object 	rowid of product
+	 * @return string
+	 */
+	function list_get_product_virtual_stock($fk_object) {
+		global $langs;
+	
+		$object = Listview::getCachedOjbect('Product', $fk_object);
+		if($object === false) return '';
+		
+		$object->load_stock('nobatch');
+		
+		$out = '';
+		if ($object->type != 1)
+		{
+			if ($object->seuil_stock_alerte != '' && $object->stock_theorique < (float) $object->seuil_stock_alerte) $out.= img_warning($langs->trans("StockTooLow")).' ';
+			$out.= $object->stock_theorique;
+		}
+
+		return $out;
+	}
+	
+	/**
+	 * Function return formated stock
+	 *
+	 * @param   int $fk_object rowid of product
+	 * @return string
+	 */
+	function list_get_product_stock($fk_object) {
+		global $langs;
+		
+		$object = Listview::getCachedOjbect('Product', $fk_object);
+		if($object === false) return '';
+		
+		$out = '';
+		if ($object->type != 1)
+		{
+			if ($object->seuil_stock_alerte != '' && $object->stock_reel< (float) $object->seuil_stock_alerte) $out.= img_warning($langs->trans("StockTooLow")).' ';
+			$out.= (double)$object->stock_reel;
+		}
+		
+		return $out;
+	}
+	/**
+	 * Function return formated min buy price
+	 *
+	 * @param   int $fk_object rowid of product
+	 * @return string
+	 */
+	function list_get_product_minbuyprice($fk_object) {
+		global $conf, $user, $langs,$db,$form;
+		
+		$out = '';
+		
+		$object = Listview::getCachedOjbect('Product', $fk_object);
+		if($object === false || empty($object->status_buy) ) return '';
+		
+		$product_fourn =new ProductFournisseur($db);
+		if ($product_fourn->find_min_price_product_fournisseur($fk_object) > 0)
+		{
+			if ($product_fourn->product_fourn_price_id > 0)
+			{
+				if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->lire)
+				{
+					$htmltext=$product_fourn->display_price_product_fournisseur(1, 1, 0, 1);
+					$out.= $form->textwithpicto(price($product_fourn->fourn_unitprice).' '.$langs->trans("HT"),$htmltext);
+				}
+				else $out.= price($product_fourn->fourn_unitprice).' '.$langs->trans("HT");
+			}
+		}
+		return $out;
+	}
+	
+	// array of customized field function
+	$arrayeval = array(
+			'tobuy'=>'list_get_product_status(@rowid@, "status_buy",1)'
+			,'tosell'=>'list_get_product_status(@rowid@, "status",0)'
+			,'ref'=>'list_get_product_ref(@rowid@)'
+			,'label'=>'dol_trunc("@val@",40)'
+			,'price'=>'list_get_product_sellprice(@rowid@)'
+			,'stock_virtual'=>'list_get_product_virtual_stock(@rowid@)'
+			,'stock'=>'list_get_product_stock(@rowid@)'
+			,'minbuyprice'=>'list_get_product_minbuyprice(@rowid@)'
+	);
+	
+	// defined list align for field
+	$arrayalign = array(
+			'price'=>'right'
+			,'tobuy'=>'right'
+			,'tosell'=>'right'
+			,'desiredstock'=>'right'
+			,'stock'=>'right'
+			,'stock_virtual'=>'right'
+			,'minbuyprice'=>'right'
+			,'datec'=>'center'
+			,'tms'=>'center'
+	);
+	
+	$parameters=array('arrayfields'=>$arrayfields);
+	$reshook=$hookmanager->executeHooks('printFieldListMoreFields',$parameters);    // Note that $action and $object may have been modified by hook
+	if($reshook) {
+		$arrayfields = $hookmanager->resArray;
+	}
+	
+	// init title, hidden field (allowed into selected fields), and position
+	$arrayhide = $arraytitle = $arrayposition = array();
+    foreach($arrayfields as $k=>$data) {
+    	if(!isset($data['enabled']) || $data['enabled']) {
+    		list($t,$f) = explode('.',$k);
+    		if(empty($f))$f = $k;
+    		$arraytitle[$f]=$data['label'];
+    		if(empty($data['checked'])) $arrayhide[] = $f;
+    		$arrayposition[$f] = empty($data['position']) ? 0 : $data['position'];
+    	}
+    }
+    
+    // Extra fields
+    if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
+    {
+    	foreach($extrafields->attribute_label as $key => $val)
+    	{
+    		$arrayalign[$key]=$extrafields->getAlignFlag($key);
+   			$arrayeval[$key] = 'list_get_product_extrafield(@rowid@, "'.$key.'")';
+    	}
+    }
+    // List of mass actions available
+    $arrayofmassactions =  array(
+    		//'presend'=>$langs->trans("SendByMail"),
+    		//'builddoc'=>$langs->trans("PDFMerge"),
+    );
+    if ($user->rights->produit->supprimer) $arrayofmassactions['delete']=$langs->trans("Delete");
+    if ($massaction == 'presend' || $massaction == 'createbills') $arrayofmassactions=array();
+    
+    // Filter on categories
+    $moreforfilter='';
+    if (! empty($conf->categorie->enabled))
+    {
+    	$moreforfilter.='<div class="divsearchfield">';
+    	$moreforfilter.=$langs->trans('Categories'). ': ';
+    	$moreforfilter.=$htmlother->select_categories(Categorie::TYPE_PRODUCT,$search_categ,'search_categ',1);
+    	$moreforfilter.='</div>';
+    }
+    
+    //Show/hide child products. Hidden by default
+    if (!empty($conf->variants->enabled) && $type === 0) {
+    	$moreforfilter.='<div class="divsearchfield">';
+    	$moreforfilter.= '<input type="checkbox" id="search_hidechildproducts" name="search_hidechildproducts" value="on"'.($search_hidechildproducts ? 'checked="checked"' : '').'>';
+    	$moreforfilter.= ' <label for="search_hidechildproducts">'.$langs->trans('HideChildProducts').'</label>';
+    	$moreforfilter.='</div>';
+    }
+    
+    if ($moreforfilter)
+    {
+    	$parameters=array();
+    	$reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters);    // Note that $action and $object may have been modified by hook
+    	
+    	if(!empty($hookmanager->resPrint)) {
+    		$moreforfilter.=$hookmanager->resPrint;
+    	}
+    				
+    }
+
+    $param='';
+    if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.urlencode($contextpage);
+    if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.urlencode($limit);
+    if ($search_categ > 0) $param.="&amp;search_categ=".urlencode($search_categ);
+    if ($sref) $param="&amp;sref=".urlencode($sref);
+    if ($search_ref_supplier) $param="&amp;search_ref_supplier=".urlencode($search_ref_supplier);
+    if ($sbarcode) $param.=($sbarcode?"&amp;sbarcode=".urlencode($sbarcode):"");
+    if ($snom) $param.="&amp;snom=".urlencode($snom);
+    if ($sall) $param.="&amp;sall=".urlencode($sall);
+    if ($tosell != '') $param.="&amp;tosell=".urlencode($tosell);
+    if ($tobuy != '') $param.="&amp;tobuy=".urlencode($tobuy);
+    if ($fourn_id > 0) $param.=($fourn_id?"&amp;fourn_id=".$fourn_id:"");
+    if ($seach_categ) $param.=($search_categ?"&amp;search_categ=".urlencode($search_categ):"");
+    if ($type != '') $param.='&amp;type='.urlencode($type);
+    if ($optioncss != '') $param.='&optioncss='.urlencode($optioncss);
+    if ($search_tobatch) $param="&amp;search_ref_supplier=".urlencode($search_ref_supplier);
+    if ($search_accountancy_code_sell) $param="&amp;search_accountancy_code_sell=".urlencode($search_accountancy_code_sell);
+    if ($search_accountancy_code_buy) $param="&amp;search_accountancy_code_buy=".urlencode($search_accountancy_code_buy);
+    // Add $param from extra fields
+    foreach ($search_array_options as $key => $val)
+    {
+    	$crit=$val;
+    	$tmpkey=preg_replace('/search_options_/','',$key);
+    	if ($val != '') $param.='&search_options_'.$tmpkey.'='.urlencode($val);
+    }
+    
+    //var_dump($arraytitle,$arrayhide);
+    $list=new Listview($db, 'products');
+    $listHTML = $list->render($sql,array(
+    		'list'=>array(
+    				'title'=>$texte
+    				,'image'=>'title_products.png'
+    				,'massactions'=>$arrayofmassactions
+    				,'param_url'=>$param
+    				,'messageNothing'=>''
+    		)
+    		,'limit'=>array(
+    				'nbLine'=>$limit
+    		)
+    		,'sortfield'=>$sortfield
+    		,'sortorder'=>$sortorder
+    		,'title'=>$arraytitle // column definition title (only defined where abble to show)
+    		,'position'=>array(
+    				'text-align'=>$arrayalign
+    				,'rank'=>$arrayposition
+    		)
+    		,'allow-fields-select'=>1 // allow to select hidden fields
+    		,'head_search'=>$moreforfilter //custom search on head
+    		,'no-auto-sql-search'=>1 //disabled auto completion sql for search and pager url, use dolibarr style for migration of product list
+			,'translate'=>array()    		
+    		,'search'=>array(
+    				'ref'=>array('search_type'=>true, 'table'=>'p', 'fieldname'=>'sref')
+    				,'label'=>array('search_type'=>true, 'table'=>'p', 'fieldname'=>'snom')
+    				,'tosell'=>array('search_type'=> array('0'=>$langs->trans('ProductStatusNotOnSellShort'),'1'=>$langs->trans('ProductStatusOnSellShort')), 'fieldname'=>'tosell')
+    				,'tobuy'=>array('search_type'=> array('0'=>$langs->trans('ProductStatusNotOnBuyShort'),'1'=>$langs->trans('ProductStatusOnBuyShort')), 'fieldname'=>'tobuy')
+    				,'barcode'=>array('search_type'=>true, 'table'=>'p', 'fieldname'=>'sbarcode')
+    				,'accountancy_code_sell'=>array('search_type'=>true, 'table'=>'p', 'fieldname'=>'search_accountancy_code_sell')
+    				,'accountancy_code_buy'=>array('search_type'=>true, 'table'=>'p', 'fieldname'=>'search_accountancy_code_buy')
+    		)
+    		,'type'=>array(
+    				'datec'=>'datetime'
+    				,'tms'=>'datetime'
+    		)
+    		,'hide'=>$arrayhide
+    		,'eval'=>$arrayeval
+    ));
+    
+    $num = $list->totalRow;
+    
+    	$arrayofselected=is_array($toselect)?$toselect:array();
+    	
+    	if ($num == 1 && ! empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $sall)
+    	{
+    	    $id = $list->TField[0]->rowid;
+    	    header("Location: ".DOL_URL_ROOT.'/product/card.php?id='.$id);
+    	    exit;
+    	}
+
+    	$helpurl='';
+    	if (isset($type))
+    	{
+    		if ($type == 0)
+    		{
+    			$helpurl='EN:Module_Products|FR:Module_Produits|ES:M&oacute;dulo_Productos';
+    		}
+    		else if ($type == 1)
+    		{
+    			$helpurl='EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios';
+    		}
+    	}
+
+    	llxHeader('',$title,$helpurl,'');
+
+    	// Displays product removal confirmation
+    	if (GETPOST('delprod'))	{
+		    setEventMessages($langs->trans("ProductDeleted", GETPOST('delprod')), null, 'mesgs');
+	    }
+
+		print '<form action="'.$_SERVER["PHP_SELF"].'" method="post" name="formulaire">';
+        if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+		print '<input type="hidden" name="action" value="list">';
+		print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+		print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+		print '<input type="hidden" name="type" value="'.$type.'">';
+
+		echo $listHTML;
+    
+    	print '</form>';
+    
+}
+
+
+llxFooter();
+$db->close();

From 8272408b6e5a1d4c1d76a7ba54695d8934699ec0 Mon Sep 17 00:00:00 2001
From: alexis portable <alexis@atm-consulting.fr>
Date: Tue, 9 May 2017 14:43:54 +0200
Subject: [PATCH 258/505] fix travis case statement

---
 htdocs/product/list-with-listview.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/product/list-with-listview.php b/htdocs/product/list-with-listview.php
index 8d53496dbcb..e3103d8f426 100644
--- a/htdocs/product/list-with-listview.php
+++ b/htdocs/product/list-with-listview.php
@@ -438,7 +438,7 @@ else
 		if ($object->type != 1)
 		{
 			if ($object->seuil_stock_alerte != '' && $object->stock_theorique < (float) $object->seuil_stock_alerte) $out.= img_warning($langs->trans("StockTooLow")).' ';
-			$out.= $object->stock_theorique;
+			$out.= (double) $object->stock_theorique;
 		}
 
 		return $out;
@@ -460,7 +460,7 @@ else
 		if ($object->type != 1)
 		{
 			if ($object->seuil_stock_alerte != '' && $object->stock_reel< (float) $object->seuil_stock_alerte) $out.= img_warning($langs->trans("StockTooLow")).' ';
-			$out.= (double)$object->stock_reel;
+			$out.= (double) $object->stock_reel;
 		}
 		
 		return $out;

From c88656edb4ef5e6cf8024716b94140fa0d7b0eb5 Mon Sep 17 00:00:00 2001
From: Laurent Dinclaux <laurent@gecka.nc>
Date: Tue, 9 May 2017 23:59:37 +1100
Subject: [PATCH 259/505] Fix PHPDOC comments

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

diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php
index 390e9999454..ef23a30b878 100644
--- a/htdocs/compta/facture/class/facture-rec.class.php
+++ b/htdocs/compta/facture/class/facture-rec.class.php
@@ -507,6 +507,8 @@ class FactureRec extends CommonInvoice
      *	@param    	double		$pu_ht              Prix unitaire HT (> 0 even for credit note)
      *	@param    	double		$qty             	Quantite
      *	@param    	double		$txtva           	Taux de tva force, sinon -1
+	 * 	@param		double		$txlocaltax1		Local tax 1 rate (deprecated)
+	 *  @param		double		$txlocaltax2		Local tax 2 rate (deprecated)
      *	@param    	int			$fk_product      	Id du produit/service predefini
      *	@param    	double		$remise_percent  	Pourcentage de remise de la ligne
      *	@param		string		$price_base_type	HT or TTC
@@ -659,6 +661,8 @@ class FactureRec extends CommonInvoice
 	 *	@param    	double		$pu_ht              Prix unitaire HT (> 0 even for credit note)
 	 *	@param    	double		$qty             	Quantite
 	 *	@param    	double		$txtva           	Taux de tva force, sinon -1
+	 * 	@param		double		$txlocaltax1		Local tax 1 rate (deprecated)
+	 *  @param		double		$txlocaltax2		Local tax 2 rate (deprecated)
 	 *	@param    	int			$fk_product      	Id du produit/service predefini
 	 *	@param    	double		$remise_percent  	Pourcentage de remise de la ligne
 	 *	@param		string		$price_base_type	HT or TTC

From fb561bae1bdd268bb3781c9b4720fde8060ddbd9 Mon Sep 17 00:00:00 2001
From: Laurent Dinclaux <laurent@gecka.nc>
Date: Wed, 10 May 2017 00:58:48 +1100
Subject: [PATCH 260/505] Fix recurring invoices generation when using the cron
 url

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

diff --git a/htdocs/public/cron/cron_run_jobs.php b/htdocs/public/cron/cron_run_jobs.php
index fc8e15aeed6..e62e176ac6e 100644
--- a/htdocs/public/cron/cron_run_jobs.php
+++ b/htdocs/public/cron/cron_run_jobs.php
@@ -26,7 +26,7 @@ if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token
 if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');
 if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');
 if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
-if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
+//if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
 if (! defined('NOLOGIN'))   define('NOLOGIN','1');
 //if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
 

From 1748f1d451821a34e58da4f2a1db6d7323e8de68 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 9 May 2017 16:52:03 +0200
Subject: [PATCH 261/505] Better tooltip for computed field

---
 htdocs/exports/export.php       | 22 ++++++++++++++--------
 htdocs/langs/en_US/exports.lang |  1 +
 htdocs/theme/eldy/style.css.php |  3 +++
 htdocs/theme/md/style.css.php   |  3 +++
 4 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php
index e9f19f49ef4..43453041dfd 100644
--- a/htdocs/exports/export.php
+++ b/htdocs/exports/export.php
@@ -439,7 +439,7 @@ if ($step == 1 || ! $datatoexport)
     $h++;
     */
 
-    dol_fiche_head($head, $hselected, $langs->trans("NewExport"));
+    dol_fiche_head($head, $hselected, $langs->trans("NewExport"), -1);
 
 
     print '<table class="notopnoleftnoright" width="100%">';
@@ -609,7 +609,14 @@ if ($step == 2 && $datatoexport)
         $text=$langs->trans($label);
         $tablename=getablenamefromfield($code,$sqlmaxforexport);
         $htmltext ='<b>'.$langs->trans("Name").":</b> ".$text.'<br>';
-        $htmltext.='<b>'.$langs->trans("Table")." -> ".$langs->trans("Field").":</b> ".$tablename." -> ".preg_replace('/^.*\./','',$code)."<br>";
+        if (! empty($objexport->array_export_special[0][$code]))
+        {
+            $htmltext.='<b>'.$langs->trans("ComputedField")." -> ".$langs->trans("Method")." :</b> ".$objexport->array_export_special[0][$code]."<br>";
+        }
+        else
+        {
+            $htmltext.='<b>'.$langs->trans("Table")." -> ".$langs->trans("Field").":</b> ".$tablename." -> ".preg_replace('/^.*\./','',$code)."<br>";
+        }
 		if (! empty($objexport->array_export_examplevalues[0][$code]))
 		{
 		    $htmltext.=$langs->trans("SourceExample").': <b>'.$objexport->array_export_examplevalues[0][$code].'</b><br>';
@@ -645,9 +652,8 @@ if ($step == 2 && $datatoexport)
     
     /*
      * Barre d'action
-     *
      */
-    print '<div class="tabsAction">';
+    print '<div class="tabsAction tabsActionNoBottom">';
 
     if (count($array_selected))
 	{
@@ -828,7 +834,7 @@ if ($step == 3 && $datatoexport)
 	/*
 	 * Barre d'action
 	 */
-	print '<div class="tabsAction">';
+	print '<div class="tabsAction tabsActionNoBottom">';
 	// il n'est pas obligatoire de filtrer les champs
 	print '<a class="butAction" href="javascript:FilterField.submit();">'.$langs->trans("NextStep").'</a>';
 	print '</div>';
@@ -883,14 +889,14 @@ if ($step == 4 && $datatoexport)
     print '<table width="100%" class="border">';
 
     // Module
-    print '<tr><td width="25%">'.$langs->trans("Module").'</td>';
+    print '<tr><td class="titlefield">'.$langs->trans("Module").'</td>';
     print '<td>';
     //print img_object($objexport->array_export_module[0]->getName(),$objexport->array_export_module[0]->picto).' ';
     print $objexport->array_export_module[0]->getName();
     print '</td></tr>';
 
     // Lot de donnees a exporter
-    print '<tr><td width="25%">'.$langs->trans("DatasetToExport").'</td>';
+    print '<tr><td>'.$langs->trans("DatasetToExport").'</td>';
     print '<td>';
 	$icon=preg_replace('/:.*$/','',$objexport->array_export_icon[0]);
     print img_object($objexport->array_export_module[0]->getName(), $icon).' ';
@@ -898,7 +904,7 @@ if ($step == 4 && $datatoexport)
     print '</td></tr>';
 
     // List of exported fields
-    print '<tr><td width="25%">'.$langs->trans("ExportedFields").'</td>';
+    print '<tr><td>'.$langs->trans("ExportedFields").'</td>';
     $list='';
     foreach($array_selected as $code=>$value)
     {
diff --git a/htdocs/langs/en_US/exports.lang b/htdocs/langs/en_US/exports.lang
index a2e208673bd..4a1152e6581 100644
--- a/htdocs/langs/en_US/exports.lang
+++ b/htdocs/langs/en_US/exports.lang
@@ -120,6 +120,7 @@ SelectPrimaryColumnsForUpdateAttempt=Select column(s) to use as primary key for
 UpdateNotYetSupportedForThisImport=Update is not supported for this type of import (only insert)
 NoUpdateAttempt=No update attempt was performed, only insert 
 ImportDataset_user_1=Users (employees or not) and properties
+ComputedField=Computed field
 ## filters
 SelectFilterFields=If you want to filter on some values, just input values here.
 FilteredFields=Filtered fields
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 4672d99b8ec..9de83c3bd97 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -2006,6 +2006,9 @@ div.tabsAction {
     padding: 0em 0em;
     text-align: right;
 }
+div.tabsActionNoBottom {
+    margin-bottom: 0px;
+}
 div.tabsAction > a {
 	margin-bottom: 16px !important;
 }
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 7818422d192..e6809a2c574 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -2011,6 +2011,9 @@ div.tabsAction {
     padding: 0em 0em;
     text-align: right;
 }
+div.tabsActionNoBottom {
+    margin-bottom: 0px;
+}
 div.tabsAction > a {
 	margin-bottom: 16px !important;
 }

From 0b97ee42cf4f278afa77836b7d12e8b633841367 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 9 May 2017 18:15:50 +0200
Subject: [PATCH 262/505] NEW Can use a credit note into a "down
 payment/deposit".

---
 htdocs/compta/facture/card.php | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 5d2ba74c48a..9483e79dba4 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -3156,7 +3156,7 @@ else if ($id > 0 || ! empty($ref))
 	$addabsolutediscount = '<a href="' . DOL_URL_ROOT . '/comm/remx.php?id=' . $soc->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"]) . '?facid=' . $object->id . '">' . $langs->trans("EditGlobalDiscounts") . '</a>';
 	$addcreditnote = '<a href="' . DOL_URL_ROOT . '/compta/facture/card.php?action=create&socid=' . $soc->id . '&type=2&backtopage=' . urlencode($_SERVER["PHP_SELF"]) . '?facid=' . $object->id . '">' . $langs->trans("AddCreditNote") . '</a>';
 
-	print '<tr><td>' . $langs->trans('Discounts');
+	print '<!-- Discounts --><tr><td>' . $langs->trans('Discounts');
 	print '</td><td>';
 	if ($soc->remise_percent)
 		print $langs->trans("CompanyHasRelativeDiscount", $soc->remise_percent);
@@ -3164,6 +3164,7 @@ else if ($id > 0 || ! empty($ref))
 		print $langs->trans("CompanyHasNoRelativeDiscount");
 		// print ' ('.$addrelativediscount.')';
 
+	// Is there commercial discount or down payment available ?
 	if ($absolute_discount > 0) {
 		print '. ';
 		if ($object->statut > 0 || $object->type == Facture::TYPE_CREDIT_NOTE || $object->type == Facture::TYPE_DEPOSIT) {
@@ -3195,21 +3196,21 @@ else if ($id > 0 || ! empty($ref))
 		} else
 			print '. ';
 	}
+	// Is there credit notes availables ?
 	if ($absolute_creditnote > 0)
 	{
 		// If validated, we show link "add credit note to payment"
-		if ($object->statut != 1 || $object->type == Facture::TYPE_CREDIT_NOTE || $object->type == Facture::TYPE_DEPOSIT) {
+		if ($object->statut != 1 || $object->type == Facture::TYPE_CREDIT_NOTE) {
 			if ($object->statut == 0 && $object->type != Facture::TYPE_DEPOSIT) {
 				$text = $langs->trans("CompanyHasCreditNote", price($absolute_creditnote), $langs->transnoentities("Currency" . $conf->currency));
 				print $form->textwithpicto($text, $langs->trans("CreditNoteDepositUse"));
 			} else {
 				print $langs->trans("CompanyHasCreditNote", price($absolute_creditnote), $langs->transnoentities("Currency" . $conf->currency)) . '.';
 			}
-		} else {
-			// Remise dispo de type avoir
-			if (! $absolute_discount)
-				print '<br>';
-			// $form->form_remise_dispo($_SERVER["PHP_SELF"].'?facid='.$object->id, 0, 'remise_id_for_payment', $soc->id, $absolute_creditnote, $filtercreditnote, $resteapayer
+		} else {  // We can add a credit note on a down payment or standard invoice or situation invoice
+			// There is credit notes discounts available
+			if (! $absolute_discount) print '<br>';
+			// $form->form_remise_dispo($_SERVER["PHP_SELF"].'?facid='.$object->id, 0, 'remise_id_for_payment', $soc->id, $absolute_creditnote, $filtercreditnote, $resteapayer);
 			$more=' ('.$addcreditnote.')';
 			$form->form_remise_dispo($_SERVER["PHP_SELF"] . '?facid=' . $object->id, 0, 'remise_id_for_payment', $soc->id, $absolute_creditnote, $filtercreditnote, 0, $more); // We allow credit note even if amount is higher
 		}

From 667e3c28764176781785e93caaebe086c3780b1a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 9 May 2017 19:26:28 +0200
Subject: [PATCH 263/505] Add another security sanitizing option

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 8d14a377c75..e0c9d520eef 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -308,9 +308,17 @@ function GETPOST($paramname,$check='',$method=0,$filter=NULL,$options=NULL)
 	            if (! is_array($out) || empty($out)) $out=array();
 	            break;
 			case 'nohtml':
-				$out=dol_string_nohtmltag($out);
+			    $out=dol_string_nohtmltag($out);
 				break;
-	        case 'custom':
+			case 'alphanohtml':	// Recommended for search params
+	            $out=trim($out);
+	            // '"' is dangerous because param in url can close the href= or src= and add javascript functions.
+	            // '../' is dangerous because it allows dir transversals
+	            if (preg_match('/"/',$out)) $out='';
+	            else if (preg_match('/\.\.\//',$out)) $out='';
+			    $out=dol_string_nohtmltag($out);
+				break;
+			case 'custom':
 	            if (empty($filter)) return 'BadFourthParameterForGETPOST';
 	            $out=filter_var($out, $filter, $options);
 	            break;

From 6d01bd712db021a03a8bd78a461e63c26fa63e44 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 9 May 2017 19:36:10 +0200
Subject: [PATCH 264/505] FIX Better sanitizing of search all parameter.

---
 htdocs/adherents/list.php                       |  2 +-
 htdocs/comm/mailing/list.php                    |  4 ++--
 htdocs/comm/propal/list.php                     |  2 +-
 htdocs/commande/list.php                        |  2 +-
 htdocs/commande/orderstoinvoice.php             |  2 +-
 htdocs/compta/facture/list.php                  |  2 +-
 htdocs/contact/list.php                         |  2 +-
 htdocs/contrat/list.php                         |  2 +-
 htdocs/don/list.php                             |  2 +-
 htdocs/expedition/list.php                      |  2 +-
 htdocs/expensereport/list.php                   |  2 +-
 htdocs/fichinter/list.php                       |  2 +-
 htdocs/filefunc.inc.php                         | 17 ++++++++++-------
 htdocs/fourn/commande/list.php                  |  3 ++-
 htdocs/fourn/commande/orderstoinvoice.php       |  2 +-
 htdocs/fourn/facture/list.php                   |  2 +-
 htdocs/holiday/list.php                         |  2 +-
 htdocs/main.inc.php                             | 14 +++++++++++---
 .../product/actions_card_product.class.php      |  2 +-
 htdocs/product/list.php                         |  2 +-
 htdocs/product/reassort.php                     |  2 +-
 htdocs/product/reassortlot.php                  |  2 +-
 htdocs/product/stock/list.php                   |  2 +-
 htdocs/product/stock/replenish.php              |  2 +-
 htdocs/product/stock/replenishorders.php        |  2 +-
 htdocs/product/stock/valo.php                   |  2 +-
 htdocs/projet/list.php                          |  3 +--
 htdocs/projet/tasks/list.php                    |  2 +-
 htdocs/societe/list.php                         |  2 +-
 htdocs/supplier_proposal/list.php               |  2 +-
 htdocs/user/group/index.php                     |  2 +-
 htdocs/user/hierarchy.php                       |  2 +-
 htdocs/user/index.php                           |  2 +-
 33 files changed, 54 insertions(+), 43 deletions(-)

diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index 28cd8773d53..4eda43dcca5 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -57,7 +57,7 @@ $type=GETPOST("type");
 $search_email=GETPOST("search_email");
 $search_categ = GETPOST("search_categ",'int');
 $catid        = GETPOST("catid",'int');
-$sall=GETPOST("sall");
+$sall=GETPOST('sall', 'alphanohtml');
 $optioncss = GETPOST('optioncss','alpha');
 
 if ($statut < -1) $statut = '';
diff --git a/htdocs/comm/mailing/list.php b/htdocs/comm/mailing/list.php
index 2d6fae37b98..7346c0045f5 100644
--- a/htdocs/comm/mailing/list.php
+++ b/htdocs/comm/mailing/list.php
@@ -41,8 +41,8 @@ $pagenext = $page + 1;
 if (! $sortorder) $sortorder="DESC";
 if (! $sortfield) $sortfield="m.date_creat";
 
-$sall=GETPOST("sall","alpha");
-$sref=GETPOST("sref","alpha");
+$sall=GETPOST('sall', 'alphanohtml');
+$sref=GETPOST("sref", "alpha");
 $filteremail=GETPOST('filteremail','alpha');
 
 // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index 44a2b9356e8..d85448397de 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -77,7 +77,7 @@ $viewstatut=GETPOST('viewstatut');
 $optioncss = GETPOST('optioncss','alpha');
 $object_statut=GETPOST('propal_statut');
 
-$sall=GETPOST("sall");
+$sall=GETPOST('sall', 'alphanohtml');
 $mesg=(GETPOST("msg") ? GETPOST("msg") : GETPOST("mesg"));
 
 $day=GETPOST("day","int");
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 073a20bc391..80601ec9727 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -71,7 +71,7 @@ $search_zip=GETPOST('search_zip','alpha');
 $search_state=trim(GETPOST("search_state"));
 $search_country=GETPOST("search_country",'int');
 $search_type_thirdparty=GETPOST("search_type_thirdparty",'int');
-$sall=GETPOST('sall');
+$sall=GETPOST('sall', 'alphanohtml');
 $socid=GETPOST('socid','int');
 $search_user=GETPOST('search_user','int');
 $search_sale=GETPOST('search_sale','int');
diff --git a/htdocs/commande/orderstoinvoice.php b/htdocs/commande/orderstoinvoice.php
index 009326f1f41..40071a0b21d 100644
--- a/htdocs/commande/orderstoinvoice.php
+++ b/htdocs/commande/orderstoinvoice.php
@@ -52,7 +52,7 @@ $action			= GETPOST('action','alpha');
 $confirm		= GETPOST('confirm','alpha');
 $sref			= GETPOST('sref');
 $sref_client	= GETPOST('sref_client');
-$sall			= GETPOST('sall');
+$sall			= GETPOST('sall', 'alphanohtml');
 $socid			= GETPOST('socid','int');
 $selected		= GETPOST('orders_to_invoice');
 $sortfield		= GETPOST("sortfield",'alpha');
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 5dbbeb24e5a..cce94646616 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -52,7 +52,7 @@ $langs->load('bills');
 $langs->load('companies');
 $langs->load('products');
 
-$sall=trim(GETPOST('sall'));
+$sall=trim(GETPOST('sall', 'alphanohtml'));
 $projectid=(GETPOST('projectid')?GETPOST('projectid','int'):0);
 
 $id=(GETPOST('id','int')?GETPOST('id','int'):GETPOST('facid','int'));  // For backward compatibility
diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index ae0f8f9398a..b425ea56667 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -42,7 +42,7 @@ $ref = '';  // There is no ref for contacts
 if ($user->societe_id) $socid=$user->societe_id;
 $result = restrictedArea($user, 'contact', $contactid,'');
 
-$sall=GETPOST("sall");
+$sall=GETPOST('sall', 'alphanohtml');
 $search_firstlast_only=GETPOST("search_firstlast_only");
 $search_lastname=GETPOST("search_lastname");
 $search_firstname=GETPOST("search_firstname");
diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index 7436c16fe69..8a22f7ee324 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -53,7 +53,7 @@ $search_country=GETPOST("search_country",'int');
 $search_type_thirdparty=GETPOST("search_type_thirdparty",'int');
 $search_contract=GETPOST('search_contract');
 $search_ref_supplier=GETPOST('search_ref_supplier','alpha');
-$sall=GETPOST('sall');
+$sall=GETPOST('sall', 'alphanohtml');
 $search_status=GETPOST('search_status');
 $socid=GETPOST('socid');
 $search_user=GETPOST('search_user','int');
diff --git a/htdocs/don/list.php b/htdocs/don/list.php
index d925573b859..1b490b34085 100644
--- a/htdocs/don/list.php
+++ b/htdocs/don/list.php
@@ -43,7 +43,7 @@ if (! $sortorder) $sortorder="DESC";
 if (! $sortfield) $sortfield="d.datedon";
 
 $statut=isset($_GET["statut"])?$_GET["statut"]:"-1";
-$search_all=GETPOST('sall','alpha');
+$search_all=GETPOST('sall', 'alphanohtml');
 $search_ref=GETPOST('search_ref','alpha');
 $search_company=GETPOST('search_company','alpha');
 $search_name=GETPOST('search_name','alpha');
diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php
index 65d7fd5223e..68f3add0229 100644
--- a/htdocs/expedition/list.php
+++ b/htdocs/expedition/list.php
@@ -50,7 +50,7 @@ $search_zip=GETPOST('search_zip','alpha');
 $search_state=trim(GETPOST("search_state"));
 $search_country=GETPOST("search_country",'int');
 $search_type_thirdparty=GETPOST("search_type_thirdparty",'int');
-$sall = GETPOST('sall');
+$sall = GETPOST('sall', 'alphanohtml');
 $optioncss = GETPOST('optioncss','alpha');
 
 $limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php
index 13b95311dee..58541330c83 100644
--- a/htdocs/expensereport/list.php
+++ b/htdocs/expensereport/list.php
@@ -63,7 +63,7 @@ if (!$sortorder) $sortorder="DESC";
 if (!$sortfield) $sortfield="d.date_debut";
 
 
-$sall         = GETPOST('sall');
+$sall         = GETPOST('sall', 'alphanohtml');
 $search_ref   = GETPOST('search_ref');
 $search_user  = GETPOST('search_user','int');
 $search_amount_ht = GETPOST('search_amount_ht','alpha');
diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php
index 563c57f5ad7..9ef7d22ad10 100644
--- a/htdocs/fichinter/list.php
+++ b/htdocs/fichinter/list.php
@@ -62,7 +62,7 @@ $search_ref=GETPOST('search_ref')?GETPOST('search_ref','alpha'):GETPOST('search_
 $search_company=GETPOST('search_company','alpha');
 $search_desc=GETPOST('search_desc','alpha');
 $search_status=GETPOST('search_status');
-$sall=GETPOST('sall');
+$sall=GETPOST('sall', 'alphanohtml');
 $optioncss = GETPOST('optioncss','alpha');
 
 // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php
index 427f428d652..59a3bd3a809 100644
--- a/htdocs/filefunc.inc.php
+++ b/htdocs/filefunc.inc.php
@@ -164,14 +164,17 @@ if (empty($multicompany_force_entity)) $multicompany_force_entity=0; // To force
 // This test check if referrer ($_SERVER['HTTP_REFERER']) is same web site than Dolibarr ($_SERVER['HTTP_HOST'])
 // when we post forms (we allow GET to allow direct link to access a particular page).
 // Note about $_SERVER[HTTP_HOST/SERVER_NAME]: http://shiflett.org/blog/2006/mar/server-name-versus-http-host
-if (! defined('NOCSRFCHECK') && empty($dolibarr_nocsrfcheck)
-    && ! empty($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] != 'GET' && ! empty($_SERVER['HTTP_HOST'])
-    && (empty($_SERVER['HTTP_REFERER']) || ! preg_match('/'.preg_quote($_SERVER['HTTP_HOST'],'/').'/i', $_SERVER['HTTP_REFERER'])))
+if (! defined('NOCSRFCHECK') && empty($dolibarr_nocsrfcheck))
 {
-	//print 'NOCSRFCHECK='.defined('NOCSRFCHECK').' REQUEST_METHOD='.$_SERVER['REQUEST_METHOD'].' HTTP_POST='.$_SERVER['HTTP_HOST'].' HTTP_REFERER='.$_SERVER['HTTP_REFERER'];
-	print "Access refused by CSRF protection in main.inc.php.\n";
-	print "If you access your server behind a proxy using url rewriting, you might add the line \$dolibarr_nocsrfcheck=1 into your conf.php file.\n";
-	die;
+    if (! empty($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] != 'GET' && ! empty($_SERVER['HTTP_HOST'])
+    && (empty($_SERVER['HTTP_REFERER']) || ! preg_match('/'.preg_quote($_SERVER['HTTP_HOST'],'/').'/i', $_SERVER['HTTP_REFERER'])))
+    {
+    	//print 'NOCSRFCHECK='.defined('NOCSRFCHECK').' REQUEST_METHOD='.$_SERVER['REQUEST_METHOD'].' HTTP_POST='.$_SERVER['HTTP_HOST'].' HTTP_REFERER='.$_SERVER['HTTP_REFERER'];
+    	print "Access refused by CSRF protection in main.inc.php. Referer of form is outside server that serve the POST.\n";
+        print "If you access your server behind a proxy using url rewriting, you might check that all HTTP header is propagated (or add the line \$dolibarr_nocsrfcheck=1 into your conf.php file).\n";
+    	die;
+    }
+    // Another test is done later on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on.
 }
 if (empty($dolibarr_main_db_host))
 {
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index 49de2dac7a3..42773058471 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -54,6 +54,8 @@ $orderday=GETPOST("orderday","int");
 $deliveryyear=GETPOST("deliveryyear","int");
 $deliverymonth=GETPOST("deliverymonth","int");
 $deliveryday=GETPOST("deliveryday","int");
+
+$sall=GETPOST('search_all', 'alphanohtml');
 $search_product_category=GETPOST('search_product_category','int');
 $search_ref=GETPOST('search_ref');
 $search_refsupp=GETPOST('search_refsupp');
@@ -69,7 +71,6 @@ $search_ht=GETPOST('search_ht');
 $search_ttc=GETPOST('search_ttc');
 $search_status=(GETPOST('search_status','alpha')!=''?GETPOST('search_status','alpha'):GETPOST('statut','alpha'));	// alpha and not intbecause it can be '6,7'
 $optioncss = GETPOST('optioncss','alpha');
-$sall=GETPOST('search_all');
 $socid = GETPOST('socid','int');
 $search_sale=GETPOST('search_sale','int');
 $search_total_ht=GETPOST('search_total_ht','alpha');
diff --git a/htdocs/fourn/commande/orderstoinvoice.php b/htdocs/fourn/commande/orderstoinvoice.php
index f804a1d9ab7..32f1a5538b5 100644
--- a/htdocs/fourn/commande/orderstoinvoice.php
+++ b/htdocs/fourn/commande/orderstoinvoice.php
@@ -53,7 +53,7 @@ $action = GETPOST('action', 'alpha');
 $confirm = GETPOST('confirm', 'alpha');
 $sref = GETPOST('sref');
 $sref_client = GETPOST('sref_client');
-$sall = GETPOST('sall');
+$sall = GETPOST('sall', 'alphanohtml');
 $socid = GETPOST('socid', 'int');
 $selected = GETPOST('orders_to_invoice');
 $sortfield = GETPOST("sortfield", 'alpha');
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index 3afb97c5fb1..396d5ffd8a5 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -88,7 +88,7 @@ $toselect = GETPOST('toselect', 'array');
 $option = GETPOST('option');
 if ($option == 'late') $filter = 'paye:0';
 
-$search_all = GETPOST('sall');
+$search_all = GETPOST('sall', 'alphanohtml');
 $search_label = GETPOST("search_label","alpha");
 $search_company = GETPOST("search_company","alpha");
 $search_amount_no_tax = GETPOST("search_amount_no_tax","alpha");
diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php
index 131dcc3651b..1ab8fbd785f 100644
--- a/htdocs/holiday/list.php
+++ b/htdocs/holiday/list.php
@@ -55,7 +55,7 @@ $pagenext = $page + 1;
 
 $id = GETPOST('id','int');
 
-$sall            = GETPOST('sall');
+$sall            = GETPOST('sall', 'alphanohtml');
 $search_ref      = GETPOST('search_ref');
 $month_create    = GETPOST('month_create');
 $year_create     = GETPOST('year_create');
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index dd45222fa42..9d97770e48a 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -298,16 +298,24 @@ if ((! empty($conf->global->MAIN_VERSION_LAST_UPGRADE) && ($conf->global->MAIN_V
 // Creation of a token against CSRF vulnerabilities
 if (! defined('NOTOKENRENEWAL'))
 {
-    $token = dol_hash(uniqid(mt_rand(),TRUE)); // Generates a hash of a random number
     // roulement des jetons car cree a chaque appel
     if (isset($_SESSION['newtoken'])) $_SESSION['token'] = $_SESSION['newtoken'];
+    
+    // Save in $_SESSION['newtoken'] what will be next token. Into forms, we will add param token = $_SESSION['newtoken']
+    $token = dol_hash(uniqid(mt_rand(),TRUE)); // Generates a hash of a random number
     $_SESSION['newtoken'] = $token;
 }
 if (! defined('NOCSRFCHECK') && empty($dolibarr_nocsrfcheck) && ! empty($conf->global->MAIN_SECURITY_CSRF_WITH_TOKEN))	// Check validity of token, only if option enabled (this option breaks some features sometimes)
 {
-    if ($_SERVER['REQUEST_METHOD'] === 'POST')
+    if ($_SERVER['REQUEST_METHOD'] == 'POST' && ! GETPOST('token')) // Note, offender can still send request by GET
     {
-        if (GETPOST('token') != $_SESSION['token'])
+        print "Access refused by CSRF protection in main.inc.php. Token not provided.\n";
+        print "If you access your server behind a proxy using url rewriting, you might check that all HTTP header is propagated (or add the line \$dolibarr_nocsrfcheck=1 into your conf.php file).\n";
+        die;
+    }
+    if ($_SERVER['REQUEST_METHOD'] === 'POST')  // This test must be after loading $_SESSION['token'].
+    {
+        if (GETPOST('token', 'alpha') != $_SESSION['token'])
         {
             dol_syslog("Invalid token in ".$_SERVER['HTTP_REFERER'].", action=".GETPOST('action').", _POST['token']=".GETPOST('token').", _SESSION['token']=".$_SESSION['token'], LOG_WARNING);
             //print 'Unset POST by CSRF protection in main.inc.php.';	// Do not output anything because this create problems when using the BACK button on browsers.
diff --git a/htdocs/product/canvas/product/actions_card_product.class.php b/htdocs/product/canvas/product/actions_card_product.class.php
index 06803e8239d..8db1ae21469 100644
--- a/htdocs/product/canvas/product/actions_card_product.class.php
+++ b/htdocs/product/canvas/product/actions_card_product.class.php
@@ -326,7 +326,7 @@ class ActionsCardProduct
         $this->list_datas = array();
 
 		// Clean parameters
-		$sall=trim(GETPOST("sall"));
+		$sall=trim(GETPOST('sall', 'alphanohtml'));
 
 		foreach($this->field_list as $field)
 		{
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index 9efdca6a4d0..1aec109474e 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -49,7 +49,7 @@ $action = GETPOST('action');
 $sref=GETPOST("sref");
 $sbarcode=GETPOST("sbarcode");
 $snom=GETPOST("snom");
-$sall=GETPOST("sall");
+$sall=GETPOST('sall', 'alphanohtml');
 $type=GETPOST("type","int");
 $search_sale = GETPOST("search_sale");
 $search_categ = GETPOST("search_categ",'int');
diff --git a/htdocs/product/reassort.php b/htdocs/product/reassort.php
index 13bc0fef186..e3e9af6a61a 100644
--- a/htdocs/product/reassort.php
+++ b/htdocs/product/reassort.php
@@ -42,7 +42,7 @@ $result=restrictedArea($user,'produit|service');
 $action=GETPOST('action','alpha');
 $sref=GETPOST("sref");
 $snom=GETPOST("snom");
-$sall=GETPOST("sall");
+$sall=GETPOST('sall', 'alphanohtml');
 $type=GETPOST("type","int");
 $sbarcode=GETPOST("sbarcode");
 $catid=GETPOST('catid','int');
diff --git a/htdocs/product/reassortlot.php b/htdocs/product/reassortlot.php
index 01285f09417..40b96c24db1 100644
--- a/htdocs/product/reassortlot.php
+++ b/htdocs/product/reassortlot.php
@@ -44,7 +44,7 @@ $result=restrictedArea($user,'produit|service');
 $action=GETPOST('action','alpha');
 $sref=GETPOST("sref");
 $snom=GETPOST("snom");
-$sall=GETPOST("sall");
+$sall=GETPOST('sall', 'alphanohtml');
 $type=GETPOST("type","int");
 $sbarcode=GETPOST("sbarcode",'alpha');
 $search_warehouse=GETPOST('search_warehouse','alpha');
diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php
index 0bfd9048352..ed1b91b4ad5 100644
--- a/htdocs/product/stock/list.php
+++ b/htdocs/product/stock/list.php
@@ -32,9 +32,9 @@ $langs->load("stocks");
 // Security check
 $result=restrictedArea($user,'stock');
 
+$sall=GETPOST('sall', 'alphanohtml');
 $search_ref=GETPOST("sref","alpha")?GETPOST("sref","alpha"):GETPOST("search_ref","alpha");
 $search_label=GETPOST("snom","alpha")?GETPOST("snom","alpha"):GETPOST("search_label","alpha");
-$sall=GETPOST("sall","alpha");
 $search_status=GETPOST("search_status","int");
 
 $limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php
index 437361b5cf5..26c6ab1dfd1 100644
--- a/htdocs/product/stock/replenish.php
+++ b/htdocs/product/stock/replenish.php
@@ -48,7 +48,7 @@ $result=restrictedArea($user,'produit|service');
 $action = GETPOST('action','alpha');
 $sref = GETPOST('sref', 'alpha');
 $snom = GETPOST('snom', 'alpha');
-$sall = GETPOST('sall', 'alpha');
+$sall = GETPOST('sall', 'alphanohtml');
 $type = GETPOST('type','int');
 $tobuy = GETPOST('tobuy', 'int');
 $salert = GETPOST('salert', 'alpha');
diff --git a/htdocs/product/stock/replenishorders.php b/htdocs/product/stock/replenishorders.php
index 4986d7c524d..5b1fda0371f 100644
--- a/htdocs/product/stock/replenishorders.php
+++ b/htdocs/product/stock/replenishorders.php
@@ -39,11 +39,11 @@ $langs->load("orders");
 if ($user->societe_id) $socid=$user->societe_id;
 $result=restrictedArea($user,'produit|service');
 
+$sall = GETPOST('search_all', 'alphanohtml');
 $sref = GETPOST('search_ref', 'alpha');
 $snom = GETPOST('search_nom', 'alpha');
 $suser = GETPOST('search_user', 'alpha');
 $sttc = GETPOST('search_ttc', 'alpha');
-$sall = GETPOST('search_all', 'alpha');
 $sdate = GETPOST('search_date', 'alpha');
 $page = GETPOST('page', 'int');
 $sproduct = GETPOST('sproduct', 'int');
diff --git a/htdocs/product/stock/valo.php b/htdocs/product/stock/valo.php
index be56636ee57..b13dd0bd27e 100644
--- a/htdocs/product/stock/valo.php
+++ b/htdocs/product/stock/valo.php
@@ -33,7 +33,7 @@ $result=restrictedArea($user,'stock');
 
 $sref=GETPOST("sref");
 $snom=GETPOST("snom");
-$sall=GETPOST("sall");
+$sall=GETPOST('sall', 'alphanohtml');
 
 $sortfield = GETPOST("sortfield");
 $sortorder = GETPOST("sortorder");
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index dadc199d146..51f260cac6f 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -62,13 +62,12 @@ $offset = $limit * $page ;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
-$search_all=GETPOST("search_all");
+$search_all=GETPOST('search_all', 'alphanohtml');
 $search_categ=GETPOST("search_categ",'alpha');
 $search_ref=GETPOST("search_ref");
 $search_label=GETPOST("search_label");
 $search_societe=GETPOST("search_societe");
 $search_year=GETPOST("search_year");
-$search_all=GETPOST("search_all");
 $search_status=GETPOST("search_status",'int');
 $search_opp_status=GETPOST("search_opp_status",'alpha');
 $search_opp_percent=GETPOST("search_opp_percent",'alpha');
diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php
index 74f9b122f14..30a89109115 100644
--- a/htdocs/projet/tasks/list.php
+++ b/htdocs/projet/tasks/list.php
@@ -36,7 +36,7 @@ $langs->load('companies');
 
 $id=GETPOST('id','int');
 
-$search_all=GETPOST('search_all');
+$search_all=GETPOST('search_all', 'alphanohtml');
 $search_project=GETPOST('search_project');
 if (! isset($_GET['search_projectstatus']) && ! isset($_POST['search_projectstatus'])) 
 {
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 393d3a1fad4..0a79921d153 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -48,7 +48,7 @@ $socid = GETPOST('socid','int');
 if ($user->societe_id) $socid=$user->societe_id;
 $result = restrictedArea($user,'societe',$socid,'');
 
-$search_all=trim(GETPOST("sall"));
+$search_all=trim(GETPOST('sall', 'alphanohtml'));
 $search_nom=trim(GETPOST("search_nom"));
 $search_nom_only=trim(GETPOST("search_nom_only"));
 $search_barcode=trim(GETPOST("sbarcode"));
diff --git a/htdocs/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php
index caf79597e53..7a841a13b19 100644
--- a/htdocs/supplier_proposal/list.php
+++ b/htdocs/supplier_proposal/list.php
@@ -66,7 +66,7 @@ $search_author=GETPOST('search_author','alpha');
 $search_status=GETPOST('viewstatut','alpha')?GETPOST('viewstatut','alpha'):GETPOST('search_status','int');
 $object_statut=$db->escape(GETPOST('supplier_proposal_statut'));
 
-$sall=GETPOST("sall");
+$sall=GETPOST('sall', 'alphanohtml');
 $mesg=(GETPOST("msg") ? GETPOST("msg") : GETPOST("mesg"));
 $year=GETPOST("year");
 $month=GETPOST("month");
diff --git a/htdocs/user/group/index.php b/htdocs/user/group/index.php
index 94c12147f1a..12e51a79d0f 100644
--- a/htdocs/user/group/index.php
+++ b/htdocs/user/group/index.php
@@ -34,7 +34,7 @@ if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS))
 
 $langs->load("users");
 
-$sall=GETPOST('sall');
+$sall=GETPOST('sall', 'alphanohtml');
 $search_group=GETPOST('search_group');
 $optioncss = GETPOST('optioncss','alpha');
 
diff --git a/htdocs/user/hierarchy.php b/htdocs/user/hierarchy.php
index bb558bd56b3..2bba66d464e 100644
--- a/htdocs/user/hierarchy.php
+++ b/htdocs/user/hierarchy.php
@@ -39,7 +39,7 @@ $socid=0;
 if ($user->societe_id > 0)
 	$socid = $user->societe_id;
 
-$sall=GETPOST('sall','alpha');
+$sall=GETPOST('sall', 'alphanohtml');
 $search_user=GETPOST('search_user','alpha');
 
 $userstatic=new User($db);
diff --git a/htdocs/user/index.php b/htdocs/user/index.php
index 623e2df3434..9e7c78f9799 100644
--- a/htdocs/user/index.php
+++ b/htdocs/user/index.php
@@ -110,7 +110,7 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
 }
 
 // Init search fields
-$sall=GETPOST('sall','alpha');
+$sall=GETPOST('sall', 'alphanohtml');
 $search_user=GETPOST('search_user','alpha');
 $search_login=GETPOST('search_login','alpha');
 $search_lastname=GETPOST('search_lastname','alpha');

From 39b45498134612f0f6c57d2d64258e74de2c74ed Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 9 May 2017 19:43:50 +0200
Subject: [PATCH 265/505] Make option MAIN_SECURITY_CSRF_WITH_TOKEN more
 visible

---
 htdocs/install/mysql/data/llx_const.sql | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/install/mysql/data/llx_const.sql b/htdocs/install/mysql/data/llx_const.sql
index b34e0cac513..bf76d378789 100644
--- a/htdocs/install/mysql/data/llx_const.sql
+++ b/htdocs/install/mysql/data/llx_const.sql
@@ -35,6 +35,7 @@ insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_N
 insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_FEATURES_LEVEL','0','chaine','Level of features to show: -1=stable+deprecated, 0=stable only (default), 1=stable+experimental, 2=stable+experimental+development',1,0);
 insert into llx_const (name, value, type, note, visible, entity) values ('MAILING_LIMIT_SENDBYWEB','25','chaine','Number of targets to defined packet size when sending mass email',1,0);
 insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_ENABLE_LOG_TO_HTML','0','chaine','If this option is set to 1, it is possible to see log output at end of HTML sources by adding paramater logtohtml=1 on URL. Module log must also be enabled.',1,0);
+insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_SECURITY_CSRF_WITH_TOKEN','0','chaine','If this option is set to 1, a CSRF protection using an antiCSRF token is added.',1,0);
 
 -- Hidden and common to all entities
 insert into llx_const (name, value, type, note, visible, entity) values ('SYSLOG_HANDLERS','["mod_syslog_file"]','chaine','Which logger to use',0,0);

From b8b91db0071e8e660bffe0b23b760f77641464ed Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 9 May 2017 21:01:37 +0200
Subject: [PATCH 266/505] Use function top_httphead to include headers in
 pages.

---
 htdocs/admin/agenda_xcal.php             | 10 +++++-----
 htdocs/cashdesk/affIndex.php             |  3 ---
 htdocs/cashdesk/facturation_dhtml.php    |  3 +--
 htdocs/cashdesk/tpl/ticket.tpl.php       |  3 ++-
 htdocs/core/ajax/check_notifications.php |  7 +++++++
 htdocs/core/antispamimage.php            |  3 ++-
 htdocs/core/js/datepicker.js.php         |  2 +-
 htdocs/core/js/lib_head.js.php           |  2 +-
 htdocs/core/js/lib_notification.js.php   | 11 ++++++-----
 htdocs/core/js/select2_locale.js.php     |  2 +-
 htdocs/core/js/timepicker.js.php         |  2 +-
 htdocs/core/lib/functions.lib.php        |  6 +++---
 htdocs/document.php                      |  2 +-
 htdocs/install/inc.php                   |  3 ++-
 htdocs/main.inc.php                      | 18 ++++++++++++------
 htdocs/paybox/lib/paybox.lib.php         |  6 ++++--
 htdocs/paypal/lib/paypal.lib.php         |  3 ++-
 htdocs/projet/jsgantt_language.js.php    |  4 ++--
 htdocs/support/inc.php                   |  3 ++-
 htdocs/theme/eldy/style.css.php          |  2 +-
 htdocs/theme/md/style.css.php            |  2 +-
 htdocs/viewimage.php                     |  4 ++--
 22 files changed, 59 insertions(+), 42 deletions(-)

diff --git a/htdocs/admin/agenda_xcal.php b/htdocs/admin/agenda_xcal.php
index 0e66125ba7c..1895eb5b15d 100644
--- a/htdocs/admin/agenda_xcal.php
+++ b/htdocs/admin/agenda_xcal.php
@@ -97,7 +97,7 @@ print "<td>".$langs->trans("Value")."</td>";
 print "<td>&nbsp;</td>";
 print "</tr>";
 
-print "<tr ".$bc[false].">";
+print '<tr class="oddeven">';
 print '<td class="fieldrequired">'.$langs->trans("PasswordTogetVCalExport")."</td>";
 print '<td><input required="required" type="text" class="flat" id="MAIN_AGENDA_XCAL_EXPORTKEY" name="MAIN_AGENDA_XCAL_EXPORTKEY" value="' . (GETPOST('MAIN_AGENDA_XCAL_EXPORTKEY','alpha')?GETPOST('MAIN_AGENDA_XCAL_EXPORTKEY','alpha'):$conf->global->MAIN_AGENDA_XCAL_EXPORTKEY) . '" size="40">';
 if (! empty($conf->use_javascript_ajax))
@@ -106,13 +106,13 @@ print '</td>';
 print "<td>&nbsp;</td>";
 print "</tr>";
 
-print "<tr ".$bc[true].">";
+print '<tr class="oddeven">';
 print "<td>".$langs->trans("PastDelayVCalExport")."</td>";
 print "<td><input type=\"text\" class=\"flat\" name=\"MAIN_AGENDA_EXPORT_PAST_DELAY\" value=\"". (GETPOST('MAIN_AGENDA_EXPORT_PAST_DELAY','alpha')?GETPOST('MAIN_AGENDA_EXPORT_PAST_DELAY','alpha'):$conf->global->MAIN_AGENDA_EXPORT_PAST_DELAY) . "\" size=\"10\"> ".$langs->trans("days")."</td>";
 print "<td>&nbsp;</td>";
 print "</tr>";
 
-print "<tr ".$bc[false].">";
+print '<tr class="oddeven">';
 print "<td>".$langs->trans("UseACacheDelay")."</td>";
 print "<td><input type=\"text\" class=\"flat\" name=\"MAIN_AGENDA_EXPORT_CACHE\" value=\"". (GETPOST('MAIN_AGENDA_EXPORT_CACHE','alpha')?GETPOST('MAIN_AGENDA_EXPORT_CACHE','alpha'):$conf->global->MAIN_AGENDA_EXPORT_CACHE) . "\" size=\"10\"></td>";
 print "<td>&nbsp;</td>";
@@ -128,8 +128,8 @@ print '<tr class="liste_titre">';
 print '<td width="25%">'.$langs->trans("Parameter")."</td>";
 print "<td>".$langs->trans("Value")."</td>";
 print "</tr>";
-print "<tr ".$bc[false].">";
-print '<td class="fieldrequired">'.$langs->trans("FixTZ")."</td>";
+print '<tr class="oddeven">';
+print '<td>'.$langs->trans("FixTZ")."</td>";
 print "<td>";
 print '<input class="flat" type="text" size="4" name="AGENDA_EXPORT_FIX_TZ" value="'.$conf->global->AGENDA_EXPORT_FIX_TZ.'">';
 print ' &nbsp; '.$langs->trans("FillThisOnlyIfRequired");
diff --git a/htdocs/cashdesk/affIndex.php b/htdocs/cashdesk/affIndex.php
index 6b1d13f719f..b5432b94eec 100644
--- a/htdocs/cashdesk/affIndex.php
+++ b/htdocs/cashdesk/affIndex.php
@@ -45,9 +45,6 @@ $langs->load("cashdesk");
 
 $form = new Form($db);
 
-//header("Content-type: text/html; charset=UTF-8");
-//header("Content-type: text/html; charset=".$conf->file->character_set_client);
-
 $arrayofjs=array();
 $arrayofcss=array('/cashdesk/css/style.css');
 
diff --git a/htdocs/cashdesk/facturation_dhtml.php b/htdocs/cashdesk/facturation_dhtml.php
index 8d4ebf8af31..3046644c35e 100644
--- a/htdocs/cashdesk/facturation_dhtml.php
+++ b/htdocs/cashdesk/facturation_dhtml.php
@@ -39,8 +39,7 @@ if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/cashdesk/include/environnement.php';
 
-//header("Content-type: text/html; charset=UTF-8");
-header("Content-type: text/html; charset=".$conf->file->character_set_client);
+top_httphead('text/html');
 
 $search = GETPOST("code", "alpha");
 
diff --git a/htdocs/cashdesk/tpl/ticket.tpl.php b/htdocs/cashdesk/tpl/ticket.tpl.php
index 40be470c429..82b84ba3b56 100644
--- a/htdocs/cashdesk/tpl/ticket.tpl.php
+++ b/htdocs/cashdesk/tpl/ticket.tpl.php
@@ -20,7 +20,8 @@ include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 
 $langs->load("main");
 $langs->load('cashdesk');
-header("Content-type: text/html; charset=".$conf->file->character_set_client);
+
+top_httphead('text/html');
 
 $facid=GETPOST('facid','int');
 $object=new Facture($db);
diff --git a/htdocs/core/ajax/check_notifications.php b/htdocs/core/ajax/check_notifications.php
index fa3edd7a4be..332626fbabd 100644
--- a/htdocs/core/ajax/check_notifications.php
+++ b/htdocs/core/ajax/check_notifications.php
@@ -24,6 +24,13 @@ if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
 
 require '../../main.inc.php';
 
+
+/*
+ * View
+ */
+
+top_httphead('text/html');  // TODO Use a json mime type
+
 global $user, $db, $langs, $conf;
 
 $time = (int) GETPOST('time');    // Use the time parameter that is always increased by time_update, even if call is late
diff --git a/htdocs/core/antispamimage.php b/htdocs/core/antispamimage.php
index a16844dd715..816763eeaf5 100644
--- a/htdocs/core/antispamimage.php
+++ b/htdocs/core/antispamimage.php
@@ -58,7 +58,8 @@ if (empty($img))
     exit;
 }
 
-header("Content-type: image/png");
+// Define mime type
+top_httphead('image/png');
 
 $background_color = imagecolorallocate($img, 250, 250, 250);
 $ecriture_color = imagecolorallocate($img, 0, 0, 0);
diff --git a/htdocs/core/js/datepicker.js.php b/htdocs/core/js/datepicker.js.php
index 02666409fc3..50c140f6f82 100644
--- a/htdocs/core/js/datepicker.js.php
+++ b/htdocs/core/js/datepicker.js.php
@@ -37,7 +37,7 @@ session_cache_limiter(FALSE);
 require_once '../../main.inc.php';
 
 // Define javascript type
-header('Content-type: text/javascript; charset=UTF-8');
+top_httphead('text/javascript; charset=UTF-8');
 // Important: Following code is to avoid page request by browser and PHP CPU at each Dolibarr page access.
 if (empty($dolibarr_nocache)) header('Cache-Control: max-age=3600, public, must-revalidate');
 else header('Cache-Control: no-cache');
diff --git a/htdocs/core/js/lib_head.js.php b/htdocs/core/js/lib_head.js.php
index 8909f446812..e604f3281f9 100644
--- a/htdocs/core/js/lib_head.js.php
+++ b/htdocs/core/js/lib_head.js.php
@@ -39,7 +39,7 @@ session_cache_limiter(FALSE);
 require_once '../../main.inc.php';
 
 // Define javascript type
-header('Content-type: text/javascript; charset=UTF-8');
+top_httphead('text/javascript; charset=UTF-8');
 // Important: Following code is to avoid page request by browser and PHP CPU at each Dolibarr page access.
 if (empty($dolibarr_nocache)) header('Cache-Control: max-age=3600, public, must-revalidate');
 else header('Cache-Control: no-cache');
diff --git a/htdocs/core/js/lib_notification.js.php b/htdocs/core/js/lib_notification.js.php
index a3b90a35db6..b640f4cc81b 100644
--- a/htdocs/core/js/lib_notification.js.php
+++ b/htdocs/core/js/lib_notification.js.php
@@ -33,21 +33,22 @@ if (! ($_SERVER['HTTP_REFERER'] === $dolibarr_main_url_root . '/' || $_SERVER['H
 {
     global $langs, $conf;
 
-    // Define javascript type
-    header('Content-type: text/javascript; charset=UTF-8');
-
+    top_httphead('text/javascript; charset=UTF-8');
+    
     $nowtime = time();
     //$nowtimeprevious = floor($nowtime / 60) * 60;   // auto_check_events_not_before is rounded to previous minute
 
     // TODO Try to make a solution with only a javascript timer that is easier. Difficulty is to avoid notification twice when.
+    /* session already started into main
     session_cache_limiter(FALSE);
     header('Cache-Control: no-cache');
-    session_start();
+    session_set_cookie_params(0, '/', null, false, true);   // Add tag httponly on session cookie
+    session_start();*/
     if (! isset($_SESSION['auto_check_events_not_before'])) 
     {
         print 'console.log("_SESSION[auto_check_events_not_before] is not set");'."\n";
         // Round to eliminate the seconds
-        $_SESSION['auto_check_events_not_before'] = $nowtime;   // auto_check_events_not_before is rounded to previous minute
+        $_SESSION['auto_check_events_not_before'] = $nowtime;
     }
     print 'var nowtime = ' . $nowtime . ';' . "\n";
     print 'var login = \'' . $_SESSION['dol_login'] . '\';' . "\n";
diff --git a/htdocs/core/js/select2_locale.js.php b/htdocs/core/js/select2_locale.js.php
index 31c6a91bc74..aa62b5a0ec1 100644
--- a/htdocs/core/js/select2_locale.js.php
+++ b/htdocs/core/js/select2_locale.js.php
@@ -37,7 +37,7 @@ session_cache_limiter(FALSE);
 require_once '../../main.inc.php';
 
 // Define javascript type
-header('Content-type: text/javascript; charset=UTF-8');
+top_httphead('text/javascript; charset=UTF-8');
 // Important: Following code is to avoid page request by browser and PHP CPU at each Dolibarr page access.
 if (empty($dolibarr_nocache)) header('Cache-Control: max-age=3600, public, must-revalidate');
 else header('Cache-Control: no-cache');
diff --git a/htdocs/core/js/timepicker.js.php b/htdocs/core/js/timepicker.js.php
index cc33a5a3933..8342ac9e3ac 100644
--- a/htdocs/core/js/timepicker.js.php
+++ b/htdocs/core/js/timepicker.js.php
@@ -37,7 +37,7 @@ session_cache_limiter(FALSE);
 require_once '../../main.inc.php';
 
 // Define javascript type
-header('Content-type: text/javascript; charset=UTF-8');
+top_httphead('text/javascript; charset=UTF-8');
 // Important: Following code is to avoid page request by browser and PHP CPU at each Dolibarr page access.
 if (empty($dolibarr_nocache)) header('Cache-Control: max-age=3600, public, must-revalidate');
 else header('Cache-Control: no-cache');
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index e3c6cb7d5cd..8dbc705c5b2 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -400,11 +400,11 @@ function GETPOST($paramname, $check='', $method=0, $filter=NULL, $options=NULL)
 
 
 /**
- *  Return a prefix to use for this Dolibarr instance for session or cookie names.
+ *  Return a prefix to use for this Dolibarr instance, for session/cookie names or email id.
  *  This prefix is unique for instance and avoid conflict between multi-instances,
- *  even when having two instances with one root dir or two instances in virtual servers
+ *  even when having two instances with one root dir or two instances in virtual servers.
  *
- *  @param  string  $mode       '' or 'email'              
+ *  @param  string  $mode       '' (prefix for session name) or 'email' (prefix for email id)              
  *  @return	string      		A calculated prefix
  */
 function dol_getprefix($mode='')
diff --git a/htdocs/document.php b/htdocs/document.php
index 02eb7193675..4e4f18826ef 100644
--- a/htdocs/document.php
+++ b/htdocs/document.php
@@ -170,9 +170,9 @@ if (! file_exists($original_file_osencoded))
 }
 
 // Permissions are ok and file found, so we return it
+top_httphead($type);
 header('Content-Description: File Transfer');
 if ($encoding)   header('Content-Encoding: '.$encoding);
-if ($type)       header('Content-Type: '.$type.(preg_match('/text/',$type)?'; charset="'.$conf->file->character_set_client:''));
 // Add MIME Content-Disposition from RFC 2183 (inline=automatically displayed, atachment=need user action to open)
 if ($attachment) header('Content-Disposition: attachment; filename="'.$filename.'"');
 else header('Content-Disposition: inline; filename="'.$filename.'"');
diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php
index 840fa709ddf..6da4125a56c 100644
--- a/htdocs/install/inc.php
+++ b/htdocs/install/inc.php
@@ -384,7 +384,8 @@ function pHeader($subtitle,$next,$action='set',$param='',$forcejqueryurl='',$css
 
     // We force the content charset
     header("Content-type: text/html; charset=".$conf->file->character_set_client);
-
+    header("X-Content-Type-Options: nosniff");
+    
     print '<!DOCTYPE HTML>'."\n";
     print '<html>'."\n";
     print '<head>'."\n";
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index ab92df9ca12..11dccf47ade 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -197,6 +197,7 @@ $sessionname='DOLSESSID_'.$prefix;
 $sessiontimeout='DOLSESSTIMEOUT_'.$prefix;
 if (! empty($_COOKIE[$sessiontimeout])) ini_set('session.gc_maxlifetime',$_COOKIE[$sessiontimeout]);
 session_name($sessionname);
+session_set_cookie_params(0, '/', null, false, true);   // Add tag httponly on session cookie
 session_start();
 if (ini_get('register_globals'))    // Deprecated in 5.3 and removed in 5.4. To solve bug in using $_SESSION
 {
@@ -528,6 +529,7 @@ if (! defined('NOLOGIN'))
             dol_syslog('User not found, connexion refused');
             session_destroy();
             session_name($sessionname);
+            session_set_cookie_params(0, '/', null, false, true);   // Add tag httponly on session cookie
             session_start();    // Fixing the bug of register_globals here is useless since session is empty
 
             if ($resultFetchUser == 0)
@@ -586,6 +588,7 @@ if (! defined('NOLOGIN'))
             dol_syslog("Can't load user even if session logged. _SESSION['dol_login']=".$login, LOG_WARNING);
             session_destroy();
             session_name($sessionname);
+            session_set_cookie_params(0, '/', null, false, true);   // Add tag httponly on session cookie
             session_start();    // Fixing the bug of register_globals here is useless since session is empty
 
             if ($resultFetchUser == 0)
@@ -967,19 +970,22 @@ if (! function_exists("llxHeader"))
 /**
  *  Show HTTP header
  *
+ *  @param  string  $contenttype    Content type. For example, 'text/html'
  *  @return	void
  */
-function top_httphead()
+function top_httphead($contenttype='text/html')
 {
     global $conf;
 
-    //header("Content-type: text/html; charset=UTF-8");
-    header("Content-type: text/html; charset=".$conf->file->character_set_client);
-
+    if ($contenttype == 'text/html' ) header("Content-Type: text/html; charset=".$conf->file->character_set_client);
+    else header("Content-Type: ".$contenttype);
+    header("X-Content-Type-Options: nosniff");
+    header("X-Frame-Options: SAMEORIGIN");
+    
     // On the fly GZIP compression for all pages (if browser support it). Must set the bit 3 of constant to 1.
-    if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x04)) {
+    /*if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x04)) {
         ob_start("ob_gzhandler");
-    }
+    }*/
 }
 
 /**
diff --git a/htdocs/paybox/lib/paybox.lib.php b/htdocs/paybox/lib/paybox.lib.php
index 922679bcb86..ca5fd6a71ad 100644
--- a/htdocs/paybox/lib/paybox.lib.php
+++ b/htdocs/paybox/lib/paybox.lib.php
@@ -36,7 +36,8 @@ function llxHeaderPaybox($title, $head = "")
 	global $user, $conf, $langs;
 
 	header("Content-type: text/html; charset=".$conf->file->character_set_client);
-
+	header("X-Content-Type-Options: nosniff");
+	
 	print '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">';
 	//print '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" http://www.w3.org/TR/1999/REC-html401-19991224/strict.dtd>';
 	print "\n";
@@ -171,7 +172,8 @@ function print_paybox_redirect($PRICE,$CURRENCY,$EMAIL,$urlok,$urlko,$TAG)
     dol_syslog("PBX_TYPEPAIEMENT: $PBX_TYPEPAIEMENT", LOG_DEBUG);
 
     header("Content-type: text/html; charset=".$conf->file->character_set_client);
-
+    header("X-Content-Type-Options: nosniff");
+    
     print '<html>'."\n";
     print '<head>'."\n";
     print "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=".$conf->file->character_set_client."\">\n";
diff --git a/htdocs/paypal/lib/paypal.lib.php b/htdocs/paypal/lib/paypal.lib.php
index 4c1cb588f1f..b1be8f56647 100644
--- a/htdocs/paypal/lib/paypal.lib.php
+++ b/htdocs/paypal/lib/paypal.lib.php
@@ -35,7 +35,8 @@ function llxHeaderPaypal($title, $head = "")
 	global $user, $conf, $langs;
 
 	header("Content-type: text/html; charset=".$conf->file->character_set_client);
-
+	header("X-Content-Type-Options: nosniff");
+	
 	$appli='Dolibarr';
 	if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $appli=$conf->global->MAIN_APPLICATION_TITLE;
 
diff --git a/htdocs/projet/jsgantt_language.js.php b/htdocs/projet/jsgantt_language.js.php
index f6b5799bda0..7aafd97fb45 100644
--- a/htdocs/projet/jsgantt_language.js.php
+++ b/htdocs/projet/jsgantt_language.js.php
@@ -34,8 +34,8 @@ if (! defined('NOREQUIREAJAX'))   define('NOREQUIREAJAX','1');
 
 require_once __DIR__.'/../main.inc.php';
 
-// Define css type
-header('Content-type: text/javascript');
+// Define mime type
+top_httphead('text/javascript');
 
 global $langs;
 ?>
diff --git a/htdocs/support/inc.php b/htdocs/support/inc.php
index 869dace222d..16aa40b246d 100644
--- a/htdocs/support/inc.php
+++ b/htdocs/support/inc.php
@@ -207,7 +207,8 @@ function pHeader($soutitre,$next,$action='none')
 
 	// On force contenu dans format sortie
 	header("Content-type: text/html; charset=".$conf->file->character_set_client);
-
+	header("X-Content-Type-Options: nosniff");
+	
 	print '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">'."\n";
 	print '<html manifest="'.DOL_URL_ROOT.'/cache.manifest">'."\n";
 	print '<head>'."\n";
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 9de83c3bd97..f923413da4c 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -45,7 +45,7 @@ if (empty($user->id) && ! empty($_SESSION['dol_login'])) $user->fetch('',$_SESSI
 
 
 // Define css type
-header('Content-type: text/css');
+top_httphead('text/css');
 // Important: Following code is to avoid page request by browser and PHP CPU at each Dolibarr page access.
 if (empty($dolibarr_nocache)) header('Cache-Control: max-age=3600, public, must-revalidate');
 else header('Cache-Control: no-cache');
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index e6809a2c574..3bd33b07225 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -46,7 +46,7 @@ if (empty($user->id) && ! empty($_SESSION['dol_login'])) $user->fetch('',$_SESSI
 
 
 // Define css type
-header('Content-type: text/css');
+top_httphead('text/css');
 // Important: Following code is to avoid page request by browser and PHP CPU at each Dolibarr page access.
 if (empty($dolibarr_nocache)) header('Cache-Control: max-age=3600, public, must-revalidate');
 else header('Cache-Control: no-cache');
diff --git a/htdocs/viewimage.php b/htdocs/viewimage.php
index f69c7e4e4aa..4f1ef007f1f 100644
--- a/htdocs/viewimage.php
+++ b/htdocs/viewimage.php
@@ -191,13 +191,13 @@ else					// Open and return file
     // Les drois sont ok et fichier trouve
     if ($type)
     {
+        top_httphead($type);
         header('Content-Disposition: inline; filename="'.basename($original_file).'"');
-        header('Content-type: '.$type);
     }
     else
     {
+        top_httphead('image/png');
         header('Content-Disposition: inline; filename="'.basename($original_file).'"');
-        header('Content-type: image/png');
     }
 
     $original_file_osencoded=dol_osencode($original_file);

From ae57395562dd62e7ccc6e664974a4188decc7438 Mon Sep 17 00:00:00 2001
From: alexis portable <alexis@atm-consulting.fr>
Date: Tue, 9 May 2017 22:24:24 +0200
Subject: [PATCH 267/505] NEW get amount base on thm for ficheinter

---
 htdocs/fichinter/class/fichinter.class.php | 27 +++++++++++++++++++++-
 htdocs/projet/element.php                  |  7 +++++-
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php
index 2942a8903ab..b52dfdc904b 100644
--- a/htdocs/fichinter/class/fichinter.class.php
+++ b/htdocs/fichinter/class/fichinter.class.php
@@ -360,6 +360,8 @@ class Fichinter extends CommonObject
 				$this->modelpdf     = $obj->model_pdf;
 				$this->fk_contrat	= $obj->fk_contrat;
 
+				$this->user_creation= $obj->fk_user_author;
+				
 				$this->extraparams	= (array) json_decode($obj->extraparams, true);
 
 				if ($this->statut == 0) $this->brouillon = 1;
@@ -537,7 +539,30 @@ class Fichinter extends CommonObject
 		}
 	}
 
-
+	/**
+	 *	Returns amount based on user thm
+	 *
+	 *	@return     float amount
+	 */
+	function getAmount() {
+		global $db;
+		
+		$amount = 0;
+		
+		$this->author = new User($db);
+		$this->author->fetch($this->user_creation);
+		
+		$thm = $this->author->thm;
+		
+		foreach($this->lines as &$line) {
+			
+			$amount+=$line->qty * $thm;
+			
+		}
+		
+		return $amount;
+	}
+	
 	/**
 	 *	Returns the label status
 	 *
diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php
index 09a3fecc4bd..02bf6c5a9ba 100644
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -333,7 +333,8 @@ $listofreferent=array(
 	'class'=>'Fichinter',
 	'table'=>'fichinter',
 	'datefieldname'=>'date_valid',
-	'disableamount'=>1,
+	'disableamount'=>0,
+	'margin'=>'minus',	
     'urlnew'=>DOL_URL_ROOT.'/fichinter/card.php?action=create&origin=project&originid='.$id.'&socid='.$socid,
     'lang'=>'interventions',
     'buttonnew'=>'AddIntervention',
@@ -559,6 +560,7 @@ foreach ($listofreferent as $key => $value)
 				if ($tablename != 'expensereport_det' && method_exists($element, 'fetch_thirdparty')) $element->fetch_thirdparty();
 				if ($tablename == 'don' || $tablename == 'chargesociales') $total_ht_by_line=$element->amount;
 				elseif ($tablename == 'stock_mouvement') $total_ht_by_line=$element->price*abs($element->qty);
+				else if($tablename == 'fichinter') $total_ht_by_line=$element->getAmount();				
 				elseif ($tablename == 'projet_task')
 				{
 					if ($idofelementuser)
@@ -583,6 +585,7 @@ foreach ($listofreferent as $key => $value)
 				if ($qualifiedfortotal) $total_ht = $total_ht + $total_ht_by_line;
 
 				if ($tablename == 'don' || $tablename == 'chargesociales') $total_ttc_by_line=$element->amount;
+				else if($tablename == 'fichinter') $total_ttc_by_line=$element->getAmount();								
 				elseif ($tablename == 'stock_mouvement') $total_ttc_by_line=$element->price*abs($element->qty);
 				elseif ($tablename == 'projet_task')
 				{
@@ -948,6 +951,7 @@ foreach ($listofreferent as $key => $value)
 				    $total_ht_by_line=null;
 				    $othermessage='';
 					if ($tablename == 'don' || $tablename == 'chargesociales') $total_ht_by_line=$element->amount;
+					else if($tablename == 'fichinter') $total_ht_by_line=$element->getAmount();
 					elseif ($tablename == 'stock_mouvement') $total_ht_by_line=$element->price*abs($element->qty);
 					elseif (in_array($tablename, array('projet_task')))
 					{
@@ -988,6 +992,7 @@ foreach ($listofreferent as $key => $value)
 				{
 				    $total_ttc_by_line=null;
 					if ($tablename == 'don' || $tablename == 'chargesociales') $total_ttc_by_line=$element->amount;
+					else if($tablename == 'fichinter') $total_ttc_by_line=$element->getAmount();
 					elseif ($tablename == 'stock_mouvement') $total_ttc_by_line=$element->price*abs($element->qty);
 					elseif ($tablename == 'projet_task')
 					{

From b157398da4f8fa909678ec4a06bcd94d71103da9 Mon Sep 17 00:00:00 2001
From: alexis portable <alexis@atm-consulting.fr>
Date: Tue, 9 May 2017 22:54:33 +0200
Subject: [PATCH 268/505] fiche inter fix user author fetch

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

diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php
index b52dfdc904b..d9912edfca1 100644
--- a/htdocs/fichinter/class/fichinter.class.php
+++ b/htdocs/fichinter/class/fichinter.class.php
@@ -326,7 +326,7 @@ class Fichinter extends CommonObject
 	function fetch($rowid,$ref='')
 	{
 		$sql = "SELECT f.rowid, f.ref, f.description, f.fk_soc, f.fk_statut,";
-		$sql.= " f.datec, f.dateo, f.datee, f.datet,";
+		$sql.= " f.datec, f.dateo, f.datee, f.datet, f.fk_user_author,";
 		$sql.= " f.date_valid as datev,";
 		$sql.= " f.tms as datem,";
 		$sql.= " f.duree, f.fk_projet, f.note_public, f.note_private, f.model_pdf, f.extraparams, fk_contrat";

From 2fc64b8e11af693dc86221f3cd3b4fae3f6897f5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 10 May 2017 00:44:54 +0200
Subject: [PATCH 269/505] Fix XSS

---
 htdocs/core/lib/functions.lib.php | 2 +-
 htdocs/index.php                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index e0c9d520eef..e0beb3a8a8e 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -302,7 +302,7 @@ function GETPOST($paramname,$check='',$method=0,$filter=NULL,$options=NULL)
 	            break;
 	        case 'aZ09':
 	            $out=trim($out);
-	            if (preg_match('/[^a-z0-9]+/i',$out)) $out='';
+	            if (preg_match('/[^a-z0-9_]+/i',$out)) $out='';
 	            break;
 	        case 'array':
 	            if (! is_array($out) || empty($out)) $out=array();
diff --git a/htdocs/index.php b/htdocs/index.php
index 4b3f48f715f..5430fcf7d24 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -30,7 +30,7 @@ require 'main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 
 // If not defined, we select menu "home"
-$_GET['mainmenu']=GETPOST('mainmenu', 'alpha')?GETPOST('mainmenu', 'alpha'):'home';
+$_GET['mainmenu']=GETPOST('mainmenu', 'aZ09')?GETPOST('mainmenu', 'aZ09'):'home';
 $action=GETPOST('action');
 
 $hookmanager->initHooks(array('index'));

From 267e66abfa92ed83ee633677092bea20e9ecda4e Mon Sep 17 00:00:00 2001
From: Thomas Raschbacher <lordvan@lordvan.com>
Date: Wed, 10 May 2017 08:48:28 +0200
Subject: [PATCH 270/505] Add more fields to projectcontacts substitution

civility added + extrafields for external contacts + isInternal to decide in template wether to list internal or not
---
 .../doc/doc_generic_project_odt.modules.php   | 59 +++++++++++--------
 1 file changed, 35 insertions(+), 24 deletions(-)

diff --git a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
index 7d0fe1a41e6..fbe3db84370 100644
--- a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
+++ b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
@@ -185,39 +185,50 @@ class doc_generic_project_odt extends ModelePDFProjects
 	function get_substitutionarray_project_contacts($contact,$outputlangs)
 	{
 		global $conf;
+		$pc='projcontacts_'; // prefix to avoid typos
 
-		// adding phone numbers if external
-		$phone_pro = '';
-		$phone_perso = '';
-		$phone_mobile = '';
+		$ret = array(
+			$pc.'id'=>$contact['id'],
+			$pc.'rowid'=>$contact['rowid'],
+			$pc.'role'=>$contact['libelle'],
+			$pc.'lastname'=>$contact['lastname'],
+			$pc.'firstname'=>$contact['firstname'],
+			$pc.'civility'=>$contact['civility'],
+			$pc.'fullcivname'=>$contact['fullname'],
+			$pc.'socname'=>$contact['socname'],
+			$pc.'email'=>$contact['email']
+			);
 
-		$ct = new Contact($this->db);
 		if ($contact['source']=='external') {
+			$ret[$pc.'isInternal'] = ''; // not internal
+			
 			$ct = new Contact($this->db);
 			$ct->fetch($contact['id']);
-			$phone_pro = $ct->phone_pro;
-			$phone_perso = $ct->phone_perso;
-			$phone_mobile = $ct->phone_mobile;
+			$ret[$pc.'phone_pro'] = $ct->phone_pro;
+			$ret[$pc.'phone_perso'] = $ct->phone_perso;
+			$ret[$pc.'phone_mobile'] = $ct->phone_mobile;
+			
+			// fetch external user extrafields
+			require_once(DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php');
+			$extrafields=new ExtraFields($this->db);
+			$extralabels=$extrafields->fetch_name_optionals_label($ct->table_element, true);
+			$extrafields_num = $ct->fetch_optionals($ct->id, $extralabels);
+			//dol_syslog(get_class($this)."::get_substitutionarray_project_contacts: ===== Number of Extrafields found: ".$extrafields_num, LOG_DEBUG);
+			foreach($ct->array_options as $efkey => $efval) {
+				dol_syslog(get_class($this)."::get_substitutionarray_project_contacts: +++++ Extrafield ".$efkey." => ".$efval, LOG_DEBUG);
+				$ret[$pc.$efkey] = $efval; // add nothing else because it already comes as 'options_XX'
+			}
 		} elseif ($contact['source']=='internal') {
+			$ret[$pc.'isInternal'] = '1'; // this is an internal user
+		
 			$ct = new User($this->db);
 			$ct->fetch($contact['id']);
-			$phone_pro = $ct->office_phone;
-			$phone_mobile = $ct->user_mobile;
+			$ret[$pc.'phone_pro'] = $ct->office_phone;
+			$ret[$pc.'phone_perso'] = '';
+			$ret[$pc.'phone_mobile'] = $ct->user_mobile;
+			// do internal users have extrafields ?
 		}
-
-		return array(
-		'projcontacts_id'=>$contact['id'],
-		'projcontacts_rowid'=>$contact['rowid'],
-		'projcontacts_role'=>$contact['libelle'],
-		'projcontacts_lastname'=>$contact['lastname'],
-		'projcontacts_firstname'=>$contact['firstname'],
-		'projcontacts_fullcivname'=>$contact['fullname'],
-		'projcontacts_socname'=>$contact['socname'],
-		'projcontacts_email'=>$contact['email'],
-		'projcontacts_phone_pro'=>$phone_pro,
-		'projcontacts_phone_perso'=>$phone_perso,
-		'projcontacts_phone_mobile'=>$phone_mobile
-		);
+		return $ret;
 	}
 
 	/**

From 0ea69e2e94a6ccf83cfbe02317424546a36a6a6c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 10 May 2017 09:58:58 +0200
Subject: [PATCH 271/505] Add empty index.html page

---
 htdocs/theme/common/fontawesome/index.html | 0
 htdocs/theme/common/octicons/index.html    | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 htdocs/theme/common/fontawesome/index.html
 create mode 100644 htdocs/theme/common/octicons/index.html

diff --git a/htdocs/theme/common/fontawesome/index.html b/htdocs/theme/common/fontawesome/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/theme/common/octicons/index.html b/htdocs/theme/common/octicons/index.html
new file mode 100644
index 00000000000..e69de29bb2d

From 09f6fe5a528dbe97ea391aaa0ba6b06efa418a35 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 10 May 2017 10:06:44 +0200
Subject: [PATCH 272/505] Fix lib_notification

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

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index fe899012983..333eb25ad89 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1289,7 +1289,7 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
                 if ($enablebrowsernotif)
                 {
                     print '<!-- Includes JS of Dolibarr (brwoser layout = '.$conf->browser->layout.')-->'."\n";
-                    print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/lib_notification.js.php?version='.urlencode(DOL_VERSION).($ext?'&amp;'.$ext:'').'"></script>'."\n";
+                    print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/lib_notification.js.php'.($ext?'?'.$ext:'').'"></script>'."\n";
                 }
             }
             

From 5c33c1773fa8ac97b454c572bd1c80d74d05d5b1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 10 May 2017 11:47:34 +0200
Subject: [PATCH 273/505] FIX XSS

---
 htdocs/core/lib/functions.lib.php |  8 +++++---
 htdocs/index.php                  |  8 ++++----
 htdocs/langs/en_US/agenda.lang    |  1 +
 test/phpunit/SecurityTest.php     | 26 +++++++++++++++++++++++++-
 4 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 89e3a9ea00d..ab75fce37e6 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -380,7 +380,7 @@ function GETPOST($paramname, $check='', $method=0, $filter=NULL, $options=NULL)
 	            break;
 	        case 'aZ09':
 	            $out=trim($out);
-	            if (preg_match('/[^a-z0-9_]+/i',$out)) $out='';
+	            if (preg_match('/[^a-z0-9_\-]+/i',$out)) $out='';
 	            break;
 	        case 'array':
 	            if (! is_array($out) || empty($out)) $out=array();
@@ -3104,7 +3104,7 @@ function dol_print_error($db='',$error='',$errors=null)
 		if ($_SERVER['DOCUMENT_ROOT'])  // Mode web
 		{
 			$out.="<b>".$langs->trans("DatabaseTypeManager").":</b> ".$db->type."<br>\n";
-			$out.="<b>".$langs->trans("RequestLastAccessInError").":</b> ".($db->lastqueryerror()?$db->lastqueryerror():$langs->trans("ErrorNoRequestInError"))."<br>\n";
+			$out.="<b>".$langs->trans("RequestLastAccessInError").":</b> ".($db->lastqueryerror()?dol_escape_htmltag($db->lastqueryerror()):$langs->trans("ErrorNoRequestInError"))."<br>\n";
 			$out.="<b>".$langs->trans("ReturnCodeLastAccessInError").":</b> ".($db->lasterrno()?$db->lasterrno():$langs->trans("ErrorNoRequestInError"))."<br>\n";
 			$out.="<b>".$langs->trans("InformationLastAccessInError").":</b> ".($db->lasterror()?$db->lasterror():$langs->trans("ErrorNoRequestInError"))."<br>\n";
 			$out.="<br>\n";
@@ -3112,7 +3112,9 @@ function dol_print_error($db='',$error='',$errors=null)
 		else                            // Mode CLI
 		{
 			$out.='> '.$langs->transnoentities("DatabaseTypeManager").":\n".$db->type."\n";
-			$out.='> '.$langs->transnoentities("RequestLastAccessInError").":\n".($db->lastqueryerror()?$db->lastqueryerror():$langs->trans("ErrorNoRequestInError"))."\n";
+			$out.='> '.$langs->transnoentities("RequestLastAccessInError").":\n".($db->lastqueryerror()?dol_escape_htmltag($db->lastqueryerror()):$langs->trans("ErrorNoRequestInError"))."\n";
+			// To make detection of xss vulnerabilities or sql injection easier with a scanner, replace line with this one:
+			//$out.='> '.$langs->transnoentities("RequestLastAccessInError").":\n".($db->lastqueryerror()?$db->lastqueryerror:$langs->trans("ErrorNoRequestInError"))."\n";
 			$out.='> '.$langs->transnoentities("ReturnCodeLastAccessInError").":\n".($db->lasterrno()?$db->lasterrno():$langs->trans("ErrorNoRequestInError"))."\n";
 			$out.='> '.$langs->transnoentities("InformationLastAccessInError").":\n".($db->lasterror()?$db->lasterror():$langs->trans("ErrorNoRequestInError"))."\n";
 
diff --git a/htdocs/index.php b/htdocs/index.php
index 1431f73ca7d..5ab2fa68cd4 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -55,10 +55,10 @@ if (count($conf->modules) <= (empty($conf->global->MAIN_MIN_NB_ENABLED_MODULE_FO
 if (GETPOST('addbox'))	// Add box (when submit is done from a form when ajax disabled)
 {
 	require_once DOL_DOCUMENT_ROOT.'/core/class/infobox.class.php';
-	$zone=GETPOST('areacode');
-	$userid=GETPOST('userid');
-	$boxorder=GETPOST('boxorder');
-	$boxorder.=GETPOST('boxcombo');
+	$zone=GETPOST('areacode', 'aZ09');
+	$userid=GETPOST('userid', 'int');
+	$boxorder=GETPOST('boxorder', 'aZ09');
+	$boxorder.=GETPOST('boxcombo', 'aZ09');
 
 	$result=InfoBox::saveboxorder($db,$zone,$boxorder,$userid);
 	if ($result > 0) setEventMessages($langs->trans("BoxAdded"), null);
diff --git a/htdocs/langs/en_US/agenda.lang b/htdocs/langs/en_US/agenda.lang
index 2b1b6bafb3a..9e7af7b0d06 100644
--- a/htdocs/langs/en_US/agenda.lang
+++ b/htdocs/langs/en_US/agenda.lang
@@ -76,6 +76,7 @@ ProposalDeleted=Proposal deleted
 OrderDeleted=Order deleted
 InvoiceDeleted=Invoice deleted
 ##### End agenda events #####
+AgendaModelModule=Document templates for event
 DateActionStart=Start date
 DateActionEnd=End date
 AgendaUrlOptions1=You can also add following parameters to filter output:
diff --git a/test/phpunit/SecurityTest.php b/test/phpunit/SecurityTest.php
index 00714e7bfab..288a15c317e 100644
--- a/test/phpunit/SecurityTest.php
+++ b/test/phpunit/SecurityTest.php
@@ -147,7 +147,9 @@ class SecurityTest extends PHPUnit_Framework_TestCase
 		$_GET["param2"]='a/b#e(pr)qq-rr\cc';
         $_GET["param3"]='"a/b#e(pr)qq-rr\cc';    // Same than param2 + "
         $_GET["param4"]='../dir';
-
+        $_GET["param5"]="a_1-b";
+        
+        // Test int
         $result=GETPOST('id','int');              // Must return nothing
         print __METHOD__." result=".$result."\n";
         $this->assertEquals($result,'');
@@ -160,6 +162,7 @@ class SecurityTest extends PHPUnit_Framework_TestCase
         print __METHOD__." result=".$result."\n";
         $this->assertEquals($result,333);
 
+        // Test alpha
         $result=GETPOST("param2",'alpha');
         print __METHOD__." result=".$result."\n";
         $this->assertEquals($result,$_GET["param2"]);
@@ -172,6 +175,27 @@ class SecurityTest extends PHPUnit_Framework_TestCase
         print __METHOD__." result=".$result."\n";
         $this->assertEquals($result,'');
 
+        // Test aZ09
+        $result=GETPOST("param1",'aZ09');  // Must return '' as there is a forbidden char ../
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals($result,$_GET["param1"]);
+        
+        $result=GETPOST("param2",'aZ09');  // Must return '' as there is a forbidden char ../
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals($result,'');
+        
+        $result=GETPOST("param3",'aZ09');  // Must return '' as there is a forbidden char ../
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals($result,'');
+        
+        $result=GETPOST("param4",'aZ09');  // Must return '' as there is a forbidden char ../
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals($result,'');
+        
+        $result=GETPOST("param5",'aZ09');
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals($result,$_GET["param5"]);
+
         return $result;
     }
 

From c4722e36940eec65ba0b6df5d6fdaf211fd9b69a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 10 May 2017 11:47:34 +0200
Subject: [PATCH 274/505] FIX XSS

---
 htdocs/core/lib/functions.lib.php |  8 +++++---
 htdocs/index.php                  |  8 ++++----
 htdocs/langs/en_US/agenda.lang    |  1 +
 test/phpunit/SecurityTest.php     | 26 +++++++++++++++++++++++++-
 4 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index e0beb3a8a8e..6b0b3112307 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -302,7 +302,7 @@ function GETPOST($paramname,$check='',$method=0,$filter=NULL,$options=NULL)
 	            break;
 	        case 'aZ09':
 	            $out=trim($out);
-	            if (preg_match('/[^a-z0-9_]+/i',$out)) $out='';
+	            if (preg_match('/[^a-z0-9_\-]+/i',$out)) $out='';
 	            break;
 	        case 'array':
 	            if (! is_array($out) || empty($out)) $out=array();
@@ -2937,7 +2937,7 @@ function dol_print_error($db='',$error='',$errors=null)
 		if ($_SERVER['DOCUMENT_ROOT'])  // Mode web
 		{
 			$out.="<b>".$langs->trans("DatabaseTypeManager").":</b> ".$db->type."<br>\n";
-			$out.="<b>".$langs->trans("RequestLastAccessInError").":</b> ".($db->lastqueryerror()?$db->lastqueryerror():$langs->trans("ErrorNoRequestInError"))."<br>\n";
+			$out.="<b>".$langs->trans("RequestLastAccessInError").":</b> ".($db->lastqueryerror()?dol_escape_htmltag($db->lastqueryerror()):$langs->trans("ErrorNoRequestInError"))."<br>\n";
 			$out.="<b>".$langs->trans("ReturnCodeLastAccessInError").":</b> ".($db->lasterrno()?$db->lasterrno():$langs->trans("ErrorNoRequestInError"))."<br>\n";
 			$out.="<b>".$langs->trans("InformationLastAccessInError").":</b> ".($db->lasterror()?$db->lasterror():$langs->trans("ErrorNoRequestInError"))."<br>\n";
 			$out.="<br>\n";
@@ -2945,7 +2945,9 @@ function dol_print_error($db='',$error='',$errors=null)
 		else                            // Mode CLI
 		{
 			$out.='> '.$langs->transnoentities("DatabaseTypeManager").":\n".$db->type."\n";
-			$out.='> '.$langs->transnoentities("RequestLastAccessInError").":\n".($db->lastqueryerror()?$db->lastqueryerror():$langs->trans("ErrorNoRequestInError"))."\n";
+			$out.='> '.$langs->transnoentities("RequestLastAccessInError").":\n".($db->lastqueryerror()?dol_escape_htmltag($db->lastqueryerror()):$langs->trans("ErrorNoRequestInError"))."\n";
+			// To make detection of xss vulnerabilities or sql injection easier with a scanner, replace line with this one:
+			//$out.='> '.$langs->transnoentities("RequestLastAccessInError").":\n".($db->lastqueryerror()?$db->lastqueryerror:$langs->trans("ErrorNoRequestInError"))."\n";
 			$out.='> '.$langs->transnoentities("ReturnCodeLastAccessInError").":\n".($db->lasterrno()?$db->lasterrno():$langs->trans("ErrorNoRequestInError"))."\n";
 			$out.='> '.$langs->transnoentities("InformationLastAccessInError").":\n".($db->lasterror()?$db->lasterror():$langs->trans("ErrorNoRequestInError"))."\n";
 
diff --git a/htdocs/index.php b/htdocs/index.php
index 5430fcf7d24..007145083cf 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -55,10 +55,10 @@ if (count($conf->modules) <= (empty($conf->global->MAIN_MIN_NB_ENABLED_MODULE_FO
 if (GETPOST('addbox'))	// Add box (when submit is done from a form when ajax disabled)
 {
 	require_once DOL_DOCUMENT_ROOT.'/core/class/infobox.class.php';
-	$zone=GETPOST('areacode');
-	$userid=GETPOST('userid');
-	$boxorder=GETPOST('boxorder');
-	$boxorder.=GETPOST('boxcombo');
+	$zone=GETPOST('areacode', 'aZ09');
+	$userid=GETPOST('userid', 'int');
+	$boxorder=GETPOST('boxorder', 'aZ09');
+	$boxorder.=GETPOST('boxcombo', 'aZ09');
 
 	$result=InfoBox::saveboxorder($db,$zone,$boxorder,$userid);
 }
diff --git a/htdocs/langs/en_US/agenda.lang b/htdocs/langs/en_US/agenda.lang
index d0f3456987d..6bfa9fd0406 100644
--- a/htdocs/langs/en_US/agenda.lang
+++ b/htdocs/langs/en_US/agenda.lang
@@ -75,6 +75,7 @@ ProposalDeleted=Proposal deleted
 OrderDeleted=Order deleted
 InvoiceDeleted=Invoice deleted
 ##### End agenda events #####
+AgendaModelModule=Document templates for event
 DateActionStart=Start date
 DateActionEnd=End date
 AgendaUrlOptions1=You can also add following parameters to filter output:
diff --git a/test/phpunit/SecurityTest.php b/test/phpunit/SecurityTest.php
index 00714e7bfab..288a15c317e 100644
--- a/test/phpunit/SecurityTest.php
+++ b/test/phpunit/SecurityTest.php
@@ -147,7 +147,9 @@ class SecurityTest extends PHPUnit_Framework_TestCase
 		$_GET["param2"]='a/b#e(pr)qq-rr\cc';
         $_GET["param3"]='"a/b#e(pr)qq-rr\cc';    // Same than param2 + "
         $_GET["param4"]='../dir';
-
+        $_GET["param5"]="a_1-b";
+        
+        // Test int
         $result=GETPOST('id','int');              // Must return nothing
         print __METHOD__." result=".$result."\n";
         $this->assertEquals($result,'');
@@ -160,6 +162,7 @@ class SecurityTest extends PHPUnit_Framework_TestCase
         print __METHOD__." result=".$result."\n";
         $this->assertEquals($result,333);
 
+        // Test alpha
         $result=GETPOST("param2",'alpha');
         print __METHOD__." result=".$result."\n";
         $this->assertEquals($result,$_GET["param2"]);
@@ -172,6 +175,27 @@ class SecurityTest extends PHPUnit_Framework_TestCase
         print __METHOD__." result=".$result."\n";
         $this->assertEquals($result,'');
 
+        // Test aZ09
+        $result=GETPOST("param1",'aZ09');  // Must return '' as there is a forbidden char ../
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals($result,$_GET["param1"]);
+        
+        $result=GETPOST("param2",'aZ09');  // Must return '' as there is a forbidden char ../
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals($result,'');
+        
+        $result=GETPOST("param3",'aZ09');  // Must return '' as there is a forbidden char ../
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals($result,'');
+        
+        $result=GETPOST("param4",'aZ09');  // Must return '' as there is a forbidden char ../
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals($result,'');
+        
+        $result=GETPOST("param5",'aZ09');
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals($result,$_GET["param5"]);
+
         return $result;
     }
 

From 383dfc0c96c0c4e77110d87f91f09a8f5bf7b4da Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 10 May 2017 11:51:59 +0200
Subject: [PATCH 275/505] FIX Pagination of invoices

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

diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index cce94646616..693a6f39f97 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -409,7 +409,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 	$nbtotalofrecords = $db->num_rows($result);
 }
 
-$sql.= $db->plimit($limit,$offset);
+$sql.= $db->plimit($limit+1,$offset);
 //print $sql;
 
 $resql = $db->query($sql);

From 3e0fcf5ec2ecda622736e8d5142e31c592167af2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 10 May 2017 11:57:59 +0200
Subject: [PATCH 276/505] Fix label "total for this page" on last page.

---
 dev/skeletons/skeleton_list.php          | 2 +-
 htdocs/comm/propal/list.php              | 2 +-
 htdocs/commande/list.php                 | 2 +-
 htdocs/compta/bank/bankentries.php       | 2 +-
 htdocs/compta/bank/index.php             | 2 +-
 htdocs/compta/facture/list.php           | 2 +-
 htdocs/compta/sociales/index.php         | 2 +-
 htdocs/expensereport/list.php            | 2 +-
 htdocs/fichinter/list.php                | 2 +-
 htdocs/fourn/facture/list.php            | 2 +-
 htdocs/product/stock/productlot_list.php | 2 +-
 htdocs/projet/list.php                   | 2 +-
 htdocs/projet/tasks/list.php             | 2 +-
 htdocs/projet/tasks/time.php             | 2 +-
 14 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/dev/skeletons/skeleton_list.php b/dev/skeletons/skeleton_list.php
index 77485c6d638..4453f2d8302 100644
--- a/dev/skeletons/skeleton_list.php
+++ b/dev/skeletons/skeleton_list.php
@@ -523,7 +523,7 @@ if (isset($totalarray['totalhtfield']))
         $i++;
         if ($i == 1)
         {
-            if ($num < $limit) print '<td align="left">'.$langs->trans("Total").'</td>';
+            if ($num < $limit && empty($offset)) print '<td align="left">'.$langs->trans("Total").'</td>';
             else print '<td align="left">'.$langs->trans("Totalforthispage").'</td>';
         }
         elseif ($totalarray['totalhtfield'] == $i) print '<td align="right">'.price($totalarray['totalht']).'</td>';
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index d85448397de..efb72afb7b7 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -991,7 +991,7 @@ if ($resql)
 		   $i++;
 		   if ($i == 1)
 	       {
-        		if ($num < $limit) print '<td align="left">'.$langs->trans("Total").'</td>';
+        		if ($num < $limit && empty($offset)) print '<td align="left">'.$langs->trans("Total").'</td>';
         		else print '<td align="left">'.$langs->trans("Totalforthispage").'</td>';
 	       }
 		   elseif ($totalarray['totalhtfield'] == $i) print '<td align="right">'.price($totalarray['totalht']).'</td>';
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 80601ec9727..e62ae11d5cd 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -1412,7 +1412,7 @@ if ($resql)
 	        $i++;
 	        if ($i == 1)
 	        {
-	            if ($num < $limit) print '<td align="left">'.$langs->trans("Total").'</td>';
+	            if ($num < $limit && empty($offset)) print '<td align="left">'.$langs->trans("Total").'</td>';
 	            else print '<td align="left">'.$langs->trans("Totalforthispage").'</td>';
 	        }
 	        elseif ($totalarray['totalhtfield'] == $i) print '<td align="right">'.price($totalarray['totalht']).'</td>';
diff --git a/htdocs/compta/bank/bankentries.php b/htdocs/compta/bank/bankentries.php
index 72e82dd0dd7..4845012a3e0 100644
--- a/htdocs/compta/bank/bankentries.php
+++ b/htdocs/compta/bank/bankentries.php
@@ -1307,7 +1307,7 @@ if ($resql)
 	        $i++;
 	        if ($i == 1)
 	        {
-	            if ($num < $limit) print '<td align="left">'.$langs->trans("Total").'</td>';
+	            if ($num < $limit && empty($offset)) print '<td align="left">'.$langs->trans("Total").'</td>';
 	            else print '<td align="left">'.$langs->trans("Totalforthispage").'</td>';
 	        }
 	        elseif ($totalarray['totaldebfield'] == $i) print '<td align="right">'.price(-1 * $totalarray['totaldeb']).'</td>';
diff --git a/htdocs/compta/bank/index.php b/htdocs/compta/bank/index.php
index 012dfe42175..5f6e30016d4 100644
--- a/htdocs/compta/bank/index.php
+++ b/htdocs/compta/bank/index.php
@@ -607,7 +607,7 @@ if (isset($totalarray['totalbalancefield']) && $lastcurrencycode != 'various')	/
         $i++;
         if ($i == 1)
         {
-            if ($num < $limit) print '<td align="left">'.$langs->trans("Total").'</td>';
+            if ($num < $limit && empty($offset)) print '<td align="left">'.$langs->trans("Total").'</td>';
             else print '<td align="left">'.$langs->trans("Totalforthispage").'</td>';
         }
         elseif ($totalarray['totalbalancefield'] == $i) print '<td align="right">'.price($totalarray['totalbalance'], 0, $langs, 0, 0, -1, $lastcurrencycode).'</td>';
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 693a6f39f97..c5fd9b80482 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -1117,7 +1117,7 @@ if ($resql)
     		   $i++;
     		   if ($i == 1)
     	       {
-            		if ($num < $limit) print '<td align="left">'.$langs->trans("Total").'</td>';
+            		if ($num < $limit && empty($offset)) print '<td align="left">'.$langs->trans("Total").'</td>';
             		else print '<td align="left">'.$langs->trans("Totalforthispage").'</td>';
     	       }
     		   elseif ($totalarray['totalhtfield'] == $i)  print '<td align="right">'.price($totalarray['totalht']).'</td>';
diff --git a/htdocs/compta/sociales/index.php b/htdocs/compta/sociales/index.php
index 66d6a65dd56..e3f4a0b9b4d 100644
--- a/htdocs/compta/sociales/index.php
+++ b/htdocs/compta/sociales/index.php
@@ -274,7 +274,7 @@ if ($resql)
 		if (isset($totalarray['totalttcfield']))
 		{
 		    print '<tr class="liste_total">';
-            if ($num < $limit) print '<td align="left">'.$langs->trans("Total").'</td>';
+            if ($num < $limit && empty($offset)) print '<td align="left">'.$langs->trans("Total").'</td>';
             else print '<td align="left">'.$langs->trans("Totalforthispage").'</td>';
             print '<td></td>';
             print '<td></td>';
diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php
index 58541330c83..ca7a52ad293 100644
--- a/htdocs/expensereport/list.php
+++ b/htdocs/expensereport/list.php
@@ -694,7 +694,7 @@ if ($resql)
 	        $i++;
 	        if ($i == 1)
 	        {
-	            if ($num < $limit) print '<td align="left">'.$langs->trans("Total").'</td>';
+	            if ($num < $limit && empty($offset)) print '<td align="left">'.$langs->trans("Total").'</td>';
 	            else print '<td align="left">'.$langs->trans("Totalforthispage").'</td>';
 	        }
 	        elseif ($totalarray['totalhtfield'] == $i) print '<td align="right">'.price($totalarray['totalht']).'</td>';
diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php
index 9ef7d22ad10..bafafb40dd1 100644
--- a/htdocs/fichinter/list.php
+++ b/htdocs/fichinter/list.php
@@ -518,7 +518,7 @@ if ($result)
 	        $i++;
 	        if ($i == 1)
 	        {
-	            if ($num < $limit) print '<td align="left">'.$langs->trans("Total").'</td>';
+	            if ($num < $limit && empty($offset)) print '<td align="left">'.$langs->trans("Total").'</td>';
 	            else print '<td align="left">'.$langs->trans("Totalforthispage").'</td>';
 	        }
 	        elseif ($totalarray['totaldurationfield'] == $i) print '<td align="right">'.convertSecondToTime($totalarray['totalduration'], 'allhourmin').'</td>';
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index 396d5ffd8a5..77064191d24 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -970,7 +970,7 @@ if ($resql)
     		   $i++;
     		   if ($i == 1)
     	       {
-            		if ($num < $limit) print '<td align="left">'.$langs->trans("Total").'</td>';
+            		if ($num < $limit && empty($offset)) print '<td align="left">'.$langs->trans("Total").'</td>';
             		else print '<td align="left">'.$langs->trans("Totalforthispage").'</td>';
     	       }
     		   elseif ($totalarray['totalhtfield'] == $i)  print '<td align="right">'.price($totalarray['totalht']).'</td>';
diff --git a/htdocs/product/stock/productlot_list.php b/htdocs/product/stock/productlot_list.php
index 2910103e380..3d89aee0013 100644
--- a/htdocs/product/stock/productlot_list.php
+++ b/htdocs/product/stock/productlot_list.php
@@ -570,7 +570,7 @@ if ($resql)
             $i++;
             if ($i == 1)
             {
-                if ($num < $limit) print '<td align="left">'.$langs->trans("Total").'</td>';
+                if ($num < $limit && empty($offset)) print '<td align="left">'.$langs->trans("Total").'</td>';
                 else print '<td align="left">'.$langs->trans("Totalforthispage").'</td>';
             }
             elseif ($totalarray['totalhtfield'] == $i) print '<td align="right">'.price($totalarray['totalht']).'</td>';
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index 51f260cac6f..408031a9ed2 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -854,7 +854,7 @@ if (isset($totalarray['totaloppfield']) || isset($totalarray['totalbudgetfield']
         $i++;
         if ($i == 1)
         {
-            if ($num < $limit) print '<td align="left">'.$langs->trans("Total").'</td>';
+            if ($num < $limit && empty($offset)) print '<td align="left">'.$langs->trans("Total").'</td>';
             else print '<td align="left">'.$langs->trans("Totalforthispage").'</td>';
         }
         elseif ($totalarray['totaloppfield'] == $i) print '<td align="right">'.price($totalarray['totalopp']).'</td>';
diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php
index 30a89109115..482c7b6f446 100644
--- a/htdocs/projet/tasks/list.php
+++ b/htdocs/projet/tasks/list.php
@@ -811,7 +811,7 @@ if (isset($totalarray['totaldurationeffectivefield']) || isset($totalarray['tota
         $i++;
         if ($i == 1)
         {
-            if ($num < $limit) print '<td align="left">'.$langs->trans("Total").'</td>';
+            if ($num < $limit && empty($offset)) print '<td align="left">'.$langs->trans("Total").'</td>';
             else print '<td align="left">'.$langs->trans("Totalforthispage").'</td>';
         }
         elseif ($totalarray['totalplannedworkloadfield'] == $i) print '<td align="center">'.convertSecondToTime($totalarray['totalplannedworkload'],$plannedworkloadoutputformat).'</td>';
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index 6cb52588a89..4c5d58dab7d 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -971,7 +971,7 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 		        $i++;
 		        if ($i == 1)
 		        {
-		            if ($num < $limit) print '<td align="left">'.$langs->trans("Total").'</td>';
+		            if ($num < $limit && empty($offset)) print '<td align="left">'.$langs->trans("Total").'</td>';
 		            else print '<td align="left">'.$langs->trans("Totalforthispage").'</td>';
 		        }
 		        elseif ($totalarray['totaldurationfield'] == $i) print '<td align="right">'.convertSecondToTime($totalarray['totalduration'],'allhourmin').'</td>';

From 8e25155fc92bf2edc964a0c4ddbfce4dc7f0f7d9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 10 May 2017 12:02:41 +0200
Subject: [PATCH 277/505] Better escaping of error message.

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index ab75fce37e6..78fbca7b0b5 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3105,18 +3105,17 @@ function dol_print_error($db='',$error='',$errors=null)
 		{
 			$out.="<b>".$langs->trans("DatabaseTypeManager").":</b> ".$db->type."<br>\n";
 			$out.="<b>".$langs->trans("RequestLastAccessInError").":</b> ".($db->lastqueryerror()?dol_escape_htmltag($db->lastqueryerror()):$langs->trans("ErrorNoRequestInError"))."<br>\n";
-			$out.="<b>".$langs->trans("ReturnCodeLastAccessInError").":</b> ".($db->lasterrno()?$db->lasterrno():$langs->trans("ErrorNoRequestInError"))."<br>\n";
-			$out.="<b>".$langs->trans("InformationLastAccessInError").":</b> ".($db->lasterror()?$db->lasterror():$langs->trans("ErrorNoRequestInError"))."<br>\n";
+			$out.="<b>".$langs->trans("ReturnCodeLastAccessInError").":</b> ".($db->lasterrno()?dol_escape_htmltag($db->lasterrno()):$langs->trans("ErrorNoRequestInError"))."<br>\n";
+			$out.="<b>".$langs->trans("InformationLastAccessInError").":</b> ".($db->lasterror()?dol_escape_htmltag($db->lasterror()):$langs->trans("ErrorNoRequestInError"))."<br>\n";
 			$out.="<br>\n";
 		}
 		else                            // Mode CLI
 		{
-			$out.='> '.$langs->transnoentities("DatabaseTypeManager").":\n".$db->type."\n";
-			$out.='> '.$langs->transnoentities("RequestLastAccessInError").":\n".($db->lastqueryerror()?dol_escape_htmltag($db->lastqueryerror()):$langs->trans("ErrorNoRequestInError"))."\n";
-			// To make detection of xss vulnerabilities or sql injection easier with a scanner, replace line with this one:
-			//$out.='> '.$langs->transnoentities("RequestLastAccessInError").":\n".($db->lastqueryerror()?$db->lastqueryerror:$langs->trans("ErrorNoRequestInError"))."\n";
-			$out.='> '.$langs->transnoentities("ReturnCodeLastAccessInError").":\n".($db->lasterrno()?$db->lasterrno():$langs->trans("ErrorNoRequestInError"))."\n";
-			$out.='> '.$langs->transnoentities("InformationLastAccessInError").":\n".($db->lasterror()?$db->lasterror():$langs->trans("ErrorNoRequestInError"))."\n";
+		    // No dol_escape_htmltag for output, we are in CLI mode
+		    $out.='> '.$langs->transnoentities("DatabaseTypeManager").":\n".$db->type."\n";
+			$out.='> '.$langs->transnoentities("RequestLastAccessInError").":\n".($db->lastqueryerror()?$db->lastqueryerror():$langs->transnoentities("ErrorNoRequestInError"))."\n";
+			$out.='> '.$langs->transnoentities("ReturnCodeLastAccessInError").":\n".($db->lasterrno()?$db->lasterrno():$langs->transnoentities("ErrorNoRequestInError"))."\n";
+			$out.='> '.$langs->transnoentities("InformationLastAccessInError").":\n".($db->lasterror()?$db->lasterror():$langs->transnoentities("ErrorNoRequestInError"))."\n";
 
 		}
 		$syslog.=", sql=".$db->lastquery();

From fe053c86037d31a4592385e41fd5df46acb1603d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 10 May 2017 12:02:41 +0200
Subject: [PATCH 278/505] Better escaping of error message.

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 6b0b3112307..facc685d234 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2938,18 +2938,17 @@ function dol_print_error($db='',$error='',$errors=null)
 		{
 			$out.="<b>".$langs->trans("DatabaseTypeManager").":</b> ".$db->type."<br>\n";
 			$out.="<b>".$langs->trans("RequestLastAccessInError").":</b> ".($db->lastqueryerror()?dol_escape_htmltag($db->lastqueryerror()):$langs->trans("ErrorNoRequestInError"))."<br>\n";
-			$out.="<b>".$langs->trans("ReturnCodeLastAccessInError").":</b> ".($db->lasterrno()?$db->lasterrno():$langs->trans("ErrorNoRequestInError"))."<br>\n";
-			$out.="<b>".$langs->trans("InformationLastAccessInError").":</b> ".($db->lasterror()?$db->lasterror():$langs->trans("ErrorNoRequestInError"))."<br>\n";
+			$out.="<b>".$langs->trans("ReturnCodeLastAccessInError").":</b> ".($db->lasterrno()?dol_escape_htmltag($db->lasterrno()):$langs->trans("ErrorNoRequestInError"))."<br>\n";
+			$out.="<b>".$langs->trans("InformationLastAccessInError").":</b> ".($db->lasterror()?dol_escape_htmltag($db->lasterror()):$langs->trans("ErrorNoRequestInError"))."<br>\n";
 			$out.="<br>\n";
 		}
 		else                            // Mode CLI
 		{
-			$out.='> '.$langs->transnoentities("DatabaseTypeManager").":\n".$db->type."\n";
-			$out.='> '.$langs->transnoentities("RequestLastAccessInError").":\n".($db->lastqueryerror()?dol_escape_htmltag($db->lastqueryerror()):$langs->trans("ErrorNoRequestInError"))."\n";
-			// To make detection of xss vulnerabilities or sql injection easier with a scanner, replace line with this one:
-			//$out.='> '.$langs->transnoentities("RequestLastAccessInError").":\n".($db->lastqueryerror()?$db->lastqueryerror:$langs->trans("ErrorNoRequestInError"))."\n";
-			$out.='> '.$langs->transnoentities("ReturnCodeLastAccessInError").":\n".($db->lasterrno()?$db->lasterrno():$langs->trans("ErrorNoRequestInError"))."\n";
-			$out.='> '.$langs->transnoentities("InformationLastAccessInError").":\n".($db->lasterror()?$db->lasterror():$langs->trans("ErrorNoRequestInError"))."\n";
+		    // No dol_escape_htmltag for output, we are in CLI mode
+		    $out.='> '.$langs->transnoentities("DatabaseTypeManager").":\n".$db->type."\n";
+			$out.='> '.$langs->transnoentities("RequestLastAccessInError").":\n".($db->lastqueryerror()?$db->lastqueryerror():$langs->transnoentities("ErrorNoRequestInError"))."\n";
+			$out.='> '.$langs->transnoentities("ReturnCodeLastAccessInError").":\n".($db->lasterrno()?$db->lasterrno():$langs->transnoentities("ErrorNoRequestInError"))."\n";
+			$out.='> '.$langs->transnoentities("InformationLastAccessInError").":\n".($db->lasterror()?$db->lasterror():$langs->transnoentities("ErrorNoRequestInError"))."\n";
 
 		}
 		$syslog.=", sql=".$db->lastquery();

From 9b4b096e8679d89d936882eaf8f417a167677302 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 10 May 2017 12:35:05 +0200
Subject: [PATCH 279/505] Debug variant module

---
 htdocs/variants/card.php       | 20 +++----
 htdocs/variants/create_val.php | 98 +++++++++++++++++++++++++---------
 2 files changed, 82 insertions(+), 36 deletions(-)

diff --git a/htdocs/variants/card.php b/htdocs/variants/card.php
index a611767cf2f..f5d35019971 100644
--- a/htdocs/variants/card.php
+++ b/htdocs/variants/card.php
@@ -19,13 +19,13 @@ require '../main.inc.php';
 require 'class/ProductAttribute.class.php';
 require 'class/ProductAttributeValue.class.php';
 
-$id = GETPOST('id');
-$valueid = GETPOST('valueid');
-$action = GETPOST('action');
-$label = GETPOST('label');
-$ref = GETPOST('ref');
-$confirm = GETPOST('confirm');
-$cancel = GETPOST('cancel');
+$id = GETPOST('id','int');
+$valueid = GETPOST('valueid','alpha');
+$action = GETPOST('action','alpha');
+$label = GETPOST('label','alpha');
+$ref = GETPOST('ref','alpha');
+$confirm = GETPOST('confirm','alpha');
+$cancel = GETPOST('cancel','alpha');
 
 $object = new ProductAttribute($db);
 $objectval = new ProductAttributeValue($db);
@@ -92,10 +92,10 @@ if ($confirm == 'yes') {
 			setEventMessage($langs->trans('RecordSaved'));
 			header('Location: '.dol_buildpath('/variants/list.php', 2));
 		}
-
 		exit();
-	} elseif ($action == 'confirm_deletevalue') {
-
+	}
+	elseif ($action == 'confirm_deletevalue') 
+	{
 		if ($objectval->fetch($valueid) > 0) {
 
 			if ($objectval->delete() < 1) {
diff --git a/htdocs/variants/create_val.php b/htdocs/variants/create_val.php
index a5ee085cf40..2f463286787 100644
--- a/htdocs/variants/create_val.php
+++ b/htdocs/variants/create_val.php
@@ -1,5 +1,4 @@
 <?php
-
 /* Copyright (C) 2016	Marcos García	<marcosgdf@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -20,83 +19,130 @@ require '../main.inc.php';
 require 'class/ProductAttribute.class.php';
 require 'class/ProductAttributeValue.class.php';
 
-$id = GETPOST('id');
-$ref = GETPOST('ref');
-$value = GETPOST('value');
+$id = GETPOST('id','int');
+$ref = GETPOST('ref','alpha');
+$value = GETPOST('value','alpha');
 
-$prodattr = new ProductAttribute($db);
-$prodattrval = new ProductAttributeValue($db);
+$action=GETPOST('action','alpha');
+$cancel=GETPOST('cancel','alpha');
+$backtopage=GETPOST('backtopage','alpha');
 
-if ($prodattr->fetch($id) < 1) {
+$object = new ProductAttribute($db);
+$objectval = new ProductAttributeValue($db);
+
+if ($object->fetch($id) < 1) {
 	dol_print_error($db, $langs->trans('ErrorRecordNotFound'));
 	exit();
 }
 
-if ($_POST) {
 
+/*
+ * Actions
+ */
+
+if ($cancel)
+{
+    $action='';
+    header('Location: '.DOL_URL_ROOT.'/variants/card.php?id='.$object->id);
+    exit();
+}
+
+// None
+
+
+
+/*
+ * View
+ */
+
+if ($action == 'add')
+{
 	if (empty($ref) || empty($value)) {
 		setEventMessage($langs->trans('ErrorFieldsRequired'), 'errors');
 	} else {
 
-		$prodattrval->fk_product_attribute = $prodattr->id;
-		$prodattrval->ref = $ref;
-		$prodattrval->value = $value;
+		$objectval->fk_product_attribute = $object->id;
+		$objectval->ref = $ref;
+		$objectval->value = $value;
 
-		if ($prodattrval->create() > 0) {
+		if ($objectval->create() > 0) {
 			setEventMessage($langs->trans('RecordSaved'));
-			header('Location: '.dol_buildpath('/variants/card.php?id='.$prodattr->id, 2));
+			header('Location: '.DOL_URL_ROOT.'/variants/card.php?id='.$object->id);
 			exit();
 		} else {
 			setEventMessage($langs->trans('ErrorCreatingProductAttributeValue'), 'errors');
 		}
 	}
-
 }
 
 $langs->load('products');
 
-$title = $langs->trans('ProductAttributeName', dol_htmlentities($prodattr->label));
+$title = $langs->trans('ProductAttributeName', dol_htmlentities($object->label));
 
 llxHeader('', $title);
 
-print_fiche_titre($title);
+$h=0;
+$head[$h][0] = DOL_URL_ROOT.'/variants/card.php?id='.$object->id;
+$head[$h][1] = $langs->trans("Card");
+$head[$h][2] = 'variant';
+$h++;
 
-dol_fiche_head();
+dol_fiche_head($head, 'variant', $langs->trans('ProductAttributeName'), -1, 'generic');
 
+print '<div class="fichecenter">';
+print '<div class="underbanner clearboth"></div>';
 ?>
 <table class="border" style="width: 100%">
 	<tr>
-		<td style="width: 15%" class="fieldrequired"><?php echo $langs->trans('Ref') ?></td>
-		<td><?php echo dol_htmlentities($prodattr->ref) ?>
+		<td class="titlefield fieldrequired"><?php echo $langs->trans('Ref') ?></td>
+		<td><?php echo dol_htmlentities($object->ref) ?>
 	</tr>
 	<tr>
-		<td style="width: 15%" class="fieldrequired"><?php echo $langs->trans('Label') ?></td>
-		<td><?php echo dol_htmlentities($prodattr->label) ?></td>
+		<td class="fieldrequired"><?php echo $langs->trans('Label') ?></td>
+		<td><?php echo dol_htmlentities($object->label) ?></td>
 	</tr>
 </table>
 
 <?php
+print '</div>';
 
 dol_fiche_end();
 
+print '<br>';
+
+
+print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<input type="hidden" name="action" value="add">';
+print '<input type="hidden" name="id" value="'.$object->id.'">';
+print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
+
 print_fiche_titre($langs->trans('NewProductAttributeValue'));
 
 dol_fiche_head();
+
 ?>
-<form method="post">
 	<table class="border" style="width: 100%">
 		<tr>
-			<td style="width: 15%" class="fieldrequired"><label for="ref"><?php echo $langs->trans('Ref') ?></label></td>
+			<td class="titlefield fieldrequired"><label for="ref"><?php echo $langs->trans('Ref') ?></label></td>
 			<td><input id="ref" type="text" name="ref" value="<?php echo $ref ?>"></td>
 		</tr>
 		<tr>
-			<td style="width: 15%" class="fieldrequired"><label for="value"><?php echo $langs->trans('Value') ?></label></td>
+			<td class="fieldrequired"><label for="value"><?php echo $langs->trans('Value') ?></label></td>
 			<td><input id="value" type="text" name="value" value="<?php echo $value ?>"></td>
 		</tr>
 	</table>
 <?php
+
 dol_fiche_end();
 
-print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Create").'"></div></form>';
+print '<div class="center">';
+print '<input type="submit" class="button" name="create" value="'.$langs->trans("Create").'">';
+print ' &nbsp; ';
+print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+print '</div>';
 
-llxFooter();
\ No newline at end of file
+print '</form>';
+
+llxFooter();
+$db->close();

From 578eb98b3332a4c14af91c97546f486ab1d1ba88 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 10 May 2017 13:13:33 +0200
Subject: [PATCH 280/505] Better user interface

---
 htdocs/adherents/type.php             |  8 ++++++--
 htdocs/admin/defaultvalues.php        |  7 +++----
 htdocs/admin/ihm.php                  | 26 ++++++++++++--------------
 htdocs/admin/translation.php          |  4 +++-
 htdocs/langs/en_US/modulebuilder.lang |  4 ++--
 5 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index ab6bfcc0704..fb147750e0b 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -82,9 +82,11 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter_x") || GETP
 // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
 $hookmanager->initHooks(array('membertypecard','globalcard'));
 
+
 /*
  *	Actions
  */
+
 if ($action == 'add' && $user->rights->adherent->configurer)
 {
 	if (! $cancel)
@@ -308,12 +310,13 @@ if ($rowid > 0)
 
 		$head = member_type_prepare_head($object);
 
-		dol_fiche_head($head, 'card', $langs->trans("MemberType"), 0, 'group');
+		dol_fiche_head($head, 'card', $langs->trans("MemberType"), -1, 'group');
 
 		$linkback = '<a href="'.DOL_URL_ROOT.'/adherents/type.php">'.$langs->trans("BackToList").'</a>';
 
 		dol_banner_tab($object, 'rowid', $linkback);
 		
+		print '<div class="fichecenter">';
 		print '<div class="underbanner clearboth"></div>';
 		
 		print '<table class="border" width="100%">';
@@ -342,7 +345,8 @@ if ($rowid > 0)
 		}
 
 		print '</table>';
-
+        print '</div>';
+        
 		dol_fiche_end();
 
 
diff --git a/htdocs/admin/defaultvalues.php b/htdocs/admin/defaultvalues.php
index dd37e4987e5..013be811b5b 100644
--- a/htdocs/admin/defaultvalues.php
+++ b/htdocs/admin/defaultvalues.php
@@ -172,9 +172,6 @@ if ($action == 'delete')
 
 
 
-
-
-
 /*
  * View
  */
@@ -323,7 +320,9 @@ else
 	print '<td align="center">';
 	print '<input type="hidden" name="entity" value="'.$conf->entity.'">';
 }
-print '<input type="submit" class="button" value="'.$langs->trans("Add").'" name="add">';
+$disabled='';
+if (empty($conf->global->MAIN_ENABLE_DEFAULT_VALUES)) $disabled=' disabled="disabled"';
+print '<input type="submit" class="button"'.$disabled.' value="'.$langs->trans("Add").'" name="add">';
 print "</td>\n";
 print '</tr>';
 
diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php
index 739a6fa4c88..cfa08f003ea 100644
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -362,13 +362,6 @@ if ($action == 'edit')	// Edit
 	print '<td width="20">&nbsp;</td>';
 	print '</tr>';
 
-	// Hide helpcenter link on login page
-	print '<tr><td class="titlefield">'.$langs->trans("DisableLinkToHelpCenter").'</td><td>';
-	print $form->selectyesno('MAIN_HELPCENTER_DISABLELINK',isset($conf->global->MAIN_HELPCENTER_DISABLELINK)?$conf->global->MAIN_HELPCENTER_DISABLELINK:0,1);
-	print '</td>';
-	print '<td width="20">&nbsp;</td>';
-	print '</tr>';
-	
 	// Message of the day on home page
     print '<tr><td class="titlefield">'.$langs->trans("MessageOfDay").'</td><td colspan="2">';
 
@@ -393,8 +386,14 @@ if ($action == 'edit')	// Edit
 	$doleditor->Create();
 	print '</td></tr>'."\n";
 	
-	// Background
+	// Hide helpcenter link on login page
+	print '<tr><td class="titlefield">'.$langs->trans("DisableLinkToHelpCenter").'</td><td>';
+	print $form->selectyesno('MAIN_HELPCENTER_DISABLELINK',isset($conf->global->MAIN_HELPCENTER_DISABLELINK)?$conf->global->MAIN_HELPCENTER_DISABLELINK:0,1);
+	print '</td>';
+	print '<td width="20">&nbsp;</td>';
+	print '</tr>';
 	
+	// Background
 	print '<tr><td><label for="imagebackground">'.$langs->trans("BackgroundImageLogin").' (png,jpg)</label></td><td colspan="2">';
     print '<div class="centpercent inline-block">';
 	print '<input type="file" class="flat class=minwidth200" name="imagebackground" id="imagebackground">';
@@ -531,11 +530,6 @@ else	// Show
     // Link to wiki help
     print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("DisableLinkToHelp",img_picto('',DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/helpdoc.png','',1)).'</td><td colspan="2">';
     print yn((isset($conf->global->MAIN_HELP_DISABLELINK)?$conf->global->MAIN_HELP_DISABLELINK:0),1);
-    print '</td></tr>';
-
-	// Link to help center
-    print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("DisableLinkToHelpCenter").'</td><td colspan="2">';
-    print yn((isset($conf->global->MAIN_HELPCENTER_DISABLELINK)?$conf->global->MAIN_HELPCENTER_DISABLELINK:0),1);
     print '</td></tr>';
 
     // Message of the day
@@ -558,8 +552,12 @@ else	// Show
     else print '&nbsp;';
     print '</td></tr>'."\n";
     
+	// Link to help center
+    print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("DisableLinkToHelpCenter").'</td><td colspan="2">';
+    print yn((isset($conf->global->MAIN_HELPCENTER_DISABLELINK)?$conf->global->MAIN_HELPCENTER_DISABLELINK:0),1);
+    print '</td></tr>';
+
     // Background login
-    
     print '<tr class="oddeven"><td>'.$langs->trans("BackgroundImageLogin").'</td><td colspan="2">';
     print '<div class="centpercent inline-block">';
     print $conf->global->MAIN_LOGIN_BACKGROUND;
diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php
index c51d1c2435d..44387bc2041 100644
--- a/htdocs/admin/translation.php
+++ b/htdocs/admin/translation.php
@@ -264,7 +264,9 @@ if ($mode == 'overwrite')
     	print '<td align="center">';
     	print '<input type="hidden" name="entity" value="'.$conf->entity.'">';
     //}
-    print '<input type="submit" class="button" value="'.$langs->trans("Add").'" name="add">';
+    $disabled='';
+    if (empty($conf->global->MAIN_ENABLE_OVERWRITE_TRANSLATION)) $disabled=' disabled="disabled"';
+    print '<input type="submit" class="button"'.$disabled.' value="'.$langs->trans("Add").'" name="add">';
     print "</td>\n";
     print '</tr>';
     
diff --git a/htdocs/langs/en_US/modulebuilder.lang b/htdocs/langs/en_US/modulebuilder.lang
index 81a34b66b85..da734ea1356 100644
--- a/htdocs/langs/en_US/modulebuilder.lang
+++ b/htdocs/langs/en_US/modulebuilder.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - loan
 ModuleBuilderDesc=This tools give you utilites to build or edit your own module.
-ModuleBuilderDesc2=Path were modules are generated/edited (first alternative directory defined into %s): <strong>%s</strong>. 
-ModuleBuilderDesc3=Modules found: <strong>%s</strong> (they are detected as editable when the file <strong>%s</strong> exists in root of module directory). 
+ModuleBuilderDesc2=Path were modules are generated/edited (first alternative directory defined into %s): <strong>%s</strong>
+ModuleBuilderDesc3=Generated/editable modules found: <strong>%s</strong> (they are detected as editable when the file <strong>%s</strong> exists in root of module directory). 
 NewModule=New module
 ModuleKey=Key for new module
 

From 5a31d2c95a6deba953720f2ceaacbe7ecce51135 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 10 May 2017 13:39:00 +0200
Subject: [PATCH 281/505] Fix css

---
 .../modulebuilder/template/myobject_card.php  | 346 ++++++++++++++++++
 htdocs/societe/class/societe.class.php        |  44 +--
 2 files changed, 368 insertions(+), 22 deletions(-)
 create mode 100644 htdocs/modulebuilder/template/myobject_card.php

diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php
new file mode 100644
index 00000000000..a257149c72a
--- /dev/null
+++ b/htdocs/modulebuilder/template/myobject_card.php
@@ -0,0 +1,346 @@
+<?php
+/* <one line to give the program's name and a brief idea of what it does.>
+ * Copyright (C) <year>  <name of author>
+ *
+ * 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    myobject_list.php
+ * \ingroup mymodule
+ * \brief   Page with list of myobject.
+ *
+ * List of myobject
+ */
+
+//if (! defined('NOREQUIREUSER'))	define('NOREQUIREUSER','1');
+//if (! defined('NOREQUIREDB'))		define('NOREQUIREDB','1');
+//if (! defined('NOREQUIRESOC'))	define('NOREQUIRESOC','1');
+//if (! defined('NOREQUIRETRAN'))	define('NOREQUIRETRAN','1');
+//if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK','1');			// Do not check anti CSRF attack test
+//if (! defined('NOSTYLECHECK'))   define('NOSTYLECHECK','1');			// Do not check style html tag into posted data
+//if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1');		// Do not check anti POST attack test
+//if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');			// If there is no need to load and show top and left menu
+//if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');			// If we don't need to load the html.form.class.php
+//if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
+//if (! defined("NOLOGIN"))        define("NOLOGIN",'1');				// If this page is public (can be called outside logged session)
+
+// Change the following lines to use the correct relative path (../, ../../, etc)
+
+// Load Dolibarr environment
+if (false === (@include '../../main.inc.php')) {  // From htdocs directory
+	require '../../../main.inc.php'; // From "custom" directory
+}
+
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+dol_include_once('/mymodule/class/myclass.class.php');
+
+// Load translation files required by the page
+$langs->load("mymodule@mymodule");
+
+// Get parameters
+$action     = GETPOST('action','alpha');
+$confirm    = GETPOST('confirm','alpha');
+
+$id			= GETPOST('id','int');
+$backtopage = GETPOST('backtopage');
+// TODO Add here list of search params
+$myparam	= GETPOST('myparam','alpha');
+
+if (empty($action) && empty($id) && empty($ref)) $action='view';
+
+// Protection if external user
+if ($user->societe_id > 0)
+{
+	//accessforbidden();
+}
+//$result = restrictedArea($user, 'mymodule', $id);
+
+$object = new Skeleton_Class($db);
+$extrafields = new ExtraFields($db);
+
+// fetch optionals attributes and labels
+$extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
+
+// Load object
+include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php';  // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
+
+// Initialize technical object to manage hooks of modules. Note that conf->hooks_modules contains array array
+$hookmanager->initHooks(array('skeleton'));
+
+
+/*
+ * ACTIONS
+ *
+ * Put here all code to do according to value of "action" parameter
+ */
+
+
+$parameters=array();
+$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+if (empty($reshook))
+{
+	if ($cancel) 
+	{
+		if ($action != 'addlink')
+		{
+			$urltogo=$backtopage?$backtopage:dol_buildpath('/mymodule/list.php',1);
+			header("Location: ".$urltogo);
+			exit;
+		}		
+		if ($id > 0 || ! empty($ref)) $ret = $object->fetch($id,$ref);
+		$action='';
+	}
+	
+	// Action to add record
+	if ($action == 'add' && ! empty($user->rights->mymodule->create))
+	{
+		if ($cancel)
+		{
+			$urltogo=$backtopage?$backtopage:dol_buildpath('/mymodule/list.php',1);
+			header("Location: ".$urltogo);
+			exit;
+		}
+
+		$error=0;
+
+		/* object_prop_getpost_prop */
+		$object->prop1=GETPOST("field1");
+		$object->prop2=GETPOST("field2");
+
+		if (empty($object->ref))
+		{
+			$error++;
+			setEventMessages($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Ref")), null, 'errors');
+		}
+
+		if (! $error)
+		{
+			$result=$object->create($user);
+			if ($result > 0)
+			{
+				// Creation OK
+				$urltogo=$backtopage?$backtopage:dol_buildpath('/mymodule/list.php',1);
+				header("Location: ".$urltogo);
+				exit;
+			}
+			{
+				// Creation KO
+				if (! empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
+				else  setEventMessages($object->error, null, 'errors');
+				$action='create';
+			}
+		}
+		else
+		{
+			$action='create';
+		}
+	}
+
+	// Action to update record
+	if ($action == 'update' && ! empty($user->rights->mymodule->create))
+	{
+		$error=0;
+
+		$object->prop1=GETPOST("field1");
+		$object->prop2=GETPOST("field2");
+
+		if (empty($object->ref))
+		{
+			$error++;
+			setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired",$langs->transnoentitiesnoconv("Ref")), null, 'errors');
+		}
+
+		if (! $error)
+		{
+			$result=$object->update($user);
+			if ($result > 0)
+			{
+				$action='view';
+			}
+			else
+			{
+				// Creation KO
+				if (! empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
+				else setEventMessages($object->error, null, 'errors');
+				$action='edit';
+			}
+		}
+		else
+		{
+			$action='edit';
+		}
+	}
+
+	// Action to delete
+	if ($action == 'confirm_delete' && ! empty($user->rights->mymodule->delete))
+	{
+		$result=$object->delete($user);
+		if ($result > 0)
+		{
+			// Delete OK
+			setEventMessages("RecordDeleted", null, 'mesgs');
+			header("Location: ".dol_buildpath('/mymodule/list.php',1));
+			exit;
+		}
+		else
+		{
+			if (! empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
+			else setEventMessages($object->error, null, 'errors');
+		}
+	}
+}
+
+
+
+/*
+ * VIEW
+ *
+ * Put here all code to build page
+ */
+
+$form = new Form($db);
+
+llxHeader('', $langs->trans('MyPageName'), '');
+
+
+// Put here content of your page
+
+// Example : Adding jquery code
+print '<script type="text/javascript" language="javascript">
+jQuery(document).ready(function() {
+	function init_myfunc()
+	{
+		jQuery("#myid").removeAttr(\'disabled\');
+		jQuery("#myid").attr(\'disabled\',\'disabled\');
+	}
+	init_myfunc();
+	jQuery("#mybutton").click(function() {
+		init_myfunc();
+	});
+});
+</script>';
+
+
+// Part to create
+if ($action == 'create')
+{
+	print load_fiche_titre($langs->trans("NewMyModule"));
+
+	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+	print '<input type="hidden" name="action" value="add">';
+	print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
+
+	dol_fiche_head();
+
+	print '<table class="border centpercent">'."\n";
+	// print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td><input class="flat" type="text" size="36" name="label" value="'.$label.'"></td></tr>';
+	// LIST_OF_TD_LABEL_FIELDS_CREATE
+	print '</table>'."\n";
+
+	dol_fiche_end();
+
+	print '<div class="center"><input type="submit" class="button" name="add" value="'.$langs->trans("Create").'"> &nbsp; <input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'"></div>';
+
+	print '</form>';
+}
+
+
+
+// Part to edit record
+if (($id || $ref) && $action == 'edit')
+{
+	print load_fiche_titre($langs->trans("MyModule"));
+    
+	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+	print '<input type="hidden" name="action" value="update">';
+	print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
+	print '<input type="hidden" name="id" value="'.$object->id.'">';
+	
+	dol_fiche_head();
+
+	print '<table class="border centpercent">'."\n";
+	// print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td><input class="flat" type="text" size="36" name="label" value="'.$label.'"></td></tr>';
+	// LIST_OF_TD_LABEL_FIELDS_EDIT
+	print '</table>';
+	
+	dol_fiche_end();
+
+	print '<div class="center"><input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
+	print ' &nbsp; <input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+	print '</div>';
+
+	print '</form>';
+}
+
+
+
+// Part to show record
+if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create')))
+{
+    $res = $object->fetch_optionals($object->id, $extralabels);
+
+	$head = commande_prepare_head($object);
+	dol_fiche_head($head, 'order', $langs->trans("CustomerOrder"), 0, 'order');
+		
+	print load_fiche_titre($langs->trans("MyModule"));
+    
+	dol_fiche_head();
+
+	if ($action == 'delete') {
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('DeleteMyOjbect'), $langs->trans('ConfirmDeleteMyObject'), 'confirm_delete', '', 0, 1);
+		print $formconfirm;
+	}
+	
+	print '<table class="border centpercent">'."\n";
+	// print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td>'.$object->label.'</td></tr>';
+	// LIST_OF_TD_LABEL_FIELDS_VIEW
+	print '</table>';
+	
+	dol_fiche_end();
+
+
+	// Buttons
+	print '<div class="tabsAction">'."\n";
+	$parameters=array();
+	$reshook=$hookmanager->executeHooks('addMoreActionsButtons',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+	if (empty($reshook))
+	{
+		if ($user->rights->mymodule->write)
+		{
+			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a></div>'."\n";
+		}
+
+		if ($user->rights->mymodule->delete)
+		{
+			print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete">'.$langs->trans('Delete').'</a></div>'."\n";
+		}
+	}
+	print '</div>'."\n";
+
+
+	// Example 2 : Adding links to objects
+	// Show links to link elements
+	//$linktoelem = $form->showLinkToObjectBlock($object, null, array('skeleton'));
+	//$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
+
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 0581ed1960e..6d3464ccc20 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -1838,29 +1838,29 @@ class Societe extends CommonObject
 
         $name=$this->name?$this->name:$this->nom;
 
-	if (! empty($conf->global->SOCIETE_ADD_REF_IN_LIST) && (!empty($withpicto)))
-	{
-		if (($this->client) && (! empty ( $this->code_client ))
-			&& ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1
-			|| $conf->global->SOCIETE_ADD_REF_IN_LIST == 2
-			)
-		) 
-			$code = $this->code_client . ' - ';
+    	if (! empty($conf->global->SOCIETE_ADD_REF_IN_LIST) && (!empty($withpicto)))
+    	{
+    		if (($this->client) && (! empty ( $this->code_client ))
+    			&& ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1
+    			|| $conf->global->SOCIETE_ADD_REF_IN_LIST == 2
+    			)
+    		) 
+    		$code = $this->code_client . ' - ';
 
-		if (($this->fournisseur) && (! empty ( $this->code_fournisseur ))
-			&& ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1
-			|| $conf->global->SOCIETE_ADD_REF_IN_LIST == 3
-			)
-		) 
-			$code .= $this->code_fournisseur . ' - ';
+    		if (($this->fournisseur) && (! empty ( $this->code_fournisseur ))
+    			&& ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1
+    			|| $conf->global->SOCIETE_ADD_REF_IN_LIST == 3
+    			)
+    		) 
+    		$code .= $this->code_fournisseur . ' - ';
+    
+    		if ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1)
+    			$name =$code.' '.$name;
+    		else
+    			$name =$code;
+    	}
 
-		if ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1)
-			$name =$code.' '.$name;
-		else
-			$name =$code;
-	}
-
-	if (!empty($this->name_alias)) $name .= ' ('.$this->name_alias.')';
+    	if (!empty($this->name_alias)) $name .= ' ('.$this->name_alias.')';
 
         $result=''; $label='';
         $linkstart=''; $linkend='';
@@ -1962,7 +1962,7 @@ class Societe extends CommonObject
             $linkend='';
         }
         
-        if ($withpicto) $result.=($linkstart.img_object(($notooltip?'':$label), 'company', ($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).$linkend);
+        if ($withpicto) $result.=($linkstart.img_object(($notooltip?'':$label), 'company', ($notooltip?'':'class="classfortooltip valigntextbottom"'), 0, 0, $notooltip?0:1).$linkend);
         if ($withpicto && $withpicto != 2) $result.=' ';
         if ($withpicto != 2) $result.=$linkstart.($maxlen?dol_trunc($name,$maxlen):$name).$linkend;
 

From 0156e99894cc25b183af899265b435cc8cd72318 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 10 May 2017 13:46:02 +0200
Subject: [PATCH 282/505] Code comment

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 78fbca7b0b5..bd3a79e7241 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -242,9 +242,10 @@ function dol_shutdown()
  *  @param	string	$paramname   Name of parameter to found
  *  @param	string	$check	     Type of check (''=no check,  'int'=check it's numeric, 'alpha'=check it's text and sign, 'aZ'=check it's a-z only, 'array'=check it's array, 'san_alpha'=Use filter_var with FILTER_SANITIZE_STRING (do not use this for free text string), 'day', 'month', 'year', 'custom'= custom filter specify $filter and $options)
  *  @param	int		$method	     Type of method (0 = get then post, 1 = only get, 2 = only post, 3 = post then get, 4 = post then get then cookie)
- *  @param  int     $filter      Filter to apply when $check is set to custom. (See http://php.net/manual/en/filter.filters.php for détails)
- *  @param  mixed   $options     Options to pass to filter_var when $check is set to custom
+ *  @param  int     $filter      Filter to apply when $check is set to 'custom'. (See http://php.net/manual/en/filter.filters.php for détails)
+ *  @param  mixed   $options     Options to pass to filter_var when $check is set to 'custom'.
  *  @return string|string[]      Value found (string or array), or '' if check fails
+ *  @TODO Set default value for check to alpha. Check all WYSIWYG edition (email and description...) is still ok with rich text.
  */
 function GETPOST($paramname, $check='', $method=0, $filter=NULL, $options=NULL)
 {

From ec03d1705b109547506685c985d0c342edfa5f94 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 10 May 2017 13:56:05 +0200
Subject: [PATCH 283/505] Fix travis

---
 .../template/build/makepack-dolibarrmodule.pl | 388 ------------------
 .../template/build/makepack-mymodule.conf     |  17 +-
 .../template/class/ParsedownDolibarr.php      |  48 ---
 .../template/class/actions_mymodule.class.php |   4 +-
 .../js/{myjs.js.php => mymodule.js.php}       |   2 +-
 .../functional/MyModuleFunctionalTest.php     |  10 +-
 .../template/test/unit/MyClassTest.php        |   8 +-
 7 files changed, 12 insertions(+), 465 deletions(-)
 delete mode 100644 htdocs/modulebuilder/template/build/makepack-dolibarrmodule.pl
 delete mode 100644 htdocs/modulebuilder/template/class/ParsedownDolibarr.php
 rename htdocs/modulebuilder/template/js/{myjs.js.php => mymodule.js.php} (96%)

diff --git a/htdocs/modulebuilder/template/build/makepack-dolibarrmodule.pl b/htdocs/modulebuilder/template/build/makepack-dolibarrmodule.pl
deleted file mode 100644
index 537fead0d40..00000000000
--- a/htdocs/modulebuilder/template/build/makepack-dolibarrmodule.pl
+++ /dev/null
@@ -1,388 +0,0 @@
-#!/usr/bin/perl
-#----------------------------------------------------------------------------
-# \file         build/makepack-dolibarrmodule.pl
-# \brief        Package builder (tgz, zip, rpm, deb, exe)
-# \author       (c)2005-2006    Laurent Destailleur <eldy@users.sourceforge.net>
-#               (c)2016         Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
-#----------------------------------------------------------------------------
-
-use Cwd;
-
-
-@LISTETARGET=("TGZ");   # Possible packages
-%REQUIREMENTTARGET=(    # Tool requirement for each package
-"TGZ"=>"tar",
-"ZIP"=>"7z"
-);
-%ALTERNATEPATH=(
-);
-
-
-use vars qw/ $REVISION $VERSION /;
-$REVISION='1.20';
-$VERSION="1.0 (build $REVISION)";
-
-
-
-#------------------------------------------------------------------------------
-# MAIN
-#------------------------------------------------------------------------------
-($DIR=$0) =~ s/([^\/\\]+)$//; ($PROG=$1) =~ s/\.([^\.]*)$//; $Extension=$1;
-$DIR||='.'; $DIR =~ s/([^\/\\])[\\\/]+$/$1/;
-
-# Detect OS type
-# --------------
-if ("$^O" =~ /linux/i || (-d "/etc" && -d "/var" && "$^O" !~ /cygwin/i)) { $OS='linux'; $CR=''; }
-elsif (-d "/etc" && -d "/Users") { $OS='macosx'; $CR=''; }
-elsif ("$^O" =~ /cygwin/i || "$^O" =~ /win32/i) { $OS='windows'; $CR="\r"; }
-if (! $OS) {
-    print "makepack-dolbarrmodule.pl was not able to detect your OS.\n";
-	print "Can't continue.\n";
-	print "makepack-dolibarrmodule.pl aborted.\n";
-    sleep 2;
-	exit 1;
-}
-
-# Define buildroot
-# ----------------
-if ($OS =~ /linux/) {
-    $TEMP=$ENV{"TEMP"}||$ENV{"TMP"}||"/tmp";
-}
-if ($OS =~ /macos/) {
-    $TEMP=$ENV{"TEMP"}||$ENV{"TMP"}||"/tmp";
-}
-if ($OS =~ /windows/) {
-    $TEMP=$ENV{"TEMP"}||$ENV{"TMP"}||"c:/temp";
-    $PROGPATH=$ENV{"ProgramFiles"};
-}
-if (! $TEMP || ! -d $TEMP) {
-    print "Error: A temporary directory can not be find.\n";
-    print "Check that TEMP or TMP environment variable is set correctly.\n";
-	print "makepack-dolibarrmodule.pl aborted.\n";
-    sleep 2;
-    exit 2;
-} 
-$BUILDROOT="$TEMP/dolibarr-buildroot";
-
-
-my $copyalreadydone=0;
-my $batch=0;
-
-for (0..@ARGV-1) {
-	if ($ARGV[$_] =~ /^-*target=(\w+)/i)   { $target=$1; $batch=1; }
-	if ($ARGV[$_] =~ /^-*desti=(.+)/i)     { $DESTI=$1; }
-    if ($ARGV[$_] =~ /^-*prefix=(.+)/i)    {
-    	$PREFIX=$1; 
-    	$FILENAMESNAPSHOT.="-".$PREFIX; 
-    }
-}
-$SOURCE="$DIR/..";
-$DESTI="$SOURCE/build";
-if ($ENV{"DESTIMODULES"}) { $DESTI = $ENV{"DESTIMODULES"}; }		# Force output dir if env DESTIMODULES is defined
-$NEWDESTI=$DESTI;
-
-
-print "Makepack for modules version $VERSION\n";
-print "Source directory: $SOURCE\n";
-print "Target directory: $NEWDESTI\n";
-
-# Autodetect version and module name
-$mod_dir = "../core/modules/";
-opendir(DIR, $mod_dir);
-@mod_files=grep { /^mod\w*\.class.php$/ } readdir(DIR);
-foreach $file (@mod_files) {
-	$PROJECTINPUT=lc $1 if $file =~ /^mod(\w*)\.class.php$/;
-	$file = $mod_dir . $file;
-	open FILE, $file or die $!;
-	@file_content = <FILE>;
-	close FILE;
-	foreach $line (@file_content) {
-		# Extracts version number
-		$PROJVERSION=$1 if $line =~ /(?<=version\s=\s')(\d+(\.\d+){1,2})/;
-	}
-}
-
-# Ask and set version $MAJOR, $MINOR and $BUILD
-if ($PROJVERSION eq '')
-{
-	print "Enter value for version: ";
-	$PROJVERSION=<STDIN>;
-}
-chomp($PROJVERSION);
-($MAJOR,$MINOR,$BUILD)=split(/\./,$PROJVERSION,3);
-if ($MINOR eq '')
-{
-    print "Enter value for minor version: ";
-    $MINOR=<STDIN>;
-    chomp($MINOR);
-}
-
-# Ask module
-if ($PROJECTINPUT eq '')
-{
-	print "Enter name for your module (mymodule, mywonderfulmondule, ... or 'all') : ";
-	$PROJECTINPUT=<STDIN>;
-}
-chomp($PROJECTINPUT);
-print "Move to ".$DIR." directory.\n";
-chdir($DIR);
-
-
-my @PROJECTLIST=();
-if ($PROJECTINPUT eq "all")
-{
-    opendir(DIR, $DIR) || return;
-    local @rv = grep { /^makepack\-(.*)\.conf$/ } sort readdir(DIR);
-    closedir(DIR);
-    foreach my $xxx (0..@rv-1) {
-    	if ($rv[$xxx] =~ /^makepack\-(.*)\.conf$/)
-    	{ 
-    	   @PROJECTLIST[$xxx]=$1;
-    	}
-    }
-}
-else
-{
-	@PROJECTLIST=($PROJECTINPUT);
-}
-
-
-# Loop on each projects
-foreach my $PROJECT (@PROJECTLIST) {
-	
-	if (! -f "makepack-".$PROJECT.".conf")
-	{
-	    print "Error: can't open conf file makepack-".$PROJECT.".conf\n";
-		print "\n";
-		print "For help on building a module package, see web page\n";
-		print 
-"http://wiki.dolibarr.org/cindex.php/Module_development#Create_a_package_to_distribute_and_install_your_module\n";
-		print "makepack-dolibarrmodule.pl aborted.\n";
-	    sleep 2;
-	    exit 2;
-	}
-	
-	$FILENAME="$PROJECT";
-	$FILENAMETGZ="module_$PROJECT-$MAJOR.$MINOR".($BUILD ne ''?".$BUILD":"");
-	$FILENAMEZIP="module_$PROJECT-$MAJOR.$MINOR".($BUILD ne ''?".$BUILD":"");
-	if (-d "/usr/src/redhat") {
-	    # redhat
-	    $RPMDIR="/usr/src/redhat";
-	}
-	if (-d "/usr/src/RPM") {
-	    # mandrake
-	    $RPMDIR="/usr/src/RPM";
-	}
-	
-	
-	# Choose package targets
-	#-----------------------
-	$target="ZIP";    # Dolibarr modules are this format
-	$CHOOSEDTARGET{uc($target)}=1;
-	
-	
-	# Test if requirement is ok
-	#--------------------------
-	foreach my $target (keys %CHOOSEDTARGET) {
-	    foreach my $req (split(/[,\s]/,$REQUIREMENTTARGET{$target})) {
-	        # Test    
-	        print "Test requirement for target $target: Search '$req'... ";
-	        $ret=`"$req" 2>&1`;
-	        $coderetour=$?; $coderetour2=$coderetour>>8;
-	        if ($coderetour != 0 && (($coderetour2 == 1 && $OS =~ /windows/ && $ret !~ /Usage/i) || ($coderetour2 == 127 && $OS !~ /windows/)) && $PROGPATH) { 
-	            # Not found error, we try in PROGPATH
-	            $ret=`"$PROGPATH/$ALTERNATEPATH{$req}/$req\" 2>&1`;
-	            $coderetour=$?; $coderetour2=$coderetour>>8;
-	            $REQUIREMENTTARGET{$target}="$PROGPATH/$ALTERNATEPATH{$req}/$req";
-	        }    
-	
-	        if ($coderetour != 0 && (($coderetour2 == 1 && $OS =~ /windows/ && $ret !~ /Usage/i) || ($coderetour2 == 127 && $OS !~ /windows/))) {
-	            # Not found error
-	            print "Not found\nCan't build target $target. Requirement '$req' not found in PATH\n";
-	            $CHOOSEDTARGET{$target}=-1;
-	            last;
-	        } else {
-	            # Pas erreur ou erreur autre que programme absent
-	            print " Found ".$REQUIREMENTTARGET{$target}."\n";
-	        }
-	    }
-	}
-	
-	print "\n";
-	
-	# Check if there is at least on target to build
-	#----------------------------------------------
-	$nboftargetok=0;
-	$nboftargetneedbuildroot=0;
-	$nboftargetneedcvs=0;
-	foreach my $target (keys %CHOOSEDTARGET) {
-	    if ($CHOOSEDTARGET{$target} < 0) { next; }
-		if ($target ne 'EXE' && $target ne 'EXEDOLIWAMP') 
-		{
-			$nboftargetneedbuildroot++;
-		}
-		if ($target eq 'SNAPSHOT')
-		{
-			$nboftargetneedcvs++;
-		}
-		$nboftargetok++;
-	}
-	
-	if ($nboftargetok) {
-	
-	    # Update CVS if required
-	    #-----------------------
-	    if ($nboftargetneedcvs)
-		{
-	    	print "Go to directory $SOURCE\n";
-	   		$olddir=getcwd();
-	   		chdir("$SOURCE");
-	    	print "Run cvs update -P -d\n";
-	    	$ret=`cvs update -P -d 2>&1`;
-	    	chdir("$olddir");
-		}
-		
-	    # Update buildroot if required
-	    #-----------------------------
-	    if ($nboftargetneedbuildroot)
-		{
-		    if (! $copyalreadydone) {
-		    	print "Delete directory $BUILDROOT\n";
-		    	$ret=`rm -fr "$BUILDROOT"`;
-	
-		    	mkdir "$BUILDROOT";
-		    	mkdir "$BUILDROOT/$PROJECT";
-		    	
-				$result=open(IN,"<makepack-".$PROJECT.".conf");
-				if (! $result) { die "Error: Can't open conf file makepack-".$PROJECT.".conf for reading.\n"; }
-			    while(<IN>)
-			    {
-			    	if ($_ =~ /^#/) { next; }	# Do not process comments
-					
-					$_ =~ s/\n//;
-			    	$_ =~ /^(.*)\/[^\/]+/;
-			    	print "Create directory $BUILDROOT/$PROJECT/$1\n";
-			    	$ret=`mkdir -p "$BUILDROOT/$PROJECT/$1"`;
-			    	if ($_ !~ /version\-/)
-			    	{
-			    	    print "Copy $SOURCE/$_ into $BUILDROOT/$PROJECT/$_\n";
-		    		    $ret=`cp -pr "$SOURCE/$_" "$BUILDROOT/$PROJECT/$_"`;
-			    	}
-				}	
-				close IN;
-				
-				@timearray=localtime(time());
-				$fulldate=($timearray[5]+1900).'-'.($timearray[4]+1).'-'.$timearray[3].' '.$timearray[2].':'.$timearray[1];
-#				open(VF,">$BUILDROOT/$PROJECT/build/version-".$PROJECT.".txt");
-#		
-#				print "Create version file $BUILDROOT/$PROJECT/build/version-".$PROJECT.".txt with date ".$fulldate."\n";
-#				$ret=`mkdir -p "$BUILDROOT/$PROJECT/build"`;
-#				print VF "Version: ".$MAJOR.".".$MINOR.($BUILD ne ''?".$BUILD":"")."\n";
-#				print VF "Build  : ".$fulldate."\n";
-#				close VF;
-		    }
-		    print "Clean $BUILDROOT\n";
-		    $ret=`rm -fr $BUILDROOT/$PROJECT/.cache`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECT/.project`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECT/.settings`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECT/build/html`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECT/documents`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECT/document`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php.mysql`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php.old`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php.postgres`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf*sav*`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom`;
-	        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom2`;
-	        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/theme/bureau2crea`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECT/test`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECT/Thumbs.db $BUILDROOT/$PROJECT/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/*/Thumbs.db`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECT/CVS* $BUILDROOT/$PROJECT/*/CVS* $BUILDROOT/$PROJECT/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/CVS*`;
-		}    
-	    
-	    # Build package for each target
-	    #------------------------------
-	    foreach my $target (keys %CHOOSEDTARGET) {
-	        if ($CHOOSEDTARGET{$target} < 0) { next; }
-	    
-	        print "\nBuild package for target $target\n";
-	        
-	    	if ($target eq 'TGZ') {
-	    		$NEWDESTI=$DESTI;
-				if (-d $DESTI.'/../modules') { $NEWDESTI=$DESTI.'/../modules'; } 
-
-	    		print "Remove target $FILENAMETGZ.tgz...\n";
-	    		unlink("$NEWDESTI/$FILENAMETGZ.tgz");
-	    		print "Compress $BUILDROOT/* into $FILENAMETGZ.tgz...\n";
-	   		    $cmd="tar --exclude-vcs --exclude *.tgz --directory \"$BUILDROOT\" --mode=go-w --group=500 --owner=500 -czvf \"$FILENAMETGZ.tgz\" .";
-	   		    $ret=`$cmd`;
-	            if ($OS =~ /windows/i) {
-	        		print "Move $FILENAMETGZ.tgz to $NEWDESTI/$FILENAMETGZ.tgz\n";
-	        		$ret=`mv "$FILENAMETGZ.tgz" "$NEWDESTI/$FILENAMETGZ.tgz"`;
-	            }
-	            else
-	            {
-	        		$ret=`mv "$FILENAMETGZ.tgz" "$NEWDESTI/$FILENAMETGZ.tgz"`;
-	            }
-	            next;
-	    	}
-	
-	    	if ($target eq 'ZIP') {
-	    		$NEWDESTI=$DESTI;
-				if (-d $DESTI.'/../modules') { $NEWDESTI=$DESTI.'/../modules'; }
-				 
-	    		print "Remove target $FILENAMEZIP.zip...\n";
-	    		unlink "$NEWDESTI/$FILENAMEZIP.zip";
-	    		print "Compress $FILENAMEZIP into $FILENAMEZIP.zip...\n";
-	
-	            print "Go to directory $BUILDROOT\n";
-	     		$olddir=getcwd();
-	     		chdir("$BUILDROOT");
-	    		$cmd= "7z a -r -tzip -mx $BUILDROOT/$FILENAMEZIP.zip *";
-				print $cmd."\n";
-				$ret= `$cmd`;
-	            chdir("$olddir");
-	
-	            print "Move $FILENAMEZIP.zip to $NEWDESTI/$FILENAMEZIP.zip\n";
-	            $ret=`mv "$BUILDROOT/$FILENAMEZIP.zip" "$NEWDESTI/$FILENAMEZIP.zip"`;
-	    		next;
-	    	}
-	    
-	    	if ($target eq 'EXE') {
-	    		$NEWDESTI=$DESTI;
-				if (-d $DESTI.'/../modules') { $NEWDESTI=$DESTI.'/../modules'; }
-
-	    		print "Remove target $FILENAMEEXE.exe...\n";
-	    		unlink "$NEWDESTI/$FILENAMEEXE.exe";
-	    		print "Compress into $FILENAMEEXE.exe by $FILENAMEEXE.nsi...\n";
-	    		$command="\"$REQUIREMENTTARGET{$target}\" /DMUI_VERSION_DOT=$MAJOR.$MINOR.$BUILD /X\"SetCompressor bzip2\" \"$SOURCE\\build\\exe\\$FILENAME.nsi\"";
-	            print "$command\n";
-	    		$ret=`$command`;
-	    		print "Move $FILENAMEEXE.exe to $NEWDESTI\n";
-	    		rename("$SOURCE\\build\\exe\\$FILENAMEEXE.exe","$NEWDESTI/$FILENAMEEXE.exe");
-	    		next;
-	    	}
-	    
-	    }
-	
-	}
-	
-	print "\n----- Summary -----\n";
-	foreach my $target (keys %CHOOSEDTARGET) {
-	    if ($CHOOSEDTARGET{$target} < 0) {
-	        print "Package $target not built (bad requirement).\n";
-	    } else {
-	        print "Package $target built successfully in $NEWDESTI\n";
-	    }
-	}
-
-
-}
-
-
-if (! $batch) {
-    print "\nPress key to finish...";
-    my $WAITKEY=<STDIN>;
-}
-
-0;
diff --git a/htdocs/modulebuilder/template/build/makepack-mymodule.conf b/htdocs/modulebuilder/template/build/makepack-mymodule.conf
index c7a47fbe45e..16dc1e7b82b 100644
--- a/htdocs/modulebuilder/template/build/makepack-mymodule.conf
+++ b/htdocs/modulebuilder/template/build/makepack-mymodule.conf
@@ -8,19 +8,4 @@
 # Setup:   Go on Dolibarr setup - modules to enable module.
 #
 # Files in module
-index.php
-mypage.php
-admin/
-class/
-COPYING
-core/
-css/
-doc/
-img/
-js/
-langs/
-lib/
-scripts/
-sql/
-vendor/
-README.md
+mymodule/
\ No newline at end of file
diff --git a/htdocs/modulebuilder/template/class/ParsedownDolibarr.php b/htdocs/modulebuilder/template/class/ParsedownDolibarr.php
deleted file mode 100644
index 45cf82f4b9c..00000000000
--- a/htdocs/modulebuilder/template/class/ParsedownDolibarr.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-/*
- * Copyright (C) 2016  Raphaël Doursenaud <rdoursenaud@gpcsolutions.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
- * 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    class/ParsedownDolibarr.php
- * \ingroup mymodule
- * \brief   Custom Parsedown class to display inline images from the README.md in the about page
- */
-
-/** Includes */
-require __DIR__ . '/../vendor/autoload.php';
-
-/**
- * Class ParsedownDolibarr
- */
-class ParsedownDolibarr extends Parsedown
-{
-    /**
-     * Resolve inline images relative URLs to the module's path
-     *
-     * @param $Excerpt
-     * @return array|void
-     */
-    protected function inlineImage($Excerpt)
-    {
-        $image = parent::inlineImage($Excerpt);
-        $path = new \Enrise\Uri($image['element']['attributes']['src']);
-        if ($path->isRelative()) {
-            $image['element']['attributes']['src'] = dol_buildpath('/mymodule/' . $path, 1);
-        }
-        return $image;
-    }
-}
diff --git a/htdocs/modulebuilder/template/class/actions_mymodule.class.php b/htdocs/modulebuilder/template/class/actions_mymodule.class.php
index 1361a7b4897..7047332bbfc 100644
--- a/htdocs/modulebuilder/template/class/actions_mymodule.class.php
+++ b/htdocs/modulebuilder/template/class/actions_mymodule.class.php
@@ -55,8 +55,8 @@ class ActionsMyModule
 	 * Overloading the doActions function : replacing the parent's function with the one below
 	 *
 	 * @param   array()         $parameters     Hook metadatas (context, etc...)
-	 * @param   CommonObject    &$object        The object to process (an invoice if you are in invoice module, a propale in propale's module, etc...)
-	 * @param   string          &$action        Current action (if set). Generally create or edit or null
+	 * @param   CommonObject    $object         The object to process (an invoice if you are in invoice module, a propale in propale's module, etc...)
+	 * @param   string          $action         Current action (if set). Generally create or edit or null
 	 * @param   HookManager     $hookmanager    Hook manager propagated to allow calling another hook
 	 * @return  int                             < 0 on error, 0 on success, 1 to replace standard code
 	 */
diff --git a/htdocs/modulebuilder/template/js/myjs.js.php b/htdocs/modulebuilder/template/js/mymodule.js.php
similarity index 96%
rename from htdocs/modulebuilder/template/js/myjs.js.php
rename to htdocs/modulebuilder/template/js/mymodule.js.php
index b2649676f14..ae8ce6cbe0d 100644
--- a/htdocs/modulebuilder/template/js/myjs.js.php
+++ b/htdocs/modulebuilder/template/js/mymodule.js.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * \file    js/myjs.js.php
+ * \file    js/mymodule.js.php
  * \ingroup mymodule
  * \brief   Example JavaScript.
  *
diff --git a/htdocs/modulebuilder/template/test/functional/MyModuleFunctionalTest.php b/htdocs/modulebuilder/template/test/functional/MyModuleFunctionalTest.php
index 3a310e48f66..41dc9891af7 100644
--- a/htdocs/modulebuilder/template/test/functional/MyModuleFunctionalTest.php
+++ b/htdocs/modulebuilder/template/test/functional/MyModuleFunctionalTest.php
@@ -39,7 +39,7 @@ use PHPUnit_Extensions_Selenium2TestCase_WebDriverException;
  * @todo Windows support (IE, Google Chrome, Mozilla Firefox, Safari)
  * @todo OSX support (Safari, Google Chrome, Mozilla Firefox)
  *
- * @package test\functional
+ * @package Testmymodule
  */
 class MyModuleFunctionalTest extends \PHPUnit_Extensions_Selenium2TestCase
 {
@@ -82,8 +82,8 @@ class MyModuleFunctionalTest extends \PHPUnit_Extensions_Selenium2TestCase
 	/**
 	 * Helper function to select links by href
 	 *
-	 * @param $value
-	 * @return mixed
+	 * @param  string  $value      Href
+	 * @return mixed               Helper string    
 	 */
 	protected function byHref($value)
 	{
@@ -261,9 +261,7 @@ class MyModuleFunctionalTest extends \PHPUnit_Extensions_Selenium2TestCase
 		$this->authenticate();
 		return $this->assertContains(
 			'tick.png',
-			$this
-				->byXPath('//td[text()="interface_99_modMyModule_MyTrigger.class.php"]/following::img')
-				->attribute('src'),
+			$this->byXPath('//td[text()="interface_99_modMyModule_MyTrigger.class.php"]/following::img')->attribute('src'),
 			"Trigger enabled"
 		);
 	}
diff --git a/htdocs/modulebuilder/template/test/unit/MyClassTest.php b/htdocs/modulebuilder/template/test/unit/MyClassTest.php
index 16016baf117..94898e9209b 100644
--- a/htdocs/modulebuilder/template/test/unit/MyClassTest.php
+++ b/htdocs/modulebuilder/template/test/unit/MyClassTest.php
@@ -28,7 +28,7 @@ namespace test\unit;
 
 /**
  * Class MyClassTest
- * @package test\unit
+ * @package Testmymodule
  */
 class MyClassTest extends \PHPUnit_Framework_TestCase
 {
@@ -93,10 +93,10 @@ class MyClassTest extends \PHPUnit_Framework_TestCase
 	/**
 	 * Unsuccessful test
 	 *
-	 * @param \Exception $e
-	 * @throws \Exception
+	 * @param  Exception $e    Exception
+	 * @throws Exception
 	 */
-	protected function onNotSuccessfulTest(\Exception $e)
+	protected function onNotSuccessfulTest(Exception $e)
 	{
 		fwrite(STDOUT, __METHOD__ . "\n");
 		throw $e;

From 8781f6bcf2a49677b0b2dc4e071165ffd6a54aaa Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 10 May 2017 14:53:20 +0200
Subject: [PATCH 284/505] Add vat code on predefined invoice

---
 htdocs/install/mysql/migration/5.0.0-6.0.0.sql | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index d2431186ed7..dbc33e384ef 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -24,6 +24,8 @@
 -- -- VPGSQL8.2 DELETE FROM llx_usergroup_user      WHERE fk_user      NOT IN (SELECT rowid from llx_user);
 -- -- VMYSQL4.1 DELETE FROM llx_usergroup_user      WHERE fk_usergroup NOT IN (SELECT rowid from llx_usergroup);
 
+ALTER TABLE llx_facturedet_rec ADD COLUMN vat_src_code varchar(10) DEFAULT '' AFTER tva_tx;
+
 ALTER TABLE llx_extrafields ADD COLUMN langs varchar(24);
 
 ALTER TABLE llx_supplier_proposaldet ADD COLUMN fk_unit integer DEFAULT NULL;

From 984531411d123527f7209eef1e459d74dfe16ae2 Mon Sep 17 00:00:00 2001
From: Marc de Lima Lucio <marc.delimalucio@atm-consulting.fr>
Date: Wed, 10 May 2017 15:01:27 +0200
Subject: [PATCH 285/505] NEW: permit multiple file upload in linked documents

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

diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 8d90892cfb6..022579b3a7c 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -126,7 +126,9 @@ class FormFile
             {
                 $out .= '<input type="hidden" name="max_file_size" value="'.($max*1024).'">';
             }
-            $out .= '<input class="flat minwidth400" type="file" name="userfile"';
+
+            $out .= '<input class="flat minwidth400" type="file"';
+            $out .= (empty($conf->global->MAIN_USE_MULTIPLE_FILEUPLOAD)?' name="userfile"':' name="userfile[]" multiple');
             $out .= (empty($conf->global->MAIN_UPLOAD_DOC) || empty($perm)?' disabled':'');
             $out .= '>';
             $out .= ' ';

From 70de54e97dfd85fa601ef4af22500824bf890037 Mon Sep 17 00:00:00 2001
From: Thomas Raschbacher <lordvan@lordvan.com>
Date: Wed, 10 May 2017 15:21:53 +0200
Subject: [PATCH 286/505] fix project extrafields for ODT

for some raeson the code was checking for already existing extra fields before even fetching it. removed the if condition, now it works fine.
---
 .../doc/doc_generic_project_odt.modules.php     | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
index fbe3db84370..e050bf8e3eb 100644
--- a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
+++ b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
@@ -131,18 +131,15 @@ class doc_generic_project_odt extends ModelePDFProjects
 		);
 
 		// Retrieve extrafields
-		if (is_array($object->array_options) && count($object->array_options))
-		{
-			$extrafieldkey=$object->element;
+		$extrafieldkey=$object->element;
 
-			require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-			$extrafields = new ExtraFields($this->db);
-			$extralabels = $extrafields->fetch_name_optionals_label($extrafieldkey,true);
-			$object->fetch_optionals($object->id,$extralabels);
-
-			$resarray = $this->fill_substitutionarray_with_extrafields($object,$resarray,$extrafields,$array_key,$outputlangs);
-		}
+		require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+		$extrafields = new ExtraFields($this->db);
+		$extralabels = $extrafields->fetch_name_optionals_label($extrafieldkey,true);
+		$object->fetch_optionals($object->id,$extralabels);
 
+		$resarray = $this->fill_substitutionarray_with_extrafields($object,$resarray,$extrafields,$array_key,$outputlangs);
+		
 		return $resarray;
 	}
 

From bba8f972a191a9dc7d596f3a083c6a60ee055a1d Mon Sep 17 00:00:00 2001
From: alexis Algoud <alexis@atm-consulting.fr>
Date: Wed, 10 May 2017 16:10:14 +0200
Subject: [PATCH 287/505] FIX situation invoice broken due to the all percent
 application form inside addline form

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

diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 05174fd940b..c9f223723be 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -3800,30 +3800,20 @@ else if ($id > 0 || ! empty($ref))
 	// Lines
 	$result = $object->getLinesArray();
 
-	print '	<form name="addproduct" id="addproduct" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . (($action != 'editline') ? '#add' : '#line_' . GETPOST('lineid')) . '" method="POST">
-	<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">
-	<input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateligne') . '">
-	<input type="hidden" name="mode" value="">
-	<input type="hidden" name="id" value="' . $object->id . '">
-	';
-
-	if (! empty($conf->use_javascript_ajax) && $object->statut == 0) {
-		include DOL_DOCUMENT_ROOT . '/core/tpl/ajaxrow.tpl.php';
-	}
-
-    print '<div class="div-table-responsive">';
-	print '<table id="tablelines" class="noborder noshadow" width="100%">';
-
 	// Show global modifiers
 	if (! empty($conf->global->INVOICE_USE_SITUATION))
 	{
 		if ($object->situation_cycle_ref && $object->statut == 0) {
+			print '<div class="div-table-responsive">';
+			print '<table id="tablelines" class="noborder noshadow" width="100%">';
+			
+			
 			print '<tr class="liste_titre nodrag nodrop">';
 			print '<form name="updatealllines" id="updatealllines" action="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '"#updatealllines" method="POST">';
 			print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '" />';
 			print '<input type="hidden" name="action" value="updatealllines" />';
 			print '<input type="hidden" name="id" value="' . $object->id . '" />';
-
+			
 			if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
 				print '<td align="center" width="5">&nbsp;</td>';
 			}
@@ -3846,7 +3836,7 @@ else if ($id > 0 || ! empty($ref))
 			print '<td width="10">&nbsp;</td>';
 			print '<td width="10">&nbsp;</td>';
 			print "</tr>\n";
-
+			
 			if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
 				print '<td align="center" width="5">&nbsp;</td>';
 			}
@@ -3860,8 +3850,29 @@ else if ($id > 0 || ! empty($ref))
 			print '<td colspan="4" align="right"><input class="button" type="submit" name="all_percent" value="Modifier" /></td>';
 			print '</tr>';
 			print '</form>';
+			
+			print '</table>';
+			print '</div>';
+			
 		}
+		
 	}
+	
+	
+	
+	print '	<form name="addproduct" id="addproduct" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . (($action != 'editline') ? '#add' : '#line_' . GETPOST('lineid')) . '" method="POST">
+	<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">
+	<input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateligne') . '">
+	<input type="hidden" name="mode" value="">
+	<input type="hidden" name="id" value="' . $object->id . '">
+	';
+
+	if (! empty($conf->use_javascript_ajax) && $object->statut == 0) {
+		include DOL_DOCUMENT_ROOT . '/core/tpl/ajaxrow.tpl.php';
+	}
+
+    print '<div class="div-table-responsive">';
+	print '<table id="tablelines" class="noborder noshadow" width="100%">';
 
 	// Show object lines
 	if (! empty($object->lines))

From b7b16dc632daea9f0cbd8c76e98a3d354e8a3876 Mon Sep 17 00:00:00 2001
From: philippe grand <philippe.grand@atoo-net.com>
Date: Wed, 10 May 2017 16:41:19 +0200
Subject: [PATCH 288/505] Update code using new css class

---
 htdocs/commande/stats/index.php            |  5 ++---
 htdocs/compta/bank/bilan.php               |  8 ++++----
 htdocs/compta/facture/card.php             | 12 ++++--------
 htdocs/compta/facture/stats/index.php      |  5 ++---
 htdocs/compta/journal/purchasesjournal.php |  5 +----
 htdocs/compta/journal/sellsjournal.php     |  5 +----
 htdocs/compta/paiement/rapport.php         |  4 ++--
 htdocs/compta/prelevement/bons.php         |  6 ++----
 htdocs/compta/prelevement/fiche-rejet.php  |  3 +--
 htdocs/compta/prelevement/fiche-stat.php   |  4 +---
 htdocs/compta/prelevement/ligne.php        |  5 +----
 htdocs/compta/prelevement/list.php         |  8 ++------
 htdocs/compta/prelevement/rejets.php       |  4 +---
 htdocs/compta/prelevement/stats.php        | 11 ++---------
 14 files changed, 26 insertions(+), 59 deletions(-)

diff --git a/htdocs/commande/stats/index.php b/htdocs/commande/stats/index.php
index dd79ee54ba1..8967e22a160 100644
--- a/htdocs/commande/stats/index.php
+++ b/htdocs/commande/stats/index.php
@@ -316,7 +316,6 @@ print '<td align="right">%</td>';
 print '</tr>';
 
 $oldyear=0;
-$var=true;
 foreach ($data as $val)
 {
 	$year = $val['year'];
@@ -324,7 +323,7 @@ foreach ($data as $val)
 	{ // If we have empty year
 		$oldyear--;
 		
-		print '<tr '.$bc[$var].' height="24">';
+		print '<tr class="oddeven" height="24">';
 		print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$oldyear.'&amp;mode='.$mode.($socid>0?'&socid='.$socid:'').($userid>0?'&userid='.$userid:'').'">'.$oldyear.'</a></td>';
 		print '<td align="right">0</td>';
 		print '<td align="right"></td>';
@@ -336,7 +335,7 @@ foreach ($data as $val)
 	}
 
 	
-	print '<tr '.$bc[$var].' height="24">';
+	print '<tr class="oddeven" height="24">';
 	print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$year.'&amp;mode='.$mode.($socid>0?'&socid='.$socid:'').($userid>0?'&userid='.$userid:'').'">'.$year.'</a></td>';
 	print '<td align="right">'.$val['nb'].'</td>';
 	print '<td align="right" style="'.(($val['nb_diff'] >= 0) ? 'color: green;':'color: red;').'">'.round($val['nb_diff']).'</td>';
diff --git a/htdocs/compta/bank/bilan.php b/htdocs/compta/bank/bilan.php
index eb6aea4f2dc..2b3c897f3ce 100644
--- a/htdocs/compta/bank/bilan.php
+++ b/htdocs/compta/bank/bilan.php
@@ -69,22 +69,22 @@ print "</tr>\n";
 
 $sql = "SELECT sum(amount) as amount FROM ".MAIN_DB_PREFIX."paiement";
 $paiem = valeur($sql);
-print "<tr ".$bc[$var]."><td>Somme des paiements (associes a une facture)</td><td align=\"right\">".price($paiem)."</td></tr>";
+print '<tr class="oddeven"><td>Somme des paiements (associes a une facture)</td><td align="right">".price($paiem)."</td></tr>';
 
 
 $sql = "SELECT sum(amount) as amount FROM ".MAIN_DB_PREFIX."bank WHERE amount > 0";
 $credits = valeur($sql);
-print "<tr ".$bc[$var]."><td>Somme des credits</td><td align=\"right\">".price($credits)."</td></tr>";
+print '<tr class="oddeven"><td>Somme des credits</td><td align="right">".price($credits)."</td></tr>';
 
 
 $sql = "SELECT sum(amount) as amount FROM ".MAIN_DB_PREFIX."bank WHERE amount < 0";
 $debits = valeur($sql);
-print "<tr ".$bc[$var]."><td>Somme des debits</td><td align=\"right\">".price($debits)."</td></tr>";
+print '<tr class="oddeven"><td>Somme des debits</td><td align="right">".price($debits)."</td></tr>';
 
 
 $sql = "SELECT sum(amount) as amount FROM ".MAIN_DB_PREFIX."bank ";
 $solde = valeur($sql);
-print "<tr ".$bc[$var]."><td>".$langs->trans("BankBalance")."</td><td align=\"right\">".price($solde)."</td></tr>";
+print '<tr class="oddeven"><td>".$langs->trans("BankBalance")."</td><td align="right">".price($solde)."</td></tr>';
 
 
 print "</table>";
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 9483e79dba4..495085bc274 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -3599,12 +3599,11 @@ else if ($id > 0 || ! empty($ref))
             print '</tr>';
             
             $total_prev_ht = $total_prev_ttc = 0;
-            $var = true;
             foreach ($object->tab_previous_situation_invoice as $prev_invoice) {
                 $totalpaye = $prev_invoice->getSommePaiement();
                 $total_prev_ht += $prev_invoice->total_ht;
                 $total_prev_ttc += $prev_invoice->total_ttc;
-                print '<tr ' . $bc[$var] . '>';
+                print '<tr class="oddeven">';
                 print '<td>' . $prev_invoice->getNomUrl(1) . '</td>';
                 print '<td></td>';
                 if (! empty($conf->banque->enabled))
@@ -3614,10 +3613,9 @@ else if ($id > 0 || ! empty($ref))
                 print '<td align="right">' . $prev_invoice->getLibStatut(3, $totalpaye) . '</td>';
                 print '</tr>';
                 
-                $var = ! $var;
             }
             
-            print '<tr ' . $bc[$var] . '>';
+            print '<tr class="oddeven">';
             print '<td colspan="2" align="right"></td>';
             print '<td align="right"><b>' . price($total_prev_ht) . '</b></td>';
             print '<td align="right"><b>' . price($total_prev_ttc) . '</b></td>';
@@ -3638,12 +3636,11 @@ else if ($id > 0 || ! empty($ref))
             
             $total_next_ht = $total_next_ttc = 0;
             
-            $var = true;
             foreach ($object->tab_next_situation_invoice as $next_invoice) {
                 $totalpaye = $next_invoice->getSommePaiement();
                 $total_next_ht += $next_invoice->total_ht;
                 $total_next_ttc += $next_invoice->total_ttc;
-                print '<tr ' . $bc[$var] . '>';
+                print '<tr class="oddeven">';
                 print '<td>' . $next_invoice->getNomUrl(1) . '</td>';
                 print '<td></td>';
                 if (! empty($conf->banque->enabled)) print '<td align="right"></td>';
@@ -3652,10 +3649,9 @@ else if ($id > 0 || ! empty($ref))
                 print '<td align="right">' . $next_invoice->getLibStatut(3, $totalpaye) . '</td>';
                 print '</tr>';
                 
-                $var = ! $var;
             }
             
-            print '<tr ' . $bc[$var] . '>';
+            print '<tr class="oddeven">';
             print '<td colspan="2" align="right"></td>';
 		    if (! empty($conf->banque->enabled)) print '<td align="right"></td>';
 
diff --git a/htdocs/compta/facture/stats/index.php b/htdocs/compta/facture/stats/index.php
index 77191136338..55ff4dad6e3 100644
--- a/htdocs/compta/facture/stats/index.php
+++ b/htdocs/compta/facture/stats/index.php
@@ -293,7 +293,6 @@ print '<td align="right">%</td>';
 print '</tr>';
 
 $oldyear=0;
-$var=true;
 foreach ($data as $val)
 {
 	$year = $val['year'];
@@ -301,7 +300,7 @@ foreach ($data as $val)
 	{	// If we have empty year
 		$oldyear--;
 		
-		print '<tr '.$bc[$var].' height="24">';
+		print '<tr class="oddeven" height="24">';
 		print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$oldyear.'&amp;mode='.$mode.($socid>0?'&socid='.$socid:'').($userid>0?'&userid='.$userid:'').'">'.$oldyear.'</a></td>';
 		print '<td align="right">0</td>';
 		print '<td align="right"></td>';
@@ -312,7 +311,7 @@ foreach ($data as $val)
 		print '</tr>';
 	}
 	
-	print '<tr '.$bc[$var].' height="24">';
+	print '<tr class="oddeven" height="24">';
 	print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$year.'&amp;mode='.$mode.($socid>0?'&socid='.$socid:'').($userid>0?'&userid='.$userid:'').'">'.$year.'</a></td>';
 	print '<td align="right">'.$val['nb'].'</td>';
 	print '<td align="right" style="'.(($val['nb_diff'] >= 0) ? 'color: green;':'color: red;').'">'.round($val['nb_diff']).'</td>';
diff --git a/htdocs/compta/journal/purchasesjournal.php b/htdocs/compta/journal/purchasesjournal.php
index f0b520bb11e..fbd391ffe2a 100644
--- a/htdocs/compta/journal/purchasesjournal.php
+++ b/htdocs/compta/journal/purchasesjournal.php
@@ -184,7 +184,6 @@ print "<td>".$langs->trans("Account")."</td>";
 print "<td>".$langs->trans("Type")."</td><td align='right'>".$langs->trans("Debit")."</td><td align='right'>".$langs->trans("Credit")."</td>";
 print "</tr>\n";
 
-$var=false;
 
 $invoicestatic=new FactureFournisseur($db);
 $companystatic=new Fournisseur($db);
@@ -229,7 +228,7 @@ foreach ($tabfac as $key => $val)
 		{
 			if (isset($line['nomtcheck']) || $mt)
 			{
-				print "<tr ".$bc[$var]." >";
+				print '<tr class="oddeven">';
 				print "<td>".dol_print_date($db->jdate($val["date"]))."</td>";
 				print "<td>".$invoicestatic->getNomUrl(1)."</td>";
 				print "<td>".$k."</td><td>".$line['label']."</td>";
@@ -249,8 +248,6 @@ foreach ($tabfac as $key => $val)
 			}
 		}
 	}
-
-	$var = !$var;
 }
 
 print "</table>";
diff --git a/htdocs/compta/journal/sellsjournal.php b/htdocs/compta/journal/sellsjournal.php
index 670d89fd2cb..fd0c45be7cd 100644
--- a/htdocs/compta/journal/sellsjournal.php
+++ b/htdocs/compta/journal/sellsjournal.php
@@ -216,7 +216,6 @@ print '<td>'.$langs->trans('Account').'</td>';
 print '<td>'.$langs->trans('Type').'</td><td align="right">'.$langs->trans('Debit').'</td><td align="right">'.$langs->trans('Credit').'</td>';
 print "</tr>\n";
 
-$var=false;
 
 $invoicestatic=new Facture($db);
 $companystatic=new Client($db);
@@ -262,7 +261,7 @@ foreach ($tabfac as $key => $val)
 		{
 			if (isset($line['nomtcheck']) || $mt)
 			{
-				print "<tr ".$bc[$var]." >";
+				print '<tr class="oddeven">';
 				print "<td>".dol_print_date($db->jdate($val["date"]))."</td>";
 				print "<td>".$invoicestatic->getNomUrl(1)."</td>";
 				print "<td>".$k."</td><td>".$line['label']."</td>";
@@ -282,8 +281,6 @@ foreach ($tabfac as $key => $val)
 			}
 		}
 	}
-
-	$var = !$var;
 }
 
 print "</table>";
diff --git a/htdocs/compta/paiement/rapport.php b/htdocs/compta/paiement/rapport.php
index e9a90667e69..c73f79c60a4 100644
--- a/htdocs/compta/paiement/rapport.php
+++ b/htdocs/compta/paiement/rapport.php
@@ -145,7 +145,7 @@ if ($year)
         print '<td align="right">'.$langs->trans("Size").'</td>';
         print '<td align="right">'.$langs->trans("Date").'</td>';
         print '</tr>';
-        $var=true;
+
         if (is_resource($handle))
         {
             while (($file = readdir($handle))!==false)
@@ -155,7 +155,7 @@ if ($year)
                     
                     $tfile = $dir . '/'.$year.'/'.$file;
                     $relativepath = $year.'/'.$file;
-                    print "<tr ".$bc[$var].">".'<td><a data-ajax="false" href="'.DOL_URL_ROOT . '/document.php?modulepart=facture_paiement&amp;file='.urlencode($relativepath).'">'.img_pdf().' '.$file.'</a></td>';
+                    print '<tr class="oddeven">'.'<td><a data-ajax="false" href="'.DOL_URL_ROOT . '/document.php?modulepart=facture_paiement&amp;file='.urlencode($relativepath).'">'.img_pdf().' '.$file.'</a></td>';
                     print '<td align="right">'.dol_print_size(dol_filesize($tfile)).'</td>';
                     print '<td align="right">'.dol_print_date(dol_filemtime($tfile),"dayhour").'</td></tr>';
                 }
diff --git a/htdocs/compta/prelevement/bons.php b/htdocs/compta/prelevement/bons.php
index dbbf9d09ac7..973135765dc 100644
--- a/htdocs/compta/prelevement/bons.php
+++ b/htdocs/compta/prelevement/bons.php
@@ -129,14 +129,12 @@ if ($result)
   print '</td>';
   print '</tr>';
 
-  $var=True;
 
   while ($i < min($num,$limit))
   {
-      $obj = $db->fetch_object($result);
-      
+      $obj = $db->fetch_object($result);     
 
-      print "<tr ".$bc[$var]."><td>";
+      print '<tr class="oddeven"><td>';
 
       print $bon->LibStatut($obj->statut,2);
       print "&nbsp;";
diff --git a/htdocs/compta/prelevement/fiche-rejet.php b/htdocs/compta/prelevement/fiche-rejet.php
index 064f41e41e8..f2240a070e6 100644
--- a/htdocs/compta/prelevement/fiche-rejet.php
+++ b/htdocs/compta/prelevement/fiche-rejet.php
@@ -138,7 +138,6 @@ if ($resql)
   	print '<td>'.$langs->trans("Line").'</td><td>'.$langs->trans("ThirdParty").'</td><td align="right">'.$langs->trans("Amount").'</td>';
   	print '<td>'.$langs->trans("Reason").'</td><td align="center">'.$langs->trans("ToBill").'</td><td align="center">'.$langs->trans("Invoice").'</td></tr>';
 
-  	$var=True;
 	$total = 0;
 
 	if ($num > 0)
@@ -148,7 +147,7 @@ if ($resql)
         {
     		$obj = $db->fetch_object($resql);
     
-    		print "<tr ".$bc[$var]."><td>";
+    		print '<tr class="oddeven"><td>';
     
     		print '<a href="'.DOL_URL_ROOT.'/compta/prelevement/ligne.php?id='.$obj->rowid.'">';
     		print img_picto('', 'statut'.$obj->statut).' ';
diff --git a/htdocs/compta/prelevement/fiche-stat.php b/htdocs/compta/prelevement/fiche-stat.php
index c5d441e3260..7e0c4f81e4b 100644
--- a/htdocs/compta/prelevement/fiche-stat.php
+++ b/htdocs/compta/prelevement/fiche-stat.php
@@ -127,13 +127,11 @@ if ($prev_id)
 		print '<tr class="liste_titre">';
 		print '<td>'.$langs->trans("Status").'</td><td align="right">'.$langs->trans("Amount").'</td><td align="right">%</td></tr>';
 
-		$var=false;
-
 		while ($i < $num)
 		{
 			$row = $db->fetch_row($resql);
 
-			print "<tr ".$bc[$var]."><td>";
+			print '<tr class="oddeven"><td>';
 
 			print $ligne->LibStatut($row[1],1);
 
diff --git a/htdocs/compta/prelevement/ligne.php b/htdocs/compta/prelevement/ligne.php
index 64ddb12a7bc..933c23b0e7e 100644
--- a/htdocs/compta/prelevement/ligne.php
+++ b/htdocs/compta/prelevement/ligne.php
@@ -298,16 +298,13 @@ if ($id)
 		print '<td>'.$langs->trans("Invoice").'</td><td>'.$langs->trans("ThirdParty").'</td><td align="right">'.$langs->trans("Amount").'</td><td align="right">'.$langs->trans("Status").'</td>';
 		print '</tr>';
 
-		$var=True;
-
 		$total = 0;
 
-		$var=false;
 		while ($i < min($num,$conf->liste_limit))
 		{
 			$obj = $db->fetch_object($result);
 
-			print "<tr ".$bc[$var]."><td>";
+			print '<tr class="oddeven"><td>';
 
 			print '<a href="'.DOL_URL_ROOT.'/compta/facture/card.php?facid='.$obj->facid.'">';
 			print img_object($langs->trans("ShowBill"),"bill");
diff --git a/htdocs/compta/prelevement/list.php b/htdocs/compta/prelevement/list.php
index f7fe4b77e7d..2fa8a255407 100644
--- a/htdocs/compta/prelevement/list.php
+++ b/htdocs/compta/prelevement/list.php
@@ -159,15 +159,11 @@ if ($result)
     print '</td>';
     print '</tr>';
 
-    $var=True;
-
     while ($i < min($num,$limit))
     {
-        $obj = $db->fetch_object($result);
+        $obj = $db->fetch_object($result);    
 
-        
-
-        print "<tr ".$bc[$var]."><td>";
+        print '<tr class="oddeven"><td>';
 
         print $ligne->LibStatut($obj->statut_ligne,2);
         print "&nbsp;";
diff --git a/htdocs/compta/prelevement/rejets.php b/htdocs/compta/prelevement/rejets.php
index ef72ca8f6e5..0f737a50f22 100644
--- a/htdocs/compta/prelevement/rejets.php
+++ b/htdocs/compta/prelevement/rejets.php
@@ -94,15 +94,13 @@ if ($result)
 	print_liste_field_titre($langs->trans("Reason"),$_SERVER["PHP_SELF"],"pr.motif","",$urladd);
 	print "</tr>\n";
 
-	$var=True;
-
 	$total = 0;
 
 	while ($i < min($num,$conf->liste_limit))
 	{
 		$obj = $db->fetch_object($result);
 
-		print "<tr ".$bc[$var]."><td>";
+		print '<tr class="oddeven"><td>';
 		print $ligne->LibStatut($obj->statut,2).'&nbsp;';
 		print '<a href="'.DOL_URL_ROOT.'/compta/prelevement/ligne.php?id='.$obj->rowid.'">';
 
diff --git a/htdocs/compta/prelevement/stats.php b/htdocs/compta/prelevement/stats.php
index b666b355e24..406c2303b6a 100644
--- a/htdocs/compta/prelevement/stats.php
+++ b/htdocs/compta/prelevement/stats.php
@@ -96,13 +96,11 @@ if ($resql)
 	print '<td width="30%">'.$langs->trans("Status").'</td><td align="center">'.$langs->trans("Number").'</td><td align="right">%</td>';
 	print '<td align="right">'.$langs->trans("Amount").'</td><td align="right">%</td></tr>';
 
-	$var=false;
-
 	while ($i < $num)
 	{
 		$row = $db->fetch_row($resql);
 
-		print "<tr ".$bc[$var]."><td>";
+		print '<tr class="oddeven"><td>';
 
 		print $ligne->LibStatut($row[2],1);
 		//print $st[$row[2]];
@@ -119,7 +117,6 @@ if ($resql)
 		print '</td><td align="right">';
 		print round($row[0]/$total*100,2)." %";
 		print '</td></tr>';
-
 		
 		$i++;
 	}
@@ -192,8 +189,6 @@ if ($resql)
 	print '<td width="30%">'.$langs->trans("Status").'</td><td align="center">'.$langs->trans("Number").'</td>';
 	print '<td align="right">%</td><td align="right">'.$langs->trans("Amount").'</td><td align="right">%</td></tr>';
 
-	$var=True;
-
 	require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/rejetprelevement.class.php';
 	$Rejet = new RejetPrelevement($db, $user);
 
@@ -201,7 +196,7 @@ if ($resql)
 	{
 		$row = $db->fetch_row($resql);
 
-		print "<tr ".$bc[$var]."><td>";
+		print '<tr class="oddeven"><td>';
 		print $Rejet->motifs[$row[2]];
 
 		print '</td><td align="center">'.$row[1];
@@ -215,9 +210,7 @@ if ($resql)
 		print '</td><td align="right">';
 		print round($row[0]/$total*100,2)." %";
 
-
 		print '</td></tr>';
-
 		
 		$i++;
 	}

From fe8d34c73b8cd741add2c0507ba553dbb89b9fb1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 10 May 2017 17:50:10 +0200
Subject: [PATCH 289/505] Add field extraparams on llx_bank_account

---
 htdocs/install/mysql/migration/5.0.0-6.0.0.sql | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index dbc33e384ef..b13bd6e649a 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -50,6 +50,7 @@ ALTER TABLE llx_holiday ADD COLUMN extraparams				varchar(255);
 ALTER TABLE llx_expensereport ADD COLUMN import_key			varchar(14);
 ALTER TABLE llx_expensereport ADD COLUMN extraparams		varchar(255);	
 
+ALTER TABLE llx_bank_account ADD COLUMN extraparams		varchar(255);	
 
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PRODUCT_CREATE','Product or service created','Executed when a product or sevice is created','product',30);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PRODUCT_MODIFY','Product or service modified','Executed when a product or sevice is modified','product',30);

From e48ba067303107b476979527f4a414da7e800795 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 10 May 2017 18:13:38 +0200
Subject: [PATCH 290/505] Fix generation of sepa mandate with multicompany

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

diff --git a/htdocs/societe/rib.php b/htdocs/societe/rib.php
index 122c5282a40..9412f3f6270 100644
--- a/htdocs/societe/rib.php
+++ b/htdocs/societe/rib.php
@@ -293,13 +293,13 @@ if (empty($reshook))
         $action = 'builddoc';
         $moreparams = array(
             'use_companybankid'=>GETPOST('companybankid'),
-            'force_dir_output'=>$conf->societe->dir_output.'/'.dol_sanitizeFileName($object->id)
+            'force_dir_output'=>$conf->societe->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->id)
         );
         $_POST['lang_id'] = GETPOST('lang_idrib'.GETPOST('companybankid'));
         $_POST['model'] =  GETPOST('modelrib'.GETPOST('companybankid'));
     }
     $id = $socid;
-    $upload_dir = $conf->societe->dir_output;
+    $upload_dir = $conf->societe->multidir_output[$object->entity];
     $permissioncreate=$user->rights->societe->creer;
     include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 

From 002bebd83796f3cbee250a393da734c90d1384dc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 10 May 2017 18:15:01 +0200
Subject: [PATCH 291/505] Fix missing extraparams make sql syntax error

---
 htdocs/install/mysql/migration/4.0.0-5.0.0.sql   | 2 ++
 htdocs/install/mysql/tables/llx_bank_account.sql | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/htdocs/install/mysql/migration/4.0.0-5.0.0.sql b/htdocs/install/mysql/migration/4.0.0-5.0.0.sql
index afda09aa785..75f9b38f34b 100644
--- a/htdocs/install/mysql/migration/4.0.0-5.0.0.sql
+++ b/htdocs/install/mysql/migration/4.0.0-5.0.0.sql
@@ -32,6 +32,8 @@ UPDATE llx_const SET name = __ENCRYPT('THIRDPARTY_DEFAULT_CREATE_CONTACT')__ WHE
 ALTER TABLE llx_product_lot MODIFY COLUMN entity integer DEFAULT 1;
 UPDATE llx_product_lot SET entity = 1 WHERE entity IS NULL;
 
+ALTER TABLE llx_bank_account ADD COLUMN extraparams		varchar(255);	
+
 ALTER TABLE llx_societe ALTER COLUMN fk_stcomm SET DEFAULT 0;
 
 ALTER TABLE llx_c_actioncomm ADD COLUMN picto varchar(48);
diff --git a/htdocs/install/mysql/tables/llx_bank_account.sql b/htdocs/install/mysql/tables/llx_bank_account.sql
index 7730ab79ef6..0faebbf64d1 100644
--- a/htdocs/install/mysql/tables/llx_bank_account.sql
+++ b/htdocs/install/mysql/tables/llx_bank_account.sql
@@ -58,5 +58,6 @@ create table llx_bank_account
   comment				text,						-- TODO rename in note_private
   note_public     		text,
   model_pdf       		varchar(255),
-  import_key      		varchar(14)
+  import_key      		varchar(14),
+  extraparams			varchar(255)				-- for other parameters with json format
 )ENGINE=innodb;

From d570df50899d105d01f8db97f5633be2554d5052 Mon Sep 17 00:00:00 2001
From: BENKE Charlie <charles.fr@benke.fr>
Date: Wed, 22 Feb 2017 15:59:10 +0100
Subject: [PATCH 292/505] inverted value between FRST & RECUR

---
 htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php b/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
index 396e89afb56..915883cbdaa 100644
--- a/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
+++ b/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
@@ -326,14 +326,14 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $txt, 0, 'L');
 				$pdf->Rect(80, $posY, 5, 5);
 				$pdf->SetXY(80, $posY);
-				if ($object->frstrecur == 'FRST') $pdf->MultiCell(5, 3, 'X', 0, 'L');
+				if ($object->frstrecur == 'RECUR') $pdf->MultiCell(5, 3, 'X', 0, 'L');
 				$pdf->SetXY(86, $posY);
 				$txt = $langs->transnoentitiesnoconv("ModeRECUR").'  '.$langs->transnoentitiesnoconv("or");
 				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $txt, 0, 'L');
 				$posY+=6;
 				$pdf->Rect(80, $posY, 5, 5);
 				$pdf->SetXY(80, $posY);
-				if ($object->frstrecur == 'RECUR') $pdf->MultiCell(5, 3, 'X', 0, 'L');
+				if ($object->frstrecur == 'FRST') $pdf->MultiCell(5, 3, 'X', 0, 'L');
 				$pdf->SetXY(86, $posY);
 				$txt = $langs->transnoentitiesnoconv("ModeFRST");
 				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $txt, 0, 'L');

From 823e5b48e3e39e1de59d88fdbb387df8e8c232f2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 10 May 2017 18:56:18 +0200
Subject: [PATCH 293/505] Code comment

---
 htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php b/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
index 915883cbdaa..3dc615d9deb 100644
--- a/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
+++ b/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
@@ -30,7 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 
 
 /**
- *	Classe permettant de generer les projets au modele Baleine
+ *	Classe permettant de generer les projets au modele SEPAMandate
  */
 
 class pdf_sepamandate extends ModeleBankAccountDoc

From 5a96ae54b9edde7df8be5a39dea4701f281aae69 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 10 May 2017 19:08:07 +0200
Subject: [PATCH 294/505] FIX Link to files on bank account tab broken with
 multicompany FIX Link to preview on thirdparty broken with multicompany

---
 htdocs/core/class/html.formfile.class.php | 7 ++++---
 htdocs/core/lib/functions.lib.php         | 5 +++--
 htdocs/societe/rib.php                    | 2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 99dee355333..6e46efe3fdf 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -680,7 +680,7 @@ class FormFile
 					$out.= ' target="_blank">';
 					$out.= img_mime($file["name"],$langs->trans("File").': '.$file["name"]).' '.dol_trunc($file["name"],$maxfilenamelength);
 					$out.= '</a>'."\n";
-                    $out.= $this->showPreview($file,$modulepart,$relativepath);
+                    $out.= $this->showPreview($file,$modulepart,$relativepath,0,$param);
 					$out.= '</td>';
 
 					// Show file size
@@ -1498,16 +1498,17 @@ class FormFile
      * @param   string    $modulepart     propal, facture, facture_fourn, ...
      * @param   string    $relativepath   Relative path of docs
      * @param   string    $ruleforpicto   Rule for picto: 0=Preview picto, 1=Use picto of mime type of file)
+     * @param	string	  $param		  More param on http links
      * @return  string    $out            Output string with HTML
      */
-    public function showPreview($file, $modulepart, $relativepath, $ruleforpicto=0)
+    public function showPreview($file, $modulepart, $relativepath, $ruleforpicto=0, $param='')
     {
         global $langs, $conf;
 
         $out='';
         if ($conf->browser->layout != 'phone')
         {
-            $urladvancedpreview=getAdvancedPreviewUrl($modulepart, $relativepath);      // Return if a file is qualified for preview
+            $urladvancedpreview=getAdvancedPreviewUrl($modulepart, $relativepath, $param);      // Return if a file is qualified for preview
             if ($urladvancedpreview)
             {
                 $out.= '<a data-ajax="false" class="pictopreview" href="'.$urladvancedpreview.'">';
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index facc685d234..2db8ecdb111 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -5839,9 +5839,10 @@ function getImageFileNameForSize($file, $extName, $extImgTarget='')
  *
  * @param   string    $modulepart     propal, facture, facture_fourn, ...
  * @param   string    $relativepath   Relative path of docs
+ * @param	string	  $param		  More param on http links
  * @return  string                    Output string with HTML
  */
-function getAdvancedPreviewUrl($modulepart, $relativepath)
+function getAdvancedPreviewUrl($modulepart, $relativepath, $param='')
 {
     global $conf;
     
@@ -5852,7 +5853,7 @@ function getAdvancedPreviewUrl($modulepart, $relativepath)
     //$mime_preview[]='archive';
     $num_mime = array_search(dol_mimetype($relativepath, '', 1), $mime_preview);
 
-    if ($num_mime !== false) return 'javascript:document_preview(\''.dol_escape_js(DOL_URL_ROOT.'/document.php?modulepart='.$modulepart.'&amp;attachment=0&amp;file='.$relativepath).'\', \''.dol_mimetype($relativepath).'\', \''.dol_escape_js('Preview').'\')';
+    if ($num_mime !== false) return 'javascript:document_preview(\''.dol_escape_js(DOL_URL_ROOT.'/document.php?modulepart='.$modulepart.'&amp;attachment=0&amp;file='.$relativepath.($param?'&amp;'.$param:'')).'\', \''.dol_mimetype($relativepath).'\', \''.dol_escape_js('Preview').'\')';
     else return '';
 }
 
diff --git a/htdocs/societe/rib.php b/htdocs/societe/rib.php
index 9412f3f6270..d571e218e51 100644
--- a/htdocs/societe/rib.php
+++ b/htdocs/societe/rib.php
@@ -657,7 +657,7 @@ if ($socid && $action != 'edit' && $action != "create")
     
         $var=true;
     
-        print $formfile->showdocuments('company', $object->id, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 0, 0, 0, 28, 0, '', 0, '', $object->default_lang);
+        print $formfile->showdocuments('company', $object->id, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 0, 0, 0, 28, 0, 'entity='.$object->entity, 0, '', $object->default_lang);
     
         print '</div><div class="fichehalfright"><div class="ficheaddleft">';
     

From d410a320d72e569b5148b0a9a0da39831a4912e9 Mon Sep 17 00:00:00 2001
From: jfefe <jfefe@users.noreply.github.com>
Date: Wed, 10 May 2017 20:32:54 +0200
Subject: [PATCH 295/505] WIP #6504: CVE-2017-7886

'defaultlang' attribute was not filtered before database request which cause an SQL injection.
---
 htdocs/core/class/translate.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/class/translate.class.php b/htdocs/core/class/translate.class.php
index 89ab0019865..5c5c1062d25 100644
--- a/htdocs/core/class/translate.class.php
+++ b/htdocs/core/class/translate.class.php
@@ -439,7 +439,7 @@ class Translate
 		if (! $found)
 		{
     		// Overwrite translation with database read
-            $sql="SELECT transkey, transvalue FROM ".MAIN_DB_PREFIX."overwrite_trans where lang='".$this->defaultlang."'";            
+            $sql="SELECT transkey, transvalue FROM ".MAIN_DB_PREFIX."overwrite_trans where lang='".$db->escape($this->defaultlang)."'";            
 		    $resql=$db->query($sql);
 		    
 		    if ($resql)

From ec4e416a6c1075e1c68d146d95fdd5c7f4e85685 Mon Sep 17 00:00:00 2001
From: Benoit <benoit@fixit-cs.com>
Date: Fri, 5 May 2017 22:21:46 +0200
Subject: [PATCH 296/505] Fix bug xhen insert new bankline

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

diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index 7867f9bd753..08925f722d7 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -471,9 +471,9 @@ class Account extends CommonObject
 
 		if ($accline->insert() > 0) {
 
-			if ($categorie) {
-				$sql = "INSERT INTO ".MAIN_DB_PREFIX."categorie_account (";
-				$sql .= "fk_account, fk_categorie";
+			if ($categorie>0) {
+				$sql = "INSERT INTO ".MAIN_DB_PREFIX."bank_class (";
+				$sql .= "lineid, fk_categ;
 				$sql .= ") VALUES (";
 				$sql .= " ".$accline->id.", ".$categorie;
 				$sql .= ")";

From 23af50ad2a276618c0e1319c12f51feb51053cfa Mon Sep 17 00:00:00 2001
From: Benoit <benoit@fixit-cs.com>
Date: Fri, 5 May 2017 22:33:34 +0200
Subject: [PATCH 297/505] Add fk_facture_fourn element to fetch lines objects

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

diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 009f765e5cd..38d0fcd5bfb 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -636,7 +636,7 @@ class FactureFournisseur extends CommonInvoice
     function fetch_lines()
     {
         $sql = 'SELECT f.rowid, f.ref as ref_supplier, f.description, f.pu_ht, f.pu_ttc, f.qty, f.remise_percent, f.vat_src_code, f.tva_tx';
-        $sql.= ', f.localtax1_tx, f.localtax2_tx, f.total_localtax1, f.total_localtax2 ';
+        $sql.= ', f.localtax1_tx, f.localtax2_tx, f.total_localtax1, f.total_localtax2, f.fk_facture_fourn ';
         $sql.= ', f.total_ht, f.tva as total_tva, f.total_ttc, f.fk_product, f.product_type, f.info_bits, f.rang, f.special_code, f.fk_parent_line, f.fk_unit';
         $sql.= ', p.rowid as product_id, p.ref as product_ref, p.label as label, p.description as product_desc';
 		$sql.= ', f.fk_multicurrency, f.multicurrency_code, f.multicurrency_subprice, f.multicurrency_total_ht, f.multicurrency_total_tva, f.multicurrency_total_ttc';
@@ -645,6 +645,7 @@ class FactureFournisseur extends CommonInvoice
         $sql.= ' WHERE fk_facture_fourn='.$this->id;
         $sql.= ' ORDER BY f.rang, f.rowid';
 
+
         dol_syslog(get_class($this)."::fetch_lines", LOG_DEBUG);
         $resql_rows = $this->db->query($sql);
         if ($resql_rows)
@@ -683,6 +684,7 @@ class FactureFournisseur extends CommonInvoice
                     $line->total_tva		= $obj->total_tva;
                     $line->total_localtax1	= $obj->total_localtax1;
                     $line->total_localtax2	= $obj->total_localtax2;
+                    $line->fk_facture_fourn     = $obj->fk_facture_fourn;
                     $line->total_ttc		= $obj->total_ttc;
                     $line->fk_product		= $obj->fk_product;
                     $line->product_type		= $obj->product_type;

From cf361e1ed2dfe8cabfecc41e25efd53e84a39da0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 10 May 2017 23:10:09 +0200
Subject: [PATCH 298/505] Fix html syntax

---
 htdocs/accountancy/journal/purchasesjournal.php | 4 +++-
 htdocs/accountancy/journal/sellsjournal.php     | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php
index c5069644cef..232a6d7611c 100644
--- a/htdocs/accountancy/journal/purchasesjournal.php
+++ b/htdocs/accountancy/journal/purchasesjournal.php
@@ -542,7 +542,9 @@ if (empty($action) || $action == 'view') {
 	print "<td>" . $langs->trans("Date") . "</td>";
 	print "<td>" . $langs->trans("Piece") . ' (' . $langs->trans("InvoiceRef") . ")</td>";
 	print "<td>" . $langs->trans("AccountAccounting") . "</td>";
-	print "<t><td>" . $langs->trans("Type") . "</td><td align='right'>" . $langs->trans("Debit") . "</td><td align='right'>" . $langs->trans("Credit") . "</td>";
+	print "<td>" . $langs->trans("Type") . "</td>";
+	print "<td align='right'>" . $langs->trans("Debit") . "</td>";
+	print "<td align='right'>" . $langs->trans("Credit") . "</td>";
 	print "</tr>\n";
 
 	$r = '';
diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php
index beb0c777e27..9af2bd2d135 100644
--- a/htdocs/accountancy/journal/sellsjournal.php
+++ b/htdocs/accountancy/journal/sellsjournal.php
@@ -593,7 +593,7 @@ if (empty($action) || $action == 'view') {
 			// print ' (' . $companystatic->getNomUrl(0, 'customer', 16) . ')';
 			print '</td>';
 			print "<td>" . $companystatic->getNomUrl(0, 'customer', 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("Code_tiers") . "</td>";
-			print "</td><td align='right'>" . ($mt >= 0 ? price($mt) : '') . "</td>";
+			print "<td align='right'>" . ($mt >= 0 ? price($mt) : '') . "</td>";
 			print "<td align='right'>" . ($mt < 0 ? price(- $mt) : '') . "</td>";
 		    print "</tr>";
 		}

From 2b64cf0ebeabaf79fbc315994cb0f34cf5de3dbf Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 10 May 2017 23:24:33 +0200
Subject: [PATCH 299/505] Update html.formfile.class.php

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

diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 022579b3a7c..5dada97908b 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -128,7 +128,7 @@ class FormFile
             }
 
             $out .= '<input class="flat minwidth400" type="file"';
-            $out .= (empty($conf->global->MAIN_USE_MULTIPLE_FILEUPLOAD)?' name="userfile"':' name="userfile[]" multiple');
+            $out .= ((empty($conf->global->MAIN_USE_MULTIPLE_FILEUPLOAD) || $conf->browser->layout == 'phone')?' name="userfile"':' name="userfile[]" multiple');
             $out .= (empty($conf->global->MAIN_UPLOAD_DOC) || empty($perm)?' disabled':'');
             $out .= '>';
             $out .= ' ';

From 0734b99d3a2b6d227601b73ad394adfcf211c229 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 10 May 2017 23:27:48 +0200
Subject: [PATCH 300/505] Fix sql syntax

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

diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index 4f28028f34d..b3396e1082c 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -473,9 +473,9 @@ class Account extends CommonObject
 
 			if ($categorie>0) {
 				$sql = "INSERT INTO ".MAIN_DB_PREFIX."bank_class (";
-				$sql .= "lineid, fk_categ;
+				$sql .= "lineid, fk_categ";
 				$sql .= ") VALUES (";
-				$sql .= " ".$accline->id.", ".$categorie;
+				$sql .= $accline->id.", ".$categorie;
 				$sql .= ")";
 
 				$result = $this->db->query($sql);

From 2da0a129d103f09e50f91f3515299fcb84c22f89 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 10 May 2017 23:41:43 +0200
Subject: [PATCH 301/505] Multiple file upload on by default on desktop.

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

diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 5dada97908b..ca3bf804750 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -128,7 +128,7 @@ class FormFile
             }
 
             $out .= '<input class="flat minwidth400" type="file"';
-            $out .= ((empty($conf->global->MAIN_USE_MULTIPLE_FILEUPLOAD) || $conf->browser->layout == 'phone')?' name="userfile"':' name="userfile[]" multiple');
+            $out .= ((! empty($conf->global->MAIN_DISABLE_MULTIPLE_FILEUPLOAD) || $conf->browser->layout != 'classic')?' name="userfile"':' name="userfile[]" multiple');
             $out .= (empty($conf->global->MAIN_UPLOAD_DOC) || empty($perm)?' disabled':'');
             $out .= '>';
             $out .= ' ';

From 8ae05a965100eb266381cbcad1ac4b65ce8e9254 Mon Sep 17 00:00:00 2001
From: Laurent Dinclaux <laurent@gecka.nc>
Date: Thu, 11 May 2017 13:38:17 +1100
Subject: [PATCH 302/505] Fix: when sending a mail the default template used
 should be the first positionned template

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

diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 231ff16c6af..e59a57d31b0 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -828,7 +828,7 @@ class FormMail extends Form
 		if ($active >= 0) $sql.=" AND active = ".$active;
 		if (is_object($outputlangs)) $sql.= " AND (lang = '".$outputlangs->defaultlang."' OR lang IS NULL OR lang = '')";
 		if (!empty($id)) $sql.= " AND rowid=".$id;
-		$sql.= $db->order("lang,label","ASC");
+		$sql.= $db->order("position,lang,label","ASC");
 		//print $sql;
 
 		$resql = $db->query($sql);

From c2f76522eb2587f61bed1ec9f2d8fcec2a1f9b1b Mon Sep 17 00:00:00 2001
From: alexis Algoud <alexis@atm-consulting.fr>
Date: Thu, 11 May 2017 09:04:14 +0200
Subject: [PATCH 303/505] fix form inside table

---
 htdocs/compta/facture.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index c9f223723be..aad8b77811f 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -3805,15 +3805,15 @@ else if ($id > 0 || ! empty($ref))
 	{
 		if ($object->situation_cycle_ref && $object->statut == 0) {
 			print '<div class="div-table-responsive">';
-			print '<table id="tablelines" class="noborder noshadow" width="100%">';
 			
-			
-			print '<tr class="liste_titre nodrag nodrop">';
 			print '<form name="updatealllines" id="updatealllines" action="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '"#updatealllines" method="POST">';
 			print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '" />';
 			print '<input type="hidden" name="action" value="updatealllines" />';
 			print '<input type="hidden" name="id" value="' . $object->id . '" />';
 			
+			print '<table id="tablelines" class="noborder noshadow" width="100%">';
+			print '<tr class="liste_titre nodrag nodrop">';
+			
 			if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
 				print '<td align="center" width="5">&nbsp;</td>';
 			}
@@ -3849,9 +3849,11 @@ else if ($id > 0 || ! empty($ref))
 			print '<td align="right" class="nowrap"><input type="text" size="1" value="" name="all_progress">%</td>';
 			print '<td colspan="4" align="right"><input class="button" type="submit" name="all_percent" value="Modifier" /></td>';
 			print '</tr>';
-			print '</form>';
 			
 			print '</table>';
+			
+			print '</form>';
+			
 			print '</div>';
 			
 		}

From f231864b3fc91d684768c0eff92425691f2e310b Mon Sep 17 00:00:00 2001
From: Philippe Grand <philippe.grand@atoo-net.com>
Date: Thu, 11 May 2017 09:13:51 +0200
Subject: [PATCH 304/505] Update bilan.php

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

diff --git a/htdocs/compta/bank/bilan.php b/htdocs/compta/bank/bilan.php
index 2b3c897f3ce..f7ab97071f9 100644
--- a/htdocs/compta/bank/bilan.php
+++ b/htdocs/compta/bank/bilan.php
@@ -69,7 +69,7 @@ print "</tr>\n";
 
 $sql = "SELECT sum(amount) as amount FROM ".MAIN_DB_PREFIX."paiement";
 $paiem = valeur($sql);
-print '<tr class="oddeven"><td>Somme des paiements (associes a une facture)</td><td align="right">".price($paiem)."</td></tr>';
+print "<tr class=\"oddeven\"><td>Somme des paiements (associes a une facture)</td><td align=\"right\">".price($paiem)."</td></tr>";
 
 
 $sql = "SELECT sum(amount) as amount FROM ".MAIN_DB_PREFIX."bank WHERE amount > 0";

From 449869c37b103f15e2fc4eb795bf422cb33f04ac Mon Sep 17 00:00:00 2001
From: Philippe Grand <philippe.grand@atoo-net.com>
Date: Thu, 11 May 2017 09:15:35 +0200
Subject: [PATCH 305/505] Update bilan.php

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

diff --git a/htdocs/compta/bank/bilan.php b/htdocs/compta/bank/bilan.php
index f7ab97071f9..73701636557 100644
--- a/htdocs/compta/bank/bilan.php
+++ b/htdocs/compta/bank/bilan.php
@@ -74,7 +74,7 @@ print "<tr class=\"oddeven\"><td>Somme des paiements (associes a une facture)</t
 
 $sql = "SELECT sum(amount) as amount FROM ".MAIN_DB_PREFIX."bank WHERE amount > 0";
 $credits = valeur($sql);
-print '<tr class="oddeven"><td>Somme des credits</td><td align="right">".price($credits)."</td></tr>';
+print "<tr class=\"oddeven\"><td>Somme des credits</td><td align=\"right\">".price($credits)."</td></tr>";
 
 
 $sql = "SELECT sum(amount) as amount FROM ".MAIN_DB_PREFIX."bank WHERE amount < 0";

From be6be3e533ae74e33d249a0c87574aed97e7759d Mon Sep 17 00:00:00 2001
From: Philippe Grand <philippe.grand@atoo-net.com>
Date: Thu, 11 May 2017 09:16:44 +0200
Subject: [PATCH 306/505] Update bilan.php

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

diff --git a/htdocs/compta/bank/bilan.php b/htdocs/compta/bank/bilan.php
index 73701636557..0baf0dcc3bb 100644
--- a/htdocs/compta/bank/bilan.php
+++ b/htdocs/compta/bank/bilan.php
@@ -79,7 +79,7 @@ print "<tr class=\"oddeven\"><td>Somme des credits</td><td align=\"right\">".pri
 
 $sql = "SELECT sum(amount) as amount FROM ".MAIN_DB_PREFIX."bank WHERE amount < 0";
 $debits = valeur($sql);
-print '<tr class="oddeven"><td>Somme des debits</td><td align="right">".price($debits)."</td></tr>';
+print "<tr class=\"oddeven\"><td>Somme des debits</td><td align=\"right\">".price($debits)."</td></tr>";
 
 
 $sql = "SELECT sum(amount) as amount FROM ".MAIN_DB_PREFIX."bank ";

From 26df028efed50c886549fa60e91f1736016895a3 Mon Sep 17 00:00:00 2001
From: Philippe Grand <philippe.grand@atoo-net.com>
Date: Thu, 11 May 2017 09:17:43 +0200
Subject: [PATCH 307/505] Update bilan.php

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

diff --git a/htdocs/compta/bank/bilan.php b/htdocs/compta/bank/bilan.php
index 0baf0dcc3bb..69370faa34e 100644
--- a/htdocs/compta/bank/bilan.php
+++ b/htdocs/compta/bank/bilan.php
@@ -84,7 +84,7 @@ print "<tr class=\"oddeven\"><td>Somme des debits</td><td align=\"right\">".pric
 
 $sql = "SELECT sum(amount) as amount FROM ".MAIN_DB_PREFIX."bank ";
 $solde = valeur($sql);
-print '<tr class="oddeven"><td>".$langs->trans("BankBalance")."</td><td align="right">".price($solde)."</td></tr>';
+print "<tr class=\"oddeven\"><td>".$langs->trans("BankBalance")."</td><td align=\"right\">".price($solde)."</td></tr>";
 
 
 print "</table>";

From 17f37cc9e1d9f879e667991c011aded6bdab45c4 Mon Sep 17 00:00:00 2001
From: phf <phf@atm-consulting.fr>
Date: Thu, 11 May 2017 11:41:00 +0200
Subject: [PATCH 308/505] Fix wrong calculation

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

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 9483e79dba4..06b64d02da6 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -1084,6 +1084,7 @@ if (empty($reshook))
 										}
 
 										if ($totalamount != 0) {
+											$i = $i > 0 ? $i-1 : 0;
 										    $tva_tx = $lines[$i]->tva_tx;
 										    if (! empty($lines[$i]->vat_src_code) && ! preg_match('/\(/', $tva_tx)) $tva_tx .= ' ('.$lines[$i]->vat_src_code.')';
 											$amountdeposit[$tva_tx] = ($totalamount * $valuedeposit) / 100;
@@ -1134,7 +1135,7 @@ if (empty($reshook))
 							if (!empty($conf->global->MAIN_DEPOSIT_MULTI_TVA) && $diff != 0)
 							{
 								$object->fetch_lines();
-								$subprice_diff = $object->lines[0]->subprice - $diff / (1 + $object->lines[0]->tva_tx);
+								$subprice_diff = $object->lines[0]->subprice - $diff / (1 + $object->lines[0]->tva_tx / 100);
 								$object->updateline($object->lines[0]->id, $object->lines[0]->desc, $subprice_diff, $object->lines[0]->qty, $object->lines[0]->remise_percent, $object->lines[0]->date_start, $object->lines[0]->date_end, $object->lines[0]->tva_tx, 0, 0, 'HT', $object->lines[0]->info_bits, $object->lines[0]->product_type, 0, 0, 0, $object->lines[0]->pa_ht, $object->lines[0]->label, 0, array(), 100);
 							}
 							

From 0e4a209dd8d0f2250ce3cebbff47c4470c5c8f8a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 11 May 2017 11:50:21 +0200
Subject: [PATCH 309/505] Fix normalize color settings

---
 htdocs/theme/eldy/style.css.php | 7 +++++--
 htdocs/theme/md/style.css.php   | 4 ++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 767c3cf2344..db28e154b3a 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -155,18 +155,20 @@ if (! empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED))
 
 //$colortopbordertitle1=$colorbackhmenu1;
 
-
 // Set text color to black or white
+$colorbackhmenu1=join(',',colorStringToArray($colorbackhmenu1));    // Normalize value to 'x,y,z'
 $tmppart=explode(',',$colorbackhmenu1);
 $tmpval=(! empty($tmppart[0]) ? $tmppart[0] : 0)+(! empty($tmppart[1]) ? $tmppart[1] : 0)+(! empty($tmppart[2]) ? $tmppart[2] : 0);
 if ($tmpval <= 460) $colortextbackhmenu='FFFFFF';
 else $colortextbackhmenu='000000';
 
+$colorbackvmenu1=join(',',colorStringToArray($colorbackvmenu1));    // Normalize value to 'x,y,z'
 $tmppart=explode(',',$colorbackvmenu1);
 $tmpval=(! empty($tmppart[0]) ? $tmppart[0] : 0)+(! empty($tmppart[1]) ? $tmppart[1] : 0)+(! empty($tmppart[2]) ? $tmppart[2] : 0);
 if ($tmpval <= 460) { $colortextbackvmenu='FFFFFF'; }
 else { $colortextbackvmenu='000000'; }
 
+$colorbacktitle1=join(',',colorStringToArray($colorbacktitle1));    // Normalize value to 'x,y,z'
 $tmppart=explode(',',$colorbacktitle1);
 if ($colortexttitle == '')
 {
@@ -175,6 +177,7 @@ if ($colortexttitle == '')
     else { $colortexttitle='000000'; $colorshadowtitle='FFFFFF'; }
 }
 
+$colorbacktabcard1=join(',',colorStringToArray($colorbacktabcard1));    // Normalize value to 'x,y,z'
 $tmppart=explode(',',$colorbacktabcard1);
 $tmpval=(! empty($tmppart[0]) ? $tmppart[0] : 0)+(! empty($tmppart[1]) ? $tmppart[1] : 0)+(! empty($tmppart[2]) ? $tmppart[2] : 0);
 if ($tmpval <= 460) { $colortextbacktab='FFFFFF'; }
@@ -346,7 +349,7 @@ select.flat, form.flat select {
 	opacity: 0;
 }
 select:invalid { color: gray; }
-input:disabled {
+	input:disabled {
 	background:#ddd;
 }
 
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 933ad850650..0d6d0fad7af 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -158,16 +158,19 @@ if (empty($colortopbordertitle1)) $colortopbordertitle1=$colorbackhmenu1;
 
 
 // Set text color to black or white
+$colorbackhmenu1=join(',',colorStringToArray($colorbackhmenu1));    // Normalize value to 'x,y,z'
 $tmppart=explode(',',$colorbackhmenu1);
 $tmpval=(! empty($tmppart[0]) ? $tmppart[0] : 0)+(! empty($tmppart[1]) ? $tmppart[1] : 0)+(! empty($tmppart[2]) ? $tmppart[2] : 0);
 if ($tmpval <= 460) $colortextbackhmenu='FFFFFF';
 else $colortextbackhmenu='000000';
 
+$colorbackvmenu1=join(',',colorStringToArray($colorbackvmenu1));    // Normalize value to 'x,y,z'
 $tmppart=explode(',',$colorbackvmenu1);
 $tmpval=(! empty($tmppart[0]) ? $tmppart[0] : 0)+(! empty($tmppart[1]) ? $tmppart[1] : 0)+(! empty($tmppart[2]) ? $tmppart[2] : 0);
 if ($tmpval <= 460) { $colortextbackvmenu='FFFFFF'; }
 else { $colortextbackvmenu='000000'; }
 
+$colorbacktitle1=join(',',colorStringToArray($colorbacktitle1));    // Normalize value to 'x,y,z'
 $tmppart=explode(',',$colorbacktitle1);
 if ($colortexttitle == '')
 {
@@ -176,6 +179,7 @@ if ($colortexttitle == '')
 	else { $colortexttitle='101010'; $colorshadowtitle='FFFFFF'; }
 }
 
+$colorbacktabcard1=join(',',colorStringToArray($colorbacktabcard1));    // Normalize value to 'x,y,z'
 $tmppart=explode(',',$colorbacktabcard1);
 $tmpval=(! empty($tmppart[0]) ? $tmppart[0] : 0)+(! empty($tmppart[1]) ? $tmppart[1] : 0)+(! empty($tmppart[2]) ? $tmppart[2] : 0);
 if ($tmpval <= 460) { $colortextbacktab='FFFFFF'; }

From eb4cfc11cb93cf7dd61fffd8ac5514b071fce450 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 11 May 2017 11:58:16 +0200
Subject: [PATCH 310/505] Fix syntax error

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

diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index 9981b1ac2f7..a7289400569 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -473,7 +473,7 @@ class Account extends CommonObject
 
 			if ($categorie>0) {
 				$sql = "INSERT INTO ".MAIN_DB_PREFIX."bank_class (";
-				$sql .= "lineid, fk_categ;
+				$sql .= "lineid, fk_categ";
 				$sql .= ") VALUES (";
 				$sql .= " ".$accline->id.", ".$categorie;
 				$sql .= ")";

From d3917b60651b67bcca511682ee822ef234929d3f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 11 May 2017 12:25:53 +0200
Subject: [PATCH 311/505] FIX Bad return code of dolCpyDir

---
 htdocs/core/lib/files.lib.php | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 3d33fcb71f2..47501a86e8d 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -551,13 +551,23 @@ function dolCopyDir($srcfile, $destfile, $newmask, $overwriteifexists)
 						$dirmaskdec |= octdec('0200');  // Set w bit required to be able to create content for recursive subdirs files
                     	dol_mkdir($destfile."/".$file, '', decoct($dirmaskdec));
                     }
-                    $result=dolCopyDir($srcfile."/".$file, $destfile."/".$file, $newmask, $overwriteifexists);
+                    $tmpresult=dolCopyDir($srcfile."/".$file, $destfile."/".$file, $newmask, $overwriteifexists);
                 }
                 else
 				{
-                    $result=dol_copy($srcfile."/".$file, $destfile."/".$file, $newmask, $overwriteifexists);
+                    $tmpresult=dol_copy($srcfile."/".$file, $destfile."/".$file, $newmask, $overwriteifexists);
+                }
+                // Set result
+                if ($result > 0 && $tmpresult >= 0)
+                {
+                    // Do nothing, so we don't set result to 0 if tmpresult is 0 and result was success in a previous pass
+                }
+                else
+                {
+                    $result=$tmpresult;
                 }
                 if ($result < 0) break;
+                
             }
         }
         closedir($dir_handle);

From b092b6861aaca24d242e9470c4e4113ff203b92c Mon Sep 17 00:00:00 2001
From: phf <phf@atm-consulting.fr>
Date: Thu, 11 May 2017 12:48:47 +0200
Subject: [PATCH 312/505] Fix feature INVOICE_CREDIT_NOTE_STANDALONE doesn't
 work

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

diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 8a80fa4bf96..4e7f7fe1c32 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -2349,7 +2349,8 @@ if ($action == 'create')
 		else
 		{
 			print '<div class="tagtr listofinvoicetype"><div class="tagtd listofinvoicetype">';
-			$tmp='<input type="radio" name="type" id="radio_creditnote" value="0" disabled> ';
+			if (empty($conf->global->INVOICE_CREDIT_NOTE_STANDALONE)) $tmp='<input type="radio" name="type" id="radio_creditnote" value="0" disabled> ';
+			else $tmp='<input type="radio" name="type" id="radio_creditnote" value="2" > ';
 			$text = $tmp.$langs->trans("InvoiceAvoir") . ' ';
 			$text.= '('.$langs->trans("YouMustCreateInvoiceFromThird").') ';
 			$desc = $form->textwithpicto($text, $langs->transnoentities("InvoiceAvoirDesc"), 1, 'help', '', 0, 3);

From b09300ab61245bfb9e6efd3734f979bfec794946 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 11 May 2017 13:01:49 +0200
Subject: [PATCH 313/505] NEW Can edit background color for odd and even lines
 in tables

---
 htdocs/admin/ihm.php                  |  64 +++++-------
 htdocs/core/lib/files.lib.php         |  69 +++++++++++-
 htdocs/core/lib/usergroups.lib.php    | 145 ++++++++++++++++++--------
 htdocs/langs/en_US/modulebuilder.lang |   2 +-
 htdocs/modulebuilder/index.php        |  23 +++-
 htdocs/theme/eldy/style.css.php       |  49 ++++-----
 htdocs/theme/md/style.css.php         |  74 +++++--------
 7 files changed, 260 insertions(+), 166 deletions(-)

diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php
index cfa08f003ea..6e5c814639b 100644
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -87,32 +87,46 @@ if ($action == 'update')
 
 	dolibarr_set_const($db, "MAIN_THEME",						$_POST["main_theme"],'chaine',0,'',$conf->entity);
 
-	$val=(implode(',',(colorStringToArray(GETPOST('THEME_ELDY_BACKBODY'),array()))));
-	if ($val == '') dolibarr_del_const($db, 'THEME_ELDY_BACKBODY', $conf->entity);
-	else dolibarr_set_const($db, 'THEME_ELDY_BACKBODY', implode(',',colorStringToArray(GETPOST('THEME_ELDY_BACKBODY'),array())),'chaine',0,'',$conf->entity);
-	
 	$val=GETPOST('THEME_TOPMENU_DISABLE_IMAGE');
 	if (! $val) dolibarr_del_const($db, 'THEME_TOPMENU_DISABLE_IMAGE', $conf->entity);
     else dolibarr_set_const($db, 'THEME_TOPMENU_DISABLE_IMAGE', GETPOST('THEME_TOPMENU_DISABLE_IMAGE'),'chaine',0,'',$conf->entity);
     
+	$val=(implode(',',(colorStringToArray(GETPOST('THEME_ELDY_BACKBODY'),array()))));
+	if ($val == '') dolibarr_del_const($db, 'THEME_ELDY_BACKBODY', $conf->entity);
+	else dolibarr_set_const($db, 'THEME_ELDY_BACKBODY', $val,'chaine',0,'',$conf->entity);
+	
     $val=(implode(',',(colorStringToArray(GETPOST('THEME_ELDY_TOPMENU_BACK1'),array()))));
 	if ($val == '') dolibarr_del_const($db, 'THEME_ELDY_TOPMENU_BACK1', $conf->entity);
-    else dolibarr_set_const($db, 'THEME_ELDY_TOPMENU_BACK1', implode(',',colorStringToArray(GETPOST('THEME_ELDY_TOPMENU_BACK1'),array())),'chaine',0,'',$conf->entity);
+    else dolibarr_set_const($db, 'THEME_ELDY_TOPMENU_BACK1', $val,'chaine',0,'',$conf->entity);
 
-	$val=(implode(',',(colorStringToArray(GETPOST('THEME_ELDY_BACKTITLE1'),array()))));
+    $val=(implode(',',(colorStringToArray(GETPOST('THEME_ELDY_BACKTITLE1'),array()))));
 	if ($val == '') dolibarr_del_const($db, 'THEME_ELDY_BACKTITLE1', $conf->entity);
-    else dolibarr_set_const($db, 'THEME_ELDY_BACKTITLE1', implode(',',colorStringToArray(GETPOST('THEME_ELDY_BACKTITLE1'),array())),'chaine',0,'',$conf->entity);
+    else dolibarr_set_const($db, 'THEME_ELDY_BACKTITLE1', $val,'chaine',0,'',$conf->entity);
 
-	$val=(implode(',',(colorStringToArray(GETPOST('THEME_ELDY_TEXTTITLENOTAB'),array()))));
+    $val=(implode(',',(colorStringToArray(GETPOST('THEME_ELDY_LINEIMPAIR1'),array()))));
+    if ($val == '') dolibarr_del_const($db, 'THEME_ELDY_LINEIMPAIR1', $conf->entity);
+    else dolibarr_set_const($db, 'THEME_ELDY_LINEIMPAIR1', $val,'chaine',0,'',$conf->entity);
+    $val=(implode(',',(colorStringToArray(GETPOST('THEME_ELDY_LINEIMPAIR1'),array()))));
+    if ($val == '') dolibarr_del_const($db, 'THEME_ELDY_LINEIMPAIR2', $conf->entity);
+    else dolibarr_set_const($db, 'THEME_ELDY_LINEIMPAIR2', $val,'chaine',0,'',$conf->entity);
+    
+    $val=(implode(',',(colorStringToArray(GETPOST('THEME_ELDY_LINEPAIR1'),array()))));
+    if ($val == '') dolibarr_del_const($db, 'THEME_ELDY_LINEPAIR1', $conf->entity);
+    else dolibarr_set_const($db, 'THEME_ELDY_LINEPAIR1', $val,'chaine',0,'',$conf->entity);
+    $val=(implode(',',(colorStringToArray(GETPOST('THEME_ELDY_LINEPAIR1'),array()))));
+    if ($val == '') dolibarr_del_const($db, 'THEME_ELDY_LINEPAIR2', $conf->entity);
+    else dolibarr_set_const($db, 'THEME_ELDY_LINEPAIR2', $val,'chaine',0,'',$conf->entity);
+    
+    $val=(implode(',',(colorStringToArray(GETPOST('THEME_ELDY_TEXTTITLENOTAB'),array()))));
 	if ($val == '') dolibarr_del_const($db, 'THEME_ELDY_TEXTTITLENOTAB', $conf->entity);
-    else dolibarr_set_const($db, 'THEME_ELDY_TEXTTITLENOTAB', implode(',',colorStringToArray(GETPOST('THEME_ELDY_TEXTTITLENOTAB'),array())),'chaine',0,'',$conf->entity);
+    else dolibarr_set_const($db, 'THEME_ELDY_TEXTTITLENOTAB', $val,'chaine',0,'',$conf->entity);
     
     if (GETPOST('THEME_ELDY_USE_HOVER') == '') dolibarr_set_const($db, "THEME_ELDY_USE_HOVER", '0', 'chaine', 0, '', $conf->entity);    // If empty, we set to '0' ('000000' is for black)
 	else dolibarr_set_const($db, "THEME_ELDY_USE_HOVER", $_POST["THEME_ELDY_USE_HOVER"], 'chaine', 0, '', $conf->entity);
 
 	$val=(implode(',',(colorStringToArray(GETPOST('THEME_ELDY_TEXTLINK'),array()))));
 	if ($val == '') dolibarr_del_const($db, 'THEME_ELDY_TEXTLINK', $conf->entity);
-    else dolibarr_set_const($db, 'THEME_ELDY_TEXTLINK', implode(',',colorStringToArray(GETPOST('THEME_ELDY_TEXTLINK'),array())),'chaine',0,'',$conf->entity);
+    else dolibarr_set_const($db, 'THEME_ELDY_TEXTLINK', $val,'chaine',0,'',$conf->entity);
 	
     dolibarr_set_const($db, "MAIN_SIZE_LISTE_LIMIT",			$_POST["main_size_liste_limit"],'chaine',0,'',$conf->entity);
     dolibarr_set_const($db, "MAIN_SIZE_SHORTLIST_LIMIT",		$_POST["main_size_shortliste_limit"],'chaine',0,'',$conf->entity);
@@ -149,34 +163,6 @@ if ($action == 'update')
 	            if ($result > 0)
 	            {
 	                dolibarr_set_const($db, "MAIN_LOGIN_BACKGROUND",$original_file,'chaine',0,'',$conf->entity);
-	
-	                // Create thumbs of logo (Note that PDF use original file and not thumbs)
-	                /*
-	                if ($isimage > 0)
-	                {
-	                    // Create thumbs
-	                    //$object->addThumbs($newfile);    // We can't use addThumbs here yet because we need name of generated thumbs to add them into constants. TODO Check if need such constants. We should be able to retreive value with get...
-	
-	                    // Create small thumb, Used on logon for example
-	                    $imgThumbSmall = vignette($dirforimage.$original_file, $maxwidthsmall, $maxheightsmall, '_small', $quality);
-	                    if (image_format_supported($imgThumbSmall) >= 0 && preg_match('/([^\\/:]+)$/i',$imgThumbSmall,$reg))
-	                    {
-	                        $imgThumbSmall = $reg[1];    // Save only basename
-	                        dolibarr_set_const($db, "MAIN_INFO_SOCIETE_LOGO_SMALL",$imgThumbSmall,'chaine',0,'',$conf->entity);
-	                    }
-	                    else dol_syslog($imgThumbSmall);
-	
-	                    // Create mini thumb, Used on menu or for setup page for example
-	                    $imgThumbMini = vignette($dirforimage.$original_file, $maxwidthmini, $maxheightmini, '_mini', $quality);
-	                    if (image_format_supported($imgThumbMini) >= 0 && preg_match('/([^\\/:]+)$/i',$imgThumbMini,$reg))
-	                    {
-	                        $imgThumbMini = $reg[1];     // Save only basename
-	                        dolibarr_set_const($db, "MAIN_INFO_SOCIETE_LOGO_MINI",$imgThumbMini,'chaine',0,'',$conf->entity);
-	                    }
-	                    else dol_syslog($imgThumbMini);
-	                }
-	                else dol_syslog("ErrorImageFormatNotSupported",LOG_WARNING);
-	                */
 	            }
 	            else if (preg_match('/^ErrorFileIsInfectedWithAVirus/',$result))
 	            {
@@ -574,7 +560,7 @@ else	// Show
     
     print '</table>'."\n";
     
-    print '<div class="tabsAction">';
+    print '<div class="tabsAction tabsActionNoBottom">';
     print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit">'.$langs->trans("Modify").'</a>';
     print '</div>';
 }
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 47501a86e8d..39865905553 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -44,7 +44,8 @@ function dol_basename($pathfile)
  *  @param	string		$path        	Starting path from which to search. This is a full path.
  *  @param	string		$types        	Can be "directories", "files", or "all"
  *  @param	int			$recursive		Determines whether subdirectories are searched
- *  @param	string		$filter        	Regex filter to restrict list. This regex value must be escaped for '/', since this char is used for preg_match function. Filter is checked into basename only.
+ *  @param	string		$filter        	Regex filter to restrict list. This regex value must be escaped for '/' by doing preg_quote($var,'/'), since this char is used for preg_match function, 
+ *                                      but must not contains the start and end '/'. Filter is checked into basename only.
  *  @param	array		$excludefilter  Array of Regex for exclude filter (example: array('(\.meta|_preview.*\.png)$','^\.')). Exclude is checked into fullpath.
  *  @param	string		$sortcriteria	Sort criteria ("","fullname","name","date","size")
  *  @param	string		$sortorder		Sort order (SORT_ASC, SORT_DESC)
@@ -440,6 +441,70 @@ function dol_filemtime($pathoffile)
 	return @filemtime($newpathoffile); // @Is to avoid errors if files does not exists
 }
 
+/**
+ * Make replacement of strings into a file.
+ *
+ * @param	string	$srcfile			Source file (can't be a directory)
+ * @param	array	$arrayreplacement	Array with strings to replace
+ * @param	string	$destfile			Destination file (can't be a directory). If empty, will be same than source file.
+ * @param	int		$newmask			Mask for new file (0 by default means $conf->global->MAIN_UMASK). Example: '0666'
+ * @return	int							<0 if error, 0 if nothing done (dest file already exists), >0 if OK
+ * @see		dolCopyr
+ */
+function dolReplaceInFile($srcfile, $arrayreplacement, $destfile='', $newmask=0)
+{
+    global $conf;
+
+    dol_syslog("files.lib.php::dolReplaceInFile srcfile=".$srcfile." destfile=".$destfile." newmask=".$newmask);
+
+    if (empty($srcfile)) return -1;
+    if (empty($destfile)) $destfile=$srcfile;
+    
+    $destexists=dol_is_file($destfile);
+    if (($destfile != $srcfile) && $destexists) return 0;
+    
+    $tmpdestfile=$destfile.'.tmp';
+
+    $newpathofsrcfile=dol_osencode($srcfile);
+    $newpathoftmpdestfile=dol_osencode($tmpdestfile);
+    $newpathofdestfile=dol_osencode($destfile);
+    $newdirdestfile=dirname($newpathofdestfile);
+
+    if ($destexists && ! is_writable($newpathofdestfile))
+    {
+        dol_syslog("files.lib.php::dolReplaceInFile failed Permission denied to overwrite target file", LOG_WARNING);
+        return -1;
+    }
+    if (! is_writable($newdirdestfile))
+    {
+        dol_syslog("files.lib.php::dolReplaceInFile failed Permission denied to write into target directory ".$newdirdestfile, LOG_WARNING);
+        return -2;
+    }
+   
+    dol_delete_file($tmpdestfile);
+    
+    
+    
+    
+    // Rename
+    $result=dol_move($newpathoftmpdestfile, $newpathofdestfile, $newmask, (($destfile == $srcfile)?1:0));
+    if (! $result)
+    {
+        dol_syslog("files.lib.php::dolReplaceInFile failed to move tmp file to final dest", LOG_WARNING);
+        return -3;
+    }
+    if (empty($newmask) && ! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
+    if (empty($newmask))	// This should no happen
+    {
+        dol_syslog("Warning: dolReplaceInFile called with empty value for newmask and no default value defined", LOG_WARNING);
+        $newmask='0664';
+    }
+
+    @chmod($newpathofdestfile, octdec($newmask));
+
+    return 1;
+}
+
 /**
  * Copy a file to another file.
  *
@@ -940,7 +1005,7 @@ function dol_delete_file($file,$disableglob=0,$nophperrors=0,$nohook=0,$object=n
 					// If error because of not exists, we must should return true and we should return false if this is a permission problem
 				}
 			}
-			else dol_syslog("No files to delete found", LOG_WARNING);
+			else dol_syslog("No files to delete found", LOG_DEBUG);
 		}
 		else
 		{
diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php
index d983f799c0d..797af488f46 100644
--- a/htdocs/core/lib/usergroups.lib.php
+++ b/htdocs/core/lib/usergroups.lib.php
@@ -443,6 +443,49 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
 
     print '</td></tr>';
 
+    // TopMenuDisableImages
+    if ($foruserprofile)
+    {
+        /*
+         print '<tr class="oddeven">';
+         print '<td>'.$langs->trans("TopMenuDisableImages").'</td>';
+         print '<td>'.($conf->global->THEME_TOPMENU_DISABLE_IMAGE?$conf->global->THEME_TOPMENU_DISABLE_IMAGE:$langs->trans("Default")).'</td>';
+         print '<td align="left" class="nowrap" width="20%"><input '.$bc[$var].' name="check_THEME_TOPMENU_DISABLE_IMAGE" id="check_THEME_TOPMENU_DISABLE_IMAGE" type="checkbox" '.(! empty($object->conf->THEME_ELDY_TOPMENU_BACK1)?" checked":"");
+         print (empty($dolibarr_main_demo) && $edit)?'':' disabled="disabled"';	// Disabled for demo
+         print '> '.$langs->trans("UsePersonalValue").'</td>';
+         print '<td>';
+         if ($edit)
+         {
+         print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_TOPMENU_DISABLE_IMAGE,array()),''),'THEME_TOPMENU_DISABLE_IMAGE','formcolor',1).' ';
+         }
+         else
+         {
+         $color = colorArrayToHex(colorStringToArray($conf->global->THEME_TOPMENU_DISABLE_IMAGE,array()),'');
+         if ($color) print '<input type="text" class="colorthumb" disabled style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
+         else print '';
+         }
+         if ($edit) print '<br>('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
+         print '</td>';*/
+    }
+    else
+    {
+        $default=$langs->trans('No');
+        print '<tr class="oddeven">';
+        print '<td>'.$langs->trans("TopMenuDisableImages").'</td>';
+        print '<td colspan="'.($colspan-1).'">';
+        if ($edit)
+        {
+            print $form->selectyesno('THEME_TOPMENU_DISABLE_IMAGE', $conf->global->THEME_TOPMENU_DISABLE_IMAGE, 1);
+        }
+        else
+        {
+            print yn($conf->global->THEME_TOPMENU_DISABLE_IMAGE);
+        }
+        print ' &nbsp; ('.$langs->trans("Default").': <strong>'.$default.'</strong>) ';
+        print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
+        print '</td>';
+    }
+    
 	// Background color THEME_ELDY_BACKBODY
     if ($foruserprofile)
 	{
@@ -535,52 +578,6 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
 	    print '</td>';
 	}
 	
-	// TopMenuBackgroundColor
-	if ($foruserprofile)
-	{
-	    /*
-	     print '<tr class="oddeven">';
-	     print '<td>'.$langs->trans("TopMenuBackgroundColor").'</td>';
-	     print '<td>'.($conf->global->THEME_ELDY_TOPMENU_BACK1?$conf->global->THEME_ELDY_TOPMENU_BACK1:$langs->trans("Default")).'</td>';
-	     print '<td align="left" class="nowrap" width="20%"><input '.$bc[$var].' name="check_THEME_ELDY_TOPMENU_BACK1" id="check_THEME_ELDY_TOPMENU_BACK1" type="checkbox" '.(! empty($object->conf->THEME_ELDY_TOPMENU_BACK1)?" checked":"");
-	     print (empty($dolibarr_main_demo) && $edit)?'':' disabled="disabled"';	// Disabled for demo
-	     print '> '.$langs->trans("UsePersonalValue").'</td>';
-	     print '<td>';
-	     if ($edit)
-	     {
-	     print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1,array()),''),'THEME_ELDY_TOPMENU_BACK1','formcolor',1).' ';
-	     }
-	     else
-	     {
-	     $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1,array()),'');
-	     if ($color) print '<input type="text" class="colorthumb" disabled style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
-	     else print '';
-	     }
-	    	if ($edit) print '<br>('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
-	    	print '</td>';*/
-	}
-	else
-	{
-	    $default=$langs->trans('No');
-	    print '<tr class="oddeven">';
-	    print '<td>'.$langs->trans("TopMenuDisableImages").'</td>';
-	    print '<td colspan="'.($colspan-1).'">';
-	    if ($edit)
-	    {
-	        print $form->selectyesno('THEME_TOPMENU_DISABLE_IMAGE', $conf->global->THEME_TOPMENU_DISABLE_IMAGE, 1);
-	    }
-	    else
-	    {
-	        print yn($conf->global->THEME_TOPMENU_DISABLE_IMAGE);
-	    }
-	    print ' &nbsp; ('.$langs->trans("Default").': <strong>'.$default.'</strong>) ';
-    	print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
-	    print '</td>';
-	}
-	
-	
-	
-	
 	// BackgroundTableTitleColor
 	if ($foruserprofile)
 	{
@@ -607,6 +604,62 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
 	    print '</tr>';
 	}
 
+	// BackgroundTableLineOddColor
+	if ($foruserprofile)
+	{
+
+	}
+	else
+	{
+	    $default='ffffff';
+	    if ($conf->theme == 'md') $default='ffffff';
+	
+	    print '<tr class="oddeven">';
+	    print '<td>'.$langs->trans("BackgroundTableLineOddColor").'</td>';
+	    print '<td colspan="'.($colspan-1).'">';
+	    if ($edit)
+	    {
+	        print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEIMPAIR1,array()),''),'THEME_ELDY_LINEIMPAIR1','formcolor',1).' ';
+	    }
+	    else
+	    {
+	        $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEIMPAIR1,array()),'');
+	        if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
+	        else print $langs->trans("Default");
+	    }
+	    print ' &nbsp; ('.$langs->trans("Default").': <strong>'.$default.'</strong>) ';
+	    print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
+	    print '</td>';
+	}
+	
+	// BackgroundTableLineEvenColor
+	if ($foruserprofile)
+	{
+	
+	}
+	else
+	{
+	    $default='f8f8f8';
+	    if ($conf->theme == 'md') $default='f8f8f8';
+	
+	    print '<tr class="oddeven">';
+	    print '<td>'.$langs->trans("BackgroundTableLineEvenColor").'</td>';
+	    print '<td colspan="'.($colspan-1).'">';
+	    if ($edit)
+	    {
+	        print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEPAIR1,array()),''),'THEME_ELDY_LINEPAIR1','formcolor',1).' ';
+	    }
+	    else
+	    {
+	        $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEPAIR1,array()),'');
+	        if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
+	        else print $langs->trans("Default");
+	    }
+	    print ' &nbsp; ('.$langs->trans("Default").': <strong>'.$default.'</strong>) ';
+	    print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
+	    print '</td>';
+	}
+	
 	// TextTitleColor
 	if ($foruserprofile)
 	{
diff --git a/htdocs/langs/en_US/modulebuilder.lang b/htdocs/langs/en_US/modulebuilder.lang
index da734ea1356..18b7044b55d 100644
--- a/htdocs/langs/en_US/modulebuilder.lang
+++ b/htdocs/langs/en_US/modulebuilder.lang
@@ -4,5 +4,5 @@ ModuleBuilderDesc2=Path were modules are generated/edited (first alternative dir
 ModuleBuilderDesc3=Generated/editable modules found: <strong>%s</strong> (they are detected as editable when the file <strong>%s</strong> exists in root of module directory). 
 NewModule=New module
 ModuleKey=Key for new module
-
+ModuleInitialized=Module initialized
 
diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index 6ad747a7694..bdad41e8556 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -59,15 +59,28 @@ if ($dircustom && $action == 'initmodule' && $modulename)
     $destfile = $dircustom.'/'.$modulename;
     $result = dolCopyDir($srcfile, $destfile, 0, 0);
     //dol_mkdir($destfile);
+    if ($result <= 0)
+    {
+        $error++;
+        setEventMessages($langs->trans("ErrorFailedToCopyDir"), null, 'errors');
+    }
+
+    // Edit PHP files
+    $listofphpfilestoedit = dol_dir_list($destfile, 'files', 1, '\.php$', 'fullname', SORT_ASC, 0, true);
+    foreach($listofphpfilestoedit as $phpfileval)
+    {
+        $arrayreplacement=array(
+            'mymodule'=>$modulename
+        );
+        $result=dolReplaceInFile($phpfileval['fullname'], $arrayreplacement);
+        var_dump($phpfileval);
+        var_dump($result);
+    }    
     
-    if ($result > 0)
+    if (! $error)
     {
         setEventMessages('ModuleInitialized', null);
     }
-    else
-    {
-        setEventMessages($langs->trans("ErrorFailedToCopyDir"), null, 'errors');
-    }
 }
 
 
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index f923413da4c..f6021be8a9a 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2004-2015	Laurent Destailleur		<eldy@users.sourceforge.net>
+/* Copyright (C) 2004-2017	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2006		Rodolphe Quiedeville	<rodolphe@quiedeville.org>
  * Copyright (C) 2007-2017	Regis Houssin			<regis.houssin@capnetworks.com>
  * Copyright (C) 2011		Philippe Grand			<philippe.grand@atoo-net.com>
@@ -35,6 +35,28 @@ if (! defined('NOLOGIN'))         define('NOLOGIN',1);          // File must be
 if (! defined('NOREQUIREHTML'))   define('NOREQUIREHTML',1);
 if (! defined('NOREQUIREAJAX'))   define('NOREQUIREAJAX','1');
 
+// Colors
+$colorbackhmenu1='80,90,120';      // topmenu
+$colorbackvmenu1='255,255,255';      // vmenu
+$colortopbordertitle1='120,120,120';    // top border of title
+$colorbacktitle1='230,230,230';      // title of tables,list
+$colorbacktabcard1='255,255,255';  // card
+$colorbacktabactive='234,234,234';
+$colorbacklineimpair1='255,255,255';    // line impair
+$colorbacklineimpair2='255,255,255';    // line impair
+$colorbacklinepair1='248,248,248';    // line pair
+$colorbacklinepair2='248,248,248';    // line pair
+$colorbacklinepairhover='238,246,252';    // line pair
+$colorbackbody='255,255,255';
+$colortexttitlenotab='100,60,20';
+$colortexttitle='0,0,0';
+$colortext='0,0,0';
+$colortextlink='0,0,100';
+$fontsize='13';
+$fontsizesmaller='12';
+
+if (defined('THEME_ONLY_CONSTANT')) return;
+    
 session_cache_limiter(FALSE);
 
 require_once '../../main.inc.php';
@@ -77,25 +99,6 @@ $dol_no_mouse_hover=$conf->dol_no_mouse_hover;
 //$user->conf->THEME_ELDY_ENABLE_PERSONALIZED=0;
 //var_dump($user->conf->THEME_ELDY_RGB);
 
-// Colors
-$colorbackhmenu1='80,90,120';      // topmenu
-$colorbackvmenu1='255,255,255';      // vmenu
-$colortopbordertitle1='120,120,120';    // top border of title
-$colorbacktitle1='240,240,240';      // title of tables,list
-$colorbacktabcard1='255,255,255';  // card
-$colorbacktabactive='234,234,234';
-$colorbacklineimpair1='255,255,255';    // line impair
-$colorbacklineimpair2='255,255,255';    // line impair
-$colorbacklinepair1='248,248,248';    // line pair
-$colorbacklinepair2='248,248,248';    // line pair
-$colorbacklinepairhover='238,246,252';    // line pair
-$colorbackbody='255,255,255';
-$colortexttitlenotab='100,60,20';
-$colortexttitle='0,0,0';
-$colortext='0,0,0';
-$colortextlink='0,0,100';
-$fontsize='13';
-$fontsizesmaller='12';
 $useboldtitle=(isset($conf->global->THEME_ELDY_USEBOLDTITLE)?$conf->global->THEME_ELDY_USEBOLDTITLE:1);
 $borderwith=2;
 
@@ -113,17 +116,11 @@ if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED))
 	$conf->global->THEME_ELDY_VERMENU_BACK1='255,255,255';    // vmenu
     $conf->global->THEME_ELDY_BACKTABCARD1='255,255,255';     // card
     $conf->global->THEME_ELDY_BACKTABACTIVE='234,234,234';
-    $conf->global->THEME_ELDY_LINEIMPAIR1='255,255,255';
-    $conf->global->THEME_ELDY_LINEIMPAIR2='255,255,255';
-    $conf->global->THEME_ELDY_LINEPAIR1='248,248,248';
-    $conf->global->THEME_ELDY_LINEPAIR2='248,248,248';
-    $conf->global->THEME_ELDY_LINEPAIRHOVER='238,246,252';
     $conf->global->THEME_ELDY_TEXT='0,0,0';
     $conf->global->THEME_ELDY_FONT_SIZE1='13';
     $conf->global->THEME_ELDY_FONT_SIZE2='12';
 }
 
- 
 // Case of option availables only if THEME_ELDY_ENABLE_PERSONALIZED is on
 $colorbackhmenu1     =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_TOPMENU_BACK1)?$colorbackhmenu1:$conf->global->THEME_ELDY_TOPMENU_BACK1)   :(empty($user->conf->THEME_ELDY_TOPMENU_BACK1)?$colorbackhmenu1:$user->conf->THEME_ELDY_TOPMENU_BACK1);
 $colorbackvmenu1     =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_VERMENU_BACK1)?$colorbackvmenu1:$conf->global->THEME_ELDY_VERMENU_BACK1)   :(empty($user->conf->THEME_ELDY_VERMENU_BACK1)?$colorbackvmenu1:$user->conf->THEME_ELDY_VERMENU_BACK1);
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 3bd33b07225..9604da70905 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2004-2015	Laurent Destailleur		<eldy@users.sourceforge.net>
+/* Copyright (C) 2004-2017	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2006		Rodolphe Quiedeville	<rodolphe@quiedeville.org>
  * Copyright (C) 2007-2017	Regis Houssin			<regis.houssin@capnetworks.com>
  * Copyright (C) 2011		Philippe Grand			<philippe.grand@atoo-net.com>
@@ -36,6 +36,28 @@ if (! defined('NOLOGIN'))         define('NOLOGIN',1);          // File must be
 if (! defined('NOREQUIREHTML'))   define('NOREQUIREHTML',1);
 if (! defined('NOREQUIREAJAX'))   define('NOREQUIREAJAX','1');
 
+// Colors
+$colorbackhmenu1='90,50,120';      // topmenu
+$colorbackvmenu1='255,255,255';      // vmenu
+$colortopbordertitle1='';           // top border of tables-lists title. not defined = default to colorbackhmenu1
+$colorbacktitle1='240,240,240';      // title of tables-lists
+$colorbacktabcard1='255,255,255';  // card
+$colorbacktabactive='234,234,234';
+$colorbacklineimpair1='255,255,255';    // line impair
+$colorbacklineimpair2='255,255,255';    // line impair
+$colorbacklinepair1='250,250,250';    // line pair
+$colorbacklinepair2='248,248,248';    // line pair
+$colorbacklinepairhover='244,244,244';    // line pair
+$colorbackbody='240,240,240';
+$colortexttitlenotab='90,90,90';
+$colortexttitle='20,20,20';
+$colortext='0,0,0';
+$colortextlink='0,0,120';
+$fontsize='13';
+$fontsizesmaller='11';
+
+if (defined('THEME_ONLY_CONSTANT')) return;
+
 session_cache_limiter(FALSE);
 
 require_once '../../main.inc.php';
@@ -78,34 +100,14 @@ $dol_no_mouse_hover=$conf->dol_no_mouse_hover;
 //$user->conf->THEME_ELDY_ENABLE_PERSONALIZED=0;
 //var_dump($user->conf->THEME_ELDY_RGB);
 
-// Colors
-$colorbackhmenu1='90,50,120';      // topmenu
-$colorbackvmenu1='255,255,255';      // vmenu
-$colortopbordertitle1='';           // top border of tables-lists title. not defined = default to colorbackhmenu1
-$colorbacktitle1='240,240,240';      // title of tables-lists
-$colorbacktabcard1='255,255,255';  // card
-$colorbacktabactive='234,234,234';
-$colorbacklineimpair1='255,255,255';    // line impair
-$colorbacklineimpair2='255,255,255';    // line impair
-$colorbacklinepair1='250,250,250';    // line pair
-$colorbacklinepair2='248,248,248';    // line pair
-$colorbacklinepairhover='244,244,244';    // line pair
-$colorbackbody='240,240,240';
-$colortexttitlenotab='90,90,90';
-$colortexttitle='20,20,20';
-$colortext='0,0,0';
-$colortextlink='0,0,120';
-$fontsize='13';
-$fontsizesmaller='11';
-$usegradient=0;
 $useboldtitle=(isset($conf->global->THEME_ELDY_USEBOLDTITLE)?$conf->global->THEME_ELDY_USEBOLDTITLE:1);
 $borderwith=2;
 
 // Case of option always editable
 if (! isset($conf->global->THEME_ELDY_BACKBODY)) $conf->global->THEME_ELDY_BACKBODY=$colorbackbody;
-if (! isset($conf->global->THEME_ELDY_TOPMENU_BACK1)) $conf->global->THEME_ELDY_TOPMENU_BACK1='90,50,120';
+if (! isset($conf->global->THEME_ELDY_TOPMENU_BACK1)) $conf->global->THEME_ELDY_TOPMENU_BACK1=$colorbackhmenu1;
 if (! isset($conf->global->THEME_ELDY_BACKTITLE1)) $conf->global->THEME_ELDY_BACKTITLE1=$colorbacktitle1;
-if (! isset($conf->global->THEME_ELDY_USE_HOVER)) $conf->global->THEME_ELDY_USE_HOVER=='238,246,252';
+if (! isset($conf->global->THEME_ELDY_USE_HOVER)) $conf->global->THEME_ELDY_USE_HOVER==$colorbacklinepairhover;
 if (! isset($conf->global->THEME_ELDY_TEXTTITLENOTAB)) $conf->global->THEME_ELDY_TEXTTITLENOTAB=$colortexttitlenotab;
 if (! isset($conf->global->THEME_ELDY_TEXTLINK)) $conf->global->THEME_ELDY_TEXTLINK=$colortextlink;
 
@@ -116,12 +118,6 @@ if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED))
 	$conf->global->THEME_ELDY_VERMENU_BACK1='255,255,255';    // vmenu
     $conf->global->THEME_ELDY_BACKTABCARD1='255,255,255';     // card
     $conf->global->THEME_ELDY_BACKTABACTIVE='234,234,234';
-    $conf->global->THEME_ELDY_LINEIMPAIR1='255,255,255';
-    $conf->global->THEME_ELDY_LINEIMPAIR2='255,255,255';
-    $conf->global->THEME_ELDY_LINEPAIR1='250,250,250';
-    $conf->global->THEME_ELDY_LINEPAIR2='248,248,248';
-    $conf->global->THEME_ELDY_LINEPAIRHOVER='238,246,252';
-    $conf->global->THEME_ELDY_USE_HOVER='238,246,252';
     $conf->global->THEME_ELDY_TEXT='0,0,0';
     $conf->global->THEME_ELDY_FONT_SIZE1='13';
     $conf->global->THEME_ELDY_FONT_SIZE2='11';
@@ -139,7 +135,6 @@ $colorbacklineimpair1=empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty(
 $colorbacklineimpair2=empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_LINEIMPAIR2)  ?$colorbacklineimpair2:$conf->global->THEME_ELDY_LINEIMPAIR2):(empty($user->conf->THEME_ELDY_LINEIMPAIR2)?$colorbacklineimpair2:$user->conf->THEME_ELDY_LINEIMPAIR2);
 $colorbacklinepair1  =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_LINEPAIR1)    ?$colorbacklinepair1:$conf->global->THEME_ELDY_LINEPAIR1)    :(empty($user->conf->THEME_ELDY_LINEPAIR1)?$colorbacklinepair1:$user->conf->THEME_ELDY_LINEPAIR1);
 $colorbacklinepair2  =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_LINEPAIR2)    ?$colorbacklinepair2:$conf->global->THEME_ELDY_LINEPAIR2)    :(empty($user->conf->THEME_ELDY_LINEPAIR2)?$colorbacklinepair2:$user->conf->THEME_ELDY_LINEPAIR2);
-$colorbacklinepairhover  =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_LINEPAIRHOVER)    ?$colorbacklinepairhover:$conf->global->THEME_ELDY_LINEPAIRHOVER)    :(empty($user->conf->THEME_ELDY_LINEPAIRHOVER)?$colorbacklinepairhover:$user->conf->THEME_ELDY_LINEPAIRHOVER);
 $colorbackbody       =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_BACKBODY)     ?$colorbackbody:$conf->global->THEME_ELDY_BACKBODY)          :(empty($user->conf->THEME_ELDY_BACKBODY)?$colorbackbody:$user->conf->THEME_ELDY_BACKBODY);
 $colortexttitlenotab =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_TEXTTITLENOTAB)?$colortexttitlenotab:$conf->global->THEME_ELDY_TEXTTITLENOTAB)             :(empty($user->conf->THEME_ELDY_TEXTTITLENOTAB)?$colortexttitlenotab:$user->conf->THEME_ELDY_TEXTTITLENOTAB);
 $colortexttitle      =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_TEXTTITLE)    ?$colortext:$conf->global->THEME_ELDY_TEXTTITLE)             :(empty($user->conf->THEME_ELDY_TEXTTITLE)?$colortexttitle:$user->conf->THEME_ELDY_TEXTTITLE);
@@ -147,6 +142,7 @@ $colortext           =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty(
 $colortextlink       =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_TEXTLINK)     ?$colortext:$conf->global->THEME_ELDY_TEXTLINK)              :(empty($user->conf->THEME_ELDY_TEXTLINK)?$colortextlink:$user->conf->THEME_ELDY_TEXTLINK);
 $fontsize            =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_FONT_SIZE1)   ?$fontsize:$conf->global->THEME_ELDY_FONT_SIZE1)             :(empty($user->conf->THEME_ELDY_FONT_SIZE1)?$fontsize:$user->conf->THEME_ELDY_FONT_SIZE1);
 $fontsizesmaller     =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_FONT_SIZE2)   ?$fontsize:$conf->global->THEME_ELDY_FONT_SIZE2)             :(empty($user->conf->THEME_ELDY_FONT_SIZE2)?$fontsize:$user->conf->THEME_ELDY_FONT_SIZE2);
+
 // Hover color
 $colorbacklinepairhover=((! isset($conf->global->THEME_ELDY_USE_HOVER) || (string) $conf->global->THEME_ELDY_USE_HOVER === '0')?'':($conf->global->THEME_ELDY_USE_HOVER === '1'?'edf4fb':$conf->global->THEME_ELDY_USE_HOVER));
 if (! empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED))
@@ -154,7 +150,7 @@ if (! empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED))
     $colorbacklinepairhover=((! isset($user->conf->THEME_ELDY_USE_HOVER) || $user->conf->THEME_ELDY_USE_HOVER === '0')?'':($user->conf->THEME_ELDY_USE_HOVER === '1'?'edf4fb':$user->conf->THEME_ELDY_USE_HOVER));
 }
 
-if (empty($colortopbordertitle1)) $colortopbordertitle1=$colorbackhmenu1;
+//if (empty($colortopbordertitle1)) $colortopbordertitle1=$colorbackhmenu1;
 
 
 // Set text color to black or white
@@ -2709,15 +2705,7 @@ tr.liste_titre, tr.liste_titre_sel, form.liste_titre, form.liste_titre_sel, tabl
 }
 div.liste_titre, tr.liste_titre, tr.liste_titre_sel, form.liste_titre, form.liste_titre_sel, table.dataTable thead tr
 {
-	<?php if ($usegradient) { ?>
-	background-image: -o-linear-gradient(bottom, rgba(0,0,0,0.1) 0%, rgba(250,250,250,0.3) 100%);
-	background-image: -moz-linear-gradient(bottom, rgba(0,0,0,0.1) 0%, rgba(250,250,250,0.3) 100%);
-	background-image: -webkit-linear-gradient(bottom, rgba(0,0,0,0.1) 0%, rgba(250,250,250,0.3) 100%);
-	background-image: -ms-linear-gradient(bottom, rgba(0,0,0,0.1) 0%, rgba(250,250,250,0.3) 100%);
-	background-image: linear-gradient(bottom, rgba(0,0,0,0.1) 0%, rgba(250,250,250,0.3) 100%);
-	<?php } else { ?>
 	background: rgb(<?php echo $colorbacktitle1; ?>);
-	<?php } ?>
 	font-weight: <?php echo $useboldtitle?'bold':'normal'; ?>;
 
     color: rgb(<?php echo $colortexttitle; ?>);
@@ -2974,15 +2962,7 @@ tr.box_titre {
 	color: #000 !important; */
 
 	/* TO MATCH ELDY */
-	<?php if ($usegradient) { ?>
-	background-image: -o-linear-gradient(bottom, rgba(0,0,0,0.1) 0%, rgba(250,250,250,0.3) 100%);
-	background-image: -moz-linear-gradient(bottom, rgba(0,0,0,0.1) 0%, rgba(250,250,250,0.3) 100%);
-	background-image: -webkit-linear-gradient(bottom, rgba(0,0,0,0.1) 0%, rgba(250,250,250,0.3) 100%);
-	background-image: -ms-linear-gradient(bottom, rgba(0,0,0,0.1) 0%, rgba(250,250,250,0.3) 100%);
-	background-image: linear-gradient(bottom, rgba(0,0,0,0.1) 0%, rgba(250,250,250,0.3) 100%);
-	<?php } else { ?>
 	background: rgb(<?php echo $colorbacktitle1; ?>);
-	<?php } ?>
 
     background-repeat: repeat-x;
     color: rgb(<?php echo $colortexttitle; ?>);

From 849fe880cd23ea49afc97dc9b9685cade52cb14b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 11 May 2017 14:39:13 +0200
Subject: [PATCH 314/505] Update resources

---
 doc/images/{README => README.md} |  14 +++++++++++---
 doc/images/dolibarr_logo.jpg     | Bin 17733 -> 23963 bytes
 doc/images/dolibarr_logo.png     | Bin 37626 -> 29999 bytes
 3 files changed, 11 insertions(+), 3 deletions(-)
 rename doc/images/{README => README.md} (66%)
 mode change 100644 => 100755 doc/images/dolibarr_logo.png

diff --git a/doc/images/README b/doc/images/README.md
similarity index 66%
rename from doc/images/README
rename to doc/images/README.md
index 7b6a051aada..798cf599b4c 100644
--- a/doc/images/README
+++ b/doc/images/README.md
@@ -1,8 +1,16 @@
-README (English)
+# README (English)
 --------------------------------
 
-* Most screen captures and icons are Dolibarr contributions, however,
-some icons are from http://led24.de/iconset/. This is original README file for this source:
+
+* Screen captures and icons are Dolibarr contributions
+
+
+* Most logos were created by Dolibarr developers. You may find sources of them on:
+
+https://github.com/Dolibarr/foundation
+
+
+* Few icons are from http://led24.de/iconset/. This is original README file for this source:
 -------------------------------------------------------
 You can do whatever you want with these icons (use on web or in desktop applications) as long as you don’t pass them off as your own and remove this readme file. A credit statement and a link back to
 http://led24.de/iconset/ or http://led24.de/ would be appreciated.
diff --git a/doc/images/dolibarr_logo.jpg b/doc/images/dolibarr_logo.jpg
index 6025ca9d201dc72982a495d45a98c793564e5aad..69de0129523f551ae32ce2e5c8122c8873b36880 100644
GIT binary patch
literal 23963
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

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

diff --git a/doc/images/dolibarr_logo.png b/doc/images/dolibarr_logo.png
old mode 100644
new mode 100755
index f2614471f7e6b5d115d8d28600b766f0e2313842..8edd0660e60d8b2e9551aff18ab83c074667a5c8
GIT binary patch
literal 29999
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

literal 37626
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
WOOBQ$zPw`q0000<MNUMnLSTY1Q_Wuh


From 74af1223de2ee82d35d9913635cec63e0579f839 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 12 May 2017 11:26:24 +0200
Subject: [PATCH 315/505] Fix company id for US

---
 htdocs/langs/en_US/companies.lang | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang
index a8485b1ec6e..3ff6395f158 100644
--- a/htdocs/langs/en_US/companies.lang
+++ b/htdocs/langs/en_US/companies.lang
@@ -232,6 +232,12 @@ ProfId3TN=Prof Id 3 (Douane code)
 ProfId4TN=Prof Id 4 (BAN)
 ProfId5TN=-
 ProfId6TN=-
+ProfId1US=Prof Id
+ProfId2US=-
+ProfId3US=-
+ProfId4US=-
+ProfId5US=-
+ProfId6US=-
 ProfId1RU=Prof Id 1 (OGRN)
 ProfId2RU=Prof Id 2 (INN)
 ProfId3RU=Prof Id 3 (KPP)

From 80b0d911547375346ba2a29b560644d21dfd7548 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 12 May 2017 12:12:04 +0200
Subject: [PATCH 316/505] More complete demo

---
 .../11/photos/ldestailleur_200x200.png        | Bin 0 -> 49440 bytes
 .../thumbs/ldestailleur_200x200_mini.png      | Bin 0 -> 10635 bytes
 .../thumbs/ldestailleur_200x200_small.png     | Bin 0 -> 39105 bytes
 .../societe/contact/12/photos/Einstein.jpg    | Bin 0 -> 14737 bytes
 .../12/photos/thumbs/Einstein_mini.jpg        | Bin 0 -> 1626 bytes
 .../12/photos/thumbs/Einstein_small.jpg       | Bin 0 -> 4080 bytes
 dev/initdemo/mysqldump_dolibarr_5.0.0.sql     |  91 +++++++++---------
 7 files changed, 46 insertions(+), 45 deletions(-)
 create mode 100644 dev/initdemo/documents_demo/societe/contact/11/photos/ldestailleur_200x200.png
 create mode 100644 dev/initdemo/documents_demo/societe/contact/11/photos/thumbs/ldestailleur_200x200_mini.png
 create mode 100644 dev/initdemo/documents_demo/societe/contact/11/photos/thumbs/ldestailleur_200x200_small.png
 create mode 100644 dev/initdemo/documents_demo/societe/contact/12/photos/Einstein.jpg
 create mode 100644 dev/initdemo/documents_demo/societe/contact/12/photos/thumbs/Einstein_mini.jpg
 create mode 100644 dev/initdemo/documents_demo/societe/contact/12/photos/thumbs/Einstein_small.jpg

diff --git a/dev/initdemo/documents_demo/societe/contact/11/photos/ldestailleur_200x200.png b/dev/initdemo/documents_demo/societe/contact/11/photos/ldestailleur_200x200.png
new file mode 100644
index 0000000000000000000000000000000000000000..a5bb2af60a43a172d115e8ea50300a13ea00fa50
GIT binary patch
literal 49440
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

literal 0
HcmV?d00001

diff --git a/dev/initdemo/documents_demo/societe/contact/11/photos/thumbs/ldestailleur_200x200_mini.png b/dev/initdemo/documents_demo/societe/contact/11/photos/thumbs/ldestailleur_200x200_mini.png
new file mode 100644
index 0000000000000000000000000000000000000000..c553f3a26f6eb895ebca1f74abfb0ca9961edfd4
GIT binary patch
literal 10635
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

literal 0
HcmV?d00001

diff --git a/dev/initdemo/documents_demo/societe/contact/11/photos/thumbs/ldestailleur_200x200_small.png b/dev/initdemo/documents_demo/societe/contact/11/photos/thumbs/ldestailleur_200x200_small.png
new file mode 100644
index 0000000000000000000000000000000000000000..deaccf65f1df561fe49c10e593fa57c88328def1
GIT binary patch
literal 39105
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
V9AahYs38CV002ovPDHLkV1h!!YbXE!

literal 0
HcmV?d00001

diff --git a/dev/initdemo/documents_demo/societe/contact/12/photos/Einstein.jpg b/dev/initdemo/documents_demo/societe/contact/12/photos/Einstein.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..ada3022ca83cf5718b784299d8b2802823a2b3c1
GIT binary patch
literal 14737
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
K7K8e?^gjT0f19fS

literal 0
HcmV?d00001

diff --git a/dev/initdemo/documents_demo/societe/contact/12/photos/thumbs/Einstein_mini.jpg b/dev/initdemo/documents_demo/societe/contact/12/photos/thumbs/Einstein_mini.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..819973dcdd6661d2fa9af5f8a6bfcc8baa4302bb
GIT binary patch
literal 1626
zcmbW!do<K}6aet=&pdu(vS!9}DEu-;!;%@9@*2}5kFlv(HDpVrOdd_%q8F12TkS9j
zF(Q@9QJY5|=@dee<ds*^c$9L8GD&UCj@>=&Is4b{-h1v}_nv$1=UjQO`~@JoIdh!>
z1VLcCB7yuXuygcu;&^TFv_<&4%!5LA^O0!AaymkbiU<_&5w4pH;<nMr1&Ow%o0uVC
zQ9D8cBV!R3Vok@(2Y@5MqA^$u8jHnXVHk_U6Y+RuWxR$eL4~NTK_+W!Xld!{Q4Mq#
zQ<i9HA!Z20c$tZ*iH?Ce-JC|J(oARzOCT7A@i@FX9<NT*)zYQ?=aAn6Bph%B7AVLN
zD3Kr(36kFj1^_@91$9CDS3pWA#l0|28NWy|P)-C&5DKM)Mqw~$v|{>@q7Tp{jM`EL
z2dnO}12zoPuuMqJ$5GbYtkv{vpEg>tGhC>Q*U~2I=u(ZB(M(LOm@8LV+t@m;b#iub
z<+}aowP`cY+h>dauH6CrJ%K?Hkx|hx`(xvdCLTL}A}Ki~O?)Q(Y({3*xeEmsFI_IY
za`jqCX<7NLipr|$y88PKjZF`lA9i$hbwBOt?dz8gkBpAJd^P_1&CI*^v$79!ALl<U
zxFCS~ll4vZ4;M+{QbMCqXn4T|Da9xXMM7hiGO%hK4|qqIx}jwPPGe1K{>@rt$_meE
z&7I-xcr7C<DRpLn_J{1>!G!-y_6_#8s~@PKAjR`gB)|sJm4fuf133{}Li?T_%A(xz
z+AKOaza#hV*K3bE6H6!5>Q(H94)9r^&2L|E+!3MG{K4+3J++C`m#SCY?TDw>XiG1z
zXm%(Nh(pj9Y^<L@;SVsoxEGou)F?(Vq|><V$z)bt{E9EZ6%`$+bNUW~eAfo*%fw5X
z`7x)&Qzbb&<LzVaAJ+e2&p=DbFQG<LN#{iegjg5pe9!r<e(w9&XCFFR=mn4471`8u
zYStB8-=ASXpJR^sY1%u4sAz}P@yu_nQS}-P<;+^!M_WP44dq>_7h>sFz3Evct~P>0
zzux)&sXd`+%eLMG0kt1i8Rx}Rw#FXMux%}N4)8GY3r^e2IVnkUX3t2svMQ36s|6Q&
zKVTqdLj1(3lI+UnaqG9M^{-i|(dsAtPfo{+=kdk*w=u6;2-%hVql=d_rknzv2T{$t
z8ViwV#Gjc^@G))py=Qfqgi9=S-pU($@b&c+8xP)G7q;q9t_)YTB_*Z3R^BUIRww-+
zWQbgAUpy_AbT(cQM~EwO)7eS>B{f23<@P1Ol0cE=5f)ABRS$lwemBTf?N%M>Jz?-A
zXjaeB{q*p}hR#V|iyAxkbExGNPLp1E!x7W>`(TGQUB3{!#jgOWXYMHFU29yuug{z6
zV|PAE@+;#*oRjNBHDj*!htELauqf!ey^&RI>t-GLWJSdV4e`zINL|M?!Eqw7Ogdy&
z70zK^4Sv~7#8koH^G29a^o9`7F?yCEx~D4J`F4GmAW~MHJT$p(-fNv;cT;7p>_Y=@
zM(@@{QKM)wg}L!joNA36oOdgZ8j%?GZ1c4XZV3>QzxrrS$4@p9CT8dI2wJCS0|(7=
zrKL9oM!f#melDypn<(k^@tfEZ)!(EOoXv|iJ<N;Tg&vuC9NfUXF|RTt2R--Ce<EGa
zsM|(4XIxgE-juc1_;Wz?J>*oe4l99NEAv>bFFv#@&AV8VNpG>rb}Ss+h~*k&8k~xW
zWBu$?k6!wGq~C#WW3RN{-J^YJnef5T5LZP-J&b@DQs0U@*<XU*Z%8)KIQ&c;n5#=Q
z&m@oD9)E0?sFxs{n9alf<~?&!mERE=xarYp_ebOVQDj`9jQtZYt$j5*2XONiRlksf
z<iR}l>){PwaNUyS2izS7hkdiHE%>5X?vlO%{aA}ym<3+-^rz62?o3@`wU(_MNby~p
qXXaluVw4lncEhc}NdrK+>D_y5!#Q|&TjATbC;oEK?W6(8`+f(?^tBZL

literal 0
HcmV?d00001

diff --git a/dev/initdemo/documents_demo/societe/contact/12/photos/thumbs/Einstein_small.jpg b/dev/initdemo/documents_demo/societe/contact/12/photos/thumbs/Einstein_small.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..35babcdfe88422a35fa1e8cf56659f86d38628c2
GIT binary patch
literal 4080
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

literal 0
HcmV?d00001

diff --git a/dev/initdemo/mysqldump_dolibarr_5.0.0.sql b/dev/initdemo/mysqldump_dolibarr_5.0.0.sql
index 0f616362d91..4c31fd25e8a 100644
--- a/dev/initdemo/mysqldump_dolibarr_5.0.0.sql
+++ b/dev/initdemo/mysqldump_dolibarr_5.0.0.sql
@@ -1,8 +1,8 @@
--- MySQL dump 10.13  Distrib 5.5.54, for debian-linux-gnu (x86_64)
+-- MySQL dump 10.13  Distrib 5.5.55, for debian-linux-gnu (x86_64)
 --
 -- Host: localhost    Database: dolibarr_5
 -- ------------------------------------------------------
--- Server version	5.5.54-0ubuntu0.14.04.1
+-- Server version	5.5.55-0ubuntu0.14.04.1
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -236,7 +236,7 @@ CREATE TABLE `llx_actioncomm` (
   KEY `idx_actioncomm_fk_contact` (`fk_contact`),
   KEY `idx_actioncomm_fk_element` (`fk_element`),
   KEY `idx_actioncomm_code` (`code`)
-) ENGINE=InnoDB AUTO_INCREMENT=327 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=328 DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -245,7 +245,7 @@ CREATE TABLE `llx_actioncomm` (
 
 LOCK TABLES `llx_actioncomm` WRITE;
 /*!40000 ALTER TABLE `llx_actioncomm` DISABLE KEYS */;
-INSERT INTO `llx_actioncomm` VALUES (1,NULL,1,'2010-07-08 14:21:44','2010-07-08 14:21:44',50,NULL,'Company AAA and Co added into Dolibarr','2010-07-08 14:21:44','2014-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,1,100,'',NULL,NULL,'Company AAA and Co added into Dolibarr\nAuthor: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(2,NULL,1,'2010-07-08 14:23:48','2010-07-08 14:23:48',50,NULL,'Company Belin SARL added into Dolibarr','2010-07-08 14:23:48','2014-12-21 12:50:33',1,NULL,NULL,2,NULL,0,1,NULL,1,0,0,1,100,'',NULL,NULL,'Company Belin SARL added into Dolibarr\nAuthor: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(3,NULL,1,'2010-07-08 22:42:12','2010-07-08 22:42:12',50,NULL,'Company Spanish Comp added into Dolibarr','2010-07-08 22:42:12','2014-12-21 12:50:33',1,NULL,NULL,3,NULL,0,1,NULL,1,0,0,1,100,'',NULL,NULL,'Company Spanish Comp added into Dolibarr\nAuthor: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(4,NULL,1,'2010-07-08 22:48:18','2010-07-08 22:48:18',50,NULL,'Company Prospector Vaalen added into Dolibarr','2010-07-08 22:48:18','2014-12-21 12:50:33',1,NULL,NULL,4,NULL,0,1,NULL,1,0,0,1,100,'',NULL,NULL,'Company Prospector Vaalen added into Dolibarr\nAuthor: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(5,NULL,1,'2010-07-08 23:22:57','2010-07-08 23:22:57',50,NULL,'Company NoCountry Co added into Dolibarr','2010-07-08 23:22:57','2014-12-21 12:50:33',1,NULL,NULL,5,NULL,0,1,NULL,1,0,0,1,100,'',NULL,NULL,'Company NoCountry Co added into Dolibarr\nAuthor: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(6,NULL,1,'2010-07-09 00:15:09','2010-07-09 00:15:09',50,NULL,'Company Swiss customer added into Dolibarr','2010-07-09 00:15:09','2014-12-21 12:50:33',1,NULL,NULL,6,NULL,0,1,NULL,1,0,0,1,100,'',NULL,NULL,'Company Swiss customer added into Dolibarr\nAuthor: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(7,NULL,1,'2010-07-09 01:24:26','2010-07-09 01:24:26',50,NULL,'Company Generic customer added into Dolibarr','2010-07-09 01:24:26','2014-12-21 12:50:33',1,NULL,NULL,7,NULL,0,1,NULL,1,0,0,1,100,'',NULL,NULL,'Company Generic customer added into Dolibarr\nAuthor: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(8,NULL,1,'2010-07-10 14:54:27','2010-07-10 14:54:27',50,NULL,'Société Client salon ajoutée dans Dolibarr','2010-07-10 14:54:27','2014-12-21 12:50:33',1,NULL,NULL,8,NULL,0,1,NULL,1,0,0,1,100,'',NULL,NULL,'Société Client salon ajoutée dans Dolibarr\nAuteur: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(9,NULL,1,'2010-07-10 14:54:44','2010-07-10 14:54:44',50,NULL,'Société Client salon invidivdu ajoutée dans Doliba','2010-07-10 14:54:44','2014-12-21 12:50:33',1,NULL,NULL,9,NULL,0,1,NULL,1,0,0,1,100,'',NULL,NULL,'Société Client salon invidivdu ajoutée dans Dolibarr\nAuteur: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(10,NULL,1,'2010-07-10 14:56:10','2010-07-10 14:56:10',50,NULL,'Facture FA1007-0001 validée dans Dolibarr','2010-07-10 14:56:10','2014-12-21 12:50:33',1,NULL,NULL,9,NULL,0,1,NULL,1,0,0,1,100,'',NULL,NULL,'Facture FA1007-0001 validée dans Dolibarr\nAuteur: admin',1,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(11,NULL,1,'2010-07-10 14:58:53','2010-07-10 14:58:53',50,NULL,'Facture FA1007-0001 validée dans Dolibarr','2010-07-10 14:58:53','2014-12-21 12:50:33',1,NULL,NULL,9,NULL,0,1,NULL,1,0,0,1,100,'',NULL,NULL,'Facture FA1007-0001 validée dans Dolibarr\nAuteur: admin',1,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(12,NULL,1,'2010-07-10 15:00:55','2010-07-10 15:00:55',50,NULL,'Facture FA1007-0001 passée à payée dans Dolibarr','2010-07-10 15:00:55','2014-12-21 12:50:33',1,NULL,NULL,9,NULL,0,1,NULL,1,0,0,1,100,'',NULL,NULL,'Facture FA1007-0001 passée à payée dans Dolibarr\nAuteur: admin',1,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(13,NULL,1,'2010-07-10 15:13:08','2010-07-10 15:13:08',50,NULL,'Société Smith Vick ajoutée dans Dolibarr','2010-07-10 15:13:08','2014-12-21 12:50:33',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,1,100,'',NULL,NULL,'Société Smith Vick ajoutée dans Dolibarr\nAuteur: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(14,NULL,1,'2010-07-10 15:21:00','2010-07-10 16:21:00',5,NULL,'RDV avec mon chef','2010-07-10 15:21:48','2010-07-10 13:21:48',1,NULL,NULL,NULL,NULL,0,1,NULL,NULL,0,0,1,0,'',3600,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(15,NULL,1,'2010-07-10 18:18:16','2010-07-10 18:18:16',50,NULL,'Contrat CONTRAT1 validé dans Dolibarr','2010-07-10 18:18:16','2014-12-21 12:50:33',1,NULL,NULL,2,NULL,0,1,NULL,1,0,0,1,100,'',NULL,NULL,'Contrat CONTRAT1 validé dans Dolibarr\nAuteur: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(16,NULL,1,'2010-07-10 18:35:57','2010-07-10 18:35:57',50,NULL,'Société Mon client ajoutée dans Dolibarr','2010-07-10 18:35:57','2014-12-21 12:50:33',1,NULL,NULL,11,NULL,0,1,NULL,1,0,0,1,100,'',NULL,NULL,'Société Mon client ajoutée dans Dolibarr\nAuteur: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(17,NULL,1,'2010-07-11 16:18:08','2010-07-11 16:18:08',50,NULL,'Société Dupont Alain ajoutée dans Dolibarr','2010-07-11 16:18:08','2014-12-21 12:50:33',1,NULL,NULL,12,NULL,0,1,NULL,1,0,0,1,100,'',NULL,NULL,'Société Dupont Alain ajoutée dans Dolibarr\nAuteur: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(18,NULL,1,'2010-07-11 17:11:00','2010-07-11 17:17:00',5,NULL,'Rendez-vous','2010-07-11 17:11:22','2010-07-11 15:11:22',1,NULL,NULL,NULL,NULL,0,1,NULL,NULL,0,0,1,0,'gfgdfgdf',360,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(19,NULL,1,'2010-07-11 17:13:20','2010-07-11 17:13:20',50,NULL,'Société Vendeur de chips ajoutée dans Dolibarr','2010-07-11 17:13:20','2014-12-21 12:50:33',1,NULL,NULL,13,NULL,0,1,NULL,1,0,0,1,100,'',NULL,NULL,'Société Vendeur de chips ajoutée dans Dolibarr\nAuteur: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(20,NULL,1,'2010-07-11 17:15:42','2010-07-11 17:15:42',50,NULL,'Commande CF1007-0001 validée','2010-07-11 17:15:42','2014-12-21 12:50:33',1,NULL,NULL,13,NULL,0,1,NULL,1,0,0,1,100,'',NULL,NULL,'Commande CF1007-0001 validée\nAuteur: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(21,NULL,1,'2010-07-11 18:47:33','2010-07-11 18:47:33',50,NULL,'Commande CF1007-0002 validée','2010-07-11 18:47:33','2014-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,1,100,'',NULL,NULL,'Commande CF1007-0002 validée\nAuteur: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(22,NULL,1,'2010-07-18 11:36:18','2010-07-18 11:36:18',50,NULL,'Proposition PR1007-0003 validée','2010-07-18 11:36:18','2014-12-21 12:50:33',1,NULL,NULL,4,NULL,0,1,NULL,1,0,0,1,100,'',NULL,NULL,'Proposition PR1007-0003 validée\nAuteur: admin',3,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(23,NULL,1,'2011-07-18 20:49:58','2011-07-18 20:49:58',50,NULL,'Invoice FA1007-0002 validated in Dolibarr','2011-07-18 20:49:58','2014-12-21 12:50:33',1,NULL,NULL,2,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Invoice FA1007-0002 validated in Dolibarr\nAuthor: admin',2,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(24,NULL,1,'2011-07-28 01:37:00',NULL,1,NULL,'Phone call','2011-07-28 01:37:48','2011-07-27 23:37:48',1,NULL,NULL,NULL,2,0,1,NULL,NULL,0,0,1,-1,'',NULL,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(25,NULL,1,'2011-08-01 02:31:24','2011-08-01 02:31:24',50,NULL,'Company mmm added into Dolibarr','2011-08-01 02:31:24','2014-12-21 12:50:33',1,NULL,NULL,15,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Company mmm added into Dolibarr\nAuthor: admin',15,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(26,NULL,1,'2011-08-01 02:31:43','2011-08-01 02:31:43',50,NULL,'Company ppp added into Dolibarr','2011-08-01 02:31:43','2014-12-21 12:50:33',1,NULL,NULL,16,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Company ppp added into Dolibarr\nAuthor: admin',16,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(27,NULL,1,'2011-08-01 02:41:26','2011-08-01 02:41:26',50,NULL,'Company aaa added into Dolibarr','2011-08-01 02:41:26','2014-12-21 12:50:33',1,NULL,NULL,17,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Company aaa added into Dolibarr\nAuthor: admin',17,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(28,NULL,1,'2011-08-01 03:34:11','2011-08-01 03:34:11',50,NULL,'Invoice FA1108-0003 validated in Dolibarr','2011-08-01 03:34:11','2014-12-21 12:50:33',1,NULL,NULL,7,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Invoice FA1108-0003 validated in Dolibarr\nAuthor: admin',5,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(29,NULL,1,'2011-08-01 03:34:11','2011-08-01 03:34:11',50,NULL,'Invoice FA1108-0003 validated in Dolibarr','2011-08-01 03:34:11','2014-12-21 12:50:33',1,NULL,NULL,7,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Invoice FA1108-0003 changed to paid in Dolibarr\nAuthor: admin',5,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(30,NULL,1,'2011-08-06 20:33:54','2011-08-06 20:33:54',50,NULL,'Invoice FA1108-0004 validated in Dolibarr','2011-08-06 20:33:54','2014-12-21 12:50:33',1,NULL,NULL,7,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Invoice FA1108-0004 validated in Dolibarr\nAuthor: admin',6,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(31,NULL,1,'2011-08-06 20:33:54','2011-08-06 20:33:54',50,NULL,'Invoice FA1108-0004 validated in Dolibarr','2011-08-06 20:33:54','2014-12-21 12:50:33',1,NULL,NULL,7,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Invoice FA1108-0004 changed to paid in Dolibarr\nAuthor: admin',6,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(38,NULL,1,'2011-08-08 02:41:55','2011-08-08 02:41:55',50,NULL,'Invoice FA1108-0005 validated in Dolibarr','2011-08-08 02:41:55','2014-12-21 12:50:33',1,NULL,NULL,2,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Invoice FA1108-0005 validated in Dolibarr\nAuthor: admin',8,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(40,NULL,1,'2011-08-08 02:53:40','2011-08-08 02:53:40',50,NULL,'Invoice FA1108-0005 changed to paid in Dolibarr','2011-08-08 02:53:40','2014-12-21 12:50:33',1,NULL,NULL,2,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Invoice FA1108-0005 changed to paid in Dolibarr\nAuthor: admin',8,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(41,NULL,1,'2011-08-08 02:54:05','2011-08-08 02:54:05',50,NULL,'Invoice FA1007-0002 changed to paid in Dolibarr','2011-08-08 02:54:05','2014-12-21 12:50:33',1,NULL,NULL,2,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Invoice FA1007-0002 changed to paid in Dolibarr\nAuthor: admin',2,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(42,NULL,1,'2011-08-08 02:55:04','2011-08-08 02:55:04',50,NULL,'Invoice FA1107-0006 validated in Dolibarr','2011-08-08 02:55:04','2014-12-21 12:50:33',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Invoice FA1107-0006 validated in Dolibarr\nAuthor: admin',3,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(43,NULL,1,'2011-08-08 02:55:26','2011-08-08 02:55:26',50,NULL,'Invoice FA1108-0007 validated in Dolibarr','2011-08-08 02:55:26','2014-12-21 12:50:33',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Invoice FA1108-0007 validated in Dolibarr\nAuthor: admin',9,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(44,NULL,1,'2011-08-08 02:55:58','2011-08-08 02:55:58',50,NULL,'Invoice FA1107-0006 changed to paid in Dolibarr','2011-08-08 02:55:58','2014-12-21 12:50:33',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Invoice FA1107-0006 changed to paid in Dolibarr\nAuthor: admin',3,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(45,NULL,1,'2011-08-08 03:04:22','2011-08-08 03:04:22',50,NULL,'Order CO1108-0001 validated','2011-08-08 03:04:22','2014-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Order CO1108-0001 validated\nAuthor: admin',5,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(46,NULL,1,'2011-08-08 13:59:09','2011-08-08 13:59:09',50,NULL,'Order CO1107-0002 validated','2011-08-08 13:59:10','2014-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Order CO1107-0002 validated\nAuthor: admin',1,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(47,NULL,1,'2011-08-08 14:24:18','2011-08-08 14:24:18',50,NULL,'Proposal PR1007-0001 validated','2011-08-08 14:24:18','2014-12-21 12:50:33',1,NULL,NULL,2,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Proposal PR1007-0001 validated\nAuthor: admin',1,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(48,NULL,1,'2011-08-08 14:24:24','2011-08-08 14:24:24',50,NULL,'Proposal PR1108-0004 validated','2011-08-08 14:24:24','2014-12-21 12:50:33',1,NULL,NULL,17,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Proposal PR1108-0004 validated\nAuthor: admin',4,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(49,NULL,1,'2011-08-08 15:04:37','2011-08-08 15:04:37',50,NULL,'Order CF1108-0003 validated','2011-08-08 15:04:37','2014-12-21 12:50:33',1,NULL,NULL,17,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Order CF1108-0003 validated\nAuthor: admin',6,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(50,NULL,1,'2012-12-08 17:56:47','2012-12-08 17:56:47',40,NULL,'Facture AV1212-0001 validée dans Dolibarr','2012-12-08 17:56:47','2014-12-21 12:50:33',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture AV1212-0001 validée dans Dolibarr\nAuteur: admin',10,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(51,NULL,1,'2012-12-08 17:57:11','2012-12-08 17:57:11',40,NULL,'Facture AV1212-0001 validée dans Dolibarr','2012-12-08 17:57:11','2014-12-21 12:50:33',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture AV1212-0001 validée dans Dolibarr\nAuteur: admin',10,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(52,NULL,1,'2012-12-08 17:58:27','2012-12-08 17:58:27',40,NULL,'Facture FA1212-0008 validée dans Dolibarr','2012-12-08 17:58:27','2014-12-21 12:50:33',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA1212-0008 validée dans Dolibarr\nAuteur: admin',11,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(53,NULL,1,'2012-12-08 18:20:49','2012-12-08 18:20:49',40,NULL,'Facture AV1212-0002 validée dans Dolibarr','2012-12-08 18:20:49','2014-12-21 12:50:33',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture AV1212-0002 validée dans Dolibarr\nAuteur: admin',12,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(54,NULL,1,'2012-12-09 18:35:07','2012-12-09 18:35:07',40,NULL,'Facture AV1212-0002 passée à payée dans Dolibarr','2012-12-09 18:35:07','2014-12-21 12:50:33',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture AV1212-0002 passée à payée dans Dolibarr\nAuteur: admin',12,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(55,NULL,1,'2012-12-09 20:14:42','2012-12-09 20:14:42',40,NULL,'Société doe john ajoutée dans Dolibarr','2012-12-09 20:14:42','2014-12-21 12:50:33',1,NULL,NULL,18,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Société doe john ajoutée dans Dolibarr\nAuteur: admin',18,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(56,NULL,1,'2012-12-12 18:54:19','2012-12-12 18:54:19',40,NULL,'Facture FA1212-0009 validée dans Dolibarr','2012-12-12 18:54:19','2014-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA1212-0009 validée dans Dolibarr\nAuteur: admin',55,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(121,NULL,1,'2012-12-06 10:00:00',NULL,50,NULL,'aaab','2012-12-21 17:48:08','2012-12-21 16:54:07',3,1,NULL,NULL,NULL,0,3,NULL,NULL,1,0,1,-1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(122,NULL,1,'2012-12-21 18:09:52','2012-12-21 18:09:52',40,NULL,'Facture client FA1007-0001 envoyée par EMail','2012-12-21 18:09:52','2014-12-21 12:50:33',1,NULL,NULL,9,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Mail envoyé par Firstname SuperAdminName <bidon@destailleur.fr> à laurent@destailleur.fr.\nSujet du mail: Envoi facture FA1007-0001\nCorps du mail:\nVeuillez trouver ci-joint la facture FA1007-0001\r\n\r\nVous pouvez cliquer sur le lien sécurisé ci-dessous pour effectuer votre paiement via Paypal\r\n\r\nhttp://localhost/dolibarrnew/public/paypal/newpayment.php?source=invoice&ref=FA1007-0001&securekey=50c82fab36bb3b6aa83e2a50691803b2\r\n\r\nCordialement',1,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(123,NULL,1,'2013-01-06 13:13:57','2013-01-06 13:13:57',40,NULL,'Facture 16 validée dans Dolibarr','2013-01-06 13:13:57','2014-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture 16 validée dans Dolibarr\nAuteur: admin',16,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(124,NULL,1,'2013-01-12 12:23:05','2013-01-12 12:23:05',40,NULL,'Patient aaa ajouté','2013-01-12 12:23:05','2014-12-21 12:50:33',1,NULL,NULL,19,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Patient aaa ajouté\nAuteur: admin',19,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(125,NULL,1,'2013-01-12 12:52:20','2013-01-12 12:52:20',40,NULL,'Patient pppoo ajouté','2013-01-12 12:52:20','2014-12-21 12:50:33',1,NULL,NULL,20,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Patient pppoo ajouté\nAuteur: admin',20,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(127,NULL,1,'2013-01-19 18:22:48','2013-01-19 18:22:48',40,NULL,'Facture FS1301-0001 validée dans Dolibarr','2013-01-19 18:22:48','2014-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FS1301-0001 validée dans Dolibarr\nAuteur: admin',148,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(128,NULL,1,'2013-01-19 18:31:10','2013-01-19 18:31:10',40,NULL,'Facture FA6801-0010 validée dans Dolibarr','2013-01-19 18:31:10','2014-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA6801-0010 validée dans Dolibarr\nAuteur: admin',150,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(129,NULL,1,'2013-01-19 18:31:10','2013-01-19 18:31:10',40,NULL,'Facture FA6801-0010 passée à payée dans Dolibarr','2013-01-19 18:31:10','2014-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA6801-0010 passée à payée dans Dolibarr\nAuteur: admin',150,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(130,NULL,1,'2013-01-19 18:31:58','2013-01-19 18:31:58',40,NULL,'Facture FS1301-0002 validée dans Dolibarr','2013-01-19 18:31:58','2014-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FS1301-0002 validée dans Dolibarr\nAuteur: admin',151,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(131,NULL,1,'2013-01-19 18:31:58','2013-01-19 18:31:58',40,NULL,'Facture FS1301-0002 passée à payée dans Dolibarr','2013-01-19 18:31:58','2014-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FS1301-0002 passée à payée dans Dolibarr\nAuteur: admin',151,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(132,NULL,1,'2013-01-23 15:07:54','2013-01-23 15:07:54',50,NULL,'Consultation 24 saisie (aaa)','2013-01-23 15:07:54','2014-12-21 12:50:33',1,NULL,NULL,19,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Consultation 24 saisie (aaa)\nAuteur: admin',24,'cabinetmed_cons',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(133,NULL,1,'2013-01-23 16:56:58','2013-01-23 16:56:58',40,NULL,'Patient pa ajouté','2013-01-23 16:56:58','2014-12-21 12:50:33',1,NULL,NULL,21,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Patient pa ajouté\nAuteur: admin',21,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(134,NULL,1,'2013-01-23 17:34:00',NULL,50,NULL,'bbcv','2013-01-23 17:35:21','2013-01-23 16:35:21',1,NULL,1,2,NULL,0,1,NULL,NULL,0,0,1,-1,'',NULL,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(135,NULL,1,'2013-02-12 15:54:00','2013-02-12 15:54:00',40,NULL,'Facture FA1212-0011 validée dans Dolibarr','2013-02-12 15:54:37','2014-12-21 12:50:33',1,1,NULL,7,NULL,0,1,NULL,1,0,0,1,50,NULL,NULL,NULL,'Facture FA1212-0011 valid&eacute;e dans Dolibarr<br />\r\nAuteur: admin',13,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(136,NULL,1,'2013-02-12 17:06:51','2013-02-12 17:06:51',40,NULL,'Commande CO1107-0003 validée','2013-02-12 17:06:51','2014-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Commande CO1107-0003 validée\nAuteur: admin',2,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(137,NULL,1,'2013-02-17 16:22:10','2013-02-17 16:22:10',40,NULL,'Proposition PR1302-0009 validée','2013-02-17 16:22:10','2014-12-21 12:50:33',1,NULL,NULL,19,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Proposition PR1302-0009 validée\nAuteur: admin',9,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(138,NULL,1,'2013-02-17 16:27:00','2013-02-17 16:27:00',40,NULL,'Facture FA1302-0012 validée dans Dolibarr','2013-02-17 16:27:00','2014-12-21 12:50:33',1,NULL,NULL,18,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA1302-0012 validée dans Dolibarr\nAuteur: admin',152,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(139,NULL,1,'2013-02-17 16:27:29','2013-02-17 16:27:29',40,NULL,'Proposition PR1302-0010 validée','2013-02-17 16:27:29','2014-12-21 12:50:33',1,NULL,NULL,18,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Proposition PR1302-0010 validée\nAuteur: admin',11,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(140,NULL,1,'2013-02-17 18:27:56','2013-02-17 18:27:56',40,NULL,'Commande CO1107-0004 validée','2013-02-17 18:27:56','2014-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Commande CO1107-0004 validée\nAuteur: admin',3,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(141,NULL,1,'2013-02-17 18:38:14','2013-02-17 18:38:14',40,NULL,'Commande CO1302-0005 validée','2013-02-17 18:38:14','2014-12-21 12:50:33',1,NULL,NULL,18,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Commande CO1302-0005 validée\nAuteur: admin',7,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(142,NULL,1,'2013-02-26 22:57:50','2013-02-26 22:57:50',40,NULL,'Company pppp added into Dolibarr','2013-02-26 22:57:50','2014-12-21 12:50:33',1,NULL,NULL,22,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Company pppp added into Dolibarr\nAuthor: admin',22,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(143,NULL,1,'2013-02-26 22:58:13','2013-02-26 22:58:13',40,NULL,'Company ttttt added into Dolibarr','2013-02-26 22:58:13','2014-12-21 12:50:33',1,NULL,NULL,23,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Company ttttt added into Dolibarr\nAuthor: admin',23,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(144,NULL,1,'2013-02-27 10:00:00','2013-02-27 19:20:00',5,NULL,'Rendez-vous','2013-02-27 19:20:53','2013-02-27 18:20:53',1,NULL,NULL,NULL,NULL,0,1,NULL,1,0,0,1,-1,'',33600,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(145,NULL,1,'2013-02-27 19:28:00',NULL,2,NULL,'fdsfsd','2013-02-27 19:28:48','2013-02-27 18:29:53',1,1,NULL,NULL,NULL,0,1,NULL,1,0,0,1,-1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(146,NULL,1,'2013-03-06 10:05:07','2013-03-06 10:05:07',40,NULL,'Contrat (PROV3) validé dans Dolibarr','2013-03-06 10:05:07','2014-12-21 12:50:33',1,NULL,NULL,19,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Contrat (PROV3) validé dans Dolibarr\nAuteur: admin',3,'contract',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(147,NULL,1,'2013-03-06 16:43:37','2013-03-06 16:43:37',40,NULL,'Facture FA1307-0013 validée dans Dolibarr','2013-03-06 16:43:37','2014-12-21 12:50:33',1,NULL,NULL,12,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA1307-0013 validée dans Dolibarr\nAuteur: admin',158,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(148,NULL,1,'2013-03-06 16:44:12','2013-03-06 16:44:12',40,NULL,'Facture FA1407-0014 validée dans Dolibarr','2013-03-06 16:44:12','2014-12-21 12:50:33',1,NULL,NULL,12,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA1407-0014 validée dans Dolibarr\nAuteur: admin',159,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(149,NULL,1,'2013-03-06 16:47:48','2013-03-06 16:47:48',40,NULL,'Facture FA1507-0015 validée dans Dolibarr','2013-03-06 16:47:48','2014-12-21 12:50:33',1,NULL,NULL,12,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA1507-0015 validée dans Dolibarr\nAuteur: admin',160,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(150,NULL,1,'2013-03-06 16:48:16','2013-03-06 16:48:16',40,NULL,'Facture FA1607-0016 validée dans Dolibarr','2013-03-06 16:48:16','2014-12-21 12:50:33',1,NULL,NULL,12,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA1607-0016 validée dans Dolibarr\nAuteur: admin',161,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(151,NULL,1,'2013-03-06 17:13:59','2013-03-06 17:13:59',40,NULL,'Société smith smith ajoutée dans Dolibarr','2013-03-06 17:13:59','2014-12-21 12:50:33',1,NULL,NULL,24,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Société smith smith ajoutée dans Dolibarr\nAuteur: admin',24,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(152,NULL,1,'2013-03-08 10:02:22','2013-03-08 10:02:22',40,NULL,'Proposition (PROV12) validée dans Dolibarr','2013-03-08 10:02:22','2014-12-21 12:50:33',1,NULL,NULL,23,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Proposition (PROV12) validée dans Dolibarr\nAuteur: admin',12,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(203,NULL,1,'2013-03-09 19:39:27','2013-03-09 19:39:27',40,'AC_ORDER_SUPPLIER_VALIDATE','Commande CF1303-0004 validée','2013-03-09 19:39:27','2014-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Commande CF1303-0004 validée\nAuteur: admin',13,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(204,NULL,1,'2013-03-10 15:47:37','2013-03-10 15:47:37',40,'AC_COMPANY_CREATE','Patient créé','2013-03-10 15:47:37','2014-12-21 12:50:33',1,NULL,NULL,25,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Patient créé\nAuteur: admin',25,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(205,NULL,1,'2013-03-10 15:57:32','2013-03-10 15:57:32',40,'AC_COMPANY_CREATE','Tiers créé','2013-03-10 15:57:32','2014-12-21 12:50:33',1,NULL,NULL,26,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Tiers créé\nAuteur: admin',26,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(206,NULL,1,'2013-03-10 15:58:28','2013-03-10 15:58:28',40,'AC_BILL_VALIDATE','Facture FA1303-0017 validée','2013-03-10 15:58:28','2014-12-21 12:50:33',1,NULL,NULL,26,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA1303-0017 validée\nAuteur: admin',208,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(207,NULL,1,'2013-03-19 09:38:10','2013-03-19 09:38:10',40,'AC_BILL_VALIDATE','Facture FA1303-0018 validée','2013-03-19 09:38:10','2014-12-21 12:50:33',1,NULL,NULL,19,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA1303-0018 validée\nAuteur: admin',209,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(208,NULL,1,'2013-03-20 14:30:11','2013-03-20 14:30:11',40,'AC_BILL_VALIDATE','Facture FA1107-0019 validée','2013-03-20 14:30:11','2014-12-21 12:50:33',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA1107-0019 validée\nAuteur: admin',210,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(209,NULL,1,'2013-03-22 09:40:25','2013-03-22 09:40:25',40,'AC_BILL_VALIDATE','Facture FA1303-0020 validée','2013-03-22 09:40:25','2014-12-21 12:50:33',1,NULL,NULL,19,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA1303-0020 validée\nAuteur: admin',211,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(210,NULL,1,'2013-03-23 17:16:25','2013-03-23 17:16:25',40,'AC_BILL_VALIDATE','Facture FA1303-0020 validée','2013-03-23 17:16:25','2014-12-21 12:50:33',1,NULL,NULL,19,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA1303-0020 validée\nAuteur: admin',211,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(211,NULL,1,'2013-03-23 18:08:27','2013-03-23 18:08:27',40,'AC_BILL_VALIDATE','Facture FA1307-0013 validée','2013-03-23 18:08:27','2014-12-21 12:50:33',1,NULL,NULL,12,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA1307-0013 validée\nAuteur: admin',158,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(212,NULL,1,'2013-03-24 15:54:00','2013-03-24 15:54:00',40,'AC_BILL_VALIDATE','Facture FA1212-0021 validée','2013-03-24 15:54:00','2014-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA1212-0021 validée\nAuteur: admin',32,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(213,NULL,1,'2013-11-07 01:02:39','2013-11-07 01:02:39',40,'AC_COMPANY_CREATE','Third party created','2013-11-07 01:02:39','2014-12-21 12:50:33',1,NULL,NULL,27,NULL,0,1,0,1,0,0,1,-1,'',NULL,NULL,'Third party created\nAuthor: admin',27,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(214,NULL,1,'2013-11-07 01:05:22','2013-11-07 01:05:22',40,'AC_COMPANY_CREATE','Third party created','2013-11-07 01:05:22','2014-12-21 12:50:33',1,NULL,NULL,28,NULL,0,1,0,1,0,0,1,-1,'',NULL,NULL,'Third party created\nAuthor: admin',28,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(215,NULL,1,'2013-11-07 01:07:07','2013-11-07 01:07:07',40,'AC_COMPANY_CREATE','Third party created','2013-11-07 01:07:07','2014-12-21 12:50:33',1,NULL,NULL,29,NULL,0,1,0,1,0,0,1,-1,'',NULL,NULL,'Third party created\nAuthor: admin',29,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(216,NULL,1,'2013-11-07 01:07:58','2013-11-07 01:07:58',40,'AC_COMPANY_CREATE','Third party created','2013-11-07 01:07:58','2014-12-21 12:50:33',1,NULL,NULL,30,NULL,0,1,0,1,0,0,1,-1,'',NULL,NULL,'Third party created\nAuthor: admin',30,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(217,NULL,1,'2013-11-07 01:10:09','2013-11-07 01:10:09',40,'AC_COMPANY_CREATE','Third party created','2013-11-07 01:10:09','2014-12-21 12:50:33',1,NULL,NULL,31,NULL,0,1,0,1,0,0,1,-1,'',NULL,NULL,'Third party created\nAuthor: admin',31,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(218,NULL,1,'2013-11-07 01:15:57','2013-11-07 01:15:57',40,'AC_COMPANY_CREATE','Third party created','2013-11-07 01:15:57','2014-12-21 12:50:33',1,NULL,NULL,32,NULL,0,1,0,1,0,0,1,-1,'',NULL,NULL,'Third party created\nAuthor: admin',32,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(219,NULL,1,'2013-11-07 01:16:51','2013-11-07 01:16:51',40,'AC_COMPANY_CREATE','Third party created','2013-11-07 01:16:51','2014-12-21 12:50:33',1,NULL,NULL,33,NULL,0,1,0,1,0,0,1,-1,'',NULL,NULL,'Third party created\nAuthor: admin',33,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(220,NULL,1,'2014-03-02 17:24:04','2014-03-02 17:24:04',40,'AC_BILL_VALIDATE','Invoice FA1302-0022 validated','2014-03-02 17:24:04','2014-12-21 12:50:33',1,NULL,NULL,18,NULL,0,1,0,1,0,0,1,-1,'',NULL,NULL,'Invoice FA1302-0022 validated\nAuthor: admin',157,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(221,NULL,1,'2014-03-02 17:24:28','2014-03-02 17:24:28',40,'AC_BILL_VALIDATE','Invoice FA1303-0020 validated','2014-03-02 17:24:28','2014-12-21 12:50:33',1,NULL,NULL,19,NULL,0,1,0,1,0,0,1,-1,'',NULL,NULL,'Invoice FA1303-0020 validated\nAuthor: admin',211,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(222,NULL,1,'2014-03-05 10:00:00','2014-03-05 10:00:00',5,NULL,'RDV John','2014-03-02 19:54:48','2014-03-02 18:55:29',1,1,NULL,NULL,NULL,0,1,0,NULL,0,0,1,-1,NULL,NULL,NULL,'gfdgdfgdf',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(223,NULL,1,'2014-03-13 10:00:00','2014-03-17 00:00:00',50,NULL,'Congress','2014-03-02 19:55:11','2014-03-02 18:55:11',1,NULL,NULL,NULL,NULL,0,1,0,NULL,0,0,1,-1,'',309600,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(224,NULL,1,'2014-03-14 10:00:00',NULL,1,NULL,'Call john','2014-03-02 19:55:56','2014-03-02 18:55:56',1,NULL,NULL,NULL,NULL,0,1,0,NULL,0,0,1,0,'',NULL,NULL,'tttt',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(225,NULL,1,'2014-03-02 20:11:31','2014-03-02 20:11:31',40,'AC_BILL_UNVALIDATE','Invoice FA1303-0020 go back to draft status','2014-03-02 20:11:31','2014-12-21 12:50:33',1,NULL,NULL,19,NULL,0,1,0,1,0,0,1,-1,'',NULL,NULL,'Invoice FA1303-0020 go back to draft status\nAuthor: admin',211,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(226,NULL,1,'2014-03-02 20:13:39','2014-03-02 20:13:39',40,'AC_BILL_VALIDATE','Invoice FA1303-0020 validated','2014-03-02 20:13:39','2014-12-21 12:50:33',1,NULL,NULL,19,NULL,0,1,0,1,0,0,1,-1,'',NULL,NULL,'Invoice FA1303-0020 validated\nAuthor: admin',211,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(227,NULL,1,'2014-03-03 19:20:10','2014-03-03 19:20:10',40,'AC_BILL_VALIDATE','Invoice FA1212-0023 validated','2014-03-03 19:20:10','2014-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,0,1,0,0,1,-1,'',NULL,NULL,'Invoice FA1212-0023 validated\nAuthor: admin',33,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(228,NULL,1,'2014-03-03 19:20:25','2014-03-03 19:20:25',40,'AC_BILL_CANCEL','Invoice FA1212-0023 canceled in Dolibarr','2014-03-03 19:20:25','2014-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,0,1,0,0,1,-1,'',NULL,NULL,'Invoice FA1212-0023 canceled in Dolibarr\nAuthor: admin',33,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(229,NULL,1,'2014-03-03 19:20:56','2014-03-03 19:20:56',40,'AC_BILL_VALIDATE','Invoice AV1403-0003 validated','2014-03-03 19:20:56','2014-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,0,1,0,0,1,-1,'',NULL,NULL,'Invoice AV1403-0003 validated\nAuthor: admin',212,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(230,NULL,1,'2014-03-03 19:21:29','2014-03-03 19:21:29',40,'AC_BILL_UNVALIDATE','Invoice AV1403-0003 go back to draft status','2014-03-03 19:21:29','2014-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,0,1,0,0,1,-1,'',NULL,NULL,'Invoice AV1403-0003 go back to draft status\nAuthor: admin',212,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(231,NULL,1,'2014-03-03 19:22:16','2014-03-03 19:22:16',40,'AC_BILL_VALIDATE','Invoice AV1303-0003 validated','2014-03-03 19:22:16','2014-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,0,1,0,0,1,-1,'',NULL,NULL,'Invoice AV1303-0003 validated\nAuthor: admin',213,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(232,NULL,1,'2016-01-22 18:54:39','2016-01-22 18:54:39',40,'AC_OTH_AUTO','Invoice 16 validated','2016-01-22 18:54:39','2016-01-22 17:54:39',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Invoice 16 validated\nAuthor: admin',16,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(233,NULL,1,'2016-01-22 18:54:46','2016-01-22 18:54:46',40,'AC_OTH_AUTO','Invoice 16 validated','2016-01-22 18:54:46','2016-01-22 17:54:46',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Invoice 16 validated\nAuthor: admin',16,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(234,NULL,1,'2016-07-05 10:00:00','2016-07-05 11:19:00',5,'AC_RDV','Meeting with my boss','2016-07-31 18:19:48','2016-07-31 14:19:48',12,NULL,NULL,NULL,NULL,0,12,1,NULL,0,0,1,-1,'',4740,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(235,NULL,1,'2016-07-13 00:00:00','2016-07-14 23:59:59',50,'AC_OTH','Trip at Las Vegas','2016-07-31 18:20:36','2016-07-31 14:20:36',12,NULL,4,NULL,2,0,12,1,NULL,0,1,1,-1,'',172799,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(236,NULL,1,'2016-07-29 10:00:00',NULL,4,'AC_EMAIL','Remind to send an email','2016-07-31 18:21:04','2016-07-31 14:21:04',12,NULL,NULL,NULL,NULL,0,4,0,NULL,0,0,1,-1,'',NULL,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(237,NULL,1,'2016-07-01 10:00:00',NULL,1,'AC_TEL','Phone call with Mr Vaalen','2016-07-31 18:22:04','2016-07-31 14:22:04',12,NULL,6,4,NULL,0,13,0,NULL,0,0,1,-1,'',NULL,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(238,NULL,1,'2016-08-02 10:00:00','2016-08-02 12:00:00',5,'AC_RDV','Meeting on radium','2016-08-01 01:15:50','2016-07-31 21:15:50',12,NULL,8,10,10,0,12,1,NULL,0,0,1,-1,'',7200,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(239,NULL,1,'2017-01-29 21:49:33','2017-01-29 21:49:33',40,'AC_OTH_AUTO','Proposal PR1302-0007 validated','2017-01-29 21:49:33','2017-01-29 17:49:33',12,NULL,NULL,19,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Proposal PR1302-0007 validated\nAuthor: admin',7,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(240,NULL,1,'2017-01-31 20:52:00',NULL,1,'AC_TEL','Call the boss','2017-01-31 20:52:10','2017-01-31 16:52:25',12,12,6,NULL,NULL,0,12,1,NULL,0,0,1,-1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(242,NULL,1,'2017-02-01 18:52:04','2017-02-01 18:52:04',40,'AC_OTH_AUTO','Order CF1007-0001 validated','2017-02-01 18:52:04','2017-02-01 14:52:04',12,NULL,NULL,13,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Order CF1007-0001 validated\nAuthor: admin',1,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(243,NULL,1,'2017-02-01 18:52:04','2017-02-01 18:52:04',40,'AC_OTH_AUTO','Order CF1007-0001 approved','2017-02-01 18:52:04','2017-02-01 14:52:04',12,NULL,NULL,13,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Order CF1007-0001 approved\nAuthor: admin',1,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(245,NULL,1,'2017-02-01 18:52:32','2017-02-01 18:52:32',40,'AC_OTH_AUTO','Supplier order CF1007-0001 submited','2017-02-01 18:52:32','2017-02-01 14:52:32',12,NULL,NULL,13,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Supplier order CF1007-0001 submited\nAuthor: admin',1,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(249,NULL,1,'2017-02-01 18:54:01','2017-02-01 18:54:01',40,'AC_OTH_AUTO','Supplier order CF1007-0001 received','2017-02-01 18:54:01','2017-02-01 14:54:01',12,NULL,NULL,13,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Supplier order CF1007-0001 received \nAuthor: admin',1,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(250,NULL,1,'2017-02-01 18:54:42','2017-02-01 18:54:42',40,'AC_OTH_AUTO','Email sent by MyBigCompany To mycustomer@example.com','2017-02-01 18:54:42','2017-02-01 14:54:42',12,NULL,NULL,13,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Sender: MyBigCompany &lt;myemail@mybigcompany.com&gt;<br>\nReceiver(s): mycustomer@example.com<br>\nEMail topic: Submission of order CF1007-0001<br>\nEmail body:<br>\nYou will find here our order CF1007-0001<br />\r\n<br />\r\nSincerely<br>\n<br>\nAttached files and documents: CF1007-0001.pdf',1,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(251,NULL,1,'2017-02-01 19:02:21','2017-02-01 19:02:21',40,'AC_OTH_AUTO','Invoice SI1702-0001 validated','2017-02-01 19:02:21','2017-02-01 15:02:21',12,NULL,5,13,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Invoice SI1702-0001 validated\nAuthor: admin',20,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(252,NULL,1,'2017-02-12 23:17:04','2017-02-12 23:17:04',40,'AC_OTH_AUTO','Patient créé','2017-02-12 23:17:04','2017-02-12 19:17:04',12,NULL,NULL,26,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Patient créé\nAuthor: admin',26,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(253,NULL,1,'2017-02-12 23:18:33','2017-02-12 23:18:33',40,'AC_OTH_AUTO','Consultation 2 recorded (aaa)','2017-02-12 23:18:33','2017-02-12 19:18:33',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Consultation 2 recorded (aaa)\nAuthor: admin',2,'cabinetmed_cons',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(254,NULL,1,'2017-02-15 23:28:41','2017-02-15 23:28:41',40,'AC_OTH_AUTO','Order CO7001-0005 validated','2017-02-15 23:28:41','2017-02-15 22:28:41',12,NULL,NULL,4,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Order CO7001-0005 validated\nAuthor: admin',7,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(255,NULL,1,'2017-02-15 23:28:56','2017-02-15 23:28:56',40,'AC_OTH_AUTO','Order CO7001-0006 validated','2017-02-15 23:28:56','2017-02-15 22:28:56',12,NULL,NULL,4,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Order CO7001-0006 validated\nAuthor: admin',8,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(256,NULL,1,'2017-02-15 23:34:33','2017-02-15 23:34:33',40,'AC_OTH_AUTO','Order CO7001-0007 validated','2017-02-15 23:34:33','2017-02-15 22:34:33',12,NULL,NULL,3,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Order CO7001-0007 validated\nAuthor: admin',9,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(257,NULL,1,'2017-02-15 23:35:03','2017-02-15 23:35:03',40,'AC_OTH_AUTO','Order CO7001-0008 validated','2017-02-15 23:35:03','2017-02-15 22:35:03',12,NULL,NULL,3,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Order CO7001-0008 validated\nAuthor: admin',10,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(263,NULL,1,'2017-02-15 23:50:34','2017-02-15 23:50:34',40,'AC_OTH_AUTO','Order CO7001-0005 validated','2017-02-15 23:50:34','2017-02-15 22:50:34',12,NULL,NULL,4,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Order CO7001-0005 validated\nAuthor: admin',17,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(264,NULL,1,'2017-02-15 23:51:23','2017-02-15 23:51:23',40,'AC_OTH_AUTO','Order CO7001-0006 validated','2017-02-15 23:51:23','2017-02-15 22:51:23',12,NULL,NULL,7,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Order CO7001-0006 validated\nAuthor: admin',18,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(265,NULL,1,'2017-02-15 23:54:51','2017-02-15 23:54:51',40,'AC_OTH_AUTO','Order CO7001-0007 validated','2017-02-15 23:54:51','2017-02-15 22:54:51',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Order CO7001-0007 validated\nAuthor: admin',19,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(266,NULL,1,'2017-02-15 23:55:52','2017-02-15 23:55:52',40,'AC_OTH_AUTO','Order CO7001-0007 validated','2017-02-15 23:55:52','2017-02-15 22:55:52',12,NULL,NULL,4,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Order CO7001-0007 validated\nAuthor: admin',20,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(267,NULL,1,'2017-02-16 00:03:44','2017-02-16 00:03:44',40,'AC_OTH_AUTO','Order CO7001-0008 validated','2017-02-16 00:03:44','2017-02-15 23:03:44',12,NULL,NULL,4,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Order CO7001-0008 validated\nAuthor: admin',29,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(268,NULL,1,'2017-02-16 00:05:01','2017-02-16 00:05:01',40,'AC_OTH_AUTO','Order CO7001-0009 validated','2017-02-16 00:05:01','2017-02-15 23:05:01',12,NULL,NULL,11,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Order CO7001-0009 validated\nAuthor: admin',34,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(269,NULL,1,'2017-02-16 00:05:01','2017-02-16 00:05:01',40,'AC_OTH_AUTO','Order CO7001-0010 validated','2017-02-16 00:05:01','2017-02-15 23:05:01',12,NULL,NULL,3,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Order CO7001-0010 validated\nAuthor: admin',38,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(270,NULL,1,'2017-02-16 00:05:11','2017-02-16 00:05:11',40,'AC_OTH_AUTO','Order CO7001-0011 validated','2017-02-16 00:05:11','2017-02-15 23:05:11',12,NULL,NULL,11,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Order CO7001-0011 validated\nAuthor: admin',40,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(271,NULL,1,'2017-02-16 00:05:11','2017-02-16 00:05:11',40,'AC_OTH_AUTO','Order CO7001-0012 validated','2017-02-16 00:05:11','2017-02-15 23:05:11',12,NULL,NULL,10,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Order CO7001-0012 validated\nAuthor: admin',43,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(272,NULL,1,'2017-02-16 00:05:11','2017-02-16 00:05:11',40,'AC_OTH_AUTO','Order CO7001-0013 validated','2017-02-16 00:05:11','2017-02-15 23:05:11',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Order CO7001-0013 validated\nAuthor: admin',47,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(273,NULL,1,'2017-02-16 00:05:11','2017-02-16 00:05:11',40,'AC_OTH_AUTO','Order CO7001-0014 validated','2017-02-16 00:05:11','2017-02-15 23:05:11',12,NULL,NULL,4,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Order CO7001-0014 validated\nAuthor: admin',48,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(274,NULL,1,'2017-02-16 00:05:26','2017-02-16 00:05:26',40,'AC_OTH_AUTO','Order CO7001-0015 validated','2017-02-16 00:05:26','2017-02-15 23:05:26',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Order CO7001-0015 validated\nAuthor: admin',50,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(275,NULL,1,'2017-02-16 00:05:26','2017-02-16 00:05:26',40,'AC_OTH_AUTO','Order CO7001-0016 validated','2017-02-16 00:05:26','2017-02-15 23:05:26',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Order CO7001-0016 validated\nAuthor: admin',54,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(277,NULL,1,'2017-02-16 00:05:35','2017-02-16 00:05:35',40,'AC_OTH_AUTO','Order CO7001-0018 validated','2017-02-16 00:05:35','2017-02-15 23:05:35',12,NULL,NULL,19,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Order CO7001-0018 validated\nAuthor: admin',62,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(278,NULL,1,'2017-02-16 00:05:35','2017-02-16 00:05:35',40,'AC_OTH_AUTO','Order CO7001-0019 validated','2017-02-16 00:05:35','2017-02-15 23:05:35',12,NULL,NULL,3,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Order CO7001-0019 validated\nAuthor: admin',68,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(279,NULL,1,'2017-02-16 00:05:36','2017-02-16 00:05:36',40,'AC_OTH_AUTO','Order CO7001-0020 validated','2017-02-16 00:05:36','2017-02-15 23:05:36',12,NULL,NULL,6,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Order CO7001-0020 validated\nAuthor: admin',72,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(281,NULL,1,'2017-02-16 00:05:37','2017-02-16 00:05:37',40,'AC_OTH_AUTO','Order CO7001-0022 validated','2017-02-16 00:05:37','2017-02-15 23:05:37',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Order CO7001-0022 validated\nAuthor: admin',78,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(282,NULL,1,'2017-02-16 00:05:38','2017-02-16 00:05:38',40,'AC_OTH_AUTO','Order CO7001-0023 validated','2017-02-16 00:05:38','2017-02-15 23:05:38',12,NULL,NULL,11,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Order CO7001-0023 validated\nAuthor: admin',81,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(283,NULL,1,'2017-02-16 00:05:38','2017-02-16 00:05:38',40,'AC_OTH_AUTO','Order CO7001-0024 validated','2017-02-16 00:05:38','2017-02-15 23:05:38',12,NULL,NULL,26,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Order CO7001-0024 validated\nAuthor: admin',83,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(284,NULL,1,'2017-02-16 00:05:38','2017-02-16 00:05:38',40,'AC_OTH_AUTO','Order CO7001-0025 validated','2017-02-16 00:05:38','2017-02-15 23:05:38',12,NULL,NULL,2,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Order CO7001-0025 validated\nAuthor: admin',84,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(285,NULL,1,'2017-02-16 00:05:38','2017-02-16 00:05:38',40,'AC_OTH_AUTO','Order CO7001-0026 validated','2017-02-16 00:05:38','2017-02-15 23:05:38',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Order CO7001-0026 validated\nAuthor: admin',85,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(286,NULL,1,'2017-02-16 00:05:38','2017-02-16 00:05:38',40,'AC_OTH_AUTO','Order CO7001-0027 validated','2017-02-16 00:05:38','2017-02-15 23:05:38',12,NULL,NULL,10,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Order CO7001-0027 validated\nAuthor: admin',88,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(287,NULL,1,'2017-02-16 03:05:56','2017-02-16 03:05:56',40,'AC_OTH_AUTO','Commande CO7001-0016 classée Livrée','2017-02-16 03:05:56','2017-02-15 23:05:56',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Commande CO7001-0016 classée Livrée\nAuteur: admin',54,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(288,NULL,1,'2017-02-16 03:06:01','2017-02-16 03:06:01',40,'AC_OTH_AUTO','Commande CO7001-0016 classée Facturée','2017-02-16 03:06:01','2017-02-15 23:06:01',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Commande CO7001-0016 classée Facturée\nAuteur: admin',54,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(294,NULL,1,'2017-02-16 03:53:04','2017-02-16 03:53:04',40,'AC_OTH_AUTO','Commande CO7001-0021 validée','2017-02-16 03:53:04','2017-02-15 23:53:04',12,NULL,NULL,4,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Commande CO7001-0021 validée\nAuteur: admin',75,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(295,NULL,1,'2017-02-16 03:58:08','2017-02-16 03:58:08',40,'AC_OTH_AUTO','Expédition SH1702-0002 validée','2017-02-16 03:58:08','2017-02-15 23:58:08',12,NULL,NULL,4,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Expédition SH1702-0002 validée\nAuteur: admin',3,'shipping',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(296,NULL,1,'2017-02-16 04:12:29','2017-02-16 04:12:29',40,'AC_OTH_AUTO','Commande CO7001-0021 validée','2017-02-16 04:12:29','2017-02-16 00:12:29',12,NULL,NULL,4,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Commande CO7001-0021 validée\nAuteur: admin',75,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(297,NULL,1,'2017-02-16 04:14:20','2017-02-16 04:14:20',40,'AC_OTH_AUTO','Commande CO7001-0021 validée','2017-02-16 04:14:20','2017-02-16 00:14:20',12,NULL,NULL,4,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Commande CO7001-0021 validée\nAuteur: admin',75,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(298,NULL,1,'2017-02-16 01:44:58','2017-02-16 01:44:58',40,'AC_OTH_AUTO','Proposal PR1702-0009 validated','2017-02-16 01:44:58','2017-02-16 00:44:58',1,NULL,NULL,1,NULL,0,1,0,NULL,0,0,1,-1,'',NULL,NULL,'Proposal PR1702-0009 validated\nAuthor: aeinstein',11,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(299,NULL,1,'2017-02-16 01:45:44','2017-02-16 01:45:44',40,'AC_OTH_AUTO','Proposal PR1702-0010 validated','2017-02-16 01:45:44','2017-02-16 00:45:44',2,NULL,NULL,7,NULL,0,2,0,NULL,0,0,1,-1,'',NULL,NULL,'Proposal PR1702-0010 validated\nAuthor: demo',12,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(300,NULL,1,'2017-02-16 01:46:15','2017-02-16 01:46:15',40,'AC_OTH_AUTO','Proposal PR1702-0011 validated','2017-02-16 01:46:15','2017-02-16 00:46:15',1,NULL,NULL,26,NULL,0,1,0,NULL,0,0,1,-1,'',NULL,NULL,'Proposal PR1702-0011 validated\nAuthor: aeinstein',13,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(301,NULL,1,'2017-02-16 01:46:15','2017-02-16 01:46:15',40,'AC_OTH_AUTO','Proposal PR1702-0012 validated','2017-02-16 01:46:15','2017-02-16 00:46:15',2,NULL,NULL,3,NULL,0,2,0,NULL,0,0,1,-1,'',NULL,NULL,'Proposal PR1702-0012 validated\nAuthor: demo',14,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(302,NULL,1,'2017-02-16 01:46:15','2017-02-16 01:46:15',40,'AC_OTH_AUTO','Proposal PR1702-0013 validated','2017-02-16 01:46:15','2017-02-16 00:46:15',2,NULL,NULL,26,NULL,0,2,0,NULL,0,0,1,-1,'',NULL,NULL,'Proposal PR1702-0013 validated\nAuthor: demo',15,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(303,NULL,1,'2017-02-16 01:46:15','2017-02-16 01:46:15',40,'AC_OTH_AUTO','Proposal PR1702-0014 validated','2017-02-16 01:46:15','2017-02-16 00:46:15',2,NULL,NULL,1,NULL,0,2,0,NULL,0,0,1,-1,'',NULL,NULL,'Proposal PR1702-0014 validated\nAuthor: demo',16,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(304,NULL,1,'2017-02-16 01:46:15','2017-02-16 01:46:15',40,'AC_OTH_AUTO','Proposal PR1702-0015 validated','2017-02-16 01:46:15','2017-02-16 00:46:15',1,NULL,NULL,1,NULL,0,1,0,NULL,0,0,1,-1,'',NULL,NULL,'Proposal PR1702-0015 validated\nAuthor: aeinstein',17,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(305,NULL,1,'2017-02-16 01:46:15','2017-02-16 01:46:15',40,'AC_OTH_AUTO','Proposal PR1702-0016 validated','2017-02-16 01:46:15','2017-02-16 00:46:15',2,NULL,NULL,26,NULL,0,2,0,NULL,0,0,1,-1,'',NULL,NULL,'Proposal PR1702-0016 validated\nAuthor: demo',18,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(306,NULL,1,'2017-02-16 01:46:15','2017-02-16 01:46:15',40,'AC_OTH_AUTO','Proposal PR1702-0017 validated','2017-02-16 01:46:15','2017-02-16 00:46:15',2,NULL,NULL,12,NULL,0,2,0,NULL,0,0,1,-1,'',NULL,NULL,'Proposal PR1702-0017 validated\nAuthor: demo',19,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(307,NULL,1,'2017-02-16 01:46:15','2017-02-16 01:46:15',40,'AC_OTH_AUTO','Proposal PR1702-0018 validated','2017-02-16 01:46:15','2017-02-16 00:46:15',1,NULL,NULL,26,NULL,0,1,0,NULL,0,0,1,-1,'',NULL,NULL,'Proposal PR1702-0018 validated\nAuthor: aeinstein',20,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(308,NULL,1,'2017-02-16 01:46:15','2017-02-16 01:46:15',40,'AC_OTH_AUTO','Proposal PR1702-0019 validated','2017-02-16 01:46:15','2017-02-16 00:46:15',1,NULL,NULL,1,NULL,0,1,0,NULL,0,0,1,-1,'',NULL,NULL,'Proposal PR1702-0019 validated\nAuthor: aeinstein',21,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(309,NULL,1,'2017-02-16 01:46:15','2017-02-16 01:46:15',40,'AC_OTH_AUTO','Proposal PR1702-0020 validated','2017-02-16 01:46:15','2017-02-16 00:46:15',1,NULL,NULL,26,NULL,0,1,0,NULL,0,0,1,-1,'',NULL,NULL,'Proposal PR1702-0020 validated\nAuthor: aeinstein',22,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(310,NULL,1,'2017-02-16 01:46:17','2017-02-16 01:46:17',40,'AC_OTH_AUTO','Proposal PR1702-0021 validated','2017-02-16 01:46:17','2017-02-16 00:46:17',2,NULL,NULL,12,NULL,0,2,0,NULL,0,0,1,-1,'',NULL,NULL,'Proposal PR1702-0021 validated\nAuthor: demo',23,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(311,NULL,1,'2017-02-16 01:46:17','2017-02-16 01:46:17',40,'AC_OTH_AUTO','Proposal PR1702-0022 validated','2017-02-16 01:46:17','2017-02-16 00:46:17',2,NULL,NULL,7,NULL,0,2,0,NULL,0,0,1,-1,'',NULL,NULL,'Proposal PR1702-0022 validated\nAuthor: demo',24,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(312,NULL,1,'2017-02-16 01:46:17','2017-02-16 01:46:17',40,'AC_OTH_AUTO','Proposal PR1702-0023 validated','2017-02-16 01:46:17','2017-02-16 00:46:17',1,NULL,NULL,3,NULL,0,1,0,NULL,0,0,1,-1,'',NULL,NULL,'Proposal PR1702-0023 validated\nAuthor: aeinstein',25,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(313,NULL,1,'2017-02-16 01:46:18','2017-02-16 01:46:18',40,'AC_OTH_AUTO','Proposal PR1702-0024 validated','2017-02-16 01:46:18','2017-02-16 00:46:18',2,NULL,NULL,1,NULL,0,2,0,NULL,0,0,1,-1,'',NULL,NULL,'Proposal PR1702-0024 validated\nAuthor: demo',26,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(314,NULL,1,'2017-02-16 01:46:18','2017-02-16 01:46:18',40,'AC_OTH_AUTO','Proposal PR1702-0025 validated','2017-02-16 01:46:18','2017-02-16 00:46:18',1,NULL,NULL,6,NULL,0,1,0,NULL,0,0,1,-1,'',NULL,NULL,'Proposal PR1702-0025 validated\nAuthor: aeinstein',27,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(315,NULL,1,'2017-02-16 01:46:18','2017-02-16 01:46:18',40,'AC_OTH_AUTO','Proposal PR1702-0026 validated','2017-02-16 01:46:18','2017-02-16 00:46:18',2,NULL,NULL,19,NULL,0,2,0,NULL,0,0,1,-1,'',NULL,NULL,'Proposal PR1702-0026 validated\nAuthor: demo',28,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(316,NULL,1,'2017-02-16 01:46:18','2017-02-16 01:46:18',40,'AC_OTH_AUTO','Proposal PR1702-0027 validated','2017-02-16 01:46:18','2017-02-16 00:46:18',2,NULL,NULL,1,NULL,0,2,0,NULL,0,0,1,-1,'',NULL,NULL,'Proposal PR1702-0027 validated\nAuthor: demo',29,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(317,NULL,1,'2017-02-16 01:46:18','2017-02-16 01:46:18',40,'AC_OTH_AUTO','Proposal PR1702-0028 validated','2017-02-16 01:46:18','2017-02-16 00:46:18',2,NULL,NULL,1,NULL,0,2,0,NULL,0,0,1,-1,'',NULL,NULL,'Proposal PR1702-0028 validated\nAuthor: demo',30,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(318,NULL,1,'2017-02-16 01:46:18','2017-02-16 01:46:18',40,'AC_OTH_AUTO','Proposal PR1702-0029 validated','2017-02-16 01:46:18','2017-02-16 00:46:18',1,NULL,NULL,11,NULL,0,1,0,NULL,0,0,1,-1,'',NULL,NULL,'Proposal PR1702-0029 validated\nAuthor: aeinstein',31,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(319,NULL,1,'2017-02-16 01:46:18','2017-02-16 01:46:18',40,'AC_OTH_AUTO','Proposal PR1702-0030 validated','2017-02-16 01:46:18','2017-02-16 00:46:18',2,NULL,NULL,19,NULL,0,2,0,NULL,0,0,1,-1,'',NULL,NULL,'Proposal PR1702-0030 validated\nAuthor: demo',32,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(320,NULL,1,'2017-02-16 04:46:31','2017-02-16 04:46:31',40,'AC_OTH_AUTO','Proposition PR1702-0026 signée','2017-02-16 04:46:31','2017-02-16 00:46:31',12,NULL,NULL,19,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Proposition PR1702-0026 signée\nAuteur: admin',28,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(321,NULL,1,'2017-02-16 04:46:37','2017-02-16 04:46:37',40,'AC_OTH_AUTO','Proposition PR1702-0027 signée','2017-02-16 04:46:37','2017-02-16 00:46:37',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Proposition PR1702-0027 signée\nAuteur: admin',29,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(322,NULL,1,'2017-02-16 04:46:42','2017-02-16 04:46:42',40,'AC_OTH_AUTO','Proposition PR1702-0028 refusée','2017-02-16 04:46:42','2017-02-16 00:46:42',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Proposition PR1702-0028 refusée\nAuteur: admin',30,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(323,NULL,1,'2017-02-16 04:47:09','2017-02-16 04:47:09',40,'AC_OTH_AUTO','Proposition PR1702-0019 validée','2017-02-16 04:47:09','2017-02-16 00:47:09',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Proposition PR1702-0019 validée\nAuteur: admin',21,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(324,NULL,1,'2017-02-16 04:47:25','2017-02-16 04:47:25',40,'AC_OTH_AUTO','Proposition PR1702-0023 signée','2017-02-16 04:47:25','2017-02-16 00:47:25',12,NULL,NULL,3,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Proposition PR1702-0023 signée\nAuteur: admin',25,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(325,NULL,1,'2017-02-16 04:47:29','2017-02-16 04:47:29',40,'AC_OTH_AUTO','Proposition PR1702-0023 classée payée','2017-02-16 04:47:29','2017-02-16 00:47:29',12,NULL,NULL,3,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Proposition PR1702-0023 classée payée\nAuteur: admin',25,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(326,NULL,1,'2017-02-17 16:07:18','2017-02-17 16:07:18',40,'AC_OTH_AUTO','Proposition PR1702-0021 validée','2017-02-17 16:07:18','2017-02-17 12:07:18',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Proposition PR1702-0021 validée\nAuteur: admin',23,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+INSERT INTO `llx_actioncomm` VALUES (1,NULL,1,'2010-07-08 14:21:44','2010-07-08 14:21:44',50,NULL,'Company AAA and Co added into Dolibarr','2010-07-08 14:21:44','2014-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,1,100,'',NULL,NULL,'Company AAA and Co added into Dolibarr\nAuthor: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(2,NULL,1,'2010-07-08 14:23:48','2010-07-08 14:23:48',50,NULL,'Company Belin SARL added into Dolibarr','2010-07-08 14:23:48','2014-12-21 12:50:33',1,NULL,NULL,2,NULL,0,1,NULL,1,0,0,1,100,'',NULL,NULL,'Company Belin SARL added into Dolibarr\nAuthor: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(3,NULL,1,'2010-07-08 22:42:12','2010-07-08 22:42:12',50,NULL,'Company Spanish Comp added into Dolibarr','2010-07-08 22:42:12','2014-12-21 12:50:33',1,NULL,NULL,3,NULL,0,1,NULL,1,0,0,1,100,'',NULL,NULL,'Company Spanish Comp added into Dolibarr\nAuthor: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(4,NULL,1,'2010-07-08 22:48:18','2010-07-08 22:48:18',50,NULL,'Company Prospector Vaalen added into Dolibarr','2010-07-08 22:48:18','2014-12-21 12:50:33',1,NULL,NULL,4,NULL,0,1,NULL,1,0,0,1,100,'',NULL,NULL,'Company Prospector Vaalen added into Dolibarr\nAuthor: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(5,NULL,1,'2010-07-08 23:22:57','2010-07-08 23:22:57',50,NULL,'Company NoCountry Co added into Dolibarr','2010-07-08 23:22:57','2014-12-21 12:50:33',1,NULL,NULL,5,NULL,0,1,NULL,1,0,0,1,100,'',NULL,NULL,'Company NoCountry Co added into Dolibarr\nAuthor: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(6,NULL,1,'2010-07-09 00:15:09','2010-07-09 00:15:09',50,NULL,'Company Swiss customer added into Dolibarr','2010-07-09 00:15:09','2014-12-21 12:50:33',1,NULL,NULL,6,NULL,0,1,NULL,1,0,0,1,100,'',NULL,NULL,'Company Swiss customer added into Dolibarr\nAuthor: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(7,NULL,1,'2010-07-09 01:24:26','2010-07-09 01:24:26',50,NULL,'Company Generic customer added into Dolibarr','2010-07-09 01:24:26','2014-12-21 12:50:33',1,NULL,NULL,7,NULL,0,1,NULL,1,0,0,1,100,'',NULL,NULL,'Company Generic customer added into Dolibarr\nAuthor: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(8,NULL,1,'2010-07-10 14:54:27','2010-07-10 14:54:27',50,NULL,'Société Client salon ajoutée dans Dolibarr','2010-07-10 14:54:27','2014-12-21 12:50:33',1,NULL,NULL,8,NULL,0,1,NULL,1,0,0,1,100,'',NULL,NULL,'Société Client salon ajoutée dans Dolibarr\nAuteur: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(9,NULL,1,'2010-07-10 14:54:44','2010-07-10 14:54:44',50,NULL,'Société Client salon invidivdu ajoutée dans Doliba','2010-07-10 14:54:44','2014-12-21 12:50:33',1,NULL,NULL,9,NULL,0,1,NULL,1,0,0,1,100,'',NULL,NULL,'Société Client salon invidivdu ajoutée dans Dolibarr\nAuteur: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(10,NULL,1,'2010-07-10 14:56:10','2010-07-10 14:56:10',50,NULL,'Facture FA1007-0001 validée dans Dolibarr','2010-07-10 14:56:10','2014-12-21 12:50:33',1,NULL,NULL,9,NULL,0,1,NULL,1,0,0,1,100,'',NULL,NULL,'Facture FA1007-0001 validée dans Dolibarr\nAuteur: admin',1,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(11,NULL,1,'2010-07-10 14:58:53','2010-07-10 14:58:53',50,NULL,'Facture FA1007-0001 validée dans Dolibarr','2010-07-10 14:58:53','2014-12-21 12:50:33',1,NULL,NULL,9,NULL,0,1,NULL,1,0,0,1,100,'',NULL,NULL,'Facture FA1007-0001 validée dans Dolibarr\nAuteur: admin',1,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(12,NULL,1,'2010-07-10 15:00:55','2010-07-10 15:00:55',50,NULL,'Facture FA1007-0001 passée à payée dans Dolibarr','2010-07-10 15:00:55','2014-12-21 12:50:33',1,NULL,NULL,9,NULL,0,1,NULL,1,0,0,1,100,'',NULL,NULL,'Facture FA1007-0001 passée à payée dans Dolibarr\nAuteur: admin',1,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(13,NULL,1,'2010-07-10 15:13:08','2010-07-10 15:13:08',50,NULL,'Société Smith Vick ajoutée dans Dolibarr','2010-07-10 15:13:08','2014-12-21 12:50:33',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,1,100,'',NULL,NULL,'Société Smith Vick ajoutée dans Dolibarr\nAuteur: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(14,NULL,1,'2010-07-10 15:21:00','2010-07-10 16:21:00',5,NULL,'RDV avec mon chef','2010-07-10 15:21:48','2010-07-10 13:21:48',1,NULL,NULL,NULL,NULL,0,1,NULL,NULL,0,0,1,0,'',3600,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(15,NULL,1,'2010-07-10 18:18:16','2010-07-10 18:18:16',50,NULL,'Contrat CONTRAT1 validé dans Dolibarr','2010-07-10 18:18:16','2014-12-21 12:50:33',1,NULL,NULL,2,NULL,0,1,NULL,1,0,0,1,100,'',NULL,NULL,'Contrat CONTRAT1 validé dans Dolibarr\nAuteur: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(16,NULL,1,'2010-07-10 18:35:57','2010-07-10 18:35:57',50,NULL,'Société Mon client ajoutée dans Dolibarr','2010-07-10 18:35:57','2014-12-21 12:50:33',1,NULL,NULL,11,NULL,0,1,NULL,1,0,0,1,100,'',NULL,NULL,'Société Mon client ajoutée dans Dolibarr\nAuteur: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(17,NULL,1,'2010-07-11 16:18:08','2010-07-11 16:18:08',50,NULL,'Société Dupont Alain ajoutée dans Dolibarr','2010-07-11 16:18:08','2014-12-21 12:50:33',1,NULL,NULL,12,NULL,0,1,NULL,1,0,0,1,100,'',NULL,NULL,'Société Dupont Alain ajoutée dans Dolibarr\nAuteur: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(18,NULL,1,'2010-07-11 17:11:00','2010-07-11 17:17:00',5,NULL,'Rendez-vous','2010-07-11 17:11:22','2010-07-11 15:11:22',1,NULL,NULL,NULL,NULL,0,1,NULL,NULL,0,0,1,0,'gfgdfgdf',360,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(19,NULL,1,'2010-07-11 17:13:20','2010-07-11 17:13:20',50,NULL,'Société Vendeur de chips ajoutée dans Dolibarr','2010-07-11 17:13:20','2014-12-21 12:50:33',1,NULL,NULL,13,NULL,0,1,NULL,1,0,0,1,100,'',NULL,NULL,'Société Vendeur de chips ajoutée dans Dolibarr\nAuteur: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(20,NULL,1,'2010-07-11 17:15:42','2010-07-11 17:15:42',50,NULL,'Commande CF1007-0001 validée','2010-07-11 17:15:42','2014-12-21 12:50:33',1,NULL,NULL,13,NULL,0,1,NULL,1,0,0,1,100,'',NULL,NULL,'Commande CF1007-0001 validée\nAuteur: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(21,NULL,1,'2010-07-11 18:47:33','2010-07-11 18:47:33',50,NULL,'Commande CF1007-0002 validée','2010-07-11 18:47:33','2014-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,1,100,'',NULL,NULL,'Commande CF1007-0002 validée\nAuteur: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(22,NULL,1,'2010-07-18 11:36:18','2010-07-18 11:36:18',50,NULL,'Proposition PR1007-0003 validée','2010-07-18 11:36:18','2014-12-21 12:50:33',1,NULL,NULL,4,NULL,0,1,NULL,1,0,0,1,100,'',NULL,NULL,'Proposition PR1007-0003 validée\nAuteur: admin',3,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(23,NULL,1,'2011-07-18 20:49:58','2011-07-18 20:49:58',50,NULL,'Invoice FA1007-0002 validated in Dolibarr','2011-07-18 20:49:58','2014-12-21 12:50:33',1,NULL,NULL,2,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Invoice FA1007-0002 validated in Dolibarr\nAuthor: admin',2,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(24,NULL,1,'2011-07-28 01:37:00',NULL,1,NULL,'Phone call','2011-07-28 01:37:48','2011-07-27 23:37:48',1,NULL,NULL,NULL,2,0,1,NULL,NULL,0,0,1,-1,'',NULL,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(25,NULL,1,'2011-08-01 02:31:24','2011-08-01 02:31:24',50,NULL,'Company mmm added into Dolibarr','2011-08-01 02:31:24','2014-12-21 12:50:33',1,NULL,NULL,15,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Company mmm added into Dolibarr\nAuthor: admin',15,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(26,NULL,1,'2011-08-01 02:31:43','2011-08-01 02:31:43',50,NULL,'Company ppp added into Dolibarr','2011-08-01 02:31:43','2014-12-21 12:50:33',1,NULL,NULL,16,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Company ppp added into Dolibarr\nAuthor: admin',16,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(27,NULL,1,'2011-08-01 02:41:26','2011-08-01 02:41:26',50,NULL,'Company aaa added into Dolibarr','2011-08-01 02:41:26','2014-12-21 12:50:33',1,NULL,NULL,17,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Company aaa added into Dolibarr\nAuthor: admin',17,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(28,NULL,1,'2011-08-01 03:34:11','2011-08-01 03:34:11',50,NULL,'Invoice FA1108-0003 validated in Dolibarr','2011-08-01 03:34:11','2014-12-21 12:50:33',1,NULL,NULL,7,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Invoice FA1108-0003 validated in Dolibarr\nAuthor: admin',5,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(29,NULL,1,'2011-08-01 03:34:11','2011-08-01 03:34:11',50,NULL,'Invoice FA1108-0003 validated in Dolibarr','2011-08-01 03:34:11','2014-12-21 12:50:33',1,NULL,NULL,7,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Invoice FA1108-0003 changed to paid in Dolibarr\nAuthor: admin',5,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(30,NULL,1,'2011-08-06 20:33:54','2011-08-06 20:33:54',50,NULL,'Invoice FA1108-0004 validated in Dolibarr','2011-08-06 20:33:54','2014-12-21 12:50:33',1,NULL,NULL,7,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Invoice FA1108-0004 validated in Dolibarr\nAuthor: admin',6,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(31,NULL,1,'2011-08-06 20:33:54','2011-08-06 20:33:54',50,NULL,'Invoice FA1108-0004 validated in Dolibarr','2011-08-06 20:33:54','2014-12-21 12:50:33',1,NULL,NULL,7,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Invoice FA1108-0004 changed to paid in Dolibarr\nAuthor: admin',6,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(38,NULL,1,'2011-08-08 02:41:55','2011-08-08 02:41:55',50,NULL,'Invoice FA1108-0005 validated in Dolibarr','2011-08-08 02:41:55','2014-12-21 12:50:33',1,NULL,NULL,2,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Invoice FA1108-0005 validated in Dolibarr\nAuthor: admin',8,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(40,NULL,1,'2011-08-08 02:53:40','2011-08-08 02:53:40',50,NULL,'Invoice FA1108-0005 changed to paid in Dolibarr','2011-08-08 02:53:40','2014-12-21 12:50:33',1,NULL,NULL,2,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Invoice FA1108-0005 changed to paid in Dolibarr\nAuthor: admin',8,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(41,NULL,1,'2011-08-08 02:54:05','2011-08-08 02:54:05',50,NULL,'Invoice FA1007-0002 changed to paid in Dolibarr','2011-08-08 02:54:05','2014-12-21 12:50:33',1,NULL,NULL,2,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Invoice FA1007-0002 changed to paid in Dolibarr\nAuthor: admin',2,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(42,NULL,1,'2011-08-08 02:55:04','2011-08-08 02:55:04',50,NULL,'Invoice FA1107-0006 validated in Dolibarr','2011-08-08 02:55:04','2014-12-21 12:50:33',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Invoice FA1107-0006 validated in Dolibarr\nAuthor: admin',3,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(43,NULL,1,'2011-08-08 02:55:26','2011-08-08 02:55:26',50,NULL,'Invoice FA1108-0007 validated in Dolibarr','2011-08-08 02:55:26','2014-12-21 12:50:33',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Invoice FA1108-0007 validated in Dolibarr\nAuthor: admin',9,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(44,NULL,1,'2011-08-08 02:55:58','2011-08-08 02:55:58',50,NULL,'Invoice FA1107-0006 changed to paid in Dolibarr','2011-08-08 02:55:58','2014-12-21 12:50:33',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Invoice FA1107-0006 changed to paid in Dolibarr\nAuthor: admin',3,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(45,NULL,1,'2011-08-08 03:04:22','2011-08-08 03:04:22',50,NULL,'Order CO1108-0001 validated','2011-08-08 03:04:22','2014-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Order CO1108-0001 validated\nAuthor: admin',5,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(46,NULL,1,'2011-08-08 13:59:09','2011-08-08 13:59:09',50,NULL,'Order CO1107-0002 validated','2011-08-08 13:59:10','2014-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Order CO1107-0002 validated\nAuthor: admin',1,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(47,NULL,1,'2011-08-08 14:24:18','2011-08-08 14:24:18',50,NULL,'Proposal PR1007-0001 validated','2011-08-08 14:24:18','2014-12-21 12:50:33',1,NULL,NULL,2,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Proposal PR1007-0001 validated\nAuthor: admin',1,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(48,NULL,1,'2011-08-08 14:24:24','2011-08-08 14:24:24',50,NULL,'Proposal PR1108-0004 validated','2011-08-08 14:24:24','2014-12-21 12:50:33',1,NULL,NULL,17,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Proposal PR1108-0004 validated\nAuthor: admin',4,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(49,NULL,1,'2011-08-08 15:04:37','2011-08-08 15:04:37',50,NULL,'Order CF1108-0003 validated','2011-08-08 15:04:37','2014-12-21 12:50:33',1,NULL,NULL,17,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Order CF1108-0003 validated\nAuthor: admin',6,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(50,NULL,1,'2012-12-08 17:56:47','2012-12-08 17:56:47',40,NULL,'Facture AV1212-0001 validée dans Dolibarr','2012-12-08 17:56:47','2014-12-21 12:50:33',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture AV1212-0001 validée dans Dolibarr\nAuteur: admin',10,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(51,NULL,1,'2012-12-08 17:57:11','2012-12-08 17:57:11',40,NULL,'Facture AV1212-0001 validée dans Dolibarr','2012-12-08 17:57:11','2014-12-21 12:50:33',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture AV1212-0001 validée dans Dolibarr\nAuteur: admin',10,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(52,NULL,1,'2012-12-08 17:58:27','2012-12-08 17:58:27',40,NULL,'Facture FA1212-0008 validée dans Dolibarr','2012-12-08 17:58:27','2014-12-21 12:50:33',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA1212-0008 validée dans Dolibarr\nAuteur: admin',11,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(53,NULL,1,'2012-12-08 18:20:49','2012-12-08 18:20:49',40,NULL,'Facture AV1212-0002 validée dans Dolibarr','2012-12-08 18:20:49','2014-12-21 12:50:33',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture AV1212-0002 validée dans Dolibarr\nAuteur: admin',12,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(54,NULL,1,'2012-12-09 18:35:07','2012-12-09 18:35:07',40,NULL,'Facture AV1212-0002 passée à payée dans Dolibarr','2012-12-09 18:35:07','2014-12-21 12:50:33',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture AV1212-0002 passée à payée dans Dolibarr\nAuteur: admin',12,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(55,NULL,1,'2012-12-09 20:14:42','2012-12-09 20:14:42',40,NULL,'Société doe john ajoutée dans Dolibarr','2012-12-09 20:14:42','2014-12-21 12:50:33',1,NULL,NULL,18,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Société doe john ajoutée dans Dolibarr\nAuteur: admin',18,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(56,NULL,1,'2012-12-12 18:54:19','2012-12-12 18:54:19',40,NULL,'Facture FA1212-0009 validée dans Dolibarr','2012-12-12 18:54:19','2014-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA1212-0009 validée dans Dolibarr\nAuteur: admin',55,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(121,NULL,1,'2012-12-06 10:00:00',NULL,50,NULL,'aaab','2012-12-21 17:48:08','2012-12-21 16:54:07',3,1,NULL,NULL,NULL,0,3,NULL,NULL,1,0,1,-1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(122,NULL,1,'2012-12-21 18:09:52','2012-12-21 18:09:52',40,NULL,'Facture client FA1007-0001 envoyée par EMail','2012-12-21 18:09:52','2014-12-21 12:50:33',1,NULL,NULL,9,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Mail envoyé par Firstname SuperAdminName <bidon@destailleur.fr> à laurent@destailleur.fr.\nSujet du mail: Envoi facture FA1007-0001\nCorps du mail:\nVeuillez trouver ci-joint la facture FA1007-0001\r\n\r\nVous pouvez cliquer sur le lien sécurisé ci-dessous pour effectuer votre paiement via Paypal\r\n\r\nhttp://localhost/dolibarrnew/public/paypal/newpayment.php?source=invoice&ref=FA1007-0001&securekey=50c82fab36bb3b6aa83e2a50691803b2\r\n\r\nCordialement',1,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(123,NULL,1,'2013-01-06 13:13:57','2013-01-06 13:13:57',40,NULL,'Facture 16 validée dans Dolibarr','2013-01-06 13:13:57','2014-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture 16 validée dans Dolibarr\nAuteur: admin',16,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(124,NULL,1,'2013-01-12 12:23:05','2013-01-12 12:23:05',40,NULL,'Patient aaa ajouté','2013-01-12 12:23:05','2014-12-21 12:50:33',1,NULL,NULL,19,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Patient aaa ajouté\nAuteur: admin',19,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(125,NULL,1,'2013-01-12 12:52:20','2013-01-12 12:52:20',40,NULL,'Patient pppoo ajouté','2013-01-12 12:52:20','2014-12-21 12:50:33',1,NULL,NULL,20,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Patient pppoo ajouté\nAuteur: admin',20,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(127,NULL,1,'2013-01-19 18:22:48','2013-01-19 18:22:48',40,NULL,'Facture FS1301-0001 validée dans Dolibarr','2013-01-19 18:22:48','2014-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FS1301-0001 validée dans Dolibarr\nAuteur: admin',148,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(128,NULL,1,'2013-01-19 18:31:10','2013-01-19 18:31:10',40,NULL,'Facture FA6801-0010 validée dans Dolibarr','2013-01-19 18:31:10','2014-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA6801-0010 validée dans Dolibarr\nAuteur: admin',150,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(129,NULL,1,'2013-01-19 18:31:10','2013-01-19 18:31:10',40,NULL,'Facture FA6801-0010 passée à payée dans Dolibarr','2013-01-19 18:31:10','2014-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA6801-0010 passée à payée dans Dolibarr\nAuteur: admin',150,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(130,NULL,1,'2013-01-19 18:31:58','2013-01-19 18:31:58',40,NULL,'Facture FS1301-0002 validée dans Dolibarr','2013-01-19 18:31:58','2014-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FS1301-0002 validée dans Dolibarr\nAuteur: admin',151,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(131,NULL,1,'2013-01-19 18:31:58','2013-01-19 18:31:58',40,NULL,'Facture FS1301-0002 passée à payée dans Dolibarr','2013-01-19 18:31:58','2014-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FS1301-0002 passée à payée dans Dolibarr\nAuteur: admin',151,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(132,NULL,1,'2013-01-23 15:07:54','2013-01-23 15:07:54',50,NULL,'Consultation 24 saisie (aaa)','2013-01-23 15:07:54','2014-12-21 12:50:33',1,NULL,NULL,19,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Consultation 24 saisie (aaa)\nAuteur: admin',24,'cabinetmed_cons',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(133,NULL,1,'2013-01-23 16:56:58','2013-01-23 16:56:58',40,NULL,'Patient pa ajouté','2013-01-23 16:56:58','2014-12-21 12:50:33',1,NULL,NULL,21,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Patient pa ajouté\nAuteur: admin',21,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(134,NULL,1,'2013-01-23 17:34:00',NULL,50,NULL,'bbcv','2013-01-23 17:35:21','2013-01-23 16:35:21',1,NULL,1,2,NULL,0,1,NULL,NULL,0,0,1,-1,'',NULL,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(135,NULL,1,'2013-02-12 15:54:00','2013-02-12 15:54:00',40,NULL,'Facture FA1212-0011 validée dans Dolibarr','2013-02-12 15:54:37','2014-12-21 12:50:33',1,1,NULL,7,NULL,0,1,NULL,1,0,0,1,50,NULL,NULL,NULL,'Facture FA1212-0011 valid&eacute;e dans Dolibarr<br />\r\nAuteur: admin',13,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(136,NULL,1,'2013-02-12 17:06:51','2013-02-12 17:06:51',40,NULL,'Commande CO1107-0003 validée','2013-02-12 17:06:51','2014-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Commande CO1107-0003 validée\nAuteur: admin',2,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(137,NULL,1,'2013-02-17 16:22:10','2013-02-17 16:22:10',40,NULL,'Proposition PR1302-0009 validée','2013-02-17 16:22:10','2014-12-21 12:50:33',1,NULL,NULL,19,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Proposition PR1302-0009 validée\nAuteur: admin',9,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(138,NULL,1,'2013-02-17 16:27:00','2013-02-17 16:27:00',40,NULL,'Facture FA1302-0012 validée dans Dolibarr','2013-02-17 16:27:00','2014-12-21 12:50:33',1,NULL,NULL,18,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA1302-0012 validée dans Dolibarr\nAuteur: admin',152,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(139,NULL,1,'2013-02-17 16:27:29','2013-02-17 16:27:29',40,NULL,'Proposition PR1302-0010 validée','2013-02-17 16:27:29','2014-12-21 12:50:33',1,NULL,NULL,18,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Proposition PR1302-0010 validée\nAuteur: admin',11,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(140,NULL,1,'2013-02-17 18:27:56','2013-02-17 18:27:56',40,NULL,'Commande CO1107-0004 validée','2013-02-17 18:27:56','2014-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Commande CO1107-0004 validée\nAuteur: admin',3,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(141,NULL,1,'2013-02-17 18:38:14','2013-02-17 18:38:14',40,NULL,'Commande CO1302-0005 validée','2013-02-17 18:38:14','2014-12-21 12:50:33',1,NULL,NULL,18,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Commande CO1302-0005 validée\nAuteur: admin',7,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(142,NULL,1,'2013-02-26 22:57:50','2013-02-26 22:57:50',40,NULL,'Company pppp added into Dolibarr','2013-02-26 22:57:50','2014-12-21 12:50:33',1,NULL,NULL,22,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Company pppp added into Dolibarr\nAuthor: admin',22,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(143,NULL,1,'2013-02-26 22:58:13','2013-02-26 22:58:13',40,NULL,'Company ttttt added into Dolibarr','2013-02-26 22:58:13','2014-12-21 12:50:33',1,NULL,NULL,23,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Company ttttt added into Dolibarr\nAuthor: admin',23,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(144,NULL,1,'2013-02-27 10:00:00','2013-02-27 19:20:00',5,NULL,'Rendez-vous','2013-02-27 19:20:53','2013-02-27 18:20:53',1,NULL,NULL,NULL,NULL,0,1,NULL,1,0,0,1,-1,'',33600,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(145,NULL,1,'2013-02-27 19:28:00',NULL,2,NULL,'fdsfsd','2013-02-27 19:28:48','2013-02-27 18:29:53',1,1,NULL,NULL,NULL,0,1,NULL,1,0,0,1,-1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(146,NULL,1,'2013-03-06 10:05:07','2013-03-06 10:05:07',40,NULL,'Contrat (PROV3) validé dans Dolibarr','2013-03-06 10:05:07','2014-12-21 12:50:33',1,NULL,NULL,19,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Contrat (PROV3) validé dans Dolibarr\nAuteur: admin',3,'contract',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(147,NULL,1,'2013-03-06 16:43:37','2013-03-06 16:43:37',40,NULL,'Facture FA1307-0013 validée dans Dolibarr','2013-03-06 16:43:37','2014-12-21 12:50:33',1,NULL,NULL,12,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA1307-0013 validée dans Dolibarr\nAuteur: admin',158,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(148,NULL,1,'2013-03-06 16:44:12','2013-03-06 16:44:12',40,NULL,'Facture FA1407-0014 validée dans Dolibarr','2013-03-06 16:44:12','2014-12-21 12:50:33',1,NULL,NULL,12,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA1407-0014 validée dans Dolibarr\nAuteur: admin',159,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(149,NULL,1,'2013-03-06 16:47:48','2013-03-06 16:47:48',40,NULL,'Facture FA1507-0015 validée dans Dolibarr','2013-03-06 16:47:48','2014-12-21 12:50:33',1,NULL,NULL,12,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA1507-0015 validée dans Dolibarr\nAuteur: admin',160,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(150,NULL,1,'2013-03-06 16:48:16','2013-03-06 16:48:16',40,NULL,'Facture FA1607-0016 validée dans Dolibarr','2013-03-06 16:48:16','2014-12-21 12:50:33',1,NULL,NULL,12,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA1607-0016 validée dans Dolibarr\nAuteur: admin',161,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(151,NULL,1,'2013-03-06 17:13:59','2013-03-06 17:13:59',40,NULL,'Société smith smith ajoutée dans Dolibarr','2013-03-06 17:13:59','2014-12-21 12:50:33',1,NULL,NULL,24,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Société smith smith ajoutée dans Dolibarr\nAuteur: admin',24,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(152,NULL,1,'2013-03-08 10:02:22','2013-03-08 10:02:22',40,NULL,'Proposition (PROV12) validée dans Dolibarr','2013-03-08 10:02:22','2014-12-21 12:50:33',1,NULL,NULL,23,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Proposition (PROV12) validée dans Dolibarr\nAuteur: admin',12,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(203,NULL,1,'2013-03-09 19:39:27','2013-03-09 19:39:27',40,'AC_ORDER_SUPPLIER_VALIDATE','Commande CF1303-0004 validée','2013-03-09 19:39:27','2014-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Commande CF1303-0004 validée\nAuteur: admin',13,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(204,NULL,1,'2013-03-10 15:47:37','2013-03-10 15:47:37',40,'AC_COMPANY_CREATE','Patient créé','2013-03-10 15:47:37','2014-12-21 12:50:33',1,NULL,NULL,25,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Patient créé\nAuteur: admin',25,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(205,NULL,1,'2013-03-10 15:57:32','2013-03-10 15:57:32',40,'AC_COMPANY_CREATE','Tiers créé','2013-03-10 15:57:32','2014-12-21 12:50:33',1,NULL,NULL,26,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Tiers créé\nAuteur: admin',26,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(206,NULL,1,'2013-03-10 15:58:28','2013-03-10 15:58:28',40,'AC_BILL_VALIDATE','Facture FA1303-0017 validée','2013-03-10 15:58:28','2014-12-21 12:50:33',1,NULL,NULL,26,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA1303-0017 validée\nAuteur: admin',208,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(207,NULL,1,'2013-03-19 09:38:10','2013-03-19 09:38:10',40,'AC_BILL_VALIDATE','Facture FA1303-0018 validée','2013-03-19 09:38:10','2014-12-21 12:50:33',1,NULL,NULL,19,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA1303-0018 validée\nAuteur: admin',209,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(208,NULL,1,'2013-03-20 14:30:11','2013-03-20 14:30:11',40,'AC_BILL_VALIDATE','Facture FA1107-0019 validée','2013-03-20 14:30:11','2014-12-21 12:50:33',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA1107-0019 validée\nAuteur: admin',210,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(209,NULL,1,'2013-03-22 09:40:25','2013-03-22 09:40:25',40,'AC_BILL_VALIDATE','Facture FA1303-0020 validée','2013-03-22 09:40:25','2014-12-21 12:50:33',1,NULL,NULL,19,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA1303-0020 validée\nAuteur: admin',211,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(210,NULL,1,'2013-03-23 17:16:25','2013-03-23 17:16:25',40,'AC_BILL_VALIDATE','Facture FA1303-0020 validée','2013-03-23 17:16:25','2014-12-21 12:50:33',1,NULL,NULL,19,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA1303-0020 validée\nAuteur: admin',211,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(211,NULL,1,'2013-03-23 18:08:27','2013-03-23 18:08:27',40,'AC_BILL_VALIDATE','Facture FA1307-0013 validée','2013-03-23 18:08:27','2014-12-21 12:50:33',1,NULL,NULL,12,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA1307-0013 validée\nAuteur: admin',158,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(212,NULL,1,'2013-03-24 15:54:00','2013-03-24 15:54:00',40,'AC_BILL_VALIDATE','Facture FA1212-0021 validée','2013-03-24 15:54:00','2014-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA1212-0021 validée\nAuteur: admin',32,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(213,NULL,1,'2013-11-07 01:02:39','2013-11-07 01:02:39',40,'AC_COMPANY_CREATE','Third party created','2013-11-07 01:02:39','2014-12-21 12:50:33',1,NULL,NULL,27,NULL,0,1,0,1,0,0,1,-1,'',NULL,NULL,'Third party created\nAuthor: admin',27,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(214,NULL,1,'2013-11-07 01:05:22','2013-11-07 01:05:22',40,'AC_COMPANY_CREATE','Third party created','2013-11-07 01:05:22','2014-12-21 12:50:33',1,NULL,NULL,28,NULL,0,1,0,1,0,0,1,-1,'',NULL,NULL,'Third party created\nAuthor: admin',28,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(215,NULL,1,'2013-11-07 01:07:07','2013-11-07 01:07:07',40,'AC_COMPANY_CREATE','Third party created','2013-11-07 01:07:07','2014-12-21 12:50:33',1,NULL,NULL,29,NULL,0,1,0,1,0,0,1,-1,'',NULL,NULL,'Third party created\nAuthor: admin',29,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(216,NULL,1,'2013-11-07 01:07:58','2013-11-07 01:07:58',40,'AC_COMPANY_CREATE','Third party created','2013-11-07 01:07:58','2014-12-21 12:50:33',1,NULL,NULL,30,NULL,0,1,0,1,0,0,1,-1,'',NULL,NULL,'Third party created\nAuthor: admin',30,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(217,NULL,1,'2013-11-07 01:10:09','2013-11-07 01:10:09',40,'AC_COMPANY_CREATE','Third party created','2013-11-07 01:10:09','2014-12-21 12:50:33',1,NULL,NULL,31,NULL,0,1,0,1,0,0,1,-1,'',NULL,NULL,'Third party created\nAuthor: admin',31,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(218,NULL,1,'2013-11-07 01:15:57','2013-11-07 01:15:57',40,'AC_COMPANY_CREATE','Third party created','2013-11-07 01:15:57','2014-12-21 12:50:33',1,NULL,NULL,32,NULL,0,1,0,1,0,0,1,-1,'',NULL,NULL,'Third party created\nAuthor: admin',32,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(219,NULL,1,'2013-11-07 01:16:51','2013-11-07 01:16:51',40,'AC_COMPANY_CREATE','Third party created','2013-11-07 01:16:51','2014-12-21 12:50:33',1,NULL,NULL,33,NULL,0,1,0,1,0,0,1,-1,'',NULL,NULL,'Third party created\nAuthor: admin',33,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(220,NULL,1,'2014-03-02 17:24:04','2014-03-02 17:24:04',40,'AC_BILL_VALIDATE','Invoice FA1302-0022 validated','2014-03-02 17:24:04','2014-12-21 12:50:33',1,NULL,NULL,18,NULL,0,1,0,1,0,0,1,-1,'',NULL,NULL,'Invoice FA1302-0022 validated\nAuthor: admin',157,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(221,NULL,1,'2014-03-02 17:24:28','2014-03-02 17:24:28',40,'AC_BILL_VALIDATE','Invoice FA1303-0020 validated','2014-03-02 17:24:28','2014-12-21 12:50:33',1,NULL,NULL,19,NULL,0,1,0,1,0,0,1,-1,'',NULL,NULL,'Invoice FA1303-0020 validated\nAuthor: admin',211,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(222,NULL,1,'2014-03-05 10:00:00','2014-03-05 10:00:00',5,NULL,'RDV John','2014-03-02 19:54:48','2014-03-02 18:55:29',1,1,NULL,NULL,NULL,0,1,0,NULL,0,0,1,-1,NULL,NULL,NULL,'gfdgdfgdf',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(223,NULL,1,'2014-03-13 10:00:00','2014-03-17 00:00:00',50,NULL,'Congress','2014-03-02 19:55:11','2014-03-02 18:55:11',1,NULL,NULL,NULL,NULL,0,1,0,NULL,0,0,1,-1,'',309600,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(224,NULL,1,'2014-03-14 10:00:00',NULL,1,NULL,'Call john','2014-03-02 19:55:56','2014-03-02 18:55:56',1,NULL,NULL,NULL,NULL,0,1,0,NULL,0,0,1,0,'',NULL,NULL,'tttt',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(225,NULL,1,'2014-03-02 20:11:31','2014-03-02 20:11:31',40,'AC_BILL_UNVALIDATE','Invoice FA1303-0020 go back to draft status','2014-03-02 20:11:31','2014-12-21 12:50:33',1,NULL,NULL,19,NULL,0,1,0,1,0,0,1,-1,'',NULL,NULL,'Invoice FA1303-0020 go back to draft status\nAuthor: admin',211,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(226,NULL,1,'2014-03-02 20:13:39','2014-03-02 20:13:39',40,'AC_BILL_VALIDATE','Invoice FA1303-0020 validated','2014-03-02 20:13:39','2014-12-21 12:50:33',1,NULL,NULL,19,NULL,0,1,0,1,0,0,1,-1,'',NULL,NULL,'Invoice FA1303-0020 validated\nAuthor: admin',211,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(227,NULL,1,'2014-03-03 19:20:10','2014-03-03 19:20:10',40,'AC_BILL_VALIDATE','Invoice FA1212-0023 validated','2014-03-03 19:20:10','2014-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,0,1,0,0,1,-1,'',NULL,NULL,'Invoice FA1212-0023 validated\nAuthor: admin',33,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(228,NULL,1,'2014-03-03 19:20:25','2014-03-03 19:20:25',40,'AC_BILL_CANCEL','Invoice FA1212-0023 canceled in Dolibarr','2014-03-03 19:20:25','2014-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,0,1,0,0,1,-1,'',NULL,NULL,'Invoice FA1212-0023 canceled in Dolibarr\nAuthor: admin',33,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(229,NULL,1,'2014-03-03 19:20:56','2014-03-03 19:20:56',40,'AC_BILL_VALIDATE','Invoice AV1403-0003 validated','2014-03-03 19:20:56','2014-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,0,1,0,0,1,-1,'',NULL,NULL,'Invoice AV1403-0003 validated\nAuthor: admin',212,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(230,NULL,1,'2014-03-03 19:21:29','2014-03-03 19:21:29',40,'AC_BILL_UNVALIDATE','Invoice AV1403-0003 go back to draft status','2014-03-03 19:21:29','2014-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,0,1,0,0,1,-1,'',NULL,NULL,'Invoice AV1403-0003 go back to draft status\nAuthor: admin',212,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(231,NULL,1,'2014-03-03 19:22:16','2014-03-03 19:22:16',40,'AC_BILL_VALIDATE','Invoice AV1303-0003 validated','2014-03-03 19:22:16','2014-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,0,1,0,0,1,-1,'',NULL,NULL,'Invoice AV1303-0003 validated\nAuthor: admin',213,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(232,NULL,1,'2016-01-22 18:54:39','2016-01-22 18:54:39',40,'AC_OTH_AUTO','Invoice 16 validated','2016-01-22 18:54:39','2016-01-22 17:54:39',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Invoice 16 validated\nAuthor: admin',16,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(233,NULL,1,'2016-01-22 18:54:46','2016-01-22 18:54:46',40,'AC_OTH_AUTO','Invoice 16 validated','2016-01-22 18:54:46','2016-01-22 17:54:46',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Invoice 16 validated\nAuthor: admin',16,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(234,NULL,1,'2016-07-05 10:00:00','2016-07-05 11:19:00',5,'AC_RDV','Meeting with my boss','2016-07-31 18:19:48','2016-07-31 14:19:48',12,NULL,NULL,NULL,NULL,0,12,1,NULL,0,0,1,-1,'',4740,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(235,NULL,1,'2016-07-13 00:00:00','2016-07-14 23:59:59',50,'AC_OTH','Trip at Las Vegas','2016-07-31 18:20:36','2016-07-31 14:20:36',12,NULL,4,NULL,2,0,12,1,NULL,0,1,1,-1,'',172799,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(236,NULL,1,'2016-07-29 10:00:00',NULL,4,'AC_EMAIL','Remind to send an email','2016-07-31 18:21:04','2016-07-31 14:21:04',12,NULL,NULL,NULL,NULL,0,4,0,NULL,0,0,1,-1,'',NULL,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(237,NULL,1,'2016-07-01 10:00:00',NULL,1,'AC_TEL','Phone call with Mr Vaalen','2016-07-31 18:22:04','2016-07-31 14:22:04',12,NULL,6,4,NULL,0,13,0,NULL,0,0,1,-1,'',NULL,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(238,NULL,1,'2016-08-02 10:00:00','2016-08-02 12:00:00',5,'AC_RDV','Meeting on radium','2016-08-01 01:15:50','2016-07-31 21:15:50',12,NULL,8,10,10,0,12,1,NULL,0,0,1,-1,'',7200,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(239,NULL,1,'2017-01-29 21:49:33','2017-01-29 21:49:33',40,'AC_OTH_AUTO','Proposal PR1302-0007 validated','2017-01-29 21:49:33','2017-01-29 17:49:33',12,NULL,NULL,19,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Proposal PR1302-0007 validated\nAuthor: admin',7,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(240,NULL,1,'2017-01-31 20:52:00',NULL,1,'AC_TEL','Call the boss','2017-01-31 20:52:10','2017-01-31 16:52:25',12,12,6,NULL,NULL,0,12,1,NULL,0,0,1,-1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(242,NULL,1,'2017-02-01 18:52:04','2017-02-01 18:52:04',40,'AC_OTH_AUTO','Order CF1007-0001 validated','2017-02-01 18:52:04','2017-02-01 14:52:04',12,NULL,NULL,13,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Order CF1007-0001 validated\nAuthor: admin',1,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(243,NULL,1,'2017-02-01 18:52:04','2017-02-01 18:52:04',40,'AC_OTH_AUTO','Order CF1007-0001 approved','2017-02-01 18:52:04','2017-02-01 14:52:04',12,NULL,NULL,13,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Order CF1007-0001 approved\nAuthor: admin',1,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(245,NULL,1,'2017-02-01 18:52:32','2017-02-01 18:52:32',40,'AC_OTH_AUTO','Supplier order CF1007-0001 submited','2017-02-01 18:52:32','2017-02-01 14:52:32',12,NULL,NULL,13,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Supplier order CF1007-0001 submited\nAuthor: admin',1,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(249,NULL,1,'2017-02-01 18:54:01','2017-02-01 18:54:01',40,'AC_OTH_AUTO','Supplier order CF1007-0001 received','2017-02-01 18:54:01','2017-02-01 14:54:01',12,NULL,NULL,13,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Supplier order CF1007-0001 received \nAuthor: admin',1,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(250,NULL,1,'2017-02-01 18:54:42','2017-02-01 18:54:42',40,'AC_OTH_AUTO','Email sent by MyBigCompany To mycustomer@example.com','2017-02-01 18:54:42','2017-02-01 14:54:42',12,NULL,NULL,13,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Sender: MyBigCompany &lt;myemail@mybigcompany.com&gt;<br>\nReceiver(s): mycustomer@example.com<br>\nEMail topic: Submission of order CF1007-0001<br>\nEmail body:<br>\nYou will find here our order CF1007-0001<br />\r\n<br />\r\nSincerely<br>\n<br>\nAttached files and documents: CF1007-0001.pdf',1,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(251,NULL,1,'2017-02-01 19:02:21','2017-02-01 19:02:21',40,'AC_OTH_AUTO','Invoice SI1702-0001 validated','2017-02-01 19:02:21','2017-02-01 15:02:21',12,NULL,5,13,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Invoice SI1702-0001 validated\nAuthor: admin',20,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(252,NULL,1,'2017-02-12 23:17:04','2017-02-12 23:17:04',40,'AC_OTH_AUTO','Patient créé','2017-02-12 23:17:04','2017-02-12 19:17:04',12,NULL,NULL,26,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Patient créé\nAuthor: admin',26,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(253,NULL,1,'2017-02-12 23:18:33','2017-02-12 23:18:33',40,'AC_OTH_AUTO','Consultation 2 recorded (aaa)','2017-02-12 23:18:33','2017-02-12 19:18:33',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Consultation 2 recorded (aaa)\nAuthor: admin',2,'cabinetmed_cons',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(254,NULL,1,'2017-02-15 23:28:41','2017-02-15 23:28:41',40,'AC_OTH_AUTO','Order CO7001-0005 validated','2017-02-15 23:28:41','2017-02-15 22:28:41',12,NULL,NULL,4,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Order CO7001-0005 validated\nAuthor: admin',7,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(255,NULL,1,'2017-02-15 23:28:56','2017-02-15 23:28:56',40,'AC_OTH_AUTO','Order CO7001-0006 validated','2017-02-15 23:28:56','2017-02-15 22:28:56',12,NULL,NULL,4,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Order CO7001-0006 validated\nAuthor: admin',8,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(256,NULL,1,'2017-02-15 23:34:33','2017-02-15 23:34:33',40,'AC_OTH_AUTO','Order CO7001-0007 validated','2017-02-15 23:34:33','2017-02-15 22:34:33',12,NULL,NULL,3,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Order CO7001-0007 validated\nAuthor: admin',9,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(257,NULL,1,'2017-02-15 23:35:03','2017-02-15 23:35:03',40,'AC_OTH_AUTO','Order CO7001-0008 validated','2017-02-15 23:35:03','2017-02-15 22:35:03',12,NULL,NULL,3,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Order CO7001-0008 validated\nAuthor: admin',10,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(263,NULL,1,'2017-02-15 23:50:34','2017-02-15 23:50:34',40,'AC_OTH_AUTO','Order CO7001-0005 validated','2017-02-15 23:50:34','2017-02-15 22:50:34',12,NULL,NULL,4,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Order CO7001-0005 validated\nAuthor: admin',17,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(264,NULL,1,'2017-02-15 23:51:23','2017-02-15 23:51:23',40,'AC_OTH_AUTO','Order CO7001-0006 validated','2017-02-15 23:51:23','2017-02-15 22:51:23',12,NULL,NULL,7,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Order CO7001-0006 validated\nAuthor: admin',18,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(265,NULL,1,'2017-02-15 23:54:51','2017-02-15 23:54:51',40,'AC_OTH_AUTO','Order CO7001-0007 validated','2017-02-15 23:54:51','2017-02-15 22:54:51',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Order CO7001-0007 validated\nAuthor: admin',19,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(266,NULL,1,'2017-02-15 23:55:52','2017-02-15 23:55:52',40,'AC_OTH_AUTO','Order CO7001-0007 validated','2017-02-15 23:55:52','2017-02-15 22:55:52',12,NULL,NULL,4,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Order CO7001-0007 validated\nAuthor: admin',20,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(267,NULL,1,'2017-02-16 00:03:44','2017-02-16 00:03:44',40,'AC_OTH_AUTO','Order CO7001-0008 validated','2017-02-16 00:03:44','2017-02-15 23:03:44',12,NULL,NULL,4,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Order CO7001-0008 validated\nAuthor: admin',29,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(268,NULL,1,'2017-02-16 00:05:01','2017-02-16 00:05:01',40,'AC_OTH_AUTO','Order CO7001-0009 validated','2017-02-16 00:05:01','2017-02-15 23:05:01',12,NULL,NULL,11,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Order CO7001-0009 validated\nAuthor: admin',34,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(269,NULL,1,'2017-02-16 00:05:01','2017-02-16 00:05:01',40,'AC_OTH_AUTO','Order CO7001-0010 validated','2017-02-16 00:05:01','2017-02-15 23:05:01',12,NULL,NULL,3,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Order CO7001-0010 validated\nAuthor: admin',38,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(270,NULL,1,'2017-02-16 00:05:11','2017-02-16 00:05:11',40,'AC_OTH_AUTO','Order CO7001-0011 validated','2017-02-16 00:05:11','2017-02-15 23:05:11',12,NULL,NULL,11,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Order CO7001-0011 validated\nAuthor: admin',40,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(271,NULL,1,'2017-02-16 00:05:11','2017-02-16 00:05:11',40,'AC_OTH_AUTO','Order CO7001-0012 validated','2017-02-16 00:05:11','2017-02-15 23:05:11',12,NULL,NULL,10,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Order CO7001-0012 validated\nAuthor: admin',43,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(272,NULL,1,'2017-02-16 00:05:11','2017-02-16 00:05:11',40,'AC_OTH_AUTO','Order CO7001-0013 validated','2017-02-16 00:05:11','2017-02-15 23:05:11',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Order CO7001-0013 validated\nAuthor: admin',47,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(273,NULL,1,'2017-02-16 00:05:11','2017-02-16 00:05:11',40,'AC_OTH_AUTO','Order CO7001-0014 validated','2017-02-16 00:05:11','2017-02-15 23:05:11',12,NULL,NULL,4,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Order CO7001-0014 validated\nAuthor: admin',48,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(274,NULL,1,'2017-02-16 00:05:26','2017-02-16 00:05:26',40,'AC_OTH_AUTO','Order CO7001-0015 validated','2017-02-16 00:05:26','2017-02-15 23:05:26',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Order CO7001-0015 validated\nAuthor: admin',50,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(275,NULL,1,'2017-02-16 00:05:26','2017-02-16 00:05:26',40,'AC_OTH_AUTO','Order CO7001-0016 validated','2017-02-16 00:05:26','2017-02-15 23:05:26',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Order CO7001-0016 validated\nAuthor: admin',54,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(277,NULL,1,'2017-02-16 00:05:35','2017-02-16 00:05:35',40,'AC_OTH_AUTO','Order CO7001-0018 validated','2017-02-16 00:05:35','2017-02-15 23:05:35',12,NULL,NULL,19,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Order CO7001-0018 validated\nAuthor: admin',62,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(278,NULL,1,'2017-02-16 00:05:35','2017-02-16 00:05:35',40,'AC_OTH_AUTO','Order CO7001-0019 validated','2017-02-16 00:05:35','2017-02-15 23:05:35',12,NULL,NULL,3,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Order CO7001-0019 validated\nAuthor: admin',68,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(279,NULL,1,'2017-02-16 00:05:36','2017-02-16 00:05:36',40,'AC_OTH_AUTO','Order CO7001-0020 validated','2017-02-16 00:05:36','2017-02-15 23:05:36',12,NULL,NULL,6,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Order CO7001-0020 validated\nAuthor: admin',72,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(281,NULL,1,'2017-02-16 00:05:37','2017-02-16 00:05:37',40,'AC_OTH_AUTO','Order CO7001-0022 validated','2017-02-16 00:05:37','2017-02-15 23:05:37',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Order CO7001-0022 validated\nAuthor: admin',78,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(282,NULL,1,'2017-02-16 00:05:38','2017-02-16 00:05:38',40,'AC_OTH_AUTO','Order CO7001-0023 validated','2017-02-16 00:05:38','2017-02-15 23:05:38',12,NULL,NULL,11,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Order CO7001-0023 validated\nAuthor: admin',81,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(283,NULL,1,'2017-02-16 00:05:38','2017-02-16 00:05:38',40,'AC_OTH_AUTO','Order CO7001-0024 validated','2017-02-16 00:05:38','2017-02-15 23:05:38',12,NULL,NULL,26,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Order CO7001-0024 validated\nAuthor: admin',83,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(284,NULL,1,'2017-02-16 00:05:38','2017-02-16 00:05:38',40,'AC_OTH_AUTO','Order CO7001-0025 validated','2017-02-16 00:05:38','2017-02-15 23:05:38',12,NULL,NULL,2,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Order CO7001-0025 validated\nAuthor: admin',84,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(285,NULL,1,'2017-02-16 00:05:38','2017-02-16 00:05:38',40,'AC_OTH_AUTO','Order CO7001-0026 validated','2017-02-16 00:05:38','2017-02-15 23:05:38',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Order CO7001-0026 validated\nAuthor: admin',85,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(286,NULL,1,'2017-02-16 00:05:38','2017-02-16 00:05:38',40,'AC_OTH_AUTO','Order CO7001-0027 validated','2017-02-16 00:05:38','2017-02-15 23:05:38',12,NULL,NULL,10,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Order CO7001-0027 validated\nAuthor: admin',88,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(287,NULL,1,'2017-02-16 03:05:56','2017-02-16 03:05:56',40,'AC_OTH_AUTO','Commande CO7001-0016 classée Livrée','2017-02-16 03:05:56','2017-02-15 23:05:56',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Commande CO7001-0016 classée Livrée\nAuteur: admin',54,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(288,NULL,1,'2017-02-16 03:06:01','2017-02-16 03:06:01',40,'AC_OTH_AUTO','Commande CO7001-0016 classée Facturée','2017-02-16 03:06:01','2017-02-15 23:06:01',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Commande CO7001-0016 classée Facturée\nAuteur: admin',54,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(294,NULL,1,'2017-02-16 03:53:04','2017-02-16 03:53:04',40,'AC_OTH_AUTO','Commande CO7001-0021 validée','2017-02-16 03:53:04','2017-02-15 23:53:04',12,NULL,NULL,4,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Commande CO7001-0021 validée\nAuteur: admin',75,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(295,NULL,1,'2017-02-16 03:58:08','2017-02-16 03:58:08',40,'AC_OTH_AUTO','Expédition SH1702-0002 validée','2017-02-16 03:58:08','2017-02-15 23:58:08',12,NULL,NULL,4,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Expédition SH1702-0002 validée\nAuteur: admin',3,'shipping',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(296,NULL,1,'2017-02-16 04:12:29','2017-02-16 04:12:29',40,'AC_OTH_AUTO','Commande CO7001-0021 validée','2017-02-16 04:12:29','2017-02-16 00:12:29',12,NULL,NULL,4,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Commande CO7001-0021 validée\nAuteur: admin',75,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(297,NULL,1,'2017-02-16 04:14:20','2017-02-16 04:14:20',40,'AC_OTH_AUTO','Commande CO7001-0021 validée','2017-02-16 04:14:20','2017-02-16 00:14:20',12,NULL,NULL,4,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Commande CO7001-0021 validée\nAuteur: admin',75,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(298,NULL,1,'2017-02-16 01:44:58','2017-02-16 01:44:58',40,'AC_OTH_AUTO','Proposal PR1702-0009 validated','2017-02-16 01:44:58','2017-02-16 00:44:58',1,NULL,NULL,1,NULL,0,1,0,NULL,0,0,1,-1,'',NULL,NULL,'Proposal PR1702-0009 validated\nAuthor: aeinstein',11,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(299,NULL,1,'2017-02-16 01:45:44','2017-02-16 01:45:44',40,'AC_OTH_AUTO','Proposal PR1702-0010 validated','2017-02-16 01:45:44','2017-02-16 00:45:44',2,NULL,NULL,7,NULL,0,2,0,NULL,0,0,1,-1,'',NULL,NULL,'Proposal PR1702-0010 validated\nAuthor: demo',12,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(300,NULL,1,'2017-02-16 01:46:15','2017-02-16 01:46:15',40,'AC_OTH_AUTO','Proposal PR1702-0011 validated','2017-02-16 01:46:15','2017-02-16 00:46:15',1,NULL,NULL,26,NULL,0,1,0,NULL,0,0,1,-1,'',NULL,NULL,'Proposal PR1702-0011 validated\nAuthor: aeinstein',13,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(301,NULL,1,'2017-02-16 01:46:15','2017-02-16 01:46:15',40,'AC_OTH_AUTO','Proposal PR1702-0012 validated','2017-02-16 01:46:15','2017-02-16 00:46:15',2,NULL,NULL,3,NULL,0,2,0,NULL,0,0,1,-1,'',NULL,NULL,'Proposal PR1702-0012 validated\nAuthor: demo',14,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(302,NULL,1,'2017-02-16 01:46:15','2017-02-16 01:46:15',40,'AC_OTH_AUTO','Proposal PR1702-0013 validated','2017-02-16 01:46:15','2017-02-16 00:46:15',2,NULL,NULL,26,NULL,0,2,0,NULL,0,0,1,-1,'',NULL,NULL,'Proposal PR1702-0013 validated\nAuthor: demo',15,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(303,NULL,1,'2017-02-16 01:46:15','2017-02-16 01:46:15',40,'AC_OTH_AUTO','Proposal PR1702-0014 validated','2017-02-16 01:46:15','2017-02-16 00:46:15',2,NULL,NULL,1,NULL,0,2,0,NULL,0,0,1,-1,'',NULL,NULL,'Proposal PR1702-0014 validated\nAuthor: demo',16,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(304,NULL,1,'2017-02-16 01:46:15','2017-02-16 01:46:15',40,'AC_OTH_AUTO','Proposal PR1702-0015 validated','2017-02-16 01:46:15','2017-02-16 00:46:15',1,NULL,NULL,1,NULL,0,1,0,NULL,0,0,1,-1,'',NULL,NULL,'Proposal PR1702-0015 validated\nAuthor: aeinstein',17,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(305,NULL,1,'2017-02-16 01:46:15','2017-02-16 01:46:15',40,'AC_OTH_AUTO','Proposal PR1702-0016 validated','2017-02-16 01:46:15','2017-02-16 00:46:15',2,NULL,NULL,26,NULL,0,2,0,NULL,0,0,1,-1,'',NULL,NULL,'Proposal PR1702-0016 validated\nAuthor: demo',18,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(306,NULL,1,'2017-02-16 01:46:15','2017-02-16 01:46:15',40,'AC_OTH_AUTO','Proposal PR1702-0017 validated','2017-02-16 01:46:15','2017-02-16 00:46:15',2,NULL,NULL,12,NULL,0,2,0,NULL,0,0,1,-1,'',NULL,NULL,'Proposal PR1702-0017 validated\nAuthor: demo',19,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(307,NULL,1,'2017-02-16 01:46:15','2017-02-16 01:46:15',40,'AC_OTH_AUTO','Proposal PR1702-0018 validated','2017-02-16 01:46:15','2017-02-16 00:46:15',1,NULL,NULL,26,NULL,0,1,0,NULL,0,0,1,-1,'',NULL,NULL,'Proposal PR1702-0018 validated\nAuthor: aeinstein',20,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(308,NULL,1,'2017-02-16 01:46:15','2017-02-16 01:46:15',40,'AC_OTH_AUTO','Proposal PR1702-0019 validated','2017-02-16 01:46:15','2017-02-16 00:46:15',1,NULL,NULL,1,NULL,0,1,0,NULL,0,0,1,-1,'',NULL,NULL,'Proposal PR1702-0019 validated\nAuthor: aeinstein',21,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(309,NULL,1,'2017-02-16 01:46:15','2017-02-16 01:46:15',40,'AC_OTH_AUTO','Proposal PR1702-0020 validated','2017-02-16 01:46:15','2017-02-16 00:46:15',1,NULL,NULL,26,NULL,0,1,0,NULL,0,0,1,-1,'',NULL,NULL,'Proposal PR1702-0020 validated\nAuthor: aeinstein',22,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(310,NULL,1,'2017-02-16 01:46:17','2017-02-16 01:46:17',40,'AC_OTH_AUTO','Proposal PR1702-0021 validated','2017-02-16 01:46:17','2017-02-16 00:46:17',2,NULL,NULL,12,NULL,0,2,0,NULL,0,0,1,-1,'',NULL,NULL,'Proposal PR1702-0021 validated\nAuthor: demo',23,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(311,NULL,1,'2017-02-16 01:46:17','2017-02-16 01:46:17',40,'AC_OTH_AUTO','Proposal PR1702-0022 validated','2017-02-16 01:46:17','2017-02-16 00:46:17',2,NULL,NULL,7,NULL,0,2,0,NULL,0,0,1,-1,'',NULL,NULL,'Proposal PR1702-0022 validated\nAuthor: demo',24,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(312,NULL,1,'2017-02-16 01:46:17','2017-02-16 01:46:17',40,'AC_OTH_AUTO','Proposal PR1702-0023 validated','2017-02-16 01:46:17','2017-02-16 00:46:17',1,NULL,NULL,3,NULL,0,1,0,NULL,0,0,1,-1,'',NULL,NULL,'Proposal PR1702-0023 validated\nAuthor: aeinstein',25,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(313,NULL,1,'2017-02-16 01:46:18','2017-02-16 01:46:18',40,'AC_OTH_AUTO','Proposal PR1702-0024 validated','2017-02-16 01:46:18','2017-02-16 00:46:18',2,NULL,NULL,1,NULL,0,2,0,NULL,0,0,1,-1,'',NULL,NULL,'Proposal PR1702-0024 validated\nAuthor: demo',26,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(314,NULL,1,'2017-02-16 01:46:18','2017-02-16 01:46:18',40,'AC_OTH_AUTO','Proposal PR1702-0025 validated','2017-02-16 01:46:18','2017-02-16 00:46:18',1,NULL,NULL,6,NULL,0,1,0,NULL,0,0,1,-1,'',NULL,NULL,'Proposal PR1702-0025 validated\nAuthor: aeinstein',27,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(315,NULL,1,'2017-02-16 01:46:18','2017-02-16 01:46:18',40,'AC_OTH_AUTO','Proposal PR1702-0026 validated','2017-02-16 01:46:18','2017-02-16 00:46:18',2,NULL,NULL,19,NULL,0,2,0,NULL,0,0,1,-1,'',NULL,NULL,'Proposal PR1702-0026 validated\nAuthor: demo',28,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(316,NULL,1,'2017-02-16 01:46:18','2017-02-16 01:46:18',40,'AC_OTH_AUTO','Proposal PR1702-0027 validated','2017-02-16 01:46:18','2017-02-16 00:46:18',2,NULL,NULL,1,NULL,0,2,0,NULL,0,0,1,-1,'',NULL,NULL,'Proposal PR1702-0027 validated\nAuthor: demo',29,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(317,NULL,1,'2017-02-16 01:46:18','2017-02-16 01:46:18',40,'AC_OTH_AUTO','Proposal PR1702-0028 validated','2017-02-16 01:46:18','2017-02-16 00:46:18',2,NULL,NULL,1,NULL,0,2,0,NULL,0,0,1,-1,'',NULL,NULL,'Proposal PR1702-0028 validated\nAuthor: demo',30,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(318,NULL,1,'2017-02-16 01:46:18','2017-02-16 01:46:18',40,'AC_OTH_AUTO','Proposal PR1702-0029 validated','2017-02-16 01:46:18','2017-02-16 00:46:18',1,NULL,NULL,11,NULL,0,1,0,NULL,0,0,1,-1,'',NULL,NULL,'Proposal PR1702-0029 validated\nAuthor: aeinstein',31,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(319,NULL,1,'2017-02-16 01:46:18','2017-02-16 01:46:18',40,'AC_OTH_AUTO','Proposal PR1702-0030 validated','2017-02-16 01:46:18','2017-02-16 00:46:18',2,NULL,NULL,19,NULL,0,2,0,NULL,0,0,1,-1,'',NULL,NULL,'Proposal PR1702-0030 validated\nAuthor: demo',32,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(320,NULL,1,'2017-02-16 04:46:31','2017-02-16 04:46:31',40,'AC_OTH_AUTO','Proposition PR1702-0026 signée','2017-02-16 04:46:31','2017-02-16 00:46:31',12,NULL,NULL,19,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Proposition PR1702-0026 signée\nAuteur: admin',28,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(321,NULL,1,'2017-02-16 04:46:37','2017-02-16 04:46:37',40,'AC_OTH_AUTO','Proposition PR1702-0027 signée','2017-02-16 04:46:37','2017-02-16 00:46:37',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Proposition PR1702-0027 signée\nAuteur: admin',29,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(322,NULL,1,'2017-02-16 04:46:42','2017-02-16 04:46:42',40,'AC_OTH_AUTO','Proposition PR1702-0028 refusée','2017-02-16 04:46:42','2017-02-16 00:46:42',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Proposition PR1702-0028 refusée\nAuteur: admin',30,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(323,NULL,1,'2017-02-16 04:47:09','2017-02-16 04:47:09',40,'AC_OTH_AUTO','Proposition PR1702-0019 validée','2017-02-16 04:47:09','2017-02-16 00:47:09',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Proposition PR1702-0019 validée\nAuteur: admin',21,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(324,NULL,1,'2017-02-16 04:47:25','2017-02-16 04:47:25',40,'AC_OTH_AUTO','Proposition PR1702-0023 signée','2017-02-16 04:47:25','2017-02-16 00:47:25',12,NULL,NULL,3,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Proposition PR1702-0023 signée\nAuteur: admin',25,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(325,NULL,1,'2017-02-16 04:47:29','2017-02-16 04:47:29',40,'AC_OTH_AUTO','Proposition PR1702-0023 classée payée','2017-02-16 04:47:29','2017-02-16 00:47:29',12,NULL,NULL,3,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Proposition PR1702-0023 classée payée\nAuteur: admin',25,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(326,NULL,1,'2017-02-17 16:07:18','2017-02-17 16:07:18',40,'AC_OTH_AUTO','Proposition PR1702-0021 validée','2017-02-17 16:07:18','2017-02-17 12:07:18',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Proposition PR1702-0021 validée\nAuteur: admin',23,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(327,NULL,1,'2017-05-12 13:53:44','2017-05-12 13:53:44',40,'AC_OTH_AUTO','Email sent by MyBigCompany To Einstein','2017-05-12 13:53:44','2017-05-12 09:53:44',12,NULL,NULL,11,12,0,12,0,NULL,0,0,1,-1,'',NULL,NULL,'Sender: MyBigCompany &lt;myemail@mybigcompany.com&gt;<br>\nReceiver(s): Einstein &lt;genius@example.com&gt;<br>\nBcc: Einstein &lt;genius@example.com&gt;<br>\nEMail topic: Test<br>\nEmail body:<br>\nTest\nAuthor: admin',11,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 /*!40000 ALTER TABLE `llx_actioncomm` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -293,7 +293,7 @@ CREATE TABLE `llx_actioncomm_resources` (
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_actioncomm_resources` (`fk_actioncomm`,`element_type`,`fk_element`),
   KEY `idx_actioncomm_resources_fk_element` (`fk_element`)
-) ENGINE=InnoDB AUTO_INCREMENT=210 DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB AUTO_INCREMENT=211 DEFAULT CHARSET=latin1;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -302,7 +302,7 @@ CREATE TABLE `llx_actioncomm_resources` (
 
 LOCK TABLES `llx_actioncomm_resources` WRITE;
 /*!40000 ALTER TABLE `llx_actioncomm_resources` DISABLE KEYS */;
-INSERT INTO `llx_actioncomm_resources` VALUES (1,1,'user',1,NULL,NULL,1),(2,2,'user',1,NULL,NULL,1),(3,3,'user',1,NULL,NULL,1),(4,4,'user',1,NULL,NULL,1),(5,5,'user',1,NULL,NULL,1),(6,6,'user',1,NULL,NULL,1),(7,7,'user',1,NULL,NULL,1),(8,8,'user',1,NULL,NULL,1),(9,9,'user',1,NULL,NULL,1),(10,10,'user',1,NULL,NULL,1),(11,11,'user',1,NULL,NULL,1),(12,12,'user',1,NULL,NULL,1),(13,13,'user',1,NULL,NULL,1),(14,14,'user',1,NULL,NULL,1),(15,15,'user',1,NULL,NULL,1),(16,16,'user',1,NULL,NULL,1),(17,17,'user',1,NULL,NULL,1),(18,18,'user',1,NULL,NULL,1),(19,19,'user',1,NULL,NULL,1),(20,20,'user',1,NULL,NULL,1),(21,21,'user',1,NULL,NULL,1),(22,22,'user',1,NULL,NULL,1),(23,23,'user',1,NULL,NULL,1),(24,24,'user',1,NULL,NULL,1),(25,25,'user',1,NULL,NULL,1),(26,26,'user',1,NULL,NULL,1),(27,27,'user',1,NULL,NULL,1),(28,28,'user',1,NULL,NULL,1),(29,29,'user',1,NULL,NULL,1),(30,30,'user',1,NULL,NULL,1),(31,31,'user',1,NULL,NULL,1),(32,38,'user',1,NULL,NULL,1),(33,40,'user',1,NULL,NULL,1),(34,41,'user',1,NULL,NULL,1),(35,42,'user',1,NULL,NULL,1),(36,43,'user',1,NULL,NULL,1),(37,44,'user',1,NULL,NULL,1),(38,45,'user',1,NULL,NULL,1),(39,46,'user',1,NULL,NULL,1),(40,47,'user',1,NULL,NULL,1),(41,48,'user',1,NULL,NULL,1),(42,49,'user',1,NULL,NULL,1),(43,50,'user',1,NULL,NULL,1),(44,51,'user',1,NULL,NULL,1),(45,52,'user',1,NULL,NULL,1),(46,53,'user',1,NULL,NULL,1),(47,54,'user',1,NULL,NULL,1),(48,55,'user',1,NULL,NULL,1),(49,56,'user',1,NULL,NULL,1),(50,121,'user',3,NULL,NULL,1),(51,122,'user',1,NULL,NULL,1),(52,123,'user',1,NULL,NULL,1),(53,124,'user',1,NULL,NULL,1),(54,125,'user',1,NULL,NULL,1),(55,127,'user',1,NULL,NULL,1),(56,128,'user',1,NULL,NULL,1),(57,129,'user',1,NULL,NULL,1),(58,130,'user',1,NULL,NULL,1),(59,131,'user',1,NULL,NULL,1),(60,132,'user',1,NULL,NULL,1),(61,133,'user',1,NULL,NULL,1),(62,134,'user',1,NULL,NULL,1),(63,135,'user',1,NULL,NULL,1),(64,136,'user',1,NULL,NULL,1),(65,137,'user',1,NULL,NULL,1),(66,138,'user',1,NULL,NULL,1),(67,139,'user',1,NULL,NULL,1),(68,140,'user',1,NULL,NULL,1),(69,141,'user',1,NULL,NULL,1),(70,142,'user',1,NULL,NULL,1),(71,143,'user',1,NULL,NULL,1),(72,144,'user',1,NULL,NULL,1),(73,145,'user',1,NULL,NULL,1),(74,146,'user',1,NULL,NULL,1),(75,147,'user',1,NULL,NULL,1),(76,148,'user',1,NULL,NULL,1),(77,149,'user',1,NULL,NULL,1),(78,150,'user',1,NULL,NULL,1),(79,151,'user',1,NULL,NULL,1),(80,152,'user',1,NULL,NULL,1),(81,203,'user',1,NULL,NULL,1),(82,204,'user',1,NULL,NULL,1),(83,205,'user',1,NULL,NULL,1),(84,206,'user',1,NULL,NULL,1),(85,207,'user',1,NULL,NULL,1),(86,208,'user',1,NULL,NULL,1),(87,209,'user',1,NULL,NULL,1),(88,210,'user',1,NULL,NULL,1),(89,211,'user',1,NULL,NULL,1),(90,212,'user',1,NULL,NULL,1),(91,213,'user',1,NULL,NULL,1),(92,214,'user',1,NULL,NULL,1),(93,215,'user',1,NULL,NULL,1),(94,216,'user',1,NULL,NULL,1),(95,217,'user',1,NULL,NULL,1),(96,218,'user',1,NULL,NULL,1),(97,219,'user',1,NULL,NULL,1),(98,220,'user',1,NULL,NULL,1),(99,221,'user',1,NULL,NULL,1),(100,222,'user',1,NULL,NULL,1),(101,223,'user',1,NULL,NULL,1),(102,224,'user',1,NULL,NULL,1),(103,225,'user',1,NULL,NULL,1),(104,226,'user',1,NULL,NULL,1),(105,227,'user',1,NULL,NULL,1),(106,228,'user',1,NULL,NULL,1),(107,229,'user',1,NULL,NULL,1),(108,230,'user',1,NULL,NULL,1),(109,231,'user',1,NULL,NULL,1),(110,232,'user',12,'0',0,0),(111,233,'user',12,'0',0,0),(112,234,'user',12,'0',0,1),(113,235,'user',12,'0',0,1),(114,236,'user',4,'0',0,0),(115,237,'user',13,'0',0,0),(116,237,'user',16,'0',0,0),(117,237,'user',18,'0',0,0),(118,238,'user',12,'0',0,1),(119,238,'user',3,'0',0,1),(120,238,'user',10,'0',0,1),(121,239,'user',12,'0',0,0),(123,240,'user',12,'0',0,1),(125,242,'user',12,'0',0,0),(126,243,'user',12,'0',0,0),(128,245,'user',12,'0',0,0),(132,249,'user',12,'0',0,0),(133,250,'user',12,'0',0,0),(134,251,'user',12,'0',0,0),(135,252,'user',12,'0',0,0),(136,253,'user',12,'0',0,0),(137,254,'user',12,'0',0,0),(138,255,'user',12,'0',0,0),(139,256,'user',12,'0',0,0),(140,257,'user',12,'0',0,0),(146,263,'user',12,'0',0,0),(147,264,'user',12,'0',0,0),(148,265,'user',12,'0',0,0),(149,266,'user',12,'0',0,0),(150,267,'user',12,'0',0,0),(151,268,'user',12,'0',0,0),(152,269,'user',12,'0',0,0),(153,270,'user',12,'0',0,0),(154,271,'user',12,'0',0,0),(155,272,'user',12,'0',0,0),(156,273,'user',12,'0',0,0),(157,274,'user',12,'0',0,0),(158,275,'user',12,'0',0,0),(160,277,'user',12,'0',0,0),(161,278,'user',12,'0',0,0),(162,279,'user',12,'0',0,0),(164,281,'user',12,'0',0,0),(165,282,'user',12,'0',0,0),(166,283,'user',12,'0',0,0),(167,284,'user',12,'0',0,0),(168,285,'user',12,'0',0,0),(169,286,'user',12,'0',0,0),(170,287,'user',12,'0',0,0),(171,288,'user',12,'0',0,0),(177,294,'user',12,'0',0,0),(178,295,'user',12,'0',0,0),(179,296,'user',12,'0',0,0),(180,297,'user',12,'0',0,0),(181,298,'user',1,'0',0,0),(182,299,'user',2,'0',0,0),(183,300,'user',1,'0',0,0),(184,301,'user',2,'0',0,0),(185,302,'user',2,'0',0,0),(186,303,'user',2,'0',0,0),(187,304,'user',1,'0',0,0),(188,305,'user',2,'0',0,0),(189,306,'user',2,'0',0,0),(190,307,'user',1,'0',0,0),(191,308,'user',1,'0',0,0),(192,309,'user',1,'0',0,0),(193,310,'user',2,'0',0,0),(194,311,'user',2,'0',0,0),(195,312,'user',1,'0',0,0),(196,313,'user',2,'0',0,0),(197,314,'user',1,'0',0,0),(198,315,'user',2,'0',0,0),(199,316,'user',2,'0',0,0),(200,317,'user',2,'0',0,0),(201,318,'user',1,'0',0,0),(202,319,'user',2,'0',0,0),(203,320,'user',12,'0',0,0),(204,321,'user',12,'0',0,0),(205,322,'user',12,'0',0,0),(206,323,'user',12,'0',0,0),(207,324,'user',12,'0',0,0),(208,325,'user',12,'0',0,0),(209,326,'user',12,'0',0,0);
+INSERT INTO `llx_actioncomm_resources` VALUES (1,1,'user',1,NULL,NULL,1),(2,2,'user',1,NULL,NULL,1),(3,3,'user',1,NULL,NULL,1),(4,4,'user',1,NULL,NULL,1),(5,5,'user',1,NULL,NULL,1),(6,6,'user',1,NULL,NULL,1),(7,7,'user',1,NULL,NULL,1),(8,8,'user',1,NULL,NULL,1),(9,9,'user',1,NULL,NULL,1),(10,10,'user',1,NULL,NULL,1),(11,11,'user',1,NULL,NULL,1),(12,12,'user',1,NULL,NULL,1),(13,13,'user',1,NULL,NULL,1),(14,14,'user',1,NULL,NULL,1),(15,15,'user',1,NULL,NULL,1),(16,16,'user',1,NULL,NULL,1),(17,17,'user',1,NULL,NULL,1),(18,18,'user',1,NULL,NULL,1),(19,19,'user',1,NULL,NULL,1),(20,20,'user',1,NULL,NULL,1),(21,21,'user',1,NULL,NULL,1),(22,22,'user',1,NULL,NULL,1),(23,23,'user',1,NULL,NULL,1),(24,24,'user',1,NULL,NULL,1),(25,25,'user',1,NULL,NULL,1),(26,26,'user',1,NULL,NULL,1),(27,27,'user',1,NULL,NULL,1),(28,28,'user',1,NULL,NULL,1),(29,29,'user',1,NULL,NULL,1),(30,30,'user',1,NULL,NULL,1),(31,31,'user',1,NULL,NULL,1),(32,38,'user',1,NULL,NULL,1),(33,40,'user',1,NULL,NULL,1),(34,41,'user',1,NULL,NULL,1),(35,42,'user',1,NULL,NULL,1),(36,43,'user',1,NULL,NULL,1),(37,44,'user',1,NULL,NULL,1),(38,45,'user',1,NULL,NULL,1),(39,46,'user',1,NULL,NULL,1),(40,47,'user',1,NULL,NULL,1),(41,48,'user',1,NULL,NULL,1),(42,49,'user',1,NULL,NULL,1),(43,50,'user',1,NULL,NULL,1),(44,51,'user',1,NULL,NULL,1),(45,52,'user',1,NULL,NULL,1),(46,53,'user',1,NULL,NULL,1),(47,54,'user',1,NULL,NULL,1),(48,55,'user',1,NULL,NULL,1),(49,56,'user',1,NULL,NULL,1),(50,121,'user',3,NULL,NULL,1),(51,122,'user',1,NULL,NULL,1),(52,123,'user',1,NULL,NULL,1),(53,124,'user',1,NULL,NULL,1),(54,125,'user',1,NULL,NULL,1),(55,127,'user',1,NULL,NULL,1),(56,128,'user',1,NULL,NULL,1),(57,129,'user',1,NULL,NULL,1),(58,130,'user',1,NULL,NULL,1),(59,131,'user',1,NULL,NULL,1),(60,132,'user',1,NULL,NULL,1),(61,133,'user',1,NULL,NULL,1),(62,134,'user',1,NULL,NULL,1),(63,135,'user',1,NULL,NULL,1),(64,136,'user',1,NULL,NULL,1),(65,137,'user',1,NULL,NULL,1),(66,138,'user',1,NULL,NULL,1),(67,139,'user',1,NULL,NULL,1),(68,140,'user',1,NULL,NULL,1),(69,141,'user',1,NULL,NULL,1),(70,142,'user',1,NULL,NULL,1),(71,143,'user',1,NULL,NULL,1),(72,144,'user',1,NULL,NULL,1),(73,145,'user',1,NULL,NULL,1),(74,146,'user',1,NULL,NULL,1),(75,147,'user',1,NULL,NULL,1),(76,148,'user',1,NULL,NULL,1),(77,149,'user',1,NULL,NULL,1),(78,150,'user',1,NULL,NULL,1),(79,151,'user',1,NULL,NULL,1),(80,152,'user',1,NULL,NULL,1),(81,203,'user',1,NULL,NULL,1),(82,204,'user',1,NULL,NULL,1),(83,205,'user',1,NULL,NULL,1),(84,206,'user',1,NULL,NULL,1),(85,207,'user',1,NULL,NULL,1),(86,208,'user',1,NULL,NULL,1),(87,209,'user',1,NULL,NULL,1),(88,210,'user',1,NULL,NULL,1),(89,211,'user',1,NULL,NULL,1),(90,212,'user',1,NULL,NULL,1),(91,213,'user',1,NULL,NULL,1),(92,214,'user',1,NULL,NULL,1),(93,215,'user',1,NULL,NULL,1),(94,216,'user',1,NULL,NULL,1),(95,217,'user',1,NULL,NULL,1),(96,218,'user',1,NULL,NULL,1),(97,219,'user',1,NULL,NULL,1),(98,220,'user',1,NULL,NULL,1),(99,221,'user',1,NULL,NULL,1),(100,222,'user',1,NULL,NULL,1),(101,223,'user',1,NULL,NULL,1),(102,224,'user',1,NULL,NULL,1),(103,225,'user',1,NULL,NULL,1),(104,226,'user',1,NULL,NULL,1),(105,227,'user',1,NULL,NULL,1),(106,228,'user',1,NULL,NULL,1),(107,229,'user',1,NULL,NULL,1),(108,230,'user',1,NULL,NULL,1),(109,231,'user',1,NULL,NULL,1),(110,232,'user',12,'0',0,0),(111,233,'user',12,'0',0,0),(112,234,'user',12,'0',0,1),(113,235,'user',12,'0',0,1),(114,236,'user',4,'0',0,0),(115,237,'user',13,'0',0,0),(116,237,'user',16,'0',0,0),(117,237,'user',18,'0',0,0),(118,238,'user',12,'0',0,1),(119,238,'user',3,'0',0,1),(120,238,'user',10,'0',0,1),(121,239,'user',12,'0',0,0),(123,240,'user',12,'0',0,1),(125,242,'user',12,'0',0,0),(126,243,'user',12,'0',0,0),(128,245,'user',12,'0',0,0),(132,249,'user',12,'0',0,0),(133,250,'user',12,'0',0,0),(134,251,'user',12,'0',0,0),(135,252,'user',12,'0',0,0),(136,253,'user',12,'0',0,0),(137,254,'user',12,'0',0,0),(138,255,'user',12,'0',0,0),(139,256,'user',12,'0',0,0),(140,257,'user',12,'0',0,0),(146,263,'user',12,'0',0,0),(147,264,'user',12,'0',0,0),(148,265,'user',12,'0',0,0),(149,266,'user',12,'0',0,0),(150,267,'user',12,'0',0,0),(151,268,'user',12,'0',0,0),(152,269,'user',12,'0',0,0),(153,270,'user',12,'0',0,0),(154,271,'user',12,'0',0,0),(155,272,'user',12,'0',0,0),(156,273,'user',12,'0',0,0),(157,274,'user',12,'0',0,0),(158,275,'user',12,'0',0,0),(160,277,'user',12,'0',0,0),(161,278,'user',12,'0',0,0),(162,279,'user',12,'0',0,0),(164,281,'user',12,'0',0,0),(165,282,'user',12,'0',0,0),(166,283,'user',12,'0',0,0),(167,284,'user',12,'0',0,0),(168,285,'user',12,'0',0,0),(169,286,'user',12,'0',0,0),(170,287,'user',12,'0',0,0),(171,288,'user',12,'0',0,0),(177,294,'user',12,'0',0,0),(178,295,'user',12,'0',0,0),(179,296,'user',12,'0',0,0),(180,297,'user',12,'0',0,0),(181,298,'user',1,'0',0,0),(182,299,'user',2,'0',0,0),(183,300,'user',1,'0',0,0),(184,301,'user',2,'0',0,0),(185,302,'user',2,'0',0,0),(186,303,'user',2,'0',0,0),(187,304,'user',1,'0',0,0),(188,305,'user',2,'0',0,0),(189,306,'user',2,'0',0,0),(190,307,'user',1,'0',0,0),(191,308,'user',1,'0',0,0),(192,309,'user',1,'0',0,0),(193,310,'user',2,'0',0,0),(194,311,'user',2,'0',0,0),(195,312,'user',1,'0',0,0),(196,313,'user',2,'0',0,0),(197,314,'user',1,'0',0,0),(198,315,'user',2,'0',0,0),(199,316,'user',2,'0',0,0),(200,317,'user',2,'0',0,0),(201,318,'user',1,'0',0,0),(202,319,'user',2,'0',0,0),(203,320,'user',12,'0',0,0),(204,321,'user',12,'0',0,0),(205,322,'user',12,'0',0,0),(206,323,'user',12,'0',0,0),(207,324,'user',12,'0',0,0),(208,325,'user',12,'0',0,0),(209,326,'user',12,'0',0,0),(210,327,'user',12,'0',0,0);
 /*!40000 ALTER TABLE `llx_actioncomm_resources` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -581,6 +581,7 @@ CREATE TABLE `llx_bank_account` (
   `note_public` text,
   `model_pdf` varchar(255) DEFAULT NULL,
   `import_key` varchar(14) DEFAULT NULL,
+  `extraparams` varchar(255) DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_bank_account_label` (`label`,`entity`)
 ) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8;
@@ -592,7 +593,7 @@ CREATE TABLE `llx_bank_account` (
 
 LOCK TABLES `llx_bank_account` WRITE;
 /*!40000 ALTER TABLE `llx_bank_account` DISABLE KEYS */;
-INSERT INTO `llx_bank_account` VALUES (1,'2010-07-08 23:56:14','2016-07-30 14:45:12','SWIBAC','Swiss bank account',1,'Switz Gold Bank','','','123456789','','','NL39RABO0314043352',NULL,NULL,'21 jum street',NULL,6,'Mac Golder','11 big road,\r\nZurich',1,0,1,NULL,'','','EUR',1500,1500,'',NULL,NULL,NULL,NULL,NULL),(2,'2010-07-09 00:00:24','2016-07-30 15:17:18','SWIBAC2','Swiss bank account old',1,'Switz Silver Bank','','','','','','NL07SNSB0908534915',NULL,NULL,'Road bankrupt\r\nZurich',NULL,6,'','',1,1,1,NULL,'','','EUR',200,400,'',NULL,NULL,NULL,NULL,NULL),(3,'2010-07-10 13:33:42','2010-07-10 11:33:42','ACCOUNTCASH','Account for cash',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'3',1,NULL,NULL,2,0,1,NULL,'',NULL,'EUR',0,0,'<br />',NULL,NULL,NULL,NULL,NULL),(4,'2016-07-30 18:42:14','2016-07-30 14:44:45','LUXBAC','Luxemburg Bank Account',1,'Lux Platinuium Bank','','','','','','NL46INGB0687674581',NULL,NULL,'',NULL,140,'','',1,0,1,NULL,'','','EUR',NULL,NULL,'',NULL,NULL,NULL,NULL,NULL);
+INSERT INTO `llx_bank_account` VALUES (1,'2010-07-08 23:56:14','2016-07-30 14:45:12','SWIBAC','Swiss bank account',1,'Switz Gold Bank','','','123456789','','','NL39RABO0314043352',NULL,NULL,'21 jum street',NULL,6,'Mac Golder','11 big road,\r\nZurich',1,0,1,NULL,'','','EUR',1500,1500,'',NULL,NULL,NULL,NULL,NULL,NULL),(2,'2010-07-09 00:00:24','2016-07-30 15:17:18','SWIBAC2','Swiss bank account old',1,'Switz Silver Bank','','','','','','NL07SNSB0908534915',NULL,NULL,'Road bankrupt\r\nZurich',NULL,6,'','',1,1,1,NULL,'','','EUR',200,400,'',NULL,NULL,NULL,NULL,NULL,NULL),(3,'2010-07-10 13:33:42','2010-07-10 11:33:42','ACCOUNTCASH','Account for cash',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'3',1,NULL,NULL,2,0,1,NULL,'',NULL,'EUR',0,0,'<br />',NULL,NULL,NULL,NULL,NULL,NULL),(4,'2016-07-30 18:42:14','2016-07-30 14:44:45','LUXBAC','Luxemburg Bank Account',1,'Lux Platinuium Bank','','','','','','NL46INGB0687674581',NULL,NULL,'',NULL,140,'','',1,0,1,NULL,'','','EUR',NULL,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL);
 /*!40000 ALTER TABLE `llx_bank_account` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -799,7 +800,7 @@ CREATE TABLE `llx_boxes` (
 
 LOCK TABLES `llx_boxes` WRITE;
 /*!40000 ALTER TABLE `llx_boxes` DISABLE KEYS */;
-INSERT INTO `llx_boxes` VALUES (253,2,323,0,'0',0,NULL,NULL),(304,2,324,0,'0',0,NULL,NULL),(305,2,325,0,'0',0,NULL,NULL),(306,2,326,0,'0',0,NULL,NULL),(307,2,327,0,'0',0,NULL,NULL),(308,2,328,0,'0',0,NULL,NULL),(309,2,329,0,'0',0,NULL,NULL),(310,2,330,0,'0',0,NULL,NULL),(311,2,331,0,'0',0,NULL,NULL),(312,2,332,0,'0',0,NULL,NULL),(313,2,333,0,'0',0,NULL,NULL),(314,1,347,0,'A01',0,NULL,NULL),(315,1,348,0,'B18',0,NULL,NULL),(316,1,349,0,'A19',0,NULL,NULL),(317,1,350,0,'B20',0,NULL,NULL),(344,1,374,0,'A21',0,NULL,NULL),(347,1,377,0,'B22',0,NULL,NULL),(348,1,378,0,'A23',0,NULL,NULL),(349,1,379,0,'B24',0,NULL,NULL),(358,1,388,0,'A25',0,NULL,NULL),(359,1,389,0,'B26',0,NULL,NULL),(360,1,390,0,'A27',0,NULL,NULL),(361,1,391,0,'B28',0,NULL,NULL),(362,1,392,0,'A29',0,NULL,NULL),(363,1,393,0,'B30',0,NULL,NULL),(366,1,396,0,'A17',0,NULL,NULL),(387,1,403,0,'B16',0,NULL,NULL),(392,1,409,0,'A15',0,NULL,NULL),(393,1,410,0,'B02',0,NULL,NULL),(394,1,411,0,'A03',0,NULL,NULL),(395,1,412,0,'B04',0,NULL,NULL),(396,1,413,0,'A05',0,NULL,NULL),(397,1,414,0,'B06',0,NULL,NULL),(398,1,415,0,'A07',0,NULL,NULL),(399,1,416,0,'B08',0,NULL,NULL),(400,1,417,0,'A09',0,NULL,NULL),(401,1,418,0,'B10',0,NULL,NULL),(501,1,419,0,'A11',0,NULL,NULL),(1019,1,392,0,'A01',2,NULL,NULL),(1021,1,412,0,'A03',2,NULL,NULL),(1022,1,347,0,'A04',2,NULL,NULL),(1023,1,393,0,'A05',2,NULL,NULL),(1025,1,389,0,'A07',2,NULL,NULL),(1026,1,416,0,'A08',2,NULL,NULL),(1027,1,396,0,'B01',2,NULL,NULL),(1028,1,377,0,'B02',2,NULL,NULL),(1029,1,379,0,'B03',2,NULL,NULL),(1031,1,419,0,'B05',2,NULL,NULL),(1036,1,424,0,'0',0,NULL,NULL),(1037,1,425,0,'0',0,NULL,NULL),(1038,1,426,0,'0',0,NULL,NULL),(1039,1,427,0,'0',0,NULL,NULL),(1115,1,412,0,'A01',12,NULL,NULL),(1116,1,392,0,'A02',12,NULL,NULL),(1117,1,377,0,'A03',12,NULL,NULL),(1118,1,347,0,'A04',12,NULL,NULL),(1119,1,396,0,'B01',12,NULL,NULL);
+INSERT INTO `llx_boxes` VALUES (253,2,323,0,'0',0,NULL,NULL),(304,2,324,0,'0',0,NULL,NULL),(305,2,325,0,'0',0,NULL,NULL),(306,2,326,0,'0',0,NULL,NULL),(307,2,327,0,'0',0,NULL,NULL),(308,2,328,0,'0',0,NULL,NULL),(309,2,329,0,'0',0,NULL,NULL),(310,2,330,0,'0',0,NULL,NULL),(311,2,331,0,'0',0,NULL,NULL),(312,2,332,0,'0',0,NULL,NULL),(313,2,333,0,'0',0,NULL,NULL),(314,1,347,0,'A01',0,NULL,NULL),(315,1,348,0,'B18',0,NULL,NULL),(316,1,349,0,'A19',0,NULL,NULL),(317,1,350,0,'B20',0,NULL,NULL),(344,1,374,0,'A21',0,NULL,NULL),(347,1,377,0,'B22',0,NULL,NULL),(348,1,378,0,'A23',0,NULL,NULL),(358,1,388,0,'A25',0,NULL,NULL),(359,1,389,0,'B26',0,NULL,NULL),(360,1,390,0,'A27',0,NULL,NULL),(362,1,392,0,'A29',0,NULL,NULL),(363,1,393,0,'B30',0,NULL,NULL),(366,1,396,0,'A17',0,NULL,NULL),(387,1,403,0,'B16',0,NULL,NULL),(392,1,409,0,'A15',0,NULL,NULL),(393,1,410,0,'B02',0,NULL,NULL),(394,1,411,0,'A03',0,NULL,NULL),(395,1,412,0,'B04',0,NULL,NULL),(396,1,413,0,'A05',0,NULL,NULL),(397,1,414,0,'B06',0,NULL,NULL),(398,1,415,0,'A07',0,NULL,NULL),(399,1,416,0,'B08',0,NULL,NULL),(400,1,417,0,'A09',0,NULL,NULL),(401,1,418,0,'B10',0,NULL,NULL),(501,1,419,0,'A11',0,NULL,NULL),(1019,1,392,0,'A01',2,NULL,NULL),(1021,1,412,0,'A03',2,NULL,NULL),(1022,1,347,0,'A04',2,NULL,NULL),(1023,1,393,0,'A05',2,NULL,NULL),(1025,1,389,0,'A07',2,NULL,NULL),(1026,1,416,0,'A08',2,NULL,NULL),(1027,1,396,0,'B01',2,NULL,NULL),(1028,1,377,0,'B02',2,NULL,NULL),(1031,1,419,0,'B05',2,NULL,NULL),(1036,1,424,0,'0',0,NULL,NULL),(1037,1,425,0,'0',0,NULL,NULL),(1038,1,426,0,'0',0,NULL,NULL),(1039,1,427,0,'0',0,NULL,NULL),(1115,1,412,0,'A01',12,NULL,NULL),(1116,1,392,0,'A02',12,NULL,NULL),(1117,1,377,0,'A03',12,NULL,NULL),(1118,1,347,0,'A04',12,NULL,NULL),(1119,1,396,0,'B01',12,NULL,NULL);
 /*!40000 ALTER TABLE `llx_boxes` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -827,7 +828,7 @@ CREATE TABLE `llx_boxes_def` (
 
 LOCK TABLES `llx_boxes_def` WRITE;
 /*!40000 ALTER TABLE `llx_boxes_def` DISABLE KEYS */;
-INSERT INTO `llx_boxes_def` VALUES (188,'box_services_vendus.php',1,'2011-08-05 20:40:27',NULL),(323,'box_actions.php',2,'2013-03-13 15:29:19',NULL),(324,'box_clients.php',2,'2013-03-13 20:21:35',NULL),(325,'box_prospect.php',2,'2013-03-13 20:21:35',NULL),(326,'box_contacts.php',2,'2013-03-13 20:21:35',NULL),(327,'box_activity.php',2,'2013-03-13 20:21:35','(WarningUsingThisBoxSlowDown)'),(328,'box_propales.php',2,'2013-03-13 20:32:38',NULL),(329,'box_comptes.php',2,'2013-03-13 20:33:09',NULL),(330,'box_factures_imp.php',2,'2013-03-13 20:33:09',NULL),(331,'box_factures.php',2,'2013-03-13 20:33:09',NULL),(332,'box_produits.php',2,'2013-03-13 20:33:09',NULL),(333,'box_produits_alerte_stock.php',2,'2013-03-13 20:33:09',NULL),(346,'box_googlemaps@google',1,'2013-11-07 00:01:39',NULL),(347,'box_clients.php',1,'2015-11-15 22:05:57',NULL),(348,'box_prospect.php',1,'2015-11-15 22:05:57',NULL),(349,'box_contacts.php',1,'2015-11-15 22:05:57',NULL),(350,'box_activity.php',1,'2015-11-15 22:05:57','(WarningUsingThisBoxSlowDown)'),(374,'box_services_contracts.php',1,'2015-11-15 22:38:37',NULL),(377,'box_project.php',1,'2015-11-15 22:38:44',NULL),(378,'box_task.php',1,'2015-11-15 22:38:44',NULL),(379,'box_members.php',1,'2015-11-15 22:39:17',NULL),(388,'box_contracts.php',1,'2015-11-15 22:39:52',NULL),(389,'box_services_expired.php',1,'2015-11-15 22:39:52',NULL),(390,'box_ficheinter.php',1,'2015-11-15 22:39:56',NULL),(391,'box_bookmarks.php',1,'2015-11-15 22:40:51',NULL),(392,'box_graph_propales_permonth.php',1,'2015-11-15 22:41:47',NULL),(393,'box_propales.php',1,'2015-11-15 22:41:47',NULL),(396,'box_graph_product_distribution.php',1,'2015-11-15 22:41:47',NULL),(403,'box_goodcustomers.php',1,'2016-07-30 11:13:20','(WarningUsingThisBoxSlowDown)'),(404,'box_external_rss.php',1,'2016-07-30 11:15:25','1 (Dolibarr.org News)'),(409,'box_produits.php',1,'2016-07-30 13:38:11',NULL),(410,'box_produits_alerte_stock.php',1,'2016-07-30 13:38:11',NULL),(411,'box_commandes.php',1,'2016-07-30 13:38:11',NULL),(412,'box_graph_orders_permonth.php',1,'2016-07-30 13:38:11',NULL),(413,'box_graph_invoices_supplier_permonth.php',1,'2016-07-30 13:38:11',NULL),(414,'box_graph_orders_supplier_permonth.php',1,'2016-07-30 13:38:11',NULL),(415,'box_fournisseurs.php',1,'2016-07-30 13:38:11',NULL),(416,'box_factures_fourn_imp.php',1,'2016-07-30 13:38:11',NULL),(417,'box_factures_fourn.php',1,'2016-07-30 13:38:11',NULL),(418,'box_supplier_orders.php',1,'2016-07-30 13:38:11',NULL),(419,'box_actions.php',1,'2016-07-30 15:42:32',NULL),(424,'box_factures_imp.php',1,'2017-02-07 18:56:12',NULL),(425,'box_factures.php',1,'2017-02-07 18:56:12',NULL),(426,'box_graph_invoices_permonth.php',1,'2017-02-07 18:56:12',NULL),(427,'box_comptes.php',1,'2017-02-07 18:56:12',NULL);
+INSERT INTO `llx_boxes_def` VALUES (188,'box_services_vendus.php',1,'2011-08-05 20:40:27',NULL),(323,'box_actions.php',2,'2013-03-13 15:29:19',NULL),(324,'box_clients.php',2,'2013-03-13 20:21:35',NULL),(325,'box_prospect.php',2,'2013-03-13 20:21:35',NULL),(326,'box_contacts.php',2,'2013-03-13 20:21:35',NULL),(327,'box_activity.php',2,'2013-03-13 20:21:35','(WarningUsingThisBoxSlowDown)'),(328,'box_propales.php',2,'2013-03-13 20:32:38',NULL),(329,'box_comptes.php',2,'2013-03-13 20:33:09',NULL),(330,'box_factures_imp.php',2,'2013-03-13 20:33:09',NULL),(331,'box_factures.php',2,'2013-03-13 20:33:09',NULL),(332,'box_produits.php',2,'2013-03-13 20:33:09',NULL),(333,'box_produits_alerte_stock.php',2,'2013-03-13 20:33:09',NULL),(346,'box_googlemaps@google',1,'2013-11-07 00:01:39',NULL),(347,'box_clients.php',1,'2015-11-15 22:05:57',NULL),(348,'box_prospect.php',1,'2015-11-15 22:05:57',NULL),(349,'box_contacts.php',1,'2015-11-15 22:05:57',NULL),(350,'box_activity.php',1,'2015-11-15 22:05:57','(WarningUsingThisBoxSlowDown)'),(374,'box_services_contracts.php',1,'2015-11-15 22:38:37',NULL),(377,'box_project.php',1,'2015-11-15 22:38:44',NULL),(378,'box_task.php',1,'2015-11-15 22:38:44',NULL),(388,'box_contracts.php',1,'2015-11-15 22:39:52',NULL),(389,'box_services_expired.php',1,'2015-11-15 22:39:52',NULL),(390,'box_ficheinter.php',1,'2015-11-15 22:39:56',NULL),(392,'box_graph_propales_permonth.php',1,'2015-11-15 22:41:47',NULL),(393,'box_propales.php',1,'2015-11-15 22:41:47',NULL),(396,'box_graph_product_distribution.php',1,'2015-11-15 22:41:47',NULL),(403,'box_goodcustomers.php',1,'2016-07-30 11:13:20','(WarningUsingThisBoxSlowDown)'),(404,'box_external_rss.php',1,'2016-07-30 11:15:25','1 (Dolibarr.org News)'),(409,'box_produits.php',1,'2016-07-30 13:38:11',NULL),(410,'box_produits_alerte_stock.php',1,'2016-07-30 13:38:11',NULL),(411,'box_commandes.php',1,'2016-07-30 13:38:11',NULL),(412,'box_graph_orders_permonth.php',1,'2016-07-30 13:38:11',NULL),(413,'box_graph_invoices_supplier_permonth.php',1,'2016-07-30 13:38:11',NULL),(414,'box_graph_orders_supplier_permonth.php',1,'2016-07-30 13:38:11',NULL),(415,'box_fournisseurs.php',1,'2016-07-30 13:38:11',NULL),(416,'box_factures_fourn_imp.php',1,'2016-07-30 13:38:11',NULL),(417,'box_factures_fourn.php',1,'2016-07-30 13:38:11',NULL),(418,'box_supplier_orders.php',1,'2016-07-30 13:38:11',NULL),(419,'box_actions.php',1,'2016-07-30 15:42:32',NULL),(424,'box_factures_imp.php',1,'2017-02-07 18:56:12',NULL),(425,'box_factures.php',1,'2017-02-07 18:56:12',NULL),(426,'box_graph_invoices_permonth.php',1,'2017-02-07 18:56:12',NULL),(427,'box_comptes.php',1,'2017-02-07 18:56:12',NULL);
 /*!40000 ALTER TABLE `llx_boxes_def` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1035,7 +1036,7 @@ CREATE TABLE `llx_c_barcode_type` (
   `example` varchar(16) NOT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_c_barcode_type` (`code`,`entity`)
-) ENGINE=InnoDB AUTO_INCREMENT=23 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=31 DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -2354,7 +2355,7 @@ CREATE TABLE `llx_categorie_contact` (
 
 LOCK TABLES `llx_categorie_contact` WRITE;
 /*!40000 ALTER TABLE `llx_categorie_contact` DISABLE KEYS */;
-INSERT INTO `llx_categorie_contact` VALUES (18,3,NULL),(18,6,NULL),(19,6,NULL),(26,9,NULL),(27,7,NULL),(27,8,NULL),(27,10,NULL);
+INSERT INTO `llx_categorie_contact` VALUES (18,3,NULL),(18,6,NULL),(19,6,NULL),(26,9,NULL),(27,7,NULL),(27,8,NULL),(27,10,NULL),(28,11,NULL);
 /*!40000 ALTER TABLE `llx_categorie_contact` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -2525,7 +2526,7 @@ CREATE TABLE `llx_categorie_societe` (
 
 LOCK TABLES `llx_categorie_societe` WRITE;
 /*!40000 ALTER TABLE `llx_categorie_societe` DISABLE KEYS */;
-INSERT INTO `llx_categorie_societe` VALUES (2,2,NULL),(2,19,NULL),(12,10,NULL);
+INSERT INTO `llx_categorie_societe` VALUES (2,2,NULL),(2,19,NULL),(12,10,NULL),(12,11,NULL),(14,11,NULL);
 /*!40000 ALTER TABLE `llx_categorie_societe` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -3096,7 +3097,7 @@ CREATE TABLE `llx_const` (
   `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_const` (`name`,`entity`)
-) ENGINE=InnoDB AUTO_INCREMENT=6092 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=6102 DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -3105,7 +3106,7 @@ CREATE TABLE `llx_const` (
 
 LOCK TABLES `llx_const` WRITE;
 /*!40000 ALTER TABLE `llx_const` DISABLE KEYS */;
-INSERT INTO `llx_const` VALUES (8,'MAIN_UPLOAD_DOC',0,'2048','chaine',0,'Max size for file upload (0 means no upload allowed)','2010-07-08 11:17:57'),(9,'MAIN_SEARCHFORM_SOCIETE',0,'1','yesno',0,'Show form for quick company search','2010-07-08 11:17:57'),(10,'MAIN_SEARCHFORM_CONTACT',0,'1','yesno',0,'Show form for quick contact search','2010-07-08 11:17:57'),(11,'MAIN_SEARCHFORM_PRODUITSERVICE',0,'1','yesno',0,'Show form for quick product search','2010-07-08 11:17:58'),(12,'MAIN_SEARCHFORM_ADHERENT',0,'1','yesno',0,'Show form for quick member search','2010-07-08 11:17:58'),(16,'MAIN_SIZE_LISTE_LIMIT',0,'25','chaine',0,'Longueur maximum des listes','2010-07-08 11:17:58'),(17,'MAIN_SHOW_WORKBOARD',0,'1','yesno',0,'Affichage tableau de bord de travail Dolibarr','2010-07-08 11:17:58'),(29,'MAIN_DELAY_NOT_ACTIVATED_SERVICES',1,'0','chaine',0,'Tolérance de retard avant alerte (en jours) sur services à activer','2010-07-08 11:17:58'),(33,'SOCIETE_NOLIST_COURRIER',0,'1','yesno',0,'Liste les fichiers du repertoire courrier','2010-07-08 11:17:58'),(36,'ADHERENT_MAIL_REQUIRED',1,'1','yesno',0,'EMail required to create a new member','2010-07-08 11:17:58'),(37,'ADHERENT_MAIL_FROM',1,'adherents@domain.com','chaine',0,'Sender EMail for automatic emails','2010-07-08 11:17:58'),(38,'ADHERENT_MAIL_RESIL',1,'Your subscription has been resiliated.\r\nWe hope to see you soon again','texte',0,'Mail resiliation','2010-07-08 11:17:58'),(39,'ADHERENT_MAIL_VALID',1,'Your subscription has been validated.\r\nThis is a remind of your personal information :\r\n\r\n%INFOS%\r\n\r\n','texte',0,'Mail de validation','2010-07-08 11:17:59'),(40,'ADHERENT_MAIL_COTIS',1,'Hello %PRENOM%,\r\nThanks for your subscription.\r\nThis email confirms that your subscription has been received and processed.\r\n\r\n','texte',0,'Mail de validation de cotisation','2010-07-08 11:17:59'),(41,'ADHERENT_MAIL_VALID_SUBJECT',1,'Your subscription has been validated','chaine',0,'Sujet du mail de validation','2010-07-08 11:17:59'),(42,'ADHERENT_MAIL_RESIL_SUBJECT',1,'Resiliating your subscription','chaine',0,'Sujet du mail de resiliation','2010-07-08 11:17:59'),(43,'ADHERENT_MAIL_COTIS_SUBJECT',1,'Receipt of your subscription','chaine',0,'Sujet du mail de validation de cotisation','2010-07-08 11:17:59'),(44,'MAILING_EMAIL_FROM',1,'dolibarr@domain.com','chaine',0,'EMail emmetteur pour les envois d emailings','2010-07-08 11:17:59'),(45,'ADHERENT_USE_MAILMAN',1,'0','yesno',0,'Utilisation de Mailman','2010-07-08 11:17:59'),(46,'ADHERENT_MAILMAN_UNSUB_URL',1,'http://lists.domain.com/cgi-bin/mailman/admin/%LISTE%/members?adminpw=%MAILMAN_ADMINPW%&user=%EMAIL%','chaine',0,'Url de desinscription aux listes mailman','2010-07-08 11:17:59'),(47,'ADHERENT_MAILMAN_URL',1,'http://lists.domain.com/cgi-bin/mailman/admin/%LISTE%/members?adminpw=%MAILMAN_ADMINPW%&send_welcome_msg_to_this_batch=1&subscribees=%EMAIL%','chaine',0,'Url pour les inscriptions mailman','2010-07-08 11:17:59'),(48,'ADHERENT_MAILMAN_LISTS',1,'test-test,test-test2','chaine',0,'Listes auxquelles inscrire les nouveaux adherents','2010-07-08 11:17:59'),(49,'ADHERENT_MAILMAN_ADMINPW',1,'','chaine',0,'Mot de passe Admin des liste mailman','2010-07-08 11:17:59'),(50,'ADHERENT_MAILMAN_SERVER',1,'lists.domain.com','chaine',0,'Serveur hebergeant les interfaces d Admin des listes mailman','2010-07-08 11:17:59'),(51,'ADHERENT_MAILMAN_LISTS_COTISANT',1,'','chaine',0,'Liste(s) auxquelles les nouveaux cotisants sont inscris automatiquement','2010-07-08 11:17:59'),(52,'ADHERENT_USE_SPIP',1,'0','yesno',0,'Utilisation de SPIP ?','2010-07-08 11:17:59'),(53,'ADHERENT_USE_SPIP_AUTO',1,'0','yesno',0,'Utilisation de SPIP automatiquement','2010-07-08 11:17:59'),(54,'ADHERENT_SPIP_USER',1,'user','chaine',0,'user spip','2010-07-08 11:17:59'),(55,'ADHERENT_SPIP_PASS',1,'pass','chaine',0,'Pass de connection','2010-07-08 11:17:59'),(56,'ADHERENT_SPIP_SERVEUR',1,'localhost','chaine',0,'serveur spip','2010-07-08 11:17:59'),(57,'ADHERENT_SPIP_DB',1,'spip','chaine',0,'db spip','2010-07-08 11:17:59'),(58,'ADHERENT_CARD_HEADER_TEXT',1,'%ANNEE%','chaine',0,'Texte imprime sur le haut de la carte adherent','2010-07-08 11:17:59'),(59,'ADHERENT_CARD_FOOTER_TEXT',1,'Association AZERTY','chaine',0,'Texte imprime sur le bas de la carte adherent','2010-07-08 11:17:59'),(61,'FCKEDITOR_ENABLE_USER',1,'1','yesno',0,'Activation fckeditor sur notes utilisateurs','2010-07-08 11:17:59'),(62,'FCKEDITOR_ENABLE_SOCIETE',1,'1','yesno',0,'Activation fckeditor sur notes societe','2010-07-08 11:17:59'),(63,'FCKEDITOR_ENABLE_PRODUCTDESC',1,'1','yesno',0,'Activation fckeditor sur notes produits','2010-07-08 11:17:59'),(64,'FCKEDITOR_ENABLE_MEMBER',1,'1','yesno',0,'Activation fckeditor sur notes adherent','2010-07-08 11:17:59'),(65,'FCKEDITOR_ENABLE_MAILING',1,'1','yesno',0,'Activation fckeditor sur emailing','2010-07-08 11:17:59'),(67,'DON_ADDON_MODEL',1,'html_cerfafr','chaine',0,'','2010-07-08 11:18:00'),(68,'PROPALE_ADDON',1,'mod_propale_marbre','chaine',0,'','2010-07-08 11:18:00'),(69,'PROPALE_ADDON_PDF',1,'azur','chaine',0,'','2010-07-08 11:18:00'),(70,'COMMANDE_ADDON',1,'mod_commande_marbre','chaine',0,'','2010-07-08 11:18:00'),(71,'COMMANDE_ADDON_PDF',1,'einstein','chaine',0,'','2010-07-08 11:18:00'),(72,'COMMANDE_SUPPLIER_ADDON',1,'mod_commande_fournisseur_muguet','chaine',0,'','2010-07-08 11:18:00'),(73,'COMMANDE_SUPPLIER_ADDON_PDF',1,'muscadet','chaine',0,'','2010-07-08 11:18:00'),(74,'EXPEDITION_ADDON',1,'enlevement','chaine',0,'','2010-07-08 11:18:00'),(76,'FICHEINTER_ADDON',1,'pacific','chaine',0,'','2010-07-08 11:18:00'),(77,'FICHEINTER_ADDON_PDF',1,'soleil','chaine',0,'','2010-07-08 11:18:00'),(79,'FACTURE_ADDON_PDF',1,'crabe','chaine',0,'','2010-07-08 11:18:00'),(80,'PROPALE_VALIDITY_DURATION',1,'15','chaine',0,'Durée de validitée des propales','2010-07-08 11:18:00'),(230,'COMPANY_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/thirdparties','chaine',0,NULL,'2010-07-08 11:26:20'),(238,'LIVRAISON_ADDON_PDF',1,'typhon','chaine',0,'Nom du gestionnaire de generation des commandes en PDF','2010-07-08 11:26:27'),(239,'LIVRAISON_ADDON_NUMBER',1,'mod_livraison_jade','chaine',0,'Nom du gestionnaire de numerotation des bons de livraison','2013-03-20 13:17:36'),(245,'FACTURE_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/invoices','chaine',0,NULL,'2010-07-08 11:28:53'),(249,'DON_FORM',1,'fsfe.fr.php','chaine',0,'Nom du gestionnaire de formulaire de dons','2010-07-08 11:29:00'),(253,'ADHERENT_BANK_USE_AUTO',1,'','yesno',0,'Insertion automatique des cotisation dans le compte banquaire','2010-07-08 11:29:05'),(254,'ADHERENT_BANK_ACCOUNT',1,'','chaine',0,'ID du Compte banquaire utilise','2010-07-08 11:29:05'),(255,'ADHERENT_BANK_CATEGORIE',1,'','chaine',0,'ID de la categorie banquaire des cotisations','2010-07-08 11:29:05'),(256,'ADHERENT_ETIQUETTE_TYPE',1,'L7163','chaine',0,'Type d etiquette (pour impression de planche d etiquette)','2010-07-08 11:29:05'),(269,'PROJECT_ADDON_PDF',1,'baleine','chaine',0,'Nom du gestionnaire de generation des projets en PDF','2010-07-08 11:29:33'),(270,'PROJECT_ADDON',1,'mod_project_simple','chaine',0,'Nom du gestionnaire de numerotation des projets','2010-07-08 11:29:33'),(368,'STOCK_USERSTOCK_AUTOCREATE',1,'1','chaine',0,'','2010-07-08 22:44:59'),(369,'EXPEDITION_ADDON_PDF',1,'merou','chaine',0,'','2010-07-08 22:58:07'),(377,'FACTURE_ADDON',1,'mod_facture_terre','chaine',0,'','2010-07-08 23:08:12'),(380,'ADHERENT_CARD_TEXT',1,'%TYPE% n° %ID%\r\n%PRENOM% %NOM%\r\n<%EMAIL%>\r\n%ADRESSE%\r\n%CP% %VILLE%\r\n%PAYS%','',0,'Texte imprime sur la carte adherent','2010-07-08 23:14:46'),(381,'ADHERENT_CARD_TEXT_RIGHT',1,'aaa','',0,'','2010-07-08 23:14:55'),(385,'PRODUIT_USE_SEARCH_TO_SELECT',1,'1','chaine',0,'','2010-07-08 23:22:19'),(386,'STOCK_CALCULATE_ON_SHIPMENT',1,'1','chaine',0,'','2010-07-08 23:23:21'),(387,'STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER',1,'1','chaine',0,'','2010-07-08 23:23:26'),(392,'MAIN_AGENDA_XCAL_EXPORTKEY',1,'dolibarr','chaine',0,'','2010-07-08 23:27:50'),(393,'MAIN_AGENDA_EXPORT_PAST_DELAY',1,'100','chaine',0,'','2010-07-08 23:27:50'),(610,'CASHDESK_ID_THIRDPARTY',1,'7','chaine',0,'','2010-07-11 17:08:18'),(611,'CASHDESK_ID_BANKACCOUNT_CASH',1,'3','chaine',0,'','2010-07-11 17:08:18'),(612,'CASHDESK_ID_BANKACCOUNT_CHEQUE',1,'1','chaine',0,'','2010-07-11 17:08:18'),(613,'CASHDESK_ID_BANKACCOUNT_CB',1,'1','chaine',0,'','2010-07-11 17:08:18'),(614,'CASHDESK_ID_WAREHOUSE',1,'2','chaine',0,'','2010-07-11 17:08:18'),(660,'LDAP_USER_DN',1,'ou=users,dc=my-domain,dc=com','chaine',0,NULL,'2010-07-18 10:25:27'),(661,'LDAP_GROUP_DN',1,'ou=groups,dc=my-domain,dc=com','chaine',0,NULL,'2010-07-18 10:25:27'),(662,'LDAP_FILTER_CONNECTION',1,'&(objectClass=user)(objectCategory=person)','chaine',0,NULL,'2010-07-18 10:25:27'),(663,'LDAP_FIELD_LOGIN',1,'uid','chaine',0,NULL,'2010-07-18 10:25:27'),(664,'LDAP_FIELD_FULLNAME',1,'cn','chaine',0,NULL,'2010-07-18 10:25:27'),(665,'LDAP_FIELD_NAME',1,'sn','chaine',0,NULL,'2010-07-18 10:25:27'),(666,'LDAP_FIELD_FIRSTNAME',1,'givenname','chaine',0,NULL,'2010-07-18 10:25:27'),(667,'LDAP_FIELD_MAIL',1,'mail','chaine',0,NULL,'2010-07-18 10:25:27'),(668,'LDAP_FIELD_PHONE',1,'telephonenumber','chaine',0,NULL,'2010-07-18 10:25:27'),(669,'LDAP_FIELD_FAX',1,'facsimiletelephonenumber','chaine',0,NULL,'2010-07-18 10:25:27'),(670,'LDAP_FIELD_MOBILE',1,'mobile','chaine',0,NULL,'2010-07-18 10:25:27'),(671,'LDAP_SERVER_TYPE',1,'openldap','chaine',0,'','2010-07-18 10:25:46'),(672,'LDAP_SERVER_PROTOCOLVERSION',1,'3','chaine',0,'','2010-07-18 10:25:47'),(673,'LDAP_SERVER_HOST',1,'localhost','chaine',0,'','2010-07-18 10:25:47'),(674,'LDAP_SERVER_PORT',1,'389','chaine',0,'','2010-07-18 10:25:47'),(675,'LDAP_SERVER_USE_TLS',1,'0','chaine',0,'','2010-07-18 10:25:47'),(676,'LDAP_SYNCHRO_ACTIVE',1,'dolibarr2ldap','chaine',0,'','2010-07-18 10:25:47'),(677,'LDAP_CONTACT_ACTIVE',1,'1','chaine',0,'','2010-07-18 10:25:47'),(678,'LDAP_MEMBER_ACTIVE',1,'1','chaine',0,'','2010-07-18 10:25:47'),(974,'MAIN_MODULE_WORKFLOW_TRIGGERS',1,'1','chaine',0,NULL,'2011-07-18 18:02:20'),(975,'WORKFLOW_PROPAL_AUTOCREATE_ORDER',1,'1','chaine',0,'','2011-07-18 18:02:24'),(980,'PRELEVEMENT_NUMERO_NATIONAL_EMETTEUR',1,'1234567','chaine',0,'','2011-07-18 18:05:50'),(983,'FACTURE_RIB_NUMBER',1,'1','chaine',0,'','2011-07-18 18:35:14'),(984,'FACTURE_CHQ_NUMBER',1,'1','chaine',0,'','2011-07-18 18:35:14'),(1016,'GOOGLE_DUPLICATE_INTO_GCAL',1,'1','chaine',0,'','2011-07-18 21:40:20'),(1152,'SOCIETE_CODECLIENT_ADDON',1,'mod_codeclient_monkey','chaine',0,'','2011-07-29 20:50:02'),(1231,'MAIN_UPLOAD_DOC',1,'2048','chaine',0,'','2011-07-29 21:04:00'),(1234,'MAIN_UMASK',1,'0664','chaine',0,'','2011-07-29 21:04:11'),(1240,'MAIN_LOGEVENTS_USER_LOGIN',1,'1','chaine',0,'','2011-07-29 21:05:01'),(1241,'MAIN_LOGEVENTS_USER_LOGIN_FAILED',1,'1','chaine',0,'','2011-07-29 21:05:01'),(1242,'MAIN_LOGEVENTS_USER_LOGOUT',1,'1','chaine',0,'','2011-07-29 21:05:01'),(1243,'MAIN_LOGEVENTS_USER_CREATE',1,'1','chaine',0,'','2011-07-29 21:05:01'),(1244,'MAIN_LOGEVENTS_USER_MODIFY',1,'1','chaine',0,'','2011-07-29 21:05:01'),(1245,'MAIN_LOGEVENTS_USER_NEW_PASSWORD',1,'1','chaine',0,'','2011-07-29 21:05:01'),(1246,'MAIN_LOGEVENTS_USER_ENABLEDISABLE',1,'1','chaine',0,'','2011-07-29 21:05:01'),(1247,'MAIN_LOGEVENTS_USER_DELETE',1,'1','chaine',0,'','2011-07-29 21:05:01'),(1248,'MAIN_LOGEVENTS_GROUP_CREATE',1,'1','chaine',0,'','2011-07-29 21:05:01'),(1249,'MAIN_LOGEVENTS_GROUP_MODIFY',1,'1','chaine',0,'','2011-07-29 21:05:01'),(1250,'MAIN_LOGEVENTS_GROUP_DELETE',1,'1','chaine',0,'','2011-07-29 21:05:01'),(1251,'MAIN_BOXES_MAXLINES',1,'5','',0,'','2011-07-29 21:05:42'),(1482,'EXPEDITION_ADDON_NUMBER',1,'mod_expedition_safor','chaine',0,'Nom du gestionnaire de numerotation des expeditions','2011-08-05 17:53:11'),(1490,'CONTRACT_ADDON',1,'mod_contract_serpis','chaine',0,'Nom du gestionnaire de numerotation des contrats','2011-08-05 18:11:58'),(1677,'COMMANDE_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/orders','chaine',0,NULL,'2012-12-08 13:11:02'),(1698,'PRODUCT_CODEPRODUCT_ADDON',1,'mod_codeproduct_leopard','yesno',0,'Module to control product codes','2012-12-08 13:11:25'),(1724,'PROPALE_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/proposals','chaine',0,NULL,'2012-12-08 13:17:14'),(1730,'OPENSTREETMAP_ENABLE_MAPS',1,'1','chaine',0,'','2012-12-08 13:22:47'),(1731,'OPENSTREETMAP_ENABLE_MAPS_CONTACTS',1,'1','chaine',0,'','2012-12-08 13:22:47'),(1732,'OPENSTREETMAP_ENABLE_MAPS_MEMBERS',1,'1','chaine',0,'','2012-12-08 13:22:47'),(1733,'OPENSTREETMAP_MAPS_ZOOM_LEVEL',1,'15','chaine',0,'','2012-12-08 13:22:47'),(1742,'MAIN_MAIL_EMAIL_FROM',2,'dolibarr-robot@domain.com','chaine',0,'EMail emetteur pour les emails automatiques Dolibarr','2012-12-08 14:08:14'),(1743,'MAIN_MENU_STANDARD',2,'eldy_menu.php','chaine',0,'Module de gestion de la barre de menu du haut pour utilisateurs internes','2013-02-11 19:43:54'),(1744,'MAIN_MENUFRONT_STANDARD',2,'eldy_menu.php','chaine',0,'Module de gestion de la barre de menu du haut pour utilisateurs externes','2013-02-11 19:43:54'),(1745,'MAIN_MENU_SMARTPHONE',2,'iphone_backoffice.php','chaine',0,'Module de gestion de la barre de menu smartphone pour utilisateurs internes','2012-12-08 14:08:14'),(1746,'MAIN_MENUFRONT_SMARTPHONE',2,'iphone_frontoffice.php','chaine',0,'Module de gestion de la barre de menu smartphone pour utilisateurs externes','2012-12-08 14:08:14'),(1747,'MAIN_THEME',2,'eldy','chaine',0,'Default theme','2012-12-08 14:08:14'),(1748,'MAIN_DELAY_ACTIONS_TODO',2,'7','chaine',0,'Tolérance de retard avant alerte (en jours) sur actions planifiées non réalisées','2012-12-08 14:08:14'),(1749,'MAIN_DELAY_ORDERS_TO_PROCESS',2,'2','chaine',0,'Tolérance de retard avant alerte (en jours) sur commandes clients non traitées','2012-12-08 14:08:14'),(1750,'MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS',2,'7','chaine',0,'Tolérance de retard avant alerte (en jours) sur commandes fournisseurs non traitées','2012-12-08 14:08:14'),(1751,'MAIN_DELAY_PROPALS_TO_CLOSE',2,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur propales à cloturer','2012-12-08 14:08:14'),(1752,'MAIN_DELAY_PROPALS_TO_BILL',2,'7','chaine',0,'Tolérance de retard avant alerte (en jours) sur propales non facturées','2012-12-08 14:08:14'),(1753,'MAIN_DELAY_CUSTOMER_BILLS_UNPAYED',2,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur factures client impayées','2012-12-08 14:08:14'),(1754,'MAIN_DELAY_SUPPLIER_BILLS_TO_PAY',2,'2','chaine',0,'Tolérance de retard avant alerte (en jours) sur factures fournisseur impayées','2012-12-08 14:08:14'),(1755,'MAIN_DELAY_NOT_ACTIVATED_SERVICES',2,'0','chaine',0,'Tolérance de retard avant alerte (en jours) sur services à activer','2012-12-08 14:08:14'),(1756,'MAIN_DELAY_RUNNING_SERVICES',2,'0','chaine',0,'Tolérance de retard avant alerte (en jours) sur services expirés','2012-12-08 14:08:14'),(1757,'MAIN_DELAY_MEMBERS',2,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur cotisations adhérent en retard','2012-12-08 14:08:14'),(1758,'MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE',2,'62','chaine',0,'Tolérance de retard avant alerte (en jours) sur rapprochements bancaires à faire','2012-12-08 14:08:14'),(1759,'MAILING_EMAIL_FROM',2,'dolibarr@domain.com','chaine',0,'EMail emmetteur pour les envois d emailings','2012-12-08 14:08:14'),(1760,'MAIN_INFO_SOCIETE_COUNTRY',3,'1:FR:France','chaine',0,'','2013-02-26 21:56:28'),(1761,'MAIN_INFO_SOCIETE_NOM',3,'bbb','chaine',0,'','2012-12-08 14:08:20'),(1762,'MAIN_INFO_SOCIETE_STATE',3,'0','chaine',0,'','2013-02-27 14:20:27'),(1763,'MAIN_MONNAIE',3,'EUR','chaine',0,'','2012-12-08 14:08:20'),(1764,'MAIN_LANG_DEFAULT',3,'auto','chaine',0,'','2012-12-08 14:08:20'),(1765,'MAIN_MAIL_EMAIL_FROM',3,'dolibarr-robot@domain.com','chaine',0,'EMail emetteur pour les emails automatiques Dolibarr','2012-12-08 14:08:20'),(1766,'MAIN_MENU_STANDARD',3,'eldy_menu.php','chaine',0,'Module de gestion de la barre de menu du haut pour utilisateurs internes','2013-02-11 19:43:54'),(1767,'MAIN_MENUFRONT_STANDARD',3,'eldy_menu.php','chaine',0,'Module de gestion de la barre de menu du haut pour utilisateurs externes','2013-02-11 19:43:54'),(1768,'MAIN_MENU_SMARTPHONE',3,'iphone_backoffice.php','chaine',0,'Module de gestion de la barre de menu smartphone pour utilisateurs internes','2012-12-08 14:08:20'),(1769,'MAIN_MENUFRONT_SMARTPHONE',3,'iphone_frontoffice.php','chaine',0,'Module de gestion de la barre de menu smartphone pour utilisateurs externes','2012-12-08 14:08:20'),(1770,'MAIN_THEME',3,'eldy','chaine',0,'Default theme','2012-12-08 14:08:20'),(1771,'MAIN_DELAY_ACTIONS_TODO',3,'7','chaine',0,'Tolérance de retard avant alerte (en jours) sur actions planifiées non réalisées','2012-12-08 14:08:20'),(1772,'MAIN_DELAY_ORDERS_TO_PROCESS',3,'2','chaine',0,'Tolérance de retard avant alerte (en jours) sur commandes clients non traitées','2012-12-08 14:08:20'),(1773,'MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS',3,'7','chaine',0,'Tolérance de retard avant alerte (en jours) sur commandes fournisseurs non traitées','2012-12-08 14:08:20'),(1774,'MAIN_DELAY_PROPALS_TO_CLOSE',3,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur propales à cloturer','2012-12-08 14:08:20'),(1775,'MAIN_DELAY_PROPALS_TO_BILL',3,'7','chaine',0,'Tolérance de retard avant alerte (en jours) sur propales non facturées','2012-12-08 14:08:20'),(1776,'MAIN_DELAY_CUSTOMER_BILLS_UNPAYED',3,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur factures client impayées','2012-12-08 14:08:20'),(1777,'MAIN_DELAY_SUPPLIER_BILLS_TO_PAY',3,'2','chaine',0,'Tolérance de retard avant alerte (en jours) sur factures fournisseur impayées','2012-12-08 14:08:20'),(1778,'MAIN_DELAY_NOT_ACTIVATED_SERVICES',3,'0','chaine',0,'Tolérance de retard avant alerte (en jours) sur services à activer','2012-12-08 14:08:20'),(1779,'MAIN_DELAY_RUNNING_SERVICES',3,'0','chaine',0,'Tolérance de retard avant alerte (en jours) sur services expirés','2012-12-08 14:08:20'),(1780,'MAIN_DELAY_MEMBERS',3,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur cotisations adhérent en retard','2012-12-08 14:08:20'),(1781,'MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE',3,'62','chaine',0,'Tolérance de retard avant alerte (en jours) sur rapprochements bancaires à faire','2012-12-08 14:08:20'),(1782,'MAILING_EMAIL_FROM',3,'dolibarr@domain.com','chaine',0,'EMail emmetteur pour les envois d emailings','2012-12-08 14:08:20'),(1803,'SYSLOG_FILE',1,'DOL_DATA_ROOT/dolibarr.log','chaine',0,'','2012-12-08 14:15:08'),(1804,'SYSLOG_HANDLERS',1,'[\"mod_syslog_file\"]','chaine',0,'','2012-12-08 14:15:08'),(1805,'MAIN_MODULE_SKINCOLOREDITOR',3,'1',NULL,0,NULL,'2012-12-08 14:35:40'),(1806,'MAIN_MODULE_SKINCOLOREDITOR_TABS_0',3,'user:+tabskincoloreditors:ColorEditor:skincoloreditor@skincoloreditor:/skincoloreditor/usercolors.php?id=__ID__','chaine',0,NULL,'2012-12-08 14:35:40'),(1922,'PAYPAL_API_SANDBOX',1,'1','chaine',0,'','2012-12-12 12:11:05'),(1923,'PAYPAL_API_USER',1,'seller_1355312017_biz_api1.nltechno.com','chaine',0,'','2012-12-12 12:11:05'),(1924,'PAYPAL_API_PASSWORD',1,'1355312040','chaine',0,'','2012-12-12 12:11:05'),(1925,'PAYPAL_API_SIGNATURE',1,'AXqqdsWBzvfn0q5iNmbuiDv1y.3EAXIMWyl4C5KvDReR9HDwwAd6dQ4Q','chaine',0,'','2012-12-12 12:11:05'),(1926,'PAYPAL_API_INTEGRAL_OR_PAYPALONLY',1,'integral','chaine',0,'','2012-12-12 12:11:05'),(1927,'PAYPAL_SECURITY_TOKEN',1,'50c82fab36bb3b6aa83e2a50691803b2','chaine',0,'','2012-12-12 12:11:05'),(1928,'PAYPAL_SECURITY_TOKEN_UNIQUE',1,'0','chaine',0,'','2012-12-12 12:11:05'),(1929,'PAYPAL_ADD_PAYMENT_URL',1,'1','chaine',0,'','2012-12-12 12:11:05'),(1980,'MAIN_PDF_FORMAT',1,'EUA4','chaine',0,'','2012-12-12 19:58:05'),(1981,'MAIN_PROFID1_IN_ADDRESS',1,'0','chaine',0,'','2012-12-12 19:58:05'),(1982,'MAIN_PROFID2_IN_ADDRESS',1,'0','chaine',0,'','2012-12-12 19:58:05'),(1983,'MAIN_PROFID3_IN_ADDRESS',1,'0','chaine',0,'','2012-12-12 19:58:05'),(1984,'MAIN_PROFID4_IN_ADDRESS',1,'0','chaine',0,'','2012-12-12 19:58:05'),(1985,'MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT',1,'0','chaine',0,'','2012-12-12 19:58:05'),(1990,'MAIN_SMS_SENDMODE',1,'ovh','chaine',0,'This is to enable OVH SMS engine','2012-12-17 21:19:01'),(2251,'FCKEDITOR_TEST',1,'Test<br />\r\n<img alt=\"\" src=\"/dolibarrnew/viewimage.php?modulepart=fckeditor&amp;file=image/Julien-Lavergne_reference_medium.jpg\" style=\"width: 200px; height: 172px;\" />fdfs','chaine',0,'','2012-12-19 19:12:24'),(2293,'SYSTEMTOOLS_MYSQLDUMP',1,'/usr/bin/mysqldump','chaine',0,'','2012-12-27 02:02:00'),(2835,'MAIN_USE_CONNECT_TIMEOUT',1,'10','chaine',0,'','2013-01-16 19:28:50'),(2836,'MAIN_USE_RESPONSE_TIMEOUT',1,'30','chaine',0,'','2013-01-16 19:28:50'),(2837,'MAIN_PROXY_USE',1,'0','chaine',0,'','2013-01-16 19:28:50'),(2838,'MAIN_PROXY_HOST',1,'localhost','chaine',0,'','2013-01-16 19:28:50'),(2839,'MAIN_PROXY_PORT',1,'8080','chaine',0,'','2013-01-16 19:28:50'),(2840,'MAIN_PROXY_USER',1,'aaa','chaine',0,'','2013-01-16 19:28:50'),(2841,'MAIN_PROXY_PASS',1,'bbb','chaine',0,'','2013-01-16 19:28:50'),(2848,'OVHSMS_NICK',1,'BN196-OVH','chaine',0,'','2013-01-16 19:32:36'),(2849,'OVHSMS_PASS',1,'bigone-10','chaine',0,'','2013-01-16 19:32:36'),(2850,'OVHSMS_SOAPURL',1,'https://www.ovh.com/soapi/soapi-re-1.55.wsdl','chaine',0,'','2013-01-16 19:32:36'),(2854,'THEME_ELDY_RGB',1,'bfbf00','chaine',0,'','2013-01-18 10:02:53'),(2855,'THEME_ELDY_ENABLE_PERSONALIZED',1,'0','chaine',0,'','2013-01-18 10:02:55'),(2858,'MAIN_SESSION_TIMEOUT',1,'2000','chaine',0,'','2013-01-19 17:01:53'),(2862,'TICKET_ADDON',1,'mod_ticket_avenc','chaine',0,'Nom du gestionnaire de numerotation des tickets','2013-01-19 17:16:10'),(2867,'FACSIM_ADDON',1,'mod_facsim_alcoy','chaine',0,'','2013-01-19 17:16:25'),(2868,'POS_SERVICES',1,'0','chaine',0,'','2013-01-19 17:16:51'),(2869,'POS_USE_TICKETS',1,'1','chaine',0,'','2013-01-19 17:16:51'),(2870,'POS_MAX_TTC',1,'100','chaine',0,'','2013-01-19 17:16:51'),(3190,'MAIN_MODULE_HOLIDAY',2,'1',NULL,0,NULL,'2013-02-01 08:52:34'),(3191,'MAIN_MODULE_HOLIDAY_TABS_0',2,'user:+paidholidays:CPTitreMenu:holiday:$user->rights->holiday->write:/holiday/index.php?mainmenu=holiday&id=__ID__','chaine',0,NULL,'2013-02-01 08:52:34'),(3195,'INVOICE_SUPPLIER_ADDON_PDF',1,'canelle','chaine',0,'','2013-02-10 19:50:27'),(3199,'MAIN_FORCE_RELOAD_PAGE',1,'1','chaine',0,NULL,'2013-02-12 16:22:55'),(3217,'MAIN_PDF_TITLE_BACKGROUND_COLOR',1,'240,240,240','chaine',1,'','2013-02-13 15:18:02'),(3223,'OVH_THIRDPARTY_IMPORT',1,'2','chaine',0,'','2013-02-13 16:20:18'),(3241,'COMPANY_USE_SEARCH_TO_SELECT',1,'2','chaine',0,'','2013-02-17 14:33:39'),(3409,'AGENDA_USE_EVENT_TYPE',1,'1','chaine',0,'','2013-02-27 18:12:24'),(3886,'MAIN_REMOVE_INSTALL_WARNING',1,'1','chaine',1,'','2013-03-02 18:32:50'),(4013,'MAIN_DELAY_ACTIONS_TODO',1,'7','chaine',0,'','2013-03-06 08:59:12'),(4014,'MAIN_DELAY_PROPALS_TO_CLOSE',1,'31','chaine',0,'','2013-03-06 08:59:12'),(4015,'MAIN_DELAY_PROPALS_TO_BILL',1,'7','chaine',0,'','2013-03-06 08:59:12'),(4016,'MAIN_DELAY_ORDERS_TO_PROCESS',1,'2','chaine',0,'','2013-03-06 08:59:12'),(4017,'MAIN_DELAY_CUSTOMER_BILLS_UNPAYED',1,'31','chaine',0,'','2013-03-06 08:59:12'),(4018,'MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS',1,'7','chaine',0,'','2013-03-06 08:59:12'),(4019,'MAIN_DELAY_SUPPLIER_BILLS_TO_PAY',1,'2','chaine',0,'','2013-03-06 08:59:12'),(4020,'MAIN_DELAY_RUNNING_SERVICES',1,'-15','chaine',0,'','2013-03-06 08:59:12'),(4021,'MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE',1,'62','chaine',0,'','2013-03-06 08:59:13'),(4022,'MAIN_DELAY_MEMBERS',1,'31','chaine',0,'','2013-03-06 08:59:13'),(4023,'MAIN_DISABLE_METEO',1,'0','chaine',0,'','2013-03-06 08:59:13'),(4044,'ADHERENT_VAT_FOR_SUBSCRIPTIONS',1,'0','',0,'','2013-03-06 16:06:38'),(4047,'ADHERENT_BANK_USE',1,'bankviainvoice','',0,'','2013-03-06 16:12:30'),(4049,'PHPSANE_SCANIMAGE',1,'/usr/bin/scanimage','chaine',0,'','2013-03-06 21:54:13'),(4050,'PHPSANE_PNMTOJPEG',1,'/usr/bin/pnmtojpeg','chaine',0,'','2013-03-06 21:54:13'),(4051,'PHPSANE_PNMTOTIFF',1,'/usr/bin/pnmtotiff','chaine',0,'','2013-03-06 21:54:13'),(4052,'PHPSANE_OCR',1,'/usr/bin/gocr','chaine',0,'','2013-03-06 21:54:13'),(4548,'ECM_AUTO_TREE_ENABLED',1,'1','chaine',0,'','2013-03-10 15:57:21'),(4579,'MAIN_MODULE_AGENDA',2,'1',NULL,0,NULL,'2013-03-13 15:29:19'),(4580,'MAIN_AGENDA_ACTIONAUTO_COMPANY_CREATE',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4581,'MAIN_AGENDA_ACTIONAUTO_CONTRACT_VALIDATE',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4582,'MAIN_AGENDA_ACTIONAUTO_PROPAL_VALIDATE',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4583,'MAIN_AGENDA_ACTIONAUTO_PROPAL_SENTBYMAIL',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4584,'MAIN_AGENDA_ACTIONAUTO_ORDER_VALIDATE',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4585,'MAIN_AGENDA_ACTIONAUTO_ORDER_SENTBYMAIL',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4586,'MAIN_AGENDA_ACTIONAUTO_BILL_VALIDATE',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4587,'MAIN_AGENDA_ACTIONAUTO_BILL_PAYED',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4588,'MAIN_AGENDA_ACTIONAUTO_BILL_CANCEL',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4589,'MAIN_AGENDA_ACTIONAUTO_BILL_SENTBYMAIL',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4590,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_VALIDATE',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4591,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_VALIDATE',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4592,'MAIN_AGENDA_ACTIONAUTO_SHIPPING_VALIDATE',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4593,'MAIN_AGENDA_ACTIONAUTO_SHIPPING_SENTBYMAIL',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4594,'MAIN_AGENDA_ACTIONAUTO_BILL_UNVALIDATE',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4595,'MAIN_MODULE_GOOGLE',2,'1',NULL,0,NULL,'2013-03-13 15:29:47'),(4596,'MAIN_MODULE_GOOGLE_TABS_0',2,'agenda:+gcal:MenuAgendaGoogle:google@google:$conf->google->enabled && $conf->global->GOOGLE_ENABLE_AGENDA:/google/index.php','chaine',0,NULL,'2013-03-13 15:29:47'),(4597,'MAIN_MODULE_GOOGLE_TABS_1',2,'user:+gsetup:GoogleUserConf:google@google:$conf->google->enabled && $conf->global->GOOGLE_DUPLICATE_INTO_GCAL:/google/admin/google_calsync_user.php?id=__ID__','chaine',0,NULL,'2013-03-13 15:29:47'),(4598,'MAIN_MODULE_GOOGLE_TRIGGERS',2,'1','chaine',0,NULL,'2013-03-13 15:29:47'),(4599,'MAIN_MODULE_GOOGLE_HOOKS',2,'[\"toprightmenu\"]','chaine',0,NULL,'2013-03-13 15:29:47'),(4688,'GOOGLE_ENABLE_AGENDA',2,'1','chaine',0,'','2013-03-13 15:36:29'),(4689,'GOOGLE_AGENDA_NAME1',2,'eldy','chaine',0,'','2013-03-13 15:36:29'),(4690,'GOOGLE_AGENDA_SRC1',2,'eldy10@mail.com','chaine',0,'','2013-03-13 15:36:29'),(4691,'GOOGLE_AGENDA_COLOR1',2,'BE6D00','chaine',0,'','2013-03-13 15:36:29'),(4692,'GOOGLE_AGENDA_COLOR2',2,'7A367A','chaine',0,'','2013-03-13 15:36:29'),(4693,'GOOGLE_AGENDA_COLOR3',2,'7A367A','chaine',0,'','2013-03-13 15:36:29'),(4694,'GOOGLE_AGENDA_COLOR4',2,'7A367A','chaine',0,'','2013-03-13 15:36:29'),(4695,'GOOGLE_AGENDA_COLOR5',2,'7A367A','chaine',0,'','2013-03-13 15:36:29'),(4696,'GOOGLE_AGENDA_TIMEZONE',2,'Europe/Paris','chaine',0,'','2013-03-13 15:36:29'),(4697,'GOOGLE_AGENDA_NB',2,'5','chaine',0,'','2013-03-13 15:36:29'),(4711,'GOOGLE_ENABLE_AGENDA',1,'1','chaine',0,'','2013-03-13 19:37:38'),(4712,'GOOGLE_AGENDA_NAME1',1,'asso master','chaine',0,'','2013-03-13 19:37:38'),(4713,'GOOGLE_AGENDA_SRC1',1,'assodolibarr@mail.com','chaine',0,'','2013-03-13 19:37:38'),(4714,'GOOGLE_AGENDA_COLOR1',1,'1B887A','chaine',0,'','2013-03-13 19:37:38'),(4715,'GOOGLE_AGENDA_COLOR2',1,'7A367A','chaine',0,'','2013-03-13 19:37:38'),(4716,'GOOGLE_AGENDA_COLOR3',1,'7A367A','chaine',0,'','2013-03-13 19:37:38'),(4717,'GOOGLE_AGENDA_COLOR4',1,'7A367A','chaine',0,'','2013-03-13 19:37:38'),(4718,'GOOGLE_AGENDA_COLOR5',1,'7A367A','chaine',0,'','2013-03-13 19:37:38'),(4719,'GOOGLE_AGENDA_TIMEZONE',1,'Europe/Paris','chaine',0,'','2013-03-13 19:37:38'),(4720,'GOOGLE_AGENDA_NB',1,'5','chaine',0,'','2013-03-13 19:37:38'),(4725,'SOCIETE_CODECLIENT_ADDON',2,'mod_codeclient_leopard','chaine',0,'Module to control third parties codes','2013-03-13 20:21:35'),(4726,'SOCIETE_CODECOMPTA_ADDON',2,'mod_codecompta_panicum','chaine',0,'Module to control third parties codes','2013-03-13 20:21:35'),(4727,'SOCIETE_FISCAL_MONTH_START',2,'','chaine',0,'Mettre le numero du mois du debut d\\\'annee fiscale, ex: 9 pour septembre','2013-03-13 20:21:35'),(4728,'MAIN_SEARCHFORM_SOCIETE',2,'1','yesno',0,'Show form for quick company search','2013-03-13 20:21:35'),(4729,'MAIN_SEARCHFORM_CONTACT',2,'1','yesno',0,'Show form for quick contact search','2013-03-13 20:21:35'),(4730,'COMPANY_ADDON_PDF_ODT_PATH',2,'DOL_DATA_ROOT/doctemplates/thirdparties','chaine',0,NULL,'2013-03-13 20:21:35'),(4743,'MAIN_MODULE_CLICKTODIAL',2,'1',NULL,0,NULL,'2013-03-13 20:30:28'),(4744,'MAIN_MODULE_NOTIFICATION',2,'1',NULL,0,NULL,'2013-03-13 20:30:34'),(4745,'MAIN_MODULE_WEBSERVICES',2,'1',NULL,0,NULL,'2013-03-13 20:30:41'),(4746,'MAIN_MODULE_PROPALE',2,'1',NULL,0,NULL,'2013-03-13 20:32:38'),(4747,'PROPALE_ADDON_PDF',2,'azur','chaine',0,'Nom du gestionnaire de generation des propales en PDF','2013-03-13 20:32:38'),(4748,'PROPALE_ADDON',2,'mod_propale_marbre','chaine',0,'Nom du gestionnaire de numerotation des propales','2013-03-13 20:32:38'),(4749,'PROPALE_VALIDITY_DURATION',2,'15','chaine',0,'Duration of validity of business proposals','2013-03-13 20:32:38'),(4750,'PROPALE_ADDON_PDF_ODT_PATH',2,'DOL_DATA_ROOT/doctemplates/proposals','chaine',0,NULL,'2013-03-13 20:32:38'),(4752,'MAIN_MODULE_TAX',2,'1',NULL,0,NULL,'2013-03-13 20:32:47'),(4753,'MAIN_MODULE_DON',2,'1',NULL,0,NULL,'2013-03-13 20:32:54'),(4754,'DON_ADDON_MODEL',2,'html_cerfafr','chaine',0,'Nom du gestionnaire de generation de recu de dons','2013-03-13 20:32:54'),(4755,'POS_USE_TICKETS',2,'1','chaine',0,'','2013-03-13 20:33:09'),(4756,'POS_MAX_TTC',2,'100','chaine',0,'','2013-03-13 20:33:09'),(4757,'MAIN_MODULE_POS',2,'1',NULL,0,NULL,'2013-03-13 20:33:09'),(4758,'TICKET_ADDON',2,'mod_ticket_avenc','chaine',0,'Nom du gestionnaire de numerotation des tickets','2013-03-13 20:33:09'),(4759,'MAIN_MODULE_BANQUE',2,'1',NULL,0,NULL,'2013-03-13 20:33:09'),(4760,'MAIN_MODULE_FACTURE',2,'1',NULL,0,NULL,'2013-03-13 20:33:09'),(4761,'FACTURE_ADDON_PDF',2,'crabe','chaine',0,'Name of PDF model of invoice','2013-03-13 20:33:09'),(4762,'FACTURE_ADDON',2,'mod_facture_terre','chaine',0,'Name of numbering numerotation rules of invoice','2013-03-13 20:33:09'),(4763,'FACTURE_ADDON_PDF_ODT_PATH',2,'DOL_DATA_ROOT/doctemplates/invoices','chaine',0,NULL,'2013-03-13 20:33:09'),(4764,'MAIN_MODULE_SOCIETE',2,'1',NULL,0,NULL,'2013-03-13 20:33:09'),(4765,'MAIN_MODULE_PRODUCT',2,'1',NULL,0,NULL,'2013-03-13 20:33:09'),(4766,'PRODUCT_CODEPRODUCT_ADDON',2,'mod_codeproduct_leopard','chaine',0,'Module to control product codes','2013-03-13 20:33:09'),(4767,'MAIN_SEARCHFORM_PRODUITSERVICE',2,'1','yesno',0,'Show form for quick product search','2013-03-13 20:33:09'),(4772,'FACSIM_ADDON',2,'mod_facsim_alcoy','chaine',0,'','2013-03-13 20:33:32'),(4773,'MAIN_MODULE_MAILING',2,'1',NULL,0,NULL,'2013-03-13 20:33:37'),(4774,'MAIN_MODULE_OPENSURVEY',2,'1',NULL,0,NULL,'2013-03-13 20:33:42'),(4782,'AGENDA_USE_EVENT_TYPE',2,'1','chaine',0,'','2013-03-13 20:53:36'),(4884,'AGENDA_DISABLE_EXT',2,'1','chaine',0,'','2013-03-13 22:03:40'),(4928,'COMMANDE_SUPPLIER_ADDON_NUMBER',1,'mod_commande_fournisseur_muguet','chaine',0,'Nom du gestionnaire de numerotation des commandes fournisseur','2013-03-22 09:24:29'),(4929,'INVOICE_SUPPLIER_ADDON_NUMBER',1,'mod_facture_fournisseur_cactus','chaine',0,'Nom du gestionnaire de numerotation des factures fournisseur','2013-03-22 09:24:29'),(5001,'MAIN_CRON_KEY',0,'bc54582fe30d5d4a830c6f582ec28810','chaine',0,'','2013-03-23 17:54:53'),(5009,'CRON_KEY',0,'2c2e755c20be2014098f629865598006','chaine',0,'','2013-03-23 18:06:24'),(5075,'MAIN_MENU_STANDARD',1,'eldy_menu.php','chaine',0,'','2013-03-24 02:51:13'),(5076,'MAIN_MENU_SMARTPHONE',1,'eldy_menu.php','chaine',0,'','2013-03-24 02:51:13'),(5077,'MAIN_MENUFRONT_STANDARD',1,'eldy_menu.php','chaine',0,'','2013-03-24 02:51:13'),(5078,'MAIN_MENUFRONT_SMARTPHONE',1,'eldy_menu.php','chaine',0,'','2013-03-24 02:51:13'),(5139,'SOCIETE_ADD_REF_IN_LIST',1,'','yesno',0,'Display customer ref into select list','2013-09-08 23:06:08'),(5150,'PROJECT_TASK_ADDON_PDF',1,'','chaine',0,'Name of PDF/ODT tasks manager class','2013-09-08 23:06:14'),(5151,'PROJECT_TASK_ADDON',1,'mod_task_simple','chaine',0,'Name of Numbering Rule task manager class','2013-09-08 23:06:14'),(5152,'PROJECT_TASK_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/tasks','chaine',0,'','2013-09-08 23:06:14'),(5195,'GOOGLE_DUPLICATE_INTO_THIRDPARTIES',1,'1','chaine',0,'','2013-11-07 00:02:34'),(5196,'GOOGLE_DUPLICATE_INTO_CONTACTS',1,'0','chaine',0,'','2013-11-07 00:02:34'),(5197,'GOOGLE_DUPLICATE_INTO_MEMBERS',1,'0','chaine',0,'','2013-11-07 00:02:34'),(5198,'GOOGLE_CONTACT_LOGIN',1,'eldy10@mail.com','chaine',0,'','2013-11-07 00:02:34'),(5199,'GOOGLE_CONTACT_PASSWORD',1,'bidonge','chaine',0,'','2013-11-07 00:02:34'),(5200,'GOOGLE_TAG_PREFIX',1,'Dolibarr (Thirdparties)','chaine',0,'','2013-11-07 00:02:34'),(5201,'GOOGLE_TAG_PREFIX_CONTACTS',1,'Dolibarr (Contacts/Addresses)','chaine',0,'','2013-11-07 00:02:34'),(5202,'GOOGLE_TAG_PREFIX_MEMBERS',1,'Dolibarr (Members)','chaine',0,'','2013-11-07 00:02:34'),(5239,'BOOKMARKS_SHOW_IN_MENU',1,'10','chaine',0,'','2014-03-02 15:42:26'),(5271,'DONATION_ART200',1,'','yesno',0,'Option Française - Eligibilité Art200 du CGI','2014-12-21 12:51:28'),(5272,'DONATION_ART238',1,'','yesno',0,'Option Française - Eligibilité Art238 bis du CGI','2014-12-21 12:51:28'),(5273,'DONATION_ART885',1,'','yesno',0,'Option Française - Eligibilité Art885-0 V bis du CGI','2014-12-21 12:51:28'),(5274,'DONATION_MESSAGE',1,'Thank you','chaine',0,'Message affiché sur le récépissé de versements ou dons','2014-12-21 12:51:28'),(5288,'DONATION_ACCOUNTINGACCOUNT',1,'7581','chaine',0,'Compte comptable de remise des versements ou dons','2015-07-19 13:41:21'),(5339,'MAIN_MULTILANGS',1,'1','chaine',0,'','2015-10-03 10:11:33'),(5340,'MAIN_SIZE_LISTE_LIMIT',1,'25','chaine',0,'','2015-10-03 10:11:33'),(5341,'MAIN_DISABLE_JAVASCRIPT',1,'0','chaine',0,'','2015-10-03 10:11:33'),(5342,'MAIN_BUTTON_HIDE_UNAUTHORIZED',1,'0','chaine',0,'','2015-10-03 10:11:33'),(5343,'MAIN_START_WEEK',1,'1','chaine',0,'','2015-10-03 10:11:33'),(5344,'MAIN_DEFAULT_WORKING_DAYS',1,'1-5','chaine',0,'','2015-10-03 10:11:33'),(5345,'MAIN_DEFAULT_WORKING_HOURS',1,'9-18','chaine',0,'','2015-10-03 10:11:33'),(5346,'MAIN_SHOW_LOGO',1,'1','chaine',0,'','2015-10-03 10:11:33'),(5347,'MAIN_FIRSTNAME_NAME_POSITION',1,'0','chaine',0,'','2015-10-03 10:11:33'),(5348,'MAIN_THEME',1,'eldy','chaine',0,'','2015-10-03 10:11:33'),(5349,'MAIN_SEARCHFORM_CONTACT',1,'1','chaine',0,'','2015-10-03 10:11:33'),(5351,'MAIN_SEARCHFORM_PRODUITSERVICE',1,'1','chaine',0,'','2015-10-03 10:11:33'),(5352,'MAIN_SEARCHFORM_PRODUITSERVICE_SUPPLIER',1,'0','chaine',0,'','2015-10-03 10:11:33'),(5353,'MAIN_SEARCHFORM_ADHERENT',1,'1','chaine',0,'','2015-10-03 10:11:33'),(5354,'MAIN_SEARCHFORM_PROJECT',1,'0','chaine',0,'','2015-10-03 10:11:33'),(5355,'MAIN_HELPCENTER_DISABLELINK',0,'1','chaine',0,'','2015-10-03 10:11:33'),(5356,'MAIN_HOME',1,'<span style=\"font-size:11px\">__(NoteSomeFeaturesAreDisabled)__<br />\r\n<br />\r\n__(SomeTranslationAreUncomplete)__</span>','chaine',0,'','2015-10-03 10:11:33'),(5357,'MAIN_HELP_DISABLELINK',0,'0','chaine',0,'','2015-10-03 10:11:33'),(5358,'MAIN_BUGTRACK_ENABLELINK',1,'0','chaine',0,'','2015-10-03 10:11:33'),(5359,'THEME_ELDY_USE_HOVER',1,'1','chaine',0,'','2015-10-03 10:11:33'),(5394,'FCKEDITOR_ENABLE_DETAILS',1,'1','yesno',0,'WYSIWIG for products details lines for all entities','2015-11-04 15:27:44'),(5395,'FCKEDITOR_ENABLE_USERSIGN',1,'1','yesno',0,'WYSIWIG for user signature','2015-11-04 15:27:44'),(5396,'FCKEDITOR_ENABLE_MAIL',1,'1','yesno',0,'WYSIWIG for products details lines for all entities','2015-11-04 15:27:44'),(5398,'CATEGORIE_RECURSIV_ADD',1,'','yesno',0,'Affect parent categories','2015-11-04 15:27:46'),(5403,'MAIN_MODULE_FCKEDITOR',1,'1',NULL,0,NULL,'2015-11-04 15:41:40'),(5404,'MAIN_MODULE_CATEGORIE',1,'1',NULL,0,NULL,'2015-11-04 15:41:43'),(5415,'EXPEDITION_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/shipment','chaine',0,NULL,'2015-11-15 22:38:28'),(5416,'LIVRAISON_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/delivery','chaine',0,NULL,'2015-11-15 22:38:28'),(5419,'MAIN_MODULE_CASHDESK',1,'1',NULL,0,NULL,'2015-11-15 22:38:33'),(5426,'MAIN_MODULE_PROJET',1,'1',NULL,0,NULL,'2015-11-15 22:38:44'),(5427,'PROJECT_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/projects','chaine',0,NULL,'2015-11-15 22:38:44'),(5428,'PROJECT_USE_OPPORTUNIES',1,'1','chaine',0,NULL,'2015-11-15 22:38:44'),(5430,'MAIN_MODULE_EXPORT',1,'1',NULL,0,NULL,'2015-11-15 22:38:56'),(5431,'MAIN_MODULE_IMPORT',1,'1',NULL,0,NULL,'2015-11-15 22:38:58'),(5432,'MAIN_MODULE_MAILING',1,'1',NULL,0,NULL,'2015-11-15 22:39:00'),(5434,'EXPENSEREPORT_ADDON_PDF',1,'standard','chaine',0,'Name of manager to build PDF expense reports documents','2015-11-15 22:39:05'),(5435,'MAIN_MODULE_SALARIES',1,'1',NULL,0,NULL,'2015-11-15 22:39:08'),(5436,'SALARIES_ACCOUNTING_ACCOUNT_PAYMENT',1,'421','chaine',0,NULL,'2015-11-15 22:39:08'),(5437,'SALARIES_ACCOUNTING_ACCOUNT_CHARGE',1,'641','chaine',0,NULL,'2015-11-15 22:39:08'),(5440,'MAIN_MODULE_ADHERENT',1,'1',NULL,0,NULL,'2015-11-15 22:39:17'),(5441,'ADHERENT_ETIQUETTE_TEXT',1,'%FULLNAME%\n%ADDRESS%\n%ZIP% %TOWN%\n%COUNTRY%','texte',0,'Text to print on member address sheets','2015-11-15 22:39:17'),(5443,'MAIN_MODULE_PRELEVEMENT',1,'1',NULL,0,NULL,'2015-11-15 22:39:33'),(5453,'MAIN_MODULE_CONTRAT',1,'1',NULL,0,NULL,'2015-11-15 22:39:52'),(5455,'MAIN_MODULE_FICHEINTER',1,'1',NULL,0,NULL,'2015-11-15 22:39:56'),(5458,'MAIN_MODULE_BOOKMARK',1,'1',NULL,0,NULL,'2015-11-15 22:40:51'),(5459,'MAIN_MODULE_PAYPAL',1,'1',NULL,0,NULL,'2015-11-15 22:41:02'),(5460,'MAIN_MODULE_MARGIN',1,'1',NULL,0,NULL,'2015-11-15 22:41:47'),(5461,'MAIN_MODULE_MARGIN_TABS_0',1,'product:+margin:Margins:margins:$user->rights->margins->liretous:/margin/tabs/productMargins.php?id=__ID__','chaine',0,NULL,'2015-11-15 22:41:47'),(5462,'MAIN_MODULE_MARGIN_TABS_1',1,'thirdparty:+margin:Margins:margins:empty($user->societe_id) && $user->rights->margins->liretous && ($object->client > 0):/margin/tabs/thirdpartyMargins.php?socid=__ID__','chaine',0,NULL,'2015-11-15 22:41:47'),(5463,'MAIN_MODULE_PROPALE',1,'1',NULL,0,NULL,'2015-11-15 22:41:47'),(5483,'GENBARCODE_BARCODETYPE_THIRDPARTY',1,'6','chaine',0,'','2016-01-16 15:49:43'),(5484,'PRODUIT_DEFAULT_BARCODE_TYPE',1,'2','chaine',0,'','2016-01-16 15:49:46'),(5539,'PRODUCT_USE_OLD_PATH_FOR_PHOTO',0,'0','chaine',1,'Use old path for products images','2016-01-22 13:34:23'),(5541,'MODULE_GOOGLE_DEBUG',1,'0','chaine',1,'','2016-01-22 13:34:57'),(5548,'MAIN_MODULE_ECM',1,'1',NULL,0,NULL,'2016-01-22 17:26:43'),(5551,'MAIN_MODULE_HOLIDAY',1,'1',NULL,0,NULL,'2016-01-22 17:26:43'),(5552,'MAIN_MODULE_HOLIDAY_TABS_0',1,'user:+paidholidays:CPTitreMenu:holiday:$user->rights->holiday->read:/holiday/list.php?mainmenu=holiday&id=__ID__','chaine',0,NULL,'2016-01-22 17:26:43'),(5555,'MAIN_MODULE_SERVICE',1,'1',NULL,0,NULL,'2016-01-22 17:26:43'),(5586,'MAIN_DELAY_EXPENSEREPORTS_TO_PAY',1,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur les notes de frais impayées','2016-01-22 17:28:18'),(5587,'MAIN_FIX_FOR_BUGGED_MTA',1,'1','chaine',1,'Set constant to fix email ending from PHP with some linux ike system','2016-01-22 17:28:18'),(5589,'MAIN_MODULE_USER',0,'1',NULL,0,NULL,'2016-01-22 17:28:42'),(5590,'MAIN_VERSION_LAST_INSTALL',0,'3.8.3','chaine',0,'Dolibarr version when install','2016-01-22 17:28:42'),(5604,'MAIN_INFO_SOCIETE_LOGO',1,'mybigcompany.png','chaine',0,'','2016-01-22 17:33:49'),(5605,'MAIN_INFO_SOCIETE_LOGO_SMALL',1,'mybigcompany_small.png','chaine',0,'','2016-01-22 17:33:49'),(5606,'MAIN_INFO_SOCIETE_LOGO_MINI',1,'mybigcompany_mini.png','chaine',0,'','2016-01-22 17:33:49'),(5612,'MAIN_ENABLE_LOG_TO_HTML',0,'0','chaine',1,'If this option is set to 1, it is possible to see log output at end of HTML sources by adding paramater logtohtml=1 on URL','2016-03-13 10:54:45'),(5614,'MAIN_SIZE_SHORTLISTE_LIMIT',1,'4','chaine',0,'Longueur maximum des listes courtes (fiche client)','2016-03-13 10:54:46'),(5626,'MAIN_MODULE_SUPPLIERPROPOSAL',1,'1',NULL,0,NULL,'2016-07-30 11:13:20'),(5627,'SUPPLIER_PROPOSAL_ADDON_PDF',1,'aurore','chaine',0,'Name of submodule to generate PDF for supplier quotation request','2016-07-30 11:13:20'),(5628,'SUPPLIER_PROPOSAL_ADDON',1,'mod_supplier_proposal_marbre','chaine',0,'Name of submodule to number supplier quotation request','2016-07-30 11:13:20'),(5629,'SUPPLIER_PROPOSAL_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/supplier_proposal','chaine',0,NULL,'2016-07-30 11:13:20'),(5632,'MAIN_MODULE_RESOURCE',1,'1',NULL,0,NULL,'2016-07-30 11:13:32'),(5633,'MAIN_MODULE_API',1,'1',NULL,0,NULL,'2016-07-30 11:13:54'),(5634,'MAIN_MODULE_WEBSERVICES',1,'1',NULL,0,NULL,'2016-07-30 11:13:56'),(5635,'WEBSERVICES_KEY',1,'dolibarrkey','chaine',0,'','2016-07-30 11:14:04'),(5638,'MAIN_MODULE_EXTERNALRSS',1,'1',NULL,0,NULL,'2016-07-30 11:15:04'),(5639,'EXTERNAL_RSS_TITLE_1',1,'Dolibarr.org News','chaine',0,'','2016-07-30 11:15:25'),(5640,'EXTERNAL_RSS_URLRSS_1',1,'https://www.dolibarr.org/rss','chaine',0,'','2016-07-30 11:15:25'),(5641,'MAIN_MODULE_DON',1,'1',NULL,0,NULL,'2016-07-30 11:16:22'),(5642,'SOCIETE_CODECOMPTA_ADDON',1,'mod_codecompta_aquarium','chaine',0,'','2016-07-30 11:16:42'),(5707,'CASHDESK_NO_DECREASE_STOCK',1,'1','chaine',0,'','2016-07-30 13:38:11'),(5708,'MAIN_MODULE_PRODUCTBATCH',1,'1',NULL,0,NULL,'2016-07-30 13:38:11'),(5710,'MAIN_MODULE_STOCK',1,'1',NULL,0,NULL,'2016-07-30 13:38:11'),(5711,'MAIN_MODULE_PRODUCT',1,'1',NULL,0,NULL,'2016-07-30 13:38:11'),(5712,'MAIN_MODULE_EXPEDITION',1,'1',NULL,0,NULL,'2016-07-30 13:38:11'),(5713,'MAIN_MODULE_COMMANDE',1,'1',NULL,0,NULL,'2016-07-30 13:38:11'),(5715,'MAIN_MODULE_FOURNISSEUR',1,'1',NULL,0,NULL,'2016-07-30 13:38:11'),(5765,'MAIN_MODULE_AGENDA',1,'1',NULL,0,NULL,'2016-07-30 15:42:32'),(5808,'MARGIN_TYPE',1,'costprice','chaine',0,'','2016-07-30 16:32:18'),(5809,'DISPLAY_MARGIN_RATES',1,'1','chaine',0,'','2016-07-30 16:32:20'),(5810,'MAIN_FEATURES_LEVEL',0,'0','chaine',1,'Level of features to show (0=stable only, 1=stable+experimental, 2=stable+experimental+development','2016-07-30 18:36:15'),(5812,'MAIN_MODULE_OPENSURVEY',1,'1',NULL,0,NULL,'2016-07-30 19:04:07'),(5813,'USER_PASSWORD_PATTERN',1,'8;1;1;1;3;1','chaine',0,'','2016-07-31 16:04:58'),(5814,'MAIN_MODULE_EXPENSEREPORT',1,'1',NULL,0,NULL,'2016-07-31 21:14:32'),(5817,'MAIN_SIZE_SHORTLIST_LIMIT',1,'3','chaine',0,'Max length for small lists (tabs)','2016-12-12 10:54:09'),(5830,'LOAN_ACCOUNTING_ACCOUNT_CAPITAL',1,'164','chaine',0,NULL,'2017-01-29 15:11:51'),(5831,'LOAN_ACCOUNTING_ACCOUNT_INSURANCE',1,'6162','chaine',0,NULL,'2017-01-29 15:11:51'),(5833,'ACCOUNTING_EXPORT_SEPARATORCSV',1,',','string',0,NULL,'2017-01-29 15:11:56'),(5834,'ACCOUNTING_ACCOUNT_SUSPENSE',1,'471','chaine',0,NULL,'2017-01-29 15:11:56'),(5835,'ACCOUNTING_SELL_JOURNAL',1,'VTE','chaine',0,NULL,'2017-01-29 15:11:56'),(5836,'ACCOUNTING_PURCHASE_JOURNAL',1,'ACH','chaine',0,NULL,'2017-01-29 15:11:56'),(5837,'ACCOUNTING_SOCIAL_JOURNAL',1,'SOC','chaine',0,NULL,'2017-01-29 15:11:56'),(5838,'ACCOUNTING_MISCELLANEOUS_JOURNAL',1,'OD','chaine',0,NULL,'2017-01-29 15:11:56'),(5839,'ACCOUNTING_ACCOUNT_TRANSFER_CASH',1,'58','chaine',0,NULL,'2017-01-29 15:11:56'),(5840,'CHARTOFACCOUNTS',1,'2','chaine',0,NULL,'2017-01-29 15:11:56'),(5841,'ACCOUNTING_EXPORT_MODELCSV',1,'1','chaine',0,NULL,'2017-01-29 15:11:56'),(5842,'ACCOUNTING_LENGTH_GACCOUNT',1,'','chaine',0,NULL,'2017-01-29 15:11:56'),(5843,'ACCOUNTING_LENGTH_AACCOUNT',1,'','chaine',0,NULL,'2017-01-29 15:11:56'),(5844,'ACCOUNTING_LIST_SORT_VENTILATION_TODO',1,'1','yesno',0,NULL,'2017-01-29 15:11:56'),(5845,'ACCOUNTING_LIST_SORT_VENTILATION_DONE',1,'1','yesno',0,NULL,'2017-01-29 15:11:56'),(5846,'ACCOUNTING_EXPORT_DATE',1,'%d%m%Y','chaine',0,NULL,'2017-01-29 15:11:56'),(5847,'ACCOUNTING_EXPENSEREPORT_JOURNAL',1,'ER','chaine',0,NULL,'2017-01-29 15:11:56'),(5848,'ACCOUNTING_EXPORT_FORMAT',1,'csv','chaine',0,NULL,'2017-01-29 15:11:56'),(5853,'MAIN_MODULE_WORKFLOW',1,'1',NULL,0,NULL,'2017-01-29 15:12:12'),(5854,'MAIN_MODULE_NOTIFICATION',1,'1',NULL,0,NULL,'2017-01-29 15:12:35'),(5855,'MAIN_MODULE_OAUTH',1,'1',NULL,0,NULL,'2017-01-29 15:12:41'),(5856,'MAIN_MODULE_PRINTING',1,'1',NULL,0,NULL,'2017-01-29 15:12:44'),(5864,'MAIN_INFO_SOCIETE_TEL',1,'09123123','chaine',0,'','2017-01-29 15:13:51'),(5865,'MAIN_INFO_SOCIETE_FAX',1,'09123124','chaine',0,'','2017-01-29 15:13:51'),(5866,'MAIN_INFO_SOCIETE_MAIL',1,'myemail@mybigcompany.com','chaine',0,'','2017-01-29 15:13:51'),(5867,'MAIN_INFO_SOCIETE_WEB',1,'https://www.dolibarr.org','chaine',0,'','2017-01-29 15:13:51'),(5868,'MAIN_INFO_SOCIETE_NOTE',1,'This is note about my company','chaine',0,'','2017-01-29 15:13:51'),(5869,'MAIN_INFO_SOCIETE_GENCOD',1,'1234567890','chaine',0,'','2017-01-29 15:13:51'),(5870,'MAIN_INFO_SOCIETE_MANAGERS',1,'Zack Zeceo','chaine',0,'','2017-01-29 15:13:51'),(5871,'MAIN_INFO_CAPITAL',1,'10000','chaine',0,'','2017-01-29 15:13:51'),(5872,'MAIN_INFO_SOCIETE_FORME_JURIDIQUE',1,'0','chaine',0,'','2017-01-29 15:13:51'),(5873,'MAIN_INFO_SIREN',1,'123456','chaine',0,'','2017-01-29 15:13:51'),(5874,'MAIN_INFO_TVAINTRA',1,'FR1234567','chaine',0,'','2017-01-29 15:13:51'),(5875,'MAIN_INFO_SOCIETE_OBJECT',1,'A company demo to show how Dolibarr ERP CRM is wonderfull','chaine',0,'','2017-01-29 15:13:51'),(5876,'SOCIETE_FISCAL_MONTH_START',1,'1','chaine',0,'','2017-01-29 15:13:51'),(5877,'FACTURE_TVAOPTION',1,'1','chaine',0,'','2017-01-29 15:13:51'),(5878,'FACTURE_LOCAL_TAX1_OPTION',1,'localtax1on','chaine',0,'','2017-01-29 15:13:51'),(5879,'MAIN_INFO_VALUE_LOCALTAX1',1,'0','chaine',0,'','2017-01-29 15:13:51'),(5880,'MAIN_INFO_LOCALTAX_CALC1',1,'0','chaine',0,'','2017-01-29 15:13:51'),(5883,'MAILING_LIMIT_SENDBYWEB',0,'15','chaine',1,'Number of targets to defined packet size when sending mass email','2017-01-29 17:36:33'),(5884,'MAIN_MAIL_DEBUG',1,'0','chaine',1,'','2017-01-29 18:53:02'),(5885,'MAIN_SOAP_DEBUG',1,'0','chaine',1,'','2017-01-29 18:53:02'),(5887,'PROJECT_USE_OPPORTUNITIES',1,'1','chaine',0,'','2017-02-01 12:23:56'),(5888,'PROJECT_HIDE_TASKS',1,'1','chaine',0,'','2017-02-01 12:23:56'),(5889,'MAIN_AGENDA_ACTIONAUTO_COMPANY_SENTBYMAIL',1,'1','chaine',0,'','2017-02-01 14:48:55'),(5890,'MAIN_AGENDA_ACTIONAUTO_COMPANY_CREATE',1,'1','chaine',0,'','2017-02-01 14:48:55'),(5891,'MAIN_AGENDA_ACTIONAUTO_PROPAL_CLOSE_REFUSED',1,'1','chaine',0,'','2017-02-01 14:48:55'),(5892,'MAIN_AGENDA_ACTIONAUTO_PROPAL_CLOSE_SIGNED',1,'1','chaine',0,'','2017-02-01 14:48:55'),(5893,'MAIN_AGENDA_ACTIONAUTO_PROPAL_CLASSIFY_BILLED',1,'1','chaine',0,'','2017-02-01 14:48:55'),(5894,'MAIN_AGENDA_ACTIONAUTO_PROPAL_VALIDATE',1,'1','chaine',0,'','2017-02-01 14:48:55'),(5895,'MAIN_AGENDA_ACTIONAUTO_PROPAL_SENTBYMAIL',1,'1','chaine',0,'','2017-02-01 14:48:55'),(5896,'MAIN_AGENDA_ACTIONAUTO_ORDER_VALIDATE',1,'1','chaine',0,'','2017-02-01 14:48:55'),(5897,'MAIN_AGENDA_ACTIONAUTO_ORDER_CLOSE',1,'1','chaine',0,'','2017-02-01 14:48:55'),(5898,'MAIN_AGENDA_ACTIONAUTO_ORDER_CANCEL',1,'1','chaine',0,'','2017-02-01 14:48:55'),(5899,'MAIN_AGENDA_ACTIONAUTO_ORDER_SENTBYMAIL',1,'1','chaine',0,'','2017-02-01 14:48:55'),(5900,'MAIN_AGENDA_ACTIONAUTO_ORDER_CLASSIFY_BILLED',1,'1','chaine',0,'','2017-02-01 14:48:55'),(5901,'MAIN_AGENDA_ACTIONAUTO_BILL_VALIDATE',1,'1','chaine',0,'','2017-02-01 14:48:55'),(5902,'MAIN_AGENDA_ACTIONAUTO_BILL_PAYED',1,'1','chaine',0,'','2017-02-01 14:48:55'),(5903,'MAIN_AGENDA_ACTIONAUTO_BILL_CANCEL',1,'1','chaine',0,'','2017-02-01 14:48:55'),(5904,'MAIN_AGENDA_ACTIONAUTO_BILL_SENTBYMAIL',1,'1','chaine',0,'','2017-02-01 14:48:55'),(5905,'MAIN_AGENDA_ACTIONAUTO_BILL_UNVALIDATE',1,'1','chaine',0,'','2017-02-01 14:48:55'),(5906,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_VALIDATE',1,'1','chaine',0,'','2017-02-01 14:48:55'),(5907,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_APPROVE',1,'1','chaine',0,'','2017-02-01 14:48:55'),(5908,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_RECEIVE',1,'1','chaine',0,'','2017-02-01 14:48:55'),(5909,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_SUBMIT',1,'1','chaine',0,'','2017-02-01 14:48:55'),(5910,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_REFUSE',1,'1','chaine',0,'','2017-02-01 14:48:55'),(5911,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_CLASSIFY_BILLED',1,'1','chaine',0,'','2017-02-01 14:48:55'),(5912,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_SENTBYMAIL',1,'1','chaine',0,'','2017-02-01 14:48:55'),(5913,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_UNVALIDATE',1,'1','chaine',0,'','2017-02-01 14:48:55'),(5914,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_VALIDATE',1,'1','chaine',0,'','2017-02-01 14:48:55'),(5915,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_PAYED',1,'1','chaine',0,'','2017-02-01 14:48:55'),(5916,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_SENTBYMAIL',1,'1','chaine',0,'','2017-02-01 14:48:55'),(5917,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_CANCELED',1,'1','chaine',0,'','2017-02-01 14:48:55'),(5918,'MAIN_AGENDA_ACTIONAUTO_CONTRACT_VALIDATE',1,'1','chaine',0,'','2017-02-01 14:48:55'),(5919,'MAIN_AGENDA_ACTIONAUTO_FICHINTER_REOPEN',1,'1','chaine',0,'','2017-02-01 14:48:55'),(5920,'MAIN_AGENDA_ACTIONAUTO_FICHINTER_SENTBYMAIL',1,'1','chaine',0,'','2017-02-01 14:48:55'),(5921,'MAIN_AGENDA_ACTIONAUTO_FICHINTER_VALIDATE',1,'1','chaine',0,'','2017-02-01 14:48:55'),(5922,'MAIN_AGENDA_ACTIONAUTO_SHIPPING_VALIDATE',1,'1','chaine',0,'','2017-02-01 14:48:55'),(5923,'MAIN_AGENDA_ACTIONAUTO_SHIPPING_SENTBYMAIL',1,'1','chaine',0,'','2017-02-01 14:48:55'),(5924,'MAIN_AGENDA_ACTIONAUTO_MEMBER_VALIDATE',1,'1','chaine',0,'','2017-02-01 14:48:55'),(5925,'MAIN_AGENDA_ACTIONAUTO_MEMBER_SUBSCRIPTION',1,'1','chaine',0,'','2017-02-01 14:48:55'),(5926,'MAIN_AGENDA_ACTIONAUTO_MEMBER_MODIFY',1,'1','chaine',0,'','2017-02-01 14:48:55'),(5927,'MAIN_AGENDA_ACTIONAUTO_MEMBER_RESILIATE',1,'1','chaine',0,'','2017-02-01 14:48:55'),(5928,'MAIN_AGENDA_ACTIONAUTO_MEMBER_DELETE',1,'1','chaine',0,'','2017-02-01 14:48:55'),(5929,'MAIN_AGENDA_ACTIONAUTO_PROJECT_CREATE',1,'1','chaine',0,'','2017-02-01 14:48:55'),(5930,'MAIN_AGENDA_ACTIONAUTO_PROJECT_DELETE',1,'1','chaine',0,'','2017-02-01 14:48:55'),(5931,'DATABASE_PWD_ENCRYPTED',1,'1','chaine',0,'','2017-02-01 15:06:04'),(5932,'MAIN_DISABLE_ALL_MAILS',1,'0','chaine',0,'','2017-02-01 15:09:09'),(5933,'MAIN_MAIL_SENDMODE',1,'mail','chaine',0,'','2017-02-01 15:09:09'),(5934,'MAIN_MAIL_SMTP_PORT',1,'465','chaine',0,'','2017-02-01 15:09:09'),(5935,'MAIN_MAIL_SMTP_SERVER',1,'smtp.mail.com','chaine',0,'','2017-02-01 15:09:09'),(5936,'MAIN_MAIL_SMTPS_ID',1,'eldy10@mail.com','chaine',0,'','2017-02-01 15:09:09'),(5937,'MAIN_MAIL_SMTPS_PW',1,'bidonge','chaine',0,'','2017-02-01 15:09:09'),(5938,'MAIN_MAIL_EMAIL_FROM',1,'robot@example.com','chaine',0,'','2017-02-01 15:09:09'),(5939,'MAIN_MAIL_DEFAULT_FROMTYPE',1,'user','chaine',0,'','2017-02-01 15:09:09'),(5940,'PRELEVEMENT_ID_BANKACCOUNT',1,'1','chaine',0,'','2017-02-06 04:04:47'),(5941,'PRELEVEMENT_ICS',1,'ICS123456','chaine',0,'','2017-02-06 04:04:47'),(5942,'PRELEVEMENT_USER',1,'1','chaine',0,'','2017-02-06 04:04:47'),(5943,'BANKADDON_PDF',1,'sepamandate','chaine',0,'','2017-02-06 04:13:52'),(5947,'CHEQUERECEIPTS_THYME_MASK',1,'CHK{yy}{mm}-{0000@1}','chaine',0,'','2017-02-06 04:16:27'),(5948,'MAIN_MODULE_LOAN',1,'1',NULL,0,NULL,'2017-02-06 19:19:05'),(5954,'MAIN_SUBMODULE_EXPEDITION',1,'1','chaine',0,'','2017-02-06 23:57:37'),(5960,'MAIN_MODULE_ACCOUNTING',1,'1',NULL,0,NULL,'2017-02-07 18:56:11'),(5963,'MAIN_MODULE_BANQUE',1,'1',NULL,0,NULL,'2017-02-07 18:56:12'),(5964,'MAIN_MODULE_TAX',1,'1',NULL,0,NULL,'2017-02-07 18:56:12'),(5995,'MAIN_MODULE_SOCIETE',1,'1',NULL,0,NULL,'2017-02-12 19:15:56'),(5996,'CABINETMED_RHEUMATOLOGY_ON',1,'0','texte',0,'','2017-02-12 19:20:04'),(5999,'MAIN_SEARCHFORM_SOCIETE',1,'1','texte',0,'','2017-02-12 19:20:04'),(6000,'CABINETMED_BANK_PATIENT_REQUIRED',1,'0','texte',0,'','2017-02-12 19:20:04'),(6004,'MAIN_MODULE_MULTICOMPANY_CSS',1,'[\"\\/multicompany\\/css\\/multicompany.css.php\"]','chaine',0,NULL,'2017-02-15 17:17:11'),(6019,'MAIN_INFO_SOCIETE_COUNTRY',2,'1:FR:France','chaine',0,'','2017-02-15 17:18:22'),(6020,'MAIN_INFO_SOCIETE_NOM',2,'MySecondCompany','chaine',0,'','2017-02-15 17:18:22'),(6021,'MAIN_INFO_SOCIETE_STATE',2,'0','chaine',0,'','2017-02-15 17:18:22'),(6022,'MAIN_MONNAIE',2,'EUR','chaine',0,'','2017-02-15 17:18:22'),(6023,'MAIN_LANG_DEFAULT',2,'auto','chaine',0,'','2017-02-15 17:18:22'),(6024,'MAIN_INFO_SOCIETE_COUNTRY',1,'14:CA:Canada','chaine',0,'','2017-02-15 17:18:41'),(6025,'MAIN_INFO_SOCIETE_NOM',1,'MyBigCompany','chaine',0,'','2017-02-15 17:18:41'),(6026,'MAIN_INFO_SOCIETE_ADDRESS',1,'21 Jump street','chaine',0,'','2017-02-15 17:18:41'),(6027,'MAIN_INFO_SOCIETE_TOWN',1,'MyTown','chaine',0,'','2017-02-15 17:18:41'),(6028,'MAIN_INFO_SOCIETE_ZIP',1,'75500','chaine',0,'','2017-02-15 17:18:41'),(6029,'MAIN_INFO_SOCIETE_STATE',1,'1514','chaine',0,'','2017-02-15 17:18:41'),(6030,'MAIN_MONNAIE',1,'EUR','chaine',0,'','2017-02-15 17:18:41'),(6031,'MAIN_LANG_DEFAULT',1,'auto','chaine',0,'','2017-02-15 17:18:41'),(6032,'MAIN_MODULE_MULTICURRENCY',1,'1',NULL,0,NULL,'2017-02-15 17:29:59'),(6047,'MAIN_MODULE_SYSLOG',0,'1',NULL,0,NULL,'2017-02-15 22:36:58'),(6048,'SYSLOG_FACILITY',0,'LOG_USER','chaine',0,'','2017-02-15 22:37:01'),(6049,'SYSLOG_FIREPHP_INCLUDEPATH',0,'/home/ldestailleur/git/dolibarr_5.0/htdocs/includes/firephp/firephp-core/lib/','chaine',0,'','2017-02-15 22:37:01'),(6050,'SYSLOG_FILE',0,'DOL_DATA_ROOT/dolibarr.log','chaine',0,'','2017-02-15 22:37:01'),(6051,'SYSLOG_CHROMEPHP_INCLUDEPATH',0,'/home/ldestailleur/git/dolibarr_5.0/htdocs/includes/ccampbell/chromephp/','chaine',0,'','2017-02-15 22:37:01'),(6052,'SYSLOG_HANDLERS',0,'[\"mod_syslog_file\"]','chaine',0,'','2017-02-15 22:37:01'),(6054,'SYSLOG_LEVEL',0,'7','chaine',0,'','2017-02-15 22:37:21'),(6074,'CABINETMED_DELAY_TO_LOCK_RECORD',1,'','chaine',1,'Number of days before locking edit of consultation','2017-02-21 00:04:15'),(6087,'MAIN_MODULE_BARCODE',1,'1',NULL,0,NULL,'2017-02-21 11:03:40'),(6088,'MAIN_MODULE_CRON',1,'1',NULL,0,NULL,'2017-02-21 11:03:40'),(6089,'MAIN_MODULE_FACTURE',1,'1',NULL,0,NULL,'2017-02-21 11:03:40'),(6090,'MAIN_VERSION_LAST_UPGRADE',0,'5.0.0','chaine',0,'Dolibarr version for last upgrade','2017-02-21 11:03:42');
+INSERT INTO `llx_const` VALUES (8,'MAIN_UPLOAD_DOC',0,'2048','chaine',0,'Max size for file upload (0 means no upload allowed)','2010-07-08 11:17:57'),(9,'MAIN_SEARCHFORM_SOCIETE',0,'1','yesno',0,'Show form for quick company search','2010-07-08 11:17:57'),(10,'MAIN_SEARCHFORM_CONTACT',0,'1','yesno',0,'Show form for quick contact search','2010-07-08 11:17:57'),(11,'MAIN_SEARCHFORM_PRODUITSERVICE',0,'1','yesno',0,'Show form for quick product search','2010-07-08 11:17:58'),(12,'MAIN_SEARCHFORM_ADHERENT',0,'1','yesno',0,'Show form for quick member search','2010-07-08 11:17:58'),(16,'MAIN_SIZE_LISTE_LIMIT',0,'25','chaine',0,'Longueur maximum des listes','2010-07-08 11:17:58'),(17,'MAIN_SHOW_WORKBOARD',0,'1','yesno',0,'Affichage tableau de bord de travail Dolibarr','2010-07-08 11:17:58'),(29,'MAIN_DELAY_NOT_ACTIVATED_SERVICES',1,'0','chaine',0,'Tolérance de retard avant alerte (en jours) sur services à activer','2010-07-08 11:17:58'),(33,'SOCIETE_NOLIST_COURRIER',0,'1','yesno',0,'Liste les fichiers du repertoire courrier','2010-07-08 11:17:58'),(36,'ADHERENT_MAIL_REQUIRED',1,'1','yesno',0,'EMail required to create a new member','2010-07-08 11:17:58'),(37,'ADHERENT_MAIL_FROM',1,'adherents@domain.com','chaine',0,'Sender EMail for automatic emails','2010-07-08 11:17:58'),(38,'ADHERENT_MAIL_RESIL',1,'Your subscription has been resiliated.\r\nWe hope to see you soon again','texte',0,'Mail resiliation','2010-07-08 11:17:58'),(39,'ADHERENT_MAIL_VALID',1,'Your subscription has been validated.\r\nThis is a remind of your personal information :\r\n\r\n%INFOS%\r\n\r\n','texte',0,'Mail de validation','2010-07-08 11:17:59'),(40,'ADHERENT_MAIL_COTIS',1,'Hello %PRENOM%,\r\nThanks for your subscription.\r\nThis email confirms that your subscription has been received and processed.\r\n\r\n','texte',0,'Mail de validation de cotisation','2010-07-08 11:17:59'),(41,'ADHERENT_MAIL_VALID_SUBJECT',1,'Your subscription has been validated','chaine',0,'Sujet du mail de validation','2010-07-08 11:17:59'),(42,'ADHERENT_MAIL_RESIL_SUBJECT',1,'Resiliating your subscription','chaine',0,'Sujet du mail de resiliation','2010-07-08 11:17:59'),(43,'ADHERENT_MAIL_COTIS_SUBJECT',1,'Receipt of your subscription','chaine',0,'Sujet du mail de validation de cotisation','2010-07-08 11:17:59'),(44,'MAILING_EMAIL_FROM',1,'dolibarr@domain.com','chaine',0,'EMail emmetteur pour les envois d emailings','2010-07-08 11:17:59'),(45,'ADHERENT_USE_MAILMAN',1,'0','yesno',0,'Utilisation de Mailman','2010-07-08 11:17:59'),(46,'ADHERENT_MAILMAN_UNSUB_URL',1,'http://lists.domain.com/cgi-bin/mailman/admin/%LISTE%/members?adminpw=%MAILMAN_ADMINPW%&user=%EMAIL%','chaine',0,'Url de desinscription aux listes mailman','2010-07-08 11:17:59'),(47,'ADHERENT_MAILMAN_URL',1,'http://lists.domain.com/cgi-bin/mailman/admin/%LISTE%/members?adminpw=%MAILMAN_ADMINPW%&send_welcome_msg_to_this_batch=1&subscribees=%EMAIL%','chaine',0,'Url pour les inscriptions mailman','2010-07-08 11:17:59'),(48,'ADHERENT_MAILMAN_LISTS',1,'test-test,test-test2','chaine',0,'Listes auxquelles inscrire les nouveaux adherents','2010-07-08 11:17:59'),(49,'ADHERENT_MAILMAN_ADMINPW',1,'','chaine',0,'Mot de passe Admin des liste mailman','2010-07-08 11:17:59'),(50,'ADHERENT_MAILMAN_SERVER',1,'lists.domain.com','chaine',0,'Serveur hebergeant les interfaces d Admin des listes mailman','2010-07-08 11:17:59'),(51,'ADHERENT_MAILMAN_LISTS_COTISANT',1,'','chaine',0,'Liste(s) auxquelles les nouveaux cotisants sont inscris automatiquement','2010-07-08 11:17:59'),(52,'ADHERENT_USE_SPIP',1,'0','yesno',0,'Utilisation de SPIP ?','2010-07-08 11:17:59'),(53,'ADHERENT_USE_SPIP_AUTO',1,'0','yesno',0,'Utilisation de SPIP automatiquement','2010-07-08 11:17:59'),(54,'ADHERENT_SPIP_USER',1,'user','chaine',0,'user spip','2010-07-08 11:17:59'),(55,'ADHERENT_SPIP_PASS',1,'pass','chaine',0,'Pass de connection','2010-07-08 11:17:59'),(56,'ADHERENT_SPIP_SERVEUR',1,'localhost','chaine',0,'serveur spip','2010-07-08 11:17:59'),(57,'ADHERENT_SPIP_DB',1,'spip','chaine',0,'db spip','2010-07-08 11:17:59'),(58,'ADHERENT_CARD_HEADER_TEXT',1,'%ANNEE%','chaine',0,'Texte imprime sur le haut de la carte adherent','2010-07-08 11:17:59'),(59,'ADHERENT_CARD_FOOTER_TEXT',1,'Association AZERTY','chaine',0,'Texte imprime sur le bas de la carte adherent','2010-07-08 11:17:59'),(61,'FCKEDITOR_ENABLE_USER',1,'1','yesno',0,'Activation fckeditor sur notes utilisateurs','2010-07-08 11:17:59'),(62,'FCKEDITOR_ENABLE_SOCIETE',1,'1','yesno',0,'Activation fckeditor sur notes societe','2010-07-08 11:17:59'),(63,'FCKEDITOR_ENABLE_PRODUCTDESC',1,'1','yesno',0,'Activation fckeditor sur notes produits','2010-07-08 11:17:59'),(64,'FCKEDITOR_ENABLE_MEMBER',1,'1','yesno',0,'Activation fckeditor sur notes adherent','2010-07-08 11:17:59'),(65,'FCKEDITOR_ENABLE_MAILING',1,'1','yesno',0,'Activation fckeditor sur emailing','2010-07-08 11:17:59'),(67,'DON_ADDON_MODEL',1,'html_cerfafr','chaine',0,'','2010-07-08 11:18:00'),(68,'PROPALE_ADDON',1,'mod_propale_marbre','chaine',0,'','2010-07-08 11:18:00'),(69,'PROPALE_ADDON_PDF',1,'azur','chaine',0,'','2010-07-08 11:18:00'),(70,'COMMANDE_ADDON',1,'mod_commande_marbre','chaine',0,'','2010-07-08 11:18:00'),(71,'COMMANDE_ADDON_PDF',1,'einstein','chaine',0,'','2010-07-08 11:18:00'),(72,'COMMANDE_SUPPLIER_ADDON',1,'mod_commande_fournisseur_muguet','chaine',0,'','2010-07-08 11:18:00'),(73,'COMMANDE_SUPPLIER_ADDON_PDF',1,'muscadet','chaine',0,'','2010-07-08 11:18:00'),(74,'EXPEDITION_ADDON',1,'enlevement','chaine',0,'','2010-07-08 11:18:00'),(76,'FICHEINTER_ADDON',1,'pacific','chaine',0,'','2010-07-08 11:18:00'),(77,'FICHEINTER_ADDON_PDF',1,'soleil','chaine',0,'','2010-07-08 11:18:00'),(79,'FACTURE_ADDON_PDF',1,'crabe','chaine',0,'','2010-07-08 11:18:00'),(80,'PROPALE_VALIDITY_DURATION',1,'15','chaine',0,'Durée de validitée des propales','2010-07-08 11:18:00'),(230,'COMPANY_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/thirdparties','chaine',0,NULL,'2010-07-08 11:26:20'),(238,'LIVRAISON_ADDON_PDF',1,'typhon','chaine',0,'Nom du gestionnaire de generation des commandes en PDF','2010-07-08 11:26:27'),(239,'LIVRAISON_ADDON_NUMBER',1,'mod_livraison_jade','chaine',0,'Nom du gestionnaire de numerotation des bons de livraison','2013-03-20 13:17:36'),(245,'FACTURE_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/invoices','chaine',0,NULL,'2010-07-08 11:28:53'),(249,'DON_FORM',1,'fsfe.fr.php','chaine',0,'Nom du gestionnaire de formulaire de dons','2010-07-08 11:29:00'),(253,'ADHERENT_BANK_USE_AUTO',1,'','yesno',0,'Insertion automatique des cotisation dans le compte banquaire','2010-07-08 11:29:05'),(254,'ADHERENT_BANK_ACCOUNT',1,'','chaine',0,'ID du Compte banquaire utilise','2010-07-08 11:29:05'),(255,'ADHERENT_BANK_CATEGORIE',1,'','chaine',0,'ID de la categorie banquaire des cotisations','2010-07-08 11:29:05'),(256,'ADHERENT_ETIQUETTE_TYPE',1,'L7163','chaine',0,'Type d etiquette (pour impression de planche d etiquette)','2010-07-08 11:29:05'),(269,'PROJECT_ADDON_PDF',1,'baleine','chaine',0,'Nom du gestionnaire de generation des projets en PDF','2010-07-08 11:29:33'),(270,'PROJECT_ADDON',1,'mod_project_simple','chaine',0,'Nom du gestionnaire de numerotation des projets','2010-07-08 11:29:33'),(368,'STOCK_USERSTOCK_AUTOCREATE',1,'1','chaine',0,'','2010-07-08 22:44:59'),(369,'EXPEDITION_ADDON_PDF',1,'merou','chaine',0,'','2010-07-08 22:58:07'),(377,'FACTURE_ADDON',1,'mod_facture_terre','chaine',0,'','2010-07-08 23:08:12'),(380,'ADHERENT_CARD_TEXT',1,'%TYPE% n° %ID%\r\n%PRENOM% %NOM%\r\n<%EMAIL%>\r\n%ADRESSE%\r\n%CP% %VILLE%\r\n%PAYS%','',0,'Texte imprime sur la carte adherent','2010-07-08 23:14:46'),(381,'ADHERENT_CARD_TEXT_RIGHT',1,'aaa','',0,'','2010-07-08 23:14:55'),(385,'PRODUIT_USE_SEARCH_TO_SELECT',1,'1','chaine',0,'','2010-07-08 23:22:19'),(386,'STOCK_CALCULATE_ON_SHIPMENT',1,'1','chaine',0,'','2010-07-08 23:23:21'),(387,'STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER',1,'1','chaine',0,'','2010-07-08 23:23:26'),(392,'MAIN_AGENDA_XCAL_EXPORTKEY',1,'dolibarr','chaine',0,'','2010-07-08 23:27:50'),(393,'MAIN_AGENDA_EXPORT_PAST_DELAY',1,'100','chaine',0,'','2010-07-08 23:27:50'),(610,'CASHDESK_ID_THIRDPARTY',1,'7','chaine',0,'','2010-07-11 17:08:18'),(611,'CASHDESK_ID_BANKACCOUNT_CASH',1,'3','chaine',0,'','2010-07-11 17:08:18'),(612,'CASHDESK_ID_BANKACCOUNT_CHEQUE',1,'1','chaine',0,'','2010-07-11 17:08:18'),(613,'CASHDESK_ID_BANKACCOUNT_CB',1,'1','chaine',0,'','2010-07-11 17:08:18'),(614,'CASHDESK_ID_WAREHOUSE',1,'2','chaine',0,'','2010-07-11 17:08:18'),(660,'LDAP_USER_DN',1,'ou=users,dc=my-domain,dc=com','chaine',0,NULL,'2010-07-18 10:25:27'),(661,'LDAP_GROUP_DN',1,'ou=groups,dc=my-domain,dc=com','chaine',0,NULL,'2010-07-18 10:25:27'),(662,'LDAP_FILTER_CONNECTION',1,'&(objectClass=user)(objectCategory=person)','chaine',0,NULL,'2010-07-18 10:25:27'),(663,'LDAP_FIELD_LOGIN',1,'uid','chaine',0,NULL,'2010-07-18 10:25:27'),(664,'LDAP_FIELD_FULLNAME',1,'cn','chaine',0,NULL,'2010-07-18 10:25:27'),(665,'LDAP_FIELD_NAME',1,'sn','chaine',0,NULL,'2010-07-18 10:25:27'),(666,'LDAP_FIELD_FIRSTNAME',1,'givenname','chaine',0,NULL,'2010-07-18 10:25:27'),(667,'LDAP_FIELD_MAIL',1,'mail','chaine',0,NULL,'2010-07-18 10:25:27'),(668,'LDAP_FIELD_PHONE',1,'telephonenumber','chaine',0,NULL,'2010-07-18 10:25:27'),(669,'LDAP_FIELD_FAX',1,'facsimiletelephonenumber','chaine',0,NULL,'2010-07-18 10:25:27'),(670,'LDAP_FIELD_MOBILE',1,'mobile','chaine',0,NULL,'2010-07-18 10:25:27'),(671,'LDAP_SERVER_TYPE',1,'openldap','chaine',0,'','2010-07-18 10:25:46'),(672,'LDAP_SERVER_PROTOCOLVERSION',1,'3','chaine',0,'','2010-07-18 10:25:47'),(673,'LDAP_SERVER_HOST',1,'localhost','chaine',0,'','2010-07-18 10:25:47'),(674,'LDAP_SERVER_PORT',1,'389','chaine',0,'','2010-07-18 10:25:47'),(675,'LDAP_SERVER_USE_TLS',1,'0','chaine',0,'','2010-07-18 10:25:47'),(676,'LDAP_SYNCHRO_ACTIVE',1,'dolibarr2ldap','chaine',0,'','2010-07-18 10:25:47'),(677,'LDAP_CONTACT_ACTIVE',1,'1','chaine',0,'','2010-07-18 10:25:47'),(678,'LDAP_MEMBER_ACTIVE',1,'1','chaine',0,'','2010-07-18 10:25:47'),(974,'MAIN_MODULE_WORKFLOW_TRIGGERS',1,'1','chaine',0,NULL,'2011-07-18 18:02:20'),(975,'WORKFLOW_PROPAL_AUTOCREATE_ORDER',1,'1','chaine',0,'','2011-07-18 18:02:24'),(980,'PRELEVEMENT_NUMERO_NATIONAL_EMETTEUR',1,'1234567','chaine',0,'','2011-07-18 18:05:50'),(983,'FACTURE_RIB_NUMBER',1,'1','chaine',0,'','2011-07-18 18:35:14'),(984,'FACTURE_CHQ_NUMBER',1,'1','chaine',0,'','2011-07-18 18:35:14'),(1016,'GOOGLE_DUPLICATE_INTO_GCAL',1,'1','chaine',0,'','2011-07-18 21:40:20'),(1152,'SOCIETE_CODECLIENT_ADDON',1,'mod_codeclient_monkey','chaine',0,'','2011-07-29 20:50:02'),(1231,'MAIN_UPLOAD_DOC',1,'2048','chaine',0,'','2011-07-29 21:04:00'),(1234,'MAIN_UMASK',1,'0664','chaine',0,'','2011-07-29 21:04:11'),(1240,'MAIN_LOGEVENTS_USER_LOGIN',1,'1','chaine',0,'','2011-07-29 21:05:01'),(1241,'MAIN_LOGEVENTS_USER_LOGIN_FAILED',1,'1','chaine',0,'','2011-07-29 21:05:01'),(1242,'MAIN_LOGEVENTS_USER_LOGOUT',1,'1','chaine',0,'','2011-07-29 21:05:01'),(1243,'MAIN_LOGEVENTS_USER_CREATE',1,'1','chaine',0,'','2011-07-29 21:05:01'),(1244,'MAIN_LOGEVENTS_USER_MODIFY',1,'1','chaine',0,'','2011-07-29 21:05:01'),(1245,'MAIN_LOGEVENTS_USER_NEW_PASSWORD',1,'1','chaine',0,'','2011-07-29 21:05:01'),(1246,'MAIN_LOGEVENTS_USER_ENABLEDISABLE',1,'1','chaine',0,'','2011-07-29 21:05:01'),(1247,'MAIN_LOGEVENTS_USER_DELETE',1,'1','chaine',0,'','2011-07-29 21:05:01'),(1248,'MAIN_LOGEVENTS_GROUP_CREATE',1,'1','chaine',0,'','2011-07-29 21:05:01'),(1249,'MAIN_LOGEVENTS_GROUP_MODIFY',1,'1','chaine',0,'','2011-07-29 21:05:01'),(1250,'MAIN_LOGEVENTS_GROUP_DELETE',1,'1','chaine',0,'','2011-07-29 21:05:01'),(1251,'MAIN_BOXES_MAXLINES',1,'5','',0,'','2011-07-29 21:05:42'),(1482,'EXPEDITION_ADDON_NUMBER',1,'mod_expedition_safor','chaine',0,'Nom du gestionnaire de numerotation des expeditions','2011-08-05 17:53:11'),(1490,'CONTRACT_ADDON',1,'mod_contract_serpis','chaine',0,'Nom du gestionnaire de numerotation des contrats','2011-08-05 18:11:58'),(1677,'COMMANDE_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/orders','chaine',0,NULL,'2012-12-08 13:11:02'),(1698,'PRODUCT_CODEPRODUCT_ADDON',1,'mod_codeproduct_leopard','yesno',0,'Module to control product codes','2012-12-08 13:11:25'),(1724,'PROPALE_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/proposals','chaine',0,NULL,'2012-12-08 13:17:14'),(1730,'OPENSTREETMAP_ENABLE_MAPS',1,'1','chaine',0,'','2012-12-08 13:22:47'),(1731,'OPENSTREETMAP_ENABLE_MAPS_CONTACTS',1,'1','chaine',0,'','2012-12-08 13:22:47'),(1732,'OPENSTREETMAP_ENABLE_MAPS_MEMBERS',1,'1','chaine',0,'','2012-12-08 13:22:47'),(1733,'OPENSTREETMAP_MAPS_ZOOM_LEVEL',1,'15','chaine',0,'','2012-12-08 13:22:47'),(1742,'MAIN_MAIL_EMAIL_FROM',2,'dolibarr-robot@domain.com','chaine',0,'EMail emetteur pour les emails automatiques Dolibarr','2012-12-08 14:08:14'),(1743,'MAIN_MENU_STANDARD',2,'eldy_menu.php','chaine',0,'Module de gestion de la barre de menu du haut pour utilisateurs internes','2013-02-11 19:43:54'),(1744,'MAIN_MENUFRONT_STANDARD',2,'eldy_menu.php','chaine',0,'Module de gestion de la barre de menu du haut pour utilisateurs externes','2013-02-11 19:43:54'),(1745,'MAIN_MENU_SMARTPHONE',2,'iphone_backoffice.php','chaine',0,'Module de gestion de la barre de menu smartphone pour utilisateurs internes','2012-12-08 14:08:14'),(1746,'MAIN_MENUFRONT_SMARTPHONE',2,'iphone_frontoffice.php','chaine',0,'Module de gestion de la barre de menu smartphone pour utilisateurs externes','2012-12-08 14:08:14'),(1747,'MAIN_THEME',2,'eldy','chaine',0,'Default theme','2012-12-08 14:08:14'),(1748,'MAIN_DELAY_ACTIONS_TODO',2,'7','chaine',0,'Tolérance de retard avant alerte (en jours) sur actions planifiées non réalisées','2012-12-08 14:08:14'),(1749,'MAIN_DELAY_ORDERS_TO_PROCESS',2,'2','chaine',0,'Tolérance de retard avant alerte (en jours) sur commandes clients non traitées','2012-12-08 14:08:14'),(1750,'MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS',2,'7','chaine',0,'Tolérance de retard avant alerte (en jours) sur commandes fournisseurs non traitées','2012-12-08 14:08:14'),(1751,'MAIN_DELAY_PROPALS_TO_CLOSE',2,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur propales à cloturer','2012-12-08 14:08:14'),(1752,'MAIN_DELAY_PROPALS_TO_BILL',2,'7','chaine',0,'Tolérance de retard avant alerte (en jours) sur propales non facturées','2012-12-08 14:08:14'),(1753,'MAIN_DELAY_CUSTOMER_BILLS_UNPAYED',2,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur factures client impayées','2012-12-08 14:08:14'),(1754,'MAIN_DELAY_SUPPLIER_BILLS_TO_PAY',2,'2','chaine',0,'Tolérance de retard avant alerte (en jours) sur factures fournisseur impayées','2012-12-08 14:08:14'),(1755,'MAIN_DELAY_NOT_ACTIVATED_SERVICES',2,'0','chaine',0,'Tolérance de retard avant alerte (en jours) sur services à activer','2012-12-08 14:08:14'),(1756,'MAIN_DELAY_RUNNING_SERVICES',2,'0','chaine',0,'Tolérance de retard avant alerte (en jours) sur services expirés','2012-12-08 14:08:14'),(1757,'MAIN_DELAY_MEMBERS',2,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur cotisations adhérent en retard','2012-12-08 14:08:14'),(1758,'MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE',2,'62','chaine',0,'Tolérance de retard avant alerte (en jours) sur rapprochements bancaires à faire','2012-12-08 14:08:14'),(1759,'MAILING_EMAIL_FROM',2,'dolibarr@domain.com','chaine',0,'EMail emmetteur pour les envois d emailings','2012-12-08 14:08:14'),(1760,'MAIN_INFO_SOCIETE_COUNTRY',3,'1:FR:France','chaine',0,'','2013-02-26 21:56:28'),(1761,'MAIN_INFO_SOCIETE_NOM',3,'bbb','chaine',0,'','2012-12-08 14:08:20'),(1762,'MAIN_INFO_SOCIETE_STATE',3,'0','chaine',0,'','2013-02-27 14:20:27'),(1763,'MAIN_MONNAIE',3,'EUR','chaine',0,'','2012-12-08 14:08:20'),(1764,'MAIN_LANG_DEFAULT',3,'auto','chaine',0,'','2012-12-08 14:08:20'),(1765,'MAIN_MAIL_EMAIL_FROM',3,'dolibarr-robot@domain.com','chaine',0,'EMail emetteur pour les emails automatiques Dolibarr','2012-12-08 14:08:20'),(1766,'MAIN_MENU_STANDARD',3,'eldy_menu.php','chaine',0,'Module de gestion de la barre de menu du haut pour utilisateurs internes','2013-02-11 19:43:54'),(1767,'MAIN_MENUFRONT_STANDARD',3,'eldy_menu.php','chaine',0,'Module de gestion de la barre de menu du haut pour utilisateurs externes','2013-02-11 19:43:54'),(1768,'MAIN_MENU_SMARTPHONE',3,'iphone_backoffice.php','chaine',0,'Module de gestion de la barre de menu smartphone pour utilisateurs internes','2012-12-08 14:08:20'),(1769,'MAIN_MENUFRONT_SMARTPHONE',3,'iphone_frontoffice.php','chaine',0,'Module de gestion de la barre de menu smartphone pour utilisateurs externes','2012-12-08 14:08:20'),(1770,'MAIN_THEME',3,'eldy','chaine',0,'Default theme','2012-12-08 14:08:20'),(1771,'MAIN_DELAY_ACTIONS_TODO',3,'7','chaine',0,'Tolérance de retard avant alerte (en jours) sur actions planifiées non réalisées','2012-12-08 14:08:20'),(1772,'MAIN_DELAY_ORDERS_TO_PROCESS',3,'2','chaine',0,'Tolérance de retard avant alerte (en jours) sur commandes clients non traitées','2012-12-08 14:08:20'),(1773,'MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS',3,'7','chaine',0,'Tolérance de retard avant alerte (en jours) sur commandes fournisseurs non traitées','2012-12-08 14:08:20'),(1774,'MAIN_DELAY_PROPALS_TO_CLOSE',3,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur propales à cloturer','2012-12-08 14:08:20'),(1775,'MAIN_DELAY_PROPALS_TO_BILL',3,'7','chaine',0,'Tolérance de retard avant alerte (en jours) sur propales non facturées','2012-12-08 14:08:20'),(1776,'MAIN_DELAY_CUSTOMER_BILLS_UNPAYED',3,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur factures client impayées','2012-12-08 14:08:20'),(1777,'MAIN_DELAY_SUPPLIER_BILLS_TO_PAY',3,'2','chaine',0,'Tolérance de retard avant alerte (en jours) sur factures fournisseur impayées','2012-12-08 14:08:20'),(1778,'MAIN_DELAY_NOT_ACTIVATED_SERVICES',3,'0','chaine',0,'Tolérance de retard avant alerte (en jours) sur services à activer','2012-12-08 14:08:20'),(1779,'MAIN_DELAY_RUNNING_SERVICES',3,'0','chaine',0,'Tolérance de retard avant alerte (en jours) sur services expirés','2012-12-08 14:08:20'),(1780,'MAIN_DELAY_MEMBERS',3,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur cotisations adhérent en retard','2012-12-08 14:08:20'),(1781,'MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE',3,'62','chaine',0,'Tolérance de retard avant alerte (en jours) sur rapprochements bancaires à faire','2012-12-08 14:08:20'),(1782,'MAILING_EMAIL_FROM',3,'dolibarr@domain.com','chaine',0,'EMail emmetteur pour les envois d emailings','2012-12-08 14:08:20'),(1803,'SYSLOG_FILE',1,'DOL_DATA_ROOT/dolibarr.log','chaine',0,'','2012-12-08 14:15:08'),(1804,'SYSLOG_HANDLERS',1,'[\"mod_syslog_file\"]','chaine',0,'','2012-12-08 14:15:08'),(1805,'MAIN_MODULE_SKINCOLOREDITOR',3,'1',NULL,0,NULL,'2012-12-08 14:35:40'),(1806,'MAIN_MODULE_SKINCOLOREDITOR_TABS_0',3,'user:+tabskincoloreditors:ColorEditor:skincoloreditor@skincoloreditor:/skincoloreditor/usercolors.php?id=__ID__','chaine',0,NULL,'2012-12-08 14:35:40'),(1922,'PAYPAL_API_SANDBOX',1,'1','chaine',0,'','2012-12-12 12:11:05'),(1923,'PAYPAL_API_USER',1,'seller_1355312017_biz_api1.nltechno.com','chaine',0,'','2012-12-12 12:11:05'),(1924,'PAYPAL_API_PASSWORD',1,'1355312040','chaine',0,'','2012-12-12 12:11:05'),(1925,'PAYPAL_API_SIGNATURE',1,'AXqqdsWBzvfn0q5iNmbuiDv1y.3EAXIMWyl4C5KvDReR9HDwwAd6dQ4Q','chaine',0,'','2012-12-12 12:11:05'),(1926,'PAYPAL_API_INTEGRAL_OR_PAYPALONLY',1,'integral','chaine',0,'','2012-12-12 12:11:05'),(1927,'PAYPAL_SECURITY_TOKEN',1,'50c82fab36bb3b6aa83e2a50691803b2','chaine',0,'','2012-12-12 12:11:05'),(1928,'PAYPAL_SECURITY_TOKEN_UNIQUE',1,'0','chaine',0,'','2012-12-12 12:11:05'),(1929,'PAYPAL_ADD_PAYMENT_URL',1,'1','chaine',0,'','2012-12-12 12:11:05'),(1980,'MAIN_PDF_FORMAT',1,'EUA4','chaine',0,'','2012-12-12 19:58:05'),(1981,'MAIN_PROFID1_IN_ADDRESS',1,'0','chaine',0,'','2012-12-12 19:58:05'),(1982,'MAIN_PROFID2_IN_ADDRESS',1,'0','chaine',0,'','2012-12-12 19:58:05'),(1983,'MAIN_PROFID3_IN_ADDRESS',1,'0','chaine',0,'','2012-12-12 19:58:05'),(1984,'MAIN_PROFID4_IN_ADDRESS',1,'0','chaine',0,'','2012-12-12 19:58:05'),(1985,'MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT',1,'0','chaine',0,'','2012-12-12 19:58:05'),(1990,'MAIN_SMS_SENDMODE',1,'ovh','chaine',0,'This is to enable OVH SMS engine','2012-12-17 21:19:01'),(2251,'FCKEDITOR_TEST',1,'Test<br />\r\n<img alt=\"\" src=\"/dolibarrnew/viewimage.php?modulepart=fckeditor&amp;file=image/Julien-Lavergne_reference_medium.jpg\" style=\"width: 200px; height: 172px;\" />fdfs','chaine',0,'','2012-12-19 19:12:24'),(2293,'SYSTEMTOOLS_MYSQLDUMP',1,'/usr/bin/mysqldump','chaine',0,'','2012-12-27 02:02:00'),(2835,'MAIN_USE_CONNECT_TIMEOUT',1,'10','chaine',0,'','2013-01-16 19:28:50'),(2836,'MAIN_USE_RESPONSE_TIMEOUT',1,'30','chaine',0,'','2013-01-16 19:28:50'),(2837,'MAIN_PROXY_USE',1,'0','chaine',0,'','2013-01-16 19:28:50'),(2838,'MAIN_PROXY_HOST',1,'localhost','chaine',0,'','2013-01-16 19:28:50'),(2839,'MAIN_PROXY_PORT',1,'8080','chaine',0,'','2013-01-16 19:28:50'),(2840,'MAIN_PROXY_USER',1,'aaa','chaine',0,'','2013-01-16 19:28:50'),(2841,'MAIN_PROXY_PASS',1,'bbb','chaine',0,'','2013-01-16 19:28:50'),(2848,'OVHSMS_NICK',1,'BN196-OVH','chaine',0,'','2013-01-16 19:32:36'),(2849,'OVHSMS_PASS',1,'bigone-10','chaine',0,'','2013-01-16 19:32:36'),(2850,'OVHSMS_SOAPURL',1,'https://www.ovh.com/soapi/soapi-re-1.55.wsdl','chaine',0,'','2013-01-16 19:32:36'),(2854,'THEME_ELDY_RGB',1,'bfbf00','chaine',0,'','2013-01-18 10:02:53'),(2855,'THEME_ELDY_ENABLE_PERSONALIZED',1,'0','chaine',0,'','2013-01-18 10:02:55'),(2858,'MAIN_SESSION_TIMEOUT',1,'2000','chaine',0,'','2013-01-19 17:01:53'),(2862,'TICKET_ADDON',1,'mod_ticket_avenc','chaine',0,'Nom du gestionnaire de numerotation des tickets','2013-01-19 17:16:10'),(2867,'FACSIM_ADDON',1,'mod_facsim_alcoy','chaine',0,'','2013-01-19 17:16:25'),(2868,'POS_SERVICES',1,'0','chaine',0,'','2013-01-19 17:16:51'),(2869,'POS_USE_TICKETS',1,'1','chaine',0,'','2013-01-19 17:16:51'),(2870,'POS_MAX_TTC',1,'100','chaine',0,'','2013-01-19 17:16:51'),(3190,'MAIN_MODULE_HOLIDAY',2,'1',NULL,0,NULL,'2013-02-01 08:52:34'),(3191,'MAIN_MODULE_HOLIDAY_TABS_0',2,'user:+paidholidays:CPTitreMenu:holiday:$user->rights->holiday->write:/holiday/index.php?mainmenu=holiday&id=__ID__','chaine',0,NULL,'2013-02-01 08:52:34'),(3195,'INVOICE_SUPPLIER_ADDON_PDF',1,'canelle','chaine',0,'','2013-02-10 19:50:27'),(3199,'MAIN_FORCE_RELOAD_PAGE',1,'1','chaine',0,NULL,'2013-02-12 16:22:55'),(3217,'MAIN_PDF_TITLE_BACKGROUND_COLOR',1,'240,240,240','chaine',1,'','2013-02-13 15:18:02'),(3223,'OVH_THIRDPARTY_IMPORT',1,'2','chaine',0,'','2013-02-13 16:20:18'),(3241,'COMPANY_USE_SEARCH_TO_SELECT',1,'2','chaine',0,'','2013-02-17 14:33:39'),(3409,'AGENDA_USE_EVENT_TYPE',1,'1','chaine',0,'','2013-02-27 18:12:24'),(3886,'MAIN_REMOVE_INSTALL_WARNING',1,'1','chaine',1,'','2013-03-02 18:32:50'),(4013,'MAIN_DELAY_ACTIONS_TODO',1,'7','chaine',0,'','2013-03-06 08:59:12'),(4014,'MAIN_DELAY_PROPALS_TO_CLOSE',1,'31','chaine',0,'','2013-03-06 08:59:12'),(4015,'MAIN_DELAY_PROPALS_TO_BILL',1,'7','chaine',0,'','2013-03-06 08:59:12'),(4016,'MAIN_DELAY_ORDERS_TO_PROCESS',1,'2','chaine',0,'','2013-03-06 08:59:12'),(4017,'MAIN_DELAY_CUSTOMER_BILLS_UNPAYED',1,'31','chaine',0,'','2013-03-06 08:59:12'),(4018,'MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS',1,'7','chaine',0,'','2013-03-06 08:59:12'),(4019,'MAIN_DELAY_SUPPLIER_BILLS_TO_PAY',1,'2','chaine',0,'','2013-03-06 08:59:12'),(4020,'MAIN_DELAY_RUNNING_SERVICES',1,'-15','chaine',0,'','2013-03-06 08:59:12'),(4021,'MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE',1,'62','chaine',0,'','2013-03-06 08:59:13'),(4022,'MAIN_DELAY_MEMBERS',1,'31','chaine',0,'','2013-03-06 08:59:13'),(4023,'MAIN_DISABLE_METEO',1,'0','chaine',0,'','2013-03-06 08:59:13'),(4044,'ADHERENT_VAT_FOR_SUBSCRIPTIONS',1,'0','',0,'','2013-03-06 16:06:38'),(4047,'ADHERENT_BANK_USE',1,'bankviainvoice','',0,'','2013-03-06 16:12:30'),(4049,'PHPSANE_SCANIMAGE',1,'/usr/bin/scanimage','chaine',0,'','2013-03-06 21:54:13'),(4050,'PHPSANE_PNMTOJPEG',1,'/usr/bin/pnmtojpeg','chaine',0,'','2013-03-06 21:54:13'),(4051,'PHPSANE_PNMTOTIFF',1,'/usr/bin/pnmtotiff','chaine',0,'','2013-03-06 21:54:13'),(4052,'PHPSANE_OCR',1,'/usr/bin/gocr','chaine',0,'','2013-03-06 21:54:13'),(4548,'ECM_AUTO_TREE_ENABLED',1,'1','chaine',0,'','2013-03-10 15:57:21'),(4579,'MAIN_MODULE_AGENDA',2,'1',NULL,0,NULL,'2013-03-13 15:29:19'),(4580,'MAIN_AGENDA_ACTIONAUTO_COMPANY_CREATE',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4581,'MAIN_AGENDA_ACTIONAUTO_CONTRACT_VALIDATE',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4582,'MAIN_AGENDA_ACTIONAUTO_PROPAL_VALIDATE',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4583,'MAIN_AGENDA_ACTIONAUTO_PROPAL_SENTBYMAIL',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4584,'MAIN_AGENDA_ACTIONAUTO_ORDER_VALIDATE',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4585,'MAIN_AGENDA_ACTIONAUTO_ORDER_SENTBYMAIL',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4586,'MAIN_AGENDA_ACTIONAUTO_BILL_VALIDATE',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4587,'MAIN_AGENDA_ACTIONAUTO_BILL_PAYED',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4588,'MAIN_AGENDA_ACTIONAUTO_BILL_CANCEL',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4589,'MAIN_AGENDA_ACTIONAUTO_BILL_SENTBYMAIL',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4590,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_VALIDATE',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4591,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_VALIDATE',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4592,'MAIN_AGENDA_ACTIONAUTO_SHIPPING_VALIDATE',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4593,'MAIN_AGENDA_ACTIONAUTO_SHIPPING_SENTBYMAIL',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4594,'MAIN_AGENDA_ACTIONAUTO_BILL_UNVALIDATE',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4595,'MAIN_MODULE_GOOGLE',2,'1',NULL,0,NULL,'2013-03-13 15:29:47'),(4596,'MAIN_MODULE_GOOGLE_TABS_0',2,'agenda:+gcal:MenuAgendaGoogle:google@google:$conf->google->enabled && $conf->global->GOOGLE_ENABLE_AGENDA:/google/index.php','chaine',0,NULL,'2013-03-13 15:29:47'),(4597,'MAIN_MODULE_GOOGLE_TABS_1',2,'user:+gsetup:GoogleUserConf:google@google:$conf->google->enabled && $conf->global->GOOGLE_DUPLICATE_INTO_GCAL:/google/admin/google_calsync_user.php?id=__ID__','chaine',0,NULL,'2013-03-13 15:29:47'),(4598,'MAIN_MODULE_GOOGLE_TRIGGERS',2,'1','chaine',0,NULL,'2013-03-13 15:29:47'),(4599,'MAIN_MODULE_GOOGLE_HOOKS',2,'[\"toprightmenu\"]','chaine',0,NULL,'2013-03-13 15:29:47'),(4688,'GOOGLE_ENABLE_AGENDA',2,'1','chaine',0,'','2013-03-13 15:36:29'),(4689,'GOOGLE_AGENDA_NAME1',2,'eldy','chaine',0,'','2013-03-13 15:36:29'),(4690,'GOOGLE_AGENDA_SRC1',2,'eldy10@mail.com','chaine',0,'','2013-03-13 15:36:29'),(4691,'GOOGLE_AGENDA_COLOR1',2,'BE6D00','chaine',0,'','2013-03-13 15:36:29'),(4692,'GOOGLE_AGENDA_COLOR2',2,'7A367A','chaine',0,'','2013-03-13 15:36:29'),(4693,'GOOGLE_AGENDA_COLOR3',2,'7A367A','chaine',0,'','2013-03-13 15:36:29'),(4694,'GOOGLE_AGENDA_COLOR4',2,'7A367A','chaine',0,'','2013-03-13 15:36:29'),(4695,'GOOGLE_AGENDA_COLOR5',2,'7A367A','chaine',0,'','2013-03-13 15:36:29'),(4696,'GOOGLE_AGENDA_TIMEZONE',2,'Europe/Paris','chaine',0,'','2013-03-13 15:36:29'),(4697,'GOOGLE_AGENDA_NB',2,'5','chaine',0,'','2013-03-13 15:36:29'),(4711,'GOOGLE_ENABLE_AGENDA',1,'1','chaine',0,'','2013-03-13 19:37:38'),(4712,'GOOGLE_AGENDA_NAME1',1,'asso master','chaine',0,'','2013-03-13 19:37:38'),(4713,'GOOGLE_AGENDA_SRC1',1,'assodolibarr@mail.com','chaine',0,'','2013-03-13 19:37:38'),(4714,'GOOGLE_AGENDA_COLOR1',1,'1B887A','chaine',0,'','2013-03-13 19:37:38'),(4715,'GOOGLE_AGENDA_COLOR2',1,'7A367A','chaine',0,'','2013-03-13 19:37:38'),(4716,'GOOGLE_AGENDA_COLOR3',1,'7A367A','chaine',0,'','2013-03-13 19:37:38'),(4717,'GOOGLE_AGENDA_COLOR4',1,'7A367A','chaine',0,'','2013-03-13 19:37:38'),(4718,'GOOGLE_AGENDA_COLOR5',1,'7A367A','chaine',0,'','2013-03-13 19:37:38'),(4719,'GOOGLE_AGENDA_TIMEZONE',1,'Europe/Paris','chaine',0,'','2013-03-13 19:37:38'),(4720,'GOOGLE_AGENDA_NB',1,'5','chaine',0,'','2013-03-13 19:37:38'),(4725,'SOCIETE_CODECLIENT_ADDON',2,'mod_codeclient_leopard','chaine',0,'Module to control third parties codes','2013-03-13 20:21:35'),(4726,'SOCIETE_CODECOMPTA_ADDON',2,'mod_codecompta_panicum','chaine',0,'Module to control third parties codes','2013-03-13 20:21:35'),(4727,'SOCIETE_FISCAL_MONTH_START',2,'','chaine',0,'Mettre le numero du mois du debut d\\\'annee fiscale, ex: 9 pour septembre','2013-03-13 20:21:35'),(4728,'MAIN_SEARCHFORM_SOCIETE',2,'1','yesno',0,'Show form for quick company search','2013-03-13 20:21:35'),(4729,'MAIN_SEARCHFORM_CONTACT',2,'1','yesno',0,'Show form for quick contact search','2013-03-13 20:21:35'),(4730,'COMPANY_ADDON_PDF_ODT_PATH',2,'DOL_DATA_ROOT/doctemplates/thirdparties','chaine',0,NULL,'2013-03-13 20:21:35'),(4743,'MAIN_MODULE_CLICKTODIAL',2,'1',NULL,0,NULL,'2013-03-13 20:30:28'),(4744,'MAIN_MODULE_NOTIFICATION',2,'1',NULL,0,NULL,'2013-03-13 20:30:34'),(4745,'MAIN_MODULE_WEBSERVICES',2,'1',NULL,0,NULL,'2013-03-13 20:30:41'),(4746,'MAIN_MODULE_PROPALE',2,'1',NULL,0,NULL,'2013-03-13 20:32:38'),(4747,'PROPALE_ADDON_PDF',2,'azur','chaine',0,'Nom du gestionnaire de generation des propales en PDF','2013-03-13 20:32:38'),(4748,'PROPALE_ADDON',2,'mod_propale_marbre','chaine',0,'Nom du gestionnaire de numerotation des propales','2013-03-13 20:32:38'),(4749,'PROPALE_VALIDITY_DURATION',2,'15','chaine',0,'Duration of validity of business proposals','2013-03-13 20:32:38'),(4750,'PROPALE_ADDON_PDF_ODT_PATH',2,'DOL_DATA_ROOT/doctemplates/proposals','chaine',0,NULL,'2013-03-13 20:32:38'),(4752,'MAIN_MODULE_TAX',2,'1',NULL,0,NULL,'2013-03-13 20:32:47'),(4753,'MAIN_MODULE_DON',2,'1',NULL,0,NULL,'2013-03-13 20:32:54'),(4754,'DON_ADDON_MODEL',2,'html_cerfafr','chaine',0,'Nom du gestionnaire de generation de recu de dons','2013-03-13 20:32:54'),(4755,'POS_USE_TICKETS',2,'1','chaine',0,'','2013-03-13 20:33:09'),(4756,'POS_MAX_TTC',2,'100','chaine',0,'','2013-03-13 20:33:09'),(4757,'MAIN_MODULE_POS',2,'1',NULL,0,NULL,'2013-03-13 20:33:09'),(4758,'TICKET_ADDON',2,'mod_ticket_avenc','chaine',0,'Nom du gestionnaire de numerotation des tickets','2013-03-13 20:33:09'),(4759,'MAIN_MODULE_BANQUE',2,'1',NULL,0,NULL,'2013-03-13 20:33:09'),(4760,'MAIN_MODULE_FACTURE',2,'1',NULL,0,NULL,'2013-03-13 20:33:09'),(4761,'FACTURE_ADDON_PDF',2,'crabe','chaine',0,'Name of PDF model of invoice','2013-03-13 20:33:09'),(4762,'FACTURE_ADDON',2,'mod_facture_terre','chaine',0,'Name of numbering numerotation rules of invoice','2013-03-13 20:33:09'),(4763,'FACTURE_ADDON_PDF_ODT_PATH',2,'DOL_DATA_ROOT/doctemplates/invoices','chaine',0,NULL,'2013-03-13 20:33:09'),(4764,'MAIN_MODULE_SOCIETE',2,'1',NULL,0,NULL,'2013-03-13 20:33:09'),(4765,'MAIN_MODULE_PRODUCT',2,'1',NULL,0,NULL,'2013-03-13 20:33:09'),(4766,'PRODUCT_CODEPRODUCT_ADDON',2,'mod_codeproduct_leopard','chaine',0,'Module to control product codes','2013-03-13 20:33:09'),(4767,'MAIN_SEARCHFORM_PRODUITSERVICE',2,'1','yesno',0,'Show form for quick product search','2013-03-13 20:33:09'),(4772,'FACSIM_ADDON',2,'mod_facsim_alcoy','chaine',0,'','2013-03-13 20:33:32'),(4773,'MAIN_MODULE_MAILING',2,'1',NULL,0,NULL,'2013-03-13 20:33:37'),(4774,'MAIN_MODULE_OPENSURVEY',2,'1',NULL,0,NULL,'2013-03-13 20:33:42'),(4782,'AGENDA_USE_EVENT_TYPE',2,'1','chaine',0,'','2013-03-13 20:53:36'),(4884,'AGENDA_DISABLE_EXT',2,'1','chaine',0,'','2013-03-13 22:03:40'),(4928,'COMMANDE_SUPPLIER_ADDON_NUMBER',1,'mod_commande_fournisseur_muguet','chaine',0,'Nom du gestionnaire de numerotation des commandes fournisseur','2013-03-22 09:24:29'),(4929,'INVOICE_SUPPLIER_ADDON_NUMBER',1,'mod_facture_fournisseur_cactus','chaine',0,'Nom du gestionnaire de numerotation des factures fournisseur','2013-03-22 09:24:29'),(5001,'MAIN_CRON_KEY',0,'bc54582fe30d5d4a830c6f582ec28810','chaine',0,'','2013-03-23 17:54:53'),(5009,'CRON_KEY',0,'2c2e755c20be2014098f629865598006','chaine',0,'','2013-03-23 18:06:24'),(5075,'MAIN_MENU_STANDARD',1,'eldy_menu.php','chaine',0,'','2013-03-24 02:51:13'),(5076,'MAIN_MENU_SMARTPHONE',1,'eldy_menu.php','chaine',0,'','2013-03-24 02:51:13'),(5077,'MAIN_MENUFRONT_STANDARD',1,'eldy_menu.php','chaine',0,'','2013-03-24 02:51:13'),(5078,'MAIN_MENUFRONT_SMARTPHONE',1,'eldy_menu.php','chaine',0,'','2013-03-24 02:51:13'),(5139,'SOCIETE_ADD_REF_IN_LIST',1,'','yesno',0,'Display customer ref into select list','2013-09-08 23:06:08'),(5150,'PROJECT_TASK_ADDON_PDF',1,'','chaine',0,'Name of PDF/ODT tasks manager class','2013-09-08 23:06:14'),(5151,'PROJECT_TASK_ADDON',1,'mod_task_simple','chaine',0,'Name of Numbering Rule task manager class','2013-09-08 23:06:14'),(5152,'PROJECT_TASK_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/tasks','chaine',0,'','2013-09-08 23:06:14'),(5195,'GOOGLE_DUPLICATE_INTO_THIRDPARTIES',1,'1','chaine',0,'','2013-11-07 00:02:34'),(5196,'GOOGLE_DUPLICATE_INTO_CONTACTS',1,'0','chaine',0,'','2013-11-07 00:02:34'),(5197,'GOOGLE_DUPLICATE_INTO_MEMBERS',1,'0','chaine',0,'','2013-11-07 00:02:34'),(5198,'GOOGLE_CONTACT_LOGIN',1,'eldy10@mail.com','chaine',0,'','2013-11-07 00:02:34'),(5199,'GOOGLE_CONTACT_PASSWORD',1,'bidonge','chaine',0,'','2013-11-07 00:02:34'),(5200,'GOOGLE_TAG_PREFIX',1,'Dolibarr (Thirdparties)','chaine',0,'','2013-11-07 00:02:34'),(5201,'GOOGLE_TAG_PREFIX_CONTACTS',1,'Dolibarr (Contacts/Addresses)','chaine',0,'','2013-11-07 00:02:34'),(5202,'GOOGLE_TAG_PREFIX_MEMBERS',1,'Dolibarr (Members)','chaine',0,'','2013-11-07 00:02:34'),(5239,'BOOKMARKS_SHOW_IN_MENU',1,'10','chaine',0,'','2014-03-02 15:42:26'),(5271,'DONATION_ART200',1,'','yesno',0,'Option Française - Eligibilité Art200 du CGI','2014-12-21 12:51:28'),(5272,'DONATION_ART238',1,'','yesno',0,'Option Française - Eligibilité Art238 bis du CGI','2014-12-21 12:51:28'),(5273,'DONATION_ART885',1,'','yesno',0,'Option Française - Eligibilité Art885-0 V bis du CGI','2014-12-21 12:51:28'),(5274,'DONATION_MESSAGE',1,'Thank you','chaine',0,'Message affiché sur le récépissé de versements ou dons','2014-12-21 12:51:28'),(5288,'DONATION_ACCOUNTINGACCOUNT',1,'7581','chaine',0,'Compte comptable de remise des versements ou dons','2015-07-19 13:41:21'),(5339,'MAIN_MULTILANGS',1,'1','chaine',0,'','2015-10-03 10:11:33'),(5340,'MAIN_SIZE_LISTE_LIMIT',1,'25','chaine',0,'','2015-10-03 10:11:33'),(5341,'MAIN_DISABLE_JAVASCRIPT',1,'0','chaine',0,'','2015-10-03 10:11:33'),(5342,'MAIN_BUTTON_HIDE_UNAUTHORIZED',1,'0','chaine',0,'','2015-10-03 10:11:33'),(5343,'MAIN_START_WEEK',1,'1','chaine',0,'','2015-10-03 10:11:33'),(5344,'MAIN_DEFAULT_WORKING_DAYS',1,'1-5','chaine',0,'','2015-10-03 10:11:33'),(5345,'MAIN_DEFAULT_WORKING_HOURS',1,'9-18','chaine',0,'','2015-10-03 10:11:33'),(5346,'MAIN_SHOW_LOGO',1,'1','chaine',0,'','2015-10-03 10:11:33'),(5347,'MAIN_FIRSTNAME_NAME_POSITION',1,'0','chaine',0,'','2015-10-03 10:11:33'),(5348,'MAIN_THEME',1,'eldy','chaine',0,'','2015-10-03 10:11:33'),(5349,'MAIN_SEARCHFORM_CONTACT',1,'1','chaine',0,'','2015-10-03 10:11:33'),(5351,'MAIN_SEARCHFORM_PRODUITSERVICE',1,'1','chaine',0,'','2015-10-03 10:11:33'),(5352,'MAIN_SEARCHFORM_PRODUITSERVICE_SUPPLIER',1,'0','chaine',0,'','2015-10-03 10:11:33'),(5353,'MAIN_SEARCHFORM_ADHERENT',1,'1','chaine',0,'','2015-10-03 10:11:33'),(5354,'MAIN_SEARCHFORM_PROJECT',1,'0','chaine',0,'','2015-10-03 10:11:33'),(5355,'MAIN_HELPCENTER_DISABLELINK',0,'1','chaine',0,'','2015-10-03 10:11:33'),(5356,'MAIN_HOME',1,'<span style=\"font-size:11px\">__(NoteSomeFeaturesAreDisabled)__<br />\r\n<br />\r\n__(SomeTranslationAreUncomplete)__</span>','chaine',0,'','2015-10-03 10:11:33'),(5357,'MAIN_HELP_DISABLELINK',0,'0','chaine',0,'','2015-10-03 10:11:33'),(5358,'MAIN_BUGTRACK_ENABLELINK',1,'0','chaine',0,'','2015-10-03 10:11:33'),(5359,'THEME_ELDY_USE_HOVER',1,'1','chaine',0,'','2015-10-03 10:11:33'),(5394,'FCKEDITOR_ENABLE_DETAILS',1,'1','yesno',0,'WYSIWIG for products details lines for all entities','2015-11-04 15:27:44'),(5395,'FCKEDITOR_ENABLE_USERSIGN',1,'1','yesno',0,'WYSIWIG for user signature','2015-11-04 15:27:44'),(5396,'FCKEDITOR_ENABLE_MAIL',1,'1','yesno',0,'WYSIWIG for products details lines for all entities','2015-11-04 15:27:44'),(5398,'CATEGORIE_RECURSIV_ADD',1,'','yesno',0,'Affect parent categories','2015-11-04 15:27:46'),(5403,'MAIN_MODULE_FCKEDITOR',1,'1',NULL,0,NULL,'2015-11-04 15:41:40'),(5404,'MAIN_MODULE_CATEGORIE',1,'1',NULL,0,NULL,'2015-11-04 15:41:43'),(5415,'EXPEDITION_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/shipment','chaine',0,NULL,'2015-11-15 22:38:28'),(5416,'LIVRAISON_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/delivery','chaine',0,NULL,'2015-11-15 22:38:28'),(5419,'MAIN_MODULE_CASHDESK',1,'1',NULL,0,NULL,'2015-11-15 22:38:33'),(5426,'MAIN_MODULE_PROJET',1,'1',NULL,0,NULL,'2015-11-15 22:38:44'),(5427,'PROJECT_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/projects','chaine',0,NULL,'2015-11-15 22:38:44'),(5428,'PROJECT_USE_OPPORTUNIES',1,'1','chaine',0,NULL,'2015-11-15 22:38:44'),(5430,'MAIN_MODULE_EXPORT',1,'1',NULL,0,NULL,'2015-11-15 22:38:56'),(5431,'MAIN_MODULE_IMPORT',1,'1',NULL,0,NULL,'2015-11-15 22:38:58'),(5432,'MAIN_MODULE_MAILING',1,'1',NULL,0,NULL,'2015-11-15 22:39:00'),(5434,'EXPENSEREPORT_ADDON_PDF',1,'standard','chaine',0,'Name of manager to build PDF expense reports documents','2015-11-15 22:39:05'),(5435,'MAIN_MODULE_SALARIES',1,'1',NULL,0,NULL,'2015-11-15 22:39:08'),(5436,'SALARIES_ACCOUNTING_ACCOUNT_PAYMENT',1,'421','chaine',0,NULL,'2015-11-15 22:39:08'),(5437,'SALARIES_ACCOUNTING_ACCOUNT_CHARGE',1,'641','chaine',0,NULL,'2015-11-15 22:39:08'),(5441,'ADHERENT_ETIQUETTE_TEXT',1,'%FULLNAME%\n%ADDRESS%\n%ZIP% %TOWN%\n%COUNTRY%','texte',0,'Text to print on member address sheets','2015-11-15 22:39:17'),(5443,'MAIN_MODULE_PRELEVEMENT',1,'1',NULL,0,NULL,'2015-11-15 22:39:33'),(5453,'MAIN_MODULE_CONTRAT',1,'1',NULL,0,NULL,'2015-11-15 22:39:52'),(5455,'MAIN_MODULE_FICHEINTER',1,'1',NULL,0,NULL,'2015-11-15 22:39:56'),(5459,'MAIN_MODULE_PAYPAL',1,'1',NULL,0,NULL,'2015-11-15 22:41:02'),(5460,'MAIN_MODULE_MARGIN',1,'1',NULL,0,NULL,'2015-11-15 22:41:47'),(5461,'MAIN_MODULE_MARGIN_TABS_0',1,'product:+margin:Margins:margins:$user->rights->margins->liretous:/margin/tabs/productMargins.php?id=__ID__','chaine',0,NULL,'2015-11-15 22:41:47'),(5462,'MAIN_MODULE_MARGIN_TABS_1',1,'thirdparty:+margin:Margins:margins:empty($user->societe_id) && $user->rights->margins->liretous && ($object->client > 0):/margin/tabs/thirdpartyMargins.php?socid=__ID__','chaine',0,NULL,'2015-11-15 22:41:47'),(5463,'MAIN_MODULE_PROPALE',1,'1',NULL,0,NULL,'2015-11-15 22:41:47'),(5483,'GENBARCODE_BARCODETYPE_THIRDPARTY',1,'6','chaine',0,'','2016-01-16 15:49:43'),(5484,'PRODUIT_DEFAULT_BARCODE_TYPE',1,'2','chaine',0,'','2016-01-16 15:49:46'),(5539,'PRODUCT_USE_OLD_PATH_FOR_PHOTO',0,'0','chaine',1,'Use old path for products images','2016-01-22 13:34:23'),(5541,'MODULE_GOOGLE_DEBUG',1,'0','chaine',1,'','2016-01-22 13:34:57'),(5548,'MAIN_MODULE_ECM',1,'1',NULL,0,NULL,'2016-01-22 17:26:43'),(5551,'MAIN_MODULE_HOLIDAY',1,'1',NULL,0,NULL,'2016-01-22 17:26:43'),(5552,'MAIN_MODULE_HOLIDAY_TABS_0',1,'user:+paidholidays:CPTitreMenu:holiday:$user->rights->holiday->read:/holiday/list.php?mainmenu=holiday&id=__ID__','chaine',0,NULL,'2016-01-22 17:26:43'),(5555,'MAIN_MODULE_SERVICE',1,'1',NULL,0,NULL,'2016-01-22 17:26:43'),(5586,'MAIN_DELAY_EXPENSEREPORTS_TO_PAY',1,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur les notes de frais impayées','2016-01-22 17:28:18'),(5587,'MAIN_FIX_FOR_BUGGED_MTA',1,'1','chaine',1,'Set constant to fix email ending from PHP with some linux ike system','2016-01-22 17:28:18'),(5589,'MAIN_MODULE_USER',0,'1',NULL,0,NULL,'2016-01-22 17:28:42'),(5590,'MAIN_VERSION_LAST_INSTALL',0,'3.8.3','chaine',0,'Dolibarr version when install','2016-01-22 17:28:42'),(5604,'MAIN_INFO_SOCIETE_LOGO',1,'mybigcompany.png','chaine',0,'','2016-01-22 17:33:49'),(5605,'MAIN_INFO_SOCIETE_LOGO_SMALL',1,'mybigcompany_small.png','chaine',0,'','2016-01-22 17:33:49'),(5606,'MAIN_INFO_SOCIETE_LOGO_MINI',1,'mybigcompany_mini.png','chaine',0,'','2016-01-22 17:33:49'),(5612,'MAIN_ENABLE_LOG_TO_HTML',0,'0','chaine',1,'If this option is set to 1, it is possible to see log output at end of HTML sources by adding paramater logtohtml=1 on URL','2016-03-13 10:54:45'),(5614,'MAIN_SIZE_SHORTLISTE_LIMIT',1,'4','chaine',0,'Longueur maximum des listes courtes (fiche client)','2016-03-13 10:54:46'),(5626,'MAIN_MODULE_SUPPLIERPROPOSAL',1,'1',NULL,0,NULL,'2016-07-30 11:13:20'),(5627,'SUPPLIER_PROPOSAL_ADDON_PDF',1,'aurore','chaine',0,'Name of submodule to generate PDF for supplier quotation request','2016-07-30 11:13:20'),(5628,'SUPPLIER_PROPOSAL_ADDON',1,'mod_supplier_proposal_marbre','chaine',0,'Name of submodule to number supplier quotation request','2016-07-30 11:13:20'),(5629,'SUPPLIER_PROPOSAL_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/supplier_proposal','chaine',0,NULL,'2016-07-30 11:13:20'),(5632,'MAIN_MODULE_RESOURCE',1,'1',NULL,0,NULL,'2016-07-30 11:13:32'),(5633,'MAIN_MODULE_API',1,'1',NULL,0,NULL,'2016-07-30 11:13:54'),(5634,'MAIN_MODULE_WEBSERVICES',1,'1',NULL,0,NULL,'2016-07-30 11:13:56'),(5635,'WEBSERVICES_KEY',1,'dolibarrkey','chaine',0,'','2016-07-30 11:14:04'),(5638,'MAIN_MODULE_EXTERNALRSS',1,'1',NULL,0,NULL,'2016-07-30 11:15:04'),(5639,'EXTERNAL_RSS_TITLE_1',1,'Dolibarr.org News','chaine',0,'','2016-07-30 11:15:25'),(5640,'EXTERNAL_RSS_URLRSS_1',1,'https://www.dolibarr.org/rss','chaine',0,'','2016-07-30 11:15:25'),(5641,'MAIN_MODULE_DON',1,'1',NULL,0,NULL,'2016-07-30 11:16:22'),(5642,'SOCIETE_CODECOMPTA_ADDON',1,'mod_codecompta_aquarium','chaine',0,'','2016-07-30 11:16:42'),(5707,'CASHDESK_NO_DECREASE_STOCK',1,'1','chaine',0,'','2016-07-30 13:38:11'),(5708,'MAIN_MODULE_PRODUCTBATCH',1,'1',NULL,0,NULL,'2016-07-30 13:38:11'),(5710,'MAIN_MODULE_STOCK',1,'1',NULL,0,NULL,'2016-07-30 13:38:11'),(5711,'MAIN_MODULE_PRODUCT',1,'1',NULL,0,NULL,'2016-07-30 13:38:11'),(5712,'MAIN_MODULE_EXPEDITION',1,'1',NULL,0,NULL,'2016-07-30 13:38:11'),(5713,'MAIN_MODULE_COMMANDE',1,'1',NULL,0,NULL,'2016-07-30 13:38:11'),(5715,'MAIN_MODULE_FOURNISSEUR',1,'1',NULL,0,NULL,'2016-07-30 13:38:11'),(5765,'MAIN_MODULE_AGENDA',1,'1',NULL,0,NULL,'2016-07-30 15:42:32'),(5808,'MARGIN_TYPE',1,'costprice','chaine',0,'','2016-07-30 16:32:18'),(5809,'DISPLAY_MARGIN_RATES',1,'1','chaine',0,'','2016-07-30 16:32:20'),(5810,'MAIN_FEATURES_LEVEL',0,'0','chaine',1,'Level of features to show (0=stable only, 1=stable+experimental, 2=stable+experimental+development','2016-07-30 18:36:15'),(5812,'MAIN_MODULE_OPENSURVEY',1,'1',NULL,0,NULL,'2016-07-30 19:04:07'),(5813,'USER_PASSWORD_PATTERN',1,'8;1;1;1;3;1','chaine',0,'','2016-07-31 16:04:58'),(5814,'MAIN_MODULE_EXPENSEREPORT',1,'1',NULL,0,NULL,'2016-07-31 21:14:32'),(5817,'MAIN_SIZE_SHORTLIST_LIMIT',1,'3','chaine',0,'Max length for small lists (tabs)','2016-12-12 10:54:09'),(5830,'LOAN_ACCOUNTING_ACCOUNT_CAPITAL',1,'164','chaine',0,NULL,'2017-01-29 15:11:51'),(5831,'LOAN_ACCOUNTING_ACCOUNT_INSURANCE',1,'6162','chaine',0,NULL,'2017-01-29 15:11:51'),(5833,'ACCOUNTING_EXPORT_SEPARATORCSV',1,',','string',0,NULL,'2017-01-29 15:11:56'),(5834,'ACCOUNTING_ACCOUNT_SUSPENSE',1,'471','chaine',0,NULL,'2017-01-29 15:11:56'),(5835,'ACCOUNTING_SELL_JOURNAL',1,'VTE','chaine',0,NULL,'2017-01-29 15:11:56'),(5836,'ACCOUNTING_PURCHASE_JOURNAL',1,'ACH','chaine',0,NULL,'2017-01-29 15:11:56'),(5837,'ACCOUNTING_SOCIAL_JOURNAL',1,'SOC','chaine',0,NULL,'2017-01-29 15:11:56'),(5838,'ACCOUNTING_MISCELLANEOUS_JOURNAL',1,'OD','chaine',0,NULL,'2017-01-29 15:11:56'),(5839,'ACCOUNTING_ACCOUNT_TRANSFER_CASH',1,'58','chaine',0,NULL,'2017-01-29 15:11:56'),(5840,'CHARTOFACCOUNTS',1,'2','chaine',0,NULL,'2017-01-29 15:11:56'),(5841,'ACCOUNTING_EXPORT_MODELCSV',1,'1','chaine',0,NULL,'2017-01-29 15:11:56'),(5842,'ACCOUNTING_LENGTH_GACCOUNT',1,'','chaine',0,NULL,'2017-01-29 15:11:56'),(5843,'ACCOUNTING_LENGTH_AACCOUNT',1,'','chaine',0,NULL,'2017-01-29 15:11:56'),(5844,'ACCOUNTING_LIST_SORT_VENTILATION_TODO',1,'1','yesno',0,NULL,'2017-01-29 15:11:56'),(5845,'ACCOUNTING_LIST_SORT_VENTILATION_DONE',1,'1','yesno',0,NULL,'2017-01-29 15:11:56'),(5846,'ACCOUNTING_EXPORT_DATE',1,'%d%m%Y','chaine',0,NULL,'2017-01-29 15:11:56'),(5847,'ACCOUNTING_EXPENSEREPORT_JOURNAL',1,'ER','chaine',0,NULL,'2017-01-29 15:11:56'),(5848,'ACCOUNTING_EXPORT_FORMAT',1,'csv','chaine',0,NULL,'2017-01-29 15:11:56'),(5853,'MAIN_MODULE_WORKFLOW',1,'1',NULL,0,NULL,'2017-01-29 15:12:12'),(5854,'MAIN_MODULE_NOTIFICATION',1,'1',NULL,0,NULL,'2017-01-29 15:12:35'),(5855,'MAIN_MODULE_OAUTH',1,'1',NULL,0,NULL,'2017-01-29 15:12:41'),(5856,'MAIN_MODULE_PRINTING',1,'1',NULL,0,NULL,'2017-01-29 15:12:44'),(5864,'MAIN_INFO_SOCIETE_TEL',1,'09123123','chaine',0,'','2017-01-29 15:13:51'),(5865,'MAIN_INFO_SOCIETE_FAX',1,'09123124','chaine',0,'','2017-01-29 15:13:51'),(5866,'MAIN_INFO_SOCIETE_MAIL',1,'myemail@mybigcompany.com','chaine',0,'','2017-01-29 15:13:51'),(5867,'MAIN_INFO_SOCIETE_WEB',1,'https://www.dolibarr.org','chaine',0,'','2017-01-29 15:13:51'),(5868,'MAIN_INFO_SOCIETE_NOTE',1,'This is note about my company','chaine',0,'','2017-01-29 15:13:51'),(5869,'MAIN_INFO_SOCIETE_GENCOD',1,'1234567890','chaine',0,'','2017-01-29 15:13:51'),(5870,'MAIN_INFO_SOCIETE_MANAGERS',1,'Zack Zeceo','chaine',0,'','2017-01-29 15:13:51'),(5871,'MAIN_INFO_CAPITAL',1,'10000','chaine',0,'','2017-01-29 15:13:51'),(5872,'MAIN_INFO_SOCIETE_FORME_JURIDIQUE',1,'0','chaine',0,'','2017-01-29 15:13:51'),(5873,'MAIN_INFO_SIREN',1,'123456','chaine',0,'','2017-01-29 15:13:51'),(5874,'MAIN_INFO_TVAINTRA',1,'FR1234567','chaine',0,'','2017-01-29 15:13:51'),(5875,'MAIN_INFO_SOCIETE_OBJECT',1,'A company demo to show how Dolibarr ERP CRM is wonderfull','chaine',0,'','2017-01-29 15:13:51'),(5876,'SOCIETE_FISCAL_MONTH_START',1,'1','chaine',0,'','2017-01-29 15:13:51'),(5877,'FACTURE_TVAOPTION',1,'1','chaine',0,'','2017-01-29 15:13:51'),(5878,'FACTURE_LOCAL_TAX1_OPTION',1,'localtax1on','chaine',0,'','2017-01-29 15:13:51'),(5879,'MAIN_INFO_VALUE_LOCALTAX1',1,'0','chaine',0,'','2017-01-29 15:13:51'),(5880,'MAIN_INFO_LOCALTAX_CALC1',1,'0','chaine',0,'','2017-01-29 15:13:51'),(5883,'MAILING_LIMIT_SENDBYWEB',0,'15','chaine',1,'Number of targets to defined packet size when sending mass email','2017-01-29 17:36:33'),(5884,'MAIN_MAIL_DEBUG',1,'0','chaine',1,'','2017-01-29 18:53:02'),(5885,'MAIN_SOAP_DEBUG',1,'0','chaine',1,'','2017-01-29 18:53:02'),(5887,'PROJECT_USE_OPPORTUNITIES',1,'1','chaine',0,'','2017-02-01 12:23:56'),(5888,'PROJECT_HIDE_TASKS',1,'1','chaine',0,'','2017-02-01 12:23:56'),(5889,'MAIN_AGENDA_ACTIONAUTO_COMPANY_SENTBYMAIL',1,'1','chaine',0,'','2017-02-01 14:48:55'),(5890,'MAIN_AGENDA_ACTIONAUTO_COMPANY_CREATE',1,'1','chaine',0,'','2017-02-01 14:48:55'),(5891,'MAIN_AGENDA_ACTIONAUTO_PROPAL_CLOSE_REFUSED',1,'1','chaine',0,'','2017-02-01 14:48:55'),(5892,'MAIN_AGENDA_ACTIONAUTO_PROPAL_CLOSE_SIGNED',1,'1','chaine',0,'','2017-02-01 14:48:55'),(5893,'MAIN_AGENDA_ACTIONAUTO_PROPAL_CLASSIFY_BILLED',1,'1','chaine',0,'','2017-02-01 14:48:55'),(5894,'MAIN_AGENDA_ACTIONAUTO_PROPAL_VALIDATE',1,'1','chaine',0,'','2017-02-01 14:48:55'),(5895,'MAIN_AGENDA_ACTIONAUTO_PROPAL_SENTBYMAIL',1,'1','chaine',0,'','2017-02-01 14:48:55'),(5896,'MAIN_AGENDA_ACTIONAUTO_ORDER_VALIDATE',1,'1','chaine',0,'','2017-02-01 14:48:55'),(5897,'MAIN_AGENDA_ACTIONAUTO_ORDER_CLOSE',1,'1','chaine',0,'','2017-02-01 14:48:55'),(5898,'MAIN_AGENDA_ACTIONAUTO_ORDER_CANCEL',1,'1','chaine',0,'','2017-02-01 14:48:55'),(5899,'MAIN_AGENDA_ACTIONAUTO_ORDER_SENTBYMAIL',1,'1','chaine',0,'','2017-02-01 14:48:55'),(5900,'MAIN_AGENDA_ACTIONAUTO_ORDER_CLASSIFY_BILLED',1,'1','chaine',0,'','2017-02-01 14:48:55'),(5901,'MAIN_AGENDA_ACTIONAUTO_BILL_VALIDATE',1,'1','chaine',0,'','2017-02-01 14:48:55'),(5902,'MAIN_AGENDA_ACTIONAUTO_BILL_PAYED',1,'1','chaine',0,'','2017-02-01 14:48:55'),(5903,'MAIN_AGENDA_ACTIONAUTO_BILL_CANCEL',1,'1','chaine',0,'','2017-02-01 14:48:55'),(5904,'MAIN_AGENDA_ACTIONAUTO_BILL_SENTBYMAIL',1,'1','chaine',0,'','2017-02-01 14:48:55'),(5905,'MAIN_AGENDA_ACTIONAUTO_BILL_UNVALIDATE',1,'1','chaine',0,'','2017-02-01 14:48:55'),(5906,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_VALIDATE',1,'1','chaine',0,'','2017-02-01 14:48:55'),(5907,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_APPROVE',1,'1','chaine',0,'','2017-02-01 14:48:55'),(5908,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_RECEIVE',1,'1','chaine',0,'','2017-02-01 14:48:55'),(5909,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_SUBMIT',1,'1','chaine',0,'','2017-02-01 14:48:55'),(5910,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_REFUSE',1,'1','chaine',0,'','2017-02-01 14:48:55'),(5911,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_CLASSIFY_BILLED',1,'1','chaine',0,'','2017-02-01 14:48:55'),(5912,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_SENTBYMAIL',1,'1','chaine',0,'','2017-02-01 14:48:55'),(5913,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_UNVALIDATE',1,'1','chaine',0,'','2017-02-01 14:48:55'),(5914,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_VALIDATE',1,'1','chaine',0,'','2017-02-01 14:48:55'),(5915,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_PAYED',1,'1','chaine',0,'','2017-02-01 14:48:55'),(5916,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_SENTBYMAIL',1,'1','chaine',0,'','2017-02-01 14:48:55'),(5917,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_CANCELED',1,'1','chaine',0,'','2017-02-01 14:48:55'),(5918,'MAIN_AGENDA_ACTIONAUTO_CONTRACT_VALIDATE',1,'1','chaine',0,'','2017-02-01 14:48:55'),(5919,'MAIN_AGENDA_ACTIONAUTO_FICHINTER_REOPEN',1,'1','chaine',0,'','2017-02-01 14:48:55'),(5920,'MAIN_AGENDA_ACTIONAUTO_FICHINTER_SENTBYMAIL',1,'1','chaine',0,'','2017-02-01 14:48:55'),(5921,'MAIN_AGENDA_ACTIONAUTO_FICHINTER_VALIDATE',1,'1','chaine',0,'','2017-02-01 14:48:55'),(5922,'MAIN_AGENDA_ACTIONAUTO_SHIPPING_VALIDATE',1,'1','chaine',0,'','2017-02-01 14:48:55'),(5923,'MAIN_AGENDA_ACTIONAUTO_SHIPPING_SENTBYMAIL',1,'1','chaine',0,'','2017-02-01 14:48:55'),(5924,'MAIN_AGENDA_ACTIONAUTO_MEMBER_VALIDATE',1,'1','chaine',0,'','2017-02-01 14:48:55'),(5925,'MAIN_AGENDA_ACTIONAUTO_MEMBER_SUBSCRIPTION',1,'1','chaine',0,'','2017-02-01 14:48:55'),(5926,'MAIN_AGENDA_ACTIONAUTO_MEMBER_MODIFY',1,'1','chaine',0,'','2017-02-01 14:48:55'),(5927,'MAIN_AGENDA_ACTIONAUTO_MEMBER_RESILIATE',1,'1','chaine',0,'','2017-02-01 14:48:55'),(5928,'MAIN_AGENDA_ACTIONAUTO_MEMBER_DELETE',1,'1','chaine',0,'','2017-02-01 14:48:55'),(5929,'MAIN_AGENDA_ACTIONAUTO_PROJECT_CREATE',1,'1','chaine',0,'','2017-02-01 14:48:55'),(5930,'MAIN_AGENDA_ACTIONAUTO_PROJECT_DELETE',1,'1','chaine',0,'','2017-02-01 14:48:55'),(5931,'DATABASE_PWD_ENCRYPTED',1,'1','chaine',0,'','2017-02-01 15:06:04'),(5932,'MAIN_DISABLE_ALL_MAILS',1,'0','chaine',0,'','2017-02-01 15:09:09'),(5933,'MAIN_MAIL_SENDMODE',1,'mail','chaine',0,'','2017-02-01 15:09:09'),(5934,'MAIN_MAIL_SMTP_PORT',1,'465','chaine',0,'','2017-02-01 15:09:09'),(5935,'MAIN_MAIL_SMTP_SERVER',1,'smtp.mail.com','chaine',0,'','2017-02-01 15:09:09'),(5936,'MAIN_MAIL_SMTPS_ID',1,'eldy10@mail.com','chaine',0,'','2017-02-01 15:09:09'),(5937,'MAIN_MAIL_SMTPS_PW',1,'bidonge','chaine',0,'','2017-02-01 15:09:09'),(5938,'MAIN_MAIL_EMAIL_FROM',1,'robot@example.com','chaine',0,'','2017-02-01 15:09:09'),(5939,'MAIN_MAIL_DEFAULT_FROMTYPE',1,'user','chaine',0,'','2017-02-01 15:09:09'),(5940,'PRELEVEMENT_ID_BANKACCOUNT',1,'1','chaine',0,'','2017-02-06 04:04:47'),(5941,'PRELEVEMENT_ICS',1,'ICS123456','chaine',0,'','2017-02-06 04:04:47'),(5942,'PRELEVEMENT_USER',1,'1','chaine',0,'','2017-02-06 04:04:47'),(5943,'BANKADDON_PDF',1,'sepamandate','chaine',0,'','2017-02-06 04:13:52'),(5947,'CHEQUERECEIPTS_THYME_MASK',1,'CHK{yy}{mm}-{0000@1}','chaine',0,'','2017-02-06 04:16:27'),(5948,'MAIN_MODULE_LOAN',1,'1',NULL,0,NULL,'2017-02-06 19:19:05'),(5954,'MAIN_SUBMODULE_EXPEDITION',1,'1','chaine',0,'','2017-02-06 23:57:37'),(5963,'MAIN_MODULE_BANQUE',1,'1',NULL,0,NULL,'2017-02-07 18:56:12'),(5964,'MAIN_MODULE_TAX',1,'1',NULL,0,NULL,'2017-02-07 18:56:12'),(5995,'MAIN_MODULE_SOCIETE',1,'1',NULL,0,NULL,'2017-02-12 19:15:56'),(5996,'CABINETMED_RHEUMATOLOGY_ON',1,'0','texte',0,'','2017-02-12 19:20:04'),(5999,'MAIN_SEARCHFORM_SOCIETE',1,'1','texte',0,'','2017-02-12 19:20:04'),(6000,'CABINETMED_BANK_PATIENT_REQUIRED',1,'0','texte',0,'','2017-02-12 19:20:04'),(6004,'MAIN_MODULE_MULTICOMPANY_CSS',1,'[\"\\/multicompany\\/css\\/multicompany.css.php\"]','chaine',0,NULL,'2017-02-15 17:17:11'),(6019,'MAIN_INFO_SOCIETE_COUNTRY',2,'1:FR:France','chaine',0,'','2017-02-15 17:18:22'),(6020,'MAIN_INFO_SOCIETE_NOM',2,'MySecondCompany','chaine',0,'','2017-02-15 17:18:22'),(6021,'MAIN_INFO_SOCIETE_STATE',2,'0','chaine',0,'','2017-02-15 17:18:22'),(6022,'MAIN_MONNAIE',2,'EUR','chaine',0,'','2017-02-15 17:18:22'),(6023,'MAIN_LANG_DEFAULT',2,'auto','chaine',0,'','2017-02-15 17:18:22'),(6024,'MAIN_INFO_SOCIETE_COUNTRY',1,'14:CA:Canada','chaine',0,'','2017-02-15 17:18:41'),(6025,'MAIN_INFO_SOCIETE_NOM',1,'MyBigCompany','chaine',0,'','2017-02-15 17:18:41'),(6026,'MAIN_INFO_SOCIETE_ADDRESS',1,'21 Jump street','chaine',0,'','2017-02-15 17:18:41'),(6027,'MAIN_INFO_SOCIETE_TOWN',1,'MyTown','chaine',0,'','2017-02-15 17:18:41'),(6028,'MAIN_INFO_SOCIETE_ZIP',1,'75500','chaine',0,'','2017-02-15 17:18:41'),(6029,'MAIN_INFO_SOCIETE_STATE',1,'1514','chaine',0,'','2017-02-15 17:18:41'),(6030,'MAIN_MONNAIE',1,'EUR','chaine',0,'','2017-02-15 17:18:41'),(6031,'MAIN_LANG_DEFAULT',1,'auto','chaine',0,'','2017-02-15 17:18:41'),(6032,'MAIN_MODULE_MULTICURRENCY',1,'1',NULL,0,NULL,'2017-02-15 17:29:59'),(6047,'MAIN_MODULE_SYSLOG',0,'1',NULL,0,NULL,'2017-02-15 22:36:58'),(6048,'SYSLOG_FACILITY',0,'LOG_USER','chaine',0,'','2017-02-15 22:37:01'),(6049,'SYSLOG_FIREPHP_INCLUDEPATH',0,'/home/ldestailleur/git/dolibarr_5.0/htdocs/includes/firephp/firephp-core/lib/','chaine',0,'','2017-02-15 22:37:01'),(6050,'SYSLOG_FILE',0,'DOL_DATA_ROOT/dolibarr.log','chaine',0,'','2017-02-15 22:37:01'),(6051,'SYSLOG_CHROMEPHP_INCLUDEPATH',0,'/home/ldestailleur/git/dolibarr_5.0/htdocs/includes/ccampbell/chromephp/','chaine',0,'','2017-02-15 22:37:01'),(6052,'SYSLOG_HANDLERS',0,'[\"mod_syslog_file\"]','chaine',0,'','2017-02-15 22:37:01'),(6054,'SYSLOG_LEVEL',0,'7','chaine',0,'','2017-02-15 22:37:21'),(6074,'CABINETMED_DELAY_TO_LOCK_RECORD',1,'','chaine',1,'Number of days before locking edit of consultation','2017-02-21 00:04:15'),(6092,'MAIN_SIZE_SHORTLIST_LIMIT',0,'3','chaine',0,'Max length for small lists (tabs)','2017-05-12 09:02:38'),(6094,'MAIN_MODULE_BARCODE',1,'1',NULL,0,NULL,'2017-05-12 09:02:42'),(6095,'MAIN_MODULE_CRON',1,'1',NULL,0,NULL,'2017-05-12 09:02:42'),(6096,'MAIN_MODULE_FACTURE',1,'1',NULL,0,NULL,'2017-05-12 09:02:42'),(6097,'MAIN_VERSION_LAST_UPGRADE',0,'5.0.3','chaine',0,'Dolibarr version for last upgrade','2017-05-12 09:02:43'),(6099,'MAIN_MODULE_SKYPE',1,'1',NULL,0,NULL,'2017-05-12 09:03:51'),(6100,'MAIN_MODULE_GRAVATAR',1,'1',NULL,0,NULL,'2017-05-12 09:03:54'),(6101,'MAIN_MODULE_ACCOUNTING',1,'1',NULL,0,NULL,'2017-05-12 09:14:30');
 /*!40000 ALTER TABLE `llx_const` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -3210,6 +3211,7 @@ CREATE TABLE `llx_contratdet` (
   `date_fin_validite` datetime DEFAULT NULL,
   `date_cloture` datetime DEFAULT NULL,
   `tva_tx` double(6,3) DEFAULT '0.000',
+  `vat_src_code` varchar(10) DEFAULT '',
   `localtax1_tx` double(6,3) DEFAULT '0.000',
   `localtax1_type` varchar(10) NOT NULL DEFAULT '0',
   `localtax2_tx` double(6,3) DEFAULT '0.000',
@@ -3258,7 +3260,7 @@ CREATE TABLE `llx_contratdet` (
 
 LOCK TABLES `llx_contratdet` WRITE;
 /*!40000 ALTER TABLE `llx_contratdet` DISABLE KEYS */;
-INSERT INTO `llx_contratdet` VALUES (1,'2013-03-06 09:00:00',1,3,4,'','',NULL,NULL,'2010-07-09 00:00:00','2010-07-09 12:00:00','2013-03-15 00:00:00',NULL,0.000,0.000,'',0.000,'',1,0,0.00000000,0,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,1,0,0,0.00000000,0,1,1,'',NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(2,'2010-07-10 16:14:14',2,NULL,0,'','Abonnement annuel assurance',NULL,NULL,'2010-07-10 00:00:00',NULL,'2011-07-10 00:00:00',NULL,1.000,0.000,'',0.000,'',1,0,10.00000000,10,0,10.00000000,0.10000000,0.00000000,0.00000000,10.10000000,1,0,NULL,0.00000000,0,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(3,'2013-03-05 10:20:58',2,3,5,'','gdfg',NULL,NULL,'2010-07-10 00:00:00','2010-07-10 12:00:00','2011-07-09 00:00:00','2013-03-06 12:00:00',4.000,0.000,'',0.000,'',1,0,0.00000000,0,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,1,0,0,0.00000000,0,1,1,'',NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(4,'2012-12-08 13:11:17',2,3,0,'','',NULL,NULL,'2010-07-10 00:00:00',NULL,NULL,NULL,0.000,0.000,'',0.000,'',1,10,40.00000000,40,NULL,36.00000000,0.00000000,0.00000000,0.00000000,36.00000000,1,0,NULL,0.00000000,0,NULL,1,'',NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(5,'2013-03-06 09:05:40',3,NULL,4,'','gfdg',NULL,NULL,NULL,'2013-03-06 12:00:00','2013-03-07 12:00:00',NULL,0.000,0.000,'',0.000,'',1,0,10.00000000,10,NULL,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,1,0,0,0.00000000,0,1,1,'',NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000);
+INSERT INTO `llx_contratdet` VALUES (1,'2013-03-06 09:00:00',1,3,4,'','',NULL,NULL,'2010-07-09 00:00:00','2010-07-09 12:00:00','2013-03-15 00:00:00',NULL,0.000,'',0.000,'',0.000,'',1,0,0.00000000,0,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,1,0,0,0.00000000,0,1,1,'',NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(2,'2010-07-10 16:14:14',2,NULL,0,'','Abonnement annuel assurance',NULL,NULL,'2010-07-10 00:00:00',NULL,'2011-07-10 00:00:00',NULL,1.000,'',0.000,'',0.000,'',1,0,10.00000000,10,0,10.00000000,0.10000000,0.00000000,0.00000000,10.10000000,1,0,NULL,0.00000000,0,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(3,'2013-03-05 10:20:58',2,3,5,'','gdfg',NULL,NULL,'2010-07-10 00:00:00','2010-07-10 12:00:00','2011-07-09 00:00:00','2013-03-06 12:00:00',4.000,'',0.000,'',0.000,'',1,0,0.00000000,0,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,1,0,0,0.00000000,0,1,1,'',NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(4,'2012-12-08 13:11:17',2,3,0,'','',NULL,NULL,'2010-07-10 00:00:00',NULL,NULL,NULL,0.000,'',0.000,'',0.000,'',1,10,40.00000000,40,NULL,36.00000000,0.00000000,0.00000000,0.00000000,36.00000000,1,0,NULL,0.00000000,0,NULL,1,'',NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(5,'2013-03-06 09:05:40',3,NULL,4,'','gfdg',NULL,NULL,NULL,'2013-03-06 12:00:00','2013-03-07 12:00:00',NULL,0.000,'',0.000,'',0.000,'',1,0,10.00000000,10,NULL,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,1,0,0,0.00000000,0,1,1,'',NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000);
 /*!40000 ALTER TABLE `llx_contratdet` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -3393,7 +3395,7 @@ CREATE TABLE `llx_cronjob` (
   `fk_mailing` int(11) DEFAULT NULL,
   `test` varchar(255) DEFAULT '1',
   PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=19 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=22 DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -3402,7 +3404,7 @@ CREATE TABLE `llx_cronjob` (
 
 LOCK TABLES `llx_cronjob` WRITE;
 /*!40000 ALTER TABLE `llx_cronjob` DISABLE KEYS */;
-INSERT INTO `llx_cronjob` VALUES (1,'2013-03-23 18:18:39','2013-03-23 19:18:39','command','aaa','aaaa','','','','','','',0,NULL,NULL,'2013-03-23 19:18:00',NULL,NULL,NULL,NULL,'3600',3600,0,0,1,1,'',NULL,0,0,0,NULL,'1'),(16,'2017-02-21 11:03:40','2017-02-21 15:03:40','method','PurgeDeleteTemporaryFilesShort',NULL,'core/class/utils.class.php','Utils','purgeFiles',NULL,NULL,'cron',10,NULL,NULL,'2017-02-21 15:03:40',NULL,NULL,NULL,NULL,'604800',2,NULL,1,NULL,NULL,'PurgeDeleteTemporaryFiles',NULL,1,0,0,NULL,'1'),(17,'2017-02-21 11:03:40','2017-02-21 15:03:40','method','MakeLocalDatabaseDumpShort',NULL,'core/class/utils.class.php','Utils','dumpDatabase','none',NULL,'cron',20,NULL,NULL,'2017-02-21 15:03:40',NULL,NULL,NULL,NULL,'604800',1,NULL,0,NULL,NULL,'MakeLocalDatabaseDump',NULL,1,0,0,NULL,'1'),(18,'2017-02-21 11:03:40','2017-02-21 15:03:40','method','RecurringInvoices',NULL,'compta/facture/class/facture-rec.class.php','FactureRec','createRecurringInvoices',NULL,NULL,'facture',0,NULL,NULL,'2017-02-21 15:03:40',NULL,NULL,NULL,NULL,'86400',1,NULL,1,NULL,NULL,'Generate recurring invoices',NULL,1,0,0,NULL,'');
+INSERT INTO `llx_cronjob` VALUES (1,'2013-03-23 18:18:39','2013-03-23 19:18:39','command','aaa','aaaa','','','','','','',0,NULL,NULL,'2013-03-23 19:18:00',NULL,NULL,NULL,NULL,'3600',3600,0,0,1,1,'',NULL,0,0,0,NULL,'1'),(19,'2017-05-12 09:02:42','2017-05-12 13:02:42','method','PurgeDeleteTemporaryFilesShort',NULL,'core/class/utils.class.php','Utils','purgeFiles',NULL,NULL,'cron',10,NULL,NULL,'2017-05-12 13:02:42',NULL,NULL,NULL,NULL,'604800',2,NULL,1,NULL,NULL,'PurgeDeleteTemporaryFiles',NULL,1,0,0,NULL,'1'),(20,'2017-05-12 09:02:42','2017-05-12 13:02:42','method','MakeLocalDatabaseDumpShort',NULL,'core/class/utils.class.php','Utils','dumpDatabase','none,auto,1,auto,10',NULL,'cron',20,NULL,NULL,'2017-05-12 13:02:42',NULL,NULL,NULL,NULL,'604800',1,NULL,0,NULL,NULL,'MakeLocalDatabaseDump',NULL,1,0,0,NULL,'1'),(21,'2017-05-12 09:02:42','2017-05-12 13:02:42','method','RecurringInvoices',NULL,'compta/facture/class/facture-rec.class.php','FactureRec','createRecurringInvoices',NULL,NULL,'facture',0,NULL,NULL,'2017-05-12 13:02:42',NULL,NULL,NULL,NULL,'86400',1,NULL,1,NULL,NULL,'Generate recurring invoices',NULL,1,0,0,NULL,'');
 /*!40000 ALTER TABLE `llx_cronjob` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -3461,7 +3463,7 @@ CREATE TABLE `llx_document_model` (
   `description` text,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_document_model` (`nom`,`type`,`entity`)
-) ENGINE=InnoDB AUTO_INCREMENT=285 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=286 DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -3470,7 +3472,7 @@ CREATE TABLE `llx_document_model` (
 
 LOCK TABLES `llx_document_model` WRITE;
 /*!40000 ALTER TABLE `llx_document_model` DISABLE KEYS */;
-INSERT INTO `llx_document_model` VALUES (9,'merou',1,'shipping',NULL,NULL),(15,'fsfe.fr.php',1,'donation',NULL,NULL),(181,'generic_invoice_odt',1,'invoice','ODT templates','FACTURE_ADDON_PDF_ODT_PATH'),(193,'canelle2',1,'invoice_supplier','canelle2',NULL),(195,'canelle',1,'invoice_supplier','canelle',NULL),(198,'azur',2,'propal',NULL,NULL),(199,'html_cerfafr',2,'donation',NULL,NULL),(200,'crabe',2,'invoice',NULL,NULL),(201,'generic_odt',1,'company','ODT templates','COMPANY_ADDON_PDF_ODT_PATH'),(250,'baleine',1,'project',NULL,NULL),(255,'soleil',1,'ficheinter',NULL,NULL),(256,'azur',1,'propal',NULL,NULL),(270,'aurore',1,'supplier_proposal',NULL,NULL),(272,'html_cerfafr',1,'donation',NULL,NULL),(273,'beluga',1,'project','beluga',NULL),(274,'rouget',1,'shipping',NULL,NULL),(275,'typhon',1,'delivery',NULL,NULL),(276,'einstein',1,'order',NULL,NULL),(277,'muscadet',1,'order_supplier',NULL,NULL),(278,'standard',1,'expensereport',NULL,NULL),(281,'sepamandate',1,'bankaccount','sepamandate',NULL),(284,'crabe',1,'invoice',NULL,NULL);
+INSERT INTO `llx_document_model` VALUES (9,'merou',1,'shipping',NULL,NULL),(15,'fsfe.fr.php',1,'donation',NULL,NULL),(181,'generic_invoice_odt',1,'invoice','ODT templates','FACTURE_ADDON_PDF_ODT_PATH'),(193,'canelle2',1,'invoice_supplier','canelle2',NULL),(195,'canelle',1,'invoice_supplier','canelle',NULL),(198,'azur',2,'propal',NULL,NULL),(199,'html_cerfafr',2,'donation',NULL,NULL),(200,'crabe',2,'invoice',NULL,NULL),(201,'generic_odt',1,'company','ODT templates','COMPANY_ADDON_PDF_ODT_PATH'),(250,'baleine',1,'project',NULL,NULL),(255,'soleil',1,'ficheinter',NULL,NULL),(256,'azur',1,'propal',NULL,NULL),(270,'aurore',1,'supplier_proposal',NULL,NULL),(272,'html_cerfafr',1,'donation',NULL,NULL),(273,'beluga',1,'project','beluga',NULL),(274,'rouget',1,'shipping',NULL,NULL),(275,'typhon',1,'delivery',NULL,NULL),(276,'einstein',1,'order',NULL,NULL),(277,'muscadet',1,'order_supplier',NULL,NULL),(278,'standard',1,'expensereport',NULL,NULL),(281,'sepamandate',1,'bankaccount','sepamandate',NULL),(285,'crabe',1,'invoice',NULL,NULL);
 /*!40000 ALTER TABLE `llx_document_model` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -4090,12 +4092,12 @@ CREATE TABLE `llx_events` (
   `dateevent` datetime DEFAULT NULL,
   `fk_user` int(11) DEFAULT NULL,
   `description` varchar(250) NOT NULL,
-  `ip` varchar(32) NOT NULL,
+  `ip` varchar(250) DEFAULT NULL,
   `user_agent` varchar(255) DEFAULT NULL,
   `fk_object` int(11) DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   KEY `idx_events_dateevent` (`dateevent`)
-) ENGINE=InnoDB AUTO_INCREMENT=842 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=843 DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -4104,7 +4106,7 @@ CREATE TABLE `llx_events` (
 
 LOCK TABLES `llx_events` WRITE;
 /*!40000 ALTER TABLE `llx_events` DISABLE KEYS */;
-INSERT INTO `llx_events` VALUES (30,'2011-07-18 18:23:06','USER_LOGOUT',1,'2011-07-18 20:23:06',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(31,'2011-07-18 18:23:12','USER_LOGIN_FAILED',1,'2011-07-18 20:23:12',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(32,'2011-07-18 18:23:17','USER_LOGIN',1,'2011-07-18 20:23:17',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(33,'2011-07-18 20:10:51','USER_LOGIN_FAILED',1,'2011-07-18 22:10:51',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(34,'2011-07-18 20:10:55','USER_LOGIN',1,'2011-07-18 22:10:55',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(35,'2011-07-18 21:18:57','USER_LOGIN',1,'2011-07-18 23:18:57',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(36,'2011-07-20 10:34:10','USER_LOGIN',1,'2011-07-20 12:34:10',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(37,'2011-07-20 12:36:44','USER_LOGIN',1,'2011-07-20 14:36:44',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(38,'2011-07-20 13:20:51','USER_LOGIN_FAILED',1,'2011-07-20 15:20:51',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(39,'2011-07-20 13:20:54','USER_LOGIN',1,'2011-07-20 15:20:54',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(40,'2011-07-20 15:03:46','USER_LOGIN_FAILED',1,'2011-07-20 17:03:46',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(41,'2011-07-20 15:03:55','USER_LOGIN',1,'2011-07-20 17:03:55',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(42,'2011-07-20 18:05:05','USER_LOGIN_FAILED',1,'2011-07-20 20:05:05',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(43,'2011-07-20 18:05:08','USER_LOGIN',1,'2011-07-20 20:05:08',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(44,'2011-07-20 21:08:53','USER_LOGIN_FAILED',1,'2011-07-20 23:08:53',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(45,'2011-07-20 21:08:56','USER_LOGIN',1,'2011-07-20 23:08:56',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(46,'2011-07-21 01:26:12','USER_LOGIN',1,'2011-07-21 03:26:12',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(47,'2011-07-21 22:35:45','USER_LOGIN_FAILED',1,'2011-07-22 00:35:45',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(48,'2011-07-21 22:35:49','USER_LOGIN',1,'2011-07-22 00:35:49',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(49,'2011-07-26 23:09:47','USER_LOGIN_FAILED',1,'2011-07-27 01:09:47',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(50,'2011-07-26 23:09:50','USER_LOGIN',1,'2011-07-27 01:09:50',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(51,'2011-07-27 17:02:27','USER_LOGIN_FAILED',1,'2011-07-27 19:02:27',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(52,'2011-07-27 17:02:32','USER_LOGIN',1,'2011-07-27 19:02:32',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(53,'2011-07-27 23:33:37','USER_LOGIN_FAILED',1,'2011-07-28 01:33:37',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(54,'2011-07-27 23:33:41','USER_LOGIN',1,'2011-07-28 01:33:41',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(55,'2011-07-28 18:20:36','USER_LOGIN_FAILED',1,'2011-07-28 20:20:36',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(56,'2011-07-28 18:20:38','USER_LOGIN',1,'2011-07-28 20:20:38',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(57,'2011-07-28 20:13:30','USER_LOGIN_FAILED',1,'2011-07-28 22:13:30',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(58,'2011-07-28 20:13:34','USER_LOGIN',1,'2011-07-28 22:13:34',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(59,'2011-07-28 20:22:51','USER_LOGIN',1,'2011-07-28 22:22:51',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(60,'2011-07-28 23:05:06','USER_LOGIN',1,'2011-07-29 01:05:06',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(61,'2011-07-29 20:15:50','USER_LOGIN_FAILED',1,'2011-07-29 22:15:50',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(62,'2011-07-29 20:15:53','USER_LOGIN',1,'2011-07-29 22:15:53',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(68,'2011-07-29 20:51:01','USER_LOGOUT',1,'2011-07-29 22:51:01',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(69,'2011-07-29 20:51:05','USER_LOGIN',1,'2011-07-29 22:51:05',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(70,'2011-07-30 08:46:20','USER_LOGIN_FAILED',1,'2011-07-30 10:46:20',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(71,'2011-07-30 08:46:38','USER_LOGIN_FAILED',1,'2011-07-30 10:46:38',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(72,'2011-07-30 08:46:42','USER_LOGIN',1,'2011-07-30 10:46:42',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(73,'2011-07-30 10:05:12','USER_LOGIN_FAILED',1,'2011-07-30 12:05:12',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(74,'2011-07-30 10:05:15','USER_LOGIN',1,'2011-07-30 12:05:15',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(75,'2011-07-30 12:15:46','USER_LOGIN',1,'2011-07-30 14:15:46',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(76,'2011-07-31 22:19:30','USER_LOGIN',1,'2011-08-01 00:19:30',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(77,'2011-07-31 23:32:52','USER_LOGIN',1,'2011-08-01 01:32:52',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(78,'2011-08-01 01:24:50','USER_LOGIN_FAILED',1,'2011-08-01 03:24:50',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(79,'2011-08-01 01:24:54','USER_LOGIN',1,'2011-08-01 03:24:54',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(80,'2011-08-01 19:31:36','USER_LOGIN_FAILED',1,'2011-08-01 21:31:35',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(81,'2011-08-01 19:31:39','USER_LOGIN',1,'2011-08-01 21:31:39',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(82,'2011-08-01 20:01:36','USER_LOGIN',1,'2011-08-01 22:01:36',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(83,'2011-08-01 20:52:54','USER_LOGIN_FAILED',1,'2011-08-01 22:52:54',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(84,'2011-08-01 20:52:58','USER_LOGIN',1,'2011-08-01 22:52:58',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(85,'2011-08-01 21:17:28','USER_LOGIN_FAILED',1,'2011-08-01 23:17:28',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(86,'2011-08-01 21:17:31','USER_LOGIN',1,'2011-08-01 23:17:31',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(87,'2011-08-04 11:55:17','USER_LOGIN',1,'2011-08-04 13:55:17',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(88,'2011-08-04 20:19:03','USER_LOGIN_FAILED',1,'2011-08-04 22:19:03',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(89,'2011-08-04 20:19:07','USER_LOGIN',1,'2011-08-04 22:19:07',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(90,'2011-08-05 17:51:42','USER_LOGIN_FAILED',1,'2011-08-05 19:51:42',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(91,'2011-08-05 17:51:47','USER_LOGIN',1,'2011-08-05 19:51:47',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(92,'2011-08-05 17:56:03','USER_LOGIN',1,'2011-08-05 19:56:03',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(93,'2011-08-05 17:59:10','USER_LOGIN',1,'2011-08-05 19:59:10',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686) AppleWebKit/534.30 (KHTML, like Gecko) Chrome/12.0.742.100 Safari/534.30',NULL),(94,'2011-08-05 18:01:58','USER_LOGIN',1,'2011-08-05 20:01:58',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686) AppleWebKit/534.30 (KHTML, like Gecko) Chrome/12.0.742.100 Safari/534.30',NULL),(95,'2011-08-05 19:59:56','USER_LOGIN',1,'2011-08-05 21:59:56',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(96,'2011-08-06 18:33:22','USER_LOGIN',1,'2011-08-06 20:33:22',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(97,'2011-08-07 00:56:59','USER_LOGIN',1,'2011-08-07 02:56:59',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(98,'2011-08-07 22:49:14','USER_LOGIN',1,'2011-08-08 00:49:14',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(99,'2011-08-07 23:05:18','USER_LOGOUT',1,'2011-08-08 01:05:18',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(105,'2011-08-08 00:41:09','USER_LOGIN',1,'2011-08-08 02:41:09',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(106,'2011-08-08 11:58:55','USER_LOGIN',1,'2011-08-08 13:58:55',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(107,'2011-08-08 14:35:48','USER_LOGIN',1,'2011-08-08 16:35:48',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(108,'2011-08-08 14:36:31','USER_LOGOUT',1,'2011-08-08 16:36:31',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(109,'2011-08-08 14:38:28','USER_LOGIN',1,'2011-08-08 16:38:28',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(110,'2011-08-08 14:39:02','USER_LOGOUT',1,'2011-08-08 16:39:02',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(111,'2011-08-08 14:39:10','USER_LOGIN',1,'2011-08-08 16:39:10',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(112,'2011-08-08 14:39:28','USER_LOGOUT',1,'2011-08-08 16:39:28',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(113,'2011-08-08 14:39:37','USER_LOGIN',1,'2011-08-08 16:39:37',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(114,'2011-08-08 14:50:02','USER_LOGOUT',1,'2011-08-08 16:50:02',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(115,'2011-08-08 14:51:45','USER_LOGIN_FAILED',1,'2011-08-08 16:51:45',NULL,'Identifiants login ou mot de passe incorrects - login=','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(116,'2011-08-08 14:51:52','USER_LOGIN',1,'2011-08-08 16:51:52',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(117,'2011-08-08 15:09:54','USER_LOGOUT',1,'2011-08-08 17:09:54',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(118,'2011-08-08 15:10:19','USER_LOGIN_FAILED',1,'2011-08-08 17:10:19',NULL,'Identifiants login ou mot de passe incorrects - login=','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(119,'2011-08-08 15:10:28','USER_LOGIN',1,'2011-08-08 17:10:28',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(121,'2011-08-08 15:14:58','USER_LOGOUT',1,'2011-08-08 17:14:58',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(122,'2011-08-08 15:15:00','USER_LOGIN_FAILED',1,'2011-08-08 17:15:00',NULL,'Identifiants login ou mot de passe incorrects - login=','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(123,'2011-08-08 15:17:57','USER_LOGIN',1,'2011-08-08 17:17:57',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(124,'2011-08-08 15:35:56','USER_LOGOUT',1,'2011-08-08 17:35:56',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(125,'2011-08-08 15:36:05','USER_LOGIN',1,'2011-08-08 17:36:05',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(126,'2011-08-08 17:32:42','USER_LOGIN',1,'2011-08-08 19:32:42',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(127,'2012-12-08 13:49:37','USER_LOGOUT',1,'2012-12-08 14:49:37',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(128,'2012-12-08 13:49:42','USER_LOGIN',1,'2012-12-08 14:49:42',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(129,'2012-12-08 13:50:12','USER_LOGOUT',1,'2012-12-08 14:50:12',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(130,'2012-12-08 13:50:14','USER_LOGIN',1,'2012-12-08 14:50:14',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(131,'2012-12-08 13:50:17','USER_LOGOUT',1,'2012-12-08 14:50:17',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(132,'2012-12-08 13:52:47','USER_LOGIN',1,'2012-12-08 14:52:47',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(133,'2012-12-08 13:53:08','USER_MODIFY',1,'2012-12-08 14:53:08',1,'User admin modified','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(134,'2012-12-08 14:08:45','USER_LOGOUT',1,'2012-12-08 15:08:45',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(135,'2012-12-08 14:09:09','USER_LOGIN',1,'2012-12-08 15:09:09',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(136,'2012-12-08 14:11:43','USER_LOGOUT',1,'2012-12-08 15:11:43',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(137,'2012-12-08 14:11:45','USER_LOGIN',1,'2012-12-08 15:11:45',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(138,'2012-12-08 14:22:53','USER_LOGOUT',1,'2012-12-08 15:22:53',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(139,'2012-12-08 14:22:54','USER_LOGIN',1,'2012-12-08 15:22:54',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(140,'2012-12-08 14:23:10','USER_LOGOUT',1,'2012-12-08 15:23:10',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(141,'2012-12-08 14:23:11','USER_LOGIN',1,'2012-12-08 15:23:11',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(142,'2012-12-08 14:23:49','USER_LOGOUT',1,'2012-12-08 15:23:49',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(143,'2012-12-08 14:23:50','USER_LOGIN',1,'2012-12-08 15:23:50',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(144,'2012-12-08 14:28:08','USER_LOGOUT',1,'2012-12-08 15:28:08',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(145,'2012-12-08 14:35:15','USER_LOGIN',1,'2012-12-08 15:35:15',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(146,'2012-12-08 14:35:18','USER_LOGOUT',1,'2012-12-08 15:35:18',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(147,'2012-12-08 14:36:07','USER_LOGIN',1,'2012-12-08 15:36:07',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(148,'2012-12-08 14:36:09','USER_LOGOUT',1,'2012-12-08 15:36:09',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(149,'2012-12-08 14:36:41','USER_LOGIN',1,'2012-12-08 15:36:41',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(150,'2012-12-08 15:59:13','USER_LOGIN',1,'2012-12-08 16:59:13',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(151,'2012-12-09 11:49:52','USER_LOGIN',1,'2012-12-09 12:49:52',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(152,'2012-12-09 13:46:31','USER_LOGIN',1,'2012-12-09 14:46:31',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(153,'2012-12-09 19:03:14','USER_LOGIN',1,'2012-12-09 20:03:14',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(154,'2012-12-10 00:16:31','USER_LOGIN',1,'2012-12-10 01:16:31',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(170,'2012-12-11 22:03:31','USER_LOGIN',1,'2012-12-11 23:03:31',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(171,'2012-12-12 00:32:39','USER_LOGIN',1,'2012-12-12 01:32:39',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(172,'2012-12-12 10:49:59','USER_LOGIN',1,'2012-12-12 11:49:59',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(175,'2012-12-12 10:57:40','USER_MODIFY',1,'2012-12-12 11:57:40',1,'Modification utilisateur admin','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(176,'2012-12-12 13:29:15','USER_LOGIN',1,'2012-12-12 14:29:15',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(177,'2012-12-12 13:30:15','USER_LOGIN',1,'2012-12-12 14:30:15',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(178,'2012-12-12 13:40:08','USER_LOGOUT',1,'2012-12-12 14:40:08',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(179,'2012-12-12 13:40:10','USER_LOGIN',1,'2012-12-12 14:40:10',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(180,'2012-12-12 13:40:26','USER_MODIFY',1,'2012-12-12 14:40:26',1,'Modification utilisateur admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(181,'2012-12-12 13:40:34','USER_LOGOUT',1,'2012-12-12 14:40:34',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(182,'2012-12-12 13:42:23','USER_LOGIN',1,'2012-12-12 14:42:23',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(183,'2012-12-12 13:43:02','USER_NEW_PASSWORD',1,'2012-12-12 14:43:02',NULL,'Changement mot de passe de admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(184,'2012-12-12 13:43:25','USER_LOGOUT',1,'2012-12-12 14:43:25',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(185,'2012-12-12 13:43:27','USER_LOGIN_FAILED',1,'2012-12-12 14:43:27',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(186,'2012-12-12 13:43:30','USER_LOGIN',1,'2012-12-12 14:43:30',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(187,'2012-12-12 14:52:11','USER_LOGIN',1,'2012-12-12 15:52:11',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(188,'2012-12-12 17:53:00','USER_LOGIN_FAILED',1,'2012-12-12 18:53:00',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(189,'2012-12-12 17:53:07','USER_LOGIN_FAILED',1,'2012-12-12 18:53:07',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(190,'2012-12-12 17:53:51','USER_NEW_PASSWORD',1,'2012-12-12 18:53:51',NULL,'Changement mot de passe de admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(191,'2012-12-12 17:54:00','USER_LOGIN',1,'2012-12-12 18:54:00',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(192,'2012-12-12 17:54:10','USER_NEW_PASSWORD',1,'2012-12-12 18:54:10',1,'Changement mot de passe de admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(193,'2012-12-12 17:54:10','USER_MODIFY',1,'2012-12-12 18:54:10',1,'Modification utilisateur admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(194,'2012-12-12 18:57:09','USER_LOGIN',1,'2012-12-12 19:57:09',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(195,'2012-12-12 23:04:08','USER_LOGIN',1,'2012-12-13 00:04:08',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(196,'2012-12-17 20:03:14','USER_LOGIN',1,'2012-12-17 21:03:14',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(197,'2012-12-17 21:18:45','USER_LOGIN',1,'2012-12-17 22:18:45',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(198,'2012-12-17 22:30:08','USER_LOGIN',1,'2012-12-17 23:30:08',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(199,'2012-12-18 23:32:03','USER_LOGIN',1,'2012-12-19 00:32:03',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(200,'2012-12-19 09:38:03','USER_LOGIN',1,'2012-12-19 10:38:03',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(201,'2012-12-19 11:23:35','USER_LOGIN',1,'2012-12-19 12:23:35',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(202,'2012-12-19 12:46:22','USER_LOGIN',1,'2012-12-19 13:46:22',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(214,'2012-12-19 19:11:31','USER_LOGIN',1,'2012-12-19 20:11:31',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(215,'2012-12-21 16:36:57','USER_LOGIN',1,'2012-12-21 17:36:57',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(216,'2012-12-21 16:38:43','USER_NEW_PASSWORD',1,'2012-12-21 17:38:43',1,'Changement mot de passe de adupont','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(217,'2012-12-21 16:38:43','USER_MODIFY',1,'2012-12-21 17:38:43',1,'Modification utilisateur adupont','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(218,'2012-12-21 16:38:51','USER_LOGOUT',1,'2012-12-21 17:38:51',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(219,'2012-12-21 16:38:55','USER_LOGIN',1,'2012-12-21 17:38:55',3,'(UserLogged,adupont)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(220,'2012-12-21 16:48:18','USER_LOGOUT',1,'2012-12-21 17:48:18',3,'(UserLogoff,adupont)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(221,'2012-12-21 16:48:20','USER_LOGIN',1,'2012-12-21 17:48:20',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(222,'2012-12-26 18:28:18','USER_LOGIN',1,'2012-12-26 19:28:18',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(223,'2012-12-26 20:00:24','USER_LOGIN',1,'2012-12-26 21:00:24',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(224,'2012-12-27 01:10:27','USER_LOGIN',1,'2012-12-27 02:10:27',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(225,'2012-12-28 19:12:08','USER_LOGIN',1,'2012-12-28 20:12:08',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(226,'2012-12-28 20:16:58','USER_LOGIN',1,'2012-12-28 21:16:58',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(227,'2012-12-29 14:35:46','USER_LOGIN',1,'2012-12-29 15:35:46',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(228,'2012-12-29 14:37:59','USER_LOGOUT',1,'2012-12-29 15:37:59',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(229,'2012-12-29 14:38:00','USER_LOGIN',1,'2012-12-29 15:38:00',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(230,'2012-12-29 17:16:48','USER_LOGIN',1,'2012-12-29 18:16:48',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(231,'2012-12-31 12:02:59','USER_LOGIN',1,'2012-12-31 13:02:59',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(232,'2013-01-02 20:32:51','USER_LOGIN',1,'2013-01-02 21:32:51',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:17.0) Gecko/20100101 Firefox/17.0',NULL),(233,'2013-01-02 20:58:59','USER_LOGIN',1,'2013-01-02 21:58:59',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(234,'2013-01-03 09:25:07','USER_LOGIN',1,'2013-01-03 10:25:07',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(235,'2013-01-03 19:39:31','USER_LOGIN',1,'2013-01-03 20:39:31',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(236,'2013-01-04 22:40:19','USER_LOGIN',1,'2013-01-04 23:40:19',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(237,'2013-01-05 12:59:59','USER_LOGIN',1,'2013-01-05 13:59:59',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(238,'2013-01-05 15:28:52','USER_LOGIN',1,'2013-01-05 16:28:52',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(239,'2013-01-05 17:02:08','USER_LOGIN',1,'2013-01-05 18:02:08',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(240,'2013-01-06 12:13:33','USER_LOGIN',1,'2013-01-06 13:13:33',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(241,'2013-01-07 01:21:15','USER_LOGIN',1,'2013-01-07 02:21:15',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(242,'2013-01-07 01:46:31','USER_LOGOUT',1,'2013-01-07 02:46:31',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(243,'2013-01-07 19:54:50','USER_LOGIN',1,'2013-01-07 20:54:50',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(244,'2013-01-08 21:55:01','USER_LOGIN',1,'2013-01-08 22:55:01',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(245,'2013-01-09 11:13:28','USER_LOGIN',1,'2013-01-09 12:13:28',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(246,'2013-01-10 18:30:46','USER_LOGIN',1,'2013-01-10 19:30:46',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(247,'2013-01-11 18:03:26','USER_LOGIN',1,'2013-01-11 19:03:26',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(248,'2013-01-12 11:15:04','USER_LOGIN',1,'2013-01-12 12:15:04',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(249,'2013-01-12 14:42:44','USER_LOGIN',1,'2013-01-12 15:42:44',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(250,'2013-01-13 12:07:17','USER_LOGIN',1,'2013-01-13 13:07:17',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(251,'2013-01-13 17:37:58','USER_LOGIN',1,'2013-01-13 18:37:58',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(252,'2013-01-13 19:24:21','USER_LOGIN',1,'2013-01-13 20:24:21',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(253,'2013-01-13 19:29:19','USER_LOGOUT',1,'2013-01-13 20:29:19',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(254,'2013-01-13 21:39:39','USER_LOGIN',1,'2013-01-13 22:39:39',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(255,'2013-01-14 00:52:21','USER_LOGIN',1,'2013-01-14 01:52:21',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(256,'2013-01-16 11:34:31','USER_LOGIN',1,'2013-01-16 12:34:31',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(257,'2013-01-16 15:36:21','USER_LOGIN',1,'2013-01-16 16:36:21',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(258,'2013-01-16 19:17:36','USER_LOGIN',1,'2013-01-16 20:17:36',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(259,'2013-01-16 19:48:08','GROUP_CREATE',1,'2013-01-16 20:48:08',1,'Création groupe ggg','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(260,'2013-01-16 21:48:53','USER_LOGIN',1,'2013-01-16 22:48:53',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(261,'2013-01-17 19:55:53','USER_LOGIN',1,'2013-01-17 20:55:53',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(262,'2013-01-18 09:48:01','USER_LOGIN',1,'2013-01-18 10:48:01',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(263,'2013-01-18 13:22:36','USER_LOGIN',1,'2013-01-18 14:22:36',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(264,'2013-01-18 16:10:23','USER_LOGIN',1,'2013-01-18 17:10:22',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(265,'2013-01-18 17:41:40','USER_LOGIN',1,'2013-01-18 18:41:40',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(266,'2013-01-19 14:33:48','USER_LOGIN',1,'2013-01-19 15:33:48',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(267,'2013-01-19 16:47:43','USER_LOGIN',1,'2013-01-19 17:47:43',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(268,'2013-01-19 16:59:43','USER_LOGIN',1,'2013-01-19 17:59:43',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(269,'2013-01-19 17:00:22','USER_LOGIN',1,'2013-01-19 18:00:22',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(270,'2013-01-19 17:04:16','USER_LOGOUT',1,'2013-01-19 18:04:16',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(271,'2013-01-19 17:04:18','USER_LOGIN',1,'2013-01-19 18:04:18',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(272,'2013-01-20 00:34:19','USER_LOGIN',1,'2013-01-20 01:34:19',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(273,'2013-01-21 11:54:17','USER_LOGIN',1,'2013-01-21 12:54:17',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(274,'2013-01-21 13:48:15','USER_LOGIN',1,'2013-01-21 14:48:15',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(275,'2013-01-21 14:30:22','USER_LOGIN',1,'2013-01-21 15:30:22',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(276,'2013-01-21 15:10:46','USER_LOGIN',1,'2013-01-21 16:10:46',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(277,'2013-01-21 17:27:43','USER_LOGIN',1,'2013-01-21 18:27:43',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(278,'2013-01-21 21:48:15','USER_LOGIN',1,'2013-01-21 22:48:15',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(279,'2013-01-21 21:50:42','USER_LOGIN',1,'2013-01-21 22:50:42',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(280,'2013-01-23 09:28:26','USER_LOGIN',1,'2013-01-23 10:28:26',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL),(281,'2013-01-23 13:21:57','USER_LOGIN',1,'2013-01-23 14:21:57',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL),(282,'2013-01-23 16:52:00','USER_LOGOUT',1,'2013-01-23 17:52:00',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL),(283,'2013-01-23 16:52:05','USER_LOGIN_FAILED',1,'2013-01-23 17:52:05',NULL,'Bad value for login or password - login=bbb','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL),(284,'2013-01-23 16:52:09','USER_LOGIN',1,'2013-01-23 17:52:09',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL),(285,'2013-01-23 16:52:27','USER_CREATE',1,'2013-01-23 17:52:27',1,'Création utilisateur aaa','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL),(286,'2013-01-23 16:52:27','USER_NEW_PASSWORD',1,'2013-01-23 17:52:27',1,'Changement mot de passe de aaa','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL),(287,'2013-01-23 16:52:37','USER_CREATE',1,'2013-01-23 17:52:37',1,'Création utilisateur bbb','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL),(288,'2013-01-23 16:52:37','USER_NEW_PASSWORD',1,'2013-01-23 17:52:37',1,'Changement mot de passe de bbb','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL),(289,'2013-01-23 16:53:15','USER_LOGOUT',1,'2013-01-23 17:53:15',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL),(290,'2013-01-23 16:53:20','USER_LOGIN',1,'2013-01-23 17:53:20',4,'(UserLogged,aaa)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL),(291,'2013-01-23 19:16:58','USER_LOGIN',1,'2013-01-23 20:16:58',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL),(292,'2013-01-26 10:54:07','USER_LOGIN',1,'2013-01-26 11:54:07',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL),(293,'2013-01-29 10:15:36','USER_LOGIN',1,'2013-01-29 11:15:36',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL),(294,'2013-01-30 17:42:50','USER_LOGIN',1,'2013-01-30 18:42:50',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL),(295,'2013-02-01 08:49:55','USER_LOGIN',1,'2013-02-01 09:49:55',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL),(296,'2013-02-01 08:51:57','USER_LOGOUT',1,'2013-02-01 09:51:57',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL),(297,'2013-02-01 08:52:39','USER_LOGIN',1,'2013-02-01 09:52:39',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL),(298,'2013-02-01 21:03:01','USER_LOGIN',1,'2013-02-01 22:03:01',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL),(299,'2013-02-10 19:48:39','USER_LOGIN',1,'2013-02-10 20:48:39',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL),(300,'2013-02-10 20:46:48','USER_LOGIN',1,'2013-02-10 21:46:48',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL),(301,'2013-02-10 21:39:23','USER_LOGIN',1,'2013-02-10 22:39:23',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL),(302,'2013-02-11 19:00:13','USER_LOGIN',1,'2013-02-11 20:00:13',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL),(303,'2013-02-11 19:43:44','USER_LOGIN_FAILED',1,'2013-02-11 20:43:44',NULL,'Unknown column \'u.fk_user\' in \'field list\'','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL),(304,'2013-02-11 19:44:01','USER_LOGIN',1,'2013-02-11 20:44:01',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL),(305,'2013-02-12 00:27:35','USER_LOGIN',1,'2013-02-12 01:27:35',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL),(306,'2013-02-12 00:27:38','USER_LOGOUT',1,'2013-02-12 01:27:38',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL),(307,'2013-02-12 00:28:07','USER_LOGIN',1,'2013-02-12 01:28:07',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL),(308,'2013-02-12 00:28:09','USER_LOGOUT',1,'2013-02-12 01:28:09',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL),(309,'2013-02-12 00:28:26','USER_LOGIN',1,'2013-02-12 01:28:26',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL),(310,'2013-02-12 00:28:30','USER_LOGOUT',1,'2013-02-12 01:28:30',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL),(311,'2013-02-12 12:42:15','USER_LOGIN',1,'2013-02-12 13:42:15',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL),(312,'2013-02-12 13:46:16','USER_LOGIN',1,'2013-02-12 14:46:16',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(313,'2013-02-12 14:54:28','USER_LOGIN',1,'2013-02-12 15:54:28',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(314,'2013-02-12 16:04:46','USER_LOGIN',1,'2013-02-12 17:04:46',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(315,'2013-02-13 14:02:43','USER_LOGIN',1,'2013-02-13 15:02:43',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(316,'2013-02-13 14:48:30','USER_LOGIN',1,'2013-02-13 15:48:30',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(317,'2013-02-13 17:44:53','USER_LOGIN',1,'2013-02-13 18:44:53',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(318,'2013-02-15 08:44:36','USER_LOGIN',1,'2013-02-15 09:44:36',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(319,'2013-02-15 08:53:20','USER_LOGIN',1,'2013-02-15 09:53:20',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(320,'2013-02-16 19:10:28','USER_LOGIN',1,'2013-02-16 20:10:28',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(321,'2013-02-16 19:22:40','USER_CREATE',1,'2013-02-16 20:22:40',1,'Création utilisateur aaab','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(322,'2013-02-16 19:22:40','USER_NEW_PASSWORD',1,'2013-02-16 20:22:40',1,'Changement mot de passe de aaab','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(323,'2013-02-16 19:48:15','USER_CREATE',1,'2013-02-16 20:48:15',1,'Création utilisateur zzz','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(324,'2013-02-16 19:48:15','USER_NEW_PASSWORD',1,'2013-02-16 20:48:15',1,'Changement mot de passe de zzz','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(325,'2013-02-16 19:50:08','USER_CREATE',1,'2013-02-16 20:50:08',1,'Création utilisateur zzzg','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(326,'2013-02-16 19:50:08','USER_NEW_PASSWORD',1,'2013-02-16 20:50:08',1,'Changement mot de passe de zzzg','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(327,'2013-02-16 21:20:03','USER_LOGIN',1,'2013-02-16 22:20:03',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(328,'2013-02-17 14:30:51','USER_LOGIN',1,'2013-02-17 15:30:51',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(329,'2013-02-17 17:21:22','USER_LOGIN',1,'2013-02-17 18:21:22',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(330,'2013-02-17 17:48:43','USER_MODIFY',1,'2013-02-17 18:48:43',1,'Modification utilisateur aaa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(331,'2013-02-17 17:48:47','USER_MODIFY',1,'2013-02-17 18:48:47',1,'Modification utilisateur aaa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(332,'2013-02-17 17:48:51','USER_MODIFY',1,'2013-02-17 18:48:51',1,'Modification utilisateur aaa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(333,'2013-02-17 17:48:56','USER_MODIFY',1,'2013-02-17 18:48:56',1,'Modification utilisateur aaa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(334,'2013-02-18 22:00:01','USER_LOGIN',1,'2013-02-18 23:00:01',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(335,'2013-02-19 08:19:52','USER_LOGIN',1,'2013-02-19 09:19:52',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(336,'2013-02-19 22:00:52','USER_LOGIN',1,'2013-02-19 23:00:52',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(337,'2013-02-20 09:34:52','USER_LOGIN',1,'2013-02-20 10:34:52',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(338,'2013-02-20 13:12:28','USER_LOGIN',1,'2013-02-20 14:12:28',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(339,'2013-02-20 17:19:44','USER_LOGIN',1,'2013-02-20 18:19:44',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(340,'2013-02-20 19:07:21','USER_MODIFY',1,'2013-02-20 20:07:21',1,'Modification utilisateur adupont','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(341,'2013-02-20 19:47:17','USER_LOGIN',1,'2013-02-20 20:47:17',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(342,'2013-02-20 19:48:01','USER_MODIFY',1,'2013-02-20 20:48:01',1,'Modification utilisateur aaa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(343,'2013-02-21 08:27:07','USER_LOGIN',1,'2013-02-21 09:27:07',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(344,'2013-02-23 13:34:13','USER_LOGIN',1,'2013-02-23 14:34:13',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(345,'2013-02-24 01:06:41','USER_LOGIN_FAILED',1,'2013-02-24 02:06:41',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(346,'2013-02-24 01:06:45','USER_LOGIN_FAILED',1,'2013-02-24 02:06:45',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(347,'2013-02-24 01:06:55','USER_LOGIN_FAILED',1,'2013-02-24 02:06:55',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(348,'2013-02-24 01:07:03','USER_LOGIN_FAILED',1,'2013-02-24 02:07:03',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(349,'2013-02-24 01:07:21','USER_LOGIN_FAILED',1,'2013-02-24 02:07:21',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(350,'2013-02-24 01:08:12','USER_LOGIN_FAILED',1,'2013-02-24 02:08:12',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(351,'2013-02-24 01:08:42','USER_LOGIN_FAILED',1,'2013-02-24 02:08:42',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(352,'2013-02-24 01:08:50','USER_LOGIN_FAILED',1,'2013-02-24 02:08:50',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(353,'2013-02-24 01:09:08','USER_LOGIN_FAILED',1,'2013-02-24 02:09:08',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(354,'2013-02-24 01:09:42','USER_LOGIN_FAILED',1,'2013-02-24 02:09:42',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(355,'2013-02-24 01:09:50','USER_LOGIN_FAILED',1,'2013-02-24 02:09:50',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(356,'2013-02-24 01:10:05','USER_LOGIN_FAILED',1,'2013-02-24 02:10:05',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(357,'2013-02-24 01:10:22','USER_LOGIN_FAILED',1,'2013-02-24 02:10:22',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(358,'2013-02-24 01:10:30','USER_LOGIN_FAILED',1,'2013-02-24 02:10:30',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(359,'2013-02-24 01:10:56','USER_LOGIN_FAILED',1,'2013-02-24 02:10:56',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(360,'2013-02-24 01:11:26','USER_LOGIN_FAILED',1,'2013-02-24 02:11:26',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(361,'2013-02-24 01:12:06','USER_LOGIN_FAILED',1,'2013-02-24 02:12:06',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(362,'2013-02-24 01:21:14','USER_LOGIN_FAILED',1,'2013-02-24 02:21:14',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(363,'2013-02-24 01:21:25','USER_LOGIN_FAILED',1,'2013-02-24 02:21:25',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(364,'2013-02-24 01:21:54','USER_LOGIN_FAILED',1,'2013-02-24 02:21:54',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(365,'2013-02-24 01:22:14','USER_LOGIN_FAILED',1,'2013-02-24 02:22:14',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(366,'2013-02-24 01:22:37','USER_LOGIN_FAILED',1,'2013-02-24 02:22:37',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(367,'2013-02-24 01:23:01','USER_LOGIN_FAILED',1,'2013-02-24 02:23:01',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(368,'2013-02-24 01:23:39','USER_LOGIN_FAILED',1,'2013-02-24 02:23:39',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(369,'2013-02-24 01:24:04','USER_LOGIN_FAILED',1,'2013-02-24 02:24:04',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(370,'2013-02-24 01:24:39','USER_LOGIN_FAILED',1,'2013-02-24 02:24:39',NULL,'Bad value for login or password - login=aa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(371,'2013-02-24 01:25:01','USER_LOGIN_FAILED',1,'2013-02-24 02:25:01',NULL,'Bad value for login or password - login=aa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(372,'2013-02-24 01:25:12','USER_LOGIN_FAILED',1,'2013-02-24 02:25:12',NULL,'Bad value for login or password - login=aa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(373,'2013-02-24 01:27:30','USER_LOGIN_FAILED',1,'2013-02-24 02:27:30',NULL,'Bad value for login or password - login=aa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(374,'2013-02-24 01:28:00','USER_LOGIN_FAILED',1,'2013-02-24 02:28:00',NULL,'Bad value for login or password - login=aa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(375,'2013-02-24 01:28:35','USER_LOGIN_FAILED',1,'2013-02-24 02:28:35',NULL,'Bad value for login or password - login=aa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(376,'2013-02-24 01:29:03','USER_LOGIN_FAILED',1,'2013-02-24 02:29:03',NULL,'Bad value for login or password - login=aa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(377,'2013-02-24 01:29:55','USER_LOGIN_FAILED',1,'2013-02-24 02:29:55',NULL,'Bad value for login or password - login=aa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(378,'2013-02-24 01:32:40','USER_LOGIN_FAILED',1,'2013-02-24 02:32:40',NULL,'Bad value for login or password - login=aa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(379,'2013-02-24 01:39:33','USER_LOGIN_FAILED',1,'2013-02-24 02:39:33',NULL,'Identifiants login ou mot de passe incorrects - login=aa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(380,'2013-02-24 01:39:38','USER_LOGIN_FAILED',1,'2013-02-24 02:39:38',NULL,'Identifiants login ou mot de passe incorrects - login=aa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(381,'2013-02-24 01:39:47','USER_LOGIN_FAILED',1,'2013-02-24 02:39:47',NULL,'Identifiants login ou mot de passe incorrects - login=lmkm','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(382,'2013-02-24 01:40:54','USER_LOGIN_FAILED',1,'2013-02-24 02:40:54',NULL,'Identifiants login ou mot de passe incorrects - login=lmkm','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(383,'2013-02-24 01:47:57','USER_LOGIN_FAILED',1,'2013-02-24 02:47:57',NULL,'Identifiants login ou mot de passe incorrects - login=lmkm','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(384,'2013-02-24 01:48:05','USER_LOGIN_FAILED',1,'2013-02-24 02:48:05',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(385,'2013-02-24 01:48:07','USER_LOGIN_FAILED',1,'2013-02-24 02:48:07',NULL,'Unknown column \'u.lastname\' in \'field list\'','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(386,'2013-02-24 01:48:35','USER_LOGIN',1,'2013-02-24 02:48:35',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(387,'2013-02-24 01:56:32','USER_LOGIN',1,'2013-02-24 02:56:32',1,'(UserLogged,admin)','192.168.0.254','Mozilla/5.0 (Linux; U; Android 2.2; en-us; sdk Build/FRF91) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1',NULL),(388,'2013-02-24 02:05:55','USER_LOGOUT',1,'2013-02-24 03:05:55',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(389,'2013-02-24 02:39:52','USER_LOGIN',1,'2013-02-24 03:39:52',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(390,'2013-02-24 02:51:10','USER_LOGOUT',1,'2013-02-24 03:51:10',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(391,'2013-02-24 12:46:41','USER_LOGIN',1,'2013-02-24 13:46:41',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(392,'2013-02-24 12:46:52','USER_LOGOUT',1,'2013-02-24 13:46:52',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(393,'2013-02-24 12:46:56','USER_LOGIN',1,'2013-02-24 13:46:56',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(394,'2013-02-24 12:47:56','USER_LOGOUT',1,'2013-02-24 13:47:56',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(395,'2013-02-24 12:48:00','USER_LOGIN',1,'2013-02-24 13:48:00',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(396,'2013-02-24 12:48:11','USER_LOGOUT',1,'2013-02-24 13:48:11',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(397,'2013-02-24 12:48:32','USER_LOGIN',1,'2013-02-24 13:48:32',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(398,'2013-02-24 12:52:22','USER_LOGOUT',1,'2013-02-24 13:52:22',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(399,'2013-02-24 12:52:27','USER_LOGIN',1,'2013-02-24 13:52:27',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(400,'2013-02-24 12:52:54','USER_LOGOUT',1,'2013-02-24 13:52:54',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(401,'2013-02-24 12:52:59','USER_LOGIN',1,'2013-02-24 13:52:59',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(402,'2013-02-24 12:55:39','USER_LOGOUT',1,'2013-02-24 13:55:39',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(403,'2013-02-24 12:55:59','USER_LOGIN',1,'2013-02-24 13:55:59',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(404,'2013-02-24 12:56:07','USER_LOGOUT',1,'2013-02-24 13:56:07',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(405,'2013-02-24 12:56:23','USER_LOGIN',1,'2013-02-24 13:56:23',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(406,'2013-02-24 12:56:46','USER_LOGOUT',1,'2013-02-24 13:56:46',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(407,'2013-02-24 12:58:30','USER_LOGIN',1,'2013-02-24 13:58:30',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(408,'2013-02-24 12:58:33','USER_LOGOUT',1,'2013-02-24 13:58:33',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(409,'2013-02-24 12:58:51','USER_LOGIN',1,'2013-02-24 13:58:51',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(410,'2013-02-24 12:58:58','USER_LOGOUT',1,'2013-02-24 13:58:58',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(411,'2013-02-24 13:18:53','USER_LOGIN',1,'2013-02-24 14:18:53',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(412,'2013-02-24 13:19:52','USER_LOGOUT',1,'2013-02-24 14:19:52',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(413,'2013-02-24 15:39:31','USER_LOGIN_FAILED',1,'2013-02-24 16:39:31',NULL,'ErrorBadValueForCode - login=admin','127.0.0.1',NULL,NULL),(414,'2013-02-24 15:42:07','USER_LOGIN',1,'2013-02-24 16:42:07',1,'(UserLogged,admin)','127.0.0.1',NULL,NULL),(415,'2013-02-24 15:42:52','USER_LOGOUT',1,'2013-02-24 16:42:52',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7',NULL),(416,'2013-02-24 16:04:21','USER_LOGIN',1,'2013-02-24 17:04:21',1,'(UserLogged,admin)','192.168.0.254','Mozilla/5.0 (Linux; U; Android 2.2; en-us; sdk Build/FRF91) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1',NULL),(417,'2013-02-24 16:11:28','USER_LOGIN_FAILED',1,'2013-02-24 17:11:28',NULL,'ErrorBadValueForCode - login=admin','127.0.0.1','Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7',NULL),(418,'2013-02-24 16:11:37','USER_LOGIN',1,'2013-02-24 17:11:37',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7',NULL),(419,'2013-02-24 16:36:52','USER_LOGOUT',1,'2013-02-24 17:36:52',1,'(UserLogoff,admin)','192.168.0.254','Mozilla/5.0 (Linux; U; Android 2.2; en-us; sdk Build/FRF91) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1',NULL),(420,'2013-02-24 16:40:37','USER_LOGIN',1,'2013-02-24 17:40:37',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(421,'2013-02-24 16:57:16','USER_LOGIN',1,'2013-02-24 17:57:16',1,'(UserLogged,admin)','192.168.0.254','Mozilla/5.0 (Linux; U; Android 2.2; en-us; sdk Build/FRF91) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1 - 2131034114',NULL),(422,'2013-02-24 17:01:30','USER_LOGOUT',1,'2013-02-24 18:01:30',1,'(UserLogoff,admin)','192.168.0.254','Mozilla/5.0 (Linux; U; Android 2.2; en-us; sdk Build/FRF91) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1 - 2131034114',NULL),(423,'2013-02-24 17:02:33','USER_LOGIN',1,'2013-02-24 18:02:33',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(424,'2013-02-24 17:14:22','USER_LOGOUT',1,'2013-02-24 18:14:22',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(425,'2013-02-24 17:15:07','USER_LOGIN_FAILED',1,'2013-02-24 18:15:07',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(426,'2013-02-24 17:15:20','USER_LOGIN',1,'2013-02-24 18:15:20',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(427,'2013-02-24 17:20:14','USER_LOGIN',1,'2013-02-24 18:20:14',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(428,'2013-02-24 17:20:51','USER_LOGIN',1,'2013-02-24 18:20:51',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(429,'2013-02-24 17:20:54','USER_LOGOUT',1,'2013-02-24 18:20:54',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(430,'2013-02-24 17:21:19','USER_LOGIN',1,'2013-02-24 18:21:19',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(431,'2013-02-24 17:32:35','USER_LOGIN',1,'2013-02-24 18:32:35',1,'(UserLogged,admin)','192.168.0.254','Mozilla/5.0 (Linux; U; Android 2.2; en-us; sdk Build/FRF91) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1 - 2131034114',NULL),(432,'2013-02-24 18:28:48','USER_LOGIN',1,'2013-02-24 19:28:48',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(433,'2013-02-24 18:29:27','USER_LOGOUT',1,'2013-02-24 19:29:27',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7',NULL),(434,'2013-02-24 18:29:32','USER_LOGIN',1,'2013-02-24 19:29:32',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7',NULL),(435,'2013-02-24 20:13:13','USER_LOGOUT',1,'2013-02-24 21:13:13',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(436,'2013-02-24 20:13:17','USER_LOGIN',1,'2013-02-24 21:13:17',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(437,'2013-02-25 08:57:16','USER_LOGIN',1,'2013-02-25 09:57:16',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(438,'2013-02-25 08:57:59','USER_LOGOUT',1,'2013-02-25 09:57:59',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(439,'2013-02-25 09:15:02','USER_LOGIN',1,'2013-02-25 10:15:02',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(440,'2013-02-25 09:15:50','USER_LOGOUT',1,'2013-02-25 10:15:50',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(441,'2013-02-25 09:15:57','USER_LOGIN',1,'2013-02-25 10:15:57',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(442,'2013-02-25 09:16:12','USER_LOGOUT',1,'2013-02-25 10:16:12',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(443,'2013-02-25 09:16:19','USER_LOGIN',1,'2013-02-25 10:16:19',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(444,'2013-02-25 09:16:25','USER_LOGOUT',1,'2013-02-25 10:16:25',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(445,'2013-02-25 09:16:39','USER_LOGIN_FAILED',1,'2013-02-25 10:16:39',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(446,'2013-02-25 09:16:42','USER_LOGIN_FAILED',1,'2013-02-25 10:16:42',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(447,'2013-02-25 09:16:54','USER_LOGIN_FAILED',1,'2013-02-25 10:16:54',NULL,'Identificadors d&#039;usuari o contrasenya incorrectes - login=gfdg','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(448,'2013-02-25 09:17:53','USER_LOGIN',1,'2013-02-25 10:17:53',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(449,'2013-02-25 09:18:37','USER_LOGOUT',1,'2013-02-25 10:18:37',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(450,'2013-02-25 09:18:41','USER_LOGIN',1,'2013-02-25 10:18:41',4,'(UserLogged,aaa)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(451,'2013-02-25 09:18:47','USER_LOGOUT',1,'2013-02-25 10:18:47',4,'(UserLogoff,aaa)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(452,'2013-02-25 10:05:34','USER_LOGIN',1,'2013-02-25 11:05:34',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(453,'2013-02-26 21:51:40','USER_LOGIN',1,'2013-02-26 22:51:40',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(454,'2013-02-26 23:30:06','USER_LOGIN',1,'2013-02-27 00:30:06',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(455,'2013-02-27 14:13:11','USER_LOGIN',1,'2013-02-27 15:13:11',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(456,'2013-02-27 18:12:06','USER_LOGIN_FAILED',1,'2013-02-27 19:12:06',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(457,'2013-02-27 18:12:10','USER_LOGIN',1,'2013-02-27 19:12:10',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(458,'2013-02-27 20:20:08','USER_LOGIN',1,'2013-02-27 21:20:08',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(459,'2013-03-01 22:12:03','USER_LOGIN',1,'2013-03-01 23:12:03',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(460,'2013-03-02 11:45:50','USER_LOGIN',1,'2013-03-02 12:45:50',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(461,'2013-03-02 15:53:51','USER_LOGIN_FAILED',1,'2013-03-02 16:53:51',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(462,'2013-03-02 15:53:53','USER_LOGIN',1,'2013-03-02 16:53:53',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(463,'2013-03-02 18:32:32','USER_LOGIN',1,'2013-03-02 19:32:32',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(464,'2013-03-02 22:59:36','USER_LOGIN',1,'2013-03-02 23:59:36',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(465,'2013-03-03 16:26:26','USER_LOGIN',1,'2013-03-03 17:26:26',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(466,'2013-03-03 22:50:27','USER_LOGIN',1,'2013-03-03 23:50:27',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(467,'2013-03-04 08:29:27','USER_LOGIN',1,'2013-03-04 09:29:27',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(468,'2013-03-04 18:27:28','USER_LOGIN',1,'2013-03-04 19:27:28',1,'(UserLogged,admin)','192.168.0.254','Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; WOW64; Trident/5.0; NP06)',NULL),(469,'2013-03-04 19:27:23','USER_LOGIN',1,'2013-03-04 20:27:23',1,'(UserLogged,admin)','192.168.0.254','Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1)',NULL),(470,'2013-03-04 19:35:14','USER_LOGIN',1,'2013-03-04 20:35:14',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(471,'2013-03-04 19:55:49','USER_LOGIN',1,'2013-03-04 20:55:49',1,'(UserLogged,admin)','192.168.0.254','Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 5.1; Trident/4.0)',NULL),(472,'2013-03-04 21:16:13','USER_LOGIN',1,'2013-03-04 22:16:13',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(473,'2013-03-05 10:17:30','USER_LOGIN',1,'2013-03-05 11:17:30',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(474,'2013-03-05 11:02:43','USER_LOGIN',1,'2013-03-05 12:02:43',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(475,'2013-03-05 23:14:39','USER_LOGIN',1,'2013-03-06 00:14:39',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(476,'2013-03-06 08:58:57','USER_LOGIN',1,'2013-03-06 09:58:57',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(477,'2013-03-06 14:29:40','USER_LOGIN',1,'2013-03-06 15:29:40',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(478,'2013-03-06 21:53:02','USER_LOGIN',1,'2013-03-06 22:53:02',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(479,'2013-03-07 21:14:39','USER_LOGIN',1,'2013-03-07 22:14:39',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(480,'2013-03-08 00:06:05','USER_LOGIN',1,'2013-03-08 01:06:05',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(481,'2013-03-08 01:38:13','USER_LOGIN',1,'2013-03-08 02:38:13',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(482,'2013-03-08 08:59:50','USER_LOGIN',1,'2013-03-08 09:59:50',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(483,'2013-03-09 12:08:51','USER_LOGIN',1,'2013-03-09 13:08:51',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(484,'2013-03-09 15:19:53','USER_LOGIN',1,'2013-03-09 16:19:53',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(495,'2013-03-09 18:06:21','USER_LOGIN',1,'2013-03-09 19:06:21',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(496,'2013-03-09 20:01:24','USER_LOGIN',1,'2013-03-09 21:01:24',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(497,'2013-03-09 23:36:45','USER_LOGIN',1,'2013-03-10 00:36:45',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(498,'2013-03-10 14:37:13','USER_LOGIN',1,'2013-03-10 15:37:13',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(499,'2013-03-10 17:54:12','USER_LOGIN',1,'2013-03-10 18:54:12',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(500,'2013-03-11 08:57:09','USER_LOGIN',1,'2013-03-11 09:57:09',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(501,'2013-03-11 22:05:13','USER_LOGIN',1,'2013-03-11 23:05:13',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(502,'2013-03-12 08:34:27','USER_LOGIN',1,'2013-03-12 09:34:27',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(503,'2013-03-13 09:11:02','USER_LOGIN',1,'2013-03-13 10:11:02',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(504,'2013-03-13 10:02:11','USER_LOGIN',1,'2013-03-13 11:02:11',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(505,'2013-03-13 13:20:58','USER_LOGIN',1,'2013-03-13 14:20:58',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(506,'2013-03-13 16:19:28','USER_LOGIN',1,'2013-03-13 17:19:28',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(507,'2013-03-13 18:34:30','USER_LOGIN',1,'2013-03-13 19:34:30',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(508,'2013-03-14 08:25:02','USER_LOGIN',1,'2013-03-14 09:25:02',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(509,'2013-03-14 19:15:22','USER_LOGIN',1,'2013-03-14 20:15:22',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(510,'2013-03-14 21:58:53','USER_LOGIN',1,'2013-03-14 22:58:53',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(511,'2013-03-14 21:58:59','USER_LOGOUT',1,'2013-03-14 22:58:59',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(512,'2013-03-14 21:59:07','USER_LOGIN',1,'2013-03-14 22:59:07',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(513,'2013-03-14 22:58:22','USER_LOGOUT',1,'2013-03-14 23:58:22',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(514,'2013-03-14 23:00:25','USER_LOGIN',1,'2013-03-15 00:00:25',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(515,'2013-03-16 12:14:28','USER_LOGIN',1,'2013-03-16 13:14:28',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(516,'2013-03-16 16:09:01','USER_LOGIN',1,'2013-03-16 17:09:01',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(517,'2013-03-16 16:57:11','USER_LOGIN',1,'2013-03-16 17:57:11',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(518,'2013-03-16 19:31:31','USER_LOGIN',1,'2013-03-16 20:31:31',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(519,'2013-03-17 17:44:39','USER_LOGIN',1,'2013-03-17 18:44:39',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(520,'2013-03-17 20:40:57','USER_LOGIN',1,'2013-03-17 21:40:57',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(521,'2013-03-17 23:14:05','USER_LOGIN',1,'2013-03-18 00:14:05',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(522,'2013-03-17 23:28:47','USER_LOGOUT',1,'2013-03-18 00:28:47',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(523,'2013-03-17 23:28:54','USER_LOGIN',1,'2013-03-18 00:28:54',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(524,'2013-03-18 17:37:30','USER_LOGIN',1,'2013-03-18 18:37:30',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(525,'2013-03-18 18:11:37','USER_LOGIN',1,'2013-03-18 19:11:37',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(526,'2013-03-19 08:35:08','USER_LOGIN',1,'2013-03-19 09:35:08',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(527,'2013-03-19 09:20:23','USER_LOGIN',1,'2013-03-19 10:20:23',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(528,'2013-03-20 13:17:13','USER_LOGIN',1,'2013-03-20 14:17:13',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(529,'2013-03-20 14:44:31','USER_LOGIN',1,'2013-03-20 15:44:31',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(530,'2013-03-20 18:24:25','USER_LOGIN',1,'2013-03-20 19:24:25',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(531,'2013-03-20 19:15:54','USER_LOGIN',1,'2013-03-20 20:15:54',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(532,'2013-03-21 18:40:47','USER_LOGIN',1,'2013-03-21 19:40:47',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(533,'2013-03-21 21:42:24','USER_LOGIN',1,'2013-03-21 22:42:24',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(534,'2013-03-22 08:39:23','USER_LOGIN',1,'2013-03-22 09:39:23',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(535,'2013-03-23 13:04:55','USER_LOGIN',1,'2013-03-23 14:04:55',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(536,'2013-03-23 15:47:43','USER_LOGIN',1,'2013-03-23 16:47:43',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(537,'2013-03-23 22:56:36','USER_LOGIN',1,'2013-03-23 23:56:36',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(538,'2013-03-24 01:22:32','USER_LOGIN',1,'2013-03-24 02:22:32',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(539,'2013-03-24 14:40:42','USER_LOGIN',1,'2013-03-24 15:40:42',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(540,'2013-03-24 15:30:26','USER_LOGOUT',1,'2013-03-24 16:30:26',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(541,'2013-03-24 15:30:29','USER_LOGIN',1,'2013-03-24 16:30:29',2,'(UserLogged,demo)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(542,'2013-03-24 15:49:40','USER_LOGOUT',1,'2013-03-24 16:49:40',2,'(UserLogoff,demo)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(543,'2013-03-24 15:49:48','USER_LOGIN',1,'2013-03-24 16:49:48',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(544,'2013-03-24 15:52:35','USER_MODIFY',1,'2013-03-24 16:52:35',1,'Modification utilisateur zzzg','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(545,'2013-03-24 15:52:52','USER_MODIFY',1,'2013-03-24 16:52:52',1,'Modification utilisateur zzzg','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(546,'2013-03-24 15:53:09','USER_MODIFY',1,'2013-03-24 16:53:09',1,'Modification utilisateur zzzg','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(547,'2013-03-24 15:53:23','USER_MODIFY',1,'2013-03-24 16:53:23',1,'Modification utilisateur zzzg','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(548,'2013-03-24 16:00:04','USER_MODIFY',1,'2013-03-24 17:00:04',1,'Modification utilisateur zzzg','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(549,'2013-03-24 16:01:50','USER_MODIFY',1,'2013-03-24 17:01:50',1,'Modification utilisateur zzzg','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(550,'2013-03-24 16:10:14','USER_MODIFY',1,'2013-03-24 17:10:14',1,'Modification utilisateur zzzg','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(551,'2013-03-24 16:55:13','USER_LOGIN',1,'2013-03-24 17:55:13',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(552,'2013-03-24 17:44:29','USER_LOGIN',1,'2013-03-24 18:44:29',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(553,'2013-09-08 23:06:26','USER_LOGIN',1,'2013-09-09 01:06:26',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/29.0.1547.57 Safari/537.36',NULL),(554,'2013-10-21 22:32:28','USER_LOGIN',1,'2013-10-22 00:32:28',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/30.0.1599.66 Safari/537.36',NULL),(555,'2013-10-21 22:32:48','USER_LOGIN',1,'2013-10-22 00:32:48',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/30.0.1599.66 Safari/537.36',NULL),(556,'2013-11-07 00:01:51','USER_LOGIN',1,'2013-11-07 01:01:51',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/30.0.1599.114 Safari/537.36',NULL),(557,'2014-03-02 15:21:07','USER_LOGIN',1,'2014-03-02 16:21:07',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/33.0.1750.117 Safari/537.36',NULL),(558,'2014-03-02 15:36:53','USER_LOGIN',1,'2014-03-02 16:36:53',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/33.0.1750.117 Safari/537.36',NULL),(559,'2014-03-02 18:54:23','USER_LOGIN',1,'2014-03-02 19:54:23',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/33.0.1750.117 Safari/537.36',NULL),(560,'2014-03-02 19:11:17','USER_LOGIN',1,'2014-03-02 20:11:17',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/33.0.1750.117 Safari/537.36',NULL),(561,'2014-03-03 18:19:24','USER_LOGIN',1,'2014-03-03 19:19:24',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/33.0.1750.117 Safari/537.36',NULL),(562,'2014-12-21 12:51:38','USER_LOGIN',1,'2014-12-21 13:51:38',1,'(UserLogged,admin) - TZ=1;TZString=CET;Screen=1920x969','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/38.0.2125.111 Safari/537.36',NULL),(563,'2014-12-21 19:52:09','USER_LOGIN',1,'2014-12-21 20:52:09',1,'(UserLogged,admin) - TZ=1;TZString=CET;Screen=1920x969','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/38.0.2125.111 Safari/537.36',NULL),(566,'2015-10-03 08:49:43','USER_NEW_PASSWORD',1,'2015-10-03 10:49:43',1,'Password change for admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(567,'2015-10-03 08:49:43','USER_MODIFY',1,'2015-10-03 10:49:43',1,'User admin modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(568,'2015-10-03 09:03:12','USER_MODIFY',1,'2015-10-03 11:03:12',1,'User admin modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(569,'2015-10-03 09:03:42','USER_MODIFY',1,'2015-10-03 11:03:42',1,'User admin modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(570,'2015-10-03 09:07:36','USER_MODIFY',1,'2015-10-03 11:07:36',1,'User demo modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(571,'2015-10-03 09:08:58','USER_NEW_PASSWORD',1,'2015-10-03 11:08:58',1,'Password change for pcurie','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(572,'2015-10-03 09:08:58','USER_MODIFY',1,'2015-10-03 11:08:58',1,'User pcurie modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(573,'2015-10-03 09:09:23','USER_MODIFY',1,'2015-10-03 11:09:23',1,'User pcurie modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(574,'2015-10-03 09:11:04','USER_NEW_PASSWORD',1,'2015-10-03 11:11:04',1,'Password change for athestudent','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(575,'2015-10-03 09:11:04','USER_MODIFY',1,'2015-10-03 11:11:04',1,'User athestudent modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(576,'2015-10-03 09:11:53','USER_MODIFY',1,'2015-10-03 11:11:53',1,'User abookkeeper modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(577,'2015-10-03 09:42:12','USER_LOGIN_FAILED',1,'2015-10-03 11:42:11',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(578,'2015-10-03 09:42:19','USER_LOGIN_FAILED',1,'2015-10-03 11:42:19',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(579,'2015-10-03 09:42:42','USER_LOGIN_FAILED',1,'2015-10-03 11:42:42',NULL,'Bad value for login or password - login=aeinstein','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(580,'2015-10-03 09:43:50','USER_LOGIN',1,'2015-10-03 11:43:50',1,'(UserLogged,admin) - TZ=1;TZString=Europe/Berlin;Screen=1600x788','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(581,'2015-10-03 09:44:44','GROUP_MODIFY',1,'2015-10-03 11:44:44',1,'Group Sale representatives modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(582,'2015-10-03 09:46:25','GROUP_CREATE',1,'2015-10-03 11:46:25',1,'Group Management created','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(583,'2015-10-03 09:46:46','GROUP_CREATE',1,'2015-10-03 11:46:46',1,'Group Scientists created','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(584,'2015-10-03 09:47:41','USER_CREATE',1,'2015-10-03 11:47:41',1,'User mcurie created','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(585,'2015-10-03 09:47:41','USER_NEW_PASSWORD',1,'2015-10-03 11:47:41',1,'Password change for mcurie','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(586,'2015-10-03 09:47:53','USER_MODIFY',1,'2015-10-03 11:47:53',1,'User mcurie modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(587,'2015-10-03 09:48:32','USER_DELETE',1,'2015-10-03 11:48:32',1,'User bbb removed','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(588,'2015-10-03 09:48:52','USER_MODIFY',1,'2015-10-03 11:48:52',1,'User bookkeeper modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(589,'2015-10-03 10:01:28','USER_MODIFY',1,'2015-10-03 12:01:28',1,'User bookkeeper modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(590,'2015-10-03 10:01:39','USER_MODIFY',1,'2015-10-03 12:01:39',1,'User bookkeeper modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(591,'2015-10-05 06:32:38','USER_LOGIN_FAILED',1,'2015-10-05 08:32:38',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(592,'2015-10-05 06:32:44','USER_LOGIN',1,'2015-10-05 08:32:44',1,'(UserLogged,admin) - TZ=1;TZString=Europe/Berlin;Screen=1590x767','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(593,'2015-10-05 07:07:52','USER_CREATE',1,'2015-10-05 09:07:52',1,'User atheceo created','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(594,'2015-10-05 07:07:52','USER_NEW_PASSWORD',1,'2015-10-05 09:07:52',1,'Password change for atheceo','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(595,'2015-10-05 07:09:08','USER_NEW_PASSWORD',1,'2015-10-05 09:09:08',1,'Password change for aeinstein','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(596,'2015-10-05 07:09:08','USER_MODIFY',1,'2015-10-05 09:09:08',1,'User aeinstein modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(597,'2015-10-05 07:09:46','USER_CREATE',1,'2015-10-05 09:09:46',1,'User admin created','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(598,'2015-10-05 07:09:46','USER_NEW_PASSWORD',1,'2015-10-05 09:09:46',1,'Password change for admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(599,'2015-10-05 07:10:20','USER_MODIFY',1,'2015-10-05 09:10:20',1,'User demo modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(600,'2015-10-05 07:10:48','USER_MODIFY',1,'2015-10-05 09:10:48',1,'User admin modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(601,'2015-10-05 07:11:22','USER_NEW_PASSWORD',1,'2015-10-05 09:11:22',1,'Password change for bbookkeeper','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(602,'2015-10-05 07:11:22','USER_MODIFY',1,'2015-10-05 09:11:22',1,'User bbookkeeper modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(603,'2015-10-05 07:12:37','USER_MODIFY',1,'2015-10-05 09:12:37',1,'User admin modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(604,'2015-10-05 07:13:27','USER_MODIFY',1,'2015-10-05 09:13:27',1,'User demo modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(605,'2015-10-05 07:13:52','USER_MODIFY',1,'2015-10-05 09:13:52',1,'User admin modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(606,'2015-10-05 07:14:35','USER_LOGOUT',1,'2015-10-05 09:14:35',1,'(UserLogoff,aeinstein)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(607,'2015-10-05 07:14:40','USER_LOGIN_FAILED',1,'2015-10-05 09:14:40',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(608,'2015-10-05 07:14:44','USER_LOGIN_FAILED',1,'2015-10-05 09:14:44',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(609,'2015-10-05 07:14:49','USER_LOGIN',1,'2015-10-05 09:14:49',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Berlin;Screen=1590x767','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(610,'2015-10-05 07:57:18','USER_MODIFY',1,'2015-10-05 09:57:18',12,'User aeinstein modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(611,'2015-10-05 08:06:54','USER_LOGOUT',1,'2015-10-05 10:06:54',12,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(612,'2015-10-05 08:07:03','USER_LOGIN',1,'2015-10-05 10:07:03',11,'(UserLogged,atheceo) - TZ=1;TZString=Europe/Berlin;Screen=1590x767','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(613,'2015-10-05 19:18:46','USER_LOGIN',1,'2015-10-05 21:18:46',11,'(UserLogged,atheceo) - TZ=1;TZString=Europe/Berlin;Screen=1590x767','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(614,'2015-10-05 19:29:35','USER_CREATE',1,'2015-10-05 21:29:35',11,'User ccommercy created','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(615,'2015-10-05 19:29:35','USER_NEW_PASSWORD',1,'2015-10-05 21:29:35',11,'Password change for ccommercy','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(616,'2015-10-05 19:30:13','GROUP_CREATE',1,'2015-10-05 21:30:13',11,'Group Commercial created','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(617,'2015-10-05 19:31:37','USER_NEW_PASSWORD',1,'2015-10-05 21:31:37',11,'Password change for admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(618,'2015-10-05 19:31:37','USER_MODIFY',1,'2015-10-05 21:31:37',11,'User admin modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(619,'2015-10-05 19:32:00','USER_MODIFY',1,'2015-10-05 21:32:00',11,'User admin modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(620,'2015-10-05 19:33:33','USER_CREATE',1,'2015-10-05 21:33:33',11,'User sscientol created','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(621,'2015-10-05 19:33:33','USER_NEW_PASSWORD',1,'2015-10-05 21:33:33',11,'Password change for sscientol','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(622,'2015-10-05 19:33:47','USER_NEW_PASSWORD',1,'2015-10-05 21:33:47',11,'Password change for mcurie','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(623,'2015-10-05 19:33:47','USER_MODIFY',1,'2015-10-05 21:33:47',11,'User mcurie modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(624,'2015-10-05 19:34:23','USER_NEW_PASSWORD',1,'2015-10-05 21:34:23',11,'Password change for pcurie','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(625,'2015-10-05 19:34:23','USER_MODIFY',1,'2015-10-05 21:34:23',11,'User pcurie modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(626,'2015-10-05 19:34:42','USER_MODIFY',1,'2015-10-05 21:34:42',11,'User aeinstein modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(627,'2015-10-05 19:36:06','USER_NEW_PASSWORD',1,'2015-10-05 21:36:06',11,'Password change for ccommercy','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(628,'2015-10-05 19:36:06','USER_MODIFY',1,'2015-10-05 21:36:06',11,'User ccommercy modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(629,'2015-10-05 19:36:57','USER_NEW_PASSWORD',1,'2015-10-05 21:36:57',11,'Password change for atheceo','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(630,'2015-10-05 19:36:57','USER_MODIFY',1,'2015-10-05 21:36:57',11,'User atheceo modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(631,'2015-10-05 19:37:27','USER_LOGOUT',1,'2015-10-05 21:37:27',11,'(UserLogoff,atheceo)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(632,'2015-10-05 19:37:35','USER_LOGIN_FAILED',1,'2015-10-05 21:37:35',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(633,'2015-10-05 19:37:39','USER_LOGIN_FAILED',1,'2015-10-05 21:37:39',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(634,'2015-10-05 19:37:44','USER_LOGIN_FAILED',1,'2015-10-05 21:37:44',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(635,'2015-10-05 19:37:49','USER_LOGIN_FAILED',1,'2015-10-05 21:37:49',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(636,'2015-10-05 19:38:12','USER_LOGIN_FAILED',1,'2015-10-05 21:38:12',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(637,'2015-10-05 19:40:48','USER_LOGIN_FAILED',1,'2015-10-05 21:40:48',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(638,'2015-10-05 19:40:55','USER_LOGIN',1,'2015-10-05 21:40:55',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Berlin;Screen=1590x767','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(639,'2015-10-05 19:43:34','USER_MODIFY',1,'2015-10-05 21:43:34',12,'User aeinstein modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(640,'2015-10-05 19:45:43','USER_CREATE',1,'2015-10-05 21:45:43',12,'User aaa created','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(641,'2015-10-05 19:45:43','USER_NEW_PASSWORD',1,'2015-10-05 21:45:43',12,'Password change for aaa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(642,'2015-10-05 19:46:18','USER_DELETE',1,'2015-10-05 21:46:18',12,'User aaa removed','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(643,'2015-10-05 19:47:09','USER_MODIFY',1,'2015-10-05 21:47:09',12,'User demo modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(644,'2015-10-05 19:47:22','USER_MODIFY',1,'2015-10-05 21:47:22',12,'User demo modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(645,'2015-10-05 19:52:05','USER_MODIFY',1,'2015-10-05 21:52:05',12,'User sscientol modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(646,'2015-10-05 19:52:23','USER_MODIFY',1,'2015-10-05 21:52:23',12,'User bbookkeeper modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(647,'2015-10-05 19:54:54','USER_NEW_PASSWORD',1,'2015-10-05 21:54:54',12,'Password change for zzeceo','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(648,'2015-10-05 19:54:54','USER_MODIFY',1,'2015-10-05 21:54:54',12,'User zzeceo modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(649,'2015-10-05 19:57:02','USER_MODIFY',1,'2015-10-05 21:57:02',12,'User zzeceo modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(650,'2015-10-05 19:57:57','USER_NEW_PASSWORD',1,'2015-10-05 21:57:57',12,'Password change for pcurie','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(651,'2015-10-05 19:57:57','USER_MODIFY',1,'2015-10-05 21:57:57',12,'User pcurie modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(652,'2015-10-05 19:59:42','USER_NEW_PASSWORD',1,'2015-10-05 21:59:42',12,'Password change for admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(653,'2015-10-05 19:59:42','USER_MODIFY',1,'2015-10-05 21:59:42',12,'User admin modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(654,'2015-10-05 20:00:21','USER_MODIFY',1,'2015-10-05 22:00:21',12,'User adminx modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(655,'2015-10-05 20:05:36','USER_MODIFY',1,'2015-10-05 22:05:36',12,'User admin modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(656,'2015-10-05 20:06:25','USER_MODIFY',1,'2015-10-05 22:06:25',12,'User ccommercy modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(657,'2015-10-05 20:07:18','USER_MODIFY',1,'2015-10-05 22:07:18',12,'User mcurie modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(658,'2015-10-05 20:07:36','USER_MODIFY',1,'2015-10-05 22:07:36',12,'User aeinstein modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(659,'2015-10-05 20:08:34','USER_MODIFY',1,'2015-10-05 22:08:34',12,'User bbookkeeper modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(660,'2015-10-05 20:47:52','USER_CREATE',1,'2015-10-05 22:47:52',12,'User cc1 created','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(661,'2015-10-05 20:47:52','USER_NEW_PASSWORD',1,'2015-10-05 22:47:52',12,'Password change for cc1','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(662,'2015-10-05 20:47:55','USER_LOGOUT',1,'2015-10-05 22:47:55',12,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(663,'2015-10-05 20:48:08','USER_LOGIN',1,'2015-10-05 22:48:08',11,'(UserLogged,zzeceo) - TZ=1;TZString=Europe/Berlin;Screen=1590x434','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(664,'2015-10-05 20:48:39','USER_CREATE',1,'2015-10-05 22:48:39',11,'User cc2 created','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(665,'2015-10-05 20:48:39','USER_NEW_PASSWORD',1,'2015-10-05 22:48:39',11,'Password change for cc2','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(666,'2015-10-05 20:48:59','USER_NEW_PASSWORD',1,'2015-10-05 22:48:59',11,'Password change for cc1','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(667,'2015-10-05 20:48:59','USER_MODIFY',1,'2015-10-05 22:48:59',11,'User cc1 modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(668,'2015-10-05 21:06:36','USER_LOGOUT',1,'2015-10-05 23:06:35',11,'(UserLogoff,zzeceo)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(669,'2015-10-05 21:06:44','USER_LOGIN_FAILED',1,'2015-10-05 23:06:44',NULL,'Bad value for login or password - login=cc1','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(670,'2015-10-05 21:07:12','USER_LOGIN_FAILED',1,'2015-10-05 23:07:12',NULL,'Bad value for login or password - login=cc1','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(671,'2015-10-05 21:07:19','USER_LOGIN_FAILED',1,'2015-10-05 23:07:19',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(672,'2015-10-05 21:07:27','USER_LOGIN_FAILED',1,'2015-10-05 23:07:27',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(673,'2015-10-05 21:07:32','USER_LOGIN',1,'2015-10-05 23:07:32',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Berlin;Screen=1590x767','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(674,'2015-10-05 21:12:28','USER_NEW_PASSWORD',1,'2015-10-05 23:12:28',12,'Password change for cc1','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(675,'2015-10-05 21:12:28','USER_MODIFY',1,'2015-10-05 23:12:28',12,'User cc1 modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(676,'2015-10-05 21:13:00','USER_CREATE',1,'2015-10-05 23:13:00',12,'User aaa created','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(677,'2015-10-05 21:13:00','USER_NEW_PASSWORD',1,'2015-10-05 23:13:00',12,'Password change for aaa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(678,'2015-10-05 21:13:40','USER_DELETE',1,'2015-10-05 23:13:40',12,'User aaa removed','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(679,'2015-10-05 21:14:47','USER_LOGOUT',1,'2015-10-05 23:14:47',12,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(680,'2015-10-05 21:14:56','USER_LOGIN',1,'2015-10-05 23:14:56',16,'(UserLogged,cc1) - TZ=1;TZString=Europe/Berlin;Screen=1590x767','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(681,'2015-10-05 21:15:56','USER_LOGOUT',1,'2015-10-05 23:15:56',16,'(UserLogoff,cc1)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(682,'2015-10-05 21:16:06','USER_LOGIN',1,'2015-10-05 23:16:06',17,'(UserLogged,cc2) - TZ=1;TZString=Europe/Berlin;Screen=1590x767','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(683,'2015-10-05 21:37:25','USER_LOGOUT',1,'2015-10-05 23:37:25',17,'(UserLogoff,cc2)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(684,'2015-10-05 21:37:31','USER_LOGIN',1,'2015-10-05 23:37:31',16,'(UserLogged,cc1) - TZ=1;TZString=Europe/Berlin;Screen=1590x767','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(685,'2015-10-05 21:43:53','USER_LOGOUT',1,'2015-10-05 23:43:53',16,'(UserLogoff,cc1)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(686,'2015-10-05 21:44:00','USER_LOGIN',1,'2015-10-05 23:44:00',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Berlin;Screen=1590x767','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(687,'2015-10-05 21:46:17','USER_LOGOUT',1,'2015-10-05 23:46:17',12,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(688,'2015-10-05 21:46:24','USER_LOGIN',1,'2015-10-05 23:46:24',16,'(UserLogged,cc1) - TZ=1;TZString=Europe/Berlin;Screen=1590x767','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(689,'2015-11-04 15:17:06','USER_LOGIN',1,'2015-11-04 16:17:06',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Berlin;Screen=1600x790','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL),(690,'2015-11-15 22:04:04','USER_LOGIN',1,'2015-11-15 23:04:04',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Berlin;Screen=1600x790','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL),(691,'2015-11-15 22:23:45','USER_MODIFY',1,'2015-11-15 23:23:45',12,'User ccommercy modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL),(692,'2015-11-15 22:24:22','USER_MODIFY',1,'2015-11-15 23:24:22',12,'User cc1 modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL),(693,'2015-11-15 22:24:53','USER_MODIFY',1,'2015-11-15 23:24:53',12,'User cc2 modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL),(694,'2015-11-15 22:25:17','USER_MODIFY',1,'2015-11-15 23:25:17',12,'User cc1 modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL),(695,'2015-11-15 22:45:37','USER_LOGOUT',1,'2015-11-15 23:45:37',12,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL),(696,'2015-11-18 13:41:02','USER_LOGIN',1,'2015-11-18 14:41:02',2,'(UserLogged,demo) - TZ=1;TZString=Europe/Berlin;Screen=1600x790','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL),(697,'2015-11-18 14:23:35','USER_LOGIN',1,'2015-11-18 15:23:35',2,'(UserLogged,demo) - TZ=1;TZString=Europe/Berlin;Screen=1600x790','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL),(698,'2015-11-18 15:15:46','USER_LOGOUT',1,'2015-11-18 16:15:46',2,'(UserLogoff,demo)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL),(699,'2015-11-18 15:15:51','USER_LOGIN',1,'2015-11-18 16:15:51',2,'(UserLogged,demo) - TZ=1;TZString=Europe/Berlin;Screen=1600x790','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL),(700,'2015-11-30 17:52:08','USER_LOGIN',1,'2015-11-30 18:52:08',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Berlin;Screen=1600x790','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL),(701,'2016-01-10 16:45:43','USER_LOGIN',1,'2016-01-10 17:45:43',2,'(UserLogged,demo) - TZ=1;TZString=Europe/Berlin;Screen=1600x790','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL),(702,'2016-01-10 16:45:52','USER_LOGOUT',1,'2016-01-10 17:45:52',2,'(UserLogoff,demo)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL),(703,'2016-01-10 16:46:06','USER_LOGIN',1,'2016-01-10 17:46:06',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Berlin;Screen=1600x790','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL),(704,'2016-01-16 14:53:47','USER_LOGIN',1,'2016-01-16 15:53:47',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Berlin;Screen=1600x790','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL),(705,'2016-01-16 15:04:29','USER_LOGOUT',1,'2016-01-16 16:04:29',12,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL),(706,'2016-01-16 15:04:40','USER_LOGIN',1,'2016-01-16 16:04:40',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Berlin;Screen=1600x790','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL),(707,'2016-01-22 09:33:26','USER_LOGIN',1,'2016-01-22 10:33:26',2,'(UserLogged,demo) - TZ=1;TZString=Europe/Berlin;Screen=1600x790','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL),(708,'2016-01-22 09:35:19','USER_LOGOUT',1,'2016-01-22 10:35:19',2,'(UserLogoff,demo)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL),(709,'2016-01-22 09:35:29','USER_LOGIN',1,'2016-01-22 10:35:29',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Berlin;Screen=1600x790','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL),(710,'2016-01-22 10:47:34','USER_CREATE',1,'2016-01-22 11:47:34',12,'User aaa created','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL),(711,'2016-01-22 10:47:34','USER_NEW_PASSWORD',1,'2016-01-22 11:47:34',12,'Password change for aaa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL),(712,'2016-01-22 12:07:56','USER_LOGIN',1,'2016-01-22 13:07:56',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Berlin;Screen=1600x790','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL),(713,'2016-01-22 12:36:25','USER_NEW_PASSWORD',1,'2016-01-22 13:36:25',12,'Password change for admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL),(714,'2016-01-22 12:36:25','USER_MODIFY',1,'2016-01-22 13:36:25',12,'User admin modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL),(715,'2016-01-22 12:56:32','USER_MODIFY',1,'2016-01-22 13:56:32',12,'User admin modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL),(716,'2016-01-22 12:58:05','USER_MODIFY',1,'2016-01-22 13:58:05',12,'User admin modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL),(717,'2016-01-22 13:01:02','USER_MODIFY',1,'2016-01-22 14:01:02',12,'User admin modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL),(718,'2016-01-22 13:01:18','USER_MODIFY',1,'2016-01-22 14:01:18',12,'User admin modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL),(719,'2016-01-22 13:13:42','USER_MODIFY',1,'2016-01-22 14:13:42',12,'User admin modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL),(720,'2016-01-22 13:15:20','USER_DELETE',1,'2016-01-22 14:15:20',12,'User aaa removed','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL),(721,'2016-01-22 13:19:21','USER_LOGOUT',1,'2016-01-22 14:19:21',12,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL),(722,'2016-01-22 13:19:32','USER_LOGIN',1,'2016-01-22 14:19:32',2,'(UserLogged,demo) - TZ=1;TZString=Europe/Berlin;Screen=1600x790','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL),(723,'2016-01-22 13:19:51','USER_LOGOUT',1,'2016-01-22 14:19:51',2,'(UserLogoff,demo)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL),(724,'2016-01-22 13:20:01','USER_LOGIN',1,'2016-01-22 14:20:01',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Berlin;Screen=1600x790','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL),(725,'2016-01-22 13:28:22','USER_LOGOUT',1,'2016-01-22 14:28:22',12,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL),(726,'2016-01-22 13:28:35','USER_LOGIN',1,'2016-01-22 14:28:35',2,'(UserLogged,demo) - TZ=1;TZString=Europe/Berlin;Screen=1600x790','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL),(727,'2016-01-22 13:33:54','USER_LOGOUT',1,'2016-01-22 14:33:54',2,'(UserLogoff,demo)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL),(728,'2016-01-22 13:34:05','USER_LOGIN',1,'2016-01-22 14:34:05',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Berlin;Screen=1600x790','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL),(729,'2016-01-22 13:51:46','USER_MODIFY',1,'2016-01-22 14:51:46',12,'User ccommercy modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL),(730,'2016-01-22 16:20:12','USER_LOGIN',1,'2016-01-22 17:20:12',2,'(UserLogged,demo) - TZ=1;TZString=Europe/Berlin;Screen=1600x790','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.82 Safari/537.36',NULL),(731,'2016-01-22 16:20:22','USER_LOGOUT',1,'2016-01-22 17:20:22',2,'(UserLogoff,demo)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.82 Safari/537.36',NULL),(732,'2016-01-22 16:20:36','USER_LOGIN',1,'2016-01-22 17:20:36',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Berlin;Screen=1600x790','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.82 Safari/537.36',NULL),(733,'2016-01-22 16:27:02','USER_CREATE',1,'2016-01-22 17:27:02',12,'User ldestailleur created','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.82 Safari/537.36',NULL),(734,'2016-01-22 16:27:02','USER_NEW_PASSWORD',1,'2016-01-22 17:27:02',12,'Password change for ldestailleur','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.82 Safari/537.36',NULL),(735,'2016-01-22 16:28:34','USER_MODIFY',1,'2016-01-22 17:28:34',12,'User ldestailleur modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.82 Safari/537.36',NULL),(736,'2016-01-22 16:30:01','USER_ENABLEDISABLE',1,'2016-01-22 17:30:01',12,'User cc2 activated','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.82 Safari/537.36',NULL),(737,'2016-01-22 17:11:06','USER_LOGIN',1,'2016-01-22 18:11:06',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Berlin;Screen=1600x790','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.82 Safari/537.36',NULL),(738,'2016-01-22 18:00:02','USER_DELETE',1,'2016-01-22 19:00:02',12,'User zzz removed','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.82 Safari/537.36',NULL),(739,'2016-01-22 18:01:40','USER_DELETE',1,'2016-01-22 19:01:40',12,'User aaab removed','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.82 Safari/537.36',NULL),(740,'2016-01-22 18:01:52','USER_DELETE',1,'2016-01-22 19:01:52',12,'User zzzg removed','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.82 Safari/537.36',NULL),(741,'2016-03-13 10:54:59','USER_LOGIN',1,'2016-03-13 14:54:59',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x971','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/49.0.2623.87 Safari/537.36',NULL),(742,'2016-07-30 11:13:10','USER_LOGIN',1,'2016-07-30 15:13:10',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL),(743,'2016-07-30 12:50:23','USER_CREATE',1,'2016-07-30 16:50:23',12,'User eldy created','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL),(744,'2016-07-30 12:50:23','USER_CREATE',1,'2016-07-30 16:50:23',12,'User eldy created','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL),(745,'2016-07-30 12:50:23','USER_NEW_PASSWORD',1,'2016-07-30 16:50:23',12,'Password change for eldy','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL),(746,'2016-07-30 12:50:38','USER_MODIFY',1,'2016-07-30 16:50:38',12,'User eldy modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL),(747,'2016-07-30 12:50:54','USER_DELETE',1,'2016-07-30 16:50:54',12,'User eldy removed','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL),(748,'2016-07-30 12:51:23','USER_NEW_PASSWORD',1,'2016-07-30 16:51:23',12,'Password change for ldestailleur','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL),(749,'2016-07-30 12:51:23','USER_MODIFY',1,'2016-07-30 16:51:23',12,'User ldestailleur modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL),(750,'2016-07-30 18:26:58','USER_LOGIN',1,'2016-07-30 22:26:58',18,'(UserLogged,ldestailleur) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL),(751,'2016-07-30 18:27:40','USER_LOGOUT',1,'2016-07-30 22:27:40',18,'(UserLogoff,ldestailleur)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL),(752,'2016-07-30 18:27:47','USER_LOGIN',1,'2016-07-30 22:27:47',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL),(753,'2016-07-30 19:00:00','USER_LOGOUT',1,'2016-07-30 23:00:00',12,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL),(754,'2016-07-30 19:00:04','USER_LOGIN',1,'2016-07-30 23:00:04',2,'(UserLogged,demo) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL),(755,'2016-07-30 19:00:14','USER_LOGOUT',1,'2016-07-30 23:00:14',2,'(UserLogoff,demo)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL),(756,'2016-07-30 19:00:19','USER_LOGIN',1,'2016-07-30 23:00:19',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL),(757,'2016-07-30 19:00:43','USER_LOGOUT',1,'2016-07-30 23:00:43',12,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL),(758,'2016-07-30 19:00:48','USER_LOGIN',1,'2016-07-30 23:00:48',2,'(UserLogged,demo) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL),(759,'2016-07-30 19:03:52','USER_LOGOUT',1,'2016-07-30 23:03:52',2,'(UserLogoff,demo)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL),(760,'2016-07-30 19:03:57','USER_LOGIN_FAILED',1,'2016-07-30 23:03:57',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL),(761,'2016-07-30 19:03:59','USER_LOGIN',1,'2016-07-30 23:03:59',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL),(762,'2016-07-30 19:04:13','USER_LOGOUT',1,'2016-07-30 23:04:13',12,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL),(763,'2016-07-30 19:04:17','USER_LOGIN',1,'2016-07-30 23:04:17',2,'(UserLogged,demo) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL),(764,'2016-07-30 19:04:26','USER_LOGOUT',1,'2016-07-30 23:04:26',2,'(UserLogoff,demo)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL),(765,'2016-07-30 19:04:31','USER_LOGIN',1,'2016-07-30 23:04:31',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL),(766,'2016-07-30 19:10:50','USER_LOGOUT',1,'2016-07-30 23:10:50',12,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL),(767,'2016-07-30 19:10:54','USER_LOGIN',1,'2016-07-30 23:10:54',2,'(UserLogged,demo) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL),(768,'2016-07-31 10:15:52','USER_LOGIN',1,'2016-07-31 14:15:52',12,'(UserLogged,admin) - TZ=;TZString=;Screen=x','127.0.0.1','Lynx/2.8.8pre.4 libwww-FM/2.14 SSL-MM/1.4.1 GNUTLS/2.12.23',NULL),(769,'2016-07-31 10:16:27','USER_LOGIN',1,'2016-07-31 14:16:27',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL),(770,'2016-07-31 10:32:14','USER_LOGIN',1,'2016-07-31 14:32:14',12,'(UserLogged,admin) - TZ=;TZString=;Screen=x','127.0.0.1','Lynx/2.8.8pre.4 libwww-FM/2.14 SSL-MM/1.4.1 GNUTLS/2.12.23',NULL),(771,'2016-07-31 10:36:28','USER_LOGIN',1,'2016-07-31 14:36:28',12,'(UserLogged,admin) - TZ=;TZString=;Screen=x','127.0.0.1','Links (2.8; Linux 3.19.0-46-generic x86_64; GNU C 4.8.2; text)',NULL),(772,'2016-07-31 10:40:10','USER_LOGIN',1,'2016-07-31 14:40:10',12,'(UserLogged,admin) - TZ=;TZString=;Screen=x','127.0.0.1','Links (2.8; Linux 3.19.0-46-generic x86_64; GNU C 4.8.2; text)',NULL),(773,'2016-07-31 10:54:16','USER_LOGIN',1,'2016-07-31 14:54:16',12,'(UserLogged,admin) - TZ=;TZString=;Screen=x','127.0.0.1','Lynx/2.8.8pre.4 libwww-FM/2.14 SSL-MM/1.4.1 GNUTLS/2.12.23',NULL),(774,'2016-07-31 12:52:52','USER_LOGIN',1,'2016-07-31 16:52:52',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x592','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL),(775,'2016-07-31 13:25:33','USER_LOGOUT',1,'2016-07-31 17:25:33',12,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL),(776,'2016-07-31 13:26:32','USER_LOGIN',1,'2016-07-31 17:26:32',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1280x751','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL),(777,'2016-07-31 14:13:57','USER_LOGOUT',1,'2016-07-31 18:13:57',12,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL),(778,'2016-07-31 14:14:04','USER_LOGIN',1,'2016-07-31 18:14:04',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL),(779,'2016-07-31 16:04:35','USER_LOGIN',1,'2016-07-31 20:04:34',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL),(780,'2016-07-31 21:14:14','USER_LOGIN',1,'2016-08-01 01:14:14',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL),(781,'2017-01-29 15:14:05','USER_LOGOUT',1,'2017-01-29 19:14:05',12,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36',NULL),(782,'2017-01-29 15:34:43','USER_LOGIN',1,'2017-01-29 19:34:43',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x571','192.168.0.254','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36',NULL),(783,'2017-01-29 15:35:04','USER_LOGOUT',1,'2017-01-29 19:35:04',12,'(UserLogoff,admin)','192.168.0.254','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36',NULL),(784,'2017-01-29 15:35:12','USER_LOGIN',1,'2017-01-29 19:35:12',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','192.168.0.254','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36',NULL),(785,'2017-01-29 15:36:43','USER_LOGOUT',1,'2017-01-29 19:36:43',12,'(UserLogoff,admin)','192.168.0.254','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36',NULL),(786,'2017-01-29 15:41:21','USER_LOGIN',1,'2017-01-29 19:41:21',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x571','192.168.0.254','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36',NULL),(787,'2017-01-29 15:41:41','USER_LOGOUT',1,'2017-01-29 19:41:41',12,'(UserLogoff,admin)','192.168.0.254','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36',NULL),(788,'2017-01-29 15:42:43','USER_LOGIN',1,'2017-01-29 19:42:43',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x571','192.168.0.254','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36',NULL),(789,'2017-01-29 15:43:18','USER_LOGOUT',1,'2017-01-29 19:43:18',12,'(UserLogoff,admin)','192.168.0.254','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36',NULL),(790,'2017-01-29 15:46:31','USER_LOGIN',1,'2017-01-29 19:46:31',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x571','192.168.0.254','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36',NULL),(791,'2017-01-29 16:18:56','USER_LOGIN',1,'2017-01-29 20:18:56',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Berlin;Screen=360x526','192.168.0.254','Mozilla/5.0 (Linux; Android 6.0; LG-H818 Build/MRA58K; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/55.0.2883.91 Mobile Safari/537.36 - DoliDroid - Android client pour Dolibarr ERP-CRM',NULL),(792,'2017-01-29 17:20:59','USER_LOGIN',1,'2017-01-29 21:20:59',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36',NULL),(793,'2017-01-30 11:19:40','USER_LOGIN',1,'2017-01-30 15:19:40',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36',NULL),(794,'2017-01-31 16:49:39','USER_LOGIN',1,'2017-01-31 20:49:39',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x520','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36',NULL),(795,'2017-02-01 10:55:23','USER_LOGIN',1,'2017-02-01 14:55:23',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36',NULL),(796,'2017-02-01 13:34:31','USER_LOGIN',1,'2017-02-01 17:34:31',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36',NULL),(797,'2017-02-01 14:41:26','USER_LOGIN',1,'2017-02-01 18:41:26',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36',NULL),(798,'2017-02-01 23:51:48','USER_LOGIN_FAILED',1,'2017-02-02 03:51:48',NULL,'Bad value for login or password - login=autologin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36',NULL),(799,'2017-02-01 23:52:55','USER_LOGIN',1,'2017-02-02 03:52:55',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36',NULL),(800,'2017-02-01 23:55:45','USER_CREATE',1,'2017-02-02 03:55:45',12,'User aboston created','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36',NULL),(801,'2017-02-01 23:55:45','USER_NEW_PASSWORD',1,'2017-02-02 03:55:45',12,'Password change for aboston','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36',NULL),(802,'2017-02-01 23:56:38','USER_MODIFY',1,'2017-02-02 03:56:38',12,'User aboston modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36',NULL),(803,'2017-02-01 23:56:50','USER_MODIFY',1,'2017-02-02 03:56:50',12,'User aboston modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36',NULL),(804,'2017-02-02 01:14:44','USER_LOGIN',1,'2017-02-02 05:14:44',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36',NULL),(805,'2017-02-03 10:27:18','USER_LOGIN',1,'2017-02-03 14:27:18',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL),(806,'2017-02-04 10:22:34','USER_LOGIN',1,'2017-02-04 14:22:34',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x489','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL),(807,'2017-02-06 04:01:31','USER_LOGIN',1,'2017-02-06 08:01:31',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL),(808,'2017-02-06 10:21:32','USER_LOGIN',1,'2017-02-06 14:21:32',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL),(809,'2017-02-06 19:09:27','USER_LOGIN',1,'2017-02-06 23:09:27',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL),(810,'2017-02-06 23:39:17','USER_LOGIN',1,'2017-02-07 03:39:17',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL),(811,'2017-02-07 11:36:34','USER_LOGIN',1,'2017-02-07 15:36:34',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x676','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL),(812,'2017-02-07 18:51:53','USER_LOGIN',1,'2017-02-07 22:51:53',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL),(813,'2017-02-07 23:13:40','USER_LOGIN',1,'2017-02-08 03:13:40',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL),(814,'2017-02-08 09:29:12','USER_LOGIN',1,'2017-02-08 13:29:12',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL),(815,'2017-02-08 17:33:12','USER_LOGIN',1,'2017-02-08 21:33:12',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL),(816,'2017-02-09 17:30:34','USER_LOGIN',1,'2017-02-09 21:30:34',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL),(817,'2017-02-10 09:30:02','USER_LOGIN',1,'2017-02-10 13:30:02',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL),(818,'2017-02-10 16:16:14','USER_LOGIN',1,'2017-02-10 20:16:14',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL),(819,'2017-02-10 17:28:15','USER_LOGIN',1,'2017-02-10 21:28:15',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL),(820,'2017-02-11 12:54:03','USER_LOGIN',1,'2017-02-11 16:54:03',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL),(821,'2017-02-11 17:23:52','USER_LOGIN',1,'2017-02-11 21:23:52',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL),(822,'2017-02-12 12:44:03','USER_LOGIN',1,'2017-02-12 16:44:03',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL),(823,'2017-02-12 16:42:13','USER_LOGIN',1,'2017-02-12 20:42:13',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL),(824,'2017-02-12 19:14:18','USER_LOGIN',1,'2017-02-12 23:14:18',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL),(825,'2017-02-15 17:17:00','USER_LOGIN',1,'2017-02-15 21:17:00',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL),(826,'2017-02-15 22:02:40','USER_LOGIN',1,'2017-02-16 02:02:40',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL),(827,'2017-02-16 22:13:27','USER_LOGIN',1,'2017-02-17 02:13:27',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x619','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL),(828,'2017-02-16 23:54:04','USER_LOGIN',1,'2017-02-17 03:54:04',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL),(829,'2017-02-17 09:14:27','USER_LOGIN',1,'2017-02-17 13:14:27',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL),(830,'2017-02-17 12:07:05','USER_LOGIN',1,'2017-02-17 16:07:05',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL),(831,'2017-02-19 21:22:20','USER_LOGIN',1,'2017-02-20 01:22:20',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL),(832,'2017-02-20 09:26:47','USER_LOGIN',1,'2017-02-20 13:26:47',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL),(833,'2017-02-20 16:39:55','USER_LOGIN',1,'2017-02-20 20:39:55',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL),(834,'2017-02-20 16:49:00','USER_MODIFY',1,'2017-02-20 20:49:00',12,'Modification utilisateur ccommerson','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL),(835,'2017-02-20 17:57:15','USER_LOGIN',1,'2017-02-20 21:57:14',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL),(836,'2017-02-20 19:43:48','USER_LOGIN',1,'2017-02-20 23:43:48',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL),(837,'2017-02-21 00:04:05','USER_LOGIN',1,'2017-02-21 04:04:05',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL),(838,'2017-02-21 10:23:13','USER_LOGIN',1,'2017-02-21 14:23:13',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL),(839,'2017-02-21 10:30:17','USER_LOGOUT',1,'2017-02-21 14:30:17',12,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL),(840,'2017-02-21 10:30:22','USER_LOGIN',1,'2017-02-21 14:30:22',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL),(841,'2017-02-21 11:44:05','USER_LOGIN',1,'2017-02-21 15:44:05',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL);
+INSERT INTO `llx_events` VALUES (30,'2011-07-18 18:23:06','USER_LOGOUT',1,'2011-07-18 20:23:06',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(31,'2011-07-18 18:23:12','USER_LOGIN_FAILED',1,'2011-07-18 20:23:12',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(32,'2011-07-18 18:23:17','USER_LOGIN',1,'2011-07-18 20:23:17',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(33,'2011-07-18 20:10:51','USER_LOGIN_FAILED',1,'2011-07-18 22:10:51',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(34,'2011-07-18 20:10:55','USER_LOGIN',1,'2011-07-18 22:10:55',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(35,'2011-07-18 21:18:57','USER_LOGIN',1,'2011-07-18 23:18:57',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(36,'2011-07-20 10:34:10','USER_LOGIN',1,'2011-07-20 12:34:10',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(37,'2011-07-20 12:36:44','USER_LOGIN',1,'2011-07-20 14:36:44',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(38,'2011-07-20 13:20:51','USER_LOGIN_FAILED',1,'2011-07-20 15:20:51',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(39,'2011-07-20 13:20:54','USER_LOGIN',1,'2011-07-20 15:20:54',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(40,'2011-07-20 15:03:46','USER_LOGIN_FAILED',1,'2011-07-20 17:03:46',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(41,'2011-07-20 15:03:55','USER_LOGIN',1,'2011-07-20 17:03:55',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(42,'2011-07-20 18:05:05','USER_LOGIN_FAILED',1,'2011-07-20 20:05:05',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(43,'2011-07-20 18:05:08','USER_LOGIN',1,'2011-07-20 20:05:08',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(44,'2011-07-20 21:08:53','USER_LOGIN_FAILED',1,'2011-07-20 23:08:53',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(45,'2011-07-20 21:08:56','USER_LOGIN',1,'2011-07-20 23:08:56',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(46,'2011-07-21 01:26:12','USER_LOGIN',1,'2011-07-21 03:26:12',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(47,'2011-07-21 22:35:45','USER_LOGIN_FAILED',1,'2011-07-22 00:35:45',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(48,'2011-07-21 22:35:49','USER_LOGIN',1,'2011-07-22 00:35:49',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(49,'2011-07-26 23:09:47','USER_LOGIN_FAILED',1,'2011-07-27 01:09:47',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(50,'2011-07-26 23:09:50','USER_LOGIN',1,'2011-07-27 01:09:50',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(51,'2011-07-27 17:02:27','USER_LOGIN_FAILED',1,'2011-07-27 19:02:27',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(52,'2011-07-27 17:02:32','USER_LOGIN',1,'2011-07-27 19:02:32',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(53,'2011-07-27 23:33:37','USER_LOGIN_FAILED',1,'2011-07-28 01:33:37',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(54,'2011-07-27 23:33:41','USER_LOGIN',1,'2011-07-28 01:33:41',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(55,'2011-07-28 18:20:36','USER_LOGIN_FAILED',1,'2011-07-28 20:20:36',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(56,'2011-07-28 18:20:38','USER_LOGIN',1,'2011-07-28 20:20:38',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(57,'2011-07-28 20:13:30','USER_LOGIN_FAILED',1,'2011-07-28 22:13:30',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(58,'2011-07-28 20:13:34','USER_LOGIN',1,'2011-07-28 22:13:34',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(59,'2011-07-28 20:22:51','USER_LOGIN',1,'2011-07-28 22:22:51',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(60,'2011-07-28 23:05:06','USER_LOGIN',1,'2011-07-29 01:05:06',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(61,'2011-07-29 20:15:50','USER_LOGIN_FAILED',1,'2011-07-29 22:15:50',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(62,'2011-07-29 20:15:53','USER_LOGIN',1,'2011-07-29 22:15:53',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(68,'2011-07-29 20:51:01','USER_LOGOUT',1,'2011-07-29 22:51:01',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(69,'2011-07-29 20:51:05','USER_LOGIN',1,'2011-07-29 22:51:05',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(70,'2011-07-30 08:46:20','USER_LOGIN_FAILED',1,'2011-07-30 10:46:20',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(71,'2011-07-30 08:46:38','USER_LOGIN_FAILED',1,'2011-07-30 10:46:38',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(72,'2011-07-30 08:46:42','USER_LOGIN',1,'2011-07-30 10:46:42',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(73,'2011-07-30 10:05:12','USER_LOGIN_FAILED',1,'2011-07-30 12:05:12',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(74,'2011-07-30 10:05:15','USER_LOGIN',1,'2011-07-30 12:05:15',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(75,'2011-07-30 12:15:46','USER_LOGIN',1,'2011-07-30 14:15:46',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(76,'2011-07-31 22:19:30','USER_LOGIN',1,'2011-08-01 00:19:30',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(77,'2011-07-31 23:32:52','USER_LOGIN',1,'2011-08-01 01:32:52',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(78,'2011-08-01 01:24:50','USER_LOGIN_FAILED',1,'2011-08-01 03:24:50',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(79,'2011-08-01 01:24:54','USER_LOGIN',1,'2011-08-01 03:24:54',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(80,'2011-08-01 19:31:36','USER_LOGIN_FAILED',1,'2011-08-01 21:31:35',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(81,'2011-08-01 19:31:39','USER_LOGIN',1,'2011-08-01 21:31:39',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(82,'2011-08-01 20:01:36','USER_LOGIN',1,'2011-08-01 22:01:36',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(83,'2011-08-01 20:52:54','USER_LOGIN_FAILED',1,'2011-08-01 22:52:54',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(84,'2011-08-01 20:52:58','USER_LOGIN',1,'2011-08-01 22:52:58',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(85,'2011-08-01 21:17:28','USER_LOGIN_FAILED',1,'2011-08-01 23:17:28',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(86,'2011-08-01 21:17:31','USER_LOGIN',1,'2011-08-01 23:17:31',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(87,'2011-08-04 11:55:17','USER_LOGIN',1,'2011-08-04 13:55:17',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(88,'2011-08-04 20:19:03','USER_LOGIN_FAILED',1,'2011-08-04 22:19:03',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(89,'2011-08-04 20:19:07','USER_LOGIN',1,'2011-08-04 22:19:07',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(90,'2011-08-05 17:51:42','USER_LOGIN_FAILED',1,'2011-08-05 19:51:42',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(91,'2011-08-05 17:51:47','USER_LOGIN',1,'2011-08-05 19:51:47',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(92,'2011-08-05 17:56:03','USER_LOGIN',1,'2011-08-05 19:56:03',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(93,'2011-08-05 17:59:10','USER_LOGIN',1,'2011-08-05 19:59:10',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686) AppleWebKit/534.30 (KHTML, like Gecko) Chrome/12.0.742.100 Safari/534.30',NULL),(94,'2011-08-05 18:01:58','USER_LOGIN',1,'2011-08-05 20:01:58',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686) AppleWebKit/534.30 (KHTML, like Gecko) Chrome/12.0.742.100 Safari/534.30',NULL),(95,'2011-08-05 19:59:56','USER_LOGIN',1,'2011-08-05 21:59:56',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(96,'2011-08-06 18:33:22','USER_LOGIN',1,'2011-08-06 20:33:22',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(97,'2011-08-07 00:56:59','USER_LOGIN',1,'2011-08-07 02:56:59',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(98,'2011-08-07 22:49:14','USER_LOGIN',1,'2011-08-08 00:49:14',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(99,'2011-08-07 23:05:18','USER_LOGOUT',1,'2011-08-08 01:05:18',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(105,'2011-08-08 00:41:09','USER_LOGIN',1,'2011-08-08 02:41:09',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(106,'2011-08-08 11:58:55','USER_LOGIN',1,'2011-08-08 13:58:55',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(107,'2011-08-08 14:35:48','USER_LOGIN',1,'2011-08-08 16:35:48',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(108,'2011-08-08 14:36:31','USER_LOGOUT',1,'2011-08-08 16:36:31',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(109,'2011-08-08 14:38:28','USER_LOGIN',1,'2011-08-08 16:38:28',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(110,'2011-08-08 14:39:02','USER_LOGOUT',1,'2011-08-08 16:39:02',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(111,'2011-08-08 14:39:10','USER_LOGIN',1,'2011-08-08 16:39:10',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(112,'2011-08-08 14:39:28','USER_LOGOUT',1,'2011-08-08 16:39:28',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(113,'2011-08-08 14:39:37','USER_LOGIN',1,'2011-08-08 16:39:37',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(114,'2011-08-08 14:50:02','USER_LOGOUT',1,'2011-08-08 16:50:02',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(115,'2011-08-08 14:51:45','USER_LOGIN_FAILED',1,'2011-08-08 16:51:45',NULL,'Identifiants login ou mot de passe incorrects - login=','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(116,'2011-08-08 14:51:52','USER_LOGIN',1,'2011-08-08 16:51:52',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(117,'2011-08-08 15:09:54','USER_LOGOUT',1,'2011-08-08 17:09:54',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(118,'2011-08-08 15:10:19','USER_LOGIN_FAILED',1,'2011-08-08 17:10:19',NULL,'Identifiants login ou mot de passe incorrects - login=','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(119,'2011-08-08 15:10:28','USER_LOGIN',1,'2011-08-08 17:10:28',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(121,'2011-08-08 15:14:58','USER_LOGOUT',1,'2011-08-08 17:14:58',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(122,'2011-08-08 15:15:00','USER_LOGIN_FAILED',1,'2011-08-08 17:15:00',NULL,'Identifiants login ou mot de passe incorrects - login=','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(123,'2011-08-08 15:17:57','USER_LOGIN',1,'2011-08-08 17:17:57',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(124,'2011-08-08 15:35:56','USER_LOGOUT',1,'2011-08-08 17:35:56',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(125,'2011-08-08 15:36:05','USER_LOGIN',1,'2011-08-08 17:36:05',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(126,'2011-08-08 17:32:42','USER_LOGIN',1,'2011-08-08 19:32:42',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(127,'2012-12-08 13:49:37','USER_LOGOUT',1,'2012-12-08 14:49:37',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(128,'2012-12-08 13:49:42','USER_LOGIN',1,'2012-12-08 14:49:42',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(129,'2012-12-08 13:50:12','USER_LOGOUT',1,'2012-12-08 14:50:12',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(130,'2012-12-08 13:50:14','USER_LOGIN',1,'2012-12-08 14:50:14',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(131,'2012-12-08 13:50:17','USER_LOGOUT',1,'2012-12-08 14:50:17',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(132,'2012-12-08 13:52:47','USER_LOGIN',1,'2012-12-08 14:52:47',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(133,'2012-12-08 13:53:08','USER_MODIFY',1,'2012-12-08 14:53:08',1,'User admin modified','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(134,'2012-12-08 14:08:45','USER_LOGOUT',1,'2012-12-08 15:08:45',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(135,'2012-12-08 14:09:09','USER_LOGIN',1,'2012-12-08 15:09:09',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(136,'2012-12-08 14:11:43','USER_LOGOUT',1,'2012-12-08 15:11:43',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(137,'2012-12-08 14:11:45','USER_LOGIN',1,'2012-12-08 15:11:45',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(138,'2012-12-08 14:22:53','USER_LOGOUT',1,'2012-12-08 15:22:53',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(139,'2012-12-08 14:22:54','USER_LOGIN',1,'2012-12-08 15:22:54',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(140,'2012-12-08 14:23:10','USER_LOGOUT',1,'2012-12-08 15:23:10',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(141,'2012-12-08 14:23:11','USER_LOGIN',1,'2012-12-08 15:23:11',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(142,'2012-12-08 14:23:49','USER_LOGOUT',1,'2012-12-08 15:23:49',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(143,'2012-12-08 14:23:50','USER_LOGIN',1,'2012-12-08 15:23:50',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(144,'2012-12-08 14:28:08','USER_LOGOUT',1,'2012-12-08 15:28:08',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(145,'2012-12-08 14:35:15','USER_LOGIN',1,'2012-12-08 15:35:15',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(146,'2012-12-08 14:35:18','USER_LOGOUT',1,'2012-12-08 15:35:18',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(147,'2012-12-08 14:36:07','USER_LOGIN',1,'2012-12-08 15:36:07',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(148,'2012-12-08 14:36:09','USER_LOGOUT',1,'2012-12-08 15:36:09',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(149,'2012-12-08 14:36:41','USER_LOGIN',1,'2012-12-08 15:36:41',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(150,'2012-12-08 15:59:13','USER_LOGIN',1,'2012-12-08 16:59:13',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(151,'2012-12-09 11:49:52','USER_LOGIN',1,'2012-12-09 12:49:52',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(152,'2012-12-09 13:46:31','USER_LOGIN',1,'2012-12-09 14:46:31',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(153,'2012-12-09 19:03:14','USER_LOGIN',1,'2012-12-09 20:03:14',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(154,'2012-12-10 00:16:31','USER_LOGIN',1,'2012-12-10 01:16:31',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(170,'2012-12-11 22:03:31','USER_LOGIN',1,'2012-12-11 23:03:31',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(171,'2012-12-12 00:32:39','USER_LOGIN',1,'2012-12-12 01:32:39',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(172,'2012-12-12 10:49:59','USER_LOGIN',1,'2012-12-12 11:49:59',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(175,'2012-12-12 10:57:40','USER_MODIFY',1,'2012-12-12 11:57:40',1,'Modification utilisateur admin','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(176,'2012-12-12 13:29:15','USER_LOGIN',1,'2012-12-12 14:29:15',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(177,'2012-12-12 13:30:15','USER_LOGIN',1,'2012-12-12 14:30:15',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(178,'2012-12-12 13:40:08','USER_LOGOUT',1,'2012-12-12 14:40:08',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(179,'2012-12-12 13:40:10','USER_LOGIN',1,'2012-12-12 14:40:10',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(180,'2012-12-12 13:40:26','USER_MODIFY',1,'2012-12-12 14:40:26',1,'Modification utilisateur admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(181,'2012-12-12 13:40:34','USER_LOGOUT',1,'2012-12-12 14:40:34',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(182,'2012-12-12 13:42:23','USER_LOGIN',1,'2012-12-12 14:42:23',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(183,'2012-12-12 13:43:02','USER_NEW_PASSWORD',1,'2012-12-12 14:43:02',NULL,'Changement mot de passe de admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(184,'2012-12-12 13:43:25','USER_LOGOUT',1,'2012-12-12 14:43:25',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(185,'2012-12-12 13:43:27','USER_LOGIN_FAILED',1,'2012-12-12 14:43:27',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(186,'2012-12-12 13:43:30','USER_LOGIN',1,'2012-12-12 14:43:30',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(187,'2012-12-12 14:52:11','USER_LOGIN',1,'2012-12-12 15:52:11',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(188,'2012-12-12 17:53:00','USER_LOGIN_FAILED',1,'2012-12-12 18:53:00',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(189,'2012-12-12 17:53:07','USER_LOGIN_FAILED',1,'2012-12-12 18:53:07',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(190,'2012-12-12 17:53:51','USER_NEW_PASSWORD',1,'2012-12-12 18:53:51',NULL,'Changement mot de passe de admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(191,'2012-12-12 17:54:00','USER_LOGIN',1,'2012-12-12 18:54:00',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(192,'2012-12-12 17:54:10','USER_NEW_PASSWORD',1,'2012-12-12 18:54:10',1,'Changement mot de passe de admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(193,'2012-12-12 17:54:10','USER_MODIFY',1,'2012-12-12 18:54:10',1,'Modification utilisateur admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(194,'2012-12-12 18:57:09','USER_LOGIN',1,'2012-12-12 19:57:09',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(195,'2012-12-12 23:04:08','USER_LOGIN',1,'2012-12-13 00:04:08',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(196,'2012-12-17 20:03:14','USER_LOGIN',1,'2012-12-17 21:03:14',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(197,'2012-12-17 21:18:45','USER_LOGIN',1,'2012-12-17 22:18:45',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(198,'2012-12-17 22:30:08','USER_LOGIN',1,'2012-12-17 23:30:08',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(199,'2012-12-18 23:32:03','USER_LOGIN',1,'2012-12-19 00:32:03',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(200,'2012-12-19 09:38:03','USER_LOGIN',1,'2012-12-19 10:38:03',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(201,'2012-12-19 11:23:35','USER_LOGIN',1,'2012-12-19 12:23:35',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(202,'2012-12-19 12:46:22','USER_LOGIN',1,'2012-12-19 13:46:22',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(214,'2012-12-19 19:11:31','USER_LOGIN',1,'2012-12-19 20:11:31',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(215,'2012-12-21 16:36:57','USER_LOGIN',1,'2012-12-21 17:36:57',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(216,'2012-12-21 16:38:43','USER_NEW_PASSWORD',1,'2012-12-21 17:38:43',1,'Changement mot de passe de adupont','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(217,'2012-12-21 16:38:43','USER_MODIFY',1,'2012-12-21 17:38:43',1,'Modification utilisateur adupont','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(218,'2012-12-21 16:38:51','USER_LOGOUT',1,'2012-12-21 17:38:51',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(219,'2012-12-21 16:38:55','USER_LOGIN',1,'2012-12-21 17:38:55',3,'(UserLogged,adupont)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(220,'2012-12-21 16:48:18','USER_LOGOUT',1,'2012-12-21 17:48:18',3,'(UserLogoff,adupont)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(221,'2012-12-21 16:48:20','USER_LOGIN',1,'2012-12-21 17:48:20',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(222,'2012-12-26 18:28:18','USER_LOGIN',1,'2012-12-26 19:28:18',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(223,'2012-12-26 20:00:24','USER_LOGIN',1,'2012-12-26 21:00:24',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(224,'2012-12-27 01:10:27','USER_LOGIN',1,'2012-12-27 02:10:27',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(225,'2012-12-28 19:12:08','USER_LOGIN',1,'2012-12-28 20:12:08',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(226,'2012-12-28 20:16:58','USER_LOGIN',1,'2012-12-28 21:16:58',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(227,'2012-12-29 14:35:46','USER_LOGIN',1,'2012-12-29 15:35:46',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(228,'2012-12-29 14:37:59','USER_LOGOUT',1,'2012-12-29 15:37:59',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(229,'2012-12-29 14:38:00','USER_LOGIN',1,'2012-12-29 15:38:00',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(230,'2012-12-29 17:16:48','USER_LOGIN',1,'2012-12-29 18:16:48',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(231,'2012-12-31 12:02:59','USER_LOGIN',1,'2012-12-31 13:02:59',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(232,'2013-01-02 20:32:51','USER_LOGIN',1,'2013-01-02 21:32:51',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:17.0) Gecko/20100101 Firefox/17.0',NULL),(233,'2013-01-02 20:58:59','USER_LOGIN',1,'2013-01-02 21:58:59',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(234,'2013-01-03 09:25:07','USER_LOGIN',1,'2013-01-03 10:25:07',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(235,'2013-01-03 19:39:31','USER_LOGIN',1,'2013-01-03 20:39:31',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(236,'2013-01-04 22:40:19','USER_LOGIN',1,'2013-01-04 23:40:19',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(237,'2013-01-05 12:59:59','USER_LOGIN',1,'2013-01-05 13:59:59',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(238,'2013-01-05 15:28:52','USER_LOGIN',1,'2013-01-05 16:28:52',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(239,'2013-01-05 17:02:08','USER_LOGIN',1,'2013-01-05 18:02:08',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(240,'2013-01-06 12:13:33','USER_LOGIN',1,'2013-01-06 13:13:33',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(241,'2013-01-07 01:21:15','USER_LOGIN',1,'2013-01-07 02:21:15',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(242,'2013-01-07 01:46:31','USER_LOGOUT',1,'2013-01-07 02:46:31',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(243,'2013-01-07 19:54:50','USER_LOGIN',1,'2013-01-07 20:54:50',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(244,'2013-01-08 21:55:01','USER_LOGIN',1,'2013-01-08 22:55:01',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(245,'2013-01-09 11:13:28','USER_LOGIN',1,'2013-01-09 12:13:28',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(246,'2013-01-10 18:30:46','USER_LOGIN',1,'2013-01-10 19:30:46',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(247,'2013-01-11 18:03:26','USER_LOGIN',1,'2013-01-11 19:03:26',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(248,'2013-01-12 11:15:04','USER_LOGIN',1,'2013-01-12 12:15:04',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(249,'2013-01-12 14:42:44','USER_LOGIN',1,'2013-01-12 15:42:44',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(250,'2013-01-13 12:07:17','USER_LOGIN',1,'2013-01-13 13:07:17',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(251,'2013-01-13 17:37:58','USER_LOGIN',1,'2013-01-13 18:37:58',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(252,'2013-01-13 19:24:21','USER_LOGIN',1,'2013-01-13 20:24:21',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(253,'2013-01-13 19:29:19','USER_LOGOUT',1,'2013-01-13 20:29:19',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(254,'2013-01-13 21:39:39','USER_LOGIN',1,'2013-01-13 22:39:39',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(255,'2013-01-14 00:52:21','USER_LOGIN',1,'2013-01-14 01:52:21',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(256,'2013-01-16 11:34:31','USER_LOGIN',1,'2013-01-16 12:34:31',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(257,'2013-01-16 15:36:21','USER_LOGIN',1,'2013-01-16 16:36:21',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(258,'2013-01-16 19:17:36','USER_LOGIN',1,'2013-01-16 20:17:36',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(259,'2013-01-16 19:48:08','GROUP_CREATE',1,'2013-01-16 20:48:08',1,'Création groupe ggg','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(260,'2013-01-16 21:48:53','USER_LOGIN',1,'2013-01-16 22:48:53',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(261,'2013-01-17 19:55:53','USER_LOGIN',1,'2013-01-17 20:55:53',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(262,'2013-01-18 09:48:01','USER_LOGIN',1,'2013-01-18 10:48:01',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(263,'2013-01-18 13:22:36','USER_LOGIN',1,'2013-01-18 14:22:36',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(264,'2013-01-18 16:10:23','USER_LOGIN',1,'2013-01-18 17:10:22',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(265,'2013-01-18 17:41:40','USER_LOGIN',1,'2013-01-18 18:41:40',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(266,'2013-01-19 14:33:48','USER_LOGIN',1,'2013-01-19 15:33:48',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(267,'2013-01-19 16:47:43','USER_LOGIN',1,'2013-01-19 17:47:43',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(268,'2013-01-19 16:59:43','USER_LOGIN',1,'2013-01-19 17:59:43',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(269,'2013-01-19 17:00:22','USER_LOGIN',1,'2013-01-19 18:00:22',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(270,'2013-01-19 17:04:16','USER_LOGOUT',1,'2013-01-19 18:04:16',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(271,'2013-01-19 17:04:18','USER_LOGIN',1,'2013-01-19 18:04:18',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(272,'2013-01-20 00:34:19','USER_LOGIN',1,'2013-01-20 01:34:19',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(273,'2013-01-21 11:54:17','USER_LOGIN',1,'2013-01-21 12:54:17',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(274,'2013-01-21 13:48:15','USER_LOGIN',1,'2013-01-21 14:48:15',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(275,'2013-01-21 14:30:22','USER_LOGIN',1,'2013-01-21 15:30:22',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(276,'2013-01-21 15:10:46','USER_LOGIN',1,'2013-01-21 16:10:46',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(277,'2013-01-21 17:27:43','USER_LOGIN',1,'2013-01-21 18:27:43',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(278,'2013-01-21 21:48:15','USER_LOGIN',1,'2013-01-21 22:48:15',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(279,'2013-01-21 21:50:42','USER_LOGIN',1,'2013-01-21 22:50:42',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(280,'2013-01-23 09:28:26','USER_LOGIN',1,'2013-01-23 10:28:26',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL),(281,'2013-01-23 13:21:57','USER_LOGIN',1,'2013-01-23 14:21:57',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL),(282,'2013-01-23 16:52:00','USER_LOGOUT',1,'2013-01-23 17:52:00',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL),(283,'2013-01-23 16:52:05','USER_LOGIN_FAILED',1,'2013-01-23 17:52:05',NULL,'Bad value for login or password - login=bbb','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL),(284,'2013-01-23 16:52:09','USER_LOGIN',1,'2013-01-23 17:52:09',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL),(285,'2013-01-23 16:52:27','USER_CREATE',1,'2013-01-23 17:52:27',1,'Création utilisateur aaa','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL),(286,'2013-01-23 16:52:27','USER_NEW_PASSWORD',1,'2013-01-23 17:52:27',1,'Changement mot de passe de aaa','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL),(287,'2013-01-23 16:52:37','USER_CREATE',1,'2013-01-23 17:52:37',1,'Création utilisateur bbb','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL),(288,'2013-01-23 16:52:37','USER_NEW_PASSWORD',1,'2013-01-23 17:52:37',1,'Changement mot de passe de bbb','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL),(289,'2013-01-23 16:53:15','USER_LOGOUT',1,'2013-01-23 17:53:15',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL),(290,'2013-01-23 16:53:20','USER_LOGIN',1,'2013-01-23 17:53:20',4,'(UserLogged,aaa)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL),(291,'2013-01-23 19:16:58','USER_LOGIN',1,'2013-01-23 20:16:58',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL),(292,'2013-01-26 10:54:07','USER_LOGIN',1,'2013-01-26 11:54:07',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL),(293,'2013-01-29 10:15:36','USER_LOGIN',1,'2013-01-29 11:15:36',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL),(294,'2013-01-30 17:42:50','USER_LOGIN',1,'2013-01-30 18:42:50',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL),(295,'2013-02-01 08:49:55','USER_LOGIN',1,'2013-02-01 09:49:55',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL),(296,'2013-02-01 08:51:57','USER_LOGOUT',1,'2013-02-01 09:51:57',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL),(297,'2013-02-01 08:52:39','USER_LOGIN',1,'2013-02-01 09:52:39',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL),(298,'2013-02-01 21:03:01','USER_LOGIN',1,'2013-02-01 22:03:01',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL),(299,'2013-02-10 19:48:39','USER_LOGIN',1,'2013-02-10 20:48:39',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL),(300,'2013-02-10 20:46:48','USER_LOGIN',1,'2013-02-10 21:46:48',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL),(301,'2013-02-10 21:39:23','USER_LOGIN',1,'2013-02-10 22:39:23',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL),(302,'2013-02-11 19:00:13','USER_LOGIN',1,'2013-02-11 20:00:13',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL),(303,'2013-02-11 19:43:44','USER_LOGIN_FAILED',1,'2013-02-11 20:43:44',NULL,'Unknown column \'u.fk_user\' in \'field list\'','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL),(304,'2013-02-11 19:44:01','USER_LOGIN',1,'2013-02-11 20:44:01',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL),(305,'2013-02-12 00:27:35','USER_LOGIN',1,'2013-02-12 01:27:35',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL),(306,'2013-02-12 00:27:38','USER_LOGOUT',1,'2013-02-12 01:27:38',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL),(307,'2013-02-12 00:28:07','USER_LOGIN',1,'2013-02-12 01:28:07',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL),(308,'2013-02-12 00:28:09','USER_LOGOUT',1,'2013-02-12 01:28:09',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL),(309,'2013-02-12 00:28:26','USER_LOGIN',1,'2013-02-12 01:28:26',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL),(310,'2013-02-12 00:28:30','USER_LOGOUT',1,'2013-02-12 01:28:30',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL),(311,'2013-02-12 12:42:15','USER_LOGIN',1,'2013-02-12 13:42:15',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL),(312,'2013-02-12 13:46:16','USER_LOGIN',1,'2013-02-12 14:46:16',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(313,'2013-02-12 14:54:28','USER_LOGIN',1,'2013-02-12 15:54:28',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(314,'2013-02-12 16:04:46','USER_LOGIN',1,'2013-02-12 17:04:46',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(315,'2013-02-13 14:02:43','USER_LOGIN',1,'2013-02-13 15:02:43',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(316,'2013-02-13 14:48:30','USER_LOGIN',1,'2013-02-13 15:48:30',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(317,'2013-02-13 17:44:53','USER_LOGIN',1,'2013-02-13 18:44:53',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(318,'2013-02-15 08:44:36','USER_LOGIN',1,'2013-02-15 09:44:36',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(319,'2013-02-15 08:53:20','USER_LOGIN',1,'2013-02-15 09:53:20',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(320,'2013-02-16 19:10:28','USER_LOGIN',1,'2013-02-16 20:10:28',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(321,'2013-02-16 19:22:40','USER_CREATE',1,'2013-02-16 20:22:40',1,'Création utilisateur aaab','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(322,'2013-02-16 19:22:40','USER_NEW_PASSWORD',1,'2013-02-16 20:22:40',1,'Changement mot de passe de aaab','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(323,'2013-02-16 19:48:15','USER_CREATE',1,'2013-02-16 20:48:15',1,'Création utilisateur zzz','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(324,'2013-02-16 19:48:15','USER_NEW_PASSWORD',1,'2013-02-16 20:48:15',1,'Changement mot de passe de zzz','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(325,'2013-02-16 19:50:08','USER_CREATE',1,'2013-02-16 20:50:08',1,'Création utilisateur zzzg','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(326,'2013-02-16 19:50:08','USER_NEW_PASSWORD',1,'2013-02-16 20:50:08',1,'Changement mot de passe de zzzg','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(327,'2013-02-16 21:20:03','USER_LOGIN',1,'2013-02-16 22:20:03',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(328,'2013-02-17 14:30:51','USER_LOGIN',1,'2013-02-17 15:30:51',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(329,'2013-02-17 17:21:22','USER_LOGIN',1,'2013-02-17 18:21:22',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(330,'2013-02-17 17:48:43','USER_MODIFY',1,'2013-02-17 18:48:43',1,'Modification utilisateur aaa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(331,'2013-02-17 17:48:47','USER_MODIFY',1,'2013-02-17 18:48:47',1,'Modification utilisateur aaa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(332,'2013-02-17 17:48:51','USER_MODIFY',1,'2013-02-17 18:48:51',1,'Modification utilisateur aaa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(333,'2013-02-17 17:48:56','USER_MODIFY',1,'2013-02-17 18:48:56',1,'Modification utilisateur aaa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(334,'2013-02-18 22:00:01','USER_LOGIN',1,'2013-02-18 23:00:01',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(335,'2013-02-19 08:19:52','USER_LOGIN',1,'2013-02-19 09:19:52',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(336,'2013-02-19 22:00:52','USER_LOGIN',1,'2013-02-19 23:00:52',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(337,'2013-02-20 09:34:52','USER_LOGIN',1,'2013-02-20 10:34:52',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(338,'2013-02-20 13:12:28','USER_LOGIN',1,'2013-02-20 14:12:28',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(339,'2013-02-20 17:19:44','USER_LOGIN',1,'2013-02-20 18:19:44',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(340,'2013-02-20 19:07:21','USER_MODIFY',1,'2013-02-20 20:07:21',1,'Modification utilisateur adupont','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(341,'2013-02-20 19:47:17','USER_LOGIN',1,'2013-02-20 20:47:17',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(342,'2013-02-20 19:48:01','USER_MODIFY',1,'2013-02-20 20:48:01',1,'Modification utilisateur aaa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(343,'2013-02-21 08:27:07','USER_LOGIN',1,'2013-02-21 09:27:07',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(344,'2013-02-23 13:34:13','USER_LOGIN',1,'2013-02-23 14:34:13',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(345,'2013-02-24 01:06:41','USER_LOGIN_FAILED',1,'2013-02-24 02:06:41',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(346,'2013-02-24 01:06:45','USER_LOGIN_FAILED',1,'2013-02-24 02:06:45',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(347,'2013-02-24 01:06:55','USER_LOGIN_FAILED',1,'2013-02-24 02:06:55',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(348,'2013-02-24 01:07:03','USER_LOGIN_FAILED',1,'2013-02-24 02:07:03',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(349,'2013-02-24 01:07:21','USER_LOGIN_FAILED',1,'2013-02-24 02:07:21',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(350,'2013-02-24 01:08:12','USER_LOGIN_FAILED',1,'2013-02-24 02:08:12',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(351,'2013-02-24 01:08:42','USER_LOGIN_FAILED',1,'2013-02-24 02:08:42',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(352,'2013-02-24 01:08:50','USER_LOGIN_FAILED',1,'2013-02-24 02:08:50',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(353,'2013-02-24 01:09:08','USER_LOGIN_FAILED',1,'2013-02-24 02:09:08',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(354,'2013-02-24 01:09:42','USER_LOGIN_FAILED',1,'2013-02-24 02:09:42',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(355,'2013-02-24 01:09:50','USER_LOGIN_FAILED',1,'2013-02-24 02:09:50',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(356,'2013-02-24 01:10:05','USER_LOGIN_FAILED',1,'2013-02-24 02:10:05',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(357,'2013-02-24 01:10:22','USER_LOGIN_FAILED',1,'2013-02-24 02:10:22',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(358,'2013-02-24 01:10:30','USER_LOGIN_FAILED',1,'2013-02-24 02:10:30',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(359,'2013-02-24 01:10:56','USER_LOGIN_FAILED',1,'2013-02-24 02:10:56',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(360,'2013-02-24 01:11:26','USER_LOGIN_FAILED',1,'2013-02-24 02:11:26',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(361,'2013-02-24 01:12:06','USER_LOGIN_FAILED',1,'2013-02-24 02:12:06',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(362,'2013-02-24 01:21:14','USER_LOGIN_FAILED',1,'2013-02-24 02:21:14',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(363,'2013-02-24 01:21:25','USER_LOGIN_FAILED',1,'2013-02-24 02:21:25',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(364,'2013-02-24 01:21:54','USER_LOGIN_FAILED',1,'2013-02-24 02:21:54',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(365,'2013-02-24 01:22:14','USER_LOGIN_FAILED',1,'2013-02-24 02:22:14',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(366,'2013-02-24 01:22:37','USER_LOGIN_FAILED',1,'2013-02-24 02:22:37',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(367,'2013-02-24 01:23:01','USER_LOGIN_FAILED',1,'2013-02-24 02:23:01',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(368,'2013-02-24 01:23:39','USER_LOGIN_FAILED',1,'2013-02-24 02:23:39',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(369,'2013-02-24 01:24:04','USER_LOGIN_FAILED',1,'2013-02-24 02:24:04',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(370,'2013-02-24 01:24:39','USER_LOGIN_FAILED',1,'2013-02-24 02:24:39',NULL,'Bad value for login or password - login=aa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(371,'2013-02-24 01:25:01','USER_LOGIN_FAILED',1,'2013-02-24 02:25:01',NULL,'Bad value for login or password - login=aa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(372,'2013-02-24 01:25:12','USER_LOGIN_FAILED',1,'2013-02-24 02:25:12',NULL,'Bad value for login or password - login=aa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(373,'2013-02-24 01:27:30','USER_LOGIN_FAILED',1,'2013-02-24 02:27:30',NULL,'Bad value for login or password - login=aa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(374,'2013-02-24 01:28:00','USER_LOGIN_FAILED',1,'2013-02-24 02:28:00',NULL,'Bad value for login or password - login=aa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(375,'2013-02-24 01:28:35','USER_LOGIN_FAILED',1,'2013-02-24 02:28:35',NULL,'Bad value for login or password - login=aa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(376,'2013-02-24 01:29:03','USER_LOGIN_FAILED',1,'2013-02-24 02:29:03',NULL,'Bad value for login or password - login=aa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(377,'2013-02-24 01:29:55','USER_LOGIN_FAILED',1,'2013-02-24 02:29:55',NULL,'Bad value for login or password - login=aa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(378,'2013-02-24 01:32:40','USER_LOGIN_FAILED',1,'2013-02-24 02:32:40',NULL,'Bad value for login or password - login=aa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(379,'2013-02-24 01:39:33','USER_LOGIN_FAILED',1,'2013-02-24 02:39:33',NULL,'Identifiants login ou mot de passe incorrects - login=aa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(380,'2013-02-24 01:39:38','USER_LOGIN_FAILED',1,'2013-02-24 02:39:38',NULL,'Identifiants login ou mot de passe incorrects - login=aa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(381,'2013-02-24 01:39:47','USER_LOGIN_FAILED',1,'2013-02-24 02:39:47',NULL,'Identifiants login ou mot de passe incorrects - login=lmkm','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(382,'2013-02-24 01:40:54','USER_LOGIN_FAILED',1,'2013-02-24 02:40:54',NULL,'Identifiants login ou mot de passe incorrects - login=lmkm','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(383,'2013-02-24 01:47:57','USER_LOGIN_FAILED',1,'2013-02-24 02:47:57',NULL,'Identifiants login ou mot de passe incorrects - login=lmkm','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(384,'2013-02-24 01:48:05','USER_LOGIN_FAILED',1,'2013-02-24 02:48:05',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(385,'2013-02-24 01:48:07','USER_LOGIN_FAILED',1,'2013-02-24 02:48:07',NULL,'Unknown column \'u.lastname\' in \'field list\'','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(386,'2013-02-24 01:48:35','USER_LOGIN',1,'2013-02-24 02:48:35',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(387,'2013-02-24 01:56:32','USER_LOGIN',1,'2013-02-24 02:56:32',1,'(UserLogged,admin)','192.168.0.254','Mozilla/5.0 (Linux; U; Android 2.2; en-us; sdk Build/FRF91) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1',NULL),(388,'2013-02-24 02:05:55','USER_LOGOUT',1,'2013-02-24 03:05:55',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(389,'2013-02-24 02:39:52','USER_LOGIN',1,'2013-02-24 03:39:52',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(390,'2013-02-24 02:51:10','USER_LOGOUT',1,'2013-02-24 03:51:10',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(391,'2013-02-24 12:46:41','USER_LOGIN',1,'2013-02-24 13:46:41',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(392,'2013-02-24 12:46:52','USER_LOGOUT',1,'2013-02-24 13:46:52',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(393,'2013-02-24 12:46:56','USER_LOGIN',1,'2013-02-24 13:46:56',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(394,'2013-02-24 12:47:56','USER_LOGOUT',1,'2013-02-24 13:47:56',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(395,'2013-02-24 12:48:00','USER_LOGIN',1,'2013-02-24 13:48:00',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(396,'2013-02-24 12:48:11','USER_LOGOUT',1,'2013-02-24 13:48:11',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(397,'2013-02-24 12:48:32','USER_LOGIN',1,'2013-02-24 13:48:32',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(398,'2013-02-24 12:52:22','USER_LOGOUT',1,'2013-02-24 13:52:22',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(399,'2013-02-24 12:52:27','USER_LOGIN',1,'2013-02-24 13:52:27',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(400,'2013-02-24 12:52:54','USER_LOGOUT',1,'2013-02-24 13:52:54',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(401,'2013-02-24 12:52:59','USER_LOGIN',1,'2013-02-24 13:52:59',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(402,'2013-02-24 12:55:39','USER_LOGOUT',1,'2013-02-24 13:55:39',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(403,'2013-02-24 12:55:59','USER_LOGIN',1,'2013-02-24 13:55:59',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(404,'2013-02-24 12:56:07','USER_LOGOUT',1,'2013-02-24 13:56:07',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(405,'2013-02-24 12:56:23','USER_LOGIN',1,'2013-02-24 13:56:23',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(406,'2013-02-24 12:56:46','USER_LOGOUT',1,'2013-02-24 13:56:46',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(407,'2013-02-24 12:58:30','USER_LOGIN',1,'2013-02-24 13:58:30',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(408,'2013-02-24 12:58:33','USER_LOGOUT',1,'2013-02-24 13:58:33',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(409,'2013-02-24 12:58:51','USER_LOGIN',1,'2013-02-24 13:58:51',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(410,'2013-02-24 12:58:58','USER_LOGOUT',1,'2013-02-24 13:58:58',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(411,'2013-02-24 13:18:53','USER_LOGIN',1,'2013-02-24 14:18:53',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(412,'2013-02-24 13:19:52','USER_LOGOUT',1,'2013-02-24 14:19:52',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(413,'2013-02-24 15:39:31','USER_LOGIN_FAILED',1,'2013-02-24 16:39:31',NULL,'ErrorBadValueForCode - login=admin','127.0.0.1',NULL,NULL),(414,'2013-02-24 15:42:07','USER_LOGIN',1,'2013-02-24 16:42:07',1,'(UserLogged,admin)','127.0.0.1',NULL,NULL),(415,'2013-02-24 15:42:52','USER_LOGOUT',1,'2013-02-24 16:42:52',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7',NULL),(416,'2013-02-24 16:04:21','USER_LOGIN',1,'2013-02-24 17:04:21',1,'(UserLogged,admin)','192.168.0.254','Mozilla/5.0 (Linux; U; Android 2.2; en-us; sdk Build/FRF91) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1',NULL),(417,'2013-02-24 16:11:28','USER_LOGIN_FAILED',1,'2013-02-24 17:11:28',NULL,'ErrorBadValueForCode - login=admin','127.0.0.1','Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7',NULL),(418,'2013-02-24 16:11:37','USER_LOGIN',1,'2013-02-24 17:11:37',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7',NULL),(419,'2013-02-24 16:36:52','USER_LOGOUT',1,'2013-02-24 17:36:52',1,'(UserLogoff,admin)','192.168.0.254','Mozilla/5.0 (Linux; U; Android 2.2; en-us; sdk Build/FRF91) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1',NULL),(420,'2013-02-24 16:40:37','USER_LOGIN',1,'2013-02-24 17:40:37',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(421,'2013-02-24 16:57:16','USER_LOGIN',1,'2013-02-24 17:57:16',1,'(UserLogged,admin)','192.168.0.254','Mozilla/5.0 (Linux; U; Android 2.2; en-us; sdk Build/FRF91) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1 - 2131034114',NULL),(422,'2013-02-24 17:01:30','USER_LOGOUT',1,'2013-02-24 18:01:30',1,'(UserLogoff,admin)','192.168.0.254','Mozilla/5.0 (Linux; U; Android 2.2; en-us; sdk Build/FRF91) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1 - 2131034114',NULL),(423,'2013-02-24 17:02:33','USER_LOGIN',1,'2013-02-24 18:02:33',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(424,'2013-02-24 17:14:22','USER_LOGOUT',1,'2013-02-24 18:14:22',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(425,'2013-02-24 17:15:07','USER_LOGIN_FAILED',1,'2013-02-24 18:15:07',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(426,'2013-02-24 17:15:20','USER_LOGIN',1,'2013-02-24 18:15:20',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(427,'2013-02-24 17:20:14','USER_LOGIN',1,'2013-02-24 18:20:14',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(428,'2013-02-24 17:20:51','USER_LOGIN',1,'2013-02-24 18:20:51',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(429,'2013-02-24 17:20:54','USER_LOGOUT',1,'2013-02-24 18:20:54',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(430,'2013-02-24 17:21:19','USER_LOGIN',1,'2013-02-24 18:21:19',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(431,'2013-02-24 17:32:35','USER_LOGIN',1,'2013-02-24 18:32:35',1,'(UserLogged,admin)','192.168.0.254','Mozilla/5.0 (Linux; U; Android 2.2; en-us; sdk Build/FRF91) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1 - 2131034114',NULL),(432,'2013-02-24 18:28:48','USER_LOGIN',1,'2013-02-24 19:28:48',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(433,'2013-02-24 18:29:27','USER_LOGOUT',1,'2013-02-24 19:29:27',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7',NULL),(434,'2013-02-24 18:29:32','USER_LOGIN',1,'2013-02-24 19:29:32',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7',NULL),(435,'2013-02-24 20:13:13','USER_LOGOUT',1,'2013-02-24 21:13:13',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(436,'2013-02-24 20:13:17','USER_LOGIN',1,'2013-02-24 21:13:17',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(437,'2013-02-25 08:57:16','USER_LOGIN',1,'2013-02-25 09:57:16',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(438,'2013-02-25 08:57:59','USER_LOGOUT',1,'2013-02-25 09:57:59',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(439,'2013-02-25 09:15:02','USER_LOGIN',1,'2013-02-25 10:15:02',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(440,'2013-02-25 09:15:50','USER_LOGOUT',1,'2013-02-25 10:15:50',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(441,'2013-02-25 09:15:57','USER_LOGIN',1,'2013-02-25 10:15:57',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(442,'2013-02-25 09:16:12','USER_LOGOUT',1,'2013-02-25 10:16:12',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(443,'2013-02-25 09:16:19','USER_LOGIN',1,'2013-02-25 10:16:19',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(444,'2013-02-25 09:16:25','USER_LOGOUT',1,'2013-02-25 10:16:25',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(445,'2013-02-25 09:16:39','USER_LOGIN_FAILED',1,'2013-02-25 10:16:39',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(446,'2013-02-25 09:16:42','USER_LOGIN_FAILED',1,'2013-02-25 10:16:42',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(447,'2013-02-25 09:16:54','USER_LOGIN_FAILED',1,'2013-02-25 10:16:54',NULL,'Identificadors d&#039;usuari o contrasenya incorrectes - login=gfdg','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(448,'2013-02-25 09:17:53','USER_LOGIN',1,'2013-02-25 10:17:53',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(449,'2013-02-25 09:18:37','USER_LOGOUT',1,'2013-02-25 10:18:37',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(450,'2013-02-25 09:18:41','USER_LOGIN',1,'2013-02-25 10:18:41',4,'(UserLogged,aaa)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(451,'2013-02-25 09:18:47','USER_LOGOUT',1,'2013-02-25 10:18:47',4,'(UserLogoff,aaa)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(452,'2013-02-25 10:05:34','USER_LOGIN',1,'2013-02-25 11:05:34',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(453,'2013-02-26 21:51:40','USER_LOGIN',1,'2013-02-26 22:51:40',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(454,'2013-02-26 23:30:06','USER_LOGIN',1,'2013-02-27 00:30:06',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(455,'2013-02-27 14:13:11','USER_LOGIN',1,'2013-02-27 15:13:11',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(456,'2013-02-27 18:12:06','USER_LOGIN_FAILED',1,'2013-02-27 19:12:06',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(457,'2013-02-27 18:12:10','USER_LOGIN',1,'2013-02-27 19:12:10',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(458,'2013-02-27 20:20:08','USER_LOGIN',1,'2013-02-27 21:20:08',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(459,'2013-03-01 22:12:03','USER_LOGIN',1,'2013-03-01 23:12:03',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(460,'2013-03-02 11:45:50','USER_LOGIN',1,'2013-03-02 12:45:50',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(461,'2013-03-02 15:53:51','USER_LOGIN_FAILED',1,'2013-03-02 16:53:51',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(462,'2013-03-02 15:53:53','USER_LOGIN',1,'2013-03-02 16:53:53',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(463,'2013-03-02 18:32:32','USER_LOGIN',1,'2013-03-02 19:32:32',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(464,'2013-03-02 22:59:36','USER_LOGIN',1,'2013-03-02 23:59:36',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(465,'2013-03-03 16:26:26','USER_LOGIN',1,'2013-03-03 17:26:26',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(466,'2013-03-03 22:50:27','USER_LOGIN',1,'2013-03-03 23:50:27',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(467,'2013-03-04 08:29:27','USER_LOGIN',1,'2013-03-04 09:29:27',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(468,'2013-03-04 18:27:28','USER_LOGIN',1,'2013-03-04 19:27:28',1,'(UserLogged,admin)','192.168.0.254','Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; WOW64; Trident/5.0; NP06)',NULL),(469,'2013-03-04 19:27:23','USER_LOGIN',1,'2013-03-04 20:27:23',1,'(UserLogged,admin)','192.168.0.254','Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1)',NULL),(470,'2013-03-04 19:35:14','USER_LOGIN',1,'2013-03-04 20:35:14',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(471,'2013-03-04 19:55:49','USER_LOGIN',1,'2013-03-04 20:55:49',1,'(UserLogged,admin)','192.168.0.254','Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 5.1; Trident/4.0)',NULL),(472,'2013-03-04 21:16:13','USER_LOGIN',1,'2013-03-04 22:16:13',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(473,'2013-03-05 10:17:30','USER_LOGIN',1,'2013-03-05 11:17:30',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(474,'2013-03-05 11:02:43','USER_LOGIN',1,'2013-03-05 12:02:43',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(475,'2013-03-05 23:14:39','USER_LOGIN',1,'2013-03-06 00:14:39',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(476,'2013-03-06 08:58:57','USER_LOGIN',1,'2013-03-06 09:58:57',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(477,'2013-03-06 14:29:40','USER_LOGIN',1,'2013-03-06 15:29:40',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(478,'2013-03-06 21:53:02','USER_LOGIN',1,'2013-03-06 22:53:02',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(479,'2013-03-07 21:14:39','USER_LOGIN',1,'2013-03-07 22:14:39',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(480,'2013-03-08 00:06:05','USER_LOGIN',1,'2013-03-08 01:06:05',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(481,'2013-03-08 01:38:13','USER_LOGIN',1,'2013-03-08 02:38:13',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(482,'2013-03-08 08:59:50','USER_LOGIN',1,'2013-03-08 09:59:50',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(483,'2013-03-09 12:08:51','USER_LOGIN',1,'2013-03-09 13:08:51',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(484,'2013-03-09 15:19:53','USER_LOGIN',1,'2013-03-09 16:19:53',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(495,'2013-03-09 18:06:21','USER_LOGIN',1,'2013-03-09 19:06:21',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(496,'2013-03-09 20:01:24','USER_LOGIN',1,'2013-03-09 21:01:24',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(497,'2013-03-09 23:36:45','USER_LOGIN',1,'2013-03-10 00:36:45',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(498,'2013-03-10 14:37:13','USER_LOGIN',1,'2013-03-10 15:37:13',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(499,'2013-03-10 17:54:12','USER_LOGIN',1,'2013-03-10 18:54:12',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(500,'2013-03-11 08:57:09','USER_LOGIN',1,'2013-03-11 09:57:09',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(501,'2013-03-11 22:05:13','USER_LOGIN',1,'2013-03-11 23:05:13',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(502,'2013-03-12 08:34:27','USER_LOGIN',1,'2013-03-12 09:34:27',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(503,'2013-03-13 09:11:02','USER_LOGIN',1,'2013-03-13 10:11:02',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(504,'2013-03-13 10:02:11','USER_LOGIN',1,'2013-03-13 11:02:11',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(505,'2013-03-13 13:20:58','USER_LOGIN',1,'2013-03-13 14:20:58',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(506,'2013-03-13 16:19:28','USER_LOGIN',1,'2013-03-13 17:19:28',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(507,'2013-03-13 18:34:30','USER_LOGIN',1,'2013-03-13 19:34:30',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(508,'2013-03-14 08:25:02','USER_LOGIN',1,'2013-03-14 09:25:02',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(509,'2013-03-14 19:15:22','USER_LOGIN',1,'2013-03-14 20:15:22',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(510,'2013-03-14 21:58:53','USER_LOGIN',1,'2013-03-14 22:58:53',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(511,'2013-03-14 21:58:59','USER_LOGOUT',1,'2013-03-14 22:58:59',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(512,'2013-03-14 21:59:07','USER_LOGIN',1,'2013-03-14 22:59:07',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(513,'2013-03-14 22:58:22','USER_LOGOUT',1,'2013-03-14 23:58:22',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(514,'2013-03-14 23:00:25','USER_LOGIN',1,'2013-03-15 00:00:25',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(515,'2013-03-16 12:14:28','USER_LOGIN',1,'2013-03-16 13:14:28',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(516,'2013-03-16 16:09:01','USER_LOGIN',1,'2013-03-16 17:09:01',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(517,'2013-03-16 16:57:11','USER_LOGIN',1,'2013-03-16 17:57:11',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(518,'2013-03-16 19:31:31','USER_LOGIN',1,'2013-03-16 20:31:31',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(519,'2013-03-17 17:44:39','USER_LOGIN',1,'2013-03-17 18:44:39',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(520,'2013-03-17 20:40:57','USER_LOGIN',1,'2013-03-17 21:40:57',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(521,'2013-03-17 23:14:05','USER_LOGIN',1,'2013-03-18 00:14:05',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(522,'2013-03-17 23:28:47','USER_LOGOUT',1,'2013-03-18 00:28:47',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(523,'2013-03-17 23:28:54','USER_LOGIN',1,'2013-03-18 00:28:54',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(524,'2013-03-18 17:37:30','USER_LOGIN',1,'2013-03-18 18:37:30',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(525,'2013-03-18 18:11:37','USER_LOGIN',1,'2013-03-18 19:11:37',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(526,'2013-03-19 08:35:08','USER_LOGIN',1,'2013-03-19 09:35:08',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(527,'2013-03-19 09:20:23','USER_LOGIN',1,'2013-03-19 10:20:23',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(528,'2013-03-20 13:17:13','USER_LOGIN',1,'2013-03-20 14:17:13',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(529,'2013-03-20 14:44:31','USER_LOGIN',1,'2013-03-20 15:44:31',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(530,'2013-03-20 18:24:25','USER_LOGIN',1,'2013-03-20 19:24:25',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(531,'2013-03-20 19:15:54','USER_LOGIN',1,'2013-03-20 20:15:54',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(532,'2013-03-21 18:40:47','USER_LOGIN',1,'2013-03-21 19:40:47',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(533,'2013-03-21 21:42:24','USER_LOGIN',1,'2013-03-21 22:42:24',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(534,'2013-03-22 08:39:23','USER_LOGIN',1,'2013-03-22 09:39:23',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(535,'2013-03-23 13:04:55','USER_LOGIN',1,'2013-03-23 14:04:55',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(536,'2013-03-23 15:47:43','USER_LOGIN',1,'2013-03-23 16:47:43',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(537,'2013-03-23 22:56:36','USER_LOGIN',1,'2013-03-23 23:56:36',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(538,'2013-03-24 01:22:32','USER_LOGIN',1,'2013-03-24 02:22:32',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(539,'2013-03-24 14:40:42','USER_LOGIN',1,'2013-03-24 15:40:42',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(540,'2013-03-24 15:30:26','USER_LOGOUT',1,'2013-03-24 16:30:26',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(541,'2013-03-24 15:30:29','USER_LOGIN',1,'2013-03-24 16:30:29',2,'(UserLogged,demo)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(542,'2013-03-24 15:49:40','USER_LOGOUT',1,'2013-03-24 16:49:40',2,'(UserLogoff,demo)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(543,'2013-03-24 15:49:48','USER_LOGIN',1,'2013-03-24 16:49:48',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(544,'2013-03-24 15:52:35','USER_MODIFY',1,'2013-03-24 16:52:35',1,'Modification utilisateur zzzg','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(545,'2013-03-24 15:52:52','USER_MODIFY',1,'2013-03-24 16:52:52',1,'Modification utilisateur zzzg','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(546,'2013-03-24 15:53:09','USER_MODIFY',1,'2013-03-24 16:53:09',1,'Modification utilisateur zzzg','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(547,'2013-03-24 15:53:23','USER_MODIFY',1,'2013-03-24 16:53:23',1,'Modification utilisateur zzzg','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(548,'2013-03-24 16:00:04','USER_MODIFY',1,'2013-03-24 17:00:04',1,'Modification utilisateur zzzg','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(549,'2013-03-24 16:01:50','USER_MODIFY',1,'2013-03-24 17:01:50',1,'Modification utilisateur zzzg','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(550,'2013-03-24 16:10:14','USER_MODIFY',1,'2013-03-24 17:10:14',1,'Modification utilisateur zzzg','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(551,'2013-03-24 16:55:13','USER_LOGIN',1,'2013-03-24 17:55:13',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(552,'2013-03-24 17:44:29','USER_LOGIN',1,'2013-03-24 18:44:29',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(553,'2013-09-08 23:06:26','USER_LOGIN',1,'2013-09-09 01:06:26',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/29.0.1547.57 Safari/537.36',NULL),(554,'2013-10-21 22:32:28','USER_LOGIN',1,'2013-10-22 00:32:28',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/30.0.1599.66 Safari/537.36',NULL),(555,'2013-10-21 22:32:48','USER_LOGIN',1,'2013-10-22 00:32:48',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/30.0.1599.66 Safari/537.36',NULL),(556,'2013-11-07 00:01:51','USER_LOGIN',1,'2013-11-07 01:01:51',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/30.0.1599.114 Safari/537.36',NULL),(557,'2014-03-02 15:21:07','USER_LOGIN',1,'2014-03-02 16:21:07',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/33.0.1750.117 Safari/537.36',NULL),(558,'2014-03-02 15:36:53','USER_LOGIN',1,'2014-03-02 16:36:53',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/33.0.1750.117 Safari/537.36',NULL),(559,'2014-03-02 18:54:23','USER_LOGIN',1,'2014-03-02 19:54:23',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/33.0.1750.117 Safari/537.36',NULL),(560,'2014-03-02 19:11:17','USER_LOGIN',1,'2014-03-02 20:11:17',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/33.0.1750.117 Safari/537.36',NULL),(561,'2014-03-03 18:19:24','USER_LOGIN',1,'2014-03-03 19:19:24',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/33.0.1750.117 Safari/537.36',NULL),(562,'2014-12-21 12:51:38','USER_LOGIN',1,'2014-12-21 13:51:38',1,'(UserLogged,admin) - TZ=1;TZString=CET;Screen=1920x969','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/38.0.2125.111 Safari/537.36',NULL),(563,'2014-12-21 19:52:09','USER_LOGIN',1,'2014-12-21 20:52:09',1,'(UserLogged,admin) - TZ=1;TZString=CET;Screen=1920x969','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/38.0.2125.111 Safari/537.36',NULL),(566,'2015-10-03 08:49:43','USER_NEW_PASSWORD',1,'2015-10-03 10:49:43',1,'Password change for admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(567,'2015-10-03 08:49:43','USER_MODIFY',1,'2015-10-03 10:49:43',1,'User admin modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(568,'2015-10-03 09:03:12','USER_MODIFY',1,'2015-10-03 11:03:12',1,'User admin modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(569,'2015-10-03 09:03:42','USER_MODIFY',1,'2015-10-03 11:03:42',1,'User admin modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(570,'2015-10-03 09:07:36','USER_MODIFY',1,'2015-10-03 11:07:36',1,'User demo modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(571,'2015-10-03 09:08:58','USER_NEW_PASSWORD',1,'2015-10-03 11:08:58',1,'Password change for pcurie','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(572,'2015-10-03 09:08:58','USER_MODIFY',1,'2015-10-03 11:08:58',1,'User pcurie modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(573,'2015-10-03 09:09:23','USER_MODIFY',1,'2015-10-03 11:09:23',1,'User pcurie modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(574,'2015-10-03 09:11:04','USER_NEW_PASSWORD',1,'2015-10-03 11:11:04',1,'Password change for athestudent','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(575,'2015-10-03 09:11:04','USER_MODIFY',1,'2015-10-03 11:11:04',1,'User athestudent modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(576,'2015-10-03 09:11:53','USER_MODIFY',1,'2015-10-03 11:11:53',1,'User abookkeeper modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(577,'2015-10-03 09:42:12','USER_LOGIN_FAILED',1,'2015-10-03 11:42:11',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(578,'2015-10-03 09:42:19','USER_LOGIN_FAILED',1,'2015-10-03 11:42:19',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(579,'2015-10-03 09:42:42','USER_LOGIN_FAILED',1,'2015-10-03 11:42:42',NULL,'Bad value for login or password - login=aeinstein','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(580,'2015-10-03 09:43:50','USER_LOGIN',1,'2015-10-03 11:43:50',1,'(UserLogged,admin) - TZ=1;TZString=Europe/Berlin;Screen=1600x788','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(581,'2015-10-03 09:44:44','GROUP_MODIFY',1,'2015-10-03 11:44:44',1,'Group Sale representatives modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(582,'2015-10-03 09:46:25','GROUP_CREATE',1,'2015-10-03 11:46:25',1,'Group Management created','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(583,'2015-10-03 09:46:46','GROUP_CREATE',1,'2015-10-03 11:46:46',1,'Group Scientists created','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(584,'2015-10-03 09:47:41','USER_CREATE',1,'2015-10-03 11:47:41',1,'User mcurie created','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(585,'2015-10-03 09:47:41','USER_NEW_PASSWORD',1,'2015-10-03 11:47:41',1,'Password change for mcurie','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(586,'2015-10-03 09:47:53','USER_MODIFY',1,'2015-10-03 11:47:53',1,'User mcurie modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(587,'2015-10-03 09:48:32','USER_DELETE',1,'2015-10-03 11:48:32',1,'User bbb removed','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(588,'2015-10-03 09:48:52','USER_MODIFY',1,'2015-10-03 11:48:52',1,'User bookkeeper modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(589,'2015-10-03 10:01:28','USER_MODIFY',1,'2015-10-03 12:01:28',1,'User bookkeeper modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(590,'2015-10-03 10:01:39','USER_MODIFY',1,'2015-10-03 12:01:39',1,'User bookkeeper modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(591,'2015-10-05 06:32:38','USER_LOGIN_FAILED',1,'2015-10-05 08:32:38',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(592,'2015-10-05 06:32:44','USER_LOGIN',1,'2015-10-05 08:32:44',1,'(UserLogged,admin) - TZ=1;TZString=Europe/Berlin;Screen=1590x767','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(593,'2015-10-05 07:07:52','USER_CREATE',1,'2015-10-05 09:07:52',1,'User atheceo created','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(594,'2015-10-05 07:07:52','USER_NEW_PASSWORD',1,'2015-10-05 09:07:52',1,'Password change for atheceo','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(595,'2015-10-05 07:09:08','USER_NEW_PASSWORD',1,'2015-10-05 09:09:08',1,'Password change for aeinstein','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(596,'2015-10-05 07:09:08','USER_MODIFY',1,'2015-10-05 09:09:08',1,'User aeinstein modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(597,'2015-10-05 07:09:46','USER_CREATE',1,'2015-10-05 09:09:46',1,'User admin created','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(598,'2015-10-05 07:09:46','USER_NEW_PASSWORD',1,'2015-10-05 09:09:46',1,'Password change for admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(599,'2015-10-05 07:10:20','USER_MODIFY',1,'2015-10-05 09:10:20',1,'User demo modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(600,'2015-10-05 07:10:48','USER_MODIFY',1,'2015-10-05 09:10:48',1,'User admin modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(601,'2015-10-05 07:11:22','USER_NEW_PASSWORD',1,'2015-10-05 09:11:22',1,'Password change for bbookkeeper','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(602,'2015-10-05 07:11:22','USER_MODIFY',1,'2015-10-05 09:11:22',1,'User bbookkeeper modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(603,'2015-10-05 07:12:37','USER_MODIFY',1,'2015-10-05 09:12:37',1,'User admin modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(604,'2015-10-05 07:13:27','USER_MODIFY',1,'2015-10-05 09:13:27',1,'User demo modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(605,'2015-10-05 07:13:52','USER_MODIFY',1,'2015-10-05 09:13:52',1,'User admin modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(606,'2015-10-05 07:14:35','USER_LOGOUT',1,'2015-10-05 09:14:35',1,'(UserLogoff,aeinstein)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(607,'2015-10-05 07:14:40','USER_LOGIN_FAILED',1,'2015-10-05 09:14:40',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(608,'2015-10-05 07:14:44','USER_LOGIN_FAILED',1,'2015-10-05 09:14:44',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(609,'2015-10-05 07:14:49','USER_LOGIN',1,'2015-10-05 09:14:49',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Berlin;Screen=1590x767','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(610,'2015-10-05 07:57:18','USER_MODIFY',1,'2015-10-05 09:57:18',12,'User aeinstein modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(611,'2015-10-05 08:06:54','USER_LOGOUT',1,'2015-10-05 10:06:54',12,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(612,'2015-10-05 08:07:03','USER_LOGIN',1,'2015-10-05 10:07:03',11,'(UserLogged,atheceo) - TZ=1;TZString=Europe/Berlin;Screen=1590x767','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(613,'2015-10-05 19:18:46','USER_LOGIN',1,'2015-10-05 21:18:46',11,'(UserLogged,atheceo) - TZ=1;TZString=Europe/Berlin;Screen=1590x767','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(614,'2015-10-05 19:29:35','USER_CREATE',1,'2015-10-05 21:29:35',11,'User ccommercy created','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(615,'2015-10-05 19:29:35','USER_NEW_PASSWORD',1,'2015-10-05 21:29:35',11,'Password change for ccommercy','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(616,'2015-10-05 19:30:13','GROUP_CREATE',1,'2015-10-05 21:30:13',11,'Group Commercial created','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(617,'2015-10-05 19:31:37','USER_NEW_PASSWORD',1,'2015-10-05 21:31:37',11,'Password change for admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(618,'2015-10-05 19:31:37','USER_MODIFY',1,'2015-10-05 21:31:37',11,'User admin modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(619,'2015-10-05 19:32:00','USER_MODIFY',1,'2015-10-05 21:32:00',11,'User admin modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(620,'2015-10-05 19:33:33','USER_CREATE',1,'2015-10-05 21:33:33',11,'User sscientol created','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(621,'2015-10-05 19:33:33','USER_NEW_PASSWORD',1,'2015-10-05 21:33:33',11,'Password change for sscientol','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(622,'2015-10-05 19:33:47','USER_NEW_PASSWORD',1,'2015-10-05 21:33:47',11,'Password change for mcurie','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(623,'2015-10-05 19:33:47','USER_MODIFY',1,'2015-10-05 21:33:47',11,'User mcurie modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(624,'2015-10-05 19:34:23','USER_NEW_PASSWORD',1,'2015-10-05 21:34:23',11,'Password change for pcurie','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(625,'2015-10-05 19:34:23','USER_MODIFY',1,'2015-10-05 21:34:23',11,'User pcurie modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(626,'2015-10-05 19:34:42','USER_MODIFY',1,'2015-10-05 21:34:42',11,'User aeinstein modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(627,'2015-10-05 19:36:06','USER_NEW_PASSWORD',1,'2015-10-05 21:36:06',11,'Password change for ccommercy','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(628,'2015-10-05 19:36:06','USER_MODIFY',1,'2015-10-05 21:36:06',11,'User ccommercy modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(629,'2015-10-05 19:36:57','USER_NEW_PASSWORD',1,'2015-10-05 21:36:57',11,'Password change for atheceo','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(630,'2015-10-05 19:36:57','USER_MODIFY',1,'2015-10-05 21:36:57',11,'User atheceo modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(631,'2015-10-05 19:37:27','USER_LOGOUT',1,'2015-10-05 21:37:27',11,'(UserLogoff,atheceo)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(632,'2015-10-05 19:37:35','USER_LOGIN_FAILED',1,'2015-10-05 21:37:35',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(633,'2015-10-05 19:37:39','USER_LOGIN_FAILED',1,'2015-10-05 21:37:39',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(634,'2015-10-05 19:37:44','USER_LOGIN_FAILED',1,'2015-10-05 21:37:44',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(635,'2015-10-05 19:37:49','USER_LOGIN_FAILED',1,'2015-10-05 21:37:49',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(636,'2015-10-05 19:38:12','USER_LOGIN_FAILED',1,'2015-10-05 21:38:12',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(637,'2015-10-05 19:40:48','USER_LOGIN_FAILED',1,'2015-10-05 21:40:48',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(638,'2015-10-05 19:40:55','USER_LOGIN',1,'2015-10-05 21:40:55',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Berlin;Screen=1590x767','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(639,'2015-10-05 19:43:34','USER_MODIFY',1,'2015-10-05 21:43:34',12,'User aeinstein modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(640,'2015-10-05 19:45:43','USER_CREATE',1,'2015-10-05 21:45:43',12,'User aaa created','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(641,'2015-10-05 19:45:43','USER_NEW_PASSWORD',1,'2015-10-05 21:45:43',12,'Password change for aaa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(642,'2015-10-05 19:46:18','USER_DELETE',1,'2015-10-05 21:46:18',12,'User aaa removed','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(643,'2015-10-05 19:47:09','USER_MODIFY',1,'2015-10-05 21:47:09',12,'User demo modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(644,'2015-10-05 19:47:22','USER_MODIFY',1,'2015-10-05 21:47:22',12,'User demo modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(645,'2015-10-05 19:52:05','USER_MODIFY',1,'2015-10-05 21:52:05',12,'User sscientol modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(646,'2015-10-05 19:52:23','USER_MODIFY',1,'2015-10-05 21:52:23',12,'User bbookkeeper modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(647,'2015-10-05 19:54:54','USER_NEW_PASSWORD',1,'2015-10-05 21:54:54',12,'Password change for zzeceo','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(648,'2015-10-05 19:54:54','USER_MODIFY',1,'2015-10-05 21:54:54',12,'User zzeceo modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(649,'2015-10-05 19:57:02','USER_MODIFY',1,'2015-10-05 21:57:02',12,'User zzeceo modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(650,'2015-10-05 19:57:57','USER_NEW_PASSWORD',1,'2015-10-05 21:57:57',12,'Password change for pcurie','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(651,'2015-10-05 19:57:57','USER_MODIFY',1,'2015-10-05 21:57:57',12,'User pcurie modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(652,'2015-10-05 19:59:42','USER_NEW_PASSWORD',1,'2015-10-05 21:59:42',12,'Password change for admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(653,'2015-10-05 19:59:42','USER_MODIFY',1,'2015-10-05 21:59:42',12,'User admin modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(654,'2015-10-05 20:00:21','USER_MODIFY',1,'2015-10-05 22:00:21',12,'User adminx modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(655,'2015-10-05 20:05:36','USER_MODIFY',1,'2015-10-05 22:05:36',12,'User admin modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(656,'2015-10-05 20:06:25','USER_MODIFY',1,'2015-10-05 22:06:25',12,'User ccommercy modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(657,'2015-10-05 20:07:18','USER_MODIFY',1,'2015-10-05 22:07:18',12,'User mcurie modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(658,'2015-10-05 20:07:36','USER_MODIFY',1,'2015-10-05 22:07:36',12,'User aeinstein modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(659,'2015-10-05 20:08:34','USER_MODIFY',1,'2015-10-05 22:08:34',12,'User bbookkeeper modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(660,'2015-10-05 20:47:52','USER_CREATE',1,'2015-10-05 22:47:52',12,'User cc1 created','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(661,'2015-10-05 20:47:52','USER_NEW_PASSWORD',1,'2015-10-05 22:47:52',12,'Password change for cc1','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(662,'2015-10-05 20:47:55','USER_LOGOUT',1,'2015-10-05 22:47:55',12,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(663,'2015-10-05 20:48:08','USER_LOGIN',1,'2015-10-05 22:48:08',11,'(UserLogged,zzeceo) - TZ=1;TZString=Europe/Berlin;Screen=1590x434','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(664,'2015-10-05 20:48:39','USER_CREATE',1,'2015-10-05 22:48:39',11,'User cc2 created','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(665,'2015-10-05 20:48:39','USER_NEW_PASSWORD',1,'2015-10-05 22:48:39',11,'Password change for cc2','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(666,'2015-10-05 20:48:59','USER_NEW_PASSWORD',1,'2015-10-05 22:48:59',11,'Password change for cc1','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(667,'2015-10-05 20:48:59','USER_MODIFY',1,'2015-10-05 22:48:59',11,'User cc1 modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(668,'2015-10-05 21:06:36','USER_LOGOUT',1,'2015-10-05 23:06:35',11,'(UserLogoff,zzeceo)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(669,'2015-10-05 21:06:44','USER_LOGIN_FAILED',1,'2015-10-05 23:06:44',NULL,'Bad value for login or password - login=cc1','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(670,'2015-10-05 21:07:12','USER_LOGIN_FAILED',1,'2015-10-05 23:07:12',NULL,'Bad value for login or password - login=cc1','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(671,'2015-10-05 21:07:19','USER_LOGIN_FAILED',1,'2015-10-05 23:07:19',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(672,'2015-10-05 21:07:27','USER_LOGIN_FAILED',1,'2015-10-05 23:07:27',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(673,'2015-10-05 21:07:32','USER_LOGIN',1,'2015-10-05 23:07:32',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Berlin;Screen=1590x767','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(674,'2015-10-05 21:12:28','USER_NEW_PASSWORD',1,'2015-10-05 23:12:28',12,'Password change for cc1','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(675,'2015-10-05 21:12:28','USER_MODIFY',1,'2015-10-05 23:12:28',12,'User cc1 modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(676,'2015-10-05 21:13:00','USER_CREATE',1,'2015-10-05 23:13:00',12,'User aaa created','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(677,'2015-10-05 21:13:00','USER_NEW_PASSWORD',1,'2015-10-05 23:13:00',12,'Password change for aaa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(678,'2015-10-05 21:13:40','USER_DELETE',1,'2015-10-05 23:13:40',12,'User aaa removed','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(679,'2015-10-05 21:14:47','USER_LOGOUT',1,'2015-10-05 23:14:47',12,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(680,'2015-10-05 21:14:56','USER_LOGIN',1,'2015-10-05 23:14:56',16,'(UserLogged,cc1) - TZ=1;TZString=Europe/Berlin;Screen=1590x767','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(681,'2015-10-05 21:15:56','USER_LOGOUT',1,'2015-10-05 23:15:56',16,'(UserLogoff,cc1)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(682,'2015-10-05 21:16:06','USER_LOGIN',1,'2015-10-05 23:16:06',17,'(UserLogged,cc2) - TZ=1;TZString=Europe/Berlin;Screen=1590x767','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(683,'2015-10-05 21:37:25','USER_LOGOUT',1,'2015-10-05 23:37:25',17,'(UserLogoff,cc2)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(684,'2015-10-05 21:37:31','USER_LOGIN',1,'2015-10-05 23:37:31',16,'(UserLogged,cc1) - TZ=1;TZString=Europe/Berlin;Screen=1590x767','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(685,'2015-10-05 21:43:53','USER_LOGOUT',1,'2015-10-05 23:43:53',16,'(UserLogoff,cc1)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(686,'2015-10-05 21:44:00','USER_LOGIN',1,'2015-10-05 23:44:00',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Berlin;Screen=1590x767','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(687,'2015-10-05 21:46:17','USER_LOGOUT',1,'2015-10-05 23:46:17',12,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(688,'2015-10-05 21:46:24','USER_LOGIN',1,'2015-10-05 23:46:24',16,'(UserLogged,cc1) - TZ=1;TZString=Europe/Berlin;Screen=1590x767','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(689,'2015-11-04 15:17:06','USER_LOGIN',1,'2015-11-04 16:17:06',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Berlin;Screen=1600x790','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL),(690,'2015-11-15 22:04:04','USER_LOGIN',1,'2015-11-15 23:04:04',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Berlin;Screen=1600x790','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL),(691,'2015-11-15 22:23:45','USER_MODIFY',1,'2015-11-15 23:23:45',12,'User ccommercy modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL),(692,'2015-11-15 22:24:22','USER_MODIFY',1,'2015-11-15 23:24:22',12,'User cc1 modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL),(693,'2015-11-15 22:24:53','USER_MODIFY',1,'2015-11-15 23:24:53',12,'User cc2 modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL),(694,'2015-11-15 22:25:17','USER_MODIFY',1,'2015-11-15 23:25:17',12,'User cc1 modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL),(695,'2015-11-15 22:45:37','USER_LOGOUT',1,'2015-11-15 23:45:37',12,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL),(696,'2015-11-18 13:41:02','USER_LOGIN',1,'2015-11-18 14:41:02',2,'(UserLogged,demo) - TZ=1;TZString=Europe/Berlin;Screen=1600x790','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL),(697,'2015-11-18 14:23:35','USER_LOGIN',1,'2015-11-18 15:23:35',2,'(UserLogged,demo) - TZ=1;TZString=Europe/Berlin;Screen=1600x790','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL),(698,'2015-11-18 15:15:46','USER_LOGOUT',1,'2015-11-18 16:15:46',2,'(UserLogoff,demo)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL),(699,'2015-11-18 15:15:51','USER_LOGIN',1,'2015-11-18 16:15:51',2,'(UserLogged,demo) - TZ=1;TZString=Europe/Berlin;Screen=1600x790','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL),(700,'2015-11-30 17:52:08','USER_LOGIN',1,'2015-11-30 18:52:08',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Berlin;Screen=1600x790','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL),(701,'2016-01-10 16:45:43','USER_LOGIN',1,'2016-01-10 17:45:43',2,'(UserLogged,demo) - TZ=1;TZString=Europe/Berlin;Screen=1600x790','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL),(702,'2016-01-10 16:45:52','USER_LOGOUT',1,'2016-01-10 17:45:52',2,'(UserLogoff,demo)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL),(703,'2016-01-10 16:46:06','USER_LOGIN',1,'2016-01-10 17:46:06',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Berlin;Screen=1600x790','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL),(704,'2016-01-16 14:53:47','USER_LOGIN',1,'2016-01-16 15:53:47',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Berlin;Screen=1600x790','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL),(705,'2016-01-16 15:04:29','USER_LOGOUT',1,'2016-01-16 16:04:29',12,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL),(706,'2016-01-16 15:04:40','USER_LOGIN',1,'2016-01-16 16:04:40',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Berlin;Screen=1600x790','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL),(707,'2016-01-22 09:33:26','USER_LOGIN',1,'2016-01-22 10:33:26',2,'(UserLogged,demo) - TZ=1;TZString=Europe/Berlin;Screen=1600x790','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL),(708,'2016-01-22 09:35:19','USER_LOGOUT',1,'2016-01-22 10:35:19',2,'(UserLogoff,demo)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL),(709,'2016-01-22 09:35:29','USER_LOGIN',1,'2016-01-22 10:35:29',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Berlin;Screen=1600x790','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL),(710,'2016-01-22 10:47:34','USER_CREATE',1,'2016-01-22 11:47:34',12,'User aaa created','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL),(711,'2016-01-22 10:47:34','USER_NEW_PASSWORD',1,'2016-01-22 11:47:34',12,'Password change for aaa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL),(712,'2016-01-22 12:07:56','USER_LOGIN',1,'2016-01-22 13:07:56',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Berlin;Screen=1600x790','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL),(713,'2016-01-22 12:36:25','USER_NEW_PASSWORD',1,'2016-01-22 13:36:25',12,'Password change for admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL),(714,'2016-01-22 12:36:25','USER_MODIFY',1,'2016-01-22 13:36:25',12,'User admin modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL),(715,'2016-01-22 12:56:32','USER_MODIFY',1,'2016-01-22 13:56:32',12,'User admin modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL),(716,'2016-01-22 12:58:05','USER_MODIFY',1,'2016-01-22 13:58:05',12,'User admin modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL),(717,'2016-01-22 13:01:02','USER_MODIFY',1,'2016-01-22 14:01:02',12,'User admin modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL),(718,'2016-01-22 13:01:18','USER_MODIFY',1,'2016-01-22 14:01:18',12,'User admin modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL),(719,'2016-01-22 13:13:42','USER_MODIFY',1,'2016-01-22 14:13:42',12,'User admin modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL),(720,'2016-01-22 13:15:20','USER_DELETE',1,'2016-01-22 14:15:20',12,'User aaa removed','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL),(721,'2016-01-22 13:19:21','USER_LOGOUT',1,'2016-01-22 14:19:21',12,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL),(722,'2016-01-22 13:19:32','USER_LOGIN',1,'2016-01-22 14:19:32',2,'(UserLogged,demo) - TZ=1;TZString=Europe/Berlin;Screen=1600x790','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL),(723,'2016-01-22 13:19:51','USER_LOGOUT',1,'2016-01-22 14:19:51',2,'(UserLogoff,demo)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL),(724,'2016-01-22 13:20:01','USER_LOGIN',1,'2016-01-22 14:20:01',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Berlin;Screen=1600x790','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL),(725,'2016-01-22 13:28:22','USER_LOGOUT',1,'2016-01-22 14:28:22',12,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL),(726,'2016-01-22 13:28:35','USER_LOGIN',1,'2016-01-22 14:28:35',2,'(UserLogged,demo) - TZ=1;TZString=Europe/Berlin;Screen=1600x790','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL),(727,'2016-01-22 13:33:54','USER_LOGOUT',1,'2016-01-22 14:33:54',2,'(UserLogoff,demo)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL),(728,'2016-01-22 13:34:05','USER_LOGIN',1,'2016-01-22 14:34:05',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Berlin;Screen=1600x790','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL),(729,'2016-01-22 13:51:46','USER_MODIFY',1,'2016-01-22 14:51:46',12,'User ccommercy modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL),(730,'2016-01-22 16:20:12','USER_LOGIN',1,'2016-01-22 17:20:12',2,'(UserLogged,demo) - TZ=1;TZString=Europe/Berlin;Screen=1600x790','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.82 Safari/537.36',NULL),(731,'2016-01-22 16:20:22','USER_LOGOUT',1,'2016-01-22 17:20:22',2,'(UserLogoff,demo)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.82 Safari/537.36',NULL),(732,'2016-01-22 16:20:36','USER_LOGIN',1,'2016-01-22 17:20:36',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Berlin;Screen=1600x790','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.82 Safari/537.36',NULL),(733,'2016-01-22 16:27:02','USER_CREATE',1,'2016-01-22 17:27:02',12,'User ldestailleur created','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.82 Safari/537.36',NULL),(734,'2016-01-22 16:27:02','USER_NEW_PASSWORD',1,'2016-01-22 17:27:02',12,'Password change for ldestailleur','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.82 Safari/537.36',NULL),(735,'2016-01-22 16:28:34','USER_MODIFY',1,'2016-01-22 17:28:34',12,'User ldestailleur modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.82 Safari/537.36',NULL),(736,'2016-01-22 16:30:01','USER_ENABLEDISABLE',1,'2016-01-22 17:30:01',12,'User cc2 activated','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.82 Safari/537.36',NULL),(737,'2016-01-22 17:11:06','USER_LOGIN',1,'2016-01-22 18:11:06',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Berlin;Screen=1600x790','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.82 Safari/537.36',NULL),(738,'2016-01-22 18:00:02','USER_DELETE',1,'2016-01-22 19:00:02',12,'User zzz removed','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.82 Safari/537.36',NULL),(739,'2016-01-22 18:01:40','USER_DELETE',1,'2016-01-22 19:01:40',12,'User aaab removed','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.82 Safari/537.36',NULL),(740,'2016-01-22 18:01:52','USER_DELETE',1,'2016-01-22 19:01:52',12,'User zzzg removed','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.82 Safari/537.36',NULL),(741,'2016-03-13 10:54:59','USER_LOGIN',1,'2016-03-13 14:54:59',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x971','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/49.0.2623.87 Safari/537.36',NULL),(742,'2016-07-30 11:13:10','USER_LOGIN',1,'2016-07-30 15:13:10',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL),(743,'2016-07-30 12:50:23','USER_CREATE',1,'2016-07-30 16:50:23',12,'User eldy created','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL),(744,'2016-07-30 12:50:23','USER_CREATE',1,'2016-07-30 16:50:23',12,'User eldy created','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL),(745,'2016-07-30 12:50:23','USER_NEW_PASSWORD',1,'2016-07-30 16:50:23',12,'Password change for eldy','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL),(746,'2016-07-30 12:50:38','USER_MODIFY',1,'2016-07-30 16:50:38',12,'User eldy modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL),(747,'2016-07-30 12:50:54','USER_DELETE',1,'2016-07-30 16:50:54',12,'User eldy removed','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL),(748,'2016-07-30 12:51:23','USER_NEW_PASSWORD',1,'2016-07-30 16:51:23',12,'Password change for ldestailleur','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL),(749,'2016-07-30 12:51:23','USER_MODIFY',1,'2016-07-30 16:51:23',12,'User ldestailleur modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL),(750,'2016-07-30 18:26:58','USER_LOGIN',1,'2016-07-30 22:26:58',18,'(UserLogged,ldestailleur) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL),(751,'2016-07-30 18:27:40','USER_LOGOUT',1,'2016-07-30 22:27:40',18,'(UserLogoff,ldestailleur)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL),(752,'2016-07-30 18:27:47','USER_LOGIN',1,'2016-07-30 22:27:47',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL),(753,'2016-07-30 19:00:00','USER_LOGOUT',1,'2016-07-30 23:00:00',12,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL),(754,'2016-07-30 19:00:04','USER_LOGIN',1,'2016-07-30 23:00:04',2,'(UserLogged,demo) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL),(755,'2016-07-30 19:00:14','USER_LOGOUT',1,'2016-07-30 23:00:14',2,'(UserLogoff,demo)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL),(756,'2016-07-30 19:00:19','USER_LOGIN',1,'2016-07-30 23:00:19',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL),(757,'2016-07-30 19:00:43','USER_LOGOUT',1,'2016-07-30 23:00:43',12,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL),(758,'2016-07-30 19:00:48','USER_LOGIN',1,'2016-07-30 23:00:48',2,'(UserLogged,demo) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL),(759,'2016-07-30 19:03:52','USER_LOGOUT',1,'2016-07-30 23:03:52',2,'(UserLogoff,demo)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL),(760,'2016-07-30 19:03:57','USER_LOGIN_FAILED',1,'2016-07-30 23:03:57',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL),(761,'2016-07-30 19:03:59','USER_LOGIN',1,'2016-07-30 23:03:59',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL),(762,'2016-07-30 19:04:13','USER_LOGOUT',1,'2016-07-30 23:04:13',12,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL),(763,'2016-07-30 19:04:17','USER_LOGIN',1,'2016-07-30 23:04:17',2,'(UserLogged,demo) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL),(764,'2016-07-30 19:04:26','USER_LOGOUT',1,'2016-07-30 23:04:26',2,'(UserLogoff,demo)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL),(765,'2016-07-30 19:04:31','USER_LOGIN',1,'2016-07-30 23:04:31',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL),(766,'2016-07-30 19:10:50','USER_LOGOUT',1,'2016-07-30 23:10:50',12,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL),(767,'2016-07-30 19:10:54','USER_LOGIN',1,'2016-07-30 23:10:54',2,'(UserLogged,demo) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL),(768,'2016-07-31 10:15:52','USER_LOGIN',1,'2016-07-31 14:15:52',12,'(UserLogged,admin) - TZ=;TZString=;Screen=x','127.0.0.1','Lynx/2.8.8pre.4 libwww-FM/2.14 SSL-MM/1.4.1 GNUTLS/2.12.23',NULL),(769,'2016-07-31 10:16:27','USER_LOGIN',1,'2016-07-31 14:16:27',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL),(770,'2016-07-31 10:32:14','USER_LOGIN',1,'2016-07-31 14:32:14',12,'(UserLogged,admin) - TZ=;TZString=;Screen=x','127.0.0.1','Lynx/2.8.8pre.4 libwww-FM/2.14 SSL-MM/1.4.1 GNUTLS/2.12.23',NULL),(771,'2016-07-31 10:36:28','USER_LOGIN',1,'2016-07-31 14:36:28',12,'(UserLogged,admin) - TZ=;TZString=;Screen=x','127.0.0.1','Links (2.8; Linux 3.19.0-46-generic x86_64; GNU C 4.8.2; text)',NULL),(772,'2016-07-31 10:40:10','USER_LOGIN',1,'2016-07-31 14:40:10',12,'(UserLogged,admin) - TZ=;TZString=;Screen=x','127.0.0.1','Links (2.8; Linux 3.19.0-46-generic x86_64; GNU C 4.8.2; text)',NULL),(773,'2016-07-31 10:54:16','USER_LOGIN',1,'2016-07-31 14:54:16',12,'(UserLogged,admin) - TZ=;TZString=;Screen=x','127.0.0.1','Lynx/2.8.8pre.4 libwww-FM/2.14 SSL-MM/1.4.1 GNUTLS/2.12.23',NULL),(774,'2016-07-31 12:52:52','USER_LOGIN',1,'2016-07-31 16:52:52',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x592','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL),(775,'2016-07-31 13:25:33','USER_LOGOUT',1,'2016-07-31 17:25:33',12,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL),(776,'2016-07-31 13:26:32','USER_LOGIN',1,'2016-07-31 17:26:32',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1280x751','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL),(777,'2016-07-31 14:13:57','USER_LOGOUT',1,'2016-07-31 18:13:57',12,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL),(778,'2016-07-31 14:14:04','USER_LOGIN',1,'2016-07-31 18:14:04',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL),(779,'2016-07-31 16:04:35','USER_LOGIN',1,'2016-07-31 20:04:34',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL),(780,'2016-07-31 21:14:14','USER_LOGIN',1,'2016-08-01 01:14:14',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL),(781,'2017-01-29 15:14:05','USER_LOGOUT',1,'2017-01-29 19:14:05',12,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36',NULL),(782,'2017-01-29 15:34:43','USER_LOGIN',1,'2017-01-29 19:34:43',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x571','192.168.0.254','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36',NULL),(783,'2017-01-29 15:35:04','USER_LOGOUT',1,'2017-01-29 19:35:04',12,'(UserLogoff,admin)','192.168.0.254','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36',NULL),(784,'2017-01-29 15:35:12','USER_LOGIN',1,'2017-01-29 19:35:12',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','192.168.0.254','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36',NULL),(785,'2017-01-29 15:36:43','USER_LOGOUT',1,'2017-01-29 19:36:43',12,'(UserLogoff,admin)','192.168.0.254','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36',NULL),(786,'2017-01-29 15:41:21','USER_LOGIN',1,'2017-01-29 19:41:21',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x571','192.168.0.254','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36',NULL),(787,'2017-01-29 15:41:41','USER_LOGOUT',1,'2017-01-29 19:41:41',12,'(UserLogoff,admin)','192.168.0.254','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36',NULL),(788,'2017-01-29 15:42:43','USER_LOGIN',1,'2017-01-29 19:42:43',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x571','192.168.0.254','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36',NULL),(789,'2017-01-29 15:43:18','USER_LOGOUT',1,'2017-01-29 19:43:18',12,'(UserLogoff,admin)','192.168.0.254','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36',NULL),(790,'2017-01-29 15:46:31','USER_LOGIN',1,'2017-01-29 19:46:31',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x571','192.168.0.254','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36',NULL),(791,'2017-01-29 16:18:56','USER_LOGIN',1,'2017-01-29 20:18:56',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Berlin;Screen=360x526','192.168.0.254','Mozilla/5.0 (Linux; Android 6.0; LG-H818 Build/MRA58K; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/55.0.2883.91 Mobile Safari/537.36 - DoliDroid - Android client pour Dolibarr ERP-CRM',NULL),(792,'2017-01-29 17:20:59','USER_LOGIN',1,'2017-01-29 21:20:59',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36',NULL),(793,'2017-01-30 11:19:40','USER_LOGIN',1,'2017-01-30 15:19:40',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36',NULL),(794,'2017-01-31 16:49:39','USER_LOGIN',1,'2017-01-31 20:49:39',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x520','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36',NULL),(795,'2017-02-01 10:55:23','USER_LOGIN',1,'2017-02-01 14:55:23',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36',NULL),(796,'2017-02-01 13:34:31','USER_LOGIN',1,'2017-02-01 17:34:31',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36',NULL),(797,'2017-02-01 14:41:26','USER_LOGIN',1,'2017-02-01 18:41:26',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36',NULL),(798,'2017-02-01 23:51:48','USER_LOGIN_FAILED',1,'2017-02-02 03:51:48',NULL,'Bad value for login or password - login=autologin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36',NULL),(799,'2017-02-01 23:52:55','USER_LOGIN',1,'2017-02-02 03:52:55',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36',NULL),(800,'2017-02-01 23:55:45','USER_CREATE',1,'2017-02-02 03:55:45',12,'User aboston created','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36',NULL),(801,'2017-02-01 23:55:45','USER_NEW_PASSWORD',1,'2017-02-02 03:55:45',12,'Password change for aboston','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36',NULL),(802,'2017-02-01 23:56:38','USER_MODIFY',1,'2017-02-02 03:56:38',12,'User aboston modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36',NULL),(803,'2017-02-01 23:56:50','USER_MODIFY',1,'2017-02-02 03:56:50',12,'User aboston modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36',NULL),(804,'2017-02-02 01:14:44','USER_LOGIN',1,'2017-02-02 05:14:44',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36',NULL),(805,'2017-02-03 10:27:18','USER_LOGIN',1,'2017-02-03 14:27:18',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL),(806,'2017-02-04 10:22:34','USER_LOGIN',1,'2017-02-04 14:22:34',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x489','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL),(807,'2017-02-06 04:01:31','USER_LOGIN',1,'2017-02-06 08:01:31',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL),(808,'2017-02-06 10:21:32','USER_LOGIN',1,'2017-02-06 14:21:32',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL),(809,'2017-02-06 19:09:27','USER_LOGIN',1,'2017-02-06 23:09:27',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL),(810,'2017-02-06 23:39:17','USER_LOGIN',1,'2017-02-07 03:39:17',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL),(811,'2017-02-07 11:36:34','USER_LOGIN',1,'2017-02-07 15:36:34',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x676','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL),(812,'2017-02-07 18:51:53','USER_LOGIN',1,'2017-02-07 22:51:53',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL),(813,'2017-02-07 23:13:40','USER_LOGIN',1,'2017-02-08 03:13:40',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL),(814,'2017-02-08 09:29:12','USER_LOGIN',1,'2017-02-08 13:29:12',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL),(815,'2017-02-08 17:33:12','USER_LOGIN',1,'2017-02-08 21:33:12',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL),(816,'2017-02-09 17:30:34','USER_LOGIN',1,'2017-02-09 21:30:34',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL),(817,'2017-02-10 09:30:02','USER_LOGIN',1,'2017-02-10 13:30:02',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL),(818,'2017-02-10 16:16:14','USER_LOGIN',1,'2017-02-10 20:16:14',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL),(819,'2017-02-10 17:28:15','USER_LOGIN',1,'2017-02-10 21:28:15',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL),(820,'2017-02-11 12:54:03','USER_LOGIN',1,'2017-02-11 16:54:03',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL),(821,'2017-02-11 17:23:52','USER_LOGIN',1,'2017-02-11 21:23:52',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL),(822,'2017-02-12 12:44:03','USER_LOGIN',1,'2017-02-12 16:44:03',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL),(823,'2017-02-12 16:42:13','USER_LOGIN',1,'2017-02-12 20:42:13',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL),(824,'2017-02-12 19:14:18','USER_LOGIN',1,'2017-02-12 23:14:18',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL),(825,'2017-02-15 17:17:00','USER_LOGIN',1,'2017-02-15 21:17:00',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL),(826,'2017-02-15 22:02:40','USER_LOGIN',1,'2017-02-16 02:02:40',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL),(827,'2017-02-16 22:13:27','USER_LOGIN',1,'2017-02-17 02:13:27',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x619','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL),(828,'2017-02-16 23:54:04','USER_LOGIN',1,'2017-02-17 03:54:04',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL),(829,'2017-02-17 09:14:27','USER_LOGIN',1,'2017-02-17 13:14:27',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL),(830,'2017-02-17 12:07:05','USER_LOGIN',1,'2017-02-17 16:07:05',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL),(831,'2017-02-19 21:22:20','USER_LOGIN',1,'2017-02-20 01:22:20',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL),(832,'2017-02-20 09:26:47','USER_LOGIN',1,'2017-02-20 13:26:47',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL),(833,'2017-02-20 16:39:55','USER_LOGIN',1,'2017-02-20 20:39:55',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL),(834,'2017-02-20 16:49:00','USER_MODIFY',1,'2017-02-20 20:49:00',12,'Modification utilisateur ccommerson','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL),(835,'2017-02-20 17:57:15','USER_LOGIN',1,'2017-02-20 21:57:14',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL),(836,'2017-02-20 19:43:48','USER_LOGIN',1,'2017-02-20 23:43:48',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL),(837,'2017-02-21 00:04:05','USER_LOGIN',1,'2017-02-21 04:04:05',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL),(838,'2017-02-21 10:23:13','USER_LOGIN',1,'2017-02-21 14:23:13',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL),(839,'2017-02-21 10:30:17','USER_LOGOUT',1,'2017-02-21 14:30:17',12,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL),(840,'2017-02-21 10:30:22','USER_LOGIN',1,'2017-02-21 14:30:22',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL),(841,'2017-02-21 11:44:05','USER_LOGIN',1,'2017-02-21 15:44:05',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL),(842,'2017-05-12 09:02:48','USER_LOGIN',1,'2017-05-12 13:02:48',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.96 Safari/537.36',NULL);
 /*!40000 ALTER TABLE `llx_events` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -4553,7 +4555,7 @@ CREATE TABLE `llx_extrafields` (
 
 LOCK TABLES `llx_extrafields` WRITE;
 /*!40000 ALTER TABLE `llx_extrafields` DISABLE KEYS */;
-INSERT INTO `llx_extrafields` VALUES (2,'adherent','zzz',1,'2013-09-08 23:04:20','zzz','varchar','255',0,0,NULL,0,0,NULL,0,0),(23,'societe','anotheraddedfield',1,'2015-10-03 09:36:35','Another added field','varchar','15',0,1,'a:1:{s:7:\"options\";a:1:{s:0:\"\";N;}}',0,0,NULL,0,0),(27,'projet','priority',1,'2016-07-30 11:28:27','Priority','select','',0,1,'a:1:{s:7:\"options\";a:5:{i:1;s:1:\"1\";i:2;s:1:\"2\";i:3;s:1:\"3\";i:4;s:1:\"4\";i:5;s:1:\"5\";}}',0,0,NULL,0,0),(28,'societe','height',1,'2017-02-12 19:15:52','Height','varchar','128',1,0,'0',0,0,NULL,0,0),(29,'societe','weight',1,'2017-02-12 19:15:53','Weigth','varchar','128',2,0,'0',0,0,NULL,0,0),(30,'societe','prof',1,'2017-02-12 19:15:53','Profession','varchar','128',3,0,'0',0,0,NULL,0,0),(31,'societe','birthdate',1,'2017-02-12 19:15:53','Date of birth','date','0',4,0,'0',0,0,NULL,0,0);
+INSERT INTO `llx_extrafields` VALUES (2,'adherent','zzz',1,'2013-09-08 23:04:20','zzz','varchar','255',0,0,NULL,0,0,NULL,0,0),(27,'projet','priority',1,'2016-07-30 11:28:27','Priority','select','',0,1,'a:1:{s:7:\"options\";a:5:{i:1;s:1:\"1\";i:2;s:1:\"2\";i:3;s:1:\"3\";i:4;s:1:\"4\";i:5;s:1:\"5\";}}',0,0,NULL,0,0);
 /*!40000 ALTER TABLE `llx_extrafields` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -5053,6 +5055,7 @@ CREATE TABLE `llx_facturedet_rec` (
   `label` varchar(255) DEFAULT NULL,
   `description` text,
   `tva_tx` double(6,3) DEFAULT NULL,
+  `vat_src_code` varchar(10) DEFAULT '',
   `localtax1_tx` double(6,3) DEFAULT '0.000',
   `localtax1_type` varchar(10) NOT NULL DEFAULT '0',
   `localtax2_tx` double(6,3) DEFAULT '0.000',
@@ -5091,7 +5094,7 @@ CREATE TABLE `llx_facturedet_rec` (
 
 LOCK TABLES `llx_facturedet_rec` WRITE;
 /*!40000 ALTER TABLE `llx_facturedet_rec` DISABLE KEYS */;
-INSERT INTO `llx_facturedet_rec` VALUES (1,1,NULL,NULL,0,NULL,'&ugrave;k&ugrave;',0.000,0.000,'0',0.000,'0',1,0,NULL,10.00000000,10.00000000,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,0,1,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(3,2,NULL,NULL,0,NULL,'ddd',0.000,0.000,'0',0.000,'0',1,0,NULL,5.00000000,5.00000000,5.00000000,0.00000000,0.00000000,0.00000000,5.00000000,0,0,1,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000);
+INSERT INTO `llx_facturedet_rec` VALUES (1,1,NULL,NULL,0,NULL,'&ugrave;k&ugrave;',0.000,'',0.000,'0',0.000,'0',1,0,NULL,10.00000000,10.00000000,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,0,1,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(3,2,NULL,NULL,0,NULL,'ddd',0.000,'',0.000,'0',0.000,'0',1,0,NULL,5.00000000,5.00000000,5.00000000,0.00000000,0.00000000,0.00000000,5.00000000,0,0,1,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000);
 /*!40000 ALTER TABLE `llx_facturedet_rec` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -5742,7 +5745,7 @@ CREATE TABLE `llx_menu` (
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `idx_menu_uk_menu` (`menu_handler`,`fk_menu`,`position`,`url`,`entity`),
   KEY `idx_menu_menuhandler_type` (`menu_handler`,`type`)
-) ENGINE=InnoDB AUTO_INCREMENT=145149 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=145152 DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -5751,7 +5754,7 @@ CREATE TABLE `llx_menu` (
 
 LOCK TABLES `llx_menu` WRITE;
 /*!40000 ALTER TABLE `llx_menu` DISABLE KEYS */;
-INSERT INTO `llx_menu` VALUES (103094,'all',2,'agenda','top','agenda',0,NULL,NULL,100,'/comm/action/index.php','','Agenda','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2013-03-13 15:29:19'),(103095,'all',2,'agenda','left','agenda',103094,NULL,NULL,100,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda','','Actions','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2013-03-13 15:29:19'),(103096,'all',2,'agenda','left','agenda',103095,NULL,NULL,101,'/comm/action/card.php?mainmenu=agenda&amp;leftmenu=agenda&amp;action=create','','NewAction','commercial',NULL,NULL,'($user->rights->agenda->myactions->create||$user->rights->agenda->allactions->create)','$conf->agenda->enabled',2,'2013-03-13 15:29:19'),(103097,'all',2,'agenda','left','agenda',103095,NULL,NULL,102,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda','','Calendar','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2013-03-13 15:29:19'),(103098,'all',2,'agenda','left','agenda',103097,NULL,NULL,103,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filter=mine','','MenuToDoMyActions','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2013-03-13 15:29:19'),(103099,'all',2,'agenda','left','agenda',103097,NULL,NULL,104,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filter=mine','','MenuDoneMyActions','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2013-03-13 15:29:19'),(103100,'all',2,'agenda','left','agenda',103097,NULL,NULL,105,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo','','MenuToDoActions','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2013-03-13 15:29:19'),(103101,'all',2,'agenda','left','agenda',103097,NULL,NULL,106,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=done','','MenuDoneActions','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2013-03-13 15:29:19'),(103102,'all',2,'agenda','left','agenda',103095,NULL,NULL,112,'/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda','','List','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2013-03-13 15:29:19'),(103103,'all',2,'agenda','left','agenda',103102,NULL,NULL,113,'/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filter=mine','','MenuToDoMyActions','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2013-03-13 15:29:19'),(103104,'all',2,'agenda','left','agenda',103102,NULL,NULL,114,'/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filter=mine','','MenuDoneMyActions','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2013-03-13 15:29:19'),(103105,'all',2,'agenda','left','agenda',103102,NULL,NULL,115,'/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo','','MenuToDoActions','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2013-03-13 15:29:19'),(103106,'all',2,'agenda','left','agenda',103102,NULL,NULL,116,'/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=done','','MenuDoneActions','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2013-03-13 15:29:19'),(103107,'all',2,'agenda','left','agenda',103095,NULL,NULL,120,'/comm/action/rapport/index.php?mainmenu=agenda&amp;leftmenu=agenda','','Reportings','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$conf->agenda->enabled',2,'2013-03-13 15:29:19'),(103108,'all',2,'pos','top','pos',0,NULL,NULL,100,'/pos/backend/listefac.php','','POS','pos@pos',NULL,'1','1','1',2,'2013-03-13 20:33:09'),(103109,'all',2,'pos','left','pos',103108,NULL,NULL,100,'/pos/backend/list.php','','Tickets','pos@pos',NULL,NULL,'$user->rights->pos->backend','$conf->global->POS_USE_TICKETS',0,'2013-03-13 20:33:09'),(103110,'all',2,'pos','left','pos',103109,NULL,NULL,100,'/pos/backend/list.php','','List','main',NULL,NULL,'$user->rights->pos->backend','$conf->global->POS_USE_TICKETS',0,'2013-03-13 20:33:09'),(103111,'all',2,'pos','left','pos',103110,NULL,NULL,100,'/pos/backend/list.php?viewstatut=0','','StatusTicketDraft','pos@pos',NULL,NULL,'$user->rights->pos->backend','$conf->global->POS_USE_TICKETS',0,'2013-03-13 20:33:09'),(103112,'all',2,'pos','left','@pos',103110,NULL,NULL,100,'/pos/backend/list.php?viewstatut=1','','StatusTicketClosed','main',NULL,NULL,'$user->rights->pos->backend','$conf->global->POS_USE_TICKETS',0,'2013-03-13 20:33:09'),(103113,'all',2,'pos','left','@pos',103110,NULL,NULL,100,'/pos/backend/list.php?viewstatut=2','','StatusTicketProcessed','main',NULL,NULL,'$user->rights->pos->backend','$conf->global->POS_USE_TICKETS',0,'2013-03-13 20:33:09'),(103114,'all',2,'pos','left','@pos',103110,NULL,NULL,100,'/pos/backend/list.php?viewtype=1','','StatusTicketReturned','main',NULL,NULL,'$user->rights->pos->backend','$conf->global->POS_USE_TICKETS',0,'2013-03-13 20:33:09'),(103115,'all',2,'pos','left','pos',103108,NULL,NULL,100,'/pos/backend/listefac.php','','Factures','pos@pos',NULL,NULL,'$user->rights->pos->backend','1',0,'2013-03-13 20:33:09'),(103116,'all',2,'pos','left','pos',103115,NULL,NULL,100,'/pos/backend/listefac.php','','List','main',NULL,NULL,'$user->rights->pos->backend','1',0,'2013-03-13 20:33:09'),(103117,'all',2,'pos','left','pos',103116,NULL,NULL,100,'/pos/backend/listefac.php?viewstatut=0','','BillStatusDraft','bills',NULL,NULL,'$user->rights->pos->backend','1',0,'2013-03-13 20:33:09'),(103118,'all',2,'pos','left','@pos',103116,NULL,NULL,100,'/pos/backend/listefac.php?viewstatut=1','','BillStatusValidated','bills',NULL,NULL,'$user->rights->pos->backend','1',0,'2013-03-13 20:33:09'),(103119,'all',2,'pos','left','@pos',103116,NULL,NULL,100,'/pos/backend/listefac.php?viewstatut=2&viewtype=0','','BillStatusPaid','bills',NULL,NULL,'$user->rights->pos->backend','1',0,'2013-03-13 20:33:09'),(103120,'all',2,'pos','left','@pos',103116,NULL,NULL,100,'/pos/backend/listefac.php?viewtype=2','','BillStatusReturned','main',NULL,NULL,'$user->rights->pos->backend','1',0,'2013-03-13 20:33:09'),(103121,'all',2,'pos','left','@pos',103108,NULL,NULL,100,'/pos/frontend/index.php','','POS','main',NULL,NULL,'$user->rights->pos->frontend','1',0,'2013-03-13 20:33:09'),(103122,'all',2,'pos','left','@pos',103121,NULL,NULL,100,'/pos/frontend/index.php','','NewTicket','main',NULL,NULL,'$user->rights->pos->frontend','1',0,'2013-03-13 20:33:09'),(103123,'all',2,'pos','left','@pos',103121,NULL,NULL,101,'/pos/backend/closes.php','','CloseandArching','main',NULL,NULL,'$user->rights->pos->backend','1',0,'2013-03-13 20:33:09'),(103124,'all',2,'pos','left','@pos',103108,NULL,NULL,100,'/pos/backend/terminal/cash.php','','Terminal','main',NULL,NULL,'$user->rights->pos->backend','1',0,'2013-03-13 20:33:09'),(103125,'all',2,'pos','left','@pos',103124,NULL,NULL,100,'/pos/backend/terminal/card.php?action=create','','NewCash','main',NULL,NULL,'$user->rights->pos->backend','1',0,'2013-03-13 20:33:09'),(103126,'all',2,'pos','left','@pos',103124,NULL,NULL,101,'/pos/backend/terminal/cash.php','','List','main',NULL,NULL,'$user->rights->pos->backend','1',0,'2013-03-13 20:33:09'),(103127,'all',2,'pos','left','@pos',103123,NULL,NULL,101,'/pos/backend/closes.php?viewstatut=0','','Arqueo','main',NULL,NULL,'$user->rights->pos->backend','1',0,'2013-03-13 20:33:09'),(103128,'all',2,'pos','left','@pos',103123,NULL,NULL,102,'/pos/backend/closes.php?viewstatut=1','','Closes','main',NULL,NULL,'$user->rights->pos->backend','1',0,'2013-03-13 20:33:09'),(103129,'all',2,'pos','left','@pos',103108,NULL,NULL,102,'/pos/backend/transfers.php','','Transfer','main',NULL,NULL,'$user->rights->pos->transfer','1',0,'2013-03-13 20:33:09'),(103130,'all',2,'pos','left','@pos',103108,NULL,NULL,102,'/pos/backend/resultat/index.php','','Rapport','main',NULL,NULL,'$user->rights->pos->stats','1',0,'2013-03-13 20:33:09'),(103131,'all',2,'pos','left','@pos',103130,NULL,NULL,102,'/pos/backend/resultat/casoc.php','','ReportsCustomer','main',NULL,NULL,'$user->rights->pos->stats','1',0,'2013-03-13 20:33:09'),(103132,'all',2,'pos','left','@pos',103130,NULL,NULL,102,'/pos/backend/resultat/causer.php','','ReportsUser','main',NULL,NULL,'$user->rights->pos->stats','1',0,'2013-03-13 20:33:09'),(103133,'all',2,'pos','left','@pos',103130,NULL,NULL,102,'/pos/backend/resultat/sellsjournal.php','','ReportsSells','main',NULL,NULL,'$user->rights->pos->stats','1',0,'2013-03-13 20:33:09'),(103134,'all',2,'opensurvey','top','opensurvey',0,NULL,NULL,200,'/opensurvey/index.php','','Surveys','opensurvey',NULL,NULL,'$user->rights->opensurvey->survey->read','$conf->opensurvey->enabled',0,'2013-03-13 20:33:42'),(103135,'all',2,'opensurvey','left','opensurvey',-1,NULL,'opensurvey',200,'/opensurvey/index.php?mainmenu=opensurvey&leftmenu=opensurvey','','Survey','opensurvey@opensurvey',NULL,'opensurvey','','$conf->opensurvey->enabled',0,'2013-03-13 20:33:42'),(103136,'all',2,'opensurvey','left','opensurvey',-1,'opensurvey','opensurvey',210,'/opensurvey/public/index.php','_blank','NewSurvey','opensurvey@opensurvey',NULL,'opensurvey_new','','$conf->opensurvey->enabled',0,'2013-03-13 20:33:42'),(103137,'all',2,'opensurvey','left','opensurvey',-1,'opensurvey','opensurvey',220,'/opensurvey/list.php','','List','opensurvey@opensurvey',NULL,'opensurvey_list','','$conf->opensurvey->enabled',0,'2013-03-13 20:33:42'),(124179,'all',1,'cashdesk','top','cashdesk',0,NULL,NULL,100,'/cashdesk/index.php?user=__LOGIN__','pointofsale','CashDeskMenu','cashdesk',NULL,NULL,'$user->rights->cashdesk->use','$conf->cashdesk->enabled',0,'2015-11-15 22:38:33'),(124210,'all',1,'margins','left','accountancy',-1,NULL,'accountancy',100,'/margin/index.php','','Margins','margins',NULL,'margins','$user->rights->margins->liretous','$conf->margin->enabled',2,'2015-11-15 22:41:47'),(134675,'all',1,'ecm','top','ecm',0,NULL,NULL,100,'/ecm/index.php','','MenuECM','ecm',NULL,NULL,'$user->rights->ecm->read || $user->rights->ecm->upload || $user->rights->ecm->setup','$conf->ecm->enabled',2,'2016-01-22 17:26:43'),(134676,'all',1,'ecm','left','ecm',-1,NULL,'ecm',101,'/ecm/index.php?mainmenu=ecm&leftmenu=ecm','','ECMArea','ecm',NULL,'ecm','$user->rights->ecm->read || $user->rights->ecm->upload','$user->rights->ecm->read || $user->rights->ecm->upload',2,'2016-01-22 17:26:43'),(134677,'all',1,'ecm','left','ecm',-1,'ecm','ecm',102,'/ecm/index.php?action=file_manager&mainmenu=ecm&leftmenu=ecm','','ECMSectionsManual','ecm',NULL,'ecm_manual','$user->rights->ecm->read || $user->rights->ecm->upload','$user->rights->ecm->read || $user->rights->ecm->upload',2,'2016-01-22 17:26:43'),(134678,'all',1,'ecm','left','ecm',-1,'ecm','ecm',103,'/ecm/index_auto.php?action=file_manager&mainmenu=ecm&leftmenu=ecm','','ECMSectionsAuto','ecm',NULL,NULL,'$user->rights->ecm->read || $user->rights->ecm->upload','$user->rights->ecm->read || $user->rights->ecm->upload',2,'2016-01-22 17:26:43'),(139885,'auguria',1,'','top','home',0,NULL,NULL,10,'/index.php?mainmenu=home&amp;leftmenu=','','Home','',-1,'','','1',2,'2016-07-30 11:13:00'),(139886,'auguria',1,'societe|fournisseur','top','companies',0,NULL,NULL,20,'/societe/index.php?mainmenu=companies&amp;leftmenu=','','ThirdParties','companies',-1,'','$user->rights->societe->lire || $user->rights->societe->contact->lire','( ! empty($conf->societe->enabled) && (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) || empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))) || ! empty($conf->fournisseur->enabled)',2,'2016-07-30 11:13:00'),(139887,'auguria',1,'product|service','top','products',0,NULL,NULL,30,'/product/index.php?mainmenu=products&amp;leftmenu=','','Products/Services','products',-1,'','$user->rights->produit->lire||$user->rights->service->lire','$conf->product->enabled || $conf->service->enabled',0,'2016-07-30 11:13:00'),(139889,'auguria',1,'propal|commande|fournisseur|contrat|ficheinter','top','commercial',0,NULL,NULL,40,'/comm/index.php?mainmenu=commercial&amp;leftmenu=','','Commercial','commercial',-1,'','$user->rights->societe->lire || $user->rights->societe->contact->lire','$conf->propal->enabled || $conf->commande->enabled || $conf->supplier_order->enabled || $conf->contrat->enabled || $conf->ficheinter->enabled',2,'2016-07-30 11:13:00'),(139890,'auguria',1,'comptabilite|accounting|facture|don|tax|salaries|loan','top','accountancy',0,NULL,NULL,50,'/compta/index.php?mainmenu=accountancy&amp;leftmenu=','','MenuFinancial','compta',-1,'','$user->rights->compta->resultat->lire || $user->rights->accounting->plancompte->lire || $user->rights->facture->lire|| $user->rights->don->lire || $user->rights->tax->charges->lire || $user->rights->salaries->read || $user->rights->loan->read','$conf->comptabilite->enabled || $conf->accounting->enabled || $conf->facture->enabled || $conf->don->enabled  || $conf->tax->enabled || $conf->salaries->enabled || $conf->supplier_invoice->enabled || $conf->loan->enabled',2,'2016-07-30 11:13:00'),(139891,'auguria',1,'projet','top','project',0,NULL,NULL,70,'/projet/index.php?mainmenu=project&amp;leftmenu=','','Projects','projects',-1,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2016-07-30 11:13:00'),(139892,'auguria',1,'mailing|export|import|opensurvey|resource','top','tools',0,NULL,NULL,90,'/core/tools.php?mainmenu=tools&amp;leftmenu=','','Tools','other',-1,'','$user->rights->mailing->lire || $user->rights->export->lire || $user->rights->import->run || $user->rights->opensurvey->read || $user->rights->resource->read','$conf->mailing->enabled || $conf->export->enabled || $conf->import->enabled || $conf->opensurvey->enabled || $conf->resource->enabled',2,'2016-07-30 11:13:00'),(139897,'auguria',1,'adherent','top','members',0,NULL,NULL,110,'/adherents/index.php?mainmenu=members&amp;leftmenu=','','Members','members',-1,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2016-07-30 11:13:00'),(139898,'auguria',1,'banque|prelevement','top','bank',0,NULL,NULL,60,'/compta/bank/index.php?mainmenu=bank&amp;leftmenu=bank','','MenuBankCash','banks',-1,'','$user->rights->banque->lire || $user->rights->prelevement->bons->lire','$conf->banque->enabled || $conf->prelevement->enabled',0,'2016-07-30 11:13:00'),(139899,'auguria',1,'hrm|holiday|deplacement|expensereport','top','hrm',0,NULL,NULL,80,'/hrm/hrm.php?mainmenu=hrm&amp;leftmenu=','','HRM','holiday',-1,'','$user->rights->hrm->employee->read || $user->rights->holiday->write || $user->rights->deplacement->lire || $user->rights->expensereport->lire','$conf->hrm->enabled || $conf->holiday->enabled || $conf->deplacement->enabled || $conf->expensereport->enabled',0,'2016-07-30 11:13:00'),(139974,'auguria',1,'','left','home',139885,NULL,NULL,0,'/index.php','','Dashboard','',0,'','','1',2,'2016-07-30 11:13:00'),(139984,'auguria',1,'','left','home',139885,NULL,NULL,1,'/admin/index.php?leftmenu=setup','','Setup','admin',0,'setup','','$user->admin',2,'2016-07-30 11:13:00'),(139985,'auguria',1,'','left','home',139984,NULL,NULL,1,'/admin/company.php?leftmenu=setup','','MenuCompanySetup','admin',1,'','','$leftmenu==\"setup\"',2,'2016-07-30 11:13:00'),(139986,'auguria',1,'','left','home',139984,NULL,NULL,4,'/admin/ihm.php?leftmenu=setup','','GUISetup','admin',1,'','','$leftmenu==\"setup\"',2,'2016-07-30 11:13:00'),(139987,'auguria',1,'','left','home',139984,NULL,NULL,2,'/admin/modules.php?leftmenu=setup','','Modules','admin',1,'','','$leftmenu==\"setup\"',2,'2016-07-30 11:13:00'),(139988,'auguria',1,'','left','home',139984,NULL,NULL,6,'/admin/boxes.php?leftmenu=setup','','Boxes','admin',1,'','','$leftmenu==\"setup\"',2,'2016-07-30 11:13:00'),(139989,'auguria',1,'','left','home',139984,NULL,NULL,3,'/admin/menus.php?leftmenu=setup','','Menus','admin',1,'','','$leftmenu==\"setup\"',2,'2016-07-30 11:13:00'),(139990,'auguria',1,'','left','home',139984,NULL,NULL,7,'/admin/delais.php?leftmenu=setup','','Alerts','admin',1,'','','$leftmenu==\"setup\"',2,'2016-07-30 11:13:00'),(139991,'auguria',1,'','left','home',139984,NULL,NULL,10,'/admin/pdf.php?leftmenu=setup','','PDF','admin',1,'','','$leftmenu==\"setup\"',2,'2016-07-30 11:13:00'),(139992,'auguria',1,'','left','home',139984,NULL,NULL,8,'/admin/security_other.php?leftmenu=setup','','Security','admin',1,'','','$leftmenu==\"setup\"',2,'2016-07-30 11:13:00'),(139993,'auguria',1,'','left','home',139984,NULL,NULL,11,'/admin/mails.php?leftmenu=setup','','Emails','admin',1,'','','$leftmenu==\"setup\"',2,'2016-07-30 11:13:00'),(139994,'auguria',1,'','left','home',139984,NULL,NULL,9,'/admin/limits.php?leftmenu=setup','','MenuLimits','admin',1,'','','$leftmenu==\"setup\"',2,'2016-07-30 11:13:00'),(139995,'auguria',1,'','left','home',139984,NULL,NULL,13,'/admin/dict.php?leftmenu=setup','','Dictionary','admin',1,'','','$leftmenu==\"setup\"',2,'2016-07-30 11:13:00'),(139996,'auguria',1,'','left','home',139984,NULL,NULL,14,'/admin/const.php?leftmenu=setup','','OtherSetup','admin',1,'','','$leftmenu==\"setup\"',2,'2016-07-30 11:13:00'),(139997,'auguria',1,'','left','home',139984,NULL,NULL,12,'/admin/sms.php?leftmenu=setup','','SMS','admin',1,'','','$leftmenu==\"setup\"',2,'2016-07-30 11:13:00'),(139998,'auguria',1,'','left','home',139984,NULL,NULL,4,'/admin/translation.php?leftmenu=setup','','Translation','admin',1,'','','$leftmenu==\"setup\"',2,'2016-07-30 11:13:00'),(139999,'auguria',1,'','left','home',139984,NULL,NULL,4,'/accountancy/admin/fiscalyear.php?mainmenu=setup','','Fiscalyear','admin',1,'','','$leftmenu==\"setup\" && $conf->accounting->enabled',2,'2016-07-30 11:13:00'),(140085,'auguria',1,'','left','home',140184,NULL,NULL,0,'/admin/system/dolibarr.php?leftmenu=admintools','','InfoDolibarr','admin',1,'','','$leftmenu==\"admintools\"',2,'2016-07-30 11:13:00'),(140086,'auguria',1,'','left','home',140085,NULL,NULL,2,'/admin/system/modules.php?leftmenu=admintools','','Modules','admin',2,'','','$leftmenu==\"admintools\"',2,'2016-07-30 11:13:00'),(140087,'auguria',1,'','left','home',140085,NULL,NULL,3,'/admin/triggers.php?leftmenu=admintools','','Triggers','admin',2,'','','$leftmenu==\"admintools\"',2,'2016-07-30 11:13:00'),(140089,'auguria',1,'','left','home',140184,NULL,NULL,1,'/admin/system/browser.php?leftmenu=admintools','','InfoBrowser','admin',1,'','','$leftmenu==\"admintools\"',2,'2016-07-30 11:13:00'),(140090,'auguria',1,'','left','home',140184,NULL,NULL,2,'/admin/system/os.php?leftmenu=admintools','','InfoOS','admin',1,'','','$leftmenu==\"admintools\"',2,'2016-07-30 11:13:00'),(140091,'auguria',1,'','left','home',140184,NULL,NULL,3,'/admin/system/web.php?leftmenu=admintools','','InfoWebServer','admin',1,'','','$leftmenu==\"admintools\"',2,'2016-07-30 11:13:00'),(140092,'auguria',1,'','left','home',140184,NULL,NULL,4,'/admin/system/phpinfo.php?leftmenu=admintools','','InfoPHP','admin',1,'','','$leftmenu==\"admintools\"',2,'2016-07-30 11:13:00'),(140094,'auguria',1,'','left','home',140184,NULL,NULL,5,'/admin/system/database.php?leftmenu=admintools','','InfoDatabase','admin',1,'','','$leftmenu==\"admintools\"',2,'2016-07-30 11:13:00'),(140184,'auguria',1,'','left','home',139885,NULL,NULL,2,'/admin/tools/index.php?leftmenu=admintools','','AdminTools','admin',0,'admintools','','$user->admin',2,'2016-07-30 11:13:00'),(140185,'auguria',1,'','left','home',140184,NULL,NULL,6,'/admin/tools/dolibarr_export.php?leftmenu=admintools','','Backup','admin',1,'','','$leftmenu==\"admintools\"',2,'2016-07-30 11:13:00'),(140186,'auguria',1,'','left','home',140184,NULL,NULL,7,'/admin/tools/dolibarr_import.php?leftmenu=admintools','','Restore','admin',1,'','','$leftmenu==\"admintools\"',2,'2016-07-30 11:13:00'),(140189,'auguria',1,'','left','home',140184,NULL,NULL,8,'/admin/tools/update.php?leftmenu=admintools','','MenuUpgrade','admin',1,'','','$leftmenu==\"admintools\"',2,'2016-07-30 11:13:00'),(140190,'auguria',1,'','left','home',140184,NULL,NULL,9,'/admin/tools/eaccelerator.php?leftmenu=admintools','','EAccelerator','admin',1,'','','$leftmenu==\"admintools\" && function_exists(\"eaccelerator_info\")',2,'2016-07-30 11:13:00'),(140191,'auguria',1,'','left','home',140184,NULL,NULL,10,'/admin/tools/listevents.php?leftmenu=admintools','','Audit','admin',1,'','','$leftmenu==\"admintools\"',2,'2016-07-30 11:13:00'),(140192,'auguria',1,'','left','home',140184,NULL,NULL,11,'/admin/tools/listsessions.php?leftmenu=admintools','','Sessions','admin',1,'','','$leftmenu==\"admintools\"',2,'2016-07-30 11:13:00'),(140193,'auguria',1,'','left','home',140184,NULL,NULL,12,'/admin/tools/purge.php?leftmenu=admintools','','Purge','admin',1,'','','$leftmenu==\"admintools\"',2,'2016-07-30 11:13:00'),(140194,'auguria',1,'','left','home',140184,NULL,NULL,13,'/support/index.php?leftmenu=admintools','_blank','HelpCenter','help',1,'','','$leftmenu==\"admintools\"',2,'2016-07-30 11:13:00'),(140195,'auguria',1,'','left','home',140184,NULL,NULL,14,'/admin/system/about.php?leftmenu=admintools','','About','admin',1,'','','$leftmenu==\"admintools\"',2,'2016-07-30 11:13:00'),(140204,'auguria',1,'','left','home',140184,NULL,NULL,0,'/product/admin/product_tools.php?mainmenu=home&amp;leftmenu=admintools','','ProductVatMassChange','products',1,'','','$leftmenu==\"admintools\"',2,'2016-07-30 11:13:00'),(140205,'auguria',1,'','left','home',140184,NULL,NULL,0,'/accountancy/admin/productaccount.php?mainmenu=home&amp;leftmenu=admintools','','InitAccountancy','accountancy',1,'','','$leftmenu==\"admintools\" && $conf->accounting->enabled',2,'2016-07-30 11:13:00'),(140284,'auguria',1,'','left','home',139885,NULL,NULL,4,'/user/home.php?leftmenu=users','','MenuUsersAndGroups','users',0,'users','','1',2,'2016-07-30 11:13:00'),(140285,'auguria',1,'','left','home',140284,NULL,NULL,0,'/user/index.php?leftmenu=users','','Users','users',1,'','$user->rights->user->user->lire || $user->admin','$leftmenu==\"users\"',2,'2016-07-30 11:13:00'),(140286,'auguria',1,'','left','home',140285,NULL,NULL,0,'/user/card.php?leftmenu=users&amp;action=create','','NewUser','users',2,'','$user->rights->user->user->creer || $user->admin','$leftmenu==\"users\"',2,'2016-07-30 11:13:00'),(140287,'auguria',1,'','left','home',140284,NULL,NULL,1,'/user/group/index.php?leftmenu=users','','Groups','users',1,'','($conf->global->MAIN_USE_ADVANCED_PERMS?$user->rights->user->group_advance->read:$user->rights->user->user->lire) || $user->admin','$leftmenu==\"users\"',2,'2016-07-30 11:13:00'),(140288,'auguria',1,'','left','home',140287,NULL,NULL,0,'/user/group/card.php?leftmenu=users&amp;action=create','','NewGroup','users',2,'','($conf->global->MAIN_USE_ADVANCED_PERMS?$user->rights->user->group_advance->write:$user->rights->user->user->creer) || $user->admin','$leftmenu==\"users\"',2,'2016-07-30 11:13:00'),(140384,'auguria',1,'','left','companies',139886,NULL,NULL,0,'/societe/index.php?leftmenu=thirdparties','','ThirdParty','companies',0,'thirdparties','$user->rights->societe->lire','$conf->societe->enabled',2,'2016-07-30 11:13:00'),(140385,'auguria',1,'','left','companies',140384,NULL,NULL,0,'/societe/soc.php?action=create','','MenuNewThirdParty','companies',1,'','$user->rights->societe->lire','$conf->societe->enabled',2,'2016-07-30 11:13:00'),(140386,'auguria',1,'','left','companies',140384,NULL,NULL,0,'/societe/list.php?action=create','','List','companies',1,'','$user->rights->societe->lire','$conf->societe->enabled',2,'2016-07-30 11:13:00'),(140387,'auguria',1,'','left','companies',140384,NULL,NULL,5,'/societe/list.php?type=f&leftmenu=suppliers','','ListSuppliersShort','suppliers',1,'','$user->rights->societe->lire && $user->rights->fournisseur->lire','$conf->societe->enabled && $conf->fournisseur->enabled',2,'2016-07-30 11:13:00'),(140388,'auguria',1,'','left','companies',140387,NULL,NULL,0,'/societe/soc.php?leftmenu=supplier&amp;action=create&amp;type=f','','NewSupplier','suppliers',2,'','$user->rights->societe->creer','$conf->societe->enabled && $conf->fournisseur->enabled',2,'2016-07-30 11:13:00'),(140390,'auguria',1,'','left','companies',140384,NULL,NULL,3,'/societe/list.php?type=p&leftmenu=prospects','','ListProspectsShort','companies',1,'','$user->rights->societe->lire','$conf->societe->enabled',2,'2016-07-30 11:13:00'),(140391,'auguria',1,'','left','companies',140390,NULL,NULL,0,'/societe/soc.php?leftmenu=prospects&amp;action=create&amp;type=p','','MenuNewProspect','companies',2,'','$user->rights->societe->creer','$conf->societe->enabled',2,'2016-07-30 11:13:00'),(140393,'auguria',1,'','left','companies',140384,NULL,NULL,4,'/societe/list.php?type=c&leftmenu=customers','','ListCustomersShort','companies',1,'','$user->rights->societe->lire','$conf->societe->enabled',2,'2016-07-30 11:13:00'),(140394,'auguria',1,'','left','companies',140393,NULL,NULL,0,'/societe/soc.php?leftmenu=customers&amp;action=create&amp;type=c','','MenuNewCustomer','companies',2,'','$user->rights->societe->creer','$conf->societe->enabled',2,'2016-07-30 11:13:00'),(140484,'auguria',1,'','left','companies',139886,NULL,NULL,1,'/contact/list.php?leftmenu=contacts','','ContactsAddresses','companies',0,'contacts','$user->rights->societe->lire','$conf->societe->enabled',2,'2016-07-30 11:13:00'),(140485,'auguria',1,'','left','companies',140484,NULL,NULL,0,'/contact/card.php?leftmenu=contacts&amp;action=create','','NewContactAddress','companies',1,'','$user->rights->societe->creer','$conf->societe->enabled',2,'2016-07-30 11:13:00'),(140486,'auguria',1,'','left','companies',140484,NULL,NULL,1,'/contact/list.php?leftmenu=contacts','','List','companies',1,'','$user->rights->societe->lire','$conf->societe->enabled',2,'2016-07-30 11:13:00'),(140488,'auguria',1,'','left','companies',140486,NULL,NULL,1,'/contact/list.php?leftmenu=contacts&amp;type=p','','ThirdPartyProspects','companies',2,'','$user->rights->societe->contact->lire','$conf->societe->enabled',2,'2016-07-30 11:13:00'),(140489,'auguria',1,'','left','companies',140486,NULL,NULL,2,'/contact/list.php?leftmenu=contacts&amp;type=c','','ThirdPartyCustomers','companies',2,'','$user->rights->societe->contact->lire','$conf->societe->enabled',2,'2016-07-30 11:13:00'),(140490,'auguria',1,'','left','companies',140486,NULL,NULL,3,'/contact/list.php?leftmenu=contacts&amp;type=f','','ThirdPartySuppliers','companies',2,'','$user->rights->societe->contact->lire','$conf->societe->enabled && $conf->fournisseur->enabled',2,'2016-07-30 11:13:00'),(140491,'auguria',1,'','left','companies',140486,NULL,NULL,4,'/contact/list.php?leftmenu=contacts&amp;type=o','','Others','companies',2,'','$user->rights->societe->contact->lire','$conf->societe->enabled',2,'2016-07-30 11:13:00'),(140534,'auguria',1,'','left','companies',139886,NULL,NULL,3,'/categories/index.php?leftmenu=cat&amp;type=1','','SuppliersCategoriesShort','categories',0,'cat','$user->rights->categorie->lire','$conf->societe->enabled && $conf->categorie->enabled',2,'2016-07-30 11:13:00'),(140535,'auguria',1,'','left','companies',140534,NULL,NULL,0,'/categories/card.php?action=create&amp;type=1','','NewCategory','categories',1,'','$user->rights->categorie->creer','$conf->societe->enabled && $conf->categorie->enabled',2,'2016-07-30 11:13:00'),(140544,'auguria',1,'','left','companies',139886,NULL,NULL,4,'/categories/index.php?leftmenu=cat&amp;type=2','','CustomersProspectsCategoriesShort','categories',0,'cat','$user->rights->categorie->lire','$conf->fournisseur->enabled && $conf->categorie->enabled',2,'2016-07-30 11:13:00'),(140545,'auguria',1,'','left','companies',140544,NULL,NULL,0,'/categories/card.php?action=create&amp;type=2','','NewCategory','categories',1,'','$user->rights->categorie->creer','$conf->fournisseur->enabled && $conf->categorie->enabled',2,'2016-07-30 11:13:00'),(140554,'auguria',1,'','left','companies',139886,NULL,NULL,3,'/categories/index.php?leftmenu=cat&amp;type=4','','ContactCategoriesShort','categories',0,'cat','$user->rights->categorie->lire','$conf->societe->enabled && $conf->categorie->enabled',2,'2016-07-30 11:13:00'),(140555,'auguria',1,'','left','companies',140554,NULL,NULL,0,'/categories/card.php?action=create&amp;type=4','','NewCategory','categories',1,'','$user->rights->categorie->creer','$conf->societe->enabled && $conf->categorie->enabled',2,'2016-07-30 11:13:00'),(140984,'auguria',1,'','left','commercial',139889,NULL,NULL,4,'/comm/propal/index.php?leftmenu=propals','','Prop','propal',0,'propals','$user->rights->propale->lire','$conf->propal->enabled',2,'2016-07-30 11:13:00'),(140985,'auguria',1,'','left','commercial',140984,NULL,NULL,0,'/comm/propal/card.php?action=create&amp;leftmenu=propals','','NewPropal','propal',1,'','$user->rights->propale->creer','$conf->propal->enabled',2,'2016-07-30 11:13:00'),(140986,'auguria',1,'','left','commercial',140984,NULL,NULL,1,'/comm/propal/list.php?leftmenu=propals','','List','propal',1,'','$user->rights->propale->lire','$conf->propal->enabled',2,'2016-07-30 11:13:00'),(140987,'auguria',1,'','left','commercial',140986,NULL,NULL,2,'/comm/propal/list.php?leftmenu=propals&amp;viewstatut=0','','PropalsDraft','propal',1,'','$user->rights->propale->lire','$conf->propal->enabled && $leftmenu==\"propals\"',2,'2016-07-30 11:13:00'),(140988,'auguria',1,'','left','commercial',140986,NULL,NULL,3,'/comm/propal/list.php?leftmenu=propals&amp;viewstatut=1','','PropalsOpened','propal',1,'','$user->rights->propale->lire','$conf->propal->enabled && $leftmenu==\"propals\"',2,'2016-07-30 11:13:00'),(140989,'auguria',1,'','left','commercial',140986,NULL,NULL,4,'/comm/propal/list.php?leftmenu=propals&amp;viewstatut=2','','PropalStatusSigned','propal',1,'','$user->rights->propale->lire','$conf->propal->enabled && $leftmenu==\"propals\"',2,'2016-07-30 11:13:00'),(140990,'auguria',1,'','left','commercial',140986,NULL,NULL,5,'/comm/propal/list.php?leftmenu=propals&amp;viewstatut=3','','PropalStatusNotSigned','propal',1,'','$user->rights->propale->lire','$conf->propal->enabled && $leftmenu==\"propals\"',2,'2016-07-30 11:13:00'),(140991,'auguria',1,'','left','commercial',140986,NULL,NULL,6,'/comm/propal/list.php?leftmenu=propals&amp;viewstatut=4','','PropalStatusBilled','propal',1,'','$user->rights->propale->lire','$conf->propal->enabled && $leftmenu==\"propals\"',2,'2016-07-30 11:13:00'),(140994,'auguria',1,'','left','commercial',140984,NULL,NULL,4,'/comm/propal/stats/index.php?leftmenu=propals','','Statistics','propal',1,'','$user->rights->propale->lire','$conf->propal->enabled',2,'2016-07-30 11:13:00'),(141084,'auguria',1,'','left','commercial',139889,NULL,NULL,5,'/commande/index.php?leftmenu=orders','','CustomersOrders','orders',0,'orders','$user->rights->commande->lire','$conf->commande->enabled',2,'2016-07-30 11:13:00'),(141085,'auguria',1,'','left','commercial',141084,NULL,NULL,0,'/commande/card.php?action=create&amp;leftmenu=orders','','NewOrder','orders',1,'','$user->rights->commande->creer','$conf->commande->enabled',2,'2016-07-30 11:13:00'),(141086,'auguria',1,'','left','commercial',141084,NULL,NULL,1,'/commande/list.php?leftmenu=orders','','List','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled',2,'2016-07-30 11:13:00'),(141087,'auguria',1,'','left','commercial',141086,NULL,NULL,2,'/commande/list.php?leftmenu=orders&amp;viewstatut=0','','StatusOrderDraftShort','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2016-07-30 11:13:00'),(141088,'auguria',1,'','left','commercial',141086,NULL,NULL,3,'/commande/list.php?leftmenu=orders&amp;viewstatut=1','','StatusOrderValidated','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2016-07-30 11:13:00'),(141089,'auguria',1,'','left','commercial',141086,NULL,NULL,4,'/commande/list.php?leftmenu=orders&amp;viewstatut=2','','StatusOrderOnProcessShort','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2016-07-30 11:13:00'),(141090,'auguria',1,'','left','commercial',141086,NULL,NULL,5,'/commande/list.php?leftmenu=orders&amp;viewstatut=3','','StatusOrderToBill','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2016-07-30 11:13:00'),(141091,'auguria',1,'','left','commercial',141086,NULL,NULL,6,'/commande/list.php?leftmenu=orders&amp;viewstatut=4','','StatusOrderProcessed','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2016-07-30 11:13:00'),(141092,'auguria',1,'','left','commercial',141086,NULL,NULL,7,'/commande/list.php?leftmenu=orders&amp;viewstatut=-1','','StatusOrderCanceledShort','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2016-07-30 11:13:00'),(141093,'auguria',1,'','left','commercial',141084,NULL,NULL,4,'/commande/stats/index.php?leftmenu=orders','','Statistics','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled',2,'2016-07-30 11:13:00'),(141184,'auguria',1,'','left','commercial',139887,NULL,NULL,6,'/expedition/index.php?leftmenu=sendings','','Shipments','sendings',0,'sendings','$user->rights->expedition->lire','$conf->expedition->enabled',2,'2016-07-30 11:13:00'),(141185,'auguria',1,'','left','commercial',141184,NULL,NULL,0,'/expedition/card.php?action=create2&leftmenu=sendings','','NewSending','sendings',1,'','$user->rights->expedition->creer','$conf->expedition->enabled && $leftmenu==\"sendings\"',2,'2016-07-30 11:13:00'),(141186,'auguria',1,'','left','commercial',141184,NULL,NULL,1,'/expedition/list.php?leftmenu=sendings','','List','sendings',1,'','$user->rights->expedition->lire','$conf->expedition->enabled && $leftmenu==\"sendings\"',2,'2016-07-30 11:13:00'),(141187,'auguria',1,'','left','commercial',141184,NULL,NULL,2,'/expedition/stats/index.php?leftmenu=sendings','','Statistics','sendings',1,'','$user->rights->expedition->lire','$conf->expedition->enabled && $leftmenu==\"sendings\"',2,'2016-07-30 11:13:00'),(141284,'auguria',1,'','left','commercial',139889,NULL,NULL,7,'/contrat/index.php?leftmenu=contracts','','Contracts','contracts',0,'contracts','$user->rights->contrat->lire','$conf->contrat->enabled',2,'2016-07-30 11:13:00'),(141285,'auguria',1,'','left','commercial',141284,NULL,NULL,0,'/contrat/card.php?&action=create&amp;leftmenu=contracts','','NewContract','contracts',1,'','$user->rights->contrat->creer','$conf->contrat->enabled',2,'2016-07-30 11:13:00'),(141286,'auguria',1,'','left','commercial',141284,NULL,NULL,1,'/contrat/list.php?leftmenu=contracts','','List','contracts',1,'','$user->rights->contrat->lire','$conf->contrat->enabled',2,'2016-07-30 11:13:00'),(141287,'auguria',1,'','left','commercial',141284,NULL,NULL,2,'/contrat/services.php?leftmenu=contracts','','MenuServices','contracts',1,'','$user->rights->contrat->lire','$conf->contrat->enabled',2,'2016-07-30 11:13:00'),(141288,'auguria',1,'','left','commercial',141287,NULL,NULL,0,'/contrat/services.php?leftmenu=contracts&amp;mode=0','','MenuInactiveServices','contracts',2,'','$user->rights->contrat->lire','$conf->contrat->enabled&&$leftmenu==\"contracts\"',2,'2016-07-30 11:13:00'),(141289,'auguria',1,'','left','commercial',141287,NULL,NULL,1,'/contrat/services.php?leftmenu=contracts&amp;mode=4','','MenuRunningServices','contracts',2,'','$user->rights->contrat->lire','$conf->contrat->enabled&&$leftmenu==\"contracts\"',2,'2016-07-30 11:13:00'),(141290,'auguria',1,'','left','commercial',141287,NULL,NULL,2,'/contrat/services.php?leftmenu=contracts&amp;mode=4&amp;filter=expired','','MenuExpiredServices','contracts',2,'','$user->rights->contrat->lire','$conf->contrat->enabled&&$leftmenu==\"contracts\"',2,'2016-07-30 11:13:00'),(141291,'auguria',1,'','left','commercial',141287,NULL,NULL,3,'/contrat/services.php?leftmenu=contracts&amp;mode=5','','MenuClosedServices','contracts',2,'','$user->rights->contrat->lire','$conf->contrat->enabled&&$leftmenu==\"contracts\"',2,'2016-07-30 11:13:00'),(141384,'auguria',1,'','left','commercial',139889,NULL,NULL,8,'/fichinter/list.php?leftmenu=ficheinter','','Interventions','interventions',0,'ficheinter','$user->rights->ficheinter->lire','$conf->ficheinter->enabled',2,'2016-07-30 11:13:00'),(141385,'auguria',1,'','left','commercial',141384,NULL,NULL,0,'/fichinter/card.php?action=create&amp;leftmenu=ficheinter','','NewIntervention','interventions',1,'','$user->rights->ficheinter->creer','$conf->ficheinter->enabled',2,'2016-07-30 11:13:00'),(141386,'auguria',1,'','left','commercial',141384,NULL,NULL,1,'/fichinter/list.php?leftmenu=ficheinter','','List','interventions',1,'','$user->rights->ficheinter->lire','$conf->ficheinter->enabled',2,'2016-07-30 11:13:00'),(141387,'auguria',1,'','left','commercial',141384,NULL,NULL,2,'/fichinter/stats/index.php?leftmenu=ficheinter','','Statistics','interventions',1,'','$user->rights->ficheinter->lire','$conf->ficheinter->enabled',2,'2016-07-30 11:13:00'),(141484,'auguria',1,'','left','accountancy',139890,NULL,NULL,3,'/fourn/facture/list.php?leftmenu=suppliers_bills','','BillsSuppliers','bills',0,'supplier_bills','$user->rights->fournisseur->facture->lire','$conf->supplier_invoice->enabled',2,'2016-07-30 11:13:00'),(141485,'auguria',1,'','left','accountancy',141484,NULL,NULL,0,'/fourn/facture/card.php?action=create&amp;leftmenu=suppliers_bills','','NewBill','bills',1,'','$user->rights->fournisseur->facture->creer','$conf->supplier_invoice->enabled',2,'2016-07-30 11:13:00'),(141486,'auguria',1,'','left','accountancy',141484,NULL,NULL,1,'/fourn/facture/impayees.php?leftmenu=suppliers_bills','','Unpaid','bills',1,'','$user->rights->fournisseur->facture->lire','$conf->supplier_invoice->enabled',2,'2016-07-30 11:13:00'),(141487,'auguria',1,'','left','accountancy',141484,NULL,NULL,2,'/fourn/facture/paiement.php?leftmenu=suppliers_bills','','Payments','bills',1,'','$user->rights->fournisseur->facture->lire','$conf->supplier_invoice->enabled',2,'2016-07-30 11:13:00'),(141488,'auguria',1,'','left','accountancy',141484,NULL,NULL,8,'/compta/facture/stats/index.php?leftmenu=customers_bills&mode=supplier','','Statistics','bills',1,'','$user->rights->fournisseur->facture->lire','$conf->supplier_invoice->enabled',2,'2016-07-30 11:13:00'),(141584,'auguria',1,'','left','accountancy',139890,NULL,NULL,3,'/compta/facture/list.php?leftmenu=customers_bills','','BillsCustomers','bills',0,'customer_bills','$user->rights->facture->lire','$conf->facture->enabled',2,'2016-07-30 11:13:00'),(141585,'auguria',1,'','left','accountancy',141584,NULL,NULL,3,'/compta/facture.php?action=create&amp;leftmenu=customers_bills','','NewBill','bills',1,'','$user->rights->facture->creer','$conf->facture->enabled',2,'2016-07-30 11:13:00'),(141586,'auguria',1,'','left','accountancy',141584,NULL,NULL,5,'/compta/facture/fiche-rec.php?leftmenu=customers_bills','','ListOfTemplates','bills',1,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2016-07-30 11:13:00'),(141588,'auguria',1,'','left','accountancy',141584,NULL,NULL,6,'/compta/paiement/list.php?leftmenu=customers_bills','','Payments','bills',1,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2016-07-30 11:13:00'),(141589,'auguria',1,'','left','accountancy',141584,NULL,NULL,4,'/compta/facture/list.php?leftmenu=customers_bills','','List','bills',1,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2016-07-30 11:13:00'),(141594,'auguria',1,'','left','accountancy',141588,NULL,NULL,1,'/compta/paiement/rapport.php?leftmenu=customers_bills','','Reportings','bills',2,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2016-07-30 11:13:00'),(141595,'auguria',1,'','left','accountancy',139898,NULL,NULL,9,'/compta/paiement/cheque/index.php?leftmenu=checks&amp;mainmenu=bank','','MenuChequeDeposits','bills',0,'checks','$user->rights->banque->lire','empty($conf->global->BANK_DISABLE_CHECK_DEPOSIT) && ! empty($conf->banque->enabled) && (! empty($conf->facture->enabled) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON))',2,'2016-07-30 11:13:00'),(141596,'auguria',1,'','left','accountancy',141595,NULL,NULL,0,'/compta/paiement/cheque/card.php?leftmenu=checks&amp;action=new','','NewCheckDeposit','compta',1,'','$user->rights->banque->lire','empty($conf->global->BANK_DISABLE_CHECK_DEPOSIT) && ! empty($conf->banque->enabled) && (! empty($conf->facture->enabled) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON))',2,'2016-07-30 11:13:00'),(141597,'auguria',1,'','left','accountancy',141595,NULL,NULL,1,'/compta/paiement/cheque/list.php?leftmenu=checks','','List','bills',1,'','$user->rights->banque->lire','empty($conf->global->BANK_DISABLE_CHECK_DEPOSIT) && ! empty($conf->banque->enabled) && (! empty($conf->facture->enabled) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON))',2,'2016-07-30 11:13:00'),(141598,'auguria',1,'','left','accountancy',141584,NULL,NULL,8,'/compta/facture/stats/index.php?leftmenu=customers_bills','','Statistics','bills',1,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2016-07-30 11:13:00'),(141604,'auguria',1,'','left','accountancy',141589,NULL,NULL,1,'/compta/facture/list.php?leftmenu=customers_bills&amp;search_status=0','','BillShortStatusDraft','bills',2,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2016-07-30 11:13:00'),(141605,'auguria',1,'','left','accountancy',141589,NULL,NULL,2,'/compta/facture/list.php?leftmenu=customers_bills&amp;search_status=1','','BillShortStatusNotPaid','bills',2,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2016-07-30 11:13:00'),(141606,'auguria',1,'','left','accountancy',141589,NULL,NULL,3,'/compta/facture/list.php?leftmenu=customers_bills&amp;search_status=2','','BillShortStatusPaid','bills',2,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2016-07-30 11:13:00'),(141607,'auguria',1,'','left','accountancy',141589,NULL,NULL,4,'/compta/facture/list.php?leftmenu=customers_bills&amp;search_status=3','','BillShortStatusCanceled','bills',2,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2016-07-30 11:13:00'),(141784,'auguria',1,'','left','accountancy',139890,NULL,NULL,3,'/commande/list.php?leftmenu=orders&amp;viewstatut=3','','MenuOrdersToBill','orders',0,'orders','$user->rights->commande->lire','$conf->commande->enabled',0,'2016-07-30 11:13:00'),(141884,'auguria',1,'','left','accountancy',139890,NULL,NULL,4,'/don/index.php?leftmenu=donations&amp;mainmenu=accountancy','','Donations','donations',0,'donations','$user->rights->don->lire','$conf->don->enabled',2,'2016-07-30 11:13:00'),(141885,'auguria',1,'','left','accountancy',141884,NULL,NULL,0,'/don/card.php?leftmenu=donations&amp;mainmenu=accountancy&amp;action=create','','NewDonation','donations',1,'','$user->rights->don->creer','$conf->don->enabled && $leftmenu==\"donations\"',2,'2016-07-30 11:13:00'),(141886,'auguria',1,'','left','accountancy',141884,NULL,NULL,1,'/don/list.php?leftmenu=donations&amp;mainmenu=accountancy','','List','donations',1,'','$user->rights->don->lire','$conf->don->enabled && $leftmenu==\"donations\"',2,'2016-07-30 11:13:00'),(141984,'auguria',1,'','left','accountancy',139899,NULL,NULL,5,'/compta/deplacement/index.php?leftmenu=tripsandexpenses','','TripsAndExpenses','trips',0,'tripsandexpenses','$user->rights->deplacement->lire','$conf->deplacement->enabled',0,'2016-07-30 11:13:00'),(141985,'auguria',1,'','left','accountancy',141984,NULL,NULL,1,'/compta/deplacement/card.php?action=create&amp;leftmenu=tripsandexpenses','','New','trips',1,'','$user->rights->deplacement->creer','$conf->deplacement->enabled',0,'2016-07-30 11:13:00'),(141986,'auguria',1,'','left','accountancy',141984,NULL,NULL,2,'/compta/deplacement/list.php?leftmenu=tripsandexpenses','','List','trips',1,'','$user->rights->deplacement->lire','$conf->deplacement->enabled',0,'2016-07-30 11:13:00'),(141987,'auguria',1,'','left','accountancy',141984,NULL,NULL,2,'/compta/deplacement/stats/index.php?leftmenu=tripsandexpenses','','Statistics','trips',1,'','$user->rights->deplacement->lire','$conf->deplacement->enabled',0,'2016-07-30 11:13:00'),(142084,'auguria',1,'','left','accountancy',139890,NULL,NULL,6,'/compta/charges/index.php?leftmenu=tax&amp;mainmenu=accountancy','','MenuSpecialExpenses','compta',0,'tax','(! empty($conf->tax->enabled) && $user->rights->tax->charges->lire) || (! empty($conf->salaries->enabled) && $user->rights->salaries->read)','$conf->tax->enabled || $conf->salaries->enabled',0,'2016-07-30 11:13:00'),(142094,'auguria',1,'','left','accountancy',142084,NULL,NULL,1,'/compta/salaries/index.php?leftmenu=tax_salary&amp;mainmenu=accountancy','','Salaries','salaries',1,'tax_sal','$user->rights->salaries->read','$conf->salaries->enabled',0,'2016-07-30 11:13:00'),(142095,'auguria',1,'','left','accountancy',142094,NULL,NULL,2,'/compta/salaries/card.php?leftmenu=tax_salary&amp;action=create','','NewPayment','companies',2,'','$user->rights->salaries->write','$conf->salaries->enabled && $leftmenu==\"tax_salary\"',0,'2016-07-30 11:13:00'),(142096,'auguria',1,'','left','accountancy',142094,NULL,NULL,3,'/compta/salaries/index.php?leftmenu=tax_salary','','Payments','companies',2,'','$user->rights->salaries->read','$conf->salaries->enabled && $leftmenu==\"tax_salary\"',0,'2016-07-30 11:13:00'),(142104,'auguria',1,'','left','accountancy',142084,NULL,NULL,1,'/loan/index.php?leftmenu=tax_loan&amp;mainmenu=accountancy','','Loans','loan',1,'tax_loan','$user->rights->loan->read','$conf->loan->enabled',0,'2016-07-30 11:13:00'),(142105,'auguria',1,'','left','accountancy',142104,NULL,NULL,2,'/loan/card.php?leftmenu=tax_loan&amp;action=create','','NewLoan','loan',2,'','$user->rights->loan->write','$conf->loan->enabled && $leftmenu==\"tax_loan\"',0,'2016-07-30 11:13:00'),(142107,'auguria',1,'','left','accountancy',142104,NULL,NULL,4,'/loan/calc.php?leftmenu=tax_loan','','Calculator','companies',2,'','$user->rights->loan->calc','$conf->loan->enabled && $leftmenu==\"tax_loan\" && ! empty($conf->global->LOAN_SHOW_CALCULATOR)',0,'2016-07-30 11:13:00'),(142134,'auguria',1,'','left','accountancy',142084,NULL,NULL,1,'/compta/sociales/index.php?leftmenu=tax_social','','SocialContributions','',1,'tax_social','$user->rights->tax->charges->lire','$conf->tax->enabled',0,'2016-07-30 11:13:00'),(142135,'auguria',1,'','left','accountancy',142134,NULL,NULL,2,'/compta/sociales/charges.php?leftmenu=tax_social&amp;action=create','','MenuNewSocialContribution','',2,'','$user->rights->tax->charges->creer','$conf->tax->enabled && $leftmenu==\"tax_social\"',0,'2016-07-30 11:13:00'),(142136,'auguria',1,'','left','accountancy',142134,NULL,NULL,3,'/compta/charges/index.php?leftmenu=tax_social&amp;mainmenu=accountancy&amp;mode=sconly','','Payments','',2,'','$user->rights->tax->charges->lire','$conf->tax->enabled && $leftmenu==\"tax_social\"',0,'2016-07-30 11:13:00'),(142184,'auguria',1,'','left','accountancy',142084,NULL,NULL,7,'/compta/tva/index.php?leftmenu=tax_vat&amp;mainmenu=accountancy','','VAT','companies',1,'tax_vat','$user->rights->tax->charges->lire','$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS)',0,'2016-07-30 11:13:00'),(142185,'auguria',1,'','left','accountancy',142184,NULL,NULL,0,'/compta/tva/card.php?leftmenu=tax_vat&amp;action=create','','New','companies',2,'','$user->rights->tax->charges->creer','$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu==\"tax_vat\"',0,'2016-07-30 11:13:00'),(142186,'auguria',1,'','left','accountancy',142184,NULL,NULL,1,'/compta/tva/reglement.php?leftmenu=tax_vat','','List','companies',2,'','$user->rights->tax->charges->lire','$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu==\"tax_vat\"',0,'2016-07-30 11:13:00'),(142187,'auguria',1,'','left','accountancy',142184,NULL,NULL,2,'/compta/tva/clients.php?leftmenu=tax_vat','','ReportByCustomers','companies',2,'','$user->rights->tax->charges->lire','$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu==\"tax_vat\"',0,'2016-07-30 11:13:00'),(142188,'auguria',1,'','left','accountancy',142184,NULL,NULL,3,'/compta/tva/quadri_detail.php?leftmenu=tax_vat','','ReportByQuarter','companies',2,'','$user->rights->tax->charges->lire','$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu==\"tax_vat\"',0,'2016-07-30 11:13:00'),(142284,'auguria',1,'','left','accountancy',139890,NULL,NULL,7,'/accountancy/customer/index.php?leftmenu=accounting','','MenuAccountancy','accountancy',0,'accounting','! empty($conf->accounting->enabled) || $user->rights->accounting->ventilation->read || $user->rights->accounting->ventilation->dispatch || $user->rights->compta->resultat->lire','$conf->accounting->enabled',0,'2016-07-30 11:13:00'),(142285,'auguria',1,'','left','accountancy',142284,NULL,NULL,1,'/accountancy/customer/index.php?leftmenu=dispatch_customer','','CustomersVentilation','accountancy',1,'dispatch_customer','$user->rights->accounting->ventilation->read','$conf->accounting->enabled',0,'2016-07-30 11:13:00'),(142286,'auguria',1,'','left','accountancy',142285,NULL,NULL,2,'/accountancy/customer/list.php','','ToDispatch','accountancy',2,'','$user->rights->accounting->ventilation->dispatch','$conf->accounting->enabled && $leftmenu==\"dispatch_customer\"',0,'2016-07-30 11:13:00'),(142287,'auguria',1,'','left','accountancy',142285,NULL,NULL,3,'/accountancy/customer/lines.php','','Dispatched','accountancy',2,'','$user->rights->accounting->ventilation->read','$conf->accounting->enabled && $leftmenu==\"dispatch_customer\"',0,'2016-07-30 11:13:00'),(142294,'auguria',1,'','left','accountancy',142284,NULL,NULL,4,'/accountancy/supplier/index.php?leftmenu=dispatch_supplier','','SuppliersVentilation','accountancy',1,'ventil_supplier','$user->rights->accounting->ventilation->read','$conf->accounting->enabled && $conf->fournisseur->enabled',0,'2016-07-30 11:13:00'),(142295,'auguria',1,'','left','accountancy',142294,NULL,NULL,5,'/accountancy/supplier/list.php','','ToDispatch','accountancy',2,'','$user->rights->accounting->ventilation->dispatch','$conf->accounting->enabled && $conf->fournisseur->enabled && $leftmenu==\"dispatch_supplier\"',0,'2016-07-30 11:13:00'),(142296,'auguria',1,'','left','accountancy',142294,NULL,NULL,6,'/accountancy/supplier/lines.php','','Dispatched','accountancy',2,'','$user->rights->accounting->ventilation->read','$conf->accounting->enabled && $conf->fournisseur->enabled && $leftmenu==\"dispatch_supplier\"',0,'2016-07-30 11:13:00'),(142314,'auguria',1,'','left','accountancy',142284,NULL,NULL,15,'/accountancy/bookkeeping/list.php','','Bookkeeping','accountancy',1,'bookkeeping','$user->rights->accounting->mouvements->lire','$conf->accounting->enabled',0,'2016-07-30 11:13:00'),(142319,'auguria',1,'','left','accountancy',142284,NULL,NULL,16,'/accountancy/bookkeeping/balance.php','','AccountBalance','accountancy',1,'balance','$user->rights->accounting->mouvements->lire','$conf->accounting->enabled',0,'2016-07-30 11:13:00'),(142324,'auguria',1,'','left','accountancy',142284,NULL,NULL,17,'/accountancy/report/result.php?leftmenu=ca&amp;mainmenu=accountancy','','Reportings','main',1,'report','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled',0,'2016-07-30 11:13:00'),(142325,'auguria',1,'','left','accountancy',142324,NULL,NULL,18,'/accountancy/report/result.php?leftmenu=ca','','ReportInOut','main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled && $leftmenu==\"ca\"',0,'2016-07-30 11:13:00'),(142326,'auguria',1,'','left','accountancy',142324,NULL,NULL,19,'/compta/resultat/index.php?leftmenu=ca','','ByExpenseIncome','main',3,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled && $leftmenu==\"ca\"',0,'2016-07-30 11:13:00'),(142327,'auguria',1,'','left','accountancy',142324,NULL,NULL,20,'/compta/resultat/clientfourn.php?leftmenu=ca','','ByCompanies','main',3,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled && $leftmenu==\"ca\"',0,'2016-07-30 11:13:00'),(142328,'auguria',1,'','left','accountancy',142324,NULL,NULL,21,'/compta/stats/index.php?leftmenu=ca','','ReportTurnover','main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled && $leftmenu==\"ca\"',0,'2016-07-30 11:13:00'),(142329,'auguria',1,'','left','accountancy',142324,NULL,NULL,22,'/compta/stats/casoc.php?leftmenu=ca','','ByCompanies','main',3,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled && $leftmenu==\"ca\"',0,'2016-07-30 11:13:00'),(142330,'auguria',1,'','left','accountancy',142324,NULL,NULL,23,'/compta/stats/cabyuser.php?leftmenu=ca','','ByUsers','main',3,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled && $leftmenu==\"ca\"',0,'2016-07-30 11:13:00'),(142331,'auguria',1,'','left','accountancy',142324,NULL,NULL,24,'/compta/stats/cabyprodserv.php?leftmenu=ca','','ByProductsAndServices','main',3,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled && $leftmenu==\"ca\"',0,'2016-07-30 11:13:00'),(142335,'auguria',1,'','left','home',142284,NULL,NULL,25,'/accountancy/admin/account.php?mainmenu=accountancy','','Chartofaccounts','admin',1,'','$user->rights->accounting->chartofaccount','$conf->accounting->enabled',0,'2016-07-30 11:13:00'),(142384,'auguria',1,'','left','accountancy',139898,NULL,NULL,9,'/compta/prelevement/index.php?leftmenu=withdraw&amp;mainmenu=bank','','StandingOrders','withdrawals',0,'withdraw','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled',2,'2016-07-30 11:13:00'),(142386,'auguria',1,'','left','accountancy',142384,NULL,NULL,0,'/compta/prelevement/create.php?leftmenu=withdraw','','NewStandingOrder','withdrawals',1,'','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled && $leftmenu==\"withdraw\"',2,'2016-07-30 11:13:00'),(142387,'auguria',1,'','left','accountancy',142384,NULL,NULL,2,'/compta/prelevement/bons.php?leftmenu=withdraw','','WithdrawalsReceipts','withdrawals',1,'','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled && $leftmenu==\"withdraw\"',2,'2016-07-30 11:13:00'),(142388,'auguria',1,'','left','accountancy',142384,NULL,NULL,3,'/compta/prelevement/list.php?leftmenu=withdraw','','WithdrawalsLines','withdrawals',1,'','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled && $leftmenu==\"withdraw\"',2,'2016-07-30 11:13:00'),(142390,'auguria',1,'','left','accountancy',142384,NULL,NULL,5,'/compta/prelevement/rejets.php?leftmenu=withdraw','','Rejects','withdrawals',1,'','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled && $leftmenu==\"withdraw\"',2,'2016-07-30 11:13:00'),(142391,'auguria',1,'','left','accountancy',142384,NULL,NULL,6,'/compta/prelevement/stats.php?leftmenu=withdraw','','Statistics','withdrawals',1,'','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled && $leftmenu==\"withdraw\"',2,'2016-07-30 11:13:00'),(142484,'auguria',1,'','left','accountancy',139898,NULL,NULL,1,'/compta/bank/index.php?leftmenu=bank&amp;mainmenu=bank','','MenuBankCash','banks',0,'bank','$user->rights->banque->lire','$conf->banque->enabled',0,'2016-07-30 11:13:00'),(142485,'auguria',1,'','left','accountancy',142484,NULL,NULL,0,'/compta/bank/card.php?action=create&amp;leftmenu=bank','','MenuNewFinancialAccount','banks',1,'','$user->rights->banque->configurer','$conf->banque->enabled && ($leftmenu==\"bank\" || $leftmenu==\"checks\" || $leftmenu==\"withdraw\")',0,'2016-07-30 11:13:00'),(142487,'auguria',1,'','left','accountancy',142484,NULL,NULL,2,'/compta/bank/search.php?leftmenu=bank','','ListTransactions','banks',1,'','$user->rights->banque->lire','$conf->banque->enabled && ($leftmenu==\"bank\" || $leftmenu==\"checks\" || $leftmenu==\"withdraw\")',0,'2016-07-30 11:13:00'),(142488,'auguria',1,'','left','accountancy',142484,NULL,NULL,3,'/compta/bank/budget.php?leftmenu=bank','','ListTransactionsByCategory','banks',1,'','$user->rights->banque->lire','$conf->banque->enabled && ($leftmenu==\"bank\" || $leftmenu==\"checks\" || $leftmenu==\"withdraw\")',0,'2016-07-30 11:13:00'),(142490,'auguria',1,'','left','accountancy',142484,NULL,NULL,5,'/compta/bank/virement.php?leftmenu=bank','','BankTransfers','banks',1,'','$user->rights->banque->transfer','$conf->banque->enabled && ($leftmenu==\"bank\" || $leftmenu==\"checks\" || $leftmenu==\"withdraw\")',0,'2016-07-30 11:13:00'),(142534,'auguria',1,'','left','accountancy',139898,NULL,NULL,4,'/categories/index.php?leftmenu=cat&amp;type=5','','Categories','categories',0,'cat','$user->rights->categorie->lire','$conf->categorie->enabled',2,'2016-07-30 11:13:00'),(142535,'auguria',1,'','left','accountancy',142534,NULL,NULL,0,'/categories/card.php?action=create&amp;type=5','','NewCategory','categories',1,'','$user->rights->categorie->creer','$conf->categorie->enabled',2,'2016-07-30 11:13:00'),(142584,'auguria',1,'','left','accountancy',139890,NULL,NULL,11,'/compta/resultat/index.php?leftmenu=ca&amp;mainmenu=accountancy','','Reportings','main',0,'ca','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled',0,'2016-07-30 11:13:00'),(142585,'auguria',1,'','left','accountancy',142584,NULL,NULL,0,'/compta/resultat/index.php?leftmenu=ca','','ReportInOut','main',1,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled && $leftmenu==\"ca\"',0,'2016-07-30 11:13:00'),(142586,'auguria',1,'','left','accountancy',142585,NULL,NULL,0,'/compta/resultat/clientfourn.php?leftmenu=ca','','ByCompanies','main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled && $leftmenu==\"ca\"',0,'2016-07-30 11:13:00'),(142587,'auguria',1,'','left','accountancy',142584,NULL,NULL,1,'/compta/stats/index.php?leftmenu=ca','','ReportTurnover','main',1,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled && $leftmenu==\"ca\"',0,'2016-07-30 11:13:00'),(142588,'auguria',1,'','left','accountancy',142587,NULL,NULL,0,'/compta/stats/casoc.php?leftmenu=ca','','ByCompanies','main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled && $leftmenu==\"ca\"',0,'2016-07-30 11:13:00'),(142589,'auguria',1,'','left','accountancy',142587,NULL,NULL,1,'/compta/stats/cabyuser.php?leftmenu=ca','','ByUsers','main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled && $leftmenu==\"ca\"',0,'2016-07-30 11:13:00'),(142590,'auguria',1,'','left','accountancy',142584,NULL,NULL,1,'/compta/journal/sellsjournal.php?leftmenu=ca','','SellsJournal','main',1,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled && $leftmenu==\"ca\"',0,'2016-07-30 11:13:00'),(142591,'auguria',1,'','left','accountancy',142584,NULL,NULL,1,'/compta/journal/purchasesjournal.php?leftmenu=ca','','PurchasesJournal','main',1,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled && $leftmenu==\"ca\"',0,'2016-07-30 11:13:00'),(142592,'auguria',1,'','left','accountancy',142587,NULL,NULL,1,'/compta/stats/cabyprodserv.php?leftmenu=ca','','ByProductsAndServices','main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled && $leftmenu==\"ca\"',0,'2016-07-30 11:13:00'),(142684,'auguria',1,'','left','products',139887,NULL,NULL,0,'/product/index.php?leftmenu=product&amp;type=0','','Products','products',0,'product','$user->rights->produit->lire','$conf->product->enabled',2,'2016-07-30 11:13:00'),(142685,'auguria',1,'','left','products',142684,NULL,NULL,0,'/product/card.php?leftmenu=product&amp;action=create&amp;type=0','','NewProduct','products',1,'','$user->rights->produit->creer','$conf->product->enabled',2,'2016-07-30 11:13:00'),(142686,'auguria',1,'','left','products',142684,NULL,NULL,1,'/product/list.php?leftmenu=product&amp;type=0','','List','products',1,'','$user->rights->produit->lire','$conf->product->enabled',2,'2016-07-30 11:13:00'),(142687,'auguria',1,'','left','products',142684,NULL,NULL,4,'/product/reassort.php?type=0','','Stocks','products',1,'','$user->rights->produit->lire && $user->rights->stock->lire','$conf->product->enabled',2,'2016-07-30 11:13:00'),(142688,'auguria',1,'','left','products',142684,NULL,NULL,6,'/product/stats/card.php?id=all&amp;leftmenu=stats&amp;type=0','','Statistics','main',1,'','$user->rights->produit->lire','$conf->propal->enabled',2,'2016-07-30 11:13:00'),(142689,'auguria',1,'','left','products',142684,NULL,NULL,5,'/product/reassortlot.php?type=0','','StocksByLotSerial','products',1,'','$user->rights->produit->lire && $user->rights->stock->lire','$conf->productbatch->enabled',2,'2016-07-30 11:13:00'),(142784,'auguria',1,'','left','products',139887,NULL,NULL,1,'/product/index.php?leftmenu=service&amp;type=1','','Services','products',0,'service','$user->rights->service->lire','$conf->service->enabled',2,'2016-07-30 11:13:00'),(142785,'auguria',1,'','left','products',142784,NULL,NULL,0,'/product/card.php?leftmenu=service&amp;action=create&amp;type=1','','NewService','products',1,'','$user->rights->service->creer','$conf->service->enabled',2,'2016-07-30 11:13:00'),(142786,'auguria',1,'','left','products',142784,NULL,NULL,1,'/product/list.php?leftmenu=service&amp;type=1','','List','products',1,'','$user->rights->service->lire','$conf->service->enabled',2,'2016-07-30 11:13:00'),(142787,'auguria',1,'','left','products',142784,NULL,NULL,5,'/product/stats/card.php?id=all&amp;leftmenu=stats&amp;type=1','','Statistics','main',1,'','$user->rights->service->lire','$conf->propal->enabled',2,'2016-07-30 11:13:00'),(142984,'auguria',1,'','left','products',139887,NULL,NULL,3,'/product/stock/index.php?leftmenu=stock','','Stock','stocks',0,'stock','$user->rights->stock->lire','$conf->stock->enabled',2,'2016-07-30 11:13:00'),(142985,'auguria',1,'','left','products',142984,NULL,NULL,0,'/product/stock/card.php?action=create','','MenuNewWarehouse','stocks',1,'','$user->rights->stock->creer','$conf->stock->enabled',2,'2016-07-30 11:13:00'),(142986,'auguria',1,'','left','products',142984,NULL,NULL,1,'/product/stock/list.php','','List','stocks',1,'','$user->rights->stock->lire','$conf->stock->enabled',2,'2016-07-30 11:13:00'),(142988,'auguria',1,'','left','products',142984,NULL,NULL,3,'/product/stock/mouvement.php','','Movements','stocks',1,'','$user->rights->stock->mouvement->lire','$conf->stock->enabled',2,'2016-07-30 11:13:00'),(142989,'auguria',1,'','left','products',142984,NULL,NULL,4,'/product/stock/replenish.php','','Replenishments','stocks',1,'','$user->rights->stock->mouvement->creer && $user->rights->fournisseur->lire','$conf->stock->enabled && $conf->supplier_order->enabled',2,'2016-07-30 11:13:00'),(142990,'auguria',1,'','left','products',142984,NULL,NULL,5,'/product/stock/massstockmove.php','','MassStockTransferShort','stocks',1,'','$user->rights->stock->mouvement->creer','$conf->stock->enabled',2,'2016-07-30 11:13:00'),(143084,'auguria',1,'','left','products',139887,NULL,NULL,4,'/categories/index.php?leftmenu=cat&amp;type=0','','Categories','categories',0,'cat','$user->rights->categorie->lire','$conf->categorie->enabled',2,'2016-07-30 11:13:00'),(143085,'auguria',1,'','left','products',143084,NULL,NULL,0,'/categories/card.php?action=create&amp;type=0','','NewCategory','categories',1,'','$user->rights->categorie->creer','$conf->categorie->enabled',2,'2016-07-30 11:13:00'),(143484,'auguria',1,'','left','project',139891,NULL,NULL,0,'/projet/index.php?leftmenu=projects','','Projects','projects',0,'projects','$user->rights->projet->lire','$conf->projet->enabled',2,'2016-07-30 11:13:00'),(143485,'auguria',1,'','left','project',143484,NULL,NULL,1,'/projet/card.php?leftmenu=projects&amp;action=create','','NewProject','projects',1,'','$user->rights->projet->creer','$conf->projet->enabled',2,'2016-07-30 11:13:00'),(143486,'auguria',1,'','left','project',143484,NULL,NULL,2,'/projet/list.php?leftmenu=projects','','List','projects',1,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2016-07-30 11:13:00'),(143494,'auguria',1,'','left','project',139891,NULL,NULL,0,'/projet/index.php?leftmenu=projects&amp;mode=mine','','MyProjects','projects',0,'myprojects','$user->rights->projet->lire','$conf->projet->enabled',2,'2016-07-30 11:13:00'),(143495,'auguria',1,'','left','project',143494,NULL,NULL,1,'/projet/card.php?leftmenu=projects&amp;action=create&amp;mode=mine','','NewProject','projects',1,'','$user->rights->projet->creer','$conf->projet->enabled',2,'2016-07-30 11:13:00'),(143496,'auguria',1,'','left','project',143494,NULL,NULL,2,'/projet/list.php?leftmenu=projects&amp;mode=mine','','List','projects',1,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2016-07-30 11:13:00'),(143584,'auguria',1,'','left','project',139891,NULL,NULL,0,'/projet/activity/index.php?leftmenu=projects','','Activities','projects',0,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2016-07-30 11:13:00'),(143585,'auguria',1,'','left','project',143584,NULL,NULL,1,'/projet/tasks.php?leftmenu=projects&amp;action=create','','NewTask','projects',1,'','$user->rights->projet->creer','$conf->projet->enabled',2,'2016-07-30 11:13:00'),(143586,'auguria',1,'','left','project',143584,NULL,NULL,2,'/projet/tasks/list.php?leftmenu=projects','','List','projects',1,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2016-07-30 11:13:00'),(143587,'auguria',1,'','left','project',143584,NULL,NULL,3,'/projet/activity/perweek.php?leftmenu=projects','','NewTimeSpent','projects',1,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2016-07-30 11:13:00'),(143684,'auguria',1,'','left','project',139891,NULL,NULL,0,'/projet/activity/index.php?leftmenu=projects&amp;mode=mine','','MyActivities','projects',0,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2016-07-30 11:13:00'),(143685,'auguria',1,'','left','project',143684,NULL,NULL,1,'/projet/tasks.php?leftmenu=projects&amp;action=create','','NewTask','projects',1,'','$user->rights->projet->creer','$conf->projet->enabled',2,'2016-07-30 11:13:00'),(143686,'auguria',1,'','left','project',143684,NULL,NULL,2,'/projet/tasks/list.php?leftmenu=projects&amp;mode=mine','','List','projects',1,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2016-07-30 11:13:00'),(143687,'auguria',1,'','left','project',143684,NULL,NULL,3,'/projet/activity/perweek.php?leftmenu=projects&amp;mode=mine','','NewTimeSpent','projects',1,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2016-07-30 11:13:00'),(143784,'auguria',1,'','left','tools',139892,NULL,NULL,0,'/comm/mailing/index.php?leftmenu=mailing','','EMailings','mails',0,'mailing','$user->rights->mailing->lire','$conf->mailing->enabled',0,'2016-07-30 11:13:00'),(143785,'auguria',1,'','left','tools',143784,NULL,NULL,0,'/comm/mailing/card.php?leftmenu=mailing&amp;action=create','','NewMailing','mails',1,'','$user->rights->mailing->creer','$conf->mailing->enabled',0,'2016-07-30 11:13:00'),(143786,'auguria',1,'','left','tools',143784,NULL,NULL,1,'/comm/mailing/list.php?leftmenu=mailing','','List','mails',1,'','$user->rights->mailing->lire','$conf->mailing->enabled',0,'2016-07-30 11:13:00'),(143984,'auguria',1,'','left','tools',139892,NULL,NULL,2,'/exports/index.php?leftmenu=export','','FormatedExport','exports',0,'export','$user->rights->export->lire','$conf->export->enabled',2,'2016-07-30 11:13:00'),(143985,'auguria',1,'','left','tools',143984,NULL,NULL,0,'/exports/export.php?leftmenu=export','','NewExport','exports',1,'','$user->rights->export->creer','$conf->export->enabled',2,'2016-07-30 11:13:00'),(144014,'auguria',1,'','left','tools',139892,NULL,NULL,2,'/imports/index.php?leftmenu=import','','FormatedImport','exports',0,'import','$user->rights->import->run','$conf->import->enabled',2,'2016-07-30 11:13:00'),(144015,'auguria',1,'','left','tools',144014,NULL,NULL,0,'/imports/import.php?leftmenu=import','','NewImport','exports',1,'','$user->rights->import->run','$conf->import->enabled',2,'2016-07-30 11:13:00'),(144084,'auguria',1,'','left','members',139897,NULL,NULL,0,'/adherents/index.php?leftmenu=members&amp;mainmenu=members','','Members','members',0,'members','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2016-07-30 11:13:00'),(144085,'auguria',1,'','left','members',144084,NULL,NULL,0,'/adherents/card.php?leftmenu=members&amp;action=create','','NewMember','members',1,'','$user->rights->adherent->creer','$conf->adherent->enabled',2,'2016-07-30 11:13:00'),(144086,'auguria',1,'','left','members',144084,NULL,NULL,1,'/adherents/list.php','','List','members',1,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2016-07-30 11:13:00'),(144087,'auguria',1,'','left','members',144086,NULL,NULL,2,'/adherents/list.php?leftmenu=members&amp;statut=-1','','MenuMembersToValidate','members',2,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2016-07-30 11:13:00'),(144088,'auguria',1,'','left','members',144086,NULL,NULL,3,'/adherents/list.php?leftmenu=members&amp;statut=1','','MenuMembersValidated','members',2,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2016-07-30 11:13:00'),(144089,'auguria',1,'','left','members',144086,NULL,NULL,4,'/adherents/list.php?leftmenu=members&amp;statut=1&amp;filter=outofdate','','MenuMembersNotUpToDate','members',2,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2016-07-30 11:13:00'),(144090,'auguria',1,'','left','members',144086,NULL,NULL,5,'/adherents/list.php?leftmenu=members&amp;statut=1&amp;filter=uptodate','','MenuMembersUpToDate','members',2,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2016-07-30 11:13:00'),(144091,'auguria',1,'','left','members',144086,NULL,NULL,6,'/adherents/list.php?leftmenu=members&amp;statut=0','','MenuMembersResiliated','members',2,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2016-07-30 11:13:00'),(144092,'auguria',1,'','left','members',144084,NULL,NULL,7,'/adherents/stats/geo.php?leftmenu=members&amp;mode=memberbycountry','','MenuMembersStats','members',1,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2016-07-30 11:13:00'),(144184,'auguria',1,'','left','members',139897,NULL,NULL,1,'/adherents/index.php?leftmenu=members&amp;mainmenu=members','','Subscriptions','compta',0,'','$user->rights->adherent->cotisation->lire','$conf->adherent->enabled',2,'2016-07-30 11:13:00'),(144185,'auguria',1,'','left','members',144184,NULL,NULL,0,'/adherents/list.php?statut=-1&amp;leftmenu=accountancy&amp;mainmenu=members','','NewSubscription','compta',1,'','$user->rights->adherent->cotisation->creer','$conf->adherent->enabled',2,'2016-07-30 11:13:00'),(144186,'auguria',1,'','left','members',144184,NULL,NULL,1,'/adherents/cotisations.php?leftmenu=members','','List','compta',1,'','$user->rights->adherent->cotisation->lire','$conf->adherent->enabled',2,'2016-07-30 11:13:00'),(144187,'auguria',1,'','left','members',144184,NULL,NULL,7,'/adherents/stats/index.php?leftmenu=members','','MenuMembersStats','members',1,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2016-07-30 11:13:00'),(144384,'auguria',1,'','left','members',139897,NULL,NULL,3,'/adherents/index.php?leftmenu=export&amp;mainmenu=members','','Exports','members',0,'export','$user->rights->adherent->export','$conf->adherent->enabled',2,'2016-07-30 11:13:00'),(144385,'auguria',1,'','left','members',144384,NULL,NULL,0,'/exports/index.php?leftmenu=export','','Datas','members',1,'','$user->rights->adherent->export','$conf->adherent->enabled && $conf->export->enabled',2,'2016-07-30 11:13:00'),(144386,'auguria',1,'','left','members',144384,NULL,NULL,1,'/adherents/htpasswd.php?leftmenu=export','','Filehtpasswd','members',1,'','$user->rights->adherent->export','$conf->adherent->enabled',2,'2016-07-30 11:13:00'),(144387,'auguria',1,'','left','members',144384,NULL,NULL,2,'/adherents/cartes/carte.php?leftmenu=export','','MembersCards','members',1,'','$user->rights->adherent->export','$conf->adherent->enabled',2,'2016-07-30 11:13:00'),(144484,'auguria',1,'','left','hrm',139899,NULL,NULL,1,'/user/index.php?&leftmenu=hrm&mode=employee','','Employees','hrm',0,'hrm','$user->rights->hrm->employee->read','$conf->hrm->enabled',0,'2016-07-30 11:13:00'),(144485,'auguria',1,'','left','hrm',144484,NULL,NULL,1,'/user/card.php?&action=create','','NewEmployee','hrm',1,'','$user->rights->hrm->employee->write','$conf->hrm->enabled',0,'2016-07-30 11:13:00'),(144486,'auguria',1,'','left','hrm',144484,NULL,NULL,2,'/user/index.php?$leftmenu=hrm&mode=employee','','List','hrm',1,'','$user->rights->hrm->employee->read','$conf->hrm->enabled',0,'2016-07-30 11:13:00'),(144584,'auguria',1,'','left','members',139897,NULL,NULL,5,'/adherents/type.php?leftmenu=setup&amp;mainmenu=members','','MembersTypes','members',0,'setup','$user->rights->adherent->configurer','$conf->adherent->enabled',2,'2016-07-30 11:13:00'),(144585,'auguria',1,'','left','members',144584,NULL,NULL,0,'/adherents/type.php?leftmenu=setup&amp;mainmenu=members&amp;action=create','','New','members',1,'','$user->rights->adherent->configurer','$conf->adherent->enabled',2,'2016-07-30 11:13:00'),(144586,'auguria',1,'','left','members',144584,NULL,NULL,1,'/adherents/type.php?leftmenu=setup&amp;mainmenu=members','','List','members',1,'','$user->rights->adherent->configurer','$conf->adherent->enabled',2,'2016-07-30 11:13:00'),(144884,'auguria',1,'','left','hrm',139899,NULL,NULL,1,'/holiday/list.php?&leftmenu=hrm','','CPTitreMenu','holiday',0,'hrm','$user->rights->holiday->read','$conf->holiday->enabled',0,'2016-07-30 11:13:00'),(144885,'auguria',1,'','left','hrm',144884,NULL,NULL,1,'/holiday/card.php?&action=request','','MenuAddCP','holiday',1,'','$user->rights->holiday->write','$conf->holiday->enabled',0,'2016-07-30 11:13:00'),(144886,'auguria',1,'','left','hrm',144884,NULL,NULL,1,'/holiday/list.php?&leftmenu=hrm','','List','holiday',1,'','$user->rights->holiday->read','$conf->holiday->enabled',0,'2016-07-30 11:13:00'),(144887,'auguria',1,'','left','hrm',144886,NULL,NULL,1,'/holiday/list.php?select_statut=2&leftmenu=hrm','','ListToApprove','trips',2,'','$user->rights->holiday->read','$conf->holiday->enabled',0,'2016-07-30 11:13:00'),(144888,'auguria',1,'','left','hrm',144884,NULL,NULL,2,'/holiday/define_holiday.php?&action=request','','MenuConfCP','holiday',1,'','$user->rights->holiday->define_holiday','$conf->holiday->enabled',0,'2016-07-30 11:13:00'),(144889,'auguria',1,'','left','hrm',144884,NULL,NULL,3,'/holiday/view_log.php?&action=request','','MenuLogCP','holiday',1,'','$user->rights->holiday->define_holiday','$conf->holiday->enabled',0,'2016-07-30 11:13:00'),(144984,'auguria',1,'','left','commercial',139889,NULL,NULL,6,'/fourn/commande/index.php?leftmenu=orders_suppliers','','SuppliersOrders','orders',0,'orders_suppliers','$user->rights->fournisseur->commande->lire','$conf->supplier_order->enabled',2,'2016-07-30 11:13:00'),(144985,'auguria',1,'','left','commercial',144984,NULL,NULL,0,'/fourn/commande/card.php?action=create&amp;leftmenu=orders_suppliers','','NewOrder','orders',1,'','$user->rights->fournisseur->commande->creer','$conf->supplier_order->enabled',2,'2016-07-30 11:13:00'),(144986,'auguria',1,'','left','commercial',144984,NULL,NULL,1,'/fourn/commande/list.php?leftmenu=orders_suppliers&amp;viewstatut=0','','List','orders',1,'','$user->rights->fournisseur->commande->lire','$conf->supplier_order->enabled',2,'2016-07-30 11:13:00'),(144992,'auguria',1,'','left','commercial',144984,NULL,NULL,7,'/commande/stats/index.php?leftmenu=orders_suppliers&amp;mode=supplier','','Statistics','orders',1,'','$user->rights->fournisseur->commande->lire','$conf->supplier_order->enabled',2,'2016-07-30 11:13:00'),(145084,'auguria',1,'','left','members',139897,NULL,NULL,3,'/categories/index.php?leftmenu=cat&amp;type=3','','MembersCategoriesShort','categories',0,'cat','$user->rights->categorie->lire','$conf->adherent->enabled && $conf->categorie->enabled',2,'2016-07-30 11:13:00'),(145085,'auguria',1,'','left','members',145084,NULL,NULL,0,'/categories/card.php?action=create&amp;type=3','','NewCategory','categories',1,'','$user->rights->categorie->creer','$conf->adherent->enabled && $conf->categorie->enabled',2,'2016-07-30 11:13:00'),(145086,'all',1,'supplier_proposal','left','commercial',-1,NULL,'commercial',300,'/supplier_proposal/index.php','','SupplierProposalsShort','supplier_proposal',NULL,'supplier_proposalsubmenu','$user->rights->supplier_proposal->lire','$conf->supplier_proposal->enabled',2,'2016-07-30 11:13:20'),(145087,'all',1,'supplier_proposal','left','commercial',-1,'supplier_proposalsubmenu','commercial',301,'/supplier_proposal/card.php?action=create&amp;leftmenu=supplier_proposals','','SupplierProposalNew','supplier_proposal',NULL,NULL,'$user->rights->supplier_proposal->creer','$conf->supplier_proposal->enabled',2,'2016-07-30 11:13:20'),(145088,'all',1,'supplier_proposal','left','commercial',-1,'supplier_proposalsubmenu','commercial',302,'/supplier_proposal/list.php?leftmenu=supplier_proposals','','List','supplier_proposal',NULL,NULL,'$user->rights->supplier_proposal->lire','$conf->supplier_proposal->enabled',2,'2016-07-30 11:13:20'),(145089,'all',1,'supplier_proposal','left','commercial',-1,'supplier_proposalsubmenu','commercial',303,'/comm/propal/stats/index.php?leftmenu=supplier_proposals&amp;mode=supplier','','Statistics','supplier_proposal',NULL,NULL,'$user->rights->supplier_proposal->lire','$conf->supplier_proposal->enabled',2,'2016-07-30 11:13:20'),(145090,'all',1,'resource','left','tools',-1,NULL,'tools',100,'/resource/list.php','','MenuResourceIndex','resource',NULL,'resource','$user->rights->resource->read','1',0,'2016-07-30 11:13:32'),(145091,'all',1,'resource','left','tools',-1,'resource','tools',101,'/resource/add.php','','MenuResourceAdd','resource',NULL,NULL,'$user->rights->resource->read','1',0,'2016-07-30 11:13:32'),(145092,'all',1,'resource','left','tools',-1,'resource','tools',102,'/resource/list.php','','List','resource',NULL,NULL,'$user->rights->resource->read','1',0,'2016-07-30 11:13:32'),(145094,'all',1,'agenda','top','agenda',0,NULL,NULL,100,'/comm/action/index.php','','Agenda','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2016-07-30 15:42:32'),(145095,'all',1,'agenda','left','agenda',145094,NULL,NULL,100,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda','','Actions','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2016-07-30 15:42:32'),(145096,'all',1,'agenda','left','agenda',145095,NULL,NULL,101,'/comm/action/card.php?mainmenu=agenda&amp;leftmenu=agenda&amp;action=create','','NewAction','commercial',NULL,NULL,'($user->rights->agenda->myactions->create||$user->rights->agenda->allactions->create)','$conf->agenda->enabled',2,'2016-07-30 15:42:32'),(145097,'all',1,'agenda','left','agenda',145095,NULL,NULL,102,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda','','Agenda','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2016-07-30 15:42:32'),(145098,'all',1,'agenda','left','agenda',145097,NULL,NULL,103,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filter=mine','','MenuToDoMyActions','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2016-07-30 15:42:32'),(145099,'all',1,'agenda','left','agenda',145097,NULL,NULL,104,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filter=mine','','MenuDoneMyActions','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2016-07-30 15:42:32'),(145100,'all',1,'agenda','left','agenda',145097,NULL,NULL,105,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filtert=-1','','MenuToDoActions','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2016-07-30 15:42:32'),(145101,'all',1,'agenda','left','agenda',145097,NULL,NULL,106,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filtert=-1','','MenuDoneActions','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2016-07-30 15:42:32'),(145102,'all',1,'agenda','left','agenda',145095,NULL,NULL,112,'/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda','','List','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2016-07-30 15:42:32'),(145103,'all',1,'agenda','left','agenda',145102,NULL,NULL,113,'/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filter=mine','','MenuToDoMyActions','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2016-07-30 15:42:32'),(145104,'all',1,'agenda','left','agenda',145102,NULL,NULL,114,'/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filter=mine','','MenuDoneMyActions','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2016-07-30 15:42:32'),(145105,'all',1,'agenda','left','agenda',145102,NULL,NULL,115,'/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filtert=-1','','MenuToDoActions','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2016-07-30 15:42:32'),(145106,'all',1,'agenda','left','agenda',145102,NULL,NULL,116,'/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filtert=-1','','MenuDoneActions','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2016-07-30 15:42:32'),(145107,'all',1,'agenda','left','agenda',145095,NULL,NULL,120,'/comm/action/rapport/index.php?mainmenu=agenda&amp;leftmenu=agenda','','Reportings','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$conf->agenda->enabled',2,'2016-07-30 15:42:32'),(145111,'all',1,'opensurvey','left','tools',-1,NULL,'tools',200,'/opensurvey/index.php?mainmenu=tools&leftmenu=opensurvey','','Survey','opensurvey',NULL,'opensurvey','$user->rights->opensurvey->read','$conf->opensurvey->enabled',0,'2016-07-30 19:04:07'),(145112,'all',1,'opensurvey','left','tools',-1,'opensurvey','tools',210,'/opensurvey/wizard/index.php','','NewSurvey','opensurvey',NULL,'opensurvey_new','$user->rights->opensurvey->write','$conf->opensurvey->enabled',0,'2016-07-30 19:04:07'),(145113,'all',1,'opensurvey','left','tools',-1,'opensurvey','tools',220,'/opensurvey/list.php','','List','opensurvey',NULL,'opensurvey_list','$user->rights->opensurvey->read','$conf->opensurvey->enabled',0,'2016-07-30 19:04:07'),(145127,'all',1,'printing','left','home',-1,'admintools','home',300,'/printing/index.php?mainmenu=home&leftmenu=admintools','','MenuDirectPrinting','printing',NULL,NULL,'$user->rights->printing->read','$conf->printing->enabled && $leftmenu==\'admintools\'',0,'2017-01-29 15:12:44'),(145146,'all',1,'barcode','left','tools',-1,NULL,'tools',200,'/barcode/printsheet.php?mainmenu=tools&leftmenu=barcodeprint','','BarCodePrintsheet','products',NULL,'barcodeprint','($conf->global->MAIN_USE_ADVANCED_PERMS && $user->rights->barcode->lire_advance) || (! $conf->global->MAIN_USE_ADVANCED_PERMS)','$conf->barcode->enabled',2,'2017-02-21 11:03:40'),(145147,'all',1,'barcode','left','home',-1,'admintools','home',300,'/barcode/codeinit.php?mainmenu=home&leftmenu=admintools','','MassBarcodeInit','products',NULL,NULL,'($conf->global->MAIN_USE_ADVANCED_PERMS && $user->rights->barcode->creer_advance) || (! $conf->global->MAIN_USE_ADVANCED_PERMS)','$conf->barcode->enabled && $leftmenu==\"admintools\"',0,'2017-02-21 11:03:40'),(145148,'all',1,'cron','left','home',-1,'admintools','home',200,'/cron/list.php?status=-2&leftmenu=admintools','','CronList','cron',NULL,NULL,'$user->rights->cron->read','$leftmenu==\'admintools\'',2,'2017-02-21 11:03:40');
+INSERT INTO `llx_menu` VALUES (103094,'all',2,'agenda','top','agenda',0,NULL,NULL,100,'/comm/action/index.php','','Agenda','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2013-03-13 15:29:19'),(103095,'all',2,'agenda','left','agenda',103094,NULL,NULL,100,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda','','Actions','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2013-03-13 15:29:19'),(103096,'all',2,'agenda','left','agenda',103095,NULL,NULL,101,'/comm/action/card.php?mainmenu=agenda&amp;leftmenu=agenda&amp;action=create','','NewAction','commercial',NULL,NULL,'($user->rights->agenda->myactions->create||$user->rights->agenda->allactions->create)','$conf->agenda->enabled',2,'2013-03-13 15:29:19'),(103097,'all',2,'agenda','left','agenda',103095,NULL,NULL,102,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda','','Calendar','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2013-03-13 15:29:19'),(103098,'all',2,'agenda','left','agenda',103097,NULL,NULL,103,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filter=mine','','MenuToDoMyActions','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2013-03-13 15:29:19'),(103099,'all',2,'agenda','left','agenda',103097,NULL,NULL,104,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filter=mine','','MenuDoneMyActions','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2013-03-13 15:29:19'),(103100,'all',2,'agenda','left','agenda',103097,NULL,NULL,105,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo','','MenuToDoActions','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2013-03-13 15:29:19'),(103101,'all',2,'agenda','left','agenda',103097,NULL,NULL,106,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=done','','MenuDoneActions','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2013-03-13 15:29:19'),(103102,'all',2,'agenda','left','agenda',103095,NULL,NULL,112,'/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda','','List','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2013-03-13 15:29:19'),(103103,'all',2,'agenda','left','agenda',103102,NULL,NULL,113,'/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filter=mine','','MenuToDoMyActions','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2013-03-13 15:29:19'),(103104,'all',2,'agenda','left','agenda',103102,NULL,NULL,114,'/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filter=mine','','MenuDoneMyActions','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2013-03-13 15:29:19'),(103105,'all',2,'agenda','left','agenda',103102,NULL,NULL,115,'/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo','','MenuToDoActions','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2013-03-13 15:29:19'),(103106,'all',2,'agenda','left','agenda',103102,NULL,NULL,116,'/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=done','','MenuDoneActions','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2013-03-13 15:29:19'),(103107,'all',2,'agenda','left','agenda',103095,NULL,NULL,120,'/comm/action/rapport/index.php?mainmenu=agenda&amp;leftmenu=agenda','','Reportings','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$conf->agenda->enabled',2,'2013-03-13 15:29:19'),(103108,'all',2,'pos','top','pos',0,NULL,NULL,100,'/pos/backend/listefac.php','','POS','pos@pos',NULL,'1','1','1',2,'2013-03-13 20:33:09'),(103109,'all',2,'pos','left','pos',103108,NULL,NULL,100,'/pos/backend/list.php','','Tickets','pos@pos',NULL,NULL,'$user->rights->pos->backend','$conf->global->POS_USE_TICKETS',0,'2013-03-13 20:33:09'),(103110,'all',2,'pos','left','pos',103109,NULL,NULL,100,'/pos/backend/list.php','','List','main',NULL,NULL,'$user->rights->pos->backend','$conf->global->POS_USE_TICKETS',0,'2013-03-13 20:33:09'),(103111,'all',2,'pos','left','pos',103110,NULL,NULL,100,'/pos/backend/list.php?viewstatut=0','','StatusTicketDraft','pos@pos',NULL,NULL,'$user->rights->pos->backend','$conf->global->POS_USE_TICKETS',0,'2013-03-13 20:33:09'),(103112,'all',2,'pos','left','@pos',103110,NULL,NULL,100,'/pos/backend/list.php?viewstatut=1','','StatusTicketClosed','main',NULL,NULL,'$user->rights->pos->backend','$conf->global->POS_USE_TICKETS',0,'2013-03-13 20:33:09'),(103113,'all',2,'pos','left','@pos',103110,NULL,NULL,100,'/pos/backend/list.php?viewstatut=2','','StatusTicketProcessed','main',NULL,NULL,'$user->rights->pos->backend','$conf->global->POS_USE_TICKETS',0,'2013-03-13 20:33:09'),(103114,'all',2,'pos','left','@pos',103110,NULL,NULL,100,'/pos/backend/list.php?viewtype=1','','StatusTicketReturned','main',NULL,NULL,'$user->rights->pos->backend','$conf->global->POS_USE_TICKETS',0,'2013-03-13 20:33:09'),(103115,'all',2,'pos','left','pos',103108,NULL,NULL,100,'/pos/backend/listefac.php','','Factures','pos@pos',NULL,NULL,'$user->rights->pos->backend','1',0,'2013-03-13 20:33:09'),(103116,'all',2,'pos','left','pos',103115,NULL,NULL,100,'/pos/backend/listefac.php','','List','main',NULL,NULL,'$user->rights->pos->backend','1',0,'2013-03-13 20:33:09'),(103117,'all',2,'pos','left','pos',103116,NULL,NULL,100,'/pos/backend/listefac.php?viewstatut=0','','BillStatusDraft','bills',NULL,NULL,'$user->rights->pos->backend','1',0,'2013-03-13 20:33:09'),(103118,'all',2,'pos','left','@pos',103116,NULL,NULL,100,'/pos/backend/listefac.php?viewstatut=1','','BillStatusValidated','bills',NULL,NULL,'$user->rights->pos->backend','1',0,'2013-03-13 20:33:09'),(103119,'all',2,'pos','left','@pos',103116,NULL,NULL,100,'/pos/backend/listefac.php?viewstatut=2&viewtype=0','','BillStatusPaid','bills',NULL,NULL,'$user->rights->pos->backend','1',0,'2013-03-13 20:33:09'),(103120,'all',2,'pos','left','@pos',103116,NULL,NULL,100,'/pos/backend/listefac.php?viewtype=2','','BillStatusReturned','main',NULL,NULL,'$user->rights->pos->backend','1',0,'2013-03-13 20:33:09'),(103121,'all',2,'pos','left','@pos',103108,NULL,NULL,100,'/pos/frontend/index.php','','POS','main',NULL,NULL,'$user->rights->pos->frontend','1',0,'2013-03-13 20:33:09'),(103122,'all',2,'pos','left','@pos',103121,NULL,NULL,100,'/pos/frontend/index.php','','NewTicket','main',NULL,NULL,'$user->rights->pos->frontend','1',0,'2013-03-13 20:33:09'),(103123,'all',2,'pos','left','@pos',103121,NULL,NULL,101,'/pos/backend/closes.php','','CloseandArching','main',NULL,NULL,'$user->rights->pos->backend','1',0,'2013-03-13 20:33:09'),(103124,'all',2,'pos','left','@pos',103108,NULL,NULL,100,'/pos/backend/terminal/cash.php','','Terminal','main',NULL,NULL,'$user->rights->pos->backend','1',0,'2013-03-13 20:33:09'),(103125,'all',2,'pos','left','@pos',103124,NULL,NULL,100,'/pos/backend/terminal/card.php?action=create','','NewCash','main',NULL,NULL,'$user->rights->pos->backend','1',0,'2013-03-13 20:33:09'),(103126,'all',2,'pos','left','@pos',103124,NULL,NULL,101,'/pos/backend/terminal/cash.php','','List','main',NULL,NULL,'$user->rights->pos->backend','1',0,'2013-03-13 20:33:09'),(103127,'all',2,'pos','left','@pos',103123,NULL,NULL,101,'/pos/backend/closes.php?viewstatut=0','','Arqueo','main',NULL,NULL,'$user->rights->pos->backend','1',0,'2013-03-13 20:33:09'),(103128,'all',2,'pos','left','@pos',103123,NULL,NULL,102,'/pos/backend/closes.php?viewstatut=1','','Closes','main',NULL,NULL,'$user->rights->pos->backend','1',0,'2013-03-13 20:33:09'),(103129,'all',2,'pos','left','@pos',103108,NULL,NULL,102,'/pos/backend/transfers.php','','Transfer','main',NULL,NULL,'$user->rights->pos->transfer','1',0,'2013-03-13 20:33:09'),(103130,'all',2,'pos','left','@pos',103108,NULL,NULL,102,'/pos/backend/resultat/index.php','','Rapport','main',NULL,NULL,'$user->rights->pos->stats','1',0,'2013-03-13 20:33:09'),(103131,'all',2,'pos','left','@pos',103130,NULL,NULL,102,'/pos/backend/resultat/casoc.php','','ReportsCustomer','main',NULL,NULL,'$user->rights->pos->stats','1',0,'2013-03-13 20:33:09'),(103132,'all',2,'pos','left','@pos',103130,NULL,NULL,102,'/pos/backend/resultat/causer.php','','ReportsUser','main',NULL,NULL,'$user->rights->pos->stats','1',0,'2013-03-13 20:33:09'),(103133,'all',2,'pos','left','@pos',103130,NULL,NULL,102,'/pos/backend/resultat/sellsjournal.php','','ReportsSells','main',NULL,NULL,'$user->rights->pos->stats','1',0,'2013-03-13 20:33:09'),(103134,'all',2,'opensurvey','top','opensurvey',0,NULL,NULL,200,'/opensurvey/index.php','','Surveys','opensurvey',NULL,NULL,'$user->rights->opensurvey->survey->read','$conf->opensurvey->enabled',0,'2013-03-13 20:33:42'),(103135,'all',2,'opensurvey','left','opensurvey',-1,NULL,'opensurvey',200,'/opensurvey/index.php?mainmenu=opensurvey&leftmenu=opensurvey','','Survey','opensurvey@opensurvey',NULL,'opensurvey','','$conf->opensurvey->enabled',0,'2013-03-13 20:33:42'),(103136,'all',2,'opensurvey','left','opensurvey',-1,'opensurvey','opensurvey',210,'/opensurvey/public/index.php','_blank','NewSurvey','opensurvey@opensurvey',NULL,'opensurvey_new','','$conf->opensurvey->enabled',0,'2013-03-13 20:33:42'),(103137,'all',2,'opensurvey','left','opensurvey',-1,'opensurvey','opensurvey',220,'/opensurvey/list.php','','List','opensurvey@opensurvey',NULL,'opensurvey_list','','$conf->opensurvey->enabled',0,'2013-03-13 20:33:42'),(124179,'all',1,'cashdesk','top','cashdesk',0,NULL,NULL,100,'/cashdesk/index.php?user=__LOGIN__','pointofsale','CashDeskMenu','cashdesk',NULL,NULL,'$user->rights->cashdesk->use','$conf->cashdesk->enabled',0,'2015-11-15 22:38:33'),(124210,'all',1,'margins','left','accountancy',-1,NULL,'accountancy',100,'/margin/index.php','','Margins','margins',NULL,'margins','$user->rights->margins->liretous','$conf->margin->enabled',2,'2015-11-15 22:41:47'),(134675,'all',1,'ecm','top','ecm',0,NULL,NULL,100,'/ecm/index.php','','MenuECM','ecm',NULL,NULL,'$user->rights->ecm->read || $user->rights->ecm->upload || $user->rights->ecm->setup','$conf->ecm->enabled',2,'2016-01-22 17:26:43'),(134676,'all',1,'ecm','left','ecm',-1,NULL,'ecm',101,'/ecm/index.php?mainmenu=ecm&leftmenu=ecm','','ECMArea','ecm',NULL,'ecm','$user->rights->ecm->read || $user->rights->ecm->upload','$user->rights->ecm->read || $user->rights->ecm->upload',2,'2016-01-22 17:26:43'),(134677,'all',1,'ecm','left','ecm',-1,'ecm','ecm',102,'/ecm/index.php?action=file_manager&mainmenu=ecm&leftmenu=ecm','','ECMSectionsManual','ecm',NULL,'ecm_manual','$user->rights->ecm->read || $user->rights->ecm->upload','$user->rights->ecm->read || $user->rights->ecm->upload',2,'2016-01-22 17:26:43'),(134678,'all',1,'ecm','left','ecm',-1,'ecm','ecm',103,'/ecm/index_auto.php?action=file_manager&mainmenu=ecm&leftmenu=ecm','','ECMSectionsAuto','ecm',NULL,NULL,'$user->rights->ecm->read || $user->rights->ecm->upload','$user->rights->ecm->read || $user->rights->ecm->upload',2,'2016-01-22 17:26:43'),(139885,'auguria',1,'','top','home',0,NULL,NULL,10,'/index.php?mainmenu=home&amp;leftmenu=','','Home','',-1,'','','1',2,'2016-07-30 11:13:00'),(139886,'auguria',1,'societe|fournisseur','top','companies',0,NULL,NULL,20,'/societe/index.php?mainmenu=companies&amp;leftmenu=','','ThirdParties','companies',-1,'','$user->rights->societe->lire || $user->rights->societe->contact->lire','( ! empty($conf->societe->enabled) && (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) || empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))) || ! empty($conf->fournisseur->enabled)',2,'2016-07-30 11:13:00'),(139887,'auguria',1,'product|service','top','products',0,NULL,NULL,30,'/product/index.php?mainmenu=products&amp;leftmenu=','','Products/Services','products',-1,'','$user->rights->produit->lire||$user->rights->service->lire','$conf->product->enabled || $conf->service->enabled',0,'2016-07-30 11:13:00'),(139889,'auguria',1,'propal|commande|fournisseur|contrat|ficheinter','top','commercial',0,NULL,NULL,40,'/comm/index.php?mainmenu=commercial&amp;leftmenu=','','Commercial','commercial',-1,'','$user->rights->societe->lire || $user->rights->societe->contact->lire','$conf->propal->enabled || $conf->commande->enabled || $conf->supplier_order->enabled || $conf->contrat->enabled || $conf->ficheinter->enabled',2,'2016-07-30 11:13:00'),(139890,'auguria',1,'comptabilite|accounting|facture|don|tax|salaries|loan','top','accountancy',0,NULL,NULL,50,'/compta/index.php?mainmenu=accountancy&amp;leftmenu=','','MenuFinancial','compta',-1,'','$user->rights->compta->resultat->lire || $user->rights->accounting->plancompte->lire || $user->rights->facture->lire|| $user->rights->don->lire || $user->rights->tax->charges->lire || $user->rights->salaries->read || $user->rights->loan->read','$conf->comptabilite->enabled || $conf->accounting->enabled || $conf->facture->enabled || $conf->don->enabled  || $conf->tax->enabled || $conf->salaries->enabled || $conf->supplier_invoice->enabled || $conf->loan->enabled',2,'2016-07-30 11:13:00'),(139891,'auguria',1,'projet','top','project',0,NULL,NULL,70,'/projet/index.php?mainmenu=project&amp;leftmenu=','','Projects','projects',-1,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2016-07-30 11:13:00'),(139892,'auguria',1,'mailing|export|import|opensurvey|resource','top','tools',0,NULL,NULL,90,'/core/tools.php?mainmenu=tools&amp;leftmenu=','','Tools','other',-1,'','$user->rights->mailing->lire || $user->rights->export->lire || $user->rights->import->run || $user->rights->opensurvey->read || $user->rights->resource->read','$conf->mailing->enabled || $conf->export->enabled || $conf->import->enabled || $conf->opensurvey->enabled || $conf->resource->enabled',2,'2016-07-30 11:13:00'),(139898,'auguria',1,'banque|prelevement','top','bank',0,NULL,NULL,60,'/compta/bank/index.php?mainmenu=bank&amp;leftmenu=bank','','MenuBankCash','banks',-1,'','$user->rights->banque->lire || $user->rights->prelevement->bons->lire','$conf->banque->enabled || $conf->prelevement->enabled',0,'2016-07-30 11:13:00'),(139899,'auguria',1,'hrm|holiday|deplacement|expensereport','top','hrm',0,NULL,NULL,80,'/hrm/hrm.php?mainmenu=hrm&amp;leftmenu=','','HRM','holiday',-1,'','$user->rights->hrm->employee->read || $user->rights->holiday->write || $user->rights->deplacement->lire || $user->rights->expensereport->lire','$conf->hrm->enabled || $conf->holiday->enabled || $conf->deplacement->enabled || $conf->expensereport->enabled',0,'2016-07-30 11:13:00'),(139974,'auguria',1,'','left','home',139885,NULL,NULL,0,'/index.php','','Dashboard','',0,'','','1',2,'2016-07-30 11:13:00'),(139984,'auguria',1,'','left','home',139885,NULL,NULL,1,'/admin/index.php?leftmenu=setup','','Setup','admin',0,'setup','','$user->admin',2,'2016-07-30 11:13:00'),(139985,'auguria',1,'','left','home',139984,NULL,NULL,1,'/admin/company.php?leftmenu=setup','','MenuCompanySetup','admin',1,'','','$leftmenu==\"setup\"',2,'2016-07-30 11:13:00'),(139986,'auguria',1,'','left','home',139984,NULL,NULL,4,'/admin/ihm.php?leftmenu=setup','','GUISetup','admin',1,'','','$leftmenu==\"setup\"',2,'2016-07-30 11:13:00'),(139987,'auguria',1,'','left','home',139984,NULL,NULL,2,'/admin/modules.php?leftmenu=setup','','Modules','admin',1,'','','$leftmenu==\"setup\"',2,'2016-07-30 11:13:00'),(139988,'auguria',1,'','left','home',139984,NULL,NULL,6,'/admin/boxes.php?leftmenu=setup','','Boxes','admin',1,'','','$leftmenu==\"setup\"',2,'2016-07-30 11:13:00'),(139989,'auguria',1,'','left','home',139984,NULL,NULL,3,'/admin/menus.php?leftmenu=setup','','Menus','admin',1,'','','$leftmenu==\"setup\"',2,'2016-07-30 11:13:00'),(139990,'auguria',1,'','left','home',139984,NULL,NULL,7,'/admin/delais.php?leftmenu=setup','','Alerts','admin',1,'','','$leftmenu==\"setup\"',2,'2016-07-30 11:13:00'),(139991,'auguria',1,'','left','home',139984,NULL,NULL,10,'/admin/pdf.php?leftmenu=setup','','PDF','admin',1,'','','$leftmenu==\"setup\"',2,'2016-07-30 11:13:00'),(139992,'auguria',1,'','left','home',139984,NULL,NULL,8,'/admin/security_other.php?leftmenu=setup','','Security','admin',1,'','','$leftmenu==\"setup\"',2,'2016-07-30 11:13:00'),(139993,'auguria',1,'','left','home',139984,NULL,NULL,11,'/admin/mails.php?leftmenu=setup','','Emails','admin',1,'','','$leftmenu==\"setup\"',2,'2016-07-30 11:13:00'),(139994,'auguria',1,'','left','home',139984,NULL,NULL,9,'/admin/limits.php?leftmenu=setup','','MenuLimits','admin',1,'','','$leftmenu==\"setup\"',2,'2016-07-30 11:13:00'),(139995,'auguria',1,'','left','home',139984,NULL,NULL,13,'/admin/dict.php?leftmenu=setup','','Dictionary','admin',1,'','','$leftmenu==\"setup\"',2,'2016-07-30 11:13:00'),(139996,'auguria',1,'','left','home',139984,NULL,NULL,14,'/admin/const.php?leftmenu=setup','','OtherSetup','admin',1,'','','$leftmenu==\"setup\"',2,'2016-07-30 11:13:00'),(139997,'auguria',1,'','left','home',139984,NULL,NULL,12,'/admin/sms.php?leftmenu=setup','','SMS','admin',1,'','','$leftmenu==\"setup\"',2,'2016-07-30 11:13:00'),(139998,'auguria',1,'','left','home',139984,NULL,NULL,4,'/admin/translation.php?leftmenu=setup','','Translation','admin',1,'','','$leftmenu==\"setup\"',2,'2016-07-30 11:13:00'),(139999,'auguria',1,'','left','home',139984,NULL,NULL,4,'/accountancy/admin/fiscalyear.php?mainmenu=setup','','Fiscalyear','admin',1,'','','$leftmenu==\"setup\" && $conf->accounting->enabled',2,'2016-07-30 11:13:00'),(140085,'auguria',1,'','left','home',140184,NULL,NULL,0,'/admin/system/dolibarr.php?leftmenu=admintools','','InfoDolibarr','admin',1,'','','$leftmenu==\"admintools\"',2,'2016-07-30 11:13:00'),(140086,'auguria',1,'','left','home',140085,NULL,NULL,2,'/admin/system/modules.php?leftmenu=admintools','','Modules','admin',2,'','','$leftmenu==\"admintools\"',2,'2016-07-30 11:13:00'),(140087,'auguria',1,'','left','home',140085,NULL,NULL,3,'/admin/triggers.php?leftmenu=admintools','','Triggers','admin',2,'','','$leftmenu==\"admintools\"',2,'2016-07-30 11:13:00'),(140089,'auguria',1,'','left','home',140184,NULL,NULL,1,'/admin/system/browser.php?leftmenu=admintools','','InfoBrowser','admin',1,'','','$leftmenu==\"admintools\"',2,'2016-07-30 11:13:00'),(140090,'auguria',1,'','left','home',140184,NULL,NULL,2,'/admin/system/os.php?leftmenu=admintools','','InfoOS','admin',1,'','','$leftmenu==\"admintools\"',2,'2016-07-30 11:13:00'),(140091,'auguria',1,'','left','home',140184,NULL,NULL,3,'/admin/system/web.php?leftmenu=admintools','','InfoWebServer','admin',1,'','','$leftmenu==\"admintools\"',2,'2016-07-30 11:13:00'),(140092,'auguria',1,'','left','home',140184,NULL,NULL,4,'/admin/system/phpinfo.php?leftmenu=admintools','','InfoPHP','admin',1,'','','$leftmenu==\"admintools\"',2,'2016-07-30 11:13:00'),(140094,'auguria',1,'','left','home',140184,NULL,NULL,5,'/admin/system/database.php?leftmenu=admintools','','InfoDatabase','admin',1,'','','$leftmenu==\"admintools\"',2,'2016-07-30 11:13:00'),(140184,'auguria',1,'','left','home',139885,NULL,NULL,2,'/admin/tools/index.php?leftmenu=admintools','','AdminTools','admin',0,'admintools','','$user->admin',2,'2016-07-30 11:13:00'),(140185,'auguria',1,'','left','home',140184,NULL,NULL,6,'/admin/tools/dolibarr_export.php?leftmenu=admintools','','Backup','admin',1,'','','$leftmenu==\"admintools\"',2,'2016-07-30 11:13:00'),(140186,'auguria',1,'','left','home',140184,NULL,NULL,7,'/admin/tools/dolibarr_import.php?leftmenu=admintools','','Restore','admin',1,'','','$leftmenu==\"admintools\"',2,'2016-07-30 11:13:00'),(140189,'auguria',1,'','left','home',140184,NULL,NULL,8,'/admin/tools/update.php?leftmenu=admintools','','MenuUpgrade','admin',1,'','','$leftmenu==\"admintools\"',2,'2016-07-30 11:13:00'),(140190,'auguria',1,'','left','home',140184,NULL,NULL,9,'/admin/tools/eaccelerator.php?leftmenu=admintools','','EAccelerator','admin',1,'','','$leftmenu==\"admintools\" && function_exists(\"eaccelerator_info\")',2,'2016-07-30 11:13:00'),(140191,'auguria',1,'','left','home',140184,NULL,NULL,10,'/admin/tools/listevents.php?leftmenu=admintools','','Audit','admin',1,'','','$leftmenu==\"admintools\"',2,'2016-07-30 11:13:00'),(140192,'auguria',1,'','left','home',140184,NULL,NULL,11,'/admin/tools/listsessions.php?leftmenu=admintools','','Sessions','admin',1,'','','$leftmenu==\"admintools\"',2,'2016-07-30 11:13:00'),(140193,'auguria',1,'','left','home',140184,NULL,NULL,12,'/admin/tools/purge.php?leftmenu=admintools','','Purge','admin',1,'','','$leftmenu==\"admintools\"',2,'2016-07-30 11:13:00'),(140194,'auguria',1,'','left','home',140184,NULL,NULL,13,'/support/index.php?leftmenu=admintools','_blank','HelpCenter','help',1,'','','$leftmenu==\"admintools\"',2,'2016-07-30 11:13:00'),(140195,'auguria',1,'','left','home',140184,NULL,NULL,14,'/admin/system/about.php?leftmenu=admintools','','About','admin',1,'','','$leftmenu==\"admintools\"',2,'2016-07-30 11:13:00'),(140204,'auguria',1,'','left','home',140184,NULL,NULL,0,'/product/admin/product_tools.php?mainmenu=home&amp;leftmenu=admintools','','ProductVatMassChange','products',1,'','','$leftmenu==\"admintools\"',2,'2016-07-30 11:13:00'),(140205,'auguria',1,'','left','home',140184,NULL,NULL,0,'/accountancy/admin/productaccount.php?mainmenu=home&amp;leftmenu=admintools','','InitAccountancy','accountancy',1,'','','$leftmenu==\"admintools\" && $conf->accounting->enabled',2,'2016-07-30 11:13:00'),(140284,'auguria',1,'','left','home',139885,NULL,NULL,4,'/user/home.php?leftmenu=users','','MenuUsersAndGroups','users',0,'users','','1',2,'2016-07-30 11:13:00'),(140285,'auguria',1,'','left','home',140284,NULL,NULL,0,'/user/index.php?leftmenu=users','','Users','users',1,'','$user->rights->user->user->lire || $user->admin','$leftmenu==\"users\"',2,'2016-07-30 11:13:00'),(140286,'auguria',1,'','left','home',140285,NULL,NULL,0,'/user/card.php?leftmenu=users&amp;action=create','','NewUser','users',2,'','$user->rights->user->user->creer || $user->admin','$leftmenu==\"users\"',2,'2016-07-30 11:13:00'),(140287,'auguria',1,'','left','home',140284,NULL,NULL,1,'/user/group/index.php?leftmenu=users','','Groups','users',1,'','($conf->global->MAIN_USE_ADVANCED_PERMS?$user->rights->user->group_advance->read:$user->rights->user->user->lire) || $user->admin','$leftmenu==\"users\"',2,'2016-07-30 11:13:00'),(140288,'auguria',1,'','left','home',140287,NULL,NULL,0,'/user/group/card.php?leftmenu=users&amp;action=create','','NewGroup','users',2,'','($conf->global->MAIN_USE_ADVANCED_PERMS?$user->rights->user->group_advance->write:$user->rights->user->user->creer) || $user->admin','$leftmenu==\"users\"',2,'2016-07-30 11:13:00'),(140384,'auguria',1,'','left','companies',139886,NULL,NULL,0,'/societe/index.php?leftmenu=thirdparties','','ThirdParty','companies',0,'thirdparties','$user->rights->societe->lire','$conf->societe->enabled',2,'2016-07-30 11:13:00'),(140385,'auguria',1,'','left','companies',140384,NULL,NULL,0,'/societe/soc.php?action=create','','MenuNewThirdParty','companies',1,'','$user->rights->societe->lire','$conf->societe->enabled',2,'2016-07-30 11:13:00'),(140386,'auguria',1,'','left','companies',140384,NULL,NULL,0,'/societe/list.php?action=create','','List','companies',1,'','$user->rights->societe->lire','$conf->societe->enabled',2,'2016-07-30 11:13:00'),(140387,'auguria',1,'','left','companies',140384,NULL,NULL,5,'/societe/list.php?type=f&leftmenu=suppliers','','ListSuppliersShort','suppliers',1,'','$user->rights->societe->lire && $user->rights->fournisseur->lire','$conf->societe->enabled && $conf->fournisseur->enabled',2,'2016-07-30 11:13:00'),(140388,'auguria',1,'','left','companies',140387,NULL,NULL,0,'/societe/soc.php?leftmenu=supplier&amp;action=create&amp;type=f','','NewSupplier','suppliers',2,'','$user->rights->societe->creer','$conf->societe->enabled && $conf->fournisseur->enabled',2,'2016-07-30 11:13:00'),(140390,'auguria',1,'','left','companies',140384,NULL,NULL,3,'/societe/list.php?type=p&leftmenu=prospects','','ListProspectsShort','companies',1,'','$user->rights->societe->lire','$conf->societe->enabled',2,'2016-07-30 11:13:00'),(140391,'auguria',1,'','left','companies',140390,NULL,NULL,0,'/societe/soc.php?leftmenu=prospects&amp;action=create&amp;type=p','','MenuNewProspect','companies',2,'','$user->rights->societe->creer','$conf->societe->enabled',2,'2016-07-30 11:13:00'),(140393,'auguria',1,'','left','companies',140384,NULL,NULL,4,'/societe/list.php?type=c&leftmenu=customers','','ListCustomersShort','companies',1,'','$user->rights->societe->lire','$conf->societe->enabled',2,'2016-07-30 11:13:00'),(140394,'auguria',1,'','left','companies',140393,NULL,NULL,0,'/societe/soc.php?leftmenu=customers&amp;action=create&amp;type=c','','MenuNewCustomer','companies',2,'','$user->rights->societe->creer','$conf->societe->enabled',2,'2016-07-30 11:13:00'),(140484,'auguria',1,'','left','companies',139886,NULL,NULL,1,'/contact/list.php?leftmenu=contacts','','ContactsAddresses','companies',0,'contacts','$user->rights->societe->lire','$conf->societe->enabled',2,'2016-07-30 11:13:00'),(140485,'auguria',1,'','left','companies',140484,NULL,NULL,0,'/contact/card.php?leftmenu=contacts&amp;action=create','','NewContactAddress','companies',1,'','$user->rights->societe->creer','$conf->societe->enabled',2,'2016-07-30 11:13:00'),(140486,'auguria',1,'','left','companies',140484,NULL,NULL,1,'/contact/list.php?leftmenu=contacts','','List','companies',1,'','$user->rights->societe->lire','$conf->societe->enabled',2,'2016-07-30 11:13:00'),(140488,'auguria',1,'','left','companies',140486,NULL,NULL,1,'/contact/list.php?leftmenu=contacts&amp;type=p','','ThirdPartyProspects','companies',2,'','$user->rights->societe->contact->lire','$conf->societe->enabled',2,'2016-07-30 11:13:00'),(140489,'auguria',1,'','left','companies',140486,NULL,NULL,2,'/contact/list.php?leftmenu=contacts&amp;type=c','','ThirdPartyCustomers','companies',2,'','$user->rights->societe->contact->lire','$conf->societe->enabled',2,'2016-07-30 11:13:00'),(140490,'auguria',1,'','left','companies',140486,NULL,NULL,3,'/contact/list.php?leftmenu=contacts&amp;type=f','','ThirdPartySuppliers','companies',2,'','$user->rights->societe->contact->lire','$conf->societe->enabled && $conf->fournisseur->enabled',2,'2016-07-30 11:13:00'),(140491,'auguria',1,'','left','companies',140486,NULL,NULL,4,'/contact/list.php?leftmenu=contacts&amp;type=o','','Others','companies',2,'','$user->rights->societe->contact->lire','$conf->societe->enabled',2,'2016-07-30 11:13:00'),(140534,'auguria',1,'','left','companies',139886,NULL,NULL,3,'/categories/index.php?leftmenu=cat&amp;type=1','','SuppliersCategoriesShort','categories',0,'cat','$user->rights->categorie->lire','$conf->societe->enabled && $conf->categorie->enabled',2,'2016-07-30 11:13:00'),(140535,'auguria',1,'','left','companies',140534,NULL,NULL,0,'/categories/card.php?action=create&amp;type=1','','NewCategory','categories',1,'','$user->rights->categorie->creer','$conf->societe->enabled && $conf->categorie->enabled',2,'2016-07-30 11:13:00'),(140544,'auguria',1,'','left','companies',139886,NULL,NULL,4,'/categories/index.php?leftmenu=cat&amp;type=2','','CustomersProspectsCategoriesShort','categories',0,'cat','$user->rights->categorie->lire','$conf->fournisseur->enabled && $conf->categorie->enabled',2,'2016-07-30 11:13:00'),(140545,'auguria',1,'','left','companies',140544,NULL,NULL,0,'/categories/card.php?action=create&amp;type=2','','NewCategory','categories',1,'','$user->rights->categorie->creer','$conf->fournisseur->enabled && $conf->categorie->enabled',2,'2016-07-30 11:13:00'),(140554,'auguria',1,'','left','companies',139886,NULL,NULL,3,'/categories/index.php?leftmenu=cat&amp;type=4','','ContactCategoriesShort','categories',0,'cat','$user->rights->categorie->lire','$conf->societe->enabled && $conf->categorie->enabled',2,'2016-07-30 11:13:00'),(140555,'auguria',1,'','left','companies',140554,NULL,NULL,0,'/categories/card.php?action=create&amp;type=4','','NewCategory','categories',1,'','$user->rights->categorie->creer','$conf->societe->enabled && $conf->categorie->enabled',2,'2016-07-30 11:13:00'),(140984,'auguria',1,'','left','commercial',139889,NULL,NULL,4,'/comm/propal/index.php?leftmenu=propals','','Prop','propal',0,'propals','$user->rights->propale->lire','$conf->propal->enabled',2,'2016-07-30 11:13:00'),(140985,'auguria',1,'','left','commercial',140984,NULL,NULL,0,'/comm/propal/card.php?action=create&amp;leftmenu=propals','','NewPropal','propal',1,'','$user->rights->propale->creer','$conf->propal->enabled',2,'2016-07-30 11:13:00'),(140986,'auguria',1,'','left','commercial',140984,NULL,NULL,1,'/comm/propal/list.php?leftmenu=propals','','List','propal',1,'','$user->rights->propale->lire','$conf->propal->enabled',2,'2016-07-30 11:13:00'),(140987,'auguria',1,'','left','commercial',140986,NULL,NULL,2,'/comm/propal/list.php?leftmenu=propals&amp;viewstatut=0','','PropalsDraft','propal',1,'','$user->rights->propale->lire','$conf->propal->enabled && $leftmenu==\"propals\"',2,'2016-07-30 11:13:00'),(140988,'auguria',1,'','left','commercial',140986,NULL,NULL,3,'/comm/propal/list.php?leftmenu=propals&amp;viewstatut=1','','PropalsOpened','propal',1,'','$user->rights->propale->lire','$conf->propal->enabled && $leftmenu==\"propals\"',2,'2016-07-30 11:13:00'),(140989,'auguria',1,'','left','commercial',140986,NULL,NULL,4,'/comm/propal/list.php?leftmenu=propals&amp;viewstatut=2','','PropalStatusSigned','propal',1,'','$user->rights->propale->lire','$conf->propal->enabled && $leftmenu==\"propals\"',2,'2016-07-30 11:13:00'),(140990,'auguria',1,'','left','commercial',140986,NULL,NULL,5,'/comm/propal/list.php?leftmenu=propals&amp;viewstatut=3','','PropalStatusNotSigned','propal',1,'','$user->rights->propale->lire','$conf->propal->enabled && $leftmenu==\"propals\"',2,'2016-07-30 11:13:00'),(140991,'auguria',1,'','left','commercial',140986,NULL,NULL,6,'/comm/propal/list.php?leftmenu=propals&amp;viewstatut=4','','PropalStatusBilled','propal',1,'','$user->rights->propale->lire','$conf->propal->enabled && $leftmenu==\"propals\"',2,'2016-07-30 11:13:00'),(140994,'auguria',1,'','left','commercial',140984,NULL,NULL,4,'/comm/propal/stats/index.php?leftmenu=propals','','Statistics','propal',1,'','$user->rights->propale->lire','$conf->propal->enabled',2,'2016-07-30 11:13:00'),(141084,'auguria',1,'','left','commercial',139889,NULL,NULL,5,'/commande/index.php?leftmenu=orders','','CustomersOrders','orders',0,'orders','$user->rights->commande->lire','$conf->commande->enabled',2,'2016-07-30 11:13:00'),(141085,'auguria',1,'','left','commercial',141084,NULL,NULL,0,'/commande/card.php?action=create&amp;leftmenu=orders','','NewOrder','orders',1,'','$user->rights->commande->creer','$conf->commande->enabled',2,'2016-07-30 11:13:00'),(141086,'auguria',1,'','left','commercial',141084,NULL,NULL,1,'/commande/list.php?leftmenu=orders','','List','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled',2,'2016-07-30 11:13:00'),(141087,'auguria',1,'','left','commercial',141086,NULL,NULL,2,'/commande/list.php?leftmenu=orders&amp;viewstatut=0','','StatusOrderDraftShort','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2016-07-30 11:13:00'),(141088,'auguria',1,'','left','commercial',141086,NULL,NULL,3,'/commande/list.php?leftmenu=orders&amp;viewstatut=1','','StatusOrderValidated','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2016-07-30 11:13:00'),(141089,'auguria',1,'','left','commercial',141086,NULL,NULL,4,'/commande/list.php?leftmenu=orders&amp;viewstatut=2','','StatusOrderOnProcessShort','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2016-07-30 11:13:00'),(141090,'auguria',1,'','left','commercial',141086,NULL,NULL,5,'/commande/list.php?leftmenu=orders&amp;viewstatut=3','','StatusOrderToBill','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2016-07-30 11:13:00'),(141091,'auguria',1,'','left','commercial',141086,NULL,NULL,6,'/commande/list.php?leftmenu=orders&amp;viewstatut=4','','StatusOrderProcessed','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2016-07-30 11:13:00'),(141092,'auguria',1,'','left','commercial',141086,NULL,NULL,7,'/commande/list.php?leftmenu=orders&amp;viewstatut=-1','','StatusOrderCanceledShort','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2016-07-30 11:13:00'),(141093,'auguria',1,'','left','commercial',141084,NULL,NULL,4,'/commande/stats/index.php?leftmenu=orders','','Statistics','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled',2,'2016-07-30 11:13:00'),(141184,'auguria',1,'','left','commercial',139887,NULL,NULL,6,'/expedition/index.php?leftmenu=sendings','','Shipments','sendings',0,'sendings','$user->rights->expedition->lire','$conf->expedition->enabled',2,'2016-07-30 11:13:00'),(141185,'auguria',1,'','left','commercial',141184,NULL,NULL,0,'/expedition/card.php?action=create2&leftmenu=sendings','','NewSending','sendings',1,'','$user->rights->expedition->creer','$conf->expedition->enabled && $leftmenu==\"sendings\"',2,'2016-07-30 11:13:00'),(141186,'auguria',1,'','left','commercial',141184,NULL,NULL,1,'/expedition/list.php?leftmenu=sendings','','List','sendings',1,'','$user->rights->expedition->lire','$conf->expedition->enabled && $leftmenu==\"sendings\"',2,'2016-07-30 11:13:00'),(141187,'auguria',1,'','left','commercial',141184,NULL,NULL,2,'/expedition/stats/index.php?leftmenu=sendings','','Statistics','sendings',1,'','$user->rights->expedition->lire','$conf->expedition->enabled && $leftmenu==\"sendings\"',2,'2016-07-30 11:13:00'),(141284,'auguria',1,'','left','commercial',139889,NULL,NULL,7,'/contrat/index.php?leftmenu=contracts','','Contracts','contracts',0,'contracts','$user->rights->contrat->lire','$conf->contrat->enabled',2,'2016-07-30 11:13:00'),(141285,'auguria',1,'','left','commercial',141284,NULL,NULL,0,'/contrat/card.php?&action=create&amp;leftmenu=contracts','','NewContract','contracts',1,'','$user->rights->contrat->creer','$conf->contrat->enabled',2,'2016-07-30 11:13:00'),(141286,'auguria',1,'','left','commercial',141284,NULL,NULL,1,'/contrat/list.php?leftmenu=contracts','','List','contracts',1,'','$user->rights->contrat->lire','$conf->contrat->enabled',2,'2016-07-30 11:13:00'),(141287,'auguria',1,'','left','commercial',141284,NULL,NULL,2,'/contrat/services.php?leftmenu=contracts','','MenuServices','contracts',1,'','$user->rights->contrat->lire','$conf->contrat->enabled',2,'2016-07-30 11:13:00'),(141288,'auguria',1,'','left','commercial',141287,NULL,NULL,0,'/contrat/services.php?leftmenu=contracts&amp;mode=0','','MenuInactiveServices','contracts',2,'','$user->rights->contrat->lire','$conf->contrat->enabled&&$leftmenu==\"contracts\"',2,'2016-07-30 11:13:00'),(141289,'auguria',1,'','left','commercial',141287,NULL,NULL,1,'/contrat/services.php?leftmenu=contracts&amp;mode=4','','MenuRunningServices','contracts',2,'','$user->rights->contrat->lire','$conf->contrat->enabled&&$leftmenu==\"contracts\"',2,'2016-07-30 11:13:00'),(141290,'auguria',1,'','left','commercial',141287,NULL,NULL,2,'/contrat/services.php?leftmenu=contracts&amp;mode=4&amp;filter=expired','','MenuExpiredServices','contracts',2,'','$user->rights->contrat->lire','$conf->contrat->enabled&&$leftmenu==\"contracts\"',2,'2016-07-30 11:13:00'),(141291,'auguria',1,'','left','commercial',141287,NULL,NULL,3,'/contrat/services.php?leftmenu=contracts&amp;mode=5','','MenuClosedServices','contracts',2,'','$user->rights->contrat->lire','$conf->contrat->enabled&&$leftmenu==\"contracts\"',2,'2016-07-30 11:13:00'),(141384,'auguria',1,'','left','commercial',139889,NULL,NULL,8,'/fichinter/list.php?leftmenu=ficheinter','','Interventions','interventions',0,'ficheinter','$user->rights->ficheinter->lire','$conf->ficheinter->enabled',2,'2016-07-30 11:13:00'),(141385,'auguria',1,'','left','commercial',141384,NULL,NULL,0,'/fichinter/card.php?action=create&amp;leftmenu=ficheinter','','NewIntervention','interventions',1,'','$user->rights->ficheinter->creer','$conf->ficheinter->enabled',2,'2016-07-30 11:13:00'),(141386,'auguria',1,'','left','commercial',141384,NULL,NULL,1,'/fichinter/list.php?leftmenu=ficheinter','','List','interventions',1,'','$user->rights->ficheinter->lire','$conf->ficheinter->enabled',2,'2016-07-30 11:13:00'),(141387,'auguria',1,'','left','commercial',141384,NULL,NULL,2,'/fichinter/stats/index.php?leftmenu=ficheinter','','Statistics','interventions',1,'','$user->rights->ficheinter->lire','$conf->ficheinter->enabled',2,'2016-07-30 11:13:00'),(141484,'auguria',1,'','left','accountancy',139890,NULL,NULL,3,'/fourn/facture/list.php?leftmenu=suppliers_bills','','BillsSuppliers','bills',0,'supplier_bills','$user->rights->fournisseur->facture->lire','$conf->supplier_invoice->enabled',2,'2016-07-30 11:13:00'),(141485,'auguria',1,'','left','accountancy',141484,NULL,NULL,0,'/fourn/facture/card.php?action=create&amp;leftmenu=suppliers_bills','','NewBill','bills',1,'','$user->rights->fournisseur->facture->creer','$conf->supplier_invoice->enabled',2,'2016-07-30 11:13:00'),(141486,'auguria',1,'','left','accountancy',141484,NULL,NULL,1,'/fourn/facture/impayees.php?leftmenu=suppliers_bills','','Unpaid','bills',1,'','$user->rights->fournisseur->facture->lire','$conf->supplier_invoice->enabled',2,'2016-07-30 11:13:00'),(141487,'auguria',1,'','left','accountancy',141484,NULL,NULL,2,'/fourn/facture/paiement.php?leftmenu=suppliers_bills','','Payments','bills',1,'','$user->rights->fournisseur->facture->lire','$conf->supplier_invoice->enabled',2,'2016-07-30 11:13:00'),(141488,'auguria',1,'','left','accountancy',141484,NULL,NULL,8,'/compta/facture/stats/index.php?leftmenu=customers_bills&mode=supplier','','Statistics','bills',1,'','$user->rights->fournisseur->facture->lire','$conf->supplier_invoice->enabled',2,'2016-07-30 11:13:00'),(141584,'auguria',1,'','left','accountancy',139890,NULL,NULL,3,'/compta/facture/list.php?leftmenu=customers_bills','','BillsCustomers','bills',0,'customer_bills','$user->rights->facture->lire','$conf->facture->enabled',2,'2016-07-30 11:13:00'),(141585,'auguria',1,'','left','accountancy',141584,NULL,NULL,3,'/compta/facture.php?action=create&amp;leftmenu=customers_bills','','NewBill','bills',1,'','$user->rights->facture->creer','$conf->facture->enabled',2,'2016-07-30 11:13:00'),(141586,'auguria',1,'','left','accountancy',141584,NULL,NULL,5,'/compta/facture/fiche-rec.php?leftmenu=customers_bills','','ListOfTemplates','bills',1,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2016-07-30 11:13:00'),(141588,'auguria',1,'','left','accountancy',141584,NULL,NULL,6,'/compta/paiement/list.php?leftmenu=customers_bills','','Payments','bills',1,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2016-07-30 11:13:00'),(141589,'auguria',1,'','left','accountancy',141584,NULL,NULL,4,'/compta/facture/list.php?leftmenu=customers_bills','','List','bills',1,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2016-07-30 11:13:00'),(141594,'auguria',1,'','left','accountancy',141588,NULL,NULL,1,'/compta/paiement/rapport.php?leftmenu=customers_bills','','Reportings','bills',2,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2016-07-30 11:13:00'),(141595,'auguria',1,'','left','accountancy',139898,NULL,NULL,9,'/compta/paiement/cheque/index.php?leftmenu=checks&amp;mainmenu=bank','','MenuChequeDeposits','bills',0,'checks','$user->rights->banque->lire','empty($conf->global->BANK_DISABLE_CHECK_DEPOSIT) && ! empty($conf->banque->enabled) && (! empty($conf->facture->enabled) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON))',2,'2016-07-30 11:13:00'),(141596,'auguria',1,'','left','accountancy',141595,NULL,NULL,0,'/compta/paiement/cheque/card.php?leftmenu=checks&amp;action=new','','NewCheckDeposit','compta',1,'','$user->rights->banque->lire','empty($conf->global->BANK_DISABLE_CHECK_DEPOSIT) && ! empty($conf->banque->enabled) && (! empty($conf->facture->enabled) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON))',2,'2016-07-30 11:13:00'),(141597,'auguria',1,'','left','accountancy',141595,NULL,NULL,1,'/compta/paiement/cheque/list.php?leftmenu=checks','','List','bills',1,'','$user->rights->banque->lire','empty($conf->global->BANK_DISABLE_CHECK_DEPOSIT) && ! empty($conf->banque->enabled) && (! empty($conf->facture->enabled) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON))',2,'2016-07-30 11:13:00'),(141598,'auguria',1,'','left','accountancy',141584,NULL,NULL,8,'/compta/facture/stats/index.php?leftmenu=customers_bills','','Statistics','bills',1,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2016-07-30 11:13:00'),(141604,'auguria',1,'','left','accountancy',141589,NULL,NULL,1,'/compta/facture/list.php?leftmenu=customers_bills&amp;search_status=0','','BillShortStatusDraft','bills',2,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2016-07-30 11:13:00'),(141605,'auguria',1,'','left','accountancy',141589,NULL,NULL,2,'/compta/facture/list.php?leftmenu=customers_bills&amp;search_status=1','','BillShortStatusNotPaid','bills',2,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2016-07-30 11:13:00'),(141606,'auguria',1,'','left','accountancy',141589,NULL,NULL,3,'/compta/facture/list.php?leftmenu=customers_bills&amp;search_status=2','','BillShortStatusPaid','bills',2,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2016-07-30 11:13:00'),(141607,'auguria',1,'','left','accountancy',141589,NULL,NULL,4,'/compta/facture/list.php?leftmenu=customers_bills&amp;search_status=3','','BillShortStatusCanceled','bills',2,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2016-07-30 11:13:00'),(141784,'auguria',1,'','left','accountancy',139890,NULL,NULL,3,'/commande/list.php?leftmenu=orders&amp;viewstatut=3','','MenuOrdersToBill','orders',0,'orders','$user->rights->commande->lire','$conf->commande->enabled',0,'2016-07-30 11:13:00'),(141884,'auguria',1,'','left','accountancy',139890,NULL,NULL,4,'/don/index.php?leftmenu=donations&amp;mainmenu=accountancy','','Donations','donations',0,'donations','$user->rights->don->lire','$conf->don->enabled',2,'2016-07-30 11:13:00'),(141885,'auguria',1,'','left','accountancy',141884,NULL,NULL,0,'/don/card.php?leftmenu=donations&amp;mainmenu=accountancy&amp;action=create','','NewDonation','donations',1,'','$user->rights->don->creer','$conf->don->enabled && $leftmenu==\"donations\"',2,'2016-07-30 11:13:00'),(141886,'auguria',1,'','left','accountancy',141884,NULL,NULL,1,'/don/list.php?leftmenu=donations&amp;mainmenu=accountancy','','List','donations',1,'','$user->rights->don->lire','$conf->don->enabled && $leftmenu==\"donations\"',2,'2016-07-30 11:13:00'),(141984,'auguria',1,'','left','accountancy',139899,NULL,NULL,5,'/compta/deplacement/index.php?leftmenu=tripsandexpenses','','TripsAndExpenses','trips',0,'tripsandexpenses','$user->rights->deplacement->lire','$conf->deplacement->enabled',0,'2016-07-30 11:13:00'),(141985,'auguria',1,'','left','accountancy',141984,NULL,NULL,1,'/compta/deplacement/card.php?action=create&amp;leftmenu=tripsandexpenses','','New','trips',1,'','$user->rights->deplacement->creer','$conf->deplacement->enabled',0,'2016-07-30 11:13:00'),(141986,'auguria',1,'','left','accountancy',141984,NULL,NULL,2,'/compta/deplacement/list.php?leftmenu=tripsandexpenses','','List','trips',1,'','$user->rights->deplacement->lire','$conf->deplacement->enabled',0,'2016-07-30 11:13:00'),(141987,'auguria',1,'','left','accountancy',141984,NULL,NULL,2,'/compta/deplacement/stats/index.php?leftmenu=tripsandexpenses','','Statistics','trips',1,'','$user->rights->deplacement->lire','$conf->deplacement->enabled',0,'2016-07-30 11:13:00'),(142084,'auguria',1,'','left','accountancy',139890,NULL,NULL,6,'/compta/charges/index.php?leftmenu=tax&amp;mainmenu=accountancy','','MenuSpecialExpenses','compta',0,'tax','(! empty($conf->tax->enabled) && $user->rights->tax->charges->lire) || (! empty($conf->salaries->enabled) && $user->rights->salaries->read)','$conf->tax->enabled || $conf->salaries->enabled',0,'2016-07-30 11:13:00'),(142094,'auguria',1,'','left','accountancy',142084,NULL,NULL,1,'/compta/salaries/index.php?leftmenu=tax_salary&amp;mainmenu=accountancy','','Salaries','salaries',1,'tax_sal','$user->rights->salaries->read','$conf->salaries->enabled',0,'2016-07-30 11:13:00'),(142095,'auguria',1,'','left','accountancy',142094,NULL,NULL,2,'/compta/salaries/card.php?leftmenu=tax_salary&amp;action=create','','NewPayment','companies',2,'','$user->rights->salaries->write','$conf->salaries->enabled && $leftmenu==\"tax_salary\"',0,'2016-07-30 11:13:00'),(142096,'auguria',1,'','left','accountancy',142094,NULL,NULL,3,'/compta/salaries/index.php?leftmenu=tax_salary','','Payments','companies',2,'','$user->rights->salaries->read','$conf->salaries->enabled && $leftmenu==\"tax_salary\"',0,'2016-07-30 11:13:00'),(142104,'auguria',1,'','left','accountancy',142084,NULL,NULL,1,'/loan/index.php?leftmenu=tax_loan&amp;mainmenu=accountancy','','Loans','loan',1,'tax_loan','$user->rights->loan->read','$conf->loan->enabled',0,'2016-07-30 11:13:00'),(142105,'auguria',1,'','left','accountancy',142104,NULL,NULL,2,'/loan/card.php?leftmenu=tax_loan&amp;action=create','','NewLoan','loan',2,'','$user->rights->loan->write','$conf->loan->enabled && $leftmenu==\"tax_loan\"',0,'2016-07-30 11:13:00'),(142107,'auguria',1,'','left','accountancy',142104,NULL,NULL,4,'/loan/calc.php?leftmenu=tax_loan','','Calculator','companies',2,'','$user->rights->loan->calc','$conf->loan->enabled && $leftmenu==\"tax_loan\" && ! empty($conf->global->LOAN_SHOW_CALCULATOR)',0,'2016-07-30 11:13:00'),(142134,'auguria',1,'','left','accountancy',142084,NULL,NULL,1,'/compta/sociales/index.php?leftmenu=tax_social','','SocialContributions','',1,'tax_social','$user->rights->tax->charges->lire','$conf->tax->enabled',0,'2016-07-30 11:13:00'),(142135,'auguria',1,'','left','accountancy',142134,NULL,NULL,2,'/compta/sociales/charges.php?leftmenu=tax_social&amp;action=create','','MenuNewSocialContribution','',2,'','$user->rights->tax->charges->creer','$conf->tax->enabled && $leftmenu==\"tax_social\"',0,'2016-07-30 11:13:00'),(142136,'auguria',1,'','left','accountancy',142134,NULL,NULL,3,'/compta/charges/index.php?leftmenu=tax_social&amp;mainmenu=accountancy&amp;mode=sconly','','Payments','',2,'','$user->rights->tax->charges->lire','$conf->tax->enabled && $leftmenu==\"tax_social\"',0,'2016-07-30 11:13:00'),(142184,'auguria',1,'','left','accountancy',142084,NULL,NULL,7,'/compta/tva/index.php?leftmenu=tax_vat&amp;mainmenu=accountancy','','VAT','companies',1,'tax_vat','$user->rights->tax->charges->lire','$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS)',0,'2016-07-30 11:13:00'),(142185,'auguria',1,'','left','accountancy',142184,NULL,NULL,0,'/compta/tva/card.php?leftmenu=tax_vat&amp;action=create','','New','companies',2,'','$user->rights->tax->charges->creer','$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu==\"tax_vat\"',0,'2016-07-30 11:13:00'),(142186,'auguria',1,'','left','accountancy',142184,NULL,NULL,1,'/compta/tva/reglement.php?leftmenu=tax_vat','','List','companies',2,'','$user->rights->tax->charges->lire','$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu==\"tax_vat\"',0,'2016-07-30 11:13:00'),(142187,'auguria',1,'','left','accountancy',142184,NULL,NULL,2,'/compta/tva/clients.php?leftmenu=tax_vat','','ReportByCustomers','companies',2,'','$user->rights->tax->charges->lire','$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu==\"tax_vat\"',0,'2016-07-30 11:13:00'),(142188,'auguria',1,'','left','accountancy',142184,NULL,NULL,3,'/compta/tva/quadri_detail.php?leftmenu=tax_vat','','ReportByQuarter','companies',2,'','$user->rights->tax->charges->lire','$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu==\"tax_vat\"',0,'2016-07-30 11:13:00'),(142284,'auguria',1,'','left','accountancy',139890,NULL,NULL,7,'/accountancy/customer/index.php?leftmenu=accounting','','MenuAccountancy','accountancy',0,'accounting','! empty($conf->accounting->enabled) || $user->rights->accounting->ventilation->read || $user->rights->accounting->ventilation->dispatch || $user->rights->compta->resultat->lire','$conf->accounting->enabled',0,'2016-07-30 11:13:00'),(142285,'auguria',1,'','left','accountancy',142284,NULL,NULL,1,'/accountancy/customer/index.php?leftmenu=dispatch_customer','','CustomersVentilation','accountancy',1,'dispatch_customer','$user->rights->accounting->ventilation->read','$conf->accounting->enabled',0,'2016-07-30 11:13:00'),(142286,'auguria',1,'','left','accountancy',142285,NULL,NULL,2,'/accountancy/customer/list.php','','ToDispatch','accountancy',2,'','$user->rights->accounting->ventilation->dispatch','$conf->accounting->enabled && $leftmenu==\"dispatch_customer\"',0,'2016-07-30 11:13:00'),(142287,'auguria',1,'','left','accountancy',142285,NULL,NULL,3,'/accountancy/customer/lines.php','','Dispatched','accountancy',2,'','$user->rights->accounting->ventilation->read','$conf->accounting->enabled && $leftmenu==\"dispatch_customer\"',0,'2016-07-30 11:13:00'),(142294,'auguria',1,'','left','accountancy',142284,NULL,NULL,4,'/accountancy/supplier/index.php?leftmenu=dispatch_supplier','','SuppliersVentilation','accountancy',1,'ventil_supplier','$user->rights->accounting->ventilation->read','$conf->accounting->enabled && $conf->fournisseur->enabled',0,'2016-07-30 11:13:00'),(142295,'auguria',1,'','left','accountancy',142294,NULL,NULL,5,'/accountancy/supplier/list.php','','ToDispatch','accountancy',2,'','$user->rights->accounting->ventilation->dispatch','$conf->accounting->enabled && $conf->fournisseur->enabled && $leftmenu==\"dispatch_supplier\"',0,'2016-07-30 11:13:00'),(142296,'auguria',1,'','left','accountancy',142294,NULL,NULL,6,'/accountancy/supplier/lines.php','','Dispatched','accountancy',2,'','$user->rights->accounting->ventilation->read','$conf->accounting->enabled && $conf->fournisseur->enabled && $leftmenu==\"dispatch_supplier\"',0,'2016-07-30 11:13:00'),(142314,'auguria',1,'','left','accountancy',142284,NULL,NULL,15,'/accountancy/bookkeeping/list.php','','Bookkeeping','accountancy',1,'bookkeeping','$user->rights->accounting->mouvements->lire','$conf->accounting->enabled',0,'2016-07-30 11:13:00'),(142319,'auguria',1,'','left','accountancy',142284,NULL,NULL,16,'/accountancy/bookkeeping/balance.php','','AccountBalance','accountancy',1,'balance','$user->rights->accounting->mouvements->lire','$conf->accounting->enabled',0,'2016-07-30 11:13:00'),(142324,'auguria',1,'','left','accountancy',142284,NULL,NULL,17,'/accountancy/report/result.php?leftmenu=ca&amp;mainmenu=accountancy','','Reportings','main',1,'report','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled',0,'2016-07-30 11:13:00'),(142325,'auguria',1,'','left','accountancy',142324,NULL,NULL,18,'/accountancy/report/result.php?leftmenu=ca','','ReportInOut','main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled && $leftmenu==\"ca\"',0,'2016-07-30 11:13:00'),(142326,'auguria',1,'','left','accountancy',142324,NULL,NULL,19,'/compta/resultat/index.php?leftmenu=ca','','ByExpenseIncome','main',3,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled && $leftmenu==\"ca\"',0,'2016-07-30 11:13:00'),(142327,'auguria',1,'','left','accountancy',142324,NULL,NULL,20,'/compta/resultat/clientfourn.php?leftmenu=ca','','ByCompanies','main',3,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled && $leftmenu==\"ca\"',0,'2016-07-30 11:13:00'),(142328,'auguria',1,'','left','accountancy',142324,NULL,NULL,21,'/compta/stats/index.php?leftmenu=ca','','ReportTurnover','main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled && $leftmenu==\"ca\"',0,'2016-07-30 11:13:00'),(142329,'auguria',1,'','left','accountancy',142324,NULL,NULL,22,'/compta/stats/casoc.php?leftmenu=ca','','ByCompanies','main',3,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled && $leftmenu==\"ca\"',0,'2016-07-30 11:13:00'),(142330,'auguria',1,'','left','accountancy',142324,NULL,NULL,23,'/compta/stats/cabyuser.php?leftmenu=ca','','ByUsers','main',3,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled && $leftmenu==\"ca\"',0,'2016-07-30 11:13:00'),(142331,'auguria',1,'','left','accountancy',142324,NULL,NULL,24,'/compta/stats/cabyprodserv.php?leftmenu=ca','','ByProductsAndServices','main',3,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled && $leftmenu==\"ca\"',0,'2016-07-30 11:13:00'),(142335,'auguria',1,'','left','home',142284,NULL,NULL,25,'/accountancy/admin/account.php?mainmenu=accountancy','','Chartofaccounts','admin',1,'','$user->rights->accounting->chartofaccount','$conf->accounting->enabled',0,'2016-07-30 11:13:00'),(142384,'auguria',1,'','left','accountancy',139898,NULL,NULL,9,'/compta/prelevement/index.php?leftmenu=withdraw&amp;mainmenu=bank','','StandingOrders','withdrawals',0,'withdraw','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled',2,'2016-07-30 11:13:00'),(142386,'auguria',1,'','left','accountancy',142384,NULL,NULL,0,'/compta/prelevement/create.php?leftmenu=withdraw','','NewStandingOrder','withdrawals',1,'','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled && $leftmenu==\"withdraw\"',2,'2016-07-30 11:13:00'),(142387,'auguria',1,'','left','accountancy',142384,NULL,NULL,2,'/compta/prelevement/bons.php?leftmenu=withdraw','','WithdrawalsReceipts','withdrawals',1,'','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled && $leftmenu==\"withdraw\"',2,'2016-07-30 11:13:00'),(142388,'auguria',1,'','left','accountancy',142384,NULL,NULL,3,'/compta/prelevement/list.php?leftmenu=withdraw','','WithdrawalsLines','withdrawals',1,'','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled && $leftmenu==\"withdraw\"',2,'2016-07-30 11:13:00'),(142390,'auguria',1,'','left','accountancy',142384,NULL,NULL,5,'/compta/prelevement/rejets.php?leftmenu=withdraw','','Rejects','withdrawals',1,'','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled && $leftmenu==\"withdraw\"',2,'2016-07-30 11:13:00'),(142391,'auguria',1,'','left','accountancy',142384,NULL,NULL,6,'/compta/prelevement/stats.php?leftmenu=withdraw','','Statistics','withdrawals',1,'','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled && $leftmenu==\"withdraw\"',2,'2016-07-30 11:13:00'),(142484,'auguria',1,'','left','accountancy',139898,NULL,NULL,1,'/compta/bank/index.php?leftmenu=bank&amp;mainmenu=bank','','MenuBankCash','banks',0,'bank','$user->rights->banque->lire','$conf->banque->enabled',0,'2016-07-30 11:13:00'),(142485,'auguria',1,'','left','accountancy',142484,NULL,NULL,0,'/compta/bank/card.php?action=create&amp;leftmenu=bank','','MenuNewFinancialAccount','banks',1,'','$user->rights->banque->configurer','$conf->banque->enabled && ($leftmenu==\"bank\" || $leftmenu==\"checks\" || $leftmenu==\"withdraw\")',0,'2016-07-30 11:13:00'),(142487,'auguria',1,'','left','accountancy',142484,NULL,NULL,2,'/compta/bank/search.php?leftmenu=bank','','ListTransactions','banks',1,'','$user->rights->banque->lire','$conf->banque->enabled && ($leftmenu==\"bank\" || $leftmenu==\"checks\" || $leftmenu==\"withdraw\")',0,'2016-07-30 11:13:00'),(142488,'auguria',1,'','left','accountancy',142484,NULL,NULL,3,'/compta/bank/budget.php?leftmenu=bank','','ListTransactionsByCategory','banks',1,'','$user->rights->banque->lire','$conf->banque->enabled && ($leftmenu==\"bank\" || $leftmenu==\"checks\" || $leftmenu==\"withdraw\")',0,'2016-07-30 11:13:00'),(142490,'auguria',1,'','left','accountancy',142484,NULL,NULL,5,'/compta/bank/virement.php?leftmenu=bank','','BankTransfers','banks',1,'','$user->rights->banque->transfer','$conf->banque->enabled && ($leftmenu==\"bank\" || $leftmenu==\"checks\" || $leftmenu==\"withdraw\")',0,'2016-07-30 11:13:00'),(142534,'auguria',1,'','left','accountancy',139898,NULL,NULL,4,'/categories/index.php?leftmenu=cat&amp;type=5','','Categories','categories',0,'cat','$user->rights->categorie->lire','$conf->categorie->enabled',2,'2016-07-30 11:13:00'),(142535,'auguria',1,'','left','accountancy',142534,NULL,NULL,0,'/categories/card.php?action=create&amp;type=5','','NewCategory','categories',1,'','$user->rights->categorie->creer','$conf->categorie->enabled',2,'2016-07-30 11:13:00'),(142584,'auguria',1,'','left','accountancy',139890,NULL,NULL,11,'/compta/resultat/index.php?leftmenu=ca&amp;mainmenu=accountancy','','Reportings','main',0,'ca','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled',0,'2016-07-30 11:13:00'),(142585,'auguria',1,'','left','accountancy',142584,NULL,NULL,0,'/compta/resultat/index.php?leftmenu=ca','','ReportInOut','main',1,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled && $leftmenu==\"ca\"',0,'2016-07-30 11:13:00'),(142586,'auguria',1,'','left','accountancy',142585,NULL,NULL,0,'/compta/resultat/clientfourn.php?leftmenu=ca','','ByCompanies','main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled && $leftmenu==\"ca\"',0,'2016-07-30 11:13:00'),(142587,'auguria',1,'','left','accountancy',142584,NULL,NULL,1,'/compta/stats/index.php?leftmenu=ca','','ReportTurnover','main',1,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled && $leftmenu==\"ca\"',0,'2016-07-30 11:13:00'),(142588,'auguria',1,'','left','accountancy',142587,NULL,NULL,0,'/compta/stats/casoc.php?leftmenu=ca','','ByCompanies','main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled && $leftmenu==\"ca\"',0,'2016-07-30 11:13:00'),(142589,'auguria',1,'','left','accountancy',142587,NULL,NULL,1,'/compta/stats/cabyuser.php?leftmenu=ca','','ByUsers','main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled && $leftmenu==\"ca\"',0,'2016-07-30 11:13:00'),(142590,'auguria',1,'','left','accountancy',142584,NULL,NULL,1,'/compta/journal/sellsjournal.php?leftmenu=ca','','SellsJournal','main',1,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled && $leftmenu==\"ca\"',0,'2016-07-30 11:13:00'),(142591,'auguria',1,'','left','accountancy',142584,NULL,NULL,1,'/compta/journal/purchasesjournal.php?leftmenu=ca','','PurchasesJournal','main',1,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled && $leftmenu==\"ca\"',0,'2016-07-30 11:13:00'),(142592,'auguria',1,'','left','accountancy',142587,NULL,NULL,1,'/compta/stats/cabyprodserv.php?leftmenu=ca','','ByProductsAndServices','main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled && $leftmenu==\"ca\"',0,'2016-07-30 11:13:00'),(142684,'auguria',1,'','left','products',139887,NULL,NULL,0,'/product/index.php?leftmenu=product&amp;type=0','','Products','products',0,'product','$user->rights->produit->lire','$conf->product->enabled',2,'2016-07-30 11:13:00'),(142685,'auguria',1,'','left','products',142684,NULL,NULL,0,'/product/card.php?leftmenu=product&amp;action=create&amp;type=0','','NewProduct','products',1,'','$user->rights->produit->creer','$conf->product->enabled',2,'2016-07-30 11:13:00'),(142686,'auguria',1,'','left','products',142684,NULL,NULL,1,'/product/list.php?leftmenu=product&amp;type=0','','List','products',1,'','$user->rights->produit->lire','$conf->product->enabled',2,'2016-07-30 11:13:00'),(142687,'auguria',1,'','left','products',142684,NULL,NULL,4,'/product/reassort.php?type=0','','Stocks','products',1,'','$user->rights->produit->lire && $user->rights->stock->lire','$conf->product->enabled',2,'2016-07-30 11:13:00'),(142688,'auguria',1,'','left','products',142684,NULL,NULL,6,'/product/stats/card.php?id=all&amp;leftmenu=stats&amp;type=0','','Statistics','main',1,'','$user->rights->produit->lire','$conf->propal->enabled',2,'2016-07-30 11:13:00'),(142689,'auguria',1,'','left','products',142684,NULL,NULL,5,'/product/reassortlot.php?type=0','','StocksByLotSerial','products',1,'','$user->rights->produit->lire && $user->rights->stock->lire','$conf->productbatch->enabled',2,'2016-07-30 11:13:00'),(142784,'auguria',1,'','left','products',139887,NULL,NULL,1,'/product/index.php?leftmenu=service&amp;type=1','','Services','products',0,'service','$user->rights->service->lire','$conf->service->enabled',2,'2016-07-30 11:13:00'),(142785,'auguria',1,'','left','products',142784,NULL,NULL,0,'/product/card.php?leftmenu=service&amp;action=create&amp;type=1','','NewService','products',1,'','$user->rights->service->creer','$conf->service->enabled',2,'2016-07-30 11:13:00'),(142786,'auguria',1,'','left','products',142784,NULL,NULL,1,'/product/list.php?leftmenu=service&amp;type=1','','List','products',1,'','$user->rights->service->lire','$conf->service->enabled',2,'2016-07-30 11:13:00'),(142787,'auguria',1,'','left','products',142784,NULL,NULL,5,'/product/stats/card.php?id=all&amp;leftmenu=stats&amp;type=1','','Statistics','main',1,'','$user->rights->service->lire','$conf->propal->enabled',2,'2016-07-30 11:13:00'),(142984,'auguria',1,'','left','products',139887,NULL,NULL,3,'/product/stock/index.php?leftmenu=stock','','Stock','stocks',0,'stock','$user->rights->stock->lire','$conf->stock->enabled',2,'2016-07-30 11:13:00'),(142985,'auguria',1,'','left','products',142984,NULL,NULL,0,'/product/stock/card.php?action=create','','MenuNewWarehouse','stocks',1,'','$user->rights->stock->creer','$conf->stock->enabled',2,'2016-07-30 11:13:00'),(142986,'auguria',1,'','left','products',142984,NULL,NULL,1,'/product/stock/list.php','','List','stocks',1,'','$user->rights->stock->lire','$conf->stock->enabled',2,'2016-07-30 11:13:00'),(142988,'auguria',1,'','left','products',142984,NULL,NULL,3,'/product/stock/mouvement.php','','Movements','stocks',1,'','$user->rights->stock->mouvement->lire','$conf->stock->enabled',2,'2016-07-30 11:13:00'),(142989,'auguria',1,'','left','products',142984,NULL,NULL,4,'/product/stock/replenish.php','','Replenishments','stocks',1,'','$user->rights->stock->mouvement->creer && $user->rights->fournisseur->lire','$conf->stock->enabled && $conf->supplier_order->enabled',2,'2016-07-30 11:13:00'),(142990,'auguria',1,'','left','products',142984,NULL,NULL,5,'/product/stock/massstockmove.php','','MassStockTransferShort','stocks',1,'','$user->rights->stock->mouvement->creer','$conf->stock->enabled',2,'2016-07-30 11:13:00'),(143084,'auguria',1,'','left','products',139887,NULL,NULL,4,'/categories/index.php?leftmenu=cat&amp;type=0','','Categories','categories',0,'cat','$user->rights->categorie->lire','$conf->categorie->enabled',2,'2016-07-30 11:13:00'),(143085,'auguria',1,'','left','products',143084,NULL,NULL,0,'/categories/card.php?action=create&amp;type=0','','NewCategory','categories',1,'','$user->rights->categorie->creer','$conf->categorie->enabled',2,'2016-07-30 11:13:00'),(143484,'auguria',1,'','left','project',139891,NULL,NULL,0,'/projet/index.php?leftmenu=projects','','Projects','projects',0,'projects','$user->rights->projet->lire','$conf->projet->enabled',2,'2016-07-30 11:13:00'),(143485,'auguria',1,'','left','project',143484,NULL,NULL,1,'/projet/card.php?leftmenu=projects&amp;action=create','','NewProject','projects',1,'','$user->rights->projet->creer','$conf->projet->enabled',2,'2016-07-30 11:13:00'),(143486,'auguria',1,'','left','project',143484,NULL,NULL,2,'/projet/list.php?leftmenu=projects','','List','projects',1,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2016-07-30 11:13:00'),(143494,'auguria',1,'','left','project',139891,NULL,NULL,0,'/projet/index.php?leftmenu=projects&amp;mode=mine','','MyProjects','projects',0,'myprojects','$user->rights->projet->lire','$conf->projet->enabled',2,'2016-07-30 11:13:00'),(143495,'auguria',1,'','left','project',143494,NULL,NULL,1,'/projet/card.php?leftmenu=projects&amp;action=create&amp;mode=mine','','NewProject','projects',1,'','$user->rights->projet->creer','$conf->projet->enabled',2,'2016-07-30 11:13:00'),(143496,'auguria',1,'','left','project',143494,NULL,NULL,2,'/projet/list.php?leftmenu=projects&amp;mode=mine','','List','projects',1,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2016-07-30 11:13:00'),(143584,'auguria',1,'','left','project',139891,NULL,NULL,0,'/projet/activity/index.php?leftmenu=projects','','Activities','projects',0,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2016-07-30 11:13:00'),(143585,'auguria',1,'','left','project',143584,NULL,NULL,1,'/projet/tasks.php?leftmenu=projects&amp;action=create','','NewTask','projects',1,'','$user->rights->projet->creer','$conf->projet->enabled',2,'2016-07-30 11:13:00'),(143586,'auguria',1,'','left','project',143584,NULL,NULL,2,'/projet/tasks/list.php?leftmenu=projects','','List','projects',1,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2016-07-30 11:13:00'),(143587,'auguria',1,'','left','project',143584,NULL,NULL,3,'/projet/activity/perweek.php?leftmenu=projects','','NewTimeSpent','projects',1,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2016-07-30 11:13:00'),(143684,'auguria',1,'','left','project',139891,NULL,NULL,0,'/projet/activity/index.php?leftmenu=projects&amp;mode=mine','','MyActivities','projects',0,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2016-07-30 11:13:00'),(143685,'auguria',1,'','left','project',143684,NULL,NULL,1,'/projet/tasks.php?leftmenu=projects&amp;action=create','','NewTask','projects',1,'','$user->rights->projet->creer','$conf->projet->enabled',2,'2016-07-30 11:13:00'),(143686,'auguria',1,'','left','project',143684,NULL,NULL,2,'/projet/tasks/list.php?leftmenu=projects&amp;mode=mine','','List','projects',1,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2016-07-30 11:13:00'),(143687,'auguria',1,'','left','project',143684,NULL,NULL,3,'/projet/activity/perweek.php?leftmenu=projects&amp;mode=mine','','NewTimeSpent','projects',1,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2016-07-30 11:13:00'),(143784,'auguria',1,'','left','tools',139892,NULL,NULL,0,'/comm/mailing/index.php?leftmenu=mailing','','EMailings','mails',0,'mailing','$user->rights->mailing->lire','$conf->mailing->enabled',0,'2016-07-30 11:13:00'),(143785,'auguria',1,'','left','tools',143784,NULL,NULL,0,'/comm/mailing/card.php?leftmenu=mailing&amp;action=create','','NewMailing','mails',1,'','$user->rights->mailing->creer','$conf->mailing->enabled',0,'2016-07-30 11:13:00'),(143786,'auguria',1,'','left','tools',143784,NULL,NULL,1,'/comm/mailing/list.php?leftmenu=mailing','','List','mails',1,'','$user->rights->mailing->lire','$conf->mailing->enabled',0,'2016-07-30 11:13:00'),(143984,'auguria',1,'','left','tools',139892,NULL,NULL,2,'/exports/index.php?leftmenu=export','','FormatedExport','exports',0,'export','$user->rights->export->lire','$conf->export->enabled',2,'2016-07-30 11:13:00'),(143985,'auguria',1,'','left','tools',143984,NULL,NULL,0,'/exports/export.php?leftmenu=export','','NewExport','exports',1,'','$user->rights->export->creer','$conf->export->enabled',2,'2016-07-30 11:13:00'),(144014,'auguria',1,'','left','tools',139892,NULL,NULL,2,'/imports/index.php?leftmenu=import','','FormatedImport','exports',0,'import','$user->rights->import->run','$conf->import->enabled',2,'2016-07-30 11:13:00'),(144015,'auguria',1,'','left','tools',144014,NULL,NULL,0,'/imports/import.php?leftmenu=import','','NewImport','exports',1,'','$user->rights->import->run','$conf->import->enabled',2,'2016-07-30 11:13:00'),(144084,'auguria',1,'','left','members',139897,NULL,NULL,0,'/adherents/index.php?leftmenu=members&amp;mainmenu=members','','Members','members',0,'members','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2016-07-30 11:13:00'),(144085,'auguria',1,'','left','members',144084,NULL,NULL,0,'/adherents/card.php?leftmenu=members&amp;action=create','','NewMember','members',1,'','$user->rights->adherent->creer','$conf->adherent->enabled',2,'2016-07-30 11:13:00'),(144086,'auguria',1,'','left','members',144084,NULL,NULL,1,'/adherents/list.php','','List','members',1,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2016-07-30 11:13:00'),(144087,'auguria',1,'','left','members',144086,NULL,NULL,2,'/adherents/list.php?leftmenu=members&amp;statut=-1','','MenuMembersToValidate','members',2,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2016-07-30 11:13:00'),(144088,'auguria',1,'','left','members',144086,NULL,NULL,3,'/adherents/list.php?leftmenu=members&amp;statut=1','','MenuMembersValidated','members',2,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2016-07-30 11:13:00'),(144089,'auguria',1,'','left','members',144086,NULL,NULL,4,'/adherents/list.php?leftmenu=members&amp;statut=1&amp;filter=outofdate','','MenuMembersNotUpToDate','members',2,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2016-07-30 11:13:00'),(144090,'auguria',1,'','left','members',144086,NULL,NULL,5,'/adherents/list.php?leftmenu=members&amp;statut=1&amp;filter=uptodate','','MenuMembersUpToDate','members',2,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2016-07-30 11:13:00'),(144091,'auguria',1,'','left','members',144086,NULL,NULL,6,'/adherents/list.php?leftmenu=members&amp;statut=0','','MenuMembersResiliated','members',2,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2016-07-30 11:13:00'),(144092,'auguria',1,'','left','members',144084,NULL,NULL,7,'/adherents/stats/geo.php?leftmenu=members&amp;mode=memberbycountry','','MenuMembersStats','members',1,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2016-07-30 11:13:00'),(144184,'auguria',1,'','left','members',139897,NULL,NULL,1,'/adherents/index.php?leftmenu=members&amp;mainmenu=members','','Subscriptions','compta',0,'','$user->rights->adherent->cotisation->lire','$conf->adherent->enabled',2,'2016-07-30 11:13:00'),(144185,'auguria',1,'','left','members',144184,NULL,NULL,0,'/adherents/list.php?statut=-1&amp;leftmenu=accountancy&amp;mainmenu=members','','NewSubscription','compta',1,'','$user->rights->adherent->cotisation->creer','$conf->adherent->enabled',2,'2016-07-30 11:13:00'),(144186,'auguria',1,'','left','members',144184,NULL,NULL,1,'/adherents/cotisations.php?leftmenu=members','','List','compta',1,'','$user->rights->adherent->cotisation->lire','$conf->adherent->enabled',2,'2016-07-30 11:13:00'),(144187,'auguria',1,'','left','members',144184,NULL,NULL,7,'/adherents/stats/index.php?leftmenu=members','','MenuMembersStats','members',1,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2016-07-30 11:13:00'),(144384,'auguria',1,'','left','members',139897,NULL,NULL,3,'/adherents/index.php?leftmenu=export&amp;mainmenu=members','','Exports','members',0,'export','$user->rights->adherent->export','$conf->adherent->enabled',2,'2016-07-30 11:13:00'),(144385,'auguria',1,'','left','members',144384,NULL,NULL,0,'/exports/index.php?leftmenu=export','','Datas','members',1,'','$user->rights->adherent->export','$conf->adherent->enabled && $conf->export->enabled',2,'2016-07-30 11:13:00'),(144386,'auguria',1,'','left','members',144384,NULL,NULL,1,'/adherents/htpasswd.php?leftmenu=export','','Filehtpasswd','members',1,'','$user->rights->adherent->export','$conf->adherent->enabled',2,'2016-07-30 11:13:00'),(144387,'auguria',1,'','left','members',144384,NULL,NULL,2,'/adherents/cartes/carte.php?leftmenu=export','','MembersCards','members',1,'','$user->rights->adherent->export','$conf->adherent->enabled',2,'2016-07-30 11:13:00'),(144484,'auguria',1,'','left','hrm',139899,NULL,NULL,1,'/user/index.php?&leftmenu=hrm&mode=employee','','Employees','hrm',0,'hrm','$user->rights->hrm->employee->read','$conf->hrm->enabled',0,'2016-07-30 11:13:00'),(144485,'auguria',1,'','left','hrm',144484,NULL,NULL,1,'/user/card.php?&action=create','','NewEmployee','hrm',1,'','$user->rights->hrm->employee->write','$conf->hrm->enabled',0,'2016-07-30 11:13:00'),(144486,'auguria',1,'','left','hrm',144484,NULL,NULL,2,'/user/index.php?$leftmenu=hrm&mode=employee','','List','hrm',1,'','$user->rights->hrm->employee->read','$conf->hrm->enabled',0,'2016-07-30 11:13:00'),(144584,'auguria',1,'','left','members',139897,NULL,NULL,5,'/adherents/type.php?leftmenu=setup&amp;mainmenu=members','','MembersTypes','members',0,'setup','$user->rights->adherent->configurer','$conf->adherent->enabled',2,'2016-07-30 11:13:00'),(144585,'auguria',1,'','left','members',144584,NULL,NULL,0,'/adherents/type.php?leftmenu=setup&amp;mainmenu=members&amp;action=create','','New','members',1,'','$user->rights->adherent->configurer','$conf->adherent->enabled',2,'2016-07-30 11:13:00'),(144586,'auguria',1,'','left','members',144584,NULL,NULL,1,'/adherents/type.php?leftmenu=setup&amp;mainmenu=members','','List','members',1,'','$user->rights->adherent->configurer','$conf->adherent->enabled',2,'2016-07-30 11:13:00'),(144884,'auguria',1,'','left','hrm',139899,NULL,NULL,1,'/holiday/list.php?&leftmenu=hrm','','CPTitreMenu','holiday',0,'hrm','$user->rights->holiday->read','$conf->holiday->enabled',0,'2016-07-30 11:13:00'),(144885,'auguria',1,'','left','hrm',144884,NULL,NULL,1,'/holiday/card.php?&action=request','','MenuAddCP','holiday',1,'','$user->rights->holiday->write','$conf->holiday->enabled',0,'2016-07-30 11:13:00'),(144886,'auguria',1,'','left','hrm',144884,NULL,NULL,1,'/holiday/list.php?&leftmenu=hrm','','List','holiday',1,'','$user->rights->holiday->read','$conf->holiday->enabled',0,'2016-07-30 11:13:00'),(144887,'auguria',1,'','left','hrm',144886,NULL,NULL,1,'/holiday/list.php?select_statut=2&leftmenu=hrm','','ListToApprove','trips',2,'','$user->rights->holiday->read','$conf->holiday->enabled',0,'2016-07-30 11:13:00'),(144888,'auguria',1,'','left','hrm',144884,NULL,NULL,2,'/holiday/define_holiday.php?&action=request','','MenuConfCP','holiday',1,'','$user->rights->holiday->define_holiday','$conf->holiday->enabled',0,'2016-07-30 11:13:00'),(144889,'auguria',1,'','left','hrm',144884,NULL,NULL,3,'/holiday/view_log.php?&action=request','','MenuLogCP','holiday',1,'','$user->rights->holiday->define_holiday','$conf->holiday->enabled',0,'2016-07-30 11:13:00'),(144984,'auguria',1,'','left','commercial',139889,NULL,NULL,6,'/fourn/commande/index.php?leftmenu=orders_suppliers','','SuppliersOrders','orders',0,'orders_suppliers','$user->rights->fournisseur->commande->lire','$conf->supplier_order->enabled',2,'2016-07-30 11:13:00'),(144985,'auguria',1,'','left','commercial',144984,NULL,NULL,0,'/fourn/commande/card.php?action=create&amp;leftmenu=orders_suppliers','','NewOrder','orders',1,'','$user->rights->fournisseur->commande->creer','$conf->supplier_order->enabled',2,'2016-07-30 11:13:00'),(144986,'auguria',1,'','left','commercial',144984,NULL,NULL,1,'/fourn/commande/list.php?leftmenu=orders_suppliers&amp;viewstatut=0','','List','orders',1,'','$user->rights->fournisseur->commande->lire','$conf->supplier_order->enabled',2,'2016-07-30 11:13:00'),(144992,'auguria',1,'','left','commercial',144984,NULL,NULL,7,'/commande/stats/index.php?leftmenu=orders_suppliers&amp;mode=supplier','','Statistics','orders',1,'','$user->rights->fournisseur->commande->lire','$conf->supplier_order->enabled',2,'2016-07-30 11:13:00'),(145084,'auguria',1,'','left','members',139897,NULL,NULL,3,'/categories/index.php?leftmenu=cat&amp;type=3','','MembersCategoriesShort','categories',0,'cat','$user->rights->categorie->lire','$conf->adherent->enabled && $conf->categorie->enabled',2,'2016-07-30 11:13:00'),(145085,'auguria',1,'','left','members',145084,NULL,NULL,0,'/categories/card.php?action=create&amp;type=3','','NewCategory','categories',1,'','$user->rights->categorie->creer','$conf->adherent->enabled && $conf->categorie->enabled',2,'2016-07-30 11:13:00'),(145086,'all',1,'supplier_proposal','left','commercial',-1,NULL,'commercial',300,'/supplier_proposal/index.php','','SupplierProposalsShort','supplier_proposal',NULL,'supplier_proposalsubmenu','$user->rights->supplier_proposal->lire','$conf->supplier_proposal->enabled',2,'2016-07-30 11:13:20'),(145087,'all',1,'supplier_proposal','left','commercial',-1,'supplier_proposalsubmenu','commercial',301,'/supplier_proposal/card.php?action=create&amp;leftmenu=supplier_proposals','','SupplierProposalNew','supplier_proposal',NULL,NULL,'$user->rights->supplier_proposal->creer','$conf->supplier_proposal->enabled',2,'2016-07-30 11:13:20'),(145088,'all',1,'supplier_proposal','left','commercial',-1,'supplier_proposalsubmenu','commercial',302,'/supplier_proposal/list.php?leftmenu=supplier_proposals','','List','supplier_proposal',NULL,NULL,'$user->rights->supplier_proposal->lire','$conf->supplier_proposal->enabled',2,'2016-07-30 11:13:20'),(145089,'all',1,'supplier_proposal','left','commercial',-1,'supplier_proposalsubmenu','commercial',303,'/comm/propal/stats/index.php?leftmenu=supplier_proposals&amp;mode=supplier','','Statistics','supplier_proposal',NULL,NULL,'$user->rights->supplier_proposal->lire','$conf->supplier_proposal->enabled',2,'2016-07-30 11:13:20'),(145090,'all',1,'resource','left','tools',-1,NULL,'tools',100,'/resource/list.php','','MenuResourceIndex','resource',NULL,'resource','$user->rights->resource->read','1',0,'2016-07-30 11:13:32'),(145091,'all',1,'resource','left','tools',-1,'resource','tools',101,'/resource/add.php','','MenuResourceAdd','resource',NULL,NULL,'$user->rights->resource->read','1',0,'2016-07-30 11:13:32'),(145092,'all',1,'resource','left','tools',-1,'resource','tools',102,'/resource/list.php','','List','resource',NULL,NULL,'$user->rights->resource->read','1',0,'2016-07-30 11:13:32'),(145094,'all',1,'agenda','top','agenda',0,NULL,NULL,100,'/comm/action/index.php','','Agenda','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2016-07-30 15:42:32'),(145095,'all',1,'agenda','left','agenda',145094,NULL,NULL,100,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda','','Actions','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2016-07-30 15:42:32'),(145096,'all',1,'agenda','left','agenda',145095,NULL,NULL,101,'/comm/action/card.php?mainmenu=agenda&amp;leftmenu=agenda&amp;action=create','','NewAction','commercial',NULL,NULL,'($user->rights->agenda->myactions->create||$user->rights->agenda->allactions->create)','$conf->agenda->enabled',2,'2016-07-30 15:42:32'),(145097,'all',1,'agenda','left','agenda',145095,NULL,NULL,102,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda','','Agenda','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2016-07-30 15:42:32'),(145098,'all',1,'agenda','left','agenda',145097,NULL,NULL,103,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filter=mine','','MenuToDoMyActions','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2016-07-30 15:42:32'),(145099,'all',1,'agenda','left','agenda',145097,NULL,NULL,104,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filter=mine','','MenuDoneMyActions','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2016-07-30 15:42:32'),(145100,'all',1,'agenda','left','agenda',145097,NULL,NULL,105,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filtert=-1','','MenuToDoActions','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2016-07-30 15:42:32'),(145101,'all',1,'agenda','left','agenda',145097,NULL,NULL,106,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filtert=-1','','MenuDoneActions','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2016-07-30 15:42:32'),(145102,'all',1,'agenda','left','agenda',145095,NULL,NULL,112,'/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda','','List','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2016-07-30 15:42:32'),(145103,'all',1,'agenda','left','agenda',145102,NULL,NULL,113,'/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filter=mine','','MenuToDoMyActions','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2016-07-30 15:42:32'),(145104,'all',1,'agenda','left','agenda',145102,NULL,NULL,114,'/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filter=mine','','MenuDoneMyActions','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2016-07-30 15:42:32'),(145105,'all',1,'agenda','left','agenda',145102,NULL,NULL,115,'/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filtert=-1','','MenuToDoActions','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2016-07-30 15:42:32'),(145106,'all',1,'agenda','left','agenda',145102,NULL,NULL,116,'/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filtert=-1','','MenuDoneActions','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2016-07-30 15:42:32'),(145107,'all',1,'agenda','left','agenda',145095,NULL,NULL,120,'/comm/action/rapport/index.php?mainmenu=agenda&amp;leftmenu=agenda','','Reportings','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$conf->agenda->enabled',2,'2016-07-30 15:42:32'),(145111,'all',1,'opensurvey','left','tools',-1,NULL,'tools',200,'/opensurvey/index.php?mainmenu=tools&leftmenu=opensurvey','','Survey','opensurvey',NULL,'opensurvey','$user->rights->opensurvey->read','$conf->opensurvey->enabled',0,'2016-07-30 19:04:07'),(145112,'all',1,'opensurvey','left','tools',-1,'opensurvey','tools',210,'/opensurvey/wizard/index.php','','NewSurvey','opensurvey',NULL,'opensurvey_new','$user->rights->opensurvey->write','$conf->opensurvey->enabled',0,'2016-07-30 19:04:07'),(145113,'all',1,'opensurvey','left','tools',-1,'opensurvey','tools',220,'/opensurvey/list.php','','List','opensurvey',NULL,'opensurvey_list','$user->rights->opensurvey->read','$conf->opensurvey->enabled',0,'2016-07-30 19:04:07'),(145127,'all',1,'printing','left','home',-1,'admintools','home',300,'/printing/index.php?mainmenu=home&leftmenu=admintools','','MenuDirectPrinting','printing',NULL,NULL,'$user->rights->printing->read','$conf->printing->enabled && $leftmenu==\'admintools\'',0,'2017-01-29 15:12:44'),(145149,'all',1,'barcode','left','tools',-1,NULL,'tools',200,'/barcode/printsheet.php?mainmenu=tools&leftmenu=barcodeprint','','BarCodePrintsheet','products',NULL,'barcodeprint','($conf->global->MAIN_USE_ADVANCED_PERMS && $user->rights->barcode->lire_advance) || (! $conf->global->MAIN_USE_ADVANCED_PERMS)','$conf->barcode->enabled',2,'2017-05-12 09:02:42'),(145150,'all',1,'barcode','left','home',-1,'admintools','home',300,'/barcode/codeinit.php?mainmenu=home&leftmenu=admintools','','MassBarcodeInit','products',NULL,NULL,'($conf->global->MAIN_USE_ADVANCED_PERMS && $user->rights->barcode->creer_advance) || (! $conf->global->MAIN_USE_ADVANCED_PERMS)','$conf->barcode->enabled && ($leftmenu==\"admintools\" || $leftmenu==\"admintools_info\")',0,'2017-05-12 09:02:42'),(145151,'all',1,'cron','left','home',-1,'admintools','home',200,'/cron/list.php?status=-2&leftmenu=admintools','','CronList','cron',NULL,NULL,'$user->rights->cron->read','($leftmenu==\'admintools\' || $leftmenu==\'admintools_info\')',2,'2017-05-12 09:02:42');
 /*!40000 ALTER TABLE `llx_menu` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -6966,6 +6969,7 @@ CREATE TABLE `llx_product_fournisseur_price` (
   `charges` double(24,8) DEFAULT '0.00000000',
   `unitcharges` double(24,8) DEFAULT '0.00000000',
   `tva_tx` double(6,3) NOT NULL DEFAULT '0.000',
+  `default_vat_code` varchar(10) DEFAULT NULL,
   `info_bits` int(11) NOT NULL DEFAULT '0',
   `fk_user` int(11) DEFAULT NULL,
   `import_key` varchar(14) DEFAULT NULL,
@@ -6990,7 +6994,7 @@ CREATE TABLE `llx_product_fournisseur_price` (
 
 LOCK TABLES `llx_product_fournisseur_price` WRITE;
 /*!40000 ALTER TABLE `llx_product_fournisseur_price` DISABLE KEYS */;
-INSERT INTO `llx_product_fournisseur_price` VALUES (1,'2010-07-11 18:45:42','2012-12-08 13:11:08',4,1,'ABCD',NULL,10.00000000,1,0,0,10.00000000,0.00000000,0.00000000,0.000,0,1,NULL,1,NULL,NULL,NULL,NULL),(2,'2016-07-30 17:34:38','2016-07-30 13:34:38',12,10,'BASIC',0,9.00000000,1,0,0,9.00000000,0.00000000,0.00000000,0.000,0,12,NULL,1,NULL,NULL,NULL,'FAVORITE'),(3,'2017-02-02 05:17:08','2017-02-02 01:17:08',1,10,'aaa',0,100.00000000,1,10,0,100.00000000,0.00000000,0.00000000,12.500,0,12,NULL,1,NULL,NULL,NULL,NULL);
+INSERT INTO `llx_product_fournisseur_price` VALUES (1,'2010-07-11 18:45:42','2012-12-08 13:11:08',4,1,'ABCD',NULL,10.00000000,1,0,0,10.00000000,0.00000000,0.00000000,0.000,NULL,0,1,NULL,1,NULL,NULL,NULL,NULL),(2,'2016-07-30 17:34:38','2016-07-30 13:34:38',12,10,'BASIC',0,9.00000000,1,0,0,9.00000000,0.00000000,0.00000000,0.000,NULL,0,12,NULL,1,NULL,NULL,NULL,'FAVORITE'),(3,'2017-02-02 05:17:08','2017-02-02 01:17:08',1,10,'aaa',0,100.00000000,1,10,0,100.00000000,0.00000000,0.00000000,12.500,NULL,0,12,NULL,1,NULL,NULL,NULL,NULL);
 /*!40000 ALTER TABLE `llx_product_fournisseur_price` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -7125,7 +7129,7 @@ CREATE TABLE `llx_product_price` (
   `entity` int(11) NOT NULL DEFAULT '1',
   `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   `fk_product` int(11) NOT NULL,
-  `date_price` datetime NOT NULL,
+  `date_price` datetime DEFAULT NULL,
   `price_level` smallint(6) DEFAULT '1',
   `price` double(24,8) DEFAULT NULL,
   `price_ttc` double(24,8) DEFAULT NULL,
@@ -7133,6 +7137,7 @@ CREATE TABLE `llx_product_price` (
   `price_min_ttc` double(24,8) DEFAULT NULL,
   `price_base_type` varchar(3) DEFAULT 'HT',
   `tva_tx` double(6,3) NOT NULL,
+  `default_vat_code` varchar(10) DEFAULT NULL,
   `recuperableonly` int(11) NOT NULL DEFAULT '0',
   `localtax1_tx` double(6,3) DEFAULT '0.000',
   `localtax1_type` varchar(10) NOT NULL DEFAULT '0',
@@ -7160,7 +7165,7 @@ CREATE TABLE `llx_product_price` (
 
 LOCK TABLES `llx_product_price` WRITE;
 /*!40000 ALTER TABLE `llx_product_price` DISABLE KEYS */;
-INSERT INTO `llx_product_price` VALUES (1,1,'2010-07-08 12:33:17',1,'2010-07-08 14:33:17',1,0.00000000,0.00000000,0.00000000,0.00000000,'HT',12.500,0,0.000,'0',0.000,'0',1,1,0,NULL,NULL,NULL,NULL,0.00000000),(2,1,'2010-07-08 22:30:01',2,'2010-07-09 00:30:01',1,0.00000000,0.00000000,0.00000000,0.00000000,'HT',12.500,0,0.000,'0',0.000,'0',1,1,0,NULL,NULL,NULL,NULL,0.00000000),(3,1,'2010-07-08 22:30:25',3,'2010-07-09 00:30:25',1,0.00000000,0.00000000,0.00000000,0.00000000,'HT',12.500,0,0.000,'0',0.000,'0',1,1,0,NULL,NULL,NULL,NULL,0.00000000),(4,1,'2010-07-10 12:44:06',4,'2010-07-10 14:44:06',1,0.00000000,0.00000000,0.00000000,0.00000000,'HT',12.500,0,0.000,'0',0.000,'0',1,1,0,NULL,NULL,NULL,NULL,0.00000000),(5,1,'2011-07-20 21:11:38',5,'2011-07-20 23:11:38',1,0.00000000,0.00000000,0.00000000,0.00000000,'HT',19.600,0,0.000,'0',0.000,'0',1,1,0,NULL,NULL,NULL,NULL,0.00000000),(6,1,'2011-07-27 17:02:59',5,'2011-07-27 19:02:59',1,10.00000000,11.96000000,0.00000000,0.00000000,'HT',19.600,0,0.000,'0',0.000,'0',1,1,0,NULL,NULL,NULL,NULL,0.00000000),(10,1,'2011-07-31 22:34:27',4,'2011-08-01 00:34:27',1,5.00000000,5.62500000,0.00000000,0.00000000,'HT',12.500,0,0.000,'0',0.000,'0',1,1,0,NULL,NULL,NULL,NULL,0.00000000),(12,1,'2013-01-13 19:24:59',11,'2013-01-13 20:24:59',1,0.00000000,0.00000000,0.00000000,0.00000000,'HT',0.000,0,0.000,'0',0.000,'0',1,1,0,NULL,NULL,NULL,NULL,0.00000000),(13,1,'2013-03-12 09:30:24',1,'2013-03-12 10:30:24',1,100.00000000,112.50000000,90.00000000,101.25000000,'HT',12.500,0,0.000,'0',0.000,'0',1,1,0,NULL,NULL,NULL,NULL,0.00000000),(14,1,'2016-07-30 13:31:29',12,'2016-07-30 17:31:29',1,9.00000000,9.00000000,9.00000000,9.00000000,'HT',0.000,0,0.000,'0',0.000,'0',12,1,0,NULL,NULL,NULL,NULL,0.00000000),(15,1,'2017-02-15 23:49:00',13,'2017-02-16 03:49:00',1,100.00000000,110.00000000,0.00000000,0.00000000,'HT',10.000,0,0.000,'0',0.000,'0',12,0,0,NULL,NULL,NULL,NULL,0.00000000);
+INSERT INTO `llx_product_price` VALUES (1,1,'2010-07-08 12:33:17',1,'2010-07-08 14:33:17',1,0.00000000,0.00000000,0.00000000,0.00000000,'HT',12.500,NULL,0,0.000,'0',0.000,'0',1,1,0,NULL,NULL,NULL,NULL,0.00000000),(2,1,'2010-07-08 22:30:01',2,'2010-07-09 00:30:01',1,0.00000000,0.00000000,0.00000000,0.00000000,'HT',12.500,NULL,0,0.000,'0',0.000,'0',1,1,0,NULL,NULL,NULL,NULL,0.00000000),(3,1,'2010-07-08 22:30:25',3,'2010-07-09 00:30:25',1,0.00000000,0.00000000,0.00000000,0.00000000,'HT',12.500,NULL,0,0.000,'0',0.000,'0',1,1,0,NULL,NULL,NULL,NULL,0.00000000),(4,1,'2010-07-10 12:44:06',4,'2010-07-10 14:44:06',1,0.00000000,0.00000000,0.00000000,0.00000000,'HT',12.500,NULL,0,0.000,'0',0.000,'0',1,1,0,NULL,NULL,NULL,NULL,0.00000000),(5,1,'2011-07-20 21:11:38',5,'2011-07-20 23:11:38',1,0.00000000,0.00000000,0.00000000,0.00000000,'HT',19.600,NULL,0,0.000,'0',0.000,'0',1,1,0,NULL,NULL,NULL,NULL,0.00000000),(6,1,'2011-07-27 17:02:59',5,'2011-07-27 19:02:59',1,10.00000000,11.96000000,0.00000000,0.00000000,'HT',19.600,NULL,0,0.000,'0',0.000,'0',1,1,0,NULL,NULL,NULL,NULL,0.00000000),(10,1,'2011-07-31 22:34:27',4,'2011-08-01 00:34:27',1,5.00000000,5.62500000,0.00000000,0.00000000,'HT',12.500,NULL,0,0.000,'0',0.000,'0',1,1,0,NULL,NULL,NULL,NULL,0.00000000),(12,1,'2013-01-13 19:24:59',11,'2013-01-13 20:24:59',1,0.00000000,0.00000000,0.00000000,0.00000000,'HT',0.000,NULL,0,0.000,'0',0.000,'0',1,1,0,NULL,NULL,NULL,NULL,0.00000000),(13,1,'2013-03-12 09:30:24',1,'2013-03-12 10:30:24',1,100.00000000,112.50000000,90.00000000,101.25000000,'HT',12.500,NULL,0,0.000,'0',0.000,'0',1,1,0,NULL,NULL,NULL,NULL,0.00000000),(14,1,'2016-07-30 13:31:29',12,'2016-07-30 17:31:29',1,9.00000000,9.00000000,9.00000000,9.00000000,'HT',0.000,NULL,0,0.000,'0',0.000,'0',12,1,0,NULL,NULL,NULL,NULL,0.00000000),(15,1,'2017-02-15 23:49:00',13,'2017-02-16 03:49:00',1,100.00000000,110.00000000,0.00000000,0.00000000,'HT',10.000,NULL,0,0.000,'0',0.000,'0',12,0,0,NULL,NULL,NULL,NULL,0.00000000);
 /*!40000 ALTER TABLE `llx_product_price` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -7823,7 +7828,7 @@ CREATE TABLE `llx_rights_def` (
 
 LOCK TABLES `llx_rights_def` WRITE;
 /*!40000 ALTER TABLE `llx_rights_def` DISABLE KEYS */;
-INSERT INTO `llx_rights_def` VALUES (11,'Lire les factures','facture',1,'lire',NULL,'a',0),(11,'Lire les factures','facture',2,'lire',NULL,'a',1),(12,'Creer/modifier les factures','facture',1,'creer',NULL,'a',0),(12,'Creer/modifier les factures','facture',2,'creer',NULL,'a',0),(13,'Dévalider les factures','facture',1,'invoice_advance','unvalidate','a',0),(13,'Dévalider les factures','facture',2,'invoice_advance','unvalidate','a',0),(14,'Valider les factures','facture',1,'invoice_advance','validate','a',0),(14,'Valider les factures','facture',2,'valider',NULL,'a',0),(15,'Envoyer les factures par mail','facture',1,'invoice_advance','send','a',0),(15,'Envoyer les factures par mail','facture',2,'invoice_advance','send','a',0),(16,'Emettre des paiements sur les factures','facture',1,'paiement',NULL,'a',0),(16,'Emettre des paiements sur les factures','facture',2,'paiement',NULL,'a',0),(19,'Supprimer les factures','facture',1,'supprimer',NULL,'a',0),(19,'Supprimer les factures','facture',2,'supprimer',NULL,'a',0),(21,'Lire les propositions commerciales','propale',1,'lire',NULL,'r',1),(21,'Lire les propositions commerciales','propale',2,'lire',NULL,'r',1),(22,'Creer/modifier les propositions commerciales','propale',1,'creer',NULL,'w',0),(22,'Creer/modifier les propositions commerciales','propale',2,'creer',NULL,'w',0),(24,'Valider les propositions commerciales','propale',1,'propal_advance','validate','d',0),(24,'Valider les propositions commerciales','propale',2,'valider',NULL,'d',0),(25,'Envoyer les propositions commerciales aux clients','propale',1,'propal_advance','send','d',0),(25,'Envoyer les propositions commerciales aux clients','propale',2,'propal_advance','send','d',0),(26,'Cloturer les propositions commerciales','propale',1,'cloturer',NULL,'d',0),(26,'Cloturer les propositions commerciales','propale',2,'cloturer',NULL,'d',0),(27,'Supprimer les propositions commerciales','propale',1,'supprimer',NULL,'d',0),(27,'Supprimer les propositions commerciales','propale',2,'supprimer',NULL,'d',0),(28,'Exporter les propositions commerciales et attributs','propale',1,'export',NULL,'r',0),(28,'Exporter les propositions commerciales et attributs','propale',2,'export',NULL,'r',0),(31,'Lire les produits','produit',1,'lire',NULL,'r',1),(31,'Lire les produits','produit',2,'lire',NULL,'r',1),(32,'Creer/modifier les produits','produit',1,'creer',NULL,'w',0),(32,'Creer/modifier les produits','produit',2,'creer',NULL,'w',0),(34,'Supprimer les produits','produit',1,'supprimer',NULL,'d',0),(34,'Supprimer les produits','produit',2,'supprimer',NULL,'d',0),(38,'Exporter les produits','produit',1,'export',NULL,'r',0),(38,'Exporter les produits','produit',2,'export',NULL,'r',0),(41,'Read projects and tasks (shared projects or projects I am contact for). Can also enter time consumed on assigned tasks (timesheet)','projet',1,'lire',NULL,'r',1),(42,'Create/modify projects and tasks (shared projects or projects I am contact for)','projet',1,'creer',NULL,'w',0),(44,'Delete project and tasks (shared projects or projects I am contact for)','projet',1,'supprimer',NULL,'d',0),(45,'Export projects','projet',1,'export',NULL,'d',0),(61,'Lire les fiches d\'intervention','ficheinter',1,'lire',NULL,'r',1),(62,'Creer/modifier les fiches d\'intervention','ficheinter',1,'creer',NULL,'w',0),(64,'Supprimer les fiches d\'intervention','ficheinter',1,'supprimer',NULL,'d',0),(67,'Exporter les fiches interventions','ficheinter',1,'export',NULL,'r',0),(68,'Envoyer les fiches d\'intervention par courriel','ficheinter',1,'ficheinter_advance','send','r',0),(69,'Valider les fiches d\'intervention ','ficheinter',1,'ficheinter_advance','validate','a',0),(70,'Dévalider les fiches d\'intervention','ficheinter',1,'ficheinter_advance','unvalidate','a',0),(71,'Read members\' card','adherent',1,'lire',NULL,'r',1),(72,'Create/modify members (need also user module permissions if member linked to a user)','adherent',1,'creer',NULL,'w',0),(74,'Remove members','adherent',1,'supprimer',NULL,'d',0),(75,'Setup types of membership','adherent',1,'configurer',NULL,'w',0),(76,'Export members','adherent',1,'export',NULL,'r',0),(78,'Read subscriptions','adherent',1,'cotisation','lire','r',1),(79,'Create/modify/remove subscriptions','adherent',1,'cotisation','creer','w',0),(81,'Lire les commandes clients','commande',1,'lire',NULL,'r',1),(82,'Creer/modifier les commandes clients','commande',1,'creer',NULL,'w',0),(84,'Valider les commandes clients','commande',1,'order_advance','validate','d',0),(86,'Envoyer les commandes clients','commande',1,'order_advance','send','d',0),(87,'Cloturer les commandes clients','commande',1,'cloturer',NULL,'d',0),(88,'Annuler les commandes clients','commande',1,'order_advance','annuler','d',0),(89,'Supprimer les commandes clients','commande',1,'supprimer',NULL,'d',0),(91,'Lire les charges','tax',1,'charges','lire','r',0),(91,'Lire les charges','tax',2,'charges','lire','r',1),(92,'Creer/modifier les charges','tax',1,'charges','creer','w',0),(92,'Creer/modifier les charges','tax',2,'charges','creer','w',0),(93,'Supprimer les charges','tax',1,'charges','supprimer','d',0),(93,'Supprimer les charges','tax',2,'charges','supprimer','d',0),(94,'Exporter les charges','tax',1,'charges','export','r',0),(94,'Exporter les charges','tax',2,'charges','export','r',0),(101,'Lire les expeditions','expedition',1,'lire',NULL,'r',1),(102,'Creer modifier les expeditions','expedition',1,'creer',NULL,'w',0),(104,'Valider les expeditions','expedition',1,'shipping_advance','validate','d',0),(105,'Envoyer les expeditions aux clients','expedition',1,'shipping_advance','send','d',0),(106,'Exporter les expeditions','expedition',1,'shipment','export','r',0),(109,'Supprimer les expeditions','expedition',1,'supprimer',NULL,'d',0),(111,'Lire les comptes bancaires','banque',1,'lire',NULL,'r',0),(111,'Lire les comptes bancaires','banque',2,'lire',NULL,'r',1),(112,'Creer/modifier montant/supprimer ecriture bancaire','banque',1,'modifier',NULL,'w',0),(112,'Creer/modifier montant/supprimer ecriture bancaire','banque',2,'modifier',NULL,'w',0),(113,'Configurer les comptes bancaires (creer, gerer categories)','banque',1,'configurer',NULL,'a',0),(113,'Configurer les comptes bancaires (creer, gerer categories)','banque',2,'configurer',NULL,'a',0),(114,'Rapprocher les ecritures bancaires','banque',1,'consolidate',NULL,'w',0),(114,'Rapprocher les ecritures bancaires','banque',2,'consolidate',NULL,'w',0),(115,'Exporter transactions et releves','banque',1,'export',NULL,'r',0),(115,'Exporter transactions et releves','banque',2,'export',NULL,'r',0),(116,'Virements entre comptes','banque',1,'transfer',NULL,'w',0),(116,'Virements entre comptes','banque',2,'transfer',NULL,'w',0),(117,'Gerer les envois de cheques','banque',1,'cheque',NULL,'w',0),(117,'Gerer les envois de cheques','banque',2,'cheque',NULL,'w',0),(121,'Lire les societes','societe',1,'lire',NULL,'r',1),(121,'Lire les societes','societe',2,'lire',NULL,'r',1),(122,'Creer modifier les societes','societe',1,'creer',NULL,'w',0),(122,'Creer modifier les societes','societe',2,'creer',NULL,'w',0),(125,'Supprimer les societes','societe',1,'supprimer',NULL,'d',0),(125,'Supprimer les societes','societe',2,'supprimer',NULL,'d',0),(126,'Exporter les societes','societe',1,'export',NULL,'r',0),(126,'Exporter les societes','societe',2,'export',NULL,'r',0),(141,'Read all projects and tasks (also private projects I am not contact for)','projet',1,'all','lire','r',0),(142,'Create/modify all projects and tasks (also private projects I am not contact for)','projet',1,'all','creer','w',0),(144,'Delete all projects and tasks (also private projects I am not contact for)','projet',1,'all','supprimer','d',0),(151,'Read withdrawals','prelevement',1,'bons','lire','r',1),(152,'Create/modify a withdrawals','prelevement',1,'bons','creer','w',0),(153,'Send withdrawals to bank','prelevement',1,'bons','send','a',0),(154,'credit/refuse withdrawals','prelevement',1,'bons','credit','a',0),(161,'Lire les contrats','contrat',1,'lire',NULL,'r',1),(162,'Creer / modifier les contrats','contrat',1,'creer',NULL,'w',0),(163,'Activer un service d\'un contrat','contrat',1,'activer',NULL,'w',0),(164,'Desactiver un service d\'un contrat','contrat',1,'desactiver',NULL,'w',0),(165,'Supprimer un contrat','contrat',1,'supprimer',NULL,'d',0),(167,'Export contracts','contrat',1,'export',NULL,'r',0),(221,'Consulter les mailings','mailing',1,'lire',NULL,'r',1),(221,'Consulter les mailings','mailing',2,'lire',NULL,'r',1),(222,'Creer/modifier les mailings (sujet, destinataires...)','mailing',1,'creer',NULL,'w',0),(222,'Creer/modifier les mailings (sujet, destinataires...)','mailing',2,'creer',NULL,'w',0),(223,'Valider les mailings (permet leur envoi)','mailing',1,'valider',NULL,'w',0),(223,'Valider les mailings (permet leur envoi)','mailing',2,'valider',NULL,'w',0),(229,'Supprimer les mailings','mailing',1,'supprimer',NULL,'d',0),(229,'Supprimer les mailings','mailing',2,'supprimer',NULL,'d',0),(237,'View recipients and info','mailing',1,'mailing_advance','recipient','r',0),(237,'View recipients and info','mailing',2,'mailing_advance','recipient','r',0),(238,'Manually send mailings','mailing',1,'mailing_advance','send','w',0),(238,'Manually send mailings','mailing',2,'mailing_advance','send','w',0),(239,'Delete mailings after validation and/or sent','mailing',1,'mailing_advance','delete','d',0),(239,'Delete mailings after validation and/or sent','mailing',2,'mailing_advance','delete','d',0),(241,'Lire les categories','categorie',1,'lire',NULL,'r',1),(242,'Creer/modifier les categories','categorie',1,'creer',NULL,'w',0),(243,'Supprimer les categories','categorie',1,'supprimer',NULL,'d',0),(251,'Consulter les autres utilisateurs','user',1,'user','lire','r',0),(252,'Consulter les permissions des autres utilisateurs','user',1,'user_advance','readperms','r',0),(253,'Creer/modifier utilisateurs internes et externes','user',1,'user','creer','w',0),(254,'Creer/modifier utilisateurs externes seulement','user',1,'user_advance','write','w',0),(255,'Modifier le mot de passe des autres utilisateurs','user',1,'user','password','w',0),(256,'Supprimer ou desactiver les autres utilisateurs','user',1,'user','supprimer','d',0),(262,'Consulter tous les tiers par utilisateurs internes (sinon uniquement si contact commercial). Non effectif pour utilisateurs externes (tjs limités à eux-meme).','societe',1,'client','voir','r',1),(262,'Consulter tous les tiers par utilisateurs internes (sinon uniquement si contact commercial). Non effectif pour utilisateurs externes (tjs limités à eux-meme).','societe',2,'client','voir','r',1),(281,'Lire les contacts','societe',1,'contact','lire','r',1),(281,'Lire les contacts','societe',2,'contact','lire','r',1),(282,'Creer modifier les contacts','societe',1,'contact','creer','w',0),(282,'Creer modifier les contacts','societe',2,'contact','creer','w',0),(283,'Supprimer les contacts','societe',1,'contact','supprimer','d',0),(283,'Supprimer les contacts','societe',2,'contact','supprimer','d',0),(286,'Exporter les contacts','societe',1,'contact','export','d',0),(286,'Exporter les contacts','societe',2,'contact','export','d',0),(300,'Read barcodes','barcode',1,'lire_advance',NULL,'r',1),(301,'Create/modify barcodes','barcode',1,'creer_advance',NULL,'w',0),(331,'Lire les bookmarks','bookmark',1,'lire',NULL,'r',1),(332,'Creer/modifier les bookmarks','bookmark',1,'creer',NULL,'r',1),(333,'Supprimer les bookmarks','bookmark',1,'supprimer',NULL,'r',0),(341,'Consulter ses propres permissions','user',1,'self_advance','readperms','r',1),(342,'Creer/modifier ses propres infos utilisateur','user',1,'self','creer','w',1),(343,'Modifier son propre mot de passe','user',1,'self','password','w',1),(344,'Modifier ses propres permissions','user',1,'self_advance','writeperms','w',1),(351,'Consulter les groupes','user',1,'group_advance','read','r',0),(352,'Consulter les permissions des groupes','user',1,'group_advance','readperms','r',0),(353,'Creer/modifier les groupes et leurs permissions','user',1,'group_advance','write','w',0),(354,'Supprimer ou desactiver les groupes','user',1,'group_advance','delete','d',0),(358,'Exporter les utilisateurs','user',1,'user','export','r',0),(510,'Read salaries','salaries',1,'read',NULL,'r',0),(511,'Read employee contracts/salaries','salaries',1,'read',NULL,'r',0),(512,'Create/modify salaries','salaries',1,'write',NULL,'w',0),(513,'Create/modify payment of salaries','salaries',1,'write',NULL,'w',0),(514,'Delete salaries','salaries',1,'delete',NULL,'d',0),(517,'Export salaries','salaries',1,'export',NULL,'r',0),(520,'Read loans','loan',1,'read',NULL,'r',0),(522,'Create/modify loans','loan',1,'write',NULL,'w',0),(524,'Delete loans','loan',1,'delete',NULL,'d',0),(525,'Access loan calculator','loan',1,'calc',NULL,'r',0),(527,'Export loans','loan',1,'export',NULL,'r',0),(531,'Lire les services','service',1,'lire',NULL,'r',1),(532,'Creer/modifier les services','service',1,'creer',NULL,'w',0),(534,'Supprimer les services','service',1,'supprimer',NULL,'d',0),(538,'Exporter les services','service',1,'export',NULL,'r',0),(701,'Lire les dons','don',1,'lire',NULL,'r',1),(701,'Lire les dons','don',2,'lire',NULL,'r',1),(702,'Creer/modifier les dons','don',1,'creer',NULL,'w',0),(702,'Creer/modifier les dons','don',2,'creer',NULL,'w',0),(703,'Supprimer les dons','don',1,'supprimer',NULL,'d',0),(703,'Supprimer les dons','don',2,'supprimer',NULL,'d',0),(771,'Read expense reports (yours and your subordinates)','expensereport',1,'lire',NULL,'r',1),(772,'Create/modify expense reports','expensereport',1,'creer',NULL,'w',0),(773,'Delete expense reports','expensereport',1,'supprimer',NULL,'d',0),(774,'Read all expense reports','expensereport',1,'readall',NULL,'r',1),(775,'Approve expense reports','expensereport',1,'approve',NULL,'w',0),(776,'Pay expense reports','expensereport',1,'to_paid',NULL,'w',0),(777,'Read expense reports of everybody','expensereport',1,'readall',NULL,'r',1),(778,'Create expense reports for everybody','expensereport',1,'writeall_advance',NULL,'w',0),(779,'Export expense reports','expensereport',1,'export',NULL,'r',0),(1001,'Lire les stocks','stock',1,'lire',NULL,'r',1),(1002,'Creer/Modifier les stocks','stock',1,'creer',NULL,'w',0),(1003,'Supprimer les stocks','stock',1,'supprimer',NULL,'d',0),(1004,'Lire mouvements de stocks','stock',1,'mouvement','lire','r',1),(1005,'Creer/modifier mouvements de stocks','stock',1,'mouvement','creer','w',0),(1101,'Lire les bons de livraison','expedition',1,'livraison','lire','r',1),(1102,'Creer modifier les bons de livraison','expedition',1,'livraison','creer','w',0),(1104,'Valider les bons de livraison','expedition',1,'livraison_advance','validate','d',0),(1109,'Supprimer les bons de livraison','expedition',1,'livraison','supprimer','d',0),(1121,'Read supplier proposals','supplier_proposal',1,'lire',NULL,'w',1),(1122,'Create/modify supplier proposals','supplier_proposal',1,'creer',NULL,'w',0),(1123,'Validate supplier proposals','supplier_proposal',1,'validate_advance',NULL,'w',0),(1124,'Envoyer les demandes fournisseurs','supplier_proposal',1,'send_advance',NULL,'w',0),(1125,'Delete supplier proposals','supplier_proposal',1,'supprimer',NULL,'w',0),(1126,'Close supplier price requests','supplier_proposal',1,'cloturer',NULL,'w',0),(1181,'Consulter les fournisseurs','fournisseur',1,'lire',NULL,'r',1),(1182,'Consulter les commandes fournisseur','fournisseur',1,'commande','lire','r',1),(1183,'Creer une commande fournisseur','fournisseur',1,'commande','creer','w',0),(1184,'Valider une commande fournisseur','fournisseur',1,'supplier_order_advance','validate','w',0),(1185,'Approuver une commande fournisseur','fournisseur',1,'commande','approuver','w',0),(1186,'Commander une commande fournisseur','fournisseur',1,'commande','commander','w',0),(1187,'Receptionner une commande fournisseur','fournisseur',1,'commande','receptionner','d',0),(1188,'Supprimer une commande fournisseur','fournisseur',1,'commande','supprimer','d',0),(1189,'Check/Uncheck a supplier order reception','fournisseur',1,'commande_advance','check','w',0),(1201,'Lire les exports','export',1,'lire',NULL,'r',1),(1202,'Creer/modifier un export','export',1,'creer',NULL,'w',0),(1231,'Consulter les factures fournisseur','fournisseur',1,'facture','lire','r',1),(1232,'Creer une facture fournisseur','fournisseur',1,'facture','creer','w',0),(1233,'Valider une facture fournisseur','fournisseur',1,'supplier_invoice_advance','validate','w',0),(1234,'Supprimer une facture fournisseur','fournisseur',1,'facture','supprimer','d',0),(1235,'Envoyer les factures par mail','fournisseur',1,'supplier_invoice_advance','send','a',0),(1236,'Exporter les factures fournisseurs, attributs et reglements','fournisseur',1,'facture','export','r',0),(1237,'Exporter les commande fournisseurs, attributs','fournisseur',1,'commande','export','r',0),(1251,'Run mass imports of external data (data load)','import',1,'run',NULL,'r',0),(1321,'Exporter les factures clients, attributs et reglements','facture',1,'facture','export','r',0),(1321,'Exporter les factures clients, attributs et reglements','facture',2,'facture','export','r',0),(1322,'Rouvrir une facture totalement réglée','facture',1,'invoice_advance','reopen','r',0),(1421,'Exporter les commandes clients et attributs','commande',1,'commande','export','r',0),(2401,'Read actions/tasks linked to his account','agenda',1,'myactions','read','r',1),(2401,'Read actions/tasks linked to his account','agenda',2,'myactions','read','r',1),(2402,'Create/modify actions/tasks linked to his account','agenda',1,'myactions','create','w',0),(2402,'Create/modify actions/tasks linked to his account','agenda',2,'myactions','create','w',0),(2403,'Delete actions/tasks linked to his account','agenda',1,'myactions','delete','w',0),(2403,'Delete actions/tasks linked to his account','agenda',2,'myactions','delete','w',0),(2411,'Read actions/tasks of others','agenda',1,'allactions','read','r',0),(2411,'Read actions/tasks of others','agenda',2,'allactions','read','r',0),(2412,'Create/modify actions/tasks of others','agenda',1,'allactions','create','w',0),(2412,'Create/modify actions/tasks of others','agenda',2,'allactions','create','w',0),(2413,'Delete actions/tasks of others','agenda',1,'allactions','delete','w',0),(2413,'Delete actions/tasks of others','agenda',2,'allactions','delete','w',0),(2414,'Export actions/tasks of others','agenda',1,'export',NULL,'w',0),(2501,'Consulter/Télécharger les documents','ecm',1,'read',NULL,'r',1),(2503,'Soumettre ou supprimer des documents','ecm',1,'upload',NULL,'w',0),(2515,'Administrer les rubriques de documents','ecm',1,'setup',NULL,'w',0),(20001,'Read your own holidays','holiday',1,'read',NULL,'w',1),(20001,'Créer / Modifier / Lire ses demandes de congés payés','holiday',2,'write',NULL,'w',1),(20002,'Create/modify your own holidays','holiday',1,'write',NULL,'w',1),(20002,'Lire / Modifier toutes les demandes de congés payés','holiday',2,'lire_tous',NULL,'w',0),(20003,'Delete holidays','holiday',1,'delete',NULL,'w',0),(20003,'Supprimer des demandes de congés payés','holiday',2,'delete',NULL,'w',0),(20004,'Read holidays for everybody','holiday',1,'read_all',NULL,'w',0),(20004,'Définir les congés payés des utilisateurs','holiday',2,'define_holiday',NULL,'w',0),(20005,'Create/modify holidays for everybody','holiday',1,'write_all',NULL,'w',0),(20005,'Voir les logs de modification des congés payés','holiday',2,'view_log',NULL,'w',0),(20006,'Setup holidays of users (setup and update balance)','holiday',1,'define_holiday',NULL,'w',0),(20006,'Accéder au rapport mensuel des congés payés','holiday',2,'month_report',NULL,'w',0),(23001,'Read cron jobs','cron',1,'read',NULL,'w',0),(23002,'Create cron Jobs','cron',1,'create',NULL,'w',0),(23003,'Delete cron Jobs','cron',1,'delete',NULL,'w',0),(23004,'Execute cron Jobs','cron',1,'execute',NULL,'w',0),(50101,'Use point of sale','cashdesk',1,'use',NULL,'a',1),(50401,'Bind products and invoices with accounting accounts','accounting',1,'bind','write','r',0),(50411,'Read operations in General Ledger','accounting',1,'mouvements','lire','r',0),(50412,'Write/Edit operations in General Ledger','accounting',1,'mouvements','creer','w',0),(50420,'Report and export reports (turnover, balance, journals, general ledger)','accounting',1,'comptarapport','lire','r',0),(50430,'Define and close a fiscal year','accounting',1,'fiscalyear',NULL,'r',0),(50440,'Manage chart of accounts, setup of accountancy','accounting',1,'chartofaccount',NULL,'r',0),(55001,'Read surveys','opensurvey',1,'read',NULL,'r',0),(55002,'Create/modify surveys','opensurvey',1,'write',NULL,'w',0),(59001,'Visualiser les marges','margins',1,'liretous',NULL,'r',1),(59002,'Définir les marges','margins',1,'creer',NULL,'w',0),(59003,'Read every user margin','margins',1,'read','all','r',0),(63001,'Read resources','resource',1,'read',NULL,'w',1),(63002,'Create/Modify resources','resource',1,'write',NULL,'w',0),(63003,'Delete resources','resource',1,'delete',NULL,'w',0),(63004,'Link resources','resource',1,'link',NULL,'w',0),(64001,'DirectPrint','printing',1,'read',NULL,'r',0),(101250,'Read surveys','opensurvey',2,'survey','read','r',0),(101251,'Create/modify surveys','opensurvey',2,'survey','write','w',0),(400051,'Use POS','pos',2,'frontend',NULL,'a',1),(400052,'Use Backend','pos',2,'backend',NULL,'a',1),(400053,'Make Transfers','pos',2,'transfer',NULL,'a',1),(400055,'Stats','pos',2,'stats',NULL,'a',1);
+INSERT INTO `llx_rights_def` VALUES (11,'Lire les factures','facture',1,'lire',NULL,'a',0),(11,'Lire les factures','facture',2,'lire',NULL,'a',1),(12,'Creer/modifier les factures','facture',1,'creer',NULL,'a',0),(12,'Creer/modifier les factures','facture',2,'creer',NULL,'a',0),(13,'Dévalider les factures','facture',1,'invoice_advance','unvalidate','a',0),(13,'Dévalider les factures','facture',2,'invoice_advance','unvalidate','a',0),(14,'Valider les factures','facture',1,'invoice_advance','validate','a',0),(14,'Valider les factures','facture',2,'valider',NULL,'a',0),(15,'Envoyer les factures par mail','facture',1,'invoice_advance','send','a',0),(15,'Envoyer les factures par mail','facture',2,'invoice_advance','send','a',0),(16,'Emettre des paiements sur les factures','facture',1,'paiement',NULL,'a',0),(16,'Emettre des paiements sur les factures','facture',2,'paiement',NULL,'a',0),(19,'Supprimer les factures','facture',1,'supprimer',NULL,'a',0),(19,'Supprimer les factures','facture',2,'supprimer',NULL,'a',0),(21,'Lire les propositions commerciales','propale',1,'lire',NULL,'r',1),(21,'Lire les propositions commerciales','propale',2,'lire',NULL,'r',1),(22,'Creer/modifier les propositions commerciales','propale',1,'creer',NULL,'w',0),(22,'Creer/modifier les propositions commerciales','propale',2,'creer',NULL,'w',0),(24,'Valider les propositions commerciales','propale',1,'propal_advance','validate','d',0),(24,'Valider les propositions commerciales','propale',2,'valider',NULL,'d',0),(25,'Envoyer les propositions commerciales aux clients','propale',1,'propal_advance','send','d',0),(25,'Envoyer les propositions commerciales aux clients','propale',2,'propal_advance','send','d',0),(26,'Cloturer les propositions commerciales','propale',1,'cloturer',NULL,'d',0),(26,'Cloturer les propositions commerciales','propale',2,'cloturer',NULL,'d',0),(27,'Supprimer les propositions commerciales','propale',1,'supprimer',NULL,'d',0),(27,'Supprimer les propositions commerciales','propale',2,'supprimer',NULL,'d',0),(28,'Exporter les propositions commerciales et attributs','propale',1,'export',NULL,'r',0),(28,'Exporter les propositions commerciales et attributs','propale',2,'export',NULL,'r',0),(31,'Lire les produits','produit',1,'lire',NULL,'r',1),(31,'Lire les produits','produit',2,'lire',NULL,'r',1),(32,'Creer/modifier les produits','produit',1,'creer',NULL,'w',0),(32,'Creer/modifier les produits','produit',2,'creer',NULL,'w',0),(34,'Supprimer les produits','produit',1,'supprimer',NULL,'d',0),(34,'Supprimer les produits','produit',2,'supprimer',NULL,'d',0),(38,'Exporter les produits','produit',1,'export',NULL,'r',0),(38,'Exporter les produits','produit',2,'export',NULL,'r',0),(41,'Read projects and tasks (shared projects or projects I am contact for). Can also enter time consumed on assigned tasks (timesheet)','projet',1,'lire',NULL,'r',1),(42,'Create/modify projects and tasks (shared projects or projects I am contact for)','projet',1,'creer',NULL,'w',0),(44,'Delete project and tasks (shared projects or projects I am contact for)','projet',1,'supprimer',NULL,'d',0),(45,'Export projects','projet',1,'export',NULL,'d',0),(61,'Lire les fiches d\'intervention','ficheinter',1,'lire',NULL,'r',1),(62,'Creer/modifier les fiches d\'intervention','ficheinter',1,'creer',NULL,'w',0),(64,'Supprimer les fiches d\'intervention','ficheinter',1,'supprimer',NULL,'d',0),(67,'Exporter les fiches interventions','ficheinter',1,'export',NULL,'r',0),(68,'Envoyer les fiches d\'intervention par courriel','ficheinter',1,'ficheinter_advance','send','r',0),(69,'Valider les fiches d\'intervention ','ficheinter',1,'ficheinter_advance','validate','a',0),(70,'Dévalider les fiches d\'intervention','ficheinter',1,'ficheinter_advance','unvalidate','a',0),(81,'Lire les commandes clients','commande',1,'lire',NULL,'r',1),(82,'Creer/modifier les commandes clients','commande',1,'creer',NULL,'w',0),(84,'Valider les commandes clients','commande',1,'order_advance','validate','d',0),(86,'Envoyer les commandes clients','commande',1,'order_advance','send','d',0),(87,'Cloturer les commandes clients','commande',1,'cloturer',NULL,'d',0),(88,'Annuler les commandes clients','commande',1,'order_advance','annuler','d',0),(89,'Supprimer les commandes clients','commande',1,'supprimer',NULL,'d',0),(91,'Lire les charges','tax',1,'charges','lire','r',0),(91,'Lire les charges','tax',2,'charges','lire','r',1),(92,'Creer/modifier les charges','tax',1,'charges','creer','w',0),(92,'Creer/modifier les charges','tax',2,'charges','creer','w',0),(93,'Supprimer les charges','tax',1,'charges','supprimer','d',0),(93,'Supprimer les charges','tax',2,'charges','supprimer','d',0),(94,'Exporter les charges','tax',1,'charges','export','r',0),(94,'Exporter les charges','tax',2,'charges','export','r',0),(101,'Lire les expeditions','expedition',1,'lire',NULL,'r',1),(102,'Creer modifier les expeditions','expedition',1,'creer',NULL,'w',0),(104,'Valider les expeditions','expedition',1,'shipping_advance','validate','d',0),(105,'Envoyer les expeditions aux clients','expedition',1,'shipping_advance','send','d',0),(106,'Exporter les expeditions','expedition',1,'shipment','export','r',0),(109,'Supprimer les expeditions','expedition',1,'supprimer',NULL,'d',0),(111,'Lire les comptes bancaires','banque',1,'lire',NULL,'r',0),(111,'Lire les comptes bancaires','banque',2,'lire',NULL,'r',1),(112,'Creer/modifier montant/supprimer ecriture bancaire','banque',1,'modifier',NULL,'w',0),(112,'Creer/modifier montant/supprimer ecriture bancaire','banque',2,'modifier',NULL,'w',0),(113,'Configurer les comptes bancaires (creer, gerer categories)','banque',1,'configurer',NULL,'a',0),(113,'Configurer les comptes bancaires (creer, gerer categories)','banque',2,'configurer',NULL,'a',0),(114,'Rapprocher les ecritures bancaires','banque',1,'consolidate',NULL,'w',0),(114,'Rapprocher les ecritures bancaires','banque',2,'consolidate',NULL,'w',0),(115,'Exporter transactions et releves','banque',1,'export',NULL,'r',0),(115,'Exporter transactions et releves','banque',2,'export',NULL,'r',0),(116,'Virements entre comptes','banque',1,'transfer',NULL,'w',0),(116,'Virements entre comptes','banque',2,'transfer',NULL,'w',0),(117,'Gerer les envois de cheques','banque',1,'cheque',NULL,'w',0),(117,'Gerer les envois de cheques','banque',2,'cheque',NULL,'w',0),(121,'Lire les societes','societe',1,'lire',NULL,'r',1),(121,'Lire les societes','societe',2,'lire',NULL,'r',1),(122,'Creer modifier les societes','societe',1,'creer',NULL,'w',0),(122,'Creer modifier les societes','societe',2,'creer',NULL,'w',0),(125,'Supprimer les societes','societe',1,'supprimer',NULL,'d',0),(125,'Supprimer les societes','societe',2,'supprimer',NULL,'d',0),(126,'Exporter les societes','societe',1,'export',NULL,'r',0),(126,'Exporter les societes','societe',2,'export',NULL,'r',0),(141,'Read all projects and tasks (also private projects I am not contact for)','projet',1,'all','lire','r',0),(142,'Create/modify all projects and tasks (also private projects I am not contact for)','projet',1,'all','creer','w',0),(144,'Delete all projects and tasks (also private projects I am not contact for)','projet',1,'all','supprimer','d',0),(151,'Read withdrawals','prelevement',1,'bons','lire','r',1),(152,'Create/modify a withdrawals','prelevement',1,'bons','creer','w',0),(153,'Send withdrawals to bank','prelevement',1,'bons','send','a',0),(154,'credit/refuse withdrawals','prelevement',1,'bons','credit','a',0),(161,'Lire les contrats','contrat',1,'lire',NULL,'r',1),(162,'Creer / modifier les contrats','contrat',1,'creer',NULL,'w',0),(163,'Activer un service d\'un contrat','contrat',1,'activer',NULL,'w',0),(164,'Desactiver un service d\'un contrat','contrat',1,'desactiver',NULL,'w',0),(165,'Supprimer un contrat','contrat',1,'supprimer',NULL,'d',0),(167,'Export contracts','contrat',1,'export',NULL,'r',0),(221,'Consulter les mailings','mailing',1,'lire',NULL,'r',1),(221,'Consulter les mailings','mailing',2,'lire',NULL,'r',1),(222,'Creer/modifier les mailings (sujet, destinataires...)','mailing',1,'creer',NULL,'w',0),(222,'Creer/modifier les mailings (sujet, destinataires...)','mailing',2,'creer',NULL,'w',0),(223,'Valider les mailings (permet leur envoi)','mailing',1,'valider',NULL,'w',0),(223,'Valider les mailings (permet leur envoi)','mailing',2,'valider',NULL,'w',0),(229,'Supprimer les mailings','mailing',1,'supprimer',NULL,'d',0),(229,'Supprimer les mailings','mailing',2,'supprimer',NULL,'d',0),(237,'View recipients and info','mailing',1,'mailing_advance','recipient','r',0),(237,'View recipients and info','mailing',2,'mailing_advance','recipient','r',0),(238,'Manually send mailings','mailing',1,'mailing_advance','send','w',0),(238,'Manually send mailings','mailing',2,'mailing_advance','send','w',0),(239,'Delete mailings after validation and/or sent','mailing',1,'mailing_advance','delete','d',0),(239,'Delete mailings after validation and/or sent','mailing',2,'mailing_advance','delete','d',0),(241,'Lire les categories','categorie',1,'lire',NULL,'r',1),(242,'Creer/modifier les categories','categorie',1,'creer',NULL,'w',0),(243,'Supprimer les categories','categorie',1,'supprimer',NULL,'d',0),(251,'Consulter les autres utilisateurs','user',1,'user','lire','r',0),(252,'Consulter les permissions des autres utilisateurs','user',1,'user_advance','readperms','r',0),(253,'Creer/modifier utilisateurs internes et externes','user',1,'user','creer','w',0),(254,'Creer/modifier utilisateurs externes seulement','user',1,'user_advance','write','w',0),(255,'Modifier le mot de passe des autres utilisateurs','user',1,'user','password','w',0),(256,'Supprimer ou desactiver les autres utilisateurs','user',1,'user','supprimer','d',0),(262,'Consulter tous les tiers par utilisateurs internes (sinon uniquement si contact commercial). Non effectif pour utilisateurs externes (tjs limités à eux-meme).','societe',1,'client','voir','r',1),(262,'Consulter tous les tiers par utilisateurs internes (sinon uniquement si contact commercial). Non effectif pour utilisateurs externes (tjs limités à eux-meme).','societe',2,'client','voir','r',1),(281,'Lire les contacts','societe',1,'contact','lire','r',1),(281,'Lire les contacts','societe',2,'contact','lire','r',1),(282,'Creer modifier les contacts','societe',1,'contact','creer','w',0),(282,'Creer modifier les contacts','societe',2,'contact','creer','w',0),(283,'Supprimer les contacts','societe',1,'contact','supprimer','d',0),(283,'Supprimer les contacts','societe',2,'contact','supprimer','d',0),(286,'Exporter les contacts','societe',1,'contact','export','d',0),(286,'Exporter les contacts','societe',2,'contact','export','d',0),(300,'Read barcodes','barcode',1,'lire_advance',NULL,'r',1),(301,'Create/modify barcodes','barcode',1,'creer_advance',NULL,'w',0),(341,'Consulter ses propres permissions','user',1,'self_advance','readperms','r',1),(342,'Creer/modifier ses propres infos utilisateur','user',1,'self','creer','w',1),(343,'Modifier son propre mot de passe','user',1,'self','password','w',1),(344,'Modifier ses propres permissions','user',1,'self_advance','writeperms','w',1),(351,'Consulter les groupes','user',1,'group_advance','read','r',0),(352,'Consulter les permissions des groupes','user',1,'group_advance','readperms','r',0),(353,'Creer/modifier les groupes et leurs permissions','user',1,'group_advance','write','w',0),(354,'Supprimer ou desactiver les groupes','user',1,'group_advance','delete','d',0),(358,'Exporter les utilisateurs','user',1,'user','export','r',0),(510,'Read salaries','salaries',1,'read',NULL,'r',0),(511,'Read employee contracts/salaries','salaries',1,'read',NULL,'r',0),(512,'Create/modify salaries','salaries',1,'write',NULL,'w',0),(513,'Create/modify payment of salaries','salaries',1,'write',NULL,'w',0),(514,'Delete salaries','salaries',1,'delete',NULL,'d',0),(517,'Export salaries','salaries',1,'export',NULL,'r',0),(520,'Read loans','loan',1,'read',NULL,'r',0),(522,'Create/modify loans','loan',1,'write',NULL,'w',0),(524,'Delete loans','loan',1,'delete',NULL,'d',0),(525,'Access loan calculator','loan',1,'calc',NULL,'r',0),(527,'Export loans','loan',1,'export',NULL,'r',0),(531,'Lire les services','service',1,'lire',NULL,'r',1),(532,'Creer/modifier les services','service',1,'creer',NULL,'w',0),(534,'Supprimer les services','service',1,'supprimer',NULL,'d',0),(538,'Exporter les services','service',1,'export',NULL,'r',0),(701,'Lire les dons','don',1,'lire',NULL,'r',1),(701,'Lire les dons','don',2,'lire',NULL,'r',1),(702,'Creer/modifier les dons','don',1,'creer',NULL,'w',0),(702,'Creer/modifier les dons','don',2,'creer',NULL,'w',0),(703,'Supprimer les dons','don',1,'supprimer',NULL,'d',0),(703,'Supprimer les dons','don',2,'supprimer',NULL,'d',0),(771,'Read expense reports (yours and your subordinates)','expensereport',1,'lire',NULL,'r',1),(772,'Create/modify expense reports','expensereport',1,'creer',NULL,'w',0),(773,'Delete expense reports','expensereport',1,'supprimer',NULL,'d',0),(774,'Read all expense reports','expensereport',1,'readall',NULL,'r',1),(775,'Approve expense reports','expensereport',1,'approve',NULL,'w',0),(776,'Pay expense reports','expensereport',1,'to_paid',NULL,'w',0),(777,'Read expense reports of everybody','expensereport',1,'readall',NULL,'r',1),(778,'Create expense reports for everybody','expensereport',1,'writeall_advance',NULL,'w',0),(779,'Export expense reports','expensereport',1,'export',NULL,'r',0),(1001,'Lire les stocks','stock',1,'lire',NULL,'r',1),(1002,'Creer/Modifier les stocks','stock',1,'creer',NULL,'w',0),(1003,'Supprimer les stocks','stock',1,'supprimer',NULL,'d',0),(1004,'Lire mouvements de stocks','stock',1,'mouvement','lire','r',1),(1005,'Creer/modifier mouvements de stocks','stock',1,'mouvement','creer','w',0),(1101,'Lire les bons de livraison','expedition',1,'livraison','lire','r',1),(1102,'Creer modifier les bons de livraison','expedition',1,'livraison','creer','w',0),(1104,'Valider les bons de livraison','expedition',1,'livraison_advance','validate','d',0),(1109,'Supprimer les bons de livraison','expedition',1,'livraison','supprimer','d',0),(1121,'Read supplier proposals','supplier_proposal',1,'lire',NULL,'w',1),(1122,'Create/modify supplier proposals','supplier_proposal',1,'creer',NULL,'w',0),(1123,'Validate supplier proposals','supplier_proposal',1,'validate_advance',NULL,'w',0),(1124,'Envoyer les demandes fournisseurs','supplier_proposal',1,'send_advance',NULL,'w',0),(1125,'Delete supplier proposals','supplier_proposal',1,'supprimer',NULL,'w',0),(1126,'Close supplier price requests','supplier_proposal',1,'cloturer',NULL,'w',0),(1181,'Consulter les fournisseurs','fournisseur',1,'lire',NULL,'r',1),(1182,'Consulter les commandes fournisseur','fournisseur',1,'commande','lire','r',1),(1183,'Creer une commande fournisseur','fournisseur',1,'commande','creer','w',0),(1184,'Valider une commande fournisseur','fournisseur',1,'supplier_order_advance','validate','w',0),(1185,'Approuver une commande fournisseur','fournisseur',1,'commande','approuver','w',0),(1186,'Commander une commande fournisseur','fournisseur',1,'commande','commander','w',0),(1187,'Receptionner une commande fournisseur','fournisseur',1,'commande','receptionner','d',0),(1188,'Supprimer une commande fournisseur','fournisseur',1,'commande','supprimer','d',0),(1189,'Check/Uncheck a supplier order reception','fournisseur',1,'commande_advance','check','w',0),(1201,'Lire les exports','export',1,'lire',NULL,'r',1),(1202,'Creer/modifier un export','export',1,'creer',NULL,'w',0),(1231,'Consulter les factures fournisseur','fournisseur',1,'facture','lire','r',1),(1232,'Creer une facture fournisseur','fournisseur',1,'facture','creer','w',0),(1233,'Valider une facture fournisseur','fournisseur',1,'supplier_invoice_advance','validate','w',0),(1234,'Supprimer une facture fournisseur','fournisseur',1,'facture','supprimer','d',0),(1235,'Envoyer les factures par mail','fournisseur',1,'supplier_invoice_advance','send','a',0),(1236,'Exporter les factures fournisseurs, attributs et reglements','fournisseur',1,'facture','export','r',0),(1237,'Exporter les commande fournisseurs, attributs','fournisseur',1,'commande','export','r',0),(1251,'Run mass imports of external data (data load)','import',1,'run',NULL,'r',0),(1321,'Exporter les factures clients, attributs et reglements','facture',1,'facture','export','r',0),(1321,'Exporter les factures clients, attributs et reglements','facture',2,'facture','export','r',0),(1322,'Rouvrir une facture totalement réglée','facture',1,'invoice_advance','reopen','r',0),(1421,'Exporter les commandes clients et attributs','commande',1,'commande','export','r',0),(2401,'Read actions/tasks linked to his account','agenda',1,'myactions','read','r',1),(2401,'Read actions/tasks linked to his account','agenda',2,'myactions','read','r',1),(2402,'Create/modify actions/tasks linked to his account','agenda',1,'myactions','create','w',0),(2402,'Create/modify actions/tasks linked to his account','agenda',2,'myactions','create','w',0),(2403,'Delete actions/tasks linked to his account','agenda',1,'myactions','delete','w',0),(2403,'Delete actions/tasks linked to his account','agenda',2,'myactions','delete','w',0),(2411,'Read actions/tasks of others','agenda',1,'allactions','read','r',0),(2411,'Read actions/tasks of others','agenda',2,'allactions','read','r',0),(2412,'Create/modify actions/tasks of others','agenda',1,'allactions','create','w',0),(2412,'Create/modify actions/tasks of others','agenda',2,'allactions','create','w',0),(2413,'Delete actions/tasks of others','agenda',1,'allactions','delete','w',0),(2413,'Delete actions/tasks of others','agenda',2,'allactions','delete','w',0),(2414,'Export actions/tasks of others','agenda',1,'export',NULL,'w',0),(2501,'Consulter/Télécharger les documents','ecm',1,'read',NULL,'r',1),(2503,'Soumettre ou supprimer des documents','ecm',1,'upload',NULL,'w',0),(2515,'Administrer les rubriques de documents','ecm',1,'setup',NULL,'w',0),(20001,'Read your own holidays','holiday',1,'read',NULL,'w',1),(20001,'Créer / Modifier / Lire ses demandes de congés payés','holiday',2,'write',NULL,'w',1),(20002,'Create/modify your own holidays','holiday',1,'write',NULL,'w',1),(20002,'Lire / Modifier toutes les demandes de congés payés','holiday',2,'lire_tous',NULL,'w',0),(20003,'Delete holidays','holiday',1,'delete',NULL,'w',0),(20003,'Supprimer des demandes de congés payés','holiday',2,'delete',NULL,'w',0),(20004,'Read holidays for everybody','holiday',1,'read_all',NULL,'w',0),(20004,'Définir les congés payés des utilisateurs','holiday',2,'define_holiday',NULL,'w',0),(20005,'Create/modify holidays for everybody','holiday',1,'write_all',NULL,'w',0),(20005,'Voir les logs de modification des congés payés','holiday',2,'view_log',NULL,'w',0),(20006,'Setup holidays of users (setup and update balance)','holiday',1,'define_holiday',NULL,'w',0),(20006,'Accéder au rapport mensuel des congés payés','holiday',2,'month_report',NULL,'w',0),(23001,'Read cron jobs','cron',1,'read',NULL,'w',0),(23002,'Create cron Jobs','cron',1,'create',NULL,'w',0),(23003,'Delete cron Jobs','cron',1,'delete',NULL,'w',0),(23004,'Execute cron Jobs','cron',1,'execute',NULL,'w',0),(50101,'Use point of sale','cashdesk',1,'use',NULL,'a',1),(50401,'Bind products and invoices with accounting accounts','accounting',1,'bind','write','r',0),(50411,'Read operations in General Ledger','accounting',1,'mouvements','lire','r',0),(50412,'Write/Edit operations in General Ledger','accounting',1,'mouvements','creer','w',0),(50420,'Report and export reports (turnover, balance, journals, general ledger)','accounting',1,'comptarapport','lire','r',0),(50430,'Define and close a fiscal year','accounting',1,'fiscalyear',NULL,'r',0),(50440,'Manage chart of accounts, setup of accountancy','accounting',1,'chartofaccount',NULL,'r',0),(55001,'Read surveys','opensurvey',1,'read',NULL,'r',0),(55002,'Create/modify surveys','opensurvey',1,'write',NULL,'w',0),(59001,'Visualiser les marges','margins',1,'liretous',NULL,'r',1),(59002,'Définir les marges','margins',1,'creer',NULL,'w',0),(59003,'Read every user margin','margins',1,'read','all','r',0),(63001,'Read resources','resource',1,'read',NULL,'w',1),(63002,'Create/Modify resources','resource',1,'write',NULL,'w',0),(63003,'Delete resources','resource',1,'delete',NULL,'w',0),(63004,'Link resources','resource',1,'link',NULL,'w',0),(64001,'DirectPrint','printing',1,'read',NULL,'r',0),(101250,'Read surveys','opensurvey',2,'survey','read','r',0),(101251,'Create/modify surveys','opensurvey',2,'survey','write','w',0),(400051,'Use POS','pos',2,'frontend',NULL,'a',1),(400052,'Use Backend','pos',2,'backend',NULL,'a',1),(400053,'Make Transfers','pos',2,'transfer',NULL,'a',1),(400055,'Stats','pos',2,'stats',NULL,'a',1);
 /*!40000 ALTER TABLE `llx_rights_def` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -7929,7 +7934,7 @@ CREATE TABLE `llx_societe` (
 
 LOCK TABLES `llx_societe` WRITE;
 /*!40000 ALTER TABLE `llx_societe` DISABLE KEYS */;
-INSERT INTO `llx_societe` VALUES (1,0,NULL,'2016-01-16 15:21:09','2010-07-08 14:21:44','Indian SAS',1,NULL,NULL,'CU1212-0007','SU1212-0005','7050','6050','1 alalah road',NULL,'Delhi',0,117,NULL,NULL,NULL,NULL,NULL,NULL,4,NULL,'0','','','','','',5000,1,NULL,NULL,NULL,1,1,NULL,NULL,0,0,0,1,12,0,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,0.000,NULL,0.000,NULL,NULL,'en_IN',NULL,NULL,1,'indiancompany.png','','',0,NULL,NULL,'',0,NULL,NULL,NULL,NULL,NULL),(2,0,NULL,'2016-07-30 11:45:49','2010-07-08 14:23:48','Teclib',1,NULL,NULL,'CU1108-0001','SU1108-0001','411CU11080001','401SU11080001','',NULL,'Paris',0,1,NULL,NULL,'www.teclib.com',NULL,NULL,4,3,57,'0','123456789','','ACE14','','',400000,0,NULL,NULL,NULL,3,1,NULL,'',0,0,0,1,12,0,NULL,NULL,NULL,NULL,NULL,NULL,1,0,0.000,NULL,0.000,NULL,NULL,'fr_FR',NULL,NULL,1,'teclibcompany.png','','',0,NULL,NULL,'',0,NULL,NULL,0,'',NULL),(3,0,NULL,'2017-02-16 00:47:25','2010-07-08 22:42:12','Spanish Comp',1,NULL,NULL,'SPANISHCOMP','SU1601-0009',NULL,NULL,'1 via mallere',NULL,'Madrid',123,4,NULL,NULL,NULL,NULL,NULL,3,4,408,'0','','','','','',10000,0,NULL,NULL,NULL,1,1,NULL,NULL,0,0,0,1,12,0,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,0.000,NULL,0.000,NULL,NULL,'es_AR',NULL,NULL,1,'spanishcompany.png','','',0,NULL,NULL,'',0,NULL,NULL,NULL,NULL,NULL),(4,0,NULL,'2016-01-22 17:24:53','2010-07-08 22:48:18','Prospector Vaalen',1,NULL,NULL,'CU1303-0014',NULL,NULL,NULL,'',NULL,'Bruxelles',103,2,NULL,NULL,NULL,NULL,NULL,3,4,201,'0','12345678','','','','',0,0,NULL,NULL,NULL,3,0,NULL,'PL_LOW',0,0,0,1,12,0,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,0.000,NULL,0.000,NULL,NULL,NULL,NULL,NULL,1,'valeencompany.png','','',0,NULL,NULL,'',0,NULL,NULL,NULL,NULL,NULL),(5,0,NULL,'2017-02-21 11:01:17','2010-07-08 23:22:57','NoCountry GmBh',1,NULL,NULL,NULL,NULL,NULL,NULL,'',NULL,NULL,0,0,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'0','','','','','',0,0,NULL,NULL,NULL,0,0,NULL,'',0,0,0,1,12,0,NULL,NULL,NULL,NULL,NULL,NULL,1,0,0.000,NULL,0.000,NULL,NULL,NULL,NULL,NULL,1,'nocountrycomp.png','','',0,NULL,NULL,'',0,NULL,NULL,1,'EUR',NULL),(6,0,NULL,'2016-01-16 15:35:56','2010-07-09 00:15:09','Swiss Touch',1,NULL,NULL,'CU1601-0018','SU1601-0010',NULL,NULL,'',NULL,'Genevia',0,6,NULL,NULL,NULL,'swisstouch@example.ch',NULL,2,2,601,'0','','','','','',56000,0,NULL,NULL,NULL,3,1,NULL,NULL,0,0,0,1,12,0,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,0.000,NULL,0.000,NULL,NULL,NULL,NULL,NULL,1,'swisstouch.png','','',0,NULL,NULL,'',0,NULL,NULL,NULL,NULL,NULL),(7,0,NULL,'2016-01-16 15:38:32','2010-07-09 01:24:26','Generic customer',1,NULL,NULL,'CU1302-0011',NULL,NULL,NULL,'',NULL,NULL,0,7,NULL,NULL,NULL,'ttt@ttt.com',NULL,NULL,8,NULL,'0','','','','','',0,0,'Generic customer to use for Point Of Sale module.<br />',NULL,NULL,1,0,NULL,NULL,0,0,0,1,12,0,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,0.000,NULL,0.000,NULL,NULL,NULL,NULL,NULL,1,'genericcustomer.png','','',0,NULL,NULL,'',0,NULL,NULL,NULL,NULL,NULL),(10,0,NULL,'2016-01-16 15:44:20','2010-07-10 15:13:08','NLTechno',1,NULL,NULL,'CU1212-0005','SU1601-0011',NULL,NULL,'',NULL,NULL,0,1,NULL,NULL,NULL,'notanemail@nltechno.com',NULL,1,4,54,'0','493861496','49386149600039','6209Z','22-01-2007','FR123456789',10000,0,NULL,NULL,NULL,1,1,NULL,NULL,0,0,0,1,12,0,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,0.000,NULL,0.000,'123456789012',NULL,'fr_FR',NULL,NULL,1,'logo_nltechno_94x100.png','','',0,NULL,NULL,'The OpenSource company',0,NULL,NULL,NULL,NULL,NULL),(11,0,NULL,'2016-01-22 17:11:20','2010-07-10 18:35:57','Company Corp 1',1,NULL,NULL,'CU1510-0017',NULL,'7051',NULL,'',NULL,NULL,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'0','','','','','',0,0,NULL,NULL,NULL,3,0,NULL,'PL_LOW',0,0,0,1,12,0,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,0.000,NULL,0.000,NULL,NULL,NULL,NULL,NULL,1,'comapnycorp1company.png','','',0,NULL,NULL,'',0,NULL,NULL,NULL,NULL,NULL),(12,0,NULL,'2016-01-22 16:41:56','2010-07-11 16:18:08','Dupont Alain',1,NULL,NULL,'CU1601-0019',NULL,NULL,NULL,'',NULL,NULL,0,1,NULL,NULL,NULL,'dalain@example.com',NULL,NULL,0,NULL,'0','','','','','',0,0,NULL,NULL,NULL,1,0,NULL,NULL,0,0,0,1,12,0,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,0.000,NULL,0.000,NULL,NULL,NULL,NULL,NULL,1,'pierrecurie.jpg','','',0,NULL,NULL,'',0,NULL,NULL,NULL,NULL,NULL),(13,0,NULL,'2016-01-22 17:13:16','2010-07-11 17:13:20','Company Corp 2',1,NULL,NULL,NULL,'SU1510-0008',NULL,NULL,'',NULL,NULL,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'0','','','','','',0,0,NULL,NULL,NULL,0,1,NULL,NULL,0,0,0,1,12,0,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,0.000,NULL,0.000,NULL,NULL,NULL,NULL,NULL,1,'companycorp2company.png','','',0,NULL,NULL,'',0,NULL,NULL,NULL,NULL,NULL),(17,0,NULL,'2017-02-15 22:55:34','2011-08-01 02:41:26','Book Keeping Company',1,NULL,NULL,'CU1108-0004','SU1108-0004',NULL,'401SU11080004','The French Company',NULL,NULL,0,1,NULL,NULL,NULL,NULL,NULL,1,0,NULL,'0','','','','','',0,0,NULL,NULL,NULL,0,1,NULL,'',0,0,0,1,12,0,NULL,NULL,NULL,NULL,NULL,NULL,1,0,0.000,NULL,0.000,NULL,NULL,NULL,NULL,NULL,1,'bookkeepercompany.png','','',0,NULL,NULL,'',0,NULL,NULL,1,'EUR',NULL),(19,0,NULL,'2017-02-21 11:51:40','2013-01-12 12:23:05','Magic Food Store',1,NULL,NULL,'CU1301-0008',NULL,NULL,NULL,'65 holdywood boulevard','123456','BigTown',0,4,NULL,'0101',NULL,'myemail@domain.com',NULL,NULL,0,NULL,'0','','','10/10/2010','','',0,0,NULL,NULL,NULL,1,0,NULL,NULL,0,0,0,1,12,0,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0.000,NULL,0.000,NULL,NULL,'en_US','patient@cabinetmed',NULL,1,'magicfoodstore.png','','',0,NULL,NULL,'',0,NULL,'sepamandate',NULL,NULL,NULL),(25,0,NULL,'2016-01-22 17:21:17','2013-03-10 15:47:37','Print Company',1,NULL,NULL,'CU1303-0016','SU1303-0007',NULL,NULL,'21 Gutenberg street','45600','Berlin',0,5,NULL,NULL,NULL,'printcompany@example.com',NULL,NULL,0,NULL,'0','','','','','',0,0,NULL,NULL,NULL,0,1,NULL,NULL,0,0,0,1,12,0,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,0.000,NULL,0.000,NULL,NULL,'de_DE',NULL,NULL,1,'printcompany.png','','',0,NULL,NULL,'',0,NULL,NULL,NULL,NULL,NULL),(26,0,NULL,'2017-02-21 00:05:05','2017-02-12 23:17:04','Patient SuperIll',1,NULL,NULL,'CU1702-0020',NULL,'411CU17020020',NULL,'',NULL,NULL,0,14,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,'','','','','',NULL,0,NULL,NULL,NULL,3,0,NULL,'',0,0,0,12,12,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0.000,NULL,0.000,NULL,NULL,'en_US','patient@cabinetmed',NULL,1,NULL,'','',0,NULL,NULL,'',0,NULL,NULL,0,'',NULL);
+INSERT INTO `llx_societe` VALUES (1,0,NULL,'2016-01-16 15:21:09','2010-07-08 14:21:44','Indian SAS',1,NULL,NULL,'CU1212-0007','SU1212-0005','7050','6050','1 alalah road',NULL,'Delhi',0,117,NULL,NULL,NULL,NULL,NULL,NULL,4,NULL,'0','','','','','',5000,1,NULL,NULL,NULL,1,1,NULL,NULL,0,0,0,1,12,0,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,0.000,NULL,0.000,NULL,NULL,'en_IN',NULL,NULL,1,'indiancompany.png','','',0,NULL,NULL,'',0,NULL,NULL,NULL,NULL,NULL),(2,0,NULL,'2016-07-30 11:45:49','2010-07-08 14:23:48','Teclib',1,NULL,NULL,'CU1108-0001','SU1108-0001','411CU11080001','401SU11080001','',NULL,'Paris',0,1,NULL,NULL,'www.teclib.com',NULL,NULL,4,3,57,'0','123456789','','ACE14','','',400000,0,NULL,NULL,NULL,3,1,NULL,'',0,0,0,1,12,0,NULL,NULL,NULL,NULL,NULL,NULL,1,0,0.000,NULL,0.000,NULL,NULL,'fr_FR',NULL,NULL,1,'teclibcompany.png','','',0,NULL,NULL,'',0,NULL,NULL,0,'',NULL),(3,0,NULL,'2017-02-16 00:47:25','2010-07-08 22:42:12','Spanish Comp',1,NULL,NULL,'SPANISHCOMP','SU1601-0009',NULL,NULL,'1 via mallere',NULL,'Madrid',123,4,NULL,NULL,NULL,NULL,NULL,3,4,408,'0','','','','','',10000,0,NULL,NULL,NULL,1,1,NULL,NULL,0,0,0,1,12,0,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,0.000,NULL,0.000,NULL,NULL,'es_AR',NULL,NULL,1,'spanishcompany.png','','',0,NULL,NULL,'',0,NULL,NULL,NULL,NULL,NULL),(4,0,NULL,'2016-01-22 17:24:53','2010-07-08 22:48:18','Prospector Vaalen',1,NULL,NULL,'CU1303-0014',NULL,NULL,NULL,'',NULL,'Bruxelles',103,2,NULL,NULL,NULL,NULL,NULL,3,4,201,'0','12345678','','','','',0,0,NULL,NULL,NULL,3,0,NULL,'PL_LOW',0,0,0,1,12,0,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,0.000,NULL,0.000,NULL,NULL,NULL,NULL,NULL,1,'valeencompany.png','','',0,NULL,NULL,'',0,NULL,NULL,NULL,NULL,NULL),(5,0,NULL,'2017-02-21 11:01:17','2010-07-08 23:22:57','NoCountry GmBh',1,NULL,NULL,NULL,NULL,NULL,NULL,'',NULL,NULL,0,0,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'0','','','','','',0,0,NULL,NULL,NULL,0,0,NULL,'',0,0,0,1,12,0,NULL,NULL,NULL,NULL,NULL,NULL,1,0,0.000,NULL,0.000,NULL,NULL,NULL,NULL,NULL,1,'nocountrycomp.png','','',0,NULL,NULL,'',0,NULL,NULL,1,'EUR',NULL),(6,0,NULL,'2016-01-16 15:35:56','2010-07-09 00:15:09','Swiss Touch',1,NULL,NULL,'CU1601-0018','SU1601-0010',NULL,NULL,'',NULL,'Genevia',0,6,NULL,NULL,NULL,'swisstouch@example.ch',NULL,2,2,601,'0','','','','','',56000,0,NULL,NULL,NULL,3,1,NULL,NULL,0,0,0,1,12,0,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,0.000,NULL,0.000,NULL,NULL,NULL,NULL,NULL,1,'swisstouch.png','','',0,NULL,NULL,'',0,NULL,NULL,NULL,NULL,NULL),(7,0,NULL,'2016-01-16 15:38:32','2010-07-09 01:24:26','Generic customer',1,NULL,NULL,'CU1302-0011',NULL,NULL,NULL,'',NULL,NULL,0,7,NULL,NULL,NULL,'ttt@ttt.com',NULL,NULL,8,NULL,'0','','','','','',0,0,'Generic customer to use for Point Of Sale module.<br />',NULL,NULL,1,0,NULL,NULL,0,0,0,1,12,0,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,0.000,NULL,0.000,NULL,NULL,NULL,NULL,NULL,1,'genericcustomer.png','','',0,NULL,NULL,'',0,NULL,NULL,NULL,NULL,NULL),(10,0,NULL,'2016-01-16 15:44:20','2010-07-10 15:13:08','NLTechno',1,NULL,NULL,'CU1212-0005','SU1601-0011',NULL,NULL,'',NULL,NULL,0,1,NULL,NULL,NULL,'notanemail@nltechno.com',NULL,1,4,54,'0','493861496','49386149600039','6209Z','22-01-2007','FR123456789',10000,0,NULL,NULL,NULL,1,1,NULL,NULL,0,0,0,1,12,0,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,0.000,NULL,0.000,'123456789012',NULL,'fr_FR',NULL,NULL,1,'logo_nltechno_94x100.png','','',0,NULL,NULL,'The OpenSource company',0,NULL,NULL,NULL,NULL,NULL),(11,0,NULL,'2017-05-12 09:06:31','2010-07-10 18:35:57','Company Corp 1',1,NULL,NULL,'CU1510-0017',NULL,'7051',NULL,'21 Green Hill street','75500','Los Angeles',0,11,'444123456',NULL,'companycorp1.com','companycorp1@example.com','corp1',1,1,NULL,'0','AB1234567','','','','USABS123',10000,0,NULL,NULL,NULL,3,0,NULL,'PL_LOW',0,0,0,1,12,0,NULL,NULL,NULL,NULL,NULL,NULL,1,0,0.000,NULL,0.000,NULL,NULL,'en_US',NULL,NULL,1,'comapnycorp1company.png','','',0,NULL,NULL,'',0,NULL,NULL,1,'EUR',NULL),(12,0,NULL,'2016-01-22 16:41:56','2010-07-11 16:18:08','Dupont Alain',1,NULL,NULL,'CU1601-0019',NULL,NULL,NULL,'',NULL,NULL,0,1,NULL,NULL,NULL,'dalain@example.com',NULL,NULL,0,NULL,'0','','','','','',0,0,NULL,NULL,NULL,1,0,NULL,NULL,0,0,0,1,12,0,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,0.000,NULL,0.000,NULL,NULL,NULL,NULL,NULL,1,'pierrecurie.jpg','','',0,NULL,NULL,'',0,NULL,NULL,NULL,NULL,NULL),(13,0,NULL,'2016-01-22 17:13:16','2010-07-11 17:13:20','Company Corp 2',1,NULL,NULL,NULL,'SU1510-0008',NULL,NULL,'',NULL,NULL,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'0','','','','','',0,0,NULL,NULL,NULL,0,1,NULL,NULL,0,0,0,1,12,0,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,0.000,NULL,0.000,NULL,NULL,NULL,NULL,NULL,1,'companycorp2company.png','','',0,NULL,NULL,'',0,NULL,NULL,NULL,NULL,NULL),(17,0,NULL,'2017-02-15 22:55:34','2011-08-01 02:41:26','Book Keeping Company',1,NULL,NULL,'CU1108-0004','SU1108-0004',NULL,'401SU11080004','The French Company',NULL,NULL,0,1,NULL,NULL,NULL,NULL,NULL,1,0,NULL,'0','','','','','',0,0,NULL,NULL,NULL,0,1,NULL,'',0,0,0,1,12,0,NULL,NULL,NULL,NULL,NULL,NULL,1,0,0.000,NULL,0.000,NULL,NULL,NULL,NULL,NULL,1,'bookkeepercompany.png','','',0,NULL,NULL,'',0,NULL,NULL,1,'EUR',NULL),(19,0,NULL,'2017-02-21 11:51:40','2013-01-12 12:23:05','Magic Food Store',1,NULL,NULL,'CU1301-0008',NULL,NULL,NULL,'65 holdywood boulevard','123456','BigTown',0,4,NULL,'0101',NULL,'myemail@domain.com',NULL,NULL,0,NULL,'0','','','10/10/2010','','',0,0,NULL,NULL,NULL,1,0,NULL,NULL,0,0,0,1,12,0,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0.000,NULL,0.000,NULL,NULL,'en_US','patient@cabinetmed',NULL,1,'magicfoodstore.png','','',0,NULL,NULL,'',0,NULL,'sepamandate',NULL,NULL,NULL),(25,0,NULL,'2016-01-22 17:21:17','2013-03-10 15:47:37','Print Company',1,NULL,NULL,'CU1303-0016','SU1303-0007',NULL,NULL,'21 Gutenberg street','45600','Berlin',0,5,NULL,NULL,NULL,'printcompany@example.com',NULL,NULL,0,NULL,'0','','','','','',0,0,NULL,NULL,NULL,0,1,NULL,NULL,0,0,0,1,12,0,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,0.000,NULL,0.000,NULL,NULL,'de_DE',NULL,NULL,1,'printcompany.png','','',0,NULL,NULL,'',0,NULL,NULL,NULL,NULL,NULL),(26,0,NULL,'2017-02-21 00:05:05','2017-02-12 23:17:04','Patient SuperIll',1,NULL,NULL,'CU1702-0020',NULL,'411CU17020020',NULL,'',NULL,NULL,0,14,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,'','','','','',NULL,0,NULL,NULL,NULL,3,0,NULL,'',0,0,0,12,12,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0.000,NULL,0.000,NULL,NULL,'en_US','patient@cabinetmed',NULL,1,NULL,'','',0,NULL,NULL,'',0,NULL,NULL,0,'',NULL);
 /*!40000 ALTER TABLE `llx_societe` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -8008,14 +8013,9 @@ CREATE TABLE `llx_societe_extrafields` (
   `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   `fk_object` int(11) NOT NULL,
   `import_key` varchar(14) DEFAULT NULL,
-  `anotheraddedfield` varchar(15) DEFAULT NULL,
-  `height` varchar(128) DEFAULT NULL,
-  `weight` varchar(128) DEFAULT NULL,
-  `prof` varchar(128) DEFAULT NULL,
-  `birthdate` date DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_societe_extrafields` (`fk_object`)
-) ENGINE=InnoDB AUTO_INCREMENT=97 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=98 DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -8024,7 +8024,7 @@ CREATE TABLE `llx_societe_extrafields` (
 
 LOCK TABLES `llx_societe_extrafields` WRITE;
 /*!40000 ALTER TABLE `llx_societe_extrafields` DISABLE KEYS */;
-INSERT INTO `llx_societe_extrafields` VALUES (75,'2016-01-22 16:40:03',10,NULL,NULL,NULL,NULL,NULL,NULL),(77,'2016-01-22 16:41:56',12,NULL,NULL,NULL,NULL,NULL,NULL),(78,'2016-01-22 17:11:20',11,NULL,NULL,NULL,NULL,NULL,NULL),(79,'2016-01-22 17:13:16',13,NULL,NULL,NULL,NULL,NULL,NULL),(81,'2016-01-22 17:18:08',19,NULL,NULL,NULL,NULL,NULL,NULL),(82,'2016-01-22 17:21:17',25,NULL,NULL,NULL,NULL,NULL,NULL),(83,'2016-01-22 17:21:51',1,NULL,NULL,NULL,NULL,NULL,NULL),(85,'2016-01-22 17:22:32',3,NULL,NULL,NULL,NULL,NULL,NULL),(86,'2016-01-22 17:24:53',4,NULL,NULL,NULL,NULL,NULL,NULL),(88,'2016-01-22 17:25:26',6,NULL,NULL,NULL,NULL,NULL,NULL),(89,'2016-01-22 17:25:41',7,NULL,NULL,NULL,NULL,NULL,NULL),(92,'2016-07-30 11:45:49',2,NULL,NULL,NULL,NULL,NULL,NULL),(94,'2017-02-15 22:55:34',17,NULL,NULL,NULL,NULL,NULL,NULL),(95,'2017-02-21 00:05:05',26,NULL,NULL,NULL,NULL,NULL,NULL),(96,'2017-02-21 11:01:17',5,NULL,NULL,NULL,NULL,NULL,NULL);
+INSERT INTO `llx_societe_extrafields` VALUES (75,'2016-01-22 16:40:03',10,NULL),(77,'2016-01-22 16:41:56',12,NULL),(79,'2016-01-22 17:13:16',13,NULL),(81,'2016-01-22 17:18:08',19,NULL),(82,'2016-01-22 17:21:17',25,NULL),(83,'2016-01-22 17:21:51',1,NULL),(85,'2016-01-22 17:22:32',3,NULL),(86,'2016-01-22 17:24:53',4,NULL),(88,'2016-01-22 17:25:26',6,NULL),(89,'2016-01-22 17:25:41',7,NULL),(92,'2016-07-30 11:45:49',2,NULL),(94,'2017-02-15 22:55:34',17,NULL),(95,'2017-02-21 00:05:05',26,NULL),(96,'2017-02-21 11:01:17',5,NULL),(97,'2017-05-12 09:06:31',11,NULL);
 /*!40000 ALTER TABLE `llx_societe_extrafields` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -8251,7 +8251,7 @@ CREATE TABLE `llx_socpeople` (
   KEY `idx_socpeople_fk_user_creat` (`fk_user_creat`),
   CONSTRAINT `fk_socpeople_fk_soc` FOREIGN KEY (`fk_soc`) REFERENCES `llx_societe` (`rowid`),
   CONSTRAINT `fk_socpeople_user_creat_user_rowid` FOREIGN KEY (`fk_user_creat`) REFERENCES `llx_user` (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=11 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=13 DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -8260,7 +8260,7 @@ CREATE TABLE `llx_socpeople` (
 
 LOCK TABLES `llx_socpeople` WRITE;
 /*!40000 ALTER TABLE `llx_socpeople` DISABLE KEYS */;
-INSERT INTO `llx_socpeople` VALUES (1,'2010-07-08 14:26:14','2016-01-16 15:07:51',1,1,NULL,'MR','Indra','Mahala','','','',297,117,'2010-07-08','Project leader','','','','','','','',NULL,0,0,1,12,'Met during a congress at Dubai','',NULL,NULL,NULL,1),(2,'2010-07-08 22:44:50','2010-07-08 20:59:57',NULL,1,NULL,'MR','Freeman','Public','','','',200,11,NULL,'','','','','','','',NULL,NULL,0,0,1,1,'A friend that is a free contact not linked to any company',NULL,NULL,NULL,NULL,1),(3,'2010-07-08 22:59:02','2016-01-22 17:30:07',NULL,1,NULL,'MR','Mywife','Nicy','','','',NULL,11,'1980-10-03','','','','','','','','',NULL,1,0,1,12,'This is a private contact','',NULL,NULL,NULL,1),(4,'2010-07-09 00:16:58','2010-07-08 22:16:58',6,1,NULL,'MR','Rotchield','Evan','','','',NULL,6,NULL,'Bank director','','','','','','',NULL,NULL,0,0,1,1,'The bank director',NULL,NULL,NULL,NULL,1),(6,'2011-08-01 02:41:26','2016-01-22 17:29:53',17,1,NULL,'','Bookkeeper','Bob','99 account street','123456','BigTown',NULL,4,NULL,'book keeper','','','','','','','',NULL,0,0,1,12,'','',NULL,NULL,NULL,1),(7,'2016-07-30 16:11:06','2016-07-30 12:16:07',NULL,1,'','MR','Dad','','','','',NULL,14,'1967-09-04','','','','','','','','','',1,0,12,12,'','',NULL,NULL,NULL,1),(8,'2016-07-30 16:13:03','2016-07-30 12:15:58',NULL,1,'','MLE','Mom','','','','',NULL,14,NULL,'','','','','','','','','',1,0,12,12,'','',NULL,NULL,NULL,1),(9,'2016-07-30 16:14:41','2016-07-30 12:15:51',NULL,1,'','MR','Francky','','','89455','Virigia',NULL,205,'1980-07-09','Baker','555-98989898','','','','francky@example.com','','','',0,0,12,12,'','',NULL,NULL,NULL,1),(10,'2016-07-30 16:26:22','2016-07-30 12:52:38',10,1,'','MR','Eldy','','','33600','Pessac',NULL,1,'1972-10-10','Dolibarr project leader','','','','','eldy@example.com','','','ldestailleur_200x200.jpg',0,0,NULL,12,'','',NULL,NULL,NULL,1);
+INSERT INTO `llx_socpeople` VALUES (1,'2010-07-08 14:26:14','2016-01-16 15:07:51',1,1,NULL,'MR','Indra','Mahala','','','',297,117,'2010-07-08','Project leader','','','','','','','',NULL,0,0,1,12,'Met during a congress at Dubai','',NULL,NULL,NULL,1),(2,'2010-07-08 22:44:50','2010-07-08 20:59:57',NULL,1,NULL,'MR','Freeman','Public','','','',200,11,NULL,'','','','','','','',NULL,NULL,0,0,1,1,'A friend that is a free contact not linked to any company',NULL,NULL,NULL,NULL,1),(3,'2010-07-08 22:59:02','2016-01-22 17:30:07',NULL,1,NULL,'MR','Mywife','Nicy','','','',NULL,11,'1980-10-03','','','','','','','','',NULL,1,0,1,12,'This is a private contact','',NULL,NULL,NULL,1),(4,'2010-07-09 00:16:58','2010-07-08 22:16:58',6,1,NULL,'MR','Rotchield','Evan','','','',NULL,6,NULL,'Bank director','','','','','','',NULL,NULL,0,0,1,1,'The bank director',NULL,NULL,NULL,NULL,1),(6,'2011-08-01 02:41:26','2016-01-22 17:29:53',17,1,NULL,'','Bookkeeper','Bob','99 account street','123456','BigTown',NULL,4,NULL,'book keeper','','','','','','','',NULL,0,0,1,12,'','',NULL,NULL,NULL,1),(7,'2016-07-30 16:11:06','2016-07-30 12:16:07',NULL,1,'','MR','Dad','','','','',NULL,14,'1967-09-04','','','','','','','','','',1,0,12,12,'','',NULL,NULL,NULL,1),(8,'2016-07-30 16:13:03','2016-07-30 12:15:58',NULL,1,'','MLE','Mom','','','','',NULL,14,NULL,'','','','','','','','','',1,0,12,12,'','',NULL,NULL,NULL,1),(9,'2016-07-30 16:14:41','2016-07-30 12:15:51',NULL,1,'','MR','Francky','','','89455','Virigia',NULL,205,'1980-07-09','Baker','555-98989898','','','','francky@example.com','','','',0,0,12,12,'','',NULL,NULL,NULL,1),(10,'2016-07-30 16:26:22','2016-07-30 12:52:38',10,1,'','MR','Eldy','','','33600','Pessac',NULL,1,'1972-10-10','Dolibarr project leader','','','','','eldy@example.com','','','ldestailleur_200x200.jpg',0,0,NULL,12,'','',NULL,NULL,NULL,1),(11,'2017-05-12 13:16:36','2017-05-12 09:18:20',11,1,'','MR','Smith','Laurent','45 Big road','897','Seattle',NULL,11,NULL,'Director','','','','','','','','ldestailleur_200x200.png',0,0,12,12,'','',NULL,NULL,NULL,1),(12,'2017-05-12 13:19:31','2017-05-12 09:19:42',11,1,'','MR','Einstein','','','','',NULL,11,NULL,'Genius','333444555','','','','genius@example.com','','','Einstein.jpg',0,0,12,12,'','',NULL,NULL,NULL,1);
 /*!40000 ALTER TABLE `llx_socpeople` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -8494,6 +8494,7 @@ CREATE TABLE `llx_supplier_proposaldet` (
   `multicurrency_total_ht` double(24,8) DEFAULT '0.00000000',
   `multicurrency_total_tva` double(24,8) DEFAULT '0.00000000',
   `multicurrency_total_ttc` double(24,8) DEFAULT '0.00000000',
+  `fk_unit` int(11) DEFAULT NULL,
   PRIMARY KEY (`rowid`)
 ) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -8504,7 +8505,7 @@ CREATE TABLE `llx_supplier_proposaldet` (
 
 LOCK TABLES `llx_supplier_proposaldet` WRITE;
 /*!40000 ALTER TABLE `llx_supplier_proposaldet` DISABLE KEYS */;
-INSERT INTO `llx_supplier_proposaldet` VALUES (2,2,NULL,NULL,NULL,'A powerfull computer with 8Gb memory.',NULL,0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,200.00000000,200.00000000,0.00000000,0.00000000,0.00000000,200.00000000,0,0,0.00000000,NULL,0,1,'',1,'EUR',200.00000000,200.00000000,0.00000000,200.00000000);
+INSERT INTO `llx_supplier_proposaldet` VALUES (2,2,NULL,NULL,NULL,'A powerfull computer with 8Gb memory.',NULL,0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,200.00000000,200.00000000,0.00000000,0.00000000,0.00000000,200.00000000,0,0,0.00000000,NULL,0,1,'',1,'EUR',200.00000000,200.00000000,0.00000000,200.00000000,NULL);
 /*!40000 ALTER TABLE `llx_supplier_proposaldet` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -8652,7 +8653,7 @@ CREATE TABLE `llx_user` (
 
 LOCK TABLES `llx_user` WRITE;
 /*!40000 ALTER TABLE `llx_user` DISABLE KEYS */;
-INSERT INTO `llx_user` VALUES (1,'2010-07-08 13:20:11','2017-02-01 15:06:04',NULL,NULL,'aeinstein',0,NULL,NULL,NULL,1,0,NULL,'11c9c772d6471aa24c27274bdd8a223b',NULL,NULL,'Einstein','Albert','','','123456789','','','aeinstein@example.com','',0,'',1,1,NULL,NULL,NULL,'','2015-10-05 08:32:44','2015-10-03 11:43:50',NULL,'',1,'alberteinstein.jpg',NULL,NULL,14,NULL,'','','',NULL,NULL,'aaaaff','',NULL,0,0,NULL,NULL,NULL,NULL,'man',NULL,NULL),(2,'2010-07-08 13:54:48','2017-02-01 15:06:04',NULL,NULL,'demo',1,NULL,NULL,NULL,1,0,NULL,'fe01ce2a7fbac8fafaed7c982a04e229',NULL,NULL,'Doe','David','','','09123123','','','daviddoe@mycompany.com','',0,'',1,1,NULL,NULL,NULL,'','2016-07-30 23:10:54','2016-07-30 23:04:17',NULL,'',1,'johndoe.png',NULL,NULL,11,NULL,'','','',NULL,NULL,'','',NULL,0,0,NULL,NULL,NULL,NULL,'man',NULL,NULL),(3,'2010-07-11 16:18:59','2017-02-01 15:06:04',NULL,NULL,'pcurie',1,NULL,NULL,NULL,1,0,NULL,'ab335b4eb4c3c99334f656e5db9584c9',NULL,NULL,'Curie','Pierre','','','','','','pcurie@example.com','',0,'',1,1,NULL,NULL,2,'','2012-12-21 17:38:55',NULL,NULL,'',1,'pierrecurie.jpg',NULL,NULL,14,NULL,'','','',NULL,NULL,'','',NULL,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(4,'2013-01-23 17:52:27','2017-02-01 15:06:04',NULL,NULL,'bbookkeeper',1,NULL,NULL,NULL,1,0,NULL,'a7d30b58d647fcf59b7163f9592b1dbb',NULL,NULL,'Bookkeeper','Bob','Bookkeeper','','','','','','',0,'',1,1,17,6,NULL,'','2013-02-25 10:18:41','2013-01-23 17:53:20',NULL,'',1,NULL,NULL,NULL,11,NULL,'','','',NULL,NULL,'','',NULL,0,0,NULL,NULL,NULL,NULL,'man',NULL,NULL),(10,'2015-10-03 11:47:41','2017-02-01 15:06:04',NULL,NULL,'mcurie',1,NULL,NULL,NULL,1,0,NULL,'52cda011808bb282d1d3625ab607a145',NULL,'t3mnkbhs','Curie','Marie','','','','','','','',0,NULL,1,1,NULL,NULL,NULL,'',NULL,NULL,NULL,'',1,'mariecurie.jpg',NULL,NULL,14,NULL,'','','',NULL,NULL,'ffaaff','',NULL,0,0,NULL,NULL,NULL,NULL,'woman',NULL,NULL),(11,'2015-10-05 09:07:52','2017-02-01 15:06:04',NULL,NULL,'zzeceo',1,NULL,NULL,NULL,1,0,NULL,'92af989c4c3a5140fb5d73eb77a52454',NULL,'cq78nf9m','Zeceo','Zack','President','','','','','','',0,NULL,1,1,NULL,NULL,NULL,'','2015-10-05 22:48:08','2015-10-05 21:18:46',NULL,'',1,NULL,NULL,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(12,'2015-10-05 09:09:46','2017-02-01 15:06:04',NULL,NULL,'admin',0,NULL,NULL,NULL,1,0,NULL,'21232f297a57a5a743894a0e4a801fc3',NULL,'nd6hgbcr','Adminson','Alice','Admin Technical','','','','','','',1,NULL,1,1,NULL,NULL,NULL,'','2017-02-21 15:44:05','2017-02-21 14:30:22',NULL,'',1,'mariecurie.jpg',NULL,NULL,11,NULL,'','','',NULL,NULL,'','',NULL,0,0,NULL,NULL,NULL,NULL,'woman',NULL,NULL),(13,'2015-10-05 21:29:35','2017-02-01 15:06:04',NULL,NULL,'ccommercy',1,NULL,NULL,NULL,1,0,NULL,'179858e041af35e8f4c81d68c55fe9da',NULL,'y451ksdv','Commercy','Charle','Commercial leader','','','','','','',0,NULL,1,1,NULL,NULL,NULL,'',NULL,NULL,NULL,'',1,NULL,NULL,NULL,11,NULL,'','','',NULL,NULL,'','',NULL,0,0,NULL,NULL,NULL,NULL,'man',NULL,NULL),(14,'2015-10-05 21:33:33','2017-02-01 15:06:04',NULL,NULL,'sscientol',1,NULL,NULL,NULL,1,0,NULL,'39bee07ac42f31c98e79cdcd5e5fe4c5',NULL,'s2hp8bxd','Scientol','Sam','Scientist leader','','','','','','',0,NULL,1,1,NULL,NULL,NULL,'',NULL,NULL,NULL,'',1,NULL,NULL,NULL,11,NULL,'','','',NULL,NULL,'','',NULL,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(16,'2015-10-05 22:47:52','2017-02-20 16:49:00',NULL,NULL,'ccommerson',1,NULL,NULL,NULL,1,0,NULL,'d68005ccf362b82d084551b6291792a3',NULL,'cx9y1dk0','Charle1','Commerson','Sale representative','','','','','','',0,NULL,1,1,NULL,NULL,NULL,'','2015-10-05 23:46:24','2015-10-05 23:37:31',NULL,'',1,NULL,NULL,NULL,13,NULL,'','','',NULL,NULL,'','',NULL,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(17,'2015-10-05 22:48:39','2017-02-01 15:06:04',NULL,NULL,'cc2',1,NULL,NULL,NULL,1,0,NULL,'a964065211872fb76f876c6c3e952ea3',NULL,'gw8cb7xj','Charle2','Commerson','Sale representative','','','','','','',0,NULL,1,1,NULL,NULL,NULL,'','2015-10-05 23:16:06',NULL,NULL,'',0,NULL,NULL,NULL,13,NULL,'','','',NULL,NULL,'','',NULL,0,0,NULL,NULL,NULL,NULL,'man',NULL,NULL),(18,'2016-01-22 17:27:02','2017-02-01 15:06:04',NULL,NULL,'ldestailleur',1,NULL,NULL,NULL,1,0,NULL,'1bb7805145a7a5066df9e6d585b8b645',NULL,'87g06wbx','Destailleur','Laurent','Project leader of Dolibarr ERP CRM','','','','','ldestailleur@example.com','<div style=\"line-height: 20.8px;\"><strong>Laurent DESTAILLEUR</strong></div>\r\n\r\n<div style=\"line-height: 20.8px;\">\r\n<div style=\"font-family: verdana, helvetica, sans-serif;\"><span style=\"color:rgb(96, 97, 99); font-family:arial; font-size:medium\"><strong>Project Director</strong></span><br />\r\n<span style=\"color:rgb(51, 102, 153)\"><span style=\"color:rgb(153, 51, 153); font-family:tahoma,new york,times,serif\"><span style=\"color:rgb(51, 102, 153)\">ldestailleur@example.com</span></span></span></div>\r\n\r\n<div style=\"font-family: verdana, helvetica, sans-serif;\">&nbsp;</div>\r\n\r\n<div style=\"font-family: verdana, helvetica, sans-serif;\">\r\n<div style=\"color: rgb(0, 0, 0);\"><span style=\"color:rgb(153, 51, 153); font-family:arial,helvetica,sans-serif; font-size:small\"><span style=\"color:rgb(51, 102, 153)\"><a href=\"http://www.facebook.com/teclib\" style=\"color: rgb(153, 51, 153); text-decoration: none; cursor: pointer;\" target=\"_blank\">Facebook</a></span>&nbsp;|&nbsp;<span style=\"color:rgb(51, 102, 153)\"><a href=\"http://twitter.com/teclib\" style=\"color: rgb(153, 51, 153); text-decoration: none; cursor: pointer;\" target=\"_blank\">Twitter</a></span>&nbsp;|&nbsp;<span style=\"color:rgb(51, 102, 153)\"><span style=\"color:rgb(153, 51, 153)\"><a href=\"http://www.teclib.com/\" style=\"color: rgb(153, 51, 153); text-decoration: none; cursor: pointer;\" target=\"_blank\">www.teclib.com</a></span></span></span></div>\r\n</div>\r\n</div>',0,NULL,1,1,10,10,NULL,'More information on http://www.destailleur.fr','2016-07-30 22:26:58',NULL,NULL,'',1,'ldestailleur_200x200.jpg',NULL,NULL,NULL,NULL,'','','',NULL,NULL,'007f7f','',NULL,0,0,NULL,NULL,NULL,NULL,'man',NULL,NULL),(19,'2017-02-02 03:55:44','2017-02-01 23:56:50',NULL,NULL,'aboston',1,NULL,NULL,NULL,1,0,NULL,'a7a77a5aff2d5fc2f75f2f61507c88d4',NULL,NULL,'Boston','Alex','','','','','','aboston@example.com','<strong>Alex Boston</strong><br />\r\nAdmin support service - 555 01 02 03 04',0,NULL,1,1,NULL,NULL,NULL,'',NULL,NULL,NULL,'',1,NULL,NULL,NULL,12,25.00000000,'','','',NULL,NULL,'ff00ff','',NULL,0,0,NULL,NULL,NULL,32.00000000,NULL,NULL,'2014-11-04 00:00:00');
+INSERT INTO `llx_user` VALUES (1,'2010-07-08 13:20:11','2017-02-01 15:06:04',NULL,NULL,'aeinstein',0,NULL,NULL,NULL,1,0,NULL,'11c9c772d6471aa24c27274bdd8a223b',NULL,NULL,'Einstein','Albert','','','123456789','','','aeinstein@example.com','',0,'',1,1,NULL,NULL,NULL,'','2015-10-05 08:32:44','2015-10-03 11:43:50',NULL,'',1,'alberteinstein.jpg',NULL,NULL,14,NULL,'','','',NULL,NULL,'aaaaff','',NULL,0,0,NULL,NULL,NULL,NULL,'man',NULL,NULL),(2,'2010-07-08 13:54:48','2017-02-01 15:06:04',NULL,NULL,'demo',1,NULL,NULL,NULL,1,0,NULL,'fe01ce2a7fbac8fafaed7c982a04e229',NULL,NULL,'Doe','David','','','09123123','','','daviddoe@mycompany.com','',0,'',1,1,NULL,NULL,NULL,'','2016-07-30 23:10:54','2016-07-30 23:04:17',NULL,'',1,'johndoe.png',NULL,NULL,11,NULL,'','','',NULL,NULL,'','',NULL,0,0,NULL,NULL,NULL,NULL,'man',NULL,NULL),(3,'2010-07-11 16:18:59','2017-02-01 15:06:04',NULL,NULL,'pcurie',1,NULL,NULL,NULL,1,0,NULL,'ab335b4eb4c3c99334f656e5db9584c9',NULL,NULL,'Curie','Pierre','','','','','','pcurie@example.com','',0,'',1,1,NULL,NULL,2,'','2012-12-21 17:38:55',NULL,NULL,'',1,'pierrecurie.jpg',NULL,NULL,14,NULL,'','','',NULL,NULL,'','',NULL,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(4,'2013-01-23 17:52:27','2017-02-01 15:06:04',NULL,NULL,'bbookkeeper',1,NULL,NULL,NULL,1,0,NULL,'a7d30b58d647fcf59b7163f9592b1dbb',NULL,NULL,'Bookkeeper','Bob','Bookkeeper','','','','','','',0,'',1,1,17,6,NULL,'','2013-02-25 10:18:41','2013-01-23 17:53:20',NULL,'',1,NULL,NULL,NULL,11,NULL,'','','',NULL,NULL,'','',NULL,0,0,NULL,NULL,NULL,NULL,'man',NULL,NULL),(10,'2015-10-03 11:47:41','2017-02-01 15:06:04',NULL,NULL,'mcurie',1,NULL,NULL,NULL,1,0,NULL,'52cda011808bb282d1d3625ab607a145',NULL,'t3mnkbhs','Curie','Marie','','','','','','','',0,NULL,1,1,NULL,NULL,NULL,'',NULL,NULL,NULL,'',1,'mariecurie.jpg',NULL,NULL,14,NULL,'','','',NULL,NULL,'ffaaff','',NULL,0,0,NULL,NULL,NULL,NULL,'woman',NULL,NULL),(11,'2015-10-05 09:07:52','2017-02-01 15:06:04',NULL,NULL,'zzeceo',1,NULL,NULL,NULL,1,0,NULL,'92af989c4c3a5140fb5d73eb77a52454',NULL,'cq78nf9m','Zeceo','Zack','President','','','','','','',0,NULL,1,1,NULL,NULL,NULL,'','2015-10-05 22:48:08','2015-10-05 21:18:46',NULL,'',1,NULL,NULL,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(12,'2015-10-05 09:09:46','2017-02-01 15:06:04',NULL,NULL,'admin',0,NULL,NULL,NULL,1,0,NULL,'21232f297a57a5a743894a0e4a801fc3',NULL,'nd6hgbcr','Adminson','Alice','Admin Technical','','','','','','',1,NULL,1,1,NULL,NULL,NULL,'','2017-05-12 13:02:48','2017-02-21 15:44:05',NULL,'',1,'mariecurie.jpg',NULL,NULL,11,NULL,'','','',NULL,NULL,'','',NULL,0,0,NULL,NULL,NULL,NULL,'woman',NULL,NULL),(13,'2015-10-05 21:29:35','2017-02-01 15:06:04',NULL,NULL,'ccommercy',1,NULL,NULL,NULL,1,0,NULL,'179858e041af35e8f4c81d68c55fe9da',NULL,'y451ksdv','Commercy','Charle','Commercial leader','','','','','','',0,NULL,1,1,NULL,NULL,NULL,'',NULL,NULL,NULL,'',1,NULL,NULL,NULL,11,NULL,'','','',NULL,NULL,'','',NULL,0,0,NULL,NULL,NULL,NULL,'man',NULL,NULL),(14,'2015-10-05 21:33:33','2017-02-01 15:06:04',NULL,NULL,'sscientol',1,NULL,NULL,NULL,1,0,NULL,'39bee07ac42f31c98e79cdcd5e5fe4c5',NULL,'s2hp8bxd','Scientol','Sam','Scientist leader','','','','','','',0,NULL,1,1,NULL,NULL,NULL,'',NULL,NULL,NULL,'',1,NULL,NULL,NULL,11,NULL,'','','',NULL,NULL,'','',NULL,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(16,'2015-10-05 22:47:52','2017-02-20 16:49:00',NULL,NULL,'ccommerson',1,NULL,NULL,NULL,1,0,NULL,'d68005ccf362b82d084551b6291792a3',NULL,'cx9y1dk0','Charle1','Commerson','Sale representative','','','','','','',0,NULL,1,1,NULL,NULL,NULL,'','2015-10-05 23:46:24','2015-10-05 23:37:31',NULL,'',1,NULL,NULL,NULL,13,NULL,'','','',NULL,NULL,'','',NULL,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(17,'2015-10-05 22:48:39','2017-02-01 15:06:04',NULL,NULL,'cc2',1,NULL,NULL,NULL,1,0,NULL,'a964065211872fb76f876c6c3e952ea3',NULL,'gw8cb7xj','Charle2','Commerson','Sale representative','','','','','','',0,NULL,1,1,NULL,NULL,NULL,'','2015-10-05 23:16:06',NULL,NULL,'',0,NULL,NULL,NULL,13,NULL,'','','',NULL,NULL,'','',NULL,0,0,NULL,NULL,NULL,NULL,'man',NULL,NULL),(18,'2016-01-22 17:27:02','2017-02-01 15:06:04',NULL,NULL,'ldestailleur',1,NULL,NULL,NULL,1,0,NULL,'1bb7805145a7a5066df9e6d585b8b645',NULL,'87g06wbx','Destailleur','Laurent','Project leader of Dolibarr ERP CRM','','','','','ldestailleur@example.com','<div style=\"line-height: 20.8px;\"><strong>Laurent DESTAILLEUR</strong></div>\r\n\r\n<div style=\"line-height: 20.8px;\">\r\n<div style=\"font-family: verdana, helvetica, sans-serif;\"><span style=\"color:rgb(96, 97, 99); font-family:arial; font-size:medium\"><strong>Project Director</strong></span><br />\r\n<span style=\"color:rgb(51, 102, 153)\"><span style=\"color:rgb(153, 51, 153); font-family:tahoma,new york,times,serif\"><span style=\"color:rgb(51, 102, 153)\">ldestailleur@example.com</span></span></span></div>\r\n\r\n<div style=\"font-family: verdana, helvetica, sans-serif;\">&nbsp;</div>\r\n\r\n<div style=\"font-family: verdana, helvetica, sans-serif;\">\r\n<div style=\"color: rgb(0, 0, 0);\"><span style=\"color:rgb(153, 51, 153); font-family:arial,helvetica,sans-serif; font-size:small\"><span style=\"color:rgb(51, 102, 153)\"><a href=\"http://www.facebook.com/teclib\" style=\"color: rgb(153, 51, 153); text-decoration: none; cursor: pointer;\" target=\"_blank\">Facebook</a></span>&nbsp;|&nbsp;<span style=\"color:rgb(51, 102, 153)\"><a href=\"http://twitter.com/teclib\" style=\"color: rgb(153, 51, 153); text-decoration: none; cursor: pointer;\" target=\"_blank\">Twitter</a></span>&nbsp;|&nbsp;<span style=\"color:rgb(51, 102, 153)\"><span style=\"color:rgb(153, 51, 153)\"><a href=\"http://www.teclib.com/\" style=\"color: rgb(153, 51, 153); text-decoration: none; cursor: pointer;\" target=\"_blank\">www.teclib.com</a></span></span></span></div>\r\n</div>\r\n</div>',0,NULL,1,1,10,10,NULL,'More information on http://www.destailleur.fr','2016-07-30 22:26:58',NULL,NULL,'',1,'ldestailleur_200x200.jpg',NULL,NULL,NULL,NULL,'','','',NULL,NULL,'007f7f','',NULL,0,0,NULL,NULL,NULL,NULL,'man',NULL,NULL),(19,'2017-02-02 03:55:44','2017-02-01 23:56:50',NULL,NULL,'aboston',1,NULL,NULL,NULL,1,0,NULL,'a7a77a5aff2d5fc2f75f2f61507c88d4',NULL,NULL,'Boston','Alex','','','','','','aboston@example.com','<strong>Alex Boston</strong><br />\r\nAdmin support service - 555 01 02 03 04',0,NULL,1,1,NULL,NULL,NULL,'',NULL,NULL,NULL,'',1,NULL,NULL,NULL,12,25.00000000,'','','',NULL,NULL,'ff00ff','',NULL,0,0,NULL,NULL,NULL,32.00000000,NULL,NULL,'2014-11-04 00:00:00');
 /*!40000 ALTER TABLE `llx_user` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -8851,7 +8852,7 @@ CREATE TABLE `llx_user_rights` (
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_user_rights` (`fk_user`,`fk_id`),
   CONSTRAINT `fk_user_rights_fk_user_user` FOREIGN KEY (`fk_user`) REFERENCES `llx_user` (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=15469 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=15505 DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -8860,7 +8861,7 @@ CREATE TABLE `llx_user_rights` (
 
 LOCK TABLES `llx_user_rights` WRITE;
 /*!40000 ALTER TABLE `llx_user_rights` DISABLE KEYS */;
-INSERT INTO `llx_user_rights` VALUES (12402,1,11),(12380,1,12),(12385,1,13),(12389,1,14),(12393,1,15),(12398,1,16),(12404,1,19),(9726,1,21),(9700,1,22),(9706,1,24),(9711,1,25),(9716,1,26),(9722,1,27),(9728,1,28),(9978,1,31),(9968,1,32),(9974,1,34),(1910,1,36),(9980,1,38),(11573,1,41),(11574,1,42),(11575,1,44),(11576,1,45),(7184,1,61),(7181,1,62),(7183,1,64),(7185,1,67),(7186,1,68),(1678,1,71),(1673,1,72),(1675,1,74),(1679,1,75),(1677,1,76),(1681,1,78),(1682,1,79),(12322,1,81),(12309,1,82),(12312,1,84),(12314,1,86),(12317,1,87),(12320,1,88),(12323,1,89),(11580,1,91),(11581,1,92),(11582,1,93),(11583,1,94),(10097,1,95),(10099,1,96),(10103,1,97),(10104,1,98),(7139,1,101),(7134,1,102),(7136,1,104),(7137,1,105),(7138,1,106),(7140,1,109),(10229,1,111),(10201,1,112),(10207,1,113),(10213,1,114),(10219,1,115),(10225,1,116),(10231,1,117),(12518,1,121),(12508,1,122),(12514,1,125),(12520,1,126),(11577,1,141),(11578,1,142),(11579,1,144),(2307,1,151),(2304,1,152),(2306,1,153),(2308,1,154),(10092,1,161),(10093,1,162),(10094,1,163),(10095,1,164),(10096,1,165),(1585,1,170),(12342,1,171),(12331,1,172),(12335,1,173),(12339,1,174),(12343,1,178),(10000,1,221),(9990,1,222),(9996,1,223),(10002,1,229),(10007,1,237),(10011,1,238),(10015,1,239),(1686,1,241),(1685,1,242),(1687,1,243),(12604,1,251),(12566,1,252),(12569,1,253),(12572,1,254),(12575,1,255),(12579,1,256),(1617,1,258),(12525,1,262),(12544,1,281),(12534,1,282),(12540,1,283),(12546,1,286),(12288,1,300),(12290,1,301),(11591,1,302),(1763,1,331),(1762,1,332),(1764,1,333),(12582,1,341),(12584,1,342),(12586,1,343),(12588,1,344),(12600,1,351),(12593,1,352),(12597,1,353),(12601,1,354),(12605,1,358),(12560,1,531),(12553,1,532),(12557,1,534),(1625,1,536),(12561,1,538),(12358,1,700),(12348,1,701),(12354,1,702),(12360,1,703),(1755,1,1001),(1754,1,1002),(1756,1,1003),(1758,1,1004),(1759,1,1005),(7146,1,1101),(7143,1,1102),(7145,1,1104),(7147,1,1109),(12412,1,1181),(12458,1,1182),(12417,1,1183),(12420,1,1184),(12423,1,1185),(12427,1,1186),(12431,1,1187),(12437,1,1188),(12434,1,1189),(1578,1,1201),(1579,1,1202),(12454,1,1231),(12443,1,1232),(12446,1,1233),(12449,1,1234),(12452,1,1235),(12455,1,1236),(12459,1,1237),(1736,1,1251),(12409,1,1321),(12326,1,1421),(8190,1,1791),(8187,1,1792),(8191,1,1793),(12264,1,2401),(12260,1,2402),(12266,1,2403),(12280,1,2411),(12276,1,2412),(12282,1,2413),(12286,1,2414),(1618,1,2500),(12370,1,2501),(12367,1,2503),(12371,1,2515),(9610,1,5001),(9611,1,5002),(12490,1,20001),(12468,1,20002),(12474,1,20003),(12480,1,20004),(12486,1,20005),(12492,1,20006),(12302,1,23001),(12295,1,23002),(12299,1,23003),(12303,1,23004),(7701,1,50101),(4984,1,50401),(4983,1,50402),(4985,1,50403),(4987,1,50411),(4988,1,50412),(4989,1,50415),(12498,1,55001),(12499,1,55002),(3564,1,100700),(3565,1,100701),(9596,1,101051),(9598,1,101052),(9600,1,101053),(9604,1,101060),(9605,1,101061),(7177,1,101201),(7178,1,101202),(10353,1,101250),(10355,1,101251),(8980,1,101261),(8981,1,101262),(7616,1,101331),(10030,1,101701),(10031,1,101702),(3582,1,102000),(3583,1,102001),(9819,1,400051),(9823,1,400052),(9827,1,400053),(9831,1,400055),(132,2,11),(133,2,12),(134,2,13),(135,2,14),(136,2,16),(137,2,19),(138,2,21),(139,2,22),(140,2,24),(141,2,25),(142,2,26),(143,2,27),(10359,2,31),(145,2,32),(10361,2,34),(146,2,36),(147,2,41),(148,2,42),(149,2,44),(150,2,61),(151,2,62),(152,2,64),(153,2,71),(154,2,72),(155,2,74),(156,2,75),(157,2,78),(158,2,79),(159,2,81),(160,2,82),(161,2,84),(162,2,86),(163,2,87),(164,2,88),(165,2,89),(166,2,91),(167,2,92),(168,2,93),(2475,2,95),(2476,2,96),(2477,2,97),(2478,2,98),(169,2,101),(170,2,102),(171,2,104),(172,2,109),(173,2,111),(174,2,112),(175,2,113),(176,2,114),(177,2,116),(178,2,117),(179,2,121),(180,2,122),(181,2,125),(182,2,141),(183,2,142),(184,2,144),(2479,2,151),(2480,2,152),(2481,2,153),(2482,2,154),(185,2,161),(186,2,162),(187,2,163),(188,2,164),(189,2,165),(190,2,170),(2471,2,171),(192,2,172),(2472,2,173),(193,2,221),(194,2,222),(195,2,229),(196,2,241),(197,2,242),(198,2,243),(199,2,251),(201,2,262),(202,2,281),(203,2,282),(204,2,283),(205,2,331),(15072,2,510),(2483,2,531),(207,2,532),(2484,2,534),(208,2,536),(2473,2,700),(210,2,701),(211,2,702),(2474,2,703),(15064,2,771),(15057,2,772),(15059,2,773),(15061,2,774),(15063,2,775),(15065,2,776),(212,2,1001),(213,2,1002),(214,2,1003),(215,2,1004),(216,2,1005),(217,2,1101),(218,2,1102),(219,2,1104),(220,2,1109),(15073,2,1121),(15074,2,1122),(15075,2,1123),(15076,2,1124),(15077,2,1125),(15078,2,1126),(221,2,1181),(222,2,1182),(223,2,1183),(224,2,1184),(225,2,1185),(226,2,1186),(227,2,1187),(228,2,1188),(229,2,1201),(230,2,1202),(231,2,1231),(232,2,1232),(233,2,1233),(234,2,1234),(235,2,1421),(236,2,2401),(237,2,2402),(238,2,2403),(239,2,2411),(240,2,2412),(241,2,2413),(242,2,2500),(2470,2,2501),(243,2,2515),(10363,2,20001),(10364,2,20002),(10365,2,20003),(10366,2,20004),(10367,2,20005),(10368,2,20006),(15054,2,23001),(10362,2,50101),(15067,2,55001),(15066,2,59001),(15068,2,63001),(15069,2,63002),(15070,2,63003),(15071,2,63004),(10372,2,101250),(1807,3,11),(1808,3,31),(1809,3,36),(1810,3,41),(1811,3,61),(1812,3,71),(1813,3,72),(1814,3,74),(1815,3,75),(1816,3,78),(1817,3,79),(1818,3,91),(1819,3,95),(1820,3,97),(1821,3,111),(1822,3,121),(1823,3,122),(1824,3,125),(1825,3,161),(1826,3,170),(1827,3,171),(1828,3,172),(1829,3,221),(1830,3,222),(1831,3,229),(1832,3,241),(1833,3,242),(1834,3,243),(1835,3,251),(1836,3,255),(1837,3,256),(1838,3,262),(1839,3,281),(1840,3,282),(1841,3,283),(1842,3,331),(1843,3,531),(1844,3,536),(1845,3,700),(1846,3,1001),(1847,3,1002),(1848,3,1003),(1849,3,1004),(1850,3,1005),(1851,3,1181),(1852,3,1182),(1853,3,1201),(1854,3,1202),(1855,3,1231),(1856,3,2401),(1857,3,2402),(1858,3,2403),(1859,3,2411),(1860,3,2412),(1861,3,2413),(1862,3,2500),(1863,3,2515),(8026,4,11),(8027,4,21),(8028,4,31),(8029,4,41),(8030,4,61),(8031,4,71),(8032,4,72),(8033,4,74),(8034,4,75),(8035,4,78),(8036,4,79),(8037,4,81),(8038,4,91),(8039,4,95),(8040,4,97),(8041,4,101),(8042,4,111),(8043,4,121),(8044,4,151),(8045,4,161),(8046,4,171),(8047,4,221),(8048,4,222),(8049,4,229),(8050,4,241),(8051,4,242),(8052,4,243),(8146,4,251),(8147,4,253),(8053,4,262),(8054,4,281),(8055,4,331),(8056,4,341),(8057,4,342),(8058,4,343),(8059,4,344),(8060,4,531),(8061,4,700),(8062,4,1001),(8063,4,1002),(8064,4,1003),(8065,4,1004),(8066,4,1005),(8067,4,1101),(8068,4,1181),(8069,4,1182),(8070,4,1201),(8071,4,1202),(8072,4,1231),(8073,4,2401),(8074,4,2501),(8075,4,2503),(8076,4,2515),(8077,4,20001),(8078,4,50101),(8079,4,101201),(8080,4,101261),(8081,4,102000),(8082,4,400051),(8083,4,400052),(8084,4,400053),(8085,4,400055),(12608,10,11),(12609,10,21),(12610,10,31),(12611,10,41),(12612,10,61),(12613,10,71),(12614,10,72),(12615,10,74),(12616,10,75),(12617,10,78),(12618,10,79),(12619,10,81),(12620,10,91),(12621,10,95),(12622,10,97),(12623,10,101),(12624,10,111),(12625,10,121),(12626,10,151),(12627,10,161),(12628,10,171),(12629,10,221),(12630,10,222),(12631,10,229),(12632,10,241),(12633,10,242),(12634,10,243),(12635,10,262),(12636,10,281),(12637,10,300),(12638,10,331),(12639,10,341),(12640,10,342),(12641,10,343),(12642,10,344),(12643,10,531),(12644,10,700),(12645,10,1001),(12646,10,1002),(12647,10,1003),(12648,10,1004),(12649,10,1005),(12650,10,1101),(12651,10,1181),(12652,10,1182),(12653,10,1201),(12654,10,1202),(12655,10,1231),(12656,10,2401),(12657,10,2501),(12658,10,2503),(12659,10,2515),(12660,10,20001),(12661,10,20002),(12662,10,23001),(12663,10,50101),(12664,11,11),(12665,11,21),(12666,11,31),(12667,11,41),(12668,11,61),(12669,11,71),(12670,11,72),(12671,11,74),(12672,11,75),(12673,11,78),(12674,11,79),(12675,11,81),(12676,11,91),(12677,11,95),(12678,11,97),(12679,11,101),(12680,11,111),(12681,11,121),(12682,11,151),(12683,11,161),(12684,11,171),(12685,11,221),(12686,11,222),(12687,11,229),(12688,11,241),(12689,11,242),(12690,11,243),(12691,11,262),(12692,11,281),(12693,11,300),(12694,11,331),(12695,11,341),(12696,11,342),(12697,11,343),(12698,11,344),(12699,11,531),(12700,11,700),(12701,11,1001),(12702,11,1002),(12703,11,1003),(12704,11,1004),(12705,11,1005),(12706,11,1101),(12707,11,1181),(12708,11,1182),(12709,11,1201),(12710,11,1202),(12711,11,1231),(12712,11,2401),(12713,11,2501),(12714,11,2503),(12715,11,2515),(12716,11,20001),(12717,11,20002),(12718,11,23001),(12719,11,50101),(15463,12,11),(15453,12,12),(15455,12,13),(15457,12,14),(15459,12,15),(15462,12,16),(15465,12,19),(14146,12,21),(14135,12,22),(14137,12,24),(14139,12,25),(14142,12,26),(14145,12,27),(14148,12,28),(14930,12,31),(14926,12,32),(14929,12,34),(14932,12,38),(13816,12,41),(13813,12,42),(13815,12,44),(13817,12,45),(14094,12,61),(14091,12,62),(14093,12,64),(14095,12,67),(14096,12,68),(13891,12,71),(13886,12,72),(13888,12,74),(13892,12,75),(13890,12,76),(13894,12,78),(13895,12,79),(14955,12,81),(14949,12,82),(14950,12,84),(14951,12,86),(14953,12,87),(14954,12,88),(14956,12,89),(15401,12,91),(15397,12,92),(15400,12,93),(15403,12,94),(13990,12,95),(12734,12,97),(14939,12,101),(14935,12,102),(14936,12,104),(14937,12,105),(14938,12,106),(14940,12,109),(15390,12,111),(15377,12,112),(15380,12,113),(15383,12,114),(15386,12,115),(15389,12,116),(15392,12,117),(15415,12,121),(15411,12,122),(15414,12,125),(15417,12,126),(13821,12,141),(13820,12,142),(13822,12,144),(13912,12,151),(13909,12,152),(13911,12,153),(13913,12,154),(14063,12,161),(14056,12,162),(14058,12,163),(14060,12,164),(14062,12,165),(14064,12,167),(13350,12,171),(13345,12,172),(13347,12,173),(13349,12,174),(13351,12,178),(13838,12,221),(13834,12,222),(13837,12,223),(13840,12,229),(13842,12,237),(13844,12,238),(13846,12,239),(13516,12,241),(13515,12,242),(13517,12,243),(14730,12,251),(14711,12,252),(14713,12,253),(14714,12,254),(14716,12,255),(14718,12,256),(15419,12,262),(15428,12,281),(15424,12,282),(15427,12,283),(15430,12,286),(15440,12,300),(15441,12,301),(14126,12,331),(14125,12,332),(14127,12,333),(14719,12,341),(14720,12,342),(14721,12,343),(14722,12,344),(14728,12,351),(14725,12,352),(14727,12,353),(14729,12,354),(14731,12,358),(13865,12,510),(13862,12,512),(13864,12,514),(13866,12,517),(15291,12,520),(15286,12,522),(15288,12,524),(15290,12,525),(15292,12,527),(14686,12,531),(14683,12,532),(14685,12,534),(14687,12,538),(13358,12,700),(14832,12,701),(14831,12,702),(14834,12,703),(15090,12,771),(15081,12,772),(15083,12,773),(15085,12,774),(15087,12,775),(15089,12,776),(15091,12,779),(14917,12,1001),(14916,12,1002),(14918,12,1003),(14920,12,1004),(14921,12,1005),(14945,12,1101),(14943,12,1102),(14944,12,1104),(14946,12,1109),(14762,12,1121),(14755,12,1122),(14757,12,1123),(14759,12,1124),(14761,12,1125),(14763,12,1126),(14982,12,1181),(15005,12,1182),(14985,12,1183),(14986,12,1184),(14988,12,1185),(14990,12,1186),(14992,12,1187),(14995,12,1188),(14993,12,1189),(13827,12,1201),(13828,12,1202),(15003,12,1231),(14998,12,1232),(14999,12,1233),(15001,12,1234),(15002,12,1235),(15004,12,1236),(15006,12,1237),(13829,12,1251),(15467,12,1321),(15468,12,1322),(14957,12,1421),(15036,12,2401),(15035,12,2402),(15038,12,2403),(15044,12,2411),(15043,12,2412),(15046,12,2413),(15047,12,2414),(14591,12,2501),(14590,12,2503),(14592,12,2515),(15435,12,5001),(15436,12,5002),(14651,12,20001),(14641,12,20002),(14644,12,20003),(14647,12,20004),(14650,12,20005),(14653,12,20006),(15447,12,23001),(15444,12,23002),(15446,12,23003),(15448,12,23004),(13712,12,50101),(15323,12,50401),(15325,12,50411),(15326,12,50412),(15327,12,50420),(15328,12,50430),(15322,12,50440),(15052,12,55001),(15053,12,55002),(14128,12,59001),(14129,12,59002),(14130,12,59003),(14818,12,63001),(14815,12,63002),(14817,12,63003),(14819,12,63004),(15241,12,64001),(15438,12,101701),(15439,12,101702),(12776,13,11),(12777,13,21),(12778,13,31),(12779,13,41),(12780,13,61),(12781,13,71),(12782,13,72),(12783,13,74),(12784,13,75),(12785,13,78),(12786,13,79),(12787,13,81),(12788,13,91),(12789,13,95),(12790,13,97),(12791,13,101),(12792,13,111),(12793,13,121),(12794,13,151),(12795,13,161),(12796,13,171),(12797,13,221),(12798,13,222),(12799,13,229),(12800,13,241),(12801,13,242),(12802,13,243),(12803,13,262),(12804,13,281),(12805,13,300),(12806,13,331),(12807,13,341),(12808,13,342),(12809,13,343),(12810,13,344),(12811,13,531),(12812,13,700),(12813,13,1001),(12814,13,1002),(12815,13,1003),(12816,13,1004),(12817,13,1005),(12818,13,1101),(12819,13,1181),(12820,13,1182),(12821,13,1201),(12822,13,1202),(12823,13,1231),(12824,13,2401),(12825,13,2501),(12826,13,2503),(12827,13,2515),(12828,13,20001),(12829,13,20002),(12830,13,23001),(12831,13,50101),(12832,14,11),(12833,14,21),(12834,14,31),(12835,14,41),(12836,14,61),(12837,14,71),(12838,14,72),(12839,14,74),(12840,14,75),(12841,14,78),(12842,14,79),(12843,14,81),(12844,14,91),(12845,14,95),(12846,14,97),(12847,14,101),(12848,14,111),(12849,14,121),(12850,14,151),(12851,14,161),(12852,14,171),(12853,14,221),(12854,14,222),(12855,14,229),(12856,14,241),(12857,14,242),(12858,14,243),(12859,14,262),(12860,14,281),(12861,14,300),(12862,14,331),(12863,14,341),(12864,14,342),(12865,14,343),(12866,14,344),(12867,14,531),(12868,14,700),(12869,14,1001),(12870,14,1002),(12871,14,1003),(12872,14,1004),(12873,14,1005),(12874,14,1101),(12875,14,1181),(12876,14,1182),(12877,14,1201),(12878,14,1202),(12879,14,1231),(12880,14,2401),(12881,14,2501),(12882,14,2503),(12883,14,2515),(12884,14,20001),(12885,14,20002),(12886,14,23001),(12887,14,50101),(12944,16,11),(12945,16,21),(12946,16,31),(13056,16,41),(13057,16,42),(13058,16,44),(13059,16,45),(12948,16,61),(12949,16,71),(12950,16,72),(12951,16,74),(12952,16,75),(12953,16,78),(12954,16,79),(12955,16,81),(12956,16,91),(12957,16,95),(12958,16,97),(12959,16,101),(12960,16,111),(12961,16,121),(13060,16,141),(13061,16,142),(13062,16,144),(12962,16,151),(12963,16,161),(12964,16,171),(12965,16,221),(12966,16,222),(12967,16,229),(12968,16,241),(12969,16,242),(12970,16,243),(13128,16,251),(13064,16,262),(12972,16,281),(12973,16,300),(12974,16,331),(12975,16,341),(12976,16,342),(12977,16,343),(12978,16,344),(12979,16,531),(12980,16,700),(12981,16,1001),(12982,16,1002),(12983,16,1003),(12984,16,1004),(12985,16,1005),(12986,16,1101),(12987,16,1181),(12988,16,1182),(12989,16,1201),(12990,16,1202),(12991,16,1231),(12992,16,2401),(12993,16,2501),(12994,16,2503),(12995,16,2515),(12996,16,20001),(12997,16,20002),(12998,16,23001),(12999,16,50101),(13000,17,11),(13001,17,21),(13002,17,31),(13065,17,41),(13066,17,42),(13067,17,44),(13068,17,45),(13004,17,61),(13005,17,71),(13006,17,72),(13007,17,74),(13008,17,75),(13009,17,78),(13010,17,79),(13011,17,81),(13012,17,91),(13013,17,95),(13014,17,97),(13015,17,101),(13016,17,111),(13017,17,121),(13069,17,141),(13070,17,142),(13071,17,144),(13018,17,151),(13019,17,161),(13020,17,171),(13021,17,221),(13022,17,222),(13023,17,229),(13024,17,241),(13025,17,242),(13026,17,243),(13028,17,281),(13029,17,300),(13030,17,331),(13031,17,341),(13032,17,342),(13033,17,343),(13034,17,344),(13035,17,531),(13036,17,700),(13037,17,1001),(13038,17,1002),(13039,17,1003),(13040,17,1004),(13041,17,1005),(13042,17,1101),(13043,17,1181),(13044,17,1182),(13045,17,1201),(13046,17,1202),(13047,17,1231),(13048,17,2401),(13049,17,2501),(13050,17,2503),(13051,17,2515),(13052,17,20001),(13053,17,20002),(13054,17,23001),(13055,17,50101),(14504,18,11),(14505,18,21),(14506,18,31),(14507,18,41),(14508,18,61),(14509,18,71),(14510,18,78),(14511,18,81),(14512,18,91),(14513,18,95),(14514,18,101),(14515,18,111),(14516,18,121),(14517,18,151),(14518,18,161),(14519,18,221),(14520,18,241),(14521,18,262),(14522,18,281),(14523,18,300),(14524,18,331),(14525,18,332),(14526,18,333),(14527,18,341),(14528,18,342),(14529,18,343),(14530,18,344),(14531,18,531),(14532,18,701),(14533,18,771),(14534,18,774),(14535,18,1001),(14536,18,1004),(14537,18,1101),(14538,18,1181),(14539,18,1182),(14540,18,1201),(14541,18,1231),(14542,18,2401),(14543,18,2501),(14544,18,2503),(14545,18,2515),(14546,18,20001),(14547,18,20002),(14548,18,50101),(14549,18,59001),(15242,19,21),(15243,19,31),(15244,19,41),(15245,19,61),(15246,19,71),(15247,19,78),(15248,19,81),(15249,19,101),(15250,19,121),(15251,19,151),(15252,19,161),(15253,19,221),(15254,19,241),(15255,19,262),(15256,19,281),(15257,19,300),(15258,19,331),(15259,19,332),(15260,19,341),(15261,19,342),(15262,19,343),(15263,19,344),(15264,19,531),(15265,19,701),(15266,19,771),(15267,19,774),(15268,19,777),(15269,19,1001),(15270,19,1004),(15271,19,1101),(15272,19,1121),(15273,19,1181),(15274,19,1182),(15275,19,1201),(15276,19,1231),(15277,19,2401),(15278,19,2501),(15279,19,20001),(15280,19,20002),(15281,19,50101),(15282,19,59001),(15283,19,63001);
+INSERT INTO `llx_user_rights` VALUES (12402,1,11),(12380,1,12),(12385,1,13),(12389,1,14),(12393,1,15),(12398,1,16),(12404,1,19),(9726,1,21),(9700,1,22),(9706,1,24),(9711,1,25),(9716,1,26),(9722,1,27),(9728,1,28),(9978,1,31),(9968,1,32),(9974,1,34),(1910,1,36),(9980,1,38),(11573,1,41),(11574,1,42),(11575,1,44),(11576,1,45),(7184,1,61),(7181,1,62),(7183,1,64),(7185,1,67),(7186,1,68),(1678,1,71),(1673,1,72),(1675,1,74),(1679,1,75),(1677,1,76),(1681,1,78),(1682,1,79),(12322,1,81),(12309,1,82),(12312,1,84),(12314,1,86),(12317,1,87),(12320,1,88),(12323,1,89),(11580,1,91),(11581,1,92),(11582,1,93),(11583,1,94),(10097,1,95),(10099,1,96),(10103,1,97),(10104,1,98),(7139,1,101),(7134,1,102),(7136,1,104),(7137,1,105),(7138,1,106),(7140,1,109),(10229,1,111),(10201,1,112),(10207,1,113),(10213,1,114),(10219,1,115),(10225,1,116),(10231,1,117),(12518,1,121),(12508,1,122),(12514,1,125),(12520,1,126),(11577,1,141),(11578,1,142),(11579,1,144),(2307,1,151),(2304,1,152),(2306,1,153),(2308,1,154),(10092,1,161),(10093,1,162),(10094,1,163),(10095,1,164),(10096,1,165),(1585,1,170),(12342,1,171),(12331,1,172),(12335,1,173),(12339,1,174),(12343,1,178),(10000,1,221),(9990,1,222),(9996,1,223),(10002,1,229),(10007,1,237),(10011,1,238),(10015,1,239),(1686,1,241),(1685,1,242),(1687,1,243),(12604,1,251),(12566,1,252),(12569,1,253),(12572,1,254),(12575,1,255),(12579,1,256),(1617,1,258),(12525,1,262),(12544,1,281),(12534,1,282),(12540,1,283),(12546,1,286),(12288,1,300),(12290,1,301),(11591,1,302),(1763,1,331),(1762,1,332),(1764,1,333),(12582,1,341),(12584,1,342),(12586,1,343),(12588,1,344),(12600,1,351),(12593,1,352),(12597,1,353),(12601,1,354),(12605,1,358),(12560,1,531),(12553,1,532),(12557,1,534),(1625,1,536),(12561,1,538),(12358,1,700),(12348,1,701),(12354,1,702),(12360,1,703),(1755,1,1001),(1754,1,1002),(1756,1,1003),(1758,1,1004),(1759,1,1005),(7146,1,1101),(7143,1,1102),(7145,1,1104),(7147,1,1109),(12412,1,1181),(12458,1,1182),(12417,1,1183),(12420,1,1184),(12423,1,1185),(12427,1,1186),(12431,1,1187),(12437,1,1188),(12434,1,1189),(1578,1,1201),(1579,1,1202),(12454,1,1231),(12443,1,1232),(12446,1,1233),(12449,1,1234),(12452,1,1235),(12455,1,1236),(12459,1,1237),(1736,1,1251),(12409,1,1321),(12326,1,1421),(8190,1,1791),(8187,1,1792),(8191,1,1793),(12264,1,2401),(12260,1,2402),(12266,1,2403),(12280,1,2411),(12276,1,2412),(12282,1,2413),(12286,1,2414),(1618,1,2500),(12370,1,2501),(12367,1,2503),(12371,1,2515),(9610,1,5001),(9611,1,5002),(12490,1,20001),(12468,1,20002),(12474,1,20003),(12480,1,20004),(12486,1,20005),(12492,1,20006),(12302,1,23001),(12295,1,23002),(12299,1,23003),(12303,1,23004),(7701,1,50101),(4984,1,50401),(4983,1,50402),(4985,1,50403),(4987,1,50411),(4988,1,50412),(4989,1,50415),(12498,1,55001),(12499,1,55002),(3564,1,100700),(3565,1,100701),(9596,1,101051),(9598,1,101052),(9600,1,101053),(9604,1,101060),(9605,1,101061),(7177,1,101201),(7178,1,101202),(10353,1,101250),(10355,1,101251),(8980,1,101261),(8981,1,101262),(7616,1,101331),(10030,1,101701),(10031,1,101702),(3582,1,102000),(3583,1,102001),(9819,1,400051),(9823,1,400052),(9827,1,400053),(9831,1,400055),(132,2,11),(133,2,12),(134,2,13),(135,2,14),(136,2,16),(137,2,19),(138,2,21),(139,2,22),(140,2,24),(141,2,25),(142,2,26),(143,2,27),(10359,2,31),(145,2,32),(10361,2,34),(146,2,36),(147,2,41),(148,2,42),(149,2,44),(150,2,61),(151,2,62),(152,2,64),(153,2,71),(154,2,72),(155,2,74),(156,2,75),(157,2,78),(158,2,79),(159,2,81),(160,2,82),(161,2,84),(162,2,86),(163,2,87),(164,2,88),(165,2,89),(166,2,91),(167,2,92),(168,2,93),(2475,2,95),(2476,2,96),(2477,2,97),(2478,2,98),(169,2,101),(170,2,102),(171,2,104),(172,2,109),(173,2,111),(174,2,112),(175,2,113),(176,2,114),(177,2,116),(178,2,117),(179,2,121),(180,2,122),(181,2,125),(182,2,141),(183,2,142),(184,2,144),(2479,2,151),(2480,2,152),(2481,2,153),(2482,2,154),(185,2,161),(186,2,162),(187,2,163),(188,2,164),(189,2,165),(190,2,170),(2471,2,171),(192,2,172),(2472,2,173),(193,2,221),(194,2,222),(195,2,229),(196,2,241),(197,2,242),(198,2,243),(199,2,251),(201,2,262),(202,2,281),(203,2,282),(204,2,283),(205,2,331),(15072,2,510),(2483,2,531),(207,2,532),(2484,2,534),(208,2,536),(2473,2,700),(210,2,701),(211,2,702),(2474,2,703),(15064,2,771),(15057,2,772),(15059,2,773),(15061,2,774),(15063,2,775),(15065,2,776),(212,2,1001),(213,2,1002),(214,2,1003),(215,2,1004),(216,2,1005),(217,2,1101),(218,2,1102),(219,2,1104),(220,2,1109),(15073,2,1121),(15074,2,1122),(15075,2,1123),(15076,2,1124),(15077,2,1125),(15078,2,1126),(221,2,1181),(222,2,1182),(223,2,1183),(224,2,1184),(225,2,1185),(226,2,1186),(227,2,1187),(228,2,1188),(229,2,1201),(230,2,1202),(231,2,1231),(232,2,1232),(233,2,1233),(234,2,1234),(235,2,1421),(236,2,2401),(237,2,2402),(238,2,2403),(239,2,2411),(240,2,2412),(241,2,2413),(242,2,2500),(2470,2,2501),(243,2,2515),(10363,2,20001),(10364,2,20002),(10365,2,20003),(10366,2,20004),(10367,2,20005),(10368,2,20006),(15054,2,23001),(10362,2,50101),(15067,2,55001),(15066,2,59001),(15068,2,63001),(15069,2,63002),(15070,2,63003),(15071,2,63004),(10372,2,101250),(1807,3,11),(1808,3,31),(1809,3,36),(1810,3,41),(1811,3,61),(1812,3,71),(1813,3,72),(1814,3,74),(1815,3,75),(1816,3,78),(1817,3,79),(1818,3,91),(1819,3,95),(1820,3,97),(1821,3,111),(1822,3,121),(1823,3,122),(1824,3,125),(1825,3,161),(1826,3,170),(1827,3,171),(1828,3,172),(1829,3,221),(1830,3,222),(1831,3,229),(1832,3,241),(1833,3,242),(1834,3,243),(1835,3,251),(1836,3,255),(1837,3,256),(1838,3,262),(1839,3,281),(1840,3,282),(1841,3,283),(1842,3,331),(1843,3,531),(1844,3,536),(1845,3,700),(1846,3,1001),(1847,3,1002),(1848,3,1003),(1849,3,1004),(1850,3,1005),(1851,3,1181),(1852,3,1182),(1853,3,1201),(1854,3,1202),(1855,3,1231),(1856,3,2401),(1857,3,2402),(1858,3,2403),(1859,3,2411),(1860,3,2412),(1861,3,2413),(1862,3,2500),(1863,3,2515),(8026,4,11),(8027,4,21),(8028,4,31),(8029,4,41),(8030,4,61),(8031,4,71),(8032,4,72),(8033,4,74),(8034,4,75),(8035,4,78),(8036,4,79),(8037,4,81),(8038,4,91),(8039,4,95),(8040,4,97),(8041,4,101),(8042,4,111),(8043,4,121),(8044,4,151),(8045,4,161),(8046,4,171),(8047,4,221),(8048,4,222),(8049,4,229),(8050,4,241),(8051,4,242),(8052,4,243),(8146,4,251),(8147,4,253),(8053,4,262),(8054,4,281),(8055,4,331),(8056,4,341),(8057,4,342),(8058,4,343),(8059,4,344),(8060,4,531),(8061,4,700),(8062,4,1001),(8063,4,1002),(8064,4,1003),(8065,4,1004),(8066,4,1005),(8067,4,1101),(8068,4,1181),(8069,4,1182),(8070,4,1201),(8071,4,1202),(8072,4,1231),(8073,4,2401),(8074,4,2501),(8075,4,2503),(8076,4,2515),(8077,4,20001),(8078,4,50101),(8079,4,101201),(8080,4,101261),(8081,4,102000),(8082,4,400051),(8083,4,400052),(8084,4,400053),(8085,4,400055),(12608,10,11),(12609,10,21),(12610,10,31),(12611,10,41),(12612,10,61),(12613,10,71),(12614,10,72),(12615,10,74),(12616,10,75),(12617,10,78),(12618,10,79),(12619,10,81),(12620,10,91),(12621,10,95),(12622,10,97),(12623,10,101),(12624,10,111),(12625,10,121),(12626,10,151),(12627,10,161),(12628,10,171),(12629,10,221),(12630,10,222),(12631,10,229),(12632,10,241),(12633,10,242),(12634,10,243),(12635,10,262),(12636,10,281),(12637,10,300),(12638,10,331),(12639,10,341),(12640,10,342),(12641,10,343),(12642,10,344),(12643,10,531),(12644,10,700),(12645,10,1001),(12646,10,1002),(12647,10,1003),(12648,10,1004),(12649,10,1005),(12650,10,1101),(12651,10,1181),(12652,10,1182),(12653,10,1201),(12654,10,1202),(12655,10,1231),(12656,10,2401),(12657,10,2501),(12658,10,2503),(12659,10,2515),(12660,10,20001),(12661,10,20002),(12662,10,23001),(12663,10,50101),(12664,11,11),(12665,11,21),(12666,11,31),(12667,11,41),(12668,11,61),(12669,11,71),(12670,11,72),(12671,11,74),(12672,11,75),(12673,11,78),(12674,11,79),(12675,11,81),(12676,11,91),(12677,11,95),(12678,11,97),(12679,11,101),(12680,11,111),(12681,11,121),(12682,11,151),(12683,11,161),(12684,11,171),(12685,11,221),(12686,11,222),(12687,11,229),(12688,11,241),(12689,11,242),(12690,11,243),(12691,11,262),(12692,11,281),(12693,11,300),(12694,11,331),(12695,11,341),(12696,11,342),(12697,11,343),(12698,11,344),(12699,11,531),(12700,11,700),(12701,11,1001),(12702,11,1002),(12703,11,1003),(12704,11,1004),(12705,11,1005),(12706,11,1101),(12707,11,1181),(12708,11,1182),(12709,11,1201),(12710,11,1202),(12711,11,1231),(12712,11,2401),(12713,11,2501),(12714,11,2503),(12715,11,2515),(12716,11,20001),(12717,11,20002),(12718,11,23001),(12719,11,50101),(15492,12,11),(15482,12,12),(15484,12,13),(15486,12,14),(15488,12,15),(15491,12,16),(15494,12,19),(14146,12,21),(14135,12,22),(14137,12,24),(14139,12,25),(14142,12,26),(14145,12,27),(14148,12,28),(14930,12,31),(14926,12,32),(14929,12,34),(14932,12,38),(13816,12,41),(13813,12,42),(13815,12,44),(13817,12,45),(14094,12,61),(14091,12,62),(14093,12,64),(14095,12,67),(14096,12,68),(13891,12,71),(13886,12,72),(13888,12,74),(13892,12,75),(13890,12,76),(13894,12,78),(13895,12,79),(14955,12,81),(14949,12,82),(14950,12,84),(14951,12,86),(14953,12,87),(14954,12,88),(14956,12,89),(15401,12,91),(15397,12,92),(15400,12,93),(15403,12,94),(13990,12,95),(12734,12,97),(14939,12,101),(14935,12,102),(14936,12,104),(14937,12,105),(14938,12,106),(14940,12,109),(15390,12,111),(15377,12,112),(15380,12,113),(15383,12,114),(15386,12,115),(15389,12,116),(15392,12,117),(15415,12,121),(15411,12,122),(15414,12,125),(15417,12,126),(13821,12,141),(13820,12,142),(13822,12,144),(13912,12,151),(13909,12,152),(13911,12,153),(13913,12,154),(14063,12,161),(14056,12,162),(14058,12,163),(14060,12,164),(14062,12,165),(14064,12,167),(13350,12,171),(13345,12,172),(13347,12,173),(13349,12,174),(13351,12,178),(13838,12,221),(13834,12,222),(13837,12,223),(13840,12,229),(13842,12,237),(13844,12,238),(13846,12,239),(13516,12,241),(13515,12,242),(13517,12,243),(14730,12,251),(14711,12,252),(14713,12,253),(14714,12,254),(14716,12,255),(14718,12,256),(15419,12,262),(15428,12,281),(15424,12,282),(15427,12,283),(15430,12,286),(15469,12,300),(15470,12,301),(14126,12,331),(14125,12,332),(14127,12,333),(14719,12,341),(14720,12,342),(14721,12,343),(14722,12,344),(14728,12,351),(14725,12,352),(14727,12,353),(14729,12,354),(14731,12,358),(13865,12,510),(13862,12,512),(13864,12,514),(13866,12,517),(15291,12,520),(15286,12,522),(15288,12,524),(15290,12,525),(15292,12,527),(14686,12,531),(14683,12,532),(14685,12,534),(14687,12,538),(13358,12,700),(14832,12,701),(14831,12,702),(14834,12,703),(15090,12,771),(15081,12,772),(15083,12,773),(15085,12,774),(15087,12,775),(15089,12,776),(15091,12,779),(14917,12,1001),(14916,12,1002),(14918,12,1003),(14920,12,1004),(14921,12,1005),(14945,12,1101),(14943,12,1102),(14944,12,1104),(14946,12,1109),(14762,12,1121),(14755,12,1122),(14757,12,1123),(14759,12,1124),(14761,12,1125),(14763,12,1126),(14982,12,1181),(15005,12,1182),(14985,12,1183),(14986,12,1184),(14988,12,1185),(14990,12,1186),(14992,12,1187),(14995,12,1188),(14993,12,1189),(13827,12,1201),(13828,12,1202),(15003,12,1231),(14998,12,1232),(14999,12,1233),(15001,12,1234),(15002,12,1235),(15004,12,1236),(15006,12,1237),(13829,12,1251),(15496,12,1321),(15497,12,1322),(14957,12,1421),(15036,12,2401),(15035,12,2402),(15038,12,2403),(15044,12,2411),(15043,12,2412),(15046,12,2413),(15047,12,2414),(14591,12,2501),(14590,12,2503),(14592,12,2515),(15435,12,5001),(15436,12,5002),(14651,12,20001),(14641,12,20002),(14644,12,20003),(14647,12,20004),(14650,12,20005),(14653,12,20006),(15476,12,23001),(15473,12,23002),(15475,12,23003),(15477,12,23004),(13712,12,50101),(15499,12,50401),(15501,12,50411),(15502,12,50412),(15503,12,50420),(15504,12,50430),(15498,12,50440),(15052,12,55001),(15053,12,55002),(14128,12,59001),(14129,12,59002),(14130,12,59003),(14818,12,63001),(14815,12,63002),(14817,12,63003),(14819,12,63004),(15241,12,64001),(15438,12,101701),(15439,12,101702),(12776,13,11),(12777,13,21),(12778,13,31),(12779,13,41),(12780,13,61),(12781,13,71),(12782,13,72),(12783,13,74),(12784,13,75),(12785,13,78),(12786,13,79),(12787,13,81),(12788,13,91),(12789,13,95),(12790,13,97),(12791,13,101),(12792,13,111),(12793,13,121),(12794,13,151),(12795,13,161),(12796,13,171),(12797,13,221),(12798,13,222),(12799,13,229),(12800,13,241),(12801,13,242),(12802,13,243),(12803,13,262),(12804,13,281),(12805,13,300),(12806,13,331),(12807,13,341),(12808,13,342),(12809,13,343),(12810,13,344),(12811,13,531),(12812,13,700),(12813,13,1001),(12814,13,1002),(12815,13,1003),(12816,13,1004),(12817,13,1005),(12818,13,1101),(12819,13,1181),(12820,13,1182),(12821,13,1201),(12822,13,1202),(12823,13,1231),(12824,13,2401),(12825,13,2501),(12826,13,2503),(12827,13,2515),(12828,13,20001),(12829,13,20002),(12830,13,23001),(12831,13,50101),(12832,14,11),(12833,14,21),(12834,14,31),(12835,14,41),(12836,14,61),(12837,14,71),(12838,14,72),(12839,14,74),(12840,14,75),(12841,14,78),(12842,14,79),(12843,14,81),(12844,14,91),(12845,14,95),(12846,14,97),(12847,14,101),(12848,14,111),(12849,14,121),(12850,14,151),(12851,14,161),(12852,14,171),(12853,14,221),(12854,14,222),(12855,14,229),(12856,14,241),(12857,14,242),(12858,14,243),(12859,14,262),(12860,14,281),(12861,14,300),(12862,14,331),(12863,14,341),(12864,14,342),(12865,14,343),(12866,14,344),(12867,14,531),(12868,14,700),(12869,14,1001),(12870,14,1002),(12871,14,1003),(12872,14,1004),(12873,14,1005),(12874,14,1101),(12875,14,1181),(12876,14,1182),(12877,14,1201),(12878,14,1202),(12879,14,1231),(12880,14,2401),(12881,14,2501),(12882,14,2503),(12883,14,2515),(12884,14,20001),(12885,14,20002),(12886,14,23001),(12887,14,50101),(12944,16,11),(12945,16,21),(12946,16,31),(13056,16,41),(13057,16,42),(13058,16,44),(13059,16,45),(12948,16,61),(12949,16,71),(12950,16,72),(12951,16,74),(12952,16,75),(12953,16,78),(12954,16,79),(12955,16,81),(12956,16,91),(12957,16,95),(12958,16,97),(12959,16,101),(12960,16,111),(12961,16,121),(13060,16,141),(13061,16,142),(13062,16,144),(12962,16,151),(12963,16,161),(12964,16,171),(12965,16,221),(12966,16,222),(12967,16,229),(12968,16,241),(12969,16,242),(12970,16,243),(13128,16,251),(13064,16,262),(12972,16,281),(12973,16,300),(12974,16,331),(12975,16,341),(12976,16,342),(12977,16,343),(12978,16,344),(12979,16,531),(12980,16,700),(12981,16,1001),(12982,16,1002),(12983,16,1003),(12984,16,1004),(12985,16,1005),(12986,16,1101),(12987,16,1181),(12988,16,1182),(12989,16,1201),(12990,16,1202),(12991,16,1231),(12992,16,2401),(12993,16,2501),(12994,16,2503),(12995,16,2515),(12996,16,20001),(12997,16,20002),(12998,16,23001),(12999,16,50101),(13000,17,11),(13001,17,21),(13002,17,31),(13065,17,41),(13066,17,42),(13067,17,44),(13068,17,45),(13004,17,61),(13005,17,71),(13006,17,72),(13007,17,74),(13008,17,75),(13009,17,78),(13010,17,79),(13011,17,81),(13012,17,91),(13013,17,95),(13014,17,97),(13015,17,101),(13016,17,111),(13017,17,121),(13069,17,141),(13070,17,142),(13071,17,144),(13018,17,151),(13019,17,161),(13020,17,171),(13021,17,221),(13022,17,222),(13023,17,229),(13024,17,241),(13025,17,242),(13026,17,243),(13028,17,281),(13029,17,300),(13030,17,331),(13031,17,341),(13032,17,342),(13033,17,343),(13034,17,344),(13035,17,531),(13036,17,700),(13037,17,1001),(13038,17,1002),(13039,17,1003),(13040,17,1004),(13041,17,1005),(13042,17,1101),(13043,17,1181),(13044,17,1182),(13045,17,1201),(13046,17,1202),(13047,17,1231),(13048,17,2401),(13049,17,2501),(13050,17,2503),(13051,17,2515),(13052,17,20001),(13053,17,20002),(13054,17,23001),(13055,17,50101),(14504,18,11),(14505,18,21),(14506,18,31),(14507,18,41),(14508,18,61),(14509,18,71),(14510,18,78),(14511,18,81),(14512,18,91),(14513,18,95),(14514,18,101),(14515,18,111),(14516,18,121),(14517,18,151),(14518,18,161),(14519,18,221),(14520,18,241),(14521,18,262),(14522,18,281),(14523,18,300),(14524,18,331),(14525,18,332),(14526,18,333),(14527,18,341),(14528,18,342),(14529,18,343),(14530,18,344),(14531,18,531),(14532,18,701),(14533,18,771),(14534,18,774),(14535,18,1001),(14536,18,1004),(14537,18,1101),(14538,18,1181),(14539,18,1182),(14540,18,1201),(14541,18,1231),(14542,18,2401),(14543,18,2501),(14544,18,2503),(14545,18,2515),(14546,18,20001),(14547,18,20002),(14548,18,50101),(14549,18,59001),(15242,19,21),(15243,19,31),(15244,19,41),(15245,19,61),(15246,19,71),(15247,19,78),(15248,19,81),(15249,19,101),(15250,19,121),(15251,19,151),(15252,19,161),(15253,19,221),(15254,19,241),(15255,19,262),(15256,19,281),(15257,19,300),(15258,19,331),(15259,19,332),(15260,19,341),(15261,19,342),(15262,19,343),(15263,19,344),(15264,19,531),(15265,19,701),(15266,19,771),(15267,19,774),(15268,19,777),(15269,19,1001),(15270,19,1004),(15271,19,1101),(15272,19,1121),(15273,19,1181),(15274,19,1182),(15275,19,1201),(15276,19,1231),(15277,19,2401),(15278,19,2501),(15279,19,20001),(15280,19,20002),(15281,19,50101),(15282,19,59001),(15283,19,63001);
 /*!40000 ALTER TABLE `llx_user_rights` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -9052,4 +9053,4 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2017-02-21 13:19:55
+-- Dump completed on 2017-05-12 12:07:24

From 245ef7a188dc2fbfa3fe1834d9fc210bdf4fd996 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 12 May 2017 13:05:03 +0200
Subject: [PATCH 317/505] Add screenshot

---
 doc/images/dolibarr_screenshot11_1280x800.png | Bin 0 -> 212848 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 doc/images/dolibarr_screenshot11_1280x800.png

diff --git a/doc/images/dolibarr_screenshot11_1280x800.png b/doc/images/dolibarr_screenshot11_1280x800.png
new file mode 100644
index 0000000000000000000000000000000000000000..1f19a884a3796efd2eca399a1d13e9296e4a0021
GIT binary patch
literal 212848
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
a09c?~)+3=`qeB4zzvN_;q{}6ZgZ>}mYe^XZ

literal 0
HcmV?d00001


From 5581e5da7289803ce19aab3fde0a5368a407634c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 12 May 2017 13:12:17 +0200
Subject: [PATCH 318/505] FIX New vat code not correctly implemented if "1
 price per customer".

---
 htdocs/comm/propal/card.php                     |  7 ++++---
 htdocs/install/mysql/migration/4.0.0-5.0.0.sql  |  3 +++
 .../mysql/tables/llx_product_customer_price.sql |  1 +
 .../tables/llx_product_customer_price_log.sql   |  1 +
 .../class/productcustomerprice.class.php        | 17 +++++++++++++----
 htdocs/product/price.php                        | 16 ++++++++++------
 6 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 150abdf5f46..407a461a1a1 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -750,7 +750,7 @@ if (empty($reshook))
 				$tva_tx = get_default_tva($mysoc, $object->thirdparty, $prod->id);
 				$tva_npr = get_default_npr($mysoc, $object->thirdparty, $prod->id);
 				if (empty($tva_tx)) $tva_npr=0;
-
+				
 				$pu_ht = $prod->price;
 				$pu_ttc = $prod->price_ttc;
 				$price_min = $prod->price_min;
@@ -775,15 +775,16 @@ if (empty($reshook))
 
 					$prodcustprice = new Productcustomerprice($db);
 
-					$filter = array('t.fk_product' => $prod->id,'t.fk_soc' => $object->thirdparty->id);
+					$filter = array('t.fk_product' => $prod->id, 't.fk_soc' => $object->thirdparty->id);
 
 					$result = $prodcustprice->fetch_all('', '', 0, 0, $filter);
 					if ($result) {
+					    // If there is some prices specific to the customer
 						if (count($prodcustprice->lines) > 0) {
 							$pu_ht = price($prodcustprice->lines[0]->price);
 							$pu_ttc = price($prodcustprice->lines[0]->price_ttc);
 							$price_base_type = $prodcustprice->lines[0]->price_base_type;
-							$tva_tx = $prodcustprice->lines[0]->tva_tx;
+							$tva_tx = ($prodcustprice->lines[0]->default_vat_code ? $prodcustprice->lines[0]->tva_tx . ' ('.$prodcustprice->lines[0]->default_vat_code.' )' : $prodcustprice->lines[0]->tva_tx);
 						}
 					}
 				}
diff --git a/htdocs/install/mysql/migration/4.0.0-5.0.0.sql b/htdocs/install/mysql/migration/4.0.0-5.0.0.sql
index dd4ac9fde4b..fa185f2864b 100644
--- a/htdocs/install/mysql/migration/4.0.0-5.0.0.sql
+++ b/htdocs/install/mysql/migration/4.0.0-5.0.0.sql
@@ -263,6 +263,9 @@ update llx_accounting_account set account_parent = 0 where account_parent = '';
 ALTER TABLE llx_product_price ALTER COLUMN date_price SET DEFAULT NULL;
  
 ALTER TABLE llx_product_price ADD COLUMN default_vat_code	varchar(10) after tva_tx;
+ALTER TABLE llx_product_customer_price ADD COLUMN default_vat_code	varchar(10) after tva_tx;
+ALTER TABLE llx_product_customer_price_log ADD COLUMN default_vat_code	varchar(10) after tva_tx;
 ALTER TABLE llx_product_fournisseur_price ADD COLUMN default_vat_code	varchar(10) after tva_tx;
 
+
 ALTER TABLE llx_events MODIFY COLUMN ip varchar(250);
diff --git a/htdocs/install/mysql/tables/llx_product_customer_price.sql b/htdocs/install/mysql/tables/llx_product_customer_price.sql
index 8098ae5f028..339de2bb4be 100644
--- a/htdocs/install/mysql/tables/llx_product_customer_price.sql
+++ b/htdocs/install/mysql/tables/llx_product_customer_price.sql
@@ -33,6 +33,7 @@ create table llx_product_customer_price
   price_min					double(24,8) DEFAULT 0,
   price_min_ttc				double(24,8) DEFAULT 0,
   price_base_type			varchar(3)   DEFAULT 'HT',
+  default_vat_code			varchar(10),	         		-- Same code than into table llx_c_tva (but no constraints). Should be used in priority to find default vat, npr, localtaxes for product.
   tva_tx					double(6,3),
   recuperableonly           integer NOT NULL DEFAULT '0',   -- Other NPR VAT
   localtax1_tx				double(6,3)  DEFAULT 0,         -- Other local VAT 1 
diff --git a/htdocs/install/mysql/tables/llx_product_customer_price_log.sql b/htdocs/install/mysql/tables/llx_product_customer_price_log.sql
index 699060cdc98..bd4fe54a586 100644
--- a/htdocs/install/mysql/tables/llx_product_customer_price_log.sql
+++ b/htdocs/install/mysql/tables/llx_product_customer_price_log.sql
@@ -30,6 +30,7 @@ create table llx_product_customer_price_log
   price_min					double(24,8) DEFAULT 0,
   price_min_ttc				double(24,8) DEFAULT 0,
   price_base_type			varchar(3)   DEFAULT 'HT',
+  default_vat_code			varchar(10),	         		-- Same code than into table llx_c_tva (but no constraints). Should be used in priority to find default vat, npr, localtaxes for product.
   tva_tx					double(6,3),
   recuperableonly           integer NOT NULL DEFAULT '0',   -- Other NPR VAT
   localtax1_tx				double(6,3)  DEFAULT 0,         -- Other local VAT 1 
diff --git a/htdocs/product/class/productcustomerprice.class.php b/htdocs/product/class/productcustomerprice.class.php
index fd36c55dcf9..5b9050077c9 100644
--- a/htdocs/product/class/productcustomerprice.class.php
+++ b/htdocs/product/class/productcustomerprice.class.php
@@ -140,7 +140,6 @@ class Productcustomerprice extends CommonObject
 
 		// Insert request
 		$sql = "INSERT INTO " . MAIN_DB_PREFIX . "product_customer_price(";
-
 		$sql .= "entity,";
 		$sql .= "datec,";
 		$sql .= "fk_product,";
@@ -150,6 +149,7 @@ class Productcustomerprice extends CommonObject
 		$sql .= "price_min,";
 		$sql .= "price_min_ttc,";
 		$sql .= "price_base_type,";
+		$sql .= "default_vat_code,";
 		$sql .= "tva_tx,";
 		$sql .= "recuperableonly,";
 		$sql .= "localtax1_type,";
@@ -158,9 +158,7 @@ class Productcustomerprice extends CommonObject
 		$sql .= "localtax2_tx,";
 		$sql .= "fk_user,";
 		$sql .= "import_key";
-
 		$sql .= ") VALUES (";
-
 		$sql .= " " . $conf->entity . ",";
 		$sql .= " '" . $this->db->idate(dol_now()) . "',";
 		$sql .= " " . (! isset($this->fk_product) ? 'NULL' : "'" . $this->fk_product . "'") . ",";
@@ -170,6 +168,7 @@ class Productcustomerprice extends CommonObject
 		$sql .= " " . (empty($this->price_min) ? '0' : "'" . $this->price_min . "'") . ",";
 		$sql .= " " . (empty($this->price_min_ttc) ? '0' : "'" . $this->price_min_ttc . "'") . ",";
 		$sql .= " " . (! isset($this->price_base_type) ? 'NULL' : "'" . $this->db->escape($this->price_base_type) . "'") . ",";
+		$sql .= " ".($this->default_vat_code ? "'".$this->db->escape($this->default_vat_code)."'" : "null").",";
 		$sql .= " " . (! isset($this->tva_tx) ? 'NULL' : "'" . $this->tva_tx . "'") . ",";
 		$sql .= " " . (! isset($this->recuperableonly) ? 'NULL' : "'" . $this->recuperableonly . "'") . ",";
 		$sql .= " " . (empty($this->localtax1_type) ? "'0'" : "'" . $this->localtax1_type . "'") . ",";
@@ -178,7 +177,6 @@ class Productcustomerprice extends CommonObject
 		$sql .= " " . (! isset($this->localtax2_tx) ? 'NULL' : "'" . $this->localtax2_tx . "'") . ",";
 		$sql .= " " . $user->id . ",";
 		$sql .= " " . (! isset($this->import_key) ? 'NULL' : "'" . $this->db->escape($this->import_key) . "'") . "";
-
 		$sql .= ")";
 
 		$this->db->begin();
@@ -250,6 +248,7 @@ class Productcustomerprice extends CommonObject
 		$sql .= " t.price_min,";
 		$sql .= " t.price_min_ttc,";
 		$sql .= " t.price_base_type,";
+		$sql .= " t.default_vat_code,";
 		$sql .= " t.tva_tx,";
 		$sql .= " t.recuperableonly,";
 		$sql .= " t.localtax1_tx,";
@@ -278,6 +277,7 @@ class Productcustomerprice extends CommonObject
 				$this->price_min = $obj->price_min;
 				$this->price_min_ttc = $obj->price_min_ttc;
 				$this->price_base_type = $obj->price_base_type;
+				$this->default_vat_code = $obj->default_vat_code;
 				$this->tva_tx = $obj->tva_tx;
 				$this->recuperableonly = $obj->recuperableonly;
 				$this->localtax1_tx = $obj->localtax1_tx;
@@ -324,6 +324,7 @@ class Productcustomerprice extends CommonObject
 		$sql .= " t.price_min,";
 		$sql .= " t.price_min_ttc,";
 		$sql .= " t.price_base_type,";
+		$sql .= " t.default_vat_code,";
 		$sql .= " t.tva_tx,";
 		$sql .= " t.recuperableonly,";
 		$sql .= " t.localtax1_tx,";
@@ -380,6 +381,7 @@ class Productcustomerprice extends CommonObject
 				$line->price_min = $obj->price_min;
 				$line->price_min_ttc = $obj->price_min_ttc;
 				$line->price_base_type = $obj->price_base_type;
+				$line->default_vat_code = $obj->default_vat_code;
 				$line->tva_tx = $obj->tva_tx;
 				$line->recuperableonly = $obj->recuperableonly;
 				$line->localtax1_tx = $obj->localtax1_tx;
@@ -429,6 +431,7 @@ class Productcustomerprice extends CommonObject
 		$sql .= " t.price_min,";
 		$sql .= " t.price_min_ttc,";
 		$sql .= " t.price_base_type,";
+		$sql .= " t.default_vat_code,";
 		$sql .= " t.tva_tx,";
 		$sql .= " t.recuperableonly,";
 		$sql .= " t.localtax1_tx,";
@@ -484,6 +487,7 @@ class Productcustomerprice extends CommonObject
 				$line->price_min = $obj->price_min;
 				$line->price_min_ttc = $obj->price_min_ttc;
 				$line->price_base_type = $obj->price_base_type;
+				$line->default_vat_code = $obj->default_vat_code;
 				$line->tva_tx = $obj->tva_tx;
 				$line->recuperableonly = $obj->recuperableonly;
 				$line->localtax1_tx = $obj->localtax1_tx;
@@ -595,6 +599,7 @@ class Productcustomerprice extends CommonObject
 		$sql .= "price_min,";
 		$sql .= "price_min_ttc,";
 		$sql .= "price_base_type,";
+		$sql .= "default_vat_code,";
 		$sql .= "tva_tx,";
 		$sql .= "recuperableonly,";
 		$sql .= "localtax1_tx,";
@@ -616,6 +621,7 @@ class Productcustomerprice extends CommonObject
 		$sql .= " t.price_min,";
 		$sql .= " t.price_min_ttc,";
 		$sql .= " t.price_base_type,";
+		$sql .= " t.default_vat_code,";
 		$sql .= " t.tva_tx,";
 		$sql .= " t.recuperableonly,";
 		$sql .= " t.localtax1_tx,";
@@ -649,6 +655,7 @@ class Productcustomerprice extends CommonObject
 		$sql .= " price_min=" . (isset($this->price_min) ? $this->price_min : "null") . ",";
 		$sql .= " price_min_ttc=" . (isset($this->price_min_ttc) ? $this->price_min_ttc : "null") . ",";
 		$sql .= " price_base_type=" . (isset($this->price_base_type) ? "'" . $this->db->escape($this->price_base_type) . "'" : "null") . ",";
+		$sql .= " default_vat_code = ".($this->default_vat_code ? "'".$this->db->escape($this->default_vat_code)."'" : "null").",";
 		$sql .= " tva_tx=" . (isset($this->tva_tx) ? $this->tva_tx : "null") . ",";
 		$sql .= " recuperableonly=" . (isset($this->recuperableonly) ? $this->recuperableonly : "null") . ",";
 		$sql .= " localtax1_tx=" . (isset($this->localtax1_tx) ? $this->localtax1_tx : "null") . ",";
@@ -918,6 +925,7 @@ class Productcustomerprice extends CommonObject
 		$this->price_min = '';
 		$this->price_min_ttc = '';
 		$this->price_base_type = '';
+		$this->default_vat_code = '';
 		$this->tva_tx = '';
 		$this->recuperableonly = '';
 		$this->localtax1_tx = '';
@@ -943,6 +951,7 @@ class PriceByCustomerLine
 	var $price_min;
 	var $price_min_ttc;
 	var $price_base_type;
+	var $default_vat_code;
 	var $tva_tx;
 	var $recuperableonly;
 	var $localtax1_tx;
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index e6bde28d27e..1e9bcec3d52 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -1518,13 +1518,13 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 		print '<tr>';
 		print '<td class="fieldrequired">' . $langs->trans('ThirdParty') . '</td>';
 		print '<td>';
-		print $form->select_company('', 'socid', 's.client in (1,2,3) AND s.rowid NOT IN (SELECT fk_soc FROM ' . MAIN_DB_PREFIX . 'product_customer_price WHERE fk_product='.$object->id.')', 'SelectThirdParty', 0, 0, array(), 0, 'minwidth300');
+		print $form->select_company('', 'socid', 's.client in (1,2,3)', 'SelectThirdParty', 0, 0, array(), 0, 'minwidth300');
 		print '</td>';
 		print '</tr>';
 
 		// VAT
 		print '<tr><td class="fieldrequired">' . $langs->trans("VATRate") . '</td><td>';
-		print $form->load_tva("tva_tx", $object->tva_tx, $mysoc, '', $object->id, $object->tva_npr, $object->type, false, 1);
+		print $form->load_tva("tva_tx", $object->default_vat_code ? $object->tva_tx.' ('.$object->default_vat_code.')' : $object->tva_tx, $mysoc, '', $object->id, $object->tva_npr, $object->type, false, 1);
 		print '</td></tr>';
 
 		// Price base
@@ -1610,9 +1610,9 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 
 		// VAT
 		print '<tr><td>' . $langs->trans("VATRate") . '</td><td colspan="2">';
-		print $form->load_tva("tva_tx", $prodcustprice->tva_tx, $mysoc, '', $object->id, $prodcustprice->recuperableonly, $object->type, false, 1);
+		print $form->load_tva("tva_tx", $prodcustprice->default_vat_code ? $prodcustprice->tva_tx.' ('.$prodcustprice->default_vat_code.')' : $prodcustprice->tva_tx, $mysoc, '', $object->id, $prodcustprice->recuperableonly, $object->type, false, 1);
 		print '</td></tr>';
-
+		
 		// Price base
 		print '<tr><td width="15%">';
 		print $langs->trans('PriceBase');
@@ -1731,8 +1731,10 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 				print "<td>" . $staticsoc->getNomUrl(1) . "</td>";
 				print "<td>" . dol_print_date($line->datec, "dayhour") . "</td>";
 
+				$tva_tx = $line->default_vat_code ? $line->tva_tx.' ('.$line->default_vat_code.')' : $line->tva_tx;
+				
 				print '<td align="center">' . $langs->trans($line->price_base_type) . "</td>";
-				print '<td align="right">' . vatrate($line->tva_tx, true, $line->recuperableonly) . "</td>";
+				print '<td align="right">' . vatrate($tva_tx, true, $line->recuperableonly) . "</td>";
 				print '<td align="right">' . price($line->price) . "</td>";
 				print '<td align="right">' . price($line->price_ttc) . "</td>";
 				print '<td align="right">' . price($line->price_min) . '</td>';
@@ -1844,11 +1846,13 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 				$staticsoc = new Societe($db);
 				$staticsoc->fetch($line->fk_soc);
 
+				$tva_tx = $line->default_vat_code ? $line->tva_tx.' ('.$line->default_vat_code.')' : $line->tva_tx;
+				
 				print "<td>" . $staticsoc->getNomUrl(1) . "</td>";
 				print "<td>" . dol_print_date($line->datec, "dayhour") . "</td>";
 
 				print '<td align="center">' . $langs->trans($line->price_base_type) . "</td>";
-				print '<td align="right">' . vatrate($line->tva_tx, true, $line->recuperableonly) . "</td>";
+				print '<td align="right">' . vatrate($tva_tx, true, $line->recuperableonly) . "</td>";
 				print '<td align="right">' . price($line->price) . "</td>";
 				print '<td align="right">' . price($line->price_ttc) . "</td>";
 				print '<td align="right">' . price($line->price_min) . '</td>';

From 419c15ee8efd6b7554ff084c3e4f5acb3c62f324 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 12 May 2017 15:28:10 +0200
Subject: [PATCH 319/505] Fix escaping class

---
 htdocs/adherents/class/adherent.class.php     | 10 +++----
 htdocs/comm/propal/class/propal.class.php     |  8 +++---
 htdocs/commande/class/commande.class.php      |  6 ++---
 htdocs/compta/bank/class/account.class.php    | 26 +++++++++----------
 htdocs/compta/facture/class/facture.class.php | 10 +++----
 .../compta/localtax/class/localtax.class.php  |  8 +++---
 .../cheque/class/remisecheque.class.php       |  2 +-
 .../salaries/class/paymentsalary.class.php    | 10 +++----
 .../sociales/class/chargesociales.class.php   |  4 +--
 htdocs/compta/tva/class/tva.class.php         |  8 +++---
 htdocs/contrat/class/contrat.class.php        | 26 +++++++++----------
 htdocs/theme/eldy/style.css.php               |  4 +--
 12 files changed, 61 insertions(+), 61 deletions(-)

diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index e12c49732dd..5a4c6ad08a0 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -433,18 +433,18 @@ class Adherent extends CommonObject
         $sql.= ", town="   .($this->town?"'".$this->db->escape($this->town)."'":"null");
         $sql.= ", country=".($this->country_id>0?"'".$this->country_id."'":"null");
         $sql.= ", state_id=".($this->state_id>0?"'".$this->state_id."'":"null");
-        $sql.= ", email='".$this->email."'";
-        $sql.= ", skype='".$this->skype."'";
+        $sql.= ", email='".$this->db->escape($this->email)."'";
+        $sql.= ", skype='".$this->db->escape($this->skype)."'";
         $sql.= ", phone="   .($this->phone?"'".$this->db->escape($this->phone)."'":"null");
         $sql.= ", phone_perso=" .($this->phone_perso?"'".$this->db->escape($this->phone_perso)."'":"null");
         $sql.= ", phone_mobile=" .($this->phone_mobile?"'".$this->db->escape($this->phone_mobile)."'":"null");
         $sql.= ", note_private=" .($this->note_private?"'".$this->db->escape($this->note_private)."'":"null");
         $sql.= ", note_public=" .($this->note_private?"'".$this->db->escape($this->note_public)."'":"null");
         $sql.= ", photo="   .($this->photo?"'".$this->photo."'":"null");
-        $sql.= ", public='".$this->public."'";
+        $sql.= ", public='".$this->db->escape($this->public)."'";
         $sql.= ", statut="  .$this->statut;
         $sql.= ", fk_adherent_type=".$this->typeid;
-        $sql.= ", morphy='".$this->morphy."'";
+        $sql.= ", morphy='".$this->db->escape($this->morphy)."'";
         $sql.= ", birth="   .($this->birth?"'".$this->db->idate($this->birth)."'":"null");
         if ($this->datefin)   $sql.= ", datefin='".$this->db->idate($this->datefin)."'";		// Ne doit etre modifie que par effacement cotisation
         if ($this->datevalid) $sql.= ", datevalid='".$this->db->idate($this->datevalid)."'";	// Ne doit etre modifie que par validation adherent
@@ -643,7 +643,7 @@ class Adherent extends CommonObject
         // Search for last subscription id and end date
         $sql = "SELECT rowid, datec as dateop, dateadh as datedeb, datef as datefin";
         $sql.= " FROM ".MAIN_DB_PREFIX."cotisation";
-        $sql.= " WHERE fk_adherent='".$this->id."'";
+        $sql.= " WHERE fk_adherent=".$this->id;
         $sql.= " ORDER by dateadh DESC";	// Sort by start subscription date
 
         dol_syslog(get_class($this)."::update_end_date", LOG_DEBUG);
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index f272120477f..5dbb8541838 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -911,7 +911,7 @@ class Propal extends CommonObject
             if ($this->id)
             {
                 $this->ref='(PROV'.$this->id.')';
-                $sql = 'UPDATE '.MAIN_DB_PREFIX."propal SET ref='".$this->ref."' WHERE rowid=".$this->id;
+                $sql = 'UPDATE '.MAIN_DB_PREFIX."propal SET ref='".$this->db->escape($this->ref)."' WHERE rowid=".$this->id;
 
                 dol_syslog(get_class($this)."::create", LOG_DEBUG);
                 $resql=$this->db->query($sql);
@@ -3443,14 +3443,14 @@ class PropaleLigne  extends CommonObjectLine
         $sql.= " , tva_tx='".price2num($this->tva_tx)."'";
         $sql.= " , localtax1_tx=".price2num($this->localtax1_tx);
         $sql.= " , localtax2_tx=".price2num($this->localtax2_tx);
-		$sql.= " , localtax1_type='".$this->localtax1_type."'";
-		$sql.= " , localtax2_type='".$this->localtax2_type."'";
+		$sql.= " , localtax1_type='".$this->db->escape($this->localtax1_type)."'";
+		$sql.= " , localtax2_type='".$this->db->escape($this->localtax2_type)."'";
         $sql.= " , qty='".price2num($this->qty)."'";
         $sql.= " , subprice=".price2num($this->subprice)."";
         $sql.= " , remise_percent=".price2num($this->remise_percent)."";
         $sql.= " , price=".price2num($this->price)."";					// TODO A virer
         $sql.= " , remise=".price2num($this->remise)."";				// TODO A virer
-        $sql.= " , info_bits='".$this->info_bits."'";
+        $sql.= " , info_bits='".$this->db->escape($this->info_bits)."'";
         if (empty($this->skip_update_total))
         {
             $sql.= " , total_ht=".price2num($this->total_ht)."";
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index cd97a6295f7..4aee6ae057d 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -3633,7 +3633,7 @@ class OrderLine extends CommonOrderLine
 
 	    $this->db->begin();
 
-        $sql = 'DELETE FROM '.MAIN_DB_PREFIX."commandedet WHERE rowid='".$this->rowid."';";
+        $sql = 'DELETE FROM '.MAIN_DB_PREFIX."commandedet WHERE rowid=".$this->rowid;
 
         dol_syslog("OrderLine::delete", LOG_DEBUG);
         $resql=$this->db->query($sql);
@@ -3874,8 +3874,8 @@ class OrderLine extends CommonOrderLine
 		$sql.= " , tva_tx=".price2num($this->tva_tx);
 		$sql.= " , localtax1_tx=".price2num($this->localtax1_tx);
 		$sql.= " , localtax2_tx=".price2num($this->localtax2_tx);
-		$sql.= " , localtax1_type='".$this->localtax1_type."'";
-		$sql.= " , localtax2_type='".$this->localtax2_type."'";
+		$sql.= " , localtax1_type='".$this->db->escape($this->localtax1_type)."'";
+		$sql.= " , localtax2_type='".$this->db->escape($this->localtax2_type)."'";
 		$sql.= " , qty=".price2num($this->qty);
 		$sql.= " , subprice=".price2num($this->subprice)."";
 		$sql.= " , remise_percent=".price2num($this->remise_percent)."";
diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index 96661f4074a..01c683285f5 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -683,17 +683,17 @@ class Account extends CommonObject
 		$sql.= ",accountancy_journal = '".$this->accountancy_journal."'";
 
 		$sql.= ",bank  = '".$this->db->escape($this->bank)."'";
-        $sql.= ",code_banque='".$this->code_banque."'";
-        $sql.= ",code_guichet='".$this->code_guichet."'";
-        $sql.= ",number='".$this->number."'";
-        $sql.= ",cle_rib='".$this->cle_rib."'";
-        $sql.= ",bic='".$this->bic."'";
-        $sql.= ",iban_prefix = '".$this->iban."'";
+        $sql.= ",code_banque='".$this->db->escape($this->code_banque)."'";
+        $sql.= ",code_guichet='".$this->db->escape($this->code_guichet)."'";
+        $sql.= ",number='".$this->db->escape($this->number)."'";
+        $sql.= ",cle_rib='".$this->db->escape($this->cle_rib)."'";
+        $sql.= ",bic='".$this->db->escape($this->bic)."'";
+        $sql.= ",iban_prefix = '".$this->db->escape($this->iban)."'";
         $sql.= ",domiciliation='".$this->db->escape($this->domiciliation)."'";
         $sql.= ",proprio = '".$this->db->escape($this->proprio)."'";
         $sql.= ",owner_address = '".$this->db->escape($this->owner_address)."'";
 
-        $sql.= ",currency_code = '".$this->currency_code."'";
+        $sql.= ",currency_code = '".$this->db->escape($this->currency_code)."'";
 
         $sql.= ",min_allowed = ".($this->min_allowed != '' ? price2num($this->min_allowed) : "null");
         $sql.= ",min_desired = ".($this->min_desired != '' ? price2num($this->min_desired) : "null");
@@ -767,12 +767,12 @@ class Account extends CommonObject
 
         $sql = "UPDATE ".MAIN_DB_PREFIX."bank_account SET ";
         $sql.= " bank  = '".$this->db->escape($this->bank)."'";
-        $sql.= ",code_banque='".$this->code_banque."'";
-        $sql.= ",code_guichet='".$this->code_guichet."'";
-        $sql.= ",number='".$this->number."'";
-        $sql.= ",cle_rib='".$this->cle_rib."'";
-        $sql.= ",bic='".$this->bic."'";
-        $sql.= ",iban_prefix = '".$this->iban."'";
+        $sql.= ",code_banque='".$this->db->escape($this->code_banque)."'";
+        $sql.= ",code_guichet='".$this->db->escape($this->code_guichet)."'";
+        $sql.= ",number='".$this->db->escape($this->number)."'";
+        $sql.= ",cle_rib='".$this->db->escape($this->cle_rib)."'";
+        $sql.= ",bic='".$this->db->escape($this->bic)."'";
+        $sql.= ",iban_prefix = '".$this->db->escape($this->iban)."'";
         $sql.= ",domiciliation='".$this->db->escape($this->domiciliation)."'";
         $sql.= ",proprio = '".$this->db->escape($this->proprio)."'";
         $sql.= ",owner_address = '".$this->db->escape($this->owner_address)."'";
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index ba834856fab..a1364702d52 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -392,7 +392,7 @@ class Facture extends CommonInvoice
 
 			// Update ref with new one
 			$this->ref='(PROV'.$this->id.')';
-			$sql = 'UPDATE '.MAIN_DB_PREFIX."facture SET facnumber='".$this->ref."' WHERE rowid=".$this->id;
+			$sql = 'UPDATE '.MAIN_DB_PREFIX."facture SET facnumber='".$this->db->escape($this->ref)."' WHERE rowid=".$this->id;
 
 			dol_syslog(get_class($this)."::create", LOG_DEBUG);
 			$resql=$this->db->query($sql);
@@ -4375,14 +4375,14 @@ class FactureLigne extends CommonInvoiceLine
         $sql.= ",tva_tx=".price2num($this->tva_tx)."";
         $sql.= ",localtax1_tx=".price2num($this->localtax1_tx)."";
         $sql.= ",localtax2_tx=".price2num($this->localtax2_tx)."";
-		$sql.= ",localtax1_type='".$this->localtax1_type."'";
-		$sql.= ",localtax2_type='".$this->localtax2_type."'";
+		$sql.= ",localtax1_type='".$this->db->escape($this->localtax1_type)."'";
+		$sql.= ",localtax2_type='".$this->db->escape($this->localtax2_type)."'";
         $sql.= ",qty=".price2num($this->qty)."";
         $sql.= ",date_start=".(! empty($this->date_start)?"'".$this->db->idate($this->date_start)."'":"null");
         $sql.= ",date_end=".(! empty($this->date_end)?"'".$this->db->idate($this->date_end)."'":"null");
         $sql.= ",product_type=".$this->product_type;
-        $sql.= ",info_bits='".$this->info_bits."'";
-        $sql.= ",special_code='".$this->special_code."'";
+        $sql.= ",info_bits='".$this->db->escape($this->info_bits)."'";
+        $sql.= ",special_code='".$this->db->escape($this->special_code)."'";
         if (empty($this->skip_update_total))
         {
         	$sql.= ",total_ht=".price2num($this->total_ht)."";
diff --git a/htdocs/compta/localtax/class/localtax.class.php b/htdocs/compta/localtax/class/localtax.class.php
index 067c8dc9cbe..e59b2c6ce2b 100644
--- a/htdocs/compta/localtax/class/localtax.class.php
+++ b/htdocs/compta/localtax/class/localtax.class.php
@@ -154,12 +154,12 @@ class Localtax extends CommonObject
 		$sql.= " tms=".$this->db->idate($this->tms).",";
 		$sql.= " datep=".$this->db->idate($this->datep).",";
 		$sql.= " datev=".$this->db->idate($this->datev).",";
-		$sql.= " amount='".$this->amount."',";
+		$sql.= " amount=".price2num($this->amount).",";
 		$sql.= " label='".$this->db->escape($this->label)."',";
 		$sql.= " note='".$this->db->escape($this->note)."',";
-		$sql.= " fk_bank='".$this->fk_bank."',";
-		$sql.= " fk_user_creat='".$this->fk_user_creat."',";
-		$sql.= " fk_user_modif='".$this->fk_user_modif."'";
+		$sql.= " fk_bank=".$this->fk_bank.",";
+		$sql.= " fk_user_creat=".$this->fk_user_creat.",";
+		$sql.= " fk_user_modif=".$this->fk_user_modif;
         $sql.= " WHERE rowid=".$this->id;
 
         dol_syslog(get_class($this)."::update", LOG_DEBUG);
diff --git a/htdocs/compta/paiement/cheque/class/remisecheque.class.php b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
index 6ab43a277c0..0d327e2832f 100644
--- a/htdocs/compta/paiement/cheque/class/remisecheque.class.php
+++ b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
@@ -177,7 +177,7 @@ class RemiseCheque extends CommonObject
 			{
 				$sql = "UPDATE ".MAIN_DB_PREFIX."bordereau_cheque";
 				$sql.= " SET ref='(PROV".$this->id.")'";
-				$sql.= " WHERE rowid='".$this->id."';";
+				$sql.= " WHERE rowid=".$this->id."";
 
 				dol_syslog("RemiseCheque::Create", LOG_DEBUG);
 				$resql = $this->db->query($sql);
diff --git a/htdocs/compta/salaries/class/paymentsalary.class.php b/htdocs/compta/salaries/class/paymentsalary.class.php
index a4bee09d7de..871a938a9c9 100644
--- a/htdocs/compta/salaries/class/paymentsalary.class.php
+++ b/htdocs/compta/salaries/class/paymentsalary.class.php
@@ -97,19 +97,19 @@ class PaymentSalary extends CommonObject
 		$sql = "UPDATE ".MAIN_DB_PREFIX."payment_salary SET";
 
 		$sql.= " tms=".$this->db->idate($this->tms).",";
-		$sql.= " fk_user='".$this->fk_user."',";
+		$sql.= " fk_user=".$this->fk_user.",";
 		$sql.= " datep=".$this->db->idate($this->datep).",";
 		$sql.= " datev=".$this->db->idate($this->datev).",";
-		$sql.= " amount='".$this->amount."',";
+		$sql.= " amount=".price2num($this->amount).",";
 		$sql.= " fk_typepayment=".$this->fk_typepayment."',";
-		$sql.= " num_payment='".$this->num_payment."',";
+		$sql.= " num_payment='".$this->db->escape($this->num_payment)."',";
 		$sql.= " label='".$this->db->escape($this->label)."',";
 		$sql.= " datesp=".$this->db->idate($this->datesp).",";
 		$sql.= " dateep=".$this->db->idate($this->dateep).",";
 		$sql.= " note='".$this->db->escape($this->note)."',";
 		$sql.= " fk_bank=".($this->fk_bank > 0 ? "'".$this->fk_bank."'":"null").",";
-		$sql.= " fk_user_author='".$this->fk_user_author."',";
-		$sql.= " fk_user_modif='".$this->fk_user_modif."'";
+		$sql.= " fk_user_author=".$this->fk_user_author.",";
+		$sql.= " fk_user_modif=".$this->fk_user_modif;
 
 		$sql.= " WHERE rowid=".$this->id;
 
diff --git a/htdocs/compta/sociales/class/chargesociales.class.php b/htdocs/compta/sociales/class/chargesociales.class.php
index e5653ba2ee3..da79bbffb75 100644
--- a/htdocs/compta/sociales/class/chargesociales.class.php
+++ b/htdocs/compta/sociales/class/chargesociales.class.php
@@ -216,7 +216,7 @@ class ChargeSociales extends CommonObject
         // Delete payments
         if (! $error)
         {
-            $sql = "DELETE FROM ".MAIN_DB_PREFIX."paiementcharge where fk_charge='".$this->id."'";
+            $sql = "DELETE FROM ".MAIN_DB_PREFIX."paiementcharge where fk_charge=".$this->id;
             dol_syslog(get_class($this)."::delete", LOG_DEBUG);
             $resql=$this->db->query($sql);
             if (! $resql)
@@ -228,7 +228,7 @@ class ChargeSociales extends CommonObject
 
         if (! $error)
         {
-            $sql = "DELETE FROM ".MAIN_DB_PREFIX."chargesociales where rowid='".$this->id."'";
+            $sql = "DELETE FROM ".MAIN_DB_PREFIX."chargesociales where rowid=".$this->id;
             dol_syslog(get_class($this)."::delete", LOG_DEBUG);
             $resql=$this->db->query($sql);
             if (! $resql)
diff --git a/htdocs/compta/tva/class/tva.class.php b/htdocs/compta/tva/class/tva.class.php
index eb4ee3a2408..d7ba51d6dc8 100644
--- a/htdocs/compta/tva/class/tva.class.php
+++ b/htdocs/compta/tva/class/tva.class.php
@@ -175,12 +175,12 @@ class Tva extends CommonObject
 		$sql.= " tms=".$this->db->idate($this->tms).",";
 		$sql.= " datep=".$this->db->idate($this->datep).",";
 		$sql.= " datev=".$this->db->idate($this->datev).",";
-		$sql.= " amount='".$this->amount."',";
+		$sql.= " amount=".price2num($this->amount).",";
 		$sql.= " label='".$this->db->escape($this->label)."',";
 		$sql.= " note='".$this->db->escape($this->note)."',";
-		$sql.= " fk_bank='".$this->fk_bank."',";
-		$sql.= " fk_user_creat='".$this->fk_user_creat."',";
-		$sql.= " fk_user_modif='".$this->fk_user_modif."'";
+		$sql.= " fk_bank=".$this->fk_bank.",";
+		$sql.= " fk_user_creat=".$this->fk_user_creat.",";
+		$sql.= " fk_user_modif=".$this->fk_user_modif."";
 
 
         $sql.= " WHERE rowid=".$this->id;
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 6ad972a11eb..d9addfff113 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -2606,9 +2606,9 @@ class ContratLigne extends CommonObjectLine
 
 		// Update request
 		$sql = "UPDATE ".MAIN_DB_PREFIX."contratdet SET";
-		$sql.= " fk_contrat='".$this->fk_contrat."',";
+		$sql.= " fk_contrat=".$this->fk_contrat.",";
 		$sql.= " fk_product=".($this->fk_product?"'".$this->fk_product."'":'null').",";
-		$sql.= " statut='".$this->statut."',";
+		$sql.= " statut=".$this->statut.",";
 		$sql.= " label='".$this->db->escape($this->label)."',";
 		$sql.= " description='".$this->db->escape($this->description)."',";
 		$sql.= " date_commande=".($this->date_commande!=''?"'".$this->db->idate($this->date_commande)."'":"null").",";
@@ -2616,23 +2616,23 @@ class ContratLigne extends CommonObjectLine
 		$sql.= " date_ouverture=".($this->date_ouverture!=''?"'".$this->db->idate($this->date_ouverture)."'":"null").",";
 		$sql.= " date_fin_validite=".($this->date_fin_validite!=''?"'".$this->db->idate($this->date_fin_validite)."'":"null").",";
 		$sql.= " date_cloture=".($this->date_cloture!=''?"'".$this->db->idate($this->date_cloture)."'":"null").",";
-		$sql.= " tva_tx='".$this->tva_tx."',";
-		$sql.= " localtax1_tx='".$this->localtax1_tx."',";
-		$sql.= " localtax2_tx='".$this->localtax2_tx."',";
-		$sql.= " qty='".$this->qty."',";
-		$sql.= " remise_percent='".$this->remise_percent."',";
+		$sql.= " tva_tx=".$this->tva_tx.",";
+		$sql.= " localtax1_tx=".$this->localtax1_tx.",";
+		$sql.= " localtax2_tx=".$this->localtax2_tx.",";
+		$sql.= " qty=".$this->qty.",";
+		$sql.= " remise_percent=".$this->remise_percent.",";
 		$sql.= " remise=".($this->remise?"'".$this->remise."'":"null").",";
 		$sql.= " fk_remise_except=".($this->fk_remise_except?"'".$this->fk_remise_except."'":"null").",";
 		$sql.= " subprice=".($this->subprice != '' ? $this->subprice : "null").",";
 		$sql.= " price_ht=".($this->price_ht != '' ? $this->price_ht : "null").",";
-		$sql.= " total_ht='".$this->total_ht."',";
-		$sql.= " total_tva='".$this->total_tva."',";
-		$sql.= " total_localtax1='".$this->total_localtax1."',";
-		$sql.= " total_localtax2='".$this->total_localtax2."',";
-		$sql.= " total_ttc='".$this->total_ttc."',";
+		$sql.= " total_ht=".$this->total_ht.",";
+		$sql.= " total_tva=".$this->total_tva.",";
+		$sql.= " total_localtax1=".$this->total_localtax1.",";
+		$sql.= " total_localtax2=".$this->total_localtax2.",";
+		$sql.= " total_ttc=".$this->total_ttc.",";
 		$sql.= " fk_product_fournisseur_price=".(!empty($this->fk_fournprice)?$this->fk_fournprice:"NULL").",";
 		$sql.= " buy_price_ht='".price2num($this->pa_ht)."',";
-		$sql.= " info_bits='".$this->info_bits."',";
+		$sql.= " info_bits='".$this->db->escape($this->info_bits)."',";
 		$sql.= " fk_user_author=".($this->fk_user_author >= 0?$this->fk_user_author:"NULL").",";
 		$sql.= " fk_user_ouverture=".($this->fk_user_ouverture > 0?$this->fk_user_ouverture:"NULL").",";
 		$sql.= " fk_user_cloture=".($this->fk_user_cloture > 0?$this->fk_user_cloture:"NULL").",";
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index d03ff95a50f..fef5f3d1e64 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -53,8 +53,8 @@ else header('Cache-Control: no-cache');
 // On the fly GZIP compression for all pages (if browser support it). Must set the bit 3 of constant to 1.
 if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x04)) { ob_start("ob_gzhandler"); }
 
-if (GETPOST('lang')) $langs->setDefaultLang(GETPOST('lang'));	// If language was forced on URL
-if (GETPOST('theme')) $conf->theme=GETPOST('theme');  // If theme was forced on URL
+if (GETPOST('lang')) $langs->setDefaultLang(GETPOST('lang', 'alpha'));	// If language was forced on URL
+if (GETPOST('theme')) $conf->theme=GETPOST('theme', 'alpha');  // If theme was forced on URL
 $langs->load("main",0,1);
 $right=($langs->trans("DIRECTION")=='rtl'?'left':'right');
 $left=($langs->trans("DIRECTION")=='rtl'?'right':'left');

From 88e7d54915feac7e61256c9a7f00731393ab8928 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 12 May 2017 15:45:00 +0200
Subject: [PATCH 320/505] Add phpunit to detect SQL not escaped string.

---
 test/phpunit/CodingPHPTest.php | 177 +++++++++++++++++++++++++++++++++
 1 file changed, 177 insertions(+)
 create mode 100644 test/phpunit/CodingPHPTest.php

diff --git a/test/phpunit/CodingPHPTest.php b/test/phpunit/CodingPHPTest.php
new file mode 100644
index 00000000000..b8d7bc90816
--- /dev/null
+++ b/test/phpunit/CodingPHPTest.php
@@ -0,0 +1,177 @@
+<?php
+/* Copyright (C) 2013 Laurent Destailleur  <eldy@users.sourceforge.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * or see http://www.gnu.org/
+ */
+
+/**
+ *      \file       test/phpunit/SqlTest.php
+ *      \ingroup    test
+ *      \brief      PHPUnit test
+ *      \remarks    To run this script as CLI:  phpunit filename.php
+ */
+
+global $conf,$user,$langs,$db;
+//define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
+//require_once 'PHPUnit/Autoload.php';
+require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
+require_once dirname(__FILE__).'/../../htdocs/core/lib/security.lib.php';
+require_once dirname(__FILE__).'/../../htdocs/core/lib/security2.lib.php';
+
+if (! defined('NOREQUIREUSER'))  define('NOREQUIREUSER','1');
+if (! defined('NOREQUIREDB'))    define('NOREQUIREDB','1');
+if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
+if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
+if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK','1');
+if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1');
+if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1'); // If there is no menu to show
+if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1'); // If we don't need to load the html.form.class.php
+if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
+if (! defined("NOLOGIN"))        define("NOLOGIN",'1');       // If this page is public (can be called outside logged session)
+
+if (empty($user->id))
+{
+    print "Load permissions for admin user nb 1\n";
+    $user->fetch(1);
+    $user->getrights();
+}
+$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+
+
+/**
+ * Class for PHPUnit tests
+ *
+ * @backupGlobals disabled
+ * @backupStaticAttributes enabled
+ * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
+ */
+class CodingPhpTest extends PHPUnit_Framework_TestCase
+{
+    protected $savconf;
+    protected $savuser;
+    protected $savlangs;
+    protected $savdb;
+
+    /**
+     * Constructor
+     * We save global variables into local variables
+     *
+     * @return SecurityTest
+     */
+    function __construct()
+    {
+        //$this->sharedFixture
+        global $conf,$user,$langs,$db;
+        $this->savconf=$conf;
+        $this->savuser=$user;
+        $this->savlangs=$langs;
+        $this->savdb=$db;
+
+        print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+        //print " - db ".$db->db;
+        print "\n";
+    }
+
+    // Static methods
+    public static function setUpBeforeClass()
+    {
+        global $conf,$user,$langs,$db;
+        $db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
+
+        print __METHOD__."\n";
+    }
+
+    // tear down after class
+    public static function tearDownAfterClass()
+    {
+        global $conf,$user,$langs,$db;
+        $db->rollback();
+
+        print __METHOD__."\n";
+    }
+
+    /**
+     * Init phpunit tests
+     *
+     * @return  void
+     */
+    protected function setUp()
+    {
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
+
+        print __METHOD__."\n";
+    }
+
+    /**
+     * End phpunit tests
+     *
+     * @return  void
+     */
+    protected function tearDown()
+    {
+        print __METHOD__."\n";
+    }
+
+    /**
+     * testSql
+     *
+     * @return string
+     */
+    public function testPHP()
+    {
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
+
+        include DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+        $filesarray = dol_dir_list(DOL_DOCUMENT_ROOT, 'files', 1, '\.php', null, 'fullname');
+
+        foreach($filesarray as $key => $file) 
+        {
+            if (preg_match('/\/htdocs\/includes\//', $file['fullname'])) continue;
+            if (preg_match('/\/htdocs\/custom\//', $file['fullname'])) continue;
+            if (preg_match('/\/htdocs\/nltechno/', $file['fullname'])) continue;
+            if (preg_match('/\/htdocs\/dolimed/', $file['fullname'])) continue;
+            
+            print 'Check php file '.$file['fullname']."\n";
+            $filecontent=file_get_contents($file['fullname']);
+            
+            $ok=true;
+            $matches=array();
+            preg_match_all('/=\'".\$this->(..)/', $filecontent, $matches, PREG_SET_ORDER);
+            foreach($matches as $key => $val)
+            {
+                if ($val[1] != 'db') 
+                {
+                    $ok=false;
+                    break;
+                }
+                //if ($reg[0] != 'db') $ok=false;
+            }
+            //print __METHOD__." Result for checking we don't have non escaped string in sql requests for file ".$file."\n";
+            $this->assertTrue($ok, 'Found non escaped string in building of a sql request '.$file['fullname'].'. Bad.');
+            //exit;
+        }
+
+        return;
+    }
+
+}

From a534f796687d2ebddb79acca13a3b33c0d16474a Mon Sep 17 00:00:00 2001
From: philippe grand <philippe.grand@atoo-net.com>
Date: Fri, 12 May 2017 16:02:01 +0200
Subject: [PATCH 321/505] Update code using new css class

---
 htdocs/contrat/card.php  |  8 ++++----
 htdocs/contrat/index.php | 16 +++-------------
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index e88372c4835..4accbed5636 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -1757,7 +1757,7 @@ else
             if ($action == 'deleteline' && ! $_REQUEST["cancel"] && $user->rights->contrat->creer && $object->lines[$cursorline-1]->id == GETPOST('rowid'))
             {
                 print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id."&lineid=".GETPOST('rowid'),$langs->trans("DeleteContractLine"),$langs->trans("ConfirmDeleteContractLine"),"confirm_deleteline",'',0,1);
-                if ($ret == 'html') print '<table class="notopnoleftnoright" width="100%"><tr '.$bc[$var].' height="6"><td></td></tr></table>';
+                if ($ret == 'html') print '<table class="notopnoleftnoright" width="100%"><tr class="oddeven" height="6"><td></td></tr></table>';
             }
 
             /*
@@ -1777,7 +1777,7 @@ else
                 array('type' => 'select', 'name' => 'newcid', 'values' => $arraycontractid));
 
                 $form->form_confirm($_SERVER["PHP_SELF"]."?id=".$object->id."&lineid=".GETPOST('rowid'),$langs->trans("MoveToAnotherContract"),$langs->trans("ConfirmMoveToAnotherContract"),"confirm_move",$formquestion);
-                print '<table class="notopnoleftnoright" width="100%"><tr '.$bc[$var].' height="6"><td></td></tr></table>';
+                print '<table class="notopnoleftnoright" width="100%"><tr class="oddeven" height="6"><td></td></tr></table>';
             }
 
             /*
@@ -1789,7 +1789,7 @@ else
                 $dateactend   = dol_mktime(12, 0, 0, GETPOST('endmonth'), GETPOST('endday'), GETPOST('endyear'));
                 $comment      = GETPOST('comment');
                 $form->form_confirm($_SERVER["PHP_SELF"]."?id=".$object->id."&ligne=".GETPOST('ligne')."&date=".$dateactstart."&dateend=".$dateactend."&comment=".urlencode($comment),$langs->trans("ActivateService"),$langs->trans("ConfirmActivateService",dol_print_date($dateactstart,"%A %d %B %Y")),"confirm_active", '', 0, 1);
-                print '<table class="notopnoleftnoright" width="100%"><tr '.$bc[$var].' height="6"><td></td></tr></table>';
+                print '<table class="notopnoleftnoright" width="100%"><tr class="oddeven" height="6"><td></td></tr></table>';
             }
 
             /*
@@ -1801,7 +1801,7 @@ else
                 $dateactend   = dol_mktime(12, 0, 0, GETPOST('endmonth'), GETPOST('endday'), GETPOST('endyear'));
                 $comment      = GETPOST('comment');
                 $form->form_confirm($_SERVER["PHP_SELF"]."?id=".$object->id."&ligne=".GETPOST('ligne')."&date=".$dateactstart."&dateend=".$dateactend."&comment=".urlencode($comment), $langs->trans("CloseService"), $langs->trans("ConfirmCloseService",dol_print_date($dateactend,"%A %d %B %Y")), "confirm_closeline", '', 0, 1);
-                print '<table class="notopnoleftnoright" width="100%"><tr '.$bc[$var].' height="6"><td></td></tr></table>';
+                print '<table class="notopnoleftnoright" width="100%"><tr class="oddeven" height="6"><td></td></tr></table>';
             }
 
 
diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php
index ea9c06d0b2f..924958319a4 100644
--- a/htdocs/contrat/index.php
+++ b/htdocs/contrat/index.php
@@ -77,7 +77,6 @@ if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is usele
     // Search contract
     if (! empty($conf->contrat->enabled))
     {
-    	$var=false;
     	print '<form method="post" action="'.DOL_URL_ROOT.'/contrat/list.php">';
     	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
     	print '<table class="noborder nohover" width="100%">';
@@ -181,7 +180,6 @@ else
 
 print '<table class="noborder nohover" width="100%">';
 print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").' - '.$langs->trans("Services").'</th></tr>'."\n";
-$var=true;
 $listofstatus=array(0,4,4,5); $bool=false;
 foreach($listofstatus as $status)
 {
@@ -204,13 +202,11 @@ if (! empty($conf->use_javascript_ajax))
     dol_print_graph('stats',300,180,$data,1,'pie',1);
     print '</td></tr>';
 }
-$var=true;
 $listofstatus=array(0,4,4,5); $bool=false;
 foreach($listofstatus as $status)
 {
     if (empty($conf->use_javascript_ajax))
-    {
-        
+    {      
     	print '<tr class="oddeven">';
     	print '<td>'.$staticcontratligne->LibStatut($status,0,($bool?1:0)).'</td>';
     	print '<td align="right"><a href="services.php?mode='.$status.($bool?'&filter=expired':'').'">'.($nb[$status.$bool]?$nb[$status.$bool]:0).' '.$staticcontratligne->LibStatut($status,3,($bool?1:0)).'</a></td>';
@@ -243,7 +239,6 @@ if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire)
 
 	if ( $resql )
 	{
-		$var = false;
 		$num = $db->num_rows($resql);
 
 		print '<table class="noborder" width="100%">';
@@ -277,7 +272,7 @@ if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire)
 		}
 		else
 		{
-			print '<tr '.$bc[$var].' class><td colspan="3" class="opacitymedium">'.$langs->trans("NoContracts").'</td></tr>';
+			print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("NoContracts").'</td></tr>';
 		}
 		print "</table><br>";
 		$db->free($resql);
@@ -330,11 +325,9 @@ if ($result)
 	print '<th align="center" width="80" colspan="4">'.$langs->trans("Services").'</th>';
 	print "</tr>\n";
 
-	$var=True;
 	while ($i < $num)
 	{
-		$obj = $db->fetch_object($result);
-		
+		$obj = $db->fetch_object($result);		
 
 		print '<tr class="oddeven">';
 		print '<td width="110" class="nowrap">';
@@ -397,7 +390,6 @@ if ($resql)
 	print '<tr class="liste_titre"><th colspan="4">'.$langs->trans("LastModifiedServices",$max).'</th>';
 	print "</tr>\n";
 
-	$var=True;
 	while ($i < min($num,$max))
 	{
 		$obj = $db->fetch_object($resql);
@@ -478,7 +470,6 @@ if ($resql)
 	print '<tr class="liste_titre"><th colspan="4">'.$langs->trans("NotActivatedServices").' <a href="'.DOL_URL_ROOT.'/contrat/services.php?mode=0"><span class="badge">'.$num.'</span></a></th>';
 	print "</tr>\n";
 
-	$var=True;
 	while ($i < $num)
 	{
 		$obj = $db->fetch_object($resql);
@@ -559,7 +550,6 @@ if ($resql)
 	print '<tr class="liste_titre"><th colspan="4">'.$langs->trans("ListOfExpiredServices").' <a href="'.DOL_URL_ROOT.'/contrat/services.php?mode=4&amp;filter=expired"><span class="badge">'.$num.'</span></a></th>';
 	print "</tr>\n";
 
-	$var=True;
 	while ($i < $num)
 	{
 		$obj = $db->fetch_object($resql);

From fa290c34fad108ec7c0751c0372ae9c4b4f63b06 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 12 May 2017 16:55:11 +0200
Subject: [PATCH 322/505] Fix against SQL injection. Add phpunit to detect
 missing escapement.

---
 .../class/accountingaccount.class.php         |  8 ++---
 .../accountancy/class/bookkeeping.class.php   | 10 +++---
 htdocs/adherents/class/adherent.class.php     |  4 +--
 .../adherents/class/adherent_type.class.php   |  4 +--
 htdocs/bookmarks/class/bookmark.class.php     |  6 ++--
 htdocs/categories/class/categorie.class.php   | 10 +++---
 htdocs/comm/action/class/actioncomm.class.php | 12 +++----
 htdocs/comm/mailing/class/mailing.class.php   | 10 +++---
 htdocs/comm/propal/class/propal.class.php     |  2 +-
 htdocs/compta/bank/class/account.class.php    |  6 ++--
 .../bank/class/paymentvarious.class.php       | 12 +++----
 .../deplacement/class/deplacement.class.php   |  4 +--
 .../cheque/class/remisecheque.class.php       |  2 +-
 .../class/bonprelevement.class.php            |  8 ++---
 htdocs/contact/class/contact.class.php        |  2 +-
 htdocs/contrat/class/contrat.class.php        | 10 +++---
 htdocs/core/class/commonobject.class.php      | 32 +++++++++----------
 htdocs/core/class/events.class.php            |  2 +-
 htdocs/core/class/fiscalyear.class.php        |  4 +--
 htdocs/core/class/link.class.php              |  4 +--
 htdocs/core/class/menubase.class.php          |  8 ++---
 htdocs/core/modules/DolibarrModules.class.php | 12 +++----
 htdocs/core/modules/modAdherent.class.php     |  4 +--
 htdocs/core/modules/modCommande.class.php     |  4 +--
 htdocs/core/modules/modDon.class.php          |  4 +--
 htdocs/core/modules/modExpedition.class.php   |  8 ++---
 htdocs/core/modules/modFacture.class.php      |  4 +--
 htdocs/core/modules/modFicheinter.class.php   |  4 +--
 htdocs/core/modules/modFournisseur.class.php  |  4 +--
 htdocs/core/modules/modPrelevement.class.php  |  4 +--
 htdocs/core/modules/modProjet.class.php       |  8 ++---
 htdocs/core/modules/modPropale.class.php      |  4 +--
 .../modules/modSupplierProposal.class.php     |  4 +--
 htdocs/don/class/don.class.php                |  8 ++---
 htdocs/ecm/class/ecmdirectory.class.php       |  2 +-
 htdocs/ecm/class/ecmfiles.class.php           |  2 +-
 htdocs/expedition/class/expedition.class.php  | 10 +++---
 .../class/expensereport.class.php             | 16 +++++-----
 htdocs/fichinter/class/fichinter.class.php    |  4 +--
 .../class/fournisseur.commande.class.php      |  8 ++---
 .../fourn/class/fournisseur.facture.class.php |  6 ++--
 htdocs/holiday/class/holiday.class.php        | 12 +++----
 htdocs/hrm/class/establishment.class.php      | 10 +++---
 htdocs/livraison/class/livraison.class.php    |  2 +-
 htdocs/loan/class/loan.class.php              |  4 +--
 .../product/actions_card_product.class.php    |  2 +-
 .../service/actions_card_service.class.php    |  2 +-
 htdocs/product/class/product.class.php        | 18 +++++------
 htdocs/projet/class/project.class.php         |  2 +-
 htdocs/projet/class/projectstats.class.php    |  2 +-
 .../class/companybankaccount.class.php        | 12 +++----
 htdocs/societe/class/societe.class.php        | 16 +++++-----
 .../class/supplier_proposal.class.php         |  8 ++---
 htdocs/user/class/userbankaccount.class.php   | 12 +++----
 test/phpunit/AllTests.php                     |  9 ++++--
 .../{CodingPHPTest.php => CodingPhpTest.php}  |  9 +++---
 .../{SqlTest.php => CodingSqlTest.php}        |  0
 57 files changed, 202 insertions(+), 198 deletions(-)
 rename test/phpunit/{CodingPHPTest.php => CodingPhpTest.php} (94%)
 rename test/phpunit/{SqlTest.php => CodingSqlTest.php} (100%)

diff --git a/htdocs/accountancy/class/accountingaccount.class.php b/htdocs/accountancy/class/accountingaccount.class.php
index 8bf7dfe0c44..a526f9171a6 100644
--- a/htdocs/accountancy/class/accountingaccount.class.php
+++ b/htdocs/accountancy/class/accountingaccount.class.php
@@ -251,12 +251,12 @@ class AccountingAccount extends CommonObject
 		$sql .= " SET fk_pcg_version = " . ($this->fk_pcg_version ? "'" . $this->db->escape($this->fk_pcg_version) . "'" : "null");
 		$sql .= " , pcg_type = " . ($this->pcg_type ? "'" . $this->db->escape($this->pcg_type) . "'" : "null");
 		$sql .= " , pcg_subtype = " . ($this->pcg_subtype ? "'" . $this->db->escape($this->pcg_subtype) . "'" : "null");
-		$sql .= " , account_number = '" . $this->account_number . "'";
-		$sql .= " , account_parent = '" . $this->account_parent . "'";
+		$sql .= " , account_number = '" . $this->db->escape($this->account_number) . "'";
+		$sql .= " , account_parent = '" . $this->db->escape($this->account_parent) . "'";
 		$sql .= " , label = " . ($this->label ? "'" . $this->db->escape($this->label) . "'" : "null");
-		$sql .= " , fk_accounting_category = '" . $this->account_category . "'";
+		$sql .= " , fk_accounting_category = '" . $this->db->escape($this->account_category) . "'";
 		$sql .= " , fk_user_modif = " . $user->id;
-		$sql .= " , active = '" . $this->active . "'";
+		$sql .= " , active = " . $this->active;
 		$sql .= " WHERE rowid = " . $this->id;
 		
 		dol_syslog(get_class($this) . "::update sql=" . $sql, LOG_DEBUG);
diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index 8f31b40bc54..a59d92eb63a 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -189,10 +189,10 @@ class BookKeeping extends CommonObject
 		// First check if line not yet already in bookkeeping
 		$sql = "SELECT count(*) as nb";
 		$sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element;
-		$sql .= " WHERE doc_type = '" . $this->doc_type . "'";
+		$sql .= " WHERE doc_type = '" . $this->db->escape($this->doc_type) . "'";
 		$sql .= " AND fk_doc = " . $this->fk_doc;
 		$sql .= " AND fk_docdet = " . $this->fk_docdet;                   // This field can be 0 is record is for several lines 
-		$sql .= " AND numero_compte = '" . $this->numero_compte . "'";
+		$sql .= " AND numero_compte = '" . $this->db->escape($this->numero_compte) . "'";
 	    $sql .= " AND entity IN (" . getEntity("accountancy", 1) . ")";
 		
 		$resql = $this->db->query($sql);
@@ -204,9 +204,9 @@ class BookKeeping extends CommonObject
 				// Determine piece_num
 				$sqlnum = "SELECT piece_num";
 				$sqlnum .= " FROM " . MAIN_DB_PREFIX . $this->table_element;
-				$sqlnum .= " WHERE doc_type = '" . $this->doc_type . "'";		// For example doc_type = 'bank' 
-				$sqlnum .= " AND fk_docdet = '" . $this->fk_docdet . "'";		// fk_docdet is rowid into llx_bank or llx_facturedet or llx_facturefourndet, or ...
-				$sqlnum .= " AND doc_ref = '" . $this->doc_ref . "'";			// ref of source object
+				$sqlnum .= " WHERE doc_type = '" . $this->db->escape($this->doc_type) . "'";		// For example doc_type = 'bank' 
+				$sqlnum .= " AND fk_docdet = " . $this->db->escape($this->fk_docdet);       		// fk_docdet is rowid into llx_bank or llx_facturedet or llx_facturefourndet, or ...
+				$sqlnum .= " AND doc_ref = '" . $this->db->escape($this->doc_ref) . "'";			// ref of source object
 			    $sqlnum .= " AND entity IN (" . getEntity("accountancy", 1) . ")";
 				
 				dol_syslog(get_class($this) . ":: create sqlnum=" . $sqlnum, LOG_DEBUG);
diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 17fad129d80..92449005d1f 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -345,7 +345,7 @@ class Adherent extends CommonObject
                 {
                     // Add link to user
                     $sql = "UPDATE ".MAIN_DB_PREFIX."user SET";
-                    $sql.= " fk_member = '".$this->id."'";
+                    $sql.= " fk_member = ".$this->id;
                     $sql.= " WHERE rowid = ".$this->user_id;
                     dol_syslog(get_class($this)."::create", LOG_DEBUG);
                     $resql = $this->db->query($sql);
@@ -1099,7 +1099,7 @@ class Adherent extends CommonObject
         elseif ($ref || $fk_soc) {
         	$sql.= " AND d.entity IN (".getEntity().")";
         	if ($ref) $sql.= " AND d.rowid='".$this->db->escape($ref)."'";
-        	elseif ($fk_soc) $sql.= " AND d.fk_soc='".$fk_soc."'";
+        	elseif ($fk_soc > 0) $sql.= " AND d.fk_soc=".$fk_soc;
         }
         elseif ($ref_ext)
         {
diff --git a/htdocs/adherents/class/adherent_type.class.php b/htdocs/adherents/class/adherent_type.class.php
index c756cc51949..d6ee9958162 100644
--- a/htdocs/adherents/class/adherent_type.class.php
+++ b/htdocs/adherents/class/adherent_type.class.php
@@ -123,9 +123,9 @@ class AdherentType extends CommonObject
         $sql.= "SET ";
         $sql.= "statut = ".$this->statut.",";
         $sql.= "libelle = '".$this->db->escape($this->libelle) ."',";
-        $sql.= "subscription = '".$this->subscription."',";
+        $sql.= "subscription = '".$this->db->escape($this->subscription)."',";
         $sql.= "note = '".$this->db->escape($this->note)."',";
-        $sql.= "vote = '".$this->vote."',";
+        $sql.= "vote = '".$this->db->escape($this->vote)."',";
         $sql.= "mail_valid = '".$this->db->escape($this->mail_valid)."'";
         $sql .= " WHERE rowid =".$this->id;
 
diff --git a/htdocs/bookmarks/class/bookmark.class.php b/htdocs/bookmarks/class/bookmark.class.php
index 0e0d6df5f35..26eabc5a5ed 100644
--- a/htdocs/bookmarks/class/bookmark.class.php
+++ b/htdocs/bookmarks/class/bookmark.class.php
@@ -173,10 +173,10 @@ class Bookmark extends CommonObject
         $sql.= " SET fk_user = ".($this->fk_user > 0?"'".$this->fk_user."'":"0");
         $sql.= " ,dateb = '".$this->db->idate($this->datec)."'";
         $sql.= " ,url = '".$this->db->escape($this->url)."'";
-        $sql.= " ,target = '".$this->target."'";
+        $sql.= " ,target = '".$this->db->escape($this->target)."'";
         $sql.= " ,title = '".$this->db->escape($this->title)."'";
-        $sql.= " ,favicon = '".$this->favicon."'";
-        $sql.= " ,position = '".$this->position."'";
+        $sql.= " ,favicon = '".$this->db->escape($this->favicon)."'";
+        $sql.= " ,position = '".$this->db->escape($this->position)."'";
         $sql.= " WHERE rowid = ".$this->id;
 
         dol_syslog("Bookmark::update", LOG_DEBUG);
diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index b2cd3d3dd31..518c3faa683 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -189,9 +189,9 @@ class Categorie extends CommonObject
 
 		$sql = "SELECT rowid, fk_parent, entity, label, description, color, fk_soc, visible, type";
 		$sql.= " FROM ".MAIN_DB_PREFIX."categorie";
-		if ($id)
+		if ($id > 0)
 		{
-			$sql.= " WHERE rowid = '".$id."'";
+			$sql.= " WHERE rowid = ".$id;
 		}
 		else
 		{
@@ -399,7 +399,7 @@ class Categorie extends CommonObject
 		{
 			$sql .= ", fk_soc = ".($this->socid != -1 ? $this->socid : 'null');
 		}
-		$sql .= ", visible = '".$this->visible."'";
+		$sql .= ", visible = '".$this->db->escape($this->visible)."'";
 		$sql .= ", fk_parent = ".$this->fk_parent;
 		$sql .= " WHERE rowid = ".$this->id;
 
@@ -1670,7 +1670,7 @@ class Categorie extends CommonObject
 	                $sql2 = "UPDATE ".MAIN_DB_PREFIX."categorie_lang";
 	                $sql2.= " SET label='".$this->db->escape($this->label)."',";
 	                $sql2.= " description='".$this->db->escape($this->description)."'";
-	                $sql2.= " WHERE fk_category=".$this->id." AND lang='".$key."'";
+	                $sql2.= " WHERE fk_category=".$this->id." AND lang='".$this->db->escape($key)."'";
 	            }
 	            else
 	            {
@@ -1692,7 +1692,7 @@ class Categorie extends CommonObject
 	                $sql2 = "UPDATE ".MAIN_DB_PREFIX."categorie_lang";
 	                $sql2.= " SET label='".$this->db->escape($this->multilangs["$key"]["label"])."',";
 	                $sql2.= " description='".$this->db->escape($this->multilangs["$key"]["description"])."'";
-	                $sql2.= " WHERE fk_category=".$this->id." AND lang='".$key."'";
+	                $sql2.= " WHERE fk_category=".$this->id." AND lang='".$this->db->escape($key)."'";
 	            }
 	            else
 	            {
diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index fc0bbebb901..a9695abcb35 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -753,8 +753,8 @@ class ActionComm extends CommonObject
         $this->db->begin();
 
         $sql = "UPDATE ".MAIN_DB_PREFIX."actioncomm ";
-        $sql.= " SET percent = '".$this->percentage."'";
-        if ($this->fk_action > 0) $sql.= ", fk_action = '".$this->fk_action."'";
+        $sql.= " SET percent = '".$this->db->escape($this->percentage)."'";
+        if ($this->fk_action > 0) $sql.= ", fk_action = '".$this->db->escape($this->fk_action)."'";
         $sql.= ", label = ".($this->label ? "'".$this->db->escape($this->label)."'":"null");
         $sql.= ", datep = ".(strval($this->datep)!='' ? "'".$this->db->idate($this->datep)."'" : 'null');
         $sql.= ", datep2 = ".(strval($this->datef)!='' ? "'".$this->db->idate($this->datef)."'" : 'null');
@@ -763,11 +763,11 @@ class ActionComm extends CommonObject
         $sql.= ", fk_project =". ($this->fk_project > 0 ? "'".$this->fk_project."'":"null");
         $sql.= ", fk_soc =". ($socid > 0 ? "'".$socid."'":"null");
         $sql.= ", fk_contact =". ($contactid > 0 ? "'".$contactid."'":"null");
-        $sql.= ", priority = '".$this->priority."'";
-        $sql.= ", fulldayevent = '".$this->fulldayevent."'";
+        $sql.= ", priority = '".$this->db->escape($this->priority)."'";
+        $sql.= ", fulldayevent = '".$this->db->escape($this->fulldayevent)."'";
         $sql.= ", location = ".($this->location ? "'".$this->db->escape($this->location)."'":"null");
-        $sql.= ", transparency = '".$this->transparency."'";
-        $sql.= ", fk_user_mod = '".$user->id."'";
+        $sql.= ", transparency = '".$this->db->escape($this->transparency)."'";
+        $sql.= ", fk_user_mod = ".$user->id;
         $sql.= ", fk_user_action=".($userownerid > 0 ? "'".$userownerid."'":"null");
         $sql.= ", fk_user_done=".($userdoneid > 0 ? "'".$userdoneid."'":"null");
         if (! empty($this->fk_element)) $sql.= ", fk_element=".($this->fk_element?$this->fk_element:"null");
diff --git a/htdocs/comm/mailing/class/mailing.class.php b/htdocs/comm/mailing/class/mailing.class.php
index 43a3cdcb78d..93c47f8aa51 100644
--- a/htdocs/comm/mailing/class/mailing.class.php
+++ b/htdocs/comm/mailing/class/mailing.class.php
@@ -159,11 +159,11 @@ class Mailing extends CommonObject
 		$sql .= " SET titre = '".$this->db->escape($this->titre)."'";
 		$sql .= ", sujet = '".$this->db->escape($this->sujet)."'";
 		$sql .= ", body = '".$this->db->escape($this->body)."'";
-		$sql .= ", email_from = '".$this->email_from."'";
-		$sql .= ", email_replyto = '".$this->email_replyto."'";
-		$sql .= ", email_errorsto = '".$this->email_errorsto."'";
-		$sql .= ", bgcolor = '".($this->bgcolor?$this->bgcolor:null)."'";
-		$sql .= ", bgimage = '".($this->bgimage?$this->bgimage:null)."'";
+		$sql .= ", email_from = '".$this->db->escape($this->email_from)."'";
+		$sql .= ", email_replyto = '".$this->db->escape($this->email_replyto)."'";
+		$sql .= ", email_errorsto = '".$this->db->escape($this->email_errorsto)."'";
+		$sql .= ", bgcolor = '".($this->bgcolor?$this->db->escape($this->bgcolor):null)."'";
+		$sql .= ", bgimage = '".($this->bgimage?$this->db->escape($this->bgimage):null)."'";
 		$sql .= " WHERE rowid = ".$this->id;
 
 		dol_syslog("Mailing::Update", LOG_DEBUG);
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index dfb53b07621..224cb77eee1 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -1021,7 +1021,7 @@ class Propal extends CommonObject
                 {
                     $sql = "UPDATE ".MAIN_DB_PREFIX."propal";
                     $sql.= " SET fk_delivery_address = ".$this->fk_delivery_address;
-                    $sql.= " WHERE ref = '".$this->ref."'";
+                    $sql.= " WHERE ref = '".$this->db->escape($this->ref)."'";
                     $sql.= " AND entity = ".$conf->entity;
 
                     $result=$this->db->query($sql);
diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index e2ad8c64bd1..9fdd329fd3d 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -701,8 +701,8 @@ class Account extends CommonObject
         $sql.= ",clos = ".$this->clos;
         $sql.= ",rappro = ".$this->rappro;
         $sql.= ",url = ".($this->url?"'".$this->url."'":"null");
-        $sql.= ",account_number = '".$this->account_number."'";
-		$sql.= ",fk_accountancy_journal = '".$this->fk_accountancy_journal."'";
+        $sql.= ",account_number = '".$this->db->escape($this->account_number)."'";
+		$sql.= ",fk_accountancy_journal = '".$this->db->escape($this->fk_accountancy_journal)."'";
 
 		$sql.= ",bank  = '".$this->db->escape($this->bank)."'";
         $sql.= ",code_banque='".$this->db->escape($this->code_banque)."'";
@@ -1858,7 +1858,7 @@ class AccountLine extends CommonObject
         
         $sql = "UPDATE ".MAIN_DB_PREFIX."bank SET";
         $sql.= " rappro = 1";
-        $sql.= ", num_releve = '".$this->num_releve."'";
+        $sql.= ", num_releve = '".$this->db->escape($this->num_releve)."'";
         $sql.= ", fk_user_rappro = ".$user->id;
         $sql.= " WHERE rowid = ".$this->id;
 
diff --git a/htdocs/compta/bank/class/paymentvarious.class.php b/htdocs/compta/bank/class/paymentvarious.class.php
index 2cbd75146df..d0c0d61a954 100644
--- a/htdocs/compta/bank/class/paymentvarious.class.php
+++ b/htdocs/compta/bank/class/paymentvarious.class.php
@@ -88,19 +88,19 @@ class PaymentVarious extends CommonObject
 		$sql = "UPDATE ".MAIN_DB_PREFIX."payment_salary SET";
 
 		$sql.= " tms=".$this->db->idate($this->tms).",";
-		$sql.= " fk_user='".$this->fk_user."',";
+		$sql.= " fk_user=".$this->fk_user.",";
 		$sql.= " datep=".$this->db->idate($this->datep).",";
 		$sql.= " datev=".$this->db->idate($this->datev).",";
 		$sql.= " sens=".$this->sens.",";
-		$sql.= " amount='".$this->amount."',";
+		$sql.= " amount=".price2num($this->amount).",";
 		$sql.= " fk_typepayment=".$this->fk_typepayment."',";
-		$sql.= " num_payment='".$this->num_payment."',";
+		$sql.= " num_payment='".$this->db->escape($this->num_payment)."',";
 		$sql.= " label='".$this->db->escape($this->label)."',";
 		$sql.= " note='".$this->db->escape($this->note)."',";
 		$sql.= " accountancy_code='".$this->db->escape($this->accountancy_code)."',";
-		$sql.= " fk_bank=".($this->fk_bank > 0 ? "'".$this->fk_bank."'":"null").",";
-		$sql.= " fk_user_author='".$this->fk_user_author."',";
-		$sql.= " fk_user_modif='".$this->fk_user_modif."'";
+		$sql.= " fk_bank=".($this->fk_bank > 0 ? $this->fk_bank:"null").",";
+		$sql.= " fk_user_author=".$this->fk_user_author.",";
+		$sql.= " fk_user_modif=".$this->fk_user_modif;
 
 		$sql.= " WHERE rowid=".$this->id;
 
diff --git a/htdocs/compta/deplacement/class/deplacement.class.php b/htdocs/compta/deplacement/class/deplacement.class.php
index 4b2dce9f14e..fa8911cecf7 100644
--- a/htdocs/compta/deplacement/class/deplacement.class.php
+++ b/htdocs/compta/deplacement/class/deplacement.class.php
@@ -187,8 +187,8 @@ class Deplacement extends CommonObject
 		$sql = "UPDATE ".MAIN_DB_PREFIX."deplacement ";
 		$sql .= " SET km = ".$this->km;		// This is a distance or amount
 		$sql .= " , dated = '".$this->db->idate($this->date)."'";
-		$sql .= " , type = '".$this->type."'";
-		$sql .= " , fk_statut = '".$this->statut."'";
+		$sql .= " , type = '".$this->db->escape($this->type)."'";
+		$sql .= " , fk_statut = '".$this->db->escape($this->statut)."'";
 		$sql .= " , fk_user = ".$this->fk_user;
 		$sql .= " , fk_user_modif = ".$user->id;
 		$sql .= " , fk_soc = ".($this->socid > 0?$this->socid:'null');
diff --git a/htdocs/compta/paiement/cheque/class/remisecheque.class.php b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
index 6aa0714d5c9..4889693857b 100644
--- a/htdocs/compta/paiement/cheque/class/remisecheque.class.php
+++ b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
@@ -308,7 +308,7 @@ class RemiseCheque extends CommonObject
 			if ( $this->errno === 0) {
 			    $sql = "UPDATE ".MAIN_DB_PREFIX."bank";
 			    $sql.= " SET fk_bordereau = 0";
-			    $sql.= " WHERE fk_bordereau = '".$this->id."'";
+			    $sql.= " WHERE fk_bordereau = ".$this->id;
 
 			    $resql = $this->db->query($sql);
 			    if (!$resql)
diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index d7489b8aca0..90ba6a22431 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -1082,19 +1082,19 @@ class BonPrelevement extends CommonObject
     {
     	$this->db->begin();
 
-    	$sql = "DELETE FROM ".MAIN_DB_PREFIX."prelevement_facture WHERE fk_prelevement_lignes IN (SELECT rowid FROM ".MAIN_DB_PREFIX."prelevement_lignes WHERE fk_prelevement_bons = '".$this->id."')";
+    	$sql = "DELETE FROM ".MAIN_DB_PREFIX."prelevement_facture WHERE fk_prelevement_lignes IN (SELECT rowid FROM ".MAIN_DB_PREFIX."prelevement_lignes WHERE fk_prelevement_bons = ".$this->id.")";
     	$resql1=$this->db->query($sql);
     	if (! $resql1) dol_print_error($this->db);
 
-    	$sql = "DELETE FROM ".MAIN_DB_PREFIX."prelevement_lignes WHERE fk_prelevement_bons = '".$this->id."'";
+    	$sql = "DELETE FROM ".MAIN_DB_PREFIX."prelevement_lignes WHERE fk_prelevement_bons = ".$this->id;
     	$resql2=$this->db->query($sql);
     	if (! $resql2) dol_print_error($this->db);
 
-    	$sql = "DELETE FROM ".MAIN_DB_PREFIX."prelevement_bons WHERE rowid = '".$this->id."'";
+    	$sql = "DELETE FROM ".MAIN_DB_PREFIX."prelevement_bons WHERE rowid = ".$this->id;
     	$resql3=$this->db->query($sql);
 		if (! $resql3) dol_print_error($this->db);
 
-    	$sql = "UPDATE ".MAIN_DB_PREFIX."prelevement_facture_demande SET fk_prelevement_bons = NULL, traite = 0 WHERE fk_prelevement_bons = '".$this->id."'";
+    	$sql = "UPDATE ".MAIN_DB_PREFIX."prelevement_facture_demande SET fk_prelevement_bons = NULL, traite = 0 WHERE fk_prelevement_bons = ".$this->id;
     	$resql4=$this->db->query($sql);
 		if (! $resql4) dol_print_error($this->db);
 
diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index 216cce41171..b80a300431a 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -317,7 +317,7 @@ class Contact extends CommonObject
 		$sql .= ", phone_perso = ".(isset($this->phone_perso)?"'".$this->db->escape($this->phone_perso)."'":"null");
 		$sql .= ", phone_mobile = ".(isset($this->phone_mobile)?"'".$this->db->escape($this->phone_mobile)."'":"null");
 		$sql .= ", jabberid = ".(isset($this->jabberid)?"'".$this->db->escape($this->jabberid)."'":"null");
-		$sql .= ", priv = '".$this->priv."'";
+		$sql .= ", priv = '".$this->db->escape($this->priv)."'";
 		$sql .= ", statut = ".$this->statut;
 		$sql .= ", fk_user_modif=".($user->id > 0 ? "'".$user->id."'":"NULL");
 		$sql .= ", default_lang=".($this->default_lang?"'".$this->default_lang."'":"NULL");
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 8564edd6ddf..db6464edb6a 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -2801,10 +2801,10 @@ class ContratLigne extends CommonObjectLine
 		$sql.= " tva_tx=".price2num($this->tva_tx).",";
 		$sql.= " localtax1_tx=".price2num($this->localtax1_tx).",";
 		$sql.= " localtax2_tx=".price2num($this->localtax2_tx).",";
-		$sql.= " qty='".$this->qty."',";
+		$sql.= " qty=".price2num($this->qty).",";
 		$sql.= " remise_percent=".price2num($this->remise_percent).",";
-		$sql.= " remise=".($this->remise?"'".$this->remise."'":"null").",";
-		$sql.= " fk_remise_except=".($this->fk_remise_except?"'".$this->fk_remise_except."'":"null").",";
+		$sql.= " remise=".($this->remise?price2num($this->remise):"null").",";
+		$sql.= " fk_remise_except=".($this->fk_remise_except > 0?$this->fk_remise_except:"null").",";
 		$sql.= " subprice=".($this->subprice != '' ? $this->subprice : "null").",";
 		$sql.= " price_ht=".($this->price_ht != '' ? $this->price_ht : "null").",";
 		$sql.= " total_ht=".$this->total_ht.",";
@@ -2818,8 +2818,8 @@ class ContratLigne extends CommonObjectLine
 		$sql.= " fk_user_author=".($this->fk_user_author >= 0?$this->fk_user_author:"NULL").",";
 		$sql.= " fk_user_ouverture=".($this->fk_user_ouverture > 0?$this->fk_user_ouverture:"NULL").",";
 		$sql.= " fk_user_cloture=".($this->fk_user_cloture > 0?$this->fk_user_cloture:"NULL").",";
-		$sql.= " commentaire='".$this->db->escape($this->commentaire)."'";
-		$sql.= ", fk_unit=".(!$this->fk_unit ? 'NULL' : $this->fk_unit);
+		$sql.= " commentaire='".$this->db->escape($this->commentaire)."',";
+		$sql.= " fk_unit=".(!$this->fk_unit ? 'NULL' : $this->fk_unit);
 		$sql.= " WHERE rowid=".$this->id;
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 947d99af545..f3f4e689467 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -579,7 +579,7 @@ abstract class CommonObject
             // On recherche id type_contact
             $sql = "SELECT tc.rowid";
             $sql.= " FROM ".MAIN_DB_PREFIX."c_type_contact as tc";
-            $sql.= " WHERE tc.element='".$this->element."'";
+            $sql.= " WHERE tc.element='".$this->db->escape($this->element)."'";
             $sql.= " AND tc.source='".$source."'";
             $sql.= " AND tc.code='".$type_contact."' AND tc.active=1";
 			//print $sql;
@@ -791,7 +791,7 @@ abstract class CommonObject
         if ($source == 'external'|| $source == 'thirdparty') $sql.=" LEFT JOIN ".MAIN_DB_PREFIX."socpeople t on ec.fk_socpeople = t.rowid";
         $sql.= " WHERE ec.element_id =".$this->id;
         $sql.= " AND ec.fk_c_type_contact=tc.rowid";
-        $sql.= " AND tc.element='".$this->element."'";
+        $sql.= " AND tc.element='".$this->db->escape($this->element)."'";
         if ($code) $sql.= " AND tc.code = '".$this->db->escape($code)."'";
         if ($source == 'internal') $sql.= " AND tc.source = 'internal'";
         if ($source == 'external' || $source == 'thirdparty') $sql.= " AND tc.source = 'external'";
@@ -852,7 +852,7 @@ abstract class CommonObject
         //$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as s ON ec.fk_socpeople=s.rowid";	// Si contact de type external, alors il est lie a une societe
         $sql.= " WHERE ec.rowid =".$rowid;
         $sql.= " AND ec.fk_c_type_contact=tc.rowid";
-        $sql.= " AND tc.element = '".$this->element."'";
+        $sql.= " AND tc.element = '".$this->db->escape($this->element)."'";
 
         dol_syslog(get_class($this)."::swapContactStatus", LOG_DEBUG);
         $resql=$this->db->query($sql);
@@ -893,10 +893,10 @@ abstract class CommonObject
         $tab = array();
         $sql = "SELECT DISTINCT tc.rowid, tc.code, tc.libelle, tc.position";
         $sql.= " FROM ".MAIN_DB_PREFIX."c_type_contact as tc";
-        $sql.= " WHERE tc.element='".$this->element."'";
+        $sql.= " WHERE tc.element='".$this->db->escape($this->element)."'";
         if ($activeonly == 1) $sql.= " AND tc.active=1"; // only the active types
-        if (! empty($source) && $source != 'all') $sql.= " AND tc.source='".$source."'";
-        if (! empty($code)) $sql.= " AND tc.code='".$code."'";
+        if (! empty($source) && $source != 'all') $sql.= " AND tc.source='".$this->db->escape($source)."'";
+        if (! empty($code)) $sql.= " AND tc.code='".$this->db->escape($code)."'";
         $sql.= $this->db->order($order,'ASC');
 
         //print "sql=".$sql;
@@ -2691,16 +2691,16 @@ abstract class CommonObject
     	if ($updatesource)
     	{
     		$sql.= "fk_source = ".$sourceid;
-    		$sql.= ", sourcetype = '".$sourcetype."'";
+    		$sql.= ", sourcetype = '".$this->db->escape($sourcetype)."'";
     		$sql.= " WHERE fk_target = ".$this->id;
-    		$sql.= " AND targettype = '".$this->element."'";
+    		$sql.= " AND targettype = '".$this->db->escape($this->element)."'";
     	}
     	else if ($updatetarget)
     	{
     		$sql.= "fk_target = ".$targetid;
-    		$sql.= ", targettype = '".$targettype."'";
+    		$sql.= ", targettype = '".$this->db->escape($targettype)."'";
     		$sql.= " WHERE fk_source = ".$this->id;
-    		$sql.= " AND sourcetype = '".$this->element."'";
+    		$sql.= " AND sourcetype = '".$this->db->escape($this->element)."'";
     	}
 
     	dol_syslog(get_class($this)."::updateObjectLinked", LOG_DEBUG);
@@ -2749,19 +2749,19 @@ abstract class CommonObject
 		{
 			if ($deletesource)
 			{
-				$sql.= " fk_source = ".$sourceid." AND sourcetype = '".$sourcetype."'";
-				$sql.= " AND fk_target = ".$this->id." AND targettype = '".$this->element."'";
+				$sql.= " fk_source = ".$sourceid." AND sourcetype = '".$this->db->escape($sourcetype)."'";
+				$sql.= " AND fk_target = ".$this->id." AND targettype = '".$this->db->escape($this->element)."'";
 			}
 			else if ($deletetarget)
 			{
-				$sql.= " fk_target = ".$targetid." AND targettype = '".$targettype."'";
-				$sql.= " AND fk_source = ".$this->id." AND sourcetype = '".$this->element."'";
+				$sql.= " fk_target = ".$targetid." AND targettype = '".$this->db->escape($targettype)."'";
+				$sql.= " AND fk_source = ".$this->id." AND sourcetype = '".$this->db->escape($this->element)."'";
 			}
 			else
 			{
-				$sql.= " (fk_source = ".$this->id." AND sourcetype = '".$this->element."')";
+				$sql.= " (fk_source = ".$this->id." AND sourcetype = '".$this->db->escape($this->element)."')";
 				$sql.= " OR";
-				$sql.= " (fk_target = ".$this->id." AND targettype = '".$this->element."')";
+				$sql.= " (fk_target = ".$this->id." AND targettype = '".$this->db->escape($this->element)."')";
 			}
 		}
 
diff --git a/htdocs/core/class/events.class.php b/htdocs/core/class/events.class.php
index e091743833c..2cfedfb7d1a 100644
--- a/htdocs/core/class/events.class.php
+++ b/htdocs/core/class/events.class.php
@@ -171,7 +171,7 @@ class Events // extends CommonObject
 
 		// Update request
 		$sql = "UPDATE ".MAIN_DB_PREFIX."events SET";
-		$sql.= " type='".$this->type."',";
+		$sql.= " type='".$this->db->escape($this->type)."',";
 		$sql.= " dateevent=".$this->db->idate($this->dateevent).",";
 		$sql.= " description='".$this->db->escape($this->description)."'";
 		$sql.= " WHERE rowid=".$this->id;
diff --git a/htdocs/core/class/fiscalyear.class.php b/htdocs/core/class/fiscalyear.class.php
index 912c1e34879..22b26983bcc 100644
--- a/htdocs/core/class/fiscalyear.class.php
+++ b/htdocs/core/class/fiscalyear.class.php
@@ -142,10 +142,10 @@ class Fiscalyear extends CommonObject
 		$this->db->begin();
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."accounting_fiscalyear";
-		$sql .= " SET label = '".$this->label."'";
+		$sql .= " SET label = '".$this->db->escape($this->label)."'";
 		$sql .= ", date_start = '".$this->db->idate($this->date_start)."'";
 		$sql .= ", date_end = ".($this->date_end ? "'".$this->db->idate($this->date_end)."'" : "null");
-		$sql .= ", statut = '".$this->statut."'";
+		$sql .= ", statut = '".$this->db->escape($this->statut)."'";
 		$sql .= ", datec = " . ($this->datec != '' ? "'".$this->db->idate($this->datec)."'" : 'null');
 		$sql .= ", fk_user_modif = " . $user->id;
 		$sql .= " WHERE rowid = ".$this->id;
diff --git a/htdocs/core/class/link.class.php b/htdocs/core/class/link.class.php
index 62bcf9d22c5..f604e85e11d 100644
--- a/htdocs/core/class/link.class.php
+++ b/htdocs/core/class/link.class.php
@@ -174,9 +174,9 @@ class Link extends CommonObject
         $sql .= ", datea = '" . $this->db->idate(dol_now()) . "'";
         $sql .= ", url = '" . $this->db->escape($this->url) . "'";
         $sql .= ", label = '" . $this->db->escape($this->label) . "'";
-        $sql .= ", objecttype = '" . $this->objecttype . "'";
+        $sql .= ", objecttype = '" . $this->db->escape($this->objecttype) . "'";
         $sql .= ", objectid = " . $this->objectid;
-        $sql .= " WHERE rowid = '" . $this->id ."'";
+        $sql .= " WHERE rowid = " . $this->id;
 
         dol_syslog(get_class($this)."::update sql = " .$sql);
         $resql = $this->db->query($sql);
diff --git a/htdocs/core/class/menubase.class.php b/htdocs/core/class/menubase.class.php
index 93037117cb8..ed6b9929a32 100644
--- a/htdocs/core/class/menubase.class.php
+++ b/htdocs/core/class/menubase.class.php
@@ -216,20 +216,20 @@ class Menubase
         $sql = "UPDATE ".MAIN_DB_PREFIX."menu SET";
         $sql.= " menu_handler='".$this->db->escape($this->menu_handler)."',";
         $sql.= " module='".$this->db->escape($this->module)."',";
-        $sql.= " type='".$this->type."',";
+        $sql.= " type='".$this->db->escape($this->type)."',";
         $sql.= " mainmenu='".$this->db->escape($this->mainmenu)."',";
         $sql.= " leftmenu='".$this->db->escape($this->leftmenu)."',";
-        $sql.= " fk_menu='".$this->fk_menu."',";
+        $sql.= " fk_menu='".$this->db->escape($this->fk_menu)."',";
         $sql.= " fk_mainmenu=".($this->fk_mainmenu?"'".$this->fk_mainmenu."'":"null").",";
         $sql.= " fk_leftmenu=".($this->fk_leftmenu?"'".$this->fk_leftmenu."'":"null").",";
-        $sql.= " position='".$this->position."',";
+        $sql.= " position=".($this->position > 0 ? $this->position : 0).",";
         $sql.= " url='".$this->db->escape($this->url)."',";
         $sql.= " target='".$this->db->escape($this->target)."',";
         $sql.= " titre='".$this->db->escape($this->titre)."',";
         $sql.= " langs='".$this->db->escape($this->langs)."',";
         $sql.= " perms='".$this->db->escape($this->perms)."',";
         $sql.= " enabled='".$this->db->escape($this->enabled)."',";
-        $sql.= " usertype='".$this->user."'";
+        $sql.= " usertype='".$this->db->escape($this->user)."'";
         $sql.= " WHERE rowid=".$this->id;
 
         dol_syslog(get_class($this)."::update", LOG_DEBUG);
diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index d0559268c52..f501d33c29a 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -779,7 +779,7 @@ class DolibarrModules           // Can not be abstract, because we need to insta
         global $conf;
         
         $sql = "SELECT tms FROM ".MAIN_DB_PREFIX."const";
-        $sql.= " WHERE ".$this->db->decrypt('name')." = '".$this->const_name."'";
+        $sql.= " WHERE ".$this->db->decrypt('name')." = '".$this->db->escape($this->const_name)."'";
         $sql.= " AND entity IN (0, ".$conf->entity.")";
         
         dol_syslog(get_class($this)."::getLastActiveDate", LOG_DEBUG);
@@ -805,7 +805,7 @@ class DolibarrModules           // Can not be abstract, because we need to insta
         global $conf;
         
         $sql = "SELECT tms, note FROM ".MAIN_DB_PREFIX."const";
-        $sql.= " WHERE ".$this->db->decrypt('name')." = '".$this->const_name."'";
+        $sql.= " WHERE ".$this->db->decrypt('name')." = '".$this->db->escape($this->const_name)."'";
         $sql.= " AND entity IN (0, ".$conf->entity.")";
         
         dol_syslog(get_class($this)."::getLastActiveDate", LOG_DEBUG);
@@ -841,7 +841,7 @@ class DolibarrModules           // Can not be abstract, because we need to insta
         $entity = ((! empty($this->always_enabled) || ! empty($this->core_enabled)) ? 0 : $conf->entity);
 
         $sql = "DELETE FROM ".MAIN_DB_PREFIX."const";
-        $sql.= " WHERE ".$this->db->decrypt('name')." = '".$this->const_name."'";
+        $sql.= " WHERE ".$this->db->decrypt('name')." = '".$this->db->escape($this->const_name)."'";
         $sql.= " AND entity IN (0, ".$entity.")";
 
         dol_syslog(get_class($this)."::_active", LOG_DEBUG);
@@ -879,7 +879,7 @@ class DolibarrModules           // Can not be abstract, because we need to insta
         $entity = ((! empty($this->always_enabled) || ! empty($this->core_enabled)) ? 0 : $conf->entity);
 
         $sql = "DELETE FROM ".MAIN_DB_PREFIX."const";
-        $sql.= " WHERE ".$this->db->decrypt('name')." = '".$this->const_name."'";
+        $sql.= " WHERE ".$this->db->decrypt('name')." = '".$this->db->escape($this->const_name)."'";
         $sql.= " AND entity IN (0, ".$entity.")";
 
         dol_syslog(get_class($this)."::_unactive", LOG_DEBUG);
@@ -1520,7 +1520,7 @@ class DolibarrModules           // Can not be abstract, because we need to insta
         // Test if module is activated
         $sql_del = "SELECT ".$this->db->decrypt('value')." as value";
         $sql_del.= " FROM ".MAIN_DB_PREFIX."const";
-        $sql_del.= " WHERE ".$this->db->decrypt('name')." = '".$this->const_name."'";
+        $sql_del.= " WHERE ".$this->db->decrypt('name')." = '".$this->db->escape($this->const_name)."'";
         $sql_del.= " AND entity IN (0,".$entity.")";
 
         dol_syslog(get_class($this)."::insert_permissions", LOG_DEBUG);
@@ -1655,7 +1655,7 @@ class DolibarrModules           // Can not be abstract, because we need to insta
         $err=0;
 
         $sql = "DELETE FROM ".MAIN_DB_PREFIX."rights_def";
-        $sql.= " WHERE module = '".$this->rights_class."'";
+        $sql.= " WHERE module = '".$this->db->escape($this->rights_class)."'";
         $sql.= " AND entity = ".$conf->entity;
         dol_syslog(get_class($this)."::delete_permissions", LOG_DEBUG);
         if (! $this->db->query($sql))
diff --git a/htdocs/core/modules/modAdherent.class.php b/htdocs/core/modules/modAdherent.class.php
index 3081cc8c726..4b3d1e5d34f 100644
--- a/htdocs/core/modules/modAdherent.class.php
+++ b/htdocs/core/modules/modAdherent.class.php
@@ -369,8 +369,8 @@ class modAdherent extends DolibarrModules
         }*/
     
         $sql = array(
-            "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->const[0][2]."' AND type='member' AND entity = ".$conf->entity,
-            "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->const[0][2]."','member',".$conf->entity.")"
+            "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[0][2])."' AND type='member' AND entity = ".$conf->entity,
+            "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[0][2])."','member',".$conf->entity.")"
         );
     
         return $this->_init($sql,$options);
diff --git a/htdocs/core/modules/modCommande.class.php b/htdocs/core/modules/modCommande.class.php
index f9c10eef6de..1806bfdea71 100644
--- a/htdocs/core/modules/modCommande.class.php
+++ b/htdocs/core/modules/modCommande.class.php
@@ -256,8 +256,8 @@ class modCommande extends DolibarrModules
 		}
 
 		$sql = array(
-				"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->const[0][2]."' AND type = 'order' AND entity = ".$conf->entity,
-				"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->const[0][2]."','order',".$conf->entity.")"
+				"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[0][2])."' AND type = 'order' AND entity = ".$conf->entity,
+				"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[0][2])."','order',".$conf->entity.")"
 		);
 
 		 return $this->_init($sql,$options);
diff --git a/htdocs/core/modules/modDon.class.php b/htdocs/core/modules/modDon.class.php
index 26dd397c913..881dd27e414 100644
--- a/htdocs/core/modules/modDon.class.php
+++ b/htdocs/core/modules/modDon.class.php
@@ -157,8 +157,8 @@ class modDon extends DolibarrModules
 		global $conf;
 
 		$sql = array(
-			 "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->const[0][2]."' AND type = 'donation' AND entity = ".$conf->entity,
-			 "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->const[0][2]."','donation',".$conf->entity.")",
+			 "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[0][2])."' AND type = 'donation' AND entity = ".$conf->entity,
+			 "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[0][2])."','donation',".$conf->entity.")",
 		);
 
 		return $this->_init($sql,$options);
diff --git a/htdocs/core/modules/modExpedition.class.php b/htdocs/core/modules/modExpedition.class.php
index 63f7b536c1b..7320eba6736 100644
--- a/htdocs/core/modules/modExpedition.class.php
+++ b/htdocs/core/modules/modExpedition.class.php
@@ -318,10 +318,10 @@ class modExpedition extends DolibarrModules
 		$sql = array();
 
 		$sql = array(
-			 "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->const[0][2]."' AND type = 'shipping' AND entity = ".$conf->entity,
-			 "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->const[0][2]."','shipping',".$conf->entity.")",
-			 "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->const[3][2]."' AND type = 'delivery' AND entity = ".$conf->entity,
-			 "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->const[3][2]."','delivery',".$conf->entity.")",
+			 "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[0][2])."' AND type = 'shipping' AND entity = ".$conf->entity,
+			 "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[0][2])."','shipping',".$conf->entity.")",
+			 "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[3][2])."' AND type = 'delivery' AND entity = ".$conf->entity,
+			 "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[3][2])."','delivery',".$conf->entity.")",
 		);
 
 		return $this->_init($sql,$options);
diff --git a/htdocs/core/modules/modFacture.class.php b/htdocs/core/modules/modFacture.class.php
index 148dd965abb..7029b7ffd78 100644
--- a/htdocs/core/modules/modFacture.class.php
+++ b/htdocs/core/modules/modFacture.class.php
@@ -311,8 +311,8 @@ class modFacture extends DolibarrModules
 		}
 
 		$sql = array(
-				"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->const[0][2]."' AND type = 'invoice' AND entity = ".$conf->entity,
-				"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->const[0][2]."','invoice',".$conf->entity.")"
+				"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[0][2])."' AND type = 'invoice' AND entity = ".$conf->entity,
+				"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[0][2])."','invoice',".$conf->entity.")"
 		);
 
 		return $this->_init($sql,$options);
diff --git a/htdocs/core/modules/modFicheinter.class.php b/htdocs/core/modules/modFicheinter.class.php
index 98ac6f9b3f2..55deaf2403f 100644
--- a/htdocs/core/modules/modFicheinter.class.php
+++ b/htdocs/core/modules/modFicheinter.class.php
@@ -194,8 +194,8 @@ class modFicheinter extends DolibarrModules
         $this->remove($options);
 
         $sql = array(
-			 "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->const[0][2]."' AND type = 'ficheinter' AND entity = ".$conf->entity,
-			 "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->const[0][2]."','ficheinter',".$conf->entity.")",
+			 "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[0][2])."' AND type = 'ficheinter' AND entity = ".$conf->entity,
+			 "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[0][2])."','ficheinter',".$conf->entity.")",
         );
 
         return $this->_init($sql,$options);
diff --git a/htdocs/core/modules/modFournisseur.class.php b/htdocs/core/modules/modFournisseur.class.php
index 269d4d04a17..fc2572d3669 100644
--- a/htdocs/core/modules/modFournisseur.class.php
+++ b/htdocs/core/modules/modFournisseur.class.php
@@ -572,8 +572,8 @@ class modFournisseur extends DolibarrModules
 		$this->remove($options);
 
 		$sql = array(
-			 "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->const[0][2]."' AND type = 'order_supplier' AND entity = ".$conf->entity,
-			 "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->const[0][2]."','order_supplier',".$conf->entity.")",
+			 "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[0][2])."' AND type = 'order_supplier' AND entity = ".$conf->entity,
+			 "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[0][2])."','order_supplier',".$conf->entity.")",
 		);
 
 		return $this->_init($sql,$options);
diff --git a/htdocs/core/modules/modPrelevement.class.php b/htdocs/core/modules/modPrelevement.class.php
index 6be4022438c..542a02e7589 100644
--- a/htdocs/core/modules/modPrelevement.class.php
+++ b/htdocs/core/modules/modPrelevement.class.php
@@ -153,8 +153,8 @@ class modPrelevement extends DolibarrModules
 		$this->remove($options);
 
 		$sql = array(
-		    "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->const[0][2]."' AND type = 'bankaccount' AND entity = ".$conf->entity,
-		    "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->const[0][2]."','bankaccount',".$conf->entity.")",
+		    "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[0][2])."' AND type = 'bankaccount' AND entity = ".$conf->entity,
+		    "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[0][2])."','bankaccount',".$conf->entity.")",
 		);		
 
 		return $this->_init($sql,$options);
diff --git a/htdocs/core/modules/modProjet.class.php b/htdocs/core/modules/modProjet.class.php
index 4ad3a86771a..96e5a96b384 100644
--- a/htdocs/core/modules/modProjet.class.php
+++ b/htdocs/core/modules/modProjet.class.php
@@ -353,13 +353,13 @@ class modProjet extends DolibarrModules
 		}
 
 		$sql = array(
-			 "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->const[0][2]."' AND type = 'project' AND entity = ".$conf->entity,
-			 "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->const[0][2]."','project',".$conf->entity.")",
+			 "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[0][2])."' AND type = 'project' AND entity = ".$conf->entity,
+			 "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[0][2])."','project',".$conf->entity.")",
 		);
 
 		$sql = array(
-			"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->const[3][2]."' AND type = 'task' AND entity = ".$conf->entity,
-			"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->const[3][2]."','task',".$conf->entity.")"
+			"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[3][2])."' AND type = 'task' AND entity = ".$conf->entity,
+			"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[3][2])."','task',".$conf->entity.")"
 		);
 
 		return $this->_init($sql,$options);
diff --git a/htdocs/core/modules/modPropale.class.php b/htdocs/core/modules/modPropale.class.php
index ce23e996e0a..3dd39b336bc 100644
--- a/htdocs/core/modules/modPropale.class.php
+++ b/htdocs/core/modules/modPropale.class.php
@@ -248,8 +248,8 @@ class modPropale extends DolibarrModules
 		}
 
 		$sql = array(
-				"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->const[0][2]."' AND type = 'propal' AND entity = ".$conf->entity,
-				"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->const[0][2]."','propal',".$conf->entity.")",
+				"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[0][2])."' AND type = 'propal' AND entity = ".$conf->entity,
+				"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[0][2])."','propal',".$conf->entity.")",
 		);
 
 		return $this->_init($sql,$options);
diff --git a/htdocs/core/modules/modSupplierProposal.class.php b/htdocs/core/modules/modSupplierProposal.class.php
index 054fdca6c90..8869f0cd343 100644
--- a/htdocs/core/modules/modSupplierProposal.class.php
+++ b/htdocs/core/modules/modSupplierProposal.class.php
@@ -227,8 +227,8 @@ class modSupplierProposal extends DolibarrModules
 		}
 
 		$sql = array(
-				"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->const[0][2]."' AND type = 'supplier_proposal' AND entity = ".$conf->entity,
-				"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->const[0][2]."','supplier_proposal',".$conf->entity.")",
+				"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[0][2])."' AND type = 'supplier_proposal' AND entity = ".$conf->entity,
+				"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[0][2])."','supplier_proposal',".$conf->entity.")",
 		);
 
 		return $this->_init($sql, $options);
diff --git a/htdocs/don/class/don.class.php b/htdocs/don/class/don.class.php
index 74349a16271..bfcbd6b7059 100644
--- a/htdocs/don/class/don.class.php
+++ b/htdocs/don/class/don.class.php
@@ -464,11 +464,11 @@ class Don extends CommonObject
         $sql .= ",note_public=".(!empty($this->note_public)?("'".$this->db->escape($this->note_public)."'"):"NULL");
         $sql .= ",datedon='".$this->db->idate($this->date)."'";
         $sql .= ",date_valid=".($this->date_valid?"'".$this->db->idate($this->date)."'":"null");
-        $sql .= ",email='".$this->email."'";
-        $sql .= ",phone='".$this->phone."'";
-        $sql .= ",phone_mobile='".$this->phone_mobile."'";
+        $sql .= ",email='".$this->db->escape($this->email)."'";
+        $sql .= ",phone='".$this->db->escape($this->phone)."'";
+        $sql .= ",phone_mobile='".$this->db->escape($this->phone_mobile)."'";
         $sql .= ",fk_statut=".$this->statut;
-        $sql .= " WHERE rowid = '".$this->id."'";
+        $sql .= " WHERE rowid = ".$this->id;
 
         dol_syslog(get_class($this)."::Update", LOG_DEBUG);
         $resql=$this->db->query($sql);
diff --git a/htdocs/ecm/class/ecmdirectory.class.php b/htdocs/ecm/class/ecmdirectory.class.php
index 82fd7f49d58..31439fa5ba3 100644
--- a/htdocs/ecm/class/ecmdirectory.class.php
+++ b/htdocs/ecm/class/ecmdirectory.class.php
@@ -202,7 +202,7 @@ class EcmDirectory // extends CommonObject
 		// Update request
 		$sql = "UPDATE ".MAIN_DB_PREFIX."ecm_directories SET";
 		$sql.= " label='".$this->db->escape($this->label)."',";
-		$sql.= " fk_parent='".$this->fk_parent."',";
+		$sql.= " fk_parent='".$this->db->escape($this->fk_parent)."',";
 		$sql.= " description='".$this->db->escape($this->description)."'";
 		$sql.= " WHERE rowid=".$this->id;
 
diff --git a/htdocs/ecm/class/ecmfiles.class.php b/htdocs/ecm/class/ecmfiles.class.php
index 2089a5b3bb8..a48d3171020 100644
--- a/htdocs/ecm/class/ecmfiles.class.php
+++ b/htdocs/ecm/class/ecmfiles.class.php
@@ -140,7 +140,7 @@ class EcmFiles //extends CommonObject
 		if (empty($this->position))   // Get max used
 		{
 		    $sql = "SELECT MAX(position) as maxposition FROM " . MAIN_DB_PREFIX . $this->table_element;
-		    $sql.= " WHERE filepath ='".$this->filepath."'";
+		    $sql.= " WHERE filepath ='".$this->db->escape($this->filepath)."'";
 		    
 		    $resql = $this->db->query($sql);
 		    if ($resql)
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index 99d81852734..8d6822fd360 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -487,7 +487,7 @@ class Expedition extends CommonObject
         $sql.= ', e.fk_incoterms, e.location_incoterms';
         $sql.= ', i.libelle as libelle_incoterms';
 		$sql.= " FROM ".MAIN_DB_PREFIX."expedition as e";
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON el.fk_target = e.rowid AND el.targettype = '".$this->element."'";
+		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON el.fk_target = e.rowid AND el.targettype = '".$this->db->escape($this->element)."'";
 		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON e.fk_incoterms = i.rowid';
 		$sql.= " WHERE e.entity IN (".getEntity('expedition', 1).")";
 		if ($id)   	  $sql.= " AND e.rowid=".$id;
@@ -1753,10 +1753,10 @@ class Expedition extends CommonObject
         else
         {
             $sql = "UPDATE ".MAIN_DB_PREFIX."c_shipment_mode SET";
-            $sql.= " code='".$this->update['code']."'";
-            $sql.= ",libelle='".$this->update['libelle']."'";
-            $sql.= ",description='".$this->update['description']."'";
-            $sql.= ",tracking='".$this->update['tracking']."'";
+            $sql.= " code='".$this->db->escape($this->update['code'])."'";
+            $sql.= ",libelle='".$this->db->escape($this->update['libelle'])."'";
+            $sql.= ",description='".$this->db->escape($this->update['description'])."'";
+            $sql.= ",tracking='".$this->db->escape($this->update['tracking'])."'";
             $sql.= " WHERE rowid=".$id;
             $resql = $this->db->query($sql);
         }
diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index 898b5c4cd1f..eb16583df26 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -183,7 +183,7 @@ class ExpenseReport extends CommonObject
             $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
             $this->ref='(PROV'.$this->id.')';
 
-            $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element." SET ref='".$this->ref."' WHERE rowid=".$this->id;
+            $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element." SET ref='".$this->db->escape($this->ref)."' WHERE rowid=".$this->id;
             $resql=$this->db->query($sql);
             if (!$resql) $error++;
 
@@ -1078,7 +1078,7 @@ class ExpenseReport extends CommonObject
 			$this->db->begin();
 			
             $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
-            $sql.= " SET ref = '".$this->ref."', fk_statut = 2, fk_user_valid = ".$fuser->id.", date_valid='".$this->db->idate($now)."'";
+            $sql.= " SET ref = '".$this->db->escape($this->ref)."', fk_statut = 2, fk_user_valid = ".$fuser->id.", date_valid='".$this->db->idate($now)."'";
             if ($update_number_int) {
                 $sql.= ", ref_number_int = ".$ref_number_int;
             }
@@ -1189,8 +1189,8 @@ class ExpenseReport extends CommonObject
 			$this->db->begin();
 			
             $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
-            $sql.= " SET ref = '".$this->ref."', fk_statut = 5, fk_user_approve = ".$fuser->id.",";
-            $sql.= " date_approve='".$this->date_approve."'";
+            $sql.= " SET ref = '".$this->db->escape($this->ref)."', fk_statut = 5, fk_user_approve = ".$fuser->id.",";
+            $sql.= " date_approve='".$this->db->idate($this->date_approve)."'";
             $sql.= ' WHERE rowid = '.$this->id;
             if ($this->db->query($sql))
             {
@@ -1248,7 +1248,7 @@ class ExpenseReport extends CommonObject
         if ($this->fk_statut != 99)
         {
             $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
-            $sql.= " SET ref = '".$this->ref."', fk_statut = 99, fk_user_refuse = ".$fuser->id.",";
+            $sql.= " SET ref = '".$this->db->escape($this->ref)."', fk_statut = 99, fk_user_refuse = ".$fuser->id.",";
             $sql.= " date_refuse='".$this->db->idate($now)."',";
             $sql.= " detail_refuse='".$this->db->escape($details)."',";
             $sql.= " fk_user_approve = NULL";
@@ -1373,7 +1373,7 @@ class ExpenseReport extends CommonObject
 			
             $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
             $sql.= " SET fk_statut = 4, fk_user_cancel = ".$fuser->id;
-            $sql.= ", date_cancel='".$this->date_cancel."'";
+            $sql.= ", date_cancel='".$this->db->idate($this->date_cancel)."'";
             $sql.= " ,detail_cancel='".$this->db->escape($detail)."'";
             $sql.= ' WHERE rowid = '.$this->id;
 
@@ -2154,8 +2154,8 @@ class ExpenseReportLine
         // Mise a jour ligne en base
         $sql = "UPDATE ".MAIN_DB_PREFIX."expensereport_det SET";
         $sql.= " comments='".$this->db->escape($this->comments)."'";
-        $sql.= ",value_unit=".$this->value_unit."";
-        $sql.= ",qty=".$this->qty."";
+        $sql.= ",value_unit=".$this->value_unit;
+        $sql.= ",qty=".$this->qty;
         $sql.= ",date='".$this->db->idate($this->date)."'";
         $sql.= ",total_ht=".$this->total_ht."";
         $sql.= ",total_tva=".$this->total_tva."";
diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php
index d9912edfca1..6142d87de7a 100644
--- a/htdocs/fichinter/class/fichinter.class.php
+++ b/htdocs/fichinter/class/fichinter.class.php
@@ -212,7 +212,7 @@ class Fichinter extends CommonObject
 			if ($this->id)
 			{
 				$this->ref='(PROV'.$this->id.')';
-				$sql = 'UPDATE '.MAIN_DB_PREFIX."fichinter SET ref='".$this->ref."' WHERE rowid=".$this->id;
+				$sql = 'UPDATE '.MAIN_DB_PREFIX."fichinter SET ref='".$this->db->escape($this->ref)."' WHERE rowid=".$this->id;
 
 				dol_syslog(get_class($this)."::create", LOG_DEBUG);
 				$resql=$this->db->query($sql);
@@ -1375,7 +1375,7 @@ class FichinterLigne extends CommonObjectLine
 		$sql.= " description='".$this->db->escape($this->desc)."'";
 		$sql.= ",date='".$this->db->idate($this->datei)."'";
 		$sql.= ",duree=".$this->duration;
-		$sql.= ",rang='".$this->rang."'";
+		$sql.= ",rang='".$this->db->escape($this->rang)."'";
 		$sql.= " WHERE rowid = ".$this->rowid;
 
 		dol_syslog("FichinterLigne::update", LOG_DEBUG);
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 6b9ded02160..cb47a2d99df 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -3213,12 +3213,12 @@ class CommandeFournisseurLigne extends CommonOrderLine
         $sql.= ", tva_tx='".price2num($this->tva_tx)."'";
         $sql.= ", localtax1_tx='".price2num($this->total_localtax1)."'";
         $sql.= ", localtax2_tx='".price2num($this->total_localtax2)."'";
-        $sql.= ", localtax1_type='".$this->localtax1_type."'";
-        $sql.= ", localtax2_type='".$this->localtax2_type."'";
+        $sql.= ", localtax1_type='".$this->db->escape($this->localtax1_type)."'";
+        $sql.= ", localtax2_type='".$this->db->escape($this->localtax2_type)."'";
         $sql.= ", qty='".price2num($this->qty)."'";
         $sql.= ", date_start=".(! empty($this->date_start)?"'".$this->db->idate($this->date_start)."'":"null");
         $sql.= ", date_end=".(! empty($this->date_end)?"'".$this->db->idate($this->date_end)."'":"null");
-        $sql.= ", info_bits='".$this->info_bits."'";
+        $sql.= ", info_bits='".$this->db->escape($this->info_bits)."'";
         $sql.= ", total_ht='".price2num($this->total_ht)."'";
         $sql.= ", total_tva='".price2num($this->total_tva)."'";
         $sql.= ", total_localtax1='".price2num($this->total_localtax1)."'";
@@ -3295,7 +3295,7 @@ class CommandeFournisseurLigne extends CommonOrderLine
 
         $this->db->begin();
 
-        $sql = 'DELETE FROM '.MAIN_DB_PREFIX."commande_fournisseurdet WHERE rowid='".$this->rowid."';";
+        $sql = 'DELETE FROM '.MAIN_DB_PREFIX."commande_fournisseurdet WHERE rowid=".$this->rowid;
 
         dol_syslog(__METHOD__, LOG_DEBUG);
         $resql=$this->db->query($sql);
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 496c4660895..f9df07e96cc 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -300,7 +300,7 @@ class FactureFournisseur extends CommonInvoice
 
             // Update ref with new one
             $this->ref='(PROV'.$this->id.')';
-            $sql = 'UPDATE '.MAIN_DB_PREFIX."facture_fourn SET ref='".$this->ref."' WHERE rowid=".$this->id;
+            $sql = 'UPDATE '.MAIN_DB_PREFIX."facture_fourn SET ref='".$this->db->escape($this->ref)."' WHERE rowid=".$this->id;
 
             dol_syslog(get_class($this)."::create", LOG_DEBUG);
             $resql=$this->db->query($sql);
@@ -2559,8 +2559,8 @@ class SupplierInvoiceLine extends CommonObjectLine
 		$sql.= ", tva_tx = ".price2num($this->tva_tx);
 		$sql.= ", localtax1_tx = ".price2num($this->localtax1_tx);
 		$sql.= ", localtax2_tx = ".price2num($this->localtax2_tx);
-		$sql.= ", localtax1_type = '".$this->localtax1_type."'";
-		$sql.= ", localtax2_type = '".$this->localtax2_type."'";
+		$sql.= ", localtax1_type = '".$this->db->escape($this->localtax1_type)."'";
+		$sql.= ", localtax2_type = '".$this->db->escape($this->localtax2_type)."'";
 		$sql.= ", total_ht = ".price2num($this->total_ht);
 		$sql.= ", tva= ".price2num($this->total_tva);
 		$sql.= ", total_localtax1= ".price2num($this->total_localtax1);
diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index e69fd312f45..5f244dcb9bf 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -546,12 +546,12 @@ class Holiday extends CommonObject
         }
        	$sql.= " halfday = ".$this->halfday.",";
         if(!empty($this->statut) && is_numeric($this->statut)) {
-            $sql.= " statut = '".$this->statut."',";
+            $sql.= " statut = ".$this->statut.",";
         } else {
             $error++;
         }
         if(!empty($this->fk_validator)) {
-            $sql.= " fk_validator = '".$this->fk_validator."',";
+            $sql.= " fk_validator = '".$this->db->escape($this->fk_validator)."',";
         } else {
             $error++;
         }
@@ -561,7 +561,7 @@ class Holiday extends CommonObject
             $sql.= " date_valid = NULL,";
         }
         if(!empty($this->fk_user_valid)) {
-            $sql.= " fk_user_valid = '".$this->fk_user_valid."',";
+            $sql.= " fk_user_valid = '".$this->db->escape($this->fk_user_valid)."',";
         } else {
             $sql.= " fk_user_valid = NULL,";
         }
@@ -571,7 +571,7 @@ class Holiday extends CommonObject
             $sql.= " date_refuse = NULL,";
         }
         if(!empty($this->fk_user_refuse)) {
-            $sql.= " fk_user_refuse = '".$this->fk_user_refuse."',";
+            $sql.= " fk_user_refuse = '".$this->db->escape($this->fk_user_refuse)."',";
         } else {
             $sql.= " fk_user_refuse = NULL,";
         }
@@ -581,7 +581,7 @@ class Holiday extends CommonObject
             $sql.= " date_cancel = NULL,";
         }
         if(!empty($this->fk_user_cancel)) {
-            $sql.= " fk_user_cancel = '".$this->fk_user_cancel."',";
+            $sql.= " fk_user_cancel = '".$this->db->escape($this->fk_user_cancel)."',";
         } else {
             $sql.= " fk_user_cancel = NULL,";
         }
@@ -591,7 +591,7 @@ class Holiday extends CommonObject
             $sql.= " detail_refuse = NULL";
         }
 
-        $sql.= " WHERE rowid= '".$this->id."'";
+        $sql.= " WHERE rowid= ".$this->id;
 
         $this->db->begin();
 
diff --git a/htdocs/hrm/class/establishment.class.php b/htdocs/hrm/class/establishment.class.php
index 4438f3ea6ad..a171a111889 100644
--- a/htdocs/hrm/class/establishment.class.php
+++ b/htdocs/hrm/class/establishment.class.php
@@ -153,12 +153,12 @@ class Establishment extends CommonObject
 		$this->db->begin();
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."establishment";
-		$sql .= " SET name = '".$this->name."'";
-		$sql .= ", address = '".$this->address."'";
-		$sql .= ", zip = '".$this->zip."'";
-		$sql .= ", town = '".$this->town."'";
+		$sql .= " SET name = '".$this->db->escape($this->name)."'";
+		$sql .= ", address = '".$this->db->escape($this->address)."'";
+		$sql .= ", zip = '".$this->db->escape($this->zip)."'";
+		$sql .= ", town = '".$this->db->escape($this->town)."'";
 		$sql .= ", fk_country = ".($this->country_id > 0 ? $this->country_id : 'null');
-		$sql .= ", status = '".$this->status."'";
+		$sql .= ", status = '".$this->db->escape($this->status)."'";
 		$sql .= ", fk_user_mod = " . $user->id;
 		$sql .= " WHERE rowid = ".$this->id;
 
diff --git a/htdocs/livraison/class/livraison.class.php b/htdocs/livraison/class/livraison.class.php
index 3a18abf2cbb..383b2276d6c 100644
--- a/htdocs/livraison/class/livraison.class.php
+++ b/htdocs/livraison/class/livraison.class.php
@@ -263,7 +263,7 @@ class Livraison extends CommonObject
         $sql.= ', l.fk_incoterms, l.location_incoterms';
         $sql.= ", i.libelle as libelle_incoterms";
 		$sql.= " FROM ".MAIN_DB_PREFIX."livraison as l";
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON el.fk_target = l.rowid AND el.targettype = '".$this->element."'";
+		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON el.fk_target = l.rowid AND el.targettype = '".$this->db->escape($this->element)."'";
 		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON l.fk_incoterms = i.rowid';
 		$sql.= " WHERE l.rowid = ".$id;
 
diff --git a/htdocs/loan/class/loan.class.php b/htdocs/loan/class/loan.class.php
index d9d4da6fb20..734c2356b3a 100644
--- a/htdocs/loan/class/loan.class.php
+++ b/htdocs/loan/class/loan.class.php
@@ -236,7 +236,7 @@ class Loan extends CommonObject
         // Delete payments
         if (! $error)
         {
-            $sql = "DELETE FROM ".MAIN_DB_PREFIX."payment_loan where fk_loan='".$this->id."'";
+            $sql = "DELETE FROM ".MAIN_DB_PREFIX."payment_loan where fk_loan=".$this->id;
             dol_syslog(get_class($this)."::delete", LOG_DEBUG);
             $resql=$this->db->query($sql);
             if (! $resql)
@@ -248,7 +248,7 @@ class Loan extends CommonObject
 
         if (! $error)
         {
-            $sql = "DELETE FROM ".MAIN_DB_PREFIX."loan where rowid='".$this->id."'";
+            $sql = "DELETE FROM ".MAIN_DB_PREFIX."loan where rowid=".$this->id;
             dol_syslog(get_class($this)."::delete", LOG_DEBUG);
             $resql=$this->db->query($sql);
             if (! $resql)
diff --git a/htdocs/product/canvas/product/actions_card_product.class.php b/htdocs/product/canvas/product/actions_card_product.class.php
index 8db1ae21469..a60694ca7cb 100644
--- a/htdocs/product/canvas/product/actions_card_product.class.php
+++ b/htdocs/product/canvas/product/actions_card_product.class.php
@@ -269,7 +269,7 @@ class ActionsCardProduct
 
 		$sql = "SELECT rowid, name, alias, title, align, sort, search, enabled, rang";
 		$sql.= " FROM ".MAIN_DB_PREFIX."c_field_list";
-		$sql.= " WHERE element = '".$this->fieldListName."'";
+		$sql.= " WHERE element = '".$this->db->escape($this->fieldListName)."'";
 		$sql.= " AND entity = ".$conf->entity;
 		$sql.= " ORDER BY rang ASC";
 
diff --git a/htdocs/product/canvas/service/actions_card_service.class.php b/htdocs/product/canvas/service/actions_card_service.class.php
index af6fbccc320..970ac535273 100644
--- a/htdocs/product/canvas/service/actions_card_service.class.php
+++ b/htdocs/product/canvas/service/actions_card_service.class.php
@@ -248,7 +248,7 @@ class ActionsCardService
 
 		$sql = "SELECT rowid, name, alias, title, align, sort, search, enabled, rang";
 		$sql.= " FROM ".MAIN_DB_PREFIX."c_field_list";
-		$sql.= " WHERE element = '".$this->fieldListName."'";
+		$sql.= " WHERE element = '".$this->db->escape($this->fieldListName)."'";
 		$sql.= " AND entity = ".$conf->entity;
 		$sql.= " ORDER BY rang ASC";
 
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 4e6c3f49738..4a8c1e9f8fb 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -494,7 +494,7 @@ class Product extends CommonObject
 			$sql = "SELECT count(*) as nb";
 			$sql.= " FROM ".MAIN_DB_PREFIX."product";
 			$sql.= " WHERE entity IN (".getEntity('product', 1).")";
-			$sql.= " AND ref = '" .$this->ref."'";
+			$sql.= " AND ref = '" .$this->db->escape($this->ref)."'";
 
 			$result = $this->db->query($sql);
 			if ($result)
@@ -1212,14 +1212,14 @@ class Product extends CommonObject
 					$sql2.= " label='".$this->db->escape($this->label)."',";
 					$sql2.= " description='".$this->db->escape($this->description)."'";
 					if (! empty($conf->global->PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION)) $sql2.= ", note='".$this->db->escape($this->note)."'";
-					$sql2.= " WHERE fk_product=".$this->id." AND lang='".$key."'";
+					$sql2.= " WHERE fk_product=".$this->id." AND lang='".$this->db->escape($key)."'";
 				}
 				else
 				{
 					$sql2 = "INSERT INTO ".MAIN_DB_PREFIX."product_lang (fk_product, lang, label, description";
 					if (! empty($conf->global->PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION)) $sql2.=", note";
 					$sql2.= ")";
-					$sql2.= " VALUES(".$this->id.",'".$key."','". $this->db->escape($this->label)."',";
+					$sql2.= " VALUES(".$this->id.",'".$this->db->escape($key)."','". $this->db->escape($this->label)."',";
 					$sql2.= " '".$this->db->escape($this->description)."'";
 					if (! empty($conf->global->PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION)) $sql2.= ", '".$this->db->escape($this->note)."'";
 					$sql2.= ")";
@@ -1247,14 +1247,14 @@ class Product extends CommonObject
 					$sql2.= " label='".$this->db->escape($this->multilangs["$key"]["label"])."',";
 					$sql2.= " description='".$this->db->escape($this->multilangs["$key"]["description"])."'";
 					if (! empty($conf->global->PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION)) $sql2.= ", note='".$this->db->escape($this->multilangs["$key"]["note"])."'";
-					$sql2.= " WHERE fk_product=".$this->id." AND lang='".$key."'";
+					$sql2.= " WHERE fk_product=".$this->id." AND lang='".$this->db->escape($key)."'";
 				}
 				else
 				{
 					$sql2 = "INSERT INTO ".MAIN_DB_PREFIX."product_lang (fk_product, lang, label, description";
 					if (! empty($conf->global->PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION)) $sql2.=", note";
 					$sql2.= ")";
-					$sql2.= " VALUES(".$this->id.",'".$key."','". $this->db->escape($this->multilangs["$key"]["label"])."',";
+					$sql2.= " VALUES(".$this->id.",'".$this->db->escape($key)."','". $this->db->escape($this->multilangs["$key"]["label"])."',";
 					$sql2.= " '".$this->db->escape($this->multilangs["$key"]["description"])."'";
 					if (! empty($conf->global->PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION)) $sql2.= ", '".$this->db->escape($this->note)."'";
 					$sql2.= ")";
@@ -1944,7 +1944,7 @@ class Product extends CommonObject
 						$sql.= " FROM ".MAIN_DB_PREFIX."product_price";
 						$sql.= " WHERE entity IN (".getEntity('productprice', 1).")";
 						$sql.= " AND price_level=".$i;
-						$sql.= " AND fk_product = '".$this->id."'";
+						$sql.= " AND fk_product = ".$this->id;
 						$sql.= " ORDER BY date_price DESC, rowid DESC";
 						$sql.= " LIMIT 1";
 						$resql = $this->db->query($sql);
@@ -1969,7 +1969,7 @@ class Product extends CommonObject
 							{
 								$sql = "SELECT rowid, price, unitprice, quantity, remise_percent, remise";
 								$sql.= " FROM ".MAIN_DB_PREFIX."product_price_by_qty";
-								$sql.= " WHERE fk_product_price = '".$this->prices_by_qty_id[$i]."'";
+								$sql.= " WHERE fk_product_price = ".$this->prices_by_qty_id[$i];
 								$sql.= " ORDER BY quantity ASC";
 								$resultat=array();
 								$resql = $this->db->query($sql);
@@ -2006,7 +2006,7 @@ class Product extends CommonObject
 					$sql = "SELECT price, price_ttc, price_min, price_min_ttc,";
 					$sql.= " price_base_type, tva_tx, default_vat_code, tosell, price_by_qty, rowid";
 					$sql.= " FROM ".MAIN_DB_PREFIX."product_price";
-					$sql.= " WHERE fk_product = '".$this->id."'";
+					$sql.= " WHERE fk_product = ".$this->id;
 					$sql.= " ORDER BY date_price DESC, rowid DESC";
 					$sql.= " LIMIT 1";
 					$resql = $this->db->query($sql);
@@ -2022,7 +2022,7 @@ class Product extends CommonObject
 						{
 							$sql = "SELECT rowid,price, unitprice, quantity, remise_percent, remise";
 							$sql.= " FROM ".MAIN_DB_PREFIX."product_price_by_qty";
-							$sql.= " WHERE fk_product_price = '".$this->prices_by_qty_id[0]."'";
+							$sql.= " WHERE fk_product_price = ".$this->prices_by_qty_id[0];
 							$sql.= " ORDER BY quantity ASC";
 							$resultat=array();
 							$resql = $this->db->query($sql);
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index 309107ed233..5efaae1fd78 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -1113,7 +1113,7 @@ class Project extends CommonObject
         // Get id of types of contacts for projects (This list never contains a lot of elements)
         $listofprojectcontacttype=array();
         $sql2 = "SELECT ctc.rowid, ctc.code FROM ".MAIN_DB_PREFIX."c_type_contact as ctc";
-        $sql2.= " WHERE ctc.element = '" . $this->element . "'";
+        $sql2.= " WHERE ctc.element = '" . $this->db->escape($this->element) . "'";
         $sql2.= " AND ctc.source = 'internal'";
         $resql = $this->db->query($sql2);
         if ($resql)
diff --git a/htdocs/projet/class/projectstats.class.php b/htdocs/projet/class/projectstats.class.php
index 88eb8ef5ced..4485117fb0f 100644
--- a/htdocs/projet/class/projectstats.class.php
+++ b/htdocs/projet/class/projectstats.class.php
@@ -143,7 +143,7 @@ class ProjectStats extends Stats
 		if (! empty($this->socid))
 			$sqlwhere[] = ' t.fk_soc=' . $this->socid;
 		if (! empty($this->year) && empty($this->yearmonth))
-			$sqlwhere[] = " date_format(t.datec,'%Y')='" . $this->year . "'";
+			$sqlwhere[] = " date_format(t.datec,'%Y')='" . $this->db->escape($this->year) . "'";
 		if (! empty($this->yearmonth))
 			$sqlwhere[] = " t.datec BETWEEN '" . $this->db->idate(dol_get_first_day($this->yearmonth)) . "' AND '" . $this->db->idate(dol_get_last_day($this->yearmonth)) . "'";
 
diff --git a/htdocs/societe/class/companybankaccount.class.php b/htdocs/societe/class/companybankaccount.class.php
index 652cd8d5d7e..65c3ca37e0a 100644
--- a/htdocs/societe/class/companybankaccount.class.php
+++ b/htdocs/societe/class/companybankaccount.class.php
@@ -144,12 +144,12 @@ class CompanyBankAccount extends Account
 
         $sql = "UPDATE ".MAIN_DB_PREFIX."societe_rib SET";
         $sql.= " bank = '" .$this->db->escape($this->bank)."'";
-        $sql.= ",code_banque='".$this->code_banque."'";
-        $sql.= ",code_guichet='".$this->code_guichet."'";
-        $sql.= ",number='".$this->number."'";
-        $sql.= ",cle_rib='".$this->cle_rib."'";
-        $sql.= ",bic='".$this->bic."'";
-        $sql.= ",iban_prefix = '".$this->iban."'";
+        $sql.= ",code_banque='".$this->db->escape($this->code_banque)."'";
+        $sql.= ",code_guichet='".$this->db->escape($this->code_guichet)."'";
+        $sql.= ",number='".$this->db->escape($this->number)."'";
+        $sql.= ",cle_rib='".$this->db->escape($this->cle_rib)."'";
+        $sql.= ",bic='".$this->db->escape($this->bic)."'";
+        $sql.= ",iban_prefix = '".$this->db->escape($this->iban)."'";
         $sql.= ",domiciliation='".$this->db->escape($this->domiciliation)."'";
         $sql.= ",proprio = '".$this->db->escape($this->proprio)."'";
         $sql.= ",owner_address = '".$this->db->escape($this->owner_address)."'";
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 6d3464ccc20..fb486629731 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -841,7 +841,7 @@ class Societe extends CommonObject
             $sql .= ",fk_effectif = ".(! empty($this->effectif_id)?"'".$this->db->escape($this->effectif_id)."'":"null");
             if (isset($this->stcomm_id))
             {
-                $sql .= ",fk_stcomm='".$this->stcomm_id."'";
+                $sql .= ",fk_stcomm=".($this->stcomm_id > 0 ? $this->stcomm_id : "null");
             }
             $sql .= ",fk_typent = ".(! empty($this->typent_id)?"'".$this->db->escape($this->typent_id)."'":"0");
 
@@ -859,7 +859,7 @@ class Societe extends CommonObject
             $sql .= ",default_lang = ".(! empty($this->default_lang)?"'".$this->db->escape($this->default_lang)."'":"null");
             $sql .= ",logo = ".(! empty($this->logo)?"'".$this->db->escape($this->logo)."'":"null");
             $sql .= ",outstanding_limit= ".($this->outstanding_limit!=''?$this->outstanding_limit:'null');
-            $sql .= ",fk_prospectlevel='".$this->fk_prospectlevel."'";
+            $sql .= ",fk_prospectlevel='".$this->db->escape($this->fk_prospectlevel)."'";
 
             $sql .= ",webservices_url = ".(! empty($this->webservices_url)?"'".$this->db->escape($this->webservices_url)."'":"null");
             $sql .= ",webservices_key = ".(! empty($this->webservices_key)?"'".$this->db->escape($this->webservices_key)."'":"null");
@@ -2080,7 +2080,7 @@ class Societe extends CommonObject
 
         $sql = "SELECT rowid, email, statut, phone_mobile, lastname, poste, firstname";
         $sql.= " FROM ".MAIN_DB_PREFIX."socpeople";
-        $sql.= " WHERE fk_soc = '".$this->id."'";
+        $sql.= " WHERE fk_soc = ".$this->id;
 
         $resql=$this->db->query($sql);
         if ($resql)
@@ -2140,7 +2140,7 @@ class Societe extends CommonObject
     {
         $contacts = array();
 
-        $sql = "SELECT rowid, lastname, firstname FROM ".MAIN_DB_PREFIX."socpeople WHERE fk_soc = '".$this->id."'";
+        $sql = "SELECT rowid, lastname, firstname FROM ".MAIN_DB_PREFIX."socpeople WHERE fk_soc = ".$this->id;
         $resql=$this->db->query($sql);
         if ($resql)
         {
@@ -2173,7 +2173,7 @@ class Societe extends CommonObject
         require_once DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php';
         $contacts = array();
 
-        $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."socpeople WHERE fk_soc = '".$this->id."'";
+        $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."socpeople WHERE fk_soc = ".$this->id;
         $resql=$this->db->query($sql);
         if ($resql)
         {
@@ -3157,7 +3157,7 @@ class Societe extends CommonObject
     {
     	$sql  = "SELECT t.localtax1, t.localtax2";
     	$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
-    	$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$this->country_code."'";
+    	$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$this->db->escape($this->country_code)."'";
     	$sql .= " AND t.active = 1";
     	if (empty($localTaxNum))   $sql .= " AND (t.localtax1_type <> '0' OR t.localtax2_type <> '0')";
     	elseif ($localTaxNum == 1) $sql .= " AND t.localtax1_type <> '0'";
@@ -3181,7 +3181,7 @@ class Societe extends CommonObject
     {
         $sql  = "SELECT t.rowid";
         $sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
-        $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$this->country_code."'";
+        $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$this->db->escape($this->country_code)."'";
         $sql .= " AND t.active = 1 AND t.recuperableonly = 1";
 
         dol_syslog("useNPR", LOG_DEBUG);
@@ -3202,7 +3202,7 @@ class Societe extends CommonObject
     {
 		$sql  = "SELECT COUNT(*) as nb";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_revenuestamp as r, ".MAIN_DB_PREFIX."c_country as c";
-		$sql .= " WHERE r.fk_pays = c.rowid AND c.code = '".$this->country_code."'";
+		$sql .= " WHERE r.fk_pays = c.rowid AND c.code = '".$this->db->escape($this->country_code)."'";
 		$sql .= " AND r.active = 1";
 
 		dol_syslog("useRevenueStamp", LOG_DEBUG);
diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index 00ca20bcd5a..7019933fb9c 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -839,7 +839,7 @@ class SupplierProposal extends CommonObject
             if ($this->id)
             {
                 $this->ref='(PROV'.$this->id.')';
-                $sql = 'UPDATE '.MAIN_DB_PREFIX."supplier_proposal SET ref='".$this->ref."' WHERE rowid=".$this->id;
+                $sql = 'UPDATE '.MAIN_DB_PREFIX."supplier_proposal SET ref='".$this->db->escape($this->ref)."' WHERE rowid=".$this->id;
 
                 dol_syslog(get_class($this)."::create", LOG_DEBUG);
                 $resql=$this->db->query($sql);
@@ -3002,14 +3002,14 @@ class SupplierProposalLine  extends CommonObjectLine
         $sql.= " , tva_tx='".price2num($this->tva_tx)."'";
         $sql.= " , localtax1_tx=".price2num($this->localtax1_tx);
         $sql.= " , localtax2_tx=".price2num($this->localtax2_tx);
-		$sql.= " , localtax1_type='".$this->localtax1_type."'";
-		$sql.= " , localtax2_type='".$this->localtax2_type."'";
+		$sql.= " , localtax1_type='".$this->db->escape($this->localtax1_type)."'";
+		$sql.= " , localtax2_type='".$this->db->escape($this->localtax2_type)."'";
         $sql.= " , qty='".price2num($this->qty)."'";
         $sql.= " , subprice=".price2num($this->subprice)."";
         $sql.= " , remise_percent=".price2num($this->remise_percent)."";
         $sql.= " , price=".price2num($this->price)."";					// TODO A virer
         $sql.= " , remise=".price2num($this->remise)."";				// TODO A virer
-        $sql.= " , info_bits='".$this->info_bits."'";
+        $sql.= " , info_bits='".$this->db->escape($this->info_bits)."'";
         if (empty($this->skip_update_total))
         {
             $sql.= " , total_ht=".price2num($this->total_ht)."";
diff --git a/htdocs/user/class/userbankaccount.class.php b/htdocs/user/class/userbankaccount.class.php
index a7aba35fc64..00d350c3b0f 100644
--- a/htdocs/user/class/userbankaccount.class.php
+++ b/htdocs/user/class/userbankaccount.class.php
@@ -100,12 +100,12 @@ class UserBankAccount extends Account
 
         $sql = "UPDATE ".MAIN_DB_PREFIX."user_rib SET";
         $sql.= " bank = '" .$this->db->escape($this->bank)."'";
-        $sql.= ",code_banque='".$this->code_banque."'";
-        $sql.= ",code_guichet='".$this->code_guichet."'";
-        $sql.= ",number='".$this->number."'";
-        $sql.= ",cle_rib='".$this->cle_rib."'";
-        $sql.= ",bic='".$this->bic."'";
-        $sql.= ",iban_prefix = '".$this->iban."'";
+        $sql.= ",code_banque='".$this->db->escape($this->code_banque)."'";
+        $sql.= ",code_guichet='".$this->db->escape($this->code_guichet)."'";
+        $sql.= ",number='".$this->db->escape($this->number)."'";
+        $sql.= ",cle_rib='".$this->db->escape($this->cle_rib)."'";
+        $sql.= ",bic='".$this->db->escape($this->bic)."'";
+        $sql.= ",iban_prefix = '".$this->db->escape($this->iban)."'";
         $sql.= ",domiciliation='".$this->db->escape($this->domiciliation)."'";
         $sql.= ",proprio = '".$this->db->escape($this->proprio)."'";
         $sql.= ",owner_address = '".$this->db->escape($this->owner_address)."'";
diff --git a/test/phpunit/AllTests.php b/test/phpunit/AllTests.php
index 99f9faf260d..812ec85117c 100644
--- a/test/phpunit/AllTests.php
+++ b/test/phpunit/AllTests.php
@@ -100,11 +100,14 @@ class AllTests
         require_once dirname(__FILE__).'/XCalLibTest.php';
         $suite->addTestSuite('XCalLibTest');
 
+        // Rules into source files content
         require_once dirname(__FILE__).'/LangTest.php';
         $suite->addTestSuite('LangTest');
-        require_once dirname(__FILE__).'/SqlTest.php';
-        $suite->addTestSuite('SqlTest');
-
+        require_once dirname(__FILE__).'/CodingSqlTest.php';
+        $suite->addTestSuite('CodingSqlTest');
+        require_once dirname(__FILE__).'/CodingPhpTest.php';
+        $suite->addTestSuite('PhpTest');
+        
         require_once dirname(__FILE__).'/SecurityTest.php';
         $suite->addTestSuite('SecurityTest');
 
diff --git a/test/phpunit/CodingPHPTest.php b/test/phpunit/CodingPhpTest.php
similarity index 94%
rename from test/phpunit/CodingPHPTest.php
rename to test/phpunit/CodingPhpTest.php
index b8d7bc90816..4860e5b5e38 100644
--- a/test/phpunit/CodingPHPTest.php
+++ b/test/phpunit/CodingPhpTest.php
@@ -148,18 +148,19 @@ class CodingPhpTest extends PHPUnit_Framework_TestCase
         {
             if (preg_match('/\/htdocs\/includes\//', $file['fullname'])) continue;
             if (preg_match('/\/htdocs\/custom\//', $file['fullname'])) continue;
-            if (preg_match('/\/htdocs\/nltechno/', $file['fullname'])) continue;
             if (preg_match('/\/htdocs\/dolimed/', $file['fullname'])) continue;
+            if (preg_match('/\/htdocs\/nltechno/', $file['fullname'])) continue;
+            if (preg_match('/\/htdocs\/teclib/', $file['fullname'])) continue;
             
             print 'Check php file '.$file['fullname']."\n";
             $filecontent=file_get_contents($file['fullname']);
             
             $ok=true;
             $matches=array();
-            preg_match_all('/=\'".\$this->(..)/', $filecontent, $matches, PREG_SET_ORDER);
+            preg_match_all('/=\s*\'"\s*\.\s*\$this->(....)/', $filecontent, $matches, PREG_SET_ORDER);
             foreach($matches as $key => $val)
             {
-                if ($val[1] != 'db') 
+                if ($val[1] != 'db->' && $val[1] != 'esca') 
                 {
                     $ok=false;
                     break;
@@ -167,7 +168,7 @@ class CodingPhpTest extends PHPUnit_Framework_TestCase
                 //if ($reg[0] != 'db') $ok=false;
             }
             //print __METHOD__." Result for checking we don't have non escaped string in sql requests for file ".$file."\n";
-            $this->assertTrue($ok, 'Found non escaped string in building of a sql request '.$file['fullname'].'. Bad.');
+            $this->assertTrue($ok, 'Found non escaped string in building of a sql request '.$file['fullname'].' ('.$val[0].'). Bad.');
             //exit;
         }
 
diff --git a/test/phpunit/SqlTest.php b/test/phpunit/CodingSqlTest.php
similarity index 100%
rename from test/phpunit/SqlTest.php
rename to test/phpunit/CodingSqlTest.php

From 1a016524e0ee866877666b1a0af2a5b769a72d48 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 12 May 2017 17:44:51 +0200
Subject: [PATCH 323/505] Fix log

---
 scripts/cron/cron_run_jobs.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/scripts/cron/cron_run_jobs.php b/scripts/cron/cron_run_jobs.php
index d60218fba22..fb03cad5757 100755
--- a/scripts/cron/cron_run_jobs.php
+++ b/scripts/cron/cron_run_jobs.php
@@ -90,7 +90,7 @@ if ($userlogin == 'firstadmin')
         if ($obj) 
         {
             $userlogin = $obj->login;
-            echo "First admin user found is login '".$userlogin."'\n<br>";
+            echo "First admin user found is login '".$userlogin."'\n";
         }
     }
     else dol_print_error($db);
@@ -146,7 +146,8 @@ if(is_array($object->lines) && (count($object->lines)>0))
 	// Loop over job
 	foreach($object->lines as $line)
 	{
-	    dol_syslog("cron_run_jobs.php cronjobid: ".$line->id, LOG_WARNING);
+	    dol_syslog("cron_run_jobs.php cronjobid: ".$line->id, LOG_DEBUG);
+	    echo "cron_run_jobs.php cronjobid: ".$line->id."\n";
 	    
 		//If date_next_jobs is less of current date, execute the program, and store the execution time of the next execution in database
 		if (($line->datenextrun < $now) && (empty($line->datestart) || $line->datestart <= $now) && (empty($line->dateend) || $line->dateend >= $now))

From 8fc285c8b35806f5da7e0bdefa2d1eaeb198f924 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 12 May 2017 18:32:13 +0200
Subject: [PATCH 324/505] Fix bad date usage

---
 htdocs/cron/list.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php
index 880235a9a17..5056f4711d3 100644
--- a/htdocs/cron/list.php
+++ b/htdocs/cron/list.php
@@ -404,11 +404,11 @@ if ($num > 0)
 		print '</td>';
 
 		print '<td class="center">';
-		if(!empty($obj->datestart)) {print dol_print_date($obj->datestart,'dayhour');}
+		if(!empty($obj->datestart)) {print dol_print_date($db->jdate($obj->datestart),'dayhour');}
 		print '</td>';
 
 		print '<td class="center">';
-		if(!empty($obj->dateend)) {print dol_print_date($obj->dateend,'dayhour');}
+		if(!empty($obj->dateend)) {print dol_print_date($db->jdate($obj->dateend),'dayhour');}
 		print '</td>';
 
 		print '<td align="right">';
@@ -420,11 +420,11 @@ if ($num > 0)
 		print '</td>';
 
 		print '<td class="center">';
-		if(!empty($obj->datenextrun)) {print dol_print_date($obj->datenextrun,'dayhour');}
+		if(!empty($obj->datenextrun)) {print dol_print_date($db->jdate($obj->datenextrun),'dayhour');}
 		print '</td>';
 
 		print '<td class="center">';
-		if(!empty($obj->datelastrun)) {print dol_print_date($obj->datelastrun,'dayhour');}
+		if(!empty($obj->datelastrun)) {print dol_print_date($db->jdate($obj->datelastrun),'dayhour');}
 		print '</td>';
 
 		print '<td class="center">';

From f6dcb2860ab2aa500805b54cd6dc3c1af9dc3b05 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 12 May 2017 19:14:54 +0200
Subject: [PATCH 325/505] More complete help message

---
 htdocs/cron/list.php          | 6 ++++--
 htdocs/langs/en_US/admin.lang | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php
index 630430e8d59..82d5fb04130 100644
--- a/htdocs/cron/list.php
+++ b/htdocs/cron/list.php
@@ -289,8 +289,10 @@ print_barre_liste($pagetitle, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $
 
 
 print $langs->trans('CronInfo').'<br>';
-print $stringcurrentdate.'<br>';
-if (! empty($conf->global->CRON_WARNING_DELAY_HOURS)) print info_admin($langs->trans("WarningCronDelayed", $conf->global->CRON_WARNING_DELAY_HOURS));
+
+$text =$langs->trans("HoursOnThisPageAreOnServerTZ").' '.$stringcurrentdate.'<br>';
+if (! empty($conf->global->CRON_WARNING_DELAY_HOURS)) $text.=$langs->trans("WarningCronDelayed", $conf->global->CRON_WARNING_DELAY_HOURS);
+print info_admin($text);
 print '<br>';
 
 
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 71e5b614abb..3662e8aca1c 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -123,7 +123,8 @@ PHPTZ=PHP server Time Zone
 DaylingSavingTime=Daylight saving time
 CurrentHour=PHP Time (server)
 CurrentSessionTimeOut=Current session timeout
-YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htacces with a line like this "SetEnv TZ Europe/Paris"
+YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htaccess with a line like this "SetEnv TZ Europe/Paris"
+HoursOnThisPageAreOnServerTZ=Warning, in contrary of other screens, hours on this page are not in your local timezone, but for the timezone of the server.
 Box=Widget
 Boxes=Widgets
 MaxNbOfLinesForBoxes=Max number of lines for widgets

From f8403d502050150ad0ba811d07dbd4a544c3f076 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 12 May 2017 20:01:45 +0200
Subject: [PATCH 326/505] Fix phpunit test

---
 htdocs/langs/en_US/cron.lang | 4 ++--
 test/phpunit/AllTests.php    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/langs/en_US/cron.lang b/htdocs/langs/en_US/cron.lang
index 76b1a92a365..a1d3c6a9986 100644
--- a/htdocs/langs/en_US/cron.lang
+++ b/htdocs/langs/en_US/cron.lang
@@ -25,7 +25,7 @@ CronDelete=Delete scheduled jobs
 CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
 CronExecute=Launch scheduled job
 CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
-CronInfo=Scheduled job module allow to execute job that have been planned
+CronInfo=Scheduled job module allows to schedule jobs to execute them automatically. Jobs can also be started manually.
 CronTask=Job
 CronNone=None
 CronDtStart=Not before
@@ -76,4 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled job
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump
-WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours, before being run.
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/test/phpunit/AllTests.php b/test/phpunit/AllTests.php
index 812ec85117c..de8cc397cf4 100644
--- a/test/phpunit/AllTests.php
+++ b/test/phpunit/AllTests.php
@@ -106,7 +106,7 @@ class AllTests
         require_once dirname(__FILE__).'/CodingSqlTest.php';
         $suite->addTestSuite('CodingSqlTest');
         require_once dirname(__FILE__).'/CodingPhpTest.php';
-        $suite->addTestSuite('PhpTest');
+        $suite->addTestSuite('CodingPhpTest');
         
         require_once dirname(__FILE__).'/SecurityTest.php';
         $suite->addTestSuite('SecurityTest');

From f7e042d7b82a67eabbd973c003fbba6e6f11f838 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 13 May 2017 13:02:55 +0200
Subject: [PATCH 327/505] Look and feel v6

---
 htdocs/adherents/admin/adherent.php           | 141 +++++++++---------
 .../adherents/admin/adherent_extrafields.php  |   2 +-
 .../admin/adherent_type_extrafields.php       |   2 +-
 htdocs/adherents/admin/public.php             |   7 +-
 htdocs/core/lib/admin.lib.php                 |   8 +-
 5 files changed, 81 insertions(+), 79 deletions(-)

diff --git a/htdocs/adherents/admin/adherent.php b/htdocs/adherents/admin/adherent.php
index 2754c2d3690..8050a0ec019 100644
--- a/htdocs/adherents/admin/adherent.php
+++ b/htdocs/adherents/admin/adherent.php
@@ -48,6 +48,37 @@ $action = GETPOST('action','alpha');
  * Actions
  */
 
+//
+if ($action == 'updateall')
+{
+    $db->begin();
+    $res1=$res2=$res3=$res4=$res5=$res6=0;
+    $res1=dolibarr_set_const($db, 'ADHERENT_LOGIN_NOT_REQUIRED', GETPOST('ADHERENT_LOGIN_NOT_REQUIRED', 'alpha'), 'chaine', 0, '', $conf->entity);
+    $res2=dolibarr_set_const($db, 'ADHERENT_MAIL_REQUIRED', GETPOST('ADHERENT_MAIL_REQUIRED', 'alpha'), 'chaine', 0, '', $conf->entity);
+    $res3=dolibarr_set_const($db, 'ADHERENT_DEFAULT_SENDINFOBYMAIL', GETPOST('ADHERENT_DEFAULT_SENDINFOBYMAIL', 'alpha'), 'chaine', 0, '', $conf->entity);
+    $res4=dolibarr_set_const($db, 'ADHERENT_BANK_USE', GETPOST('ADHERENT_BANK_USE', 'alpha'), 'chaine', 0, '', $conf->entity);
+    // Use vat for invoice creation
+    if ($conf->facture->enabled)
+    {
+        $res4=dolibarr_set_const($db, 'ADHERENT_VAT_FOR_SUBSCRIPTIONS', GETPOST('ADHERENT_VAT_FOR_SUBSCRIPTIONS', 'alpha'), 'chaine', 0, '', $conf->entity);
+        $res5=dolibarr_set_const($db, 'ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS', GETPOST('ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS', 'alpha'), 'chaine', 0, '', $conf->entity);
+        if (! empty($conf->product->enabled) || ! empty($conf->service->enabled))
+        {
+            $res6=dolibarr_set_const($db, 'ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS', GETPOST('ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS', 'alpha'), 'chaine', 0, '', $conf->entity);
+        }
+    }
+    if ($res1 < 0 || $res2 < 0 || $res3 < 0 || $res4 < 0 || $res5 < 0 || $res6 < 0)
+    {
+        setEventMessages('ErrorFailedToSaveDate', null, 'errors');
+        $db->rollback();
+    }
+    else
+    {
+        setEventMessages('RecordModifiedSuccessfully', null, 'mesgs');
+        $db->commit();
+    }
+}
+
 // Action mise a jour ou ajout d'une constante
 if ($action == 'update' || $action == 'add')
 {
@@ -116,113 +147,81 @@ print load_fiche_titre($langs->trans("MembersSetup"),$linkback,'title_setup');
 
 $head = member_admin_prepare_head();
 
-dol_fiche_head($head, 'general', $langs->trans("Members"), 0, 'user');
+dol_fiche_head($head, 'general', $langs->trans("Members"), -1, 'user');
+
+print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<input type="hidden" name="action" value="updateall">';
 
 print load_fiche_titre($langs->trans("MemberMainOptions"),'','');
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Description").'</td>';
 print '<td>'.$langs->trans("Value").'</td>';
-print '<td align="center">'.$langs->trans("Action").'</td>';
 print "</tr>\n";
 
 // Login/Pass required for members
-print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print '<input type="hidden" name="action" value="update">';
-print '<input type="hidden" name="constname" value="ADHERENT_LOGIN_NOT_REQUIRED">';
 print '<tr class="oddeven"><td>'.$langs->trans("AdherentLoginRequired").'</td><td>';
-print $form->selectyesno('constvalue',(! empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)?0:1),1);
-print '</td><td align="center" width="80">';
-print '<input type="submit" class="button" value="'.$langs->trans("Update").'" name="Button">';
+print $form->selectyesno('ADHERENT_LOGIN_NOT_REQUIRED',(! empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)?0:1),1);
 print "</td></tr>\n";
-print '</form>';
 
 // Mail required for members
-print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print '<input type="hidden" name="action" value="update">';
-print '<input type="hidden" name="constname" value="ADHERENT_MAIL_REQUIRED">';
 print '<tr class="oddeven"><td>'.$langs->trans("AdherentMailRequired").'</td><td>';
-print $form->selectyesno('constvalue',(! empty($conf->global->ADHERENT_MAIL_REQUIRED)?$conf->global->ADHERENT_MAIL_REQUIRED:0),1);
-print '</td><td align="center" width="80">';
-print '<input type="submit" class="button" value="'.$langs->trans("Update").'" name="Button">';
+print $form->selectyesno('ADHERENT_MAIL_REQUIRED',(! empty($conf->global->ADHERENT_MAIL_REQUIRED)?$conf->global->ADHERENT_MAIL_REQUIRED:0),1);
 print "</td></tr>\n";
-print '</form>';
 
 // Send mail information is on by default
-print '<form action="adherent.php" method="POST">';
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print '<input type="hidden" name="action" value="update">';
-print '<input type="hidden" name="constname" value="ADHERENT_DEFAULT_SENDINFOBYMAIL">';
 print '<tr class="oddeven"><td>'.$langs->trans("MemberSendInformationByMailByDefault").'</td><td>';
-print $form->selectyesno('constvalue',(! empty($conf->global->ADHERENT_DEFAULT_SENDINFOBYMAIL)?$conf->global->ADHERENT_DEFAULT_SENDINFOBYMAIL:0),1);
-print '</td><td align="center" width="80">';
-print '<input type="submit" class="button" value="'.$langs->trans("Update").'" name="Button">';
+print $form->selectyesno('ADHERENT_DEFAULT_SENDINFOBYMAIL',(! empty($conf->global->ADHERENT_DEFAULT_SENDINFOBYMAIL)?$conf->global->ADHERENT_DEFAULT_SENDINFOBYMAIL:0),1);
 print "</td></tr>\n";
-print '</form>';
 
 // Insert subscription into bank account
-print '<form action="adherent.php" method="POST">';
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print '<input type="hidden" name="action" value="update">';
-print '<input type="hidden" name="constname" value="ADHERENT_BANK_USE">';
 print '<tr class="oddeven"><td>'.$langs->trans("MoreActionsOnSubscription").'</td>';
 $arraychoices=array('0'=>$langs->trans("None"));
 if (! empty($conf->banque->enabled)) $arraychoices['bankdirect']=$langs->trans("MoreActionBankDirect");
 if (! empty($conf->banque->enabled) && ! empty($conf->societe->enabled) && ! empty($conf->facture->enabled)) $arraychoices['invoiceonly']=$langs->trans("MoreActionInvoiceOnly");
 if (! empty($conf->banque->enabled) && ! empty($conf->societe->enabled) && ! empty($conf->facture->enabled)) $arraychoices['bankviainvoice']=$langs->trans("MoreActionBankViaInvoice");
 print '<td>';
-print $form->selectarray('constvalue',$arraychoices,$conf->global->ADHERENT_BANK_USE,0);
-print '</td><td align="center" width="80">';
-print '<input type="submit" class="button" value="'.$langs->trans("Update").'" name="Button">';
+print $form->selectarray('ADHERENT_BANK_USE',$arraychoices,$conf->global->ADHERENT_BANK_USE,0);
 print '</td>';
 print "</tr>\n";
-print '</form>';
 
 // Use vat for invoice creation
 if ($conf->facture->enabled)
 {
-	print '<form action="adherent.php" method="POST">';
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	print '<input type="hidden" name="action" value="update">';
-	print '<input type="hidden" name="constname" value="ADHERENT_VAT_FOR_SUBSCRIPTIONS">';
 	print '<tr class="oddeven"><td>'.$langs->trans("VATToUseForSubscriptions").'</td>';
 	if (! empty($conf->banque->enabled))
 	{
 		print '<td>';
-		print $form->selectarray('constvalue', array('0'=>$langs->trans("NoVatOnSubscription"),'defaultforfoundationcountry'=>$langs->trans("Default")), (empty($conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS)?'0':$conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS), 0);
-		print '</td><td align="center" width="80">';
-		print '<input type="submit" class="button" value="'.$langs->trans("Update").'" name="Button">';
+		print $form->selectarray('ADHERENT_VAT_FOR_SUBSCRIPTIONS', array('0'=>$langs->trans("NoVatOnSubscription"),'defaultforfoundationcountry'=>$langs->trans("Default")), (empty($conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS)?'0':$conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS), 0);
 		print '</td>';
 	}
 	else
 	{
-		print '<td align="right" colspan="2">';
+		print '<td align="right">';
 		print $langs->trans("WarningModuleNotActive",$langs->transnoentities("Module85Name"));
 		print '</td>';
 	}
 	print "</tr>\n";
-	print '</form>';
-
+	
 	if (! empty($conf->product->enabled) || ! empty($conf->service->enabled))
 	{
-		print '<form action="adherent.php" method="POST">';
-		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-		print '<input type="hidden" name="action" value="update">';
-		print '<input type="hidden" name="constname" value="ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS">';
 		print '<tr class="oddeven"><td>'.$langs->trans("ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS").'</td>';
 		print '<td>';
-		$form->select_produits($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS, 'constvalue_ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS');
-		print '</td><td align="center" width="80">';
-		print '<input type="submit" class="button" value="'.$langs->trans("Update").'" name="Button">';
+		$form->select_produits($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS, 'ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS');
 		print '</td>';
 	}
 	print "</tr>\n";
-	print '</form>';
 }
 
 print '</table>';
+
+print '<center>';
+print '<input type="submit" class="button" value="'.$langs->trans("Update").'" name="Button">';
+print '</center>';
+
+print '</form>';
+
 print '<br>';
 
 
@@ -240,13 +239,12 @@ $constantes=array(
 
 print load_fiche_titre($langs->trans("MembersCards"),'','');
 
-form_constantes($constantes);
+$helptext='*'.$langs->trans("FollowingConstantsWillBeSubstituted").'<br>';
+$helptext.='%DOL_MAIN_URL_ROOT%, %ID%, %FIRSTNAME%, %LASTNAME%, %FULLNAME%, %LOGIN%, %PASSWORD%, ';
+$helptext.='%COMPANY%, %ADDRESS%, %ZIP%, %TOWN%, %COUNTRY%, %EMAIL%, %BIRTH%, %PHOTO%, %TYPE%, ';
+$helptext.='%YEAR%, %MONTH%, %DAY%';
 
-print '*'.$langs->trans("FollowingConstantsWillBeSubstituted").'<br>';
-print '%DOL_MAIN_URL_ROOT%, %ID%, %FIRSTNAME%, %LASTNAME%, %FULLNAME%, %LOGIN%, %PASSWORD%, ';
-print '%COMPANY%, %ADDRESS%, %ZIP%, %TOWN%, %COUNTRY%, %EMAIL%, %BIRTH%, %PHOTO%, %TYPE%, ';
-print '%YEAR%, %MONTH%, %DAY%';
-print '<br>';
+form_constantes($constantes, 0, $helptext);
 
 print '<br>';
 
@@ -258,13 +256,12 @@ $constantes=array('ADHERENT_ETIQUETTE_TYPE','ADHERENT_ETIQUETTE_TEXT');
 
 print load_fiche_titre($langs->trans("MembersTickets"),'','');
 
-form_constantes($constantes);
+$helptext='*'.$langs->trans("FollowingConstantsWillBeSubstituted").'<br>';
+$helptext.='%DOL_MAIN_URL_ROOT%, %ID%, %FIRSTNAME%, %LASTNAME%, %FULLNAME%, %LOGIN%, %PASSWORD%, ';
+$helptext.='%COMPANY%, %ADDRESS%, %ZIP%, %TOWN%, %COUNTRY%, %EMAIL%, %BIRTH%, %PHOTO%, %TYPE%, ';
+$helptext.='%YEAR%, %MONTH%, %DAY%';
 
-print '*'.$langs->trans("FollowingConstantsWillBeSubstituted").'<br>';
-print '%DOL_MAIN_URL_ROOT%, %ID%, %FIRSTNAME%, %LASTNAME%, %FULLNAME%, %LOGIN%, %PASSWORD%, ';
-print '%COMPANY%, %ADDRESS%, %ZIP%, %TOWN%, %COUNTRY%, %EMAIL%, %BIRTH%, %PHOTO%, %TYPE%, ';
-print '%YEAR%, %MONTH%, %DAY%';
-print '<br>';
+form_constantes($constantes, 0, $helptext);
 
 print '<br>';
 
@@ -288,13 +285,17 @@ $constantes=array(
 
 print load_fiche_titre($langs->trans("Other"),'','');
 
-form_constantes($constantes);
+$helptext='*'.$langs->trans("FollowingConstantsWillBeSubstituted").'<br>';
+$helptext.='%DOL_MAIN_URL_ROOT%, %ID%, %FIRSTNAME%, %LASTNAME%, %FULLNAME%, %LOGIN%, %PASSWORD%, ';
+$helptext.='%COMPANY%, %ADDRESS%, %ZIP%, %TOWN%, %COUNTRY%, %EMAIL%, %BIRTH%, %PHOTO%, %TYPE%, ';
+$helptext.='%YEAR%, %MONTH%, %DAY%';
 
-print '*'.$langs->trans("FollowingConstantsWillBeSubstituted").'<br>';
-print '%DOL_MAIN_URL_ROOT%, %ID%, %FIRSTNAME%, %LASTNAME%, %FULLNAME%, %LOGIN%, %PASSWORD%, ';
-print '%COMPANY%, %ADDRESS%, %ZIP%, %TOWN%, %COUNTRY%, %EMAIL%, %BIRTH%, %PHOTO%, %TYPE%, ';
-//print '%YEAR%, %MONTH%, %DAY%';	// Not supported
-print '<br>';
+$helptext='*'.$langs->trans("FollowingConstantsWillBeSubstituted").'<br>';
+$helptext.='%DOL_MAIN_URL_ROOT%, %ID%, %FIRSTNAME%, %LASTNAME%, %FULLNAME%, %LOGIN%, %PASSWORD%, ';
+$helptext.='%COMPANY%, %ADDRESS%, %ZIP%, %TOWN%, %COUNTRY%, %EMAIL%, %BIRTH%, %PHOTO%, %TYPE%, ';
+//$helptext.='%YEAR%, %MONTH%, %DAY%';	// Not supported
+
+form_constantes($constantes, 0, $helptext);
 
 dol_fiche_end();
 
diff --git a/htdocs/adherents/admin/adherent_extrafields.php b/htdocs/adherents/admin/adherent_extrafields.php
index 32bf1c87b11..542b4f29a57 100644
--- a/htdocs/adherents/admin/adherent_extrafields.php
+++ b/htdocs/adherents/admin/adherent_extrafields.php
@@ -70,7 +70,7 @@ print load_fiche_titre($langs->trans("MembersSetup"),$linkback,'title_setup');
 
 $head = member_admin_prepare_head();
 
-dol_fiche_head($head, 'attributes', $langs->trans("Members"), 0, 'user');
+dol_fiche_head($head, 'attributes', $langs->trans("Members"), -1, 'user');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
diff --git a/htdocs/adherents/admin/adherent_type_extrafields.php b/htdocs/adherents/admin/adherent_type_extrafields.php
index 835bd05ea5f..8e0d5f9eaa8 100644
--- a/htdocs/adherents/admin/adherent_type_extrafields.php
+++ b/htdocs/adherents/admin/adherent_type_extrafields.php
@@ -73,7 +73,7 @@ print load_fiche_titre($langs->trans("MembersSetup"),$linkback,'title_setup');
 
 $head = member_admin_prepare_head();
 
-dol_fiche_head($head, 'attributes_type', $langs->trans("Members"), 0, 'user');
+dol_fiche_head($head, 'attributes_type', $langs->trans("Members"), -1, 'user');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
diff --git a/htdocs/adherents/admin/public.php b/htdocs/adherents/admin/public.php
index 5c16a34793c..9c982884dd9 100644
--- a/htdocs/adherents/admin/public.php
+++ b/htdocs/adherents/admin/public.php
@@ -92,8 +92,9 @@ $head = member_admin_prepare_head();
 
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
 print '<input type="hidden" name="action" value="update">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 
-dol_fiche_head($head, 'public', $langs->trans("Members"), 0, 'user');
+dol_fiche_head($head, 'public', $langs->trans("Members"), -1, 'user');
 
 if ($conf->use_javascript_ajax)
 {
@@ -147,7 +148,6 @@ print '<td align="right">'.$langs->trans("Value").'</td>';
 print "</tr>\n";
 
 // Allow public form
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<tr class="oddeven"><td>';
 print $langs->trans("EnablePublicSubscriptionForm");
 print '</td><td align="right">';
@@ -156,7 +156,6 @@ print "</td></tr>\n";
 
 // Force Type
 $adht = new AdherentType($db);
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<tr class="oddeven drag"><td>';
 print $langs->trans("ForceMemberType");
 print '</td><td width="60" align="center">';
@@ -167,7 +166,6 @@ print $form->selectarray("MEMBER_NEWFORM_FORCETYPE", $listofval, $forcetype, cou
 print "</td></tr>\n";
 
 // Amount
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<tr class="oddeven" id="tramount"><td>';
 print $langs->trans("DefaultAmount");
 print '</td><td align="right">';
@@ -175,7 +173,6 @@ print '<input type="text" id="MEMBER_NEWFORM_AMOUNT" name="MEMBER_NEWFORM_AMOUNT
 print "</td></tr>\n";
 
 // Can edit
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<tr class="oddeven" id="tredit"><td>';
 print $langs->trans("CanEditAmount");
 print '</td><td align="right">';
diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php
index 2016807efe9..6a0336aab38 100644
--- a/htdocs/core/lib/admin.lib.php
+++ b/htdocs/core/lib/admin.lib.php
@@ -1180,9 +1180,10 @@ function complete_elementList_with_modules(&$elementList)
  *
  *	@param	array	$tableau		Array of constants
  *	@param	int		$strictw3c		0=Include form into table (deprecated), 1=Form is outside table to respect W3C (no form into table), 2=No form nor button at all
+ *  @param  string  $helptext       Help
  *	@return	void
  */
-function form_constantes($tableau,$strictw3c=0)
+function form_constantes($tableau, $strictw3c=0, $helptext='')
 {
     global $db,$bc,$langs,$conf,$_Avery_Labels;
 
@@ -1193,7 +1194,10 @@ function form_constantes($tableau,$strictw3c=0)
     print '<table class="noborder" width="100%">';
     print '<tr class="liste_titre">';
     print '<td>'.$langs->trans("Description").'</td>';
-    print '<td>'.$langs->trans("Value").'*</td>';
+    print '<td>';
+    $text = $langs->trans("Value");
+    print $form->textwithpicto($text, $helptext, 1, 'help', '', 0, 2, 'idhelptext');
+    print '</td>';
     if (empty($strictw3c)) print '<td align="center" width="80">'.$langs->trans("Action").'</td>';
     print "</tr>\n";
     $var=true;

From 6f9e67b1fb2eabe886f2431b20780031d4062430 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 13 May 2017 13:08:25 +0200
Subject: [PATCH 328/505] Remove no more used constant

---
 htdocs/core/modules/modAdherent.class.php      | 7 -------
 htdocs/install/mysql/migration/5.0.0-6.0.0.sql | 2 ++
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/htdocs/core/modules/modAdherent.class.php b/htdocs/core/modules/modAdherent.class.php
index 4b3d1e5d34f..b75d674b41f 100644
--- a/htdocs/core/modules/modAdherent.class.php
+++ b/htdocs/core/modules/modAdherent.class.php
@@ -160,13 +160,6 @@ class modAdherent extends DolibarrModules
         $this->const[$r][4] = 0;
         $r++;
         
-        $this->const[$r][0] = "ADHERENT_BANK_USE_AUTO";
-        $this->const[$r][1] = "yesno";
-        $this->const[$r][2] = "";
-        $this->const[$r][3] = "Insertion automatique des cotisations dans le compte bancaire";
-        $this->const[$r][4] = 0;
-        $r++;
-        
         $this->const[$r][0] = "ADHERENT_BANK_ACCOUNT";
         $this->const[$r][1] = "chaine";
         $this->const[$r][2] = "";
diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index 58ad642266e..9a3ab73d133 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -148,6 +148,8 @@ ALTER TABLE llx_societe_remise_except ADD CONSTRAINT fk_societe_remise_fk_invoic
 
 ALTER TABLE llx_facture_rec ADD COLUMN vat_src_code	varchar(10) DEFAULT '';
 
+DELETE FROM llx_const where name = 'ADHERENT_BANK_USE_AUTO';
+
 UPDATE llx_const set value='moono-lisa' where value = 'moono' AND name = 'FCKEDITOR_SKIN';
 
 ALTER TABLE llx_product_price ADD COLUMN default_vat_code	varchar(10) after tva_tx;

From 54088f38fbad784c9678fdc495af524b3609c2fc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 13 May 2017 14:03:09 +0200
Subject: [PATCH 329/505] Code standardization on online payment code

---
 htdocs/core/lib/payments.lib.php    |  71 +++++++-
 htdocs/paybox/lib/paybox.lib.php    | 116 ------------
 htdocs/paypal/lib/paypal.lib.php    | 138 ---------------
 htdocs/public/paybox/paymentko.php  |  11 +-
 htdocs/public/paybox/paymentok.php  |  12 +-
 htdocs/public/payment/paymentko.php |   4 +-
 htdocs/public/payment/paymentok.php | 265 ++++++++++++++++------------
 htdocs/public/paypal/paymentko.php  |  11 +-
 htdocs/public/paypal/paymentok.php  |  11 +-
 9 files changed, 254 insertions(+), 385 deletions(-)

diff --git a/htdocs/core/lib/payments.lib.php b/htdocs/core/lib/payments.lib.php
index 591956bbffc..3a4d6b684f5 100644
--- a/htdocs/core/lib/payments.lib.php
+++ b/htdocs/core/lib/payments.lib.php
@@ -86,4 +86,73 @@ function payment_supplier_prepare_head(Paiement $object) {
 	complete_head_from_modules($conf,$langs,$object,$head,$h,'payment_supplier', 'remove');
 
 	return $head;
-}
\ No newline at end of file
+}
+
+
+
+/**
+ * Show footer of company in HTML pages
+ *
+ * @param   Societe		$fromcompany	Third party
+ * @param   Translate	$langs			Output language
+ * @return	void
+ */
+function htmlPrintOnlinePaymentFooter($fromcompany,$langs)
+{
+    global $conf;
+
+    // Juridical status
+    $line1="";
+    if ($fromcompany->forme_juridique_code)
+    {
+        $line1.=($line1?" - ":"").getFormeJuridiqueLabel($fromcompany->forme_juridique_code);
+    }
+    // Capital
+    if ($fromcompany->capital)
+    {
+        $line1.=($line1?" - ":"").$langs->transnoentities("CapitalOf",$fromcompany->capital)." ".$langs->transnoentities("Currency".$conf->currency);
+    }
+    // Prof Id 1
+    if ($fromcompany->idprof1 && ($fromcompany->country_code != 'FR' || ! $fromcompany->idprof2))
+    {
+        $field=$langs->transcountrynoentities("ProfId1",$fromcompany->country_code);
+        if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
+        $line1.=($line1?" - ":"").$field.": ".$fromcompany->idprof1;
+    }
+    // Prof Id 2
+    if ($fromcompany->idprof2)
+    {
+        $field=$langs->transcountrynoentities("ProfId2",$fromcompany->country_code);
+        if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
+        $line1.=($line1?" - ":"").$field.": ".$fromcompany->idprof2;
+    }
+
+    // Second line of company infos
+    $line2="";
+    // Prof Id 3
+    if ($fromcompany->idprof3)
+    {
+        $field=$langs->transcountrynoentities("ProfId3",$fromcompany->country_code);
+        if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
+        $line2.=($line2?" - ":"").$field.": ".$fromcompany->idprof3;
+    }
+    // Prof Id 4
+    if ($fromcompany->idprof4)
+    {
+        $field=$langs->transcountrynoentities("ProfId4",$fromcompany->country_code);
+        if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
+        $line2.=($line2?" - ":"").$field.": ".$fromcompany->idprof4;
+    }
+    // IntraCommunautary VAT
+    if ($fromcompany->tva_intra != '')
+    {
+        $line2.=($line2?" - ":"").$langs->transnoentities("VATIntraShort").": ".$fromcompany->tva_intra;
+    }
+
+    print '<br><br><hr>'."\n";
+    print '<div class="center"><font style="font-size: 10px;">'."\n";
+    print $fromcompany->name.'<br>';
+    print $line1.'<br>';
+    print $line2;
+    print '</font></div>'."\n";
+}
diff --git a/htdocs/paybox/lib/paybox.lib.php b/htdocs/paybox/lib/paybox.lib.php
index ca5fd6a71ad..09848ed905e 100644
--- a/htdocs/paybox/lib/paybox.lib.php
+++ b/htdocs/paybox/lib/paybox.lib.php
@@ -24,54 +24,6 @@
 
 
 
-/**
- * Show header
- *
- * @param 	string	$title		Title of page
- * @param 	string	$head		Head string to add int head section
- * @return	void
- */
-function llxHeaderPaybox($title, $head = "")
-{
-	global $user, $conf, $langs;
-
-	header("Content-type: text/html; charset=".$conf->file->character_set_client);
-	header("X-Content-Type-Options: nosniff");
-	
-	print '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">';
-	//print '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" http://www.w3.org/TR/1999/REC-html401-19991224/strict.dtd>';
-	print "\n";
-	print "<html>\n";
-	print "<head>\n";
-	print '<meta name="robots" content="noindex,nofollow">'."\n";
-	print '<meta name="keywords" content="dolibarr,payment,online">'."\n";
-	print '<meta name="description" content="Welcome on Dolibarr online payment form">'."\n";
-	print "<title>".$title."</title>\n";
-	if ($head) print $head."\n";
-	if (! empty($conf->global->PAYBOX_CSS_URL)) print '<link rel="stylesheet" type="text/css" href="'.$conf->global->PAYBOX_CSS_URL.'?lang='.$langs->defaultlang.'">'."\n";
-	else
-	{
-		print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.$conf->css.'?lang='.$langs->defaultlang.'">'."\n";
-		print '<style type="text/css">';
-		print '.CTableRow1      { margin: 1px; padding: 3px; font: 12px verdana,arial; background: #e6E6eE; color: #000000; -moz-border-radius-topleft:6px; -moz-border-radius-topright:6px; -moz-border-radius-bottomleft:6px; -moz-border-radius-bottomright:6px;}';
-		print '.CTableRow2      { margin: 1px; padding: 3px; font: 12px verdana,arial; background: #FFFFFF; color: #000000; -moz-border-radius-topleft:6px; -moz-border-radius-topright:6px; -moz-border-radius-bottomleft:6px; -moz-border-radius-bottomright:6px;}';
-		print '</style>';
-	}
-	print "</head>\n";
-	print '<body style="margin: 20px;">'."\n";
-}
-
-/**
- * Show footer
- *
- * @return	void
- */
-function llxFooterPayBox()
-{
-	print "</body>\n";
-	print "</html>\n";
-}
-
 
 /**
  * Create a redirect form to paybox form
@@ -220,71 +172,3 @@ function print_paybox_redirect($PRICE,$CURRENCY,$EMAIL,$urlok,$urlko,$TAG)
 	return;
 }
 
-
-/**
- * Show footer of company in HTML pages
- *
- * @param   Societe		$fromcompany	Third party
- * @param   Translate	$langs			Output language
- * @return	void
- */
-function html_print_paybox_footer($fromcompany,$langs)
-{
-	global $conf;
-
-	// Juridical status
-	$line1="";
-	if ($fromcompany->forme_juridique_code)
-	{
-		$line1.=($line1?" - ":"").getFormeJuridiqueLabel($fromcompany->forme_juridique_code);
-	}
-	// Capital
-	if ($fromcompany->capital)
-	{
-		$line1.=($line1?" - ":"").$langs->transnoentities("CapitalOf",$fromcompany->capital)." ".$langs->transnoentities("Currency".$conf->currency);
-	}
-	// Prof Id 1
-	if ($fromcompany->idprof1 && ($fromcompany->country_code != 'FR' || ! $fromcompany->idprof2))
-	{
-		$field=$langs->transcountrynoentities("ProfId1",$fromcompany->country_code);
-		if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
-		$line1.=($line1?" - ":"").$field.": ".$fromcompany->idprof1;
-	}
-	// Prof Id 2
-	if ($fromcompany->idprof2)
-	{
-		$field=$langs->transcountrynoentities("ProfId2",$fromcompany->country_code);
-		if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
-		$line1.=($line1?" - ":"").$field.": ".$fromcompany->idprof2;
-	}
-
-	// Second line of company infos
-	$line2="";
-	// Prof Id 3
-	if ($fromcompany->idprof3)
-	{
-		$field=$langs->transcountrynoentities("ProfId3",$fromcompany->country_code);
-		if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
-		$line2.=($line2?" - ":"").$field.": ".$fromcompany->idprof3;
-	}
-	// Prof Id 4
-	if ($fromcompany->idprof4)
-	{
-		$field=$langs->transcountrynoentities("ProfId4",$fromcompany->country_code);
-		if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
-		$line2.=($line2?" - ":"").$field.": ".$fromcompany->idprof4;
-	}
-	// IntraCommunautary VAT
-	if ($fromcompany->tva_intra != '')
-	{
-		$line2.=($line2?" - ":"").$langs->transnoentities("VATIntraShort").": ".$fromcompany->tva_intra;
-	}
-
-	print '<br><br><hr>'."\n";
-	print '<div class="center"><font style="font-size: 10px;">'."\n";
-	print $fromcompany->name.'<br>';
-	print $line1.'<br>';
-	print $line2;
-	print '</font></div>'."\n";
-}
-
diff --git a/htdocs/paypal/lib/paypal.lib.php b/htdocs/paypal/lib/paypal.lib.php
index b1be8f56647..9f08ffcb924 100644
--- a/htdocs/paypal/lib/paypal.lib.php
+++ b/htdocs/paypal/lib/paypal.lib.php
@@ -23,144 +23,6 @@
  */
 
 
-/**
- * Show header
- *
- * @param 	string	$title		Title
- * @param 	string	$head		More header to add
- * @return	void
- */
-function llxHeaderPaypal($title, $head = "")
-{
-	global $user, $conf, $langs;
-
-	header("Content-type: text/html; charset=".$conf->file->character_set_client);
-	header("X-Content-Type-Options: nosniff");
-	
-	$appli='Dolibarr';
-	if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $appli=$conf->global->MAIN_APPLICATION_TITLE;
-
-	print '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">';
-	//print '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" http://www.w3.org/TR/1999/REC-html401-19991224/strict.dtd>';
-	print "\n";
-	print "<html>\n";
-	print "<head>\n";
-	print '<meta name="robots" content="noindex,nofollow">'."\n";
-	print '<meta name="keywords" content="dolibarr,payment,online">'."\n";
-	print '<meta name="description" content="Welcome on '.$appli.' online payment form">'."\n";
-	print "<title>".$title."</title>\n";
-	if ($head) print $head."\n";
-	if (! empty($conf->global->PAYPAL_CSS_URL)) print '<link rel="stylesheet" type="text/css" href="'.$conf->global->PAYPAL_CSS_URL.'?lang='.$langs->defaultlang.'">'."\n";
-	else
-	{
-		print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.$conf->css.'?lang='.$langs->defaultlang.'">'."\n";
-		print '<style type="text/css">';
-		print '.CTableRow1      { margin: 1px; padding: 3px; font: 12px verdana,arial; background: #e6E6eE; color: #000000; -moz-border-radius-topleft:6px; -moz-border-radius-topright:6px; -moz-border-radius-bottomleft:6px; -moz-border-radius-bottomright:6px;}';
-		print '.CTableRow2      { margin: 1px; padding: 3px; font: 12px verdana,arial; background: #FFFFFF; color: #000000; -moz-border-radius-topleft:6px; -moz-border-radius-topright:6px; -moz-border-radius-bottomleft:6px; -moz-border-radius-bottomright:6px;}';
-		print '</style>';
-	}
-
-	if ($conf->use_javascript_ajax)
-	{
-		print '<!-- Includes for JQuery (Ajax library) -->'."\n";
-		print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/jnotify/jquery.jnotify-alt.min.css" />'."\n";          // JNotify
-
-		// Output standard javascript links
-		$ext='.js';
-
-		// JQuery. Must be before other includes
-		print '<!-- Includes JS for JQuery -->'."\n";
-		print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery.min'.$ext.'"></script>'."\n";
-		// jQuery jnotify
-		if (empty($conf->global->MAIN_DISABLE_JQUERY_JNOTIFY))
-		{
-			print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jnotify/jquery.jnotify.min'.$ext.'"></script>'."\n";
-			print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/jnotify'.$ext.'"></script>'."\n";
-		}
-	}
-	print "</head>\n";
-	print '<body style="margin: 20px;">'."\n";
-}
-
-/**
- * Show footer
- *
- * @return	void
- */
-function llxFooterPaypal()
-{
-	print "</body>\n";
-	print "</html>\n";
-}
-
-
-/**
- * Show footer of company in HTML pages
- *
- * @param   Societe		$fromcompany	Third party
- * @param   Translate	$langs			Output language
- * @return	void
- */
-function html_print_paypal_footer($fromcompany,$langs)
-{
-	global $conf;
-
-	// Juridical status
-	$line1="";
-	if ($fromcompany->forme_juridique_code)
-	{
-		$line1.=($line1?" - ":"").getFormeJuridiqueLabel($fromcompany->forme_juridique_code);
-	}
-	// Capital
-	if ($fromcompany->capital)
-	{
-		$line1.=($line1?" - ":"").$langs->transnoentities("CapitalOf",$fromcompany->capital)." ".$langs->transnoentities("Currency".$conf->currency);
-	}
-	// Prof Id 1
-	if ($fromcompany->idprof1 && ($fromcompany->country_code != 'FR' || ! $fromcompany->idprof2))
-	{
-		$field=$langs->transcountrynoentities("ProfId1",$fromcompany->country_code);
-		if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
-		$line1.=($line1?" - ":"").$field.": ".$fromcompany->idprof1;
-	}
-	// Prof Id 2
-	if ($fromcompany->idprof2)
-	{
-		$field=$langs->transcountrynoentities("ProfId2",$fromcompany->country_code);
-		if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
-		$line1.=($line1?" - ":"").$field.": ".$fromcompany->idprof2;
-	}
-
-	// Second line of company infos
-	$line2="";
-	// Prof Id 3
-	if ($fromcompany->idprof3)
-	{
-		$field=$langs->transcountrynoentities("ProfId3",$fromcompany->country_code);
-		if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
-		$line2.=($line2?" - ":"").$field.": ".$fromcompany->idprof3;
-	}
-	// Prof Id 4
-	if ($fromcompany->idprof4)
-	{
-		$field=$langs->transcountrynoentities("ProfId4",$fromcompany->country_code);
-		if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
-		$line2.=($line2?" - ":"").$field.": ".$fromcompany->idprof4;
-	}
-	// IntraCommunautary VAT
-	if ($fromcompany->tva_intra != '')
-	{
-		$line2.=($line2?" - ":"").$langs->transnoentities("VATIntraShort").": ".$fromcompany->tva_intra;
-	}
-
-	print '<br><br><hr>'."\n";
-	print '<div class="center"><font style="font-size: 10px;">'."\n";
-	print $fromcompany->name.'<br>';
-	print $line1.'<br>';
-	print $line2;
-	print '</font></div>'."\n";
-}
-
 /**
  *  Define head array for tabs of paypal tools setup pages
  *
diff --git a/htdocs/public/paybox/paymentko.php b/htdocs/public/paybox/paymentko.php
index 09de4525b39..0b6b0955bb2 100644
--- a/htdocs/public/paybox/paymentko.php
+++ b/htdocs/public/paybox/paymentko.php
@@ -35,6 +35,7 @@ if (is_numeric($entity)) define("DOLENTITY", $entity);
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/paybox/lib/paybox.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
 
 // Security check
 if (empty($conf->paybox->enabled)) accessforbidden('',0,0,1);
@@ -93,7 +94,11 @@ if (! empty($conf->global->PAYBOX_PAYONLINE_SENDEMAIL))
 }
 
 
-llxHeaderPayBox($langs->trans("PaymentForm"));
+$head='';
+if (! empty($conf->global->PAYBOX_CSS_URL)) $head='<link rel="stylesheet" type="text/css" href="'.$conf->global->PAYBOX_CSS_URL.'?lang='.$langs->defaultlang.'">'."\n";
+
+
+llxHeader($head, $langs->trans("PaymentForm"));
 
 
 // Show message
@@ -107,9 +112,9 @@ if (! empty($conf->global->PAYBOX_MESSAGE_KO)) print $conf->global->PAYBOX_MESSA
 print "\n</div>\n";
 
 
-html_print_paybox_footer($mysoc,$langs);
+htmlPrintOnlinePaymentFooter($mysoc,$langs);
 
 
-llxFooterPayBox();
+llxFooter();
 
 $db->close();
diff --git a/htdocs/public/paybox/paymentok.php b/htdocs/public/paybox/paymentok.php
index 9c3030a86ba..482f58ed909 100644
--- a/htdocs/public/paybox/paymentok.php
+++ b/htdocs/public/paybox/paymentok.php
@@ -35,6 +35,7 @@ if (is_numeric($entity)) define("DOLENTITY", $entity);
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/paybox/lib/paybox.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
 
 // Security check
 if (empty($conf->paybox->enabled)) accessforbidden('',0,0,1);
@@ -76,7 +77,12 @@ $tracepost = "";
 foreach($_POST as $k => $v) $tracepost .= "{$k} - {$v}\n";
 dol_syslog("POST=".$tracepost, LOG_DEBUG, 0, '_paybox');
 
-llxHeaderPayBox($langs->trans("PaymentForm"));
+
+$head='';
+if (! empty($conf->global->PAYBOX_CSS_URL)) $head='<link rel="stylesheet" type="text/css" href="'.$conf->global->PAYBOX_CSS_URL.'?lang='.$langs->defaultlang.'">'."\n";
+
+
+llxHeader($head, $langs->trans("PaymentForm"));
 
 
 // Show message
@@ -164,9 +170,9 @@ if (! empty($conf->global->PAYBOX_PAYONLINE_SENDEMAIL))
 
 print "\n</div>\n";
 
-html_print_paybox_footer($mysoc,$langs);
+htmlPrintOnlinePaymentFooter($mysoc,$langs);
 
 
-llxFooterPayBox();
+llxFooter();
 
 $db->close();
diff --git a/htdocs/public/payment/paymentko.php b/htdocs/public/payment/paymentko.php
index 70dac3c960b..5bd09f845da 100644
--- a/htdocs/public/payment/paymentko.php
+++ b/htdocs/public/payment/paymentko.php
@@ -37,6 +37,8 @@ if (is_numeric($entity)) define("DOLENTITY", $entity);
 
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
+
 if (! empty($conf->paypal->enabled))
 {
 	require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypal.lib.php';
@@ -138,7 +140,7 @@ if (! empty($conf->global->PAYPAL_MESSAGE_KO)) print $conf->global->PAYPAL_MESSA
 print "\n</div>\n";
 
 
-html_print_paypal_footer($mysoc,$langs);
+htmlPrintOnlinePaymentFooter($mysoc,$langs);
 
 
 llxFooter();
diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index ce3fcd8bb29..221abec032f 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -37,15 +37,14 @@ if (is_numeric($entity)) define("DOLENTITY", $entity);
 
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
+
 if (! empty($conf->paypal->enabled))
 {
 	require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypal.lib.php';
 	require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypalfunctions.lib.php';
 }
 
-// Security check
-//if (empty($conf->paypal->enabled)) accessforbidden('',0,0,1);
-
 $langs->load("main");
 $langs->load("other");
 $langs->load("dict");
@@ -84,16 +83,17 @@ if (! empty($conf->paypal->enabled))
 	    dol_print_error('',"Paypal setup param PAYPAL_API_SIGNATURE not defined");
 	    return -1;
 	}
+
+    $PAYPALTOKEN=GETPOST('TOKEN');
+    if (empty($PAYPALTOKEN)) $PAYPALTOKEN=GETPOST('token');
+    $PAYPALPAYERID=GETPOST('PAYERID');
+    if (empty($PAYPALPAYERID)) $PAYPALPAYERID=GETPOST('PayerID');
+    $PAYPALFULLTAG=GETPOST('FULLTAG');
+    if (empty($PAYPALFULLTAG)) $PAYPALFULLTAG=GETPOST('fulltag');
 }
 
 $source=GETPOST('source');
 $ref=GETPOST('ref');
-$PAYPALTOKEN=GETPOST('TOKEN');
-if (empty($PAYPALTOKEN)) $PAYPALTOKEN=GETPOST('token');
-$PAYPALPAYERID=GETPOST('PAYERID');
-if (empty($PAYPALPAYERID)) $PAYPALPAYERID=GETPOST('PayerID');
-$PAYPALFULLTAG=GETPOST('FULLTAG');
-if (empty($PAYPALFULLTAG)) $PAYPALFULLTAG=GETPOST('fulltag');
 
 $paymentmethod=array();
 if (! empty($conf->paypal->enabled)) $paymentmethod['paypal']='paypal';
@@ -104,6 +104,14 @@ if (! empty($conf->paybox->enabled)) $paymentmethod['paybox']='paybox';
 if (empty($paymentmethod)) accessforbidden('', 0, 0, 1);
 
 
+// If payment is ok
+$PAYMENTSTATUS=$TRANSACTIONID=$TAXAMT=$NOTE='';
+// If payment is ko
+$ErrorCode=$ErrorShortMsg=$ErrorLongMsg=$ErrorSeverityCode='';
+
+$ispaymentok = false;
+
+
 /*
  * Actions
  */
@@ -123,13 +131,16 @@ dol_syslog("POST=".$tracepost, LOG_DEBUG, 0, '_payment');
 $head='';
 if (! empty($conf->global->PAYMENT_CSS_URL)) $head='<link rel="stylesheet" type="text/css" href="'.$conf->global->PAYMENT_CSS_URL.'?lang='.$langs->defaultlang.'">'."\n";
 
+
 llxHeader($head, $langs->trans("PaymentForm"));
 
 
+
 // Show message
 print '<span id="dolpaymentspan"></span>'."\n";
 print '<div id="dolpaymentdiv" align="center">'."\n";
 
+
 if (! empty($conf->paypal->enabled))
 {
 	if ($PAYPALTOKEN)
@@ -147,7 +158,6 @@ if (! empty($conf->paypal->enabled))
 	
 		dol_syslog("Call paymentok with token=".$token." paymentType=".$paymentType." currencyCodeType=".$currencyCodeType." payerID=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt." fulltag=".$fulltag, LOG_DEBUG, 0, '_paypal');
 	
-	
 		// Validate record
 	    if (! empty($paymentType))
 	    {
@@ -159,7 +169,7 @@ if (! empty($conf->paypal->enabled))
 	        $resArray=confirmPayment($token, $paymentType, $currencyCodeType, $payerID, $ipaddress, $FinalPaymentAmt, $fulltag);
 	
 	        $ack = strtoupper($resArray["ACK"]);
-	        if($ack=="SUCCESS" || $ack=="SUCCESSWITHWARNING")
+	        if ($ack=="SUCCESS" || $ack=="SUCCESSWITHWARNING")
 	        {
 	        	$object = new stdClass();
 	
@@ -175,132 +185,153 @@ if (! empty($conf->paypal->enabled))
 	            $TRANSACTIONID=urldecode($resArray["TRANSACTIONID"]);
 	            $TAXAMT=urldecode($resArray["TAXAMT"]);
 	            $NOTE=urldecode($resArray["NOTE"]);
-	
-	            print $langs->trans("YourPaymentHasBeenRecorded")."<br>\n";
-	            print $langs->trans("ThisIsTransactionId",$TRANSACTIONID)."<br><br>\n";
-	            if (! empty($conf->global->PAYPAL_MESSAGE_OK)) print $conf->global->PAYPAL_MESSAGE_OK;
-	
-	            // Appel des triggers
-	            include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-	            $interface=new Interfaces($db);
-	            $result=$interface->run_triggers('PAYPAL_PAYMENT_OK',$object,$user,$langs,$conf);
-	            if ($result < 0) { $error++; $errors=$interface->errors; }
-	            // Fin appel triggers
-	
-	        	// Send an email
-				if (! empty($conf->global->PAYPAL_PAYONLINE_SENDEMAIL))
-				{
-					$sendto=$conf->global->PAYPAL_PAYONLINE_SENDEMAIL;
-					$from=$conf->global->MAILING_EMAIL_FROM;
-					// Define $urlwithroot
-					$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
-					$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
-					//$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
-	
-					$urlback=$_SERVER["REQUEST_URI"];
-					$topic='['.$conf->global->MAIN_APPLICATION_TITLE.'] '.$langs->transnoentitiesnoconv("NewPaypalPaymentReceived");
-					$tmptag=dolExplodeIntoArray($fulltag,'.','=');
-					$content="";
-					if (! empty($tmptag['MEM']))
-					{
-						$langs->load("members");
-						$url=$urlwithroot."/adherents/card_subscriptions.php?rowid=".$tmptag['MEM'];
-						$content.=$langs->trans("PaymentSubscription")."<br>\n";
-						$content.=$langs->trans("MemberId").': '.$tmptag['MEM']."<br>\n";
-						$content.=$langs->trans("Link").': <a href="'.$url.'">'.$url.'</a>'."<br>\n";
-					}
-					else
-					{
-						$content.=$langs->transnoentitiesnoconv("NewPaypalPaymentReceived")."<br>\n";
-					}
-					$content.="<br>\n";
-					$content.=$langs->transnoentitiesnoconv("TechnicalInformation").":<br>\n";
-					$content.=$langs->transnoentitiesnoconv("ReturnURLAfterPayment").': '.$urlback."<br>\n";
-					$content.="tag=".$fulltag." token=".$token." paymentType=".$paymentType." currencycodeType=".$currencyCodeType." payerId=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt;
-	
-					$ishtml=dol_textishtml($content);	// May contain urls
-	
-					require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-					$mailfile = new CMailFile($topic, $sendto, $from, $content, array(), array(), array(), '', '', 0, $ishtml);
-	
-					$result=$mailfile->sendfile();
-					if ($result)
-					{
-						dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_payment');
-					}
-					else
-					{
-						dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_payment');
-					}
-				}
+
+	            $ispaymentok=True;
 	        }
 	        else
-			{
+	        {
 	            //Display a user friendly Error on the page using any of the following error information returned by PayPal
 	            $ErrorCode = urldecode($resArray["L_ERRORCODE0"]);
 	            $ErrorShortMsg = urldecode($resArray["L_SHORTMESSAGE0"]);
 	            $ErrorLongMsg = urldecode($resArray["L_LONGMESSAGE0"]);
 	            $ErrorSeverityCode = urldecode($resArray["L_SEVERITYCODE0"]);
-	
-	            echo $langs->trans('DoExpressCheckoutPaymentAPICallFailed') . "<br>\n";
-	            echo $langs->trans('DetailedErrorMessage') . ": " . $ErrorLongMsg."<br>\n";
-	            echo $langs->trans('ShortErrorMessage') . ": " . $ErrorShortMsg."<br>\n";
-	            echo $langs->trans('ErrorCode') . ": " . $ErrorCode."<br>\n";
-	            echo $langs->trans('ErrorSeverityCode') . ": " . $ErrorSeverityCode."<br>\n";
-	
-	            if ($mysoc->email) echo "\nPlease, send a screenshot of this page to ".$mysoc->email."<br>\n";
-	
-	           	// Send an email
-				if (! empty($conf->global->PAYPAL_PAYONLINE_SENDEMAIL))
-				{
-					$sendto=$conf->global->PAYPAL_PAYONLINE_SENDEMAIL;
-					$from=$conf->global->MAILING_EMAIL_FROM;
-					// Define $urlwithroot
-					$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
-					$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
-					//$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
-	
-					$urlback=$_SERVER["REQUEST_URI"];
-					$topic='['.$conf->global->MAIN_APPLICATION_TITLE.'] '.$langs->transnoentitiesnoconv("ValidationOfPaypalPaymentFailed");
-					$content="";
-					$content.=$langs->transnoentitiesnoconv("PaypalConfirmPaymentPageWasCalledButFailed")."\n";
-					$content.="\n";
-					$content.=$langs->transnoentitiesnoconv("TechnicalInformation").":\n";
-					$content.=$langs->transnoentitiesnoconv("ReturnURLAfterPayment").': '.$urlback."\n";
-					$content.="tag=".$fulltag."\ntoken=".$token." paymentType=".$paymentType." currencycodeType=".$currencyCodeType." payerId=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt;
-	
-					$ishtml=dol_textishtml($content);	// May contain urls
-	
-					require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-					$mailfile = new CMailFile($topic, $sendto, $from, $content, array(), array(), array(), '', '', 0, $ishtml);
-	
-					$result=$mailfile->sendfile();
-					if ($result)
-					{
-						dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_payment');
-					}
-					else
-					{
-						dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_payment');
-					}
-				}
 	        }
 	    }
 	    else
 	    {
 	        dol_print_error('','Session expired');
-	    }
+	    }	    
+	}
+	else
+	{
+	    dol_print_error('','$PAYPALTOKEN not defined');
+	}	
+}
+
+
+
+if ($ispaymentok)
+{
+    // Appel des triggers
+    include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+    $interface=new Interfaces($db);
+    $result=$interface->run_triggers('PAYMENTONLINE_PAYMENT_OK',$object,$user,$langs,$conf);
+    if ($result < 0) { $error++; $errors=$interface->errors; }
+    // Fin appel triggers
+
+    
+    print $langs->trans("YourPaymentHasBeenRecorded")."<br>\n";
+    print $langs->trans("ThisIsTransactionId",$TRANSACTIONID)."<br><br>\n";
+    if (! empty($conf->global->PAYMENT_MESSAGE_OK)) print $conf->global->PAYMENT_MESSAGE_OK;
+    
+    
+	// Send an email
+	if (! empty($conf->global->PAYMENTONLINE_SENDEMAIL))
+	{
+		$sendto=$conf->global->PAYMENTONLINE_SENDEMAIL;
+		$from=$conf->global->MAILING_EMAIL_FROM;
+		// Define $urlwithroot
+		$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
+		$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
+		//$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
+
+		$urlback=$_SERVER["REQUEST_URI"];
+		$topic='['.$conf->global->MAIN_APPLICATION_TITLE.'] '.$langs->transnoentitiesnoconv("NewPaypalPaymentReceived");
+		$tmptag=dolExplodeIntoArray($fulltag,'.','=');
+		$content="";
+		if (! empty($tmptag['MEM']))
+		{
+			$langs->load("members");
+			$url=$urlwithroot."/adherents/card_subscriptions.php?rowid=".$tmptag['MEM'];
+			$content.=$langs->trans("PaymentSubscription")."<br>\n";
+			$content.=$langs->trans("MemberId").': '.$tmptag['MEM']."<br>\n";
+			$content.=$langs->trans("Link").': <a href="'.$url.'">'.$url.'</a>'."<br>\n";
+		}
+		else
+		{
+			$content.=$langs->transnoentitiesnoconv("NewPaypalPaymentReceived")."<br>\n";
+		}
+		$content.="<br>\n";
+		$content.=$langs->transnoentitiesnoconv("TechnicalInformation").":<br>\n";
+		$content.=$langs->transnoentitiesnoconv("ReturnURLAfterPayment").': '.$urlback."<br>\n";
+		$content.="tag=".$fulltag." token=".$token." paymentType=".$paymentType." currencycodeType=".$currencyCodeType." payerId=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt;
+
+		$ishtml=dol_textishtml($content);	// May contain urls
+
+		require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+		$mailfile = new CMailFile($topic, $sendto, $from, $content, array(), array(), array(), '', '', 0, $ishtml);
+
+		$result=$mailfile->sendfile();
+		if ($result)
+		{
+			dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_payment');
+		}
+		else
+		{
+			dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_payment');
+		}
 	}
 }
 else
 {
-    // No TOKEN parameter in URL
-    dol_print_error('','No TOKEN parameter in URL');
+    // Appel des triggers
+    include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+    $interface=new Interfaces($db);
+    $result=$interface->run_triggers('PAYMENTONLINE_PAYMENT_KO',$object,$user,$langs,$conf);
+    if ($result < 0) { $error++; $errors=$interface->errors; }
+    // Fin appel triggers
+    
+
+    print $langs->trans('DoExpressCheckoutPaymentAPICallFailed') . "<br>\n";
+    print $langs->trans('DetailedErrorMessage') . ": " . $ErrorLongMsg."<br>\n";
+    print $langs->trans('ShortErrorMessage') . ": " . $ErrorShortMsg."<br>\n";
+    print $langs->trans('ErrorCode') . ": " . $ErrorCode."<br>\n";
+    print $langs->trans('ErrorSeverityCode') . ": " . $ErrorSeverityCode."<br>\n";
+     
+    if ($mysoc->email) print "\nPlease, send a screenshot of this page to ".$mysoc->email."<br>\n";
+    
+    
+    // Send an email
+    if (! empty($conf->global->PAYMENTONLINE_SENDEMAIL))
+    {
+        $sendto=$conf->global->PAYMENTONLINE_SENDEMAIL;
+        $from=$conf->global->MAILING_EMAIL_FROM;
+        // Define $urlwithroot
+        $urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
+        $urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
+        //$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
+         
+        $urlback=$_SERVER["REQUEST_URI"];
+        $topic='['.$conf->global->MAIN_APPLICATION_TITLE.'] '.$langs->transnoentitiesnoconv("ValidationOfPaypalPaymentFailed");
+        $content="";
+        $content.=$langs->transnoentitiesnoconv("PaypalConfirmPaymentPageWasCalledButFailed")."\n";
+        $content.="\n";
+        $content.=$langs->transnoentitiesnoconv("TechnicalInformation").":\n";
+        $content.=$langs->transnoentitiesnoconv("ReturnURLAfterPayment").': '.$urlback."\n";
+        $content.="tag=".$fulltag."\ntoken=".$token." paymentType=".$paymentType." currencycodeType=".$currencyCodeType." payerId=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt;
+         
+        $ishtml=dol_textishtml($content);	// May contain urls
+         
+        require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+        $mailfile = new CMailFile($topic, $sendto, $from, $content, array(), array(), array(), '', '', 0, $ishtml);
+         
+        $result=$mailfile->sendfile();
+        if ($result)
+        {
+            dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_payment');
+        }
+        else
+        {
+            dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_payment');
+        }
+    }
 }
 
+
 print "\n</div>\n";
 
-html_print_paypal_footer($mysoc,$langs);
+
+htmlPrintOnlinePaymentFooter($mysoc,$langs);
 
 
 llxFooter();
diff --git a/htdocs/public/paypal/paymentko.php b/htdocs/public/paypal/paymentko.php
index 4bad572ed8b..7436693a1c1 100644
--- a/htdocs/public/paypal/paymentko.php
+++ b/htdocs/public/paypal/paymentko.php
@@ -39,6 +39,7 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypal.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypalfunctions.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
 
 // Security check
 if (empty($conf->paypal->enabled)) accessforbidden('',0,0,1);
@@ -113,7 +114,11 @@ if (! empty($conf->global->PAYPAL_PAYONLINE_SENDEMAIL))
 }
 
 
-llxHeaderPaypal($langs->trans("PaymentForm"));
+$head='';
+if (! empty($conf->global->PAYPAL_CSS_URL)) $head='<link rel="stylesheet" type="text/css" href="'.$conf->global->PAYPAL_CSS_URL.'?lang='.$langs->defaultlang.'">'."\n";
+
+
+llxHeader($head, $langs->trans("PaymentForm"));
 
 
 // Show ko message
@@ -125,9 +130,9 @@ if (! empty($conf->global->PAYPAL_MESSAGE_KO)) print $conf->global->PAYPAL_MESSA
 print "\n</div>\n";
 
 
-html_print_paypal_footer($mysoc,$langs);
+htmlPrintOnlinePaymentFooter($mysoc,$langs);
 
 
-llxFooterPaypal();
+llxFooter();
 
 $db->close();
diff --git a/htdocs/public/paypal/paymentok.php b/htdocs/public/paypal/paymentok.php
index 90f13aa6f17..984c282d161 100644
--- a/htdocs/public/paypal/paymentok.php
+++ b/htdocs/public/paypal/paymentok.php
@@ -39,6 +39,7 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypal.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypalfunctions.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
 
 // Security check
 if (empty($conf->paypal->enabled)) accessforbidden('',0,0,1);
@@ -107,7 +108,11 @@ foreach($_POST as $k => $v) $tracepost .= "{$k} - {$v}\n";
 dol_syslog("POST=".$tracepost, LOG_DEBUG, 0, '_paypal');
 
 
-llxHeaderPaypal($langs->trans("PaymentForm"));
+$head='';
+if (! empty($conf->global->PAYPAL_CSS_URL)) $head='<link rel="stylesheet" type="text/css" href="'.$conf->global->PAYPAL_CSS_URL.'?lang='.$langs->defaultlang.'">'."\n";
+
+
+llxHeader($head, $langs->trans("PaymentForm"));
 
 
 // Show message
@@ -281,9 +286,9 @@ else
 
 print "\n</div>\n";
 
-html_print_paypal_footer($mysoc,$langs);
+htmlPrintOnlinePaymentFooter($mysoc,$langs);
 
 
-llxFooterPaypal();
+llxFooter();
 
 $db->close();

From b5b97816c897e9875d5bdb7a926b3735484b8da8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 13 May 2017 14:06:14 +0200
Subject: [PATCH 330/505] FIX #6803

---
 htdocs/install/mysql/migration/5.0.0-6.0.0.sql | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index 9a3ab73d133..bf28e6a3db6 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -212,7 +212,9 @@ ALTER TABLE llx_default_values ADD UNIQUE INDEX uk_default_values(type, entity,
 ALTER TABLE llx_supplier_proposaldet ADD INDEX idx_supplier_proposaldet_fk_supplier_proposal (fk_supplier_proposal);
 ALTER TABLE llx_supplier_proposaldet ADD INDEX idx_supplier_proposaldet_fk_product (fk_product);
 
+UPDATE llx_supplier_proposaldet SET fk_unit = NULL where fk_unit not in (SELECT rowid from llx_c_units);
 ALTER TABLE llx_supplier_proposaldet ADD CONSTRAINT fk_supplier_proposaldet_fk_unit FOREIGN KEY (fk_unit) REFERENCES llx_c_units (rowid);
+
 ALTER TABLE llx_supplier_proposaldet ADD CONSTRAINT fk_supplier_proposaldet_fk_supplier_proposal FOREIGN KEY (fk_supplier_proposal) REFERENCES llx_supplier_proposal (rowid);
 
 -- NEW inventory module

From 71833f598776928ce6eb93ee9cb24a45b6730683 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 13 May 2017 15:19:35 +0200
Subject: [PATCH 331/505] Standardize code

---
 htdocs/externalsite/frametop.php          |   4 +
 htdocs/main.inc.php                       |  31 ++---
 htdocs/paybox/lib/paybox.lib.php          |   2 +-
 htdocs/paypal/admin/paypal.php            |   5 +-
 htdocs/paypal/lib/paypal.lib.php          |   6 +-
 htdocs/public/members/new.php             |   1 +
 htdocs/public/paybox/newpayment.php       |  27 ++--
 htdocs/public/paybox/paymentko.php        |   6 +-
 htdocs/public/paybox/paymentok.php        |  12 +-
 htdocs/public/payment/newpayment.php      | 143 +++++++++++++++++-----
 htdocs/public/payment/paymentko.php       |  21 ++--
 htdocs/public/payment/paymentok.php       |  40 ++++--
 htdocs/public/paypal/newpayment.php       |  19 ++-
 htdocs/public/paypal/paymentko.php        |  12 +-
 htdocs/public/paypal/paymentok.php        |  12 +-
 htdocs/societe/checkvat/checkVatPopup.php |   8 +-
 htdocs/theme/eldy/style.css.php           |   3 +
 htdocs/websites/frametop.php              |   5 +-
 htdocs/websites/index.php                 |   4 +-
 19 files changed, 251 insertions(+), 110 deletions(-)

diff --git a/htdocs/externalsite/frametop.php b/htdocs/externalsite/frametop.php
index f33c8ae61a2..3fb50ec6745 100644
--- a/htdocs/externalsite/frametop.php
+++ b/htdocs/externalsite/frametop.php
@@ -27,5 +27,9 @@ require ("../main.inc.php");
 $langs->load("externalsite");
 
 top_htmlhead("","");
+
+print '<body id="mainbody">' . "\n";
+
 top_menu("","","_top");
 
+print '</body>';
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 333eb25ad89..c6bf910a8af 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -950,20 +950,24 @@ if (! function_exists("llxHeader"))
      * @param 	array  	$arrayofjs			Array of complementary js files
      * @param 	array  	$arrayofcss			Array of complementary css files
      * @param	string	$morequerystring	Query string to add to the link "print" to get same parameters (use only if autodetect fails)
+     * @param   string  $morecssonbody      More CSS on body tag.
      * @return	void
      */
-	function llxHeader($head='', $title='', $help_url='', $target='', $disablejs=0, $disablehead=0, $arrayofjs='', $arrayofcss='', $morequerystring='')
+	function llxHeader($head='', $title='', $help_url='', $target='', $disablejs=0, $disablehead=0, $arrayofjs='', $arrayofcss='', $morequerystring='', $morecssonbody='')
 	{
 	    global $conf;
 
 	    // html header
 		top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);
 
+        print '<body id="mainbody"'.($morecssonbody?' class="'.$morecssonbody.'"':'').'>' . "\n";
+
 		// top menu and left menu area
 		if (empty($conf->dol_hide_topmenu))
 		{
 			top_menu($head, $title, $target, $disablejs, $disablehead, $arrayofjs, $arrayofcss, $morequerystring, $help_url);
 		}
+		
 		if (empty($conf->dol_hide_leftmenu))
 		{
 			left_menu('', $help_url, '', '', 1, $title, 1);
@@ -1219,19 +1223,6 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
                 print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/editinplace.js'.($ext?'?'.$ext:'').'"></script>'."\n";
                 print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jeditable/jquery.jeditable.ckeditor.js'.($ext?'?'.$ext:'').'"></script>'."\n";
             }
-            // jQuery File Upload
-            /*
-            if (! empty($conf->global->MAIN_USE_JQUERY_FILEUPLOAD) || (defined('REQUIRE_JQUERY_FILEUPLOAD') && constant('REQUIRE_JQUERY_FILEUPLOAD')))
-            {
-                print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/template/tmpl.min'.$ext.'"></script>'."\n";
-                print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/fileupload/js/jquery.iframe-transport'.$ext.'"></script>'."\n";
-                print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/fileupload/js/jquery.fileupload'.$ext.'"></script>'."\n";
-                print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/fileupload/js/jquery.fileupload-fp'.$ext.'"></script>'."\n";
-                print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/fileupload/js/jquery.fileupload-ui'.$ext.'"></script>'."\n";
-                print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/fileupload/js/jquery.fileupload-jui'.$ext.'"></script>'."\n";
-                print '<!-- The XDomainRequest Transport is included for cross-domain file deletion for IE8+ -->'."\n";
-                print '<!--[if gte IE 8]><script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/fileupload/js/cors/jquery.xdr-transport'.$ext.'"></script><![endif]-->'."\n";
-            }*/
             // jQuery DataTables
             /* Removed a old hidden problematic feature never used in Dolibarr. If an external module need datatable, the module must provide all lib it needs and manage version problems with other dolibarr components
             if (! empty($conf->global->MAIN_USE_JQUERY_DATATABLES) || (defined('REQUIRE_JQUERY_DATATABLES') && constant('REQUIRE_JQUERY_DATATABLES')))
@@ -1377,9 +1368,11 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
     $toprightmenu='';
 
     // For backward compatibility with old modules
-    if (empty($conf->headerdone)) top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);
-
-    print '<body id="mainbody">' . "\n";
+    if (empty($conf->headerdone)) 
+    {
+        top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);
+        print '<body id="mainbody">';
+    }
 
     /*
      * Top menu
@@ -1762,6 +1755,7 @@ function main_area($title='')
     print "\n";
 
     print '<!-- Begin div class="fiche" -->'."\n".'<div class="fiche">'."\n";
+    
     if (! empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED)) print info_admin($langs->trans("WarningYouAreInMaintenanceMode",$conf->global->MAIN_ONLY_LOGIN_ALLOWED));
 }
 
@@ -1899,7 +1893,8 @@ if (! function_exists("llxFooter"))
         }
 
         print "\n\n";
-        print '</div> <!-- End div class="fiche" -->'."\n";
+        
+        print '</div> <!-- End div class="fiche" -->'."\n"; // End div fiche
 
 		if (empty($conf->dol_hide_leftmenu)) print '</div> <!-- End div id-right -->'; // End div id-right
 
diff --git a/htdocs/paybox/lib/paybox.lib.php b/htdocs/paybox/lib/paybox.lib.php
index 09848ed905e..a4106488f53 100644
--- a/htdocs/paybox/lib/paybox.lib.php
+++ b/htdocs/paybox/lib/paybox.lib.php
@@ -33,7 +33,7 @@
  * @param   string	$EMAIL		EMail
  * @param   string	$urlok		Url to go back if payment is OK
  * @param   string	$urlko		Url to go back if payment is KO
- * @param   string	$TAG		Tag
+ * @param   string	$TAG		Full tag
  * @return  int              	1 if OK, -1 if ERROR
  */
 function print_paybox_redirect($PRICE,$CURRENCY,$EMAIL,$urlok,$urlko,$TAG)
diff --git a/htdocs/paypal/admin/paypal.php b/htdocs/paypal/admin/paypal.php
index 4942d15a9ce..ef0c40f2813 100644
--- a/htdocs/paypal/admin/paypal.php
+++ b/htdocs/paypal/admin/paypal.php
@@ -96,7 +96,6 @@ llxHeader('',$langs->trans("PaypalSetup"));
 
 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
 print load_fiche_titre($langs->trans("ModuleSetup").' PayPal',$linkback);
-print '<br>';
 
 $head=paypaladmin_prepare_head();
 
@@ -105,7 +104,7 @@ print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="action" value="setvalue">';
 
 
-dol_fiche_head($head, 'paypalaccount', '');
+dol_fiche_head($head, 'paypalaccount', '', -1);
 
 print $langs->trans("PaypalDesc")."<br>\n";
 
@@ -138,7 +137,7 @@ print '</td></tr>';
 print '<tr class="oddeven"><td class="fieldrequired">';
 print $langs->trans("PAYPAL_API_USER").'</td><td>';
 print '<input size="32" type="text" name="PAYPAL_API_USER" value="'.$conf->global->PAYPAL_API_USER.'">';
-print ' &nbsp; '.$langs->trans("Example").': paypal_api1.mywebsite.com';
+print ' &nbsp; '.$langs->trans("Example").': admin-facilitator_api1.example.com, paypal_api1.mywebsite.com';
 print '</td></tr>';
 
 
diff --git a/htdocs/paypal/lib/paypal.lib.php b/htdocs/paypal/lib/paypal.lib.php
index 9f08ffcb924..944afd34b1a 100644
--- a/htdocs/paypal/lib/paypal.lib.php
+++ b/htdocs/paypal/lib/paypal.lib.php
@@ -191,7 +191,7 @@ function getPaypalPaymentUrl($mode,$type,$ref='',$amount='9.99',$freetag='your_f
  * @param	string	$paymentType		Payment type
  * @param  	string	$returnURL			Url to use if payment is OK
  * @param   string	$cancelURL			Url to use if payment is KO
- * @param   string	$tag				Tag
+ * @param   string	$tag				Full tag
  * @return	void
  */
 function print_paypal_redirect($paymentAmount,$currencyCodeType,$paymentType,$returnURL,$cancelURL,$tag)
@@ -306,7 +306,7 @@ function print_paypal_redirect($paymentAmount,$currencyCodeType,$paymentType,$re
  * @param 	string 			$paymentType		Payment type
  * @param 	string 			$returnURL			Return Url
  * @param 	string 			$cancelURL			Cancel Url
- * @param 	string 			$tag				Tag
+ * @param 	string 			$tag				Full tag
  * @param 	string 			$solutionType		Type
  * @param 	string 			$landingPage		Landing page
  * @param	string			$shipToName			Ship to name
@@ -429,7 +429,7 @@ function getDetails($token)
  *	@param	string	$payerID			Payer ID
  *	@param	string	$ipaddress			IP Address
  *	@param	string	$FinalPaymentAmt	Amount
- *	@param	string	$tag				Tag
+ *	@param	string	$tag				Full tag
  *	@return	void
  */
 function confirmPayment($token, $paymentType, $currencyCodeType, $payerID, $ipaddress, $FinalPaymentAmt, $tag)
diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php
index c307512e257..4130b616a0e 100644
--- a/htdocs/public/members/new.php
+++ b/htdocs/public/members/new.php
@@ -91,6 +91,7 @@ $extrafields = new ExtraFields($db);
 function llxHeaderVierge($title, $head="", $disablejs=0, $disablehead=0, $arrayofjs='', $arrayofcss='')
 {
     global $user, $conf, $langs, $mysoc;
+    
     top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss); // Show html headers
     print '<body id="mainbody" class="publicnewmemberform" style="margin-top: 10px;">';
 
diff --git a/htdocs/public/paybox/newpayment.php b/htdocs/public/paybox/newpayment.php
index b4b978009b7..a52358dab24 100644
--- a/htdocs/public/paybox/newpayment.php
+++ b/htdocs/public/paybox/newpayment.php
@@ -36,6 +36,7 @@ if (is_numeric($entity)) define("DOLENTITY", $entity);
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/paybox/lib/paybox.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 
@@ -95,6 +96,7 @@ $ref=$REF=GETPOST('ref','alpha');
 $TAG=GETPOST("tag",'alpha');
 $FULLTAG=GETPOST("fulltag",'alpha');  // fulltag is tag with more informations
 $SECUREKEY=GETPOST("securekey");	        // Secure key
+$FULLTAG.=($FULLTAG?'.':'').'PM=paybox';
 
 if (! empty($SOURCE))
 {
@@ -126,19 +128,22 @@ $valid=true;
 /*
  * Actions
  */
+
 if (GETPOST("action") == 'dopayment')
 {
     $PRICE=price2num(GETPOST("newamount"),'MT');
     $email=GETPOST("email");
 
+    $origfulltag=GETPOST("fulltag",'alpha');
+    
 	$mesg='';
 	if (empty($PRICE) || ! is_numeric($PRICE)) $mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Amount"));
-	elseif (empty($email))          $mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("YourEMail"));
-	elseif (! isValidEMail($email)) $mesg=$langs->trans("ErrorBadEMail",$email);
-	elseif (empty($FULLTAG))        $mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("PaymentCode"));
-    elseif (dol_strlen($urlok) > 150) $mesg='Error urlok too long '.$urlok;
+	elseif (empty($email))            $mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("YourEMail"));
+	elseif (! isValidEMail($email))   $mesg=$langs->trans("ErrorBadEMail",$email);
+    elseif (! $origfulltag)           $mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("PaymentCode"));
+	elseif (dol_strlen($urlok) > 150) $mesg='Error urlok too long '.$urlok;
     elseif (dol_strlen($urlko) > 150) $mesg='Error urlko too long '.$urlko;
-
+    
 	if (empty($mesg))
 	{
 		dol_syslog("newpayment.php call paybox api and do redirect", LOG_DEBUG);
@@ -156,7 +161,13 @@ if (GETPOST("action") == 'dopayment')
  * View
  */
 
-llxHeaderPayBox($langs->trans("PaymentForm"));
+$head='';
+if (! empty($conf->global->PAYBOX_CSS_URL)) $head='<link rel="stylesheet" type="text/css" href="'.$conf->global->PAYBOX_CSS_URL.'?lang='.$langs->defaultlang.'">'."\n";
+
+$conf->dol_hide_topmenu=1;
+$conf->dol_hide_leftmenu=1;
+
+llxHeader($head, $langs->trans("PaymentForm"), '', '', 0, 0, '', '', '', 'onlinepaymentbody');
 
 
 // Common variables
@@ -782,9 +793,9 @@ print '</div>'."\n";
 print '<br>';
 
 
-html_print_paybox_footer($mysoc,$langs);
+htmlPrintOnlinePaymentFooter($mysoc,$langs);
 
 
-llxFooterPayBox();
+llxFooter('', 'public');
 
 $db->close();
diff --git a/htdocs/public/paybox/paymentko.php b/htdocs/public/paybox/paymentko.php
index 0b6b0955bb2..f5f42c8a529 100644
--- a/htdocs/public/paybox/paymentko.php
+++ b/htdocs/public/paybox/paymentko.php
@@ -97,8 +97,10 @@ if (! empty($conf->global->PAYBOX_PAYONLINE_SENDEMAIL))
 $head='';
 if (! empty($conf->global->PAYBOX_CSS_URL)) $head='<link rel="stylesheet" type="text/css" href="'.$conf->global->PAYBOX_CSS_URL.'?lang='.$langs->defaultlang.'">'."\n";
 
+$conf->dol_hide_topmenu=1;
+$conf->dol_hide_leftmenu=1;
 
-llxHeader($head, $langs->trans("PaymentForm"));
+llxHeader($head, $langs->trans("PaymentForm"), '', '', 0, 0, '', '', '', 'onlinepaymentbody');
 
 
 // Show message
@@ -115,6 +117,6 @@ print "\n</div>\n";
 htmlPrintOnlinePaymentFooter($mysoc,$langs);
 
 
-llxFooter();
+llxFooter('', 'public');
 
 $db->close();
diff --git a/htdocs/public/paybox/paymentok.php b/htdocs/public/paybox/paymentok.php
index 482f58ed909..92bd484cde5 100644
--- a/htdocs/public/paybox/paymentok.php
+++ b/htdocs/public/paybox/paymentok.php
@@ -55,8 +55,8 @@ if (empty($PAYBOXTOKEN)) $PAYBOXTOKEN=GETPOST('token');
 $PAYBOXPAYERID=GETPOST('PAYERID');
 if (empty($PAYBOXPAYERID)) $PAYBOXPAYERID=GETPOST('PayerID');
 */
-$PAYBOXFULLTAG=GETPOST('FULLTAG');
-if (empty($PAYBOXFULLTAG)) $PAYBOXFULLTAG=GETPOST('fulltag');
+$FULLTAG=GETPOST('FULLTAG');
+if (empty($FULLTAG)) $FULLTAG=GETPOST('fulltag');
 
 
 /*
@@ -81,8 +81,10 @@ dol_syslog("POST=".$tracepost, LOG_DEBUG, 0, '_paybox');
 $head='';
 if (! empty($conf->global->PAYBOX_CSS_URL)) $head='<link rel="stylesheet" type="text/css" href="'.$conf->global->PAYBOX_CSS_URL.'?lang='.$langs->defaultlang.'">'."\n";
 
+$conf->dol_hide_topmenu=1;
+$conf->dol_hide_leftmenu=1;
 
-llxHeader($head, $langs->trans("PaymentForm"));
+llxHeader($head, $langs->trans("PaymentForm"), '', '', 0, 0, '', '', '', 'onlinepaymentbody');
 
 
 // Show message
@@ -93,7 +95,7 @@ print '<div id="dolpaymentdiv" align="center">'."\n";
 /*
 $token              = $PAYBOXTOKEN;
 */
-$fulltag            = $PAYBOXFULLTAG;
+$fulltag            = $FULLTAG;
 /*$payerID            = $PAYBOXPAYERID;
 // Set by newpayment.php
 $paymentType        = $_SESSION['PaymentType'];
@@ -173,6 +175,6 @@ print "\n</div>\n";
 htmlPrintOnlinePaymentFooter($mysoc,$langs);
 
 
-llxFooter();
+llxFooter('', 'public');
 
 $db->close();
diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index 4c4b6863aaa..1ea8e7385ea 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -16,7 +16,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
- * For test: https://developer.paypal.com/
+ * For paypal test: https://developer.paypal.com/
+ * For paybox test: ???
  */
 
 /**
@@ -37,6 +38,7 @@ if (is_numeric($entity)) define("DOLENTITY", $entity);
 
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 
@@ -49,6 +51,9 @@ $langs->load("dict");
 $langs->load("bills");
 $langs->load("companies");
 $langs->load("errors");
+$langs->load("paybox");     // File with generic data
+
+$action=GETPOST('action','alpha');
 
 // Input are:
 // type ('invoice','order','contractline'),
@@ -62,7 +67,7 @@ $amount=price2num(GETPOST("amount"));
 if (! GETPOST("currency",'alpha')) $currency=$conf->currency;
 else $currency=GETPOST("currency",'alpha');
 
-if (! GETPOST("action"))
+if (! $action)
 {
     if (! GETPOST("amount") && ! GETPOST("source"))
     {
@@ -81,10 +86,25 @@ if (! GETPOST("action"))
     }
 }
 
+
+$paymentmethod='';
+$validpaymentmethod=array();
+
+// Detect $paymentmethod
+foreach($_POST as $key => $val)
+{
+    if (preg_match('/^dopayment_(.*)$/', $key, $reg))
+    {
+        $paymentmethod=$reg[1];
+        break;
+    }
+}
+
+
 // Define $urlwithroot
 //$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
 //$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
-$urlwithroot=DOL_MAIN_URL_ROOT;						// This is to use same domain name than current
+$urlwithroot=DOL_MAIN_URL_ROOT;						// This is to use same domain name than current. For Paypal payment, we can use internal URL like localhost.
 
 $urlok=$urlwithroot.'/public/payment/paymentok.php?';
 $urlko=$urlwithroot.'/public/payment/paymentko.php?';
@@ -95,6 +115,7 @@ $ref=$REF=GETPOST('ref','alpha');
 $TAG=GETPOST("tag",'alpha');
 $FULLTAG=GETPOST("fulltag",'alpha');		// fulltag is tag with more informations
 $SECUREKEY=GETPOST("securekey");	        // Secure key
+if ($paymentmethod) $FULLTAG.=($FULLTAG?'.':'').'PM='.$paymentmethod;
 
 if (! empty($SOURCE))
 {
@@ -129,9 +150,10 @@ if (! empty($entity))
 $urlok=preg_replace('/&$/','',$urlok);  // Remove last &
 $urlko=preg_replace('/&$/','',$urlko);  // Remove last &
 
-$paymentmethod=array();
 
-// Check parameters
+
+// Find valid payment methods
+
 if (! empty($conf->paypal->enabled))
 {
 	$langs->load("paypal");
@@ -158,7 +180,7 @@ if (! empty($conf->paypal->enabled))
 	    dol_print_error('',"Paypal setup param PAYPAL_API_SIGNATURE not defined");
 	    return -1;
 	}
-	
+
 	// Check security token
 	$valid=true;
 	if (! empty($conf->global->PAYPAL_SECURITY_TOKEN))
@@ -173,28 +195,57 @@ if (! empty($conf->paypal->enabled))
 	        $token = $conf->global->PAYPAL_SECURITY_TOKEN;
 	    }
 		if ($SECUREKEY != $token) $valid=false;
-	
+		
 		if (! $valid)
 		{
 	    	print '<div class="error">Bad value for key.</div>';
 		    //print 'SECUREKEY='.$SECUREKEY.' token='.$token.' valid='.$valid;
 	    	exit;
 		}
-		else
-		{
-			$paymentmethod[]='paypal';
-		}
 	}
+	
+    $validpaymentmethod['paypal']='valid';
 }
+
 if (! empty($conf->paybox->enabled))
 {
 	$langs->load("paybox");
 	
+	// TODO
+	
+    $validpaymentmethod['paybox']='valid';
 }
+
 // TODO Add check of other payment mode
 
 
-if (empty($paymentmethod)) accessforbidden('', 0, 0, 1);
+// Check security token
+$valid=true;
+if (! empty($conf->global->PAYMENT_SECURITY_TOKEN))
+{
+    if (! empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
+    {
+        if ($SOURCE && $REF) $token = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . $SOURCE . $REF, 2);    // Use the source in the hash to avoid duplicates if the references are identical
+        else $token = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
+    }
+    else
+    {
+        $token = $conf->global->PAYMENT_SECURITY_TOKEN;
+    }
+    if ($SECUREKEY != $token) $valid=false;
+
+    if (! $valid)
+    {
+        print '<div class="error">Bad value for key.</div>';
+        //print 'SECUREKEY='.$SECUREKEY.' token='.$token.' valid='.$valid;
+        exit;
+    }
+}
+
+
+
+
+if (empty($validpaymentmethod)) accessforbidden('', 0, 0, 1);
 
 
 
@@ -202,13 +253,15 @@ if (empty($paymentmethod)) accessforbidden('', 0, 0, 1);
  * Actions
  */
 
-if (GETPOST("action") == 'dopayment')
+
+if ($action == 'dopayment')
 {
-	if (GETPOST('paymentmethod') == 'paypal')
+	if ($paymentmethod == 'paypal')
 	{ 
 		$PAYPAL_API_PRICE=price2num(GETPOST("newamount"),'MT');
 	    $PAYPAL_PAYMENT_TYPE='Sale';
 	
+	    $origfulltag=GETPOST("fulltag",'alpha');
 	    $shipToName=GETPOST("shipToName");
 	    $shipToStreet=GETPOST("shipToStreet");
 	    $shipToCity=GETPOST("shipToCity");
@@ -224,7 +277,7 @@ if (GETPOST("action") == 'dopayment')
 		if (empty($PAYPAL_API_PRICE) || ! is_numeric($PAYPAL_API_PRICE))   $mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Amount"));
 		//elseif (empty($EMAIL))          $mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("YourEMail"));
 		//elseif (! isValidEMail($EMAIL)) $mesg=$langs->trans("ErrorBadEMail",$EMAIL);
-		elseif (empty($FULLTAG))        $mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("PaymentCode"));
+		elseif (! $origfulltag)        $mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("PaymentCode"));
 	
 	    //var_dump($_POST);
 		if (empty($mesg))
@@ -275,7 +328,14 @@ if (GETPOST("action") == 'dopayment')
  * View
  */
 
-llxHeaderPaypal($langs->trans("PaymentForm"));
+$head='';
+if (! empty($conf->global->PAYMENT_CSS_URL)) $head='<link rel="stylesheet" type="text/css" href="'.$conf->global->PAYMENT_CSS_URL.'?lang='.$langs->defaultlang.'">'."\n";
+
+$conf->dol_hide_topmenu=1;
+$conf->dol_hide_leftmenu=1;
+
+llxHeader($head, $langs->trans("PaymentForm"), '', '', 0, 0, '', '', '', 'onlinepaymentbody');
+
 
 if (! empty($conf->paypal->enabled))
 {
@@ -302,12 +362,18 @@ print '<input type="hidden" name="securekey" value="'.$SECUREKEY.'">'."\n";
 print '<input type="hidden" name="entity" value="'.$entity.'" />';
 print "\n";
 print '<!-- Form to send a payment -->'."\n";
+// Additionnal information for each payment system
 if (! empty($conf->paypal->enabled))
 {
 	print '<!-- PAYPAL_API_SANDBOX = '.$conf->global->PAYPAL_API_SANDBOX.' -->'."\n";
 	print '<!-- PAYPAL_API_INTEGRAL_OR_PAYPALONLY = '.$conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY.' -->'."\n";
 	print '<!-- creditor = '.$creditor.' -->'."\n";
 }
+if (! empty($conf->paybox->enabled))
+{
+
+}
+// TODO Add others
 print '<!-- urlok = '.$urlok.' -->'."\n";
 print '<!-- urlko = '.$urlko.' -->'."\n";
 print "\n";
@@ -370,7 +436,7 @@ $error=0;
 $var=false;
 
 // Free payment
-if (! GETPOST("source") && $valid)
+if (! GETPOST("source"))
 {
 	$found=true;
 	$tag=GETPOST("tag");
@@ -417,7 +483,7 @@ if (! GETPOST("source") && $valid)
 
 
 // Payment on customer order
-if (GETPOST("source") == 'order' && $valid)
+if (GETPOST("source") == 'order')
 {
 	$found=true;
 	$langs->load("orders");
@@ -524,7 +590,7 @@ if (GETPOST("source") == 'order' && $valid)
 
 
 // Payment on customer invoice
-if (GETPOST("source") == 'invoice' && $valid)
+if (GETPOST("source") == 'invoice')
 {
 	$found=true;
 	$langs->load("bills");
@@ -630,7 +696,7 @@ if (GETPOST("source") == 'invoice' && $valid)
 }
 
 // Payment on contract line
-if (GETPOST("source") == 'contractline' && $valid)
+if (GETPOST("source") == 'contractline')
 {
 	$found=true;
 	$langs->load("contracts");
@@ -825,7 +891,7 @@ if (GETPOST("source") == 'contractline' && $valid)
 }
 
 // Payment on member subscription
-if (GETPOST("source") == 'membersubscription' && $valid)
+if (GETPOST("source") == 'membersubscription')
 {
 	$found=true;
 	$langs->load("members");
@@ -971,16 +1037,29 @@ print "\n";
 
 if ($found && ! $error)	// We are in a management option and no error
 {
-	if (empty($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY)) $conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY='integral';
+    // Buttons for all payments registration methods
+    
+    if (! empty($conf->paypal->enabled))
+    {
+    	if (empty($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY)) $conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY='integral';
+    
+    	if ($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY == 'integral')
+    	{
+    		print '<br><input class="button" type="submit" name="dopayment_paypal" value="'.$langs->trans("PaypalOrCBDoPayment").'">';
+    	}
+    	if ($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY == 'paypalonly')
+    	{
+    		print '<br><input class="button" type="submit" name="dopayment_paypal" value="'.$langs->trans("PaypalDoPayment").'">';
+    	}
+    }
 
-	if ($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY == 'integral')
-	{
-		print '<br><input class="button" type="submit" name="dopayment" value="'.$langs->trans("PaypalOrCBDoPayment").'">';
-	}
-	if ($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY == 'paypalonly')
-	{
-		print '<br><input class="button" type="submit" name="dopayment" value="'.$langs->trans("PaypalDoPayment").'">';
-	}
+    if (! empty($conf->paypal->enabled))
+    {
+    
+        
+    }
+    
+    // TODO Other methods
 }
 else
 {
@@ -995,8 +1074,8 @@ print '</div>'."\n";
 print '<br>';
 
 
-html_print_paypal_footer($mysoc,$langs);
+htmlPrintOnlinePaymentFooter($mysoc,$langs);
 
-llxFooterPaypal();
+llxFooter('', 'public');
 
 $db->close();
diff --git a/htdocs/public/payment/paymentko.php b/htdocs/public/payment/paymentko.php
index 5bd09f845da..ceface2a9c0 100644
--- a/htdocs/public/payment/paymentko.php
+++ b/htdocs/public/payment/paymentko.php
@@ -57,16 +57,16 @@ $PAYPALTOKEN=GETPOST('TOKEN');
 if (empty($PAYPALTOKEN)) $PAYPALTOKEN=GETPOST('token');
 $PAYPALPAYERID=GETPOST('PAYERID');
 if (empty($PAYPALPAYERID)) $PAYPALPAYERID=GETPOST('PayerID');
-$PAYPALFULLTAG=GETPOST('FULLTAG');
-if (empty($PAYPALFULLTAG)) $PAYPALFULLTAG=GETPOST('fulltag');
+$FULLTAG=GETPOST('FULLTAG');
+if (empty($FULLTAG)) $FULLTAG=GETPOST('fulltag');
 
-$paymentmethod=array();
-if (! empty($conf->paypal->enabled)) $paymentmethod['paypal']='paypal';
-if (! empty($conf->paybox->enabled)) $paymentmethod['paybox']='paybox';
+$validpaymentmethod=array();
+if (! empty($conf->paypal->enabled)) $validpaymentmethod['paypal']='paypal';
+if (! empty($conf->paybox->enabled)) $validpaymentmethod['paybox']='paybox';
 
 
 // Security check
-if (empty($paymentmethod)) accessforbidden('', 0, 0, 1);
+if (empty($validpaymentmethod)) accessforbidden('', 0, 0, 1);
 
 
 /*
@@ -94,7 +94,7 @@ if (! empty($conf->paypal->enabled))
 	{
 	    // Get on url call
 	    $token              = $PAYPALTOKEN;
-	    $fulltag            = $PAYPALFULLTAG;
+	    $fulltag            = $FULLTAG;
 	    $payerID            = $PAYPALPAYERID;
 	    // Set by newpayment.php
 	    $paymentType        = $_SESSION['PaymentType'];
@@ -128,7 +128,10 @@ if (! empty($conf->paypal->enabled))
 $head='';
 if (! empty($conf->global->PAYMENT_CSS_URL)) $head='<link rel="stylesheet" type="text/css" href="'.$conf->global->PAYMENT_CSS_URL.'?lang='.$langs->defaultlang.'">'."\n";
 
-llxHeader($head, $langs->trans("PaymentForm"));
+$conf->dol_hide_topmenu=1;
+$conf->dol_hide_leftmenu=1;
+
+llxHeader($head, $langs->trans("PaymentForm"), '', '', 0, 0, '', '', '', 'onlinepaymentbody');
 
 
 // Show ko message
@@ -143,6 +146,6 @@ print "\n</div>\n";
 htmlPrintOnlinePaymentFooter($mysoc,$langs);
 
 
-llxFooter();
+llxFooter('', 'public');
 
 $db->close();
diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index 221abec032f..c138cc29267 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -88,28 +88,46 @@ if (! empty($conf->paypal->enabled))
     if (empty($PAYPALTOKEN)) $PAYPALTOKEN=GETPOST('token');
     $PAYPALPAYERID=GETPOST('PAYERID');
     if (empty($PAYPALPAYERID)) $PAYPALPAYERID=GETPOST('PayerID');
-    $PAYPALFULLTAG=GETPOST('FULLTAG');
-    if (empty($PAYPALFULLTAG)) $PAYPALFULLTAG=GETPOST('fulltag');
+    $FULLTAG=GETPOST('FULLTAG');
+    if (empty($FULLTAG)) $FULLTAG=GETPOST('fulltag');
 }
 
 $source=GETPOST('source');
 $ref=GETPOST('ref');
 
-$paymentmethod=array();
-if (! empty($conf->paypal->enabled)) $paymentmethod['paypal']='paypal';
-if (! empty($conf->paybox->enabled)) $paymentmethod['paybox']='paybox';
 
+// Detect $paymentmethod
+$paymentmethod='';
+if (preg_match('/PM=([^\.]+)/', $FULLTAG, $reg))
+{
+    $paymentmethod=$reg[1];
+}
+if (empty($paymentmethod))
+{
+    dol_print_error(null, 'The back url does not contains a parameter fulltag that should help us to find the payment method used');
+    exit;
+}
+else
+{
+    dol_syslog("paymentmethod=".$paymentmethod);
+}
+
+
+$validpaymentmethod=array();
+if (! empty($conf->paypal->enabled)) $validpaymentmethod['paypal']='paypal';
+if (! empty($conf->paybox->enabled)) $validpaymentmethod['paybox']='paybox';
 
 // Security check
-if (empty($paymentmethod)) accessforbidden('', 0, 0, 1);
+if (empty($validpaymentmethod)) accessforbidden('', 0, 0, 1);
 
 
+$ispaymentok = false;
 // If payment is ok
 $PAYMENTSTATUS=$TRANSACTIONID=$TAXAMT=$NOTE='';
 // If payment is ko
 $ErrorCode=$ErrorShortMsg=$ErrorLongMsg=$ErrorSeverityCode='';
 
-$ispaymentok = false;
+
 
 
 /*
@@ -131,8 +149,10 @@ dol_syslog("POST=".$tracepost, LOG_DEBUG, 0, '_payment');
 $head='';
 if (! empty($conf->global->PAYMENT_CSS_URL)) $head='<link rel="stylesheet" type="text/css" href="'.$conf->global->PAYMENT_CSS_URL.'?lang='.$langs->defaultlang.'">'."\n";
 
+$conf->dol_hide_topmenu=1;
+$conf->dol_hide_leftmenu=1;
 
-llxHeader($head, $langs->trans("PaymentForm"));
+llxHeader($head, $langs->trans("PaymentForm"), '', '', 0, 0, '', '', '', 'onlinepaymentbody');
 
 
 
@@ -147,7 +167,7 @@ if (! empty($conf->paypal->enabled))
 	{
 	    // Get on url call
 	    $token              = $PAYPALTOKEN;
-	    $fulltag            = $PAYPALFULLTAG;
+	    $fulltag            = $FULLTAG;
 	    $payerID            = $PAYPALPAYERID;
 	    // Set by newpayment.php
 	    $paymentType        = $_SESSION['PaymentType'];
@@ -334,6 +354,6 @@ print "\n</div>\n";
 htmlPrintOnlinePaymentFooter($mysoc,$langs);
 
 
-llxFooter();
+llxFooter('', 'public');
 
 $db->close();
diff --git a/htdocs/public/paypal/newpayment.php b/htdocs/public/paypal/newpayment.php
index 4acce4ac803..9698f42afa7 100644
--- a/htdocs/public/paypal/newpayment.php
+++ b/htdocs/public/paypal/newpayment.php
@@ -39,6 +39,7 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypal.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypalfunctions.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 
@@ -51,7 +52,7 @@ $langs->load("dict");
 $langs->load("bills");
 $langs->load("companies");
 $langs->load("errors");
-$langs->load("paybox");
+$langs->load("paybox");     // File with generic data
 $langs->load("paypal");
 
 // Input are:
@@ -99,6 +100,7 @@ $ref=$REF=GETPOST('ref','alpha');
 $TAG=GETPOST("tag",'alpha');
 $FULLTAG=GETPOST("fulltag",'alpha');		// fulltag is tag with more informations
 $SECUREKEY=GETPOST("securekey");	        // Secure key
+$FULLTAG.=($FULLTAG?'.':'').'PM=paypal';
 
 if (! empty($SOURCE))
 {
@@ -188,6 +190,7 @@ if (GETPOST("action") == 'dopayment')
 	$PAYPAL_API_PRICE=price2num(GETPOST("newamount"),'MT');
     $PAYPAL_PAYMENT_TYPE='Sale';
 
+	$origfulltag=GETPOST("fulltag",'alpha');
     $shipToName=GETPOST("shipToName");
     $shipToStreet=GETPOST("shipToStreet");
     $shipToCity=GETPOST("shipToCity");
@@ -203,7 +206,7 @@ if (GETPOST("action") == 'dopayment')
 	if (empty($PAYPAL_API_PRICE) || ! is_numeric($PAYPAL_API_PRICE))   $mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Amount"));
 	//elseif (empty($EMAIL))          $mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("YourEMail"));
 	//elseif (! isValidEMail($EMAIL)) $mesg=$langs->trans("ErrorBadEMail",$EMAIL);
-	elseif (empty($FULLTAG))        $mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("PaymentCode"));
+	elseif (! $origfulltag)        $mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("PaymentCode"));
 
     //var_dump($_POST);
 	if (empty($mesg))
@@ -254,7 +257,13 @@ if (GETPOST("action") == 'dopayment')
  * View
  */
 
-llxHeaderPaypal($langs->trans("PaymentForm"));
+$head='';
+if (! empty($conf->global->PAYPAL_CSS_URL)) $head='<link rel="stylesheet" type="text/css" href="'.$conf->global->PAYPAL_CSS_URL.'?lang='.$langs->defaultlang.'">'."\n";
+
+$conf->dol_hide_topmenu=1;
+$conf->dol_hide_leftmenu=1;
+
+llxHeader($head, $langs->trans("PaymentForm"), '', '', 0, 0, '', '', '', 'onlinepaymentbody');
 
 if (! empty($PAYPAL_API_SANDBOX))
 {
@@ -968,8 +977,8 @@ print '</div>'."\n";
 print '<br>';
 
 
-html_print_paypal_footer($mysoc,$langs);
+htmlPrintOnlinePaymentFooter($mysoc,$langs);
 
-llxFooterPaypal();
+llxFooter('', 'public');
 
 $db->close();
diff --git a/htdocs/public/paypal/paymentko.php b/htdocs/public/paypal/paymentko.php
index 7436693a1c1..a3ff8b5b7a3 100644
--- a/htdocs/public/paypal/paymentko.php
+++ b/htdocs/public/paypal/paymentko.php
@@ -56,8 +56,8 @@ $PAYPALTOKEN=GETPOST('TOKEN');
 if (empty($PAYPALTOKEN)) $PAYPALTOKEN=GETPOST('token');
 $PAYPALPAYERID=GETPOST('PAYERID');
 if (empty($PAYPALPAYERID)) $PAYPALPAYERID=GETPOST('PayerID');
-$PAYPALFULLTAG=GETPOST('FULLTAG');
-if (empty($PAYPALFULLTAG)) $PAYPALFULLTAG=GETPOST('fulltag');
+$FULLTAG=GETPOST('FULLTAG');
+if (empty($FULLTAG)) $FULLTAG=GETPOST('fulltag');
 
 
 /*
@@ -83,7 +83,7 @@ if (! empty($conf->global->PAYPAL_PAYONLINE_SENDEMAIL))
 {
     // Get on url call
     $token              = $PAYPALTOKEN;
-    $fulltag            = $PAYPALFULLTAG;
+    $fulltag            = $FULLTAG;
     $payerID            = $PAYPALPAYERID;
     // Set by newpayment.php
     $paymentType        = $_SESSION['PaymentType'];
@@ -117,8 +117,10 @@ if (! empty($conf->global->PAYPAL_PAYONLINE_SENDEMAIL))
 $head='';
 if (! empty($conf->global->PAYPAL_CSS_URL)) $head='<link rel="stylesheet" type="text/css" href="'.$conf->global->PAYPAL_CSS_URL.'?lang='.$langs->defaultlang.'">'."\n";
 
+$conf->dol_hide_topmenu=1;
+$conf->dol_hide_leftmenu=1;
 
-llxHeader($head, $langs->trans("PaymentForm"));
+llxHeader($head, $langs->trans("PaymentForm"), '', '', 0, 0, '', '', '', 'onlinepaymentbody');
 
 
 // Show ko message
@@ -133,6 +135,6 @@ print "\n</div>\n";
 htmlPrintOnlinePaymentFooter($mysoc,$langs);
 
 
-llxFooter();
+llxFooter('', 'public');
 
 $db->close();
diff --git a/htdocs/public/paypal/paymentok.php b/htdocs/public/paypal/paymentok.php
index 984c282d161..c38612c8ac8 100644
--- a/htdocs/public/paypal/paymentok.php
+++ b/htdocs/public/paypal/paymentok.php
@@ -87,8 +87,8 @@ $PAYPALTOKEN=GETPOST('TOKEN');
 if (empty($PAYPALTOKEN)) $PAYPALTOKEN=GETPOST('token');
 $PAYPALPAYERID=GETPOST('PAYERID');
 if (empty($PAYPALPAYERID)) $PAYPALPAYERID=GETPOST('PayerID');
-$PAYPALFULLTAG=GETPOST('FULLTAG');
-if (empty($PAYPALFULLTAG)) $PAYPALFULLTAG=GETPOST('fulltag');
+$FULLTAG=GETPOST('FULLTAG');
+if (empty($FULLTAG)) $FULLTAG=GETPOST('fulltag');
 
 
 /*
@@ -111,8 +111,10 @@ dol_syslog("POST=".$tracepost, LOG_DEBUG, 0, '_paypal');
 $head='';
 if (! empty($conf->global->PAYPAL_CSS_URL)) $head='<link rel="stylesheet" type="text/css" href="'.$conf->global->PAYPAL_CSS_URL.'?lang='.$langs->defaultlang.'">'."\n";
 
+$conf->dol_hide_topmenu=1;
+$conf->dol_hide_leftmenu=1;
 
-llxHeader($head, $langs->trans("PaymentForm"));
+llxHeader($head, $langs->trans("PaymentForm"), '', '', 0, 0, '', '', '', 'onlinepaymentbody');
 
 
 // Show message
@@ -123,7 +125,7 @@ if ($PAYPALTOKEN)
 {
     // Get on url call
     $token              = $PAYPALTOKEN;
-    $fulltag            = $PAYPALFULLTAG;
+    $fulltag            = $FULLTAG;
     $payerID            = $PAYPALPAYERID;
     // Set by newpayment.php
     $paymentType        = $_SESSION['PaymentType'];
@@ -289,6 +291,6 @@ print "\n</div>\n";
 htmlPrintOnlinePaymentFooter($mysoc,$langs);
 
 
-llxFooter();
+llxFooter('', 'public');
 
 $db->close();
diff --git a/htdocs/societe/checkvat/checkVatPopup.php b/htdocs/societe/checkvat/checkVatPopup.php
index dd1cd7df740..f1e56d4a359 100644
--- a/htdocs/societe/checkvat/checkVatPopup.php
+++ b/htdocs/societe/checkvat/checkVatPopup.php
@@ -34,8 +34,12 @@ $WS_DOL_URL_WSDL='http://ec.europa.eu/taxation_customs/vies/checkVatService.wsdl
 $WS_METHOD ='checkVat';
 
 
-top_htmlhead("", $langs->trans("VATIntraCheckableOnEUSite"));
-print '<body style="margin: 10px">';
+
+$conf->dol_hide_topmenu=1;
+$conf->dol_hide_leftmenu=1;
+
+llxHeader('', $langs->trans("VATIntraCheckableOnEUSite"));
+
 print '<div>';
 print '<div>';
 
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index f1d17801072..39f17317076 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -988,6 +988,9 @@ div.fiche {
 	<?php if (! empty($conf->dol_hide_leftmenu) && ! empty($conf->dol_hide_topmenu)) print 'margin-top: 4px;'."\n"; ?>
 	<?php if (! empty($conf->dol_hide_leftmenu)) print 'margin-bottom: 12px;'."\n"; ?>
 }
+body.onlinepaymentbody div.fiche {	/* For online payment page */
+	margin: 40px !important;
+}
 div.fiche>table:first-child {
 	margin-bottom: 15px !important;
 }
diff --git a/htdocs/websites/frametop.php b/htdocs/websites/frametop.php
index 9001691b72c..7cebf239e28 100644
--- a/htdocs/websites/frametop.php
+++ b/htdocs/websites/frametop.php
@@ -28,11 +28,14 @@ require ("../main.inc.php");
 $langs->load("externalsite");
 
 top_htmlhead("","");
+
+print '<body id="mainbody">' . "\n";
+
 top_menu("","","_top");
 
+print '</body>';
 
 /*
 $website = new Website($db);
 $listofwebsites = $website->fetchAll();
 */
-print 'rrr';
diff --git a/htdocs/websites/index.php b/htdocs/websites/index.php
index b78a172e01f..e7dbb898145 100644
--- a/htdocs/websites/index.php
+++ b/htdocs/websites/index.php
@@ -38,7 +38,7 @@ define('NOSTYLECHECK',1);
  * @param 	int    	$disablehead		More content into html header
  * @param 	array  	$arrayofjs			Array of complementary js files
  * @param 	array  	$arrayofcss			Array of complementary css files
- * @param	string	$morequerystring	Query string to add to the link "print" to get same parameters (use only if autodetect fails)
+ * @param	string	$morequerystring	Query string to add to the link "print" to get same parameters (set this only if autodetect fails)
  * @return	void
  */
 function llxHeader($head='', $title='', $help_url='', $target='', $disablejs=0, $disablehead=0, $arrayofjs='', $arrayofcss='', $morequerystring='')
@@ -48,6 +48,8 @@ function llxHeader($head='', $title='', $help_url='', $target='', $disablejs=0,
     // html header
     top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);
 
+    print '<body id="mainbody">';
+    
     // top menu and left menu area
     if (empty($conf->dol_hide_topmenu))
     {

From 1e825e9f1e657d153fe8919715f72056f02c08c2 Mon Sep 17 00:00:00 2001
From: philippe grand <philippe.grand@atoo-net.com>
Date: Sat, 13 May 2017 17:25:35 +0200
Subject: [PATCH 332/505] Update code using new css class

---
 htdocs/don/admin/donation.php | 16 ++++------------
 htdocs/don/card.php           |  5 +----
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/htdocs/don/admin/donation.php b/htdocs/don/admin/donation.php
index 98000ad6e98..2888b911700 100644
--- a/htdocs/don/admin/donation.php
+++ b/htdocs/don/admin/donation.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2005-2010  Laurent Destailleur  	<eldy@users.sourceforge.net>
  * Copyright (C) 2012-2015	Juanjo Menent			<jmenent@2byte.es>
- * Copyright (C) 2013-2016  Philippe Grand			<philippe.grand@atoo-net.com>
+ * Copyright (C) 2013-2017  Philippe Grand			<philippe.grand@atoo-net.com>
  * Copyright (C) 2015       Alexandre Spangaro		<aspangaro.dolibarr@gmail.com>
  * Copyright (C) 2015  		Benoit Bruchard			<benoitb21@gmail.com>
  *
@@ -250,14 +250,12 @@ clearstatcache();
 
 $handle=opendir($dir);
 
-$var=True;
 if (is_resource($handle))
 {
 	while (($file = readdir($handle))!==false)
 	{
 		if (preg_match('/\.modules\.php$/i',$file))
 		{
-			$var = !$var;
 			$name = substr($file, 0, dol_strlen($file) -12);
 			$classname = substr($file, 0, dol_strlen($file) -12);
 
@@ -353,13 +351,11 @@ print '<td>'.$langs->trans("Parameters").'</td>';
 print '<td width="60" align="center">'.$langs->trans("Value")."</td>\n";
 print '<td></td>';
 print "</tr>\n";
-$var=true;
 
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'" />';
 print '<input type="hidden" name="action" value="set_DONATION_ACCOUNTINGACCOUNT" />';
 
-$var=! $var;
 print '<tr class="oddeven">';
 
 print '<td>';
@@ -383,7 +379,6 @@ print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'" />';
 print '<input type="hidden" name="action" value="set_DONATION_MESSAGE" />';
 
-$var=! $var;
 print '<tr class="oddeven"><td colspan="2">';
 print $langs->trans("FreeTextOnDonations").' '.img_info($langs->trans("AddCRIfTooLong")).'<br>';
 print '<textarea name="DONATION_MESSAGE" class="flat" cols="80">'.$conf->global->DONATION_MESSAGE.'</textarea>';
@@ -406,9 +401,8 @@ if (preg_match('/fr/i',$conf->global->MAIN_INFO_SOCIETE_COUNTRY))
 	print '<tr class="liste_titre">';
 	print '<td colspan="3">' . $langs->trans('Parameters') . '</td>';
 	print "</tr>\n";
-
 	
-	print "<tr " . $bc[$var] . ">";
+	print '<tr class="oddeven">';
 	print '<td width="80%">' . $langs->trans("DONATION_ART200") . '</td>';
 	if (! empty($conf->global->DONATION_ART200)) {
 		print '<td align="center" colspan="2"><a href="' . $_SERVER['PHP_SELF'] . '?action=setart200&value=0">';
@@ -420,9 +414,8 @@ if (preg_match('/fr/i',$conf->global->MAIN_INFO_SOCIETE_COUNTRY))
 		print '</a></td>';
 	}
 	print '</tr>';
-
 	
-	print "<tr " . $bc[$var] . ">";
+	print '<tr class="oddeven">';
 	print '<td width="80%">' . $langs->trans("DONATION_ART238") . '</td>';
 	if (! empty($conf->global->DONATION_ART238)) {
 		print '<td align="center" colspan="2"><a href="' . $_SERVER['PHP_SELF'] . '?action=setart238&value=0">';
@@ -434,9 +427,8 @@ if (preg_match('/fr/i',$conf->global->MAIN_INFO_SOCIETE_COUNTRY))
 		print '</a></td>';
 	}
 	print '</tr>';
-
 	
-	print "<tr " . $bc[$var] . ">";
+	print '<tr class="oddeven">';
 	print '<td width="80%">' . $langs->trans("DONATION_ART885") . '</td>';
 	if (! empty($conf->global->DONATION_ART885)) {
 		print '<td align="center" colspan="2"><a href="' . $_SERVER['PHP_SELF'] . '?action=setart885&value=0">';
diff --git a/htdocs/don/card.php b/htdocs/don/card.php
index f6584628d25..882b80ec339 100644
--- a/htdocs/don/card.php
+++ b/htdocs/don/card.php
@@ -699,12 +699,11 @@ if (! empty($id) && $action != 'edit')
    		print '<td align="right">'.$langs->trans("Amount").'</td>';
    		print '</tr>';
 
-		$var=True;
 		while ($i < $num)
 		{
 			$objp = $db->fetch_object($resql);
 			
-			print "<tr ".$bc[$var]."><td>";
+			print '<tr class="oddeven"><td>';
 			print '<a href="'.DOL_URL_ROOT.'/don/payment/card.php?id='.$objp->rowid.'">'.img_object($langs->trans("Payment"),"payment").' '.$objp->rowid.'</a></td>';
 			print '<td>'.dol_print_date($db->jdate($objp->dp),'day')."</td>\n";
 		    $labeltype=$langs->trans("PaymentType".$objp->type_code)!=("PaymentType".$objp->type_code)?$langs->trans("PaymentType".$objp->type_code):$objp->paiement_type;
@@ -809,8 +808,6 @@ if (! empty($id) && $action != 'edit')
 	$genallowed	=	($object->statut == 2 && ($object->paid == 0 || $user->admin) && $user->rights->don->creer);
 	$delallowed	=	$user->rights->don->supprimer;
 
-	$var=true;
-
 	print $formfile->showdocuments('donation',$filename,$filedir,$urlsource,$genallowed,$delallowed,$object->modelpdf);
 
 	print '</div><div class="fichehalfright"><div class="ficheaddleft">';

From 70b73c73f7d3004dae99686b0b7d0213ae338128 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 13 May 2017 18:34:57 +0200
Subject: [PATCH 333/505] Fix coding style

---
 htdocs/cashdesk/validation_verif.php | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/htdocs/cashdesk/validation_verif.php b/htdocs/cashdesk/validation_verif.php
index 3328fa52886..0722b3fb92e 100644
--- a/htdocs/cashdesk/validation_verif.php
+++ b/htdocs/cashdesk/validation_verif.php
@@ -39,15 +39,11 @@ $bankaccountid=GETPOST('cashdeskbank');
 
 switch ($action)
 {
-
 	default:
-
-		$redirection = DOL_URL_ROOT.'/cashdesk/affIndex.php?menutpl=validation';
+	    $redirection = DOL_URL_ROOT.'/cashdesk/affIndex.php?menutpl=validation';
 		break;
 
-
 	case 'valide_achat':
-        
 	    $thirdpartyid = $_SESSION['CASHDESK_ID_THIRDPARTY'];
 	    
 		$company=new Societe($db);
@@ -115,13 +111,11 @@ switch ($action)
 
 
 	case 'retour':
-
 		$redirection = 'affIndex.php?menutpl=facturation';
 		break;
 
 
 	case 'valide_facture':
-
 		$now=dol_now();
 
 		// Recuperation de la date et de l'heure
@@ -363,3 +357,4 @@ switch ($action)
 $_SESSION['serObjFacturation'] = serialize($obj_facturation);
 
 header('Location: '.$redirection);
+exit;

From 553f5b990c910bc181af2d4e44fdbaf7e31b12c9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 13 May 2017 18:50:55 +0200
Subject: [PATCH 334/505] Fix scrutinizer errors

---
 htdocs/accountancy/admin/categories_list.php |  6 +++---
 htdocs/admin/dict.php                        | 13 +++++++------
 htdocs/comm/mailing/class/mailing.class.php  |  2 +-
 htdocs/commande/class/commande.class.php     |  5 -----
 4 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/htdocs/accountancy/admin/categories_list.php b/htdocs/accountancy/admin/categories_list.php
index 0580a9688ed..14475119461 100644
--- a/htdocs/accountancy/admin/categories_list.php
+++ b/htdocs/accountancy/admin/categories_list.php
@@ -669,7 +669,7 @@ if ($id)
 
         if (empty($reshook))
         {
-       		fieldList($fieldlist,$obj,$tabname[$id],'add');
+       		fieldListAccountingCategories($fieldlist,$obj,$tabname[$id],'add');
         }
 
         print '<td colspan="4" align="right">';
@@ -858,7 +858,7 @@ if ($id)
                     $error=$hookmanager->error; $errors=$hookmanager->errors;
 
                     // Show fields
-                    if (empty($reshook)) fieldList($fieldlist,$obj,$tabname[$id],'edit');
+                    if (empty($reshook)) fieldListAccountingCategories($fieldlist,$obj,$tabname[$id],'edit');
 
                     print '<td></td>';
                     print '<td></td>';
@@ -1147,7 +1147,7 @@ $db->close();
  *  @param		string	$context		'add'=Output field for the "add form", 'edit'=Output field for the "edit form", 'hide'=Output field for the "add form" but we dont want it to be rendered
  *	@return		void
  */
-function fieldList($fieldlist, $obj='', $tabname='', $context='')
+function fieldListAccountingCategories($fieldlist, $obj='', $tabname='', $context='')
 {
 	global $conf,$langs,$db;
 	global $form, $mysoc;
diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index c2730e6c034..28e99d02606 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -1753,15 +1753,16 @@ function fieldList($fieldlist, $obj='', $tabname='', $context='')
 		    print '<td>';
 		    $transfound=0;
 	        // Special case for labels
-	        if ($tabname == MAIN_DB_PREFIX.'c_payment_term') {
+	        if ($tabname == MAIN_DB_PREFIX.'c_payment_term') 
+	        {
 	            $langs->load("bills");
 	            $transkey="PaymentCondition".strtoupper($obj->code);
+    	        if ($langs->trans($transkey) != $transkey)
+                {
+                    $transfound=1;
+                    print $form->textwithpicto($langs->trans($transkey), $langs->trans("GoIntoTranslationMenuToChangeThis"));
+                }
 	        }
-	        if ($langs->trans($transkey) != $transkey)
-            {
-                $transfound=1;
-                print $form->textwithpicto($langs->trans($transkey), $langs->trans("GoIntoTranslationMenuToChangeThis"));
-            }
 		    if (! $transfound)
 		    {
 		        print '<textarea cols="30" rows="'.ROWS_2.'" class="flat" name="'.$fieldlist[$field].'">'.(! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:'').'</textarea>';
diff --git a/htdocs/comm/mailing/class/mailing.class.php b/htdocs/comm/mailing/class/mailing.class.php
index 93c47f8aa51..72c2b6d4690 100644
--- a/htdocs/comm/mailing/class/mailing.class.php
+++ b/htdocs/comm/mailing/class/mailing.class.php
@@ -585,7 +585,7 @@ class Mailing extends CommonObject
 	 *  @param	strin	$desc			Desc error
 	 *  @return string        			Label
 	 */
-	static public function libStatutDest($statut,$mode=0,$desc='')
+	public static function libStatutDest($statut,$mode=0,$desc='')
 	{
 		global $langs;
 		$langs->load('mails');
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 4c8870c5cb0..a12a563e58c 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -2875,11 +2875,6 @@ class Commande extends CommonOrder
                     $this->error=$langs->trans('ErrorStockIsNotEnoughToAddProductOnOrder', $product->ref);
                     dol_syslog(get_class($this)."::addline error=Product ".$product->ref.": ".$this->error, LOG_ERR);
                     $this->db->rollback();
-                    unset($_POST['productid']);
-                    unset($_POST['tva_tx']);
-                    unset($_POST['price_ht']);
-                    unset($_POST['qty']);
-                    unset($_POST['buying_price']);
                     return self::STOCK_NOT_ENOUGH_FOR_ORDER;
                 }
             }

From 4343f93c00b90c294c21f714a0e581ccf6247868 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 13 May 2017 19:36:28 +0200
Subject: [PATCH 335/505] Remove a lot of useless code

---
 htdocs/accountancy/admin/categories_list.php | 291 ++++---------------
 1 file changed, 58 insertions(+), 233 deletions(-)

diff --git a/htdocs/accountancy/admin/categories_list.php b/htdocs/accountancy/admin/categories_list.php
index 14475119461..7b1eb44545a 100644
--- a/htdocs/accountancy/admin/categories_list.php
+++ b/htdocs/accountancy/admin/categories_list.php
@@ -168,9 +168,6 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
     {
         if ($value == 'country_id' && in_array($tablib[$id],array('DictionaryVAT','DictionaryRegion','DictionaryCompanyType','DictionaryHolidayTypes','DictionaryRevenueStamp','DictionaryAccountancysystem','DictionaryAccountancyCategory'))) continue;		// For some pages, country is not mandatory
     	if ($value == 'country' && in_array($tablib[$id],array('DictionaryCanton','DictionaryCompanyType','DictionaryRevenueStamp'))) continue;		// For some pages, country is not mandatory
-        if ($value == 'localtax1' && empty($_POST['localtax1_type'])) continue;
-        if ($value == 'localtax2' && empty($_POST['localtax2_type'])) continue;
-        if ($value == 'color' && empty($_POST['color'])) continue;
 		if ($value == 'formula' && empty($_POST['formula'])) continue;
         if ((! isset($_POST[$value]) || $_POST[$value]=='')
         	&& (! in_array($listfield[$f], array('decalage','module','accountancy_code','accountancy_code_sell','accountancy_code_buy'))  // Fields that are not mandatory
@@ -183,17 +180,12 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
             // We take translate key of field
             if ($fieldnamekey == 'libelle' || ($fieldnamekey == 'label'))  $fieldnamekey='Label';
             if ($fieldnamekey == 'libelle_facture') $fieldnamekey = 'LabelOnDocuments';
-            if ($fieldnamekey == 'nbjour')   $fieldnamekey='NbOfDays';
-            if ($fieldnamekey == 'decalage') $fieldnamekey='Offset';
             if ($fieldnamekey == 'module')   $fieldnamekey='Module';
             if ($fieldnamekey == 'code') $fieldnamekey = 'Code';
             if ($fieldnamekey == 'note') $fieldnamekey = 'Note';
             if ($fieldnamekey == 'taux') $fieldnamekey = 'Rate';
             if ($fieldnamekey == 'type') $fieldnamekey = 'Type';
             if ($fieldnamekey == 'position') $fieldnamekey = 'Position';
-            if ($fieldnamekey == 'unicode') $fieldnamekey = 'Unicode';
-            if ($fieldnamekey == 'deductible') $fieldnamekey = 'Deductible';
-            if ($fieldnamekey == 'sortorder') $fieldnamekey = 'SortOrder';
 			if ($fieldnamekey == 'category_type') $fieldnamekey = 'Calculated';
 
             setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->transnoentities($fieldnamekey)), null, 'errors');
@@ -217,7 +209,7 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
 	    	$msg .= $langs->transnoentities('ErrorFieldFormat', $langs->transnoentities('Code')).'<br />';
 	    }*/
     }
-    if (isset($_POST["country"]) && ($_POST["country"]=='0') && ($id != 2))
+    if (isset($_POST["country"]) && ($_POST["country"]=='0'))
     {
     	if (in_array($tablib[$id],array('DictionaryCompanyType','DictionaryHolidayTypes')))	// Field country is no mandatory for such dictionaries
     	{
@@ -229,15 +221,8 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
         	setEventMessages($langs->transnoentities("ErrorFieldRequired",$langs->transnoentities("Country")), null, 'errors');
     	}
     }
-    if ($id == 3 && ! is_numeric($_POST["code"]))
-    {
-       	$ok=0;
-       	setEventMessages($langs->transnoentities("ErrorFieldMustBeANumeric",$langs->transnoentities("Code")), null, 'errors');
-    }
 
 	// Clean some parameters
-    if ((! empty($_POST["localtax1_type"]) || ($_POST['localtax1_type'] == '0')) && empty($_POST["localtax1"])) $_POST["localtax1"]='0';	// If empty, we force to 0
-    if ((! empty($_POST["localtax2_type"]) || ($_POST['localtax2_type'] == '0')) && empty($_POST["localtax2"])) $_POST["localtax2"]='0';	// If empty, we force to 0
 	if ($_POST["accountancy_code"] <= 0) $_POST["accountancy_code"]='';	// If empty, we force to null
 	if ($_POST["accountancy_code_sell"] <= 0) $_POST["accountancy_code_sell"]='';	// If empty, we force to null
 	if ($_POST["accountancy_code_buy"] <= 0) $_POST["accountancy_code_buy"]='';	// If empty, we force to null
@@ -474,26 +459,9 @@ if ($id)
     $linkback='<a href="'.$_SERVER['PHP_SELF'].'">'.$langs->trans("BackToDictionaryList").'</a>';
 }
 $titlepicto='title_setup';
-if ($id == 10 && GETPOST('from') == 'accountancy')
-{
-    $titre=$langs->trans("MenuVatAccounts");
-    $titlepicto='title_accountancy';
-}
-if ($id == 7 && GETPOST('from') == 'accountancy')
-{
-    $titre=$langs->trans("MenuTaxAccounts");
-    $titlepicto='title_accountancy';
-}
 
 print load_fiche_titre($titre,$linkback,$titlepicto);
 
-if (empty($id))
-{
-    print $langs->trans("DictionaryDesc");
-    print " ".$langs->trans("OnlyActiveElementsAreShown")."<br>\n";
-}
-print "<br>\n";
-
 
 // Confirmation de la suppression de la ligne
 if ($action == 'delete')
@@ -563,19 +531,6 @@ if ($id)
             $valuetoshow=ucfirst($fieldlist[$field]);   // Par defaut
             $valuetoshow=$langs->trans($valuetoshow);   // try to translate
             $align="left";
-            if ($fieldlist[$field]=='source')          { $valuetoshow=$langs->trans("Contact"); }
-            if ($fieldlist[$field]=='price')           { $valuetoshow=$langs->trans("PriceUHT"); }
-            if ($fieldlist[$field]=='taux')            {
-				if ($tabname[$id] != MAIN_DB_PREFIX."c_revenuestamp") $valuetoshow=$langs->trans("Rate");
-				else $valuetoshow=$langs->trans("Amount");
-				$align='center';
-            }
-            if ($fieldlist[$field]=='localtax1_type')  { $valuetoshow=$langs->trans("UseLocalTax")." 2"; $align="center"; $sortable=0; }
-            if ($fieldlist[$field]=='localtax1')       { $valuetoshow=$langs->trans("Rate")." 2"; $align="center"; }
-            if ($fieldlist[$field]=='localtax2_type')  { $valuetoshow=$langs->trans("UseLocalTax")." 3"; $align="center"; $sortable=0; }
-            if ($fieldlist[$field]=='localtax2')       { $valuetoshow=$langs->trans("Rate")." 3"; $align="center"; }
-            if ($fieldlist[$field]=='organization')    { $valuetoshow=$langs->trans("Organization"); }
-            if ($fieldlist[$field]=='lang')            { $valuetoshow=$langs->trans("Language"); }
             if ($fieldlist[$field]=='type')            {
 				if ($tabname[$id] == MAIN_DB_PREFIX."c_paiement") $valuetoshow=$form->textwithtooltip($langs->trans("Type"),$langs->trans("TypePaymentDesc"),2,1,img_help(1,''));
 				else $valuetoshow=$langs->trans("Type");
@@ -584,49 +539,20 @@ if ($id)
             if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label')
             {
             	$valuetoshow=$langs->trans("Label");
-            	if ($id != 25) $valuetoshow.="*";
             }
             if ($fieldlist[$field]=='libelle_facture') { $valuetoshow=$langs->trans("LabelOnDocuments")."*"; }
             if ($fieldlist[$field]=='country')         {
                 if (in_array('region_id',$fieldlist)) { print '<td>&nbsp;</td>'; continue; }		// For region page, we do not show the country input
                 $valuetoshow=$langs->trans("Country");
             }
-            if ($fieldlist[$field]=='recuperableonly') { $valuetoshow=$langs->trans("NPR"); $align="center"; }
-            if ($fieldlist[$field]=='nbjour')          { $valuetoshow=$langs->trans("NbOfDays"); }
-            if ($fieldlist[$field]=='type_cdr')        { $valuetoshow=$langs->trans("AtEndOfMonth"); $align="center"; }
-            if ($fieldlist[$field]=='decalage')        { $valuetoshow=$langs->trans("Offset"); }
-            if ($fieldlist[$field]=='width' || $fieldlist[$field]=='nx') { $valuetoshow=$langs->trans("Width"); }
-            if ($fieldlist[$field]=='height' || $fieldlist[$field]=='ny') { $valuetoshow=$langs->trans("Height"); }
-            if ($fieldlist[$field]=='unit' || $fieldlist[$field]=='metric') { $valuetoshow=$langs->trans("MeasuringUnit"); }
             if ($fieldlist[$field]=='region_id' || $fieldlist[$field]=='country_id') { $valuetoshow=''; }
             if ($fieldlist[$field]=='accountancy_code'){ $valuetoshow=$langs->trans("AccountancyCode"); }
             if ($fieldlist[$field]=='accountancy_code_sell'){ $valuetoshow=$langs->trans("AccountancyCodeSell"); }
             if ($fieldlist[$field]=='accountancy_code_buy'){ $valuetoshow=$langs->trans("AccountancyCodeBuy"); }
             if ($fieldlist[$field]=='pcg_version' || $fieldlist[$field]=='fk_pcg_version') { $valuetoshow=$langs->trans("Pcg_version"); }
-            if ($fieldlist[$field]=='account_parent')  { $valuetoshow=$langs->trans("Accountparent"); }
-            if ($fieldlist[$field]=='pcg_type')        { $valuetoshow=$langs->trans("Pcg_type"); }
-            if ($fieldlist[$field]=='pcg_subtype')     { $valuetoshow=$langs->trans("Pcg_subtype"); }
-            if ($fieldlist[$field]=='sortorder')       { $valuetoshow=$langs->trans("SortOrder"); }
-	        if ($fieldlist[$field]=='short_label')     { $valuetoshow=$langs->trans("ShortLabel"); }
-            if ($fieldlist[$field]=='type_template')   { $valuetoshow=$langs->trans("TypeOfTemplate"); }
-			if ($fieldlist[$field]=='range_account')   { $valuetoshow=$langs->trans("Range"); }
+            if ($fieldlist[$field]=='range_account')   { $valuetoshow=$langs->trans("Range"); }
 			if ($fieldlist[$field]=='sens')            { $valuetoshow=$langs->trans("Sens"); }
 			if ($fieldlist[$field]=='category_type')   { $valuetoshow=$langs->trans("Calculated"); }
-			if ($fieldlist[$field]=='formula')         { $valuetoshow=$langs->trans("Formula"); }
-			if ($fieldlist[$field]=='paper_size')      { $valuetoshow=$langs->trans("PaperSize"); }
-			if ($fieldlist[$field]=='orientation')     { $valuetoshow=$langs->trans("Orientation"); }
-			if ($fieldlist[$field]=='leftmargin')      { $valuetoshow=$langs->trans("LeftMargin"); }
-			if ($fieldlist[$field]=='topmargin')       { $valuetoshow=$langs->trans("TopMargin"); }
-			if ($fieldlist[$field]=='spacex')          { $valuetoshow=$langs->trans("SpaceX"); }
-			if ($fieldlist[$field]=='spacey')          { $valuetoshow=$langs->trans("SpaceY"); }
-			if ($fieldlist[$field]=='font_size')       { $valuetoshow=$langs->trans("FontSize"); }
-			if ($fieldlist[$field]=='custom_x')        { $valuetoshow=$langs->trans("CustomX"); }
-			if ($fieldlist[$field]=='custom_y')        { $valuetoshow=$langs->trans("CustomY"); }
-			if ($fieldlist[$field]=='content')         { $valuetoshow=$langs->trans("Content"); }
-			if ($fieldlist[$field]=='percent')         { $valuetoshow=$langs->trans("Percentage"); }
-			if ($fieldlist[$field]=='affect')          { $valuetoshow=$langs->trans("Info"); }
-			if ($fieldlist[$field]=='delay')           { $valuetoshow=$langs->trans("NoticePeriod"); }
-			if ($fieldlist[$field]=='newbymonth')      { $valuetoshow=$langs->trans("NewByMonth"); }
 				
             if ($valuetoshow != '')
             {
@@ -639,7 +565,6 @@ if ($id)
              if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label') $alabelisused=1;
         }
 
-        if ($id == 4) print '<td></td>';
         print '<td>';
         print '<input type="hidden" name="id" value="'.$id.'">';
         print '</td>';
@@ -649,7 +574,7 @@ if ($id)
         print '</tr>';
 
         // Line to enter new values
-        print "<tr ".$bcnd[$var].">";
+        print '<tr class="oddeven nodrag nodrop nohover">';
 
         $obj = new stdClass();
         // If data was already input, we define them in obj to populate input fields.
@@ -679,15 +604,9 @@ if ($id)
 
         $colspan=count($fieldlist)+3;
 
-        if (! empty($alabelisused))  // If there is one label among fields, we show legend of *
-        {
-        	print '<tr><td colspan="'.$colspan.'">* '.$langs->trans("LabelUsedByDefault").'.</td></tr>';
-        }
         print '<tr><td colspan="'.$colspan.'">&nbsp;</td></tr>';	// Keep &nbsp; to have a line with enough height
     }
 
-
-
     // List of available record in database
     dol_syslog("htdocs/admin/dict", LOG_DEBUG);
     $resql=$db->query($sql);
@@ -712,101 +631,8 @@ if ($id)
             print '</td></tr>';
         }
 
-        // Title of lines
-        print '<tr class="liste_titre liste_titre_add">';
-        foreach ($fieldlist as $field => $value)
-        {
-            // Determine le nom du champ par rapport aux noms possibles
-            // dans les dictionnaires de donnees
-            $showfield=1;							  	// By defaut
-            $align="left";
-            $sortable=1;
-            $valuetoshow='';
-            /*
-            $tmparray=getLabelOfField($fieldlist[$field]);
-            $showfield=$tmp['showfield'];
-            $valuetoshow=$tmp['valuetoshow'];
-            $align=$tmp['align'];
-            $sortable=$tmp['sortable'];
-			*/
-            $valuetoshow=ucfirst($fieldlist[$field]);   // By defaut
-            $valuetoshow=$langs->trans($valuetoshow);   // try to translate
-            if ($fieldlist[$field]=='source')          { $valuetoshow=$langs->trans("Contact"); }
-            if ($fieldlist[$field]=='price')           { $valuetoshow=$langs->trans("PriceUHT"); }
-            if ($fieldlist[$field]=='taux')            {
-				if ($tabname[$id] != MAIN_DB_PREFIX."c_revenuestamp") $valuetoshow=$langs->trans("Rate");
-				else $valuetoshow=$langs->trans("Amount");
-				$align='center';
-            }
-            if ($fieldlist[$field]=='localtax1_type')  { $valuetoshow=$langs->trans("UseLocalTax")." 2"; $align="center"; $sortable=0; }
-            if ($fieldlist[$field]=='localtax1')       { $valuetoshow=$langs->trans("Rate")." 2"; $align="center"; $sortable=0; }
-            if ($fieldlist[$field]=='localtax2_type')  { $valuetoshow=$langs->trans("UseLocalTax")." 3"; $align="center"; $sortable=0; }
-            if ($fieldlist[$field]=='localtax2')       { $valuetoshow=$langs->trans("Rate")." 3"; $align="center"; $sortable=0; }
-            if ($fieldlist[$field]=='organization')    { $valuetoshow=$langs->trans("Organization"); }
-            if ($fieldlist[$field]=='lang')            { $valuetoshow=$langs->trans("Language"); }
-            if ($fieldlist[$field]=='type')            { $valuetoshow=$langs->trans("Type"); }
-            if ($fieldlist[$field]=='code')            { $valuetoshow=$langs->trans("Code"); }
-            if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label')
-            {
-            	$valuetoshow=$langs->trans("Label");
-               	if ($id != 25) $valuetoshow.="*";
-            }
-            if ($fieldlist[$field]=='libelle_facture') { $valuetoshow=$langs->trans("LabelOnDocuments")."*"; }
-            if ($fieldlist[$field]=='country')         { $valuetoshow=$langs->trans("Country"); }
-            if ($fieldlist[$field]=='recuperableonly') { $valuetoshow=$langs->trans("NPR"); $align="center"; }
-            if ($fieldlist[$field]=='nbjour')          { $valuetoshow=$langs->trans("NbOfDays"); }
-            if ($fieldlist[$field]=='type_cdr')        { $valuetoshow=$langs->trans("AtEndOfMonth"); $align="center"; }
-            if ($fieldlist[$field]=='decalage')        { $valuetoshow=$langs->trans("Offset"); }
-            if ($fieldlist[$field]=='width' || $fieldlist[$field]=='nx') { $valuetoshow=$langs->trans("Width"); }
-            if ($fieldlist[$field]=='height' || $fieldlist[$field]=='ny') { $valuetoshow=$langs->trans("Height"); }
-            if ($fieldlist[$field]=='unit' || $fieldlist[$field]=='metric') { $valuetoshow=$langs->trans("MeasuringUnit"); }
-            if ($fieldlist[$field]=='region_id' || $fieldlist[$field]=='country_id') { $showfield=0; }
-            if ($fieldlist[$field]=='accountancy_code'){ $valuetoshow=$langs->trans("AccountancyCode"); }
-            if ($fieldlist[$field]=='accountancy_code_sell'){ $valuetoshow=$langs->trans("AccountancyCodeSell"); $sortable=0; }
-            if ($fieldlist[$field]=='accountancy_code_buy'){ $valuetoshow=$langs->trans("AccountancyCodeBuy"); $sortable=0; }
-			if ($fieldlist[$field]=='fk_pcg_version')  { $valuetoshow=$langs->trans("Pcg_version"); }
-            if ($fieldlist[$field]=='account_parent')  { $valuetoshow=$langs->trans("Accountsparent"); }
-            if ($fieldlist[$field]=='pcg_type')        { $valuetoshow=$langs->trans("Pcg_type"); }
-            if ($fieldlist[$field]=='pcg_subtype')     { $valuetoshow=$langs->trans("Pcg_subtype"); }
-            if ($fieldlist[$field]=='sortorder')       { $valuetoshow=$langs->trans("SortOrder"); }
-            if ($fieldlist[$field]=='short_label')     { $valuetoshow=$langs->trans("ShortLabel"); }
-        	if ($fieldlist[$field]=='type_template')   { $valuetoshow=$langs->trans("TypeOfTemplate"); }
-			if ($fieldlist[$field]=='range_account')   { $valuetoshow=$langs->trans("Range"); }
-			if ($fieldlist[$field]=='sens')            { $valuetoshow=$langs->trans("Sens"); }
-			if ($fieldlist[$field]=='category_type')   { $valuetoshow=$langs->trans("Calculated"); }
-			if ($fieldlist[$field]=='formula')         { $valuetoshow=$langs->trans("Formula"); }
-			if ($fieldlist[$field]=='paper_size')      { $valuetoshow=$langs->trans("PaperSize"); }
-			if ($fieldlist[$field]=='orientation')     { $valuetoshow=$langs->trans("Orientation"); }
-			if ($fieldlist[$field]=='leftmargin')      { $valuetoshow=$langs->trans("LeftMargin"); }
-			if ($fieldlist[$field]=='topmargin')       { $valuetoshow=$langs->trans("TopMargin"); }
-			if ($fieldlist[$field]=='spacex')          { $valuetoshow=$langs->trans("SpaceX"); }
-			if ($fieldlist[$field]=='spacey')          { $valuetoshow=$langs->trans("SpaceY"); }
-			if ($fieldlist[$field]=='font_size')       { $valuetoshow=$langs->trans("FontSize"); }
-			if ($fieldlist[$field]=='custom_x')        { $valuetoshow=$langs->trans("CustomX"); }
-			if ($fieldlist[$field]=='custom_y')        { $valuetoshow=$langs->trans("CustomY"); }
-			if ($fieldlist[$field]=='content')         { $valuetoshow=$langs->trans("Content"); }
-			if ($fieldlist[$field]=='percent')         { $valuetoshow=$langs->trans("Percentage"); }
-			if ($fieldlist[$field]=='affect')          { $valuetoshow=$langs->trans("Info"); }
-			if ($fieldlist[$field]=='delay')           { $valuetoshow=$langs->trans("NoticePeriod"); }
-			if ($fieldlist[$field]=='newbymonth')      { $valuetoshow=$langs->trans("NewByMonth"); }
-
-            // Affiche nom du champ
-            if ($showfield)
-            {
-                print getTitleFieldOfList($valuetoshow, 0, $_SERVER["PHP_SELF"], ($sortable?$fieldlist[$field]:''), ($page?'page='.$page.'&':''), $param, "align=".$align, $sortfield, $sortorder);
-            }
-        }
-		// Favorite - Only activated on country dictionary
-        if ($id == 4) print getTitleFieldOfList($langs->trans("Favorite"), 0, $_SERVER["PHP_SELF"], "favorite", ($page?'page='.$page.'&':''), $param, 'align="center"', $sortfield, $sortorder);
-
-		print getTitleFieldOfList($langs->trans("Status"), 0, $_SERVER["PHP_SELF"], "active", ($page?'page='.$page.'&':''), $param, 'align="center"', $sortfield, $sortorder);
-        print getTitleFieldOfList('');
-        print getTitleFieldOfList('');
-        print getTitleFieldOfList('');
-        print '</tr>';
-
         // Title line with search boxes
-        print '<tr class="liste_titre_filter">';
+        print '<tr class="liste_titre liste_titre_add liste_titre_filter">';
         $filterfound=0;
         foreach ($fieldlist as $field => $value)
         {
@@ -829,7 +655,6 @@ if ($id)
                 }
             }
         }
-        if ($id == 4) print '<td></td>';
         print '<td class="liste_titre"></td>';
         print '<td class="liste_titre"></td>';
         print '<td class="liste_titre"></td>';
@@ -841,7 +666,59 @@ if ($id)
     	}
     	print '</td>';
     	print '</tr>';
-            
+    	
+    	// Title of lines
+        print '<tr class="liste_titre">';
+        foreach ($fieldlist as $field => $value)
+        {
+            // Determine le nom du champ par rapport aux noms possibles
+            // dans les dictionnaires de donnees
+            $showfield=1;							  	// By defaut
+            $align="left";
+            $sortable=1;
+            $valuetoshow='';
+
+            $valuetoshow=ucfirst($fieldlist[$field]);   // By defaut
+            $valuetoshow=$langs->trans($valuetoshow);   // try to translate
+            if ($fieldlist[$field]=='source')          { $valuetoshow=$langs->trans("Contact"); }
+            if ($fieldlist[$field]=='price')           { $valuetoshow=$langs->trans("PriceUHT"); }
+            if ($fieldlist[$field]=='taux')            {
+				if ($tabname[$id] != MAIN_DB_PREFIX."c_revenuestamp") $valuetoshow=$langs->trans("Rate");
+				else $valuetoshow=$langs->trans("Amount");
+				$align='center';
+            }
+            if ($fieldlist[$field]=='type')            { $valuetoshow=$langs->trans("Type"); }
+            if ($fieldlist[$field]=='code')            { $valuetoshow=$langs->trans("Code"); }
+            if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label')
+            {
+            	$valuetoshow=$langs->trans("Label");
+               	if ($id != 25) $valuetoshow.="*";
+            }
+            if ($fieldlist[$field]=='country')         { $valuetoshow=$langs->trans("Country"); }
+            if ($fieldlist[$field]=='region_id' || $fieldlist[$field]=='country_id') { $showfield=0; }
+            if ($fieldlist[$field]=='accountancy_code'){ $valuetoshow=$langs->trans("AccountancyCode"); }
+            if ($fieldlist[$field]=='accountancy_code_sell'){ $valuetoshow=$langs->trans("AccountancyCodeSell"); $sortable=0; }
+            if ($fieldlist[$field]=='accountancy_code_buy'){ $valuetoshow=$langs->trans("AccountancyCodeBuy"); $sortable=0; }
+			if ($fieldlist[$field]=='fk_pcg_version')  { $valuetoshow=$langs->trans("Pcg_version"); }
+            if ($fieldlist[$field]=='account_parent')  { $valuetoshow=$langs->trans("Accountsparent"); }
+            if ($fieldlist[$field]=='pcg_type')        { $valuetoshow=$langs->trans("Pcg_type"); }
+            if ($fieldlist[$field]=='pcg_subtype')     { $valuetoshow=$langs->trans("Pcg_subtype"); }
+        	if ($fieldlist[$field]=='type_template')   { $valuetoshow=$langs->trans("TypeOfTemplate"); }
+			if ($fieldlist[$field]=='range_account')   { $valuetoshow=$langs->trans("Range"); }
+			if ($fieldlist[$field]=='sens')            { $valuetoshow=$langs->trans("Sens"); }
+			if ($fieldlist[$field]=='category_type')   { $valuetoshow=$langs->trans("Calculated"); }
+            // Affiche nom du champ
+            if ($showfield)
+            {
+                print getTitleFieldOfList($valuetoshow, 0, $_SERVER["PHP_SELF"], ($sortable?$fieldlist[$field]:''), ($page?'page='.$page.'&':''), $param, "align=".$align, $sortfield, $sortorder);
+            }
+        }
+		print getTitleFieldOfList($langs->trans("Status"), 0, $_SERVER["PHP_SELF"], "active", ($page?'page='.$page.'&':''), $param, 'align="center"', $sortfield, $sortorder);
+        print getTitleFieldOfList('');
+        print getTitleFieldOfList('');
+        print getTitleFieldOfList('');
+        print '</tr>';
+
         if ($num)
         {
             // Lines with values
@@ -912,19 +789,6 @@ if ($id)
                                     $valuetoshow=($key != "Country".strtoupper($obj->country_code)?$obj->country_code." - ".$key:$obj->country);
                                 }
                             }
-                            else if ($fieldlist[$field]=='recuperableonly' || $fieldlist[$field] == 'deductible' || $fieldlist[$field] == 'category_type') {
-                                $valuetoshow=yn($valuetoshow);
-                                $align="center";
-                            }
-                            else if ($fieldlist[$field]=='type_cdr') {
-                				if(empty($valuetoshow)) $valuetoshow = $langs->trans('None');
-                				elseif($valuetoshow == 1) $valuetoshow = $langs->trans('AtEndOfMonth');
-                				elseif($valuetoshow == 2) $valuetoshow = $langs->trans('CurrentNext');
-                                $align="center";
-                            }
-                            else if ($fieldlist[$field]=='price' || preg_match('/^amount/i',$fieldlist[$field])) {
-                                $valuetoshow=price($valuetoshow);
-                            }
                             else if ($fieldlist[$field]=='libelle_facture') {
                                 $langs->load("bills");
                                 $key=$langs->trans("PaymentCondition".strtoupper($obj->code));
@@ -1003,9 +867,6 @@ if ($id)
                             else if ($fieldlist[$field]=='region_id' || $fieldlist[$field]=='country_id') {
                                 $showfield=0;
                             }
-                            else if ($fieldlist[$field]=='unicode') {
-                            	$valuetoshow = $langs->getCurrencySymbol($obj->code,1);
-                            }
                             else if ($fieldlist[$field]=='label' && $tabname[$_GET["id"]]==MAIN_DB_PREFIX.'c_units') {
 	                            $langs->load("products");
 	                            $valuetoshow=$langs->trans($obj->{$fieldlist[$field]});
@@ -1014,32 +875,6 @@ if ($id)
 	                            $langs->load("products");
 	                            $valuetoshow = $langs->trans($obj->{$fieldlist[$field]});
                             }
-                            else if (($fieldlist[$field] == 'unit') && ($tabname[$id] == MAIN_DB_PREFIX.'c_paper_format'))
-                            {
-                            	$key = $langs->trans('SizeUnit'.strtolower($obj->unit));
-                                $valuetoshow = ($obj->code && $key != 'SizeUnit'.strtolower($obj->unit) ? $key : $obj->{$fieldlist[$field]});
-                            }
-							else if ($fieldlist[$field]=='localtax1' || $fieldlist[$field]=='localtax2') {
-							    $align="center";
-							}
-							else if ($fieldlist[$field]=='localtax1_type') {
-                              if ($obj->localtax1 != 0)
-							    $valuetoshow=$localtax_typeList[$valuetoshow];
-							  else
-							    $valuetoshow = '';
-							  $align="center";
-							}
-							else if ($fieldlist[$field]=='localtax2_type') {
-							 if ($obj->localtax2 != 0)
-							    $valuetoshow=$localtax_typeList[$valuetoshow];
-							  else
-							    $valuetoshow = '';
-							  $align="center";
-							}
-							else if ($fieldlist[$field]=='taux') {
-                                $valuetoshow = price($valuetoshow, 0, $langs, 0, 0);
-							    $align="center";
-							}
 							else if (in_array($fieldlist[$field],array('recuperableonly')))
 							{
 								$align="center";
@@ -1057,7 +892,7 @@ if ($id)
 
                     // Can an entry be erased or disabled ?
                     $iserasable=1;$canbedisabled=1;$canbemodified=1;	// true by default
-                    if (isset($obj->code) && $id != 10)
+                    if (isset($obj->code))
                     {
                     	if (($obj->code == '0' || $obj->code == '' || preg_match('/unknown/i',$obj->code))) { $iserasable = 0; $canbedisabled = 0; }
                     	else if ($obj->code == 'RECEP') { $iserasable = 0; $canbedisabled = 0; }
@@ -1073,16 +908,6 @@ if ($id)
                     if ($param) $url .= '&'.$param;
                     $url.='&';
 
-					// Favorite
-					// Only activated on country dictionary
-                    if ($id == 4)
-					{
-						print '<td align="center" class="nowrap">';
-						if ($iserasable) print '<a href="'.$url.'action='.$acts[$obj->favorite].'_favorite">'.$actl[$obj->favorite].'</a>';
-						else print $langs->trans("AlwaysActive");
-						print '</td>';
-					}
-
                     // Active
                     print '<td align="center" class="nowrap">';
                     if ($canbedisabled) print '<a href="'.$url.'action='.$acts[$obj->active].'">'.$actl[$obj->active].'</a>';

From 5729bdb2c92a04e8521a0490e2f4b19ea55ae363 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 13 May 2017 19:51:31 +0200
Subject: [PATCH 336/505] Fix phpunit

---
 test/phpunit/CodingSqlTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/phpunit/CodingSqlTest.php b/test/phpunit/CodingSqlTest.php
index 0a9acc50220..c6123df3e77 100644
--- a/test/phpunit/CodingSqlTest.php
+++ b/test/phpunit/CodingSqlTest.php
@@ -57,7 +57,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class SqlTest extends PHPUnit_Framework_TestCase
+class CodingSqlTest extends PHPUnit_Framework_TestCase
 {
     protected $savconf;
     protected $savuser;

From 955c9f4217b4dd7a943f9c07b505833397b8defd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 13 May 2017 21:10:56 +0200
Subject: [PATCH 337/505] Standardize the way online payments are working.
 Removed the trigger file of PAYPAL module that stored data that was not used
 by Dolibarr. The trigger event still exists, but if an external module need
 action on it, it must provides itself its trigger file.

---
 ChangeLog                                     |   2 +
 ...face_20_modPaypal_PaypalWorkflow.class.php | 112 -----------------
 ...face_20_modStripe_StripeWorkflow.class.php | 113 ------------------
 htdocs/paybox/admin/paybox.php                |  15 ++-
 htdocs/paypal/admin/paypal.php                |   3 -
 htdocs/public/paybox/paymentko.php            |   9 ++
 htdocs/public/paybox/paymentok.php            |   4 +
 htdocs/public/payment/paymentko.php           |  11 ++
 htdocs/public/payment/paymentok.php           |  27 +++--
 htdocs/public/paypal/paymentko.php            |  11 ++
 htdocs/public/paypal/paymentok.php            |  14 ++-
 11 files changed, 78 insertions(+), 243 deletions(-)
 delete mode 100644 htdocs/core/triggers/interface_20_modPaypal_PaypalWorkflow.class.php
 delete mode 100644 htdocs/core/triggers/interface_20_modStripe_StripeWorkflow.class.php

diff --git a/ChangeLog b/ChangeLog
index f48de97d970..68e9674d0da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,8 @@ Following changes may create regression for some external modules, but were nece
 * Removed CommonObject::displayMarginInfos (was deprecated in 3.8). Use same method into
   html.formmargin.class.php
 * Removed Societe::set_commnucation_level (was deprecated in 4.0). Was not used.
+* Removed the trigger file of PAYPAL module that stored data that was not used by Dolibarr. The trigger event still
+  exists, but if an external module need action on it, it must provides itself its trigger file.
 
 ***** ChangeLog for 5.0.2 compared to 5.0.1 *****
 FIX: #6468 + Fix missing translation
diff --git a/htdocs/core/triggers/interface_20_modPaypal_PaypalWorkflow.class.php b/htdocs/core/triggers/interface_20_modPaypal_PaypalWorkflow.class.php
deleted file mode 100644
index 1d57f598d57..00000000000
--- a/htdocs/core/triggers/interface_20_modPaypal_PaypalWorkflow.class.php
+++ /dev/null
@@ -1,112 +0,0 @@
-<?php
-/* Copyright (C) 2011-2012  Regis Houssin  <regis.houssin@capnetworks.com>
- * Copyright (C) 2014       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
- * 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/triggers/interface_20_modPaypal_PaypalWorkflow.class.php
- *      \ingroup    paypal
- *      \brief      Trigger file for paypal workflow
- */
-
-require_once DOL_DOCUMENT_ROOT.'/core/triggers/dolibarrtriggers.class.php';
-
-
-/**
- *  Class of triggers for paypal module
- */
-class InterfacePaypalWorkflow extends DolibarrTriggers
-{
-	public $picto = 'paypal@paypal';
-	public $family = 'paypal';
-	public $description = "Triggers of this module allows to manage paypal workflow";
-	public $version = self::VERSION_DOLIBARR;
-
-	/**
-	 * Function called when a Dolibarrr business event is done.
-	 * All functions "runTrigger" are triggered if file is inside directory htdocs/core/triggers or htdocs/module/code/triggers (and declared)
-	 *
-	 * @param string		$action		Event action code
-	 * @param Object		$object     Object
-	 * @param User			$user       Object user
-	 * @param Translate		$langs      Object langs
-	 * @param conf			$conf       Object conf
-	 * @return int         				<0 if KO, 0 if no triggered ran, >0 if OK
-	 */
-	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
-    {
-        // Mettre ici le code a executer en reaction de l'action
-        // Les donnees de l'action sont stockees dans $object
-
-        if ($action == 'PAYPAL_PAYMENT_OK')
-        {
-        	dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". source=".$object->source." ref=".$object->ref);
-
-        	if (! empty($object->source))
-        	{
-        		if ($object->source == 'membersubscription')
-        		{
-        			//require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherents.class.php';
-
-        			// TODO add subscription treatment
-        		}
-        		else
-        		{
-        			require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
-
-        			$soc = new Societe($this->db);
-
-        			// Parse element/subelement (ex: project_task)
-        			$element = $path = $filename = $object->source;
-        			if (preg_match('/^([^_]+)_([^_]+)/i',$object->source,$regs))
-        			{
-        				$element = $path = $regs[1];
-        				$filename = $regs[2];
-        			}
-        			// For compatibility
-        			if ($element == 'order') {
-        				$path = $filename = 'commande';
-        			}
-        			if ($element == 'invoice') {
-        				$path = 'compta/facture'; $filename = 'facture';
-        			}
-
-        			dol_include_once('/'.$path.'/class/'.$filename.'.class.php');
-
-        			$classname = ucfirst($filename);
-        			$obj = new $classname($this->db);
-
-        			$ret = $obj->fetch('',$object->ref);
-        			if ($ret < 0) return -1;
-
-        			// Add payer id
-        			$soc->setValueFrom('ref_int', $object->payerID, 'societe', $obj->socid);
-
-        			// Add transaction id
-        			$obj->setValueFrom('ref_int',$object->resArray["TRANSACTIONID"]);
-        		}
-        	}
-        	else
-        	{
-        		// TODO add free tag treatment
-        	}
-
-        }
-
-		return 0;
-    }
-
-}
diff --git a/htdocs/core/triggers/interface_20_modStripe_StripeWorkflow.class.php b/htdocs/core/triggers/interface_20_modStripe_StripeWorkflow.class.php
deleted file mode 100644
index 4fbf29c7b07..00000000000
--- a/htdocs/core/triggers/interface_20_modStripe_StripeWorkflow.class.php
+++ /dev/null
@@ -1,113 +0,0 @@
-<?php
-/* Copyright (C) 2011-2012	Regis Houssin		<regis.houssin@capnetworks.com>
- * Copyright (C) 2014		Marcos García		<marcosgdf@gmail.com>
- * Copyright (C) 2017		Alexandre Spangaro	<aspangaro@zendsi.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/triggers/interface_20_modStripe_StripeWorkflow.class.php
- *      \ingroup    stripe
- *      \brief      Trigger file for stripe workflow
- */
-
-require_once DOL_DOCUMENT_ROOT.'/core/triggers/dolibarrtriggers.class.php';
-
-
-/**
- *  Class of triggers for stripe module
- */
-class InterfaceStripeWorkflow extends DolibarrTriggers
-{
-	public $picto = 'stripe@stripe';
-	public $family = 'stripe';
-	public $description = "Triggers of this module allows to manage stripe workflow";
-	public $version = self::VERSION_DOLIBARR;
-
-	/**
-	 * Function called when a Dolibarrr business event is done.
-	 * All functions "runTrigger" are triggered if file is inside directory htdocs/core/triggers or htdocs/module/code/triggers (and declared)
-	 *
-	 * @param string		$action		Event action code
-	 * @param Object		$object     Object
-	 * @param User			$user       Object user
-	 * @param Translate		$langs      Object langs
-	 * @param conf			$conf       Object conf
-	 * @return int         				<0 if KO, 0 if no triggered ran, >0 if OK
-	 */
-	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
-    {
-        // Mettre ici le code a executer en reaction de l'action
-        // Les donnees de l'action sont stockees dans $object
-
-        if ($action == 'STRIPE_PAYMENT_OK')
-        {
-        	dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". source=".$object->source." ref=".$object->ref);
-
-        	if (! empty($object->source))
-        	{
-        		if ($object->source == 'membersubscription')
-        		{
-        			//require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherents.class.php';
-
-        			// TODO add subscription treatment
-        		}
-        		else
-        		{
-        			require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
-
-        			$soc = new Societe($this->db);
-
-        			// Parse element/subelement (ex: project_task)
-        			$element = $path = $filename = $object->source;
-        			if (preg_match('/^([^_]+)_([^_]+)/i',$object->source,$regs))
-        			{
-        				$element = $path = $regs[1];
-        				$filename = $regs[2];
-        			}
-        			// For compatibility
-        			if ($element == 'order') {
-        				$path = $filename = 'commande';
-        			}
-        			if ($element == 'invoice') {
-        				$path = 'compta/facture'; $filename = 'facture';
-        			}
-
-        			dol_include_once('/'.$path.'/class/'.$filename.'.class.php');
-
-        			$classname = ucfirst($filename);
-        			$obj = new $classname($this->db);
-
-        			$ret = $obj->fetch('',$object->ref);
-        			if ($ret < 0) return -1;
-
-        			// Add payer id
-        			$soc->setValueFrom('ref_int', $object->payerID, 'societe', $obj->socid);
-
-        			// Add transaction id
-        			$obj->setValueFrom('ref_int',$object->resArray["TRANSACTIONID"]);
-        		}
-        	}
-        	else
-        	{
-        		// TODO add free tag treatment
-        	}
-
-        }
-
-		return 0;
-    }
-
-}
diff --git a/htdocs/paybox/admin/paybox.php b/htdocs/paybox/admin/paybox.php
index 1a020ab86bf..ffbc2e41e0c 100644
--- a/htdocs/paybox/admin/paybox.php
+++ b/htdocs/paybox/admin/paybox.php
@@ -93,16 +93,22 @@ llxHeader();
 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
 print load_fiche_titre($langs->trans("PayBoxSetup"),$linkback,'title_setup');
 
-print $langs->trans("PayBoxDesc")."<br>\n";
+$h = 0;
+$head = array();
+
+$head[$h][0] = DOL_URL_ROOT."/paybox/admin/paybox.php";
+$head[$h][1] = $langs->trans("PayBox");
+$head[$h][2] = 'payboxaccount';
+$h++;
 
-print '<br>';
 print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="action" value="setvalue">';
 
-dol_fiche_head(null, 'payboxaccount', '');
+dol_fiche_head($head, 'payboxaccount', '', -1);
 
-$var=true;
+print $langs->trans("PayBoxDesc")."<br>\n";
+print '<br>';
 
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
@@ -131,7 +137,6 @@ print '<input size="32" type="text" name="PAYBOX_PBX_IDENTIFIANT" value="'.$conf
 print '<br>'.$langs->trans("Example").': 2 ('.$langs->trans("Test").')';
 print '</td></tr>';
 
-$var=true;
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("UsageParameter").'</td>';
 print '<td>'.$langs->trans("Value").'</td>';
diff --git a/htdocs/paypal/admin/paypal.php b/htdocs/paypal/admin/paypal.php
index ef0c40f2813..6d52fea8d99 100644
--- a/htdocs/paypal/admin/paypal.php
+++ b/htdocs/paypal/admin/paypal.php
@@ -121,7 +121,6 @@ print '<br>';
 print '<table class="noborder" width="100%">';
 
 // Account Parameters
-$var=true;
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("AccountParameter").'</td>';
 print '<td>'.$langs->trans("Value").'</td>';
@@ -160,7 +159,6 @@ print $form->selectarray("PAYPAL_SSLVERSION",array('1'=> $langs->trans('TLSv1'),
 print '</td></tr>';
 
 // Usage Parameters
-$var=true;
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("UsageParameter").'</td>';
 print '<td>'.$langs->trans("Value").'</td>';
@@ -220,7 +218,6 @@ print '<input size="32" type="email" name="PAYPAL_PAYONLINE_SENDEMAIL" value="'.
 print ' &nbsp; '.$langs->trans("Example").': myemail@myserver.com';
 print '</td></tr>';
 
-$var=true;
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("UrlGenerationParameters").'</td>';
 print '<td>'.$langs->trans("Value").'</td>';
diff --git a/htdocs/public/paybox/paymentko.php b/htdocs/public/paybox/paymentko.php
index 1d450a91af2..e417aad12c7 100644
--- a/htdocs/public/paybox/paymentko.php
+++ b/htdocs/public/paybox/paymentko.php
@@ -50,6 +50,7 @@ $langs->load("paypal");
 $langs->load("stripe");
 
 
+$object = new stdClass();   // For triggers
 
 
 /*
@@ -71,6 +72,14 @@ foreach($_POST as $k => $v) $tracepost .= "{$k} - {$v}\n";
 dol_syslog("POST=".$tracepost, LOG_DEBUG, 0, '_paybox');
 
 
+// Appel des triggers
+include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+$interface=new Interfaces($db);
+$result=$interface->run_triggers('PAYBOX_PAYMENT_OK',$object,$user,$langs,$conf);
+if ($result < 0) { $error++; $errors=$interface->errors; }
+// Fin appel triggers
+
+
 // Send an email
 if (! empty($conf->global->PAYBOX_PAYONLINE_SENDEMAIL))
 {
diff --git a/htdocs/public/paybox/paymentok.php b/htdocs/public/paybox/paymentok.php
index 93d93a88cbe..5b88dcb65d7 100644
--- a/htdocs/public/paybox/paymentok.php
+++ b/htdocs/public/paybox/paymentok.php
@@ -60,6 +60,9 @@ $FULLTAG=GETPOST('FULLTAG');
 if (empty($FULLTAG)) $FULLTAG=GETPOST('fulltag');
 
 
+$object = new stdClass();   // For triggers
+
+
 /*
  * Actions
  */
@@ -113,6 +116,7 @@ print $langs->trans("YourPaymentHasBeenRecorded")."<br><br>\n";
 
 if (! empty($conf->global->PAYBOX_MESSAGE_OK)) print $conf->global->PAYBOX_MESSAGE_OK;
 
+
 // Appel des triggers
 include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
 $interface=new Interfaces($db);
diff --git a/htdocs/public/payment/paymentko.php b/htdocs/public/payment/paymentko.php
index ceface2a9c0..6ce1c3badfa 100644
--- a/htdocs/public/payment/paymentko.php
+++ b/htdocs/public/payment/paymentko.php
@@ -69,6 +69,9 @@ if (! empty($conf->paybox->enabled)) $validpaymentmethod['paybox']='paybox';
 if (empty($validpaymentmethod)) accessforbidden('', 0, 0, 1);
 
 
+$object = new stdClass();   // For triggers
+
+
 /*
  * Actions
  */
@@ -87,6 +90,14 @@ foreach($_POST as $k => $v) $tracepost .= "{$k} - {$v}\n";
 dol_syslog("POST=".$tracepost, LOG_DEBUG, 0, '_payment');
 
 
+// Appel des triggers
+include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+$interface=new Interfaces($db);
+$result=$interface->run_triggers('PAYMENTONLINE_PAYMENT_KO',$object,$user,$langs,$conf);
+if ($result < 0) { $error++; $errors=$interface->errors; }
+// Fin appel triggers
+
+
 // Send an email
 if (! empty($conf->paypal->enabled))
 {
diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index c138cc29267..c1b4329c7be 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -128,6 +128,9 @@ $PAYMENTSTATUS=$TRANSACTIONID=$TAXAMT=$NOTE='';
 $ErrorCode=$ErrorShortMsg=$ErrorLongMsg=$ErrorSeverityCode='';
 
 
+$object = new stdClass();   // For triggers
+
+
 
 
 /*
@@ -191,8 +194,6 @@ if (! empty($conf->paypal->enabled))
 	        $ack = strtoupper($resArray["ACK"]);
 	        if ($ack=="SUCCESS" || $ack=="SUCCESSWITHWARNING")
 	        {
-	        	$object = new stdClass();
-	
 	        	$object->source		= $source;
 	        	$object->ref		= $ref;
 	        	$object->payerID	= $payerID;
@@ -244,11 +245,16 @@ if ($ispaymentok)
     print $langs->trans("ThisIsTransactionId",$TRANSACTIONID)."<br><br>\n";
     if (! empty($conf->global->PAYMENT_MESSAGE_OK)) print $conf->global->PAYMENT_MESSAGE_OK;
     
+    $sendemail = '';
+    if (! empty($conf->global->PAYMENTONLINE_SENDEMAIL)) $sendemail=$conf->global->PAYMENTONLINE_SENDEMAIL;
+    // TODO Remove local option to keep only the generic one ?
+    if ($paymentmethod == 'paypal' && ! empty($conf->global->PAYPAL_PAYONLINE_SENDEMAIL)) $sendemail=$conf->global->PAYPAL_PAYONLINE_SENDEMAIL;
+    if ($paymentmethod == 'paybox' && ! empty($conf->global->PAYBOX_PAYONLINE_SENDEMAIL)) $sendemail=$conf->global->PAYBOX_PAYONLINE_SENDEMAIL;
     
 	// Send an email
-	if (! empty($conf->global->PAYMENTONLINE_SENDEMAIL))
+    if ($sendemail)
 	{
-		$sendto=$conf->global->PAYMENTONLINE_SENDEMAIL;
+		$sendto=$sendemail;
 		$from=$conf->global->MAILING_EMAIL_FROM;
 		// Define $urlwithroot
 		$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
@@ -269,10 +275,11 @@ if ($ispaymentok)
 		}
 		else
 		{
-			$content.=$langs->transnoentitiesnoconv("NewPaypalPaymentReceived")."<br>\n";
+			$content.=$langs->transnoentitiesnoconv("NewOnlinePaymentReceived")."<br>\n";
 		}
 		$content.="<br>\n";
 		$content.=$langs->transnoentitiesnoconv("TechnicalInformation").":<br>\n";
+		$content.=$langs->transnoentitiesnoconv("PaymentSystem").': '.$paymentmethod."<br>\n";
 		$content.=$langs->transnoentitiesnoconv("ReturnURLAfterPayment").': '.$urlback."<br>\n";
 		$content.="tag=".$fulltag." token=".$token." paymentType=".$paymentType." currencycodeType=".$currencyCodeType." payerId=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt;
 
@@ -310,11 +317,16 @@ else
      
     if ($mysoc->email) print "\nPlease, send a screenshot of this page to ".$mysoc->email."<br>\n";
     
+    $sendemail = '';
+    if (! empty($conf->global->PAYMENTONLINE_SENDEMAIL)) $sendemail=$conf->global->PAYMENTONLINE_SENDEMAIL;
+    // TODO Remove local option to keep only the generic one ?
+    if ($paymentmethod == 'paypal' && ! empty($conf->global->PAYPAL_PAYONLINE_SENDEMAIL)) $sendemail=$conf->global->PAYPAL_PAYONLINE_SENDEMAIL;
+    if ($paymentmethod == 'paybox' && ! empty($conf->global->PAYBOX_PAYONLINE_SENDEMAIL)) $sendemail=$conf->global->PAYBOX_PAYONLINE_SENDEMAIL;
     
     // Send an email
-    if (! empty($conf->global->PAYMENTONLINE_SENDEMAIL))
+    if ($sendemail)
     {
-        $sendto=$conf->global->PAYMENTONLINE_SENDEMAIL;
+        $sendto=$sendemail;
         $from=$conf->global->MAILING_EMAIL_FROM;
         // Define $urlwithroot
         $urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
@@ -327,6 +339,7 @@ else
         $content.=$langs->transnoentitiesnoconv("PaypalConfirmPaymentPageWasCalledButFailed")."\n";
         $content.="\n";
         $content.=$langs->transnoentitiesnoconv("TechnicalInformation").":\n";
+		$content.=$langs->transnoentitiesnoconv("PaymentSystem").': '.$paymentmethod."<br>\n";
         $content.=$langs->transnoentitiesnoconv("ReturnURLAfterPayment").': '.$urlback."\n";
         $content.="tag=".$fulltag."\ntoken=".$token." paymentType=".$paymentType." currencycodeType=".$currencyCodeType." payerId=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt;
          
diff --git a/htdocs/public/paypal/paymentko.php b/htdocs/public/paypal/paymentko.php
index 0bc3c9ca9e6..2d3c67beecb 100644
--- a/htdocs/public/paypal/paymentko.php
+++ b/htdocs/public/paypal/paymentko.php
@@ -61,6 +61,9 @@ $FULLTAG=GETPOST('FULLTAG');
 if (empty($FULLTAG)) $FULLTAG=GETPOST('fulltag');
 
 
+$object = new stdClass();   // For triggers
+
+
 /*
  * Actions
  */
@@ -79,6 +82,14 @@ foreach($_POST as $k => $v) $tracepost .= "{$k} - {$v}\n";
 dol_syslog("POST=".$tracepost, LOG_DEBUG, 0, '_paypal');
 
 
+// Appel des triggers
+include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+$interface=new Interfaces($db);
+$result=$interface->run_triggers('PAYPAL_PAYMENT_KO',$object,$user,$langs,$conf);
+if ($result < 0) { $error++; $errors=$interface->errors; }
+// Fin appel triggers
+
+
 // Send an email
 if (! empty($conf->global->PAYPAL_PAYONLINE_SENDEMAIL))
 {
diff --git a/htdocs/public/paypal/paymentok.php b/htdocs/public/paypal/paymentok.php
index ca6a376e60d..ddb779d621e 100644
--- a/htdocs/public/paypal/paymentok.php
+++ b/htdocs/public/paypal/paymentok.php
@@ -92,6 +92,9 @@ $FULLTAG=GETPOST('FULLTAG');
 if (empty($FULLTAG)) $FULLTAG=GETPOST('fulltag');
 
 
+$object = new stdClass();   // For triggers
+
+
 /*
  * Actions
  */
@@ -151,8 +154,6 @@ if ($PAYPALTOKEN)
         $ack = strtoupper($resArray["ACK"]);
         if($ack=="SUCCESS" || $ack=="SUCCESSWITHWARNING")
         {
-        	$object = new stdClass();
-
         	$object->source		= $source;
         	$object->ref		= $ref;
         	$object->payerID	= $payerID;
@@ -226,7 +227,14 @@ if ($PAYPALTOKEN)
         }
         else
 		{
-            //Display a user friendly Error on the page using any of the following error information returned by PayPal
+            // Appel des triggers
+            include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+            $interface=new Interfaces($db);
+            $result=$interface->run_triggers('PAYPAL_PAYMENT_KO',$object,$user,$langs,$conf);
+            if ($result < 0) { $error++; $errors=$interface->errors; }
+            // Fin appel triggers
+            
+		    //Display a user friendly Error on the page using any of the following error information returned by PayPal
             $ErrorCode = urldecode($resArray["L_ERRORCODE0"]);
             $ErrorShortMsg = urldecode($resArray["L_SHORTMESSAGE0"]);
             $ErrorLongMsg = urldecode($resArray["L_LONGMESSAGE0"]);

From 8dcec30d8938b302382b652dfabd494b99eb8db1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 13 May 2017 21:17:08 +0200
Subject: [PATCH 338/505] Start debug of module stripe

---
 htdocs/stripe/lib/stripe.lib.php | 45 --------------------------------
 1 file changed, 45 deletions(-)

diff --git a/htdocs/stripe/lib/stripe.lib.php b/htdocs/stripe/lib/stripe.lib.php
index c454296a304..5f0b1bd0404 100644
--- a/htdocs/stripe/lib/stripe.lib.php
+++ b/htdocs/stripe/lib/stripe.lib.php
@@ -51,52 +51,7 @@ function stripeadmin_prepare_head()
     return $head;
 }
 
-/**
- * Show header
- *
- * @param 	string	$title		Title of page
- * @param 	string	$head		Head string to add int head section
- * @return	void
- */
-function llxHeaderStripe($title, $head = "")
-{
-	global $user, $conf, $langs;
 
-	header("Content-type: text/html; charset=".$conf->file->character_set_client);
-
-	print '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">';
-	//print '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" http://www.w3.org/TR/1999/REC-html401-19991224/strict.dtd>';
-	print "\n";
-	print "<html>\n";
-	print "<head>\n";
-	print '<meta name="robots" content="noindex,nofollow">'."\n";
-	print '<meta name="keywords" content="dolibarr,payment,online">'."\n";
-	print '<meta name="description" content="Welcome on Dolibarr online payment form">'."\n";
-	print "<title>".$title."</title>\n";
-	if ($head) print $head."\n";
-	if (! empty($conf->global->STRIPE_CSS_URL)) print '<link rel="stylesheet" type="text/css" href="'.$conf->global->STRIPE_CSS_URL.'?lang='.$langs->defaultlang.'">'."\n";
-	else
-	{
-		print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.$conf->css.'?lang='.$langs->defaultlang.'">'."\n";
-		print '<style type="text/css">';
-		print '.CTableRow1      { margin: 1px; padding: 3px; font: 12px verdana,arial; background: #e6E6eE; color: #000000; -moz-border-radius-topleft:6px; -moz-border-radius-topright:6px; -moz-border-radius-bottomleft:6px; -moz-border-radius-bottomright:6px;}';
-		print '.CTableRow2      { margin: 1px; padding: 3px; font: 12px verdana,arial; background: #FFFFFF; color: #000000; -moz-border-radius-topleft:6px; -moz-border-radius-topright:6px; -moz-border-radius-bottomleft:6px; -moz-border-radius-bottomright:6px;}';
-		print '</style>';
-	}
-	print "</head>\n";
-	print '<body style="margin: 20px;">'."\n";
-}
-
-/**
- * Show footer
- *
- * @return	void
- */
-function llxFooterStripe()
-{
-	print "</body>\n";
-	print "</html>\n";
-}
 
 /**
  * Return string with full Url

From 0ed4b607b21d198f86ad2b6041411fc434590c9d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 13 May 2017 22:05:58 +0200
Subject: [PATCH 339/505] Standardize code for payment

---
 htdocs/paypal/admin/paypal.php      |   1 +
 htdocs/public/paybox/paymentko.php  |  15 ++-
 htdocs/public/paybox/paymentok.php  |  15 ++-
 htdocs/public/paypal/newpayment.php |  17 ++--
 htdocs/public/paypal/paymentko.php  |  15 ++-
 htdocs/public/paypal/paymentok.php  |  30 +++++-
 htdocs/public/stripe/newpayment.php |   2 +
 htdocs/stripe/admin/stripe.php      | 147 +++++++++++++++++++++-------
 8 files changed, 195 insertions(+), 47 deletions(-)

diff --git a/htdocs/paypal/admin/paypal.php b/htdocs/paypal/admin/paypal.php
index 6d52fea8d99..36c8df9d0d6 100644
--- a/htdocs/paypal/admin/paypal.php
+++ b/htdocs/paypal/admin/paypal.php
@@ -43,6 +43,7 @@ $action = GETPOST('action','alpha');
 if ($action == 'setvalue' && $user->admin)
 {
 	$db->begin();
+	
     $result=dolibarr_set_const($db, "PAYPAL_API_SANDBOX",GETPOST('PAYPAL_API_SANDBOX','alpha'),'chaine',0,'',$conf->entity);
     if (! $result > 0) $error++;
     $result=dolibarr_set_const($db, "PAYPAL_API_USER",GETPOST('PAYPAL_API_USER','alpha'),'chaine',0,'',$conf->entity);
diff --git a/htdocs/public/paybox/paymentko.php b/htdocs/public/paybox/paymentko.php
index e417aad12c7..be5b388f6ed 100644
--- a/htdocs/public/paybox/paymentko.php
+++ b/htdocs/public/paybox/paymentko.php
@@ -86,8 +86,21 @@ if (! empty($conf->global->PAYBOX_PAYONLINE_SENDEMAIL))
 	$sendto=$conf->global->PAYBOX_PAYONLINE_SENDEMAIL;
 	$from=$conf->global->MAILING_EMAIL_FROM;
 
+	// Define link to login card
+	$appli=constant('DOL_APPLICATION_TITLE');
+	if (! empty($conf->global->MAIN_APPLICATION_TITLE))
+	{
+	    $appli=$conf->global->MAIN_APPLICATION_TITLE;
+	    if (preg_match('/\d\.\d/', $appli))
+	    {
+	        if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli.=" (".DOL_VERSION.")";	// If new title contains a version that is different than core
+	    }
+	    else $appli.=" ".DOL_VERSION;
+	}
+	else $appli.=" ".DOL_VERSION;
+	
 	$urlback=$_SERVER["REQUEST_URI"];
-	$topic='['.$conf->global->MAIN_APPLICATION_TITLE.'] '.$langs->transnoentitiesnoconv("NewPayboxPaymentFailed");
+	$topic='['.$appli.'] '.$langs->transnoentitiesnoconv("NewPayboxPaymentFailed");
 	$content=$langs->transnoentitiesnoconv("NewPayboxPaymentFailed")."\n".$fulltag;
 	require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
 	$mailfile = new CMailFile($topic, $sendto, $from, $content);
diff --git a/htdocs/public/paybox/paymentok.php b/htdocs/public/paybox/paymentok.php
index 5b88dcb65d7..0e91189e242 100644
--- a/htdocs/public/paybox/paymentok.php
+++ b/htdocs/public/paybox/paymentok.php
@@ -135,8 +135,21 @@ if (! empty($conf->global->PAYBOX_PAYONLINE_SENDEMAIL))
 	$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
 	//$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
 
+	// Define link to login card
+	$appli=constant('DOL_APPLICATION_TITLE');
+	if (! empty($conf->global->MAIN_APPLICATION_TITLE))
+	{
+	    $appli=$conf->global->MAIN_APPLICATION_TITLE;
+	    if (preg_match('/\d\.\d/', $appli))
+	    {
+	        if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli.=" (".DOL_VERSION.")";	// If new title contains a version that is different than core
+	    }
+	    else $appli.=" ".DOL_VERSION;
+	}
+	else $appli.=" ".DOL_VERSION;
+	
 	$urlback=$_SERVER["REQUEST_URI"];
-	$topic='['.$conf->global->MAIN_APPLICATION_TITLE.'] '.$langs->transnoentitiesnoconv("NewPayboxPaymentReceived");
+	$topic='['.$appli.'] '.$langs->transnoentitiesnoconv("NewPayboxPaymentReceived");
 	$tmptag=dolExplodeIntoArray($fulltag,'.','=');
 	$content="";
 	if (! empty($tmptag['MEM']))
diff --git a/htdocs/public/paypal/newpayment.php b/htdocs/public/paypal/newpayment.php
index e118d769476..cd963eec798 100644
--- a/htdocs/public/paypal/newpayment.php
+++ b/htdocs/public/paypal/newpayment.php
@@ -1,11 +1,11 @@
 <?php
 /* Copyright (C) 2001-2002	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
- * Copyright (C) 2006-2012	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2006-2017	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2009-2012	Regis Houssin			<regis.houssin@capnetworks.com>
  *
- * This program is free software; you can redistribute it and/or modify
+ * 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
+ * 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,
@@ -23,7 +23,6 @@
  *     	\file       htdocs/public/paypal/newpayment.php
  *		\ingroup    paypal
  *		\brief      File to offer a way to make a payment for a particular Dolibarr entity
- *		\author	    Laurent Destailleur
  */
 
 define("NOLOGIN",1);		// This means this output page does not require to be logged.
@@ -353,7 +352,7 @@ $error=0;
 $var=false;
 
 // Free payment
-if (! GETPOST("source") && $valid)
+if (! GETPOST("source"))
 {
 	$found=true;
 	$tag=GETPOST("tag");
@@ -400,7 +399,7 @@ if (! GETPOST("source") && $valid)
 
 
 // Payment on customer order
-if (GETPOST("source") == 'order' && $valid)
+if (GETPOST("source") == 'order')
 {
 	$found=true;
 	$langs->load("orders");
@@ -507,7 +506,7 @@ if (GETPOST("source") == 'order' && $valid)
 
 
 // Payment on customer invoice
-if (GETPOST("source") == 'invoice' && $valid)
+if (GETPOST("source") == 'invoice')
 {
 	$found=true;
 	$langs->load("bills");
@@ -613,7 +612,7 @@ if (GETPOST("source") == 'invoice' && $valid)
 }
 
 // Payment on contract line
-if (GETPOST("source") == 'contractline' && $valid)
+if (GETPOST("source") == 'contractline')
 {
 	$found=true;
 	$langs->load("contracts");
@@ -808,7 +807,7 @@ if (GETPOST("source") == 'contractline' && $valid)
 }
 
 // Payment on member subscription
-if (GETPOST("source") == 'membersubscription' && $valid)
+if (GETPOST("source") == 'membersubscription')
 {
 	$found=true;
 	$langs->load("members");
diff --git a/htdocs/public/paypal/paymentko.php b/htdocs/public/paypal/paymentko.php
index 2d3c67beecb..e432db2e317 100644
--- a/htdocs/public/paypal/paymentko.php
+++ b/htdocs/public/paypal/paymentko.php
@@ -108,8 +108,21 @@ if (! empty($conf->global->PAYPAL_PAYONLINE_SENDEMAIL))
 	$sendto=$conf->global->PAYPAL_PAYONLINE_SENDEMAIL;
 	$from=$conf->global->MAILING_EMAIL_FROM;
 
+	// Define link to login card
+	$appli=constant('DOL_APPLICATION_TITLE');
+	if (! empty($conf->global->MAIN_APPLICATION_TITLE))
+	{
+	    $appli=$conf->global->MAIN_APPLICATION_TITLE;
+	    if (preg_match('/\d\.\d/', $appli))
+	    {
+	        if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli.=" (".DOL_VERSION.")";	// If new title contains a version that is different than core
+	    }
+	    else $appli.=" ".DOL_VERSION;
+	}
+	else $appli.=" ".DOL_VERSION;
+	
 	$urlback=$_SERVER["REQUEST_URI"];
-	$topic='['.$conf->global->MAIN_APPLICATION_TITLE.'] '.$langs->transnoentitiesnoconv("NewPaypalPaymentFailed");
+	$topic='['.$appli.'] '.$langs->transnoentitiesnoconv("NewPaypalPaymentFailed");
 	$content=$langs->transnoentitiesnoconv("NewPaypalPaymentFailed")."\ntag=".$fulltag."\ntoken=".$token." paymentType=".$paymentType." currencycodeType=".$currencyCodeType." payerId=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt;
 	require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
 	$mailfile = new CMailFile($topic, $sendto, $from, $content);
diff --git a/htdocs/public/paypal/paymentok.php b/htdocs/public/paypal/paymentok.php
index ddb779d621e..e3f2ed201e5 100644
--- a/htdocs/public/paypal/paymentok.php
+++ b/htdocs/public/paypal/paymentok.php
@@ -188,8 +188,21 @@ if ($PAYPALTOKEN)
 				$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
 				//$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
 
+				// Define link to login card
+				$appli=constant('DOL_APPLICATION_TITLE');
+				if (! empty($conf->global->MAIN_APPLICATION_TITLE))
+				{
+				    $appli=$conf->global->MAIN_APPLICATION_TITLE;
+				    if (preg_match('/\d\.\d/', $appli))
+				    {
+				        if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli.=" (".DOL_VERSION.")";	// If new title contains a version that is different than core
+				    }
+				    else $appli.=" ".DOL_VERSION;
+				}
+				else $appli.=" ".DOL_VERSION;
+				
 				$urlback=$_SERVER["REQUEST_URI"];
-				$topic='['.$conf->global->MAIN_APPLICATION_TITLE.'] '.$langs->transnoentitiesnoconv("NewPaypalPaymentReceived");
+				$topic='['.$appli.'] '.$langs->transnoentitiesnoconv("NewPaypalPaymentReceived");
 				$tmptag=dolExplodeIntoArray($fulltag,'.','=');
 				$content="";
 				if (! empty($tmptag['MEM']))
@@ -258,8 +271,21 @@ if ($PAYPALTOKEN)
 				$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
 				//$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
 
+				// Define link to login card
+				$appli=constant('DOL_APPLICATION_TITLE');
+				if (! empty($conf->global->MAIN_APPLICATION_TITLE))
+				{
+				    $appli=$conf->global->MAIN_APPLICATION_TITLE;
+				    if (preg_match('/\d\.\d/', $appli))
+				    {
+				        if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli.=" (".DOL_VERSION.")";	// If new title contains a version that is different than core
+				    }
+				    else $appli.=" ".DOL_VERSION;
+				}
+				else $appli.=" ".DOL_VERSION;
+				
 				$urlback=$_SERVER["REQUEST_URI"];
-				$topic='['.$conf->global->MAIN_APPLICATION_TITLE.'] '.$langs->transnoentitiesnoconv("ValidationOfPaypalPaymentFailed");
+				$topic='['.$appli.'] '.$langs->transnoentitiesnoconv("ValidationOfPaypalPaymentFailed");
 				$content="";
 				$content.=$langs->transnoentitiesnoconv("PaypalConfirmPaymentPageWasCalledButFailed")."\n";
 				$content.="\n";
diff --git a/htdocs/public/stripe/newpayment.php b/htdocs/public/stripe/newpayment.php
index 71f581000b2..0d6cefd357a 100644
--- a/htdocs/public/stripe/newpayment.php
+++ b/htdocs/public/stripe/newpayment.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2017		Alexandre Spangaro		<aspangaro@zendsi.com>
  * Copyright (C) 2017		Saasprov				<saasprov@gmail.com>
+ * Copyright (C) 2017       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
@@ -35,6 +36,7 @@ if (empty($conf->stripe->enabled)) accessforbidden('',0,0,1);
 
 $langs->load("main");
 $langs->load("other");
+$langs->load("paybox");     // File with generic data
 $langs->load("stripe");
 
 $source=GETPOST("source",'alpha');
diff --git a/htdocs/stripe/admin/stripe.php b/htdocs/stripe/admin/stripe.php
index 6274197a301..3dd238b2f1d 100644
--- a/htdocs/stripe/admin/stripe.php
+++ b/htdocs/stripe/admin/stripe.php
@@ -36,8 +36,7 @@ $langs->load("paypal");
 $langs->load("paybox");
 $langs->load("stripe");
 
-if (!$user->admin)
-  accessforbidden();
+if (! $user->admin) accessforbidden();
   
 $action = GETPOST('action','alpha');
 
@@ -96,6 +95,8 @@ if ($action=="setlive")
  *	View
  */
 
+$form=new Form($db);
+
 $SECRET_TEST_KEY="sk_test_xxxxxxxxxxxxxxxxxxxxxxxx"; // Stripe test secret key
 if (empty($conf->global->STRIPE_TEST_SECRET_KEY)) $conf->global->STRIPE_TEST_SECRET_KEY = $SECRET_TEST_KEY;
 $PUBLISHABLE_TEST_KEY="pk_test_xxxxxxxxxxxxxxxxxxxxxxxx"; // Stripe test publishable key
@@ -108,10 +109,8 @@ if (empty($conf->global->STRIPE_LIVE_PUBLISHABLE_KEY)) $conf->global->STRIPE_LIV
 
 llxHeader('',$langs->trans("StripeSetup"));
 
-
 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
 print load_fiche_titre($langs->trans("ModuleSetup").' Stripe',$linkback);
-print '<br>';
 
 $head=stripeadmin_prepare_head();
 
@@ -119,22 +118,19 @@ print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="action" value="setvalue">';
 
-dol_fiche_head($head, 'stripeaccount', '');
+dol_fiche_head($head, 'stripeaccount', '', -1);
 
 print $langs->trans("StripeDesc")."<br>\n";
 
 print '<br>';
 
-$var=true;
-
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("AccountParameter").'</td>';
 print '<td>'.$langs->trans("Value").'</td>';
 print "</tr>\n";
 
-$var=!$var;
-print '<tr '.$bc[$var].'>';
+print '<tr class="oddeven">';
 print '<td class="titlefield fieldrequired">';
 print $langs->trans("StripeLiveEnabled").'</td><td>';
 if (!empty($conf->global->STRIPE_LIVE))
@@ -149,29 +145,25 @@ else
 }
 print '</td></tr>';
 
-$var=!$var;
-print '<tr '.$bc[$var].'><td>';
+print '<tr class="oddeven"><td>';
 print '<span class="titlefield fieldrequired">'.$langs->trans("STRIPE_TEST_SECRET_KEY").'</span></td><td>';
 print '<input size="32" type="text" name="STRIPE_TEST_SECRET_KEY" value="'.$conf->global->STRIPE_TEST_SECRET_KEY.'">';
 print '<br>'.$langs->trans("Example").': sk_test_xxxxxxxxxxxxxxxxxxxxxxxx';
 print '</td></tr>';
 
-$var=!$var;
-print '<tr '.$bc[$var].'><td>';
+print '<tr class="oddeven"><td>';
 print '<span class="fieldrequired">'.$langs->trans("STRIPE_TEST_PUBLISHABLE_KEY").'</span></td><td>';
 print '<input size="32" type="text" name="STRIPE_TEST_PUBLISHABLE_KEY" value="'.$conf->global->STRIPE_TEST_PUBLISHABLE_KEY.'">';
 print '<br>'.$langs->trans("Example").': pk_test_xxxxxxxxxxxxxxxxxxxxxxxx';
 print '</td></tr>';
 
-$var=!$var;
-print '<tr '.$bc[$var].'><td>';
+print '<tr class="oddeven"><td>';
 print '<span class="fieldrequired">'.$langs->trans("STRIPE_LIVE_SECRET_KEY").'</span></td><td>';
 print '<input size="32" type="text" name="STRIPE_LIVE_SECRET_KEY" value="'.$conf->global->STRIPE_LIVE_SECRET_KEY.'">';
 print '<br>'.$langs->trans("Example").': sk_live_xxxxxxxxxxxxxxxxxxxxxxxx';
 print '</td></tr>';
 
-$var=!$var;
-print '<tr '.$bc[$var].'><td>';
+print '<tr class="oddeven"><td>';
 print '<span class="fieldrequired">'.$langs->trans("STRIPE_LIVE_PUBLISHABLE_KEY").'</span></td><td>';
 print '<input size="32" type="text" name="STRIPE_LIVE_PUBLISHABLE_KEY" value="'.$conf->global->STRIPE_LIVE_PUBLISHABLE_KEY.'">';
 print '<br>'.$langs->trans("Example").': pk_live_xxxxxxxxxxxxxxxxxxxxxxxx';
@@ -187,29 +179,25 @@ print '<td>'.$langs->trans("UsageParameter").'</td>';
 print '<td>'.$langs->trans("Value").'</td>';
 print "</tr>\n";
 
-$var=!$var;
-print '<tr '.$bc[$var].'><td>';
+print '<tr class="oddeven"><td>';
 print $langs->trans("VendorName").'</td><td>';
 print '<input size="64" type="text" name="STRIPE_CREDITOR" value="'.$conf->global->STRIPE_CREDITOR.'">';
 print '<br>'.$langs->trans("Example").': '.$mysoc->name;
 print '</td></tr>';
 
-$var=!$var;
-print '<tr '.$bc[$var].'><td>';
+print '<tr class="oddeven"><td>';
 print $langs->trans("CSSUrlForPaymentForm").'</td><td>';
 print '<input size="64" type="text" name="STRIPE_CSS_URL" value="'.$conf->global->STRIPE_CSS_URL.'">';
 print '<br>'.$langs->trans("Example").': http://mysite/mycss.css';
 print '</td></tr>';
 
-$var=!$var;
-print '<tr '.$bc[$var].'><td>';
+print '<tr class="oddeven"><td>';
 print $langs->trans("MessageOK").'</td><td>';
 $doleditor=new DolEditor('STRIPE_MESSAGE_OK',$conf->global->STRIPE_MESSAGE_OK,'',100,'dolibarr_details','In',false,true,true,ROWS_2,'90%');
 $doleditor->Create();
 print '</td></tr>';
 
-$var=!$var;
-print '<tr '.$bc[$var].'><td>';
+print '<tr class="oddeven"><td>';
 print $langs->trans("MessageKO").'</td><td>';
 $doleditor=new DolEditor('STRIPE_MESSAGE_KO',$conf->global->STRIPE_MESSAGE_KO,'',100,'dolibarr_details','In',false,true,true,ROWS_2,'90%');
 $doleditor->Create();
@@ -225,35 +213,128 @@ print '</form>';
 
 print '<br><br>';
 
-/*
+
+$token='';
+
+
+// Url list
 print '<u>'.$langs->trans("FollowingUrlAreAvailableToMakePayments").':</u><br>';
 print img_picto('','object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnFreeAmount",$servicename).':<br>';
-print '<b>'.DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?amount=<i>9.99</i>&tag=<i>your_free_tag</i></b>'."<br>\n";
+print '<strong>'.getStripePaymentUrl(1,'free')."</strong><br><br>\n";
 if (! empty($conf->commande->enabled))
 {
 	print img_picto('','object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnOrder",$servicename).':<br>';
-	print '<b>'.DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?source=order&ref=<i>order_ref</i></b>'."<br>\n";
+	print '<strong>'.getStripePaymentUrl(1,'order')."</strong><br>\n";
+	if (! empty($conf->global->STRIPE_SECURITY_TOKEN) && ! empty($conf->global->STRIPE_SECURITY_TOKEN_UNIQUE))
+	{
+	    $langs->load("orders");
+	    print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+	    print $langs->trans("EnterRefToBuildUrl",$langs->transnoentitiesnoconv("Order")).': ';
+        print '<input type="text class="flat" id="generate_order_ref" name="generate_order_ref" value="'.GETPOST('generate_order_ref','alpha').'" size="10">';
+        print '<input type="submit" class="none" value="'.$langs->trans("GetSecuredUrl").'">';
+        if (GETPOST('generate_order_ref','alpha'))
+        {
+            print '<br> -> <strong>';
+            $url=getStripePaymentUrl(0,'order',GETPOST('generate_order_ref','alpha'));
+            print $url;
+            print "</strong><br>\n";
+        }
+        print '</form>';
+	}
+	print '<br>';
 }
 if (! empty($conf->facture->enabled))
 {
 	print img_picto('','object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnInvoice",$servicename).':<br>';
-	print '<b>'.DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?source=invoice&ref=<i>invoice_ref</i></b>'."<br>\n";
+	print '<strong>'.getStripePaymentUrl(1,'invoice')."</strong><br>\n";
+	if (! empty($conf->global->STRIPE_SECURITY_TOKEN) && ! empty($conf->global->STRIPE_SECURITY_TOKEN_UNIQUE))
+	{
+	    $langs->load("bills");
+	    print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+	    print $langs->trans("EnterRefToBuildUrl",$langs->transnoentitiesnoconv("Invoice")).': ';
+        print '<input type="text class="flat" id="generate_invoice_ref" name="generate_invoice_ref" value="'.GETPOST('generate_invoice_ref','alpha').'" size="10">';
+        print '<input type="submit" class="none" value="'.$langs->trans("GetSecuredUrl").'">';
+        if (GETPOST('generate_invoice_ref','alpha'))
+        {
+            print '<br> -> <strong>';
+            $url=getPaypalPaymentUrl(0,'invoice',GETPOST('generate_invoice_ref','alpha'));
+            print $url;
+            print "</strong><br>\n";
+        }
+        print '</form>';
+	}
+	print '<br>';
 }
 if (! empty($conf->contrat->enabled))
 {
 	print img_picto('','object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnContractLine",$servicename).':<br>';
-	print '<b>'.DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?source=contractline&ref=<i>contractline_ref</i></b>'."<br>\n";
+	print '<strong>'.getStripePaymentUrl(1,'contractline')."</strong><br>\n";
+	if (! empty($conf->global->STRIPE_SECURITY_TOKEN) && ! empty($conf->global->STRIPE_SECURITY_TOKEN_UNIQUE))
+	{
+	    $langs->load("contract");
+	    print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+	    print $langs->trans("EnterRefToBuildUrl",$langs->transnoentitiesnoconv("Contract")).': ';
+        print '<input type="text class="flat" id="generate_contract_ref" name="generate_contract_ref" value="'.GETPOST('generate_contract_ref','alpha').'" size="10">';
+        print '<input type="submit" class="none" value="'.$langs->trans("GetSecuredUrl").'">';
+        if (GETPOST('generate_contract_ref'))
+        {
+            print '<br> -> <strong>';
+            $url=getPaypalPaymentUrl(0,'contractline',GETPOST('generate_contract_ref','alpha'));
+            print $url;
+            print "</strong><br>\n";
+        }
+        print '</form>';
+	}
+	print '<br>';
 }
 if (! empty($conf->adherent->enabled))
 {
 	print img_picto('','object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnMemberSubscription",$servicename).':<br>';
-	print '<b>'.DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?source=membersubscription&ref=<i>member_ref</i></b>'."<br>\n";
+	print '<strong>'.getStripePaymentUrl(1,'membersubscription')."</strong><br>\n";
+	if (! empty($conf->global->STRIPE_SECURITY_TOKEN) && ! empty($conf->global->STRIPE_SECURITY_TOKEN_UNIQUE))
+	{
+	    $langs->load("members");
+	    print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+	    print $langs->trans("EnterRefToBuildUrl",$langs->transnoentitiesnoconv("Member")).': ';
+        print '<input type="text class="flat" id="generate_member_ref" name="generate_member_ref" value="'.GETPOST('generate_member_ref','alpha').'" size="10">';
+        print '<input type="submit" class="none" value="'.$langs->trans("GetSecuredUrl").'">';
+        if (GETPOST('generate_member_ref'))
+        {
+            print '<br> -> <strong>';
+            $url=getPaypalPaymentUrl(0,'membersubscription',GETPOST('generate_member_ref','alpha'));
+            print $url;
+            print "</strong><br>\n";
+        }
+        print '</form>';
+	}
 }
 
 print "<br>";
 print info_admin($langs->trans("YouCanAddTagOnUrl"));
-*/
+
+if (! empty($conf->use_javascript_ajax))
+{
+	print "\n".'<script type="text/javascript">';
+	print '$(document).ready(function () {
+            $("#apidoca").hide();
+            $("#apidoca").click(function() {
+                $("#apidoc").show();
+            	$("#apidoca").hide();
+            });
+
+            $("#generate_token").click(function() {
+            	$.get( "'.DOL_URL_ROOT.'/core/ajax/security.php", {
+            		action: \'getrandompassword\',
+            		generic: true
+				},
+				function(token) {
+					$("#STRIPE_SECURITY_TOKEN").val(token);
+				});
+            });
+    });';
+	print '</script>';
+}
+
 
 llxFooter();
-
 $db->close();

From 169e63d49a5108737f5d951a477e82f54badbb1f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 13 May 2017 22:23:03 +0200
Subject: [PATCH 340/505] Fix set of background for left menu

---
 htdocs/theme/eldy/style.css.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 92424afbb55..a8e7729f31b 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -918,6 +918,7 @@ td.showDragHandle {
 	display: table-cell;
 	border-right: 1px solid #d0d0d0;
 	box-shadow: 3px 0 6px -2px #eee;
+	background: rgb(<?php echo $colorbackvmenu1; ?>);
 }
 div.blockvmenulogo
 {

From 9e4e72baee649d03ca33e5eefaf0f8fde66379b7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 14 May 2017 05:26:19 +0200
Subject: [PATCH 341/505] Enhance module stripe

---
 htdocs/langs/en_US/paybox.lang        |    1 +
 htdocs/public/payment/newpayment.php  |  150 +--
 htdocs/public/paypal/newpayment.php   |   94 +-
 htdocs/public/stripe/index.php        |    2 +-
 htdocs/public/stripe/newpayment.php   | 1278 +++++++++++++++++++++----
 htdocs/stripe/admin/stripe.php        |   46 +-
 htdocs/{public => }/stripe/config.php |   14 +-
 7 files changed, 1276 insertions(+), 309 deletions(-)
 rename htdocs/{public => }/stripe/config.php (82%)

diff --git a/htdocs/langs/en_US/paybox.lang b/htdocs/langs/en_US/paybox.lang
index c0a55888e7c..91fe071627c 100644
--- a/htdocs/langs/en_US/paybox.lang
+++ b/htdocs/langs/en_US/paybox.lang
@@ -11,6 +11,7 @@ YourEMail=Email to receive payment confirmation
 Creditor=Creditor
 PaymentCode=Payment code
 PayBoxDoPayment=Go on payment
+ToPay=Do payment
 YouWillBeRedirectedOnPayBox=You will be redirected on secured Paybox page to input you credit card information
 Continue=Next
 ToOfferALinkForOnlinePayment=URL for %s payment
diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index 1ea8e7385ea..744f477782e 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2001-2002	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
- * Copyright (C) 2006-2012	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2006-2017	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2009-2012	Regis Houssin			<regis.houssin@capnetworks.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -24,7 +24,6 @@
  *     	\file       htdocs/public/payment/newpayment.php
  *		\ingroup    core
  *		\brief      File to offer a way to make a payment for a particular Dolibarr entity
- *		\author	    Laurent Destailleur
  */
 
 define("NOLOGIN",1);		// This means this output page does not require to be logged.
@@ -43,7 +42,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 
 // Security check
-//if (empty($conf->paypal->enabled)) accessforbidden('',0,0,1);
+// No check on module enabled. Done later according to $validpaymentmethod
 
 $langs->load("main");
 $langs->load("other");
@@ -502,10 +501,13 @@ if (GETPOST("source") == 'order')
 		$result=$order->fetch_thirdparty($order->socid);
 	}
 
-	$amount=$order->total_ttc;
-    if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
-    $amount=price2num($amount);
-
+    if ($action != 'dopayment') // Do not change amount if we just click on first dopayment
+    {
+    	$amount=$order->total_ttc;
+        if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
+        $amount=price2num($amount);
+    }
+    
 	$fulltag='ORD='.$order->ref.'.CUS='.$order->thirdparty->id;
 	//$fulltag.='.NAM='.strtr($order->thirdparty->name,"-"," ");
 	if (! empty($TAG)) { $tag=$TAG; $fulltag.='.TAG='.$TAG; }
@@ -609,10 +611,13 @@ if (GETPOST("source") == 'invoice')
 		$result=$invoice->fetch_thirdparty($invoice->socid);
 	}
 
-	$amount=price2num($invoice->total_ttc - $invoice->getSommePaiement());
-    if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
-    $amount=price2num($amount);
-
+    if ($action != 'dopayment') // Do not change amount if we just click on first dopayment
+    {
+    	$amount=price2num($invoice->total_ttc - $invoice->getSommePaiement());
+        if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
+        $amount=price2num($amount);
+    }
+    
 	$fulltag='INV='.$invoice->ref.'.CUS='.$invoice->thirdparty->id;
 	//$fulltag.='.NAM='.strtr($invoice->thirdparty->name,"-"," ");
 	if (! empty($TAG)) { $tag=$TAG; $fulltag.='.TAG='.$TAG; }
@@ -733,35 +738,38 @@ if (GETPOST("source") == 'contractline')
 		}
 	}
 
-	$amount=$contractline->total_ttc;
-	if ($contractline->fk_product)
-	{
-		$product=new Product($db);
-		$result=$product->fetch($contractline->fk_product);
-
-		// We define price for product (TODO Put this in a method in product class)
-		if (! empty($conf->global->PRODUIT_MULTIPRICES))
-		{
-			$pu_ht = $product->multiprices[$contract->thirdparty->price_level];
-			$pu_ttc = $product->multiprices_ttc[$contract->thirdparty->price_level];
-			$price_base_type = $product->multiprices_base_type[$contract->thirdparty->price_level];
-		}
-		else
-		{
-			$pu_ht = $product->price;
-			$pu_ttc = $product->price_ttc;
-			$price_base_type = $product->price_base_type;
-		}
-
-		$amount=$pu_ttc;
-		if (empty($amount))
-		{
-			dol_print_error('','ErrorNoPriceDefinedForThisProduct');
-			exit;
-		}
-	}
-    if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
-    $amount=price2num($amount);
+    if ($action != 'dopayment') // Do not change amount if we just click on first dopayment
+    {
+    	$amount=$contractline->total_ttc;
+    	if ($contractline->fk_product)
+    	{
+    		$product=new Product($db);
+    		$result=$product->fetch($contractline->fk_product);
+    
+    		// We define price for product (TODO Put this in a method in product class)
+    		if (! empty($conf->global->PRODUIT_MULTIPRICES))
+    		{
+    			$pu_ht = $product->multiprices[$contract->thirdparty->price_level];
+    			$pu_ttc = $product->multiprices_ttc[$contract->thirdparty->price_level];
+    			$price_base_type = $product->multiprices_base_type[$contract->thirdparty->price_level];
+    		}
+    		else
+    		{
+    			$pu_ht = $product->price;
+    			$pu_ttc = $product->price_ttc;
+    			$price_base_type = $product->price_base_type;
+    		}
+    
+    		$amount=$pu_ttc;
+    		if (empty($amount))
+    		{
+    			dol_print_error('','ErrorNoPriceDefinedForThisProduct');
+    			exit;
+    		}
+    	}
+        if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
+        $amount=price2num($amount);
+    }
 
 	$fulltag='COL='.$contractline->ref.'.CON='.$contract->ref.'.CUS='.$contract->thirdparty->id.'.DAT='.dol_print_date(dol_now(),'%Y%m%d%H%M');
 	//$fulltag.='.NAM='.strtr($contract->thirdparty->name,"-"," ");
@@ -911,10 +919,13 @@ if (GETPOST("source") == 'membersubscription')
 		$subscription=new Subscription($db);
 	}
 
-	$amount=$subscription->total_ttc;
-    if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
-    $amount=price2num($amount);
-
+    if ($action != 'dopayment') // Do not change amount if we just click on first dopayment
+    {
+    	$amount=$subscription->total_ttc;
+        if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
+        $amount=price2num($amount);
+    }
+    
 	$fulltag='MEM='.$member->id.'.DAT='.dol_print_date(dol_now(),'%Y%m%d%H%M');
 	if (! empty($TAG)) { $tag=$TAG; $fulltag.='.TAG='.$TAG; }
 	$fulltag=dol_string_unaccent($fulltag);
@@ -1035,35 +1046,42 @@ if ($mesg) print '<tr><td align="center" colspan="2"><br><div class="warning">'.
 print '</table>'."\n";
 print "\n";
 
-if ($found && ! $error)	// We are in a management option and no error
+if ($action != 'dopayment')
 {
-    // Buttons for all payments registration methods
-    
-    if (! empty($conf->paypal->enabled))
+    if ($found && ! $error)	// We are in a management option and no error
     {
-    	if (empty($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY)) $conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY='integral';
-    
-    	if ($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY == 'integral')
-    	{
-    		print '<br><input class="button" type="submit" name="dopayment_paypal" value="'.$langs->trans("PaypalOrCBDoPayment").'">';
-    	}
-    	if ($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY == 'paypalonly')
-    	{
-    		print '<br><input class="button" type="submit" name="dopayment_paypal" value="'.$langs->trans("PaypalDoPayment").'">';
-    	}
-    }
-
-    if (! empty($conf->paypal->enabled))
-    {
-    
+        // Buttons for all payments registration methods
         
-    }
+        if (! empty($conf->paypal->enabled))
+        {
+        	if (empty($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY)) $conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY='integral';
+        
+        	if ($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY == 'integral')
+        	{
+        		print '<br><input class="button" type="submit" name="dopayment_paypal" value="'.$langs->trans("PaypalOrCBDoPayment").'">';
+        	}
+        	if ($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY == 'paypalonly')
+        	{
+        		print '<br><input class="button" type="submit" name="dopayment_paypal" value="'.$langs->trans("PaypalDoPayment").'">';
+        	}
+        }
     
-    // TODO Other methods
+        if (! empty($conf->paybox->enabled))
+        {
+        
+            
+        }
+        
+        // TODO Other methods
+    }
+    else
+    {
+    	dol_print_error_email('ERRORNEWPAYMENTPAYPAL');
+    }
 }
 else
 {
-	dol_print_error_email('ERRORNEWPAYMENTPAYPAL');
+    // Print
 }
 
 print '</td></tr>'."\n";
diff --git a/htdocs/public/paypal/newpayment.php b/htdocs/public/paypal/newpayment.php
index cd963eec798..c9cedcfd32d 100644
--- a/htdocs/public/paypal/newpayment.php
+++ b/htdocs/public/paypal/newpayment.php
@@ -418,10 +418,13 @@ if (GETPOST("source") == 'order')
 		$result=$order->fetch_thirdparty($order->socid);
 	}
 
-	$amount=$order->total_ttc;
-    if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
-    $amount=price2num($amount);
-
+    if ($action != 'dopayment') // Do not change amount if we just click on first dopayment
+    {
+    	$amount=$order->total_ttc;
+        if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
+        $amount=price2num($amount);
+    }
+    
 	$fulltag='ORD='.$order->ref.'.CUS='.$order->thirdparty->id;
 	//$fulltag.='.NAM='.strtr($order->thirdparty->name,"-"," ");
 	if (! empty($TAG)) { $tag=$TAG; $fulltag.='.TAG='.$TAG; }
@@ -525,10 +528,13 @@ if (GETPOST("source") == 'invoice')
 		$result=$invoice->fetch_thirdparty($invoice->socid);
 	}
 
-	$amount=price2num($invoice->total_ttc - $invoice->getSommePaiement());
-    if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
-    $amount=price2num($amount);
-
+    if ($action != 'dopayment') // Do not change amount if we just click on first dopayment
+    {
+    	$amount=price2num($invoice->total_ttc - $invoice->getSommePaiement());
+        if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
+        $amount=price2num($amount);
+    }
+    
 	$fulltag='INV='.$invoice->ref.'.CUS='.$invoice->thirdparty->id;
 	//$fulltag.='.NAM='.strtr($invoice->thirdparty->name,"-"," ");
 	if (! empty($TAG)) { $tag=$TAG; $fulltag.='.TAG='.$TAG; }
@@ -649,35 +655,38 @@ if (GETPOST("source") == 'contractline')
 		}
 	}
 
-	$amount=$contractline->total_ttc;
-	if ($contractline->fk_product)
-	{
-		$product=new Product($db);
-		$result=$product->fetch($contractline->fk_product);
-
-		// We define price for product (TODO Put this in a method in product class)
-		if (! empty($conf->global->PRODUIT_MULTIPRICES))
-		{
-			$pu_ht = $product->multiprices[$contract->thirdparty->price_level];
-			$pu_ttc = $product->multiprices_ttc[$contract->thirdparty->price_level];
-			$price_base_type = $product->multiprices_base_type[$contract->thirdparty->price_level];
-		}
-		else
-		{
-			$pu_ht = $product->price;
-			$pu_ttc = $product->price_ttc;
-			$price_base_type = $product->price_base_type;
-		}
-
-		$amount=$pu_ttc;
-		if (empty($amount))
-		{
-			dol_print_error('','ErrorNoPriceDefinedForThisProduct');
-			exit;
-		}
-	}
-    if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
-    $amount=price2num($amount);
+    if ($action != 'dopayment') // Do not change amount if we just click on first dopayment
+    {
+    	$amount=$contractline->total_ttc;
+    	if ($contractline->fk_product)
+    	{
+    		$product=new Product($db);
+    		$result=$product->fetch($contractline->fk_product);
+    
+    		// We define price for product (TODO Put this in a method in product class)
+    		if (! empty($conf->global->PRODUIT_MULTIPRICES))
+    		{
+    			$pu_ht = $product->multiprices[$contract->thirdparty->price_level];
+    			$pu_ttc = $product->multiprices_ttc[$contract->thirdparty->price_level];
+    			$price_base_type = $product->multiprices_base_type[$contract->thirdparty->price_level];
+    		}
+    		else
+    		{
+    			$pu_ht = $product->price;
+    			$pu_ttc = $product->price_ttc;
+    			$price_base_type = $product->price_base_type;
+    		}
+    
+    		$amount=$pu_ttc;
+    		if (empty($amount))
+    		{
+    			dol_print_error('','ErrorNoPriceDefinedForThisProduct');
+    			exit;
+    		}
+    	}
+        if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
+        $amount=price2num($amount);
+    }
 
 	$fulltag='COL='.$contractline->ref.'.CON='.$contract->ref.'.CUS='.$contract->thirdparty->id.'.DAT='.dol_print_date(dol_now(),'%Y%m%d%H%M');
 	//$fulltag.='.NAM='.strtr($contract->thirdparty->name,"-"," ");
@@ -827,10 +836,13 @@ if (GETPOST("source") == 'membersubscription')
 		$subscription=new Subscription($db);
 	}
 
-	$amount=$subscription->total_ttc;
-    if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
-    $amount=price2num($amount);
-
+    if ($action != 'dopayment') // Do not change amount if we just click on first dopayment
+    {
+    	$amount=$subscription->total_ttc;
+        if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
+        $amount=price2num($amount);
+    }
+    
 	$fulltag='MEM='.$member->id.'.DAT='.dol_print_date(dol_now(),'%Y%m%d%H%M');
 	if (! empty($TAG)) { $tag=$TAG; $fulltag.='.TAG='.$TAG; }
 	$fulltag=dol_string_unaccent($fulltag);
diff --git a/htdocs/public/stripe/index.php b/htdocs/public/stripe/index.php
index 0b7ad1c82e4..6a86f3ed88e 100644
--- a/htdocs/public/stripe/index.php
+++ b/htdocs/public/stripe/index.php
@@ -16,7 +16,7 @@
  */
 
 /**
- *     	\file       htdocs/public/paybox/index.php
+ *     	\file       htdocs/public/stripe/index.php
  *		\ingroup    core
  *		\brief      A redirect page to an error
  *		\author	    Laurent Destailleur
diff --git a/htdocs/public/stripe/newpayment.php b/htdocs/public/stripe/newpayment.php
index 0d6cefd357a..95f0f9f2134 100644
--- a/htdocs/public/stripe/newpayment.php
+++ b/htdocs/public/stripe/newpayment.php
@@ -23,213 +23,1145 @@
 *  \brief      Page to do payment with Stripe
 */
 
-define("NOLOGIN",1);
-define("NOCSRFCHECK",1);
+define("NOLOGIN",1);		// This means this output page does not require to be logged.
+define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.
+
+// For MultiCompany module.
+// Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
+// TODO This should be useless. Because entity must be retreive from object ref and not from url.
+$entity=(! empty($_GET['entity']) ? (int) $_GET['entity'] : (! empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
+if (is_numeric($entity)) define("DOLENTITY", $entity);
 
 require '../../main.inc.php';
+
+require_once DOL_DOCUMENT_ROOT.'/stripe/config.php';
+/* included into config.php
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/stripe/lib/stripe.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/public/stripe/config.php';
 require_once DOL_DOCUMENT_ROOT.'/includes/stripe/init.php';
+*/
 
 // Security check
 if (empty($conf->stripe->enabled)) accessforbidden('',0,0,1);
 
 $langs->load("main");
+$langs->load("companies");
 $langs->load("other");
 $langs->load("paybox");     // File with generic data
 $langs->load("stripe");
 
-$source=GETPOST("source",'alpha');
-$ref=GETPOST('ref','alpha');
+$action=GETPOST('action','alpha');
 
-$form = new Form($db);
+// Input are:
+// type ('invoice','order','contractline'),
+// id (object id),
+// amount (required if id is empty),
+// tag (a free text, required if type is empty)
+// currency (iso code)
+
+$suffix=GETPOST("suffix",'alpha');
+$amount=price2num(GETPOST("amount"));
+if (! GETPOST("currency",'alpha')) $currency=$conf->currency;
+else $currency=GETPOST("currency",'alpha');
+
+if (! $action)
+{
+    if (! GETPOST("amount") && ! GETPOST("source"))
+    {
+        dol_print_error('',$langs->trans('ErrorBadParameters')." - amount or source");
+        exit;
+    }
+    if (is_numeric($amount) && ! GETPOST("tag") && ! GETPOST("source"))
+    {
+        dol_print_error('',$langs->trans('ErrorBadParameters')." - tag or source");
+        exit;
+    }
+    if (GETPOST("source") && ! GETPOST("ref"))
+    {
+        dol_print_error('',$langs->trans('ErrorBadParameters')." - ref");
+        exit;
+    }
+}
+
+// Define $urlwithroot
+//$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
+//$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
+$urlwithroot=DOL_MAIN_URL_ROOT;						// This is to use same domain name than current
+
+$urlok=$urlwithroot.'/public/paypal/paymentok.php?';
+$urlko=$urlwithroot.'/public/paypal/paymentko.php?';
+
+// Complete urls for post treatment
+$SOURCE=GETPOST("source",'alpha');
+$ref=$REF=GETPOST('ref','alpha');
+$TAG=GETPOST("tag",'alpha');
+$FULLTAG=GETPOST("fulltag",'alpha');		// fulltag is tag with more informations
+$SECUREKEY=GETPOST("securekey");	        // Secure key
+$FULLTAG.=($FULLTAG?'.':'').'PM=stripe';
+
+if (! empty($SOURCE))
+{
+    $urlok.='source='.urlencode($SOURCE).'&';
+    $urlko.='source='.urlencode($SOURCE).'&';
+}
+if (! empty($REF))
+{
+    $urlok.='ref='.urlencode($REF).'&';
+    $urlko.='ref='.urlencode($REF).'&';
+}
+if (! empty($TAG))
+{
+    $urlok.='tag='.urlencode($TAG).'&';
+    $urlko.='tag='.urlencode($TAG).'&';
+}
+if (! empty($FULLTAG))
+{
+    $urlok.='fulltag='.urlencode($FULLTAG).'&';
+    $urlko.='fulltag='.urlencode($FULLTAG).'&';
+}
+if (! empty($SECUREKEY))
+{
+    $urlok.='securekey='.urlencode($SECUREKEY).'&';
+    $urlko.='securekey='.urlencode($SECUREKEY).'&';
+}
+if (! empty($entity))
+{
+    $urlok.='entity='.urlencode($entity).'&';
+    $urlko.='entity='.urlencode($entity).'&';
+}
+$urlok=preg_replace('/&$/','',$urlok);  // Remove last &
+$urlko=preg_replace('/&$/','',$urlko);  // Remove last &
+
+// Check parameters
+/*
+$STRIPE_API_OK="";
+if ($urlok) $STRIPE_API_OK=$urlok;
+$STRIPE_API_KO="";
+if ($urlko) $STRIPE_API_KO=$urlko;
+if (empty($STRIPE_API_USER))
+{
+    dol_print_error('',"Paypal setup param STRIPE_API_USER not defined");
+    return -1;
+}
+if (empty($STRIPE_API_PASSWORD))
+{
+    dol_print_error('',"Paypal setup param STRIPE_API_PASSWORD not defined");
+    return -1;
+}
+if (empty($STRIPE_API_SIGNATURE))
+{
+    dol_print_error('',"Paypal setup param STRIPE_API_SIGNATURE not defined");
+    return -1;
+}
+*/
+
+
+// Check security token
+$valid=true;
+if (! empty($conf->global->STRIPE_SECURITY_TOKEN))
+{
+    if (! empty($conf->global->STRIPE_SECURITY_TOKEN_UNIQUE))
+    {
+        if ($SOURCE && $REF) $token = dol_hash($conf->global->STRIPE_SECURITY_TOKEN . $SOURCE . $REF, 2);    // Use the source in the hash to avoid duplicates if the references are identical
+        else $token = dol_hash($conf->global->STRIPE_SECURITY_TOKEN, 2);
+    }
+    else
+    {
+        $token = $conf->global->STRIPE_SECURITY_TOKEN;
+    }
+    if ($SECUREKEY != $token) $valid=false;
+
+    if (! $valid)
+    {
+        print '<div class="error">Bad value for key.</div>';
+        //print 'SECUREKEY='.$SECUREKEY.' token='.$token.' valid='.$valid;
+        exit;
+    }
+}
+
+
+/*
+ * Actions
+ */
+
+if ($action == 'dopayment')    // We click on button Create payment that lead on this page
+{
+    if (GETPOST('newamount')) $amount = GETPOST('newamount');
+    else 
+    {
+        setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Amount")), null, 'errors');
+        $action = '';
+    }
+}
+
+if ($action == 'charge')
+{
+    dol_syslog("POST keys  : ".join(',', array_keys($_POST)));
+    dol_syslog("POST values: ".join(',', $_POST));
+    
+    $token = GETPOST("stripeToken");
+    $email = GETPOST("stripeEmail");
+
+    try {
+        $customer = \Stripe\Customer::create(array(
+            'email' => $email,
+            'card'  => $token
+            // TODO
+        ));
+         
+        $charge = \Stripe\Charge::create(array(
+            'customer' => $customer->id,
+            'amount'   => price2num($amount, 'MU'),
+            'currency' => $conf->currency,
+            // TODO
+            'description' => 'Invoice payment N: '.$ref
+        ));
+    } catch(\Stripe\Error\Card $e) {
+        // Since it's a decline, \Stripe\Error\Card will be caught
+        $body = $e->getJsonBody();
+        $err  = $body['error'];
+    
+        print('Status is:' . $e->getHttpStatus() . "\n");
+        print('Type is:' . $err['type'] . "\n");
+        print('Code is:' . $err['code'] . "\n");
+        // param is '' in this case
+        print('Param is:' . $err['param'] . "\n");
+        print('Message is:' . $err['message'] . "\n");
+    
+        setEventMessages($e->getMessage(), null, 'errors');
+        $action='';
+    } catch (\Stripe\Error\RateLimit $e) {
+        // Too many requests made to the API too quickly
+        setEventMessages($e->getMessage(), null, 'errors');
+        $action='';
+    } catch (\Stripe\Error\InvalidRequest $e) {
+        // Invalid parameters were supplied to Stripe's API
+        setEventMessages($e->getMessage(), null, 'errors');
+        $action='';
+    } catch (\Stripe\Error\Authentication $e) {
+        // Authentication with Stripe's API failed
+        // (maybe you changed API keys recently)
+        setEventMessages($e->getMessage(), null, 'errors');
+        $action='';
+    } catch (\Stripe\Error\ApiConnection $e) {
+        // Network communication with Stripe failed
+        setEventMessages($e->getMessage(), null, 'errors');
+        $action='';
+    } catch (\Stripe\Error\Base $e) {
+        // Display a very generic error to the user, and maybe send
+        // yourself an email
+        setEventMessages($e->getMessage(), null, 'errors');
+        $action='';
+    } catch (Exception $e) {
+        // Something else happened, completely unrelated to Stripe
+        setEventMessages($e->getMessage(), null, 'errors');
+        $action='';
+    }
+        
+    // TODO
+    dol_syslog("Action  Pay.");
+    
+    
+}
+
+
+/*
+ * View
+ */
+
+$head='';
+if (! empty($conf->global->STRIPE_CSS_URL)) $head='<link rel="stylesheet" type="text/css" href="'.$conf->global->STRIPE_CSS_URL.'?lang='.$langs->defaultlang.'">'."\n";
+
+$conf->dol_hide_topmenu=1;
+$conf->dol_hide_leftmenu=1;
+
+llxHeader($head, $langs->trans("PaymentForm"), '', '', 0, 0, '', '', '', 'onlinepaymentbody');
+
+if (! empty($STRIPE_API_SANDBOX))
+{
+    dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode'),'','warning');
+}
+
+// Common variables
+$creditor=$mysoc->name;
+$paramcreditor='STRIPE_CREDITOR_'.$suffix;
+if (! empty($conf->global->$paramcreditor)) $creditor=$conf->global->$paramcreditor;
+else if (! empty($conf->global->STRIPE_CREDITOR)) $creditor=$conf->global->STRIPE_CREDITOR;
+
+print '<span id="dolpaymentspan"></span>'."\n";
+print '<div class="center">'."\n";
+print '<form id="dolpaymentform" class="center" name="paymentform" action="'.$_SERVER["PHP_SELF"].'" method="POST">'."\n";
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'."\n";
+print '<input type="hidden" name="action" value="dopayment">'."\n";
+print '<input type="hidden" name="tag" value="'.GETPOST("tag",'alpha').'">'."\n";
+print '<input type="hidden" name="suffix" value="'.GETPOST("suffix",'alpha').'">'."\n";
+print '<input type="hidden" name="securekey" value="'.$SECUREKEY.'">'."\n";
+print '<input type="hidden" name="entity" value="'.$entity.'" />';
+print "\n";
+print '<!-- Form to send a Stripe payment -->'."\n";
+print '<!-- STRIPE_API_SANDBOX = '.$conf->global->STRIPE_API_SANDBOX.' -->'."\n";
+print '<!-- creditor = '.$creditor.' -->'."\n";
+print '<!-- urlok = '.$urlok.' -->'."\n";
+print '<!-- urlko = '.$urlko.' -->'."\n";
+print "\n";
+
+print '<table id="dolpaymenttable" summary="Payment form" class="center">'."\n";
+
+// Show logo (search order: logo defined by PAYBOX_LOGO_suffix, then PAYBOX_LOGO, then small company logo, large company logo, theme logo, common logo)
+$width=0;
+// Define logo and logosmall
+$logosmall=$mysoc->logo_small;
+$logo=$mysoc->logo;
+$paramlogo='STRIPE_LOGO_'.$suffix;
+if (! empty($conf->global->$paramlogo)) $logosmall=$conf->global->$paramlogo;
+else if (! empty($conf->global->STRIPE_LOGO)) $logosmall=$conf->global->STRIPE_LOGO;
+//print '<!-- Show logo (logosmall='.$logosmall.' logo='.$logo.') -->'."\n";
+// Define urllogo
+$urllogo='';
+if (! empty($logosmall) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$logosmall))
+{
+    $urllogo=DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode('thumbs/'.$logosmall);
+}
+elseif (! empty($logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$logo))
+{
+    $urllogo=DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode($logo);
+    $width=96;
+}
+// Output html code for logo
+if ($urllogo)
+{
+    print '<tr>';
+    print '<td align="center"><img id="dolpaymentlogo" title="'.$title.'" src="'.$urllogo.'"';
+    if ($width) print ' width="'.$width.'"';
+    print '></td>';
+    print '</tr>'."\n";
+}
+
+// Output introduction text
+$text='';
+if (! empty($conf->global->STRIPE_NEWFORM_TEXT))
+{
+    $langs->load("members");
+    if (preg_match('/^\((.*)\)$/',$conf->global->STRIPE_NEWFORM_TEXT,$reg)) $text.=$langs->trans($reg[1])."<br>\n";
+    else $text.=$conf->global->STRIPE_NEWFORM_TEXT."<br>\n";
+    $text='<tr><td align="center"><br>'.$text.'<br></td></tr>'."\n";
+}
+if (empty($text))
+{
+    $text.='<tr><td class="textpublicpayment"><br><strong>'.$langs->trans("WelcomeOnPaymentPage").'</strong><br></td></tr>'."\n";
+    $text.='<tr><td class="textpublicpayment"><br>'.$langs->trans("ThisScreenAllowsYouToPay",$creditor).'<br><br></td></tr>'."\n";
+}
+print $text;
+
+// Output payment summary form
+print '<tr><td align="center">';
+print '<table with="100%" id="tablepublicpayment">';
+print '<tr class="liste_total"><td align="left" colspan="2">'.$langs->trans("ThisIsInformationOnPayment").' :</td></tr>'."\n";
+
+$found=false;
+$error=0;
+$var=false;
+
+// Free payment
+if (! GETPOST("source"))
+{
+    $found=true;
+    $tag=GETPOST("tag");
+    $fulltag=$tag;
+    
+    // Creditor
+    print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
+    print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
+    print '<input type="hidden" name="creditor" value="'.$creditor.'">';
+    print '</td></tr>'."\n";
+
+    // Amount
+    print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
+    if (empty($amount)) print ' ('.$langs->trans("ToComplete").')';
+    print '</td><td class="CTableRow'.($var?'1':'2').'">';
+    if (empty($amount) || ! is_numeric($amount))
+    {
+        print '<input type="hidden" name="amount" value="'.GETPOST("amount",'int').'">';
+        print '<input class="flat" size=8 type="text" name="newamount" value="'.GETPOST("newamount","int").'">';
+    }
+    else {
+        print '<b>'.price($amount).'</b>';
+        print '<input type="hidden" name="amount" value="'.$amount.'">';
+        print '<input type="hidden" name="newamount" value="'.$amount.'">';
+    }
+    // Currency
+    print ' <b>'.$langs->trans("Currency".$currency).'</b>';
+    print '<input type="hidden" name="currency" value="'.$currency.'">';
+    print '</td></tr>'."\n";
+
+    // Tag
+
+    print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
+    print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
+    print '<input type="hidden" name="tag" value="'.$tag.'">';
+    print '<input type="hidden" name="fulltag" value="'.$fulltag.'">';
+    print '</td></tr>'."\n";
+
+    // We do not add fields shipToName, shipToStreet, shipToCity, shipToState, shipToCountryCode, shipToZip, shipToStreet2, phoneNum
+    // as they don't exists (buyer is unknown, tag is free).
+}
+
+
+// Payment on customer order
+if (GETPOST("source") == 'order')
+{
+    $found=true;
+    $langs->load("orders");
+
+    require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+
+    $order=new Commande($db);
+    $result=$order->fetch('',$ref);
+    if ($result < 0)
+    {
+        $mesg=$order->error;
+        $error++;
+    }
+    else
+    {
+        $result=$order->fetch_thirdparty($order->socid);
+    }
+
+    if ($action != 'dopayment') // Do not change amount if we just click on first dopayment
+    {
+        $amount=$order->total_ttc;
+        if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
+        $amount=price2num($amount);
+    }
+    
+    $fulltag='ORD='.$order->ref.'.CUS='.$order->thirdparty->id;
+    //$fulltag.='.NAM='.strtr($order->thirdparty->name,"-"," ");
+    if (! empty($TAG)) { $tag=$TAG; $fulltag.='.TAG='.$TAG; }
+    $fulltag=dol_string_unaccent($fulltag);
+
+    // Creditor
+
+    print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
+    print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
+    print '<input type="hidden" name="creditor" value="'.$creditor.'">';
+    print '</td></tr>'."\n";
+
+    // Debitor
+
+    print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("ThirdParty");
+    print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$order->thirdparty->name.'</b>';
+
+    // Object
+
+    $text='<b>'.$langs->trans("PaymentOrderRef",$order->ref).'</b>';
+    print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Designation");
+    print '</td><td class="CTableRow'.($var?'1':'2').'">'.$text;
+    print '<input type="hidden" name="source" value="'.GETPOST("source",'alpha').'">';
+    print '<input type="hidden" name="ref" value="'.$order->ref.'">';
+    print '</td></tr>'."\n";
+
+    // Amount
+
+    print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
+    if (empty($amount)) print ' ('.$langs->trans("ToComplete").')';
+    print '</td><td class="CTableRow'.($var?'1':'2').'">';
+    if (empty($amount) || ! is_numeric($amount))
+    {
+        print '<input type="hidden" name="amount" value="'.GETPOST("amount",'int').'">';
+        print '<input class="flat" size=8 type="text" name="newamount" value="'.GETPOST("newamount","int").'">';
+    }
+    else {
+        print '<b>'.price($amount).'</b>';
+        print '<input type="hidden" name="amount" value="'.$amount.'">';
+        print '<input type="hidden" name="newamount" value="'.$amount.'">';
+    }
+    // Currency
+    print ' <b>'.$langs->trans("Currency".$currency).'</b>';
+    print '<input type="hidden" name="currency" value="'.$currency.'">';
+    print '</td></tr>'."\n";
+
+    // Tag
+
+    print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
+    print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
+    print '<input type="hidden" name="tag" value="'.$tag.'">';
+    print '<input type="hidden" name="fulltag" value="'.$fulltag.'">';
+    print '</td></tr>'."\n";
+
+    // Shipping address
+    $shipToName=$order->thirdparty->name;
+    $shipToStreet=$order->thirdparty->address;
+    $shipToCity=$order->thirdparty->town;
+    $shipToState=$order->thirdparty->state_code;
+    $shipToCountryCode=$order->thirdparty->country_code;
+    $shipToZip=$order->thirdparty->zip;
+    $shipToStreet2='';
+    $phoneNum=$order->thirdparty->phone;
+    if ($shipToName && $shipToStreet && $shipToCity && $shipToCountryCode && $shipToZip)
+    {
+        print '<input type="hidden" name="shipToName" value="'.$shipToName.'">'."\n";
+        print '<input type="hidden" name="shipToStreet" value="'.$shipToStreet.'">'."\n";
+        print '<input type="hidden" name="shipToCity" value="'.$shipToCity.'">'."\n";
+        print '<input type="hidden" name="shipToState" value="'.$shipToState.'">'."\n";
+        print '<input type="hidden" name="shipToCountryCode" value="'.$shipToCountryCode.'">'."\n";
+        print '<input type="hidden" name="shipToZip" value="'.$shipToZip.'">'."\n";
+        print '<input type="hidden" name="shipToStreet2" value="'.$shipToStreet2.'">'."\n";
+        print '<input type="hidden" name="phoneNum" value="'.$phoneNum.'">'."\n";
+    }
+    else
+    {
+        print '<!-- Shipping address not complete, so we don t use it -->'."\n";
+    }
+    print '<input type="hidden" name="email" value="'.$order->thirdparty->email.'">'."\n";
+    print '<input type="hidden" name="desc" value="'.$langs->trans("Order").' '.$order->ref.'">'."\n";
+}
 
-$invoice = null;
 
 // Payment on customer invoice
-if ($source == 'invoice')
+if (GETPOST("source") == 'invoice')
 {
-	$found=true;
-	$langs->load("bills");
+    $found=true;
+    $langs->load("bills");
 
-	require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+    require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 
-	$invoice=new Facture($db);
-	$result=$invoice->fetch('',$ref);
-	if ($result < 0)
-	{
-		$mesg=$invoice->error;
-		$error++;
-	}
-	else
-	{
-		$result=$invoice->fetch_thirdparty($invoice->socid);
-	}
+    $invoice=new Facture($db);
+    $result=$invoice->fetch('',$ref);
+    if ($result < 0)
+    {
+        $mesg=$invoice->error;
+        $error++;
+    }
+    else
+    {
+        $result=$invoice->fetch_thirdparty($invoice->socid);
+    }
+    
+    if ($action != 'dopayment') // Do not change amount if we just click on first dopayment
+    {
+        $amount=price2num($invoice->total_ttc - $invoice->getSommePaiement());
+        if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
+        $amount=price2num($amount);
+    }
+    
+    $fulltag='INV='.$invoice->ref.'.CUS='.$invoice->thirdparty->id;
+    //$fulltag.='.NAM='.strtr($invoice->thirdparty->name,"-"," ");
+    if (! empty($TAG)) { $tag=$TAG; $fulltag.='.TAG='.$TAG; }
+    $fulltag=dol_string_unaccent($fulltag);
+    
+    // Creditor
+
+    print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
+    print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
+    print '<input type="hidden" name="creditor" value="'.$creditor.'">';
+    print '</td></tr>'."\n";
+
+    // Debitor
+
+    print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("ThirdParty");
+    print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$invoice->thirdparty->name.'</b>';
+
+    // Object
+
+    $text='<b>'.$langs->trans("PaymentInvoiceRef",$invoice->ref).'</b>';
+    print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Designation");
+    print '</td><td class="CTableRow'.($var?'1':'2').'">'.$text;
+    print '<input type="hidden" name="source" value="'.GETPOST("source",'alpha').'">';
+    print '<input type="hidden" name="ref" value="'.$invoice->ref.'">';
+    print '</td></tr>'."\n";
+
+    // Amount
+
+    print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
+    if (empty($amount)) print ' ('.$langs->trans("ToComplete").')';
+    print '</td><td class="CTableRow'.($var?'1':'2').'">';
+    if (empty($amount) || ! is_numeric($amount))
+    {
+        print '<input type="hidden" name="amount" value="'.GETPOST("amount",'int').'">';
+        print '<input class="flat" size=8 type="text" name="newamount" value="'.GETPOST("newamount","int").'">';
+    }
+    else {
+        print '<b>'.price($amount).'</b>';
+        print '<input type="hidden" name="amount" value="'.$amount.'">';
+        print '<input type="hidden" name="newamount" value="'.$amount.'">';
+    }
+    // Currency
+    print ' <b>'.$langs->trans("Currency".$currency).'</b>';
+    print '<input type="hidden" name="currency" value="'.$currency.'">';
+    print '</td></tr>'."\n";
+
+    // Tag
+
+    print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
+    print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
+    print '<input type="hidden" name="tag" value="'.$tag.'">';
+    print '<input type="hidden" name="fulltag" value="'.$fulltag.'">';
+    print '</td></tr>'."\n";
+
+    // Shipping address
+    $shipToName=$invoice->thirdparty->name;
+    $shipToStreet=$invoice->thirdparty->address;
+    $shipToCity=$invoice->thirdparty->town;
+    $shipToState=$invoice->thirdparty->state_code;
+    $shipToCountryCode=$invoice->thirdparty->country_code;
+    $shipToZip=$invoice->thirdparty->zip;
+    $shipToStreet2='';
+    $phoneNum=$invoice->thirdparty->phone;
+    if ($shipToName && $shipToStreet && $shipToCity && $shipToCountryCode && $shipToZip)
+    {
+        print '<input type="hidden" name="shipToName" value="'.$shipToName.'">'."\n";
+        print '<input type="hidden" name="shipToStreet" value="'.$shipToStreet.'">'."\n";
+        print '<input type="hidden" name="shipToCity" value="'.$shipToCity.'">'."\n";
+        print '<input type="hidden" name="shipToState" value="'.$shipToState.'">'."\n";
+        print '<input type="hidden" name="shipToCountryCode" value="'.$shipToCountryCode.'">'."\n";
+        print '<input type="hidden" name="shipToZip" value="'.$shipToZip.'">'."\n";
+        print '<input type="hidden" name="shipToStreet2" value="'.$shipToStreet2.'">'."\n";
+        print '<input type="hidden" name="phoneNum" value="'.$phoneNum.'">'."\n";
+    }
+    else
+    {
+        print '<!-- Shipping address not complete, so we don t use it -->'."\n";
+    }
+    print '<input type="hidden" name="email" value="'.$invoice->thirdparty->email.'">'."\n";
+    print '<input type="hidden" name="desc" value="'.$langs->trans("Invoice").' '.$invoice->ref.'">'."\n";
 }
 
-$pay = false;
-$ttc = $invoice->total_ttc ;
-$ttc = $ttc * 100;
-if (GETPOST("action") == 'charge')
+// Payment on contract line
+if (GETPOST("source") == 'contractline')
 {
-  $token = GETPOST("stripeToken");
-  $email = GETPOST("stripeEmail");
+    $found=true;
+    $langs->load("contracts");
 
-  $customer = \stripe\Customer::create(array(
-      'email' => $email,
-      'card'  => $token
-  ));
-	
-	$ttc = round($ttc, 2);
-  $charge = \stripe\Charge::create(array(
-      'customer' => $customer->id,
-      'amount'   => $ttc,
-      'currency' => $conf->currency,
-      'description' => 'Invoice payment N: '.$ref
-  ));
+    require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
 
-	$pay = true;
-	
+    $contractline=new ContratLigne($db);
+    $result=$contractline->fetch('',$ref);
+    if ($result < 0)
+    {
+        $mesg=$contractline->error;
+        $error++;
+    }
+    else
+    {
+        if ($contractline->fk_contrat > 0)
+        {
+            $contract=new Contrat($db);
+            $result=$contract->fetch($contractline->fk_contrat);
+            if ($result > 0)
+            {
+                $result=$contract->fetch_thirdparty($contract->socid);
+            }
+            else
+            {
+                $mesg=$contract->error;
+                $error++;
+            }
+        }
+        else
+        {
+            $mesg='ErrorRecordNotFound';
+            $error++;
+        }
+    }
+
+    if ($action != 'dopayment') // Do not change amount if we just click on first dopayment
+    {
+        $amount=$contractline->total_ttc;
+        if ($contractline->fk_product)
+        {
+            $product=new Product($db);
+            $result=$product->fetch($contractline->fk_product);
+    
+            // We define price for product (TODO Put this in a method in product class)
+            if (! empty($conf->global->PRODUIT_MULTIPRICES))
+            {
+                $pu_ht = $product->multiprices[$contract->thirdparty->price_level];
+                $pu_ttc = $product->multiprices_ttc[$contract->thirdparty->price_level];
+                $price_base_type = $product->multiprices_base_type[$contract->thirdparty->price_level];
+            }
+            else
+            {
+                $pu_ht = $product->price;
+                $pu_ttc = $product->price_ttc;
+                $price_base_type = $product->price_base_type;
+            }
+    
+            $amount=$pu_ttc;
+            if (empty($amount))
+            {
+                dol_print_error('','ErrorNoPriceDefinedForThisProduct');
+                exit;
+            }
+        }
+
+        if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
+        $amount=price2num($amount);
+    }
+    
+    $fulltag='COL='.$contractline->ref.'.CON='.$contract->ref.'.CUS='.$contract->thirdparty->id.'.DAT='.dol_print_date(dol_now(),'%Y%m%d%H%M');
+    //$fulltag.='.NAM='.strtr($contract->thirdparty->name,"-"," ");
+    if (! empty($TAG)) { $tag=$TAG; $fulltag.='.TAG='.$TAG; }
+    $fulltag=dol_string_unaccent($fulltag);
+
+    $qty=1;
+    if (GETPOST('qty')) $qty=GETPOST('qty');
+
+    // Creditor
+
+    print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
+    print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
+    print '<input type="hidden" name="creditor" value="'.$creditor.'">';
+    print '</td></tr>'."\n";
+
+    // Debitor
+
+    print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("ThirdParty");
+    print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$contract->thirdparty->name.'</b>';
+
+    // Object
+
+    $text='<b>'.$langs->trans("PaymentRenewContractId",$contract->ref,$contractline->ref).'</b>';
+    if ($contractline->fk_product)
+    {
+        $text.='<br>'.$product->ref.($product->label?' - '.$product->label:'');
+    }
+    if ($contractline->description) $text.='<br>'.dol_htmlentitiesbr($contractline->description);
+    //if ($contractline->date_fin_validite) {
+    //	$text.='<br>'.$langs->trans("DateEndPlanned").': ';
+    //	$text.=dol_print_date($contractline->date_fin_validite);
+    //}
+    if ($contractline->date_fin_validite)
+    {
+        $text.='<br>'.$langs->trans("ExpiredSince").': '.dol_print_date($contractline->date_fin_validite);
+    }
+
+    print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Designation");
+    print '</td><td class="CTableRow'.($var?'1':'2').'">'.$text;
+    print '<input type="hidden" name="source" value="'.GETPOST("source",'alpha').'">';
+    print '<input type="hidden" name="ref" value="'.$contractline->ref.'">';
+    print '</td></tr>'."\n";
+
+    // Quantity
+
+    $label=$langs->trans("Quantity");
+    $qty=1;
+    $duration='';
+    if ($contractline->fk_product)
+    {
+        if ($product->isService() && $product->duration_value > 0)
+        {
+            $label=$langs->trans("Duration");
+
+            // TODO Put this in a global method
+            if ($product->duration_value > 1)
+            {
+                $dur=array("h"=>$langs->trans("Hours"),"d"=>$langs->trans("DurationDays"),"w"=>$langs->trans("DurationWeeks"),"m"=>$langs->trans("DurationMonths"),"y"=>$langs->trans("DurationYears"));
+            }
+            else
+            {
+                $dur=array("h"=>$langs->trans("Hour"),"d"=>$langs->trans("DurationDay"),"w"=>$langs->trans("DurationWeek"),"m"=>$langs->trans("DurationMonth"),"y"=>$langs->trans("DurationYear"));
+            }
+            $duration=$product->duration_value.' '.$dur[$product->duration_unit];
+        }
+    }
+    print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$label.'</td>';
+    print '<td class="CTableRow'.($var?'1':'2').'"><b>'.($duration?$duration:$qty).'</b>';
+    print '<input type="hidden" name="newqty" value="'.dol_escape_htmltag($qty).'">';
+    print '</b></td></tr>'."\n";
+
+    // Amount
+
+    print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
+    if (empty($amount)) print ' ('.$langs->trans("ToComplete").')';
+    print '</td><td class="CTableRow'.($var?'1':'2').'">';
+    if (empty($amount) || ! is_numeric($amount))
+    {
+        print '<input type="hidden" name="amount" value="'.GETPOST("amount",'int').'">';
+        print '<input class="flat" size=8 type="text" name="newamount" value="'.GETPOST("newamount","int").'">';
+    }
+    else {
+        print '<b>'.price($amount).'</b>';
+        print '<input type="hidden" name="amount" value="'.$amount.'">';
+        print '<input type="hidden" name="newamount" value="'.$amount.'">';
+    }
+    // Currency
+    print ' <b>'.$langs->trans("Currency".$currency).'</b>';
+    print '<input type="hidden" name="currency" value="'.$currency.'">';
+    print '</td></tr>'."\n";
+
+    // Tag
+
+    print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
+    print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
+    print '<input type="hidden" name="tag" value="'.$tag.'">';
+    print '<input type="hidden" name="fulltag" value="'.$fulltag.'">';
+    print '</td></tr>'."\n";
+
+    // Shipping address
+    $shipToName=$contract->thirdparty->name;
+    $shipToStreet=$contract->thirdparty->address;
+    $shipToCity=$contract->thirdparty->town;
+    $shipToState=$contract->thirdparty->state_code;
+    $shipToCountryCode=$contract->thirdparty->country_code;
+    $shipToZip=$contract->thirdparty->zip;
+    $shipToStreet2='';
+    $phoneNum=$contract->thirdparty->phone;
+    if ($shipToName && $shipToStreet && $shipToCity && $shipToCountryCode && $shipToZip)
+    {
+        print '<input type="hidden" name="shipToName" value="'.$shipToName.'">'."\n";
+        print '<input type="hidden" name="shipToStreet" value="'.$shipToStreet.'">'."\n";
+        print '<input type="hidden" name="shipToCity" value="'.$shipToCity.'">'."\n";
+        print '<input type="hidden" name="shipToState" value="'.$shipToState.'">'."\n";
+        print '<input type="hidden" name="shipToCountryCode" value="'.$shipToCountryCode.'">'."\n";
+        print '<input type="hidden" name="shipToZip" value="'.$shipToZip.'">'."\n";
+        print '<input type="hidden" name="shipToStreet2" value="'.$shipToStreet2.'">'."\n";
+        print '<input type="hidden" name="phoneNum" value="'.$phoneNum.'">'."\n";
+    }
+    else
+    {
+        print '<!-- Shipping address not complete, so we don t use it -->'."\n";
+    }
+    print '<input type="hidden" name="email" value="'.$contract->thirdparty->email.'">'."\n";
+    print '<input type="hidden" name="desc" value="'.$langs->trans("Contract").' '.$contract->ref.'">'."\n";
+}
+
+// Payment on member subscription
+if (GETPOST("source") == 'membersubscription')
+{
+    $found=true;
+    $langs->load("members");
+
+    require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
+    require_once DOL_DOCUMENT_ROOT.'/adherents/class/subscription.class.php';
+
+    $member=new Adherent($db);
+    $result=$member->fetch('',$ref);
+    if ($result < 0)
+    {
+        $mesg=$member->error;
+        $error++;
+    }
+    else
+    {
+        $subscription=new Subscription($db);
+    }
+
+    if ($action != 'dopayment') // Do not change amount if we just click on first dopayment
+    {
+        $amount=$subscription->total_ttc;
+        if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
+        $amount=price2num($amount);
+    }
+    
+    $fulltag='MEM='.$member->id.'.DAT='.dol_print_date(dol_now(),'%Y%m%d%H%M');
+    if (! empty($TAG)) { $tag=$TAG; $fulltag.='.TAG='.$TAG; }
+    $fulltag=dol_string_unaccent($fulltag);
+
+    // Creditor
+
+    print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
+    print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
+    print '<input type="hidden" name="creditor" value="'.$creditor.'">';
+    print '</td></tr>'."\n";
+
+    // Debitor
+
+    print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Member");
+    print '</td><td class="CTableRow'.($var?'1':'2').'"><b>';
+    if ($member->morphy == 'mor' && ! empty($member->societe)) print $member->societe;
+    else print $member->getFullName($langs);
+    print '</b>';
+
+    // Object
+
+    $text='<b>'.$langs->trans("PaymentSubscription").'</b>';
+    print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Designation");
+    print '</td><td class="CTableRow'.($var?'1':'2').'">'.$text;
+    print '<input type="hidden" name="source" value="'.GETPOST("source",'alpha').'">';
+    print '<input type="hidden" name="ref" value="'.$member->ref.'">';
+    print '</td></tr>'."\n";
+
+    if ($member->last_subscription_date || $member->last_subscription_amount)
+    {
+        // Last subscription date
+
+        print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("LastSubscriptionDate");
+        print '</td><td class="CTableRow'.($var?'1':'2').'">'.dol_print_date($member->last_subscription_date,'day');
+        print '</td></tr>'."\n";
+
+        // Last subscription amount
+
+        print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("LastSubscriptionAmount");
+        print '</td><td class="CTableRow'.($var?'1':'2').'">'.price($member->last_subscription_amount);
+        print '</td></tr>'."\n";
+
+        if (empty($amount) && ! GETPOST('newamount')) $_GET['newamount']=$member->last_subscription_amount;
+    }
+
+    // Amount
+
+    print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
+    if (empty($amount))
+    {
+        print ' ('.$langs->trans("ToComplete");
+        if (! empty($conf->global->MEMBER_EXT_URL_SUBSCRIPTION_INFO)) print ' - <a href="'.$conf->global->MEMBER_EXT_URL_SUBSCRIPTION_INFO.'" rel="external" target="_blank">'.$langs->trans("SeeHere").'</a>';
+        print ')';
+    }
+    print '</td><td class="CTableRow'.($var?'1':'2').'">';
+    if (empty($amount) || ! is_numeric($amount))
+    {
+        $valtoshow=GETPOST("newamount",'int');
+        if (! empty($conf->global->MEMBER_MIN_AMOUNT) && $valtoshow) $valtoshow=max($conf->global->MEMBER_MIN_AMOUNT,$valtoshow);
+        print '<input type="hidden" name="amount" value="'.GETPOST("amount",'int').'">';
+        print '<input class="flat" size="8" type="text" name="newamount" value="'.$valtoshow.'">';
+    }
+    else {
+        $valtoshow=$amount;
+        if (! empty($conf->global->MEMBER_MIN_AMOUNT) && $valtoshow) $valtoshow=max($conf->global->MEMBER_MIN_AMOUNT,$valtoshow);
+        print '<b>'.price($valtoshow).'</b>';
+        print '<input type="hidden" name="amount" value="'.$valtoshow.'">';
+        print '<input type="hidden" name="newamount" value="'.$valtoshow.'">';
+    }
+    // Currency
+    print ' <b>'.$langs->trans("Currency".$currency).'</b>';
+    print '<input type="hidden" name="currency" value="'.$currency.'">';
+    print '</td></tr>'."\n";
+
+    // Tag
+
+    print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
+    print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
+    print '<input type="hidden" name="tag" value="'.$tag.'">';
+    print '<input type="hidden" name="fulltag" value="'.$fulltag.'">';
+    print '</td></tr>'."\n";
+
+    // Shipping address
+    $shipToName=$member->getFullName($langs);
+    $shipToStreet=$member->address;
+    $shipToCity=$member->town;
+    $shipToState=$member->state_code;
+    $shipToCountryCode=$member->country_code;
+    $shipToZip=$member->zip;
+    $shipToStreet2='';
+    $phoneNum=$member->phone;
+    if ($shipToName && $shipToStreet && $shipToCity && $shipToCountryCode && $shipToZip)
+    {
+        print '<input type="hidden" name="shipToName" value="'.$shipToName.'">'."\n";
+        print '<input type="hidden" name="shipToStreet" value="'.$shipToStreet.'">'."\n";
+        print '<input type="hidden" name="shipToCity" value="'.$shipToCity.'">'."\n";
+        print '<input type="hidden" name="shipToState" value="'.$shipToState.'">'."\n";
+        print '<input type="hidden" name="shipToCountryCode" value="'.$shipToCountryCode.'">'."\n";
+        print '<input type="hidden" name="shipToZip" value="'.$shipToZip.'">'."\n";
+        print '<input type="hidden" name="shipToStreet2" value="'.$shipToStreet2.'">'."\n";
+        print '<input type="hidden" name="phoneNum" value="'.$phoneNum.'">'."\n";
+    }
+    else
+    {
+        print '<!-- Shipping address not complete, so we don t use it -->'."\n";
+    }
+    print '<input type="hidden" name="email" value="'.$member->email.'">'."\n";
+    print '<input type="hidden" name="desc" value="'.$langs->trans("PaymentSubscription").'">'."\n";
 }
 
 
 
-?>
+if (! $found && ! $mesg) $mesg=$langs->trans("ErrorBadParameters");
 
-<!doctype html>
-<html>
-<head>
-    <meta charset="utf-8">
-    <title><?php echo $langs->trans('PaymentForm'); ?></title>
-    <link rel='stylesheet' type='text/css' href='css/style.css' />
-</head>
+if ($mesg) print '<tr><td align="center" colspan="2"><br><div class="warning">'.$mesg.'</div></td></tr>'."\n";
 
-<body>
-    <div class="invoice-box">		
-        <table cellpadding="0" cellspacing="0">
-            <tr class="top">
-                <td colspan="2">
-                    <table>
-                        <tr>
-                            <td class="title">                                
-								<?php 
-									if(empty($pay)):
-									print '<form  action="' . $_SERVER['REQUEST_URI'] . '" method="POST">';
-									print '<input type="hidden" name="action" value="charge" />';
-									
-								?>
-								  <script src="https://checkout.stripe.com/checkout.js" 
-										class="stripe-button"
-										data-key="<?php echo $stripe['publishable_key']; ?>"
-										data-amount="<?php echo $ttc; ?>"
-										data-currency="<?php echo $conf->currency; ?>"
-										data-description="<?php echo 'Invoice payment N: '.$ref; ?>">
-									</script>
-								</form>
-								<?php endif; ?>
-                            </td>
-                            
-                            <td>
-                                <?php echo $langs->trans("Invoice") . ' : ' . $invoice->ref; ?><br>
-                                <?php echo $langs->trans('Date') . ' : ' . dol_print_date($invoice->date, 'day'); ?><br>
-                                <?php echo $langs->trans('DateMaxPayment') . ' : ' . dol_print_date($invoice->date_validation, 'day'); ?>
-                            </td>
-                        </tr>
-                    </table>
-                </td>
-            </tr>
-            
-            <tr class="information">
-                <td colspan="2">
-                    <table>
-                        <tr>
-                            <td>
-                                <?php echo $invoice->thirdparty->name; ?><br>
-                                <?php echo $invoice->thirdparty->address; ?><br>
-								<?php echo $invoice->thirdparty->zip . ', ' . $invoice->thirdparty->town .' '. $invoice->thirdparty->country_code ; ?>
-                            </td>
-                            
-                            <td>
-                               
-                            </td>
-                        </tr>
-                    </table>
-                </td>
-            </tr>
-            
-            <tr class="heading">
-                <td>
-                    <?php echo $langs->trans('PaymentConditionsShort'); ?>
-                </td>
-                
-                <td>
-                    <?php echo $form->form_conditions_reglement('', $invoice->cond_reglement_id, 'none'); ?>
-                </td>
-            </tr>
-            
-            
-            <tr class="heading">
-                <td>
-                    TOTAL
-                </td>
-                
-                <td>
-                </td>
-            </tr>
-            
-            <tr class="item">
-                <td>
-                   <?php echo $langs->trans('AmountHT'); ?>
-                </td>
-                
-                <td>
-                    <?php echo price($invoice->total_ht, 1, '', 1, - 1, - 1, $conf->currency); ?>
-                </td>
-            </tr>
-            
-            <tr class="item">
-                <td>
-                    <?php echo $langs->trans('AmountVAT'); ?>
-                </td>
-                
-                <td>
-                    <?php echo price($invoice->total_tva, 1, '', 1, - 1, - 1, $conf->currency); ?>
-                </td>
-            </tr>
-            
-            <tr class="item last">
-                <td>
-                    <?php echo $langs->trans('AmountTTC'); ?>
-                </td>
-                
-                <td>
-                   <?php echo price($invoice->total_ttc, 1, '', 1, - 1, - 1, $conf->currency); ?>
-                </td>
-            </tr>
-            
-            <tr class="total">
-                <td></td>
-                
-                <td>
-                   Total: <?php echo price($invoice->total_ttc, 1, '', 1, - 1, - 1, $conf->currency); ?>
-                </td>
-            </tr>
-			
-			
-        </table>
-		<?php //var_dump($mysoc); ?>
-		
-		<span class="center">
-			<?php html_print_stripe_footer($mysoc,$langs); ?>
-		</span>
-		
-		<?php //echo var_dump($mysoc); ?>
-		
+print '</table>'."\n";
+print "\n";
+
+
+if ($action != 'dopayment')
+{
+    if ($found && ! $error)	// We are in a management option and no error
+    {
+        print '<br><input class="button" type="submit" name="dopayment_stripe" value="'.$langs->trans("StripeDoPayment").'">';
+    }
+    else
+    {
+        dol_print_error_email('ERRORNEWPAYMENTSTRIPE');
+    }
+}
+
+
+print '</td></tr>'."\n";
+
+print '</table>'."\n";
+print '</form>'."\n";
+print '</div>'."\n";
+print '<br>';
+
+
+// Add more content on page for some services
+if (preg_match('/^dopayment/',$action))
+{
+    // Simple checkout
+    /*
+     print '<script src="https://checkout.stripe.com/checkout.js"
+     class="stripe-button"
+     data-key="'.$stripe['publishable_key'].'"
+     data-amount="'.$ttc.'"
+     data-currency="'.$conf->currency.'"
+     data-description="'.$ref.'">
+     </script>';
+     */
+    
+    // Personalized checkout
+    print '<style>
+    /**
+     * The CSS shown here will not be introduced in the Quickstart guide, but shows
+     * how you can use CSS to style your Element s container.
+     */
+    .StripeElement {
+        background-color: white;
+        padding: 8px 12px;
+        border-radius: 4px;
+        border: 1px solid transparent;
+        box-shadow: 0 1px 3px 0 #e6ebf1;
+        -webkit-transition: box-shadow 150ms ease;
+        transition: box-shadow 150ms ease;
+    }
+    
+    .StripeElement--focus {
+        box-shadow: 0 1px 3px 0 #cfd7df;
+    }
+    
+    .StripeElement--invalid {
+        border-color: #fa755a;
+    }
+    
+    .StripeElement--webkit-autofill {
+        background-color: #fefde5 !important;
+    }
+    </style>';
+    
+    print '
+    
+    <br>
+    <form action="'.$_SERVER['REQUEST_URI'].'" method="POST" id="payment-form">';
+
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'."\n";
+    print '<input type="hidden" name="dopayment_stripe" value="1">'."\n";
+    print '<input type="hidden" name="action" value="charge">'."\n";
+    print '<input type="hidden" name="tag" value="'.GETPOST("tag",'alpha').'">'."\n";
+    print '<input type="hidden" name="suffix" value="'.GETPOST("suffix",'alpha').'">'."\n";
+    print '<input type="hidden" name="securekey" value="'.$SECUREKEY.'">'."\n";
+    print '<input type="hidden" name="entity" value="'.$entity.'" />';
+        
+    print '
+    <table id="dolpaymenttable" summary="Payment form" class="center">
+    <tbody><tr><td class="textpublicpayment">
+                    
+    <div class="form-row left">
+    <label for="card-element">
+    Credit or debit card
+    </label>
+    <div id="card-element">
+    <!-- a Stripe Element will be inserted here. -->
     </div>
+    
+    <!-- Used to display form errors -->
+    <div id="card-errors" role="alert"></div>
+    </div>
+    <br>
+    <button>'.$langs->trans("ToPay").'</button>
+    
+    </td></tr></tbody></table>
+        
+    </form>
 
-</body>
-</html>
+        
+    <script src="https://js.stripe.com/v2/"></script>
+    <script src="https://js.stripe.com/v3/"></script>
+    
+    <script type="text/javascript" language="javascript">';
+    ?>
+    
+        // Create a Stripe client
+        var stripe = Stripe('<?php echo $stripe['publishable_key']; ?>');
+        
+        // Create an instance of Elements
+        var elements = stripe.elements();
+        
+        // Custom styling can be passed to options when creating an Element.
+        // (Note that this demo uses a wider set of styles than the guide below.)
+        var style = {
+          base: {
+            color: '#32325d',
+            lineHeight: '24px',
+            fontFamily: '"Helvetica Neue", Helvetica, sans-serif',
+            fontSmoothing: 'antialiased',
+            fontSize: '16px',
+            '::placeholder': {
+              color: '#aab7c4'
+            }
+          },
+          invalid: {
+            color: '#fa755a',
+            iconColor: '#fa755a'
+          }
+        };
+        
+        // Create an instance of the card Element
+        var card = elements.create('card', {style: style});
+        
+        // Add an instance of the card Element into the `card-element` <div>
+        card.mount('#card-element');
+        
+        // Handle real-time validation errors from the card Element.
+        card.addEventListener('change', function(event) {
+          var displayError = document.getElementById('card-errors');
+          if (event.error) {
+            displayError.textContent = event.error.message;
+          } else {
+            displayError.textContent = '';
+          }
+        });
+        
+        // Handle form submission
+        var form = document.getElementById('payment-form');
+        console.log(form);
+        form.addEventListener('submit', function(event) {
+          event.preventDefault();
+        
+          stripe.createToken(card).then(function(result) {
+            if (result.error) {
+              // Inform the user if there was an error
+              var errorElement = document.getElementById('card-errors');
+              errorElement.textContent = result.error.message;
+            } else {
+              // Send the token to your server
+              stripeTokenHandler(result.token);
+            }
+          });
+        });
+        
+        function stripeTokenHandler(token) {
+          // Insert the token ID into the form so it gets submitted to the server
+          var form = document.getElementById('payment-form');
+          var hiddenInput = document.createElement('input');
+          hiddenInput.setAttribute('type', 'hidden');
+          hiddenInput.setAttribute('name', 'stripeToken');
+          hiddenInput.setAttribute('value', token.id);
+          form.appendChild(hiddenInput);
+        
+          // Submit the form
+          console.log("submit");
+          form.submit();
+        }        
+    
+    <?php
+        print '</script>';    
+}
 
 
 
+htmlPrintOnlinePaymentFooter($mysoc,$langs);
+
+llxFooter('', 'public');
+
+$db->close();
 
diff --git a/htdocs/stripe/admin/stripe.php b/htdocs/stripe/admin/stripe.php
index 3dd238b2f1d..484b7537755 100644
--- a/htdocs/stripe/admin/stripe.php
+++ b/htdocs/stripe/admin/stripe.php
@@ -47,15 +47,15 @@ if ($action == 'setvalue' && $user->admin)
 
     $result=dolibarr_set_const($db, "STRIPE_LIVE",GETPOST('STRIPE_LIVE','alpha'),'chaine',0,'',$conf->entity);
     if (! $result > 0) $error++;
-	$result=dolibarr_set_const($db, "STRIPE_TEST_SECRET_KEY",GETPOST('STRIPE_TEST_SECRET_KEY','alpha'),'chaine',0,'',$conf->entity);
-	if (! $result > 0) $error++;
 	$result=dolibarr_set_const($db, "STRIPE_TEST_PUBLISHABLE_KEY",GETPOST('STRIPE_TEST_PUBLISHABLE_KEY','alpha'),'chaine',0,'',$conf->entity);
 	if (! $result > 0) $error++;
-	$result=dolibarr_set_const($db, "STRIPE_LIVE_SECRET_KEY",GETPOST('STRIPE_LIVE_SECRET_KEY','alpha'),'chaine',0,'',$conf->entity);
+	$result=dolibarr_set_const($db, "STRIPE_TEST_SECRET_KEY",GETPOST('STRIPE_TEST_SECRET_KEY','alpha'),'chaine',0,'',$conf->entity);
 	if (! $result > 0) $error++;
 	$result=dolibarr_set_const($db, "STRIPE_LIVE_PUBLISHABLE_KEY",GETPOST('STRIPE_LIVE_PUBLISHABLE_KEY','alpha'),'chaine',0,'',$conf->entity);
 	if (! $result > 0) $error++;
-    $result=dolibarr_set_const($db, "STRIPE_CREDITOR",GETPOST('STRIPE_CREDITOR','alpha'),'chaine',0,'',$conf->entity);
+	$result=dolibarr_set_const($db, "STRIPE_LIVE_SECRET_KEY",GETPOST('STRIPE_LIVE_SECRET_KEY','alpha'),'chaine',0,'',$conf->entity);
+	if (! $result > 0) $error++;
+	$result=dolibarr_set_const($db, "STRIPE_CREDITOR",GETPOST('STRIPE_CREDITOR','alpha'),'chaine',0,'',$conf->entity);
     if (! $result > 0) $error++;
 	$result=dolibarr_set_const($db, "STRIPE_CSS_URL",GETPOST('STRIPE_CSS_URL','alpha'),'chaine',0,'',$conf->entity);
 	if (! $result > 0) $error++;
@@ -97,15 +97,15 @@ if ($action=="setlive")
 
 $form=new Form($db);
 
-$SECRET_TEST_KEY="sk_test_xxxxxxxxxxxxxxxxxxxxxxxx"; // Stripe test secret key
-if (empty($conf->global->STRIPE_TEST_SECRET_KEY)) $conf->global->STRIPE_TEST_SECRET_KEY = $SECRET_TEST_KEY;
-$PUBLISHABLE_TEST_KEY="pk_test_xxxxxxxxxxxxxxxxxxxxxxxx"; // Stripe test publishable key
-if (empty($conf->global->STRIPE_TEST_PUBLISHABLE_KEY)) $conf->global->STRIPE_TEST_PUBLISHABLE_KEY = $PUBLISHABLE_TEST_KEY;
+//$SECRET_TEST_KEY="sk_test_xxxxxxxxxxxxxxxxxxxxxxxx"; // Stripe test secret key
+//if (empty($conf->global->STRIPE_TEST_SECRET_KEY)) $conf->global->STRIPE_TEST_SECRET_KEY = $SECRET_TEST_KEY;
+//$PUBLISHABLE_TEST_KEY="pk_test_xxxxxxxxxxxxxxxxxxxxxxxx"; // Stripe test publishable key
+//if (empty($conf->global->STRIPE_TEST_PUBLISHABLE_KEY)) $conf->global->STRIPE_TEST_PUBLISHABLE_KEY = $PUBLISHABLE_TEST_KEY;
 
-$SECRET_LIVE_KEY="sk_live_xxxxxxxxxxxxxxxxxxxxxxxx"; // Stripe live secret key
-if (empty($conf->global->STRIPE_LIVE_SECRET_KEY)) $conf->global->STRIPE_LIVE_SECRET_KEY = $SECRET_LIVE_KEY;
-$PUBLISHABLE_LIVE_KEY="pk_live_xxxxxxxxxxxxxxxxxxxxxxxx"; // Stripe live publishable key
-if (empty($conf->global->STRIPE_LIVE_PUBLISHABLE_KEY)) $conf->global->STRIPE_LIVE_PUBLISHABLE_KEY = $PUBLISHABLE_LIVE_KEY;
+//$SECRET_LIVE_KEY="sk_live_xxxxxxxxxxxxxxxxxxxxxxxx"; // Stripe live secret key
+//if (empty($conf->global->STRIPE_LIVE_SECRET_KEY)) $conf->global->STRIPE_LIVE_SECRET_KEY = $SECRET_LIVE_KEY;
+//$PUBLISHABLE_LIVE_KEY="pk_live_xxxxxxxxxxxxxxxxxxxxxxxx"; // Stripe live publishable key
+//if (empty($conf->global->STRIPE_LIVE_PUBLISHABLE_KEY)) $conf->global->STRIPE_LIVE_PUBLISHABLE_KEY = $PUBLISHABLE_LIVE_KEY;
 
 llxHeader('',$langs->trans("StripeSetup"));
 
@@ -145,30 +145,30 @@ else
 }
 print '</td></tr>';
 
-print '<tr class="oddeven"><td>';
-print '<span class="titlefield fieldrequired">'.$langs->trans("STRIPE_TEST_SECRET_KEY").'</span></td><td>';
-print '<input size="32" type="text" name="STRIPE_TEST_SECRET_KEY" value="'.$conf->global->STRIPE_TEST_SECRET_KEY.'">';
-print '<br>'.$langs->trans("Example").': sk_test_xxxxxxxxxxxxxxxxxxxxxxxx';
-print '</td></tr>';
-
 print '<tr class="oddeven"><td>';
 print '<span class="fieldrequired">'.$langs->trans("STRIPE_TEST_PUBLISHABLE_KEY").'</span></td><td>';
-print '<input size="32" type="text" name="STRIPE_TEST_PUBLISHABLE_KEY" value="'.$conf->global->STRIPE_TEST_PUBLISHABLE_KEY.'">';
+print '<input class="minwidth300" type="text" name="STRIPE_TEST_PUBLISHABLE_KEY" value="'.$conf->global->STRIPE_TEST_PUBLISHABLE_KEY.'">';
 print '<br>'.$langs->trans("Example").': pk_test_xxxxxxxxxxxxxxxxxxxxxxxx';
 print '</td></tr>';
 
 print '<tr class="oddeven"><td>';
-print '<span class="fieldrequired">'.$langs->trans("STRIPE_LIVE_SECRET_KEY").'</span></td><td>';
-print '<input size="32" type="text" name="STRIPE_LIVE_SECRET_KEY" value="'.$conf->global->STRIPE_LIVE_SECRET_KEY.'">';
-print '<br>'.$langs->trans("Example").': sk_live_xxxxxxxxxxxxxxxxxxxxxxxx';
+print '<span class="titlefield fieldrequired">'.$langs->trans("STRIPE_TEST_SECRET_KEY").'</span></td><td>';
+print '<input class="minwidth300" type="text" name="STRIPE_TEST_SECRET_KEY" value="'.$conf->global->STRIPE_TEST_SECRET_KEY.'">';
+print '<br>'.$langs->trans("Example").': sk_test_xxxxxxxxxxxxxxxxxxxxxxxx';
 print '</td></tr>';
 
 print '<tr class="oddeven"><td>';
 print '<span class="fieldrequired">'.$langs->trans("STRIPE_LIVE_PUBLISHABLE_KEY").'</span></td><td>';
-print '<input size="32" type="text" name="STRIPE_LIVE_PUBLISHABLE_KEY" value="'.$conf->global->STRIPE_LIVE_PUBLISHABLE_KEY.'">';
+print '<input class="minwidth300" type="text" name="STRIPE_LIVE_PUBLISHABLE_KEY" value="'.$conf->global->STRIPE_LIVE_PUBLISHABLE_KEY.'">';
 print '<br>'.$langs->trans("Example").': pk_live_xxxxxxxxxxxxxxxxxxxxxxxx';
 print '</td></tr>';
 
+print '<tr class="oddeven"><td>';
+print '<span class="fieldrequired">'.$langs->trans("STRIPE_LIVE_SECRET_KEY").'</span></td><td>';
+print '<input class="minwidth300" type="text" name="STRIPE_LIVE_SECRET_KEY" value="'.$conf->global->STRIPE_LIVE_SECRET_KEY.'">';
+print '<br>'.$langs->trans("Example").': sk_live_xxxxxxxxxxxxxxxxxxxxxxxx';
+print '</td></tr>';
+
 print '</table>';
 
 print '<br>';
diff --git a/htdocs/public/stripe/config.php b/htdocs/stripe/config.php
similarity index 82%
rename from htdocs/public/stripe/config.php
rename to htdocs/stripe/config.php
index dfd0ea6aa1a..0cc15c7fb60 100644
--- a/htdocs/public/stripe/config.php
+++ b/htdocs/stripe/config.php
@@ -17,21 +17,22 @@
  */
 
 /**
-*  \file       stripe/config.php
+*  \file       htdocs/public/stripe/config.php
 *  \ingroup    Stripe
 *  \brief      Page to move config in api
 */
 
-require '../../main.inc.php';
-
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/stripe/lib/stripe.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/includes/stripe/init.php';
 
+global $stripe;
+global $conf;
+
 //use \includes\stripe as stripe;
 $stripe = array();
 
-if(empty($conf->global->SKYPE_LIVE))
+if (empty($conf->global->SKYPE_LIVE))
 {
 	$stripe = array(
 		"secret_key"      => $conf->global->STRIPE_TEST_SECRET_KEY,
@@ -46,4 +47,7 @@ else
 	);	
 }
 
-\includes\stripe::setApiKey($stripe['secret_key']);
\ No newline at end of file
+require_once DOL_DOCUMENT_ROOT."/includes/stripe/lib/Stripe.php";
+require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
+
+\Stripe\Stripe::setApiKey($stripe['secret_key']);

From 143c019905e571321feb4fa7a385cc82aa9d6e85 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Sun, 14 May 2017 08:07:34 +0200
Subject: [PATCH 342/505] Fix : Sql error on salaries index for accountancy
 multijournal + debug

---
 htdocs/compta/bank/card.php                   | 51 +++++++------------
 htdocs/compta/bank/class/account.class.php    |  2 +-
 htdocs/compta/salaries/index.php              | 15 ++++--
 .../core/class/html.formaccounting.class.php  |  4 +-
 4 files changed, 34 insertions(+), 38 deletions(-)

diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index 804d2c5511d..5c9fcf7802a 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -101,7 +101,8 @@ if ($action == 'add')
 
 	$account_number 		 = GETPOST('account_number','alpha');
 	if ($account_number <= 0) { $object->account_number = ''; } else { $object->account_number = $account_number; }
-	$object->fk_accountancy_journal  = trim($_POST["fk_accountancy_journal"]);
+	$fk_accountancy_journal  = GETPOST('fk_accountancy_journal','int');
+	if ($fk_accountancy_journal <= 0) { $object->fk_accountancy_journal = ''; } else { $object->fk_accountancy_journal = $fk_accountancy_journal; }
 
     $object->solde           = $_POST["solde"];
     $object->date_solde      = dol_mktime(12,0,0,$_POST["remonth"],$_POST["reday"],$_POST["reyear"]);
@@ -199,7 +200,8 @@ if ($action == 'update')
 
 	$account_number 		 = GETPOST('account_number', 'int');
 	if ($account_number <= 0) { $object->account_number = ''; } else { $object->account_number = $account_number; }
-	$object->fk_accountancy_journal = trim($_POST["fk_accountancy_journal"]);
+	$fk_accountancy_journal  = GETPOST('fk_accountancy_journal','int');
+	if ($fk_accountancy_journal <= 0) { $object->fk_accountancy_journal = ''; } else { $object->fk_accountancy_journal = $fk_accountancy_journal; }
 
     $object->currency_code   = trim($_POST["account_currency_code"]);
 
@@ -502,35 +504,20 @@ if ($action == 'create')
 
 	print '<table class="border" width="100%">';
 	// Accountancy code
-    if (! empty($conf->global->MAIN_BANK_ACCOUNTANCY_CODE_ALWAYS_REQUIRED))
-    {
-		if (! empty($conf->accounting->enabled))
-		{
-			print '<tr><td class="fieldrequired titlefieldcreate">'.$langs->trans("AccountancyCode").'</td>';
-			print '<td>';
-			print $formaccountancy->select_account($object->account_number, 'account_number', 1, '', 1, 1);
-			print '</td></tr>';
-		}
-		else
-		{
-			print '<tr><td class="fieldrequired titlefieldcreate">'.$langs->trans("AccountancyCode").'</td>';
-			print '<td colspan="3"><input type="text" name="account_number" value="'.(GETPOST("account_number")?GETPOST('account_number', 'alpha'):$object->account_number).'"></td></tr>';
-		}
+	$fieldrequired='';
+    if (! empty($conf->global->MAIN_BANK_ACCOUNTANCY_CODE_ALWAYS_REQUIRED)) $fieldrequired='fieldrequired '; 
+    
+	if (! empty($conf->accounting->enabled))
+	{
+		print '<tr><td class="'.$fieldrequired.'titlefieldcreate">'.$langs->trans("AccountancyCode").'</td>';
+		print '<td>';
+		print $formaccountancy->select_account($object->account_number, 'account_number', 1, '', 1, 1);
+		print '</td></tr>';
 	}
-    else
-    {
-		if (! empty($conf->accounting->enabled))
-		{
-			print '<tr><td class="titlefieldcreate">'.$langs->trans("AccountancyCode").'</td>';
-			print '<td>';
-			print $formaccountancy->select_account($object->account_number, 'account_number', 1, '', 1, 1);
-			print '</td></tr>';
-		}
-		else
-		{
-			print '<tr><td class="titlefieldcreate">'.$langs->trans("AccountancyCode").'</td>';
-			print '<td colspan="3"><input type="text" name="account_number" value="'.(GETPOST("account_number")?GETPOST('account_number', 'alpha'):$object->account_number).'"></td></tr>';
-		}
+	else
+	{
+		print '<tr><td class="'.$fieldrequired.'titlefieldcreate">'.$langs->trans("AccountancyCode").'</td>';
+		print '<td colspan="3"><input type="text" name="account_number" value="'.(GETPOST("account_number")?GETPOST('account_number', 'alpha'):$object->account_number).'"></td></tr>';
 	}
 
 	// Accountancy journal
@@ -538,7 +525,7 @@ if ($action == 'create')
 	{
 		print '<tr><td>'.$langs->trans("AccountancyJournal").'</td>';
 	    print '<td>';
-		print $formaccountancy2->select_journal($object->fk_accountancy_journal, 'fk_accountancy_journal', 4, 1, '', 1, 1);
+		print $formaccountancy2->select_journal($object->fk_accountancy_journal, 'fk_accountancy_journal', 4, 1, '', 0, 0);
 		print '</td></tr>';
 	}
 
@@ -994,7 +981,7 @@ else
 		{
 			print '<tr><td>'.$langs->trans("AccountancyJournal").'</td>';
 			print '<td>';
-			print $formaccountancy2->select_journal($object->fk_accountancy_journal, 'fk_accountancy_journal', 4, 1, '', 1, 1);
+			print $formaccountancy2->select_journal($object->fk_accountancy_journal, 'fk_accountancy_journal', 4, 1, '', 0, 0);
 			print '</td></tr>';
 		}
 		
diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index 9fdd329fd3d..2a615ad4b69 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -1259,7 +1259,7 @@ class Account extends CommonObject
             include_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
             $langs->load("accountancy");
             $label .= '<br><b>' . $langs->trans('AccountAccounting') . ':</b> ' . length_accountg($this->account_number);
-            $label .= '<br><b>' . $langs->trans('AccountancyJournal') . ':</b> ' . $this->fk_accountancy_journal;
+            $label .= '<br><b>' . $langs->trans('AccountancyJournal') . ':</b> ' . $this->accountancy_journal;
         }
         $linkclose = '" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
 
diff --git a/htdocs/compta/salaries/index.php b/htdocs/compta/salaries/index.php
index 597b8aabad0..5e78a070796 100644
--- a/htdocs/compta/salaries/index.php
+++ b/htdocs/compta/salaries/index.php
@@ -26,6 +26,7 @@
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/salaries/class/paymentsalary.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php';
 
 $langs->load("compta");
 $langs->load("salaries");
@@ -94,7 +95,7 @@ $accountstatic = new Account($db);
 
 $sql = "SELECT u.rowid as uid, u.lastname, u.firstname, u.login, u.email, u.admin, u.salary as current_salary, u.fk_soc as fk_soc,";
 $sql.= " s.rowid, s.fk_user, s.amount, s.salary, s.label, s.datep as datep, s.datev as datev, s.fk_typepayment as type, s.num_payment, s.fk_bank,";
-$sql.= " ba.rowid as bid, ba.ref as bref, ba.number as bnumber, ba.account_number, ba.accountancy_journal, ba.label as blabel,";
+$sql.= " ba.rowid as bid, ba.ref as bref, ba.number as bnumber, ba.account_number, ba.fk_accountancy_journal, ba.label as blabel,";
 $sql.= " pst.code as payment_code";
 $sql.= " FROM ".MAIN_DB_PREFIX."payment_salary as s";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as pst ON s.fk_typepayment = pst.id";
@@ -236,8 +237,16 @@ if ($result)
 	            $accountstatic->id=$obj->bid;
 	            $accountstatic->ref=$obj->bref;
 	            $accountstatic->number=$obj->bnumber;
-	            $accountstatic->accountancy_number=$obj->account_number;
-	            $accountstatic->accountancy_journal=$obj->accountancy_journal;
+				
+				if (! empty($conf->accounting->enabled))
+				{
+					$accountstatic->account_number=$obj->account_number;
+					
+					$accountingjournal = new AccountingJournal($db);
+					$accountingjournal->fetch($obj->fk_accountancy_journal);
+
+					$accountstatic->accountancy_journal = $accountingjournal->getNomUrl(0,1,1,'',1);
+				}
 	            $accountstatic->label=$obj->blabel;
 	        	print $accountstatic->getNomUrl(1);
 	        }
diff --git a/htdocs/core/class/html.formaccounting.class.php b/htdocs/core/class/html.formaccounting.class.php
index a87b566d0d6..97f31f05e99 100644
--- a/htdocs/core/class/html.formaccounting.class.php
+++ b/htdocs/core/class/html.formaccounting.class.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2016 		Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
+/* Copyright (C) 2016-2017	Alexandre Spangaro	<aspangaro@zendsi.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
@@ -121,7 +121,7 @@ class FormAccounting extends Form
 			}
 		}
 
-		$out .= Form::selectarray($htmlname, $options, $select, $showempty, 0, 0, '', 0, 0, 0, '', $morecss, 1);
+		$out .= Form::selectarray($htmlname, $options, $selected, $showempty, 0, 0, '', 0, 0, 0, '', $morecss, 1);
 
 		return $out;
 	}

From 9b550ae178a57901884cf1a72f898cf6e9717f8f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 14 May 2017 12:54:26 +0200
Subject: [PATCH 343/505] Fix migration of accountancy_journal from char to
 num.

---
 .../install/mysql/migration/5.0.0-6.0.0.sql   | 38 +++++++++++--------
 .../mysql/tables/llx_bank_account.key.sql     |  3 +-
 htdocs/public/stripe/newpayment.php           |  4 +-
 3 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index bf28e6a3db6..7572e0d2030 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -117,17 +117,33 @@ CREATE TABLE llx_product_attribute_combination
   entity INT DEFAULT 1 NOT NULL
 );
 
-INSERT INTO llx_accounting_journal (rowid, code, label, nature, active) VALUES (1,'VT', 'Journal des ventes', 1, 1);
-INSERT INTO llx_accounting_journal (rowid, code, label, nature, active) VALUES (2,'AC', 'Journal des achats', 2, 1);
-INSERT INTO llx_accounting_journal (rowid, code, label, nature, active) VALUES (3,'BQ', 'Journal de banque', 3, 1);
-INSERT INTO llx_accounting_journal (rowid, code, label, nature, active) VALUES (4,'OD', 'Journal des opérations diverses', 0, 1);
-INSERT INTO llx_accounting_journal (rowid, code, label, nature, active) VALUES (5,'AN', 'Journal des à-nouveaux', 9, 1);
 
-ALTER TABLE llx_accounting_journal ADD COLUMN entity integer DEFAULT 1;
+ALTER TABLE llx_bank_account drop foreign key bank_fk_accountancy_journal;
+
+-- Add journal entries
+INSERT INTO llx_accounting_journal (rowid, code, label, nature, active) VALUES (1,'VT', 'Sale journal', 2, 1);
+INSERT INTO llx_accounting_journal (rowid, code, label, nature, active) VALUES (2,'AC', 'Purchase journal', 3, 1);
+INSERT INTO llx_accounting_journal (rowid, code, label, nature, active) VALUES (3,'BQ', 'Bank journal', 4, 1);
+INSERT INTO llx_accounting_journal (rowid, code, label, nature, active) VALUES (4,'OD', 'Other journal', 1, 1);
+INSERT INTO llx_accounting_journal (rowid, code, label, nature, active) VALUES (5,'AN', 'Has new journal', 9, 1);
+-- Fix old entries
+UPDATE llx_accounting_journal SET nature = 1 where code = 'OD' and nature = 0;
+UPDATE llx_accounting_journal SET nature = 2 where code = 'VT' and nature = 1;
+UPDATE llx_accounting_journal SET nature = 3 where code = 'AC' and nature = 2;
+UPDATE llx_accounting_journal SET nature = 4 where (code = 'BK' or code = 'BQ') and nature = 3;
+
+UPDATE llx_bank_account as ba set accountancy_journal = 'BQ' where accountancy_journal = 'BK';
+UPDATE llx_bank_account as ba set accountancy_journal = 'OD' where accountancy_journal IS NULL;
+
+ALTER TABLE llx_bank_account ADD COLUMN fk_accountancy_journal integer;
+ALTER TABLE llx_bank_account ADD INDEX idx_fk_accountancy_journal (fk_accountancy_journal);
+
+UPDATE llx_bank_account as ba set fk_accountancy_journal = (SELECT rowid FROM llx_accounting_journal as aj where ba.accountancy_journal = aj.code) where accountancy_journal not in ('1', '2', '3', '4', '5', '6', '5', '8', '9', '10', '11', '12', '13', '14', '15');
+ALTER TABLE llx_bank_account ADD CONSTRAINT fk_bank_account_accountancy_journal FOREIGN KEY (fk_accountancy_journal) REFERENCES llx_accounting_journal (rowid);
+
 
 ALTER TABLE llx_paiementfourn ADD COLUMN model_pdf varchar(255);
 
-
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('EXPENSE_REPORT_CREATE','Expense report created','Executed when an expense report is created','expensereport',201);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('EXPENSE_REPORT_VALIDATE','Expense report validated','Executed when an expense report is validated','expensereport',202);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('EXPENSE_REPORT_APPROVE','Expense report approved','Executed when an expense report is approved','expensereport',203);
@@ -262,14 +278,6 @@ insert into llx_c_tva(fk_pays,taux,code,recuperableonly,localtax1,localtax1_type
 
 ALTER TABLE llx_events MODIFY COLUMN ip varchar(250);
 
-UPDATE llx_accounting_journal SET nature = 1 where code = 'OD' and nature = 0;
-UPDATE llx_accounting_journal SET nature = 2 where code = 'VT' and nature = 1;
-UPDATE llx_accounting_journal SET nature = 3 where code = 'AC' and nature = 2;
-UPDATE llx_accounting_journal SET nature = 4 where (code = 'BK' or code = 'BQ') and nature = 3;
-
-
-ALTER TABLE llx_bank_account CHANGE COLUMN accountancy_journal fk_accountancy_journal integer;
---ALTER TABLE llx_bank_account ADD CONSTRAINT bank_fk_accountancy_journal FOREIGN KEY (fk_accountancy_journal) REFERENCES llx_accounting_journal (rowid);
 
 
 
diff --git a/htdocs/install/mysql/tables/llx_bank_account.key.sql b/htdocs/install/mysql/tables/llx_bank_account.key.sql
index 986ca7ea550..c5f2786fd24 100644
--- a/htdocs/install/mysql/tables/llx_bank_account.key.sql
+++ b/htdocs/install/mysql/tables/llx_bank_account.key.sql
@@ -19,5 +19,6 @@
 
 
 ALTER TABLE llx_bank_account ADD UNIQUE uk_bank_account_label (label,entity);
+ALTER TABLE llx_bank_account ADD INDEX idx_fk_accountancy_journal (fk_accountancy_journal);
 
--- ALTER TABLE llx_bank_account ADD CONSTRAINT bank_fk_accountancy_journal FOREIGN KEY (fk_accountancy_journal) REFERENCES llx_accounting_journal (rowid);
+ALTER TABLE llx_bank_account ADD CONSTRAINT fk_bank_account_accountancy_journal FOREIGN KEY (fk_accountancy_journal) REFERENCES llx_accounting_journal (rowid);
diff --git a/htdocs/public/stripe/newpayment.php b/htdocs/public/stripe/newpayment.php
index 95f0f9f2134..7578be73745 100644
--- a/htdocs/public/stripe/newpayment.php
+++ b/htdocs/public/stripe/newpayment.php
@@ -537,14 +537,14 @@ if (GETPOST("source") == 'invoice')
     {
         $result=$invoice->fetch_thirdparty($invoice->socid);
     }
-    
+
     if ($action != 'dopayment') // Do not change amount if we just click on first dopayment
     {
         $amount=price2num($invoice->total_ttc - $invoice->getSommePaiement());
         if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
         $amount=price2num($amount);
     }
-    
+
     $fulltag='INV='.$invoice->ref.'.CUS='.$invoice->thirdparty->id;
     //$fulltag.='.NAM='.strtr($invoice->thirdparty->name,"-"," ");
     if (! empty($TAG)) { $tag=$TAG; $fulltag.='.TAG='.$TAG; }

From 8e68aa86acd2297ed4f1bff6487dde4f9be83c1e Mon Sep 17 00:00:00 2001
From: BENKE Charlie <charles.fr@benke.fr>
Date: Sun, 14 May 2017 15:17:40 +0200
Subject: [PATCH 344/505] problems with additionnal template type

If i active my new xml templater, and keep odt, the odt folder is added on folder to scan on my xml path
ex :
odt folder defined : c:\toto
xml folder defined : c:\tata

folder scanned with odt :  c:\toto
folder scanned with odt :  c:\toto,c:\tata
---
 htdocs/core/lib/functions2.lib.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php
index b36da631635..2f46ad49b80 100644
--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@@ -1530,8 +1530,10 @@ function getListOfModels($db,$type,$maxfilenamelength=0)
                 include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
                 $const=$obj->description;
-                $dirtoscan.=($dirtoscan?',':'').preg_replace('/[\r\n]+/',',',trim($conf->global->$const));
-                $listoffiles=array();
+                //irtoscan.=($dirtoscan?',':'').preg_replace('/[\r\n]+/',',',trim($conf->global->$const));
+                $dirtoscan= preg_replace('/[\r\n]+/',',',trim($conf->global->$const));
+
+		$listoffiles=array();
 
                 // Now we add models found in directories scanned
                 $listofdir=explode(',',$dirtoscan);
@@ -2111,4 +2113,4 @@ function cartesianArray(array $input) {
     }
 
     return $result;
-}
\ No newline at end of file
+}

From 998254d9c6426bd22980b6ccb332012650f43f8f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 14 May 2017 16:17:00 +0200
Subject: [PATCH 345/505] Finish rewrite and debug of module Stripe.

---
 htdocs/core/modules/modStripe.class.php |   2 +-
 htdocs/langs/en_US/paypal.lang          |   9 +-
 htdocs/langs/en_US/stripe.lang          |   1 +
 htdocs/public/paybox/paymentko.php      | 110 ++++++++-----
 htdocs/public/paybox/paymentok.php      |  12 +-
 htdocs/public/payment/newpayment.php    |   2 +-
 htdocs/public/payment/paymentko.php     | 165 ++++++++++++++------
 htdocs/public/payment/paymentok.php     |  80 ++++++++--
 htdocs/public/paypal/paymentko.php      | 103 ++++++------
 htdocs/public/paypal/paymentok.php      |  27 ++--
 htdocs/public/stripe/newpayment.php     |  81 ++++++++--
 htdocs/public/stripe/paymentko.php      | 165 ++++++++++++++++++++
 htdocs/public/stripe/paymentok.php      | 199 ++++++++++++++++++++++++
 htdocs/stripe/admin/stripe.php          |  20 ++-
 htdocs/stripe/lib/stripe.lib.php        |   1 +
 15 files changed, 781 insertions(+), 196 deletions(-)
 create mode 100644 htdocs/public/stripe/paymentko.php
 create mode 100644 htdocs/public/stripe/paymentok.php

diff --git a/htdocs/core/modules/modStripe.class.php b/htdocs/core/modules/modStripe.class.php
index 4f4b15fa0a4..e7e20be5b83 100644
--- a/htdocs/core/modules/modStripe.class.php
+++ b/htdocs/core/modules/modStripe.class.php
@@ -65,7 +65,7 @@ class modStripe extends DolibarrModules
         $this->picto='stripe@stripe';
 
         // Data directories to create when module is enabled.
-        $this->dirs = array('/stripe/temp');
+        $this->dirs = array();
 
         // Config pages. Put here list of php page names stored in admmin directory used to setup module.
         $this->config_page_url = array("stripe.php@stripe");
diff --git a/htdocs/langs/en_US/paypal.lang b/htdocs/langs/en_US/paypal.lang
index 3c699527018..63999f31234 100644
--- a/htdocs/langs/en_US/paypal.lang
+++ b/htdocs/langs/en_US/paypal.lang
@@ -16,15 +16,16 @@ ThisIsTransactionId=This is id of transaction: <b>%s</b>
 PAYPAL_ADD_PAYMENT_URL=Add the url of Paypal payment when you send a document by mail
 PredefinedMailContentLink=You can click on the secure link below to make your payment (PayPal) if it is not already done.\n\n%s\n\n
 YouAreCurrentlyInSandboxMode=You are currently in the "sandbox" mode
-NewPaypalPaymentReceived=New Paypal payment received
-NewPaypalPaymentFailed=New Paypal payment tried but failed
+NewOnlinePaymentReceived=New online payment received
+NewOnlinePaymentFailed=New online payment tried but failed
 PAYPAL_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or not)
 ReturnURLAfterPayment=Return URL after payment
-ValidationOfPaypalPaymentFailed=Validation of Paypal payment failed 
-PaypalConfirmPaymentPageWasCalledButFailed=Payment confirmation page for Paypal was called by Paypal but confirmation failed
+ValidationOfOnlinePaymentFailed=Validation of online payment failed 
+PaymentSystemConfirmPaymentPageWasCalledButFailed=Payment confirmation page was called by payment system returned an error
 SetExpressCheckoutAPICallFailed=SetExpressCheckout API call failed.
 DoExpressCheckoutPaymentAPICallFailed=DoExpressCheckoutPayment API call failed.
 DetailedErrorMessage=Detailed Error Message
 ShortErrorMessage=Short Error Message
 ErrorCode=Error Code
 ErrorSeverityCode=Error Severity Code
+OnlinePaymentSystem=Online payment system
\ No newline at end of file
diff --git a/htdocs/langs/en_US/stripe.lang b/htdocs/langs/en_US/stripe.lang
index 3f85dc2d544..68b853ac25b 100644
--- a/htdocs/langs/en_US/stripe.lang
+++ b/htdocs/langs/en_US/stripe.lang
@@ -9,6 +9,7 @@ ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s.
 ThisIsInformationOnPayment=This is information on payment to do
 ToComplete=To complete
 YourEMail=Email to receive payment confirmation
+STRIPE_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or not)
 Creditor=Creditor
 PaymentCode=Payment code
 StripeDoPayment=Go on payment
diff --git a/htdocs/public/paybox/paymentko.php b/htdocs/public/paybox/paymentko.php
index be5b388f6ed..9cc8a07ea70 100644
--- a/htdocs/public/paybox/paymentko.php
+++ b/htdocs/public/paybox/paymentko.php
@@ -20,7 +20,6 @@
  *     	\file       htdocs/public/paybox/paymentko.php
  *		\ingroup    paybox
  *		\brief      File to show page after a failed payment
- *		\author	    Laurent Destailleur
  */
 
 define("NOLOGIN",1);		// This means this output page does not require to be logged.
@@ -52,6 +51,8 @@ $langs->load("stripe");
 
 $object = new stdClass();   // For triggers
 
+$paymentmethod='paybox';
+
 
 /*
  * Actions
@@ -72,51 +73,74 @@ foreach($_POST as $k => $v) $tracepost .= "{$k} - {$v}\n";
 dol_syslog("POST=".$tracepost, LOG_DEBUG, 0, '_paybox');
 
 
-// Appel des triggers
-include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-$interface=new Interfaces($db);
-$result=$interface->run_triggers('PAYBOX_PAYMENT_OK',$object,$user,$langs,$conf);
-if ($result < 0) { $error++; $errors=$interface->errors; }
-// Fin appel triggers
-
-
-// Send an email
-if (! empty($conf->global->PAYBOX_PAYONLINE_SENDEMAIL))
+if (! empty($_SESSION['ipaddress']))      // To avoid to make action twice
 {
-	$sendto=$conf->global->PAYBOX_PAYONLINE_SENDEMAIL;
-	$from=$conf->global->MAILING_EMAIL_FROM;
-
-	// Define link to login card
-	$appli=constant('DOL_APPLICATION_TITLE');
-	if (! empty($conf->global->MAIN_APPLICATION_TITLE))
-	{
-	    $appli=$conf->global->MAIN_APPLICATION_TITLE;
-	    if (preg_match('/\d\.\d/', $appli))
-	    {
-	        if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli.=" (".DOL_VERSION.")";	// If new title contains a version that is different than core
-	    }
-	    else $appli.=" ".DOL_VERSION;
-	}
-	else $appli.=" ".DOL_VERSION;
-	
-	$urlback=$_SERVER["REQUEST_URI"];
-	$topic='['.$appli.'] '.$langs->transnoentitiesnoconv("NewPayboxPaymentFailed");
-	$content=$langs->transnoentitiesnoconv("NewPayboxPaymentFailed")."\n".$fulltag;
-	require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-	$mailfile = new CMailFile($topic, $sendto, $from, $content);
-
-	$result=$mailfile->sendfile();
-	if ($result)
-	{
-		dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_paybox');
-	}
-	else
-	{
-		dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_paybox');
-	}
+    // Get on url call
+    $fulltag            = $FULLTAG;
+    $onlinetoken        = empty($PAYPALTOKEN)?$_SESSION['onlinetoken']:$PAYPALTOKEN;
+    $payerID            = empty($PAYPALPAYERID)?$_SESSION['payerID']:$PAYPALPAYERID;
+    // Set by newpayment.php
+    $paymentType        = $_SESSION['PaymentType'];
+    $currencyCodeType   = $_SESSION['currencyCodeType'];
+    $FinalPaymentAmt    = $_SESSION["Payment_Amount"];
+    // From env
+    $ipaddress          = $_SESSION['ipaddress'];
+    
+    // Appel des triggers
+    include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+    $interface=new Interfaces($db);
+    $result=$interface->run_triggers('PAYBOX_PAYMENT_OK',$object,$user,$langs,$conf);
+    if ($result < 0) { $error++; $errors=$interface->errors; }
+    // Fin appel triggers
+    
+    // Send an email
+    $sendemail = '';
+    if (! empty($conf->global->PAYBOX_PAYONLINE_SENDEMAIL))  $sendemail=$conf->global->PAYBOX_PAYONLINE_SENDEMAIL;
+    
+    if ($sendemail)
+    {
+    	$sendto=$sendemail;
+    	$from=$conf->global->MAILING_EMAIL_FROM;
+    
+    	// Define link to login card
+    	$appli=constant('DOL_APPLICATION_TITLE');
+    	if (! empty($conf->global->MAIN_APPLICATION_TITLE))
+    	{
+    	    $appli=$conf->global->MAIN_APPLICATION_TITLE;
+    	    if (preg_match('/\d\.\d/', $appli))
+    	    {
+    	        if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli.=" (".DOL_VERSION.")";	// If new title contains a version that is different than core
+    	    }
+    	    else $appli.=" ".DOL_VERSION;
+    	}
+    	else $appli.=" ".DOL_VERSION;
+    	
+    	$urlback=$_SERVER["REQUEST_URI"];
+    	$topic='['.$appli.'] '.$langs->transnoentitiesnoconv("NewOnlinePaymentFailed");
+    	$content="";
+    	$content.=$langs->transnoentitiesnoconv("ValidationOfOnlinePaymentFailed")."\n";
+    	$content.="\n";
+    	$content.=$langs->transnoentitiesnoconv("TechnicalInformation").":\n";
+    	$content.=$langs->transnoentitiesnoconv("OnlinePaymentSystem").': '.$paymentmethod."<br>\n";
+    	$content.=$langs->transnoentitiesnoconv("ReturnURLAfterPayment").': '.$urlback."\n";
+    	$content.="tag=".$fulltag."\npaymentType=".$paymentType." currencycodeType=".$currencyCodeType." payerId=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt;
+    	require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+    	$mailfile = new CMailFile($topic, $sendto, $from, $content);
+    	
+    	$result=$mailfile->sendfile();
+    	if ($result)
+    	{
+    		dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_paybox');
+    	}
+    	else
+    	{
+    		dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_paybox');
+    	}
+    }
+    
+    unset($_SESSION['ipaddress']);
 }
 
-
 $head='';
 if (! empty($conf->global->PAYBOX_CSS_URL)) $head='<link rel="stylesheet" type="text/css" href="'.$conf->global->PAYBOX_CSS_URL.'?lang='.$langs->defaultlang.'">'."\n";
 
diff --git a/htdocs/public/paybox/paymentok.php b/htdocs/public/paybox/paymentok.php
index 0e91189e242..b59034b774e 100644
--- a/htdocs/public/paybox/paymentok.php
+++ b/htdocs/public/paybox/paymentok.php
@@ -20,7 +20,6 @@
  *     	\file       htdocs/public/paybox/paymentok.php
  *		\ingroup    paybox
  *		\brief      File to show page after a successful payment
- *		\author	    Laurent Destailleur
  */
 
 define("NOLOGIN",1);		// This means this output page does not require to be logged.
@@ -62,6 +61,8 @@ if (empty($FULLTAG)) $FULLTAG=GETPOST('fulltag');
 
 $object = new stdClass();   // For triggers
 
+$paymentmethod='paybox';
+
 
 /*
  * Actions
@@ -97,7 +98,7 @@ print '<div id="dolpaymentdiv" align="center">'."\n";
 
 // Get on url call
 /*
-$token              = $PAYBOXTOKEN;
+$onlinetoken              = $PAYBOXTOKEN;
 */
 $fulltag            = $FULLTAG;
 /*$payerID            = $PAYBOXPAYERID;
@@ -108,7 +109,7 @@ $FinalPaymentAmt    = $_SESSION["Payment_Amount"];
 // From env
 $ipaddress          = $_SESSION['ipaddress'];
 
-dol_syslog("Call newpaymentok with token=".$token." paymentType=".$paymentType." currencyCodeType=".$currencyCodeType." payerID=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt." fulltag=".$fulltag);
+dol_syslog("Call newpaymentok with token=".$onlinetoken." paymentType=".$paymentType." currencyCodeType=".$currencyCodeType." payerID=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt." fulltag=".$fulltag);
 */
 
 
@@ -149,7 +150,7 @@ if (! empty($conf->global->PAYBOX_PAYONLINE_SENDEMAIL))
 	else $appli.=" ".DOL_VERSION;
 	
 	$urlback=$_SERVER["REQUEST_URI"];
-	$topic='['.$appli.'] '.$langs->transnoentitiesnoconv("NewPayboxPaymentReceived");
+	$topic='['.$appli.'] '.$langs->transnoentitiesnoconv("NewOnlinePaymentReceived");
 	$tmptag=dolExplodeIntoArray($fulltag,'.','=');
 	$content="";
 	if (! empty($tmptag['MEM']))
@@ -162,10 +163,11 @@ if (! empty($conf->global->PAYBOX_PAYONLINE_SENDEMAIL))
 	}
 	else
 	{
-		$content.=$langs->transnoentitiesnoconv("NewPayboxPaymentReceived")."<br>\n";
+		$content.=$langs->transnoentitiesnoconv("NewOnlinePaymentReceived")."<br>\n";
 	}
 	$content.="<br>\n";
 	$content.=$langs->transnoentitiesnoconv("TechnicalInformation").":<br>\n";
+    $content.=$langs->transnoentitiesnoconv("OnlinePaymentSystem").': '.$paymentmethod."<br>\n";
 	$content.=$langs->transnoentitiesnoconv("ReturnURLAfterPayment").': '.$urlback."<br>\n";
 	$content.="tag=".$fulltag."<br>\n";
 
diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index 744f477782e..788321b6212 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -114,7 +114,7 @@ $ref=$REF=GETPOST('ref','alpha');
 $TAG=GETPOST("tag",'alpha');
 $FULLTAG=GETPOST("fulltag",'alpha');		// fulltag is tag with more informations
 $SECUREKEY=GETPOST("securekey");	        // Secure key
-if ($paymentmethod) $FULLTAG.=($FULLTAG?'.':'').'PM='.$paymentmethod;
+if ($paymentmethod && ! preg_match('/'.preg_quote('PM='.$paymentmethod,'/').'/', $FULLTAG)) $FULLTAG.=($FULLTAG?'.':'').'PM='.$paymentmethod;
 
 if (! empty($SOURCE))
 {
diff --git a/htdocs/public/payment/paymentko.php b/htdocs/public/payment/paymentko.php
index 6ce1c3badfa..9abcfcf2c58 100644
--- a/htdocs/public/payment/paymentko.php
+++ b/htdocs/public/payment/paymentko.php
@@ -23,7 +23,6 @@
  *		\brief      File to show page after a failed payment.
  *                  This page is called by payment system with url provided to it competed with parameter TOKEN=xxx
  *                  This token can be used to get more informations.
- *		\author	    Laurent Destailleur
  */
 
 define("NOLOGIN",1);		// This means this output page does not require to be logged.
@@ -53,16 +52,40 @@ $langs->load("companies");
 $langs->load("paybox");
 $langs->load("paypal");
 
-$PAYPALTOKEN=GETPOST('TOKEN');
-if (empty($PAYPALTOKEN)) $PAYPALTOKEN=GETPOST('token');
-$PAYPALPAYERID=GETPOST('PAYERID');
-if (empty($PAYPALPAYERID)) $PAYPALPAYERID=GETPOST('PayerID');
+if (! empty($conf->paypal->enabled))
+{
+    $PAYPALTOKEN=GETPOST('TOKEN');
+    if (empty($PAYPALTOKEN)) $PAYPALTOKEN=GETPOST('token');
+    $PAYPALPAYERID=GETPOST('PAYERID');
+    if (empty($PAYPALPAYERID)) $PAYPALPAYERID=GETPOST('PayerID');
+}
+// TODO Other payment method
+
 $FULLTAG=GETPOST('FULLTAG');
 if (empty($FULLTAG)) $FULLTAG=GETPOST('fulltag');
 
+
+// Detect $paymentmethod
+$paymentmethod='';
+if (preg_match('/PM=([^\.]+)/', $FULLTAG, $reg))
+{
+    $paymentmethod=$reg[1];
+}
+if (empty($paymentmethod))
+{
+    dol_print_error(null, 'The back url does not contains a parameter fulltag that should help us to find the payment method used');
+    exit;
+}
+else
+{
+    dol_syslog("paymentmethod=".$paymentmethod);
+}
+
+
 $validpaymentmethod=array();
 if (! empty($conf->paypal->enabled)) $validpaymentmethod['paypal']='paypal';
 if (! empty($conf->paybox->enabled)) $validpaymentmethod['paybox']='paybox';
+if (! empty($conf->stripe->enabled)) $validpaymentmethod['stripe']='stripe';
 
 
 // Security check
@@ -90,50 +113,94 @@ foreach($_POST as $k => $v) $tracepost .= "{$k} - {$v}\n";
 dol_syslog("POST=".$tracepost, LOG_DEBUG, 0, '_payment');
 
 
-// Appel des triggers
-include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-$interface=new Interfaces($db);
-$result=$interface->run_triggers('PAYMENTONLINE_PAYMENT_KO',$object,$user,$langs,$conf);
-if ($result < 0) { $error++; $errors=$interface->errors; }
-// Fin appel triggers
-
-
-// Send an email
-if (! empty($conf->paypal->enabled))
+if (! empty($_SESSION['ipaddress']))      // To avoid to make action twice
 {
-	if (! empty($conf->global->PAYPAL_PAYONLINE_SENDEMAIL))
-	{
-	    // Get on url call
-	    $token              = $PAYPALTOKEN;
-	    $fulltag            = $FULLTAG;
-	    $payerID            = $PAYPALPAYERID;
-	    // Set by newpayment.php
-	    $paymentType        = $_SESSION['PaymentType'];
-	    $currencyCodeType   = $_SESSION['currencyCodeType'];
-	    $FinalPaymentAmt    = $_SESSION["Payment_Amount"];
-	    // From env
-	    $ipaddress          = $_SESSION['ipaddress'];
-	    
-	    
-		$sendto=$conf->global->PAYPAL_PAYONLINE_SENDEMAIL;
-		$from=$conf->global->MAILING_EMAIL_FROM;
-	
-		$urlback=$_SERVER["REQUEST_URI"];
-		$topic='['.$conf->global->MAIN_APPLICATION_TITLE.'] '.$langs->transnoentitiesnoconv("NewPaypalPaymentFailed");
-		$content=$langs->transnoentitiesnoconv("NewPaypalPaymentFailed")."\ntag=".$fulltag."\ntoken=".$token." paymentType=".$paymentType." currencycodeType=".$currencyCodeType." payerId=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt;
-		require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-		$mailfile = new CMailFile($topic, $sendto, $from, $content);
-	
-		$result=$mailfile->sendfile();
-		if ($result)
-		{
-			dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_payment');
-		}
-		else
-		{
-			dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_payment');
-		}
-	}
+    // Get on url call
+    $fulltag            = $FULLTAG;
+    $onlinetoken        = empty($PAYPALTOKEN)?$_SESSION['onlinetoken']:$PAYPALTOKEN;
+    $payerID            = empty($PAYPALPAYERID)?$_SESSION['payerID']:$PAYPALPAYERID;
+    // Set by newpayment.php
+    $paymentType        = $_SESSION['PaymentType'];
+    $currencyCodeType   = $_SESSION['currencyCodeType'];
+    $FinalPaymentAmt    = $_SESSION["Payment_Amount"];
+    // From env
+    $ipaddress          = $_SESSION['ipaddress'];
+        
+    // Appel des triggers
+    include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+    $interface=new Interfaces($db);
+    $result=$interface->run_triggers('PAYMENTONLINE_PAYMENT_KO',$object,$user,$langs,$conf);
+    if ($result < 0) { $error++; $errors=$interface->errors; }
+    // Fin appel triggers
+    
+    // Send an email
+    $sendemail = '';
+    if (! empty($conf->paypal->enabled))
+    {
+    	if (! empty($conf->global->PAYPAL_PAYONLINE_SENDEMAIL))
+    	{
+            $sendemail = $conf->global->PAYPAL_PAYONLINE_SENDEMAIL;
+    	}
+    }
+    // Send an email
+    if (! empty($conf->paybox->enabled))
+    {
+        if (! empty($conf->global->PAYBOX_PAYONLINE_SENDEMAIL))
+        {
+            $sendemail = $conf->global->PAYBOX_PAYONLINE_SENDEMAIL;
+        }
+    }
+    // Send an email
+    if (! empty($conf->stripe->enabled))
+    {
+        if (! empty($conf->global->STRIPE_PAYONLINE_SENDEMAIL))
+        {
+            $sendemail = $conf->global->STRIPE_PAYONLINE_SENDEMAIL;
+        }
+    }
+    
+    if ($sendemail)
+    {
+        $from=$conf->global->MAILING_EMAIL_FROM;
+        $sendto=$sendemail;
+        
+    	// Define link to login card
+    	$appli=constant('DOL_APPLICATION_TITLE');
+    	if (! empty($conf->global->MAIN_APPLICATION_TITLE))
+    	{
+    	    $appli=$conf->global->MAIN_APPLICATION_TITLE;
+    	    if (preg_match('/\d\.\d/', $appli))
+    	    {
+    	        if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli.=" (".DOL_VERSION.")";	// If new title contains a version that is different than core
+    	    }
+    	    else $appli.=" ".DOL_VERSION;
+    	}
+    	else $appli.=" ".DOL_VERSION;
+    	
+    	$urlback=$_SERVER["REQUEST_URI"];
+    	$topic='['.$appli.'] '.$langs->transnoentitiesnoconv("NewOnlinePaymentFailed");
+    	$content="";
+    	$content.=$langs->transnoentitiesnoconv("ValidationOfOnlinePaymentFailed")."\n";
+    	$content.="\n";
+    	$content.=$langs->transnoentitiesnoconv("TechnicalInformation").":\n";
+    	$content.=$langs->transnoentitiesnoconv("OnlinePaymentSystem").': '.$paymentmethod."<br>\n";
+    	$content.=$langs->transnoentitiesnoconv("ReturnURLAfterPayment").': '.$urlback."\n";
+    	$content.="tag=".$fulltag."\ntoken=".$onlinetoken." paymentType=".$paymentType." currencycodeType=".$currencyCodeType." payerId=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt;
+    	require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+    	$mailfile = new CMailFile($topic, $sendto, $from, $content);
+    
+    	$result=$mailfile->sendfile();
+    	if ($result)
+    	{
+    		dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_payment');
+    	}
+    	else
+    	{
+    		dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_payment');
+    	}
+    }
+    
+    unset($_SESSION['ipaddress']);
 }
 
 $head='';
@@ -150,7 +217,7 @@ print '<span id="dolpaymentspan"></span>'."\n";
 print '<div id="dolpaymentdiv" align="center">'."\n";
 print $langs->trans("YourPaymentHasNotBeenRecorded")."<br><br>";
 
-if (! empty($conf->global->PAYPAL_MESSAGE_KO)) print $conf->global->PAYPAL_MESSAGE_KO;
+if (! empty($conf->global->PAYMENT_MESSAGE_KO)) print $conf->global->PAYMENT_MESSAGE_KO;
 print "\n</div>\n";
 
 
diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index c1b4329c7be..26022dcd4f8 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -23,7 +23,6 @@
  *		\brief      File to show page after a successful payment
  *                  This page is called by payment system with url provided to it completed with parameter TOKEN=xxx
  *                  This token can be used to get more informations.
- *		\author	    Laurent Destailleur
  */
 
 define("NOLOGIN",1);		// This means this output page does not require to be logged.
@@ -88,10 +87,10 @@ if (! empty($conf->paypal->enabled))
     if (empty($PAYPALTOKEN)) $PAYPALTOKEN=GETPOST('token');
     $PAYPALPAYERID=GETPOST('PAYERID');
     if (empty($PAYPALPAYERID)) $PAYPALPAYERID=GETPOST('PayerID');
-    $FULLTAG=GETPOST('FULLTAG');
-    if (empty($FULLTAG)) $FULLTAG=GETPOST('fulltag');
 }
 
+$FULLTAG=GETPOST('FULLTAG');
+if (empty($FULLTAG)) $FULLTAG=GETPOST('fulltag');
 $source=GETPOST('source');
 $ref=GETPOST('ref');
 
@@ -116,6 +115,7 @@ else
 $validpaymentmethod=array();
 if (! empty($conf->paypal->enabled)) $validpaymentmethod['paypal']='paypal';
 if (! empty($conf->paybox->enabled)) $validpaymentmethod['paybox']='paybox';
+if (! empty($conf->stripe->enabled)) $validpaymentmethod['stripe']='stripe';
 
 // Security check
 if (empty($validpaymentmethod)) accessforbidden('', 0, 0, 1);
@@ -169,7 +169,7 @@ if (! empty($conf->paypal->enabled))
 	if ($PAYPALTOKEN)
 	{
 	    // Get on url call
-	    $token              = $PAYPALTOKEN;
+	    $onlinetoken              = $PAYPALTOKEN;
 	    $fulltag            = $FULLTAG;
 	    $payerID            = $PAYPALPAYERID;
 	    // Set by newpayment.php
@@ -179,17 +179,17 @@ if (! empty($conf->paypal->enabled))
 	    // From env
 	    $ipaddress          = $_SESSION['ipaddress'];
 	
-		dol_syslog("Call paymentok with token=".$token." paymentType=".$paymentType." currencyCodeType=".$currencyCodeType." payerID=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt." fulltag=".$fulltag, LOG_DEBUG, 0, '_paypal');
+		dol_syslog("Call paymentok with token=".$onlinetoken." paymentType=".$paymentType." currencyCodeType=".$currencyCodeType." payerID=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt." fulltag=".$fulltag, LOG_DEBUG, 0, '_paypal');
 	
 		// Validate record
 	    if (! empty($paymentType))
 	    {
 	        dol_syslog("We call GetExpressCheckoutDetails", LOG_DEBUG, 0, '_payment');
-	        $resArray=getDetails($token);
+	        $resArray=getDetails($onlinetoken);
 	        //var_dump($resarray);
 	
-	        dol_syslog("We call DoExpressCheckoutPayment token=".$token." paymentType=".$paymentType." currencyCodeType=".$currencyCodeType." payerID=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt." fulltag=".$fulltag, LOG_DEBUG, 0, '_payment');
-	        $resArray=confirmPayment($token, $paymentType, $currencyCodeType, $payerID, $ipaddress, $FinalPaymentAmt, $fulltag);
+	        dol_syslog("We call DoExpressCheckoutPayment token=".$onlinetoken." paymentType=".$paymentType." currencyCodeType=".$currencyCodeType." payerID=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt." fulltag=".$fulltag, LOG_DEBUG, 0, '_payment');
+	        $resArray=confirmPayment($onlinetoken, $paymentType, $currencyCodeType, $payerID, $ipaddress, $FinalPaymentAmt, $fulltag);
 	
 	        $ack = strtoupper($resArray["ACK"]);
 	        if ($ack=="SUCCESS" || $ack=="SUCCESSWITHWARNING")
@@ -233,6 +233,17 @@ if (! empty($conf->paypal->enabled))
 
 if ($ispaymentok)
 {
+    // Get on url call
+    $fulltag            = $FULLTAG;
+    $onlinetoken        = empty($PAYPALTOKEN)?$_SESSION['onlinetoken']:$PAYPALTOKEN;
+    $payerID            = empty($PAYPALPAYERID)?$_SESSION['payerID']:$PAYPALPAYERID;
+    // Set by newpayment.php
+    $paymentType        = $_SESSION['PaymentType'];
+    $currencyCodeType   = $_SESSION['currencyCodeType'];
+    $FinalPaymentAmt    = $_SESSION["Payment_Amount"];
+    // From env
+    $ipaddress          = $_SESSION['ipaddress'];
+    
     // Appel des triggers
     include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
     $interface=new Interfaces($db);
@@ -250,6 +261,7 @@ if ($ispaymentok)
     // TODO Remove local option to keep only the generic one ?
     if ($paymentmethod == 'paypal' && ! empty($conf->global->PAYPAL_PAYONLINE_SENDEMAIL)) $sendemail=$conf->global->PAYPAL_PAYONLINE_SENDEMAIL;
     if ($paymentmethod == 'paybox' && ! empty($conf->global->PAYBOX_PAYONLINE_SENDEMAIL)) $sendemail=$conf->global->PAYBOX_PAYONLINE_SENDEMAIL;
+    if ($paymentmethod == 'stripe' && ! empty($conf->global->STRIPE_PAYONLINE_SENDEMAIL)) $sendemail=$conf->global->STRIPE_PAYONLINE_SENDEMAIL;
     
 	// Send an email
     if ($sendemail)
@@ -261,8 +273,21 @@ if ($ispaymentok)
 		$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
 		//$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
 
+		// Define link to login card
+		$appli=constant('DOL_APPLICATION_TITLE');
+		if (! empty($conf->global->MAIN_APPLICATION_TITLE))
+		{
+		    $appli=$conf->global->MAIN_APPLICATION_TITLE;
+		    if (preg_match('/\d\.\d/', $appli))
+		    {
+		        if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli.=" (".DOL_VERSION.")";	// If new title contains a version that is different than core
+		    }
+		    else $appli.=" ".DOL_VERSION;
+		}
+		else $appli.=" ".DOL_VERSION;
+		
 		$urlback=$_SERVER["REQUEST_URI"];
-		$topic='['.$conf->global->MAIN_APPLICATION_TITLE.'] '.$langs->transnoentitiesnoconv("NewPaypalPaymentReceived");
+		$topic='['.$appli.'] '.$langs->transnoentitiesnoconv("NewOnlinePaymentReceived");
 		$tmptag=dolExplodeIntoArray($fulltag,'.','=');
 		$content="";
 		if (! empty($tmptag['MEM']))
@@ -279,9 +304,9 @@ if ($ispaymentok)
 		}
 		$content.="<br>\n";
 		$content.=$langs->transnoentitiesnoconv("TechnicalInformation").":<br>\n";
-		$content.=$langs->transnoentitiesnoconv("PaymentSystem").': '.$paymentmethod."<br>\n";
+		$content.=$langs->transnoentitiesnoconv("OnlinePaymentSystem").': '.$paymentmethod."<br>\n";
 		$content.=$langs->transnoentitiesnoconv("ReturnURLAfterPayment").': '.$urlback."<br>\n";
-		$content.="tag=".$fulltag." token=".$token." paymentType=".$paymentType." currencycodeType=".$currencyCodeType." payerId=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt;
+		$content.="tag=".$fulltag."\ntoken=".$onlinetoken." paymentType=".$paymentType." currencycodeType=".$currencyCodeType." payerId=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt;
 
 		$ishtml=dol_textishtml($content);	// May contain urls
 
@@ -301,6 +326,17 @@ if ($ispaymentok)
 }
 else
 {
+    // Get on url call
+    $fulltag            = $FULLTAG;
+    $onlinetoken        = empty($PAYPALTOKEN)?$_SESSION['onlinetoken']:$PAYPALTOKEN;
+    $payerID            = empty($PAYPALPAYERID)?$_SESSION['payerID']:$PAYPALPAYERID;
+    // Set by newpayment.php
+    $paymentType        = $_SESSION['PaymentType'];
+    $currencyCodeType   = $_SESSION['currencyCodeType'];
+    $FinalPaymentAmt    = $_SESSION["Payment_Amount"];
+    // From env
+    $ipaddress          = $_SESSION['ipaddress'];
+    
     // Appel des triggers
     include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
     $interface=new Interfaces($db);
@@ -322,6 +358,7 @@ else
     // TODO Remove local option to keep only the generic one ?
     if ($paymentmethod == 'paypal' && ! empty($conf->global->PAYPAL_PAYONLINE_SENDEMAIL)) $sendemail=$conf->global->PAYPAL_PAYONLINE_SENDEMAIL;
     if ($paymentmethod == 'paybox' && ! empty($conf->global->PAYBOX_PAYONLINE_SENDEMAIL)) $sendemail=$conf->global->PAYBOX_PAYONLINE_SENDEMAIL;
+    if ($paymentmethod == 'stripe' && ! empty($conf->global->STRIPE_PAYONLINE_SENDEMAIL)) $sendemail=$conf->global->STRIPE_PAYONLINE_SENDEMAIL;
     
     // Send an email
     if ($sendemail)
@@ -333,15 +370,28 @@ else
         $urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
         //$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
          
+        // Define link to login card
+        $appli=constant('DOL_APPLICATION_TITLE');
+        if (! empty($conf->global->MAIN_APPLICATION_TITLE))
+        {
+            $appli=$conf->global->MAIN_APPLICATION_TITLE;
+            if (preg_match('/\d\.\d/', $appli))
+            {
+                if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli.=" (".DOL_VERSION.")";	// If new title contains a version that is different than core
+            }
+            else $appli.=" ".DOL_VERSION;
+        }
+        else $appli.=" ".DOL_VERSION;
+        
         $urlback=$_SERVER["REQUEST_URI"];
-        $topic='['.$conf->global->MAIN_APPLICATION_TITLE.'] '.$langs->transnoentitiesnoconv("ValidationOfPaypalPaymentFailed");
+        $topic='['.$appli.'] '.$langs->transnoentitiesnoconv("ValidationOfPaymentFailed");
         $content="";
-        $content.=$langs->transnoentitiesnoconv("PaypalConfirmPaymentPageWasCalledButFailed")."\n";
+        $content.=$langs->transnoentitiesnoconv("PaymentSystemConfirmPaymentPageWasCalledButFailed")."\n";
         $content.="\n";
         $content.=$langs->transnoentitiesnoconv("TechnicalInformation").":\n";
-		$content.=$langs->transnoentitiesnoconv("PaymentSystem").': '.$paymentmethod."<br>\n";
+		$content.=$langs->transnoentitiesnoconv("OnlinePaymentSystem").': '.$paymentmethod."\n";
         $content.=$langs->transnoentitiesnoconv("ReturnURLAfterPayment").': '.$urlback."\n";
-        $content.="tag=".$fulltag."\ntoken=".$token." paymentType=".$paymentType." currencycodeType=".$currencyCodeType." payerId=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt;
+        $content.="tag=".$fulltag."\ntoken=".$onlinetoken." paymentType=".$paymentType." currencycodeType=".$currencyCodeType." payerId=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt;
          
         $ishtml=dol_textishtml($content);	// May contain urls
          
diff --git a/htdocs/public/paypal/paymentko.php b/htdocs/public/paypal/paymentko.php
index e432db2e317..a4e3c0a83ca 100644
--- a/htdocs/public/paypal/paymentko.php
+++ b/htdocs/public/paypal/paymentko.php
@@ -23,7 +23,6 @@
  *		\brief      File to show page after a failed payment.
  *                  This page is called by paypal with url provided to payal competed with parameter TOKEN=xxx
  *                  This token can be used to get more informations.
- *		\author	    Laurent Destailleur
  */
 
 define("NOLOGIN",1);		// This means this output page does not require to be logged.
@@ -63,6 +62,8 @@ if (empty($FULLTAG)) $FULLTAG=GETPOST('fulltag');
 
 $object = new stdClass();   // For triggers
 
+$paymentmethod='paypal';
+
 
 /*
  * Actions
@@ -81,61 +82,73 @@ $tracepost = "";
 foreach($_POST as $k => $v) $tracepost .= "{$k} - {$v}\n";
 dol_syslog("POST=".$tracepost, LOG_DEBUG, 0, '_paypal');
 
-
-// Appel des triggers
-include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-$interface=new Interfaces($db);
-$result=$interface->run_triggers('PAYPAL_PAYMENT_KO',$object,$user,$langs,$conf);
-if ($result < 0) { $error++; $errors=$interface->errors; }
-// Fin appel triggers
-
-
-// Send an email
-if (! empty($conf->global->PAYPAL_PAYONLINE_SENDEMAIL))
+if (! empty($_SESSION['ipaddress']))      // To avoid to make action twice
 {
     // Get on url call
-    $token              = $PAYPALTOKEN;
     $fulltag            = $FULLTAG;
-    $payerID            = $PAYPALPAYERID;
+    $onlinetoken        = empty($PAYPALTOKEN)?$_SESSION['onlinetoken']:$PAYPALTOKEN;
+    $payerID            = empty($PAYPALPAYERID)?$_SESSION['payerID']:$PAYPALPAYERID;
     // Set by newpayment.php
     $paymentType        = $_SESSION['PaymentType'];
     $currencyCodeType   = $_SESSION['currencyCodeType'];
     $FinalPaymentAmt    = $_SESSION["Payment_Amount"];
     // From env
     $ipaddress          = $_SESSION['ipaddress'];
+        
+    // Appel des triggers
+    include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+    $interface=new Interfaces($db);
+    $result=$interface->run_triggers('PAYPAL_PAYMENT_KO',$object,$user,$langs,$conf);
+    if ($result < 0) { $error++; $errors=$interface->errors; }
+    // Fin appel triggers
     
+    // Send an email
+    $sendemail = '';
+    if (! empty($conf->global->PAYPAL_PAYONLINE_SENDEMAIL))  $sendemail=$conf->global->PAYPAL_PAYONLINE_SENDEMAIL;
     
-	$sendto=$conf->global->PAYPAL_PAYONLINE_SENDEMAIL;
-	$from=$conf->global->MAILING_EMAIL_FROM;
-
-	// Define link to login card
-	$appli=constant('DOL_APPLICATION_TITLE');
-	if (! empty($conf->global->MAIN_APPLICATION_TITLE))
-	{
-	    $appli=$conf->global->MAIN_APPLICATION_TITLE;
-	    if (preg_match('/\d\.\d/', $appli))
-	    {
-	        if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli.=" (".DOL_VERSION.")";	// If new title contains a version that is different than core
-	    }
-	    else $appli.=" ".DOL_VERSION;
-	}
-	else $appli.=" ".DOL_VERSION;
-	
-	$urlback=$_SERVER["REQUEST_URI"];
-	$topic='['.$appli.'] '.$langs->transnoentitiesnoconv("NewPaypalPaymentFailed");
-	$content=$langs->transnoentitiesnoconv("NewPaypalPaymentFailed")."\ntag=".$fulltag."\ntoken=".$token." paymentType=".$paymentType." currencycodeType=".$currencyCodeType." payerId=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt;
-	require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-	$mailfile = new CMailFile($topic, $sendto, $from, $content);
-
-	$result=$mailfile->sendfile();
-	if ($result)
-	{
-		dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_paypal');
-	}
-	else
-	{
-		dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_paypal');
-	}
+    if ($sendemail)
+    {
+    	$sendto=$sendemail;
+    	$from=$conf->global->MAILING_EMAIL_FROM;
+    
+    	// Define link to login card
+    	$appli=constant('DOL_APPLICATION_TITLE');
+    	if (! empty($conf->global->MAIN_APPLICATION_TITLE))
+    	{
+    	    $appli=$conf->global->MAIN_APPLICATION_TITLE;
+    	    if (preg_match('/\d\.\d/', $appli))
+    	    {
+    	        if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli.=" (".DOL_VERSION.")";	// If new title contains a version that is different than core
+    	    }
+    	    else $appli.=" ".DOL_VERSION;
+    	}
+    	else $appli.=" ".DOL_VERSION;
+    	
+    	$urlback=$_SERVER["REQUEST_URI"];
+    	$topic='['.$appli.'] '.$langs->transnoentitiesnoconv("NewOnlinePaymentFailed");
+    	$content="";
+    	$content.=$langs->transnoentitiesnoconv("ValidationOfOnlinePaymentFailed")."\n";
+    	$content.="\n";
+    	$content.=$langs->transnoentitiesnoconv("TechnicalInformation").":\n";
+    	$content.=$langs->transnoentitiesnoconv("OnlinePaymentSystem").': '.$paymentmethod."<br>\n";
+    	$content.=$langs->transnoentitiesnoconv("ReturnURLAfterPayment").': '.$urlback."\n";
+    	$content.="tag=".$fulltag."\ntoken=".$onlinetoken." paymentType=".$paymentType." currencycodeType=".$currencyCodeType." payerId=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt;
+    
+    	require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+    	$mailfile = new CMailFile($topic, $sendto, $from, $content);
+    
+    	$result=$mailfile->sendfile();
+    	if ($result)
+    	{
+    		dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_paypal');
+    	}
+    	else
+    	{
+    		dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_paypal');
+    	}
+    }
+    
+    unset($_SESSION['ipaddress']);
 }
 
 
diff --git a/htdocs/public/paypal/paymentok.php b/htdocs/public/paypal/paymentok.php
index e3f2ed201e5..d98a6085e3e 100644
--- a/htdocs/public/paypal/paymentok.php
+++ b/htdocs/public/paypal/paymentok.php
@@ -23,7 +23,6 @@
  *		\brief      File to show page after a successful payment
  *                  This page is called by paypal with url provided to payal completed with parameter TOKEN=xxx
  *                  This token can be used to get more informations.
- *		\author	    Laurent Destailleur
  */
 
 define("NOLOGIN",1);		// This means this output page does not require to be logged.
@@ -94,6 +93,8 @@ if (empty($FULLTAG)) $FULLTAG=GETPOST('fulltag');
 
 $object = new stdClass();   // For triggers
 
+$paymentmethod='paypal';
+
 
 /*
  * Actions
@@ -128,7 +129,7 @@ print '<div id="dolpaymentdiv" align="center">'."\n";
 if ($PAYPALTOKEN)
 {
     // Get on url call
-    $token              = $PAYPALTOKEN;
+    $onlinetoken        = $PAYPALTOKEN;
     $fulltag            = $FULLTAG;
     $payerID            = $PAYPALPAYERID;
     // Set by newpayment.php
@@ -138,18 +139,18 @@ if ($PAYPALTOKEN)
     // From env
     $ipaddress          = $_SESSION['ipaddress'];
 
-	dol_syslog("Call paymentok with token=".$token." paymentType=".$paymentType." currencyCodeType=".$currencyCodeType." payerID=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt." fulltag=".$fulltag, LOG_DEBUG, 0, '_paypal');
+	dol_syslog("Call paymentok with token=".$onlinetoken." paymentType=".$paymentType." currencyCodeType=".$currencyCodeType." payerID=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt." fulltag=".$fulltag, LOG_DEBUG, 0, '_paypal');
 
 
 	// Validate record
     if (! empty($paymentType))
     {
         dol_syslog("We call GetExpressCheckoutDetails", LOG_DEBUG, 0, '_paypal');
-        $resArray=getDetails($token);
+        $resArray=getDetails($onlinetoken);
         //var_dump($resarray);
 
-        dol_syslog("We call DoExpressCheckoutPayment token=".$token." paymentType=".$paymentType." currencyCodeType=".$currencyCodeType." payerID=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt." fulltag=".$fulltag, LOG_DEBUG, 0, '_paypal');
-        $resArray=confirmPayment($token, $paymentType, $currencyCodeType, $payerID, $ipaddress, $FinalPaymentAmt, $fulltag);
+        dol_syslog("We call DoExpressCheckoutPayment token=".$onlinetoken." paymentType=".$paymentType." currencyCodeType=".$currencyCodeType." payerID=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt." fulltag=".$fulltag, LOG_DEBUG, 0, '_paypal');
+        $resArray=confirmPayment($onlinetoken, $paymentType, $currencyCodeType, $payerID, $ipaddress, $FinalPaymentAmt, $fulltag);
 
         $ack = strtoupper($resArray["ACK"]);
         if($ack=="SUCCESS" || $ack=="SUCCESSWITHWARNING")
@@ -202,7 +203,7 @@ if ($PAYPALTOKEN)
 				else $appli.=" ".DOL_VERSION;
 				
 				$urlback=$_SERVER["REQUEST_URI"];
-				$topic='['.$appli.'] '.$langs->transnoentitiesnoconv("NewPaypalPaymentReceived");
+				$topic='['.$appli.'] '.$langs->transnoentitiesnoconv("NewOnlinePaymentReceived");
 				$tmptag=dolExplodeIntoArray($fulltag,'.','=');
 				$content="";
 				if (! empty($tmptag['MEM']))
@@ -215,12 +216,13 @@ if ($PAYPALTOKEN)
 				}
 				else
 				{
-					$content.=$langs->transnoentitiesnoconv("NewPaypalPaymentReceived")."<br>\n";
+					$content.=$langs->transnoentitiesnoconv("NewOnlinePaymentReceived")."<br>\n";
 				}
 				$content.="<br>\n";
 				$content.=$langs->transnoentitiesnoconv("TechnicalInformation").":<br>\n";
+                $content.=$langs->transnoentitiesnoconv("OnlinePaymentSystem").': '.$paymentmethod."<br>\n";
 				$content.=$langs->transnoentitiesnoconv("ReturnURLAfterPayment").': '.$urlback."<br>\n";
-				$content.="tag=".$fulltag." token=".$token." paymentType=".$paymentType." currencycodeType=".$currencyCodeType." payerId=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt;
+				$content.="tag=".$fulltag."\ntoken=".$onlinetoken." paymentType=".$paymentType." currencycodeType=".$currencyCodeType." payerId=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt;
 
 				$ishtml=dol_textishtml($content);	// May contain urls
 
@@ -285,13 +287,14 @@ if ($PAYPALTOKEN)
 				else $appli.=" ".DOL_VERSION;
 				
 				$urlback=$_SERVER["REQUEST_URI"];
-				$topic='['.$appli.'] '.$langs->transnoentitiesnoconv("ValidationOfPaypalPaymentFailed");
+				$topic='['.$appli.'] '.$langs->transnoentitiesnoconv("ValidationOfPaymentFailed");
 				$content="";
-				$content.=$langs->transnoentitiesnoconv("PaypalConfirmPaymentPageWasCalledButFailed")."\n";
+				$content.=$langs->transnoentitiesnoconv("PaymentSystemConfirmPaymentPageWasCalledButFailed")."\n";
 				$content.="\n";
 				$content.=$langs->transnoentitiesnoconv("TechnicalInformation").":\n";
+                $content.=$langs->transnoentitiesnoconv("OnlinePaymentSystem").': '.$paymentmethod."\n";
 				$content.=$langs->transnoentitiesnoconv("ReturnURLAfterPayment").': '.$urlback."\n";
-				$content.="tag=".$fulltag."\ntoken=".$token." paymentType=".$paymentType." currencycodeType=".$currencyCodeType." payerId=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt;
+				$content.="tag=".$fulltag."\ntoken=".$onlinetoken." paymentType=".$paymentType." currencycodeType=".$currencyCodeType." payerId=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt;
 
 				$ishtml=dol_textishtml($content);	// May contain urls
 
diff --git a/htdocs/public/stripe/newpayment.php b/htdocs/public/stripe/newpayment.php
index 7578be73745..5975d349fe4 100644
--- a/htdocs/public/stripe/newpayment.php
+++ b/htdocs/public/stripe/newpayment.php
@@ -98,7 +98,7 @@ $ref=$REF=GETPOST('ref','alpha');
 $TAG=GETPOST("tag",'alpha');
 $FULLTAG=GETPOST("fulltag",'alpha');		// fulltag is tag with more informations
 $SECUREKEY=GETPOST("securekey");	        // Secure key
-$FULLTAG.=($FULLTAG?'.':'').'PM=stripe';
+if (! preg_match('/'.preg_quote('PM=stripe','/').'/', $FULLTAG)) $FULLTAG.=($FULLTAG?'.':'').'PM=stripe';
 
 if (! empty($SOURCE))
 {
@@ -185,7 +185,7 @@ if (! empty($conf->global->STRIPE_SECURITY_TOKEN))
  * Actions
  */
 
-if ($action == 'dopayment')    // We click on button Create payment that lead on this page
+if ($action == 'dopayment')    // We click on button Create payment
 {
     if (GETPOST('newamount')) $amount = GETPOST('newamount');
     else 
@@ -197,25 +197,37 @@ if ($action == 'dopayment')    // We click on button Create payment that lead on
 
 if ($action == 'charge')
 {
-    dol_syslog("POST keys  : ".join(',', array_keys($_POST)));
-    dol_syslog("POST values: ".join(',', $_POST));
+    // Correct the amount according to unit of currency
+    // See https://support.stripe.com/questions/which-zero-decimal-currencies-does-stripe-support
+    $arrayzerounitcurrency=array('BIF', 'CLP', 'DJF', 'GNF', 'JPY', 'KMF', 'KRW', 'MGA', 'PYG', 'RWF', 'VND', 'VUV', 'XAF', 'XOF', 'XPF');
+    if (! in_array($currency, $arrayzerounitcurrency)) $amount=$amount * 100;
     
-    $token = GETPOST("stripeToken");
-    $email = GETPOST("stripeEmail");
+    dol_syslog("POST keys  : ".join(',', array_keys($_POST)), LOG_DEBUG, 0, '_stripe');
+    dol_syslog("POST values: ".join(',', $_POST), LOG_DEBUG, 0, '_stripe');
+    
+    $stripeToken = GETPOST("stripeToken",'alpha');
+    $email = GETPOST("stripeEmail",'alpha');
 
+    dol_syslog("stripeToken = ".$stripeToken, LOG_DEBUG, 0, '_stripe');
+    dol_syslog("stripeEmail = ".$stripeEmail, LOG_DEBUG, 0, '_stripe');
+    
+    $error = 0;
+    
     try {
+        dol_syslog("Create customer", LOG_DEBUG, 0, '_stripe');
         $customer = \Stripe\Customer::create(array(
             'email' => $email,
-            'card'  => $token
+            'card'  => $stripeToken
             // TODO
         ));
          
+        dol_syslog("Create charge", LOG_DEBUG, 0, '_stripe');
         $charge = \Stripe\Charge::create(array(
             'customer' => $customer->id,
             'amount'   => price2num($amount, 'MU'),
-            'currency' => $conf->currency,
-            // TODO
-            'description' => 'Invoice payment N: '.$ref
+            'currency' => $currency,
+            'description' => 'Stripe payment: '.$FULLTAG,
+            'statement_descriptor' => dol_trunc(dol_trunc(dol_string_unaccent($mysoc->name), 6, 'right', 'UTF-8', 1).' '.$FULLTAG, 22, 'right', 'UTF-8', 1)     // 22 chars
         ));
     } catch(\Stripe\Error\Card $e) {
         // Since it's a decline, \Stripe\Error\Card will be caught
@@ -229,39 +241,73 @@ if ($action == 'charge')
         print('Param is:' . $err['param'] . "\n");
         print('Message is:' . $err['message'] . "\n");
     
+        $error++;
         setEventMessages($e->getMessage(), null, 'errors');
+        dol_syslog($e->getMessage(), LOG_WARNING, 0, '_stripe');
         $action='';
     } catch (\Stripe\Error\RateLimit $e) {
         // Too many requests made to the API too quickly
+        $error++;
+        dol_syslog($e->getMessage(), LOG_WARNING, 0, '_stripe');
         setEventMessages($e->getMessage(), null, 'errors');
         $action='';
     } catch (\Stripe\Error\InvalidRequest $e) {
         // Invalid parameters were supplied to Stripe's API
+        $error++;
+        dol_syslog($e->getMessage(), LOG_WARNING, 0, '_stripe');
         setEventMessages($e->getMessage(), null, 'errors');
         $action='';
     } catch (\Stripe\Error\Authentication $e) {
         // Authentication with Stripe's API failed
         // (maybe you changed API keys recently)
+        $error++;
+        dol_syslog($e->getMessage(), LOG_WARNING, 0, '_stripe');
         setEventMessages($e->getMessage(), null, 'errors');
         $action='';
     } catch (\Stripe\Error\ApiConnection $e) {
         // Network communication with Stripe failed
+        $error++;
+        dol_syslog($e->getMessage(), LOG_WARNING, 0, '_stripe');
         setEventMessages($e->getMessage(), null, 'errors');
         $action='';
     } catch (\Stripe\Error\Base $e) {
         // Display a very generic error to the user, and maybe send
         // yourself an email
+        $error++;
+        dol_syslog($e->getMessage(), LOG_WARNING, 0, '_stripe');
         setEventMessages($e->getMessage(), null, 'errors');
         $action='';
     } catch (Exception $e) {
         // Something else happened, completely unrelated to Stripe
+        $error++;
+        dol_syslog($e->getMessage(), LOG_WARNING, 0, '_stripe');
         setEventMessages($e->getMessage(), null, 'errors');
         $action='';
     }
         
-    // TODO
-    dol_syslog("Action  Pay.");
+	$_SESSION["onlinetoken"] = $stripeToken;
+    $_SESSION["FinalPaymentAmt"] = $amount;
+    $_SESSION["currencyCodeType"] = $currency;
+    $_SESSION["paymentType"] = '';
+    $_SESSION['ipaddress'] = $_SERVER['REMOTE_ADDR'];  // Payer ip
+    $_SESSION['payerID'] = is_object($customer)?$customer->id:'';
+    $_SESSION['TRANSACTIONID'] = is_object($charge)?$charge->id:'';
     
+    dol_syslog("Action charge stripe result=".$error." ip=".$_SESSION['ipaddress'], LOG_DEBUG, 0, '_stripe');
+    dol_syslog("onlinetoken=".$_SESSION["onlinetoken"]." FinalPaymentAmt=".$_SESSION["FinalPaymentAmt"]." currencyCodeType=".$_SESSION["currencyCodeType"]." payerID=".$_SESSION['payerID']." TRANSACTIONID=".$_SESSION['TRANSACTIONID'], LOG_DEBUG, 0, '_stripe');
+    dol_syslog("FULLTAG=".$FULLTAG, LOG_DEBUG, 0, '_stripe');
+    dol_syslog("Now call the redirect to paymentok or paymentko", LOG_DEBUG, 0, '_stripe');
+    
+    if ($error)
+    {
+        header("Location: ".DOL_URL_ROOT.'/public/stripe/paymentko.php?FULLTAG='.urlencode($FULLTAG));
+        exit;
+    }
+    else
+    {
+        header("Location: ".DOL_URL_ROOT.'/public/stripe/paymentok.php?FULLTAG='.urlencode($FULLTAG));
+        exit;
+    }
     
 }
 
@@ -1046,11 +1092,16 @@ if (preg_match('/^dopayment/',$action))
     print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'."\n";
     print '<input type="hidden" name="dopayment_stripe" value="1">'."\n";
     print '<input type="hidden" name="action" value="charge">'."\n";
-    print '<input type="hidden" name="tag" value="'.GETPOST("tag",'alpha').'">'."\n";
-    print '<input type="hidden" name="suffix" value="'.GETPOST("suffix",'alpha').'">'."\n";
+    print '<input type="hidden" name="tag" value="'.$TAG.'">'."\n";
+    print '<input type="hidden" name="source" value="'.$SOURCE.'">'."\n";
+    print '<input type="hidden" name="ref" value="'.$REF.'">'."\n";
+    print '<input type="hidden" name="fulltag" value="'.$FULLTAG.'">'."\n";
+    print '<input type="hidden" name="suffix" value="'.$suffix.'">'."\n";
     print '<input type="hidden" name="securekey" value="'.$SECUREKEY.'">'."\n";
     print '<input type="hidden" name="entity" value="'.$entity.'" />';
-        
+    print '<input type="hidden" name="amount" value="'.$amount.'">'."\n";
+    print '<input type="hidden" name="currency" value="'.$currency.'">'."\n";
+    
     print '
     <table id="dolpaymenttable" summary="Payment form" class="center">
     <tbody><tr><td class="textpublicpayment">
diff --git a/htdocs/public/stripe/paymentko.php b/htdocs/public/stripe/paymentko.php
new file mode 100644
index 00000000000..01000939b37
--- /dev/null
+++ b/htdocs/public/stripe/paymentko.php
@@ -0,0 +1,165 @@
+<?php
+/* Copyright (C) 2017	Laurent Destailleur		<eldy@users.sourceforge.net>
+*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *     	\file       htdocs/public/stripe/paymentko.php
+ *		\ingroup    core
+ *		\brief      File to show page after a failed payment.
+ *                  This page is called by payment system with url provided to it competed with parameter FULLTAG=xxx
+ *                  More data like token are saved into session. This token can be used to get more informations.
+ */
+
+define("NOLOGIN",1);		// This means this output page does not require to be logged.
+define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.
+
+// For MultiCompany module.
+// Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
+// TODO This should be useless. Because entity must be retreive from object ref and not from url.
+$entity=(! empty($_GET['entity']) ? (int) $_GET['entity'] : (! empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
+if (is_numeric($entity)) define("DOLENTITY", $entity);
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
+
+$langs->load("main");
+$langs->load("other");
+$langs->load("dict");
+$langs->load("bills");
+$langs->load("companies");
+$langs->load("paybox");
+$langs->load("paypal");
+$langs->load("stripe");
+
+$FULLTAG=GETPOST('FULLTAG');
+if (empty($FULLTAG)) $FULLTAG=GETPOST('fulltag');
+
+// Security check
+if (empty($conf->stripe->enabled)) accessforbidden('',0,0,1);
+
+$object = new stdClass();   // For triggers
+
+$paymentmethod='stripe';
+
+
+/*
+ * Actions
+ */
+
+
+
+
+/*
+ * View
+ */
+
+dol_syslog("Callback url when a PayPal payment was canceled. query_string=".(empty($_SERVER["QUERY_STRING"])?'':$_SERVER["QUERY_STRING"])." script_uri=".(empty($_SERVER["SCRIPT_URI"])?'':$_SERVER["SCRIPT_URI"]), LOG_DEBUG, 0, '_stripe');
+
+$tracepost = "";
+foreach($_POST as $k => $v) $tracepost .= "{$k} - {$v}\n";
+dol_syslog("POST=".$tracepost, LOG_DEBUG, 0, '_stripe');
+
+if (! empty($_SESSION['ipaddress']))      // To avoid to make action twice
+{
+    $fulltag            = $FULLTAG;
+    $onlinetoken        = empty($PAYPALTOKEN)?$_SESSION['onlinetoken']:$PAYPALTOKEN;
+    $payerID            = empty($PAYPALPAYERID)?$_SESSION['payerID']:$PAYPALPAYERID;
+    $currencyCodeType   = $_SESSION['currencyCodeType'];
+    $paymentType        = $_SESSION['paymentType'];
+    $FinalPaymentAmt    = $_SESSION['FinalPaymentAmt'];
+    $ipaddress          = $_SESSION['ipaddress'];
+    
+    // Appel des triggers
+    include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+    $interface=new Interfaces($db);
+    $result=$interface->run_triggers('STRIPE_PAYMENT_KO',$object,$user,$langs,$conf);
+    if ($result < 0) { $error++; $errors=$interface->errors; }
+    // Fin appel triggers
+    
+    // Send an email
+    $sendemail = '';
+    if (! empty($conf->global->PAYPAL_PAYONLINE_SENDEMAIL))  $sendemail=$conf->global->PAYPAL_PAYONLINE_SENDEMAIL;
+    
+    if ($sendemail)
+    {
+        // Get on url call
+    	$sendto=$sendemail;
+    	$from=$conf->global->MAILING_EMAIL_FROM;
+    
+    	// Define link to login card
+    	$appli=constant('DOL_APPLICATION_TITLE');
+    	if (! empty($conf->global->MAIN_APPLICATION_TITLE))
+    	{
+    	    $appli=$conf->global->MAIN_APPLICATION_TITLE;
+    	    if (preg_match('/\d\.\d/', $appli))
+    	    {
+    	        if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli.=" (".DOL_VERSION.")";	// If new title contains a version that is different than core
+    	    }
+    	    else $appli.=" ".DOL_VERSION;
+    	}
+    	else $appli.=" ".DOL_VERSION;
+    	
+    	$urlback=$_SERVER["REQUEST_URI"];
+    	$topic='['.$appli.'] '.$langs->transnoentitiesnoconv("NewOnlinePaymentFailed");
+    	$content="";
+    	$content.=$langs->transnoentitiesnoconv("ValidationOfOnlinePaymentFailed")."\n";
+    	$content.="\n";
+    	$content.=$langs->transnoentitiesnoconv("TechnicalInformation").":\n";
+    	$content.=$langs->transnoentitiesnoconv("OnlinePaymentSystem").': '.$paymentmethod."\n";
+    	$content.=$langs->transnoentitiesnoconv("ReturnURLAfterPayment").': '.$urlback."\n";
+    	$content.="tag=".$fulltag."\ntoken=".$onlinetoken." paymentType=".$paymentType." currencycodeType=".$currencyCodeType." payerId=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt;
+    	require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+    	$mailfile = new CMailFile($topic, $sendto, $from, $content);
+    
+    	$result=$mailfile->sendfile();
+    	if ($result)
+    	{
+    		dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_stripe');
+    	}
+    	else
+    	{
+    		dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_stripe');
+    	}
+    }
+
+    unset($_SESSION['ipaddress']);
+}
+
+$head='';
+if (! empty($conf->global->STRIPE_CSS_URL)) $head='<link rel="stylesheet" type="text/css" href="'.$conf->global->STRIPE_CSS_URL.'?lang='.$langs->defaultlang.'">'."\n";
+
+$conf->dol_hide_topmenu=1;
+$conf->dol_hide_leftmenu=1;
+
+llxHeader($head, $langs->trans("PaymentForm"), '', '', 0, 0, '', '', '', 'onlinepaymentbody');
+
+
+// Show ko message
+print '<span id="dolpaymentspan"></span>'."\n";
+print '<div id="dolpaymentdiv" align="center">'."\n";
+print $langs->trans("YourPaymentHasNotBeenRecorded")."<br><br>";
+
+if (! empty($conf->global->STRIPE_MESSAGE_KO)) print $conf->global->STRIPE_MESSAGE_KO;
+print "\n</div>\n";
+
+
+htmlPrintOnlinePaymentFooter($mysoc,$langs);
+
+
+llxFooter('', 'public');
+
+$db->close();
diff --git a/htdocs/public/stripe/paymentok.php b/htdocs/public/stripe/paymentok.php
new file mode 100644
index 00000000000..4eede2e9544
--- /dev/null
+++ b/htdocs/public/stripe/paymentok.php
@@ -0,0 +1,199 @@
+<?php
+/* Copyright (C) 2017	Laurent Destailleur		<eldy@users.sourceforge.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *     	\file       htdocs/public/stripe/paymentok.php
+ *		\ingroup    core
+ *		\brief      File to show page after a successful payment
+ *                  This page is called by payment system with url provided to it completed with parameter FULLTAG=xxx
+ *                  More data like token are saved into session. This token can be used to get more informations.
+ */
+
+define("NOLOGIN",1);		// This means this output page does not require to be logged.
+define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.
+
+// For MultiCompany module.
+// Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
+// TODO This should be useless. Because entity must be retreive from object ref and not from url.
+$entity=(! empty($_GET['entity']) ? (int) $_GET['entity'] : (! empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
+if (is_numeric($entity)) define("DOLENTITY", $entity);
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
+
+$langs->load("main");
+$langs->load("other");
+$langs->load("dict");
+$langs->load("bills");
+$langs->load("companies");
+$langs->load("paybox");
+$langs->load("paypal");
+
+$FULLTAG=GETPOST('FULLTAG');
+if (empty($FULLTAG)) $FULLTAG=GETPOST('fulltag');
+$source=GETPOST('source');
+$ref=GETPOST('ref');
+
+// Security check
+if (empty($conf->stripe->enabled)) accessforbidden('', 0, 0, 1);
+
+
+$ispaymentok = false;
+// If payment is ok
+$PAYMENTSTATUS=$TRANSACTIONID=$TAXAMT=$NOTE='';
+// If payment is ko
+$ErrorCode=$ErrorShortMsg=$ErrorLongMsg=$ErrorSeverityCode='';
+
+
+$object = new stdClass();   // For triggers
+
+$paymentmethod='stripe';
+
+
+/*
+ * Actions
+ */
+
+
+
+/*
+ * View
+ */
+
+dol_syslog("Callback url when a payment was done. query_string=".(empty($_SERVER["QUERY_STRING"])?'':$_SERVER["QUERY_STRING"])." script_uri=".(empty($_SERVER["SCRIPT_URI"])?'':$_SERVER["SCRIPT_URI"]), LOG_DEBUG, 0, '_stripe');
+
+$tracepost = "";
+foreach($_POST as $k => $v) $tracepost .= "{$k} - {$v}\n";
+dol_syslog("POST=".$tracepost, LOG_DEBUG, 0, '_stripe');
+
+$head='';
+if (! empty($conf->global->STRIPE_CSS_URL)) $head='<link rel="stylesheet" type="text/css" href="'.$conf->global->STRIPE_CSS_URL.'?lang='.$langs->defaultlang.'">'."\n";
+
+$conf->dol_hide_topmenu=1;
+$conf->dol_hide_leftmenu=1;
+
+llxHeader($head, $langs->trans("PaymentForm"), '', '', 0, 0, '', '', '', 'onlinepaymentbody');
+
+
+
+// Show message
+print '<span id="dolpaymentspan"></span>'."\n";
+print '<div id="dolpaymentdiv" align="center">'."\n";
+
+$ispaymentok = true;    // We call this page if payment is ok
+if ($ispaymentok)
+{
+    // Get on url call
+    $fulltag            = $FULLTAG;
+    $onlinetoken        = empty($PAYPALTOKEN)?$_SESSION['onlinetoken']:$PAYPALTOKEN;
+    $payerID            = empty($PAYPALPAYERID)?$_SESSION['payerID']:$PAYPALPAYERID;
+    // Set by newpayment.php
+    $paymentType        = $_SESSION['PaymentType'];
+    $currencyCodeType   = $_SESSION['currencyCodeType'];
+    $FinalPaymentAmt    = $_SESSION["Payment_Amount"];
+    // From env
+    $ipaddress          = $_SESSION['ipaddress'];
+    $TRANSACTIONID      = $_SESSION['TRANSACTIONID'];
+
+    // Appel des triggers
+    include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+    $interface=new Interfaces($db);
+    $result=$interface->run_triggers('STRIPE_PAYMENT_OK',$object,$user,$langs,$conf);
+    if ($result < 0) { $error++; $errors=$interface->errors; }
+    // Fin appel triggers
+
+    
+    print $langs->trans("YourPaymentHasBeenRecorded")."<br>\n";
+    print $langs->trans("ThisIsTransactionId",$TRANSACTIONID)."<br><br>\n";
+    if (! empty($conf->global->STRIPE_MESSAGE_OK)) print $conf->global->STRIPE_MESSAGE_OK;
+    
+    $sendemail = '';
+    if (! empty($conf->global->STRIPE_PAYONLINE_SENDEMAIL)) $sendemail=$conf->global->STRIPE_PAYONLINE_SENDEMAIL;
+    
+	// Send an email
+    if ($sendemail)
+	{
+		$sendto=$sendemail;
+		$from=$conf->global->MAILING_EMAIL_FROM;
+		// Define $urlwithroot
+		$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
+		$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
+		//$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
+
+    	// Define link to login card
+    	$appli=constant('DOL_APPLICATION_TITLE');
+    	if (! empty($conf->global->MAIN_APPLICATION_TITLE))
+    	{
+    	    $appli=$conf->global->MAIN_APPLICATION_TITLE;
+    	    if (preg_match('/\d\.\d/', $appli))
+    	    {
+    	        if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli.=" (".DOL_VERSION.")";	// If new title contains a version that is different than core
+    	    }
+    	    else $appli.=" ".DOL_VERSION;
+    	}
+    	else $appli.=" ".DOL_VERSION;
+    	
+    	$urlback=$_SERVER["REQUEST_URI"];
+		$topic='['.$appli.'] '.$langs->transnoentitiesnoconv("NewOnlinePaymentReceived");
+		$tmptag=dolExplodeIntoArray($fulltag,'.','=');
+		$content="";
+		if (! empty($tmptag['MEM']))
+		{
+			$langs->load("members");
+			$url=$urlwithroot."/adherents/card_subscriptions.php?rowid=".$tmptag['MEM'];
+			$content.=$langs->trans("PaymentSubscription")."<br>\n";
+			$content.=$langs->trans("MemberId").': '.$tmptag['MEM']."<br>\n";
+			$content.=$langs->trans("Link").': <a href="'.$url.'">'.$url.'</a>'."<br>\n";
+		}
+		else
+		{
+			$content.=$langs->transnoentitiesnoconv("NewOnlinePaymentReceived")."<br>\n";
+		}
+		$content.="<br>\n";
+		$content.=$langs->transnoentitiesnoconv("TechnicalInformation").":<br>\n";
+		$content.=$langs->transnoentitiesnoconv("OnlinePaymentSystem").': '.$paymentmethod."<br>\n";
+		$content.=$langs->transnoentitiesnoconv("ReturnURLAfterPayment").': '.$urlback."<br>\n";
+		$content.="tag=".$fulltag."\ntoken=".$onlinetoken." paymentType=".$paymentType." currencycodeType=".$currencyCodeType." payerId=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt;
+
+		$ishtml=dol_textishtml($content);	// May contain urls
+
+		require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+		$mailfile = new CMailFile($topic, $sendto, $from, $content, array(), array(), array(), '', '', 0, $ishtml);
+
+		$result=$mailfile->sendfile();
+		if ($result)
+		{
+			dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_stripe');
+		}
+		else
+		{
+			dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_stripe');
+		}
+	}
+}
+
+
+print "\n</div>\n";
+
+
+htmlPrintOnlinePaymentFooter($mysoc,$langs);
+
+
+llxFooter('', 'public');
+
+$db->close();
diff --git a/htdocs/stripe/admin/stripe.php b/htdocs/stripe/admin/stripe.php
index 484b7537755..6ca9073a9df 100644
--- a/htdocs/stripe/admin/stripe.php
+++ b/htdocs/stripe/admin/stripe.php
@@ -63,6 +63,8 @@ if ($action == 'setvalue' && $user->admin)
     if (! $result > 0) $error++;
     $result=dolibarr_set_const($db, "STRIPE_MESSAGE_KO",GETPOST('STRIPE_MESSAGE_KO','alpha'),'chaine',0,'',$conf->entity);
 	if (! $result > 0) $error++;
+	$result=dolibarr_set_const($db, "STRIPE_PAYONLINE_SENDEMAIL",GETPOST('STRIPE_PAYONLINE_SENDEMAIL'),'chaine',0,'',$conf->entity);
+	if (! $result > 0) $error++;
 	
     if (! $error)
   	{
@@ -148,25 +150,25 @@ print '</td></tr>';
 print '<tr class="oddeven"><td>';
 print '<span class="fieldrequired">'.$langs->trans("STRIPE_TEST_PUBLISHABLE_KEY").'</span></td><td>';
 print '<input class="minwidth300" type="text" name="STRIPE_TEST_PUBLISHABLE_KEY" value="'.$conf->global->STRIPE_TEST_PUBLISHABLE_KEY.'">';
-print '<br>'.$langs->trans("Example").': pk_test_xxxxxxxxxxxxxxxxxxxxxxxx';
+print ' &nbsp; '.$langs->trans("Example").': pk_test_xxxxxxxxxxxxxxxxxxxxxxxx';
 print '</td></tr>';
 
 print '<tr class="oddeven"><td>';
 print '<span class="titlefield fieldrequired">'.$langs->trans("STRIPE_TEST_SECRET_KEY").'</span></td><td>';
 print '<input class="minwidth300" type="text" name="STRIPE_TEST_SECRET_KEY" value="'.$conf->global->STRIPE_TEST_SECRET_KEY.'">';
-print '<br>'.$langs->trans("Example").': sk_test_xxxxxxxxxxxxxxxxxxxxxxxx';
+print ' &nbsp; '.$langs->trans("Example").': sk_test_xxxxxxxxxxxxxxxxxxxxxxxx';
 print '</td></tr>';
 
 print '<tr class="oddeven"><td>';
 print '<span class="fieldrequired">'.$langs->trans("STRIPE_LIVE_PUBLISHABLE_KEY").'</span></td><td>';
 print '<input class="minwidth300" type="text" name="STRIPE_LIVE_PUBLISHABLE_KEY" value="'.$conf->global->STRIPE_LIVE_PUBLISHABLE_KEY.'">';
-print '<br>'.$langs->trans("Example").': pk_live_xxxxxxxxxxxxxxxxxxxxxxxx';
+print ' &nbsp; '.$langs->trans("Example").': pk_live_xxxxxxxxxxxxxxxxxxxxxxxx';
 print '</td></tr>';
 
 print '<tr class="oddeven"><td>';
 print '<span class="fieldrequired">'.$langs->trans("STRIPE_LIVE_SECRET_KEY").'</span></td><td>';
 print '<input class="minwidth300" type="text" name="STRIPE_LIVE_SECRET_KEY" value="'.$conf->global->STRIPE_LIVE_SECRET_KEY.'">';
-print '<br>'.$langs->trans("Example").': sk_live_xxxxxxxxxxxxxxxxxxxxxxxx';
+print ' &nbsp; '.$langs->trans("Example").': sk_live_xxxxxxxxxxxxxxxxxxxxxxxx';
 print '</td></tr>';
 
 print '</table>';
@@ -182,13 +184,13 @@ print "</tr>\n";
 print '<tr class="oddeven"><td>';
 print $langs->trans("VendorName").'</td><td>';
 print '<input size="64" type="text" name="STRIPE_CREDITOR" value="'.$conf->global->STRIPE_CREDITOR.'">';
-print '<br>'.$langs->trans("Example").': '.$mysoc->name;
+print ' &nbsp; '.$langs->trans("Example").': '.$mysoc->name;
 print '</td></tr>';
 
 print '<tr class="oddeven"><td>';
 print $langs->trans("CSSUrlForPaymentForm").'</td><td>';
 print '<input size="64" type="text" name="STRIPE_CSS_URL" value="'.$conf->global->STRIPE_CSS_URL.'">';
-print '<br>'.$langs->trans("Example").': http://mysite/mycss.css';
+print ' &nbsp; '.$langs->trans("Example").': http://mysite/mycss.css';
 print '</td></tr>';
 
 print '<tr class="oddeven"><td>';
@@ -203,6 +205,12 @@ $doleditor=new DolEditor('STRIPE_MESSAGE_KO',$conf->global->STRIPE_MESSAGE_KO,''
 $doleditor->Create();
 print '</td></tr>';
 
+print '<tr class="oddeven"><td>';
+print $langs->trans("STRIPE_PAYONLINE_SENDEMAIL").'</td><td>';
+print '<input size="32" type="email" name="STRIPE_PAYONLINE_SENDEMAIL" value="'.$conf->global->STRIPE_PAYONLINE_SENDEMAIL.'">';
+print ' &nbsp; '.$langs->trans("Example").': myemail@myserver.com';
+print '</td></tr>';
+
 print '</table>';
 
 dol_fiche_end();
diff --git a/htdocs/stripe/lib/stripe.lib.php b/htdocs/stripe/lib/stripe.lib.php
index 5f0b1bd0404..fbafd47c3ab 100644
--- a/htdocs/stripe/lib/stripe.lib.php
+++ b/htdocs/stripe/lib/stripe.lib.php
@@ -73,6 +73,7 @@ function showStripePaymentUrl($type,$ref)
     $out.=img_picto('','object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePayment",$servicename).'<br>';
     $url=getStripePaymentUrl(0,$type,$ref);
     $out.='<input type="text" id="stripeurl" class="quatrevingtpercent" value="'.$url.'"><br>';
+    $out.=ajax_autoselect("stripeurl", 0);
     return $out;
 }
 

From caae7e41718a23491ea6b78f8100b52e6a0dcf9f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 14 May 2017 17:05:13 +0200
Subject: [PATCH 346/505] NEW It's easier to switch between sandbox and live
 for paypal

---
 htdocs/langs/en_US/paypal.lang      |  3 ++-
 htdocs/langs/en_US/stripe.lang      |  2 +-
 htdocs/paypal/admin/paypal.php      | 35 +++++++++++++++++++++++------
 htdocs/public/paypal/newpayment.php |  2 +-
 htdocs/public/stripe/newpayment.php |  7 +++---
 htdocs/stripe/admin/stripe.php      |  1 +
 6 files changed, 37 insertions(+), 13 deletions(-)

diff --git a/htdocs/langs/en_US/paypal.lang b/htdocs/langs/en_US/paypal.lang
index 63999f31234..a0cadc88096 100644
--- a/htdocs/langs/en_US/paypal.lang
+++ b/htdocs/langs/en_US/paypal.lang
@@ -28,4 +28,5 @@ DetailedErrorMessage=Detailed Error Message
 ShortErrorMessage=Short Error Message
 ErrorCode=Error Code
 ErrorSeverityCode=Error Severity Code
-OnlinePaymentSystem=Online payment system
\ No newline at end of file
+OnlinePaymentSystem=Online payment system
+PaypalLiveEnabled=Paypal live enabled (otherwise test/sandbox mode)
\ No newline at end of file
diff --git a/htdocs/langs/en_US/stripe.lang b/htdocs/langs/en_US/stripe.lang
index 68b853ac25b..c115a76603c 100644
--- a/htdocs/langs/en_US/stripe.lang
+++ b/htdocs/langs/en_US/stripe.lang
@@ -39,4 +39,4 @@ STRIPE_TEST_SECRET_KEY=Secret test key
 STRIPE_TEST_PUBLISHABLE_KEY=Publishable test key
 STRIPE_LIVE_SECRET_KEY=Secret live key
 STRIPE_LIVE_PUBLISHABLE_KEY=Publishable live key
-StripeLiveEnabled=Stripe live enabled
\ No newline at end of file
+StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
\ No newline at end of file
diff --git a/htdocs/paypal/admin/paypal.php b/htdocs/paypal/admin/paypal.php
index 36c8df9d0d6..2d0be83c80d 100644
--- a/htdocs/paypal/admin/paypal.php
+++ b/htdocs/paypal/admin/paypal.php
@@ -44,8 +44,6 @@ if ($action == 'setvalue' && $user->admin)
 {
 	$db->begin();
 	
-    $result=dolibarr_set_const($db, "PAYPAL_API_SANDBOX",GETPOST('PAYPAL_API_SANDBOX','alpha'),'chaine',0,'',$conf->entity);
-    if (! $result > 0) $error++;
     $result=dolibarr_set_const($db, "PAYPAL_API_USER",GETPOST('PAYPAL_API_USER','alpha'),'chaine',0,'',$conf->entity);
     if (! $result > 0) $error++;
     $result=dolibarr_set_const($db, "PAYPAL_API_PASSWORD",GETPOST('PAYPAL_API_PASSWORD','alpha'),'chaine',0,'',$conf->entity);
@@ -85,6 +83,21 @@ if ($action == 'setvalue' && $user->admin)
     }
 }
 
+if ($action=="setlive")
+{
+    $liveenable = GETPOST('value','int')?0:1;
+    $res = dolibarr_set_const($db, "PAYPAL_API_SANDBOX", $liveenable,'yesno',0,'',$conf->entity);
+    if (! $res > 0) $error++;
+    if (! $error)
+    {
+        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+    }
+    else
+    {
+        setEventMessages($langs->trans("Error"), null, 'errors');
+    }
+}
+
 
 /*
  *	View
@@ -127,13 +140,21 @@ print '<td>'.$langs->trans("AccountParameter").'</td>';
 print '<td>'.$langs->trans("Value").'</td>';
 print "</tr>\n";
 
-
-print '<tr class="oddeven"><td class="fieldrequired">';
-print $langs->trans("PAYPAL_API_SANDBOX").'</td><td>';
-print $form->selectyesno("PAYPAL_API_SANDBOX",$conf->global->PAYPAL_API_SANDBOX,1);
+print '<tr class="oddeven">';
+print '<td class="titlefield fieldrequired">';
+print $langs->trans("PaypalLiveEnabled").'</td><td>';
+if (empty($conf->global->PAYPAL_API_SANDBOX))
+{
+    print '<a href="'.$_SERVER['PHP_SELF'].'?action=setlive&value=0">';
+    print img_picto($langs->trans("Activated"),'switch_on');
+}
+else
+{
+    print '<a href="'.$_SERVER['PHP_SELF'].'?action=setlive&value=1">';
+    print img_picto($langs->trans("Disabled"),'switch_off');
+}
 print '</td></tr>';
 
-
 print '<tr class="oddeven"><td class="fieldrequired">';
 print $langs->trans("PAYPAL_API_USER").'</td><td>';
 print '<input size="32" type="text" name="PAYPAL_API_USER" value="'.$conf->global->PAYPAL_API_USER.'">';
diff --git a/htdocs/public/paypal/newpayment.php b/htdocs/public/paypal/newpayment.php
index c9cedcfd32d..08bf0c4faed 100644
--- a/htdocs/public/paypal/newpayment.php
+++ b/htdocs/public/paypal/newpayment.php
@@ -265,7 +265,7 @@ $conf->dol_hide_leftmenu=1;
 
 llxHeader($head, $langs->trans("PaymentForm"), '', '', 0, 0, '', '', '', 'onlinepaymentbody');
 
-if (! empty($PAYPAL_API_SANDBOX))
+if (! empty($conf->global->PAYPAL_API_SANDBOX))
 {
 	dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode'),'','warning');
 }
diff --git a/htdocs/public/stripe/newpayment.php b/htdocs/public/stripe/newpayment.php
index 5975d349fe4..64ea70cfbeb 100644
--- a/htdocs/public/stripe/newpayment.php
+++ b/htdocs/public/stripe/newpayment.php
@@ -49,6 +49,7 @@ $langs->load("main");
 $langs->load("companies");
 $langs->load("other");
 $langs->load("paybox");     // File with generic data
+$langs->load("paypal");
 $langs->load("stripe");
 
 $action=GETPOST('action','alpha');
@@ -300,12 +301,12 @@ if ($action == 'charge')
     
     if ($error)
     {
-        header("Location: ".DOL_URL_ROOT.'/public/stripe/paymentko.php?FULLTAG='.urlencode($FULLTAG));
+        header("Location: ".$urlko);
         exit;
     }
     else
     {
-        header("Location: ".DOL_URL_ROOT.'/public/stripe/paymentok.php?FULLTAG='.urlencode($FULLTAG));
+        header("Location: ".$urlok);
         exit;
     }
     
@@ -324,7 +325,7 @@ $conf->dol_hide_leftmenu=1;
 
 llxHeader($head, $langs->trans("PaymentForm"), '', '', 0, 0, '', '', '', 'onlinepaymentbody');
 
-if (! empty($STRIPE_API_SANDBOX))
+if (empty($conf->global->STRIPE_LIVE))
 {
     dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode'),'','warning');
 }
diff --git a/htdocs/stripe/admin/stripe.php b/htdocs/stripe/admin/stripe.php
index 6ca9073a9df..056e43690b2 100644
--- a/htdocs/stripe/admin/stripe.php
+++ b/htdocs/stripe/admin/stripe.php
@@ -93,6 +93,7 @@ if ($action=="setlive")
 	}
 }
 
+
 /*
  *	View
  */

From 93554b7e30d4b6d4830292a054cdf7154885f132 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Sun, 14 May 2017 21:06:33 +0200
Subject: [PATCH 347/505] Typo searchpicto

---
 htdocs/accountancy/admin/categories_list.php     | 4 ++--
 htdocs/accountancy/admin/journals_list.php       | 4 ++--
 htdocs/accountancy/admin/productaccount.php      | 4 ++--
 htdocs/accountancy/bookkeeping/balance.php       | 4 ++--
 htdocs/accountancy/bookkeeping/listbyaccount.php | 4 ++--
 htdocs/adherents/list.php                        | 4 ++--
 htdocs/adherents/subscription/list.php           | 4 ++--
 htdocs/admin/dict.php                            | 4 ++--
 htdocs/admin/tools/listevents.php                | 4 ++--
 htdocs/admin/translation.php                     | 4 ++--
 htdocs/comm/action/listactions.php               | 4 ++--
 htdocs/comm/mailing/cibles.php                   | 4 ++--
 htdocs/comm/mailing/list.php                     | 4 ++--
 htdocs/comm/propal/list.php                      | 4 ++--
 htdocs/commande/list.php                         | 4 ++--
 htdocs/compta/bank/bankentries.php               | 4 ++--
 htdocs/compta/bank/index.php                     | 4 ++--
 htdocs/compta/deplacement/list.php               | 4 ++--
 htdocs/compta/facture/fiche-rec.php              | 4 ++--
 htdocs/compta/facture/list.php                   | 4 ++--
 htdocs/compta/paiement/cheque/list.php           | 4 ++--
 htdocs/compta/paiement/list.php                  | 4 ++--
 htdocs/compta/prelevement/bons.php               | 4 ++--
 htdocs/compta/prelevement/demandes.php           | 4 ++--
 htdocs/compta/prelevement/list.php               | 4 ++--
 htdocs/compta/salaries/index.php                 | 4 ++--
 htdocs/compta/sociales/index.php                 | 4 ++--
 htdocs/compta/tva/reglement.php                  | 4 ++--
 htdocs/contrat/list.php                          | 4 ++--
 htdocs/contrat/services.php                      | 4 ++--
 htdocs/core/lib/company.lib.php                  | 4 ++--
 htdocs/don/list.php                              | 4 ++--
 htdocs/expedition/list.php                       | 4 ++--
 htdocs/expensereport/list.php                    | 4 ++--
 htdocs/fichinter/list.php                        | 4 ++--
 htdocs/fourn/commande/list.php                   | 4 ++--
 htdocs/fourn/facture/impayees.php                | 4 ++--
 htdocs/fourn/facture/list.php                    | 4 ++--
 htdocs/fourn/facture/paiement.php                | 4 ++--
 htdocs/holiday/list.php                          | 4 ++--
 htdocs/opensurvey/list.php                       | 4 ++--
 htdocs/product/list.php                          | 4 ++--
 htdocs/product/price.php                         | 4 ++--
 htdocs/product/reassort.php                      | 4 ++--
 htdocs/product/reassortlot.php                   | 4 ++--
 htdocs/projet/list.php                           | 4 ++--
 htdocs/projet/tasks.php                          | 4 ++--
 htdocs/resource/list.php                         | 4 ++--
 htdocs/societe/consumption.php                   | 4 ++--
 htdocs/societe/list.php                          | 4 ++--
 htdocs/societe/price.php                         | 4 ++--
 htdocs/supplier_proposal/list.php                | 4 ++--
 52 files changed, 104 insertions(+), 104 deletions(-)

diff --git a/htdocs/accountancy/admin/categories_list.php b/htdocs/accountancy/admin/categories_list.php
index 7b1eb44545a..86be6aa52ab 100644
--- a/htdocs/accountancy/admin/categories_list.php
+++ b/htdocs/accountancy/admin/categories_list.php
@@ -661,8 +661,8 @@ if ($id)
         print '<td class="liste_titre" align="center">';
     	if ($filterfound)
     	{
-        	$searchpitco=$form->showFilterAndCheckAddButtons(0);
-        	print $searchpitco;
+        	$searchpicto=$form->showFilterAndCheckAddButtons(0);
+        	print $searchpicto;
     	}
     	print '</td>';
     	print '</tr>';
diff --git a/htdocs/accountancy/admin/journals_list.php b/htdocs/accountancy/admin/journals_list.php
index 0b13bfc7d4d..facb507c530 100644
--- a/htdocs/accountancy/admin/journals_list.php
+++ b/htdocs/accountancy/admin/journals_list.php
@@ -577,8 +577,8 @@ if ($id)
         print '<td class="liste_titre" align="center">';
     	if ($filterfound)
     	{
-        	$searchpitco=$form->showFilterAndCheckAddButtons(0);
-        	print $searchpitco;
+        	$searchpicto=$form->showFilterAndCheckAddButtons(0);
+        	print $searchpicto;
     	}
     	print '</td>';
     	print '</tr>';
diff --git a/htdocs/accountancy/admin/productaccount.php b/htdocs/accountancy/admin/productaccount.php
index dda7d545043..4f82db33e94 100644
--- a/htdocs/accountancy/admin/productaccount.php
+++ b/htdocs/accountancy/admin/productaccount.php
@@ -329,8 +329,8 @@ if ($result)
 	print '</td>';
 	print '<td class="liste_titre">&nbsp;</td>';
 	print '<td align="center" class="liste_titre">';
-	$searchpitco=$form->showFilterButtons();
-	print $searchpitco;
+	$searchpicto=$form->showFilterButtons();
+	print $searchpicto;
 	print '</td>';
 	print '</tr>';
 	
diff --git a/htdocs/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php
index 5f4801da32c..9e5be25eb73 100644
--- a/htdocs/accountancy/bookkeeping/balance.php
+++ b/htdocs/accountancy/bookkeeping/balance.php
@@ -192,8 +192,8 @@ else {
     print $formventilation->select_account($search_accountancy_code_end, 'search_accountancy_code_end', 1, array(), 1, 1, '');
     print '</td>';
     print '<td align="right" class="liste_titre">';
-	$searchpitco=$form->showFilterAndCheckAddButtons(0);
-	print $searchpitco;
+	$searchpicto=$form->showFilterAndCheckAddButtons(0);
+	print $searchpicto;
     print '</td>';
     
     print '</tr>';
diff --git a/htdocs/accountancy/bookkeeping/listbyaccount.php b/htdocs/accountancy/bookkeeping/listbyaccount.php
index 2323f3afcb8..eb8a53561d2 100644
--- a/htdocs/accountancy/bookkeeping/listbyaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbyaccount.php
@@ -239,8 +239,8 @@ print '<td class="liste_titre">&nbsp;</td>';
 print '<td class="liste_titre">&nbsp;</td>';
 print '<td class="liste_titre" align="right"><input type="text" name="search_ledger_code" size="3" value="' . $search_ledger_code . '"></td>';
 print '<td class="liste_titre" align="right" colspan="2">';
-$searchpitco=$form->showFilterAndCheckAddButtons(0);
-print $searchpitco;
+$searchpicto=$form->showFilterAndCheckAddButtons(0);
+print $searchpicto;
 print '</td>';
 
 print '<tr class="liste_titre">';
diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index 7a6013b9b78..37237b29073 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -560,8 +560,8 @@ if (! empty($arrayfields['d.statut']['checked']))
 }
 // Action column
 print '<td class="liste_titre" align="middle">';
-$searchpitco=$form->showFilterButtons();
-print $searchpitco;
+$searchpicto=$form->showFilterButtons();
+print $searchpicto;
 print '</td>';
 
 print "</tr>\n";
diff --git a/htdocs/adherents/subscription/list.php b/htdocs/adherents/subscription/list.php
index 750ad483461..206f5ebf8c9 100644
--- a/htdocs/adherents/subscription/list.php
+++ b/htdocs/adherents/subscription/list.php
@@ -239,8 +239,8 @@ if ($result)
 	
     // Action column
     print '<td class="liste_titre" align="right">';
-    $searchpitco=$form->showFilterButtons();
-    print $searchpitco;
+    $searchpicto=$form->showFilterButtons();
+    print $searchpicto;
     print '</td>';  
 
 	print "</tr>\n";
diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 28e99d02606..46a8001b02a 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -1188,8 +1188,8 @@ if ($id)
     	print '<td class="liste_titre" colspan="2" align="right">';
     	if ($filterfound)
     	{
-        	$searchpitco=$form->showFilterAndCheckAddButtons(0);
-        	print $searchpitco;
+        	$searchpicto=$form->showFilterAndCheckAddButtons(0);
+        	print $searchpicto;
     	}
     	print '</td>';
         print '</tr>';
diff --git a/htdocs/admin/tools/listevents.php b/htdocs/admin/tools/listevents.php
index f5e6afd36b1..47f4af17dcf 100644
--- a/htdocs/admin/tools/listevents.php
+++ b/htdocs/admin/tools/listevents.php
@@ -249,8 +249,8 @@ if ($result)
 	print '</td>';
 
 	print '<td align="right" class="liste_titre">';
-	$searchpitco=$form->showFilterAndCheckAddButtons(0);
-	print $searchpitco;
+	$searchpicto=$form->showFilterAndCheckAddButtons(0);
+	print $searchpicto;
 	print '</td>';
 
 	print "</tr>\n";
diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php
index 44387bc2041..c9488f919fe 100644
--- a/htdocs/admin/translation.php
+++ b/htdocs/admin/translation.php
@@ -421,8 +421,8 @@ if ($mode == 'searchkey')
     print '</td>';    
     // Action column
     print '<td class="liste_titre nowrap" align="right">';
-    $searchpitco=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
-    print $searchpitco;
+    $searchpicto=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
+    print $searchpicto;
     print '</td>';
     print '</tr>';
     
diff --git a/htdocs/comm/action/listactions.php b/htdocs/comm/action/listactions.php
index 3e6224e0c41..232eb0fc9b1 100644
--- a/htdocs/comm/action/listactions.php
+++ b/htdocs/comm/action/listactions.php
@@ -361,8 +361,8 @@ if ($resql)
     print '</td>';
 	// Action column
 	print '<td class="liste_titre" align="middle">';
-	$searchpitco=$form->showFilterButtons();
-	print $searchpitco;
+	$searchpicto=$form->showFilterButtons();
+	print $searchpicto;
 	print '</td>';
 	print "</tr>\n";
 	
diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index 118cc336fb7..01924526c66 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -484,8 +484,8 @@ if ($object->fetch($id) >= 0)
 		print '</td>';
 		// Action column
 		print '<td class="liste_titre" align="right">';
-		$searchpitco=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
-		print $searchpitco;
+		$searchpicto=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
+		print $searchpicto;
 		print '</td>';
 		print '</tr>';
 		
diff --git a/htdocs/comm/mailing/list.php b/htdocs/comm/mailing/list.php
index 8a9c01787d1..f5efbf54383 100644
--- a/htdocs/comm/mailing/list.php
+++ b/htdocs/comm/mailing/list.php
@@ -135,8 +135,8 @@ if ($result)
 	print '<td class="liste_titre">&nbsp;</td>';
 	print '<td class="liste_titre">&nbsp;</td>';
 	print '<td class="liste_titre" align="right">';
-	$searchpitco=$form->showFilterAndCheckAddButtons(0);
-	print $searchpitco;
+	$searchpicto=$form->showFilterAndCheckAddButtons(0);
+	print $searchpicto;
 	print '</td>';
 	print "</tr>\n";
 
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index 3595d871c72..ac5cee3bebc 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -696,8 +696,8 @@ if ($resql)
 	}
 	// Action column
 	print '<td class="liste_titre" align="middle">';
-	$searchpitco=$form->showFilterButtons();
-	print $searchpitco;
+	$searchpicto=$form->showFilterButtons();
+	print $searchpicto;
 	print '</td>';
 	
 	print "</tr>\n";
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 8cab07c9780..c73258cff89 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -989,8 +989,8 @@ if ($resql)
 	}
 	// Action column
 	print '<td class="liste_titre" align="middle">';
-	$searchpitco=$form->showFilterButtons();
-	print $searchpitco;
+	$searchpicto=$form->showFilterButtons();
+	print $searchpicto;
 	print '</td>';
 	
     print "</tr>\n";
diff --git a/htdocs/compta/bank/bankentries.php b/htdocs/compta/bank/bankentries.php
index 286836b0103..ed8241de427 100644
--- a/htdocs/compta/bank/bankentries.php
+++ b/htdocs/compta/bank/bankentries.php
@@ -797,8 +797,8 @@ if ($resql)
 	print '<td class="liste_titre" align="middle">';
 	print '</td>';
 	print '<td class="liste_titre" align="middle">';
-	$searchpitco=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
-	print $searchpitco;
+	$searchpicto=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
+	print $searchpicto;
     print '</td>';
 	print "</tr>\n";
 
diff --git a/htdocs/compta/bank/index.php b/htdocs/compta/bank/index.php
index f5d4fee1fc0..37883c29c0f 100644
--- a/htdocs/compta/bank/index.php
+++ b/htdocs/compta/bank/index.php
@@ -393,8 +393,8 @@ if (! empty($arrayfields['balance']['checked']))
 }
 // Action column
 print '<td class="liste_titre" align="middle">';
-$searchpitco=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
-print $searchpitco;
+$searchpicto=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
+print $searchpicto;
 print '</td>';
 print '</tr>';
 
diff --git a/htdocs/compta/deplacement/list.php b/htdocs/compta/deplacement/list.php
index 95f4082e082..1cf976325ec 100644
--- a/htdocs/compta/deplacement/list.php
+++ b/htdocs/compta/deplacement/list.php
@@ -165,8 +165,8 @@ if ($resql)
     // print '<input class="flat" size="10" type="text" name="search_amount" value="'.$search_amount.'">';
     print '</td>';
     print '<td class="liste_titre" align="right">';
-    $searchpitco=$form->showFilterAndCheckAddButtons(0);
-    print $searchpitco;
+    $searchpicto=$form->showFilterAndCheckAddButtons(0);
+    print $searchpicto;
     print '</td>';
     print "</tr>\n";
 
diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php
index acf97a3893a..bfede218eb8 100644
--- a/htdocs/compta/facture/fiche-rec.php
+++ b/htdocs/compta/facture/fiche-rec.php
@@ -1769,8 +1769,8 @@ else
 			}
 			// Action column
 			print '<td class="liste_titre" align="middle">';
-			$searchpitco=$form->showFilterAndCheckAddButtons(0, 'checkforselect', 1);
-			print $searchpitco;
+			$searchpicto=$form->showFilterAndCheckAddButtons(0, 'checkforselect', 1);
+			print $searchpicto;
 			print '</td>';
 			print "</tr>\n";
 
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 5b01c445960..638ca033e1a 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -936,8 +936,8 @@ if ($resql)
 	}
 	// Action column
 	print '<td class="liste_titre" align="middle">';
-	$searchpitco=$form->showFilterButtons();
-	print $searchpitco;
+	$searchpicto=$form->showFilterButtons();
+	print $searchpicto;
     print '</td>';
     print "</tr>\n";
 
diff --git a/htdocs/compta/paiement/cheque/list.php b/htdocs/compta/paiement/cheque/list.php
index f1a9a839792..9798e2d28b4 100644
--- a/htdocs/compta/paiement/cheque/list.php
+++ b/htdocs/compta/paiement/cheque/list.php
@@ -175,8 +175,8 @@ if ($resql)
 	print '</td>';
 	print '<td class="liste_titre"></td>';
     print '<td class="liste_titre" align="right">';
-    $searchpitco=$form->showFilterAndCheckAddButtons(0);
-    print $searchpitco;
+    $searchpicto=$form->showFilterAndCheckAddButtons(0);
+    print $searchpicto;
     print '</td>';
     print "</tr>\n";
 
diff --git a/htdocs/compta/paiement/list.php b/htdocs/compta/paiement/list.php
index d0ba0373457..ab4189d5338 100644
--- a/htdocs/compta/paiement/list.php
+++ b/htdocs/compta/paiement/list.php
@@ -254,8 +254,8 @@ if ($resql)
     print '<input class="flat" type="text" size="4" name="search_amount" value="'.$search_amount.'">';
 	print '</td>';
     print '<td class="liste_titre" align="right">';
-    $searchpitco=$form->showFilterAndCheckAddButtons(0);
-    print $searchpitco;
+    $searchpicto=$form->showFilterAndCheckAddButtons(0);
+    print $searchpicto;
     print '</td>';
     if (! empty($conf->global->BILL_ADD_PAYMENT_VALIDATION))
     {
diff --git a/htdocs/compta/prelevement/bons.php b/htdocs/compta/prelevement/bons.php
index 973135765dc..7319de4a7bd 100644
--- a/htdocs/compta/prelevement/bons.php
+++ b/htdocs/compta/prelevement/bons.php
@@ -124,8 +124,8 @@ if ($result)
   print '<td class="liste_titre"><input type="text" class="flat maxwidth100" name="search_ref" value="'. $db->escape($search_ref).'"></td>';
   print '<td class="liste_titre">&nbsp;</td>';
   print '<td class="liste_titre" align="right">';
-  $searchpitco=$form->showFilterAndCheckAddButtons(0);
-  print $searchpitco;
+  $searchpicto=$form->showFilterAndCheckAddButtons(0);
+  print $searchpicto;
   print '</td>';
   print '</tr>';
 
diff --git a/htdocs/compta/prelevement/demandes.php b/htdocs/compta/prelevement/demandes.php
index c1c8bd7e929..e619b28e994 100644
--- a/htdocs/compta/prelevement/demandes.php
+++ b/htdocs/compta/prelevement/demandes.php
@@ -124,8 +124,8 @@ if ($resql)
 	print '<td class="liste_titre"></td>';
 	// Action column
 	print '<td class="liste_titre" align="middle">';
-	$searchpitco=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
-	print $searchpitco;
+	$searchpicto=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
+	print $searchpicto;
 	print '</td>';
 	print '</tr>';
 
diff --git a/htdocs/compta/prelevement/list.php b/htdocs/compta/prelevement/list.php
index 2fa8a255407..9b1f1ff461e 100644
--- a/htdocs/compta/prelevement/list.php
+++ b/htdocs/compta/prelevement/list.php
@@ -154,8 +154,8 @@ if ($result)
     print '<td class="liste_titre">&nbsp;</td>';
     print '<td class="liste_titre">&nbsp;</td>';
     print '<td class="liste_titre" align="right">';
-    $searchpitco=$form->showFilterAndCheckAddButtons(0);
-    print $searchpitco;
+    $searchpicto=$form->showFilterAndCheckAddButtons(0);
+    print $searchpicto;
     print '</td>';
     print '</tr>';
 
diff --git a/htdocs/compta/salaries/index.php b/htdocs/compta/salaries/index.php
index 5e78a070796..e193374a552 100644
--- a/htdocs/compta/salaries/index.php
+++ b/htdocs/compta/salaries/index.php
@@ -184,8 +184,8 @@ if ($result)
 	print '<td class="liste_titre" align="right"><input name="search_amount" class="flat" type="text" size="8" value="'.$search_amount.'"></td>';
 
     print '<td class="liste_titre" align="right">';
-    $searchpitco=$form->showFilterAndCheckAddButtons(0);
-    print $searchpitco;
+    $searchpicto=$form->showFilterAndCheckAddButtons(0);
+    print $searchpicto;
     print '</td>';
     
     print '<tr class="liste_titre">';
diff --git a/htdocs/compta/sociales/index.php b/htdocs/compta/sociales/index.php
index e76a6edc49a..50e14823a5f 100644
--- a/htdocs/compta/sociales/index.php
+++ b/htdocs/compta/sociales/index.php
@@ -202,8 +202,8 @@ if ($resql)
 		print '</td>';
 
         print '<td class="liste_titre" align="right">';
-        $searchpitco=$form->showFilterAndCheckAddButtons(0);
-        print $searchpitco;
+        $searchpicto=$form->showFilterAndCheckAddButtons(0);
+        print $searchpicto;
         print '</td>';
 		print "</tr>\n";
 
diff --git a/htdocs/compta/tva/reglement.php b/htdocs/compta/tva/reglement.php
index 15a6df0a717..94895062bc3 100644
--- a/htdocs/compta/tva/reglement.php
+++ b/htdocs/compta/tva/reglement.php
@@ -182,8 +182,8 @@ if ($result)
     }
 	print '<td class="liste_titre" align="right"><input name="search_amount" class="flat" type="text" size="8" value="'.$search_amount.'"></td>';
     print '<td class="liste_titre" align="right">';
-    $searchpitco=$form->showFilterAndCheckAddButtons(0);
-    print $searchpitco;
+    $searchpicto=$form->showFilterAndCheckAddButtons(0);
+    print $searchpicto;
     print '</td>';
 	print "</tr>\n";
 
diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index 3bf4a45bb10..318a24931be 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -509,8 +509,8 @@ if ($resql)
         print '<td class="liste_titre" colspan="4" align="right"></td>';
     }
     print '<td class="liste_titre" align="middle">';
-    $searchpitco=$form->showFilterButtons();
-    print $searchpitco;
+    $searchpicto=$form->showFilterButtons();
+    print $searchpicto;
     print '</td>';
     print "</tr>\n";
     
diff --git a/htdocs/contrat/services.php b/htdocs/contrat/services.php
index d92bcd16679..f283502bc3e 100644
--- a/htdocs/contrat/services.php
+++ b/htdocs/contrat/services.php
@@ -503,8 +503,8 @@ if (! empty($arrayfields['status']['checked']))
 }
 // Action column
 print '<td class="liste_titre" align="right">';
-$searchpitco=$form->showFilterAndCheckAddButtons(0);
-print $searchpitco;
+$searchpicto=$form->showFilterAndCheckAddButtons(0);
+print $searchpicto;
 print '</td>';
 print "</tr>\n";
 
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index 6847cd7b9c2..3fef1265f9d 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -1264,8 +1264,8 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon='', $noprint=
         $out.='<td class="liste_titre"></td>';
         // Action column
         $out.='<td class="liste_titre" align="middle">';
-        $searchpitco=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
-        $out.=$searchpitco;
+        $searchpicto=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
+        $out.=$searchpicto;
         $out.='</td>';
         $out.='</tr>';
         
diff --git a/htdocs/don/list.php b/htdocs/don/list.php
index d271ea3e894..b0cd414ed28 100644
--- a/htdocs/don/list.php
+++ b/htdocs/don/list.php
@@ -183,8 +183,8 @@ if ($resql)
     print '<td class="liste_titre" align="right"><input name="search_amount" class="flat" type="text" size="8" value="'.$search_amount.'"></td>';
     print '<td class="liste_titre" align="right"></td>';
     print '<td class="liste_titre" align="right">';
-    $searchpitco=$form->showFilterAndCheckAddButtons(0);
-    print $searchpitco;
+    $searchpicto=$form->showFilterAndCheckAddButtons(0);
+    print $searchpicto;
     print '</td>';
 	print "</tr>\n";
 
diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php
index bff7991fdeb..50454e3f253 100644
--- a/htdocs/expedition/list.php
+++ b/htdocs/expedition/list.php
@@ -421,8 +421,8 @@ if ($resql)
 	}
 	// Action column
 	print '<td class="liste_titre" align="middle">';
-	$searchpitco=$form->showFilterAndCheckAddButtons(0);
-	print $searchpitco;
+	$searchpicto=$form->showFilterAndCheckAddButtons(0);
+	print $searchpicto;
     print '</td>';
 	print "</tr>\n";
 
diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php
index 204115d8112..06998059aa5 100644
--- a/htdocs/expensereport/list.php
+++ b/htdocs/expensereport/list.php
@@ -461,8 +461,8 @@ if ($resql)
 	}
 	// Action column
 	print '<td class="liste_titre" align="middle">';
-	$searchpitco=$form->showFilterButtons();
-	print $searchpitco;
+	$searchpicto=$form->showFilterButtons();
+	print $searchpicto;
 	print '</td>';
 
 	print "</tr>\n";
diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php
index b5a6bcb0e94..9963794fd9f 100644
--- a/htdocs/fichinter/list.php
+++ b/htdocs/fichinter/list.php
@@ -402,8 +402,8 @@ if ($resql)
 		print '</td>';
     }
 	print '<td class="liste_titre" align="right">';
-	$searchpitco=$form->showFilterButtons();
-	print $searchpitco;
+	$searchpicto=$form->showFilterButtons();
+	print $searchpicto;
 	print '</td>';
 	
     print "</tr>\n";
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index 80a98cc5886..8ca86a1e6c5 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -1019,8 +1019,8 @@ if ($resql)
 	}
 	// Action column
 	print '<td class="liste_titre" align="middle">';
-	$searchpitco=$form->showFilterButtons();
-	print $searchpitco;
+	$searchpicto=$form->showFilterButtons();
+	print $searchpicto;
 	print '</td>';
 
 	print "</tr>\n";
diff --git a/htdocs/fourn/facture/impayees.php b/htdocs/fourn/facture/impayees.php
index 4538351b6ad..4ade0a6dbb0 100644
--- a/htdocs/fourn/facture/impayees.php
+++ b/htdocs/fourn/facture/impayees.php
@@ -216,8 +216,8 @@ if ($user->rights->fournisseur->facture->lire)
 		print '<input class="flat" type="text" size="8" name="search_amount_all_tax" value="'.$search_amount_all_tax.'">';
 		print '</td>';
         print '<td class="liste_titre" align="right">';
-        $searchpitco=$form->showFilterAndCheckAddButtons(0);
-        print $searchpitco;
+        $searchpicto=$form->showFilterAndCheckAddButtons(0);
+        print $searchpicto;
         print '</td>';
 		print "</tr>\n";
 
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index 2924a40001a..9ad1bf63ce2 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -818,8 +818,8 @@ if ($resql)
 	}
 	// Action column
 	print '<td class="liste_titre" align="middle">';
-	$searchpitco=$form->showFilterButtons('checkforselect', 0);
-	print $searchpitco;
+	$searchpicto=$form->showFilterButtons('checkforselect', 0);
+	print $searchpicto;
 	print '</td>';
 
 	print "</tr>\n";
diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php
index 5f1d8cd2d99..b6825e93d82 100644
--- a/htdocs/fourn/facture/paiement.php
+++ b/htdocs/fourn/facture/paiement.php
@@ -722,8 +722,8 @@ if (empty($action))
         print '<input class="flat" type="text" size="4" name="search_amount" value="'.dol_escape_htmltag($search_amount).'">';
         print '</td>';
         print '<td class="liste_titre" align="right">';
-        $searchpitco=$form->showFilterAndCheckAddButtons(0);
-        print $searchpitco;
+        $searchpicto=$form->showFilterAndCheckAddButtons(0);
+        print $searchpicto;
         print '</td>';
         print "</tr>\n";
 
diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php
index ab8a89670ae..063c3042e3b 100644
--- a/htdocs/holiday/list.php
+++ b/htdocs/holiday/list.php
@@ -373,8 +373,8 @@ print '</td>';
 
 // ACTION
 print '<td class="liste_titre" align="right">';
-$searchpitco=$form->showFilterAndCheckAddButtons(0);
-print $searchpitco;
+$searchpicto=$form->showFilterAndCheckAddButtons(0);
+print $searchpicto;
 print '</td>';
 
 print "</tr>\n";
diff --git a/htdocs/opensurvey/list.php b/htdocs/opensurvey/list.php
index 203602bde6e..3f9411c9879 100644
--- a/htdocs/opensurvey/list.php
+++ b/htdocs/opensurvey/list.php
@@ -105,8 +105,8 @@ $arraystatus=array(''=>'&nbsp;','expired'=>$langs->trans("Expired"),'opened'=>$l
 print '<td class="liste_titre" align="center">'. $form->selectarray('status', $arraystatus, $status).'</td>';
 print '<td class="liste_titre"></td>';
 print '<td class="liste_titre" align="right">';
-$searchpitco=$form->showFilterAndCheckAddButtons(0);
-print $searchpitco;
+$searchpicto=$form->showFilterAndCheckAddButtons(0);
+print $searchpicto;
 print '</td>';
 print '</tr>'."\n";
 
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index b779d4b7bfa..9d256f33831 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -611,8 +611,8 @@ else
 	            print '</td>';
     		}
             print '<td class="liste_titre" align="middle">';
-	        $searchpitco=$form->showFilterButtons();
-            print $searchpitco;
+	        $searchpicto=$form->showFilterButtons();
+            print $searchpicto;
             print '</td>';
 
     		print '</tr>';
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index d765411ed8c..407fe18bc61 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -1797,8 +1797,8 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
     		print '<td colspan="8">&nbsp;</td>';
     		// Print the search button
             print '<td class="liste_titre" align="right">';
-            $searchpitco=$form->showFilterAndCheckAddButtons(0);
-            print $searchpitco;
+            $searchpicto=$form->showFilterAndCheckAddButtons(0);
+            print $searchpicto;
             print '</td>';
     		print '</tr>';
 		}
diff --git a/htdocs/product/reassort.php b/htdocs/product/reassort.php
index ca335558899..a87fecd36b7 100644
--- a/htdocs/product/reassort.php
+++ b/htdocs/product/reassort.php
@@ -276,8 +276,8 @@ if ($resql)
 	print '<td class="liste_titre" colspan="'.$colspan_warehouse.'">&nbsp;</td>';
 	print '<td class="liste_titre"></td>';
 	print '<td class="liste_titre" align="right">';
-   	$searchpitco=$form->showFilterAndCheckAddButtons(0);
-   	print $searchpitco;
+   	$searchpicto=$form->showFilterAndCheckAddButtons(0);
+   	print $searchpicto;
 	print '</td>';
 	print '</tr>';
 
diff --git a/htdocs/product/reassortlot.php b/htdocs/product/reassortlot.php
index 183242c3c52..660d0e78bd3 100644
--- a/htdocs/product/reassortlot.php
+++ b/htdocs/product/reassortlot.php
@@ -280,8 +280,8 @@ if ($resql)
 	print '<td class="liste_titre">&nbsp;</td>';
     print '<td class="liste_titre">&nbsp;</td>';
     print '<td class="liste_titre" align="right">';
-    $searchpitco=$form->showFilterAndCheckAddButtons(0);
-    print $searchpitco;
+    $searchpicto=$form->showFilterAndCheckAddButtons(0);
+    print $searchpicto;
     print '</td>';
 	print '</tr>';
 
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index a7285e1f410..6e1bd638d29 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -605,8 +605,8 @@ if (! empty($arrayfields['p.fk_statut']['checked']))
 }
 // Action column
 print '<td class="liste_titre" align="right">';
-$searchpitco=$form->showFilterButtons();
-print $searchpitco;
+$searchpicto=$form->showFilterButtons();
+print $searchpicto;
 print '</td>';
 
 print '</tr>'."\n";
diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index 35a7812d4fa..72736531356 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -501,8 +501,8 @@ else if ($id > 0 || ! empty($ref))
 
         // Action column
         print '<td class="liste_titre" align="right">';
-        $searchpitco=$form->showFilterButtons();
-        print $searchpitco;
+        $searchpicto=$form->showFilterButtons();
+        print $searchpicto;
         print '</td>';
 	}
 	
diff --git a/htdocs/resource/list.php b/htdocs/resource/list.php
index 559dbce4b06..c0b58523994 100644
--- a/htdocs/resource/list.php
+++ b/htdocs/resource/list.php
@@ -232,8 +232,8 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
 }
 // Action column
 print '<td class="liste_titre" align="right">';
-$searchpitco=$form->showFilterAndCheckAddButtons(0);
-print $searchpitco;
+$searchpicto=$form->showFilterAndCheckAddButtons(0);
+print $searchpicto;
 print '</td>';
 print "</tr>\n";
 
diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php
index d0f92bb9c14..17018091951 100644
--- a/htdocs/societe/consumption.php
+++ b/htdocs/societe/consumption.php
@@ -388,8 +388,8 @@ if ($sql_select)
     print '<td class="liste_titre" align="center">';
     print '</td>';
     print '<td class="liste_titre" align="right">';
-    $searchpitco=$form->showFilterAndCheckAddButtons(0);
-    print $searchpitco;
+    $searchpicto=$form->showFilterAndCheckAddButtons(0);
+    print $searchpicto;
     print '</td>';
     print '</tr>';
 
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 7693da9d818..37134fbd313 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -863,8 +863,8 @@ if (! empty($arrayfields['s.status']['checked']))
 }
 // Action column
 print '<td class="liste_titre" align="right">';
-$searchpitco=$form->showFilterButtons();
-print $searchpitco;
+$searchpicto=$form->showFilterButtons();
+print $searchpicto;
 print '</td>';
 
 print "</tr>\n";
diff --git a/htdocs/societe/price.php b/htdocs/societe/price.php
index e8dc595c6c3..952a34a9a59 100644
--- a/htdocs/societe/price.php
+++ b/htdocs/societe/price.php
@@ -510,8 +510,8 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
             print '<td colspan="8">&nbsp;</td>';
             // Print the search button
             print '<td class="liste_titre" align="right">';
-            $searchpitco=$form->showFilterAndCheckAddButtons(0);
-            print $searchpitco;
+            $searchpicto=$form->showFilterAndCheckAddButtons(0);
+            print $searchpicto;
             print '</td>';
             print '</tr>';
         }
diff --git a/htdocs/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php
index efd0ae16647..56f8df0f825 100644
--- a/htdocs/supplier_proposal/list.php
+++ b/htdocs/supplier_proposal/list.php
@@ -553,8 +553,8 @@ if ($result)
 	print '</td>';
 	// Check boxes
 	print '<td class="liste_titre" align="middle">';
-	$searchpitco=$form->showFilterButtons();
-	print $searchpitco;
+	$searchpicto=$form->showFilterButtons();
+	print $searchpicto;
 	print '</td>';
 
 	print "</tr>\n";

From 4dc7d5cd8d2ee6d1320ae634a77005a878b32a83 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Sun, 14 May 2017 21:20:35 +0200
Subject: [PATCH 348/505] Fix : tooltip on bank in customer invoice card

---
 htdocs/compta/facture/card.php                   | 14 ++++++++++++--
 htdocs/modulebuilder/skeletons/skeleton_list.php |  4 ++--
 htdocs/product/canvas/product/tpl/list.tpl.php   |  4 ++--
 htdocs/product/canvas/service/tpl/list.tpl.php   |  4 ++--
 htdocs/product/stock/list.php                    |  4 ++--
 htdocs/product/stock/mouvement.php               |  4 ++--
 htdocs/product/stock/productlot_list.php         |  4 ++--
 htdocs/product/stock/replenish.php               |  4 ++--
 htdocs/product/stock/replenishorders.php         |  4 ++--
 htdocs/projet/activity/perday.php                |  4 ++--
 htdocs/projet/activity/perweek.php               |  4 ++--
 htdocs/projet/tasks/list.php                     |  4 ++--
 htdocs/projet/tasks/time.php                     |  4 ++--
 htdocs/user/hierarchy.php                        |  4 ++--
 htdocs/user/index.php                            |  4 ++--
 htdocs/variants/combinations.php                 |  4 ++--
 16 files changed, 42 insertions(+), 32 deletions(-)

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 6f7f4d84879..9525f63b722 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -59,6 +59,9 @@ require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
 if (!empty($conf->variants->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductCombination.class.php';
 }
+if (! empty($conf->accounting->enabled)) {
+	require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php';
+}
 
 $langs->load('bills');
 $langs->load('companies');
@@ -3685,7 +3688,7 @@ else if ($id > 0 || ! empty($ref))
     $sql = 'SELECT p.datep as dp, p.ref, p.num_paiement, p.rowid, p.fk_bank,';
     $sql .= ' c.code as payment_code, c.libelle as payment_label,';
     $sql .= ' pf.amount,';
-    $sql .= ' ba.rowid as baid, ba.ref as baref, ba.label';
+    $sql .= ' ba.rowid as baid, ba.ref as baref, ba.label, ba.number as banumber, ba.account_number, ba.fk_accountancy_journal';
     $sql .= ' FROM ' . MAIN_DB_PREFIX . 'c_paiement as c, ' . MAIN_DB_PREFIX . 'paiement_facture as pf, ' . MAIN_DB_PREFIX . 'paiement as p';
     $sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'bank as b ON p.fk_bank = b.rowid';
     $sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'bank_account as ba ON b.fk_account = ba.rowid';
@@ -3717,7 +3720,14 @@ else if ($id > 0 || ! empty($ref))
                     $bankaccountstatic->id = $objp->baid;
                     $bankaccountstatic->ref = $objp->baref;
                     $bankaccountstatic->label = $objp->baref;
-                    print '<td align="right">';
+					$bankaccountstatic->number = $objp->banumber;
+					$bankaccountstatic->account_number = $objp->account_number;
+
+					$accountingjournal = new AccountingJournal($db);
+					$accountingjournal->fetch($objp->fk_accountancy_journal);
+					$bankaccountstatic->accountancy_journal = $accountingjournal->getNomUrl(0,1,1,'',1);
+
+					print '<td align="right">';
                     if ($bankaccountstatic->id)
                         print $bankaccountstatic->getNomUrl(1, 'transactions');
                     print '</td>';
diff --git a/htdocs/modulebuilder/skeletons/skeleton_list.php b/htdocs/modulebuilder/skeletons/skeleton_list.php
index 51158664889..205fcf4be8c 100644
--- a/htdocs/modulebuilder/skeletons/skeleton_list.php
+++ b/htdocs/modulebuilder/skeletons/skeleton_list.php
@@ -420,8 +420,8 @@ if (! empty($arrayfields['t.tms']['checked']))
 }*/
 // Action column
 print '<td class="liste_titre" align="right">';
-$searchpitco=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
-print $searchpitco;
+$searchpicto=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
+print $searchpicto;
 print '</td>';
 print '</tr>'."\n";
     
diff --git a/htdocs/product/canvas/product/tpl/list.tpl.php b/htdocs/product/canvas/product/tpl/list.tpl.php
index ad00d75259e..db7cac7e51c 100644
--- a/htdocs/product/canvas/product/tpl/list.tpl.php
+++ b/htdocs/product/canvas/product/tpl/list.tpl.php
@@ -71,8 +71,8 @@
   				<td class="liste_titre" align="<?php echo $searchfield['align']; ?>"><input class="flat" type="text" name="s<?php echo $searchfield['alias']; ?>" value=""></td>
 	<?php } else if ($key == $num) { 
         print '<td class="liste_titre" align="right">';
-        $searchpitco=$form->showFilterAndCheckAddButtons(0);
-        print $searchpitco;
+        $searchpicto=$form->showFilterAndCheckAddButtons(0);
+        print $searchpicto;
         print '</td>';
 	} else { ?>
   			<td class="liste_titre">&nbsp;</td>
diff --git a/htdocs/product/canvas/service/tpl/list.tpl.php b/htdocs/product/canvas/service/tpl/list.tpl.php
index a7efe4f86ba..ee2a894de98 100644
--- a/htdocs/product/canvas/service/tpl/list.tpl.php
+++ b/htdocs/product/canvas/service/tpl/list.tpl.php
@@ -71,8 +71,8 @@
   				<td class="liste_titre" align="<?php echo $searchfield['align']; ?>"><input class="flat" type="text" name="s<?php echo $searchfield['alias']; ?>" value=""></td>
 	<?php } else if ($key == $num) { 	
         print '<td class="liste_titre" align="right">';
-        $searchpitco=$form->showFilterAndCheckAddButtons(0);
-        print $searchpitco;
+        $searchpicto=$form->showFilterAndCheckAddButtons(0);
+        print $searchpicto;
         print '</td>';
  			} else { ?>
   			<td class="liste_titre">&nbsp;</td>
diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php
index 78b5b612da1..b3361f0b328 100644
--- a/htdocs/product/stock/list.php
+++ b/htdocs/product/stock/list.php
@@ -168,8 +168,8 @@ if ($result)
 	print '</td>';
 
     print '<td class="liste_titre" align="right">';
-    $searchpitco=$form->showFilterAndCheckAddButtons(0);
-    print $searchpitco;
+    $searchpicto=$form->showFilterAndCheckAddButtons(0);
+    print $searchpicto;
     print '</td>';
 
 	print '</tr>';
diff --git a/htdocs/product/stock/mouvement.php b/htdocs/product/stock/mouvement.php
index bc4099f66ec..82a85ae83b0 100644
--- a/htdocs/product/stock/mouvement.php
+++ b/htdocs/product/stock/mouvement.php
@@ -861,8 +861,8 @@ if ($resql)
 	}
     // Actions    
     print '<td class="liste_titre" align="right">';
-    $searchpitco=$form->showFilterAndCheckAddButtons(0);
-    print $searchpitco;
+    $searchpicto=$form->showFilterAndCheckAddButtons(0);
+    print $searchpicto;
     print '</td>';
     print "</tr>\n";
 
diff --git a/htdocs/product/stock/productlot_list.php b/htdocs/product/stock/productlot_list.php
index d8879d1fa28..df97621c07b 100644
--- a/htdocs/product/stock/productlot_list.php
+++ b/htdocs/product/stock/productlot_list.php
@@ -399,8 +399,8 @@ if ($resql)
      }*/
     // Action column
     print '<td class="liste_titre" align="right">';
-    $searchpitco=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
-    print $searchpitco;
+    $searchpicto=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
+    print $searchpicto;
     print '</td>';
     print '</tr>'."\n";
     
diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php
index fabfe736683..1a3d7c9edb2 100644
--- a/htdocs/product/stock/replenish.php
+++ b/htdocs/product/stock/replenish.php
@@ -513,8 +513,8 @@ print '<td class="liste_titre" align="right">' . $langs->trans('AlertOnly') . '&
 print '<td class="liste_titre" align="right">' . $langs->trans('Draft') . '&nbsp;<input type="checkbox" id="draftorder" name="draftorder" ' . (!empty($draftchecked)?$draftchecked:'') . '></td>';
 print '<td class="liste_titre">&nbsp;</td>';
 print '<td class="liste_titre" align="right">';
-$searchpitco=$form->showFilterAndCheckAddButtons(0);
-print $searchpitco;
+$searchpicto=$form->showFilterAndCheckAddButtons(0);
+print $searchpicto;
 print '</td>';
 print '</tr>';
 
diff --git a/htdocs/product/stock/replenishorders.php b/htdocs/product/stock/replenishorders.php
index 8967fd672d6..d190c4d704d 100644
--- a/htdocs/product/stock/replenishorders.php
+++ b/htdocs/product/stock/replenishorders.php
@@ -179,8 +179,8 @@ if ($resql)
          $form->select_date('', 'search_date', 0, 0, 1, '', 1, 0, 1, 0, '').
          '</td>'.
          '<td class="liste_titre" align="right">';
-         $searchpitco=$form->showFilterAndCheckAddButtons(0);
-         print $searchpitco;
+         $searchpicto=$form->showFilterAndCheckAddButtons(0);
+         print $searchpicto;
          '</td>'.
          '</tr>';
 
diff --git a/htdocs/projet/activity/perday.php b/htdocs/projet/activity/perday.php
index c1aa8aaa469..4c57b45ed50 100644
--- a/htdocs/projet/activity/perday.php
+++ b/htdocs/projet/activity/perday.php
@@ -421,8 +421,8 @@ print '<td class="liste_titre"></td>';
 print '<td class="liste_titre"></td>';
 // Action column
 print '<td class="liste_titre nowrap" align="right">';
-$searchpitco=$form->showFilterAndCheckAddButtons(0);
-print $searchpitco;
+$searchpicto=$form->showFilterAndCheckAddButtons(0);
+print $searchpicto;
 print '</td>';
 print "</tr>\n";
 
diff --git a/htdocs/projet/activity/perweek.php b/htdocs/projet/activity/perweek.php
index 905b93393dd..5720c71b88c 100644
--- a/htdocs/projet/activity/perweek.php
+++ b/htdocs/projet/activity/perweek.php
@@ -417,8 +417,8 @@ for($i=0;$i<7;$i++)
 }
 // Action column
 print '<td class="liste_titre nowrap" align="right">';
-$searchpitco=$form->showFilterAndCheckAddButtons(0);
-print $searchpitco;
+$searchpicto=$form->showFilterAndCheckAddButtons(0);
+print $searchpicto;
 print '</td>';
 print "</tr>\n";
 
diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php
index 8579d436d71..d739324716a 100644
--- a/htdocs/projet/tasks/list.php
+++ b/htdocs/projet/tasks/list.php
@@ -579,8 +579,8 @@ if (! empty($arrayfields['t.tms']['checked']))
 }
 // Action column
 print '<td class="liste_titre" align="right">';
-$searchpitco=$form->showFilterButtons();
-print $searchpitco;
+$searchpicto=$form->showFilterButtons();
+print $searchpicto;
 print '</td>';
 print "</tr>\n";
 
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index eed7bae2734..dab06bbda74 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -776,8 +776,8 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 		print $hookmanager->resPrint;
 		// Action column
 		print '<td class="liste_titre center">';
-		$searchpitco=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
-		print $searchpitco;
+		$searchpicto=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
+		print $searchpicto;
 		print '</td>';
 		print '</tr>'."\n";	
 		
diff --git a/htdocs/user/hierarchy.php b/htdocs/user/hierarchy.php
index ef5380e9678..9e7f6583f6e 100644
--- a/htdocs/user/hierarchy.php
+++ b/htdocs/user/hierarchy.php
@@ -153,8 +153,8 @@ print '<td class="liste_titre" align="right">';
 print $form->selectarray('search_statut', array('-1'=>'','1'=>$langs->trans('Enabled')),$search_statut);
 print '</td>';
 print '<td class="liste_titre" align="right">';
-$searchpitco=$form->showFilterAndCheckAddButtons(0);
-print $searchpitco;
+$searchpicto=$form->showFilterAndCheckAddButtons(0);
+print $searchpicto;
 print '</td>';
 print '</tr>';
 
diff --git a/htdocs/user/index.php b/htdocs/user/index.php
index 9592eed863f..04acb9b56f7 100644
--- a/htdocs/user/index.php
+++ b/htdocs/user/index.php
@@ -419,8 +419,8 @@ if (! empty($arrayfields['u.statut']['checked']))
 }
 // Action column
 print '<td class="liste_titre" align="right">';
-$searchpitco=$form->showFilterAndCheckAddButtons(0);
-print $searchpitco;
+$searchpicto=$form->showFilterAndCheckAddButtons(0);
+print $searchpicto;
 print '</td>';
 
 print "</tr>\n";
diff --git a/htdocs/variants/combinations.php b/htdocs/variants/combinations.php
index 4342b352478..76a091ad8a2 100644
--- a/htdocs/variants/combinations.php
+++ b/htdocs/variants/combinations.php
@@ -638,8 +638,8 @@ if (! empty($id) || ! empty($ref))
 				<td class="liste_titre"></td>
         		<?php 
         		print '<td class="liste_titre" align="middle">';
-        		$searchpitco=$form->showCheckAddButtons('checkforselect', 1);
-        		print $searchpitco;
+        		$searchpicto=$form->showCheckAddButtons('checkforselect', 1);
+        		print $searchpicto;
         		print '</td>';
                 ?>
 			</tr>

From b29d0385e68a5a89ac164610ad7687025acb500a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 15 May 2017 00:15:56 +0200
Subject: [PATCH 349/505] NEW Can send an email to a user from its card.

---
 htdocs/core/actions_sendmails.inc.php     |    5 +-
 htdocs/core/class/CMailFile.class.php     |    5 +
 htdocs/core/class/html.formmail.class.php |    4 +-
 htdocs/user/card.php                      | 1034 ++++++++++++---------
 4 files changed, 592 insertions(+), 456 deletions(-)

diff --git a/htdocs/core/actions_sendmails.inc.php b/htdocs/core/actions_sendmails.inc.php
index d031f318eb9..cf50d05d6bf 100644
--- a/htdocs/core/actions_sendmails.inc.php
+++ b/htdocs/core/actions_sendmails.inc.php
@@ -116,6 +116,7 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 		if (method_exists($object,"fetch_thirdparty") && $object->element != 'societe')
 		{
 			$result=$object->fetch_thirdparty();
+			if ($object->element == 'user' && $result == 0) $result=1;    // Even if not found, we consider ok
 			$thirdparty=$object->thirdparty;
 			$sendtosocid=$thirdparty->id;
 		}
@@ -187,7 +188,7 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 				{
 					$tmparray[] = $thirdparty->name.' <'.$thirdparty->email.'>';
 				}
-				else	// Id du contact
+				elseif ($val)	// Id du contact
 				{
 					$tmparray[] = $thirdparty->contact_get_property((int) $val,'email');
 					$sendtoid[] = $val;
@@ -217,7 +218,7 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 				{
 					$tmparray[] = $thirdparty->name.' <'.$thirdparty->email.'>';
 				}
-				else	// Id du contact
+				elseif ($val)	// Id du contact
 				{
 					$tmparray[] = $thirdparty->contact_get_property((int) $val,'email');
 					//$sendtoid[] = $val;  TODO Add also id of contact in CC ?
diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php
index 3da7f3abcf3..3b3efe96fb0 100644
--- a/htdocs/core/class/CMailFile.class.php
+++ b/htdocs/core/class/CMailFile.class.php
@@ -153,6 +153,11 @@ class CMailFile
 			$this->error='ErrorSubjectIsRequired';
 			return;
 		}
+		if (empty($msg))
+		{
+		    dol_syslog("CMailFile::CMailfile: Try to send an email with empty body");
+		    $msg='.';     // Avoid empty message (with empty message conten show a multipart structure)
+		}		
 
 		// Detect if message is HTML (use fast method)
 		if ($msgishtml == -1)
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 00262b99bb5..020382095a3 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -634,11 +634,11 @@ class FormMail extends Form
         		if ($this->withtopicreadonly)
         		{
         			$out.= $defaulttopic;
-        			$out.= '<input type="hidden" size="60" id="subject" name="subject" value="'.$defaulttopic.'" />';
+        			$out.= '<input type="hidden" class="quatrevingtpercent" id="subject" name="subject" value="'.$defaulttopic.'" />';
         		}
         		else
         		{
-        			$out.= '<input type="text" size="60" id="subject" name="subject" value="'. ((isset($_POST["subject"]) && ! $_POST['modelselected'])?$_POST["subject"]:($defaulttopic?$defaulttopic:'')) .'" />';
+        			$out.= '<input type="text" class="quatrevingtpercent" id="subject" name="subject" value="'. ((isset($_POST["subject"]) && ! $_POST['modelselected'])?$_POST["subject"]:($defaulttopic?$defaulttopic:'')) .'" />';
         		}
         		$out.= "</td></tr>\n";
         	}
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 3682088b552..cf6a1096a7b 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -592,6 +592,14 @@ if (empty($reshook)) {
         }
     }
 		
+    // Actions to send emails
+    $actiontypecode='AC_OTH_AUTO';
+    $trigger_name='USER_SENTBYMAIL';
+    $paramname='id';    // Name of param key to open the card
+    $mode='emailfromuser';
+    $trackid='use'.$object->id;
+    include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
+    
     // Actions to build doc
     $upload_dir = $conf->user->dir_output;
     $permissioncreate=$user->rights->user->user->creer;
@@ -1575,6 +1583,17 @@ else
 
             print '<div class="tabsAction">';
 
+            if (! empty($object->email))
+            {
+                $langs->load("mails");
+                print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=presend&amp;mode=init#presend">'.$langs->trans('SendMail').'</a></div>';
+            }
+            else
+            {
+                $langs->load("mails");
+                print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NoEMail")).'">'.$langs->trans('SendMail').'</a></div>';
+            }
+            
             if ($caneditfield && (empty($conf->multicompany->enabled) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
             {
                 if (! empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED))
@@ -1647,6 +1666,116 @@ else
 
 
 
+            //Select mail models is same action as presend
+            if (GETPOST('modelselected')) {
+                $action = 'presend';
+            }
+            if ($action == 'presend')
+            {
+                /*
+                 * Affiche formulaire mail
+                 */
+            
+                // By default if $action=='presend'
+                $titreform='SendMail';
+                $topicmail='';
+                $action='send';
+                $modelmail='user';
+            
+                print '<div id="presend"></div>';
+                print load_fiche_titre($langs->trans($titreform));
+            
+                dol_fiche_head();
+            
+                // Define output language
+                $outputlangs = $langs;
+                $newlang = '';
+                if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id']))
+                    $newlang = $_REQUEST['lang_id'];
+                
+                if ($conf->global->MAIN_MULTILANGS && empty($newlang))
+                    $newlang = $object->default_lang;
+            
+                // Cree l'objet formulaire mail
+                include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+                $formmail = new FormMail($db);
+                $formmail->param['langsmodels']=(empty($newlang)?$langs->defaultlang:$newlang);
+                $formmail->fromtype = (GETPOST('fromtype')?GETPOST('fromtype'):(!empty($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE)?$conf->global->MAIN_MAIL_DEFAULT_FROMTYPE:'user'));
+    
+                if($formmail->fromtype === 'user'){
+                    $formmail->fromid = $user->id;
+    
+                }
+                $formmail->trackid='thi'.$object->id;
+                if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2))	// If bit 2 is set
+                {
+                    include DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+                    $formmail->frommail=dolAddEmailTrackId($formmail->frommail, 'thi'.$object->id);
+                }
+                $formmail->withfrom=1;
+                $formmail->withtopic=1;
+                $formmail->withto=GETPOST('sendto')?GETPOST('sendto'):$object->email;
+                $formmail->withtofree=1;
+                $formmail->withtocc=1;
+                $formmail->withtoccc=$conf->global->MAIN_EMAIL_USECCC;
+                $formmail->withfile=2;
+                $formmail->withbody=1;
+                $formmail->withdeliveryreceipt=1;
+                $formmail->withcancel=1;
+                // Tableau des substitutions
+                //$formmail->setSubstitFromObject($object);
+                $formmail->substit['__LASTNAME__']=$object->lastname;
+                $formmail->substit['__FIRSTNAME__']=$object->firstname;
+                $formmail->substit['__SIGNATURE__']=$user->signature;
+                $formmail->substit['__PERSONALIZED__']='';
+    
+                //Find the good contact adress
+                /*
+                $custcontact='';
+                $contactarr=array();
+                $contactarr=$object->liste_contact(-1,'external');
+    
+                if (is_array($contactarr) && count($contactarr)>0)
+                {
+                foreach($contactarr as $contact)
+                {
+                if ($contact['libelle']==$langs->trans('TypeContact_facture_external_BILLING')) {
+    
+                require_once DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php';
+    
+                $contactstatic=new Contact($db);
+                $contactstatic->fetch($contact['id']);
+                $custcontact=$contactstatic->getFullName($langs,1);
+                }
+                }
+    
+                if (!empty($custcontact)) {
+                $formmail->substit['__CONTACTCIVNAME__']=$custcontact;
+                }
+                }*/
+    
+    
+                // Tableau des parametres complementaires du post
+                $formmail->param['action']=$action;
+                $formmail->param['models']=$modelmail;
+                $formmail->param['models_id']=GETPOST('modelmailselected','int');
+                $formmail->param['socid']=$object->id;
+                $formmail->param['returnurl']=$_SERVER["PHP_SELF"].'?id='.$object->id;
+    
+                // Init list of files
+                if (GETPOST("mode")=='init')
+                {
+                    $formmail->clear_attached_files();
+                    $formmail->add_attached_files($file,basename($file),dol_mimetype($file));
+                }
+                print $formmail->get_form();
+    
+                dol_fiche_end();
+            }
+        }
+
+        if (GETPOST('action') != 'presend' && GETPOST('action') != 'send')
+        {
             /*
              * List of groups of user
              */
@@ -1775,486 +1904,485 @@ else
                 }
                 print "<br>";
             }
-        }
-
-        /*
-         * Fiche en mode edition
-         */
-        if ($action == 'edit' && ($canedituser || $caneditfield || $caneditpassword || ($user->id == $object->id)))
-        {
-        	print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'" method="POST" name="updateuser" enctype="multipart/form-data">';
-            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-            print '<input type="hidden" name="action" value="update">';
-            print '<input type="hidden" name="entity" value="'.$object->entity.'">';
-
-            dol_fiche_head($head, 'user', $title, 0, 'user');
-
-            print '<table width="100%" class="border">';
-
-            // Ref/ID
-			if (! empty($conf->global->MAIN_SHOW_TECHNICAL_ID))
-			{
-	            print '<tr><td>'.$langs->trans("Ref").'</td>';
-	            print '<td>';
-	            print $object->id;
-	            print '</td>';
-	            print '</tr>';
-			}
-
-            // Lastname
-            print "<tr>";
-            print '<td class="fieldrequired">'.$langs->trans("Lastname").'</td>';
-            print '<td>';
-            if ($caneditfield && !$object->ldap_sid)
+    
+            /*
+             * Fiche en mode edition
+             */
+            if ($action == 'edit' && ($canedituser || $caneditfield || $caneditpassword || ($user->id == $object->id)))
             {
-                print '<input class="minwidth100" type="text" class="flat" name="lastname" value="'.$object->lastname.'">';
-            }
-            else
-            {
-                print '<input type="hidden" name="lastname" value="'.$object->lastname.'">';
-                print $object->lastname;
-            }
-            print '</td>';
-            print '</tr>';
-
-            // Firstname
-            print "<tr>".'<td>'.$langs->trans("Firstname").'</td>';
-            print '<td>';
-            if ($caneditfield && !$object->ldap_sid)
-            {
-                print '<input class="minwidth100" type="text" class="flat" name="firstname" value="'.$object->firstname.'">';
-            }
-            else
-            {
-                print '<input type="hidden" name="firstname" value="'.$object->firstname.'">';
-                print $object->firstname;
-            }
-            print '</td></tr>';
-
-            // Employee
-            print '<tr>';
-            print '<td>'.fieldLabel('Employee','employee',0).'</td><td>';
-            print $form->selectyesno("employee",$object->employee,1);
-            print '</td></tr>';
-
-            // Position/Job
-            print '<tr><td>'.$langs->trans("PostOrFunction").'</td>';
-            print '<td>';
-            if ($caneditfield)
-            {
-            	print '<input size="30" type="text" name="job" value="'.$object->job.'">';
-            }
-            else
-			{
-                print '<input type="hidden" name="job" value="'.$object->job.'">';
-          		print $object->job;
-            }
-            print '</td></tr>';
-
-		    // Gender
-    		print '<tr><td>'.$langs->trans("Gender").'</td>';
-    		print '<td>';
-    		$arraygender=array('man'=>$langs->trans("Genderman"),'woman'=>$langs->trans("Genderwoman"));
-    		print $form->selectarray('gender', $arraygender, GETPOST('gender')?GETPOST('gender'):$object->gender, 1);
-    		print '</td></tr>';
-
-            // Login
-            print "<tr>".'<td><span class="fieldrequired">'.$langs->trans("Login").'</span></td>';
-            print '<td>';
-            if ($user->admin  && !$object->ldap_sid)
-            {
-                print '<input size="12" maxlength="24" type="text" class="flat" name="login" value="'.$object->login.'">';
-            }
-            else
-            {
-                print '<input type="hidden" name="login" value="'.$object->login.'">';
-                print $object->login;
-            }
-            print '</td>';
-            print '</tr>';
-
-            // Pass
-            print '<tr><td>'.$langs->trans("Password").'</td>';
-            print '<td>';
-            if ($object->ldap_sid)
-            {
-                $text=$langs->trans("DomainPassword");
-            }
-            else if ($caneditpassword)
-            {
-                $text='<input size="12" maxlength="32" type="password" class="flat" name="password" value="'.$object->pass.'" autocomplete="off">';
-                if ($dolibarr_main_authentication && $dolibarr_main_authentication == 'http')
+            	print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'" method="POST" name="updateuser" enctype="multipart/form-data">';
+                print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+                print '<input type="hidden" name="action" value="update">';
+                print '<input type="hidden" name="entity" value="'.$object->entity.'">';
+    
+                dol_fiche_head($head, 'user', $title, 0, 'user');
+    
+                print '<table width="100%" class="border">';
+    
+                // Ref/ID
+    			if (! empty($conf->global->MAIN_SHOW_TECHNICAL_ID))
+    			{
+    	            print '<tr><td>'.$langs->trans("Ref").'</td>';
+    	            print '<td>';
+    	            print $object->id;
+    	            print '</td>';
+    	            print '</tr>';
+    			}
+    
+                // Lastname
+                print "<tr>";
+                print '<td class="fieldrequired">'.$langs->trans("Lastname").'</td>';
+                print '<td>';
+                if ($caneditfield && !$object->ldap_sid)
                 {
-                    $text=$form->textwithpicto($text,$langs->trans("DolibarrInHttpAuthenticationSoPasswordUseless",$dolibarr_main_authentication),1,'warning');
+                    print '<input class="minwidth100" type="text" class="flat" name="lastname" value="'.$object->lastname.'">';
                 }
-            }
-            else
-            {
-                $text=preg_replace('/./i','*',$object->pass);
-            }
-            print $text;
-            print "</td></tr>\n";
-
-            // API key
-            if(! empty($conf->api->enabled) && $user->admin) {
-                print '<tr><td>'.$langs->trans("ApiKey").'</td>';
-                print '<td>';
-                print '<input class="minwidth100" maxsize="32" type="text" id="api_key" name="api_key" value="'.$object->api_key.'" autocomplete="off">';
-                if (! empty($conf->use_javascript_ajax))
-                    print '&nbsp;'.img_picto($langs->trans('Generate'), 'refresh', 'id="generate_api_key" class="linkobject"');
-                print '</td></tr>';
-            }
-
-            // Administrator
-            print '<tr><td>'.$langs->trans("Administrator").'</td>';
-            if ($object->societe_id > 0)
-            {
-            	$langs->load("admin");
-                print '<td>';
-                print '<input type="hidden" name="admin" value="'.$object->admin.'">'.yn($object->admin);
-                print ' ('.$langs->trans("ExternalUser").')';
-                print '</td></tr>';
-            }
-            else
-            {
-                print '<td>';
-                $nbAdmin = $user->getNbOfUsers('active','',1);
-                $nbSuperAdmin = $user->getNbOfUsers('active','superadmin',1);
-                //var_dump($nbAdmin);
-                //var_dump($nbSuperAdmin);
-                if ($user->admin								// Need to be admin to allow downgrade of an admin
-                && ($user->id != $object->id)                   // Don't downgrade ourself
-                && (
-                	(empty($conf->multicompany->enabled) && $nbAdmin >= 1)
-                	|| (! empty($conf->multicompany->enabled) && ($object->entity > 0 || $nbSuperAdmin > 1))    // Don't downgrade a superadmin if alone
-                	)
-                )
+                else
                 {
-                    print $form->selectyesno('admin',$object->admin,1);
-
-                    if (! empty($conf->multicompany->enabled) && ! $user->entity && empty($conf->multicompany->transverse_mode))
+                    print '<input type="hidden" name="lastname" value="'.$object->lastname.'">';
+                    print $object->lastname;
+                }
+                print '</td>';
+                print '</tr>';
+    
+                // Firstname
+                print "<tr>".'<td>'.$langs->trans("Firstname").'</td>';
+                print '<td>';
+                if ($caneditfield && !$object->ldap_sid)
+                {
+                    print '<input class="minwidth100" type="text" class="flat" name="firstname" value="'.$object->firstname.'">';
+                }
+                else
+                {
+                    print '<input type="hidden" name="firstname" value="'.$object->firstname.'">';
+                    print $object->firstname;
+                }
+                print '</td></tr>';
+    
+                // Employee
+                print '<tr>';
+                print '<td>'.fieldLabel('Employee','employee',0).'</td><td>';
+                print $form->selectyesno("employee",$object->employee,1);
+                print '</td></tr>';
+    
+                // Position/Job
+                print '<tr><td>'.$langs->trans("PostOrFunction").'</td>';
+                print '<td>';
+                if ($caneditfield)
+                {
+                	print '<input size="30" type="text" name="job" value="'.$object->job.'">';
+                }
+                else
+    			{
+                    print '<input type="hidden" name="job" value="'.$object->job.'">';
+              		print $object->job;
+                }
+                print '</td></tr>';
+    
+    		    // Gender
+        		print '<tr><td>'.$langs->trans("Gender").'</td>';
+        		print '<td>';
+        		$arraygender=array('man'=>$langs->trans("Genderman"),'woman'=>$langs->trans("Genderwoman"));
+        		print $form->selectarray('gender', $arraygender, GETPOST('gender')?GETPOST('gender'):$object->gender, 1);
+        		print '</td></tr>';
+    
+                // Login
+                print "<tr>".'<td><span class="fieldrequired">'.$langs->trans("Login").'</span></td>';
+                print '<td>';
+                if ($user->admin  && !$object->ldap_sid)
+                {
+                    print '<input size="12" maxlength="24" type="text" class="flat" name="login" value="'.$object->login.'">';
+                }
+                else
+                {
+                    print '<input type="hidden" name="login" value="'.$object->login.'">';
+                    print $object->login;
+                }
+                print '</td>';
+                print '</tr>';
+    
+                // Pass
+                print '<tr><td>'.$langs->trans("Password").'</td>';
+                print '<td>';
+                if ($object->ldap_sid)
+                {
+                    $text=$langs->trans("DomainPassword");
+                }
+                else if ($caneditpassword)
+                {
+                    $text='<input size="12" maxlength="32" type="password" class="flat" name="password" value="'.$object->pass.'" autocomplete="off">';
+                    if ($dolibarr_main_authentication && $dolibarr_main_authentication == 'http')
                     {
-                        if ($conf->use_javascript_ajax)
-                        {
-                            print '<script type="text/javascript">
-									$(function() {
-										var admin = $("select[name=admin]").val();
-										if (admin == 0) {
-											$("input[name=superadmin]")
-													.prop("disabled", true)
-													.prop("checked", false);
-										}
-										if ($("input[name=superadmin]").is(":checked")) {
-											$("select[name=entity]")
-													.prop("disabled", true);
-										}
-										$("select[name=admin]").change(function() {
-											 if ( $(this).val() == 0 ) {
-											 	$("input[name=superadmin]")
-													.prop("disabled", true)
-													.prop("checked", false);
-											 	$("select[name=entity]")
-													.prop("disabled", false);
-											 } else {
-											 	$("input[name=superadmin]")
-													.prop("disabled", false);
-											 }
-										});
-										$("input[name=superadmin]").change(function() {
-											if ( $(this).is(":checked")) {
-												$("select[name=entity]")
-													.prop("disabled", true);
-											} else {
-												$("select[name=entity]")
-													.prop("disabled", false);
-											}
-										});
-									});
-								</script>';
-                        }
-
-                        $checked=(($object->admin && ! $object->entity) ? ' checked' : '');
-                        print '<input type="checkbox" name="superadmin" value="1"'.$checked.' /> '.$langs->trans("SuperAdministrator");
+                        $text=$form->textwithpicto($text,$langs->trans("DolibarrInHttpAuthenticationSoPasswordUseless",$dolibarr_main_authentication),1,'warning');
                     }
                 }
                 else
                 {
-                    $yn = yn($object->admin);
-                    print '<input type="hidden" name="admin" value="'.$object->admin.'">';
-                    print '<input type="hidden" name="superadmin" value="'.(empty($object->entity) ? 1 : 0).'">';
-                    if (! empty($conf->multicompany->enabled) && empty($object->entity)) print $form->textwithpicto($yn,$langs->trans("DontDowngradeSuperAdmin"),1,'warning');
-                    else print $yn;
+                    $text=preg_replace('/./i','*',$object->pass);
                 }
+                print $text;
+                print "</td></tr>\n";
+    
+                // API key
+                if(! empty($conf->api->enabled) && $user->admin) {
+                    print '<tr><td>'.$langs->trans("ApiKey").'</td>';
+                    print '<td>';
+                    print '<input class="minwidth100" maxsize="32" type="text" id="api_key" name="api_key" value="'.$object->api_key.'" autocomplete="off">';
+                    if (! empty($conf->use_javascript_ajax))
+                        print '&nbsp;'.img_picto($langs->trans('Generate'), 'refresh', 'id="generate_api_key" class="linkobject"');
+                    print '</td></tr>';
+                }
+    
+                // Administrator
+                print '<tr><td>'.$langs->trans("Administrator").'</td>';
+                if ($object->societe_id > 0)
+                {
+                	$langs->load("admin");
+                    print '<td>';
+                    print '<input type="hidden" name="admin" value="'.$object->admin.'">'.yn($object->admin);
+                    print ' ('.$langs->trans("ExternalUser").')';
+                    print '</td></tr>';
+                }
+                else
+                {
+                    print '<td>';
+                    $nbAdmin = $user->getNbOfUsers('active','',1);
+                    $nbSuperAdmin = $user->getNbOfUsers('active','superadmin',1);
+                    //var_dump($nbAdmin);
+                    //var_dump($nbSuperAdmin);
+                    if ($user->admin								// Need to be admin to allow downgrade of an admin
+                    && ($user->id != $object->id)                   // Don't downgrade ourself
+                    && (
+                    	(empty($conf->multicompany->enabled) && $nbAdmin >= 1)
+                    	|| (! empty($conf->multicompany->enabled) && ($object->entity > 0 || $nbSuperAdmin > 1))    // Don't downgrade a superadmin if alone
+                    	)
+                    )
+                    {
+                        print $form->selectyesno('admin',$object->admin,1);
+    
+                        if (! empty($conf->multicompany->enabled) && ! $user->entity && empty($conf->multicompany->transverse_mode))
+                        {
+                            if ($conf->use_javascript_ajax)
+                            {
+                                print '<script type="text/javascript">
+    									$(function() {
+    										var admin = $("select[name=admin]").val();
+    										if (admin == 0) {
+    											$("input[name=superadmin]")
+    													.prop("disabled", true)
+    													.prop("checked", false);
+    										}
+    										if ($("input[name=superadmin]").is(":checked")) {
+    											$("select[name=entity]")
+    													.prop("disabled", true);
+    										}
+    										$("select[name=admin]").change(function() {
+    											 if ( $(this).val() == 0 ) {
+    											 	$("input[name=superadmin]")
+    													.prop("disabled", true)
+    													.prop("checked", false);
+    											 	$("select[name=entity]")
+    													.prop("disabled", false);
+    											 } else {
+    											 	$("input[name=superadmin]")
+    													.prop("disabled", false);
+    											 }
+    										});
+    										$("input[name=superadmin]").change(function() {
+    											if ( $(this).is(":checked")) {
+    												$("select[name=entity]")
+    													.prop("disabled", true);
+    											} else {
+    												$("select[name=entity]")
+    													.prop("disabled", false);
+    											}
+    										});
+    									});
+    								</script>';
+                            }
+    
+                            $checked=(($object->admin && ! $object->entity) ? ' checked' : '');
+                            print '<input type="checkbox" name="superadmin" value="1"'.$checked.' /> '.$langs->trans("SuperAdministrator");
+                        }
+                    }
+                    else
+                    {
+                        $yn = yn($object->admin);
+                        print '<input type="hidden" name="admin" value="'.$object->admin.'">';
+                        print '<input type="hidden" name="superadmin" value="'.(empty($object->entity) ? 1 : 0).'">';
+                        if (! empty($conf->multicompany->enabled) && empty($object->entity)) print $form->textwithpicto($yn,$langs->trans("DontDowngradeSuperAdmin"),1,'warning');
+                        else print $yn;
+                    }
+                    print '</td></tr>';
+                }
+    
+               	// Type
+               	print '<tr><td>'.$langs->trans("Type").'</td>';
+               	print '<td>';
+               	if ($user->id == $object->id || ! $user->admin)
+               	{
+    	           	$type=$langs->trans("Internal");
+        	       	if ($object->societe_id) $type=$langs->trans("External");
+            	   	print $form->textwithpicto($type,$langs->trans("InternalExternalDesc"));
+    	           	if ($object->ldap_sid) print ' ('.$langs->trans("DomainUser").')';
+               	}
+               	else
+    			{
+    				$type=0;
+    	            if ($object->contact_id) $type=$object->contact_id;
+    	            print $form->selectcontacts(0,$type,'contactid',2,'','',1,'',false,1);
+    	           	if ($object->ldap_sid) print ' ('.$langs->trans("DomainUser").')';
+                }
+               	print '</td></tr>';
+    
+    			// Address
+                print '<tr><td class="tdtop">'.fieldLabel('Address','address').'</td>';
+    	        print '<td><textarea name="address" id="address" class="quatrevingtpercent" rows="3" wrap="soft">';
+                print $object->address;
+                print '</textarea></td></tr>';
+    
+                // Zip
+                print '<tr><td>'.fieldLabel('Zip','zipcode').'</td><td>';
+                print $formcompany->select_ziptown($object->zip, 'zipcode', array('town', 'selectcountry_id', 'state_id'), 6);
                 print '</td></tr>';
-            }
-
-           	// Type
-           	print '<tr><td>'.$langs->trans("Type").'</td>';
-           	print '<td>';
-           	if ($user->id == $object->id || ! $user->admin)
-           	{
-	           	$type=$langs->trans("Internal");
-    	       	if ($object->societe_id) $type=$langs->trans("External");
-        	   	print $form->textwithpicto($type,$langs->trans("InternalExternalDesc"));
-	           	if ($object->ldap_sid) print ' ('.$langs->trans("DomainUser").')';
-           	}
-           	else
-			{
-				$type=0;
-	            if ($object->contact_id) $type=$object->contact_id;
-	            print $form->selectcontacts(0,$type,'contactid',2,'','',1,'',false,1);
-	           	if ($object->ldap_sid) print ' ('.$langs->trans("DomainUser").')';
-            }
-           	print '</td></tr>';
-
-			// Address
-            print '<tr><td class="tdtop">'.fieldLabel('Address','address').'</td>';
-	        print '<td><textarea name="address" id="address" class="quatrevingtpercent" rows="3" wrap="soft">';
-            print $object->address;
-            print '</textarea></td></tr>';
-
-            // Zip
-            print '<tr><td>'.fieldLabel('Zip','zipcode').'</td><td>';
-            print $formcompany->select_ziptown($object->zip, 'zipcode', array('town', 'selectcountry_id', 'state_id'), 6);
-            print '</td></tr>';
-
-			// Town
-			print '<tr><td>'.fieldLabel('Town','town').'</td><td>';
-            print $formcompany->select_ziptown($object->town, 'town', array('zipcode', 'selectcountry_id', 'state_id'));
-            print '</td></tr>';
-
-            // Country
-            print '<tr><td>'.fieldLabel('Country','selectcounty_id').'</td><td>';
-            print $form->select_country((GETPOST('country_id')!=''?GETPOST('country_id'):$object->country_id),'country_id');
-            if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
-            print '</td></tr>';
-
-            // State
-            if (empty($conf->global->USER_DISABLE_STATE))
-            {
-                print '<tr><td class="tdoverflow">'.fieldLabel('State','state_id').'</td><td>';
-                print $formcompany->select_state($object->state_id,$object->country_code, 'state_id');
+    
+    			// Town
+    			print '<tr><td>'.fieldLabel('Town','town').'</td><td>';
+                print $formcompany->select_ziptown($object->town, 'town', array('zipcode', 'selectcountry_id', 'state_id'));
                 print '</td></tr>';
-            }
-
-            // Tel pro
-            print "<tr>".'<td>'.$langs->trans("PhonePro").'</td>';
-            print '<td>';
-            if ($caneditfield  && empty($object->ldap_sid))
-            {
-                print '<input size="20" type="text" name="office_phone" class="flat" value="'.$object->office_phone.'">';
-            }
-            else
-            {
-                print '<input type="hidden" name="office_phone" value="'.$object->office_phone.'">';
-                print $object->office_phone;
-            }
-            print '</td></tr>';
-
-            // Tel mobile
-            print "<tr>".'<td>'.$langs->trans("PhoneMobile").'</td>';
-            print '<td>';
-            if ($caneditfield && empty($object->ldap_sid))
-            {
-                print '<input size="20" type="text" name="user_mobile" class="flat" value="'.$object->user_mobile.'">';
-            }
-            else
-            {
-                print '<input type="hidden" name="user_mobile" value="'.$object->user_mobile.'">';
-                print $object->user_mobile;
-            }
-            print '</td></tr>';
-
-            // Fax
-            print "<tr>".'<td>'.$langs->trans("Fax").'</td>';
-            print '<td>';
-            if ($caneditfield  && empty($object->ldap_sid))
-            {
-                print '<input size="20" type="text" name="office_fax" class="flat" value="'.$object->office_fax.'">';
-            }
-            else
-            {
-                print '<input type="hidden" name="office_fax" value="'.$object->office_fax.'">';
-                print $object->office_fax;
-            }
-            print '</td></tr>';
-
-            // Skype
-            if (! empty($conf->skype->enabled))
-            {
-                print '<tr><td>'.$langs->trans("Skype").'</td>';
+    
+                // Country
+                print '<tr><td>'.fieldLabel('Country','selectcounty_id').'</td><td>';
+                print $form->select_country((GETPOST('country_id')!=''?GETPOST('country_id'):$object->country_id),'country_id');
+                if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+                print '</td></tr>';
+    
+                // State
+                if (empty($conf->global->USER_DISABLE_STATE))
+                {
+                    print '<tr><td class="tdoverflow">'.fieldLabel('State','state_id').'</td><td>';
+                    print $formcompany->select_state($object->state_id,$object->country_code, 'state_id');
+                    print '</td></tr>';
+                }
+    
+                // Tel pro
+                print "<tr>".'<td>'.$langs->trans("PhonePro").'</td>';
                 print '<td>';
                 if ($caneditfield  && empty($object->ldap_sid))
                 {
-                    print '<input size="40" type="text" name="skype" class="flat" value="'.$object->skype.'">';
+                    print '<input size="20" type="text" name="office_phone" class="flat" value="'.$object->office_phone.'">';
                 }
                 else
                 {
-                    print '<input type="hidden" name="skype" value="'.$object->skype.'">';
-                    print $object->skype;
+                    print '<input type="hidden" name="office_phone" value="'.$object->office_phone.'">';
+                    print $object->office_phone;
                 }
                 print '</td></tr>';
-            }
-
-            // EMail
-            print "<tr>".'<td'.(! empty($conf->global->USER_MAIL_REQUIRED)?' class="fieldrequired"':'').'>'.$langs->trans("EMail").'</td>';
-            print '<td>';
-            if ($caneditfield  && empty($object->ldap_sid))
-            {
-                print '<input class="minwidth100" type="text" name="email" class="flat" value="'.$object->email.'">';
-            }
-            else
-            {
-                print '<input type="hidden" name="email" value="'.$object->email.'">';
-                print $object->email;
-            }
-            print '</td></tr>';
-
-            // Signature
-            print "<tr>".'<td class="tdtop">'.$langs->trans("Signature").'</td>';
-            print '<td>';
-            if ($caneditfield)
-            {
-	            require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-	            $doleditor=new DolEditor('signature',$object->signature,'',138,'dolibarr_mailings','In',false,true,empty($conf->global->FCKEDITOR_ENABLE_USERSIGN)?0:1,ROWS_4,'90%');
-	            print $doleditor->Create(1);
-            }
-            else
-			{
-          		print dol_htmlentitiesbr($object->signature);
-            }
-            print '</td></tr>';
-
-            // OpenID url
-            if (isset($conf->file->main_authentication) && preg_match('/openid/',$conf->file->main_authentication) && ! empty($conf->global->MAIN_OPENIDURL_PERUSER))
-            {
-                print "<tr>".'<td>'.$langs->trans("OpenIDURL").'</td>';
+    
+                // Tel mobile
+                print "<tr>".'<td>'.$langs->trans("PhoneMobile").'</td>';
+                print '<td>';
+                if ($caneditfield && empty($object->ldap_sid))
+                {
+                    print '<input size="20" type="text" name="user_mobile" class="flat" value="'.$object->user_mobile.'">';
+                }
+                else
+                {
+                    print '<input type="hidden" name="user_mobile" value="'.$object->user_mobile.'">';
+                    print $object->user_mobile;
+                }
+                print '</td></tr>';
+    
+                // Fax
+                print "<tr>".'<td>'.$langs->trans("Fax").'</td>';
+                print '<td>';
+                if ($caneditfield  && empty($object->ldap_sid))
+                {
+                    print '<input size="20" type="text" name="office_fax" class="flat" value="'.$object->office_fax.'">';
+                }
+                else
+                {
+                    print '<input type="hidden" name="office_fax" value="'.$object->office_fax.'">';
+                    print $object->office_fax;
+                }
+                print '</td></tr>';
+    
+                // Skype
+                if (! empty($conf->skype->enabled))
+                {
+                    print '<tr><td>'.$langs->trans("Skype").'</td>';
+                    print '<td>';
+                    if ($caneditfield  && empty($object->ldap_sid))
+                    {
+                        print '<input size="40" type="text" name="skype" class="flat" value="'.$object->skype.'">';
+                    }
+                    else
+                    {
+                        print '<input type="hidden" name="skype" value="'.$object->skype.'">';
+                        print $object->skype;
+                    }
+                    print '</td></tr>';
+                }
+    
+                // EMail
+                print "<tr>".'<td'.(! empty($conf->global->USER_MAIL_REQUIRED)?' class="fieldrequired"':'').'>'.$langs->trans("EMail").'</td>';
+                print '<td>';
+                if ($caneditfield  && empty($object->ldap_sid))
+                {
+                    print '<input class="minwidth100" type="text" name="email" class="flat" value="'.$object->email.'">';
+                }
+                else
+                {
+                    print '<input type="hidden" name="email" value="'.$object->email.'">';
+                    print $object->email;
+                }
+                print '</td></tr>';
+    
+                // Signature
+                print "<tr>".'<td class="tdtop">'.$langs->trans("Signature").'</td>';
                 print '<td>';
                 if ($caneditfield)
                 {
-                    print '<input class="minwidth100" type="url" name="openid" class="flat" value="'.$object->openid.'">';
+    	            require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+    	            $doleditor=new DolEditor('signature',$object->signature,'',138,'dolibarr_mailings','In',false,true,empty($conf->global->FCKEDITOR_ENABLE_USERSIGN)?0:1,ROWS_4,'90%');
+    	            print $doleditor->Create(1);
                 }
                 else
-              {
-                    print '<input type="hidden" name="openid" value="'.$object->openid.'">';
-                    print $object->openid;
+    			{
+              		print dol_htmlentitiesbr($object->signature);
                 }
                 print '</td></tr>';
-            }
-
-            // Hierarchy
-            print '<tr><td>'.$langs->trans("HierarchicalResponsible").'</td>';
-            print '<td>';
-            if ($caneditfield)
-            {
-            	print $form->select_dolusers($object->fk_user, 'fk_user', 1, array($object->id), 0, '', 0, $object->entity, 0, 0, '', 0, '', 'maxwidth300');
-            }
-            else
-            {
-          		print '<input type="hidden" name="fk_user" value="'.$object->fk_user.'">';
-            	$huser=new User($db);
-            	$huser->fetch($object->fk_user);
-            	print $huser->getNomUrl(1);
-            }
-            print '</td>';
-            print "</tr>\n";
-
-            if (! empty($conf->salaries->enabled) && ! empty($user->rights->salaries->read))
-            {
-            	$langs->load("salaries");
-
-            	// THM
-			    print '<tr><td>';
-			    $text=$langs->trans("THM");
-			    print $form->textwithpicto($text, $langs->trans("THMDescription"), 1, 'help', 'classthm');
-			    print '</td>';
-			    print '<td>';
-			    print '<input size="8" type="text" name="thm" value="'.price2num(GETPOST('thm')?GETPOST('thm'):$object->thm).'">';
-			    print '</td>';
-			    print "</tr>\n";
-
-			    // TJM
-			    print '<tr><td>';
-			    $text=$langs->trans("TJM");
-			    print $form->textwithpicto($text, $langs->trans("TJMDescription"), 1, 'help', 'classthm');
-			    print '</td>';
-			    print '<td>';
-			    print '<input size="8" type="text" name="tjm" value="'.price2num(GETPOST('tjm')?GETPOST('tjm'):$object->tjm).'">';
-			    print '</td>';
-			    print "</tr>\n";
-
-			    // Salary
-			    print '<tr><td>'.$langs->trans("Salary").'</td>';
-			    print '<td>';
-			    print '<input size="8" type="text" name="salary" value="'.price2num(GETPOST('salary')?GETPOST('salary'):$object->salary).'">';
-			    print '</td>';
-			    print "</tr>\n";
-            }
-
-		    // Weeklyhours
-		    print '<tr><td>'.$langs->trans("WeeklyHours").'</td>';
-		    print '<td>';
-		    print '<input size="8" type="text" name="weeklyhours" value="'.price2num(GETPOST('weeklyhours')?GETPOST('weeklyhours'):$object->weeklyhours).'">';
-		    print '</td>';
-		    print "</tr>\n";
-
-		    // Date employment
-		    print '<tr><td>'.$langs->trans("DateEmployment").'</td>';
-		    print '<td>';
-			echo $form->select_date(GETPOST('dateemployment')?GETPOST('dateemployment'):$object->dateemployment,'dateemployment',0,0,1,'form'.'dateemployment',1,0,1);
-			print '</td>';
-		    print "</tr>\n";
-
-		    // Accountancy code
-			if ($conf->accounting->enabled)
+    
+                // OpenID url
+                if (isset($conf->file->main_authentication) && preg_match('/openid/',$conf->file->main_authentication) && ! empty($conf->global->MAIN_OPENIDURL_PERUSER))
+                {
+                    print "<tr>".'<td>'.$langs->trans("OpenIDURL").'</td>';
+                    print '<td>';
+                    if ($caneditfield)
+                    {
+                        print '<input class="minwidth100" type="url" name="openid" class="flat" value="'.$object->openid.'">';
+                    }
+                    else
+                  {
+                        print '<input type="hidden" name="openid" value="'.$object->openid.'">';
+                        print $object->openid;
+                    }
+                    print '</td></tr>';
+                }
+    
+                // Hierarchy
+                print '<tr><td>'.$langs->trans("HierarchicalResponsible").'</td>';
+                print '<td>';
+                if ($caneditfield)
+                {
+                	print $form->select_dolusers($object->fk_user, 'fk_user', 1, array($object->id), 0, '', 0, $object->entity, 0, 0, '', 0, '', 'maxwidth300');
+                }
+                else
+                {
+              		print '<input type="hidden" name="fk_user" value="'.$object->fk_user.'">';
+                	$huser=new User($db);
+                	$huser->fetch($object->fk_user);
+                	print $huser->getNomUrl(1);
+                }
+                print '</td>';
+                print "</tr>\n";
+    
+                if (! empty($conf->salaries->enabled) && ! empty($user->rights->salaries->read))
+                {
+                	$langs->load("salaries");
+    
+                	// THM
+    			    print '<tr><td>';
+    			    $text=$langs->trans("THM");
+    			    print $form->textwithpicto($text, $langs->trans("THMDescription"), 1, 'help', 'classthm');
+    			    print '</td>';
+    			    print '<td>';
+    			    print '<input size="8" type="text" name="thm" value="'.price2num(GETPOST('thm')?GETPOST('thm'):$object->thm).'">';
+    			    print '</td>';
+    			    print "</tr>\n";
+    
+    			    // TJM
+    			    print '<tr><td>';
+    			    $text=$langs->trans("TJM");
+    			    print $form->textwithpicto($text, $langs->trans("TJMDescription"), 1, 'help', 'classthm');
+    			    print '</td>';
+    			    print '<td>';
+    			    print '<input size="8" type="text" name="tjm" value="'.price2num(GETPOST('tjm')?GETPOST('tjm'):$object->tjm).'">';
+    			    print '</td>';
+    			    print "</tr>\n";
+    
+    			    // Salary
+    			    print '<tr><td>'.$langs->trans("Salary").'</td>';
+    			    print '<td>';
+    			    print '<input size="8" type="text" name="salary" value="'.price2num(GETPOST('salary')?GETPOST('salary'):$object->salary).'">';
+    			    print '</td>';
+    			    print "</tr>\n";
+                }
+    
+    		    // Weeklyhours
+    		    print '<tr><td>'.$langs->trans("WeeklyHours").'</td>';
+    		    print '<td>';
+    		    print '<input size="8" type="text" name="weeklyhours" value="'.price2num(GETPOST('weeklyhours')?GETPOST('weeklyhours'):$object->weeklyhours).'">';
+    		    print '</td>';
+    		    print "</tr>\n";
+    
+    		    // Date employment
+    		    print '<tr><td>'.$langs->trans("DateEmployment").'</td>';
+    		    print '<td>';
+    			echo $form->select_date(GETPOST('dateemployment')?GETPOST('dateemployment'):$object->dateemployment,'dateemployment',0,0,1,'form'.'dateemployment',1,0,1);
+    			print '</td>';
+    		    print "</tr>\n";
+    
+    		    // Accountancy code
+    			if ($conf->accounting->enabled)
+        		{
+    			print "<tr>";
+    			print '<td>'.$langs->trans("AccountancyCode").'</td>';
+    			print '<td>';
+    			if ($caneditfield)
+    			{
+    				print '<input size="30" type="text" class="flat" name="accountancy_code" value="'.$object->accountancy_code.'">';
+    			}
+    			else
+    			{
+    				print '<input type="hidden" name="accountancy_code" value="'.$object->accountancy_code.'">';
+    				print $object->accountancy_code;
+    			}
+    			print '</td>';
+    			print "</tr>";
+    		}
+    
+    		// User color
+    		if (! empty($conf->agenda->enabled))
+    	    {
+    			print '<tr><td>'.$langs->trans("ColorUser").'</td>';
+    			print '<td>';
+    			print $formother->selectColor(GETPOST('color')?GETPOST('color'):$object->color, 'color', null, 1, '', 'hideifnotset');
+    			print '</td></tr>';
+    		}
+    
+    		// Photo
+    		print '<tr>';
+    		print '<td>'.$langs->trans("Photo").'</td>';
+    		print '<td>';
+    		print $form->showphoto('userphoto',$object,60,0,$caneditfield,'photowithmargin','small');
+    		print '</td>';
+    		print '</tr>';
+    		
+    		// Categories
+    		if (!empty( $conf->categorie->enabled ) && !empty( $user->rights->categorie->lire )) 
     		{
-			print "<tr>";
-			print '<td>'.$langs->trans("AccountancyCode").'</td>';
-			print '<td>';
-			if ($caneditfield)
-			{
-				print '<input size="30" type="text" class="flat" name="accountancy_code" value="'.$object->accountancy_code.'">';
-			}
-			else
-			{
-				print '<input type="hidden" name="accountancy_code" value="'.$object->accountancy_code.'">';
-				print $object->accountancy_code;
-			}
-			print '</td>';
-			print "</tr>";
-		}
-
-		// User color
-		if (! empty($conf->agenda->enabled))
-	    {
-			print '<tr><td>'.$langs->trans("ColorUser").'</td>';
-			print '<td>';
-			print $formother->selectColor(GETPOST('color')?GETPOST('color'):$object->color, 'color', null, 1, '', 'hideifnotset');
-			print '</td></tr>';
-		}
-
-		// Photo
-		print '<tr>';
-		print '<td>'.$langs->trans("Photo").'</td>';
-		print '<td>';
-		print $form->showphoto('userphoto',$object,60,0,$caneditfield,'photowithmargin','small');
-		print '</td>';
-		print '</tr>';
-		
-		// Categories
-		if (!empty( $conf->categorie->enabled ) && !empty( $user->rights->categorie->lire )) 
-		{
-			print '<tr><td>' . fieldLabel( 'Categories', 'usercats' ) . '</td>';
-			print '<td>';
-			$cate_arbo = $form->select_all_categories( Categorie::TYPE_CONTACT, null, null, null, null, 1 );
-			$c = new Categorie( $db );
-			$cats = $c->containing($object->id, Categorie::TYPE_USER);
-			foreach ($cats as $cat) {
-				$arrayselected[] = $cat->id;
-			}
-			print $form->multiselectarray( 'usercats', $cate_arbo, $arrayselected, '', 0, '', 0, '90%' );
-			print "</td></tr>";
-		}
+    			print '<tr><td>' . fieldLabel( 'Categories', 'usercats' ) . '</td>';
+    			print '<td>';
+    			$cate_arbo = $form->select_all_categories( Categorie::TYPE_CONTACT, null, null, null, null, 1 );
+    			$c = new Categorie( $db );
+    			$cats = $c->containing($object->id, Categorie::TYPE_USER);
+    			foreach ($cats as $cat) {
+    				$arrayselected[] = $cat->id;
+    			}
+    			print $form->multiselectarray( 'usercats', $cate_arbo, $arrayselected, '', 0, '', 0, '90%' );
+    			print "</td></tr>";
+    		}
 
             // Status
             print '<tr><td>'.$langs->trans("Status").'</td>';
@@ -2373,6 +2501,8 @@ else
             
             
             print '</div></div></div>';
+        }
+        
         }
         
 		if (! empty($conf->ldap->enabled) && ! empty($object->ldap_sid)) $ldap->close();

From becd023032f78b43c2818339c90f8ccd469ebdba Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Mon, 15 May 2017 05:11:00 +0200
Subject: [PATCH 350/505] Fix : tooltip on supplier invoice payment

---
 htdocs/compta/facture/card.php | 11 +++++++----
 htdocs/fourn/facture/card.php  | 15 +++++++++++++--
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 9525f63b722..023b2049ee9 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -3721,11 +3721,14 @@ else if ($id > 0 || ! empty($ref))
                     $bankaccountstatic->ref = $objp->baref;
                     $bankaccountstatic->label = $objp->baref;
 					$bankaccountstatic->number = $objp->banumber;
-					$bankaccountstatic->account_number = $objp->account_number;
 
-					$accountingjournal = new AccountingJournal($db);
-					$accountingjournal->fetch($objp->fk_accountancy_journal);
-					$bankaccountstatic->accountancy_journal = $accountingjournal->getNomUrl(0,1,1,'',1);
+					if (! empty($conf->accounting->enabled)) {
+						$bankaccountstatic->account_number = $objp->account_number;
+
+						$accountingjournal = new AccountingJournal($db);
+						$accountingjournal->fetch($objp->fk_accountancy_journal);
+						$bankaccountstatic->accountancy_journal = $accountingjournal->getNomUrl(0,1,1,'',1);
+					}
 
 					print '<td align="right">';
                     if ($bankaccountstatic->id)
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index f930ad87979..838e5cf25c0 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -8,7 +8,7 @@
  * Copyright (C) 2013-2015	Philippe Grand			<philippe.grand@atoo-net.com>
  * Copyright (C) 2013		Florian Henry			<florian.henry@open-concept.pro>
  * Copyright (C) 2014-2016  Marcos García			<marcosgdf@gmail.com>
- * Copyright (C) 2016		Alexandre Spangaro		<aspangaro@zendsi.com>
+ * Copyright (C) 2016-2017	Alexandre Spangaro		<aspangaro@zendsi.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
@@ -49,6 +49,7 @@ if (!empty($conf->projet->enabled)) {
 if (!empty($conf->variants->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductCombination.class.php';
 }
+if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php';
 
 
 $langs->load('bills');
@@ -2317,7 +2318,7 @@ else
     	$sql = 'SELECT p.datep as dp, p.ref, p.num_paiement, p.rowid, p.fk_bank,';
     	$sql.= ' c.id as paiement_type,';
     	$sql.= ' pf.amount,';
-    	$sql.= ' ba.rowid as baid, ba.ref as baref, ba.label';
+    	$sql.= ' ba.rowid as baid, ba.ref as baref, ba.label, ba.number as banumber, ba.account_number, ba.fk_accountancy_journal';
     	$sql.= ' FROM '.MAIN_DB_PREFIX.'paiementfourn as p';
     	$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank as b ON p.fk_bank = b.rowid';
     	$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank_account as ba ON b.fk_account = ba.rowid';
@@ -2365,6 +2366,16 @@ else
     	                $bankaccountstatic->id=$objp->baid;
     	                $bankaccountstatic->ref=$objp->baref;
     	                $bankaccountstatic->label=$objp->baref;
+						$bankaccountstatic->number = $objp->banumber;
+
+						if (! empty($conf->accounting->enabled)) {
+							$bankaccountstatic->account_number = $objp->account_number;
+
+							$accountingjournal = new AccountingJournal($db);
+							$accountingjournal->fetch($objp->fk_accountancy_journal);
+							$bankaccountstatic->accountancy_journal = $accountingjournal->getNomUrl(0,1,1,'',1);
+						}
+
     	                print '<td align="right">';
     	                if ($objp->baid > 0) print $bankaccountstatic->getNomUrl(1,'transactions');
     	                print '</td>';

From 4d9016c49f9bc0738c4254888a12f945dd29c7b9 Mon Sep 17 00:00:00 2001
From: phf <phf@atm-consulting.fr>
Date: Thu, 11 May 2017 09:53:23 +0200
Subject: [PATCH 351/505] Fix create propal form from propal with project id,
 fk_project is not used to init select project

---
 htdocs/commande/card.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 8459a4a5e9e..93b4e8ec02b 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -1589,9 +1589,6 @@ if ($action == 'create' && $user->rights->commande->creer)
 	// Project
 	if (! empty($conf->projet->enabled) && $socid > 0)
 	{
-		$projectid = GETPOST('projectid')?GETPOST('projectid'):0;
-		if ($origin == 'project') $projectid = ($originid ? $originid : 0);
-
 		$langs->load("projects");
 		print '<tr>';
 		print '<td>' . $langs->trans("Project") . '</td><td colspan="2">';

From d120a391f9ac4f6b617e7d95883647d1657021dd Mon Sep 17 00:00:00 2001
From: phf <phf@atm-consulting.fr>
Date: Mon, 15 May 2017 10:26:40 +0200
Subject: [PATCH 352/505] Fix use $numlines instead $i

---
 htdocs/compta/facture/card.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 06b64d02da6..91f64dc8693 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -1084,9 +1084,9 @@ if (empty($reshook))
 										}
 
 										if ($totalamount != 0) {
-											$i = $i > 0 ? $i-1 : 0;
-										    $tva_tx = $lines[$i]->tva_tx;
-										    if (! empty($lines[$i]->vat_src_code) && ! preg_match('/\(/', $tva_tx)) $tva_tx .= ' ('.$lines[$i]->vat_src_code.')';
+											if ($numlines > 0) $numlines = $numlines-1;
+										    $tva_tx = $lines[$numlines]->tva_tx;
+										    if (! empty($lines[$numlines]->vat_src_code) && ! preg_match('/\(/', $tva_tx)) $tva_tx .= ' ('.$lines[$numlines]->vat_src_code.')';
 											$amountdeposit[$tva_tx] = ($totalamount * $valuedeposit) / 100;
 										} else {
 											$amountdeposit[0] = 0;

From b3245fb4557d1e7da0b851f4293ead067eb6ef9c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 15 May 2017 10:27:21 +0200
Subject: [PATCH 353/505] NEW Include an hourglass icon when we click on online
 payment button

---
 htdocs/paypal/admin/paypal.php       |   2 +-
 htdocs/public/paypal/newpayment.php  |  20 +++-
 htdocs/public/stripe/newpayment.php  | 156 ++++++++++++++-------------
 htdocs/stripe/admin/stripe.php       |   7 +-
 htdocs/theme/common/dolibarr_box.png | Bin 31433 -> 34121 bytes
 htdocs/theme/eldy/style.css.php      |   6 +-
 htdocs/theme/md/style.css.php        |   6 +-
 7 files changed, 101 insertions(+), 96 deletions(-)

diff --git a/htdocs/paypal/admin/paypal.php b/htdocs/paypal/admin/paypal.php
index 2d0be83c80d..4c3dd2d961e 100644
--- a/htdocs/paypal/admin/paypal.php
+++ b/htdocs/paypal/admin/paypal.php
@@ -141,7 +141,7 @@ print '<td>'.$langs->trans("Value").'</td>';
 print "</tr>\n";
 
 print '<tr class="oddeven">';
-print '<td class="titlefield fieldrequired">';
+print '<td class="titlefield">';
 print $langs->trans("PaypalLiveEnabled").'</td><td>';
 if (empty($conf->global->PAYPAL_API_SANDBOX))
 {
diff --git a/htdocs/public/paypal/newpayment.php b/htdocs/public/paypal/newpayment.php
index 08bf0c4faed..5be4e49f232 100644
--- a/htdocs/public/paypal/newpayment.php
+++ b/htdocs/public/paypal/newpayment.php
@@ -276,7 +276,7 @@ $paramcreditor='PAYPAL_CREDITOR_'.$suffix;
 if (! empty($conf->global->$paramcreditor)) $creditor=$conf->global->$paramcreditor;
 else if (! empty($conf->global->PAYPAL_CREDITOR)) $creditor=$conf->global->PAYPAL_CREDITOR;
 
-print '<span id="dolpaymentspan"></span>'."\n";
+print '<span id="dopaymentspan"></span>'."\n";
 print '<div class="center">'."\n";
 print '<form id="dolpaymentform" class="center" name="paymentform" action="'.$_SERVER["PHP_SELF"].'" method="POST">'."\n";
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'."\n";
@@ -969,12 +969,13 @@ if ($found && ! $error)	// We are in a management option and no error
 
 	if ($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY == 'integral')
 	{
-		print '<br><input class="button" type="submit" name="dopayment" value="'.$langs->trans("PaypalOrCBDoPayment").'">';
+		print '<br><input class="button" type="submit" id="dopayment" name="dopayment" value="'.$langs->trans("PaypalOrCBDoPayment").'">';
 	}
 	if ($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY == 'paypalonly')
 	{
-		print '<br><input class="button" type="submit" name="dopayment" value="'.$langs->trans("PaypalDoPayment").'">';
+		print '<br><input class="button" type="submit" id="dopayment" name="dopayment" value="'.$langs->trans("PaypalDoPayment").'">';
 	}
+	print '<img id="hourglasstopay" class="hidden" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/working.gif'.'">';
 }
 else
 {
@@ -986,9 +987,22 @@ print '</td></tr>'."\n";
 print '</table>'."\n";
 print '</form>'."\n";
 print '</div>'."\n";
+
+
+print '<script type="text/javascript" language="javascript">
+jQuery(document).ready(function() {
+	jQuery("#dopayment").click(function() {
+		jQuery("#dopayment").hide();
+        jQuery("#hourglasstopay").show();
+	});
+});
+</script>';
+
+
 print '<br>';
 
 
+
 htmlPrintOnlinePaymentFooter($mysoc,$langs);
 
 llxFooter('', 'public');
diff --git a/htdocs/public/stripe/newpayment.php b/htdocs/public/stripe/newpayment.php
index 64ea70cfbeb..a430baafb59 100644
--- a/htdocs/public/stripe/newpayment.php
+++ b/htdocs/public/stripe/newpayment.php
@@ -90,8 +90,8 @@ if (! $action)
 //$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
 $urlwithroot=DOL_MAIN_URL_ROOT;						// This is to use same domain name than current
 
-$urlok=$urlwithroot.'/public/paypal/paymentok.php?';
-$urlko=$urlwithroot.'/public/paypal/paymentko.php?';
+$urlok=$urlwithroot.'/public/stripe/paymentok.php?';
+$urlko=$urlwithroot.'/public/stripe/paymentko.php?';
 
 // Complete urls for post treatment
 $SOURCE=GETPOST("source",'alpha');
@@ -1119,8 +1119,8 @@ if (preg_match('/^dopayment/',$action))
     <div id="card-errors" role="alert"></div>
     </div>
     <br>
-    <button>'.$langs->trans("ToPay").'</button>
-    
+    <button class="button" id="buttontopay">'.$langs->trans("ToPay").'</button>
+    <img id="hourglasstopay" class="hidden" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/working.gif'.'">
     </td></tr></tbody></table>
         
     </form>
@@ -1131,82 +1131,84 @@ if (preg_match('/^dopayment/',$action))
     
     <script type="text/javascript" language="javascript">';
     ?>
+
+    // Create a Stripe client
+    var stripe = Stripe('<?php echo $stripe['publishable_key']; ?>');
     
-        // Create a Stripe client
-        var stripe = Stripe('<?php echo $stripe['publishable_key']; ?>');
-        
-        // Create an instance of Elements
-        var elements = stripe.elements();
-        
-        // Custom styling can be passed to options when creating an Element.
-        // (Note that this demo uses a wider set of styles than the guide below.)
-        var style = {
-          base: {
-            color: '#32325d',
-            lineHeight: '24px',
-            fontFamily: '"Helvetica Neue", Helvetica, sans-serif',
-            fontSmoothing: 'antialiased',
-            fontSize: '16px',
-            '::placeholder': {
-              color: '#aab7c4'
-            }
-          },
-          invalid: {
-            color: '#fa755a',
-            iconColor: '#fa755a'
-          }
-        };
-        
-        // Create an instance of the card Element
-        var card = elements.create('card', {style: style});
-        
-        // Add an instance of the card Element into the `card-element` <div>
-        card.mount('#card-element');
-        
-        // Handle real-time validation errors from the card Element.
-        card.addEventListener('change', function(event) {
-          var displayError = document.getElementById('card-errors');
-          if (event.error) {
-            displayError.textContent = event.error.message;
-          } else {
-            displayError.textContent = '';
-          }
-        });
-        
-        // Handle form submission
-        var form = document.getElementById('payment-form');
-        console.log(form);
-        form.addEventListener('submit', function(event) {
-          event.preventDefault();
-        
-          stripe.createToken(card).then(function(result) {
-            if (result.error) {
-              // Inform the user if there was an error
-              var errorElement = document.getElementById('card-errors');
-              errorElement.textContent = result.error.message;
-            } else {
-              // Send the token to your server
-              stripeTokenHandler(result.token);
-            }
-          });
-        });
-        
-        function stripeTokenHandler(token) {
-          // Insert the token ID into the form so it gets submitted to the server
-          var form = document.getElementById('payment-form');
-          var hiddenInput = document.createElement('input');
-          hiddenInput.setAttribute('type', 'hidden');
-          hiddenInput.setAttribute('name', 'stripeToken');
-          hiddenInput.setAttribute('value', token.id);
-          form.appendChild(hiddenInput);
-        
-          // Submit the form
-          console.log("submit");
-          form.submit();
-        }        
+    // Create an instance of Elements
+    var elements = stripe.elements();
+    
+    // Custom styling can be passed to options when creating an Element.
+    // (Note that this demo uses a wider set of styles than the guide below.)
+    var style = {
+      base: {
+        color: '#32325d',
+        lineHeight: '24px',
+        fontFamily: '"Helvetica Neue", Helvetica, sans-serif',
+        fontSmoothing: 'antialiased',
+        fontSize: '16px',
+        '::placeholder': {
+          color: '#aab7c4'
+        }
+      },
+      invalid: {
+        color: '#fa755a',
+        iconColor: '#fa755a'
+      }
+    };
+    
+    // Create an instance of the card Element
+    var card = elements.create('card', {style: style});
+    
+    // Add an instance of the card Element into the `card-element` <div>
+    card.mount('#card-element');
+    
+    // Handle real-time validation errors from the card Element.
+    card.addEventListener('change', function(event) {
+      var displayError = document.getElementById('card-errors');
+      if (event.error) {
+        displayError.textContent = event.error.message;
+      } else {
+        displayError.textContent = '';
+      }
+    });
+    
+    // Handle form submission
+    var form = document.getElementById('payment-form');
+    console.log(form);
+    form.addEventListener('submit', function(event) {
+      event.preventDefault();
+    
+      stripe.createToken(card).then(function(result) {
+        if (result.error) {
+          // Inform the user if there was an error
+          var errorElement = document.getElementById('card-errors');
+          errorElement.textContent = result.error.message;
+        } else {
+          // Send the token to your server
+          stripeTokenHandler(result.token);
+        }
+      });
+    });
+    
+    function stripeTokenHandler(token) {
+      // Insert the token ID into the form so it gets submitted to the server
+      var form = document.getElementById('payment-form');
+      var hiddenInput = document.createElement('input');
+      hiddenInput.setAttribute('type', 'hidden');
+      hiddenInput.setAttribute('name', 'stripeToken');
+      hiddenInput.setAttribute('value', token.id);
+      form.appendChild(hiddenInput);
+    
+      // Submit the form
+      jQuery('#buttontopay').hide();
+      jQuery('#hourglasstopay').show();
+      console.log("submit");
+      form.submit();
+    }        
     
     <?php
-        print '</script>';    
+    print '</script>';    
 }
 
 
diff --git a/htdocs/stripe/admin/stripe.php b/htdocs/stripe/admin/stripe.php
index 056e43690b2..f135927b28a 100644
--- a/htdocs/stripe/admin/stripe.php
+++ b/htdocs/stripe/admin/stripe.php
@@ -134,7 +134,7 @@ print '<td>'.$langs->trans("Value").'</td>';
 print "</tr>\n";
 
 print '<tr class="oddeven">';
-print '<td class="titlefield fieldrequired">';
+print '<td class="titlefield">';
 print $langs->trans("StripeLiveEnabled").'</td><td>';
 if (!empty($conf->global->STRIPE_LIVE))
 {
@@ -229,7 +229,7 @@ $token='';
 // Url list
 print '<u>'.$langs->trans("FollowingUrlAreAvailableToMakePayments").':</u><br>';
 print img_picto('','object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnFreeAmount",$servicename).':<br>';
-print '<strong>'.getStripePaymentUrl(1,'free')."</strong><br><br>\n";
+print '<strong>'.getStripePaymentUrl(1,'free')."</strong><br>\n";
 if (! empty($conf->commande->enabled))
 {
 	print img_picto('','object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnOrder",$servicename).':<br>';
@@ -250,7 +250,6 @@ if (! empty($conf->commande->enabled))
         }
         print '</form>';
 	}
-	print '<br>';
 }
 if (! empty($conf->facture->enabled))
 {
@@ -272,7 +271,6 @@ if (! empty($conf->facture->enabled))
         }
         print '</form>';
 	}
-	print '<br>';
 }
 if (! empty($conf->contrat->enabled))
 {
@@ -294,7 +292,6 @@ if (! empty($conf->contrat->enabled))
         }
         print '</form>';
 	}
-	print '<br>';
 }
 if (! empty($conf->adherent->enabled))
 {
diff --git a/htdocs/theme/common/dolibarr_box.png b/htdocs/theme/common/dolibarr_box.png
index 074b41951badb0f25e1f06b8c0c3d6b43a21f8df..69595524187aecf0831e12606a8a43d7c0fce971 100644
GIT binary patch
literal 34121
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
Hu0mjf6-o*L

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

diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index a8e7729f31b..80edfc6fea9 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -3264,7 +3264,7 @@ div.visible {
     display: block;
 }
 
-div.hidden {
+div.hidden, td.hidden, img.hidden {
     display: none;
 }
 
@@ -3272,10 +3272,6 @@ tr.visible {
     display: block;
 }
 
-td.hidden {
-    display: none;
-}
-
 
 /* ============================================================================== */
 /*  Module website                                                                */
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 5c96fa501ae..36e2dc4e6f3 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -3362,7 +3362,7 @@ div.visible {
     display: block;
 }
 
-div.hidden {
+div.hidden, td.hidden, img.hidden {
     display: none;
 }
 
@@ -3370,10 +3370,6 @@ tr.visible {
     display: block;
 }
 
-td.hidden {
-    display: none;
-}
-
 
 /* ============================================================================== */
 /*  Module website                                                                */

From f2aa0ea48837fb9517d03f6ff99d42d86a105f31 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 15 May 2017 10:39:14 +0200
Subject: [PATCH 354/505] Look and feel v6

---
 htdocs/paybox/admin/paybox.php | 3 +--
 htdocs/paypal/admin/paypal.php | 8 ++++----
 htdocs/stripe/admin/stripe.php | 9 ++++++---
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/htdocs/paybox/admin/paybox.php b/htdocs/paybox/admin/paybox.php
index ffbc2e41e0c..56a8482fcfc 100644
--- a/htdocs/paybox/admin/paybox.php
+++ b/htdocs/paybox/admin/paybox.php
@@ -212,7 +212,7 @@ print '</form>';
 
 print '<br><br>';
 
-print '<u>'.$langs->trans("FollowingUrlAreAvailableToMakePayments").':</u><br>';
+print '<u>'.$langs->trans("FollowingUrlAreAvailableToMakePayments").':</u><br><br>';
 print img_picto('','object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnFreeAmount",$servicename).':<br>';
 print '<b>'.DOL_MAIN_URL_ROOT.'/public/paybox/newpayment.php?amount=<i>9.99</i>&tag=<i>your_free_tag</i></b>'."<br>\n";
 if (! empty($conf->commande->enabled))
@@ -237,7 +237,6 @@ if (! empty($conf->adherent->enabled))
 	print '<b>'.DOL_MAIN_URL_ROOT.'/public/paybox/newpayment.php?source=membersubscription&ref=<i>member_ref</i></b>'."<br>\n";
 }
 
-print "<br>";
 print info_admin($langs->trans("YouCanAddTagOnUrl"));
 
 llxFooter();
diff --git a/htdocs/paypal/admin/paypal.php b/htdocs/paypal/admin/paypal.php
index 4c3dd2d961e..cc83dc10fab 100644
--- a/htdocs/paypal/admin/paypal.php
+++ b/htdocs/paypal/admin/paypal.php
@@ -175,7 +175,7 @@ print '<br>'.$langs->trans("Example").': ASsqXEmw4KzmX-CPChWSVDNCNfd.A3YNR7uz-Vn
 print '</td></tr>';
 
 
-print '<tr class="oddeven"><td class="fieldrequired">';
+print '<tr class="oddeven"><td>';
 print $langs->trans("PAYPAL_SSLVERSION").'</td><td>';
 print $form->selectarray("PAYPAL_SSLVERSION",array('1'=> $langs->trans('TLSv1'),'6'=> $langs->trans('TLSv1.2')),$conf->global->PAYPAL_SSLVERSION);
 print '</td></tr>';
@@ -187,7 +187,7 @@ print '<td>'.$langs->trans("Value").'</td>';
 print "</tr>\n";
 
 
-print '<tr class="oddeven"><td class="fieldrequired">';
+print '<tr class="oddeven"><td>';
 print $langs->trans("PAYPAL_API_INTEGRAL_OR_PAYPALONLY").'</td><td>';
 print $form->selectarray("PAYPAL_API_INTEGRAL_OR_PAYPALONLY",array('integral'=> $langs->trans('PaypalModeIntegral'),'paypalonly'=> $langs->trans('PaypalModeOnlyPaypal')),$conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY);
 print '</td></tr>';
@@ -296,7 +296,7 @@ $token='';
 
 
 // Url list
-print '<u>'.$langs->trans("FollowingUrlAreAvailableToMakePayments").':</u><br>';
+print '<u>'.$langs->trans("FollowingUrlAreAvailableToMakePayments").':</u><br><br>';
 print img_picto('','object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnFreeAmount",$servicename).':<br>';
 print '<strong>'.getPaypalPaymentUrl(1,'free')."</strong><br><br>\n";
 if (! empty($conf->commande->enabled))
@@ -385,9 +385,9 @@ if (! empty($conf->adherent->enabled))
         }
         print '</form>';
 	}
+	print '<br>';
 }
 
-print "<br>";
 print info_admin($langs->trans("YouCanAddTagOnUrl"));
 
 if (! empty($conf->use_javascript_ajax))
diff --git a/htdocs/stripe/admin/stripe.php b/htdocs/stripe/admin/stripe.php
index f135927b28a..c2c33edc189 100644
--- a/htdocs/stripe/admin/stripe.php
+++ b/htdocs/stripe/admin/stripe.php
@@ -227,9 +227,9 @@ $token='';
 
 
 // Url list
-print '<u>'.$langs->trans("FollowingUrlAreAvailableToMakePayments").':</u><br>';
+print '<u>'.$langs->trans("FollowingUrlAreAvailableToMakePayments").':</u><br><br>';
 print img_picto('','object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnFreeAmount",$servicename).':<br>';
-print '<strong>'.getStripePaymentUrl(1,'free')."</strong><br>\n";
+print '<strong>'.getStripePaymentUrl(1,'free')."</strong><br><br>\n";
 if (! empty($conf->commande->enabled))
 {
 	print img_picto('','object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnOrder",$servicename).':<br>';
@@ -250,6 +250,7 @@ if (! empty($conf->commande->enabled))
         }
         print '</form>';
 	}
+	print '<br>';
 }
 if (! empty($conf->facture->enabled))
 {
@@ -271,6 +272,7 @@ if (! empty($conf->facture->enabled))
         }
         print '</form>';
 	}
+	print '<br>';
 }
 if (! empty($conf->contrat->enabled))
 {
@@ -292,6 +294,7 @@ if (! empty($conf->contrat->enabled))
         }
         print '</form>';
 	}
+	print '<br>';
 }
 if (! empty($conf->adherent->enabled))
 {
@@ -313,9 +316,9 @@ if (! empty($conf->adherent->enabled))
         }
         print '</form>';
 	}
+	print '<br>';
 }
 
-print "<br>";
 print info_admin($langs->trans("YouCanAddTagOnUrl"));
 
 if (! empty($conf->use_javascript_ajax))

From 789fbb6dc3ea6a16133288a6faa163dc45b31b0c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 15 May 2017 12:57:08 +0200
Subject: [PATCH 355/505] Enhance tooltips

---
 htdocs/admin/system/perf.php  | 9 ++++++---
 htdocs/langs/en_US/admin.lang | 2 ++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/htdocs/admin/system/perf.php b/htdocs/admin/system/perf.php
index 3e6a9df4a25..9b23dc74089 100644
--- a/htdocs/admin/system/perf.php
+++ b/htdocs/admin/system/perf.php
@@ -112,7 +112,7 @@ $test=function_exists('opcache_get_status');
 if (! $foundcache && $test)
 {
 	$foundcache++;
-	print img_picto('','tick.png').' '.$langs->trans("ZendOPCacheInstalled");  // Should be by defautl starting with PHP 5.5
+	print img_picto('','tick.png').' '.$langs->trans("ZendOPCacheInstalled");  // Should be by default starting with PHP 5.5
 	//$tmp=opcache_get_status();
 	//var_dump($tmp);
 }
@@ -376,7 +376,8 @@ jQuery(document).ready(function() {
 
 print '<br>';
 print '<strong>'.$langs->trans("HTTPCacheStaticResources").' - ';
-print $langs->trans("CacheByServer").':</strong><br>';
+print $form->textwithpicto($langs->trans("CacheByServer"), $langs->trans("CacheByServerDesc"));
+print ':</strong><br>';
 // No cahce on PHP
 //print '<div id="httpcachephpok">'.img_picto('','warning.png').' '.$langs->trans("FilesOfTypeNotCompressed",'php (.php)').'</div>';
 //print '<div id="httpcachephpko">'.img_picto('','tick.png').' '.$langs->trans("FilesOfTypeNotCached",'php (.php)').'</div>';
@@ -399,7 +400,9 @@ print $langs->trans("TestNotPossibleWithCurrentBrowsers").'<br>';
 
 // Compressions
 print '<br>';
-print '<strong>'.$langs->trans("CompressionOfResources").'</strong>: ';
+print '<strong>';
+print $form->textwithpicto($langs->trans("CompressionOfResources"), $langs->trans("CompressionOfResourcesDesc"));
+print '</strong>: ';
 //$tmp=getURLContent(DOL_URL_ROOT.'/index.php','GET');var_dump($tmp);
 print '<br>';
 // on PHP
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 3662e8aca1c..1c9ac65e4b8 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1353,8 +1353,10 @@ FilesOfTypeNotCached=Files of type %s are not cached by HTTP server
 FilesOfTypeCompressed=Files of type %s are compressed by HTTP server
 FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
 CacheByServer=Cache by server
+CacheByServerDesc=For exemple using the Apache directive "ExpiresByType image/gif A2592000"
 CacheByClient=Cache by browser
 CompressionOfResources=Compression of HTTP responses
+CompressionOfResourcesDesc=For exemple using the Apache directive "AddOutputFilterByType DEFLATE"
 TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers 
 DefaultValuesDesc=You can define/force here the default value you want to get when your create a new record, and/or defaut filters or sort order when your list record. 
 DefaultCreateForm=Default values for new objects

From f10b77f1909a9ff3c105ad450fe005237a345754 Mon Sep 17 00:00:00 2001
From: phf <phf@atm-consulting.fr>
Date: Mon, 15 May 2017 15:05:42 +0200
Subject: [PATCH 356/505] Fix html id 'tablelines' exist twice

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

diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index aad8b77811f..c871594f16a 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -3811,7 +3811,7 @@ else if ($id > 0 || ! empty($ref))
 			print '<input type="hidden" name="action" value="updatealllines" />';
 			print '<input type="hidden" name="id" value="' . $object->id . '" />';
 			
-			print '<table id="tablelines" class="noborder noshadow" width="100%">';
+			print '<table id="tablelines_all_progress" class="noborder noshadow" width="100%">';
 			print '<tr class="liste_titre nodrag nodrop">';
 			
 			if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {

From 3da7b9543df6bd94712ea493195172c3faba1da5 Mon Sep 17 00:00:00 2001
From: phf <phf@atm-consulting.fr>
Date: Mon, 15 May 2017 15:10:15 +0200
Subject: [PATCH 357/505] Fix double quote

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

diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index c871594f16a..6637d1332f2 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -3806,7 +3806,7 @@ else if ($id > 0 || ! empty($ref))
 		if ($object->situation_cycle_ref && $object->statut == 0) {
 			print '<div class="div-table-responsive">';
 			
-			print '<form name="updatealllines" id="updatealllines" action="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '"#updatealllines" method="POST">';
+			print '<form name="updatealllines" id="updatealllines" action="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '#updatealllines" method="POST">';
 			print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '" />';
 			print '<input type="hidden" name="action" value="updatealllines" />';
 			print '<input type="hidden" name="id" value="' . $object->id . '" />';

From bdb2f851032c9f4a8a6253cd45bde4470eb6374e Mon Sep 17 00:00:00 2001
From: philippe grand <philippe.grand@atoo-net.com>
Date: Mon, 15 May 2017 16:25:51 +0200
Subject: [PATCH 358/505] Update code using new css class

---
 htdocs/expedition/card.php        |  2 +-
 htdocs/expedition/index.php       | 22 +++++++---------------
 htdocs/expedition/stats/index.php |  6 ++----
 3 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index cbe602f7313..a0280ce9e39 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -1013,7 +1013,7 @@ if ($action == 'create')
 									{
 										$img=img_warning($langs->trans("StockTooLow"));
 									}
-									print "<tr ".$bc[$var]."><td>&nbsp; &nbsp; &nbsp; ->
+									print "<tr class=\"oddeven\"><td>&nbsp; &nbsp; &nbsp; ->
 										<a href=\"".DOL_URL_ROOT."/product/card.php?id=".$value['id']."\">".$value['fullpath']."
 										</a> (".$value['nb'].")</td><td align=\"center\"> ".$value['nb_total']."</td><td>&nbsp</td><td>&nbsp</td>
 										<td align=\"center\">".$value['stock']." ".$img."</td></tr>";
diff --git a/htdocs/expedition/index.php b/htdocs/expedition/index.php
index c3e277ad7b0..039a038f18a 100644
--- a/htdocs/expedition/index.php
+++ b/htdocs/expedition/index.php
@@ -90,17 +90,15 @@ if ($resql)
 		print '<tr class="liste_titre">';
 		print '<th colspan="3">'.$langs->trans("SendingsToValidate").'</th></tr>';
 		$i = 0;
-		$var = True;
 		while ($i < $num)
 		{
 			$obj = $db->fetch_object($resql);
 			
 			$shipment->id=$obj->rowid;
 			$shipment->ref=$obj->ref;
-			$shipment->ref_customer=$obj->ref_customer;
-				
+			$shipment->ref_customer=$obj->ref_customer;				
 			
-			print "<tr ".$bc[$var].'><td class="nowrap">';
+			print '<tr class="oddeven"><td class="nowrap">';
 			print $shipment->getNomUrl(1);
 			print "</td>";
 			print '<td>';
@@ -142,7 +140,6 @@ if ($resql)
 		print '<table class="noborder" width="100%">';
 		print '<tr class="liste_titre">';
 		print '<th colspan="3">'.$langs->trans("OrdersToProcess").'</th></tr>';
-		$var = True;
 		while ($i < $num)
 		{
 			$obj = $db->fetch_object($resql);
@@ -154,8 +151,7 @@ if ($resql)
 			$orderstatic->facturee=0;
 			
 			$companystatic->name=$obj->name;
-			$companystatic->id=$obj->socid;
-			
+			$companystatic->id=$obj->socid;			
 			
 			print '<tr class="oddeven">';
 			print '<td class="nowrap">';
@@ -204,7 +200,6 @@ if ( $resql )
 		print '<table class="noborder" width="100%">';
 		print '<tr class="liste_titre">';
 		print '<th colspan="3">'.$langs->trans("OrdersInProcess").'</th></tr>';
-		$var = True;
 		while ($i < $num)
 		{
 			$obj = $db->fetch_object($resql);
@@ -216,10 +211,9 @@ if ( $resql )
             $orderstatic->facturee=$obj->billed;
 			
             $companystatic->name=$obj->name;
-			$companystatic->id=$obj->socid;
-				
+			$companystatic->id=$obj->socid;				
 			
-			print "<tr ".$bc[$var]."><td>";
+			print '<tr class="oddeven"><td>';
 			print $orderstatic->getNomUrl(1);
 			print '</td>';
 			print '<td>';
@@ -264,16 +258,14 @@ if ($resql)
 		$i = 0;
 		print '<table class="noborder" width="100%">';
 		print '<tr class="liste_titre">';
-		print '<th colspan="3">'.$langs->trans("LastSendings",$num).'</th></tr>';
-		$var = True;
+		print '<th colspan="3">'.$langs->trans("LastSendings", $num).'</th></tr>';
 		while ($i < $num)
 		{
 			$obj = $db->fetch_object($resql);
 		    
 			$shipment->id=$obj->rowid;
 			$shipment->ref=$obj->ref;
-			$shipment->ref_customer=$obj->ref_customer;
-				
+			$shipment->ref_customer=$obj->ref_customer;				
 			
 			print '<tr class="oddeven"><td>';
 			print $shipment->getNomUrl(1);
diff --git a/htdocs/expedition/stats/index.php b/htdocs/expedition/stats/index.php
index cccfc0d90a0..53837c76fd1 100644
--- a/htdocs/expedition/stats/index.php
+++ b/htdocs/expedition/stats/index.php
@@ -269,7 +269,6 @@ print '<td align="center">'.$langs->trans("AmountAverage").'</td>';*/
 print '</tr>';
 
 $oldyear=0;
-$var=true;
 foreach ($data as $val)
 {
 	$year = $val['year'];
@@ -278,7 +277,7 @@ foreach ($data as $val)
 		$oldyear--;
 		
 		
-		print '<tr '.$bc[$var].' height="24">';
+		print '<tr class="oddeven" height="24">';
 		print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$oldyear.'&amp;mode='.$mode.'">'.$oldyear.'</a></td>';
 	
 		print '<td align="right">0</td>';
@@ -286,9 +285,8 @@ foreach ($data as $val)
 		print '<td align="right">0</td>';*/
 		print '</tr>';
 	}
-
 	
-	print '<tr '.$bc[$var].' height="24">';
+	print '<tr class="oddeven" height="24">';
 	print '<td align="center">';
 	if ($year) print '<a href="'.$_SERVER["PHP_SELF"].'?year='.$year.'&amp;mode='.$mode.'">'.$year.'</a>';
 	else print $langs->trans("ValidationDateNotDefinedEvenIfShipmentValidated");

From ce84990414d00d4e5a74f73bf68bdb456f84628a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 16 May 2017 02:43:05 +0200
Subject: [PATCH 359/505] NEW On invoices generated by template, we save if of
 source template.

---
 htdocs/compta/facture/class/facture-rec.class.php |  4 +++-
 htdocs/compta/facture/class/facture.class.php     |  5 ++++-
 htdocs/compta/facture/fiche-rec.php               |  5 +++--
 htdocs/install/mysql/migration/5.0.0-6.0.0.sql    |  2 +-
 htdocs/install/mysql/tables/llx_facture.sql       |  3 ++-
 htdocs/langs/en_US/other.lang                     | 12 ++++++++++++
 6 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php
index ef23a30b878..927be3fa25e 100644
--- a/htdocs/compta/facture/class/facture-rec.class.php
+++ b/htdocs/compta/facture/class/facture-rec.class.php
@@ -446,7 +446,7 @@ class FactureRec extends CommonInvoice
 		}
 		else
 		{
-			$this->error=$this->db-lasterror();
+			$this->error=$this->db->lasterror();
 			return -3;
 		}
 	}
@@ -849,6 +849,8 @@ class FactureRec extends CommonInvoice
 
 			    $facture = new Facture($db);
 				$facture->fac_rec = $facturerec->id;    // We will create $facture from this recurring invoice
+				$facture->fk_fac_rec_source = $facturerec->id;    // We will create $facture from this recurring invoice
+				
 			    $facture->type = self::TYPE_STANDARD;
 			    $facture->brouillon = 1;
 			    $facture->date = $facturerec->date_when;	// We could also use dol_now here but we prefer date_when so invoice has real date when we would like even if we generate later.
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 844e217cccb..e46b5718d22 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -279,6 +279,8 @@ class Facture extends CommonInvoice
 		// Create invoice from a template invoice
 		if ($this->fac_rec > 0)
 		{
+		    $this->fk_fac_rec_source = $this->fac_rec;
+		    
 			require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture-rec.class.php';
 			$_facrec = new FactureRec($this->db);
 			$result=$_facrec->fetch($this->fac_rec);
@@ -386,7 +388,7 @@ class Facture extends CommonInvoice
 		$sql.= ", note_public";
 		$sql.= ", ref_client, ref_int";
         $sql.= ", fk_account";
-		$sql.= ", fk_facture_source, fk_user_author, fk_projet";
+		$sql.= ", fk_fac_rec_source, fk_facture_source, fk_user_author, fk_projet";
 		$sql.= ", fk_cond_reglement, fk_mode_reglement, date_lim_reglement, model_pdf";
 		$sql.= ", situation_cycle_ref, situation_counter, situation_final";
 		$sql.= ", fk_incoterms, location_incoterms";
@@ -410,6 +412,7 @@ class Facture extends CommonInvoice
 		$sql.= ", ".($this->ref_client?"'".$this->db->escape($this->ref_client)."'":"null");
 		$sql.= ", ".($this->ref_int?"'".$this->db->escape($this->ref_int)."'":"null");
 		$sql.= ", ".($this->fk_account>0?$this->fk_account:'NULL');
+		$sql.= ", ".($this->fk_fac_rec_source?"'".$this->db->escape($this->fk_fac_rec_source)."'":"null");
 		$sql.= ", ".($this->fk_facture_source?"'".$this->db->escape($this->fk_facture_source)."'":"null");
 		$sql.= ", ".($user->id > 0 ? "'".$user->id."'":"null");
 		$sql.= ", ".($this->fk_project?$this->fk_project:"null");
diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php
index acf97a3893a..773f04d2ca0 100644
--- a/htdocs/compta/facture/fiche-rec.php
+++ b/htdocs/compta/facture/fiche-rec.php
@@ -44,6 +44,7 @@ require_once DOL_DOCUMENT_ROOT . '/core/lib/invoice.lib.php';
 $langs->load('bills');
 $langs->load('compta');
 $langs->load('admin');
+$langs->load('other');
 
 // Security check
 $id=(GETPOST('facid','int')?GETPOST('facid','int'):GETPOST('id','int'));
@@ -940,7 +941,7 @@ if ($action == 'create')
 		    '__INVOICE_YEAR__' =>  $langs->trans("PreviousYearOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date($object->date,'%Y').')',
 		    '__INVOICE_NEXT_YEAR__' => $langs->trans("NextYearOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date(dol_time_plus_duree($object->date, 1, 'y'),'%Y').')'
 		);
-		$substitutionarray['__(TRANSKEY)__']=$langs->trans("TransKey");
+		$substitutionarray['__(TransKey)__']=$langs->trans("TransKey");
 		
 		$htmltext = '<i>'.$langs->trans("FollowingConstantsWillBeSubstituted").':<br>';
 		foreach($substitutionarray as $key => $val)
@@ -1258,7 +1259,7 @@ else
 		    '__INVOICE_YEAR__' =>  $langs->trans("PreviousYearOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date($dateexample,'%Y').')',
 		    '__INVOICE_NEXT_YEAR__' => $langs->trans("NextYearOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date(dol_time_plus_duree($dateexample, 1, 'y'),'%Y').')'
 		);
-		$substitutionarray['__(TRANSKEY)__']=$langs->trans("TransKey");
+		$substitutionarray['__(TransKey)__']=$langs->trans("TransKey");
 		
 		$htmltext = '<i>'.$langs->trans("FollowingConstantsWillBeSubstituted").':<br>';
 		foreach($substitutionarray as $key => $val)
diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index 7572e0d2030..88260498f28 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -278,7 +278,7 @@ insert into llx_c_tva(fk_pays,taux,code,recuperableonly,localtax1,localtax1_type
 
 ALTER TABLE llx_events MODIFY COLUMN ip varchar(250);
 
-
+ALTER TABLE llx_facture ADD COLUMN fk_fac_rec_source integer;
 
 
 
diff --git a/htdocs/install/mysql/tables/llx_facture.sql b/htdocs/install/mysql/tables/llx_facture.sql
index aaf467a06b0..014572cd7e6 100644
--- a/htdocs/install/mysql/tables/llx_facture.sql
+++ b/htdocs/install/mysql/tables/llx_facture.sql
@@ -63,7 +63,8 @@ create table llx_facture
   fk_user_modif         integer,                                -- user making last change
   fk_user_valid			integer,								-- user validating
 
-  fk_facture_source		integer,								-- facture origine si facture avoir
+  fk_fac_rec_source		integer,								-- facture rec source
+  fk_facture_source		integer,								-- facture origin if credit notes or replacement invoice
   fk_projet				integer DEFAULT NULL,					-- projet auquel est associee la facture
 
   fk_account			integer,								-- bank account
diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang
index a37927566e3..11a09af3373 100644
--- a/htdocs/langs/en_US/other.lang
+++ b/htdocs/langs/en_US/other.lang
@@ -9,6 +9,18 @@ BirthdayDate=Birthday date
 DateToBirth=Date of birth
 BirthdayAlertOn=birthday alert active
 BirthdayAlertOff=birthday alert inactive
+TransKey=Translation of the key TransKey
+MonthOfInvoice=Month (number 1-12) of invoice date
+TextMonthOfInvoice=Month (tex) of invoice date
+PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
+TextPreviousMonthOfInvoice=Previous month (text) of invoice date
+NextMonthOfInvoice=Following month (number 1-12) of invoice date
+TextNextMonthOfInvoice=Following month (text) of invoice date
+
+YearOfInvoice=Year of invoice date
+PreviousYearOfInvoice=Previous year of invoice date
+NextYearOfInvoice=Following year of invoice date
+
 Notify_FICHINTER_ADD_CONTACT=Added contact to Intervention
 Notify_FICHINTER_VALIDATE=Intervention validated
 Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail

From ab444ce73049adaf09625d0ab33b5f657e51d243 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 16 May 2017 03:02:00 +0200
Subject: [PATCH 360/505] Prepare for module collab/pad

---
 build/rpm/dolibarr_fedora.spec   |   5 +-
 build/rpm/dolibarr_generic.spec  |  11 +-
 build/rpm/dolibarr_mandriva.spec |   4 +-
 build/rpm/dolibarr_opensuse.spec |   5 +-
 htdocs/collab/index.php          | 507 +++++++++++++++++++++++++++++++
 5 files changed, 521 insertions(+), 11 deletions(-)
 create mode 100644 htdocs/collab/index.php

diff --git a/build/rpm/dolibarr_fedora.spec b/build/rpm/dolibarr_fedora.spec
index fb818e285fb..a0f981b8c11 100755
--- a/build/rpm/dolibarr_fedora.spec
+++ b/build/rpm/dolibarr_fedora.spec
@@ -18,8 +18,8 @@ License: GPLv3+
 #Packager: Laurent Destailleur (Eldy) <eldy@users.sourceforge.net>
 Vendor: Dolibarr dev team
 
-URL: http://www.dolibarr.org
-Source0: http://www.dolibarr.org/files/lastbuild/package_rpm_redhat-fedora/%{name}-%{version}.tgz
+URL: https://www.dolibarr.org
+Source0: https://www.dolibarr.org/files/lastbuild/package_rpm_redhat-fedora/%{name}-%{version}.tgz
 Patch0: %{name}-forrpm.patch
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -165,6 +165,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/bookmarks
 %_datadir/dolibarr/htdocs/cashdesk
 %_datadir/dolibarr/htdocs/categories
+%_datadir/dolibarr/htdocs/collab
 %_datadir/dolibarr/htdocs/comm
 %_datadir/dolibarr/htdocs/commande
 %_datadir/dolibarr/htdocs/compta
diff --git a/build/rpm/dolibarr_generic.spec b/build/rpm/dolibarr_generic.spec
index 7b12a20eebb..446e0e0d5f7 100755
--- a/build/rpm/dolibarr_generic.spec
+++ b/build/rpm/dolibarr_generic.spec
@@ -26,17 +26,17 @@ License: GPL-3.0+
 #Packager: Laurent Destailleur (Eldy) <eldy@users.sourceforge.net>
 Vendor: Dolibarr dev team
 
-URL: http://www.dolibarr.org
+URL: https://www.dolibarr.org
 %if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version}
-Source0: http://www.dolibarr.org/files/lastbuild/package_rpm_redhat-fedora/%{name}-%{version}.tgz
+Source0: https://www.dolibarr.org/files/lastbuild/package_rpm_redhat-fedora/%{name}-%{version}.tgz
 %else
 %if 0%{?mdkversion}
-Source0: http://www.dolibarr.org/files/lastbuild/package_rpm_mandriva/%{name}-%{version}.tgz
+Source0: https://www.dolibarr.org/files/lastbuild/package_rpm_mandriva/%{name}-%{version}.tgz
 %else
 %if 0%{?suse_version}
-Source0: http://www.dolibarr.org/files/lastbuild/package_rpm_opensuse/%{name}-%{version}.tgz
+Source0: https://www.dolibarr.org/files/lastbuild/package_rpm_opensuse/%{name}-%{version}.tgz
 %else
-Source0: http://www.dolibarr.org/files/lastbuild/package_rpm_generic/%{name}-%{version}.tgz
+Source0: https://www.dolibarr.org/files/lastbuild/package_rpm_generic/%{name}-%{version}.tgz
 %endif
 %endif
 %endif
@@ -245,6 +245,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/bookmarks
 %_datadir/dolibarr/htdocs/cashdesk
 %_datadir/dolibarr/htdocs/categories
+%_datadir/dolibarr/htdocs/collab
 %_datadir/dolibarr/htdocs/comm
 %_datadir/dolibarr/htdocs/commande
 %_datadir/dolibarr/htdocs/compta
diff --git a/build/rpm/dolibarr_mandriva.spec b/build/rpm/dolibarr_mandriva.spec
index fd35227a242..1fb1b7fcc75 100755
--- a/build/rpm/dolibarr_mandriva.spec
+++ b/build/rpm/dolibarr_mandriva.spec
@@ -18,8 +18,8 @@ License: GPL-3.0+
 #Packager: Laurent Destailleur (Eldy) <eldy@users.sourceforge.net>
 Vendor: Dolibarr dev team
 
-URL: http://www.dolibarr.org
-Source0: http://www.dolibarr.org/files/lastbuild/package_rpm_mandriva/%{name}-%{version}.tgz
+URL: https://www.dolibarr.org
+Source0: https://www.dolibarr.org/files/lastbuild/package_rpm_mandriva/%{name}-%{version}.tgz
 Patch0: %{name}-forrpm.patch
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-build
diff --git a/build/rpm/dolibarr_opensuse.spec b/build/rpm/dolibarr_opensuse.spec
index 02a5f8a1819..1bb7ef061e6 100755
--- a/build/rpm/dolibarr_opensuse.spec
+++ b/build/rpm/dolibarr_opensuse.spec
@@ -18,8 +18,8 @@ License: GPL-3.0+
 #Packager: Laurent Destailleur (Eldy) <eldy@users.sourceforge.net>
 Vendor: Dolibarr dev team
 
-URL: http://www.dolibarr.org
-Source0: http://www.dolibarr.org/files/lastbuild/package_rpm_opensuse/%{name}-%{version}.tgz
+URL: https://www.dolibarr.org
+Source0: https://www.dolibarr.org/files/lastbuild/package_rpm_opensuse/%{name}-%{version}.tgz
 Patch0: %{name}-forrpm.patch
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -173,6 +173,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/bookmarks
 %_datadir/dolibarr/htdocs/cashdesk
 %_datadir/dolibarr/htdocs/categories
+%_datadir/dolibarr/htdocs/collab
 %_datadir/dolibarr/htdocs/comm
 %_datadir/dolibarr/htdocs/commande
 %_datadir/dolibarr/htdocs/compta
diff --git a/htdocs/collab/index.php b/htdocs/collab/index.php
new file mode 100644
index 00000000000..0c892c4e776
--- /dev/null
+++ b/htdocs/collab/index.php
@@ -0,0 +1,507 @@
+<?php
+/* Copyright (C) 2016-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *   	\file       htdocs/collab/index.php
+ *		\ingroup    collab
+ *		\brief      Page to work on a shared document (PAD)
+ */
+
+define('NOSCANPOSTFORINJECTION',1);
+define('NOSTYLECHECK',1);
+
+
+/**
+ *	Show HTML header HTML + BODY + Top menu + left menu + DIV
+ *
+ * @param 	string 	$head				Optionnal head lines
+ * @param 	string 	$title				HTML title
+ * @param	string	$help_url			Url links to help page
+ * 		                            	Syntax is: For a wiki page: EN:EnglishPage|FR:FrenchPage|ES:SpanishPage
+ *                                  	For other external page: http://server/url
+ * @param	string	$target				Target to use on links
+ * @param 	int    	$disablejs			More content into html header
+ * @param 	int    	$disablehead		More content into html header
+ * @param 	array  	$arrayofjs			Array of complementary js files
+ * @param 	array  	$arrayofcss			Array of complementary css files
+ * @param	string	$morequerystring	Query string to add to the link "print" to get same parameters (set this only if autodetect fails)
+ * @return	void
+ */
+function llxHeader($head='', $title='', $help_url='', $target='', $disablejs=0, $disablehead=0, $arrayofjs='', $arrayofcss='', $morequerystring='')
+{
+    global $conf;
+
+    // html header
+    top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);
+
+    print '<body id="mainbody">';
+    
+    // top menu and left menu area
+    if (empty($conf->dol_hide_topmenu))
+    {
+        top_menu($head, $title, $target, $disablejs, $disablehead, $arrayofjs, $arrayofcss, $morequerystring, $help_url);
+    }
+    if (empty($conf->dol_hide_leftmenu))
+    {
+        left_menu('', $help_url, '', '', 1, $title, 1);
+    }
+
+    // main area
+    //main_area($title);
+    print '<!-- Begin div class="fiche" -->'."\n".'<div class="fichebutwithotherclass">'."\n";
+}
+
+
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+$langs->load("admin");
+$langs->load("other");
+$langs->load("website");
+
+if (! $user->admin) accessforbidden();
+
+if (! ((GETPOST('testmenuhider') || ! empty($conf->global->MAIN_TESTMENUHIDER)) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)))
+{
+    $conf->dol_hide_leftmenu = 1;   // Force hide of left menu.
+}
+
+$error=0;
+$website=GETPOST('website', 'alpha');
+$page=GETPOST('page', 'alpha');
+$pageid=GETPOST('pageid', 'int');
+$action=GETPOST('action','alpha');
+
+if (GETPOST('delete')) { $action='delete'; }
+if (GETPOST('preview')) $action='preview';
+if (GETPOST('create')) { $action='create'; }
+if (GETPOST('editmedia')) { $action='editmedia'; }
+if (GETPOST('editcss')) { $action='editcss'; }
+if (GETPOST('editmenu')) { $action='editmenu'; }
+if (GETPOST('setashome')) { $action='setashome'; }
+if (GETPOST('editmeta')) { $action='editmeta'; }
+if (GETPOST('editcontent')) { $action='editcontent'; }
+
+if (empty($action)) $action='preview';
+
+
+
+
+/*
+ * Actions
+ */
+
+if (GETPOST('refreshsite')) $pageid=0;      // If we change the site, we reset the pageid.
+if (GETPOST('refreshpage')) $action='preview'; 
+
+
+// Add a collab page
+if ($action == 'add')
+{
+    $db->begin();
+
+    $objectpage->title = GETPOST('WEBSITE_TITLE');
+    $objectpage->pageurl = GETPOST('WEBSITE_PAGENAME');
+    $objectpage->description = GETPOST('WEBSITE_DESCRIPTION');
+    $objectpage->keywords = GETPOST('WEBSITE_KEYWORD');
+
+    if (empty($objectpage->title))
+    {
+        setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("WEBSITE_PAGENAME")), null, 'errors');
+        $error++;
+    }
+
+    if (! $error)
+    {
+        $res = $objectpage->create($user);
+        if ($res <= 0)
+        {
+            $error++;
+            setEventMessages($objectpage->error, $objectpage->errors, 'errors');
+        }
+    }
+	if (! $error)
+	{
+		$db->commit();
+	    setEventMessages($langs->trans("PageAdded", $objectpage->pageurl), null, 'mesgs');
+	    $action='';
+	}
+	else
+	{
+		$db->rollback();
+	}
+	
+	$action = 'preview';
+	$id = $objectpage->id;
+}
+
+// Update page
+if ($action == 'delete')
+{
+    $db->begin();
+
+    $res = $object->fetch(0, $website);
+
+    $res = $objectpage->fetch($pageid, $object->fk_website);
+
+    if ($res > 0)
+    {
+        $res = $objectpage->delete($user);
+        if (! $res > 0)
+        {
+            $error++;
+            setEventMessages($objectpage->error, $objectpage->errors, 'errors');
+        }
+
+        if (! $error)
+        {
+            $db->commit();
+            setEventMessages($langs->trans("PageDeleted", $objectpage->pageurl, $website), null, 'mesgs');
+            
+            header("Location: ".$_SERVER["PHP_SELF"].'?website='.$website);
+            exit;
+        }
+        else
+        {
+            $db->rollback();
+        }
+    }
+    else
+    {
+        dol_print_error($db);
+    }
+}
+
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+
+$help_url='';
+
+llxHeader('', $langs->trans("WebsiteSetup"), $help_url);
+
+print "\n".'<form action="'.$_SERVER["PHP_SELF"].'" method="POST"><div>';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+if ($action == 'create')
+{
+    print '<input type="hidden" name="action" value="add">';
+}
+
+
+// Add a margin under toolbar ?
+$style='';
+if ($action != 'preview' && $action != 'editcontent') $style=' margin-bottom: 5px;';
+
+//var_dump($objectpage);exit;
+print '<div class="centpercent websitebar">';
+
+if (count($object->records) > 0)
+{
+    // ***** Part for web sites
+    
+    print '<div class="websiteselection hideonsmartphoneimp">';
+    print $langs->trans("Website").': ';
+    print '</div>';
+
+    // List of websites
+    print '<div class="websiteselection">';
+    $out='';
+    $out.='<select name="website" class="minwidth100" id="website">';
+    if (empty($object->records)) $out.='<option value="-1">&nbsp;</option>';
+    // Loop on each sites
+    $i=0;
+    foreach($object->records as $key => $valwebsite)
+    {
+        if (empty($website)) $website=$valwebsite->ref;
+
+        $out.='<option value="'.$valwebsite->ref.'"';
+        if ($website == $valwebsite->ref) $out.=' selected';		// To preselect a value
+        $out.='>';
+        $out.=$valwebsite->ref;
+        $out.='</option>';
+        $i++;
+    }
+    $out.='</select>';
+    $out.=ajax_combobox('website');
+    print $out;
+    print '<input type="submit" class="button" name="refreshsite" value="'.$langs->trans("Load").'">';
+
+    if ($website)
+    {
+        $virtualurl='';
+        $dataroot=DOL_DATA_ROOT.'/websites/'.$website;
+        if (! empty($object->virtualhost)) $virtualurl=$object->virtualhost;
+    }
+    
+    if ($website && $action == 'preview')
+    {
+        $disabled='';
+        if (empty($user->rights->websites->write)) $disabled=' disabled="disabled"';
+    
+        print ' &nbsp; ';
+        
+        //print '<input type="submit" class="button"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("MediaFiles")).'" name="editmedia">';
+        print '<input type="submit" class="button"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("EditCss")).'" name="editcss">';
+        print '<input type="submit" class="button"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("EditMenu")).'" name="editmenu">';
+        print '<input type="submit"'.$disabled.' class="button" value="'.dol_escape_htmltag($langs->trans("AddPage")).'" name="create">';
+    }
+    
+    print '</div>';
+
+    // Button for websites
+    print '<div class="websitetools">';
+
+    if ($action == 'preview')
+    {
+        print '<div class="websiteinputurl">';
+        print '<input type="text" id="previewsiteurl" class="minwidth200imp" name="previewsite" placeholder="'.$langs->trans("http://myvirtualhost").'" value="'.$virtualurl.'">';
+        //print '<input type="submit" class="button" name="previewwebsite" target="tab'.$website.'" value="'.$langs->trans("ViewSiteInNewTab").'">';
+        $htmltext=$langs->trans("SetHereVirtualHost", $dataroot);
+        print $form->textwithpicto('', $htmltext);
+        print '</div>';
+        
+        $urlext=$virtualurl;
+        $urlint=$urlwithroot.'/public/websites/index.php?website='.$website;
+        //if (! empty($object->virtualhost))
+        //{
+            print '<a class="websitebuttonsitepreview" id="previewsiteext" href="'.$urlext.'" target="tab'.$website.'" alt="'.dol_escape_htmltag($langs->trans("PreviewSiteServedByWebServer", $langs->transnoentitiesnoconv("Site"), $langs->transnoentitiesnoconv("Site"), $dataroot, $urlext)).'">';
+            print $form->textwithpicto('', $langs->trans("PreviewSiteServedByWebServer", $langs->transnoentitiesnoconv("Site"), $langs->transnoentitiesnoconv("Site"), $dataroot, $urlext?$urlext:$langs->trans("VirtualHostUrlNotDefined")), 1, 'preview_ext');
+            print '</a>';
+        //}
+        
+        print '<a class="websitebuttonsitepreview" id="previewsite" href="'.$urlwithroot.'/public/websites/index.php?website='.$website.'" target="tab'.$website.'" alt="'.dol_escape_htmltag($langs->trans("PreviewSiteServedByDolibarr", $langs->transnoentitiesnoconv("Site"), $langs->transnoentitiesnoconv("Site"), $urlint)).'">';
+        print $form->textwithpicto('', $langs->trans("PreviewSiteServedByDolibarr", $langs->transnoentitiesnoconv("Site"), $langs->transnoentitiesnoconv("Site"), $urlint, $dataroot), 1, 'preview');
+        print '</a>';
+    }
+
+    if (in_array($action, array('editcss','editmenu','create')))
+    {
+        if ($action != 'preview') print '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Cancel")).'" name="preview">';
+        if (preg_match('/^create/',$action)) print '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Save")).'" name="update">';
+        if (preg_match('/^edit/',$action)) print '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Save")).'" name="update">';
+    }
+    
+    print '</div>';
+
+
+    // ***** Part for pages
+    
+    if ($website)
+    {
+        print '</div>';
+
+        $array=$objectpage->fetchAll($object->id);
+        if (! is_array($array) && $array < 0) dol_print_error('', $objectpage->error, $objectpage->errors);
+        $atleastonepage=(is_array($array) && count($array) > 0);
+        
+        print '<div class="centpercent websitebar"'.($style?' style="'.$style.'"':'').'">';
+        print '<div class="websiteselection hideonsmartphoneimp">';
+        print $langs->trans("Page").': ';
+        print '</div>';
+        print '<div class="websiteselection">';
+        
+        if ($action != 'add')
+        {
+            $out='';
+            $out.='<select name="pageid" id="pageid" class="minwidth200">';
+            if ($atleastonepage)
+            {
+                if (empty($pageid) && $action != 'create')      // Page id is not defined, we try to take one
+                {
+                    $firstpageid=0;$homepageid=0;
+                    foreach($array as $key => $valpage)
+                    {
+                        if (empty($firstpageid)) $firstpageid=$valpage->id;
+                        if ($object->fk_default_home && $key == $object->fk_default_home) $homepageid=$valpage->id;
+                    }
+                    $pageid=$homepageid?$homepageid:$firstpageid;   // We choose home page and if not defined yet, we take first page
+                }
+    
+                foreach($array as $key => $valpage)
+                {
+                    $out.='<option value="'.$key.'"';
+                    if ($pageid > 0 && $pageid == $key) $out.=' selected';		// To preselect a value
+                    $out.='>';
+                    $out.=$valpage->title;
+                    if ($object->fk_default_home && $key == $object->fk_default_home) $out.=' ('.$langs->trans("HomePage").')';
+                    $out.='</option>';
+                }
+            }
+            else $out.='<option value="-1">&nbsp;</option>';
+            $out.='</select>';
+            $out.=ajax_combobox('pageid');
+            print $out;
+        }
+        else
+        {
+            print $langs->trans("New");
+        }
+
+        print '<input type="submit" class="button" name="refreshpage" value="'.$langs->trans("Load").'"'.($atleastonepage?'':' disabled="disabled"').'>';
+        //print $form->selectarray('page', $array);
+        
+        if ($action == 'preview')
+        {
+            $disabled='';
+            if (empty($user->rights->websites->write)) $disabled=' disabled="disabled"';
+        
+            if ($pageid > 0)
+            {
+                print ' &nbsp; ';
+                
+                if ($object->fk_default_home > 0 && $pageid == $object->fk_default_home) print '<input type="submit" class="button" disabled="disabled" value="'.dol_escape_htmltag($langs->trans("SetAsHomePage")).'" name="setashome">';
+                else print '<input type="submit" class="button"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("SetAsHomePage")).'" name="setashome">';
+                print '<input type="submit" class="button"'.$disabled.'  value="'.dol_escape_htmltag($langs->trans("EditPageMeta")).'" name="editmeta">';
+                print '<input type="submit" class="button"'.$disabled.'  value="'.dol_escape_htmltag($langs->trans("EditPageContent")).'" name="editcontent">';
+                //print '<a href="'.$_SERVER["PHP_SELF"].'?action=editmeta&website='.urlencode($website).'&pageid='.urlencode($pageid).'" class="button">'.dol_escape_htmltag($langs->trans("EditPageMeta")).'</a>';
+                //print '<a href="'.$_SERVER["PHP_SELF"].'?action=editcontent&website='.urlencode($website).'&pageid='.urlencode($pageid).'" class="button">'.dol_escape_htmltag($langs->trans("EditPageContent")).'</a>';
+                print '<input type="submit" class="buttonDelete" name="delete" value="'.$langs->trans("Delete").'"'.($atleastonepage?'':' disabled="disabled"').'>';
+            }
+        }
+        
+        print '</div>';
+        print '<div class="websiteselection">';
+        print '</div>';
+
+        print '<div class="websitetools">';
+
+        if ($website && $pageid > 0 && $action == 'preview')
+        {
+            $websitepage = new WebSitePage($db);
+            $websitepage->fetch($pageid);
+            
+            $realpage=$urlwithroot.'/public/websites/index.php?website='.$website.'&page='.$pageid;
+            $pagealias = $websitepage->pageurl;
+            
+            print '<div class="websiteinputurl">';
+            print '<input type="text" id="previewpageurl" class="minwidth200imp" name="previewsite" value="'.$pagealias.'" disabled="disabled">';
+            //print '<input type="submit" class="button" name="previewwebsite" target="tab'.$website.'" value="'.$langs->trans("ViewSiteInNewTab").'">';
+            $htmltext=$langs->trans("WEBSITE_PAGENAME", $pagealias);
+            print $form->textwithpicto('', $htmltext);
+            print '</div>';
+            
+            if (! empty($object->virtualhost))
+            {
+                $urlext=$virtualurl.'/'.$pagealias.'.php';
+                print '<a class="websitebuttonsitepreview" id="previewpageext" href="'.$urlext.'" target="tab'.$website.'" alt="'.dol_escape_htmltag($langs->trans("PreviewSiteServedByWebServer", $langs->transnoentitiesnoconv("Page"), $langs->transnoentitiesnoconv("Page"), $dataroot, $urlext)).'">';
+                print $form->textwithpicto('', $langs->trans("PreviewSiteServedByWebServer", $langs->transnoentitiesnoconv("Page"), $langs->transnoentitiesnoconv("Page"), $dataroot, $urlext?$urlext:$langs->trans("VirtualHostUrlNotDefined")), 1, 'preview_ext');
+                print '</a>';
+            }
+            else
+            {
+                print '<a class="websitebuttonsitepreview" id="previewpageextnoclick" href="#">';
+                print $form->textwithpicto('', $langs->trans("PreviewSiteServedByWebServer", $langs->transnoentitiesnoconv("Page"), $langs->transnoentitiesnoconv("Page"), $dataroot, $urlext?$urlext:$langs->trans("VirtualHostUrlNotDefined")), 1, 'preview_ext');
+                print '</a>';
+            }
+            
+            print '<a class="websitebuttonsitepreview" id="previewpage" href="'.$realpage.'&nocache='.dol_now().'" class="button" target="tab'.$website.'" alt="'.dol_escape_htmltag($langs->trans("PreviewSiteServedByDolibarr", $langs->transnoentitiesnoconv("Page"), $langs->transnoentitiesnoconv("Page"), $realpage)).'">';
+            print $form->textwithpicto('', $langs->trans("PreviewSiteServedByDolibarr", $langs->transnoentitiesnoconv("Page"), $langs->transnoentitiesnoconv("Page"), $realpage, $dataroot), 1, 'preview'); 
+            print '</a>';       // View page in new Tab
+            //print '<input type="submit" class="button" name="previewpage" target="tab'.$website.'"value="'.$langs->trans("ViewPageInNewTab").'">';
+            
+            // TODO Add js to save alias like we save virtual host name and use dynamic virtual host for url of id=previewpageext
+        }
+        if (! in_array($action, array('editcss','editmenu','create')))
+        {
+            if ($action != 'preview') print '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Cancel")).'" name="preview">';
+            if (preg_match('/^create/',$action)) print '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Save")).'" name="update">';
+            if (preg_match('/^edit/',$action)) print '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Save")).'" name="update">';
+        }
+        
+        print '</div>';
+
+        if ($action == 'preview')
+        {
+            // Adding jquery code to change on the fly url of preview ext
+            if (! empty($conf->use_javascript_ajax))
+            {
+                print '<script type="text/javascript" language="javascript">
+                    jQuery(document).ready(function() {
+                    	jQuery("#previewsiteext,#previewpageext").click(function() {
+                            newurl=jQuery("#previewsiteurl").val();
+                            newpage=jQuery("#previewsiteurl").val() + "/" + jQuery("#previewpageurl").val() + ".php";
+                            console.log("Open url "+newurl);
+                            /* Save url */
+                            jQuery.ajax({
+                                method: "POST",
+                                url: "'.DOL_URL_ROOT.'/core/ajax/saveinplace.php",
+                                data: {
+                                    field: \'editval_virtualhost\',
+                                    element: \'websites\',
+                                    table_element: \'website\',
+                                    fk_element: '.$object->id.',
+                                    value: newurl,
+                                },
+                                context: document.body
+                            });
+                    
+                            jQuery("#previewsiteext").attr("href",newurl);
+                            jQuery("#previewpageext").attr("href",newpage);
+                        });
+                    });
+                    </script>';
+            }
+        }
+    }
+}
+else
+{
+    print '<div class="websiteselection">';
+    $langs->load("errors");
+    print $langs->trans("ErrorModuleSetupNotComplete");
+    print '<div>';
+    $action='';
+}
+
+
+print '</div>';
+
+$head = array();
+
+if ($action == 'editcontent')
+{
+    /*
+     * Editing global variables not related to a specific theme
+     */
+    
+    $csscontent = @file_get_contents($filecss);
+    
+    $contentforedit = '';
+    /*$contentforedit.='<style scoped>'."\n";        // "scoped" means "apply to parent element only". Not yet supported by browsers
+    $contentforedit.=$csscontent;
+    $contentforedit.='</style>'."\n";*/
+    $contentforedit .= $objectpage->content;
+    
+    require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+    $doleditor=new DolEditor('PAGE_CONTENT',$contentforedit,'',500,'Full','',true,true,true,ROWS_5,'90%');
+    $doleditor->Create(0, '', false);
+}
+
+print "</div>\n</form>\n";
+
+
+
+
+llxFooter();
+
+$db->close();

From cc95e046e52ae44e35ff6e64e38e56351fe6191f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 16 May 2017 03:34:49 +0200
Subject: [PATCH 361/505] NEW Can sort customer balance summary on date

---
 htdocs/compta/recap-compta.php | 50 ++++++++++++++++++++++++++--------
 1 file changed, 38 insertions(+), 12 deletions(-)

diff --git a/htdocs/compta/recap-compta.php b/htdocs/compta/recap-compta.php
index 2a1234fccc1..a383f841a47 100644
--- a/htdocs/compta/recap-compta.php
+++ b/htdocs/compta/recap-compta.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2001-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2017 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
@@ -39,6 +39,30 @@ $result = restrictedArea($user, 'societe', $id, '&societe');
 $object = new Societe($db);
 if ($id > 0) $object->fetch($id);
 
+// Load variable for pagination
+$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$sortfield = GETPOST('sortfield','alpha');
+$sortorder = GETPOST('sortorder','alpha');
+$page = GETPOST('page','int');
+if ($page == -1) { $page = 0; }
+$offset = $limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+if (! $sortfield) $sortfield="f.datef"; // Set here default search field
+if (! $sortorder) $sortorder="DESC";
+
+
+$arrayfields=array(
+    'f.datef'=>array('label'=>"Date", 'checked'=>1),
+    //...    
+);
+
+/*
+ * Actions
+ */
+
+// None
+
 
 /*
  *	View
@@ -55,10 +79,10 @@ llxHeader('',$title,$help_url);
 
 if ($id > 0)
 {
-	/*
-	 * Affichage onglets
-	 */
-	$head = societe_prepare_head($object);
+    $param='';
+    if ($id > 0) $param.='&socid='.$id;
+
+    $head = societe_prepare_head($object);
 
 	dol_fiche_head($head, 'customer', $langs->trans("ThirdParty"), 0, 'company');
 	dol_banner_tab($object, 'socid', '', ($user->societe_id?0:1), 'rowid', 'nom', '', '', 0, '', '', 1);
@@ -71,7 +95,7 @@ if ($id > 0)
 
 		print '<table class="noborder" width="100%">';
 		print '<tr class="liste_titre">';
-		print '<td width="100" align="center">'.$langs->trans("Date").'</td>';
+        if (! empty($arrayfields['f.datef']['checked']))  print_liste_field_titre($arrayfields['f.datef']['label'],$_SERVER["PHP_SELF"],"f.datef","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
 		print '<td>'.$langs->trans("Element").'</td>';
 		print '<td>'.$langs->trans("Status").'</td>';
 		print '<td align="right">'.$langs->trans("Debit").'</td>';
@@ -90,7 +114,7 @@ if ($id > 0)
 		$sql.= " WHERE f.fk_soc = s.rowid AND s.rowid = ".$object->id;
 		$sql.= " AND f.entity = ".$conf->entity;
 		$sql.= " AND f.fk_user_valid = u.rowid";
-		$sql.= " ORDER BY f.datef ASC";
+		$sql.= $db->order($sortfield, $sortorder);
 
 		$resql=$db->query($sql);
 		if ($resql)
@@ -177,13 +201,13 @@ if ($id > 0)
 		}
 		
 		if(empty($TData)) {
-			print '<tr '.$bc[false].'><td colspan="7">'.$langs->trans("NoInvoice").'</td></tr>';
+			print '<tr class="oddeven"><td colspan="7">'.$langs->trans("NoInvoice").'</td></tr>';
 		} else {
-		
+			
 			// Sort array by date
 			asort($TDataSort);
 			array_multisort($TData,$TDataSort);
-			
+
 			// Balance calculation
 			foreach($TData as &$data1) {
 				$balance += $data1['amount'];
@@ -191,7 +215,8 @@ if ($id > 0)
 			}
 			
 			// Reverse array to have last elements on top
-			$TData = array_reverse($TData);
+			$TData = dol_sort_array($TData, 'date', $sortorder);
+				
 			
 			$totalDebit = 0;
 			$totalCredit = 0;
@@ -223,7 +248,8 @@ if ($id > 0)
 			print '<td colspan="3">&nbsp;</td>';
 			print '<td align="right">'.price($totalDebit).'</td>';
 			print '<td align="right">'.price($totalCredit).'</td>';
-			print '<td colspan="2">&nbsp;</td>';
+			print '<td align="right">'.price(price2num($totalDebit - $totalCredit, 'MT')).'</td>';
+			print '<td></td>';
 			print "</tr>\n";
 		}
 		

From c9738aa7ea0fa41af59963cc27144bdec4f1c866 Mon Sep 17 00:00:00 2001
From: arnaud <arnaud.saint-patrice@atm-consulting.fr>
Date: Tue, 16 May 2017 11:34:00 +0200
Subject: [PATCH 362/505] FIX doactions hook missing in invoice model page

---
 htdocs/compta/facture/fiche-rec.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php
index 289ac8d704a..a6b238ba3c7 100644
--- a/htdocs/compta/facture/fiche-rec.php
+++ b/htdocs/compta/facture/fiche-rec.php
@@ -124,6 +124,10 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
  * Actions
  */
 
+$parameters = array('socid' => $socid);
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
 // Set note
 include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php';	// Must be include, not include_once
 

From cc16bb0befc906751b4dc29d22ac0497d17c20b4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 16 May 2017 12:22:55 +0200
Subject: [PATCH 363/505] Debug default value feature.

---
 htdocs/admin/defaultvalues.php    |  6 +++
 htdocs/core/lib/functions.lib.php | 74 +++++++++++++++----------------
 htdocs/projet/card.php            | 12 ++---
 3 files changed, 48 insertions(+), 44 deletions(-)

diff --git a/htdocs/admin/defaultvalues.php b/htdocs/admin/defaultvalues.php
index 013be811b5b..7ebc67472d1 100644
--- a/htdocs/admin/defaultvalues.php
+++ b/htdocs/admin/defaultvalues.php
@@ -271,6 +271,12 @@ if ($mode != 'focus')
         $texthelp.='__DAY__<br>';
         $texthelp.='__MONTH__<br>';
         $texthelp.='__YEAR__<br>';
+        $texthelp.='__PREVIOUS_DAY__<br>';
+        $texthelp.='__PREVIOUS_MONTH__<br>';
+        $texthelp.='__PREVIOUS_YEAR__<br>';
+        $texthelp.='__NEXT_DAY__<br>';
+        $texthelp.='__NEXT_MONTH__<br>';
+        $texthelp.='__NEXT_YEAR__<br>';
         if (! empty($conf->multicompany->enabled)) $texthelp.='__ENTITYID__<br>';
         $textvalue=$form->textwithpicto($langs->trans("Value"), $texthelp, 1, 'help', '', 0, 2, '');
     }
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index d2638898a33..63990112be5 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -240,7 +240,7 @@ function dol_shutdown()
  *  Return value of a param into GET or POST supervariable
  *
  *  @param	string	$paramname   Name of parameter to found
- *  @param	string	$check	     Type of check (''=no check,  'int'=check it's numeric, 'alpha'=check it's text and sign, 'aZ'=check it's a-z only, 'array'=check it's array, 'san_alpha'=Use filter_var with FILTER_SANITIZE_STRING (do not use this for free text string), 'day', 'month', 'year', 'custom'= custom filter specify $filter and $options)
+ *  @param	string	$check	     Type of check (''=no check, 'none'=no check, 'int'=check it's numeric, 'alpha'=check it's text and sign, 'aZ'=check it's a-z only, 'array'=check it's array, 'san_alpha'=Use filter_var with FILTER_SANITIZE_STRING (do not use this for free text string), 'day', 'month', 'year', 'custom'= custom filter specify $filter and $options)
  *  @param	int		$method	     Type of method (0 = get then post, 1 = only get, 2 = only post, 3 = post then get, 4 = post then get then cookie)
  *  @param  int     $filter      Filter to apply when $check is set to 'custom'. (See http://php.net/manual/en/filter.filters.php for détails)
  *  @param  mixed   $options     Options to pass to filter_var when $check is set to 'custom'.
@@ -249,6 +249,8 @@ function dol_shutdown()
  */
 function GETPOST($paramname, $check='', $method=0, $filter=NULL, $options=NULL)
 {
+    global $mysoc,$user,$conf;
+    
     if (empty($method)) $out = isset($_GET[$paramname])?$_GET[$paramname]:(isset($_POST[$paramname])?$_POST[$paramname]:'');
 	elseif ($method==1) $out = isset($_GET[$paramname])?$_GET[$paramname]:'';
 	elseif ($method==2) $out = isset($_POST[$paramname])?$_POST[$paramname]:'';
@@ -258,8 +260,6 @@ function GETPOST($paramname, $check='', $method=0, $filter=NULL, $options=NULL)
 	
 	if (empty($method) || $method == 3 || $method == 4)
 	{
-	    global $conf;
-	    
 	    // Management of default values
 	    if (! isset($_GET['sortfield']) && ! empty($conf->global->MAIN_ENABLE_DEFAULT_VALUES))	// If we did a click on a field to sort, we do no apply default values. Same if option MAIN_DISABLE_DEFAULT_VALUES is on
 	    {
@@ -320,43 +320,41 @@ function GETPOST($paramname, $check='', $method=0, $filter=NULL, $options=NULL)
 	if (! empty($check))
 	{
 	    // Replace vars like __DAY__, __MONTH__, __YEAR__, __MYCOUNTRYID__, __USERID__, __ENTITYID__
-	    // TODO Add more var like __PREVIOUSDAY__, __PREVIOUSMONTH__, __PREVIOUSYEAR__
-	    if (! is_array($out) && preg_match('/^__([a-z0-9]+)__$/i', $out, $reg))
+	    if (! is_array($out))
 	    {
-	        if ($reg[1] == 'DAY')
+	        $maxloop=20; $loopnb=0;    // Protection against infinite loop
+	        while (preg_match('/__([A-Z0-9]+_?[A-Z0-9]+)__/i', $out, $reg) && ($loopnb < $maxloop))    // Detect '__ABCDEF__' as key 'ABCDEF' and '__ABC_DEF__' as key 'ABC_DEF'
 	        {
-    	        $tmp=dol_getdate(dol_now(), true);
-    	        $out = $tmp['mday'];
-	        }
-	        elseif ($reg[1] == 'MONTH')
-	        {
-    	        $tmp=dol_getdate(dol_now(), true);
-    	        $out = $tmp['mon'];
-	        }
-	        elseif ($reg[1] == 'YEAR')
-	        {
-	            $tmp=dol_getdate(dol_now(), true);
-	            $out = $tmp['year'];
-	        }
-	        elseif ($reg[1] == 'MYCOUNTRYID')
-	        {
-	            global $mysoc;
-	            $out = $mysoc->country_id;
-	        }
-	        elseif ($reg[1] == 'USERID')
-	        {
-	            global $user;
-	            $out = $user->id;
-	        }
-	    	elseif ($reg[1] == 'SUPERVISORID')
-	        {
-	            global $user;
-	            $out = $user->fk_user;
-	        }
-	        elseif ($reg[1] == 'ENTITYID')
-	        {
-	            global $conf;
-	            $out = $conf->entity;
+	            $loopnb++; $newout = '';
+
+    	        if ($reg[1] == 'DAY')       { $tmp=dol_getdate(dol_now(), true); $newout = $tmp['mday']; }
+    	        elseif ($reg[1] == 'MONTH') { $tmp=dol_getdate(dol_now(), true); $newout = $tmp['mon'];  }
+    	        elseif ($reg[1] == 'YEAR')  { $tmp=dol_getdate(dol_now(), true); $newout = $tmp['year']; }
+    	    	elseif ($reg[1] == 'PREVIOUS_DAY')   { $tmp=dol_getdate(dol_now(), true); $tmp2=dol_get_prev_day($tmp['mday'], $tmp['mon'], $tmp['year']); $newout = $tmp2['day']; }
+    	        elseif ($reg[1] == 'PREVIOUS_MONTH') { $tmp=dol_getdate(dol_now(), true); $tmp2=dol_get_prev_month($tmp['mday'], $tmp['mon'], $tmp['year']); $newout = $tmp2['month']; }
+    	        elseif ($reg[1] == 'PREVIOUS_YEAR')  { $tmp=dol_getdate(dol_now(), true); $newout = ($tmp['year'] - 1); }
+    	    	elseif ($reg[1] == 'NEXT_DAY')   { $tmp=dol_getdate(dol_now(), true); $tmp2=dol_get_next_day($tmp['mday'], $tmp['mon'], $tmp['year']); $newout = $tmp2['day']; }
+    	        elseif ($reg[1] == 'NEXT_MONTH') { $tmp=dol_getdate(dol_now(), true); $tmp2=dol_get_next_month($tmp['mday'], $tmp['mon'], $tmp['year']); $newout = $tmp2['month']; }
+    	        elseif ($reg[1] == 'NEXT_YEAR')  { $tmp=dol_getdate(dol_now(), true); $newout = ($tmp['year'] + 1); }
+    	        elseif ($reg[1] == 'MYCOUNTRYID')
+    	        {
+    	            $newout = $mysoc->country_id;
+    	        }
+    	        elseif ($reg[1] == 'USERID')
+    	        {
+    	            $newout = $user->id;
+    	        }
+    	    	elseif ($reg[1] == 'SUPERVISORID')
+    	        {
+    	            $newout = $user->fk_user;
+    	        }
+    	        elseif ($reg[1] == 'ENTITYID')
+    	        {
+    	            $newout = $conf->entity;
+    	        }
+    	        else $newout = '';     // Key not found, we replace with empty string
+    	        //var_dump('__'.$reg[1].'__ -> '.$newout);
+    	        $out = preg_replace('/__'.preg_quote($reg[1],'/').'__/', $newout, $out);
 	        }
 	    }
 
diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index 791cd6855f0..1ee81f7b917 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -142,9 +142,9 @@ if (empty($reshook))
 	        $db->begin();
 
 	        $object->ref             = GETPOST('ref','alpha');
-	        $object->title           = GETPOST('title'); // Do not use 'alpha' here, we want field as it is
+	        $object->title           = GETPOST('title','none'); // Do not use 'alpha' here, we want field as it is
 	        $object->socid           = GETPOST('socid','int');
-	        $object->description     = GETPOST('description'); // Do not use 'alpha' here, we want field as it is
+	        $object->description     = GETPOST('description','none'); // Do not use 'alpha' here, we want field as it is
 	        $object->public          = GETPOST('public','alpha');
 	        $object->opp_amount      = price2num(GETPOST('opp_amount'));
 	        $object->budget_amount   = price2num(GETPOST('budget_amount'));
@@ -243,9 +243,9 @@ if (empty($reshook))
 			$old_start_date = $object->date_start;
 
 	        $object->ref          = GETPOST('ref','alpha');
-	        $object->title        = GETPOST('title'); // Do not use 'alpha' here, we want field as it is
+	        $object->title        = GETPOST('title','none'); // Do not use 'alpha' here, we want field as it is
 	        $object->socid        = GETPOST('socid','int');
-	        $object->description  = GETPOST('description');	// Do not use 'alpha' here, we want field as it is
+	        $object->description  = GETPOST('description','none');	// Do not use 'alpha' here, we want field as it is
 	        $object->public       = GETPOST('public','alpha');
 	        $object->date_start   = empty($_POST["projectstart"])?'':$date_start;
 	        $object->date_end     = empty($_POST["projectend"])?'':$date_end;
@@ -509,7 +509,7 @@ if ($action == 'create' && $user->rights->projet->creer)
     print '</td></tr>';
 
     // Label
-    print '<tr><td><span class="fieldrequired">'.$langs->trans("Label").'</span></td><td><input size="80" type="text" name="title" value="'.GETPOST("title").'"></td></tr>';
+    print '<tr><td><span class="fieldrequired">'.$langs->trans("Label").'</span></td><td><input size="80" type="text" name="title" value="'.GETPOST("title",'none').'"></td></tr>';
 
     // Thirdparty
     if ($conf->societe->enabled)
@@ -588,7 +588,7 @@ if ($action == 'create' && $user->rights->projet->creer)
     // Description
     print '<tr><td class="tdtop">'.$langs->trans("Description").'</td>';
     print '<td>';
-    print '<textarea name="description" wrap="soft" class="centpercent" rows="'.ROWS_3.'">'.GETPOST("description").'</textarea>';
+    print '<textarea name="description" wrap="soft" class="centpercent" rows="'.ROWS_3.'">'.dol_escape_htmltag(GETPOST("description",'none')).'</textarea>';
     print '</td></tr>';
 
     if ($conf->categorie->enabled) {

From 99cc67d12312d0a7952883d053443eecd5a8a56a Mon Sep 17 00:00:00 2001
From: philippe grand <philippe.grand@atoo-net.com>
Date: Tue, 16 May 2017 12:43:16 +0200
Subject: [PATCH 364/505] Update code using new css class

---
 htdocs/compta/resultat/clientfourn.php | 67 ++++++++------------------
 1 file changed, 21 insertions(+), 46 deletions(-)

diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php
index 5c77bbba21d..1b5a232b812 100644
--- a/htdocs/compta/resultat/clientfourn.php
+++ b/htdocs/compta/resultat/clientfourn.php
@@ -231,13 +231,11 @@ $result = $db->query($sql);
 if ($result) {
     $num = $db->num_rows($result);
     $i = 0;
-    $var=true;
     while ($i < $num)
     {
         $objp = $db->fetch_object($result);
         
-
-        print "<tr ".$bc[$var]."><td>&nbsp;</td>";
+        print '<tr class="oddeven"><td>&nbsp;</td>';
         print "<td>".$langs->trans("Bills").' <a href="'.DOL_URL_ROOT.'/compta/facture/list.php?socid='.$objp->socid.'">'.$objp->name."</td>\n";
 
         if ($modecompta == 'CREANCES-DETTES')
@@ -282,7 +280,7 @@ if ($modecompta != 'CREANCES-DETTES')
                 $objp = $db->fetch_object($result);
                 
 
-                print "<tr ".$bc[$var]."><td>&nbsp;</td>";
+                print '<tr class="oddeven"><td>&nbsp;</td>';
                 print "<td>".$langs->trans("Bills")." ".$langs->trans("Other")." (".$langs->trans("PaymentsNotLinkedToInvoice").")\n";
 
                 if ($modecompta == 'CREANCES-DETTES')
@@ -303,9 +301,8 @@ if ($modecompta != 'CREANCES-DETTES')
 }
 
 if ($total_ttc == 0)
-{
-    
-    print "<tr ".$bc[$var]."><td>&nbsp;</td>";
+{    
+    print '<tr class="oddeven"><td>&nbsp;</td>';
     print '<td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td>';
     print '</tr>';
 }
@@ -361,15 +358,13 @@ $result = $db->query($sql);
 if ($result) {
     $num = $db->num_rows($result);
     $i = 0;
-    $var=true;
     if ($num > 0)
     {
         while ($i < $num)
         {
             $objp = $db->fetch_object($result);
             
-
-            print "<tr ".$bc[$var]."><td>&nbsp;</td>";
+            print '<tr class="oddeven"><td>&nbsp;</td>';
             print "<td>".$langs->trans("Bills")." <a href=\"".DOL_URL_ROOT."/fourn/facture/list.php?socid=".$objp->socid."\">".$objp->name."</a></td>\n";
 
             if ($modecompta == 'CREANCES-DETTES')
@@ -386,9 +381,8 @@ if ($result) {
         }
     }
     else
-    {
-        
-        print "<tr ".$bc[$var]."><td>&nbsp;</td>";
+    {        
+        print '<tr class="oddeven"><td>&nbsp;</td>';
         print '<td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td>';
         print '</tr>';
     }
@@ -447,7 +441,6 @@ $subtotal_ht = 0;
 $subtotal_ttc = 0;
 if ($result) {
     $num = $db->num_rows($result);
-    $var=true;
     $i = 0;
     if ($num) {
         while ($i < $num) {
@@ -458,8 +451,7 @@ if ($result) {
             $subtotal_ht += $obj->amount;
             $subtotal_ttc += $obj->amount;
 
-            $var = !$var;
-            print "<tr ".$bc[$var]."><td>&nbsp;</td>";
+            print '<tr class="oddeven"><td>&nbsp;</td>';
             print '<td>'.$obj->label.'</td>';
             if ($modecompta == 'CREANCES-DETTES') print '<td align="right">'.price(-$obj->amount).'</td>';
             print '<td align="right">'.price(-$obj->amount).'</td>';
@@ -468,8 +460,7 @@ if ($result) {
         }
     }
     else {
-        $var = !$var;
-        print "<tr ".$bc[$var]."><td>&nbsp;</td>";
+        print '<tr class="oddeven"><td>&nbsp;</td>';
         print '<td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td>';
         print '</tr>';
     }
@@ -526,7 +517,6 @@ $subtotal_ht = 0;
 $subtotal_ttc = 0;
 if ($result) {
     $num = $db->num_rows($result);
-    $var=true;
     $i = 0;
     if ($num) {
         while ($i < $num) {
@@ -537,8 +527,7 @@ if ($result) {
             $subtotal_ht += $obj->amount;
             $subtotal_ttc += $obj->amount;
 
-            $var = !$var;
-            print "<tr ".$bc[$var]."><td>&nbsp;</td>";
+            print '<tr class="oddeven"><td>&nbsp;</td>';
             print '<td>'.$obj->label.'</td>';
             if ($modecompta == 'CREANCES-DETTES')
             	print '<td align="right">'.price(-$obj->amount).'</td>';
@@ -548,8 +537,7 @@ if ($result) {
         }
     }
     else {
-        $var = !$var;
-        print "<tr ".$bc[$var]."><td>&nbsp;</td>";
+        print '<tr class="oddeven"><td>&nbsp;</td>';
         print '<td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td>';
         print '</tr>';
     }
@@ -615,7 +603,6 @@ if (! empty($conf->salaries->enabled))
 	if ($result)
 	{
 	    $num = $db->num_rows($result);
-	    $var=true;
 	    $i = 0;
 	    if ($num)
 	    {
@@ -628,8 +615,7 @@ if (! empty($conf->salaries->enabled))
 	            $subtotal_ht += $obj->amount;
 	            $subtotal_ttc += $obj->amount;
 
-	            $var = !$var;
-	            print "<tr ".$bc[$var]."><td>&nbsp;</td>";
+	            print '<tr class="oddeven"><td>&nbsp;</td>';
 
 	            print "<td>".$langs->trans("Salary")." <a href=\"".DOL_URL_ROOT."/compta/salaries/index.php?filtre=s.fk_user=".$obj->fk_user."\">".$obj->firstname." ".$obj->lastname."</a></td>\n";
 
@@ -641,8 +627,7 @@ if (! empty($conf->salaries->enabled))
 	    }
 	    else
 	    {
-	        $var = !$var;
-	        print "<tr ".$bc[$var]."><td>&nbsp;</td>";
+	        print '<tr class="oddeven"><td>&nbsp;</td>';
 	        print '<td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td>';
 	        print '</tr>';
 	    }
@@ -704,7 +689,6 @@ if (! empty($conf->expensereport->enabled))
 	if ($result)
 	{
 		$num = $db->num_rows($result);
-		$var=true;
 		if ($num)
 		{
 			while ($obj = $db->fetch_object($result))
@@ -714,8 +698,7 @@ if (! empty($conf->expensereport->enabled))
 				$subtotal_ht += $obj->amount_ht;
 				$subtotal_ttc += $obj->amount_ttc;
 
-				$var = !$var;
-				print "<tr ".$bc[$var]."><td>&nbsp;</td>";
+				print '<tr class="oddeven"><td>&nbsp;</td>';
 
 				print "<td>".$langs->trans("ExpenseReport")." <a href=\"".DOL_URL_ROOT."/expensereport/list.php?search_user=".$obj->userid."\">".$obj->firstname." ".$obj->lastname."</a></td>\n";
 
@@ -726,8 +709,7 @@ if (! empty($conf->expensereport->enabled))
 		}
 		else
 		{
-			$var = !$var;
-			print "<tr ".$bc[$var]."><td>&nbsp;</td>";
+			print '<tr class="oddeven"><td>&nbsp;</td>';
 			print '<td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td>';
 			print '</tr>';
 		}
@@ -782,7 +764,6 @@ if (! empty($conf->don->enabled))
 	if ($result)
 	{
 		$num = $db->num_rows($result);
-		$var=true;
 		$i = 0;
 		if ($num)
 		{
@@ -795,8 +776,7 @@ if (! empty($conf->don->enabled))
 				$subtotal_ht += $obj->amount;
 				$subtotal_ttc += $obj->amount;
 
-				$var = !$var;
-				print "<tr ".$bc[$var]."><td>&nbsp;</td>";
+				print '<tr class="oddeven"><td>&nbsp;</td>';
 
 				print "<td>".$langs->trans("Donation")." <a href=\"".DOL_URL_ROOT."/don/list.php?search_company=".$obj->name."&search_name=".$obj->firstname." ".$obj->lastname."\">".$obj->name. " ".$obj->firstname." ".$obj->lastname."</a></td>\n";
 
@@ -808,8 +788,7 @@ if (! empty($conf->don->enabled))
 		}
 		else
 		{
-			$var = !$var;
-			print "<tr ".$bc[$var]."><td>&nbsp;</td>";
+			print '<tr class="oddeven"><td>&nbsp;</td>';
 			print '<td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td>';
 			print '</tr>';
 		}
@@ -859,7 +838,6 @@ if ($modecompta == 'CREANCES-DETTES')
     if ($result)
     {
         $num = $db->num_rows($result);
-        $var=false;
         $i = 0;
         if ($num)
         {
@@ -878,7 +856,7 @@ if ($modecompta == 'CREANCES-DETTES')
     } else {
         dol_print_error($db);
     }
-    print "<tr ".$bc[$var]."><td>&nbsp;</td>";
+    print '<tr class="oddeven"><td>&nbsp;</td>';
     print "<td>".$langs->trans("VATToPay")."</td>\n";
     print "<td align=\"right\">&nbsp;</td>\n";
     print "<td align=\"right\">".price($amount)."</td>\n";
@@ -908,7 +886,6 @@ if ($modecompta == 'CREANCES-DETTES')
     if ($result)
     {
         $num = $db->num_rows($result);
-        $var=true;
         $i = 0;
         if ($num)
         {
@@ -928,7 +905,7 @@ if ($modecompta == 'CREANCES-DETTES')
     } else {
         dol_print_error($db);
     }
-    print "<tr ".$bc[$var]."><td>&nbsp;</td>";
+    print '<tr class="oddeven"><td>&nbsp;</td>';
     print "<td>".$langs->trans("VATToCollect")."</td>\n";
     print "<td align=\"right\">&nbsp;</td>\n";
     print "<td align=\"right\">".price($amount)."</td>\n";
@@ -955,7 +932,6 @@ else
     $result=$db->query($sql);
     if ($result) {
         $num = $db->num_rows($result);
-        $var=false;
         $i = 0;
         if ($num) {
             while ($i < $num) {
@@ -974,7 +950,7 @@ else
     } else {
         dol_print_error($db);
     }
-    print "<tr ".$bc[$var]."><td>&nbsp;</td>";
+    print '<tr class="oddeven"><td>&nbsp;</td>';
     print "<td>".$langs->trans("VATPaid")."</td>\n";
     if ($modecompta == 'CREANCES-DETTES')
     	print "<td align=\"right\">".price($amount)."</td>\n";
@@ -1000,7 +976,6 @@ else
     $result=$db->query($sql);
     if ($result) {
         $num = $db->num_rows($result);
-        $var=true;
         $i = 0;
         if ($num) {
             while ($i < $num) {
@@ -1021,7 +996,7 @@ else
     {
         dol_print_error($db);
     }
-    print "<tr ".$bc[$var]."><td>&nbsp;</td>";
+    print '<tr class="oddeven"><td>&nbsp;</td>';
     print "<td>".$langs->trans("VATCollected")."</td>\n";
     if ($modecompta == 'CREANCES-DETTES')
     	print "<td align=\"right\">".price($amount)."</td>\n";

From 68e333879fee345e90523e6b424d944fa85f4143 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 16 May 2017 13:27:32 +0200
Subject: [PATCH 365/505] Fix var not sanitized

---
 htdocs/accountancy/admin/account.php          |  2 +-
 htdocs/accountancy/admin/card.php             |  2 +-
 htdocs/accountancy/admin/categories.php       |  2 +-
 htdocs/accountancy/admin/fiscalyear.php       |  2 +-
 htdocs/accountancy/bookkeeping/card.php       |  2 +-
 htdocs/accountancy/expensereport/index.php    |  2 +-
 htdocs/accountancy/journal/bankjournal.php    |  2 +-
 .../journal/expensereportsjournal.php         |  2 +-
 .../accountancy/journal/purchasesjournal.php  |  2 +-
 htdocs/accountancy/journal/sellsjournal.php   |  2 +-
 htdocs/accountancy/report/result.php          |  2 +-
 htdocs/adherents/ldap.php                     |  2 +-
 htdocs/adherents/list.php                     |  2 +-
 htdocs/admin/clicktodial.php                  |  2 +-
 htdocs/admin/company.php                      |  2 +-
 htdocs/admin/events.php                       |  2 +-
 htdocs/admin/external_rss.php                 |  2 +-
 htdocs/admin/geoipmaxmind.php                 |  2 +-
 htdocs/admin/ihm.php                          |  2 +-
 htdocs/admin/ldap.php                         |  2 +-
 htdocs/admin/ldap_contacts.php                |  2 +-
 htdocs/admin/ldap_groups.php                  |  2 +-
 htdocs/admin/ldap_members.php                 |  2 +-
 htdocs/admin/ldap_users.php                   |  2 +-
 htdocs/admin/mailman.php                      |  2 +-
 htdocs/admin/menus.php                        |  2 +-
 htdocs/admin/menus/edit.php                   |  2 +-
 htdocs/admin/notification.php                 |  2 +-
 htdocs/admin/perms.php                        |  2 +-
 htdocs/admin/proxy.php                        |  2 +-
 htdocs/admin/security.php                     |  2 +-
 htdocs/admin/sms.php                          |  2 +-
 htdocs/admin/spip.php                         |  2 +-
 htdocs/admin/syslog.php                       |  2 +-
 htdocs/admin/system/perf.php                  |  2 +-
 htdocs/admin/system/xcache.php                |  2 +-
 htdocs/api/admin/index.php                    |  2 +-
 htdocs/barcode/codeinit.php                   |  2 +-
 htdocs/barcode/printsheet.php                 |  2 +-
 htdocs/cashdesk/validation_verif.php          |  2 +-
 htdocs/categories/admin/categorie.php         |  2 +-
 htdocs/categories/edit.php                    |  2 +-
 htdocs/categories/photos.php                  |  2 +-
 htdocs/categories/viewcat.php                 |  2 +-
 htdocs/collab/index.php                       |  2 +-
 htdocs/comm/card.php                          |  2 +-
 htdocs/comm/mailing/advtargetemailing.php     |  2 +-
 htdocs/comm/mailing/cibles.php                |  2 +-
 htdocs/comm/remise.php                        |  2 +-
 htdocs/comm/remx.php                          |  2 +-
 htdocs/commande/customer.php                  |  2 +-
 htdocs/commande/document.php                  |  2 +-
 htdocs/compta/bank/card.php                   |  2 +-
 htdocs/compta/bank/categ.php                  |  4 +-
 htdocs/compta/bank/various_payment/info.php   |  2 +-
 htdocs/compta/clients.php                     |  2 +-
 htdocs/compta/paiement.php                    |  2 +-
 htdocs/compta/paiement/rapport.php            |  2 +-
 htdocs/compta/payment_sc/card.php             |  2 +-
 htdocs/compta/salaries/card.php               |  2 +-
 htdocs/compta/salaries/info.php               |  2 +-
 htdocs/compta/sociales/card.php               |  2 +-
 htdocs/compta/sociales/document.php           |  2 +-
 htdocs/compta/sociales/info.php               |  2 +-
 htdocs/compta/tva/info.php                    |  2 +-
 htdocs/contact/document.php                   |  2 +-
 htdocs/contact/ldap.php                       |  2 +-
 htdocs/contact/note.php                       |  2 +-
 htdocs/core/ajax/ajaxdirpreview.php           |  2 +-
 htdocs/core/ajax/bankconciliate.php           |  2 +-
 .../boxes/box_graph_invoices_permonth.php     |  4 +-
 .../box_graph_invoices_supplier_permonth.php  |  4 +-
 .../core/boxes/box_graph_orders_permonth.php  |  4 +-
 .../box_graph_orders_supplier_permonth.php    |  4 +-
 .../boxes/box_graph_product_distribution.php  |  6 +-
 .../boxes/box_graph_propales_permonth.php     |  4 +-
 htdocs/core/class/html.form.class.php         | 14 ++--
 htdocs/core/class/html.formfile.class.php     |  6 +-
 htdocs/core/datepicker.php                    |  1 -
 htdocs/core/get_menudiv.php                   |  1 -
 htdocs/core/lib/functions.lib.php             | 22 ++++++-
 htdocs/core/lib/security.lib.php              |  8 +--
 htdocs/core/lib/security2.lib.php             |  2 +-
 htdocs/core/lib/usergroups.lib.php            |  2 +-
 htdocs/core/menus/standard/auguria.lib.php    |  4 +-
 htdocs/core/menus/standard/eldy.lib.php       |  4 +-
 htdocs/core/menus/standard/empty.php          |  2 +-
 htdocs/core/search_page.php                   |  1 -
 htdocs/core/tpl/ajaxrow.tpl.php               |  2 +-
 htdocs/core/tpl/notes.tpl.php                 |  4 +-
 htdocs/document.php                           |  4 +-
 htdocs/don/payment/card.php                   |  2 +-
 htdocs/don/payment/payment.php                |  4 +-
 htdocs/ecm/docfile.php                        |  4 +-
 htdocs/ecm/index.php                          |  2 +-
 htdocs/ecm/index_auto.php                     |  2 +-
 htdocs/expensereport/card.php                 |  2 +-
 htdocs/expensereport/payment/card.php         |  2 +-
 htdocs/expensereport/payment/payment.php      |  4 +-
 htdocs/externalsite/frames.php                |  2 +-
 htdocs/fourn/card.php                         |  2 +-
 htdocs/fourn/commande/dispatch.php            |  2 +-
 htdocs/fourn/commande/note.php                |  2 +-
 htdocs/fourn/facture/card.php                 |  2 +-
 htdocs/fourn/facture/rapport.php              |  2 +-
 htdocs/ftp/index.php                          |  2 +-
 htdocs/holiday/define_holiday.php             |  2 +-
 htdocs/index.php                              |  2 +-
 htdocs/install/repair.php                     |  2 +-
 htdocs/install/step2.php                      |  2 +-
 htdocs/install/upgrade.php                    |  4 +-
 htdocs/install/upgrade2.php                   |  4 +-
 htdocs/loan/card.php                          |  2 +-
 htdocs/loan/document.php                      |  2 +-
 htdocs/loan/info.php                          |  2 +-
 htdocs/loan/note.php                          |  2 +-
 htdocs/loan/payment/card.php                  |  2 +-
 htdocs/loan/payment/payment.php               |  2 +-
 htdocs/main.inc.php                           | 66 +++++++++----------
 htdocs/master.inc.php                         |  2 +-
 htdocs/opensurvey/card.php                    |  2 +-
 htdocs/opensurvey/exportcsv.php               |  2 +-
 htdocs/opensurvey/list.php                    |  2 +-
 htdocs/opensurvey/results.php                 |  2 +-
 htdocs/product/note.php                       |  2 +-
 htdocs/product/stock/card.php                 |  2 +-
 htdocs/product/stock/mouvement.php            |  2 +-
 htdocs/product/stock/product.php              |  2 +-
 htdocs/projet/activity/perday.php             |  2 +-
 htdocs/projet/activity/perweek.php            |  2 +-
 htdocs/projet/note.php                        |  2 +-
 htdocs/public/demo/index.php                  |  2 +-
 htdocs/public/opensurvey/studs.php            |  2 +-
 htdocs/public/paybox/newpayment.php           |  4 +-
 htdocs/public/paypal/newpayment.php           |  4 +-
 htdocs/societe/card.php                       |  2 +-
 htdocs/societe/document.php                   |  2 +-
 htdocs/societe/note.php                       |  2 +-
 htdocs/societe/notify/card.php                |  2 +-
 htdocs/theme/eldy/style.css.php               | 31 +++++----
 htdocs/theme/md/style.css.php                 | 31 +++++----
 htdocs/user/card.php                          |  2 +-
 htdocs/user/document.php                      |  2 +-
 htdocs/user/note.php                          |  2 +-
 htdocs/user/notify/card.php                   |  2 +-
 htdocs/user/passwordforgotten.php             |  2 +-
 htdocs/variants/list.php                      |  2 +-
 htdocs/viewimage.php                          | 12 ++--
 htdocs/websites/index.php                     |  2 +-
 .../accountancy/export-thirdpartyaccount.php  |  2 +-
 150 files changed, 261 insertions(+), 248 deletions(-)

diff --git a/htdocs/accountancy/admin/account.php b/htdocs/accountancy/admin/account.php
index 7f909cd2f13..d3556135972 100644
--- a/htdocs/accountancy/admin/account.php
+++ b/htdocs/accountancy/admin/account.php
@@ -37,7 +37,7 @@ $langs->load("accountancy");
 $langs->load("salaries");
 
 $mesg = '';
-$action = GETPOST('action');
+$action = GETPOST('action','aZ09');
 $cancel = GETPOST('cancel');
 $id = GETPOST('id', 'int');
 $rowid = GETPOST('rowid', 'int');
diff --git a/htdocs/accountancy/admin/card.php b/htdocs/accountancy/admin/card.php
index 8e77c4a5dab..3522460e07b 100644
--- a/htdocs/accountancy/admin/card.php
+++ b/htdocs/accountancy/admin/card.php
@@ -37,7 +37,7 @@ $langs->load("bills");
 $langs->load("accountancy");
 
 $mesg = '';
-$action = GETPOST('action');
+$action = GETPOST('action','aZ09');
 $backtopage = GETPOST('backtopage');
 $id = GETPOST('id', 'int');
 $rowid = GETPOST('rowid', 'int');
diff --git a/htdocs/accountancy/admin/categories.php b/htdocs/accountancy/admin/categories.php
index 19c33d848c8..fd8c67246f4 100644
--- a/htdocs/accountancy/admin/categories.php
+++ b/htdocs/accountancy/admin/categories.php
@@ -36,7 +36,7 @@ $mesg = '';
 $id = GETPOST('id', 'int');
 $rowid = GETPOST('rowid', 'int');
 $cancel = GETPOST('cancel');
-$action = GETPOST('action');
+$action = GETPOST('action','aZ09');
 $cat_id = GETPOST('account_category');
 $selectcpt = GETPOST('cpt_bk', 'array');
 $cpt_id = GETPOST('cptid');
diff --git a/htdocs/accountancy/admin/fiscalyear.php b/htdocs/accountancy/admin/fiscalyear.php
index 507a68a3c01..16e11225d49 100644
--- a/htdocs/accountancy/admin/fiscalyear.php
+++ b/htdocs/accountancy/admin/fiscalyear.php
@@ -25,7 +25,7 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/core/class/fiscalyear.class.php';
 
-$action = GETPOST('action');
+$action = GETPOST('action','aZ09');
 
 // Load variable for pagination
 $limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php
index 055451016e9..7ee3e6bb4fe 100644
--- a/htdocs/accountancy/bookkeeping/card.php
+++ b/htdocs/accountancy/bookkeeping/card.php
@@ -43,7 +43,7 @@ if ($user->societe_id > 0) {
 	accessforbidden();
 }
 
-$action = GETPOST('action');
+$action = GETPOST('action','aZ09');
 $piece_num = GETPOST("piece_num");
 
 $mesg = '';
diff --git a/htdocs/accountancy/expensereport/index.php b/htdocs/accountancy/expensereport/index.php
index 4bfeb630b02..a38194356bd 100644
--- a/htdocs/accountancy/expensereport/index.php
+++ b/htdocs/accountancy/expensereport/index.php
@@ -55,7 +55,7 @@ if ($year == 0) {
 }
 
 // Validate History
-$action = GETPOST('action');
+$action = GETPOST('action','aZ09');
 
 
 /*
diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index a68798869a2..d1602bedf00 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -71,7 +71,7 @@ $date_startyear = GETPOST('date_startyear');
 $date_endmonth = GETPOST('date_endmonth');
 $date_endday = GETPOST('date_endday');
 $date_endyear = GETPOST('date_endyear');
-$action = GETPOST('action');
+$action = GETPOST('action','aZ09');
 
 $now = dol_now();
 
diff --git a/htdocs/accountancy/journal/expensereportsjournal.php b/htdocs/accountancy/journal/expensereportsjournal.php
index 8e343bcbb08..f67224e3996 100644
--- a/htdocs/accountancy/journal/expensereportsjournal.php
+++ b/htdocs/accountancy/journal/expensereportsjournal.php
@@ -58,7 +58,7 @@ $now = dol_now();
 if ($user->societe_id > 0)
 	accessforbidden();
 
-$action = GETPOST('action');
+$action = GETPOST('action','aZ09');
 
 
 /*
diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php
index 232a6d7611c..f9cd162b6a0 100644
--- a/htdocs/accountancy/journal/purchasesjournal.php
+++ b/htdocs/accountancy/journal/purchasesjournal.php
@@ -57,7 +57,7 @@ $now = dol_now();
 if ($user->societe_id > 0)
 	accessforbidden();
 
-$action = GETPOST('action');
+$action = GETPOST('action','aZ09');
 
 
 /*
diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php
index 9af2bd2d135..85ce7361394 100644
--- a/htdocs/accountancy/journal/sellsjournal.php
+++ b/htdocs/accountancy/journal/sellsjournal.php
@@ -60,7 +60,7 @@ $now = dol_now();
 if ($user->societe_id > 0)
 	accessforbidden();
 
-$action = GETPOST('action');
+$action = GETPOST('action','aZ09');
 
 
 /*
diff --git a/htdocs/accountancy/report/result.php b/htdocs/accountancy/report/result.php
index a487cb641ff..aa31185604a 100644
--- a/htdocs/accountancy/report/result.php
+++ b/htdocs/accountancy/report/result.php
@@ -35,7 +35,7 @@ $langs->load("accountancy");
 $langs->load("compta");
 
 $mesg = '';
-$action = GETPOST('action');
+$action = GETPOST('action','aZ09');
 $cat_id = GETPOST('account_category');
 $selectcpt = GETPOST('cpt_bk');
 $id = GETPOST('id', 'int');
diff --git a/htdocs/adherents/ldap.php b/htdocs/adherents/ldap.php
index a5f61a45642..38e90663c0f 100644
--- a/htdocs/adherents/ldap.php
+++ b/htdocs/adherents/ldap.php
@@ -35,7 +35,7 @@ $langs->load("ldap");
 $langs->load("admin");
 
 $rowid = GETPOST('id','int');
-$action = GETPOST('action');
+$action = GETPOST('action','aZ09');
 
 // Protection
 $socid=0;
diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index 7a6013b9b78..33d175e6350 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -37,7 +37,7 @@ $langs->load("companies");
 // Security check
 $result=restrictedArea($user,'adherent');
 
-$action=GETPOST("action");
+$action=GETPOST('action','aZ09');
 $filter=GETPOST("filter");
 $statut=GETPOST("statut");
 $search=GETPOST("search");
diff --git a/htdocs/admin/clicktodial.php b/htdocs/admin/clicktodial.php
index 86b94d8ecf0..df3c54f758c 100644
--- a/htdocs/admin/clicktodial.php
+++ b/htdocs/admin/clicktodial.php
@@ -30,7 +30,7 @@ $langs->load("admin");
 
 if (!$user->admin) accessforbidden();
 
-$action = GETPOST("action");
+$action = GETPOST('action','aZ09');
 
 
 /*
diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php
index ef22d8ecb4a..4487f81c2fe 100644
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -36,7 +36,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 
-$action=GETPOST('action');
+$action=GETPOST('action','aZ09');
 
 $langs->load("admin");
 $langs->load("companies");
diff --git a/htdocs/admin/events.php b/htdocs/admin/events.php
index 74525a6855b..7a8c71c0130 100644
--- a/htdocs/admin/events.php
+++ b/htdocs/admin/events.php
@@ -35,7 +35,7 @@ $langs->load("users");
 $langs->load("admin");
 $langs->load("other");
 
-$action=GETPOST("action");
+$action=GETPOST('action','aZ09');
 
 
 $securityevent=new Events($db);
diff --git a/htdocs/admin/external_rss.php b/htdocs/admin/external_rss.php
index 30646b749fa..1d9621ad378 100644
--- a/htdocs/admin/external_rss.php
+++ b/htdocs/admin/external_rss.php
@@ -38,7 +38,7 @@ if (!$user->admin) accessforbidden();
 
 $def = array();
 $lastexternalrss=0;
-$action=GETPOST('action');
+$action=GETPOST('action','aZ09');
 
 
 /*
diff --git a/htdocs/admin/geoipmaxmind.php b/htdocs/admin/geoipmaxmind.php
index 5a69a356777..5ae1a04e2ea 100644
--- a/htdocs/admin/geoipmaxmind.php
+++ b/htdocs/admin/geoipmaxmind.php
@@ -33,7 +33,7 @@ accessforbidden();
 $langs->load("admin");
 $langs->load("errors");
 
-$action = GETPOST("action");
+$action = GETPOST('action','aZ09');
 
 /*
  * Actions
diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php
index 6e5c814639b..7c23b62f230 100644
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -45,7 +45,7 @@ $langs->load("agenda");
 
 if (! $user->admin) accessforbidden();
 
-$action = GETPOST('action');
+$action = GETPOST('action','aZ09');
 
 
 if (! defined("MAIN_MOTD")) define("MAIN_MOTD","");
diff --git a/htdocs/admin/ldap.php b/htdocs/admin/ldap.php
index 770d91d1d11..4d8dab035ca 100644
--- a/htdocs/admin/ldap.php
+++ b/htdocs/admin/ldap.php
@@ -36,7 +36,7 @@ $langs->load("admin");
 if (!$user->admin)
   accessforbidden();
 
-  $action = GETPOST("action");
+  $action = GETPOST('action','aZ09');
 
 /*
  * Actions
diff --git a/htdocs/admin/ldap_contacts.php b/htdocs/admin/ldap_contacts.php
index 27e32f8cd7c..d5ca994c258 100644
--- a/htdocs/admin/ldap_contacts.php
+++ b/htdocs/admin/ldap_contacts.php
@@ -38,7 +38,7 @@ $langs->load("errors");
 if (!$user->admin)
   accessforbidden();
 
-$action = GETPOST("action");
+$action = GETPOST('action','aZ09');
   
 /*
  * Actions
diff --git a/htdocs/admin/ldap_groups.php b/htdocs/admin/ldap_groups.php
index 192b11bfd8d..3f8869de70f 100644
--- a/htdocs/admin/ldap_groups.php
+++ b/htdocs/admin/ldap_groups.php
@@ -39,7 +39,7 @@ $langs->load("errors");
 if (!$user->admin)
   accessforbidden();
   
-$action = GETPOST("action");
+$action = GETPOST('action','aZ09');
 
 
 /*
diff --git a/htdocs/admin/ldap_members.php b/htdocs/admin/ldap_members.php
index 8c7291c3dc4..afbf8da375a 100644
--- a/htdocs/admin/ldap_members.php
+++ b/htdocs/admin/ldap_members.php
@@ -39,7 +39,7 @@ $langs->load("errors");
 if (!$user->admin)
   accessforbidden();
 
-$action = GETPOST("action");
+$action = GETPOST('action','aZ09');
 
 /*
  * Actions
diff --git a/htdocs/admin/ldap_users.php b/htdocs/admin/ldap_users.php
index 79f34001a63..43a6720a448 100644
--- a/htdocs/admin/ldap_users.php
+++ b/htdocs/admin/ldap_users.php
@@ -39,7 +39,7 @@ $langs->load("errors");
 if (!$user->admin)
   accessforbidden();
 
-$action = GETPOST("action");
+$action = GETPOST('action','aZ09');
 
 /*
  * Actions
diff --git a/htdocs/admin/mailman.php b/htdocs/admin/mailman.php
index 27d7b59553a..3048f519a86 100644
--- a/htdocs/admin/mailman.php
+++ b/htdocs/admin/mailman.php
@@ -41,7 +41,7 @@ if (! $user->admin) accessforbidden();
 
 $type=array('yesno','texte','chaine');
 
-$action = GETPOST("action");
+$action = GETPOST('action','aZ09');
 $testsubscribeemail = GETPOST("testsubscribeemail");
 $testunsubscribeemail = GETPOST("testunsubscribeemail");
 
diff --git a/htdocs/admin/menus.php b/htdocs/admin/menus.php
index ddfb4d0cd62..888045f3297 100644
--- a/htdocs/admin/menus.php
+++ b/htdocs/admin/menus.php
@@ -27,7 +27,7 @@ require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
 
-$action=GETPOST('action');
+$action=GETPOST('action','aZ09');
 
 $langs->load("companies");
 $langs->load("products");
diff --git a/htdocs/admin/menus/edit.php b/htdocs/admin/menus/edit.php
index 0a2669e960d..db03407fed1 100644
--- a/htdocs/admin/menus/edit.php
+++ b/htdocs/admin/menus/edit.php
@@ -43,7 +43,7 @@ foreach($dirmenus as $dirmenu)
     $dirsmartphone[]=$dirmenu.'smartphone';
 }
 
-$action=GETPOST('action');
+$action=GETPOST('action','aZ09');
 
 $menu_handler_top=$conf->global->MAIN_MENU_STANDARD;
 $menu_handler_smartphone=$conf->global->MAIN_MENU_SMARTPHONE;
diff --git a/htdocs/admin/notification.php b/htdocs/admin/notification.php
index c82e64d48ea..73fb3d91587 100644
--- a/htdocs/admin/notification.php
+++ b/htdocs/admin/notification.php
@@ -41,7 +41,7 @@ $langs->load("mails");
 if (!$user->admin)
   accessforbidden();
 
-$action = GETPOST("action");
+$action = GETPOST('action','aZ09');
 
 
 /*
diff --git a/htdocs/admin/perms.php b/htdocs/admin/perms.php
index 5acbeb2e627..0c7ed656d9f 100644
--- a/htdocs/admin/perms.php
+++ b/htdocs/admin/perms.php
@@ -32,7 +32,7 @@ $langs->load("admin");
 $langs->load("users");
 $langs->load("other");
 
-$action=GETPOST('action');
+$action=GETPOST('action','aZ09');
 
 if (!$user->admin) accessforbidden();
 
diff --git a/htdocs/admin/proxy.php b/htdocs/admin/proxy.php
index 224fac14ce7..ee22f377200 100644
--- a/htdocs/admin/proxy.php
+++ b/htdocs/admin/proxy.php
@@ -40,7 +40,7 @@ $upload_dir=$conf->admin->dir_temp;
  * Actions
  */
 
-if (GETPOST("action") == 'set_proxy')
+if (GETPOST('action','aZ09') == 'set_proxy')
 {
     if (GETPOST("MAIN_USE_CONNECT_TIMEOUT") && ! is_numeric(GETPOST("MAIN_USE_CONNECT_TIMEOUT")))
     {
diff --git a/htdocs/admin/security.php b/htdocs/admin/security.php
index 4d0415dbd01..9627164f534 100644
--- a/htdocs/admin/security.php
+++ b/htdocs/admin/security.php
@@ -27,7 +27,7 @@ require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
 
-$action=GETPOST('action');
+$action=GETPOST('action','aZ09');
 
 $langs->load("users");
 $langs->load("admin");
diff --git a/htdocs/admin/sms.php b/htdocs/admin/sms.php
index faf05b7fb0f..0027f2e834d 100644
--- a/htdocs/admin/sms.php
+++ b/htdocs/admin/sms.php
@@ -43,7 +43,7 @@ $substitutionarrayfortest=array(
 '__FIRSTNAME__' => 'TESTFirstname'
 );
 
-$action=GETPOST('action');
+$action=GETPOST('action','aZ09');
 
 
 /*
diff --git a/htdocs/admin/spip.php b/htdocs/admin/spip.php
index 241062732a4..12fc15823bd 100644
--- a/htdocs/admin/spip.php
+++ b/htdocs/admin/spip.php
@@ -41,7 +41,7 @@ if (! $user->admin) accessforbidden();
 
 $type=array('yesno','texte','chaine');
 
-$action = GETPOST("action");
+$action = GETPOST('action','aZ09');
 
 
 /*
diff --git a/htdocs/admin/syslog.php b/htdocs/admin/syslog.php
index 03a1872c90c..65933c25639 100644
--- a/htdocs/admin/syslog.php
+++ b/htdocs/admin/syslog.php
@@ -35,7 +35,7 @@ $langs->load("admin");
 $langs->load("other");
 
 $error=0;
-$action = GETPOST("action");
+$action = GETPOST('action','aZ09');
 
 $syslogModules = array();
 $activeModules = array();
diff --git a/htdocs/admin/system/perf.php b/htdocs/admin/system/perf.php
index 9b23dc74089..25079d8f185 100644
--- a/htdocs/admin/system/perf.php
+++ b/htdocs/admin/system/perf.php
@@ -33,7 +33,7 @@ $langs->load("other");
 if (! $user->admin)
 	accessforbidden();
 
-if (GETPOST('action') == 'donothing')
+if (GETPOST('action','aZ09') == 'donothing')
 {
 	exit;
 }
diff --git a/htdocs/admin/system/xcache.php b/htdocs/admin/system/xcache.php
index 361be2b461a..53eaeec085f 100644
--- a/htdocs/admin/system/xcache.php
+++ b/htdocs/admin/system/xcache.php
@@ -26,7 +26,7 @@ $langs->load("admin");
 
 if (!$user->admin) accessforbidden();
 
-$action=GETPOST('action');
+$action=GETPOST('action','aZ09');
 
 
 /*
diff --git a/htdocs/api/admin/index.php b/htdocs/api/admin/index.php
index 8142b564c1e..d7f002d02aa 100644
--- a/htdocs/api/admin/index.php
+++ b/htdocs/api/admin/index.php
@@ -34,7 +34,7 @@ $langs->load("admin");
 if (! $user->admin)
 	accessforbidden();
 
-$action=GETPOST("action");
+$action=GETPOST('action','aZ09');
 
 //Activate ProfId
 if ($action == 'setproductionmode')
diff --git a/htdocs/barcode/codeinit.php b/htdocs/barcode/codeinit.php
index ebe121301b7..1ebd512e772 100644
--- a/htdocs/barcode/codeinit.php
+++ b/htdocs/barcode/codeinit.php
@@ -38,7 +38,7 @@ $forbarcode=GETPOST('forbarcode');
 $fk_barcode_type=GETPOST('fk_barcode_type');
 $eraseallbarcode=GETPOST('eraseallbarcode');
 
-$action=GETPOST('action');
+$action=GETPOST('action','aZ09');
 
 $producttmp=new Product($db);
 $thirdpartytmp=new Societe($db);
diff --git a/htdocs/barcode/printsheet.php b/htdocs/barcode/printsheet.php
index a60ac19d0af..a4857c94e87 100644
--- a/htdocs/barcode/printsheet.php
+++ b/htdocs/barcode/printsheet.php
@@ -45,7 +45,7 @@ $numberofsticker=GETPOST('numberofsticker','int');
 
 $mesg='';
 
-$action=GETPOST('action');
+$action=GETPOST('action','aZ09');
 
 $producttmp=new Product($db);
 $thirdpartytmp=new Societe($db);
diff --git a/htdocs/cashdesk/validation_verif.php b/htdocs/cashdesk/validation_verif.php
index 0722b3fb92e..5e4ed9b028e 100644
--- a/htdocs/cashdesk/validation_verif.php
+++ b/htdocs/cashdesk/validation_verif.php
@@ -34,7 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 $obj_facturation = unserialize($_SESSION['serObjFacturation']);
 unset ($_SESSION['serObjFacturation']);
 
-$action =GETPOST('action');
+$action =GETPOST('action','aZ09');
 $bankaccountid=GETPOST('cashdeskbank');
 
 switch ($action)
diff --git a/htdocs/categories/admin/categorie.php b/htdocs/categories/admin/categorie.php
index bc27be9bb12..d16b081e6ae 100644
--- a/htdocs/categories/admin/categorie.php
+++ b/htdocs/categories/admin/categorie.php
@@ -32,7 +32,7 @@ accessforbidden();
 
 $langs->load("categories");
 
-$action=GETPOST("action");
+$action=GETPOST('action','aZ09');
 
 /*
  *	Actions
diff --git a/htdocs/categories/edit.php b/htdocs/categories/edit.php
index b96042d7a8e..9981d09cda0 100644
--- a/htdocs/categories/edit.php
+++ b/htdocs/categories/edit.php
@@ -34,7 +34,7 @@ $langs->load("categories");
 $id=GETPOST('id','int');
 $ref=GETPOST('ref');
 $type=GETPOST('type');
-$action=GETPOST('action');
+$action=GETPOST('action','aZ09');
 $confirm=GETPOST('confirm');
 $cancel=GETPOST('cancel');
 
diff --git a/htdocs/categories/photos.php b/htdocs/categories/photos.php
index 100d2d0d48e..e99e081e015 100644
--- a/htdocs/categories/photos.php
+++ b/htdocs/categories/photos.php
@@ -39,7 +39,7 @@ $langs->load("bills");
 $id=GETPOST('id','int');
 $ref=GETPOST('ref');
 $type=GETPOST('type');
-$action=GETPOST('action');
+$action=GETPOST('action','aZ09');
 $confirm=GETPOST('confirm');
 
 if ($id == "")
diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php
index d04d0baebd2..665b033936e 100644
--- a/htdocs/categories/viewcat.php
+++ b/htdocs/categories/viewcat.php
@@ -37,7 +37,7 @@ $langs->load("categories");
 $id=GETPOST('id','int');
 $ref=GETPOST('ref');
 $type=GETPOST('type');
-$action=GETPOST('action');
+$action=GETPOST('action','aZ09');
 $confirm=GETPOST('confirm');
 $removeelem = GETPOST('removeelem','int');
 $elemid=GETPOST('elemid');
diff --git a/htdocs/collab/index.php b/htdocs/collab/index.php
index 0c892c4e776..ea7abde4151 100644
--- a/htdocs/collab/index.php
+++ b/htdocs/collab/index.php
@@ -77,7 +77,7 @@ $langs->load("website");
 
 if (! $user->admin) accessforbidden();
 
-if (! ((GETPOST('testmenuhider') || ! empty($conf->global->MAIN_TESTMENUHIDER)) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)))
+if (! ((GETPOST('testmenuhider','int') || ! empty($conf->global->MAIN_TESTMENUHIDER)) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)))
 {
     $conf->dol_hide_leftmenu = 1;   // Force hide of left menu.
 }
diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index b933289be4f..b26ce4fa7ac 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -60,7 +60,7 @@ $id = (GETPOST('socid','int') ? GETPOST('socid','int') : GETPOST('id','int'));
 if ($user->societe_id > 0) $id=$user->societe_id;
 $result = restrictedArea($user,'societe',$id,'&societe');
 
-$action		= GETPOST('action');
+$action		= GETPOST('action','aZ09');
 $mode		= GETPOST("mode");
 
 $sortfield = GETPOST("sortfield",'alpha');
diff --git a/htdocs/comm/mailing/advtargetemailing.php b/htdocs/comm/mailing/advtargetemailing.php
index 362bec914b6..0a9cdca7abc 100644
--- a/htdocs/comm/mailing/advtargetemailing.php
+++ b/htdocs/comm/mailing/advtargetemailing.php
@@ -59,7 +59,7 @@ if (! $sortfield)
 
 $id = GETPOST('id', 'int');
 $rowid = GETPOST('rowid', 'int');
-$action = GETPOST("action");
+$action = GETPOST('action','aZ09');
 $search_nom = GETPOST("search_nom");
 $search_prenom = GETPOST("search_prenom");
 $search_email = GETPOST("search_email");
diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index 118cc336fb7..0020a8fd771 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -52,7 +52,7 @@ if (! $sortorder) $sortorder="ASC";
 
 $id=GETPOST('id','int');
 $rowid=GETPOST('rowid','int');
-$action=GETPOST("action");
+$action=GETPOST('action','aZ09');
 $search_lastname=GETPOST("search_lastname");
 $search_firstname=GETPOST("search_firstname");
 $search_email=GETPOST("search_email");
diff --git a/htdocs/comm/remise.php b/htdocs/comm/remise.php
index 2be1981c5ae..bca371977a7 100644
--- a/htdocs/comm/remise.php
+++ b/htdocs/comm/remise.php
@@ -52,7 +52,7 @@ if (GETPOST('cancel') && ! empty($backtopage))
      exit;
 }
 
-if (GETPOST("action") == 'setremise')
+if (GETPOST('action','aZ09') == 'setremise')
 {
 	$object = new Societe($db);
 	$object->fetch($id);
diff --git a/htdocs/comm/remx.php b/htdocs/comm/remx.php
index 375b4d0ecb8..9964db9ecde 100644
--- a/htdocs/comm/remx.php
+++ b/htdocs/comm/remx.php
@@ -185,7 +185,7 @@ if ($action == 'setremise' && $user->rights->societe->creer)
 	}
 }
 
-if (GETPOST("action") == 'confirm_remove' && GETPOST("confirm")=='yes')
+if (GETPOST('action','aZ09') == 'confirm_remove' && GETPOST("confirm")=='yes')
 {
 	//if ($user->rights->societe->creer)
 	//if ($user->rights->facture->creer)
diff --git a/htdocs/commande/customer.php b/htdocs/commande/customer.php
index b5672f276e7..431a54b9f76 100644
--- a/htdocs/commande/customer.php
+++ b/htdocs/commande/customer.php
@@ -30,7 +30,7 @@ require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 
-$action=GETPOST('action');
+$action=GETPOST('action','aZ09');
 
 // Secrutiy check
 if ($user->societe_id > 0)
diff --git a/htdocs/commande/document.php b/htdocs/commande/document.php
index ef4f220f3e4..0b6cb908ef3 100644
--- a/htdocs/commande/document.php
+++ b/htdocs/commande/document.php
@@ -36,7 +36,7 @@ require_once DOL_DOCUMENT_ROOT .'/commande/class/commande.class.php';
 $langs->load('companies');
 $langs->load('other');
 
-$action		= GETPOST('action');
+$action		= GETPOST('action','aZ09');
 $confirm	= GETPOST('confirm');
 $id			= GETPOST('id','int');
 $ref		= GETPOST('ref');
diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index 804d2c5511d..be16e1f8bd6 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -46,7 +46,7 @@ $langs->load("categories");
 $langs->load("companies");
 $langs->load("compta");
 
-$action=GETPOST("action");
+$action=GETPOST('action','aZ09');
 $cancel = GETPOST('cancel', 'alpha');
 
 // Security check
diff --git a/htdocs/compta/bank/categ.php b/htdocs/compta/bank/categ.php
index 0cf88224e63..83e1f15ef36 100644
--- a/htdocs/compta/bank/categ.php
+++ b/htdocs/compta/bank/categ.php
@@ -33,7 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/bankcateg.class.php';
 $langs->load("banks");
 $langs->load("categories");
 
-$action=GETPOST('action');
+$action=GETPOST('action','aZ09');
 
 if (!$user->rights->banque->configurer)
   accessforbidden();
@@ -108,7 +108,7 @@ if ($result)
 		
 		print '<tr class="oddeven">';
 		print '<td><a href="'.DOL_URL_ROOT.'/compta/bank/budget.php?bid='.$objp->rowid.'">'.$objp->rowid.'</a></td>';
-		if (GETPOST("action") == 'edit' && GETPOST("categid")== $objp->rowid)
+		if (GETPOST('action','aZ09') == 'edit' && GETPOST("categid")== $objp->rowid)
 		{
 			print "<td colspan=2>";
 			print '<input type="hidden" name="categid" value="'.$objp->rowid.'">';
diff --git a/htdocs/compta/bank/various_payment/info.php b/htdocs/compta/bank/various_payment/info.php
index 73c1baa5c02..cda6b4ce137 100644
--- a/htdocs/compta/bank/various_payment/info.php
+++ b/htdocs/compta/bank/various_payment/info.php
@@ -31,7 +31,7 @@ $langs->load("bills");
 $langs->load("salaries");
 
 $id=GETPOST('id','int');
-$action=GETPOST("action");
+$action=GETPOST('action','aZ09');
 
 // Security check
 $socid = GETPOST('socid','int');
diff --git a/htdocs/compta/clients.php b/htdocs/compta/clients.php
index 28eaa0a7c9b..59fb3af2f00 100644
--- a/htdocs/compta/clients.php
+++ b/htdocs/compta/clients.php
@@ -27,7 +27,7 @@ require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 
-$action=GETPOST('action');
+$action=GETPOST('action','aZ09');
 
 // Secrutiy check
 if ($user->societe_id > 0)
diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php
index 8cd924a0df8..0881ce061dc 100644
--- a/htdocs/compta/paiement.php
+++ b/htdocs/compta/paiement.php
@@ -817,7 +817,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 /**
  *  Show list of payments
  */
-if (! GETPOST('action'))
+if (! GETPOST('action','aZ09'))
 {
     if ($page == -1) $page = 0 ;
     $limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
diff --git a/htdocs/compta/paiement/rapport.php b/htdocs/compta/paiement/rapport.php
index c73f79c60a4..a185f0aba6e 100644
--- a/htdocs/compta/paiement/rapport.php
+++ b/htdocs/compta/paiement/rapport.php
@@ -31,7 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 // Security check
 if (! $user->rights->facture->lire) accessforbidden();
 
-$action=GETPOST('action');
+$action=GETPOST('action','aZ09');
 
 $socid=0;
 if ($user->societe_id > 0)
diff --git a/htdocs/compta/payment_sc/card.php b/htdocs/compta/payment_sc/card.php
index 2d653f2ba05..45762ed95bb 100644
--- a/htdocs/compta/payment_sc/card.php
+++ b/htdocs/compta/payment_sc/card.php
@@ -38,7 +38,7 @@ $langs->load('companies');
 
 // Security check
 $id=GETPOST("id",'int');
-$action=GETPOST("action");
+$action=GETPOST('action','aZ09');
 $confirm=GETPOST('confirm');
 if ($user->societe_id) $socid=$user->societe_id;
 // TODO ajouter regle pour restreindre acces paiement
diff --git a/htdocs/compta/salaries/card.php b/htdocs/compta/salaries/card.php
index 569aa81629e..0ea91dc2857 100644
--- a/htdocs/compta/salaries/card.php
+++ b/htdocs/compta/salaries/card.php
@@ -39,7 +39,7 @@ $langs->load("salaries");
 $langs->load('hrm');
 
 $id=GETPOST("id",'int');
-$action=GETPOST('action');
+$action=GETPOST('action','aZ09');
 
 // Security check
 $socid = GETPOST("socid","int");
diff --git a/htdocs/compta/salaries/info.php b/htdocs/compta/salaries/info.php
index 429efc27a33..f15aac021ec 100644
--- a/htdocs/compta/salaries/info.php
+++ b/htdocs/compta/salaries/info.php
@@ -32,7 +32,7 @@ $langs->load("bills");
 $langs->load("salaries");
 
 $id=GETPOST('id','int');
-$action=GETPOST("action");
+$action=GETPOST('action','aZ09');
 
 // Security check
 $socid = GETPOST('socid','int');
diff --git a/htdocs/compta/sociales/card.php b/htdocs/compta/sociales/card.php
index aa479ec4369..f34ff9b1a31 100644
--- a/htdocs/compta/sociales/card.php
+++ b/htdocs/compta/sociales/card.php
@@ -38,7 +38,7 @@ $langs->load("compta");
 $langs->load("bills");
 
 $id=GETPOST('id','int');
-$action=GETPOST("action");
+$action=GETPOST('action','aZ09');
 $confirm=GETPOST('confirm');
 $projectid = (GETPOST('projectid') ? GETPOST('projectid', 'int') : 0);
 
diff --git a/htdocs/compta/sociales/document.php b/htdocs/compta/sociales/document.php
index cf42a11b515..95c72cbedb2 100644
--- a/htdocs/compta/sociales/document.php
+++ b/htdocs/compta/sociales/document.php
@@ -40,7 +40,7 @@ $langs->load("compta");
 $langs->load("bills");
 
 $id = GETPOST('id','int');
-$action = GETPOST("action");
+$action = GETPOST('action','aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 
 // Security check
diff --git a/htdocs/compta/sociales/info.php b/htdocs/compta/sociales/info.php
index 7caa212be9e..bbacfafd430 100644
--- a/htdocs/compta/sociales/info.php
+++ b/htdocs/compta/sociales/info.php
@@ -30,7 +30,7 @@ $langs->load("compta");
 $langs->load("bills");
 
 $id=GETPOST('id','int');
-$action=GETPOST("action");
+$action=GETPOST('action','aZ09');
 
 // Security check
 $socid = GETPOST('socid','int');
diff --git a/htdocs/compta/tva/info.php b/htdocs/compta/tva/info.php
index f85ab9fc2b0..0c6ce29475a 100644
--- a/htdocs/compta/tva/info.php
+++ b/htdocs/compta/tva/info.php
@@ -30,7 +30,7 @@ $langs->load("compta");
 $langs->load("bills");
 
 $id=GETPOST('id','int');
-$action=GETPOST("action");
+$action=GETPOST('action','aZ09');
 
 // Security check
 $socid = GETPOST('socid','int');
diff --git a/htdocs/contact/document.php b/htdocs/contact/document.php
index b0067d81ec1..5d70ba7b4e1 100644
--- a/htdocs/contact/document.php
+++ b/htdocs/contact/document.php
@@ -34,7 +34,7 @@ $langs->load("companies");
 $langs->load("contact");
 
 $id = GETPOST('id','int');
-$action = GETPOST("action");
+$action = GETPOST('action','aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 
 $object = new Contact($db);
diff --git a/htdocs/contact/ldap.php b/htdocs/contact/ldap.php
index af8fccfd7b9..3e998b43ec5 100644
--- a/htdocs/contact/ldap.php
+++ b/htdocs/contact/ldap.php
@@ -32,7 +32,7 @@ $langs->load("companies");
 $langs->load("ldap");
 $langs->load("admin");
 
-$action=GETPOST('action');
+$action=GETPOST('action','aZ09');
 
 // Security check
 $id = GETPOST('id', 'int');
diff --git a/htdocs/contact/note.php b/htdocs/contact/note.php
index eed044cdadf..c49dbc9f787 100644
--- a/htdocs/contact/note.php
+++ b/htdocs/contact/note.php
@@ -29,7 +29,7 @@ require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/contact.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 
-$action = GETPOST('action');
+$action = GETPOST('action','aZ09');
 
 $langs->load("companies");
 
diff --git a/htdocs/core/ajax/ajaxdirpreview.php b/htdocs/core/ajax/ajaxdirpreview.php
index 3fec57091cb..8d8f48ec141 100644
--- a/htdocs/core/ajax/ajaxdirpreview.php
+++ b/htdocs/core/ajax/ajaxdirpreview.php
@@ -40,7 +40,7 @@ if (! isset($mode) || $mode != 'noajax')    // For ajax call
     require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
     require_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmdirectory.class.php';
 
-	$action=GETPOST("action");
+	$action=GETPOST('action','aZ09');
     $file=urldecode(GETPOST('file'));
     $section=GETPOST("section");
     $module=GETPOST("module");
diff --git a/htdocs/core/ajax/bankconciliate.php b/htdocs/core/ajax/bankconciliate.php
index 3a8a3e30687..24318be6cf8 100644
--- a/htdocs/core/ajax/bankconciliate.php
+++ b/htdocs/core/ajax/bankconciliate.php
@@ -31,7 +31,7 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
-$action=GETPOST('action');
+$action=GETPOST('action','aZ09');
 
 
 /*
diff --git a/htdocs/core/boxes/box_graph_invoices_permonth.php b/htdocs/core/boxes/box_graph_invoices_permonth.php
index d313d10b310..8d8fea71411 100644
--- a/htdocs/core/boxes/box_graph_invoices_permonth.php
+++ b/htdocs/core/boxes/box_graph_invoices_permonth.php
@@ -122,7 +122,7 @@ class box_graph_invoices_permonth extends ModeleBoxes
 			// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
 			if ($shownb)
 			{
-				$data1 = $stats->getNbByMonthWithPrevYear($endyear,$startyear,(GETPOST('action')==$refreshaction?-1:(3600*24)));
+				$data1 = $stats->getNbByMonthWithPrevYear($endyear,$startyear,(GETPOST('action','aZ09')==$refreshaction?-1:(3600*24)));
 
 				$filenamenb = $dir."/".$prefix."invoicesnbinyear-".$endyear.".png";
 				if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstats&amp;file=invoicesnbinyear-'.$endyear.'.png';
@@ -162,7 +162,7 @@ class box_graph_invoices_permonth extends ModeleBoxes
 			// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
 			if ($showtot)
 			{
-				$data2 = $stats->getAmountByMonthWithPrevYear($endyear,$startyear,(GETPOST('action')==$refreshaction?-1:(3600*24)));
+				$data2 = $stats->getAmountByMonthWithPrevYear($endyear,$startyear,(GETPOST('action','aZ09')==$refreshaction?-1:(3600*24)));
 
 				$filenamenb = $dir."/".$prefix."invoicesamountinyear-".$endyear.".png";
 				if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstats&amp;file=invoicesamountinyear-'.$endyear.'.png';
diff --git a/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php b/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
index 7c3d6ab4e7f..e7ece7a2a53 100644
--- a/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
+++ b/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
@@ -121,7 +121,7 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
 			// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
 			if ($shownb)
 			{
-				$data1 = $stats->getNbByMonthWithPrevYear($endyear,$startyear,(GETPOST('action')==$refreshaction?-1:(3600*24)));
+				$data1 = $stats->getNbByMonthWithPrevYear($endyear,$startyear,(GETPOST('action','aZ09')==$refreshaction?-1:(3600*24)));
 
 				$filenamenb = $dir."/".$prefix."invoicessuppliernbinyear-".$year.".png";
 				if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstats&amp;file=invoicesnbinyear-'.$year.'.png';
@@ -161,7 +161,7 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
 			// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
 			if ($showtot)
 			{
-				$data2 = $stats->getAmountByMonthWithPrevYear($endyear,$startyear,(GETPOST('action')==$refreshaction?-1:(3600*24)));
+				$data2 = $stats->getAmountByMonthWithPrevYear($endyear,$startyear,(GETPOST('action','aZ09')==$refreshaction?-1:(3600*24)));
 
 				$filenamenb = $dir."/".$prefix."invoicessupplieramountinyear-".$year.".png";
 				if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstats&amp;file=invoicesamountinyear-'.$year.'.png';
diff --git a/htdocs/core/boxes/box_graph_orders_permonth.php b/htdocs/core/boxes/box_graph_orders_permonth.php
index 0d3077a82ce..ec45cc3dde7 100644
--- a/htdocs/core/boxes/box_graph_orders_permonth.php
+++ b/htdocs/core/boxes/box_graph_orders_permonth.php
@@ -124,7 +124,7 @@ class box_graph_orders_permonth extends ModeleBoxes
 			// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
 			if ($shownb)
 			{
-				$data1 = $stats->getNbByMonthWithPrevYear($endyear,$startyear,(GETPOST('action')==$refreshaction?-1:(3600*24)));
+				$data1 = $stats->getNbByMonthWithPrevYear($endyear,$startyear,(GETPOST('action','aZ09')==$refreshaction?-1:(3600*24)));
 
 				$filenamenb = $dir."/".$prefix."ordersnbinyear-".$endyear.".png";
 				if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&amp;file=ordersnbinyear-'.$endyear.'.png';
@@ -162,7 +162,7 @@ class box_graph_orders_permonth extends ModeleBoxes
 			// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
 			if ($showtot)
 			{
-				$data2 = $stats->getAmountByMonthWithPrevYear($endyear,$startyear,(GETPOST('action')==$refreshaction?-1:(3600*24)));
+				$data2 = $stats->getAmountByMonthWithPrevYear($endyear,$startyear,(GETPOST('action','aZ09')==$refreshaction?-1:(3600*24)));
 
 				$filenamenb = $dir."/".$prefix."ordersamountinyear-".$endyear.".png";
 				if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&amp;file=ordersamountinyear-'.$endyear.'.png';
diff --git a/htdocs/core/boxes/box_graph_orders_supplier_permonth.php b/htdocs/core/boxes/box_graph_orders_supplier_permonth.php
index d16bfbc0f90..28335c79b62 100644
--- a/htdocs/core/boxes/box_graph_orders_supplier_permonth.php
+++ b/htdocs/core/boxes/box_graph_orders_supplier_permonth.php
@@ -123,7 +123,7 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
 			// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
 			if ($shownb)
 			{
-				$data1 = $stats->getNbByMonthWithPrevYear($endyear,$startyear,(GETPOST('action')==$refreshaction?-1:(3600*24)));
+				$data1 = $stats->getNbByMonthWithPrevYear($endyear,$startyear,(GETPOST('action','aZ09')==$refreshaction?-1:(3600*24)));
 
 				$filenamenb = $dir."/".$prefix."orderssuppliernbinyear-".$endyear.".png";
 				if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&amp;file=ordersnbinyear-'.$endyear.'.png';
@@ -161,7 +161,7 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
 			// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
 			if ($showtot)
 			{
-				$data2 = $stats->getAmountByMonthWithPrevYear($endyear,$startyear,(GETPOST('action')==$refreshaction?-1:(3600*24)));
+				$data2 = $stats->getAmountByMonthWithPrevYear($endyear,$startyear,(GETPOST('action','aZ09')==$refreshaction?-1:(3600*24)));
 
 				$filenamenb = $dir."/".$prefix."orderssupplieramountinyear-".$endyear.".png";
 				if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&amp;file=ordersamountinyear-'.$endyear.'.png';
diff --git a/htdocs/core/boxes/box_graph_product_distribution.php b/htdocs/core/boxes/box_graph_product_distribution.php
index 2b3c69a9e15..44d5d0b0c15 100644
--- a/htdocs/core/boxes/box_graph_product_distribution.php
+++ b/htdocs/core/boxes/box_graph_product_distribution.php
@@ -139,7 +139,7 @@ class box_graph_product_distribution extends ModeleBoxes
 				$showpointvalue = 1; $nocolor = 0;
 				$mode='customer';
 				$stats_invoice = new FactureStats($this->db, $socid, $mode, ($userid>0?$userid:0));
-				$data1 = $stats_invoice->getAllByProductEntry($year,(GETPOST('action')==$refreshaction?-1:(3600*24)));
+				$data1 = $stats_invoice->getAllByProductEntry($year,(GETPOST('action','aZ09')==$refreshaction?-1:(3600*24)));
 				if (empty($data1))
 				{
 					$showpointvalue=0;
@@ -197,7 +197,7 @@ class box_graph_product_distribution extends ModeleBoxes
 
 				$showpointvalue = 1; $nocolor = 0;
 				$stats_proposal = new PropaleStats($this->db, $socid, ($userid>0?$userid:0));
-				$data2 = $stats_proposal->getAllByProductEntry($year,(GETPOST('action')==$refreshaction?-1:(3600*24)));
+				$data2 = $stats_proposal->getAllByProductEntry($year,(GETPOST('action','aZ09')==$refreshaction?-1:(3600*24)));
 				if (empty($data2))
 				{
 					$showpointvalue = 0;
@@ -259,7 +259,7 @@ class box_graph_product_distribution extends ModeleBoxes
 				$showpointvalue = 1; $nocolor = 0;
 				$mode='customer';
 				$stats_order = new CommandeStats($this->db, $socid, $mode, ($userid>0?$userid:0));
-				$data3 = $stats_order->getAllByProductEntry($year,(GETPOST('action')==$refreshaction?-1:(3600*24)));
+				$data3 = $stats_order->getAllByProductEntry($year,(GETPOST('action','aZ09')==$refreshaction?-1:(3600*24)));
 				if (empty($data3))
 				{
 					$showpointvalue = 0;
diff --git a/htdocs/core/boxes/box_graph_propales_permonth.php b/htdocs/core/boxes/box_graph_propales_permonth.php
index 2a29cf27314..ccce8372d1f 100644
--- a/htdocs/core/boxes/box_graph_propales_permonth.php
+++ b/htdocs/core/boxes/box_graph_propales_permonth.php
@@ -121,7 +121,7 @@ class box_graph_propales_permonth extends ModeleBoxes
 			// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
 			if ($shownb)
 			{
-				$data1 = $stats->getNbByMonthWithPrevYear($endyear,$startyear,(GETPOST('action')==$refreshaction?-1:(3600*24)));
+				$data1 = $stats->getNbByMonthWithPrevYear($endyear,$startyear,(GETPOST('action','aZ09')==$refreshaction?-1:(3600*24)));
 				$datatype1 = array_pad(array(), ($endyear-$startyear+1), 'bars');
 
 				$filenamenb = $dir."/".$prefix."propalsnbinyear-".$endyear.".png";
@@ -160,7 +160,7 @@ class box_graph_propales_permonth extends ModeleBoxes
 			// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
 			if ($showtot)
 			{
-				$data2 = $stats->getAmountByMonthWithPrevYear($endyear,$startyear,(GETPOST('action')==$refreshaction?-1:(3600*24)));
+				$data2 = $stats->getAmountByMonthWithPrevYear($endyear,$startyear,(GETPOST('action','aZ09')==$refreshaction?-1:(3600*24)));
 				$datatype2 = array_pad(array(), ($endyear-$startyear+1), 'bars');
 				//$datatype2 = array('lines','bars');
 
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index b12e58fe8f7..afa2006864f 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -110,18 +110,18 @@ class Form
         }
         else
 		{
-            if (empty($notabletag) && GETPOST('action') != 'edit'.$htmlname && $perm) $ret.='<table class="nobordernopadding" width="100%"><tr><td class="nowrap">';
+            if (empty($notabletag) && GETPOST('action','aZ09') != 'edit'.$htmlname && $perm) $ret.='<table class="nobordernopadding" width="100%"><tr><td class="nowrap">';
 	        if ($fieldrequired) $ret.='<span class="fieldrequired">';
             $ret.=$langs->trans($text);
 	        if ($fieldrequired) $ret.='</span>';
 	        if (! empty($notabletag)) $ret.=' ';
-            if (empty($notabletag) && GETPOST('action') != 'edit'.$htmlname && $perm) $ret.='</td>';
-            if (empty($notabletag) && GETPOST('action') != 'edit'.$htmlname && $perm) $ret.='<td align="right">';
-            if ($htmlname && GETPOST('action') != 'edit'.$htmlname && $perm) $ret.='<a href="'.$_SERVER["PHP_SELF"].'?action=edit'.$htmlname.'&amp;id='.$object->id.$moreparam.'">'.img_edit($langs->trans('Edit'), ($notabletag ? 0 : 1)).'</a>';
+            if (empty($notabletag) && GETPOST('action','aZ09') != 'edit'.$htmlname && $perm) $ret.='</td>';
+            if (empty($notabletag) && GETPOST('action','aZ09') != 'edit'.$htmlname && $perm) $ret.='<td align="right">';
+            if ($htmlname && GETPOST('action','aZ09') != 'edit'.$htmlname && $perm) $ret.='<a href="'.$_SERVER["PHP_SELF"].'?action=edit'.$htmlname.'&amp;id='.$object->id.$moreparam.'">'.img_edit($langs->trans('Edit'), ($notabletag ? 0 : 1)).'</a>';
 	        if (! empty($notabletag) && $notabletag == 1) $ret.=' : ';
 	        if (! empty($notabletag) && $notabletag == 3) $ret.=' ';
-            if (empty($notabletag) && GETPOST('action') != 'edit'.$htmlname && $perm) $ret.='</td>';
-            if (empty($notabletag) && GETPOST('action') != 'edit'.$htmlname && $perm) $ret.='</tr></table>';
+            if (empty($notabletag) && GETPOST('action','aZ09') != 'edit'.$htmlname && $perm) $ret.='</td>';
+            if (empty($notabletag) && GETPOST('action','aZ09') != 'edit'.$htmlname && $perm) $ret.='</tr></table>';
         }
 
         return $ret;
@@ -159,7 +159,7 @@ class Form
         }
         else
         {
-            if (GETPOST('action') == 'edit'.$htmlname)
+            if (GETPOST('action','aZ09') == 'edit'.$htmlname)
             {
                 $ret.="\n";
                 $ret.='<form method="post" action="'.$_SERVER["PHP_SELF"].($moreparam?'?'.$moreparam:'').'">';
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index adacddb2163..225825d6699 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -994,7 +994,7 @@ class FormFile
 			if (empty($url)) $url=$_SERVER["PHP_SELF"];
 			
 			print '<!-- html.formfile::list_of_documents -->'."\n";
-			if (GETPOST('action') == 'editfile' && $permtoeditline)
+			if (GETPOST('action','aZ09') == 'editfile' && $permtoeditline)
 			{
 			    print '<form action="'.$_SERVER["PHP_SELF"].'?'.$param.'" method="POST">';
 			    print '<input type="hidden" name="action" value="renamefile">';
@@ -1131,7 +1131,7 @@ class FormFile
 					print img_mime($file['name'],$file['name'].' ('.dol_print_size($file['size'],0,0).')').' ';
 					if ($showrelpart == 1) print $relativepath;
 					//print dol_trunc($file['name'],$maxlength,'middle');
-					if (GETPOST('action') == 'editfile' && $file['name'] == basename(GETPOST('urlfile')))
+					if (GETPOST('action','aZ09') == 'editfile' && $file['name'] == basename(GETPOST('urlfile')))
 					{
 					    print '</a>';
 					    print '<input type="hidden" name="renamefilefrom" value="'.dol_escape_htmltag($file['name']).'">';
@@ -1268,7 +1268,7 @@ class FormFile
 				}
 			}				
 			
-			if (GETPOST('action') == 'editfile' && $permtoeditline)
+			if (GETPOST('action','aZ09') == 'editfile' && $permtoeditline)
 			{
 			    print '</form>';
 			}
diff --git a/htdocs/core/datepicker.php b/htdocs/core/datepicker.php
index eeb20ee265c..d2441487231 100644
--- a/htdocs/core/datepicker.php
+++ b/htdocs/core/datepicker.php
@@ -39,7 +39,6 @@ if (! defined('NOREQUIREHTML'))   define('NOREQUIREHTML',1);
 require_once '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 
-if (GETPOST('lang')) $langs->setDefaultLang(GETPOST('lang'));	// If language was forced on URL by the main.inc.php
 $langs->load("main");
 $langs->load("agenda");
 $right=($langs->trans("DIRECTION")=='rtl'?'left':'right');
diff --git a/htdocs/core/get_menudiv.php b/htdocs/core/get_menudiv.php
index fd80124e7df..0e2f0bcb7c3 100644
--- a/htdocs/core/get_menudiv.php
+++ b/htdocs/core/get_menudiv.php
@@ -47,7 +47,6 @@ if (! defined('DISABLE_SELECT2'))           define('DISABLE_SELECT2',1);
 
 require_once '../main.inc.php';
 
-if (GETPOST('lang')) $langs->setDefaultLang(GETPOST('lang'));	// If language was forced on URL by the main.inc.php
 $langs->load("main");
 $right=($langs->trans("DIRECTION")=='rtl'?'left':'right');
 $left=($langs->trans("DIRECTION")=='rtl'?'right':'left');
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 63990112be5..06ed76c5008 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -240,7 +240,17 @@ function dol_shutdown()
  *  Return value of a param into GET or POST supervariable
  *
  *  @param	string	$paramname   Name of parameter to found
- *  @param	string	$check	     Type of check (''=no check, 'none'=no check, 'int'=check it's numeric, 'alpha'=check it's text and sign, 'aZ'=check it's a-z only, 'array'=check it's array, 'san_alpha'=Use filter_var with FILTER_SANITIZE_STRING (do not use this for free text string), 'day', 'month', 'year', 'custom'= custom filter specify $filter and $options)
+ *  @param	string	$check	     Type of check
+ *                                  ''=no check (deprecated)
+ *                                  'none'=no check (only for param that should have very rich content)
+ *                                  'int'=check it's numeric
+ *                                  'alpha'=check it's text and sign
+ *                                  'aZ'=check it's a-z only
+ *                                  'aZ09'=check it's simple alpha string (recommended for keys)
+ *                                  'array'=check it's array
+ *                                  'san_alpha'=Use filter_var with FILTER_SANITIZE_STRING (do not use this for free text string)
+ *                                  'nohtml', 'alphanohtml'=check there is no html content
+ *                                  'custom'= custom filter specify $filter and $options)
  *  @param	int		$method	     Type of method (0 = get then post, 1 = only get, 2 = only post, 3 = post then get, 4 = post then get then cookie)
  *  @param  int     $filter      Filter to apply when $check is set to 'custom'. (See http://php.net/manual/en/filter.filters.php for détails)
  *  @param  mixed   $options     Options to pass to filter_var when $check is set to 'custom'.
@@ -317,9 +327,14 @@ function GETPOST($paramname, $check='', $method=0, $filter=NULL, $options=NULL)
 	    }
 	}	
 	
+	if (empty($check) && $conf->global->MAIN_FEATURES_LEVEL > 0)
+	{
+	   dol_syslog("A GETPOST is called with 1st param = ".$paramname." and 2nd param not defined, when calling page ".$_SERVER["PHP_SELF"], LOG_WARNING);    
+	}
+	
 	if (! empty($check))
 	{
-	    // Replace vars like __DAY__, __MONTH__, __YEAR__, __MYCOUNTRYID__, __USERID__, __ENTITYID__
+	    // Replace vars like __DAY__, __MONTH__, __YEAR__, __MYCOUNTRYID__, __USERID__, __ENTITYID__, ...
 	    if (! is_array($out))
 	    {
 	        $maxloop=20; $loopnb=0;    // Protection against infinite loop
@@ -358,8 +373,11 @@ function GETPOST($paramname, $check='', $method=0, $filter=NULL, $options=NULL)
 	        }
 	    }
 
+	    // Check is done after replacement
 	    switch ($check)
 	    {
+	        case 'none':
+	            break;
 	        case 'int':
 	            if (! is_numeric($out)) { $out=''; }
 	            break;
diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php
index 7870824285a..ccc8a68a5d9 100644
--- a/htdocs/core/lib/security.lib.php
+++ b/htdocs/core/lib/security.lib.php
@@ -98,7 +98,7 @@ function dol_hash($chain,$type=0)
 
 /**
  *	Check permissions of a user to show a page and an object. Check read permission.
- * 	If GETPOST('action') defined, we also check write and delete permission.
+ * 	If GETPOST('action','aZ09') defined, we also check write and delete permission.
  *
  *	@param	User	$user      	  	User to check
  *	@param  string	$features	    Features to check (it must be module name. Examples: 'societe', 'contact', 'produit&service', 'produit|service', ...)
@@ -207,7 +207,7 @@ function restrictedArea($user, $features, $objectid=0, $tableandshare='', $featu
 
     // Check write permission from module
     $createok=1; $nbko=0;
-    if (GETPOST("action")  == 'create')
+    if (GETPOST('action','aZ09')  == 'create')
     {
         foreach ($featuresarray as $feature)
         {
@@ -262,7 +262,7 @@ function restrictedArea($user, $features, $objectid=0, $tableandshare='', $featu
 
     // Check create user permission
     $createuserok=1;
-    if (GETPOST("action") == 'confirm_create_user' && GETPOST("confirm") == 'yes')
+    if (GETPOST('action','aZ09') == 'confirm_create_user' && GETPOST("confirm") == 'yes')
     {
         if (! $user->rights->user->user->creer) $createuserok=0;
 
@@ -272,7 +272,7 @@ function restrictedArea($user, $features, $objectid=0, $tableandshare='', $featu
 
     // Check delete permission from module
     $deleteok=1; $nbko=0;
-    if ((GETPOST("action")  == 'confirm_delete' && GETPOST("confirm") == 'yes') || GETPOST("action")  == 'delete')
+    if ((GETPOST('action','aZ09')  == 'confirm_delete' && GETPOST("confirm") == 'yes') || GETPOST('action','aZ09')  == 'delete')
     {
         foreach ($featuresarray as $feature)
         {
diff --git a/htdocs/core/lib/security2.lib.php b/htdocs/core/lib/security2.lib.php
index a14645a3152..b6b8d4ddd72 100644
--- a/htdocs/core/lib/security2.lib.php
+++ b/htdocs/core/lib/security2.lib.php
@@ -155,7 +155,7 @@ function dol_loginfunction($langs,$conf,$mysoc)
 	$titletruedolibarrversion=constant('DOL_VERSION');	// $title used by login template after the @ to inform of true Dolibarr version
 
 	// Note: $conf->css looks like '/theme/eldy/style.css.php'
-	$conf->css = "/theme/".(GETPOST('theme')?GETPOST('theme','alpha'):$conf->theme)."/style.css.php";
+	$conf->css = "/theme/".(GETPOST('theme','alpha')?GETPOST('theme','alpha'):$conf->theme)."/style.css.php";
 	//$themepath=dol_buildpath((empty($conf->global->MAIN_FORCETHEMEDIR)?'':$conf->global->MAIN_FORCETHEMEDIR).$conf->css,1);
 	$themepath=dol_buildpath($conf->css,1);
 	if (! empty($conf->modules_parts['theme']))		// Using this feature slow down application
diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php
index 797af488f46..2cea718dcc0 100644
--- a/htdocs/core/lib/usergroups.lib.php
+++ b/htdocs/core/lib/usergroups.lib.php
@@ -417,7 +417,7 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
     					$file=$dirtheme."/".$subdir."/thumb.png";
     					$url=$urltheme."/".$subdir."/thumb.png";
     					if (! file_exists($file)) $url=DOL_URL_ROOT.'/public/theme/common/nophoto.png';
-    					print '<a href="'.$_SERVER["PHP_SELF"].($edit?'?action=edit&theme=':'?theme=').$subdir.(GETPOST("optioncss")?'&optioncss='.GETPOST("optioncss",'alpha',1):'').($fuser?'&id='.$fuser->id:'').'" style="font-weight: normal;" alt="'.$langs->trans("Preview").'">';
+    					print '<a href="'.$_SERVER["PHP_SELF"].($edit?'?action=edit&theme=':'?theme=').$subdir.(GETPOST('optioncss','alpha',1)?'&optioncss='.GETPOST('optioncss','alpha',1):'').($fuser?'&id='.$fuser->id:'').'" style="font-weight: normal;" alt="'.$langs->trans("Preview").'">';
     					if ($subdir == $conf->global->MAIN_THEME) $title=$langs->trans("ThemeCurrentlyActive");
     					else $title=$langs->trans("ShowPreview");
     					print '<img src="'.$url.'" border="0" width="80" height="60" alt="'.$title.'" title="'.$title.'" style="margin-bottom: 5px;">';
diff --git a/htdocs/core/menus/standard/auguria.lib.php b/htdocs/core/menus/standard/auguria.lib.php
index d2d8e36b8ca..7272eb000d4 100644
--- a/htdocs/core/menus/standard/auguria.lib.php
+++ b/htdocs/core/menus/standard/auguria.lib.php
@@ -53,7 +53,7 @@ function print_auguria_menu($db,$atarget,$type_user,&$tabMenu,&$menu,$noout=0,$m
 
 	if (empty($noout)) print_start_menu_array_auguria();
 
-	$usemenuhider = (GETPOST('testmenuhider') || ! empty($conf->global->MAIN_TESTMENUHIDER));
+	$usemenuhider = (GETPOST('testmenuhider','int') || ! empty($conf->global->MAIN_TESTMENUHIDER));
 	
 	// Show/Hide vertical menu
 	if ($mode != 'jmobile' && $mode != 'topnb' && $usemenuhider && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
@@ -248,7 +248,7 @@ function print_left_auguria_menu($db,$menu_array_before,$menu_array_after,&$tabM
 	$mainmenu=($forcemainmenu?$forcemainmenu:$_SESSION["mainmenu"]);
 	$leftmenu=($forceleftmenu?'':(empty($_SESSION["leftmenu"])?'none':$_SESSION["leftmenu"]));
 
-	$usemenuhider = (GETPOST('testmenuhider') || ! empty($conf->global->MAIN_TESTMENUHIDER));
+	$usemenuhider = (GETPOST('testmenuhider','int') || ! empty($conf->global->MAIN_TESTMENUHIDER));
 	global $usemenuhider;
 	
 	// Show logo company
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index b7a372e50bd..4aa5064977d 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -51,7 +51,7 @@ function print_eldy_menu($db,$atarget,$type_user,&$tabMenu,&$menu,$noout=0,$mode
 
 	if (empty($noout)) print_start_menu_array();
 
-	$usemenuhider = (GETPOST('testmenuhider') || ! empty($conf->global->MAIN_TESTMENUHIDER));
+	$usemenuhider = (GETPOST('testmenuhider','int') || ! empty($conf->global->MAIN_TESTMENUHIDER));
 	
 	// Show/Hide vertical menu
 	if ($mode != 'jmobile' && $mode != 'topnb' && $usemenuhider && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
@@ -458,7 +458,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 	$mainmenu=($forcemainmenu?$forcemainmenu:$_SESSION["mainmenu"]);
 	$leftmenu=($forceleftmenu?'':(empty($_SESSION["leftmenu"])?'none':$_SESSION["leftmenu"]));
 
-	$usemenuhider = (GETPOST('testmenuhider') || ! empty($conf->global->MAIN_TESTMENUHIDER));
+	$usemenuhider = (GETPOST('testmenuhider','int') || ! empty($conf->global->MAIN_TESTMENUHIDER));
 	
 	// Show logo company
 	if (empty($conf->global->MAIN_MENU_INVERT) && empty($noout) && ! empty($conf->global->MAIN_SHOW_LOGO) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
diff --git a/htdocs/core/menus/standard/empty.php b/htdocs/core/menus/standard/empty.php
index 9a98fa4ffa4..501216ec860 100644
--- a/htdocs/core/menus/standard/empty.php
+++ b/htdocs/core/menus/standard/empty.php
@@ -93,7 +93,7 @@ class MenuManager
 			$classname='class="tmenusel"';
 
 			// Show/Hide vertical menu
-			if ($mode != 'jmobile' && $mode != 'topnb' && (GETPOST('testmenuhider') || ! empty($conf->global->MAIN_TESTMENUHIDER)) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+			if ($mode != 'jmobile' && $mode != 'topnb' && (GETPOST('testmenuhider','int') || ! empty($conf->global->MAIN_TESTMENUHIDER)) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
 			{
 			    $showmode=1;
 			    $classname = 'class="tmenu menuhider"';
diff --git a/htdocs/core/search_page.php b/htdocs/core/search_page.php
index ffbad81a30f..36f1e29e558 100644
--- a/htdocs/core/search_page.php
+++ b/htdocs/core/search_page.php
@@ -35,7 +35,6 @@ if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU',1);
 
 require_once '../main.inc.php';
 
-if (GETPOST('lang')) $langs->setDefaultLang(GETPOST('lang'));	// If language was forced on URL by the main.inc.php
 $langs->load("main");
 $right=($langs->trans("DIRECTION")=='rtl'?'left':'right');
 $left=($langs->trans("DIRECTION")=='rtl'?'right':'left');
diff --git a/htdocs/core/tpl/ajaxrow.tpl.php b/htdocs/core/tpl/ajaxrow.tpl.php
index 0708ae07a51..96be9b49196 100644
--- a/htdocs/core/tpl/ajaxrow.tpl.php
+++ b/htdocs/core/tpl/ajaxrow.tpl.php
@@ -31,7 +31,7 @@ $forcereloadpage=empty($conf->global->MAIN_FORCE_RELOAD_PAGE)?0:1;
 $tagidfortablednd=(empty($tagidfortablednd)?'tablelines':$tagidfortablednd);
 $filepath=(empty($filepath)?'':$filepath);
 
-if (GETPOST('action') != 'editline' && $nboflines > 1) { ?>
+if (GETPOST('action','aZ09') != 'editline' && $nboflines > 1) { ?>
 <script type="text/javascript">
 $(document).ready(function(){
 	$(".imgupforline").hide();
diff --git a/htdocs/core/tpl/notes.tpl.php b/htdocs/core/tpl/notes.tpl.php
index 01d0ba7b33c..2538e052ae4 100644
--- a/htdocs/core/tpl/notes.tpl.php
+++ b/htdocs/core/tpl/notes.tpl.php
@@ -31,7 +31,7 @@ $value_private=$object->note_private;
 if (! empty($conf->global->MAIN_AUTO_TIMESTAMP_IN_PUBLIC_NOTES))
 {
 	$stringtoadd=dol_print_date(dol_now(), 'dayhour').' '.$user->getFullName($langs).' --';
-	if (GETPOST('action') == 'edit'.$note_public)
+	if (GETPOST('action','aZ09') == 'edit'.$note_public)
 	{
 		$value_public=dol_concatdesc($value_public, ($value_public?"\n":"")."-- ".$stringtoadd);
 		if (dol_textishtml($value_public)) $value_public.="<br>\n";
@@ -41,7 +41,7 @@ if (! empty($conf->global->MAIN_AUTO_TIMESTAMP_IN_PUBLIC_NOTES))
 if (! empty($conf->global->MAIN_AUTO_TIMESTAMP_IN_PRIVATE_NOTES))
 {
 	$stringtoadd=dol_print_date(dol_now(), 'dayhour').' '.$user->getFullName($langs).' --';
-	if (GETPOST('action') == 'edit'.$note_private)
+	if (GETPOST('action','aZ09') == 'edit'.$note_private)
 	{
 		$value_private=dol_concatdesc($value_private, ($value_private?"\n":"")."-- ".$stringtoadd);
 		if (dol_textishtml($value_private)) $value_private.="<br>\n";
diff --git a/htdocs/document.php b/htdocs/document.php
index 4e4f18826ef..46e27d57a67 100644
--- a/htdocs/document.php
+++ b/htdocs/document.php
@@ -61,7 +61,7 @@ $action=GETPOST('action','alpha');
 $original_file=GETPOST('file','alpha');	// Do not use urldecode here ($_GET are already decoded by PHP).
 $modulepart=GETPOST('modulepart','alpha');
 $urlsource=GETPOST('urlsource','alpha');
-$entity=GETPOST('entity')?GETPOST('entity','int'):$conf->entity;
+$entity=GETPOST('entity','int')?GETPOST('entity','int'):$conf->entity;
 
 // Security check
 if (empty($modulepart)) accessforbidden('Bad value for parameter modulepart');
@@ -95,7 +95,7 @@ else $type=dol_mimetype($original_file);
 // Define attachment (attachment=true to force choice popup 'open'/'save as')
 $attachment = true;
 if (preg_match('/\.(html|htm)$/i',$original_file)) $attachment = false;
-if (isset($_GET["attachment"])) $attachment = GETPOST("attachment")?true:false;
+if (isset($_GET["attachment"])) $attachment = GETPOST("attachment",'alpha')?true:false;
 if (! empty($conf->global->MAIN_DISABLE_FORCE_SAVEAS)) $attachment=false;
 
 // Security: Delete string ../ into $original_file
diff --git a/htdocs/don/payment/card.php b/htdocs/don/payment/card.php
index 2e7d2a001fd..436b449b446 100644
--- a/htdocs/don/payment/card.php
+++ b/htdocs/don/payment/card.php
@@ -34,7 +34,7 @@ $langs->load('companies');
 
 // Security check
 $id=GETPOST('rowid')?GETPOST('rowid','int'):GETPOST('id','int');
-$action=GETPOST("action");
+$action=GETPOST('action','aZ09');
 $confirm=GETPOST('confirm');
 if ($user->societe_id) $socid=$user->societe_id;
 // TODO Add rule to restrict access payment
diff --git a/htdocs/don/payment/payment.php b/htdocs/don/payment/payment.php
index 23526fd926d..fe4197dbc15 100644
--- a/htdocs/don/payment/payment.php
+++ b/htdocs/don/payment/payment.php
@@ -29,7 +29,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 $langs->load("bills");
 
 $chid=GETPOST("rowid");
-$action=GETPOST('action');
+$action=GETPOST('action','aZ09');
 $amounts = array();
 
 // Security check
@@ -154,7 +154,7 @@ $form=new Form($db);
 
 
 // Form to create donation payment
-if (GETPOST("action") == 'create')
+if (GETPOST('action','aZ09') == 'create')
 {
 
 	$don = new Don($db);
diff --git a/htdocs/ecm/docfile.php b/htdocs/ecm/docfile.php
index 3b6455fe4a9..5f40d1bb6f3 100644
--- a/htdocs/ecm/docfile.php
+++ b/htdocs/ecm/docfile.php
@@ -62,7 +62,7 @@ if (! $sortorder) $sortorder="ASC";
 if (! $sortfield) $sortfield="label";
 
 $cancel=GETPOST('cancel');
-$action=GETPOST('action');
+$action=GETPOST('action','aZ09');
 $section=GETPOST("section");
 if (! $section)
 {
@@ -221,7 +221,7 @@ while ($tmpecmdir && $result > 0)
 print img_picto('','object_dir').' <a href="'.DOL_URL_ROOT.'/ecm/index.php">'.$langs->trans("ECMRoot").'</a> -> ';
 print $s;
 print ' -> ';
-if (GETPOST('action') == 'edit') print '<input type="text" name="label" class="quatrevingtpercent" value="'.$urlfile.'">';
+if (GETPOST('action','aZ09') == 'edit') print '<input type="text" name="label" class="quatrevingtpercent" value="'.$urlfile.'">';
 else print $urlfile;
 print '</td></tr>';
 /*print '<tr><td class="tdtop">'.$langs->trans("Description").'</td><td>';
diff --git a/htdocs/ecm/index.php b/htdocs/ecm/index.php
index be0520e9298..edbe7538dfa 100644
--- a/htdocs/ecm/index.php
+++ b/htdocs/ecm/index.php
@@ -49,7 +49,7 @@ $result = restrictedArea($user, 'ecm', 0);
 
 // Get parameters
 $socid=GETPOST('socid','int');
-$action=GETPOST("action");
+$action=GETPOST('action','aZ09');
 $section=GETPOST("section")?GETPOST("section","int"):GETPOST("section_id","int");
 $module=GETPOST("module");
 if (! $section) $section=0;
diff --git a/htdocs/ecm/index_auto.php b/htdocs/ecm/index_auto.php
index 065d14b4593..a605440ff61 100644
--- a/htdocs/ecm/index_auto.php
+++ b/htdocs/ecm/index_auto.php
@@ -49,7 +49,7 @@ $result = restrictedArea($user, 'ecm', 0);
 
 // Get parameters
 $socid=GETPOST('socid','int');
-$action=GETPOST("action");
+$action=GETPOST('action','aZ09');
 $section=GETPOST("section")?GETPOST("section","int"):GETPOST("section_id","int");
 $module=GETPOST("module");
 if (! $section) $section=0;
diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index 9a2433994bd..fe546cd1064 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -45,7 +45,7 @@ $langs->load("trips");
 $langs->load("bills");
 $langs->load("mails");
 
-$action=GETPOST('action');
+$action=GETPOST('action','aZ09');
 $cancel=GETPOST('cancel');
 $confirm = GETPOST('confirm', 'alpha');
 
diff --git a/htdocs/expensereport/payment/card.php b/htdocs/expensereport/payment/card.php
index 4450f1644bf..bc956955258 100644
--- a/htdocs/expensereport/payment/card.php
+++ b/htdocs/expensereport/payment/card.php
@@ -34,7 +34,7 @@ $langs->load('companies');
 
 // Security check
 $id=GETPOST('rowid')?GETPOST('rowid','int'):GETPOST('id','int');
-$action=GETPOST("action");
+$action=GETPOST('action','aZ09');
 $confirm=GETPOST('confirm');
 if ($user->societe_id) $socid=$user->societe_id;
 // TODO Add rule to restrict access payment
diff --git a/htdocs/expensereport/payment/payment.php b/htdocs/expensereport/payment/payment.php
index 82c3fc16e30..40c4fad2513 100644
--- a/htdocs/expensereport/payment/payment.php
+++ b/htdocs/expensereport/payment/payment.php
@@ -31,7 +31,7 @@ $langs->load("bills");
 $langs->load("banks");
 
 $chid=GETPOST("id");
-$action=GETPOST('action');
+$action=GETPOST('action','aZ09');
 $amounts = array();
 $accountid=GETPOST('accountid','int');
 
@@ -174,7 +174,7 @@ $form=new Form($db);
 
 
 // Form to create expense report payment
-if (GETPOST("action") == 'create')
+if (GETPOST('action','aZ09') == 'create')
 {
 	$expensereport = new ExpenseReport($db);
 	$expensereport->fetch($chid);
diff --git a/htdocs/externalsite/frames.php b/htdocs/externalsite/frames.php
index c0b5cf92e7e..adf9d547073 100644
--- a/htdocs/externalsite/frames.php
+++ b/htdocs/externalsite/frames.php
@@ -38,7 +38,7 @@ $mainmenu=GETPOST('mainmenu', 'alpha');
 $leftmenu=GETPOST('leftmenu', 'alpha');
 $idmenu=GETPOST('idmenu', 'int');
 $theme=GETPOST('theme', 'alpha');
-$codelang=GETPOST('lang', 'alpha');
+$codelang=GETPOST('lang', 'aZ09');
 
 print "
 <html>
diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php
index 4c2716e311a..6243a9e3a16 100644
--- a/htdocs/fourn/card.php
+++ b/htdocs/fourn/card.php
@@ -44,7 +44,7 @@ $langs->load('bills');
 $langs->load('orders');
 $langs->load('commercial');
 
-$action	= GETPOST('action');
+$action	= GETPOST('action','aZ09');
 $cancelbutton = GETPOST('cancel');
 
 // Security check
diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php
index b7e3830ad5c..e89555a5d50 100644
--- a/htdocs/fourn/commande/dispatch.php
+++ b/htdocs/fourn/commande/dispatch.php
@@ -52,7 +52,7 @@ if (! empty($conf->productbatch->enabled))
 $id = GETPOST("id", 'int');
 $ref = GETPOST('ref');
 $lineid = GETPOST('lineid', 'int');
-$action = GETPOST('action');
+$action = GETPOST('action','aZ09');
 if ($user->societe_id)
 	$socid = $user->societe_id;
 $result = restrictedArea($user, 'fournisseur', $id, '', 'commande');
diff --git a/htdocs/fourn/commande/note.php b/htdocs/fourn/commande/note.php
index 35384db0ee5..a3334baa5d9 100644
--- a/htdocs/fourn/commande/note.php
+++ b/htdocs/fourn/commande/note.php
@@ -35,7 +35,7 @@ $langs->load('stocks');
 
 $id = GETPOST('facid','int')?GETPOST('facid','int'):GETPOST('id','int');
 $ref = GETPOST('ref');
-$action = GETPOST('action');
+$action = GETPOST('action','aZ09');
 
 // Security check
 if ($user->societe_id) $socid=$user->societe_id;
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index f930ad87979..c0851a44b6f 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -61,7 +61,7 @@ if (!empty($conf->incoterm->enabled)) $langs->load('incoterm');
 
 $id			= (GETPOST('facid','int') ? GETPOST('facid','int') : GETPOST('id','int'));
 $socid		= GETPOST('socid', 'int');
-$action		= GETPOST("action");
+$action		= GETPOST('action','aZ09');
 $confirm	= GETPOST("confirm");
 $ref		= GETPOST('ref','alpha');
 $cancel		= GETPOST('cancel','alpha');
diff --git a/htdocs/fourn/facture/rapport.php b/htdocs/fourn/facture/rapport.php
index a7241a1ecf4..f2bb499d652 100644
--- a/htdocs/fourn/facture/rapport.php
+++ b/htdocs/fourn/facture/rapport.php
@@ -31,7 +31,7 @@ $socid='';
 if (! empty($user->societe_id)) $socid=$user->societe_id;
 $result = restrictedArea($user, 'fournisseur', $id, 'facture_fourn', 'facture');
 
-$action=GETPOST('action');
+$action=GETPOST('action','aZ09');
 
 $socid=0;
 if ($user->societe_id > 0)
diff --git a/htdocs/ftp/index.php b/htdocs/ftp/index.php
index c8ba7c6b786..5b9dc94172b 100644
--- a/htdocs/ftp/index.php
+++ b/htdocs/ftp/index.php
@@ -37,7 +37,7 @@ if ($user->societe_id) $socid=$user->societe_id;
 $result = restrictedArea($user, 'ftp','');
 
 // Get parameters
-$action=GETPOST('action');
+$action=GETPOST('action','aZ09');
 $section=GETPOST('section');
 if (! $section) $section='/';
 $numero_ftp = GETPOST("numero_ftp");
diff --git a/htdocs/holiday/define_holiday.php b/htdocs/holiday/define_holiday.php
index 804ad55e10a..e1b8b21a7bd 100644
--- a/htdocs/holiday/define_holiday.php
+++ b/htdocs/holiday/define_holiday.php
@@ -36,7 +36,7 @@ if ($user->societe_id > 0) accessforbidden();
 // If the user does not have perm to read the page
 if(!$user->rights->holiday->read) accessforbidden();
 
-$action=GETPOST('action');
+$action=GETPOST('action','aZ09');
 
 $holiday = new Holiday($db);
 
diff --git a/htdocs/index.php b/htdocs/index.php
index 5ab2fa68cd4..d2da24471d8 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -31,7 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 
 // If not defined, we select menu "home"
 $_GET['mainmenu']=GETPOST('mainmenu', 'aZ09')?GETPOST('mainmenu', 'aZ09'):'home';
-$action=GETPOST('action');
+$action=GETPOST('action','aZ09');
 
 $hookmanager->initHooks(array('index'));
 
diff --git a/htdocs/install/repair.php b/htdocs/install/repair.php
index 93597451f21..a70553cbfb0 100644
--- a/htdocs/install/repair.php
+++ b/htdocs/install/repair.php
@@ -63,7 +63,7 @@ if (! is_object($conf)) dolibarr_install_syslog("repair: conf file not initializ
  * View
 */
 
-pHeader('',"upgrade2",GETPOST('action'));
+pHeader('',"upgrade2",GETPOST('action','aZ09'));
 
 $actiondone=0;
 
diff --git a/htdocs/install/step2.php b/htdocs/install/step2.php
index d5fb1bbfd05..baceee5f7eb 100644
--- a/htdocs/install/step2.php
+++ b/htdocs/install/step2.php
@@ -42,7 +42,7 @@ error_reporting(0);		// Disable all errors
 @set_time_limit(900);	// Need 900 on some OS like Windows 7/64
 error_reporting($err);
 
-$action=GETPOST('action');
+$action=GETPOST('action','aZ09');
 $setuplang=(GETPOST('selectlang','',3)?GETPOST('selectlang','',3):'auto');
 $langs->setDefaultLang($setuplang);
 
diff --git a/htdocs/install/upgrade.php b/htdocs/install/upgrade.php
index ec363646708..96853887f81 100644
--- a/htdocs/install/upgrade.php
+++ b/htdocs/install/upgrade.php
@@ -97,12 +97,12 @@ if (! $versionfrom && ! $versionto)
 }
 
 
-pHeader('',"upgrade2",GETPOST('action'),'versionfrom='.$versionfrom.'&versionto='.$versionto);
+pHeader('',"upgrade2",GETPOST('action','aZ09'),'versionfrom='.$versionfrom.'&versionto='.$versionto);
 
 $actiondone=0;
 
 // Action to launch the migrate script
-if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action')))
+if (! GETPOST('action','aZ09') || preg_match('/upgrade/i',GETPOST('action','aZ09')))
 {
     $actiondone=1;
 
diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index f535bf27ebd..4646c3b6eb9 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -101,10 +101,10 @@ if ((! $versionfrom || preg_match('/version/', $versionfrom)) && (! $versionto |
 	exit;
 }
 
-pHeader('','step5',GETPOST("action")?GETPOST("action"):'upgrade','versionfrom='.$versionfrom.'&versionto='.$versionto);
+pHeader('','step5',GETPOST('action','aZ09')?GETPOST('action','aZ09'):'upgrade','versionfrom='.$versionfrom.'&versionto='.$versionto);
 
 
-if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action')))
+if (! GETPOST('action','aZ09') || preg_match('/upgrade/i',GETPOST('action','aZ09')))
 {
     print '<h3>'.$langs->trans('DataMigration').'</h3>';
 
diff --git a/htdocs/loan/card.php b/htdocs/loan/card.php
index 92961b9a7d1..b58bfb929d9 100644
--- a/htdocs/loan/card.php
+++ b/htdocs/loan/card.php
@@ -36,7 +36,7 @@ $langs->load("bills");
 $langs->load("loan");
 
 $id=GETPOST('id','int');
-$action=GETPOST('action');
+$action=GETPOST('action','aZ09');
 $confirm=GETPOST('confirm');
 $cancel=GETPOST('cancel','alpha');
 
diff --git a/htdocs/loan/document.php b/htdocs/loan/document.php
index e6446e366fa..f4f490a146a 100644
--- a/htdocs/loan/document.php
+++ b/htdocs/loan/document.php
@@ -35,7 +35,7 @@ $langs->load("bills");
 $langs->load("loan");
 
 $id = GETPOST('id','int');
-$action = GETPOST("action");
+$action = GETPOST('action','aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 
 // Security check
diff --git a/htdocs/loan/info.php b/htdocs/loan/info.php
index f61b9312432..73bb1c1f984 100644
--- a/htdocs/loan/info.php
+++ b/htdocs/loan/info.php
@@ -31,7 +31,7 @@ $langs->load("bills");
 $langs->load("loan");
 
 $id=GETPOST('id','int');
-$action=GETPOST("action");
+$action=GETPOST('action','aZ09');
 
 // Security check
 $socid = GETPOST('socid','int');
diff --git a/htdocs/loan/note.php b/htdocs/loan/note.php
index e28320470a2..4b76cad1d6d 100644
--- a/htdocs/loan/note.php
+++ b/htdocs/loan/note.php
@@ -30,7 +30,7 @@ require '../main.inc.php';
 require_once(DOL_DOCUMENT_ROOT.'/loan/class/loan.class.php');
 require_once DOL_DOCUMENT_ROOT.'/core/lib/loan.lib.php';
 
-$action = GETPOST('action');
+$action = GETPOST('action','aZ09');
 
 $langs->load('loan');
 
diff --git a/htdocs/loan/payment/card.php b/htdocs/loan/payment/card.php
index 5a9558222dc..206e3e64de7 100644
--- a/htdocs/loan/payment/card.php
+++ b/htdocs/loan/payment/card.php
@@ -33,7 +33,7 @@ $langs->load('loan');
 
 // Security check
 $id=GETPOST("id",'int');
-$action=GETPOST("action");
+$action=GETPOST('action','aZ09');
 $confirm=GETPOST('confirm');
 if ($user->societe_id) $socid=$user->societe_id;
 // TODO ajouter regle pour restreindre acces paiement
diff --git a/htdocs/loan/payment/payment.php b/htdocs/loan/payment/payment.php
index 8c7a0af6cef..dc927035954 100644
--- a/htdocs/loan/payment/payment.php
+++ b/htdocs/loan/payment/payment.php
@@ -31,7 +31,7 @@ $langs->load("bills");
 $langs->load("loan");
 
 $chid=GETPOST('id','int');
-$action=GETPOST('action');
+$action=GETPOST('action','aZ09');
 $cancel=GETPOST('cancel','alpha');
 
 // Security check
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index c6bf910a8af..c2b99f22c1f 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -307,7 +307,7 @@ if (! defined('NOTOKENRENEWAL'))
 }
 if (! defined('NOCSRFCHECK') && empty($dolibarr_nocsrfcheck) && ! empty($conf->global->MAIN_SECURITY_CSRF_WITH_TOKEN))	// Check validity of token, only if option enabled (this option breaks some features sometimes)
 {
-    if ($_SERVER['REQUEST_METHOD'] == 'POST' && ! GETPOST('token')) // Note, offender can still send request by GET
+    if ($_SERVER['REQUEST_METHOD'] == 'POST' && ! GETPOST('token','alpha')) // Note, offender can still send request by GET
     {
         print "Access refused by CSRF protection in main.inc.php. Token not provided.\n";
         print "If you access your server behind a proxy using url rewriting, you might check that all HTTP header is propagated (or add the line \$dolibarr_nocsrfcheck=1 into your conf.php file).\n";
@@ -317,7 +317,7 @@ if (! defined('NOCSRFCHECK') && empty($dolibarr_nocsrfcheck) && ! empty($conf->g
     {
         if (GETPOST('token', 'alpha') != $_SESSION['token'])
         {
-            dol_syslog("Invalid token in ".$_SERVER['HTTP_REFERER'].", action=".GETPOST('action').", _POST['token']=".GETPOST('token').", _SESSION['token']=".$_SESSION['token'], LOG_WARNING);
+            dol_syslog("Invalid token in ".$_SERVER['HTTP_REFERER'].", action=".GETPOST('action','aZ09').", _POST['token']=".GETPOST('token','alpha').", _SESSION['token']=".$_SESSION['token'], LOG_WARNING);
             //print 'Unset POST by CSRF protection in main.inc.php.';	// Do not output anything because this create problems when using the BACK button on browsers.
             unset($_POST);
         }
@@ -325,7 +325,7 @@ if (! defined('NOCSRFCHECK') && empty($dolibarr_nocsrfcheck) && ! empty($conf->g
 }
 
 // Disable modules (this must be after session_start and after conf has been loaded)
-if (GETPOST('disablemodules'))  $_SESSION["disablemodules"]=GETPOST('disablemodules');
+if (GETPOST('disablemodules','alpha'))  $_SESSION["disablemodules"]=GETPOST('disablemodules','alpha');
 if (! empty($_SESSION["disablemodules"]))
 {
     $disabled_modules=explode(',',$_SESSION["disablemodules"]);
@@ -448,7 +448,7 @@ if (! defined('NOLOGIN'))
         }
 
         $usertotest		= (! empty($_COOKIE['login_dolibarr']) ? $_COOKIE['login_dolibarr'] : GETPOST("username","alpha",2));
-        $passwordtotest	= GETPOST('password','',2);
+        $passwordtotest	= GETPOST('password','none',2);
         $entitytotest	= (GETPOST('entity','int') ? GETPOST('entity','int') : (!empty($conf->entity) ? $conf->entity : 1));
 
         // Validation of login/pass/entity
@@ -463,7 +463,7 @@ if (! defined('NOLOGIN'))
         {
             include_once DOL_DOCUMENT_ROOT.'/core/class/translate.class.php';
             $langs=new Translate("",$conf);
-    		$langcode=(GETPOST('lang')?GETPOST('lang','alpha',1):(empty($conf->global->MAIN_LANG_DEFAULT)?'auto':$conf->global->MAIN_LANG_DEFAULT));
+    		$langcode=(GETPOST('lang','aZ09',1)?GETPOST('lang','aZ09',1):(empty($conf->global->MAIN_LANG_DEFAULT)?'auto':$conf->global->MAIN_LANG_DEFAULT));
         	$langs->setDefaultLang($langcode);
         }
 
@@ -575,9 +575,9 @@ if (! defined('NOLOGIN'))
 	        if ($reshook < 0) $error++;
 
 	        $paramsurl=array();
-	        if (GETPOST('textbrowser')) $paramsurl[]='textbrowser='.GETPOST('textbrowser','int');
-	        if (GETPOST('nojs')) $paramsurl[]='nojs='.GETPOST('nojs','int');
-	        if (GETPOST('lang')) $paramsurl[]='lang='.GETPOST('lang','alpha');
+	        if (GETPOST('textbrowser','int')) $paramsurl[]='textbrowser='.GETPOST('textbrowser','int');
+	        if (GETPOST('nojs','int'))        $paramsurl[]='nojs='.GETPOST('nojs','int');
+	        if (GETPOST('lang','aZ09'))       $paramsurl[]='lang='.GETPOST('lang','aZ09');
             header('Location: '.DOL_URL_ROOT.'/index.php'.(count($paramsurl)?'?'.implode('&',$paramsurl):''));
             exit;
         }
@@ -635,9 +635,9 @@ if (! defined('NOLOGIN'))
 	        if ($reshook < 0) $error++;
 
 	        $paramsurl=array();
-	        if (GETPOST('textbrowser')) $paramsurl[]='textbrowser='.GETPOST('textbrowser','int');
-	        if (GETPOST('nojs')) $paramsurl[]='nojs='.GETPOST('nojs','int');
-	        if (GETPOST('lang')) $paramsurl[]='lang='.GETPOST('lang','alpha');
+	        if (GETPOST('textbrowser','int')) $paramsurl[]='textbrowser='.GETPOST('textbrowser','int');
+	        if (GETPOST('nojs','int'))        $paramsurl[]='nojs='.GETPOST('nojs','int');
+	        if (GETPOST('lang','aZ09'))       $paramsurl[]='lang='.GETPOST('lang','aZ09');
             header('Location: '.DOL_URL_ROOT.'/index.php'.(count($paramsurl)?'?'.implode('&',$paramsurl):''));
             exit;
         }
@@ -761,7 +761,7 @@ if (! defined('NOLOGIN'))
 }
 
 // Case forcing style from url
-if (GETPOST('theme'))
+if (GETPOST('theme','alpha'))
 {
 	$conf->theme=GETPOST('theme','alpha',1);
 	$conf->css  = "/theme/".$conf->theme."/style.css.php";
@@ -769,7 +769,7 @@ if (GETPOST('theme'))
 
 
 // Set javascript option
-if (! GETPOST('nojs'))   // If javascript was not disabled on URL
+if (! GETPOST('nojs','int'))   // If javascript was not disabled on URL
 {
 	if (! empty($user->conf->MAIN_DISABLE_JAVASCRIPT))
 	{
@@ -778,17 +778,17 @@ if (! GETPOST('nojs'))   // If javascript was not disabled on URL
 }
 else $conf->use_javascript_ajax=0;
 // Set MAIN_OPTIMIZEFORTEXTBROWSER
-if (GETPOST('textbrowser') || (! empty($conf->browser->name) && $conf->browser->name == 'lynxlinks') || ! empty($user->conf->MAIN_OPTIMIZEFORTEXTBROWSER))   // If we must enable text browser
+if (GETPOST('textbrowser','int') || (! empty($conf->browser->name) && $conf->browser->name == 'lynxlinks') || ! empty($user->conf->MAIN_OPTIMIZEFORTEXTBROWSER))   // If we must enable text browser
 {
     $conf->global->MAIN_OPTIMIZEFORTEXTBROWSER=1;
 }
 
 // Set terminal output option according to conf->browser.
-if (GETPOST('dol_hide_leftmenu') || ! empty($_SESSION['dol_hide_leftmenu']))               $conf->dol_hide_leftmenu=1;
-if (GETPOST('dol_hide_topmenu') || ! empty($_SESSION['dol_hide_topmenu']))                 $conf->dol_hide_topmenu=1;
-if (GETPOST('dol_optimize_smallscreen') || ! empty($_SESSION['dol_optimize_smallscreen'])) $conf->dol_optimize_smallscreen=1;
-if (GETPOST('dol_no_mouse_hover') || ! empty($_SESSION['dol_no_mouse_hover']))             $conf->dol_no_mouse_hover=1;
-if (GETPOST('dol_use_jmobile') || ! empty($_SESSION['dol_use_jmobile']))                   $conf->dol_use_jmobile=1;
+if (GETPOST('dol_hide_leftmenu','int') || ! empty($_SESSION['dol_hide_leftmenu']))               $conf->dol_hide_leftmenu=1;
+if (GETPOST('dol_hide_topmenu','int') || ! empty($_SESSION['dol_hide_topmenu']))                 $conf->dol_hide_topmenu=1;
+if (GETPOST('dol_optimize_smallscreen','int') || ! empty($_SESSION['dol_optimize_smallscreen'])) $conf->dol_optimize_smallscreen=1;
+if (GETPOST('dol_no_mouse_hover','int') || ! empty($_SESSION['dol_no_mouse_hover']))             $conf->dol_no_mouse_hover=1;
+if (GETPOST('dol_use_jmobile','int') || ! empty($_SESSION['dol_use_jmobile']))                   $conf->dol_use_jmobile=1;
 if (! empty($conf->browser->layout) && $conf->browser->layout != 'classic') $conf->dol_no_mouse_hover=1;
 if ((! empty($conf->browser->layout) && $conf->browser->layout == 'phone')
 	|| (! empty($_SESSION['dol_screenwidth']) && $_SESSION['dol_screenwidth'] < 400)
@@ -809,7 +809,7 @@ if (! empty($conf->dol_use_jmobile) && in_array($conf->theme,array('bureau2crea'
 
 if (! defined('NOREQUIRETRAN'))
 {
-    if (! GETPOST('lang'))	// If language was not forced on URL
+    if (! GETPOST('lang','aZ09'))	// If language was not forced on URL
     {
         // If user has chosen its own language
         if (! empty($user->conf->MAIN_LANG_DEFAULT))
@@ -909,7 +909,7 @@ if (! defined('NOREQUIREMENU'))
 
 	// Load the menu manager (only if not already done)
 	$file_menu=$conf->standard_menu;
-	if (GETPOST('menu')) $file_menu=GETPOST('menu');     // example: menu=eldy_menu.php
+	if (GETPOST('menu','alpha')) $file_menu=GETPOST('menu','alpha');     // example: menu=eldy_menu.php
 	if (! class_exists('MenuManager'))
 	{
 		$menufound=0;
@@ -1034,7 +1034,7 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
     if (empty($disablehead))
     {
         print "<head>\n";
-		if (GETPOST('dol_basehref')) print '<base href="'.dol_escape_htmltag(GETPOST('dol_basehref')).'">'."\n";
+		if (GETPOST('dol_basehref','alpha')) print '<base href="'.dol_escape_htmltag(GETPOST('dol_basehref','alpha')).'">'."\n";
         // Displays meta
         print '<meta name="robots" content="noindex'.($disablenofollow?'':',nofollow').'">'."\n";      				// Do not index
         print '<meta name="viewport" content="width=device-width, initial-scale=1.0">';	// Scale for mobile device
@@ -1043,9 +1043,9 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
 		$favicon=dol_buildpath('/theme/'.$conf->theme.'/img/favicon.ico',1);
         if (! empty($conf->global->MAIN_FAVICON_URL)) $favicon=$conf->global->MAIN_FAVICON_URL;
         print '<link rel="shortcut icon" type="image/x-icon" href="'.$favicon.'"/>'."\n";
-        //if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && ! GETPOST('textbrowser')) print '<link rel="top" title="'.$langs->trans("Home").'" href="'.(DOL_URL_ROOT?DOL_URL_ROOT:'/').'">'."\n";
-        if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && ! GETPOST('textbrowser')) print '<link rel="copyright" title="GNU General Public License" href="http://www.gnu.org/copyleft/gpl.html#SEC1">'."\n";
-        if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && ! GETPOST('textbrowser')) print '<link rel="author" title="Dolibarr Development Team" href="https://www.dolibarr.org">'."\n";
+        //if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && ! GETPOST('textbrowser','int')) print '<link rel="top" title="'.$langs->trans("Home").'" href="'.(DOL_URL_ROOT?DOL_URL_ROOT:'/').'">'."\n";
+        if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && ! GETPOST('textbrowser','int')) print '<link rel="copyright" title="GNU General Public License" href="http://www.gnu.org/copyleft/gpl.html#SEC1">'."\n";
+        if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && ! GETPOST('textbrowser','int')) print '<link rel="author" title="Dolibarr Development Team" href="https://www.dolibarr.org">'."\n";
 
         // Displays title
         $appli=constant('DOL_APPLICATION_TITLE');
@@ -1059,17 +1059,17 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
         //$ext='';
         //if (! empty($conf->dol_use_jmobile)) $ext='version='.urlencode(DOL_VERSION);
         $ext='version='.urlencode(DOL_VERSION);
-        if (GETPOST('version')) $ext='version='.GETPOST('version','int');	// usefull to force no cache on css/js
-        if (GETPOST('testmenuhider') || ! empty($conf->global->MAIN_TESTMENUHIDER)) $ext.='&testmenuhider='.(GETPOST('testmenuhider')?GETPOST('testmenuhider','int'):$conf->global->MAIN_TESTMENUHIDER);
+        if (GETPOST('version','int')) $ext='version='.GETPOST('version','int');	// usefull to force no cache on css/js
+        if (GETPOST('testmenuhider','int') || ! empty($conf->global->MAIN_TESTMENUHIDER)) $ext.='&testmenuhider='.(GETPOST('testmenuhider','int')?GETPOST('testmenuhider','int'):$conf->global->MAIN_TESTMENUHIDER);
         
-        $themeparam='?lang='.$langs->defaultlang.'&amp;theme='.$conf->theme.(GETPOST('optioncss')?'&amp;optioncss='.GETPOST('optioncss','alpha',1):'').'&amp;userid='.$user->id.'&amp;entity='.$conf->entity;
+        $themeparam='?lang='.$langs->defaultlang.'&amp;theme='.$conf->theme.(GETPOST('optioncss','aZ09')?'&amp;optioncss='.GETPOST('optioncss','aZ09',1):'').'&amp;userid='.$user->id.'&amp;entity='.$conf->entity;
         $themeparam.=($ext?'&amp;'.$ext:'');
         if (! empty($_SESSION['dol_resetcache'])) $themeparam.='&amp;dol_resetcache='.$_SESSION['dol_resetcache'];
-        if (GETPOST('dol_hide_topmenu'))           { $themeparam.='&amp;dol_hide_topmenu='.GETPOST('dol_hide_topmenu','int'); }
-        if (GETPOST('dol_hide_leftmenu'))          { $themeparam.='&amp;dol_hide_leftmenu='.GETPOST('dol_hide_leftmenu','int'); }
-        if (GETPOST('dol_optimize_smallscreen'))   { $themeparam.='&amp;dol_optimize_smallscreen='.GETPOST('dol_optimize_smallscreen','int'); }
-        if (GETPOST('dol_no_mouse_hover'))         { $themeparam.='&amp;dol_no_mouse_hover='.GETPOST('dol_no_mouse_hover','int'); }
-        if (GETPOST('dol_use_jmobile'))            { $themeparam.='&amp;dol_use_jmobile='.GETPOST('dol_use_jmobile','int'); $conf->dol_use_jmobile=GETPOST('dol_use_jmobile','int'); }
+        if (GETPOST('dol_hide_topmenu','int'))           { $themeparam.='&amp;dol_hide_topmenu='.GETPOST('dol_hide_topmenu','int'); }
+        if (GETPOST('dol_hide_leftmenu','int'))          { $themeparam.='&amp;dol_hide_leftmenu='.GETPOST('dol_hide_leftmenu','int'); }
+        if (GETPOST('dol_optimize_smallscreen','int'))   { $themeparam.='&amp;dol_optimize_smallscreen='.GETPOST('dol_optimize_smallscreen','int'); }
+        if (GETPOST('dol_no_mouse_hover','int'))         { $themeparam.='&amp;dol_no_mouse_hover='.GETPOST('dol_no_mouse_hover','int'); }
+        if (GETPOST('dol_use_jmobile','int'))            { $themeparam.='&amp;dol_use_jmobile='.GETPOST('dol_use_jmobile','int'); $conf->dol_use_jmobile=GETPOST('dol_use_jmobile','int'); }
         
         if (! defined('DISABLE_JQUERY') && ! $disablejs && $conf->use_javascript_ajax)
         {
diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php
index 61e51999479..90a4cb70611 100644
--- a/htdocs/master.inc.php
+++ b/htdocs/master.inc.php
@@ -246,7 +246,7 @@ if (! defined('NOREQUIREDB') && ! defined('NOREQUIRESOC'))
 // Set default language (must be after the setValues setting global $conf->global->MAIN_LANG_DEFAULT. Page main.inc.php will overwrite langs->defaultlang with user value later)
 if (! defined('NOREQUIRETRAN'))
 {
-    $langcode=(GETPOST('lang')?GETPOST('lang','alpha',1):(empty($conf->global->MAIN_LANG_DEFAULT)?'auto':$conf->global->MAIN_LANG_DEFAULT));
+    $langcode=(GETPOST('lang','aZ09')?GETPOST('lang','aZ09',1):(empty($conf->global->MAIN_LANG_DEFAULT)?'auto':$conf->global->MAIN_LANG_DEFAULT));
 	$langs->setDefaultLang($langcode);
 }
 
diff --git a/htdocs/opensurvey/card.php b/htdocs/opensurvey/card.php
index bb4d4650344..d7a466a5217 100644
--- a/htdocs/opensurvey/card.php
+++ b/htdocs/opensurvey/card.php
@@ -34,7 +34,7 @@ require_once(DOL_DOCUMENT_ROOT."/opensurvey/fonctions.php");
 if (!$user->rights->opensurvey->read) accessforbidden();
 
 // Initialisation des variables
-$action=GETPOST('action');
+$action=GETPOST('action','aZ09');
 $cancel=GETPOST('cancel');
 
 $numsondage = '';
diff --git a/htdocs/opensurvey/exportcsv.php b/htdocs/opensurvey/exportcsv.php
index 7096ae7ad99..90fd56cd4d1 100644
--- a/htdocs/opensurvey/exportcsv.php
+++ b/htdocs/opensurvey/exportcsv.php
@@ -28,7 +28,7 @@ require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/opensurvey/class/opensurveysondage.class.php");
 
-$action=GETPOST('action');
+$action=GETPOST('action','aZ09');
 $numsondage = '';
 if (GETPOST('id'))
 {
diff --git a/htdocs/opensurvey/list.php b/htdocs/opensurvey/list.php
index 203602bde6e..6f5beaf1277 100644
--- a/htdocs/opensurvey/list.php
+++ b/htdocs/opensurvey/list.php
@@ -30,7 +30,7 @@ require_once(DOL_DOCUMENT_ROOT."/opensurvey/class/opensurveysondage.class.php");
 // Security check
 if (!$user->rights->opensurvey->read) accessforbidden();
 
-$action=GETPOST('action');
+$action=GETPOST('action','aZ09');
 $id=GETPOST('id','alpha');
 $numsondage= $id;
 $search_ref = GETPOST('search_ref', 'alpha');
diff --git a/htdocs/opensurvey/results.php b/htdocs/opensurvey/results.php
index 806609ad7cd..f10e21effe1 100644
--- a/htdocs/opensurvey/results.php
+++ b/htdocs/opensurvey/results.php
@@ -35,7 +35,7 @@ if (!$user->rights->opensurvey->read) accessforbidden();
 
 
 // Init vars
-$action=GETPOST('action');
+$action=GETPOST('action','aZ09');
 $numsondage= GETPOST("id");
 
 $object=new Opensurveysondage($db);
diff --git a/htdocs/product/note.php b/htdocs/product/note.php
index 0178635ed10..74e8f9e4f8f 100644
--- a/htdocs/product/note.php
+++ b/htdocs/product/note.php
@@ -34,7 +34,7 @@ $langs->load("companies");
 
 $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
-$action = GETPOST('action');
+$action = GETPOST('action','aZ09');
 
 // Security check
 $fieldvalue = (! empty($id) ? $id : (! empty($ref) ? $ref : ''));
diff --git a/htdocs/product/stock/card.php b/htdocs/product/stock/card.php
index 95f74352305..665d340f6f9 100644
--- a/htdocs/product/stock/card.php
+++ b/htdocs/product/stock/card.php
@@ -38,7 +38,7 @@ $langs->load("stocks");
 $langs->load("companies");
 $langs->load("categories");
 
-$action=GETPOST('action');
+$action=GETPOST('action','aZ09');
 $cancel=GETPOST('cancel');
 $confirm=GETPOST('confirm');
 
diff --git a/htdocs/product/stock/mouvement.php b/htdocs/product/stock/mouvement.php
index bc4099f66ec..8f512409f03 100644
--- a/htdocs/product/stock/mouvement.php
+++ b/htdocs/product/stock/mouvement.php
@@ -50,7 +50,7 @@ $result=restrictedArea($user,'stock');
 $id=GETPOST('id','int');
 $msid=GETPOST('msid','int');
 $product_id=GETPOST("product_id");
-$action=GETPOST('action');
+$action=GETPOST('action','aZ09');
 $cancel=GETPOST('cancel');
 $idproduct = GETPOST('idproduct','int');
 $year = GETPOST("year");
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index 7c524a167b9..385c4d51ccd 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -51,7 +51,7 @@ $langs->load("sendings");
 if (! empty($conf->productbatch->enabled)) $langs->load("productbatch");
 
 $backtopage=GETPOST('backtopage');
-$action=GETPOST("action");
+$action=GETPOST('action','aZ09');
 $cancel=GETPOST('cancel');
 
 $id=GETPOST('id', 'int');
diff --git a/htdocs/projet/activity/perday.php b/htdocs/projet/activity/perday.php
index c1aa8aaa469..8a3494213cc 100644
--- a/htdocs/projet/activity/perday.php
+++ b/htdocs/projet/activity/perday.php
@@ -35,7 +35,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 
 $langs->load('projects');
 
-$action=GETPOST('action');
+$action=GETPOST('action','aZ09');
 $mode=GETPOST("mode");
 $id=GETPOST('id','int');
 $taskid=GETPOST('taskid');
diff --git a/htdocs/projet/activity/perweek.php b/htdocs/projet/activity/perweek.php
index 905b93393dd..c6949598ade 100644
--- a/htdocs/projet/activity/perweek.php
+++ b/htdocs/projet/activity/perweek.php
@@ -36,7 +36,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 $langs->load('projects');
 $langs->load('users');
 
-$action=GETPOST('action');
+$action=GETPOST('action','aZ09');
 $mode=GETPOST("mode");
 $id=GETPOST('id','int');
 $taskid=GETPOST('taskid');
diff --git a/htdocs/projet/note.php b/htdocs/projet/note.php
index a6b6e3c93e2..9a73e481666 100644
--- a/htdocs/projet/note.php
+++ b/htdocs/projet/note.php
@@ -28,7 +28,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php';
 
 $langs->load('projects');
 
-$action=GETPOST('action');
+$action=GETPOST('action','aZ09');
 $id = GETPOST('id','int');
 $ref= GETPOST('ref');
 
diff --git a/htdocs/public/demo/index.php b/htdocs/public/demo/index.php
index 3c3353e5eb6..d5db9866c1f 100644
--- a/htdocs/public/demo/index.php
+++ b/htdocs/public/demo/index.php
@@ -202,7 +202,7 @@ asort($orders);
  * Actions
  */
 
-if (GETPOST("action") == 'gotodemo')
+if (GETPOST('action','aZ09') == 'gotodemo')
 {
 	//print 'ee'.GETPOST("demochoice");
 	$disablestring='';
diff --git a/htdocs/public/opensurvey/studs.php b/htdocs/public/opensurvey/studs.php
index 070c739e85c..98d267fdd72 100644
--- a/htdocs/public/opensurvey/studs.php
+++ b/htdocs/public/opensurvey/studs.php
@@ -32,7 +32,7 @@ require_once(DOL_DOCUMENT_ROOT."/opensurvey/fonctions.php");
 
 
 // Init vars
-$action=GETPOST('action');
+$action=GETPOST('action','aZ09');
 $numsondage = '';
 if (GETPOST('sondage'))
 {
diff --git a/htdocs/public/paybox/newpayment.php b/htdocs/public/paybox/newpayment.php
index a52358dab24..c3aff6341cc 100644
--- a/htdocs/public/paybox/newpayment.php
+++ b/htdocs/public/paybox/newpayment.php
@@ -63,7 +63,7 @@ $amount=price2num(GETPOST("amount"));
 if (! GETPOST("currency",'alpha')) $currency=$conf->currency;
 else $currency=GETPOST("currency",'alpha');
 
-if (! GETPOST("action"))
+if (! GETPOST('action','aZ09'))
 {
     if (! GETPOST("amount") && ! GETPOST("source"))
     {
@@ -129,7 +129,7 @@ $valid=true;
  * Actions
  */
 
-if (GETPOST("action") == 'dopayment')
+if (GETPOST('action','aZ09') == 'dopayment')
 {
     $PRICE=price2num(GETPOST("newamount"),'MT');
     $email=GETPOST("email");
diff --git a/htdocs/public/paypal/newpayment.php b/htdocs/public/paypal/newpayment.php
index 5be4e49f232..6de2cb8a441 100644
--- a/htdocs/public/paypal/newpayment.php
+++ b/htdocs/public/paypal/newpayment.php
@@ -67,7 +67,7 @@ $amount=price2num(GETPOST("amount"));
 if (! GETPOST("currency",'alpha')) $currency=$conf->currency;
 else $currency=GETPOST("currency",'alpha');
 
-if (! GETPOST("action"))
+if (! GETPOST('action','aZ09'))
 {
     if (! GETPOST("amount") && ! GETPOST("source"))
     {
@@ -185,7 +185,7 @@ if (! empty($conf->global->PAYPAL_SECURITY_TOKEN))
  * Actions
  */
 
-if (GETPOST("action") == 'dopayment')
+if (GETPOST('action','aZ09') == 'dopayment')
 {
 	$PAYPAL_API_PRICE=price2num(GETPOST("newamount"),'MT');
     $PAYPAL_PAYMENT_TYPE='Sale';
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index ca09825f62a..5a53a2c6ed2 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -55,7 +55,7 @@ if (! empty($conf->notification->enabled)) $langs->load("mails");
 
 $mesg=''; $error=0; $errors=array();
 
-$action		= (GETPOST('action') ? GETPOST('action') : 'view');
+$action		= (GETPOST('action','aZ09') ? GETPOST('action','aZ09') : 'view');
 $cancel     = GETPOST('cancel');
 $backtopage = GETPOST('backtopage','alpha');
 $confirm	= GETPOST('confirm');
diff --git a/htdocs/societe/document.php b/htdocs/societe/document.php
index a43db2da318..3802397509b 100644
--- a/htdocs/societe/document.php
+++ b/htdocs/societe/document.php
@@ -36,7 +36,7 @@ $langs->load("companies");
 $langs->load('other');
 
 
-$action=GETPOST('action');
+$action=GETPOST('action','aZ09');
 $confirm=GETPOST('confirm');
 $id=(GETPOST('socid','int') ? GETPOST('socid','int') : GETPOST('id','int'));
 $ref = GETPOST('ref', 'alpha');
diff --git a/htdocs/societe/note.php b/htdocs/societe/note.php
index c713250a0e2..bdba82f440e 100644
--- a/htdocs/societe/note.php
+++ b/htdocs/societe/note.php
@@ -29,7 +29,7 @@
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 
-$action = GETPOST('action');
+$action = GETPOST('action','aZ09');
 
 $langs->load("companies");
 
diff --git a/htdocs/societe/notify/card.php b/htdocs/societe/notify/card.php
index d547d9e57dc..b17ea678853 100644
--- a/htdocs/societe/notify/card.php
+++ b/htdocs/societe/notify/card.php
@@ -36,7 +36,7 @@ $langs->load("admin");
 $langs->load("other");
 
 $socid = GETPOST("socid",'int');
-$action = GETPOST('action');
+$action = GETPOST('action','aZ09');
 $contactid=GETPOST('contactid');    // May be an int or 'thirdparty'
 $actionid=GETPOST('actionid');
 
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 80edfc6fea9..2aa33543913 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -75,8 +75,7 @@ else header('Cache-Control: no-cache');
 // On the fly GZIP compression for all pages (if browser support it). Must set the bit 3 of constant to 1.
 if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x04)) { ob_start("ob_gzhandler"); }
 
-if (GETPOST('lang')) $langs->setDefaultLang(GETPOST('lang', 'alpha'));	// If language was forced on URL
-if (GETPOST('theme')) $conf->theme=GETPOST('theme', 'alpha');  // If theme was forced on URL
+if (GETPOST('theme','alpha')) $conf->theme=GETPOST('theme','alpha');  // If theme was forced on URL
 $langs->load("main",0,1);
 $right=($langs->trans("DIRECTION")=='rtl'?'left':'right');
 $left=($langs->trans("DIRECTION")=='rtl'?'right':'left');
@@ -231,7 +230,7 @@ print '*/'."\n";
 
 
 body {
-<?php if (GETPOST("optioncss") == 'print') {  ?>
+<?php if (GETPOST('optioncss','aZ09') == 'print') {  ?>
 	background-color: #FFFFFF;
 <?php } else { ?>
 	background: rgb(<?php print $colorbackbody; ?>);
@@ -867,7 +866,7 @@ div.fiche>form>div.div-table-responsive {
    	}
 }
 .linkobject { cursor: pointer; }
-<?php if (GETPOST("optioncss") == 'print') { ?>
+<?php if (GETPOST('optioncss','aZ09') == 'print') { ?>
 .hideonprint { display: none; }
 <?php } ?>
 
@@ -942,7 +941,7 @@ div.vmenu, td.vmenu {
 
 
 /* For smartphone (testmenuhider is on) */
-<?php if ($conf->browser->layout == 'phone' && ((GETPOST('testmenuhider') || ! empty($conf->global->MAIN_TESTMENUHIDER)) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))) { ?>
+<?php if ($conf->browser->layout == 'phone' && ((GETPOST('testmenuhider','int') || ! empty($conf->global->MAIN_TESTMENUHIDER)) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))) { ?>
 #id-container {
 	width: 100%;
 }
@@ -984,8 +983,8 @@ div.fiche {
 
 
 div.fiche {
-	margin-<?php print $left; ?>: <?php print (GETPOST("optioncss") == 'print'?6:($dol_hide_leftmenu?'6':'26')); ?>px;
-	margin-<?php print $right; ?>: <?php print (GETPOST("optioncss") == 'print'?8:(empty($conf->dol_optimize_smallscreen)?'16':'6')); ?>px;
+	margin-<?php print $left; ?>: <?php print (GETPOST('optioncss','aZ09') == 'print'?6:($dol_hide_leftmenu?'6':'26')); ?>px;
+	margin-<?php print $right; ?>: <?php print (GETPOST('optioncss','aZ09') == 'print'?8:(empty($conf->dol_optimize_smallscreen)?'16':'6')); ?>px;
 	<?php if (! empty($conf->dol_hide_leftmenu) && ! empty($conf->dol_hide_topmenu)) print 'margin-top: 4px;'."\n"; ?>
 	<?php if (! empty($conf->dol_hide_leftmenu)) print 'margin-bottom: 12px;'."\n"; ?>
 }
@@ -1029,8 +1028,8 @@ div.ficheaddleft {
 @media only screen and (max-width: 1000px)
 {
     div.fiche {
-    	margin-<?php print $left; ?>: <?php print (GETPOST("optioncss") == 'print'?6:($dol_hide_leftmenu?'6':'20')); ?>px;
-    	margin-<?php print $right; ?>: <?php print (GETPOST("optioncss") == 'print'?8:6); ?>px;
+    	margin-<?php print $left; ?>: <?php print (GETPOST('optioncss','aZ09') == 'print'?6:($dol_hide_leftmenu?'6':'20')); ?>px;
+    	margin-<?php print $right; ?>: <?php print (GETPOST('optioncss','aZ09') == 'print'?8:6); ?>px;
     	<?php if (! empty($conf->dol_hide_leftmenu) && ! empty($conf->dol_hide_topmenu)) print 'margin-top: 4px;'; ?>
     }
     div.fichecenter {
@@ -1183,7 +1182,7 @@ if (! empty($conf->global->THEME_TOPMENU_DISABLE_IMAGE)) { $disableimages = 1; $
 ?>
 
 div#id-top {
-<?php if (GETPOST("optioncss") == 'print') {  ?>
+<?php if (GETPOST('optioncss','aZ09') == 'print') {  ?>
 	display:none;
 <?php } else { ?>
 	background: rgb(<?php echo $colorbackhmenu1 ?>);
@@ -1206,7 +1205,7 @@ div#id-top {
 }
 
 div#tmenu_tooltip {
-<?php if (GETPOST("optioncss") == 'print') {  ?>
+<?php if (GETPOST('optioncss','aZ09') == 'print') {  ?>
 	display:none;
 <?php } else { ?>
 	padding-<?php echo $right; ?>: <?php echo ($maxwidthloginblock - 10); ?>px;
@@ -1220,7 +1219,7 @@ div.tmenusep {
 }
 
 div.tmenudiv {
-<?php if (GETPOST("optioncss") == 'print') {  ?>
+<?php if (GETPOST('optioncss','aZ09') == 'print') {  ?>
 	display:none;
 <?php } else { ?>
     position: relative;
@@ -1632,7 +1631,7 @@ div.login_block {
 	top: 4px;
 	font-weight: bold;
 	max-width: <?php echo $maxwidthloginblock; ?>px;
-	<?php if (GETPOST("optioncss") == 'print') { ?>
+	<?php if (GETPOST('optioncss','aZ09') == 'print') { ?>
 	display: none;
 	<?php } ?>
 }
@@ -1746,7 +1745,7 @@ div.vmenu, td.vmenu {
 .vmenu {
     width: 190px;
 	margin-left: 6px;
-	<?php if (GETPOST("optioncss") == 'print') { ?>
+	<?php if (GETPOST('optioncss','aZ09') == 'print') { ?>
     display: none;
 	<?php } ?>
 }
@@ -4600,7 +4599,7 @@ div.tabsElem a.tab {
 	<?php } ?>
 	}
 	div#tmenu_tooltip {
-	<?php if (GETPOST("optioncss") == 'print') {  ?>
+	<?php if (GETPOST('optioncss','aZ09') == 'print') {  ?>
 		display:none;
 	<?php } else { ?>
 		padding-<?php echo $right; ?>: 0;
@@ -4611,7 +4610,7 @@ div.tabsElem a.tab {
 		width: 100%;
 	}
 	div.login_block {
-		<?php if ($conf->browser->layout == 'phone' && ((GETPOST('testmenuhider') || ! empty($conf->global->MAIN_TESTMENUHIDER)) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))) { ?>
+		<?php if ($conf->browser->layout == 'phone' && ((GETPOST('testmenuhider','int') || ! empty($conf->global->MAIN_TESTMENUHIDER)) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))) { ?>
 		display: none;
 		padding-top: 20px;
 		padding-left: 20px;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 36e2dc4e6f3..dde2c8c42ad 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -76,8 +76,7 @@ else header('Cache-Control: no-cache');
 // On the fly GZIP compression for all pages (if browser support it). Must set the bit 3 of constant to 1.
 if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x04)) { ob_start("ob_gzhandler"); }
 
-if (GETPOST('lang')) $langs->setDefaultLang(GETPOST('lang'));	// If language was forced on URL
-if (GETPOST('theme')) $conf->theme=GETPOST('theme');  // If theme was forced on URL
+if (GETPOST('theme','alpha')) $conf->theme=GETPOST('theme','alpha');  // If theme was forced on URL
 $langs->load("main",0,1);
 $right=($langs->trans("DIRECTION")=='rtl'?'left':'right');
 $left=($langs->trans("DIRECTION")=='rtl'?'right':'left');
@@ -234,7 +233,7 @@ print '*/'."\n";
 
 
 body {
-<?php if (GETPOST("optioncss") == 'print') {  ?>
+<?php if (GETPOST('optioncss','aZ09') == 'print') {  ?>
 	background-color: #FFFFFF;
 <?php } else { ?>
 	background: rgb(<?php print $colorbackbody; ?>);
@@ -874,7 +873,7 @@ div.fiche>form>div.div-table-responsive {
    	}    
 }
 .linkobject { cursor: pointer; }
-<?php if (GETPOST("optioncss") == 'print') { ?>
+<?php if (GETPOST('optioncss','aZ09') == 'print') { ?>
 .hideonprint { display: none; }
 <?php } ?>
 
@@ -921,14 +920,14 @@ td.showDragHandle {
 #id-right {	/* This must stay id-right and not be replaced with echo $right */
 	width: 100%;
 	padding-bottom: 10px;
-<?php if (GETPOST("optioncss") != 'print') { ?>
+<?php if (GETPOST('optioncss','aZ09') != 'print') { ?>
 	padding-left: 229px;
 	padding-top: 12px;
 <?php } ?>
 }
 
 .side-nav {
-<?php if (GETPOST("optioncss") == 'print') { ?>
+<?php if (GETPOST('optioncss','aZ09') == 'print') { ?>
 	display: none;
 <?php } else { ?>
 	background: #FFF;
@@ -1027,8 +1026,8 @@ div.fiche {
 <?php } ?>
 
 div.fiche {
-	margin-<?php print $left; ?>: <?php print (GETPOST("optioncss") == 'print'?6:($dol_hide_leftmenu?'4':'20')); ?>px;
-	margin-<?php print $right; ?>: <?php print (GETPOST("optioncss") == 'print'?8:(empty($conf->dol_optimize_smallscreen)?'16':'4')); ?>px;
+	margin-<?php print $left; ?>: <?php print (GETPOST('optioncss','aZ09') == 'print'?6:($dol_hide_leftmenu?'4':'20')); ?>px;
+	margin-<?php print $right; ?>: <?php print (GETPOST('optioncss','aZ09') == 'print'?8:(empty($conf->dol_optimize_smallscreen)?'16':'4')); ?>px;
 	<?php if (! empty($conf->dol_hide_leftmenu) && ! empty($conf->dol_hide_topmenu)) print 'margin-top: 4px;'; ?>
 	margin-bottom: 15px;
 }
@@ -1065,8 +1064,8 @@ div.ficheaddleft {
 @media only screen and (max-width: 900px)
 {
     div.fiche {
-    	margin-<?php print $left; ?>: <?php print (GETPOST("optioncss") == 'print'?6:($dol_hide_leftmenu?'4':'20')); ?>px;
-    	margin-<?php print $right; ?>: <?php print (GETPOST("optioncss") == 'print'?8:16); ?>px;
+    	margin-<?php print $left; ?>: <?php print (GETPOST('optioncss','aZ09') == 'print'?6:($dol_hide_leftmenu?'4':'20')); ?>px;
+    	margin-<?php print $right; ?>: <?php print (GETPOST('optioncss','aZ09') == 'print'?8:16); ?>px;
     	<?php if (! empty($conf->dol_hide_leftmenu) && ! empty($conf->dol_hide_topmenu)) print 'margin-top: 4px;'; ?>
     	margin-bottom: 15px;
     }
@@ -1227,7 +1226,7 @@ if (! empty($conf->global->THEME_TOPMENU_DISABLE_IMAGE)) { $heightmenu = 30; $di
 ?>
 
 div#tmenu_tooltip {
-<?php if (GETPOST("optioncss") == 'print') {  ?>
+<?php if (GETPOST('optioncss','aZ09') == 'print') {  ?>
 	display:none;
 <?php } else { ?>
 	background: rgb(<?php echo $colorbackhmenu1 ?>);
@@ -1243,7 +1242,7 @@ div#tmenu_tooltip {
 }
 
 div#tmenu_tooltip {
-<?php if (GETPOST("optioncss") == 'print') {  ?>
+<?php if (GETPOST('optioncss','aZ09') == 'print') {  ?>
 	display:none;
 <?php } else { ?>
 	/* padding-<?php echo $right; ?>: <?php echo ($maxwidthloginblock - 10); ?>px; */
@@ -1257,7 +1256,7 @@ div.tmenusep {
 }
 
 div.tmenudiv {
-<?php if (GETPOST("optioncss") == 'print') {  ?>
+<?php if (GETPOST('optioncss','aZ09') == 'print') {  ?>
 	display:none;
 <?php } else { ?>
     position: relative;
@@ -1673,7 +1672,7 @@ div.login_block {
 	background: #FFF;
 	width: 228px;
 	height: 42px;
-	<?php if (GETPOST("optioncss") == 'print') { ?>
+	<?php if (GETPOST('optioncss','aZ09') == 'print') { ?>
 	display: none;
 	<?php } ?>
 }
@@ -1777,7 +1776,7 @@ div.vmenu, td.vmenu {
 
 .vmenu {
 	margin-left: 4px;
-	<?php if (GETPOST("optioncss") == 'print') { ?>
+	<?php if (GETPOST('optioncss','aZ09') == 'print') { ?>
     display: none;
 	<?php } ?>
 }
@@ -4702,7 +4701,7 @@ border-top-right-radius: 6px;
 @media only screen and (max-width: 570px)
 {
 	div#tmenu_tooltip {
-	<?php if (GETPOST("optioncss") == 'print') {  ?>
+	<?php if (GETPOST('optioncss','aZ09') == 'print') {  ?>
 		display:none;
 	<?php } else { ?>
 		/* padding-<?php echo $right; ?>: 78px; */
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index cf6a1096a7b..d98ef682e90 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -1774,7 +1774,7 @@ else
             }
         }
 
-        if (GETPOST('action') != 'presend' && GETPOST('action') != 'send')
+        if (GETPOST('action','aZ09') != 'presend' && GETPOST('action','aZ09') != 'send')
         {
             /*
              * List of groups of user
diff --git a/htdocs/user/document.php b/htdocs/user/document.php
index 8b055979992..b15af46bcd8 100644
--- a/htdocs/user/document.php
+++ b/htdocs/user/document.php
@@ -35,7 +35,7 @@ $langs->load("users");
 $langs->load('other');
 
 
-$action=GETPOST('action');
+$action=GETPOST('action','aZ09');
 $confirm=GETPOST('confirm');
 $id=(GETPOST('userid','int') ? GETPOST('userid','int') : GETPOST('id','int'));
 $ref = GETPOST('ref', 'alpha');
diff --git a/htdocs/user/note.php b/htdocs/user/note.php
index 2844676a465..b9e8cb69869 100644
--- a/htdocs/user/note.php
+++ b/htdocs/user/note.php
@@ -28,7 +28,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
 
 $id = GETPOST('id','int');
-$action = GETPOST('action');
+$action = GETPOST('action','aZ09');
 
 $langs->load("companies");
 $langs->load("members");
diff --git a/htdocs/user/notify/card.php b/htdocs/user/notify/card.php
index 2b7c31d75df..3c186ac3cae 100644
--- a/htdocs/user/notify/card.php
+++ b/htdocs/user/notify/card.php
@@ -37,7 +37,7 @@ $langs->load("admin");
 $langs->load("other");
 
 $id = GETPOST("id",'int');
-$action = GETPOST('action');
+$action = GETPOST('action','aZ09');
 $actionid=GETPOST('actionid');
 
 // Security check
diff --git a/htdocs/user/passwordforgotten.php b/htdocs/user/passwordforgotten.php
index e59e26efd0b..6530a4f8536 100644
--- a/htdocs/user/passwordforgotten.php
+++ b/htdocs/user/passwordforgotten.php
@@ -172,7 +172,7 @@ else
 }
 
 // Note: $conf->css looks like '/theme/eldy/style.css.php'
-$conf->css = "/theme/".(GETPOST('theme')?GETPOST('theme','alpha'):$conf->theme)."/style.css.php";
+$conf->css = "/theme/".(GETPOST('theme','alpha')?GETPOST('theme','alpha'):$conf->theme)."/style.css.php";
 //$themepath=dol_buildpath((empty($conf->global->MAIN_FORCETHEMEDIR)?'':$conf->global->MAIN_FORCETHEMEDIR).$conf->css,1);
 $themepath=dol_buildpath($conf->css,1);
 if (! empty($conf->modules_parts['theme']))	// This slow down
diff --git a/htdocs/variants/list.php b/htdocs/variants/list.php
index 7b8855c1c4e..9a141b88200 100644
--- a/htdocs/variants/list.php
+++ b/htdocs/variants/list.php
@@ -19,7 +19,7 @@ require '../main.inc.php';
 require DOL_DOCUMENT_ROOT.'/variants/class/ProductAttribute.class.php';
 
 $id = GETPOST('id');
-$action = GETPOST('action');
+$action = GETPOST('action','aZ09');
 $object = new ProductAttribute($db);
 
 
diff --git a/htdocs/viewimage.php b/htdocs/viewimage.php
index 4f1ef007f1f..bd73f0c0b43 100644
--- a/htdocs/viewimage.php
+++ b/htdocs/viewimage.php
@@ -62,10 +62,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 
 $action=GETPOST('action','alpha');
-$original_file=GETPOST("file");
+$original_file=GETPOST("file",'alpha');
 $modulepart=GETPOST('modulepart','alpha');
-$urlsource=GETPOST("urlsource");
-$entity=GETPOST('entity')?GETPOST('entity','int'):$conf->entity;
+$urlsource=GETPOST("urlsource",'alpha');
+$entity=GETPOST('entity','int')?GETPOST('entity','int'):$conf->entity;
 
 // Security check
 if (empty($modulepart)) accessforbidden('Bad value for parameter modulepart');
@@ -84,7 +84,7 @@ if ($modulepart == 'fckeditor') $modulepart='medias';   // For backward compatib
  * View
  */
 
-if (GETPOST("cache"))
+if (GETPOST("cache",'alpha'))
 {
     // Important: Following code is to avoid page request by browser and PHP CPU at
     // each Dolibarr page access.
@@ -137,9 +137,9 @@ if (preg_match('/\.\./',$original_file) || preg_match('/[<>|]/',$original_file))
 if ($modulepart == 'barcode')
 {
     $generator=GETPOST("generator","alpha");
-    $code=GETPOST("code");
+    $code=GETPOST("code",'alpha');
     $encoding=GETPOST("encoding","alpha");
-    $readable=GETPOST("readable")?GETPOST("readable","alpha"):"Y";
+    $readable=GETPOST("readable",'alpha')?GETPOST("readable","alpha"):"Y";
 
     if (empty($generator) || empty($encoding))
     {
diff --git a/htdocs/websites/index.php b/htdocs/websites/index.php
index e7dbb898145..8138100ab77 100644
--- a/htdocs/websites/index.php
+++ b/htdocs/websites/index.php
@@ -79,7 +79,7 @@ $langs->load("website");
 
 if (! $user->admin) accessforbidden();
 
-if (! ((GETPOST('testmenuhider') || ! empty($conf->global->MAIN_TESTMENUHIDER)) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)))
+if (! ((GETPOST('testmenuhider','int') || ! empty($conf->global->MAIN_TESTMENUHIDER)) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)))
 {
     $conf->dol_hide_leftmenu = 1;   // Force hide of left menu.
 }
diff --git a/scripts/accountancy/export-thirdpartyaccount.php b/scripts/accountancy/export-thirdpartyaccount.php
index c84ffdabc0f..cfc43113eda 100755
--- a/scripts/accountancy/export-thirdpartyaccount.php
+++ b/scripts/accountancy/export-thirdpartyaccount.php
@@ -159,7 +159,7 @@ if ($resql) {
 	$i = 0;
 
 	// export csv
-	if (GETPOST('action') == 'export_csv') {
+	if (GETPOST('action','aZ09') == 'export_csv') {
 
 		header('Content-Type: text/csv');
 		header('Content-Disposition: attachment;filename=export_csv.csv');

From 194ed505f4d18ae8d037b7a875e1620538ebf4fa Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 16 May 2017 14:05:46 +0200
Subject: [PATCH 366/505] Look and feel v6

---
 htdocs/margin/checkMargins.php | 96 +++++++++++++++++++++++++++-------
 1 file changed, 78 insertions(+), 18 deletions(-)

diff --git a/htdocs/margin/checkMargins.php b/htdocs/margin/checkMargins.php
index b3c663ad886..9656fa99fd9 100644
--- a/htdocs/margin/checkMargins.php
+++ b/htdocs/margin/checkMargins.php
@@ -47,7 +47,7 @@ $sortorder = GETPOST("sortorder", 'alpha');
 if (! $sortorder)
 	$sortorder = "DESC";
 if (! $sortfield) {
-	$sortfield = 'f.rowid';
+	$sortfield = 'f.facnumber';
 }
 $page = GETPOST("page", 'int');
 if ($page == - 1) {
@@ -98,6 +98,46 @@ if (! empty($enddate)) {
 	$options .= '&amp;enddatemonth=' . GETPOST('enddatemonth', 'int') . '&amp;enddateday=' . GETPOST('enddateday', 'int') . '&amp;enddateyear=' . GETPOST('enddateyear', 'int');
 }
 
+$search_ref = GETPOST('search_ref','alpha');
+
+
+/*
+ * Actions
+ */
+
+if (GETPOST('cancel')) { $action='list'; $massaction=''; }
+if (! GETPOST('confirmmassaction') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction=''; }
+
+$parameters=array();
+$reshook=$hookmanager->executeHooks('doActions',$parameters, $object, $action);    // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+if (empty($reshook))
+{
+    // Selection of new fields
+    include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+
+    // Purge search criteria
+    if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // All tests are required to be compatible with all browsers
+    {
+        $search_ref='';
+        $search_array_options=array();
+    }
+
+    // Mass actions
+    /*
+    $objectclass='Product';
+    if ((string) $type == '1') { $objectlabel='Services'; }
+    if ((string) $type == '0') { $objectlabel='Products'; }
+
+    $permtoread = $user->rights->produit->lire;
+    $permtodelete = $user->rights->produit->supprimer;
+    $uploaddir = $conf->product->dir_output;
+    include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
+    */
+}
+
+
 /*
  * View
  */
@@ -125,8 +165,7 @@ dol_fiche_head($head, $langs->trans('checkMargins'), $title, 0, $picto);
 
 print '<table class="border" width="100%">';
 
-// Start date
-print '<td class="titlefield">' . $langs->trans('DateStart') . ' (' . $langs->trans("DateValidation") . ')</td>';
+print '<tr><td class="titlefield">' . $langs->trans('DateStart') . ' (' . $langs->trans("DateValidation") . ')</td>';
 print '<td>';
 $form->select_date($startdate, 'startdate', '', '', 1, "sel", 1, 1);
 print '</td>';
@@ -136,12 +175,17 @@ $form->select_date($enddate, 'enddate', '', '', 1, "sel", 1, 1);
 print '</td>';
 print '<td style="text-align: center;">';
 print '<input type="submit" class="button" value="' . dol_escape_htmltag($langs->trans('Refresh')) . '" name="button_search" />';
-print '</td></tr>';
+print '</td>';
+print '</tr>';
 print "</table>";
 
 dol_fiche_end();
 
 
+$arrayfields=array();
+$massactionbutton='';
+
+
 $sql = "SELECT";
 $sql .= " f.facnumber, f.rowid as invoiceid, d.rowid as invoicedetid, d.buy_price_ht, d.total_ht, d.subprice, d.label, d.description , d.qty";
 $sql .= " ,d.fk_product";
@@ -150,10 +194,9 @@ $sql .= " INNER JOIN " . MAIN_DB_PREFIX . "facturedet as d  ON d.fk_facture = f.
 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product as p ON d.fk_product = p.rowid";
 $sql .= " WHERE f.fk_statut > 0";
 $sql .= " AND f.entity = " . getEntity('facture', 1);
-if (! empty($startdate))
-	$sql .= " AND f.datef >= '" . $db->idate($startdate) . "'";
-if (! empty($enddate))
-	$sql .= " AND f.datef <= '" . $db->idate($enddate) . "'";
+if (! empty($startdate)) $sql .= " AND f.datef >= '" . $db->idate($startdate) . "'";
+if (! empty($enddate))   $sql .= " AND f.datef <= '" . $db->idate($enddate) . "'";
+if ($search_ref) $sql.=natural_search('f.facnumber', $search_ref);
 $sql .= " AND d.buy_price_ht IS NOT NULL";
 $sql .= $db->order($sortfield, $sortorder);
 
@@ -186,27 +229,43 @@ if ($result) {
 	
 	$moreforfilter='';
 	
+	$varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
+	//$selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
+	//if ($massactionbutton) $selectedfields.=$form->showCheckAddButtons('checkforselect', 1);
+	$selectedfields='';
+	
     print '<div class="div-table-responsive">';
     print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
 	
+	print '<tr class="liste_titre liste_titre_search">';
+	print '<td><input type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'"></td>';
+	print '<td></td>';
+	print '<td></td>';
+	print '<td></td>';
+	print '<td></td>';
+	print '<td></td>';
+    print '<td class="liste_titre" align="middle">';
+    $searchpitco=$form->showFilterButtons();
+    print $searchpitco;
+    print '</td>';
+	print "</tr>\n";
+    
 	print '<tr class="liste_titre">';
-	
-	print_liste_field_titre($langs->trans("Ref"), $_SERVER["PHP_SELF"], "f.ref", "", $options, '', $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("Ref"), $_SERVER["PHP_SELF"], "f.facnumber", "", $options, '', $sortfield, $sortorder);
 	print_liste_field_titre($langs->trans("Description"), $_SERVER["PHP_SELF"], "", "", $options, 'width=20%', $sortfield, $sortorder);
 	print_liste_field_titre($langs->trans("UnitPriceHT"), $_SERVER["PHP_SELF"], "d.subprice", "", $options, 'align="right"', $sortfield, $sortorder);
 	print_liste_field_titre($labelcostprice, $_SERVER["PHP_SELF"], "d.buy_price_ht", "", $options, 'align="right"', $sortfield, $sortorder);
 	print_liste_field_titre($langs->trans("Qty"), $_SERVER["PHP_SELF"], "d.qty", "", $options, 'align="right"', $sortfield, $sortorder);
 	print_liste_field_titre($langs->trans("AmountTTC"), $_SERVER["PHP_SELF"], "d.total_ht", "", $options, 'align="right"', $sortfield, $sortorder);
-	
+	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'maxwidthsearch ');
 	print "</tr>\n";
 	
 	if ($num > 0) {
-		$var = true;
-		
-		while ( $objp = $db->fetch_object($result) ) {
+		while ($objp = $db->fetch_object($result)) 
+		{
 			$var = ! $var;
 			
-			print "<tr " . $bc[$var] . ">";
+			print '<tr class="oddeven">';
 			print '<td>';
 			$result_inner = $invoicestatic->fetch($objp->invoiceid);
 			if ($result_inner < 0) {
@@ -241,7 +300,8 @@ if ($result) {
 			print '<td align="right">';
 			print price($objp->total_ht);
 			print '</td>';
-			
+			print '<td></td>';
+				
 			print "</tr>\n";
 			
 			$i ++;
@@ -255,8 +315,8 @@ if ($result) {
 }
 
 
-print '<div class="tabsAction">' . "\n";
-print '<div class="inline-block divButAction"><input type="submit"  name="button_updatemagins" id="button_updatemagins" class="butAction" value="' . $langs->trans("Update") . '" /></div>';
+print '<div class="center">' . "\n";
+print '<input type="submit" class="button" name="button_updatemagins" id="button_updatemagins" value="' . $langs->trans("Update") . '">';
 print '</div>';
 
 print '</form>';

From 9870cafea38eeea8750110953f45936c37aa3eb7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 16 May 2017 16:40:03 +0200
Subject: [PATCH 367/505] Better translation

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

diff --git a/htdocs/langs/en_US/margins.lang b/htdocs/langs/en_US/margins.lang
index 64e1a87864d..8633d910657 100644
--- a/htdocs/langs/en_US/margins.lang
+++ b/htdocs/langs/en_US/margins.lang
@@ -41,4 +41,4 @@ rateMustBeNumeric=Rate must be a numeric value
 markRateShouldBeLesserThan100=Mark rate should be lower than 100
 ShowMarginInfos=Show margin infos
 CheckMargins=Margins detail
-MarginPerSaleRepresentativeWarning=The report of margin per user use the link between thirdparties and sale representatives to calculate the margin of each user. Because some thirdparties may not be linked to any sale representative and some thirdparties may be linked to several users, some margins may not appears in these report or may appears in several different lines.
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between thirdparties and sale representatives to calculate the margin of each salerepresentaive. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).

From d110292a1b1892c9d83ead7e2628a9f12ba89da3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 16 May 2017 17:49:38 +0200
Subject: [PATCH 368/505] Uniformize code

---
 htdocs/projet/list.php          | 80 ++++++++++++++++-----------------
 htdocs/projet/tasks/list.php    | 80 ++++++++++++++++-----------------
 htdocs/theme/eldy/style.css.php |  4 +-
 htdocs/theme/md/style.css.php   |  2 +-
 4 files changed, 83 insertions(+), 83 deletions(-)

diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index a7285e1f410..be43315cb85 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -86,12 +86,12 @@ $optioncss = GETPOST('optioncss','alpha');
 $mine = $_REQUEST['mode']=='mine' ? 1 : 0;
 if ($mine) { $search_project_user = $user->id; $mine=0; }
 
-$sday	= GETPOST('sday','int');
-$smonth	= GETPOST('smonth','int');
-$syear	= GETPOST('syear','int');
-$day	= GETPOST('day','int');
-$month	= GETPOST('month','int');
-$year	= GETPOST('year','int');
+$search_sday	= GETPOST('search_sday','int');
+$search_smonth	= GETPOST('search_smonth','int');
+$search_syear	= GETPOST('search_syear','int');
+$search_eday	= GETPOST('search_eday','int');
+$search_emonth	= GETPOST('search_emonth','int');
+$search_eyear	= GETPOST('search_eyear','int');
 
 if ($search_status == '') $search_status=-1;	// -1 or 1
 
@@ -175,12 +175,12 @@ if (empty($reshook))
     	$search_public="";
     	$search_sale="";
     	$search_project_user='';
-    	$sday="";
-    	$smonth="";
-    	$syear="";
-    	$day="";
-    	$month="";
-    	$year="";
+    	$search_sday="";
+    	$search_smonth="";
+    	$search_syear="";
+    	$search_eday="";
+    	$search_emonth="";
+    	$search_eyear="";
     	$toselect='';
     	$search_array_options=array();
     }
@@ -269,31 +269,31 @@ if ($search_label) $sql .= natural_search('p.title', $search_label);
 if ($search_societe) $sql .= natural_search('s.nom', $search_societe);
 if ($search_opp_amount) $sql .= natural_search('p.opp_amount', $search_opp_amount, 1);
 if ($search_opp_percent) $sql .= natural_search('p.opp_percent', $search_opp_percent, 1);
-if ($smonth > 0)
+if ($search_smonth > 0)
 {
-    if ($syear > 0 && empty($sday))
-    	$sql.= " AND p.dateo BETWEEN '".$db->idate(dol_get_first_day($syear,$smonth,false))."' AND '".$db->idate(dol_get_last_day($syear,$smonth,false))."'";
-    else if ($syear > 0 && ! empty($sday))
-    	$sql.= " AND p.dateo BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $smonth, $sday, $syear))."' AND '".$db->idate(dol_mktime(23, 59, 59, $smonth, $sday, $syear))."'";
+    if ($search_syear > 0 && empty($search_sday))
+    	$sql.= " AND p.dateo BETWEEN '".$db->idate(dol_get_first_day($search_syear,$search_smonth,false))."' AND '".$db->idate(dol_get_last_day($search_syear,$search_smonth,false))."'";
+    else if ($search_syear > 0 && ! empty($search_sday))
+    	$sql.= " AND p.dateo BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $search_smonth, $search_sday, $search_syear))."' AND '".$db->idate(dol_mktime(23, 59, 59, $search_smonth, $search_sday, $search_syear))."'";
     else
-    	$sql.= " AND date_format(p.dateo, '%m') = '".$smonth."'";
+    	$sql.= " AND date_format(p.dateo, '%m') = '".$search_smonth."'";
 }
-else if ($syear > 0)
+else if ($search_syear > 0)
 {
-    $sql.= " AND p.dateo BETWEEN '".$db->idate(dol_get_first_day($syear,1,false))."' AND '".$db->idate(dol_get_last_day($syear,12,false))."'";
+    $sql.= " AND p.dateo BETWEEN '".$db->idate(dol_get_first_day($search_syear,1,false))."' AND '".$db->idate(dol_get_last_day($search_syear,12,false))."'";
 }
-if ($month > 0)
+if ($search_emonth > 0)
 {
-    if ($year > 0 && empty($day))
-    	$sql.= " AND p.datee BETWEEN '".$db->idate(dol_get_first_day($year,$month,false))."' AND '".$db->idate(dol_get_last_day($year,$month,false))."'";
-    else if ($year > 0 && ! empty($day))
-    	$sql.= " AND p.datee BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year))."' AND '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year))."'";
+    if ($search_eyear > 0 && empty($search_eday))
+    	$sql.= " AND p.datee BETWEEN '".$db->idate(dol_get_first_day($search_eyear,$search_emonth,false))."' AND '".$db->idate(dol_get_last_day($search_eyear,$search_emonth,false))."'";
+    else if ($search_eyear > 0 && ! empty($search_eday))
+    	$sql.= " AND p.datee BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $search_emonth, $search_eday, $search_eyear))."' AND '".$db->idate(dol_mktime(23, 59, 59, $search_emonth, $search_eday, $search_eyear))."'";
     else
-    	$sql.= " AND date_format(p.datee, '%m') = '".$month."'";
+    	$sql.= " AND date_format(p.datee, '%m') = '".$search_emonth."'";
 }
-else if ($year > 0)
+else if ($search_eyear > 0)
 {
-    $sql.= " AND p.datee BETWEEN '".$db->idate(dol_get_first_day($year,1,false))."' AND '".$db->idate(dol_get_last_day($year,12,false))."'";
+    $sql.= " AND p.datee BETWEEN '".$db->idate(dol_get_first_day($search_eyear,1,false))."' AND '".$db->idate(dol_get_last_day($search_eyear,12,false))."'";
 }
 if ($search_all) $sql .= natural_search(array_keys($fieldstosearchall), $search_all);
 if ($search_status >= 0) 
@@ -371,12 +371,12 @@ llxHeader("", $title, $help_url);
 $param='';
 if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
 if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
-if ($sday)              		$param.='&sday='.$day;
-if ($smonth)              		$param.='&smonth='.$smonth;
-if ($syear)               		$param.='&syear=' .$syear;
-if ($day)               		$param.='&day='.$day;
-if ($month)              		$param.='&month='.$month;
-if ($year)               		$param.='&year=' .$year;
+if ($search_sday)              		    $param.='&search_sday='.$search_sday;
+if ($search_smonth)              		$param.='&search_smonth='.$search_smonth;
+if ($search_syear)               		$param.='&search_syear=' .$search_syear;
+if ($search_eday)               		$param.='&search_eday='.$search_eday;
+if ($search_emonth)              		$param.='&search_emonth='.$search_emonth;
+if ($search_eyear)               		$param.='&search_eyear=' .$search_eyear;
 if ($socid)				        $param.='&socid='.$socid;
 if ($search_all != '') 			$param.='&search_all='.$search_all;
 if ($search_ref != '') 			$param.='&search_ref='.$search_ref;
@@ -510,18 +510,18 @@ if (! empty($arrayfields['commercial']['checked']))
 if (! empty($arrayfields['p.dateo']['checked']))
 {
 	print '<td class="liste_titre center">';
-	if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="sday" value="'.$sday.'">';
-	print '<input class="flat" type="text" size="1" maxlength="2" name="smonth" value="'.$smonth.'">';
-	$formother->select_year($syear?$syear:-1,'syear',1, 20, 5);
+	if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="search_sday" value="'.$search_sday.'">';
+	print '<input class="flat" type="text" size="1" maxlength="2" name="search_smonth" value="'.$search_smonth.'">';
+	$formother->select_year($search_syear?$search_syear:-1,'search_syear',1, 20, 5);
 	print '</td>';
 }
 // End date
 if (! empty($arrayfields['p.datee']['checked']))
 {
 	print '<td class="liste_titre center">';
-	if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="day" value="'.$day.'">';
-	print '<input class="flat" type="text" size="1" maxlength="2" name="month" value="'.$month.'">';
-	$formother->select_year($year?$year:-1,'year',1, 20, 5);
+	if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="search_eday" value="'.$search_eday.'">';
+	print '<input class="flat" type="text" size="1" maxlength="2" name="search_emonth" value="'.$search_emonth.'">';
+	$formother->select_year($search_eyear?$search_eyear:-1,'search_eyear',1, 20, 5);
 	print '</td>';
 }
 if (! empty($arrayfields['p.public']['checked']))
diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php
index 8579d436d71..285aa182206 100644
--- a/htdocs/projet/tasks/list.php
+++ b/htdocs/projet/tasks/list.php
@@ -60,12 +60,12 @@ $search_task_user=GETPOST('search_task_user');
 $mine = $_REQUEST['mode']=='mine' ? 1 : 0;
 if ($mine) { $search_task_user = $user->id; $mine = 0; }
 
-$sday	= GETPOST('sday','int');
-$smonth	= GETPOST('smonth','int');
-$syear	= GETPOST('syear','int');
-$day	= GETPOST('day','int');
-$month	= GETPOST('month','int');
-$year	= GETPOST('year','int');
+$search_sday	= GETPOST('search_sday','int');
+$search_smonth	= GETPOST('search_smonth','int');
+$search_syear	= GETPOST('search_syear','int');
+$search_eday	= GETPOST('search_eday','int');
+$search_emonth	= GETPOST('search_emonth','int');
+$search_eyear	= GETPOST('search_eyear','int');
 
 // Initialize context for list
 $contextpage=GETPOST('contextpage','aZ')?GETPOST('contextpage','aZ'):'tasklist';
@@ -162,12 +162,12 @@ if (empty($reshook))
         $search_task_description="";
         $search_task_user=-1;
         $search_project_user=-1;
-        $sday='';
-        $smonth='';
-        $syear='';
-        $day='';
-        $month='';
-        $year='';
+        $search_sday='';
+        $search_smonth='';
+        $search_syear='';
+        $search_eday='';
+        $search_emonth='';
+        $search_eyear='';
         $toselect='';
         $search_array_options=array();
     }
@@ -277,31 +277,31 @@ if ($search_project_title) $sql .= natural_search('p.title', $search_project_tit
 if ($search_task_ref)      $sql .= natural_search('t.ref', $search_task_ref);
 if ($search_task_label)    $sql .= natural_search('t.label', $search_task_label);
 if ($search_societe) $sql .= natural_search('s.nom', $search_societe);
-if ($smonth > 0)
+if ($search_smonth > 0)
 {
-    if ($syear > 0 && empty($sday))
-        $sql.= " AND t.dateo BETWEEN '".$db->idate(dol_get_first_day($syear,$smonth,false))."' AND '".$db->idate(dol_get_last_day($syear,$smonth,false))."'";
-        else if ($syear > 0 && ! empty($sday))
-            $sql.= " AND t.dateo BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $smonth, $sday, $syear))."' AND '".$db->idate(dol_mktime(23, 59, 59, $smonth, $sday, $syear))."'";
+    if ($search_syear > 0 && empty($search_sday))
+        $sql.= " AND t.dateo BETWEEN '".$db->idate(dol_get_first_day($search_syear,$search_smonth,false))."' AND '".$db->idate(dol_get_last_day($search_syear,$search_smonth,false))."'";
+        else if ($search_syear > 0 && ! empty($search_sday))
+            $sql.= " AND t.dateo BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $search_smonth, $search_sday, $search_syear))."' AND '".$db->idate(dol_mktime(23, 59, 59, $search_smonth, $search_sday, $search_syear))."'";
             else
-                $sql.= " AND date_format(t.dateo, '%m') = '".$smonth."'";
+                $sql.= " AND date_format(t.dateo, '%m') = '".$search_smonth."'";
 }
-else if ($syear > 0)
+else if ($search_syear > 0)
 {
-    $sql.= " AND t.dateo BETWEEN '".$db->idate(dol_get_first_day($syear,1,false))."' AND '".$db->idate(dol_get_last_day($syear,12,false))."'";
+    $sql.= " AND t.dateo BETWEEN '".$db->idate(dol_get_first_day($search_syear,1,false))."' AND '".$db->idate(dol_get_last_day($search_syear,12,false))."'";
 }
-if ($month > 0)
+if ($search_emonth > 0)
 {
-    if ($year > 0 && empty($day))
-        $sql.= " AND t.datee BETWEEN '".$db->idate(dol_get_first_day($year,$month,false))."' AND '".$db->idate(dol_get_last_day($year,$month,false))."'";
-        else if ($year > 0 && ! empty($day))
-            $sql.= " AND t.datee BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year))."' AND '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year))."'";
+    if ($search_eyear > 0 && empty($search_eday))
+        $sql.= " AND t.datee BETWEEN '".$db->idate(dol_get_first_day($search_eyear,$search_emonth,false))."' AND '".$db->idate(dol_get_last_day($search_eyear,$search_emonth,false))."'";
+        else if ($search_eyear > 0 && ! empty($search_eday))
+            $sql.= " AND t.datee BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $search_emonth, $search_eday, $search_eyear))."' AND '".$db->idate(dol_mktime(23, 59, 59, $search_emonth, $search_eday, $search_eyear))."'";
             else
-                $sql.= " AND date_format(t.datee, '%m') = '".$month."'";
+                $sql.= " AND date_format(t.datee, '%m') = '".$search_emonth."'";
 }
-else if ($year > 0)
+else if ($search_eyear > 0)
 {
-    $sql.= " AND t.datee BETWEEN '".$db->idate(dol_get_first_day($year,1,false))."' AND '".$db->idate(dol_get_last_day($year,12,false))."'";
+    $sql.= " AND t.datee BETWEEN '".$db->idate(dol_get_first_day($search_eyear,1,false))."' AND '".$db->idate(dol_get_last_day($search_eyear,12,false))."'";
 }
 if ($search_all) $sql .= natural_search(array_keys($fieldstosearchall), $search_all);
 if ($search_projectstatus >= 0)
@@ -368,12 +368,12 @@ llxHeader("", $title, $help_url);
 $param='';
 if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
 if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
-if ($sday)              		$param.='&sday='.$day;
-if ($smonth)              		$param.='&smonth='.$smonth;
-if ($syear)               		$param.='&syear=' .$syear;
-if ($day)               		$param.='&day='.$day;
-if ($month)              		$param.='&month='.$month;
-if ($year)               		$param.='&year=' .$year;
+if ($search_sday)                 		$param.='&search_sday='.$search_sday;
+if ($search_smonth)              		$param.='&search_smonth='.$search_smonth;
+if ($search_syear)               		$param.='&search_syear=' .$search_syear;
+if ($search_eday)               		$param.='&search_eday='.$search_eday;
+if ($search_emonth)              		$param.='&search_emonth='.$search_emonth;
+if ($search_eyear)               		$param.='&search_eyear=' .$search_eyear;
 if ($socid)				        $param.='&socid='.$socid;
 if ($search_all != '') 			$param.='&search_all='.$search_all;
 if ($search_project_ref != '') 			$param.='&search_project_ref='.$search_project_ref;
@@ -493,18 +493,18 @@ if (! empty($arrayfields['t.label']['checked']))
 if (! empty($arrayfields['t.dateo']['checked']))
 {
     print '<td class="liste_titre center">';
-    if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="sday" value="'.$sday.'">';
-    print '<input class="flat" type="text" size="1" maxlength="2" name="smonth" value="'.$smonth.'">';
-    $formother->select_year($syear?$syear:-1,'syear',1, 20, 5);
+    if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="search_sday" value="'.$search_sday.'">';
+    print '<input class="flat" type="text" size="1" maxlength="2" name="search_smonth" value="'.$search_smonth.'">';
+    $formother->select_year($search_syear?$search_syear:-1,'search_syear',1, 20, 5);
     print '</td>';
 }
 // End date
 if (! empty($arrayfields['t.datee']['checked']))
 {
     print '<td class="liste_titre center">';
-    if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="day" value="'.$day.'">';
-    print '<input class="flat" type="text" size="1" maxlength="2" name="month" value="'.$month.'">';
-    $formother->select_year($year?$year:-1,'year',1, 20, 5);
+    if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="search_eday" value="'.$search_eday.'">';
+    print '<input class="flat" type="text" size="1" maxlength="2" name="search_emonth" value="'.$search_emonth.'">';
+    $formother->select_year($search_eyear?$search_eyear:-1,'search_eyear',1, 20, 5);
     print '</td>';
 }
 if (! empty($arrayfields['p.ref']['checked']))
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 2aa33543913..66f880da786 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -265,7 +265,7 @@ input.select2-input {
 	border-bottom:  solid 1px rgba(0,0,0,.2) !important;	/* required to avoid to lose bottom line when focus is lost on select2. */
 }
 
-.liste_titre input[name=monthvalid], .liste_titre input[name=smonth], .liste_titre input[name=month], .liste_titre input[name=month_lim] {
+.liste_titre input[name=monthvalid], .liste_titre input[name=search_smonth], .liste_titre input[name=search_emonth], .liste_titre input[name=smonth], .liste_titre input[name=month], .liste_titre input[name=month_lim] {
 	margin-right: 4px;
 }
 input[type=submit] {
@@ -1765,7 +1765,7 @@ input.vmenusearchselectcombo[type=text] {
     text-overflow: ellipsis;
     width: 188px;				/* required to have overflow working. must be same than .menu_titre */
 }
-#menu_contenu_logo { padding-top: 0; }
+#menu_contenu_logo { /* padding-top: 0; */ }
 .companylogo { }
 .searchform { padding-top: 10px; }
 
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index dde2c8c42ad..04732ef0305 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -280,7 +280,7 @@ textarea.cke_source:focus
 	box-shadow: none;
 }
 
-.liste_titre input[name=monthvalid], .liste_titre input[name=smonth], .liste_titre input[name=month], .liste_titre input[name=month_lim] {
+.liste_titre input[name=monthvalid], .liste_titre input[name=search_smonth], .liste_titre input[name=search_emonth], .liste_titre input[name=smonth], .liste_titre input[name=month], .liste_titre input[name=month_lim] {
 	margin-right: 4px;
 }
 input, input.flat, textarea, textarea.flat, form.flat select, select, select.flat, .dataTables_length label select {

From 3890c67210a2e7c07e31382343daa03c268b4db0 Mon Sep 17 00:00:00 2001
From: florian HENRY <florian.henry@atm-consulting.fr>
Date: Tue, 16 May 2017 19:08:59 +0200
Subject: [PATCH 369/505] fix event thirdparty agenda do not show good owner

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

diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index 4e52f2d8f01..96d43ee4e5f 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -1001,7 +1001,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon='', $noprint=
         if (get_class($filterobj) == 'Societe')  $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as sp ON a.fk_contact = sp.rowid";
         if (get_class($filterobj) == 'Adherent') $sql.= ", ".MAIN_DB_PREFIX."adherent as m";
         if (get_class($filterobj) == 'CommandeFournisseur') $sql.= ", ".MAIN_DB_PREFIX."commande_fournisseur as o";
-        $sql.= " WHERE u.rowid = a.fk_user_author";
+        $sql.= " WHERE u.rowid = a.fk_user_action";
         $sql.= " AND a.entity IN (".getEntity('agenda', 1).")";
         if (get_class($filterobj) == 'Societe'  && $filterobj->id) $sql.= " AND a.fk_soc = ".$filterobj->id;
         if (get_class($filterobj) == 'Project' && $filterobj->id) $sql.= " AND a.fk_project = ".$filterobj->id;

From b0f02851375c30a51c125e049e57cf49bef7af2a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 16 May 2017 18:12:10 +0200
Subject: [PATCH 370/505] Standardize code

---
 htdocs/commande/class/api_orders.class.php | 15 +++++++++++++++
 htdocs/commande/class/commande.class.php   |  1 -
 htdocs/user/class/api_users.class.php      | 17 +++++++++++++++++
 htdocs/user/class/user.class.php           |  2 ++
 4 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/htdocs/commande/class/api_orders.class.php b/htdocs/commande/class/api_orders.class.php
index e0ab753c64c..81a2ad79d69 100644
--- a/htdocs/commande/class/api_orders.class.php
+++ b/htdocs/commande/class/api_orders.class.php
@@ -494,6 +494,21 @@ class Orders extends DolibarrApi
         );
     }
 
+    /**
+     * Clean sensible object datas
+     *
+     * @param   object  $object    Object to clean
+     * @return    array    Array of cleaned object properties
+     */
+    function _cleanObjectDatas($object) {
+    
+        $object = parent::_cleanObjectDatas($object);
+    
+        unset($object->address);
+    
+        return $object;
+    }
+    
     /**
      * Validate fields before create or update object
      *
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index a12a563e58c..fea30eda589 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -116,7 +116,6 @@ class Commande extends CommonOrder
 
     public $demand_reason_id;   // Source reason. Why we receive order (after a phone campaign, ...)
     public $demand_reason_code;
-    public $address;
     public $date;				// Date commande
 	/**
 	 * @deprecated
diff --git a/htdocs/user/class/api_users.class.php b/htdocs/user/class/api_users.class.php
index a759f1dfe08..80065f8d8d2 100644
--- a/htdocs/user/class/api_users.class.php
+++ b/htdocs/user/class/api_users.class.php
@@ -272,6 +272,23 @@ class Users extends DolibarrApi
 		return $this->useraccount->delete($id);
 	}
 
+	/**
+	 * Clean sensible object datas
+	 *
+	 * @param   object  $object    Object to clean
+	 * @return    array    Array of cleaned object properties
+	 */
+	function _cleanObjectDatas($object) {
+	
+	    $object = parent::_cleanObjectDatas($object);
+	
+	    unset($object->default_values);
+	    unset($object->lastsearch_values);
+	    unset($object->lastsearch_values_tmp);
+	     
+	    return $object;
+	}	
+	
 	/**
 	 * Validate fields before create or update object
      * 
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index f23c8aca0b6..e09e52c1882 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -110,6 +110,8 @@ class User extends CommonObject
 	
 	public $conf;           		// To store personal config
 	public $default_values;         // To store default values for user
+	public $lastsearch_values_tmp;  // To store current search criterias for user
+	public $lastsearch_values;      // To store last saved search criterias for user
 	
 	public $users;					// To store all tree of users hierarchy
 	public $parentof;				// To store an array of all parents for all ids.

From b29f325fcf6993861c5979fe361b407b8e82ad66 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 16 May 2017 23:38:23 +0200
Subject: [PATCH 371/505] Work on search criteria persistence

---
 htdocs/core/lib/functions.lib.php      | 78 ++++++++++++++++----------
 htdocs/main.inc.php                    | 39 +++++++++++--
 htdocs/projet/class/project.class.php  | 27 +++++----
 htdocs/societe/class/societe.class.php | 20 ++++---
 4 files changed, 111 insertions(+), 53 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 06ed76c5008..141811e382b 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -237,8 +237,10 @@ function dol_shutdown()
 
 
 /**
- *  Return value of a param into GET or POST supervariable
- *
+ *  Return value of a param into GET or POST supervariable.
+ *  Use the property $user->default_values[path]['creatform'] and/or $user->default_values[path]['filters'] and/or $user->default_values[path]['sortorder']
+ *  Note: The property $user->default_values is loaded by the main when loading the user.
+ *  
  *  @param	string	$paramname   Name of parameter to found
  *  @param	string	$check	     Type of check
  *                                  ''=no check (deprecated)
@@ -255,6 +257,7 @@ function dol_shutdown()
  *  @param  int     $filter      Filter to apply when $check is set to 'custom'. (See http://php.net/manual/en/filter.filters.php for détails)
  *  @param  mixed   $options     Options to pass to filter_var when $check is set to 'custom'.
  *  @return string|string[]      Value found (string or array), or '' if check fails
+ *  
  *  @TODO Set default value for check to alpha. Check all WYSIWYG edition (email and description...) is still ok with rich text.
  */
 function GETPOST($paramname, $check='', $method=0, $filter=NULL, $options=NULL)
@@ -270,16 +273,16 @@ function GETPOST($paramname, $check='', $method=0, $filter=NULL, $options=NULL)
 	
 	if (empty($method) || $method == 3 || $method == 4)
 	{
+    	$relativepathstring = $_SERVER["PHP_SELF"];
+    	if (constant('DOL_URL_ROOT')) $relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_URL_ROOT'),'/').'/', '', $relativepathstring);
+    	$relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
+    	$relativepathstring = preg_replace('/^\//', '', $relativepathstring);
+	
 	    // Management of default values
 	    if (! isset($_GET['sortfield']) && ! empty($conf->global->MAIN_ENABLE_DEFAULT_VALUES))	// If we did a click on a field to sort, we do no apply default values. Same if option MAIN_DISABLE_DEFAULT_VALUES is on
 	    {
 	        if (! empty($_GET['action']) && $_GET['action'] == 'create' && ! empty($paramname) && ! isset($_GET[$paramname]) && ! isset($_POST[$paramname]))
 	        {
-	            $relativepathstring = $_SERVER["PHP_SELF"];
-	            if (constant('DOL_URL_ROOT')) $relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_URL_ROOT'),'/').'/', '', $relativepathstring);
-	            $relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
-	            $relativepathstring = preg_replace('/^\//', '', $relativepathstring);
-	            global $user;
 	            if (! empty($user->default_values))		// $user->default_values defined from menu default values, and values loaded not at first
 	            {
 	                //var_dump($user->default_values[$relativepathstring]['createform']);
@@ -290,46 +293,46 @@ function GETPOST($paramname, $check='', $method=0, $filter=NULL, $options=NULL)
 	        //elseif (preg_match('/list.php$/', $_SERVER["PHP_SELF"]) && ! empty($paramname) && ! isset($_GET[$paramname]) && ! isset($_POST[$paramname]))
 	        elseif (! empty($paramname) && ! isset($_GET[$paramname]) && ! isset($_POST[$paramname]))
 	        {
-	            $relativepathstring = $_SERVER["PHP_SELF"];
-	            if (constant('DOL_URL_ROOT')) $relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_URL_ROOT'),'/').'/', '', $relativepathstring);
-	            $relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
-	            $relativepathstring = preg_replace('/^\//', '', $relativepathstring);
-	            global $user;
 	            if (! empty($user->default_values))		// $user->default_values defined from menu default values
 	            {
 	                //var_dump($user->default_values[$relativepathstring]);
 	                if ($paramname == 'sortfield')
 	                {
-	                    if (isset($user->default_values[$relativepathstring]['sortorder']))
+	                    if (isset($user->default_values[$relativepathstring]['sortorder']))    // We will use the key of $user->default_values[path][sortorder]
 	                    {
+	                        $forbidden_chars_to_replace=array(" ","'","/","\\",":","*","?","\"","<",">","|","[","]",";","=");  // we accept _, -, . and ,
 	                        foreach($user->default_values[$relativepathstring]['sortorder'] as $key => $val)
 	                        {
 	                            if ($out) $out.=', ';
-	                            $out.=dol_string_nospecial($key, '');
+	                            $out.=dol_string_nospecial($key, '', $forbidden_chars_to_replace);
 	                        }
 	                    }
 	                }
 	                elseif ($paramname == 'sortorder')
 	                {
-	                    if (isset($user->default_values[$relativepathstring]['sortorder']))
+	                    if (isset($user->default_values[$relativepathstring]['sortorder']))    // We will use the val of $user->default_values[path][sortorder]
 	                    {
+	                        $forbidden_chars_to_replace=array(" ","'","/","\\",":","*","?","\"","<",">","|","[","]",";","=");  // we accept _, -, . and ,
 	                        foreach($user->default_values[$relativepathstring]['sortorder'] as $key => $val)
 	                        {
 	                            if ($out) $out.=', ';
-	                            $out.=dol_string_nospecial($val, '');
+	                            $out.=dol_string_nospecial($val, '', $forbidden_chars_to_replace);
 	                        }
 	                    }
 	                }
 	                elseif (isset($user->default_values[$relativepathstring]['filters'][$paramname]))
-	                $out = dol_string_nospecial($user->default_values[$relativepathstring]['filters'][$paramname], '');
+	                {
+	                    $forbidden_chars_to_replace=array(" ","'","/","\\",":","*","?","\"","<",">","|","[","]",";","=");  // we accept _, -, . and ,
+	                    $out = dol_string_nospecial($user->default_values[$relativepathstring]['filters'][$paramname], '', $forbidden_chars_to_replace);
+	                }
 	            }
 	        }
 	    }
 	}	
 	
-	if (empty($check) && $conf->global->MAIN_FEATURES_LEVEL > 0)
+	if (empty($check) && $conf->global->MAIN_FEATURES_LEVEL >= 2)
 	{
-	   dol_syslog("A GETPOST is called with 1st param = ".$paramname." and 2nd param not defined, when calling page ".$_SERVER["PHP_SELF"], LOG_WARNING);    
+	   dol_syslog("Deprecated use of GETPOST, called with 1st param = ".$paramname." and 2nd param not defined, when calling page ".$_SERVER["PHP_SELF"], LOG_WARNING);    
 	}
 	
 	if (! empty($check))
@@ -338,7 +341,7 @@ function GETPOST($paramname, $check='', $method=0, $filter=NULL, $options=NULL)
 	    if (! is_array($out))
 	    {
 	        $maxloop=20; $loopnb=0;    // Protection against infinite loop
-	        while (preg_match('/__([A-Z0-9]+_?[A-Z0-9]+)__/i', $out, $reg) && ($loopnb < $maxloop))    // Detect '__ABCDEF__' as key 'ABCDEF' and '__ABC_DEF__' as key 'ABC_DEF'
+	        while (preg_match('/__([A-Z0-9]+_?[A-Z0-9]+)__/i', $out, $reg) && ($loopnb < $maxloop))    // Detect '__ABCDEF__' as key 'ABCDEF' and '__ABC_DEF__' as key 'ABC_DEF'. Detection is also correct when 2 vars are side by side.
 	        {
 	            $loopnb++; $newout = '';
 
@@ -420,6 +423,17 @@ function GETPOST($paramname, $check='', $method=0, $filter=NULL, $options=NULL)
 	    }
 	}
 
+	// Save data into session if key start with 'search_' or is 'smonth', 'syear', 'month', 'year'
+	if (empty($method) || $method == 3 || $method == 4)
+	{
+	    //if (preg_match('/^search_/', $paramname) || in_array($paramname, array('sortorder', 'sortfield", 'smonth', 'syear', 'month', 'year')))
+	    if (preg_match('/^search_/', $paramname) || in_array($paramname, array('sortorder','sortfield')))
+	    {
+	        //if ($paramname == 'sortorder') var_dump($paramname.' - '.$out);
+	        $user->lastsearch_values_tmp[$relativepathstring][$paramname]=$out;
+	    }
+	}
+	
 	return $out;
 }
 
@@ -3223,8 +3237,8 @@ function print_liste_field_titre($name, $file="", $field="", $begin="", $morepar
  *	@param	string	$begin       ("" by defaut)
  *	@param	string	$moreparam   Add more parameters on sort url links ("" by default)
  *	@param  string	$moreattrib  Add more attributes on th ("" by defaut). To add more css class, use param $prefix.
- *	@param  string	$sortfield   Current field used to sort
- *	@param  string	$sortorder   Current sort order
+ *	@param  string	$sortfield   Current field used to sort (Ex: 'd.datep,d.id')
+ *	@param  string	$sortorder   Current sort order (Ex: 'asc,desc')
  *  @param	string	$prefix		 Prefix for css. Use space after prefix to add your own CSS tag.
  *	@return	string
  */
@@ -3241,11 +3255,15 @@ function getTitleFieldOfList($name, $thead=0, $file="", $field="", $begin="", $m
 	if ($thead==2) $tag='div';
 
 	$tmpsortfield=explode(',',$sortfield);
-	$sortfield=trim($tmpsortfield[0]);
+	$sortfield1=trim($tmpsortfield[0]);    // If $sortfield is 'd.datep,d.id', it becomes 'd.datep'
+	$tmpfield=explode(',',$field);
+	$field1=trim($tmpfield[0]);            // If $field is 'd.datep,d.id', it becomes 'd.datep'
+
+	//var_dump('field='.$field.' field1='.$field1.' sortfield='.$sortfield.' sortfield1='.$sortfield1);
 	
-	// If field is used as sort criteria we use a specific class
+	// If field is used as sort criteria we use a specific css class liste_titre_sel
 	// Example if (sortfield,field)=("nom","xxx.nom") or (sortfield,field)=("nom","nom")
-	if ($field && ($sortfield == $field || $sortfield == preg_replace("/^[^\.]+\./","",$field))) $out.= '<'.$tag.' class="'.$prefix.'liste_titre_sel" '. $moreattrib.'>';
+	if ($field1 && ($sortfield1 == $field1 || $sortfield1 == preg_replace("/^[^\.]+\./","",$field1))) $out.= '<'.$tag.' class="'.$prefix.'liste_titre_sel" '. $moreattrib.'>';
 	else $out.= '<'.$tag.' class="'.$prefix.'liste_titre" '. $moreattrib.'>';
 
 	if (empty($thead) && $field)    // If this is a sort field
@@ -3255,15 +3273,15 @@ function getTitleFieldOfList($name, $thead=0, $file="", $field="", $begin="", $m
 		$options=preg_replace('/&+/i','&',$options);
 		if (! preg_match('/^&/',$options)) $options='&'.$options;
 
-		if ($field != $sortfield)
+		if ($field1 != $sortfield1) // We are on another field
 		{
             if (preg_match('/^DESC/', $sortorder)) $out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=desc&begin='.$begin.$options.'">';
             else $out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=asc&begin='.$begin.$options.'">';
 		}
-		else
+		else                      // We are of first sorting criteria
 		{
-            if (preg_match('/^ASC/', $sortorder)) $out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=desc&begin='.$begin.$options.'">';
-		    else $out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=asc&begin='.$begin.$options.'">';
+            if (preg_match('/^ASC/', $sortorder)) $out.= '<a href="'.$file.'?sortfield='.$sortfield.'&sortorder=desc&begin='.$begin.$options.'">';
+		    else $out.= '<a href="'.$file.'?sortfield='.$sortfield.'&sortorder=asc&begin='.$begin.$options.'">';
 		}
 	}
 
@@ -3285,7 +3303,7 @@ function getTitleFieldOfList($name, $thead=0, $file="", $field="", $begin="", $m
 		//$sortimg.= '<img width="2" src="'.DOL_URL_ROOT.'/theme/common/transparent.png" alt="">';
 		//$sortimg.= '<span class="nowrap">';
 
-		if (! $sortorder || $field != $sortfield)
+		if (! $sortorder || $field1 != $sortfield1)
 		{
 			//$out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=asc&begin='.$begin.$options.'">'.img_down("A-Z",0).'</a>';
 			//$out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=desc&begin='.$begin.$options.'">'.img_up("Z-A",0).'</a>';
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index c2b99f22c1f..d632e91d537 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -646,6 +646,19 @@ if (! defined('NOLOGIN'))
 	       // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
 	       $hookmanager->initHooks(array('main'));
 
+	       if (! empty($_GET['save_lastsearch_values']))    // Keep $_GET here
+	       {
+               $relativepathstring = preg_replace('/\?.*$/','',$_SERVER["HTTP_REFERER"]);
+	           if (constant('DOL_MAIN_URL_ROOT')) $relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_MAIN_URL_ROOT'),'/').'/', '', $relativepathstring);
+	           $relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
+               $relativepathstring = preg_replace('/^\//', '', $relativepathstring);
+               if (! empty($_SESSION['lastsearch_values_tmp_'.$relativepathstring]))
+               {
+                   $_SESSION['lastsearch_values_'.$relativepathstring]=$_SESSION['lastsearch_values_tmp_'.$relativepathstring];
+                   unset($_SESSION['lastsearch_values_tmp_'.$relativepathstring]);
+               }
+	       }
+	       
 	       $action = '';
 	       $reshook = $hookmanager->executeHooks('updateSession', array(), $user, $action);
 	       if ($reshook < 0) {
@@ -653,7 +666,7 @@ if (! defined('NOLOGIN'))
 	       }
         }
     }
-
+    
     // Is it a new session that has started ?
     // If we are here, this means authentication was successfull.
     if (! isset($_SESSION["dol_login"]))
@@ -1858,7 +1871,7 @@ if (! function_exists("llxFooter"))
 {
     /**
      * Show HTML footer
-     * Close div /DIV data-role=page + /DIV class=fiche + /DIV /DIV main layout + /BODY + /HTML.
+     * Close div /DIV class=fiche + /DIV id-right + /DIV id-container + /BODY + /HTML.
      * If global var $delayedhtmlcontent was filled, we output it just before closing the body.
      *
      * @param	string	$comment    A text to add as HTML comment into HTML generated page
@@ -1867,12 +1880,30 @@ if (! function_exists("llxFooter"))
      */
     function llxFooter($comment='',$zone='private')
     {
-        global $conf, $langs;
+        global $conf, $langs, $user;
         global $delayedhtmlcontent;
 
         // Global html output events ($mesgs, $errors, $warnings)
         dol_htmloutput_events();
 
+        // Save $user->lastsearch_values if defined (define on list pages when a form field search_xxx exists)
+        if (is_object($user) && ! empty($user->lastsearch_values_tmp) && is_array($user->lastsearch_values_tmp))
+        {
+            // Clean data
+            foreach($user->lastsearch_values_tmp as $key => $val)
+            {
+                unset($_SESSION['lastsearch_values_tmp_'.$key]);
+                if (count($val))
+                {
+                    if (empty($val['sortfield'])) unset($val['sortfield']);
+                    if (empty($val['sortorder'])) unset($val['sortorder']);
+                    dol_syslog('Save lastsearch_values_tmp_'.$key.'='.json_encode($val, 0, 1));
+                    $_SESSION['lastsearch_values_tmp_'.$key]=json_encode($val);
+                    unset($_SESSION['lastsearch_values_'.$key]);
+                }
+            }
+        }
+
         // Core error message
         if (! empty($conf->global->MAIN_CORE_ERROR))
         {
@@ -1943,7 +1974,7 @@ if (! function_exists("llxFooter"))
         			});
         		});
             </script>' . "\n";
-        }         
+        }
         
         // Wrapper to manage dropdown
         if ($conf->use_javascript_ajax)
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index 5efaae1fd78..6a7b130ac0d 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -922,15 +922,16 @@ class Project extends CommonObject
     /**
      * 	Return clicable name (with picto eventually)
      *
-     * 	@param	int		$withpicto		0=No picto, 1=Include picto into link, 2=Only picto
-     * 	@param	string	$option			Variant ('', 'nolink')
-     * 	@param	int		$addlabel		0=Default, 1=Add label into string, >1=Add first chars into string
-     *  @param	string	$moreinpopup	Text to add into popup
-     *  @param	string	$sep			Separator between ref and label if option addlabel is set
-     *  @param	int   	$notooltip		1=Disable tooltip
-     * 	@return	string					Chaine avec URL
+     * 	@param	int		$withpicto		          0=No picto, 1=Include picto into link, 2=Only picto
+     * 	@param	string	$option			          Variant ('', 'nolink')
+     * 	@param	int		$addlabel		          0=Default, 1=Add label into string, >1=Add first chars into string
+     *  @param	string	$moreinpopup	          Text to add into popup
+     *  @param	string	$sep			          Separator between ref and label if option addlabel is set
+     *  @param	int   	$notooltip		          1=Disable tooltip
+     *  @param  int     $save_lastsearch_value    -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+     * 	@return	string					          String with URL
      */
-    function getNomUrl($withpicto=0, $option='', $addlabel=0, $moreinpopup='', $sep=' - ', $notooltip=0)
+    function getNomUrl($withpicto=0, $option='', $addlabel=0, $moreinpopup='', $sep=' - ', $notooltip=0, $save_lastsearch_value=-1)
     {
         global $conf, $langs, $user;
 
@@ -940,10 +941,8 @@ class Project extends CommonObject
         
         $label='';
         if ($option != 'nolink') $label = '<u>' . $langs->trans("ShowProject") . '</u>';
-        if (! empty($this->ref))
-            $label .= ($label?'<br>':'').'<b>' . $langs->trans('Ref') . ': </b>' . $this->ref;	// The space must be after the : to not being explode when showing the title in img_picto
-        if (! empty($this->title))
-            $label .= ($label?'<br>':'').'<b>' . $langs->trans('Label') . ': </b>' . $this->title;	// The space must be after the : to not being explode when showing the title in img_picto
+        $label .= ($label?'<br>':'').'<b>' . $langs->trans('Ref') . ': </b>' . $this->ref;	// The space must be after the : to not being explode when showing the title in img_picto
+        $label .= ($label?'<br>':'').'<b>' . $langs->trans('Label') . ': </b>' . $this->title;	// The space must be after the : to not being explode when showing the title in img_picto
         if (! empty($this->thirdparty_name))
             $label .= ($label?'<br>':'').'<b>' . $langs->trans('ThirdParty') . ': </b>' . $this->thirdparty_name;	// The space must be after the : to not being explode when showing the title in img_picto
         if (! empty($this->dateo))
@@ -965,6 +964,10 @@ class Project extends CommonObject
             {
                 $url = DOL_URL_ROOT . '/projet/card.php?id=' . $this->id;
             }
+            // Add param to save lastsearch_values or not
+            $add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0); 
+            if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
+            if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
         }
         
         $linkclose='';
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index fb486629731..6aebf0e8786 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -1824,13 +1824,14 @@ class Societe extends CommonObject
     /**
      *    	Return a link on thirdparty (with picto)
      *
-     *		@param	int		$withpicto		Add picto into link (0=No picto, 1=Include picto with link, 2=Picto only)
-     *		@param	string	$option			Target of link ('', 'customer', 'prospect', 'supplier', 'project')
-     *		@param	int		$maxlen			Max length of name
-     *      @param	int  	$notooltip		1=Disable tooltip
-     *		@return	string					String with URL
+     *		@param	int		$withpicto		          Add picto into link (0=No picto, 1=Include picto with link, 2=Picto only)
+     *		@param	string	$option			          Target of link ('', 'customer', 'prospect', 'supplier', 'project')
+     *		@param	int		$maxlen			          Max length of name
+     *      @param	int  	$notooltip		          1=Disable tooltip
+     *      @param  int     $save_lastsearch_value    -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+     *		@return	string					          String with URL
      */
-    function getNomUrl($withpicto=0, $option='', $maxlen=0, $notooltip=0)
+    function getNomUrl($withpicto=0, $option='', $maxlen=0, $notooltip=0, $save_lastsearch_value=-1)
     {
         global $conf, $langs, $hookmanager;
 
@@ -1929,7 +1930,12 @@ class Societe extends CommonObject
         $label.= '</div>';
 
         // Add type of canvas
-        $linkstart.=(!empty($this->canvas)?'&canvas='.$this->canvas:'').'"';
+        $linkstart.=(!empty($this->canvas)?'&canvas='.$this->canvas:'');
+        // Add param to save lastsearch_values or not
+        $add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0); 
+        if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
+        if ($add_save_lastsearch_values) $linkstart.='&save_lastsearch_values=1';
+        $linkstart.='"';
 
         $linkclose='';
         if (empty($notooltip))

From 7931c548c78650ab31843f8be27bea665395ec47 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 16 May 2017 23:57:41 +0200
Subject: [PATCH 372/505] Better translation

---
 htdocs/install/mysql/data/llx_c_shipment_mode.sql | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/install/mysql/data/llx_c_shipment_mode.sql b/htdocs/install/mysql/data/llx_c_shipment_mode.sql
index 7bc3f8f590d..189bd3ea94b 100644
--- a/htdocs/install/mysql/data/llx_c_shipment_mode.sql
+++ b/htdocs/install/mysql/data/llx_c_shipment_mode.sql
@@ -1,6 +1,6 @@
 -- Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
 -- Copyright (C) 2003      Jean-Louis Bergamo   <jlb@j1b.org>
--- Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
+-- Copyright (C) 2004-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
 -- Copyright (C) 2004      Benoit Mortier       <benoit.mortier@opensides.be>
 -- Copyright (C) 2004      Guillaume Delecourt  <guillaume.delecourt@opensides.be>
 -- Copyright (C) 2005-2011 Regis Houssin        <regis.houssin@capnetworks.com>
@@ -29,8 +29,8 @@
 --
 -- Sending method
 --
-INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (1,'CATCH','Catch','Catch by client','',1);
-INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (2,'TRANS','Transporter','Generic transporter','',1);
+INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (1,'CATCH','At-Store Reclamation','At-Store Reclamation by the customer','',1);
+INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (2,'TRANS','Generic transporter','Generic transporter','',1);
 INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (3,'COLSUI','Colissimo Suivi','Colissimo Suivi','http://www.colissimo.fr/portail_colissimo/suivre.do?colispart={TRACKID}',0);
 INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (4,'LETTREMAX','Lettre Max','Courrier Suivi et Lettre Max','',0);
 INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (5,'UPS','UPS','United Parcel Service','http://wwwapps.ups.com/etracking/tracking.cgi?InquiryNumber2=&InquiryNumber3=&tracknums_displayed=3&loc=fr_FR&TypeOfInquiryNumber=T&HTMLVersion=4.0&InquiryNumber22=&InquiryNumber32=&track=Track&Suivi.x=64&Suivi.y=7&Suivi=Valider&InquiryNumber1={TRACKID}',0);

From 1a98886aa3012008920a72000c5aaf087afb73f9 Mon Sep 17 00:00:00 2001
From: Sergio Sanchis Climent <sergiosanchis@hotmail.com>
Date: Wed, 17 May 2017 00:42:29 +0200
Subject: [PATCH 373/505] FIX: #6813

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

diff --git a/htdocs/admin/supplier_proposal.php b/htdocs/admin/supplier_proposal.php
index 069c90ead8a..6752566a70f 100644
--- a/htdocs/admin/supplier_proposal.php
+++ b/htdocs/admin/supplier_proposal.php
@@ -274,7 +274,7 @@ foreach ($dirmodels as $reldir)
 
 			while (($file = readdir($handle))!==false)
 			{
-				if (substr($file, 0, 21) == 'mod_supplier_proposal_' && substr($file, dol_strlen($file)-3, 3) == 'php')
+				if (substr($file, 0, 22) == 'mod_supplier_proposal_' && substr($file, dol_strlen($file)-3, 3) == 'php')
 				{
 					$file = substr($file, 0, dol_strlen($file)-4);
 

From d86b42b024cdf8ffb5d793ff935ffa28663dc70b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 17 May 2017 14:45:08 +0200
Subject: [PATCH 374/505] Missing title, bad css

---
 htdocs/langs/en_US/suppliers.lang | 1 +
 htdocs/product/fournisseurs.php   | 8 +++++---
 htdocs/product/price.php          | 7 ++++---
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/htdocs/langs/en_US/suppliers.lang b/htdocs/langs/en_US/suppliers.lang
index b890919ace5..d84925d0676 100644
--- a/htdocs/langs/en_US/suppliers.lang
+++ b/htdocs/langs/en_US/suppliers.lang
@@ -14,6 +14,7 @@ TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Some sub-products have no price defined
 AddSupplierPrice=Add buying price
 ChangeSupplierPrice=Change buying price
+SupplierPrices=Supplier prices
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=This reference supplier is already associated with a reference: %s
 NoRecordedSuppliers=No suppliers recorded
 SupplierPayment=Supplier payment
diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index 6ff8d9deca0..1d54495b605 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -584,6 +584,11 @@ if ($id > 0 || $ref)
 
 			if ($user->rights->fournisseur->lire)
 			{
+				$product_fourn = new ProductFournisseur($db);
+				$product_fourn_list = $product_fourn->list_product_fournisseur_price($object->id, $sortfield, $sortorder);
+				$nbtotalofrecords = count($product_fourn_list);
+			    print_barre_liste($langs->trans('SupplierPrices'), $page, $_SERVEUR ['PHP_SELF'], $option, $sortfield, $sortorder, '', count($product_fourn_list), $nbtotalofrecords, 'title_accountancy.png');
+			     
 				// Suppliers list title
 			    print '<div class="div-table-responsive">';
 			    print '<table class="noborder" width="100%">';
@@ -611,9 +616,6 @@ if ($id > 0 || $ref)
 				print_liste_field_titre('');
 				print "</tr>\n";
 
-				$product_fourn = new ProductFournisseur($db);
-				$product_fourn_list = $product_fourn->list_product_fournisseur_price($object->id, $sortfield, $sortorder);
-
 				if (is_array($product_fourn_list))
 				{
 					$var=true;
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index 1e9bcec3d52..607d6e07097 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -1755,7 +1755,8 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 	else if ($action != 'showlog_default_price' && $action != 'edit_price')
 	{
 		// List of all prices by customers
-
+        print '<!-- list of prices per customer -->'."\n";
+        
 		// Count total nb of records
 		$nbtotalofrecords = '';
 		if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
@@ -1792,8 +1793,8 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 		if (count($prodcustprice->lines) > 0 || $search_soc)
 		{
     		print '<tr class="liste_titre">';
-    		print '<td><input type="text" class="flat" name="search_soc" value="' . $search_soc . '" size="20"></td>';
-    		print '<td colspan="8">&nbsp;</td>';
+    		print '<td class="liste_titre"><input type="text" class="flat" name="search_soc" value="' . $search_soc . '" size="20"></td>';
+    		print '<td class="liste_titre" colspan="8">&nbsp;</td>';
     		// Print the search button
             print '<td class="liste_titre" align="right">';
             $searchpitco=$form->showFilterAndCheckAddButtons(0);

From e2a7b0943f8e63034a5e46bf7ae332c495999834 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 17 May 2017 14:52:27 +0200
Subject: [PATCH 375/505] Clean dead code

---
 htdocs/fourn/ajax/getSupplierPrices.php          | 6 ------
 htdocs/fourn/class/fournisseur.product.class.php | 4 ++--
 htdocs/margin/lib/margins.lib.php                | 2 --
 htdocs/product/fournisseurs.php                  | 3 ++-
 4 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/htdocs/fourn/ajax/getSupplierPrices.php b/htdocs/fourn/ajax/getSupplierPrices.php
index af3d728dc78..817f83f7ab6 100644
--- a/htdocs/fourn/ajax/getSupplierPrices.php
+++ b/htdocs/fourn/ajax/getSupplierPrices.php
@@ -78,12 +78,6 @@ if ($idprod > 0)
 				$title.= price($unitprice,0,$langs,0,0,-1,$conf->currency)."/".$langs->trans("Unit");
 				$price = $unitprice;
 			}
-			if ($productSupplier->fourn_unitcharges > 0 && ($conf->global->MARGIN_TYPE == "2"))
-			{
-				$title.=" + ";
-				$title.= price($productSupplier->fourn_unitcharges,0,$langs,0,0,-1,$conf->currency);
-				$price += $productSupplier->fourn_unitcharges;
-			}
 			
 			$label = price($price,0,$langs,0,0,-1,$conf->currency)."/".$langs->trans("Unit");
 			if ($productSupplier->fourn_ref) $label.=' ('.$productSupplier->fourn_ref.')';
diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php
index eaff46ddc2c..4f576148099 100644
--- a/htdocs/fourn/class/fournisseur.product.class.php
+++ b/htdocs/fourn/class/fournisseur.product.class.php
@@ -229,12 +229,12 @@ class ProductFournisseur extends Product
 			$sql.= " remise_percent = ".$remise_percent.",";
 			$sql.= " remise = ".$remise.",";
 			$sql.= " unitprice = ".$unitBuyPrice.",";
-			$sql.= " unitcharges = ".$unitCharges.",";
+			$sql.= " unitcharges = ".$unitCharges.",";   // deprecated
 			$sql.= " tva_tx = ".$tva_tx.",";
 			$sql.= " fk_availability = ".$availability.",";
 			$sql.= " entity = ".$conf->entity.",";
 			$sql.= " info_bits = ".$newnpr.",";
-			$sql.= " charges = ".$charges.",";
+			$sql.= " charges = ".$charges.",";           // deprecated
 			$sql.= " delivery_time_days = ".($delivery_time_days != '' ? $delivery_time_days : 'null').",";
 			$sql.= " supplier_reputation = ".(empty($supplier_reputation) ? 'NULL' : "'".$this->db->escape($supplier_reputation)."'");			
 			$sql.= " WHERE rowid = ".$this->product_fourn_price_id;
diff --git a/htdocs/margin/lib/margins.lib.php b/htdocs/margin/lib/margins.lib.php
index d7dbd5d81eb..e1c2d59b7b8 100644
--- a/htdocs/margin/lib/margins.lib.php
+++ b/htdocs/margin/lib/margins.lib.php
@@ -124,8 +124,6 @@ function getMarginInfos($pvht, $remise_percent, $tva_tx, $localtax1_tx, $localta
 		if ($product->fetch_product_fournisseur_price($fk_pa))
 		{
 			$paht_ret = $product->fourn_unitprice * (1 - $product->fourn_remise_percent / 100);
-			if ($conf->global->MARGIN_TYPE == "2" && $product->fourn_unitcharges > 0)
-				$paht_ret += $product->fourn_unitcharges;
 		}
 		else
 		{
diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index 546d94773a3..2c0a5cd15d7 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -678,6 +678,7 @@ if ($id > 0 || $ref)
 						print'</td>';
 
 						// Charges ????
+						/*
 						if ($conf->global->PRODUCT_CHARGES)
 						{
 							if (! empty($conf->margin->enabled))
@@ -686,7 +687,7 @@ if ($id > 0 || $ref)
 								print $productfourn->fourn_unitcharges?price($productfourn->fourn_unitcharges) : ($productfourn->fourn_qty?price($productfourn->fourn_charges/$productfourn->fourn_qty):"&nbsp;");
 								print '</td>';
 							}
-						}
+						}*/
 
 						if (is_object($hookmanager))
 						{

From 56989ae5aff33d76a79d365374e16b6e1bfba6da Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 17 May 2017 15:10:45 +0200
Subject: [PATCH 376/505] Add missing fields making not possible to enter
 reference price of products into another currency

---
 htdocs/install/mysql/migration/5.0.0-6.0.0.sql   | 16 ++++++++++++++++
 .../tables/llx_product_fournisseur_price.sql     |  8 +++++++-
 .../tables/llx_product_fournisseur_price_log.sql |  7 ++++++-
 .../install/mysql/tables/llx_product_price.sql   |  5 ++++-
 4 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index 88260498f28..6ba7707b249 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -189,6 +189,22 @@ ALTER TABLE llx_cronjob ADD COLUMN processing integer NOT NULL DEFAULT 0;
 ALTER TABLE llx_website ADD COLUMN fk_user_create integer;
 ALTER TABLE llx_website ADD COLUMN fk_user_modif integer;
 
+-- Add missing fields making not possible to enter reference price of products into another currency
+ALTER TABLE llx_product_fournisseur_price ADD COLUMN multicurrency_tx			double(24,8) DEFAULT 1;
+ALTER TABLE llx_product_fournisseur_price ADD COLUMN multicurrency_price_ttc	double(24,8) DEFAULT NULL;
+
+ALTER TABLE llx_product_fournisseur_price ADD COLUMN fk_multicurrency		 integer;
+ALTER TABLE llx_product_fournisseur_price ADD COLUMN multicurrency_code		 varchar(255);
+ALTER TABLE llx_product_fournisseur_price ADD COLUMN multicurrency_tx	     double(24,8) DEFAULT 1;
+ALTER TABLE llx_product_fournisseur_price ADD COLUMN multicurrency_price	 double(24,8) DEFAULT NULL;
+ALTER TABLE llx_product_fournisseur_price ADD COLUMN multicurrency_price_ttc double(24,8) DEFAULT NULL;
+
+ALTER TABLE llx_product_fournisseur_price_log ADD COLUMN fk_multicurrency		 integer;
+ALTER TABLE llx_product_fournisseur_price_log ADD COLUMN multicurrency_code		 varchar(255);
+ALTER TABLE llx_product_fournisseur_price_log ADD COLUMN multicurrency_tx	     double(24,8) DEFAULT 1;
+ALTER TABLE llx_product_fournisseur_price_log ADD COLUMN multicurrency_price	 double(24,8) DEFAULT NULL;
+ALTER TABLE llx_product_fournisseur_price_log ADD COLUMN multicurrency_price_ttc double(24,8) DEFAULT NULL;
+
 
 create table llx_payment_various
 (
diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql b/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql
index 94032b784f4..f341b103edb 100755
--- a/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql
+++ b/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql
@@ -43,5 +43,11 @@ create table llx_product_fournisseur_price
   fk_supplier_price_expression	integer,            -- Link to the rule for dynamic price calculation
   import_key			varchar(14),                -- Import key
   delivery_time_days    integer,
-  supplier_reputation varchar(10)
+  supplier_reputation varchar(10),
+  
+  fk_multicurrency		integer,
+  multicurrency_code	varchar(255),
+  multicurrency_tx			double(24,8) DEFAULT 1,
+  multicurrency_price	double(24,8) DEFAULT NULL,
+  multicurrency_price_ttc	double(24,8) DEFAULT NULL
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql b/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql
index 3d54f9ef341..e9b78922413 100644
--- a/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql
+++ b/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql
@@ -24,6 +24,11 @@ create table llx_product_fournisseur_price_log
   fk_product_fournisseur      integer      NOT NULL,
   price                       double(24,8) DEFAULT 0,
   quantity                    double,
-  fk_user                     integer
+  fk_user                     integer,
 
+  fk_multicurrency		integer,
+  multicurrency_code	varchar(255),
+  multicurrency_tx			double(24,8) DEFAULT 1,
+  multicurrency_price	double(24,8) DEFAULT NULL,
+  multicurrency_price_ttc	double(24,8) DEFAULT NULL
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_product_price.sql b/htdocs/install/mysql/tables/llx_product_price.sql
index ee2ee953c49..a7f9ba38751 100755
--- a/htdocs/install/mysql/tables/llx_product_price.sql
+++ b/htdocs/install/mysql/tables/llx_product_price.sql
@@ -46,6 +46,9 @@ create table llx_product_price
   
   fk_multicurrency		integer,
   multicurrency_code	varchar(255),
-  multicurrency_price	double(24,8) DEFAULT NULL
+  multicurrency_tx			double(24,8) DEFAULT 1,
+  multicurrency_price	double(24,8) DEFAULT NULL,
+  multicurrency_price_ttc	double(24,8) DEFAULT NULL
+  
 )ENGINE=innodb;
 

From 1d6b4cb28ace17c701a6e647288610358002fade Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 17 May 2017 15:25:09 +0200
Subject: [PATCH 377/505] Look and feel v6

---
 htdocs/product/price.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index cce87bfae5a..d3e144b91ca 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -1080,6 +1080,7 @@ if ($action == 'edit_price' && $object->getRights()->creer)
 
 	if (empty($conf->global->PRODUIT_MULTIPRICES))
 	{
+	    print '<!-- Edit price -->'."\n";
 		print '<form action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '" method="POST">';
 		print '<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">';
 		print '<input type="hidden" name="action" value="update_price">';
@@ -1184,7 +1185,8 @@ if ($action == 'edit_price' && $object->getRights()->creer)
 	}
 	else
 	{
-		?>
+	    print '<!-- Edit price per level -->'."\n";
+	    ?>
 		<script>
 
 			var showHidePriceRules = function () {
@@ -1213,7 +1215,7 @@ if ($action == 'edit_price' && $object->getRights()->creer)
 		print '<input type="hidden" name="action" value="update_price">';
 		print '<input type="hidden" name="id" value="' . $object->id . '">';
 
-		dol_fiche_head('');
+		//dol_fiche_head('', '', '', -1);
 		
 		if (! empty($conf->global->PRODUIT_MULTIPRICES) && ! empty($conf->global->PRODUIT_MULTIPRICES_ALLOW_AUTOCALC_PRICELEVEL)) {
 			print $langs->trans('UseMultipriceRules'). ' <input type="checkbox" id="usePriceRules" name="usePriceRules" '.($object->price_autogen ? 'checked' : '').'><br><br>';
@@ -1295,7 +1297,7 @@ if ($action == 'edit_price' && $object->getRights()->creer)
 		
 		print '</table>';
 		
-		dol_fiche_end();
+		//dol_fiche_end();
 		
 		print '<div style="text-align: center">';
 		print '<input type="submit" class="button" value="' . $langs->trans("Save") . '">';

From c224e2b4f607d41c392e34fada46556711322472 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 17 May 2017 16:05:26 +0200
Subject: [PATCH 378/505] Remove table that does not exists

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

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 4a8c1e9f8fb..1225eb82696 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -1076,7 +1076,7 @@ class Product extends CommonObject
    			// Delete all child tables
 			if (! $error)
 			{
-				$elements = array('product_fournisseur_price','product_price','product_lang','categorie_product','product_stock','product_customer_price','product_lot','product_warehouse_properties');  // product_batch is done before
+				$elements = array('product_fournisseur_price','product_price','product_lang','categorie_product','product_stock','product_customer_price','product_lot');  // product_batch is done before
     			foreach($elements as $table)
     			{
     				if (! $error)

From 169859b7086704b4362d7964be64a5f2dd4d11ef Mon Sep 17 00:00:00 2001
From: KHELIFA <kkhelifa@open-dsi.fr>
Date: Wed, 17 May 2017 17:00:45 +0200
Subject: [PATCH 379/505] Module Agenda: Add option - Show linked object into
 agenda view

---
 htdocs/admin/agenda_other.php      | 24 ++++++++++++++++++++++++
 htdocs/comm/action/index.php       | 10 ++++++++++
 htdocs/comm/action/listactions.php | 18 +++++++++++++++++-
 htdocs/langs/en_US/admin.lang      |  1 +
 htdocs/langs/fr_FR/admin.lang      |  1 +
 5 files changed, 53 insertions(+), 1 deletion(-)

diff --git a/htdocs/admin/agenda_other.php b/htdocs/admin/agenda_other.php
index 1d785e882fc..55b61145b6a 100644
--- a/htdocs/admin/agenda_other.php
+++ b/htdocs/admin/agenda_other.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2011-2017  Juanjo Menent           <jmenent@2byte.es>
  * Copyright (C) 2015		Jean-François Ferry	    <jfefe@aternatik.fr>
  * Copyright (C) 2016		Charlie Benke		    <charlie@patas-monkey.com>
+ * Copyright (C) 2017       Open-DSI                <support@open-dsi.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
@@ -431,6 +432,29 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0)
     }
 }
 
+// AGENDA_SHOW_LINKED_OBJECT
+$var=!$var;
+print '<tr '.$bc[$var].'>'."\n";
+print '<td>'.$langs->trans("AGENDA_SHOW_LINKED_OBJECT").'</td>'."\n";
+print '<td align="center">&nbsp;</td>'."\n";
+print '<td align="right">'."\n";
+if (! empty($conf->use_javascript_ajax))
+{
+    print ajax_constantonoff('AGENDA_SHOW_LINKED_OBJECT');
+}
+else
+{
+    if (empty($conf->global->AGENDA_SHOW_LINKED_OBJECT))
+    {
+        print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_AGENDA_SHOW_LINKED_OBJECT">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
+    }
+    else
+    {
+        print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_AGENDA_SHOW_LINKED_OBJECT">'.img_picto($langs->trans("Enabled"),'switch_on').'</a>';
+    }
+}
+print '</td></tr>'."\n";
+
 print '</table>';
 
 dol_fiche_end();
diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index 47ef8093c1a..0a8ab49ea38 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -6,6 +6,7 @@
  * 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>
+ * Copyright (C) 2017      Open-DSI             <support@open-dsi.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
@@ -446,6 +447,7 @@ $sql.= ' a.percent,';
 $sql.= ' a.fk_user_author,a.fk_user_action,';
 $sql.= ' a.transparency, a.priority, a.fulldayevent, a.location,';
 $sql.= ' a.fk_soc, a.fk_contact,';
+$sql.= ' a.fk_element, a.elementtype,';
 $sql.= ' ca.code as type_code, ca.libelle as type_label, ca.color as type_color';
 $sql.= ' FROM '.MAIN_DB_PREFIX.'c_actioncomm as ca, '.MAIN_DB_PREFIX."actioncomm as a";
 if (! $user->rights->societe->client->voir && ! $socid) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON a.fk_soc = sc.fk_soc";
@@ -570,6 +572,8 @@ if ($resql)
         $event->fulldayevent=$obj->fulldayevent;
         $event->location=$obj->location;
         $event->transparency=$obj->transparency;
+        $event->fk_element=$obj->fk_element;
+        $event->elementtype=$obj->elementtype;
 
         $event->societe->id=$obj->fk_soc;
         $event->contact->id=$obj->fk_contact;
@@ -1478,6 +1482,12 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
                             if ($linerelatedto) $linerelatedto.=' / ';
                             if (! empty($contact->id)) $linerelatedto.=$contact->getNomUrl(1,'',0);
                         }
+                        if (! empty($event->fk_element) && $event->fk_element > 0 && ! empty($event->elementtype) && ! empty($conf->global->AGENDA_SHOW_LINKED_OBJECT))
+                        {
+                            include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+                            if ($linerelatedto) $linerelatedto.=' / ';
+                            $linerelatedto.=dolGetElementUrl($event->fk_element,$event->elementtype,1);
+                        }
                         if ($linerelatedto) print '<br>'.$linerelatedto;
                     }
 
diff --git a/htdocs/comm/action/listactions.php b/htdocs/comm/action/listactions.php
index 3e6224e0c41..4de2fce68dd 100644
--- a/htdocs/comm/action/listactions.php
+++ b/htdocs/comm/action/listactions.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2003      Eric Seigne          <erics@rycks.com>
  * Copyright (C) 2004-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2017      Open-DSI             <support@open-dsi.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
@@ -183,6 +184,7 @@ $sql.= " s.nom as societe, s.rowid as socid, s.client,";
 $sql.= " a.id, a.label, a.datep as dp, a.datep2 as dp2,";
 $sql.= ' a.fk_user_author,a.fk_user_action,';
 $sql.= " a.fk_contact, a.note, a.percent as percent,";
+$sql.= " a.fk_element, a.elementtype,";
 $sql.= " c.code as type_code, c.libelle as type_label,";
 $sql.= " sp.lastname, sp.firstname";
 $sql.= " FROM ".MAIN_DB_PREFIX."c_actioncomm as c, ".MAIN_DB_PREFIX."actioncomm as a";
@@ -355,6 +357,7 @@ if ($resql)
 	print '</td>';
 	print '<td class="liste_titre"></td>';
 	print '<td class="liste_titre"></td>';
+    if (! empty($conf->global->AGENDA_SHOW_LINKED_OBJECT)) print '<td class="liste_titre"></td>';
 	print '<td class="liste_titre"></td>';
     print '<td class="liste_titre center">';
     print $formactions->form_select_status_action('formaction',$status,1,'status',1,2);
@@ -375,7 +378,8 @@ if ($resql)
 	print_liste_field_titre($langs->trans("DateEnd"),$_SERVER["PHP_SELF"],"a.datep2",$param,'','align="center"',$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("ThirdParty"),$_SERVER["PHP_SELF"],"s.nom",$param,"","",$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("Contact"),$_SERVER["PHP_SELF"],"a.fk_contact",$param,"","",$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("ActionsOwnedByShort"),$_SERVER["PHP_SELF"],"",$param,"","",$sortfield,$sortorder);
+    if (! empty($conf->global->AGENDA_SHOW_LINKED_OBJECT)) print_liste_field_titre($langs->trans("LinkedObject"),$_SERVER["PHP_SELF"],"a.fk_element",$param,"","",$sortfield,$sortorder);
+    print_liste_field_titre($langs->trans("ActionsOwnedByShort"),$_SERVER["PHP_SELF"],"",$param,"","",$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"a.percent",$param,"",'align="center"',$sortfield,$sortorder);
 	print_liste_field_titre("");
 	print "</tr>\n";
@@ -482,6 +486,18 @@ if ($resql)
 		}
 		print '</td>';
 
+        // Linked object
+        if (! empty($conf->global->AGENDA_SHOW_LINKED_OBJECT)) {
+            print '<td>';
+            if ($obj->fk_element > 0 && ! empty($obj->elementtype)) {
+                include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+                print dolGetElementUrl($obj->fk_element,$obj->elementtype,1);
+            } else {
+                print "&nbsp;";
+            }
+            print '</td>';
+        }
+
 		// User to do
 		print '<td align="left">';
 		if ($obj->fk_user_action > 0)
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 1c9ac65e4b8..19e296bd951 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1512,6 +1512,7 @@ AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into searc
 AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
 AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
 AGENDA_NOTIFICATION_SOUND=Enable sound notification
+AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Click To Dial module setup
 ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index bd3d6405843..65ab2f84184 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -1479,6 +1479,7 @@ AGENDA_DEFAULT_FILTER_STATUS=Régler automatiquement le statut d'événement dan
 AGENDA_DEFAULT_VIEW=Quel onglet voulez-vous voir ouvrir par défaut quand on choisit le menu Agenda
 AGENDA_NOTIFICATION=Activer les notifications d'événements dans le navigateur utilisateur quand la date de l'événement est atteinte (Chaque utilisateur peut refuser ceci au moment de la question de confirmation posée par le navigateur).
 AGENDA_NOTIFICATION_SOUND=Activer les notifications sonores.
+AGENDA_SHOW_LINKED_OBJECT=Afficher l'objet lié dans la vue agenda
 ##### Clicktodial #####
 ClickToDialSetup=Configuration du module Click To Dial
 ClickToDialUrlDesc=URL appelée lors d'un clic sur le pictogramme téléphone. Dans l'URL, vous pouvez utiliser les balises<br><b>__PHONETO__</b> qui sera remplacée par le téléphone de l'appelé<br><b>__PHONEFROM__</b> qui sera remplacée par le téléphone de l'appelant (le votre, défini sur votre fiche utilisateur)<br><b>__LOGIN__</b> qui sera remplacée par votre identifiant clicktodial (défini sur votre fiche utilisateur)<br><b>__PASS__</b> qui sera remplacée par votre mot de passe clicktodial (défini sur votre fiche utilisateur).

From f3838ee8f21f7f827a3f4519485b9326ab4aa11c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 17 May 2017 18:52:01 +0200
Subject: [PATCH 380/505] Fix limit into message

---
 htdocs/core/boxes/box_produits_alerte_stock.php | 2 +-
 htdocs/langs/en_US/stocks.lang                  | 2 +-
 htdocs/product/list.php                         | 4 ++--
 htdocs/product/stock/product.php                | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/boxes/box_produits_alerte_stock.php b/htdocs/core/boxes/box_produits_alerte_stock.php
index 0097d3d48e0..55e70f62f96 100644
--- a/htdocs/core/boxes/box_produits_alerte_stock.php
+++ b/htdocs/core/boxes/box_produits_alerte_stock.php
@@ -159,7 +159,7 @@ class box_produits_alerte_stock extends ModeleBoxes
 
 					$this->info_box_contents[$line][] = array('td' => 'align="center"',
                     'text' => $objp->total_stock . ' / '.$objp->seuil_stock_alerte,
-					'text2'=>img_warning($langs->transnoentitiesnoconv("StockLowerThanLimit")));
+					'text2'=>img_warning($langs->transnoentitiesnoconv("StockLowerThanLimit", $objp->seuil_stock_alerte)));
 
 					$this->info_box_contents[$line][] = array('td' => 'align="right" width="18"',
                     'text' => $productstatic->LibStatut($objp->tosell,3,0));
diff --git a/htdocs/langs/en_US/stocks.lang b/htdocs/langs/en_US/stocks.lang
index 9c9f82f6efb..0d2f10a2165 100644
--- a/htdocs/langs/en_US/stocks.lang
+++ b/htdocs/langs/en_US/stocks.lang
@@ -42,7 +42,7 @@ LabelMovement=Movement label
 NumberOfUnit=Number of units
 UnitPurchaseValue=Unit purchase price
 StockTooLow=Stock too low
-StockLowerThanLimit=Stock lower than alert limit
+StockLowerThanLimit=Stock lower than alert limit (%s)
 EnhancedValue=Value
 PMPValue=Weighted average price
 PMPValueShort=WAP
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index b779d4b7bfa..d9e603c6706 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -803,7 +803,7 @@ else
    					print '<td align="right">';
     				if ($obj->fk_product_type != 1)
     				{
-   						if ($obj->seuil_stock_alerte != '' && $product_static->stock_reel < (float) $obj->seuil_stock_alerte) print img_warning($langs->trans("StockTooLow")).' ';
+   						if ($obj->seuil_stock_alerte != '' && $product_static->stock_reel < (float) $obj->seuil_stock_alerte) print img_warning($langs->trans("StockLowerThanLimit", $obj->seuil_stock_alerte)).' ';
       					print $product_static->stock_reel;
     				}
     				print '</td>';
@@ -814,7 +814,7 @@ else
    					print '<td align="right">';
     				if ($obj->fk_product_type != 1)
     				{
-   						if ($obj->seuil_stock_alerte != '' && $product_static->stock_theorique < (float) $obj->seuil_stock_alerte) print img_warning($langs->trans("StockTooLow")).' ';
+   						if ($obj->seuil_stock_alerte != '' && $product_static->stock_theorique < (float) $obj->seuil_stock_alerte) print img_warning($langs->trans("StockLowerThanLimit", $obj->seuil_stock_alerte)).' ';
       					print $product_static->stock_theorique;
     				}
     				print '</td>';
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index 385c4d51ccd..e894368beaf 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -638,7 +638,7 @@ if ($id > 0 || $ref)
         print $form->textwithpicto($langs->trans("PhysicalStock"), $text_stock_options, 1);
         print '</td>';
 		print '<td>'.price2num($object->stock_reel, 'MS');
-		if ($object->seuil_stock_alerte != '' && ($object->stock_reel < $object->seuil_stock_alerte)) print ' '.img_warning($langs->trans("StockLowerThanLimit"));
+		if ($object->seuil_stock_alerte != '' && ($object->stock_reel < $object->seuil_stock_alerte)) print ' '.img_warning($langs->trans("StockLowerThanLimit", $object->seuil_stock_alerte));
 		print '</td>';
 		print '</tr>';
 
@@ -689,7 +689,7 @@ if ($id > 0 || $ref)
         print "<td>";
         //print (empty($stocktheo)?0:$stocktheo);
         print $form->textwithpicto((empty($stocktheo)?0:$stocktheo), $helpondiff);
-        if ($object->seuil_stock_alerte != '' && ($object->stock_theorique < $object->seuil_stock_alerte)) print ' '.img_warning($langs->trans("StockLowerThanLimit"));
+        if ($object->seuil_stock_alerte != '' && ($object->stock_theorique < $object->seuil_stock_alerte)) print ' '.img_warning($langs->trans("StockLowerThanLimit", $object->seuil_stock_alerte));
         print '</td>';
         print '</tr>';
 

From 58f789659d7e8b9a7854115eeeea852e7e1654f7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 18 May 2017 02:53:49 +0200
Subject: [PATCH 381/505] Remove one picto loading

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 141811e382b..dd856c151b6 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3062,8 +3062,8 @@ function info_admin($text, $infoonimgalt = 0, $nodiv=0, $admin='1')
 	{
 		return img_picto($text, 'info', 'class="hideonsmartphone"');
 	}
-
-	return ($nodiv?'':'<div class="'.(empty($admin)?'':($admin=='1'?'info':$admin)).' hideonsmartphone">').img_picto($admin?$langs->trans('InfoAdmin'):$langs->trans('Note'), ($nodiv?'info':'info_black'), 'class="hideonsmartphone"').' '.$text.($nodiv?'':'</div>');
+	
+	return ($nodiv?'':'<div class="'.(empty($admin)?'':($admin=='1'?'info':$admin)).' hideonsmartphone">').'<span class="fa fa-info-circle" title="'.dol_escape_htmltag($admin?$langs->trans('InfoAdmin'):$langs->trans('Note')).'"></span> '.$text.($nodiv?'':'</div>');
 }
 
 

From ff5d682d49b6c64b346a116922a2a245b1f8af03 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 18 May 2017 03:12:29 +0200
Subject: [PATCH 382/505] Fix css

---
 htdocs/commande/card.php | 8 ++++----
 htdocs/contrat/card.php  | 9 ++-------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 8459a4a5e9e..07f25b40ed8 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -1646,8 +1646,8 @@ if ($action == 'create' && $user->rights->commande->creer)
 
 	// Note public
 	print '<tr>';
-	print '<td class="border" valign="top">' . $langs->trans('NotePublic') . '</td>';
-	print '<td valign="top" colspan="2">';
+	print '<td class="tdtop">' . $langs->trans('NotePublic') . '</td>';
+	print '<td colspan="2">';
 
 	$doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
 	print $doleditor->Create(1);
@@ -1657,8 +1657,8 @@ if ($action == 'create' && $user->rights->commande->creer)
 	// Note private
 	if (empty($user->societe_id)) {
 		print '<tr>';
-		print '<td class="border" valign="top">' . $langs->trans('NotePrivate') . '</td>';
-		print '<td valign="top" colspan="2">';
+		print '<td class="tdtop">' . $langs->trans('NotePrivate') . '</td>';
+		print '<td colspan="2">';
 
 		$doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
 		print $doleditor->Create(1);
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 4accbed5636..0e0f8c84090 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -1056,12 +1056,7 @@ if ($result > 0)
 	$modCodeContract = new $module();
 }
 
-
-/*********************************************************************
- *
- * Mode creation
- *
- *********************************************************************/
+// Create
 if ($action == 'create')
 {
 	print load_fiche_titre($langs->trans('AddContract'),'','title_commercial.png');
@@ -1158,7 +1153,7 @@ if ($action == 'create')
 	else
 	{
 		print '<td>';
-		print $form->select_company('','socid','','SelectThirdParty',1);
+		print $form->select_company('', 'socid', '', 'SelectThirdParty', 1, 0, null, 0, 'minwidth300');
 		print '</td>';
 	}
 	print '</tr>'."\n";

From 2bf1f848d660ec8b403820b67c1dd83ae0e1ad7a Mon Sep 17 00:00:00 2001
From: "cam.lafit" <cam.lafit@azerttyu.net>
Date: Thu, 18 May 2017 10:18:45 +0200
Subject: [PATCH 383/505] Provide payment SOAP webservices

* Backport from https://github.com/nikkow/dolibarr-payment-webservice
---
 htdocs/webservices/server_payment.php | 218 ++++++++++++++++++++++++++
 1 file changed, 218 insertions(+)
 create mode 100644 htdocs/webservices/server_payment.php

diff --git a/htdocs/webservices/server_payment.php b/htdocs/webservices/server_payment.php
new file mode 100644
index 00000000000..e8e4f5e1cb0
--- /dev/null
+++ b/htdocs/webservices/server_payment.php
@@ -0,0 +1,218 @@
+<?php
+/* Copyright (C) 2006-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+ * The payment webservice was initially created by Nicolas Nunge <me@nikkow.eu>
+ */
+
+/**
+ *       \file       htdocs/webservices/server_payment.php
+ *       \brief      File that is entry point to call Dolibarr WebServices
+ */
+
+// This is to make Dolibarr working with Plesk
+set_include_path($_SERVER['DOCUMENT_ROOT'].'/htdocs');
+
+require_once '../master.inc.php';
+require_once NUSOAP_PATH.'/nusoap.php';                // Include SOAP
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/ws.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
+
+require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
+
+
+dol_syslog("Call Dolibarr webservices interfaces");
+
+$langs->load("main");
+
+// Enable and test if module web services is enabled
+if (empty($conf->global->MAIN_MODULE_WEBSERVICES))
+{
+       $langs->load("admin");
+       dol_syslog("Call Dolibarr webservices interfaces with module webservices disabled");
+       print $langs->trans("WarningModuleNotActive",'WebServices').'.<br><br>';
+       print $langs->trans("ToActivateModule");
+       exit;
+}
+
+// Create the soap Object
+$server                              = new nusoap_server();
+$server->soap_defencoding            = 'UTF-8';
+$server->decode_utf8                 = false;
+$ns                                  = 'http://www.dolibarr.org/ns/';
+$server->configureWSDL('WebServicesDolibarrPayment',$ns);
+$server->wsdl->schemaTargetNamespace = $ns;
+
+
+// Define WSDL Authentication object
+$server->wsdl->addComplexType(
+    'authentication',
+    'complexType',
+    'struct',
+    'all',
+    '',
+    array(
+        'dolibarrkey'       => array('name'=>'dolibarrkey','type'=>'xsd:string'),
+       'sourceapplication' => array('name'=>'sourceapplication','type'=>'xsd:string'),
+       'login'             => array('name'=>'login','type'=>'xsd:string'),
+        'password'          => array('name'=>'password','type'=>'xsd:string'),
+        'entity'            => array('name'=>'entity','type'=>'xsd:string')
+    )
+);
+// Define WSDL Return object
+$server->wsdl->addComplexType(
+    'result',
+    'complexType',
+    'struct',
+    'all',
+    '',
+    array(
+        'result_code'  => array('name'=>'result_code','type'=>'xsd:string'),
+        'result_label' => array('name'=>'result_label','type'=>'xsd:string'),
+    )
+);
+
+// Define WSDL for Payment object
+$server->wsdl->addComplexType(
+    'payment',
+    'complexType',
+    'struct',
+    'all',
+    '',
+    array(
+        'amount'          => array('name'=>'amount','type'=>'xsd:double'),
+        'num_paiement'    => array('name'=>'num_paiement','type'=>'xsd:string'),
+        'thirdparty_id'   => array('name'=>'thirdparty_id','type'=>'xsd:int'),
+               'bank_account'    => array('name'=>'bank_account','type'=>'xsd:int'),
+               'payment_mode_id' => array('name'=>'payment_mode_id','type'=>'xsd:int'),
+               'invoice_id'      => array('name'=>'invoice_id','type'=>'xsd:int'),
+               'int_label'       => array('name'=>'int_label','type'=>'xsd:string'),
+               'emitter'         => array('name'=>'emitter','type'=>'xsd:string'),
+               'bank_source'     => array('name'=>'bank_source','type'=>'xsd:string'),
+    )
+);
+
+// 5 styles: RPC/encoded, RPC/literal, Document/encoded (not WS-I compliant), Document/literal, Document/literal wrapped
+// Style merely dictates how to translate a WSDL binding to a SOAP message. Nothing more. You can use either style with any programming model.
+// http://www.ibm.com/developerworks/webservices/library/ws-whichwsdl/
+$styledoc = 'rpc';       // rpc/document (document is an extend into SOAP 1.0 to support unstructured messages)
+$styleuse = 'encoded';   // encoded/literal/literal wrapped
+// Better choice is document/literal wrapped but literal wrapped not supported by nusoap.
+
+// Register WSDL
+$server->register(
+    'createPayment',
+    // Entry values
+    array('authentication'=>'tns:authentication','payment'=>'tns:payment'),
+    // Exit values
+    array('result'=>'tns:result','id'=>'xsd:string','ref'=>'xsd:string','ref_ext'=>'xsd:string'),
+    $ns,
+    $ns.'#createPayment',
+    $styledoc,
+    $styleuse,
+    'WS to create a new payment'
+);
+
+/**
+ * Create a payment
+ *
+ * @param      array           $authentication         Array of authentication information
+ * @param      Facture         $invoice                        Invoice
+ * @return     array                                                   Array result
+ */
+function createPayment($authentication, $payment)
+{
+    global $db,$conf,$langs;
+
+    $now = dol_now();
+
+    dol_syslog("Function: createPayment login=".$authentication['login']." id=".$payment->id.
+               ", ref=".$payment->ref.", ref_ext=".$payment->ref_ext);
+
+    if ($authentication['entity']) $conf->entity=$authentication['entity'];
+
+    // Init and check authentication
+    $objectresp = array();
+    $errorcode  = '';
+       $errorlabel = '';
+    $error      = 0;
+    $fuser      = check_authentication($authentication,$error,$errorcode,$errorlabel);
+
+    // Check parameters
+    if (empty($payment['amount']) && empty($payment['thirdparty_id'])) {
+       $error++;
+               $errorcode  ='KO';
+               $errorlabel ="You must specify the amount and the third party's ID.";
+    }
+
+    if (! $error)
+    {
+               $soc = new Societe($db);
+        $res = $soc->fetch($payment['thirdparty_id']);
+
+               $new_payment               = new Paiement($db);
+               $new_payment->amount       = doubleval($payment['amount']);
+               $new_payment->num_paiement = $payment['num_paiement'];
+               $new_payment->bank_account = intval($payment['bank_account']);
+               $new_payment->paiementid   = !empty($payment['payment_mode_id']) ? intval($payment['payment_mode_id']) : $soc->mode_reglement_id;
+               $new_payment->datepaye     = $now;
+               $new_payment->author       = $payment['thirdparty_id'];
+               $new_payment->amounts      = array();
+
+               if(intval($payment['invoice_id']) > 0) {
+                       $new_payment->amounts[ $payment['invoice_id'] ] = $new_payment->amount;
+               }
+
+        $db->begin();
+               $result = $new_payment->create($fuser, true);
+
+               if($payment['bank_account']) {
+                       $new_payment->addPaymentToBank($fuser, 'payment', $payment['int_label'], $payment['bank_account'], $payment['emitter'], $payment['bank_source']);
+               }
+
+        if ($result < 0)
+        {
+            $error++;
+        }
+
+        if (! $error)
+        {
+            $db->commit();
+            $objectresp=array('result'=>array('result_code'=>'OK', 'result_label'=>''),'id'=>$new_payment->id);
+        }
+        else
+        {
+            $db->rollback();
+            $error++;
+            $errorcode='KO';
+            $errorlabel=$new_payment->error;
+            dol_syslog("Function: createInvoice error while creating".$errorlabel);
+        }
+    }
+
+    if ($error)
+    {
+        $objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
+    }
+
+    return $objectresp;
+}
+
+// Return the results.
+$server->service(file_get_contents("php://input"));

From 368fb314fe70e4e970a8ceff1d115c0415fa62ee Mon Sep 17 00:00:00 2001
From: "cam.lafit" <cam.lafit@azerttyu.net>
Date: Thu, 18 May 2017 10:22:01 +0200
Subject: [PATCH 384/505] FIX : missing object on createInvoiceFromOrder

* To create an invoice from order, we must have an order first
Load class as requirment
---
 htdocs/webservices/server_invoice.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/webservices/server_invoice.php b/htdocs/webservices/server_invoice.php
index 54f5e3c564c..9318328a060 100644
--- a/htdocs/webservices/server_invoice.php
+++ b/htdocs/webservices/server_invoice.php
@@ -30,6 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/ws.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
 
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 
 
 dol_syslog("Call Dolibarr webservices interfaces");

From 94ca52886049357a30c9b3a23f69d6d0e8c87679 Mon Sep 17 00:00:00 2001
From: "cam.lafit" <cam.lafit@azerttyu.net>
Date: Thu, 18 May 2017 10:26:51 +0200
Subject: [PATCH 385/505] FIX : CreateInvoiceFromOrder prototype

* SOAP declaration must follow function argument list
---
 htdocs/webservices/server_invoice.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/webservices/server_invoice.php b/htdocs/webservices/server_invoice.php
index 9318328a060..a085d38e74d 100644
--- a/htdocs/webservices/server_invoice.php
+++ b/htdocs/webservices/server_invoice.php
@@ -254,7 +254,7 @@ $server->register(
 $server->register(
 		'createInvoiceFromOrder',
 		// Entry values
-		array('authentication'=>'tns:authentication','invoice'=>'tns:invoice'),
+		array('authentication'=>'tns:authentication','id_order'=>'xsd:string','ref_order'=>'xsd:string','ref_ext_order'=>'xsd:string','id_invoice'=>'xsd:string','ref_invoice'=>'xsd:string','ref_ext_invoice'=>'xsd:string'),
 		// Exit values
 		array('result'=>'tns:result','invoice'=>'tns:invoice'),
 		$ns,

From 545e41b85872c839fa7a0ef14e417a2576b1a118 Mon Sep 17 00:00:00 2001
From: "cam.lafit" <cam.lafit@azerttyu.net>
Date: Thu, 18 May 2017 10:28:48 +0200
Subject: [PATCH 386/505] Fix : CreateInvoiceFromOrder result

* We should be return same informations as other CreateInvoice function
* Also invoice data can't be converted correctly by NuSoap, we can have some PHP error with invoice object
---
 htdocs/webservices/server_invoice.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/htdocs/webservices/server_invoice.php b/htdocs/webservices/server_invoice.php
index a085d38e74d..99202cd72e4 100644
--- a/htdocs/webservices/server_invoice.php
+++ b/htdocs/webservices/server_invoice.php
@@ -256,7 +256,7 @@ $server->register(
 		// Entry values
 		array('authentication'=>'tns:authentication','id_order'=>'xsd:string','ref_order'=>'xsd:string','ref_ext_order'=>'xsd:string','id_invoice'=>'xsd:string','ref_invoice'=>'xsd:string','ref_ext_invoice'=>'xsd:string'),
 		// Exit values
-		array('result'=>'tns:result','invoice'=>'tns:invoice'),
+		array('result'=>'tns:result','id'=>'xsd:string','ref'=>'xsd:string','ref_ext'=>'xsd:string'),
 		$ns,
 		$ns.'#createInvoiceFromOrder',
 		$styledoc,
@@ -735,8 +735,7 @@ function createInvoiceFromOrder($authentication,$id_order='', $ref_order='', $re
 	}
 	else
 	{
-		$objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''),'invoice'=>$newobject);
-		
+		$objectresp= array('result'=>array('result_code'=>'OK', 'result_label'=>''),'id'=>$newobject->id,'ref'=>$newobject->ref,'ref_ext'=>$newobject->ref_ext);
 	}
 	
 	return $objectresp;

From 682f6f838e713c89108e5965a41a3974a96f3d5c Mon Sep 17 00:00:00 2001
From: "cam.lafit" <cam.lafit@azerttyu.net>
Date: Thu, 18 May 2017 10:36:37 +0200
Subject: [PATCH 387/505] Change argument list CreateInvoiceFromOrder

* invoice data are not mandatory
Only order information are required
---
 htdocs/webservices/server_invoice.php | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/htdocs/webservices/server_invoice.php b/htdocs/webservices/server_invoice.php
index 99202cd72e4..8f14be1a8b9 100644
--- a/htdocs/webservices/server_invoice.php
+++ b/htdocs/webservices/server_invoice.php
@@ -254,7 +254,7 @@ $server->register(
 $server->register(
 		'createInvoiceFromOrder',
 		// Entry values
-		array('authentication'=>'tns:authentication','id_order'=>'xsd:string','ref_order'=>'xsd:string','ref_ext_order'=>'xsd:string','id_invoice'=>'xsd:string','ref_invoice'=>'xsd:string','ref_ext_invoice'=>'xsd:string'),
+		array('authentication'=>'tns:authentication','id_order'=>'xsd:string','ref_order'=>'xsd:string','ref_ext_order'=>'xsd:string'),
 		// Exit values
 		array('result'=>'tns:result','id'=>'xsd:string','ref'=>'xsd:string','ref_ext'=>'xsd:string'),
 		$ns,
@@ -653,13 +653,9 @@ function createInvoice($authentication,$invoice)
  * @param	string      $id_order			id of order to copy invoice from
  * @param	string      $ref_order			ref of order to copy invoice from
  * @param	string      $ref_ext_order		ref_ext of order to copy invoice from
- * @param	string      $id_invoice			invoice id
- * @param	string      $ref_invoice		invoice ref
- * @param	string      $ref_ext_invoice	invoice ref_ext
  * @return	array							Array result
  */
-function createInvoiceFromOrder($authentication,$id_order='', $ref_order='', $ref_ext_order='', 
-		$id_invoice='', $ref_invoice='', $ref_ext_invoice='')
+function createInvoiceFromOrder($authentication,$id_order='', $ref_order='', $ref_ext_order='')
 {
 	global $db,$conf;
 
@@ -680,8 +676,6 @@ function createInvoiceFromOrder($authentication,$id_order='', $ref_order='', $re
 	// Check parameters
 	if (empty($id_order) && empty($ref_order) && empty($ref_ext_order))	{
 		$error++; $errorcode='KO'; $errorlabel="order id or ref or ref_ext is mandatory.";
-	} else if (empty($id_invoice) && empty($ref_invoice) && empty($ref_ext_invoice))	{
-		$error++; $errorcode='KO'; $errorlabel="invoice id or ref or ref_ext is mandatory.";
 	}
 	
 	//////////////////////

From fbb3406c5d1bde83d5bebcb85612c33ba21ec242 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 18 May 2017 10:46:55 +0200
Subject: [PATCH 388/505] Fix missing filters

---
 htdocs/societe/list.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 7693da9d818..421e9bc3095 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -493,6 +493,9 @@ if ($search_sale > 0)	$param.='&amp;search_sale='.urlencode($search_sale);
 if ($search_nom != '') $param.= "&amp;search_nom=".urlencode($search_nom);
 if ($search_town != '') $param.= "&amp;search_town=".urlencode($search_town);
 if ($search_zip != '') $param.= "&amp;search_zip=".urlencode($search_zip);
+if ($search_phone != '') $param.= "&amp;search_phone=".urlencode($search_phone);
+if ($search_email != '') $param.= "&amp;search_email=".urlencode($search_email);
+if ($search_url != '') $param.= "&amp;search_url=".urlencode($search_url);
 if ($search_state != '') $param.= "&amp;search_state=".urlencode($search_state);
 if ($search_country != '') $param.= "&amp;search_country=".urlencode($search_country);
 if ($search_customer_code != '') $param.= "&amp;search_customer_code=".urlencode($search_customer_code);

From ec25869ec614c13fe693adf6b93b420822f98d8b Mon Sep 17 00:00:00 2001
From: "cam.lafit" <cam.lafit@azerttyu.net>
Date: Thu, 18 May 2017 10:37:36 +0200
Subject: [PATCH 389/505] FIX : UpdateInvoice create object

* To update data, function must work on invoice object
---
 htdocs/webservices/server_invoice.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/webservices/server_invoice.php b/htdocs/webservices/server_invoice.php
index 8f14be1a8b9..2150017577b 100644
--- a/htdocs/webservices/server_invoice.php
+++ b/htdocs/webservices/server_invoice.php
@@ -789,7 +789,7 @@ function updateInvoice($authentication,$invoice)
 					{
 						// Define output language
 						$outputlangs = $langs;
-						$order->generateDocument($invoice->modelpdf, $outputlangs);		
+						$object->generateDocument($object->modelpdf, $outputlangs);
 					}
 				}
 				if ($invoice['status'] == Facture::STATUS_CLOSED)

From 240371b59d5d41bd484d7a1cfe13bbf8216e4aab Mon Sep 17 00:00:00 2001
From: "cam.lafit" <cam.lafit@azerttyu.net>
Date: Thu, 18 May 2017 10:40:10 +0200
Subject: [PATCH 390/505] UPDATE : add warehouse information on order creation

* If stock management is enabled we must done information about warehouse source
If any warehouse is provided, client must send 0.
---
 htdocs/webservices/server_order.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/htdocs/webservices/server_order.php b/htdocs/webservices/server_order.php
index f477ccfed9c..b0f794dd55f 100644
--- a/htdocs/webservices/server_order.php
+++ b/htdocs/webservices/server_order.php
@@ -325,7 +325,7 @@ $server->register(
 
 $server->register(
 		'validOrder',
-		array('authentication'=>'tns:authentication','id'=>'xsd:string'),	// Entry values
+		array('authentication'=>'tns:authentication','id'=>'xsd:string','id_warehouse'=>'xsd:string'),  // Entry values
 		array('result'=>'tns:result'),	// Exit values
 		$ns,
 		$ns.'#validOrder',
@@ -795,7 +795,7 @@ function createOrder($authentication,$order)
  * @param	int			$id					Id of order to validate
  * @return	array							Array result
  */
-function validOrder($authentication,$id='')
+function validOrder($authentication,$id='',$id_warehouse=0)
 {
 	global $db,$conf,$langs;
 
@@ -821,7 +821,8 @@ function validOrder($authentication,$id='')
 			$db->begin();
 			if ($result > 0)
 			{
-				$result=$order->valid($fuser);
+
+				$result=$order->valid($fuser,$id_warehouse);
 
 				if ($result	>= 0)
 				{

From 1a1b27d68cfa78d63df7316e76dc1d5808bc185e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 18 May 2017 11:13:18 +0200
Subject: [PATCH 391/505] Fix input of duration

---
 htdocs/core/class/html.form.class.php | 4 ++--
 htdocs/projet/tasks/task.php          | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index afa2006864f..26001e8e1f1 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -4962,7 +4962,7 @@ class Form
         }
         elseif ($typehour=='text' || $typehour=='textselect')
         {
-        	$retstring.='<input placeholder="'.$langs->trans('HourShort').'" type="number" min="0" size="1" name="'.$prefix.'hour"'.($disabled?' disabled':'').' class="flat maxwidth50" value="'.($hourSelected?((int) $hourSelected):'').'">';
+        	$retstring.='<input placeholder="'.$langs->trans('HourShort').'" type="number" min="0" size="1" name="'.$prefix.'hour"'.($disabled?' disabled':'').' class="flat maxwidth50" value="'.(($hourSelected != '')?((int) $hourSelected):'').'">';
         }
         else return 'BadValueForParameterTypeHour';
 
@@ -4986,7 +4986,7 @@ class Form
         }
         elseif ($typehour=='text' )
         {
-        	$retstring.='<input placeholder="'.$langs->trans('MinuteShort').'" type="number" min="0" size="1" name="'.$prefix.'min"'.($disabled?' disabled':'').' class="flat maxwidth50" value="'.($minSelected?((int) $minSelected):'').'">';
+        	$retstring.='<input placeholder="'.$langs->trans('MinuteShort').'" type="number" min="0" size="1" name="'.$prefix.'min"'.($disabled?' disabled':'').' class="flat maxwidth50" value="'.(($minSelected != '')?((int) $minSelected):'').'">';
         }
         
         if ($typehour!='text') $retstring.=' '.$langs->trans('MinuteShort');
diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php
index 243881821e0..f0a55517881 100644
--- a/htdocs/projet/tasks/task.php
+++ b/htdocs/projet/tasks/task.php
@@ -43,7 +43,7 @@ $action=GETPOST('action','alpha');
 $confirm=GETPOST('confirm','alpha');
 $withproject=GETPOST('withproject','int');
 $project_ref=GETPOST('project_ref','alpha');
-$planned_workload=((GETPOST('planned_workloadhour')!='' && GETPOST('planned_workloadmin')!='')?GETPOST('planned_workloadhour')*3600+GETPOST('planned_workloadmin')*60:'');
+$planned_workload=((GETPOST('planned_workloadhour','int')!='' || GETPOST('planned_workloadmin','int')!='') ? (GETPOST('planned_workloadhour','int')>0?GETPOST('planned_workloadhour','int')*3600:0) + (GETPOST('planned_workloadmin','int')>0?GETPOST('planned_workloadmin','int')*60:0) : '');
 
 // Security check
 $socid=0;

From 0b52c43e05de3e366198779c775f920b36335763 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 18 May 2017 11:35:12 +0200
Subject: [PATCH 392/505] Fix bad selection of progress when not known

---
 htdocs/core/class/html.formother.class.php | 6 ++++--
 htdocs/projet/class/task.class.php         | 6 +++---
 htdocs/projet/tasks.php                    | 4 ++--
 htdocs/projet/tasks/task.php               | 6 +++---
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php
index 66e624e96b9..2ee6b18a44f 100644
--- a/htdocs/core/class/html.formother.class.php
+++ b/htdocs/core/class/html.formother.class.php
@@ -274,15 +274,17 @@ class FormOther
      *    @param    int		$increment     	increment value
      *    @param    int		$start         	start value
      *    @param    int		$end           	end value
+     *    @param    int     $showempty      Add also an empty line
      *    @return   string					HTML select string
      */
-    function select_percent($selected=0,$htmlname='percent',$disabled=0,$increment=5,$start=0,$end=100)
+    function select_percent($selected=0,$htmlname='percent',$disabled=0,$increment=5,$start=0,$end=100,$showempty=0)
     {
         $return = '<select class="flat" name="'.$htmlname.'" '.($disabled?'disabled':'').'>';
+        if ($showempty) $return.='<option value="-1"'.(($selected == -1 || $selected == '')?' selected':'').'>&nbsp;</option>';
 
         for ($i = $start ; $i <= $end ; $i += $increment)
         {
-            if ($selected == $i)
+            if ($selected != '' && (int) $selected == $i)
             {
                 $return.= '<option value="'.$i.'" selected>';
             }
diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index 9a1819fc46c..dad46c96989 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -100,7 +100,7 @@ class Task extends CommonObject
         // Clean parameters
         $this->label = trim($this->label);
         $this->description = trim($this->description);
-
+        
         // Check parameters
         // Put here code to add control on parameters values
 
@@ -128,7 +128,7 @@ class Task extends CommonObject
         $sql.= ", ".($this->date_start!=''?"'".$this->db->idate($this->date_start)."'":'null');
         $sql.= ", ".($this->date_end!=''?"'".$this->db->idate($this->date_end)."'":'null');
         $sql.= ", ".($this->planned_workload!=''?$this->planned_workload:0);
-        $sql.= ", ".($this->progress!=''?$this->progress:0);
+        $sql.= ", ".(($this->progress!='' && $this->progress >= 0)?$this->progress:'null');
         $sql.= ")";
 
         $this->db->begin();
@@ -300,7 +300,7 @@ class Task extends CommonObject
         $sql.= " planned_workload=".((isset($this->planned_workload) && $this->planned_workload != '')?$this->planned_workload:"null").",";
         $sql.= " dateo=".($this->date_start!=''?"'".$this->db->idate($this->date_start)."'":'null').",";
         $sql.= " datee=".($this->date_end!=''?"'".$this->db->idate($this->date_end)."'":'null').",";
-        $sql.= " progress=".$this->progress.",";
+        $sql.= " progress=".(($this->progress!='' && $this->progress >= 0)?$this->progress:'null').",";
         $sql.= " rang=".((!empty($this->rang))?$this->rang:"0");
         $sql.= " WHERE rowid=".$this->id;
 
diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index 35a7812d4fa..06bd2c9c730 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -391,14 +391,14 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
 	print $form->select_date(($date_end?$date_end:-1),'datee',1,1,0,'',1,1,1);
 	print '</td></tr>';
 
-	// planned workload
+	// Planned workload
 	print '<tr><td>'.$langs->trans("PlannedWorkload").'</td><td>';
 	print $form->select_duration('planned_workload', $planned_workload?$planned_workload : $object->planned_workload,0,'text');
 	print '</td></tr>';
 
 	// Progress
 	print '<tr><td>'.$langs->trans("ProgressDeclared").'</td><td colspan="3">';
-	print $formother->select_percent($progress,'progress');
+	print $formother->select_percent($progress,'progress',0,5,0,100,1);
 	print '</td></tr>';
 
 	// Description
diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php
index f0a55517881..603a69a07b0 100644
--- a/htdocs/projet/tasks/task.php
+++ b/htdocs/projet/tasks/task.php
@@ -391,12 +391,12 @@ if ($id > 0 || ! empty($ref))
 
 			// Planned workload
 			print '<tr><td>'.$langs->trans("PlannedWorkload").'</td><td>';
-			print $form->select_duration('planned_workload',$object->planned_workload,0,'text');
+			print $form->select_duration('planned_workload', $object->planned_workload, 0, 'text');
 			print '</td></tr>';
 
 			// Progress declared
-			print '<tr><td>'.$langs->trans("ProgressDeclared").'</td><td colspan="3">';
-			print $formother->select_percent($object->progress,'progress');
+			print '<tr><td>'.$langs->trans("ProgressDeclared").'</td><td>';
+			print $formother->select_percent($object->progress,'progress',0,5,0,100,1);
 			print '</td></tr>';
 
 			// Description

From a36a9fab2fbaa9e91c884d82fdba7ca85b486f1c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 18 May 2017 12:12:36 +0200
Subject: [PATCH 393/505] Look and feel v6

---
 htdocs/core/lib/project.lib.php    |  2 +-
 htdocs/projet/card.php             |  2 +-
 htdocs/projet/class/task.class.php |  2 +-
 htdocs/projet/element.php          |  3 +-
 htdocs/projet/tasks.php            | 11 +++--
 htdocs/projet/tasks/contact.php    | 34 ++++++---------
 htdocs/projet/tasks/document.php   | 48 +++++++--------------
 htdocs/projet/tasks/note.php       | 47 +++++++--------------
 htdocs/projet/tasks/task.php       | 48 +++++++--------------
 htdocs/projet/tasks/time.php       | 67 ++++++++++++++++--------------
 10 files changed, 104 insertions(+), 160 deletions(-)

diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index 96bcbaa00c4..38f78dd8333 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -479,7 +479,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 				if ($lines[$i]->planned_workload || $lines[$i]->duration)
 				{
 					if ($lines[$i]->planned_workload) print round(100 * $lines[$i]->duration / $lines[$i]->planned_workload,2).' %';
-					else print $langs->trans('WorkloadNotDefined');
+					else print '<span class="opacitymedium">'.$langs->trans('WorkloadNotDefined').'</span>';
 				}
 				print '</td>';
 
diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index 1ee81f7b917..47d0f1c3148 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -711,7 +711,7 @@ elseif ($object->id > 0)
     print '<input type="hidden" name="comefromclone" value="'.$comefromclone.'">';
 
     $head=project_prepare_head($object);
-    dol_fiche_head($head, 'project', $langs->trans("Project"),0,($object->public?'projectpub':'project'));
+    dol_fiche_head($head, 'project', $langs->trans("Project"), -1, ($object->public?'projectpub':'project'));
 
     if ($action == 'edit' && $userWrite > 0)
     {
diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index dad46c96989..e1025241115 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -127,7 +127,7 @@ class Task extends CommonObject
         $sql.= ", ".$user->id;
         $sql.= ", ".($this->date_start!=''?"'".$this->db->idate($this->date_start)."'":'null');
         $sql.= ", ".($this->date_end!=''?"'".$this->db->idate($this->date_end)."'":'null');
-        $sql.= ", ".($this->planned_workload!=''?$this->planned_workload:0);
+        $sql.= ", ".(($this->planned_workload!='' && $this->planned_workload >= 0)?$this->planned_workload:'null');
         $sql.= ", ".(($this->progress!='' && $this->progress >= 0)?$this->progress:'null');
         $sql.= ")";
 
diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php
index 02bf6c5a9ba..8aebe756d70 100644
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -123,7 +123,7 @@ $userstatic=new User($db);
 $userAccess = $object->restrictedProjectArea($user);
 
 $head=project_prepare_head($object);
-dol_fiche_head($head, 'element', $langs->trans("Project"),0,($object->public?'projectpub':'project'));
+dol_fiche_head($head, 'element', $langs->trans("Project"), -1, ($object->public?'projectpub':'project'));
 
 
 // Project card
@@ -231,6 +231,7 @@ print '<div class="clearboth"></div>';
 
 dol_fiche_end();
 
+print '<br>';
 
 /*
  * Referers types
diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index 06bd2c9c730..fdeebd0ca69 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -92,9 +92,12 @@ if ($action == 'createtask' && $user->rights->projet->creer)
 {
 	$error=0;
 
-	$date_start = dol_mktime($_POST['dateohour'],$_POST['dateomin'],0,$_POST['dateomonth'],$_POST['dateoday'],$_POST['dateoyear'],'user');
-	$date_end = dol_mktime($_POST['dateehour'],$_POST['dateemin'],0,$_POST['dateemonth'],$_POST['dateeday'],$_POST['dateeyear'],'user');
-
+    // If we use user timezone, we must change also view/list to use user timezone everywhere
+    //$date_start = dol_mktime($_POST['dateohour'],$_POST['dateomin'],0,$_POST['dateomonth'],$_POST['dateoday'],$_POST['dateoyear'],'user');
+	//$date_end = dol_mktime($_POST['dateehour'],$_POST['dateemin'],0,$_POST['dateemonth'],$_POST['dateeday'],$_POST['dateeyear'],'user');
+	$date_start = dol_mktime($_POST['dateohour'],$_POST['dateomin'],0,$_POST['dateomonth'],$_POST['dateoday'],$_POST['dateoyear']);
+	$date_end = dol_mktime($_POST['dateehour'],$_POST['dateemin'],0,$_POST['dateemonth'],$_POST['dateeday'],$_POST['dateeyear']);
+	
 	if (! $cancel)
 	{
 		if (empty($taskref))
@@ -215,7 +218,7 @@ if ($id > 0 || ! empty($ref))
 	$tab=GETPOST('tab')?GETPOST('tab'):'tasks';
 
 	$head=project_prepare_head($object);
-	dol_fiche_head($head, $tab, $langs->trans("Project"), 0, ($object->public?'projectpub':'project'));
+	dol_fiche_head($head, $tab, $langs->trans("Project"), -1, ($object->public?'projectpub':'project'));
 
 	$param='';
     if ($search_user_id > 0) $param.='&search_user_id='.dol_escape_htmltag($search_user_id);
diff --git a/htdocs/projet/tasks/contact.php b/htdocs/projet/tasks/contact.php
index e2f94406558..9160f2b3795 100644
--- a/htdocs/projet/tasks/contact.php
+++ b/htdocs/projet/tasks/contact.php
@@ -293,33 +293,23 @@ if ($id > 0 || ! empty($ref))
 		else $object->next_prev_filter=" fk_projet = ".$projectstatic->id;
 		
 		$morehtmlref='';
-		dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, $param, 0, '', '', 1);
 		
-		if (empty($withproject)) 
+		// Project
+		if (empty($withproject))
 		{
-		    print '<div class="fichecenter">';
+		    $morehtmlref.='<div class="refidno">';
+		    $morehtmlref.=$langs->trans("Project").': ';
+		    $morehtmlref.=$projectstatic->getNomUrl(1);
+		    $morehtmlref.='<br>';
 		
-		    print '<div class="underbanner clearboth"></div>';
-		    print '<table class="border" width="100%">';
-
-		    // Project
-		    print '<tr><td class="titlefield">'.$langs->trans("Project").'</td><td>';
-    		print $projectstatic->getNomUrl(1);
-    		print '</td></tr>';
-
-    		// Customer
-    		print "<tr><td>".$langs->trans("ThirdParty")."</td>";
-    		print '<td colspan="3">';
-    		if ($projectstatic->thirdparty->id > 0) print $projectstatic->thirdparty->getNomUrl(1);
-    		else print '&nbsp;';
-    		print '</td></tr>';
-		
-    		print "</table>";
-		
-    		print '</div>';
+		    // Third party
+		    $morehtmlref.=$langs->trans("ThirdParty").': ';
+		    $morehtmlref.=$projectstatic->thirdparty->getNomUrl(1);
+		    $morehtmlref.='</div>';
 		}
-
 		
+		dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, $param, 0, '', '', 1);
+
 		dol_fiche_end();
 
 		/*
diff --git a/htdocs/projet/tasks/document.php b/htdocs/projet/tasks/document.php
index 684b7648ab8..241ba0162e5 100644
--- a/htdocs/projet/tasks/document.php
+++ b/htdocs/projet/tasks/document.php
@@ -239,6 +239,21 @@ if ($object->id > 0)
 	else $object->next_prev_filter=" fk_projet = ".$projectstatic->id;
 	
 	$morehtmlref='';
+	
+	// Project
+	if (empty($withproject))
+	{
+	    $morehtmlref.='<div class="refidno">';
+	    $morehtmlref.=$langs->trans("Project").': ';
+	    $morehtmlref.=$projectstatic->getNomUrl(1);
+	    $morehtmlref.='<br>';
+	
+	    // Third party
+	    $morehtmlref.=$langs->trans("ThirdParty").': ';
+	    $morehtmlref.=$projectstatic->thirdparty->getNomUrl(1);
+	    $morehtmlref.='</div>';
+	}
+	
 	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, $param);
 	
 	print '<div class="fichecenter">';
@@ -246,39 +261,6 @@ if ($object->id > 0)
 	print '<div class="underbanner clearboth"></div>';
 	print '<table class="border" width="100%">';
 
-	// Ref
-	/*
-	print '<tr><td class="titlefield">';
-	print $langs->trans("Ref");
-	print '</td><td colspan="3">';
-	if (empty($withproject) || empty($projectstatic->id))
-	{
-		$projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,0,1);
-		$object->next_prev_filter=" fk_projet in (".$projectsListId.")";
-	}
-	else $object->next_prev_filter=" fk_projet = ".$projectstatic->id;
-	print $form->showrefnav($object,'ref',$linkback,1,'ref','ref','',$param);
-	print '</td>';
-	print '</tr>';
-
-	// Label
-	print '<tr><td>'.$langs->trans("Label").'</td><td colspan="3">'.$object->label.'</td></tr>';
-    */
-	
-	// Project
-	if (empty($withproject))
-	{
-		print '<tr><td class="titlefield">'.$langs->trans("Project").'</td><td colspan="3">';
-		print $projectstatic->getNomUrl(1);
-		print '</td></tr>';
-
-		// Third party
-		print '<td>'.$langs->trans("ThirdParty").'</td><td colspan="3">';
-		if ($projectstatic->thirdparty->id) print $projectstatic->thirdparty->getNomUrl(1);
-		else print '&nbsp;';
-		print '</td></tr>';
-	}
-
 	// Files infos
 	print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
 	print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.$totalsize.' '.$langs->trans("bytes").'</td></tr>';
diff --git a/htdocs/projet/tasks/note.php b/htdocs/projet/tasks/note.php
index ebdd3d0c5a3..0d6df7d85fd 100644
--- a/htdocs/projet/tasks/note.php
+++ b/htdocs/projet/tasks/note.php
@@ -211,43 +211,26 @@ if ($object->id > 0)
 	else $object->next_prev_filter=" fk_projet = ".$projectstatic->id;
 	
 	$morehtmlref='';
+	
+	// Project
+	if (empty($withproject))
+	{
+	    $morehtmlref.='<div class="refidno">';
+	    $morehtmlref.=$langs->trans("Project").': ';
+	    $morehtmlref.=$projectstatic->getNomUrl(1);
+	    $morehtmlref.='<br>';
+	
+	    // Third party
+	    $morehtmlref.=$langs->trans("ThirdParty").': ';
+	    $morehtmlref.=$projectstatic->thirdparty->getNomUrl(1);
+	    $morehtmlref.='</div>';
+	}
+	
 	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, $param);
 	
 	print '<div class="fichecenter">';
 	
     print '<div class="underbanner clearboth"></div>';
-	print '<table class="border" width="100%">';
-    /*
-	// Ref
-	print '<tr><td class="titlefield">'.$langs->trans("Ref").'</td><td>';
-	if (empty($withproject) || empty($projectstatic->id))
-	{
-	    $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,0,1);
-	    $object->next_prev_filter=" fk_projet in (".$projectsListId.")";
-	}
-	else $object->next_prev_filter=" fk_projet = ".$projectstatic->id;
-	print $form->showrefnav($object,'ref',$linkback,1,'ref','ref','',$param);
-	print '</td></tr>';
-
-	// Label
-	print '<tr><td>'.$langs->trans("Label").'</td><td>'.$object->label.'</td></tr>';
-    */
-	
-	// Project
-	if (empty($withproject))
-	{
-		print '<tr><td>'.$langs->trans("Project").'</td><td colspan="3">';
-		print $projectstatic->getNomUrl(1);
-		print '</td></tr>';
-
-		// Third party
-		print '<tr><td>'.$langs->trans("ThirdParty").'</td><td>';
-		if ($projectstatic->thirdparty->id > 0) print $projectstatic->thirdparty->getNomUrl(1);
-		else print'&nbsp;';
-		print '</td></tr>';
-	}
-
-	print "</table>";
 
 	$cssclass='titlefield';
     $moreparam=$param;
diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php
index 603a69a07b0..5f493167fd8 100644
--- a/htdocs/projet/tasks/task.php
+++ b/htdocs/projet/tasks/task.php
@@ -447,6 +447,21 @@ if ($id > 0 || ! empty($ref))
 			else $object->next_prev_filter=" fk_projet = ".$projectstatic->id;
 			
 			$morehtmlref='';
+			
+			// Project
+			if (empty($withproject))
+			{
+			    $morehtmlref.='<div class="refidno">';
+			    $morehtmlref.=$langs->trans("Project").': ';
+			    $morehtmlref.=$projectstatic->getNomUrl(1);
+			    $morehtmlref.='<br>';
+			
+			    // Third party
+			    $morehtmlref.=$langs->trans("ThirdParty").': ';
+			    $morehtmlref.=$projectstatic->thirdparty->getNomUrl(1);
+			    $morehtmlref.='</div>';
+			}
+			
 			dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, $param);
 			
 			print '<div class="fichecenter">';
@@ -454,39 +469,6 @@ if ($id > 0 || ! empty($ref))
 			print '<div class="underbanner clearboth"></div>';			
 			print '<table class="border" width="100%">';
 
-			/*
-			// Ref
-			print '<tr><td class="titlefield">';
-			print $langs->trans("Ref");
-			print '</td><td colspan="3">';
-			if (! GETPOST('withproject') || empty($projectstatic->id))
-			{
-				$projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,0,1);
-				$object->next_prev_filter=" fk_projet in (".$projectsListId.")";
-			}
-			else $object->next_prev_filter=" fk_projet = ".$projectstatic->id;
-			print $form->showrefnav($object,'ref',$linkback,1,'ref','ref','',$param);
-			print '</td>';
-			print '</tr>';
-
-			// Label
-			print '<tr><td>'.$langs->trans("Label").'</td><td colspan="3">'.$object->label.'</td></tr>';
-            */
-			
-			// Project
-			if (empty($withproject))
-			{
-				print '<tr><td class="titlefield">'.$langs->trans("Project").'</td><td colspan="3">';
-				print $projectstatic->getNomUrl(1);
-				print '</td></tr>';
-
-				// Third party
-				print '<td>'.$langs->trans("ThirdParty").'</td><td colspan="3">';
-				if ($projectstatic->societe->id) print $projectstatic->societe->getNomUrl(1);
-				else print '&nbsp;';
-				print '</td></tr>';
-			}
-
 			// Date start - Date end
 			print '<tr><td class="titlefield">'.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").'</td><td colspan="3">';
 			$start = dol_print_date($object->date_start,'dayhour');
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index eed7bae2734..0cbe660dd9e 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2005		Rodolphe Quiedeville	<rodolphe@quiedeville.org>
- * Copyright (C) 2006-2016	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2006-2017	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2010-2012	Regis Houssin			<regis.houssin@capnetworks.com>
  * Copyright (C) 2011		Juanjo Menent			<jmenent@2byte.es>
  *
@@ -442,27 +442,31 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 		else $object->next_prev_filter=" fk_projet = ".$projectstatic->id;
 		
 		$morehtmlref='';
+		
+		// Project
+		if (empty($withproject))
+		{
+		    $morehtmlref.='<div class="refidno">';
+		    $morehtmlref.=$langs->trans("Project").': ';
+		    $morehtmlref.=$projectstatic->getNomUrl(1);
+		    $morehtmlref.='<br>';
+		
+		    // Third party
+		    $morehtmlref.=$langs->trans("ThirdParty").': ';
+		    $morehtmlref.=$projectstatic->thirdparty->getNomUrl(1);
+		    $morehtmlref.='</div>';
+		}
+		
 		dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, $param);
 		
 		print '<div class="fichecenter">';
+		print '<div class="fichehalfleft">';
 		
         print '<div class="underbanner clearboth"></div>';
 		print '<table class="border" width="100%">';
 
-		// Ref
-		/*
-		print '<tr><td class="titlefield">';
-		print $langs->trans("Ref");
-		print '</td><td colspan="3">';
-		print $form->showrefnav($object,'ref',$linkback,1,'ref','ref','',$param);
-		print '</td></tr>';
-
-		// Label
-		print '<tr><td>'.$langs->trans("Label").'</td><td colspan="3">'.$object->label.'</td></tr>';
-        */
-		
 		// Date start - Date end
-		print '<tr><td class="titlefield">'.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").'</td><td colspan="3">';
+		print '<tr><td class="titlefield">'.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").'</td><td>';
 		$start = dol_print_date($object->date_start,'dayhour');
 		print ($start?$start:'?');
 		$end = dol_print_date($object->date_end,'dayhour');
@@ -472,17 +476,25 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 		print '</td></tr>';
 
 		// Planned workload
-		print '<tr><td>'.$langs->trans("PlannedWorkload").'</td><td colspan="3">';
+		print '<tr><td>'.$langs->trans("PlannedWorkload").'</td><td>';
 		print convertSecondToTime($object->planned_workload,'allhourmin');
 		print '</td></tr>';
 
+		print '</table>';
+		print '</div>';
+		
+		print '<div class="fichehalfright"><div class="ficheaddleft">';
+		
+		print '<div class="underbanner clearboth"></div>';
+		print '<table class="border" width="100%">';
+		
 		// Progress declared
-		print '<tr><td>'.$langs->trans("ProgressDeclared").'</td><td colspan="3">';
+		print '<tr><td>'.$langs->trans("ProgressDeclared").'</td><td>';
 		print $object->progress.' %';
 		print '</td></tr>';
 
 		// Progress calculated
-		print '<tr><td>'.$langs->trans("ProgressCalculated").'</td><td colspan="3">';
+		print '<tr><td>'.$langs->trans("ProgressCalculated").'</td><td>';
 		if ($object->planned_workload)
 		{
 			$tmparray=$object->getSummaryOfTimeSpent();
@@ -492,23 +504,14 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 		else print '';
 		print '</td></tr>';
 
-		// Project
-		if (empty($withproject))
-		{
-			print '<tr><td>'.$langs->trans("Project").'</td><td>';
-			print $projectstatic->getNomUrl(1);
-			print '</td></tr>';
-
-			// Third party
-			print '<td>'.$langs->trans("ThirdParty").'</td><td>';
-			if ($projectstatic->thirdparty->id) print $projectstatic->thirdparty->getNomUrl(1);
-			else print '&nbsp;';
-			print '</td></tr>';
-		}
-
 		print '</table>';
-        print '</div>';
+
+		print '</div>';
+		print '</div>';
         
+		print '</div>';
+		print '<div class="clearboth"></div>';
+		    
 		dol_fiche_end();
 
 

From 4a46480ef54c0867de4de77da5bffe62066d5f46 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 18 May 2017 12:40:20 +0200
Subject: [PATCH 394/505] Fix preview of PDF contract

---
 htdocs/admin/salaries.php                |  4 +-
 htdocs/core/lib/files.lib.php            |  6 +++
 htdocs/core/modules/modContrat.class.php | 54 ++++++++++++++++++++----
 htdocs/core/modules/modFacture.class.php | 18 ++++----
 4 files changed, 63 insertions(+), 19 deletions(-)

diff --git a/htdocs/admin/salaries.php b/htdocs/admin/salaries.php
index 52470be4106..8f115d3963b 100644
--- a/htdocs/admin/salaries.php
+++ b/htdocs/admin/salaries.php
@@ -85,7 +85,7 @@ print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="action" value="update">';
 
-dol_fiche_head();
+//dol_fiche_head(null, '', '', -1);
 
 /*
  *  Params
@@ -122,7 +122,7 @@ print '</tr>';
 
 print "</table>\n";
 
-dol_fiche_end();
+//dol_fiche_end();
 
 print '<div class="center"><input type="submit" class="button" value="'.$langs->trans('Modify').'" name="button"></div>';
 
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 39865905553..4c3be3cc4d1 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -1706,6 +1706,12 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 	    if ($fuser->rights->ficheinter->lire) $accessallowed=1;
 	    $original_file=$conf->ficheinter->dir_output.'/'.$original_file;
 	}
+	// Wrapping pour les apercu conat
+	elseif (($modulepart == 'apercucontract') && !empty($conf->contrat->dir_output))
+	{
+	    if ($fuser->rights->contrat->lire) $accessallowed=1;
+	    $original_file=$conf->contrat->dir_output.'/'.$original_file;
+	}
 	// Wrapping pour les apercu supplier proposal
 	elseif (($modulepart == 'apercusupplier_proposal' || $modulepart == 'apercusupplier_proposal') && !empty($conf->supplier_proposal->dir_output))
 	{
diff --git a/htdocs/core/modules/modContrat.class.php b/htdocs/core/modules/modContrat.class.php
index c4c8cd500fb..52127c4e6f4 100644
--- a/htdocs/core/modules/modContrat.class.php
+++ b/htdocs/core/modules/modContrat.class.php
@@ -70,12 +70,29 @@ class modContrat extends DolibarrModules
 
 		// Constants
 		$this->const = array();
-		$this->const[0][0] = "CONTRACT_ADDON";
-		$this->const[0][1] = "chaine";
-		$this->const[0][2] = "mod_contract_serpis";
-		$this->const[0][3] = 'Nom du gestionnaire de numerotation des contrats';
-		$this->const[0][4] = 0;
-
+		$r=0;
+		
+		$this->const[$r][0] = "CONTRACT_ADDON";
+		$this->const[$r][1] = "chaine";
+		$this->const[$r][2] = "mod_contract_serpis";
+		$this->const[$r][3] = 'Nom du gestionnaire de numerotation des contrats';
+		$this->const[$r][4] = 0;
+		$r++;
+		
+		$this->const[$r][0] = "CONTRACT_ADDON_PDF";
+		$this->const[$r][1] = "chaine";
+		$this->const[$r][2] = "strato";
+		$this->const[$r][3] = 'Name of PDF model of contract';
+		$this->const[$r][4] = 0;
+		$r++;
+		
+		$this->const[$r][0] = "CONTRACT_ADDON_PDF_ODT_PATH";
+		$this->const[$r][1] = "chaine";
+		$this->const[$r][2] = "DOL_DATA_ROOT/doctemplates/contracts";
+		$this->const[$r][3] = "";
+		$this->const[$r][4] = 0;
+		$r++;
+		
 		// Boxes
 		$this->boxes = array(
 			0=>array('file'=>'box_contracts.php','enabledbydefaulton'=>'Home'),
@@ -202,8 +219,29 @@ class modContrat extends DolibarrModules
 		// Nettoyage avant activation
 		$this->remove($options);
 
-		$sql = array();
-
+		//ODT template
+		$src=DOL_DOCUMENT_ROOT.'/install/doctemplates/contracts/template_contract.odt';
+		$dirodt=DOL_DATA_ROOT.'/doctemplates/contracts';
+		$dest=$dirodt.'/template_contract.odt';
+		
+		if (file_exists($src) && ! file_exists($dest))
+		{
+		    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+		    dol_mkdir($dirodt);
+		    $result=dol_copy($src,$dest,0,0);
+		    if ($result < 0)
+		    {
+		        $langs->load("errors");
+		        $this->error=$langs->trans('ErrorFailToCopyFile',$src,$dest);
+		        return 0;
+		    }
+		}
+		
+		$sql = array(
+		    "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[1][2])."' AND type = 'contract' AND entity = ".$conf->entity,
+		    "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[1][2])."','contract',".$conf->entity.")"
+		);
+		
 		return $this->_init($sql,$options);
 	}
 }
diff --git a/htdocs/core/modules/modFacture.class.php b/htdocs/core/modules/modFacture.class.php
index 7029b7ffd78..b16c7749e40 100644
--- a/htdocs/core/modules/modFacture.class.php
+++ b/htdocs/core/modules/modFacture.class.php
@@ -79,13 +79,6 @@ class modFacture extends DolibarrModules
 		$this->const = array();
 		$r=0;
 
-		$this->const[$r][0] = "FACTURE_ADDON_PDF";
-		$this->const[$r][1] = "chaine";
-		$this->const[$r][2] = "crabe";
-		$this->const[$r][3] = 'Name of PDF model of invoice';
-		$this->const[$r][4] = 0;
-		$r++;
-
 		$this->const[$r][0] = "FACTURE_ADDON";
 		$this->const[$r][1] = "chaine";
 		$this->const[$r][2] = "mod_facture_terre";
@@ -93,6 +86,13 @@ class modFacture extends DolibarrModules
 		$this->const[$r][4] = 0;
 		$r++;
 
+		$this->const[$r][0] = "FACTURE_ADDON_PDF";
+		$this->const[$r][1] = "chaine";
+		$this->const[$r][2] = "crabe";
+		$this->const[$r][3] = 'Name of PDF model of invoice';
+		$this->const[$r][4] = 0;
+		$r++;
+
 		$this->const[$r][0] = "FACTURE_ADDON_PDF_ODT_PATH";
 		$this->const[$r][1] = "chaine";
 		$this->const[$r][2] = "DOL_DATA_ROOT/doctemplates/invoices";
@@ -311,8 +311,8 @@ class modFacture extends DolibarrModules
 		}
 
 		$sql = array(
-				"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[0][2])."' AND type = 'invoice' AND entity = ".$conf->entity,
-				"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[0][2])."','invoice',".$conf->entity.")"
+				"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[1][2])."' AND type = 'invoice' AND entity = ".$conf->entity,
+				"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[1][2])."','invoice',".$conf->entity.")"
 		);
 
 		return $this->_init($sql,$options);

From eaa4b650f88aff2e6f48bfffb697825f32596375 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 18 May 2017 13:01:48 +0200
Subject: [PATCH 395/505] Code comment

---
 htdocs/core/js/lib_head.js.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/js/lib_head.js.php b/htdocs/core/js/lib_head.js.php
index e604f3281f9..478d66f2c2a 100644
--- a/htdocs/core/js/lib_head.js.php
+++ b/htdocs/core/js/lib_head.js.php
@@ -982,7 +982,7 @@ function newpopup(url,title) {
 function document_preview(file, type, title)
 {
 	var ValidImageTypes = ["image/gif", "image/jpeg", "image/png"];
-	console.log("document_preview A click was done. file="+file+", type="+type);
+	console.log("document_preview A click was done. file="+file+", type="+type+", title="+title);
 	
 	if ($.inArray(type, ValidImageTypes) < 0) {
 		var width='85%';
@@ -1018,8 +1018,8 @@ function document_preview(file, type, title)
 
 	}
 	function show_preview(){
-
-		var newElem = '<object data="'+file+'" type="'+type+'" width="'+object_width+'" height="'+object_height+'"></object>';
+		/* console.log("file="+file+" type="+type+" width="+width+" height="+height); */
+		var newElem = '<object name="objectpreview" data="'+file+'" type="'+type+'" width="'+object_width+'" height="'+object_height+'" param="noparam"></object>';
 
 		$("#dialogforpopup").html(newElem);
 		$("#dialogforpopup").dialog({

From dff7d00d2bd5c49bae6c33274b1d2d35c8456144 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 18 May 2017 13:13:18 +0200
Subject: [PATCH 396/505] Look and feel v6

---
 htdocs/admin/contract.php                        | 11 ++++++-----
 htdocs/contrat/admin/contract_extrafields.php    |  3 +--
 htdocs/contrat/admin/contractdet_extrafields.php |  3 +--
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/htdocs/admin/contract.php b/htdocs/admin/contract.php
index ddd8c6f1c00..37c0b9bccde 100644
--- a/htdocs/admin/contract.php
+++ b/htdocs/admin/contract.php
@@ -216,11 +216,9 @@ $form=new Form($db);
 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
 print load_fiche_titre($langs->trans("ContractsSetup"),$linkback,'title_setup');
 
-print "<br>";
-
 $head=contract_admin_prepare_head();
 
-dol_fiche_head($head, 'contract', $langs->trans("Contracts"), 0, 'contract');
+dol_fiche_head($head, 'contract', $langs->trans("Contracts"), -1, 'contract');
 
 /*
  * Contracts Numbering model
@@ -510,7 +508,9 @@ $htmltext.='</i>';
 
 $var=! $var;
 print '<tr class="oddeven"><td colspan="2">';
-print $form->textwithpicto($langs->trans("FreeLegalTextOnContracts"), $langs->trans("AddCRIfTooLong").'<br><br>'.$htmltext).'<br>';
+//print $form->textwithpicto($langs->trans("FreeLegalTextOnContracts"), $langs->trans("AddCRIfTooLong").'<br><br>'.$htmltext, 1, 'help', '', 0, 2, 'tooltiphelp');
+print $form->textwithpicto($langs->trans("FreeLegalTextOnContracts"), $langs->trans("AddCRIfTooLong").'<br><br>'.$htmltext, 1, 'help', '', 0, 2);
+print '<br>';
 $variablename='CONTRACT_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
@@ -527,7 +527,8 @@ print '</td></tr>'."\n";
 //Use draft Watermark
 
 print '<tr class="oddeven"><td>';
-print $form->textwithpicto($langs->trans("WatermarkOnDraftContractCards"), $htmltext);
+//print $form->textwithpicto($langs->trans("WatermarkOnDraftContractCards"), $htmltext, 1, 'help', '', 0, 2, 'tooltiphelp');
+print $form->textwithpicto($langs->trans("WatermarkOnDraftContractCards"), $htmltext, 1, 'help', '', 0, 2);
 print '</td><td>';
 print '<input size="50" class="flat" type="text" name="CONTRACT_DRAFT_WATERMARK" value="'.$conf->global->CONTRACT_DRAFT_WATERMARK.'">';
 print '</td></tr>'."\n";
diff --git a/htdocs/contrat/admin/contract_extrafields.php b/htdocs/contrat/admin/contract_extrafields.php
index a5a86efaad9..509c5307ef8 100644
--- a/htdocs/contrat/admin/contract_extrafields.php
+++ b/htdocs/contrat/admin/contract_extrafields.php
@@ -69,10 +69,9 @@ llxHeader();
 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
 print load_fiche_titre($langs->trans("ContractsSetup"),$linkback,'title_setup');
 
-print '<br>';
 $head=contract_admin_prepare_head();
 
-dol_fiche_head($head, 'attributes', $langs->trans("Contracts"), 0, 'contract');
+dol_fiche_head($head, 'attributes', $langs->trans("Contracts"), -1, 'contract');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
diff --git a/htdocs/contrat/admin/contractdet_extrafields.php b/htdocs/contrat/admin/contractdet_extrafields.php
index 8014334c008..39c691e7ddc 100644
--- a/htdocs/contrat/admin/contractdet_extrafields.php
+++ b/htdocs/contrat/admin/contractdet_extrafields.php
@@ -69,10 +69,9 @@ llxHeader();
 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
 print load_fiche_titre($langs->trans("ContractsSetup"),$linkback,'title_setup');
 
-print '<br>';
 $head=contract_admin_prepare_head();
 
-dol_fiche_head($head, 'attributeslines', $langs->trans("Contracts"), 0, 'contract');
+dol_fiche_head($head, 'attributeslines', $langs->trans("Contracts"), -1, 'contract');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 

From 5a79d11389e16c1261bfe4243beb09f18af1c949 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 18 May 2017 13:14:56 +0200
Subject: [PATCH 397/505] Avoid warning

---
 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 dd856c151b6..c9ec77c76de 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -330,7 +330,7 @@ function GETPOST($paramname, $check='', $method=0, $filter=NULL, $options=NULL)
 	    }
 	}	
 	
-	if (empty($check) && $conf->global->MAIN_FEATURES_LEVEL >= 2)
+	if (empty($check) && ! empty($conf->global->MAIN_FEATURES_LEVEL) && $conf->global->MAIN_FEATURES_LEVEL >= 2)
 	{
 	   dol_syslog("Deprecated use of GETPOST, called with 1st param = ".$paramname." and 2nd param not defined, when calling page ".$_SERVER["PHP_SELF"], LOG_WARNING);    
 	}

From 82cac745e32efcd5cb18a5d5e82077b12406e382 Mon Sep 17 00:00:00 2001
From: florian HENRY <florian.henry@atm-consulting.fr>
Date: Thu, 18 May 2017 14:18:59 +0200
Subject: [PATCH 398/505] FIX 6863

---
 htdocs/core/class/html.form.class.php | 90 +++++++++++++--------------
 1 file changed, 44 insertions(+), 46 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 29ac151152a..204bcfacfb9 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -80,7 +80,7 @@ class Form
      * @param	string	$typeofdata		Type of data ('string' by default, 'email', 'amount:99', 'numeric:99', 'text' or 'textarea:rows:cols', 'datepicker' ('day' do not work, don't know why), 'ckeditor:dolibarr_zzz:width:height:savemethod:1:rows:cols', 'select;xxx[:class]'...)
      * @param	string	$moreparam		More param to add on a href URL.
      * @param   int     $fieldrequired  1 if we want to show field as mandatory using the "fieldrequired" CSS.
-     * @param   int     $notabletag     1=Do not output table tags but output a ':', 2=Do not output table tags and no ':', 3=Do not output table tags but output a ' ' 
+     * @param   int     $notabletag     1=Do not output table tags but output a ':', 2=Do not output table tags and no ':', 3=Do not output table tags but output a ' '
      * @return	string					HTML edit field
      */
     function editfieldkey($text, $htmlname, $preselected, $object, $perm, $typeofdata='string', $moreparam='', $fieldrequired=0, $notabletag=0)
@@ -512,7 +512,7 @@ class Form
      *
      * @param	string	$selected		Value auto selected when at least one record is selected. Not a preselected value. Use '0' by default.
      * @param	int		$arrayofaction	array('code'=>'label', ...). The code is the key stored into the GETPOST('massaction') when submitting action.
-     * @param   int     $alwaysvisible  1=select button always visible 
+     * @param   int     $alwaysvisible  1=select button always visible
      * @return	string					Select list
      */
     function selectMassAction($selected, $arrayofaction, $alwaysvisible=0)
@@ -556,16 +556,16 @@ class Form
     	  				jQuery(".massaction").hide();
     	            }
         		}
-    
+
         	jQuery(document).ready(function () {
         		initCheckForSelect();
         		jQuery(".checkforselect").click(function() {
         			initCheckForSelect();
     	  		});
     	  		jQuery(".massactionselect").change(function() {
-        			var massaction = $( this ).val();  
+        			var massaction = $( this ).val();
         			var urlform = $( this ).closest("form").attr("action").replace("#show_files","");
-        			if (massaction == "builddoc") 
+        			if (massaction == "builddoc")
                     {
                         urlform = urlform + "#show_files";
     	            }
@@ -586,7 +586,7 @@ class Form
     		</script>
         	';
     	}
-    	
+
     	return $ret;
     }
 
@@ -1013,7 +1013,7 @@ class Form
     {
         global $conf,$user,$langs;
 
-        $out=''; 
+        $out='';
         $num=0;
         $outarray=array();
 
@@ -1055,8 +1055,6 @@ class Form
         $resql=$this->db->query($sql);
         if ($resql)
         {
-			$events = null;
-			
            	if ($conf->use_javascript_ajax && ! $forcecombo)
             {
 				include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
@@ -1420,7 +1418,7 @@ class Form
 		    // Build list includeUsers to have only hierarchy and current user
 		    $includeUsers = implode(",",$user->getAllChildIds(1));
 		}
-		
+
         $out='';
 
         // On recherche les utilisateurs
@@ -1637,7 +1635,7 @@ class Form
 			$i++;
 		}
 		if ($nbassignetouser) $out.='</div>';
-		
+
 		//$out.='</form>';
         return $out;
     }
@@ -1663,7 +1661,7 @@ class Form
      *  @param      int         $hidepriceinlabel       1=Hide prices in label
      *  @param      string      $warehouseStatus        warehouse status filter, following comma separated filter options can be used
      *										            'warehouseopen' = select products from open warehouses,
-	 *										            'warehouseclosed' = select products from closed warehouses, 
+	 *										            'warehouseclosed' = select products from closed warehouses,
 	 *										            'warehouseinternal' = select products from warehouses for internal correct/transfer only
      *  @return		void
      */
@@ -1730,7 +1728,7 @@ class Form
      *  @param      int     $hidepriceinlabel   1=Hide prices in label
      *  @param      string  $warehouseStatus    warehouse status filter, following comma separated filter options can be used
      *										    'warehouseopen' = select products from open warehouses,
-	 *										    'warehouseclosed' = select products from closed warehouses, 
+	 *										    'warehouseclosed' = select products from closed warehouses,
 	 *										    'warehouseinternal' = select products from warehouses for internal correct/transfer only
      *  @return     array    				    Array of keys for json
      */
@@ -1745,19 +1743,19 @@ class Form
         if (! empty($warehouseStatus))
         {
             require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
-            if (preg_match('/warehouseclosed/', $warehouseStatus)) 
+            if (preg_match('/warehouseclosed/', $warehouseStatus))
             {
                 $warehouseStatusArray[] = Entrepot::STATUS_CLOSED;
             }
-            if (preg_match('/warehouseopen/', $warehouseStatus)) 
+            if (preg_match('/warehouseopen/', $warehouseStatus))
             {
                 $warehouseStatusArray[] = Entrepot::STATUS_OPEN_ALL;
             }
-            if (preg_match('/warehouseinternal/', $warehouseStatus)) 
+            if (preg_match('/warehouseinternal/', $warehouseStatus))
             {
                 $warehouseStatusArray[] = Entrepot::STATUS_OPEN_INTERNAL;
             }
-        }		
+        }
 
         $selectFields = " p.rowid, p.label, p.ref, p.description, p.barcode, p.fk_product_type, p.price, p.price_ttc, p.price_base_type, p.tva_tx, p.duration, p.fk_price_expression";
         (count($warehouseStatusArray)) ? $selectFieldsGrouped = ", sum(ps.reel) as stock" : $selectFieldsGrouped = ", p.stock";
@@ -1796,7 +1794,7 @@ class Form
             $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_stock as ps on ps.fk_product = p.rowid";
             $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."entrepot as e on ps.fk_entrepot = e.rowid";
         }
-        
+
         //Price by customer
         if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES) && !empty($socid)) {
         	$sql.=" LEFT JOIN  ".MAIN_DB_PREFIX."product_customer_price as pcp ON pcp.fk_soc=".$socid." AND pcp.fk_product=p.rowid";
@@ -1863,7 +1861,7 @@ class Form
             $num = $this->db->num_rows($result);
 
             $events=null;
-            
+
             if ($conf->use_javascript_ajax && ! $forcecombo)
             {
 				include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
@@ -1871,9 +1869,9 @@ class Form
             	$out.= $comboenhancement;
             	$nodatarole=($comboenhancement?' data-role="none"':'');
             }
-            
+
             $out.='<select class="flat'.($morecss?' '.$morecss:'').'" name="'.$htmlname.'" id="'.$htmlname.'"'.$nodatarole.'>';
-            
+
             $textifempty='';
             // Do not use textifempty = ' ' or '&nbsp;' here, or search on key will search on ' key'.
             //if (! empty($conf->use_javascript_ajax) || $forcecombo) $textifempty='';
@@ -2898,7 +2896,7 @@ class Form
 
         // Set default value if not already set by caller
         if (empty($selected) && ! empty($conf->global->MAIN_DEFAULT_PAYMENT_TERM_ID)) $selected = $conf->global->MAIN_DEFAULT_PAYMENT_TERM_ID;
-        
+
         print '<select class="flat" name="'.$htmlname.'">';
         if ($addempty) print '<option value="0">&nbsp;</option>';
         foreach($this->cache_conditions_paiements as $id => $arrayconditions)
@@ -3409,7 +3407,7 @@ class Form
         // Clean parameters
         $newselectedchoice=empty($selectedchoice)?"no":$selectedchoice;
         if ($conf->browser->layout == 'phone') $width='95%';
-        
+
         if (is_array($formquestion) && ! empty($formquestion))
         {
         	// First add hidden fields and value
@@ -3675,7 +3673,7 @@ class Form
         require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 
         $out='';
-        
+
         $formproject=new FormProjets($this->db);
 
         $langs->load("project");
@@ -3703,8 +3701,8 @@ class Form
                 $out.="&nbsp;";
             }
         }
-        
-        if (empty($nooutput)) 
+
+        if (empty($nooutput))
         {
             print $out;
             return '';
@@ -4049,7 +4047,7 @@ class Form
                 }
                 print '</div>';
             }
-            if ($more) 
+            if ($more)
             {
                 print '<div class="inline-block">';
                 print $more;
@@ -4259,7 +4257,7 @@ class Form
 		// Make select dynamic
 		include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
 		$out.= ajax_combobox($htmlname);
-		
+
         return $out;
     }
 
@@ -4454,13 +4452,13 @@ class Form
         		$key.= $rate['nprtva'] ? '*': '';
         		if ($mode > 0 && $rate['code']) $key.=' ('.$rate['code'].')';
         		if ($mode < 0) $key = $rate['rowid'];
-        		
+
         		$return.= '<option value="'.$key.'"';
         		if (! $selectedfound)
         		{
             		if ($defaultcode) // If defaultcode is defined, we used it in priority to select combo option instead of using rate+npr flag
             		{
-                        if ($defaultcode == $rate['code']) 
+                        if ($defaultcode == $rate['code'])
                         {
                             $return.= ' selected';
                             $selectedfound=true;
@@ -4884,7 +4882,7 @@ class Form
      *  @param	string			$morecss		Add more class to css styles
      *  @param	int				$addjscombo		    Add js combo
      *  @param  string          $moreparamonempty   Add more param on the empty option line. Not used if show_empty not set.
-     *  @param  int             $disablebademail    Check if an email is found into value and if not disable and colorize entry. 
+     *  @param  int             $disablebademail    Check if an email is found into value and if not disable and colorize entry.
      * 	@return	string							    HTML select string.
      *  @see multiselectarray
      */
@@ -4906,7 +4904,7 @@ class Form
         {
         	$minLengthToAutocomplete=0;
         	$tmpplugin=empty($conf->global->MAIN_USE_JQUERY_MULTISELECT)?(constant('REQUIRE_JQUERY_MULTISELECT')?constant('REQUIRE_JQUERY_MULTISELECT'):'select2'):$conf->global->MAIN_USE_JQUERY_MULTISELECT;
-        	
+
         	// Enhance with select2
         	$nodatarole='';
         	if ($conf->use_javascript_ajax)
@@ -4933,7 +4931,7 @@ class Form
         	// Translate
         	if ($translate)
         	{
-	        	foreach($array as $key => $value) 
+	        	foreach($array as $key => $value)
 	        	{
 	        	    $array[$key]=$langs->trans($value);
 	        	}
@@ -5452,7 +5450,7 @@ class Form
 
 		$linktoelem='';
 		$linktoelemlist='';
-		
+
 		if (! is_object($object->thirdparty)) $object->fetch_thirdparty();
 
 		$possiblelinks=array();
@@ -5460,7 +5458,7 @@ class Form
 		{
     		$listofidcompanytoscan=$object->thirdparty->id;
     		if (($object->thirdparty->parent > 0) && ! empty($conf->global->THIRDPARTY_INCLUDE_PARENT_IN_LINKTO)) $listofidcompanytoscan.=','.$object->thirdparty->parent;
-    		
+
     		$possiblelinks=array(
     		    'propal'=>array('enabled'=>$conf->propal->enabled, 'perms'=>1, 'label'=>'LinkToProposal', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_client, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."propal as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('propal',1).')'),
     		    'order'=>array('enabled'=>$conf->commande->enabled, 'perms'=>1, 'label'=>'LinkToOrder', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_client, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."commande as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('commande',1).')'),
@@ -5472,9 +5470,9 @@ class Form
     		    'invoice_supplier'=>array('enabled'=>$conf->fournisseur->facture->enabled , 'perms'=>1, 'label'=>'LinkToSupplierInvoice', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_supplier, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture_fourn as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('facture_fourn',1).')')
     		);
 		}
-		
+
 		global $action;
-		
+
 		// Can complet the possiblelink array
 		$hookmanager->initHooks(array('commonobject'));
 		$parameters=array();
@@ -5499,7 +5497,7 @@ class Form
 			$num = 0;
 
 			if (empty($possiblelink['enabled'])) continue;
-			
+
 			if (! empty($possiblelink['perms']) && (empty($restrictlinksto) || in_array($key, $restrictlinksto)) && (empty($excludelinksto) || ! in_array($key, $excludelinksto)))
 			{
 				print '<div id="'.$key.'list"'.(empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)?' style="display:none"':'').'>';
@@ -5711,7 +5709,7 @@ class Form
 
         //print "paramid=$paramid,morehtml=$morehtml,shownav=$shownav,$fieldid,$fieldref,$morehtmlref,$moreparam";
         $object->load_previous_next_ref((isset($object->next_prev_filter)?$object->next_prev_filter:''),$fieldid,$nodbprefix);
-        
+
         $navurl = $_SERVER["PHP_SELF"];
         // Special case for project/task page
         if ($paramid == 'project_ref')
@@ -5753,10 +5751,10 @@ class Form
 		    if ($conf->browser->layout == 'phone') $ret.='<div class="floatleft">'.$morehtmlleft.'</div>';    // class="center" to have photo in middle
 		    else $ret.='<div class="inline-block floatleft">'.$morehtmlleft.'</div>';
 		}
-		
+
 		//if ($conf->browser->layout == 'phone') $ret.='<div class="clearboth"></div>';
 		$ret.='<div class="inline-block floatleft valignmiddle refid'.(($shownav && ($previous_ref || $next_ref))?' refidpadding':'').'">';
-		
+
 		// For thirdparty, contact, user, member, the ref is the id, so we show something else
 		if ($object->element == 'societe')
 		{
@@ -5768,17 +5766,17 @@ class Form
 		}
 		else if (in_array($object->element, array('action', 'agenda')))
 		{
-		    $ret.=$object->ref.'<br>'.$object->label;    
+		    $ret.=$object->ref.'<br>'.$object->label;
 		}
 		else if ($fieldref != 'none') $ret.=dol_htmlentities($object->$fieldref);
-		
-		
+
+
 		if ($morehtmlref)
 		{
 		    $ret.=' '.$morehtmlref;
 		}
-		$ret.='</div>';		
-		
+		$ret.='</div>';
+
 		$ret.='</div><!-- End banner content -->';
 
         return $ret;

From 0b0dbd9649462722a7856e5a5b2ab25032a618d6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 18 May 2017 17:57:20 +0200
Subject: [PATCH 399/505] Code comment

---
 htdocs/install/mysql/tables/llx_actioncomm.sql | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/install/mysql/tables/llx_actioncomm.sql b/htdocs/install/mysql/tables/llx_actioncomm.sql
index e022b46a859..46017d1e739 100644
--- a/htdocs/install/mysql/tables/llx_actioncomm.sql
+++ b/htdocs/install/mysql/tables/llx_actioncomm.sql
@@ -40,14 +40,14 @@ create table llx_actioncomm
   fk_soc			integer,
   fk_contact		integer,
   fk_parent			integer NOT NULL default 0,
-  fk_user_action	integer,						-- user id of owner of action (note that assigned users to event are store into another table)
+  fk_user_action	integer,						-- user id of owner of action (note that users assigned to event are stored into another table)
   fk_user_done		integer,						-- user id of user that has made action (deprecated)
 
-  transparency      integer,						-- transparency (ical standard). used to say if user assigned to event are busy or not by event. This field may be deprecated if we want to store transparency for each assigned user, so into table llx_actioncomm_resources.
+  transparency      integer,						-- transparency (ical standard). used to say if user assigned to event are busy or not by event. This field may be deprecated if we want to store transparency for each assigned user, moved into table llx_actioncomm_resources.
 
   priority			smallint,						-- priority (ical standard)
-  fulldayevent		smallint NOT NULL default 0, -- priority (ical standard)
-  punctual			smallint NOT NULL default 1, -- deprecated. milestone is event with date start (datep) = date end (datep2)
+  fulldayevent		smallint NOT NULL default 0,    -- priority (ical standard)
+  punctual			smallint NOT NULL default 1,    -- deprecated. milestone is event with date start (datep) = date end (datep2)
   percent			smallint NOT NULL default 0,
   location			varchar(128),
   durationp			real,							-- planed duration
@@ -64,9 +64,9 @@ create table llx_actioncomm
   email_tobcc		varchar(256),					-- when event was an email, we store here the email_tobcc
   errors_to			varchar(256),					-- when event was an email, we store here the erros_to
   
-  recurid           varchar(128),                  -- used to store event id to link all recurring event records each other  
+  recurid           varchar(128),                   -- used to store event id to link each other all the repeating event records  
   recurrule         varchar(128),					-- contains string with ical format recurring rule like "FREQ=MONTHLY;INTERVAL=2;BYMONTHDAY=19" or "FREQ=WEEKLY;BYDAY=MO"
-  recurdateend      datetime,
+  recurdateend      datetime,						-- no more recurring event after this date
      
   fk_element		integer DEFAULT NULL,			-- For link to an element (proposal, invoice, order, ...)
   elementtype		varchar(255) DEFAULT NULL		-- For link to an element (proposal, invoice, order, ...)

From ef575166c0195b74affa042e117dc30338ad542b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 18 May 2017 19:10:05 +0200
Subject: [PATCH 400/505] FIX #6651

---
 htdocs/comm/propal/list.php       |  10 +-
 htdocs/supplier_proposal/list.php | 586 +++++++++++++++++++++++-------
 2 files changed, 456 insertions(+), 140 deletions(-)

diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index ac5cee3bebc..af9ffa6d778 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -84,7 +84,7 @@ $day=GETPOST("day","int");
 $month=GETPOST("month","int");
 $year=GETPOST("year","int");
 
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
@@ -242,6 +242,7 @@ $sql.= " typent.code as typent_code,";
 $sql.= " state.code_departement as state_code, state.nom as state_name,";
 $sql.= ' p.rowid, p.note_private, p.total_ht, p.tva as total_vat, p.total as total_ttc, p.localtax1, p.localtax2, p.ref, p.ref_client, p.fk_statut, p.fk_user_author, p.datep as dp, p.fin_validite as dfv,';
 $sql.= ' p.datec as date_creation, p.tms as date_update,';
+$sql.= " pr.rowid as project_id, pr.ref as project_ref,";
 if (! $user->rights->societe->client->voir && ! $socid) $sql .= " sc.fk_soc, sc.fk_user,";
 $sql.= ' u.login';
 // Add fields from extrafields
@@ -259,6 +260,7 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
 if ($sall || $search_product_category > 0) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'propaldet as pd ON p.rowid=pd.fk_propal';
 if ($search_product_category > 0) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_product as cp ON cp.fk_product=pd.fk_product';
 $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'user as u ON p.fk_user_author = u.rowid';
+$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."projet as pr ON pr.rowid = p.fk_projet";
 // We'll need this table joined to the select in order to filter by sale
 if ($search_sale > 0 || (! $user->rights->societe->client->voir && ! $socid)) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 if ($search_user > 0)
@@ -377,6 +379,7 @@ if ($resql)
 	if ($search_montant_ht)  $param.='&search_montant_ht='.$search_montant_ht;
 	if ($search_login)  	 $param.='&search_login='.$search_login;
 	if ($search_town)		 $param.='&search_town='.$search_town;
+	if ($search_zip)		 $param.='&search_zip='.$search_zip;
 	if ($socid > 0)          $param.='&socid='.$socid;
 	if ($optioncss != '') $param.='&optioncss='.$optioncss;
 	// Add $param from extra fields
@@ -532,7 +535,7 @@ if ($resql)
 	    $moreforfilter.=$form->select_dolusers($search_user, 'search_user', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
 	    $moreforfilter.='</div>';
 	}
-	// If the user can view prospects other than his'
+	// If the user can view products
 	if ($conf->categorie->enabled && ($user->rights->produit->lire || $user->rights->service->lire))
 	{
 		include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
@@ -566,7 +569,7 @@ if ($resql)
 	{
 	    print '<td class="liste_titre">';
     	print '<input class="flat" size="6" type="text" name="search_ref" value="'.$search_ref.'">';
-	   print '</td>';
+ 	    print '</td>';
 	}
 	if (! empty($arrayfields['p.ref_client']['checked']))
 	{
@@ -1001,7 +1004,6 @@ if ($resql)
 		   else print '<td></td>';
 		}
 		print '</tr>';
-		
 	}
 
 	$db->free($resql);
diff --git a/htdocs/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php
index 56f8df0f825..c5f994f8a10 100644
--- a/htdocs/supplier_proposal/list.php
+++ b/htdocs/supplier_proposal/list.php
@@ -61,8 +61,15 @@ $search_user=GETPOST('search_user','int');
 $search_sale=GETPOST('search_sale','int');
 $search_ref=GETPOST('sf_ref')?GETPOST('sf_ref','alpha'):GETPOST('search_ref','alpha');
 $search_societe=GETPOST('search_societe','alpha');
-$search_montant_ht=GETPOST('search_montant_ht','alpha');
 $search_author=GETPOST('search_author','alpha');
+$search_town=GETPOST('search_town','alpha');
+$search_zip=GETPOST('search_zip','alpha');
+$search_state=trim(GETPOST("search_state"));
+$search_country=GETPOST("search_country",'int');
+$search_type_thirdparty=GETPOST("search_type_thirdparty",'int');
+$search_montant_ht=GETPOST('search_montant_ht','alpha');
+$search_montant_vat=GETPOST('search_montant_vat','alpha');
+$search_montant_ttc=GETPOST('search_montant_ttc','alpha');
 $search_status=GETPOST('viewstatut','alpha')?GETPOST('viewstatut','alpha'):GETPOST('search_status','int');
 $object_statut=$db->escape(GETPOST('supplier_proposal_statut'));
 
@@ -121,28 +128,28 @@ $fieldstosearchall = array(
     'p.ref'=>'Ref',
     's.nom'=>'Supplier',
     'pd.description'=>'Description',
-    'p.note_private'=>"NotePrivate",
     'p.note_public'=>'NotePublic',
 );
+if (empty($user->socid)) $fieldstosearchall["p.note_private"]="NotePrivate";
 
-// TODO Use field of supplier proposal
+$checkedtypetiers=0;
 $arrayfields=array(
-    'p.ref'=>array('label'=>$langs->trans("Ref"), 'checked'=>1),
+    'sp.ref'=>array('label'=>$langs->trans("Ref"), 'checked'=>1),
     's.nom'=>array('label'=>$langs->trans("Supplier"), 'checked'=>1),
     's.town'=>array('label'=>$langs->trans("Town"), 'checked'=>1),
     's.zip'=>array('label'=>$langs->trans("Zip"), 'checked'=>1),
     'state.nom'=>array('label'=>$langs->trans("StateShort"), 'checked'=>0),
     'country.code_iso'=>array('label'=>$langs->trans("Country"), 'checked'=>0),
     'typent.code'=>array('label'=>$langs->trans("ThirdPartyType"), 'checked'=>$checkedtypetiers),
-    'p.date'=>array('label'=>$langs->trans("Date"), 'checked'=>1),
-    'p.fin_validite'=>array('label'=>$langs->trans("DateEnd"), 'checked'=>1),
-    'p.total_ht'=>array('label'=>$langs->trans("AmountHT"), 'checked'=>1),
-    'p.total_vat'=>array('label'=>$langs->trans("AmountVAT"), 'checked'=>0),
-    'p.total_ttc'=>array('label'=>$langs->trans("AmountTTC"), 'checked'=>0),
+    'sp.date_valid'=>array('label'=>$langs->trans("Date"), 'checked'=>1),
+    'sp.date_livraison'=>array('label'=>$langs->trans("DateEnd"), 'checked'=>1),
+    'sp.total_ht'=>array('label'=>$langs->trans("AmountHT"), 'checked'=>1),
+    'sp.total_vat'=>array('label'=>$langs->trans("AmountVAT"), 'checked'=>0),
+    'sp.total_ttc'=>array('label'=>$langs->trans("AmountTTC"), 'checked'=>0),
     'u.login'=>array('label'=>$langs->trans("Author"), 'checked'=>1, 'position'=>10),
-    'p.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
-    'p.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500),
-    'p.fk_statut'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000),
+    'sp.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
+    'sp.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500),
+    'sp.fk_statut'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000),
 );
 // Extra fields
 if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
@@ -169,6 +176,7 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
+// Do we click on purge search criteria ?
 if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") ||GETPOST("button_removefilter")) // All tests are required to be compatible with all browsers
 {
     $search_categ='';
@@ -177,6 +185,16 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") ||GETPO
     $search_ref='';
     $search_societe='';
     $search_montant_ht='';
+    $search_montant_vat='';
+    $search_montant_ttc='';
+    $search_login='';
+    $search_product_category='';
+    $search_town='';
+    $search_zip="";
+    $search_state="";
+    $search_type='';
+    $search_country='';
+    $search_type_thirdparty='';
     $search_author='';
     $yearvalid='';
     $monthvalid='';
@@ -186,10 +204,6 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") ||GETPO
     $object_statut='';
 }
 
-$parameters=array('socid'=>$socid);
-$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-
 if (empty($reshook))
 {
     $objectclass='SupplierProposal';
@@ -215,15 +229,18 @@ $formpropal = new FormPropal($db);
 $companystatic=new Societe($db);
 $formcompany=new FormCompany($db);
 
-llxHeader('',$langs->trans('CommRequest'),'EN:Ask_Price_Supplier|FR:Demande_de_prix_fournisseur');
+$help_url='EN:Ask_Price_Supplier|FR:Demande_de_prix_fournisseur';
+llxHeader('',$langs->trans('CommRequest'),$help_url);
 
 $sql = 'SELECT';
 if ($sall || $search_product_category > 0) $sql = 'SELECT DISTINCT';
-$sql.= ' s.rowid as socid, s.nom as name, s.town, s.client, s.code_client,';
+$sql.= ' s.rowid as socid, s.nom as name, s.town, s.zip, s.fk_pays, s.client, s.code_client,';
 $sql.= " typent.code as typent_code,";
 $sql.= " state.code_departement as state_code, state.nom as state_name,";
-$sql.= ' sp.rowid, sp.note_private, sp.total_ht, sp.ref, sp.fk_statut, sp.fk_user_author, sp.date_valid, sp.date_livraison as dp,';
+$sql.= ' sp.rowid, sp.note_private, sp.total_ht, sp.tva as total_vat, sp.total as total_ttc, sp.localtax1, sp.localtax2, sp.ref, sp.fk_statut, sp.fk_user_author, sp.date_valid, sp.date_livraison as dp,';
+$sql.= ' sp.datec as date_creation, sp.tms as date_update,';
 $sql.= " p.rowid as project_id, p.ref as project_ref,";
+if (! $user->rights->societe->client->voir && ! $socid) $sql .= " sc.fk_soc, sc.fk_user,";
 $sql.= " u.firstname, u.lastname, u.photo, u.login";
 // Add fields from extrafields
 foreach ($extrafields->attribute_label as $key => $val) $sql.=($extrafields->attribute_type[$key] != 'separate' ? ",ef.".$key.' as options_'.$key : '');
@@ -231,7 +248,7 @@ foreach ($extrafields->attribute_label as $key => $val) $sql.=($extrafields->att
 $parameters=array();
 $reshook=$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.= ' FROM '.MAIN_DB_PREFIX.'societe as s';
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as country on (country.rowid = s.fk_pays)";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_typent as typent on (typent.id = s.fk_typent)";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as state on (state.rowid = s.fk_departement)";
@@ -254,10 +271,17 @@ if (! $user->rights->societe->client->voir && ! $socid) //restriction
 {
 	$sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 }
+if ($search_town)  $sql.= natural_search('s.town', $search_town);
+if ($search_zip)   $sql.= natural_search("s.zip",$search_zip);
+if ($search_state) $sql.= natural_search("state.nom",$search_state);
+if ($search_country) $sql .= " AND s.fk_pays IN (".$search_country.')';
+if ($search_type_thirdparty) $sql .= " AND s.fk_typent IN (".$search_type_thirdparty.')';
 if ($search_ref)     $sql .= natural_search('sp.ref', $search_ref);
 if ($search_societe) $sql .= natural_search('s.nom', $search_societe);
 if ($search_author)  $sql .= natural_search('u.login', $search_author);
-if ($search_montant_ht) $sql.= " AND sp.total_ht='".$db->escape(price2num(trim($search_montant_ht)))."'";
+if ($search_montant_ht) $sql.= natural_search('sp.total_ht=', $search_montant_ht, 1);
+if ($search_montant_vat != '') $sql.= natural_search("sp.tva", $search_montant_vat, 1);
+if ($search_montant_ttc != '') $sql.= natural_search("sp.total", $search_montant_ttc, 1);
 if ($sall) $sql .= natural_search(array_keys($fieldstosearchall), $sall);
 if ($socid) $sql.= ' AND s.rowid = '.$socid;
 if ($search_status >= 0 && $search_status != '') $sql.= ' AND sp.fk_statut IN ('.$search_status.')';
@@ -292,6 +316,23 @@ if ($search_user > 0)
 {
     $sql.= " AND c.fk_c_type_contact = tc.rowid AND tc.element='supplier_proposal' AND tc.source='internal' AND c.element_id = sp.rowid AND c.fk_socpeople = ".$search_user;
 }
+// Add where from extra fields
+foreach ($search_array_options as $key => $val)
+{
+    $crit=$val;
+    $tmpkey=preg_replace('/search_options_/','',$key);
+    $typ=$extrafields->attribute_type[$tmpkey];
+    $mode=0;
+    if (in_array($typ, array('int','double'))) $mode=1;    // Search on a numeric
+    if ($val && ( ($crit != '' && ! in_array($typ, array('select'))) || ! empty($crit)))
+    {
+        $sql .= natural_search('ef.'.$tmpkey, $crit, $mode);
+    }
+}
+// Add where from hooks
+$parameters=array();
+$reshook=$hookmanager->executeHooks('printFieldListWhere',$parameters);    // Note that $action and $object may have been modified by hook
+$sql.=$hookmanager->resPrint;
 
 $sql.= $db->order($sortfield,$sortorder);
 $sql.=', sp.ref DESC';
@@ -300,14 +341,14 @@ $sql.=', sp.ref DESC';
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
-	$result = $db->query($sql);
-	$nbtotalofrecords = $db->num_rows($result);
+	$resql = $db->query($sql);
+	$nbtotalofrecords = $db->num_rows($resql);
 }
 
 $sql.= $db->plimit($limit + 1,$offset);
 
-$result=$db->query($sql);
-if ($result)
+$resql=$db->query($sql);
+if ($resql)
 {
 	$objectstatic=new SupplierProposal($db);
 	$userstatic=new User($db);
@@ -323,7 +364,7 @@ if ($result)
 	    $title = $langs->trans('ListOfSupplierProposals');
 	}
 	
-	$num = $db->num_rows($result);
+	$num = $db->num_rows($resql);
 
 	$arrayofselected=is_array($toselect)?$toselect:array();
 	
@@ -339,6 +380,8 @@ if ($result)
 	if ($search_sale > 0)    $param.='&search_sale='.$search_sale;
 	if ($search_montant_ht)  $param.='&search_montant_ht='.$search_montant_ht;
 	if ($search_author)  	 $param.='&search_author='.$search_author;
+	if ($search_town)		 $param.='&search_town='.$search_town;
+	if ($search_zip)		 $param.='&search_zip='.$search_zip;
 	if ($socid > 0)          $param.='&socid='.$socid;
 	if ($search_status != '') $param.='&search_status='.$search_status;
 	if ($optioncss != '') $param.='&optioncss='.$optioncss;
@@ -495,6 +538,16 @@ if ($result)
 	    $moreforfilter.=$form->select_dolusers($search_user, 'search_user', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
 	    $moreforfilter.='</div>';
 	}
+	// If the user can view products
+	if ($conf->categorie->enabled && ($user->rights->produit->lire || $user->rights->service->lire))
+	{
+	    include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+	    $moreforfilter.='<div class="divsearchfield">';
+	    $moreforfilter.=$langs->trans('IncludingProductWithTag'). ': ';
+	    $cate_arbo = $form->select_all_categories(Categorie::TYPE_PRODUCT, null, 'parent', null, null, 1);
+	    $moreforfilter.=$form->selectarray('search_product_category', $cate_arbo, $search_product_category, 1, 0, 0, '', 0, 0, 0, 0, 'maxwidth300', 1);
+	    $moreforfilter.='</div>';
+	}
 	$parameters=array();
 	$reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters);    // Note that $action and $object may have been modified by hook
 	if (empty($reshook)) $moreforfilter .= $hookmanager->resPrint;
@@ -512,46 +565,142 @@ if ($result)
     if ($massactionbutton) $selectedfields.=$form->showCheckAddButtons('checkforselect', 1);
     
     print '<div class="div-table-responsive">';
-    print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">';
+    print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
     
 	print '<tr class="liste_titre_filter">';
-	print '<td class="liste_titre">';
-	print '<input class="flat" size="6" type="text" name="search_ref" value="'.$search_ref.'">';
-	print '</td>';
-	print '<td class="liste_titre" align="left">';
-	print '<input class="flat" type="text" size="12" name="search_societe" value="'.$search_societe.'">';
-	print '</td>';
-
-	// Date valid
-	print '<td class="liste_titre" colspan="1" align="center">';
-	//print $langs->trans('Month').': ';
-	print '<input class="flat" type="text" size="1" maxlength="2" name="monthvalid" value="'.$monthvalid.'">';
-	//print '&nbsp;'.$langs->trans('Year').': ';
-	$syearvalid = $yearvalid;
-	$formother->select_year($syearvalid,'yearvalid',1, 20, 5);
-	print '</td>';
-	
+	if (! empty($arrayfields['sp.ref']['checked']))            
+	{
+		print '<td class="liste_titre">';
+		print '<input class="flat" size="6" type="text" name="search_ref" value="'.$search_ref.'">';
+		print '</td>';
+	}
+	if (! empty($arrayfields['s.nom']['checked']))
+	{	
+		print '<td class="liste_titre" align="left">';
+		print '<input class="flat" type="text" size="12" name="search_societe" value="'.$search_societe.'">';
+		print '</td>';
+	}
+	if (! empty($arrayfields['s.town']['checked'])) print '<td class="liste_titre"><input class="flat" type="text" size="6" name="search_town" value="'.$search_town.'"></td>';
+	if (! empty($arrayfields['s.zip']['checked'])) print '<td class="liste_titre"><input class="flat" type="text" size="4" name="search_zip" value="'.$search_zip.'"></td>';
+	// State
+    if (! empty($arrayfields['state.nom']['checked']))
+    {
+        print '<td class="liste_titre">';
+    	print '<input class="flat" size="4" type="text" name="search_state" value="'.dol_escape_htmltag($search_state).'">';
+    	print '</td>';
+    }
+    // Country
+    if (! empty($arrayfields['country.code_iso']['checked']))
+    {
+        print '<td class="liste_titre" align="center">';
+    	print $form->select_country($search_country,'search_country','',0,'maxwidth100');
+    	print '</td>';
+    }
+	// Company type
+    if (! empty($arrayfields['typent.code']['checked']))
+    {
+        print '<td class="liste_titre maxwidthonsmartphone" align="center">';
+    	print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 0, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT)?'ASC':$conf->global->SOCIETE_SORT_ON_TYPEENT));
+    	print '</td>';
+    }
 	// Date
-	print '<td class="liste_titre" colspan="1" align="center">';
-	//print $langs->trans('Month').': ';
-	print '<input class="flat" type="text" size="1" maxlength="2" name="month" value="'.$month.'">';
-	//print '&nbsp;'.$langs->trans('Year').': ';
-	$syear = $year;
-	$formother->select_year($syear,'year',1, 20, 5);
-	print '</td>';
+	if (! empty($arrayfields['sp.date_valid']['checked'])) 
+	{
+		print '<td class="liste_titre" colspan="1" align="center">';
+		//print $langs->trans('Month').': ';
+		print '<input class="flat" type="text" size="1" maxlength="2" name="monthvalid" value="'.$monthvalid.'">';
+		//print '&nbsp;'.$langs->trans('Year').': ';
+		$syearvalid = $yearvalid;
+		$formother->select_year($syearvalid,'yearvalid',1, 20, 5);
+		print '</td>';	
+	}
+	// Date
+	if (! empty($arrayfields['sp.date_livraison']['checked'])) 
+	{
+		print '<td class="liste_titre" colspan="1" align="center">';
+		//print $langs->trans('Month').': ';
+		print '<input class="flat" type="text" size="1" maxlength="2" name="month" value="'.$month.'">';
+		//print '&nbsp;'.$langs->trans('Year').': ';
+		$syear = $year;
+		$formother->select_year($syear,'year',1, 20, 5);
+		print '</td>';
+	}
 
-	// Amount
-	print '<td class="liste_titre" align="right">';
-	print '<input class="flat" type="text" size="10" name="search_montant_ht" value="'.$search_montant_ht.'">';
-	print '</td>';
-	// Author
-	print '<td class="liste_titre" align="center">';
-	print '<input class="flat" size="10" type="text" name="search_author" value="'.$search_author.'">';
-	print '</td>';
-	print '<td class="liste_titre" align="right">';
-	$formpropal->selectProposalStatus($search_status,1,0,1,'supplier','search_status');
-	print '</td>';
-	// Check boxes
+	if (! empty($arrayfields['sp.total_ht']['checked']))
+	{
+	    // Amount
+	    print '<td class="liste_titre" align="right">';
+	    print '<input class="flat" type="text" size="5" name="search_montant_ht" value="'.$search_montant_ht.'">';
+	    print '</td>';
+	}
+	if (! empty($arrayfields['sp.total_vat']['checked']))
+	{
+	    // Amount
+	    print '<td class="liste_titre" align="right">';
+	    print '<input class="flat" type="text" size="5" name="search_montant_vat" value="'.$search_montant_vat.'">';
+	    print '</td>';
+	}
+	if (! empty($arrayfields['sp.total_ttc']['checked']))
+	{
+	    // Amount
+	    print '<td class="liste_titre" align="right">';
+	    print '<input class="flat" type="text" size="5" name="search_montant_ttc" value="'.$search_montant_ttc.'">';
+	    print '</td>';
+	}
+	if (! empty($arrayfields['u.login']['checked']))
+	{
+	    // Author
+	    print '<td class="liste_titre" align="center">';
+	    print '<input class="flat" size="4" type="text" name="search_login" value="'.$search_author.'">';
+	    print '</td>';
+	}	
+	// Extra fields
+	if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
+	{
+	    foreach($extrafields->attribute_label as $key => $val)
+	    {
+	        if (! empty($arrayfields["ef.".$key]['checked']))
+	        {
+	            $align=$extrafields->getAlignFlag($key);
+	            $typeofextrafield=$extrafields->attribute_type[$key];
+	            print '<td class="liste_titre'.($align?' '.$align:'').'">';
+	            if (in_array($typeofextrafield, array('varchar', 'int', 'double', 'select')))
+	            {
+	                $crit=$val;
+	                $tmpkey=preg_replace('/search_options_/','',$key);
+	                $searchclass='';
+	                if (in_array($typeofextrafield, array('varchar', 'select'))) $searchclass='searchstring';
+	                if (in_array($typeofextrafield, array('int', 'double'))) $searchclass='searchnum';
+	                print '<input class="flat'.($searchclass?' '.$searchclass:'').'" size="4" type="text" name="search_options_'.$tmpkey.'" value="'.dol_escape_htmltag($search_array_options['search_options_'.$tmpkey]).'">';
+	            }
+	            print '</td>';
+	        }
+	    }
+	}
+	// Fields from hook
+	$parameters=array('arrayfields'=>$arrayfields);
+	$reshook=$hookmanager->executeHooks('printFieldListOption',$parameters);    // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
+	// Date creation
+	if (! empty($arrayfields['sp.datec']['checked']))
+	{
+	    print '<td class="liste_titre">';
+	    print '</td>';
+	}
+	// Date modification
+	if (! empty($arrayfields['sp.tms']['checked']))
+	{
+	    print '<td class="liste_titre">';
+	    print '</td>';
+	}	
+	// Status
+	if (! empty($arrayfields['sp.fk_statut']['checked']))
+	{
+		print '<td class="liste_titre maxwidthonsmartphone" align="right">';
+		$formpropal->selectProposalStatus($search_status,1,0,1,'supplier','search_status');
+		print '</td>';
+	}
+	// Action column
 	print '<td class="liste_titre" align="middle">';
 	$searchpicto=$form->showFilterButtons();
 	print $searchpicto;
@@ -561,63 +710,92 @@ if ($result)
 
 	// Fields title
 	print '<tr class="liste_titre">';
-	print_liste_field_titre($langs->trans('Ref'),$_SERVER["PHP_SELF"],'sp.ref','',$param,'',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans('Supplier'),$_SERVER["PHP_SELF"],'s.nom','',$param,'',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans('Date'),$_SERVER["PHP_SELF"],'sp.date_valid','',$param, 'align="center"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans('SupplierProposalDate'),$_SERVER["PHP_SELF"],'sp.date_livraison','',$param, 'align="center"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans('AmountHT'),$_SERVER["PHP_SELF"],'sp.total_ht','',$param, 'align="right"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans('Author'),$_SERVER["PHP_SELF"],'u.login','',$param,'align="center"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans('Status'),$_SERVER["PHP_SELF"],'sp.fk_statut','',$param,'align="right"',$sortfield,$sortorder);
+	if (! empty($arrayfields['sp.ref']['checked']))           print_liste_field_titre($arrayfields['sp.ref']['label'],$_SERVER["PHP_SELF"],'sp.ref','',$param,'',$sortfield,$sortorder);
+	if (! empty($arrayfields['s.nom']['checked']))            print_liste_field_titre($arrayfields['s.nom']['label'],$_SERVER["PHP_SELF"],'s.nom','',$param,'',$sortfield,$sortorder);
+	if (! empty($arrayfields['s.town']['checked']))           print_liste_field_titre($arrayfields['s.town']['label'],$_SERVER["PHP_SELF"],'s.town','',$param,'',$sortfield,$sortorder);
+	if (! empty($arrayfields['s.zip']['checked']))            print_liste_field_titre($arrayfields['s.zip']['label'],$_SERVER["PHP_SELF"],'s.zip','',$param,'',$sortfield,$sortorder);
+	if (! empty($arrayfields['state.nom']['checked']))        print_liste_field_titre($arrayfields['state.nom']['label'],$_SERVER["PHP_SELF"],"state.nom","",$param,'',$sortfield,$sortorder);
+	if (! empty($arrayfields['country.code_iso']['checked'])) print_liste_field_titre($arrayfields['country.code_iso']['label'],$_SERVER["PHP_SELF"],"country.code_iso","",$param,'align="center"',$sortfield,$sortorder);
+	if (! empty($arrayfields['typent.code']['checked']))      print_liste_field_titre($arrayfields['typent.code']['label'],$_SERVER["PHP_SELF"],"typent.code","",$param,'align="center"',$sortfield,$sortorder);
+	if (! empty($arrayfields['sp.date_valid']['checked']))      print_liste_field_titre($arrayfields['sp.date_valid']['label'],$_SERVER["PHP_SELF"],'sp.date_valid','',$param, 'align="center"',$sortfield,$sortorder);
+	if (! empty($arrayfields['sp.date_livraison']['checked']))  print_liste_field_titre($arrayfields['sp.date_livraison']['label'],$_SERVER["PHP_SELF"],'sp.date_livraison','',$param, 'align="center"',$sortfield,$sortorder);
+	if (! empty($arrayfields['sp.total_ht']['checked']))        print_liste_field_titre($arrayfields['sp.total_ht']['label'],$_SERVER["PHP_SELF"],'sp.total_ht','',$param, 'align="right"',$sortfield,$sortorder);
+	if (! empty($arrayfields['sp.total_vat']['checked']))       print_liste_field_titre($arrayfields['sp.total_vat']['label'],$_SERVER["PHP_SELF"],'sp.total_vat','',$param, 'align="right"',$sortfield,$sortorder);
+	if (! empty($arrayfields['sp.total_ttc']['checked']))       print_liste_field_titre($arrayfields['sp.total_ttc']['label'],$_SERVER["PHP_SELF"],'sp.total_ttc','',$param, 'align="right"',$sortfield,$sortorder);
+	if (! empty($arrayfields['u.login']['checked']))            print_liste_field_titre($arrayfields['u.login']['label'],$_SERVER["PHP_SELF"],'u.login','',$param,'align="center"',$sortfield,$sortorder);
+	// Extra fields
+	if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
+	{
+	   foreach($extrafields->attribute_label as $key => $val) 
+	   {
+           if (! empty($arrayfields["ef.".$key]['checked'])) 
+           {
+				$align=$extrafields->getAlignFlag($key);
+				print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+           }
+	   }
+	}
+	// Hook fields
+	$parameters=array('arrayfields'=>$arrayfields);
+    $reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
+    print $hookmanager->resPrint;
+	if (! empty($arrayfields['sp.datec']['checked']))     print_liste_field_titre($arrayfields['sp.datec']['label'],$_SERVER["PHP_SELF"],"sp.datec","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
+	if (! empty($arrayfields['sp.tms']['checked']))       print_liste_field_titre($arrayfields['sp.tms']['label'],$_SERVER["PHP_SELF"],"sp.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
+	if (! empty($arrayfields['sp.fk_statut']['checked'])) print_liste_field_titre($arrayfields['sp.fk_statut']['label'],$_SERVER["PHP_SELF"],"sp.fk_statut","",$param,'align="right"',$sortfield,$sortorder);
 	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'maxwidthsearch ');
-	print "</tr>\n";
+	print '</tr>'."\n";
 	
 	$now = dol_now();
-	$var=true;
+	$i=0;
 	$total=0;
 	$subtotal=0;
 	$totalarray=array();
 	while ($i < min($num,$limit))
 	{
-		$obj = $db->fetch_object($result);
+		$obj = $db->fetch_object($resql);
 		
-
 		$objectstatic->id=$obj->rowid;
 		$objectstatic->ref=$obj->ref;
 
 		print '<tr class="oddeven">';
-		print '<td class="nowrap">';
+		
+		if (! empty($arrayfields['sp.ref']['checked']))
+		{
+			print '<td class="nowrap">';
 
-		print '<table class="nobordernopadding"><tr class="nocellnopadd">';
-		// Picto + Ref
-		print '<td class="nobordernopadding nowrap">';
-		print $objectstatic->getNomUrl(1);
-		print '</td>';
-		// Warning
-		$warnornote='';
-		if ($obj->fk_statut == 1 && $db->jdate($obj->date_valid) < ($now - $conf->supplier_proposal->warning_delay)) $warnornote.=img_warning($langs->trans("Late"));
-		if (! empty($obj->note_private))
-		{
-			$warnornote.=($warnornote?' ':'');
-			$warnornote.= '<span class="note">';
-			$warnornote.= '<a href="note.php?id='.$obj->rowid.'">'.img_picto($langs->trans("ViewPrivateNote"),'object_generic').'</a>';
-			$warnornote.= '</span>';
-		}
-		if ($warnornote)
-		{
-			print '<td style="min-width: 20px" class="nobordernopadding nowrap">';
-			print $warnornote;
+			print '<table class="nobordernopadding"><tr class="nocellnopadd">';
+			// Picto + Ref
+			print '<td class="nobordernopadding nowrap">';
+			print $objectstatic->getNomUrl(1);
 			print '</td>';
+			// Warning
+			$warnornote='';
+			if ($obj->fk_statut == 1 && $db->jdate($obj->date_valid) < ($now - $conf->supplier_proposal->warning_delay)) $warnornote.=img_warning($langs->trans("Late"));
+			if (! empty($obj->note_private))
+			{
+				$warnornote.=($warnornote?' ':'');
+				$warnornote.= '<span class="note">';
+				$warnornote.= '<a href="note.php?id='.$obj->rowid.'">'.img_picto($langs->trans("ViewPrivateNote"),'object_generic').'</a>';
+				$warnornote.= '</span>';
+			}
+			if ($warnornote)
+			{
+				print '<td style="min-width: 20px" class="nobordernopadding nowrap">';
+				print $warnornote;
+				print '</td>';
+			}
+			// Other picto tool
+			print '<td width="16" align="right" class="nobordernopadding hideonsmartphone">';
+			$filename=dol_sanitizeFileName($obj->ref);
+			$filedir=$conf->supplier_proposal->dir_output . '/' . dol_sanitizeFileName($obj->ref);
+			$urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->rowid;
+			print $formfile->getDocumentsLink($objectstatic->element, $filename, $filedir);
+			print '</td></tr></table>';
+	
+			print "</td>\n";
+			if (! $i) $totalarray['nbfield']++;
 		}
-		// Other picto tool
-		print '<td width="16" align="right" class="nobordernopadding hideonsmartphone">';
-		$filename=dol_sanitizeFileName($obj->ref);
-		$filedir=$conf->supplier_proposal->dir_output . '/' . dol_sanitizeFileName($obj->ref);
-		$urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->rowid;
-		print $formfile->getDocumentsLink($objectstatic->element, $filename, $filedir);
-		print '</td></tr></table>';
-
-		print "</td>\n";
-
+		
 		$url = DOL_URL_ROOT.'/comm/card.php?socid='.$obj->socid;
 
 		// Company
@@ -625,30 +803,157 @@ if ($result)
 		$companystatic->name=$obj->name;
 		$companystatic->client=$obj->client;
 		$companystatic->code_client=$obj->code_client;
-		print '<td>';
-		print $companystatic->getNomUrl(1,'customer');
-		print '</td>';
 
-		// Date
-		print '<td align="center">';
-		print dol_print_date($db->jdate($obj->date_valid), 'day');
-		print "</td>\n";
+		// Thirdparty
+		if (! empty($arrayfields['s.nom']['checked']))
+		{
+    		print '<td class="tdoverflowmax200">';
+			print $companystatic->getNomUrl(1,'customer');
+			print '</td>';
+			if (! $i) $totalarray['nbfield']++;
+		}
+
+		// Town
+        if (! empty($arrayfields['s.town']['checked']))
+        {
+            print '<td class="nocellnopadd">';
+		    print $obj->town;
+    		print '</td>';
+    		if (! $i) $totalarray['nbfield']++;
+        }
+        // Zip
+        if (! empty($arrayfields['s.zip']['checked']))
+        {
+            print '<td class="nocellnopadd">';
+            print $obj->zip;
+            print '</td>';
+            if (! $i) $totalarray['nbfield']++;
+        }
+        // State
+        if (! empty($arrayfields['state.nom']['checked']))
+        {
+            print "<td>".$obj->state_name."</td>\n";
+            if (! $i) $totalarray['nbfield']++;
+        }
+        // Country
+        if (! empty($arrayfields['country.code_iso']['checked']))
+        {
+            print '<td align="center">';
+            $tmparray=getCountry($obj->fk_pays,'all');
+            print $tmparray['label'];
+            print '</td>';
+            if (! $i) $totalarray['nbfield']++;
+        }
+        // Type ent
+        if (! empty($arrayfields['typent.code']['checked']))
+        {
+            print '<td align="center">';
+            if (count($typenArray)==0) $typenArray = $formcompany->typent_array(1);
+            print $typenArray[$obj->typent_code];
+            print '</td>';
+            if (! $i) $totalarray['nbfield']++;
+        }
+        
+		// Date proposal
+        if (! empty($arrayfields['sp.date_valid']['checked']))
+        {
+            print '<td align="center">';
+			print dol_print_date($db->jdate($obj->date_valid), 'day');
+			print "</td>\n";
+			if (! $i) $totalarray['nbfield']++;
+        }
 		
 		// Date delivery
-		print '<td align="center">';
-		print dol_print_date($db->jdate($obj->dp), 'day');
-		print "</td>\n";
-
-		print '<td align="right">'.price($obj->total_ht)."</td>\n";
+        if (! empty($arrayfields['sp.date_livraison']['checked']))
+        {
+        	print '<td align="center">';
+			print dol_print_date($db->jdate($obj->dp), 'day');
+			print "</td>\n";
+			if (! $i) $totalarray['nbfield']++;
+        }
 
+        // Amount HT
+        if (! empty($arrayfields['sp.total_ht']['checked']))
+        {
+		      print '<td align="right">'.price($obj->total_ht)."</td>\n";
+		      if (! $i) $totalarray['nbfield']++;
+		      if (! $i) $totalarray['totalhtfield']=$totalarray['nbfield'];
+		      $totalarray['totalht'] += $obj->total_ht;
+        }
+        // Amount VAT
+        if (! empty($arrayfields['sp.total_vat']['checked']))
+        {
+            print '<td align="right">'.price($obj->total_vat)."</td>\n";
+            if (! $i) $totalarray['nbfield']++;
+		    if (! $i) $totalarray['totalvatfield']=$totalarray['nbfield'];
+		    $totalarray['totalvat'] += $obj->total_vat;
+        }
+        // Amount TTC
+        if (! empty($arrayfields['sp.total_ttc']['checked']))
+        {
+            print '<td align="right">'.price($obj->total_ttc)."</td>\n";
+            if (! $i) $totalarray['nbfield']++;
+		    if (! $i) $totalarray['totalttcfield']=$totalarray['nbfield'];
+		    $totalarray['totalttc'] += $obj->total_ttc;
+        }
+        
 		$userstatic->id=$obj->fk_user_author;
 		$userstatic->login=$obj->login;
-		print '<td align="center">';
-		if ($userstatic->id) print $userstatic->getLoginUrl(1);
-		else print '&nbsp;';
-		print "</td>\n";
 
-		print '<td align="right">'.$objectstatic->LibStatut($obj->fk_statut,5)."</td>\n";
+        // Author
+        if (! empty($arrayfields['u.login']['checked']))
+        {
+			print '<td align="center">';
+			if ($userstatic->id) print $userstatic->getLoginUrl(1);
+			else print '&nbsp;';
+			print "</td>\n";
+    		if (! $i) $totalarray['nbfield']++;
+        }
+        
+        // Extra fields
+        if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
+        {
+            foreach($extrafields->attribute_label as $key => $val)
+            {
+                if (! empty($arrayfields["ef.".$key]['checked']))
+                {
+                    print '<td';
+                    $align=$extrafields->getAlignFlag($key);
+                    if ($align) print ' align="'.$align.'"';
+                    print '>';
+                    $tmpkey='options_'.$key;
+                    print $extrafields->showOutputField($key, $obj->$tmpkey, '', 1);
+                    print '</td>';
+                    if (! $i) $totalarray['nbfield']++;
+                }
+            }
+        }
+        // Fields from hook
+        $parameters=array('arrayfields'=>$arrayfields, 'obj'=>$obj);
+        $reshook=$hookmanager->executeHooks('printFieldListValue',$parameters);    // Note that $action and $object may have been modified by hook
+        print $hookmanager->resPrint;
+        // Date creation
+        if (! empty($arrayfields['sp.datec']['checked']))
+        {
+            print '<td align="center" class="nowrap">';
+            print dol_print_date($db->jdate($obj->date_creation), 'dayhour');
+            print '</td>';
+            if (! $i) $totalarray['nbfield']++;
+        }
+        // Date modification
+        if (! empty($arrayfields['sp.tms']['checked']))
+        {
+            print '<td align="center" class="nowrap">';
+            print dol_print_date($db->jdate($obj->date_update), 'dayhour');
+            print '</td>';
+            if (! $i) $totalarray['nbfield']++;
+        }
+        // Status
+        if (! empty($arrayfields['sp.fk_statut']['checked']))
+        {	
+            print '<td align="right">'.$objectstatic->LibStatut($obj->fk_statut,5)."</td>\n";
+            if (! $i) $totalarray['nbfield']++;
+        }
 
         // Action column
         print '<td class="nowrap" align="center">';
@@ -659,7 +964,8 @@ if ($result)
     		print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected?' checked="checked"':'').'>';
         }
         print '</td>';
-
+        if (! $i) $totalarray['nbfield']++;
+        
 		print "</tr>\n";
 
 		$total += $obj->total_ht;
@@ -668,22 +974,30 @@ if ($result)
 		$i++;
 	}
 
-	if ($total>0)
+	// Show total line
+	if (isset($totalarray['totalhtfield'])
+	    || isset($totalarray['totalvatfield'])
+	    || isset($totalarray['totalttcfield'])
+	    || isset($totalarray['totalamfield'])
+	    || isset($totalarray['totalrtpfield'])
+	    )
 	{
-		if($num<$limit){
-			
-			print '<tr class="liste_total"><td align="left">'.$langs->trans("TotalHT").'</td>';
-			print '<td colspan="4" align="right">'.price($total).'</td><td colspan="3"></td>';
-			print '</tr>';
-		}
-		else
-		{
-			
-			print '<tr class="liste_total"><td align="left">'.$langs->trans("TotalHTforthispage").'</td>';
-			print '<td colspan="4" align="right">'.price($total).'</td><td colspan="3"></td>';
-			print '</tr>';
-		}
-
+	    print '<tr class="liste_total">';
+	    $i=0;
+	    while ($i < $totalarray['nbfield'])
+	    {
+	        $i++;
+	        if ($i == 1)
+	        {
+	            if ($num < $limit && empty($offset)) print '<td align="left">'.$langs->trans("Total").'</td>';
+	            else print '<td align="left">'.$langs->trans("Totalforthispage").'</td>';
+	        }
+	        elseif ($totalarray['totalhtfield'] == $i) print '<td align="right">'.price($totalarray['totalht']).'</td>';
+	        elseif ($totalarray['totalvatfield'] == $i) print '<td align="right">'.price($totalarray['totalvat']).'</td>';
+	        elseif ($totalarray['totalttcfield'] == $i) print '<td align="right">'.price($totalarray['totalttc']).'</td>';
+	        else print '<td></td>';
+	    }
+	    print '</tr>';
 	}
 
 	$db->free($resql);

From 88fc7dbc3e7596a19b38fa93d0630665fae18b4c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 18 May 2017 19:19:55 +0200
Subject: [PATCH 401/505] Fix remove warning

---
 htdocs/core/modules/DolibarrModules.class.php | 2 +-
 test/phpunit/CodingPhpTest.php                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index f501d33c29a..cdb4ea33f73 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -848,7 +848,7 @@ class DolibarrModules           // Can not be abstract, because we need to insta
         $resql=$this->db->query($sql);
         if (! $resql) $err++;
 
-        $note=json_encode(array('authorid'=>$user->id, 'ip'=>$_SERVER['REMOTE_ADDR']));
+        $note=json_encode(array('authorid'=>$user->id, 'ip'=>(empty($_SERVER['REMOTE_ADDR'])?'':$_SERVER['REMOTE_ADDR'])));
         
         $sql = "INSERT INTO ".MAIN_DB_PREFIX."const (name, value, visible, entity, note) VALUES";
         $sql.= " (".$this->db->encrypt($this->const_name,1);
diff --git a/test/phpunit/CodingPhpTest.php b/test/phpunit/CodingPhpTest.php
index 4860e5b5e38..159323a9e83 100644
--- a/test/phpunit/CodingPhpTest.php
+++ b/test/phpunit/CodingPhpTest.php
@@ -141,7 +141,7 @@ class CodingPhpTest extends PHPUnit_Framework_TestCase
         $langs=$this->savlangs;
         $db=$this->savdb;
 
-        include DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+        include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
         $filesarray = dol_dir_list(DOL_DOCUMENT_ROOT, 'files', 1, '\.php', null, 'fullname');
 
         foreach($filesarray as $key => $file) 

From a28f8c84e42b2dfb2b636c803465c17f0e85bdd8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 18 May 2017 22:23:59 +0200
Subject: [PATCH 402/505] Fix travis error

---
 htdocs/webservices/server_order.php   | 1 +
 htdocs/webservices/server_payment.php | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/htdocs/webservices/server_order.php b/htdocs/webservices/server_order.php
index b0f794dd55f..c84eefa3480 100644
--- a/htdocs/webservices/server_order.php
+++ b/htdocs/webservices/server_order.php
@@ -793,6 +793,7 @@ function createOrder($authentication,$order)
  *
  * @param	array		$authentication		Array of authentication information
  * @param	int			$id					Id of order to validate
+ * @param	int			$id_warehouse		Id of warehouse to use for stock decrease
  * @return	array							Array result
  */
 function validOrder($authentication,$id='',$id_warehouse=0)
diff --git a/htdocs/webservices/server_payment.php b/htdocs/webservices/server_payment.php
index e8e4f5e1cb0..d6cd261a686 100644
--- a/htdocs/webservices/server_payment.php
+++ b/htdocs/webservices/server_payment.php
@@ -129,12 +129,13 @@ $server->register(
     'WS to create a new payment'
 );
 
+
 /**
  * Create a payment
  *
  * @param      array           $authentication         Array of authentication information
- * @param      Facture         $invoice                        Invoice
- * @return     array                                                   Array result
+ * @param      Object          $payment                Payment
+ * @return     array                                   Array result
  */
 function createPayment($authentication, $payment)
 {

From ff2a268831c157ec261f7425e423aeb8e556b40a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 19 May 2017 00:52:13 +0200
Subject: [PATCH 403/505] NEW Architecture to manage search criteria
 persistance (using save_lastsearch_values=1 on exit links and
 restore_lastsearch_values=1 in entry links)

---
 htdocs/core/lib/functions.lib.php          | 42 +++++++++++++++++++---
 htdocs/core/menus/standard/auguria.lib.php |  8 +++++
 htdocs/core/menus/standard/eldy.lib.php    | 16 +++++----
 htdocs/main.inc.php                        |  4 ++-
 htdocs/projet/card.php                     |  2 +-
 htdocs/projet/contact.php                  |  2 +-
 htdocs/projet/document.php                 |  2 +-
 htdocs/projet/element.php                  |  2 +-
 htdocs/projet/ganttview.php                |  2 +-
 htdocs/projet/index.php                    |  2 +-
 htdocs/projet/info.php                     |  2 +-
 htdocs/projet/note.php                     |  4 +--
 htdocs/projet/tasks.php                    |  2 +-
 13 files changed, 68 insertions(+), 22 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index c9ec77c76de..4e17c62d3f5 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -264,6 +264,8 @@ function GETPOST($paramname, $check='', $method=0, $filter=NULL, $options=NULL)
 {
     global $mysoc,$user,$conf;
     
+    if (empty($paramname)) return 'BadFirstParameterForGETPOST';
+        
     if (empty($method)) $out = isset($_GET[$paramname])?$_GET[$paramname]:(isset($_POST[$paramname])?$_POST[$paramname]:'');
 	elseif ($method==1) $out = isset($_GET[$paramname])?$_GET[$paramname]:'';
 	elseif ($method==2) $out = isset($_POST[$paramname])?$_POST[$paramname]:'';
@@ -279,11 +281,11 @@ function GETPOST($paramname, $check='', $method=0, $filter=NULL, $options=NULL)
     	$relativepathstring = preg_replace('/^\//', '', $relativepathstring);
 	
 	    // Management of default values
-	    if (! isset($_GET['sortfield']) && ! empty($conf->global->MAIN_ENABLE_DEFAULT_VALUES))	// If we did a click on a field to sort, we do no apply default values. Same if option MAIN_DISABLE_DEFAULT_VALUES is on
+	    if (! isset($_GET['sortfield']) && ! empty($conf->global->MAIN_ENABLE_DEFAULT_VALUES))	// If we did a click on a field to sort, we do no apply default values. Same if option MAIN_ENABLE_DEFAULT_VALUES is not set
 	    {
-	        if (! empty($_GET['action']) && $_GET['action'] == 'create' && ! empty($paramname) && ! isset($_GET[$paramname]) && ! isset($_POST[$paramname]))
+	        if (! empty($_GET['action']) && $_GET['action'] == 'create' && ! isset($_GET[$paramname]) && ! isset($_POST[$paramname]))
 	        {
-	            if (! empty($user->default_values))		// $user->default_values defined from menu default values, and values loaded not at first
+	            if (! empty($user->default_values))		// $user->default_values defined from menu default values
 	            {
 	                //var_dump($user->default_values[$relativepathstring]['createform']);
 	                if (isset($user->default_values[$relativepathstring]['createform'][$paramname])) $out = $user->default_values[$relativepathstring]['createform'][$paramname];
@@ -328,11 +330,34 @@ function GETPOST($paramname, $check='', $method=0, $filter=NULL, $options=NULL)
 	            }
 	        }
 	    }
+	    
+	    // Retrieve values into restore_lastsearch_values
+	    if ($_GET['restore_lastsearch_values'])        // Keep $_GET here
+	    {
+	        if (! empty($_SESSION['lastsearch_values_'.$relativepathstring]))
+	        {
+	            $tmp=json_decode($_SESSION['lastsearch_values_'.$relativepathstring], true);
+	            if (is_array($tmp))
+	            {
+    	            foreach($tmp as $key => $val)
+    	            {
+        	           if ($key == $paramname)
+        	           {
+    	                   $out=$val;
+    	                   break;
+        	           }
+    	            }
+	            }
+	        }
+	    }
+	    
 	}	
 	
 	if (empty($check) && ! empty($conf->global->MAIN_FEATURES_LEVEL) && $conf->global->MAIN_FEATURES_LEVEL >= 2)
 	{
 	   dol_syslog("Deprecated use of GETPOST, called with 1st param = ".$paramname." and 2nd param not defined, when calling page ".$_SERVER["PHP_SELF"], LOG_WARNING);    
+	   // Enable this line to know who call the GETPOST with empty $check parameter.
+	   //var_dump(debug_backtrace()[0]);
 	}
 	
 	if (! empty($check))
@@ -423,14 +448,23 @@ function GETPOST($paramname, $check='', $method=0, $filter=NULL, $options=NULL)
 	    }
 	}
 
+    // Code for search criteria persistence.
 	// Save data into session if key start with 'search_' or is 'smonth', 'syear', 'month', 'year'
 	if (empty($method) || $method == 3 || $method == 4)
 	{
 	    //if (preg_match('/^search_/', $paramname) || in_array($paramname, array('sortorder', 'sortfield", 'smonth', 'syear', 'month', 'year')))
 	    if (preg_match('/^search_/', $paramname) || in_array($paramname, array('sortorder','sortfield')))
 	    {
+	        //var_dump($user->default_values[$relativepathstring]);exit;
 	        //if ($paramname == 'sortorder') var_dump($paramname.' - '.$out);
-	        $user->lastsearch_values_tmp[$relativepathstring][$paramname]=$out;
+	        
+	        // We save search key only if:
+	        // - not empty, or
+	        // - if value is empty and a default value exists that is not empty (it means we did a filter to an empty value when default was not).
+	        if (! empty($out) || ! empty($user->default_values[$relativepathstring][$paramname]))
+	        {
+                $user->lastsearch_values_tmp[$relativepathstring][$paramname]=$out;
+	        }
 	    }
 	}
 	
diff --git a/htdocs/core/menus/standard/auguria.lib.php b/htdocs/core/menus/standard/auguria.lib.php
index 7272eb000d4..3cc9c569120 100644
--- a/htdocs/core/menus/standard/auguria.lib.php
+++ b/htdocs/core/menus/standard/auguria.lib.php
@@ -103,6 +103,14 @@ function print_auguria_menu($db,$atarget,$type_user,&$tabMenu,&$menu,$noout=0,$m
 			$url=preg_replace('/__USERID__/',$user->id,$url);
 			$shorturl=preg_replace('/__USERID__/',$user->id,$shorturl);
 
+			// TODO Find a generic solution
+			if (preg_match('/search_project_user=__search_project_user__/', $shorturl))
+			{
+			    $search_project_user = GETPOST('search_project_user','int');
+			    if ($search_project_user) $shorturl=preg_replace('/search_project_user=__search_project_user__/', 'search_project_user='.$search_project_user, $shorturl);
+			    else $shorturl=preg_replace('/search_project_user=__search_project_user__/', '', $shorturl);
+			}
+			
 			// Define the class (top menu selected or not)
 			if (! empty($_SESSION['idmenu']) && $newTabMenu[$i]['rowid'] == $_SESSION['idmenu']) $classname='class="tmenusel"';
 			else if (! empty($_SESSION["mainmenu"]) && $newTabMenu[$i]['mainmenu'] == $_SESSION["mainmenu"]) $classname='class="tmenusel"';
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 4aa5064977d..521fd6831f2 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -1299,11 +1299,13 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 			if (! empty($conf->projet->enabled))
 			{
 				$langs->load("projects");
-
+				
+				$search_project_user = GETPOST('search_project_user','int');
+				
 				// Project affected to user
-				$newmenu->add("/projet/index.php?leftmenu=projects&search_project_user=".GETPOST('search_project_user'), $langs->trans("Projects"), 0, $user->rights->projet->lire, '', $mainmenu, 'projects');
-				$newmenu->add("/projet/card.php?leftmenu=projects&action=create&search_project_user=".GETPOST('search_project_user'), $langs->trans("NewProject"), 1, $user->rights->projet->creer);
-				$newmenu->add("/projet/list.php?leftmenu=projects&search_project_user=".GETPOST('search_project_user')."&search_status=99", $langs->trans("List"), 1, $user->rights->projet->lire);
+				$newmenu->add("/projet/index.php?leftmenu=projects".($search_project_user?'&search_project_user='.$search_project_user:''), $langs->trans("Projects"), 0, $user->rights->projet->lire, '', $mainmenu, 'projects');
+				$newmenu->add("/projet/card.php?leftmenu=projects&action=create".($search_project_user?'&search_project_user='.$search_project_user:''), $langs->trans("NewProject"), 1, $user->rights->projet->creer);
+				$newmenu->add("/projet/list.php?leftmenu=projects".($search_project_user?'&search_project_user='.$search_project_user:'')."&search_status=99", $langs->trans("List"), 1, $user->rights->projet->lire);
 
 				// All project i have permission on
 				/*
@@ -1316,10 +1318,10 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 				if (empty($conf->global->PROJECT_HIDE_TASKS))
 				{
 					// Project affected to user
-					$newmenu->add("/projet/activity/index.php?leftmenu=tasks&search_project_user=".GETPOST('search_project_user'), $langs->trans("Activities"), 0, $user->rights->projet->lire);
+					$newmenu->add("/projet/activity/index.php?leftmenu=tasks".($search_project_user?'&search_project_user='.$search_project_user:''), $langs->trans("Activities"), 0, $user->rights->projet->lire);
 					$newmenu->add("/projet/tasks.php?leftmenu=tasks&action=create", $langs->trans("NewTask"), 1, $user->rights->projet->creer);
-					$newmenu->add("/projet/tasks/list.php?leftmenu=tasks&search_project_user=".GETPOST('search_project_user'), $langs->trans("List"), 1, $user->rights->projet->lire);
-					$newmenu->add("/projet/activity/perweek.php?leftmenu=tasks&search_project_user=".GETPOST('search_project_user'), $langs->trans("NewTimeSpent"), 1, $user->rights->projet->lire);
+					$newmenu->add("/projet/tasks/list.php?leftmenu=tasks".($search_project_user?'&search_project_user='.$search_project_user:''), $langs->trans("List"), 1, $user->rights->projet->lire);
+					$newmenu->add("/projet/activity/perweek.php?leftmenu=tasks".($search_project_user?'&search_project_user='.$search_project_user:''), $langs->trans("NewTimeSpent"), 1, $user->rights->projet->lire);
 
 					// All project i have permission on
 					/*$newmenu->add("/projet/activity/index.php", $langs->trans("Activities"), 0, $user->rights->projet->lire && $user->rights->projet->lire);
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index d632e91d537..73f0a815413 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -646,6 +646,7 @@ if (! defined('NOLOGIN'))
 	       // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
 	       $hookmanager->initHooks(array('main'));
 
+	       // Code for search criteria persistence.
 	       if (! empty($_GET['save_lastsearch_values']))    // Keep $_GET here
 	       {
                $relativepathstring = preg_replace('/\?.*$/','',$_SERVER["HTTP_REFERER"]);
@@ -1886,6 +1887,7 @@ if (! function_exists("llxFooter"))
         // Global html output events ($mesgs, $errors, $warnings)
         dol_htmloutput_events();
 
+        // Code for search criteria persistence.
         // Save $user->lastsearch_values if defined (define on list pages when a form field search_xxx exists)
         if (is_object($user) && ! empty($user->lastsearch_values_tmp) && is_array($user->lastsearch_values_tmp))
         {
@@ -1897,7 +1899,7 @@ if (! function_exists("llxFooter"))
                 {
                     if (empty($val['sortfield'])) unset($val['sortfield']);
                     if (empty($val['sortorder'])) unset($val['sortorder']);
-                    dol_syslog('Save lastsearch_values_tmp_'.$key.'='.json_encode($val, 0, 1));
+                    dol_syslog('Save lastsearch_values_tmp_'.$key.'='.json_encode($val, 0, 1)." (systematic recording of last search criteria)");
                     $_SESSION['lastsearch_values_tmp_'.$key]=json_encode($val);
                     unset($_SESSION['lastsearch_values_'.$key]);
                 }
diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index 47d0f1c3148..f6355ec5566 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -837,7 +837,7 @@ elseif ($object->id > 0)
     {
         // Project card
         
-        $linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php">'.$langs->trans("BackToList").'</a>';
+        $linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
         
         $morehtmlref='<div class="refidno">';
         // Title
diff --git a/htdocs/projet/contact.php b/htdocs/projet/contact.php
index e843d4951e4..72b82ac2bb0 100644
--- a/htdocs/projet/contact.php
+++ b/htdocs/projet/contact.php
@@ -151,7 +151,7 @@ if ($id > 0 || ! empty($ref))
 
     // Project card
     
-    $linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php">'.$langs->trans("BackToList").'</a>';
+    $linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
     
     $morehtmlref='<div class="refidno">';
     // Title
diff --git a/htdocs/projet/document.php b/htdocs/projet/document.php
index 2d5a6cd71d0..21dd30f560c 100644
--- a/htdocs/projet/document.php
+++ b/htdocs/projet/document.php
@@ -109,7 +109,7 @@ if ($object->id > 0)
 	
 	// Project card
 	
-	$linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php">'.$langs->trans("BackToList").'</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 	
 	$morehtmlref='<div class="refidno">';
 	// Title
diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php
index 8aebe756d70..f745c71d761 100644
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -128,7 +128,7 @@ dol_fiche_head($head, 'element', $langs->trans("Project"), -1, ($object->public?
 
 // Project card
 
-$linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php">'.$langs->trans("BackToList").'</a>';
+$linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
 $morehtmlref='<div class="refidno">';
 // Title
diff --git a/htdocs/projet/ganttview.php b/htdocs/projet/ganttview.php
index 36fbfccca77..7ec9dcf1a4b 100644
--- a/htdocs/projet/ganttview.php
+++ b/htdocs/projet/ganttview.php
@@ -102,7 +102,7 @@ if ($id > 0 || ! empty($ref))
 
     // Project card
     
-    $linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php">'.$langs->trans("BackToList").'</a>';
+    $linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
     
     $morehtmlref='<div class="refidno">';
     // Title
diff --git a/htdocs/projet/index.php b/htdocs/projet/index.php
index 8295e106be9..c7f0181dbf5 100644
--- a/htdocs/projet/index.php
+++ b/htdocs/projet/index.php
@@ -33,7 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 $langs->load("projects");
 $langs->load("companies");
 
-$mine = GETPOST('mode')=='mine' ? 1 : 0;
+$mine = GETPOST('mode','aZ09')=='mine' ? 1 : 0;
 $search_project_user = GETPOST('search_project_user','int');
 
 // Security check
diff --git a/htdocs/projet/info.php b/htdocs/projet/info.php
index 3206fd51244..74015626b9e 100644
--- a/htdocs/projet/info.php
+++ b/htdocs/projet/info.php
@@ -112,7 +112,7 @@ dol_fiche_head($head, 'agenda', $langs->trans("Project"), -1, ($object->public?'
 
 // Project card
 
-$linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php">'.$langs->trans("BackToList").'</a>';
+$linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
 $morehtmlref='<div class="refidno">';
 // Title
diff --git a/htdocs/projet/note.php b/htdocs/projet/note.php
index 9a73e481666..88217fbfb1c 100644
--- a/htdocs/projet/note.php
+++ b/htdocs/projet/note.php
@@ -30,7 +30,7 @@ $langs->load('projects');
 
 $action=GETPOST('action','aZ09');
 $id = GETPOST('id','int');
-$ref= GETPOST('ref');
+$ref= GETPOST('ref','alpha');
 
 $mine = $_REQUEST['mode']=='mine' ? 1 : 0;
 //if (! $user->rights->projet->all->lire) $mine=1;	// Special for projects
@@ -82,7 +82,7 @@ if ($id > 0 || ! empty($ref))
 	
 	// Project card
 	
-	$linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php">'.$langs->trans("BackToList").'</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 	
 	$morehtmlref='<div class="refidno">';
 	// Title
diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index e8a949f3191..85fa0f640e9 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -225,7 +225,7 @@ if ($id > 0 || ! empty($ref))
 
     // Project card
     
-    $linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php">'.$langs->trans("BackToList").'</a>';
+    $linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
     
     $morehtmlref='<div class="refidno">';
     // Title

From 7b784a1dcbc5e3af7c83e3dda89252871845c4ee Mon Sep 17 00:00:00 2001
From: absnc <frederick.nguyenxuan@gmail.com>
Date: Fri, 19 May 2017 17:50:10 +1100
Subject: [PATCH 404/505] Enable shipments for project overview tab

---
 htdocs/expedition/card.php                    |  16 ++
 htdocs/expedition/class/expedition.class.php  |   2 +
 htdocs/expedition/shipment.php                |   1 +
 .../install/mysql/migration/5.0.0-6.0.0.sql   |   2 +
 .../install/mysql/tables/llx_expedition.sql   |   1 +
 htdocs/langs/en_US/projects.lang              |   1 +
 htdocs/langs/fr_FR/projects.lang              |   1 +
 htdocs/langs/fr_NC/projects.lang              | 197 ++++++++++++++++++
 htdocs/langs/fr_NC/sendings.lang              |  71 +++++++
 htdocs/projet/element.php                     |  12 ++
 10 files changed, 304 insertions(+)
 create mode 100644 htdocs/langs/fr_NC/projects.lang
 create mode 100644 htdocs/langs/fr_NC/sendings.lang

diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index a0280ce9e39..8924577009f 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -191,6 +191,7 @@ if (empty($reshook))
 	    $object->note				= GETPOST('note','alpha');
 	    $object->origin				= $origin;
 	    $object->origin_id			= $origin_id;
+        $object->fk_project         = GETPOST('projectid');
 	    $object->weight				= GETPOST('weight','int')==''?"NULL":GETPOST('weight','int');
 	    $object->sizeH				= GETPOST('sizeH','int')==''?"NULL":GETPOST('sizeH','int');
 	    $object->sizeW				= GETPOST('sizeW','int')==''?"NULL":GETPOST('sizeW','int');
@@ -696,6 +697,21 @@ if ($action == 'create')
             print '<td colspan="3">'.$soc->getNomUrl(1).'</td>';
             print '</tr>';
 
+            // Project
+            if (! empty($conf->projet->enabled))
+            {
+                $projectid = GETPOST('projectid')?GETPOST('projectid'):0;
+                if ($origin == 'project') $projectid = ($originid ? $originid : 0);
+
+                $langs->load("projects");
+                print '<tr>';
+                print '<td>' . $langs->trans("Project") . '</td><td colspan="2">';
+                $numprojet = $formproject->select_projects($soc->id, $projectid, 'projectid', 0);
+                print ' &nbsp; <a href="'.DOL_URL_ROOT.'/projet/card.php?socid=' . $soc->id . '&action=create&status=1&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create&socid='.$soc->id).'">' . $langs->trans("AddProject") . '</a>';
+                print '</td>';
+                print '</tr>';
+            }
+
             // Date delivery planned
             print '<tr><td>'.$langs->trans("DateDeliveryPlanned").'</td>';
             print '<td colspan="3">';
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index 8d6822fd360..2b7ada7a0c2 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -211,6 +211,7 @@ class Expedition extends CommonObject
 		$sql.= ", date_expedition";
 		$sql.= ", date_delivery";
 		$sql.= ", fk_soc";
+		$sql.= ", fk_projet";
 		$sql.= ", fk_address";
 		$sql.= ", fk_shipping_method";
 		$sql.= ", tracking_number";
@@ -234,6 +235,7 @@ class Expedition extends CommonObject
 		$sql.= ", ".($this->date_expedition>0?"'".$this->db->idate($this->date_expedition)."'":"null");
 		$sql.= ", ".($this->date_delivery>0?"'".$this->db->idate($this->date_delivery)."'":"null");
 		$sql.= ", ".$this->socid;
+		$sql.= ", ".$this->fk_project;
 		$sql.= ", ".($this->fk_delivery_address>0?$this->fk_delivery_address:"null");
 		$sql.= ", ".($this->shipping_method_id>0?$this->shipping_method_id:"null");
 		$sql.= ", '".$this->db->escape($this->tracking_number)."'";
diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php
index ede1cc6bec9..849053c610c 100644
--- a/htdocs/expedition/shipment.php
+++ b/htdocs/expedition/shipment.php
@@ -880,6 +880,7 @@ if ($id > 0 || ! empty($ref))
                 print '<input type="hidden" name="shipping_method_id" value="'.$object->shipping_method_id.'">';
 				print '<input type="hidden" name="origin" value="commande">';
 				print '<input type="hidden" name="origin_id" value="'.$object->id.'">';
+				print '<input type="hidden" name="projectid" value="'.$object->fk_project.'">';
 				//print '<table class="border" width="100%">';
 
 				$langs->load("stocks");
diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index 6ba7707b249..72ef855f96b 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -47,6 +47,8 @@ ALTER TABLE llx_ecm_files ADD INDEX idx_ecm_files_label (label);
 ALTER TABLE llx_holiday ADD COLUMN import_key				varchar(14);
 ALTER TABLE llx_holiday ADD COLUMN extraparams				varchar(255);	
 
+ALTER TABLE llx_expedition ADD COLUMN fk_projet integer DEFAULT NULL after fk_soc;
+
 ALTER TABLE llx_expensereport ADD COLUMN import_key			varchar(14);
 ALTER TABLE llx_expensereport ADD COLUMN extraparams		varchar(255);	
 
diff --git a/htdocs/install/mysql/tables/llx_expedition.sql b/htdocs/install/mysql/tables/llx_expedition.sql
index aa71e62c0a2..088e4893c06 100644
--- a/htdocs/install/mysql/tables/llx_expedition.sql
+++ b/htdocs/install/mysql/tables/llx_expedition.sql
@@ -26,6 +26,7 @@ create table llx_expedition
   ref                   varchar(30)        NOT NULL,
   entity                integer  DEFAULT 1 NOT NULL,	-- multi company id
   fk_soc                integer            NOT NULL,
+  fk_projet  		integer  DEFAULT NULL,
   
   ref_ext               varchar(30),					-- reference into an external system (not used by dolibarr)
   ref_int				varchar(30),					-- reference into an internal system (used by dolibarr to store extern id like paypal info)
diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang
index 97d47589d53..c98c2120e21 100644
--- a/htdocs/langs/en_US/projects.lang
+++ b/htdocs/langs/en_US/projects.lang
@@ -82,6 +82,7 @@ ListPredefinedInvoicesAssociatedProject=List of customer template invoices assoc
 ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
 ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
 ListContractAssociatedProject=List of contracts associated with the project
+ListShippingAssociatedProject=List of shippings associated with the project
 ListFichinterAssociatedProject=List of interventions associated with the project
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
 ListDonationsAssociatedProject=List of donations associated with the project
diff --git a/htdocs/langs/fr_FR/projects.lang b/htdocs/langs/fr_FR/projects.lang
index fed1df8c59f..34553656359 100644
--- a/htdocs/langs/fr_FR/projects.lang
+++ b/htdocs/langs/fr_FR/projects.lang
@@ -79,6 +79,7 @@ ListSupplierOrdersAssociatedProject=Liste des commandes fournisseurs associées
 ListSupplierInvoicesAssociatedProject=Liste des factures fournisseurs associées au projet
 ListContractAssociatedProject=Liste des contrats associés au projet
 ListFichinterAssociatedProject=Liste des interventions associées au projet
+ListShippingAssociatedProject=Liste des expéditions associées au projet
 ListExpenseReportsAssociatedProject=Liste des notes de frais associées avec ce projet
 ListDonationsAssociatedProject=Liste des dons associés au projet
 ListActionsAssociatedProject=Liste des événements associés au projet
diff --git a/htdocs/langs/fr_NC/projects.lang b/htdocs/langs/fr_NC/projects.lang
new file mode 100644
index 00000000000..34553656359
--- /dev/null
+++ b/htdocs/langs/fr_NC/projects.lang
@@ -0,0 +1,197 @@
+# Dolibarr language file - Source file is en_US - projects
+RefProject=Réf. projet
+ProjectRef=Ref projet
+ProjectId=Id projet
+ProjectLabel=Libellé projet
+Project=Projet
+Projects=Projets
+ProjectsArea=Espace projets
+ProjectStatus=Statut projet
+SharedProject=Tout le monde
+PrivateProject=Contacts projet
+MyProjectsDesc=Cette vue projet est restreinte aux projets pour lesquels vous êtes un contact affecté (quel qu'en soit le type).
+ProjectsPublicDesc=Cette vue présente tous les projets pour lesquels vous êtes habilité à avoir une visibilité.
+TasksOnProjectsPublicDesc=Cette vue affiche toutes les tâches de projets selon vos permissions utilisateur
+ProjectsPublicTaskDesc=Cette vue présente tous les projets et tâches pour lesquels vous êtes habilité à avoir une visibilité.
+ProjectsDesc=Cette vue présente tous les projets (vos habilitations vous offrant une vue exhaustive).
+TasksOnProjectsDesc=Cette vue présente toutes les tâches sur tous les projets (vos permissions d'utilisateur vous accordent la permission de voir tout).
+MyTasksDesc=Cette vue est restreinte aux projets et tâches pour lesquels vous êtes un contact affecté à au moins une tâche (quel qu'en soit le type).
+OnlyOpenedProject=Seuls les projets ouverts sont visibles (les projets à l'état brouillon ou fermé ne sont pas visibles).
+ClosedProjectsAreHidden=Les projets fermés ne sont pas visible.
+TasksPublicDesc=Cette vue présente tous les projets et tâches pour lesquels vous êtes habilité à avoir une visibilité.
+TasksDesc=Cette vue présente tous les projets et tâches (vos habilitations vous offrant une vue exhaustive).
+AllTaskVisibleButEditIfYouAreAssigned=Toutes les tâches d'un tel projet sont visibles mais il n'est possible de saisir du temps passé que sur celles qui vous sont assignées.\nAssignez vous la tache pour pouvoir saisir un temps passé.
+OnlyYourTaskAreVisible=Seules les tâches qui vous sont assignées sont visibles. Assignez vous une tâche pour la voir et saisir du temps passé
+ImportDatasetTasks=Tâches des projets
+NewProject=Nouveau projet
+AddProject=Créer projet
+DeleteAProject=Supprimer un projet
+DeleteATask=Supprimer une tâche
+ConfirmDeleteAProject=Êtes-vous sûr de vouloir supprimer ce projet ?
+ConfirmDeleteATask=Êtes-vous sûr de vouloir supprimer cette tâche ?
+OpenedProjects=Projets ouverts
+OpenedTasks=Tâches ouvertes
+OpportunitiesStatusForOpenedProjects=Montant des opportunités des projets ouverts par statut
+OpportunitiesStatusForProjects=Montant des opportunités des projets par statut
+ShowProject=Afficher projet
+SetProject=Définir projet
+NoProject=Aucun projet défini ou responsable
+NbOfProjects=Nombre de projets
+TimeSpent=Temps consommé
+TimeSpentByYou=Temps consommé par vous
+TimeSpentByUser=Temps consommé par utilisateur
+TimesSpent=Temps consommés
+RefTask=Ref. tâche
+LabelTask=Libellé tâche
+TaskTimeSpent=Temps consommé sur les tâches
+TaskTimeUser=Utilisateur
+TaskTimeNote=Note
+TaskTimeDate=Date
+TasksOnOpenedProject=Tâches sur projets ouverts
+WorkloadNotDefined=Charge de travail non définie
+NewTimeSpent=Nouveau consommé
+MyTimeSpent=Mon consommé
+Tasks=Tâches
+Task=Tâche
+TaskDateStart=Date de début de tâche
+TaskDateEnd=Date de fin de tâche
+TaskDescription=Description de la tâche
+NewTask=Nouvelle tâche
+AddTask=Créer tâche
+AddTimeSpent=Saisir temps consommé
+Activity=Activité
+Activities=Tâches/activités
+MyActivities=Mes tâches/activités
+MyProjects=Mes projets
+MyProjectsArea=Espace Mes projets
+DurationEffective=Durée effective
+ProgressDeclared=Progression déclarée
+ProgressCalculated=Progression calculée
+Time=Temps
+ListOfTasks=Liste de tâches
+GoToListOfTimeConsumed=Aller à la liste des temps consommés
+GoToListOfTasks=Aller à la liste des tâches
+ListProposalsAssociatedProject=Liste des propositions commerciales associées au projet
+ListOrdersAssociatedProject=Liste des commandes clients associées au projet
+ListInvoicesAssociatedProject=Liste des factures clients associées au projet
+ListPredefinedInvoicesAssociatedProject=Liste des modèles de facture client associées au projet
+ListSupplierOrdersAssociatedProject=Liste des commandes fournisseurs associées au projet
+ListSupplierInvoicesAssociatedProject=Liste des factures fournisseurs associées au projet
+ListContractAssociatedProject=Liste des contrats associés au projet
+ListFichinterAssociatedProject=Liste des interventions associées au projet
+ListShippingAssociatedProject=Liste des expéditions associées au projet
+ListExpenseReportsAssociatedProject=Liste des notes de frais associées avec ce projet
+ListDonationsAssociatedProject=Liste des dons associés au projet
+ListActionsAssociatedProject=Liste des événements associés au projet
+ListTaskTimeUserProject=Liste du temps consommé sur les tâches d'un projet
+ActivityOnProjectToday=Activité projet aujourd'hui
+ActivityOnProjectYesterday=Activité projet hier
+ActivityOnProjectThisWeek=Activité sur les projets cette semaine
+ActivityOnProjectThisMonth=Activité sur les projets ce mois
+ActivityOnProjectThisYear=Activité sur les projets cette année
+ChildOfTask=Fille du projet/tâche
+NotOwnerOfProject=Non responsable de ce projet privé
+AffectedTo=Affecté à
+CantRemoveProject=Ce projet ne peut être supprimé car il est référencé par de nombreux objets (factures, commandes ou autre). voir la liste sur l'onglet Reférents.
+ValidateProject=Valider projet
+ConfirmValidateProject=Êtes-vous sûr de vouloir valider ce projet ?
+CloseAProject=Clore projet
+ConfirmCloseAProject=Êtes-vous sûr de vouloir clore ce projet ?
+AlsoCloseAProject=Fermer également le projet (laissez-le ouvert si vous devez suivre la production de tâches dessus)
+ReOpenAProject=Réouvrir projet
+ConfirmReOpenAProject=Êtes-vous sûr de vouloir rouvrir ce projet ?
+ProjectContact=Contacts projet
+ActionsOnProject=Événements sur le projet
+YouAreNotContactOfProject=Vous n'êtes pas contact de ce projet privé
+DeleteATimeSpent=Suppression du temps consommé
+ConfirmDeleteATimeSpent=Êtes-vous sûr de vouloir supprimer ce temps consommé ?
+DoNotShowMyTasksOnly=Voir aussi les tâches qui ne me sont pas affectées
+ShowMyTasksOnly=Ne voir que les tâches qui me sont affectées
+TaskRessourceLinks=Ressources
+ProjectsDedicatedToThisThirdParty=Projets dédiés à ce tiers
+NoTasks=Aucune tâche pour ce projet
+LinkedToAnotherCompany=Liés à autre société
+TaskIsNotAffectedToYou=Tâche qui ne vous sont pas affectées
+ErrorTimeSpentIsEmpty=Le temps consommé n'est pas renseigné
+ThisWillAlsoRemoveTasks=Cette opération détruira également les tâches du projet (<b>%s</b> tâches actuellement) et le suivi des consommés.
+IfNeedToUseOhterObjectKeepEmpty=Si des objets (facture, commande, ...), appartenant à un autre tiers que celui choisi, doivent être liés au projet à créer, laisser vide afin de laisser le projet multi-tiers.
+CloneProject=Cloner le projet
+CloneTasks=Cloner les tâches
+CloneContacts=Cloner les contacts
+CloneNotes=Cloner les notes
+CloneProjectFiles=Cloner les pièces jointes du projet
+CloneTaskFiles=Cloner les pièces jointes des tâche(s) (si tâche(s) cloner)
+CloneMoveDate=Mettre à jour les dates projet/tâches à partir de maintenant
+ConfirmCloneProject=Êtes-vous sûr de vouloir cloner ce projet ?
+ProjectReportDate=Reporter les dates des tâches en fonction de la date de départ.
+ErrorShiftTaskDate=Une erreur s'est produite dans le report des dates des tâches.
+ProjectsAndTasksLines=Projets et tâches
+ProjectCreatedInDolibarr=Projet %s créé
+ProjectModifiedInDolibarr=Projet %s modifié
+TaskCreatedInDolibarr=Tâche %s créée
+TaskModifiedInDolibarr=Tâche %s modifiée
+TaskDeletedInDolibarr=Tâche %s supprimée
+OpportunityStatus=Statut opportunité
+OpportunityStatusShort=Status opp.
+OpportunityProbability=Probabilité d'opportunité
+OpportunityProbabilityShort=Prob. opp.
+OpportunityAmount=Montant opportunité
+OpportunityAmountShort=Montant Opp.
+OpportunityAmountAverageShort=montant moyen des opportunités
+OpportunityAmountWeigthedShort=Montant pondéré des opportunités
+WonLostExcluded=hors opportunités remportées/perdues
+##### Types de contacts #####
+TypeContact_project_internal_PROJECTLEADER=Chef de projet
+TypeContact_project_external_PROJECTLEADER=Chef de projet
+TypeContact_project_internal_PROJECTCONTRIBUTOR=Contributeur
+TypeContact_project_external_PROJECTCONTRIBUTOR=Contributeur
+TypeContact_project_task_internal_TASKEXECUTIVE=Responsable
+TypeContact_project_task_external_TASKEXECUTIVE=Responsable
+TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributeur
+TypeContact_project_task_external_TASKCONTRIBUTOR=Contributeur
+SelectElement=Séléctionnez l'élément
+AddElement=Associer l'élément
+# Documents models
+DocumentModelBeluga=Modèle de document de rapport pour l'aperçu projet
+DocumentModelBaleine=Modèles de document de rapport de tâches de projets
+PlannedWorkload=Charge de travail prévue
+PlannedWorkloadShort=Charge de travail
+ProjectReferers=Objets associés
+ProjectMustBeValidatedFirst=Le projet doit être validé d'abord
+FirstAddRessourceToAllocateTime=Affecter un utilisateur pour saisir des temps
+InputPerDay=Saisie par jour
+InputPerWeek=Saisie par semaine
+InputPerAction=Saisie par action
+TimeAlreadyRecorded=Temps consommé déjà enregistré pour cette tâche/jour et utilisateur %s
+ProjectsWithThisUserAsContact=Projets avec cet utilisateur comme contact
+TasksWithThisUserAsContact=Tâches assignées à cet utilisateur
+ResourceNotAssignedToProject=Non assigné à un projet
+ResourceNotAssignedToTheTask=Non assigné à la tache
+AssignTaskToMe=M'assigner la tâche
+AssignTask=Assigner
+ProjectOverview=Vue d'ensemble
+ManageTasks=Utiliser les projets pour suivre les tâches
+ManageOpportunitiesStatus=Utiliser les projets pour suivre les affaires / opportunités
+ProjectNbProjectByMonth=Nb de projets créés par mois
+ProjectOppAmountOfProjectsByMonth=Montant des opportunités par mois
+ProjectWeightedOppAmountOfProjectsByMonth=Montant pondéré des opportunités par mois
+ProjectOpenedProjectByOppStatus=Opportunités/affaires ouvertes par statut
+ProjectsStatistics=Statistics sur les projets
+TaskAssignedToEnterTime=Tâche assignée. La saisie de temps sur cette tâche devrait être possible.
+IdTaskTime=Id ligne de temps
+YouCanCompleteRef=SI vous souhaitez compléter la référence avec d'autres informations filtrables, il est recommandé d'ajouter le caractère - entre les données. La numérotation automatique sera alors fonctionnelle pour le prochain compteur. Par exemple %s-ABC. Il est également possible d'ajouter des mots-clés dans le libellé. Il est cependant recommandé d'utiliser un attribut supplémentaire ou extrafield.
+OpenedProjectsByThirdparties=Projets ouverts par tiers
+OnlyOpportunitiesShort=Opportunités uniquement
+OpenedOpportunitiesShort=Opportunités ouvertes
+NotAnOpportunityShort=Non une opportunité
+OpportunityTotalAmount=Montant total des opportunités
+OpportunityPonderatedAmount=Montant pondéré des opportunités
+OpportunityPonderatedAmountDesc=Montant des opportunités pondéré par la probabilité
+OppStatusPROSP=Prospection
+OppStatusQUAL=Qualification
+OppStatusPROPO=Proposition
+OppStatusNEGO=Négociation
+OppStatusPENDING=En attente
+OppStatusWON=Gagné
+OppStatusLOST=Perdu
+Budget=Budget
diff --git a/htdocs/langs/fr_NC/sendings.lang b/htdocs/langs/fr_NC/sendings.lang
new file mode 100644
index 00000000000..5c3974dc11c
--- /dev/null
+++ b/htdocs/langs/fr_NC/sendings.lang
@@ -0,0 +1,71 @@
+# Dolibarr language file - Source file is en_US - sendings
+RefSending=Réf. expédition
+Sending=Expédition
+Sendings=Expéditions
+AllSendings=Toutes les expéditions
+Shipment=Expédition
+Shipments=Expéditions
+ShowSending=Afficher Expéditions
+Receivings=Bons de réceptions
+SendingsArea=Espace expéditions
+ListOfSendings=Liste des expéditions
+SendingMethod=Méthode d'expédition
+LastSendings=Les %s dernières expéditions
+StatisticsOfSendings=Statistiques des expéditions
+NbOfSendings=Nombre d'expéditions
+NumberOfShipmentsByMonth=Nombre d'expéditions par mois
+SendingCard=Fiche expédition
+NewSending=Nouvelle expédition
+CreateShipment=Créer expédition
+QtyShipped=Qté. expédiée
+QtyPreparedOrShipped=Quantité préparée ou envoyée
+QtyToShip=Qté. à expédier
+QtyReceived=Qté. reçue
+QtyInOtherShipments=Qté dans les autres expéditions
+KeepToShip=Reste à expédier
+OtherSendingsForSameOrder=Autres expéditions pour cette commande
+SendingsAndReceivingForSameOrder=Expéditions et réceptions pour cette commande
+SendingsToValidate=Expéditions à valider
+StatusSendingCanceled=Annulée
+StatusSendingDraft=Brouillon
+StatusSendingValidated=Validée (produits à envoyer ou envoyés)
+StatusSendingProcessed=Traitée
+StatusSendingDraftShort=Brouillon
+StatusSendingValidatedShort=Validée
+StatusSendingProcessedShort=Traitée
+SendingSheet=Fiche expédition
+ConfirmDeleteSending=Êtes-vous sûr de vouloir supprimer cette expédition ?
+ConfirmValidateSending=Êtes-vous sûr de vouloir valider cette expédition sous la référence <b>%s</b>?
+ConfirmCancelSending=Êtes-vous sûr de vouloir annuler cette expédition ?
+DocumentModelSimple=Modèle simple
+DocumentModelMerou=Modèle Merou A5
+WarningNoQtyLeftToSend=Alerte, aucun produit en attente d'expédition.
+StatsOnShipmentsOnlyValidated=Statistiques effectuées sur les expéditions validées uniquement. La date prise en compte est la date de validation (la date de prévision de livraison n'étant pas toujours renseignée).
+DateDeliveryPlanned=Date prévue de livraison
+RefDeliveryReceipt=Ref bon de réception
+StatusReceipt=Status du bon de réception
+DateReceived=Date de réception réelle
+SendShippingByEMail=Envoyer bon d'expédition par email
+SendShippingRef=Envoi du bordereau d'expédition %s
+ActionsOnShipping=Événements sur l'expédition
+LinkToTrackYourPackage=Lien pour le suivi de votre colis
+ShipmentCreationIsDoneFromOrder=Pour le moment, la création d'une nouvelle expédition se fait depuis la fiche commande.
+ShipmentLine=Ligne d'expédition
+ProductQtyInCustomersOrdersRunning=Quantité de produit en commandes client ouvertes
+ProductQtyInSuppliersOrdersRunning=Quantité de produit en commandes fournisseur ouvertes
+ProductQtyInShipmentAlreadySent=Quantité du produit parmi les commandes clients déjà envoyées
+ProductQtyInSuppliersShipmentAlreadyRecevied=Quantité de produit déjà reçu en commandes fournisseur ouvertes
+NoProductToShipFoundIntoStock=Aucun produit à expédier n'a été trouver dans l'entrepôt <b>%s</b>. Corrigez l'inventaire ou retourner choisir un autre entrepôt.
+WeightVolShort=Poids/vol.
+ValidateOrderFirstBeforeShipment=Vous devez d'abord valider la commande pour pouvoir créer une expédition.
+
+# Sending methods
+# ModelDocument
+DocumentModelTyphon=Modèle de bon de réception/livraison complet (logo…)
+Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constante EXPEDITION_ADDON_NUMBER non définie
+SumOfProductVolumes=Somme des volumes des produits
+SumOfProductWeights=Somme des poids des produits
+
+# warehouse details
+DetailWarehouseNumber= Détail de l'entrepôt
+DetailWarehouseFormat= W:%s (Qté : %d)
diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php
index f745c71d761..93e15f2fe77 100644
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -43,6 +43,7 @@ if (! empty($conf->fournisseur->enabled))	require_once DOL_DOCUMENT_ROOT.'/fourn
 if (! empty($conf->fournisseur->enabled))	require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
 if (! empty($conf->contrat->enabled))		require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
 if (! empty($conf->ficheinter->enabled))	require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
+if (! empty($conf->expedition->enabled))    require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
 if (! empty($conf->deplacement->enabled))	require_once DOL_DOCUMENT_ROOT.'/compta/deplacement/class/deplacement.class.php';
 if (! empty($conf->expensereport->enabled))	require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
 if (! empty($conf->agenda->enabled))		require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
@@ -341,6 +342,17 @@ $listofreferent=array(
     'buttonnew'=>'AddIntervention',
     'testnew'=>$user->rights->ficheinter->creer,
     'test'=>$conf->ficheinter->enabled && $user->rights->ficheinter->lire),
+'shipping'=>array(
+    'name'=>"Shippings",
+	'title'=>"ListShippingAssociatedProject",
+	'class'=>'Expedition',
+	'table'=>'expedition',
+	'datefieldname'=>'date_valid',
+	'urlnew'=>DOL_URL_ROOT.'/expedition/card.php?action=create&origin=project&originid='.$id.'&socid='.$socid,
+	'lang'=>'sendings',
+	'buttonnew'=>'CreateShipment',
+	'testnew'=>0,
+	'test'=>$conf->expedition->enabled && $user->rights->expedition->lire),
 'trip'=>array(
 	'name'=>"TripsAndExpenses",
 	'title'=>"ListExpenseReportsAssociatedProject",

From a2764bc4c2e6dc5de914dd1fb78082dde3b8d380 Mon Sep 17 00:00:00 2001
From: absys <frederick.nguyenxuan@gmail.com>
Date: Fri, 19 May 2017 18:14:42 +1100
Subject: [PATCH 405/505] Fix indent.

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

diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 8924577009f..2bf63907d68 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -191,7 +191,7 @@ if (empty($reshook))
 	    $object->note				= GETPOST('note','alpha');
 	    $object->origin				= $origin;
 	    $object->origin_id			= $origin_id;
-        $object->fk_project         = GETPOST('projectid');
+            $object->fk_project         = GETPOST('projectid');
 	    $object->weight				= GETPOST('weight','int')==''?"NULL":GETPOST('weight','int');
 	    $object->sizeH				= GETPOST('sizeH','int')==''?"NULL":GETPOST('sizeH','int');
 	    $object->sizeW				= GETPOST('sizeW','int')==''?"NULL":GETPOST('sizeW','int');

From 2382a0a4ee32b12bf4721a144d34ceddd2761e57 Mon Sep 17 00:00:00 2001
From: KHELIFA <kkhelifa@open-dsi.fr>
Date: Fri, 19 May 2017 10:46:29 +0200
Subject: [PATCH 406/505] Core dictionaries: Adds the ability to change the
 color and position of the dictionary 'Types of agenda events'

---
 htdocs/admin/dict.php         | 42 ++++++++++++++++++++++++++---------
 htdocs/langs/en_US/admin.lang |  1 +
 htdocs/langs/fr_FR/admin.lang |  1 +
 3 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 46a8001b02a..2b422074f1b 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -431,7 +431,7 @@ $tabhelp[2]  = array('code'=>$langs->trans("EnterAnyCode"));
 $tabhelp[3]  = array('code'=>$langs->trans("EnterAnyCode"));
 $tabhelp[4]  = array('code'=>$langs->trans("EnterAnyCode"));
 $tabhelp[5]  = array('code'=>$langs->trans("EnterAnyCode"));
-$tabhelp[6]  = array('code'=>$langs->trans("EnterAnyCode"), 'position'=>$langs->trans("PositionIntoComboList"));
+$tabhelp[6]  = array('code'=>$langs->trans("EnterAnyCode"), 'color'=>$langs->trans("ColorFormat"), 'position'=>$langs->trans("PositionIntoComboList"));
 $tabhelp[7]  = array('code'=>$langs->trans("EnterAnyCode"));
 $tabhelp[8]  = array('code'=>$langs->trans("EnterAnyCode"), 'position'=>$langs->trans("PositionIntoComboList"));
 $tabhelp[9]  = array('code'=>$langs->trans("EnterAnyCode"), 'unicode'=>$langs->trans("UnicodeCurrency"));
@@ -581,6 +581,12 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
     $listfieldmodify=explode(',',$tabfieldinsert[$id]);
     $listfieldvalue=explode(',',$tabfieldvalue[$id]);
 
+    if (GETPOST('actionmodify') && $tabname[$id] == MAIN_DB_PREFIX . "c_actioncomm" && isset($_POST["type"]) && in_array($_POST["type"],array('system','systemauto'))) {
+        $listfield=explode(',','color,position');
+        $listfieldmodify=explode(',','color,position');
+        $listfieldvalue=explode(',','color,position');
+    }
+
     // Check that all fields are filled
     $ok=1;
     foreach ($listfield as $f => $value)
@@ -619,7 +625,7 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
         }
     }
     // Other checks
-    if ($tabname[$id] == MAIN_DB_PREFIX."c_actioncomm" && isset($_POST["type"]) && in_array($_POST["type"],array('system','systemauto'))) {
+    if (GETPOST('actionadd') && $tabname[$id] == MAIN_DB_PREFIX."c_actioncomm" && isset($_POST["type"]) && in_array($_POST["type"],array('system','systemauto'))) {
         $ok=0;
         setEventMessages($langs->transnoentities('ErrorReservedTypeSystemSystemAuto'), null, 'errors');
     }
@@ -1104,7 +1110,7 @@ if ($id)
 
         if (empty($reshook))
         {
-       		fieldList($fieldlist,$obj,$tabname[$id],'add');
+       		fieldList($fieldlist,$langs,$obj,$tabname[$id],'add');
         }
 
         if ($id == 4) print '<td></td>';
@@ -1304,7 +1310,13 @@ if ($id)
                     $error=$hookmanager->error; $errors=$hookmanager->errors;
 
                     // Show fields
-                    if (empty($reshook)) fieldList($fieldlist,$obj,$tabname[$id],'edit');
+                    if (empty($reshook)) {
+                        $fieldl = $fieldlist;
+                        if ($tabname[$id] == MAIN_DB_PREFIX . "c_actioncomm" && in_array($obj->type, array('system', 'systemauto'))) {
+                            $fieldl=array(array('code'),array('libelle'),array('type'),'color','position');
+                        }
+                        fieldList($fieldl, $langs, $obj, $tabname[$id], 'edit');
+                    }
 
                     print '<td colspan="3" align="center">';
                     print '<div name="'.(! empty($obj->rowid)?$obj->rowid:$obj->code).'"></div>';
@@ -1512,6 +1524,7 @@ if ($id)
                     if (in_array($obj->code, array('AC_OTH','AC_OTH_AUTO')) || in_array($obj->type, array('systemauto'))) { $canbedisabled=0; $canbedisabled = 0; }
                     $canbemodified=$iserasable;
                     if ($obj->code == 'RECEP') $canbemodified=1;
+                    if ($tabname[$id] == MAIN_DB_PREFIX."c_actioncomm") $canbemodified=1;
 
                     // Url 
                     $rowidcol=$tabrowid[$id];
@@ -1643,15 +1656,16 @@ $db->close();
 /**
  *	Show fields in insert/edit mode
  *
- * 	@param		array	$fieldlist		Array of fields
- * 	@param		Object	$obj			If we show a particular record, obj is filled with record fields
- *  @param		string	$tabname		Name of SQL table
- *  @param		string	$context		'add'=Output field for the "add form", 'edit'=Output field for the "edit form", 'hide'=Output field for the "add form" but we dont want it to be rendered
+ * 	@param		array		$fieldlist		Array of fields
+ * 	@param		Translate	$langs			Translate class
+ * 	@param		Object		$obj			If we show a particular record, obj is filled with record fields
+ *  @param		string		$tabname		Name of SQL table
+ *  @param		string		$context		'add'=Output field for the "add form", 'edit'=Output field for the "edit form", 'hide'=Output field for the "add form" but we dont want it to be rendered
  *	@return		void
  */
-function fieldList($fieldlist, $obj='', $tabname='', $context='')
+function fieldList($fieldlist, $langs, $obj='', $tabname='', $context='')
 {
-	global $conf,$langs,$db;
+	global $conf,$db;
 	global $form;
 	global $region_id;
 	global $elementList,$sourceList,$localtax_typeList;
@@ -1809,6 +1823,14 @@ function fieldList($fieldlist, $obj='', $tabname='', $context='')
 			}
 			print '</td>';
 		}
+        elseif (is_array($fieldlist[$field]))
+        {
+            $hidden = (! empty($obj->{$fieldlist[$field][0]})?$obj->{$fieldlist[$field][0]}:'');
+            print '<td>';
+            print '<input type="hidden" name="'.$fieldlist[$field][0].'" value="'.$hidden.'">';
+            print $langs->trans($hidden);
+            print '</td>';
+        }
 		else
 		{
 			$classtd=''; $class='';
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 1c9ac65e4b8..070b58d40c2 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1632,6 +1632,7 @@ MinimumNoticePeriod=Minimum notice period (Your leave request must be done befor
 NbAddedAutomatically=Number of days added to counters of users (automatically) each month
 EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For exemple: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
+ColorFormat=The RGB color is in HEX format, eg: FF0000
 PositionIntoComboList=Position of line into combo lists
 SellTaxRate=Sale tax rate
 RecuperableOnly=Yes for VAT "Non Perçue Récupérable" dedicated for some state in France. Keep value to "No" in all other cases.
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index bd3d6405843..4eac426571d 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -1600,6 +1600,7 @@ MinimumNoticePeriod=Période de préavis minimum (Votre demande de congé doit 
 NbAddedAutomatically=Nombre de jours ajoutés aux compteurs des utilisateurs (automatiquement) chaque mois
 EnterAnyCode=Ce champ contient une référence pour identifier le champ. Entrez une valeur de votre choix, mais sans caractères spéciaux.
 UnicodeCurrency=Saisissez ici entre accolades, la liste du numéro des octets qui représentent le symbole de la monnaie. Pour exemple: pour $, entrez [36] - pour le Real Brésilien R$ [82,36] - pour l'euro €, entrez [8364]
+ColorFormat=La couleur RVB est au format HEX, ex: FF0000
 PositionIntoComboList=Position de la ligne dans des listes déroulantes
 SellTaxRate=Taux de TVA
 RecuperableOnly=Oui pour une TVA "Perçue Non Récupérable" dédiée à certains pays comme la France. Gardez la valeur à "Non" dans tous les autres cas.

From aec4cef5de4f8e4cc3b63d4f112bed5f66f8f42e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 19 May 2017 12:58:38 +0200
Subject: [PATCH 407/505] Clean some code for type of event deprecated since
 3.3

---
 htdocs/admin/mails.php                        |    4 +-
 htdocs/comm/propal/card.php                   |    2 +-
 htdocs/commande/card.php                      |    1 -
 htdocs/compta/facture/card.php                |    1 -
 htdocs/contrat/card.php                       |    1 -
 htdocs/core/actions_massactions.inc.php       |    8 +-
 htdocs/core/actions_sendmails.inc.php         |   43 +-
 htdocs/core/class/html.formmail.class.php     |    2 +-
 htdocs/core/lib/usergroups.lib.php            |    2 +-
 ...terface_50_modAgenda_ActionsAuto.class.php |   58 +-
 htdocs/expedition/card.php                    |    1 -
 htdocs/fichinter/card.php                     |    2 -
 htdocs/fourn/commande/card.php                |    1 -
 htdocs/fourn/facture/card.php                 |    1 -
 .../install/mysql/data/llx_c_actioncomm.sql   |   12 +-
 .../install/mysql/migration/5.0.0-6.0.0.sql   |    3 +-
 htdocs/langs/en_US/main.lang                  |    1 +
 htdocs/societe/card.php                       |    1 -
 htdocs/supplier_proposal/card.php             |    1 -
 htdocs/theme/eldy/style.css.php               |    1 +
 htdocs/theme/md/style.css.php                 |    3 +-
 htdocs/user/card.php                          | 1174 +++++++++--------
 22 files changed, 638 insertions(+), 685 deletions(-)

diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php
index 219cd85c2fe..03cce1dff09 100644
--- a/htdocs/admin/mails.php
+++ b/htdocs/admin/mails.php
@@ -86,8 +86,8 @@ if ($action == 'update' && empty($_POST["cancel"]))
 
 // Actions to send emails
 $id=0;
-$actiontypecode='';
-$trigger_name='';
+$actiontypecode='';     // Not an event for agenda
+$trigger_name='';       // Disable triggers
 $paramname='id';
 $mode='emailfortest';
 $trackid=(($action == 'testhtml')?"testhtml":"test");
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 0ee995e4784..df86464281a 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -644,7 +644,7 @@ if (empty($reshook))
 	 */
 
 	// Actions to send emails
-	$actiontypecode='AC_PROP';
+    $actiontypecode='AC_OTH_AUTO';
 	$trigger_name='PROPAL_SENTBYMAIL';
 	$paramname='id';
 	$mode='emailfromproposal';
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 07f25b40ed8..fe91f0b6ff8 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -1259,7 +1259,6 @@ if (empty($reshook))
 
 
 	// Actions to send emails
-	$actiontypecode='AC_COM';
 	$trigger_name='ORDER_SENTBYMAIL';
 	$paramname='id';
 	$mode='emailfromorder';
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 02b67c814ef..4835b53b277 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -1911,7 +1911,6 @@ if (empty($reshook))
 
 	// Actions to send emails
 	if (empty($id)) $id=$facid;
-	$actiontypecode='AC_FAC';
 	$trigger_name='BILL_SENTBYMAIL';
 	$paramname='id';
 	$mode='emailfrominvoice';
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 0e0f8c84090..f00816e9d4b 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -953,7 +953,6 @@ if (empty($reshook))
 	 */
 
 	// Actions to send emails
-	$actiontypecode='AC_CONT';
 	$trigger_name='CONTRACT_SENTBYMAIL';
 	$paramname='id';
 	$mode='emailfromcontract';
diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php
index 58e47a29ec8..92d1011b923 100644
--- a/htdocs/core/actions_massactions.inc.php
+++ b/htdocs/core/actions_massactions.inc.php
@@ -274,12 +274,12 @@ if (! $error && $massaction == 'confirm_presend')
                         // Insert logs into agenda
                         foreach($listofqualifiedinvoice as $invid => $object)
                         {
-                            if ($objectclass == 'Propale') $actiontypecode='AC_PROP';
+                            /*if ($objectclass == 'Propale') $actiontypecode='AC_PROP';
                             if ($objectclass == 'Commande') $actiontypecode='AC_COM';
                             if ($objectclass == 'Facture') $actiontypecode='AC_FAC';
                             if ($objectclass == 'Supplier_Proposal') $actiontypecode='AC_SUP_PRO';
                             if ($objectclass == 'CommandeFournisseur') $actiontypecode='AC_SUP_ORD';
-                            if ($objectclass == 'FactureFournisseur') $actiontypecode='AC_SUP_INV';
+                            if ($objectclass == 'FactureFournisseur') $actiontypecode='AC_SUP_INV';*/
                             
                             $actionmsg=$langs->transnoentities('MailSentBy').' '.$from.' '.$langs->transnoentities('To').' '.$sendto;
                             if ($message)
@@ -289,10 +289,10 @@ if (! $error && $massaction == 'confirm_presend')
                                 $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('TextUsedInTheMessageBody') . ":");
                                 $actionmsg = dol_concatdesc($actionmsg, $message);
                             }
-
+                            $actionmsg2='';
+                            
                             // Initialisation donnees
                             $object->sendtoid		= 0;
-                            $object->actiontypecode	= $actiontypecode;
                             $object->actionmsg		= $actionmsg;  // Long text
                             $object->actionmsg2		= $actionmsg2; // Short text
                             $object->fk_element		= $invid;
diff --git a/htdocs/core/actions_sendmails.inc.php b/htdocs/core/actions_sendmails.inc.php
index cf50d05d6bf..dded23e6cbf 100644
--- a/htdocs/core/actions_sendmails.inc.php
+++ b/htdocs/core/actions_sendmails.inc.php
@@ -23,11 +23,11 @@
 
 // $mysoc must be defined
 // $id must be defined
-// $actiontypecode must be defined
 // $paramname must be defined
 // $mode must be defined
-// $object and $uobject may be defined.
-
+// $trigger_name must be set (can be '')
+// $actiontypecode can be set
+// $object and $uobject may be defined
 
 /*
  * Add file in email form
@@ -155,7 +155,7 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 				}
 			}
 		}
-		else dol_print_error('','Use actions_sendmails.in.php for a type that is not supported');
+		else dol_print_error('','Use actions_sendmails.in.php for an element/object that is not supported');
 	}
 	else $thirdparty = $mysoc;
 
@@ -347,7 +347,7 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 				{
 					$error=0;
 
-					// FIXME This must be moved into a trigger for action $trigger_name
+					// FIXME This must be moved into the trigger for action $trigger_name
 					if (! empty($conf->dolimail->enabled))
 					{
 						$mid = (GETPOST('mid','int') ? GETPOST('mid','int') : 0);	// Original mail id is set ?
@@ -370,21 +370,26 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 					// Initialisation of datas
 					if (is_object($object))
 					{
-						$object->socid			= $sendtosocid;	// To link to a company
-						$object->sendtoid		= $sendtoid;	// To link to contacts/addresses. This is an array.
-						$object->actiontypecode	= $actiontypecode;
-						$object->actionmsg		= $actionmsg;  // Long text
-						$object->actionmsg2		= $actionmsg2; // Short text
+					    if (empty($actiontypecode)) $actiontypecode='AC_OTH_AUTO'; // Event insert into agenda automatically
+					    
+						$object->socid			= $sendtosocid;	   // To link to a company
+						$object->sendtoid		= $sendtoid;	   // To link to contacts/addresses. This is an array.
+						$object->actiontypecode	= $actiontypecode; // Type of event ('AC_OTH', 'AC_OTH_AUTO', 'AC_XXX'...)
+						$object->actionmsg		= $actionmsg;      // Long text
+						$object->actionmsg2		= $actionmsg2;     // Short text
 						$object->trackid        = $trackid;
 						$object->fk_element		= $object->id;
 						$object->elementtype	= $object->element;
 
 						// Call of triggers
-						include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-						$interface=new Interfaces($db);
-						$result=$interface->run_triggers($trigger_name,$object,$user,$langs,$conf);
-						if ($result < 0) {
-							$error++; $errors=$interface->errors;
+						if (! empty($trigger_name))
+						{
+    						include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+    						$interface=new Interfaces($db);
+    						$result=$interface->run_triggers($trigger_name,$object,$user,$langs,$conf);
+    						if ($result < 0) {
+    							$error++; $errors=$interface->errors;
+    						}
 						}
 					}
 						
@@ -398,8 +403,12 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 						// This avoid sending mail twice if going out and then back to page
 						$mesg=$langs->trans('MailSuccessfulySent',$mailfile->getValidAddress($from,2),$mailfile->getValidAddress($sendto,2));
 						setEventMessages($mesg, null, 'mesgs');
-						if ($conf->dolimail->enabled) header('Location: '.$_SERVER["PHP_SELF"].'?'.($paramname?$paramname:'id').'='.$object->id.'&'.($paramname2?$paramname2:'mid').'='.$parm2val);
-						else header('Location: '.$_SERVER["PHP_SELF"].'?'.($paramname?$paramname:'id').'='.$object->id);
+						if ($conf->dolimail->enabled) 
+						{
+						    header('Location: '.$_SERVER["PHP_SELF"].'?'.($paramname?$paramname:'id').'='.(is_object($object)?$object->id:'').'&'.($paramname2?$paramname2:'mid').'='.$parm2val);
+						    exit;
+						}
+						header('Location: '.$_SERVER["PHP_SELF"].'?'.($paramname?$paramname:'id').'='.(is_object($object)?$object->id:''));
 						exit;
 					}
 				}
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 020382095a3..3641ac87cef 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -297,7 +297,7 @@ class FormMail extends Form
         	$arraydefaultmessage=$this->getEMailTemplate($this->db, $this->param["models"], $user, $outputlangs, $model_id);
 			//var_dump($arraydefaultmessage);
 
-        	$out.= "\n<!-- Begin form mail -->\n";
+        	$out.= "\n".'<!-- Begin form mail --><div id="mailformdiv"></div>'."\n";
         	if ($this->withform == 1)
         	{
         		$out.= '<form method="POST" name="mailform" id="mailform" enctype="multipart/form-data" action="'.$this->param["returnurl"].'#formmail">'."\n";
diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php
index 2cea718dcc0..f48974acb02 100644
--- a/htdocs/core/lib/usergroups.lib.php
+++ b/htdocs/core/lib/usergroups.lib.php
@@ -145,7 +145,7 @@ function user_prepare_head($object)
     {
 		// Bank
     	$head[$h][0] = DOL_URL_ROOT.'/user/bank.php?id='.$object->id;
-    	$head[$h][1] = $langs->trans("BankAccounts");
+    	$head[$h][1] = $langs->trans("HR");
     	$head[$h][2] = 'bank';
     	$h++;
 	}
diff --git a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
index 9da1ada59ad..1160fb2625d 100644
--- a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
+++ b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
@@ -76,6 +76,8 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
 		$langs->load("agenda");
 
+		if (empty($object->actiontypecode)) $object->actiontypecode='AC_OTH_AUTO';
+
 		// Actions
 		if ($action == 'COMPANY_CREATE')
         {
@@ -83,7 +85,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $langs->load("other");
             $langs->load("companies");
 
-			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("NewCompanyToDolibarr",$object->name);
             $object->actionmsg=$langs->transnoentities("NewCompanyToDolibarr",$object->name);
             if (! empty($object->prefix)) $object->actionmsg.=" (".$object->prefix.")";
@@ -97,7 +98,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $langs->load("other");
         	$langs->load("orders");
 
-            if (empty($object->actiontypecode)) $object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) dol_syslog('Trigger called with property actionmsg2 on object not defined', LOG_ERR);
 
             // Parameters $object->sendtoid defined by caller
@@ -109,7 +109,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $langs->load("other");
             $langs->load("contracts");
 
-			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ContractValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
             $object->actionmsg=$langs->transnoentities("ContractValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
 
@@ -121,7 +120,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $langs->load("other");
             $langs->load("propal");
 
-			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("PropalValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
             $object->actionmsg=$langs->transnoentities("PropalValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
 
@@ -133,7 +131,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $langs->load("other");
         	$langs->load("propal");
 
-            $object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ProposalSentByEMail",$object->ref);
             if (empty($object->actionmsg))
             {
@@ -149,7 +146,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $langs->load("other");
         	$langs->load("propal");
 
-			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("PropalClosedSignedInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("PropalClosedSignedInDolibarr",$object->ref);
 
@@ -161,7 +157,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $langs->load("other");
         	$langs->load("propal");
 
-			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("PropalClassifiedBilledInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("PropalClassifiedBilledInDolibarr",$object->ref);
 
@@ -173,7 +168,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $langs->load("other");
         	$langs->load("propal");
 
-			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("PropalClosedRefusedInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("PropalClosedRefusedInDolibarr",$object->ref);
 
@@ -184,7 +178,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $langs->load("agenda");
             $langs->load("orders");
 
-			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
             $object->actionmsg=$langs->transnoentities("OrderValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
 
@@ -196,7 +189,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $langs->load("other");
         	$langs->load("orders");
 
-			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderDeliveredInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("OrderDeliveredInDolibarr",$object->ref);
 
@@ -208,7 +200,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $langs->load("other");
         	$langs->load("orders");
 
-			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderBilledInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("OrderBilledInDolibarr",$object->ref);
 
@@ -220,7 +211,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $langs->load("other");
         	$langs->load("orders");
 
-			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderCanceledInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("OrderCanceledInDolibarr",$object->ref);
 
@@ -232,7 +222,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $langs->load("other");
         	$langs->load("orders");
 
-            $object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderSentByEMail",$object->ref);
             if (empty($object->actionmsg))
             {
@@ -248,7 +237,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $langs->load("other");
             $langs->load("bills");
 
-			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InvoiceValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
             $object->actionmsg=$langs->transnoentities("InvoiceValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
 
@@ -260,7 +248,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $langs->load("other");
             $langs->load("bills");
 
-			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InvoiceBackToDraftInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("InvoiceBackToDraftInDolibarr",$object->ref);
 
@@ -272,7 +259,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $langs->load("other");
             $langs->load("bills");
 
-            $object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InvoiceSentByEMail",$object->ref);
             if (empty($object->actionmsg))
             {
@@ -289,7 +275,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $langs->load("bills");
 
             // Values for this action can't be defined by caller.
-			$object->actiontypecode='AC_OTH_AUTO';
             $object->actionmsg2=$langs->transnoentities("InvoicePaidInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("InvoicePaidInDolibarr",$object->ref);
 
@@ -301,7 +286,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $langs->load("other");
             $langs->load("bills");
 
-			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InvoiceCanceledInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("InvoiceCanceledInDolibarr",$object->ref);
 
@@ -313,7 +297,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $langs->load("other");
             $langs->load("interventions");
 
-			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InterventionCreatedInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("InterventionCreatedInDolibarr",$object->ref);
 
@@ -327,7 +310,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $langs->load("other");
             $langs->load("interventions");
 
-			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InterventionValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
             $object->actionmsg=$langs->transnoentities("InterventionValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
 
@@ -341,7 +323,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $langs->load("other");
             $langs->load("interventions");
 
-			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InterventionModifiedInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("InterventionModifiedInDolibarr",$object->ref);
 
@@ -355,7 +336,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $langs->load("other");
             $langs->load("interventions");
 
-            $object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InterventionSentByEMail",$object->ref);
             $object->actionmsg=$langs->transnoentities("InterventionSentByEMail",$object->ref);
 
@@ -368,7 +348,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $langs->load("other");
             $langs->load("interventions");
 
-            $object->actiontypecode='AC_OTH_AUTO';
            	if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InterventionClassifiedBilledInDolibarr",$object->ref);
            	$object->actionmsg=$langs->transnoentities("InterventionClassifiedBilledInDolibarr",$object->ref);
 
@@ -380,7 +359,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $langs->load("other");
             $langs->load("interventions");
 
-            $object->actiontypecode='AC_OTH_AUTO';
            	if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InterventionClassifiedUnbilledInDolibarr",$object->ref);
            	$object->actionmsg=$langs->transnoentities("InterventionClassifiedUnbilledInDolibarr",$object->ref);
 
@@ -392,7 +370,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $langs->load("other");
             $langs->load("interventions");
 
-			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InterventionDeletedInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("InterventionDeletedInDolibarr",$object->ref);
 
@@ -406,7 +383,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $langs->load("other");
         	$langs->load("sendings");
 
-        	$object->actiontypecode='AC_OTH_AUTO';
         	if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ShippingValidated",($object->newref?$object->newref:$object->ref));
         	if (empty($object->actionmsg))
         	{
@@ -422,7 +398,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $langs->load("other");
             $langs->load("sendings");
 
-            $object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ShippingSentByEMail",$object->ref);
             if (empty($object->actionmsg))
             {
@@ -438,7 +413,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $langs->load("other");
         	$langs->load("orders");
 
-			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderCreatedInDolibarr",($object->newref?$object->newref:$object->ref));
             $object->actionmsg=$langs->transnoentities("OrderCreatedInDolibarr",($object->newref?$object->newref:$object->ref));
 
@@ -450,7 +424,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $langs->load("other");
         	$langs->load("orders");
 
-			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
             $object->actionmsg=$langs->transnoentities("OrderValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
 
@@ -462,7 +435,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
 		    $langs->load("other");
 			$langs->load("orders");
 
-			$object->actiontypecode='AC_OTH_AUTO';
 			if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderApprovedInDolibarr",$object->ref);
 			$object->actionmsg=$langs->transnoentities("OrderApprovedInDolibarr",$object->ref);
 
@@ -474,7 +446,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
 		    $langs->load("other");
 			$langs->load("orders");
 
-			$object->actiontypecode='AC_OTH_AUTO';
 			if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderRefusedInDolibarr",$object->ref);
 			$object->actionmsg=$langs->transnoentities("OrderRefusedInDolibarr",$object->ref);
 
@@ -486,7 +457,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $langs->load("other");
         	$langs->load("orders");
 
-			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("SupplierOrderSubmitedInDolibarr",($object->newref?$object->newref:$object->ref));
             $object->actionmsg=$langs->transnoentities("SupplierOrderSubmitedInDolibarr",($object->newref?$object->newref:$object->ref));
 
@@ -498,7 +468,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $langs->load("other");
         	$langs->load("orders");
 
-			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("SupplierOrderReceivedInDolibarr",($object->newref?$object->newref:$object->ref));
             $object->actionmsg=$langs->transnoentities("SupplierOrderReceivedInDolibarr",($object->newref?$object->newref:$object->ref));
 
@@ -511,7 +480,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $langs->load("bills");
             $langs->load("orders");
 
-            $object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("SupplierOrderSentByEMail",$object->ref);
             if (empty($object->actionmsg))
             {
@@ -528,7 +496,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $langs->load("bills");
             $langs->load("orders");
 
-            $object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("SupplierOrderClassifiedBilled",$object->ref);
             if (empty($object->actionmsg))
             {
@@ -543,7 +510,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $langs->load("other");
             $langs->load("bills");
 
-			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InvoiceValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
             $object->actionmsg=$langs->transnoentities("InvoiceValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
 
@@ -555,7 +521,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $langs->load("other");
             $langs->load("bills");
 
-			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InvoiceBackToDraftInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("InvoiceBackToDraftInDolibarr",$object->ref);
 
@@ -568,7 +533,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $langs->load("bills");
             $langs->load("orders");
 
-            $object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("SupplierInvoiceSentByEMail",$object->ref);
             if (empty($object->actionmsg))
             {
@@ -584,7 +548,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $langs->load("other");
             $langs->load("bills");
 
-			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InvoicePaidInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("InvoicePaidInDolibarr",$object->ref);
 
@@ -596,7 +559,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $langs->load("other");
             $langs->load("bills");
 
-			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InvoiceCanceledInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("InvoiceCanceledInDolibarr",$object->ref);
 
@@ -610,7 +572,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $langs->load("other");
             $langs->load("members");
 
-			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("MemberValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
             $object->actionmsg=$langs->transnoentities("MemberValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
             $object->actionmsg.="\n".$langs->transnoentities("Member").': '.$object->getFullName($langs);
@@ -624,7 +585,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $langs->load("other");
             $langs->load("members");
 
-			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("MemberModifiedInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("MemberModifiedInDolibarr",$object->ref);
             $object->actionmsg.="\n".$langs->transnoentities("Member").': '.$object->getFullName($langs);
@@ -638,7 +598,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $langs->load("other");
             $langs->load("members");
 
-			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("MemberSubscriptionAddedInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("MemberSubscriptionAddedInDolibarr",$object->ref);
             $object->actionmsg.="\n".$langs->transnoentities("Member").': '.$object->getFullName($langs);
@@ -654,7 +613,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $langs->load("other");
             $langs->load("members");
 
-			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("MemberResiliatedInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("MemberResiliatedInDolibarr",$object->ref);
             $object->actionmsg.="\n".$langs->transnoentities("Member").': '.$object->getFullName($langs);
@@ -668,7 +626,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $langs->load("other");
             $langs->load("members");
 
-			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("MemberDeletedInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("MemberDeletedInDolibarr",$object->ref);
             $object->actionmsg.="\n".$langs->transnoentities("Member").': '.$object->getFullName($langs);
@@ -684,7 +641,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $langs->load("other");
         	$langs->load("projects");
 
-        	$object->actiontypecode='AC_OTH_AUTO';
         	if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ProjectCreatedInDolibarr",$object->ref);
         	$object->actionmsg=$langs->transnoentities("ProjectCreatedInDolibarr",$object->ref);
         	$object->actionmsg.="\n".$langs->transnoentities("Project").': '.$object->ref;
@@ -696,8 +652,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $langs->load("other");
             $langs->load("projects");
         
-            $object->actiontypecode='AC_OTH_AUTO';
-        
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ProjectValidatedInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("ProjectValidatedInDolibarr",$object->ref);
             $object->actionmsg.="\n".$langs->transnoentities("Project").': '.$object->ref;
@@ -709,7 +663,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $langs->load("other");
             $langs->load("projects");
         
-            $object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ProjectModifiedInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("ProjectModifieddInDolibarr",$object->ref);
             $object->actionmsg.="\n".$langs->transnoentities("Task").': '.$object->ref;
@@ -723,8 +676,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
 		    $langs->load("other");
 			$langs->load("projects");
 
-			$object->actiontypecode='AC_OTH_AUTO';
-
 			if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("TaskCreatedInDolibarr",$object->ref);
 			$object->actionmsg=$langs->transnoentities("TaskCreatedInDolibarr",$object->ref);
 			$object->actionmsg.="\n".$langs->transnoentities("Task").': '.$object->ref;
@@ -737,7 +688,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
 		    $langs->load("other");
 			$langs->load("projects");
 
-			$object->actiontypecode='AC_OTH_AUTO';
 			if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("TaskModifiedInDolibarr",$object->ref);
 			$object->actionmsg=$langs->transnoentities("TaskModifieddInDolibarr",$object->ref);
 			$object->actionmsg.="\n".$langs->transnoentities("Task").': '.$object->ref;
@@ -750,7 +700,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
 		    $langs->load("other");
 			$langs->load("projects");
 
-			$object->actiontypecode='AC_OTH_AUTO';
 			if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("TaskDeletedInDolibarr",$object->ref);
 			$object->actionmsg=$langs->transnoentities("TaskDeletedInDolibarr",$object->ref);
 			$object->actionmsg.="\n".$langs->transnoentities("Task").': '.$object->ref;
@@ -763,7 +712,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
 		    $langs->load("agenda");
 		    $langs->load("other");
 		    
-		    $object->actiontypecode='AC_OTH_AUTO';
 		    if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities($action."InDolibarr",$object->ref);
 		    $object->actionmsg=$langs->transnoentities($action."InDolibarr",$object->ref);
 		    
@@ -805,7 +753,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 		// Insertion action
 		require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 		$actioncomm = new ActionComm($this->db);
-		$actioncomm->type_code   = $object->actiontypecode;		// code of parent table llx_c_actioncomm (will be deprecated)
+		$actioncomm->type_code   = $object->actiontypecode;		// Type of event ('AC_OTH', 'AC_OTH_AUTO', 'AC_XXX'...)
 		$actioncomm->code        = 'AC_'.$action;
 		$actioncomm->label       = $object->actionmsg2;
 		$actioncomm->note        = $object->actionmsg;          // TODO Replace with $actioncomm->email_msgid ? $object->email_content : $object->actionmsg
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index a0280ce9e39..fdd477cc63d 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -595,7 +595,6 @@ if (empty($reshook))
 
 	// Actions to send emails
 	if (empty($id)) $id=$facid;
-	$actiontypecode='AC_SHIP';
 	$trigger_name='SHIPPING_SENTBYMAIL';
 	$paramname='id';
 	$mode='emailfromshipment';
diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index 91e094c1a50..51cd5a62d3f 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -719,8 +719,6 @@ if (empty($reshook))
 	 */
 
 	// Actions to send emails
-	$actiontypecode='AC_OTH_AUTO';
-	$trigger_name='FICHINTER_SENTBYMAIL';
 	$paramname='id';
 	$mode='emailfromintervention';
 	$trackid='int'.$object->id;
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 378fab9f50c..a6f0cc248f1 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -1154,7 +1154,6 @@ if (empty($reshook))
 	 */
 
 	// Actions to send emails
-	$actiontypecode='AC_SUP_ORD';
 	$trigger_name='ORDER_SUPPLIER_SENTBYMAIL';
 	$paramname='id';
 	$mode='emailfromsupplierorder';
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index bda155efe88..04e6ea98481 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -1188,7 +1188,6 @@ if (empty($reshook))
 	 */
 
 	// Actions to send emails
-	$actiontypecode='AC_SUP_INV';
 	$trigger_name='BILL_SUPPLIER_SENTBYMAIL';
 	$paramname='id';
 	$mode='emailfromsupplierinvoice';
diff --git a/htdocs/install/mysql/data/llx_c_actioncomm.sql b/htdocs/install/mysql/data/llx_c_actioncomm.sql
index 2b84ee6ff82..6b89ed74dd2 100644
--- a/htdocs/install/mysql/data/llx_c_actioncomm.sql
+++ b/htdocs/install/mysql/data/llx_c_actioncomm.sql
@@ -38,12 +38,12 @@ insert into llx_c_actioncomm (id, code, type, libelle, module, active, position)
 insert into llx_c_actioncomm (id, code, type, libelle, module, active, position) values ( 5,'AC_RDV','system','Rendez-vous',NULL, 1, 1);
 insert into llx_c_actioncomm (id, code, type, libelle, module, active, position) values (11,'AC_INT','system','Intervention on site',NULL, 1, 4);
 -- Code kept for backward compatibility < 3.3 
-insert into llx_c_actioncomm (id, code, type, libelle, module, active, position) values ( 3,'AC_PROP','systemauto', 'Send commercial proposal by email','propal',0,10);
-insert into llx_c_actioncomm (id, code, type, libelle, module, active, position) values ( 8,'AC_COM','systemauto','Send customer order by email','order', 0,8);
-insert into llx_c_actioncomm (id, code, type, libelle, module, active, position) values ( 9,'AC_FAC','systemauto', 'Send customer invoice by email','invoice',0,6);
-insert into llx_c_actioncomm (id, code, type, libelle, module, active, position) values ( 10,'AC_SHIP','systemauto', 'Send shipping by email','shipping',0,11);
-insert into llx_c_actioncomm (id, code, type, libelle, module, active, position) values ( 30,'AC_SUP_ORD','systemauto','Send supplier order by email','order_supplier',0,9);
-insert into llx_c_actioncomm (id, code, type, libelle, module, active, position) values ( 31,'AC_SUP_INV','systemauto','Send supplier invoice by email','invoice_supplier',0,7);
+--insert into llx_c_actioncomm (id, code, type, libelle, module, active, position) values ( 3,'AC_PROP','systemauto', 'Send commercial proposal by email','propal',0,10);
+--insert into llx_c_actioncomm (id, code, type, libelle, module, active, position) values ( 8,'AC_COM','systemauto','Send customer order by email','order', 0,8);
+--insert into llx_c_actioncomm (id, code, type, libelle, module, active, position) values ( 9,'AC_FAC','systemauto', 'Send customer invoice by email','invoice',0,6);
+--insert into llx_c_actioncomm (id, code, type, libelle, module, active, position) values ( 10,'AC_SHIP','systemauto', 'Send shipping by email','shipping',0,11);
+--insert into llx_c_actioncomm (id, code, type, libelle, module, active, position) values ( 30,'AC_SUP_ORD','systemauto','Send supplier order by email','order_supplier',0,9);
+--insert into llx_c_actioncomm (id, code, type, libelle, module, active, position) values ( 31,'AC_SUP_INV','systemauto','Send supplier invoice by email','invoice_supplier',0,7);
 -- Code used from 3.3+ when type of event is not used
 insert into llx_c_actioncomm (id, code, type, libelle, module, active, position) values ( 40,'AC_OTH_AUTO','systemauto','Other (automatically inserted events)',NULL, 1, 20);
 insert into llx_c_actioncomm (id, code, type, libelle, module, active, position) values ( 50,'AC_OTH','system','Other (manually inserted events)',NULL, 1, 5);
diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index 6ba7707b249..725eca55daa 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -296,7 +296,6 @@ ALTER TABLE llx_events MODIFY COLUMN ip varchar(250);
 
 ALTER TABLE llx_facture ADD COLUMN fk_fac_rec_source integer;
 
-
-
+DELETE from llx_c_actioncomm where code in ('AC_PROP','AC_COM','AC_FAC','AC_SHIP','AC_SUP_ORD','AC_SUP_INV') AND id NOT IN (SELECT DISTINCT fk_action FROM llx_actioncomm);
 
 
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 79927cc888c..a5f2ddf1e7e 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -771,6 +771,7 @@ ModuleBuilder=Module Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
+HR=HR
 # Week day
 Monday=Monday
 Tuesday=Tuesday
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 5a53a2c6ed2..14e8e4b4679 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -750,7 +750,6 @@ if (empty($reshook))
 
     // Actions to send emails
     $id=$socid;
-    $actiontypecode='AC_OTH_AUTO';
     $trigger_name='COMPANY_SENTBYMAIL';
     $paramname='socid';
     $mode='emailfromthirdparty';
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index d36b471a721..86c350ecc22 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -466,7 +466,6 @@ if (empty($reshook))
 	include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
 
 	// Actions to send emails
-	$actiontypecode='AC_ASKPRICE';
 	$trigger_name='SUPPLIER_PROPOSAL_SENTBYMAIL';
 	$paramname='id';
 	$mode='emailfromsupplierproposal';
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 66f880da786..4ae7d400a09 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -1101,6 +1101,7 @@ div.nopadding {
 	padding-top: 1px;
 	padding-bottom: 1px;
 	width: 44px;
+	text-align:center;
 }
 div.attacharea {
 	padding-top: 18px;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 04732ef0305..2beef147c02 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -1145,6 +1145,7 @@ img.hideonsmartphone.pictoactionview {
 	padding-top: 1px;
 	padding-bottom: 1px;
 	width: 44px;
+	text-align:center;
 }
 div.attacharea {
 	padding-top: 18px;
@@ -3054,7 +3055,7 @@ div.info {
   -moz-border-radius: 4px;
   -webkit-border-radius: 4px;
   border-radius: 4px;
-  background: #EaE4Ea;
+  background: #868;
   text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
 }
 
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index d98ef682e90..9249e8f295e 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -593,7 +593,6 @@ if (empty($reshook)) {
     }
 		
     // Actions to send emails
-    $actiontypecode='AC_OTH_AUTO';
     $trigger_name='USER_SENTBYMAIL';
     $paramname='id';    // Name of param key to open the card
     $mode='emailfromuser';
@@ -1005,14 +1004,6 @@ if (($action == 'create') || ($action == 'adduserldap'))
     }
     print '</td></tr>';
 
-    // Signature
-    print '<tr><td class="tdtop">'.$langs->trans("Signature").'</td>';
-    print '<td>';
-    require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-    $doleditor=new DolEditor('signature',GETPOST('signature'),'',138,'dolibarr_mailings','In',true,true,empty($conf->global->FCKEDITOR_ENABLE_USERSIGN)?0:1,ROWS_4,'90%');
-    print $doleditor->Create(1);
-    print '</td></tr>';
-
     // Multicompany
     if (! empty($conf->multicompany->enabled))
     {
@@ -1028,6 +1019,15 @@ if (($action == 'create') || ($action == 'adduserldap'))
         }
     }
 
+    // Accountancy code
+    if ($conf->accounting->enabled)
+    {
+        print '<tr><td>'.$langs->trans("AccountancyCode").'</td>';
+        print '<td>';
+        print '<input size="30" type="text" name="accountancy_code" value="'.GETPOST('accountancy_code').'">';
+        print '</td></tr>';
+    }
+    
     // Hierarchy
     print '<tr><td>'.$langs->trans("HierarchicalResponsible").'</td>';
     print '<td>';
@@ -1035,7 +1035,8 @@ if (($action == 'create') || ($action == 'adduserldap'))
     print '</td>';
     print "</tr>\n";
 
-	if ($conf->salaries->enabled && ! empty($user->rights->salaries->read))
+    if ((! empty($conf->salaries->enabled) && ! empty($user->rights->salaries->read))
+       || (! empty($conf->hrm->enabled) && ! empty($user->rights->hrm->employee->read)))
 	{
 		$langs->load("salaries");
 
@@ -1081,15 +1082,6 @@ if (($action == 'create') || ($action == 'adduserldap'))
 	print '</td>';
     print "</tr>\n";
 
-	// Accountancy code
-	if ($conf->accounting->enabled)
-	{
-		print '<tr><td>'.$langs->trans("AccountancyCode").'</td>';
-		print '<td>';
-		print '<input size="30" type="text" name="accountancy_code" value="'.GETPOST('accountancy_code').'">';
-		print '</td></tr>';
-	}
-
 	// User color
 	if (! empty($conf->agenda->enabled))
 	{
@@ -1108,6 +1100,14 @@ if (($action == 'create') || ($action == 'adduserldap'))
 			null, '90%' );
 		print "</td></tr>";
 	}
+
+    // Other attributes
+    $parameters=array('objectsrc' => $objectsrc, 'colspan' => ' colspan="3"');
+    $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+    if (empty($reshook) && ! empty($extrafields->attribute_label))
+    {
+    	print $object->showOptionals($extrafields,'edit');
+    }
 	
     // Note
     print '<tr><td class="tdtop">';
@@ -1118,15 +1118,15 @@ if (($action == 'create') || ($action == 'adduserldap'))
     $doleditor->Create();
     print "</td></tr>\n";
 
-    // Other attributes
-    $parameters=array('objectsrc' => $objectsrc, 'colspan' => ' colspan="3"');
-    $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-    if (empty($reshook) && ! empty($extrafields->attribute_label))
-    {
-    	print $object->showOptionals($extrafields,'edit');
-    }
-
- 	print "</table>\n";
+    // Signature
+    print '<tr><td class="tdtop">'.$langs->trans("Signature").'</td>';
+    print '<td>';
+    require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+    $doleditor=new DolEditor('signature',GETPOST('signature'),'',138,'dolibarr_mailings','In',true,true,empty($conf->global->FCKEDITOR_ENABLE_USERSIGN)?0:1,ROWS_4,'90%');
+    print $doleditor->Create(1);
+    print '</td></tr>';
+    
+    print "</table>\n";
 
  	dol_fiche_end();
 
@@ -1379,11 +1379,15 @@ else
             	print '</td></tr>'."\n";
             }
 
-            // Signature
-            print '<tr><td class="tdtop">'.$langs->trans('Signature').'</td><td>';
-            print dol_htmlentitiesbr($object->signature);
-            print "</td></tr>\n";
-
+            // Accountancy code
+            if ($conf->accounting->enabled)
+            {
+                print '<tr><td>'.$langs->trans("AccountancyCode").'</td>';
+                print '<td>'.$object->accountancy_code.'</td></tr>';
+            }
+            
+            // TODO Move this into RH Tab (visible if RH module on)
+            
             // Hierarchy
             print '<tr><td>'.$langs->trans("HierarchicalResponsible").'</td>';
             print '<td>';
@@ -1396,7 +1400,8 @@ else
             print '</td>';
             print "</tr>\n";
 
-            if (! empty($conf->salaries->enabled) && ! empty($user->rights->salaries->read))
+            if ((! empty($conf->salaries->enabled) && ! empty($user->rights->salaries->read))
+                || (! empty($conf->hrm->enabled) && ! empty($user->rights->hrm->employee->read)))
             {
             	$langs->load("salaries");
 
@@ -1435,13 +1440,6 @@ else
 		    print '</td>';
 		    print "</tr>\n";
 
-			// Accountancy code
-			if ($conf->accounting->enabled)
-			{
-				print '<tr><td>'.$langs->trans("AccountancyCode").'</td>';
-				print '<td>'.$object->accountancy_code.'</td>';
-			}
-
 		    // Date employment
 		    print '<tr><td>'.$langs->trans("DateEmployment").'</td>';
 		    print '<td>';
@@ -1449,7 +1447,7 @@ else
 		    print '</td>';
 		    print "</tr>\n";
 
-			print '</table>';
+		    print '</table>';
 
 	        print '</div>';
 	        print '<div class="fichehalfright"><div class="ficheaddleft">';
@@ -1567,7 +1565,12 @@ else
                 print '</tr>'."\n";
             }
 
-			print "</table>\n";
+            // Signature
+            print '<tr><td class="tdtop">'.$langs->trans('Signature').'</td><td>';
+            print dol_htmlentitiesbr($object->signature);
+            print "</td></tr>\n";
+
+            print "</table>\n";
 			print '</div>';
 
         	print '</div></div>';
@@ -1772,586 +1775,574 @@ else
     
                 dol_fiche_end();
             }
-        }
 
-        if (GETPOST('action','aZ09') != 'presend' && GETPOST('action','aZ09') != 'send')
-        {
-            /*
-             * List of groups of user
-             */
-
-            if ($canreadgroup)
+            if (GETPOST('action','aZ09') != 'presend' && GETPOST('action','aZ09') != 'send')
             {
-                print load_fiche_titre($langs->trans("ListOfGroupsForUser"),'','');
-
-                // On selectionne les groupes auquel fait parti le user
-                $exclude = array();
-
-                $usergroup=new UserGroup($db);
-                $groupslist = $usergroup->listGroupsForUser($object->id);
-
-                if (! empty($groupslist))
-                {
-                    if (! (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode)))
-                    {
-                        foreach($groupslist as $groupforuser)
-                        {
-                            $exclude[]=$groupforuser->id;
-                        }
-                    }
-                }
-
-                if ($caneditgroup)
-                {
-                    print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'" method="POST">'."\n";
-                    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'" />';
-                    print '<input type="hidden" name="action" value="addgroup" />';
-                }
-                
-                print '<table class="noborder" width="100%">'."\n";
-                print '<tr class="liste_titre"><th class="liste_titre" width="25%">'.$langs->trans("Groups").'</th>'."\n";
-                if(! empty($conf->multicompany->enabled) && !empty($conf->multicompany->transverse_mode) && $conf->entity == 1 && $user->admin && ! $user->entity)
-                {
-                    print '<td class="liste_titre" width="25%">'.$langs->trans("Entity").'</td>';
-                }
-                print '<th align="right">';
-                if ($caneditgroup)
-                {
-                    print $form->select_dolgroups('', 'group', 1, $exclude, 0, '', '', $object->entity);
-                    print ' &nbsp; ';
-                    // Multicompany
-                    if (! empty($conf->multicompany->enabled))
-                    {
-                        if ($conf->entity == 1 && $conf->multicompany->transverse_mode)
-                        {
-                            print '</td><td>'.$langs->trans("Entity").'</td>';
-                            print "<td>".$mc->select_entities($conf->entity);
-                        }
-                        else
-                        {
-                            print '<input type="hidden" name="entity" value="'.$conf->entity.'" />';
-                        }
-                    }
-                    else
-                    {
-                    	print '<input type="hidden" name="entity" value="'.$conf->entity.'" />';
-                    }
-                    print '<input type="submit" class="button" value="'.$langs->trans("Add").'" />';
-                }
-                print '</th></tr>'."\n";
-
                 /*
-                 * Groups assigned to user
+                 * List of groups of user
                  */
-                if (! empty($groupslist))
+    
+                if ($canreadgroup)
                 {
-                    foreach($groupslist as $group)
+                    print load_fiche_titre($langs->trans("ListOfGroupsForUser"),'','');
+    
+                    // On selectionne les groupes auquel fait parti le user
+                    $exclude = array();
+    
+                    $usergroup=new UserGroup($db);
+                    $groupslist = $usergroup->listGroupsForUser($object->id);
+    
+                    if (! empty($groupslist))
                     {
-                        
-
-                        print '<tr class="oddeven">';
-                        print '<td>';
-                        if ($caneditgroup)
+                        if (! (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode)))
                         {
-                            print '<a href="'.DOL_URL_ROOT.'/user/group/card.php?id='.$group->id.'">'.img_object($langs->trans("ShowGroup"),"group").' '.$group->name.'</a>';
-                        }
-                        else
-                        {
-                            print img_object($langs->trans("ShowGroup"),"group").' '.$group->name;
-                        }
-                        print '</td>';
-                        if (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode) && $conf->entity == 1 && $user->admin && ! $user->entity)
-                        {
-                        	print '<td class="valeur">';
-                        	if (! empty($group->usergroup_entity))
-                        	{
-                        		$nb=0;
-                        		foreach($group->usergroup_entity as $group_entity)
-                        		{
-                        			$mc->getInfo($group_entity);
-                        			print ($nb > 0 ? ', ' : '').$mc->label;
-                        			print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=removegroup&amp;group='.$group->id.'&amp;entity='.$group_entity.'">';
-                        			print img_delete($langs->trans("RemoveFromGroup"));
-                        			print '</a>';
-                        			$nb++;
-                        		}
-                        	}
-                        }
-                        print '<td align="right">';
-                        if ($caneditgroup && empty($conf->multicompany->transverse_mode))
-                        {
-                            print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=removegroup&amp;group='.$group->id.'">';
-                            print img_delete($langs->trans("RemoveFromGroup"));
-                            print '</a>';
-                        }
-                        else
-                        {
-                            print "&nbsp;";
-                        }
-                        print "</td></tr>\n";
-                    }
-                }
-                else
-                {
-                    print '<tr '.$bc[false].'><td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
-                }
-
-                print "</table>";
-                
-                if ($caneditgroup)
-                {
-                    print '</form>';
-                }
-                print "<br>";
-            }
-    
-            /*
-             * Fiche en mode edition
-             */
-            if ($action == 'edit' && ($canedituser || $caneditfield || $caneditpassword || ($user->id == $object->id)))
-            {
-            	print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'" method="POST" name="updateuser" enctype="multipart/form-data">';
-                print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-                print '<input type="hidden" name="action" value="update">';
-                print '<input type="hidden" name="entity" value="'.$object->entity.'">';
-    
-                dol_fiche_head($head, 'user', $title, 0, 'user');
-    
-                print '<table width="100%" class="border">';
-    
-                // Ref/ID
-    			if (! empty($conf->global->MAIN_SHOW_TECHNICAL_ID))
-    			{
-    	            print '<tr><td>'.$langs->trans("Ref").'</td>';
-    	            print '<td>';
-    	            print $object->id;
-    	            print '</td>';
-    	            print '</tr>';
-    			}
-    
-                // Lastname
-                print "<tr>";
-                print '<td class="fieldrequired">'.$langs->trans("Lastname").'</td>';
-                print '<td>';
-                if ($caneditfield && !$object->ldap_sid)
-                {
-                    print '<input class="minwidth100" type="text" class="flat" name="lastname" value="'.$object->lastname.'">';
-                }
-                else
-                {
-                    print '<input type="hidden" name="lastname" value="'.$object->lastname.'">';
-                    print $object->lastname;
-                }
-                print '</td>';
-                print '</tr>';
-    
-                // Firstname
-                print "<tr>".'<td>'.$langs->trans("Firstname").'</td>';
-                print '<td>';
-                if ($caneditfield && !$object->ldap_sid)
-                {
-                    print '<input class="minwidth100" type="text" class="flat" name="firstname" value="'.$object->firstname.'">';
-                }
-                else
-                {
-                    print '<input type="hidden" name="firstname" value="'.$object->firstname.'">';
-                    print $object->firstname;
-                }
-                print '</td></tr>';
-    
-                // Employee
-                print '<tr>';
-                print '<td>'.fieldLabel('Employee','employee',0).'</td><td>';
-                print $form->selectyesno("employee",$object->employee,1);
-                print '</td></tr>';
-    
-                // Position/Job
-                print '<tr><td>'.$langs->trans("PostOrFunction").'</td>';
-                print '<td>';
-                if ($caneditfield)
-                {
-                	print '<input size="30" type="text" name="job" value="'.$object->job.'">';
-                }
-                else
-    			{
-                    print '<input type="hidden" name="job" value="'.$object->job.'">';
-              		print $object->job;
-                }
-                print '</td></tr>';
-    
-    		    // Gender
-        		print '<tr><td>'.$langs->trans("Gender").'</td>';
-        		print '<td>';
-        		$arraygender=array('man'=>$langs->trans("Genderman"),'woman'=>$langs->trans("Genderwoman"));
-        		print $form->selectarray('gender', $arraygender, GETPOST('gender')?GETPOST('gender'):$object->gender, 1);
-        		print '</td></tr>';
-    
-                // Login
-                print "<tr>".'<td><span class="fieldrequired">'.$langs->trans("Login").'</span></td>';
-                print '<td>';
-                if ($user->admin  && !$object->ldap_sid)
-                {
-                    print '<input size="12" maxlength="24" type="text" class="flat" name="login" value="'.$object->login.'">';
-                }
-                else
-                {
-                    print '<input type="hidden" name="login" value="'.$object->login.'">';
-                    print $object->login;
-                }
-                print '</td>';
-                print '</tr>';
-    
-                // Pass
-                print '<tr><td>'.$langs->trans("Password").'</td>';
-                print '<td>';
-                if ($object->ldap_sid)
-                {
-                    $text=$langs->trans("DomainPassword");
-                }
-                else if ($caneditpassword)
-                {
-                    $text='<input size="12" maxlength="32" type="password" class="flat" name="password" value="'.$object->pass.'" autocomplete="off">';
-                    if ($dolibarr_main_authentication && $dolibarr_main_authentication == 'http')
-                    {
-                        $text=$form->textwithpicto($text,$langs->trans("DolibarrInHttpAuthenticationSoPasswordUseless",$dolibarr_main_authentication),1,'warning');
-                    }
-                }
-                else
-                {
-                    $text=preg_replace('/./i','*',$object->pass);
-                }
-                print $text;
-                print "</td></tr>\n";
-    
-                // API key
-                if(! empty($conf->api->enabled) && $user->admin) {
-                    print '<tr><td>'.$langs->trans("ApiKey").'</td>';
-                    print '<td>';
-                    print '<input class="minwidth100" maxsize="32" type="text" id="api_key" name="api_key" value="'.$object->api_key.'" autocomplete="off">';
-                    if (! empty($conf->use_javascript_ajax))
-                        print '&nbsp;'.img_picto($langs->trans('Generate'), 'refresh', 'id="generate_api_key" class="linkobject"');
-                    print '</td></tr>';
-                }
-    
-                // Administrator
-                print '<tr><td>'.$langs->trans("Administrator").'</td>';
-                if ($object->societe_id > 0)
-                {
-                	$langs->load("admin");
-                    print '<td>';
-                    print '<input type="hidden" name="admin" value="'.$object->admin.'">'.yn($object->admin);
-                    print ' ('.$langs->trans("ExternalUser").')';
-                    print '</td></tr>';
-                }
-                else
-                {
-                    print '<td>';
-                    $nbAdmin = $user->getNbOfUsers('active','',1);
-                    $nbSuperAdmin = $user->getNbOfUsers('active','superadmin',1);
-                    //var_dump($nbAdmin);
-                    //var_dump($nbSuperAdmin);
-                    if ($user->admin								// Need to be admin to allow downgrade of an admin
-                    && ($user->id != $object->id)                   // Don't downgrade ourself
-                    && (
-                    	(empty($conf->multicompany->enabled) && $nbAdmin >= 1)
-                    	|| (! empty($conf->multicompany->enabled) && ($object->entity > 0 || $nbSuperAdmin > 1))    // Don't downgrade a superadmin if alone
-                    	)
-                    )
-                    {
-                        print $form->selectyesno('admin',$object->admin,1);
-    
-                        if (! empty($conf->multicompany->enabled) && ! $user->entity && empty($conf->multicompany->transverse_mode))
-                        {
-                            if ($conf->use_javascript_ajax)
+                            foreach($groupslist as $groupforuser)
                             {
-                                print '<script type="text/javascript">
-    									$(function() {
-    										var admin = $("select[name=admin]").val();
-    										if (admin == 0) {
-    											$("input[name=superadmin]")
-    													.prop("disabled", true)
-    													.prop("checked", false);
-    										}
-    										if ($("input[name=superadmin]").is(":checked")) {
-    											$("select[name=entity]")
-    													.prop("disabled", true);
-    										}
-    										$("select[name=admin]").change(function() {
-    											 if ( $(this).val() == 0 ) {
-    											 	$("input[name=superadmin]")
-    													.prop("disabled", true)
-    													.prop("checked", false);
-    											 	$("select[name=entity]")
-    													.prop("disabled", false);
-    											 } else {
-    											 	$("input[name=superadmin]")
-    													.prop("disabled", false);
-    											 }
-    										});
-    										$("input[name=superadmin]").change(function() {
-    											if ( $(this).is(":checked")) {
-    												$("select[name=entity]")
-    													.prop("disabled", true);
-    											} else {
-    												$("select[name=entity]")
-    													.prop("disabled", false);
-    											}
-    										});
-    									});
-    								</script>';
+                                $exclude[]=$groupforuser->id;
                             }
+                        }
+                    }
     
-                            $checked=(($object->admin && ! $object->entity) ? ' checked' : '');
-                            print '<input type="checkbox" name="superadmin" value="1"'.$checked.' /> '.$langs->trans("SuperAdministrator");
+                    if ($caneditgroup)
+                    {
+                        print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'" method="POST">'."\n";
+                        print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'" />';
+                        print '<input type="hidden" name="action" value="addgroup" />';
+                    }
+                    
+                    print '<table class="noborder" width="100%">'."\n";
+                    print '<tr class="liste_titre"><th class="liste_titre" width="25%">'.$langs->trans("Groups").'</th>'."\n";
+                    if(! empty($conf->multicompany->enabled) && !empty($conf->multicompany->transverse_mode) && $conf->entity == 1 && $user->admin && ! $user->entity)
+                    {
+                        print '<td class="liste_titre" width="25%">'.$langs->trans("Entity").'</td>';
+                    }
+                    print '<th align="right">';
+                    if ($caneditgroup)
+                    {
+                        print $form->select_dolgroups('', 'group', 1, $exclude, 0, '', '', $object->entity);
+                        print ' &nbsp; ';
+                        // Multicompany
+                        if (! empty($conf->multicompany->enabled))
+                        {
+                            if ($conf->entity == 1 && $conf->multicompany->transverse_mode)
+                            {
+                                print '</td><td>'.$langs->trans("Entity").'</td>';
+                                print "<td>".$mc->select_entities($conf->entity);
+                            }
+                            else
+                            {
+                                print '<input type="hidden" name="entity" value="'.$conf->entity.'" />';
+                            }
+                        }
+                        else
+                        {
+                        	print '<input type="hidden" name="entity" value="'.$conf->entity.'" />';
+                        }
+                        print '<input type="submit" class="button" value="'.$langs->trans("Add").'" />';
+                    }
+                    print '</th></tr>'."\n";
+    
+                    /*
+                     * Groups assigned to user
+                     */
+                    if (! empty($groupslist))
+                    {
+                        foreach($groupslist as $group)
+                        {
+                            
+    
+                            print '<tr class="oddeven">';
+                            print '<td>';
+                            if ($caneditgroup)
+                            {
+                                print '<a href="'.DOL_URL_ROOT.'/user/group/card.php?id='.$group->id.'">'.img_object($langs->trans("ShowGroup"),"group").' '.$group->name.'</a>';
+                            }
+                            else
+                            {
+                                print img_object($langs->trans("ShowGroup"),"group").' '.$group->name;
+                            }
+                            print '</td>';
+                            if (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode) && $conf->entity == 1 && $user->admin && ! $user->entity)
+                            {
+                            	print '<td class="valeur">';
+                            	if (! empty($group->usergroup_entity))
+                            	{
+                            		$nb=0;
+                            		foreach($group->usergroup_entity as $group_entity)
+                            		{
+                            			$mc->getInfo($group_entity);
+                            			print ($nb > 0 ? ', ' : '').$mc->label;
+                            			print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=removegroup&amp;group='.$group->id.'&amp;entity='.$group_entity.'">';
+                            			print img_delete($langs->trans("RemoveFromGroup"));
+                            			print '</a>';
+                            			$nb++;
+                            		}
+                            	}
+                            }
+                            print '<td align="right">';
+                            if ($caneditgroup && empty($conf->multicompany->transverse_mode))
+                            {
+                                print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=removegroup&amp;group='.$group->id.'">';
+                                print img_delete($langs->trans("RemoveFromGroup"));
+                                print '</a>';
+                            }
+                            else
+                            {
+                                print "&nbsp;";
+                            }
+                            print "</td></tr>\n";
                         }
                     }
                     else
                     {
-                        $yn = yn($object->admin);
-                        print '<input type="hidden" name="admin" value="'.$object->admin.'">';
-                        print '<input type="hidden" name="superadmin" value="'.(empty($object->entity) ? 1 : 0).'">';
-                        if (! empty($conf->multicompany->enabled) && empty($object->entity)) print $form->textwithpicto($yn,$langs->trans("DontDowngradeSuperAdmin"),1,'warning');
-                        else print $yn;
+                        print '<tr '.$bc[false].'><td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
                     }
-                    print '</td></tr>';
-                }
     
-               	// Type
-               	print '<tr><td>'.$langs->trans("Type").'</td>';
-               	print '<td>';
-               	if ($user->id == $object->id || ! $user->admin)
-               	{
-    	           	$type=$langs->trans("Internal");
-        	       	if ($object->societe_id) $type=$langs->trans("External");
-            	   	print $form->textwithpicto($type,$langs->trans("InternalExternalDesc"));
-    	           	if ($object->ldap_sid) print ' ('.$langs->trans("DomainUser").')';
-               	}
-               	else
-    			{
-    				$type=0;
-    	            if ($object->contact_id) $type=$object->contact_id;
-    	            print $form->selectcontacts(0,$type,'contactid',2,'','',1,'',false,1);
-    	           	if ($object->ldap_sid) print ' ('.$langs->trans("DomainUser").')';
-                }
-               	print '</td></tr>';
-    
-    			// Address
-                print '<tr><td class="tdtop">'.fieldLabel('Address','address').'</td>';
-    	        print '<td><textarea name="address" id="address" class="quatrevingtpercent" rows="3" wrap="soft">';
-                print $object->address;
-                print '</textarea></td></tr>';
-    
-                // Zip
-                print '<tr><td>'.fieldLabel('Zip','zipcode').'</td><td>';
-                print $formcompany->select_ziptown($object->zip, 'zipcode', array('town', 'selectcountry_id', 'state_id'), 6);
-                print '</td></tr>';
-    
-    			// Town
-    			print '<tr><td>'.fieldLabel('Town','town').'</td><td>';
-                print $formcompany->select_ziptown($object->town, 'town', array('zipcode', 'selectcountry_id', 'state_id'));
-                print '</td></tr>';
-    
-                // Country
-                print '<tr><td>'.fieldLabel('Country','selectcounty_id').'</td><td>';
-                print $form->select_country((GETPOST('country_id')!=''?GETPOST('country_id'):$object->country_id),'country_id');
-                if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
-                print '</td></tr>';
-    
-                // State
-                if (empty($conf->global->USER_DISABLE_STATE))
-                {
-                    print '<tr><td class="tdoverflow">'.fieldLabel('State','state_id').'</td><td>';
-                    print $formcompany->select_state($object->state_id,$object->country_code, 'state_id');
-                    print '</td></tr>';
-                }
-    
-                // Tel pro
-                print "<tr>".'<td>'.$langs->trans("PhonePro").'</td>';
-                print '<td>';
-                if ($caneditfield  && empty($object->ldap_sid))
-                {
-                    print '<input size="20" type="text" name="office_phone" class="flat" value="'.$object->office_phone.'">';
-                }
-                else
-                {
-                    print '<input type="hidden" name="office_phone" value="'.$object->office_phone.'">';
-                    print $object->office_phone;
-                }
-                print '</td></tr>';
-    
-                // Tel mobile
-                print "<tr>".'<td>'.$langs->trans("PhoneMobile").'</td>';
-                print '<td>';
-                if ($caneditfield && empty($object->ldap_sid))
-                {
-                    print '<input size="20" type="text" name="user_mobile" class="flat" value="'.$object->user_mobile.'">';
-                }
-                else
-                {
-                    print '<input type="hidden" name="user_mobile" value="'.$object->user_mobile.'">';
-                    print $object->user_mobile;
-                }
-                print '</td></tr>';
-    
-                // Fax
-                print "<tr>".'<td>'.$langs->trans("Fax").'</td>';
-                print '<td>';
-                if ($caneditfield  && empty($object->ldap_sid))
-                {
-                    print '<input size="20" type="text" name="office_fax" class="flat" value="'.$object->office_fax.'">';
-                }
-                else
-                {
-                    print '<input type="hidden" name="office_fax" value="'.$object->office_fax.'">';
-                    print $object->office_fax;
-                }
-                print '</td></tr>';
-    
-                // Skype
-                if (! empty($conf->skype->enabled))
-                {
-                    print '<tr><td>'.$langs->trans("Skype").'</td>';
-                    print '<td>';
-                    if ($caneditfield  && empty($object->ldap_sid))
+                    print "</table>";
+                    
+                    if ($caneditgroup)
                     {
-                        print '<input size="40" type="text" name="skype" class="flat" value="'.$object->skype.'">';
+                        print '</form>';
                     }
-                    else
-                    {
-                        print '<input type="hidden" name="skype" value="'.$object->skype.'">';
-                        print $object->skype;
-                    }
-                    print '</td></tr>';
+                    print "<br>";
                 }
-    
-                // EMail
-                print "<tr>".'<td'.(! empty($conf->global->USER_MAIL_REQUIRED)?' class="fieldrequired"':'').'>'.$langs->trans("EMail").'</td>';
-                print '<td>';
-                if ($caneditfield  && empty($object->ldap_sid))
+            }
+        }
+        
+        /*
+         * Fiche en mode edition
+         */
+        if ($action == 'edit' && ($canedituser || $caneditfield || $caneditpassword || ($user->id == $object->id)))
+        {
+        	print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'" method="POST" name="updateuser" enctype="multipart/form-data">';
+            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+            print '<input type="hidden" name="action" value="update">';
+            print '<input type="hidden" name="entity" value="'.$object->entity.'">';
+
+            dol_fiche_head($head, 'user', $title, 0, 'user');
+
+            print '<table width="100%" class="border">';
+
+            // Ref/ID
+			if (! empty($conf->global->MAIN_SHOW_TECHNICAL_ID))
+			{
+	            print '<tr><td>'.$langs->trans("Ref").'</td>';
+	            print '<td>';
+	            print $object->id;
+	            print '</td>';
+	            print '</tr>';
+			}
+
+            // Lastname
+            print "<tr>";
+            print '<td class="fieldrequired">'.$langs->trans("Lastname").'</td>';
+            print '<td>';
+            if ($caneditfield && !$object->ldap_sid)
+            {
+                print '<input class="minwidth100" type="text" class="flat" name="lastname" value="'.$object->lastname.'">';
+            }
+            else
+            {
+                print '<input type="hidden" name="lastname" value="'.$object->lastname.'">';
+                print $object->lastname;
+            }
+            print '</td>';
+            print '</tr>';
+
+            // Firstname
+            print "<tr>".'<td>'.$langs->trans("Firstname").'</td>';
+            print '<td>';
+            if ($caneditfield && !$object->ldap_sid)
+            {
+                print '<input class="minwidth100" type="text" class="flat" name="firstname" value="'.$object->firstname.'">';
+            }
+            else
+            {
+                print '<input type="hidden" name="firstname" value="'.$object->firstname.'">';
+                print $object->firstname;
+            }
+            print '</td></tr>';
+
+            // Employee
+            print '<tr>';
+            print '<td>'.fieldLabel('Employee','employee',0).'</td><td>';
+            print $form->selectyesno("employee",$object->employee,1);
+            print '</td></tr>';
+
+            // Position/Job
+            print '<tr><td>'.$langs->trans("PostOrFunction").'</td>';
+            print '<td>';
+            if ($caneditfield)
+            {
+            	print '<input size="30" type="text" name="job" value="'.$object->job.'">';
+            }
+            else
+			{
+                print '<input type="hidden" name="job" value="'.$object->job.'">';
+          		print $object->job;
+            }
+            print '</td></tr>';
+
+		    // Gender
+    		print '<tr><td>'.$langs->trans("Gender").'</td>';
+    		print '<td>';
+    		$arraygender=array('man'=>$langs->trans("Genderman"),'woman'=>$langs->trans("Genderwoman"));
+    		print $form->selectarray('gender', $arraygender, GETPOST('gender')?GETPOST('gender'):$object->gender, 1);
+    		print '</td></tr>';
+
+            // Login
+            print "<tr>".'<td><span class="fieldrequired">'.$langs->trans("Login").'</span></td>';
+            print '<td>';
+            if ($user->admin  && !$object->ldap_sid)
+            {
+                print '<input size="12" maxlength="24" type="text" class="flat" name="login" value="'.$object->login.'">';
+            }
+            else
+            {
+                print '<input type="hidden" name="login" value="'.$object->login.'">';
+                print $object->login;
+            }
+            print '</td>';
+            print '</tr>';
+
+            // Pass
+            print '<tr><td>'.$langs->trans("Password").'</td>';
+            print '<td>';
+            if ($object->ldap_sid)
+            {
+                $text=$langs->trans("DomainPassword");
+            }
+            else if ($caneditpassword)
+            {
+                $text='<input size="12" maxlength="32" type="password" class="flat" name="password" value="'.$object->pass.'" autocomplete="off">';
+                if ($dolibarr_main_authentication && $dolibarr_main_authentication == 'http')
                 {
-                    print '<input class="minwidth100" type="text" name="email" class="flat" value="'.$object->email.'">';
+                    $text=$form->textwithpicto($text,$langs->trans("DolibarrInHttpAuthenticationSoPasswordUseless",$dolibarr_main_authentication),1,'warning');
+                }
+            }
+            else
+            {
+                $text=preg_replace('/./i','*',$object->pass);
+            }
+            print $text;
+            print "</td></tr>\n";
+
+            // API key
+            if(! empty($conf->api->enabled) && $user->admin) 
+            {
+                print '<tr><td>'.$langs->trans("ApiKey").'</td>';
+                print '<td>';
+                print '<input class="minwidth300" maxsize="32" type="text" id="api_key" name="api_key" value="'.$object->api_key.'" autocomplete="off">';
+                if (! empty($conf->use_javascript_ajax))
+                    print '&nbsp;'.img_picto($langs->trans('Generate'), 'refresh', 'id="generate_api_key" class="linkobject"');
+                print '</td></tr>';
+            }
+
+            // Administrator
+            print '<tr><td>'.$langs->trans("Administrator").'</td>';
+            if ($object->societe_id > 0)
+            {
+            	$langs->load("admin");
+                print '<td>';
+                print '<input type="hidden" name="admin" value="'.$object->admin.'">'.yn($object->admin);
+                print ' ('.$langs->trans("ExternalUser").')';
+                print '</td></tr>';
+            }
+            else
+            {
+                print '<td>';
+                $nbAdmin = $user->getNbOfUsers('active','',1);
+                $nbSuperAdmin = $user->getNbOfUsers('active','superadmin',1);
+                //var_dump($nbAdmin);
+                //var_dump($nbSuperAdmin);
+                if ($user->admin								// Need to be admin to allow downgrade of an admin
+                && ($user->id != $object->id)                   // Don't downgrade ourself
+                && (
+                	(empty($conf->multicompany->enabled) && $nbAdmin >= 1)
+                	|| (! empty($conf->multicompany->enabled) && ($object->entity > 0 || $nbSuperAdmin > 1))    // Don't downgrade a superadmin if alone
+                	)
+                )
+                {
+                    print $form->selectyesno('admin',$object->admin,1);
+
+                    if (! empty($conf->multicompany->enabled) && ! $user->entity && empty($conf->multicompany->transverse_mode))
+                    {
+                        if ($conf->use_javascript_ajax)
+                        {
+                            print '<script type="text/javascript">
+									$(function() {
+										var admin = $("select[name=admin]").val();
+										if (admin == 0) {
+											$("input[name=superadmin]")
+													.prop("disabled", true)
+													.prop("checked", false);
+										}
+										if ($("input[name=superadmin]").is(":checked")) {
+											$("select[name=entity]")
+													.prop("disabled", true);
+										}
+										$("select[name=admin]").change(function() {
+											 if ( $(this).val() == 0 ) {
+											 	$("input[name=superadmin]")
+													.prop("disabled", true)
+													.prop("checked", false);
+											 	$("select[name=entity]")
+													.prop("disabled", false);
+											 } else {
+											 	$("input[name=superadmin]")
+													.prop("disabled", false);
+											 }
+										});
+										$("input[name=superadmin]").change(function() {
+											if ( $(this).is(":checked")) {
+												$("select[name=entity]")
+													.prop("disabled", true);
+											} else {
+												$("select[name=entity]")
+													.prop("disabled", false);
+											}
+										});
+									});
+								</script>';
+                        }
+
+                        $checked=(($object->admin && ! $object->entity) ? ' checked' : '');
+                        print '<input type="checkbox" name="superadmin" value="1"'.$checked.' /> '.$langs->trans("SuperAdministrator");
+                    }
                 }
                 else
                 {
-                    print '<input type="hidden" name="email" value="'.$object->email.'">';
-                    print $object->email;
+                    $yn = yn($object->admin);
+                    print '<input type="hidden" name="admin" value="'.$object->admin.'">';
+                    print '<input type="hidden" name="superadmin" value="'.(empty($object->entity) ? 1 : 0).'">';
+                    if (! empty($conf->multicompany->enabled) && empty($object->entity)) print $form->textwithpicto($yn,$langs->trans("DontDowngradeSuperAdmin"),1,'warning');
+                    else print $yn;
                 }
                 print '</td></tr>';
-    
-                // Signature
-                print "<tr>".'<td class="tdtop">'.$langs->trans("Signature").'</td>';
+            }
+
+           	// Type
+           	print '<tr><td>'.$langs->trans("Type").'</td>';
+           	print '<td>';
+           	if ($user->id == $object->id || ! $user->admin)
+           	{
+	           	$type=$langs->trans("Internal");
+    	       	if ($object->societe_id) $type=$langs->trans("External");
+        	   	print $form->textwithpicto($type,$langs->trans("InternalExternalDesc"));
+	           	if ($object->ldap_sid) print ' ('.$langs->trans("DomainUser").')';
+           	}
+           	else
+			{
+				$type=0;
+	            if ($object->contact_id) $type=$object->contact_id;
+	            print $form->selectcontacts(0,$type,'contactid',2,'','',1,'',false,1);
+	           	if ($object->ldap_sid) print ' ('.$langs->trans("DomainUser").')';
+            }
+           	print '</td></tr>';
+
+			// Address
+            print '<tr><td class="tdtop">'.fieldLabel('Address','address').'</td>';
+	        print '<td><textarea name="address" id="address" class="quatrevingtpercent" rows="3" wrap="soft">';
+            print $object->address;
+            print '</textarea></td></tr>';
+
+            // Zip
+            print '<tr><td>'.fieldLabel('Zip','zipcode').'</td><td>';
+            print $formcompany->select_ziptown($object->zip, 'zipcode', array('town', 'selectcountry_id', 'state_id'), 6);
+            print '</td></tr>';
+
+			// Town
+			print '<tr><td>'.fieldLabel('Town','town').'</td><td>';
+            print $formcompany->select_ziptown($object->town, 'town', array('zipcode', 'selectcountry_id', 'state_id'));
+            print '</td></tr>';
+
+            // Country
+            print '<tr><td>'.fieldLabel('Country','selectcounty_id').'</td><td>';
+            print $form->select_country((GETPOST('country_id')!=''?GETPOST('country_id'):$object->country_id),'country_id');
+            if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+            print '</td></tr>';
+
+            // State
+            if (empty($conf->global->USER_DISABLE_STATE))
+            {
+                print '<tr><td class="tdoverflow">'.fieldLabel('State','state_id').'</td><td>';
+                print $formcompany->select_state($object->state_id,$object->country_code, 'state_id');
+                print '</td></tr>';
+            }
+
+            // Tel pro
+            print "<tr>".'<td>'.$langs->trans("PhonePro").'</td>';
+            print '<td>';
+            if ($caneditfield  && empty($object->ldap_sid))
+            {
+                print '<input size="20" type="text" name="office_phone" class="flat" value="'.$object->office_phone.'">';
+            }
+            else
+            {
+                print '<input type="hidden" name="office_phone" value="'.$object->office_phone.'">';
+                print $object->office_phone;
+            }
+            print '</td></tr>';
+
+            // Tel mobile
+            print "<tr>".'<td>'.$langs->trans("PhoneMobile").'</td>';
+            print '<td>';
+            if ($caneditfield && empty($object->ldap_sid))
+            {
+                print '<input size="20" type="text" name="user_mobile" class="flat" value="'.$object->user_mobile.'">';
+            }
+            else
+            {
+                print '<input type="hidden" name="user_mobile" value="'.$object->user_mobile.'">';
+                print $object->user_mobile;
+            }
+            print '</td></tr>';
+
+            // Fax
+            print "<tr>".'<td>'.$langs->trans("Fax").'</td>';
+            print '<td>';
+            if ($caneditfield  && empty($object->ldap_sid))
+            {
+                print '<input size="20" type="text" name="office_fax" class="flat" value="'.$object->office_fax.'">';
+            }
+            else
+            {
+                print '<input type="hidden" name="office_fax" value="'.$object->office_fax.'">';
+                print $object->office_fax;
+            }
+            print '</td></tr>';
+
+            // Skype
+            if (! empty($conf->skype->enabled))
+            {
+                print '<tr><td>'.$langs->trans("Skype").'</td>';
+                print '<td>';
+                if ($caneditfield  && empty($object->ldap_sid))
+                {
+                    print '<input size="40" type="text" name="skype" class="flat" value="'.$object->skype.'">';
+                }
+                else
+                {
+                    print '<input type="hidden" name="skype" value="'.$object->skype.'">';
+                    print $object->skype;
+                }
+                print '</td></tr>';
+            }
+
+            // EMail
+            print "<tr>".'<td'.(! empty($conf->global->USER_MAIL_REQUIRED)?' class="fieldrequired"':'').'>'.$langs->trans("EMail").'</td>';
+            print '<td>';
+            if ($caneditfield  && empty($object->ldap_sid))
+            {
+                print '<input class="minwidth100" type="text" name="email" class="flat" value="'.$object->email.'">';
+            }
+            else
+            {
+                print '<input type="hidden" name="email" value="'.$object->email.'">';
+                print $object->email;
+            }
+            print '</td></tr>';
+
+            // OpenID url
+            if (isset($conf->file->main_authentication) && preg_match('/openid/',$conf->file->main_authentication) && ! empty($conf->global->MAIN_OPENIDURL_PERUSER))
+            {
+                print "<tr>".'<td>'.$langs->trans("OpenIDURL").'</td>';
                 print '<td>';
                 if ($caneditfield)
                 {
-    	            require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-    	            $doleditor=new DolEditor('signature',$object->signature,'',138,'dolibarr_mailings','In',false,true,empty($conf->global->FCKEDITOR_ENABLE_USERSIGN)?0:1,ROWS_4,'90%');
-    	            print $doleditor->Create(1);
+                    print '<input class="minwidth100" type="url" name="openid" class="flat" value="'.$object->openid.'">';
                 }
                 else
-    			{
-              		print dol_htmlentitiesbr($object->signature);
+                {
+                    print '<input type="hidden" name="openid" value="'.$object->openid.'">';
+                    print $object->openid;
                 }
                 print '</td></tr>';
-    
-                // OpenID url
-                if (isset($conf->file->main_authentication) && preg_match('/openid/',$conf->file->main_authentication) && ! empty($conf->global->MAIN_OPENIDURL_PERUSER))
-                {
-                    print "<tr>".'<td>'.$langs->trans("OpenIDURL").'</td>';
-                    print '<td>';
-                    if ($caneditfield)
-                    {
-                        print '<input class="minwidth100" type="url" name="openid" class="flat" value="'.$object->openid.'">';
-                    }
-                    else
-                  {
-                        print '<input type="hidden" name="openid" value="'.$object->openid.'">';
-                        print $object->openid;
-                    }
-                    print '</td></tr>';
-                }
-    
-                // Hierarchy
-                print '<tr><td>'.$langs->trans("HierarchicalResponsible").'</td>';
+            }
+
+            // Accountancy code
+            if ($conf->accounting->enabled)
+            {
+                print "<tr>";
+                print '<td>'.$langs->trans("AccountancyCode").'</td>';
                 print '<td>';
                 if ($caneditfield)
                 {
-                	print $form->select_dolusers($object->fk_user, 'fk_user', 1, array($object->id), 0, '', 0, $object->entity, 0, 0, '', 0, '', 'maxwidth300');
+                				print '<input size="30" type="text" class="flat" name="accountancy_code" value="'.$object->accountancy_code.'">';
                 }
                 else
                 {
-              		print '<input type="hidden" name="fk_user" value="'.$object->fk_user.'">';
-                	$huser=new User($db);
-                	$huser->fetch($object->fk_user);
-                	print $huser->getNomUrl(1);
+                				print '<input type="hidden" name="accountancy_code" value="'.$object->accountancy_code.'">';
+                				print $object->accountancy_code;
                 }
                 print '</td>';
-                print "</tr>\n";
-    
-                if (! empty($conf->salaries->enabled) && ! empty($user->rights->salaries->read))
-                {
-                	$langs->load("salaries");
-    
-                	// THM
-    			    print '<tr><td>';
-    			    $text=$langs->trans("THM");
-    			    print $form->textwithpicto($text, $langs->trans("THMDescription"), 1, 'help', 'classthm');
-    			    print '</td>';
-    			    print '<td>';
-    			    print '<input size="8" type="text" name="thm" value="'.price2num(GETPOST('thm')?GETPOST('thm'):$object->thm).'">';
-    			    print '</td>';
-    			    print "</tr>\n";
-    
-    			    // TJM
-    			    print '<tr><td>';
-    			    $text=$langs->trans("TJM");
-    			    print $form->textwithpicto($text, $langs->trans("TJMDescription"), 1, 'help', 'classthm');
-    			    print '</td>';
-    			    print '<td>';
-    			    print '<input size="8" type="text" name="tjm" value="'.price2num(GETPOST('tjm')?GETPOST('tjm'):$object->tjm).'">';
-    			    print '</td>';
-    			    print "</tr>\n";
-    
-    			    // Salary
-    			    print '<tr><td>'.$langs->trans("Salary").'</td>';
-    			    print '<td>';
-    			    print '<input size="8" type="text" name="salary" value="'.price2num(GETPOST('salary')?GETPOST('salary'):$object->salary).'">';
-    			    print '</td>';
-    			    print "</tr>\n";
-                }
-    
-    		    // Weeklyhours
-    		    print '<tr><td>'.$langs->trans("WeeklyHours").'</td>';
-    		    print '<td>';
-    		    print '<input size="8" type="text" name="weeklyhours" value="'.price2num(GETPOST('weeklyhours')?GETPOST('weeklyhours'):$object->weeklyhours).'">';
-    		    print '</td>';
-    		    print "</tr>\n";
-    
-    		    // Date employment
-    		    print '<tr><td>'.$langs->trans("DateEmployment").'</td>';
-    		    print '<td>';
-    			echo $form->select_date(GETPOST('dateemployment')?GETPOST('dateemployment'):$object->dateemployment,'dateemployment',0,0,1,'form'.'dateemployment',1,0,1);
-    			print '</td>';
-    		    print "</tr>\n";
-    
-    		    // Accountancy code
-    			if ($conf->accounting->enabled)
-        		{
-    			print "<tr>";
-    			print '<td>'.$langs->trans("AccountancyCode").'</td>';
-    			print '<td>';
-    			if ($caneditfield)
-    			{
-    				print '<input size="30" type="text" class="flat" name="accountancy_code" value="'.$object->accountancy_code.'">';
-    			}
-    			else
-    			{
-    				print '<input type="hidden" name="accountancy_code" value="'.$object->accountancy_code.'">';
-    				print $object->accountancy_code;
-    			}
-    			print '</td>';
-    			print "</tr>";
-    		}
-    
+                print "</tr>";
+            }
+            
+            // Hierarchy
+            print '<tr><td>'.$langs->trans("HierarchicalResponsible").'</td>';
+            print '<td>';
+            if ($caneditfield)
+            {
+            	print $form->select_dolusers($object->fk_user, 'fk_user', 1, array($object->id), 0, '', 0, $object->entity, 0, 0, '', 0, '', 'maxwidth300');
+            }
+            else
+            {
+          		print '<input type="hidden" name="fk_user" value="'.$object->fk_user.'">';
+            	$huser=new User($db);
+            	$huser->fetch($object->fk_user);
+            	print $huser->getNomUrl(1);
+            }
+            print '</td>';
+            print "</tr>\n";
+
+            if ((! empty($conf->salaries->enabled) && ! empty($user->rights->salaries->read))
+               || (! empty($conf->hrm->enabled) && ! empty($user->rights->hrm->employee->read)))
+            {
+            	$langs->load("salaries");
+
+            	// THM
+			    print '<tr><td>';
+			    $text=$langs->trans("THM");
+			    print $form->textwithpicto($text, $langs->trans("THMDescription"), 1, 'help', 'classthm');
+			    print '</td>';
+			    print '<td>';
+			    print '<input size="8" type="text" name="thm" value="'.price2num(GETPOST('thm')?GETPOST('thm'):$object->thm).'">';
+			    print '</td>';
+			    print "</tr>\n";
+
+			    // TJM
+			    print '<tr><td>';
+			    $text=$langs->trans("TJM");
+			    print $form->textwithpicto($text, $langs->trans("TJMDescription"), 1, 'help', 'classthm');
+			    print '</td>';
+			    print '<td>';
+			    print '<input size="8" type="text" name="tjm" value="'.price2num(GETPOST('tjm')?GETPOST('tjm'):$object->tjm).'">';
+			    print '</td>';
+			    print "</tr>\n";
+
+			    // Salary
+			    print '<tr><td>'.$langs->trans("Salary").'</td>';
+			    print '<td>';
+			    print '<input size="8" type="text" name="salary" value="'.price2num(GETPOST('salary')?GETPOST('salary'):$object->salary).'">';
+			    print '</td>';
+			    print "</tr>\n";
+            }
+
+		    // Weeklyhours
+		    print '<tr><td>'.$langs->trans("WeeklyHours").'</td>';
+		    print '<td>';
+		    print '<input size="8" type="text" name="weeklyhours" value="'.price2num(GETPOST('weeklyhours')?GETPOST('weeklyhours'):$object->weeklyhours).'">';
+		    print '</td>';
+		    print "</tr>\n";
+
+		    // Date employment
+		    print '<tr><td>'.$langs->trans("DateEmployment").'</td>';
+		    print '<td>';
+			echo $form->select_date(GETPOST('dateemployment')?GETPOST('dateemployment'):$object->dateemployment,'dateemployment',0,0,1,'form'.'dateemployment',1,0,1);
+			print '</td>';
+		    print "</tr>\n";
+
     		// User color
     		if (! empty($conf->agenda->enabled))
     	    {
@@ -2461,6 +2452,21 @@ else
             	print $object->showOptionals($extrafields,'edit');
             }
 
+            // Signature
+            print "<tr>".'<td class="tdtop">'.$langs->trans("Signature").'</td>';
+            print '<td>';
+            if ($caneditfield)
+            {
+                require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+                $doleditor=new DolEditor('signature',$object->signature,'',138,'dolibarr_mailings','In',false,true,empty($conf->global->FCKEDITOR_ENABLE_USERSIGN)?0:1,ROWS_4,'90%');
+                print $doleditor->Create(1);
+            }
+            else
+            {
+                print dol_htmlentitiesbr($object->signature);
+            }
+            print '</td></tr>';
+            
             print '</table>';
 
             dol_fiche_end();
@@ -2501,8 +2507,6 @@ else
             
             
             print '</div></div></div>';
-        }
-        
         }
         
 		if (! empty($conf->ldap->enabled) && ! empty($object->ldap_sid)) $ldap->close();

From 4e7353f8a0525448aff1884580b0171f83bdcef0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 19 May 2017 13:39:00 +0200
Subject: [PATCH 408/505] Clean code

---
 htdocs/core/lib/usergroups.lib.php        |  7 ++---
 htdocs/core/modules/modHRM.class.php      |  2 +-
 htdocs/core/modules/modSalaries.class.php |  2 +-
 htdocs/hrm/admin/admin_establishment.php  |  2 +-
 htdocs/hrm/admin/admin_hrm.php            |  2 +-
 htdocs/hrm/class/establishment.class.php  |  2 ++
 htdocs/hrm/establishment/info.php         |  2 +-
 htdocs/langs/en_US/admin.lang             |  6 ++---
 htdocs/langs/en_US/main.lang              |  1 +
 htdocs/user/bank.php                      | 31 ++++++++++++++++-------
 htdocs/user/card.php                      | 10 +++++---
 11 files changed, 44 insertions(+), 23 deletions(-)

diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php
index f48974acb02..3086e7d264a 100644
--- a/htdocs/core/lib/usergroups.lib.php
+++ b/htdocs/core/lib/usergroups.lib.php
@@ -141,16 +141,17 @@ function user_prepare_head($object)
     // $this->tabs = array('entity:-tabname);   												to remove a tab
     complete_head_from_modules($conf,$langs,$object,$head,$h,'user');
 
-	if (! empty($conf->hrm->enabled) && $user->rights->hrm->employee->read)
+    if ((! empty($conf->salaries->enabled) && ! empty($user->rights->salaries->read))
+       || (! empty($conf->hrm->enabled) && ! empty($user->rights->hrm->employee->read)))
     {
 		// Bank
     	$head[$h][0] = DOL_URL_ROOT.'/user/bank.php?id='.$object->id;
-    	$head[$h][1] = $langs->trans("HR");
+    	$head[$h][1] = $langs->trans("HRAndBank");
     	$head[$h][2] = 'bank';
     	$h++;
 	}
 
-    //Info on users is visible only by internal user
+    // Such info on users is visible only by internal user
     if (empty($user->societe_id))
     {
 		// Notes
diff --git a/htdocs/core/modules/modHRM.class.php b/htdocs/core/modules/modHRM.class.php
index 74a0107aedb..3d1ea43f63c 100644
--- a/htdocs/core/modules/modHRM.class.php
+++ b/htdocs/core/modules/modHRM.class.php
@@ -45,7 +45,7 @@ class modHRM extends DolibarrModules
 		$this->family = "hr";
 		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
 		$this->name = preg_replace( '/^mod/i', '', get_class($this));
-		$this->description = "Management of employees carrier and feelings";
+		$this->description = "Management of employees carrier and feelings (department, employment contract)";
 		
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
 		$this->version = 'development';
diff --git a/htdocs/core/modules/modSalaries.class.php b/htdocs/core/modules/modSalaries.class.php
index a1f4753b12d..d5e982bcccc 100644
--- a/htdocs/core/modules/modSalaries.class.php
+++ b/htdocs/core/modules/modSalaries.class.php
@@ -54,7 +54,7 @@ class modSalaries extends DolibarrModules
 		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
 		$this->name = preg_replace('/^mod/i','',get_class($this));
 		// Module description used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
-		$this->description = "Employees contracts and salaries management";
+		$this->description = "Payment of salaries";
 
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
 		$this->version = 'dolibarr';
diff --git a/htdocs/hrm/admin/admin_establishment.php b/htdocs/hrm/admin/admin_establishment.php
index 291169aa30d..1f1e9e53f73 100644
--- a/htdocs/hrm/admin/admin_establishment.php
+++ b/htdocs/hrm/admin/admin_establishment.php
@@ -74,7 +74,7 @@ print load_fiche_titre($langs->trans("HRMSetup"), $linkback);
 
 // Configuration header
 $head = hrm_admin_prepare_head();
-dol_fiche_head($head, 'establishments', $langs->trans("HRM"), 0, "user");
+dol_fiche_head($head, 'establishments', $langs->trans("HRM"), -1, "user");
 
 $sql = "SELECT e.rowid, e.name, e.address, e.zip, e.town, e.status";
 $sql.= " FROM ".MAIN_DB_PREFIX."establishment as e";
diff --git a/htdocs/hrm/admin/admin_hrm.php b/htdocs/hrm/admin/admin_hrm.php
index 7f9ed583b98..f488eb562e5 100644
--- a/htdocs/hrm/admin/admin_hrm.php
+++ b/htdocs/hrm/admin/admin_hrm.php
@@ -78,7 +78,7 @@ print '<form action="' . $_SERVER["PHP_SELF"] . '" method="post">';
 print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
 print '<input type="hidden" name="action" value="update">';
 
-dol_fiche_head($head, 'parameters', $langs->trans("HRM"), 0, "user");
+dol_fiche_head($head, 'parameters', $langs->trans("HRM"), -1, "user");
 
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
diff --git a/htdocs/hrm/class/establishment.class.php b/htdocs/hrm/class/establishment.class.php
index a171a111889..d449af14972 100644
--- a/htdocs/hrm/class/establishment.class.php
+++ b/htdocs/hrm/class/establishment.class.php
@@ -96,6 +96,7 @@ class Establishment extends CommonObject
 		$sql.= ", entity";
 		$sql.= ", datec";
 		$sql.= ", fk_user_author";
+		$sql.= ", fk_user_mod";
 		$sql.= ") VALUES (";
 		$sql.= " '".$this->db->escape($this->name)."'";
 		$sql.= ", '".$this->db->escape($this->address)."'";
@@ -106,6 +107,7 @@ class Establishment extends CommonObject
 		$sql.= ", ".$conf->entity;
 		$sql.= ", '".$this->db->idate($now)."'";
 		$sql.= ", ". $user->id;
+		$sql.= ", ". $user->id;
 		$sql.= ")";
 
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
diff --git a/htdocs/hrm/establishment/info.php b/htdocs/hrm/establishment/info.php
index 1ef523fa607..29b571e58ce 100644
--- a/htdocs/hrm/establishment/info.php
+++ b/htdocs/hrm/establishment/info.php
@@ -44,7 +44,7 @@ if ($id)
 
 	$head = establishment_prepare_head($object);
 
-	dol_fiche_head($head, 'info', $langs->trans("Establishment"), 0, 'building');
+	dol_fiche_head($head, 'info', $langs->trans("Establishment"), -1, 'building');
 
     print '<table width="100%"><tr><td>';
     dol_print_object_info($object);
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 1c9ac65e4b8..be7451caffa 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -519,8 +519,8 @@ Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
 Module500Name=Special expenses
 Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
-Module510Name=Employee contracts and salaries
-Module510Desc=Management of employees contracts, salaries and payments
+Module510Name=Payment of employee wages
+Module510Desc=Record and follow payment of your employee wages
 Module520Name=Loan
 Module520Desc=Management of loans
 Module600Name=Notifications
@@ -563,7 +563,7 @@ Module2900Desc=GeoIP Maxmind conversions capabilities
 Module3100Name=Skype
 Module3100Desc=Add a Skype button into users / third parties / contacts / members cards
 Module4000Name=HRM
-Module4000Desc=Human resources management
+Module4000Desc=Human resources management (mangement of department, employee contracts and feelings)
 Module5000Name=Multi-company
 Module5000Desc=Allows you to manage multiple companies
 Module6000Name=Workflow
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index a5f2ddf1e7e..01aa5537c13 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -772,6 +772,7 @@ SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
 HR=HR
+HRAndBank=HR and Bank
 # Week day
 Monday=Monday
 Tuesday=Tuesday
diff --git a/htdocs/user/bank.php b/htdocs/user/bank.php
index c86ca27bf34..939f7c35aa7 100644
--- a/htdocs/user/bank.php
+++ b/htdocs/user/bank.php
@@ -24,7 +24,7 @@
 /**
  *	    \file       htdocs/user/bank.php
  *      \ingroup    HRM
- *		\brief      BAN tab for users
+ *		\brief      Tab for HRM
  */
 
 require '../main.inc.php';
@@ -47,7 +47,7 @@ $socid=0;
 if ($user->societe_id > 0) $socid = $user->societe_id;
 $feature2 = (($socid && $user->rights->user->self->creer)?'':'user');
 if ($user->id == $id) $feature2=''; // A user can always read its own card
-$result = restrictedArea($user, 'user', $id, 'user&user', $feature2);
+$result = restrictedArea($user, 'salaries|hrm', $id, 'user&user', $feature2);
 
 $object = new User($db);
 if ($id > 0 || ! empty($ref))
@@ -155,14 +155,27 @@ if ($account->id && $action != 'edit')
         
     print '<div class="fichecenter">';
 
+    print '<div class="underbanner clearboth"></div>';
+    
+    print '<table class="border centpercent">';
+    
+    print '<tr><td class="titlefield">'.$langs->trans("xxx").'</td>';
+    print '<td></td></tr>';
+    
+    print '</table>';
+    
+    print '</br>';
+    
+    print load_fiche_titre($langs->trans("BAN"));
+    
     print '<div class="underbanner clearboth"></div>';
     print '<table class="border centpercent">';
 
     print '<tr><td class="titlefield">'.$langs->trans("LabelRIB").'</td>';
-    print '<td colspan="4">'.$account->label.'</td></tr>';
+    print '<td>'.$account->label.'</td></tr>';
 
 	print '<tr><td>'.$langs->trans("BankName").'</td>';
-	print '<td colspan="4">'.$account->bank.'</td></tr>';
+	print '<td>'.$account->bank.'</td></tr>';
 
 	// Show fields of bank account
 	foreach ($account->getFieldsToShow() as $val) {
@@ -182,7 +195,7 @@ if ($account->id && $action != 'edit')
 	}
 
 	print '<tr><td class="tdtop">'.$langs->trans("IBAN").'</td>';
-	print '<td colspan="4">'.$account->iban . '&nbsp;';
+	print '<td>'.$account->iban . '&nbsp;';
     if (! empty($account->iban)) {
         if (! checkIbanForAccount($account)) {
             print img_picto($langs->trans("IbanNotValid"),'warning');
@@ -193,7 +206,7 @@ if ($account->id && $action != 'edit')
     print '</td></tr>';
 
 	print '<tr><td class="tdtop">'.$langs->trans("BIC").'</td>';
-	print '<td colspan="4">'.$account->bic.'&nbsp;';
+	print '<td>'.$account->bic.'&nbsp;';
     if (! empty($account->bic)) {
         if (! checkSwiftForAccount($account)) {
             print img_picto($langs->trans("SwiftNotValid"),'warning');
@@ -203,15 +216,15 @@ if ($account->id && $action != 'edit')
     }
     print '</td></tr>';
 
-	print '<tr><td class="tdtop">'.$langs->trans("BankAccountDomiciliation").'</td><td colspan="4">';
+	print '<tr><td class="tdtop">'.$langs->trans("BankAccountDomiciliation").'</td><td>';
 	print $account->domiciliation;
 	print "</td></tr>\n";
 
-	print '<tr><td class="tdtop">'.$langs->trans("BankAccountOwner").'</td><td colspan="4">';
+	print '<tr><td class="tdtop">'.$langs->trans("BankAccountOwner").'</td><td>';
 	print $account->proprio;
 	print "</td></tr>\n";
 
-	print '<tr><td class="tdtop">'.$langs->trans("BankAccountOwnerAddress").'</td><td colspan="4">';
+	print '<tr><td class="tdtop">'.$langs->trans("BankAccountOwnerAddress").'</td><td>';
 	print $account->owner_address;
 	print "</td></tr>\n";
 
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 9249e8f295e..92951de98e8 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -1028,6 +1028,8 @@ if (($action == 'create') || ($action == 'adduserldap'))
         print '</td></tr>';
     }
     
+    // TODO Move this into tab RH (HierarchicalResponsible must be on both tab)
+    
     // Hierarchy
     print '<tr><td>'.$langs->trans("HierarchicalResponsible").'</td>';
     print '<td>';
@@ -1264,7 +1266,7 @@ else
          */
         if ($action != 'edit')
         {
-			dol_fiche_head($head, 'user', $title, 0, 'user');
+			dol_fiche_head($head, 'user', $title, -1, 'user');
 
             dol_banner_tab($object,'id',$linkback,$user->rights->user->user->lire || $user->admin);
 
@@ -1386,8 +1388,8 @@ else
                 print '<td>'.$object->accountancy_code.'</td></tr>';
             }
             
-            // TODO Move this into RH Tab (visible if RH module on)
-            
+            // TODO Move this into tab RH, visible when salarie or RH is visible (HierarchicalResponsible must be on both tab)
+
             // Hierarchy
             print '<tr><td>'.$langs->trans("HierarchicalResponsible").'</td>';
             print '<td>';
@@ -2279,6 +2281,8 @@ else
                 print "</tr>";
             }
             
+            // TODO Move this into tab RH (HierarchicalResponsible must be on both tab)
+            
             // Hierarchy
             print '<tr><td>'.$langs->trans("HierarchicalResponsible").'</td>';
             print '<td>';

From 30cedd154ef5737e717ff13bdd9b7c18ef22a324 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 19 May 2017 15:34:38 +0200
Subject: [PATCH 409/505] Fix default value must apply only if
 restore_lastsearch_values is on

---
 htdocs/core/lib/functions.lib.php | 49 +++++++++++++++----------------
 1 file changed, 23 insertions(+), 26 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 4e17c62d3f5..09856131da7 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -280,8 +280,24 @@ function GETPOST($paramname, $check='', $method=0, $filter=NULL, $options=NULL)
     	$relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
     	$relativepathstring = preg_replace('/^\//', '', $relativepathstring);
 	
-	    // Management of default values
-	    if (! isset($_GET['sortfield']) && ! empty($conf->global->MAIN_ENABLE_DEFAULT_VALUES))	// If we did a click on a field to sort, we do no apply default values. Same if option MAIN_ENABLE_DEFAULT_VALUES is not set
+    	// Retrieve values if restore_lastsearch_values is set and there is saved values
+    	if ($_GET['restore_lastsearch_values'] && ! empty($_SESSION['lastsearch_values_'.$relativepathstring]))        // Keep $_GET here
+    	{
+	        $tmp=json_decode($_SESSION['lastsearch_values_'.$relativepathstring], true);
+	        if (is_array($tmp))
+	        {
+	            foreach($tmp as $key => $val)
+	            {
+	                if ($key == $paramname)
+	                {
+	                    $out=$val;
+	                    break;
+	                }
+	            }
+	        }
+    	}
+	    // Else, retreive default values if we are not doing a sort
+	    elseif (! isset($_GET['sortfield']) && ! empty($conf->global->MAIN_ENABLE_DEFAULT_VALUES))	// If we did a click on a field to sort, we do no apply default values. Same if option MAIN_ENABLE_DEFAULT_VALUES is not set
 	    {
 	        if (! empty($_GET['action']) && $_GET['action'] == 'create' && ! isset($_GET[$paramname]) && ! isset($_POST[$paramname]))
 	        {
@@ -331,26 +347,6 @@ function GETPOST($paramname, $check='', $method=0, $filter=NULL, $options=NULL)
 	        }
 	    }
 	    
-	    // Retrieve values into restore_lastsearch_values
-	    if ($_GET['restore_lastsearch_values'])        // Keep $_GET here
-	    {
-	        if (! empty($_SESSION['lastsearch_values_'.$relativepathstring]))
-	        {
-	            $tmp=json_decode($_SESSION['lastsearch_values_'.$relativepathstring], true);
-	            if (is_array($tmp))
-	            {
-    	            foreach($tmp as $key => $val)
-    	            {
-        	           if ($key == $paramname)
-        	           {
-    	                   $out=$val;
-    	                   break;
-        	           }
-    	            }
-	            }
-	        }
-	    }
-	    
 	}	
 	
 	if (empty($check) && ! empty($conf->global->MAIN_FEATURES_LEVEL) && $conf->global->MAIN_FEATURES_LEVEL >= 2)
@@ -455,13 +451,14 @@ function GETPOST($paramname, $check='', $method=0, $filter=NULL, $options=NULL)
 	    //if (preg_match('/^search_/', $paramname) || in_array($paramname, array('sortorder', 'sortfield", 'smonth', 'syear', 'month', 'year')))
 	    if (preg_match('/^search_/', $paramname) || in_array($paramname, array('sortorder','sortfield')))
 	    {
-	        //var_dump($user->default_values[$relativepathstring]);exit;
-	        //if ($paramname == 'sortorder') var_dump($paramname.' - '.$out);
-	        
+	        //var_dump($paramname.' - '.$out.' '.$user->default_values[$relativepathstring]['filters'][$paramname]);
+
 	        // We save search key only if:
 	        // - not empty, or
 	        // - if value is empty and a default value exists that is not empty (it means we did a filter to an empty value when default was not).
-	        if (! empty($out) || ! empty($user->default_values[$relativepathstring][$paramname]))
+	        
+	        //if (! empty($out) || ! empty($user->default_values[$relativepathstring]['filters'][$paramname]))
+	        if (! empty($out))
 	        {
                 $user->lastsearch_values_tmp[$relativepathstring][$paramname]=$out;
 	        }

From 470165615f49805053a46a3c79fcb1ea1c5ee0b0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 19 May 2017 16:32:23 +0200
Subject: [PATCH 410/505] Fix look and feel v6

---
 htdocs/commande/card.php                      |  22 +-
 htdocs/hrm/admin/admin_establishment.php      |   2 +-
 htdocs/hrm/class/establishment.class.php      |  27 +-
 htdocs/hrm/establishment/card.php             | 184 +++++-----
 .../modulebuilder/skeletons/skeleton_card.php | 313 ++++++++++++++++--
 5 files changed, 405 insertions(+), 143 deletions(-)

diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index fe91f0b6ff8..d06e03a48e7 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -1327,13 +1327,7 @@ $formorder = new FormOrder($db);
 $formmargin = new FormMargin($db);
 if (! empty($conf->projet->enabled)) { $formproject = new FormProjets($db); }
 
-/**
- * *******************************************************************
- *
- * Mode creation
- *
- * *******************************************************************
- */
+// Mode creation
 if ($action == 'create' && $user->rights->commande->creer)
 {
 	print load_fiche_titre($langs->trans('CreateOrder'),'','title_commercial.png');
@@ -1501,9 +1495,7 @@ if ($action == 'create' && $user->rights->commande->creer)
 	}
 	print '</tr>' . "\n";
 
-	/*
-	 * Contact de la commande
-	 */
+	// Contact of order
 	if ($socid > 0) {
 		print "<tr><td>" . $langs->trans("DefaultContact") . '</td><td colspan="2">';
 		$form->select_contacts($soc->id, $setcontact, 'contactid', 1, $srccontactslist);
@@ -1748,11 +1740,7 @@ if ($action == 'create' && $user->rights->commande->creer)
 		print '</table>';
 	}
 } else {
-	/* *************************************************************************** */
-	/*                                                                             */
-	/* Mode vue et edition                                                         */
-	/*                                                                             */
-	/* *************************************************************************** */
+	// Mode view
 	$now = dol_now();
 
 	if ($object->id > 0) {
@@ -2447,8 +2435,8 @@ if ($action == 'create' && $user->rights->commande->creer)
 		dol_fiche_end();
 
 		/*
-		 * Boutons actions
-		*/
+		 * Buttons for actions
+		 */
 		if ($action != 'presend' && $action != 'editline') {
 			print '<div class="tabsAction">';
 
diff --git a/htdocs/hrm/admin/admin_establishment.php b/htdocs/hrm/admin/admin_establishment.php
index 1f1e9e53f73..091a2a15f06 100644
--- a/htdocs/hrm/admin/admin_establishment.php
+++ b/htdocs/hrm/admin/admin_establishment.php
@@ -120,7 +120,7 @@ if ($result)
 			print '<td align="left">'.$obj->town.'</td>';
 
             print '<td align="right">';
-			print $establishmentstatic->getLibStatus(5);
+			print $establishmentstatic->getLibStatut(5);
 			print '</td>';
             print "</tr>\n";
 
diff --git a/htdocs/hrm/class/establishment.class.php b/htdocs/hrm/class/establishment.class.php
index d449af14972..413cb0cb584 100644
--- a/htdocs/hrm/class/establishment.class.php
+++ b/htdocs/hrm/class/establishment.class.php
@@ -33,8 +33,10 @@ class Establishment extends CommonObject
 	public $table_element_line = '';
 	public $fk_element = 'fk_establishment';
 	protected $ismultientitymanaged = 1;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
-
-	public $id;
+    public $picto='building';
+    
+    public $id;
+    public $ref;
 	public $rowid;
 
 	public $name;
@@ -160,7 +162,7 @@ class Establishment extends CommonObject
 		$sql .= ", zip = '".$this->db->escape($this->zip)."'";
 		$sql .= ", town = '".$this->db->escape($this->town)."'";
 		$sql .= ", fk_country = ".($this->country_id > 0 ? $this->country_id : 'null');
-		$sql .= ", status = '".$this->db->escape($this->status)."'";
+		$sql .= ", status = ".$this->db->escape($this->status);
 		$sql .= ", fk_user_mod = " . $user->id;
 		$sql .= " WHERE rowid = ".$this->id;
 
@@ -197,6 +199,7 @@ class Establishment extends CommonObject
 			$obj = $this->db->fetch_object($result);
 
 			$this->id			= $obj->rowid;
+			$this->ref			= $obj->rowid;
 			$this->name			= $obj->name;
 			$this->address		= $obj->address;
 			$this->zip			= $obj->zip;
@@ -249,9 +252,9 @@ class Establishment extends CommonObject
 	 * @param	int		$mode   	0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto
 	 * @return  string   		   	Label
 	 */
-	function getLibStatus($mode=0)
+	function getLibStatut($mode=0)
 	{
-		return $this->LibStatus($this->status,$mode);
+		return $this->LibStatut($this->status,$mode);
 	}
 
 	/**
@@ -261,7 +264,7 @@ class Establishment extends CommonObject
 	 *  @param  int		$mode       0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto
 	 *  @return string      		Label
 	 */
-	function LibStatus($status,$mode=0)
+	function LibStatut($status,$mode=0)
 	{
 		global $langs;
 
@@ -383,4 +386,16 @@ class Establishment extends CommonObject
 
         return '';
     }
+    
+    /**
+     * Initialise object with example values
+     * Id must be 0 if object instance is a specimen
+     *
+     * @return void
+     */
+    public function initAsSpecimen()
+    {
+        $this->id = 0;
+        $this->ref = 'DEAAA';
+    }    
 }
diff --git a/htdocs/hrm/establishment/card.php b/htdocs/hrm/establishment/card.php
index eafa302886f..3a08ae197a2 100644
--- a/htdocs/hrm/establishment/card.php
+++ b/htdocs/hrm/establishment/card.php
@@ -140,7 +140,8 @@ else if ($action == 'update')
 			$object->town			= GETPOST('town', 'alpha');
 			$object->country_id     = GETPOST('country_id', 'int');
 			$object->fk_user_mod	= $user->id;
-
+			$object->status         = GETPOST('status','int');
+			
 			$result = $object->update($user);
 
             if ($result > 0)
@@ -184,13 +185,13 @@ if ($action == 'create')
     print '<table class="border" width="100%">';
 
 	// Name
-    print '<tr><td>'. fieldLabel('Name','name',1).'</td><td><input name="name" id="name" size="32" value="' . GETPOST("name") . '"></td></tr>';
+    print '<tr><td>'. fieldLabel('Name','name',1).'</td><td><input name="name" id="name" size="32" value="' . GETPOST("name", "alpha") . '"></td></tr>';
 
 	// Address
 	print '<tr>';
 	print '<td>'.fieldLabel('Address','address',0).'</td>';
 	print '<td>';
-	print '<input name="address" id="address" size="32" value="' . $object->address . '">';
+	print '<input name="address" id="address" class="qutrevingtpercent" value="' . GETPOST('address','alpha') . '">';
 	print '</td>';
 	print '</tr>';
 
@@ -220,7 +221,7 @@ if ($action == 'create')
 	print '<tr>';
 	print '<td>'.fieldLabel('Country','selectcountry_id',0).'</td>';
 	print '<td class="maxwidthonsmartphone">';
-	print $form->select_country($mysoc->country_id,'country_id');
+	print $form->select_country(GETPOST('country_id','int')>0?GETPOST('country_id','int'):$mysoc->country_id,'country_id');
 		if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
 	print '</td>';
 	print '</tr>';
@@ -229,7 +230,7 @@ if ($action == 'create')
     print '<tr>';
     print '<td>'.fieldLabel('Status','status',1).'</td>';
 	print '<td>';
-	print $form->selectarray('status',$status2label,GETPOST('status'));
+	print $form->selectarray('status',$status2label,GETPOST('status','alpha'));
     print '</td></tr>';
 
     print '</table>';
@@ -244,7 +245,9 @@ if ($action == 'create')
 
     print '</form>';
 }
-else if ($id)
+
+// Part to edit record
+if (($id || $ref) && $action == 'edit')
 {
     $result = $object->fetch($id);
     if ($result > 0)
@@ -316,91 +319,94 @@ else if ($id)
 
             print '</form>';
         }
-        else
-        {
-            /*
-             * Confirm delete
-             */
-            if ($action == 'delete')
-            {
-                print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id,$langs->trans("DeleteEstablishment"),$langs->trans("ConfirmDeleteEstablishment"),"confirm_delete");
-
-            }
-
-        	dol_fiche_head($head, 'card', $langs->trans("Establishment"), 0, 'building');
-
-        	print '<table class="border" width="100%">';
-
-            $linkback = '<a href="../admin/admin_establishment.php">'.$langs->trans("BackToList").'</a>';
-
-            // Ref
-            print '<tr><td width="25%">'.$langs->trans("Ref").'</td><td width="50%">';
-            print $object->id;
-			print '</td><td width="25%">';
-			print $linkback;
-            print '</td></tr>';
-
-			// Name
-			print '<tr>';
-			print '<td>'.$langs->trans("Name").'</td>';
-			print '<td colspan="2">'.$object->name.'</td>';
-			print '</tr>';
-
-			// Address
-			print '<tr>';
-			print '<td>'.$langs->trans("Address").'</td>';
-			print '<td colspan="2">'.$object->address.'</td>';
-			print '</tr>';
-
-			// Zipcode
-			print '<tr>';
-			print '<td>'.$langs->trans("Zipcode").'</td>';
-			print '<td colspan="2">'.$object->zip.'</td>';
-			print '</tr>';
-
-			// Town
-			print '<tr>';
-			print '<td>'.$langs->trans("Town").'</td>';
-			print '<td colspan="2">'.$object->town.'</td>';
-			print '</tr>';
-
-			// Country
-			print '<tr>';
-			print '<td>'.$langs->trans("Country").'</td>';
-			print '<td colspan="2">';
-			if ($object->country_id > 0)
-			{
-				$img=picto_from_langcode($object->country_code);
-				print $img?$img.' ':'';
-				print getCountry($object->getCountryCode(),0,$db);
-			}
-			print '</td>';
-			print '</tr>';
-
-            // Status
-            print '<tr><td>'.$langs->trans("Status").'</td><td colspan="2">';
-            print $object->getLibStatus(4).'</td></tr>';
-
-            print "</table>";
-
-            dol_fiche_end();
-
-            /*
-             * Barre d'actions
-            */
-
-            print '<div class="tabsAction">';
-            print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&id='.$id.'">'.$langs->trans('Modify').'</a>';
-			print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?action=delete&id='.$id.'">'.$langs->trans('Delete').'</a>';
-            print '</div>';
-        }
-    }
-    else
-    {
-        dol_print_error($db);
     }
+    else dol_print_error($db);
 }
 
-llxFooter();
+if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create')))
+{
+    $res = $object->fetch_optionals($object->id, $extralabels);
+    
+    $head = establishment_prepare_head($object);
+    dol_fiche_head($head, 'card', $langs->trans("Establishment"), -1, 'building');
+    
+    // Confirmation to delete
+    if ($action == 'delete')
+    {
+        print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id,$langs->trans("DeleteEstablishment"),$langs->trans("ConfirmDeleteEstablishment"),"confirm_delete");
 
+    }
+
+	
+	// Object card
+	// ------------------------------------------------------------
+	
+	$linkback = '<a href="' . DOL_URL_ROOT . '/hrm/admin/admin_establishment.php' . (! empty($socid) ? '?socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
+	
+	$morehtmlref='<div class="refidno">';
+    $morehtmlref.='</div>';
+	
+    dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'id', $morehtmlref);
+    
+    
+    print '<div class="fichecenter">';
+    //print '<div class="fichehalfleft">';
+    print '<div class="underbanner clearboth"></div>';
+    print '<table class="border centpercent">'."\n"; 
+
+	// Name
+	print '<tr>';
+	print '<td class="titlefield">'.$langs->trans("Name").'</td>';
+	print '<td>'.$object->name.'</td>';
+	print '</tr>';
+
+	// Address
+	print '<tr>';
+	print '<td>'.$langs->trans("Address").'</td>';
+	print '<td>'.$object->address.'</td>';
+	print '</tr>';
+
+	// Zipcode
+	print '<tr>';
+	print '<td>'.$langs->trans("Zipcode").'</td>';
+	print '<td>'.$object->zip.'</td>';
+	print '</tr>';
+
+	// Town
+	print '<tr>';
+	print '<td>'.$langs->trans("Town").'</td>';
+	print '<td>'.$object->town.'</td>';
+	print '</tr>';
+
+	// Country
+	print '<tr>';
+	print '<td>'.$langs->trans("Country").'</td>';
+	print '<td>';
+	if ($object->country_id > 0)
+	{
+		$img=picto_from_langcode($object->country_code);
+		print $img?$img.' ':'';
+		print getCountry($object->getCountryCode(),0,$db);
+	}
+	print '</td>';
+	print '</tr>';
+
+    print '</table>';
+    print '</div>';
+    
+    print '<div class="clearboth"></div><br>';
+    
+    dol_fiche_end();
+
+    /*
+     * Barre d'actions
+    */
+
+    print '<div class="tabsAction">';
+    print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&id='.$id.'">'.$langs->trans('Modify').'</a>';
+	print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?action=delete&id='.$id.'">'.$langs->trans('Delete').'</a>';
+    print '</div>';
+}
+ 
+llxFooter();
 $db->close();
diff --git a/htdocs/modulebuilder/skeletons/skeleton_card.php b/htdocs/modulebuilder/skeletons/skeleton_card.php
index 84cbcbb2160..49683af79c8 100644
--- a/htdocs/modulebuilder/skeletons/skeleton_card.php
+++ b/htdocs/modulebuilder/skeletons/skeleton_card.php
@@ -297,52 +297,305 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 {
     $res = $object->fetch_optionals($object->id, $extralabels);
 
-	$head = commande_prepare_head($object);
-	dol_fiche_head($head, 'order', $langs->trans("CustomerOrder"), 0, 'order');
+	$head = mymodule_prepare_head($object);
+	dol_fiche_head($head, 'order', $langs->trans("CustomerOrder"), -1, 'order');
 		
-	print load_fiche_titre($langs->trans("MyModule"));
-    
-	dol_fiche_head();
-
+	$formconfirm = '';
+	
+	// Confirmation to delete
 	if ($action == 'delete') {
-		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('DeleteMyOjbect'), $langs->trans('ConfirmDeleteMyObject'), 'confirm_delete', '', 0, 1);
-		print $formconfirm;
+	    $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('DeleteOrder'), $langs->trans('ConfirmDeleteOrder'), 'confirm_delete', '', 0, 1);
 	}
 	
+	// Confirmation of action xxxx
+	if ($action == 'xxx')
+	{
+	    $formquestion=array();
+	    /*
+	        $formquestion = array(
+	            // 'text' => $langs->trans("ConfirmClone"),
+	            // array('type' => 'checkbox', 'name' => 'clone_content', 'label' => $langs->trans("CloneMainAttributes"), 'value' => 1),
+	            // array('type' => 'checkbox', 'name' => 'update_prices', 'label' => $langs->trans("PuttingPricesUpToDate"), 'value' => 1),
+	            // array('type' => 'other',    'name' => 'idwarehouse',   'label' => $langs->trans("SelectWarehouseForStockDecrease"), 'value' => $formproduct->selectWarehouses(GETPOST('idwarehouse')?GETPOST('idwarehouse'):'ifone', 'idwarehouse', '', 1)));
+	    }*/	
+	    $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('XXX'), $text, 'confirm_xxx', $formquestion, 0, 1, 220);
+	}
+	
+	if (! $formconfirm) {
+	    $parameters = array('lineid' => $lineid);
+	    $reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+	    if (empty($reshook)) $formconfirm.=$hookmanager->resPrint;
+	    elseif ($reshook > 0) $formconfirm=$hookmanager->resPrint;
+	}
+	
+	// Print form confirm
+	print $formconfirm;
+	
+	
+	
+	// Object card
+	// ------------------------------------------------------------
+	
+	$linkback = '<a href="' . DOL_URL_ROOT . '/mymodule/list.php' . (! empty($socid) ? '?socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
+	
+	
+	$morehtmlref='<div class="refidno">';
+	/*
+	// Ref bis
+	$morehtmlref.=$form->editfieldkey("RefBis", 'ref_client', $object->ref_client, $object, $user->rights->mymodule->creer, 'string', '', 0, 1);
+	$morehtmlref.=$form->editfieldval("RefBis", 'ref_client', $object->ref_client, $object, $user->rights->mymodule->creer, 'string', '', null, null, '', 1);
+	// Thirdparty
+	$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $soc->getNomUrl(1);
+	// Project
+	if (! empty($conf->projet->enabled))
+	{
+	    $langs->load("projects");
+	    $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
+	    if ($user->rights->mymodule->creer)
+	    {
+	        if ($action != 'classify')
+	        {
+	            $morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+	            if ($action == 'classify') {
+	                //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+	                $morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+	                $morehtmlref.='<input type="hidden" name="action" value="classin">';
+	                $morehtmlref.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+	                $morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+	                $morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+	                $morehtmlref.='</form>';
+	            } else {
+	                $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+	            }
+	        }
+	    } else {
+	        if (! empty($object->fk_project)) {
+	            $proj = new Project($db);
+	            $proj->fetch($object->fk_project);
+	            $morehtmlref.='<a href="'.DOL_URL_ROOT.'/projet/card.php?id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
+	            $morehtmlref.=$proj->ref;
+	            $morehtmlref.='</a>';
+	        } else {
+	            $morehtmlref.='';
+	        }
+	    }
+	}
+	*/
+	$morehtmlref.='</div>';
+	
+	
+	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+	
+	
+	print '<div class="fichecenter">';
+	print '<div class="fichehalfleft">';
+	print '<div class="underbanner clearboth"></div>';
 	print '<table class="border centpercent">'."\n";
 	// print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td>'.$object->label.'</td></tr>';
 	// LIST_OF_TD_LABEL_FIELDS_VIEW
+
+
+	// Other attributes
+	$cols = 2;
+	include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
+
 	print '</table>';
+	print '</div>';
+	print '<div class="fichehalfright">';
+	print '<div class="ficheaddleft">';
+	print '<div class="underbanner clearboth"></div>';
+	print '<table class="border centpercent">';
+	
+	
+
+	print '</table>';
+	print '</div>';
+	print '</div>';
+	print '</div>';
+	
+	print '<div class="clearboth"></div><br>';
 	
 	dol_fiche_end();
 
 
-	// Buttons
-	print '<div class="tabsAction">'."\n";
-	$parameters=array();
-	$reshook=$hookmanager->executeHooks('addMoreActionsButtons',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-
-	if (empty($reshook))
-	{
-		if ($user->rights->mymodule->write)
-		{
-			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a></div>'."\n";
-		}
-
-		if ($user->rights->mymodule->delete)
-		{
-			print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete">'.$langs->trans('Delete').'</a></div>'."\n";
-		}
+	// Buttons for actions
+	if ($action != 'presend' && $action != 'editline') {
+    	print '<div class="tabsAction">'."\n";
+    	$parameters=array();
+    	$reshook=$hookmanager->executeHooks('addMoreActionsButtons',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+    	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+    
+    	if (empty($reshook))
+    	{
+    		if ($user->rights->mymodule->write)
+    		{
+    			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a></div>'."\n";
+    		}
+    
+    		if ($user->rights->mymodule->delete)
+    		{
+    			print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete">'.$langs->trans('Delete').'</a></div>'."\n";
+    		}
+    	}
+    	print '</div>'."\n";
 	}
-	print '</div>'."\n";
 
+	
+	// Select mail models is same action as presend
+	if (GETPOST('modelselected')) {
+	    $action = 'presend';
+	}
+	
+	if ($action != 'presend')
+	{
+	    print '<div class="fichecenter"><div class="fichehalfleft">';
+	    print '<a name="builddoc"></a>'; // ancre
+	    // Documents
+	    $comref = dol_sanitizeFileName($object->ref);
+	    $relativepath = $comref . '/' . $comref . '.pdf';
+	    $filedir = $conf->mymodule->dir_output . '/' . $comref;
+	    $urlsource = $_SERVER["PHP_SELF"] . "?id=" . $object->id;
+	    $genallowed = $user->rights->mymodule->creer;
+	    $delallowed = $user->rights->mymodule->supprimer;
+	    print $formfile->showdocuments('mymodule', $comref, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', '', '', $soc->default_lang);
+	
+	
+	    // Show links to link elements
+	    $linktoelem = $form->showLinkToObjectBlock($object, null, array('order'));
+	    $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
+	
+	
+	    print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+	
+	    // List of actions on element
+	    include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
+	    $formactions = new FormActions($db);
+	    $somethingshown = $formactions->showactions($object, 'order', $socid);
+	
+	    print '</div></div></div>';
+	}
+	
 
-	// Example 2 : Adding links to objects
-	// Show links to link elements
-	//$linktoelem = $form->showLinkToObjectBlock($object, null, array('skeleton'));
-	//$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
+	/*
+	 * Action presend
+	 */
+    /*
+	if ($action == 'presend')
+	{
+		$object->fetch_projet();
 
+		$ref = dol_sanitizeFileName($object->ref);
+		include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
+		$fileparams = dol_most_recent_file($conf->commande->dir_output . '/' . $ref, preg_quote($ref, '/').'[^\-]+');
+		$file = $fileparams['fullname'];
+
+		// Define output language
+		$outputlangs = $langs;
+		$newlang = '';
+		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id']))
+			$newlang = $_REQUEST['lang_id'];
+		if ($conf->global->MAIN_MULTILANGS && empty($newlang))
+			$newlang = $object->thirdparty->default_lang;
+
+		if (!empty($newlang))
+		{
+			$outputlangs = new Translate('', $conf);
+			$outputlangs->setDefaultLang($newlang);
+			$outputlangs->load('commercial');
+		}
+
+		// Build document if it not exists
+		if (! $file || ! is_readable($file)) {
+			$result = $object->generateDocument(GETPOST('model') ? GETPOST('model') : $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+			if ($result <= 0) {
+				dol_print_error($db, $object->error, $object->errors);
+				exit();
+			}
+			$fileparams = dol_most_recent_file($conf->commande->dir_output . '/' . $ref, preg_quote($ref, '/').'[^\-]+');
+			$file = $fileparams['fullname'];
+		}
+
+		print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>';
+		print '<div class="clearboth"></div>';
+		print '<br>';
+		print load_fiche_titre($langs->trans('SendOrderByMail'));
+
+		dol_fiche_head('');
+
+		// Cree l'objet formulaire mail
+		include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
+		$formmail = new FormMail($db);
+		$formmail->param['langsmodels']=(empty($newlang)?$langs->defaultlang:$newlang);
+        $formmail->fromtype = (GETPOST('fromtype')?GETPOST('fromtype'):(!empty($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE)?$conf->global->MAIN_MAIL_DEFAULT_FROMTYPE:'user'));
+
+        if($formmail->fromtype === 'user'){
+            $formmail->fromid = $user->id;
+
+        }
+		$formmail->trackid='ord'.$object->id;
+		if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2))	// If bit 2 is set
+		{
+			include DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+			$formmail->frommail=dolAddEmailTrackId($formmail->frommail, 'ord'.$object->id);
+		}
+		$formmail->withfrom = 1;
+		$liste = array();
+		foreach ($object->thirdparty->thirdparty_and_contact_email_array(1) as $key => $value)
+			$liste [$key] = $value;
+		$formmail->withto = GETPOST('sendto') ? GETPOST('sendto') : $liste;
+		$formmail->withtocc = $liste;
+		$formmail->withtoccc = $conf->global->MAIN_EMAIL_USECCC;
+		if (empty($object->ref_client)) {
+			$formmail->withtopic = $outputlangs->trans('SendOrderRef', '__ORDERREF__');
+		} else if (! empty($object->ref_client)) {
+			$formmail->withtopic = $outputlangs->trans('SendOrderRef', '__ORDERREF__ (__REFCLIENT__)');
+		}
+		$formmail->withfile = 2;
+		$formmail->withbody = 1;
+		$formmail->withdeliveryreceipt = 1;
+		$formmail->withcancel = 1;
+		// Tableau des substitutions
+		$formmail->setSubstitFromObject($object);
+		$formmail->substit ['__ORDERREF__'] = $object->ref;
+
+		$custcontact = '';
+		$contactarr = array();
+		$contactarr = $object->liste_contact(- 1, 'external');
+
+		if (is_array($contactarr) && count($contactarr) > 0)
+		{
+			foreach ($contactarr as $contact)
+			{
+				if ($contact['libelle'] == $langs->trans('TypeContact_commande_external_CUSTOMER')) {	// TODO Use code and not label
+					$contactstatic = new Contact($db);
+					$contactstatic->fetch($contact ['id']);
+					$custcontact = $contactstatic->getFullName($langs, 1);
+				}
+			}
+
+			if (! empty($custcontact)) {
+				$formmail->substit['__CONTACTCIVNAME__'] = $custcontact;
+			}
+		}
+
+		// Tableau des parametres complementaires
+		$formmail->param['action'] = 'send';
+		$formmail->param['models'] = 'order_send';
+		$formmail->param['models_id']=GETPOST('modelmailselected','int');
+		$formmail->param['orderid'] = $object->id;
+		$formmail->param['returnurl'] = $_SERVER["PHP_SELF"] . '?id=' . $object->id;
+
+		// Init list of files
+		if (GETPOST("mode") == 'init') {
+			$formmail->clear_attached_files();
+			$formmail->add_attached_files($file, basename($file), dol_mimetype($file));
+		}
+
+		// Show form
+		print $formmail->get_form();
+
+		dol_fiche_end();
+	}*/
 }
 
 

From f65b29c1351e1fc3172eb58df494c9bddbd9cc73 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 19 May 2017 16:57:38 +0200
Subject: [PATCH 411/505] FIX #6867 - Rewrite code to solve regression (not
 mixing array/string type and solve php warnings). Also restore $langs as a
 global var.

---
 htdocs/admin/dict.php | 39 +++++++++++++--------------------------
 1 file changed, 13 insertions(+), 26 deletions(-)

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 2b422074f1b..ee21a8ccfbe 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -581,12 +581,6 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
     $listfieldmodify=explode(',',$tabfieldinsert[$id]);
     $listfieldvalue=explode(',',$tabfieldvalue[$id]);
 
-    if (GETPOST('actionmodify') && $tabname[$id] == MAIN_DB_PREFIX . "c_actioncomm" && isset($_POST["type"]) && in_array($_POST["type"],array('system','systemauto'))) {
-        $listfield=explode(',','color,position');
-        $listfieldmodify=explode(',','color,position');
-        $listfieldvalue=explode(',','color,position');
-    }
-
     // Check that all fields are filled
     $ok=1;
     foreach ($listfield as $f => $value)
@@ -1110,7 +1104,7 @@ if ($id)
 
         if (empty($reshook))
         {
-       		fieldList($fieldlist,$langs,$obj,$tabname[$id],'add');
+       		fieldList($fieldlist, $obj, $tabname[$id], 'add');
         }
 
         if ($id == 4) print '<td></td>';
@@ -1310,13 +1304,7 @@ if ($id)
                     $error=$hookmanager->error; $errors=$hookmanager->errors;
 
                     // Show fields
-                    if (empty($reshook)) {
-                        $fieldl = $fieldlist;
-                        if ($tabname[$id] == MAIN_DB_PREFIX . "c_actioncomm" && in_array($obj->type, array('system', 'systemauto'))) {
-                            $fieldl=array(array('code'),array('libelle'),array('type'),'color','position');
-                        }
-                        fieldList($fieldl, $langs, $obj, $tabname[$id], 'edit');
-                    }
+                    if (empty($reshook)) fieldList($fieldlist, $obj, $tabname[$id], 'edit');
 
                     print '<td colspan="3" align="center">';
                     print '<div name="'.(! empty($obj->rowid)?$obj->rowid:$obj->code).'"></div>';
@@ -1657,15 +1645,14 @@ $db->close();
  *	Show fields in insert/edit mode
  *
  * 	@param		array		$fieldlist		Array of fields
- * 	@param		Translate	$langs			Translate class
  * 	@param		Object		$obj			If we show a particular record, obj is filled with record fields
  *  @param		string		$tabname		Name of SQL table
  *  @param		string		$context		'add'=Output field for the "add form", 'edit'=Output field for the "edit form", 'hide'=Output field for the "add form" but we dont want it to be rendered
  *	@return		void
  */
-function fieldList($fieldlist, $langs, $obj='', $tabname='', $context='')
+function fieldList($fieldlist, $obj='', $tabname='', $context='')
 {
-	global $conf,$db;
+	global $conf,$langs,$db;
 	global $form;
 	global $region_id;
 	global $elementList,$sourceList,$localtax_typeList;
@@ -1677,7 +1664,15 @@ function fieldList($fieldlist, $langs, $obj='', $tabname='', $context='')
 
 	foreach ($fieldlist as $field => $value)
 	{
-		if ($fieldlist[$field] == 'country')
+	    if (in_array($fieldlist[$field], array('code', 'libelle', 'type')) && $tabname == MAIN_DB_PREFIX."c_actioncomm" && in_array($obj->type, array('system','systemauto')))
+        {
+            $hidden = (! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:'');
+            print '<td>';
+            print '<input type="hidden" name="'.$fieldlist[$field].'" value="'.$hidden.'">';
+            print $langs->trans($hidden);
+            print '</td>';
+        }
+	    elseif ($fieldlist[$field] == 'country')
 		{
 			if (in_array('region_id',$fieldlist))
 			{
@@ -1823,14 +1818,6 @@ function fieldList($fieldlist, $langs, $obj='', $tabname='', $context='')
 			}
 			print '</td>';
 		}
-        elseif (is_array($fieldlist[$field]))
-        {
-            $hidden = (! empty($obj->{$fieldlist[$field][0]})?$obj->{$fieldlist[$field][0]}:'');
-            print '<td>';
-            print '<input type="hidden" name="'.$fieldlist[$field][0].'" value="'.$hidden.'">';
-            print $langs->trans($hidden);
-            print '</td>';
-        }
 		else
 		{
 			$classtd=''; $class='';

From b35b40e2bf21cb827fd2c8ee3bfd00ae005db61e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 19 May 2017 17:08:42 +0200
Subject: [PATCH 412/505] Align position of right

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

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index ee21a8ccfbe..8319ccd0450 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -1228,6 +1228,7 @@ if ($id)
             if ($fieldlist[$field]=='lang')            { $valuetoshow=$langs->trans("Language"); }
             if ($fieldlist[$field]=='type')            { $valuetoshow=$langs->trans("Type"); }
             if ($fieldlist[$field]=='code')            { $valuetoshow=$langs->trans("Code"); }
+            if ($fieldlist[$field]=='position')        { $align='right'; }
             if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label')
             {
                 //if ($id != 25) $valuetoshow=$form->textwithtooltip($langs->trans("Label"), $langs->trans("LabelUsedByDefault"),2,1,img_help(1,''));
@@ -1494,6 +1495,7 @@ if ($id)
                             $class='tddict';
                             if ($fieldlist[$field] == 'tracking') $class.=' tdoverflowauto';
                             if ($fieldlist[$field] == 'code') $class.=' width100';
+                            if ($fieldlist[$field] == 'position') $class.=' right';
                             // Show value for field
 							if ($showfield) print '<!-- '.$fieldlist[$field].' --><td align="'.$align.'" class="'.$class.'">'.$valuetoshow.'</td>';
                         }

From c30dcf78cb329dae0711f734ecc0c061390d95f5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 19 May 2017 17:24:15 +0200
Subject: [PATCH 413/505] Show info when link has been deleted

---
 htdocs/comm/action/card.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index 30b13bc3007..2b10f0c2f26 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005      Simon TOSSER         <simon@kornog-computing.com>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2010-2013 Juanjo Menent        <jmenent@2byte.es>
@@ -1396,7 +1396,11 @@ if ($id > 0)
 		{
 			include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 			print '<tr><td>'.$langs->trans("LinkedObject").'</td>';
-			print '<td colspan="3">'.dolGetElementUrl($object->fk_element,$object->elementtype,1).'</td></tr>';
+			$link=dolGetElementUrl($object->fk_element,$object->elementtype,1);
+			print '<td colspan="3">';
+			if (empty($link)) print '<span class="opacitymedium">'.$langs->trans("ObjectDeleted").'</span>';
+			else print $link;
+			print '</td></tr>';
 		}
 
 		// Description

From 807c77f754f922133e78c9c93c392a0b8eeded89 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 19 May 2017 18:03:49 +0200
Subject: [PATCH 414/505] Fix inconsistent options

---
 htdocs/admin/agenda_other.php    | 23 -----------------------
 htdocs/comm/action/card.php      |  2 +-
 htdocs/comm/action/index.php     |  1 -
 htdocs/core/class/conf.class.php |  6 ++++++
 htdocs/societe/ajax/company.php  |  6 +++---
 5 files changed, 10 insertions(+), 28 deletions(-)

diff --git a/htdocs/admin/agenda_other.php b/htdocs/admin/agenda_other.php
index 55b61145b6a..bd9587a4440 100644
--- a/htdocs/admin/agenda_other.php
+++ b/htdocs/admin/agenda_other.php
@@ -432,29 +432,6 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0)
     }
 }
 
-// AGENDA_SHOW_LINKED_OBJECT
-$var=!$var;
-print '<tr '.$bc[$var].'>'."\n";
-print '<td>'.$langs->trans("AGENDA_SHOW_LINKED_OBJECT").'</td>'."\n";
-print '<td align="center">&nbsp;</td>'."\n";
-print '<td align="right">'."\n";
-if (! empty($conf->use_javascript_ajax))
-{
-    print ajax_constantonoff('AGENDA_SHOW_LINKED_OBJECT');
-}
-else
-{
-    if (empty($conf->global->AGENDA_SHOW_LINKED_OBJECT))
-    {
-        print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_AGENDA_SHOW_LINKED_OBJECT">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
-    }
-    else
-    {
-        print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_AGENDA_SHOW_LINKED_OBJECT">'.img_picto($langs->trans("Enabled"),'switch_on').'</a>';
-    }
-}
-print '</td></tr>'."\n";
-
 print '</table>';
 
 dol_fiche_end();
diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index 2b10f0c2f26..02ee84dc2de 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -1114,7 +1114,7 @@ if ($id > 0)
 			$events[]=array('method' => 'getContacts', 'url' => dol_buildpath('/core/ajax/contacts.php?showempty=1',1), 'htmlname' => 'contactid', 'params' => array('add-customer-contact' => 'disabled'));
 			// TODO Refresh also list of project if $conf->global->PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY not defined with list linked to socid ?
 			// FIXME If we change company, we may get a project that does not match
-			print $form->select_company($object->socid, 'socid', '', 'SelectThirdParty', 1, 0, $events, 0);
+			print $form->select_company($object->socid, 'socid', '', 'SelectThirdParty', 1, 0, $events, 0, 'minwidth200');
 			print '</div>';
 			print '</td></tr>';
 
diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index 0a8ab49ea38..307d6417285 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -160,7 +160,6 @@ if ($action =='delete_action')
 }
 
 
-
 /*
  * View
  */
diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index 28a287971a8..578ed17049e 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -580,6 +580,12 @@ class Conf
 
 		if (empty($this->global->MAIN_SIZE_SHORTLIST_LIMIT)) $this->global->MAIN_SIZE_SHORTLIST_LIMIT=3;
 
+		// Save inconsistent option
+		if (empty($conf->global->AGENDA_USE_EVENT_TYPE) && $conf->global->AGENDA_DEFAULT_FILTER_TYPE == 'AC_NON_AUTO')
+		{
+		    $conf->global->AGENDA_DEFAULT_FILTER_TYPE='0';    // 'AC_NON_AUTO' does not exists when AGENDA_DEFAULT_FILTER_TYPE is not on.
+		}
+		    
 		// For backward compatibility
 		if (isset($this->product))   $this->produit=$this->product;
 		if (isset($this->facture))   $this->invoice=$this->facture;
diff --git a/htdocs/societe/ajax/company.php b/htdocs/societe/ajax/company.php
index 32f57f73c25..d57a6f3fca6 100644
--- a/htdocs/societe/ajax/company.php
+++ b/htdocs/societe/ajax/company.php
@@ -83,11 +83,11 @@ else
 	sort($match);
 	$id = (! empty($match[0]) ? $match[0] : '');
 
-	if (! GETPOST($htmlname) && ! GETPOST($id)) return;
-
 	// When used from jQuery, the search term is added as GET param "term".
-	$searchkey=(GETPOST($id)?GETPOST($id):(GETPOST($htmlname)?GETPOST($htmlname):''));
+	$searchkey=(($id && GETPOST($id, 'alpha'))?GETPOST($id, 'alpha'):(($htmlname && GETPOST($htmlname, 'alpha'))?GETPOST($htmlname, 'alpha'):''));
 
+	if (! $searchkey) return;
+	
 	$form = new Form($db);
 	$arrayresult=$form->select_thirdparty_list(0,$htmlname,$filter,1,0,0,null,$searchkey,$outjson);
 

From ba5fb700baae1931aba39baa32e5e1bd238a4dba Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 19 May 2017 18:35:52 +0200
Subject: [PATCH 415/505] Missing translation

---
 htdocs/langs/en_US/contracts.lang | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/langs/en_US/contracts.lang b/htdocs/langs/en_US/contracts.lang
index 880f00a9331..f742ca4cecd 100644
--- a/htdocs/langs/en_US/contracts.lang
+++ b/htdocs/langs/en_US/contracts.lang
@@ -83,6 +83,8 @@ NoteListOfYourExpiredServices=This list contains only services of contracts for
 StandardContractsTemplate=Standard contracts template
 ContactNameAndSignature=For %s, name and signature:
 OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
+CloneContract=Clone contract
+ConfirmCloneContract=Are you sure you want to clone the contract <b>%s</b>?
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Sales representative signing contract

From 06b37d0e8285112ed10553ca636619b6bfdbd0c1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 19 May 2017 20:17:33 +0200
Subject: [PATCH 416/505] Work on dol_check_secure_access_document to support
 write question

---
 htdocs/core/lib/files.lib.php    | 20 ++++++++++++++------
 htdocs/core/lib/security.lib.php |  1 +
 test/phpunit/FilesLibTest.php    | 21 +++++++++++++++++++++
 3 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 4c3be3cc4d1..f9f6efea8d5 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -1642,9 +1642,11 @@ function dol_most_recent_file($dir,$regexfilter='',$excludefilter=array('(\.meta
  * @param	string	$entity				Restrict onto entity
  * @param  	User	$fuser				User object (forced)
  * @param	string	$refname			Ref of object to check permission for external users (autodetect if not provided)
+ * @param   string  $more               Check permission for 'read' or 'write'               
  * @return	mixed						Array with access information : 'accessallowed' & 'sqlprotectagainstexternals' & 'original_file' (as a full path name)
+ * @see restrictedArea
  */
-function dol_check_secure_access_document($modulepart,$original_file,$entity,$fuser='',$refname='')
+function dol_check_secure_access_document($modulepart,$original_file,$entity,$fuser='',$refname='',$mode='read')
 {
 	global $user, $conf, $db;
 	global $dolibarr_main_data_root;
@@ -2246,6 +2248,12 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
     // If modulepart=module				Allows any module to open a file if file is in directory called DOL_DATA_ROOT/modulepart
     else
 	{
+	    $lire='lire'; $read='read'; $download='download';
+	    if ($mode == 'write')
+	    {
+	        $lire='creer'; $read='write'; $download='upload';
+	    }
+	    
 	    if (preg_match('/^specimen/i',$original_file))	$accessallowed=1;    // If link to a file called specimen. Test must be done before changing $original_file int full path. 
 	    if ($fuser->admin) $accessallowed=1;    // If user is admin
 
@@ -2257,7 +2265,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 				dol_print_error('','Error call dol_check_secure_access_document with not supported value for modulepart parameter ('.$modulepart.')');
 				exit;
 			}
-		    if ($fuser->rights->{$reg[1]}->lire || $fuser->rights->{$reg[1]}->read || ($fuser->rights->{$reg[1]}->download)) $accessallowed=1;
+		    if ($fuser->rights->{$reg[1]}->{$lire} || $fuser->rights->{$reg[1]}->{$read} || ($fuser->rights->{$reg[1]}->{$download})) $accessallowed=1;
 			$original_file=$conf->{$reg[1]}->dir_temp.'/'.$fuser->id.'/'.$original_file;
 		}
 		else if (preg_match('/^([a-z]+)_temp$/i',$modulepart,$reg))
@@ -2267,7 +2275,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 				dol_print_error('','Error call dol_check_secure_access_document with not supported value for modulepart parameter ('.$modulepart.')');
 				exit;
 			}
-		    if ($fuser->rights->{$reg[1]}->lire || $fuser->rights->{$reg[1]}->read || ($fuser->rights->{$reg[1]}->download)) $accessallowed=1;
+		    if ($fuser->rights->{$reg[1]}->{$lire} || $fuser->rights->{$reg[1]}->{$read} || ($fuser->rights->{$reg[1]}->{$download})) $accessallowed=1;
 			$original_file=$conf->{$reg[1]}->dir_temp.'/'.$original_file;
 		}
 		else if (preg_match('/^([a-z]+)_user$/i',$modulepart,$reg))
@@ -2277,7 +2285,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 				dol_print_error('','Error call dol_check_secure_access_document with not supported value for modulepart parameter ('.$modulepart.')');
 				exit;
 			}
-		    if ($fuser->rights->{$reg[1]}->lire || $fuser->rights->{$reg[1]}->read || ($fuser->rights->{$reg[1]}->download)) $accessallowed=1;
+		    if ($fuser->rights->{$reg[1]}->{$lire} || $fuser->rights->{$reg[1]}->{$read} || ($fuser->rights->{$reg[1]}->{$download})) $accessallowed=1;
 			$original_file=$conf->{$reg[1]}->dir_output.'/'.$fuser->id.'/'.$original_file;
 		}
 		else
@@ -2297,7 +2305,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 			}
 			else
 			{
-				if ($fuser->rights->$modulepart->lire || $fuser->rights->$modulepart->read) $accessallowed=1;
+				if ($fuser->rights->$modulepart->{$lire} || $fuser->rights->$modulepart->{$read}) $accessallowed=1;
 				$original_file=$conf->$modulepart->dir_output.'/'.$original_file;
 			}
 		}
@@ -2307,7 +2315,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 		if (! empty($conf->global->$subPermCategoryConstName))
 		{
 			$subPermCategory = $conf->global->$subPermCategoryConstName;
-			if (! empty($subPermCategory) && (($fuser->rights->$modulepart->$subPermCategory->lire) || ($fuser->rights->$modulepart->$subPermCategory->read) || ($fuser->rights->$modulepart->$subPermCategory->download)))
+			if (! empty($subPermCategory) && (($fuser->rights->$modulepart->$subPermCategory->{$lire}) || ($fuser->rights->$modulepart->$subPermCategory->{$read}) || ($fuser->rights->$modulepart->$subPermCategory->{$download})))
 			{
 				$accessallowed=1;
 			}
diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php
index ccc8a68a5d9..6993ad496ea 100644
--- a/htdocs/core/lib/security.lib.php
+++ b/htdocs/core/lib/security.lib.php
@@ -109,6 +109,7 @@ function dol_hash($chain,$type=0)
  *  @param  string	$dbt_select     Field name for select if not rowid. Not used if objectid is null (optional)
  *  @param	Canvas	$objcanvas		Object canvas
  * 	@return	int						Always 1, die process if not allowed
+ *  @see dol_check_secure_access_document
  */
 function restrictedArea($user, $features, $objectid=0, $tableandshare='', $feature2='', $dbt_keyfield='fk_soc', $dbt_select='rowid', $objcanvas=null)
 {
diff --git a/test/phpunit/FilesLibTest.php b/test/phpunit/FilesLibTest.php
index f9000006b46..ddfcb8ed217 100644
--- a/test/phpunit/FilesLibTest.php
+++ b/test/phpunit/FilesLibTest.php
@@ -418,4 +418,25 @@ class FilesLibTest extends PHPUnit_Framework_TestCase
         $this->assertEquals(1,count($founddirs));
     }
 
+
+    /**
+     * testDolCheckSecureAccessDocument
+     *
+     * @return void
+     */
+    public function testDolCheckSecureAccessDocument()
+    {
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
+    
+        //$dummyuser=new User($db);
+        //$result=restrictedArea($dummyuser,'societe');
+    
+        //$result=dol_check_secure_access_document($user,'societe');
+        //$this->assertEquals(1,$result);
+    }    
+    
 }

From 035cae656f185961e9b8600429b27bc6fa70a8c3 Mon Sep 17 00:00:00 2001
From: Inovea Conseil <inoveaconseil@users.noreply.github.com>
Date: Fri, 19 May 2017 22:14:34 +0200
Subject: [PATCH 417/505] Fix bug in insert method

Missing the last comma in the insert method
---
 dev/skeletons/build_class_from_table.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev/skeletons/build_class_from_table.php b/dev/skeletons/build_class_from_table.php
index 62ad1188759..537975365ef 100755
--- a/dev/skeletons/build_class_from_table.php
+++ b/dev/skeletons/build_class_from_table.php
@@ -251,7 +251,7 @@ $cleanparam='';
 $i=0;
 foreach($property as $key => $prop)
 {
-	$i++;
+	
 	$addfield=1;
 	if ($prop['field'] == 'tms') $addfield=0;	// This is a field of type timestamp edited automatically
 	if ($prop['extra'] == 'auto_increment') $addfield=0;
@@ -263,6 +263,7 @@ foreach($property as $key => $prop)
 		$varprop.="';";
 		$varprop.="\n";
 	}
+	$i++;
 }
 $targetcontent=preg_replace('/\$sql \.= \' field1,\';/', $varprop, $targetcontent);
 $targetcontent=preg_replace('/\$sql \.= \' field2\';/', '', $targetcontent);

From 4ff9607011e5cd83a9cbd0a82b47474afbbd963d Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Sat, 20 May 2017 07:56:33 +0200
Subject: [PATCH 418/505] Update table accounting_bookeeping to prepare FEC
 format and harmonization

---
 .../install/mysql/migration/5.0.0-6.0.0.sql   | 12 +++++
 .../tables/llx_accounting_bookkeeping.sql     | 54 +++++++++++--------
 2 files changed, 43 insertions(+), 23 deletions(-)

diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index 6ba7707b249..00f616ca56f 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -141,6 +141,18 @@ ALTER TABLE llx_bank_account ADD INDEX idx_fk_accountancy_journal (fk_accountanc
 UPDATE llx_bank_account as ba set fk_accountancy_journal = (SELECT rowid FROM llx_accounting_journal as aj where ba.accountancy_journal = aj.code) where accountancy_journal not in ('1', '2', '3', '4', '5', '6', '5', '8', '9', '10', '11', '12', '13', '14', '15');
 ALTER TABLE llx_bank_account ADD CONSTRAINT fk_bank_account_accountancy_journal FOREIGN KEY (fk_accountancy_journal) REFERENCES llx_accounting_journal (rowid);
 
+--Update general ledger for FEC format & harmonization
+ALTER TABLE llx_accounting_bookkeeping MODIFY COLUMN code_tiers varchar(32);
+ALTER TABLE llx_accounting_bookkeeping MODIFY COLUMN label_compte varchar(255);
+ALTER TABLE llx_accounting_bookkeeping MODIFY COLUMN code_journal varchar(32);
+ALTER TABLE llx_accounting_bookkeeping ADD COLUMN thirdparty_label varchar(255) AFTER code_tiers;
+ALTER TABLE llx_accounting_bookkeeping ADD COLUMN label_operation varchar(255) AFTER label_compte;
+ALTER TABLE llx_accounting_bookkeeping ADD COLUMN multicurrency_amount double AFTER sens;
+ALTER TABLE llx_accounting_bookkeeping ADD COLUMN multicurrency_code varchar(255) AFTER multicurrency_amount;
+ALTER TABLE llx_accounting_bookkeeping ADD COLUMN lettering_code varchar(255) AFTER multicurrency_code;
+ALTER TABLE llx_accounting_bookkeeping ADD COLUMN date_lettering datetime AFTER lettering_code;
+ALTER TABLE llx_accounting_bookkeeping ADD COLUMN journal_label varchar(255) AFTER code_journal;
+ALTER TABLE llx_accounting_bookkeeping ADD COLUMN date_validated datetime AFTER validated;
 
 ALTER TABLE llx_paiementfourn ADD COLUMN model_pdf varchar(255);
 
diff --git a/htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql b/htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql
index c72186c6910..651fee6c339 100644
--- a/htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql
+++ b/htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql
@@ -1,6 +1,6 @@
 -- ============================================================================
 -- Copyright (C) 2013-2014 Olivier Geffroy      <jeff@jeffinfo.com>
--- Copyright (C) 2013-2014 Alexandre Spangaro   <aspangaro.dolibarr@gmail.com>
+-- Copyright (C) 2013-2017 Alexandre Spangaro   <aspangaro@zendsi.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
@@ -19,26 +19,34 @@
 
 CREATE TABLE llx_accounting_bookkeeping 
 (
-  rowid				integer NOT NULL AUTO_INCREMENT PRIMARY KEY,
-  entity			integer DEFAULT 1 NOT NULL,	  -- multi company id
-  doc_date			date NOT NULL,
-  doc_type			varchar(30) NOT NULL,	-- facture_client/reglement_client/facture_fournisseur/reglement_fournisseur
-  doc_ref			varchar(300) NOT NULL,	-- facture_client/reglement_client/... reference number
-  fk_doc			integer NOT NULL,		-- facture_client/reglement_client/... rowid
-  fk_docdet			integer NOT NULL,		-- facture_client/reglement_client/... line rowid
-  code_tiers		varchar(24),			-- code tiers
-  numero_compte		varchar(32) NOT NULL,
-  label_compte		varchar(128) NOT NULL,
-  debit				double NOT NULL,
-  credit			double NOT NULL,
-  montant			double NOT NULL,
-  sens				varchar(1) DEFAULT NULL,
-  fk_user_author	integer NOT NULL,						-- user creating
-  fk_user_modif     integer,                                -- user making last change
-  date_creation		datetime,								-- date de creation
-  tms               timestamp,								-- date last modification 
-  import_key		varchar(14),
-  code_journal		varchar(10) NOT NULL,
-  piece_num			integer NOT NULL,
-  validated         tinyint DEFAULT 0 NOT NULL -- 0 line not validated / 1 line validated (No deleting / No modification) 
+  rowid                 integer NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  entity                integer DEFAULT 1 NOT NULL,	-- 					| multi company id
+  doc_date              date NOT NULL,				-- FEC:PieceDate
+  doc_type              varchar(30) NOT NULL,		-- FEC:PieceRef		| facture_client/reglement_client/facture_fournisseur/reglement_fournisseur
+  doc_ref               varchar(300) NOT NULL,		-- 					| facture_client/reglement_client/... reference number
+  fk_doc                integer NOT NULL,			-- 					| facture_client/reglement_client/... rowid
+  fk_docdet             integer NOT NULL,			-- 					| facture_client/reglement_client/... line rowid
+  code_tiers            varchar(32),				-- FEC:CompAuxNum	| account number of auxiliary account
+  thirdparty_label      varchar(255),				-- FEC:CompAuxLib	| label of auxiliary account
+  numero_compte         varchar(32) NOT NULL,		-- FEC:CompteNum	| account number
+  label_compte          varchar(255) NOT NULL,		-- FEC:CompteLib	| label of account
+  label_operation       varchar(255),				-- FEC:EcritureLib	| label of the operation
+  debit                 double NOT NULL,			-- FEC:Debit
+  credit                double NOT NULL,			-- FEC:Credit
+  montant               double NOT NULL,			-- FEC:Montant (Not necessary)
+  sens                  varchar(1) DEFAULT NULL,	-- FEC:Sens (Not necessary)
+  multicurrency_amount  double,						-- FEC:Montantdevise
+  multicurrency_code    varchar(255),				-- FEC:Idevise
+  lettering_code        varchar(255),				-- FEC:EcritureLet
+  date_lettering        datetime,					-- FEC:DateLet
+  fk_user_author        integer NOT NULL,			-- 					| user creating
+  fk_user_modif         integer,					-- 					| user making last change
+  date_creation         datetime,					-- FEC:EcritureDate	| creation date
+  tms                   timestamp,					--					| date last modification 
+  import_key            varchar(14),
+  code_journal          varchar(32) NOT NULL,		-- FEC:JournalCode
+  journal_label         varchar(255),				-- FEC:JournalLib
+  piece_num             integer NOT NULL,			-- FEC:EcritureNum
+  validated             tinyint DEFAULT 0 NOT NULL,	-- 					| 0 line not validated / 1 line validated (No deleting / No modification) 
+  date_validated        datetime					-- FEC:ValidDate
 ) ENGINE=innodb;

From df05980c3a7d9f011000a7f7a5b20fdd0daab450 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 20 May 2017 10:42:45 +0200
Subject: [PATCH 419/505] Prepare table of notification per object (exemple
 agenda events)

---
 .../install/mysql/migration/5.0.0-6.0.0.sql   | 13 ++++++++
 .../install/mysql/tables/llx_actioncomm.sql   |  2 +-
 htdocs/install/mysql/tables/llx_notify.sql    |  1 +
 .../install/mysql/tables/llx_notify_def.sql   |  5 ++--
 .../mysql/tables/llx_notify_def_object.sql    | 30 +++++++++++++++++++
 5 files changed, 48 insertions(+), 3 deletions(-)
 create mode 100644 htdocs/install/mysql/tables/llx_notify_def_object.sql

diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index 99a00b033c6..fc4bdceb149 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -24,6 +24,19 @@
 -- -- VPGSQL8.2 DELETE FROM llx_usergroup_user      WHERE fk_user      NOT IN (SELECT rowid from llx_user);
 -- -- VMYSQL4.1 DELETE FROM llx_usergroup_user      WHERE fk_usergroup NOT IN (SELECT rowid from llx_usergroup);
 
+
+create table llx_notify_def_object
+(
+  id				integer AUTO_INCREMENT PRIMARY KEY,
+  entity			integer DEFAULT 1 NOT NULL,		-- multi company id
+  objet_type		varchar(16),					-- 'actioncomm'
+  objet_id			integer NOT NULL,				-- id of parent key
+  type_notif		varchar(16) DEFAULT 'browser',	-- 'browser', 'email', 'sms', 'webservice', ...
+  date_notif		datetime,						-- date notification
+  user_id			integer,						-- notification is for this user
+  moreparam			varchar(255)
+)ENGINE=innodb;
+
 ALTER TABLE llx_facturedet_rec ADD COLUMN vat_src_code varchar(10) DEFAULT '' AFTER tva_tx;
 
 ALTER TABLE llx_extrafields ADD COLUMN langs varchar(24);
diff --git a/htdocs/install/mysql/tables/llx_actioncomm.sql b/htdocs/install/mysql/tables/llx_actioncomm.sql
index 46017d1e739..4849aacb690 100644
--- a/htdocs/install/mysql/tables/llx_actioncomm.sql
+++ b/htdocs/install/mysql/tables/llx_actioncomm.sql
@@ -64,7 +64,7 @@ create table llx_actioncomm
   email_tobcc		varchar(256),					-- when event was an email, we store here the email_tobcc
   errors_to			varchar(256),					-- when event was an email, we store here the erros_to
   
-  recurid           varchar(128),                   -- used to store event id to link each other all the repeating event records  
+  recurid           varchar(128),                   -- used to store event id to link each other all the repeating event record
   recurrule         varchar(128),					-- contains string with ical format recurring rule like "FREQ=MONTHLY;INTERVAL=2;BYMONTHDAY=19" or "FREQ=WEEKLY;BYDAY=MO"
   recurdateend      datetime,						-- no more recurring event after this date
      
diff --git a/htdocs/install/mysql/tables/llx_notify.sql b/htdocs/install/mysql/tables/llx_notify.sql
index f595dc7c126..b0fa333dbb9 100644
--- a/htdocs/install/mysql/tables/llx_notify.sql
+++ b/htdocs/install/mysql/tables/llx_notify.sql
@@ -16,6 +16,7 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program. If not, see <http://www.gnu.org/licenses/>.
 --
+-- Table of notification done
 -- ===================================================================
 
 create table llx_notify
diff --git a/htdocs/install/mysql/tables/llx_notify_def.sql b/htdocs/install/mysql/tables/llx_notify_def.sql
index a3fc123c8dd..3641e8cd2e7 100644
--- a/htdocs/install/mysql/tables/llx_notify_def.sql
+++ b/htdocs/install/mysql/tables/llx_notify_def.sql
@@ -15,16 +15,17 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program. If not, see <http://www.gnu.org/licenses/>.
 --
+-- Table to declare permanent notifications (per workflow event)
 -- ===================================================================
 
 create table llx_notify_def
 (
   rowid           integer AUTO_INCREMENT PRIMARY KEY,
   tms             timestamp,
-  datec           date,             -- date de creation
+  datec           date,             			-- date de creation
   fk_action       integer NOT NULL,
   fk_soc          integer,
   fk_contact      integer,
   fk_user		  integer,
-  type            varchar(16) DEFAULT 'email'
+  type            varchar(16) DEFAULT 'email'	-- 'browser', 'email', 'sms', 'webservice', ...
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_notify_def_object.sql b/htdocs/install/mysql/tables/llx_notify_def_object.sql
new file mode 100644
index 00000000000..d1ddd2d1b99
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_notify_def_object.sql
@@ -0,0 +1,30 @@
+-- ========================================================================
+-- Copyright (C) 2017 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/>.
+--
+-- Table to declare notifications (per object)
+-- ========================================================================
+
+create table llx_notify_def_object
+(
+  id				integer AUTO_INCREMENT PRIMARY KEY,
+  entity			integer DEFAULT 1 NOT NULL,		-- multi company id
+  objet_type		varchar(16),					-- 'actioncomm'
+  objet_id			integer NOT NULL,				-- id of parent key
+  type_notif		varchar(16) DEFAULT 'browser',	-- 'browser', 'email', 'sms', 'webservice', ...
+  date_notif		datetime,						-- date notification
+  user_id			integer,						-- notification is for this user
+  moreparam			varchar(255)
+)ENGINE=innodb;

From 601f3ea75e585eff80142a1929ee5ea09d0ba4d7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 20 May 2017 11:31:03 +0200
Subject: [PATCH 420/505] Fix dol_check_secure_access_document in write mode,
 add phpunit tests

---
 htdocs/core/lib/files.lib.php | 123 +++++++++++++++++-----------------
 test/phpunit/FilesLibTest.php |  45 ++++++++++++-
 2 files changed, 104 insertions(+), 64 deletions(-)

diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index f9f6efea8d5..437811d8e98 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -1639,14 +1639,14 @@ function dol_most_recent_file($dir,$regexfilter='',$excludefilter=array('(\.meta
  *
  * @param	string	$modulepart			Module of document ('module', 'module_user_temp', 'module_user' or 'module_temp')
  * @param	string	$original_file		Relative path with filename, relative to modulepart.
- * @param	string	$entity				Restrict onto entity
+ * @param	string	$entity				Restrict onto entity (0=no restriction)
  * @param  	User	$fuser				User object (forced)
  * @param	string	$refname			Ref of object to check permission for external users (autodetect if not provided)
  * @param   string  $more               Check permission for 'read' or 'write'               
  * @return	mixed						Array with access information : 'accessallowed' & 'sqlprotectagainstexternals' & 'original_file' (as a full path name)
  * @see restrictedArea
  */
-function dol_check_secure_access_document($modulepart,$original_file,$entity,$fuser='',$refname='',$mode='read')
+function dol_check_secure_access_document($modulepart, $original_file, $entity, $fuser='', $refname='', $mode='read')
 {
 	global $user, $conf, $db;
 	global $dolibarr_main_data_root;
@@ -1666,6 +1666,13 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 
 	$relative_original_file = $original_file;
 
+	// Define possible keys to use for permission check
+	$lire='lire'; $read='read'; $download='download';
+	if ($mode == 'write')
+	{
+	    $lire='creer'; $read='write'; $download='upload';
+	}
+	 
 	// Wrapping for some images
 	if (($modulepart == 'mycompany' || $modulepart == 'companylogo') && !empty($conf->mycompany->dir_output))
 	{
@@ -1687,125 +1694,125 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 	// Wrapping pour les apercu factures
 	elseif ($modulepart == 'apercufacture' && !empty($conf->facture->dir_output))
 	{
-		if ($fuser->rights->facture->lire) $accessallowed=1;
+		if ($fuser->rights->facture->{$lire}) $accessallowed=1;
 		$original_file=$conf->facture->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les apercu propal
 	elseif ($modulepart == 'apercupropal' && !empty($conf->propal->dir_output))
 	{
-		if ($fuser->rights->propale->lire) $accessallowed=1;
+		if ($fuser->rights->propale->{$lire}) $accessallowed=1;
 		$original_file=$conf->propal->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les apercu commande
 	elseif ($modulepart == 'apercucommande' && !empty($conf->commande->dir_output))
 	{
-		if ($fuser->rights->commande->lire) $accessallowed=1;
+		if ($fuser->rights->commande->{$lire}) $accessallowed=1;
 		$original_file=$conf->commande->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les apercu intervention
 	elseif (($modulepart == 'apercufichinter' || $modulepart == 'apercuficheinter') && !empty($conf->ficheinter->dir_output))
 	{
-	    if ($fuser->rights->ficheinter->lire) $accessallowed=1;
+	    if ($fuser->rights->ficheinter->{$lire}) $accessallowed=1;
 	    $original_file=$conf->ficheinter->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les apercu conat
 	elseif (($modulepart == 'apercucontract') && !empty($conf->contrat->dir_output))
 	{
-	    if ($fuser->rights->contrat->lire) $accessallowed=1;
+	    if ($fuser->rights->contrat->{$lire}) $accessallowed=1;
 	    $original_file=$conf->contrat->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les apercu supplier proposal
 	elseif (($modulepart == 'apercusupplier_proposal' || $modulepart == 'apercusupplier_proposal') && !empty($conf->supplier_proposal->dir_output))
 	{
-	    if ($fuser->rights->supplier_proposal->lire) $accessallowed=1;
+	    if ($fuser->rights->supplier_proposal->{$lire}) $accessallowed=1;
 	    $original_file=$conf->supplier_proposal->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les apercu supplier order
 	elseif (($modulepart == 'apercusupplier_order' || $modulepart == 'apercusupplier_order') && !empty($conf->fournisseur->commande->dir_output))
 	{
-	    if ($fuser->rights->fournisseur->commande->lire) $accessallowed=1;
+	    if ($fuser->rights->fournisseur->commande->{$lire}) $accessallowed=1;
 	    $original_file=$conf->fournisseur->commande->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les apercu supplier invoice
 	elseif (($modulepart == 'apercusupplier_invoice' || $modulepart == 'apercusupplier_invoice') && !empty($conf->fournisseur->facture->dir_output))
 	{
-	    if ($fuser->rights->fournisseur->facture->lire) $accessallowed=1;
+	    if ($fuser->rights->fournisseur->facture->{$lire}) $accessallowed=1;
 	    $original_file=$conf->fournisseur->facture->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les images des stats propales
 	elseif ($modulepart == 'propalstats' && !empty($conf->propal->dir_temp))
 	{
-		if ($fuser->rights->propale->lire) $accessallowed=1;
+		if ($fuser->rights->propale->{$lire}) $accessallowed=1;
 		$original_file=$conf->propal->dir_temp.'/'.$original_file;
 	}
 	// Wrapping pour les images des stats commandes
 	elseif ($modulepart == 'orderstats' && !empty($conf->commande->dir_temp))
 	{
-		if ($fuser->rights->commande->lire) $accessallowed=1;
+		if ($fuser->rights->commande->{$lire}) $accessallowed=1;
 		$original_file=$conf->commande->dir_temp.'/'.$original_file;
 	}
 	elseif ($modulepart == 'orderstatssupplier' && !empty($conf->fournisseur->dir_output))
 	{
-		if ($fuser->rights->fournisseur->commande->lire) $accessallowed=1;
+		if ($fuser->rights->fournisseur->commande->{$lire}) $accessallowed=1;
 		$original_file=$conf->fournisseur->dir_output.'/commande/temp/'.$original_file;
 	}
 	// Wrapping pour les images des stats factures
 	elseif ($modulepart == 'billstats' && !empty($conf->facture->dir_temp))
 	{
-		if ($fuser->rights->facture->lire) $accessallowed=1;
+		if ($fuser->rights->facture->{$lire}) $accessallowed=1;
 		$original_file=$conf->facture->dir_temp.'/'.$original_file;
 	}
 	elseif ($modulepart == 'billstatssupplier' && !empty($conf->fournisseur->dir_output))
 	{
-		if ($fuser->rights->fournisseur->facture->lire) $accessallowed=1;
+		if ($fuser->rights->fournisseur->facture->{$lire}) $accessallowed=1;
 		$original_file=$conf->fournisseur->dir_output.'/facture/temp/'.$original_file;
 	}
 	// Wrapping pour les images des stats expeditions
 	elseif ($modulepart == 'expeditionstats' && !empty($conf->expedition->dir_temp))
 	{
-		if ($fuser->rights->expedition->lire) $accessallowed=1;
+		if ($fuser->rights->expedition->{$lire}) $accessallowed=1;
 		$original_file=$conf->expedition->dir_temp.'/'.$original_file;
 	}
 	// Wrapping pour les images des stats expeditions
 	elseif ($modulepart == 'tripsexpensesstats' && !empty($conf->deplacement->dir_temp))
 	{
-		if ($fuser->rights->deplacement->lire) $accessallowed=1;
+		if ($fuser->rights->deplacement->{$lire}) $accessallowed=1;
 		$original_file=$conf->deplacement->dir_temp.'/'.$original_file;
 	}
 	// Wrapping pour les images des stats expeditions
 	elseif ($modulepart == 'memberstats' && !empty($conf->adherent->dir_temp))
 	{
-		if ($fuser->rights->adherent->lire) $accessallowed=1;
+		if ($fuser->rights->adherent->{$lire}) $accessallowed=1;
 		$original_file=$conf->adherent->dir_temp.'/'.$original_file;
 	}
 	// Wrapping pour les images des stats produits
 	elseif (preg_match('/^productstats_/i',$modulepart) && !empty($conf->product->dir_temp))
 	{
-		if ($fuser->rights->produit->lire || $fuser->rights->service->lire) $accessallowed=1;
+		if ($fuser->rights->produit->{$lire} || $fuser->rights->service->{$lire}) $accessallowed=1;
 		$original_file=(!empty($conf->product->multidir_temp[$entity])?$conf->product->multidir_temp[$entity]:$conf->service->multidir_temp[$entity]).'/'.$original_file;
 	}
 	// Wrapping for taxes
 	elseif ($modulepart == 'tax' && !empty($conf->tax->dir_output))
 	{
-		if ($fuser->rights->tax->charges->lire) $accessallowed=1;
+		if ($fuser->rights->tax->charges->{$lire}) $accessallowed=1;
 		$original_file=$conf->tax->dir_output.'/'.$original_file;
 	}
 	// Wrapping for events
 	elseif ($modulepart == 'actions' && !empty($conf->agenda->dir_output))
 	{
-		if ($fuser->rights->agenda->myactions->read) $accessallowed=1;
+		if ($fuser->rights->agenda->myactions->{$read}) $accessallowed=1;
 		$original_file=$conf->agenda->dir_output.'/'.$original_file;
 	}
 	// Wrapping for categories
 	elseif ($modulepart == 'category' && !empty($conf->categorie->dir_output))
 	{
-		if ($fuser->rights->categorie->lire) $accessallowed=1;
+		if ($fuser->rights->categorie->{$lire}) $accessallowed=1;
 		$original_file=$conf->categorie->multidir_output[$entity].'/'.$original_file;
 	}
 	// Wrapping pour les prelevements
 	elseif ($modulepart == 'prelevement' && !empty($conf->prelevement->dir_output))
 	{
-		if ($fuser->rights->prelevement->bons->lire || preg_match('/^specimen/i',$original_file)) $accessallowed=1;
+		if ($fuser->rights->prelevement->bons->{$lire} || preg_match('/^specimen/i',$original_file)) $accessallowed=1;
 		$original_file=$conf->prelevement->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les graph energie
@@ -1856,7 +1863,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 	// Wrapping for users
 	else if ($modulepart == 'user' && !empty($conf->user->dir_output))
 	{
-        $canreaduser=(! empty($fuser->admin) || $fuser->rights->user->user->lire);
+        $canreaduser=(! empty($fuser->admin) || $fuser->rights->user->user->{$lire});
         if ($fuser->id == (int) $refname) { $canreaduser=1; } // A user can always read its own card
         if ($canreaduser || preg_match('/^specimen/i',$original_file))
 	    {
@@ -1868,7 +1875,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 	// Wrapping for third parties
 	else if (($modulepart == 'company' || $modulepart == 'societe') && !empty($conf->societe->dir_output))
 	{
-		if ($fuser->rights->societe->lire || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->societe->{$lire} || preg_match('/^specimen/i',$original_file))
 		{
 			$accessallowed=1;
 		}
@@ -1879,7 +1886,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 	// Wrapping for contact
 	else if ($modulepart == 'contact' && !empty($conf->societe->dir_output))
 	{
-		if ($fuser->rights->societe->lire)
+		if ($fuser->rights->societe->{$lire})
 		{
 			$accessallowed=1;
 		}
@@ -1889,7 +1896,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 	// Wrapping for invoices
 	else if (($modulepart == 'facture' || $modulepart == 'invoice') && !empty($conf->facture->dir_output))
 	{
-		if ($fuser->rights->facture->lire || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->facture->{$lire} || preg_match('/^specimen/i',$original_file))
 		{
 			$accessallowed=1;
 		}
@@ -1899,7 +1906,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 	// Wrapping for mass actions
 	else if ($modulepart == 'massfilesarea_proposals' && !empty($conf->propal->dir_output))
 	{
-	    if ($fuser->rights->propal->lire || preg_match('/^specimen/i',$original_file))
+	    if ($fuser->rights->propal->{$lire} || preg_match('/^specimen/i',$original_file))
 	    {
 	        $accessallowed=1;
 	    }
@@ -1907,7 +1914,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 	}
 	else if ($modulepart == 'massfilesarea_orders')
 	{
-	    if ($fuser->rights->commande->lire || preg_match('/^specimen/i',$original_file))
+	    if ($fuser->rights->commande->{$lire} || preg_match('/^specimen/i',$original_file))
 	    {
 	        $accessallowed=1;
 	    }
@@ -1915,7 +1922,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 	}
 	else if ($modulepart == 'massfilesarea_invoices')
 	{
-	    if ($fuser->rights->facture->lire || preg_match('/^specimen/i',$original_file))
+	    if ($fuser->rights->facture->{$lire} || preg_match('/^specimen/i',$original_file))
 	    {
 	        $accessallowed=1;
 	    }
@@ -1923,7 +1930,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 	}
 	else if ($modulepart == 'massfilesarea_expensereport')
 	{
-	    if ($fuser->rights->facture->lire || preg_match('/^specimen/i',$original_file))
+	    if ($fuser->rights->facture->{$lire} || preg_match('/^specimen/i',$original_file))
 	    {
 	        $accessallowed=1;
 	    }
@@ -1931,7 +1938,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 	}
 	else if ($modulepart == 'massfilesarea_interventions')
 	{
-	    if ($fuser->rights->ficheinter->lire || preg_match('/^specimen/i',$original_file))
+	    if ($fuser->rights->ficheinter->{$lire} || preg_match('/^specimen/i',$original_file))
 	    {
 	        $accessallowed=1;
 	    }
@@ -1939,7 +1946,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 	}
 	else if ($modulepart == 'massfilesarea_supplier_proposal' && !empty($conf->propal->dir_output))
 	{
-	    if ($fuser->rights->supplier_proposal->lire || preg_match('/^specimen/i',$original_file))
+	    if ($fuser->rights->supplier_proposal->{$lire} || preg_match('/^specimen/i',$original_file))
 	    {
 	        $accessallowed=1;
 	    }
@@ -1947,7 +1954,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 	}
 	else if ($modulepart == 'massfilesarea_supplier_order')
 	{
-	    if ($fuser->rights->fournisseur->commande->lire || preg_match('/^specimen/i',$original_file))
+	    if ($fuser->rights->fournisseur->commande->{$lire} || preg_match('/^specimen/i',$original_file))
 	    {
 	        $accessallowed=1;
 	    }
@@ -1955,7 +1962,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 	}
 	else if ($modulepart == 'massfilesarea_supplier_invoice')
 	{
-	    if ($fuser->rights->fournisseur->facture->lire || preg_match('/^specimen/i',$original_file))
+	    if ($fuser->rights->fournisseur->facture->{$lire} || preg_match('/^specimen/i',$original_file))
 	    {
 	        $accessallowed=1;
 	    }
@@ -1965,7 +1972,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 	// Wrapping for interventions
 	else if (($modulepart == 'fichinter' || $modulepart == 'ficheinter') && !empty($conf->ficheinter->dir_output))
 	{
-		if ($fuser->rights->ficheinter->lire || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->ficheinter->{$lire} || preg_match('/^specimen/i',$original_file))
 		{
 			$accessallowed=1;
 		}
@@ -1976,7 +1983,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 	// Wrapping pour les deplacements et notes de frais
 	else if ($modulepart == 'deplacement' && !empty($conf->deplacement->dir_output))
 	{
-		if ($fuser->rights->deplacement->lire || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->deplacement->{$lire} || preg_match('/^specimen/i',$original_file))
 		{
 			$accessallowed=1;
 		}
@@ -1986,7 +1993,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 	// Wrapping pour les propales
 	else if ($modulepart == 'propal' && !empty($conf->propal->dir_output))
 	{
-		if ($fuser->rights->propale->lire || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->propale->{$lire} || preg_match('/^specimen/i',$original_file))
 		{
 			$accessallowed=1;
 		}
@@ -1998,7 +2005,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 	// Wrapping pour les commandes
 	else if (($modulepart == 'commande' || $modulepart == 'order') && !empty($conf->commande->dir_output))
 	{
-		if ($fuser->rights->commande->lire || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->commande->{$lire} || preg_match('/^specimen/i',$original_file))
 		{
 			$accessallowed=1;
 		}
@@ -2009,7 +2016,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 	// Wrapping pour les projets
 	else if ($modulepart == 'project' && !empty($conf->projet->dir_output))
 	{
-		if ($fuser->rights->projet->lire || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->projet->{$lire} || preg_match('/^specimen/i',$original_file))
 		{
 			$accessallowed=1;
 		}
@@ -2018,7 +2025,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 	}
 	else if ($modulepart == 'project_task' && !empty($conf->projet->dir_output))
 	{
-		if ($fuser->rights->projet->lire || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->projet->{$lire} || preg_match('/^specimen/i',$original_file))
 		{
 			$accessallowed=1;
 		}
@@ -2029,7 +2036,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 	// Wrapping pour les commandes fournisseurs
 	else if (($modulepart == 'commande_fournisseur' || $modulepart == 'order_supplier') && !empty($conf->fournisseur->commande->dir_output)) 
 	{
-		if ($fuser->rights->fournisseur->commande->lire || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->fournisseur->commande->{$lire} || preg_match('/^specimen/i',$original_file))
 		{
 			$accessallowed=1;
 		}
@@ -2040,7 +2047,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 	// Wrapping pour les factures fournisseurs
 	else if (($modulepart == 'facture_fournisseur' || $modulepart == 'invoice_supplier') && !empty($conf->fournisseur->facture->dir_output))
 	{
-		if ($fuser->rights->fournisseur->facture->lire || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->fournisseur->facture->{$lire} || preg_match('/^specimen/i',$original_file))
 		{
 			$accessallowed=1;
 		}
@@ -2050,7 +2057,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 	// Wrapping pour les rapport de paiements
 	else if ($modulepart == 'supplier_payment')
 	{
-		if ($fuser->rights->fournisseur->facture->lire || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->fournisseur->facture->{$lire} || preg_match('/^specimen/i',$original_file))
 		{
 			$accessallowed=1;
 		}
@@ -2061,7 +2068,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 	// Wrapping pour les rapport de paiements
 	else if ($modulepart == 'facture_paiement' && !empty($conf->facture->dir_output))
 	{
-		if ($fuser->rights->facture->lire || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->facture->{$lire} || preg_match('/^specimen/i',$original_file))
 		{
 			$accessallowed=1;
 		}
@@ -2082,7 +2089,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 	// Wrapping pour les expedition
 	else if ($modulepart == 'expedition' && !empty($conf->expedition->dir_output))
 	{
-		if ($fuser->rights->expedition->lire || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->expedition->{$lire} || preg_match('/^specimen/i',$original_file))
 		{
 			$accessallowed=1;
 		}
@@ -2091,7 +2098,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 	// Wrapping pour les bons de livraison
 	else if ($modulepart == 'livraison' && !empty($conf->expedition->dir_output))
 	{
-		if ($fuser->rights->expedition->livraison->lire || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->expedition->livraison->{$lire} || preg_match('/^specimen/i',$original_file))
 		{
 			$accessallowed=1;
 		}
@@ -2101,7 +2108,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 	// Wrapping pour les actions
 	else if ($modulepart == 'actions' && !empty($conf->agenda->dir_output))
 	{
-		if ($fuser->rights->agenda->myactions->read || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->agenda->myactions->{$read} || preg_match('/^specimen/i',$original_file))
 		{
 			$accessallowed=1;
 		}
@@ -2111,7 +2118,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 	// Wrapping pour les actions
 	else if ($modulepart == 'actionsreport' && !empty($conf->agenda->dir_temp))
 	{
-		if ($fuser->rights->agenda->allactions->read || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->agenda->allactions->{$read} || preg_match('/^specimen/i',$original_file))
 		{
 			$accessallowed=1;
 		}
@@ -2121,7 +2128,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 	// Wrapping pour les produits et services
 	else if ($modulepart == 'product' || $modulepart == 'produit' || $modulepart == 'service' || $modulepart == 'produit|service')
 	{
-		if (($fuser->rights->produit->lire || $fuser->rights->service->lire) || preg_match('/^specimen/i',$original_file))
+		if (($fuser->rights->produit->{$lire} || $fuser->rights->service->{$lire}) || preg_match('/^specimen/i',$original_file))
 		{
 			$accessallowed=1;
 		}
@@ -2132,7 +2139,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 	// Wrapping pour les contrats
 	else if ($modulepart == 'contract' && !empty($conf->contrat->dir_output))
 	{
-		if ($fuser->rights->contrat->lire || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->contrat->{$lire} || preg_match('/^specimen/i',$original_file))
 		{
 			$accessallowed=1;
 		}
@@ -2143,7 +2150,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 	// Wrapping pour les dons
 	else if ($modulepart == 'donation' && !empty($conf->don->dir_output))
 	{
-		if ($fuser->rights->don->lire || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->don->{$lire} || preg_match('/^specimen/i',$original_file))
 		{
 			$accessallowed=1;
 		}
@@ -2153,7 +2160,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 	// Wrapping pour les remises de cheques
 	else if ($modulepart == 'remisecheque' && !empty($conf->banque->dir_output))
 	{
-		if ($fuser->rights->banque->lire || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->banque->{$lire} || preg_match('/^specimen/i',$original_file))
 		{
 			$accessallowed=1;
 		}
@@ -2164,7 +2171,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 	// Wrapping for bank
 	else if ($modulepart == 'bank' && !empty($conf->bank->dir_output))
 	{
-		if ($fuser->rights->banque->lire)
+		if ($fuser->rights->banque->{$lire})
 		{
 			$accessallowed=1;
 		}
@@ -2227,7 +2234,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 	// Wrapping pour Foundation module
 	else if ($modulepart == 'member' && !empty($conf->adherent->dir_output))
 	{
-		if ($fuser->rights->adherent->lire || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->adherent->{$lire} || preg_match('/^specimen/i',$original_file))
 		{
 			$accessallowed=1;
 		}
@@ -2248,12 +2255,6 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
     // If modulepart=module				Allows any module to open a file if file is in directory called DOL_DATA_ROOT/modulepart
     else
 	{
-	    $lire='lire'; $read='read'; $download='download';
-	    if ($mode == 'write')
-	    {
-	        $lire='creer'; $read='write'; $download='upload';
-	    }
-	    
 	    if (preg_match('/^specimen/i',$original_file))	$accessallowed=1;    // If link to a file called specimen. Test must be done before changing $original_file int full path. 
 	    if ($fuser->admin) $accessallowed=1;    // If user is admin
 
diff --git a/test/phpunit/FilesLibTest.php b/test/phpunit/FilesLibTest.php
index ddfcb8ed217..819c44216fe 100644
--- a/test/phpunit/FilesLibTest.php
+++ b/test/phpunit/FilesLibTest.php
@@ -434,9 +434,48 @@ class FilesLibTest extends PHPUnit_Framework_TestCase
     
         //$dummyuser=new User($db);
         //$result=restrictedArea($dummyuser,'societe');
+
+        $user->rights->facture->lire = 0;
+        $user->rights->facture->creer = 0;
+        $filename='SPECIMEN.pdf';             // Filename relative to module part
+        $result=dol_check_secure_access_document('facture', $filename, 0, '', '', 'read');
+        $this->assertEquals(1,$result['accessallowed']);
+        
+        
+        // Check read permission
+        $user->rights->facture->lire = 1;
+        $user->rights->facture->creer = 1;
+        $filename='FA010101/FA010101.pdf';    // Filename relative to module part
+        $result=dol_check_secure_access_document('facture', $filename, 0, '', '', 'read');
+        $this->assertEquals(1,$result['accessallowed']);
+        
+        $user->rights->facture->lire = 0;
+        $user->rights->facture->creer = 0;
+        $filename='FA010101/FA010101.pdf';    // Filename relative to module part
+        $result=dol_check_secure_access_document('facture', $filename, 0, '', '', 'read');
+        $this->assertEquals(0,$result['accessallowed']);
+        
+        // Check write permission
+        $user->rights->facture->lire = 0;
+        $user->rights->facture->creer = 0;
+        $filename='FA010101/FA010101.pdf';    // Filename relative to module part
+        $result=dol_check_secure_access_document('facture', $filename, 0, '', '', 'write');
+        var_dump($result);
+        $this->assertEquals(0,$result['accessallowed']);
+        
+        $user->rights->facture->lire = 1;
+        $user->rights->facture->creer = 1;
+        $filename='FA010101/FA010101.pdf';    // Filename relative to module part
+        $result=dol_check_secure_access_document('facture', $filename, 0, '', '', 'write');
+        var_dump($result);
+        $this->assertEquals(1,$result['accessallowed']);
     
-        //$result=dol_check_secure_access_document($user,'societe');
-        //$this->assertEquals(1,$result);
+        $user->rights->facture->lire = 1;
+        $user->rights->facture->creer = 0;
+        $filename='FA010101/FA010101.pdf';    // Filename relative to module part
+        $result=dol_check_secure_access_document('facture', $filename, 0, '', '', 'write');
+        var_dump($result);
+        $this->assertEquals(0,$result['accessallowed']);
     }    
-    
+
 }

From 864dc0d9897dc2f84599b58fa5dc258e97ff89cb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 20 May 2017 11:59:32 +0200
Subject: [PATCH 421/505] Remove var_dump

---
 test/phpunit/FilesLibTest.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/test/phpunit/FilesLibTest.php b/test/phpunit/FilesLibTest.php
index 819c44216fe..d1a5f48ae8d 100644
--- a/test/phpunit/FilesLibTest.php
+++ b/test/phpunit/FilesLibTest.php
@@ -460,21 +460,18 @@ class FilesLibTest extends PHPUnit_Framework_TestCase
         $user->rights->facture->creer = 0;
         $filename='FA010101/FA010101.pdf';    // Filename relative to module part
         $result=dol_check_secure_access_document('facture', $filename, 0, '', '', 'write');
-        var_dump($result);
         $this->assertEquals(0,$result['accessallowed']);
         
         $user->rights->facture->lire = 1;
         $user->rights->facture->creer = 1;
         $filename='FA010101/FA010101.pdf';    // Filename relative to module part
         $result=dol_check_secure_access_document('facture', $filename, 0, '', '', 'write');
-        var_dump($result);
         $this->assertEquals(1,$result['accessallowed']);
     
         $user->rights->facture->lire = 1;
         $user->rights->facture->creer = 0;
         $filename='FA010101/FA010101.pdf';    // Filename relative to module part
         $result=dol_check_secure_access_document('facture', $filename, 0, '', '', 'write');
-        var_dump($result);
         $this->assertEquals(0,$result['accessallowed']);
     }    
 

From 80cbc2838585997c50731d647059e8a78be3a10b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 20 May 2017 15:52:36 +0200
Subject: [PATCH 422/505] NEW Add REST API to push a file.

---
 htdocs/accountancy/admin/categories_list.php  |   2 +-
 htdocs/accountancy/admin/journals_list.php    |   2 +-
 htdocs/admin/dict.php                         |   4 +-
 htdocs/admin/mails_templates.php              |   2 +-
 htdocs/api/admin/explorer.php                 |   2 +
 ....php => api_dictionarycountries.class.php} |   5 +-
 ...lass.php => api_dictionarytowns.class.php} |   5 +-
 htdocs/api/class/api_documents.class.php      | 127 +++++++++++++-----
 htdocs/api/class/api_login.class.php          |   2 +-
 htdocs/core/class/html.form.class.php         |   2 +-
 htdocs/core/lib/functions.lib.php             |   4 +-
 htdocs/core/modules/modResource.class.php     |   2 +-
 .../install/mysql/migration/4.0.0-5.0.0.sql   |   2 +-
 .../mysql/tables/llx_user_employment.sql      |   2 +-
 htdocs/variants/generator.php                 |  14 +-
 test/phpunit/RestAPIDocumentTest.php          |  21 ++-
 16 files changed, 126 insertions(+), 72 deletions(-)
 rename htdocs/api/class/{api_dictionnarycountries.class.php => api_dictionarycountries.class.php} (97%)
 rename htdocs/api/class/{api_dictionnarytowns.class.php => api_dictionarytowns.class.php} (95%)

diff --git a/htdocs/accountancy/admin/categories_list.php b/htdocs/accountancy/admin/categories_list.php
index 86be6aa52ab..c0fa895ae4c 100644
--- a/htdocs/accountancy/admin/categories_list.php
+++ b/htdocs/accountancy/admin/categories_list.php
@@ -929,7 +929,7 @@ if ($id)
                     {
                         print '<td align="center">';
                         if ($user->admin) print '<a href="'.$url.'action=delete">'.img_delete().'</a>';
-                        //else print '<a href="#">'.img_delete().'</a>';    // Some dictionnary can be edited by other profile than admin
+                        //else print '<a href="#">'.img_delete().'</a>';    // Some dictionary can be edited by other profile than admin
                         print '</td>';
                     }
                     else print '<td>&nbsp;</td>';
diff --git a/htdocs/accountancy/admin/journals_list.php b/htdocs/accountancy/admin/journals_list.php
index facb507c530..1421d71be97 100644
--- a/htdocs/accountancy/admin/journals_list.php
+++ b/htdocs/accountancy/admin/journals_list.php
@@ -676,7 +676,7 @@ if ($id)
                     {
                         print '<td align="center">';
                         if ($user->admin) print '<a href="'.$url.'action=delete">'.img_delete().'</a>';
-                        //else print '<a href="#">'.img_delete().'</a>';    // Some dictionnary can be edited by other profile than admin
+                        //else print '<a href="#">'.img_delete().'</a>';    // Some dictionary can be edited by other profile than admin
                         print '</td>';
                     }
                     else print '<td>&nbsp;</td>';
diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 8319ccd0450..28db9ef8b49 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -1100,7 +1100,7 @@ if ($id)
         $reshook=$hookmanager->executeHooks('createDictionaryFieldlist',$parameters, $obj, $tmpaction);    // Note that $action and $object may have been modified by some hooks
         $error=$hookmanager->error; $errors=$hookmanager->errors;
 
-        if ($id == 3) unset($fieldlist[2]); // Remove field ??? if dictionnary Regions
+        if ($id == 3) unset($fieldlist[2]); // Remove field ??? if dictionary Regions
 
         if (empty($reshook))
         {
@@ -1555,7 +1555,7 @@ if ($id)
                     {
                         print '<td align="center">';
                         if ($user->admin) print '<a href="'.$url.'action=delete">'.img_delete().'</a>';
-                        //else print '<a href="#">'.img_delete().'</a>';    // Some dictionnary can be edited by other profile than admin
+                        //else print '<a href="#">'.img_delete().'</a>';    // Some dictionary can be edited by other profile than admin
                         print '</td>';
                     }
                     else print '<td>&nbsp;</td>';
diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php
index a403cf1f493..b9e5df738ad 100644
--- a/htdocs/admin/mails_templates.php
+++ b/htdocs/admin/mails_templates.php
@@ -767,7 +767,7 @@ if ($resql)
                 {
                     print '<td align="center">';
                     if ($user->admin) print '<a href="'.$url.'action=delete">'.img_delete().'</a>';
-                    //else print '<a href="#">'.img_delete().'</a>';    // Some dictionnary can be edited by other profile than admin
+                    //else print '<a href="#">'.img_delete().'</a>';    // Some dictionary can be edited by other profile than admin
                     print '</td>';
                 }
                 else print '<td>&nbsp;</td>';
diff --git a/htdocs/api/admin/explorer.php b/htdocs/api/admin/explorer.php
index c83d759dcd6..b09acb6772a 100644
--- a/htdocs/api/admin/explorer.php
+++ b/htdocs/api/admin/explorer.php
@@ -14,6 +14,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * 
+ * @deprecated      Old explorer. Not using Swagger. See instead explorer in htdocs/api/index.php.
  */
 
 /**
diff --git a/htdocs/api/class/api_dictionnarycountries.class.php b/htdocs/api/class/api_dictionarycountries.class.php
similarity index 97%
rename from htdocs/api/class/api_dictionnarycountries.class.php
rename to htdocs/api/class/api_dictionarycountries.class.php
index ddb3e2474a9..070be509a8a 100644
--- a/htdocs/api/class/api_dictionnarycountries.class.php
+++ b/htdocs/api/class/api_dictionarycountries.class.php
@@ -27,7 +27,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/ccountry.class.php';
  * @access protected
  * @class DolibarrApiAccess {@requires user,external}
  */
-class DictionnaryCountries extends DolibarrApi
+class DictionaryCountries extends DolibarrApi
 {
     private $translations = null;
 
@@ -93,7 +93,8 @@ class DictionnaryCountries extends DolibarrApi
 
         if ($result) {
             $num = $this->db->num_rows($result);
-            for ($i = 0; $i < min($num, ($limit <= 0 ? $num : $limit)); $i++) {
+            $min = min($num, ($limit <= 0 ? $num : $limit));
+            for ($i = 0; $i < $min; $i++) {
                 $obj = $this->db->fetch_object($result);
                 $country = new Ccountry($this->db);
                 if ($country->fetch($obj->rowid) > 0) {
diff --git a/htdocs/api/class/api_dictionnarytowns.class.php b/htdocs/api/class/api_dictionarytowns.class.php
similarity index 95%
rename from htdocs/api/class/api_dictionnarytowns.class.php
rename to htdocs/api/class/api_dictionarytowns.class.php
index da58c9109eb..0ebcfbe0b17 100644
--- a/htdocs/api/class/api_dictionnarytowns.class.php
+++ b/htdocs/api/class/api_dictionarytowns.class.php
@@ -27,7 +27,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/ccountry.class.php';
  * @access protected
  * @class DolibarrApiAccess {@requires user,external}
  */
-class DictionnaryTowns extends DolibarrApi
+class DictionaryTowns extends DolibarrApi
 {
     /**
      * Constructor
@@ -88,7 +88,8 @@ class DictionnaryTowns extends DolibarrApi
 
         if ($result) {
             $num = $this->db->num_rows($result);
-            for ($i = 0; $i < min($num, ($limit <= 0 ? $num : $limit)); $i++) {
+            $min = min($num, ($limit <= 0 ? $num : $limit));
+            for ($i = 0; $i < $min; $i++) {
                 $list[] = $this->db->fetch_object($result);
             }
         } else {
diff --git a/htdocs/api/class/api_documents.class.php b/htdocs/api/class/api_documents.class.php
index ca10b2befce..6650fc45401 100644
--- a/htdocs/api/class/api_documents.class.php
+++ b/htdocs/api/class/api_documents.class.php
@@ -58,23 +58,33 @@ class Documents extends DolibarrApi
      *
      * @return array
      * @throws RestException
-     *
      */
+     /*
      public function get($module_part, $filename) {
 
-     }
+     }*/
 
 
     /**
-     * Receive file
+     * Push a file. 
+     * Test sample: { "filename": "mynewfile.txt", "modulepart": "facture", "ref": "FA1701-001", "subdir": "", "filecontent": "content text", "fileencoding": "" }
      *
-     * @param   array   $request_data   Request datas
-     *
-     * @return  bool     State of copy
+     * @param   string  $filename           Name of file to create ('FA1705-0123')
+     * @param   string  $modulepart         Module part ('facture', ...)
+     * @param   string  $ref                Reference of object (This will define subdir automatically and store submited file into it)
+     * @param   string  $subdir             Subdirectory (Only if refname not provided)
+     * @param   string  $filecontent        File content (string with file content. An empty file will be created if this parameter is not provided)
+     * @param   string  $fileencoding       File encoding (''=no encoding, 'base64'=Base 64)
+     * @return  bool     				    State of copy
      * @throws RestException
      */
-    public function post($request_data) {
-        global $conf;
+    public function post($filename, $modulepart, $ref='', $subdir='', $filecontent='', $fileencoding='') {
+        global $db, $conf;
+        
+        /*var_dump($modulepart);
+        var_dump($filename);
+        var_dump($filecontent);
+        exit;*/
         
         require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
 
@@ -82,46 +92,89 @@ class Documents extends DolibarrApi
             throw new RestException(401);
         }
 
-        // Suppression de la chaine de caractere ../ dans $original_file
-		$original_file = str_replace("../","/", $request_data['name']);
-        $refname = str_replace("../","/", $request_data['refname']);
+        $newfilecontent = '';
+        if (empty($fileencoding)) $newfilecontent = $filecontent;
+        if ($fileencoding == 'base64') $newfilecontent = base64_decode($filecontent);
 
-		// find the subdirectory name as the reference
-		if (empty($request_data['refname'])) $refname=basename(dirname($original_file)."/");
+		$original_file = dol_sanitizeFileName($filename);
 
+		// Define $uploadir
+		$object = null;
+		$entity = $user->entity;
+		if ($ref)
+		{
+    		if ($modulepart == 'facture' || $modulepart == 'invoice')
+    		{
+    		    $modulepart='facture';
+    		    $object=new Facture($db);
+    		    $result = $object->fetch('', $ref);
+    		    if (! ($result > 0))
+    		    {
+    		        throw new RestException(500, 'The object '.$modulepart." with ref '".$ref."' was not found.");
+    		    }
+    		    if (! empty($entity))
+    		    {
+    		        $tmpreldir = get_exdir(0, 0, 0, 0, $object, $modulepart);
+                    $upload_dir = $conf->{$modulepart}->multidir_output[$entity].'/'.$tmpreldir.$object->ref;
+    		    }
+    		    else
+    		    {
+    		        $tmpreldir = get_exdir(0, 0, 0, 0, $object, $modulepart);
+    		        $upload_dir = $conf->{$modulepart}->dir_output.'/'.$tmpreldir.$object->ref;
+    		    }
+    		}
+    		
+    		if (empty($upload_dir) || $upload_dir == '/')
+    		{
+    		    throw new RestException(500, 'This value of modulepart does not support yet usage of refname. Check modulepart parameter or try to use subdir parameter instead of ref.');
+    		}
+		}
+		else
+		{
+		    if ($modulepart == 'invoice') $modulepart ='facture';
+		    if (empty($conf->{$modulepart}->dir_output))
+		    {
+		        throw new RestException(500, 'This value of modulepart is not supported with refname not defined.');
+		    }
+		    $upload_dir = $conf->{$modulepart}->multidir_output[$entity];
+
+		    if (empty($upload_dir) || $upload_dir == '/')
+		    {
+		        throw new RestException(500, 'This value of modulepart is not yet supported.');
+		    }
+		}
+		$upload_dir = dol_sanitizePathName($upload_dir);
+		
         // Security:
-		// On interdit les remontees de repertoire ainsi que les pipe dans
-		// les noms de fichiers.
-		if (preg_match('/\.\./',$original_file) || preg_match('/[<>|]/',$original_file))
-		{
-            throw new RestException(401,'Refused to deliver file '.$original_file);
-		}
-        if (preg_match('/\.\./',$refname) || preg_match('/[<>|]/',$refname))
-		{
-            throw new RestException(401,'Refused to deliver file '.$refname);
-		}
-
-        $modulepart = $request_data['modulepart'];
+        // TODO Use dol_check_secure_access_document
 
         // Check mandatory fields
-        $result = $this->_validate_file($request_data);
+        //$result = $this->_validate_file($request_data);
 
-        $upload_dir = DOL_DATA_ROOT . '/' .$modulepart.'/'.dol_sanitizeFileName($refname);
-        $destfile = $upload_dir . $original_file;
+        $destfile = $upload_dir . '/' . $original_file;
 
-        if (!is_dir($upload_dir)) {
+        if (!dol_is_dir($upload_dir)) {
             throw new RestException(401,'Directory not exists : '.$upload_dir);
         }
 
-        $file = $_FILES['file'];
-        $srcfile = $file['tmp_name'];
-        $res = dol_move($srcfile, $destfile, 0, 1);
-
-        if (!$res) {
-            throw new RestException(500);
+        if (dol_is_file($destfile))
+        {
+            throw new RestException(500, "File with name '".$original_file."' already exists.");
         }
-
-        return $res;
+        
+        $fhandle = fopen($destfile, 'w');
+        if ($fhandle)
+        {
+            $nbofbyteswrote = fwrite($fhandle, $newfilecontent);
+            fclose($fhandle);
+            @chmod($destfile, octdec($conf->global->MAIN_UMASK));
+        }
+        else
+        {
+            throw new RestException(500, 'Failed to open file for write');
+        }
+        
+        return true;
     }
 
     /**
diff --git a/htdocs/api/class/api_login.class.php b/htdocs/api/class/api_login.class.php
index 76a9befebc9..9b965e24c33 100644
--- a/htdocs/api/class/api_login.class.php
+++ b/htdocs/api/class/api_login.class.php
@@ -36,7 +36,7 @@ class Login
 	 *
 	 * Request the API token for a couple username / password. 
 	 * Using method POST is recommanded for security reasons (method GET is often logged by default by web servers with parameters so with login and pass into server log file).
-	 * Both method are provided for developer conveniance. Best is to not use at all the login API method and enter directly the "api_key" into field at the top right of page (Note: "api_key" can be found/set on the user page). 
+	 * Both methods are provided for developer conveniance. Best is to not use at all the login API method and enter directly the "api_key" into field at the top right of page (Note: "api_key" can be found/set on the user page). 
 	 * 
 	 * @param   string  $login			User login
 	 * @param   string  $password		User password
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 26001e8e1f1..f58e96087b8 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -2502,7 +2502,7 @@ class Form
                     }
                     if ($objp->supplier_reputation)
                     {
-            			//TODO dictionnary
+            			//TODO dictionary
             			$reputations=array(''=>$langs->trans('Standard'),'FAVORITE'=>$langs->trans('Favorite'),'NOTTHGOOD'=>$langs->trans('NotTheGoodQualitySupplier'), 'DONOTORDER'=>$langs->trans('DoNotOrderThisProductToThisSupplier'));
 
                         $opt .= " - ".$reputations[$objp->supplier_reputation];
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 09856131da7..2d3b1420e81 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -4555,8 +4555,8 @@ function yn($yesno, $case=1, $color=0)
 
 /**
  *	Return a path to have a directory according to object.
- *  New usage:       $conf->module->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 1, $object, 'modulepart')
- *         or:       $conf->module->dir_output.'/'.get_exdir(0, 0, 0, 1, $object, 'modulepart')     if multidir_output not defined.
+ *  New usage:       $conf->module->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 1, $object, $modulepart)
+ *         or:       $conf->module->dir_output.'/'.get_exdir(0, 0, 0, 1, $object, $modulepart)     if multidir_output not defined.
  *  Old usage:       '015' with level 3->"0/1/5/", '015' with level 1->"5/", 'ABC-1' with level 3 ->"0/0/1/"
  *
  *	@param	string	$num            Id of object (deprecated, $object will be used in future)
diff --git a/htdocs/core/modules/modResource.class.php b/htdocs/core/modules/modResource.class.php
index f6674bdcfd7..020fa92e9f3 100644
--- a/htdocs/core/modules/modResource.class.php
+++ b/htdocs/core/modules/modResource.class.php
@@ -305,7 +305,7 @@ class modResource extends DolibarrModules
 		);
 		//$this->import_convertvalue_array[$r]=array('s.fk_soc'=>array('rule'=>'lastrowid',table='t');
 		$this->import_regex_array[$r]=array('s.datec'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]( [0-9][0-9]:[0-9][0-9]:[0-9][0-9])?$');
-		$this->import_examplevalues_array[$r]=array('r.ref'=>"REF1",'r.fk_code_type_resource'=>"Code from dictionnary resource type",'r.datec'=>"2017-01-01 or 2017-01-01 12:30:00");
+		$this->import_examplevalues_array[$r]=array('r.ref'=>"REF1",'r.fk_code_type_resource'=>"Code from dictionary resource type",'r.datec'=>"2017-01-01 or 2017-01-01 12:30:00");
 		$this->import_updatekeys_array[$r]=array('r.rf'=>'ResourceFormLabel_ref');
 		
 	}
diff --git a/htdocs/install/mysql/migration/4.0.0-5.0.0.sql b/htdocs/install/mysql/migration/4.0.0-5.0.0.sql
index 7eb08612611..a750581ae49 100644
--- a/htdocs/install/mysql/migration/4.0.0-5.0.0.sql
+++ b/htdocs/install/mysql/migration/4.0.0-5.0.0.sql
@@ -218,7 +218,7 @@ create table llx_user_employment
   tms               timestamp,
   fk_user_creat     integer,
   fk_user_modif     integer,
-  job				varchar(128),				-- job position. may be a dictionnary
+  job				varchar(128),				-- job position. may be a dictionary
   status            integer NOT NULL,			-- draft, active, closed
   salary			double(24,8),				-- last and current value stored into llx_user
   salaryextra		double(24,8),				-- last and current value stored into llx_user
diff --git a/htdocs/install/mysql/tables/llx_user_employment.sql b/htdocs/install/mysql/tables/llx_user_employment.sql
index 4dfa2548c2f..80520ce3dd8 100644
--- a/htdocs/install/mysql/tables/llx_user_employment.sql
+++ b/htdocs/install/mysql/tables/llx_user_employment.sql
@@ -28,7 +28,7 @@ create table llx_user_employment
   tms               timestamp,
   fk_user_creat     integer,
   fk_user_modif     integer,
-  job				varchar(128),				-- job position. may be a dictionnary
+  job				varchar(128),				-- job position. may be a dictionary
   status            integer NOT NULL,			-- draft, active, closed
   salary			double(24,8),				-- last and current value stored into llx_user
   salaryextra		double(24,8),				-- last and current value stored into llx_user
diff --git a/htdocs/variants/generator.php b/htdocs/variants/generator.php
index 7b0358fd176..d4162899874 100644
--- a/htdocs/variants/generator.php
+++ b/htdocs/variants/generator.php
@@ -162,19 +162,19 @@ if (! empty($id) || ! empty($ref)) {
 
 	print_fiche_titre($langs->trans('ProductCombinationGenerator'));
 
-	$dictionnary_attr = array();
+	$dictionary_attr = array();
 
 	foreach ($prodattr->fetchAll() as $attr) {
-		$dictionnary_attr[$attr->id] = $attr;
+		$dictionary_attr[$attr->id] = $attr;
 		foreach ($prodattrval->fetchAllByProductAttribute($attr->id) as $attrval) {
-			$dictionnary_attr[$attr->id]->values[$attrval->id] = $attrval;
+			$dictionary_attr[$attr->id]->values[$attrval->id] = $attrval;
 		}
 	}
 	?>
 
 	<script>
 
-		dictionnary_attr = <?php echo json_encode($dictionnary_attr) ?>;
+		dictionary_attr = <?php echo json_encode($dictionary_attr) ?>;
 		weight_units = '<?php echo measuring_units_string($object->weight_units, 'weight') ?>';
 		attr_selected = {};
 		percentage_variation = jQuery('input#price_var_percent').prop('checked');
@@ -191,7 +191,7 @@ if (! empty($id) || ! empty($ref)) {
 
 			if (!attr_selected.hasOwnProperty(attr)) {
 
-				var label = dictionnary_attr[attr].label;
+				var label = dictionary_attr[attr].label;
 
 				var table = jQuery(document.createElement('table'))
 					.attr('id', 'combinations_'+attr)
@@ -239,7 +239,7 @@ if (! empty($id) || ! empty($ref)) {
 			}
 
 			html.append(
-				jQuery(document.createElement('td')).text(dictionnary_attr[attr].values[val].value),
+				jQuery(document.createElement('td')).text(dictionary_attr[attr].values[val].value),
 				jQuery(document.createElement('td')).css('text-align', 'center').append(
 					jQuery(document.createElement('input')).attr('type', 'text').css('width', '50px').attr('name', 'combinations[' + attr + '][' + val + '][price]').val(price),
 					percent_symbol_html
@@ -350,7 +350,7 @@ if (! empty($id) || ! empty($ref)) {
 		<div style="float:left; width: 20%">
 
 			<select id="features" multiple style="width: 100%; height: 300px; overflow: auto">
-				<?php foreach ($dictionnary_attr as $attr): ?>
+				<?php foreach ($dictionary_attr as $attr): ?>
 				<optgroup label="<?php echo $attr->label ?>">
 					<?php foreach ($attr->values as $attrval): ?>
 						<option value="<?php echo $attr->id.':'.$attrval->id ?>"<?php
diff --git a/test/phpunit/RestAPIDocumentTest.php b/test/phpunit/RestAPIDocumentTest.php
index ea0c218027f..0ff33bc36c5 100644
--- a/test/phpunit/RestAPIDocumentTest.php
+++ b/test/phpunit/RestAPIDocumentTest.php
@@ -131,11 +131,11 @@ class RestAPIDocumentTest extends PHPUnit_Framework_TestCase
     }
 
     /**
-     * testRestReceiveDocument.
+     * testPushDocument.
      *
      * @return int
      */
-    public function testRestReceiveDocument()
+    public function testPushDocument()
     {
         global $conf,$user,$langs,$db;
 
@@ -143,20 +143,17 @@ class RestAPIDocumentTest extends PHPUnit_Framework_TestCase
 
         $fileName = 'img250x20.png';
         $filePath = dirname(__FILE__).'/'.$fileName;
-        $mimetype = mime_content_type($filePath);
-      // Init Curl file object
-      // See https://wiki.php.net/rfc/curl-file-upload
-      $cfile = curl_file_create($filePath, $mimetype);
+        $mimetype = dol_mimetype($filePath);
 
         echo __METHOD__.' Request POST url='.$url."\n";
 
-      // Send to existant directory
-      $data = array(
+        // Send to existant directory
+        $data = array(
           'modulepart' => 'facture',
-          'file' => $cfile,
+          'file' => 'eeeeeee',
           'refname' => 'AV1303-0003',
           'name' => $fileName, // Name for destination
-          'type' => $mimetype, );
+          'mime' => $mimetype );
 
         $result = getURLContent($url, 'POST', $data, 1);
 
@@ -165,8 +162,8 @@ class RestAPIDocumentTest extends PHPUnit_Framework_TestCase
         $this->assertEquals($result['curl_error_no'], '');
         $this->assertEquals($result['content'], 'true');
 
-      // Send to unexistant directory
-      $data = array(
+        // Send to unexistant directory
+        $data = array(
           'modulepart' => 'facture',
           'file' => $cfile,
           'name' => 'AV1303-0003STSEIUDEISRESIJLEU/'.$fileName, // Name for destination

From eb5bab36ca662ceaea25779df2ca0cb94f9077c8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 20 May 2017 16:15:06 +0200
Subject: [PATCH 423/505] Use dolibarr security checks before uploading a file.

---
 htdocs/api/class/api_documents.class.php | 62 ++++++++++--------------
 1 file changed, 25 insertions(+), 37 deletions(-)

diff --git a/htdocs/api/class/api_documents.class.php b/htdocs/api/class/api_documents.class.php
index 6650fc45401..85fa777aa21 100644
--- a/htdocs/api/class/api_documents.class.php
+++ b/htdocs/api/class/api_documents.class.php
@@ -56,23 +56,23 @@ class Documents extends DolibarrApi
      * @param   string  $module_part    Module part for file
      * @param   string  $filename       File name
      *
-     * @return array
+     * @return  array                   Array with data of file
      * @throws RestException
      */
-     /*
-     public function get($module_part, $filename) {
-
-     }*/
+     public function index($module_part, $filename) {
+            return array('note'=>'FeatureNotYetAvailable');
+     }
 
 
     /**
      * Push a file. 
-     * Test sample: { "filename": "mynewfile.txt", "modulepart": "facture", "ref": "FA1701-001", "subdir": "", "filecontent": "content text", "fileencoding": "" }
+     * Test sample 1: { "filename": "mynewfile.txt", "modulepart": "facture", "ref": "FA1701-001", "subdir": "", "filecontent": "content text", "fileencoding": "" }.
+     * Test sample 2: { "filename": "mynewfile.txt", "modulepart": "medias", "ref": "", "subdir": "mysubdir1/mysubdir2", "filecontent": "content text", "fileencoding": "" }.
      *
      * @param   string  $filename           Name of file to create ('FA1705-0123')
-     * @param   string  $modulepart         Module part ('facture', ...)
+     * @param   string  $modulepart         Name of module or area concerned by file upload ('facture', ...)
      * @param   string  $ref                Reference of object (This will define subdir automatically and store submited file into it)
-     * @param   string  $subdir             Subdirectory (Only if refname not provided)
+     * @param   string  $subdir             Subdirectory (Only if ref not provided)
      * @param   string  $filecontent        File content (string with file content. An empty file will be created if this parameter is not provided)
      * @param   string  $fileencoding       File encoding (''=no encoding, 'base64'=Base 64)
      * @return  bool     				    State of copy
@@ -108,49 +108,37 @@ class Documents extends DolibarrApi
     		    $modulepart='facture';
     		    $object=new Facture($db);
     		    $result = $object->fetch('', $ref);
-    		    if (! ($result > 0))
-    		    {
-    		        throw new RestException(500, 'The object '.$modulepart." with ref '".$ref."' was not found.");
-    		    }
-    		    if (! empty($entity))
-    		    {
-    		        $tmpreldir = get_exdir(0, 0, 0, 0, $object, $modulepart);
-                    $upload_dir = $conf->{$modulepart}->multidir_output[$entity].'/'.$tmpreldir.$object->ref;
-    		    }
-    		    else
-    		    {
-    		        $tmpreldir = get_exdir(0, 0, 0, 0, $object, $modulepart);
-    		        $upload_dir = $conf->{$modulepart}->dir_output.'/'.$tmpreldir.$object->ref;
-    		    }
     		}
     		
+    		if (! ($object->id > 0))
+    		{
+   		        throw new RestException(500, 'The object '.$modulepart." with ref '".$ref."' was not found.");
+    		}
+
+    		$tmp = dol_check_secure_access_document($modulepart, $tmpreldir.$object->ref, $entity, DolibarrApiAccess::$user, $ref, 'write');
+    		$upload_dir = $tmp['original_file'];
+    		
     		if (empty($upload_dir) || $upload_dir == '/')
     		{
-    		    throw new RestException(500, 'This value of modulepart does not support yet usage of refname. Check modulepart parameter or try to use subdir parameter instead of ref.');
+    		    throw new RestException(500, 'This value of modulepart does not support yet usage of ref. Check modulepart parameter or try to use subdir parameter instead of ref.');
     		}
 		}
 		else
 		{
 		    if ($modulepart == 'invoice') $modulepart ='facture';
-		    if (empty($conf->{$modulepart}->dir_output))
-		    {
-		        throw new RestException(500, 'This value of modulepart is not supported with refname not defined.');
-		    }
-		    $upload_dir = $conf->{$modulepart}->multidir_output[$entity];
+		    
+		    $tmp = dol_check_secure_access_document($modulepart, $subdir, $entity, DolibarrApiAccess::$user, '', 'write');
+    		$upload_dir = $tmp['original_file'];
 
 		    if (empty($upload_dir) || $upload_dir == '/')
-		    {
-		        throw new RestException(500, 'This value of modulepart is not yet supported.');
-		    }
+    		{
+    		    throw new RestException(500, 'This value of modulepart does not support yet usage of ref. Check modulepart parameter or try to use subdir parameter instead of ref.');
+    		}
 		}
+		
+		
 		$upload_dir = dol_sanitizePathName($upload_dir);
 		
-        // Security:
-        // TODO Use dol_check_secure_access_document
-
-        // Check mandatory fields
-        //$result = $this->_validate_file($request_data);
-
         $destfile = $upload_dir . '/' . $original_file;
 
         if (!dol_is_dir($upload_dir)) {

From 7e25cc04755bada0cb281aa5581910a2e15bab9d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 20 May 2017 17:09:15 +0200
Subject: [PATCH 424/505] FIX Phpunit on file submit with REST API

---
 htdocs/api/class/api_documents.class.php |  3 +-
 htdocs/core/lib/geturl.lib.php           |  1 +
 test/phpunit/RestAPIDocumentTest.php     | 59 ++++++++++++++----------
 3 files changed, 37 insertions(+), 26 deletions(-)

diff --git a/htdocs/api/class/api_documents.class.php b/htdocs/api/class/api_documents.class.php
index 85fa777aa21..18ccee58b07 100644
--- a/htdocs/api/class/api_documents.class.php
+++ b/htdocs/api/class/api_documents.class.php
@@ -36,9 +36,8 @@ class Documents extends DolibarrApi
      * @var array   $DOCUMENT_FIELDS     Mandatory fields, checked when create and update object
      */
     static $DOCUMENT_FIELDS = array(
-        'name',
         'modulepart',
-        'file'
+        'filename'
     );
 
     /**
diff --git a/htdocs/core/lib/geturl.lib.php b/htdocs/core/lib/geturl.lib.php
index 808e4f0ef09..6f268fda3a7 100644
--- a/htdocs/core/lib/geturl.lib.php
+++ b/htdocs/core/lib/geturl.lib.php
@@ -71,6 +71,7 @@ function getURLContent($url,$postorget='GET',$param='',$followlocation=1,$addhea
     curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, empty($conf->global->MAIN_USE_CONNECT_TIMEOUT)?5:$conf->global->MAIN_USE_CONNECT_TIMEOUT);
     curl_setopt($ch, CURLOPT_TIMEOUT, empty($conf->global->MAIN_USE_RESPONSE_TIMEOUT)?30:$conf->global->MAIN_USE_RESPONSE_TIMEOUT);
 
+    //curl_setopt($ch, CURLOPT_SAFE_UPLOAD, true);	// PHP 5.5
     curl_setopt($ch, CURLOPT_RETURNTRANSFER,1);		// We want response
     if ($postorget == 'POST')
     {
diff --git a/test/phpunit/RestAPIDocumentTest.php b/test/phpunit/RestAPIDocumentTest.php
index 0ff33bc36c5..b180586aa91 100644
--- a/test/phpunit/RestAPIDocumentTest.php
+++ b/test/phpunit/RestAPIDocumentTest.php
@@ -28,6 +28,7 @@ global $conf,$user,$langs,$db;
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 require_once dirname(__FILE__).'/../../htdocs/core/lib/date.lib.php';
 require_once dirname(__FILE__).'/../../htdocs/core/lib/geturl.lib.php';
+require_once dirname(__FILE__).'/../../htdocs/core/lib/files.lib.php';
 
 if (empty($user->id)) {
     echo "Load permissions for admin user nb 1\n";
@@ -141,40 +142,50 @@ class RestAPIDocumentTest extends PHPUnit_Framework_TestCase
 
         $url = $this->api_url.'/documents/?api_key='.$this->api_key;
 
-        $fileName = 'img250x20.png';
-        $filePath = dirname(__FILE__).'/'.$fileName;
-        $mimetype = dol_mimetype($filePath);
-
         echo __METHOD__.' Request POST url='.$url."\n";
 
-        // Send to existant directory
+        
+        // Send to non existant directory
+        
+        dol_delete_dir_recursive(DOL_DATA_ROOT.'/medias/tmpphpunit');
+        
+        //$data = '{ "filename": "mynewfile.txt", "modulepart": "medias", "ref": "", "subdir": "mysubdir1/mysubdir2", "filecontent": "content text", "fileencoding": "" }';
         $data = array(
-          'modulepart' => 'facture',
-          'file' => 'eeeeeee',
-          'refname' => 'AV1303-0003',
-          'name' => $fileName, // Name for destination
-          'mime' => $mimetype );
-
+            'filename'=>"mynewfile.txt",
+            'modulepart'=>"medias",
+            'ref'=>"",
+            'subdir'=>"tmpphpunit/tmpphpunit2",
+            'filecontent'=>"content text",
+            'fileencoding'=>""
+        );
+        
         $result = getURLContent($url, 'POST', $data, 1);
-
         echo __METHOD__.' Result for sending document: '.var_export($result, true)."\n";
         echo __METHOD__.' curl_error_no: '.$result['curl_error_no']."\n";
-        $this->assertEquals($result['curl_error_no'], '');
-        $this->assertEquals($result['content'], 'true');
+        $object = json_decode($result['content'], true);
+        $this->assertNotNull($object, 'Parsing of json result must no be null');
+        $this->assertEquals('401', $object['error']['code']);
 
-        // Send to unexistant directory
+        
+        // Send to existant directory
+        
+        dol_mkdir(DOL_DATA_ROOT.'/medias/tmpphpunit/tmpphpunit2');
+        
         $data = array(
-          'modulepart' => 'facture',
-          'file' => $cfile,
-          'name' => 'AV1303-0003STSEIUDEISRESIJLEU/'.$fileName, // Name for destination
-          'type' => $mimetype, );
+            'filename'=>"mynewfilethatwillfails.txt",
+            'modulepart'=>"medias",
+            'ref'=>"",
+            'subdir'=>"tmpphpunit/tmpphpunit2",
+            'filecontent'=>"content text",
+            'fileencoding'=>""
+        );
 
         $result2 = getURLContent($url, 'POST', $data, 1);
         echo __METHOD__.' Result for sending document: '.var_export($result2, true)."\n";
-        echo __METHOD__.' curl_error_no: '.$result['curl_error_no']."\n";
-
-        $object = json_decode($result2['content'], true);
-        $this->assertNotNull($object, 'Parsing of json result must no be null');
-        $this->assertEquals('401', $object['error']['code']);
+        echo __METHOD__.' curl_error_no: '.$result2['curl_error_no']."\n";
+        $object2 = json_decode($result2['content'], true);
+        $this->assertNotNull($object2, 'Parsing of json result must no be null');
+        $this->assertEquals($result2['curl_error_no'], '');
+        $this->assertEquals($result2['content'], 'true');
     }
 }

From a53fb25cfa8c7de492219d6ae406100b2fceb4ca Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 20 May 2017 18:46:15 +0200
Subject: [PATCH 425/505] Look and feel v6

---
 htdocs/admin/tools/dolibarr_export.php |  5 ++++-
 htdocs/admin/tools/dolibarr_import.php | 21 +++++++++++++--------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/htdocs/admin/tools/dolibarr_export.php b/htdocs/admin/tools/dolibarr_export.php
index df5dafa43af..6b0bf70bf64 100644
--- a/htdocs/admin/tools/dolibarr_export.php
+++ b/htdocs/admin/tools/dolibarr_export.php
@@ -113,7 +113,10 @@ jQuery(document).ready(function() {
 print load_fiche_titre($langs->trans("Backup"),'','title_setup');
 //print_barre_liste($langs->trans("Backup"), '', '', '', '', '', $langs->trans("BackupDesc",DOL_DATA_ROOT), 0, 0, 'title_setup');
 
-print '<div class="center">'.$langs->trans("BackupDesc",DOL_DATA_ROOT).'</div><br><br>';
+print '<div class="center">';
+print $langs->trans("BackupDesc",DOL_DATA_ROOT);
+print '</div>';
+print '<br><br>';
 
 ?>
 
diff --git a/htdocs/admin/tools/dolibarr_import.php b/htdocs/admin/tools/dolibarr_import.php
index 9f8af14f2b9..fec00bd490c 100644
--- a/htdocs/admin/tools/dolibarr_import.php
+++ b/htdocs/admin/tools/dolibarr_import.php
@@ -67,7 +67,11 @@ jQuery(document).ready(function() {
 
 print load_fiche_titre($langs->trans("Restore"),'','title_setup');
 
-print $langs->trans("RestoreDesc",DOL_DATA_ROOT).'<br><br>';
+print '<div class="center">';
+print $langs->trans("RestoreDesc",DOL_DATA_ROOT);
+print '</div>';
+print '<br><br>';
+
 ?>
 <fieldset>
 <legend style="font-size: 3em">1</legend>
@@ -86,7 +90,7 @@ print $langs->trans("RestoreDesc3",$dolibarr_main_db_name).'<br><br>';
 
 <?php print $langs->trans("DatabaseName").' : <b>'.$dolibarr_main_db_name.'</b>'; ?><br><br>
 
-<table><tr><td class="tdtop">
+<table class="centpercent"><tr><td class="tdtop">
 
 <?php if ($conf->use_javascript_ajax) { ?>
 <div id="div_container_exportoptions">
@@ -123,14 +127,14 @@ print $langs->trans("RestoreDesc3",$dolibarr_main_db_name).'<br><br>';
 </td><td class="tdtop">
 
 
-<div id="div_container_sub_exportoptions">
+<div id="div_container_sub_exportoptions" >
 <?php
 if (in_array($type, array('mysql', 'mysqli')))
 {
 ?>
 	<fieldset id="mysql_options">
     <legend><?php echo $langs->trans('RestoreMySQL') ?></legend>
-	<div class="formelementrow">
+	<div class="formelementrow centpercent">
 	<?php
 	// Parameteres execution
 	$command=$db->getPathOfRestore();
@@ -150,8 +154,9 @@ if (in_array($type, array('mysql', 'mysqli')))
 
 	echo $langs->trans("ImportMySqlDesc");
 	print '<br>';
-	print '<textarea rows="1" cols="120">'.$langs->trans("ImportMySqlCommand",$command,($showpass?$paramclear:$paramcrypted)).'</textarea><br>';
-
+	print '<textarea rows="1" id="restorecommand" class="centpercent">'.$langs->trans("ImportMySqlCommand",$command,($showpass?$paramclear:$paramcrypted)).'</textarea><br>';
+	print ajax_autoselect('restorecommand');
+	
 	if (empty($_GET["showpass"]) && $dolibarr_main_db_pass) print '<br><a href="'.$_SERVER["PHP_SELF"].'?showpass=1&amp;radio_dump=mysql_options">'.$langs->trans("UnHidePassword").'</a>';
 	//else print '<br><a href="'.$_SERVER["PHP_SELF"].'?showpass=0&amp;radio_dump=mysql_options">'.$langs->trans("HidePassword").'</a>';
 	?>
@@ -189,8 +194,8 @@ else if (in_array($type, array('pgsql')))
 
     echo $langs->trans("ImportPostgreSqlDesc");
     print '<br>';
-    print '<textarea rows="1" cols="120">'.$langs->trans("ImportPostgreSqlCommand",$command,($showpass?$paramclear:$paramcrypted)).'</textarea><br>';
-
+    print '<textarea rows="1" id="restorecommand" class="centpercent">'.$langs->trans("ImportPostgreSqlCommand",$command,($showpass?$paramclear:$paramcrypted)).'</textarea><br>';
+    print ajax_autoselect('restorecommand');
     //if (empty($_GET["showpass"]) && $dolibarr_main_db_pass) print '<br><a href="'.$_SERVER["PHP_SELF"].'?showpass=1&amp;radio_dump=postgresql_options">'.$langs->trans("UnHidePassword").'</a>';
     //else print '<br><a href="'.$_SERVER["PHP_SELF"].'?showpass=0&amp;radio_dump=mysql_options">'.$langs->trans("HidePassword").'</a>';
     ?>

From 2dd2ab1003e5ff182aec85c964a48934fe8a110c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 20 May 2017 20:59:54 +0200
Subject: [PATCH 426/505] Look and feel v6

---
 htdocs/core/class/doleditor.class.php       |  2 +-
 htdocs/core/class/html.formfile.class.php   |  2 +-
 htdocs/core/class/html.formmargin.class.php |  5 +++--
 htdocs/core/lib/functions.lib.php           |  2 +-
 htdocs/core/lib/functions2.lib.php          | 15 +++++++++++++++
 htdocs/theme/eldy/style.css.php             | 14 +++++++-------
 htdocs/theme/md/style.css.php               |  3 ---
 7 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/htdocs/core/class/doleditor.class.php b/htdocs/core/class/doleditor.class.php
index 5d30ab3b839..a7e404383ea 100644
--- a/htdocs/core/class/doleditor.class.php
+++ b/htdocs/core/class/doleditor.class.php
@@ -167,7 +167,7 @@ class DolEditor
         {
             $found=1;
             //$out.= '<textarea id="'.$this->htmlname.'" name="'.$this->htmlname.'" rows="'.$this->rows.'" cols="'.$this->cols.'"'.($this->readonly?' disabled':'').' class="flat">';
-            $out.= '<textarea id="'.$this->htmlname.'" name="'.$this->htmlname.'" rows="'.$this->rows.'"'.(preg_match('/%/',$this->cols)?' style="margin-top: 2px; width: '.$this->cols.'"':' cols="'.$this->cols.'"').' class="flat">';
+            $out.= '<textarea id="'.$this->htmlname.'" name="'.$this->htmlname.'" rows="'.$this->rows.'"'.(preg_match('/%/',$this->cols)?' style="margin-top: 5px; width: '.$this->cols.'"':' cols="'.$this->cols.'"').' class="flat">';
             $out.= $this->content;
             $out.= '</textarea>';
 
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 225825d6699..e263efeaa57 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -1685,7 +1685,7 @@ class FormFile
         global $langs, $conf;
 
         $out='';
-        if ($conf->browser->layout != 'phone')
+        if ($conf->browser->layout != 'phone' && ! empty($conf->use_javascript_ajax))
         {
             $urladvancedpreview=getAdvancedPreviewUrl($modulepart, $relativepath, 1, $param);      // Return if a file is qualified for preview.
             if (count($urladvancedpreview))
diff --git a/htdocs/core/class/html.formmargin.class.php b/htdocs/core/class/html.formmargin.class.php
index 2cf82424a4e..5f78fa0e283 100644
--- a/htdocs/core/class/html.formmargin.class.php
+++ b/htdocs/core/class/html.formmargin.class.php
@@ -214,6 +214,7 @@ class FormMargin
     	    if (!empty($hidemargininfos)) print '<script>$(document).ready(function() {$(".margininfos").hide();});</script>';
 		}
 
+		print '<!-- Margin table -->'."\n";
 		print '<table class="noborder margintable centpercent">';
 		print '<tr class="liste_titre">';
 		print '<td class="liste_titre">'.$langs->trans('Margins').'</td>';
@@ -232,7 +233,7 @@ class FormMargin
 		if (! empty($conf->product->enabled))
 		{
 			//if ($marginInfo['margin_on_products'] != 0 && $marginInfo['margin_on_services'] != 0) {
-			print '<tr class="impair">';
+			print '<tr class="oddeven">';
 			print '<td>'.$langs->trans('MarginOnProducts').'</td>';
 			print '<td align="right">'.price($marginInfo['pv_products'], null, null, null, null, $rounding).'</td>';
 			print '<td align="right">'.price($marginInfo['pa_products'], null, null, null, null, $rounding).'</td>';
@@ -246,7 +247,7 @@ class FormMargin
 
 		if (! empty($conf->service->enabled))
 		{
-			print '<tr class="pair">';
+			print '<tr class="oddeven">';
 			print '<td>'.$langs->trans('MarginOnServices').'</td>';
 			print '<td align="right">'.price($marginInfo['pv_services'], null, null, null, null, $rounding).'</td>';
 			print '<td align="right">'.price($marginInfo['pa_services'], null, null, null, null, $rounding).'</td>';
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 2d3b1420e81..b6365a23b9a 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2734,7 +2734,7 @@ function img_edit($titlealt = 'default', $float = 0, $other = 'class="pictoedit"
 
 	if ($titlealt == 'default') $titlealt = $langs->trans('Modify');
 
-	return img_picto($titlealt, 'edit.png', ($float ? 'style="float: '.($langs->tab_translate["DIRECTION"] == 'rtl'?'left':'right').'"' : $other));
+	return img_picto($titlealt, 'edit.png', ($float ? 'style="float: '.($langs->tab_translate["DIRECTION"] == 'rtl'?'left':'right').'"' : "") . ($other?' '.$other:''));
 }
 
 /**
diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php
index 2f46ad49b80..c8d617ec99d 100644
--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@@ -780,11 +780,26 @@ function get_next_value($db,$mask,$table,$field,$where='',$objsoc='',$date='',$m
     	$masktype_value='';
     }
 
+    // Personalized field {XXX-1} à {XXX-9}
+    $maskperso=array();
+    $maskpersonew=array();
+    $tmpmask=$mask;
+    while (preg_match('/\{([A-Z]+)\-([1-9])\}/i',$tmpmask,$regKey))
+    {
+        $maskperso[$regKey[1]]='\{'.$regKey[1]+'\-'.$regKey[2].'\}';
+        $maskpersonew[$regKey[1]]=str_pad('', '_', $regKey[2], STR_PAD_RIGHT);
+        $tmpmask=preg_replace('/\{'.$regKey[1].'\-'.$regKey[2].'\}/i', $maskpersonew, $tmpmask);
+    }
+    
     $maskwithonlyymcode=$mask;
     $maskwithonlyymcode=preg_replace('/\{(0+)([@\+][0-9\-\+\=]+)?([@\+][0-9\-\+\=]+)?\}/i',$maskcounter,$maskwithonlyymcode);
     $maskwithonlyymcode=preg_replace('/\{dd\}/i','dd',$maskwithonlyymcode);
     $maskwithonlyymcode=preg_replace('/\{(c+)(0*)\}/i',$maskrefclient,$maskwithonlyymcode);
     $maskwithonlyymcode=preg_replace('/\{(t+)\}/i',$masktype_value,$maskwithonlyymcode);
+    foreach($maskperso as $key => $val)
+    {
+        $maskwithonlyymcode=preg_replace('/'.$val.'/i', $maskpersonew[$key], $maskwithonlyymcode);
+    }
     $maskwithnocode=$maskwithonlyymcode;
     $maskwithnocode=preg_replace('/\{yyyy\}/i','yyyy',$maskwithnocode);
     $maskwithnocode=preg_replace('/\{yy\}/i','yy',$maskwithnocode);
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 4ae7d400a09..b8f31b4e224 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -273,7 +273,7 @@ input[type=submit] {
 }
 input, input.flat, form.flat select, select, select.flat, .dataTables_length label select {
 	<?php if (empty($conf->global->THEME_ELDY_SHOW_BORDER_INPUT)) 
-		print "border: none;" 
+	print "border: none;" 
 	?>
 }
 input, input.flat, textarea, textarea.flat, form.flat select, select, select.flat, .dataTables_length label select {
@@ -281,7 +281,7 @@ input, input.flat, textarea, textarea.flat, form.flat select, select, select.fla
     font-family: <?php print $fontlist ?>;
     outline: none;
     margin: 0px 0px 0px 0px;
-    border-bottom: solid 1px rgba(0,0,0,.2);
+    border-bottom: solid 1px rgba(0,0,0,.4);
 }
 
 input {
@@ -460,6 +460,9 @@ form {
     padding:0px;
     margin:0px;
 }
+form#addproduct {
+    padding-top: 6px;
+}
 div.float
 {
     float:<?php print $left; ?>;
@@ -2238,12 +2241,12 @@ div .tdtop {
 }
 
 table.border td, div.border div div.tagtd {
-	padding: 3px 2px 3px 2px;
+	padding: 5px 2px 5px 2px;
 	border-collapse: collapse;
 }
 div.tabBar .fichecenter table.border>tbody>tr>td, div.tabBar .fichecenter div.border div div.tagtd, div.tabBar div.border div div.tagtd
 {
-	padding-top: 4px;
+	padding-top: 5px;
 	border-bottom: 1px solid #E0E0E0;
 }
 
@@ -2709,9 +2712,6 @@ tr.liste_sub_total, tr.liste_sub_total td {
 {
 	padding-left: 2px;
 }
-.margintable td {
-	border: 0px !important;
-}
 
 /* Disable shadows */
 .noshadow {
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 2beef147c02..91a4c0922d9 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -2801,9 +2801,6 @@ tr.liste_sub_total, tr.liste_sub_total td {
 {
 	padding-left: 2px;
 }
-.margintable td {
-	border: 0px !important;
-}
 
 /* Disable shadows */
 .noshadow {

From 2a9c6d9387e0c63ffd064558b45edd63cf9c8480 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 20 May 2017 21:11:31 +0200
Subject: [PATCH 427/505] Complete ignore file

---
 htdocs/.gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/.gitignore b/htdocs/.gitignore
index 608ef55d106..5e2113ec179 100644
--- a/htdocs/.gitignore
+++ b/htdocs/.gitignore
@@ -4,6 +4,7 @@
 /dolimed*
 /ecommerce*
 /extensions*
+/forceproject*
 /google*
 /lead
 /multicompany*

From b3dc73e61161634de13f7c3664f6e2d8d89078ca Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 21 May 2017 02:43:51 +0200
Subject: [PATCH 428/505] Look and feel v6

---
 htdocs/accountancy/admin/productaccount.php   |  1 +
 htdocs/accountancy/bookkeeping/list.php       |  1 +
 htdocs/accountancy/customer/lines.php         |  1 +
 htdocs/accountancy/customer/list.php          |  3 +-
 htdocs/accountancy/expensereport/lines.php    |  3 +-
 htdocs/accountancy/expensereport/list.php     |  5 +-
 htdocs/accountancy/supplier/lines.php         |  3 +-
 htdocs/accountancy/supplier/list.php          |  3 +-
 htdocs/adherents/list.php                     |  1 +
 htdocs/adherents/subscription/list.php        |  1 +
 htdocs/adherents/type.php                     |  1 +
 htdocs/admin/defaultvalues.php                |  1 +
 htdocs/admin/modules.php                      |  3 +-
 htdocs/admin/translation.php                  |  1 +
 htdocs/comm/action/listactions.php            |  1 +
 htdocs/comm/action/rapport/index.php          |  1 +
 htdocs/comm/mailing/cibles.php                |  2 +
 htdocs/comm/mailing/list.php                  |  1 +
 htdocs/comm/propal/list.php                   |  3 +-
 htdocs/commande/list.php                      |  3 +-
 htdocs/compta/bank/bankentries.php            |  1 +
 htdocs/compta/bank/index.php                  |  1 +
 htdocs/compta/bank/various_payment/index.php  |  3 +-
 htdocs/compta/charges/index.php               |  1 +
 htdocs/compta/facture/contact.php             |  2 +-
 htdocs/compta/facture/fiche-rec.php           |  1 +
 htdocs/compta/facture/list.php                |  5 +-
 htdocs/compta/facture/prelevement.php         |  2 +-
 htdocs/compta/paiement/cheque/list.php        |  1 +
 htdocs/compta/paiement/list.php               |  1 +
 htdocs/compta/prelevement/bons.php            |  1 +
 htdocs/compta/prelevement/factures.php        |  3 +-
 htdocs/compta/salaries/index.php              |  3 +-
 htdocs/compta/sociales/card.php               | 81 ++++++++++---------
 htdocs/compta/sociales/document.php           | 23 +++++-
 htdocs/compta/sociales/index.php              |  1 +
 htdocs/compta/sociales/info.php               | 27 ++++++-
 htdocs/compta/sociales/payments.php           |  1 +
 htdocs/compta/tva/reglement.php               |  1 +
 htdocs/contact/list.php                       |  1 +
 htdocs/contrat/list.php                       |  1 +
 htdocs/contrat/services.php                   |  1 +
 htdocs/core/lib/company.lib.php               |  4 +-
 htdocs/cron/list.php                          |  1 +
 htdocs/don/list.php                           |  1 +
 htdocs/expedition/list.php                    |  1 +
 htdocs/expensereport/list.php                 |  1 +
 htdocs/fichinter/list.php                     |  1 +
 htdocs/fourn/commande/list.php                |  1 +
 htdocs/fourn/facture/list.php                 |  1 +
 htdocs/fourn/facture/paiement.php             |  3 +-
 htdocs/fourn/product/list.php                 |  1 +
 htdocs/holiday/list.php                       |  1 +
 htdocs/loan/index.php                         |  1 +
 .../modulebuilder/skeletons/skeleton_list.php |  1 +
 htdocs/opensurvey/list.php                    |  1 +
 htdocs/product/list-with-listview.php         |  1 +
 htdocs/product/list.php                       |  1 +
 htdocs/product/reassort.php                   |  1 +
 htdocs/product/reassortlot.php                |  1 +
 htdocs/product/stock/list.php                 |  3 +-
 htdocs/product/stock/mouvement.php            |  1 +
 htdocs/product/stock/productlot_list.php      |  1 +
 htdocs/projet/list.php                        |  1 +
 htdocs/projet/tasks.php                       |  1 +
 htdocs/projet/tasks/list.php                  |  1 +
 htdocs/projet/tasks/time.php                  |  3 +-
 htdocs/resource/list.php                      |  1 +
 htdocs/societe/list.php                       |  1 +
 htdocs/societe/notify/card.php                |  1 +
 htdocs/supplier_proposal/list.php             |  1 +
 htdocs/user/group/index.php                   |  1 +
 htdocs/user/index.php                         |  1 +
 htdocs/user/notify/card.php                   |  1 +
 74 files changed, 178 insertions(+), 64 deletions(-)

diff --git a/htdocs/accountancy/admin/productaccount.php b/htdocs/accountancy/admin/productaccount.php
index 4f82db33e94..359a8b40c12 100644
--- a/htdocs/accountancy/admin/productaccount.php
+++ b/htdocs/accountancy/admin/productaccount.php
@@ -279,6 +279,7 @@ if ($result)
     print '<input type="hidden" name="action" value="update">';
     print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
     print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+    print '<input type="hidden" name="page" value="'.$page.'">';
     
     print load_fiche_titre($langs->trans("ProductsBinding"), '', 'title_accountancy');
 	print '<br>';
diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index b382d855994..0c49ac0e1ba 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -355,6 +355,7 @@ print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+print '<input type="hidden" name="page" value="'.$page.'">';
 
 $button = '<a class="butAction" name="button_export_csv" href="'.$_SERVER["PHP_SELF"].'?action=export_csv'.($param?'&'.$param:'').'">';
 if (count($filter)) $button.= $langs->trans("ExportFilteredList");
diff --git a/htdocs/accountancy/customer/lines.php b/htdocs/accountancy/customer/lines.php
index 428e490aff7..52b3a31d6f0 100644
--- a/htdocs/accountancy/customer/lines.php
+++ b/htdocs/accountancy/customer/lines.php
@@ -248,6 +248,7 @@ if ($result) {
 	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+	print '<input type="hidden" name="page" value="'.$page.'">';
 	
 	print_barre_liste($langs->trans("InvoiceLinesDone"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num_lines, $nbtotalofrecords, 'title_accountancy', 0, '', '', $limit);
 	print $langs->trans("DescVentilDoneCustomer") . '<br>';
diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php
index 46cb19c2ae1..bbd875e0dbf 100644
--- a/htdocs/accountancy/customer/list.php
+++ b/htdocs/accountancy/customer/list.php
@@ -263,8 +263,7 @@ if ($result) {
 	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-	
-	//$center='<div align="center"><input type="submit" class="butAction" value="' . $langs->trans("Ventilate") . '" name="ventil"></div>';
+	print '<input type="hidden" name="page" value="'.$page.'">';
 	
 	print_barre_liste($langs->trans("InvoiceLines"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num_lines, $nbtotalofrecords, 'title_accountancy', 0, '', '', $limit);
 
diff --git a/htdocs/accountancy/expensereport/lines.php b/htdocs/accountancy/expensereport/lines.php
index 4205a497c1a..6d0ffbd4476 100644
--- a/htdocs/accountancy/expensereport/lines.php
+++ b/htdocs/accountancy/expensereport/lines.php
@@ -219,7 +219,8 @@ if ($result) {
 	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-
+	print '<input type="hidden" name="page" value="'.$page.'">';
+	
 	print_barre_liste($langs->trans("ExpenseReportLinesDone"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num_lines, $nbtotalofrecords, 'title_accountancy', 0, '', '', $limit);
 
 	print $langs->trans("DescVentilDoneExpenseReport") . '<br>';
diff --git a/htdocs/accountancy/expensereport/list.php b/htdocs/accountancy/expensereport/list.php
index 114fd2c99ea..72316e4c4d6 100644
--- a/htdocs/accountancy/expensereport/list.php
+++ b/htdocs/accountancy/expensereport/list.php
@@ -246,9 +246,8 @@ if ($result) {
 	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-
-	//$center='<div class="center"><input type="submit" class="butAction" value="' . $langs->trans("Ventilate") . '" name="ventil"></div>';
-
+	print '<input type="hidden" name="page" value="'.$page.'">';
+	
 	print_barre_liste($langs->trans("ExpenseReportLines"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num_lines, $nbtotalofrecords, 'title_accountancy', 0, '', '', $limit);
 
 	print $langs->trans("DescVentilTodoExpenseReport") . '</br><br>';
diff --git a/htdocs/accountancy/supplier/lines.php b/htdocs/accountancy/supplier/lines.php
index 09cf552c7bb..1a95262f861 100644
--- a/htdocs/accountancy/supplier/lines.php
+++ b/htdocs/accountancy/supplier/lines.php
@@ -230,7 +230,8 @@ if ($result) {
 	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-		
+	print '<input type="hidden" name="page" value="'.$page.'">';
+	
 	print_barre_liste($langs->trans("InvoiceLinesDone"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num_lines, $nbtotalofrecords, 'title_accountancy', 0, '', '', $limit);
 	
 	print $langs->trans("DescVentilDoneSupplier") . '<br>';
diff --git a/htdocs/accountancy/supplier/list.php b/htdocs/accountancy/supplier/list.php
index e702aa8add8..061e465b1e7 100644
--- a/htdocs/accountancy/supplier/list.php
+++ b/htdocs/accountancy/supplier/list.php
@@ -260,8 +260,7 @@ if ($result) {
 	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-	
-	//$center='<div align="center"><input type="submit" class="butAction" value="' . $langs->trans("Ventilate") . '" name="ventil"></div>';
+	print '<input type="hidden" name="page" value="'.$page.'">';
 	
 	print_barre_liste($langs->trans("InvoiceLines"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num_lines, $nbtotalofrecords, 'title_accountancy', 0, '', '', $limit);
 
diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index 9e0de6f1d75..1b059d8616d 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -353,6 +353,7 @@ print '<input type="hidden" name="formfilteraction" id="formfilteraction" value=
 print '<input type="hidden" name="action" value="list">';
 print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+print '<input type="hidden" name="page" value="'.$page.'">';
 print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
 print_barre_liste($titre, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_generic.png', 0, '', '', $limit);
diff --git a/htdocs/adherents/subscription/list.php b/htdocs/adherents/subscription/list.php
index 206f5ebf8c9..55b832e327c 100644
--- a/htdocs/adherents/subscription/list.php
+++ b/htdocs/adherents/subscription/list.php
@@ -189,6 +189,7 @@ if ($result)
     print '<input type="hidden" name="view" value="'.dol_escape_htmltag($view).'">';
     print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
     print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+    print '<input type="hidden" name="page" value="'.$page.'">';
     print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
     
 	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_generic.png', 0, '', '', $limit);
diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index fb147750e0b..083ab4bda3b 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -191,6 +191,7 @@ if (! $rowid && $action != 'create' && $action != 'edit')
 		print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 		print '<input type="hidden" name="action" value="list">';
 		print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+        print '<input type="hidden" name="page" value="'.$page.'">';
 		print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 		
 	    print_barre_liste($langs->trans("MembersTypes"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_generic.png', 0, '', '', $limit);
diff --git a/htdocs/admin/defaultvalues.php b/htdocs/admin/defaultvalues.php
index 7ebc67472d1..40e63de8aea 100644
--- a/htdocs/admin/defaultvalues.php
+++ b/htdocs/admin/defaultvalues.php
@@ -220,6 +220,7 @@ print '<input type="hidden" name="formfilteraction" id="formfilteraction" value=
 print '<input type="hidden" name="action" value="list">';
 print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+print '<input type="hidden" name="page" value="'.$page.'">';
 
 $head=defaultvalues_prepare_head();
     
diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index 433508be908..5c4291ff3f3 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -436,7 +436,8 @@ if ($mode == 'common')
     print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
     print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
     print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-
+    print '<input type="hidden" name="page" value="'.$page.'">';
+    
     dol_fiche_head($head, $mode, '', -1);
 
     $moreforfilter = '';
diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php
index c9488f919fe..72aaa7fe355 100644
--- a/htdocs/admin/translation.php
+++ b/htdocs/admin/translation.php
@@ -209,6 +209,7 @@ print '<input type="hidden" name="formfilteraction" id="formfilteraction" value=
 print '<input type="hidden" name="action" value="list">';
 print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+print '<input type="hidden" name="page" value="'.$page.'">';
 
 $head=translation_prepare_head();
 
diff --git a/htdocs/comm/action/listactions.php b/htdocs/comm/action/listactions.php
index 301cf63620e..6ed846c0ebe 100644
--- a/htdocs/comm/action/listactions.php
+++ b/htdocs/comm/action/listactions.php
@@ -324,6 +324,7 @@ if ($resql)
     print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
     print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
     print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+    print '<input type="hidden" name="page" value="'.$page.'">';
     print '<input type="hidden" name="type" value="'.$type.'">';
     $nav='';
     if ($optioncss != '') $nav.= '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
diff --git a/htdocs/comm/action/rapport/index.php b/htdocs/comm/action/rapport/index.php
index 760d82f0246..125355a3386 100644
--- a/htdocs/comm/action/rapport/index.php
+++ b/htdocs/comm/action/rapport/index.php
@@ -111,6 +111,7 @@ if ($resql)
 	print '<input type="hidden" name="action" value="list">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+	print '<input type="hidden" name="page" value="'.$page.'">';
 	
 	print_barre_liste($langs->trans("Actions"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_agenda', 0, '', '', $limit);
 
diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index c302dea1e43..719dba1a622 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -428,6 +428,7 @@ if ($object->fetch($id) >= 0)
 		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 		print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 		print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+        print '<input type="hidden" name="page" value="'.$page.'">';
 		print '<input type="hidden" name="id" value="'.$object->id.'">';
 
 		$cleartext='';
@@ -443,6 +444,7 @@ if ($object->fetch($id) >= 0)
 		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 		print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 		print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+        print '<input type="hidden" name="page" value="'.$page.'">';
 		print '<input type="hidden" name="id" value="'.$object->id.'">';
 		print '<input type="hidden" name="limit" value="'.$limit.'">';
 		
diff --git a/htdocs/comm/mailing/list.php b/htdocs/comm/mailing/list.php
index f5efbf54383..e7775a6485e 100644
--- a/htdocs/comm/mailing/list.php
+++ b/htdocs/comm/mailing/list.php
@@ -116,6 +116,7 @@ if ($result)
 	print '<input type="hidden" name="action" value="list">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+	print '<input type="hidden" name="page" value="'.$page.'">';
 	
     $moreforfilter = '';
     
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index af9ffa6d778..d2a6c6e926f 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -407,7 +407,8 @@ if ($resql)
 	print '<input type="hidden" name="action" value="list">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-
+	print '<input type="hidden" name="page" value="'.$page.'">';
+	
 	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_commercial.png', 0, '', '', $limit);
 	
 	if ($massaction == 'presend')
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index c73258cff89..b9102e78ddc 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -648,7 +648,8 @@ if ($resql)
 	print '<input type="hidden" name="action" value="list">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-    print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
+    print '<input type="hidden" name="page" value="'.$page.'">';
+	print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 	print '<input type="hidden" name="viewstatut" value="'.$viewstatut.'">';
 
 	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_commercial.png', 0, '', '', $limit);
diff --git a/htdocs/compta/bank/bankentries.php b/htdocs/compta/bank/bankentries.php
index ed8241de427..fd3c1ec9825 100644
--- a/htdocs/compta/bank/bankentries.php
+++ b/htdocs/compta/bank/bankentries.php
@@ -578,6 +578,7 @@ if ($resql)
 	print '<input type="hidden" name="view" value="'.dol_escape_htmltag($view).'">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+    print '<input type="hidden" name="page" value="'.$page.'">';
 	print '<input type="hidden" name="id" value="'.$id.'">';
 	print '<input type="hidden" name="ref" value="'.$ref.'">';
 	if (GETPOST('bid')) print '<input type="hidden" name="bid" value="'.GETPOST("bid").'">';
diff --git a/htdocs/compta/bank/index.php b/htdocs/compta/bank/index.php
index 37883c29c0f..8ff5f1964fc 100644
--- a/htdocs/compta/bank/index.php
+++ b/htdocs/compta/bank/index.php
@@ -256,6 +256,7 @@ print '<input type="hidden" name="formfilteraction" id="formfilteraction" value=
 print '<input type="hidden" name="action" value="list">';
 print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+print '<input type="hidden" name="page" value="'.$page.'">';
 print '<input type="hidden" name="viewstatut" value="'.$viewstatut.'">';
 
 print_barre_liste($title,$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords,'title_bank.png',0,$newcardbutton,'',$limit, 1);
diff --git a/htdocs/compta/bank/various_payment/index.php b/htdocs/compta/bank/various_payment/index.php
index abf6d23d22e..f189eeef306 100644
--- a/htdocs/compta/bank/various_payment/index.php
+++ b/htdocs/compta/bank/various_payment/index.php
@@ -141,7 +141,8 @@ if ($result)
     print '<input type="hidden" name="action" value="list">';
     print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
     print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-
+    print '<input type="hidden" name="page" value="'.$page.'">';
+    
 	print_barre_liste($langs->trans("VariousPayments"),$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num, $totalnboflines, 'title_accountancy.png', 0, '', '', $limit);
 	
     print '<div class="div-table-responsive">';
diff --git a/htdocs/compta/charges/index.php b/htdocs/compta/charges/index.php
index ee71290be2d..a690478a53e 100644
--- a/htdocs/compta/charges/index.php
+++ b/htdocs/compta/charges/index.php
@@ -89,6 +89,7 @@ print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+print '<input type="hidden" name="page" value="'.$page.'">';
 print '<input type="hidden" name="mode" value="'.$mode.'">';
 
 if ($mode != 'sconly') 
diff --git a/htdocs/compta/facture/contact.php b/htdocs/compta/facture/contact.php
index cdca425d5f6..93b23834e9f 100644
--- a/htdocs/compta/facture/contact.php
+++ b/htdocs/compta/facture/contact.php
@@ -140,7 +140,7 @@ if ($id > 0 || ! empty($ref))
 
 		$totalpaye = $object->getSommePaiement();
 		
-		dol_fiche_head($head, 'contact', $langs->trans('InvoiceCustomer'), 0, 'bill');
+		dol_fiche_head($head, 'contact', $langs->trans('InvoiceCustomer'), -1, 'bill');
 
 		// Invoice content
 		
diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php
index 3c22b96a1d4..b09bd7f60f3 100644
--- a/htdocs/compta/facture/fiche-rec.php
+++ b/htdocs/compta/facture/fiche-rec.php
@@ -1652,6 +1652,7 @@ else
         	print '<input type="hidden" name="action" value="list">';
         	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
         	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+            print '<input type="hidden" name="page" value="'.$page.'">';
         	print '<input type="hidden" name="viewstatut" value="'.$viewstatut.'">';
 
 	        print_barre_liste($langs->trans("RepeatableInvoices"),$page,$_SERVER['PHP_SELF'],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords,'title_accountancy.png',0,'','',$limit);
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 638ca033e1a..10b11812b1a 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -433,7 +433,7 @@ if ($search_status != '' && $search_status >= 0)
     if ($search_status == '2') $sql.=" AND f.fk_statut = 2";  // payed     Not that some corrupted data may contains f.fk_statut = 1 AND f.paye = 1 (it means payed too but should not happend. If yes, reopen and reclassify billed)
     if ($search_status == '3') $sql.=" AND f.fk_statut = 3";  // abandonned
 }
-if ($search_paymentmode > 0) $sql .= " AND f.fk_mode_reglement = ".$search_paymentmode."";
+if ($search_paymentmode > 0) $sql .= " AND f.fk_mode_reglement = ".$search_paymentmode;
 if ($month > 0)
 {
     if ($year > 0 && empty($day))
@@ -454,7 +454,7 @@ if ($month_lim > 0)
 	else if ($year_lim > 0 && ! empty($day_lim))
 		$sql.= " AND f.date_lim_reglement BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month_lim, $day_lim, $year_lim))."' AND '".$db->idate(dol_mktime(23, 59, 59, $month_lim, $day_lim, $year_lim))."'";
 	else
-		$sql.= " AND date_format(f.date_lim_reglement, '%m') = '".$month_lim."'";
+		$sql.= " AND date_format(f.date_lim_reglement, '%m') = '".$db->escape($month_lim)."'";
 }
 else if ($year_lim > 0)
 {
@@ -600,6 +600,7 @@ if ($resql)
     print '<input type="hidden" name="action" value="list">';
     print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
     print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+    print '<input type="hidden" name="page" value="'.$page.'">';
     print '<input type="hidden" name="viewstatut" value="'.$viewstatut.'">';
 
 	print_barre_liste($langs->trans('BillsCustomers').' '.($socid?' '.$soc->name:''), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_accountancy.png', 0, '', '', $limit);
diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php
index f3d83278885..e9b1694808b 100644
--- a/htdocs/compta/facture/prelevement.php
+++ b/htdocs/compta/facture/prelevement.php
@@ -147,7 +147,7 @@ if ($object->id > 0)
 
 	$head = facture_prepare_head($object);
 
-	dol_fiche_head($head, 'standingorders', $langs->trans('InvoiceCustomer'),0,'bill');
+	dol_fiche_head($head, 'standingorders', $langs->trans('InvoiceCustomer'), -1, 'bill');
 
 	// Invoice content
 
diff --git a/htdocs/compta/paiement/cheque/list.php b/htdocs/compta/paiement/cheque/list.php
index 9798e2d28b4..a4fac965e7a 100644
--- a/htdocs/compta/paiement/cheque/list.php
+++ b/htdocs/compta/paiement/cheque/list.php
@@ -138,6 +138,7 @@ if ($resql)
 	print '<input type="hidden" name="view" value="'.dol_escape_htmltag($view).'">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+	print '<input type="hidden" name="page" value="'.$page.'">';
 	
 	print_barre_liste($langs->trans("MenuChequeDeposits"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_bank.png', '', '', $limit);
 	
diff --git a/htdocs/compta/paiement/list.php b/htdocs/compta/paiement/list.php
index ab4189d5338..daf70556213 100644
--- a/htdocs/compta/paiement/list.php
+++ b/htdocs/compta/paiement/list.php
@@ -218,6 +218,7 @@ if ($resql)
     print '<input type="hidden" name="action" value="list">';
     print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
     print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+    print '<input type="hidden" name="page" value="'.$page.'">';
     print '<input type="hidden" name="viewstatut" value="'.$viewstatut.'">';
     
     print_barre_liste($langs->trans("ReceivedCustomersPayments"), $page, $_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num, $nbtotalofrecords,'title_accountancy.png', 0, '', '', $limit);
diff --git a/htdocs/compta/prelevement/bons.php b/htdocs/compta/prelevement/bons.php
index 7319de4a7bd..302e1e9e59c 100644
--- a/htdocs/compta/prelevement/bons.php
+++ b/htdocs/compta/prelevement/bons.php
@@ -105,6 +105,7 @@ if ($result)
   print '<input type="hidden" name="action" value="list">';
   print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
   print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+  print '<input type="hidden" name="page" value="'.$page.'">';
   print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
   
   print_barre_liste($langs->trans("WithdrawalsReceipts"), $page, $_SERVER["PHP_SELF"], $urladd, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_generic', 0, '', '', $limit);
diff --git a/htdocs/compta/prelevement/factures.php b/htdocs/compta/prelevement/factures.php
index 72d775a49c3..6136ee48499 100644
--- a/htdocs/compta/prelevement/factures.php
+++ b/htdocs/compta/prelevement/factures.php
@@ -166,7 +166,8 @@ if ($result)
 	print '<input type="hidden" name="action" value="list">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-    print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
+    print '<input type="hidden" name="page" value="'.$page.'">';
+	print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 	print '<input type="hidden" name="viewstatut" value="'.$viewstatut.'">';
 
 	$massactionbutton='';
diff --git a/htdocs/compta/salaries/index.php b/htdocs/compta/salaries/index.php
index e193374a552..dc95b06bc52 100644
--- a/htdocs/compta/salaries/index.php
+++ b/htdocs/compta/salaries/index.php
@@ -150,7 +150,8 @@ if ($result)
     print '<input type="hidden" name="action" value="list">';
     print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
     print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-
+    print '<input type="hidden" name="page" value="'.$page.'">';
+    
 	print_barre_liste($langs->trans("SalariesPayments"),$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num, $totalnboflines, 'title_accountancy.png', 0, '', '', $limit);
 	
     print '<div class="div-table-responsive">';
diff --git a/htdocs/compta/sociales/card.php b/htdocs/compta/sociales/card.php
index f34ff9b1a31..630197cfc78 100644
--- a/htdocs/compta/sociales/card.php
+++ b/htdocs/compta/sociales/card.php
@@ -77,6 +77,13 @@ if ($action == 'reopen' && $user->rights->tax->charges->creer) {
     }
 }
 
+// Link to a project
+if ($action == 'classin' && $user->rights->tax->charges->creer)
+{
+    $object->fetch($id);
+    $object->setProject(GETPOST('projectid'));
+}
+
 if ($action == 'setlib' && $user->rights->tax->charges->creer)
 {
     $object->fetch($id);
@@ -203,11 +210,9 @@ if ($action == 'update' && ! $_POST["cancel"] && $user->rights->tax->charges->cr
 	{
         $result=$object->fetch($id);
 
-        $object->lib		= GETPOST('label');
         $object->date_ech	= $dateech;
         $object->periode	= $dateperiod;
         $object->amount		= price2num($amount);
-		$object->fk_project	= GETPOST("fk_project");
 
         $result=$object->update($user);
         if ($result <= 0)
@@ -276,6 +281,7 @@ if ($action == 'confirm_clone' && $confirm == 'yes' && ($user->rights->tax->char
 
 $form = new Form($db);
 $formsocialcontrib = new FormSocialContrib($db);
+if (! empty($conf->projet->enabled)) { $formproject = new FormProjets($db); }
 
 $title = $langs->trans("SocialContribution") . ' - ' . $langs->trans("Card");
 $help_url='EN:Module_Taxes_and_social_contributions|FR:Module Taxes et dividendes|ES:M&oacute;dulo Impuestos y cargas sociales (IVA, impuestos)';
@@ -430,15 +436,47 @@ if ($id > 0)
 			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 		}
 
-		dol_fiche_head($head, 'card', $langs->trans("SocialContribution"),0,'bill');
+		dol_fiche_head($head, 'card', $langs->trans("SocialContribution"), -1, 'bill');
 
 		$morehtmlref='<div class="refidno">';
 		// Ref customer
 		$morehtmlref.=$form->editfieldkey("Label", 'lib', $object->lib, $object, $user->rights->tax->charges->creer, 'string', '', 0, 1);
 		$morehtmlref.=$form->editfieldval("Label", 'lib', $object->lib, $object, $user->rights->tax->charges->creer, 'string', '', null, null, '', 1);
+		// Project
+		if (! empty($conf->projet->enabled))
+		{
+		    $langs->load("projects");
+		    $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
+		    if ($user->rights->tax->charges->creer)
+		    {
+		        if ($action != 'classify')
+		            $morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+		            if ($action == 'classify') {
+		                //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+		                $morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+		                $morehtmlref.='<input type="hidden" name="action" value="classin">';
+		                $morehtmlref.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		                $morehtmlref.=$formproject->select_projects(0, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+		                $morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+		                $morehtmlref.='</form>';
+		            } else {
+		                $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+		            }
+		    } else {
+		        if (! empty($object->fk_project)) {
+		            $proj = new Project($db);
+		            $proj->fetch($object->fk_project);
+		            $morehtmlref.='<a href="'.DOL_URL_ROOT.'/projet/card.php?id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
+		            $morehtmlref.=$proj->ref;
+		            $morehtmlref.='</a>';
+		        } else {
+		            $morehtmlref.='';
+		        }
+		    }
+		}		
 		$morehtmlref.='</div>';
 		
-		$linkback = '<a href="' . DOL_URL_ROOT . '/compta/sociales/index.php">' . $langs->trans("BackToList") . '</a>';
+		$linkback = '<a href="' . DOL_URL_ROOT . '/compta/sociales/index.php?restore_lastsearch_values=1">' . $langs->trans("BackToList") . '</a>';
 		
 		$object->totalpaye = $totalpaye;   // To give a chance to dol_banner_tab to use already paid amount to show correct status
 		
@@ -449,25 +487,6 @@ if ($id > 0)
 		print '<div class="underbanner clearboth"></div>';
 		
 		print '<table class="border" width="100%">';
-
-        /*
-		// Ref
-		print '<tr><td>'.$langs->trans("Ref").'</td><td>';
-		print $form->showrefnav($object,'id',$linkback);
-		print "</td></tr>";
-        */
-
-		// Label
-		/*if ($action == 'edit')
-		{
-			print '<tr><td>'.$langs->trans("Label").'</td><td>';
-			print '<input type="text" name="label" size="40" value="'.$object->lib.'">';
-			print '</td></tr>';
-		}
-		else
-		{
-			print '<tr><td>'.$langs->trans("Label").'</td><td colspan="2">'.$object->lib.'</td></tr>';
-		}*/
 		
 		// Type
 		print '<tr><td class="titlefield">'.$langs->trans("Type")."</td><td>".$object->type_libelle."</td>";
@@ -508,22 +527,6 @@ if ($id > 0)
             print '<tr><td>'.$langs->trans("AmountTTC").'</td><td>'.price($object->amount,0,$outputlangs,1,-1,-1,$conf->currency).'</td></tr>';
         }
 
-		// Project
-		if (! empty($conf->projet->enabled)){
-			print '<tr><td class="nowrap">';
-			print $langs->trans("Project");
-			print '</td><td>';
-			if ($action == 'edit') {
-				$formproject=new FormProjets($db);
-				$numproject=$formproject->select_projects(-1,$object->fk_project,'fk_project',16,0,1,1);
-			} else {
-				$project=new Project($db);
-				$project->fetch($object->fk_project);
-				print $project->getNomUrl(1,'',1);;
-			}
-			print '</td></tr>';
-		}
-
         // Mode of payment
         print '<tr><td>';
         print '<table class="nobordernopadding" width="100%"><tr><td>';
diff --git a/htdocs/compta/sociales/document.php b/htdocs/compta/sociales/document.php
index 95c72cbedb2..ce2f853c935 100644
--- a/htdocs/compta/sociales/document.php
+++ b/htdocs/compta/sociales/document.php
@@ -33,6 +33,11 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/tax.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+if (! empty($conf->projet->enabled))
+{
+    require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+    require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
+}
 
 $langs->load("other");
 $langs->load("companies");
@@ -88,6 +93,7 @@ if ($action == 'setlib' && $user->rights->tax->charges->creer)
  */
 
 $form = new Form($db);
+if (! empty($conf->projet->enabled)) { $formproject = new FormProjets($db); }
 
 $title = $langs->trans("SocialContribution") . ' - ' . $langs->trans("Documents");
 $help_url='EN:Module_Taxes_and_social_contributions|FR:Module Taxes et dividendes|ES:M&oacute;dulo Impuestos y cargas sociales (IVA, impuestos)';
@@ -105,9 +111,24 @@ if ($object->id)
 	// Label of social contribution
 	$morehtmlref.=$form->editfieldkey("Label", 'lib', $object->lib, $object, $user->rights->tax->charges->creer, 'string', '', 0, 1);
 	$morehtmlref.=$form->editfieldval("Label", 'lib', $object->lib, $object, $user->rights->tax->charges->creer, 'string', '', null, null, '', 1);
+    // Project
+	if (! empty($conf->projet->enabled))
+	{
+	    $langs->load("projects");
+	    $morehtmlref.='<br>'.$langs->trans('Project') . ' : ';
+        if (! empty($object->fk_project)) {
+            $proj = new Project($db);
+            $proj->fetch($object->fk_project);
+            $morehtmlref.='<a href="'.DOL_URL_ROOT.'/projet/card.php?id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
+            $morehtmlref.=$proj->ref;
+            $morehtmlref.='</a>';
+        } else {
+            $morehtmlref.='';
+        }
+	}		
 	$morehtmlref.='</div>';
 
-	$linkback = '<a href="' . DOL_URL_ROOT . '/compta/sociales/index.php">' . $langs->trans("BackToList") . '</a>';
+	$linkback = '<a href="' . DOL_URL_ROOT . '/compta/sociales/index.php?restore_lastsearch_values=1">' . $langs->trans("BackToList") . '</a>';
 
 	$object->totalpaye = $totalpaye;   // To give a chance to dol_banner_tab to use already paid amount to show correct status
 
diff --git a/htdocs/compta/sociales/index.php b/htdocs/compta/sociales/index.php
index 50e14823a5f..194c3f38d99 100644
--- a/htdocs/compta/sociales/index.php
+++ b/htdocs/compta/sociales/index.php
@@ -152,6 +152,7 @@ if ($resql)
 	print '<input type="hidden" name="action" value="list">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+    print '<input type="hidden" name="page" value="'.$page.'">';
 	print '<input type="hidden" name="viewstatut" value="'.$viewstatut.'">';
 	
 	if ($year)
diff --git a/htdocs/compta/sociales/info.php b/htdocs/compta/sociales/info.php
index bbacfafd430..91334134a2c 100644
--- a/htdocs/compta/sociales/info.php
+++ b/htdocs/compta/sociales/info.php
@@ -25,6 +25,11 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/tax.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+if (! empty($conf->projet->enabled))
+{
+    require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+    require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
+}
 
 $langs->load("compta");
 $langs->load("bills");
@@ -37,6 +42,7 @@ $socid = GETPOST('socid','int');
 if ($user->societe_id) $socid=$user->societe_id;
 $result = restrictedArea($user, 'tax', $id, 'chargesociales','charges');
 
+
 /*
  * Actions
  */
@@ -49,9 +55,13 @@ if ($action == 'setlib' && $user->rights->tax->charges->creer)
         setEventMessages($object->error, $object->errors, 'errors');
 }
 
+
 /*
  * View
  */
+
+if (! empty($conf->projet->enabled)) { $formproject = new FormProjets($db); }
+
 $title = $langs->trans("SocialContribution") . ' - ' . $langs->trans("Info");
 $help_url = 'EN:Module_Taxes_and_social_contributions|FR:Module Taxes et dividendes|ES:M&oacute;dulo Impuestos y cargas sociales (IVA, impuestos)';
 llxHeader("",$title,$help_url);
@@ -68,9 +78,24 @@ $morehtmlref='<div class="refidno">';
 // Label of social contribution
 $morehtmlref.=$form->editfieldkey("Label", 'lib', $object->lib, $object, $user->rights->tax->charges->creer, 'string', '', 0, 1);
 $morehtmlref.=$form->editfieldval("Label", 'lib', $object->lib, $object, $user->rights->tax->charges->creer, 'string', '', null, null, '', 1);
+// Project
+if (! empty($conf->projet->enabled))
+{
+    $langs->load("projects");
+    $morehtmlref.='<br>'.$langs->trans('Project') . ' : ';
+    if (! empty($object->fk_project)) {
+        $proj = new Project($db);
+        $proj->fetch($object->fk_project);
+        $morehtmlref.='<a href="'.DOL_URL_ROOT.'/projet/card.php?id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
+        $morehtmlref.=$proj->ref;
+        $morehtmlref.='</a>';
+    } else {
+        $morehtmlref.='';
+    }
+}
 $morehtmlref.='</div>';
 
-$linkback = '<a href="' . DOL_URL_ROOT . '/compta/sociales/index.php">' . $langs->trans("BackToList") . '</a>';
+$linkback = '<a href="' . DOL_URL_ROOT . '/compta/sociales/index.php?restore_lastsearch_values=1">' . $langs->trans("BackToList") . '</a>';
 
 $object->totalpaye = $totalpaye;   // To give a chance to dol_banner_tab to use already paid amount to show correct status
 
diff --git a/htdocs/compta/sociales/payments.php b/htdocs/compta/sociales/payments.php
index eda1633480a..ae7240c204a 100644
--- a/htdocs/compta/sociales/payments.php
+++ b/htdocs/compta/sociales/payments.php
@@ -85,6 +85,7 @@ print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+print '<input type="hidden" name="page" value="'.$page.'">';
 print '<input type="hidden" name="mode" value="'.$mode.'">';
 
 if ($mode != 'sconly') 
diff --git a/htdocs/compta/tva/reglement.php b/htdocs/compta/tva/reglement.php
index 94895062bc3..076978a86fb 100644
--- a/htdocs/compta/tva/reglement.php
+++ b/htdocs/compta/tva/reglement.php
@@ -154,6 +154,7 @@ if ($result)
 	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+	print '<input type="hidden" name="page" value="'.$page.'">';
 	
 	print_barre_liste($langs->trans("VATPayments"),$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$totalnboflines, 'title_accountancy', 0, '', '', $limit);
 	
diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index 929dbdc91e8..fc601cf8a53 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -433,6 +433,7 @@ print '<input type="hidden" name="formfilteraction" id="formfilteraction" value=
 print '<input type="hidden" name="view" value="'.dol_escape_htmltag($view).'">';
 print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+print '<input type="hidden" name="page" value="'.$page.'">';
 
 print_barre_liste($titre, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_companies.png', 0, '', '', $limit);
 
diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index 318a24931be..43cce90bd1c 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -340,6 +340,7 @@ if ($resql)
 	print '<input type="hidden" name="action" value="list">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+	print '<input type="hidden" name="page" value="'.$page.'">';
 	
     print_barre_liste($langs->trans("ListOfContracts"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $totalnboflines, 'title_commercial.png', 0, '', '', $limit);
 
diff --git a/htdocs/contrat/services.php b/htdocs/contrat/services.php
index f283502bc3e..adac837f3e0 100644
--- a/htdocs/contrat/services.php
+++ b/htdocs/contrat/services.php
@@ -308,6 +308,7 @@ print '<input type="hidden" name="formfilteraction" id="formfilteraction" value=
 print '<input type="hidden" name="action" value="list">';
 print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+print '<input type="hidden" name="page" value="'.$page.'">';
 
 $title=$langs->trans("ListOfServices");
 if ($mode == "0") $title=$langs->trans("ListOfInactiveServices");	// Must use == "0"
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index 3fef1265f9d..2fa2599e4d3 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -698,6 +698,7 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
 
     $sortfield = GETPOST("sortfield",'alpha');
     $sortorder = GETPOST("sortorder",'alpha');
+    $page = GETPOST('page','int');
     $search_status		= GETPOST("search_status",'int');
     if ($search_status=='') $search_status=1; // always display activ customer first
     $search_name = GETPOST("search_name",'alpha');
@@ -733,7 +734,8 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
     print '<input type="hidden" name="socid" value="'.$object->id.'">';
     print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
     print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
-
+    print '<input type="hidden" name="page" value="'.$page.'">';
+    
     print "\n".'<table class="noborder" width="100%">'."\n";
 
     $param="socid=".$object->id;
diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php
index 2eff05868d4..95338247eca 100644
--- a/htdocs/cron/list.php
+++ b/htdocs/cron/list.php
@@ -273,6 +273,7 @@ print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="action" value="list">';
 print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+print '<input type="hidden" name="page" value="'.$page.'">';
 print '<input type="hidden" name="viewstatut" value="'.$viewstatut.'">';
 
 // Line with explanation and button new job
diff --git a/htdocs/don/list.php b/htdocs/don/list.php
index b0cd414ed28..daa6f7aa1f2 100644
--- a/htdocs/don/list.php
+++ b/htdocs/don/list.php
@@ -149,6 +149,7 @@ if ($resql)
 	print '<input type="hidden" name="action" value="list">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+    print '<input type="hidden" name="page" value="'.$page.'">';
 	print '<input type="hidden" name="type" value="'.$type.'">';
 
     if ($search_all)
diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php
index 50454e3f253..c838c002cc9 100644
--- a/htdocs/expedition/list.php
+++ b/htdocs/expedition/list.php
@@ -280,6 +280,7 @@ if ($resql)
     print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
     print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
     print '<input type="hidden" name="action" value="list">';
+    print '<input type="hidden" name="page" value="'.$page.'">';
     print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
     print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
     
diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php
index 06998059aa5..f95952db482 100644
--- a/htdocs/expensereport/list.php
+++ b/htdocs/expensereport/list.php
@@ -314,6 +314,7 @@ if ($resql)
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 	print '<input type="hidden" name="action" value="list">';
+    print '<input type="hidden" name="page" value="'.$page.'">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 
diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php
index 9963794fd9f..9271a348558 100644
--- a/htdocs/fichinter/list.php
+++ b/htdocs/fichinter/list.php
@@ -288,6 +288,7 @@ if ($resql)
     print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
     print '<input type="hidden" name="action" value="list">';
+    print '<input type="hidden" name="page" value="'.$page.'">';
     print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
     print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
     print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index 8ca86a1e6c5..544d882cda3 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -677,6 +677,7 @@ if ($resql)
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 	print '<input type="hidden" name="action" value="list">';
+    print '<input type="hidden" name="page" value="'.$page.'">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 	print '<input type="hidden" name="viewstatut" value="'.$viewstatut.'">';
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index 9ad1bf63ce2..e449ed83371 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -453,6 +453,7 @@ if ($resql)
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 	print '<input type="hidden" name="action" value="list">';
+    print '<input type="hidden" name="page" value="'.$page.'">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 	print '<input type="hidden" name="viewstatut" value="'.$viewstatut.'">';
diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php
index b6825e93d82..10851e629e3 100644
--- a/htdocs/fourn/facture/paiement.php
+++ b/htdocs/fourn/facture/paiement.php
@@ -679,7 +679,8 @@ if (empty($action))
         print '<input type="hidden" name="action" value="list">';
         print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
         print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-
+        print '<input type="hidden" name="page" value="'.$page.'">';
+        
         $moreforfilter='';
         
         $parameters=array();
diff --git a/htdocs/fourn/product/list.php b/htdocs/fourn/product/list.php
index 94302eca4be..ca874511c94 100644
--- a/htdocs/fourn/product/list.php
+++ b/htdocs/fourn/product/list.php
@@ -170,6 +170,7 @@ if ($resql)
 	if ($fourn_id > 0) print '<input type="hidden" name="fourn_id" value="'.$fourn_id.'">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+    print '<input type="hidden" name="page" value="'.$page.'">';
 	print '<input type="hidden" name="type" value="'.$type.'">';
 
 	print '<table class="liste" width="100%">';
diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php
index 063c3042e3b..30d3dc14f69 100644
--- a/htdocs/holiday/list.php
+++ b/htdocs/holiday/list.php
@@ -282,6 +282,7 @@ print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="action" value="list">';
 print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+print '<input type="hidden" name="page" value="'.$page.'">';
 if ($id > 0) print '<input type="hidden" name="id" value="'.$id.'">';
 
 if ($sall)
diff --git a/htdocs/loan/index.php b/htdocs/loan/index.php
index fdc8cf67073..b04d3bd90b3 100644
--- a/htdocs/loan/index.php
+++ b/htdocs/loan/index.php
@@ -117,6 +117,7 @@ if ($resql)
 	print '<input type="hidden" name="action" value="list">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+    print '<input type="hidden" name="page" value="'.$page.'">';
 	print '<input type="hidden" name="viewstatut" value="'.$viewstatut.'">';
     
     print_barre_liste($langs->trans("Loans"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_accountancy.png', 0, '', '', $limit);
diff --git a/htdocs/modulebuilder/skeletons/skeleton_list.php b/htdocs/modulebuilder/skeletons/skeleton_list.php
index 205fcf4be8c..9c258162759 100644
--- a/htdocs/modulebuilder/skeletons/skeleton_list.php
+++ b/htdocs/modulebuilder/skeletons/skeleton_list.php
@@ -307,6 +307,7 @@ print '<input type="hidden" name="formfilteraction" id="formfilteraction" value=
 print '<input type="hidden" name="action" value="list">';
 print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+print '<input type="hidden" name="page" value="'.$page.'">';
 print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
 print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_companies', 0, '', '', $limit);
diff --git a/htdocs/opensurvey/list.php b/htdocs/opensurvey/list.php
index 636611f91f0..510a0545372 100644
--- a/htdocs/opensurvey/list.php
+++ b/htdocs/opensurvey/list.php
@@ -89,6 +89,7 @@ print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="action" value="list">';
 print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+print '<input type="hidden" name="page" value="'.$page.'">';
 
 $moreforfilter = '';
 
diff --git a/htdocs/product/list-with-listview.php b/htdocs/product/list-with-listview.php
index e3103d8f426..1ebbf256c9c 100644
--- a/htdocs/product/list-with-listview.php
+++ b/htdocs/product/list-with-listview.php
@@ -689,6 +689,7 @@ else
 		print '<input type="hidden" name="action" value="list">';
 		print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 		print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+        print '<input type="hidden" name="page" value="'.$page.'">';
 		print '<input type="hidden" name="type" value="'.$type.'">';
 
 		echo $listHTML;
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index c957606b66a..7e6ae9b47f4 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -429,6 +429,7 @@ else
 		print '<input type="hidden" name="action" value="list">';
 		print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 		print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+        print '<input type="hidden" name="page" value="'.$page.'">';
 		print '<input type="hidden" name="type" value="'.$type.'">';
 
 	    print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_products.png', 0, '', '', $limit);
diff --git a/htdocs/product/reassort.php b/htdocs/product/reassort.php
index a87fecd36b7..e460bbec7c5 100644
--- a/htdocs/product/reassort.php
+++ b/htdocs/product/reassort.php
@@ -189,6 +189,7 @@ if ($resql)
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+    print '<input type="hidden" name="page" value="'.$page.'">';
 	print '<input type="hidden" name="type" value="'.$type.'">';
 
 	if ($sref || $snom || $sall || GETPOST('search'))
diff --git a/htdocs/product/reassortlot.php b/htdocs/product/reassortlot.php
index 660d0e78bd3..6ab18ac87cb 100644
--- a/htdocs/product/reassortlot.php
+++ b/htdocs/product/reassortlot.php
@@ -200,6 +200,7 @@ if ($resql)
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+    print '<input type="hidden" name="page" value="'.$page.'">';
 	print '<input type="hidden" name="type" value="'.$type.'">';
 
 	if ($sref || $snom || $sall || GETPOST('search'))
diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php
index b3361f0b328..eefbe3deee9 100644
--- a/htdocs/product/stock/list.php
+++ b/htdocs/product/stock/list.php
@@ -135,7 +135,8 @@ if ($result)
 	print '<input type="hidden" name="action" value="list">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-
+	print '<input type="hidden" name="page" value="'.$page.'">';
+	
 	print_barre_liste($langs->trans("ListOfWarehouses"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $totalnboflines, 'title_generic.png', 0, '', '', $limit);
 	
 	if ($sall)
diff --git a/htdocs/product/stock/mouvement.php b/htdocs/product/stock/mouvement.php
index 506ee68e42b..5f0f9c213dc 100644
--- a/htdocs/product/stock/mouvement.php
+++ b/htdocs/product/stock/mouvement.php
@@ -695,6 +695,7 @@ if ($resql)
     print '<input type="hidden" name="action" value="list">';
     print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
     print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+    print '<input type="hidden" name="page" value="'.$page.'">';
     print '<input type="hidden" name="type" value="'.$type.'">';
     print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
     if ($id > 0) print '<input type="hidden" name="id" value="'.$id.'">';
diff --git a/htdocs/product/stock/productlot_list.php b/htdocs/product/stock/productlot_list.php
index df97621c07b..78d3c470cb1 100644
--- a/htdocs/product/stock/productlot_list.php
+++ b/htdocs/product/stock/productlot_list.php
@@ -309,6 +309,7 @@ if ($resql)
     print '<input type="hidden" name="action" value="list">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+	print '<input type="hidden" name="page" value="'.$page.'">';
 	
     print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_companies', 0, '', '', $limit);
 	
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index cbf036ef7e3..6230626a320 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -416,6 +416,7 @@ print '<input type="hidden" name="formfilteraction" id="formfilteraction" value=
 print '<input type="hidden" name="action" value="list">';
 print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+print '<input type="hidden" name="page" value="'.$page.'">';
 print '<input type="hidden" name="type" value="'.$type.'">';
 print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index 85fa0f640e9..064281633c8 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -468,6 +468,7 @@ else if ($id > 0 || ! empty($ref))
 	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+    print '<input type="hidden" name="page" value="'.$page.'">';
 	print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 	
 	$title=$langs->trans("ListOfTasks");
diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php
index 8c9f56f1d94..1f2459e85db 100644
--- a/htdocs/projet/tasks/list.php
+++ b/htdocs/projet/tasks/list.php
@@ -412,6 +412,7 @@ print '<input type="hidden" name="action" value="list">';
 print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+print '<input type="hidden" name="page" value="'.$page.'">';
 print '<input type="hidden" name="type" value="'.$type.'">';
 print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index ddbd59ed11f..cbdfece9d45 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -707,7 +707,8 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 		else print '<input type="hidden" name="action" value="list">';
 	    print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	    print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-		
+	    print '<input type="hidden" name="page" value="'.$page.'">';
+	     
 		print '<input type="hidden" name="id" value="'.$id.'">';
 		print '<input type="hidden" name="projectid" value="'.$projectidforalltimes.'">';
 		print '<input type="hidden" name="withproject" value="'.$withproject.'">';
diff --git a/htdocs/resource/list.php b/htdocs/resource/list.php
index c0b58523994..f8a1fb6be61 100644
--- a/htdocs/resource/list.php
+++ b/htdocs/resource/list.php
@@ -187,6 +187,7 @@ print '<input type="hidden" name="formfilteraction" id="formfilteraction" value=
 print '<input type="hidden" name="action" value="list">';
 print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+print '<input type="hidden" name="page" value="'.$page.'">';
 print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
 $moreforfilter = '';
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 4670036d70b..40ca07783c4 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -547,6 +547,7 @@ print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+print '<input type="hidden" name="page" value="'.$page.'">';
 
 print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_companies', 0, '', '', $limit);
 
diff --git a/htdocs/societe/notify/card.php b/htdocs/societe/notify/card.php
index b17ea678853..7e7648db712 100644
--- a/htdocs/societe/notify/card.php
+++ b/htdocs/societe/notify/card.php
@@ -454,6 +454,7 @@ if ($result > 0)
     print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
     print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
     print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+    print '<input type="hidden" name="page" value="'.$page.'">';
     print '<input type="hidden" name="socid" value="'.$object->id.'">';
     
     // List of active notifications
diff --git a/htdocs/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php
index c5f994f8a10..2c10e2451a6 100644
--- a/htdocs/supplier_proposal/list.php
+++ b/htdocs/supplier_proposal/list.php
@@ -410,6 +410,7 @@ if ($resql)
 	print '<input type="hidden" name="action" value="list">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+	print '<input type="hidden" name="page" value="'.$page.'">';
 	
 	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_commercial.png', 0, '', '', $limit);
 
diff --git a/htdocs/user/group/index.php b/htdocs/user/group/index.php
index 6956a1ad5eb..38fdf68b2ba 100644
--- a/htdocs/user/group/index.php
+++ b/htdocs/user/group/index.php
@@ -131,6 +131,7 @@ if ($resql)
     print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
     print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
     print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+    print '<input type="hidden" name="page" value="'.$page.'">';
     print '<input type="hidden" name="mode" value="'.$mode.'">';
     print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
diff --git a/htdocs/user/index.php b/htdocs/user/index.php
index 04acb9b56f7..4cec562ce44 100644
--- a/htdocs/user/index.php
+++ b/htdocs/user/index.php
@@ -296,6 +296,7 @@ print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+print '<input type="hidden" name="page" value="'.$page.'">';
 print '<input type="hidden" name="mode" value="'.$mode.'">';
 print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
diff --git a/htdocs/user/notify/card.php b/htdocs/user/notify/card.php
index 3c186ac3cae..e39d8153cac 100644
--- a/htdocs/user/notify/card.php
+++ b/htdocs/user/notify/card.php
@@ -435,6 +435,7 @@ if ($result > 0)
     print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
     print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
     print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+    print '<input type="hidden" name="page" value="'.$page.'">';
     print '<input type="hidden" name="id" value="'.$object->id.'">';
     
     // List of notifications done

From 5992175b687e7a7b226951269eb24cc4bbe10ea1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 21 May 2017 03:23:44 +0200
Subject: [PATCH 429/505] Standardize code between customer and supplier
 invoice list.

---
 htdocs/compta/facture/list.php    |  33 ++++++--
 htdocs/core/lib/functions.lib.php |   2 +-
 htdocs/fourn/facture/list.php     | 124 ++++++++++++++++++++++--------
 3 files changed, 119 insertions(+), 40 deletions(-)

diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 10b11812b1a..1ab17765d8f 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -536,7 +536,7 @@ if ($resql)
     $param='&socid='.$socid;
     if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
     if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
-	if ($sall)				 $param.='&sall='.$sall;
+	if ($sall)				 $param.='&sall='.urlencode($sall);
     if ($day)                $param.='&day='.urlencode($day);
     if ($month)              $param.='&month='.urlencode($month);
     if ($year)               $param.='&year=' .urlencode($year);
@@ -760,14 +760,14 @@ if ($resql)
     // Filters lines
     print '<tr class="liste_titre_filter">';
 	// Ref
-	if (! empty($arrayfields['f.facnumber']['checked'])) 
+	if (! empty($arrayfields['f.facnumber']['checked']))
 	{
         print '<td class="liste_titre" align="left">';
         print '<input class="flat" size="6" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
         print '</td>';
 	}
 	// Ref customer
-	if (! empty($arrayfields['f.ref_client']['checked'])) 
+	if (! empty($arrayfields['f.ref_client']['checked']))
 	{
     	print '<td class="liste_titre">';
     	print '<input class="flat" size="6" type="text" name="search_refcustomer" value="'.dol_escape_htmltag($search_refcustomer).'">';
@@ -806,6 +806,11 @@ if ($resql)
     	print '<br><input type="checkbox" name="option" value="late"'.($option == 'late'?' checked':'').'> '.$langs->trans("Late");
         print '</td>';
 	}
+	// Project
+	if (! empty($arrayfields['p.ref']['checked']))
+	{
+	    print '<td class="liste_titre" align="left"><input class="flat" type="text" size="6" name="search_project" value="'.$search_project.'"></td>';
+	}
 	// Thirpdarty
 	if (! empty($arrayfields['s.nom']['checked'])) 
 	{
@@ -1016,7 +1021,7 @@ if ($resql)
     
                 print '<td class="nobordernopadding nowrap">';
                 print $facturestatic->getNomUrl(1,'',200,0,'',0,1);
-                print $obj->increment;
+                print empty($obj->increment)?'':' ('.$obj->increment.')';
                 print '</td>';
     
                 print '<td style="min-width: 20px" class="nobordernopadding nowrap">';
@@ -1071,6 +1076,20 @@ if ($resql)
     		    if (! $i) $totalarray['nbfield']++;
     		}
 
+            // Project
+    		if (! empty($arrayfields['p.ref']['checked']))
+    		{
+    		    print '<td class="nowrap">';
+    		    if ($obj->project_id > 0)
+    		    {
+	    		    $projectstatic->id=$obj->project_id;
+    			    $projectstatic->ref=$obj->project_ref;
+    			    print $projectstatic->getNomUrl(1);
+    		    }
+    		    print '</td>';
+    		    if (! $i) $totalarray['nbfield']++;
+    		}
+    		
     		// Third party
     		if (! empty($arrayfields['s.nom']['checked']))
     		{
@@ -1295,15 +1314,13 @@ if ($resql)
 	print $hookmanager->resPrint;
     
 	print "</table>\n";
-    print "</div>";
+    print '</div>';
     
     print "</form>\n";
     
     if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files)
     {
-        /*
-         * Show list of available documents
-         */
+        // Show list of available documents
         $urlsource=$_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
         $urlsource.=str_replace('&amp;','&',$param);
         
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index b6365a23b9a..14f61d99590 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -105,7 +105,7 @@ function getDoliDBInstance($type, $host, $user, $pass, $name, $port)
  * 	@param	string	$element	Current element 
  *                              'societe', 'socpeople', 'actioncomm', 'agenda', 'resource', 
  *                              'product', 'productprice', 'stock',
- *                              'propal', 'facture', 'facture_fourn',
+ *                              'propal', 'supplier_proposal', 'facture', 'facture_fourn',
  *                              'categorie', 'bank_account', 'bank_account', 'adherent', 'user',  
  *                              'commande', 'commande_fournisseur', 'expedition', 'intervention', 'survey',
  *                              'contract', 'tax', 'expensereport', 'holiday', 'multicurrency', 'project',
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index e449ed83371..0918423908e 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -163,6 +163,8 @@ $arrayfields=array(
     'f.total_localtax1'=>array('label'=>$langs->transcountry("AmountLT1", $mysoc->country_code), 'checked'=>0, 'enabled'=>$mysoc->localtax1_assuj=="1"),
     'f.total_localtax2'=>array('label'=>$langs->transcountry("AmountLT2", $mysoc->country_code), 'checked'=>0, 'enabled'=>$mysoc->localtax2_assuj=="1"),
     'f.total_ttc'=>array('label'=>$langs->trans("AmountTTC"), 'checked'=>0),
+    'dynamount_payed'=>array('label'=>$langs->trans("Payed"), 'checked'=>0),
+    'rtp'=>array('label'=>$langs->trans("Rest"), 'checked'=>0),
     'f.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
     'f.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500),
     'f.fk_statut'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000),
@@ -263,7 +265,9 @@ $sql.= " s.rowid as socid, s.nom as name, s.town, s.zip, s.fk_pays, s.client, s.
 $sql.= " typent.code as typent_code,";
 $sql.= " state.code_departement as state_code, state.nom as state_name,";
 $sql.= " p.rowid as project_id, p.ref as project_ref";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user ";
+// We need dynamount_payed to be able to sort on status (value is surely wrong because we can count several lines several times due to other left join or link with contacts. But what we need is just 0 or > 0)
+// TODO Better solution to be able to sort on already payed or remain to pay is to store amount_payed in a denormalized field.
+if (! $search_all) $sql.= ', SUM(pf.amount) as dynamount_payed';   
 // Add fields from extrafields
 foreach ($extrafields->attribute_label as $key => $val) $sql.=($extrafields->attribute_type[$key] != 'separate' ? ",ef.".$key.' as options_'.$key : '');
 // Add fields from hooks
@@ -276,6 +280,7 @@ $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_typent as typent on (typent.id = s.fk_typ
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as state on (state.rowid = s.fk_departement)";
 $sql.= ', '.MAIN_DB_PREFIX.'facture_fourn as f';
 if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."facture_fourn_extrafields as ef on (f.rowid = ef.fk_object)";
+if (! $search_all) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'paiementfourn_facturefourn as pf ON pf.fk_facturefourn = f.rowid';
 if ($search_all || $search_product_category > 0) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'facture_fourn_det as pd ON f.rowid=pd.fk_facture_fourn';
 if ($search_product_category > 0) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_product as cp ON cp.fk_product=pd.fk_product';
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."projet as p ON p.rowid = f.fk_projet";
@@ -287,14 +292,10 @@ if ($search_user > 0)
     $sql.=", ".MAIN_DB_PREFIX."c_type_contact as tc";
 }
 $sql.= ' WHERE f.fk_soc = s.rowid';
-$sql.= " AND f.entity = ".$conf->entity;
+$sql.= ' AND f.entity IN ('.getEntity('facture_fourn', 1).')';
 if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 if ($search_product_category > 0) $sql.=" AND cp.fk_categorie = ".$search_product_category;
 if ($socid > 0) $sql .= ' AND s.rowid = '.$socid;
-if ($search_all)
-{
-    $sql.= natural_search(array_keys($fieldstosearchall), $search_all);
-}
 if ($search_ref)
 {
 	if (is_numeric($search_ref)) $sql .= natural_search(array('f.ref'), $search_ref);
@@ -337,7 +338,7 @@ if ($month_lim > 0)
 	else if ($year_lim > 0 && ! empty($day_lim))
 		$sql.= " AND f.date_lim_reglement BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month_lim, $day_lim, $year_lim))."' AND '".$db->idate(dol_mktime(23, 59, 59, $month_lim, $day_lim, $year_lim))."'";
 	else
-		$sql.= " AND date_format(f.date_lim_reglement, '%m') = '".$month_lim."'";
+		$sql.= " AND date_format(f.date_lim_reglement, '%m') = '".$db->escape($month_lim)."'";
 }
 else if ($year_lim > 0)
 {
@@ -382,6 +383,26 @@ $parameters=array();
 $reshook=$hookmanager->executeHooks('printFieldListWhere',$parameters);    // Note that $action and $object may have been modified by hook
 $sql.=$hookmanager->resPrint;
 
+if (! $search_all)
+{
+    $sql.= " GROUP BY f.rowid, f.ref, f.ref_supplier, f.datef, f.date_lim_reglement, f.fk_mode_reglement,";
+    $sql.= " f.total_ht, f.total_ttc, f.total_tva, f.paye, f.fk_statut, f.libelle, f.datec, f.tms,";
+    $sql.= " f.localtax1, f.localtax2,";
+    $sql.= " s.rowid, s.nom, s.town, s.zip, s.fk_pays, s.client, s.code_client,";
+    $sql.= " typent.code,";
+    $sql.= " state.code_departement, state.nom,";
+    $sql.= " p.rowid, p.ref";
+
+    foreach ($extrafields->attribute_label as $key => $val) //prevent error with sql_mode=only_full_group_by
+    {
+        $sql.=($extrafields->attribute_type[$key] != 'separate' ? ",ef.".$key : '');
+    }   
+}
+else
+{
+    $sql.= natural_search(array_keys($fieldstosearchall), $search_all);
+}
+
 $sql.= $db->order($sortfield,$sortorder);
 
 $nbtotalofrecords = '';
@@ -410,7 +431,8 @@ if ($resql)
 	$param='&socid='.$socid;
     if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
     if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
-	if ($day) 					$param.='&day='.urlencode($day);
+	if ($search_all)			$param.='&search_all='.urlencode($search_all);
+    if ($day) 					$param.='&day='.urlencode($day);
 	if ($month) 				$param.='&month='.urlencode($month);
 	if ($year)  				$param.='&year=' .urlencode($year);
 	if ($day_lim) 				$param.='&day_lim='.urlencode($day_lim);
@@ -428,6 +450,8 @@ if ($resql)
 	if ($search_amount_no_tax)	$param.='&search_amount_no_tax='.urlencode($search_amount_no_tax);
 	if ($search_amount_all_tax)	$param.='&search_amount_all_tax='.urlencode($search_amount_all_tax);
 	if ($search_status >= 0)  	$param.="&search_status=".urlencode($search_status);
+    if ($show_files)            $param.='&show_files=' .$show_files;
+	if ($option)                $param.="&option=".$option;
 	if ($optioncss != '')       $param.='&optioncss='.$optioncss;
 	// Add $param from extra fields
 	foreach ($search_array_options as $key => $val)
@@ -453,13 +477,13 @@ if ($resql)
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 	print '<input type="hidden" name="action" value="list">';
-    print '<input type="hidden" name="page" value="'.$page.'">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+    print '<input type="hidden" name="page" value="'.$page.'">';
 	print '<input type="hidden" name="viewstatut" value="'.$viewstatut.'">';
 	print '<input type="hidden" name="socid" value="'.$socid.'">';
 
-	print_barre_liste($langs->trans("BillsSuppliers").($socid?" - $soc->name":""), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_accountancy', 0, '', '', $limit);
+	print_barre_liste($langs->trans("BillsSuppliers").($socid?' '.$soc->name:''), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_accountancy', 0, '', '', $limit);
 	
 	if ($massaction == 'presend')
 	{
@@ -467,7 +491,7 @@ if ($resql)
 	
 	    if (! GETPOST('cancel'))
 	    {
-	        $objecttmp=new Commande($db);
+	        $objecttmp=new FactureFourn($db);
 	        $listofselectedid=array();
 	        $listofselectedthirdparties=array();
 	        $listofselectedref=array();
@@ -491,8 +515,8 @@ if ($resql)
 	
 	    dol_fiche_head(null, '', '');
 	
-	    $topicmail="SendOrderRef";
-	    $modelmail="order_send";
+	    $topicmail="SendBillRef";
+	    $modelmail="supplier_invoice_send";
 	
 	    // Cree l'objet formulaire mail
 	    include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
@@ -506,12 +530,12 @@ if ($resql)
 	    }
 	    if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 1))	// If bit 1 is set
 	    {
-	        $formmail->trackid='ord'.$object->id;
+	        $formmail->trackid='sinv'.$object->id;
 	    }
 	    if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2))	// If bit 2 is set
 	    {
 	        include DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-	        $formmail->frommail=dolAddEmailTrackId($formmail->frommail, 'ord'.$object->id);
+	        $formmail->frommail=dolAddEmailTrackId($formmail->frommail, 'sinv'.$object->id);
 	    }
 	    $formmail->withfrom=1;
 	    $liste=$langs->trans("AllRecipientSelected");
@@ -678,7 +702,7 @@ if ($resql)
 	if (! empty($arrayfields['f.datef']['checked']))
 	{
 	    print '<td class="liste_titre" align="center">';
-	    if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="day" value="'.$day.'">';
+	    if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="day" value="'.dol_escape_htmltag($day).'">';
 	    print '<input class="flat" type="text" size="1" maxlength="2" name="month" value="'.$month.'">';
 	    $formother->select_year($year?$year:-1,'year',1, 20, 5);
 	    print '</td>';
@@ -687,7 +711,7 @@ if ($resql)
 	if (! empty($arrayfields['f.date_lim_reglement']['checked']))
 	{
 	    print '<td class="liste_titre" align="center">';
-	    if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="day_lim" value="'.$day_lim.'">';
+	    if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="day_lim" value="'.dol_escape_htmltag($day_lim).'">';
 	    print '<input class="flat" type="text" size="1" maxlength="2" name="month_lim" value="'.$month_lim.'">';
 	    $formother->select_year($year_lim?$year_lim:-1,'year_lim',1, 20, 5);
 	    print '<br><input type="checkbox" name="option" value="late"'.($option == 'late'?' checked':'').'> '.$langs->trans("Late");
@@ -704,9 +728,9 @@ if ($resql)
 	    print '<td class="liste_titre" align="left"><input class="flat" type="text" size="6" name="search_societe" value="'.$search_societe.'"></td>';
 	}
 	// Town
-	if (! empty($arrayfields['s.town']['checked'])) print '<td class="liste_titre"><input class="flat" type="text" size="6" name="search_town" value="'.$search_town.'"></td>';
+	if (! empty($arrayfields['s.town']['checked'])) print '<td class="liste_titre"><input class="flat" type="text" size="6" name="search_town" value="'.dol_escape_htmltag($search_town).'"></td>';
 	// Zip
-	if (! empty($arrayfields['s.zip']['checked'])) print '<td class="liste_titre"><input class="flat" type="text" size="4" name="search_zip" value="'.$search_zip.'"></td>';
+	if (! empty($arrayfields['s.zip']['checked'])) print '<td class="liste_titre"><input class="flat" type="text" size="4" name="search_zip" value="'.dol_escape_htmltag($search_zip).'"></td>';
 	// State
 	if (! empty($arrayfields['state.nom']['checked']))
 	{
@@ -739,14 +763,14 @@ if ($resql)
 	{
 	    // Amount
 	    print '<td class="liste_titre" align="right">';
-	    print '<input class="flat" type="text" size="5" name="search_montant_ht" value="'.$search_montant_ht.'">';
+	    print '<input class="flat" type="text" size="5" name="search_montant_ht" value="'.dol_escape_htmltag($search_montant_ht).'">';
 	    print '</td>';
 	}
 	if (! empty($arrayfields['f.total_vat']['checked']))
 	{
 	    // Amount
 	    print '<td class="liste_titre" align="right">';
-	    print '<input class="flat" type="text" size="5" name="search_montant_vat" value="'.$search_montant_vat.'">';
+	    print '<input class="flat" type="text" size="5" name="search_montant_vat" value="'.dol_escape_htmltag($search_montant_vat).'">';
 	    print '</td>';
 	}
 	if (! empty($arrayfields['f.total_localtax1']['checked']))
@@ -767,9 +791,19 @@ if ($resql)
 	{
 	    // Amount
 	    print '<td class="liste_titre" align="right">';
-	    print '<input class="flat" type="text" size="5" name="search_montant_ttc" value="'.$search_montant_ttc.'">';
+	    print '<input class="flat" type="text" size="5" name="search_montant_ttc" value="'.dol_escape_htmltag($search_montant_ttc).'">';
 	    print '</td>';
 	}
+    if (! empty($arrayfields['dynamount_payed']['checked']))
+    {
+        print '<td class="liste_titre" align="right">';
+        print '</td>';
+    }
+    if (! empty($arrayfields['rtp']['checked']))
+    {
+        print '<td class="liste_titre" align="right">';
+        print '</td>';
+    }
 	// Extra fields
 	if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 	{
@@ -819,7 +853,7 @@ if ($resql)
 	}
 	// Action column
 	print '<td class="liste_titre" align="middle">';
-	$searchpicto=$form->showFilterButtons('checkforselect', 0);
+	$searchpicto=$form->showFilterButtons();
 	print $searchpicto;
 	print '</td>';
 
@@ -844,6 +878,8 @@ if ($resql)
 	if (! empty($arrayfields['f.total_localtax1']['checked']))    print_liste_field_titre($arrayfields['f.total_localtax1']['label'],$_SERVER['PHP_SELF'],'f.localtax1','',$param,'align="right"',$sortfield,$sortorder);
 	if (! empty($arrayfields['f.total_localtax2']['checked']))    print_liste_field_titre($arrayfields['f.total_localtax2']['label'],$_SERVER['PHP_SELF'],'f.localtax2','',$param,'align="right"',$sortfield,$sortorder);
 	if (! empty($arrayfields['f.total_ttc']['checked']))          print_liste_field_titre($arrayfields['f.total_ttc']['label'],$_SERVER['PHP_SELF'],'f.total_ttc','',$param,'align="right"',$sortfield,$sortorder);
+    if (! empty($arrayfields['dynamount_payed']['checked']))      print_liste_field_titre($arrayfields['dynamount_payed']['label'],$_SERVER['PHP_SELF'],'','',$param,'align="right"',$sortfield,$sortorder);
+    if (! empty($arrayfields['rtp']['checked']))                  print_liste_field_titre($arrayfields['rtp']['label'],$_SERVER['PHP_SELF'],'','',$param,'align="right"',$sortfield,$sortorder);
 	// Extra fields
 	if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 	{
@@ -880,14 +916,20 @@ if ($resql)
 		{
 			$obj = $db->fetch_object($resql);
 			
-		
 			$datelimit=$db->jdate($obj->datelimite);
 			$facturestatic->id=$obj->facid;
 			$facturestatic->ref=$obj->ref;
+            $facturestatic->type=$obj->type;
 			$facturestatic->ref_supplier=$obj->ref_supplier;
 			$facturestatic->date_echeance = $db->jdate($obj->datelimite);
 			$facturestatic->statut = $obj->fk_statut;
-	
+
+			$paiement = $facturestatic->getSommePaiement();
+			$totalcreditnotes = $facturestatic->getSumCreditNotesUsed();
+			$totaldeposits = $facturestatic->getSumDepositsUsed();
+			$totalpay = $paiement + $totalcreditnotes + $totaldeposits;
+			$remaintopay = $obj->total_ttc - $totalpay;
+				
             print '<tr class="oddeven">';
     		if (! empty($arrayfields['f.ref']['checked']))
     		{
@@ -969,7 +1011,7 @@ if ($resql)
     		// Third party
     		if (! empty($arrayfields['s.nom']['checked']))
     		{
-                print '<td>';
+                print '<td class="tdoverflowmax200">';
                 $thirdparty=new Societe($db);
                 $thirdparty->id=$obj->socid;
                 $thirdparty->name=$obj->name;
@@ -1070,22 +1112,23 @@ if ($resql)
     		    $totalarray['totalttc'] += $obj->total_ttc;
             }
 
-            if (! empty($arrayfields['am']['checked']))
+		    if (! empty($arrayfields['dynamount_payed']['checked']))
             {
-                print '<td align="right">'.(! empty($paiement)?price($paiement,0,$langs):'&nbsp;').'</td>';
+                print '<td align="right">'.(! empty($totalpay)?price($totalpay,0,$langs):'&nbsp;').'</td>'; // TODO Use a denormalized field
                 if (! $i) $totalarray['nbfield']++;
     		    if (! $i) $totalarray['totalamfield']=$totalarray['nbfield'];
-    		    $totalarray['totalam'] += $paiement;
+    		    $totalarray['totalam'] += $totalpay;
             }
 
             if (! empty($arrayfields['rtp']['checked']))
             {
-                print '<td align="right">'.(! empty($remaintopay)?price($remaintopay,0,$langs):'&nbsp;').'</td>';
+                print '<td align="right">'.(! empty($remaintopay)?price($remaintopay,0,$langs):'&nbsp;').'</td>'; // TODO Use a denormalized field
                 if (! $i) $totalarray['nbfield']++;
     		    if (! $i) $totalarray['totalrtpfield']=$totalarray['nbfield'];
     		    $totalarray['totalrtp'] += $remaintopay;
             }
             
+            
             // Extra fields
             if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
             {
@@ -1135,7 +1178,6 @@ if ($resql)
             }
             
     		// Action column
-            // Action column
             print '<td class="nowrap" align="center">';
             if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
             {
@@ -1193,7 +1235,27 @@ if ($resql)
 	
 	print "</table>\n";
     print '</div>';
+    
 	print "</form>\n";
+    
+    /*
+    if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files)
+    {
+        // Show list of available documents
+        $urlsource=$_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
+        $urlsource.=str_replace('&amp;','&',$param);
+        
+        $filedir=$diroutputmassaction;
+        $genallowed=$user->rights->facture->lire;
+        $delallowed=$user->rights->facture->lire;
+    
+        print $formfile->showdocuments('massfilesarea_invoices','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$title,'');
+    }
+    else
+    {
+        print '<br><a name="show_files"></a><a href="'.$_SERVER["PHP_SELF"].'?show_files=1'.$param.'#show_files">'.$langs->trans("ShowTempMassFilesArea").'</a>';
+    }
+    */
 }
 else
 {

From 52b5a8ece787e4d0c6d5ae893819777fdfe4368a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 21 May 2017 14:06:43 +0200
Subject: [PATCH 430/505] More powerfull dol_move function.

---
 htdocs/api/class/api_documents.class.php |  26 +--
 htdocs/core/class/antivir.class.php      |   7 +
 htdocs/core/lib/files.lib.php            | 216 ++++++++++++++---------
 test/phpunit/RestAPIDocumentTest.php     |   2 +-
 4 files changed, 160 insertions(+), 91 deletions(-)

diff --git a/htdocs/api/class/api_documents.class.php b/htdocs/api/class/api_documents.class.php
index 18ccee58b07..9794dad4a12 100644
--- a/htdocs/api/class/api_documents.class.php
+++ b/htdocs/api/class/api_documents.class.php
@@ -65,8 +65,8 @@ class Documents extends DolibarrApi
 
     /**
      * Push a file. 
-     * Test sample 1: { "filename": "mynewfile.txt", "modulepart": "facture", "ref": "FA1701-001", "subdir": "", "filecontent": "content text", "fileencoding": "" }.
-     * Test sample 2: { "filename": "mynewfile.txt", "modulepart": "medias", "ref": "", "subdir": "mysubdir1/mysubdir2", "filecontent": "content text", "fileencoding": "" }.
+     * Test sample 1: { "filename": "mynewfile.txt", "modulepart": "facture", "ref": "FA1701-001", "subdir": "", "filecontent": "content text", "fileencoding": "", "overwriteifexists": "0" }.
+     * Test sample 2: { "filename": "mynewfile.txt", "modulepart": "medias", "ref": "", "subdir": "mysubdir1/mysubdir2", "filecontent": "content text", "fileencoding": "", "overwriteifexists": "0" }.
      *
      * @param   string  $filename           Name of file to create ('FA1705-0123')
      * @param   string  $modulepart         Name of module or area concerned by file upload ('facture', ...)
@@ -74,10 +74,12 @@ class Documents extends DolibarrApi
      * @param   string  $subdir             Subdirectory (Only if ref not provided)
      * @param   string  $filecontent        File content (string with file content. An empty file will be created if this parameter is not provided)
      * @param   string  $fileencoding       File encoding (''=no encoding, 'base64'=Base 64)
+     * @param   int 	$overwriteifexists  Overwrite file if exists (1 by default)
      * @return  bool     				    State of copy
      * @throws RestException
      */
-    public function post($filename, $modulepart, $ref='', $subdir='', $filecontent='', $fileencoding='') {
+    public function post($filename, $modulepart, $ref='', $subdir='', $filecontent='', $fileencoding='', $overwriteifexists=0)
+    {
         global $db, $conf;
         
         /*var_dump($modulepart);
@@ -138,30 +140,34 @@ class Documents extends DolibarrApi
 		
 		$upload_dir = dol_sanitizePathName($upload_dir);
 		
-        $destfile = $upload_dir . '/' . $original_file;
-
+		$destfile = $upload_dir . '/' . $original_file;
+		$destfiletmp = DOL_DATA_ROOT.'/admin/temp/' . $original_file;
+		dol_delete_file($destfiletmp);
+		
         if (!dol_is_dir($upload_dir)) {
             throw new RestException(401,'Directory not exists : '.$upload_dir);
         }
 
-        if (dol_is_file($destfile))
+        if (! $overwriteifexists && dol_is_file($destfile))
         {
             throw new RestException(500, "File with name '".$original_file."' already exists.");
         }
         
-        $fhandle = fopen($destfile, 'w');
+        $fhandle = @fopen($destfiletmp, 'w');
         if ($fhandle)
         {
             $nbofbyteswrote = fwrite($fhandle, $newfilecontent);
             fclose($fhandle);
-            @chmod($destfile, octdec($conf->global->MAIN_UMASK));
+            @chmod($destfiletmp, octdec($conf->global->MAIN_UMASK));
         }
         else
         {
-            throw new RestException(500, 'Failed to open file for write');
+            throw new RestException(500, "Failed to open file '".$destfiletmp."' for write");
         }
         
-        return true;
+        $result = dol_move($destfiletmp, $destfile, 0, $overwriteifexists, 1);
+        
+        return $result;
     }
 
     /**
diff --git a/htdocs/core/class/antivir.class.php b/htdocs/core/class/antivir.class.php
index d7f765fa510..357f184eea8 100644
--- a/htdocs/core/class/antivir.class.php
+++ b/htdocs/core/class/antivir.class.php
@@ -49,6 +49,7 @@ class AntiVir
 	/**
 	 *	Scan a file with antivirus.
 	 *  This function runs the command defined in setup. This antivirus command must return 0 if OK.
+	 *  Return also true (virus found) if file end with '.virus' (so we can make test safely).
 	 *
 	 *	@param	string	$file		File to scan
 	 *	@return	int					<0 if KO (-98 if error, -99 if virus), 0 if OK
@@ -59,6 +60,12 @@ class AntiVir
 
 		$return = 0;
 
+		if (preg_match('/\.virus$/i', $file))
+		{
+		    $this->errors='File has an extension saying file is a virus';
+		    return -97;		    
+		}
+		
 		$fullcommand=$this->getCliCommand($file);
 		//$fullcommand='"c:\Program Files (x86)\ClamWin\bin\clamscan.exe" --database="C:\Program Files (x86)\ClamWin\lib" "c:\temp\aaa.txt"';
         $fullcommand.=' 2>&1';      // This is to get error output
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 437811d8e98..008f4c15e3c 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -648,15 +648,19 @@ function dolCopyDir($srcfile, $destfile, $newmask, $overwriteifexists)
 
 /**
  * Move a file into another name.
- * This function differs from dol_move_uploaded_file, because it can be called in any context.
+ * Note: 
+ *  - This function differs from dol_move_uploaded_file, because it can be called in any context.
+ *  - Database of files is updated.
+ *  - Test on antivirus is done only if param testvirus is provided and an antivirus was set. 
  *
  * @param	string  $srcfile            Source file (can't be a directory. use native php @rename() to move a directory)
  * @param   string	$destfile           Destination file (can't be a directory. use native php @rename() to move a directory)
  * @param   integer	$newmask            Mask in octal string for new file (0 by default means $conf->global->MAIN_UMASK)
  * @param   int		$overwriteifexists  Overwrite file if exists (1 by default)
  * @return  boolean 		            True if OK, false if KO
+ * @see dol_move_uploaded_file
  */
-function dol_move($srcfile, $destfile, $newmask=0, $overwriteifexists=1)
+function dol_move($srcfile, $destfile, $newmask=0, $overwriteifexists=1, $testvirus=0)
 {
     global $user, $db, $conf;
     $result=false;
@@ -676,6 +680,18 @@ function dol_move($srcfile, $destfile, $newmask=0, $overwriteifexists=1)
         $newpathofsrcfile=dol_osencode($srcfile);
         $newpathofdestfile=dol_osencode($destfile);
 
+        // Check virus
+        $testvirusarray=array();
+        if ($testvirus)
+        {
+            $testvirusarray=dolCheckVirus($newpathofsrcfile);
+            if (count($testvirusarray)) 
+            {
+                dol_syslog("files.lib.php::dol_move canceled because a virus was found into source file. we ignore the move request.", LOG_WARNING);
+                return false;
+            }
+        }
+
         $result=@rename($newpathofsrcfile, $newpathofdestfile); // To see errors, remove @
         if (! $result)
         {
@@ -703,9 +719,17 @@ function dol_move($srcfile, $destfile, $newmask=0, $overwriteifexists=1)
 
                 dol_syslog("Try to rename also entries in database for full relative path before = ".$rel_filetorenamebefore." after = ".$rel_filetorenameafter, LOG_DEBUG);
                 include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
+                
+                $ecmfiletarget=new EcmFiles($db);
+                $resultecmtarget = $ecmfiletarget->fetch(0, '', $rel_filetorenameafter);
+                if ($resultecmtarget > 0)   // An entry for target name already exists for target, we delete it, a new one will be created.
+                {
+                    $ecmfiletarget->delete($user);
+                }
+                
                 $ecmfile=new EcmFiles($db);
-                $result = $ecmfile->fetch(0, '', $rel_filetorenamebefore);
-                if ($result > 0)   // If found
+                $resultecm = $ecmfile->fetch(0, '', $rel_filetorenamebefore);
+                if ($resultecm > 0)   // If an entry was found for src file, we use it to move entry
                 {
                     $filename = basename($rel_filetorenameafter);
                     $rel_dir = dirname($rel_filetorenameafter);
@@ -714,9 +738,9 @@ function dol_move($srcfile, $destfile, $newmask=0, $overwriteifexists=1)
                     
                     $ecmfile->filepath = $rel_dir;
                     $ecmfile->filename = $filename;
-                    $result = $ecmfile->update($user);
+                    $resultecm = $ecmfile->update($user);
                 }
-                elseif ($result == 0)   // If not found
+                elseif ($resultecm == 0)   // If no entry were found for src files, create/update target file
                 {
                     $filename = basename($rel_filetorenameafter);
                     $rel_dir = dirname($rel_filetorenameafter);
@@ -730,16 +754,19 @@ function dol_move($srcfile, $destfile, $newmask=0, $overwriteifexists=1)
                     $ecmfile->gen_or_uploaded = 'unknown';
                     $ecmfile->description = '';    // indexed content
                     $ecmfile->keyword = '';        // keyword content
-                    $result = $ecmfile->create($user);
-                    if ($result < 0)
+                    $resultecm = $ecmfile->create($user);
+                    if ($resultecm < 0)
                     {
                         setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
-                    }                    
+                    }
                 }
-                elseif ($result < 0)
+                elseif ($resultecm < 0)
                 {
                     setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
                 }
+                
+                if ($resultecm > 0) $result=true;
+                else $result = false;
             }        
         }
         
@@ -769,10 +796,41 @@ function dol_unescapefile($filename)
 	return trim(basename($filename), ".\x00..\x20");
 }
 
+
+/**
+ * Check virus into a file
+ * 
+ * @param   string      $src_file       Source file to check
+ * @return  array                       Array of errors or empty array if not virus found
+ */
+function dolCheckVirus($src_file)
+{
+    global $conf;
+    
+    if (! empty($conf->global->MAIN_ANTIVIRUS_COMMAND))
+    {
+        if (! class_exists('AntiVir')) {
+            require_once DOL_DOCUMENT_ROOT.'/core/class/antivir.class.php';
+        }
+        $antivir=new AntiVir($db);
+        $result = $antivir->dol_avscan_file($src_file);
+        if ($result < 0)	// If virus or error, we stop here
+        {
+            $reterrors=$antivir->errors;
+            return $reterrors;
+        }
+    }
+    return array();
+}
+
+
 /**
  *	Make control on an uploaded file from an GUI page and move it to final destination.
  * 	If there is errors (virus found, antivir in error, bad filename), file is not moved.
- *  Note: This function can be used only into a HTML page context. Use dol_move if you are outside.
+ *  Note: 
+ *  - This function can be used only into a HTML page context. Use dol_move if you are outside.
+ *  - Database of files is not updated.
+ *  - Test on antivirus is always done (if antivirus set).
  *
  *	@param	string	$src_file			Source full path filename ($_FILES['field']['tmp_name'])
  *	@param	string	$dest_file			Target full path filename  ($_FILES['field']['name'])
@@ -794,80 +852,78 @@ function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite, $disable
 
 	if (empty($nohook))
 	{
-		// If an upload error has been reported
-		if ($uploaderrorcode)
-		{
-			switch($uploaderrorcode)
-			{
-				case UPLOAD_ERR_INI_SIZE:	// 1
-					return 'ErrorFileSizeTooLarge';
-					break;
-				case UPLOAD_ERR_FORM_SIZE:	// 2
-					return 'ErrorFileSizeTooLarge';
-					break;
-				case UPLOAD_ERR_PARTIAL:	// 3
-					return 'ErrorPartialFile';
-					break;
-				case UPLOAD_ERR_NO_TMP_DIR:	//
-					return 'ErrorNoTmpDir';
-					break;
-				case UPLOAD_ERR_CANT_WRITE:
-					return 'ErrorFailedToWriteInDir';
-					break;
-				case UPLOAD_ERR_EXTENSION:
-					return 'ErrorUploadBlockedByAddon';
-					break;
-				default:
-					break;
-			}
-		}
-
-		// If we need to make a virus scan
-		if (empty($disablevirusscan) && file_exists($src_file) && ! empty($conf->global->MAIN_ANTIVIRUS_COMMAND))
-		{
-			if (! class_exists('AntiVir')) {
-				require_once DOL_DOCUMENT_ROOT.'/core/class/antivir.class.php';
-			}
-			$antivir=new AntiVir($db);
-			$result = $antivir->dol_avscan_file($src_file);
-			if ($result < 0)	// If virus or error, we stop here
-			{
-				$reterrors=$antivir->errors;
-				dol_syslog('Files.lib::dol_move_uploaded_file File "'.$src_file.'" (target name "'.$dest_file.'") KO with antivirus: result='.$result.' errors='.join(',',$antivir->errors), LOG_WARNING);
-				return 'ErrorFileIsInfectedWithAVirus: '.join(',',$reterrors);
-			}
-		}
-
-		// Security:
-		// Disallow file with some extensions. We renamed them.
-		// Car si on a mis le rep documents dans un rep de la racine web (pas bien), cela permet d'executer du code a la demande.
-		if (preg_match('/\.htm|\.html|\.php|\.pl|\.cgi$/i',$dest_file) && empty($conf->global->MAIN_DOCUMENT_IS_OUTSIDE_WEBROOT_SO_NOEXE_NOT_REQUIRED))
-		{
-			$file_name.= '.noexe';
-		}
-
-		// Security:
-		// We refuse cache files/dirs, upload using .. and pipes into filenames.
-		if (preg_match('/^\./',$src_file) || preg_match('/\.\./',$src_file) || preg_match('/[<>|]/',$src_file))
-		{
-			dol_syslog("Refused to deliver file ".$src_file, LOG_WARNING);
-			return -1;
-		}
-
-		// Security:
-		// On interdit fichiers caches, remontees de repertoire ainsi que les pipe dans les noms de fichiers.
-		if (preg_match('/^\./',$dest_file) || preg_match('/\.\./',$dest_file) || preg_match('/[<>|]/',$dest_file))
-		{
-			dol_syslog("Refused to deliver file ".$dest_file, LOG_WARNING);
-			return -2;
-		}
-
 		$reshook=$hookmanager->initHooks(array('fileslib'));
 
 		$parameters=array('dest_file' => $dest_file, 'src_file' => $src_file, 'file_name' => $file_name, 'varfiles' => $varfiles, 'allowoverwrite' => $allowoverwrite);
 		$reshook=$hookmanager->executeHooks('moveUploadedFile', $parameters, $object);
 	}
-
+    
+	if (empty($reshook))
+	{
+    	// If an upload error has been reported
+    	if ($uploaderrorcode)
+    	{
+    	    switch($uploaderrorcode)
+    	    {
+    	        case UPLOAD_ERR_INI_SIZE:	// 1
+    	            return 'ErrorFileSizeTooLarge';
+    	            break;
+    	        case UPLOAD_ERR_FORM_SIZE:	// 2
+    	            return 'ErrorFileSizeTooLarge';
+    	            break;
+    	        case UPLOAD_ERR_PARTIAL:	// 3
+    	            return 'ErrorPartialFile';
+    	            break;
+    	        case UPLOAD_ERR_NO_TMP_DIR:	//
+    	            return 'ErrorNoTmpDir';
+    	            break;
+    	        case UPLOAD_ERR_CANT_WRITE:
+    	            return 'ErrorFailedToWriteInDir';
+    	            break;
+    	        case UPLOAD_ERR_EXTENSION:
+    	            return 'ErrorUploadBlockedByAddon';
+    	            break;
+    	        default:
+    	            break;
+    	    }
+    	}
+    	
+    	// If we need to make a virus scan
+    	if (empty($disablevirusscan) && file_exists($src_file))
+    	{
+    	    $checkvirusarray=dolCheckVirus($src_file);
+    	    if (count($checkvirusarray))
+    	    {
+    	       dol_syslog('Files.lib::dol_move_uploaded_file File "'.$src_file.'" (target name "'.$dest_file.'") KO with antivirus: result='.$result.' errors='.join(',',$checkvirusarray), LOG_WARNING);
+    	       return 'ErrorFileIsInfectedWithAVirus: '.join(',',$checkvirusarray);
+    	    }
+    	}
+    	
+    	// Security:
+    	// Disallow file with some extensions. We renamed them.
+    	// Car si on a mis le rep documents dans un rep de la racine web (pas bien), cela permet d'executer du code a la demande.
+    	if (preg_match('/\.htm|\.html|\.php|\.pl|\.cgi$/i',$dest_file) && empty($conf->global->MAIN_DOCUMENT_IS_OUTSIDE_WEBROOT_SO_NOEXE_NOT_REQUIRED))
+    	{
+    	    $file_name.= '.noexe';
+    	}
+    	
+    	// Security:
+    	// We refuse cache files/dirs, upload using .. and pipes into filenames.
+    	if (preg_match('/^\./',$src_file) || preg_match('/\.\./',$src_file) || preg_match('/[<>|]/',$src_file))
+    	{
+    	    dol_syslog("Refused to deliver file ".$src_file, LOG_WARNING);
+    	    return -1;
+    	}
+    	
+    	// Security:
+    	// On interdit fichiers caches, remontees de repertoire ainsi que les pipe dans les noms de fichiers.
+    	if (preg_match('/^\./',$dest_file) || preg_match('/\.\./',$dest_file) || preg_match('/[<>|]/',$dest_file))
+    	{
+    	    dol_syslog("Refused to deliver file ".$dest_file, LOG_WARNING);
+    	    return -2;
+    	}
+	}
+	
 	if ($reshook < 0)	// At least one blocking error returned by one hook
 	{
 		$errmsg = join(',', $hookmanager->errors);
diff --git a/test/phpunit/RestAPIDocumentTest.php b/test/phpunit/RestAPIDocumentTest.php
index b180586aa91..b60a7e9e833 100644
--- a/test/phpunit/RestAPIDocumentTest.php
+++ b/test/phpunit/RestAPIDocumentTest.php
@@ -172,7 +172,7 @@ class RestAPIDocumentTest extends PHPUnit_Framework_TestCase
         dol_mkdir(DOL_DATA_ROOT.'/medias/tmpphpunit/tmpphpunit2');
         
         $data = array(
-            'filename'=>"mynewfilethatwillfails.txt",
+            'filename'=>"mynewfile.txt",
             'modulepart'=>"medias",
             'ref'=>"",
             'subdir'=>"tmpphpunit/tmpphpunit2",

From d834cbf7baeb2fef8698c84ff634726160d3e437 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Sun, 21 May 2017 15:24:16 +0200
Subject: [PATCH 431/505] Use getNomUrl for accounting account in product card

---
 htdocs/product/card.php | 36 ++++++++++++++++++++++--------------
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 71f7cd8e7f6..5885775a1f1 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -1,20 +1,20 @@
 <?php
-/* Copyright (C) 2001-2007	Rodolphe Quiedeville		<rodolphe@quiedeville.org>
+/* Copyright (C) 2001-2007	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
  * Copyright (C) 2004-2016	Laurent Destailleur		<eldy@users.sourceforge.net>
- * Copyright (C) 2005		Eric Seigne			<eric.seigne@ryxeo.com>
+ * Copyright (C) 2005		Eric Seigne				<eric.seigne@ryxeo.com>
  * Copyright (C) 2005-2015	Regis Houssin			<regis.houssin@capnetworks.com>
  * Copyright (C) 2006		Andre Cianfarani		<acianfa@free.fr>
  * Copyright (C) 2006		Auguria SARL			<info@auguria.org>
  * Copyright (C) 2010-2015	Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2013-2016	Marcos García			<marcosgdf@gmail.com>
  * Copyright (C) 2012-2013	Cédric Salvador			<csalvador@gpcsolutions.fr>
- * Copyright (C) 2011-2016	Alexandre Spangaro		<aspangaro.dolibarr@gmail.com>
+ * Copyright (C) 2011-2017	Alexandre Spangaro		<aspangaro.dolibarr@gmail.com>
  * Copyright (C) 2014		Cédric Gross			<c.gross@kreiz-it.fr>
  * Copyright (C) 2014-2015	Ferran Marcet			<fmarcet@2byte.es>
  * Copyright (C) 2015		Jean-François Ferry		<jfefe@aternatik.fr>
  * Copyright (C) 2015		Raphaël Doursenaud		<rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2016		Charlie Benke			<charlie@patas-monkey.com>
- * Copyright (C) 2016		Meziane Sof			<virtualsof@yahoo.fr>
+ * Copyright (C) 2016		Meziane Sof				<virtualsof@yahoo.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
@@ -51,8 +51,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/product/modules_product.php';
 if (! empty($conf->propal->enabled))     require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 if (! empty($conf->facture->enabled))    require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 if (! empty($conf->commande->enabled))   require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
-if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
 if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/accountancy/class/html.formventilation.class.php';
+if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
 
 $langs->load("products");
 $langs->load("other");
@@ -272,7 +272,7 @@ if (empty($reshook))
             $object->volume_units       	 = GETPOST('volume_units');
             $object->finished           	 = GETPOST('finished');
 	        $object->fk_unit                 = GETPOST('units');
-			
+
 			$accountancy_code_sell 			 = GETPOST('accountancy_code_sell');
 			$accountancy_code_buy 			 = GETPOST('accountancy_code_buy');
 
@@ -399,7 +399,7 @@ if (empty($reshook))
 
 				$accountancy_code_sell 			 = GETPOST('accountancy_code_sell');
 				$accountancy_code_buy 			 = GETPOST('accountancy_code_buy');
-				
+
 				if ($accountancy_code_sell <= 0) { $object->accountancy_code_sell = ''; } else { $object->accountancy_code_sell = $accountancy_code_sell; }
 				if ($accountancy_code_buy <= 0) { $object->accountancy_code_buy = ''; } else { $object->accountancy_code_buy = $accountancy_code_buy; }
 
@@ -1107,7 +1107,7 @@ else
 
         // Accountancy codes
         print '<table class="border" width="100%">';
-		
+
 		if (! empty($conf->accounting->enabled))
 		{
             // Accountancy_code_sell
@@ -1121,7 +1121,7 @@ else
             print '<td>';
 			print $formaccountancy->select_account(GETPOST('accountancy_code_buy'), 'accountancy_code_buy', 1, null, 1, 1, '');
             print '</td></tr>';
-		}			
+		}
 		else // For external software 
 		{
             // Accountancy_code_sell
@@ -1414,7 +1414,7 @@ else
                 print '<td>';
 				print $formaccountancy->select_account($object->accountancy_code_buy, 'accountancy_code_buy', 1, '', 1, 1);
                 print '</td></tr>';
-			}			
+			}
 			else // For external software 
 			{
                 // Accountancy_code_sell
@@ -1530,8 +1530,12 @@ else
 			print '<tr><td class="nowrap">';
             print $langs->trans("ProductAccountancySellCode");
             print '</td><td colspan="2">';
-			if (! empty($conf->accounting->enabled)) {
-				print length_accountg($object->accountancy_code_sell);
+			if (! empty($conf->accounting->enabled))
+			{
+				$accountingaccount = new AccountingAccount($db);
+				$accountingaccount->fetch('',$object->accountancy_code_sell);
+
+				print $accountingaccount->getNomUrl(0,1,1,'',1);
             } else {
 				print $object->accountancy_code_sell;
 			}
@@ -1541,8 +1545,12 @@ else
 			print '<tr><td class="nowrap">';
             print $langs->trans("ProductAccountancyBuyCode");
             print '</td><td colspan="2">';
-			if (! empty($conf->accounting->enabled)) {
-				print length_accountg($object->accountancy_code_buy);
+			if (! empty($conf->accounting->enabled))
+			{
+				$accountingaccount2 = new AccountingAccount($db);
+				$accountingaccount2->fetch('',$object->accountancy_code_buy);
+
+				print $accountingaccount2->getNomUrl(0,1,1,'',1);
             } else {
 				print $object->accountancy_code_buy;
 			}

From 6aa6ef1f9f1a13db8853935b6030db5ff13584ac Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 21 May 2017 18:30:43 +0200
Subject: [PATCH 432/505] Fix travis error

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

diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 008f4c15e3c..0920158b720 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -657,6 +657,7 @@ function dolCopyDir($srcfile, $destfile, $newmask, $overwriteifexists)
  * @param   string	$destfile           Destination file (can't be a directory. use native php @rename() to move a directory)
  * @param   integer	$newmask            Mask in octal string for new file (0 by default means $conf->global->MAIN_UMASK)
  * @param   int		$overwriteifexists  Overwrite file if exists (1 by default)
+ * @param   int     $testvirus          Do an antivirus test. Move is canceled if a virus is found.
  * @return  boolean 		            True if OK, false if KO
  * @see dol_move_uploaded_file
  */
@@ -1698,7 +1699,7 @@ function dol_most_recent_file($dir,$regexfilter='',$excludefilter=array('(\.meta
  * @param	string	$entity				Restrict onto entity (0=no restriction)
  * @param  	User	$fuser				User object (forced)
  * @param	string	$refname			Ref of object to check permission for external users (autodetect if not provided)
- * @param   string  $more               Check permission for 'read' or 'write'               
+ * @param   string  $mode               Check permission for 'read' or 'write'               
  * @return	mixed						Array with access information : 'accessallowed' & 'sqlprotectagainstexternals' & 'original_file' (as a full path name)
  * @see restrictedArea
  */

From 5cb38ece19b6922a2646ca45a01fbde90b874ae4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 21 May 2017 19:37:15 +0200
Subject: [PATCH 433/505] Fix travis errors

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 14f61d99590..8462cdc76ff 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -281,7 +281,7 @@ function GETPOST($paramname, $check='', $method=0, $filter=NULL, $options=NULL)
     	$relativepathstring = preg_replace('/^\//', '', $relativepathstring);
 	
     	// Retrieve values if restore_lastsearch_values is set and there is saved values
-    	if ($_GET['restore_lastsearch_values'] && ! empty($_SESSION['lastsearch_values_'.$relativepathstring]))        // Keep $_GET here
+    	if (! empty($_GET['restore_lastsearch_values']) && ! empty($_SESSION['lastsearch_values_'.$relativepathstring]))        // Keep $_GET here
     	{
 	        $tmp=json_decode($_SESSION['lastsearch_values_'.$relativepathstring], true);
 	        if (is_array($tmp))
diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index cdb4ea33f73..71de341a769 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -848,8 +848,8 @@ class DolibarrModules           // Can not be abstract, because we need to insta
         $resql=$this->db->query($sql);
         if (! $resql) $err++;
 
-        $note=json_encode(array('authorid'=>$user->id, 'ip'=>(empty($_SERVER['REMOTE_ADDR'])?'':$_SERVER['REMOTE_ADDR'])));
-        
+        $note=json_encode(array('authorid'=>(is_object($user)?$user->id:0), 'ip'=>(empty($_SERVER['REMOTE_ADDR'])?'':$_SERVER['REMOTE_ADDR'])));
+
         $sql = "INSERT INTO ".MAIN_DB_PREFIX."const (name, value, visible, entity, note) VALUES";
         $sql.= " (".$this->db->encrypt($this->const_name,1);
         $sql.= ", ".$this->db->encrypt('1',1);

From 965e23b71190a8d77e2042e4f568d5233d9b664a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 21 May 2017 19:45:47 +0200
Subject: [PATCH 434/505] Test to fix a regression

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

diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php
index c8d617ec99d..8934447fdfe 100644
--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@@ -781,7 +781,7 @@ function get_next_value($db,$mask,$table,$field,$where='',$objsoc='',$date='',$m
     }
 
     // Personalized field {XXX-1} à {XXX-9}
-    $maskperso=array();
+    /*$maskperso=array();
     $maskpersonew=array();
     $tmpmask=$mask;
     while (preg_match('/\{([A-Z]+)\-([1-9])\}/i',$tmpmask,$regKey))
@@ -789,17 +789,17 @@ function get_next_value($db,$mask,$table,$field,$where='',$objsoc='',$date='',$m
         $maskperso[$regKey[1]]='\{'.$regKey[1]+'\-'.$regKey[2].'\}';
         $maskpersonew[$regKey[1]]=str_pad('', '_', $regKey[2], STR_PAD_RIGHT);
         $tmpmask=preg_replace('/\{'.$regKey[1].'\-'.$regKey[2].'\}/i', $maskpersonew, $tmpmask);
-    }
+    }*/
     
     $maskwithonlyymcode=$mask;
     $maskwithonlyymcode=preg_replace('/\{(0+)([@\+][0-9\-\+\=]+)?([@\+][0-9\-\+\=]+)?\}/i',$maskcounter,$maskwithonlyymcode);
     $maskwithonlyymcode=preg_replace('/\{dd\}/i','dd',$maskwithonlyymcode);
     $maskwithonlyymcode=preg_replace('/\{(c+)(0*)\}/i',$maskrefclient,$maskwithonlyymcode);
     $maskwithonlyymcode=preg_replace('/\{(t+)\}/i',$masktype_value,$maskwithonlyymcode);
-    foreach($maskperso as $key => $val)
+    /*foreach($maskperso as $key => $val)
     {
         $maskwithonlyymcode=preg_replace('/'.$val.'/i', $maskpersonew[$key], $maskwithonlyymcode);
-    }
+    }*/
     $maskwithnocode=$maskwithonlyymcode;
     $maskwithnocode=preg_replace('/\{yyyy\}/i','yyyy',$maskwithnocode);
     $maskwithnocode=preg_replace('/\{yy\}/i','yy',$maskwithnocode);

From 6e31de731b8cd376a0b185b30cf8a78e7d7e8b57 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 21 May 2017 20:24:56 +0200
Subject: [PATCH 435/505] Fix phpunit

---
 htdocs/societe/class/societe.class.php | 2 +-
 test/phpunit/SocieteTest.php           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 6aebf0e8786..995c16719cb 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -841,7 +841,7 @@ class Societe extends CommonObject
             $sql .= ",fk_effectif = ".(! empty($this->effectif_id)?"'".$this->db->escape($this->effectif_id)."'":"null");
             if (isset($this->stcomm_id))
             {
-                $sql .= ",fk_stcomm=".($this->stcomm_id > 0 ? $this->stcomm_id : "null");
+                $sql .= ",fk_stcomm=".($this->stcomm_id > 0 ? $this->stcomm_id : "0");
             }
             $sql .= ",fk_typent = ".(! empty($this->typent_id)?"'".$this->db->escape($this->typent_id)."'":"0");
 
diff --git a/test/phpunit/SocieteTest.php b/test/phpunit/SocieteTest.php
index 24b868b743e..31aa98fd082 100755
--- a/test/phpunit/SocieteTest.php
+++ b/test/phpunit/SocieteTest.php
@@ -79,7 +79,7 @@ class SocieteTest extends PHPUnit_Framework_TestCase
 
         if ($conf->global->SOCIETE_CODECLIENT_ADDON != 'mod_codeclient_monkey') { print "\n".__METHOD__." third party ref checker must be setup to 'mod_codeclient_monkey' not to '".$conf->global->SOCIETE_CODECLIENT_ADDON."'.\n"; die(); }
 
-        if (! empty($conf->global->MAIN_DISABLEPROFIDRULES)) { print "\n".__METHOD__." constant MAIN_DISABLEPROFIDRULE must be empty (if a module set it, disable module).\n"; die(); }
+        if (! empty($conf->global->MAIN_DISABLEPROFIDRULES)) { print "\n".__METHOD__." constant MAIN_DISABLEPROFIDRULES must be empty (if a module set it, disable module).\n"; die(); }
 
         $db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
 

From ff35229be58e84c049540c47f0a2c12fb0b874b7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 21 May 2017 20:46:11 +0200
Subject: [PATCH 436/505] Fix phpunit

---
 test/phpunit/UserTest.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/test/phpunit/UserTest.php b/test/phpunit/UserTest.php
index 4e0c0ba58ca..e0802ff17a2 100644
--- a/test/phpunit/UserTest.php
+++ b/test/phpunit/UserTest.php
@@ -75,6 +75,9 @@ class UserTest extends PHPUnit_Framework_TestCase
     public static function setUpBeforeClass()
     {
         global $conf,$user,$langs,$db;
+
+        if (! empty($conf->global->MAIN_LDAP_ENABLED)) { print "\n".__METHOD__." module LDAP must be disabled.\n"; die(); }
+        
         $db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
 
         print __METHOD__."\n";
@@ -187,7 +190,7 @@ class UserTest extends PHPUnit_Framework_TestCase
         $newlocalobject=new User($this->savdb);
         $newlocalobject->initAsSpecimen();
         $this->changeProperties($newlocalobject);
-        $this->assertEquals($this->objCompare($localobject,$newlocalobject,true,array('id','socid','societe_id','ref','pass_indatabase','pass_indatabase_crypted','datec','datem','datelastlogin','datepreviouslogin')), array());    // Actual, Expected
+        $this->assertEquals($this->objCompare($localobject,$newlocalobject,true,array('id','socid','societe_id','ref','pass','pass_indatabase','pass_indatabase_crypted','datec','datem','datelastlogin','datepreviouslogin')), array());    // Actual, Expected
 
         return $localobject;
     }

From 3e381aa5a29345136f1468e731948187d5b7fcfb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 21 May 2017 21:04:20 +0200
Subject: [PATCH 437/505] Fix phpunit

---
 test/phpunit/AdherentTest.php | 6 ++++--
 test/phpunit/UserTest.php     | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/test/phpunit/AdherentTest.php b/test/phpunit/AdherentTest.php
index 42b4ff7cf7f..b998c346b7b 100644
--- a/test/phpunit/AdherentTest.php
+++ b/test/phpunit/AdherentTest.php
@@ -83,7 +83,9 @@ class AdherentTest extends PHPUnit_Framework_TestCase
             print "\n".__METHOD__." Company must be setup to have name-firstname in order 'Firstname Lastname'\n";
             die();
         }
-
+        if (! empty($conf->global->MAIN_MODULE_LDAP)) { print "\n".__METHOD__." module LDAP must be disabled.\n"; die(); }
+        if (! empty($conf->global->MAIN_MODULE_MAILMANSPIP)) { print "\n".__METHOD__." module MailmanSpip must be disabled.\n"; die(); }
+        
         print __METHOD__."\n";
     }
 
@@ -322,7 +324,7 @@ class AdherentTest extends PHPUnit_Framework_TestCase
 
         $expected = DOL_MAIN_URL_ROOT.','.$localobject->id.',,New firstname,New name,New firstname New name,'.
                     'New company,New address,New zip,New town,Belgium,newemail@newemail.com,'.dol_print_date($localobject->birth,'day').',,'.
-                    'newlogin,dolibspec,New firstname,New name,New company,New address,New zip,New town,Belgium';
+                    'newlogin,,New firstname,New name,New company,New address,New zip,New town,Belgium';
 
         $result = $localobject->makeSubstitution($template);
         print __METHOD__." result=".$result."\n";
diff --git a/test/phpunit/UserTest.php b/test/phpunit/UserTest.php
index e0802ff17a2..b932d2e2221 100644
--- a/test/phpunit/UserTest.php
+++ b/test/phpunit/UserTest.php
@@ -76,7 +76,7 @@ class UserTest extends PHPUnit_Framework_TestCase
     {
         global $conf,$user,$langs,$db;
 
-        if (! empty($conf->global->MAIN_LDAP_ENABLED)) { print "\n".__METHOD__." module LDAP must be disabled.\n"; die(); }
+        if (! empty($conf->global->MAIN_MODULE_LDAP)) { print "\n".__METHOD__." module LDAP must be disabled.\n"; die(); }
         
         $db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
 

From 4a085a8cc0ebf22036b97b9f1b5c1532fd77cbec Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 21 May 2017 21:21:44 +0200
Subject: [PATCH 438/505] Fix phpunit

---
 htdocs/compta/bank/class/account.class.php | 5 ++---
 test/phpunit/WebservicesInvoicesTest.php   | 2 ++
 test/phpunit/WebservicesOrdersTest.php     | 2 ++
 test/phpunit/WebservicesOtherTest.php      | 2 ++
 test/phpunit/WebservicesProductsTest.php   | 2 ++
 test/phpunit/WebservicesThirdpartyTest.php | 2 ++
 test/phpunit/WebservicesUserTest.php       | 2 ++
 7 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index 2a615ad4b69..b77ed4db1a5 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -569,7 +569,7 @@ class Account extends CommonObject
         $sql.= ", '".$this->db->escape($this->label)."'";
         $sql.= ", ".$conf->entity;
         $sql.= ", '".$this->db->escape($this->account_number)."'";
-		$sql.= ", '".$this->db->escape($this->fk_accountancy_journal)."'";
+		$sql.= ", ".($this->fk_accountancy_journal > 0 ? $this->db->escape($this->fk_accountancy_journal) : "null");
 		$sql.= ", '".$this->db->escape($this->bank)."'";
         $sql.= ", '".$this->code_banque."'";
         $sql.= ", '".$this->code_guichet."'";
@@ -702,8 +702,7 @@ class Account extends CommonObject
         $sql.= ",rappro = ".$this->rappro;
         $sql.= ",url = ".($this->url?"'".$this->url."'":"null");
         $sql.= ",account_number = '".$this->db->escape($this->account_number)."'";
-		$sql.= ",fk_accountancy_journal = '".$this->db->escape($this->fk_accountancy_journal)."'";
-
+		$sql.= ",fk_accountancy_journal = ".($this->fk_accountancy_journal > 0 ? $this->db->escape($this->fk_accountancy_journal) : "null");
 		$sql.= ",bank  = '".$this->db->escape($this->bank)."'";
         $sql.= ",code_banque='".$this->db->escape($this->code_banque)."'";
         $sql.= ",code_guichet='".$this->db->escape($this->code_guichet)."'";
diff --git a/test/phpunit/WebservicesInvoicesTest.php b/test/phpunit/WebservicesInvoicesTest.php
index 470bcbf4900..07bd95e01f2 100644
--- a/test/phpunit/WebservicesInvoicesTest.php
+++ b/test/phpunit/WebservicesInvoicesTest.php
@@ -39,6 +39,8 @@ if (empty($user->id))
 }
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;
 
+$conf->global->MAIN_UMASK='0666';
+
 
 /**
  * Class for PHPUnit tests
diff --git a/test/phpunit/WebservicesOrdersTest.php b/test/phpunit/WebservicesOrdersTest.php
index 06ead4f4873..e81ee2d3604 100644
--- a/test/phpunit/WebservicesOrdersTest.php
+++ b/test/phpunit/WebservicesOrdersTest.php
@@ -38,6 +38,8 @@ if (empty($user->id)) {
 }
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;
 
+$conf->global->MAIN_UMASK='0666';
+
 
 /**
  * Class for PHPUnit tests
diff --git a/test/phpunit/WebservicesOtherTest.php b/test/phpunit/WebservicesOtherTest.php
index d04fc6b9b9c..e3725c8609c 100644
--- a/test/phpunit/WebservicesOtherTest.php
+++ b/test/phpunit/WebservicesOtherTest.php
@@ -38,6 +38,8 @@ if (empty($user->id)) {
 }
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;
 
+$conf->global->MAIN_UMASK='0666';
+
 
 /**
  * Class for PHPUnit tests
diff --git a/test/phpunit/WebservicesProductsTest.php b/test/phpunit/WebservicesProductsTest.php
index fecc58a65e1..796ee700221 100644
--- a/test/phpunit/WebservicesProductsTest.php
+++ b/test/phpunit/WebservicesProductsTest.php
@@ -40,6 +40,8 @@ if (empty($user->id)) {
 }
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;
 
+$conf->global->MAIN_UMASK='0666';
+
 if (empty($conf->service->enabled))
 {
 	print "Error: Module service must be enabled.\n";
diff --git a/test/phpunit/WebservicesThirdpartyTest.php b/test/phpunit/WebservicesThirdpartyTest.php
index 2888c432e73..59907b36194 100644
--- a/test/phpunit/WebservicesThirdpartyTest.php
+++ b/test/phpunit/WebservicesThirdpartyTest.php
@@ -38,6 +38,8 @@ if (empty($user->id)) {
 }
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;
 
+$conf->global->MAIN_UMASK='0666';
+
 
 /**
  * Class for PHPUnit tests
diff --git a/test/phpunit/WebservicesUserTest.php b/test/phpunit/WebservicesUserTest.php
index 78d3d311fe0..5098da22e6e 100644
--- a/test/phpunit/WebservicesUserTest.php
+++ b/test/phpunit/WebservicesUserTest.php
@@ -38,6 +38,8 @@ if (empty($user->id)) {
 }
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;
 
+$conf->global->MAIN_UMASK='0666';
+
 
 /**
  * Class for PHPUnit tests

From e85f31f456068c1ed8998a4ab3dca38811dcf546 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 21 May 2017 21:33:24 +0200
Subject: [PATCH 439/505] Fix phpunit

---
 test/phpunit/WebservicesProductsTest.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/test/phpunit/WebservicesProductsTest.php b/test/phpunit/WebservicesProductsTest.php
index 796ee700221..e3500a68f5b 100644
--- a/test/phpunit/WebservicesProductsTest.php
+++ b/test/phpunit/WebservicesProductsTest.php
@@ -169,7 +169,9 @@ class WebservicesProductsTest extends PHPUnit_Framework_TestCase
                 'ref'=>'NewProductFromWS'.$datestring,
                 'label'=>'New Product From WS '.$datestring,
                 'type'=>1,
-                'description'=>'This is a new product created from WS PHPUnit test case'
+                'description'=>'This is a new product created from WS PHPUnit test case',
+                'barcode'=>'123456789012',
+                'barcode_type'=>2
             )
         );
         print __METHOD__." call method ".$WS_METHOD."\n";

From 6052d2d8ed3dbfa965469838a2aa2c8b4d660f96 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 21 May 2017 21:37:33 +0200
Subject: [PATCH 440/505] Try to output log after error

---
 test/phpunit/NumberingModulesTest.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/test/phpunit/NumberingModulesTest.php b/test/phpunit/NumberingModulesTest.php
index b29cd03b2c9..e0d175b75d5 100644
--- a/test/phpunit/NumberingModulesTest.php
+++ b/test/phpunit/NumberingModulesTest.php
@@ -158,6 +158,10 @@ class NumberingModulesTest extends PHPUnit_Framework_TestCase
 		$numbering=new mod_facture_mercure();
 		$result=$numbering->getNextValue($mysoc, $localobject2, 'last');
 		print __METHOD__." result=".$result."\n";
+
+		$out=file_get_contents(DOL_DATA_ROOT.'/dolibarr.log');
+		print $out;
+		
 		$this->assertEquals('1915-0001', $result, "Test to get last value with param 'last'");
 		$result=$numbering->getNextValue($mysoc, $localobject2);
 		$result2=$localobject2->create($user,1);

From 246fa9748b708ed2cbc9f86eda4aa713e7b307de Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 21 May 2017 23:06:45 +0200
Subject: [PATCH 441/505] Debug travis error

---
 test/phpunit/ModulesTest.php          |  5 +++++
 test/phpunit/NumberingModulesTest.php | 23 ++++++++++++++---------
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/test/phpunit/ModulesTest.php b/test/phpunit/ModulesTest.php
index e769ce9dd51..a4ff51333e0 100755
--- a/test/phpunit/ModulesTest.php
+++ b/test/phpunit/ModulesTest.php
@@ -143,6 +143,11 @@ class ModulesTest extends PHPUnit_Framework_TestCase
             $result=$mod->init();
         	$this->assertLessThan($result, 0, $modlabel);
         	print __METHOD__." test remove/init for module ".$modlabel.", result=".$result."\n";
+        	
+        	if (in_array($modlabel, array('Ldap', 'MailmanSpip')))
+        	{
+        	    $result=$mod->remove();
+        	}
 		}
 
         return 0;
diff --git a/test/phpunit/NumberingModulesTest.php b/test/phpunit/NumberingModulesTest.php
index e0d175b75d5..d7f3eaf611c 100644
--- a/test/phpunit/NumberingModulesTest.php
+++ b/test/phpunit/NumberingModulesTest.php
@@ -144,30 +144,35 @@ class NumberingModulesTest extends PHPUnit_Framework_TestCase
 		$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1915);	// we use year 1915 to be sure to not have existing invoice for this year
 		$numbering=new mod_facture_mercure();
 		$result=$numbering->getNextValue($mysoc, $localobject);
-		$result2=$localobject->create($user,1);
-		$result3=$localobject->validate($user, $result);		// create invoice by forcing ref
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('1915-0001', $result, 'Test for {yyyy}-{0000}, 1st invoice');				// counter must start to 1
+		$result2=$localobject->create($user,1);
+		print __METHOD__." result2=".$result."\n";
+		$result3=$localobject->validate($user, $result);		// create invoice by forcing ref
+		print __METHOD__." result3=".$result."\n";
+		$this->assertEquals(1, $result3, 'Test validation of invoice with forced ref is ok');	// counter must start to 1
 		$result=$localobject->is_erasable();
 		print __METHOD__." is_erasable=".$result."\n";
-		$this->assertEquals(1, $result, 'Test for is_erasable, 1st invoice');						   // Can be deleted
+		$this->assertEquals(1, $result, 'Test for is_erasable, 1st invoice');						    // Can be deleted
 
+		$out=file_get_contents(DOL_DATA_ROOT.'/dolibarr.log');
+		print $out;
+		
 		$localobject2=new Facture($this->savdb);
 		$localobject2->initAsSpecimen();
 		$localobject2->date=dol_mktime(12, 0, 0, 1, 1, 1916);	// we use following year for second invoice (there is no reset into mask)
 		$numbering=new mod_facture_mercure();
 		$result=$numbering->getNextValue($mysoc, $localobject2, 'last');
 		print __METHOD__." result=".$result."\n";
-
-		$out=file_get_contents(DOL_DATA_ROOT.'/dolibarr.log');
-		print $out;
-		
 		$this->assertEquals('1915-0001', $result, "Test to get last value with param 'last'");
 		$result=$numbering->getNextValue($mysoc, $localobject2);
-		$result2=$localobject2->create($user,1);
-		$result3=$localobject2->validate($user, $result);		// create invoice by forcing ref
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('1916-0002', $result);				// counter must be now 2 (not reseted)
+		$result2=$localobject2->create($user,1);
+		print __METHOD__." result2=".$result."\n";
+		$result3=$localobject2->validate($user, $result);		// create invoice by forcing ref
+		print __METHOD__." result3=".$result."\n";
+		$this->assertEquals(1, $result3, 'Test validation of invoice with forced ref is ok');	// counter must start to 1
 		$result=$localobject2->is_erasable();
 		print __METHOD__." is_erasable=".$result."\n";
 		$this->assertEquals(1, $result);						// Can be deleted

From 090a7028d77d9c702d21dbe3169b6d690bf1a9ff Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 21 May 2017 23:41:04 +0200
Subject: [PATCH 442/505] Fix constant usage

---
 htdocs/core/lib/files.lib.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 0920158b720..9d04cb82a1e 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -1572,6 +1572,8 @@ function dol_convert_file($fileinput,$ext='png',$fileoutput='')
  */
 function dol_compress_file($inputfile, $outputfile, $mode="gz")
 {
+    global $conf;
+    
     $foundhandler=0;
 
     try
@@ -1627,10 +1629,10 @@ function dol_uncompress($inputfile,$outputdir)
 {
     global $conf, $langs;
 
-    if (! empty($conf->global->ODTPHP_PATHTOPCLZIP))
+    if (defined('ODTPHP_PATHTOPCLZIP'))
     {
-    	dol_syslog("Constant ODTPHP_PATHTOPCLZIP for pclzip library is set to ".$conf->global->ODTPHP_PATHTOPCLZIP.", so we use Pclzip to unzip into ".$outputdir);
-        include_once $conf->global->ODTPHP_PATHTOPCLZIP.'/pclzip.lib.php';
+    	dol_syslog("Constant ODTPHP_PATHTOPCLZIP for pclzip library is set to ".ODTPHP_PATHTOPCLZIP.", so we use Pclzip to unzip into ".$outputdir);
+        include_once ODTPHP_PATHTOPCLZIP.'/pclzip.lib.php';
         $archive = new PclZip($inputfile);
         $result=$archive->extract(PCLZIP_OPT_PATH, $outputdir);
         //var_dump($result);

From ef9cf6ef5235ef37ecfbb03dea295809bcc7d17c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 21 May 2017 23:54:37 +0200
Subject: [PATCH 443/505] Add test on phpunit

---
 test/phpunit/FunctionsLibTest.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/phpunit/FunctionsLibTest.php b/test/phpunit/FunctionsLibTest.php
index 28e55fd793b..8c57e8a178a 100644
--- a/test/phpunit/FunctionsLibTest.php
+++ b/test/phpunit/FunctionsLibTest.php
@@ -81,6 +81,8 @@ class FunctionsLibTest extends PHPUnit_Framework_TestCase
         global $conf,$user,$langs,$db;
         //$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
 
+        if (! function_exists('mb_substr')) { print "\n".__METHOD__." function mb_substr must be enabled.\n"; die(); }
+        
         print __METHOD__."\n";
     }
 

From ecce1c20374ed1ab51cea9211b8a07751351b7f7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 21 May 2017 23:58:19 +0200
Subject: [PATCH 444/505] Remove conf

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

diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 9d04cb82a1e..c60464ed0fd 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -1572,8 +1572,6 @@ function dol_convert_file($fileinput,$ext='png',$fileoutput='')
  */
 function dol_compress_file($inputfile, $outputfile, $mode="gz")
 {
-    global $conf;
-    
     $foundhandler=0;
 
     try
@@ -1627,7 +1625,7 @@ function dol_compress_file($inputfile, $outputfile, $mode="gz")
  */
 function dol_uncompress($inputfile,$outputdir)
 {
-    global $conf, $langs;
+    global $langs;
 
     if (defined('ODTPHP_PATHTOPCLZIP'))
     {

From a3eef35ce647dbc17d1e5f5e1b3ea36815a95f40 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 22 May 2017 01:19:16 +0200
Subject: [PATCH 445/505] Fix travis error

---
 htdocs/adherents/card.php.bak         | 1787 -------------------------
 htdocs/core/lib/functions.lib.php     |   13 +-
 test/phpunit/AllTests.php             |    2 +-
 test/phpunit/FilesLibTest.php         |   14 +-
 test/phpunit/NumberingModulesTest.php |   10 +-
 5 files changed, 24 insertions(+), 1802 deletions(-)
 delete mode 100644 htdocs/adherents/card.php.bak

diff --git a/htdocs/adherents/card.php.bak b/htdocs/adherents/card.php.bak
deleted file mode 100644
index 48461c64b02..00000000000
--- a/htdocs/adherents/card.php.bak
+++ /dev/null
@@ -1,1787 +0,0 @@
-<?php
-/* Copyright (C) 2001-2004 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) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C) 2012      Marcos García        <marcosgdf@gmail.com>
- * Copyright (C) 2012-2016 Philippe Grand       <philippe.grand@atoo-net.com>
- * Copyright (C) 2015-2016 Alexandre Spangaro   <aspangaro.dolibarr@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
- * 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/adherents/card.php
- *       \ingroup    member
- *       \brief      Page of member
- */
-
-require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
-require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
-require_once DOL_DOCUMENT_ROOT.'/adherents/class/subscription.class.php';
-require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
-
-$langs->load("companies");
-$langs->load("bills");
-$langs->load("members");
-$langs->load("users");
-$langs->load('other');
-
-$action=GETPOST('action','alpha');
-$cancel=GETPOST('cancel','alpha');
-$backtopage=GETPOST('backtopage','alpha');
-$confirm=GETPOST('confirm','alpha');
-$rowid=GETPOST('rowid','int');
-$id=GETPOST('id')?GETPOST('id','int'):$rowid;
-$typeid=GETPOST('typeid','int');
-$userid=GETPOST('userid','int');
-$socid=GETPOST('socid','int');
-
-if (! empty($conf->mailmanspip->enabled))
-{
-	include_once DOL_DOCUMENT_ROOT.'/mailmanspip/class/mailmanspip.class.php';
-
-	$langs->load('mailmanspip');
-
-	$mailmanspip = new MailmanSpip($db);
-}
-
-$object = new Adherent($db);
-$extrafields = new ExtraFields($db);
-
-// fetch optionals attributes and labels
-$extralabels=$extrafields->fetch_name_optionals_label($object->table_element);
-
-// Get object canvas (By default, this is not defined, so standard usage of dolibarr)
-$object->getCanvas($id);
-$canvas = $object->canvas?$object->canvas:GETPOST("canvas");
-$objcanvas=null;
-if (! empty($canvas))
-{
-	require_once DOL_DOCUMENT_ROOT.'/core/class/canvas.class.php';
-	$objcanvas = new Canvas($db, $action);
-	$objcanvas->getCanvas('adherent', 'membercard', $canvas);
-}
-
-// Security check
-$result=restrictedArea($user, 'adherent', $id, '', '', 'fk_soc', 'rowid', $objcanvas);
-
-if ($id > 0)
-{
-	// Load member
-	$result = $object->fetch($id);
-
-	// Define variables to know what current user can do on users
-	$canadduser=($user->admin || $user->rights->user->user->creer);
-	// Define variables to know what current user can do on properties of user linked to edited member
-	if ($object->user_id)
-	{
-		// $ User is the user who edits, $ object->user_id is the id of the related user in the edited member  
-		$caneditfielduser=((($user->id == $object->user_id) && $user->rights->user->self->creer)
-				|| (($user->id != $object->user_id) && $user->rights->user->user->creer));
-		$caneditpassworduser=((($user->id == $object->user_id) && $user->rights->user->self->password)
-				|| (($user->id != $object->user_id) && $user->rights->user->user->password));
-	}
-}
-
-// Define variables to determine what the current user can do on the members
-$canaddmember=$user->rights->adherent->creer;
-// Define variables to determine what the current user can do on the properties of a member
-if ($id)
-{
-	$caneditfieldmember=$user->rights->adherent->creer;
-}
-
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-$hookmanager->initHooks(array('membercard','globalcard'));
-
-
-
-/*
- * 	Actions
- */
-
-if ($cancel) $action='';
-
-$parameters=array('id'=>$id, 'rowid'=>$id, 'objcanvas'=>$objcanvas);
-$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-
-if (empty($reshook))
-{
-	if ($action == 'setuserid' && ($user->rights->user->self->creer || $user->rights->user->user->creer))
-	{
-		$error=0;
-		if (empty($user->rights->user->user->creer))	// If can edit only itself user, we can link to itself only
-		{
-			if ($userid != $user->id && $userid != $object->user_id)
-			{
-				$error++;
-				setEventMessages($langs->trans("ErrorUserPermissionAllowsToLinksToItselfOnly"), null, 'errors');
-			}
-		}
-
-		if (! $error)
-		{
-			if ($userid != $object->user_id)	// If link differs from currently in database
-			{
-				$result=$object->setUserId($userid);
-				if ($result < 0) dol_print_error($object->db,$object->error);
-				$action='';
-			}
-		}
-	}
-
-	if ($action == 'setsocid')
-	{
-		$error=0;
-		if (! $error)
-		{
-			if ($socid != $object->fk_soc)	// If link differs from currently in database
-			{
-				$sql ="SELECT rowid FROM ".MAIN_DB_PREFIX."adherent";
-				$sql.=" WHERE fk_soc = '".$socid."'";
-				$sql.=" AND entity = ".$conf->entity;
-				$resql = $db->query($sql);
-				if ($resql)
-				{
-					$obj = $db->fetch_object($resql);
-					if ($obj && $obj->rowid > 0)
-					{
-						$othermember=new Adherent($db);
-						$othermember->fetch($obj->rowid);
-						$thirdparty=new Societe($db);
-						$thirdparty->fetch($socid);
-						$error++;
-						setEventMessages($langs->trans("ErrorMemberIsAlreadyLinkedToThisThirdParty",$othermember->getFullName($langs),$othermember->login,$thirdparty->name), null, 'errors');
-					}
-				}
-
-				if (! $error)
-				{
-					$result=$object->setThirdPartyId($socid);
-					if ($result < 0) dol_print_error($object->db,$object->error);
-					$action='';
-				}
-			}
-		}
-	}
-
-	// Create user from a member
-	if ($action == 'confirm_create_user' && $confirm == 'yes' && $user->rights->user->user->creer)
-	{
-		if ($result > 0)
-		{
-			// Creation user
-			$nuser = new User($db);
-			$result=$nuser->create_from_member($object,GETPOST('login'));
-
-			if ($result < 0)
-			{
-				$langs->load("errors");
-				setEventMessages($langs->trans($nuser->error), null, 'errors');
-			}
-		}
-		else
-		{
-			setEventMessages($object->errors, $object->error, 'errors');
-		}
-	}
-
-	// Create third party from a member
-	if ($action == 'confirm_create_thirdparty' && $confirm == 'yes' && $user->rights->societe->creer)
-	{
-		if ($result > 0)
-		{
-			// User creation 
-			$company = new Societe($db);
-			$result=$company->create_from_member($object,GETPOST('companyname'));
-
-			if ($result < 0)
-			{
-				$langs->load("errors");
-				setEventMessages($langs->trans($company->error), null, 'errors');
-				setEventMessages($company->error, $company->errors, 'errors');
-			}
-		}
-		else
-		{
-			setEventMessages($object->error, $object->errors, 'errors');
-		}
-	}
-
-	if ($action == 'confirm_sendinfo' && $confirm == 'yes')
-	{
-		if ($object->email)
-		{
-			$from=$conf->email_from;
-			if (! empty($conf->global->ADHERENT_MAIL_FROM)) $from=$conf->global->ADHERENT_MAIL_FROM;
-
-			$result=$object->send_an_email($langs->transnoentitiesnoconv("ThisIsContentOfYourCard")."\n\n%INFOS%\n\n",$langs->transnoentitiesnoconv("CardContent"));
-
-			$langs->load("mails");
-			setEventMessages($langs->trans("MailSuccessfulySent", $from, $object->email), null, 'mesgs');
-		}
-	}
-
-	if ($action == 'update' && ! $cancel && $user->rights->adherent->creer)
-	{
-		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-
-		$birthdate='';
-		if (isset($_POST["birthday"]) && $_POST["birthday"]
-				&& isset($_POST["birthmonth"]) && $_POST["birthmonth"]
-				&& isset($_POST["birthyear"]) && $_POST["birthyear"])
-		{
-			$birthdate=dol_mktime(12, 0, 0, $_POST["birthmonth"], $_POST["birthday"], $_POST["birthyear"]);
-		}
-		$lastname=$_POST["lastname"];
-		$firstname=$_POST["firstname"];
-		$societe=$_POST["societe"];
-		$morphy=$_POST["morphy"];
-		$login=$_POST["login"];
-		if ($morphy != 'mor' && empty($lastname)) {
-			$error++;
-			$langs->load("errors");
-			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Lastname")), null, 'errors');
-		}
-		if ($morphy != 'mor' && (!isset($firstname) || $firstname=='')) {
-			$error++;
-			$langs->load("errors");
-			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Firstname")), null, 'errors');
-		}
-		if ($morphy == 'mor' && empty($societe)) {
-			$error++;
-			$langs->load("errors");
-			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Company")), null, 'errors');
-		}
-		// Test si le login existe deja
-		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
-		{
-			if (empty($login)) {
-				$error++;
-				setEventMessages($langs->trans("ErrorFieldRequired", $langs->trans("Login")), null, 'errors');
-			}
-		}
-		// Create new object
-		if ($result > 0 && ! $error)
-		{
-			$object->oldcopy = clone $object;
-
-			// Change values
-			$object->civility_id = trim($_POST["civility_id"]);
-			$object->firstname   = trim($_POST["firstname"]);
-			$object->lastname    = trim($_POST["lastname"]);
-			$object->login       = trim($_POST["login"]);
-			$object->pass        = trim($_POST["pass"]);
-
-			$object->societe     = trim($_POST["societe"]);
-			$object->company     = trim($_POST["societe"]);
-
-			$object->address     = trim($_POST["address"]);
-			$object->zip         = trim($_POST["zipcode"]);
-			$object->town        = trim($_POST["town"]);
-			$object->state_id    = $_POST["state_id"];
-			$object->country_id  = $_POST["country_id"];
-
-			$object->phone       = trim($_POST["phone"]);
-			$object->phone_perso = trim($_POST["phone_perso"]);
-			$object->phone_mobile= trim($_POST["phone_mobile"]);
-			$object->email       = trim($_POST["email"]);
-			$object->skype       = trim($_POST["skype"]);
-			$object->birth       = $birthdate;
-
-			$object->typeid      = $_POST["typeid"];
-			//$object->note        = trim($_POST["comment"]);
-			$object->morphy      = $_POST["morphy"];
-
-			if (GETPOST('deletephoto')) $object->photo='';
-			elseif (! empty($_FILES['photo']['name'])) $object->photo  = dol_sanitizeFileName($_FILES['photo']['name']);
-
-			// Get status and public property
-			$object->statut      = $_POST["statut"];
-			$object->public      = $_POST["public"];
-
-			// Fill array 'array_options' with data from add form
-			$ret = $extrafields->setOptionalsFromPost($extralabels,$object);
-			if ($ret < 0) $error++;
-
-			// Check if we need to also synchronize user information
-			$nosyncuser=0;
-			if ($object->user_id)	// If linked to a user
-			{
-				if ($user->id != $object->user_id && empty($user->rights->user->user->creer)) $nosyncuser=1;		// Disable synchronizing
-			}
-
-			// Check if we need to also synchronize password information
-			$nosyncuserpass=0;
-			if ($object->user_id)	// If linked to a user
-			{
-				if ($user->id != $object->user_id && empty($user->rights->user->user->password)) $nosyncuserpass=1;	// Disable synchronizing
-			}
-
-			$result=$object->update($user,0,$nosyncuser,$nosyncuserpass);
-
-			if ($result >= 0 && ! count($object->errors))
-			{
-				$categories = GETPOST('memcats', 'array');
-				$object->setCategories($categories);
-
-				// Logo/Photo save
-				$dir= $conf->adherent->dir_output . '/' . get_exdir(0,0,0,1,$object,'member').'/photos';
-				$file_OK = is_uploaded_file($_FILES['photo']['tmp_name']);
-				if ($file_OK)
-				{
-					if (GETPOST('deletephoto'))
-					{
-						require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
-						$fileimg=$conf->adherent->dir_output.'/'.get_exdir(0,0,0,1,$object,'member').'/photos/'.$object->photo;
-						$dirthumbs=$conf->adherent->dir_output.'/'.get_exdir(0,0,0,1,$object,'member').'/photos/thumbs';
-						dol_delete_file($fileimg);
-						dol_delete_dir_recursive($dirthumbs);
-					}
-
-					if (image_format_supported($_FILES['photo']['name']) > 0)
-					{
-						dol_mkdir($dir);
-
-						if (@is_dir($dir))
-						{
-							$newfile=$dir.'/'.dol_sanitizeFileName($_FILES['photo']['name']);
-							if (! dol_move_uploaded_file($_FILES['photo']['tmp_name'],$newfile,1,0,$_FILES['photo']['error']) > 0)
-							{
-								setEventMessages($langs->trans("ErrorFailedToSaveFile"), null, 'errors');
-							}
-							else
-							{
-							    // Create thumbs
-							    $object->addThumbs($newfile);
-							}
-						}
-					}
-					else
-					{
-						setEventMessages("ErrorBadImageFormat", null, 'errors');
-					}
-				}
-				else
-				{
-					switch($_FILES['photo']['error'])
-					{
-						case 1: //uploaded file exceeds the upload_max_filesize directive in php.ini
-						case 2: //uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the html form
-							$errors[] = "ErrorFileSizeTooLarge";
-							break;
-						case 3: //uploaded file was only partially uploaded
-							$errors[] = "ErrorFilePartiallyUploaded";
-							break;
-					}
-				}
-
-	            $rowid=$object->id;
-	            $id=$object->id;
-				$action='';
-
-				if (! empty($backtopage))
-				{
-					header("Location: ".$backtopage);
-					exit;
-				}
-			}
-			else
-			{
-				setEventMessages($object->error, $object->errors, 'errors');
-				$action='';
-			}
-		}
-		else
-		{
-			$action='edit';
-		}
-	}
-
-	if ($action == 'add' && $user->rights->adherent->creer)
-	{
-		if ($canvas) $object->canvas=$canvas;
-		$birthdate='';
-		if (isset($_POST["birthday"]) && $_POST["birthday"]
-				&& isset($_POST["birthmonth"]) && $_POST["birthmonth"]
-				&& isset($_POST["birthyear"]) && $_POST["birthyear"])
-		{
-			$birthdate=dol_mktime(12, 0, 0, $_POST["birthmonth"], $_POST["birthday"], $_POST["birthyear"]);
-		}
-		$datesubscription='';
-		if (isset($_POST["reday"]) && isset($_POST["remonth"]) && isset($_POST["reyear"]))
-		{
-			$datesubscription=dol_mktime(12, 0, 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]);
-		}
-
-		$typeid=$_POST["typeid"];
-		$civility_id=$_POST["civility_id"];
-		$lastname=$_POST["lastname"];
-		$firstname=$_POST["firstname"];
-		$societe=$_POST["societe"];
-		$address=$_POST["address"];
-		$zip=$_POST["zipcode"];
-		$town=$_POST["town"];
-		$state_id=$_POST["state_id"];
-		$country_id=$_POST["country_id"];
-
-		$phone=$_POST["phone"];
-		$phone_perso=$_POST["phone_perso"];
-		$phone_mobile=$_POST["phone_mobile"];
-		$skype=$_POST["member_skype"];
-		$email=$_POST["member_email"];
-		$login=$_POST["member_login"];
-		$pass=$_POST["password"];
-		$photo=$_POST["photo"];
-		//$comment=$_POST["comment"];
-		$morphy=$_POST["morphy"];
-		$subscription=$_POST["subscription"];
-		$public=$_POST["public"];
-
-		$userid=$_POST["userid"];
-		$socid=$_POST["socid"];
-
-		$object->civility_id = $civility_id;
-		$object->firstname   = $firstname;
-		$object->lastname    = $lastname;
-		$object->societe     = $societe;
-		$object->address     = $address;
-		$object->zip         = $zip;
-		$object->town        = $town;
-		$object->state_id    = $state_id;
-		$object->country_id  = $country_id;
-		$object->phone       = $phone;
-		$object->phone_perso = $phone_perso;
-		$object->phone_mobile= $phone_mobile;
-		$object->skype       = $skype;
-		$object->email       = $email;
-		$object->login       = $login;
-		$object->pass        = $pass;
-		$object->birth       = $birthdate;
-		$object->photo       = $photo;
-		$object->typeid      = $typeid;
-		//$object->note        = $comment;
-		$object->morphy      = $morphy;
-		$object->user_id     = $userid;
-		$object->fk_soc      = $socid;
-		$object->public      = $public;
-
-		// Fill array 'array_options' with data from add form
-		$ret = $extrafields->setOptionalsFromPost($extralabels,$object);
-		if ($ret < 0) $error++;
-
-		// Check parameters
-		if (empty($morphy) || $morphy == "-1") {
-			$error++;
-			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Nature")), null, 'errors');
-		}
-		// Tests if the login already exists
-		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
-		{
-			if (empty($login)) {
-				$error++;
-				setEventMessages($langs->trans("ErrorFieldRequired", $langs->trans("Login")), null, 'errors');
-			}
-			else {
-				$sql = "SELECT login FROM ".MAIN_DB_PREFIX."adherent WHERE login='".$db->escape($login)."'";
-				$result = $db->query($sql);
-				if ($result) {
-					$num = $db->num_rows($result);
-				}
-				if ($num) {
-					$error++;
-					$langs->load("errors");
-					setEventMessages($langs->trans("ErrorLoginAlreadyExists",$login), null, 'errors');
-				}
-			}
-			if (empty($pass)) {
-				$error++;
-				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Password")), null, 'errors');
-			}
-		}
-		if ($morphy == 'mor' && empty($societe)) {
-			$error++;
-			$langs->load("errors");
-			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Company")), null, 'errors');
-		}
-		if ($morphy != 'mor' && empty($lastname)) {
-			$error++;
-			$langs->load("errors");
-			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Lastname")), null, 'errors');
-		}
-		if ($morphy != 'mor' && (!isset($firstname) || $firstname=='')) {
-			$error++;
-			$langs->load("errors");
-			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Firstname")), null, 'errors');
-		}
-		if (! ($typeid > 0)) {	// Keep () before !
-			$error++;
-			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type")), null, 'errors');
-		}
-		if ($conf->global->ADHERENT_MAIL_REQUIRED && ! isValidEMail($email)) {
-			$error++;
-			$langs->load("errors");
-			setEventMessages($langs->trans("ErrorBadEMail",$email), null, 'errors');
-		}
-		$public=0;
-		if (isset($public)) $public=1;
-
-		if (! $error)
-		{
-			$db->begin();
-
-			// Email about right and login does not exist
-			$result=$object->create($user);
-			if ($result > 0)
-			{
-				// Foundation categories
-				$memcats = GETPOST('memcats', 'array');
-				$object->setCategories($memcats);
-
-				$db->commit();
-				$rowid=$object->id;
-				$id=$object->id;
-				$action='';
-			}
-			else
-			{
-				$db->rollback();
-
-				if ($object->error) {
-					setEventMessages($object->error, $object->errors, 'errors');
-				} else {
-					setEventMessages($object->error, $object->errors, 'errors');
-				}
-
-				$action = 'create';
-			}
-		}
-		else {
-			$action = 'create';
-		}
-	}
-
-	if ($user->rights->adherent->supprimer && $action == 'confirm_delete' && $confirm == 'yes')
-	{
-		$result=$object->delete($id);
-		if ($result > 0)
-		{
-			if (! empty($backtopage))
-			{
-				header("Location: ".$backtopage);
-				exit;
-			}
-			else
-			{
-				header("Location: list.php");
-				exit;
-			}
-		}
-		else
-		{
-			$errmesg=$object->error;
-		}
-	}
-
-	if ($user->rights->adherent->creer && $action == 'confirm_valid' && $confirm == 'yes')
-	{
-		$error=0;
-
-		$db->begin();
-
-		$adht = new AdherentType($db);
-		$adht->fetch($object->typeid);
-
-		$result=$object->validate($user);
-
-		if ($result >= 0 && ! count($object->errors))
-		{
-			// Send confirmation email (according to parameters of member type. Otherwise generic)
-			if ($object->email && GETPOST("send_mail"))
-			{
-				$result=$object->send_an_email($adht->getMailOnValid(),$conf->global->ADHERENT_MAIL_VALID_SUBJECT,array(),array(),array(),"","",0,2);
-				if ($result < 0)
-				{
-					$error++;
-					setEventMessages($object->error, $object->errors, 'errors');
-				}
-			}
-		}
-		else
-		{
-			$error++;
-			if ($object->error) {
-				setEventMessages($object->error, $object->errors, 'errors');
-			} else {
-				setEventMessages($object->error, $object->errors, 'errors');
-			}
-		}
-
-		if (! $error)
-		{
-			$db->commit();
-		}
-		else
-		{
-			$db->rollback();
-		}
-		$action='';
-	}
-
-	if ($user->rights->adherent->supprimer && $action == 'confirm_resign')
-	{
-		$error = 0;
-
-		if ($confirm == 'yes')
-		{
-			$adht = new AdherentType($db);
-			$adht->fetch($object->typeid);
-
-			$result=$object->resiliate($user);
-
-			if ($result >= 0 && ! count($object->errors))
-			{
-				if ($object->email && GETPOST("send_mail"))
-				{
-					$result=$object->send_an_email($adht->getMailOnResiliate(),$conf->global->ADHERENT_MAIL_RESIL_SUBJECT,array(),array(),array(),"","",0,-1);
-				}
-				if ($result < 0)
-				{
-					$error++;
-					setEventMessages($object->error, $object->errors, 'errors');
-				}
-			}
-			else
-			{
-				$error++;
-
-				if ($object->error) {
-					setEventMessages($object->error, $object->errors, 'errors');
-				} else {
-					setEventMessages($object->error, $object->errors, 'errors');
-				}
-				$action='';
-			}
-		}
-		if (! empty($backtopage) && ! $error)
-		{
-			header("Location: ".$backtopage);
-			exit;
-		}
-	}
-
-	// SPIP Management
-	if ($user->rights->adherent->supprimer && $action == 'confirm_del_spip' && $confirm == 'yes')
-	{
-		if (! count($object->errors))
-		{
-			if (!$mailmanspip->del_to_spip($object))
-			{
-				setEventMessages($langs->trans('DeleteIntoSpipError').': '.$mailmanspip->error, null, 'errors');
-			}
-		}
-	}
-
-	if ($user->rights->adherent->creer && $action == 'confirm_add_spip' && $confirm == 'yes')
-	{
-		if (! count($object->errors))
-		{
-			if (!$mailmanspip->add_to_spip($object))
-			{
-				setEventMessages($langs->trans('AddIntoSpipError').': '.$mailmanspip->error, null, 'errors');
-			}
-		}
-	}
-	
-	// Actions to build doc
-	$upload_dir = $conf->adherent->dir_output;
-	$permissioncreate=$user->rights->adherent->creer;
-	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
-}
-
-
-/*
- * View
- */
-
-$form = new Form($db);
-$formfile = new FormFile($db);
-$formcompany = new FormCompany($db);
-
-$title=$langs->trans("Member") . " - " . $langs->trans("Card");
-$help_url='EN:Module_Foundations|FR:Module_Adh&eacute;rents|ES:M&oacute;dulo_Miembros';
-llxHeader('',$title,$help_url);
-
-$countrynotdefined=$langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')';
-
-if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
-{
-	// -----------------------------------------
-	// When used with CANVAS
-	// -----------------------------------------
-	if (empty($object->error) && $id)
-	{
-		$object = new Adherent($db);
-		$result=$object->fetch($id);
-		if ($result <= 0) dol_print_error('',$object->error);
-	}
-   	$objcanvas->assign_values($action, $object->id, $object->ref);	// Set value for templates
-    $objcanvas->display_canvas($action);							// Show template
-}
-else
-{
-	// -----------------------------------------
-	// When used in standard mode
-	// -----------------------------------------
-
-	if ($action == 'create')
-	{
-		/* ************************************************************************** */
-		/*                                                                            */
-		/* Creation mode                                                              */
-		/*                                                                            */
-		/* ************************************************************************** */
-		$object->canvas=$canvas;
-		$object->state_id = GETPOST('state_id', 'int');
-
-		// We set country_id, country_code and country for the selected country
-		$object->country_id=GETPOST('country_id','int')?GETPOST('country_id','int'):$mysoc->country_id;
-		if ($object->country_id)
-		{
-			$tmparray=getCountry($object->country_id,'all');
-			$object->country_code=$tmparray['code'];
-			$object->country=$tmparray['label'];
-		}
-
-		$adht = new AdherentType($db);
-
-		print load_fiche_titre($langs->trans("NewMember"));
-
-		if ($conf->use_javascript_ajax)
-		{
-			print "\n".'<script type="text/javascript" language="javascript">';
-			print 'jQuery(document).ready(function () {
-						jQuery("#selectcountry_id").change(function() {
-							document.formsoc.action.value="create";
-							document.formsoc.submit();
-						});
-						function initfieldrequired()
-						{
-							jQuery("#tdcompany").removeClass("fieldrequired");
-							jQuery("#tdlastname").removeClass("fieldrequired");
-							jQuery("#tdfirstname").removeClass("fieldrequired");
-							if (jQuery("#morphy").val() == \'mor\')
-							{
-								jQuery("#tdcompany").addClass("fieldrequired");
-							}
-							if (jQuery("#morphy").val() == \'phy\')
-							{
-								jQuery("#tdlastname").addClass("fieldrequired");
-								jQuery("#tdfirstname").addClass("fieldrequired");
-							}
-						}
-						jQuery("#morphy").change(function() {
-							initfieldrequired();
-						});
-						initfieldrequired();
-					})';
-			print '</script>'."\n";
-		}
-
-		print '<form name="formsoc" action="'.$_SERVER["PHP_SELF"].'" method="post" enctype="multipart/form-data">';
-		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-		print '<input type="hidden" name="action" value="add">';
-
-        dol_fiche_head('');
-
-		print '<table class="border" width="100%">';
-		print '<tbody>';
-
-		// Login
-		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
-		{
-			print '<tr><td><span class="fieldrequired">'.$langs->trans("Login").' / '.$langs->trans("Id").'</span></td><td><input type="text" name="member_login" class="maxwidth200" value="'.(isset($_POST["member_login"])?GETPOST("member_login", 'alpha', 2):$object->login).'"></td></tr>';
-		}
-
-		// Type
-		print '<tr><td class="fieldrequired">'.$langs->trans("MemberType").'</td><td>';
-		$listetype=$adht->liste_array();
-		if (count($listetype))
-		{
-			print $form->selectarray("typeid", $listetype, GETPOST('typeid','int')?GETPOST('typeid','int'):$typeid, count($listetype)>1?1:0);
-		} else {
-			print '<font class="error">'.$langs->trans("NoTypeDefinedGoToSetup").'</font>';
-		}
-		print "</td>\n";
-
-		// Morphy
-		$morphys["phy"] = $langs->trans("Physical");
-		$morphys["mor"] = $langs->trans("Moral");
-		print '<tr><td class="fieldrequired">'.$langs->trans("Nature")."</td><td>\n";
-		print $form->selectarray("morphy", $morphys, GETPOST('morphy','alpha')?GETPOST('morphy','alpha'):$object->morphy, 1);
-		print "</td>\n";
-
-		// Company
-		print '<tr><td id="tdcompany">'.$langs->trans("Company").'</td><td><input type="text" name="societe" size="40" value="'.(GETPOST('societe','alpha')?GETPOST('societe','alpha'):$object->societe).'"></td></tr>';
-
-		// Civility
-		print '<tr><td>'.$langs->trans("UserTitle").'</td><td>';
-		print $formcompany->select_civility(GETPOST('civility_id','int')?GETPOST('civility_id','int'):$object->civility_id,'civility_id').'</td>';
-		print '</tr>';
-
-		// Lastname
-		print '<tr><td id="tdlastname">'.$langs->trans("Lastname").'</td><td><input type="text" name="lastname" value="'.(GETPOST('lastname','alpha')?GETPOST('lastname','alpha'):$object->lastname).'" size="40"></td>';
-		print '</tr>';
-
-		// Firstname
-		print '<tr><td id="tdfirstname">'.$langs->trans("Firstname").'</td><td><input type="text" name="firstname" size="40" value="'.(GETPOST('firstname','alpha')?GETPOST('firstname','alpha'):$object->firstname).'"></td>';
-		print '</tr>';
-
-		// EMail
-		print '<tr><td>'.($conf->global->ADHERENT_MAIL_REQUIRED?'<span class="fieldrequired">':'').$langs->trans("EMail").($conf->global->ADHERENT_MAIL_REQUIRED?'</span>':'').'</td><td><input type="text" name="member_email" size="40" value="'.(GETPOST('member_email','alpha')?GETPOST('member_email','alpha'):$object->email).'"></td></tr>';
-
-		// Password
-		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
-		{
-			require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
-			$generated_password=getRandomPassword(false);
-			print '<tr><td><span class="fieldrequired">'.$langs->trans("Password").'</span></td><td>';
-			print '<input size="30" maxsize="32" type="text" name="password" value="'.$generated_password.'">';
-			print '</td></tr>';
-		}
-
-		// Address
-		print '<tr><td class="tdtop">'.$langs->trans("Address").'</td><td>';
-		print '<textarea name="address" wrap="soft" class="quatrevingtpercent" rows="2">'.(GETPOST('address','alpha')?GETPOST('address','alpha'):$object->address).'</textarea>';
-		print '</td></tr>';
-
-		// Zip / Town
-		print '<tr><td>'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td>';
-		print $formcompany->select_ziptown((GETPOST('zipcode','alpha')?GETPOST('zipcode','alpha'):$object->zip),'zipcode',array('town','selectcountry_id','state_id'),6);
-		print ' ';
-		print $formcompany->select_ziptown((GETPOST('town','alpha')?GETPOST('town','alpha'):$object->town),'town',array('zipcode','selectcountry_id','state_id'));
-		print '</td></tr>';
-
-		// Country
-		$object->country_id=$object->country_id?$object->country_id:$mysoc->country_id;
-		print '<tr><td width="25%">'.$langs->trans('Country').'</td><td>';
-		print $form->select_country(GETPOST('country_id','alpha')?GETPOST('country_id','alpha'):$object->country_id,'country_id');
-		if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
-		print '</td></tr>';
-
-		// State
-		if (empty($conf->global->MEMBER_DISABLE_STATE))
-		{
-			print '<tr><td>'.$langs->trans('State').'</td><td>';
-			if ($object->country_id)
-			{
-				print $formcompany->select_state(GETPOST('state_id','int')?GETPOST('state_id','int'):$object->state_id,$object->country_code);
-			}
-			else
-			{
-				print $countrynotdefined;
-			}
-			print '</td></tr>';
-		}
-
-		// Pro phone
-		print '<tr><td>'.$langs->trans("PhonePro").'</td><td><input type="text" name="phone" size="20" value="'.(GETPOST('phone','alpha')?GETPOST('phone','alpha'):$object->phone).'"></td></tr>';
-
-		// Personal phone
-		print '<tr><td>'.$langs->trans("PhonePerso").'</td><td><input type="text" name="phone_perso" size="20" value="'.(GETPOST('phone_perso','alpha')?GETPOST('phone_perso','alpha'):$object->phone_perso).'"></td></tr>';
-
-		// Mobile phone
-		print '<tr><td>'.$langs->trans("PhoneMobile").'</td><td><input type="text" name="phone_mobile" size="20" value="'.(GETPOST('phone_mobile','alpha')?GETPOST('phone_mobile','alpha'):$object->phone_mobile).'"></td></tr>';
-
-	    // Skype
-	    if (! empty($conf->skype->enabled))
-	    {
-			print '<tr><td>'.$langs->trans("Skype").'</td><td><input type="text" name="member_skype" size="40" value="'.(GETPOST('member_skype','alpha')?GETPOST('member_skype','alpha'):$object->skype).'"></td></tr>';
-	    }
-
-		// Birthday
-		print "<tr><td>".$langs->trans("Birthday")."</td><td>\n";
-		$form->select_date(($object->birth ? $object->birth : -1),'birth','','',1,'formsoc');
-		print "</td></tr>\n";
-
-		// Public profil
-		print "<tr><td>".$langs->trans("Public")."</td><td>\n";
-		print $form->selectyesno("public",$object->public,1);
-		print "</td></tr>\n";
-
-		// Categories
-		if (! empty($conf->categorie->enabled)  && ! empty($user->rights->categorie->lire))
-		{
-			print '<tr><td>' . fieldLabel('Categories', 'memcars') . '</td><td>';
-			$cate_arbo = $form->select_all_categories(Categorie::TYPE_MEMBER, null, 'parent', null, null, 1);
-			print $form->multiselectarray('memcats', $cate_arbo, GETPOST('memcats', 'array'), null, null, null, null, '100%');
-			print "</td></tr>";
-		}
-
-		// Other attributes
-		$parameters=array();
-		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-		if (empty($reshook) && ! empty($extrafields->attribute_label))
-		{
-			print $object->showOptionals($extrafields,'edit');
-		}
-
-		/*
-		 // Third party Dolibarr
-		if (! empty($conf->societe->enabled))
-		{
-		print '<tr><td>'.$langs->trans("LinkedToDolibarrThirdParty").'</td><td class="valeur">';
-		print $form->select_company($object->fk_soc,'socid','',1);
-		print '</td></tr>';
-		}
-
-		// Login Dolibarr
-		print '<tr><td>'.$langs->trans("LinkedToDolibarrUser").'</td><td class="valeur">';
-		print $form->select_dolusers($object->user_id, 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
-		print '</td></tr>';
-		*/
-        print '<tbody>';
-		print "</table>\n";
-
-        dol_fiche_end();
-
-	    print '<div class="center">';
-	    print '<input type="submit" name="button" class="button" value="'.$langs->trans("AddMember").'">';
-	    print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	    print '<input type="submit" name="cancel" class="button" value="'.$langs->trans("Cancel").'" onclick="history.go(-1)" />';
-	    print '</div>';
-
-		print "</form>\n";
-	}
-
-	if ($action == 'edit')
-	{
-		/********************************************
-		*
-		* Edition mode
-		*
-		********************************************/
-
-		$res=$object->fetch($id);
-		if ($res < 0) {
-			dol_print_error($db,$object->error); exit;
-		}
-		$res=$object->fetch_optionals($object->id,$extralabels);
-		if ($res < 0) {
-			dol_print_error($db); exit;
-		}
-
-		$adht = new AdherentType($db);
-		$adht->fetch($object->typeid);
-
-		// We set country_id, and country_code, country of the chosen country
-		$country=GETPOST('country','int');
-		if (!empty($country) || $object->country_id)
-		{
-			$sql = "SELECT rowid, code, label from ".MAIN_DB_PREFIX."c_country where rowid = ".(!empty($country)?$country:$object->country_id);
-			$resql=$db->query($sql);
-			if ($resql)
-			{
-				$obj = $db->fetch_object($resql);
-			}
-			else
-			{
-				dol_print_error($db);
-			}
-			$object->country_id=$obj->rowid;
-			$object->country_code=$obj->code;
-			$object->country=$langs->trans("Country".$obj->code)?$langs->trans("Country".$obj->code):$obj->label;
-		}
-
-		$head = member_prepare_head($object);
-
-
-		if ($conf->use_javascript_ajax)
-		{
-			print "\n".'<script type="text/javascript" language="javascript">';
-			print 'jQuery(document).ready(function () {
-				jQuery("#selectcountry_id").change(function() {
-					document.formsoc.action.value="edit";
-					document.formsoc.submit();
-				});
-				function initfieldrequired()
-				{
-					jQuery("#tdcompany").removeClass("fieldrequired");
-					jQuery("#tdlastname").removeClass("fieldrequired");
-					jQuery("#tdfirstname").removeClass("fieldrequired");
-					if (jQuery("#morphy").val() == \'mor\')
-					{
-						jQuery("#tdcompany").addClass("fieldrequired");
-					}
-					if (jQuery("#morphy").val() == \'phy\')
-					{
-						jQuery("#tdlastname").addClass("fieldrequired");
-						jQuery("#tdfirstname").addClass("fieldrequired");
-					}
-				}
-				jQuery("#morphy").change(function() {
-					initfieldrequired();
-				});
-				initfieldrequired();
-			})';
-			print '</script>'."\n";
-		}
-
-		print '<form name="formsoc" action="'.$_SERVER["PHP_SELF"].'" method="post" enctype="multipart/form-data">';
-		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'" />';
-		print '<input type="hidden" name="action" value="update" />';
-		print '<input type="hidden" name="rowid" value="'.$id.'" />';
-		print '<input type="hidden" name="statut" value="'.$object->statut.'" />';
-		if ($backtopage) print '<input type="hidden" name="backtopage" value="'.($backtopage != '1' ? $backtopage : $_SERVER["HTTP_REFERER"]).'">';
-
-		dol_fiche_head($head, 'general', $langs->trans("Member"), 0, 'user');
-
-		print '<table class="border" width="100%">';
-
-		// Ref
-		print '<tr><td class="titlefieldcreate">'.$langs->trans("Ref").'</td><td class="valeur" colspan="2">'.$object->id.'</td></tr>';
-
-		// Login
-		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
-		{
-			print '<tr><td><span class="fieldrequired">'.$langs->trans("Login").' / '.$langs->trans("Id").'</span></td><td colspan="2"><input type="text" name="login" class="maxwidth200" value="'.(isset($_POST["login"])?GETPOST("login",'alpha',2):$object->login).'"></td></tr>';
-		}
-
-		// Morphy
-		$morphys["phy"] = $langs->trans("Physical");
-		$morphys["mor"] = $langs->trans("Morale");
-		print '<tr><td><span class="fieldrequired">'.$langs->trans("Nature").'</span></td><td>';
-		print $form->selectarray("morphy", $morphys, isset($_POST["morphy"])?$_POST["morphy"]:$object->morphy);
-		print "</td></tr>";
-
-		// Type
-		print '<tr><td class="fieldrequired">'.$langs->trans("Type").'</td><td>';
-		if ($user->rights->adherent->creer)
-		{
-			print $form->selectarray("typeid", $adht->liste_array(), (isset($_POST["typeid"])?$_POST["typeid"]:$object->typeid));
-		}
-		else
-		{
-			print $adht->getNomUrl(1);
-			print '<input type="hidden" name="typeid" value="'.$object->typeid.'">';
-		}
-		print "</td></tr>";
-
-		// Company
-		print '<tr><td id="tdcompany">'.$langs->trans("Company").'</td><td><input type="text" name="societe" size="40" value="'.(isset($_POST["societe"])?GETPOST("societe",'',2):$object->societe).'"></td></tr>';
-
-		// Civility
-		print '<tr><td>'.$langs->trans("UserTitle").'</td><td>';
-		print $formcompany->select_civility(isset($_POST["civility_id"])?$_POST["civility_id"]:$object->civility_id)."\n";
-		print '</td>';
-		print '</tr>';
-
-		// Lastname
-		print '<tr><td id="tdlastname">'.$langs->trans("Lastname").'</td><td><input type="text" name="lastname" size="40" value="'.(isset($_POST["lastname"])?GETPOST("lastname",'',2):$object->lastname).'"></td>';
-		print '</tr>';
-
-		// Firstname
-		print '<tr><td id="tdfirstname">'.$langs->trans("Firstname").'</td><td><input type="text" name="firstname" size="40" value="'.(isset($_POST["firstname"])?GETPOST("firstname",'',3):$object->firstname).'"></td>';
-		print '</tr>';
-
-		// Photo
-		print '<tr><td>'.$langs->trans("Photo").'</td>';
-		print '<td class="hideonsmartphone" valign="middle">';
-		print $form->showphoto('memberphoto',$object)."\n";
-		if ($caneditfieldmember)
-		{
-			if ($object->photo) print "<br>\n";
-			print '<table class="nobordernopadding">';
-			if ($object->photo) print '<tr><td><input type="checkbox" class="flat photodelete" name="deletephoto" id="photodelete"> '.$langs->trans("Delete").'<br><br></td></tr>';
-			print '<tr><td>'.$langs->trans("PhotoFile").'</td></tr>';
-			print '<tr><td><input type="file" class="flat" name="photo" id="photoinput"></td></tr>';
-			print '</table>';
-		}
-		print '</td></tr>';
-
-		// EMail
-		print '<tr><td>'.($conf->global->ADHERENT_MAIL_REQUIRED?'<span class="fieldrequired">':'').$langs->trans("EMail").($conf->global->ADHERENT_MAIL_REQUIRED?'</span>':'').'</td><td><input type="text" name="email" size="40" value="'.(isset($_POST["email"])?GETPOST("email",'',2):$object->email).'"></td></tr>';
-
-		// Password
-		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
-		{
-			print '<tr><td class="fieldrequired">'.$langs->trans("Password").'</td><td><input type="password" name="pass" class="maxwdith200" value="'.(isset($_POST["pass"])?GETPOST("pass",'',2):$object->pass).'"></td></tr>';
-		}
-
-		// Address
-		print '<tr><td>'.$langs->trans("Address").'</td><td>';
-		print '<textarea name="address" wrap="soft" class="quatrevingtpercent" rows="2">'.(isset($_POST["address"])?GETPOST("address",'',2):$object->address).'</textarea>';
-		print '</td></tr>';
-
-		// Zip / Town
-		print '<tr><td>'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td>';
-		print $formcompany->select_ziptown((isset($_POST["zipcode"])?GETPOST("zipcode",'',2):$object->zip),'zipcode',array('town','selectcountry_id','state_id'),6);
-		print ' ';
-		print $formcompany->select_ziptown((isset($_POST["town"])?GETPOST("town",'',2):$object->town),'town',array('zipcode','selectcountry_id','state_id'));
-		print '</td></tr>';
-
-		// Country
-		//$object->country_id=$object->country_id?$object->country_id:$mysoc->country_id;    // In edit mode we don't force to company country if not defined
-		print '<tr><td width="25%">'.$langs->trans('Country').'</td><td>';
-		print $form->select_country(isset($_POST["country_id"])?$_POST["country_id"]:$object->country_id,'country_id');
-		if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
-		print '</td></tr>';
-
-		// State
-		if (empty($conf->global->MEMBER_DISABLE_STATE))
-		{
-			print '<tr><td>'.$langs->trans('State').'</td><td>';
-			print $formcompany->select_state($object->state_id,isset($_POST["country_id"])?GETPOST("country_id"):$object->country_id);
-			print '</td></tr>';
-		}
-
-		// Pro phone
-		print '<tr><td>'.$langs->trans("PhonePro").'</td><td><input type="text" name="phone" size="20" value="'.(isset($_POST["phone"])?GETPOST("phone"):$object->phone).'"></td></tr>';
-
-		// Personal phone
-		print '<tr><td>'.$langs->trans("PhonePerso").'</td><td><input type="text" name="phone_perso" size="20" value="'.(isset($_POST["phone_perso"])?GETPOST("phone_perso"):$object->phone_perso).'"></td></tr>';
-
-		// Mobile phone
-		print '<tr><td>'.$langs->trans("PhoneMobile").'</td><td><input type="text" name="phone_mobile" size="20" value="'.(isset($_POST["phone_mobile"])?GETPOST("phone_mobile"):$object->phone_mobile).'"></td></tr>';
-
-	    // Skype
-	    if (! empty($conf->skype->enabled))
-	    {
-			    print '<tr><td>'.$langs->trans("Skype").'</td><td><input type="text" name="skype" size="40" value="'.(isset($_POST["skype"])?GETPOST("skype"):$object->skype).'"></td></tr>';
-	    }
-
-		// Birthday
-		print "<tr><td>".$langs->trans("Birthday")."</td><td>\n";
-		$form->select_date(($object->birth ? $object->birth : -1),'birth','','',1,'formsoc');
-		print "</td></tr>\n";
-
-		// Public profil
-		print "<tr><td>".$langs->trans("Public")."</td><td>\n";
-		print $form->selectyesno("public",(isset($_POST["public"])?GETPOST("public",'',2):$object->public),1);
-		print "</td></tr>\n";
-
-		// Categories
-		if (! empty( $conf->categorie->enabled ) && !empty( $user->rights->categorie->lire ))
-		{
-			print '<tr><td>' . fieldLabel('Categories', 'memcats') . '</td>';
-			print '<td colspan="2">';
-			$cate_arbo = $form->select_all_categories(Categorie::TYPE_MEMBER, null, null, null, null, 1);
-			$c = new Categorie($db);
-			$cats = $c->containing($object->id, Categorie::TYPE_MEMBER);
-			foreach ($cats as $cat) {
-				$arrayselected[] = $cat->id;
-			}
-			print $form->multiselectarray('memcats', $cate_arbo, $arrayselected, '', 0, '', 0, '100%');
-			print "</td></tr>";
-		}
-
-		// Other attributes
-		$parameters=array("colspan"=>2);
-		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-		if (empty($reshook) && ! empty($extrafields->attribute_label))
-		{
-			print $object->showOptionals($extrafields,'edit',$parameters);
-		}
-
-		// Third party Dolibarr
-		if (! empty($conf->societe->enabled))
-		{
-			print '<tr><td>'.$langs->trans("LinkedToDolibarrThirdParty").'</td><td colspan="2" class="valeur">';
-			if ($object->fk_soc)
-			{
-				$company=new Societe($db);
-				$result=$company->fetch($object->fk_soc);
-				print $company->getNomUrl(1);
-			}
-			else
-			{
-				print $langs->trans("NoThirdPartyAssociatedToMember");
-			}
-			print '</td></tr>';
-		}
-
-		// Login Dolibarr
-		print '<tr><td>'.$langs->trans("LinkedToDolibarrUser").'</td><td colspan="2" class="valeur">';
-		if ($object->user_id)
-		{
-			$form->form_users($_SERVER['PHP_SELF'].'?rowid='.$object->id,$object->user_id,'none');
-		}
-		else print $langs->trans("NoDolibarrAccess");
-		print '</td></tr>';
-
-		print '</table>';
-
-		dol_fiche_end();
-
-		print '<div class="center">';
-		print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
-		print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-		print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'" onclick="history.go(-1)" />';
-		print '</div>';
-
-		print '</form>';
-
-	}
-
-	if ($id > 0 && $action != 'edit')
-	{
-		/* ************************************************************************** */
-		/*                                                                            */
-		/* View mode                                                                  */
-		/*                                                                            */
-		/* ************************************************************************** */
-
-		$res=$object->fetch($id);
-		if ($res < 0) {
-			dol_print_error($db,$object->error); exit;
-		}
-		$res=$object->fetch_optionals($object->id,$extralabels);
-		if ($res < 0) {
-			dol_print_error($db); exit;
-		}
-
-		$adht = new AdherentType($db);
-		$res=$adht->fetch($object->typeid);
-		if ($res < 0) {
-			dol_print_error($db); exit;
-		}
-
-
-		/*
-		 * Show tabs
-		 */
-		$head = member_prepare_head($object);
-
-		dol_fiche_head($head, 'general', $langs->trans("Member"), 0, 'user');
-
-		// Confirm create user
-		if ($action == 'create_user')
-		{
-			$login=$object->login;
-			if (empty($login))
-			{
-				// Full firstname and name separated with a dot : firstname.name
-				include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-				$login=dol_buildlogin($object->lastname,$object->firstname);
-			}
-			if (empty($login)) $login=strtolower(substr($object->firstname, 0, 4)) . strtolower(substr($object->lastname, 0, 4));
-
-			// Create a form array
-			$formquestion=array(
-					array('label' => $langs->trans("LoginToCreate"), 'type' => 'text', 'name' => 'login', 'value' => $login)
-			);
-			$text=$langs->trans("ConfirmCreateLogin").'<br>';
-			if (! empty($conf->societe->enabled))
-			{
-				if ($object->fk_soc > 0) $text.=$langs->trans("UserWillBeExternalUser");
-				else $text.=$langs->trans("UserWillBeInternalUser");
-			}
-			print $form->formconfirm($_SERVER["PHP_SELF"]."?rowid=".$object->id,$langs->trans("CreateDolibarrLogin"),$text,"confirm_create_user",$formquestion,'yes');
-		}
-
-		// Confirm create third party
-		if ($action == 'create_thirdparty')
-		{
-			$name = $object->getFullName($langs);
-			if (! empty($name))
-			{
-				if ($object->societe) $name.=' ('.$object->societe.')';
-			}
-			else
-			{
-				$name=$object->societe;
-			}
-
-			// Create a form array
-			$formquestion=array(		array('label' => $langs->trans("NameToCreate"), 'type' => 'text', 'name' => 'companyname', 'value' => $name));
-
-			print $form->formconfirm($_SERVER["PHP_SELF"]."?rowid=".$object->id,$langs->trans("CreateDolibarrThirdParty"),$langs->trans("ConfirmCreateThirdParty"),"confirm_create_thirdparty",$formquestion,1);
-		}
-
-		// Confirm validate member
-		if ($action == 'valid')
-		{
-			$langs->load("mails");
-
-			$adht = new AdherentType($db);
-			$adht->fetch($object->typeid);
-
-			$subjecttosend=$object->makeSubstitution($conf->global->ADHERENT_MAIL_VALID_SUBJECT);
-			$texttosend=$object->makeSubstitution($adht->getMailOnValid());
-
-			$tmp=$langs->trans("SendAnEMailToMember");
-			$tmp.='<br>('.$langs->trans("MailFrom").': <b>'.$conf->global->ADHERENT_MAIL_FROM.'</b>, ';
-			$tmp.=$langs->trans("MailRecipient").': <b>'.$object->email.'</b>)';
-			$helpcontent='';
-			$helpcontent.='<b>'.$langs->trans("MailFrom").'</b>: '.$conf->global->ADHERENT_MAIL_FROM.'<br>'."\n";
-			$helpcontent.='<b>'.$langs->trans("MailRecipient").'</b>: '.$object->email.'<br>'."\n";
-			$helpcontent.='<b>'.$langs->trans("Subject").'</b>:<br>'."\n";
-			$helpcontent.=$subjecttosend."\n";
-			$helpcontent.="<br>";
-			$helpcontent.='<b>'.$langs->trans("Content").'</b>:<br>';
-			$helpcontent.=dol_htmlentitiesbr($texttosend)."\n";
-			$label=$form->textwithpicto($tmp,$helpcontent,1,'help');
-
-			// Create form popup
-			$formquestion=array();
-			if ($object->email) $formquestion[]=array('type' => 'checkbox', 'name' => 'send_mail', 'label' => $label,  'value' => ($conf->global->ADHERENT_DEFAULT_SENDINFOBYMAIL?true:false));
-			if (! empty($conf->mailman->enabled) && ! empty($conf->global->ADHERENT_USE_MAILMAN)) {
-				$formquestion[]=array('type'=>'other','label'=>$langs->transnoentitiesnoconv("SynchroMailManEnabled"),'value'=>'');
-			}
-			if (! empty($conf->mailman->enabled) && ! empty($conf->global->ADHERENT_USE_SPIP))    {
-				$formquestion[]=array('type'=>'other','label'=>$langs->transnoentitiesnoconv("SynchroSpipEnabled"),'value'=>'');
-			}
-			print $form->formconfirm("card.php?rowid=".$id,$langs->trans("ValidateMember"),$langs->trans("ConfirmValidateMember"),"confirm_valid",$formquestion,1,1);
-		}
-
-		// Confirm send card by mail
-		if ($action == 'sendinfo')
-		{
-			print $form->formconfirm("card.php?rowid=".$id,$langs->trans("SendCardByMail"),$langs->trans("ConfirmSendCardByMail",$object->email),"confirm_sendinfo",'',0,1);
-		}
-
-		// Confirm terminate
-		if ($action == 'resign')
-		{
-			$langs->load("mails");
-
-			$adht = new AdherentType($db);
-			$adht->fetch($object->typeid);
-
-			$subjecttosend=$object->makeSubstitution($conf->global->ADHERENT_MAIL_RESIL_SUBJECT);
-			$texttosend=$object->makeSubstitution($adht->getMailOnResiliate());
-
-			$tmp=$langs->trans("SendAnEMailToMember");
-			$tmp.='<br>('.$langs->trans("MailFrom").': <b>'.$conf->global->ADHERENT_MAIL_FROM.'</b>, ';
-			$tmp.=$langs->trans("MailRecipient").': <b>'.$object->email.'</b>)';
-			$helpcontent='';
-			$helpcontent.='<b>'.$langs->trans("MailFrom").'</b>: '.$conf->global->ADHERENT_MAIL_FROM.'<br>'."\n";
-			$helpcontent.='<b>'.$langs->trans("MailRecipient").'</b>: '.$object->email.'<br>'."\n";
-			$helpcontent.='<b>'.$langs->trans("Subject").'</b>:<br>'."\n";
-			$helpcontent.=$subjecttosend."\n";
-			$helpcontent.="<br>";
-			$helpcontent.='<b>'.$langs->trans("Content").'</b>:<br>';
-			$helpcontent.=dol_htmlentitiesbr($texttosend)."\n";
-			$label=$form->textwithpicto($tmp,$helpcontent,1,'help');
-
-			// Create an array
-			$formquestion=array();
-			if ($object->email) $formquestion[]=array('type' => 'checkbox', 'name' => 'send_mail', 'label' => $label, 'value' => (! empty($conf->global->ADHERENT_DEFAULT_SENDINFOBYMAIL)?'true':'false'));
-			if ($backtopage)    $formquestion[]=array('type' => 'hidden', 'name' => 'backtopage', 'value' => ($backtopage != '1' ? $backtopage : $_SERVER["HTTP_REFERER"]));
-			print $form->formconfirm("card.php?rowid=".$id,$langs->trans("ResiliateMember"),$langs->trans("ConfirmResiliateMember"),"confirm_resign",$formquestion,'no',1);
-		}
-
-		// Confirm remove member
-		if ($action == 'delete')
-		{
-			$formquestion=array();
-			if ($backtopage) $formquestion[]=array('type' => 'hidden', 'name' => 'backtopage', 'value' => ($backtopage != '1' ? $backtopage : $_SERVER["HTTP_REFERER"]));
-			print $form->formconfirm("card.php?rowid=".$id,$langs->trans("DeleteMember"),$langs->trans("ConfirmDeleteMember"),"confirm_delete",$formquestion,0,1);
-		}
-
-		// Confirm add in spip
-		if ($action == 'add_spip')
-		{
-			print $form->formconfirm("card.php?rowid=".$id, $langs->trans('AddIntoSpip'), $langs->trans('AddIntoSpipConfirmation'), 'confirm_add_spip');
-		}
-		// Confirm removed from spip
-		if ($action == 'del_spip')
-		{
-			print $form->formconfirm("card.php?rowid=$id", $langs->trans('DeleteIntoSpip'), $langs->trans('DeleteIntoSpipConfirmation'), 'confirm_del_spip');
-		}
-
-		$rowspan=17;
-		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) $rowspan++;
-		if (! empty($conf->societe->enabled)) $rowspan++;
-
-		$linkback = '<a href="'.DOL_URL_ROOT.'/adherents/list.php">'.$langs->trans("BackToList").'</a>';
-		
-		dol_banner_tab($object, 'rowid', $linkback);
-        
-        print '<div class="fichecenter">';
-        print '<div class="fichehalfleft">';
-        
-        print '<div class="underbanner clearboth"></div>';
-		print '<table class="border centpercent">';
-
-		// Login
-		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
-		{
-			print '<tr><td class="titlefield">'.$langs->trans("Login").' / '.$langs->trans("Id").'</td><td class="valeur">'.$object->login.'&nbsp;</td></tr>';
-		}
-
-		// Type
-		print '<tr><td class="titlefield">'.$langs->trans("Type").'</td><td class="valeur">'.$adht->getNomUrl(1)."</td></tr>\n";
-
-		// Morphy
-		print '<tr><td>'.$langs->trans("Nature").'</td><td class="valeur" >'.$object->getmorphylib().'</td>';
-		print '</tr>';
-
-		// Company
-		print '<tr><td>'.$langs->trans("Company").'</td><td class="valeur">'.$object->societe.'</td></tr>';
-
-		// Civility
-		print '<tr><td>'.$langs->trans("UserTitle").'</td><td class="valeur">'.$object->getCivilityLabel().'&nbsp;</td>';
-		print '</tr>';
-
-		// Password
-		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
-		{
-			print '<tr><td>'.$langs->trans("Password").'</td><td>'.preg_replace('/./i','*',$object->pass);
-			if ($object->pass) print preg_replace('/./i','*',$object->pass);
-			else
-			{
-			    if ($user->admin) print $langs->trans("Crypted").': '.$object->pass_indatabase_crypted;
-			    else print $langs->trans("Hidden");
-			}
-			if ((! empty($object->pass) || ! empty($object->pass_crypted)) && empty($object->user_id))
-			{
-			    $langs->load("errors");
-			    $htmltext=$langs->trans("WarningPasswordSetWithNoAccount");
-			    print ' '.$form->textwithpicto('', $htmltext,1,'warning');
-			}
-			print '</td></tr>';
-		}
-		
-        print '</table>';
-        
-        print '</div>';
-        print '<div class="fichehalfright"><div class="ficheaddleft">';
-       
-        print '<div class="underbanner clearboth"></div>';
-        print '<table class="border tableforfield" width="100%">';
-		
-		// Birthday
-		print '<tr><td class="titlefield">'.$langs->trans("Birthday").'</td><td class="valeur">'.dol_print_date($object->birth,'day').'</td></tr>';
-
-		// Public
-		print '<tr><td>'.$langs->trans("Public").'</td><td class="valeur">'.yn($object->public).'</td></tr>';
-
-		// Categories
-		if (! empty($conf->categorie->enabled)  && ! empty($user->rights->categorie->lire))
-		{
-			print '<tr><td>' . $langs->trans("Categories") . '</td>';
-			print '<td colspan="2">';
-			print $form->showCategories($object->id, 'member', 1);
-			print '</td></tr>';
-		}
-
-		// Other attributes
-		$parameters=array('colspan'=>2);
-		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-		if (empty($reshook) && ! empty($extrafields->attribute_label))
-		{
-			print $object->showOptionals($extrafields, 'view', $parameters);
-		}
-
-        // Date end subscription
-        print '<tr><td>'.$langs->trans("SubscriptionEndDate").'</td><td class="valeur">';
-        if ($object->datefin)
-        {
-            print dol_print_date($object->datefin,'day');
-            if ($object->hasDelay()) {
-                print " ".img_warning($langs->trans("Late"));
-            }
-        }
-        else
-        {
-	        if (! $adht->subscription)
-	        {
-	        	print $langs->trans("SubscriptionNotRecorded");
-		        if ($object->statut > 0) print " ".img_warning($langs->trans("Late")); // displays delay Pictogram only if not a draft and not terminated
-	        }
-	        else
-	        {
-	            print $langs->trans("SubscriptionNotReceived");
-	            if ($object->statut > 0) print " ".img_warning($langs->trans("Late")); // displays delay Pictogram only if not a draft and not terminated
-	        }
-        }
-        print '</td></tr>';
-		
-		// Third party Dolibarr
-		if (! empty($conf->societe->enabled))
-		{
-			print '<tr><td>';
-			print '<table class="nobordernopadding" width="100%"><tr><td>';
-			print $langs->trans("LinkedToDolibarrThirdParty");
-			print '</td>';
-			if ($action != 'editthirdparty' && $user->rights->adherent->creer) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editthirdparty&amp;rowid='.$object->id.'">'.img_edit($langs->trans('SetLinkToThirdParty'),1).'</a></td>';
-			print '</tr></table>';
-			print '</td><td colspan="2" class="valeur">';
-			if ($action == 'editthirdparty')
-			{
-				$htmlname='socid';
-				print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'" name="form'.$htmlname.'">';
-				print '<input type="hidden" name="rowid" value="'.$object->id.'">';
-				print '<input type="hidden" name="action" value="set'.$htmlname.'">';
-				print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-				print '<table class="nobordernopadding" cellpadding="0" cellspacing="0">';
-				print '<tr><td>';
-				print $form->select_company($object->fk_soc,'socid','',1);
-				print '</td>';
-				print '<td align="left"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
-				print '</tr></table></form>';
-			}
-			else
-			{
-				if ($object->fk_soc)
-				{
-					$company=new Societe($db);
-					$result=$company->fetch($object->fk_soc);
-					print $company->getNomUrl(1);
-				}
-				else
-				{
-					print $langs->trans("NoThirdPartyAssociatedToMember");
-				}
-			}
-			print '</td></tr>';
-		}
-
-		// Login Dolibarr
-		print '<tr><td>';
-		print '<table class="nobordernopadding" width="100%"><tr><td>';
-		print $langs->trans("LinkedToDolibarrUser");
-		print '</td>';
-		if ($action != 'editlogin' && $user->rights->adherent->creer)
-		{
-			print '<td align="right">';
-			if ($user->rights->user->user->creer)
-			{
-				print '<a href="'.$_SERVER["PHP_SELF"].'?action=editlogin&amp;rowid='.$object->id.'">'.img_edit($langs->trans('SetLinkToUser'),1).'</a>';
-			}
-			print '</td>';
-		}
-		print '</tr></table>';
-		print '</td><td colspan="2" class="valeur">';
-		if ($action == 'editlogin')
-		{
-			$form->form_users($_SERVER['PHP_SELF'].'?rowid='.$object->id,$object->user_id,'userid','');
-		}
-		else
-		{
-			if ($object->user_id)
-			{
-				$form->form_users($_SERVER['PHP_SELF'].'?rowid='.$object->id,$object->user_id,'none');
-			}
-			else print $langs->trans("NoDolibarrAccess");
-		}
-		print '</td></tr>';
-
-		print "</table>\n";
-
-		print "</div></div></div>\n";
-        print '<div style="clear:both"></div>';
-
-        dol_fiche_end();
-        
-        
-		/*
-		 * Hotbar
-		 */
-        
-		print '<div class="tabsAction">';
-		$parameters = array();
-		$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been
-		if (empty($reshook)) {
-			if ($action != 'valid' && $action != 'editlogin' && $action != 'editthirdparty')
-			{
-				// Modify
-				if ($user->rights->adherent->creer)
-				{
-					print '<div class="inline-block divButAction"><a class="butAction" href="card.php?rowid='.$id.'&action=edit">'.$langs->trans("Modify")."</a></div>";
-				}
-				else
-				{
-					print '<div class="inline-block divButAction"><font class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Modify").'</font></div>';
-				}
-	
-				// Validate
-				if ($object->statut == -1)
-				{
-					if ($user->rights->adherent->creer)
-					{
-						print '<div class="inline-block divButAction"><a class="butAction" href="card.php?rowid='.$id.'&action=valid">'.$langs->trans("Validate")."</a></div>\n";
-					}
-					else
-					{
-						print '<div class="inline-block divButAction"><font class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Validate").'</font></div>';
-					}
-				}
-	
-				// Reactivate
-				if ($object->statut == 0)
-				{
-					if ($user->rights->adherent->creer)
-					{
-						print '<div class="inline-block divButAction"><a class="butAction" href="card.php?rowid='.$id.'&action=valid">'.$langs->trans("Reenable")."</a></div>\n";
-					}
-					else
-					{
-						print '<div class="inline-block divButAction"><font class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Reenable")."</font></div>";
-					}
-				}
-	
-				// Send card by email
-				if ($user->rights->adherent->creer)
-				{
-					if ($object->statut >= 1)
-					{
-						if ($object->email) print '<div class="inline-block divButAction"><a class="butAction" href="card.php?rowid='.$object->id.'&action=sendinfo">'.$langs->trans("SendCardByMail")."</a></div>\n";
-						else print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NoEMail")).'">'.$langs->trans("SendCardByMail")."</a></div>\n";
-					}
-					else
-					{
-						print '<div class="inline-block divButAction"><font class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("ValidateBefore")).'">'.$langs->trans("SendCardByMail")."</font></div>";
-					}
-				}
-				else
-				{
-					print '<div class="inline-block divButAction"><font class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("SendCardByMail")."</font></div>";
-				}
-	
-				// Terminate
-				if ($object->statut >= 1)
-				{
-					if ($user->rights->adherent->supprimer)
-					{
-						print '<div class="inline-block divButAction"><a class="butAction" href="card.php?rowid='.$id.'&action=resign">'.$langs->trans("Resiliate")."</a></div>\n";
-					}
-					else
-					{
-						print '<div class="inline-block divButAction"><font class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Resiliate")."</font></div>";
-					}
-				}
-	
-				// Create third party
-				if (! empty($conf->societe->enabled) && ! $object->fk_soc)
-				{
-					if ($user->rights->societe->creer)
-					{
-						if ($object->statut != -1) print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&amp;action=create_thirdparty">'.$langs->trans("CreateDolibarrThirdParty").'</a></div>';
-						else print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("ValidateBefore")).'">'.$langs->trans("CreateDolibarrThirdParty").'</a></div>';
-					}
-					else
-					{
-						print '<div class="inline-block divButAction"><font class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("CreateDolibarrThirdParty")."</font></div>";
-					}
-				}
-	
-				// Create user
-				if (! $user->societe_id && ! $object->user_id)
-				{
-					if ($user->rights->user->user->creer)
-					{
-						if ($object->statut != -1) print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&amp;action=create_user">'.$langs->trans("CreateDolibarrLogin").'</a></div>';
-						else print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("ValidateBefore")).'">'.$langs->trans("CreateDolibarrLogin").'</a></div>';
-					}
-					else
-					{
-						print '<div class="inline-block divButAction"><font class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("CreateDolibarrLogin")."</font></div>";
-					}
-				}
-	
-				// Delete
-				if ($user->rights->adherent->supprimer)
-				{
-					print '<div class="inline-block divButAction"><a class="butActionDelete" href="card.php?rowid='.$object->id.'&action=delete">'.$langs->trans("Delete")."</a></div>\n";
-				}
-				else
-				{
-					print '<div class="inline-block divButAction"><font class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Delete")."</font></div>";
-				}
-	
-				// Action SPIP
-				if (! empty($conf->mailmanspip->enabled) && ! empty($conf->global->ADHERENT_USE_SPIP))
-				{
-					$isinspip = $mailmanspip->is_in_spip($object);
-	
-					if ($isinspip == 1)
-					{
-						print '<div class="inline-block divButAction"><a class="butAction" href="card.php?rowid='.$object->id.'&action=del_spip">'.$langs->trans("DeleteIntoSpip")."</a></div>\n";
-					}
-					if ($isinspip == 0)
-					{
-						print '<div class="inline-block divButAction"><a class="butAction" href="card.php?rowid='.$object->id.'&action=add_spip">'.$langs->trans("AddIntoSpip")."</a></div>\n";
-					}
-				}
-	
-			}
-		}
-		print '</div>';
-
-		if ($isinspip == -1)
-		{
-			print '<br><br><font class="error">'.$langs->trans('SPIPConnectionFailed').': '.$mailmanspip->error.'</font>';
-		}
-
-		
-		
-		print '<div class="fichecenter"><div class="fichehalfleft">';
-		print '<a name="builddoc"></a>'; // ancre
-		
-		// Documents generes
-		$filename = dol_sanitizeFileName($object->ref);
-		//$filename =  'tmp_cards.php';
-		//$filedir = $conf->adherent->dir_output . '/' . get_exdir($object->id, 2, 0, 0, $object, 'member') . dol_sanitizeFileName($object->ref);
-		$filedir = $conf->adherent->dir_output . '/' . get_exdir(0, 0, 0, 0, $object, 'member');
-		$urlsource = $_SERVER['PHP_SELF'] . '?id=' . $object->id;
-		$genallowed = $user->rights->adherent->creer;
-		$delallowed = $user->rights->adherent->supprimer;
-
-		print $formfile->showdocuments('member', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', '', '', $object->default_lang, '', $object);
-		$somethingshown = $formfile->numoffiles;
-		
-		// Show links to link elements
-		//$linktoelem = $form->showLinkToObjectBlock($object, null, array('subscription'));
-		//$somethingshown = $form->showLinkedObjectBlock($object, '');
-		
-		// Show links to link elements
-		/*$linktoelem = $form->showLinkToObjectBlock($object,array('order'));
-		 if ($linktoelem) print ($somethingshown?'':'<br>').$linktoelem;
-		
-		 // Link for paypal payment
-		 /*
-		 if (! empty($conf->paypal->enabled) && $object->statut != 0) {
-		 include_once DOL_DOCUMENT_ROOT . '/paypal/lib/paypal.lib.php';
-		 print showPaypalPaymentUrl('invoice', $object->ref);
-		 }
-		 */
-		print '</div><div class="fichehalfright"><div class="ficheaddleft">';
-		
-		// List of actions on element
-        /* Already in tab Agenda/Events
-        include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
-		$formactions = new FormActions($db);
-		$somethingshown = $formactions->showactions($object, 'member', $socid);
-		*/
-		print '</div></div></div>';		
-		
-	}
-}
-
-llxFooter();
-
-$db->close();
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 8462cdc76ff..30e1579c33e 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -615,19 +615,20 @@ function dol_buildpath($path, $type=0)
 }
 
 /**
- *	Create a clone of instance of object (new instance with same properties)
- * 	This function works for both PHP4 and PHP5
+ *	Create a clone of instance of object (new instance with same value for properties)
+ *  Property that are reference are also new object (true clone)
  *
  * 	@param	object	$object		Object to clone
  *	@return object				Object clone
- *  @deprecated Dolibarr no longer supports PHP4, use PHP5 native clone construct
  *  @see https://php.net/manual/language.oop5.cloning.php
  */
 function dol_clone($object)
 {
-	dol_syslog(__FUNCTION__ . " is deprecated", LOG_WARNING);
+	//dol_syslog(__FUNCTION__ . " is deprecated", LOG_WARNING);
 
-	$myclone = clone $object;
+	//$myclone = clone $object;                    // PHP clone is a shallow copy only, not a real clone, so properties of references will keep references (refer to the same target/variable
+	$myclone=unserialize(serialize($object));
+	    
 	return $myclone;
 }
 
@@ -2469,7 +2470,7 @@ function dol_trunc($string,$size=40,$trunc='right',$stringencoding='UTF-8',$nodo
 	if ($trunc == 'right')
 	{
 		$newstring=dol_textishtml($string)?dol_string_nohtmltag($string,1):$string;
-		if (dol_strlen($newstring,$stringencoding) > ($size+($nodot?0:1)))
+        if (dol_strlen($newstring,$stringencoding) > ($size+($nodot?0:1)))
 		return dol_substr($newstring,0,$size,$stringencoding).($nodot?'':'...');
 		else
 		return $string;
diff --git a/test/phpunit/AllTests.php b/test/phpunit/AllTests.php
index de8cc397cf4..a417824867b 100644
--- a/test/phpunit/AllTests.php
+++ b/test/phpunit/AllTests.php
@@ -121,7 +121,7 @@ class AllTests
         $suite->addTestSuite('BuildDocTest');
         require_once dirname(__FILE__).'/CMailFileTest.php';
         $suite->addTestSuite('CMailFileTest');
-
+        
         require_once dirname(__FILE__).'/CommonObjectTest.php';
         $suite->addTestSuite('CommonObjectTest');
 
diff --git a/test/phpunit/FilesLibTest.php b/test/phpunit/FilesLibTest.php
index d1a5f48ae8d..c0a4ce845a9 100644
--- a/test/phpunit/FilesLibTest.php
+++ b/test/phpunit/FilesLibTest.php
@@ -431,10 +431,17 @@ class FilesLibTest extends PHPUnit_Framework_TestCase
         $user=$this->savuser;
         $langs=$this->savlangs;
         $db=$this->savdb;
-    
+        
+        
         //$dummyuser=new User($db);
         //$result=restrictedArea($dummyuser,'societe');
 
+        // We save user properties
+        $savpermlire = $user->rights->facture->lire;
+        $savpermcreer = $user->rights->facture->creer;
+        
+        
+		// Check access to SPECIMEN
         $user->rights->facture->lire = 0;
         $user->rights->facture->creer = 0;
         $filename='SPECIMEN.pdf';             // Filename relative to module part
@@ -473,6 +480,11 @@ class FilesLibTest extends PHPUnit_Framework_TestCase
         $filename='FA010101/FA010101.pdf';    // Filename relative to module part
         $result=dol_check_secure_access_document('facture', $filename, 0, '', '', 'write');
         $this->assertEquals(0,$result['accessallowed']);
+        
+        
+        // We restore user properties
+        $user->rights->facture->lire = $savpermlire;
+        $user->rights->facture->creer = $savpermcreer;
     }    
 
 }
diff --git a/test/phpunit/NumberingModulesTest.php b/test/phpunit/NumberingModulesTest.php
index d7f3eaf611c..401b7ce0058 100644
--- a/test/phpunit/NumberingModulesTest.php
+++ b/test/phpunit/NumberingModulesTest.php
@@ -128,7 +128,7 @@ class NumberingModulesTest extends PHPUnit_Framework_TestCase
 		$user=$this->savuser;
 		$langs=$this->savlangs;
 		$db=$this->savdb;
-
+		
 		require_once dirname(__FILE__).'/../../htdocs/compta/facture/class/facture.class.php';
 		require_once dirname(__FILE__).'/../../htdocs/core/modules/facture/mod_facture_mercure.php';
 
@@ -138,8 +138,8 @@ class NumberingModulesTest extends PHPUnit_Framework_TestCase
 		$conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}-{0000}';
 		$conf->global->FACTURE_MERCURE_MASK_INVOICE='{yyyy}-{0000}';
         $conf->global->INVOICE_CAN_ALWAYS_BE_REMOVED=0;
-        
-		$localobject=new Facture($this->savdb);
+
+        $localobject=new Facture($this->savdb);
 		$localobject->initAsSpecimen();
 		$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1915);	// we use year 1915 to be sure to not have existing invoice for this year
 		$numbering=new mod_facture_mercure();
@@ -154,10 +154,6 @@ class NumberingModulesTest extends PHPUnit_Framework_TestCase
 		$result=$localobject->is_erasable();
 		print __METHOD__." is_erasable=".$result."\n";
 		$this->assertEquals(1, $result, 'Test for is_erasable, 1st invoice');						    // Can be deleted
-
-		$out=file_get_contents(DOL_DATA_ROOT.'/dolibarr.log');
-		print $out;
-		
 		$localobject2=new Facture($this->savdb);
 		$localobject2->initAsSpecimen();
 		$localobject2->date=dol_mktime(12, 0, 0, 1, 1, 1916);	// we use following year for second invoice (there is no reset into mask)

From dd5976066a6fe052f13d80238347a0d8ee7c0756 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 22 May 2017 02:04:43 +0200
Subject: [PATCH 446/505] Fix travis

---
 test/phpunit/AdherentTest.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/phpunit/AdherentTest.php b/test/phpunit/AdherentTest.php
index b998c346b7b..5db9808c9ab 100644
--- a/test/phpunit/AdherentTest.php
+++ b/test/phpunit/AdherentTest.php
@@ -322,9 +322,10 @@ class AdherentTest extends PHPUnit_Framework_TestCase
                     '%ADDRESS%,%ZIP%,%TOWN%,%COUNTRY%,%EMAIL%,%BIRTH%,%PHOTO%,%LOGIN%,%PASSWORD%,%PRENOM%,'.
                     '%NOM%,%SOCIETE%,%ADDRESS%,%ZIP%,%TOWN%,%COUNTRY%';
 
+        // If option to store clear password has been set, we get 'dolibspec' into PASSWORD field.
         $expected = DOL_MAIN_URL_ROOT.','.$localobject->id.',,New firstname,New name,New firstname New name,'.
                     'New company,New address,New zip,New town,Belgium,newemail@newemail.com,'.dol_print_date($localobject->birth,'day').',,'.
-                    'newlogin,,New firstname,New name,New company,New address,New zip,New town,Belgium';
+                    'newlogin,dolibspec,New firstname,New name,New company,New address,New zip,New town,Belgium';
 
         $result = $localobject->makeSubstitution($template);
         print __METHOD__." result=".$result."\n";

From 9bc60b8aa5d738d99ebcec0e25ff72d97aba8e20 Mon Sep 17 00:00:00 2001
From: phf <phf@atm-consulting.fr>
Date: Mon, 22 May 2017 09:26:10 +0200
Subject: [PATCH 447/505] Fix missing column ref on migration for inventory

---
 htdocs/install/mysql/migration/5.0.0-6.0.0.sql | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index 0bd68ddfcfb..67ad5017999 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -326,3 +326,4 @@ ALTER TABLE llx_facture ADD COLUMN fk_fac_rec_source integer;
 DELETE from llx_c_actioncomm where code in ('AC_PROP','AC_COM','AC_FAC','AC_SHIP','AC_SUP_ORD','AC_SUP_INV') AND id NOT IN (SELECT DISTINCT fk_action FROM llx_actioncomm);
 
 
+ALTER TABLE llx_inventory ADD COLUMN ref varchar(48);
\ No newline at end of file

From f72ac3cf456d11b66c99bb38100ee3ab89e94fa0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 22 May 2017 10:07:29 +0200
Subject: [PATCH 448/505] Fix php7 compatibility

---
 htdocs/api/class/api_documents.class.php | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/htdocs/api/class/api_documents.class.php b/htdocs/api/class/api_documents.class.php
index 9794dad4a12..eb6380a19e4 100644
--- a/htdocs/api/class/api_documents.class.php
+++ b/htdocs/api/class/api_documents.class.php
@@ -49,20 +49,23 @@ class Documents extends DolibarrApi
         $this->db = $db;
     }
 
+
     /**
      * Return a document
      *
      * @param   string  $module_part    Module part for file
      * @param   string  $filename       File name
-     *
+     * 
+     * @url	GET {module_part}/{filename}
+     * 
      * @return  array                   Array with data of file
      * @throws RestException
      */
-     public function index($module_part, $filename) {
-            return array('note'=>'FeatureNotYetAvailable');
-     }
-
-
+    public function get($module_part, $filename) {
+        return array('note'=>'FeatureNotYetAvailable');
+    }
+     
+     
     /**
      * Push a file. 
      * Test sample 1: { "filename": "mynewfile.txt", "modulepart": "facture", "ref": "FA1701-001", "subdir": "", "filecontent": "content text", "fileencoding": "", "overwriteifexists": "0" }.

From 8301e24261a5c5660ed2d018dbe93c6f2028c7f3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 22 May 2017 10:40:24 +0200
Subject: [PATCH 449/505] PHP7 compatibility

---
 htdocs/api/class/api.class.php                |  3 +-
 htdocs/api/class/api_documents.class.php      | 38 ++++++++++++-------
 .../bank/class/api_bankaccounts.class.php     |  3 +-
 3 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/htdocs/api/class/api.class.php b/htdocs/api/class/api.class.php
index 082e6188379..190e24d326c 100644
--- a/htdocs/api/class/api.class.php
+++ b/htdocs/api/class/api.class.php
@@ -66,6 +66,7 @@ class DolibarrApi
      *
      * @return array
      */
+    /* Disabled, most APIs does not share same signature for method index 
     function index()
     {
         return array(
@@ -74,7 +75,7 @@ class DolibarrApi
                 'message' => __class__.' is up and running!'
             )
         );
-    }
+    }*/
 
 
     /**
diff --git a/htdocs/api/class/api_documents.class.php b/htdocs/api/class/api_documents.class.php
index eb6380a19e4..e26486981fa 100644
--- a/htdocs/api/class/api_documents.class.php
+++ b/htdocs/api/class/api_documents.class.php
@@ -36,8 +36,7 @@ class Documents extends DolibarrApi
      * @var array   $DOCUMENT_FIELDS     Mandatory fields, checked when create and update object
      */
     static $DOCUMENT_FIELDS = array(
-        'modulepart',
-        'filename'
+        'modulepart'
     );
 
     /**
@@ -49,23 +48,36 @@ class Documents extends DolibarrApi
         $this->db = $db;
     }
 
-
+    
     /**
-     * Return a document
+     * Return list of documents.
+     *
+     * @param   string  $module_part    Name of module or area concerned by file download ('facture', ...)
+     * @param   string  $ref            Reference of object (This will define subdir automatically)
+     * @param   string  $subdir         Subdirectory (Only if ref not provided)
+     * @return  array                   List of documents
      *
-     * @param   string  $module_part    Module part for file
-     * @param   string  $filename       File name
-     * 
-     * @url	GET {module_part}/{filename}
-     * 
-     * @return  array                   Array with data of file
      * @throws RestException
      */
-    public function get($module_part, $filename) {
+    public function index($module_part, $ref='', $subdir='') {
         return array('note'=>'FeatureNotYetAvailable');
     }
-     
-     
+    
+    
+    /**
+     * Return a document.
+     *
+     * @param   int         $id          ID of document
+     * @return  array                    Array with data of file
+     *
+     * @throws RestException
+     */
+    /*
+    public function get($id) {
+        return array('note'=>'xxx');
+    }*/
+    
+    
     /**
      * Push a file. 
      * Test sample 1: { "filename": "mynewfile.txt", "modulepart": "facture", "ref": "FA1701-001", "subdir": "", "filecontent": "content text", "fileencoding": "", "overwriteifexists": "0" }.
diff --git a/htdocs/compta/bank/class/api_bankaccounts.class.php b/htdocs/compta/bank/class/api_bankaccounts.class.php
index 7eaf673c2e7..10994d7d525 100644
--- a/htdocs/compta/bank/class/api_bankaccounts.class.php
+++ b/htdocs/compta/bank/class/api_bankaccounts.class.php
@@ -98,7 +98,8 @@ class BankAccounts extends DolibarrApi
 
         if ($result) {
             $num = $this->db->num_rows($result);
-            for ($i = 0; $i < min($num, ($limit <= 0 ? $num : $limit)); $i++) {
+            $minnum = min($num, ($limit <= 0 ? $num : $limit));
+            for ($i = 0; $i < $minnum; $i++) {
                 $obj = $this->db->fetch_object($result);
                 $account = new Account($this->db);
                 if ($account->fetch($obj->rowid) > 0) {

From f5e29d6c86ad885301fa96528baa4c853269e3d0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 22 May 2017 10:45:02 +0200
Subject: [PATCH 450/505] Fix phpcs warning

---
 htdocs/categories/class/api_categories.class.php            | 6 ++++--
 htdocs/categories/class/api_deprecated_category.class.php   | 6 ++++--
 htdocs/comm/action/class/api_agendaevents.class.php         | 3 ++-
 htdocs/comm/propal/class/api_proposals.class.php            | 3 ++-
 htdocs/commande/class/api_deprecated_commande.class.php     | 3 ++-
 htdocs/commande/class/api_orders.class.php                  | 3 ++-
 htdocs/compta/bank/class/api_bankaccounts.class.php         | 4 ++--
 .../compta/facture/class/api_deprecated_invoice.class.php   | 3 ++-
 htdocs/compta/facture/class/api_invoices.class.php          | 3 ++-
 htdocs/expensereport/class/api_expensereports.class.php     | 3 ++-
 htdocs/fourn/class/api_supplier_invoices.class.php          | 3 ++-
 htdocs/product/class/api_deprecated_product.class.php       | 6 ++++--
 htdocs/product/class/api_products.class.php                 | 3 ++-
 htdocs/product/stock/class/api_stockmovements.class.php     | 3 ++-
 htdocs/product/stock/class/api_warehouses.class.php         | 3 ++-
 htdocs/projet/class/api_projects.class.php                  | 3 ++-
 htdocs/projet/class/api_tasks.class.php                     | 3 ++-
 htdocs/societe/class/api_contacts.class.php                 | 3 ++-
 htdocs/societe/class/api_deprecated_contact.class.php       | 3 ++-
 htdocs/societe/class/api_deprecated_thirdparty.class.php    | 3 ++-
 htdocs/societe/class/api_thirdparties.class.php             | 3 ++-
 htdocs/user/class/api_users.class.php                       | 3 ++-
 22 files changed, 50 insertions(+), 26 deletions(-)

diff --git a/htdocs/categories/class/api_categories.class.php b/htdocs/categories/class/api_categories.class.php
index a08abdfc545..fc7aca368f4 100644
--- a/htdocs/categories/class/api_categories.class.php
+++ b/htdocs/categories/class/api_categories.class.php
@@ -146,7 +146,8 @@ class Categories extends DolibarrApi
         {
         	$i=0;
             $num = $db->num_rows($result);
-            while ($i < min($num, ($limit <= 0 ? $num : $limit)))
+            $min = min($num, ($limit <= 0 ? $num : $limit));
+            while ($i < $min)
             {
                 $obj = $db->fetch_object($result);
                 $category_static = new Categorie($db);
@@ -232,7 +233,8 @@ class Categories extends DolibarrApi
         {
         	$i=0;
             $num = $db->num_rows($result);
-            while ($i < min($num, ($limit <= 0 ? $num : $limit)))
+            $min = min($num, ($limit <= 0 ? $num : $limit));
+            while ($i < $min)
             {
                 $obj = $db->fetch_object($result);
                 $category_static = new Categorie($db);
diff --git a/htdocs/categories/class/api_deprecated_category.class.php b/htdocs/categories/class/api_deprecated_category.class.php
index 271f2900502..efbcac82124 100644
--- a/htdocs/categories/class/api_deprecated_category.class.php
+++ b/htdocs/categories/class/api_deprecated_category.class.php
@@ -147,7 +147,8 @@ class CategoryApi extends DolibarrApi
         {
         	$i=0;
             $num = $db->num_rows($result);
-            while ($i < min($num, ($limit <= 0 ? $num : $limit)))
+            $min = min($num, ($limit <= 0 ? $num : $limit));
+            while ($i < $min)
             {
                 $obj = $db->fetch_object($result);
                 $category_static = new Categorie($db);
@@ -228,7 +229,8 @@ class CategoryApi extends DolibarrApi
         {
         	$i=0;
             $num = $db->num_rows($result);
-            while ($i < min($num, ($limit <= 0 ? $num : $limit)))
+            $min = min($num, ($limit <= 0 ? $num : $limit));
+            while ($i < $min)
             {
                 $obj = $db->fetch_object($result);
                 $category_static = new Categorie($db);
diff --git a/htdocs/comm/action/class/api_agendaevents.class.php b/htdocs/comm/action/class/api_agendaevents.class.php
index 5eeca63a4aa..376df238a95 100644
--- a/htdocs/comm/action/class/api_agendaevents.class.php
+++ b/htdocs/comm/action/class/api_agendaevents.class.php
@@ -147,7 +147,8 @@ class AgendaEvents extends DolibarrApi
         if ($result)
         {
             $num = $db->num_rows($result);
-            while ($i < min($num, ($limit <= 0 ? $num : $limit)))
+            $min = min($num, ($limit <= 0 ? $num : $limit));
+            while ($i < $min)
             {
                 $obj = $db->fetch_object($result);
                 $actioncomm_static = new ActionComm($db);
diff --git a/htdocs/comm/propal/class/api_proposals.class.php b/htdocs/comm/propal/class/api_proposals.class.php
index fd508b03256..190f6cdca87 100644
--- a/htdocs/comm/propal/class/api_proposals.class.php
+++ b/htdocs/comm/propal/class/api_proposals.class.php
@@ -148,7 +148,8 @@ class Proposals extends DolibarrApi
         if ($result)
         {
             $num = $db->num_rows($result);
-            while ($i < min($num, ($limit <= 0 ? $num : $limit)))
+            $min = min($num, ($limit <= 0 ? $num : $limit));
+            while ($i < $min)
             {
                 $obj = $db->fetch_object($result);
                 $propal_static = new Propal($db);
diff --git a/htdocs/commande/class/api_deprecated_commande.class.php b/htdocs/commande/class/api_deprecated_commande.class.php
index aa1584c4fed..c0b3a634825 100644
--- a/htdocs/commande/class/api_deprecated_commande.class.php
+++ b/htdocs/commande/class/api_deprecated_commande.class.php
@@ -163,7 +163,8 @@ class CommandeApi extends DolibarrApi
         {
         	$i=0;
             $num = $db->num_rows($result);
-            while ($i < min($num, ($limit <= 0 ? $num : $limit)))
+            $min = min($num, ($limit <= 0 ? $num : $limit));
+            while ($i < $min)
             {
                 $obj = $db->fetch_object($result);
                 $commande_static = new Commande($db);
diff --git a/htdocs/commande/class/api_orders.class.php b/htdocs/commande/class/api_orders.class.php
index 81a2ad79d69..1bd4e44a877 100644
--- a/htdocs/commande/class/api_orders.class.php
+++ b/htdocs/commande/class/api_orders.class.php
@@ -152,7 +152,8 @@ class Orders extends DolibarrApi
         if ($result)
         {
             $num = $db->num_rows($result);
-            while ($i < min($num, ($limit <= 0 ? $num : $limit)))
+            $min = min($num, ($limit <= 0 ? $num : $limit));
+            while ($i < $min)
             {
                 $obj = $db->fetch_object($result);
                 $commande_static = new Commande($db);
diff --git a/htdocs/compta/bank/class/api_bankaccounts.class.php b/htdocs/compta/bank/class/api_bankaccounts.class.php
index 10994d7d525..98ee2672d3b 100644
--- a/htdocs/compta/bank/class/api_bankaccounts.class.php
+++ b/htdocs/compta/bank/class/api_bankaccounts.class.php
@@ -98,8 +98,8 @@ class BankAccounts extends DolibarrApi
 
         if ($result) {
             $num = $this->db->num_rows($result);
-            $minnum = min($num, ($limit <= 0 ? $num : $limit));
-            for ($i = 0; $i < $minnum; $i++) {
+            $min = min($num, ($limit <= 0 ? $num : $limit));
+            for ($i = 0; $i < $min; $i++) {
                 $obj = $this->db->fetch_object($result);
                 $account = new Account($this->db);
                 if ($account->fetch($obj->rowid) > 0) {
diff --git a/htdocs/compta/facture/class/api_deprecated_invoice.class.php b/htdocs/compta/facture/class/api_deprecated_invoice.class.php
index b638a46b920..36aa232de9e 100644
--- a/htdocs/compta/facture/class/api_deprecated_invoice.class.php
+++ b/htdocs/compta/facture/class/api_deprecated_invoice.class.php
@@ -161,7 +161,8 @@ class InvoiceApi extends DolibarrApi
         {
             $i=0;
             $num = $db->num_rows($result);
-            while ($i < min($num, ($limit <= 0 ? $num : $limit)))
+            $min = min($num, ($limit <= 0 ? $num : $limit));
+            while ($i < $min)
             {
                 $obj = $db->fetch_object($result);
                 $invoice_static = new Facture($db);
diff --git a/htdocs/compta/facture/class/api_invoices.class.php b/htdocs/compta/facture/class/api_invoices.class.php
index 4efc997cc42..e2842df0530 100644
--- a/htdocs/compta/facture/class/api_invoices.class.php
+++ b/htdocs/compta/facture/class/api_invoices.class.php
@@ -155,7 +155,8 @@ class Invoices extends DolibarrApi
         {
             $i=0;
             $num = $db->num_rows($result);
-            while ($i < min($num, ($limit <= 0 ? $num : $limit)))
+            $min = min($num, ($limit <= 0 ? $num : $limit));
+            while ($i < $min)
             {
                 $obj = $db->fetch_object($result);
                 $invoice_static = new Facture($db);
diff --git a/htdocs/expensereport/class/api_expensereports.class.php b/htdocs/expensereport/class/api_expensereports.class.php
index 03ecb51de79..763b550d34e 100644
--- a/htdocs/expensereport/class/api_expensereports.class.php
+++ b/htdocs/expensereport/class/api_expensereports.class.php
@@ -134,7 +134,8 @@ class ExpenseReports extends DolibarrApi
         if ($result)
         {
             $num = $db->num_rows($result);
-            while ($i < min($num, ($limit <= 0 ? $num : $limit)))
+            $min = min($num, ($limit <= 0 ? $num : $limit));
+            while ($i < $min)
             {
                 $obj = $db->fetch_object($result);
                 $expensereport_static = new ExpenseReport($db);
diff --git a/htdocs/fourn/class/api_supplier_invoices.class.php b/htdocs/fourn/class/api_supplier_invoices.class.php
index 3bf5c3f5934..1eb1872126c 100644
--- a/htdocs/fourn/class/api_supplier_invoices.class.php
+++ b/htdocs/fourn/class/api_supplier_invoices.class.php
@@ -155,7 +155,8 @@ class SupplierInvoices extends DolibarrApi
         {
             $i = 0;
             $num = $db->num_rows($result);
-            while ($i < min($num, ($limit <= 0 ? $num : $limit)))
+            $min = min($num, ($limit <= 0 ? $num : $limit));
+            while ($i < $min)
             {
                 $obj = $db->fetch_object($result);
                 $invoice_static = new FactureFournisseur($db);
diff --git a/htdocs/product/class/api_deprecated_product.class.php b/htdocs/product/class/api_deprecated_product.class.php
index e2ee97e0100..e33c7dd3e32 100644
--- a/htdocs/product/class/api_deprecated_product.class.php
+++ b/htdocs/product/class/api_deprecated_product.class.php
@@ -149,7 +149,8 @@ class ProductApi extends DolibarrApi
         {
         	$i=0;
             $num = $db->num_rows($result);
-            while ($i < min($num, ($limit <= 0 ? $num : $limit)))
+            $min = min($num, ($limit <= 0 ? $num : $limit));
+            while ($i < $min)
             {
                 $obj = $db->fetch_object($result);
                 $product_static = new Product($db);
@@ -235,7 +236,8 @@ class ProductApi extends DolibarrApi
         {
         	$i=0;
             $num = $db->num_rows($result);
-            while ($i < min($num, ($limit <= 0 ? $num : $limit)))
+            $min = min($num, ($limit <= 0 ? $num : $limit));
+            while ($i < $min)
             {
                 $obj = $db->fetch_object($result);
                 $product_static = new Product($db);
diff --git a/htdocs/product/class/api_products.class.php b/htdocs/product/class/api_products.class.php
index 14885532952..a733a554fd5 100644
--- a/htdocs/product/class/api_products.class.php
+++ b/htdocs/product/class/api_products.class.php
@@ -146,7 +146,8 @@ class Products extends DolibarrApi
         if ($result)
         {
             $num = $db->num_rows($result);
-            while ($i < min($num, ($limit <= 0 ? $num : $limit)))
+            $min = min($num, ($limit <= 0 ? $num : $limit));
+            while ($i < $min)
             {
                 $obj = $db->fetch_object($result);
                 $product_static = new Product($db);
diff --git a/htdocs/product/stock/class/api_stockmovements.class.php b/htdocs/product/stock/class/api_stockmovements.class.php
index 677d34d9fcb..79e17749991 100644
--- a/htdocs/product/stock/class/api_stockmovements.class.php
+++ b/htdocs/product/stock/class/api_stockmovements.class.php
@@ -133,7 +133,8 @@ class StockMovements extends DolibarrApi
         {
         	$i=0;
             $num = $db->num_rows($result);
-            while ($i < min($num, ($limit <= 0 ? $num : $limit)))
+            $min = min($num, ($limit <= 0 ? $num : $limit));
+            while ($i < $min)
             {
                 $obj = $db->fetch_object($result);
                 $stockmovement_static = new MouvementStock($db);
diff --git a/htdocs/product/stock/class/api_warehouses.class.php b/htdocs/product/stock/class/api_warehouses.class.php
index d09c7bc527f..d50f590c30c 100644
--- a/htdocs/product/stock/class/api_warehouses.class.php
+++ b/htdocs/product/stock/class/api_warehouses.class.php
@@ -131,7 +131,8 @@ class Warehouses extends DolibarrApi
         {
         	$i=0;
             $num = $db->num_rows($result);
-            while ($i < min($num, ($limit <= 0 ? $num : $limit)))
+            $min = min($num, ($limit <= 0 ? $num : $limit));
+            while ($i < $min)
             {
                 $obj = $db->fetch_object($result);
                 $warehouse_static = new Entrepot($db);
diff --git a/htdocs/projet/class/api_projects.class.php b/htdocs/projet/class/api_projects.class.php
index 5bb7e8dfc7e..0f4f85c05af 100644
--- a/htdocs/projet/class/api_projects.class.php
+++ b/htdocs/projet/class/api_projects.class.php
@@ -153,7 +153,8 @@ class Projects extends DolibarrApi
         if ($result)
         {
             $num = $db->num_rows($result);
-            while ($i < min($num, ($limit <= 0 ? $num : $limit)))
+            $min = min($num, ($limit <= 0 ? $num : $limit));
+            while ($i < $min)
             {
                 $obj = $db->fetch_object($result);
                 $project_static = new Project($db);
diff --git a/htdocs/projet/class/api_tasks.class.php b/htdocs/projet/class/api_tasks.class.php
index ad72a36fa45..d2d7b81d865 100644
--- a/htdocs/projet/class/api_tasks.class.php
+++ b/htdocs/projet/class/api_tasks.class.php
@@ -160,7 +160,8 @@ class Tasks extends DolibarrApi
         if ($result)
         {
             $num = $db->num_rows($result);
-            while ($i < min($num, ($limit <= 0 ? $num : $limit)))
+            $min = min($num, ($limit <= 0 ? $num : $limit));
+            while ($i < $min)
             {
                 $obj = $db->fetch_object($result);
                 $task_static = new Task($db);
diff --git a/htdocs/societe/class/api_contacts.class.php b/htdocs/societe/class/api_contacts.class.php
index de50799e430..02c1410fcbf 100644
--- a/htdocs/societe/class/api_contacts.class.php
+++ b/htdocs/societe/class/api_contacts.class.php
@@ -153,7 +153,8 @@ class Contacts extends DolibarrApi
 		if ($result)
 		{
 			$num = $db->num_rows($result);
-			while ($i < min($num, ($limit <= 0 ? $num : $limit)))
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			while ($i < $min)
 			{
 				$obj = $db->fetch_object($result);
 				$contact_static = new Contact($db);
diff --git a/htdocs/societe/class/api_deprecated_contact.class.php b/htdocs/societe/class/api_deprecated_contact.class.php
index 196a1386b5d..8cb61fa3eb0 100644
--- a/htdocs/societe/class/api_deprecated_contact.class.php
+++ b/htdocs/societe/class/api_deprecated_contact.class.php
@@ -167,7 +167,8 @@ class ContactApi extends DolibarrApi
 		{
 			$i = 0;
 		    $num = $db->num_rows($result);
-			while ($i < min($num, ($limit <= 0 ? $num : $limit)))
+		    $min = min($num, ($limit <= 0 ? $num : $limit));
+			while ($i < $min)
 			{
 				$obj = $db->fetch_object($result);
 				$contact_static = new Contact($db);
diff --git a/htdocs/societe/class/api_deprecated_thirdparty.class.php b/htdocs/societe/class/api_deprecated_thirdparty.class.php
index 96a2ebac321..a8146f4cca6 100644
--- a/htdocs/societe/class/api_deprecated_thirdparty.class.php
+++ b/htdocs/societe/class/api_deprecated_thirdparty.class.php
@@ -214,7 +214,8 @@ class ThirdpartyApi extends DolibarrApi
         {
 			$i = 0;
             $num = $db->num_rows($result);
-            while ($i < min($num, ($limit <= 0 ? $num : $limit)))
+            $min = min($num, ($limit <= 0 ? $num : $limit));
+            while ($i < $min)
             {
                 $obj = $db->fetch_object($result);
                 $soc_static = new Societe($db);
diff --git a/htdocs/societe/class/api_thirdparties.class.php b/htdocs/societe/class/api_thirdparties.class.php
index f8e96d82e47..df7965d6d8c 100644
--- a/htdocs/societe/class/api_thirdparties.class.php
+++ b/htdocs/societe/class/api_thirdparties.class.php
@@ -156,7 +156,8 @@ class Thirdparties extends DolibarrApi
         if ($result)
         {
             $num = $db->num_rows($result);
-            while ($i < min($num, ($limit <= 0 ? $num : $limit)))
+            $min = min($num, ($limit <= 0 ? $num : $limit));
+            while ($i < $min)
             {
                 $obj = $db->fetch_object($result);
                 $soc_static = new Societe($db);
diff --git a/htdocs/user/class/api_users.class.php b/htdocs/user/class/api_users.class.php
index 80065f8d8d2..aa2569fb3ca 100644
--- a/htdocs/user/class/api_users.class.php
+++ b/htdocs/user/class/api_users.class.php
@@ -106,7 +106,8 @@ class Users extends DolibarrApi
 	    if ($result)
 	    {
 	        $num = $db->num_rows($result);
-	        while ($i < min($num, ($limit <= 0 ? $num : $limit)))
+	        $min = min($num, ($limit <= 0 ? $num : $limit));
+	        while ($i < $min)
 	        {
 	            $obj = $db->fetch_object($result);
 	            $user_static = new User($db);

From 82560b912614a139b60ab0e6d9168d123d213478 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 22 May 2017 10:58:20 +0200
Subject: [PATCH 451/505] Look and feel v6

---
 htdocs/adherents/card.php         | 2 +-
 htdocs/adherents/subscription.php | 2 +-
 htdocs/langs/en_US/main.lang      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php
index 270430c899f..1234f75e059 100644
--- a/htdocs/adherents/card.php
+++ b/htdocs/adherents/card.php
@@ -1273,7 +1273,7 @@ else
 		 */
 		$head = member_prepare_head($object);
 
-		dol_fiche_head($head, 'general', $langs->trans("Member"), 0, 'user');
+		dol_fiche_head($head, 'general', $langs->trans("Member"), -1, 'user');
 
 		// Confirm create user
 		if ($action == 'create_user')
diff --git a/htdocs/adherents/subscription.php b/htdocs/adherents/subscription.php
index 658cdfee323..1874a0b37a7 100644
--- a/htdocs/adherents/subscription.php
+++ b/htdocs/adherents/subscription.php
@@ -578,7 +578,7 @@ if ($rowid > 0)
     print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
     print '<input type="hidden" name="rowid" value="'.$object->id.'">';
 
-    dol_fiche_head($head, 'subscription', $langs->trans("Member"), 0, 'user');
+    dol_fiche_head($head, 'subscription', $langs->trans("Member"), -1, 'user');
 
     $linkback = '<a href="'.DOL_URL_ROOT.'/adherents/list.php">'.$langs->trans("BackToList").'</a>';
     
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 01aa5537c13..77b5af78f81 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -762,7 +762,7 @@ Calendar=Calendar
 GroupBy=Group by...
 ViewFlatList=View flat list
 RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>. 
+SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a>. 
 DirectDownloadLink=Direct download link
 Download=Download
 ActualizeCurrency=Update currency rate

From 1a8884bbbee037f128875d5d138a98571b0be2f9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 22 May 2017 15:20:52 +0200
Subject: [PATCH 452/505] NEW Can filter on year and product tags on the
 product statistic page

---
 htdocs/categories/class/categorie.class.php   |  26 +-
 htdocs/core/class/html.form.class.php         |   2 +-
 htdocs/langs/en_US/other.lang                 |  24 +-
 htdocs/product/ajax/products.php              |   4 +-
 htdocs/product/card.php                       |   3 +-
 htdocs/product/class/product.class.php        |  57 +-
 htdocs/product/composition/card.php           |  81 ++-
 htdocs/product/list.php                       |  68 +-
 htdocs/product/stats/card.php                 | 631 +++++++++---------
 htdocs/product/stats/commande.php             |   2 +-
 htdocs/product/stats/commande_fournisseur.php |   2 +-
 htdocs/product/stats/contrat.php              |   2 +-
 htdocs/product/stats/facture.php              |   2 +-
 htdocs/product/stats/facture_fournisseur.php  |   2 +-
 htdocs/product/stats/propal.php               |   2 +-
 15 files changed, 500 insertions(+), 408 deletions(-)

diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index 518c3faa683..142cc22fe75 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -792,11 +792,12 @@ class Categorie extends CommonObject
 	/**
 	 * Return list of fetched instance of elements having this category
 	 *
-	 * @param   string $type Type of category ('customer', 'supplier', 'contact', 'product', 'member')
-	 *
-	 * @return  mixed        -1 if KO, array of instance of object if OK
+	 * @param   string     $type       Type of category ('customer', 'supplier', 'contact', 'product', 'member')
+	 * @param   int        $onlyids    Return only ids of objects (consume less memory)
+	 * @return  mixed                  -1 if KO, array of instance of object if OK
+	 * @see containsObject
 	 */
-	function getObjectsInCateg($type)
+	function getObjectsInCateg($type, $onlyids=0)
 	{
 		$objs = array();
 
@@ -813,10 +814,18 @@ class Categorie extends CommonObject
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-			while ($rec = $this->db->fetch_array($resql)) {
-				$obj = new $this->MAP_OBJ_CLASS[$type]( $this->db );
-				$obj->fetch( $rec['fk_' . $this->MAP_CAT_FK[$type]]);
-				$objs[] = $obj;
+			while ($rec = $this->db->fetch_array($resql)) 
+			{
+			    if ($onlyids)
+			    {
+			        $objs[] = $rec['fk_' . $this->MAP_CAT_FK[$type]];
+			    }
+			    else
+			    {
+				    $obj = new $this->MAP_OBJ_CLASS[$type]( $this->db );
+				    $obj->fetch( $rec['fk_' . $this->MAP_CAT_FK[$type]]);
+				    $objs[] = $obj;
+			    }
 			}
 			return $objs;
 		}
@@ -834,6 +843,7 @@ class Categorie extends CommonObject
 	 * @param   int    $object_id id of the object to search
 	 *
 	 * @return  int                        number of occurrences
+	 * @see getObjectsInCateg
 	 */
 	function containsObject($type, $object_id )
 	{
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index f58e96087b8..561504f7845 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -4783,7 +4783,7 @@ class Form
                 {
                     $retstring.='<select'.($disabled?' disabled':'').' class="flat valignmiddle maxwidth75imp" id="'.$prefix.'year" name="'.$prefix.'year">';
 
-                    for ($year = $syear - 5; $year < $syear + 10 ; $year++)
+                    for ($year = $syear - 10; $year < $syear + 10 ; $year++)
                     {
                         $retstring.='<option value="'.$year.'"'.($year == $syear ? ' selected':'').'>'.$year.'</option>';
                     }
diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang
index 11a09af3373..02fa209c340 100644
--- a/htdocs/langs/en_US/other.lang
+++ b/htdocs/langs/en_US/other.lang
@@ -160,18 +160,18 @@ ProfIdShortDesc=<b>Prof Id %s</b> is an information depending on third party cou
 DolibarrDemo=Dolibarr ERP/CRM demo
 StatsByNumberOfUnits=Statistics in number of products/services units
 StatsByNumberOfEntities=Statistics in number of referring entities
-NumberOfProposals=Number of proposals in past 12 months
-NumberOfCustomerOrders=Number of customer orders in past 12 months
-NumberOfCustomerInvoices=Number of customer invoices in past 12 months
-NumberOfSupplierProposals=Number of supplier proposals in past 12 months
-NumberOfSupplierOrders=Number of supplier orders in past 12 months
-NumberOfSupplierInvoices=Number of supplier invoices in past 12 months
-NumberOfUnitsProposals=Number of units on proposals in past 12 months
-NumberOfUnitsCustomerOrders=Number of units on customer orders in past 12 months
-NumberOfUnitsCustomerInvoices=Number of units on customer invoices in past 12 months
-NumberOfUnitsSupplierProposals=Number of units on supplier proposals in past 12 months
-NumberOfUnitsSupplierOrders=Number of units on supplier orders in past 12 months
-NumberOfUnitsSupplierInvoices=Number of units on supplier invoices in past 12 months
+NumberOfProposals=Number of proposals
+NumberOfCustomerOrders=Number of customer orders
+NumberOfCustomerInvoices=Number of customer invoices
+NumberOfSupplierProposals=Number of supplier proposals
+NumberOfSupplierOrders=Number of supplier orders
+NumberOfSupplierInvoices=Number of supplier invoices
+NumberOfUnitsProposals=Number of units on proposals
+NumberOfUnitsCustomerOrders=Number of units on customer orders
+NumberOfUnitsCustomerInvoices=Number of units on customer invoices
+NumberOfUnitsSupplierProposals=Number of units on supplier proposals
+NumberOfUnitsSupplierOrders=Number of units on supplier orders
+NumberOfUnitsSupplierInvoices=Number of units on supplier invoices
 EMailTextInterventionAddedContact=A newintervention %s has been assigned to you.
 EMailTextInterventionValidated=The intervention %s has been validated.
 EMailTextInvoiceValidated=The invoice %s has been validated.
diff --git a/htdocs/product/ajax/products.php b/htdocs/product/ajax/products.php
index 0510299fbd7..8867011101b 100644
--- a/htdocs/product/ajax/products.php
+++ b/htdocs/product/ajax/products.php
@@ -178,11 +178,11 @@ else
 
 	$idprod = (! empty($match[0]) ? $match[0] : '');
 	
-	if (! GETPOST($htmlname) && ! GETPOST($idprod))
+	if (! $htmlname && (! $idprod || ! GETPOST($idprod,'alpha')))
 		return;
 
 		// When used from jQuery, the search term is added as GET param "term".
-	$searchkey = (GETPOST($idprod) ? GETPOST($idprod) : (GETPOST($htmlname) ? GETPOST($htmlname) : ''));
+	$searchkey = (($idprod && GETPOST($idprod,'alpha')) ? GETPOST($idprod,'alpha') :  (GETPOST($htmlname, 'alpha') ? GETPOST($htmlname, 'alpha') : ''));
 
 	$form = new Form($db);
 	if (empty($mode) || $mode == 1) {  // mode=1: customer
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 71f7cd8e7f6..7cd86404afa 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -1448,7 +1448,8 @@ else
 		    $head=product_prepare_head($object);
             $titre=$langs->trans("CardProduct".$object->type);
             $picto=($object->type== Product::TYPE_SERVICE?'service':'product');
-            dol_fiche_head($head, 'card', $titre, 0, $picto);
+            
+            dol_fiche_head($head, 'card', $titre, -1, $picto);
 
             $linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?type='.$object->type.'">'.$langs->trans("BackToList").'</a>';
             $object->next_prev_filter=" fk_product_type = ".$object->type;
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 1225eb82696..d866e3ec2ae 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -2459,9 +2459,10 @@ class Product extends CommonObject
 	 *
 	 *  @param		string	$sql        Request to execute
 	 *  @param		string	$mode		'byunit'=number of unit, 'bynumber'=nb of entities
+	 *  @param      int     $year       Year (0=current year)
 	 *  @return   	array       		<0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
 	 */
-	function _get_stats($sql,$mode)
+	function _get_stats($sql, $mode, $year=0)
 	{
 		$resql = $this->db->query($sql);
 		if ($resql)
@@ -2482,8 +2483,15 @@ class Product extends CommonObject
 			return -1;
 		}
 
-		$year = strftime('%Y',time());
-		$month = strftime('%m',time());
+		if (empty($year)) 
+		{
+		    $year = strftime('%Y',time());
+		    $month = strftime('%m',time());
+		}
+		else
+		{
+		    $month=12;    // We imagine we are at end of year, so we get last 12 month before, so all correct year.
+		}
 		$result = array();
 
 		for ($j = 0 ; $j < 12 ; $j++)
@@ -2516,9 +2524,11 @@ class Product extends CommonObject
 	 *  @param  	int		$socid                   Limit count on a particular third party id
 	 *  @param		string	$mode		             'byunit'=number of unit, 'bynumber'=nb of entities
 	 *  @param      int     $filteronproducttype     0=To filter on product only, 1=To filter on services only
+	 *  @param      int     $year                    Year (0=last 12 month)
+	 *  @param      string  $morefilter              More sql filters
 	 * 	@return   	array       		             <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
 	 */
-	function get_nb_vente($socid, $mode, $filteronproducttype=-1)
+	function get_nb_vente($socid, $mode, $filteronproducttype=-1, $year=0, $morefilter='')
 	{
 		global $conf;
 		global $user;
@@ -2536,10 +2546,11 @@ class Product extends CommonObject
 		$sql.= " AND f.entity IN (".getEntity('facture', 1).")";
 		if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND f.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
 		if ($socid > 0)	$sql.= " AND f.fk_soc = $socid";
+		$sql.=$morefilter;
 		$sql.= " GROUP BY date_format(f.datef,'%Y%m')";
 		$sql.= " ORDER BY date_format(f.datef,'%Y%m') DESC";
 
-		return $this->_get_stats($sql,$mode);
+		return $this->_get_stats($sql,$mode, $year);
 	}
 
 
@@ -2549,9 +2560,11 @@ class Product extends CommonObject
 	 *  @param  	int		$socid                   Limit count on a particular third party id
 	 * 	@param		string	$mode		             'byunit'=number of unit, 'bynumber'=nb of entities
 	 *  @param      int     $filteronproducttype     0=To filter on product only, 1=To filter on services only
+	 *  @param      int     $year                    Year (0=last 12 month)
+	 *  @param      string  $morefilter              More sql filters
 	 * 	@return   	array       		             <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
 	 */
-	function get_nb_achat($socid, $mode, $filteronproducttype=-1)
+	function get_nb_achat($socid, $mode, $filteronproducttype=-1, $year=0, $morefilter='')
 	{
 		global $conf;
 		global $user;
@@ -2569,11 +2582,11 @@ class Product extends CommonObject
 		$sql.= " AND f.entity IN (".getEntity('facture_fourn', 1).")";
 		if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND f.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
 		if ($socid > 0)	$sql.= " AND f.fk_soc = $socid";
+		$sql.=$morefilter;
 		$sql.= " GROUP BY date_format(f.datef,'%Y%m')";
 		$sql.= " ORDER BY date_format(f.datef,'%Y%m') DESC";
 
-		$resarray=$this->_get_stats($sql,$mode);
-		return $resarray;
+		return $this->_get_stats($sql,$mode, $year);
 	}
 
 	/**
@@ -2582,9 +2595,11 @@ class Product extends CommonObject
 	 *  @param  	int		$socid                   Limit count on a particular third party id
 	 * 	@param		string	$mode		             'byunit'=number of unit, 'bynumber'=nb of entities
 	 *  @param      int     $filteronproducttype     0=To filter on product only, 1=To filter on services only
+	 *  @param      int     $year                    Year (0=last 12 month)
+	 *  @param      string  $morefilter              More sql filters
 	 * 	@return   	array       		             <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
 	 */
-	function get_nb_propal($socid, $mode, $filteronproducttype=-1)
+	function get_nb_propal($socid, $mode, $filteronproducttype=-1, $year=0, $morefilter='')
 	{
 		global $conf;
 		global $user;
@@ -2602,10 +2617,11 @@ class Product extends CommonObject
 		$sql.= " AND p.entity IN (".getEntity('propal', 1).")";
 		if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
 		if ($socid > 0)	$sql.= " AND p.fk_soc = ".$socid;
+		$sql.=$morefilter;
 		$sql.= " GROUP BY date_format(p.datep,'%Y%m')";
 		$sql.= " ORDER BY date_format(p.datep,'%Y%m') DESC";
 
-		return $this->_get_stats($sql,$mode);
+		return $this->_get_stats($sql,$mode, $year);
 	}
 
 	/**
@@ -2614,9 +2630,11 @@ class Product extends CommonObject
 	 *  @param  	int		$socid                   Limit count on a particular third party id
 	 * 	@param		string	$mode		             'byunit'=number of unit, 'bynumber'=nb of entities
 	 *  @param      int     $filteronproducttype     0=To filter on product only, 1=To filter on services only
+	 *  @param      int     $year                    Year (0=last 12 month)
+	 *  @param      string  $morefilter              More sql filters
 	 * 	@return   	array       		             <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
 	 */
-	function get_nb_propalsupplier($socid, $mode, $filteronproducttype=-1)
+	function get_nb_propalsupplier($socid, $mode, $filteronproducttype=-1, $year=0, $morefilter='')
 	{
 		global $conf;
 		global $user;
@@ -2634,10 +2652,11 @@ class Product extends CommonObject
 		$sql.= " AND p.entity IN (".getEntity('propal', 1).")";
 		if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
 		if ($socid > 0)	$sql.= " AND p.fk_soc = ".$socid;
+		$sql.=$morefilter;
 		$sql.= " GROUP BY date_format(p.date_valid,'%Y%m')";
 		$sql.= " ORDER BY date_format(p.date_valid,'%Y%m') DESC";
 
-		return $this->_get_stats($sql,$mode);
+		return $this->_get_stats($sql,$mode, $year);
 	}
 	
 	/**
@@ -2646,9 +2665,11 @@ class Product extends CommonObject
 	 *  @param  	int		$socid                   Limit count on a particular third party id
 	 *  @param		string	$mode		             'byunit'=number of unit, 'bynumber'=nb of entities
 	 *  @param      int     $filteronproducttype     0=To filter on product only, 1=To filter on services only
+	 *  @param      int     $year                    Year (0=last 12 month)
+	 *  @param      string  $morefilter              More sql filters
 	 * 	@return   	array       		             <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
 	 */
-	function get_nb_order($socid, $mode, $filteronproducttype=-1)
+	function get_nb_order($socid, $mode, $filteronproducttype=-1, $year=0, $morefilter='')
 	{
 		global $conf, $user;
 
@@ -2665,10 +2686,11 @@ class Product extends CommonObject
 		$sql.= " AND c.entity IN (".getEntity('commande', 1).")";
 		if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
 		if ($socid > 0)	$sql.= " AND c.fk_soc = ".$socid;
+		$sql.=$morefilter;
 		$sql.= " GROUP BY date_format(c.date_commande,'%Y%m')";
 		$sql.= " ORDER BY date_format(c.date_commande,'%Y%m') DESC";
 
-		return $this->_get_stats($sql,$mode);
+		return $this->_get_stats($sql,$mode, $year);
 	}
 
 	/**
@@ -2677,9 +2699,11 @@ class Product extends CommonObject
 	 *  @param  	int		$socid                   Limit count on a particular third party id
 	 *  @param		string	$mode		             'byunit'=number of unit, 'bynumber'=nb of entities
 	 *  @param      int     $filteronproducttype     0=To filter on product only, 1=To filter on services only
+	 *  @param      int     $year                    Year (0=last 12 month)
+	 *  @param      string  $morefilter              More sql filters
 	 * 	@return   	array       		             <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
 	 */
-	function get_nb_ordersupplier($socid, $mode, $filteronproducttype=-1)
+	function get_nb_ordersupplier($socid, $mode, $filteronproducttype=-1, $year=0, $morefilter='')
 	{
 		global $conf, $user;
 
@@ -2696,10 +2720,11 @@ class Product extends CommonObject
 		$sql.= " AND c.entity IN (".getEntity('supplier_order', 1).")";
 		if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
 		if ($socid > 0)	$sql.= " AND c.fk_soc = ".$socid;
+		$sql.=$morefilter;
 		$sql.= " GROUP BY date_format(c.date_commande,'%Y%m')";
 		$sql.= " ORDER BY date_format(c.date_commande,'%Y%m') DESC";
 
-		return $this->_get_stats($sql,$mode);
+		return $this->_get_stats($sql,$mode, $year);
 	}
 
 	/**
diff --git a/htdocs/product/composition/card.php b/htdocs/product/composition/card.php
index 37068a1daca..aa1cf4137e9 100644
--- a/htdocs/product/composition/card.php
+++ b/htdocs/product/composition/card.php
@@ -193,7 +193,7 @@ llxHeader('', $title, $helpurl);
 $head=product_prepare_head($object);
 $titre=$langs->trans("CardProduct".$object->type);
 $picto=($object->type==Product::TYPE_SERVICE?'service':'product');
-dol_fiche_head($head, 'subproduct', $titre, 0, $picto);
+dol_fiche_head($head, 'subproduct', $titre, -1, $picto);
 
 
 if ($id > 0 || ! empty($ref))
@@ -209,48 +209,47 @@ if ($id > 0 || ! empty($ref))
 		
         if ($object->type!=Product::TYPE_SERVICE || empty($conf->global->PRODUIT_MULTIPRICES))
         {
+            print '<div class="fichecenter">';
     	    print '<div class="underbanner clearboth"></div>';	
             print '<table class="border tableforfield" width="100%">';
-        }
         
-		// Nature
-		if ($object->type!=Product::TYPE_SERVICE)
-		{
-			print '<tr><td>'.$langs->trans("Nature").'</td><td>';
-			print $object->getLibFinished();
-			print '</td></tr>';
-		}
+    		// Nature
+    		if ($object->type!=Product::TYPE_SERVICE)
+    		{
+    			print '<tr><td>'.$langs->trans("Nature").'</td><td>';
+    			print $object->getLibFinished();
+    			print '</td></tr>';
+    		}
+    
+    		if (empty($conf->global->PRODUIT_MULTIPRICES))
+    		{
+    		    // Price
+    			print '<tr><td>'.$langs->trans("SellingPrice").'</td><td>';
+    			if ($object->price_base_type == 'TTC')
+    			{
+    				print price($object->price_ttc).' '.$langs->trans($object->price_base_type);
+    			}
+    			else
+    			{
+    				print price($object->price).' '.$langs->trans($object->price_base_type?$object->price_base_type:'HT');
+    			}
+    			print '</td></tr>';
+    
+    			// Price minimum
+    			print '<tr><td>'.$langs->trans("MinPrice").'</td><td>';
+    			if ($object->price_base_type == 'TTC')
+    			{
+    				print price($object->price_min_ttc).' '.$langs->trans($object->price_base_type);
+    			}
+    			else
+    			{
+    				print price($object->price_min).' '.$langs->trans($object->price_base_type?$object->price_base_type:'HT');
+    			}
+    			print '</td></tr>';
+    		}
 
-		if (empty($conf->global->PRODUIT_MULTIPRICES))
-		{
-		    // Price
-			print '<tr><td>'.$langs->trans("SellingPrice").'</td><td>';
-			if ($object->price_base_type == 'TTC')
-			{
-				print price($object->price_ttc).' '.$langs->trans($object->price_base_type);
-			}
-			else
-			{
-				print price($object->price).' '.$langs->trans($object->price_base_type?$object->price_base_type:'HT');
-			}
-			print '</td></tr>';
-
-			// Price minimum
-			print '<tr><td>'.$langs->trans("MinPrice").'</td><td>';
-			if ($object->price_base_type == 'TTC')
-			{
-				print price($object->price_min_ttc).' '.$langs->trans($object->price_base_type);
-			}
-			else
-			{
-				print price($object->price_min).' '.$langs->trans($object->price_base_type?$object->price_base_type:'HT');
-			}
-			print '</td></tr>';
-		}
-
-        if ($object->type!=Product::TYPE_SERVICE || empty($conf->global->PRODUIT_MULTIPRICES))
-        {
-		  print '</table>';
+            print '</table>';
+            print '</div>';
         }
 
 		dol_fiche_end();
@@ -271,7 +270,7 @@ if ($id > 0 || ! empty($ref))
 
 		//if (count($prodsfather) > 0)
 		//{
-			print load_fiche_titre($langs->trans("ProductParentList"),'','').'<br>';
+			print load_fiche_titre($langs->trans("ProductParentList"),'','');
 			print '<table class="centpercent noborder">';
 			print '<tr class="liste_titre">';
 			print '<td>'.$langs->trans('ParentProducts').'</td>';
@@ -320,7 +319,7 @@ if ($id > 0 || ! empty($ref))
 		//if (count($prods_arbo) > 0)
 		//{
 			$atleastonenotdefined=0;
-			print load_fiche_titre($langs->trans("ProductAssociationList"),'','').'<br>';
+			print load_fiche_titre($langs->trans("ProductAssociationList"),'','');
 
 			print '<form name="formComposedProduct" action="'.$_SERVER['PHP_SELF'].'" method="post">';
 			print '<input type="hidden" name="action" value="save_composed_product" />';
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index 7e6ae9b47f4..74f9c59cff3 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -55,6 +55,7 @@ $sall=GETPOST('sall', 'alphanohtml');
 $sref=GETPOST("sref");
 $sbarcode=GETPOST("sbarcode");
 $snom=GETPOST("snom");
+$search_type = GETPOST("search_type",'int');
 $search_sale = GETPOST("search_sale");
 $search_categ = GETPOST("search_categ",'int');
 $tosell = GETPOST("tosell", 'int');
@@ -65,7 +66,7 @@ $search_tobatch = GETPOST("search_tobatch",'int');
 $search_accountancy_code_sell = GETPOST("search_accountancy_code_sell",'alpha');
 $search_accountancy_code_buy = GETPOST("search_accountancy_code_buy",'alpha');
 $optioncss = GETPOST('optioncss','alpha');
-$type= (int) GETPOST("type","int");
+$type=(int) GETPOST("type","int");
 
 //Show/hide child products. Hidden by default
 if (!$_POST) {
@@ -114,8 +115,8 @@ if (! empty($canvas))
 }
 
 // Security check
-if ($type=='0') $result=restrictedArea($user,'produit','','','','','',$objcanvas);
-else if ($type=='1') $result=restrictedArea($user,'service','','','','','',$objcanvas);
+if ($search_type=='0') $result=restrictedArea($user,'produit','','','','','',$objcanvas);
+else if ($search_type=='1') $result=restrictedArea($user,'service','','','','','',$objcanvas);
 else $result=restrictedArea($user,'produit|service','','','','','',$objcanvas);
 
 // Define virtualdiffersfromphysical
@@ -158,7 +159,8 @@ $arrayfields=array(
     'p.ref'=>array('label'=>$langs->trans("Ref"), 'checked'=>1),
     //'pfp.ref_fourn'=>array('label'=>$langs->trans("RefSupplier"), 'checked'=>1, 'enabled'=>(! empty($conf->barcode->enabled))),
     'p.label'=>array('label'=>$langs->trans("Label"), 'checked'=>1),
-	'p.barcode'=>array('label'=>$langs->trans("Gencod"), 'checked'=>($contextpage != 'servicelist'), 'enabled'=>(! empty($conf->barcode->enabled))),
+    'p.fk_product_type'=>array('label'=>$langs->trans("Type"), 'checked'=>0, 'enabled'=>(! empty($conf->produit->enabled) && ! empty($conf->service->enabled))),
+    'p.barcode'=>array('label'=>$langs->trans("Gencod"), 'checked'=>($contextpage != 'servicelist'), 'enabled'=>(! empty($conf->barcode->enabled))),
     'p.duration'=>array('label'=>$langs->trans("Duration"), 'checked'=>($contextpage != 'productlist'), 'enabled'=>(! empty($conf->service->enabled))),
 	'p.sellprice'=>array('label'=>$langs->trans("SellingPrice"), 'checked'=>1, 'enabled'=>empty($conf->global->PRODUIT_MULTIPRICES)),
     'p.minbuyprice'=>array('label'=>$langs->trans("BuyingPriceMinShort"), 'checked'=>1, 'enabled'=>(! empty($user->rights->fournisseur->lire))),
@@ -212,6 +214,7 @@ if (empty($reshook))
     	$tosell="";
     	$tobuy="";
     	$search_tobatch='';
+    	$search_type='';
     	$search_accountancy_code_sell='';
     	$search_accountancy_code_buy='';
     	$search_array_options=array();
@@ -219,8 +222,8 @@ if (empty($reshook))
     
     // Mass actions
     $objectclass='Product';
-    if ((string) $type == '1') { $objectlabel='Services'; }
-    if ((string) $type == '0') { $objectlabel='Products'; }
+    if ((string) $search_type == '1') { $objectlabel='Services'; }
+    if ((string) $search_type == '0') { $objectlabel='Products'; }
     
     $permtoread = $user->rights->produit->lire;
     $permtodelete = $user->rights->produit->supprimer;
@@ -244,9 +247,9 @@ else
 {
 	$title=$langs->trans("ProductsAndServices");
 
-	if (isset($type))
+	if ($search_type != '' && $search_type != '-1')
 	{
-		if ($type==1)
+		if ($search_type==1)
 		{
 			$texte = $langs->trans("Services");
 		}
@@ -260,13 +263,13 @@ else
 		$texte = $langs->trans("ProductsAndServices");
 	}
 
-    $sql = 'SELECT DISTINCT p.rowid, p.ref, p.label, p.barcode, p.price, p.price_ttc, p.price_base_type, p.entity,';
+    $sql = 'SELECT DISTINCT p.rowid, p.ref, p.label, p.fk_product_type, p.barcode, p.price, p.price_ttc, p.price_base_type, p.entity,';
     $sql.= ' p.fk_product_type, p.duration, p.tosell, p.tobuy, p.seuil_stock_alerte, p.desiredstock,';
     $sql.= ' p.tobatch, p.accountancy_code_sell, p.accountancy_code_buy,';
     $sql.= ' p.datec as date_creation, p.tms as date_update,';
     //$sql.= ' pfp.ref_fourn as ref_supplier, ';
     $sql.= ' MIN(pfp.unitprice) as minsellprice';
-	if (!empty($conf->variants->enabled) && $search_hidechildproducts && ($type === 0)) {
+	if (!empty($conf->variants->enabled) && $search_hidechildproducts && ($search_type === 0)) {
 		$sql .= ', pac.rowid prod_comb_id';
 	}
 	// Add fields from extrafields
@@ -281,17 +284,17 @@ else
    	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as pfp ON p.rowid = pfp.fk_product";
 	// multilang
 	if (! empty($conf->global->MAIN_MULTILANGS)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_lang as pl ON pl.fk_product = p.rowid AND pl.lang = '".$langs->getDefaultLang() ."'";
-	if (!empty($conf->variants->enabled) && $search_hidechildproducts && ($type === 0)) {
+	if (!empty($conf->variants->enabled) && $search_hidechildproducts && ($search_type === 0)) {
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_attribute_combination pac ON pac.fk_product_child = p.rowid";
 	}
 
 	$sql.= ' WHERE p.entity IN ('.getEntity('product', 1).')';
 	if ($sall) $sql .= natural_search(array_keys($fieldstosearchall), $sall);
     // if the type is not 1, we show all products (type = 0,2,3)
-    if (dol_strlen($type))
+    if (dol_strlen($search_type) && $search_type != '-1')
     {
-    	if ($type == 1) $sql.= " AND p.fk_product_type = '1'";
-    	else $sql.= " AND p.fk_product_type <> '1'";
+    	if ($search_type == 1) $sql.= " AND p.fk_product_type = 1";
+    	else $sql.= " AND p.fk_product_type <> 1";
     }
 	if ($sref)     $sql .= natural_search('p.ref', $sref);
 	if ($snom)     $sql .= natural_search('p.label', $snom);
@@ -309,7 +312,7 @@ else
     if ($search_accountancy_code_sell)   $sql.= natural_search('p.accountancy_code_buy', $search_accountancy_code_buy);
     // Add where from extra fields
 
-	if (!empty($conf->variants->enabled) && $search_hidechildproducts && ($type === 0)) {
+	if (!empty($conf->variants->enabled) && $search_hidechildproducts && ($search_type === 0)) {
 		$sql .= " AND pac.rowid IS NULL";
 	}
 
@@ -333,7 +336,7 @@ else
     $sql.= " GROUP BY p.rowid, p.ref, p.label, p.barcode, p.price, p.price_ttc, p.price_base_type,";
     $sql.= " p.fk_product_type, p.duration, p.tosell, p.tobuy, p.seuil_stock_alerte, p.desiredstock,";
     $sql.= ' p.datec, p.tms, p.entity, p.tobatch, p.accountancy_code_sell, p.accountancy_code_buy';
-	if (!empty($conf->variants->enabled) && $search_hidechildproducts && ($type === 0)) {
+	if (!empty($conf->variants->enabled) && $search_hidechildproducts && ($search_type === 0)) {
 		$sql .= ', pac.rowid';
 	}
 	// Add fields from extrafields
@@ -368,13 +371,13 @@ else
     	}
 
     	$helpurl='';
-    	if (isset($type))
+    	if ($search_type != '')
     	{
-    		if ($type == 0)
+    		if ($search_type == 0)
     		{
     			$helpurl='EN:Module_Products|FR:Module_Produits|ES:M&oacute;dulo_Productos';
     		}
-    		else if ($type == 1)
+    		else if ($search_type == 1)
     		{
     			$helpurl='EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios';
     		}
@@ -401,7 +404,8 @@ else
     	if ($fourn_id > 0) $param.=($fourn_id?"&amp;fourn_id=".$fourn_id:"");
     	if ($seach_categ) $param.=($search_categ?"&amp;search_categ=".urlencode($search_categ):"");
     	if ($type != '') $param.='&amp;type='.urlencode($type);
-		if ($optioncss != '') $param.='&optioncss='.urlencode($optioncss);
+    	if ($search_type != '') $param.='&amp;search_type='.urlencode($search_type);
+    	if ($optioncss != '') $param.='&optioncss='.urlencode($optioncss);
     	if ($search_tobatch) $param="&amp;search_ref_supplier=".urlencode($search_ref_supplier);
     	if ($search_accountancy_code_sell) $param="&amp;search_accountancy_code_sell=".urlencode($search_accountancy_code_sell);
     	if ($search_accountancy_code_buy) $param="&amp;search_accountancy_code_buy=".urlencode($search_accountancy_code_buy);
@@ -430,7 +434,8 @@ else
 		print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 		print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
         print '<input type="hidden" name="page" value="'.$page.'">';
-		print '<input type="hidden" name="type" value="'.$type.'">';
+        print '<input type="hidden" name="type" value="'.$type.'">';
+        if (empty($arrayfields['p.fk_product_type']['checked'])) print '<input type="hidden" name="search_type" value="'.dol_escape_htmltag($search_type).'">';
 
 	    print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_products.png', 0, '', '', $limit);
 
@@ -480,7 +485,7 @@ else
     		}
 
 			//Show/hide child products. Hidden by default
-			if (!empty($conf->variants->enabled) && $type === 0) {
+			if (!empty($conf->variants->enabled) && $search_type === 0) {
 				$moreforfilter.='<div class="divsearchfield">';
 				$moreforfilter.= '<input type="checkbox" id="search_hidechildproducts" name="search_hidechildproducts" value="on"'.($search_hidechildproducts ? 'checked="checked"' : '').'>';
 				$moreforfilter.= ' <label for="search_hidechildproducts">'.$langs->trans('HideChildProducts').'</label>';
@@ -524,6 +529,14 @@ else
 		   		print '<input class="flat" type="text" name="snom" size="12" value="'.dol_escape_htmltag($snom).'">';
     			print '</td>';
     		}
+    		// Type
+    	    if (! empty($arrayfields['p.fk_product_type']['checked']))
+    		{
+    			print '<td class="liste_titre" align="left">';
+		   		$array=array('-1'=>'&nbsp;', '0'=>$langs->trans('Product'), '1'=>$langs->trans('Service'));
+    			print $form->selectarray('search_type', $array, $search_type);
+    			print '</td>';
+    		}
     		// Barcode
     		if (! empty($arrayfields['p.barcode']['checked']))
     		{
@@ -622,6 +635,7 @@ else
     		if (! empty($arrayfields['p.ref']['checked']))  print_liste_field_titre($arrayfields['p.ref']['label'], $_SERVER["PHP_SELF"],"p.ref","",$param,"",$sortfield,$sortorder);
     		if (! empty($arrayfields['pfp.ref_fourn']['checked']))  print_liste_field_titre($arrayfields['pfp.ref_fourn']['label'], $_SERVER["PHP_SELF"],"pfp.ref_fourn","",$param,"",$sortfield,$sortorder);
     		if (! empty($arrayfields['p.label']['checked']))  print_liste_field_titre($arrayfields['p.label']['label'], $_SERVER["PHP_SELF"],"p.label","",$param,"",$sortfield,$sortorder);
+    		if (! empty($arrayfields['p.fk_product_type']['checked']))  print_liste_field_titre($arrayfields['p.fk_product_type']['label'], $_SERVER["PHP_SELF"],"p.fk_product_type","",$param,"",$sortfield,$sortorder);
     		if (! empty($arrayfields['p.barcode']['checked']))  print_liste_field_titre($arrayfields['p.barcode']['label'], $_SERVER["PHP_SELF"],"p.barcode","",$param,"",$sortfield,$sortorder);
     		if (! empty($arrayfields['p.duration']['checked']))  print_liste_field_titre($arrayfields['p.duration']['label'], $_SERVER["PHP_SELF"],"p.duration","",$param,'align="center"',$sortfield,$sortorder);
     		if (! empty($arrayfields['p.sellprice']['checked']))  print_liste_field_titre($arrayfields['p.sellprice']['label'], $_SERVER["PHP_SELF"],"","",$param,'align="right"',$sortfield,$sortorder);
@@ -690,7 +704,7 @@ else
                 $product_static->status     = $obj->tosell;
 				$product_static->entity = $obj->entity;
 
-				if (! empty($conf->stock->enabled) && $user->rights->stock->lire && $type != 1)	// To optimize call of load_stock
+				if (! empty($conf->stock->enabled) && $user->rights->stock->lire && $search_type != 1)	// To optimize call of load_stock
 				{
 				    if ($obj->fk_product_type != 1)    // Not a service
 				    {
@@ -721,7 +735,13 @@ else
 			    	print '<td>'.dol_trunc($obj->label,40).'</td>';
 			    }
 			    
-    			// Barcode
+    		    // Type
+			    if (! empty($arrayfields['p.fk_product_type']['checked']))
+			    {
+			    	print '<td>'.$obj->fk_product_type.'</td>';
+			    }
+			    
+			    // Barcode
 			    if (! empty($arrayfields['p.barcode']['checked']))
 			    {
     				print '<td>'.$obj->barcode.'</td>';
diff --git a/htdocs/product/stats/card.php b/htdocs/product/stats/card.php
index d0a85756c04..0477491518c 100644
--- a/htdocs/product/stats/card.php
+++ b/htdocs/product/stats/card.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2001-2007	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
- * Copyright (c) 2004-2015	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (c) 2004-2017	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@capnetworks.com>
  * Copyright (C) 2005		Eric Seigne				<eric.seigne@ryxeo.com>
  * Copyright (C) 2013		Juanjo Menent			<jmenent@2byte.es>
@@ -30,6 +30,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
+require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 
 $WIDTH=DolGraph::getDefaultGraphSizeForStats('width',380);
 $HEIGHT=DolGraph::getDefaultGraphSizeForStats('height',160);
@@ -43,6 +45,9 @@ $langs->load("other");
 $id		= GETPOST('id','int');         // For this page, id can also be 'all'
 $ref	= GETPOST('ref');
 $mode	= (GETPOST('mode') ? GETPOST('mode') : 'byunit');
+$search_year   = GETPOST('search_year','int');
+$search_categ  = GETPOST('search_categ','int');
+
 $error	= 0;
 $mesg	= '';
 $graphfiles=array();
@@ -55,348 +60,380 @@ $fieldvalue = (! empty($id) ? $id : $ref);
 $fieldtype = (! empty($ref) ? 'ref' : 'rowid');
 $result=restrictedArea($user,'produit|service',$fieldvalue,'product&product','','',$fieldtype);
 
+$tmp=dol_getdate(dol_now());
+$currentyear=$tmp['year'];
+if (empty($search_year)) $search_year=$currentyear;
+
+
+/*
+ * Actions
+ */
+
+// None
+
 
 /*
  *	View
  */
 
 $form = new Form($db);
+$htmlother = new FormOther($db);
 
-if (! empty($id) || ! empty($ref) || GETPOST('id') == 'all')
+$object = new Product($db);
+if (! $id)
 {
-	$object = new Product($db);
-    if (GETPOST('id') == 'all')
+    llxHeader("",$langs->trans("ProductStatistics"));
+
+    $type = GETPOST('type','int');
+
+   	$helpurl='';
+    if ($type == '0')
     {
-        llxHeader("",$langs->trans("ProductStatistics"));
-
-   	    $type = GETPOST('type');
-
-       	$helpurl='';
-        if ($type == '0')
-        {
-            $helpurl='EN:Module_Products|FR:Module_Produits|ES:M&oacute;dulo_Productos';
-            //$title=$langs->trans("StatisticsOfProducts");
-            $title=$langs->trans("Statistics");
-        }
-        else if ($type == '1')
-        {
-            $helpurl='EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios';
-            //$title=$langs->trans("StatisticsOfServices");
-            $title=$langs->trans("Statistics");
-        }
-        else
-        {
-            $helpurl='EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios';
-            //$title=$langs->trans("StatisticsOfProductsOrServices");
-            $title=$langs->trans("Statistics");
-        }
-
-        print load_fiche_titre($title, $mesg,'title_products.png');
+        $helpurl='EN:Module_Products|FR:Module_Produits|ES:M&oacute;dulo_Productos';
+        //$title=$langs->trans("StatisticsOfProducts");
+        $title=$langs->trans("Statistics");
+    }
+    else if ($type == '1')
+    {
+        $helpurl='EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios';
+        //$title=$langs->trans("StatisticsOfServices");
+        $title=$langs->trans("Statistics");
     }
     else
     {
-        $result = $object->fetch($id,$ref);
-
-		$title = $langs->trans('ProductServiceCard');
-		$helpurl = '';
-		$shortlabel = dol_trunc($object->label,16);
-		if (GETPOST("type") == '0' || ($object->type == Product::TYPE_PRODUCT))
-		{
-			$title = $langs->trans('Product')." ". $shortlabel ." - ".$langs->trans('Statistics');
-			$helpurl='EN:Module_Products|FR:Module_Produits|ES:M&oacute;dulo_Productos';
-		}
-		if (GETPOST("type") == '1' || ($object->type == Product::TYPE_SERVICE))
-		{
-			$title = $langs->trans('Service')." ". $shortlabel ." - ".$langs->trans('Statistics');
-			$helpurl='EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios';
-		}
-
-		llxHeader('', $title, $helpurl);
+        $helpurl='EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios';
+        //$title=$langs->trans("StatisticsOfProductsOrServices");
+        $title=$langs->trans("Statistics");
     }
 
+    print load_fiche_titre($title, $mesg,'title_products.png');
+}
+else
+{
+    $result = $object->fetch($id,$ref);
 
-	if ($result && (! empty($id) || ! empty($ref)))
+	$title = $langs->trans('ProductServiceCard');
+	$helpurl = '';
+	$shortlabel = dol_trunc($object->label,16);
+	if (GETPOST("type") == '0' || ($object->type == Product::TYPE_PRODUCT))
 	{
-		$head=product_prepare_head($object);
-		$titre=$langs->trans("CardProduct".$object->type);
-		$picto=($object->type==Product::TYPE_SERVICE?'service':'product');
+		$title = $langs->trans('Product')." ". $shortlabel ." - ".$langs->trans('Statistics');
+		$helpurl='EN:Module_Products|FR:Module_Produits|ES:M&oacute;dulo_Productos';
+	}
+	if (GETPOST("type") == '1' || ($object->type == Product::TYPE_SERVICE))
+	{
+		$title = $langs->trans('Service')." ". $shortlabel ." - ".$langs->trans('Statistics');
+		$helpurl='EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios';
+	}
 
-		dol_fiche_head($head, 'stats', $titre, 0, $picto);
+	llxHeader('', $title, $helpurl);
+}
 
-		$linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php">'.$langs->trans("BackToList").'</a>';
+
+if ($result && (! empty($id) || ! empty($ref)))
+{
+	$head=product_prepare_head($object);
+	$titre=$langs->trans("CardProduct".$object->type);
+	$picto=($object->type==Product::TYPE_SERVICE?'service':'product');
+
+	dol_fiche_head($head, 'stats', $titre, -1, $picto);
+
+	$linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php">'.$langs->trans("BackToList").'</a>';
+	
+    dol_banner_tab($object, 'ref', $linkback, ($user->societe_id?0:1), 'ref', '', '', '', 0, '', '', 1);
+
+    dol_fiche_end();
+}
+if (empty($id) & empty($ref))
+{
+    $h=0;
+    $head = array();
+
+    $head[$h][0] = DOL_URL_ROOT.'/product/stats/card.php'.($type != ''?'?type='.$type:'');
+    $head[$h][1] = $langs->trans("Chart");
+    $head[$h][2] = 'chart';
+    $h++;
+
+	$title = $langs->trans("ListProductServiceByPopularity");
+    if ((string) $type == '1') {
+    	$title = $langs->trans("ListServiceByPopularity");
+    }
+    if ((string) $type == '0') {
+    	$title = $langs->trans("ListProductByPopularity");
+    }
+
+    $head[$h][0] = DOL_URL_ROOT.'/product/popuprop.php'.($type != ''?'?type='.$type:'');
+    $head[$h][1] = $title;
+    $head[$h][2] = 'popularityprop';
+    $h++;
+
+    dol_fiche_head($head, 'chart', $langs->trans("Statistics"), -1);
+}
+
+
+if ($result || empty($id))
+{
+        print '<form name="stats" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+        print '<input type="hidden" name="id" value="'.$id.'">';
+        
+    	print '<table class="noborder" width="100%">';
+    	print '<tr class="liste_titre"><td class="liste_titre" colspan="2">'.$langs->trans("Filter").'</td></tr>';
+
+    	if (empty($id))
+    	{
+        	// Type
+    		print '<tr><td class="titlefield">'.$langs->trans("ProductsAndServices").'</td><td>';
+    		$array=array('-1'=>'&nbsp;', '0'=>$langs->trans('Product'), '1'=>$langs->trans('Service'));
+    		print $form->selectarray('type', $array, $type);
+    		print '</td></tr>';
 		
-        dol_banner_tab($object, 'ref', $linkback, ($user->societe_id?0:1), 'ref', '', '', '', 0, '', '', 1);
-
-        dol_fiche_end();
-	}
-	if (GETPOST('id') == 'all')
-	{
-        $h=0;
-        $head = array();
-
-        $head[$h][0] = DOL_URL_ROOT.'/product/stats/card.php?id=all';
-        $head[$h][1] = $langs->trans("Chart");
-        $head[$h][2] = 'chart';
-        $h++;
-
-    	$title = $langs->trans("ListProductServiceByPopularity");
-        if ((string) $type == '1') {
-        	$title = $langs->trans("ListServiceByPopularity");
-        }
-        if ((string) $type == '0') {
-        	$title = $langs->trans("ListProductByPopularity");
-        }
-
-        $head[$h][0] = DOL_URL_ROOT.'/product/popuprop.php'.($type != ''?'?type='.$type:'');
-        $head[$h][1] = $title;
-        $head[$h][2] = 'popularityprop';
-        $h++;
-
-        dol_fiche_head($head,'chart',$langs->trans("Statistics"));
-	}
-
-
-	if ($result || GETPOST('id') == 'all')
-	{
-	    if (GETPOST('id') == 'all')
-	    {
-    		// Choice of type of product
-    		if (! empty($conf->dol_use_jmobile)) print "\n".'<div class="fichecenter"><div class="nowrap">'."\n";
-
-    		if ((string) $type != '0') print '<a href="'.$_SERVER["PHP_SELF"].'?id='.(GETPOST('id')?GETPOST('id'):$object->id).'&type=0'.($mode?'&mode='.$mode:'').'">';
-    		else print img_picto('','tick').' ';
-    		print $langs->trans("Products");
-    		if ((string) $type != '0') print '</a>';
-
-    		if (! empty($conf->dol_use_jmobile)) print '</div>'."\n".'<div class="nowrap">'."\n";
-    		else print ' &nbsp; / &nbsp; ';
-
-    		if ((string) $type != '1') print '<a href="'.$_SERVER["PHP_SELF"].'?id='.(GETPOST('id')?GETPOST('id'):$object->id).'&type=1'.($mode?'&mode='.$mode:'').'">';
-    		else print img_picto('','tick').' ';
-    		print $langs->trans("Services");
-    		if ((string) $type != '1') print '</a>';
-
-    		if (! empty($conf->dol_use_jmobile)) print '</div>'."\n".'<div class="nowrap">'."\n";
-    		else print ' &nbsp; / &nbsp; ';
-
-    		if ((string) $type == '0' || (string) $type == '1') print '<a href="'.$_SERVER["PHP_SELF"].'?id='.(GETPOST('id')?GETPOST('id'):$object->id).($mode?'&mode='.$mode:'').'">';
-    		else print img_picto('','tick').' ';
-    		print $langs->trans("ProductsAndServices");
-    		if ((string) $type == '0' || (string) $type == '1') print '</a>';
-
-    		if (! empty($conf->dol_use_jmobile)) print '</div></div>';
-    		else print '<br>';
-    		print '<br>';
-	    }
-
-		// Choice of stats mode (byunit or bynumber)
-		if (! empty($conf->dol_use_jmobile)) print "\n".'<div class="fichecenter"><div class="nowrap">'."\n";
-
-		if ($mode == 'bynumber') print '<a href="'.$_SERVER["PHP_SELF"].'?id='.(GETPOST('id')?GETPOST('id'):$object->id).($type != '' ? '&type='.$type:'').'&mode=byunit">';
-		else print img_picto('','tick').' ';
-		print $langs->trans("StatsByNumberOfUnits");
-		if ($mode == 'bynumber') print '</a>';
-
-		if (! empty($conf->dol_use_jmobile)) print '</div>'."\n".'<div class="nowrap">'."\n";
-		else print ' &nbsp; / &nbsp; ';
-
-		if ($mode == 'byunit') print '<a href="'.$_SERVER["PHP_SELF"].'?id='.(GETPOST('id')?GETPOST('id'):$object->id).($type != '' ? '&type='.$type:'').'&mode=bynumber">';
-		else print img_picto('','tick').' ';
-		print $langs->trans("StatsByNumberOfEntities");
-		if ($mode == 'byunit') print '</a>';
-
-		if (! empty($conf->dol_use_jmobile)) print '</div></div>';
-		else print '<br>';
-		print '<br>';
-
-		//print '<table width="100%">';
-
-		// Generation des graphs
-    	$dir = (! empty($conf->product->multidir_temp[$object->entity])?$conf->product->multidir_temp[$object->entity]:$conf->service->multidir_temp[$object->entity]);
-		if ($object->id > 0)  // We are on statistics for a dedicated product
-		{
-    		if (! file_exists($dir.'/'.$object->id))
+    		// Tag
+    		if ($conf->categorie->enabled)
     		{
-    			if (dol_mkdir($dir.'/'.$object->id) < 0)
-    			{
-    				$mesg = $langs->trans("ErrorCanNotCreateDir",$dir);
-    				$error++;
-    			}
+        		print '<tr><td class="titlefield">'.$langs->trans("Categories").'</td><td>';
+        		//$moreforfilter.='<div class="divsearchfield">';
+        		$moreforfilter.=$htmlother->select_categories(Categorie::TYPE_PRODUCT,$search_categ,'search_categ',1);
+        		//$moreforfilter.='</div>';
+        		print $moreforfilter;
+        		print '</td></tr>';
     		}
-		}
-
-		if($conf->propal->enabled) {
-			$graphfiles['propal']=array('modulepart'=>'productstats_proposals',
-			'file' => $object->id.'/propal12m'.((string) $type != '' ? '_type'.$type : '').'_'.$mode.'.png',
-			'label' => ($mode=='byunit'?$langs->transnoentitiesnoconv("NumberOfUnitsProposals"):$langs->transnoentitiesnoconv("NumberOfProposals")));
-		}
-
-		if($conf->supplier_proposal->enabled) {
-			$graphfiles['proposalssuppliers']=array('modulepart'=>'productstats_proposalssuppliers',
-			'file' => $object->id.'/proposalssuppliers12m'.((string) $type != '' ? '_type'.$type : '').'_'.$mode.'.png',
-			'label' => ($mode=='byunit'?$langs->transnoentitiesnoconv("NumberOfUnitsSupplierProposals"):$langs->transnoentitiesnoconv("NumberOfSupplierProposals")));
-		}
-
-		if($conf->order->enabled) {
-			$graphfiles['orders']=array('modulepart'=>'productstats_orders',
-			'file' => $object->id.'/orders12m'.((string) $type != '' ? '_type'.$type : '').'_'.$mode.'.png',
-			'label' => ($mode=='byunit'?$langs->transnoentitiesnoconv("NumberOfUnitsCustomerOrders"):$langs->transnoentitiesnoconv("NumberOfCustomerOrders")));
-		}
-
-		if($conf->fournisseur->enabled) {
-			$graphfiles['orderssuppliers']=array('modulepart'=>'productstats_orderssuppliers',
-			'file' => $object->id.'/orderssuppliers12m'.((string) $type != '' ? '_type'.$type : '').'_'.$mode.'.png',
-			'label' => ($mode=='byunit'?$langs->transnoentitiesnoconv("NumberOfUnitsSupplierOrders"):$langs->transnoentitiesnoconv("NumberOfSupplierOrders")));
-		}
-
-		if($conf->facture->enabled) {
-			$graphfiles['invoices']=array('modulepart'=>'productstats_invoices',
-			'file' => $object->id.'/invoices12m'.((string) $type != '' ? '_type'.$type : '').'_'.$mode.'.png',
-			'label' => ($mode=='byunit'?$langs->transnoentitiesnoconv("NumberOfUnitsCustomerInvoices"):$langs->transnoentitiesnoconv("NumberOfCustomerInvoices")));
-
-			$graphfiles['invoicessuppliers']=array('modulepart'=>'productstats_invoicessuppliers',
-			'file' => $object->id.'/invoicessuppliers12m'.((string) $type != '' ? '_type'.$type : '').'_'.$mode.'.png',
-			'label' => ($mode=='byunit'?$langs->transnoentitiesnoconv("NumberOfUnitsSupplierInvoices"):$langs->transnoentitiesnoconv("NumberOfSupplierInvoices")));
-		}
-
-		$px = new DolGraph();
-
-		if (! $error && count($graphfiles)>0)
+    	}
+		
+		// Year
+		print '<tr><td class="titlefield">'.$langs->trans("Year").'</td><td>';
+		$arrayyears=array();
+		for ($year = $currentyear - 10; $year < $currentyear + 10 ; $year++)
 		{
-			$mesg = $px->isGraphKo();
-			if (! $mesg)
-			{
-				foreach($graphfiles as $key => $val)
-				{
-					if (! $graphfiles[$key]['file']) continue;
-
-					$graph_data = array();
-
-					if (dol_is_file($dir . '/' . $graphfiles[$key]['file']))
-					{
-    					// TODO Load cachefile $graphfiles[$key]['file']
-					}
-					else
-					{
-    					if ($key == 'propal')             $graph_data = $object->get_nb_propal($socid,$mode,((string) $type != '' ? $type : -1));
-    					if ($key == 'orders')             $graph_data = $object->get_nb_order($socid,$mode,((string) $type != '' ? $type : -1));
-    					if ($key == 'invoices')           $graph_data = $object->get_nb_vente($socid,$mode,((string) $type != '' ? $type : -1));
-    					if ($key == 'proposalssuppliers') $graph_data = $object->get_nb_propalsupplier($socid,$mode,((string) $type != '' ? $type : -1));
-    					if ($key == 'invoicessuppliers')  $graph_data = $object->get_nb_achat($socid,$mode,((string) $type != '' ? $type : -1));
-    					if ($key == 'orderssuppliers')    $graph_data = $object->get_nb_ordersupplier($socid,$mode,((string) $type != '' ? $type : -1));
-
-    					// TODO Save cachefile $graphfiles[$key]['file']
-					}
-
-					if (is_array($graph_data))
-					{
-						$px->SetData($graph_data);
-						$px->SetYLabel($graphfiles[$key]['label']);
-						$px->SetMaxValue($px->GetCeilMaxValue()<0?0:$px->GetCeilMaxValue());
-						$px->SetMinValue($px->GetFloorMinValue()>0?0:$px->GetFloorMinValue());
-						$px->SetWidth($WIDTH);
-						$px->SetHeight($HEIGHT);
-						$px->SetHorizTickIncrement(1);
-						$px->SetPrecisionY(0);
-						$px->SetShading(3);
-						//print 'x '.$key.' '.$graphfiles[$key]['file'];
-
-						$url=DOL_URL_ROOT.'/viewimage.php?modulepart='.$graphfiles[$key]['modulepart'].'&entity='.$object->entity.'&file='.urlencode($graphfiles[$key]['file']);
-						$px->draw($dir."/".$graphfiles[$key]['file'],$url);
-
-						$graphfiles[$key]['output']=$px->show();
-					}
-					else
-					{
-						dol_print_error($db,'Error for calculating graph on key='.$key.' - '.$object->error);
-					}
-				}
-			}
-
-			$mesg = $langs->trans("ChartGenerated");
+		    $arrayyears[$year]=$year;
 		}
+		if (! in_array($year,$arrayyears)) $arrayyears[$year]=$year;
+		if (! in_array($nowyear,$arrayyears)) $arrayyears[$nowyear]=$nowyear;
+		arsort($arrayyears);
+		print $form->selectarray('search_year',$arrayyears,$search_year,0);
+		print '</td></tr>';
+		print '</table>';
+		print '<div class="center"><input type="submit" name="submit" class="button" value="'.$langs->trans("Refresh").'"></div>';
+		print '</form>';
+		
+		print '<br>';
+    
 
-		// Show graphs
-		$i=0;
-		if ( count($graphfiles)>0)
+	// Choice of stats mode (byunit or bynumber)
+	if (! empty($conf->dol_use_jmobile)) print "\n".'<div class="fichecenter"><div class="nowrap">'."\n";
+
+	if ($mode == 'bynumber') print '<a href="'.$_SERVER["PHP_SELF"].'?id='.(GETPOST('id')?GETPOST('id'):$object->id).($type != '' ? '&type='.$type:'').'&mode=byunit&search_year='.$search_year.'">';
+	else print img_picto('','tick').' ';
+	print $langs->trans("StatsByNumberOfUnits");
+	if ($mode == 'bynumber') print '</a>';
+
+	if (! empty($conf->dol_use_jmobile)) print '</div>'."\n".'<div class="nowrap">'."\n";
+	else print ' &nbsp; / &nbsp; ';
+
+	if ($mode == 'byunit') print '<a href="'.$_SERVER["PHP_SELF"].'?id='.(GETPOST('id')?GETPOST('id'):$object->id).($type != '' ? '&type='.$type:'').'&mode=bynumber&search_year='.$search_year.'">';
+	else print img_picto('','tick').' ';
+	print $langs->trans("StatsByNumberOfEntities");
+	if ($mode == 'byunit') print '</a>';
+
+	if (! empty($conf->dol_use_jmobile)) print '</div></div>';
+	else print '<br>';
+	print '<br>';
+
+	//print '<table width="100%">';
+
+	// Generation des graphs
+	$dir = (! empty($conf->product->multidir_temp[$object->entity])?$conf->product->multidir_temp[$object->entity]:$conf->service->multidir_temp[$object->entity]);
+	if ($object->id > 0)  // We are on statistics for a dedicated product
+	{
+		if (! file_exists($dir.'/'.$object->id))
+		{
+			if (dol_mkdir($dir.'/'.$object->id) < 0)
+			{
+				$mesg = $langs->trans("ErrorCanNotCreateDir",$dir);
+				$error++;
+			}
+		}
+	}
+
+	if($conf->propal->enabled) {
+		$graphfiles['propal']=array('modulepart'=>'productstats_proposals',
+		'file' => $object->id.'/propal12m'.((string) $type != '' ? '_type'.$type : '').'_'.$mode.($search_year?'_year'.$search_year:'').'.png',
+		'label' => ($mode=='byunit'?$langs->transnoentitiesnoconv("NumberOfUnitsProposals"):$langs->transnoentitiesnoconv("NumberOfProposals")));
+	}
+
+	if($conf->supplier_proposal->enabled) {
+		$graphfiles['proposalssuppliers']=array('modulepart'=>'productstats_proposalssuppliers',
+		'file' => $object->id.'/proposalssuppliers12m'.((string) $type != '' ? '_type'.$type : '').'_'.$mode.($search_year?'_year'.$search_year:'').'.png',
+		'label' => ($mode=='byunit'?$langs->transnoentitiesnoconv("NumberOfUnitsSupplierProposals"):$langs->transnoentitiesnoconv("NumberOfSupplierProposals")));
+	}
+
+	if($conf->order->enabled) {
+		$graphfiles['orders']=array('modulepart'=>'productstats_orders',
+		'file' => $object->id.'/orders12m'.((string) $type != '' ? '_type'.$type : '').'_'.$mode.($search_year?'_year'.$search_year:'').'.png',
+		'label' => ($mode=='byunit'?$langs->transnoentitiesnoconv("NumberOfUnitsCustomerOrders"):$langs->transnoentitiesnoconv("NumberOfCustomerOrders")));
+	}
+
+	if($conf->fournisseur->enabled) {
+		$graphfiles['orderssuppliers']=array('modulepart'=>'productstats_orderssuppliers',
+		'file' => $object->id.'/orderssuppliers12m'.((string) $type != '' ? '_type'.$type : '').'_'.$mode.($search_year?'_year'.$search_year:'').'.png',
+		'label' => ($mode=='byunit'?$langs->transnoentitiesnoconv("NumberOfUnitsSupplierOrders"):$langs->transnoentitiesnoconv("NumberOfSupplierOrders")));
+	}
+
+	if($conf->facture->enabled) {
+		$graphfiles['invoices']=array('modulepart'=>'productstats_invoices',
+		'file' => $object->id.'/invoices12m'.((string) $type != '' ? '_type'.$type : '').'_'.$mode.($search_year?'_year'.$search_year:'').'.png',
+		'label' => ($mode=='byunit'?$langs->transnoentitiesnoconv("NumberOfUnitsCustomerInvoices"):$langs->transnoentitiesnoconv("NumberOfCustomerInvoices")));
+
+		$graphfiles['invoicessuppliers']=array('modulepart'=>'productstats_invoicessuppliers',
+		'file' => $object->id.'/invoicessuppliers12m'.((string) $type != '' ? '_type'.$type : '').'_'.$mode.($search_year?'_year'.$search_year:'').'.png',
+		'label' => ($mode=='byunit'?$langs->transnoentitiesnoconv("NumberOfUnitsSupplierInvoices"):$langs->transnoentitiesnoconv("NumberOfSupplierInvoices")));
+	}
+
+	$px = new DolGraph();
+
+	if (! $error && count($graphfiles)>0)
+	{
+		$mesg = $px->isGraphKo();
+		if (! $mesg)
 		{
 			foreach($graphfiles as $key => $val)
 			{
 				if (! $graphfiles[$key]['file']) continue;
-	
-				if ($graphfiles == 'propal' && ! $user->rights->propale->lire) continue;
-				if ($graphfiles == 'order' && ! $user->rights->commande->lire) continue;
-				if ($graphfiles == 'invoices' && ! $user->rights->facture->lire) continue;
-				if ($graphfiles == 'proposals_suppliers' && ! $user->rights->supplier_proposal->lire) continue;
-				if ($graphfiles == 'invoices_suppliers' && ! $user->rights->fournisseur->facture->lire) continue;
-				if ($graphfiles == 'orders_suppliers' && ! $user->rights->fournisseur->commande->lire) continue;
-	
-	
-				if ($i % 2 == 0)
+
+				$graph_data = array();
+
+				if (dol_is_file($dir . '/' . $graphfiles[$key]['file']))
 				{
-					print "\n".'<div class="fichecenter"><div class="fichehalfleft">'."\n";
+					// TODO Load cachefile $graphfiles[$key]['file']
 				}
 				else
 				{
-					print "\n".'<div class="fichehalfright"><div class="ficheaddleft">'."\n";
+				    $morefilters='';
+				    if ($search_categ > 0) 
+				    {
+				        $categ=new Categorie($db);
+				        $categ->fetch($search_categ);
+				        $listofprodids = $categ->getObjectsInCateg('product', 1);
+				        $morefilters=' AND d.fk_product IN ('.((is_array($listofprodids) && count($listofprodids)) ? join(',',$listofprodids):'0').')';
+				    }
+				    if ($search_categ == -2)
+				    {
+				        $morefilters=' AND d.fk_product NOT IN (SELECT cp.fk_product from '.MAIN_DB_PREFIX.'categorie_product as cp)';
+				    }
+				    
+					if ($key == 'propal')             $graph_data = $object->get_nb_propal($socid, $mode, ((string) $type != '' ? $type : -1), $search_year, $morefilters);
+					if ($key == 'orders')             $graph_data = $object->get_nb_order($socid, $mode, ((string) $type != '' ? $type : -1), $search_year, $morefilters);
+					if ($key == 'invoices')           $graph_data = $object->get_nb_vente($socid, $mode, ((string) $type != '' ? $type : -1), $search_year, $morefilters);
+					if ($key == 'proposalssuppliers') $graph_data = $object->get_nb_propalsupplier($socid, $mode, ((string) $type != '' ? $type : -1), $search_year, $morefilters);
+					if ($key == 'invoicessuppliers')  $graph_data = $object->get_nb_achat($socid, $mode, ((string) $type != '' ? $type : -1), $search_year, $morefilters);
+					if ($key == 'orderssuppliers')    $graph_data = $object->get_nb_ordersupplier($socid, $mode, ((string) $type != '' ? $type : -1), $search_year, $morefilters);
+
+					// TODO Save cachefile $graphfiles[$key]['file']
 				}
-	
-				// Date generation
-				if ($graphfiles[$key]['output'] && ! $px->isGraphKo())
+
+				if (is_array($graph_data))
 				{
-				    if (file_exists($dir."/".$graphfiles[$key]['file']) && filemtime($dir."/".$graphfiles[$key]['file'])) $dategenerated=$langs->trans("GeneratedOn",dol_print_date(filemtime($dir."/".$graphfiles[$key]['file']),"dayhour"));
-				    else $dategenerated=$langs->trans("GeneratedOn",dol_print_date(dol_now(),"dayhour"));
+					$px->SetData($graph_data);
+					$px->SetYLabel($graphfiles[$key]['label']);
+					$px->SetMaxValue($px->GetCeilMaxValue()<0?0:$px->GetCeilMaxValue());
+					$px->SetMinValue($px->GetFloorMinValue()>0?0:$px->GetFloorMinValue());
+					$px->SetWidth($WIDTH);
+					$px->SetHeight($HEIGHT);
+					$px->SetHorizTickIncrement(1);
+					$px->SetPrecisionY(0);
+					$px->SetShading(3);
+					//print 'x '.$key.' '.$graphfiles[$key]['file'];
+
+					$url=DOL_URL_ROOT.'/viewimage.php?modulepart='.$graphfiles[$key]['modulepart'].'&entity='.$object->entity.'&file='.urlencode($graphfiles[$key]['file']);
+					$px->draw($dir."/".$graphfiles[$key]['file'],$url);
+
+					$graphfiles[$key]['output']=$px->show();
 				}
 				else
 				{
-				    print $dategenerated=($mesg?'<font class="error">'.$mesg.'</font>':$langs->trans("ChartNotGenerated"));
+					dol_print_error($db,'Error for calculating graph on key='.$key.' - '.$object->error);
 				}
-				$linktoregenerate='<a href="'.$_SERVER["PHP_SELF"].'?id='.(GETPOST('id')?GETPOST('id'):$object->id).((string) $type != ''?'&amp;type='.$type:'').'&amp;action=recalcul&amp;mode='.$mode.'">'.img_picto($langs->trans("ReCalculate").' ('.$dategenerated.')','refresh').'</a>';
-				
-				// Show graph
-				print '<table class="noborder" width="100%">';
-				// Label
-				print '<tr class="liste_titre"><td>';
-				print $graphfiles[$key]['label'];
-				print '</td>';
-				print '<td align="right">'.$linktoregenerate.'</td>';
-				print '</tr>';
-				// Image
-				print '<tr class="impair"><td colspan="2" class="nohover" align="center">';
-				print $graphfiles[$key]['output'];
-				print '</td></tr>';
-				print '</table>';
-	
-				if ($i % 2 == 0)
-				{
-					print "\n".'</div>'."\n";
-				}
-				else
-				{
-					print "\n".'</div></div></div>';
-					print '<div class="clear"><div class="fichecenter"><br></div></div>'."\n";
-				}
-	
-				$i++;
 			}
 		}
-		// div not closed
-		if ($i % 2 == 1)
-		{
-			print "\n".'<div class="fichehalfright"><div class="ficheaddleft">'."\n";
-			print "\n".'</div></div></div>';
-			print '<div class="clear"><div class="fichecenter"><br></div></div>'."\n";
-		}
+
+		$mesg = $langs->trans("ChartGenerated");
 	}
 
-	if (GETPOST('id') == 'all')
+	// Show graphs
+	$i=0;
+	if ( count($graphfiles)>0)
 	{
-	    dol_fiche_end();
+		foreach($graphfiles as $key => $val)
+		{
+			if (! $graphfiles[$key]['file']) continue;
+
+			if ($graphfiles == 'propal' && ! $user->rights->propale->lire) continue;
+			if ($graphfiles == 'order' && ! $user->rights->commande->lire) continue;
+			if ($graphfiles == 'invoices' && ! $user->rights->facture->lire) continue;
+			if ($graphfiles == 'proposals_suppliers' && ! $user->rights->supplier_proposal->lire) continue;
+			if ($graphfiles == 'invoices_suppliers' && ! $user->rights->fournisseur->facture->lire) continue;
+			if ($graphfiles == 'orders_suppliers' && ! $user->rights->fournisseur->commande->lire) continue;
+
+
+			if ($i % 2 == 0)
+			{
+				print "\n".'<div class="fichecenter"><div class="fichehalfleft">'."\n";
+			}
+			else
+			{
+				print "\n".'<div class="fichehalfright"><div class="ficheaddleft">'."\n";
+			}
+
+			// Date generation
+			if ($graphfiles[$key]['output'] && ! $px->isGraphKo())
+			{
+			    if (file_exists($dir."/".$graphfiles[$key]['file']) && filemtime($dir."/".$graphfiles[$key]['file'])) $dategenerated=$langs->trans("GeneratedOn",dol_print_date(filemtime($dir."/".$graphfiles[$key]['file']),"dayhour"));
+			    else $dategenerated=$langs->trans("GeneratedOn",dol_print_date(dol_now(),"dayhour"));
+			}
+			else
+			{
+			    print $dategenerated=($mesg?'<font class="error">'.$mesg.'</font>':$langs->trans("ChartNotGenerated"));
+			}
+			$linktoregenerate='<a href="'.$_SERVER["PHP_SELF"].'?id='.(GETPOST('id')?GETPOST('id'):$object->id).((string) $type != ''?'&type='.$type:'').'&action=recalcul&mode='.$mode.'&search_year='.$search_year.'&search_categ='.$search_categ.'">'.img_picto($langs->trans("ReCalculate").' ('.$dategenerated.')','refresh').'</a>';
+			
+			// Show graph
+			print '<table class="noborder" width="100%">';
+			// Label
+			print '<tr class="liste_titre"><td>';
+			print $graphfiles[$key]['label'];
+			print '</td>';
+			print '<td align="right">'.$linktoregenerate.'</td>';
+			print '</tr>';
+			// Image
+			print '<tr class="impair"><td colspan="2" class="nohover" align="center">';
+			print $graphfiles[$key]['output'];
+			print '</td></tr>';
+			print '</table>';
+
+			if ($i % 2 == 0)
+			{
+				print "\n".'</div>'."\n";
+			}
+			else
+			{
+				print "\n".'</div></div></div>';
+				print '<div class="clear"><div class="fichecenter"><br></div></div>'."\n";
+			}
+
+			$i++;
+		}
+	}
+	// div not closed
+	if ($i % 2 == 1)
+	{
+		print "\n".'<div class="fichehalfright"><div class="ficheaddleft">'."\n";
+		print "\n".'</div></div></div>';
+		print '<div class="clear"><div class="fichecenter"><br></div></div>'."\n";
 	}
 }
-else
+
+if (! $id)
 {
-	dol_print_error();
+    dol_fiche_end();
 }
 
 llxFooter();
diff --git a/htdocs/product/stats/commande.php b/htdocs/product/stats/commande.php
index 341d002a1af..1c72d5f6615 100644
--- a/htdocs/product/stats/commande.php
+++ b/htdocs/product/stats/commande.php
@@ -94,7 +94,7 @@ if ($id > 0 || ! empty($ref))
 		$head=product_prepare_head($product);
 		$titre=$langs->trans("CardProduct".$product->type);
 		$picto=($product->type==Product::TYPE_SERVICE?'service':'product');
-		dol_fiche_head($head, 'referers', $titre, 0, $picto);
+		dol_fiche_head($head, 'referers', $titre, -1, $picto);
 
 		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$product,$action);    // Note that $action and $object may have been modified by hook
 		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
diff --git a/htdocs/product/stats/commande_fournisseur.php b/htdocs/product/stats/commande_fournisseur.php
index bed3be1892f..3201e7ed2e8 100644
--- a/htdocs/product/stats/commande_fournisseur.php
+++ b/htdocs/product/stats/commande_fournisseur.php
@@ -101,7 +101,7 @@ if ($id > 0 || ! empty($ref)) {
 		$head = product_prepare_head($product);
 		$titre = $langs->trans("CardProduct" . $product->type);
 		$picto = ($product->type == Product::TYPE_SERVICE ? 'service' : 'product');
-		dol_fiche_head($head, 'referers', $titre, 0, $picto);
+		dol_fiche_head($head, 'referers', $titre, -1, $picto);
 
 		$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $product, $action); // Note that $action and $object may have been modified by hook
 		if ($reshook < 0)
diff --git a/htdocs/product/stats/contrat.php b/htdocs/product/stats/contrat.php
index 6a8183ca7de..e2f5bccc430 100644
--- a/htdocs/product/stats/contrat.php
+++ b/htdocs/product/stats/contrat.php
@@ -84,7 +84,7 @@ if ($id > 0 || ! empty($ref))
 		$head=product_prepare_head($product);
 		$titre=$langs->trans("CardProduct".$product->type);
 		$picto=($product->type==Product::TYPE_SERVICE?'service':'product');
-		dol_fiche_head($head, 'referers', $titre, 0, $picto);
+		dol_fiche_head($head, 'referers', $titre, -1, $picto);
 
 		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$product,$action);    // Note that $action and $object may have been modified by hook
 		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php
index f0e5b0f13c4..506689a6001 100644
--- a/htdocs/product/stats/facture.php
+++ b/htdocs/product/stats/facture.php
@@ -111,7 +111,7 @@ if ($id > 0 || ! empty($ref))
 		$head=product_prepare_head($product);
 		$titre=$langs->trans("CardProduct".$product->type);
 		$picto=($product->type==Product::TYPE_SERVICE?'service':'product');
-		dol_fiche_head($head, 'referers', $titre, 0, $picto);
+		dol_fiche_head($head, 'referers', $titre, -1, $picto);
 
 		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$product,$action);    // Note that $action and $object may have been modified by hook
 		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
diff --git a/htdocs/product/stats/facture_fournisseur.php b/htdocs/product/stats/facture_fournisseur.php
index 6fe189c7700..ac2849fefcf 100644
--- a/htdocs/product/stats/facture_fournisseur.php
+++ b/htdocs/product/stats/facture_fournisseur.php
@@ -96,7 +96,7 @@ if ($id > 0 || ! empty($ref))
 		$head = product_prepare_head($product);
 		$titre = $langs->trans("CardProduct" . $product->type);
 		$picto = ($product->type == Product::TYPE_SERVICE ? 'service' : 'product');
-		dol_fiche_head($head, 'referers', $titre, 0, $picto);
+		dol_fiche_head($head, 'referers', $titre, -1, $picto);
 
 		$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $product, $action); // Note that $action and $object may have been modified by hook
 		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
diff --git a/htdocs/product/stats/propal.php b/htdocs/product/stats/propal.php
index 289cf3d3578..06d43838bce 100644
--- a/htdocs/product/stats/propal.php
+++ b/htdocs/product/stats/propal.php
@@ -94,7 +94,7 @@ if ($id > 0 || ! empty($ref))
 		$head = product_prepare_head($product);
 		$titre = $langs->trans("CardProduct" . $product->type);
 		$picto = ($product->type == Product::TYPE_SERVICE ? 'service' : 'product');
-		dol_fiche_head($head, 'referers', $titre, 0, $picto);
+		dol_fiche_head($head, 'referers', $titre, -1, $picto);
 
 		$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $product, $action); // Note that $action and $object may have been modified by hook
 		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');

From 2b9f654b8cb4837a0c499ce6203c3d65b6e6c6d0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 22 May 2017 15:31:05 +0200
Subject: [PATCH 453/505] Fix translation

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

diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang
index 02fa209c340..280a1666b02 100644
--- a/htdocs/langs/en_US/other.lang
+++ b/htdocs/langs/en_US/other.lang
@@ -158,8 +158,8 @@ AuthenticationDoesNotAllowSendNewPassword=Authentication mode is <b>%s</b>.<br /
 EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use this option.
 ProfIdShortDesc=<b>Prof Id %s</b> is an information depending on third party country.<br>For example, for country <b>%s</b>, it's code <b>%s</b>.
 DolibarrDemo=Dolibarr ERP/CRM demo
-StatsByNumberOfUnits=Statistics in number of products/services units
-StatsByNumberOfEntities=Statistics in number of referring entities
+StatsByNumberOfUnits=Statistics for sum of qty of products/services
+StatsByNumberOfEntities=Statistics in number of referring entities (nb of invoice, or order...)
 NumberOfProposals=Number of proposals
 NumberOfCustomerOrders=Number of customer orders
 NumberOfCustomerInvoices=Number of customer invoices

From 0cd030d856357497860b1f64dd86399738afc65b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 23 May 2017 00:13:07 +0200
Subject: [PATCH 454/505] NEW Introduce mass actions on contacts

---
 htdocs/contact/list.php | 105 +++++++++++++++++++++++++++-------------
 htdocs/main.inc.php     |   2 +-
 htdocs/societe/list.php |  10 ++--
 3 files changed, 79 insertions(+), 38 deletions(-)

diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index fc601cf8a53..39557a6e455 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -32,8 +32,13 @@ require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 
-$langs->load("companies");
-$langs->load("suppliers");
+$langs->loadLangs(array("companies", "suppliers"));
+
+$action=GETPOST('action','alpha');
+$massaction=GETPOST('massaction','alpha');
+$show_files=GETPOST('show_files','int');
+$confirm=GETPOST('confirm','alpha');
+$toselect = GETPOST('toselect', 'array');
 
 // Security check
 $id = GETPOST('id','int');
@@ -177,7 +182,7 @@ if (empty($reshook))
     // Selection of new fields
     include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
-    // Purge search criteria
+    // Did we click on purge search criteria ?
     if (GETPOST('button_removefilter_x') || GETPOST('button_removefilter.x') || GETPOST('button_removefilter'))	// All tests are required to be compatible with all browsers
     {
         $sall="";
@@ -198,6 +203,7 @@ if (empty($reshook))
         $search_categ='';
         $search_categ_thirdparty='';
         $search_categ_supplier='';
+        $toselect='';
         $search_array_options=array();
     }
 
@@ -205,7 +211,7 @@ if (empty($reshook))
     $objectclass='Contact';
     $objectlabel='Contact';
     $permtoread = $user->rights->societe->lire;
-    $permtodelete = $user->rights->societe->delete;
+    $permtodelete = $user->rights->societe->supprimer;
     $uploaddir = $conf->societe->dir_output;
     include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }
@@ -224,7 +230,7 @@ $contactstatic=new Contact($db);
 $title = (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses"));
 
 $sql = "SELECT s.rowid as socid, s.nom as name,";
-$sql.= " p.rowid as cidp, p.lastname as lastname, p.statut, p.firstname, p.zip, p.town, p.poste, p.email, p.skype,";
+$sql.= " p.rowid, p.lastname as lastname, p.statut, p.firstname, p.zip, p.town, p.poste, p.email, p.skype,";
 $sql.= " p.phone as phone_pro, p.phone_mobile, p.phone_perso, p.fax, p.fk_pays, p.priv, p.datec as date_creation, p.tms as date_update,";
 $sql.= " co.code as country_code";
 // Add fields from extrafields
@@ -374,8 +380,6 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 
 $sql.= $db->plimit($limit+1, $offset);
 
-//print $sql;
-dol_syslog("contact/list.php", LOG_DEBUG);
 $result = $db->query($sql);
 if (! $result)
 {
@@ -385,15 +389,18 @@ if (! $result)
 
 $num = $db->num_rows($result);
 
+$arrayofselected=is_array($toselect)?$toselect:array();
+
 if ($num == 1 && ! empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $sall)
 {
     $obj = $db->fetch_object($resql);
-    $id = $obj->cidp;
+    $id = $obj->rowid;
     header("Location: ".DOL_URL_ROOT.'/contact/card.php?id='.$id);
     exit;
 }
 
-llxHeader('',$title,'EN:Module_Third_Parties|FR:Module_Tiers|ES:M&oacute;dulo_Empresas');
+$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:M&oacute;dulo_Empresas';
+llxHeader('',$title,$help_url);
 
 $param='';
 if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
@@ -426,16 +433,26 @@ foreach ($search_array_options as $key => $val)
     if ($val != '') $param.='&search_options_'.$tmpkey.'='.urlencode($val);
 }
 
-print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
+// List of mass actions available
+$arrayofmassactions =  array(
+//    'presend'=>$langs->trans("SendByMail"),
+//    'builddoc'=>$langs->trans("PDFMerge"),
+);
+//if($user->rights->societe->creer) $arrayofmassactions['createbills']=$langs->trans("CreateInvoiceForThisCustomer");
+if ($user->rights->societe->supprimer) $arrayofmassactions['delete']=$langs->trans("Delete");
+if ($massaction == 'presend') $arrayofmassactions=array();
+$massactionbutton=$form->selectMassAction('', $arrayofmassactions);
+
+print '<form method="post" action="'.$_SERVER["PHP_SELF"].'" name="formfilter">';
 if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
-print '<input type="hidden" name="view" value="'.dol_escape_htmltag($view).'">';
 print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 print '<input type="hidden" name="page" value="'.$page.'">';
+print '<input type="hidden" name="view" value="'.dol_escape_htmltag($view).'">';
 
-print_barre_liste($titre, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_companies.png', 0, '', '', $limit);
+print_barre_liste($titre, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_companies.png', 0, '', '', $limit);
 
 if ($sall)
 {
@@ -447,6 +464,7 @@ if ($search_firstlast_only)
     print $langs->trans("FilterOnInto", $search_firstlast_only) . $langs->trans("Lastname").", ".$langs->trans("Firstname");
 }
 
+$moreforfilter='';
 if (! empty($conf->categorie->enabled))
 {
 	require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
@@ -483,6 +501,7 @@ if ($moreforfilter)
 
 $varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
 $selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
+if ($massactionbutton) $selectedfields.=$form->showCheckAddButtons('checkforselect', 1);
 
 print '<div class="div-table-responsive">';
 print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
@@ -575,7 +594,18 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
    {
 		if (! empty($arrayfields["ef.".$key]['checked']))
 		{
-			print '<td class="liste_titre">';
+            $align=$extrafields->getAlignFlag($key);
+            $typeofextrafield=$extrafields->attribute_type[$key];
+            print '<td class="liste_titre'.($align?' '.$align:'').'">';
+		    if (in_array($typeofextrafield, array('varchar', 'int', 'double', 'select')))
+			{
+			    $crit=$val;
+				$tmpkey=preg_replace('/search_options_/','',$key);
+				$searchclass='';
+				if (in_array($typeofextrafield, array('varchar', 'select'))) $searchclass='searchstring';
+				if (in_array($typeofextrafield, array('int', 'double'))) $searchclass='searchnum';
+				print '<input class="flat'.($searchclass?' '.$searchclass:'').'" size="4" type="text" name="search_options_'.$tmpkey.'" value="'.dol_escape_htmltag($search_array_options['search_options_'.$tmpkey]).'">';
+			}
 			print '</td>';
 		}
    }
@@ -596,15 +626,17 @@ if (! empty($arrayfields['p.tms']['checked']))
     print '<td class="liste_titre">';
     print '</td>';
 }
+// Status
 if (! empty($arrayfields['p.statut']['checked']))
 {
     print '<td class="liste_titre" align="center">';
     print $form->selectarray('search_status', array('-1'=>'', '0'=>$langs->trans('ActivityCeased'),'1'=>$langs->trans('InActivity')),$search_status);
     print '</td>';
 }
+// Action column
 print '<td class="liste_titre" align="right">';
-print '<input type="image" name="button_search" class="liste_titre" 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" name="button_removefilter" class="liste_titre" src="'.img_picto($langs->trans("RemoveFilter"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
+$searchpicto=$form->showFilterButtons();
+print $searchpicto;
 print '</td>';
 
 print '</tr>';
@@ -656,7 +688,7 @@ while ($i < min($num,$limit))
 
 	$contactstatic->lastname=$obj->lastname;
 	$contactstatic->firstname='';
-	$contactstatic->id=$obj->cidp;
+	$contactstatic->id=$obj->rowid;
 	$contactstatic->statut=$obj->statut;
 	$contactstatic->poste=$obj->poste;
 	$contactstatic->email=$obj->email;
@@ -696,32 +728,32 @@ while ($i < min($num,$limit))
     // Phone
     if (! empty($arrayfields['p.phone']['checked']))
     {
-        print '<td>'.dol_print_phone($obj->phone_pro,$obj->country_code,$obj->cidp,$obj->socid,'AC_TEL').'</td>';
+        print '<td>'.dol_print_phone($obj->phone_pro,$obj->country_code,$obj->rowid,$obj->socid,'AC_TEL').'</td>';
     }
     // Phone perso
     if (! empty($arrayfields['p.phone_perso']['checked']))
     {
-        print '<td>'.dol_print_phone($obj->phone_perso,$obj->country_code,$obj->cidp,$obj->socid,'AC_TEL').'</td>';
+        print '<td>'.dol_print_phone($obj->phone_perso,$obj->country_code,$obj->rowid,$obj->socid,'AC_TEL').'</td>';
     }
     // Phone mobile
     if (! empty($arrayfields['p.phone_mobile']['checked']))
     {
-        print '<td>'.dol_print_phone($obj->phone_mobile,$obj->country_code,$obj->cidp,$obj->socid,'AC_TEL').'</td>';
+        print '<td>'.dol_print_phone($obj->phone_mobile,$obj->country_code,$obj->rowid,$obj->socid,'AC_TEL').'</td>';
     }
     // Fax
     if (! empty($arrayfields['p.fax']['checked']))
     {
-        print '<td>'.dol_print_phone($obj->fax,$obj->country_code,$obj->cidp,$obj->socid,'AC_TEL').'</td>';
+        print '<td>'.dol_print_phone($obj->fax,$obj->country_code,$obj->rowid,$obj->socid,'AC_TEL').'</td>';
     }
     // EMail
     if (! empty($arrayfields['p.email']['checked']))
     {
-        print '<td>'.dol_print_email($obj->email,$obj->cidp,$obj->socid,'AC_EMAIL',18).'</td>';
+        print '<td>'.dol_print_email($obj->email,$obj->rowid,$obj->socid,'AC_EMAIL',18).'</td>';
     }
     // Skype
     if (! empty($arrayfields['p.skype']['checked']))
     {
-        if (! empty($conf->skype->enabled)) { print '<td>'.dol_print_skype($obj->skype,$obj->cidp,$obj->socid,'AC_SKYPE',18).'</td>'; }
+        if (! empty($conf->skype->enabled)) { print '<td>'.dol_print_skype($obj->skype,$obj->rowid,$obj->socid,'AC_SKYPE',18).'</td>'; }
     }
     // Company
     if (! empty($arrayfields['p.thirdparty']['checked']))
@@ -784,28 +816,35 @@ while ($i < min($num,$limit))
     {
         print '<td align="center">'.$contactstatic->getLibStatut(3).'</td>';
     }
-    // Action column - Links Add action and Export vcard
-    print '<td class="center">';
-    /*print '<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&amp;backtopage=1&amp;contactid='.$obj->cidp.'&amp;socid='.$obj->socid.'">'.img_object($langs->trans("AddAction"),"action").'</a>';
-    print ' &nbsp; ';
-    print '<a href="'.DOL_URL_ROOT.'/contact/vcard.php?id='.$obj->cidp.'">';
-    print img_picto($langs->trans("VCard"),'vcard.png').' ';
-    print '</a>'; */
-    print '</td>';
 
+   // Action column
+    print '<td class="nowrap" align="center">';
+    if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+    {
+        $selected=0;
+		if (in_array($obj->rowid, $arrayofselected)) $selected=1;
+		print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected?' checked="checked"':'').'>';
+    }
+    print '</td>';
+    if (! $i) $totalarray['nbfield']++;
+    
     print "</tr>\n";
     $i++;
 }
 
+$db->free($result);
+
+$parameters=array('arrayfields'=>$arrayfields, 'sql'=>$sql);
+$reshook=$hookmanager->executeHooks('printFieldListFooter',$parameters);    // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+
 print "</table>";
 print "</div>";
 
-if ($num > $limit || $page) print_barre_liste('', $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_companies.png', 0, '', '', $limit, 1);
+//if ($num > $limit || $page) print_barre_liste('', $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_companies.png', 0, '', '', $limit, 1);
 
 print '</form>';
 
-$db->free($result);
-
 
 llxFooter();
 $db->close();
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 73f0a815413..e674aea6d5c 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -859,7 +859,7 @@ if (! defined('NOLOGIN'))
 }
 
 
-dol_syslog("--- Access to ".$_SERVER["PHP_SELF"]);
+dol_syslog("--- Access to ".$_SERVER["PHP_SELF"].' - action='.GETPOST('action','az09').', massaction='.GETPOST('massaction','az09'));
 //Another call for easy debugg
 //dol_syslog("Access to ".$_SERVER["PHP_SELF"].' GET='.join(',',array_keys($_GET)).'->'.join(',',$_GET).' POST:'.join(',',array_keys($_POST)).'->'.join(',',$_POST));
 
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 40ca07783c4..48e1b67a69c 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -187,6 +187,8 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
    }
 }
 
+$object = new Societe($db);
+
 
 /*
  * Actions
@@ -196,7 +198,7 @@ if (GETPOST('cancel')) { $action='list'; $massaction=''; }
 if (! GETPOST('confirmmassaction') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction=''; }
 
 $parameters=array();
-$reshook=$hookmanager->executeHooks('doActions',$parameters);    // Note that $action and $object may have been modified by some hooks
+$reshook=$hookmanager->executeHooks('doActions',$parameters, $object, $action);    // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 if (empty($reshook))
@@ -204,7 +206,7 @@ if (empty($reshook))
     // Selection of new fields
     include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
-    // Do we click on purge search criteria ?
+    // Did we click on purge search criteria ?
     if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // All tests are required to be compatible with all browsers
     {
         $search_nom='';
@@ -603,7 +605,7 @@ if ($user->rights->societe->client->voir || $socid)
 	$moreforfilter.=$formother->select_salesrepresentatives($search_sale,'search_sale',$user, 0, 1, 'maxwidth300');
 	$moreforfilter.='</div>';
 }
-if (! empty($moreforfilter))
+if ($moreforfilter)
 {
 	print '<div class="liste_titre liste_titre_bydiv centpercent">';
 	print $moreforfilter;
@@ -905,7 +907,7 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
         if (! empty($arrayfields["ef.".$key]['checked']))
         {
             $align=$extrafields->getAlignFlag($key);
-            print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+            print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
         }
     }
 }

From 2da50f1eca2aa36fb56f540e93c8e0068e6b7417 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 23 May 2017 01:32:19 +0200
Subject: [PATCH 455/505] Look and feel v6

---
 htdocs/comm/card.php        |  2 +-
 htdocs/contact/agenda.php   |  2 +-
 htdocs/contact/card.php     |  2 +-
 htdocs/contact/document.php |  2 +-
 htdocs/contact/info.php     |  2 +-
 htdocs/contact/ldap.php     |  2 +-
 htdocs/contact/note.php     | 50 +------------------------------------
 htdocs/contact/perso.php    |  2 +-
 htdocs/fourn/card.php       |  2 +-
 htdocs/societe/card.php     |  8 +++---
 10 files changed, 14 insertions(+), 60 deletions(-)

diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index b26ce4fa7ac..7599cce4cfd 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -204,7 +204,7 @@ if ($id > 0)
 {
 	$head = societe_prepare_head($object);
 
-	dol_fiche_head($head, 'customer', $langs->trans("ThirdParty"),0,'company');
+	dol_fiche_head($head, 'customer', $langs->trans("ThirdParty"), -1, 'company');
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php">'.$langs->trans("BackToList").'</a>';
 	
diff --git a/htdocs/contact/agenda.php b/htdocs/contact/agenda.php
index e97263ebf00..f57e088e00e 100644
--- a/htdocs/contact/agenda.php
+++ b/htdocs/contact/agenda.php
@@ -208,7 +208,7 @@ else
 
         dol_htmloutput_errors($error,$errors);
 
-        dol_fiche_head($head, 'agenda', $title, 0, 'contact');
+        dol_fiche_head($head, 'agenda', $title, -1, 'contact');
 
         $linkback = '<a href="'.DOL_URL_ROOT.'/contact/list.php">'.$langs->trans("BackToList").'</a>';
         
diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index dfa6eec515c..fde2e428169 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -1021,7 +1021,7 @@ else
 
         dol_htmloutput_errors($error,$errors);
 
-        dol_fiche_head($head, 'card', $title, 0, 'contact');
+        dol_fiche_head($head, 'card', $title, -1, 'contact');
 
         if ($action == 'create_user')
         {
diff --git a/htdocs/contact/document.php b/htdocs/contact/document.php
index 5d70ba7b4e1..da8ef616a4f 100644
--- a/htdocs/contact/document.php
+++ b/htdocs/contact/document.php
@@ -96,7 +96,7 @@ if ($object->id)
     $head = contact_prepare_head($object);
 	$title = (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses"));
 
-    dol_fiche_head($head, 'documents', $title, 0, 'contact');
+    dol_fiche_head($head, 'documents', $title, -1, 'contact');
 
 
     // Construit liste des fichiers
diff --git a/htdocs/contact/info.php b/htdocs/contact/info.php
index 0250691e88d..20d379b50d0 100644
--- a/htdocs/contact/info.php
+++ b/htdocs/contact/info.php
@@ -59,7 +59,7 @@ if ($id > 0)
 
 	$head = contact_prepare_head($object);
 
-	dol_fiche_head($head, 'info', $title, 0, 'contact');
+	dol_fiche_head($head, 'info', $title, -1, 'contact');
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/contact/list.php">'.$langs->trans("BackToList").'</a>';
 
diff --git a/htdocs/contact/ldap.php b/htdocs/contact/ldap.php
index 3e998b43ec5..16c00bf92cb 100644
--- a/htdocs/contact/ldap.php
+++ b/htdocs/contact/ldap.php
@@ -88,7 +88,7 @@ $form = new Form($db);
 
 $head = contact_prepare_head($object);
 
-dol_fiche_head($head, 'ldap', $title, 0, 'contact');
+dol_fiche_head($head, 'ldap', $title, -1, 'contact');
 
 dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', '');
     
diff --git a/htdocs/contact/note.php b/htdocs/contact/note.php
index c49dbc9f787..b52f9bf8727 100644
--- a/htdocs/contact/note.php
+++ b/htdocs/contact/note.php
@@ -73,7 +73,7 @@ if ($id > 0)
 
     $head = contact_prepare_head($object);
 
-    dol_fiche_head($head, 'note', $title,0,'contact');
+    dol_fiche_head($head, 'note', $title, -1, 'contact');
     
     $linkback = '<a href="'.DOL_URL_ROOT.'/contact/list.php">'.$langs->trans("BackToList").'</a>';
 
@@ -100,61 +100,13 @@ if ($id > 0)
 
 	print '<table class="border centpercent">';
 
-    // Company
-    if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
-    {
-    	if ($object->socid > 0)
-    	{
-    		$objsoc = new Societe($db);
-    		$objsoc->fetch($object->socid);
-
-    		print '<tr><td class="'.$cssclass.'">'.$langs->trans("ThirdParty").'</td><td>'.$objsoc->getNomUrl(1).'</td></tr>';
-    	}
-
-    	else
-    	{
-    		print '<tr><td class="'.$cssclass.'">'.$langs->trans("ThirdParty").'</td><td>';
-    		print $langs->trans("ContactNotLinkedToCompany");
-    		print '</td></tr>';
-    	}
-    }
-
     // Civility
     print '<tr><td class="'.$cssclass.'">'.$langs->trans("UserTitle").'</td><td>';
     print $object->getCivilityLabel();
     print '</td></tr>';
 
-    // Date To Birth
-    print '<tr>';
-    if (! empty($object->birthday))
-    {
-    	include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-
-    	print '<td>'.$langs->trans("DateToBirth").'</td><td>'.dol_print_date($object->birthday,"day");
-
-    	print ' &nbsp; ';
-    	//var_dump($birthdatearray);
-    	$ageyear=convertSecondToTime($now-$object->birthday,'year')-1970;
-    	$agemonth=convertSecondToTime($now-$object->birthday,'month')-1;
-    	if ($ageyear >= 2) print '('.$ageyear.' '.$langs->trans("DurationYears").')';
-    	else if ($agemonth >= 2) print '('.$agemonth.' '.$langs->trans("DurationMonths").')';
-    	else print '('.$agemonth.' '.$langs->trans("DurationMonth").')';
-
-
-    	print ' &nbsp; - &nbsp; ';
-    	if ($object->birthday_alert) print $langs->trans("BirthdayAlertOn");
-    	else print $langs->trans("BirthdayAlertOff");
-    	print '</td>';
-    }
-    else
-    {
-    	print '<td>'.$langs->trans("DateToBirth").'</td><td>'.$langs->trans("Unknown")."</td>";
-    }
-    print "</tr>";
-
     print "</table>";
 
-    print '<br>';
     
 	$cssclass="titlefield";
 	include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
diff --git a/htdocs/contact/perso.php b/htdocs/contact/perso.php
index bc4443dd8bf..30fa10b5ddc 100644
--- a/htdocs/contact/perso.php
+++ b/htdocs/contact/perso.php
@@ -229,7 +229,7 @@ else
 {
     // View mode
     
-    dol_fiche_head($head, 'perso', $title, 0, 'contact');
+    dol_fiche_head($head, 'perso', $title, -1, 'contact');
     
     $linkback = '<a href="'.DOL_URL_ROOT.'/contact/list.php">'.$langs->trans("BackToList").'</a>';
     
diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php
index 6243a9e3a16..cfa88b187f0 100644
--- a/htdocs/fourn/card.php
+++ b/htdocs/fourn/card.php
@@ -130,7 +130,7 @@ if ($object->id > 0)
 	 */
 	$head = societe_prepare_head($object);
 
-	dol_fiche_head($head, 'supplier', $langs->trans("ThirdParty"),0,'company');
+	dol_fiche_head($head, 'supplier', $langs->trans("ThirdParty"), -1, 'company');
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php">'.$langs->trans("BackToList").'</a>';
 	
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 14e8e4b4679..346f4ea38dc 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -1544,7 +1544,7 @@ else
 
             dol_fiche_head($head, 'card', $langs->trans("ThirdParty"), 0, 'company');
 
-
+            print '<div class="fichecenter2">'; 
             print '<table class="border" width="100%">';
 
             // Ref/ID
@@ -1934,7 +1934,8 @@ else
             print '</tr>';
 
             print '</table>';
-
+            print '</div>';
+            
 	        dol_fiche_end();
 
             print '<div align="center">';
@@ -1951,13 +1952,14 @@ else
         /*
          * View
          */
+        
         if (!empty($object->id)) $res=$object->fetch_optionals($object->id,$extralabels);
         //if ($res < 0) { dol_print_error($db); exit; }
 
 
         $head = societe_prepare_head($object);
 
-        dol_fiche_head($head, 'card', $langs->trans("ThirdParty"), 0, 'company');
+        dol_fiche_head($head, 'card', $langs->trans("ThirdParty"), -1, 'company');
 
         // Confirm delete third party
         if ($action == 'delete' || ($conf->use_javascript_ajax && empty($conf->dol_use_jmobile)))

From 8781a19e0e10d18317d81f6580bb04b8d87a9a2f Mon Sep 17 00:00:00 2001
From: arnaud <arnaud.saint-patrice@atm-consulting.fr>
Date: Tue, 23 May 2017 12:22:53 +0200
Subject: [PATCH 456/505] FIX pagination on resources

---
 htdocs/resource/list.php | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/htdocs/resource/list.php b/htdocs/resource/list.php
index 2c97b68f7ed..6e171eef934 100644
--- a/htdocs/resource/list.php
+++ b/htdocs/resource/list.php
@@ -91,15 +91,11 @@ if (empty($sortorder)) $sortorder="ASC";
 if (empty($sortfield)) $sortfield="t.rowid";
 if (empty($arch)) $arch = 0;
 
-$page           = GETPOST('page','int');
-if ($page == -1) {
-	$page = 0 ;
-}
+$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$page = GETPOST("page");
 $page = is_numeric($page) ? $page : 0;
 $page = $page == -1 ? 0 : $page;
-if (! $sortfield) $sortfield="p.ref";
-if (! $sortorder) $sortorder="ASC";
-$offset = $conf->liste_limit * $page ;
+$offset = $limit * $page ;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 

From 71bd69a8048c2d16d10d31d9cb5c996e730e1864 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 23 May 2017 13:25:12 +0200
Subject: [PATCH 457/505] Better link to show part to edit

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

diff --git a/htdocs/api/admin/index.php b/htdocs/api/admin/index.php
index d7f002d02aa..c22a12fee61 100644
--- a/htdocs/api/admin/index.php
+++ b/htdocs/api/admin/index.php
@@ -111,7 +111,7 @@ $urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain
 
 // Show message
 $message='';
-$url='<a href="'.$urlwithroot.'/api/index.php/login?login='.urlencode($user->login).'&password=yourpassword" target="_blank">'.$urlwithroot.'/api/index.php/login?login='.urlencode($user->login).'&password=yourpassword[&reset=1]</a>';
+$url=$urlwithroot.'/api/index.php/login?login=<strong>auserlogin</strong>&userpassword=<strong>thepassword</strong>[&reset=1]';
 $message.=$langs->trans("UrlToGetKeyToUseAPIs").':<br>';
 $message.=img_picto('','object_globe.png').' '.$url;
 print $message;

From 5ebe71166567ac84835d9b87b0a8f8eb93fefa28 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 23 May 2017 13:38:48 +0200
Subject: [PATCH 458/505] Look and feel v6

---
 htdocs/resource/card.php                    | 39 +++++++++++-----
 htdocs/resource/class/dolresource.class.php | 51 ++++++++++++++++-----
 htdocs/resource/contact.php                 | 31 ++++++++-----
 htdocs/resource/document.php                | 28 +++++++----
 htdocs/resource/note.php                    | 29 ++++++++----
 5 files changed, 125 insertions(+), 53 deletions(-)

diff --git a/htdocs/resource/card.php b/htdocs/resource/card.php
index d2ec14efd71..7f0a96a7ab4 100644
--- a/htdocs/resource/card.php
+++ b/htdocs/resource/card.php
@@ -221,29 +221,41 @@ if ( $object->fetch($id) > 0 )
 	}
 	else
 	{
-		dol_fiche_head($head, 'resource', $langs->trans("ResourceSingular"),0,'resource');
+		dol_fiche_head($head, 'resource', $langs->trans("ResourceSingular"), -1, 'resource');
 
+		$formconfirm = '';
+		
 		// Confirm deleting resource line
 	    if ($action == 'delete')
 	    {
-	        print $form->formconfirm("card.php?&id=".$id,$langs->trans("DeleteResource"),$langs->trans("ConfirmDeleteResource"),"confirm_delete_resource",'','',1);
+	        $formconfirm = $form->formconfirm("card.php?&id=".$id,$langs->trans("DeleteResource"),$langs->trans("ConfirmDeleteResource"),"confirm_delete_resource",'','',1);
 	    }
 
-
+	    // Print form confirm
+	    print $formconfirm;
+	    
+	    
+	    $linkback = '<a href="' . DOL_URL_ROOT . '/resource/list.php' . (! empty($socid) ? '?id=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
+	    
+	    
+	    $morehtmlref='<div class="refidno">';
+	    $morehtmlref.='</div>';
+	    
+	    
+	    dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref);
+	    
+	    
+	    print '<div class="fichecenter">';
+	    print '<div class="underbanner clearboth"></div>';
+	    
 		/*---------------------------------------
 		 * View object
 		 */
 		print '<table width="100%" class="border">';
 
-		print '<tr><td class="titlefield">'.$langs->trans("ResourceFormLabel_ref").'</td><td>';
-		$linkback = $objet->ref.' <a href="list.php">'.$langs->trans("BackToList").'</a>';
-		print $form->showrefnav($object, 'id', $linkback,1,"rowid");
-		print '</td>';
-		print '</tr>';
-
 		// Resource type
 		print '<tr>';
-		print '<td>' . $langs->trans("ResourceType") . '</td>';
+		print '<td class="titlefield">' . $langs->trans("ResourceType") . '</td>';
 		print '<td>';
 		print $object->type_label;
 		print '</td>';
@@ -267,9 +279,14 @@ if ( $object->fetch($id) > 0 )
 		print '</tr>';
 
 		print '</table>';
+		
+		print '</div>';
+		
+		print '<div class="clearboth"></div><br>';
+		
+		dol_fiche_end();
 	}
 
-	print '</div>';
 
 	/*
 	 * Boutons actions
diff --git a/htdocs/resource/class/dolresource.class.php b/htdocs/resource/class/dolresource.class.php
index 6e418e2e649..51024cfe7ee 100644
--- a/htdocs/resource/class/dolresource.class.php
+++ b/htdocs/resource/class/dolresource.class.php
@@ -30,18 +30,19 @@ require_once DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php";
  */
 class Dolresource extends CommonObject
 {
-	var $element='dolresource';			//!< Id that identify managed objects
-	var $table_element='resource';	//!< Name of table without prefix where object is stored
-
-	var $resource_id;
-	var $resource_type;
-	var $element_id;
-	var $element_type;
-	var $busy;
-	var $mandatory;
-	var $fk_user_create;
-	var $type_label;
-	var $tms='';
+	public $element='dolresource';			//!< Id that identify managed objects
+	public $table_element='resource';	//!< Name of table without prefix where object is stored
+    public $picto = 'resource';
+    
+	public $resource_id;
+	public $resource_type;
+	public $element_id;
+	public $element_type;
+	public $busy;
+	public $mandatory;
+	public $fk_user_create;
+	public $type_label;
+	public $tms='';
 
     /**
      *  Constructor
@@ -974,4 +975,30 @@ class Dolresource extends CommonObject
         $result.=$link.$this->ref.$linkend;
         return $result;
     }
+    
+    
+    /**
+     *  Retourne le libelle du status d'un user (actif, inactif)
+     *
+     *  @param	int		$mode          0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
+     *  @return	string 			       Label of status
+     */
+    function getLibStatut($mode=0)
+    {
+        return $this->LibStatut($this->status,$mode);
+    }
+    
+    /**
+     *  Return the status
+     *
+     *  @param	int		$status        	Id status
+     *  @param  int		$mode          	0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 5=Long label + Picto
+     *  @return string 			       	Label of status
+     */
+    static function LibStatut($status,$mode=0)
+    {
+        global $langs;
+    
+        return '';
+    }    
 }
diff --git a/htdocs/resource/contact.php b/htdocs/resource/contact.php
index 97dbb0de1be..007ecd8025d 100644
--- a/htdocs/resource/contact.php
+++ b/htdocs/resource/contact.php
@@ -119,23 +119,30 @@ if ($id > 0 || ! empty($ref))
 
 
 	$head = resource_prepare_head($object);
-	dol_fiche_head($head, 'contact', $langs->trans("ResourceSingular"), 0, 'resource');
+	dol_fiche_head($head, 'contact', $langs->trans("ResourceSingular"), -1, 'resource');
 
 
-	/*
-	*   Resource synthese pour rappel
-	*/
+	$linkback = '<a href="' . DOL_URL_ROOT . '/resource/list.php' . (! empty($socid) ? '?id=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
+	 
+	 
+	$morehtmlref='<div class="refidno">';
+	$morehtmlref.='</div>';
+	 
+	 
+	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref);
+	 
+	 
+	print '<div class="fichecenter">';
+	print '<div class="underbanner clearboth"></div>';
+	 
+	
+	// Object
+
 	print '<table width="100%" class="border">';
 
-	print '<tr><td class="titlefield">'.$langs->trans("ResourceFormLabel_ref").'</td><td>';
-	$linkback = $objet->ref.' <a href="list.php">'.$langs->trans("BackToList").'</a>';
-	print $form->showrefnav($object, 'id', $linkback,1,"rowid");
-	print '</td>';
-	print '</tr>';
-
 	// Resource type
 	print '<tr>';
-	print '<td>' . $langs->trans("ResourceType") . '</td>';
+	print '<td class="titlefield">' . $langs->trans("ResourceType") . '</td>';
 	print '<td>';
 	print $object->type_label;
 	print '</td>';
@@ -144,6 +151,8 @@ if ($id > 0 || ! empty($ref))
 	print '</table>';
 	print '</div>';
 
+	dol_fiche_end();
+	
 	print '<br>';
 
 	if (! empty($conf->global->RESOURCE_HIDE_ADD_CONTACT_USER))     $hideaddcontactforuser=1;
diff --git a/htdocs/resource/document.php b/htdocs/resource/document.php
index 1078e8bb94a..2d8e260d85a 100644
--- a/htdocs/resource/document.php
+++ b/htdocs/resource/document.php
@@ -89,7 +89,7 @@ if ($object->id)
 
 	$head=resource_prepare_head($object);
 
-	dol_fiche_head($head, 'documents',  $langs->trans("ResourceSingular"), 0, 'resource');
+	dol_fiche_head($head, 'documents',  $langs->trans("ResourceSingular"), -1, 'resource');
 
 
 	// Construit liste des fichiers
@@ -100,19 +100,25 @@ if ($object->id)
 		$totalsize+=$file['size'];
 	}
 
-
+	
+	$linkback = '<a href="' . DOL_URL_ROOT . '/resource/list.php' . (! empty($socid) ? '?id=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
+	 
+	 
+	$morehtmlref='<div class="refidno">';
+	$morehtmlref.='</div>';
+	 
+	 
+	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref);
+	 
+	 
+	print '<div class="fichecenter">';
+	print '<div class="underbanner clearboth"></div>';
+	 
     print '<table class="border" width="100%">';
 
-
-	print '<tr><td class="titlefield">'.$langs->trans("ResourceFormLabel_ref").'</td><td>';
-	$linkback = $objet->ref.' <a href="list.php">'.$langs->trans("BackToList").'</a>';
-	print $form->showrefnav($object, 'id', $linkback,1,"rowid");
-	print '</td>';
-	print '</tr>';
-
 	// Resource type
 	print '<tr>';
-	print '<td>' . $langs->trans("ResourceType") . '</td>';
+	print '<td class="titlefield">' . $langs->trans("ResourceType") . '</td>';
 	print '<td>';
 	print $object->type_label;
 	print '</td>';
@@ -124,6 +130,8 @@ if ($object->id)
 
     print '</div>';
 
+    dol_fiche_end();
+    
     $modulepart = 'dolresource';
     $permission = $user->rights->resource->write;
     $param = '&id=' . $object->id;
diff --git a/htdocs/resource/note.php b/htdocs/resource/note.php
index 30e37eba77f..20d96591c7b 100644
--- a/htdocs/resource/note.php
+++ b/htdocs/resource/note.php
@@ -64,24 +64,35 @@ $form = new Form($db);
 if ($id > 0 || ! empty($ref))
 {
 	$head = resource_prepare_head($object);
-	dol_fiche_head($head, 'note', $langs->trans('ResourceSingular'), 0, 'resource');
+	dol_fiche_head($head, 'note', $langs->trans('ResourceSingular'), -1, 'resource');
 
+	$linkback = '<a href="' . DOL_URL_ROOT . '/resource/list.php' . (! empty($socid) ? '?id=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
+	 
+	 
+	$morehtmlref='<div class="refidno">';
+	$morehtmlref.='</div>';
+	 
+	 
+	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref);
+	 
+	 
+	print '<div class="fichecenter">';
+	print '<div class="underbanner clearboth"></div>';
+	 
 	print '<table class="border" width="100%">';
-	print '<tr><td class="titlefield">'.$langs->trans("ResourceFormLabel_ref").'</td><td>';
-	$linkback = $objet->ref.' <a href="list.php">'.$langs->trans("BackToList").'</a>';
-	print $form->showrefnav($object, 'id', $linkback,1,"rowid");
-	print '</td>';
-	print '</tr>';
 
 	// Resource type
 	print '<tr>';
-	print '<td>' . $langs->trans("ResourceType") . '</td>';
+	print '<td class="titlefield">' . $langs->trans("ResourceType") . '</td>';
 	print '<td>';
 	print $object->type_label;
 	print '</td>';
-	print '</tr>';		print "</table>";
+	print '</tr>';
+	
+	print "</table>";
 
-	print '<br>';
+	print '</div>';
+	
 	$permission=$user->rights->resource->write;
 	$cssclass='titlefield';
 	include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';

From 3e37185b74de67d4f6cf5e77fdd5e2cb5ed06e28 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 23 May 2017 13:44:18 +0200
Subject: [PATCH 459/505] FIX download attached file on resource

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

diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index c60464ed0fd..4c492d1693e 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -2214,6 +2214,16 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		$original_file=$conf->don->dir_output.'/'.$original_file;
 	}
 
+	// Wrapping pour les dons
+	else if ($modulepart == 'dolresource' && !empty($conf->resource->dir_output))
+	{
+		if ($fuser->rights->resource->{$read} || preg_match('/^specimen/i',$original_file))
+		{
+			$accessallowed=1;
+		}
+		$original_file=$conf->resource->dir_output.'/'.$original_file;
+	}
+	
 	// Wrapping pour les remises de cheques
 	else if ($modulepart == 'remisecheque' && !empty($conf->banque->dir_output))
 	{

From 80ce8da7a388f157beb81e46ed465b952004a857 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 23 May 2017 15:13:52 +0200
Subject: [PATCH 460/505] Fix migration errors and responsive design

---
 htdocs/contrat/card.php                       | 67 ++++++++++---------
 htdocs/core/class/html.formactions.class.php  |  5 +-
 htdocs/install/default.css                    |  6 +-
 .../install/mysql/migration/5.0.0-6.0.0.sql   | 17 +++++
 .../mysql/tables/llx_opensurvey_sondage.sql   |  2 +-
 htdocs/install/step5.php                      |  8 +--
 htdocs/theme/eldy/style.css.php               |  2 +-
 htdocs/theme/md/style.css.php                 | 17 +++--
 8 files changed, 72 insertions(+), 52 deletions(-)

diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index f00816e9d4b..31e5d6f3094 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -2083,44 +2083,45 @@ else
 
             print "</div>";
         }
-	// Select mail models is same action as presend
-	if (GETPOST('modelselected')) {
-		$action = 'presend';
-	}
-
-	if ($action != 'presend')
-	{
-		print '<div class="fichecenter"><div class="fichehalfleft">';
-
-		/*
-		 * Documents generes
-		*/
-		$filename = dol_sanitizeFileName($object->ref);
-		$filedir = $conf->contrat->dir_output . "/" . dol_sanitizeFileName($object->ref);
-		$urlsource = $_SERVER["PHP_SELF"] . "?id=" . $object->id;
-		$genallowed = $user->rights->contrat->creer;
-		$delallowed = $user->rights->contrat->supprimer;
-
-		$var = true;
-
-		print $formfile->showdocuments('contract', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', 0, '', $soc->default_lang);
-
-
-			// Show links to link elements
-			$linktoelem = $form->showLinkToObjectBlock($object, null, array('contrat'));
-			$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
-
-
-		print '</div><div class="fichehalfright"><div class="ficheaddleft">';
-
+        
+    	// Select mail models is same action as presend
+    	if (GETPOST('modelselected')) {
+    		$action = 'presend';
+    	}
+    
+    	if ($action != 'presend')
+    	{
+    		print '<div class="fichecenter"><div class="fichehalfleft">';
+    
+    		/*
+    		 * Documents generes
+    		*/
+    		$filename = dol_sanitizeFileName($object->ref);
+    		$filedir = $conf->contrat->dir_output . "/" . dol_sanitizeFileName($object->ref);
+    		$urlsource = $_SERVER["PHP_SELF"] . "?id=" . $object->id;
+    		$genallowed = $user->rights->contrat->creer;
+    		$delallowed = $user->rights->contrat->supprimer;
+    
+    		$var = true;
+    
+    		print $formfile->showdocuments('contract', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', 0, '', $soc->default_lang);
+    
+    
+    			// Show links to link elements
+    			$linktoelem = $form->showLinkToObjectBlock($object, null, array('contrat'));
+    			$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
+    
+    
+    		print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+    
 			// List of actions on element
 			include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
 			$formactions = new FormActions($db);
 			$somethingshown = $formactions->showactions($object, 'contract', $socid);
 
-
-		print '</div></div></div>';
-	}
+    
+    		print '</div></div></div>';
+    	}
 
 		/*
 		 * Action presend
diff --git a/htdocs/core/class/html.formactions.class.php b/htdocs/core/class/html.formactions.class.php
index 452ff89d914..456faa7931e 100644
--- a/htdocs/core/class/html.formactions.class.php
+++ b/htdocs/core/class/html.formactions.class.php
@@ -189,7 +189,9 @@ class FormActions
 
         	$page=0; $param=''; $sortfield='a.datep';
         	
-        	$total = 0;	$var=true; 
+        	$total = 0; 
+        	
+        	print '<div class="div-table-responsive">';
         	print '<table class="noborder'.($morecss?' '.$morecss:'').'" width="100%">';
         	print '<tr class="liste_titre">';
         	print_liste_field_titre($langs->trans('Ref'), $_SERVER["PHP_SELF"], '', $page, $param, '');
@@ -243,6 +245,7 @@ class FormActions
         		print '</tr>';
         	}
         	print '</table>';
+        	print '</div>';
         }
 
         return $num;
diff --git a/htdocs/install/default.css b/htdocs/install/default.css
index 9725b06b8bc..b3905e63a49 100644
--- a/htdocs/install/default.css
+++ b/htdocs/install/default.css
@@ -54,9 +54,9 @@ span.titre {
 	font-weight: bold;
 	background: #FFFFFF;
 	color: #444;
-	border: 1px solid #999;
-	padding: 5px 5px 5px 5px;
-	margin: 0 0 0 15px;
+	border: 1px solid #bbb;
+	padding: 10px 10px 10px 10px;
+	margin: 0 0 10px 10px;
 }
 
 div.soustitre {
diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index 0bd68ddfcfb..a21c340b556 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -25,6 +25,23 @@
 -- -- VMYSQL4.1 DELETE FROM llx_usergroup_user      WHERE fk_usergroup NOT IN (SELECT rowid from llx_usergroup);
 
 
+-- Clean corrupted values for tms
+-- VMYSQL4.1 SET sql_mode = 'ALLOW_INVALID_DATES';
+-- VMYSQL4.1 update llx_opensurvey_sondage set tms = date_fin where DATE(STR_TO_DATE(tms, '%Y-%m-%d')) IS NULL;
+-- VMYSQL4.1 SET sql_mode = 'NO_ZERO_DATE';
+-- VMYSQL4.1 update llx_opensurvey_sondage set tms = date_fin where DATE(STR_TO_DATE(tms, '%Y-%m-%d')) IS NULL;
+-- Remove default not null on date_fin
+-- VMYSQL4.3 ALTER TABLE llx_opensurvey_sondage MODIFY COLUMN date_fin DATETIME NULL DEFAULT NULL;
+-- VPGSQL8.2 ALTER TABLE llx_opensurvey_sondage ALTER COLUMN date_fin DROP NOT NULL;
+
+ALTER TABLE llx_opensurvey_sondage MODIFY COLUMN tms timestamp DEFAULT CURRENT_TIMESTAMP;
+
+ALTER TABLE llx_opensurvey_sondage ADD COLUMN fk_user_creat integer NOT NULL DEFAULT 0;
+ALTER TABLE llx_opensurvey_sondage ADD COLUMN status integer DEFAULT 1 after date_fin;
+ALTER TABLE llx_opensurvey_sondage ADD COLUMN entity integer DEFAULT 1 NOT NULL;
+ALTER TABLE llx_opensurvey_sondage ADD COLUMN allow_comments tinyint NOT NULL DEFAULT 1;
+
+
 create table llx_notify_def_object
 (
   id				integer AUTO_INCREMENT PRIMARY KEY,
diff --git a/htdocs/install/mysql/tables/llx_opensurvey_sondage.sql b/htdocs/install/mysql/tables/llx_opensurvey_sondage.sql
index 5ea2183758a..e9b2481757d 100644
--- a/htdocs/install/mysql/tables/llx_opensurvey_sondage.sql
+++ b/htdocs/install/mysql/tables/llx_opensurvey_sondage.sql
@@ -23,7 +23,7 @@ CREATE TABLE llx_opensurvey_sondage (
 	nom_admin VARCHAR(64),
 	fk_user_creat integer NOT NULL,
 	titre TEXT NOT NULL,
-	date_fin DATETIME NOT NULL,
+	date_fin DATETIME NULL,
     status integer DEFAULT 1,
 	format VARCHAR(2) NOT NULL,                 -- 'A' = Text choice (choices are saved into sujet field), 'D' = Date choice (choices are saved into sujet field), 'F' = Form survey
 	mailsonde tinyint NOT NULL DEFAULT 0,
diff --git a/htdocs/install/step5.php b/htdocs/install/step5.php
index 96cc1c4fdcf..875fd9378f2 100644
--- a/htdocs/install/step5.php
+++ b/htdocs/install/step5.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2004       Rodolphe Quiedeville    <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2012  Laurent Destailleur     <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2017  Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2004       Benoit Mortier          <benoit.mortier@opensides.be>
  * Copyright (C) 2004       Sebastien DiCintio      <sdicintio@ressource-toi.org>
  * Copyright (C) 2005-2012  Regis Houssin           <regis.houssin@capnetworks.com>
@@ -395,11 +395,11 @@ elseif (empty($action) || preg_match('/upgrade/i',$action))
             print '<br><div class="warning">'.$langs->trans("WarningRemoveInstallDir")."</div>";
         }
 
-        print "<br>";
+        print "<br><br>";
 
         print '<div class="center"><a href="../index.php?mainmenu=home' . (isset($login) ? '&username=' . urlencode($login) : '') . '">';
-        print $langs->trans("GoToDolibarr");
-        print '</a></div>';
+        print $langs->trans("GoToDolibarr").'...';
+        print '</a></div><br>';
     }
     else
     {
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index b8f31b4e224..a8eddcd825f 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -698,7 +698,7 @@ div.fiche>form>div.div-table-responsive {
     justify-content: flex-start;
 }
 .thumbstat {
-	flex: 1 1 114px;
+	flex: 1 1 116px;
 }
 .thumbstat150 {
 	flex: 1 1 170px;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 91a4c0922d9..943540fa02f 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -544,7 +544,7 @@ textarea.centpercent {
 .cursorpointer {
 	cursor: pointer;
 }
-.cusormove {
+.cursormove {
 	cursor: move;
 }
 .badge {
@@ -701,7 +701,7 @@ div.fiche>form>div.div-table-responsive {
     justify-content: flex-start;
 }
 .thumbstat {
-	flex: 1 1 114px;
+	flex: 1 1 116px;
 }
 .thumbstat150 {
 	flex: 1 1 150px;
@@ -1979,9 +1979,10 @@ div.tabsElem { margin-top: 6px; }		/* To avoid overlap of tabs when not browser
 
 div.tabBar {
     color: #<?php echo $colortextbacktab; ?>;
-    padding-top: <?php echo ($dol_optimize_smallscreen?'4':'16'); ?>px;
-    padding-left: <?php echo ($dol_optimize_smallscreen?'4':'16'); ?>px;
-    padding-right: <?php echo ($dol_optimize_smallscreen?'4':'16'); ?>px;
+    padding-top: 16px;
+    padding-left: 16px;
+    padding-right: 16px;
+	padding-bottom: 16px;
     margin: 0px 0px 16px 0px;
     -moz-border-radius:3px;
     -webkit-border-radius: 3px;
@@ -1991,8 +1992,6 @@ div.tabBar {
     border-top: 1px solid #CCC;
 	width: auto;
 	background: rgb(<?php echo $colorbacktabcard1; ?>);
-
-	padding-bottom: 12px;
 	border-bottom: 1px solid #aaa; 
 }
 div.tabBar div.titre {
@@ -4627,8 +4626,8 @@ border-top-right-radius: 6px;
 	}
 
     div.tabBar {
-        padding-left: 0px;
-        padding-right: 0px;
+        padding-left: 8px;
+        padding-right: 8px;
         -moz-border-radius: 0;
         -webkit-border-radius: 0;
     	border-radius: 0px;

From cea98ce5cbfe4baaee079cbab4923e862650c461 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 23 May 2017 15:30:56 +0200
Subject: [PATCH 461/505] Look and feel v6

---
 .../install/mysql/migration/5.0.0-6.0.0.sql   |  2 ++
 htdocs/opensurvey/card.php                    | 31 ++++++++--------
 .../class/opensurveysondage.class.php         | 25 ++++++-------
 htdocs/opensurvey/results.php                 | 35 ++++++++++---------
 4 files changed, 47 insertions(+), 46 deletions(-)

diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index a21c340b556..6c71f279867 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -40,6 +40,8 @@ ALTER TABLE llx_opensurvey_sondage ADD COLUMN fk_user_creat integer NOT NULL DEF
 ALTER TABLE llx_opensurvey_sondage ADD COLUMN status integer DEFAULT 1 after date_fin;
 ALTER TABLE llx_opensurvey_sondage ADD COLUMN entity integer DEFAULT 1 NOT NULL;
 ALTER TABLE llx_opensurvey_sondage ADD COLUMN allow_comments tinyint NOT NULL DEFAULT 1;
+ALTER TABLE llx_opensurvey_sondage ADD COLUMN allow_spy tinyint NOT NULL DEFAULT 1 AFTER allow_comments;
+ALTER TABLE llx_opensurvey_sondage ADD COLUMN sujet TEXT;
 
 
 create table llx_notify_def_object
diff --git a/htdocs/opensurvey/card.php b/htdocs/opensurvey/card.php
index d7a466a5217..707af9f7115 100644
--- a/htdocs/opensurvey/card.php
+++ b/htdocs/opensurvey/card.php
@@ -212,22 +212,23 @@ print '<input type="hidden" name="action" value="update">';
 $head = opensurvey_prepare_head($object);
 
 
-dol_fiche_head($head,'general',$langs->trans("Survey"),0,dol_buildpath('/opensurvey/img/object_opensurvey.png',1),1);
+dol_fiche_head($head,'general',$langs->trans("Survey"), -1, DOL_URL_ROOT.'/opensurvey/img/object_opensurvey.png', 1);
+
+$morehtmlref = '';
+
+$linkback = '<a href="'.DOL_URL_ROOT.'/opensurvey/list.php">'.$langs->trans("BackToList").'</a>';
+
+dol_banner_tab($object, 'id', $linkback, 1, 'id_sondage', 'id_sondage', $morehtmlref);
+
+
+print '<div class="fichecenter">';
+print '<div class="underbanner clearboth"></div>';
 
 print '<table class="border" width="100%">';
 
-$linkback = '<a href="'.dol_buildpath('/opensurvey/list.php',1).'">'.$langs->trans("BackToList").'</a>';
-
-// Ref
-print '<tr><td class="titlefield">'.$langs->trans('Ref').'</td>';
-print '<td colspan="3">';
-print $form->showrefnav($object, 'id', $linkback, 1, 'id_sondage', 'id_sondage');
-print '</td>';
-print '</tr>';
-
 // Type
 $type=($object->format=="A")?'classic':'date';
-print '<tr><td>'.$langs->trans("Type").'</td><td colspan="2">';
+print '<tr><td class="titlefield">'.$langs->trans("Type").'</td><td colspan="2">';
 print img_picto('',dol_buildpath('/opensurvey/img/'.($type == 'classic'?'chart-32.png':'calendar-32.png'),1),'width="16"',1);
 print ' '.$langs->trans($type=='classic'?"TypeClassic":"TypeDate").'</td></tr>';
 
@@ -242,12 +243,6 @@ if ($action == 'edit')
 else print dol_htmlentities($object->titre);
 print '</td></tr>';
 
-// Status
-print '<tr><td>';
-print $langs->trans("Status") .'</td><td colspan="2">';
-print $object->getLibStatut(4);
-print '</td></tr>';
-
 // Description
 print '<tr><td class="tdtop">'.$langs->trans("Description") .'</td><td colspan="2">';
 if ($action == 'edit')
@@ -345,6 +340,8 @@ print '</td></tr>';
 
 print '</table>';
 
+print '</div>';
+
 dol_fiche_end();
 
 if ($action == 'edit')
diff --git a/htdocs/opensurvey/class/opensurveysondage.class.php b/htdocs/opensurvey/class/opensurveysondage.class.php
index 5ad27731d88..95af2b130d5 100644
--- a/htdocs/opensurvey/class/opensurveysondage.class.php
+++ b/htdocs/opensurvey/class/opensurveysondage.class.php
@@ -34,19 +34,20 @@ require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php");
  */
 class Opensurveysondage extends CommonObject
 {
-	var $element='opensurvey_sondage';			//!< Id that identify managed objects
-	var $table_element='opensurvey_sondage';	//!< Name of table without prefix where object is stored
-
-	var $id_sondage;
+	public $element='opensurvey_sondage';			//!< Id that identify managed objects
+	public $table_element='opensurvey_sondage';	//!< Name of table without prefix where object is stored
+    public $picto = 'opensurvey';
+    
+	public $id_sondage;
 	/**
 	 * @deprecated
 	 * @see description
 	 */
-	var $commentaires;
+	public $commentaires;
 	public $description;
 
-	var $mail_admin;
-	var $nom_admin;
+	public $mail_admin;
+	public $nom_admin;
 
 	/**
 	 * Id of user author of the poll
@@ -54,11 +55,11 @@ class Opensurveysondage extends CommonObject
 	 */
 	public $fk_user_creat;
 
-	var $titre;
-	var $date_fin='';
-	var $status=1;
-	var $format;
-	var $mailsonde;
+	public $titre;
+	public $date_fin='';
+	public $status=1;
+	public $format;
+	public $mailsonde;
 
 	public $sujet;
 
diff --git a/htdocs/opensurvey/results.php b/htdocs/opensurvey/results.php
index f10e21effe1..9bfb15b2c24 100644
--- a/htdocs/opensurvey/results.php
+++ b/htdocs/opensurvey/results.php
@@ -426,23 +426,23 @@ print '<form name="formulaire4" action="#" method="POST">'."\n";
 
 $head = opensurvey_prepare_head($object);
 
-print dol_get_fiche_head($head,'preview',$langs->trans("Survey"),0,dol_buildpath('/opensurvey/img/object_opensurvey.png',1),1);
+dol_fiche_head($head,'preview',$langs->trans("Survey"), -1, DOL_URL_ROOT.'/opensurvey/img/object_opensurvey.png', 1);
 
+$morehtmlref = '';
+
+$linkback = '<a href="'.DOL_URL_ROOT.'/opensurvey/list.php">'.$langs->trans("BackToList").'</a>';
+
+dol_banner_tab($object, 'id', $linkback, 1, 'id_sondage', 'id_sondage', $morehtmlref);
+
+
+print '<div class="fichecenter">';
+print '<div class="underbanner clearboth"></div>';
 
 print '<table class="border" width="100%">';
 
-$linkback = '<a href="'.dol_buildpath('/opensurvey/list.php',1).(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
-
-// Ref
-print '<tr><td class="titlefield">'.$langs->trans('Ref').'</td>';
-print '<td colspan="3">';
-print $form->showrefnav($object, 'id', $linkback, 1, 'id_sondage', 'id_sondage');
-print '</td>';
-print '</tr>';
-
 // Type
 $type=($object->format=="A")?'classic':'date';
-print '<tr><td>'.$langs->trans("Type").'</td><td colspan="2">';
+print '<tr><td class="titlefield">'.$langs->trans("Type").'</td><td colspan="2">';
 print img_picto('',dol_buildpath('/opensurvey/img/'.($type == 'classic'?'chart-32.png':'calendar-32.png'),1),'width="16"',1);
 print ' '.$langs->trans($type=='classic'?"TypeClassic":"TypeDate").'</td></tr>';
 
@@ -499,6 +499,8 @@ print '</td></tr>';
 
 print '</table>';
 
+print '</div>';
+
 dol_fiche_end();
 
 print '</form>'."\n";
@@ -1045,7 +1047,7 @@ print '</table>'."\n";
 print '</div>'."\n";
 
 
-$toutsujet = explode(",", $object->sujet);
+$toutsujet = explode(",", $object->sujet);  // With old versions, this field was not set
 
 $compteursujet = 0;
 $meilleursujet = '';
@@ -1056,7 +1058,7 @@ for ($i = 0; $i < $nbcolonnes; $i++) {
 		if ($object->format == "D") {
 			$meilleursujetexport = $toutsujet[$i];
 
-			if (strpos($toutsujet[$i], '@') !== false) {
+            if (strpos($toutsujet[$i], '@') !== false) {
 				$toutsujetdate = explode("@", $toutsujet[$i]);
 				$meilleursujet .= dol_print_date($toutsujetdate[0],'daytext'). ' ('.dol_print_date($toutsujetdate[0],'%A').')' . ' - ' . $toutsujetdate[1];
 			} else {
@@ -1072,8 +1074,7 @@ for ($i = 0; $i < $nbcolonnes; $i++) {
 		$compteursujet++;
 	}
 }
-
-$meilleursujet = substr("$meilleursujet", 1);
+$meilleursujet = substr($meilleursujet, 1);
 $meilleursujet = str_replace("°", "'", $meilleursujet);
 
 // Show best choice
@@ -1083,9 +1084,9 @@ if ($nbofcheckbox >= 2)
 	print '<p class="affichageresultats">'."\n";
 
 	if (isset($meilleurecolonne) && $compteursujet == "1") {
-		print "<img src=\"".dol_buildpath('/opensurvey/img/medaille.png',1)."\"> " . $langs->trans('TheBestChoice') . ": <b>".$meilleursujet." </b>" . $langs->trans("with") . " <b>$meilleurecolonne </b>" . $vote_str . ".\n";
+		print "<img src=\"".DOL_URL_ROOT.'/opensurvey/img/medaille.png'."\"> " . $langs->trans('TheBestChoice') . ": <b>".$meilleursujet." </b>" . $langs->trans("with") . " <b>".$meilleurecolonne."</b>" . $vote_str . ".\n";
 	} elseif (isset($meilleurecolonne)) {
-		print "<img src=\"".dol_buildpath('/opensurvey/img/medaille.png',1)."\"> " . $langs->trans('TheBestChoices') . ": <b>".$meilleursujet." </b>" . $langs->trans("with") . " <b>$meilleurecolonne </b>" . $vote_str . ".\n";
+		print "<img src=\"".DOL_URL_ROOT.'/opensurvey/img/medaille.png'."\"> " . $langs->trans('TheBestChoices') . ": <b>".$meilleursujet." </b>" . $langs->trans("with") . " <b>".$meilleurecolonne."</b>" . $vote_str . ".\n";
 	}
 	print '<br></p><br>'."\n";
 }

From 67b3e3da99cbcbcc974f08bb240b31dee3d7d2b0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 23 May 2017 15:51:39 +0200
Subject: [PATCH 462/505] FIX #6784

---
 htdocs/core/lib/ajax.lib.php       | 6 +++---
 htdocs/opensurvey/card.php         | 4 ++--
 htdocs/public/opensurvey/studs.php | 3 +++
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php
index 9ba57abf302..d278f29b897 100644
--- a/htdocs/core/lib/ajax.lib.php
+++ b/htdocs/core/lib/ajax.lib.php
@@ -354,9 +354,9 @@ function ajax_dialog($title,$message,$w=350,$h=150)
  * Make content of an input box selected when we click into input field.
  * 
  * @param string	$htmlname	Id of html object 
- * @param int		$addlink	Add a link to after
+ * @param string	$addlink	Add a 'link to' after
  */
-function ajax_autoselect($htmlname, $addlink=0)
+function ajax_autoselect($htmlname, $addlink='')
 {
 	global $langs;
 	$out = '<script type="text/javascript">
@@ -364,7 +364,7 @@ function ajax_autoselect($htmlname, $addlink=0)
 				    jQuery("#'.$htmlname.'").click(function() { jQuery(this).select(); } );
 				});
 		    </script>';
-	if ($addlink) $out.=' <a href="'.$url.'" target="_blank">'.$langs->trans("Link").'</a>';
+	if ($addlink) $out.=' <a href="'.$addlink.'" target="_blank">'.$langs->trans("Link").'</a>';
 	return $out;
 }
 
diff --git a/htdocs/opensurvey/card.php b/htdocs/opensurvey/card.php
index 707af9f7115..18326321a4b 100644
--- a/htdocs/opensurvey/card.php
+++ b/htdocs/opensurvey/card.php
@@ -332,9 +332,9 @@ $urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($
 $urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
 //$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
 
-$url=$urlwithouturlroot.dol_buildpath('/public/opensurvey/studs.php',1).'?sondage='.$object->id_sondage;
+$url=$urlwithroot.'/public/opensurvey/studs.php?sondage='.$object->id_sondage;
 print '<input type="text" style="width: 60%" '.($action == 'edit' ? 'disabled' : '').' id="opensurveyurl" name="opensurveyurl" value="'.$url.'">';
-if ($action != 'edit') print ajax_autoselect("opensurveyurl", 1);
+if ($action != 'edit') print ajax_autoselect("opensurveyurl", $url);
 
 print '</td></tr>';
 
diff --git a/htdocs/public/opensurvey/studs.php b/htdocs/public/opensurvey/studs.php
index 98d267fdd72..8e769452ec1 100644
--- a/htdocs/public/opensurvey/studs.php
+++ b/htdocs/public/opensurvey/studs.php
@@ -47,6 +47,9 @@ $nblignes=$object->fetch_lines();
 //If the survey has not yet finished, then it can be modified
 $canbemodified = ((empty($object->date_fin) || $object->date_fin > dol_now()) && $object->status != Opensurveysondage::STATUS_CLOSED);
 
+// Security check
+if (empty($conf->opensurvey->enabled)) accessforbidden('',0,0,1);
+
 
 /*
  * Actions

From c98f0ba45713c6f66750c4328b3e76323ef6bfe6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 23 May 2017 15:57:18 +0200
Subject: [PATCH 463/505] Fix typo

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

diff --git a/htdocs/langs/en_US/stocks.lang b/htdocs/langs/en_US/stocks.lang
index 0d2f10a2165..97ddedc3231 100644
--- a/htdocs/langs/en_US/stocks.lang
+++ b/htdocs/langs/en_US/stocks.lang
@@ -119,7 +119,7 @@ NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
 MassMovement=Mass movement
 SelectProductInAndOutWareHouse=Select a product, a quantity, a source warehouse and a target warehouse, then click "%s". Once this is done for all required movements, click onto "%s".
-RecordMovement=Record transfert
+RecordMovement=Record transfer
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
 RuleForStockAvailability=Rules on stock requirements

From 3898cfe02f4acf744595eee9fdd51fac5a562a57 Mon Sep 17 00:00:00 2001
From: David <dvasseur@users.noreply.github.com>
Date: Tue, 23 May 2017 18:27:41 +0200
Subject: [PATCH 464/505] FIX: REST API not possible to add agendaevents

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

diff --git a/htdocs/comm/action/class/api_agendaevents.class.php b/htdocs/comm/action/class/api_agendaevents.class.php
index 5eeca63a4aa..b1014b9171a 100644
--- a/htdocs/comm/action/class/api_agendaevents.class.php
+++ b/htdocs/comm/action/class/api_agendaevents.class.php
@@ -289,7 +289,7 @@ class AgendaEvents extends DolibarrApi
     function _validate($data)
     {
         $event = array();
-        foreach (Events::$FIELDS as $field) {
+        foreach (AgendaEvents::$FIELDS as $field) {
             if (!isset($data[$field]))
                 throw new RestException(400, "$field field missing");
             $event[$field] = $data[$field];

From a3d8da0a73f5c1c3ec2248b1bac9dc9a17e51c43 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Wed, 24 May 2017 11:27:27 +0200
Subject: [PATCH 465/505] Fix: wrong SPECIMEN value

---
 htdocs/user/class/usergroup.class.php | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/htdocs/user/class/usergroup.class.php b/htdocs/user/class/usergroup.class.php
index 81c5e986444..319b48dfffa 100644
--- a/htdocs/user/class/usergroup.class.php
+++ b/htdocs/user/class/usergroup.class.php
@@ -335,16 +335,16 @@ class UserGroup extends CommonObject
 				$error++;
 				dol_print_error($this->db);
 			}
-			
+
 			if (! $error)
 			{
 			    $this->context = array('audit'=>$langs->trans("PermissionsAdd"));
-			
+
 			    // Call trigger
 			    $result=$this->call_trigger('GROUP_MODIFY',$user);
 			    if ($result < 0) { $error++; }
 			    // End call triggers
-			}			
+			}
 		}
 
 		if ($error) {
@@ -444,11 +444,11 @@ class UserGroup extends CommonObject
 				$error++;
 				dol_print_error($this->db);
 			}
-			
+
 			if (! $error)
 			{
 		        $this->context = array('audit'=>$langs->trans("PermissionsDelete"));
-		        
+
 			    // Call trigger
 			    $result=$this->call_trigger('GROUP_MODIFY',$user);
 			    if ($result < 0) { $error++; }
@@ -805,7 +805,7 @@ class UserGroup extends CommonObject
 				$muser=new User($this->db);
 				$muser->fetch($val->id);
 				$info2 = $muser->_load_ldap_info();
-                                $valueofldapfield[] = $muser->_load_ldap_dn($info2);
+				$valueofldapfield[] = $muser->_load_ldap_dn($info2);
 			}
 			$info[$conf->global->LDAP_GROUP_FIELD_GROUPMEMBERS] = (!empty($valueofldapfield)?$valueofldapfield:'');
 		}
@@ -833,7 +833,11 @@ class UserGroup extends CommonObject
 		$this->note='This is a note';
 		$this->datec=time();
 		$this->datem=time();
-		$this->members=array($user->id);	// Members of this group is just me
+
+		// Members of this group is just me
+		$this->members=array(
+				$user->id => $user
+		);
 	}
 }
 

From 6d4c5e4b4afe56d1247f7a02bb35db26b746b5f0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 24 May 2017 11:20:56 +0200
Subject: [PATCH 466/505] Code comment

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 30e1579c33e..e8ead0ed829 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -280,6 +280,7 @@ function GETPOST($paramname, $check='', $method=0, $filter=NULL, $options=NULL)
     	$relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
     	$relativepathstring = preg_replace('/^\//', '', $relativepathstring);
 	
+        // Code for search criteria persistence.
     	// Retrieve values if restore_lastsearch_values is set and there is saved values
     	if (! empty($_GET['restore_lastsearch_values']) && ! empty($_SESSION['lastsearch_values_'.$relativepathstring]))        // Keep $_GET here
     	{
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index e674aea6d5c..da9e65f47ce 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1935,7 +1935,6 @@ if (! function_exists("llxFooter"))
         if ($comment) print '<!-- '.$comment.' -->'."\n";
 
         printCommonFooter($zone);
-        //var_dump($langs);		// Uncommment to see the property _tab_loaded to see which language file were loaded
 
         if (empty($conf->dol_hide_leftmenu) && empty($conf->dol_use_jmobile)) print '</div> <!-- End div id-container -->'."\n";	// End div container
 

From 6eeb82ec70cd07d16d9b9711aff7ac45d1998015 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 24 May 2017 13:45:26 +0200
Subject: [PATCH 467/505] FIX dialog window with md theme must not be hidden by
 left menu part.

---
 htdocs/core/class/html.form.class.php | 2 +-
 htdocs/theme/eldy/style.css.php       | 4 ++--
 htdocs/theme/md/style.css.php         | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 29ac151152a..f2249d673b8 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -968,7 +968,7 @@ class Form
     		$out.=  ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT.'/societe/ajax/company.php', $urloption, $conf->global->COMPANY_USE_SEARCH_TO_SELECT, 0, $ajaxoptions);
 			$out.='<style type="text/css">
 					.ui-autocomplete {
-						z-index: 150;
+						z-index: 250;
 					}
 				</style>';
     		if (empty($hidelabel)) print $langs->trans("RefOrLabel").' : ';
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index c9562e80bad..dd91fc17d28 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -866,7 +866,7 @@ div.vmenu, td.vmenu {
 }
 .side-nav {
 	position: absolute;
-    z-index: 200;
+    z-index: 90;
     display: none;
 }
 div.blockvmenulogo
@@ -4222,7 +4222,7 @@ span.noborderoncategories {
 /* ============================================================================== */
 
 ul.ulselectedfields {
-    z-index: 100;			/* To have the select box appears on first plan even when near buttons are decorated by jmobile */
+    z-index: 95;			/* To have the select box appears on first plan even when near buttons are decorated by jmobile */
 }
 dl.dropdown {
     margin:0px;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 0d6d0fad7af..05b127250cb 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -832,7 +832,7 @@ td.showDragHandle {
 	position: fixed;
 	top: 50px;
 <?php } ?>
-	z-index: 200;
+	z-index: 90;
 	-webkit-transform: translateZ(0);
 	-moz-transform: translateZ(0);
 	-ms-transform: translateZ(0);
@@ -889,7 +889,7 @@ div.login_block {
 
 	position: auto;
 	top: auto;
-	z-index: 200;
+	z-index: 90;
 }
 div.login_block {
 	/* position: initial !important;*/
@@ -899,7 +899,7 @@ div.login_block {
 	padding-left: 0 ! important;
 }
 #id-left {
-	z-index: 201;
+	z-index: 91;
 	background: #FFF;
 	border-right: 1px solid rgba(0,0,0,0.3);
 <?php if ((GETPOST('testmenuhider') || ! empty($conf->global->MAIN_TESTMENUHIDER)) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) { ?>
@@ -4116,7 +4116,7 @@ span.noborderoncategories {
 /* ============================================================================== */
 
 ul.ulselectedfields {
-    z-index: 100;			/* To have the select box appears on first plan even when near buttons are decorated by jmobile */
+    z-index: 90;			/* To have the select box appears on first plan even when near buttons are decorated by jmobile */
 }
 dl.dropdown {
     margin:0px;

From f011197e0017cb7e49f51dfbbf6897dc7514c207 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 24 May 2017 15:12:45 +0200
Subject: [PATCH 468/505] Update swagger to 2.0.24

---
 COPYRIGHT                                     | 137 +-----
 .../Luracast/Restler/explorer/css/screen.css  |  43 +-
 .../Restler/explorer/images/logo_small.png    | Bin 1620 -> 770 bytes
 .../Restler/explorer/images/pet_store_api.png | Bin 0 -> 824 bytes
 .../Restler/explorer/images/wordnik_api.png   | Bin 0 -> 980 bytes
 .../Luracast/Restler/explorer/index.html      |  34 +-
 .../Restler/explorer/lib/swagger-oauth.js     | 103 ++---
 .../Luracast/Restler/explorer/lib/swagger.js  | 425 +++++++++++-------
 .../Luracast/Restler/explorer/swagger-ui.js   | 331 ++++++++------
 .../Restler/explorer/swagger-ui.min.js        |   2 +-
 10 files changed, 552 insertions(+), 523 deletions(-)
 create mode 100644 htdocs/includes/restler/framework/Luracast/Restler/explorer/images/pet_store_api.png
 create mode 100644 htdocs/includes/restler/framework/Luracast/Restler/explorer/images/wordnik_api.png

diff --git a/COPYRIGHT b/COPYRIGHT
index 61a0f2de6bd..04f0358a655 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -21,13 +21,13 @@ GeoIP                  1.4           LGPL-2.1+                   Yes
 Mobiledetect           2.8.17        MIT License                 Yes             Detect mobile devices browsers
 NuSoap                 0.9.5         LGPL 2.1+                   Yes             Library to develop SOAP Web services (not into rpm and deb package)
 PEAR Mail_MIME         1.8.9         BSD                         Yes             NuSoap dependency
-odtPHP                 1.0.1         GPL-2+  b                   Yes             Library to build/edit ODT files
+odtPHP                 1.0.1         GPL-2+                      Yes             Library to build/edit ODT files
 ParseDown              1.6           MIT License                 Yes             Markdown parser
 PHPExcel               1.8.1         LGPL-2.1+                   Yes             Read/Write XLS files, read ODS files
 php-iban               1.4.7         LGPL-3+                     Yes             Parse and validate IBAN (and IIBAN) bank account information in PHP
 PHPoAuthLib            0.8.2         MIT License                 Yes             Library to provide oauth1 and oauth2 to different service
 PHPPrintIPP            1.3           GPL-2+                      Yes             Library to send print IPP requests
-Restler                3.0.0RC6      LGPL-3+                     Yes             Library to develop REST Web services
+Restler                3.0.0RC6      LGPL-3+                     Yes             Library to develop REST Web services (+ swagger-ui js lib into dir explorer)
 TCPDF                  6.2.12        LGPL-3+                     Yes             PDF generation
 TCPDI                  1.0.0         LGPL-3+ / Apache 2.0        Yes             FPDI replacement
 Swift Mailer           5.4.2-DEV     MIT license                 Yes             Comprehensive mailing tools for PHP
@@ -52,138 +52,13 @@ jQuery Timepicker      1.1.0         GPL and MIT License         Yes
 jQuery Tiptip          1.3           GPL and MIT License         Yes             JS library for tooltips
 jsGanttImproved        1.7.5.2       BSD License                 Yes             JS library (to build Gantt reports)
 JsTimezoneDetect       1.0.6         MIT License                 Yes             JS library to detect user timezone
+SwaggerUI			   2.0.24		 GPL-2+                      Yes             JS library to offer the REST API explorer
 
 For licenses compatibility informations:
 http://www.gnu.org/licenses/licenses.en.html
 
 
-Copyright
----------
-
-Copyright (C) 2016
-
-Copyright (C) 2015
-- Laurent Destailleur <eldy@users.sourceforge.net>
-- Marcos García <marcosgdf@gmail.com>
-- Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
-- Frederic France <frederic.france@free.fr>
-- Regis Houssin <regis.houssin@capnetworks.com>
-
-Copyright (C) 2014
-- Laurent Destailleur <eldy@users.sourceforge.net>
-- Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr>
-- Jean-François Ferry <jfefe@aternatik.fr>
-- Marcos García <marcosgdf@gmail.com>
-- Philippe Grand <philippe.grand@atoo-net.com>
-- Florian Henry <florian.henry@open-concept.pro>
-- Regis Houssin <regis.houssin@capnetworks.com>
-- Maxime Kohlhaas <mko@atm-consulting.fr>
-- Juanjo Menent <jmenent@2byte.es>
-- Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
-- Frederic France <frederic.france@free.fr>
-
-Copyright (C) 2013
-- Christophe Battarel <christophe.battarel@altairis.fr>
-- Laurent Destailleur <eldy@users.sourceforge.net>
-- Jean-François Ferry <jfefe@aternatik.fr>
-- Marcos García <marcosgdf@gmail.com>
-- Philippe Grand <philippe.grand@atoo-net.com>
-- Florian Henry <florian.henry@open-concept.pro>
-- Regis Houssin <regis.houssin@capnetworks.com>
-- Maxime Kohlhaas <mko@atm-consulting.fr>
-- Juanjo Menent <jmenent@2byte.es>
-- Adolfo Segura <adolfo.segura@gmail.com>
-- Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
-
-Copyright (C) 2012
-- Christophe Battarel <christophe.battarel@altairis.fr>
-- Laurent Destailleur <eldy@users.sourceforge.net>
-- Jean-François Ferry <jfefe@aternatik.fr>
-- Marcos García <marcosgdf@gmail.com>
-- Philippe Grand <philippe.grand@atoo-net.com>
-- Jean Heimburger <jean@tiaris.info>
-- Florian Henry <florian.henry@open-concept.pro>
-- Regis Houssin <regis.houssin@capnetworks.com>
-- Maxime Kohlhaas <mko@atm-consulting.fr>
-- Juanjo Menent <jmenent@2byte.es>
-- Nicolas Péré <nicolas@amarok2.net>
-- Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
-
-Copyright (C) 2011
-- Laurent Destailleur <eldy@users.sourceforge.net>
-- Regis Houssin <regis.houssin@capnetworks.com>
-- Juanjo Menent <jmenent@2byte.es>
-- Philippe Grand <philippe.grand@atoo-net.com>
-- Jean Heimburger <jean@tiaris.info>
-
-Copyright (C) 2010
-- Laurent Destailleur <eldy@users.sourceforge.net>
-- Regis Houssin <regis.houssin@capnetworks.com>
-- Juanjo Menent <jmenent@2byte.es>
-- r2gnl
-- meos
-
-Copyright (C) 2009
-- Laurent Destailleur <eldy@users.sourceforge.net>
-- Regis Houssin <regis.houssin@capnetworks.com>
-- Juanjo Menent <jmenent@2byte.es>
-
-Copyright (C) 2008
-- Laurent Destailleur <eldy@users.sourceforge.net>
-- Regis Houssin <regis.houssin@capnetworks.com>
-- Rodolphe Quiedeville <rodolphe@quiedeville.org>
-- Jeremie Ollivier <jeremie.o@laposte.net>
-
-Copyright (C) 2007
-- Rodolphe Quiedeville <rodolphe@quiedeville.org>
-- Laurent Destailleur <eldy@users.sourceforge.net>
-- Regis Houssin <regis.houssin@capnetworks.com>
-- Auguria SARL <info@auguria.org>
-- Jean Heimburger <jean@tiaris.info>
-- Jeremie Ollivier <jeremie.o@laposte.net>
-
-Copyright (C) 2006
-- Auguria SARL <info@auguria.org>
-- Marc Barilley/Ocebo <marc@ocebo.com>
-- Laurent Destailleur <eldy@users.sourceforge.net>
-- Rodolphe Quiedeville <rodolphe@quiedeville.org>
-- Regis Houssin <regis.houssin@capnetworks.com>
-- Andre Cianfarani <acianfa@free.fr>
-- Yannick Warnier <ywarnier@beeznest.org>
-- Jean Heimburger <jean@tiaris.info>
-
-Copyright (C) 2005
-- Brice Davoleau <brice.davoleau@gmail.com>
-- Laurent Destailleur <eldy@users.sourceforge.net>
-- Benoit Mortier <benoit.mortier@opensides.be>
-- Rodolphe Quiedeville <rodolphe@quiedeville.org>
-- Eric Seigne <erics@rycks.com>
-- Matthieu Valleton <mv@seeschloss.org>
-- Regis Houssin <regis.houssin@capnetworks.com>
-
-Copyright (C) 2004
-- Laurent Destailleur <eldy@users.sourceforge.net>
-- Rodolphe Quiedeville <rodolphe@quiedeville.org>
-- Eric Seigne <erics@rycks.com>
-- Benoit Mortier <benoit.mortier@opensides.be>
-- Christophe Combelles <ccomb@free.fr>
-- Sebastien Di Cintio <sdicintio@ressource-toi.org>
-
-Copyright (C) 2003
-- Jean-Louis Bergamo <jlb@j1b.org>
-- Xavier Dutoit <doli@sydesy.com>
-- Rodolphe Quiedeville <rodolphe@quiedeville.org>
-- Emmanuel Raviart <eraviart@entrouvert.com>
-- Eric Seigne <erics@rycks.com>
-
-Copyright (C) 2002
-- Jean-Louis Bergamo <jlb@j1b.org>
-- Rodolphe Quiedeville <rodolphe@quiedeville.org>
-
-Copyright (C) 2001
-- Rodolphe Quiedeville <rodolphe@quiedeville.org>
-
-
-
-
+Copyright / Authors
+-------------------
 
+See page https://github.com/Dolibarr/dolibarr/graphs/contributors
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/css/screen.css b/htdocs/includes/restler/framework/Luracast/Restler/explorer/css/screen.css
index 2ac5625af06..478b99837d7 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/explorer/css/screen.css
+++ b/htdocs/includes/restler/framework/Luracast/Restler/explorer/css/screen.css
@@ -350,7 +350,7 @@
   font-size: .85em;
   line-height: 1.2em;
   overflow: auto;
-  max-height: 400px;
+  max-height: 200px;
   cursor: pointer;
 }
 .swagger-section .swagger-ui-wrap .model-signature ul.signature-nav {
@@ -743,17 +743,20 @@
   display: inline-block;
   font-size: 0.9em;
 }
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content div.sandbox_header img {
-  display: block;
-  clear: none;
-  float: right;
-}
 .swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content div.sandbox_header input.submit {
   display: block;
   clear: none;
   float: left;
   padding: 6px 8px;
 }
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content div.sandbox_header span.response_throbber {
+  background-image: url('../images/throbber.gif');
+  width: 128px;
+  height: 16px;
+  display: block;
+  clear: none;
+  float: right;
+}
 .swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content form input[type='text'].error {
   outline: 2px solid black;
   outline-color: #cc0000;
@@ -1158,7 +1161,7 @@
   cursor: pointer;
 }
 .swagger-section #header {
-  background-color: #646257;
+  background-color: #89bf04;
   padding: 14px;
 }
 .swagger-section #header a#logo {
@@ -1193,7 +1196,7 @@
   padding: 6px 8px;
   font-size: 0.9em;
   color: white;
-  background-color: #000000;
+  background-color: #547f00;
   -moz-border-radius: 4px;
   -webkit-border-radius: 4px;
   -o-border-radius: 4px;
@@ -1202,35 +1205,13 @@
   border-radius: 4px;
 }
 .swagger-section #header form#api_selector .input a#explore:hover {
-  background-color: #a41e22;
+  background-color: #547f00;
 }
 .swagger-section #header form#api_selector .input input {
   font-size: 0.9em;
   padding: 3px;
   margin: 0;
 }
-.swagger-section #footer-nav {
-  margin-top: 50px;
-  color: #bbb;
-  float: left;
-  list-style: none;
-  font-size: 0.8em;
-}
-.swagger-section #footer-nav li {
-  display: block;
-  float: left;
-}
-.swagger-section #footer-nav a {
-  margin-right: 4px;
-  text-decoration: none;
-  font-weight: none;
-  padding: 4px 2px;
-  font-size: 0.9em;
-  color: #999;
-}
-.swagger-section #footer-nav a:hover {
-  color: #555;
-}
 .swagger-section #content_message {
   margin: 10px 15px;
   font-style: italic;
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/images/logo_small.png b/htdocs/includes/restler/framework/Luracast/Restler/explorer/images/logo_small.png
index 2ed3cf64be72132f93719f8014a6f440b06d818a..5496a65579ae903d4008f9d268fac422ef9d3679 100644
GIT binary patch
delta 757
zcmV<R0t)@q41xxb8Gi-<0028MuA%?{02y>eSaefwW^{L9a%BKPWN%_+AW3auXJt}l
zVPtu6$z?nM00N{*L_t(|+Qe5qY|}s#esPzIE@o)O=n+8&R{|*#L(PIfT{3hiQ=F}c
zp~=FUc0*!FJHWzFGqE6%NL1<;XChLEdTG@Sk5yS*2~bDg=YQT+mVIX@wF56YoppY>
z@BMu5<%Q@!N$oaYTJMs{o1Hj{zU)vi6JQ2&cx&>)ZfVp2{)tzg4GBvD3&5@boJKre
zJ30eu1)x3N+9gsM@#-+RHxaPN;V_lQG6K)HlLvDutp^T$uMiaC@ST^ZBO1#CLla(m
z1{Ks3e94Adynh&~zGdCBX<^=^@I0X3SCR7OMbn}sUKdeFKO-flaJa%@kJ27@Rod?J
z9=+Q<rfqi^8=#Y?wj1kwX#b$c_Zv$4C0UJ>x5|=PtG8n>y~9rIu}+48M}FW5Bbqw3
zt#po?c?kmG!FX32W(dOjzTb+U@64MzHItoeB!M0JcYm^KB<j}E5#~0sp!XPJOOLgT
zS*yn>q0?}5!|tR}5&*k=hqU1Np`{I?Gbb7b+;Y=z!O$nm8}UUSzrCVok2dMe##j1t
zbxF~$^O(JOe=y#o&iZF&|1KS!4Pqm~YUtPaa}xR)WTS{s(z8WTpAfl&Oi~ADARd;i
zc|2dJ>wo#Wf#fv~himh7V?Smz%4rfoBw(of_O7l9t{Vt<5?^=8(OEx}+adud!kbfi
zfsy(V&q!X~mXJ{r*stQof-;iQPXh1hwBR*L1G&ztYv`a7B=K~d#e8-HEJhShIm0li
z01l!p6##<^07Z%Eh62^kB5plKKb=vl4A{YyOl}<uuRAjW1xs7n(TB&AKy<RIr;r!y
z*f@9QV(<ZjBi!|hJblTahtrI=7$f#e<Q%=BrTUjK$v|(4ab;@?141#<dR6>|0VpD{
nD)OJ^fG<28<h5Wae+3u-njrty3Hmng00000NkvXXu0mjfWrbey

literal 1620
zcmbu8c~BEq7{J#C1BpOmK+ed-7%-9;0wG}uAtalG+)D@{k_bw;BwWEHRcI>}?}J(t
ztryN<J0exF8LK!Roe`yK5S13if~DXf2$IrDJ^s)ReFVqx-%fwCyKm=v@9p<{-@dm)
zi^}})VR#6F{1kGD4zv+7w+{w9eJ5Aeg9c+q6nY;YpGS|=h9Kx8u~w~@PESvJd3k|O
z5XWM%;GIY$5(or;e}7+JUpyX<!{L3reLy^Lh5*p@J{}cC4Gjqi3JRK?@<DtFnM{s|
zhyY!)<Bdkca)Vx<q1EZqbUHL$i)yv%G*peEDvesHQ7cqRxl);`RLJFWiCiv~r6Q@|
zk|Gj`P>cu>M1Y8rg+jhiC`b|TlKDJ7A5P}ONxTFekIUo1iHR@_b6}X8z-4neaq(;x
zi?xi&WX3QVOeUSdpfMQH0DAP2=x7>kN#s&mB#jmY{Hatjl}cGej_~+~FC>MBg@u4M
z0d3%>RmwaX5>H-%K)?s75kAbHVKzGqCvdr3jwf$CNX=%mLH4*fR$MF-IIvhTK*Qs}
zc&`B*fC&(oHSuTw6Ut%=DBEo1B7g~r6y_lW6xmbe1>gsOQm@i#bTX-0z>}vWNxAVL
zBUl<3X_89~QW2V*l+K3{4m(dFH7le!GO-B}7)AW76n>_Fmn{)xBZ4BCxG)vTmk0|a
zh#3*&A%a{{a<N2M1R`Q#J|d{DE?H~M`=l(_Vac%<nrwMlYgT1iSLiCTwB?zavUF7`
zDlbt<Eiy5f#p%881{<i|p+hsE`SU3h3Q+PO@sRnBA`k2S2iyNUhu(2=hRd^bbq&li
z2>=J+L!d<qmxIOND&<By1kEGP+;e^zsCf&5B!@K1kzp-ztTWpRAyI)fuaKN-u@$bf
z+Dh$YaRztn%Go+FZo$krv8~YTuvja|dP{jB1jod3Vq)VS(nqd=lebqP5$S1r@^d#}
zqRd-DTU(E=N7TMqkkwsxkUQ8}-`2~l2*epIIK|v?T)@Uh*X)f`>z{q}EO5*5<5lFX
ztT~aF-W=wwXlAasy!KA#{!_vCc8`r){wOYAfK|}Zg9PJbxS`Drk;)p~zY|Tt-88>*
zwriWWb1zVDZt<?aifzb#J=Jt2Yh}~u*r$K$2jZKCb}!3y=1<pRp7-wvx_E5vly5*k
zCcN=MKv4wj{45~QEvU@>TG?paYc|7T*|z0vmc|>Drcq6j5NpMz|2?cHb`i@?uwOi^
zq83NCbnz;42Pc0dj34#(XLPH(clD@>^Tx(273Y3H^+xZ#{TS}&gSD83m-~j}1AOfv
zMVs~g)RU1HH|1RUc<k(*Bd<s>D`si?r4G*GZO0OveK+}{)fDYSTMi+hjRZR>cge1S
zR@On$u^Zq1me^ji^p@q(E2tf<f1%t|HB3E1tj6{>BTvg3>Jq*E-5aaR-qd1lcM;WU
z`vf>j9jA6B>rS5l-}&OHq0;I0;+3!cMzi&fqek1LqNjZyefrl8q?U<>9#!evrstg<
z9UZRNU`5UKvUD!GPtvYGoKo%T9HASStIj)gc|l1glldggnPy|@c4zEtP{iK5USC1K
ziz=MEGQLy=x@c#Hg$F8HUC&hyzUtY|{)^#UHYzzVSzcQ3^7e(a`*rm1RIaV^#o0IS
z_w{vkWbY|374IK1=xA3vqFX{vwfG#EEU9>G9xCaaa>Z+G%+t}diAF+FEzVq};smoa
zbi)HvbN`b!s}nDrr&Ia{2953Bcl~x&Cvp!-BYU1?)gSHc36Gp-R=&RcbjO;eQEGE&
ta!w9m(NDOMo}d5m!&kLnqYQAv9LOHZ7#!&yyal!|q>!SLGf3{ne*t=UPFDZ`

diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/images/pet_store_api.png b/htdocs/includes/restler/framework/Luracast/Restler/explorer/images/pet_store_api.png
new file mode 100644
index 0000000000000000000000000000000000000000..f9f9cd4aeb35a108c4b2f1dddb59977d56c595d8
GIT binary patch
literal 824
zcmV-81IPS{P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00004b3#c}2nYxW
zd<bNS00009a7bBm000XT000XT0n*)m`~Uy|9CSrkbW?9;ba!ELWdK2BZ(?O2Mrm?o
zcW-iQb09-gHF34$HUIzuvPnciR7i=fl}Tt6K@>n=Rd;8mVwQ<w7Vu!yh)%}+A_y4|
z-UNe}fD5=LMo};*QSmG;(NPF0A}$9}@FM6z1efSh#09bl12MQ@5|hbdlCI2Ty1bZM
z2B)3;YyJP;ug@<^05qRC<;3Ih6RztX_B>NY4k4xJQ%YT}s;WA7;r!W@XgqjG_4og}
z8w>{OB9REiMa8-B85td+y}bji^~2KA`Md4j-u{zw=H%Da@83%_8qEnl9k1WK;pWX-
zb-lg)pQYAreK@>)*5Clqni{IZVYGG+NY67Bp-^bn;L{Nbh44I6CIK+n7p8#U?;fCA
zYMFcy%UEjup4fgnli%NyzSe*@419QuU9lJ|T$?f9w?HIQ$RwEJGK7^!y7LhxIgVJp
z9c!kB{0aydM1epU1NJ=h(<e-{>}2X?Y{qn70yEN$dwm~favs=VbQ+T?!AvSl{P~PE
zS&zsJbTQttne>kdM4$jBhLMFy@I1)3u-4cAzrY*l!o9eK^w%+jqY!oi(Ri8sMauvK
zwnCP#%3hEH#FtNqq{iT(?=_JA_8XC>5Y8Y@!wmxKb|A87ZbpHA`+%v~0pt{5Nko1L
zLKR^25YExt1lH7L1<xo5e7uJ-X(+4!X+Qw(Fk<f&f<EAoVT;7lP2gydL*Q621)^}0
zf)y)$!86{#+1P{#mE*;qp`Sg$Py%CM#x#`r6J&e`_Udg|)my<$z<3`7B_hx9N9P}F
zYK3c24KdPPZP*+3AQ!CtKY<XLC+kF;aH37V!P87BrTCdh4EhHAD~1vYq?CP9Db?E1
z*~P0@ZL<b%YkN(5M<+_DR&nfjv(wYlb0-iC>{t<rP*hZu6MS@Zbo$f3zhue6T>{|P
z@n)yHyZf~3>LZ@#&CNw1rA#OlY^|)UJQKUrlKKO&x%wPhH}6&e0000<MNUMnLSTZR
CaCsR3

literal 0
HcmV?d00001

diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/images/wordnik_api.png b/htdocs/includes/restler/framework/Luracast/Restler/explorer/images/wordnik_api.png
new file mode 100644
index 0000000000000000000000000000000000000000..dca4f1455ac45e9cdc3659d77d6a47370048eb1c
GIT binary patch
literal 980
zcmV;_11tQAP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00004b3#c}2nYxW
zd<bNS00009a7bBm000XT000XT0n*)m`~Uy|9CSrkbW?9;ba!ELWdK2BZ(?O2Mrm?o
zcW-iQb09-gHF34$HUIzvPDw;TR7i=Xl}%_|RTRg6XC{pqCo`k81cgjzl5UhNtQ+m3
zt*8-2j9OY3)<lrHC`CuamA2RkRj?pvrT9T=!KPmeE2XVSKmvXtEehhoZtP6biP(r$
zCzI(*oO|DKk(tST^8o|?;qdPLzjOZQ+>dvj&>@zN_HP5m0E=+A=efDBI*IG*Gy%%<
zz@yc%2XvGm)QQv5k^Z&#4C6!9MwX8BCmQ{3eAX|GTwn#>(PS6PoB=$Pw<CKBKLBV&
zb_3mx>n*?wz?%Tx2gwJ4apoy`A15D=>?%}hj`fV*p=6XW=YR(sp))`dxTnqHE&{&;
zPdeO}SVkf*6_$c45W3Z}u|Z&a8{r!6ZNY62S>5{jAd)Hkjg@h%@c)c#BvZK2lmGw|
z`Vh+%ECkF{t=)XpF3Z1bj=Pe9LpHbnQwjeTU#=4hB76#52DU2P2Ouj~^lRWwRd%eN
zBw_z%FL0CUlk!`s2!<DdgRAm78r^sGWZmbD^^*Y6eOJdEZYRibN9$EW9FD#=y9glV
zY-%$wg76eD;3WSxx_@?yTTMBeP5?x+GsOTup85vZ>`>QG&H__i_)I9=AuA=jn4<xW
z!ZoN3`U>0z>;@hRsg)>J(58cx;l;h_zE*-R7Wbz6Ff#1Mss*)zTImU4`2@?a7y;v4
zH=lJ_PM5Rkw*AU`Cmq6aa>chASJ&Z3Ebj`y;w$MM!fa6`13VU7Kc|T5Xl#7ecj?mp
zREV-nBJ6C)`?&}QDe_(KM>BrlN|iF{7-90j+J>N0^vY=LK;8!^9Y_m*aRPX{!S6ag
zgRw(13pJvt`;{^S-vgUk?8pV_Vh4a4P7~}uHT)ENFMqd71QIOl8Q6+24TM_+158z)
z54U-*C{M)S&!2Bfu&`?&#2Ti6;WojY;%6+I;uCof+*T2iUMz!7Eg<{}#DJSx)C$5f
zP(oSf>_s1t06cJ-U3?<9poS4O{Go>H>hro^ks;r3mm1Ehfq?m(_YE8UiVUgG%W9ZY
z!@O^}KR%JW*0e=66rUYj5BP~=x%$^x92-m_<lKT#h7yyxUmTxX5xNt{a`UcUQ-XFV
zKC|Hq;F0R|QsTswRzI62boA2)P|LK|+W^y@#{CEF=vbZ23tjU70000<MNUMnLSTXw
CR=u(S

literal 0
HcmV?d00001

diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/index.html b/htdocs/includes/restler/framework/Luracast/Restler/explorer/index.html
index 5ff93006cf4..c9b9fbff77b 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/explorer/index.html
+++ b/htdocs/includes/restler/framework/Luracast/Restler/explorer/index.html
@@ -2,8 +2,7 @@
 <html>
 <head>
   <title>Api Explorer</title>
-  <!-- DOL_CHANGE LDR Remove external links <link href='https://fonts.googleapis.com/css?family=Droid+Sans:400,700' rel='stylesheet' type='text/css'/>
-  <link href="//maxcdn.bootstrapcdn.com/font-awesome/4.1.0/css/font-awesome.min.css" rel="stylesheet">-->
+  <!-- DOL_CHANGE LDR Remove external links <link href='//fonts.googleapis.com/css?family=Droid+Sans:400,700' rel='stylesheet' type='text/css'/>-->
   <link href='css/reset.css' media='screen' rel='stylesheet' type='text/css'/>
   <link href='css/screen.css' media='screen' rel='stylesheet' type='text/css'/>
   <link href='css/reset.css' media='print' rel='stylesheet' type='text/css'/>
@@ -27,10 +26,11 @@
     $(function () {
       window.swaggerUi = new SwaggerUi({
       url: "resources.json",
+      validatorUrl: null,
       dom_id: "swagger-ui-container",
-      supportedSubmitMethods: ['get', 'post', 'put', 'patch', 'delete'],
+      supportedSubmitMethods: ['get', 'post', 'put', 'delete'],
       onComplete: function(swaggerApi, swaggerUi){
-        log("Loaded Api Explorer");
+        log("Loaded API Explorer");
 
         if(typeof initOAuth == "function") {
           /*
@@ -45,15 +45,19 @@
           hljs.highlightBlock(e)
         });
       },
+      defaultModelRendering: 'model',
       onFailure: function(data) {
-        log("Unable to Load Api Explorer");
+        log("Unable to Load API Explorer");
       },
-      docExpansion: "none"
+      docExpansion: "none",
+      /*showRequestHeaders: true,
+      jsonEditor: true */
+      /*, sorter : "alpha"*/
     });
 
     $('#input_apiKey').change(function() {
       var key = $('#input_apiKey')[0].value;
-
+      log("key: " + key);
       if(key && key.trim() != "") {
         /* DOL_CHANGE LDR We set DOLAPIKEY into header */
         log("added key " + key);
@@ -67,11 +71,15 @@
         console.log("header DOLAPIKEY added with value "+key);
       }
     })
-    
     window.swaggerUi.load();
   });
-    
   </script>
+  
+  <style>
+	.info_title, .info_description, .info_contact, .info_license {
+		display: none;
+	}
+  </style>
 </head>
 
 <body class="swagger-section">
@@ -79,6 +87,14 @@
   <div class="swagger-ui-wrap">
     <a id="logo" href="#">API Explorer</a>
     <form id='api_selector'>
+      <!-- DOL_CHANGE LDR
+      <div class='input icon-btn'>
+        <img id="show-pet-store-icon" src="images/pet_store_api.png" title="Show Swagger Petstore Example Apis">
+      </div>
+      <div class='input icon-btn'>
+        <img id="show-wordnik-dev-icon" src="images/wordnik_api.png" title="Show Wordnik Developer Apis">
+      </div>
+      -->
       <div class='input'><input placeholder="http://example.com/api" id="input_baseUrl" name="baseUrl" type="hidden" value="resources.json"/></div>
       <div class='input'><input placeholder="DOLAPIKEY" id="input_apiKey" name="apiKey" type="text"/></div>
       <div class='input'><a id="explore" href="#">Explore</a></div>
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/swagger-oauth.js b/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/swagger-oauth.js
index 19777eb90f0..8bb17fb076a 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/swagger-oauth.js
+++ b/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/swagger-oauth.js
@@ -48,72 +48,65 @@ function handleLogin() {
       str += '</label></li>';
       popup.append(str);
     }
-  
+  }
 
-    var $win = $(window),
-      dw = $win.width(),
-      dh = $win.height(),
-      st = $win.scrollTop(),
-      dlgWd = popupDialog.outerWidth(),
-      dlgHt = popupDialog.outerHeight(),
-      top = (dh -dlgHt)/2 + st,
-      left = (dw - dlgWd)/2;
+  var $win = $(window),
+    dw = $win.width(),
+    dh = $win.height(),
+    st = $win.scrollTop(),
+    dlgWd = popupDialog.outerWidth(),
+    dlgHt = popupDialog.outerHeight(),
+    top = (dh -dlgHt)/2 + st,
+    left = (dw - dlgWd)/2;
 
-    popupDialog.css({
-      top: (top < 0? 0 : top) + 'px',
-      left: (left < 0? 0 : left) + 'px'
-    });
+  popupDialog.css({
+    top: (top < 0? 0 : top) + 'px',
+    left: (left < 0? 0 : left) + 'px'
+  });
 
-    popupDialog.find('button.api-popup-cancel').click(function() {
-      popupMask.hide();
-      popupDialog.hide();
-    });
-    popupDialog.find('button.api-popup-authbtn').click(function() {
-      popupMask.hide();
-      popupDialog.hide();
+  popupDialog.find('button.api-popup-cancel').click(function() {
+    popupMask.hide();
+    popupDialog.hide();
+  });
+  popupDialog.find('button.api-popup-authbtn').click(function() {
+    popupMask.hide();
+    popupDialog.hide();
 
-      var authSchemes = window.swaggerUi.api.authSchemes;
-      var location = window.location;
-      var locationUrl = location.protocol + '//' + location.host + location.pathname;
-      var redirectUrl = locationUrl.replace("index.html","").concat("/o2c.html").replace("//o2c.html","/o2c.html");
-      var url = null;
+    var authSchemes = window.swaggerUi.api.authSchemes;
+    var host = window.location;
+    var pathname = location.pathname.substring(0, location.pathname.lastIndexOf("/"));
+    var redirectUrl = host.protocol + '//' + host.host + pathname + "/o2c.html";
+    var url = null;
 
-      var p = window.swaggerUi.api.authSchemes;
-      for (var key in p) {
-        if (p.hasOwnProperty(key)) {
-          var o = p[key].grantTypes;
-          for(var t in o) {
-            if(o.hasOwnProperty(t) && t === 'implicit') {
-              var dets = o[t];
-              url = dets.loginEndpoint.url + "?response_type=token";
-              window.swaggerUi.tokenName = dets.tokenName;
-            }
+    for (var key in authSchemes) {
+      if (authSchemes.hasOwnProperty(key)) {
+        var o = authSchemes[key].grantTypes;
+        for(var t in o) {
+          if(o.hasOwnProperty(t) && t === 'implicit') {
+            var dets = o[t];
+            url = dets.loginEndpoint.url + "?response_type=token";
+            window.swaggerUi.tokenName = dets.tokenName;
           }
         }
       }
-      var scopes = [];
-      var scopeForUrl='';
-      var o = $('.api-popup-scopes').find('input:checked');
+    }
+    var scopes = []
+    var o = $('.api-popup-scopes').find('input:checked');
 
-      for(var k =0; k < o.length; k++) {
-        scopes.push($(o[k]).attr("scope"));
-        if(k > 0){
-      	  scopeForUrl+=' ';
-        }
-        scopeForUrl+=$(o[k]).attr("scope");
-      }
+    for(k =0; k < o.length; k++) {
+      scopes.push($(o[k]).attr("scope"));
+    }
 
-      window.enabledScopes=scopes;
-    
+    window.enabledScopes=scopes;
 
-      url += '&redirect_uri=' + encodeURIComponent(redirectUrl);
-      url += '&realm=' + encodeURIComponent(realm);
-      url += '&client_id=' + encodeURIComponent(clientId);
-      url += '&scope=' + encodeURIComponent(scopeForUrl);
+    url += '&redirect_uri=' + encodeURIComponent(redirectUrl);
+    url += '&realm=' + encodeURIComponent(realm);
+    url += '&client_id=' + encodeURIComponent(clientId);
+    url += '&scope=' + encodeURIComponent(scopes);
+
+    window.open(url);
+  });
 
-      window.open(url);
-    });
-  }
   popupMask.show();
   popupDialog.show();
   return;
@@ -211,7 +204,7 @@ function onOAuthComplete(token) {
           }
         });
 
-        window.authorizations.add("key", new ApiKeyAuthorization("Authorization", "Bearer " + b, "header"));
+        window.authorizations.add("oauth2", new ApiKeyAuthorization("Authorization", "Bearer " + b, "header"));
       }
     }
   }
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/swagger.js b/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/swagger.js
index 2100bb81e83..9e73a9b33e2 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/swagger.js
+++ b/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/swagger.js
@@ -1,5 +1,5 @@
 // swagger.js
-// version 2.0.30
+// version 2.0.39
 
 var __bind = function(fn, me){
   return function(){
@@ -11,10 +11,20 @@ log = function(){
   log.history = log.history || [];
   log.history.push(arguments);
   if(this.console){
-    console.log( Array.prototype.slice.call(arguments) );
+    console.log( Array.prototype.slice.call(arguments)[0] );
   }
 };
 
+// if you want to apply conditional formatting of parameter values
+parameterMacro = function(value) {
+  return value;
+}
+
+// if you want to apply conditional formatting of model property values
+modelPropertyMacro = function(value) {
+  return value;
+}
+
 if (!Array.prototype.indexOf) {
   Array.prototype.indexOf = function(obj, start) {
     for (var i = (start || 0), j = this.length; i < j; i++) {
@@ -45,48 +55,50 @@ if (!('map' in Array.prototype)) {
 }
 
 Object.keys = Object.keys || (function () {
-    var hasOwnProperty = Object.prototype.hasOwnProperty,
-        hasDontEnumBug = !{toString:null}.propertyIsEnumerable("toString"),
-        DontEnums = [
-            'toString',
-            'toLocaleString',
-            'valueOf',
-            'hasOwnProperty',
-            'isPrototypeOf',
-            'propertyIsEnumerable',
-            'constructor'
-        ],
-        DontEnumsLength = DontEnums.length;
-  
-    return function (o) {
-        if (typeof o != "object" && typeof o != "function" || o === null)
-            throw new TypeError("Object.keys called on a non-object");
-     
-        var result = [];
-        for (var name in o) {
-            if (hasOwnProperty.call(o, name))
-                result.push(name);
-        }
-     
-        if (hasDontEnumBug) {
-            for (var i = 0; i < DontEnumsLength; i++) {
-                if (hasOwnProperty.call(o, DontEnums[i]))
-                    result.push(DontEnums[i]);
-            }   
-        }
-     
-        return result;
-    };
+  var hasOwnProperty = Object.prototype.hasOwnProperty,
+    hasDontEnumBug = !{toString:null}.propertyIsEnumerable("toString"),
+    DontEnums = [
+      'toString',
+      'toLocaleString',
+      'valueOf',
+      'hasOwnProperty',
+      'isPrototypeOf',
+      'propertyIsEnumerable',
+      'constructor'
+    ],
+  DontEnumsLength = DontEnums.length;
+
+  return function (o) {
+    if (typeof o != "object" && typeof o != "function" || o === null)
+      throw new TypeError("Object.keys called on a non-object");
+
+    var result = [];
+    for (var name in o) {
+      if (hasOwnProperty.call(o, name))
+        result.push(name);
+    }
+
+    if (hasDontEnumBug) {
+      for (var i = 0; i < DontEnumsLength; i++) {
+        if (hasOwnProperty.call(o, DontEnums[i]))
+          result.push(DontEnums[i]);
+      }
+    }
+
+    return result;
+  };
 })();
 
-
 var SwaggerApi = function(url, options) {
+  this.isBuilt = false;
   this.url = null;
   this.debug = false;
   this.basePath = null;
   this.authorizations = null;
   this.authorizationScheme = null;
   this.info = null;
+  this.useJQuery = false;
+  this.modelsArray = [];
 
   options = (options||{});
   if (url)
@@ -103,13 +115,20 @@ var SwaggerApi = function(url, options) {
   if (options.success != null)
     this.success = options.success;
 
+  if (typeof options.useJQuery === 'boolean')
+    this.useJQuery = options.useJQuery;
+
   this.failure = options.failure != null ? options.failure : function() {};
   this.progress = options.progress != null ? options.progress : function() {};
-  if (options.success != null)
+  if (options.success != null) {
     this.build();
+    this.isBuilt = true;
+  }
 }
 
 SwaggerApi.prototype.build = function() {
+  if(this.isBuilt)
+    return this;
   var _this = this;
   this.progress('fetching resource list: ' + this.url);
   var obj = {
@@ -117,7 +136,7 @@ SwaggerApi.prototype.build = function() {
     url: this.url,
     method: "get",
     headers: {
-      accept: "application/json"
+      accept: "application/json,application/json;charset=\"utf-8\",*/*"
     },
     on: {
       error: function(response) {
@@ -154,6 +173,7 @@ SwaggerApi.prototype.buildFromSpec = function(response) {
   }
   this.apis = {};
   this.apisArray = [];
+  this.consumes = response.consumes;
   this.produces = response.produces;
   this.authSchemes = response.authorizations;
   if (response.info != null) {
@@ -171,13 +191,13 @@ SwaggerApi.prototype.buildFromSpec = function(response) {
       }
     }
   }
-  if (response.basePath) {
+  if (response.basePath)
     this.basePath = response.basePath;
-  } else if (this.url.indexOf('?') > 0) {
+  else if (this.url.indexOf('?') > 0)
     this.basePath = this.url.substring(0, this.url.lastIndexOf('?'));
-  } else {
+  else
     this.basePath = this.url;
-  }
+
   if (isApi) {
     var newName = response.resourcePath.replace(/\//g, '');
     this.resourcePath = response.resourcePath;
@@ -272,7 +292,6 @@ SwaggerApi.prototype.fail = function(message) {
 
 SwaggerApi.prototype.setConsolidatedModels = function() {
   var model, modelName, resource, resource_name, _i, _len, _ref, _ref1, _results;
-  this.modelsArray = [];
   this.models = {};
   _ref = this.apis;
   for (resource_name in _ref) {
@@ -317,8 +336,8 @@ var SwaggerResource = function(resourceObj, api) {
   var _this = this;
   this.api = api;
   this.api = this.api;
-  produces = [];
-  consumes = [];
+  consumes = (this.consumes | []);
+  produces = (this.produces | []);
   this.path = this.api.resourcePath != null ? this.api.resourcePath : resourceObj.path;
   this.description = resourceObj.description;
 
@@ -349,7 +368,7 @@ var SwaggerResource = function(resourceObj, api) {
       method: "get",
       useJQuery: this.useJQuery,
       headers: {
-        accept: "application/json"
+        accept: "application/json,application/json;charset=\"utf-8\",*/*"
       },
       on: {
         response: function(resp) {
@@ -368,22 +387,28 @@ var SwaggerResource = function(resourceObj, api) {
   }
 }
 
-SwaggerResource.prototype.getAbsoluteBasePath = function(relativeBasePath) {
-  var parts, pos, url;
+SwaggerResource.prototype.getAbsoluteBasePath = function (relativeBasePath) {
+  var pos, url;
   url = this.api.basePath;
   pos = url.lastIndexOf(relativeBasePath);
-  if (pos === -1) {
-    parts = url.split("/");
-    url = parts[0] + "//" + parts[2];
-    if (relativeBasePath.indexOf("/") === 0) {
-      return url + relativeBasePath;
-    } else {
-      return url + "/" + relativeBasePath;
-    }
-  } else if (relativeBasePath === "/") {
-    return url.substring(0, pos);
-  } else {
-    return url.substring(0, pos) + relativeBasePath;
+  var parts = url.split("/");
+  var rootUrl = parts[0] + "//" + parts[2];
+
+  if(relativeBasePath.indexOf("http") === 0)
+    return relativeBasePath;
+  if(relativeBasePath === "/")
+    return rootUrl;
+  if(relativeBasePath.substring(0, 1) == "/") {
+    // use root + relative
+    return rootUrl + relativeBasePath;
+  }
+  else {
+    var pos = this.basePath.lastIndexOf("/");
+    var base = this.basePath.substring(0, pos);
+    if(base.substring(base.length - 1) == "/")
+      return base + relativeBasePath;
+    else
+      return base + "/" + relativeBasePath;
   }
 };
 
@@ -478,8 +503,7 @@ SwaggerResource.prototype.addOperations = function(resource_path, ops, consumes,
 
 SwaggerResource.prototype.sanitize = function(nickname) {
   var op;
-  op = nickname.replace(/[\s!@#$%^&*()_+=\[{\]};:<>|./?,\\'""-]/g, '_');
-  //'
+  op = nickname.replace(/[\s!@#$%^&*()_+=\[{\]};:<>|.\/?,\\'""-]/g, '_');
   op = op.replace(/((_){2,})/g, '_');
   op = op.replace(/^(_)*/g, '');
   op = op.replace(/([_])*$/g, '');
@@ -584,6 +608,7 @@ var SwaggerModelProperty = function(name, obj) {
   this.isCollection = this.dataType && (this.dataType.toLowerCase() === 'array' || this.dataType.toLowerCase() === 'list' || this.dataType.toLowerCase() === 'set');
   this.descr = obj.description;
   this.required = obj.required;
+  this.defaultValue = modelPropertyMacro(obj.defaultValue);
   if (obj.items != null) {
     if (obj.items.type != null) {
       this.refDataType = obj.items.type;
@@ -629,7 +654,9 @@ SwaggerModelProperty.prototype.getSampleValue = function(modelsToIgnore) {
 
 SwaggerModelProperty.prototype.toSampleValue = function(value) {
   var result;
-  if (value === "integer") {
+  if ((typeof this.defaultValue !== 'undefined') && this.defaultValue !== null) {
+    result = this.defaultValue;
+  } else if (value === "integer") {
     result = 0;
   } else if (value === "boolean") {
     result = false;
@@ -759,6 +786,7 @@ var SwaggerOperation = function(nickname, path, method, parameters, summary, not
         }
       }
     }
+    param.defaultValue = parameterMacro(param.defaultValue);
   }
   this.resource[this.nickname] = function(args, callback, error) {
     return _this["do"](args, callback, error);
@@ -812,7 +840,7 @@ SwaggerOperation.prototype.getSampleJSON = function(type, models) {
       else
         return JSON.stringify(val, null, 2);
     }
-    else 
+    else
       return val;
   }
 };
@@ -1073,7 +1101,7 @@ SwaggerOperation.prototype.formatXml = function(xml) {
 var SwaggerRequest = function(type, url, params, opts, successCallback, errorCallback, operation, execution) {
   var _this = this;
   var errors = [];
-  this.useJQuery = (typeof operation.useJQuery !== 'undefined' ? operation.useJQuery : null);
+  this.useJQuery = (typeof operation.resource.useJQuery !== 'undefined' ? operation.resource.useJQuery : null);
   this.type = (type||errors.push("SwaggerRequest type is required (get/post/put/delete/patch/options)."));
   this.url = (url||errors.push("SwaggerRequest url is required."));
   this.params = params;
@@ -1090,96 +1118,59 @@ var SwaggerRequest = function(type, url, params, opts, successCallback, errorCal
 
   this.type = this.type.toUpperCase();
 
-  var myHeaders = {};
+  // set request, response content type headers
+  var headers = this.setHeaders(params, this.operation);
   var body = params.body;
-  var parent = params["parent"];
-  var requestContentType = "application/json";
 
-  var formParams = [];
-  var fileParams = [];
-  var params = this.operation.parameters;
-
-
-  for(var i = 0; i < params.length; i++) {
-    var param = params[i];
-    if(param.paramType === "form")
-      formParams.push(param);
-    else if(param.paramType === "file")
-      fileParams.push(param);
-  }
-
-
-  if (body && (this.type === "POST" || this.type === "PUT" || this.type === "PATCH")) {
-    if (this.opts.requestContentType) {
-      requestContentType = this.opts.requestContentType;
-    }
-  } else {
-    // if any form params, content type must be set
-    if(formParams.length > 0) {
-      if(fileParams.length > 0)
-        requestContentType = "multipart/form-data";
-      else
-        requestContentType = "application/x-www-form-urlencoded";
-    }
-    else if (this.type != "DELETE")
-      requestContentType = null;
-  }
-
-  if (requestContentType && this.operation.consumes) {
-    if (this.operation.consumes[requestContentType] === 'undefined') {
-      log("server doesn't consume " + requestContentType + ", try " + JSON.stringify(this.operation.consumes));
-      if (this.requestContentType === null) {
-        requestContentType = this.operation.consumes[0];
-      }
-    }
-  }
-
-  var responseContentType = null;
-  if (this.opts.responseContentType) {
-    responseContentType = this.opts.responseContentType;
-  } else {
-    responseContentType = "application/json";
-  }
-  if (responseContentType && this.operation.produces) {
-    if (this.operation.produces[responseContentType] === 'undefined') {
-      log("server can't produce " + responseContentType);
-    }
-  }
-  if (requestContentType && requestContentType.indexOf("application/x-www-form-urlencoded") === 0) {
-    var fields = {};
-    var possibleParams = {};
+  // encode the body for form submits
+  if (headers["Content-Type"]) {
     var values = {};
-    var key;
-    for(key in formParams){
-      var param = formParams[key];
-      values[param.name] = param;
+    var i;
+    var operationParams = this.operation.parameters;
+    for(i = 0; i < operationParams.length; i++) {
+      var param = operationParams[i];
+      if(param.paramType === "form")
+        values[param.name] = param;
     }
 
-    var encoded = "";
-    var key;
-    for(key in values) {
-      value = this.params[key];
-      if(typeof value !== 'undefined'){
-        if(encoded !== "")
-          encoded += "&";
-        encoded += encodeURIComponent(key) + '=' + encodeURIComponent(value);
+    if(headers["Content-Type"].indexOf("application/x-www-form-urlencoded") === 0) {
+      var encoded = "";
+      var key;
+      for(key in values) {
+        value = this.params[key];
+        if(typeof value !== 'undefined'){
+          if(encoded !== "")
+            encoded += "&";
+          encoded += encodeURIComponent(key) + '=' + encodeURIComponent(value);
+        }
       }
+      body = encoded;
+    }
+    else if (headers["Content-Type"].indexOf("multipart/form-data") === 0) {
+      // encode the body for form submits
+      var data = "";
+      var boundary = "----SwaggerFormBoundary" + Date.now();
+      var key;
+      for(key in values) {
+        value = this.params[key];
+        if(typeof value !== 'undefined') {
+          data += '--' + boundary + '\n';
+          data += 'Content-Disposition: form-data; name="' + key + '"';
+          data += '\n\n';
+          data += value + "\n";
+        }
+      }
+      data += "--" + boundary + "--\n";
+      headers["Content-Type"] = "multipart/form-data; boundary=" + boundary;
+      body = data;
     }
-    body = encoded;
   }
-  var name;
-  for (name in this.headers)
-    myHeaders[name] = this.headers[name];
-  if ((requestContentType && body !== "") || (requestContentType === "application/x-www-form-urlencoded"))
-    myHeaders["Content-Type"] = requestContentType;
-  if (responseContentType)
-    myHeaders["Accept"] = responseContentType;
 
   if (!((this.headers != null) && (this.headers.mock != null))) {
     obj = {
       url: this.url,
       method: this.type,
-      headers: myHeaders,
+      headers: headers,
       body: body,
       useJQuery: this.useJQuery,
       on: {
@@ -1216,6 +1207,77 @@ var SwaggerRequest = function(type, url, params, opts, successCallback, errorCal
   }
 };
 
+SwaggerRequest.prototype.setHeaders = function(params, operation) {
+  // default type
+  var accepts = "application/json";
+  var consumes = "application/json";
+
+  var allDefinedParams = this.operation.parameters;
+  var definedFormParams = [];
+  var definedFileParams = [];
+  var body = params.body;
+  var headers = {};
+
+  // get params from the operation and set them in definedFileParams, definedFormParams, headers
+  var i;
+  for(i = 0; i < allDefinedParams.length; i++) {
+    var param = allDefinedParams[i];
+    if(param.paramType === "form")
+      definedFormParams.push(param);
+    else if(param.paramType === "file")
+      definedFileParams.push(param);
+    else if(param.paramType === "header" && this.params.headers) {
+      var key = param.name;
+      var headerValue = this.params.headers[param.name];
+      if(typeof this.params.headers[param.name] !== 'undefined')
+        headers[key] = headerValue;
+    }
+  }
+
+  // if there's a body, need to set the accepts header via requestContentType
+  if (body && (this.type === "POST" || this.type === "PUT" || this.type === "PATCH" || this.type === "DELETE")) {
+    if (this.opts.requestContentType)
+      consumes = this.opts.requestContentType;
+  } else {
+    // if any form params, content type must be set
+    if(definedFormParams.length > 0) {
+      if(definedFileParams.length > 0)
+        consumes = "multipart/form-data";
+      else
+        consumes = "application/x-www-form-urlencoded";
+    }
+    else if (this.type === "DELETE")
+      body = "{}";
+    else if (this.type != "DELETE")
+      accepts = null;
+  }
+
+  if (consumes && this.operation.consumes) {
+    if (this.operation.consumes.indexOf(consumes) === -1) {
+      log("server doesn't consume " + consumes + ", try " + JSON.stringify(this.operation.consumes));
+      consumes = this.operation.consumes[0];
+    }
+  }
+
+  if (this.opts.responseContentType) {
+    accepts = this.opts.responseContentType;
+  } else {
+    accepts = "application/json";
+  }
+  if (accepts && this.operation.produces) {
+    if (this.operation.produces.indexOf(accepts) === -1) {
+      log("server can't produce " + accepts);
+      accepts = this.operation.produces[0];
+    }
+  }
+
+  if ((consumes && body !== "") || (consumes === "application/x-www-form-urlencoded"))
+    headers["Content-Type"] = consumes;
+  if (accepts)
+    headers["Accept"] = accepts;
+  return headers;
+}
+
 SwaggerRequest.prototype.asCurl = function() {
   var results = [];
   if(this.headers) {
@@ -1259,9 +1321,16 @@ SwaggerHttp.prototype.isIE8 = function() {
 };
 
 /*
- * JQueryHttpClient lets a browser take advantage of JQuery's cross-browser magic
+ * JQueryHttpClient lets a browser take advantage of JQuery's cross-browser magic.
+ * NOTE: when jQuery is available it will export both '$' and 'jQuery' to the global space.
+ *       Since we are using closures here we need to alias it for internal use.
  */
-var JQueryHttpClient = function(options) {}
+var JQueryHttpClient = function(options) {
+  "use strict";
+  if(!jQuery){
+    var jQuery = window.jQuery;
+  }
+}
 
 JQueryHttpClient.prototype.execute = function(obj) {
   var cb = obj.on;
@@ -1335,8 +1404,8 @@ JQueryHttpClient.prototype.execute = function(obj) {
       return cb.response(out);
   };
 
-  $.support.cors = true;
-  return $.ajax(obj);
+  jQuery.support.cors = true;
+  return jQuery.ajax(obj);
 }
 
 /*
@@ -1411,11 +1480,36 @@ ShredHttpClient.prototype.execute = function(obj) {
     return out;
   };
 
+  // Transform an error into a usable response-like object
+  var transformError = function(error) {
+    var out = {
+      // Default to a status of 0 - The client will treat this as a generic permissions sort of error
+      status: 0,
+      data: error.message || error
+    };
+
+    if(error.code) {
+      out.obj = error;
+
+      if(error.code === 'ENOTFOUND' || error.code === 'ECONNREFUSED' ) {
+        // We can tell the client that this should be treated as a missing resource and not as a permissions thing
+        out.status = 404;
+      }
+    }
+
+    return out;
+  };
+
   res = {
     error: function(response) {
       if (obj)
         return cb.error(transform(response));
     },
+    // Catch the Shred error raised when the request errors as it is made (i.e. No Response is coming)
+    request_error: function(err) {
+      if(obj)
+        return cb.error(transformError(err));
+    },
     redirect: function(response) {
       if (obj)
         return cb.redirect(transform(response));
@@ -1452,26 +1546,42 @@ SwaggerAuthorizations.prototype.remove = function(name) {
 };
 
 SwaggerAuthorizations.prototype.apply = function(obj, authorizations) {
-  status = null;
+  var status = null;
   var key;
-  for (key in this.authz) {
-    value = this.authz[key];
-    result = value.apply(obj, authorizations);
-    if (result === false)
-      status = false;
-    if (result === true)
-      status = true;
+
+  // if the "authorizations" key is undefined, or has an empty array, add all keys
+  if(typeof authorizations === 'undefined' || Object.keys(authorizations).length == 0) {
+    for (key in this.authz) {
+      value = this.authz[key];
+      result = value.apply(obj, authorizations);
+      if (result === true)
+        status = true;
+    }
   }
+  else {
+    for(name in authorizations) {
+      for (key in this.authz) {
+        if(key == name) {
+          value = this.authz[key];
+          result = value.apply(obj, authorizations);
+          if (result === true)
+            status = true;
+        }
+      }      
+    }
+  }
+
   return status;
 };
 
 /**
  * ApiKeyAuthorization allows a query param or header to be injected
  */
-var ApiKeyAuthorization = function(name, value, type) {
+var ApiKeyAuthorization = function(name, value, type, delimiter) {
   this.name = name;
   this.value = value;
   this.type = type;
+  this.delimiter = delimiter;
 };
 
 ApiKeyAuthorization.prototype.apply = function(obj, authorizations) {
@@ -1482,7 +1592,12 @@ ApiKeyAuthorization.prototype.apply = function(obj, authorizations) {
       obj.url = obj.url + "?" + this.name + "=" + this.value;
     return true;
   } else if (this.type === "header") {
-    obj.headers[this.name] = this.value;
+    if(typeof obj.headers[this.name] !== 'undefined') {
+      if(typeof this.delimiter !== 'undefined')
+        obj.headers[this.name] = obj.headers[this.name] + this.delimiter +  this.value;
+    }
+    else
+      obj.headers[this.name] = this.value;
     return true;
   }
 };
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/swagger-ui.js b/htdocs/includes/restler/framework/Luracast/Restler/explorer/swagger-ui.js
index 5c6aad20be6..c28bf145ab6 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/explorer/swagger-ui.js
+++ b/htdocs/includes/restler/framework/Luracast/Restler/explorer/swagger-ui.js
@@ -1,5 +1,5 @@
 // swagger-ui.js
-// version 2.0.17
+// version 2.0.23
 $(function() {
 
 	// Helper function for vertically aligning DOM elements
@@ -68,7 +68,7 @@ log = function(){
   log.history = log.history || [];
   log.history.push(arguments);
   if(this.console){
-    console.log( Array.prototype.slice.call(arguments) );
+    console.log( Array.prototype.slice.call(arguments)[0] );
   }
 };
 
@@ -240,67 +240,74 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
 function program1(depth0,data) {
   
   var buffer = "", stack1, stack2;
-  buffer += "\n                ";
+  buffer += "\n    <div class=\"info_title\">"
+    + escapeExpression(((stack1 = ((stack1 = depth0.info),stack1 == null || stack1 === false ? stack1 : stack1.title)),typeof stack1 === functionType ? stack1.apply(depth0) : stack1))
+    + "</div>\n    <div class=\"info_description\">";
+  stack2 = ((stack1 = ((stack1 = depth0.info),stack1 == null || stack1 === false ? stack1 : stack1.description)),typeof stack1 === functionType ? stack1.apply(depth0) : stack1);
+  if(stack2 || stack2 === 0) { buffer += stack2; }
+  buffer += "</div>\n    ";
   stack2 = helpers['if'].call(depth0, ((stack1 = depth0.info),stack1 == null || stack1 === false ? stack1 : stack1.termsOfServiceUrl), {hash:{},inverse:self.noop,fn:self.program(2, program2, data),data:data});
   if(stack2 || stack2 === 0) { buffer += stack2; }
-  buffer += "\n                ";
+  buffer += "\n    ";
   stack2 = helpers['if'].call(depth0, ((stack1 = depth0.info),stack1 == null || stack1 === false ? stack1 : stack1.contact), {hash:{},inverse:self.noop,fn:self.program(4, program4, data),data:data});
   if(stack2 || stack2 === 0) { buffer += stack2; }
-  buffer += "\n                ";
+  buffer += "\n    ";
   stack2 = helpers['if'].call(depth0, ((stack1 = depth0.info),stack1 == null || stack1 === false ? stack1 : stack1.license), {hash:{},inverse:self.noop,fn:self.program(6, program6, data),data:data});
   if(stack2 || stack2 === 0) { buffer += stack2; }
-  buffer += "\n            ";
+  buffer += "\n  ";
   return buffer;
   }
 function program2(depth0,data) {
   
   var buffer = "", stack1;
-  buffer += "<li><a href=\""
+  buffer += "<div class=\"info_tos\"><a href=\""
     + escapeExpression(((stack1 = ((stack1 = depth0.info),stack1 == null || stack1 === false ? stack1 : stack1.termsOfServiceUrl)),typeof stack1 === functionType ? stack1.apply(depth0) : stack1))
-    + "\" title=\"Terms of Service\"><i class=\"fa fa-lg fa-bullhorn\"></i> Terms</a></li>";
+    + "\">Terms of service</a></div>";
   return buffer;
   }
 
 function program4(depth0,data) {
   
   var buffer = "", stack1;
-  buffer += "<li><a href=\"mailto:"
+  buffer += "<div class='info_contact'><a href=\"mailto:"
     + escapeExpression(((stack1 = ((stack1 = depth0.info),stack1 == null || stack1 === false ? stack1 : stack1.contact)),typeof stack1 === functionType ? stack1.apply(depth0) : stack1))
-    + "\"><i class=\"fa fa-lg fa-send\"></i> Contact</a></li>";
+    + "\">Contact the developer</a></div>";
   return buffer;
   }
 
 function program6(depth0,data) {
   
   var buffer = "", stack1;
-  buffer += "<li><a href=\""
+  buffer += "<div class='info_license'><a href='"
     + escapeExpression(((stack1 = ((stack1 = depth0.info),stack1 == null || stack1 === false ? stack1 : stack1.licenseUrl)),typeof stack1 === functionType ? stack1.apply(depth0) : stack1))
-    + "\" title=\""
+    + "'>"
     + escapeExpression(((stack1 = ((stack1 = depth0.info),stack1 == null || stack1 === false ? stack1 : stack1.license)),typeof stack1 === functionType ? stack1.apply(depth0) : stack1))
-    + "\"><i class=\"fa fa-lg fa-certificate\"></i> License</a></li>";
+    + "</a></div>";
   return buffer;
   }
 
 function program8(depth0,data) {
   
   var buffer = "", stack1;
-  buffer += " v";
+  buffer += "\n        , <span style=\"font-variant: small-caps\">api version</span>: ";
   if (stack1 = helpers.apiVersion) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
   else { stack1 = depth0.apiVersion; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1);
+  buffer += escapeExpression(stack1)
+    + "\n        ";
   return buffer;
   }
 
-  buffer += "<div class='info' id='api_info'>\n</div>\n<div class='container' id='resources_container'>\n    <ul id='resources'>\n    </ul>\n\n    <div class=\"footer\">\n        <ul id=\"footer-nav\">\n            ";
+  buffer += "<div class='info' id='api_info'>\n  ";
   stack1 = helpers['if'].call(depth0, depth0.info, {hash:{},inverse:self.noop,fn:self.program(1, program1, data),data:data});
   if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\n            <li>\n                ";
+  buffer += "\n</div>\n<div class='container' id='resources_container'>\n    <ul id='resources'>\n    </ul>\n\n    <div class=\"footer\">\n        <br>\n        <br>\n        <h4 style=\"color: #999\">[ <span style=\"font-variant: small-caps\">base url</span>: ";
   if (stack1 = helpers.basePath) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
   else { stack1 = depth0.basePath; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1);
+  buffer += escapeExpression(stack1)
+    + "\n        ";
   stack1 = helpers['if'].call(depth0, depth0.apiVersion, {hash:{},inverse:self.noop,fn:self.program(8, program8, data),data:data});
   if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += " Powered by Restler & Swagger\n            </li>\n        </ul>\n    </div>\n</div>\n";
+  buffer += "]</h4>\n    </div>\n</div>\n";
   return buffer;
   });
 })();
@@ -389,7 +396,7 @@ function program18(depth0,data) {
 function program20(depth0,data) {
   
   
-  return "\n          <div class='sandbox_header'>\n            <input class='submit' name='commit' type='button' value='Try it out!' />\n            <a href='#' class='response_hider' style='display:none'>Hide Response</a>\n            <img alt='Throbber' class='response_throbber' src='images/throbber.gif' style='display:none' />\n          </div>\n          ";
+  return "\n          <div class='sandbox_header'>\n            <input class='submit' name='commit' type='button' value='Try it out!' />\n            <a href='#' class='response_hider' style='display:none'>Hide Response</a>\n            <span class='response_throbber' style='display:none'></span>\n          </div>\n          ";
   }
 
   buffer += "\n  <ul class='operations' >\n    <li class='";
@@ -555,7 +562,7 @@ function program9(depth0,data) {
   
   var buffer = "", stack1;
   buffer += "\n		";
-  stack1 = helpers['if'].call(depth0, depth0.defaultValue, {hash:{},inverse:self.program(12, program12, data),fn:self.program(10, program10, data),data:data});
+  stack1 = helpers['if'].call(depth0, depth0.isFile, {hash:{},inverse:self.program(10, program10, data),fn:self.program(2, program2, data),data:data});
   if(stack1 || stack1 === 0) { buffer += stack1; }
   buffer += "\n	";
   return buffer;
@@ -563,7 +570,16 @@ function program9(depth0,data) {
 function program10(depth0,data) {
   
   var buffer = "", stack1;
-  buffer += "\n			<input class='parameter' minlength='0' name='";
+  buffer += "\n			";
+  stack1 = helpers['if'].call(depth0, depth0.defaultValue, {hash:{},inverse:self.program(13, program13, data),fn:self.program(11, program11, data),data:data});
+  if(stack1 || stack1 === 0) { buffer += stack1; }
+  buffer += "\n		";
+  return buffer;
+  }
+function program11(depth0,data) {
+  
+  var buffer = "", stack1;
+  buffer += "\n				<input class='parameter' minlength='0' name='";
   if (stack1 = helpers.name) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
   else { stack1 = depth0.name; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
   buffer += escapeExpression(stack1)
@@ -571,18 +587,18 @@ function program10(depth0,data) {
   if (stack1 = helpers.defaultValue) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
   else { stack1 = depth0.defaultValue; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
   buffer += escapeExpression(stack1)
-    + "'/>\n		";
+    + "'/>\n			";
   return buffer;
   }
 
-function program12(depth0,data) {
+function program13(depth0,data) {
   
   var buffer = "", stack1;
-  buffer += "\n			<input class='parameter' minlength='0' name='";
+  buffer += "\n				<input class='parameter' minlength='0' name='";
   if (stack1 = helpers.name) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
   else { stack1 = depth0.name; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
   buffer += escapeExpression(stack1)
-    + "' placeholder='' type='text' value=''/>\n		";
+    + "' placeholder='' type='text' value=''/>\n			";
   return buffer;
   }
 
@@ -1057,23 +1073,19 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
 
 function program1(depth0,data) {
   
-  var buffer = "", stack1;
-  buffer += " : ";
-  if (stack1 = helpers.description) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.description; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  return buffer;
+  
+  return " : ";
   }
 
   buffer += "<div class='heading'>\n  <h2>\n    <a href='#!/";
   if (stack1 = helpers.id) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
   else { stack1 = depth0.id; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
   buffer += escapeExpression(stack1)
-    + "' onclick=\"Docs.toggleEndpointListForResource('";
+    + "' class=\"toggleEndpointList\" data-id=\"";
   if (stack1 = helpers.id) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
   else { stack1 = depth0.id; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
   buffer += escapeExpression(stack1)
-    + "');\">";
+    + "\">";
   if (stack1 = helpers.name) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
   else { stack1 = depth0.name; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
   buffer += escapeExpression(stack1)
@@ -1083,6 +1095,9 @@ function program1(depth0,data) {
   else { stack1 = depth0.description; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
   if (!helpers.description) { stack1 = blockHelperMissing.call(depth0, stack1, options); }
   if(stack1 || stack1 === 0) { buffer += stack1; }
+  if (stack1 = helpers.description) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
+  else { stack1 = depth0.description; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
+  if(stack1 || stack1 === 0) { buffer += stack1; }
   buffer += "\n  </h2>\n  <ul class='options'>\n    <li>\n      <a href='#!/";
   if (stack1 = helpers.id) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
   else { stack1 = depth0.id; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
@@ -1091,19 +1106,19 @@ function program1(depth0,data) {
   if (stack1 = helpers.id) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
   else { stack1 = depth0.id; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
   buffer += escapeExpression(stack1)
-    + "'\n         onclick=\"Docs.toggleEndpointListForResource('";
+    + "' class=\"toggleEndpointList\" data-id=\"";
   if (stack1 = helpers.id) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
   else { stack1 = depth0.id; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
   buffer += escapeExpression(stack1)
-    + "');\">Show/Hide</a>\n    </li>\n    <li>\n      <a href='#' onclick=\"Docs.collapseOperationsForResource('";
+    + "\">Show/Hide</a>\n    </li>\n    <li>\n      <a href='#' class=\"collapseResource\" data-id=\"";
   if (stack1 = helpers.id) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
   else { stack1 = depth0.id; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
   buffer += escapeExpression(stack1)
-    + "'); return false;\">\n        List Operations\n      </a>\n    </li>\n    <li>\n      <a href='#' onclick=\"Docs.expandOperationsForResource('";
+    + "\">\n        List Operations\n      </a>\n    </li>\n    <li>\n      <a href='#' class=\"expandResource\" data-id=";
   if (stack1 = helpers.id) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
   else { stack1 = depth0.id; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
   buffer += escapeExpression(stack1)
-    + "'); return false;\">\n        Expand Operations\n      </a>\n    </li>\n    <li>\n      <a href='";
+    + ">\n        Expand Operations\n      </a>\n    </li>\n    <li>\n      <a href='";
   if (stack1 = helpers.url) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
   else { stack1 = depth0.url; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
   buffer += escapeExpression(stack1)
@@ -1203,18 +1218,18 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
 
 
 
-// Generated by CoffeeScript 1.5.0
+// Generated by CoffeeScript 1.6.3
 (function() {
-  var ContentTypeView, HeaderView, MainView, OperationView, ParameterContentTypeView, ParameterView, ResourceView, ResponseContentTypeView, SignatureView, StatusCodeView, SwaggerUi,
+  var ContentTypeView, HeaderView, MainView, OperationView, ParameterContentTypeView, ParameterView, ResourceView, ResponseContentTypeView, SignatureView, StatusCodeView, SwaggerUi, _ref, _ref1, _ref10, _ref2, _ref3, _ref4, _ref5, _ref6, _ref7, _ref8, _ref9,
     __hasProp = {}.hasOwnProperty,
     __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; };
 
   SwaggerUi = (function(_super) {
-
     __extends(SwaggerUi, _super);
 
     function SwaggerUi() {
-      SwaggerUi.__super__.constructor.apply(this, arguments);
+      _ref = SwaggerUi.__super__.constructor.apply(this, arguments);
+      return _ref;
     }
 
     SwaggerUi.prototype.dom_id = "swagger_ui";
@@ -1263,9 +1278,9 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
     };
 
     SwaggerUi.prototype.load = function() {
-      var url, _ref;
-      if ((_ref = this.mainView) != null) {
-        _ref.clear();
+      var url, _ref1;
+      if ((_ref1 = this.mainView) != null) {
+        _ref1.clear();
       }
       url = this.options.url;
       if (url.indexOf("http") !== 0) {
@@ -1281,10 +1296,10 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
     SwaggerUi.prototype.render = function() {
       var _this = this;
       this.showMessage('Finished Loading Resource Information. Rendering Swagger UI...');
-      this.headerView.updateInfo(this.api.info);
       this.mainView = new MainView({
         model: this.api,
-        el: $('#' + this.dom_id)
+        el: $('#' + this.dom_id),
+        swaggerOptions: this.options
       }).render();
       this.showMessage();
       switch (this.options.docExpansion) {
@@ -1355,11 +1370,11 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
   window.SwaggerUi = SwaggerUi;
 
   HeaderView = (function(_super) {
-
     __extends(HeaderView, _super);
 
     function HeaderView() {
-      HeaderView.__super__.constructor.apply(this, arguments);
+      _ref1 = HeaderView.__super__.constructor.apply(this, arguments);
+      return _ref1;
     }
 
     HeaderView.prototype.events = {
@@ -1412,40 +1427,56 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
       }
     };
 
-    HeaderView.prototype.updateInfo = function(info) {
-      if (info.title != null) {
-        $('#logo').text(info.title);
-      }
-      if (info.description != null) {
-        $('#logo').attr('title', info.description);
-      }
-      if (info.termsOfServiceUrl != null) {
-        return $('#logo').attr('href', info.termsOfServiceUrl);
-      }
-    };
-
     return HeaderView;
 
   })(Backbone.View);
 
   MainView = (function(_super) {
+    var sorters;
 
     __extends(MainView, _super);
 
     function MainView() {
-      MainView.__super__.constructor.apply(this, arguments);
+      _ref2 = MainView.__super__.constructor.apply(this, arguments);
+      return _ref2;
     }
 
-    MainView.prototype.initialize = function() {};
+    sorters = {
+      'alpha': function(a, b) {
+        return a.path.localeCompare(b.path);
+      },
+      'method': function(a, b) {
+        return a.method.localeCompare(b.method);
+      }
+    };
+
+    MainView.prototype.initialize = function(opts) {
+      var route, sorter, sorterName, _i, _len, _ref3;
+      if (opts == null) {
+        opts = {};
+      }
+      if (opts.swaggerOptions.sorter) {
+        sorterName = opts.swaggerOptions.sorter;
+        sorter = sorters[sorterName];
+        _ref3 = this.model.apisArray;
+        for (_i = 0, _len = _ref3.length; _i < _len; _i++) {
+          route = _ref3[_i];
+          route.operationsArray.sort(sorter);
+        }
+        if (sorterName === "alpha") {
+          return this.model.apisArray.sort(sorter);
+        }
+      }
+    };
 
     MainView.prototype.render = function() {
-      var counter, id, resource, resources, _i, _len, _ref;
+      var counter, id, resource, resources, _i, _len, _ref3;
       $(this.el).html(Handlebars.templates.main(this.model));
       resources = {};
       counter = 0;
-      _ref = this.model.apisArray;
-      for (_i = 0, _len = _ref.length; _i < _len; _i++) {
-        resource = _ref[_i];
+      _ref3 = this.model.apisArray;
+      for (_i = 0, _len = _ref3.length; _i < _len; _i++) {
+        resource = _ref3[_i];
         id = resource.name;
         while (typeof resources[id] !== 'undefined') {
           id = id + "_" + counter;
@@ -1464,7 +1495,8 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
         model: resource,
         tagName: 'li',
         id: 'resource_' + resource.id,
-        className: 'resource'
+        className: 'resource',
+        swaggerOptions: this.options.swaggerOptions
       });
       return $('#resources').append(resourceView.render().el);
     };
@@ -1478,22 +1510,22 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
   })(Backbone.View);
 
   ResourceView = (function(_super) {
-
     __extends(ResourceView, _super);
 
     function ResourceView() {
-      ResourceView.__super__.constructor.apply(this, arguments);
+      _ref3 = ResourceView.__super__.constructor.apply(this, arguments);
+      return _ref3;
     }
 
     ResourceView.prototype.initialize = function() {};
 
     ResourceView.prototype.render = function() {
-      var counter, id, methods, operation, _i, _len, _ref;
+      var counter, id, methods, operation, _i, _len, _ref4;
       $(this.el).html(Handlebars.templates.resource(this.model));
       methods = {};
-      _ref = this.model.operationsArray;
-      for (_i = 0, _len = _ref.length; _i < _len; _i++) {
-        operation = _ref[_i];
+      _ref4 = this.model.operationsArray;
+      for (_i = 0, _len = _ref4.length; _i < _len; _i++) {
+        operation = _ref4[_i];
         counter = 0;
         id = operation.nickname;
         while (typeof methods[id] !== 'undefined') {
@@ -1505,6 +1537,10 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
         operation.parentId = this.model.id;
         this.addOperation(operation);
       }
+      $('.toggleEndpointList', this.el).click(this.callDocs.bind(this, 'toggleEndpointListForResource'));
+      $('.collapseResource', this.el).click(this.callDocs.bind(this, 'collapseOperationsForResource'));
+      /* DOL_CHANGE LDR Fix typo error that break expand */
+      $('.expandResource', this.el).click(this.callDocs.bind(this, 'expandOperationsForResource'));
       return this;
     };
 
@@ -1514,22 +1550,28 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
       operationView = new OperationView({
         model: operation,
         tagName: 'li',
-        className: 'endpoint'
+        className: 'endpoint',
+        swaggerOptions: this.options.swaggerOptions
       });
       $('.endpoints', $(this.el)).append(operationView.render().el);
       return this.number++;
     };
 
+    ResourceView.prototype.callDocs = function(fnName, e) {
+      e.preventDefault();
+      return Docs[fnName](e.currentTarget.getAttribute('data-id'));
+    };
+
     return ResourceView;
 
   })(Backbone.View);
 
   OperationView = (function(_super) {
-
     __extends(OperationView, _super);
 
     function OperationView() {
-      OperationView.__super__.constructor.apply(this, arguments);
+      _ref4 = OperationView.__super__.constructor.apply(this, arguments);
+      return _ref4;
     }
 
     OperationView.prototype.invocationUrl = null;
@@ -1548,8 +1590,8 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
     OperationView.prototype.mouseEnter = function(e) {
       var elem, hgh, pos, scMaxX, scMaxY, scX, scY, wd, x, y;
       elem = $(e.currentTarget.parentNode).find('#api_information_panel');
-      x = event.pageX;
-      y = event.pageY;
+      x = e.pageX;
+      y = e.pageY;
       scX = $(window).scrollLeft();
       scY = $(window).scrollTop();
       scMaxX = scX + $(window).width();
@@ -1580,16 +1622,16 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
     };
 
     OperationView.prototype.render = function() {
-      var contentTypeModel, isMethodSubmissionSupported, k, o, param, responseContentTypeView, responseSignatureView, signatureModel, statusCode, type, v, _i, _j, _k, _l, _len, _len1, _len2, _len3, _ref, _ref1, _ref2, _ref3;
+      var contentTypeModel, isMethodSubmissionSupported, k, o, param, responseContentTypeView, responseSignatureView, signatureModel, statusCode, type, v, _i, _j, _k, _l, _len, _len1, _len2, _len3, _ref5, _ref6, _ref7, _ref8;
       isMethodSubmissionSupported = true;
       if (!isMethodSubmissionSupported) {
         this.model.isReadOnly = true;
       }
       this.model.oauth = null;
       if (this.model.authorizations) {
-        _ref = this.model.authorizations;
-        for (k in _ref) {
-          v = _ref[k];
+        _ref5 = this.model.authorizations;
+        for (k in _ref5) {
+          v = _ref5[k];
           if (k === "oauth2") {
             if (this.model.oauth === null) {
               this.model.oauth = {};
@@ -1624,9 +1666,9 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
       };
       contentTypeModel.consumes = this.model.consumes;
       contentTypeModel.produces = this.model.produces;
-      _ref1 = this.model.parameters;
-      for (_j = 0, _len1 = _ref1.length; _j < _len1; _j++) {
-        param = _ref1[_j];
+      _ref6 = this.model.parameters;
+      for (_j = 0, _len1 = _ref6.length; _j < _len1; _j++) {
+        param = _ref6[_j];
         type = param.type || param.dataType;
         if (type.toLowerCase() === 'file') {
           if (!contentTypeModel.consumes) {
@@ -1639,14 +1681,14 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
         model: contentTypeModel
       });
       $('.response-content-type', $(this.el)).append(responseContentTypeView.render().el);
-      _ref2 = this.model.parameters;
-      for (_k = 0, _len2 = _ref2.length; _k < _len2; _k++) {
-        param = _ref2[_k];
+      _ref7 = this.model.parameters;
+      for (_k = 0, _len2 = _ref7.length; _k < _len2; _k++) {
+        param = _ref7[_k];
         this.addParameter(param, contentTypeModel.consumes);
       }
-      _ref3 = this.model.responseMessages;
-      for (_l = 0, _len3 = _ref3.length; _l < _len3; _l++) {
-        statusCode = _ref3[_l];
+      _ref8 = this.model.responseMessages;
+      for (_l = 0, _len3 = _ref8.length; _l < _len3; _l++) {
+        statusCode = _ref8[_l];
         this.addStatusCode(statusCode);
       }
       return this;
@@ -1673,7 +1715,7 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
     };
 
     OperationView.prototype.submitOperation = function(e) {
-      var error_free, form, isFileUpload, map, o, opts, val, _i, _j, _k, _len, _len1, _len2, _ref, _ref1, _ref2;
+      var error_free, form, isFileUpload, map, o, opts, val, _i, _j, _k, _len, _len1, _len2, _ref5, _ref6, _ref7;
       if (e != null) {
         e.preventDefault();
       }
@@ -1698,9 +1740,9 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
           parent: this
         };
         isFileUpload = false;
-        _ref = form.find("input");
-        for (_i = 0, _len = _ref.length; _i < _len; _i++) {
-          o = _ref[_i];
+        _ref5 = form.find("input");
+        for (_i = 0, _len = _ref5.length; _i < _len; _i++) {
+          o = _ref5[_i];
           if ((o.value != null) && jQuery.trim(o.value).length > 0) {
             map[o.name] = o.value;
           }
@@ -1708,16 +1750,16 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
             isFileUpload = true;
           }
         }
-        _ref1 = form.find("textarea");
-        for (_j = 0, _len1 = _ref1.length; _j < _len1; _j++) {
-          o = _ref1[_j];
+        _ref6 = form.find("textarea");
+        for (_j = 0, _len1 = _ref6.length; _j < _len1; _j++) {
+          o = _ref6[_j];
           if ((o.value != null) && jQuery.trim(o.value).length > 0) {
             map["body"] = o.value;
           }
         }
-        _ref2 = form.find("select");
-        for (_k = 0, _len2 = _ref2.length; _k < _len2; _k++) {
-          o = _ref2[_k];
+        _ref7 = form.find("select");
+        for (_k = 0, _len2 = _ref7.length; _k < _len2; _k++) {
+          o = _ref7[_k];
           val = this.getSelectedValue(o);
           if ((val != null) && jQuery.trim(val).length > 0) {
             map[o.name] = val;
@@ -1739,46 +1781,46 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
     };
 
     OperationView.prototype.handleFileUpload = function(map, form) {
-      var bodyParam, el, headerParams, o, obj, param, params, _i, _j, _k, _l, _len, _len1, _len2, _len3, _ref, _ref1, _ref2, _ref3,
+      var bodyParam, el, headerParams, o, obj, param, params, _i, _j, _k, _l, _len, _len1, _len2, _len3, _ref5, _ref6, _ref7, _ref8,
         _this = this;
-      _ref = form.serializeArray();
-      for (_i = 0, _len = _ref.length; _i < _len; _i++) {
-        o = _ref[_i];
+      _ref5 = form.serializeArray();
+      for (_i = 0, _len = _ref5.length; _i < _len; _i++) {
+        o = _ref5[_i];
         if ((o.value != null) && jQuery.trim(o.value).length > 0) {
           map[o.name] = o.value;
         }
       }
       bodyParam = new FormData();
       params = 0;
-      _ref1 = this.model.parameters;
-      for (_j = 0, _len1 = _ref1.length; _j < _len1; _j++) {
-        param = _ref1[_j];
+      _ref6 = this.model.parameters;
+      for (_j = 0, _len1 = _ref6.length; _j < _len1; _j++) {
+        param = _ref6[_j];
         if (param.paramType === 'form') {
-          if (map[param.name] !== void 0) {
+          if (param.type.toLowerCase() !== 'file' && map[param.name] !== void 0) {
             bodyParam.append(param.name, map[param.name]);
           }
         }
       }
       headerParams = {};
-      _ref2 = this.model.parameters;
-      for (_k = 0, _len2 = _ref2.length; _k < _len2; _k++) {
-        param = _ref2[_k];
+      _ref7 = this.model.parameters;
+      for (_k = 0, _len2 = _ref7.length; _k < _len2; _k++) {
+        param = _ref7[_k];
         if (param.paramType === 'header') {
           headerParams[param.name] = map[param.name];
         }
       }
       log(headerParams);
-      _ref3 = form.find('input[type~="file"]');
-      for (_l = 0, _len3 = _ref3.length; _l < _len3; _l++) {
-        el = _ref3[_l];
+      _ref8 = form.find('input[type~="file"]');
+      for (_l = 0, _len3 = _ref8.length; _l < _len3; _l++) {
+        el = _ref8[_l];
         if (typeof el.files[0] !== 'undefined') {
           bodyParam.append($(el).attr('name'), el.files[0]);
           params += 1;
         }
       }
-      log(bodyParam);
       this.invocationUrl = this.model.supportHeaderParams() ? (headerParams = this.model.getHeaderParams(map), this.model.urlify(map, false)) : this.model.urlify(map, true);
-      $(".request_url", $(this.el)).html("<pre>" + this.invocationUrl + "</pre>");
+      $(".request_url", $(this.el)).html("<pre></pre>");
+      $(".request_url pre", $(this.el)).text(this.invocationUrl);
       obj = {
         type: this.model.method,
         url: this.invocationUrl,
@@ -1829,14 +1871,14 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
     };
 
     OperationView.prototype.getSelectedValue = function(select) {
-      var opt, options, _i, _len, _ref;
+      var opt, options, _i, _len, _ref5;
       if (!select.multiple) {
         return select.value;
       } else {
         options = [];
-        _ref = select.options;
-        for (_i = 0, _len = _ref.length; _i < _len; _i++) {
-          opt = _ref[_i];
+        _ref5 = select.options;
+        for (_i = 0, _len = _ref5.length; _i < _len; _i++) {
+          opt = _ref5[_i];
           if (opt.selected) {
             options.push(opt.value);
           }
@@ -1924,9 +1966,9 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
         padding = '';
         indent += transitions[fromTo];
         padding = ((function() {
-          var _j, _ref, _results;
+          var _j, _ref5, _results;
           _results = [];
-          for (j = _j = 0, _ref = indent; 0 <= _ref ? _j < _ref : _j > _ref; j = 0 <= _ref ? ++_j : --_j) {
+          for (j = _j = 0, _ref5 = indent; 0 <= _ref5 ? _j < _ref5 : _j > _ref5; j = 0 <= _ref5 ? ++_j : --_j) {
             _results.push('  ');
           }
           return _results;
@@ -1945,7 +1987,7 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
     };
 
     OperationView.prototype.showStatus = function(response) {
-      var code, content, contentType, headers, pre, response_body, url;
+      var code, content, contentType, headers, opts, pre, response_body, response_body_el, url;
       if (response.content === void 0) {
         content = response.data;
         url = response.url;
@@ -1974,14 +2016,21 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
         pre = $('<pre class="json" />').append(code);
       }
       response_body = pre;
-      $(".request_url", $(this.el)).html("<pre>" + url + "</pre>");
+      $(".request_url", $(this.el)).html("<pre></pre>");
+      $(".request_url pre", $(this.el)).text(url);
       $(".response_code", $(this.el)).html("<pre>" + response.status + "</pre>");
       $(".response_body", $(this.el)).html(response_body);
-      $(".response_headers", $(this.el)).html("<pre>" + JSON.stringify(response.headers, null, "  ").replace(/\n/g, "<br>") + "</pre>");
+      $(".response_headers", $(this.el)).html("<pre>" + _.escape(JSON.stringify(response.headers, null, "  ")).replace(/\n/g, "<br>") + "</pre>");
       $(".response", $(this.el)).slideDown();
       $(".response_hider", $(this.el)).show();
       $(".response_throbber", $(this.el)).hide();
-      return hljs.highlightBlock($('.response_body', $(this.el))[0]);
+      response_body_el = $('.response_body', $(this.el))[0];
+      opts = this.options.swaggerOptions;
+      if (opts.highlightSizeThreshold && response.data.length > opts.highlightSizeThreshold) {
+        return response_body_el;
+      } else {
+        return hljs.highlightBlock(response_body_el);
+      }
     };
 
     OperationView.prototype.toggleOperationContent = function() {
@@ -1999,11 +2048,11 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
   })(Backbone.View);
 
   StatusCodeView = (function(_super) {
-
     __extends(StatusCodeView, _super);
 
     function StatusCodeView() {
-      StatusCodeView.__super__.constructor.apply(this, arguments);
+      _ref5 = StatusCodeView.__super__.constructor.apply(this, arguments);
+      return _ref5;
     }
 
     StatusCodeView.prototype.initialize = function() {};
@@ -2038,11 +2087,11 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
   })(Backbone.View);
 
   ParameterView = (function(_super) {
-
     __extends(ParameterView, _super);
 
     function ParameterView() {
-      ParameterView.__super__.constructor.apply(this, arguments);
+      _ref6 = ParameterView.__super__.constructor.apply(this, arguments);
+      return _ref6;
     }
 
     ParameterView.prototype.initialize = function() {
@@ -2127,11 +2176,11 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
   })(Backbone.View);
 
   SignatureView = (function(_super) {
-
     __extends(SignatureView, _super);
 
     function SignatureView() {
-      SignatureView.__super__.constructor.apply(this, arguments);
+      _ref7 = SignatureView.__super__.constructor.apply(this, arguments);
+      return _ref7;
     }
 
     SignatureView.prototype.events = {
@@ -2146,7 +2195,7 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
       var template;
       template = this.template();
       $(this.el).html(template(this.model));
-      this.switchToDescription();
+      this.switchToSnippet();
       this.isParam = this.model.isParam;
       if (this.isParam) {
         $('.notice', $(this.el)).text('Click to set as parameter value');
@@ -2196,11 +2245,11 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
   })(Backbone.View);
 
   ContentTypeView = (function(_super) {
-
     __extends(ContentTypeView, _super);
 
     function ContentTypeView() {
-      ContentTypeView.__super__.constructor.apply(this, arguments);
+      _ref8 = ContentTypeView.__super__.constructor.apply(this, arguments);
+      return _ref8;
     }
 
     ContentTypeView.prototype.initialize = function() {};
@@ -2222,11 +2271,11 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
   })(Backbone.View);
 
   ResponseContentTypeView = (function(_super) {
-
     __extends(ResponseContentTypeView, _super);
 
     function ResponseContentTypeView() {
-      ResponseContentTypeView.__super__.constructor.apply(this, arguments);
+      _ref9 = ResponseContentTypeView.__super__.constructor.apply(this, arguments);
+      return _ref9;
     }
 
     ResponseContentTypeView.prototype.initialize = function() {};
@@ -2248,11 +2297,11 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
   })(Backbone.View);
 
   ParameterContentTypeView = (function(_super) {
-
     __extends(ParameterContentTypeView, _super);
 
     function ParameterContentTypeView() {
-      ParameterContentTypeView.__super__.constructor.apply(this, arguments);
+      _ref10 = ParameterContentTypeView.__super__.constructor.apply(this, arguments);
+      return _ref10;
     }
 
     ParameterContentTypeView.prototype.initialize = function() {};
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/swagger-ui.min.js b/htdocs/includes/restler/framework/Luracast/Restler/explorer/swagger-ui.min.js
index a1e827a1029..2956b613b0f 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/explorer/swagger-ui.min.js
+++ b/htdocs/includes/restler/framework/Luracast/Restler/explorer/swagger-ui.min.js
@@ -1 +1 @@
-$(function(){$.fn.vAlign=function(){return this.each(function(c){var a=$(this).height();var d=$(this).parent().height();var b=(d-a)/2;$(this).css("margin-top",b)})};$.fn.stretchFormtasticInputWidthToParent=function(){return this.each(function(b){var d=$(this).closest("form").innerWidth();var c=parseInt($(this).closest("form").css("padding-left"),10)+parseInt($(this).closest("form").css("padding-right"),10);var a=parseInt($(this).css("padding-left"),10)+parseInt($(this).css("padding-right"),10);$(this).css("width",d-c-a)})};$("form.formtastic li.string input, form.formtastic textarea").stretchFormtasticInputWidthToParent();$("ul.downplayed li div.content p").vAlign();$("form.sandbox").submit(function(){var a=true;$(this).find("input.required").each(function(){$(this).removeClass("error");if($(this).val()==""){$(this).addClass("error");$(this).wiggle();a=false}});return a})});function clippyCopiedCallback(b){$("#api_key_copied").fadeIn().delay(1000).fadeOut()}log=function(){log.history=log.history||[];log.history.push(arguments);if(this.console){console.log(Array.prototype.slice.call(arguments))}};if(Function.prototype.bind&&console&&typeof console.log=="object"){["log","info","warn","error","assert","dir","clear","profile","profileEnd"].forEach(function(a){console[a]=this.bind(console[a],console)},Function.prototype.call)}var Docs={shebang:function(){var b=$.param.fragment().split("/");b.shift();switch(b.length){case 1:log("shebang resource:"+b[0]);var d="resource_"+b[0];Docs.expandEndpointListForResource(b[0]);$("#"+d).slideto({highlight:false});break;case 2:log("shebang endpoint: "+b.join("_"));Docs.expandEndpointListForResource(b[0]);$("#"+d).slideto({highlight:false});var c=b.join("_");var a=c+"_content";log("li_dom_id "+c);log("li_content_dom_id "+a);Docs.expandOperation($("#"+a));$("#"+c).slideto({highlight:false});break}},toggleEndpointListForResource:function(b){var a=$("li#resource_"+Docs.escapeResourceName(b)+" ul.endpoints");if(a.is(":visible")){Docs.collapseEndpointListForResource(b)}else{Docs.expandEndpointListForResource(b)}},expandEndpointListForResource:function(b){var b=Docs.escapeResourceName(b);if(b==""){$(".resource ul.endpoints").slideDown();return}$("li#resource_"+b).addClass("active");var a=$("li#resource_"+b+" ul.endpoints");a.slideDown()},collapseEndpointListForResource:function(b){var b=Docs.escapeResourceName(b);$("li#resource_"+b).removeClass("active");var a=$("li#resource_"+b+" ul.endpoints");a.slideUp()},expandOperationsForResource:function(a){Docs.expandEndpointListForResource(a);if(a==""){$(".resource ul.endpoints li.operation div.content").slideDown();return}$("li#resource_"+Docs.escapeResourceName(a)+" li.operation div.content").each(function(){Docs.expandOperation($(this))})},collapseOperationsForResource:function(a){Docs.expandEndpointListForResource(a);$("li#resource_"+Docs.escapeResourceName(a)+" li.operation div.content").each(function(){Docs.collapseOperation($(this))})},escapeResourceName:function(a){return a.replace(/[!"#$%&'()*+,.\/:;<=>?@\[\\\]\^`{|}~]/g,"\\$&")},expandOperation:function(a){a.slideDown()},collapseOperation:function(a){a.slideUp()}};(function(){var b=Handlebars.template,a=Handlebars.templates=Handlebars.templates||{};a.content_type=b(function(g,l,f,k,j){this.compilerInfo=[4,">= 1.0.0"];f=this.merge(f,g.helpers);j=j||{};var i="",c,h="function",m=this;function e(r,q){var o="",p;o+="\n  ";p=f.each.call(r,r.produces,{hash:{},inverse:m.noop,fn:m.program(2,d,q),data:q});if(p||p===0){o+=p}o+="\n";return o}function d(r,q){var o="",p;o+='\n	<option value="';p=(typeof r===h?r.apply(r):r);if(p||p===0){o+=p}o+='">';p=(typeof r===h?r.apply(r):r);if(p||p===0){o+=p}o+="</option>\n	";return o}function n(p,o){return'\n  <option value="application/json">application/json</option>\n'}i+='<label for="contentType"></label>\n<select name="contentType">\n';c=f["if"].call(l,l.produces,{hash:{},inverse:m.program(4,n,j),fn:m.program(1,e,j),data:j});if(c||c===0){i+=c}i+="\n</select>\n";return i})})();(function(){var b=Handlebars.template,a=Handlebars.templates=Handlebars.templates||{};a.main=b(function(g,m,f,l,k){this.compilerInfo=[4,">= 1.0.0"];f=this.merge(f,g.helpers);k=k||{};var i="",c,h="function",j=this.escapeExpression,p=this;function e(v,u){var r="",t,s;r+="\n                ";s=f["if"].call(v,((t=v.info),t==null||t===false?t:t.termsOfServiceUrl),{hash:{},inverse:p.noop,fn:p.program(2,d,u),data:u});if(s||s===0){r+=s}r+="\n                ";s=f["if"].call(v,((t=v.info),t==null||t===false?t:t.contact),{hash:{},inverse:p.noop,fn:p.program(4,q,u),data:u});if(s||s===0){r+=s}r+="\n                ";s=f["if"].call(v,((t=v.info),t==null||t===false?t:t.license),{hash:{},inverse:p.noop,fn:p.program(6,o,u),data:u});if(s||s===0){r+=s}r+="\n            ";return r}function d(u,t){var r="",s;r+='<li><a href="'+j(((s=((s=u.info),s==null||s===false?s:s.termsOfServiceUrl)),typeof s===h?s.apply(u):s))+'" title="Terms of Service"><i class="fa fa-lg fa-bullhorn"></i> Terms</a></li>';return r}function q(u,t){var r="",s;r+='<li><a href="mailto:'+j(((s=((s=u.info),s==null||s===false?s:s.contact)),typeof s===h?s.apply(u):s))+'"><i class="fa fa-lg fa-send"></i> Contact</a></li>';return r}function o(u,t){var r="",s;r+='<li><a href="'+j(((s=((s=u.info),s==null||s===false?s:s.licenseUrl)),typeof s===h?s.apply(u):s))+'" title="'+j(((s=((s=u.info),s==null||s===false?s:s.license)),typeof s===h?s.apply(u):s))+'"><i class="fa fa-lg fa-certificate"></i> License</a></li>';return r}function n(u,t){var r="",s;r+=" v";if(s=f.apiVersion){s=s.call(u,{hash:{},data:t})}else{s=u.apiVersion;s=typeof s===h?s.apply(u):s}r+=j(s);return r}i+="<div class='info' id='api_info'>\n</div>\n<div class='container' id='resources_container'>\n    <ul id='resources'>\n    </ul>\n\n    <div class=\"footer\">\n        <ul id=\"footer-nav\">\n            ";c=f["if"].call(m,m.info,{hash:{},inverse:p.noop,fn:p.program(1,e,k),data:k});if(c||c===0){i+=c}i+="\n            <li>\n                ";if(c=f.basePath){c=c.call(m,{hash:{},data:k})}else{c=m.basePath;c=typeof c===h?c.apply(m):c}i+=j(c);c=f["if"].call(m,m.apiVersion,{hash:{},inverse:p.noop,fn:p.program(8,n,k),data:k});if(c||c===0){i+=c}i+=" Powered by Restler & Swagger\n            </li>\n        </ul>\n    </div>\n</div>\n";return i})})();(function(){var b=Handlebars.template,a=Handlebars.templates=Handlebars.templates||{};a.operation=b(function(g,s,q,m,y){this.compilerInfo=[4,">= 1.0.0"];q=this.merge(q,g.helpers);y=y||{};var r="",i,f,e="function",d=this.escapeExpression,p=this,c=q.blockHelperMissing;function o(C,B){var z="",A;z+="\n        <h4>Implementation Notes</h4>\n        <p>";if(A=q.notes){A=A.call(C,{hash:{},data:B})}else{A=C.notes;A=typeof A===e?A.apply(C):A}if(A||A===0){z+=A}z+="</p>\n        ";return z}function n(A,z){return'\n        <div class="auth">\n        <span class="api-ic ic-error"></span>'}function l(C,B){var z="",A;z+='\n          <div id="api_information_panel" style="top: 526px; left: 776px; display: none;">\n          ';A=q.each.call(C,C,{hash:{},inverse:p.noop,fn:p.program(6,k,B),data:B});if(A||A===0){z+=A}z+="\n          </div>\n        ";return z}function k(D,C){var z="",B,A;z+="\n            <div title='";A=((B=D.description),typeof B===e?B.apply(D):B);if(A||A===0){z+=A}z+="'>"+d(((B=D.scope),typeof B===e?B.apply(D):B))+"</div>\n          ";return z}function h(A,z){return"</div>"}function x(A,z){return'\n        <div class=\'access\'>\n          <span class="api-ic ic-off" title="click to authenticate"></span>\n        </div>\n        '}function w(A,z){return'\n          <h4>Response Class</h4>\n          <p><span class="model-signature" /></p>\n          <br/>\n          <div class="response-content-type" />\n        '}function v(A,z){return'\n          <h4>Parameters</h4>\n          <table class=\'fullwidth\'>\n          <thead>\n            <tr>\n            <th style="width: 100px; max-width: 100px">Parameter</th>\n            <th style="width: 310px; max-width: 310px">Value</th>\n            <th style="width: 200px; max-width: 200px">Description</th>\n            <th style="width: 100px; max-width: 100px">Parameter Type</th>\n            <th style="width: 220px; max-width: 230px">Data Type</th>\n            </tr>\n          </thead>\n          <tbody class="operation-params">\n\n          </tbody>\n          </table>\n          '}function u(A,z){return"\n          <div style='margin:0;padding:0;display:inline'></div>\n          <h4>Response Messages</h4>\n          <table class='fullwidth'>\n            <thead>\n            <tr>\n              <th>HTTP Status Code</th>\n              <th>Reason</th>\n              <th>Response Model</th>\n            </tr>\n            </thead>\n            <tbody class=\"operation-status\">\n            \n            </tbody>\n          </table>\n          "}function t(A,z){return"\n          "}function j(A,z){return"\n          <div class='sandbox_header'>\n            <input class='submit' name='commit' type='button' value='Try it out!' />\n            <a href='#' class='response_hider' style='display:none'>Hide Response</a>\n            <img alt='Throbber' class='response_throbber' src='images/throbber.gif' style='display:none' />\n          </div>\n          "}r+="\n  <ul class='operations' >\n    <li class='";if(i=q.method){i=i.call(s,{hash:{},data:y})}else{i=s.method;i=typeof i===e?i.apply(s):i}r+=d(i)+" operation' id='";if(i=q.parentId){i=i.call(s,{hash:{},data:y})}else{i=s.parentId;i=typeof i===e?i.apply(s):i}r+=d(i)+"_";if(i=q.nickname){i=i.call(s,{hash:{},data:y})}else{i=s.nickname;i=typeof i===e?i.apply(s):i}r+=d(i)+"'>\n      <div class='heading'>\n        <h3>\n          <span class='http_method'>\n          <a href='#!/";if(i=q.parentId){i=i.call(s,{hash:{},data:y})}else{i=s.parentId;i=typeof i===e?i.apply(s):i}r+=d(i)+"/";if(i=q.nickname){i=i.call(s,{hash:{},data:y})}else{i=s.nickname;i=typeof i===e?i.apply(s):i}r+=d(i)+'\' class="toggleOperation">';if(i=q.method){i=i.call(s,{hash:{},data:y})}else{i=s.method;i=typeof i===e?i.apply(s):i}r+=d(i)+"</a>\n          </span>\n          <span class='path'>\n          <a href='#!/";if(i=q.parentId){i=i.call(s,{hash:{},data:y})}else{i=s.parentId;i=typeof i===e?i.apply(s):i}r+=d(i)+"/";if(i=q.nickname){i=i.call(s,{hash:{},data:y})}else{i=s.nickname;i=typeof i===e?i.apply(s):i}r+=d(i)+'\' class="toggleOperation">';if(i=q.path){i=i.call(s,{hash:{},data:y})}else{i=s.path;i=typeof i===e?i.apply(s):i}r+=d(i)+"</a>\n          </span>\n        </h3>\n        <ul class='options'>\n          <li>\n          <a href='#!/";if(i=q.parentId){i=i.call(s,{hash:{},data:y})}else{i=s.parentId;i=typeof i===e?i.apply(s):i}r+=d(i)+"/";if(i=q.nickname){i=i.call(s,{hash:{},data:y})}else{i=s.nickname;i=typeof i===e?i.apply(s):i}r+=d(i)+'\' class="toggleOperation">';if(i=q.summary){i=i.call(s,{hash:{},data:y})}else{i=s.summary;i=typeof i===e?i.apply(s):i}if(i||i===0){r+=i}r+="</a>\n          </li>\n        </ul>\n      </div>\n      <div class='content' id='";if(i=q.parentId){i=i.call(s,{hash:{},data:y})}else{i=s.parentId;i=typeof i===e?i.apply(s):i}r+=d(i)+"_";if(i=q.nickname){i=i.call(s,{hash:{},data:y})}else{i=s.nickname;i=typeof i===e?i.apply(s):i}r+=d(i)+"_content' style='display:none'>\n        ";i=q["if"].call(s,s.notes,{hash:{},inverse:p.noop,fn:p.program(1,o,y),data:y});if(i||i===0){r+=i}r+="\n        ";f={hash:{},inverse:p.noop,fn:p.program(3,n,y),data:y};if(i=q.oauth){i=i.call(s,f)}else{i=s.oauth;i=typeof i===e?i.apply(s):i}if(!q.oauth){i=c.call(s,i,f)}if(i||i===0){r+=i}r+="\n        ";i=q.each.call(s,s.oauth,{hash:{},inverse:p.noop,fn:p.program(5,l,y),data:y});if(i||i===0){r+=i}r+="\n        ";f={hash:{},inverse:p.noop,fn:p.program(8,h,y),data:y};if(i=q.oauth){i=i.call(s,f)}else{i=s.oauth;i=typeof i===e?i.apply(s):i}if(!q.oauth){i=c.call(s,i,f)}if(i||i===0){r+=i}r+="\n        ";f={hash:{},inverse:p.noop,fn:p.program(10,x,y),data:y};if(i=q.oauth){i=i.call(s,f)}else{i=s.oauth;i=typeof i===e?i.apply(s):i}if(!q.oauth){i=c.call(s,i,f)}if(i||i===0){r+=i}r+="\n        ";i=q["if"].call(s,s.type,{hash:{},inverse:p.noop,fn:p.program(12,w,y),data:y});if(i||i===0){r+=i}r+="\n        <form accept-charset='UTF-8' class='sandbox'>\n          <div style='margin:0;padding:0;display:inline'></div>\n          ";i=q["if"].call(s,s.parameters,{hash:{},inverse:p.noop,fn:p.program(14,v,y),data:y});if(i||i===0){r+=i}r+="\n          ";i=q["if"].call(s,s.responseMessages,{hash:{},inverse:p.noop,fn:p.program(16,u,y),data:y});if(i||i===0){r+=i}r+="\n          ";i=q["if"].call(s,s.isReadOnly,{hash:{},inverse:p.program(20,j,y),fn:p.program(18,t,y),data:y});if(i||i===0){r+=i}r+="\n        </form>\n        <div class='response' style='display:none'>\n          <h4>Request URL</h4>\n          <div class='block request_url'></div>\n          <h4>Response Body</h4>\n          <div class='block response_body'></div>\n          <h4>Response Code</h4>\n          <div class='block response_code'></div>\n          <h4>Response Headers</h4>\n          <div class='block response_headers'></div>\n        </div>\n      </div>\n    </li>\n  </ul>\n";return r})})();(function(){var b=Handlebars.template,a=Handlebars.templates=Handlebars.templates||{};a.param=b(function(f,q,o,j,s){this.compilerInfo=[4,">= 1.0.0"];o=this.merge(o,f.helpers);s=s||{};var p="",g,d="function",c=this.escapeExpression,n=this;function m(x,w){var u="",v;u+="\n		";v=o["if"].call(x,x.isFile,{hash:{},inverse:n.program(4,k,w),fn:n.program(2,l,w),data:w});if(v||v===0){u+=v}u+="\n	";return u}function l(x,w){var u="",v;u+='\n			<input type="file" name=\'';if(v=o.name){v=v.call(x,{hash:{},data:w})}else{v=x.name;v=typeof v===d?v.apply(x):v}u+=c(v)+'\'/>\n			<div class="parameter-content-type" />\n		';return u}function k(x,w){var u="",v;u+="\n			";v=o["if"].call(x,x.defaultValue,{hash:{},inverse:n.program(7,h,w),fn:n.program(5,i,w),data:w});if(v||v===0){u+=v}u+="\n		";return u}function i(x,w){var u="",v;u+="\n				<textarea class='body-textarea' name='";if(v=o.name){v=v.call(x,{hash:{},data:w})}else{v=x.name;v=typeof v===d?v.apply(x):v}u+=c(v)+"'>";if(v=o.defaultValue){v=v.call(x,{hash:{},data:w})}else{v=x.defaultValue;v=typeof v===d?v.apply(x):v}u+=c(v)+"</textarea>\n			";return u}function h(x,w){var u="",v;u+="\n				<textarea class='body-textarea' name='";if(v=o.name){v=v.call(x,{hash:{},data:w})}else{v=x.name;v=typeof v===d?v.apply(x):v}u+=c(v)+'\'></textarea>\n				<br />\n				<div class="parameter-content-type" />\n			';return u}function e(x,w){var u="",v;u+="\n		";v=o["if"].call(x,x.defaultValue,{hash:{},inverse:n.program(12,r,w),fn:n.program(10,t,w),data:w});if(v||v===0){u+=v}u+="\n	";return u}function t(x,w){var u="",v;u+="\n			<input class='parameter' minlength='0' name='";if(v=o.name){v=v.call(x,{hash:{},data:w})}else{v=x.name;v=typeof v===d?v.apply(x):v}u+=c(v)+"' placeholder='' type='text' value='";if(v=o.defaultValue){v=v.call(x,{hash:{},data:w})}else{v=x.defaultValue;v=typeof v===d?v.apply(x):v}u+=c(v)+"'/>\n		";return u}function r(x,w){var u="",v;u+="\n			<input class='parameter' minlength='0' name='";if(v=o.name){v=v.call(x,{hash:{},data:w})}else{v=x.name;v=typeof v===d?v.apply(x):v}u+=c(v)+"' placeholder='' type='text' value=''/>\n		";return u}p+="<td class='code'>";if(g=o.name){g=g.call(q,{hash:{},data:s})}else{g=q.name;g=typeof g===d?g.apply(q):g}p+=c(g)+"</td>\n<td>\n\n	";g=o["if"].call(q,q.isBody,{hash:{},inverse:n.program(9,e,s),fn:n.program(1,m,s),data:s});if(g||g===0){p+=g}p+="\n\n</td>\n<td>";if(g=o.description){g=g.call(q,{hash:{},data:s})}else{g=q.description;g=typeof g===d?g.apply(q):g}if(g||g===0){p+=g}p+="</td>\n<td>";if(g=o.paramType){g=g.call(q,{hash:{},data:s})}else{g=q.paramType;g=typeof g===d?g.apply(q):g}if(g||g===0){p+=g}p+='</td>\n<td>\n	<span class="model-signature"></span>\n</td>\n';return p})})();(function(){var b=Handlebars.template,a=Handlebars.templates=Handlebars.templates||{};a.param_list=b(function(h,t,r,m,y){this.compilerInfo=[4,">= 1.0.0"];r=this.merge(r,h.helpers);y=y||{};var s="",j,g,e,p=this,q=r.helperMissing,d="function",c=this.escapeExpression;function o(A,z){return" multiple='multiple'"}function n(A,z){return"\n    "}function l(C,B){var z="",A;z+="\n      ";A=r["if"].call(C,C.defaultValue,{hash:{},inverse:p.program(8,i,B),fn:p.program(6,k,B),data:B});if(A||A===0){z+=A}z+="\n    ";return z}function k(A,z){return"\n      "}function i(E,D){var z="",C,B,A;z+="\n        ";A={hash:{},inverse:p.program(11,x,D),fn:p.program(9,f,D),data:D};B=((C=r.isArray||E.isArray),C?C.call(E,E,A):q.call(E,"isArray",E,A));if(B||B===0){z+=B}z+="\n      ";return z}function f(A,z){return"\n        "}function x(A,z){return"\n          <option selected=\"\" value=''></option>\n        "}function w(C,B){var z="",A;z+="\n      ";A=r["if"].call(C,C.isDefault,{hash:{},inverse:p.program(16,u,B),fn:p.program(14,v,B),data:B});if(A||A===0){z+=A}z+="\n    ";return z}function v(C,B){var z="",A;z+='\n        <option selected="" value=\'';if(A=r.value){A=A.call(C,{hash:{},data:B})}else{A=C.value;A=typeof A===d?A.apply(C):A}z+=c(A)+"'>";if(A=r.value){A=A.call(C,{hash:{},data:B})}else{A=C.value;A=typeof A===d?A.apply(C):A}z+=c(A)+" (default)</option>\n      ";return z}function u(C,B){var z="",A;z+="\n        <option value='";if(A=r.value){A=A.call(C,{hash:{},data:B})}else{A=C.value;A=typeof A===d?A.apply(C):A}z+=c(A)+"'>";if(A=r.value){A=A.call(C,{hash:{},data:B})}else{A=C.value;A=typeof A===d?A.apply(C):A}z+=c(A)+"</option>\n      ";return z}s+="<td class='code'>";if(j=r.name){j=j.call(t,{hash:{},data:y})}else{j=t.name;j=typeof j===d?j.apply(t):j}s+=c(j)+"</td>\n<td>\n  <select ";e={hash:{},inverse:p.noop,fn:p.program(1,o,y),data:y};g=((j=r.isArray||t.isArray),j?j.call(t,t,e):q.call(t,"isArray",t,e));if(g||g===0){s+=g}s+=" class='parameter' name='";if(g=r.name){g=g.call(t,{hash:{},data:y})}else{g=t.name;g=typeof g===d?g.apply(t):g}s+=c(g)+"'>\n    ";g=r["if"].call(t,t.required,{hash:{},inverse:p.program(5,l,y),fn:p.program(3,n,y),data:y});if(g||g===0){s+=g}s+="\n    ";g=r.each.call(t,((j=t.allowableValues),j==null||j===false?j:j.descriptiveValues),{hash:{},inverse:p.noop,fn:p.program(13,w,y),data:y});if(g||g===0){s+=g}s+="\n  </select>\n</td>\n<td>";if(g=r.description){g=g.call(t,{hash:{},data:y})}else{g=t.description;g=typeof g===d?g.apply(t):g}if(g||g===0){s+=g}s+="</td>\n<td>";if(g=r.paramType){g=g.call(t,{hash:{},data:y})}else{g=t.paramType;g=typeof g===d?g.apply(t):g}if(g||g===0){s+=g}s+='</td>\n<td><span class="model-signature"></span></td>';return s})})();(function(){var b=Handlebars.template,a=Handlebars.templates=Handlebars.templates||{};a.param_readonly=b(function(g,m,f,l,k){this.compilerInfo=[4,">= 1.0.0"];f=this.merge(f,g.helpers);k=k||{};var i="",d,h="function",j=this.escapeExpression,o=this;function e(t,s){var q="",r;q+="\n        <textarea class='body-textarea' readonly='readonly' name='";if(r=f.name){r=r.call(t,{hash:{},data:s})}else{r=t.name;r=typeof r===h?r.apply(t):r}q+=j(r)+"'>";if(r=f.defaultValue){r=r.call(t,{hash:{},data:s})}else{r=t.defaultValue;r=typeof r===h?r.apply(t):r}q+=j(r)+"</textarea>\n    ";return q}function c(t,s){var q="",r;q+="\n        ";r=f["if"].call(t,t.defaultValue,{hash:{},inverse:o.program(6,n,s),fn:o.program(4,p,s),data:s});if(r||r===0){q+=r}q+="\n    ";return q}function p(t,s){var q="",r;q+="\n            ";if(r=f.defaultValue){r=r.call(t,{hash:{},data:s})}else{r=t.defaultValue;r=typeof r===h?r.apply(t):r}q+=j(r)+"\n        ";return q}function n(r,q){return"\n            (empty)\n        "}i+="<td class='code'>";if(d=f.name){d=d.call(m,{hash:{},data:k})}else{d=m.name;d=typeof d===h?d.apply(m):d}i+=j(d)+"</td>\n<td>\n    ";d=f["if"].call(m,m.isBody,{hash:{},inverse:o.program(3,c,k),fn:o.program(1,e,k),data:k});if(d||d===0){i+=d}i+="\n</td>\n<td>";if(d=f.description){d=d.call(m,{hash:{},data:k})}else{d=m.description;d=typeof d===h?d.apply(m):d}if(d||d===0){i+=d}i+="</td>\n<td>";if(d=f.paramType){d=d.call(m,{hash:{},data:k})}else{d=m.paramType;d=typeof d===h?d.apply(m):d}if(d||d===0){i+=d}i+='</td>\n<td><span class="model-signature"></span></td>\n';return i})})();(function(){var b=Handlebars.template,a=Handlebars.templates=Handlebars.templates||{};a.param_readonly_required=b(function(g,m,f,l,k){this.compilerInfo=[4,">= 1.0.0"];f=this.merge(f,g.helpers);k=k||{};var i="",d,h="function",j=this.escapeExpression,o=this;function e(t,s){var q="",r;q+="\n        <textarea class='body-textarea'  readonly='readonly' placeholder='(required)' name='";if(r=f.name){r=r.call(t,{hash:{},data:s})}else{r=t.name;r=typeof r===h?r.apply(t):r}q+=j(r)+"'>";if(r=f.defaultValue){r=r.call(t,{hash:{},data:s})}else{r=t.defaultValue;r=typeof r===h?r.apply(t):r}q+=j(r)+"</textarea>\n    ";return q}function c(t,s){var q="",r;q+="\n        ";r=f["if"].call(t,t.defaultValue,{hash:{},inverse:o.program(6,n,s),fn:o.program(4,p,s),data:s});if(r||r===0){q+=r}q+="\n    ";return q}function p(t,s){var q="",r;q+="\n            ";if(r=f.defaultValue){r=r.call(t,{hash:{},data:s})}else{r=t.defaultValue;r=typeof r===h?r.apply(t):r}q+=j(r)+"\n        ";return q}function n(r,q){return"\n            (empty)\n        "}i+="<td class='code required'>";if(d=f.name){d=d.call(m,{hash:{},data:k})}else{d=m.name;d=typeof d===h?d.apply(m):d}i+=j(d)+"</td>\n<td>\n    ";d=f["if"].call(m,m.isBody,{hash:{},inverse:o.program(3,c,k),fn:o.program(1,e,k),data:k});if(d||d===0){i+=d}i+="\n</td>\n<td>";if(d=f.description){d=d.call(m,{hash:{},data:k})}else{d=m.description;d=typeof d===h?d.apply(m):d}if(d||d===0){i+=d}i+="</td>\n<td>";if(d=f.paramType){d=d.call(m,{hash:{},data:k})}else{d=m.paramType;d=typeof d===h?d.apply(m):d}if(d||d===0){i+=d}i+='</td>\n<td><span class="model-signature"></span></td>\n';return i})})();(function(){var b=Handlebars.template,a=Handlebars.templates=Handlebars.templates||{};a.param_required=b(function(f,q,o,j,u){this.compilerInfo=[4,">= 1.0.0"];o=this.merge(o,f.helpers);u=u||{};var p="",g,d="function",c=this.escapeExpression,n=this;function m(z,y){var w="",x;w+="\n		";x=o["if"].call(z,z.isFile,{hash:{},inverse:n.program(4,k,y),fn:n.program(2,l,y),data:y});if(x||x===0){w+=x}w+="\n	";return w}function l(z,y){var w="",x;w+='\n			<input type="file" name=\'';if(x=o.name){x=x.call(z,{hash:{},data:y})}else{x=z.name;x=typeof x===d?x.apply(z):x}w+=c(x)+"'/>\n		";return w}function k(z,y){var w="",x;w+="\n			";x=o["if"].call(z,z.defaultValue,{hash:{},inverse:n.program(7,h,y),fn:n.program(5,i,y),data:y});if(x||x===0){w+=x}w+="\n		";return w}function i(z,y){var w="",x;w+="\n				<textarea class='body-textarea' placeholder='(required)' name='";if(x=o.name){x=x.call(z,{hash:{},data:y})}else{x=z.name;x=typeof x===d?x.apply(z):x}w+=c(x)+"'>";if(x=o.defaultValue){x=x.call(z,{hash:{},data:y})}else{x=z.defaultValue;x=typeof x===d?x.apply(z):x}w+=c(x)+"</textarea>\n			";return w}function h(z,y){var w="",x;w+="\n				<textarea class='body-textarea' placeholder='(required)' name='";if(x=o.name){x=x.call(z,{hash:{},data:y})}else{x=z.name;x=typeof x===d?x.apply(z):x}w+=c(x)+'\'></textarea>\n				<br />\n				<div class="parameter-content-type" />\n			';return w}function e(z,y){var w="",x;w+="\n		";x=o["if"].call(z,z.isFile,{hash:{},inverse:n.program(12,t,y),fn:n.program(10,v,y),data:y});if(x||x===0){w+=x}w+="\n	";return w}function v(z,y){var w="",x;w+="\n			<input class='parameter' class='required' type='file' name='";if(x=o.name){x=x.call(z,{hash:{},data:y})}else{x=z.name;x=typeof x===d?x.apply(z):x}w+=c(x)+"'/>\n		";return w}function t(z,y){var w="",x;w+="\n			";x=o["if"].call(z,z.defaultValue,{hash:{},inverse:n.program(15,r,y),fn:n.program(13,s,y),data:y});if(x||x===0){w+=x}w+="\n		";return w}function s(z,y){var w="",x;w+="\n				<input class='parameter required' minlength='1' name='";if(x=o.name){x=x.call(z,{hash:{},data:y})}else{x=z.name;x=typeof x===d?x.apply(z):x}w+=c(x)+"' placeholder='(required)' type='text' value='";if(x=o.defaultValue){x=x.call(z,{hash:{},data:y})}else{x=z.defaultValue;x=typeof x===d?x.apply(z):x}w+=c(x)+"'/>\n			";return w}function r(z,y){var w="",x;w+="\n				<input class='parameter required' minlength='1' name='";if(x=o.name){x=x.call(z,{hash:{},data:y})}else{x=z.name;x=typeof x===d?x.apply(z):x}w+=c(x)+"' placeholder='(required)' type='text' value=''/>\n			";return w}p+="<td class='code required'>";if(g=o.name){g=g.call(q,{hash:{},data:u})}else{g=q.name;g=typeof g===d?g.apply(q):g}p+=c(g)+"</td>\n<td>\n	";g=o["if"].call(q,q.isBody,{hash:{},inverse:n.program(9,e,u),fn:n.program(1,m,u),data:u});if(g||g===0){p+=g}p+="\n</td>\n<td>\n	<strong>";if(g=o.description){g=g.call(q,{hash:{},data:u})}else{g=q.description;g=typeof g===d?g.apply(q):g}if(g||g===0){p+=g}p+="</strong>\n</td>\n<td>";if(g=o.paramType){g=g.call(q,{hash:{},data:u})}else{g=q.paramType;g=typeof g===d?g.apply(q):g}if(g||g===0){p+=g}p+='</td>\n<td><span class="model-signature"></span></td>\n';return p})})();(function(){var b=Handlebars.template,a=Handlebars.templates=Handlebars.templates||{};a.parameter_content_type=b(function(g,l,f,k,j){this.compilerInfo=[4,">= 1.0.0"];f=this.merge(f,g.helpers);j=j||{};var i="",c,h="function",m=this;function e(r,q){var o="",p;o+="\n  ";p=f.each.call(r,r.consumes,{hash:{},inverse:m.noop,fn:m.program(2,d,q),data:q});if(p||p===0){o+=p}o+="\n";return o}function d(r,q){var o="",p;o+='\n  <option value="';p=(typeof r===h?r.apply(r):r);if(p||p===0){o+=p}o+='">';p=(typeof r===h?r.apply(r):r);if(p||p===0){o+=p}o+="</option>\n  ";return o}function n(p,o){return'\n  <option value="application/json">application/json</option>\n'}i+='<label for="parameterContentType"></label>\n<select name="parameterContentType">\n';c=f["if"].call(l,l.consumes,{hash:{},inverse:m.program(4,n,j),fn:m.program(1,e,j),data:j});if(c||c===0){i+=c}i+="\n</select>\n";return i})})();(function(){var b=Handlebars.template,a=Handlebars.templates=Handlebars.templates||{};a.resource=b(function(f,l,e,k,j){this.compilerInfo=[4,">= 1.0.0"];e=this.merge(e,f.helpers);j=j||{};var h="",c,o,g="function",i=this.escapeExpression,n=this,m=e.blockHelperMissing;function d(s,r){var p="",q;p+=" : ";if(q=e.description){q=q.call(s,{hash:{},data:r})}else{q=s.description;q=typeof q===g?q.apply(s):q}if(q||q===0){p+=q}return p}h+="<div class='heading'>\n  <h2>\n    <a href='#!/";if(c=e.id){c=c.call(l,{hash:{},data:j})}else{c=l.id;c=typeof c===g?c.apply(l):c}h+=i(c)+"' onclick=\"Docs.toggleEndpointListForResource('";if(c=e.id){c=c.call(l,{hash:{},data:j})}else{c=l.id;c=typeof c===g?c.apply(l):c}h+=i(c)+"');\">";if(c=e.name){c=c.call(l,{hash:{},data:j})}else{c=l.name;c=typeof c===g?c.apply(l):c}h+=i(c)+"</a> ";o={hash:{},inverse:n.noop,fn:n.program(1,d,j),data:j};if(c=e.description){c=c.call(l,o)}else{c=l.description;c=typeof c===g?c.apply(l):c}if(!e.description){c=m.call(l,c,o)}if(c||c===0){h+=c}h+="\n  </h2>\n  <ul class='options'>\n    <li>\n      <a href='#!/";if(c=e.id){c=c.call(l,{hash:{},data:j})}else{c=l.id;c=typeof c===g?c.apply(l):c}h+=i(c)+"' id='endpointListTogger_";if(c=e.id){c=c.call(l,{hash:{},data:j})}else{c=l.id;c=typeof c===g?c.apply(l):c}h+=i(c)+"'\n         onclick=\"Docs.toggleEndpointListForResource('";if(c=e.id){c=c.call(l,{hash:{},data:j})}else{c=l.id;c=typeof c===g?c.apply(l):c}h+=i(c)+"');\">Show/Hide</a>\n    </li>\n    <li>\n      <a href='#' onclick=\"Docs.collapseOperationsForResource('";if(c=e.id){c=c.call(l,{hash:{},data:j})}else{c=l.id;c=typeof c===g?c.apply(l):c}h+=i(c)+"'); return false;\">\n        List Operations\n      </a>\n    </li>\n    <li>\n      <a href='#' onclick=\"Docs.expandOperationsForResource('";if(c=e.id){c=c.call(l,{hash:{},data:j})}else{c=l.id;c=typeof c===g?c.apply(l):c}h+=i(c)+"'); return false;\">\n        Expand Operations\n      </a>\n    </li>\n    <li>\n      <a href='";if(c=e.url){c=c.call(l,{hash:{},data:j})}else{c=l.url;c=typeof c===g?c.apply(l):c}h+=i(c)+"'>Raw</a>\n    </li>\n  </ul>\n</div>\n<ul class='endpoints' id='";if(c=e.id){c=c.call(l,{hash:{},data:j})}else{c=l.id;c=typeof c===g?c.apply(l):c}h+=i(c)+"_endpoint_list' style='display:none'>\n\n</ul>\n";return h})})();(function(){var b=Handlebars.template,a=Handlebars.templates=Handlebars.templates||{};a.response_content_type=b(function(g,l,f,k,j){this.compilerInfo=[4,">= 1.0.0"];f=this.merge(f,g.helpers);j=j||{};var i="",c,h="function",m=this;function e(r,q){var o="",p;o+="\n  ";p=f.each.call(r,r.produces,{hash:{},inverse:m.noop,fn:m.program(2,d,q),data:q});if(p||p===0){o+=p}o+="\n";return o}function d(r,q){var o="",p;o+='\n  <option value="';p=(typeof r===h?r.apply(r):r);if(p||p===0){o+=p}o+='">';p=(typeof r===h?r.apply(r):r);if(p||p===0){o+=p}o+="</option>\n  ";return o}function n(p,o){return'\n  <option value="application/json">application/json</option>\n'}i+='<label for="responseContentType"></label>\n<select name="responseContentType">\n';c=f["if"].call(l,l.produces,{hash:{},inverse:m.program(4,n,j),fn:m.program(1,e,j),data:j});if(c||c===0){i+=c}i+="\n</select>\n";return i})})();(function(){var b=Handlebars.template,a=Handlebars.templates=Handlebars.templates||{};a.signature=b(function(e,k,d,j,i){this.compilerInfo=[4,">= 1.0.0"];d=this.merge(d,e.helpers);i=i||{};var g="",c,f="function",h=this.escapeExpression;g+='<div>\n<ul class="signature-nav">\n    <li><a class="description-link" href="#">Model</a></li>\n    <li><a class="snippet-link" href="#">Model Schema</a></li>\n</ul>\n<div>\n\n<div class="signature-container">\n    <div class="description">\n        ';if(c=d.signature){c=c.call(k,{hash:{},data:i})}else{c=k.signature;c=typeof c===f?c.apply(k):c}if(c||c===0){g+=c}g+='\n    </div>\n\n    <div class="snippet">\n        <pre><code>';if(c=d.sampleJSON){c=c.call(k,{hash:{},data:i})}else{c=k.sampleJSON;c=typeof c===f?c.apply(k):c}g+=h(c)+'</code></pre>\n        <small class="notice"></small>\n    </div>\n</div>\n\n';return g})})();(function(){var b=Handlebars.template,a=Handlebars.templates=Handlebars.templates||{};a.status_code=b(function(e,k,d,j,i){this.compilerInfo=[4,">= 1.0.0"];d=this.merge(d,e.helpers);i=i||{};var g="",c,f="function",h=this.escapeExpression;g+="<td width='15%' class='code'>";if(c=d.code){c=c.call(k,{hash:{},data:i})}else{c=k.code;c=typeof c===f?c.apply(k):c}g+=h(c)+"</td>\n<td>";if(c=d.message){c=c.call(k,{hash:{},data:i})}else{c=k.message;c=typeof c===f?c.apply(k):c}if(c||c===0){g+=c}g+="</td>\n<td width='50%'><span class=\"model-signature\" /></td>";return g})})();(function(){var g,c,i,d,m,f,k,a,l,j,b,h={}.hasOwnProperty,e=function(q,o){for(var n in o){if(h.call(o,n)){q[n]=o[n]}}function p(){this.constructor=q}p.prototype=o.prototype;q.prototype=new p();q.__super__=o.prototype;return q};b=(function(o){e(n,o);function n(){n.__super__.constructor.apply(this,arguments)}n.prototype.dom_id="swagger_ui";n.prototype.options=null;n.prototype.api=null;n.prototype.headerView=null;n.prototype.mainView=null;n.prototype.initialize=function(p){var q=this;if(p==null){p={}}if(p.dom_id!=null){this.dom_id=p.dom_id;delete p.dom_id}if($("#"+this.dom_id)==null){$("body").append('<div id="'+this.dom_id+'"></div>')}this.options=p;this.options.success=function(){return q.render()};this.options.progress=function(r){return q.showMessage(r)};this.options.failure=function(r){return q.onLoadFailure(r)};this.headerView=new c({el:$("#header")});return this.headerView.on("update-swagger-ui",function(r){return q.updateSwaggerUi(r)})};n.prototype.updateSwaggerUi=function(p){this.options.url=p.url;return this.load()};n.prototype.load=function(){var p,q;if((q=this.mainView)!=null){q.clear()}p=this.options.url;if(p.indexOf("http")!==0){p=this.buildUrl(window.location.href.toString(),p)}this.options.url=p;this.headerView.update(p);this.api=new SwaggerApi(this.options);this.api.build();return this.api};n.prototype.render=function(){var p=this;this.showMessage("Finished Loading Resource Information. Rendering Swagger UI...");this.headerView.updateInfo(this.api.info);this.mainView=new i({model:this.api,el:$("#"+this.dom_id)}).render();this.showMessage();switch(this.options.docExpansion){case"full":Docs.expandOperationsForResource("");break;case"list":Docs.collapseOperationsForResource("")}if(this.options.onComplete){this.options.onComplete(this.api,this)}return setTimeout(function(){return Docs.shebang()},400)};n.prototype.buildUrl=function(r,p){var q,s;log("base is "+r);if(p.indexOf("/")===0){s=r.split("/");r=s[0]+"//"+s[2];return r+p}else{q=r.length;if(r.indexOf("?")>-1){q=Math.min(q,r.indexOf("?"))}if(r.indexOf("#")>-1){q=Math.min(q,r.indexOf("#"))}r=r.substring(0,q);if(r.indexOf("/",r.length-1)!==-1){return r+p}return r+"/"+p}};n.prototype.showMessage=function(p){if(p==null){p=""}$("#message-bar").removeClass("message-fail");$("#message-bar").addClass("message-success");return $("#message-bar").html(p)};n.prototype.onLoadFailure=function(p){var q;if(p==null){p=""}$("#message-bar").removeClass("message-success");$("#message-bar").addClass("message-fail");q=$("#message-bar").html(p);if(this.options.onFailure!=null){this.options.onFailure(p)}return q};return n})(Backbone.Router);window.SwaggerUi=b;c=(function(o){e(n,o);function n(){n.__super__.constructor.apply(this,arguments)}n.prototype.events={"click #show-pet-store-icon":"showPetStore","click #show-wordnik-dev-icon":"showWordnikDev","click #explore":"showCustom","keyup #input_baseUrl":"showCustomOnKeyup","keyup #input_apiKey":"showCustomOnKeyup"};n.prototype.initialize=function(){};n.prototype.showPetStore=function(p){return this.trigger("update-swagger-ui",{url:"http://petstore.swagger.wordnik.com/api/api-docs"})};n.prototype.showWordnikDev=function(p){return this.trigger("update-swagger-ui",{url:"http://api.wordnik.com/v4/resources.json"})};n.prototype.showCustomOnKeyup=function(p){if(p.keyCode===13){return this.showCustom()}};n.prototype.showCustom=function(p){if(p!=null){p.preventDefault()}return this.trigger("update-swagger-ui",{url:$("#input_baseUrl").val(),apiKey:$("#input_apiKey").val()})};n.prototype.update=function(q,r,p){if(p==null){p=false}$("#input_baseUrl").val(q);if(p){return this.trigger("update-swagger-ui",{url:q})}};n.prototype.updateInfo=function(p){if(p.title!=null){$("#logo").text(p.title)}if(p.description!=null){$("#logo").attr("title",p.description)}if(p.termsOfServiceUrl!=null){return $("#logo").attr("href",p.termsOfServiceUrl)}};return n})(Backbone.View);i=(function(n){e(o,n);function o(){o.__super__.constructor.apply(this,arguments)}o.prototype.initialize=function(){};o.prototype.render=function(){var q,v,t,u,s,p,r;$(this.el).html(Handlebars.templates.main(this.model));u={};q=0;r=this.model.apisArray;for(s=0,p=r.length;s<p;s++){t=r[s];v=t.name;while(typeof u[v]!=="undefined"){v=v+"_"+q;q+=1}t.id=v;u[v]=t;this.addResource(t)}return this};o.prototype.addResource=function(q){var p;p=new k({model:q,tagName:"li",id:"resource_"+q.id,className:"resource"});return $("#resources").append(p.render().el)};o.prototype.clear=function(){return $(this.el).html("")};return o})(Backbone.View);k=(function(o){e(n,o);function n(){n.__super__.constructor.apply(this,arguments)}n.prototype.initialize=function(){};n.prototype.render=function(){var q,v,s,r,u,p,t;$(this.el).html(Handlebars.templates.resource(this.model));s={};t=this.model.operationsArray;for(u=0,p=t.length;u<p;u++){r=t[u];q=0;v=r.nickname;while(typeof s[v]!=="undefined"){v=v+"_"+q;q+=1}s[v]=r;r.nickname=v;r.parentId=this.model.id;this.addOperation(r)}return this};n.prototype.addOperation=function(p){var q;p.number=this.number;q=new d({model:p,tagName:"li",className:"endpoint"});$(".endpoints",$(this.el)).append(q.render().el);return this.number++};return n})(Backbone.View);d=(function(o){e(n,o);function n(){n.__super__.constructor.apply(this,arguments)}n.prototype.invocationUrl=null;n.prototype.events={"submit .sandbox":"submitOperation","click .submit":"submitOperation","click .response_hider":"hideResponse","click .toggleOperation":"toggleOperationContent","mouseenter .api-ic":"mouseEnter","mouseout .api-ic":"mouseExit"};n.prototype.initialize=function(){};n.prototype.mouseEnter=function(u){var s,t,z,q,p,A,v,r,B,w;s=$(u.currentTarget.parentNode).find("#api_information_panel");B=event.pageX;w=event.pageY;A=$(window).scrollLeft();v=$(window).scrollTop();q=A+$(window).width();p=v+$(window).height();r=s.width();t=s.height();if(B+r>q){B=q-r}if(B<A){B=A}if(w+t>p){w=p-t}if(w<v){w=v}z={};z.top=w;z.left=B;s.css(z);return $(u.currentTarget.parentNode).find("#api_information_panel").show()};n.prototype.mouseExit=function(p){return $(p.currentTarget.parentNode).find("#api_information_panel").hide()};n.prototype.render=function(){var H,I,G,F,y,E,z,D,A,x,C,t,r,q,p,K,M,L,J,B,w,u,s;I=true;if(!I){this.model.isReadOnly=true}this.model.oauth=null;if(this.model.authorizations){B=this.model.authorizations;for(G in B){C=B[G];if(G==="oauth2"){if(this.model.oauth===null){this.model.oauth={}}if(this.model.oauth.scopes===void 0){this.model.oauth.scopes=[]}for(t=0,K=C.length;t<K;t++){F=C[t];this.model.oauth.scopes.push(F)}}}}$(this.el).html(Handlebars.templates.operation(this.model));if(this.model.responseClassSignature&&this.model.responseClassSignature!=="string"){D={sampleJSON:this.model.responseSampleJSON,isParam:false,signature:this.model.responseClassSignature};z=new l({model:D,tagName:"div"});$(".model-signature",$(this.el)).append(z.render().el)}else{$(".model-signature",$(this.el)).html(this.model.type)}H={isParam:false};H.consumes=this.model.consumes;H.produces=this.model.produces;w=this.model.parameters;for(r=0,M=w.length;r<M;r++){y=w[r];x=y.type||y.dataType;if(x.toLowerCase()==="file"){if(!H.consumes){log("set content type ");H.consumes="multipart/form-data"}}}E=new a({model:H});$(".response-content-type",$(this.el)).append(E.render().el);u=this.model.parameters;for(q=0,L=u.length;q<L;q++){y=u[q];this.addParameter(y,H.consumes)}s=this.model.responseMessages;for(p=0,J=s.length;p<J;p++){A=s[p];this.addStatusCode(A)}return this};n.prototype.addParameter=function(r,p){var q;r.consumes=p;q=new f({model:r,tagName:"tr",readOnly:this.model.isReadOnly});return $(".operation-params",$(this.el)).append(q.render().el)};n.prototype.addStatusCode=function(q){var p;p=new j({model:q,tagName:"tr"});return $(".operation-status",$(this.el)).append(p.render().el)};n.prototype.submitOperation=function(D){var F,t,C,r,u,p,v,A,z,x,E,s,q,B,y,w;if(D!=null){D.preventDefault()}t=$(".sandbox",$(this.el));F=true;t.find("input.required").each(function(){var G=this;$(this).removeClass("error");if(jQuery.trim($(this).val())===""){$(this).addClass("error");$(this).wiggle({callback:function(){return $(G).focus()}});return F=false}});if(F){r={};p={parent:this};C=false;B=t.find("input");for(A=0,E=B.length;A<E;A++){u=B[A];if((u.value!=null)&&jQuery.trim(u.value).length>0){r[u.name]=u.value}if(u.type==="file"){C=true}}y=t.find("textarea");for(z=0,s=y.length;z<s;z++){u=y[z];if((u.value!=null)&&jQuery.trim(u.value).length>0){r.body=u.value}}w=t.find("select");for(x=0,q=w.length;x<q;x++){u=w[x];v=this.getSelectedValue(u);if((v!=null)&&jQuery.trim(v).length>0){r[u.name]=v}}p.responseContentType=$("div select[name=responseContentType]",$(this.el)).val();p.requestContentType=$("div select[name=parameterContentType]",$(this.el)).val();$(".response_throbber",$(this.el)).show();if(C){return this.handleFileUpload(r,t)}else{return this.model["do"](r,p,this.showCompleteStatus,this.showErrorStatus,this)}}};n.prototype.success=function(p,q){return q.showCompleteStatus(p)};n.prototype.handleFileUpload=function(H,u){var C,t,p,D,B,z,F,w,s,r,q,G,K,J,I,A,y,x,v,E=this;A=u.serializeArray();for(w=0,G=A.length;w<G;w++){D=A[w];if((D.value!=null)&&jQuery.trim(D.value).length>0){H[D.name]=D.value}}C=new FormData();F=0;y=this.model.parameters;for(s=0,K=y.length;s<K;s++){z=y[s];if(z.paramType==="form"){if(H[z.name]!==void 0){C.append(z.name,H[z.name])}}}p={};x=this.model.parameters;for(r=0,J=x.length;r<J;r++){z=x[r];if(z.paramType==="header"){p[z.name]=H[z.name]}}log(p);v=u.find('input[type~="file"]');for(q=0,I=v.length;q<I;q++){t=v[q];if(typeof t.files[0]!=="undefined"){C.append($(t).attr("name"),t.files[0]);F+=1}}log(C);this.invocationUrl=this.model.supportHeaderParams()?(p=this.model.getHeaderParams(H),this.model.urlify(H,false)):this.model.urlify(H,true);$(".request_url",$(this.el)).html("<pre>"+this.invocationUrl+"</pre>");B={type:this.model.method,url:this.invocationUrl,headers:p,data:C,dataType:"json",contentType:false,processData:false,error:function(M,N,L){return E.showErrorStatus(E.wrap(M),E)},success:function(L){return E.showResponse(L,E)},complete:function(L){return E.showCompleteStatus(E.wrap(L),E)}};if(window.authorizations){window.authorizations.apply(B)}if(F===0){B.data.append("fake","true")}jQuery.ajax(B);return false};n.prototype.wrap=function(t){var r,u,w,q,v,s,p;w={};u=t.getAllResponseHeaders().split("\r");for(s=0,p=u.length;s<p;s++){q=u[s];r=q.split(":");if(r[0]!==void 0&&r[1]!==void 0){w[r[0].trim()]=r[1].trim()}}v={};v.content={};v.content.data=t.responseText;v.headers=w;v.request={};v.request.url=this.invocationUrl;v.status=t.status;return v};n.prototype.getSelectedValue=function(p){var s,r,u,q,t;if(!p.multiple){return p.value}else{r=[];t=p.options;for(u=0,q=t.length;u<q;u++){s=t[u];if(s.selected){r.push(s.value)}}if(r.length>0){return r.join(",")}else{return null}}};n.prototype.hideResponse=function(p){if(p!=null){p.preventDefault()}$(".response",$(this.el)).slideUp();return $(".response_hider",$(this.el)).fadeOut()};n.prototype.showResponse=function(p){var q;q=JSON.stringify(p,null,"\t").replace(/\n/g,"<br>");return $(".response_body",$(this.el)).html(escape(q))};n.prototype.showErrorStatus=function(q,p){return p.showStatus(q)};n.prototype.showCompleteStatus=function(q,p){return p.showStatus(q)};n.prototype.formatXml=function(w){var s,v,q,x,C,y,r,p,A,B,u,t,z;p=/(>)(<)(\/*)/g;B=/[ ]*(.*)[ ]+\n/g;s=/(<.+>)(.+\n)/g;w=w.replace(p,"$1\n$2$3").replace(B,"$1\n").replace(s,"$1\n$2");r=0;v="";C=w.split("\n");q=0;x="other";A={"single->single":0,"single->closing":-1,"single->opening":0,"single->other":0,"closing->single":0,"closing->closing":-1,"closing->opening":0,"closing->other":0,"opening->single":1,"opening->closing":0,"opening->opening":1,"opening->other":1,"other->single":0,"other->closing":-1,"other->opening":0,"other->other":0};u=function(I){var E,D,G,K,H,F,J;F={single:Boolean(I.match(/<.+\/>/)),closing:Boolean(I.match(/<\/.+>/)),opening:Boolean(I.match(/<[^!?].*>/))};H=((function(){var L;L=[];for(G in F){J=F[G];if(J){L.push(G)}}return L})())[0];H=H===void 0?"other":H;E=x+"->"+H;x=H;K="";q+=A[E];K=((function(){var M,N,L;L=[];for(D=M=0,N=q;0<=N?M<N:M>N;D=0<=N?++M:--M){L.push("  ")}return L})()).join("");if(E==="opening->closing"){return v=v.substr(0,v.length-1)+I+"\n"}else{return v+=K+I+"\n"}};for(t=0,z=C.length;t<z;t++){y=C[t];u(y)}return v};n.prototype.showStatus=function(p){var t,s,w,v,u,r,q;if(p.content===void 0){s=p.data;q=p.url}else{s=p.content.data;q=p.request.url}v=p.headers;w=v&&v["Content-Type"]?v["Content-Type"].split(";")[0].trim():null;if(!s){t=$("<code />").text("no content");u=$('<pre class="json" />').append(t)}else{if(w==="application/json"||/\+json$/.test(w)){t=$("<code />").text(JSON.stringify(JSON.parse(s),null,"  "));u=$('<pre class="json" />').append(t)}else{if(w==="application/xml"||/\+xml$/.test(w)){t=$("<code />").text(this.formatXml(s));u=$('<pre class="xml" />').append(t)}else{if(w==="text/html"){t=$("<code />").html(s);u=$('<pre class="xml" />').append(t)}else{if(/^image\//.test(w)){u=$("<img>").attr("src",q)}else{t=$("<code />").text(s);u=$('<pre class="json" />').append(t)}}}}}r=u;$(".request_url",$(this.el)).html("<pre>"+q+"</pre>");$(".response_code",$(this.el)).html("<pre>"+p.status+"</pre>");$(".response_body",$(this.el)).html(r);$(".response_headers",$(this.el)).html("<pre>"+JSON.stringify(p.headers,null,"  ").replace(/\n/g,"<br>")+"</pre>");$(".response",$(this.el)).slideDown();$(".response_hider",$(this.el)).show();$(".response_throbber",$(this.el)).hide();return hljs.highlightBlock($(".response_body",$(this.el))[0])};n.prototype.toggleOperationContent=function(){var p;p=$("#"+Docs.escapeResourceName(this.model.parentId)+"_"+this.model.nickname+"_content");if(p.is(":visible")){return Docs.collapseOperation(p)}else{return Docs.expandOperation(p)}};return n})(Backbone.View);j=(function(o){e(n,o);function n(){n.__super__.constructor.apply(this,arguments)}n.prototype.initialize=function(){};n.prototype.render=function(){var q,p,r;r=this.template();$(this.el).html(r(this.model));if(swaggerUi.api.models.hasOwnProperty(this.model.responseModel)){q={sampleJSON:JSON.stringify(swaggerUi.api.models[this.model.responseModel].createJSONSample(),null,2),isParam:false,signature:swaggerUi.api.models[this.model.responseModel].getMockSignature()};p=new l({model:q,tagName:"div"});$(".model-signature",this.$el).append(p.render().el)}else{$(".model-signature",this.$el).html("")}return this};n.prototype.template=function(){return Handlebars.templates.status_code};return n})(Backbone.View);f=(function(o){e(n,o);function n(){n.__super__.constructor.apply(this,arguments)}n.prototype.initialize=function(){return Handlebars.registerHelper("isArray",function(q,p){if(q.type.toLowerCase()==="array"||q.allowMultiple){return p.fn(this)}else{return p.inverse(this)}})};n.prototype.render=function(){var v,p,r,u,q,w,t,s;s=this.model.type||this.model.dataType;if(this.model.paramType==="body"){this.model.isBody=true}if(s.toLowerCase()==="file"){this.model.isFile=true}t=this.template();$(this.el).html(t(this.model));q={sampleJSON:this.model.sampleJSON,isParam:true,signature:this.model.signature};if(this.model.sampleJSON){w=new l({model:q,tagName:"div"});$(".model-signature",$(this.el)).append(w.render().el)}else{$(".model-signature",$(this.el)).html(this.model.signature)}p=false;if(this.model.isBody){p=true}v={isParam:p};v.consumes=this.model.consumes;if(p){r=new m({model:v});$(".parameter-content-type",$(this.el)).append(r.render().el)}else{u=new a({model:v});$(".response-content-type",$(this.el)).append(u.render().el)}return this};n.prototype.template=function(){if(this.model.isList){return Handlebars.templates.param_list}else{if(this.options.readOnly){if(this.model.required){return Handlebars.templates.param_readonly_required}else{return Handlebars.templates.param_readonly}}else{if(this.model.required){return Handlebars.templates.param_required}else{return Handlebars.templates.param}}}};return n})(Backbone.View);l=(function(o){e(n,o);function n(){n.__super__.constructor.apply(this,arguments)}n.prototype.events={"click a.description-link":"switchToDescription","click a.snippet-link":"switchToSnippet","mousedown .snippet":"snippetToTextArea"};n.prototype.initialize=function(){};n.prototype.render=function(){var p;p=this.template();$(this.el).html(p(this.model));this.switchToDescription();this.isParam=this.model.isParam;if(this.isParam){$(".notice",$(this.el)).text("Click to set as parameter value")}return this};n.prototype.template=function(){return Handlebars.templates.signature};n.prototype.switchToDescription=function(p){if(p!=null){p.preventDefault()}$(".snippet",$(this.el)).hide();$(".description",$(this.el)).show();$(".description-link",$(this.el)).addClass("selected");return $(".snippet-link",$(this.el)).removeClass("selected")};n.prototype.switchToSnippet=function(p){if(p!=null){p.preventDefault()}$(".description",$(this.el)).hide();$(".snippet",$(this.el)).show();$(".snippet-link",$(this.el)).addClass("selected");return $(".description-link",$(this.el)).removeClass("selected")};n.prototype.snippetToTextArea=function(p){var q;if(this.isParam){if(p!=null){p.preventDefault()}q=$("textarea",$(this.el.parentNode.parentNode.parentNode));if($.trim(q.val())===""){return q.val(this.model.sampleJSON)}}};return n})(Backbone.View);g=(function(n){e(o,n);function o(){o.__super__.constructor.apply(this,arguments)}o.prototype.initialize=function(){};o.prototype.render=function(){var p;p=this.template();$(this.el).html(p(this.model));$("label[for=contentType]",$(this.el)).text("Response Content Type");return this};o.prototype.template=function(){return Handlebars.templates.content_type};return o})(Backbone.View);a=(function(n){e(o,n);function o(){o.__super__.constructor.apply(this,arguments)}o.prototype.initialize=function(){};o.prototype.render=function(){var p;p=this.template();$(this.el).html(p(this.model));$("label[for=responseContentType]",$(this.el)).text("Response Content Type");return this};o.prototype.template=function(){return Handlebars.templates.response_content_type};return o})(Backbone.View);m=(function(o){e(n,o);function n(){n.__super__.constructor.apply(this,arguments)}n.prototype.initialize=function(){};n.prototype.render=function(){var p;p=this.template();$(this.el).html(p(this.model));$("label[for=parameterContentType]",$(this.el)).text("Parameter content type:");return this};n.prototype.template=function(){return Handlebars.templates.parameter_content_type};return n})(Backbone.View)}).call(this);
\ No newline at end of file
+$(function(){$.fn.vAlign=function(){return this.each(function(c){var a=$(this).height();var d=$(this).parent().height();var b=(d-a)/2;$(this).css("margin-top",b)})};$.fn.stretchFormtasticInputWidthToParent=function(){return this.each(function(b){var d=$(this).closest("form").innerWidth();var c=parseInt($(this).closest("form").css("padding-left"),10)+parseInt($(this).closest("form").css("padding-right"),10);var a=parseInt($(this).css("padding-left"),10)+parseInt($(this).css("padding-right"),10);$(this).css("width",d-c-a)})};$("form.formtastic li.string input, form.formtastic textarea").stretchFormtasticInputWidthToParent();$("ul.downplayed li div.content p").vAlign();$("form.sandbox").submit(function(){var a=true;$(this).find("input.required").each(function(){$(this).removeClass("error");if($(this).val()==""){$(this).addClass("error");$(this).wiggle();a=false}});return a})});function clippyCopiedCallback(b){$("#api_key_copied").fadeIn().delay(1000).fadeOut()}log=function(){log.history=log.history||[];log.history.push(arguments);if(this.console){console.log(Array.prototype.slice.call(arguments)[0])}};if(Function.prototype.bind&&console&&typeof console.log=="object"){["log","info","warn","error","assert","dir","clear","profile","profileEnd"].forEach(function(a){console[a]=this.bind(console[a],console)},Function.prototype.call)}var Docs={shebang:function(){var b=$.param.fragment().split("/");b.shift();switch(b.length){case 1:log("shebang resource:"+b[0]);var d="resource_"+b[0];Docs.expandEndpointListForResource(b[0]);$("#"+d).slideto({highlight:false});break;case 2:log("shebang endpoint: "+b.join("_"));Docs.expandEndpointListForResource(b[0]);$("#"+d).slideto({highlight:false});var c=b.join("_");var a=c+"_content";log("li_dom_id "+c);log("li_content_dom_id "+a);Docs.expandOperation($("#"+a));$("#"+c).slideto({highlight:false});break}},toggleEndpointListForResource:function(b){var a=$("li#resource_"+Docs.escapeResourceName(b)+" ul.endpoints");if(a.is(":visible")){Docs.collapseEndpointListForResource(b)}else{Docs.expandEndpointListForResource(b)}},expandEndpointListForResource:function(b){var b=Docs.escapeResourceName(b);if(b==""){$(".resource ul.endpoints").slideDown();return}$("li#resource_"+b).addClass("active");var a=$("li#resource_"+b+" ul.endpoints");a.slideDown()},collapseEndpointListForResource:function(b){var b=Docs.escapeResourceName(b);$("li#resource_"+b).removeClass("active");var a=$("li#resource_"+b+" ul.endpoints");a.slideUp()},expandOperationsForResource:function(a){Docs.expandEndpointListForResource(a);if(a==""){$(".resource ul.endpoints li.operation div.content").slideDown();return}$("li#resource_"+Docs.escapeResourceName(a)+" li.operation div.content").each(function(){Docs.expandOperation($(this))})},collapseOperationsForResource:function(a){Docs.expandEndpointListForResource(a);$("li#resource_"+Docs.escapeResourceName(a)+" li.operation div.content").each(function(){Docs.collapseOperation($(this))})},escapeResourceName:function(a){return a.replace(/[!"#$%&'()*+,.\/:;<=>?@\[\\\]\^`{|}~]/g,"\\$&")},expandOperation:function(a){a.slideDown()},collapseOperation:function(a){a.slideUp()}};(function(){var b=Handlebars.template,a=Handlebars.templates=Handlebars.templates||{};a.content_type=b(function(g,l,f,k,j){this.compilerInfo=[4,">= 1.0.0"];f=this.merge(f,g.helpers);j=j||{};var i="",c,h="function",m=this;function e(r,q){var o="",p;o+="\n  ";p=f.each.call(r,r.produces,{hash:{},inverse:m.noop,fn:m.program(2,d,q),data:q});if(p||p===0){o+=p}o+="\n";return o}function d(r,q){var o="",p;o+='\n	<option value="';p=(typeof r===h?r.apply(r):r);if(p||p===0){o+=p}o+='">';p=(typeof r===h?r.apply(r):r);if(p||p===0){o+=p}o+="</option>\n	";return o}function n(p,o){return'\n  <option value="application/json">application/json</option>\n'}i+='<label for="contentType"></label>\n<select name="contentType">\n';c=f["if"].call(l,l.produces,{hash:{},inverse:m.program(4,n,j),fn:m.program(1,e,j),data:j});if(c||c===0){i+=c}i+="\n</select>\n";return i})})();(function(){var b=Handlebars.template,a=Handlebars.templates=Handlebars.templates||{};a.main=b(function(g,m,f,l,k){this.compilerInfo=[4,">= 1.0.0"];f=this.merge(f,g.helpers);k=k||{};var i="",c,h="function",j=this.escapeExpression,p=this;function e(v,u){var r="",t,s;r+='\n    <div class="info_title">'+j(((t=((t=v.info),t==null||t===false?t:t.title)),typeof t===h?t.apply(v):t))+'</div>\n    <div class="info_description">';s=((t=((t=v.info),t==null||t===false?t:t.description)),typeof t===h?t.apply(v):t);if(s||s===0){r+=s}r+="</div>\n    ";s=f["if"].call(v,((t=v.info),t==null||t===false?t:t.termsOfServiceUrl),{hash:{},inverse:p.noop,fn:p.program(2,d,u),data:u});if(s||s===0){r+=s}r+="\n    ";s=f["if"].call(v,((t=v.info),t==null||t===false?t:t.contact),{hash:{},inverse:p.noop,fn:p.program(4,q,u),data:u});if(s||s===0){r+=s}r+="\n    ";s=f["if"].call(v,((t=v.info),t==null||t===false?t:t.license),{hash:{},inverse:p.noop,fn:p.program(6,o,u),data:u});if(s||s===0){r+=s}r+="\n  ";return r}function d(u,t){var r="",s;r+='<div class="info_tos"><a href="'+j(((s=((s=u.info),s==null||s===false?s:s.termsOfServiceUrl)),typeof s===h?s.apply(u):s))+'">Terms of service</a></div>';return r}function q(u,t){var r="",s;r+="<div class='info_contact'><a href=\"mailto:"+j(((s=((s=u.info),s==null||s===false?s:s.contact)),typeof s===h?s.apply(u):s))+'">Contact the developer</a></div>';return r}function o(u,t){var r="",s;r+="<div class='info_license'><a href='"+j(((s=((s=u.info),s==null||s===false?s:s.licenseUrl)),typeof s===h?s.apply(u):s))+"'>"+j(((s=((s=u.info),s==null||s===false?s:s.license)),typeof s===h?s.apply(u):s))+"</a></div>";return r}function n(u,t){var r="",s;r+='\n        , <span style="font-variant: small-caps">api version</span>: ';if(s=f.apiVersion){s=s.call(u,{hash:{},data:t})}else{s=u.apiVersion;s=typeof s===h?s.apply(u):s}r+=j(s)+"\n        ";return r}i+="<div class='info' id='api_info'>\n  ";c=f["if"].call(m,m.info,{hash:{},inverse:p.noop,fn:p.program(1,e,k),data:k});if(c||c===0){i+=c}i+="\n</div>\n<div class='container' id='resources_container'>\n    <ul id='resources'>\n    </ul>\n\n    <div class=\"footer\">\n        <br>\n        <br>\n        <h4 style=\"color: #999\">[ <span style=\"font-variant: small-caps\">base url</span>: ";if(c=f.basePath){c=c.call(m,{hash:{},data:k})}else{c=m.basePath;c=typeof c===h?c.apply(m):c}i+=j(c)+"\n        ";c=f["if"].call(m,m.apiVersion,{hash:{},inverse:p.noop,fn:p.program(8,n,k),data:k});if(c||c===0){i+=c}i+="]</h4>\n    </div>\n</div>\n";return i})})();(function(){var b=Handlebars.template,a=Handlebars.templates=Handlebars.templates||{};a.operation=b(function(g,s,q,m,y){this.compilerInfo=[4,">= 1.0.0"];q=this.merge(q,g.helpers);y=y||{};var r="",i,f,e="function",d=this.escapeExpression,p=this,c=q.blockHelperMissing;function o(C,B){var z="",A;z+="\n        <h4>Implementation Notes</h4>\n        <p>";if(A=q.notes){A=A.call(C,{hash:{},data:B})}else{A=C.notes;A=typeof A===e?A.apply(C):A}if(A||A===0){z+=A}z+="</p>\n        ";return z}function n(A,z){return'\n        <div class="auth">\n        <span class="api-ic ic-error"></span>'}function l(C,B){var z="",A;z+='\n          <div id="api_information_panel" style="top: 526px; left: 776px; display: none;">\n          ';A=q.each.call(C,C,{hash:{},inverse:p.noop,fn:p.program(6,k,B),data:B});if(A||A===0){z+=A}z+="\n          </div>\n        ";return z}function k(D,C){var z="",B,A;z+="\n            <div title='";A=((B=D.description),typeof B===e?B.apply(D):B);if(A||A===0){z+=A}z+="'>"+d(((B=D.scope),typeof B===e?B.apply(D):B))+"</div>\n          ";return z}function h(A,z){return"</div>"}function x(A,z){return'\n        <div class=\'access\'>\n          <span class="api-ic ic-off" title="click to authenticate"></span>\n        </div>\n        '}function w(A,z){return'\n          <h4>Response Class</h4>\n          <p><span class="model-signature" /></p>\n          <br/>\n          <div class="response-content-type" />\n        '}function v(A,z){return'\n          <h4>Parameters</h4>\n          <table class=\'fullwidth\'>\n          <thead>\n            <tr>\n            <th style="width: 100px; max-width: 100px">Parameter</th>\n            <th style="width: 310px; max-width: 310px">Value</th>\n            <th style="width: 200px; max-width: 200px">Description</th>\n            <th style="width: 100px; max-width: 100px">Parameter Type</th>\n            <th style="width: 220px; max-width: 230px">Data Type</th>\n            </tr>\n          </thead>\n          <tbody class="operation-params">\n\n          </tbody>\n          </table>\n          '}function u(A,z){return"\n          <div style='margin:0;padding:0;display:inline'></div>\n          <h4>Response Messages</h4>\n          <table class='fullwidth'>\n            <thead>\n            <tr>\n              <th>HTTP Status Code</th>\n              <th>Reason</th>\n              <th>Response Model</th>\n            </tr>\n            </thead>\n            <tbody class=\"operation-status\">\n            \n            </tbody>\n          </table>\n          "}function t(A,z){return"\n          "}function j(A,z){return"\n          <div class='sandbox_header'>\n            <input class='submit' name='commit' type='button' value='Try it out!' />\n            <a href='#' class='response_hider' style='display:none'>Hide Response</a>\n            <span class='response_throbber' style='display:none'></span>\n          </div>\n          "}r+="\n  <ul class='operations' >\n    <li class='";if(i=q.method){i=i.call(s,{hash:{},data:y})}else{i=s.method;i=typeof i===e?i.apply(s):i}r+=d(i)+" operation' id='";if(i=q.parentId){i=i.call(s,{hash:{},data:y})}else{i=s.parentId;i=typeof i===e?i.apply(s):i}r+=d(i)+"_";if(i=q.nickname){i=i.call(s,{hash:{},data:y})}else{i=s.nickname;i=typeof i===e?i.apply(s):i}r+=d(i)+"'>\n      <div class='heading'>\n        <h3>\n          <span class='http_method'>\n          <a href='#!/";if(i=q.parentId){i=i.call(s,{hash:{},data:y})}else{i=s.parentId;i=typeof i===e?i.apply(s):i}r+=d(i)+"/";if(i=q.nickname){i=i.call(s,{hash:{},data:y})}else{i=s.nickname;i=typeof i===e?i.apply(s):i}r+=d(i)+'\' class="toggleOperation">';if(i=q.method){i=i.call(s,{hash:{},data:y})}else{i=s.method;i=typeof i===e?i.apply(s):i}r+=d(i)+"</a>\n          </span>\n          <span class='path'>\n          <a href='#!/";if(i=q.parentId){i=i.call(s,{hash:{},data:y})}else{i=s.parentId;i=typeof i===e?i.apply(s):i}r+=d(i)+"/";if(i=q.nickname){i=i.call(s,{hash:{},data:y})}else{i=s.nickname;i=typeof i===e?i.apply(s):i}r+=d(i)+'\' class="toggleOperation">';if(i=q.path){i=i.call(s,{hash:{},data:y})}else{i=s.path;i=typeof i===e?i.apply(s):i}r+=d(i)+"</a>\n          </span>\n        </h3>\n        <ul class='options'>\n          <li>\n          <a href='#!/";if(i=q.parentId){i=i.call(s,{hash:{},data:y})}else{i=s.parentId;i=typeof i===e?i.apply(s):i}r+=d(i)+"/";if(i=q.nickname){i=i.call(s,{hash:{},data:y})}else{i=s.nickname;i=typeof i===e?i.apply(s):i}r+=d(i)+'\' class="toggleOperation">';if(i=q.summary){i=i.call(s,{hash:{},data:y})}else{i=s.summary;i=typeof i===e?i.apply(s):i}if(i||i===0){r+=i}r+="</a>\n          </li>\n        </ul>\n      </div>\n      <div class='content' id='";if(i=q.parentId){i=i.call(s,{hash:{},data:y})}else{i=s.parentId;i=typeof i===e?i.apply(s):i}r+=d(i)+"_";if(i=q.nickname){i=i.call(s,{hash:{},data:y})}else{i=s.nickname;i=typeof i===e?i.apply(s):i}r+=d(i)+"_content' style='display:none'>\n        ";i=q["if"].call(s,s.notes,{hash:{},inverse:p.noop,fn:p.program(1,o,y),data:y});if(i||i===0){r+=i}r+="\n        ";f={hash:{},inverse:p.noop,fn:p.program(3,n,y),data:y};if(i=q.oauth){i=i.call(s,f)}else{i=s.oauth;i=typeof i===e?i.apply(s):i}if(!q.oauth){i=c.call(s,i,f)}if(i||i===0){r+=i}r+="\n        ";i=q.each.call(s,s.oauth,{hash:{},inverse:p.noop,fn:p.program(5,l,y),data:y});if(i||i===0){r+=i}r+="\n        ";f={hash:{},inverse:p.noop,fn:p.program(8,h,y),data:y};if(i=q.oauth){i=i.call(s,f)}else{i=s.oauth;i=typeof i===e?i.apply(s):i}if(!q.oauth){i=c.call(s,i,f)}if(i||i===0){r+=i}r+="\n        ";f={hash:{},inverse:p.noop,fn:p.program(10,x,y),data:y};if(i=q.oauth){i=i.call(s,f)}else{i=s.oauth;i=typeof i===e?i.apply(s):i}if(!q.oauth){i=c.call(s,i,f)}if(i||i===0){r+=i}r+="\n        ";i=q["if"].call(s,s.type,{hash:{},inverse:p.noop,fn:p.program(12,w,y),data:y});if(i||i===0){r+=i}r+="\n        <form accept-charset='UTF-8' class='sandbox'>\n          <div style='margin:0;padding:0;display:inline'></div>\n          ";i=q["if"].call(s,s.parameters,{hash:{},inverse:p.noop,fn:p.program(14,v,y),data:y});if(i||i===0){r+=i}r+="\n          ";i=q["if"].call(s,s.responseMessages,{hash:{},inverse:p.noop,fn:p.program(16,u,y),data:y});if(i||i===0){r+=i}r+="\n          ";i=q["if"].call(s,s.isReadOnly,{hash:{},inverse:p.program(20,j,y),fn:p.program(18,t,y),data:y});if(i||i===0){r+=i}r+="\n        </form>\n        <div class='response' style='display:none'>\n          <h4>Request URL</h4>\n          <div class='block request_url'></div>\n          <h4>Response Body</h4>\n          <div class='block response_body'></div>\n          <h4>Response Code</h4>\n          <div class='block response_code'></div>\n          <h4>Response Headers</h4>\n          <div class='block response_headers'></div>\n        </div>\n      </div>\n    </li>\n  </ul>\n";return r})})();(function(){var b=Handlebars.template,a=Handlebars.templates=Handlebars.templates||{};a.param=b(function(f,q,o,j,t){this.compilerInfo=[4,">= 1.0.0"];o=this.merge(o,f.helpers);t=t||{};var p="",g,d="function",c=this.escapeExpression,n=this;function m(y,x){var v="",w;v+="\n		";w=o["if"].call(y,y.isFile,{hash:{},inverse:n.program(4,k,x),fn:n.program(2,l,x),data:x});if(w||w===0){v+=w}v+="\n	";return v}function l(y,x){var v="",w;v+='\n			<input type="file" name=\'';if(w=o.name){w=w.call(y,{hash:{},data:x})}else{w=y.name;w=typeof w===d?w.apply(y):w}v+=c(w)+'\'/>\n			<div class="parameter-content-type" />\n		';return v}function k(y,x){var v="",w;v+="\n			";w=o["if"].call(y,y.defaultValue,{hash:{},inverse:n.program(7,h,x),fn:n.program(5,i,x),data:x});if(w||w===0){v+=w}v+="\n		";return v}function i(y,x){var v="",w;v+="\n				<textarea class='body-textarea' name='";if(w=o.name){w=w.call(y,{hash:{},data:x})}else{w=y.name;w=typeof w===d?w.apply(y):w}v+=c(w)+"'>";if(w=o.defaultValue){w=w.call(y,{hash:{},data:x})}else{w=y.defaultValue;w=typeof w===d?w.apply(y):w}v+=c(w)+"</textarea>\n			";return v}function h(y,x){var v="",w;v+="\n				<textarea class='body-textarea' name='";if(w=o.name){w=w.call(y,{hash:{},data:x})}else{w=y.name;w=typeof w===d?w.apply(y):w}v+=c(w)+'\'></textarea>\n				<br />\n				<div class="parameter-content-type" />\n			';return v}function e(y,x){var v="",w;v+="\n		";w=o["if"].call(y,y.isFile,{hash:{},inverse:n.program(10,u,x),fn:n.program(2,l,x),data:x});if(w||w===0){v+=w}v+="\n	";return v}function u(y,x){var v="",w;v+="\n			";w=o["if"].call(y,y.defaultValue,{hash:{},inverse:n.program(13,r,x),fn:n.program(11,s,x),data:x});if(w||w===0){v+=w}v+="\n		";return v}function s(y,x){var v="",w;v+="\n				<input class='parameter' minlength='0' name='";if(w=o.name){w=w.call(y,{hash:{},data:x})}else{w=y.name;w=typeof w===d?w.apply(y):w}v+=c(w)+"' placeholder='' type='text' value='";if(w=o.defaultValue){w=w.call(y,{hash:{},data:x})}else{w=y.defaultValue;w=typeof w===d?w.apply(y):w}v+=c(w)+"'/>\n			";return v}function r(y,x){var v="",w;v+="\n				<input class='parameter' minlength='0' name='";if(w=o.name){w=w.call(y,{hash:{},data:x})}else{w=y.name;w=typeof w===d?w.apply(y):w}v+=c(w)+"' placeholder='' type='text' value=''/>\n			";return v}p+="<td class='code'>";if(g=o.name){g=g.call(q,{hash:{},data:t})}else{g=q.name;g=typeof g===d?g.apply(q):g}p+=c(g)+"</td>\n<td>\n\n	";g=o["if"].call(q,q.isBody,{hash:{},inverse:n.program(9,e,t),fn:n.program(1,m,t),data:t});if(g||g===0){p+=g}p+="\n\n</td>\n<td>";if(g=o.description){g=g.call(q,{hash:{},data:t})}else{g=q.description;g=typeof g===d?g.apply(q):g}if(g||g===0){p+=g}p+="</td>\n<td>";if(g=o.paramType){g=g.call(q,{hash:{},data:t})}else{g=q.paramType;g=typeof g===d?g.apply(q):g}if(g||g===0){p+=g}p+='</td>\n<td>\n	<span class="model-signature"></span>\n</td>\n';return p})})();(function(){var b=Handlebars.template,a=Handlebars.templates=Handlebars.templates||{};a.param_list=b(function(h,t,r,m,y){this.compilerInfo=[4,">= 1.0.0"];r=this.merge(r,h.helpers);y=y||{};var s="",j,g,e,p=this,q=r.helperMissing,d="function",c=this.escapeExpression;function o(A,z){return" multiple='multiple'"}function n(A,z){return"\n    "}function l(C,B){var z="",A;z+="\n      ";A=r["if"].call(C,C.defaultValue,{hash:{},inverse:p.program(8,i,B),fn:p.program(6,k,B),data:B});if(A||A===0){z+=A}z+="\n    ";return z}function k(A,z){return"\n      "}function i(E,D){var z="",C,B,A;z+="\n        ";A={hash:{},inverse:p.program(11,x,D),fn:p.program(9,f,D),data:D};B=((C=r.isArray||E.isArray),C?C.call(E,E,A):q.call(E,"isArray",E,A));if(B||B===0){z+=B}z+="\n      ";return z}function f(A,z){return"\n        "}function x(A,z){return"\n          <option selected=\"\" value=''></option>\n        "}function w(C,B){var z="",A;z+="\n      ";A=r["if"].call(C,C.isDefault,{hash:{},inverse:p.program(16,u,B),fn:p.program(14,v,B),data:B});if(A||A===0){z+=A}z+="\n    ";return z}function v(C,B){var z="",A;z+='\n        <option selected="" value=\'';if(A=r.value){A=A.call(C,{hash:{},data:B})}else{A=C.value;A=typeof A===d?A.apply(C):A}z+=c(A)+"'>";if(A=r.value){A=A.call(C,{hash:{},data:B})}else{A=C.value;A=typeof A===d?A.apply(C):A}z+=c(A)+" (default)</option>\n      ";return z}function u(C,B){var z="",A;z+="\n        <option value='";if(A=r.value){A=A.call(C,{hash:{},data:B})}else{A=C.value;A=typeof A===d?A.apply(C):A}z+=c(A)+"'>";if(A=r.value){A=A.call(C,{hash:{},data:B})}else{A=C.value;A=typeof A===d?A.apply(C):A}z+=c(A)+"</option>\n      ";return z}s+="<td class='code'>";if(j=r.name){j=j.call(t,{hash:{},data:y})}else{j=t.name;j=typeof j===d?j.apply(t):j}s+=c(j)+"</td>\n<td>\n  <select ";e={hash:{},inverse:p.noop,fn:p.program(1,o,y),data:y};g=((j=r.isArray||t.isArray),j?j.call(t,t,e):q.call(t,"isArray",t,e));if(g||g===0){s+=g}s+=" class='parameter' name='";if(g=r.name){g=g.call(t,{hash:{},data:y})}else{g=t.name;g=typeof g===d?g.apply(t):g}s+=c(g)+"'>\n    ";g=r["if"].call(t,t.required,{hash:{},inverse:p.program(5,l,y),fn:p.program(3,n,y),data:y});if(g||g===0){s+=g}s+="\n    ";g=r.each.call(t,((j=t.allowableValues),j==null||j===false?j:j.descriptiveValues),{hash:{},inverse:p.noop,fn:p.program(13,w,y),data:y});if(g||g===0){s+=g}s+="\n  </select>\n</td>\n<td>";if(g=r.description){g=g.call(t,{hash:{},data:y})}else{g=t.description;g=typeof g===d?g.apply(t):g}if(g||g===0){s+=g}s+="</td>\n<td>";if(g=r.paramType){g=g.call(t,{hash:{},data:y})}else{g=t.paramType;g=typeof g===d?g.apply(t):g}if(g||g===0){s+=g}s+='</td>\n<td><span class="model-signature"></span></td>';return s})})();(function(){var b=Handlebars.template,a=Handlebars.templates=Handlebars.templates||{};a.param_readonly=b(function(g,m,f,l,k){this.compilerInfo=[4,">= 1.0.0"];f=this.merge(f,g.helpers);k=k||{};var i="",d,h="function",j=this.escapeExpression,o=this;function e(t,s){var q="",r;q+="\n        <textarea class='body-textarea' readonly='readonly' name='";if(r=f.name){r=r.call(t,{hash:{},data:s})}else{r=t.name;r=typeof r===h?r.apply(t):r}q+=j(r)+"'>";if(r=f.defaultValue){r=r.call(t,{hash:{},data:s})}else{r=t.defaultValue;r=typeof r===h?r.apply(t):r}q+=j(r)+"</textarea>\n    ";return q}function c(t,s){var q="",r;q+="\n        ";r=f["if"].call(t,t.defaultValue,{hash:{},inverse:o.program(6,n,s),fn:o.program(4,p,s),data:s});if(r||r===0){q+=r}q+="\n    ";return q}function p(t,s){var q="",r;q+="\n            ";if(r=f.defaultValue){r=r.call(t,{hash:{},data:s})}else{r=t.defaultValue;r=typeof r===h?r.apply(t):r}q+=j(r)+"\n        ";return q}function n(r,q){return"\n            (empty)\n        "}i+="<td class='code'>";if(d=f.name){d=d.call(m,{hash:{},data:k})}else{d=m.name;d=typeof d===h?d.apply(m):d}i+=j(d)+"</td>\n<td>\n    ";d=f["if"].call(m,m.isBody,{hash:{},inverse:o.program(3,c,k),fn:o.program(1,e,k),data:k});if(d||d===0){i+=d}i+="\n</td>\n<td>";if(d=f.description){d=d.call(m,{hash:{},data:k})}else{d=m.description;d=typeof d===h?d.apply(m):d}if(d||d===0){i+=d}i+="</td>\n<td>";if(d=f.paramType){d=d.call(m,{hash:{},data:k})}else{d=m.paramType;d=typeof d===h?d.apply(m):d}if(d||d===0){i+=d}i+='</td>\n<td><span class="model-signature"></span></td>\n';return i})})();(function(){var b=Handlebars.template,a=Handlebars.templates=Handlebars.templates||{};a.param_readonly_required=b(function(g,m,f,l,k){this.compilerInfo=[4,">= 1.0.0"];f=this.merge(f,g.helpers);k=k||{};var i="",d,h="function",j=this.escapeExpression,o=this;function e(t,s){var q="",r;q+="\n        <textarea class='body-textarea'  readonly='readonly' placeholder='(required)' name='";if(r=f.name){r=r.call(t,{hash:{},data:s})}else{r=t.name;r=typeof r===h?r.apply(t):r}q+=j(r)+"'>";if(r=f.defaultValue){r=r.call(t,{hash:{},data:s})}else{r=t.defaultValue;r=typeof r===h?r.apply(t):r}q+=j(r)+"</textarea>\n    ";return q}function c(t,s){var q="",r;q+="\n        ";r=f["if"].call(t,t.defaultValue,{hash:{},inverse:o.program(6,n,s),fn:o.program(4,p,s),data:s});if(r||r===0){q+=r}q+="\n    ";return q}function p(t,s){var q="",r;q+="\n            ";if(r=f.defaultValue){r=r.call(t,{hash:{},data:s})}else{r=t.defaultValue;r=typeof r===h?r.apply(t):r}q+=j(r)+"\n        ";return q}function n(r,q){return"\n            (empty)\n        "}i+="<td class='code required'>";if(d=f.name){d=d.call(m,{hash:{},data:k})}else{d=m.name;d=typeof d===h?d.apply(m):d}i+=j(d)+"</td>\n<td>\n    ";d=f["if"].call(m,m.isBody,{hash:{},inverse:o.program(3,c,k),fn:o.program(1,e,k),data:k});if(d||d===0){i+=d}i+="\n</td>\n<td>";if(d=f.description){d=d.call(m,{hash:{},data:k})}else{d=m.description;d=typeof d===h?d.apply(m):d}if(d||d===0){i+=d}i+="</td>\n<td>";if(d=f.paramType){d=d.call(m,{hash:{},data:k})}else{d=m.paramType;d=typeof d===h?d.apply(m):d}if(d||d===0){i+=d}i+='</td>\n<td><span class="model-signature"></span></td>\n';return i})})();(function(){var b=Handlebars.template,a=Handlebars.templates=Handlebars.templates||{};a.param_required=b(function(f,q,o,j,u){this.compilerInfo=[4,">= 1.0.0"];o=this.merge(o,f.helpers);u=u||{};var p="",g,d="function",c=this.escapeExpression,n=this;function m(z,y){var w="",x;w+="\n		";x=o["if"].call(z,z.isFile,{hash:{},inverse:n.program(4,k,y),fn:n.program(2,l,y),data:y});if(x||x===0){w+=x}w+="\n	";return w}function l(z,y){var w="",x;w+='\n			<input type="file" name=\'';if(x=o.name){x=x.call(z,{hash:{},data:y})}else{x=z.name;x=typeof x===d?x.apply(z):x}w+=c(x)+"'/>\n		";return w}function k(z,y){var w="",x;w+="\n			";x=o["if"].call(z,z.defaultValue,{hash:{},inverse:n.program(7,h,y),fn:n.program(5,i,y),data:y});if(x||x===0){w+=x}w+="\n		";return w}function i(z,y){var w="",x;w+="\n				<textarea class='body-textarea' placeholder='(required)' name='";if(x=o.name){x=x.call(z,{hash:{},data:y})}else{x=z.name;x=typeof x===d?x.apply(z):x}w+=c(x)+"'>";if(x=o.defaultValue){x=x.call(z,{hash:{},data:y})}else{x=z.defaultValue;x=typeof x===d?x.apply(z):x}w+=c(x)+"</textarea>\n			";return w}function h(z,y){var w="",x;w+="\n				<textarea class='body-textarea' placeholder='(required)' name='";if(x=o.name){x=x.call(z,{hash:{},data:y})}else{x=z.name;x=typeof x===d?x.apply(z):x}w+=c(x)+'\'></textarea>\n				<br />\n				<div class="parameter-content-type" />\n			';return w}function e(z,y){var w="",x;w+="\n		";x=o["if"].call(z,z.isFile,{hash:{},inverse:n.program(12,t,y),fn:n.program(10,v,y),data:y});if(x||x===0){w+=x}w+="\n	";return w}function v(z,y){var w="",x;w+="\n			<input class='parameter' class='required' type='file' name='";if(x=o.name){x=x.call(z,{hash:{},data:y})}else{x=z.name;x=typeof x===d?x.apply(z):x}w+=c(x)+"'/>\n		";return w}function t(z,y){var w="",x;w+="\n			";x=o["if"].call(z,z.defaultValue,{hash:{},inverse:n.program(15,r,y),fn:n.program(13,s,y),data:y});if(x||x===0){w+=x}w+="\n		";return w}function s(z,y){var w="",x;w+="\n				<input class='parameter required' minlength='1' name='";if(x=o.name){x=x.call(z,{hash:{},data:y})}else{x=z.name;x=typeof x===d?x.apply(z):x}w+=c(x)+"' placeholder='(required)' type='text' value='";if(x=o.defaultValue){x=x.call(z,{hash:{},data:y})}else{x=z.defaultValue;x=typeof x===d?x.apply(z):x}w+=c(x)+"'/>\n			";return w}function r(z,y){var w="",x;w+="\n				<input class='parameter required' minlength='1' name='";if(x=o.name){x=x.call(z,{hash:{},data:y})}else{x=z.name;x=typeof x===d?x.apply(z):x}w+=c(x)+"' placeholder='(required)' type='text' value=''/>\n			";return w}p+="<td class='code required'>";if(g=o.name){g=g.call(q,{hash:{},data:u})}else{g=q.name;g=typeof g===d?g.apply(q):g}p+=c(g)+"</td>\n<td>\n	";g=o["if"].call(q,q.isBody,{hash:{},inverse:n.program(9,e,u),fn:n.program(1,m,u),data:u});if(g||g===0){p+=g}p+="\n</td>\n<td>\n	<strong>";if(g=o.description){g=g.call(q,{hash:{},data:u})}else{g=q.description;g=typeof g===d?g.apply(q):g}if(g||g===0){p+=g}p+="</strong>\n</td>\n<td>";if(g=o.paramType){g=g.call(q,{hash:{},data:u})}else{g=q.paramType;g=typeof g===d?g.apply(q):g}if(g||g===0){p+=g}p+='</td>\n<td><span class="model-signature"></span></td>\n';return p})})();(function(){var b=Handlebars.template,a=Handlebars.templates=Handlebars.templates||{};a.parameter_content_type=b(function(g,l,f,k,j){this.compilerInfo=[4,">= 1.0.0"];f=this.merge(f,g.helpers);j=j||{};var i="",c,h="function",m=this;function e(r,q){var o="",p;o+="\n  ";p=f.each.call(r,r.consumes,{hash:{},inverse:m.noop,fn:m.program(2,d,q),data:q});if(p||p===0){o+=p}o+="\n";return o}function d(r,q){var o="",p;o+='\n  <option value="';p=(typeof r===h?r.apply(r):r);if(p||p===0){o+=p}o+='">';p=(typeof r===h?r.apply(r):r);if(p||p===0){o+=p}o+="</option>\n  ";return o}function n(p,o){return'\n  <option value="application/json">application/json</option>\n'}i+='<label for="parameterContentType"></label>\n<select name="parameterContentType">\n';c=f["if"].call(l,l.consumes,{hash:{},inverse:m.program(4,n,j),fn:m.program(1,e,j),data:j});if(c||c===0){i+=c}i+="\n</select>\n";return i})})();(function(){var b=Handlebars.template,a=Handlebars.templates=Handlebars.templates||{};a.resource=b(function(f,l,e,k,j){this.compilerInfo=[4,">= 1.0.0"];e=this.merge(e,f.helpers);j=j||{};var h="",c,o,g="function",i=this.escapeExpression,n=this,m=e.blockHelperMissing;function d(q,p){return" : "}h+="<div class='heading'>\n  <h2>\n    <a href='#!/";if(c=e.id){c=c.call(l,{hash:{},data:j})}else{c=l.id;c=typeof c===g?c.apply(l):c}h+=i(c)+'\' class="toggleEndpointList" data-id="';if(c=e.id){c=c.call(l,{hash:{},data:j})}else{c=l.id;c=typeof c===g?c.apply(l):c}h+=i(c)+'">';if(c=e.name){c=c.call(l,{hash:{},data:j})}else{c=l.name;c=typeof c===g?c.apply(l):c}h+=i(c)+"</a> ";o={hash:{},inverse:n.noop,fn:n.program(1,d,j),data:j};if(c=e.description){c=c.call(l,o)}else{c=l.description;c=typeof c===g?c.apply(l):c}if(!e.description){c=m.call(l,c,o)}if(c||c===0){h+=c}if(c=e.description){c=c.call(l,{hash:{},data:j})}else{c=l.description;c=typeof c===g?c.apply(l):c}if(c||c===0){h+=c}h+="\n  </h2>\n  <ul class='options'>\n    <li>\n      <a href='#!/";if(c=e.id){c=c.call(l,{hash:{},data:j})}else{c=l.id;c=typeof c===g?c.apply(l):c}h+=i(c)+"' id='endpointListTogger_";if(c=e.id){c=c.call(l,{hash:{},data:j})}else{c=l.id;c=typeof c===g?c.apply(l):c}h+=i(c)+'\' class="toggleEndpointList" data-id="';if(c=e.id){c=c.call(l,{hash:{},data:j})}else{c=l.id;c=typeof c===g?c.apply(l):c}h+=i(c)+'">Show/Hide</a>\n    </li>\n    <li>\n      <a href=\'#\' class="collapseResource" data-id="';if(c=e.id){c=c.call(l,{hash:{},data:j})}else{c=l.id;c=typeof c===g?c.apply(l):c}h+=i(c)+'">\n        List Operations\n      </a>\n    </li>\n    <li>\n      <a href=\'#\' class="expandResource" data-id=';if(c=e.id){c=c.call(l,{hash:{},data:j})}else{c=l.id;c=typeof c===g?c.apply(l):c}h+=i(c)+">\n        Expand Operations\n      </a>\n    </li>\n    <li>\n      <a href='";if(c=e.url){c=c.call(l,{hash:{},data:j})}else{c=l.url;c=typeof c===g?c.apply(l):c}h+=i(c)+"'>Raw</a>\n    </li>\n  </ul>\n</div>\n<ul class='endpoints' id='";if(c=e.id){c=c.call(l,{hash:{},data:j})}else{c=l.id;c=typeof c===g?c.apply(l):c}h+=i(c)+"_endpoint_list' style='display:none'>\n\n</ul>\n";return h})})();(function(){var b=Handlebars.template,a=Handlebars.templates=Handlebars.templates||{};a.response_content_type=b(function(g,l,f,k,j){this.compilerInfo=[4,">= 1.0.0"];f=this.merge(f,g.helpers);j=j||{};var i="",c,h="function",m=this;function e(r,q){var o="",p;o+="\n  ";p=f.each.call(r,r.produces,{hash:{},inverse:m.noop,fn:m.program(2,d,q),data:q});if(p||p===0){o+=p}o+="\n";return o}function d(r,q){var o="",p;o+='\n  <option value="';p=(typeof r===h?r.apply(r):r);if(p||p===0){o+=p}o+='">';p=(typeof r===h?r.apply(r):r);if(p||p===0){o+=p}o+="</option>\n  ";return o}function n(p,o){return'\n  <option value="application/json">application/json</option>\n'}i+='<label for="responseContentType"></label>\n<select name="responseContentType">\n';c=f["if"].call(l,l.produces,{hash:{},inverse:m.program(4,n,j),fn:m.program(1,e,j),data:j});if(c||c===0){i+=c}i+="\n</select>\n";return i})})();(function(){var b=Handlebars.template,a=Handlebars.templates=Handlebars.templates||{};a.signature=b(function(e,k,d,j,i){this.compilerInfo=[4,">= 1.0.0"];d=this.merge(d,e.helpers);i=i||{};var g="",c,f="function",h=this.escapeExpression;g+='<div>\n<ul class="signature-nav">\n    <li><a class="description-link" href="#">Model</a></li>\n    <li><a class="snippet-link" href="#">Model Schema</a></li>\n</ul>\n<div>\n\n<div class="signature-container">\n    <div class="description">\n        ';if(c=d.signature){c=c.call(k,{hash:{},data:i})}else{c=k.signature;c=typeof c===f?c.apply(k):c}if(c||c===0){g+=c}g+='\n    </div>\n\n    <div class="snippet">\n        <pre><code>';if(c=d.sampleJSON){c=c.call(k,{hash:{},data:i})}else{c=k.sampleJSON;c=typeof c===f?c.apply(k):c}g+=h(c)+'</code></pre>\n        <small class="notice"></small>\n    </div>\n</div>\n\n';return g})})();(function(){var b=Handlebars.template,a=Handlebars.templates=Handlebars.templates||{};a.status_code=b(function(e,k,d,j,i){this.compilerInfo=[4,">= 1.0.0"];d=this.merge(d,e.helpers);i=i||{};var g="",c,f="function",h=this.escapeExpression;g+="<td width='15%' class='code'>";if(c=d.code){c=c.call(k,{hash:{},data:i})}else{c=k.code;c=typeof c===f?c.apply(k):c}g+=h(c)+"</td>\n<td>";if(c=d.message){c=c.call(k,{hash:{},data:i})}else{c=k.message;c=typeof c===f?c.apply(k):c}if(c||c===0){g+=c}g+="</td>\n<td width='50%'><span class=\"model-signature\" /></td>";return g})})();(function(){var j,r,u,o,l,k,n,m,i,p,s,q,h,c,g,f,e,d,b,a,x,w,t={}.hasOwnProperty,v=function(B,z){for(var y in z){if(t.call(z,y)){B[y]=z[y]}}function A(){this.constructor=B}A.prototype=z.prototype;B.prototype=new A();B.__super__=z.prototype;return B};s=(function(z){v(y,z);function y(){q=y.__super__.constructor.apply(this,arguments);return q}y.prototype.dom_id="swagger_ui";y.prototype.options=null;y.prototype.api=null;y.prototype.headerView=null;y.prototype.mainView=null;y.prototype.initialize=function(A){var B=this;if(A==null){A={}}if(A.dom_id!=null){this.dom_id=A.dom_id;delete A.dom_id}if($("#"+this.dom_id)==null){$("body").append('<div id="'+this.dom_id+'"></div>')}this.options=A;this.options.success=function(){return B.render()};this.options.progress=function(C){return B.showMessage(C)};this.options.failure=function(C){return B.onLoadFailure(C)};this.headerView=new r({el:$("#header")});return this.headerView.on("update-swagger-ui",function(C){return B.updateSwaggerUi(C)})};y.prototype.updateSwaggerUi=function(A){this.options.url=A.url;return this.load()};y.prototype.load=function(){var B,A;if((A=this.mainView)!=null){A.clear()}B=this.options.url;if(B.indexOf("http")!==0){B=this.buildUrl(window.location.href.toString(),B)}this.options.url=B;this.headerView.update(B);this.api=new SwaggerApi(this.options);this.api.build();return this.api};y.prototype.render=function(){var A=this;this.showMessage("Finished Loading Resource Information. Rendering Swagger UI...");this.mainView=new u({model:this.api,el:$("#"+this.dom_id),swaggerOptions:this.options}).render();this.showMessage();switch(this.options.docExpansion){case"full":Docs.expandOperationsForResource("");break;case"list":Docs.collapseOperationsForResource("")}if(this.options.onComplete){this.options.onComplete(this.api,this)}return setTimeout(function(){return Docs.shebang()},400)};y.prototype.buildUrl=function(C,A){var B,D;log("base is "+C);if(A.indexOf("/")===0){D=C.split("/");C=D[0]+"//"+D[2];return C+A}else{B=C.length;if(C.indexOf("?")>-1){B=Math.min(B,C.indexOf("?"))}if(C.indexOf("#")>-1){B=Math.min(B,C.indexOf("#"))}C=C.substring(0,B);if(C.indexOf("/",C.length-1)!==-1){return C+A}return C+"/"+A}};y.prototype.showMessage=function(A){if(A==null){A=""}$("#message-bar").removeClass("message-fail");$("#message-bar").addClass("message-success");return $("#message-bar").html(A)};y.prototype.onLoadFailure=function(A){var B;if(A==null){A=""}$("#message-bar").removeClass("message-success");$("#message-bar").addClass("message-fail");B=$("#message-bar").html(A);if(this.options.onFailure!=null){this.options.onFailure(A)}return B};return y})(Backbone.Router);window.SwaggerUi=s;r=(function(z){v(y,z);function y(){h=y.__super__.constructor.apply(this,arguments);return h}y.prototype.events={"click #show-pet-store-icon":"showPetStore","click #show-wordnik-dev-icon":"showWordnikDev","click #explore":"showCustom","keyup #input_baseUrl":"showCustomOnKeyup","keyup #input_apiKey":"showCustomOnKeyup"};y.prototype.initialize=function(){};y.prototype.showPetStore=function(A){return this.trigger("update-swagger-ui",{url:"http://petstore.swagger.wordnik.com/api/api-docs"})};y.prototype.showWordnikDev=function(A){return this.trigger("update-swagger-ui",{url:"http://api.wordnik.com/v4/resources.json"})};y.prototype.showCustomOnKeyup=function(A){if(A.keyCode===13){return this.showCustom()}};y.prototype.showCustom=function(A){if(A!=null){A.preventDefault()}return this.trigger("update-swagger-ui",{url:$("#input_baseUrl").val(),apiKey:$("#input_apiKey").val()})};y.prototype.update=function(B,C,A){if(A==null){A=false}$("#input_baseUrl").val(B);if(A){return this.trigger("update-swagger-ui",{url:B})}};return y})(Backbone.View);u=(function(y){var z;v(A,y);function A(){g=A.__super__.constructor.apply(this,arguments);return g}z={alpha:function(C,B){return C.path.localeCompare(B.path)},method:function(C,B){return C.method.localeCompare(B.method)}};A.prototype.initialize=function(D){var C,H,F,E,B,G;if(D==null){D={}}if(D.swaggerOptions.sorter){F=D.swaggerOptions.sorter;H=z[F];G=this.model.apisArray;for(E=0,B=G.length;E<B;E++){C=G[E];C.operationsArray.sort(H)}if(F==="alpha"){return this.model.apisArray.sort(H)}}};A.prototype.render=function(){var C,H,E,F,D,B,G;$(this.el).html(Handlebars.templates.main(this.model));F={};C=0;G=this.model.apisArray;for(D=0,B=G.length;D<B;D++){E=G[D];H=E.name;while(typeof F[H]!=="undefined"){H=H+"_"+C;C+=1}E.id=H;F[H]=E;this.addResource(E)}return this};A.prototype.addResource=function(C){var B;B=new n({model:C,tagName:"li",id:"resource_"+C.id,className:"resource",swaggerOptions:this.options.swaggerOptions});return $("#resources").append(B.render().el)};A.prototype.clear=function(){return $(this.el).html("")};return A})(Backbone.View);n=(function(z){v(y,z);function y(){f=y.__super__.constructor.apply(this,arguments);return f}y.prototype.initialize=function(){};y.prototype.render=function(){var B,G,D,C,E,A,F;$(this.el).html(Handlebars.templates.resource(this.model));D={};F=this.model.operationsArray;for(E=0,A=F.length;E<A;E++){C=F[E];B=0;G=C.nickname;while(typeof D[G]!=="undefined"){G=G+"_"+B;B+=1}D[G]=C;C.nickname=G;C.parentId=this.model.id;this.addOperation(C)}$(".toggleEndpointList",this.el).click(this.callDocs.bind(this,"toggleEndpointListForResource"));$(".collapseResource",this.el).click(this.callDocs.bind(this,"collapseOperationsForResource"));$(".expandResource",this.el).click(this.callDocs.bind(this,"expandOperationsForResource"));return this};y.prototype.addOperation=function(A){var B;A.number=this.number;B=new o({model:A,tagName:"li",className:"endpoint",swaggerOptions:this.options.swaggerOptions});$(".endpoints",$(this.el)).append(B.render().el);return this.number++};y.prototype.callDocs=function(B,A){A.preventDefault();return Docs[B](A.currentTarget.getAttribute("data-id"))};return y})(Backbone.View);o=(function(z){v(y,z);function y(){e=y.__super__.constructor.apply(this,arguments);return e}y.prototype.invocationUrl=null;y.prototype.events={"submit .sandbox":"submitOperation","click .submit":"submitOperation","click .response_hider":"hideResponse","click .toggleOperation":"toggleOperationContent","mouseenter .api-ic":"mouseEnter","mouseout .api-ic":"mouseExit"};y.prototype.initialize=function(){};y.prototype.mouseEnter=function(F){var D,E,I,B,A,J,G,C,K,H;D=$(F.currentTarget.parentNode).find("#api_information_panel");K=F.pageX;H=F.pageY;J=$(window).scrollLeft();G=$(window).scrollTop();B=J+$(window).width();A=G+$(window).height();C=D.width();E=D.height();if(K+C>B){K=B-C}if(K<J){K=J}if(H+E>A){H=A-E}if(H<G){H=G}I={};I.top=H;I.left=K;D.css(I);return $(F.currentTarget.parentNode).find("#api_information_panel").show()};y.prototype.mouseExit=function(A){return $(A.currentTarget.parentNode).find("#api_information_panel").hide()};y.prototype.render=function(){var Q,R,P,O,I,N,J,M,K,H,L,G,F,E,C,T,V,U,S,D,B,A,W;R=true;if(!R){this.model.isReadOnly=true}this.model.oauth=null;if(this.model.authorizations){D=this.model.authorizations;for(P in D){L=D[P];if(P==="oauth2"){if(this.model.oauth===null){this.model.oauth={}}if(this.model.oauth.scopes===void 0){this.model.oauth.scopes=[]}for(G=0,T=L.length;G<T;G++){O=L[G];this.model.oauth.scopes.push(O)}}}}$(this.el).html(Handlebars.templates.operation(this.model));if(this.model.responseClassSignature&&this.model.responseClassSignature!=="string"){M={sampleJSON:this.model.responseSampleJSON,isParam:false,signature:this.model.responseClassSignature};J=new i({model:M,tagName:"div"});$(".model-signature",$(this.el)).append(J.render().el)}else{$(".model-signature",$(this.el)).html(this.model.type)}Q={isParam:false};Q.consumes=this.model.consumes;Q.produces=this.model.produces;B=this.model.parameters;for(F=0,V=B.length;F<V;F++){I=B[F];H=I.type||I.dataType;if(H.toLowerCase()==="file"){if(!Q.consumes){log("set content type ");Q.consumes="multipart/form-data"}}}N=new m({model:Q});$(".response-content-type",$(this.el)).append(N.render().el);A=this.model.parameters;for(E=0,U=A.length;E<U;E++){I=A[E];this.addParameter(I,Q.consumes)}W=this.model.responseMessages;for(C=0,S=W.length;C<S;C++){K=W[C];this.addStatusCode(K)}return this};y.prototype.addParameter=function(C,A){var B;C.consumes=A;B=new k({model:C,tagName:"tr",readOnly:this.model.isReadOnly});return $(".operation-params",$(this.el)).append(B.render().el)};y.prototype.addStatusCode=function(B){var A;A=new p({model:B,tagName:"tr"});return $(".operation-status",$(this.el)).append(A.render().el)};y.prototype.submitOperation=function(O){var Q,G,N,D,I,A,J,M,L,K,P,F,C,H,E,B;if(O!=null){O.preventDefault()}G=$(".sandbox",$(this.el));Q=true;G.find("input.required").each(function(){var R=this;$(this).removeClass("error");if(jQuery.trim($(this).val())===""){$(this).addClass("error");$(this).wiggle({callback:function(){return $(R).focus()}});return Q=false}});if(Q){D={};A={parent:this};N=false;H=G.find("input");for(M=0,P=H.length;M<P;M++){I=H[M];if((I.value!=null)&&jQuery.trim(I.value).length>0){D[I.name]=I.value}if(I.type==="file"){N=true}}E=G.find("textarea");for(L=0,F=E.length;L<F;L++){I=E[L];if((I.value!=null)&&jQuery.trim(I.value).length>0){D.body=I.value}}B=G.find("select");for(K=0,C=B.length;K<C;K++){I=B[K];J=this.getSelectedValue(I);if((J!=null)&&jQuery.trim(J).length>0){D[I.name]=J}}A.responseContentType=$("div select[name=responseContentType]",$(this.el)).val();A.requestContentType=$("div select[name=parameterContentType]",$(this.el)).val();$(".response_throbber",$(this.el)).show();if(N){return this.handleFileUpload(D,G)}else{return this.model["do"](D,A,this.showCompleteStatus,this.showErrorStatus,this)}}};y.prototype.success=function(A,B){return B.showCompleteStatus(A)};y.prototype.handleFileUpload=function(R,I){var M,H,C,N,L,K,P,J,G,F,D,Q,U,T,S,E,B,A,V,O=this;E=I.serializeArray();for(J=0,Q=E.length;J<Q;J++){N=E[J];if((N.value!=null)&&jQuery.trim(N.value).length>0){R[N.name]=N.value}}M=new FormData();P=0;B=this.model.parameters;for(G=0,U=B.length;G<U;G++){K=B[G];if(K.paramType==="form"){if(K.type.toLowerCase()!=="file"&&R[K.name]!==void 0){M.append(K.name,R[K.name])}}}C={};A=this.model.parameters;for(F=0,T=A.length;F<T;F++){K=A[F];if(K.paramType==="header"){C[K.name]=R[K.name]}}log(C);V=I.find('input[type~="file"]');for(D=0,S=V.length;D<S;D++){H=V[D];if(typeof H.files[0]!=="undefined"){M.append($(H).attr("name"),H.files[0]);P+=1}}this.invocationUrl=this.model.supportHeaderParams()?(C=this.model.getHeaderParams(R),this.model.urlify(R,false)):this.model.urlify(R,true);$(".request_url",$(this.el)).html("<pre></pre>");$(".request_url pre",$(this.el)).text(this.invocationUrl);L={type:this.model.method,url:this.invocationUrl,headers:C,data:M,dataType:"json",contentType:false,processData:false,error:function(X,Y,W){return O.showErrorStatus(O.wrap(X),O)},success:function(W){return O.showResponse(W,O)},complete:function(W){return O.showCompleteStatus(O.wrap(W),O)}};if(window.authorizations){window.authorizations.apply(L)}if(P===0){L.data.append("fake","true")}jQuery.ajax(L);return false};y.prototype.wrap=function(E){var C,F,H,B,G,D,A;H={};F=E.getAllResponseHeaders().split("\r");for(D=0,A=F.length;D<A;D++){B=F[D];C=B.split(":");if(C[0]!==void 0&&C[1]!==void 0){H[C[0].trim()]=C[1].trim()}}G={};G.content={};G.content.data=E.responseText;G.headers=H;G.request={};G.request.url=this.invocationUrl;G.status=E.status;return G};y.prototype.getSelectedValue=function(A){var D,C,F,B,E;if(!A.multiple){return A.value}else{C=[];E=A.options;for(F=0,B=E.length;F<B;F++){D=E[F];if(D.selected){C.push(D.value)}}if(C.length>0){return C.join(",")}else{return null}}};y.prototype.hideResponse=function(A){if(A!=null){A.preventDefault()}$(".response",$(this.el)).slideUp();return $(".response_hider",$(this.el)).fadeOut()};y.prototype.showResponse=function(A){var B;B=JSON.stringify(A,null,"\t").replace(/\n/g,"<br>");return $(".response_body",$(this.el)).html(escape(B))};y.prototype.showErrorStatus=function(B,A){return A.showStatus(B)};y.prototype.showCompleteStatus=function(B,A){return A.showStatus(B)};y.prototype.formatXml=function(H){var D,G,B,I,N,J,C,A,L,M,F,E,K;A=/(>)(<)(\/*)/g;M=/[ ]*(.*)[ ]+\n/g;D=/(<.+>)(.+\n)/g;H=H.replace(A,"$1\n$2$3").replace(M,"$1\n").replace(D,"$1\n$2");C=0;G="";N=H.split("\n");B=0;I="other";L={"single->single":0,"single->closing":-1,"single->opening":0,"single->other":0,"closing->single":0,"closing->closing":-1,"closing->opening":0,"closing->other":0,"opening->single":1,"opening->closing":0,"opening->opening":1,"opening->other":1,"other->single":0,"other->closing":-1,"other->opening":0,"other->other":0};F=function(T){var P,O,R,V,S,Q,U;Q={single:Boolean(T.match(/<.+\/>/)),closing:Boolean(T.match(/<\/.+>/)),opening:Boolean(T.match(/<[^!?].*>/))};S=((function(){var W;W=[];for(R in Q){U=Q[R];if(U){W.push(R)}}return W})())[0];S=S===void 0?"other":S;P=I+"->"+S;I=S;V="";B+=L[P];V=((function(){var X,Y,W;W=[];for(O=X=0,Y=B;0<=Y?X<Y:X>Y;O=0<=Y?++X:--X){W.push("  ")}return W})()).join("");if(P==="opening->closing"){return G=G.substr(0,G.length-1)+T+"\n"}else{return G+=V+T+"\n"}};for(E=0,K=N.length;E<K;E++){J=N[E];F(J)}return G};y.prototype.showStatus=function(F){var C,H,J,D,A,E,I,G,B;if(F.content===void 0){H=F.data;B=F.url}else{H=F.content.data;B=F.request.url}D=F.headers;J=D&&D["Content-Type"]?D["Content-Type"].split(";")[0].trim():null;if(!H){C=$("<code />").text("no content");E=$('<pre class="json" />').append(C)}else{if(J==="application/json"||/\+json$/.test(J)){C=$("<code />").text(JSON.stringify(JSON.parse(H),null,"  "));E=$('<pre class="json" />').append(C)}else{if(J==="application/xml"||/\+xml$/.test(J)){C=$("<code />").text(this.formatXml(H));E=$('<pre class="xml" />').append(C)}else{if(J==="text/html"){C=$("<code />").html(H);E=$('<pre class="xml" />').append(C)}else{if(/^image\//.test(J)){E=$("<img>").attr("src",B)}else{C=$("<code />").text(H);E=$('<pre class="json" />').append(C)}}}}}I=E;$(".request_url",$(this.el)).html("<pre></pre>");$(".request_url pre",$(this.el)).text(B);$(".response_code",$(this.el)).html("<pre>"+F.status+"</pre>");$(".response_body",$(this.el)).html(I);$(".response_headers",$(this.el)).html("<pre>"+_.escape(JSON.stringify(F.headers,null,"  ")).replace(/\n/g,"<br>")+"</pre>");$(".response",$(this.el)).slideDown();$(".response_hider",$(this.el)).show();$(".response_throbber",$(this.el)).hide();G=$(".response_body",$(this.el))[0];A=this.options.swaggerOptions;if(A.highlightSizeThreshold&&F.data.length>A.highlightSizeThreshold){return G}else{return hljs.highlightBlock(G)}};y.prototype.toggleOperationContent=function(){var A;A=$("#"+Docs.escapeResourceName(this.model.parentId)+"_"+this.model.nickname+"_content");if(A.is(":visible")){return Docs.collapseOperation(A)}else{return Docs.expandOperation(A)}};return y})(Backbone.View);p=(function(z){v(y,z);function y(){d=y.__super__.constructor.apply(this,arguments);return d}y.prototype.initialize=function(){};y.prototype.render=function(){var B,A,C;C=this.template();$(this.el).html(C(this.model));if(swaggerUi.api.models.hasOwnProperty(this.model.responseModel)){B={sampleJSON:JSON.stringify(swaggerUi.api.models[this.model.responseModel].createJSONSample(),null,2),isParam:false,signature:swaggerUi.api.models[this.model.responseModel].getMockSignature()};A=new i({model:B,tagName:"div"});$(".model-signature",this.$el).append(A.render().el)}else{$(".model-signature",this.$el).html("")}return this};y.prototype.template=function(){return Handlebars.templates.status_code};return y})(Backbone.View);k=(function(z){v(y,z);function y(){b=y.__super__.constructor.apply(this,arguments);return b}y.prototype.initialize=function(){return Handlebars.registerHelper("isArray",function(B,A){if(B.type.toLowerCase()==="array"||B.allowMultiple){return A.fn(this)}else{return A.inverse(this)}})};y.prototype.render=function(){var G,A,C,F,B,H,E,D;D=this.model.type||this.model.dataType;if(this.model.paramType==="body"){this.model.isBody=true}if(D.toLowerCase()==="file"){this.model.isFile=true}E=this.template();$(this.el).html(E(this.model));B={sampleJSON:this.model.sampleJSON,isParam:true,signature:this.model.signature};if(this.model.sampleJSON){H=new i({model:B,tagName:"div"});$(".model-signature",$(this.el)).append(H.render().el)}else{$(".model-signature",$(this.el)).html(this.model.signature)}A=false;if(this.model.isBody){A=true}G={isParam:A};G.consumes=this.model.consumes;if(A){C=new l({model:G});$(".parameter-content-type",$(this.el)).append(C.render().el)}else{F=new m({model:G});$(".response-content-type",$(this.el)).append(F.render().el)}return this};y.prototype.template=function(){if(this.model.isList){return Handlebars.templates.param_list}else{if(this.options.readOnly){if(this.model.required){return Handlebars.templates.param_readonly_required}else{return Handlebars.templates.param_readonly}}else{if(this.model.required){return Handlebars.templates.param_required}else{return Handlebars.templates.param}}}};return y})(Backbone.View);i=(function(z){v(y,z);function y(){a=y.__super__.constructor.apply(this,arguments);return a}y.prototype.events={"click a.description-link":"switchToDescription","click a.snippet-link":"switchToSnippet","mousedown .snippet":"snippetToTextArea"};y.prototype.initialize=function(){};y.prototype.render=function(){var A;A=this.template();$(this.el).html(A(this.model));this.switchToSnippet();this.isParam=this.model.isParam;if(this.isParam){$(".notice",$(this.el)).text("Click to set as parameter value")}return this};y.prototype.template=function(){return Handlebars.templates.signature};y.prototype.switchToDescription=function(A){if(A!=null){A.preventDefault()}$(".snippet",$(this.el)).hide();$(".description",$(this.el)).show();$(".description-link",$(this.el)).addClass("selected");return $(".snippet-link",$(this.el)).removeClass("selected")};y.prototype.switchToSnippet=function(A){if(A!=null){A.preventDefault()}$(".description",$(this.el)).hide();$(".snippet",$(this.el)).show();$(".snippet-link",$(this.el)).addClass("selected");return $(".description-link",$(this.el)).removeClass("selected")};y.prototype.snippetToTextArea=function(A){var B;if(this.isParam){if(A!=null){A.preventDefault()}B=$("textarea",$(this.el.parentNode.parentNode.parentNode));if($.trim(B.val())===""){return B.val(this.model.sampleJSON)}}};return y})(Backbone.View);j=(function(y){v(z,y);function z(){x=z.__super__.constructor.apply(this,arguments);return x}z.prototype.initialize=function(){};z.prototype.render=function(){var A;A=this.template();$(this.el).html(A(this.model));$("label[for=contentType]",$(this.el)).text("Response Content Type");return this};z.prototype.template=function(){return Handlebars.templates.content_type};return z})(Backbone.View);m=(function(y){v(z,y);function z(){w=z.__super__.constructor.apply(this,arguments);return w}z.prototype.initialize=function(){};z.prototype.render=function(){var A;A=this.template();$(this.el).html(A(this.model));$("label[for=responseContentType]",$(this.el)).text("Response Content Type");return this};z.prototype.template=function(){return Handlebars.templates.response_content_type};return z})(Backbone.View);l=(function(z){v(y,z);function y(){c=y.__super__.constructor.apply(this,arguments);return c}y.prototype.initialize=function(){};y.prototype.render=function(){var A;A=this.template();$(this.el).html(A(this.model));$("label[for=parameterContentType]",$(this.el)).text("Parameter content type:");return this};y.prototype.template=function(){return Handlebars.templates.parameter_content_type};return y})(Backbone.View)}).call(this);
\ No newline at end of file

From 160eb194ea28e33f12953aa2b5bf5d64b1033537 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 24 May 2017 15:24:35 +0200
Subject: [PATCH 469/505] Clean REST response for user and third parties

---
 .../societe/class/api_thirdparties.class.php  | 21 ++++++++++++++++++-
 htdocs/user/class/api_users.class.php         | 20 ++++++++++++++----
 2 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/htdocs/societe/class/api_thirdparties.class.php b/htdocs/societe/class/api_thirdparties.class.php
index df7965d6d8c..507fd62ec48 100644
--- a/htdocs/societe/class/api_thirdparties.class.php
+++ b/htdocs/societe/class/api_thirdparties.class.php
@@ -311,7 +311,26 @@ class Thirdparties extends DolibarrApi
       return $this->company;
     }
 
-    /**
+	/**
+	 * Clean sensible object datas
+	 *
+	 * @param   object  $object    Object to clean
+	 * @return    array    Array of cleaned object properties
+	 */
+	function _cleanObjectDatas($object) {
+	
+	    $object = parent::_cleanObjectDatas($object);
+	
+	    unset($object->total_ht);
+	    unset($object->total_tva);
+	    unset($object->total_localtax1);
+	    unset($object->total_localtax2);
+	    unset($object->total_ttc);
+	    
+	    return $object;
+	}	
+	
+	/**
      * Validate fields before create or update object
      * 
      * @param array $data   Datas to validate
diff --git a/htdocs/user/class/api_users.class.php b/htdocs/user/class/api_users.class.php
index aa2569fb3ca..af1b8441293 100644
--- a/htdocs/user/class/api_users.class.php
+++ b/htdocs/user/class/api_users.class.php
@@ -225,9 +225,9 @@ class Users extends DolibarrApi
     /**
 	 * add user to group
 	 *
-	 * @param   int     $id User ID
-	 * @param   int     $group Group ID
-	 * @return  int
+	 * @param   int     $id        User ID
+	 * @param   int     $group     Group ID
+	 * @return  int                1 if success
      * 
 	 * @url	GET {id}/setGroup/{group}
 	 */
@@ -246,7 +246,13 @@ class Users extends DolibarrApi
           throw new RestException(401, 'Access not allowed for login ' . DolibarrApiAccess::$user->login);
         }
     
-        return $this->useraccount->SetInGroup($group,1);
+        $result = $this->useraccount->SetInGroup($group,1);
+        if (! ($result > 0))
+        {
+            throw new RestException(500, $this->useraccount->error);
+        }
+                
+        return 1;
     }
 
 	/**
@@ -287,6 +293,12 @@ class Users extends DolibarrApi
 	    unset($object->lastsearch_values);
 	    unset($object->lastsearch_values_tmp);
 	     
+	    unset($object->total_ht);
+	    unset($object->total_tva);
+	    unset($object->total_localtax1);
+	    unset($object->total_localtax2);
+	    unset($object->total_ttc);
+	    
 	    return $object;
 	}	
 	

From 55121c5e05cfee1fcd84e818f46fcb449972c245 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Wed, 24 May 2017 16:35:02 +0200
Subject: [PATCH 470/505] Fix: use encrypt for llx_const data

---
 htdocs/install/mysql/migration/5.0.0-6.0.0.sql | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index 6c71f279867..8ae10636373 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -210,22 +210,22 @@ ALTER TABLE llx_societe_remise_except ADD CONSTRAINT fk_societe_remise_fk_invoic
 
 ALTER TABLE llx_facture_rec ADD COLUMN vat_src_code	varchar(10) DEFAULT '';
 
-DELETE FROM llx_const where name = 'ADHERENT_BANK_USE_AUTO';
+DELETE FROM llx_const WHERE name = __ENCRYPT('ADHERENT_BANK_USE_AUTO')__;
 
-UPDATE llx_const set value='moono-lisa' where value = 'moono' AND name = 'FCKEDITOR_SKIN';
+UPDATE llx_const SET value = __ENCRYPT('moono-lisa')__ WHERE value = __ENCRYPT('moono')__ AND name = __ENCRYPT('FCKEDITOR_SKIN')__;
 
-ALTER TABLE llx_product_price ADD COLUMN default_vat_code	varchar(10) after tva_tx;
-ALTER TABLE llx_product_fournisseur_price ADD COLUMN default_vat_code	varchar(10) after tva_tx;
+ALTER TABLE llx_product_price ADD COLUMN default_vat_code	varchar(10) AFTER tva_tx;
+ALTER TABLE llx_product_fournisseur_price ADD COLUMN default_vat_code	varchar(10) AFTER tva_tx;
 
 ALTER TABLE llx_user ADD COLUMN model_pdf varchar(255);
 ALTER TABLE llx_usergroup ADD COLUMN model_pdf varchar(255);
 
-INSERT INTO llx_const (name, entity, value, type, visible, note) VALUES ('PRODUCT_ADDON_PDF_ODT_PATH', 1, 'DOL_DATA_ROOT/doctemplates/products', 'chaine', 0, '');
-INSERT INTO llx_const (name, entity, value, type, visible, note) VALUES ('CONTRACT_ADDON_PDF_ODT_PATH', 1, 'DOL_DATA_ROOT/doctemplates/contracts', 'chaine', 0, '');
-INSERT INTO llx_const (name, entity, value, type, visible, note) VALUES ('USERGROUP_ADDON_PDF_ODT_PATH', 1, 'DOL_DATA_ROOT/doctemplates/usergroups', 'chaine', 0, '');
-INSERT INTO llx_const (name, entity, value, type, visible, note) VALUES ('USER_ADDON_PDF_ODT_PATH', 1, 'DOL_DATA_ROOT/doctemplates/users', 'chaine', 0, '');
+INSERT INTO llx_const (name, entity, value, type, visible, note) VALUES (__ENCRYPT('PRODUCT_ADDON_PDF_ODT_PATH')__, 1, __ENCRYPT('DOL_DATA_ROOT/doctemplates/products')__, 'chaine', 0, '');
+INSERT INTO llx_const (name, entity, value, type, visible, note) VALUES (__ENCRYPT('CONTRACT_ADDON_PDF_ODT_PATH')__, 1, __ENCRYPT('DOL_DATA_ROOT/doctemplates/contracts')__, 'chaine', 0, '');
+INSERT INTO llx_const (name, entity, value, type, visible, note) VALUES (__ENCRYPT('USERGROUP_ADDON_PDF_ODT_PATH')__, 1, __ENCRYPT('DOL_DATA_ROOT/doctemplates/usergroups')__, 'chaine', 0, '');
+INSERT INTO llx_const (name, entity, value, type, visible, note) VALUES (__ENCRYPT('USER_ADDON_PDF_ODT_PATH')__, 1, __ENCRYPT('DOL_DATA_ROOT/doctemplates/users')__, 'chaine', 0, '');
 
-INSERT INTO llx_const (name, entity, value, type, visible, note) VALUES ('MAIN_ENABLE_OVERWRITE_TRANSLATION', 1, '1', 'chaine', 0, 'Enable overwrote of translation');
+INSERT INTO llx_const (name, entity, value, type, visible, note) VALUES (__ENCRYPT('MAIN_ENABLE_OVERWRITE_TRANSLATION')__, 1, __ENCRYPT('1')__, 'chaine', 0, 'Enable overwrote of translation');
 
 ALTER TABLE llx_chargesociales ADD COLUMN ref varchar(16);
 ALTER TABLE llx_chargesociales ADD COLUMN fk_projet integer DEFAULT NULL;

From 339d9dbfdf6a800b12387ba2226a95d2172d6865 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Wed, 24 May 2017 18:44:03 +0200
Subject: [PATCH 471/505] New: add REST api "dictionaryevents" for to use with
 "agendaevents"

---
 .../api/class/api_dictionaryevents.class.php  | 100 ++++++++++++++++++
 1 file changed, 100 insertions(+)
 create mode 100644 htdocs/api/class/api_dictionaryevents.class.php

diff --git a/htdocs/api/class/api_dictionaryevents.class.php b/htdocs/api/class/api_dictionaryevents.class.php
new file mode 100644
index 00000000000..23d7e8e5dba
--- /dev/null
+++ b/htdocs/api/class/api_dictionaryevents.class.php
@@ -0,0 +1,100 @@
+<?php
+/* Copyright (C) 2017	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/>.
+ */
+
+use Luracast\Restler\RestException;
+
+require_once DOL_DOCUMENT_ROOT.'/main.inc.php';
+
+/**
+ * API class for events type (content of the actioncomm dictionary)
+ *
+ * @access protected
+ * @class DolibarrApiAccess {@requires user,external}
+ */
+class DictionaryEvents extends DolibarrApi
+{
+    /**
+     * Constructor
+     */
+    function __construct()
+    {
+        global $db;
+        $this->db = $db;
+    }
+
+    /**
+     * Get the list of events types.
+     *
+     * @param string    $sortfield  Sort field
+     * @param string    $sortorder  Sort order
+     * @param int       $limit      Number of items per page
+     * @param int       $page       Page number (starting from zero)
+     * @param string    $type       To filter on type of event
+     * @param string    $module     To filter on module events
+     * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
+     * @return List of events types
+     *
+     * @throws RestException
+     */
+    function index($sortfield = "code", $sortorder = 'ASC', $limit = 100, $page = 0, $type = '', $module = '', $sqlfilters = '')
+    {
+        $list = array();
+
+        $sql = "SELECT id, code, type, libelle as label, module";
+        $sql.= " FROM ".MAIN_DB_PREFIX."c_actioncomm as t";
+        $sql.= " WHERE t.active = 1";
+        if ($type) $sql.=" AND t.type LIKE '%" . $this->db->escape($type) . "%'";
+        if ($module)    $sql.=" AND t.module LIKE '%" . $this->db->escape($module) . "%'";
+        // Add sql filters
+        if ($sqlfilters)
+        {
+            if (! DolibarrApi::_checkFilters($sqlfilters))
+            {
+                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+            }
+	        $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+            $sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+        }
+
+
+        $sql.= $this->db->order($sortfield, $sortorder);
+
+        if ($limit) {
+            if ($page < 0) {
+                $page = 0;
+            }
+            $offset = $limit * $page;
+
+            $sql .= $this->db->plimit($limit, $offset);
+        }
+
+        $result = $this->db->query($sql);
+
+        if ($result) {
+            $num = $this->db->num_rows($result);
+            $min = min($num, ($limit <= 0 ? $num : $limit));
+            for ($i = 0; $i < $min; $i++) {
+                $list[] = $this->db->fetch_object($result);
+            }
+        } else {
+            throw new RestException(503, 'Error when retrieving list of events types : '.$this->db->lasterror());
+        }
+
+        return $list;
+    }
+
+}

From 659436f1ed0d62085aa0edfc56299fa3e4965d70 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Wed, 24 May 2017 19:33:44 +0200
Subject: [PATCH 472/505] Fix: wrong min value

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

diff --git a/htdocs/adherents/class/api_members.class.php b/htdocs/adherents/class/api_members.class.php
index 9ea36bf579a..3b1bda41250 100644
--- a/htdocs/adherents/class/api_members.class.php
+++ b/htdocs/adherents/class/api_members.class.php
@@ -106,7 +106,7 @@ class Members extends DolibarrApi
             $sql.= ' AND t.fk_adherent_type='.$typeid;
         }
         // Add sql filters
-        if ($sqlfilters) 
+        if ($sqlfilters)
         {
             if (! DolibarrApi::_checkFilters($sqlfilters))
             {
@@ -115,7 +115,7 @@ class Members extends DolibarrApi
 	        $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
             $sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
         }
-        
+
         $sql.= $db->order($sortfield, $sortorder);
         if ($limit)    {
             if ($page < 0)
@@ -132,9 +132,10 @@ class Members extends DolibarrApi
         {
             $i=0;
             $num = $db->num_rows($result);
-            while ($i < min($limit, $num))
+            $min = min($num, ($limit <= 0 ? $num : $limit));
+            while ($i < $min)
             {
-                $obj = $db->fetch_object($result);
+            	$obj = $db->fetch_object($result);
                 $member = new Adherent($this->db);
                 if($member->fetch($obj->rowid)) {
                     $obj_ret[] = $this->_cleanObjectDatas($member);

From 3782bc445888981404e16b246dd8729e182ed637 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 24 May 2017 18:00:26 +0200
Subject: [PATCH 473/505] Look and feel v6

---
 htdocs/projet/admin/project.php                  | 2 +-
 htdocs/projet/admin/project_extrafields.php      | 2 +-
 htdocs/projet/admin/project_task_extrafields.php | 2 +-
 htdocs/projet/tasks/time.php                     | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/projet/admin/project.php b/htdocs/projet/admin/project.php
index 42cacc19272..fbcecf032cf 100644
--- a/htdocs/projet/admin/project.php
+++ b/htdocs/projet/admin/project.php
@@ -318,7 +318,7 @@ print load_fiche_titre($langs->trans("ProjectsSetup"),$linkback,'title_setup');
 
 $head=project_admin_prepare_head();
 
-dol_fiche_head($head, 'project', $langs->trans("Projects"), 0, 'project');
+dol_fiche_head($head, 'project', $langs->trans("Projects"), -1, 'project');
 
 
 
diff --git a/htdocs/projet/admin/project_extrafields.php b/htdocs/projet/admin/project_extrafields.php
index e3e070a3473..26a6286f034 100644
--- a/htdocs/projet/admin/project_extrafields.php
+++ b/htdocs/projet/admin/project_extrafields.php
@@ -70,7 +70,7 @@ print load_fiche_titre($langs->trans("ProjectsSetup"),$linkback,'title_setup');
 
 $head = project_admin_prepare_head();
 
-dol_fiche_head($head, 'attributes', $langs->trans("Projects"), 0, 'project');
+dol_fiche_head($head, 'attributes', $langs->trans("Projects"), -1, 'project');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
diff --git a/htdocs/projet/admin/project_task_extrafields.php b/htdocs/projet/admin/project_task_extrafields.php
index 3d6e1d78fe8..58f91e863fc 100644
--- a/htdocs/projet/admin/project_task_extrafields.php
+++ b/htdocs/projet/admin/project_task_extrafields.php
@@ -69,7 +69,7 @@ print load_fiche_titre($langs->trans("ProjectsSetup"),$linkback,'title_setup');
 
 $head = project_admin_prepare_head();
 
-dol_fiche_head($head, 'attributes_task', $langs->trans("Projects"), 0, 'project');
+dol_fiche_head($head, 'attributes_task', $langs->trans("Projects"), -1, 'project');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index cbdfece9d45..b35cc4d707d 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -96,7 +96,7 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
 // Purge search criteria
-if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") ||GETPOST("button_removefilter")) // All test are required to be compatible with all browsers
+if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") ||GETPOST("button_removefilter")) // All tests are required to be compatible with all browsers
 {
     $search_date='';
     $search_datehour='';
@@ -305,7 +305,7 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 			// Tabs for project
 			$tab='tasks';
 			$head=project_prepare_head($projectstatic);
-			dol_fiche_head($head, $tab, $langs->trans("Project"), 0, ($projectstatic->public?'projectpub':'project'));
+			dol_fiche_head($head, $tab, $langs->trans("Project"), -1, ($projectstatic->public?'projectpub':'project'));
 
 			$param=($mode=='mine'?'&mode=mine':'');
 

From e5fe629a0e761063f74b6787ea61735d71880981 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 24 May 2017 22:48:44 +0200
Subject: [PATCH 474/505] NEW Extrafields support formulas to be computed using
 PHP expressions

---
 htdocs/contact/list.php                       |   6 +-
 htdocs/core/actions_extrafields.inc.php       | 108 ++++++++++--------
 htdocs/core/class/extrafields.class.php       |  97 +++++++++++-----
 htdocs/core/lib/functions.lib.php             |  24 +++-
 htdocs/core/tpl/admin_extrafields_add.tpl.php |  67 ++++++++---
 .../core/tpl/admin_extrafields_edit.tpl.php   |  59 ++++++++--
 .../core/tpl/admin_extrafields_view.tpl.php   |   6 +-
 .../install/mysql/migration/5.0.0-6.0.0.sql   |   5 +-
 .../install/mysql/tables/llx_extrafields.sql  |   6 +-
 htdocs/langs/en_US/admin.lang                 |  12 +-
 htdocs/langs/en_US/main.lang                  |   1 +
 .../modulebuilder/skeletons/skeleton_list.php |  20 ++--
 htdocs/projet/list.php                        |  50 ++++----
 htdocs/projet/tasks/list.php                  |  37 +++---
 htdocs/societe/class/societe.class.php        |   2 -
 htdocs/societe/list.php                       |   6 +-
 16 files changed, 335 insertions(+), 171 deletions(-)

diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index 39557a6e455..9bcfee7ccae 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -597,7 +597,7 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
             $align=$extrafields->getAlignFlag($key);
             $typeofextrafield=$extrafields->attribute_type[$key];
             print '<td class="liste_titre'.($align?' '.$align:'').'">';
-		    if (in_array($typeofextrafield, array('varchar', 'int', 'double', 'select')))
+		    if (in_array($typeofextrafield, array('varchar', 'int', 'double', 'select')) && empty($extrafields->attribute_computed[$key]))
 			{
 			    $crit=$val;
 				$tmpkey=preg_replace('/search_options_/','',$key);
@@ -664,7 +664,9 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
        if (! empty($arrayfields["ef.".$key]['checked']))
        {
 			$align=$extrafields->getAlignFlag($key);
-			print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+			$sortonfield = "ef.".$key;
+			if (! empty($extrafields->attribute_computed[$key])) $sortonfield='';
+			print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],$sortonfield,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
        }
    }
 }
diff --git a/htdocs/core/actions_extrafields.inc.php b/htdocs/core/actions_extrafields.inc.php
index afcf929589b..b34cbe886ab 100644
--- a/htdocs/core/actions_extrafields.inc.php
+++ b/htdocs/core/actions_extrafields.inc.php
@@ -14,6 +14,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
+ * 
+ * $elementype must be defined.
  */
 
 /**
@@ -24,11 +26,14 @@
 $maxsizestring=255;
 $maxsizeint=10;
 
-$extrasize=GETPOST('size');
-if (GETPOST('type')=='double' && strpos($extrasize,',')===false) $extrasize='24,8';
-if (GETPOST('type')=='date')     $extrasize='';
-if (GETPOST('type')=='datetime') $extrasize='';
-if (GETPOST('type')=='select')   $extrasize='';
+$extrasize=GETPOST('size','int');
+$type=GETPOST('type','alpha');
+$param=GETPOST('param','alpha');;
+
+if ($type=='double' && strpos($extrasize,',')===false) $extrasize='24,8';
+if ($type=='date')     $extrasize='';
+if ($type=='datetime') $extrasize='';
+if ($type=='select')   $extrasize='';
 
 
 // Add attribute
@@ -37,73 +42,73 @@ if ($action == 'add')
 	if ($_POST["button"] != $langs->trans("Cancel"))
 	{
 	    // Check values
-		if (! GETPOST('type'))
+		if (! $type)
 		{
 			$error++;
 			$langs->load("errors");
 			$mesg[]=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Type"));
 			$action = 'create';
 		}
-		if (GETPOST('type')=='varchar' && $extrasize <= 0)
+		if ($type=='varchar' && $extrasize <= 0)
 		{
 		    $error++;
 		    $langs->load("errors");
 		    $mesg[]=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Size"));
 		    $action = 'edit';
 		}
-        if (GETPOST('type')=='varchar' && $extrasize > $maxsizestring)
+        if ($type=='varchar' && $extrasize > $maxsizestring)
         {
             $error++;
             $langs->load("errors");
             $mesg[]=$langs->trans("ErrorSizeTooLongForVarcharType",$maxsizestring);
             $action = 'create';
         }
-        if (GETPOST('type')=='int' && $extrasize > $maxsizeint)
+        if ($type=='int' && $extrasize > $maxsizeint)
         {
             $error++;
             $langs->load("errors");
             $mesg[]=$langs->trans("ErrorSizeTooLongForIntType",$maxsizeint);
             $action = 'create';
         }
-        if (GETPOST('type')=='select' && !GETPOST('param'))
+        if ($type=='select' && !$param)
         {
         	$error++;
         	$langs->load("errors");
         	$mesg[]=$langs->trans("ErrorNoValueForSelectType");
         	$action = 'create';
         }
-        if (GETPOST('type')=='sellist' && !GETPOST('param'))
+        if ($type=='sellist' && !$param)
         {
         	$error++;
         	$langs->load("errors");
         	$mesg[]=$langs->trans("ErrorNoValueForSelectListType");
         	$action = 'create';
         }
-        if (GETPOST('type')=='checkbox' && !GETPOST('param'))
+        if ($type=='checkbox' && !$param)
         {
         	$error++;
         	$langs->load("errors");
         	$mesg[]=$langs->trans("ErrorNoValueForCheckBoxType");
         	$action = 'create';
         }
-        if (GETPOST('type')=='link' && !GETPOST('param'))
+        if ($type=='link' && !$param)
         {
         	$error++;
         	$langs->load("errors");
         	$mesg[]=$langs->trans("ErrorNoValueForLinkType");
         	$action = 'create';
         }
-        if (GETPOST('type')=='radio' && !GETPOST('param'))
+        if ($type=='radio' && !$param)
         {
         	$error++;
         	$langs->load("errors");
         	$mesg[]=$langs->trans("ErrorNoValueForRadioType");
         	$action = 'create';
         }
-        if  (((GETPOST('type')=='radio') || (GETPOST('type')=='checkbox')) && GETPOST('param'))
+        if  ((($type=='radio') || ($type=='checkbox')) && $param)
         {
         	// Construct array for parameter (value of select list)
-    		$parameters = GETPOST('param');
+    		$parameters = $param;
     		$parameters_array = explode("\r\n",$parameters);
     		foreach($parameters_array as $param_ligne)
     		{
@@ -134,11 +139,11 @@ if ($action == 'add')
     		if (isset($_POST["attrname"]) && preg_match("/^[a-z0-9-_]+$/",$_POST['attrname']) && !is_numeric($_POST["attrname"]))
     		{
     			// Construct array for parameter (value of select list)
-        		$default_value = GETPOST('default_value');
-    			$parameters = GETPOST('param');
+        		$default_value = GETPOST('default_value','alpha');
+    			$parameters = $param;
     			$parameters_array = explode("\r\n",$parameters);
     			//In sellist we have only one line and it can have come to do SQL expression
-    			if (GETPOST('type')=='sellist') {
+    			if ($type=='sellist') {
     				foreach($parameters_array as $param_ligne)
     				{
     					$params['options'] = array($parameters=>null);
@@ -155,20 +160,21 @@ if ($action == 'add')
     			}
 
                 $result=$extrafields->addExtraField(
-                	GETPOST('attrname'),
-                	GETPOST('label'),
-                	GETPOST('type'),
-                	GETPOST('pos'),
+                	GETPOST('attrname', 'alpha'),
+                	GETPOST('label', 'alpha'),
+                	$type,
+                	GETPOST('pos', 'alpha'),
                 	$extrasize,
                 	$elementtype,
-                	(GETPOST('unique')?1:0),
-                	(GETPOST('required')?1:0),
+                	(GETPOST('unique', 'alpha')?1:0),
+                	(GETPOST('required', 'alpha')?1:0),
                 	$default_value,
                 	$params,
-                	(GETPOST('alwayseditable')?1:0),
-                	(GETPOST('perms')?GETPOST('perms'):''),
-                	(GETPOST('list')?1:0),
-					(GETPOST('ishidden')?1:0)
+                	(GETPOST('alwayseditable', 'alpha')?1:0),
+                	(GETPOST('perms', 'alpha')?GETPOST('perms', 'alpha'):''),
+                	(GETPOST('list', 'alpha')?1:0),
+					(GETPOST('ishidden', 'alpha')?1:0),
+                    GETPOST('computed_value','alpha')
                 );
     			if ($result > 0)
     			{
@@ -205,66 +211,66 @@ if ($action == 'update')
 	if ($_POST["button"] != $langs->trans("Cancel"))
 	{
         // Check values
-		if (! GETPOST('type'))
+		if (! $type)
 		{
 			$error++;
 			$langs->load("errors");
 			$mesg[]=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Type"));
 			$action = 'edit';
 		}
-		if (GETPOST('type')=='varchar' && $extrasize <= 0)
+		if ($type=='varchar' && $extrasize <= 0)
 		{
 		    $error++;
 		    $langs->load("errors");
 		    $mesg[]=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Size"));
 		    $action = 'edit';
 		}
-		if (GETPOST('type')=='varchar' && $extrasize > $maxsizestring)
+		if ($type=='varchar' && $extrasize > $maxsizestring)
         {
             $error++;
             $langs->load("errors");
             $mesg[]=$langs->trans("ErrorSizeTooLongForVarcharType",$maxsizestring);
             $action = 'edit';
         }
-        if (GETPOST('type')=='int' && $extrasize > $maxsizeint)
+        if ($type=='int' && $extrasize > $maxsizeint)
         {
             $error++;
             $langs->load("errors");
             $mesg[]=$langs->trans("ErrorSizeTooLongForIntType",$maxsizeint);
             $action = 'edit';
         }
-        if (GETPOST('type')=='select' && !GETPOST('param'))
+        if ($type=='select' && !$param)
         {
         	$error++;
         	$langs->load("errors");
         	$mesg[]=$langs->trans("ErrorNoValueForSelectType");
         	$action = 'edit';
         }
-        if (GETPOST('type')=='sellist' && !GETPOST('param'))
+        if ($type=='sellist' && !$param)
         {
         	$error++;
         	$langs->load("errors");
         	$mesg[]=$langs->trans("ErrorNoValueForSelectListType");
         	$action = 'edit';
         }
-        if (GETPOST('type')=='checkbox' && !GETPOST('param'))
+        if ($type=='checkbox' && !$param)
         {
         	$error++;
         	$langs->load("errors");
         	$mesg[]=$langs->trans("ErrorNoValueForCheckBoxType");
         	$action = 'edit';
         }
-        if (GETPOST('type')=='radio' && !GETPOST('param'))
+        if ($type=='radio' && !$param)
         {
         	$error++;
         	$langs->load("errors");
         	$mesg[]=$langs->trans("ErrorNoValueForRadioType");
         	$action = 'edit';
         }
-        if  (((GETPOST('type')=='radio') || (GETPOST('type')=='checkbox')) && GETPOST('param'))
+        if  ((($type=='radio') || ($type=='checkbox')) && $param)
         {
         	// Construct array for parameter (value of select list)
-        	$parameters = GETPOST('param');
+        	$parameters = $param;
         	$parameters_array = explode("\r\n",$parameters);
         	foreach($parameters_array as $param_ligne)
         	{
@@ -295,10 +301,10 @@ if ($action == 'update')
     		{
     			$pos = GETPOST('pos','int');
     			// Construct array for parameter (value of select list)
-    			$parameters = GETPOST('param');
+    			$parameters = $param;
     			$parameters_array = explode("\r\n",$parameters);
     			//In sellist we have only one line and it can have come to do SQL expression
-    			if (GETPOST('type')=='sellist') {
+    			if ($type=='sellist') {
     				foreach($parameters_array as $param_ligne)
     				{
     					$params['options'] = array($parameters=>null);
@@ -315,19 +321,21 @@ if ($action == 'update')
     			}
 
     			$result=$extrafields->update(
-    				GETPOST('attrname'),
-    				GETPOST('label'),
-    				GETPOST('type'),
+    				GETPOST('attrname', 'alpha'),
+    				GETPOST('label', 'alpha'),
+    				$type,
     				$extrasize,
     				$elementtype,
-    				(GETPOST('unique')?1:0),
-    				(GETPOST('required')?1:0),
+    				(GETPOST('unique', 'alpha')?1:0),
+    				(GETPOST('required', 'alpha')?1:0),
     				$pos,
     				$params,
-    				(GETPOST('alwayseditable')?1:0),
-    				(GETPOST('perms')?GETPOST('perms'):''),
-                	(GETPOST('list')?1:0),
-					(GETPOST('ishidden')?1:0)
+    				(GETPOST('alwayseditable', 'alpha')?1:0),
+    				(GETPOST('perms', 'alpha')?GETPOST('perms', 'alpha'):''),
+                	(GETPOST('list', 'alpha')?1:0),
+					(GETPOST('ishidden', 'alpha')?1:0),
+    			    GETPOST('default_value','alpha'),
+    			    GETPOST('computed_value','alpha')
     			);
     			if ($result > 0)
     			{
diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index f86f786e0fb..c89fc593745 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -36,14 +36,22 @@
 class ExtraFields
 {
 	var $db;
-	// Tableau contenant le nom des champs en clef et la definition de ces champs
+
+	// type of element (for what object is the extrafield)
+	var $attribute_elementtype;
+	
+	// Array with type of the extra field
 	var $attribute_type;
-	// Tableau contenant le nom des champs en clef et le label de ces champs en value
+	// Array with label of extra field
 	var $attribute_label;
-	// Tableau contenant le nom des champs en clef et la taille/longueur max de ces champs en value
+	// Array with size of extra field
 	var $attribute_size;
-	// Tableau contenant le nom des choix en clef et la valeur de ces choix en value
+	// array with list of possible values for some types of extra fields
 	var $attribute_choice;
+	// Array to store compute formula for computed fields
+	var $attribute_computed;
+	// Array to store default value
+	var $attribute_default;
 	// Array to store if attribute is unique or not
 	var $attribute_unique;
 	// Array to store if attribute is required or not
@@ -77,16 +85,17 @@ class ExtraFields
 	'phone'=>'ExtrafieldPhone',
 	'mail'=>'ExtrafieldMail',
 	'url'=>'ExtrafieldUrl',
+	'password' => 'ExtrafieldPassword',
 	'select' => 'ExtrafieldSelect',
 	'sellist' => 'ExtrafieldSelectList',
 	'radio' => 'ExtrafieldRadio',
 	'checkbox' => 'ExtrafieldCheckBox',
 	'chkbxlst' => 'ExtrafieldCheckBoxFromList',
 	'link' => 'ExtrafieldLink',
-	'password' => 'ExtrafieldPassword',
 	'separate' => 'ExtrafieldSeparator',
 	);
 
+	
 	/**
 	 *	Constructor
 	 *
@@ -96,10 +105,12 @@ class ExtraFields
 	{
 		$this->db = $db;
 		$this->error = array();
+		$this->attribute_elementtype = array();
 		$this->attribute_type = array();
 		$this->attribute_label = array();
 		$this->attribute_size = array();
-		$this->attribute_elementtype = array();
+		$this->attribute_computed = array();
+		$this->attribute_default = array();
 		$this->attribute_unique = array();
 		$this->attribute_required = array();
 		$this->attribute_perms = array();
@@ -118,15 +129,16 @@ class ExtraFields
 	 *  @param  string	$elementtype        Element type ('member', 'product', 'thirdparty', ...)
 	 *  @param	int		$unique				Is field unique or not
 	 *  @param	int		$required			Is field required or not
-	 *  @param	string	$default_value		Defaulted value (Example: '', '0', 'null', 'avalue')
+	 *  @param	string	$default_value		Defaulted value (In database. use the default_value feature for default value on screen. Example: '', '0', 'null', 'avalue')
 	 *  @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
 	 *  @param	int		$ishidden			Is hidden extrafield (warning, do not rely on this. If your module need a hidden data, it must use its own table)
+	 *  @param  string  $computed           Computed value
 	 *  @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='', $list=0, $ishidden=0)
+	function addExtraField($attrname, $label, $type, $pos, $size, $elementtype, $unique=0, $required=0, $default_value='', $param=0, $alwayseditable=0, $perms='', $list=0, $ishidden=0, $computed='')
 	{
 		if (empty($attrname)) return -1;
 		if (empty($label)) return -1;
@@ -137,13 +149,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, $perms, $list);
+			$result=$this->create($attrname, $type, $size, $elementtype, $unique, $required, $default_value, $param, $perms, $list, $copmputed);
 		}
 		$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, $list, $ishidden);
+			$result2=$this->create_label($attrname, $label, $type, $pos, $size, $elementtype, $unique, $required, $param, $alwayseditable, $perms, $list, $ishidden, $default, $computed);
 			$err2=$this->errno;
 			if ($result2 > 0 || ($err1 == 'DB_ERROR_COLUMN_ALREADY_EXISTS' && $err2 == 'DB_ERROR_RECORD_ALREADY_EXISTS'))
 			{
@@ -169,13 +181,14 @@ class ExtraFields
 	 *  @param  string	$elementtype        Element type ('member', 'product', 'thirdparty', 'contact', ...)
 	 *  @param	int		$unique				Is field unique or not
 	 *  @param	int		$required			Is field required or not
-	 *  @param  string  $default_value		Default value for field
+	 *  @param  string  $default_value		Default value for field (in database)
 	 *  @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
+	 *  @param  string  $computed           Computed value
 	 *  @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='', $perms='', $list=0)
+	private function create($attrname, $type='varchar', $length=255, $elementtype='member', $unique=0, $required=0, $default_value='',$param='', $perms='', $list=0, $computed='')
 	{
 		if ($elementtype == 'thirdparty') $elementtype='societe';
 		if ($elementtype == 'contact') $elementtype='socpeople';
@@ -258,9 +271,11 @@ class ExtraFields
 	 *  @param	string			$perms			Permission to check
 	 *  @param	int				$list			Into list view by default
 	 *  @param	int				$ishidden		Is hidden extrafield (warning, do not rely on this. If your module need a hidden data, it must use its own table)
+	 *  @param  string          $default        Default value (in database. use the default_value feature for default value on screen).
+	 *  @param  string          $computed       Computed value
 	 *  @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='', $list=0, $ishidden=0)
+	private function create_label($attrname, $label='', $type='', $pos=0, $size=0, $elementtype='member', $unique=0, $required=0, $param='', $alwayseditable=0, $perms='', $list=0, $ishidden=0, $default='', $computed='')
 	{
 		global $conf;
 
@@ -286,7 +301,7 @@ class ExtraFields
 				$params='';
 			}
 
-			$sql = "INSERT INTO ".MAIN_DB_PREFIX."extrafields(name, label, type, pos, size, entity, elementtype, fieldunique, fieldrequired, param, alwayseditable, perms, list, ishidden)";
+			$sql = "INSERT INTO ".MAIN_DB_PREFIX."extrafields(name, label, type, pos, size, entity, elementtype, fieldunique, fieldrequired, param, alwayseditable, perms, list, ishidden, fielddefault, fieldcomputed)";
 			$sql.= " VALUES('".$attrname."',";
 			$sql.= " '".$this->db->escape($label)."',";
 			$sql.= " '".$type."',";
@@ -299,8 +314,10 @@ class ExtraFields
 			$sql.= " '".$params."',";
 			$sql.= " '".$alwayseditable."',";
 			$sql.= " ".($perms?"'".$this->db->escape($perms)."'":"null").",";
-			$sql.= " ".$list;
-			$sql.= ", ".$ishidden;
+			$sql.= " ".$list.",";
+			$sql.= " ".$ishidden.",";
+			$sql.= " ".($default?"'".$this->db->escape($default)."'":"null").",";
+			$sql.= " ".($computed?"'".$this->db->escape($computed)."'":"null");
 			$sql.=')';
 
 			dol_syslog(get_class($this)."::create_label", LOG_DEBUG);
@@ -430,9 +447,11 @@ class ExtraFields
 	 *  @param	string	$perms				Permission to check
 	 *  @param	int		$list				Into list view by default
 	 *  @param	int		$ishidden			Is hidden extrafield (warning, do not rely on this. If your module need a hidden data, it must use its own table)
+	 *  @param  string  $default            Default value (in database. use the default_value feature for default value on screen).
+	 *  @param  string  $computed           Computed value
 	 * 	@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='',$list='',$ishidden=0)
+	function update($attrname,$label,$type,$length,$elementtype,$unique=0,$required=0,$pos=0,$param='',$alwayseditable=0, $perms='',$list='',$ishidden=0,$default='',$computed='')
 	{
 		if ($elementtype == 'thirdparty') $elementtype='societe';
 		if ($elementtype == 'contact') $elementtype='socpeople';
@@ -479,7 +498,7 @@ class ExtraFields
 			{
 				if ($label)
 				{
-					$result=$this->update_label($attrname,$label,$type,$length,$elementtype,$unique,$required,$pos,$param,$alwayseditable,$perms,$list,$ishidden);
+					$result=$this->update_label($attrname,$label,$type,$length,$elementtype,$unique,$required,$pos,$param,$alwayseditable,$perms,$list,$ishidden,$default,$computed);
 				}
 				if ($result > 0)
 				{
@@ -531,12 +550,14 @@ class ExtraFields
 	 *  @param	string	$perms				Permission to check
 	 *  @param	int		$list				Into list view by default
 	 *  @param	int		$ishidden			Is hidden extrafield (warning, do not rely on this. If your module need a hidden data, it must use its own table)
+	 *  @param  string  $default            Default value (in database. use the default_value feature for default value on screen).
+	 *  @param  string  $computed           Computed value
 	 *  @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='',$list=0,$ishidden=0)
+	private function update_label($attrname,$label,$type,$size,$elementtype,$unique=0,$required=0,$pos=0,$param='',$alwayseditable=0,$perms='',$list=0,$ishidden=0,$default='',$computed='')
 	{
 		global $conf;
-		dol_syslog(get_class($this)."::update_label ".$attrname.", ".$label.", ".$type.", ".$size.", ".$elementtype.", ".$unique.", ".$required.", ".$pos.", ".$alwayseditable.", ".$perms.", ".$list.", ".$ishidden);
+		dol_syslog(get_class($this)."::update_label ".$attrname.", ".$label.", ".$type.", ".$size.", ".$elementtype.", ".$unique.", ".$required.", ".$pos.", ".$alwayseditable.", ".$perms.", ".$list.", ".$ishidden.", ".$default.", ".$computed);
 
 		// Clean parameters
 		if ($elementtype == 'thirdparty') $elementtype='societe';
@@ -557,7 +578,7 @@ class ExtraFields
 			$sql_del.= " WHERE name = '".$attrname."'";
 			$sql_del.= " AND entity = ".$conf->entity;
 			$sql_del.= " AND elementtype = '".$elementtype."'";
-			dol_syslog(get_class($this)."::update_label", LOG_DEBUG);
+
 			$resql1=$this->db->query($sql_del);
 
 			$sql = "INSERT INTO ".MAIN_DB_PREFIX."extrafields(";
@@ -573,8 +594,10 @@ class ExtraFields
 			$sql.= " pos,";
 			$sql.= " alwayseditable,";
 			$sql.= " param,";
-			$sql.= " list";
-			$sql.= ", ishidden";
+			$sql.= " list,";
+			$sql.= " ishidden,";
+			$sql.= " fielddefault,";
+			$sql.= " fieldcomputed";
 			$sql.= ") VALUES (";
 			$sql.= "'".$attrname."',";
 			$sql.= " ".$conf->entity.",";
@@ -588,10 +611,12 @@ class ExtraFields
 			$sql.= " '".$pos."',";
 			$sql.= " '".$alwayseditable."',";
 			$sql.= " '".$param."',";
-			$sql.= " ".$list;
-			$sql.= ", ".$ishidden;
+			$sql.= " ".$list.", ";
+			$sql.= " ".$ishidden.", ";
+			$sql.= " ".($default?"'".$this->db->escape($default)."'":"null").",";
+			$sql.= " ".($computed?"'".$this->db->escape($computed)."'":"null");
 			$sql.= ")";
-			dol_syslog(get_class($this)."::update_label", LOG_DEBUG);
+
 			$resql2=$this->db->query($sql);
 
 			if ($resql1 && $resql2)
@@ -635,7 +660,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,list,ishidden";
+		$sql = "SELECT rowid,name,label,type,size,elementtype,fieldunique,fieldrequired,param,pos,alwayseditable,perms,list,ishidden,fielddefault,fieldcomputed";
 		$sql.= " FROM ".MAIN_DB_PREFIX."extrafields";
 		$sql.= " WHERE entity IN (0,".$conf->entity.")";
 		if ($elementtype) $sql.= " AND elementtype = '".$elementtype."'";
@@ -658,6 +683,8 @@ class ExtraFields
 					$this->attribute_label[$tab->name]=$tab->label;
 					$this->attribute_size[$tab->name]=$tab->size;
 					$this->attribute_elementtype[$tab->name]=$tab->elementtype;
+					$this->attribute_default[$tab->name]=$tab->fielddefault;
+					$this->attribute_computed[$tab->name]=$tab->fieldcomputed;
 					$this->attribute_unique[$tab->name]=$tab->fieldunique;
 					$this->attribute_required[$tab->name]=$tab->fieldrequired;
 					$this->attribute_param[$tab->name]=($tab->param ? unserialize($tab->param) : '');
@@ -699,6 +726,8 @@ class ExtraFields
 		$type =$this->attribute_type[$key];
 		$size =$this->attribute_size[$key];
 		$elementtype=$this->attribute_elementtype[$key];
+		$default=$this->attribute_default[$key];
+		$computed=$this->attribute_computed[$key];
 		$unique=$this->attribute_unique[$key];
 		$required=$this->attribute_required[$key];
 		$param=$this->attribute_param[$key];
@@ -706,6 +735,8 @@ class ExtraFields
 		$list=$this->attribute_list[$key];
 		$hidden=$this->attribute_hidden[$key];
 
+		if ($computed) return '<span class="opacitymedium">'.$langs->trans("AutomaticallyCalculated").'</span>';
+		
 		if (empty($showsize))
 		{
     		if ($type == 'date')
@@ -1218,10 +1249,12 @@ class ExtraFields
 	{
 		global $conf,$langs;
 
+		$elementtype=$this->attribute_elementtype[$key];
 		$label=$this->attribute_label[$key];
 		$type=$this->attribute_type[$key];
 		$size=$this->attribute_size[$key];
-		$elementtype=$this->attribute_elementtype[$key];
+		$default=$this->attribute_default[$key];
+		$computed=$this->attribute_computed[$key];
 		$unique=$this->attribute_unique[$key];
 		$required=$this->attribute_required[$key];
 		$params=$this->attribute_param[$key];
@@ -1229,6 +1262,14 @@ class ExtraFields
 		$list=$this->attribute_list[$key];
 		$hidden=$this->attribute_hidden[$key];	// warning, do not rely on this. If your module need a hidden data, it must use its own table.
 
+		// If field is a computed field, value must become result of compute
+		if ($computed)
+		{
+		    // Make the eval of compute string
+		    //var_dump($computed);
+		    $value = dol_eval($computed, 1, 0);
+		}
+		
 		$showsize=0;
 		if ($type == 'date')
 		{
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index e8ead0ed829..9ecfdc037f3 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -5604,20 +5604,32 @@ function verifCond($strRights)
  *
  * @param 	string	$s				String to evaluate
  * @param	int		$returnvalue	0=No return (used to execute eval($a=something)). 1=Value of eval is returned (used to eval($something)).
+ * @param   int     $hideerrors     1=Hide errors
  * @return	mixed					Nothing or return of eval
  */
-function dol_eval($s,$returnvalue=0)
+function dol_eval($s, $returnvalue=0, $hideerrors=1)
 {
 	// Only global variables can be changed by eval function and returned to caller
-	global $langs, $user, $conf;
-	global $leftmenu;
+	global $db, $langs, $user, $conf;
+	global $mainmenu, $leftmenu;
 	global $rights;
 	global $object;
-    global $soc;
+	global $mysoc;
+	
+	global $obj;       // To get $obj used into list when dol_eval is used for computed fields and $obj is not yet $object      
+	global $soc;       // For backward compatibility
 
 	//print $s."<br>\n";
-	if ($returnvalue) return @eval('return '.$s.';');
-	else @eval($s);
+	if ($returnvalue)
+	{
+	    if ($hideerrors) return @eval('return '.$s.';');
+	    else return eval('return '.$s.';');
+	}
+	else
+	{
+	    if ($hideerrors) @eval($s);
+	    else eval($s);
+	}
 }
 
 /**
diff --git a/htdocs/core/tpl/admin_extrafields_add.tpl.php b/htdocs/core/tpl/admin_extrafields_add.tpl.php
index 9e4fd464ee6..62821372e56 100644
--- a/htdocs/core/tpl/admin_extrafields_add.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_add.tpl.php
@@ -18,10 +18,12 @@
  */
 
 /**
- * The following vars must be defined
+ * The following vars must be defined:
  * $type2label
  * $form
  * $conf, $lang,
+ * The following vars may also be defined:
+ * $elementtype
  */
 
 ?>
@@ -31,15 +33,16 @@
     jQuery(document).ready(function() {
     	function init_typeoffields(type)
     	{
-        	console.log("select new type "+type);
+        	console.log("selected type is "+type);
     		var size = jQuery("#size");
+    		var computed_value = jQuery("#computed_value");
+    		var default_value = jQuery("#default_value");
     		var unique = jQuery("#unique");
     		var required = jQuery("#required");
-    		var default_value = jQuery("#default_value");
     		var alwayseditable = jQuery("#alwayseditable");
     		var list = jQuery("#list");
     		<?php
-    		if((GETPOST('type') != "select") && (GETPOST('type') != "sellist"))
+    		if ((GETPOST('type') != "select") && (GETPOST('type') != "sellist"))
     		{
     			print 'jQuery("#value_choice").hide();';
     		}
@@ -51,6 +54,28 @@
     		}
     		?>
 
+    		// Case of computed field
+    		console.log(type);
+    		if (type == '' || type == 'varchar' || type == 'int' || type == 'double' || type == 'price') { 
+    			jQuery("tr.extra_computed_value").show(); 
+    		} else {
+    			computed_value.val(''); jQuery("tr.extra_computed_value").hide();
+    		} 
+    		if (computed_value.val())
+    		{
+        		console.log("We enter a computed formula");
+        		jQuery("#default_value").val('');
+        		/* jQuery("#unique, #required, #alwayseditable, #ishidden, #list").removeAttr('checked'); */
+        		jQuery("#default_value, #unique, #required, #alwayseditable, #ishidden, #list").attr('disabled', true);
+        		jQuery("tr.extra_default_value, tr.extra_unique, tr.extra_required, tr.extra_alwayseditable, tr.extra_ishidden, tr.extra_list").hide();
+    		}
+    		else
+    		{
+        		console.log("No computed formula");
+        		jQuery("#default_value, #unique, #required, #alwayseditable, #ishidden, #list").attr('disabled', false);
+        		jQuery("tr.extra_default_value, tr.extra_unique, tr.extra_required, tr.extra_alwayseditable, tr.extra_ishidden, tr.extra_list").show();
+    		}
+    		
 			if (type == 'date')          { size.val('').prop('disabled', true); unique.removeAttr('disabled'); jQuery("#value_choice").hide();jQuery("#helpchkbxlst").hide(); }
 			else if (type == 'datetime') { size.val('').prop('disabled', true); unique.removeAttr('disabled'); jQuery("#value_choice").hide(); jQuery("#helpchkbxlst").hide();}
     		else if (type == 'double')   { size.val('24,8').removeAttr('disabled'); unique.removeAttr('disabled'); jQuery("#value_choice").hide(); jQuery("#helpchkbxlst").hide();}
@@ -65,7 +90,10 @@
 			else if (type == 'checkbox') { size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); jQuery("#value_choice").show();jQuery("#helpselect").show();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").hide();jQuery("#helplink").hide();}
 			else if (type == 'chkbxlst') { size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); jQuery("#value_choice").show();jQuery("#helpselect").hide();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").show();jQuery("#helplink").hide();}
 			else if (type == 'link')     { size.val('').prop('disabled', true); unique.removeAttr('disabled'); jQuery("#value_choice").show();jQuery("#helpselect").hide();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").hide();jQuery("#helplink").show();}
-			else if (type == 'separate') { size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); required.val('').prop('disabled', true); default_value.val('').prop('disabled', true); jQuery("#value_choice").hide();jQuery("#helpselect").hide();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").hide();jQuery("#helplink").hide();}
+			else if (type == 'separate') { 
+				size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); required.val('').prop('disabled', true); 
+				jQuery("#value_choice").hide();jQuery("#helpselect").hide();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").hide();jQuery("#helplink").hide();
+			}
 			else {	// type = string
 				size.val('').prop('disabled', true);
 				unique.removeAttr('disabled');
@@ -73,10 +101,12 @@
 
 			if (type == 'separate')
 			{
-				unique.removeAttr('checked').prop('disabled', true); required.removeAttr('checked').prop('disabled', true); alwayseditable.removeAttr('checked').prop('disabled', true); list.val('').prop('disabled', true); 
+				required.removeAttr('checked').prop('disabled', true); alwayseditable.removeAttr('checked').prop('disabled', true); list.val('').prop('disabled', true);
+				jQuery('#size, #default_value').val('').prop('disabled', true); 
 			}
 			else
 			{
+				default_value.removeAttr('disabled');
 				required.removeAttr('disabled'); alwayseditable.removeAttr('disabled'); list.val('').removeAttr('disabled'); 
 			}
     	}
@@ -84,6 +114,11 @@
     	jQuery("#type").change(function() {
     		init_typeoffields($(this).val());
     	});
+
+    	// If we enter a formula, we disable other fields
+    	jQuery("#computed_value").keyup(function() {
+    		init_typeoffields(jQuery('#type').val());
+    	});
     });
 </script>
 
@@ -103,9 +138,7 @@
 <?php print $form->selectarray('type',$type2label,GETPOST('type')); ?>
 </td></tr>
 <!-- Size -->
-<tr><td class="fieldrequired"><?php echo $langs->trans("Size"); ?></td><td class="valeur"><input id="size" type="text" name="size" size="5" value="<?php echo (GETPOST('size')?GETPOST('size'):''); ?>"></td></tr>
-<!-- Position -->
-<tr><td><?php echo $langs->trans("Position"); ?></td><td class="valeur"><input type="text" name="pos" size="5" value="<?php echo GETPOST('pos'); ?>"></td></tr>
+<tr class="extra_size"><td class="fieldrequired"><?php echo $langs->trans("Size"); ?></td><td class="valeur"><input id="size" type="text" name="size" size="5" value="<?php echo (GETPOST('size')?GETPOST('size'):''); ?>"></td></tr>
 <!-- Default Value (for select list / radio/ checkbox) -->
 <tr id="value_choice">
 <td>
@@ -124,17 +157,21 @@
     </table>
 </td>
 </tr>
-<!-- Default Value -->
-<tr><td><?php echo $langs->trans("DefaultValue"); ?></td><td class="valeur"><input id="default_value" type="text" name="default_value" size="5" value="<?php echo (GETPOST('"default_value"')?GETPOST('"default_value"'):''); ?>"></td></tr>
+<!-- Position -->
+<tr><td class="titlefield"><?php echo $langs->trans("Position"); ?></td><td class="valeur"><input type="text" name="pos" size="5" value="<?php echo GETPOST('pos'); ?>"></td></tr>
+<!-- Computed Value -->
+<tr class="extra_computed_value"><td><?php echo $form->textwithpicto($langs->trans("ComputedFormula"), $langs->trans("ComputedFormulaDesc"), 1, 'help', '', 0, 2, 'tooltipcompute'); ?></td><td class="valeur"><input id="computed_value" type="text" name="computed_value" class="quatrevingtpercent" value="<?php echo (GETPOST('"computed_value"')?GETPOST('"computed_value"'):''); ?>"></td></tr>
+<!-- Default Value (at sql setup level) -->
+<tr class="extra_default_value"><td><?php echo $langs->trans("DefaultValue").' ('.$langs->trans("Database").')'; ?></td><td class="valeur"><input id="default_value" type="text" name="default_value" size="5" value="<?php echo (GETPOST('"default_value"')?GETPOST('"default_value"'):''); ?>"></td></tr>
 <!-- Unique -->
-<tr><td><?php echo $langs->trans("Unique"); ?></td><td class="valeur"><input id="unique" type="checkbox" name="unique"<?php echo (GETPOST('unique')?' checked':''); ?>></td></tr>
+<tr class="extra_unique"><td><?php echo $langs->trans("Unique"); ?></td><td class="valeur"><input id="unique" type="checkbox" name="unique"<?php echo (GETPOST('unique')?' checked':''); ?>></td></tr>
 <!-- Required -->
-<tr><td><?php echo $langs->trans("Required"); ?></td><td class="valeur"><input id="required" type="checkbox" name="required"<?php echo (GETPOST('required')?' checked':''); ?>></td></tr>
+<tr class="extra_required"><td><?php echo $langs->trans("Required"); ?></td><td class="valeur"><input id="required" type="checkbox" name="required"<?php echo (GETPOST('required')?' checked':''); ?>></td></tr>
 <!-- Always editable -->
-<tr><td><?php echo $langs->trans("AlwaysEditable"); ?></td><td class="valeur"><input id="alwayseditable" type="checkbox" name="alwayseditable"<?php echo ((GETPOST('alwayseditable') || ! GETPOST('button'))?' checked':''); ?>></td></tr>
+<tr class="extra_alwayseditable"><td><?php echo $langs->trans("AlwaysEditable"); ?></td><td class="valeur"><input id="alwayseditable" type="checkbox" name="alwayseditable"<?php echo ((GETPOST('alwayseditable') || ! GETPOST('button'))?' checked':''); ?>></td></tr>
 <!-- Is visible or not -->
 <?php if (! empty($conf->global->MAIN_CAN_HIDE_EXTRAFIELDS)) { ?>
-<tr><td><?php echo $langs->trans("Hidden"); ?></td><td class="valeur"><input id="ishidden" type="checkbox" name="ishidden"<?php echo (GETPOST('ishidden') ?' checked' : ''); ?>></td></tr>
+<tr class="extra_ishidden"><td><?php echo $langs->trans("Hidden"); ?></td><td class="valeur"><input id="ishidden" type="checkbox" name="ishidden"<?php echo (GETPOST('ishidden') ?' checked' : ''); ?>></td></tr>
 <?php } ?>
 <?php if ($conf->global->MAIN_FEATURES_LEVEL >= 2) { ?>
 <!-- By default visible into list -->
diff --git a/htdocs/core/tpl/admin_extrafields_edit.tpl.php b/htdocs/core/tpl/admin_extrafields_edit.tpl.php
index b6c43b10ce9..6f049c506a3 100644
--- a/htdocs/core/tpl/admin_extrafields_edit.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_edit.tpl.php
@@ -15,6 +15,16 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
+
+/**
+ * The following vars must be defined:
+ * $type2label
+ * $form
+ * $conf, $lang,
+ * The following vars may also be defined:
+ * $elementtype
+ */
+
 ?>
 
 <!-- BEGIN PHP TEMPLATE admin_extrafields_edit.tpl.php -->
@@ -24,9 +34,10 @@
     	{
         	console.log("select new type "+type);
     		var size = jQuery("#size");
+    		var computed_value = jQuery("#computed_value");
+    		var default_value = jQuery("#default_value");
     		var unique = jQuery("#unique");
     		var required = jQuery("#required");
-    		var default_value = jQuery("#default_value");
     		var alwayseditable = jQuery("#alwayseditable");
     		var list = jQuery("#list");
     		<?php
@@ -42,6 +53,27 @@
     		}
     		?>
 
+    		// Case of computed field
+    		if (type == 'varchar' || type == 'int' || type == 'double' || type == 'price') { 
+    			jQuery("tr.extra_computed_value").show(); 
+    		} else {
+    			computed_value.val(''); jQuery("tr.extra_computed_value").hide();
+    		} 
+    		if (computed_value.val())
+    		{
+        		console.log("We enter a computed formula");
+        		jQuery("#default_value").val('');
+        		/* jQuery("#unique, #required, #alwayseditable, #ishidden, #list").removeAttr('checked'); */
+        		jQuery("#default_value, #unique, #required, #alwayseditable, #ishidden, #list").attr('disabled', true);
+        		jQuery("tr.extra_default_value, tr.extra_unique, tr.extra_required, tr.extra_alwayseditable, tr.extra_ishidden, tr.extra_list").hide();
+    		}
+    		else
+    		{
+        		console.log("No computed formula");
+        		jQuery("#default_value, #unique, #required, #alwayseditable, #ishidden, #list").attr('disabled', false);
+        		jQuery("tr.extra_default_value, tr.extra_unique, tr.extra_required, tr.extra_alwayseditable, tr.extra_ishidden, tr.extra_list").show();
+    		}
+    		
 			if (type == 'date') { size.val('').prop('disabled', true); unique.removeAttr('disabled'); jQuery("#value_choice").hide();jQuery("#helpchkbxlst").hide(); }
 			else if (type == 'datetime') { size.val('').prop('disabled', true); unique.removeAttr('disabled'); jQuery("#value_choice").hide(); jQuery("#helpchkbxlst").hide();}
     		else if (type == 'double')   { size.removeAttr('disabled'); unique.removeAttr('disabled'); jQuery("#value_choice").hide(); jQuery("#helpchkbxlst").hide();}
@@ -65,9 +97,11 @@
 			if (type == 'separate')
 			{
 				required.removeAttr('checked').prop('disabled', true); alwayseditable.removeAttr('checked').prop('disabled', true); list.val('').prop('disabled', true); 
+				jQuery('#size, #default_value').val('').prop('disabled', true); 
 			}
 			else
 			{
+				default_value.removeAttr('disabled');
 				required.removeAttr('disabled'); alwayseditable.removeAttr('disabled'); list.val('').removeAttr('disabled'); 
 			}			
     	}
@@ -75,6 +109,11 @@
     	jQuery("#type").change(function() {
     		init_typeoffields($(this).val());
     	});
+
+    	// If we enter a formula, we disable other fields
+    	jQuery("#computed_value").keyup(function() {
+    		init_typeoffields(jQuery('#type').val());
+    	});    	
     });
 </script>
 
@@ -92,6 +131,8 @@
 <?php
 $type=$extrafields->attribute_type[$attrname];
 $size=$extrafields->attribute_size[$attrname];
+$computed=$extrafields->attribute_computed[$attrname];
+$default=$extrafields->attribute_default[$attrname];
 $unique=$extrafields->attribute_unique[$attrname];
 $required=$extrafields->attribute_required[$attrname];
 $pos=$extrafields->attribute_pos[$attrname];
@@ -156,9 +197,7 @@ else
 ?>
 </td></tr>
 <!-- Size -->
-<tr><td class="fieldrequired"><?php echo $langs->trans("Size"); ?></td><td><input id="size" type="text" name="size" size="5" value="<?php echo $size; ?>"></td></tr>
-<!-- Position -->
-<tr><td><?php echo $langs->trans("Position"); ?></td><td class="valeur"><input type="text" name="pos" size="5" value="<?php  echo $extrafields->attribute_pos[$attrname];  ?>"></td></tr>
+<tr class="extra_size"><td class="fieldrequired"><?php echo $langs->trans("Size"); ?></td><td><input id="size" type="text" name="size" size="5" value="<?php echo $size; ?>"></td></tr>
 <!--  Value (for select list / radio) -->
 <tr id="value_choice">
 <td>
@@ -177,12 +216,18 @@ else
     </table>
 </td>
 </tr>
+<!-- Position -->
+<tr><td class="titlefield"><?php echo $langs->trans("Position"); ?></td><td class="valeur"><input type="text" name="pos" size="5" value="<?php echo dol_escape_htmltag($extrafields->attribute_pos[$attrname]);  ?>"></td></tr>
+<!-- Computed value -->
+<tr class="extra_computed_value"><td><?php echo $form->textwithpicto($langs->trans("ComputedFormula"), $langs->trans("ComputedFormulaDesc"), 1, 'help', '', 0, 2, 'tooltipcompute'); ?></td><td class="valeur"><input id="computed_value" class="quatrevingtpercent" type="text" name="computed_value" value="<?php echo dol_escape_htmltag($computed); ?>"></td></tr>
+<!-- Default value -->
+<!-- Edit of default into sql structure not yet supported -->
 <!-- Unique -->
-<tr><td><?php echo $langs->trans("Unique"); ?></td><td class="valeur"><input id="unique" type="checkbox" name="unique"<?php echo ($unique?' checked':''); ?>></td></tr>
+<tr class="extra_unique"><td><?php echo $langs->trans("Unique"); ?></td><td class="valeur"><input id="unique" type="checkbox" name="unique"<?php echo ($unique?' checked':''); ?>></td></tr>
 <!-- Required -->
-<tr><td><?php echo $langs->trans("Required"); ?></td><td class="valeur"><input id="required" type="checkbox" name="required"<?php echo ($required?' checked':''); ?>></td></tr>
+<tr class="extra_required"><td><?php echo $langs->trans("Required"); ?></td><td class="valeur"><input id="required" type="checkbox" name="required"<?php echo ($required?' checked':''); ?>></td></tr>
 <!-- Always editable -->
-<tr><td><?php echo $langs->trans("AlwaysEditable"); ?></td><td class="valeur"><input id="alwayseditable" type="checkbox" name="alwayseditable"<?php echo ($alwayseditable?' checked':''); ?>></td></tr>
+<tr class="extra_alwayseditable"><td><?php echo $langs->trans("AlwaysEditable"); ?></td><td class="valeur"><input id="alwayseditable" type="checkbox" name="alwayseditable"<?php echo ($alwayseditable?' checked':''); ?>></td></tr>
 <!-- Is visible or not -->
 <?php if (! empty($conf->global->MAIN_CAN_HIDE_EXTRAFIELDS)) { ?>
     <tr><td><?php echo $langs->trans("Hidden"); ?></td><td class="valeur"><input id="ishidden" type="checkbox" name="ishidden"<?php echo ($ishidden ?' checked':''); ?>></td></tr>
diff --git a/htdocs/core/tpl/admin_extrafields_view.tpl.php b/htdocs/core/tpl/admin_extrafields_view.tpl.php
index 3242a388a3d..a6d7e735735 100644
--- a/htdocs/core/tpl/admin_extrafields_view.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_view.tpl.php
@@ -37,12 +37,15 @@ print '<div class="div-table-responsive">';
 print '<table summary="listofattributes" class="noborder" width="100%">';
 
 print '<tr class="liste_titre">';
-print '<td align="left">'.$langs->trans("Position").'</td>';
+print '<td align="left">'.$langs->trans("Position");
+print '<span class="nowrap"><img src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/1downarrow.png" alt="" title="A-Z" class="imgdown"></span>';
+print '</td>';
 print '<td>'.$langs->trans("Label").'</td>';
 print '<td>'.$langs->trans("AttributeCode").'</td>';
 print '<td>'.$langs->trans("Type").'</td>';
 print '<td align="right">'.$langs->trans("Size").'</td>';
 print '<td align="center">'.$langs->trans("Unique").'</td>';
+print '<td>'.$langs->trans("ComputedFormula").'</td>';
 print '<td align="center">'.$langs->trans("Required").'</td>';
 print '<td align="center">'.$langs->trans("AlwaysEditable").'</td>';
 if (! empty($conf->global->MAIN_CAN_HIDE_EXTRAFIELDS)) print '<td align="center">'.$langs->trans("Hidden").'</td>';
@@ -61,6 +64,7 @@ if (count($extrafields->attribute_type))
         print "<td>".$type2label[$extrafields->attribute_type[$key]]."</td>\n";
         print '<td align="right">'.$extrafields->attribute_size[$key]."</td>\n";
         print '<td align="center">'.yn($extrafields->attribute_unique[$key])."</td>\n";
+        print '<td>'.dol_trunc($extrafields->attribute_computed[$key], 20)."</td>\n";
         print '<td align="center">'.yn($extrafields->attribute_required[$key])."</td>\n";
         print '<td align="center">'.yn($extrafields->attribute_alwayseditable[$key])."</td>\n";
     	if (! empty($conf->global->MAIN_CAN_HIDE_EXTRAFIELDS)) print '<td align="center">'.yn($extrafields->attribute_hidden[$key])."</td>\n";	// Add hidden option on not working feature. Why hide if user can't see it.
diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index 6c71f279867..f7ed5b7575b 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -34,6 +34,10 @@
 -- VMYSQL4.3 ALTER TABLE llx_opensurvey_sondage MODIFY COLUMN date_fin DATETIME NULL DEFAULT NULL;
 -- VPGSQL8.2 ALTER TABLE llx_opensurvey_sondage ALTER COLUMN date_fin DROP NOT NULL;
 
+
+ALTER TABLE llx_extrafields ADD COLUMN fieldcomputed text;
+ALTER TABLE llx_extrafields ADD COLUMN fielddefault varchar(255);
+
 ALTER TABLE llx_opensurvey_sondage MODIFY COLUMN tms timestamp DEFAULT CURRENT_TIMESTAMP;
 
 ALTER TABLE llx_opensurvey_sondage ADD COLUMN fk_user_creat integer NOT NULL DEFAULT 0;
@@ -251,7 +255,6 @@ ALTER TABLE llx_product_fournisseur_price_log ADD COLUMN multicurrency_tx	     d
 ALTER TABLE llx_product_fournisseur_price_log ADD COLUMN multicurrency_price	 double(24,8) DEFAULT NULL;
 ALTER TABLE llx_product_fournisseur_price_log ADD COLUMN multicurrency_price_ttc double(24,8) DEFAULT NULL;
 
-
 create table llx_payment_various
 (
   rowid                 integer AUTO_INCREMENT PRIMARY KEY,
diff --git a/htdocs/install/mysql/tables/llx_extrafields.sql b/htdocs/install/mysql/tables/llx_extrafields.sql
index 2cc144db092..aee51524e6f 100644
--- a/htdocs/install/mysql/tables/llx_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_extrafields.sql
@@ -21,12 +21,14 @@ create table llx_extrafields
 (
 	rowid           integer AUTO_INCREMENT PRIMARY KEY,
 	name            varchar(64) NOT NULL,         				-- name of field into extrafields tables
-	entity          integer DEFAULT 1 NOT NULL,				-- multi company id
-    elementtype     varchar(64) NOT NULL DEFAULT 'member',	-- for which element this extra fields is for
+	entity          integer DEFAULT 1 NOT NULL,					-- multi company id
+    elementtype     varchar(64) NOT NULL DEFAULT 'member',		-- for which element this extra fields is for
 	tms             timestamp,									-- date of last update
 	label           varchar(255) NOT NULL,        				-- label to show for attribute
 	type            varchar(8),
 	size            varchar(8) DEFAULT NULL,
+	fieldcomputed   text,
+	fielddefault    varchar(255),
 	fieldunique     integer DEFAULT 0,
 	fieldrequired   integer DEFAULT 0,
 	perms			varchar(255),								-- not used yet
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index d25a97c28e5..fe547931908 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -375,19 +375,21 @@ Int=Integer
 Float=Float
 DateAndTime=Date and hour
 Unique=Unique
-Boolean=Boolean (Checkbox)
+Boolean=Boolean (one checkbox)
 ExtrafieldPhone = Phone
 ExtrafieldPrice = Price
 ExtrafieldMail = Email
 ExtrafieldUrl = Url
 ExtrafieldSelect = Select list
 ExtrafieldSelectList = Select from table
-ExtrafieldSeparator=Separator
+ExtrafieldSeparator=Separator (not a field)
 ExtrafieldPassword=Password
-ExtrafieldCheckBox=Checkbox
-ExtrafieldRadio=Radio button
-ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldRadio=Radio buttons (on choice only)
+ExtrafieldCheckBox=Checkboxes
+ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=Link to an object
+ComputedFormula=Computed field
+ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 5 ? round($object->id / 2, 2) : ($object->id + 2*$user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref : 'Parent project not found'<br><br>Other example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id : ($obj->rowid ? $obj->rowid : $object->id)) > 0)) ? round($reloadedobj->capital / 5) : '-1'
 ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 77b5af78f81..a170bc3f6e1 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -773,6 +773,7 @@ BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
 HR=HR
 HRAndBank=HR and Bank
+AutomaticallyCalculated=Automatically calculated
 # Week day
 Monday=Monday
 Tuesday=Tuesday
diff --git a/htdocs/modulebuilder/skeletons/skeleton_list.php b/htdocs/modulebuilder/skeletons/skeleton_list.php
index 9c258162759..47aeda79fdc 100644
--- a/htdocs/modulebuilder/skeletons/skeleton_list.php
+++ b/htdocs/modulebuilder/skeletons/skeleton_list.php
@@ -126,13 +126,7 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
 }
 
 
-// Load object if id or ref is provided as parameter
 $object=new Skeleton_Class($db);
-if (($id > 0 || ! empty($ref)) && $action != 'add')
-{
-	$result=$object->fetch($id,$ref);
-	if ($result < 0) dol_print_error($db);
-}
 
 
 
@@ -354,7 +348,9 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
        if (! empty($arrayfields["ef.".$key]['checked'])) 
        {
 			$align=$extrafields->getAlignFlag($key);
-			print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+			$sortonfield = "ef.".$key;
+			if (! empty($extrafields->attribute_computed[$key])) $sortonfield='';
+			print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],$sortonfield,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
        }
    }
 }
@@ -383,7 +379,7 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
             $align=$extrafields->getAlignFlag($key);
             $typeofextrafield=$extrafields->attribute_type[$key];
             print '<td class="liste_titre'.($align?' '.$align:'').'">';
-        	if (in_array($typeofextrafield, array('varchar', 'int', 'double', 'select')))
+        	if (in_array($typeofextrafield, array('varchar', 'int', 'double', 'select')) && empty($extrafields->attribute_computed[$key]))
 			{
 			    $crit=$val;
 				$tmpkey=preg_replace('/search_options_/','',$key);
@@ -427,6 +423,14 @@ print '</td>';
 print '</tr>'."\n";
     
 
+// Detect if we need a fetch on each output line
+$needToFetchEachLine=0;
+foreach ($extrafields->attribute_computed as $key => $val)
+{
+    if (preg_match('/\$object/',$val)) $needToFetchEachLine++;  // There is at least one compute field that use $object
+}
+
+
 $i=0;
 $totalarray=array();
 while ($i < min($num, $limit))
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index 6230626a320..b327573e3db 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -141,6 +141,8 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
    }
 }
 
+$object = new Project($db);
+
 
 /*
  * Actions
@@ -200,7 +202,6 @@ if (empty($reshook))
  * View
  */
 
-$projectstatic = new Project($db);
 $socstatic = new Societe($db);
 $form = new Form($db);
 $formother = new FormOther($db);
@@ -212,12 +213,12 @@ $title=$langs->trans("Projects");
 
 // Get list of project id allowed to user (in a string list separated by coma)
 $projectsListId='';
-if (! $user->rights->projet->all->lire) $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,0,1,$socid);
+if (! $user->rights->projet->all->lire) $projectsListId = $object->getProjectsAuthorizedForUser($user,0,1,$socid);
 
 // Get id of types of contacts for projects (This list never contains a lot of elements)
 $listofprojectcontacttype=array();
 $sql = "SELECT ctc.rowid, ctc.code FROM ".MAIN_DB_PREFIX."c_type_contact as ctc";
-$sql.= " WHERE ctc.element = '" . $projectstatic->element . "'";
+$sql.= " WHERE ctc.element = '" . $object->element . "'";
 $sql.= " AND ctc.source = 'internal'";
 $resql = $db->query($sql);
 if ($resql)
@@ -232,7 +233,7 @@ if (count($listofprojectcontacttype) == 0) $listofprojectcontacttype[0]='0';
 
 
 $distinct='DISTINCT';   // We add distinct until we are added a protection to be sure a contact of a project and task is only once.
-$sql = "SELECT ".$distinct." p.rowid as projectid, p.ref, p.title, p.fk_statut, p.fk_opp_status, p.public, p.fk_user_creat";
+$sql = "SELECT ".$distinct." p.rowid as id, p.ref, p.title, p.fk_statut, p.fk_opp_status, p.public, p.fk_user_creat";
 $sql.= ", p.datec as date_creation, p.dateo as date_start, p.datee as date_end, p.opp_amount, p.opp_percent, p.tms as date_update, p.budget_amount";
 $sql.= ", s.nom as name, s.rowid as socid";
 $sql.= ", cls.code as opp_status_code";
@@ -360,8 +361,7 @@ $arrayofselected=is_array($toselect)?$toselect:array();
 if ($num == 1 && ! empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all)
 {
     $obj = $db->fetch_object($resql);
-    $id = $obj->projectid;
-    header("Location: ".DOL_URL_ROOT.'/projet/card.php?id='.$id);
+    header("Location: ".DOL_URL_ROOT.'/projet/card.php?id='.$obj->id);
     exit;
 }
 
@@ -566,7 +566,7 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
             $align=$extrafields->getAlignFlag($key);
             $typeofextrafield=$extrafields->attribute_type[$key];
             print '<td class="liste_titre'.($align?' '.$align:'').'">';
-        	if (in_array($typeofextrafield, array('varchar', 'int', 'double', 'select')))
+        	if (in_array($typeofextrafield, array('varchar', 'int', 'double', 'select')) && empty($extrafields->attribute_computed[$key]))
 			{
 			    $crit=$val;
 				$tmpkey=preg_replace('/search_options_/','',$key);
@@ -599,7 +599,7 @@ if (! empty($arrayfields['p.fk_statut']['checked']))
 {
 	print '<td class="liste_titre nowrap" align="right">';
     $arrayofstatus = array();
-    foreach($projectstatic->statuts_short as $key => $val) $arrayofstatus[$key]=$langs->trans($val);
+    foreach($object->statuts_short as $key => $val) $arrayofstatus[$key]=$langs->trans($val);
     $arrayofstatus['99']=$langs->trans("NotClosed").' ('.$langs->trans('Draft').'+'.$langs->trans('Opened').')';
 	print $form->selectarray('search_status', $arrayofstatus, $search_status, 1, 0, 0, '', 0, 0, 0, '', 'maxwidth100');
     print '</td>';
@@ -632,7 +632,9 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
         if (! empty($arrayfields["ef.".$key]['checked']))
         {
             $align=$extrafields->getAlignFlag($key);
-            print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+            $sortonfield = "ef.".$key;
+            if (! empty($extrafields->attribute_computed[$key])) $sortonfield='';
+            print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],$sortonfield,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
         }
     }
 }
@@ -652,15 +654,15 @@ while ($i < min($num,$limit))
 {
 	$obj = $db->fetch_object($resql);
 
-	$projectstatic->id = $obj->projectid;
-	$projectstatic->user_author_id = $obj->fk_user_creat;
-	$projectstatic->public = $obj->public;
-	$projectstatic->ref = $obj->ref;
-	$projectstatic->datee = $db->jdate($obj->date_end);
-	$projectstatic->statut = $obj->fk_statut;
-	$projectstatic->opp_status = $obj->fk_opp_status;
-	 
-	$userAccess = $projectstatic->restrictedProjectArea($user);    // why this ?
+	$object->id = $obj->id;
+	$object->user_author_id = $obj->fk_user_creat;
+	$object->public = $obj->public;
+	$object->ref = $obj->ref;
+	$object->datee = $db->jdate($obj->date_end);
+	$object->statut = $obj->fk_statut;
+	$object->opp_status = $obj->fk_opp_status;
+	
+	$userAccess = $object->restrictedProjectArea($user);    // why this ?
 	if ($userAccess >= 0)
 	{
 		print '<tr class="oddeven">';
@@ -669,8 +671,8 @@ while ($i < min($num,$limit))
     	if (! empty($arrayfields['p.ref']['checked']))
     	{
     		print '<td class="nowrap">';
-    		print $projectstatic->getNomUrl(1);
-    		if ($projectstatic->hasDelay()) print img_warning($langs->trans('Late'));
+    		print $object->getNomUrl(1);
+    		if ($object->hasDelay()) print img_warning($langs->trans('Late'));
     		print '</td>';
 		    if (! $i) $totalarray['nbfield']++;
     	}
@@ -851,8 +853,7 @@ while ($i < min($num,$limit))
 		// Status
 		if (! empty($arrayfields['p.fk_statut']['checked']))
 		{
-    		$projectstatic->statut = $obj->fk_statut;
-    		print '<td align="right">'.$projectstatic->getLibStatut(5).'</td>';
+    		print '<td align="right">'.$object->getLibStatut(5).'</td>';
 			if (! $i) $totalarray['nbfield']++;
 		}
         // Action column
@@ -860,8 +861,8 @@ while ($i < min($num,$limit))
         if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
         {
             $selected=0;
-    		if (in_array($obj->projectid, $arrayofselected)) $selected=1;
-    		print '<input id="cb'.$obj->projectid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->projectid.'"'.($selected?' checked="checked"':'').'>';
+    		if (in_array($obj->id, $arrayofselected)) $selected=1;
+    		print '<input id="cb'.$obj->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->id.'"'.($selected?' checked="checked"':'').'>';
         }
         print '</td>';
 		if (! $i) $totalarray['nbfield']++;
@@ -871,7 +872,6 @@ while ($i < min($num,$limit))
 	}
 
 	$i++;
-
 }
 
 // Show total line
diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php
index 1f2459e85db..4e31434dbc4 100644
--- a/htdocs/projet/tasks/list.php
+++ b/htdocs/projet/tasks/list.php
@@ -131,6 +131,8 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
     }
 }
 
+$object = new Task($db);
+
 
 /*
  * Actions
@@ -190,11 +192,11 @@ if (empty($search_projectstatus) && $search_projectstatus == '') $search_project
  * View
  */
 
+$now = dol_now();
 $form=new Form($db);
 $formother=new FormOther($db);
 $socstatic=new Societe($db);
 $projectstatic = new Project($db);
-$taskstatic = new Task($db);
 $puser=new User($db);
 $tuser=new User($db);
 if ($search_project_user > 0) $puser->fetch($search_project_user);
@@ -231,7 +233,7 @@ if (count($listofprojectcontacttype) == 0) $listofprojectcontacttype[0]='0';
 // Get id of types of contacts for tasks (This list never contains a lot of elements)
 $listoftaskcontacttype=array();
 $sql = "SELECT ctc.rowid, ctc.code FROM ".MAIN_DB_PREFIX."c_type_contact as ctc";
-$sql.= " WHERE ctc.element = '" . $taskstatic->element . "'";
+$sql.= " WHERE ctc.element = '" . $object->element . "'";
 $sql.= " AND ctc.source = 'internal'";
 $resql = $db->query($sql);
 if ($resql)
@@ -549,7 +551,7 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
             $align=$extrafields->getAlignFlag($key);
             $typeofextrafield=$extrafields->attribute_type[$key];
             print '<td class="liste_titre'.($align?' '.$align:'').'">';
-        	if (in_array($typeofextrafield, array('varchar', 'int', 'double', 'select')))
+        	if (in_array($typeofextrafield, array('varchar', 'int', 'double', 'select')) && empty($extrafields->attribute_computed[$key]))
 			{
 			    $crit=$val;
 				$tmpkey=preg_replace('/search_options_/','',$key);
@@ -606,7 +608,9 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
         if (! empty($arrayfields["ef.".$key]['checked']))
         {
             $align=$extrafields->getAlignFlag($key);
-            print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+            $sortonfield = "ef.".$key;
+            if (! empty($extrafields->attribute_computed[$key])) $sortonfield='';
+            print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],$sortonfield,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
         }
     }
 }
@@ -624,14 +628,21 @@ $plannedworkloadoutputformat='allhourmin';
 $timespentoutputformat='allhourmin';
 if (! empty($conf->global->PROJECT_PLANNED_WORKLOAD_FORMAT)) $plannedworkloadoutputformat=$conf->global->PROJECT_PLANNED_WORKLOAD_FORMAT;
 if (! empty($conf->global->PROJECT_TIMES_SPENT_FORMAT)) $timespentoutputformat=$conf->global->PROJECT_TIME_SPENT_FORMAT;
- 
-$now = dol_now();
+
 $i=0;
 $totalarray=array();
 while ($i < min($num,$limit))
 {
 	$obj = $db->fetch_object($resql);
 
+	$object->id = $obj->id;
+	$object->ref = $obj->ref;
+	$object->label = $obj->label;
+	$object->fk_statut = $obj->fk_statut;
+	$object->progress = $obj->progress;
+	$object->datee = $db->jdate($obj->date_end);	// deprecated
+	$object->date_end = $db->jdate($obj->date_end);
+
 	$projectstatic->id = $obj->projectid;
 	$projectstatic->ref = $obj->projectref;
 	$projectstatic->title = $obj->projecttitle;
@@ -639,14 +650,6 @@ while ($i < min($num,$limit))
 	$projectstatic->statut = $obj->projectstatus;
 	$projectstatic->datee = $db->jdate($obj->projectdatee);
 	
-	$taskstatic->id = $obj->id;
-	$taskstatic->ref = $obj->ref;
-	$taskstatic->label = $obj->label;
-	$taskstatic->fk_statut = $obj->fk_statut;
-	$taskstatic->progress = $obj->progress;
-	$taskstatic->datee = $db->jdate($obj->date_end);	// deprecated
-	$taskstatic->date_end = $db->jdate($obj->date_end);
-	
 	$userAccess = $projectstatic->restrictedProjectArea($user);    // why this ?
 	if ($userAccess >= 0)
 	{
@@ -656,8 +659,8 @@ while ($i < min($num,$limit))
     	if (! empty($arrayfields['t.ref']['checked']))
     	{
     	    print '<td>';
-    	    print $taskstatic->getNomUrl(1,'withproject');
-    		if ($taskstatic->hasDelay()) print img_warning("Late");
+    	    print $object->getNomUrl(1,'withproject');
+    		if ($object->hasDelay()) print img_warning("Late");
     	    print '</td>';
 		    if (! $i) $totalarray['nbfield']++;
     	}        	 
@@ -665,7 +668,7 @@ while ($i < min($num,$limit))
     	if (! empty($arrayfields['t.label']['checked']))
     	{
     	    print '<td>';
-    	    print $taskstatic->label;
+    	    print $object->label;
     	    print '</td>';
 		    if (! $i) $totalarray['nbfield']++;
     	}
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 995c16719cb..ebd06dbd5c4 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -389,8 +389,6 @@ class Societe extends CommonObject
         $this->forme_juridique_code  = 0;
         $this->tva_assuj = 1;
         $this->status = 1;
-
-        return 1;
     }
 
 
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 48e1b67a69c..51d4b41e6bb 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -831,7 +831,7 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
             $align=$extrafields->getAlignFlag($key);
             $typeofextrafield=$extrafields->attribute_type[$key];
             print '<td class="liste_titre'.($align?' '.$align:'').'">';
-		    if (in_array($typeofextrafield, array('varchar', 'int', 'double', 'select')))
+		    if (in_array($typeofextrafield, array('varchar', 'int', 'double', 'select')) && empty($extrafields->attribute_computed[$key]))
 			{
 			    $crit=$val;
 				$tmpkey=preg_replace('/search_options_/','',$key);
@@ -907,7 +907,9 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
         if (! empty($arrayfields["ef.".$key]['checked']))
         {
             $align=$extrafields->getAlignFlag($key);
-            print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+            $sortonfield = "ef.".$key;
+            if (! empty($extrafields->attribute_computed[$key])) $sortonfield='';
+            print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],$sortonfield,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
         }
     }
 }

From ba7e75417409e7103fbc5c7cfb5c5f76c11d9b81 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Thu, 25 May 2017 05:32:13 +0200
Subject: [PATCH 475/505] Remove old code (journal)

---
 htdocs/accountancy/admin/journal.php    | 207 ------------------------
 htdocs/accountancy/bookkeeping/list.php |   1 -
 htdocs/core/lib/accounting.lib.php      |  48 +-----
 3 files changed, 7 insertions(+), 249 deletions(-)
 delete mode 100644 htdocs/accountancy/admin/journal.php

diff --git a/htdocs/accountancy/admin/journal.php b/htdocs/accountancy/admin/journal.php
deleted file mode 100644
index 8e19a3e3e87..00000000000
--- a/htdocs/accountancy/admin/journal.php
+++ /dev/null
@@ -1,207 +0,0 @@
-<?php
-/* Copyright (C) 2013-2014 Olivier Geffroy      <jeff@jeffinfo.com>
- * Copyright (C) 2013-2017 Alexandre Spangaro	<aspangaro@zendsi.com>
- * Copyright (C) 2014 	   Florian Henry		<florian.henry@open-concept.pro>
- * Copyright (C) 2014      Marcos García        <marcosgdf@gmail.com>
- * Copyright (C) 2014	   Juanjo Menent		<jmenent@2byte.es>
- * Copyright (C) 2015      Jean-François Ferry  <jfefe@aternatik.fr>
- * Copyright (C) 2016      Laurent Destailleur 	<eldy@users.sourceforge.net>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-/**
- * \file		htdocs/accountancy/admin/journal.php
-* \ingroup		Advanced accountancy
-* \brief		Setup page to configure accounting expert module
-*/
-require '../../main.inc.php';
-
-// Class
-require_once DOL_DOCUMENT_ROOT . '/core/lib/admin.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/bank.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/compta/bank/class/account.class.php';
-
-$langs->load("compta");
-$langs->load("bills");
-$langs->load("admin");
-$langs->load("accountancy");
-$langs->load("salaries");
-
-// Security check
-if (empty($user->admin) || ! empty($user->rights->accountancy->chartofaccount))
-{
-    accessforbidden();
-}
-
-$action = GETPOST('action', 'alpha');
-
-// Other parameters ACCOUNTING_*
-$list = array (
-		'ACCOUNTING_SELL_JOURNAL',
-		'ACCOUNTING_PURCHASE_JOURNAL',
-		'ACCOUNTING_SOCIAL_JOURNAL',
-		'ACCOUNTING_MISCELLANEOUS_JOURNAL',
-		'ACCOUNTING_EXPENSEREPORT_JOURNAL'
-);
-
-/*
- * Actions
-*/
-
-if ($action == 'update') {
-	$error = 0;
-
-	// Save vars
-	foreach ($list as $constname)
-	{
-		$constvalue = GETPOST($constname, 'alpha');
-
-		if (! dolibarr_set_const($db, $constname, $constvalue, 'chaine', 0, '', $conf->entity)) {
-			$error ++;
-		}
-	}
-
-	// Save bank account journals
-	$arrayofbankaccount = GETPOST('bank_account', 'array');
-	foreach($arrayofbankaccount as $key => $code)
-	{
-		$bankaccount = new Account($db);
-		$res = $bankaccount->fetch($key);
-		if ($res > 0)
-		{
-			$bankaccount->accountancy_journal = $code;
-			$bankaccount->update($user);
-		}
-		else
-		{
-			$error++;
-			break;
-		}
-	}
-
-	if (! $error) {
-		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	} else {
-		setEventMessages($langs->trans("Error"), null, 'errors');
-	}
-}
-
-/*
- * View
-*/
-
-llxHeader();
-
-$form = new Form($db);
-
-$linkback = '<a href="' . DOL_URL_ROOT . '/admin/modules.php">' . $langs->trans("BackToModuleList") . '</a>';
-print load_fiche_titre($langs->trans('ConfigAccountingExpert'), $linkback, 'title_setup');
-
-$head = admin_accounting_prepare_head(null);
-
-print '<form action="' . $_SERVER["PHP_SELF"] . '" method="post">';
-print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
-print '<input type="hidden" name="action" value="update">';
-
-dol_fiche_head($head, 'journal', $langs->trans("Configuration"), 0, 'cron');
-
-print '<table class="noborder" width="100%">';
-print '<tr class="liste_titre">';
-print '<td colspan="2">' . $langs->trans('Journaux') . '</td>';
-print "</tr>\n";
-
-foreach ( $list as $key ) {
-
-	print '<tr class="oddeven value">';
-
-	// Param
-	$label = $langs->trans($key);
-	print '<td width="50%"><label for="' . $key . '">' . $label . '</label></td>';
-
-	// Value
-	print '<td>';
-	print '<input type="text" size="20" id="' . $key . '" name="' . $key . '" value="' . $conf->global->$key . '">';
-	print '</td></tr>';
-}
-
-print "</table>\n";
-
-print '<br>';
-
-print '<table class="noborder" width="100%">';
-print '<tr class="liste_titre">';
-print '<td colspan="2">' . $langs->trans('JournalFinancial') . ' ('.$langs->trans('Opened').')</td>';
-print "</tr>\n";
-
-// Bank account
-$sql = "SELECT rowid, ref, label, number, account_number, accountancy_journal";
-$sql .= " FROM " . MAIN_DB_PREFIX . "bank_account";
-$sql .= " WHERE entity = " . $conf->entity;
-$sql .= " AND clos = 0";
-$sql .= " ORDER BY label";
-
-$resql = $db->query($sql);
-if ($resql) {
-	$numr = $db->num_rows($resql);
-	$i = 0;
-
-	if ($numr > 0)
-
-		$bankaccountstatic = new Account($db);
-
-	while ( $i < $numr ) {
-		$objp = $db->fetch_object($resql);
-
-		$bankaccountstatic->rowid = $objp->rowid;
-		$bankaccountstatic->id = $objp->rowid;
-		$bankaccountstatic->ref = $objp->ref;
-		$bankaccountstatic->label = $objp->label;
-		$bankaccountstatic->number = $objp->number;
-		$bankaccountstatic->account_number = $objp->account_number;
-		$bankaccountstatic->accountancy_journal = $objp->accountancy_journal;
-
-		print '<tr class="oddeven value">';
-
-		// Param
-		print '<td width="50%"><label for="' . $objp->rowid . '">' . $langs->trans("Journal");
-		print ' - '.$bankaccountstatic->getNomUrl(1);
-		print '</label></td>';
-
-		// Value
-		print '<td>';
-		print '<input type="text" size="20" id="' . $objp->rowid . '" name="bank_account['.$objp->rowid.']" value="' . $objp->accountancy_journal . '">';
-		print '</td></tr>';
-
-		$i ++;
-	}
-	$db->free($resql);
-}
-else
-{
-	dol_print_error($db);
-}
-
-print "</table>\n";
-
-dol_fiche_end();
-
-print '<div class="center"><input type="submit" class="button" value="' . $langs->trans('Modify') . '" name="button"></div>';
-
-print '</form>';
-
-llxFooter();
-$db->close();
\ No newline at end of file
diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index 0c49ac0e1ba..72385bab746 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -292,7 +292,6 @@ $title_page = $langs->trans("Bookkeeping");
 llxHeader('', $title_page);
 
 // List
-
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 	$nbtotalofrecords = $object->fetchAll($sortorder, $sortfield, 0, 0, $filter);
diff --git a/htdocs/core/lib/accounting.lib.php b/htdocs/core/lib/accounting.lib.php
index c8863ce8f61..7952c0eda7d 100644
--- a/htdocs/core/lib/accounting.lib.php
+++ b/htdocs/core/lib/accounting.lib.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2013-2014 Olivier Geffroy      <jeff@jeffinfo.com>
  * Copyright (C) 2013-2017 Alexandre Spangaro   <aspangaro.dolibarr@gmail.com>
- * Copyright (C) 2014 	   Florian Henry        <florian.henry@open-concept.pro>
+ * Copyright (C) 2014      Florian Henry        <florian.henry@open-concept.pro>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,7 +27,7 @@
  *	Prepare array with list of admin tabs
  *
  *	@param	AccountingAccount	$object		Object instance we show card
- *	@return	array				Array of tabs to show
+ *	@return	array							Array of tabs to show
  */
 function admin_accounting_prepare_head(AccountingAccount $object=null)
 {
@@ -41,11 +41,6 @@ function admin_accounting_prepare_head(AccountingAccount $object=null)
 	$head[$h][2] = 'general';
 	$h ++;
 
-	$head[$h][0] = DOL_URL_ROOT.'/accountancy/admin/journals.php';
-	$head[$h][1] = $langs->trans("Journaux");
-	$head[$h][2] = 'journal';
-	$h ++;
-
 	$head[$h][0] = DOL_URL_ROOT.'/accountancy/admin/export.php';
 	$head[$h][1] = $langs->trans("ExportOptions");
 	$head[$h][2] = 'export';
@@ -91,35 +86,6 @@ function accounting_prepare_head(AccountingAccount $object)
 	return $head;
 }
 
-/**
- *	Prepare array with list of tabs
- *
- *	@param	AccountingAccount	$object		Accounting account
- *	@return	array				Array of tabs to show
- */
-function accounting_journal_prepare_head(AccountingJournal $object)
-{
-	global $langs, $conf;
-
-	$h = 0;
-	$head = array ();
-
-	$head[$h][0] = DOL_URL_ROOT.'/accountancy/admin/journals_card.php?id=' . $object->id;
-	$head[$h][1] = $langs->trans("Card");
-	$head[$h][2] = 'card';
-	$h ++;
-
-	// Show more tabs from modules
-	// Entries must be declared in modules descriptor with line
-	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab
-	// $this->tabs = array('entity:-tabname); to remove a tab
-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'accounting_journal');
-
-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'accounting_journal', 'remove');
-
-	return $head;
-}
-
 /**
  * Return accounting account without zero on the right
  *
@@ -129,7 +95,7 @@ function accounting_journal_prepare_head(AccountingJournal $object)
 function clean_account($account)
 {
 	$account = rtrim($account,"0");
-	
+
 	return $account;
 }
 
@@ -144,9 +110,9 @@ function length_accountg($account)
 	global $conf;
 
 	if ($account < 0 || empty($account)) return '';
-	
+
 	if (! empty($conf->global->ACCOUNTING_MANAGE_ZERO)) return $account;
-	
+
 	$g = $conf->global->ACCOUNTING_LENGTH_GACCOUNT;
 	if (! empty($g)) {
 		// Clean parameters
@@ -179,9 +145,9 @@ function length_accounta($accounta)
 	global $conf, $langs;
 
 	if ($accounta < 0 || empty($accounta)) return '';
-	
+
 	if (! empty($conf->global->ACCOUNTING_MANAGE_ZERO)) return $accounta;
-	
+
 	$a = $conf->global->ACCOUNTING_LENGTH_AACCOUNT;
 	if (! empty($a)) {
 		// Clean parameters

From a086b82f84b477ec01ce4f67884808fc911104e6 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Thu, 25 May 2017 05:40:41 +0200
Subject: [PATCH 476/505] Removed old code (Function select_pcgtype/subtype)

---
 htdocs/accountancy/admin/card.php             | 93 +++++++++----------
 htdocs/accountancy/admin/importaccounts.php   | 21 ++---
 .../class/html.formventilation.class.php      | 91 ------------------
 3 files changed, 53 insertions(+), 152 deletions(-)

diff --git a/htdocs/accountancy/admin/card.php b/htdocs/accountancy/admin/card.php
index 3522460e07b..b23f5cb5421 100644
--- a/htdocs/accountancy/admin/card.php
+++ b/htdocs/accountancy/admin/card.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2013-2014 Olivier Geffroy      <jeff@jeffinfo.com>
- * Copyright (C) 2013-2016 Alexandre Spangaro   <aspangaro.dolibarr@gmail.com>
- * Copyright (C) 2014	   Florian Henry		<florian.henry@open-concept.pro>
+ * Copyright (C) 2013-2017 Alexandre Spangaro   <aspangaro.dolibarr@gmail.com>
+ * Copyright (C) 2014      Florian Henry        <florian.henry@open-concept.pro>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@
 
 /**
  * \file 		htdocs/accountancy/admin/card.php
- * \ingroup     Advanced accountancy
+ * \ingroup		Advanced accountancy
  * \brief 		Card of accounting account
  */
 
@@ -59,7 +59,7 @@ if (GETPOST('cancel'))
 	header("Location: ".$urltogo);
 	exit;
 }
-		
+
 if ($action == 'add' && $user->rights->accounting->chartofaccount)
 {
 	if (! $cancel) {
@@ -86,7 +86,7 @@ if ($action == 'add' && $user->rights->accounting->chartofaccount)
 		} else {
 			$account_parent = GETPOST('account_parent','int');
 		}
-		
+
 		$object->fk_pcg_version = $obj->pcg_version;
 		$object->pcg_type = GETPOST('pcg_type');
 		$object->pcg_subtype = GETPOST('pcg_subtype');
@@ -95,7 +95,7 @@ if ($action == 'add' && $user->rights->accounting->chartofaccount)
 		$object->account_category = GETPOST('account_category');
 		$object->label = GETPOST('label', 'alpha');
 		$object->active = 1;
-		
+
 		$res = $object->create($user);
 		if ($res == - 3) {
 			$error = 1;
@@ -124,9 +124,9 @@ if ($action == 'add' && $user->rights->accounting->chartofaccount)
 } else if ($action == 'edit' && $user->rights->accounting->chartofaccount) {
 	if (! $cancel) {
 		$result = $object->fetch($id);
-		
+
 		$sql = 'SELECT pcg_version FROM ' . MAIN_DB_PREFIX . 'accounting_system WHERE rowid=' . $conf->global->CHARTOFACCOUNTS;
-		
+
 		dol_syslog('accountancy/admin/card.php:: $sql=' . $sql);
 		$result2 = $db->query($sql);
 		$obj = $db->fetch_object($result2);
@@ -156,9 +156,9 @@ if ($action == 'add' && $user->rights->accounting->chartofaccount)
 		$object->account_parent = $account_parent;
 		$object->account_category = GETPOST('account_category');
 		$object->label = GETPOST('label', 'alpha');
-		
+
 		$result = $object->update($user);
-		
+
 		if ($result > 0) {
 		    $urltogo=$backtopage?$backtopage:($_SERVER["PHP_SELF"]."?id=".$id);
 		    header("Location: " . $urltogo);
@@ -205,13 +205,13 @@ $accountsystem->fetch($conf->global->CHARTOFACCOUNTS);
 // Create mode
 if ($action == 'create') {
 	print load_fiche_titre($langs->trans('NewAccountingAccount'));
-	
+
 	print '<form name="add" action="' . $_SERVER["PHP_SELF"] . '" method="POST">' . "\n";
 	print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
 	print '<input type="hidden" name="action" value="add">';
-	
+
 	dol_fiche_head();
-	
+
 	print '<table class="border" width="100%">';
 
 	// Chart of account
@@ -219,8 +219,7 @@ if ($action == 'create') {
 	print '<td>';
 	print $accountsystem->ref;
 	print '</td></tr>';
-	
-	
+
 	// Account number
 	print '<tr><td class="titlefieldcreate"><span class="fieldrequired">' . $langs->trans("AccountNumber") . '</span></td>';
 	print '<td><input name="account_number" size="30" value="' . $object->account_number . '"></td></tr>';
@@ -245,56 +244,54 @@ if ($action == 'create') {
 	print '<tr><td>' . $langs->trans("Pcgtype") . '</td>';
 	print '<td>';
 	print '<input type="text" name="pcg_type" value="'.dol_escape_htmltag(isset($_POST['pcg_type'])?GETPOST('pcg_type','alpha'):$object->pcg_type).'">';
-	//print $htmlacc->select_pcgtype($object->pcg_type, 'pcg_type', 1);
 	print '</td></tr>';
 
 	// Chart of acounts subtype
 	print '<tr><td>' . $langs->trans("Pcgsubtype") . '</td>';
 	print '<td>';
 	print '<input type="text" name="pcg_subtype" value="'.dol_escape_htmltag(isset($_POST['pcg_subtype'])?GETPOST('pcg_subtype','alpha'):$object->pcg_subtype).'">';
-	//print $htmlacc->select_pcgsubtype($object->pcg_subtype, 'pcg_subtype', 1);
 	print '</td></tr>';
-	
+
 	print '</table>';
-	
+
 	dol_fiche_end();
-	
+
 	print '<div class="center">';
 	print '<input class="button" type="submit" value="' . $langs->trans("Save") . '">';
 	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
 	print '<input class="button" type="submit" name="cancel" value="' . $langs->trans("Cancel") . '">';
 	print '</div>';
-	
+
 	print '</form>';
 } else if ($id) {
 	$result = $object->fetch($id);
-	
+
 	if ($result > 0) {
 		dol_htmloutput_mesg($mesg);
-		
+
 		$head = accounting_prepare_head($object);
-		
+
 		// Edit mode
 		if ($action == 'update') 
 		{
 			dol_fiche_head($head, 'card', $langs->trans('AccountAccounting'), 0, 'billr');
-			
+
 			print '<form name="update" action="' . $_SERVER["PHP_SELF"] . '" method="POST">' . "\n";
 			print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
 			print '<input type="hidden" name="action" value="edit">';
 			print '<input type="hidden" name="id" value="' . $id . '">';
 			print '<input type="hidden" name="backtopage" value="' . $backtopage . '">';
-				
+
 			print '<table class="border" width="100%">';
-			
+
 			// Account number
 			print '<tr><td class="titlefieldcreate"><span class="fieldrequired">' . $langs->trans("AccountNumber") . '</span></td>';
 			print '<td><input name="account_number" size="30" value="' . $object->account_number . '"</td></tr>';
-			
+
 			// Label
 			print '<tr><td><span class="fieldrequired">' . $langs->trans("Label") . '</span></td>';
 			print '<td><input name="label" size="70" value="' . $object->label . '"</td></tr>';
-			
+
 			// Account parent
 			print '<tr><td>' . $langs->trans("Accountparent") . '</td>';
 			print '<td>';
@@ -302,15 +299,14 @@ if ($action == 'create') {
 			print '</td></tr>';
 
 			// Category
-            print '<tr><td>'.$langs->trans("AccountingCategory").'</td>';
+			print '<tr><td>'.$langs->trans("AccountingCategory").'</td>';
 			print '<td>';
-            $formaccounting->select_accounting_category($object->account_category, 'account_category', 1);
-            print '</td></tr>';
+			$formaccounting->select_accounting_category($object->account_category, 'account_category', 1);
+			print '</td></tr>';
 
 			// Chart of accounts type
 			print '<tr><td>' . $langs->trans("Pcgtype") . '</td>';
 			print '<td>';
-			//print $htmlacc->select_pcgtype($object->pcg_type, 'pcg_type', 1);
 			print '<input type="text" name="pcg_type" value="'.dol_escape_htmltag(isset($_POST['pcg_type'])?GETPOST('pcg_type','alpha'):$object->pcg_type).'">';
 			print '</td></tr>';
 
@@ -318,29 +314,27 @@ if ($action == 'create') {
 			print '<tr><td>' . $langs->trans("Pcgsubtype") . '</td>';
 			print '<td>';
 			print '<input type="text" name="pcg_subtype" value="'.dol_escape_htmltag(isset($_POST['pcg_subtype'])?GETPOST('pcg_subtype','alpha'):$object->pcg_subtype).'">';
-			//print $htmlacc->select_pcgsubtype($object->pcg_subtype, 'pcg_subtype', 1);
 			print '</td></tr>';
-			
+
 			print '</table>';
-			
+
 			dol_fiche_end();
-			
+
 			print '<div class="center">';
 			print '<input type="submit" class="button" value="' . $langs->trans("Save") . '">';
 			print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
 			print '<input type="submit" name="cancel" class="button" value="' . $langs->trans("Cancel") . '">';
 			print '</div>';
-			
+
 			print '</form>';
 		} else {
-			
 			// View mode
 			$linkback = '<a href="../admin/account.php">' . $langs->trans("BackToChartofaccounts") . '</a>';
-			
+
 			dol_fiche_head($head, 'card', $langs->trans('AccountAccounting'), 0, 'billr');
-			
+
 			print '<table class="border" width="100%">';
-			
+
 			// Account number
 			print '<tr><td class="titlefield">' . $langs->trans("AccountNumber") . '</td>';
 			print '<td>' . $object->account_number . '</td>';
@@ -378,31 +372,30 @@ if ($action == 'create') {
 			} else {
 				print img_picto($langs->trans("Activated"), 'switch_on');
 			}*/
-			
+
 			print '</td></tr>';
-			
+
 			print '</table>';
-			
+
 			dol_fiche_end();
-			
+
 			/*
 			 * Actions buttons
 			 */
-			
 			print '<div class="tabsAction">';
-			
+
 			if (! empty($user->rights->accounting->chartofaccount)) {
 				print '<a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?action=update&id=' . $id . '">' . $langs->trans('Modify') . '</a>';
 			} else {
 				print '<a class="butActionRefused" href="#" title="' . dol_escape_htmltag($langs->trans("NotAllowed")) . '">' . $langs->trans('Modify') . '</a>';
 			}
-			
+
 			if (! empty($user->rights->accounting->chartofaccount)) {
 				print '<a class="butActionDelete" href="' . $_SERVER["PHP_SELF"] . '?action=delete&id=' . $id . '">' . $langs->trans('Delete') . '</a>';
 			} else {
 				print '<a class="butActionRefused" href="#" title="' . dol_escape_htmltag($langs->trans("NotAllowed")) . '">' . $langs->trans('Delete') . '</a>';
 			}
-			
+
 			print '</div>';
 		}
 	} else {
diff --git a/htdocs/accountancy/admin/importaccounts.php b/htdocs/accountancy/admin/importaccounts.php
index 4a6c82cb581..f4f155c0b59 100644
--- a/htdocs/accountancy/admin/importaccounts.php
+++ b/htdocs/accountancy/admin/importaccounts.php
@@ -146,36 +146,35 @@ if ($result) {
 	while ( $i < min($num_lines, $limit) ) {
 		$objp = $db->fetch_object($result);
 		print '<tr class="oddeven">';
-		
+
 		print '<td align="left">';
 		print $objp->accounting;
 		print '</td>';
-		
+
 		print '<td align="left">';
 		print '<input name="label" size="30" value="">';
 		print '</td>';
-		
+
 		// Colonne choix du compte
 		print '<td>';
 		print $htmlacc->select_account($accounting->account_parent, 'AccountParent');
 		print '</td>';
-		
+
 		print '<td>';
-		print $htmlacc->select_pcgtype($accounting->pcg_type, 'pcgType');
+		print '<input type="text" name="pcgType" value="'.dol_escape_htmltag(isset($_POST['pcg_subtype'])?GETPOST('pcg_subtype','alpha'):$accounting->pcg_type).'">';
 		print '</td>';
-		
+
 		print '<td>';
-		print $htmlacc->select_pcgsubtype($accounting->pcg_subtype, 'pcgSubType');
+		print '<input type="text" name="pcgSubType" value="'.dol_escape_htmltag(isset($_POST['pcg_subtype'])?GETPOST('pcg_subtype','alpha'):$accounting->pcg_subtype).'">';
 		print '</td>';
-		
+
 		// Colonne choix ligne a ventiler
-		
 		$checked = ('label' == 'O') ? ' checked' : '';
-		
+
 		print '<td align="center">';
 		print '<input type="checkbox" name="mesCasesCochees[]" ' . $checked . ' value="' . $objp->accounting . '"/>';
 		print '</td>';
-		
+
 		print '</tr>';
 		$i ++;
 	}
diff --git a/htdocs/accountancy/class/html.formventilation.class.php b/htdocs/accountancy/class/html.formventilation.class.php
index 112bde76038..d7a827f2480 100644
--- a/htdocs/accountancy/class/html.formventilation.class.php
+++ b/htdocs/accountancy/class/html.formventilation.class.php
@@ -151,97 +151,6 @@ class FormVentilation extends Form
 		return $out;
 	}
 
-	/**
-	 * Return list of accounts with label by class of accounts
-	 *
-	 * @param string $selectid Preselected pcg_type
-	 * @param string $htmlname Name of field in html form
-	 * @param int $showempty Add an empty field
-	 * @param array $event Event options
-	 *
-	 * @return string String with HTML select
-	 */
-	function select_pcgtype($selectid, $htmlname = 'pcg_type', $showempty = 0, $event = array()) {
-		global $conf;
-
-		$sql = "SELECT DISTINCT pcg_type ";
-		$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_account as aa";
-		$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "accounting_system as asy ON aa.fk_pcg_version = asy.pcg_version";
-		$sql .= " AND asy.rowid = " . $conf->global->CHARTOFACCOUNTS;
-		$sql .= " ORDER BY pcg_type";
-
-		dol_syslog(get_class($this) . "::select_pcgtype", LOG_DEBUG);
-		$resql = $this->db->query($sql);
-
-		if (!$resql) {
-			$this->error = "Error ".$this->db->lasterror();
-			dol_syslog(get_class($this)."::select_pcgtype ".$this->error, LOG_ERR);
-			return -1;
-		}
-
-		$options = array();
-		$out = ajax_combobox($htmlname, $event);
-
-		while ($obj = $this->db->fetch_object($resql)) 
-		{
-		    if ($obj->pcg_type != '-1')
-		    {
-                $options[$obj->pcg_type] = $obj->pcg_type;
-		    }
-		}
-
-		$out .= Form::selectarray($htmlname, $options, $selectid, $showempty, 0, 0, '', 0, 0, 0, '', 'minwidth200');
-
-		$this->db->free($resql);
-		return $out;
-	}
-
-	/**
-	 * Return list of accounts with label by sub_class of accounts
-	 *
-	 * @param string $selectid Preselected pcg_type
-	 * @param string $htmlname Name of field in html form
-	 * @param int $showempty Add an empty field
-	 * @param array $event Event options
-	 *
-	 * @return string String with HTML select
-	 */
-	function select_pcgsubtype($selectid, $htmlname = 'pcg_subtype', $showempty = 0, $event = array()) 
-	{
-		global $conf;
-
-		$sql = "SELECT DISTINCT pcg_subtype ";
-		$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_account as aa";
-		$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "accounting_system as asy ON aa.fk_pcg_version = asy.pcg_version";
-		$sql .= " AND asy.rowid = " . $conf->global->CHARTOFACCOUNTS;
-		$sql .= " ORDER BY pcg_subtype";
-
-		dol_syslog(get_class($this) . "::select_pcgsubtype", LOG_DEBUG);
-		$resql = $this->db->query($sql);
-
-		if (!$resql) {
-			$this->error = "Error ".$this->db->lasterror();
-			dol_syslog(get_class($this)."::select_pcgsubtype ".$this->error, LOG_ERR);
-			return -1;
-		}
-
-		$options = array();
-		$out = ajax_combobox($htmlname, $event);
-
-		while ($obj = $this->db->fetch_object($resql)) 
-		{
-		    if ($obj->pcg_type != '-1')
-		    {
-                $options[$obj->pcg_subtype] = $obj->pcg_subtype;
-		    }
-		}
-
-		$out .= Form::selectarray($htmlname, $options, $selectid, $showempty, 0, 0, '', 0, 0, 0, '', 'minwidth200');
-
-		$this->db->free($resql);
-		return $out;
-	}
-
 	/**
 	 * Return list of auxilary thirdparty accounts
 	 *

From 1f079fac9d92bd8baabad8a947f849c6acc36c4e Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Thu, 25 May 2017 06:57:28 +0200
Subject: [PATCH 477/505] Move html.formventilation.class.php to
 html.formaccounting.class.php

---
 htdocs/accountancy/admin/account.php          |   1 -
 htdocs/accountancy/admin/accountmodel.php     |   8 +-
 htdocs/accountancy/admin/card.php             |   6 +-
 htdocs/accountancy/admin/categories_list.php  |   6 +-
 htdocs/accountancy/admin/defaultaccounts.php  |   6 +-
 htdocs/accountancy/admin/importaccounts.php   |  33 +-
 htdocs/accountancy/admin/index.php            |  15 +-
 htdocs/accountancy/admin/productaccount.php   |   4 +-
 htdocs/accountancy/bookkeeping/balance.php    |   8 +-
 htdocs/accountancy/bookkeeping/card.php       |  12 +-
 htdocs/accountancy/bookkeeping/list.php       |  18 +-
 .../accountancy/bookkeeping/listbyaccount.php |   6 +-
 htdocs/accountancy/bookkeeping/listbyyear.php |  12 +-
 .../class/html.formventilation.class.php      | 292 ------------------
 htdocs/accountancy/customer/card.php          |  38 ++-
 htdocs/accountancy/customer/lines.php         |  34 +-
 htdocs/accountancy/customer/list.php          |  43 ++-
 htdocs/accountancy/expensereport/card.php     |   6 +-
 htdocs/accountancy/expensereport/lines.php    |   6 +-
 htdocs/accountancy/expensereport/list.php     |   6 +-
 htdocs/accountancy/supplier/card.php          |  36 +--
 htdocs/accountancy/supplier/lines.php         |  10 +-
 htdocs/accountancy/supplier/list.php          |  39 ++-
 htdocs/admin/dict.php                         |   6 +-
 htdocs/admin/loan.php                         |   8 +-
 htdocs/admin/mails_templates.php              |   4 +-
 htdocs/admin/salaries.php                     |   6 +-
 htdocs/admin/taxes.php                        |   6 +-
 htdocs/compta/bank/card.php                   |  31 +-
 htdocs/compta/bank/various_payment/card.php   |   8 +-
 .../core/class/html.formaccounting.class.php  | 264 +++++++++++++++-
 htdocs/don/admin/donation.php                 |  18 +-
 htdocs/loan/card.php                          |  18 +-
 htdocs/product/card.php                       |  14 +-
 34 files changed, 490 insertions(+), 538 deletions(-)
 delete mode 100644 htdocs/accountancy/class/html.formventilation.class.php

diff --git a/htdocs/accountancy/admin/account.php b/htdocs/accountancy/admin/account.php
index d3556135972..62e35fa0f57 100644
--- a/htdocs/accountancy/admin/account.php
+++ b/htdocs/accountancy/admin/account.php
@@ -27,7 +27,6 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php';
-require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
 
 // Langs
 $langs->load("compta");
diff --git a/htdocs/accountancy/admin/accountmodel.php b/htdocs/accountancy/admin/accountmodel.php
index 55c194cd416..ca26c35c442 100644
--- a/htdocs/accountancy/admin/accountmodel.php
+++ b/htdocs/accountancy/admin/accountmodel.php
@@ -39,7 +39,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
-if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
+if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
 
 $langs->load("errors");
 $langs->load("admin");
@@ -1258,8 +1258,8 @@ function fieldListAccountModel($fieldlist, $obj='', $tabname='', $context='')
 
 	$formadmin = new FormAdmin($db);
 	$formcompany = new FormCompany($db);
-	$formaccountancy = new FormVentilation($db);
-	
+	$formaccounting = new FormAccounting($db);
+
 	foreach ($fieldlist as $field => $value)
 	{
 		if ($fieldlist[$field] == 'country')
@@ -1400,7 +1400,7 @@ function fieldListAccountModel($fieldlist, $obj='', $tabname='', $context='')
 			if (! empty($conf->accounting->enabled))
 			{
 				$accountancy_account = (! empty($obj->$fieldlist[$field]) ? $obj->$fieldlist[$field] : 0);
-				print $formaccountancy->select_account($accountancy_account, $fieldlist[$field], 1, '', 1, 1, 'maxwidth200 maxwidthonsmartphone');
+				print $formaccounting->select_account($accountancy_account, $fieldlist[$field], 1, '', 1, 1, 'maxwidth200 maxwidthonsmartphone');
 			}
 			else
 			{
diff --git a/htdocs/accountancy/admin/card.php b/htdocs/accountancy/admin/card.php
index b23f5cb5421..73e3fdf6dd9 100644
--- a/htdocs/accountancy/admin/card.php
+++ b/htdocs/accountancy/admin/card.php
@@ -27,7 +27,6 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php';
 require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountancysystem.class.php';
-require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
 
 $error = 0;
@@ -196,7 +195,6 @@ $helpurl = '';
 llxheader('', $title, $helpurl);
 
 $form = new Form($db);
-$htmlacc = new FormVentilation($db);
 $formaccounting = new FormAccounting($db);
 
 $accountsystem = new AccountancySystem($db);
@@ -231,7 +229,7 @@ if ($action == 'create') {
 	// Account parent
 	print '<tr><td>' . $langs->trans("Accountparent") . '</td>';
 	print '<td>';
-	print $htmlacc->select_account($object->account_parent, 'account_parent', 1, null, 0, 0, 'minwidth200');
+	print $formaccounting->select_account($object->account_parent, 'account_parent', 1, null, 0, 0, 'minwidth200');
 	print '</td></tr>';
 
 	// Category
@@ -295,7 +293,7 @@ if ($action == 'create') {
 			// Account parent
 			print '<tr><td>' . $langs->trans("Accountparent") . '</td>';
 			print '<td>';
-			print $htmlacc->select_account($object->account_parent, 'account_parent', 1);
+			print $formaccounting->select_account($object->account_parent, 'account_parent', 1);
 			print '</td></tr>';
 
 			// Category
diff --git a/htdocs/accountancy/admin/categories_list.php b/htdocs/accountancy/admin/categories_list.php
index c0fa895ae4c..f3a35350084 100644
--- a/htdocs/accountancy/admin/categories_list.php
+++ b/htdocs/accountancy/admin/categories_list.php
@@ -39,7 +39,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/accountancy/class/html.formventilation.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
 
 $langs->load("errors");
 $langs->load("admin");
@@ -982,7 +982,7 @@ function fieldListAccountingCategories($fieldlist, $obj='', $tabname='', $contex
 
 	$formadmin = new FormAdmin($db);
 	$formcompany = new FormCompany($db);
-	if (! empty($conf->accounting->enabled)) $formaccountancy = new FormVentilation($db);
+	if (! empty($conf->accounting->enabled)) $formaccounting = new FormAccounting($db);
 
 	foreach ($fieldlist as $field => $value)
 	{
@@ -1125,7 +1125,7 @@ function fieldListAccountingCategories($fieldlist, $obj='', $tabname='', $contex
 			{
 			    $fieldname = $fieldlist[$field];
 				$accountancy_account = (! empty($obj->$fieldname) ? $obj->$fieldname : 0);
-				print $formaccountancy->select_account($accountancy_account, $fieldlist[$field], 1, '', 1, 1, 'maxwidth200 maxwidthonsmartphone');
+				print $formaccounting->select_account($accountancy_account, $fieldlist[$field], 1, '', 1, 1, 'maxwidth200 maxwidthonsmartphone');
 			}
 			else
 			{
diff --git a/htdocs/accountancy/admin/defaultaccounts.php b/htdocs/accountancy/admin/defaultaccounts.php
index 4b733bee5a6..c2a6453ffee 100644
--- a/htdocs/accountancy/admin/defaultaccounts.php
+++ b/htdocs/accountancy/admin/defaultaccounts.php
@@ -32,7 +32,7 @@ require '../../main.inc.php';
 // Class
 require_once DOL_DOCUMENT_ROOT . '/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
 
 $langs->load("compta");
 $langs->load("bills");
@@ -117,7 +117,7 @@ if ($action == 'update') {
 llxHeader();
 
 $form = new Form($db);
-$formaccountancy = new FormVentilation($db);
+$formaccounting = new FormAccounting($db);
 
 $linkback = '';
 print load_fiche_titre($langs->trans('MenuDefaultAccounts'), $linkback, 'title_accountancy');
@@ -142,7 +142,7 @@ foreach ( $list_account as $key ) {
 	print '<td>' . $label . '</td>';
 	// Value
 	print '<td>';  // Do not force align=right, or it align also the content of the select box 
-	print $formaccountancy->select_account($conf->global->$key, $key, 1, '', 1, 1);
+	print $formaccounting->select_account($conf->global->$key, $key, 1, '', 1, 1);
 	print '</td>';
 	print '</tr>';
 }
diff --git a/htdocs/accountancy/admin/importaccounts.php b/htdocs/accountancy/admin/importaccounts.php
index f4f155c0b59..1bb1bf178b3 100644
--- a/htdocs/accountancy/admin/importaccounts.php
+++ b/htdocs/accountancy/admin/importaccounts.php
@@ -1,8 +1,7 @@
 <?php
-/* 
- * Copyright (C) 2013-2014 Olivier Geffroy      <jeff@jeffinfo.com>
- * Copyright (C) 2013-2014 Alexandre Spangaro   <aspangaro.dolibarr@gmail.com> 
- * Copyright (C) 2014	   Florian Henry		<florian.henry@open-concept.pro>
+/* Copyright (C) 2013-2014 Olivier Geffroy      <jeff@jeffinfo.com>
+ * Copyright (C) 2013-2017 Alexandre Spangaro   <aspangaro.dolibarr@gmail.com> 
+ * Copyright (C) 2014      Florian Henry        <florian.henry@open-concept.pro>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -28,7 +27,7 @@ require '../../main.inc.php';
 // Class
 require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php';
-require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
 
 // langs
 $langs->load("compta");
@@ -65,22 +64,22 @@ if ($_POST["action"] == 'import') {
 	if (is_array($to_import) && count($to_import) > 0) {
 		print '<div><font color="red">' . count($to_import) . ' ' . $langs->trans("SelectedLines") . '</font></div>';
 		$sql = 'SELECT pcg_version FROM ' . MAIN_DB_PREFIX . 'accounting_system WHERE rowid=' . $conf->global->CHARTOFACCOUNTS;
-		
+
 		$result = $db->query($sql);
 		if ($result && ($db->num_rows($result) > 0)) {
-			
+
 			$obj = $db->fetch_object($result);
-			
+
 			$cpt = 0;
 			foreach ( $to_import as $maLigneCochee ) {
-				
+
 				$accounting = new AccountingAccount($db);
-				
+
 				$monLabel = GETPOST('label' . $maLigneCochee);
 				$monParentAccount = GETPOST('AccountParent' . $maLigneCochee);
 				$monType = GETPOST('pcgType' . $maLigneCochee);
 				$monSubType = GETPOST('pcgSubType' . $maLigneCochee);
-				
+
 				$accounting->fk_pcg_version = $obj->pcg_version;
 				$accounting->account_number = $maLigneCochee;
 				$accounting->label = $monLabel;
@@ -126,10 +125,10 @@ if ($result) {
 	$num_lines = $db->num_rows($result);
 	$i = 0;
 	print_barre_liste($langs->trans("ImportAccount"), $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, '', $num_lines);
-	
+
 	print '<form action="' . $_SERVER["PHP_SELF"] . '" method="POST">' . "\n";
 	print '<input type="hidden" name="action" value="import">';
-	
+
 	print '<table class="noborder" width="100%">';
 	print '<tr class="liste_titre"><td>' . $langs->trans("AccountAccouting") . '</td>';
 	print '<td>' . $langs->trans("label") . '</td>';
@@ -138,10 +137,10 @@ if ($result) {
 	print '<td>' . $langs->trans("Pcgsubtype") . '</td>';
 	print '<td align="center">' . $langs->trans("Import") . '</td>';
 	print '</tr>';
-	
+
 	$form = new Form($db);
-	$htmlacc = new FormVentilation($db);
-	
+	$formaccounting = new FormAccounting($db);
+
 	$var = true;
 	while ( $i < min($num_lines, $limit) ) {
 		$objp = $db->fetch_object($result);
@@ -157,7 +156,7 @@ if ($result) {
 
 		// Colonne choix du compte
 		print '<td>';
-		print $htmlacc->select_account($accounting->account_parent, 'AccountParent');
+		print $formaccounting->select_account($accounting->account_parent, 'AccountParent');
 		print '</td>';
 
 		print '<td>';
diff --git a/htdocs/accountancy/admin/index.php b/htdocs/accountancy/admin/index.php
index 899aaa1a3d2..0e1f67a0e61 100644
--- a/htdocs/accountancy/admin/index.php
+++ b/htdocs/accountancy/admin/index.php
@@ -1,11 +1,11 @@
 <?php
-/* Copyright (C) 2013-2014 Olivier Geffroy		<jeff@jeffinfo.com>
- * Copyright (C) 2013-2014 Florian Henry		<florian.henry@open-concept.pro>
- * Copyright (C) 2013-2017 Alexandre Spangaro	<aspangaro@zendsi.com>
- * Copyright (C) 2014-2015 Ari Elbaz (elarifr)	<github@accedinfo.com>
+/* Copyright (C) 2013-2014 Olivier Geffroy      <jeff@jeffinfo.com>
+ * Copyright (C) 2013-2014 Florian Henry        <florian.henry@open-concept.pro>
+ * Copyright (C) 2013-2017 Alexandre Spangaro   <aspangaro@zendsi.com>
+ * Copyright (C) 2014-2015 Ari Elbaz (elarifr)  <github@accedinfo.com>
  * Copyright (C) 2014      Marcos García        <marcosgdf@gmail.com>
- * Copyright (C) 2014	   Juanjo Menent		<jmenent@2byte.es>
- * Copyright (C) 2015      Jean-François Ferry	<jfefe@aternatik.fr>
+ * Copyright (C) 2014      Juanjo Menent        <jmenent@2byte.es>
+ * Copyright (C) 2015      Jean-François Ferry  <jfefe@aternatik.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
@@ -31,8 +31,6 @@ require '../../main.inc.php';
 
 // Class
 require_once DOL_DOCUMENT_ROOT . '/core/lib/admin.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
 
 $langs->load("compta");
 $langs->load("bills");
@@ -160,7 +158,6 @@ if ($action == 'setdisabledirectinput') {
 llxHeader();
 
 $form = new Form($db);
-$formaccountancy = new FormVentilation($db);
 
 $linkback = '<a href="' . DOL_URL_ROOT . '/admin/modules.php">' . $langs->trans("BackToModuleList") . '</a>';
 print load_fiche_titre($langs->trans('ConfigAccountingExpert'), $linkback, 'title_setup');
diff --git a/htdocs/accountancy/admin/productaccount.php b/htdocs/accountancy/admin/productaccount.php
index 359a8b40c12..fcb44c6f858 100644
--- a/htdocs/accountancy/admin/productaccount.php
+++ b/htdocs/accountancy/admin/productaccount.php
@@ -31,7 +31,7 @@ require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/report.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
 require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php';
 require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
 
@@ -184,7 +184,7 @@ if ($action == 'update') {
  * View
  */
 
-$form = new FormVentilation($db);
+$form = new FormAccounting($db);
 
 // Defaut AccountingAccount RowId Product / Service
 // at this time ACCOUNTING_SERVICE_SOLD_ACCOUNT & ACCOUNTING_PRODUCT_SOLD_ACCOUNT are account number not accountingacount rowid
diff --git a/htdocs/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php
index 9e5be25eb73..3111707cff6 100644
--- a/htdocs/accountancy/bookkeeping/balance.php
+++ b/htdocs/accountancy/bookkeeping/balance.php
@@ -28,8 +28,8 @@ require '../../main.inc.php';
 
 // Class
 require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
 require_once DOL_DOCUMENT_ROOT . '/accountancy/class/bookkeeping.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php';
 
 // Langs
@@ -61,7 +61,7 @@ $offset = $limit * $page;
 
 $object = new BookKeeping($db);
 
-$formventilation = new FormVentilation($db);
+$formaccounting = new FormAccounting($db);
 $formother = new FormOther($db);
 $form = new Form($db);
 
@@ -186,10 +186,10 @@ else {
     print '<tr class="liste_titre_filter">';
     print '<td class="liste_titre" colspan="5">';
     print $langs->trans('From');
-    print $formventilation->select_account($search_accountancy_code_start, 'search_accountancy_code_start', 1, array(), 1, 1, '');
+    print $formaccounting->select_account($search_accountancy_code_start, 'search_accountancy_code_start', 1, array(), 1, 1, '');
     print ' ';
     print $langs->trans('to');
-    print $formventilation->select_account($search_accountancy_code_end, 'search_accountancy_code_end', 1, array(), 1, 1, '');
+    print $formaccounting->select_account($search_accountancy_code_end, 'search_accountancy_code_end', 1, array(), 1, 1, '');
     print '</td>';
     print '<td align="right" class="liste_titre">';
 	$searchpicto=$form->showFilterAndCheckAddButtons(0);
diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php
index 7ee3e6bb4fe..4443fb959b2 100644
--- a/htdocs/accountancy/bookkeeping/card.php
+++ b/htdocs/accountancy/bookkeeping/card.php
@@ -27,9 +27,8 @@ require '../../main.inc.php';
 // Class
 require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/accountancy/class/bookkeeping.class.php';
-require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
 require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
 
 // Langs
 $langs->load("accountancy");
@@ -215,7 +214,6 @@ else if ($action == "confirm_create") {
 llxHeader();
 
 $html = new Form($db);
-$formventilation = new FormVentilation($db);
 $formaccountancy = new FormAccounting($db);
 
 /*
@@ -389,10 +387,10 @@ if ($action == 'create') {
 					if ($action == 'update' && $line->id == $id) {
 
 						print '<td>';
-						print $formventilation->select_account($line->numero_compte, 'account_number', 0, array (), 1, 1, '');
+						print $formaccounting->select_account($line->numero_compte, 'account_number', 0, array (), 1, 1, '');
 						print '</td>';
 						print '<td>';
-						print $formventilation->select_auxaccount($line->code_tiers, 'code_tiers', 1);
+						print $formaccounting->select_auxaccount($line->code_tiers, 'code_tiers', 1);
 						print '</td>';
 						print '<td><input type="text" size="15" name="label_compte" value="' . $line->label_compte . '"/></td>';
 						print '<td align="right"><input type="text" size="6" name="debit" value="' . price($line->debit) . '"/></td>';
@@ -433,10 +431,10 @@ if ($action == 'create') {
 				if ($action == "" || $action == 'add') {
 					print '<tr class="oddeven">';
 					print '<td>';
-					print $formventilation->select_account($account_number, 'account_number', 0, array (), 1, 1, '');
+					print $formaccounting->select_account($account_number, 'account_number', 0, array (), 1, 1, '');
 					print '</td>';
 					print '<td>';
-					print $formventilation->select_auxaccount($code_tiers, 'code_tiers', 1);
+					print $formaccounting->select_auxaccount($code_tiers, 'code_tiers', 1);
 					print '</td>';
 					print '<td><input type="text" size="15" name="label_compte" value="' . $label_compte . '"/></td>';
 					print '<td align="right"><input type="text" class="right maxwidth50" name="debit" value="' . price($debit) . '"/></td>';
diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index 72385bab746..a955d671475 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -28,10 +28,10 @@ require '../../main.inc.php';
 
 // Class
 require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
 require_once DOL_DOCUMENT_ROOT . '/accountancy/class/bookkeeping.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
 
 // Langs
 $langs->load("accountancy");
@@ -94,7 +94,7 @@ if ($sortfield == "") $sortfield = "t.rowid";
 
 $object = new BookKeeping($db);
 
-$formventilation = new FormVentilation($db);
+$formaccounting = new FormAccounting($db);
 $formother = new FormOther($db);
 $form = new Form($db);
 
@@ -321,8 +321,8 @@ if ($action == 'delbookkeepingyear') {
 	if (empty($delyear)) {
 		$delyear = dol_print_date(dol_now(), '%Y');
 	}
-	$year_array = $formventilation->selectyear_accountancy_bookkepping($delyear, 'delyear', 0, 'array');
-	$journal_array = $formventilation->selectjournal_accountancy_bookkepping($deljournal, 'deljournal', 0, 'array');
+	$year_array = $formaccounting->selectyear_accountancy_bookkepping($delyear, 'delyear', 0, 'array');
+	$journal_array = $formaccounting->selectjournal_accountancy_bookkepping($deljournal, 'deljournal', 0, 'array');
 
 	$form_question['delyear'] = array (
 			'name' => 'delyear',
@@ -385,17 +385,17 @@ print '</td>';
 print '<td class="liste_titre"><input type="text" name="search_doc_ref" size="8" value="' . dol_escape_htmltag($search_doc_ref) . '"></td>';
 print '<td class="liste_titre">';
 print $langs->trans('From');
-print $formventilation->select_account($search_accountancy_code_start, 'search_accountancy_code_start', 1, array (), 1, 1, '');
+print $formaccounting->select_account($search_accountancy_code_start, 'search_accountancy_code_start', 1, array (), 1, 1, '');
 print '<br>';
 print $langs->trans('to');
-print $formventilation->select_account($search_accountancy_code_end, 'search_accountancy_code_end', 1, array (), 1, 1, '');
+print $formaccounting->select_account($search_accountancy_code_end, 'search_accountancy_code_end', 1, array (), 1, 1, '');
 print '</td>';
 print '<td class="liste_titre">';
 print $langs->trans('From');
-print $formventilation->select_auxaccount($search_accountancy_aux_code_start, 'search_accountancy_aux_code_start', 1);
+print $formaccounting->select_auxaccount($search_accountancy_aux_code_start, 'search_accountancy_aux_code_start', 1);
 print '<br>';
 print $langs->trans('to');
-print $formventilation->select_auxaccount($search_accountancy_aux_code_end, 'search_accountancy_aux_code_end', 1);
+print $formaccounting->select_auxaccount($search_accountancy_aux_code_end, 'search_accountancy_aux_code_end', 1);
 print '</td>';
 print '<td class="liste_titre">';
 print '<input type="text" size="7" class="flat" name="search_mvt_label" value="' . $search_mvt_label . '"/>';
diff --git a/htdocs/accountancy/bookkeeping/listbyaccount.php b/htdocs/accountancy/bookkeeping/listbyaccount.php
index eb8a53561d2..6b329e421ad 100644
--- a/htdocs/accountancy/bookkeeping/listbyaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbyaccount.php
@@ -29,8 +29,8 @@ require '../../main.inc.php';
 
 // Class
 require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
 require_once DOL_DOCUMENT_ROOT . '/accountancy/class/bookkeeping.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php';
 
 // Langs
@@ -75,7 +75,7 @@ if (empty($search_date_end)) $search_date_end = dol_mktime(0, 0, 0, 12, 31, dol_
 
 $object = new BookKeeping($db);
 
-$formventilation = new FormVentilation($db);
+$formaccounting = new FormAccounting($db);
 $formother = new FormOther($db);
 $form = new Form($db);
 
@@ -188,7 +188,7 @@ if ($action == 'delbookkeepingyear') {
 	if (empty($delyear)) {
 		$delyear = dol_print_date(dol_now(), '%Y');
 	}
-	$year_array = $formventilation->selectyear_accountancy_bookkepping($delyear, 'delyear', 0, 'array');
+	$year_array = $formaccounting->selectyear_accountancy_bookkepping($delyear, 'delyear', 0, 'array');
 
 	$form_question['delyear'] = array (
 			'name' => 'delyear',
diff --git a/htdocs/accountancy/bookkeeping/listbyyear.php b/htdocs/accountancy/bookkeeping/listbyyear.php
index 263f293043a..5fba55f2eba 100644
--- a/htdocs/accountancy/bookkeeping/listbyyear.php
+++ b/htdocs/accountancy/bookkeeping/listbyyear.php
@@ -29,7 +29,7 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/accountancy/class/bookkeeping.class.php';
-require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
 
 // Langs
 $langs->load("accountancy");
@@ -67,7 +67,7 @@ $search_code_journal = GETPOST('search_code_journal', 'alpha');
 
 $object = new BookKeeping($db);
 $form = new Form($db);
-$formventilation = new FormVentilation($db);
+$formaccounting = new FormAccounting($db);
 
 // Filter
 if (empty($search_date_start)) {
@@ -182,15 +182,15 @@ print $form->select_date($search_date_end, 'date_end');
 print '</div>';
 print '<div class="liste_titre">';
 print $langs->trans('From') . ' ' . $langs->trans('AccountAccounting') . ': ';
-print $formventilation->select_account($search_numero_compte_start, 'search_numero_compte_start', 1, array (), 1, 1, '');
+print $formaccounting->select_account($search_numero_compte_start, 'search_numero_compte_start', 1, array (), 1, 1, '');
 print $langs->trans('To') . ' ' . $langs->trans('AccountAccounting') . ': ';
-print $formventilation->select_account($search_numero_compte_end, 'search_numero_compte_end', 1, array (), 1, 1, '');
+print $formaccounting->select_account($search_numero_compte_end, 'search_numero_compte_end', 1, array (), 1, 1, '');
 print '</div>';
 print '<div class="liste_titre">';
 print $langs->trans('From') . ' ' . $langs->trans('ThirdPartyAccount') . ': ';
-print $formventilation->select_auxaccount($search_code_tiers_start, 'search_code_tiers_start', 1);
+print $formaccounting->select_auxaccount($search_code_tiers_start, 'search_code_tiers_start', 1);
 print $langs->trans('To') . ' ' . $langs->trans('ThirdPartyAccount') . ': ';
-print $formventilation->select_auxaccount($search_code_tiers_end, 'searchcode_tiers_end', 1);
+print $formaccounting->select_auxaccount($search_code_tiers_end, 'searchcode_tiers_end', 1);
 print '</div>';
 print "<table class=\"noborder\" width=\"100%\">";
 
diff --git a/htdocs/accountancy/class/html.formventilation.class.php b/htdocs/accountancy/class/html.formventilation.class.php
deleted file mode 100644
index d7a827f2480..00000000000
--- a/htdocs/accountancy/class/html.formventilation.class.php
+++ /dev/null
@@ -1,292 +0,0 @@
-<?php
-/* Copyright (C) 2013-2016 Florian Henry        <florian.henry@open-concept.pro>
- * Copyright (C) 2013-2014 Olivier Geffroy      <jeff@jeffinfo.com>
- * Copyright (C) 2013-2016 Alexandre Spangaro   <aspangaro.dolibarr@gmail.com>
- * Copyright (C) 2015      Ari Elbaz (elarifr)  <github@accedinfo.com>
- * Copyright (C) 2016      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
- * 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/accountancy/class/html.formventilation.class.php
- * \ingroup		Advanced accountancy
- * \brief		File of class with all html predefined components
- */
-
-/**
- * Class to manage generation of HTML components for bank module
- */
-class FormVentilation extends Form
-{
-
-    private $options_cache = array();
-
-
-	/**
-	 * Return select filter with date of transaction
-	 *
-	 * @param string $htmlname Name of select field
-	 * @param string $selectedkey Value
-	 * @return string HTML edit field
-	 */
-	function select_bookkeeping_importkey($htmlname = 'importkey', $selectedkey = '') {
-		$options = array();
-
-		$sql = 'SELECT DISTINCT import_key from ' . MAIN_DB_PREFIX . 'accounting_bookkeeping';
-	    $sql .= " WHERE entity IN (" . getEntity("accountancy", 1) . ")";
-		$sql .= ' ORDER BY import_key DESC';
-
-		dol_syslog(get_class($this) . "::select_bookkeeping_importkey", LOG_DEBUG);
-		$resql = $this->db->query($sql);
-
-		if (!$resql) {
-			$this->error = "Error " . $this->db->lasterror();
-			dol_syslog(get_class($this) . "::select_bookkeeping_importkey " . $this->error, LOG_ERR);
-			return - 1;
-		}
-
-		while ($obj = $this->db->fetch_object($resql)) {
-			$options[$obj->import_key] = dol_print_date($obj->import_key, 'dayhourtext');
-		}
-
-		return Form::selectarray($htmlname, $options, $selectedkey);
-	}
-
-	/**
-	 * Return list of accounts with label by chart of accounts
-	 *
-	 * @param string   $selectid           Preselected id or code of accounting accounts (depends on $select_in)
-	 * @param string   $htmlname           Name of field in html form
-	 * @param int      $showempty          Add an empty field
-	 * @param array    $event              Event options
-	 * @param int      $select_in          0=selectid value is a aa.rowid (default) or 1=selectid is aa.account_number
-	 * @param int      $select_out         Set value returned by select. 0=rowid (default), 1=account_number
-	 * @param string   $morecss            More css non HTML object
-	 * @param string   $usecache           Key to use to store result into a cache. Next call with same key will reuse the cache.
-	 * @return string                      String with HTML select
-	 */
-	function select_account($selectid, $htmlname = 'account', $showempty = 0, $event = array(), $select_in = 0, $select_out = 0, $morecss='maxwidth300 maxwidthonsmartphone', $usecache='')
-	{
-		global $conf;
-
-		require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
-
-		$out = '';
-		
-    	$options = array();
-		if ($usecache && ! empty($this->options_cache[$usecache]))
-		{
-		    $options = $this->options_cache[$usecache];
-		    $selected=$selectid;
-		}
-		else
-		{
-    		$trunclength = defined('ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT') ? $conf->global->ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT : 50;
-
-    		$sql = "SELECT DISTINCT aa.account_number, aa.label, aa.rowid, aa.fk_pcg_version";
-    		$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_account as aa";
-    		$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "accounting_system as asy ON aa.fk_pcg_version = asy.pcg_version";
-    		$sql .= " AND asy.rowid = " . $conf->global->CHARTOFACCOUNTS;
-    		$sql .= " AND aa.active = 1";
-    		$sql .= " ORDER BY aa.account_number";
-
-    		dol_syslog(get_class($this) . "::select_account", LOG_DEBUG);
-    		$resql = $this->db->query($sql);
-
-    		if (!$resql) {
-    			$this->error = "Error " . $this->db->lasterror();
-    			dol_syslog(get_class($this) . "::select_account " . $this->error, LOG_ERR);
-    			return -1;
-    		}
-
-    		$out .= ajax_combobox($htmlname, $event);
-
-    		$selected = 0;
-    		while ($obj = $this->db->fetch_object($resql))
-    		{
-    			$label = length_accountg($obj->account_number) . ' - ' . $obj->label;
-    			$label = dol_trunc($label, $trunclength);
-
-    			$select_value_in = $obj->rowid;
-    			$select_value_out = $obj->rowid;
-
-    			// Try to guess if we have found default value
-    			if ($select_in == 1) {
-    				$select_value_in = $obj->account_number;
-    			}
-    			if ($select_out == 1) {
-    				$select_value_out = $obj->account_number;
-    			}
-    			// Remember guy's we store in database llx_facturedet the rowid of accounting_account and not the account_number
-    			// Because same account_number can be share between different accounting_system and do have the same meaning
-    			if ($selectid != '' && $selectid == $select_value_in) {
-    			    //var_dump("Found ".$selectid." ".$select_value_in);
-    				$selected = $select_value_out;
-    			}
-
-    			$options[$select_value_out] = $label;
-    		}
-    		$this->db->free($resql);
-
-    		if ($usecache)
-    		{
-                $this->options_cache[$usecache] = $options;
-    		}
-		}
-
-		$out .= Form::selectarray($htmlname, $options, $selected, $showempty, 0, 0, '', 0, 0, 0, '', $morecss, 1);
-
-		return $out;
-	}
-
-	/**
-	 * Return list of auxilary thirdparty accounts
-	 *
-	 * @param string $selectid Preselected pcg_type
-	 * @param string $htmlname Name of field in html form
-	 * @param int $showempty Add an empty field
-	 * @param array $event Event options
-	 *
-	 * @return string String with HTML select
-	 */
-	function select_auxaccount($selectid, $htmlname = 'account_num_aux', $showempty = 0, $event = array()) {
-
-		$aux_account = array();
-
-		// Auxiliary customer account
-		$sql = "SELECT DISTINCT code_compta, nom ";
-		$sql .= " FROM ".MAIN_DB_PREFIX."societe";
-	    $sql .= " WHERE entity IN (" . getEntity("societe", 1) . ")";
-		$sql .= " ORDER BY code_compta";
-		dol_syslog(get_class($this)."::select_auxaccount", LOG_DEBUG);
-		$resql = $this->db->query($sql);
-		if ($resql) {
-			while ($obj = $this->db->fetch_object($resql)) {
-				if (!empty($obj->code_compta)) {
-					$aux_account[$obj->code_compta] = $obj->code_compta.' ('.$obj->nom.')';
-				}
-			}
-		} else {
-			$this->error = "Error ".$this->db->lasterror();
-			dol_syslog(get_class($this)."::select_pcgsubtype ".$this->error, LOG_ERR);
-			return -1;
-		}
-		$this->db->free($resql);
-
-		// Auxiliary supplier account
-		$sql = "SELECT DISTINCT code_compta_fournisseur, nom ";
-		$sql .= " FROM ".MAIN_DB_PREFIX."societe";
-	    $sql .= " WHERE entity IN (" . getEntity("societe", 1) . ")";
-		$sql .= " ORDER BY code_compta_fournisseur";
-		dol_syslog(get_class($this)."::select_auxaccount", LOG_DEBUG);
-		$resql = $this->db->query($sql);
-		if ($resql) {
-			while ($obj = $this->db->fetch_object($resql)) {
-				if (!empty($obj->code_compta_fournisseur)) {
-					$aux_account[$obj->code_compta_fournisseur] = $obj->code_compta_fournisseur.' ('.$obj->nom.')';
-				}
-			}
-		} else {
-			$this->error = "Error ".$this->db->lasterror();
-			dol_syslog(get_class($this)."::select_pcgsubtype ".$this->error, LOG_ERR);
-			return -1;
-		}
-		$this->db->free($resql);
-
-		// Build select
-		$out = ajax_combobox($htmlname, $event);
-		$out .= Form::selectarray($htmlname, $aux_account, $selectid, $showempty, 0, 0, '', 0, 0, 0, '', 'maxwidth300');
-
-		return $out;
-	}
-
-	/**
-	 * Return HTML combo list of years existing into book keepping
-	 *
-	 * @param string $selected Preselected value
-	 * @param string $htmlname Name of HTML select object
-	 * @param int $useempty Affiche valeur vide dans liste
-	 * @param string $output_format (html/opton (for option html only)/array (to return options arrays
-	 * @return string/array
-	 */
-	function selectyear_accountancy_bookkepping($selected = '', $htmlname = 'yearid', $useempty = 0, $output_format = 'html')
-	{
-	    global $conf;
-
-		$out_array = array();
-
-		$sql = "SELECT DISTINCT date_format(doc_date,'%Y') as dtyear";
-		$sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping";
-	    $sql .= " WHERE entity IN (" . getEntity("accountancy", 1) . ")";
-		$sql .= " ORDER BY date_format(doc_date,'%Y')";
-		dol_syslog(get_class($this)."::".__METHOD__, LOG_DEBUG);
-		$resql = $this->db->query($sql);
-
-		if (!$resql) {
-			$this->error = "Error ".$this->db->lasterror();
-			dol_syslog(get_class($this)."::".__METHOD__.$this->error, LOG_ERR);
-			return -1;
-		}
-		while ($obj = $this->db->fetch_object($resql)) {
-			$out_array[$obj->dtyear] = $obj->dtyear;
-		}
-		$this->db->free($resql);
-
-		if ($output_format == 'html') {
-			return Form::selectarray($htmlname, $out_array, $selected, $useempty, 0, 0, 'placeholder="aa"');
-		} else {
-			return $out_array;
-		}
-	}
-
-	/**
-	 * Return HTML combo list of years existing into book keepping
-	 *
-	 * @param  string          $selected       Preselected value
-	 * @param  string          $htmlname       Name of HTML select object
-	 * @param  int             $useempty       Affiche valeur vide dans liste
-	 * @param  string          $output_format  Html/option (for option html only)/array (to return options arrays
-	 * @return string/array
-	 */
-	function selectjournal_accountancy_bookkepping($selected = '', $htmlname = 'journalid', $useempty = 0, $output_format = 'html')
-	{
-	    global $conf,$langs;
-
-		$out_array = array();
-
-		$sql = "SELECT DISTINCT code_journal";
-		$sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping";
-	    $sql .= " WHERE entity IN (" . getEntity("accountancy", 1) . ")";
-		$sql .= " ORDER BY code_journal";
-		dol_syslog(get_class($this)."::".__METHOD__, LOG_DEBUG);
-		$resql = $this->db->query($sql);
-
-		if (!$resql) {
-			$this->error = "Error ".$this->db->lasterror();
-			dol_syslog(get_class($this)."::".__METHOD__.$this->error, LOG_ERR);
-			return -1;
-		}
-		while ($obj = $this->db->fetch_object($resql)) {
-			$out_array[$obj->code_journal] = $obj->code_journal?$obj->code_journal:$langs->trans("NotDefined");  // TODO Not defined is accepted ? We should avoid this, shouldn't we ?
-		}
-		$this->db->free($resql);
-
-		if ($output_format == 'html') {
-			return Form::selectarray($htmlname, $out_array, $selected, $useempty, 0, 0, 'placeholder="aa"');
-		} else {
-			return $out_array;
-		}
-	}
-}
diff --git a/htdocs/accountancy/customer/card.php b/htdocs/accountancy/customer/card.php
index baa70bf51e8..eca3be1d477 100644
--- a/htdocs/accountancy/customer/card.php
+++ b/htdocs/accountancy/customer/card.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2013-2014 Olivier Geffroy		<jeff@jeffinfo.com>
  * Copyright (C) 2013-2014 Florian Henry		<florian.henry@open-concept.pro>
- * Copyright (C) 2013-2015 Alexandre Spangaro	<aspangaro.dolibarr@gmail.com>
+ * Copyright (C) 2013-2017 Alexandre Spangaro	<aspangaro.dolibarr@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
@@ -26,7 +26,7 @@ require '../../main.inc.php';
 
 // Class
 require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
-require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
 
 // Langs
 $langs->load("bills");
@@ -39,9 +39,7 @@ $id = GETPOST('id');
 // Security check
 if ($user->societe_id > 0)
 	accessforbidden();
-	
-	
-	
+
 /*
  * Actions
  */
@@ -84,7 +82,7 @@ if ($cancel == $langs->trans("Cancel")) {
  */
 $form = new Form($db);
 $facture_static = new Facture($db);
-$formventilation = new FormVentilation($db);
+$formaccounting = new FormAccounting($db);
 
 if (! empty($id)) {
 	$sql = "SELECT f.facnumber, f.rowid as facid, l.fk_product, l.description, l.price,";
@@ -96,50 +94,50 @@ if (! empty($id)) {
 	$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "facture as f ON f.rowid = l.fk_facture";
 	$sql .= " WHERE f.fk_statut > 0 AND l.rowid = " . $id;
 	$sql .= " AND f.entity IN (" . getEntity("facture", 0) . ")"; // We don't share object for accountancy
-	
+
 	dol_syslog("/accounting/customer/card.php sql=" . $sql, LOG_DEBUG);
 	$result = $db->query($sql);
-	
+
 	if ($result) {
 		$num_lines = $db->num_rows($result);
 		$i = 0;
-		
+
 		if ($num_lines) {
-			
+
 			$objp = $db->fetch_object($result);
-			
+
 			print '<form action="' . $_SERVER["PHP_SELF"] . '?id=' . $id . '" method="post">' . "\n";
 			print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
 			print '<input type="hidden" name="action" value="ventil">';
-			
+
 			print load_fiche_titre($langs->trans('CustomersVentilation'), '', 'title_setup');
-			
+
 			dol_fiche_head();
-			
+
 			print '<table class="border" width="100%">';
-			
+
 			// Ref facture
 			print '<tr><td>' . $langs->trans("Invoice") . '</td>';
 			$facture_static->ref = $objp->facnumber;
 			$facture_static->id = $objp->facid;
 			print '<td>' . $facture_static->getNomUrl(1) . '</td>';
 			print '</tr>';
-			
+
 			print '<tr><td width="20%">' . $langs->trans("Line") . '</td>';
 			print '<td>' . nl2br($objp->description) . '</td></tr>';
 			print '<tr><td width="20%">' . $langs->trans("Account") . '</td><td>';
-			print $formventilation->select_account($objp->fk_code_ventilation, 'codeventil', 1);
+			print $formaccounting->select_account($objp->fk_code_ventilation, 'codeventil', 1);
 			print '</td></tr>';
 			print '</table>';
-			
+
 			dol_fiche_end();
-			
+
 			print '<div class="center">';
 			print '<input class="button" type="submit" value="' . $langs->trans("Save") . '">';
 			print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
 			print '<input class="button" type="submit" name="cancel" value="' . $langs->trans("Cancel") . '">';
 			print '</div>';
-			
+
 			print '</form>';
 		} else {
 			print "Error";
diff --git a/htdocs/accountancy/customer/lines.php b/htdocs/accountancy/customer/lines.php
index 52b3a31d6f0..f3763dd9ca0 100644
--- a/htdocs/accountancy/customer/lines.php
+++ b/htdocs/accountancy/customer/lines.php
@@ -28,7 +28,7 @@
 require '../../main.inc.php';
 
 // Class
-require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
 require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
@@ -77,7 +77,7 @@ if ($user->societe_id > 0)
 if (! $user->rights->accounting->bind->write)
 	accessforbidden();
 
-$formventilation = new FormVentilation($db);
+$formaccounting = new FormAccounting($db);
 
 
 /*
@@ -254,14 +254,14 @@ if ($result) {
 	print $langs->trans("DescVentilDoneCustomer") . '<br>';
 
 	print '<br><div class="inline-block divButAction">' . $langs->trans("ChangeAccount") . '<br>';
-	print $formventilation->select_account($account_parent, 'account_parent', 1);
+	print $formaccounting->select_account($account_parent, 'account_parent', 1);
 	print '<input type="submit" class="button valignmiddle" value="' . $langs->trans("ChangeBinding") . '"/></div>';
 
 	$moreforfilter = '';
-	
-    print '<div class="div-table-responsive">';
+
+	print '<div class="div-table-responsive">';
 	print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
-	
+
 	print '<tr class="liste_titre_filter">';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_lineid" value="' . dol_escape_htmltag($search_lineid) . '""></td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_invoice" value="' . dol_escape_htmltag($search_invoice) . '"></td>';
@@ -278,7 +278,7 @@ if ($result) {
 	$searchpicto=$form->showFilterButtons();
 	print $searchpicto;
 	print "</td></tr>\n";
-	
+
 	print '<tr class="liste_titre">';
 	print_liste_field_titre($langs->trans("LineId"), $_SERVER["PHP_SELF"], "fd.rowid", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre($langs->trans("Invoice"), $_SERVER["PHP_SELF"], "f.facnumber", "", $param, '', $sortfield, $sortorder);
@@ -303,16 +303,16 @@ if ($result) {
 
 		$facture_static->ref = $objp->facnumber;
 		$facture_static->id = $objp->rowid;
-		
+
 		$product_static->ref = $objp->product_ref;
 		$product_static->id = $objp->product_id;
 		$product_static->type = $objp->product_type;
 		$product_static->label = $objp->product_label;
-		
+
 		print '<tr class="oddeven">';
 
 		print '<td>' . $objp->rowid . '</td>';
-		
+
 		// Ref Invoice
 		print '<td>' . $facture_static->getNomUrl(1) . '</td>';
 
@@ -324,13 +324,13 @@ if ($result) {
 			print $product_static->getNomUrl(1);
 		if ($objp->product_label) print '<br>'.$objp->product_label;
 		print '</td>';
-		
+
 		print '<td>';
 		$text = dolGetFirstLineOfText(dol_string_nohtmltag($objp->description));
 		$trunclength = defined('ACCOUNTING_LENGTH_DESCRIPTION') ? ACCOUNTING_LENGTH_DESCRIPTION : 32;
 		print $form->textwithtooltip(dol_trunc($text,$trunclength), $objp->description);
 		print '</td>';
-		
+
 		print '<td align="right">' . price($objp->total_ht) . '</td>';
 		print '<td align="center">' . price($objp->tva_tx) . '</td>';
 		print '<td>';
@@ -338,20 +338,20 @@ if ($result) {
 		print img_edit();
 		print '</a>';
 		print '</td>';
-		
+
 		print '<td>' . $objp->country .'</td>';
-		
+
 		print '<td>' . $objp->tva_intra . '</td>';
-		
+
 		print '<td class="center"><input type="checkbox" class="checkforaction" name="changeaccount[]" value="' . $objp->rowid . '"/></td>';
 
 		print "</tr>";
 		$i ++;
 	}
-	
+
 	print "</table>";
 	print "</div>";
-	
+
     if ($nbtotalofrecords > $limit) {
         print_barre_liste('', $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num_lines, $nbtotalofrecords, '', 0, '', '', $limit, 1);
     }
diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php
index bbd875e0dbf..8af289f2c99 100644
--- a/htdocs/accountancy/customer/list.php
+++ b/htdocs/accountancy/customer/list.php
@@ -30,7 +30,7 @@ require '../../main.inc.php';
 // Class
 require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
-require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
 require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
 
@@ -85,7 +85,7 @@ if ($user->societe_id > 0)
 if (! $user->rights->accounting->bind->write)
 	accessforbidden();
 
-$formventilation = new FormVentilation($db);
+$formaccounting = new FormAccounting($db);
 $accounting = new AccountingAccount($db);
 $aarowid_s = $accounting->fetch('', $conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT, 1);
 $aarowid_p = $accounting->fetch('', $conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT, 1);
@@ -101,7 +101,7 @@ if (! GETPOST('confirmmassaction') && $massaction != 'presend' && $massaction !=
 // Purge search criteria
 if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // All test are required to be compatible with all browsers
 {
-    $search_lineid = '';
+	$search_lineid = '';
 	$search_ref = '';
 	$search_invoice = '';
 	$search_label = '';
@@ -241,7 +241,7 @@ if ($result) {
 	$i = 0;
 
 	$arrayofselected=is_array($toselect)?$toselect:array();
-	
+
 	$param='';
 	if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
 	if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
@@ -254,8 +254,7 @@ if ($result) {
 	//if ($user->rights->mymodule->supprimer) $arrayofmassactions['delete']=$langs->trans("Delete");
 	//if ($massaction == 'presend') $arrayofmassactions=array();
 	$massactionbutton=$form->selectMassAction('ventil', $arrayofmassactions, 1);
-	
-	
+
 	print '<form action="' . $_SERVER["PHP_SELF"] . '" method="post">' . "\n";
 	print '<input type="hidden" name="action" value="ventil">';
 	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
@@ -264,16 +263,16 @@ if ($result) {
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 	print '<input type="hidden" name="page" value="'.$page.'">';
-	
+
 	print_barre_liste($langs->trans("InvoiceLines"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num_lines, $nbtotalofrecords, 'title_accountancy', 0, '', '', $limit);
 
 	print $langs->trans("DescVentilTodoCustomer") . '</br><br>';
 
 	if ($msg) print $msg.'<br>';
-	
+
 	$moreforfilter = '';
-	
-    print '<div class="div-table-responsive">';
+
+	print '<div class="div-table-responsive">';
 	print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
 
 	// We add search filter
@@ -309,7 +308,7 @@ if ($result) {
 	if ($massactionbutton) $checkpicto=$form->showCheckAddButtons('checkforselect', 1);
 	print_liste_field_titre($checkpicto, '', '', '', '', 'align="center"');
 	print "</tr>\n";
-	
+
 	$facture_static = new Facture($db);
 	$product_static = new Product($db);
 	$form = new Form($db);
@@ -330,7 +329,7 @@ if ($result) {
 		$facture_static->ref = $objp->facnumber;
 		$facture_static->id = $objp->facid;
 		$facture_static->type = $objp->ftype;
-		
+
 		$code_sell_p_notset = '';
 		$objp->aarowid_suggest = $objp->aarowid;
 
@@ -350,30 +349,30 @@ if ($result) {
 		if (! empty($objp->code_sell)) {
 			$objp->code_sell_p = $objp->code_sell;       // Code on product
 		} else {
-    	    $code_sell_p_notset = 'color:orange';
+			$code_sell_p_notset = 'color:orange';
 		}
 		if (empty($objp->code_sell_l) && empty($objp->code_sell_p)) $code_sell_p_notset = 'color:red';
-		
+
 		// $objp->code_sell_p is now code of product/service
 		// $objp->code_sell_l is now default code of product/service
-					
+
 		print '<tr class="oddeven">';
 
 		// Line id
 		print '<td>' . $objp->rowid . '</td>';
-		
+
 		// Ref Invoice
 		print '<td>' . $facture_static->getNomUrl(1) . '</td>';
 
 		print '<td align="center">' . dol_print_date($db->jdate($objp->datef), 'day') . '</td>';
-		
+
 		// Ref Product
 		print '<td>';
 		if ($product_static->id)
 			print $product_static->getNomUrl(1);
 		if ($objp->product_label) print '<br>'.$objp->product_label;
 		print '</td>';
-		
+
 		print '<td class="tdoverflowonsmartphone">';
 		$text = dolGetFirstLineOfText(dol_string_nohtmltag($objp->description));
 		$trunclength = defined('ACCOUNTING_LENGTH_DESCRIPTION') ? ACCOUNTING_LENGTH_DESCRIPTION : 32;
@@ -383,14 +382,14 @@ if ($result) {
 		print '<td align="right">';
 		print price($objp->total_ht);
 		print '</td>';
-		
+
 		// Vat rate
 		if ($objp->vat_tx_l != $objp->vat_tx_p)
 			$code_vat_differ = 'font-weight:bold; text-decoration:blink; color:red';
 		print '<td style="' . $code_vat_differ . '" align="right">';
 		print price($objp->tva_tx_line);
 		print '</td>';
-		
+
 		// Current account
 		print '<td align="center" style="' . $code_sell_p_notset . '">';
 	    print (($objp->type_l == 1)?$langs->trans("DefaultForService"):$langs->trans("DefaultForProduct")) . ' = ' . ($objp->code_sell_l > 0 ? length_accountg($objp->code_sell_l) : $langs->trans("Unknown"));
@@ -403,7 +402,7 @@ if ($result) {
 
 		// Suggested accounting account
 		print '<td align="center">';
-		print $formventilation->select_account($objp->aarowid_suggest, 'codeventil'.$objp->rowid, 1, array(), 0, 0, 'maxwidth300 maxwidthonsmartphone', 'cachewithshowemptyone');
+		print $formaccounting->select_account($objp->aarowid_suggest, 'codeventil'.$objp->rowid, 1, array(), 0, 0, 'maxwidth300 maxwidthonsmartphone', 'cachewithshowemptyone');
 		print '</td>';
 		
 		print '<td align="center">';
@@ -414,7 +413,7 @@ if ($result) {
 	}
 	print '</table>';
 	print "</div>";
-	
+
 	print '</form>';
 } else {
 	print $db->error();
diff --git a/htdocs/accountancy/expensereport/card.php b/htdocs/accountancy/expensereport/card.php
index 52440385e50..e37b35f1003 100644
--- a/htdocs/accountancy/expensereport/card.php
+++ b/htdocs/accountancy/expensereport/card.php
@@ -30,7 +30,7 @@ require '../../main.inc.php';
 
 // Class
 require_once DOL_DOCUMENT_ROOT . '/expensereport/class/expensereport.class.php';
-require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
 
 // Langs
 $langs->load("bills");
@@ -85,7 +85,7 @@ if ($cancel == $langs->trans("Cancel")) {
 // Create
 $form = new Form($db);
 $expensereport_static = new ExpenseReport($db);
-$formventilation = new FormVentilation($db);
+$formaccounting = new FormAccounting($db);
 
 if (! empty($id)) {
 	$sql = "SELECT er.ref, er.rowid as facid, erd.fk_c_type_fees, erd.comments, erd.rowid, erd.fk_code_ventilation,";
@@ -135,7 +135,7 @@ if (! empty($id)) {
 			print '<td>' . ($langs->trans($objp->type_fees_code) == $objp->type_fees_code ? $objp->type_fees_label : $langs->trans(($objp->type_fees_code))) . '</td>';
 
 			print '<tr><td>' . $langs->trans("Account") . '</td><td>';
-			print $formventilation->select_account($objp->fk_code_ventilation, 'codeventil', 1);
+			print $formaccounting->select_account($objp->fk_code_ventilation, 'codeventil', 1);
 			print '</td></tr>';
 			print '</table>';
 
diff --git a/htdocs/accountancy/expensereport/lines.php b/htdocs/accountancy/expensereport/lines.php
index 6d0ffbd4476..b3936bbf1a6 100644
--- a/htdocs/accountancy/expensereport/lines.php
+++ b/htdocs/accountancy/expensereport/lines.php
@@ -27,7 +27,7 @@
 require '../../main.inc.php';
 
 // Class
-require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
 require_once DOL_DOCUMENT_ROOT . '/expensereport/class/expensereport.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
@@ -74,7 +74,7 @@ if ($user->societe_id > 0)
 if (! $user->rights->accounting->bind->write)
 	accessforbidden();
 
-$formventilation = new FormVentilation($db);
+$formaccounting = new FormAccounting($db);
 
 
 /*
@@ -226,7 +226,7 @@ if ($result) {
 	print $langs->trans("DescVentilDoneExpenseReport") . '<br>';
 
 	print '<br><div class="inline-block divButAction">' . $langs->trans("ChangeAccount") . '<br>';
-	print $formventilation->select_account(GETPOST('account_parent'), 'account_parent', 1);
+	print $formaccounting->select_account(GETPOST('account_parent'), 'account_parent', 1);
 	print '<input type="submit" class="button valignmiddle" value="' . $langs->trans("ChangeBinding") . '" /></div>';
 
 	$moreforfilter = '';
diff --git a/htdocs/accountancy/expensereport/list.php b/htdocs/accountancy/expensereport/list.php
index 72316e4c4d6..b1a86c96838 100644
--- a/htdocs/accountancy/expensereport/list.php
+++ b/htdocs/accountancy/expensereport/list.php
@@ -29,7 +29,7 @@ require '../../main.inc.php';
 
 // Class
 require_once DOL_DOCUMENT_ROOT . '/expensereport/class/expensereport.class.php';
-require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
 require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
 
@@ -83,7 +83,7 @@ if ($user->societe_id > 0)
 if (! $user->rights->accounting->bind->write)
 	accessforbidden();
 
-$formventilation = new FormVentilation($db);
+$formaccounting = new FormAccounting($db);
 $accounting = new AccountingAccount($db);
 
 
@@ -343,7 +343,7 @@ if ($result) {
 
 		// Suggested accounting account
 		print '<td align="center">';
-		print $formventilation->select_account($objp->aarowid_suggest, 'codeventil'.$objp->rowid, 1, array(), 0, 0, 'maxwidth300 maxwidthonsmartphone', 'cachewithshowemptyone');
+		print $formaccounting->select_account($objp->aarowid_suggest, 'codeventil'.$objp->rowid, 1, array(), 0, 0, 'maxwidth300 maxwidthonsmartphone', 'cachewithshowemptyone');
 		print '</td>';
 
 		print '<td align="center">';
diff --git a/htdocs/accountancy/supplier/card.php b/htdocs/accountancy/supplier/card.php
index b7c5979aa7a..47a99c88496 100644
--- a/htdocs/accountancy/supplier/card.php
+++ b/htdocs/accountancy/supplier/card.php
@@ -1,11 +1,11 @@
 <?php
 /* Copyright (C) 2004       Rodolphe Quiedeville  <rodolphe@quiedeville.org>
  * Copyright (C) 2005       Simon TOSSER          <simon@kornog-computing.com>
- * Copyright (C) 2013-2015  Alexandre Spangaro    <aspangaro.dolibarr@gmail.com>
+ * Copyright (C) 2013-2017  Alexandre Spangaro    <aspangaro.dolibarr@gmail.com>
  * Copyright (C) 2013-2014  Olivier Geffroy       <jeff@jeffinfo.com>
- * Copyright (C) 2013-2014	Florian Henry	      <florian.henry@open-concept.pro>
- * Copyright (C) 2014	    Juanjo Menent		  <jmenent@2byte.es>
- * Copyright (C) 2015       Jean-François Ferry	  <jfefe@aternatik.fr>
+ * Copyright (C) 2013-2014  Florian Henry         <florian.henry@open-concept.pro>
+ * Copyright (C) 2014       Juanjo Menent         <jmenent@2byte.es>
+ * Copyright (C) 2015       Jean-François Ferry   <jfefe@aternatik.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
@@ -30,7 +30,7 @@ require '../../main.inc.php';
 
 // Class
 require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.facture.class.php';
-require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
 
 // Langs
 $langs->load("bills");
@@ -52,11 +52,11 @@ if ($user->societe_id > 0)
 if ($action == 'ventil' && $user->rights->accounting->bind->write) {
 	if (! GETPOST('cancel', 'alpha')) {
 	    if ($codeventil < 0) $codeventil = 0;
-	    
+
 		$sql = " UPDATE " . MAIN_DB_PREFIX . "facture_fourn_det";
 		$sql .= " SET fk_code_ventilation = " . $codeventil;
 		$sql .= " WHERE rowid = " . $id;
-		
+
 		$resql = $db->query($sql);
 		if (! $resql) {
 			setEventMessages($db->lasterror(), null, 'errors');
@@ -85,7 +85,7 @@ if ($cancel == $langs->trans("Cancel")) {
 // Create
 $form = new Form($db);
 $facturefournisseur_static = new FactureFournisseur($db);
-$formventilation = new FormVentilation($db);
+$formaccounting = new FormAccounting($db);
 
 if (! empty($id)) {
 	$sql = "SELECT f.ref as facnumber, f.rowid as facid, l.fk_product, l.description, l.rowid, l.fk_code_ventilation, ";
@@ -107,41 +107,41 @@ if (! empty($id)) {
 		
 		if ($num_lines) {
 			$objp = $db->fetch_object($result);
-			
+
 			print '<form action="' . $_SERVER["PHP_SELF"] . '?id=' . $id . '" method="post">' . "\n";
 			print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
 			print '<input type="hidden" name="action" value="ventil">';
-			
+
 			print load_fiche_titre($langs->trans('SuppliersVentilation'), '', 'title_setup');
-			
+
 			dol_fiche_head();
-			
+
 			print '<table class="border" width="100%">';
-			
+
 			// ref invoice
 			print '<tr><td>' . $langs->trans("BillsSuppliers") . '</td>';
 			$facturefournisseur_static->ref = $objp->facnumber;
 			$facturefournisseur_static->id = $objp->facid;
 			print '<td>' . $facturefournisseur_static->getNomUrl(1) . '</td>';
 			print '</tr>';
-			
+
 			print '<tr><td width="20%">' . $langs->trans("Line") . '</td>';
 			print '<td>' . stripslashes(nl2br($objp->description)) . '</td></tr>';
 			print '<tr><td width="20%">' . $langs->trans("ProductLabel") . '</td>';
 			print '<td>' . dol_trunc($objp->product_label, 24) . '</td>';
 			print '<tr><td width="20%">' . $langs->trans("Account") . '</td><td>';
-			print $formventilation->select_account($objp->fk_code_ventilation, 'codeventil', 1);
+			print $formaccounting->select_account($objp->fk_code_ventilation, 'codeventil', 1);
 			print '</td></tr>';
 			print '</table>';
-			
+
 			dol_fiche_end();
-			
+
 			print '<div class="center">';
 			print '<input class="button" type="submit" value="' . $langs->trans("Save") . '">';
 			print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
 			print '<input class="button" type="submit" name="cancel" value="' . $langs->trans("Cancel") . '">';
 			print '</div>';
-			
+
 			print '</form>';
 		} else {
 			print "Error";
diff --git a/htdocs/accountancy/supplier/lines.php b/htdocs/accountancy/supplier/lines.php
index 1a95262f861..2757b6d8aec 100644
--- a/htdocs/accountancy/supplier/lines.php
+++ b/htdocs/accountancy/supplier/lines.php
@@ -1,9 +1,9 @@
 <?php
 /* Copyright (C) 2013-2016 Olivier Geffroy		<jeff@jeffinfo.com>
- * Copyright (C) 2013-2016 Alexandre Spangaro	<aspangaro.dolibarr@gmail.com>
+ * Copyright (C) 2013-2017 Alexandre Spangaro	<aspangaro.dolibarr@gmail.com>
  * Copyright (C) 2014-2015 Ari Elbaz (elarifr)	<github@accedinfo.com>  
  * Copyright (C) 2013-2016 Florian Henry		<florian.henry@open-concept.pro>
- * Copyright (C) 2014	   Juanjo Menent		<jmenent@2byte.es>
+ * Copyright (C) 2014      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
@@ -27,7 +27,7 @@
 require '../../main.inc.php';
 
 // Class
-require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
 require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.facture.class.php';
 require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
@@ -76,7 +76,7 @@ if ($user->societe_id > 0)
 if (! $user->rights->accounting->bind->write)
 	accessforbidden();
 
-$formventilation = new FormVentilation($db);
+$formaccounting = new FormAccounting($db);
 
 
 /*
@@ -237,7 +237,7 @@ if ($result) {
 	print $langs->trans("DescVentilDoneSupplier") . '<br>';
 	
 	print '<br><div class="inline-block divButAction">' . $langs->trans("ChangeAccount") . '<br>';
-	print $formventilation->select_account(GETPOST('account_parent'), 'account_parent', 1);
+	print $formaccounting->select_account(GETPOST('account_parent'), 'account_parent', 1);
 	print '<input type="submit" class="button valignmiddle" value="' . $langs->trans("ChangeBinding") . '" /></div>';
 	
 	$moreforfilter = '';
diff --git a/htdocs/accountancy/supplier/list.php b/htdocs/accountancy/supplier/list.php
index 061e465b1e7..9c822425a1c 100644
--- a/htdocs/accountancy/supplier/list.php
+++ b/htdocs/accountancy/supplier/list.php
@@ -1,10 +1,10 @@
 <?php
 /* Copyright (C) 2013-2014	Olivier Geffroy			<jeff@jeffinfo.com>
- * Copyright (C) 2013-2016	Alexandre Spangaro		<aspangaro.dolibarr@gmail.com>
+ * Copyright (C) 2013-2017	Alexandre Spangaro		<aspangaro.dolibarr@gmail.com>
  * Copyright (C) 2014-2015	Ari Elbaz (elarifr)		<github@accedinfo.com>
  * Copyright (C) 2013-2014	Florian Henry			<florian.henry@open-concept.pro>
  * Copyright (C) 2014		Juanjo Menent			<jmenent@2byte.es>s
- * Copyright (C) 2016	  	Laurent Destailleur     <eldy@users.sourceforge.net>
+ * Copyright (C) 2016		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
@@ -30,7 +30,7 @@ require '../../main.inc.php';
 // Class
 require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.facture.class.php';
 require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.product.class.php';
-require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
 require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
 
@@ -85,7 +85,7 @@ if ($user->societe_id > 0)
 if (! $user->rights->accounting->bind->write)
 	accessforbidden();
 
-$formventilation = new FormVentilation($db);
+$formaccounting = new FormAccounting($db);
 $accounting = new AccountingAccount($db);
 // TODO: we should need to check if result is a really exist accountaccount rowid.....
 $aarowid_s = $accounting->fetch('', $conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT, 1);
@@ -238,11 +238,11 @@ if ($result) {
 	$i = 0;
 
 	$arrayofselected=is_array($toselect)?$toselect:array();
-	
+
 	$param='';
 	if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
 	if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
-	
+
 	$arrayofmassactions =  array(
 	    'ventil'=>$langs->trans("Ventilate")
 	    //'presend'=>$langs->trans("SendByMail"),
@@ -251,8 +251,7 @@ if ($result) {
 	//if ($user->rights->mymodule->supprimer) $arrayofmassactions['delete']=$langs->trans("Delete");
 	//if ($massaction == 'presend') $arrayofmassactions=array();
 	$massactionbutton=$form->selectMassAction('ventil', $arrayofmassactions, 1);
-	
-	
+
 	print '<form action="' . $_SERVER["PHP_SELF"] . '" method="post">' . "\n";
 	print '<input type="hidden" name="action" value="ventil">';
 	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
@@ -261,15 +260,15 @@ if ($result) {
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 	print '<input type="hidden" name="page" value="'.$page.'">';
-	
+
 	print_barre_liste($langs->trans("InvoiceLines"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num_lines, $nbtotalofrecords, 'title_accountancy', 0, '', '', $limit);
 
 	print $langs->trans("DescVentilTodoCustomer") . '</br><br>';
 
 	if ($msg) print $msg.'<br>';
-	
+
 	$moreforfilter = '';
-	
+
     print '<div class="div-table-responsive">';
 
     print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
@@ -329,7 +328,7 @@ if ($result) {
 		$productfourn_static->id = $objp->product_id;
 		$productfourn_static->type = $objp->type;
 		$productfourn_static->label = $objp->product_label;
-		
+
 		$facturefourn_static->ref = $objp->ref;
 		$facturefourn_static->id = $objp->facid;
 		$facturefourn_static->type = $objp->type;
@@ -347,14 +346,14 @@ if ($result) {
 				$objp->aarowid_suggest = $aarowid_p;
 		}
 		if ($objp->code_buy_l == -1) $objp->code_buy_l='';
-		
+
 		if (! empty($objp->code_buy)) {
 			$objp->code_buy_p = $objp->code_buy;       // Code on product
 		} else {
 			$code_buy_p_notset = 'color:orange';
 		}
 		if (empty($objp->code_buy_l) && empty($objp->code_buy_p)) $code_buy_p_notset = 'color:red';
-		
+
 		// $objp->code_buy_p is now code of product/service
 		// $objp->code_buy_l is now default code of product/service
 					
@@ -362,23 +361,23 @@ if ($result) {
 
 		// Line id
 		print '<td>' . $objp->rowid . '</td>';
-		
+
 		// Ref Invoice
 		print '<td>' . $facturefourn_static->getNomUrl(1) . '</td>';
 
 		print '<td class="tdoverflowonsmartphone">';
 		print $objp->invoice_label;
 		print '</td>';
-		
+
 		print '<td align="center">' . dol_print_date($db->jdate($objp->datef), 'day') . '</td>';
-		
+
 		// Ref product
 		print '<td>';
 		if ($productfourn_static->id)
 			print $productfourn_static->getNomUrl(1);
 		if ($objp->product_label) print '<br>'.$objp->product_label;
         print '</td>';
-        
+
         // Description
 		print '<td>';
 		$text = dolGetFirstLineOfText(dol_string_nohtmltag($objp->description));
@@ -409,9 +408,9 @@ if ($result) {
 
 		// Suggested accounting account
 		print '<td align="center">';
-		print $formventilation->select_account($objp->aarowid_suggest, 'codeventil'.$objp->rowid, 1, array(), 0, 0, 'maxwidth300 maxwidthonsmartphone', 'cachewithshowemptyone');
+		print $formaccounting->select_account($objp->aarowid_suggest, 'codeventil'.$objp->rowid, 1, array(), 0, 0, 'maxwidth300 maxwidthonsmartphone', 'cachewithshowemptyone');
 		print '</td>';
-		
+
 		// Colonne choix ligne a ventiler
 		print '<td align="center">';
 		print '<input type="checkbox" class="flat checkforselect" name="toselect[]" value="' . $objp->rowid . "_" . $i . '"' . ($objp->aarowid ? "checked" : "") . '/>';
diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 28db9ef8b49..913fcf75de6 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -39,7 +39,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
-if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
+if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
 
 $langs->load("errors");
 $langs->load("admin");
@@ -1662,7 +1662,7 @@ function fieldList($fieldlist, $obj='', $tabname='', $context='')
 
 	$formadmin = new FormAdmin($db);
 	$formcompany = new FormCompany($db);
-	if (! empty($conf->accounting->enabled)) $formaccountancy = new FormVentilation($db);
+	if (! empty($conf->accounting->enabled)) $formaccounting = new FormAccounting($db);
 
 	foreach ($fieldlist as $field => $value)
 	{
@@ -1811,7 +1811,7 @@ function fieldList($fieldlist, $obj='', $tabname='', $context='')
 			{
 			    $fieldname = $fieldlist[$field];
 				$accountancy_account = (! empty($obj->$fieldname) ? $obj->$fieldname : 0);
-				print $formaccountancy->select_account($accountancy_account, $fieldlist[$field], 1, '', 1, 1, 'maxwidth200 maxwidthonsmartphone');
+				print $formaccounting->select_account($accountancy_account, $fieldlist[$field], 1, '', 1, 1, 'maxwidth200 maxwidthonsmartphone');
 			}
 			else
 			{
diff --git a/htdocs/admin/loan.php b/htdocs/admin/loan.php
index 86d963ed54f..c3e8bad9f6d 100644
--- a/htdocs/admin/loan.php
+++ b/htdocs/admin/loan.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2014-2016	Alexandre Spangaro	<aspangaro.dolibarr@gmail.com>
+/* Copyright (C) 2014-2017  Alexandre Spangaro	<aspangaro.dolibarr@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
@@ -26,7 +26,7 @@ require '../main.inc.php';
 	
 // Class
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
-if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
+if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
 
 $langs->load("admin");
 $langs->load("loan");
@@ -77,7 +77,7 @@ if ($action == 'update')
 llxHeader();
 
 $form = new Form($db);
-if (! empty($conf->accounting->enabled)) $formaccountancy = New FormVentilation($db);
+if (! empty($conf->accounting->enabled)) $formaccounting = New FormAccounting($db);
 
 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
 print load_fiche_titre($langs->trans('ConfigLoan'),$linkback,'title_setup');
@@ -106,7 +106,7 @@ foreach ($list as $key)
 	print '<td>';
 	if (! empty($conf->accounting->enabled))
 	{
-		print $formaccountancy->select_account($conf->global->$key, $key, 1, '', 1, 1);
+		print $formaccounting->select_account($conf->global->$key, $key, 1, '', 1, 1);
 	}
 	else
 	{
diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php
index b9e5df738ad..caea3bef9f7 100644
--- a/htdocs/admin/mails_templates.php
+++ b/htdocs/admin/mails_templates.php
@@ -39,7 +39,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
-if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
+if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
 
 $langs->load("errors");
 $langs->load("admin");
@@ -841,7 +841,7 @@ function fieldList($fieldlist, $obj='', $tabname='', $context='')
 
 	$formadmin = new FormAdmin($db);
 	$formcompany = new FormCompany($db);
-	if (! empty($conf->accounting->enabled)) $formaccountancy = new FormVentilation($db);
+	if (! empty($conf->accounting->enabled)) $formaccounting = new FormAccounting($db);
 
 	foreach ($fieldlist as $field => $value)
 	{
diff --git a/htdocs/admin/salaries.php b/htdocs/admin/salaries.php
index 8f115d3963b..85603de2ae5 100644
--- a/htdocs/admin/salaries.php
+++ b/htdocs/admin/salaries.php
@@ -26,7 +26,7 @@ require '../main.inc.php';
 
 // Class
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
-if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
+if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
 
 $langs->load("admin");
 $langs->load("salaries");
@@ -76,7 +76,7 @@ if ($action == 'update')
 llxHeader('',$langs->trans('SalariesSetup'));
 
 $form = new Form($db);
-if (! empty($conf->accounting->enabled)) $formaccountancy = New FormVentilation($db);
+if (! empty($conf->accounting->enabled)) $formaccounting = New FormAccounting($db);
 
 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
 print load_fiche_titre($langs->trans('SalariesSetup'),$linkback,'title_setup');
@@ -109,7 +109,7 @@ foreach ($list as $key)
 	print '<td>';
 	if (! empty($conf->accounting->enabled))
 	{
-		print $formaccountancy->select_account($conf->global->$key, $key, 1, '', 1, 1);
+		print $formaccounting->select_account($conf->global->$key, $key, 1, '', 1, 1);
 	}
 	else
 	{
diff --git a/htdocs/admin/taxes.php b/htdocs/admin/taxes.php
index dbdce59c3c5..59796919a8b 100644
--- a/htdocs/admin/taxes.php
+++ b/htdocs/admin/taxes.php
@@ -27,7 +27,7 @@
 
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/admin.lib.php';
-if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
+if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
 
 $langs->load('admin');
 
@@ -113,7 +113,7 @@ if ($action == 'update') {
 
 llxHeader();
 $form=new Form($db);
-if (! empty($conf->accounting->enabled)) $formaccountancy = New FormVentilation($db);
+if (! empty($conf->accounting->enabled)) $formaccounting = New FormAccounting($db);
 
 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
 print load_fiche_titre($langs->trans('TaxSetup'),$linkback,'title_setup');
@@ -216,7 +216,7 @@ foreach ($list as $key)
 	print '<td>';
 	if (! empty($conf->accounting->enabled))
 	{
-		print $formaccountancy->select_account($conf->global->$key, $key, 1, '', 1, 1);
+		print $formaccounting->select_account($conf->global->$key, $key, 1, '', 1, 1);
 	}
 	else
 	{
diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index a8263a74916..2cb90b6a44a 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -35,7 +35,6 @@ require_once DOL_DOCUMENT_ROOT . '/core/class/html.formbank.class.php';
 require_once DOL_DOCUMENT_ROOT . '/compta/bank/class/account.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php';
 if (! empty($conf->categorie->enabled)) require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
-if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
 if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
 if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php';
 if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php';
@@ -281,8 +280,7 @@ if ($action == 'confirm_delete' && $_POST["confirm"] == "yes" && $user->rights->
 $form = new Form($db);
 $formbank = new FormBank($db);
 $formcompany = new FormCompany($db);
-if (! empty($conf->accounting->enabled)) $formaccountancy = New FormVentilation($db);
-if (! empty($conf->accounting->enabled)) $formaccountancy2 = New FormAccounting($db);
+if (! empty($conf->accounting->enabled)) $formaccounting = New FormAccounting($db);
 
 $countrynotdefined=$langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')';
 
@@ -511,7 +509,7 @@ if ($action == 'create')
 	{
 		print '<tr><td class="'.$fieldrequired.'titlefieldcreate">'.$langs->trans("AccountancyCode").'</td>';
 		print '<td>';
-		print $formaccountancy->select_account($object->account_number, 'account_number', 1, '', 1, 1);
+		print $formaccounting->select_account($object->account_number, 'account_number', 1, '', 1, 1);
 		print '</td></tr>';
 	}
 	else
@@ -525,7 +523,7 @@ if ($action == 'create')
 	{
 		print '<tr><td>'.$langs->trans("AccountancyJournal").'</td>';
 	    print '<td>';
-		print $formaccountancy2->select_journal($object->fk_accountancy_journal, 'fk_accountancy_journal', 4, 1, '', 0, 0);
+		print $formaccounting->select_journal($object->fk_accountancy_journal, 'fk_accountancy_journal', 4, 1, '', 0, 0);
 		print '</td></tr>';
 	}
 
@@ -957,43 +955,42 @@ else
 
 
 		//print '<div class="underbanner clearboth"></div>';
-		
+
 		print '<table class="border" width="100%">';
-		
+
 		// Accountancy code
 		$tdextra = ' class="titlefieldcreate"';
-		
+
 		if (!empty($conf->global->MAIN_BANK_ACCOUNTANCY_CODE_ALWAYS_REQUIRED)) {
 		    $tdextra = ' class="fieldrequired titlefieldcreate"';
 		}
-		
+
 		print '<tr class="liste_titre_add"><td'.$tdextra.'>'.$langs->trans("AccountancyCode").'</td>';
 		print '<td>';
 		if (!empty($conf->accounting->enabled)) {
-		    print $formaccountancy->select_account($object->account_number, 'account_number', 1, '', 1, 1);
+		    print $formaccounting->select_account($object->account_number, 'account_number', 1, '', 1, 1);
 		} else {
 		    print '<input type="text" name="account_number" value="'.(GETPOST("account_number") ? GETPOST("account_number") : $object->account_number).'">';
 		}
 		print '</td></tr>';
-		
+
 		// Accountancy journal
 		if (! empty($conf->accounting->enabled))
 		{
 			print '<tr><td>'.$langs->trans("AccountancyJournal").'</td>';
 			print '<td>';
-			print $formaccountancy2->select_journal($object->fk_accountancy_journal, 'fk_accountancy_journal', 4, 1, '', 0, 0);
+			print $formaccounting->select_journal($object->fk_accountancy_journal, 'fk_accountancy_journal', 4, 1, '', 0, 0);
 			print '</td></tr>';
 		}
-		
+
 		print '</table>';
-		
-		
+
 		if ($_POST["type"] == Account::TYPE_SAVINGS || $_POST["type"] == Account::TYPE_CURRENT)
 		{
 		    print '<br>';
-		    
+
 		    //print '<div class="underbanner clearboth"></div>';
-		    
+
 			print '<table class="border" width="100%">';
 
 			// If bank account
diff --git a/htdocs/compta/bank/various_payment/card.php b/htdocs/compta/bank/various_payment/card.php
index 4875ac593c6..20c49c71468 100644
--- a/htdocs/compta/bank/various_payment/card.php
+++ b/htdocs/compta/bank/various_payment/card.php
@@ -26,7 +26,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/paymentvarious.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/accountancy/class/html.formventilation.class.php';
+if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
 if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
 
 $langs->load("compta");
@@ -180,7 +180,7 @@ if ($action == 'delete')
 llxHeader("",$langs->trans("VariousPayment"));
 
 $form = new Form($db);
-if (! empty($conf->accounting->enabled)) $formaccountancy = New FormVentilation($db);
+if (! empty($conf->accounting->enabled)) $formaccounting = New FormAccounting($db);
 
 if ($id)
 {
@@ -271,9 +271,9 @@ if ($action == 'create')
 	{
 		print '<tr><td>'.$langs->trans("AccountAccounting").'</td>';
         print '<td>';
-		print $formaccountancy->select_account($accountancy_code, 'accountancy_code', 1, null, 1, 1, '');
+		print $formaccounting->select_account($accountancy_code, 'accountancy_code', 1, null, 1, 1, '');
         print '</td></tr>';
-	}			
+	}
 	else // For external software 
 	{
 		print '<tr><td>'.$langs->trans("AccountAccounting").'</td>';
diff --git a/htdocs/core/class/html.formaccounting.class.php b/htdocs/core/class/html.formaccounting.class.php
index 97f31f05e99..3ad3721c9d4 100644
--- a/htdocs/core/class/html.formaccounting.class.php
+++ b/htdocs/core/class/html.formaccounting.class.php
@@ -1,5 +1,9 @@
 <?php
-/* Copyright (C) 2016-2017	Alexandre Spangaro	<aspangaro@zendsi.com>
+/* Copyright (C) 2013-2016 Florian Henry        <florian.henry@open-concept.pro>
+ * Copyright (C) 2013-2014 Olivier Geffroy      <jeff@jeffinfo.com>
+ * Copyright (C) 2015      Ari Elbaz (elarifr)  <github@accedinfo.com>
+ * Copyright (C) 2016      Marcos García        <marcosgdf@gmail.com>
+ * Copyright (C) 2016-2017 Alexandre Spangaro   <aspangaro@zendsi.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
@@ -28,7 +32,7 @@
 class FormAccounting extends Form
 {
 
-    private $options_cache = array();
+	private $options_cache = array();
 
 	var $db;
 	var $error;
@@ -205,5 +209,261 @@ class FormAccounting extends Form
         
         print $out;
     }
+
+	/**
+	 * Return select filter with date of transaction
+	 *
+	 * @param string $htmlname Name of select field
+	 * @param string $selectedkey Value
+	 * @return string HTML edit field
+	 */
+	function select_bookkeeping_importkey($htmlname = 'importkey', $selectedkey = '') {
+		$options = array();
+
+		$sql = 'SELECT DISTINCT import_key from ' . MAIN_DB_PREFIX . 'accounting_bookkeeping';
+	    $sql .= " WHERE entity IN (" . getEntity("accountancy", 1) . ")";
+		$sql .= ' ORDER BY import_key DESC';
+
+		dol_syslog(get_class($this) . "::select_bookkeeping_importkey", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+
+		if (!$resql) {
+			$this->error = "Error " . $this->db->lasterror();
+			dol_syslog(get_class($this) . "::select_bookkeeping_importkey " . $this->error, LOG_ERR);
+			return - 1;
+		}
+
+		while ($obj = $this->db->fetch_object($resql)) {
+			$options[$obj->import_key] = dol_print_date($obj->import_key, 'dayhourtext');
+		}
+
+		return Form::selectarray($htmlname, $options, $selectedkey);
+	}
+
+	/**
+	 * Return list of accounts with label by chart of accounts
+	 *
+	 * @param string   $selectid           Preselected id or code of accounting accounts (depends on $select_in)
+	 * @param string   $htmlname           Name of field in html form
+	 * @param int      $showempty          Add an empty field
+	 * @param array    $event              Event options
+	 * @param int      $select_in          0=selectid value is a aa.rowid (default) or 1=selectid is aa.account_number
+	 * @param int      $select_out         Set value returned by select. 0=rowid (default), 1=account_number
+	 * @param string   $morecss            More css non HTML object
+	 * @param string   $usecache           Key to use to store result into a cache. Next call with same key will reuse the cache.
+	 * @return string                      String with HTML select
+	 */
+	function select_account($selectid, $htmlname = 'account', $showempty = 0, $event = array(), $select_in = 0, $select_out = 0, $morecss='maxwidth300 maxwidthonsmartphone', $usecache='')
+	{
+		global $conf;
+
+		require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
+
+		$out = '';
+		
+    	$options = array();
+		if ($usecache && ! empty($this->options_cache[$usecache]))
+		{
+		    $options = $this->options_cache[$usecache];
+		    $selected=$selectid;
+		}
+		else
+		{
+    		$trunclength = defined('ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT') ? $conf->global->ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT : 50;
+
+    		$sql = "SELECT DISTINCT aa.account_number, aa.label, aa.rowid, aa.fk_pcg_version";
+    		$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_account as aa";
+    		$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "accounting_system as asy ON aa.fk_pcg_version = asy.pcg_version";
+    		$sql .= " AND asy.rowid = " . $conf->global->CHARTOFACCOUNTS;
+    		$sql .= " AND aa.active = 1";
+    		$sql .= " ORDER BY aa.account_number";
+
+    		dol_syslog(get_class($this) . "::select_account", LOG_DEBUG);
+    		$resql = $this->db->query($sql);
+
+    		if (!$resql) {
+    			$this->error = "Error " . $this->db->lasterror();
+    			dol_syslog(get_class($this) . "::select_account " . $this->error, LOG_ERR);
+    			return -1;
+    		}
+
+    		$out .= ajax_combobox($htmlname, $event);
+
+    		$selected = 0;
+    		while ($obj = $this->db->fetch_object($resql))
+    		{
+    			$label = length_accountg($obj->account_number) . ' - ' . $obj->label;
+    			$label = dol_trunc($label, $trunclength);
+
+    			$select_value_in = $obj->rowid;
+    			$select_value_out = $obj->rowid;
+
+    			// Try to guess if we have found default value
+    			if ($select_in == 1) {
+    				$select_value_in = $obj->account_number;
+    			}
+    			if ($select_out == 1) {
+    				$select_value_out = $obj->account_number;
+    			}
+    			// Remember guy's we store in database llx_facturedet the rowid of accounting_account and not the account_number
+    			// Because same account_number can be share between different accounting_system and do have the same meaning
+    			if ($selectid != '' && $selectid == $select_value_in) {
+    			    //var_dump("Found ".$selectid." ".$select_value_in);
+    				$selected = $select_value_out;
+    			}
+
+    			$options[$select_value_out] = $label;
+    		}
+    		$this->db->free($resql);
+
+    		if ($usecache)
+    		{
+                $this->options_cache[$usecache] = $options;
+    		}
+		}
+
+		$out .= Form::selectarray($htmlname, $options, $selected, $showempty, 0, 0, '', 0, 0, 0, '', $morecss, 1);
+
+		return $out;
+	}
+
+	/**
+	 * Return list of auxilary thirdparty accounts
+	 *
+	 * @param string $selectid Preselected pcg_type
+	 * @param string $htmlname Name of field in html form
+	 * @param int $showempty Add an empty field
+	 * @param array $event Event options
+	 *
+	 * @return string String with HTML select
+	 */
+	function select_auxaccount($selectid, $htmlname = 'account_num_aux', $showempty = 0, $event = array()) {
+
+		$aux_account = array();
+
+		// Auxiliary customer account
+		$sql = "SELECT DISTINCT code_compta, nom ";
+		$sql .= " FROM ".MAIN_DB_PREFIX."societe";
+	    $sql .= " WHERE entity IN (" . getEntity("societe", 1) . ")";
+		$sql .= " ORDER BY code_compta";
+		dol_syslog(get_class($this)."::select_auxaccount", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			while ($obj = $this->db->fetch_object($resql)) {
+				if (!empty($obj->code_compta)) {
+					$aux_account[$obj->code_compta] = $obj->code_compta.' ('.$obj->nom.')';
+				}
+			}
+		} else {
+			$this->error = "Error ".$this->db->lasterror();
+			dol_syslog(get_class($this)."::select_pcgsubtype ".$this->error, LOG_ERR);
+			return -1;
+		}
+		$this->db->free($resql);
+
+		// Auxiliary supplier account
+		$sql = "SELECT DISTINCT code_compta_fournisseur, nom ";
+		$sql .= " FROM ".MAIN_DB_PREFIX."societe";
+		$sql .= " WHERE entity IN (" . getEntity("societe", 1) . ")";
+		$sql .= " ORDER BY code_compta_fournisseur";
+		dol_syslog(get_class($this)."::select_auxaccount", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			while ($obj = $this->db->fetch_object($resql)) {
+				if (!empty($obj->code_compta_fournisseur)) {
+					$aux_account[$obj->code_compta_fournisseur] = $obj->code_compta_fournisseur.' ('.$obj->nom.')';
+				}
+			}
+		} else {
+			$this->error = "Error ".$this->db->lasterror();
+			dol_syslog(get_class($this)."::select_pcgsubtype ".$this->error, LOG_ERR);
+			return -1;
+		}
+		$this->db->free($resql);
+
+		// Build select
+		$out = ajax_combobox($htmlname, $event);
+		$out .= Form::selectarray($htmlname, $aux_account, $selectid, $showempty, 0, 0, '', 0, 0, 0, '', 'maxwidth300');
+
+		return $out;
+	}
+
+	/**
+	 * Return HTML combo list of years existing into book keepping
+	 *
+	 * @param string $selected Preselected value
+	 * @param string $htmlname Name of HTML select object
+	 * @param int $useempty Affiche valeur vide dans liste
+	 * @param string $output_format (html/opton (for option html only)/array (to return options arrays
+	 * @return string/array
+	 */
+	function selectyear_accountancy_bookkepping($selected = '', $htmlname = 'yearid', $useempty = 0, $output_format = 'html')
+	{
+	    global $conf;
+
+		$out_array = array();
+
+		$sql = "SELECT DISTINCT date_format(doc_date,'%Y') as dtyear";
+		$sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping";
+	    $sql .= " WHERE entity IN (" . getEntity("accountancy", 1) . ")";
+		$sql .= " ORDER BY date_format(doc_date,'%Y')";
+		dol_syslog(get_class($this)."::".__METHOD__, LOG_DEBUG);
+		$resql = $this->db->query($sql);
+
+		if (!$resql) {
+			$this->error = "Error ".$this->db->lasterror();
+			dol_syslog(get_class($this)."::".__METHOD__.$this->error, LOG_ERR);
+			return -1;
+		}
+		while ($obj = $this->db->fetch_object($resql)) {
+			$out_array[$obj->dtyear] = $obj->dtyear;
+		}
+		$this->db->free($resql);
+
+		if ($output_format == 'html') {
+			return Form::selectarray($htmlname, $out_array, $selected, $useempty, 0, 0, 'placeholder="aa"');
+		} else {
+			return $out_array;
+		}
+	}
+
+	/**
+	 * Return HTML combo list of years existing into book keepping
+	 *
+	 * @param  string          $selected       Preselected value
+	 * @param  string          $htmlname       Name of HTML select object
+	 * @param  int             $useempty       Affiche valeur vide dans liste
+	 * @param  string          $output_format  Html/option (for option html only)/array (to return options arrays
+	 * @return string/array
+	 */
+	function selectjournal_accountancy_bookkepping($selected = '', $htmlname = 'journalid', $useempty = 0, $output_format = 'html')
+	{
+	    global $conf,$langs;
+
+		$out_array = array();
+
+		$sql = "SELECT DISTINCT code_journal";
+		$sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping";
+	    $sql .= " WHERE entity IN (" . getEntity("accountancy", 1) . ")";
+		$sql .= " ORDER BY code_journal";
+		dol_syslog(get_class($this)."::".__METHOD__, LOG_DEBUG);
+		$resql = $this->db->query($sql);
+
+		if (!$resql) {
+			$this->error = "Error ".$this->db->lasterror();
+			dol_syslog(get_class($this)."::".__METHOD__.$this->error, LOG_ERR);
+			return -1;
+		}
+		while ($obj = $this->db->fetch_object($resql)) {
+			$out_array[$obj->code_journal] = $obj->code_journal?$obj->code_journal:$langs->trans("NotDefined");  // TODO Not defined is accepted ? We should avoid this, shouldn't we ?
+		}
+		$this->db->free($resql);
+
+		if ($output_format == 'html') {
+			return Form::selectarray($htmlname, $out_array, $selected, $useempty, 0, 0, 'placeholder="aa"');
+		} else {
+			return $out_array;
+		}
+	}
 }
 
diff --git a/htdocs/don/admin/donation.php b/htdocs/don/admin/donation.php
index 2888b911700..c8d8be2461d 100644
--- a/htdocs/don/admin/donation.php
+++ b/htdocs/don/admin/donation.php
@@ -1,9 +1,9 @@
 <?php
 /* Copyright (C) 2005-2010  Laurent Destailleur  	<eldy@users.sourceforge.net>
- * Copyright (C) 2012-2015	Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2012-2015  Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2013-2017  Philippe Grand			<philippe.grand@atoo-net.com>
- * Copyright (C) 2015       Alexandre Spangaro		<aspangaro.dolibarr@gmail.com>
- * Copyright (C) 2015  		Benoit Bruchard			<benoitb21@gmail.com>
+ * Copyright (C) 2015-2017  Alexandre Spangaro		<aspangaro.dolibarr@gmail.com>
+ * Copyright (C) 2015       Benoit Bruchard			<benoitb21@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
@@ -29,7 +29,7 @@ require_once DOL_DOCUMENT_ROOT . '/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/donation.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/don/class/don.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
-if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
+if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
 
 $langs->load("admin");
 $langs->load("donations");
@@ -199,7 +199,7 @@ else if ($action == 'setart885') {
 
 $dir = "../../core/modules/dons/";
 $form=new Form($db);
-if (! empty($conf->accounting->enabled)) $formaccountancy = New FormVentilation($db);
+if (! empty($conf->accounting->enabled)) $formaccounting = New FormAccounting($db);
 
 llxHeader('',$langs->trans("DonationsSetup"),'DonConfiguration');
 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
@@ -364,7 +364,7 @@ print '<label for="DONATION_ACCOUNTINGACCOUNT">' . $label . '</label></td>';
 print '<td>';
 if (! empty($conf->accounting->enabled))
 {
-	print $formaccountancy->select_account($conf->global->DONATION_ACCOUNTINGACCOUNT, 'DONATION_ACCOUNTINGACCOUNT', 1, '', 1, 1);
+	print $formaccounting->select_account($conf->global->DONATION_ACCOUNTINGACCOUNT, 'DONATION_ACCOUNTINGACCOUNT', 1, '', 1, 1);
 }
 else
 {
@@ -401,7 +401,7 @@ if (preg_match('/fr/i',$conf->global->MAIN_INFO_SOCIETE_COUNTRY))
 	print '<tr class="liste_titre">';
 	print '<td colspan="3">' . $langs->trans('Parameters') . '</td>';
 	print "</tr>\n";
-	
+
 	print '<tr class="oddeven">';
 	print '<td width="80%">' . $langs->trans("DONATION_ART200") . '</td>';
 	if (! empty($conf->global->DONATION_ART200)) {
@@ -414,7 +414,7 @@ if (preg_match('/fr/i',$conf->global->MAIN_INFO_SOCIETE_COUNTRY))
 		print '</a></td>';
 	}
 	print '</tr>';
-	
+
 	print '<tr class="oddeven">';
 	print '<td width="80%">' . $langs->trans("DONATION_ART238") . '</td>';
 	if (! empty($conf->global->DONATION_ART238)) {
@@ -427,7 +427,7 @@ if (preg_match('/fr/i',$conf->global->MAIN_INFO_SOCIETE_COUNTRY))
 		print '</a></td>';
 	}
 	print '</tr>';
-	
+
 	print '<tr class="oddeven">';
 	print '<td width="80%">' . $langs->trans("DONATION_ART885") . '</td>';
 	if (! empty($conf->global->DONATION_ART885)) {
diff --git a/htdocs/loan/card.php b/htdocs/loan/card.php
index b58bfb929d9..81d43e46ab0 100644
--- a/htdocs/loan/card.php
+++ b/htdocs/loan/card.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2014-2016	Alexandre Spangaro   <aspangaro@zendsi.com>
+/* Copyright (C) 2014-2017	Alexandre Spangaro   <aspangaro@zendsi.com>
  * Copyright (C) 2015       Frederic France      <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -27,7 +27,7 @@ require_once DOL_DOCUMENT_ROOT.'/loan/class/loan.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/loan.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
-if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/accountancy/class/html.formventilation.class.php';
+if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
 require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 
@@ -235,7 +235,7 @@ if (empty($reshook))
 
 $form = new Form($db);
 $formproject = new FormProjets($db);
-if (! empty($conf->accounting->enabled)) $formaccountancy = New FormVentilation($db);
+if (! empty($conf->accounting->enabled)) $formaccounting = New FormAccounting($db);
 
 $title = $langs->trans("Loan") . ' - ' . $langs->trans("Card");
 $help_url = 'EN:Module_Loan|FR:Module_Emprunt';
@@ -337,19 +337,19 @@ if ($action == 'create')
 		// Accountancy_account_capital
         print '<tr><td class="titlefieldcreate">'.$langs->trans("LoanAccountancyCapitalCode").'</td>';
         print '<td>';
-		print $formaccountancy->select_account($object->accountancy_account_capital, 'accountancy_account_capital', 1, '', 0, 1);
+		print $formaccounting->select_account($object->accountancy_account_capital, 'accountancy_account_capital', 1, '', 0, 1);
         print '</td></tr>';
 
 		// Accountancy_account_insurance
         print '<tr><td>'.$langs->trans("LoanAccountancyInsuranceCode").'</td>';
         print '<td>';
-		print $formaccountancy->select_account($object->accountancy_account_insurance, 'accountancy_account_insurance', 1, '', 0, 1);
+		print $formaccounting->select_account($object->accountancy_account_insurance, 'accountancy_account_insurance', 1, '', 0, 1);
         print '</td></tr>';
 
 		// Accountancy_account_interest
         print '<tr><td>'.$langs->trans("LoanAccountancyInterestCode").'</td>';
         print '<td>';
-		print $formaccountancy->select_account($object->accountancy_account_interest, 'accountancy_account_interest', 1, '', 0, 1);
+		print $formaccounting->select_account($object->accountancy_account_interest, 'accountancy_account_interest', 1, '', 0, 1);
         print '</td></tr>';
 	}
 	else // For external software 
@@ -541,7 +541,7 @@ if ($id > 0)
 		{
 			if (! empty($conf->accounting->enabled))
 			{
-				print $formaccountancy->select_account($object->account_capital, 'accountancy_account_capital', 1, '', 0, 1);
+				print $formaccounting->select_account($object->account_capital, 'accountancy_account_capital', 1, '', 0, 1);
 			}
 			else
 			{
@@ -566,7 +566,7 @@ if ($id > 0)
 		{
 			if (! empty($conf->accounting->enabled))
 			{
-				print $formaccountancy->select_account($object->account_insurance, 'accountancy_account_insurance', 1, '', 0, 1);
+				print $formaccounting->select_account($object->account_insurance, 'accountancy_account_insurance', 1, '', 0, 1);
 			}
 			else
 			{
@@ -591,7 +591,7 @@ if ($id > 0)
 		{
 			if (! empty($conf->accounting->enabled))
 			{
-				print $formaccountancy->select_account($object->account_interest, 'accountancy_account_interest', 1, '', 0, 1);
+				print $formaccounting->select_account($object->account_interest, 'accountancy_account_interest', 1, '', 0, 1);
 			}
 			else
 			{
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 7cd86404afa..2869e0f557c 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -52,7 +52,7 @@ if (! empty($conf->propal->enabled))     require_once DOL_DOCUMENT_ROOT.'/comm/p
 if (! empty($conf->facture->enabled))    require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 if (! empty($conf->commande->enabled))   require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
-if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/accountancy/class/html.formventilation.class.php';
+if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
 
 $langs->load("products");
 $langs->load("other");
@@ -808,7 +808,7 @@ llxHeader('', $title, $helpurl);
 $form = new Form($db);
 $formfile = new FormFile($db);
 $formproduct = new FormProduct($db);
-if (! empty($conf->accounting->enabled)) $formaccountancy = New FormVentilation($db);
+if (! empty($conf->accounting->enabled)) $formaccounting = New FormAccounting($db);
 
 // Load object modBarCodeProduct
 $res=0;
@@ -1113,13 +1113,13 @@ else
             // Accountancy_code_sell
             print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancySellCode").'</td>';
             print '<td>';
-		    print $formaccountancy->select_account(GETPOST('accountancy_code_sell'), 'accountancy_code_sell', 1, null, 1, 1, '');
+		    print $formaccounting->select_account(GETPOST('accountancy_code_sell'), 'accountancy_code_sell', 1, null, 1, 1, '');
             print '</td></tr>';
 
             // Accountancy_code_buy
             print '<tr><td>'.$langs->trans("ProductAccountancyBuyCode").'</td>';
             print '<td>';
-			print $formaccountancy->select_account(GETPOST('accountancy_code_buy'), 'accountancy_code_buy', 1, null, 1, 1, '');
+			print $formaccounting->select_account(GETPOST('accountancy_code_buy'), 'accountancy_code_buy', 1, null, 1, 1, '');
             print '</td></tr>';
 		}			
 		else // For external software 
@@ -1406,15 +1406,15 @@ else
                 // Accountancy_code_sell
                 print '<tr><td class="titlefield">'.$langs->trans("ProductAccountancySellCode").'</td>';
                 print '<td>';
-				print $formaccountancy->select_account($object->accountancy_code_sell, 'accountancy_code_sell', 1, '', 1, 1);
+				print $formaccounting->select_account($object->accountancy_code_sell, 'accountancy_code_sell', 1, '', 1, 1);
                 print '</td></tr>';
 
                 // Accountancy_code_buy
                 print '<tr><td>'.$langs->trans("ProductAccountancyBuyCode").'</td>';
                 print '<td>';
-				print $formaccountancy->select_account($object->accountancy_code_buy, 'accountancy_code_buy', 1, '', 1, 1);
+				print $formaccounting->select_account($object->accountancy_code_buy, 'accountancy_code_buy', 1, '', 1, 1);
                 print '</td></tr>';
-			}			
+			}
 			else // For external software 
 			{
                 // Accountancy_code_sell

From e4f5d45c4593dad2b2b39834844fec8369548715 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Thu, 25 May 2017 07:10:09 +0200
Subject: [PATCH 478/505] Remove old code
 (selectjournal_accountancy_bookkepping)

---
 htdocs/accountancy/bookkeeping/list.php       |  2 +-
 .../core/class/html.formaccounting.class.php  | 39 -------------------
 2 files changed, 1 insertion(+), 40 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index a955d671475..369dd7afcec 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -322,7 +322,7 @@ if ($action == 'delbookkeepingyear') {
 		$delyear = dol_print_date(dol_now(), '%Y');
 	}
 	$year_array = $formaccounting->selectyear_accountancy_bookkepping($delyear, 'delyear', 0, 'array');
-	$journal_array = $formaccounting->selectjournal_accountancy_bookkepping($deljournal, 'deljournal', 0, 'array');
+	$journal_array = $formaccounting->selectjournal($deljournal, 'deljournal', '', 1, 'array', 1, 1);
 
 	$form_question['delyear'] = array (
 			'name' => 'delyear',
diff --git a/htdocs/core/class/html.formaccounting.class.php b/htdocs/core/class/html.formaccounting.class.php
index 3ad3721c9d4..f3db5777783 100644
--- a/htdocs/core/class/html.formaccounting.class.php
+++ b/htdocs/core/class/html.formaccounting.class.php
@@ -426,44 +426,5 @@ class FormAccounting extends Form
 			return $out_array;
 		}
 	}
-
-	/**
-	 * Return HTML combo list of years existing into book keepping
-	 *
-	 * @param  string          $selected       Preselected value
-	 * @param  string          $htmlname       Name of HTML select object
-	 * @param  int             $useempty       Affiche valeur vide dans liste
-	 * @param  string          $output_format  Html/option (for option html only)/array (to return options arrays
-	 * @return string/array
-	 */
-	function selectjournal_accountancy_bookkepping($selected = '', $htmlname = 'journalid', $useempty = 0, $output_format = 'html')
-	{
-	    global $conf,$langs;
-
-		$out_array = array();
-
-		$sql = "SELECT DISTINCT code_journal";
-		$sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping";
-	    $sql .= " WHERE entity IN (" . getEntity("accountancy", 1) . ")";
-		$sql .= " ORDER BY code_journal";
-		dol_syslog(get_class($this)."::".__METHOD__, LOG_DEBUG);
-		$resql = $this->db->query($sql);
-
-		if (!$resql) {
-			$this->error = "Error ".$this->db->lasterror();
-			dol_syslog(get_class($this)."::".__METHOD__.$this->error, LOG_ERR);
-			return -1;
-		}
-		while ($obj = $this->db->fetch_object($resql)) {
-			$out_array[$obj->code_journal] = $obj->code_journal?$obj->code_journal:$langs->trans("NotDefined");  // TODO Not defined is accepted ? We should avoid this, shouldn't we ?
-		}
-		$this->db->free($resql);
-
-		if ($output_format == 'html') {
-			return Form::selectarray($htmlname, $out_array, $selected, $useempty, 0, 0, 'placeholder="aa"');
-		} else {
-			return $out_array;
-		}
-	}
 }
 

From db6d7d9e21c63669241dfdcf3989fbce594460fa Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Thu, 25 May 2017 07:15:36 +0200
Subject: [PATCH 479/505] Spaces

---
 .../accountancy/class/bookkeeping.class.php   | 114 +++++++++---------
 1 file changed, 57 insertions(+), 57 deletions(-)

diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index a59d92eb63a..c885d6228cb 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -1053,23 +1053,23 @@ class BookKeeping extends CommonObject
 	 */
 	function deleteByYearAndJournal($delyear='', $journal='') {
 	    global $conf;
-	    
+
 	    if (empty($delyear) && empty($journal)) 
 	    {
 	        return -1;
 	    }
-	    
+
 		$this->db->begin();
-		
+
 		// first check if line not yet in bookkeeping
 		$sql = "DELETE";
 		$sql.= " FROM " . MAIN_DB_PREFIX . $this->table_element;
 		$sql.= " WHERE 1 = 1";
 		if (! empty($delyear)) $sql.= " AND YEAR(doc_date) = " . $delyear;         // FIXME Must use between
 		if (! empty($journal)) $sql.= " AND code_journal = '".$journal."'";
-	    $sql .= " AND entity IN (" . getEntity("accountancy", 1) . ")";
+		$sql .= " AND entity IN (" . getEntity("accountancy", 1) . ")";
 		$resql = $this->db->query($sql);
-		
+
 		if (! $resql) {
 			$this->errors[] = "Error " . $this->db->lasterror();
 			foreach ( $this->errors as $errmsg ) {
@@ -1083,7 +1083,7 @@ class BookKeeping extends CommonObject
 		$this->db->commit();
 		return 1;
 	}
-	
+
 	/**
 	 * Delete bookkepping by piece number
 	 *
@@ -1092,17 +1092,17 @@ class BookKeeping extends CommonObject
 	 */
 	function deleteMvtNum($piecenum) {
 	    global $conf;
-	    
+
 		$this->db->begin();
 		
 		// first check if line not yet in bookkeeping
 		$sql = "DELETE";
 		$sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element;
 		$sql .= " WHERE piece_num = " . $piecenum;
-	    $sql .= " AND entity IN (" . getEntity("accountancy", 1) . ")";
-		
+		$sql .= " AND entity IN (" . getEntity("accountancy", 1) . ")";
+
 		$resql = $this->db->query($sql);
-		
+
 		if (! $resql) {
 			$this->errors[] = "Error " . $this->db->lasterror();
 			foreach ( $this->errors as $errmsg ) {
@@ -1116,7 +1116,7 @@ class BookKeeping extends CommonObject
 		$this->db->commit();
 		return 1;
 	}
-	
+
 	/**
 	 * Load an object from its id and create a new one in database
 	 *
@@ -1130,27 +1130,27 @@ class BookKeeping extends CommonObject
 		global $user;
 		$error = 0;
 		$object = new Accountingbookkeeping($this->db);
-		
+
 		$this->db->begin();
-		
+
 		// Load source object
 		$object->fetch($fromid);
 		// Reset object
 		$object->id = 0;
-		
+
 		// Clear fields
 		// ...
-		
+
 		// Create clone
 		$result = $object->create($user);
-		
+
 		// Other options
 		if ($result < 0) {
 			$error ++;
 			$this->errors = $object->errors;
 			dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
 		}
-		
+
 		// End
 		if (! $error) {
 			$this->db->commit();
@@ -1158,11 +1158,11 @@ class BookKeeping extends CommonObject
 			return $object->id;
 		} else {
 			$this->db->rollback();
-			
+
 			return - 1;
 		}
 	}
-	
+
 	/**
 	 * Initialise object with example values
 	 * Id must be 0 if object instance is a specimen
@@ -1171,9 +1171,9 @@ class BookKeeping extends CommonObject
 	 */
 	public function initAsSpecimen() {
 		global $user;
-		
+
 		$now=dol_now();
-		
+
 		$this->id = 0;
 		$this->doc_date = $now;
 		$this->doc_type = '';
@@ -1192,7 +1192,7 @@ class BookKeeping extends CommonObject
 		$this->code_journal = '';
 		$this->piece_num = '';
 	}
-	
+
 	/**
 	 * Load an accounting document into memory from database
 	 *
@@ -1201,17 +1201,17 @@ class BookKeeping extends CommonObject
 	 */
 	public function fetchPerMvt($piecenum) {
 		global $conf;
-		
-	    $sql = "SELECT piece_num,doc_date,code_journal,doc_ref,doc_type";
+
+		$sql = "SELECT piece_num,doc_date,code_journal,doc_ref,doc_type";
 		$sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element;
 		$sql .= " WHERE piece_num = " . $piecenum;
-	    $sql .= " AND entity IN (" . getEntity("accountancy", 1) . ")";
-		
+		$sql .= " AND entity IN (" . getEntity("accountancy", 1) . ")";
+
 		dol_syslog(get_class($this) . "::" . __METHOD__, LOG_DEBUG);
 		$result = $this->db->query($sql);
 		if ($result) {
 			$obj = $this->db->fetch_object($result);
-			
+
 			$this->piece_num = $obj->piece_num;
 			$this->code_journal = $obj->code_journal;
 			$this->doc_date = $this->db->jdate($obj->doc_date);
@@ -1222,10 +1222,10 @@ class BookKeeping extends CommonObject
 			dol_syslog(get_class($this) . "::" . __METHOD__ . $this->error, LOG_ERR);
 			return - 1;
 		}
-		
+
 		return 1;
 	}
-	
+
 	/**
 	 * Return next number movement
 	 *
@@ -1233,8 +1233,8 @@ class BookKeeping extends CommonObject
 	 */
 	public function getNextNumMvt() 
 	{
-	    global $conf;
-	    
+		global $conf;
+
 		$sql = "SELECT MAX(piece_num)+1 as max FROM " . MAIN_DB_PREFIX . $this->table_element;
 	    $sql .= " WHERE entity IN (" . getEntity("accountancy", 1) . ")";
 		
@@ -1243,16 +1243,16 @@ class BookKeeping extends CommonObject
 
 		if ($result) {
 			$obj = $this->db->fetch_object($result);
-	        if ($obj) $result = $obj->max;
-	        if (empty($result)) $result = 1;
-	        return $result;
+			if ($obj) $result = $obj->max;
+			if (empty($result)) $result = 1;
+			return $result;
 		} else {
 			$this->error = "Error " . $this->db->lasterror();
 			dol_syslog(get_class($this) . "::getNextNumMvt " . $this->error, LOG_ERR);
 			return - 1;
 		}
 	}
-	
+
 	/**
 	 * Load all informations of accountancy document
 	 *
@@ -1260,26 +1260,26 @@ class BookKeeping extends CommonObject
 	 * @return int <0 if KO, >0 if OK
 	 */
 	function fetch_all_per_mvt($piecenum) {
-	    global $conf;
-	    
+		global $conf;
+
 		$sql = "SELECT rowid, doc_date, doc_type,";
 		$sql .= " doc_ref, fk_doc, fk_docdet, code_tiers,";
 		$sql .= " numero_compte, label_compte, debit, credit,";
 		$sql .= " montant, sens, fk_user_author, import_key, code_journal, piece_num";
 		$sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element;
 		$sql .= " WHERE piece_num = " . $piecenum;
-	    $sql .= " AND entity IN (" . getEntity("accountancy", 1) . ")";
-		
+		$sql .= " AND entity IN (" . getEntity("accountancy", 1) . ")";
+
 		dol_syslog(get_class($this) . "::" . __METHOD__, LOG_DEBUG);
 		$result = $this->db->query($sql);
 		if ($result) {
-			
+
 			while ( $obj = $this->db->fetch_object($result) ) {
-				
+
 				$line = new BookKeepingLine();
-				
+
 				$line->id = $obj->rowid;
-				
+
 				$line->doc_date = $this->db->jdate($obj->doc_date);
 				$line->doc_type = $obj->doc_type;
 				$line->doc_ref = $obj->doc_ref;
@@ -1294,7 +1294,7 @@ class BookKeeping extends CommonObject
 				$line->sens = $obj->sens;
 				$line->code_journal = $obj->code_journal;
 				$line->piece_num = $obj->piece_num;
-				
+
 				$this->linesmvt[] = $line;
 			}
 		} else {
@@ -1302,10 +1302,10 @@ class BookKeeping extends CommonObject
 			dol_syslog(get_class($this) . "::" . __METHOD__ . $this->error, LOG_ERR);
 			return - 1;
 		}
-		
+
 		return 1;
 	}
-	
+
 	/**
 	 * Export bookkeping
 	 *
@@ -1313,28 +1313,28 @@ class BookKeeping extends CommonObject
 	 * @return int Result
 	 */
 	function export_bookkeping($model = 'ebp') {
-	    global $conf;
-	    
+		global $conf;
+
 		$sql = "SELECT rowid, doc_date, doc_type,";
 		$sql .= " doc_ref, fk_doc, fk_docdet, code_tiers,";
 		$sql .= " numero_compte, label_compte, debit, credit,";
 		$sql .= " montant, sens, fk_user_author, import_key, code_journal, piece_num";
 		$sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element;
-	    $sql .= " WHERE entity IN (" . getEntity("accountancy", 1) . ")";
-		
+		$sql .= " WHERE entity IN (" . getEntity("accountancy", 1) . ")";
+
 		dol_syslog(get_class($this) . "::export_bookkeping", LOG_DEBUG);
-		
+
 		$resql = $this->db->query($sql);
-		
+
 		if ($resql) {
 			$this->linesexport = array ();
-			
+
 			$num = $this->db->num_rows($resql);
 			while ( $obj = $this->db->fetch_object($resql) ) {
 				$line = new BookKeepingLine();
-				
+
 				$line->id = $obj->rowid;
-				
+
 				$line->doc_date = $this->db->jdate($obj->doc_date);
 				$line->doc_type = $obj->doc_type;
 				$line->doc_ref = $obj->doc_ref;
@@ -1349,11 +1349,11 @@ class BookKeeping extends CommonObject
 				$line->sens = $obj->sens;
 				$line->code_journal = $obj->code_journal;
 				$line->piece_num = $obj->piece_num;
-				
+
 				$this->linesexport[] = $line;
 			}
 			$this->db->free($resql);
-			
+
 			return $num;
 		} else {
 			$this->error = "Error " . $this->db->lasterror();

From 18886849eb87d7f63c9bf5df2de060b4587a6247 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Thu, 25 May 2017 08:48:59 +0200
Subject: [PATCH 480/505] New: add REST api "memberstypes"

---
 .../adherents/class/adherent_type.class.php   |  25 +-
 .../class/api_memberstypes.class.php          | 322 ++++++++++++++++++
 htdocs/adherents/type.php                     |  68 ++--
 htdocs/core/class/html.form.class.php         |  54 +--
 htdocs/core/lib/functions.lib.php             | 108 +++---
 5 files changed, 455 insertions(+), 122 deletions(-)
 create mode 100644 htdocs/adherents/class/api_memberstypes.class.php

diff --git a/htdocs/adherents/class/adherent_type.class.php b/htdocs/adherents/class/adherent_type.class.php
index d6ee9958162..a7775332812 100644
--- a/htdocs/adherents/class/adherent_type.class.php
+++ b/htdocs/adherents/class/adherent_type.class.php
@@ -1,8 +1,8 @@
 <?php
-/* Copyright (C) 2002      Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2009      Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C) 2016      Charlie Benke        <charlie@patas-monkey.com>
+/* Copyright (C) 2002		Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2008	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2009-2017	Regis Houssin			<regis.houssin@capnetworks.com>
+ * Copyright (C) 2016		Charlie Benke			<charlie@patas-monkey.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
@@ -36,7 +36,13 @@ class AdherentType extends CommonObject
 	public $table_element = 'adherent_type';
 	public $element = 'adherent_type';
 	public $picto = 'group';
-	
+
+	/**
+	 * @var string
+	 * @deprecated Use label
+	 * @see label
+	 */
+	public $libelle;
 	/** @var string Label */
 	public $label;
 	/**
@@ -81,12 +87,13 @@ class AdherentType extends CommonObject
         global $conf;
 
         $this->statut=(int) $this->statut;
+        $this->label=(!empty($this->libelle)?trim($this->libelle):trim($this->label));
 
         $sql = "INSERT INTO ".MAIN_DB_PREFIX."adherent_type (";
         $sql.= "libelle";
         $sql.= ", entity";
         $sql.= ") VALUES (";
-        $sql.= "'".$this->db->escape($this->libelle)."'";
+        $sql.= "'".$this->db->escape($this->label)."'";
         $sql.= ", ".$conf->entity;
         $sql.= ")";
 
@@ -117,12 +124,12 @@ class AdherentType extends CommonObject
 
     	$error=0;
 
-        $this->libelle=trim($this->libelle);
+    	$this->label=(!empty($this->libelle)?trim($this->libelle):trim($this->label));
 
         $sql = "UPDATE ".MAIN_DB_PREFIX."adherent_type ";
         $sql.= "SET ";
         $sql.= "statut = ".$this->statut.",";
-        $sql.= "libelle = '".$this->db->escape($this->libelle) ."',";
+        $sql.= "libelle = '".$this->db->escape($this->label) ."',";
         $sql.= "subscription = '".$this->db->escape($this->subscription)."',";
         $sql.= "note = '".$this->db->escape($this->note)."',";
         $sql.= "vote = '".$this->db->escape($this->vote)."',";
@@ -307,7 +314,7 @@ class AdherentType extends CommonObject
     {
     	return '';
     }
-    
+
     /**
      *     getMailOnValid
      *
diff --git a/htdocs/adherents/class/api_memberstypes.class.php b/htdocs/adherents/class/api_memberstypes.class.php
new file mode 100644
index 00000000000..18c828eb9e5
--- /dev/null
+++ b/htdocs/adherents/class/api_memberstypes.class.php
@@ -0,0 +1,322 @@
+<?php
+/* Copyright (C) 2017	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/>.
+ */
+
+use Luracast\Restler\RestException;
+
+require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
+
+/**
+ * API class for members types
+ *
+ * @access protected
+ * @class  DolibarrApiAccess {@requires user,external}
+ */
+class MembersTypes extends DolibarrApi
+{
+    /**
+     * @var array   $FIELDS     Mandatory fields, checked when create and update object
+     */
+    static $FIELDS = array(
+        'label'
+    );
+
+    /**
+     * Constructor
+     */
+    function __construct()
+    {
+        global $db, $conf;
+        $this->db = $db;
+    }
+
+    /**
+     * Get properties of a member type object
+     *
+     * Return an array with member type informations
+     *
+     * @param     int     $id ID of member type
+     * @return    array|mixed data without useless information
+     *
+     * @throws    RestException
+     */
+    function get($id)
+    {
+        if(! DolibarrApiAccess::$user->rights->adherent->lire) {
+            throw new RestException(401);
+        }
+
+        $membertype = new AdherentType($this->db);
+        $result = $membertype->fetch($id);
+        if( ! $result ) {
+            throw new RestException(404, 'member type not found');
+        }
+
+        if( ! DolibarrApi::_checkAccessToResource('member',$membertype->id,'adherent_type')) {
+            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        }
+
+        return $this->_cleanObjectDatas($membertype);
+    }
+
+    /**
+     * List members types
+     *
+     * Get a list of members types
+     *
+     * @param string    $sortfield  Sort field
+     * @param string    $sortorder  Sort order
+     * @param int       $limit      Limit for list
+     * @param int       $page       Page number
+     * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.libelle:like:'SO-%') and (t.subscription:=:'1')"
+     * @return array                Array of member type objects
+     *
+     * @throws RestException
+     */
+    function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 0, $page = 0, $sqlfilters = '') {
+        global $db, $conf;
+
+        $obj_ret = array();
+
+        if(! DolibarrApiAccess::$user->rights->adherent->lire) {
+            throw new RestException(401);
+        }
+
+        $sql = "SELECT t.rowid";
+        $sql.= " FROM ".MAIN_DB_PREFIX."adherent_type as t";
+        $sql.= ' WHERE t.entity IN ('.getEntity('adherent', 1).')';
+
+        // Add sql filters
+        if ($sqlfilters)
+        {
+            if (! DolibarrApi::_checkFilters($sqlfilters))
+            {
+                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+            }
+	        $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+            $sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+        }
+
+        $sql.= $db->order($sortfield, $sortorder);
+        if ($limit)    {
+            if ($page < 0)
+            {
+                $page = 0;
+            }
+            $offset = $limit * $page;
+
+            $sql.= $db->plimit($limit + 1, $offset);
+        }
+
+        $result = $db->query($sql);
+        if ($result)
+        {
+            $i=0;
+            $num = $db->num_rows($result);
+            $min = min($num, ($limit <= 0 ? $num : $limit));
+            while ($i < $min)
+            {
+            	$obj = $db->fetch_object($result);
+                $membertype = new AdherentType($this->db);
+                if ($membertype->fetch($obj->rowid)) {
+                    $obj_ret[] = $this->_cleanObjectDatas($membertype);
+                }
+                $i++;
+            }
+        }
+        else {
+            throw new RestException(503, 'Error when retrieve member type list : '.$db->lasterror());
+        }
+        if ( ! count($obj_ret)) {
+            throw new RestException(404, 'No member type found');
+        }
+
+        return $obj_ret;
+    }
+
+    /**
+     * Create member type object
+     *
+     * @param array $request_data   Request data
+     * @return int  ID of member type
+     */
+    function post($request_data = null)
+    {
+        if (! DolibarrApiAccess::$user->rights->adherent->configurer) {
+            throw new RestException(401);
+        }
+        // Check mandatory fields
+        $result = $this->_validate($request_data);
+
+        $membertype = new AdherentType($this->db);
+        foreach($request_data as $field => $value) {
+            $membertype->$field = $value;
+        }
+        if ($membertype->create(DolibarrApiAccess::$user) < 0) {
+            throw new RestException(500, 'Error creating member type', array_merge(array($membertype->error), $membertype->errors));
+        }
+        return $membertype->id;
+    }
+
+    /**
+     * Update member type
+     *
+     * @param int   $id             ID of member type to update
+     * @param array $request_data   Datas
+     * @return int
+     */
+    function put($id, $request_data = null)
+    {
+        if (! DolibarrApiAccess::$user->rights->adherent->configurer) {
+            throw new RestException(401);
+        }
+
+        $membertype = new AdherentType($this->db);
+        $result = $membertype->fetch($id);
+        if( ! $result ) {
+            throw new RestException(404, 'member type not found');
+        }
+
+        if( ! DolibarrApi::_checkAccessToResource('member',$membertype->id,'adherent_type')) {
+            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        }
+
+        foreach($request_data as $field => $value) {
+            if ($field == 'id') continue;
+            // Process the status separately because it must be updated using
+            // the validate() and resiliate() methods of the class AdherentType.
+            $membertype->$field = $value;
+        }
+
+        // If there is no error, update() returns the number of affected rows
+        // so if the update is a no op, the return value is zero.
+        if ($membertype->update(DolibarrApiAccess::$user) >= 0)
+            return $this->get($id);
+
+        return false;
+    }
+
+    /**
+     * Delete member type
+     *
+     * @param int $id   member type ID
+     * @return array
+     */
+    function delete($id)
+    {
+        if (! DolibarrApiAccess::$user->rights->adherent->configurer) {
+            throw new RestException(401);
+        }
+        $membertype = new AdherentType($this->db);
+        $result = $membertype->fetch($id);
+        if( ! $result ) {
+            throw new RestException(404, 'member type not found');
+        }
+
+        if ( ! DolibarrApi::_checkAccessToResource('member',$membertype->id,'adherent_type')) {
+            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        }
+
+        if (! $membertype->delete($membertype->id)) {
+            throw new RestException(401,'error when deleting member type');
+        }
+
+        return array(
+            'success' => array(
+                'code' => 200,
+                'message' => 'member type deleted'
+            )
+        );
+    }
+
+    /**
+     * Validate fields before creating an object
+     *
+     * @param array|null    $data   Data to validate
+     * @return array
+     *
+     * @throws RestException
+     */
+    function _validate($data)
+    {
+        $membertype = array();
+        foreach (MembersTypes::$FIELDS as $field) {
+            if (!isset($data[$field]))
+                throw new RestException(400, "$field field missing");
+            $membertype[$field] = $data[$field];
+        }
+        return $membertype;
+    }
+
+    /**
+     * Clean sensible object datas
+     *
+     * @param   object  $object    Object to clean
+     * @return    array    Array of cleaned object properties
+     */
+    function _cleanObjectDatas($object) {
+
+        $object = parent::_cleanObjectDatas($object);
+
+        unset($object->cotisation);
+        unset($object->libelle);
+
+        unset($object->import_key);
+        unset($object->array_options);
+        unset($object->linkedObjectsIds);
+        unset($object->context);
+        unset($object->canvas);
+        unset($object->fk_project);
+        unset($object->contact);
+        unset($object->contact_id);
+        unset($object->thirdparty);
+        unset($object->user);
+        unset($object->origin);
+        unset($object->origin_id);
+        unset($object->ref_ext);
+        unset($object->country);
+        unset($object->country_id);
+        unset($object->country_code);
+        unset($object->barcode_type);
+        unset($object->barcode_type_code);
+        unset($object->barcode_type_label);
+        unset($object->barcode_type_coder);
+        unset($object->mode_reglement_id);
+        unset($object->cond_reglement_id);
+        unset($object->cond_reglement);
+        unset($object->fk_delivery_address);
+        unset($object->shipping_method_id);
+        unset($object->modelpdf);
+        unset($object->fk_account);
+        unset($object->note_public);
+        unset($object->note_private);
+        unset($object->fk_incoterms);
+        unset($object->libelle_incoterms);
+        unset($object->location_incoterms);
+        unset($object->name);
+        unset($object->lastname);
+        unset($object->firstname);
+        unset($object->civility_id);
+        unset($object->total_ht);
+        unset($object->total_tva);
+        unset($object->total_localtax1);
+        unset($object->total_localtax2);
+        unset($object->total_ttc);
+
+        return $object;
+    }
+
+}
diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index 083ab4bda3b..31a40e96669 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -1,10 +1,10 @@
 <?php
-/* Copyright (C) 2001-2002 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2003      Jean-Louis Bergamo   <jlb@j1b.org>
- * Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C) 2013      Florian Henry        <florian.henry@open-concept.pro>
- * Copyright (C) 2015      Alexandre Spangaro   <aspangaro.dolibarr@gmail.com>
+/* Copyright (C) 2001-2002	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2003		Jean-Louis Bergamo		<jlb@j1b.org>
+ * Copyright (C) 2004-2011	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2017	Regis Houssin			<regis.houssin@capnetworks.com>
+ * Copyright (C) 2013		Florian Henry			<florian.henry@open-concept.pro>
+ * Copyright (C) 2015		Alexandre Spangaro		<aspangaro.dolibarr@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
@@ -55,7 +55,7 @@ $pagenext = $page + 1;
 if (! $sortorder) {  $sortorder="DESC"; }
 if (! $sortfield) {  $sortfield="d.lastname"; }
 
-$label=GETPOST("libelle","alpha");
+$label=GETPOST("label","alpha");
 $subscription=GETPOST("subscription","int");
 $vote=GETPOST("vote","int");
 $comment=GETPOST("comment");
@@ -93,17 +93,17 @@ if ($action == 'add' && $user->rights->adherent->configurer)
 	{
 		$object = new AdherentType($db);
 
-		$object->libelle        = trim($label);
-		$object->subscription   = (int) trim($subscription);
-		$object->note           = trim($comment);
-		$object->mail_valid     = (boolean) trim($mail_valid);
-		$object->vote           = (boolean) trim($vote);
+		$object->label			= trim($label);
+		$object->subscription	= (int) trim($subscription);
+		$object->note			= trim($comment);
+		$object->mail_valid		= (boolean) trim($mail_valid);
+		$object->vote			= (boolean) trim($vote);
 
 		// Fill array 'array_options' with data from add form
 		$ret = $extrafields->setOptionalsFromPost($extralabels,$object);
 		if ($ret < 0) $error++;
 
-		if ($object->libelle)
+		if ($object->label)
 		{
 			$id=$object->create($user);
 			if ($id > 0)
@@ -131,7 +131,7 @@ if ($action == 'update' && $user->rights->adherent->configurer)
 	{
 		$object = new AdherentType($db);
 		$object->id             = $rowid;
-		$object->libelle        = trim($label);
+		$object->label        = trim($label);
 		$object->subscription   = (int) trim($subscription);
 		$object->note           = trim($comment);
 		$object->mail_valid     = (boolean) trim($mail_valid);
@@ -171,7 +171,7 @@ if (! $rowid && $action != 'create' && $action != 'edit')
 {
 	//dol_fiche_head('');
 
-	$sql = "SELECT d.rowid, d.libelle, d.subscription, d.vote";
+	$sql = "SELECT d.rowid, d.libelle as label, d.subscription, d.vote";
 	$sql.= " FROM ".MAIN_DB_PREFIX."adherent_type as d";
 	$sql.= " WHERE d.entity IN (".getEntity().")";
 
@@ -180,11 +180,11 @@ if (! $rowid && $action != 'create' && $action != 'edit')
 	{
 		$num = $db->num_rows($result);
 		$nbtotalofrecords = $num;
-		
+
 		$i = 0;
 
 		$param = '';
-		
+
 		print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 		if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@@ -193,14 +193,14 @@ if (! $rowid && $action != 'create' && $action != 'edit')
 		print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
         print '<input type="hidden" name="page" value="'.$page.'">';
 		print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-		
+
 	    print_barre_liste($langs->trans("MembersTypes"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_generic.png', 0, '', '', $limit);
-	   
+
 		$moreforfilter = '';
-		
+
 		print '<div class="div-table-responsive">';
 		print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
-		
+
 		print '<tr class="liste_titre">';
 		print '<th>'.$langs->trans("Ref").'</th>';
 		print '<th>'.$langs->trans("Label").'</th>';
@@ -214,7 +214,7 @@ if (! $rowid && $action != 'create' && $action != 'edit')
 			$objp = $db->fetch_object($result);
 			print '<tr class="oddeven">';
 			print '<td><a href="'.$_SERVER["PHP_SELF"].'?rowid='.$objp->rowid.'">'.img_object($langs->trans("ShowType"),'group').' '.$objp->rowid.'</a></td>';
-			print '<td>'.dol_escape_htmltag($objp->libelle).'</td>';
+			print '<td>'.dol_escape_htmltag($objp->label).'</td>';
 			print '<td align="center">'.yn($objp->subscription).'</td>';
 			print '<td align="center">'.yn($objp->vote).'</td>';
 			if ($user->rights->adherent->configurer)
@@ -226,7 +226,7 @@ if (! $rowid && $action != 'create' && $action != 'edit')
 		}
 		print "</table>";
 		print '</div>';
-		
+
 		print '</form>';
 	}
 	else
@@ -256,7 +256,7 @@ if ($action == 'create')
 	print '<table class="border" width="100%">';
 	print '<tbody>';
 
-	print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("Label").'</td><td><input type="text" name="libelle" size="40"></td></tr>';
+	print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("Label").'</td><td><input type="text" name="label" size="40"></td></tr>';
 
 	print '<tr><td>'.$langs->trans("SubscriptionRequired").'</td><td>';
 	print $form->selectyesno("subscription",1,1);
@@ -316,10 +316,10 @@ if ($rowid > 0)
 		$linkback = '<a href="'.DOL_URL_ROOT.'/adherents/type.php">'.$langs->trans("BackToList").'</a>';
 
 		dol_banner_tab($object, 'rowid', $linkback);
-		
+
 		print '<div class="fichecenter">';
 		print '<div class="underbanner clearboth"></div>';
-		
+
 		print '<table class="border" width="100%">';
 
 		print '<tr><td class="titlefield">'.$langs->trans("SubscriptionRequired").'</td><td>';
@@ -347,7 +347,7 @@ if ($rowid > 0)
 
 		print '</table>';
         print '</div>';
-        
+
 		dol_fiche_end();
 
 
@@ -460,7 +460,7 @@ if ($rowid > 0)
 		    {
 				$membertype=new AdherentType($db);
 		        $result=$membertype->fetch($type);
-				$titre.=" (".$membertype->libelle.")";
+				$titre.=" (".$membertype->label.")";
 		    }
 
 		    $param="&rowid=".$rowid;
@@ -478,12 +478,12 @@ if ($rowid > 0)
 
 			print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 			print '<input class="flat" type="hidden" name="rowid" value="'.$rowid.'" size="12"></td>';
-				
+
 			print '<br>';
             print_barre_liste('',$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords);
-		    
+
             $moreforfilter = '';
-            
+
             print '<div class="div-table-responsive">';
             print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
 
@@ -548,7 +548,7 @@ if ($rowid > 0)
 		        // Type
 		        /*print '<td class="nowrap">';
 		        $membertypestatic->id=$objp->type_id;
-		        $membertypestatic->libelle=$objp->type;
+		        $membertypestatic->label=$objp->type;
 		        print $membertypestatic->getNomUrl(1,12);
 		        print '</td>';
 				*/
@@ -613,7 +613,7 @@ if ($rowid > 0)
 		    print "</table>\n";
             print '</div>';
             print '</form>';
-            
+
 			if ($num > $conf->liste_limit)
 			{
 			    print_barre_liste('',$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords,'');
@@ -652,7 +652,7 @@ if ($rowid > 0)
 
 		print '<tr><td width="15%">'.$langs->trans("Ref").'</td><td>'.$object->id.'</td></tr>';
 
-		print '<tr><td>'.$langs->trans("Label").'</td><td><input type="text" name="libelle" size="40" value="'.dol_escape_htmltag($object->libelle).'"></td></tr>';
+		print '<tr><td>'.$langs->trans("Label").'</td><td><input type="text" name="label" size="40" value="'.dol_escape_htmltag($object->label).'"></td></tr>';
 
 		print '<tr><td>'.$langs->trans("SubscriptionRequired").'</td><td>';
 		print $form->selectyesno("subscription",$object->subscription,1);
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 561504f7845..46eed944460 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -429,23 +429,23 @@ class Form
         if ($direction > 0) { $extracss=($extracss?$extracss.' ':'').'inline-block'; $extrastyle='padding: 0px; padding-right: 3px !important;'; }
 
         $classfortooltip='classfortooltip';
-        
+
         $s='';$textfordialog='';
-        
+
         $htmltext=str_replace('"',"&quot;",$htmltext);
-        if ($tooltiptrigger != '') 
+        if ($tooltiptrigger != '')
         {
             $classfortooltip='classfortooltiponclick';
             $textfordialog.='<div style="display: none;" id="idfortooltiponclick_'.$tooltiptrigger.'" class="classfortooltiponclicktext">'.$htmltext.'</div>';
         }
-        if ($tooltipon == 2 || $tooltipon == 3) 
+        if ($tooltipon == 2 || $tooltipon == 3)
         {
             $paramfortooltipimg=' class="'.$classfortooltip.' inline-block'.($extracss?' '.$extracss:'').'" style="padding: 0px;'.($extrastyle?' '.$extrastyle:'').'"';
             if ($tooltiptrigger == '') $paramfortooltipimg.=' title="'.($noencodehtmltext?$htmltext:dol_escape_htmltag($htmltext,1)).'"'; // Attribut to put on img tag to store tooltip
             else $paramfortooltipimg.=' dolid="'.$tooltiptrigger.'"';
         }
         else $paramfortooltipimg =($extracss?' class="'.$extracss.'"':'').($extrastyle?' style="'.$extrastyle.'"':''); // Attribut to put on td text tag
-        if ($tooltipon == 1 || $tooltipon == 3) 
+        if ($tooltipon == 1 || $tooltipon == 3)
         {
             $paramfortooltiptd=' class="'.($tooltipon == 3 ? 'cursorpointer ' : '').$classfortooltip.' inline-block'.($extracss?' '.$extracss:'').'" style="padding: 0px;'.($extrastyle?' '.$extrastyle:'').'" ';
             if ($tooltiptrigger == '') $paramfortooltiptd.=' title="'.($noencodehtmltext?$htmltext:dol_escape_htmltag($htmltext,1)).'"'; // Attribut to put on td tag to store tooltip
@@ -496,7 +496,7 @@ class Form
 
         $alt = '';
         if ($tooltiptrigger) $alt=$langs->trans("ClickToShowHelp");
-        
+
         //For backwards compatibility
         if ($type == '0') $type = 'info';
         elseif ($type == '1') $type = 'help';
@@ -577,16 +577,16 @@ class Form
     	  				jQuery(".massaction").hide();
     	            }
         		}
-    
+
         	jQuery(document).ready(function () {
         		initCheckForSelect();
         		jQuery(".checkforselect").click(function() {
         			initCheckForSelect();
     	  		});
     	  		jQuery(".massactionselect").change(function() {
-        			var massaction = $( this ).val();  
+        			var massaction = $( this ).val();
         			var urlform = $( this ).closest("form").attr("action").replace("#show_files","");
-        			if (massaction == "builddoc") 
+        			if (massaction == "builddoc")
                     {
                         urlform = urlform + "#show_files";
     	            }
@@ -1034,7 +1034,7 @@ class Form
     {
         global $conf,$user,$langs;
 
-        $out=''; 
+        $out='';
         $num=0;
         $outarray=array();
 
@@ -1077,7 +1077,7 @@ class Form
         if ($resql)
         {
 			$events = null;
-			
+
            	if ($conf->use_javascript_ajax && ! $forcecombo)
             {
 				include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
@@ -3450,7 +3450,7 @@ class Form
             $cat = new Categorie($this->db);
             $cate_arbo = $cat->get_full_arbo($type,$excludeafterid);
 		}
-		
+
         $output = '<select class="flat" name="'.$htmlname.'">';
 		$outarray=array();
         if (is_array($cate_arbo))
@@ -4178,7 +4178,7 @@ class Form
                 }
                 print '</div>';
             }
-            if ($more) 
+            if ($more)
             {
                 print '<div class="inline-block">';
                 print $more;
@@ -4923,7 +4923,7 @@ class Form
      *	@param  int	$iSecond  		    Default preselected duration (number of seconds or '')
      * 	@param	int	$disabled           Disable the combo box
      * 	@param	string	$typehour		If 'select' then input hour and input min is a combo,
-     *						            if 'text' input hour is in text and input min is a text, 
+     *						            if 'text' input hour is in text and input min is a text,
      *						            if 'textselect' input hour is in text and input min is a combo
      *  @param	integer	$minunderhours	If 1, show minutes selection under the hours
      * 	@param	int	$nooutput		    Do not output html string but return it
@@ -4968,7 +4968,7 @@ class Form
 
         if ($typehour!='text') $retstring.=' '.$langs->trans('HourShort');
         else $retstring.=':';
-        
+
         // Minutes
         if ($minunderhours) $retstring.='<br>';
         else $retstring.="&nbsp;";
@@ -4988,7 +4988,7 @@ class Form
         {
         	$retstring.='<input placeholder="'.$langs->trans('MinuteShort').'" type="number" min="0" size="1" name="'.$prefix.'min"'.($disabled?' disabled':'').' class="flat maxwidth50" value="'.(($minSelected != '')?((int) $minSelected):'').'">';
         }
-        
+
         if ($typehour!='text') $retstring.=' '.$langs->trans('MinuteShort');
 
         //$retstring.="&nbsp;";
@@ -5594,7 +5594,7 @@ class Form
 		{
     		$listofidcompanytoscan=$object->thirdparty->id;
     		if (($object->thirdparty->parent > 0) && ! empty($conf->global->THIRDPARTY_INCLUDE_PARENT_IN_LINKTO)) $listofidcompanytoscan.=','.$object->thirdparty->parent;
-    		
+
     		$possiblelinks=array(
     		    'propal'=>array('enabled'=>$conf->propal->enabled, 'perms'=>1, 'label'=>'LinkToProposal', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_client, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."propal as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('propal',1).')'),
     		    'order'=>array('enabled'=>$conf->commande->enabled, 'perms'=>1, 'label'=>'LinkToOrder', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_client, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."commande as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('commande',1).')'),
@@ -5606,7 +5606,7 @@ class Form
     		    'invoice_supplier'=>array('enabled'=>$conf->fournisseur->facture->enabled , 'perms'=>1, 'label'=>'LinkToSupplierInvoice', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_supplier, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture_fourn as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('facture_fourn',1).')')
     		);
 		}
-		
+
 		global $action;
 
 		// Can complete the possiblelink array
@@ -5845,7 +5845,7 @@ class Form
 
         //print "paramid=$paramid,morehtml=$morehtml,shownav=$shownav,$fieldid,$fieldref,$morehtmlref,$moreparam";
         $object->load_previous_next_ref((isset($object->next_prev_filter)?$object->next_prev_filter:''),$fieldid,$nodbprefix);
-        
+
         $navurl = $_SERVER["PHP_SELF"];
         // Special case for project/task page
         if ($paramid == 'project_ref')
@@ -5902,11 +5902,15 @@ class Form
 		}
 		else if (in_array($object->element, array('action', 'agenda')))
 		{
-		    $ret.=$object->ref.'<br>'.$object->label;    
+		    $ret.=$object->ref.'<br>'.$object->label;
+		}
+		else if (in_array($object->element, array('adherent_type')))
+		{
+			$ret.=$object->label;
 		}
 		else if ($fieldref != 'none') $ret.=dol_htmlentities($object->$fieldref);
-		
-		
+
+
 		if ($morehtmlref)
 		{
 		    $ret.=' '.$morehtmlref;
@@ -6207,7 +6211,7 @@ class Form
         return $out;
     }
 
-    
+
     /**
      *	Return HTML to show the search and clear seach button
      *
@@ -6216,7 +6220,7 @@ class Form
     function showFilterButtons()
     {
         global $conf, $langs;
-    
+
         $out='<div class="nowrap">';
         $out.='<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")).'">';
         $out.='<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")).'">';
@@ -6235,7 +6239,7 @@ class Form
     function showCheckAddButtons($cssclass='checkforaction', $calljsfunction=0)
     {
         global $conf, $langs;
-    
+
         $out='';
         if (! empty($conf->use_javascript_ajax)) $out.='<div class="inline-block checkallactions"><input type="checkbox" id="checkallactions" name="checkallactions" class="checkallactions"></div>';
         $out.='<script type="text/javascript">
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 9ecfdc037f3..992827006da 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -102,14 +102,14 @@ function getDoliDBInstance($type, $host, $user, $pass, $name, $port)
 /**
  * 	Get list of entity id to use
  *
- * 	@param	string	$element	Current element 
- *                              'societe', 'socpeople', 'actioncomm', 'agenda', 'resource', 
+ * 	@param	string	$element	Current element
+ *                              'societe', 'socpeople', 'actioncomm', 'agenda', 'resource',
  *                              'product', 'productprice', 'stock',
  *                              'propal', 'supplier_proposal', 'facture', 'facture_fourn',
- *                              'categorie', 'bank_account', 'bank_account', 'adherent', 'user',  
+ *                              'categorie', 'bank_account', 'bank_account', 'adherent', 'user',
  *                              'commande', 'commande_fournisseur', 'expedition', 'intervention', 'survey',
  *                              'contract', 'tax', 'expensereport', 'holiday', 'multicurrency', 'project',
- *                              'email_template', 'event',  
+ *                              'email_template', 'event',
  * 	@param	int		$shared		0=Return id of entity, 1=Return id entity + shared entities
  * 	@return	mixed				Entity id(s) to use
  */
@@ -121,7 +121,7 @@ function getEntity($element=false, $shared=0)
 	if ($element == 'actioncomm') $element='agenda';
 	if ($element == 'fichinter')  $element='intervention';
 	if ($element == 'categorie')  $element='category';
-	
+
 	if (is_object($mc))
 	{
 		return $mc->getEntity($element, $shared);
@@ -240,7 +240,7 @@ function dol_shutdown()
  *  Return value of a param into GET or POST supervariable.
  *  Use the property $user->default_values[path]['creatform'] and/or $user->default_values[path]['filters'] and/or $user->default_values[path]['sortorder']
  *  Note: The property $user->default_values is loaded by the main when loading the user.
- *  
+ *
  *  @param	string	$paramname   Name of parameter to found
  *  @param	string	$check	     Type of check
  *                                  ''=no check (deprecated)
@@ -257,29 +257,29 @@ function dol_shutdown()
  *  @param  int     $filter      Filter to apply when $check is set to 'custom'. (See http://php.net/manual/en/filter.filters.php for détails)
  *  @param  mixed   $options     Options to pass to filter_var when $check is set to 'custom'.
  *  @return string|string[]      Value found (string or array), or '' if check fails
- *  
+ *
  *  @TODO Set default value for check to alpha. Check all WYSIWYG edition (email and description...) is still ok with rich text.
  */
 function GETPOST($paramname, $check='', $method=0, $filter=NULL, $options=NULL)
 {
     global $mysoc,$user,$conf;
-    
+
     if (empty($paramname)) return 'BadFirstParameterForGETPOST';
-        
+
     if (empty($method)) $out = isset($_GET[$paramname])?$_GET[$paramname]:(isset($_POST[$paramname])?$_POST[$paramname]:'');
 	elseif ($method==1) $out = isset($_GET[$paramname])?$_GET[$paramname]:'';
 	elseif ($method==2) $out = isset($_POST[$paramname])?$_POST[$paramname]:'';
 	elseif ($method==3) $out = isset($_POST[$paramname])?$_POST[$paramname]:(isset($_GET[$paramname])?$_GET[$paramname]:'');
 	elseif ($method==4) $out = isset($_POST[$paramname])?$_POST[$paramname]:(isset($_GET[$paramname])?$_GET[$paramname]:(isset($_COOKIE[$paramname])?$_COOKIE[$paramname]:''));
 	else return 'BadThirdParameterForGETPOST';
-	
+
 	if (empty($method) || $method == 3 || $method == 4)
 	{
     	$relativepathstring = $_SERVER["PHP_SELF"];
     	if (constant('DOL_URL_ROOT')) $relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_URL_ROOT'),'/').'/', '', $relativepathstring);
     	$relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
     	$relativepathstring = preg_replace('/^\//', '', $relativepathstring);
-	
+
         // Code for search criteria persistence.
     	// Retrieve values if restore_lastsearch_values is set and there is saved values
     	if (! empty($_GET['restore_lastsearch_values']) && ! empty($_SESSION['lastsearch_values_'.$relativepathstring]))        // Keep $_GET here
@@ -347,16 +347,16 @@ function GETPOST($paramname, $check='', $method=0, $filter=NULL, $options=NULL)
 	            }
 	        }
 	    }
-	    
-	}	
-	
+
+	}
+
 	if (empty($check) && ! empty($conf->global->MAIN_FEATURES_LEVEL) && $conf->global->MAIN_FEATURES_LEVEL >= 2)
 	{
-	   dol_syslog("Deprecated use of GETPOST, called with 1st param = ".$paramname." and 2nd param not defined, when calling page ".$_SERVER["PHP_SELF"], LOG_WARNING);    
+	   dol_syslog("Deprecated use of GETPOST, called with 1st param = ".$paramname." and 2nd param not defined, when calling page ".$_SERVER["PHP_SELF"], LOG_WARNING);
 	   // Enable this line to know who call the GETPOST with empty $check parameter.
 	   //var_dump(debug_backtrace()[0]);
 	}
-	
+
 	if (! empty($check))
 	{
 	    // Replace vars like __DAY__, __MONTH__, __YEAR__, __MYCOUNTRYID__, __USERID__, __ENTITYID__, ...
@@ -457,7 +457,7 @@ function GETPOST($paramname, $check='', $method=0, $filter=NULL, $options=NULL)
 	        // We save search key only if:
 	        // - not empty, or
 	        // - if value is empty and a default value exists that is not empty (it means we did a filter to an empty value when default was not).
-	        
+
 	        //if (! empty($out) || ! empty($user->default_values[$relativepathstring]['filters'][$paramname]))
 	        if (! empty($out))
 	        {
@@ -465,7 +465,7 @@ function GETPOST($paramname, $check='', $method=0, $filter=NULL, $options=NULL)
 	        }
 	    }
 	}
-	
+
 	return $out;
 }
 
@@ -475,13 +475,13 @@ function GETPOST($paramname, $check='', $method=0, $filter=NULL, $options=NULL)
  *  This prefix is unique for instance and avoid conflict between multi-instances,
  *  even when having two instances with one root dir or two instances in virtual servers.
  *
- *  @param  string  $mode       '' (prefix for session name) or 'email' (prefix for email id)              
+ *  @param  string  $mode       '' (prefix for session name) or 'email' (prefix for email id)
  *  @return	string      		A calculated prefix
  */
 function dol_getprefix($mode='')
 {
     global $conf;
-    
+
     // If MAIL_PREFIX_FOR_EMAIL_ID is set and prefix is for email
     if ($mode == 'email' && ! empty($conf->global->MAIL_PREFIX_FOR_EMAIL_ID))
     {
@@ -629,7 +629,7 @@ function dol_clone($object)
 
 	//$myclone = clone $object;                    // PHP clone is a shallow copy only, not a real clone, so properties of references will keep references (refer to the same target/variable
 	$myclone=unserialize(serialize($object));
-	    
+
 	return $myclone;
 }
 
@@ -1134,7 +1134,7 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
 	global $conf, $form, $user, $langs;
 
 	$error = 0;
-	
+
 	$maxvisiblephotos=1;
 	$showimage=1;
 	$showbarcode=empty($conf->barcode->enabled)?0:($object->barcode?1:0);
@@ -1206,7 +1206,7 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
                     $fileimage = $file.'_preview.png';              // If PDF has 1 page
                     $fileimagebis = $file.'_preview-0.png';         // If PDF has more than one page
                     $relativepathimage = $relativepath.'_preview.png';
-                    
+
                     // Si fichier PDF existe
                     if (file_exists($file))
                     {
@@ -1249,7 +1249,7 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
                     $morehtmlleft.='</div>';
                 }
             }
-            
+
             if (! $phototoshow && $conf->browser->layout != 'phone')      // Show No photo link (picto of pbject)
             {
                 $morehtmlleft.='<div class="floatleft inline-block valignmiddle divphotoref">';
@@ -1271,12 +1271,12 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
             }
         }
 	}
-	
+
 	if ($showbarcode) $morehtmlleft.='<div class="floatleft inline-block valignmiddle divphotoref">'.$form->showbarcode($object).'</div>';
-	
+
 	if ($object->element == 'societe')
 	{
-	    if (! empty($conf->use_javascript_ajax) && $user->rights->societe->creer && ! empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) 
+	    if (! empty($conf->use_javascript_ajax) && $user->rights->societe->creer && ! empty($conf->global->MAIN_DIRECT_STATUS_UPDATE))
     	{
 	       	$morehtmlstatus.=ajax_object_onoff($object, 'status', 'status', 'InActivity', 'ActivityCeased');
     	}
@@ -1303,7 +1303,7 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
 	    if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3) || $conf->browser->layout=='phone') $tmptxt=$object->getLibStatut(5, $object->totalpaye);
 		$morehtmlstatus.=$tmptxt;
 	}
-	elseif ($object->element == 'contrat' || $object->element == 'contract') 
+	elseif ($object->element == 'contrat' || $object->element == 'contract')
 	{
         if ($object->statut==0) $morehtmlstatus.=$object->getLibStatut(2);
         else $morehtmlstatus.=$object->getLibStatut(4);
@@ -1314,14 +1314,14 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
 		$morehtmlstatus.=$tmptxt;
 	}
 	if (! empty($object->name_alias)) $morehtmlref.='<div class="refidno">'.$object->name_alias.'</div>';      // For thirdparty
-	
+
 	// Add label
 	if ($object->element == 'product' || $object->element == 'bank_account' || $object->element == 'project_task')
 	{
 		if (! empty($object->label)) $morehtmlref.='<div class="refidno">'.$object->label.'</div>';
 	}
-	
-	if ($object->element != 'product' && $object->element != 'bookmark') 
+
+	if ($object->element != 'product' && $object->element != 'bookmark')
 	{
     	$morehtmlref.='<div class="refidno">';
     	$morehtmlref.=$object->getBannerAddress('refaddress',$object);
@@ -1333,7 +1333,7 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
 		$morehtmlref.=$langs->trans("TechnicalID").': '.$object->id;
 		$morehtmlref.='</div>';
 	}
-	
+
 	print '<div class="'.($onlybanner?'arearefnobottom ':'arearef ').'heightref valignmiddle" width="100%">';
 	print $form->showrefnav($object, $paramid, $morehtml, $shownav, $fieldid, $fieldref, $morehtmlref, $moreparam, $nodbprefix, $morehtmlleft, $morehtmlstatus, $morehtmlright);
 	print '</div>';
@@ -3095,7 +3095,7 @@ function info_admin($text, $infoonimgalt = 0, $nodiv=0, $admin='1')
 	{
 		return img_picto($text, 'info', 'class="hideonsmartphone"');
 	}
-	
+
 	return ($nodiv?'':'<div class="'.(empty($admin)?'':($admin=='1'?'info':$admin)).' hideonsmartphone">').'<span class="fa fa-info-circle" title="'.dol_escape_htmltag($admin?$langs->trans('InfoAdmin'):$langs->trans('Note')).'"></span> '.$text.($nodiv?'':'</div>');
 }
 
@@ -3293,7 +3293,7 @@ function getTitleFieldOfList($name, $thead=0, $file="", $field="", $begin="", $m
 	$field1=trim($tmpfield[0]);            // If $field is 'd.datep,d.id', it becomes 'd.datep'
 
 	//var_dump('field='.$field.' field1='.$field1.' sortfield='.$sortfield.' sortfield1='.$sortfield1);
-	
+
 	// If field is used as sort criteria we use a specific css class liste_titre_sel
 	// Example if (sortfield,field)=("nom","xxx.nom") or (sortfield,field)=("nom","nom")
 	if ($field1 && ($sortfield1 == $field1 || $sortfield1 == preg_replace("/^[^\.]+\./","",$field1))) $out.= '<'.$tag.' class="'.$prefix.'liste_titre_sel" '. $moreattrib.'>';
@@ -3441,7 +3441,7 @@ function load_fiche_titre($titre, $morehtmlright='', $picto='title_generic.png',
  *	@param	string	    $options         	More parameters for links ('' by default, does not include sortfield neither sortorder)
  *	@param	string    	$sortfield       	Field to sort on ('' by default)
  *	@param	string	    $sortorder       	Order to sort ('' by default)
- *	@param	string	    $center          	String in the middle ('' by default). We often find here string $massaction comming from $form->selectMassAction() 
+ *	@param	string	    $center          	String in the middle ('' by default). We often find here string $massaction comming from $form->selectMassAction()
  *	@param	int		    $num				Number of records found by select with limit+1
  *	@param	int|string  $totalnboflines		Total number of records/lines for all pages (if known). Use a negative value of number to not show number. Use '' if unknown.
  *	@param	string	    $picto				Icon to use before title (should be a 32x32 transparent png file)
@@ -3965,7 +3965,7 @@ function get_localtax($vatrate, $local, $thirdparty_buyer="", $thirdparty_seller
 	{
 	    $conf->global->MAIN_GET_LOCALTAXES_VALUES_FROM_THIRDPARTY = 1;
 	}
-	    
+
 	// Search local taxes
 	if (! empty($conf->global->MAIN_GET_LOCALTAXES_VALUES_FROM_THIRDPARTY))
 	{
@@ -4210,7 +4210,7 @@ function getLocalTaxesFromRate($vatrate, $local, $buyer, $seller, $firstparamisi
 /**
  *	Return vat rate of a product in a particular selling country or default country vat if product is unknown
  *  Function called by get_default_tva
- *  
+ *
  *  @param	int			$idprod          	Id of product or 0 if not a predefined product
  *  @param  Societe		$thirdparty_seller  Thirdparty with a ->country_code defined (FR, US, IT, ...)
  *	@param	int			$idprodfournprice	Id product_fournisseur_price (for "supplier" order/invoice)
@@ -4248,7 +4248,7 @@ function get_product_vat_for_country($idprod, $thirdparty_seller, $idprodfournpr
 		}
 		else
 		{
-			// TODO Read default product vat according to countrycode and product. Vat for couple countrycode/product is a feature not implemeted yet. 
+			// TODO Read default product vat according to countrycode and product. Vat for couple countrycode/product is a feature not implemeted yet.
 			// May be usefull/required if hidden option SERVICE_ARE_ECOMMERCE_200238EC is on
 		}
 	}
@@ -5020,9 +5020,9 @@ function make_substitutions($text, $substitutionarray, $outputlangs=null)
 	global $conf, $langs;
 
 	if (! is_array($substitutionarray)) return 'ErrorBadParameterSubstitutionArrayWhenCalling_make_substitutions';
-	
+
 	if (empty($outputlangs)) $outputlangs=$langs;
-	
+
 	// Make substitution for language keys
 	if (is_object($outputlangs))
 	{
@@ -5030,10 +5030,10 @@ function make_substitutions($text, $substitutionarray, $outputlangs=null)
 		{
 			$msgishtml = 0;
 			if (dol_textishtml($text,1)) $msgishtml = 1;
-			$text = preg_replace('/__\('.preg_quote($reg[1]).'\)__/', $msgishtml?dol_htmlentitiesbr($outputlangs->transnoentitiesnoconv($reg[1])):$outputlangs->transnoentitiesnoconv($reg[1]), $text);	
+			$text = preg_replace('/__\('.preg_quote($reg[1]).'\)__/', $msgishtml?dol_htmlentitiesbr($outputlangs->transnoentitiesnoconv($reg[1])):$outputlangs->transnoentitiesnoconv($reg[1]), $text);
 		}
 	}
-		
+
 	// Make substitition for array $substitutionarray
 	foreach ($substitutionarray as $key => $value)
 	{
@@ -5046,7 +5046,7 @@ function make_substitutions($text, $substitutionarray, $outputlangs=null)
 
 /**
  *  Complete the $substitutionarray with more entries.
- *  Can also add substitution keys coming from external module that had set the "substitutions=1" into module_part array. In this case, method completesubstitutionarray provided by module is called. 
+ *  Can also add substitution keys coming from external module that had set the "substitutions=1" into module_part array. In this case, method completesubstitutionarray provided by module is called.
  *
  *  @param  array		$substitutionarray		Array substitution old value => new value value
  *  @param  Translate	$outputlangs            Output language
@@ -5067,7 +5067,7 @@ function complete_substitutions_array(&$substitutionarray, $outputlangs, $object
 	{
 		// TODO
 	}
-	
+
 	// Add a substitution key for each extrafields, using key __EXTRA_XXX__
 	if (is_object($object) && is_array($object->array_options))
 	{
@@ -5079,7 +5079,7 @@ function complete_substitutions_array(&$substitutionarray, $outputlangs, $object
 			$substitutionarray['%EXTRA_'.$keyshort.'%']=$val;
 		}
 	}
-	
+
 	// Check if there is external substitution to do, requested by plugins
 	$dirsubstitutions=array_merge(array(),(array) $conf->modules_parts['substitutions']);
 
@@ -5615,8 +5615,8 @@ function dol_eval($s, $returnvalue=0, $hideerrors=1)
 	global $rights;
 	global $object;
 	global $mysoc;
-	
-	global $obj;       // To get $obj used into list when dol_eval is used for computed fields and $obj is not yet $object      
+
+	global $obj;       // To get $obj used into list when dol_eval is used for computed fields and $obj is not yet $object
 	global $soc;       // For backward compatibility
 
 	//print $s."<br>\n";
@@ -5827,7 +5827,7 @@ function printCommonFooter($zone='private')
     	           this.href=this.href+\'&page_y=\'+page_y;
     	           });'."\n";
     	print '});'."\n";
-    	
+
     	if (empty($conf->dol_use_jmobile))
     	{
         	print '<!-- Set handler to switch left menu page (menuhider) -->'."\n";
@@ -5837,7 +5837,7 @@ function printCommonFooter($zone='private')
         	print "  $('.login_block').toggle();";
         	print '});'."\n";
     	}
-    	
+
     	print '</script>'."\n";
 	}
 
@@ -6000,9 +6000,9 @@ function natural_search($fields, $value, $mode=0, $nofirstand=0)
     {
     	$value=preg_replace('/([<>=]+)\s+([0-9'.preg_quote($langs->trans("DecimalSeparator"),'/').'\-])/','\1\2',$value);	// Clean string '< 10' into '<10' so we can the explode on space to get all tests to do
     }
-    
+
     $value = preg_replace('/\s*\|\s*/','|', $value);
-    
+
     $crits = explode(' ', $value);
     $res = '';
     if (! is_array($fields)) $fields = array($fields);
@@ -6125,7 +6125,7 @@ function getImageFileNameForSize($file, $extName, $extImgTarget='')
  *
  * @param   string    $modulepart     propal, facture, facture_fourn, ...
  * @param   string    $relativepath   Relative path of docs.
- * @param	int		  $alldata		  Return array with all components (1 is recommended, then use a simple a href link with the class, target and mime attribute added. 'documentpreview' css class is handled by jquery code into main.inc.php)  
+ * @param	int		  $alldata		  Return array with all components (1 is recommended, then use a simple a href link with the class, target and mime attribute added. 'documentpreview' css class is handled by jquery code into main.inc.php)
  * @param	string	  $param		  More param on http links
  * @return  string|array              Output string with href link or array with all components of link
  */
@@ -6139,8 +6139,8 @@ function getAdvancedPreviewUrl($modulepart, $relativepath, $alldata=0, $param=''
     //$mime_preview[]='vnd.oasis.opendocument.presentation';
     //$mime_preview[]='archive';
     $num_mime = array_search(dol_mimetype($relativepath, '', 1), $mime_preview);
- 
-    if ($alldata == 1) 
+
+    if ($alldata == 1)
     {
     	if ($num_mime !== false) return array('target'=>'_blank', 'css'=>'documentpreview', 'url'=>DOL_URL_ROOT.'/document.php?modulepart='.$modulepart.'&attachment=0&file='.urlencode($relativepath), 'mime'=>dol_mimetype($relativepath), );
     	else return array();

From 954670731d69009b4c3ed7589fc52d6831ff838a Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Thu, 25 May 2017 09:05:19 +0200
Subject: [PATCH 481/505] Fix: changelog

---
 ChangeLog | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 68e9674d0da..c76617b2f8a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,9 @@ English Dolibarr ChangeLog
 
 ***** ChangeLog for 6.0.0 compared to 5.0.* *****
 
+For developers:
+NEW: Add a lot of API REST: dictionaryevents, memberstypes, ...
+
 WARNING: 
 
 Following changes may create regression for some external modules, but were necessary to make Dolibarr better:

From 74e9b9bf0a6a5015e5995d9cac8e9006b7c99ade Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Thu, 25 May 2017 13:48:30 +0200
Subject: [PATCH 482/505] Fix: Wrong path for external module API REST

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

diff --git a/htdocs/api/index.php b/htdocs/api/index.php
index fa96da6b139..1e04590da14 100644
--- a/htdocs/api/index.php
+++ b/htdocs/api/index.php
@@ -1,6 +1,7 @@
 <?php
-/* Copyright (C) 2015   Jean-François Ferry     <jfefe@aternatik.fr>
+/* Copyright (C) 2015	Jean-François Ferry		<jfefe@aternatik.fr>
  * Copyright (C) 2016	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2017	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
@@ -143,10 +144,9 @@ foreach ($modulesdir as $dir)
                      *
                      * Search files named api_<object>.class.php into /htdocs/<module>/class directory
                      *
-                     * @todo : take care of externals module!
                      * @todo : use getElementProperties() function ?
                      */
-                    $dir_part = DOL_DOCUMENT_ROOT.'/'.$moduledirforclass.'/class/';
+                    $dir_part = dol_buildpath('/'.$moduledirforclass.'/class/');
 
                     $handle_part=@opendir(dol_osencode($dir_part));
                     if (is_resource($handle_part))

From 9dfc8a9dc8e735a637fa0f4f53c24d4d04644619 Mon Sep 17 00:00:00 2001
From: philippe grand <philippe.grand@atoo-net.com>
Date: Thu, 25 May 2017 19:13:13 +0200
Subject: [PATCH 483/505] fix : bad link

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

diff --git a/htdocs/core/lib/accounting.lib.php b/htdocs/core/lib/accounting.lib.php
index c8863ce8f61..ab28cb997ed 100644
--- a/htdocs/core/lib/accounting.lib.php
+++ b/htdocs/core/lib/accounting.lib.php
@@ -41,7 +41,7 @@ function admin_accounting_prepare_head(AccountingAccount $object=null)
 	$head[$h][2] = 'general';
 	$h ++;
 
-	$head[$h][0] = DOL_URL_ROOT.'/accountancy/admin/journals.php';
+	$head[$h][0] = DOL_URL_ROOT.'/accountancy/admin/journal.php';
 	$head[$h][1] = $langs->trans("Journaux");
 	$head[$h][2] = 'journal';
 	$h ++;

From ca08f814c1ded69a054fab469c7dc7615f2e71b9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 25 May 2017 19:38:42 +0200
Subject: [PATCH 484/505] Remove deprecated files

---
 htdocs/install/fileconf.php         |  40 ++++++++++++++--------------
 htdocs/theme/common/ical.gif        | Bin 460 -> 0 bytes
 htdocs/theme/common/information.png | Bin 4180 -> 0 bytes
 htdocs/theme/common/rss.gif         | Bin 476 -> 0 bytes
 htdocs/theme/common/vcal.gif        | Bin 1079 -> 0 bytes
 htdocs/theme/login_background.png   | Bin 79 -> 0 bytes
 6 files changed, 20 insertions(+), 20 deletions(-)
 delete mode 100644 htdocs/theme/common/ical.gif
 delete mode 100644 htdocs/theme/common/information.png
 delete mode 100644 htdocs/theme/common/rss.gif
 delete mode 100644 htdocs/theme/common/vcal.gif
 delete mode 100644 htdocs/theme/login_background.png

diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php
index cdd639ad50b..424126b63b6 100644
--- a/htdocs/install/fileconf.php
+++ b/htdocs/install/fileconf.php
@@ -86,7 +86,7 @@ if (! is_writable($conffile))
 
 if (! empty($force_install_message))
 {
-    print '<div><table><tr><td valign="middle"><img src="../theme/common/information.png" style="height:40px;"></td><td valign="middle">'.$langs->trans($force_install_message).'</td></tr></table>';
+    print '<div><br>'.$langs->trans($force_install_message).'</div>';
 
     /*print '<script type="text/javascript">';
     print '	jQuery(document).ready(function() {
@@ -125,7 +125,7 @@ if (! empty($force_install_message))
 		$dolibarr_main_document_root = detect_dolibarr_main_document_root();
 	}
 	?>
-		<td class="label" valign="top">
+		<td class="label tdtop">
 			<input type="text"
 			       class="minwidth300"
 			       value="<?php print $dolibarr_main_document_root ?>"
@@ -156,7 +156,7 @@ if (! empty($force_install_message))
 			$dolibarr_main_data_root = detect_dolibarr_main_data_root($dolibarr_main_document_root);
 		}
 		?>
-		<td class="label" valign="top">
+		<td class="label tdtop">
 			<input type="text"
 			       class="minwidth300"
 			       value="<?php print $dolibarr_main_data_root ?>"
@@ -210,7 +210,7 @@ if (! empty($force_install_message))
 	    ?>
 	<tr>
 		<td class="tdtop label"><?php echo $langs->trans("ForceHttps"); ?></td>
-		<td class="label" valign="top">
+		<td class="label tdtop">
 			<input type="checkbox"
 			       name="main_force_https"
 				<?php if (!empty($force_install_mainforcehttps)) {
@@ -238,9 +238,9 @@ if (! empty($force_install_message))
 	</tr>
 
 	<tr>
-		<td class="label" valign="top"><b> <?php echo $langs->trans("DatabaseName"); ?>
+		<td class="label tdtop"><b> <?php echo $langs->trans("DatabaseName"); ?>
 		</b></td>
-		<td class="label" valign="top">
+		<td class="label tdtop">
 			<input type="text" id="db_name"
 			       name="db_name"
 			       value="<?php echo (!empty($dolibarr_main_db_name)) ? $dolibarr_main_db_name : ($force_install_database ? $force_install_database : 'dolibarr'); ?>"
@@ -371,9 +371,9 @@ if (! empty($force_install_message))
 	</tr>
 
 	<tr class="hidesqlite">
-		<td class="label" valign="top"><?php echo $langs->trans("DatabasePrefix"); ?>
+		<td class="label tdtop"><?php echo $langs->trans("DatabasePrefix"); ?>
 		</td>
-		<td class="label" valign="top">
+		<td class="label tdtop">
 			<input type="text" id="db_prefix"
 			       name="db_prefix"
 			       value="<?php echo(!empty($force_install_prefix) ? $force_install_prefix : (!empty($dolibarr_main_db_prefix) ? $dolibarr_main_db_prefix : 'llx_')); ?>"
@@ -386,9 +386,9 @@ if (! empty($force_install_message))
 	</tr>
 
 	<tr class="hidesqlite">
-		<td class="label" valign="top"><?php echo $langs->trans("CreateDatabase"); ?>
+		<td class="label tdtop"><?php echo $langs->trans("CreateDatabase"); ?>
 		</td>
-		<td class="label" valign="top">
+		<td class="label tdtop">
 			<input type="checkbox"
 			       id="db_create_database"
 			       name="db_create_database"
@@ -405,9 +405,9 @@ if (! empty($force_install_message))
 	</tr>
 
 	<tr class="hidesqlite">
-		<td class="label" valign="top"><b><?php echo $langs->trans("Login"); ?></b>
+		<td class="label tdtop"><b><?php echo $langs->trans("Login"); ?></b>
 		</td>
-		<td class="label" valign="top">
+		<td class="label tdtop">
 			<input type="text" id="db_user"
 			       name="db_user"
 			       value="<?php print (!empty($force_install_databaselogin)) ? $force_install_databaselogin : $dolibarr_main_db_user; ?>"
@@ -420,9 +420,9 @@ if (! empty($force_install_message))
 	</tr>
 
 	<tr class="hidesqlite">
-		<td class="label" valign="top"><b><?php echo $langs->trans("Password"); ?></b>
+		<td class="label tdtop"><b><?php echo $langs->trans("Password"); ?></b>
 		</td>
-		<td class="label" valign="top">
+		<td class="label tdtop">
 			<input type="password" id="db_pass" autocomplete="off"
 			       name="db_pass"
 			       value="<?php
@@ -442,9 +442,9 @@ if (! empty($force_install_message))
 	</tr>
 
 	<tr class="hidesqlite">
-		<td class="label" valign="top"><?php echo $langs->trans("CreateUser"); ?>
+		<td class="label tdtop"><?php echo $langs->trans("CreateUser"); ?>
 		</td>
-		<td class="label" valign="top">
+		<td class="label tdtop">
 			<input type="checkbox"
 			       id="db_create_user" name="db_create_user"
 				<?php if (!empty($force_install_createuser)) {
@@ -472,8 +472,8 @@ if (! empty($force_install_message))
 	</tr>
 
 	<tr class="hidesqlite hideroot">
-		<td class="label" valign="top"><b><?php echo $langs->trans("Login"); ?></b></td>
-		<td class="label" valign="top">
+		<td class="label tdtop"><b><?php echo $langs->trans("Login"); ?></b></td>
+		<td class="label tdtop">
 			<input type="text"
 			       id="db_user_root"
 			       name="db_user_root"
@@ -496,9 +496,9 @@ if (! empty($force_install_message))
 
 	</tr>
 	<tr class="hidesqlite hideroot">
-		<td class="label" valign="top"><b><?php echo $langs->trans("Password"); ?></b>
+		<td class="label tdtop"><b><?php echo $langs->trans("Password"); ?></b>
 		</td>
-		<td class="label" valign="top">
+		<td class="label tdtop">
 			<input type="password"
 			       autocomplete="off"
 			       id="db_pass_root"
diff --git a/htdocs/theme/common/ical.gif b/htdocs/theme/common/ical.gif
deleted file mode 100644
index 01cc8cde5643d5bde115b93b1df9b4ab09bd6c0c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 460
zcmV;-0W<zbNk%v~VI%+!0Hpu`03QPYnHYiAodDDqLDpHq?9VW`VPVOJ0JAfJ>Wu*R
zA|To{;`rtuyi9T0hycGS0MQzu;I={CRLA_q((&4%@T!sIqX5nvQNwz1(vT3cMPcM`
z5XLhAcnbigJ(1h00Lvc$JOh~eoe<Y0QO|Gk{qqalGjZU9LA`Bp&XSSsn=su&vF5{3
z-DI)yxB$B=0L3E^x;_A`I8oGWFuYv=!Y0!9)^XL1ap!%)^2y@*<&oT}QQ=?!$RX18
z*Z=?kEC2ui03-ko000K@z=>!`EE<o<qe(GnI-k&}G}>WKn=8rc${kdjxRSVpwT*S#
z0Z+_xx=IqNRbnYoQl5pbltCRRC?EqBVi7P+Z-G!>O#~$@G7kwQ0v-<_92y`aB{~cx
zF^DCKPmBW+j|c;aFHR5;8zmn*B?l0zqk^SYr>VH4ZY3Bbk2Sx#PNt|Vs*?h`BO?oA
zV-3fPb1HT>19~M65*s!WVJs;rEF~!yZyzT(ILTIFV-Eu@6k|R#Il>4JGfEVA@P?W_
zFT5UjSm>b%3>qj5c#r`Cfrmo_V0chvkzqrGT?T*{8B$7z03lMUT*<Pf%a#Cw0027_
C5x2kq

diff --git a/htdocs/theme/common/information.png b/htdocs/theme/common/information.png
deleted file mode 100644
index 231d39426c5bfba6b3e7f9a4f955be2888251285..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4180
zcmV-a5UcNrP)<h;3K|Lk000e1NJLTq002Ay002A)1^@s6I{evk00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyt=
z5eGY+;owLB01wnjL_t(&-tC%sj9piK$3MSwm$%HkS!|ETo_I-Gl0Xs{lCY*rT8bbw
zAS(W-DoU#gu@%%(r9k2Y!jeE@!rBdywtuv0E9j;Q5u8xckPxC0AS#8lggC_Zcw#$a
z&-%7|?>Xn!KhAygX1q+s#(@a=Ctc~yn|sea-{1QE{mz4Pa!!7xM1DH2{S%-765ta*
zYk)rp>s1(wV5nk}sz_=CV<J(tbk(SBc~2*U!<px39G-dB1CHMZ_LlIu`X1P_LD+kp
z0&IKD?yHRQQdQjndY(WPhyf4e2**@;RK<MDY4WwHFJC(kz@{68!ynPG=#9Wfo=p~h
z7Yqyut($e*t8agfsJlvp-!*aiia4$irB#x&PEx60q6A|M0P3B(B9|g>W3vuLk>QH&
zW8V9}SCzZ=AFF<cZ@$a1=|(vGYyrIGCR4p^Lo}Y)ZQ_f66(i5D4UIE6GC`ciq!A>s
zP>Bs`Vu&L{6bVKQ;PGCtUMZ}STTkv_aqcMd(+4Q>Eb~s^^n@Mx0zW*YJYhZD{8Iuv
zbR8`0X4}r)FEjW*OR9}42i9$&S{u|##YjCh4Ao*9g9$^ml!018trAg5V&ceP44~i?
zto3vYPp4bZ>{=Gvj)jiZ+4-i-P9I|a*pr8x*U#*`^Sa$^ze(8tVP*V%aO9Ss1mNod
z!={}ZhO3g_6eZPb2i9%T+Tc1#BS)hav3{t+#?cyM!!<^SY77ljs8<pyNkkk+rG>-m
zy@K<e!aB0t(e4&3v~rFuW*nXCGQChRJ=@Yl2Yx8cg_-XbPTx5B<?Fs*tz1txyX~0<
z{BF2nINmx@+iKK)Z(w9%pgwvY21~sntZyVtY#89Yu?FL#1B^6k4A#>CG>V8Lg9sR7
zmR>F<e9{uQb4pfNTAiGk#V&`AwV6E9WNN0%k*8)kwC{U3=ik2XPX9S*0c*E%bXtj+
zKf?1VwqJhDZ%0P%8JW1GS{WQcw4k0U8;4W2k2l!9d6>-`1{rBosirYeB!HkO-YHHM
z@5ALZnAj_TVnm3HkR}neN=&1cGF(roS0f@kmI$eB)NXt6wS(I`m(1_|z`wu^z}L?<
z;2ZILob5YrdsCcL{&wWN%Z!PP;4{+5Gdd7)-o`;D#u|(^YE+Uq#HUxR4epv3j=~;y
zIY(hVh4WbFan9kK;?)CSL`af|Y8n&ALSZePtPrV<QDoVr1KVGEb#r6mA9eBt9=>t5
z0KWsS+z@ZS{FQHulgb^V+kOF2E9x^MEcH~_FkEAN-5^8t3Xu_<CxEmrWZuG3WEPus
z$=fY#w@Xo2a;Hn6b8AcR;klj?yec9g=B>3Xw!1Xj8B!eul?&?3y>>2d+`;@6zyoIk
z@VD4{`Kw+O$ML_7Y`H9ebs3@sMjZ7@#Big^P`yGN8@$&5(Ds33ogC9y<hfgFY~5HR
zA>+V-{n#v{@G-gb0c_6`N^i&uhqVrCJ<dD2nPtA&VQ#TQH!p~5!|I*gJTNrBX@2jA
zz63zJ3)}-|n6%cvS0-M(VRLG9YIMsEHIWhZUBnfrT4Do3gB3QdYcRHMkb!DimK=jI
z!72t}$Cf%ffBAwFmj9<O-p_0^Mux_bsQ-*eC|gDZF$N>xoag9Vi^mQg<MF9^W}6mA
zj6^l&4t}3JYrW;bgA0Gd+(-4yE!_DA>n?iv=Z7~v=fb2?6ZIM53%~*%5ycoo5=TVF
z;8n4%v{W8k(_6<|U-vwa6ZLz^MccUhKfj5Ohsb<MJglRzmZIoc+>#feT+J-BnVxAf
z+ia8N1zy9lmBu*T`Ked<@xf1KKf1)if1M)nt|nV=GTU|x{C-j!+?m!#P}c=tfEJ)0
z!Q)jZ3QM!y#TY1TN)pEy6SA!WS6{mMq+kI=gv}c_u)o<wDjs797DX^dkkaDnm3CGz
zJ=<ii*`}Lic&8xX#bBa{p^X>S^~hrnEb!?oPhDwFD!YI-Y#%a);)9K`3lyJ=YJsQ)
z^`MH1AU?39RyPMiqDteyq@=91M`l~A>h-C4&wODq*7sd{$+bf{D+<R#tIM(Z7ITXo
zio$||Am9sB4C%m##z}g`*5A1G>d8Idy$?RWR=~FcuzmPrZ>SD!+8V_P>bi(8!J?>?
z2|&QBrzoJMIl1+uaS_;*2qrSz_q{28@0yDl9jc!2roH=S_@5`c)EdzeAu&dfl8~qm
zS-g`KEVeQhnq4}1f%gguhyxYWM+i=aCobjKzVF-$pTFv~VtDA6c30|E?r)4;kcxQl
zIjAi=y1;>hO9r>}8h|_R%NXumAr|ld?vp%s>nLNR^`&=w?c0;w{)LCh5wgOPTSt~#
z^1PsvTiV^6#dep4W|z6e4$XE(mKQj$;q{`FstK1EOq5b|=C=-<|0{bI_TDpfJSjOv
zmVPr^cV765X_7uLx^)NY+TgMfzXW&g#pLqP3}1&$hzaf}2u6anx|w71Xq}Ctbtb2q
zbaF=}jmjDu6c@In_>zrT=dsR(dh9)_imEK>T$Z$+f=Q96MrZLD&FLrpegA#!*VDd5
z*Wl8Bjp5eU4Xob=YSA)5AsU#zF{lsmwlV=xQb<s*;r=YgblRYf*chgpvrJD0*F_8+
z0g)K3*N`X*i)bIP0;(SG`|Fpt1h75js|)*7M{Q^m&FLS#kPE62k6_o7rHzSxC#jF3
zt^?`<P|CM>Us_{zQ3ccOQtW?-qI(3d9`yl?YCs?gLt_`imdjyap!X!Iy)|?xo1bj`
z@U@0N)Bz3*qyy`=Y}&H0?(ic#wF=;Cflo62s@q3RoKA>36pyF}@nzh~ntQBnX8DH?
zzn<q`^arcn_p7gbGi?;_{Zgd$@X0C5*$SryG?Yp2G0svMSVz{Ldjs(46^2~7%qM|s
zr5d@bqofjCQhh&Bp~t=OX?jnAW;=U&PgwSVh^%St6)8w5_ZmPeo;a;zL|%7-=bnUG
zsj9xfB-OqfYhRnHx)eie5x0i>R2B5}Tl4-tbeZZDQIAA1ioERU0iQo&MD+Y9u7LP5
zhEBBXTC5Nm!$bdjh&>Pfh%es%7|!{VE5-Yhs(x*t6~y%S={*V<V^q+}`l~;ZuAa2&
z6@c|7icys^=k^SI8m0x3*zkq>_QHL8S!`vz>c!_1MJFP&*8TX?Na=r26cG^-LnZY!
zAV0N*;|c;Xi0ZO*@Jx>Ee|*5YR1W)Fm9n{6iSb0hohBYSs25X$m0ld5hILOzoONM?
zr@4H8J5naBWnZeI2+nJ<I^fBUqH@@~Vx?7OY2C9fy;^&^UbG^@dc<B#Fp-8bdiaTj
z_UeGU9Yo}ZF7JSbMw}ky(|)j=P2gU^pFz}UuMDg2Tcq?#^&Ze8Jignn0{E@KXVohY
zIhzqC<+9>7L6_0Ivjtc&{q%U6bLM_64wWrXR_}5=d^P;@ou>kPNAT)B*FWfN24c!f
zmSqDu-DG__!FYzDU`i+kkq9vnd1nz-{yE(67poDEQtL(bpgNC8gkpmFRDiP|#9sTG
zKb}LM@)=*!PSrpJML?ne+9c%7qi$wF_pE_wEp6iO+Vh9N#E3+}y(NIwH5x{(g>Dx*
z9cZ^ssVub_vN(sCoyN@1phdB2bF$PR^|-X5A9}{%vbGjk>j$kT7VH`)9`C}d+}oW$
zOnr0$BnGi%H`41^%jRj7ST+lDaP(2|ZDe5q<n1R{ZucO1_}&o3=_bt9m*A7+lu4}L
zB}w0Ir7I&b?YRRYCccxYTm5N`X}9mZ?ctG$=UyIHs;J8lmz7fwM{m}!Y!+|=_>aBm
zC2VXc#&}E=ap7}*{)8SHU}3RI635hPRbKg;w=p+-1%6;~#paf*s>f3e0}`WAikKQE
zs&aJycbIME19SK6YOl@0m0ghCibH;@H8c6x=y{i^suk~}FbGgZw47_nO3*7tuorG-
zeEq=FpSm^%SG7V9WUo4e=BOMZN(3fCBtc9}XW<Ag?|y3To*UaI^}3VpAPYmhg9r0{
zMQ8EroyBPhBa|d01~DskCGw1suodes2a7QXy(*F*65~BIkM6^%`OGQ9Y}GgIZCOkF
z#@4Y(FbQH3)Wl)-CuS*@dmPr6<E}pVGth$6%9F&C#Vjkx4-%o01nb6C+A|06>fbYU
z_pbeC2Dp72Q+wWfz}ftd7Y;v)m_$WV)FkD=(;&<G(c>*0M`zIUt-Baa(r~yMy1l;Y
zRwSzkl^8Jzn1rk~OMC9gM-F^>*T*M@ZuoHz#6QgWuTFo^*zj`~R~qZUckwPSk6c_y
z?M{?eyx=^%hT*(*p1kn1vVy#DIPb{{PrFl4SQm~}eMvDzPGob+vhovwNl=qwOa)BL
z(I>u5k?ZEEuUvO{^)v1@$t(-`<|}pj@kfV5CMpBNBBu1NUeQ+{E@5eUareWME9O#i
zoQmbRKrP#|m0*{fR!!-~aTv*(3X0L0eGiMX?wYBu>^l5(NY?0cpJL|g3vH|Br3=%K
z&lXu5iK;55f|@jJKn$2@S$rvx5u)<AMM~gdPTfC7>5+ade-W@$-g>cNC=+D_CWa_Q
zqDrtVMrWtKFV5O`Oy0HY?zJFUdysW+(WwWHP8B}dF@NaMJZsH~L={X_MNB0O!lg`T
zVe;M^9EUR|(+}`oV$)@mE!<=JiLSQ>J+KLw3L=&AeK9i!{#$I;dCP%s+s{3NKWc%^
z*X&-O8h2N<G4{ft@e5Ixp}q)1dvD8H?Mg)DEPH8kzWmj?V$j+j0+a<FgNiBXZM>9?
zyNkzIoZgFb{^gT<cHIlWhMVE&`_Jx=T6)sl_rmV{qaV6saQju`-T9|p6xW7{(t$EY
zgIjCaWr>(&9Zku_MV8`RWO)l38UQtM2{OS%DPn>fdsUiG?W1{Y-@}=UE_?E>>;JD`
zQSN=_EW9M!ZZTVSRJX<0hmvYzY<TnY!VKF7`iXaV%3~U@WrkZeKVMN`O-U97W1=!N
zN>X7W+Ovmf&rIUcckI9OfzQI1&WyyIG1#pig2@j6F#Kz`S4L{~H$}{!Cbh=K`pAT)
z^-)nRP;W~r8V2Oc=S|Xc_nw8N9MMRGm;`TgZOt5%yfurp*>11$=LhfFb#T+*4IFNM
z^d}7XR7T%<+Z#mvJ58KEzuFiZNbAEyNd+-6#zY}%d-1%)nnFTTU#PQIY}TZ^I8D)+
z{{a$xu~j4=Jo+E+?wl2xde(_=<p#L45si%3<6)Eix~Ts{G3J_ZvKEn~H6%`#V%xg{
zmv`{42uaMd7vXa`@n0P}s!e@t-ZOLaS!3$Y;I#QAz&Fcw=r7rF)#8L0HW<|*MC+gt
zDvHqc$Rf&YUYJ8izWUx1Ejjvrn7#Sg4j4#ofa0So1`F^AFb1T+0?-960zShzIVb1j
eoSc*6<o^LD<Q#uU>O8vu0000<MNUMnLSTaY_!TGs

diff --git a/htdocs/theme/common/rss.gif b/htdocs/theme/common/rss.gif
deleted file mode 100644
index 16c96dd33756b3d48c6dadcf33eba9382e22316a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 476
zcmZ?wbhEHbRAJy_xXQqw$jA6$UDJnT)~gXLzrMVm@5p?AUeW(nlUie@w<kAVC^CN9
z;(RE8<>QqD|I-+rZ=U#nR`}C6mhTTP{4WxHu)OI%5Ueh~k|^^3;-=?&7k+>F;OC~M
z4>=<LYgGP!`|#o5LZCbYErH@s7FH1k1qL0EB_KaBu>Ex4PxH``>i0-?W-PRre_=(5
zmaED9_Fl1~2M*TLdR;%<owP9Q#j-<r`X{EDRXZFzVaojF>dtc-dc2~%B{^I?Qle~v
ze68ZG-F}(=*=!s<TurQkIs804+~SovBGb8fDkoO+WwY=K<*>~X$dy~t&A5e)X9C}(
znj%py))GNx$y||cLGj}o_Uv2T$<ZM+OIV7Nhm~8Dg@;{=k(HILi6{L+wg_uqXZHp!
z`I#~~++2<PtS?r*+Wk~iT<O6iWgRD`1lDs)n~EMZDl#%@1Ox~uHZgW?Y_r_ZQFzCg
lJCNl<r4hr_=1HpOEgUUBaW*kAB%PY$xp|rIY)1wLYXD|1m*oHe

diff --git a/htdocs/theme/common/vcal.gif b/htdocs/theme/common/vcal.gif
deleted file mode 100644
index 6ff53f5b7bc36a59f411b127bd521c735ba316d1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1079
zcmW+#YfR2z6hAhXhUE5v-ZXieT)MEMXz7!=Wuy7xL$YCx+uH~W$*`ypo5pzN11;v#
za;drGlC@;UgA&>+w^Gxjx2q!Y_&xvU+u1qicRT<8!o>^b#I6pd5!6d$?9;|5W5gIX
zhHRy^(aLBsnvEvgRN5$Ilo-WEk)0K7L>UnyY=rD8Ys1R07-qu+BtzPeG9-rB5DH)e
z8dzAyG+7?|l-8m(YfY9Gl~P)XR;(3S6=;gmB3f7rSy7l}rCBtyW`ahnYEqg+6Keu1
zR09m6p%Svt12M1x4J<5^HDqf%QHqr!>kqW3M3k@+vUZ^YO%}zhnBX3wFsn!uu_D+*
z9*~J`!~y>h0f$fxFo=dqj6w&9femP2kxkCFQRA@)*&yK$w5XVc3Aw^9RG=xuLdX$G
zBLL{aID&>-M2S2g6WfRbnqU|Xp&DQijZMgc4iEzy&}2_!r_n}@N4OY*gg?-tVzM8H
z&DFWLZ8|5kF*{eWvrf=9btgN!>cnA>;5f8Mj%a%mM~4M=pz%52N(c|0Kot>E($)F*
zPI1T83%=;Es_7F81IMiMAIdRPYNNwyqQk0ZhE_}sE^r6tM!D}rPP!Ela$|DPsgQB|
zhYT7&FZzArybmiAKW|8`Pg&cLvAyYNW^?Yr=CdbTt`zvLU2ZFX&{bL9_4ajdV?$p@
zdw+Ur)1`c0^~)Z7`XRpu4uDY#hX%6$1o;{Io8nq@<9vChU%>INSw;C3*(2Qvxy{Gw
zA7}k|fAjv+QAzXDs3G>v?Eu&P4Da&qbvZAR6Lz{wZWTODJohN;D|HXM6y=(`)z^QZ
zC97yvLV9E1rspwZ*Ua~HQclI-0E*k~Z8+twZ4IhT^>+UZJ(9AqCVN@sq42`%;WZch
ztMfBYr+j+g@l}<^x3o`<+4pbTky%S(<cX&zZ*<zGo73X2B$nh&m>s$D*>kUMjrdTt
zWhwm%?CkcASXGwRG4j!#^-*<kJC=OwI2u-5Qdvx2Vuz>4&M5Qzczt5?>DJ)Vi)ZTl
zDkoq2csIN8$pP1j$mBaal3aO($Nl$|wl#Tnj(z;DsDIbtPjB`ny()Y7r?>s{^<jP#
F_aB}U9@GE;

diff --git a/htdocs/theme/login_background.png b/htdocs/theme/login_background.png
deleted file mode 100644
index facc2c6f4423ed902fc2c478068417b0a08bd823..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 79
zcmeAS@N?(olHy`uVBq!ia0vp^j6j^i0VEib+*$VkDKSqM#}JO|$v@5?VQ3MU)R^(@
c!9~Va2KP>Z?f!}q6F@3GUHx3vIVCg!0He_qmjD0&


From 1f3a8b507e604492a7c98f0a2e1d7da4c38afb1d Mon Sep 17 00:00:00 2001
From: philippe grand <philippe.grand@atoo-net.com>
Date: Thu, 25 May 2017 22:02:57 +0200
Subject: [PATCH 485/505] missing translation

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

diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index 92fe19676c0..33434f03394 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -257,7 +257,7 @@ Formula=Formula
 ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
-
+NoJournalDefined=No journal defined
 Binded=Lines bound
 ToBind=Lines to bind
 

From 7a1480d362d1fc247f1d0234ec4d254a6a8858ba Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 26 May 2017 00:02:41 +0200
Subject: [PATCH 486/505] Look and feel v6

---
 htdocs/bookmarks/bookmarks.lib.php | 33 ++++++++----------------------
 htdocs/install/default.css         | 29 +++++++++++++++++---------
 htdocs/install/fileconf.php        | 12 +++++------
 htdocs/theme/eldy/style.css.php    |  3 ++-
 htdocs/theme/md/style.css.php      |  2 +-
 5 files changed, 37 insertions(+), 42 deletions(-)

diff --git a/htdocs/bookmarks/bookmarks.lib.php b/htdocs/bookmarks/bookmarks.lib.php
index c1882ce4bf9..4df9b56979d 100644
--- a/htdocs/bookmarks/bookmarks.lib.php
+++ b/htdocs/bookmarks/bookmarks.lib.php
@@ -41,29 +41,15 @@ function printBookmarksList($aDb, $aLangs)
 	$langs->load("bookmarks");
 
 	$url= $_SERVER["PHP_SELF"].(! empty($_SERVER["QUERY_STRING"])?'?'.$_SERVER["QUERY_STRING"]:'');
-    // TODO Add post param to $url
     
 	$ret = '';
 	
 	// Menu bookmark
-	/*
-	$ret.= '<div class="menu_titre">';
-	$ret.= '<table class="nobordernopadding" width="100%" summary="bookmarkstable"><tr><td>';
-	$ret.= '<a class="vmenu" href="'.DOL_URL_ROOT.'/bookmarks/list.php">'.$langs->trans('Bookmarks').'</a>';
-	$ret.= '</td><td align="right">';
-	if ($user->rights->bookmark->creer)
-	{
-		$ret.= '<a class="vsmenu addbookmarkpicto" href="'.DOL_URL_ROOT.'/bookmarks/card.php?action=create&amp;urlsource='.urlencode($url).'&amp;url='.urlencode($url).'">';
-		$ret.=img_object($langs->trans('AddThisPageToBookmarks'),'bookmark');
-		$ret.= '</a>';
-	}
-	$ret.= '</td></tr></table>';
-	$ret.= '</div>';
-    */
 	$ret.= '<div class="menu_top"></div>'."\n";
 
-	$ret.= '<!-- form with POST method by default --><form id="actionbookmark" name="actionbookmark" method="POST" action="">';
-	$ret.= '<select name="bookmark" id="boxbookmark" class="flat boxcombo vmenusearchselectcombo">';
+	$ret.= '<!-- form with POST method by default, will be replaced with GET for external link by js -->'."\n";
+	$ret.= '<form id="actionbookmark" name="actionbookmark" method="POST" action="">';
+	$ret.= '<select name="bookmark" id="boxbookmark" class="flat boxcombo vmenusearchselectcombo" alt="Bookmarks">';
 	$ret.= '<option hidden value="listbookmarks" class="optiongrey" selected rel="'.DOL_URL_ROOT.'/bookmarks/list.php">'.$langs->trans('Bookmarks').'</option>';
     $ret.= '<option value="listbookmark" class="optionblue" rel="'.dol_escape_htmltag(DOL_URL_ROOT.'/bookmarks/list.php').'">'.dol_escape_htmltag($user->rights->bookmark->creer ? $langs->trans('EditBookmarks') : $langs->trans('ListOfBookmarks')).'...</option>';
 	// Url to go on create new bookmark page
@@ -77,19 +63,18 @@ function printBookmarksList($aDb, $aLangs)
 	{
 		$sql = "SELECT rowid, title, url, target FROM ".MAIN_DB_PREFIX."bookmark";
 		$sql.= " WHERE (fk_user = ".$user->id." OR fk_user is NULL OR fk_user = 0)";
-        $sql.= " AND entity = ".$conf->entity;
+        $sql.= " AND entity IN (".getEntity('bookmarks',1).")";
 		$sql.= " ORDER BY position";
 		if ($resql = $db->query($sql) )
 		{
 			$i=0;
 			while ($i < $conf->global->BOOKMARKS_SHOW_IN_MENU && $obj = $db->fetch_object($resql))
 			{
-				//$ret.='<div class="menu_contenu">';
-			    $ret.='<option name="bookmark'.$obj->rowid.'" value="'.$obj->rowid.'" '.($obj->target == 1?' target="_blank"':'').' rel="'.dol_escape_htmltag($obj->url).'">'.img_picto('','object_bookmark').' '.$obj->title.'</option>';
-				/*$ret.='<a class="vsmenu" title="'.$obj->title.'" href="'.$obj->url.'"'.($obj->target == 1?' target="_blank"':'').'>';
-				if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) $ret.=' '.img_object('','bookmark').' ';
-				$ret.= dol_trunc($obj->title, 20).'</a><br>';*/
-				//$ret.='</div>';
+			    $ret.='<option name="bookmark'.$obj->rowid.'" value="'.$obj->rowid.'" '.($obj->target == 1?' target="_blank"':'').' rel="'.dol_escape_htmltag($obj->url).'">';
+			    //$ret.='<span class="fa fa-print">aa</span>';
+			    $ret.=img_picto('','object_bookmark').' ';
+			    $ret.=$obj->title;
+			    $ret.='</option>';
 				$i++;
 			}
 		}
diff --git a/htdocs/install/default.css b/htdocs/install/default.css
index b3905e63a49..e23a36ddd21 100644
--- a/htdocs/install/default.css
+++ b/htdocs/install/default.css
@@ -289,11 +289,11 @@ div.comment {
 }
 
 h3 {
-	margin-top: 10px;
+	margin-top: 20px;
 	font-size:16px;
 	font-weight: normal;
-	color: #4965B3;
-	text-shadow: 1px 1px 1px #c0c0c0;
+	color: rgb(100,60,20);
+	/* text-shadow: 1px 1px 1px #c0c0c0; */
 }
 
 tr.bg1 {
@@ -345,15 +345,15 @@ ul {
 
 .button {
     background: #fcfcfc;
-    border: 1px solid #d0d0d0;
+    border: 1px solid #e0e0e0;
     padding: 0.3em 0.7em;
     margin: 0 0.5em;
-    -moz-border-radius:0 5px 0 5px;
-    -webkit-border-radius:0 5px 0 5px;
-    border-radius:0 5px 0 5px;
-    -moz-box-shadow: 2px 2px 3px #CCC;
-    -webkit-box-shadow: 2px 2px 3px #CCC;
-    box-shadow: 2px 2px 3px #CCC;
+    -moz-border-radius: 5px 5px 5px 5px;
+    -webkit-border-radius: 5px 5px 5px 5px;
+    border-radius: 5px 5px 5px 5px;
+    -moz-box-shadow: 2px 2px 3px #ddd;
+    -webkit-box-shadow: 2px 2px 3px #ddd;
+    box-shadow: 2px 2px 3px #ddd;
 }
 a.button:hover {
     text-decoration:none;
@@ -368,3 +368,12 @@ a.button:hover {
 .center {
     text-align: center;
 }
+
+.valignmiddle {
+	vertical-align: middle;
+}
+
+.valigntextbottom {
+	vertical-align: text-bottom;
+}
+
diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php
index 424126b63b6..c0a3aaf65fd 100644
--- a/htdocs/install/fileconf.php
+++ b/htdocs/install/fileconf.php
@@ -109,8 +109,8 @@ if (! empty($force_install_message))
 <table class="nobordernopadding<?php if ($force_install_noedit) print ' hidewhennoedit'; ?>">
 
 	<tr>
-		<td colspan="3" class="label" align="center">
-		<h3><?php echo $langs->trans("WebServer"); ?></h3>
+		<td colspan="3" class="label">
+		<h3><img class="valigntextbottom" src="../theme/common/octicons/lib/svg/globe.svg" width="20" alt="webserver"> <?php echo $langs->trans("WebServer"); ?></h3>
 		</td>
 	</tr>
 
@@ -232,8 +232,8 @@ if (! empty($force_install_message))
 	<!-- Dolibarr database -->
 
 	<tr>
-		<td colspan="3" class="label" align="center"><br>
-		<h3><?php echo $langs->trans("DolibarrDatabase"); ?></h3>
+		<td colspan="3" class="label"><br>
+		<h3><img class="valigntextbottom" src="../theme/common/octicons/lib/svg/database.svg" width="20" alt="webserver"> <?php echo $langs->trans("DolibarrDatabase"); ?></h3>
 		</td>
 	</tr>
 
@@ -466,8 +466,8 @@ if (! empty($force_install_message))
 	$force_install_databaserootpass = parse_database_pass($force_install_databaserootpass);
 	?>
 	<tr class="hidesqlite hideroot">
-		<td colspan="3" class="label" align="center"><br>
-		<h3><?php echo $langs->trans("DatabaseSuperUserAccess"); ?></h3>
+		<td colspan="3" class="label"><br>
+		<h3><img class="valigntextbottom" src="../theme/common/octicons/lib/svg/shield.svg" width="20" alt="webserver"> <?php echo $langs->trans("DatabaseSuperUserAccess"); ?></h3>
 		</td>
 	</tr>
 
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index a8eddcd825f..3e995d83c83 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -1782,7 +1782,7 @@ font.vsmenudisabled { font-size:<?php print $fontsize ?>px; font-family: <?php p
 a.vsmenu:link, a.vsmenu:visited { color: #<?php echo $colortextbackvmenu; ?>; white-space: nowrap; }
 font.vsmenudisabledmargin { margin: 1px 1px 1px 6px; }
 
-a.help:link, a.help:visited, a.help:hover, a.help:active, span.help { font-size:<?php print $fontsizesmaller ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: normal; color: #666666; text-decoration: none; }
+a.help:link, a.help:visited, a.help:hover, a.help:active, span.help { font-size:<?php print $fontsizesmaller ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: normal; color: #aaa; text-decoration: none; }
 
 .vmenu div.blockvmenufirst, .vmenu div.blockvmenulogo, .vmenu div.blockvmenusearchphone, .vmenu div.blockvmenubookmarks
 {
@@ -1815,6 +1815,7 @@ div.blockvmenusearchphone
 }
 div.blockvmenubookmarks
 {
+	padding-top: 10px !important;
 	padding-bottom: 16px !important;
 }
 div.blockvmenupair, div.blockvmenuimpair, div.blockvmenubookmarks, div.blockvmenuend
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 943540fa02f..4fd3d736f04 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -1805,7 +1805,7 @@ font.vsmenudisabled { font-size:<?php print $fontsize ?>px; font-family: <?php p
 a.vsmenu:link, a.vsmenu:visited { color: #<?php echo $colortextbackvmenu; ?>; white-space: nowrap; }
 font.vsmenudisabledmargin { margin: 1px 1px 1px 8px; }
 
-a.help:link, a.help:visited, a.help:hover, a.help:active, span.help { font-size:<?php print $fontsizesmaller ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: normal; color: #666666; text-decoration: none; }
+a.help:link, a.help:visited, a.help:hover, a.help:active, span.help { font-size:<?php print $fontsizesmaller ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: normal; color: #999; text-decoration: none; }
 
 div.blockvmenulogo
 {

From 95b2b1bd173c04ec427e48b0bd120aa92de86222 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Fri, 26 May 2017 10:28:10 +0200
Subject: [PATCH 487/505] Fix: for view special values

---
 htdocs/admin/modulehelp.php | 97 ++++++++++++++++++++++---------------
 1 file changed, 58 insertions(+), 39 deletions(-)

diff --git a/htdocs/admin/modulehelp.php b/htdocs/admin/modulehelp.php
index d318566ff61..21e3afb3921 100644
--- a/htdocs/admin/modulehelp.php
+++ b/htdocs/admin/modulehelp.php
@@ -1,5 +1,6 @@
 <?php
-/* Copyright (C) 2017  Laurent Destailleur     <eldy@users.sourceforge.net>
+/* Copyright (C) 2017	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2017	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
@@ -68,7 +69,7 @@ llxHeader('',$langs->trans("Setup"),$help_url);
 print '<!-- Force style container -->'."\n".'<style>
 .id-container {
     width: 100%;
-} 
+}
 </style>';
 
 $arrayofnatures=array('core'=>$langs->transnoentitiesnoconv("Core"), 'external'=>$langs->transnoentitiesnoconv("External").' - '.$langs->trans("AllPublishers"));
@@ -165,6 +166,7 @@ foreach ($modulesdir as $dir)
 
 		    			            // Gives the possibility to the module, to provide his own family info and position of this family
 		    			            if (is_array($objMod->familyinfo) && !empty($objMod->familyinfo)) {
+		    			            	if (!is_array($familyinfo)) $familyinfo=array();
 		    			            	$familyinfo = array_merge($familyinfo, $objMod->familyinfo);
 		    			            	$familykey = key($objMod->familyinfo);
 		    			            } else {
@@ -305,13 +307,13 @@ if ($objMod->isCoreOrExternalModule() == 'external')
 
 // Define text of description of module
 $text='';
-   
+
 if ($mode == 'desc')
 {
     if ($moduledesc) $text.=$moduledesc.'<br><br>';
-    
+
     $text.='<strong>'.$langs->trans("Version").':</strong> '.$version;
-    
+
     $textexternal='';
     if ($objMod->isCoreOrExternalModule() == 'external')
     {
@@ -346,8 +348,8 @@ if ($mode == 'desc')
         $text.='<strong>'.$langs->trans("LastActivationIP").':</strong> ';
         $text.= $ip;
         $text.='<br>';
-    }    
-    
+    }
+
     $moduledesclong=$objMod->getDescLong();
     if ($moduledesclong) $text.='<br><hr><div class="moduledesclong">'.$moduledesclong.'<div>';
 }
@@ -360,9 +362,9 @@ if ($mode == 'feature')
     $text.='<br><strong>'.$langs->trans("RequiredBy").':</strong> ';
 	if (count($objMod->requiredby)) $text.=join(',', $objMod->requiredby);
 	else $text.=$langs->trans("None");
-	
+
     $text.='<br><br><br>';
-    
+
     $text.='<strong>'.$langs->trans("AddRemoveTabs").':</strong> ';
     if (isset($objMod->tabs) && is_array($objMod->tabs) && count($objMod->tabs))
     {
@@ -375,9 +377,9 @@ if ($mode == 'feature')
         }
     }
     else $text.=$langs->trans("No");
-    
+
     $text.='<br>';
-    
+
     $text.='<br><strong>'.$langs->trans("AddDictionaries").':</strong> ';
     if (isset($objMod->dictionaries) && isset($objMod->dictionaries['tablib']) && is_array($objMod->dictionaries['tablib']) && count($objMod->dictionaries['tablib']))
     {
@@ -389,9 +391,9 @@ if ($mode == 'feature')
         }
     }
     else $text.=$langs->trans("No");
-    
+
     $text.='<br>';
-    
+
     $text.='<br><strong>'.$langs->trans("AddBoxes").':</strong> ';
     if (isset($objMod->boxes) && is_array($objMod->boxes) && count($objMod->boxes))
     {
@@ -403,27 +405,27 @@ if ($mode == 'feature')
         }
     }
     else $text.=$langs->trans("No");
-    
+
     $text.='<br>';
-    
+
     $text.='<br><strong>'.$langs->trans("AddModels").':</strong> ';
     if (isset($objMod->module_parts) && isset($objMod->module_parts['models']) && $objMod->module_parts['models'])
     {
         $text.=$langs->trans("Yes");
     }
     else $text.=$langs->trans("No");
-    
+
     $text.='<br>';
-    
+
     $text.='<br><strong>'.$langs->trans("AddSubstitutions").':</strong> ';
     if (isset($objMod->module_parts) && isset($objMod->module_parts['substitutions']) && $objMod->module_parts['substitutions'])
     {
         $text.=$langs->trans("Yes");
     }
     else $text.=$langs->trans("No");
-    
+
     $text.='<br>';
-    
+
     $text.='<br><strong>'.$langs->trans("AddSheduledJobs").':</strong> ';
     if (isset($objMod->cronjobs) && is_array($objMod->cronjobs) && count($objMod->cronjobs))
     {
@@ -435,55 +437,72 @@ if ($mode == 'feature')
         }
     }
     else $text.=$langs->trans("No");
-    
+
     $text.='<br>';
-    
+
     $text.='<br><strong>'.$langs->trans("AddTriggers").':</strong> ';
     if (isset($objMod->module_parts) && isset($objMod->module_parts['triggers']) && $objMod->module_parts['triggers'])
     {
         $text.=$langs->trans("Yes");
     }
     else $text.=$langs->trans("No");
-    
+
     $text.='<br>';
-    
+
     $text.='<br><strong>'.$langs->trans("AddHooks").':</strong> ';
     if (isset($objMod->module_parts) && is_array($objMod->module_parts['hooks']) && count($objMod->module_parts['hooks']))
     {
-        $i=0;
-        foreach($objMod->module_parts['hooks'] as $val)
+    	$i=0;
+        foreach($objMod->module_parts['hooks'] as $key => $val)
         {
-            $text.=($i?', ':'').($val);
-            $i++;
+        	if ($key == 'entity') continue;
+
+        	// For special values
+        	if ($key == 'data')
+        	{
+        		if (is_array($val))
+        		{
+        			foreach($val as $value)
+        			{
+        				$text.=($i?', ':'').($value);
+        				$i++;
+        			}
+
+        			continue;
+        		}
+        	}
+
+        	$text.=($i?', ':'').($val);
+        	$i++;
         }
     }
     else $text.=$langs->trans("No");
-    
+
     $text.='<br>';
-    
+
     $text.='<br><strong>'.$langs->trans("AddPermissions").':</strong> ';
     if (isset($objMod->rights) && is_array($objMod->rights) && count($objMod->rights))
     {
         $i=0;
         foreach($objMod->rights as $val)
         {
-            $text.=($i?', ':'').($val[1]);
-            $i++;
+        	$text.=($i?', ':'').($val[1]);
+        	$i++;
         }
     }
     else $text.=$langs->trans("No");
-    
+
     $text.='<br>';
-    
+
     $text.='<br><strong>'.$langs->trans("AddMenus").':</strong> ';
     if (isset($objMod->menu) && ! empty($objMod->menu)) // objMod can be an array or just an int 1
     {
         $text.=$langs->trans("Yes");
     }
     else $text.=$langs->trans("No");
-    
+
     $text.='<br>';
-    
+
     $text.='<br><strong>'.$langs->trans("AddExportProfiles").':</strong> ';
     if (isset($objMod->export_label) && is_array($objMod->export_label) && count($objMod->export_label))
     {
@@ -495,9 +514,9 @@ if ($mode == 'feature')
         }
     }
     else $text.=$langs->trans("No");
-    
+
     $text.='<br>';
-    
+
     $text.='<br><strong>'.$langs->trans("AddImportProfiles").':</strong> ';
     if (isset($objMod->import_label) && is_array($objMod->import_label) && count($objMod->import_label))
     {
@@ -509,9 +528,9 @@ if ($mode == 'feature')
         }
     }
     else $text.=$langs->trans("No");
-    
+
     $text.='<br>';
-    
+
     $text.='<br><strong>'.$langs->trans("AddOtherPagesOrServices").':</strong> ';
     $text.=$langs->trans("DetectionNotPossible");
 }

From ee2019ae37c307872781d2ab8350fb2cf49f93f8 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Fri, 26 May 2017 16:52:27 +0200
Subject: [PATCH 488/505] Fix: limit to 100 by default to avoid freeze

---
 .../action/class/api_agendaevents.class.php   | 88 +++++++++----------
 1 file changed, 44 insertions(+), 44 deletions(-)

diff --git a/htdocs/comm/action/class/api_agendaevents.class.php b/htdocs/comm/action/class/api_agendaevents.class.php
index 376df238a95..a056dccb865 100644
--- a/htdocs/comm/action/class/api_agendaevents.class.php
+++ b/htdocs/comm/action/class/api_agendaevents.class.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2015   Jean-François Ferry     <jfefe@aternatik.fr>
  * Copyright (C) 2016   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
@@ -23,14 +23,14 @@
 /**
  * API class for Agenda Events
  *
- * @access protected 
+ * @access protected
  * @class  DolibarrApiAccess {@requires user,external}
  */
 class AgendaEvents extends DolibarrApi
 {
 
     /**
-     * @var array   $FIELDS     Mandatory fields, checked when create and update object 
+     * @var array   $FIELDS     Mandatory fields, checked when create and update object
      */
     static $FIELDS = array(
     );
@@ -40,7 +40,7 @@ class AgendaEvents extends DolibarrApi
      */
     public $actioncomm;
 
-    
+
     /**
      * Constructor
      */
@@ -55,61 +55,61 @@ class AgendaEvents extends DolibarrApi
      * Get properties of a Agenda Events object
      *
      * Return an array with Agenda Events informations
-     * 
+     *
      * @param       int         $id         ID of Agenda Events
      * @return 	    array|mixed             Data without useless information
 	 *
      * @throws 	RestException
      */
     function get($id)
-    {		
+    {
         if(! DolibarrApiAccess::$user->rights->agenda->myactions->read) {
             throw new RestException(401, "Insuffisant rights to read an event");
         }
-        
+
         $result = $this->actioncomm->fetch($id);
         if( ! $result ) {
             throw new RestException(404, 'Agenda Events not found');
         }
-		
+
         if(! DolibarrApiAccess::$user->rights->agenda->allactions->read && $this->actioncomm->ownerid != DolibarrApiAccess::$user->id) {
             throw new RestException(401, "Insuffisant rights to read event for owner id ".$request_data['userownerid'].' Your id is '.DolibarrApiAccess::$user->id);
         }
-        
+
 		if( ! DolibarrApi::_checkAccessToResource('agenda',$this->actioncomm->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
-        
+
         $this->actioncomm->fetchObjectLinked();
 		return $this->_cleanObjectDatas($this->actioncomm);
     }
 
     /**
      * List Agenda Events
-     * 
+     *
      * Get a list of Agenda Events
-     * 
+     *
      * @param string	$sortfield	Sort field
      * @param string	$sortorder	Sort order
      * @param int		$limit		Limit for list
      * @param int		$page		Page number
      * @param string   	$user_ids   User ids filter field (owners of event). Example: '1' or '1,2,3'          {@pattern /^[0-9,]*$/i}
-     * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.label:like:'%dol%') and (t.date_creation:<:'20160101')"
+     * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.label:like:'%dol%') and (t.datec:<:'20160101')"
      * @return  array               Array of Agenda Events objects
      */
-    function index($sortfield = "t.id", $sortorder = 'ASC', $limit = 0, $page = 0, $user_ids = 0, $sqlfilters = '') {
+    function index($sortfield = "t.id", $sortorder = 'ASC', $limit = 100, $page = 0, $user_ids = 0, $sqlfilters = '') {
         global $db, $conf;
-        
+
         $obj_ret = array();
 
         // case of external user
         $socid = 0;
-        if (! empty(DolibarrApiAccess::$user->societe_id)) $socid = DolibarrApiAccess::$user->societe_id;
-        
+        if (! empty(DolibarrApiAccess::$user->socid)) $socid = DolibarrApiAccess::$user->socid;
+
         // If the internal user must only see his customers, force searching by him
         $search_sale = 0;
         if (! DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) $search_sale = DolibarrApiAccess::$user->id;
-        
+
         $sql = "SELECT t.id as rowid";
         $sql.= " FROM ".MAIN_DB_PREFIX."actioncomm as t";
         $sql.= ' WHERE t.entity IN ('.getEntity('agenda', 1).')';
@@ -121,7 +121,7 @@ class AgendaEvents extends DolibarrApi
             $sql .= " AND sc.fk_user = ".$search_sale;
         }
         // Add sql filters
-        if ($sqlfilters) 
+        if ($sqlfilters)
         {
             if (! DolibarrApi::_checkFilters($sqlfilters))
             {
@@ -130,7 +130,7 @@ class AgendaEvents extends DolibarrApi
 	        $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
             $sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
         }
-        
+
         $sql.= $db->order($sortfield, $sortorder);
         if ($limit)	{
             if ($page < 0)
@@ -143,7 +143,7 @@ class AgendaEvents extends DolibarrApi
         }
 
         $result = $db->query($sql);
-        
+
         if ($result)
         {
             $num = $db->num_rows($result);
@@ -181,7 +181,7 @@ class AgendaEvents extends DolibarrApi
       if(! DolibarrApiAccess::$user->rights->agenda->allactions->create && DolibarrApiAccess::$user->id != $request_data['userownerid']) {
 		      throw new RestException(401, "Insuffisant rights to create an Agenda Event for owner id ".$request_data['userownerid'].' Your id is '.DolibarrApiAccess::$user->id);
 		  }
-		  
+
         // Check mandatory fields
         $result = $this->_validate($request_data);
 
@@ -198,18 +198,18 @@ class AgendaEvents extends DolibarrApi
         if ($this->actioncomm->create(DolibarrApiAccess::$user) < 0) {
             throw new RestException(500, "Error creating event", array_merge(array($this->actioncomm->error), $this->actioncomm->errors));
         }
-        
+
         return $this->actioncomm->id;
     }
 
-    
+
     /**
      * Update Agenda Event general fields (won't touch lines of expensereport)
      *
      * @param int   $id             Id of Agenda Event to update
-     * @param array $request_data   Datas   
-     * 
-     * @return int 
+     * @param array $request_data   Datas
+     *
+     * @return int
      */
     /*
     function put($id, $request_data = NULL) {
@@ -219,12 +219,12 @@ class AgendaEvents extends DolibarrApi
       if(! DolibarrApiAccess::$user->rights->agenda->allactions->create && DolibarrApiAccess::$user->id != $request_data['userownerid']) {
 		      throw new RestException(401, "Insuffisant rights to create an Agenda Event for owner id ".$request_data['userownerid'].' Your id is '.DolibarrApiAccess::$user->id);
 		  }
-        
+
         $result = $this->expensereport->fetch($id);
         if( ! $result ) {
             throw new RestException(404, 'expensereport not found');
         }
-		
+
 		if( ! DolibarrApi::_checkAccessToResource('expensereport',$this->expensereport->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
@@ -232,19 +232,19 @@ class AgendaEvents extends DolibarrApi
             if ($field == 'id') continue;
             $this->expensereport->$field = $value;
         }
-        
+
         if($this->expensereport->update($id, DolibarrApiAccess::$user,1,'','','update'))
             return $this->get($id);
-        
+
         return false;
     }
     */
-        
+
     /**
      * Delete Agenda Event
      *
      * @param   int     $id         Agenda Event ID
-     * 
+     *
      * @return  array
      */
     function delete($id)
@@ -252,39 +252,39 @@ class AgendaEvents extends DolibarrApi
         if(! DolibarrApiAccess::$user->rights->agenda->myactions->delete) {
 			  throw new RestException(401, "Insuffisant rights to delete your Agenda Event");
 		}
-        
+
 		$result = $this->actioncomm->fetch($id);
-		  
+
         if(! DolibarrApiAccess::$user->rights->agenda->allactions->delete && DolibarrApiAccess::$user->id != $this->actioncomm->userownerid) {
 		      throw new RestException(401, "Insuffisant rights to delete an Agenda Event of owner id ".$request_data['userownerid'].' Your id is '.DolibarrApiAccess::$user->id);
 		}
-		
+
 		if( ! $result ) {
             throw new RestException(404, 'Agenda Event not found');
         }
-		
+
 		if( ! DolibarrApi::_checkAccessToResource('actioncomm',$this->actioncomm->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
-        
+
         if( ! $this->actioncomm->delete(DolibarrApiAccess::$user)) {
             throw new RestException(500, 'Error when delete Agenda Event : '.$this->actioncomm->error);
         }
-        
+
         return array(
             'success' => array(
                 'code' => 200,
                 'message' => 'Agenda Event deleted'
             )
         );
-        
+
     }
-    
+
     /**
      * Validate fields before create or update object
-     * 
+     *
      * @param   array           $data   Array with data to verify
-     * @return  array           
+     * @return  array
      * @throws  RestException
      */
     function _validate($data)
@@ -294,7 +294,7 @@ class AgendaEvents extends DolibarrApi
             if (!isset($data[$field]))
                 throw new RestException(400, "$field field missing");
             $event[$field] = $data[$field];
-            
+
         }
         return $event;
     }

From db9e068500f9242043d6a54c9285dfd1aa270748 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Fri, 26 May 2017 17:38:57 +0200
Subject: [PATCH 489/505] Fix: [Restler] Delete the cache file otherwise it
 does not update

---
 htdocs/api/admin/index.php | 29 +++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/htdocs/api/admin/index.php b/htdocs/api/admin/index.php
index c22a12fee61..218ab58467e 100644
--- a/htdocs/api/admin/index.php
+++ b/htdocs/api/admin/index.php
@@ -43,12 +43,29 @@ if ($action == 'setproductionmode')
 
 	if (dolibarr_set_const($db, 'API_PRODUCTION_MODE', $status, 'chaine', 0, '', $conf->entity) > 0)
 	{
-	    $result = dol_mkdir($conf->api->dir_temp);
-	    if ($result < 0)
-	    {
-	        setEventMessages($langs->trans("ErrorFaildToCreateDir", $conf->api->dir_temp), null, 'errors');
-	    }
-	    else
+		$error=0;
+
+		if ($status == 1)
+		{
+			$result = dol_mkdir($conf->api->dir_temp);
+			if ($result < 0)
+			{
+				setEventMessages($langs->trans("ErrorFailedToCreateDir", $conf->api->dir_temp), null, 'errors');
+				$error++;
+			}
+		}
+		else
+		{
+			// Delete the cache file otherwise it does not update
+			$result = dol_delete_file($conf->api->dir_temp.'/routes.php');
+			if ($result < 0)
+			{
+				setEventMessages($langs->trans("ErrorFailedToDeleteFile", $conf->api->dir_temp.'/routes.php'), null, 'errors');
+				$error++;
+			}
+		}
+
+	    if (!$error)
 	    {
     		header("Location: ".$_SERVER["PHP_SELF"]);
 	   	    exit;

From 1711107420dcaeea69c75e6a19ebac3ad457826d Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Sat, 27 May 2017 07:11:17 +0200
Subject: [PATCH 490/505] FIX : colspan in bank entries

---
 htdocs/compta/bank/bankentries.php | 86 ++++++++++++++----------------
 1 file changed, 39 insertions(+), 47 deletions(-)

diff --git a/htdocs/compta/bank/bankentries.php b/htdocs/compta/bank/bankentries.php
index fd3c1ec9825..2598d1659d0 100644
--- a/htdocs/compta/bank/bankentries.php
+++ b/htdocs/compta/bank/bankentries.php
@@ -3,8 +3,8 @@
  * Copyright (C) 2004-2016  Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2010  Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2012       Vinícius Nogueira    <viniciusvgn@gmail.com>
- * Copyright (C) 2014       Florian Henry    	 <florian.henry@open-cooncept.pro>
- * Copyright (C) 2015       Jean-François Ferry	 <jfefe@aternatik.fr>
+ * Copyright (C) 2014       Florian Henry        <florian.henry@open-cooncept.pro>
+ * Copyright (C) 2015       Jean-François Ferry  <jfefe@aternatik.fr>
  * Copyright (C) 2016       Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2017       Alexandre Spangaro   <aspangaro@zendsi.com>
  *
@@ -195,7 +195,7 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETP
 	$search_num_releve='';
 	$search_conciliated='';
 	$thirdparty='';
-	
+
 	$account="";
 	if ($id > 0 || ! empty($ref)) $account=$object->id;
 }
@@ -436,7 +436,6 @@ if ($id > 0 || ! empty($ref))
                 print '<a class="butActionRefused" title="'.$langs->trans("NotEnoughPermissions").'" href="#">'.$langs->trans("Conciliate").'</a>';
             }
         }
-    
         print '</div>';
     }
 }
@@ -548,9 +547,9 @@ if ($resql)
 {
 	$var=True;
 	$num = $db->num_rows($resql);
-	
+
 	$arrayofselected=is_array($toselect)?$toselect:array();
-	
+
     // List of mass actions available
     $arrayofmassactions =  array(
         //'presend'=>$langs->trans("SendByMail"),
@@ -559,16 +558,14 @@ if ($resql)
     //if ($user->rights->bank->supprimer) $arrayofmassactions['delete']=$langs->trans("Delete");
     if ($massaction == 'presend') $arrayofmassactions=array();
     $massactionbutton=$form->selectMassAction('', $arrayofmassactions);
-    
-    
+
     // Confirmation delete
     if ($action == 'delete')
     {
         $text=$langs->trans('ConfirmDeleteTransaction');
         print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id.'&rowid='.GETPOST("rowid"), $langs->trans('DeleteTransaction'), $text, 'confirm_delete', null, '', 1);
     }
-    
-    
+
     // Lines of title fields
 	print '<form method="post" action="'.$_SERVER["PHP_SELF"].'" name="search_form">'."\n";
 	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
@@ -582,7 +579,7 @@ if ($resql)
 	print '<input type="hidden" name="id" value="'.$id.'">';
 	print '<input type="hidden" name="ref" value="'.$ref.'">';
 	if (GETPOST('bid')) print '<input type="hidden" name="bid" value="'.GETPOST("bid").'">';
-	
+
 	// Form to reconcile
 	if ($user->rights->banque->consolidate && $action == 'reconcile')
 	{
@@ -657,11 +654,10 @@ if ($resql)
     	});
     });
     </script>
-    	
-    ';	
-	
+    ';
+
 	$i = 0;
-	
+
 	// Title
 	$bankcateg=new BankCateg($db);
 	$morehtml='<div data-role="fieldcontain">';
@@ -669,7 +665,7 @@ if ($resql)
 	$morehtml.='<input type="text" name="pageplusone" id="pageplusone" size="1" class="flat" value="'.($page+1).'">';
 	$morehtml.='/'.$nbtotalofpages.' ';
 	$morehtml.='</div>';
-	
+
 	$picto='title_bank';
 	if ($id > 0 || ! empty($ref)) $picto='';
 	if (GETPOST("bid"))
@@ -681,13 +677,12 @@ if ($resql)
 	{
 		print_barre_liste($langs->trans("BankTransactions"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, $picto, 0, $morehtml, '', $limit);
 	}
-	
+
 	// We can add page now to param
 	if ($page != '') $param.='&page='.urlencode($page);
-	
-	
+
 	$moreforfilter = '';
-	
+
 	$moreforfilter.='<div class="divsearchfield">';
 	$moreforfilter .= $langs->trans('DateOperationShort').' : ';
 	$moreforfilter .= '<div class="nowrap'.($conf->browser->layout=='phone'?' centpercent':'').' inline-block">'.$langs->trans('From') . ' ';
@@ -695,7 +690,7 @@ if ($resql)
 	//$moreforfilter .= ' - ';
 	$moreforfilter .= '<div class="nowrap'.($conf->browser->layout=='phone'?' centpercent':'').' inline-block">'.$langs->trans('to') . ' ' . $form->select_date($search_dt_end, 'search_end_dt', 0, 0, 1, "search_form", 1, 0, 1).'</div>';
 	$moreforfilter .= '</div>';
-	
+
 	$moreforfilter.='<div class="divsearchfield">';
 	$moreforfilter .= $langs->trans('DateValueShort').' : ';
 	$moreforfilter .= '<div class="nowrap'.($conf->browser->layout=='phone'?' centpercent':'').' inline-block">'.$langs->trans('From') . ' ';
@@ -703,7 +698,7 @@ if ($resql)
 	//$moreforfilter .= ' - ';
 	$moreforfilter .= '<div class="nowrap'.($conf->browser->layout=='phone'?' centpercent':'').' inline-block">'.$langs->trans('to') . ' ' . $form->select_date($search_dv_end, 'search_end_dv', 0, 0, 1, "search_form", 1, 0, 1).'</div>';
 	$moreforfilter .= '</div>';
-	
+
 	$parameters=array();
 	$reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters);    // Note that $action and $object may have been modified by hook
 	if (empty($reshook)) $moreforfilter .= $hookmanager->resPrint;
@@ -715,10 +710,10 @@ if ($resql)
 		print $moreforfilter;
 		print '</div>'."\n";
 	}
-	
+
     $varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
     $selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
-	
+
     print '<div class="div-table-responsive">';
     print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
 
@@ -803,7 +798,6 @@ if ($resql)
     print '</td>';
 	print "</tr>\n";
 
-
 	// Fields title
 	print '<tr class="liste_titre">';
 	if (! empty($arrayfields['b.rowid']['checked']))            print_liste_field_titre($arrayfields['b.rowid']['label'],$_SERVER['PHP_SELF'],'b.rowid','',$param,'',$sortfield,$sortorder);
@@ -838,14 +832,13 @@ if ($resql)
 	print_liste_field_titre('', $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
 	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'maxwidthsearch ');
 	print "</tr>\n";
-	
-	
+
     $balance = 0;    // For balance
 	$balancecalculated = false;
-	
+
 	// Loop on each record
 	$sign = 1;
-	
+
     $totalarray=array();
     while ($i < min($num,$limit)) 
     {
@@ -885,9 +878,9 @@ if ($resql)
             
             $balancecalculated=true;
         }
-        
+
         $balance = price2num($balance + ($sign * $objp->amount),'MT');
-        
+
         if (empty($cachebankaccount[$objp->bankid]))
         {
             $bankaccounttmp = new Account($db);
@@ -899,8 +892,6 @@ if ($resql)
         {
             $bankaccount = $cachebankaccount[$objp->bankid];
         }
-         
-        
 
         print '<tr class="oddeven">';
 
@@ -1012,19 +1003,19 @@ if ($resql)
     	        }
     	        elseif ($links[$key]['type']=='company')
     	        {
-    	            	
+
     	        }
     	        elseif ($links[$key]['type']=='user')
     	        {
-    	            	
+
     	        }
     	        elseif ($links[$key]['type']=='member')
     	        {
-    	            	
+
     	        }
     	        elseif ($links[$key]['type']=='sc')
     	        {
-    	            	
+
     	        }
     	        else
     	        {
@@ -1044,11 +1035,10 @@ if ($resql)
     	            print '</a>';
     	        }
     	    }
-    	    	
     	    print '</td>';
     	    if (! $i) $totalarray['nbfield']++;
     	}
-    	
+
         // Date ope
     	if (! empty($arrayfields['b.dateo']['checked']))            
     	{
@@ -1089,7 +1079,7 @@ if ($resql)
     	    print '<td class="nowrap" align="center">'.($objp->num_chq?$objp->num_chq:"")."</td>\n";
     	    if (! $i) $totalarray['nbfield']++;
     	}
-    	 
+
 		// Third party
     	if (! empty($arrayfields['bu.label']['checked']))            
     	{
@@ -1114,7 +1104,7 @@ if ($resql)
 			print '</td>';
             if (! $i) $totalarray['nbfield']++;
     	}
-    	
+
     	// Bank account
     	if (! empty($arrayfields['ba.ref']['checked']))            
     	{
@@ -1123,7 +1113,7 @@ if ($resql)
 			print "</td>\n";
             if (! $i) $totalarray['nbfield']++;
     	}
-    	
+
     	// Debit
     	if (! empty($arrayfields['b.debit']['checked']))
     	{
@@ -1137,6 +1127,7 @@ if ($resql)
     	    if (! $i) $totalarray['nbfield']++;
     	    if (! $i) $totalarray['totaldebfield']=$totalarray['nbfield'];
     	}
+
     	// Credit
     	if (! empty($arrayfields['b.credit']['checked']))
     	{
@@ -1150,7 +1141,7 @@ if ($resql)
     	    if (! $i) $totalarray['nbfield']++;
     	    if (! $i) $totalarray['totalcredfield']=$totalarray['nbfield'];
     	}
-    	 
+
     	// Balance
     	if (! empty($arrayfields['balance']['checked']))
     	{
@@ -1169,8 +1160,9 @@ if ($resql)
         	{
         	    print '<td align="right">-</td>';
         	}
+			if (! $i) $totalarray['nbfield']++;
     	}
-    	
+
     	if (! empty($arrayfields['b.num_releve']['checked']))
     	{
             print '<td class="nowrap" align="center">';
@@ -1197,7 +1189,7 @@ if ($resql)
         	print '</td>';
             if (! $i) $totalarray['nbfield']++;
     	}
-    	
+
     	// Action edit/delete
     	print '<td class="nowrap" align="center">';
     	// Transaction reconciliated or edit link
@@ -1254,7 +1246,7 @@ if ($resql)
 
 		$i++;
 	}
-	
+
 	// Show total line
 	if (isset($totalarray['totaldebfield']) || isset($totalarray['totalcredfield']))
 	{
@@ -1277,7 +1269,7 @@ if ($resql)
 
 	print "</table>";
 	print "</div>";
-	
+
     print '</form>';
 	$db->free($resql);
 }

From 783cec0d6d0eaf8910a8ec7abe7cac3ac54ee55f Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Sat, 27 May 2017 07:21:59 +0200
Subject: [PATCH 491/505] Move to getNomUrl for expense report in bank entries

---
 htdocs/compta/bank/bankentries.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/compta/bank/bankentries.php b/htdocs/compta/bank/bankentries.php
index 2598d1659d0..f98c48b1aba 100644
--- a/htdocs/compta/bank/bankentries.php
+++ b/htdocs/compta/bank/bankentries.php
@@ -42,7 +42,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/salaries/class/paymentsalary.class.php';
 require_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php';
-require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
+require_once DOL_DOCUMENT_ROOT.'/expensereport/class/paymentexpensereport.class.php';
 require_once DOL_DOCUMENT_ROOT.'/loan/class/loan.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php';
 
@@ -345,7 +345,7 @@ $paymentsupplierstatic=new PaiementFourn($db);
 $paymentvatstatic=new TVA($db);
 $paymentsalstatic=new PaymentSalary($db);
 $donstatic=new Don($db);
-$expensereportstatic=new ExpenseReport($db);
+$paymentexpensereportstatic=new PaymentExpenseReport($db);
 $bankstatic=new Account($db);
 $banklinestatic=new AccountLine($db);
 
@@ -966,9 +966,9 @@ if ($resql)
     	        }
     	        elseif ($links[$key]['type']=='payment_expensereport')
     	        {
-    	            print '<a href="'.DOL_URL_ROOT.'/expensereport/payment/card.php?id='.$links[$key]['url_id'].'">';
-    	            print ' '.img_object($langs->trans('ShowPayment'),'payment').' ';
-    	            print '</a>';
+    	            $paymentexpensereportstatic->id=$links[$key]['url_id'];
+    	            $paymentexpensereportstatic->ref=$links[$key]['url_id'];
+    	            print ' '.$paymentexpensereportstatic->getNomUrl(2);
     	        }
     	        elseif ($links[$key]['type']=='banktransfert')
     	        {

From 570f9aaa9e104fe4b85cea1901a68796bb0d9413 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Sat, 27 May 2017 08:18:53 +0200
Subject: [PATCH 492/505] Review old payment page for expense report

---
 htdocs/core/lib/expensereport.lib.php         |  33 ++++
 .../class/paymentexpensereport.class.php      |  73 +++++++-
 htdocs/expensereport/payment/card.php         | 159 ++++++++++--------
 htdocs/expensereport/payment/info.php         |  81 +++++++++
 4 files changed, 273 insertions(+), 73 deletions(-)
 create mode 100644 htdocs/expensereport/payment/info.php

diff --git a/htdocs/core/lib/expensereport.lib.php b/htdocs/core/lib/expensereport.lib.php
index f253f077243..a5f19174a84 100644
--- a/htdocs/core/lib/expensereport.lib.php
+++ b/htdocs/core/lib/expensereport.lib.php
@@ -78,7 +78,40 @@ function expensereport_prepare_head($object)
 	return $head;
 }
 
+/**
+ * Returns an array with the tabs for the "Expense report payment" section
+ * It loads tabs from modules looking for the entity payment
+ * 
+ * @param	Paiement	$object		Current payment object
+ * @return	array					Tabs for the payment section
+ */
+function payment_expensereport_prepare_head(PaymentExpenseReport $object) {
 
+	global $langs, $conf;
+
+	$h = 0;
+	$head = array();
+
+	$head[$h][0] = DOL_URL_ROOT.'/expensereport/payment/card.php?id='.$object->id;
+	$head[$h][1] = $langs->trans("Card");
+	$head[$h][2] = 'payment';
+	$h++;
+
+    // Show more tabs from modules
+    // Entries must be declared in modules descriptor with line
+    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
+    // $this->tabs = array('entity:-tabname);   												to remove a tab
+    complete_head_from_modules($conf,$langs,$object,$head,$h,'payment_expensereport');
+
+	$head[$h][0] = DOL_URL_ROOT.'/expensereport/payment/info.php?id='.$object->id;
+	$head[$h][1] = $langs->trans("Info");
+	$head[$h][2] = 'info';
+	$h++;
+
+	complete_head_from_modules($conf,$langs,$object,$head,$h,'payment_expensereport', 'remove');
+
+	return $head;
+}
 
 /**
  *  Return array head with list of tabs to view object informations.
diff --git a/htdocs/expensereport/class/paymentexpensereport.class.php b/htdocs/expensereport/class/paymentexpensereport.class.php
index 9fc8c7627dd..edd80a0bff5 100644
--- a/htdocs/expensereport/class/paymentexpensereport.class.php
+++ b/htdocs/expensereport/class/paymentexpensereport.class.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2015       Alexandre Spangaro	  	<aspangaro.dolibarr@gmail.com>
+/* Copyright (C) 2015-2017  Alexandre Spangaro  <aspangaro.dolibarr@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
@@ -31,6 +31,7 @@ class PaymentExpenseReport extends CommonObject
 {
 	public $element='payment_expensereport';			//!< Id that identify managed objects
 	public $table_element='payment_expensereport';	//!< Name of table without prefix where object is stored
+    public $picto = 'payment';
 
 	var $rowid;
 
@@ -425,6 +426,32 @@ class PaymentExpenseReport extends CommonObject
 	}
 
 
+	/**
+	 * 	Retourne le libelle du statut d'un don (brouillon, validee, abandonnee, payee)
+	 *
+	 *  @param	int		$mode       0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long
+	 *  @return string        		Libelle
+	 */
+	function getLibStatut($mode=0)
+	{
+	    return '';
+	}
+
+	/**
+	 *  Renvoi le libelle d'un statut donne
+	 *
+	 *  @param	int		$statut        	Id statut
+	 *  @param  int		$mode          	0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
+	 *  @return string 			       	Libelle du statut
+	 */
+	function LibStatut($statut,$mode=0)
+	{
+	    global $langs;
+	
+	    return '';
+	}
+
+
 	/**
      *  Initialise an instance with random values.
      *  Used to build previews or test instances.
@@ -613,4 +640,48 @@ class PaymentExpenseReport extends CommonObject
 
 		return $result;
 	}
+
+	/**
+	 *    Tab information on object
+	 *
+	 *    @param   int     $id      Payment id
+	 *    @return  void
+	 */
+	function info($id)
+	{
+		$sql = 'SELECT e.rowid, e.datec, e.fk_user_creat, e.fk_user_modif, e.tms';
+		$sql.= ' FROM '.MAIN_DB_PREFIX.'payment_expensereport as e';
+		$sql.= ' WHERE e.rowid = '.$id;
+
+		dol_syslog(get_class($this).'::info', LOG_DEBUG);
+		$result = $this->db->query($sql);
+
+		if ($result)
+		{
+			if ($this->db->num_rows($result))
+			{
+				$obj = $this->db->fetch_object($result);
+				$this->id = $obj->rowid;
+				if ($obj->fk_user_creat)
+				{
+					$cuser = new User($this->db);
+					$cuser->fetch($obj->fk_user_creat);
+					$this->user_creation     = $cuser;
+				}
+				if ($obj->fk_user_modif)
+				{
+					$muser = new User($this->db);
+					$muser->fetch($obj->fk_user_modif);
+					$this->user_modification = $muser;
+				}
+				$this->date_creation     = $this->db->jdate($obj->datec);
+				$this->date_modification = $this->db->jdate($obj->tms);
+			}
+			$this->db->free($result);
+		}
+		else
+		{
+			dol_print_error($this->db);
+		}
+	}
 }
diff --git a/htdocs/expensereport/payment/card.php b/htdocs/expensereport/payment/card.php
index bc956955258..de01f01a5df 100644
--- a/htdocs/expensereport/payment/card.php
+++ b/htdocs/expensereport/payment/card.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2015       Alexandre Spangaro	  	<aspangaro.dolibarr@gmail.com>
+/* Copyright (C) 2015-2017  Alexandre Spangaro  <aspangaro.dolibarr@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
@@ -24,29 +24,25 @@
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
 require_once DOL_DOCUMENT_ROOT.'/expensereport/class/paymentexpensereport.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/expensereport/modules_expensereport.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/expensereport.lib.php';
 if (! empty($conf->banque->enabled)) require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
 $langs->load('bills');
 $langs->load('banks');
 $langs->load('companies');
+$langs->load('trips');
 
-// Security check
 $id=GETPOST('rowid')?GETPOST('rowid','int'):GETPOST('id','int');
 $action=GETPOST('action','aZ09');
 $confirm=GETPOST('confirm');
+
+// Security check
 if ($user->societe_id) $socid=$user->societe_id;
 // TODO Add rule to restrict access payment
 //$result = restrictedArea($user, 'facture', $id,'');
 
-$payment = new PaymentExpenseReport($db);
-if ($id > 0) 
-{
-	$result=$payment->fetch($id);
-	if (! $result) dol_print_error($db,'Failed to get payment id '.$id);
-}
-
+$object = new PaymentExpenseReport($db);
 
 /*
  * Actions
@@ -57,7 +53,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->expensere
 {
 	$db->begin();
 
-	$result = $payment->delete($user);
+	$result = $object->delete($user);
 	if ($result > 0)
 	{
         $db->commit();
@@ -66,7 +62,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->expensere
 	}
 	else
 	{
-		setEventMessages($payment->error, $payment->errors, 'errors');
+		setEventMessages($object->error, $object->errors, 'errors');
         $db->rollback();
 	}
 }
@@ -76,7 +72,7 @@ if ($action == 'confirm_valide' && $confirm == 'yes' && $user->rights->expensere
 {
 	$db->begin();
 
-	$result=$payment->valide();
+	$result=$object->valide();
 	
 	if ($result > 0)
 	{
@@ -99,12 +95,12 @@ if ($action == 'confirm_valide' && $confirm == 'yes' && $user->rights->expensere
 			}
 		}
 
-		header('Location: card.php?id='.$payment->id);
+		header('Location: card.php?id='.$object->id);
 		exit;
 	}
 	else
 	{
-		setEventMessages($payment->error, $payment->errors, 'errors');
+		setEventMessages($object->error, $object->errors, 'errors');
 		$db->rollback();
 	}
 }
@@ -114,27 +110,27 @@ if ($action == 'confirm_valide' && $confirm == 'yes' && $user->rights->expensere
  * View
  */
 
-llxHeader();
+llxHeader('', $langs->trans("ExpenseReportPayment"));
+
+if ($id > 0) 
+{
+	$result=$object->fetch($id);
+	if (! $result) dol_print_error($db,'Failed to get payment id '.$id);
+}
 
-$expensereport = new ExpenseReport($db);
 $form = new Form($db);
 
-$h=0;
+$head = payment_expensereport_prepare_head($object);
 
-$head[$h][0] = DOL_URL_ROOT.'/expensereport/payment/card.php?id='.$id;
-$head[$h][1] = $langs->trans("Card");
-$hselected = $h;
-$h++;
-
-dol_fiche_head($head, $hselected, $langs->trans("ExpenseReportPayment"), 0, 'payment');
+dol_fiche_head($head, 'payment', $langs->trans("ExpenseReportPayment"), -1, 'payment');
 
 /*
  * Confirm deleting of the payment
  */
 if ($action == 'delete')
 {
-	print $form->formconfirm('card.php?id='.$payment->id, $langs->trans("DeletePayment"), $langs->trans("ConfirmDeletePayment"), 'confirm_delete','',0,2);
-	
+	print $form->formconfirm('card.php?id='.$object->id, $langs->trans("DeletePayment"), $langs->trans("ConfirmDeletePayment"), 'confirm_delete','',0,2);
+
 }
 
 /*
@@ -143,46 +139,61 @@ if ($action == 'delete')
 if ($action == 'valide')
 {
 	$facid = $_GET['facid'];
-	print $form->formconfirm('card.php?id='.$payment->id.'&amp;facid='.$facid, $langs->trans("ValidatePayment"), $langs->trans("ConfirmValidatePayment"), 'confirm_valide','',0,2);
-	
+	print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;facid='.$facid, $langs->trans("ValidatePayment"), $langs->trans("ConfirmValidatePayment"), 'confirm_valide','',0,2);
+
 }
 
+// $linkback = '<a href="' . DOL_URL_ROOT . '/expensereport/payment/list.php">' . $langs->trans("BackToList") . '</a>';
 
-print '<table class="border" width="100%">';
+dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', '');
 
-// Ref
-print '<tr><td valign="top" width="20%">'.$langs->trans('Ref').'</td>';
-print '<td colspan="3">';
-print $form->showrefnav($payment,'id','',1,'rowid','id');
-print '</td></tr>';
+print '<div class="fichecenter">';
+print '<div class="underbanner clearboth"></div>';
 
-// Date
-print '<tr><td>'.$langs->trans('Date').'</td><td colspan="3">'.dol_print_date($payment->datep,'day').'</td></tr>';
+print '<table class="border centpercent">'."\n";
+
+// Date payment
+print '<tr><td class="titlefield">'.$langs->trans('Date').'</td><td colspan="3">'.dol_print_date($object->datep,'day').'</td></tr>';
 
 // Mode
-print '<tr><td>'.$langs->trans('Mode').'</td><td colspan="3">'.$langs->trans("PaymentType".$payment->type_code).'</td></tr>';
+print '<tr><td>'.$langs->trans('PaymentMode').'</td><td colspan="3">'.$langs->trans("PaymentType".$object->type_code).'</td></tr>';
 
 // Number
-print '<tr><td>'.$langs->trans('Numero').'</td><td colspan="3">'.$payment->num_payment.'</td></tr>';
+print '<tr><td>'.$langs->trans('Numero').'</td><td colspan="3">'.$object->num_payment.'</td></tr>';
 
 // Amount
-print '<tr><td>'.$langs->trans('Amount').'</td><td colspan="3">'.price($payment->amount, 0, $outputlangs, 1, -1, -1, $conf->currency).'</td></tr>';
+print '<tr><td>'.$langs->trans('Amount').'</td><td colspan="3">'.price($object->amount, 0, $outputlangs, 1, -1, -1, $conf->currency).'</td></tr>';
 
 // Note
-print '<tr><td class="tdtop">'.$langs->trans('Note').'</td><td colspan="3">'.nl2br($payment->note).'</td></tr>';
+print '<tr><td class="tdtop">'.$langs->trans('Note').'</td><td colspan="3">'.nl2br($object->note).'</td></tr>';
 
+$disable_delete = 0;
 // Bank account
 if (! empty($conf->banque->enabled))
 {
-    if ($payment->bank_account)
+    if ($object->bank_account)
     {
     	$bankline=new AccountLine($db);
-    	$bankline->fetch($payment->bank_line);
+    	$bankline->fetch($object->bank_line);
+        if ($bankline->rappro)
+        {
+            $disable_delete = 1;
+            $title_button = dol_escape_htmltag($langs->transnoentitiesnoconv("CantRemoveConciliatedPayment"));
+        }
 
     	print '<tr>';
     	print '<td>'.$langs->trans('BankTransactionLine').'</td>';
 		print '<td colspan="3">';
-		print $bankline->getNomUrl(1,0,'showall');
+		print $bankline->getNomUrl(1,0,'showconciliated');
+    	print '</td>';
+    	print '</tr>';
+
+    	print '<tr>';
+    	print '<td>'.$langs->trans('BankAccount').'</td>';
+		print '<td colspan="3">';
+		$accountstatic=new Account($db);
+		$accountstatic->fetch($bankline->fk_account);
+        print $accountstatic->getNomUrl(1);
     	print '</td>';
     	print '</tr>';
     }
@@ -190,13 +201,16 @@ if (! empty($conf->banque->enabled))
 
 print '</table>';
 
+print '</div>';
+
+dol_fiche_end();
+
 
 /*
- * List of donations paid
+ * List of expense report paid
  */
 
-$disable_delete = 0;
-$sql = 'SELECT er.rowid as did, er.paid, er.total_ttc, per.amount';
+$sql = 'SELECT er.rowid as eid, er.paid, er.total_ttc, per.amount';
 $sql.= ' FROM '.MAIN_DB_PREFIX.'payment_expensereport as per,'.MAIN_DB_PREFIX.'expensereport as er';
 $sql.= ' WHERE per.fk_expensereport = er.rowid';
 $sql.= ' AND er.entity IN ('.getEntity('expensereport', 1).')';
@@ -210,12 +224,17 @@ if ($resql)
 
 	$i = 0;
 	$total = 0;
-	print '<br><table class="noborder" width="100%">';
+	print '<br>';
+
+	print '<div class="div-table-responsive">';
+	print '<table class="noborder" width="100%">';
+
 	print '<tr class="liste_titre">';
 	print '<td>'.$langs->trans('ExpenseReport').'</td>';
-    print '<td align="right">'.$langs->trans('ExpectedToPay').'</td>';
-	print '<td align="center">'.$langs->trans('Status').'</td>';
+	print '<td align="right">'.$langs->trans('ExpectedToPay').'</td>';
 	print '<td align="right">'.$langs->trans('PayedByThisPayment').'</td>';
+	print '<td align="right">'.$langs->trans('RemainderToPay').'</td>';
+	print '<td align="center">'.$langs->trans('Status').'</td>';
 	print "</tr>\n";
 
 	if ($num > 0)
@@ -226,19 +245,28 @@ if ($resql)
 		{
 			$objp = $db->fetch_object($resql);
 
-			
 			print '<tr class="oddeven">';
-			// Ref
+
+			$expensereport=new ExpenseReport($db);
+			$expensereport->fetch($objp->eid);
+
+			// Expense report
 			print '<td>';
-			$expensereport->fetch($objp->did);
 			print $expensereport->getNomUrl(1);
 			print "</td>\n";
+
 			// Expected to pay
 			print '<td align="right">'.price($objp->total_ttc).'</td>';
-			// Status
-			print '<td align="center">'.$expensereport->getLibStatut(4,$objp->amount).'</td>';
+
 			// Amount paid
 			print '<td align="right">'.price($objp->amount).'</td>';
+
+			// Remain to pay
+            print '<td align="right">'.price($remaintopay).'</td>';
+
+			// Status
+			print '<td align="center">'.$expensereport->getLibStatut(4,$objp->amount).'</td>';
+
 			print "</tr>\n";
 			if ($objp->paid == 1)	// If at least one invoice is paid, disable delete
 			{
@@ -251,6 +279,8 @@ if ($resql)
 	
 
 	print "</table>\n";
+	print '</div>';
+
 	$db->free($resql);
 }
 else
@@ -266,26 +296,13 @@ print '</div>';
  */
 print '<div class="tabsAction">';
 
-/*
-if (! empty($conf->global->BILL_ADD_PAYMENT_VALIDATION))
-{
-	if ($user->societe_id == 0 && $payment->statut == 0 && $_GET['action'] == '')
-	{
-		if ($user->rights->facture->paiement)
-		{
-			print '<a class="butAction" href="card.php?id='.$_GET['id'].'&amp;facid='.$objp->facid.'&amp;action=valide">'.$langs->trans('Valid').'</a>';
-		}
-	}
-}
-*/
-
-if ($_GET['action'] == '')
+if ($action == '')
 {
 	if ($user->rights->expensereport->supprimer)
 	{
 		if (! $disable_delete)
 		{
-			print '<a class="butActionDelete" href="card.php?id='.$_GET['id'].'&amp;action=delete">'.$langs->trans('Delete').'</a>';
+			print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?id='.$id.'&amp;action=delete">'.$langs->trans('Delete').'</a>';
 		}
 		else
 		{
@@ -296,8 +313,6 @@ if ($_GET['action'] == '')
 
 print '</div>';
 
-
-
 llxFooter();
 
 $db->close();
diff --git a/htdocs/expensereport/payment/info.php b/htdocs/expensereport/payment/info.php
new file mode 100644
index 00000000000..bcecc54276b
--- /dev/null
+++ b/htdocs/expensereport/payment/info.php
@@ -0,0 +1,81 @@
+<?php
+/* Copyright (C) 2004      Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2013      Marcos García        <marcosgdf@gmail.com>
+ * Copyright (C) 2015       Alexandre Spangaro  <aspangaro@zendsi.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/expensereport/payment/info.php
+ *		\ingroup    Expense report
+ *		\brief      Tab payment info
+ */
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/expensereport/class/paymentexpensereport.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/expensereport.lib.php';
+
+$langs->load("bills");
+$langs->load("trips");
+
+$id=GETPOST('id');
+$ref=GETPOST('ref', 'alpha');
+$action=GETPOST('action','alpha');
+$confirm=GETPOST('confirm','alpha');
+
+/*
+ * Actions
+ */
+
+// None
+
+
+/*
+ * View
+ */
+
+llxHeader('', $langs->trans("Payment"));
+
+$object = new PaymentExpenseReport($db);
+$object->fetch($id, $ref);
+$object->info($object->id);
+
+$head = payment_expensereport_prepare_head($object);
+
+dol_fiche_head($head, 'info', $langs->trans("ExpenseReportPayment"), -1, 'payment');
+
+
+//$linkback = '<a href="' . DOL_URL_ROOT . '/expensereport/payment/list.php">' . $langs->trans("BackToList") . '</a>';
+
+dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', '');
+
+
+print '<div class="fichecenter">';
+print '<div class="underbanner clearboth"></div>';
+
+print '<br>';
+
+print '<table width="100%"><tr><td>';
+dol_print_object_info($object);
+print '</td></tr></table>';
+
+print '</div>';
+
+dol_fiche_end();
+
+llxFooter();
+$db->close();

From c651f1da4561101e1430951eb531988bff8211f6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 27 May 2017 13:46:34 +0200
Subject: [PATCH 493/505] Work on modulebuilder tool

---
 htdocs/core/ajax/check_notifications.php      |   2 +-
 htdocs/core/lib/files.lib.php                 |   4 +-
 htdocs/langs/en_US/errors.lang                |   1 +
 htdocs/langs/en_US/modulebuilder.lang         |   1 +
 htdocs/modulebuilder/README.md                | 221 +++++
 htdocs/modulebuilder/index.php                |  64 +-
 htdocs/modulebuilder/template/README.md       | 223 +----
 htdocs/modulebuilder/template/admin/about.php |   2 +-
 htdocs/modulebuilder/template/admin/setup.php |   6 +-
 .../template/class/MyTrigger.php              |  51 --
 .../template/class/actions_mymodule.class.php |   2 +-
 .../template/class/myclass.class.php          | 361 --------
 .../template/class/myobject.class.php         | 607 +++++++++++++
 .../class/myobject_api_class.class.php        | 292 +++++++
 .../core/modules/modMyModule.class.php        | 817 +++++-------------
 ...terface_99_modMyModule_Triggers.class.php} |  69 +-
 ...ect_mymodule.png => myobject_mymodule.png} | Bin
 .../modulebuilder/template/js/mymodule.js.php |   2 +-
 .../modulebuilder/template/myobject_card.php  | 386 +++++++--
 .../modulebuilder/template/myobject_list.php  | 490 ++++++++++-
 .../template/scripts/myobject.php             | 165 ++++
 .../template/scripts/myscript.php             | 203 -----
 htdocs/modulebuilder/template/sql/data.sql    |   2 +-
 ...x_mytable.key.sql => llx_myobject.key.sql} |   2 +-
 .../sql/{llx_mytable.sql => llx_myobject.sql} |   2 +-
 .../MyModuleFunctionalTest.php                |   0
 .../MyObjectTest.php}                         |  10 +-
 27 files changed, 2327 insertions(+), 1658 deletions(-)
 create mode 100644 htdocs/modulebuilder/README.md
 delete mode 100644 htdocs/modulebuilder/template/class/MyTrigger.php
 delete mode 100644 htdocs/modulebuilder/template/class/myclass.class.php
 create mode 100644 htdocs/modulebuilder/template/class/myobject.class.php
 create mode 100644 htdocs/modulebuilder/template/class/myobject_api_class.class.php
 rename htdocs/modulebuilder/template/core/triggers/{interface_99_modMyModule_MyTrigger.class.php => interface_99_modMyModule_Triggers.class.php} (91%)
 rename htdocs/modulebuilder/template/img/{object_mymodule.png => myobject_mymodule.png} (100%)
 create mode 100644 htdocs/modulebuilder/template/scripts/myobject.php
 delete mode 100644 htdocs/modulebuilder/template/scripts/myscript.php
 rename htdocs/modulebuilder/template/sql/{llx_mytable.key.sql => llx_myobject.key.sql} (90%)
 rename htdocs/modulebuilder/template/sql/{llx_mytable.sql => llx_myobject.sql} (97%)
 rename htdocs/modulebuilder/template/test/{functional => phpunit}/MyModuleFunctionalTest.php (100%)
 rename htdocs/modulebuilder/template/test/{unit/MyClassTest.php => phpunit/MyObjectTest.php} (91%)

diff --git a/htdocs/core/ajax/check_notifications.php b/htdocs/core/ajax/check_notifications.php
index 332626fbabd..6984bbff5b4 100644
--- a/htdocs/core/ajax/check_notifications.php
+++ b/htdocs/core/ajax/check_notifications.php
@@ -33,7 +33,7 @@ top_httphead('text/html');  // TODO Use a json mime type
 
 global $user, $db, $langs, $conf;
 
-$time = (int) GETPOST('time');    // Use the time parameter that is always increased by time_update, even if call is late
+$time = (int) GETPOST('time','int');    // Use the time parameter that is always increased by time_update, even if call is late
 //$time=dol_now();
 
 
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 4c492d1693e..2d5b8d2f6db 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -54,7 +54,7 @@ function dol_basename($pathfile)
  *  @return	array						Array of array('name'=>'xxx','fullname'=>'/abc/xxx','date'=>'yyy','size'=>99,'type'=>'dir|file',...)
  *  @see dol_dir_list_indatabase
  */
-function dol_dir_list($path, $types="all", $recursive=0, $filter="", $excludefilter="", $sortcriteria="name", $sortorder=SORT_ASC, $mode=0, $nohook=false)
+function dol_dir_list($path, $types="all", $recursive=0, $filter="", $excludefilter="", $sortcriteria="name", $sortorder=SORT_ASC, $mode=0, $nohook=0)
 {
 	global $db, $hookmanager;
 	global $object;
@@ -483,6 +483,8 @@ function dolReplaceInFile($srcfile, $arrayreplacement, $destfile='', $newmask=0)
    
     dol_delete_file($tmpdestfile);
     
+    // Create $newpathoftmpdestfile from $newpathofsrcfile
+    
     
     
     
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index 79984981e87..aea5ad68113 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -18,6 +18,7 @@ ErrorFailToCreateFile=Failed to create file '<b>%s</b>'.
 ErrorFailToRenameDir=Failed to rename directory '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToCreateDir=Failed to create directory '<b>%s</b>'.
 ErrorFailToDeleteDir=Failed to delete directory '<b>%s</b>'.
+ErrorFailToMakeReplacementInto=Failed to make replacement into file '<b>%s</b>'.
 ErrorThisContactIsAlreadyDefinedAsThisType=This contact is already defined as contact for this type.
 ErrorCashAccountAcceptsOnlyCashMoney=This bank account is a cash account, so it accepts payments of type cash only.
 ErrorFromToAccountsMustDiffers=Source and targets bank accounts must be different.
diff --git a/htdocs/langs/en_US/modulebuilder.lang b/htdocs/langs/en_US/modulebuilder.lang
index 18b7044b55d..de0c2fc216a 100644
--- a/htdocs/langs/en_US/modulebuilder.lang
+++ b/htdocs/langs/en_US/modulebuilder.lang
@@ -1,5 +1,6 @@
 # Dolibarr language file - Source file is en_US - loan
 ModuleBuilderDesc=This tools give you utilites to build or edit your own module.
+EnterNameOfModuleDesc=Enter name of the module to create with no spaces. Use uppercase to separate words (For example: MyModule, EcommerceForShop, SyncWithMySystem...)
 ModuleBuilderDesc2=Path were modules are generated/edited (first alternative directory defined into %s): <strong>%s</strong>
 ModuleBuilderDesc3=Generated/editable modules found: <strong>%s</strong> (they are detected as editable when the file <strong>%s</strong> exists in root of module directory). 
 NewModule=New module
diff --git a/htdocs/modulebuilder/README.md b/htdocs/modulebuilder/README.md
new file mode 100644
index 00000000000..5e2af06a430
--- /dev/null
+++ b/htdocs/modulebuilder/README.md
@@ -0,0 +1,221 @@
+Dolibarr Module Template (aka My Module)
+========================================
+
+This is a full featured module template for Dolibarr.
+It's a tool for module developers to kickstart their project and give an hands-on sample of which features Dolibarr has to offer for module development.
+
+If you're not a module developer you have no use for this.
+
+Documentation
+-------------
+
+[Module tutorial](http://wiki.dolibarr.org/index.php/Module_development)
+
+[Dolibarr development](http://wiki.dolibarr.org/index.php/Developer_documentation)
+
+### Translations
+
+Dolibarr uses [Transifex](http://transifex.com) to manage it's translations.
+
+This template also contains a sample configuration for Transifex managed translations under the hidden [.tx](.tx) directory.
+
+For more informations, see the [translator's documentation](http://wiki.dolibarr.org/index.php/Translator_documentation).
+
+There is a [Transifex project](http://transifex.com/projects/p/dolibarr-module-template) for this module.
+
+Install
+-------
+
+### Manually
+
+- Make sure Dolibarr (>= 3.3.x) is already installed and configured on your workstation or development server.
+
+- In your Dolibarr installation directory, edit the ```htdocs/conf/conf.php``` file
+
+- Find the following lines:
+    ```php
+    //$dolibarr_main_url_root_alt ...
+    //$dolibarr_main_document_root_alt ...
+    ```
+
+- Uncomment these lines (delete the leading ```//```) and assign a sensible value according to your Dolibarr installation
+
+    For example :
+
+    - UNIX:
+        ```php
+        $dolibarr_main_url_root = 'http://localhost/Dolibarr/htdocs';
+        $dolibarr_main_document_root = '/var/www/Dolibarr/htdocs';
+        $dolibarr_main_url_root_alt = '/custom';
+        $dolibarr_main_document_root_alt = '/var/www/Dolibarr/htdocs/custom';
+        ```
+
+    - Windows:
+        ```php
+        $dolibarr_main_url_root = 'http://localhost/Dolibarr/htdocs';
+        $dolibarr_main_document_root = 'C:/My Web Sites/Dolibarr/htdocs';
+        $dolibarr_main_url_root_alt = '/custom';
+        $dolibarr_main_document_root_alt = 'C:/My Web Sites/Dolibarr/htdocs/custom';
+        ```
+
+    For more information about the ```conf.php``` file take a look at the conf.php.example file.
+
+*Note that for Dolibarr versions before 3.5, the ```$dolibarr_main_url_root_alt``` has to be an absolute path*
+
+- Clone the repository in ```$dolibarr_main_document_root_alt/mymodule```
+
+*(You may have to create the ```htdocs/custom``` directory first if it doesn't exist yet.)*
+```sh
+git clone git@github.com:Dolibarr/dolibarr-module-template.git mymodule
+```
+
+- Install [Composer](https://getcomposer.org) dependencies:
+```sh
+composer install
+```
+
+Follow the [final steps](#final_steps).
+
+### Using [Composer](https://getcomposer.org)
+Require this repository from Dolibarr's composer:
+```json
+{
+  "repositories": [
+    {
+      "type": "vcs",
+      "url": "https://github.com/dolibarr/dolibarr-module-template"
+    }
+  ],
+  "require": {
+    "dolibarr/mymodule": "dev-master"
+  }
+}
+```
+
+Run
+```sh
+composer update
+```
+
+Follow the [final steps](#final_steps).
+
+### <a name="final_steps"></a>Final steps
+
+From your browser:
+
+  - Log into Dolibarr as a super-administrator
+  - Under "Setup" -> "Other setup", set ```MAIN_FEATURES_LEVEL``` to ```2```
+  - Go to "Setup" -> "Modules"
+  - The module is under one of the tabs
+  - You should now be able to enable the new module and start coding ;)
+
+Provided tools
+--------------
+
+### Starting a new module
+
+A [script](dev/newmodule.sh) allows you to rename most of the code to your own module name.  
+It requires ```find```, ```sed``` and ```rename``` commands on your system.  
+Just make sure you provide a CamelCase name.
+```sh
+./dev/newmodule.sh [NewName]
+```
+
+Some work still has to be done manually:
+- Rename the directory holding the code
+- Maybe rename some other bits (Search for 'my' in filenames and code)
+- Update your module ID in the module descriptor
+- Update your language files
+    - Keywords based on the module ID
+    - String referencing the template
+- Remove the features you don't plan to use
+- Fill the copyright notices at the top of each file
+- Add your logo: see [images README](dev/img/README.md) for specifications
+- Start a new GIT history 
+```
+git checkout --orphan [new_branch_name]
+```
+- Build an awesome module ;)
+
+### Composer scripts
+
+Only the main commands are listed here.  
+See the [composer comments](composer-comments.md) or the [composer.json](composer.json) itself for more informations.
+
+#### Check
+
+Run a linter, a PHP compatibility version checker and checks coding style.
+```sh
+composer check
+```
+
+#### Test
+  
+Run unit and functional tests.
+```sh
+composer test
+```
+
+#### Doc
+Build code and user documentation.
+
+#### Release
+
+Run the checks and tests then build a distribution ZIP.
+```sh
+composer release
+```
+
+#### Git hooks
+
+Optional [GIT hooks](https://git-scm.com/book/it/v2/Customizing-Git-Git-Hooks) are provided.
+These are just wrappers calling composer scripts.  
+They ensure best practices are followed during module development.  
+
+Install:
+```sh
+composer git_hooks_install
+```
+
+Remove:
+```sh
+composer git_hooks_remove
+```
+
+## Publishing the module
+The de-facto standard for publishing and marketing modules for Dolibarr is the [Dolistore](https://www.dolistore.com).  
+Templates for required images and texts are [provided](dev/dolistore).  
+Check the dedicated [README](dev/dolistore/README.md) for more informations.
+
+Contributions
+-------------
+
+Feel free to contribute and report defects on our [issue tracker](http://github.com/Dolibarr/dolibarr-module-template/issues).
+
+Licenses
+--------
+
+### Main code
+
+![GPLv3 logo](img/gplv3.png)
+
+GPLv3 or (at your option) any later version.
+
+See [COPYING](COPYING) for more information.
+
+### Other Licenses
+
+#### [Parsedown](http://parsedown.org/)
+
+Used to display this README in the module's about page.  
+Licensed under MIT.
+
+#### [GNU Licenses logos](https://www.gnu.org/graphics/license-logos.html)
+
+Public domain
+
+#### Documentation
+
+All texts and readmes.
+
+![GFDL logo](img/gfdl.png)
diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index bdad41e8556..a033bd1be23 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -32,15 +32,15 @@ $langs->load("other");
 $action=GETPOST('action','alpha');
 $confirm=GETPOST('confirm','alpha');
 $module=GETPOST('module');
-$tab=GETPOST('tab');
 if (empty($module)) $module='initmodule';
 if (empty($tab)) $tab='description';
 
+$modulename=dol_sanitizeFileName(GETPOST('modulename','alpha'));
+
 
 // Security check
 if (! $user->admin && empty($conf->global->MODULEBUILDER_FOREVERYONE)) accessforbidden('ModuleBuilderNotAllowed');
 
-$modulename=dol_sanitizeFileName(GETPOST('modulename','alpha'));
 
 // Dir for custom dirs
 $tmp=explode(',', $dolibarr_main_document_root_alt);
@@ -55,35 +55,59 @@ $FILEFLAG='modulebuilder.txt';
 
 if ($dircustom && $action == 'initmodule' && $modulename)
 {
-    $srcfile = DOL_DOCUMENT_ROOT.'/modulebuilder/template';
-    $destfile = $dircustom.'/'.$modulename;
-    $result = dolCopyDir($srcfile, $destfile, 0, 0);
+    $srcdir = DOL_DOCUMENT_ROOT.'/modulebuilder/template';
+    $destdir = $dircustom.'/'.$modulename;
+
+    $arrayreplacement=array(
+        'mymodule'=>strtolower($modulename),
+     	'MyModule'=>$modulename
+    );
+    
+    $result = dolCopyDir($srcdir, $destdir, 0, 0);
     //dol_mkdir($destfile);
     if ($result <= 0)
     {
         $error++;
-        setEventMessages($langs->trans("ErrorFailedToCopyDir"), null, 'errors');
+        $langs->load("errors");
+        setEventMessages($langs->trans("ErrorFailToCopyDir", $srcdir, $destdir), null, 'errors');
     }
 
     // Edit PHP files
-    $listofphpfilestoedit = dol_dir_list($destfile, 'files', 1, '\.php$', 'fullname', SORT_ASC, 0, true);
-    foreach($listofphpfilestoedit as $phpfileval)
+    if (! $error)
     {
-        $arrayreplacement=array(
-            'mymodule'=>$modulename
-        );
-        $result=dolReplaceInFile($phpfileval['fullname'], $arrayreplacement);
-        var_dump($phpfileval);
-        var_dump($result);
-    }    
-    
+	    $listofphpfilestoedit = dol_dir_list($destdir, 'files', 1, '\.php$', '', 'fullname', SORT_ASC, 0, 1);
+	    foreach($listofphpfilestoedit as $phpfileval)
+	    {
+	        var_dump($phpfileval['fullname']);
+	    	
+	    	$arrayreplacement=array(
+	            'mymodule'=>strtolower($modulename),
+	        	'MyModule'=>$modulename,
+	        	'MYMODULE'=>strtoupper($modulename),
+	        	'My module'=>$modulename,
+	        	'htdocs/modulebuilder/template/'=>'',
+	        );
+	        
+	        
+	        $result=dolReplaceInFile($phpfileval['fullname'], $arrayreplacement);
+	        //var_dump($result);
+	        if ($result < 0)
+	        {
+	        	setEventMessages($langs->trans("ErrorFailToMakeReplacementInto", $phpfileval['fullname']), null, 'errors');
+	        }
+	    }    
+    }
+        
     if (! $error)
     {
         setEventMessages('ModuleInitialized', null);
+        $module=$modulename;
+        $modulename = '';
     }
 }
 
 
+
 /*
  * View
  */
@@ -96,6 +120,7 @@ $text=$langs->trans("ModuleBuilder");
 print load_fiche_titre($text, '', 'title_setup');
 
 $listofmodules=array();
+
 /*
 if (!empty($conf->modulebuilder->enabled) && $mainmenu == 'modulebuilder')	// Entry for Module builder
 {
@@ -124,7 +149,7 @@ if (!empty($conf->modulebuilder->enabled) && $mainmenu == 'modulebuilder')	// En
         $newmenu->add('', 'NoGeneratedModuleFound', 0, 0);
     }*/
 
-            
+
 // Show description of content
 print $langs->trans("ModuleBuilderDesc").'<br>';
 print $langs->trans("ModuleBuilderDesc2", 'conf/conf.php', $dircustom).'<br>';
@@ -161,7 +186,10 @@ if ($module == 'initmodule')
     print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
     print '<input type="hidden" name="action" value="initmodule">';
     print '<input type="hidden" name="module" value="initmodule">';
-    print '<input type="text" name="modulename" value="" placeholder="'.dol_escape_htmltag($langs->trans("ModuleKey")).'">';
+    
+    print $langs->trans("EnterNameOfModuleDesc").'<br><br>';
+    
+    print '<input type="text" name="modulename" value="'.dol_escape_htmltag($modulename).'" placeholder="'.dol_escape_htmltag($langs->trans("ModuleKey")).'">';
     print '<input type="submit" class="button" name="create" value="'.dol_escape_htmltag($langs->trans("Create")).'">';
     print '</form>';
 }
diff --git a/htdocs/modulebuilder/template/README.md b/htdocs/modulebuilder/template/README.md
index 5e2af06a430..ba723bf5195 100644
--- a/htdocs/modulebuilder/template/README.md
+++ b/htdocs/modulebuilder/template/README.md
@@ -1,221 +1,6 @@
-Dolibarr Module Template (aka My Module)
-========================================
+# MYMODULE FOR DOLIBARR ERP CRM
 
-This is a full featured module template for Dolibarr.
-It's a tool for module developers to kickstart their project and give an hands-on sample of which features Dolibarr has to offer for module development.
+## Features
+MyModuleDescription
 
-If you're not a module developer you have no use for this.
-
-Documentation
--------------
-
-[Module tutorial](http://wiki.dolibarr.org/index.php/Module_development)
-
-[Dolibarr development](http://wiki.dolibarr.org/index.php/Developer_documentation)
-
-### Translations
-
-Dolibarr uses [Transifex](http://transifex.com) to manage it's translations.
-
-This template also contains a sample configuration for Transifex managed translations under the hidden [.tx](.tx) directory.
-
-For more informations, see the [translator's documentation](http://wiki.dolibarr.org/index.php/Translator_documentation).
-
-There is a [Transifex project](http://transifex.com/projects/p/dolibarr-module-template) for this module.
-
-Install
--------
-
-### Manually
-
-- Make sure Dolibarr (>= 3.3.x) is already installed and configured on your workstation or development server.
-
-- In your Dolibarr installation directory, edit the ```htdocs/conf/conf.php``` file
-
-- Find the following lines:
-    ```php
-    //$dolibarr_main_url_root_alt ...
-    //$dolibarr_main_document_root_alt ...
-    ```
-
-- Uncomment these lines (delete the leading ```//```) and assign a sensible value according to your Dolibarr installation
-
-    For example :
-
-    - UNIX:
-        ```php
-        $dolibarr_main_url_root = 'http://localhost/Dolibarr/htdocs';
-        $dolibarr_main_document_root = '/var/www/Dolibarr/htdocs';
-        $dolibarr_main_url_root_alt = '/custom';
-        $dolibarr_main_document_root_alt = '/var/www/Dolibarr/htdocs/custom';
-        ```
-
-    - Windows:
-        ```php
-        $dolibarr_main_url_root = 'http://localhost/Dolibarr/htdocs';
-        $dolibarr_main_document_root = 'C:/My Web Sites/Dolibarr/htdocs';
-        $dolibarr_main_url_root_alt = '/custom';
-        $dolibarr_main_document_root_alt = 'C:/My Web Sites/Dolibarr/htdocs/custom';
-        ```
-
-    For more information about the ```conf.php``` file take a look at the conf.php.example file.
-
-*Note that for Dolibarr versions before 3.5, the ```$dolibarr_main_url_root_alt``` has to be an absolute path*
-
-- Clone the repository in ```$dolibarr_main_document_root_alt/mymodule```
-
-*(You may have to create the ```htdocs/custom``` directory first if it doesn't exist yet.)*
-```sh
-git clone git@github.com:Dolibarr/dolibarr-module-template.git mymodule
-```
-
-- Install [Composer](https://getcomposer.org) dependencies:
-```sh
-composer install
-```
-
-Follow the [final steps](#final_steps).
-
-### Using [Composer](https://getcomposer.org)
-Require this repository from Dolibarr's composer:
-```json
-{
-  "repositories": [
-    {
-      "type": "vcs",
-      "url": "https://github.com/dolibarr/dolibarr-module-template"
-    }
-  ],
-  "require": {
-    "dolibarr/mymodule": "dev-master"
-  }
-}
-```
-
-Run
-```sh
-composer update
-```
-
-Follow the [final steps](#final_steps).
-
-### <a name="final_steps"></a>Final steps
-
-From your browser:
-
-  - Log into Dolibarr as a super-administrator
-  - Under "Setup" -> "Other setup", set ```MAIN_FEATURES_LEVEL``` to ```2```
-  - Go to "Setup" -> "Modules"
-  - The module is under one of the tabs
-  - You should now be able to enable the new module and start coding ;)
-
-Provided tools
---------------
-
-### Starting a new module
-
-A [script](dev/newmodule.sh) allows you to rename most of the code to your own module name.  
-It requires ```find```, ```sed``` and ```rename``` commands on your system.  
-Just make sure you provide a CamelCase name.
-```sh
-./dev/newmodule.sh [NewName]
-```
-
-Some work still has to be done manually:
-- Rename the directory holding the code
-- Maybe rename some other bits (Search for 'my' in filenames and code)
-- Update your module ID in the module descriptor
-- Update your language files
-    - Keywords based on the module ID
-    - String referencing the template
-- Remove the features you don't plan to use
-- Fill the copyright notices at the top of each file
-- Add your logo: see [images README](dev/img/README.md) for specifications
-- Start a new GIT history 
-```
-git checkout --orphan [new_branch_name]
-```
-- Build an awesome module ;)
-
-### Composer scripts
-
-Only the main commands are listed here.  
-See the [composer comments](composer-comments.md) or the [composer.json](composer.json) itself for more informations.
-
-#### Check
-
-Run a linter, a PHP compatibility version checker and checks coding style.
-```sh
-composer check
-```
-
-#### Test
-  
-Run unit and functional tests.
-```sh
-composer test
-```
-
-#### Doc
-Build code and user documentation.
-
-#### Release
-
-Run the checks and tests then build a distribution ZIP.
-```sh
-composer release
-```
-
-#### Git hooks
-
-Optional [GIT hooks](https://git-scm.com/book/it/v2/Customizing-Git-Git-Hooks) are provided.
-These are just wrappers calling composer scripts.  
-They ensure best practices are followed during module development.  
-
-Install:
-```sh
-composer git_hooks_install
-```
-
-Remove:
-```sh
-composer git_hooks_remove
-```
-
-## Publishing the module
-The de-facto standard for publishing and marketing modules for Dolibarr is the [Dolistore](https://www.dolistore.com).  
-Templates for required images and texts are [provided](dev/dolistore).  
-Check the dedicated [README](dev/dolistore/README.md) for more informations.
-
-Contributions
--------------
-
-Feel free to contribute and report defects on our [issue tracker](http://github.com/Dolibarr/dolibarr-module-template/issues).
-
-Licenses
---------
-
-### Main code
-
-![GPLv3 logo](img/gplv3.png)
-
-GPLv3 or (at your option) any later version.
-
-See [COPYING](COPYING) for more information.
-
-### Other Licenses
-
-#### [Parsedown](http://parsedown.org/)
-
-Used to display this README in the module's about page.  
-Licensed under MIT.
-
-#### [GNU Licenses logos](https://www.gnu.org/graphics/license-logos.html)
-
-Public domain
-
-#### Documentation
-
-All texts and readmes.
-
-![GFDL logo](img/gfdl.png)
+Other modules are available on <a href="https://www.dolistore.com target="_new">Dolistore.com</a>.
diff --git a/htdocs/modulebuilder/template/admin/about.php b/htdocs/modulebuilder/template/admin/about.php
index 6953af2ef38..844c444bad2 100644
--- a/htdocs/modulebuilder/template/admin/about.php
+++ b/htdocs/modulebuilder/template/admin/about.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * \file    admin/about.php
+ * \file    htdocs/modulebuilder/template/admin/about.php
  * \ingroup mymodule
  * \brief   About page of module MyModule.
  *
diff --git a/htdocs/modulebuilder/template/admin/setup.php b/htdocs/modulebuilder/template/admin/setup.php
index 8bc2c6d9ded..63b92bc6468 100644
--- a/htdocs/modulebuilder/template/admin/setup.php
+++ b/htdocs/modulebuilder/template/admin/setup.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * \file    admin/setup.php
+ * \file    htdocs/modulebuilder/template/admin/setup.php
  * \ingroup mymodule
  * \brief   Example module setup page.
  *
@@ -57,8 +57,8 @@ $page_name = "MyModuleSetup";
 llxHeader('', $langs->trans($page_name));
 
 // Subheader
-$linkback = '<a href="' . DOL_URL_ROOT . '/admin/modules.php">'
-	. $langs->trans("BackToModuleList") . '</a>';
+$linkback = '<a href="' . DOL_URL_ROOT . '/admin/modules.php">' . $langs->trans("BackToModuleList") . '</a>';
+
 print load_fiche_titre($langs->trans($page_name), $linkback);
 
 // Configuration header
diff --git a/htdocs/modulebuilder/template/class/MyTrigger.php b/htdocs/modulebuilder/template/class/MyTrigger.php
deleted file mode 100644
index 61604b7ff72..00000000000
--- a/htdocs/modulebuilder/template/class/MyTrigger.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/* <one line to give the program's name and a brief idea of what it does.>
- * Copyright (C) <year>  <name of author>
- *
- * 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    class/MyTrigger.php
- * \ingroup mymodule
- * \brief   Compatibility class for triggers in Dolibarr < 3.7.
- *
- * Hack for compatibility with Dolibarr versions < 3.7.
- * Remove this and extend DolibarrTriggers directly from interface_99_modMyModule_MyTrigger.class.php
- * if you don't intend to support these versions.
- */
-
-// We ignore the PSR1.Classes.ClassDeclaration.MultipleClasses rule.
-// @codingStandardsIgnoreStart
-$dolibarr_version = versiondolibarrarray();
-if ($dolibarr_version[0] < 3 || ($dolibarr_version[0] == 3 && $dolibarr_version[1] < 7)) { // DOL_VERSION < 3.7
-	/**
-	 * Class MyTrigger
-	 *
-	 * For Dolibarr < 3.7.
-	 */
-	abstract class MyTrigger
-	{
-	}
-} else {
-	/**
-	 * Class MyTrigger
-	 *
-	 * For Dolibarr >= 3.7
-	 */
-	abstract class MyTrigger extends DolibarrTriggers
-	{
-	}
-}
-// @codingStandardsIgnoreEnd
diff --git a/htdocs/modulebuilder/template/class/actions_mymodule.class.php b/htdocs/modulebuilder/template/class/actions_mymodule.class.php
index 7047332bbfc..f3ce5963aa6 100644
--- a/htdocs/modulebuilder/template/class/actions_mymodule.class.php
+++ b/htdocs/modulebuilder/template/class/actions_mymodule.class.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * \file    class/actions_mymodule.class.php
+ * \file    htdocs/modulebuilder/template/class/actions_mymodule.class.php
  * \ingroup mymodule
  * \brief   Example hook overload.
  *
diff --git a/htdocs/modulebuilder/template/class/myclass.class.php b/htdocs/modulebuilder/template/class/myclass.class.php
deleted file mode 100644
index 336ccf7c98a..00000000000
--- a/htdocs/modulebuilder/template/class/myclass.class.php
+++ /dev/null
@@ -1,361 +0,0 @@
-<?php
-/* <one line to give the program's name and a brief idea of what it does.>
- * Copyright (C) <year>  <name of author>
- *
- * 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    class/myclass.class.php
- * \ingroup mymodule
- * \brief   Example CRUD (Create/Read/Update/Delete) class.
- *
- * Put detailed description here.
- */
-
-/** Includes */
-//require_once DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php";
-//require_once DOL_DOCUMENT_ROOT."/societe/class/societe.class.php";
-//require_once DOL_DOCUMENT_ROOT."/product/class/product.class.php";
-
-/**
- * Put your class' description here
- */
-class MyClass // extends CommonObject
-{
-
-    /** @var DoliDb Database handler */
-	private $db;
-    /** @var string Error code or message */
-	public $error;
-    /** @var array Several error codes or messages */
-	public $errors = array();
-    /** @var string Id to identify managed object */
-	//public $element='myelement';
-    /** @var string Name of table without prefix where object is stored */
-	//public $table_element='mytable';
-    /** @var int An example ID */
-	public $id;
-    /** @var mixed An example property */
-	public $prop1;
-    /** @var mixed An example property */
-	public $prop2;
-
-	/**
-	 * Constructor
-	 *
-	 * @param DoliDb $db Database handler
-	 */
-	public function __construct($db)
-	{
-		$this->db = $db;
-
-		return 1;
-	}
-
-	/**
-	 * Create object into database
-	 *
-	 * @param User $user User that create
-	 * @param int $notrigger 0=launch triggers after, 1=disable triggers
-	 * @return int <0 if KO, Id of created object if OK
-	 */
-	public function create($user, $notrigger = 0)
-	{
-		global $conf, $langs;
-		$error = 0;
-
-		// Clean parameters
-		if (isset($this->prop1)) {
-			$this->prop1 = trim($this->prop1);
-		}
-		if (isset($this->prop2)) {
-			$this->prop2 = trim($this->prop2);
-		}
-
-		// Check parameters
-		// Put here code to add control on parameters values
-		// Insert request
-		$sql = "INSERT INTO " . MAIN_DB_PREFIX . "mytable(";
-		$sql.= " field1,";
-		$sql.= " field2";
-
-		$sql.= ") VALUES (";
-		$sql.= " '" . $this->prop1 . "',";
-		$sql.= " '" . $this->prop2 . "'";
-
-		$sql.= ")";
-
-		$this->db->begin();
-
-		dol_syslog(__METHOD__ . " sql=" . $sql, LOG_DEBUG);
-		$resql = $this->db->query($sql);
-		if (! $resql) {
-			$error ++;
-			$this->errors[] = "Error " . $this->db->lasterror();
-		}
-
-		if (! $error) {
-			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . "mytable");
-
-			if (! $notrigger) {
-				// Uncomment this and change MYOBJECT to your own tag if you
-				// want this action call a trigger.
-				//// Call triggers
-				//include_once DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php";
-				//$interface=new Interfaces($this->db);
-				//$result=$interface->run_triggers('MYOBJECT_CREATE',$this,$user,$langs,$conf);
-				//if ($result < 0) { $error++; $this->errors=$interface->errors; }
-				//// End call triggers
-			}
-		}
-
-		// Commit or rollback
-		if ($error) {
-			foreach ($this->errors as $errmsg) {
-				dol_syslog(__METHOD__ . " " . $errmsg, LOG_ERR);
-				$this->error.=($this->error ? ', ' . $errmsg : $errmsg);
-			}
-			$this->db->rollback();
-
-			return -1 * $error;
-		} else {
-			$this->db->commit();
-
-			return $this->id;
-		}
-	}
-
-	/**
-	 * Load object in memory from database
-	 *
-	 * @param int $id Id object
-	 * @return int <0 if KO, >0 if OK
-	 */
-	public function fetch($id)
-	{
-		global $langs;
-		$sql = "SELECT";
-		$sql.= " t.rowid,";
-		$sql.= " t.field1,";
-		$sql.= " t.field2";
-		//...
-		$sql.= " FROM " . MAIN_DB_PREFIX . "mytable as t";
-		$sql.= " WHERE t.rowid = " . $id;
-
-		dol_syslog(__METHOD__ . " sql=" . $sql, LOG_DEBUG);
-		$resql = $this->db->query($sql);
-		if ($resql) {
-			if ($this->db->num_rows($resql)) {
-				$obj = $this->db->fetch_object($resql);
-
-				$this->id = $obj->rowid;
-				$this->prop1 = $obj->field1;
-				$this->prop2 = $obj->field2;
-				//...
-			}
-			$this->db->free($resql);
-
-			return 1;
-		} else {
-			$this->error = "Error " . $this->db->lasterror();
-			dol_syslog(__METHOD__ . " " . $this->error, LOG_ERR);
-
-			return -1;
-		}
-	}
-
-	/**
-	 * Update object into database
-	 *
-	 * @param User $user User that modify
-	 * @param int $notrigger 0=launch triggers after, 1=disable triggers
-	 * @return int <0 if KO, >0 if OK
-	 */
-	public function update($user = 0, $notrigger = 0)
-	{
-		global $conf, $langs;
-		$error = 0;
-
-		// Clean parameters
-		if (isset($this->prop1)) {
-			$this->prop1 = trim($this->prop1);
-		}
-		if (isset($this->prop2)) {
-			$this->prop2 = trim($this->prop2);
-		}
-
-		// Check parameters
-		// Put here code to add control on parameters values
-		// Update request
-		$sql = "UPDATE " . MAIN_DB_PREFIX . "mytable SET";
-		$sql.= " field1=" . (isset($this->field1) ? "'" . $this->db->escape($this->field1) . "'" : "null") . ",";
-		$sql.= " field2=" . (isset($this->field2) ? "'" . $this->db->escape($this->field2) . "'" : "null") . "";
-
-		$sql.= " WHERE rowid=" . $this->id;
-
-		$this->db->begin();
-
-		dol_syslog(__METHOD__ . " sql=" . $sql, LOG_DEBUG);
-		$resql = $this->db->query($sql);
-		if (! $resql) {
-			$error ++;
-			$this->errors[] = "Error " . $this->db->lasterror();
-		}
-
-		if (! $error) {
-			if (! $notrigger) {
-				// Uncomment this and change MYOBJECT to your own tag if you
-				// want this action call a trigger.
-				//// Call triggers
-				//include_once DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php";
-				//$interface=new Interfaces($this->db);
-				//$result=$interface->run_triggers('MYOBJECT_MODIFY',$this,$user,$langs,$conf);
-				//if ($result < 0) { $error++; $this->errors=$interface->errors; }
-				//// End call triggers
-			}
-		}
-
-		// Commit or rollback
-		if ($error) {
-			foreach ($this->errors as $errmsg) {
-				dol_syslog(__METHOD__ . " " . $errmsg, LOG_ERR);
-				$this->error.=($this->error ? ', ' . $errmsg : $errmsg);
-			}
-			$this->db->rollback();
-
-			return -1 * $error;
-		} else {
-			$this->db->commit();
-
-			return 1;
-		}
-	}
-
-	/**
-	 * Delete object in database
-	 *
-	 * @param User $user User that delete
-	 * @param int $notrigger 0=launch triggers after, 1=disable triggers
-	 * @return int <0 if KO, >0 if OK
-	 */
-	public function delete($user, $notrigger = 0)
-	{
-		global $conf, $langs;
-		$error = 0;
-
-		$this->db->begin();
-
-		if (! $error) {
-			if (! $notrigger) {
-				// Uncomment this and change MYOBJECT to your own tag if you
-				// want this action call a trigger.
-				//// Call triggers
-				//include_once DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php";
-				//$interface=new Interfaces($this->db);
-				//$result=$interface->run_triggers('MYOBJECT_DELETE',$this,$user,$langs,$conf);
-				//if ($result < 0) { $error++; $this->errors=$interface->errors; }
-				//// End call triggers
-			}
-		}
-
-		if (! $error) {
-			$sql = "DELETE FROM " . MAIN_DB_PREFIX . "mytable";
-			$sql.= " WHERE rowid=" . $this->id;
-
-			dol_syslog(__METHOD__ . " sql=" . $sql);
-			$resql = $this->db->query($sql);
-			if (! $resql) {
-				$error ++;
-				$this->errors[] = "Error " . $this->db->lasterror();
-			}
-		}
-
-		// Commit or rollback
-		if ($error) {
-			foreach ($this->errors as $errmsg) {
-				dol_syslog(__METHOD__ . " " . $errmsg, LOG_ERR);
-				$this->error.=($this->error ? ', ' . $errmsg : $errmsg);
-			}
-			$this->db->rollback();
-
-			return -1 * $error;
-		} else {
-			$this->db->commit();
-
-			return 1;
-		}
-	}
-
-	/**
-	 * Load an object from its id and create a new one in database
-	 *
-	 * @param int $fromid Id of object to clone
-	 * @return int New id of clone
-	 */
-	public function createFromClone($fromid)
-	{
-		global $user, $langs;
-
-		$error = 0;
-
-		$object = new SkeletonClass($this->db);
-
-		$this->db->begin();
-
-		// Load source object
-		$object->fetch($fromid);
-		$object->id = 0;
-		$object->statut = 0;
-
-		// Clear fields
-		// ...
-		// Create clone
-		$result = $object->create($user);
-
-		// Other options
-		if ($result < 0) {
-			$this->error = $object->error;
-			$error ++;
-		}
-
-		if (! $error) {
-			// Do something
-		}
-
-		// End
-		if (! $error) {
-			$this->db->commit();
-
-			return $object->id;
-		} else {
-			$this->db->rollback();
-
-			return -1;
-		}
-	}
-
-	/**
-	 * Initialise object with example values
-	 * Id must be 0 if object instance is a specimen
-	 *
-	 * @return void
-	 */
-	public function initAsSpecimen()
-	{
-		$this->id = 0;
-		$this->prop1 = 'prop1';
-		$this->prop2 = 'prop2';
-	}
-}
diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php
new file mode 100644
index 00000000000..292c6a139a4
--- /dev/null
+++ b/htdocs/modulebuilder/template/class/myobject.class.php
@@ -0,0 +1,607 @@
+<?php
+/* Copyright (C) 2007-2017  Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2014-2016  Juanjo Menent       <jmenent@2byte.es>
+ * Copyright (C) 2015       Florian Henry       <florian.henry@open-concept.pro>
+ * Copyright (C) 2015       Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
+ * Copyright (C) ---Put here your own copyright and developer email---
+ *
+ * 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/modulebuilder/template/class/myobject.class.php
+ * \ingroup     mymodule othermodule1 othermodule2
+ * \brief       This file is an example for a CRUD class file (Create/Read/Update/Delete)
+ */
+
+// Put here all includes required by your class file
+require_once DOL_DOCUMENT_ROOT . '/core/class/commonobject.class.php';
+//require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
+//require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
+
+/**
+ * Class MyModuleObject
+ *
+ * Put here description of your class.
+ */
+class MyModuleObject extends CommonObject
+{
+	/**
+	 * @var string Id to identify managed object
+	 */
+	public $element = 'mymoduleobject';
+	/**
+	 * @var string Name of table without prefix where object is stored
+	 */
+	public $table_element = 'mymoduleobject';
+    /**
+     * @var array Array with all fields and their property
+     */
+	public $picto = 'generic';
+    /**
+     * @var array Array with all fields and their property
+     */
+	public $fields;
+	
+	/**
+	 * @var mixed Sample property 1
+	 */
+	public $prop1;
+	/**
+	 * @var mixed Sample property 2
+	 */
+	public $prop2;
+	
+	//...
+	
+	protected $ismultientitymanaged = 1;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
+	
+	public $table_element_line = 'mymoduleobjectdet';
+    public $class_element_line = 'MyModuleObjectline';
+    public $fk_element = 'fk_mymoduleobject';
+
+    /**
+	 * @var MyModuleObjectLine[] Lines
+	 */
+	public $lines = array();
+	
+	
+	
+	/**
+	 * Constructor
+	 *
+	 * @param DoliDb $db Database handler
+	 */
+	public function __construct(DoliDB $db)
+	{
+		$this->db = $db;
+	}
+
+	/**
+	 * Create object into database
+	 *
+	 * @param  User $user      User that creates
+	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 *
+	 * @return int <0 if KO, Id of created object if OK
+	 */
+	public function create(User $user, $notrigger = false)
+	{
+		dol_syslog(__METHOD__, LOG_DEBUG);
+
+		$error = 0;
+
+		// Clean parameters
+		if (isset($this->prop1)) {
+			$this->prop1 = trim($this->prop1);
+		}
+		if (isset($this->prop2)) {
+			$this->prop2 = trim($this->prop2);
+		}
+		//...
+
+		// Check parameters
+		// Put here code to add control on parameters values
+
+		// Insert request
+		$sql = 'INSERT INTO ' . MAIN_DB_PREFIX . $this->table_element . '(';
+		$sql .= ' field1,';
+		$sql .= ' field2';
+		//...
+		$sql .= ') VALUES (';
+		$sql .= ' \'' . $this->prop1 . '\',';
+		$sql .= ' \'' . $this->prop2 . '\'';
+		//...
+		$sql .= ')';
+
+		$this->db->begin();
+
+		$resql = $this->db->query($sql);
+		if (!$resql) {
+			$error ++;
+			$this->errors[] = 'Error ' . $this->db->lasterror();
+			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+		}
+
+		if (!$error) {
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . $this->table_element);
+
+			if (!$notrigger) {
+				// Uncomment this and change MYOBJECT to your own tag if you
+				// want this action to call a trigger.
+
+				//// Call triggers
+				//$result=$this->call_trigger('MYOBJECT_CREATE',$user);
+				//if ($result < 0) $error++;
+				//// End call triggers
+			}
+		}
+
+		// Commit or rollback
+		if ($error) {
+			$this->db->rollback();
+
+			return - 1 * $error;
+		} else {
+			$this->db->commit();
+
+			return $this->id;
+		}
+	}
+
+	/**
+	 * Load object in memory from the database
+	 *
+	 * @param int    $id  Id object
+	 * @param string $ref Ref
+	 *
+	 * @return int <0 if KO, 0 if not found, >0 if OK
+	 */
+	public function fetch($id, $ref = null)
+	{
+		dol_syslog(__METHOD__, LOG_DEBUG);
+
+		$sql = 'SELECT';
+		$sql .= ' t.rowid,';
+		$sql .= ' t.field1,';
+		$sql .= ' t.field2';
+		//...
+		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t';
+		$sql.= ' WHERE 1 = 1';
+		if (! empty($conf->multicompany->enabled)) {
+		    $sql .= " AND entity IN (" . getEntity("mymoduleobject", 1) . ")";
+		}
+		if (null !== $ref) {
+			$sql .= ' AND t.ref = ' . '\'' . $ref . '\'';
+		} else {
+			$sql .= ' AND t.rowid = ' . $id;
+		}
+
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$numrows = $this->db->num_rows($resql);
+			if ($numrows) {
+				$obj = $this->db->fetch_object($resql);
+
+				$this->id = $obj->rowid;
+				$this->prop1 = $obj->field1;
+				$this->prop2 = $obj->field2;
+				//...
+			}
+			
+			// Retrieve all extrafields for invoice
+			// fetch optionals attributes and labels
+			/*
+			require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+			$extrafields=new ExtraFields($this->db);
+			$extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true);
+			$this->fetch_optionals($this->id,$extralabels);
+            */
+			
+			// $this->fetch_lines();
+			
+			$this->db->free($resql);
+
+			if ($numrows) {
+				return 1;
+			} else {
+				return 0;
+			}
+		} else {
+			$this->errors[] = 'Error ' . $this->db->lasterror();
+			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+
+			return - 1;
+		}
+	}
+
+	/**
+	 * Load object in memory from the database
+	 *
+	 * @param string $sortorder Sort Order
+	 * @param string $sortfield Sort field
+	 * @param int    $limit     offset limit
+	 * @param int    $offset    offset limit
+	 * @param array  $filter    filter array
+	 * @param string $filtermode filter mode (AND or OR)
+	 *
+	 * @return int <0 if KO, >0 if OK
+	 */
+	public function fetchAll($sortorder='', $sortfield='', $limit=0, $offset=0, array $filter = array(), $filtermode='AND')
+	{
+		dol_syslog(__METHOD__, LOG_DEBUG);
+
+		$sql = 'SELECT';
+		$sql .= ' t.rowid,';
+		$sql .= ' t.field1,';
+		$sql .= ' t.field2';
+		//...
+		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element. ' as t';
+
+		// Manage filter
+		$sqlwhere = array();
+		if (count($filter) > 0) {
+			foreach ($filter as $key => $value) {
+				$sqlwhere [] = $key . ' LIKE \'%' . $this->db->escape($value) . '%\'';
+			}
+		}
+		$sql.= ' WHERE 1 = 1';
+		if (! empty($conf->multicompany->enabled)) {
+		    $sql .= " AND entity IN (" . getEntity("mymoduleobject", 1) . ")";
+		}
+		if (count($sqlwhere) > 0) {
+			$sql .= ' AND ' . implode(' '.$filtermode.' ', $sqlwhere);
+		}
+		if (!empty($sortfield)) {
+			$sql .= $this->db->order($sortfield,$sortorder);
+		}
+		if (!empty($limit)) {
+		 $sql .=  ' ' . $this->db->plimit($limit, $offset);
+		}
+
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$num = $this->db->num_rows($resql);
+
+			while ($obj = $this->db->fetch_object($resql)) {
+				$line = new self($this->db);
+
+				$line->id = $obj->rowid;
+				$line->prop1 = $obj->field1;
+				$line->prop2 = $obj->field2;
+				//...
+			}
+			$this->db->free($resql);
+
+			return $num;
+		} else {
+			$this->errors[] = 'Error ' . $this->db->lasterror();
+			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+
+			return - 1;
+		}
+	}
+
+	/**
+	 * Update object into database
+	 *
+	 * @param  User $user      User that modifies
+	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 *
+	 * @return int <0 if KO, >0 if OK
+	 */
+	public function update(User $user, $notrigger = false)
+	{
+		dol_syslog(__METHOD__, LOG_DEBUG);
+
+		$error = 0;
+		
+		// Clean parameters
+		if (isset($this->prop1)) {
+			$this->prop1 = trim($this->prop1);
+		}
+		if (isset($this->prop2)) {
+			$this->prop2 = trim($this->prop2);
+		}
+		//...
+
+		// Check parameters
+		// Put here code to add a control on parameters values
+
+		// Update request
+		$sql = 'UPDATE ' . MAIN_DB_PREFIX . $this->table_element . ' SET';
+		$sql .= " field1=".(isset($this->field1)?"'".$this->db->escape($this->field1)."'":"null").",";
+        $sql .= " field2=".(isset($this->field2)?"'".$this->db->escape($this->field2)."'":"null")."";
+		//...
+		$sql .= ' WHERE rowid=' . $this->id;
+
+		$this->db->begin();
+
+		$resql = $this->db->query($sql);
+		if (!$resql) {
+			$error ++;
+			$this->errors[] = 'Error ' . $this->db->lasterror();
+			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+		}
+
+		if (!$error && !$notrigger) {
+			// Uncomment this and change MYOBJECT to your own tag if you
+			// want this action calls a trigger.
+
+			//// Call triggers
+			//$result=$this->call_trigger('MYOBJECT_MODIFY',$user);
+			//if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
+			//// End call triggers
+		}
+
+		// Commit or rollback
+		if ($error) {
+			$this->db->rollback();
+
+			return - 1 * $error;
+		} else {
+			$this->db->commit();
+
+			return 1;
+		}
+	}
+
+	/**
+	 * Delete object in database
+	 *
+	 * @param User $user      User that deletes
+	 * @param bool $notrigger false=launch triggers after, true=disable triggers
+	 *
+	 * @return int <0 if KO, >0 if OK
+	 */
+	public function delete(User $user, $notrigger = false)
+	{
+		dol_syslog(__METHOD__, LOG_DEBUG);
+
+		$error = 0;
+
+		$this->db->begin();
+
+		if (!$error) {
+			if (!$notrigger) {
+				// Uncomment this and change MYOBJECT to your own tag if you
+				// want this action calls a trigger.
+
+				//// Call triggers
+				//$result=$this->call_trigger('MYOBJECT_DELETE',$user);
+				//if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
+				//// End call triggers
+			}
+		}
+
+		// If you need to delete child tables to, you can insert them here
+		
+		if (!$error) {
+			$sql = 'DELETE FROM ' . MAIN_DB_PREFIX . $this->table_element;
+			$sql .= ' WHERE rowid=' . $this->id;
+
+			$resql = $this->db->query($sql);
+			if (!$resql) {
+				$error ++;
+				$this->errors[] = 'Error ' . $this->db->lasterror();
+				dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+			}
+		}
+
+		// Commit or rollback
+		if ($error) {
+			$this->db->rollback();
+
+			return - 1 * $error;
+		} else {
+			$this->db->commit();
+
+			return 1;
+		}
+	}
+
+	/**
+	 * Load an object from its id and create a new one in database
+	 *
+	 * @param int $fromid Id of object to clone
+	 *
+	 * @return int New id of clone
+	 */
+	public function createFromClone($fromid)
+	{
+		dol_syslog(__METHOD__, LOG_DEBUG);
+
+		global $user;
+		$error = 0;
+		$object = new MyModuleObject($this->db);
+
+		$this->db->begin();
+
+		// Load source object
+		$object->fetch($fromid);
+		// Reset object
+		$object->id = 0;
+
+		// Clear fields
+		// ...
+
+		// Create clone
+		$result = $object->create($user);
+
+		// Other options
+		if ($result < 0) {
+			$error ++;
+			$this->errors = $object->errors;
+			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+		}
+
+		// End
+		if (!$error) {
+			$this->db->commit();
+
+			return $object->id;
+		} else {
+			$this->db->rollback();
+
+			return - 1;
+		}
+	}
+
+	/**
+	 *  Return a link to the object card (with optionaly the picto)
+	 *
+	 *	@param	int		$withpicto			Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
+	 *	@param	string	$option				On what the link point to
+     *  @param	int  	$notooltip			1=Disable tooltip
+     *  @param	int		$maxlen				Max length of visible user name
+     *  @param  string  $morecss            Add more css on link
+	 *	@return	string						String with URL
+	 */
+	function getNomUrl($withpicto=0, $option='', $notooltip=0, $maxlen=24, $morecss='')
+	{
+		global $db, $conf, $langs;
+        global $dolibarr_main_authentication, $dolibarr_main_demo;
+        global $menumanager;
+
+        if (! empty($conf->dol_no_mouse_hover)) $notooltip=1;   // Force disable tooltips
+        
+        $result = '';
+        $companylink = '';
+
+        $label = '<u>' . $langs->trans("MyModule") . '</u>';
+        $label.= '<br>';
+        $label.= '<b>' . $langs->trans('Ref') . ':</b> ' . $this->ref;
+
+        $url = DOL_URL_ROOT.'/mymodule/'.$this->table_name.'_card.php?id='.$this->id;
+        
+        $linkclose='';
+        if (empty($notooltip))
+        {
+            if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+            {
+                $label=$langs->trans("ShowProject");
+                $linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
+            }
+            $linkclose.=' title="'.dol_escape_htmltag($label, 1).'"';
+            $linkclose.=' class="classfortooltip'.($morecss?' '.$morecss:'').'"';
+        }
+        else $linkclose = ($morecss?' class="'.$morecss.'"':'');
+        
+		$linkstart = '<a href="'.$url.'"';
+		$linkstart.=$linkclose.'>';
+		$linkend='</a>';
+
+        if ($withpicto)
+        {
+            $result.=($linkstart.img_object(($notooltip?'':$label), 'label', ($notooltip?'':'class="classfortooltip"')).$linkend);
+            if ($withpicto != 2) $result.=' ';
+		}
+		$result.= $linkstart . $this->ref . $linkend;
+		return $result;
+	}
+
+	/**
+	 *  Retourne le libelle du status d'un user (actif, inactif)
+	 *
+	 *  @param	int		$mode          0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
+	 *  @return	string 			       Label of status
+	 */
+	function getLibStatut($mode=0)
+	{
+		return $this->LibStatut($this->status,$mode);
+	}
+
+	/**
+	 *  Return the status
+	 *
+	 *  @param	int		$status        	Id status
+	 *  @param  int		$mode          	0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 5=Long label + Picto
+	 *  @return string 			       	Label of status
+	 */
+	static function LibStatut($status,$mode=0)
+	{
+		global $langs;
+
+		if ($mode == 0)
+		{
+			$prefix='';
+			if ($status == 1) return $langs->trans('Enabled');
+			if ($status == 0) return $langs->trans('Disabled');
+		}
+		if ($mode == 1)
+		{
+			if ($status == 1) return $langs->trans('Enabled');
+			if ($status == 0) return $langs->trans('Disabled');
+		}
+		if ($mode == 2)
+		{
+			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
+			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
+		}
+		if ($mode == 3)
+		{
+			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4');
+			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5');
+		}
+		if ($mode == 4)
+		{
+			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
+			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
+		}
+		if ($mode == 5)
+		{
+			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4');
+			if ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5');
+		}
+		if ($mode == 6)
+		{
+			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4');
+			if ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5');
+		}
+	}
+
+
+	/**
+	 * Initialise object with example values
+	 * Id must be 0 if object instance is a specimen
+	 *
+	 * @return void
+	 */
+	public function initAsSpecimen()
+	{
+		$this->id = 0;
+		$this->prop1 = 'prop1';
+		$this->prop2 = 'prop2';
+	}
+
+}
+
+/**
+ * Class MyModuleObjectLine
+ */
+class MyModuleObjectLine
+{
+	/**
+	 * @var int ID
+	 */
+	public $id;
+	/**
+	 * @var mixed Sample line property 1
+	 */
+	public $prop1;
+	/**
+	 * @var mixed Sample line property 2
+	 */
+	public $prop2;
+}
diff --git a/htdocs/modulebuilder/template/class/myobject_api_class.class.php b/htdocs/modulebuilder/template/class/myobject_api_class.class.php
new file mode 100644
index 00000000000..8f0dbee2e38
--- /dev/null
+++ b/htdocs/modulebuilder/template/class/myobject_api_class.class.php
@@ -0,0 +1,292 @@
+<?php
+/* Copyright (C) 2015   Jean-François Ferry     <jfefe@aternatik.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
+ * 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/>.
+ */
+
+use Luracast\Restler\RestException;
+
+/**
+ * \file    htdocs/modulebuilder/template/class/myobject_api_class.class.php
+ * \ingroup mymodule
+ * \brief   File for API management of myobject.
+ */
+ 
+/**
+ * API class for mymodule myobject
+ *
+ * @smart-auto-routing false
+ * @access protected 
+ * @class  DolibarrApiAccess {@requires user,external}
+ */
+class MyObjectApi extends DolibarrApi
+{
+    /**
+     * @var array   $FIELDS     Mandatory fields, checked when create and update object 
+     */
+    static $FIELDS = array(
+        'name'
+    );
+
+    /**
+     * @var MyObject $myobject {@type MyObject}
+     */
+    public $myobject;
+
+    /**
+     * Constructor
+     *
+     * @url     GET myobject/
+     * 
+     */
+    function __construct()
+    {
+		global $db, $conf;
+		$this->db = $db;
+        $this->myobject = new MyObject($this->db);
+    }
+
+    /**
+     * Get properties of a myobject object
+     *
+     * Return an array with myobject informations
+     *
+     * @param 	int 	$id ID of myobject
+     * @return 	array|mixed data without useless information
+	 * 
+     * @url	GET myobject/{id}
+     * @throws 	RestException
+     */
+    function get($id)
+    {		
+		if(! DolibarrApiAccess::$user->rights->myobject->read) {
+			throw new RestException(401);
+		}
+			
+        $result = $this->myobject->fetch($id);
+        if( ! $result ) {
+            throw new RestException(404, 'MyObject not found');
+        }
+		
+		if( ! DolibarrApi::_checkAccessToResource('myobject',$this->myobject->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+
+		return $this->_cleanObjectDatas($this->myobject);
+    }
+
+    /**
+     * List myobjects
+     * 
+     * Get a list of myobjects
+     * 
+     * @param int		$mode		Use this param to filter list
+     * @param string	$sortfield	Sort field
+     * @param string	$sortorder	Sort order
+     * @param int		$limit		Limit for list
+     * @param int		$page		Page number
+     * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101') or (t.import_key:=:'20160101')"
+     * @return array Array of myobject objects
+     *
+     * @url	GET /myobjects/
+     */
+    function index($mode, $sortfield = "t.rowid", $sortorder = 'ASC', $limit = 0, $page = 0, $sqlfilters = '') {
+        global $db, $conf;
+        
+        $obj_ret = array();
+        
+        $socid = DolibarrApiAccess::$user->societe_id ? DolibarrApiAccess::$user->societe_id : '';
+            
+        // If the internal user must only see his customers, force searching by him
+        if (! DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) $search_sale = DolibarrApiAccess::$user->id;
+
+        $sql = "SELECT s.rowid";
+        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
+        $sql.= " FROM ".MAIN_DB_PREFIX."myobject as s";
+        
+        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
+        $sql.= ", ".MAIN_DB_PREFIX."c_stcomm as st";
+        $sql.= " WHERE s.fk_stcomm = st.id";
+        
+		// Example of use $mode
+        //if ($mode == 1) $sql.= " AND s.client IN (1, 3)";
+        //if ($mode == 2) $sql.= " AND s.client IN (2, 3)";
+
+        $sql.= ' AND s.entity IN ('.getEntity('myobject', 1).')';
+        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql.= " AND s.fk_soc = sc.fk_soc";
+        if ($socid) $sql.= " AND s.fk_soc = ".$socid;
+        if ($search_sale > 0) $sql.= " AND s.rowid = sc.fk_soc";		// Join for the needed table to filter by sale
+        // Insert sale filter
+        if ($search_sale > 0)
+        {
+            $sql .= " AND sc.fk_user = ".$search_sale;
+        }
+        if ($sqlfilters)
+        {
+            if (! DolibarrApi::_checkFilters($sqlfilters))
+            {
+                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+            }
+	        $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+            $sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+        }
+
+        $sql.= $db->order($sortfield, $sortorder);
+        if ($limit)	{
+            if ($page < 0)
+            {
+                $page = 0;
+            }
+            $offset = $limit * $page;
+
+            $sql.= $db->plimit($limit + 1, $offset);
+        }
+
+        $result = $db->query($sql);
+        if ($result)
+        {
+            $num = $db->num_rows($result);
+            while ($i < $num)
+            {
+                $obj = $db->fetch_object($result);
+                $myobject_static = new MyObject($db);
+                if($myobject_static->fetch($obj->rowid)) {
+                    $obj_ret[] = parent::_cleanObjectDatas($myobject_static);
+                }
+                $i++;
+            }
+        }
+        else {
+            throw new RestException(503, 'Error when retrieve myobject list');
+        }
+        if( ! count($obj_ret)) {
+            throw new RestException(404, 'No myobject found');
+        }
+		return $obj_ret;
+    }
+    
+    /**
+     * Create myobject object
+     *
+     * @param array $request_data   Request datas
+     * @return int  ID of myobject
+     * 
+     * @url	POST myobject/
+     */
+    function post($request_data = NULL)
+    {
+        if(! DolibarrApiAccess::$user->rights->myobject->create) {
+			throw new RestException(401);
+		}
+        // Check mandatory fields
+        $result = $this->_validate($request_data);
+        
+        foreach($request_data as $field => $value) {
+            $this->myobject->$field = $value;
+        }
+        if( ! $this->myobject->create(DolibarrApiAccess::$user)) {
+            throw new RestException(500);
+        }
+        return $this->myobject->id;
+    }
+
+    /**
+     * Update myobject
+     *
+     * @param int   $id             Id of myobject to update
+     * @param array $request_data   Datas   
+     * @return int 
+     * 
+     * @url	PUT myobject/{id}
+     */
+    function put($id, $request_data = NULL)
+    {
+        if(! DolibarrApiAccess::$user->rights->myobject->create) {
+			throw new RestException(401);
+		}
+        
+        $result = $this->myobject->fetch($id);
+        if( ! $result ) {
+            throw new RestException(404, 'MyObject not found');
+        }
+		
+		if( ! DolibarrApi::_checkAccessToResource('myobject',$this->myobject->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+
+        foreach($request_data as $field => $value) {
+            $this->myobject->$field = $value;
+        }
+        
+        if($this->myobject->update($id, DolibarrApiAccess::$user))
+            return $this->get ($id);
+        
+        return false;
+    }
+    
+    /**
+     * Delete myobject
+     *
+     * @param   int     $id   MyObject ID
+     * @return  array
+     * 
+     * @url	DELETE myobject/{id}
+     */
+    function delete($id)
+    {
+        if(! DolibarrApiAccess::$user->rights->myobject->supprimer) {
+			throw new RestException(401);
+		}
+        $result = $this->myobject->fetch($id);
+        if( ! $result ) {
+            throw new RestException(404, 'MyObject not found');
+        }
+		
+		if( ! DolibarrApi::_checkAccessToResource('myobject',$this->myobject->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+        
+        if( !$this->myobject->delete($id))
+        {
+            throw new RestException(500);
+        }
+        
+         return array(
+            'success' => array(
+                'code' => 200,
+                'message' => 'MyObject deleted'
+            )
+        );
+        
+    }
+    
+    /**
+     * Validate fields before create or update object
+     * 
+     * @param array $data   Data to validate
+     * @return array
+     * 
+     * @throws RestException
+     */
+    function _validate($data)
+    {
+        $myobject = array();
+        foreach (MyObjectApi::$FIELDS as $field) {
+            if (!isset($data[$field]))
+                throw new RestException(400, "$field field missing");
+            $myobject[$field] = $data[$field];
+        }
+        return $myobject;
+    }
+}
diff --git a/htdocs/modulebuilder/template/core/modules/modMyModule.class.php b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
index 152059cd79a..71948b0e1be 100644
--- a/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
+++ b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
@@ -1,10 +1,11 @@
 <?php
-/* <one line to give the program's name and a brief idea of what it does.>
- * Copyright (C) <year>  <name of author>
+/* Copyright (C) 2003      Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2016 Regis Houssin        <regis.houssin@capnetworks.com>
  *
- * This program is free software: you can redistribute it and/or modify
+ * 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
+ * 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,
@@ -13,309 +14,28 @@
  * 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/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
- * \defgroup    mymodule    MyModule module
- * \brief       MyModule module descriptor.
+ * 	\defgroup   mymodule     Module MyModule
+ *  \brief      MyModule module descriptor.
  *
- * Put detailed description here.
+ *  \file       htdocs/mymodule/core/modules/modMyModule.class.php
+ *  \ingroup    mymodule
+ *  \brief      Description and activation file for module MyModule
  */
+include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
 
-/**
- * \file        core/modules/modMyModule.class.php
- * \ingroup     mymodule
- * \brief       Example module description and activation file.
- *
- * Put detailed description here.
- */
-
-include_once DOL_DOCUMENT_ROOT . "/core/modules/DolibarrModules.class.php";
 
 // The class name should start with a lower case mod for Dolibarr to pick it up
 // so we ignore the Squiz.Classes.ValidClassName.NotCamelCaps rule.
 // @codingStandardsIgnoreStart
 /**
- * Description and activation class for module MyModule
+ *  Description and activation class for module MyModule
  */
 class modMyModule extends DolibarrModules
 {
-	/** @var DoliDB Database handler */
-	public $db;
-
-	/**
-	 * @var int numero Module unique ID
-	 * @see http://wiki.dolibarr.org/index.php/List_of_modules_id Available ranges
-	 */
-	public $numero = 500000;
-
-	/** @var string Text key to reference module (for permissions, menus, etc.) */
-	public $rights_class = 'mymodule';
-
-	/**
-	 * @var string Module family.
-	 * Used to group modules in module setup page.
-	 * Can be one of 'crm', 'financial', 'hr', 'projects', 'products', 'ecm', 'technic', 'other'
-	 */
-	public $family = 'other';
-
-	/** @var int Module position in the family */
-	public $module_position = 500;
-
-	/** @var array Provide a custom family and options */
-	public $familyinfo = array(
-//        'myownfamily' => array(
-//            'position' => '001',
-//            'label' => 'MyOwnFamily'
-//        )
-	);
-
-	/** @var string Module name */
-	public $name = "My Module";
-
-	/** @var string Module short description */
-	public $description = "Description of module MyModule";
-
-	/** @var string Module long description */
-	public $descriptionlong = "A very long description. Can be a full HTML content";
-
-	/**
-	 * @var string Module editor name
-	 * @since 4.0
-	 */
-	public $editor_name = "My Company";
-
-	/**
-	 * @var string Module editor website
-	 * @since 4.0
-	 */
-	public $editor_url = "http://www.example.com";
-
-	/**
-	 * @var string Module version string
-	 * Special values to hide the module behind MAIN_FEATURES_LEVEL: development, experimental
-	 * @see https://semver.org
-	 */
-	public $version = 'development';
-
-	/** @var string Key used in llx_const table to save module status enabled/disabled */
-	public $const_name = 'MAIN_MODULE_MYMODULE';
-
-	/**
-	 * @var string Module logo
-	 * Should be named object_mymodule.png and store under mymodule/img
-	 */
-	public $picto = 'mymodule@mymodule';
-
-	/** @var array Define module parts */
-	public $module_parts = array(
-		/** @var bool Module ships triggers in mymodule/core/triggers */
-		'triggers' => true,
-		/**
-		 * @var bool Module ships login in mymodule/core/login
-		 * @todo: example
-		 */
-		'login' => false,
-		/**
-		 * @var bool Module ships substitution functions
-		 * @todo example
-		 */
-		'substitutions' => false,
-		/**
-		 * @var bool Module ships menu handlers
-		 * @todo example
-		 */
-		'menus' => false,
-		/**
-		 * @var bool Module ships theme in mymodule/theme
-		 * @todo example
-		 */
-		'theme' => false,
-		/**
-		 * @var bool Module shipped templates in mymodule/core/tpl overload core ones
-		 * @todo example
-		 */
-		'tpl' => false,
-		/**
-		 * @var bool Module ships barcode functions
-		 * @todo example
-		 */
-		'barcode' => false,
-		/**
-		 * @var bool Module ships models
-		 * @todo example
-		 */
-		'models' => false,
-		/** @var string[] List of module shipped custom CSS relative file paths */
-		'css' => array(
-			'mymodule/css/mycss.css.php'
-		),
-		/** @var string[] List of module shipped custom JavaScript relative file paths */
-		'js' => array(
-			'mymodule/js/myjs.js.php'
-		),
-		/**
-		 * @var string[] List of hook contexts managed by the module
-		 * @ todo example
-		 */
-		'hooks' => array(),
-		/**
-		 * @var array List of default directory names to force
-		 * @todo example
-		 */
-		'dir' => array(),
-		/**
-		 * @var array List of workflow contexts managed by the module
-		 */
-		'workflow' => array(),
-	);
-
-	/** @var string Data directories to create when module is enabled */
-	public $dirs = array(
-		'/mymodule/temp'
-	);
-
-	/** @var array Configuration page declaration */
-	public $config_page_url = 'setup.php@mymodule';
-
-	/** @var bool Control module visibility */
-	public $hidden = false;
-
-	/** @var string[] List of class names of modules to enable when this one is enabled */
-	public $depends = array();
-
-	/** @var string[] List of class names of modules to disable when this one is disabled */
-	public $requiredby = array();
-
-	/** @var string List of class names of modules this module conflicts with */
-	public $conflictwith = array();
-
-	/** @var int[] Minimum PHP version required by this module */
-	public $phpmin = array(5, 3);
-
-	/** @var int[] Minimum Dolibarr version required by this module */
-	public $need_dolibarr_version = array(3, 2);
-
-	/** @var string[] List of language files */
-	public $langfiles = array('mymodule@mymodule');
-
-	/** @var array Indexed list of constants options */
-	public $const = array(
-		0 => array(
-			/** @var string Constant name */
-			'MYMODULE_MYNEWCONST1',
-			/**
-			 * @var string Constant type
-			 * @todo Are there other types than 'chaine'?
-			 */
-			'chaine',
-			/** @var string Constant initial value */
-			'myvalue',
-			/** @var string Constant description */
-			'This is a configuration constant',
-			/** @var bool Constant visibility */
-			true,
-			/**
-			 * @var string Multi-company entities
-			 * 'current' or 'allentities'
-			 */
-			'current',
-			/** @var bool Delete constant when module is disabled */
-			true
-		)
-	);
-
-	/**
-	 * @var string List of pages to add as tab in a specific view
-	 * @todo example
-	 */
-	public $tabs = array();
-
-	/**
-	 * @var array Dictionaries declared by the module
-	 *@todo example
-	 */
-	public $dictionaries = array();
-
-	/** @var array Indexed list of boxes options */
-	public $boxes = array(
-		0 => array(
-			'file' => 'mybox@mymodule',
-			'note' => '',
-			'enabledbydefaulton' => 'Home'
-		)
-	);
-
-	/**
-	 * @var array Indexed list of cronjobs options
-	 * @todo: example
-	 */
-	public $cronjobs = array();
-
-	/**
-	 * @var array Indexed list of permissions options
-	 * @todo example
-	 */
-	public $rights = array();
-
-	/**
-	 * @var array Indexed list of menu options
-	 * @todo example
-	 */
-	public $menu = array();
-
-	/**
-	 * @var array Indexed list of export IDs
-	 * @todo example
-	 */
-	public $export_code = array();
-
-	/**
-	 * @var array Indexed list of export names
-	 * @todo example
-	 */
-	public $export_label = array();
-
-	/**
-	 * @var array Indexed list of export enabling conditions
-	 * @todo example
-	 */
-	public $export_enabled = array();
-
-	/**
-	 * @var array Indexed list of export required permissions
-	 * @todo example
-	 */
-	public $export_permission = array();
-
-	/**
-	 * @var array Indexed list of export fields
-	 * @todo example
-	 */
-	public $export_fields_array = array();
-
-	/**
-	 * @var array Indexed list of export entities
-	 * @todo example
-	 */
-	public $export_entities_array = array();
-
-	/**
-	 * @var array Indexed list of export SQL queries start
-	 * @todo example
-	 */
-	public $export_sql_start = array();
-
-	/**
-	 * @var array Indexed list of export SQL queries end
-	 * @todo example
-	 */
-	public $export_sql_end = array();
-
-	/** @var bool Module only enabled / disabled in main company when multi-company is in use */
-	public $core_enabled = false;
-
 	// @codingStandardsIgnoreEnd
 	/**
 	 * Constructor. Define names, constants, directories, boxes, permissions
@@ -324,61 +44,90 @@ class modMyModule extends DolibarrModules
 	 */
 	public function __construct($db)
 	{
-		global $langs, $conf;
+        global $langs,$conf;
 
-		// DolibarrModules is abstract in Dolibarr < 3.8
-		if (is_callable('parent::__construct')) {
-			parent::__construct($db);
-		} else {
-			global $db;
-			$this->db = $db;
-		}
+        $this->db = $db;
 
-		// Declare custom family with translated label
-		//$this->familyinfo = array(
-		//	'myownfamily' => array(
-		//		'position' => '001',
-		//		'label' => $langs->trans("MyOwnFamily")
-		//	)
-		//);
+		// Id for module (must be unique).
+		// Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id).
+		$this->numero = 500000;		// TODO Go on page http://wiki.dolibarr.org/index.php/List_of_modules_id to reserve id number for your module
+		// Key text used to identify module (for permissions, menus, etc...)
+		$this->rights_class = 'mymodule';
 
-		// Lazy automatic module naming from class names
-		//$this->name = preg_replace('/^mod/i', '', get_class($this));
+		// Family can be 'crm','financial','hr','projects','products','ecm','technic','interface','other'
+		// It is used to group modules by family in module setup page
+		$this->family = "other";
+		// Module position in the family
+		$this->module_position = 500;
+		// Gives the possibility to the module, to provide his own family info and position of this family (Overwrite $this->family and $this->module_position. Avoid this)
+		//$this->familyinfo = array('myownfamily' => array('position' => '001', 'label' => $langs->trans("MyOwnFamily")));
 
-		// Lazy automatic constant naming from module name
-		//$this->const_name = 'MAIN_MODULE_' . strtoupper($this->name);
+		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+		$this->name = preg_replace('/^mod/i','',get_class($this));
+		// Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
+		$this->description = "MyModuleDescription";
+		$this->descriptionlong = "MyModuleDescription (Long)";
+		$this->editor_name = 'Editor name';
+		$this->editor_url = 'https://www.example.com';
+		
+		// Possible values for version are: 'development', 'experimental', 'dolibarr', 'dolibarr_deprecated' or a version string like 'x.y.z'
+		$this->version = '1.0';
+		// Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
+		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+		// Name of image file used for this module.
+		// If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
+		// If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
+		$this->picto='generic';
 
-		// Examples for complex types
+		// Defined all module parts (triggers, login, substitutions, menus, css, etc...)
+		// for default path (eg: /mymodule/core/xxxxx) (0=disable, 1=enable)
+		// for specific path of parts (eg: /mymodule/core/modules/barcode)
+		// for specific css file (eg: /mymodule/css/mymodule.css.php)
 		//$this->module_parts = array(
-			// Set here all hooks context managed by module
-			// 'hooks' => array('hookcontext1','hookcontext2'),
-			// To force the default directories names
-			// 'dir' => array('output' => 'othermodulename'),
-			// Set here all workflow context managed by module
-			// Don't forget to depend on modWorkflow!
-			// The description translation key will be descWORKFLOW_MODULE1_YOURACTIONTYPE_MODULE2
-			// You will be able to check if it is enabled with the $conf->global->WORKFLOW_MODULE1_YOURACTIONTYPE_MODULE2 constant
-			// Implementation is up to you and is usually done in a trigger.
-			// 'workflow' => array(
-			//     'WORKFLOW_MODULE1_YOURACTIONTYPE_MODULE2' => array(
-			//         'enabled' => '! empty($conf->module1->enabled) && ! empty($conf->module2->enabled)',
-			//         'picto' => 'yourpicto@mymodule',
-			//         'warning' => 'WarningTextTranslationKey',
-			//      ),
-			// ),
-		//);
+		//                        	'triggers' => 0,                                 	// Set this to 1 if module has its own trigger directory (core/triggers)
+		//							'login' => 0,                                    	// Set this to 1 if module has its own login method directory (core/login)
+		//							'substitutions' => 0,                            	// Set this to 1 if module has its own substitution function file (core/substitutions)
+		//							'menus' => 0,                                    	// Set this to 1 if module has its own menus handler directory (core/menus)
+		//							'theme' => 0,                                    	// Set this to 1 if module has its own theme directory (theme)
+		//                        	'tpl' => 0,                                      	// Set this to 1 if module overwrite template dir (core/tpl)
+		//							'barcode' => 0,                                  	// Set this to 1 if module has its own barcode directory (core/modules/barcode)
+		//							'models' => 0,                                   	// Set this to 1 if module has its own models directory (core/modules/xxx)
+		//							'css' => array('/mymodule/css/mymodule.css.php'),	// Set this to relative path of css file if module has its own css file
+	 	//							'js' => array('/mymodule/js/mymodule.js'),          // Set this to relative path of js file if module must load a js on all pages
+		//							'hooks' => array('hookcontext1','hookcontext2',...) // Set here all hooks context managed by module. You can also set hook context 'all'
+		//							'dir' => array('output' => 'othermodulename'),      // To force the default directories names
+		//							'workflow' => array('WORKFLOW_MODULE1_YOURACTIONTYPE_MODULE2'=>array('enabled'=>'! empty($conf->module1->enabled) && ! empty($conf->module2->enabled)', 'picto'=>'yourpicto@mymodule')) // Set here all workflow context managed by module
+		//                        );
+		$this->module_parts = array();
 
+		// Data directories to create when module is enabled.
+		// Example: this->dirs = array("/mymodule/temp");
+		$this->dirs = array();
+
+		// Config pages. Put here list of php page, stored into mymodule/admin directory, to use to setup module.
+		$this->config_page_url = array("setup.php@mymodule");
+
+		// Dependencies
+		$this->hidden = false;			// A condition to hide module
+		$this->depends = array();		// List of module class names as string that must be enabled if this module is enabled
+		$this->requiredby = array();	// List of module ids to disable if this one is disabled
+		$this->conflictwith = array();	// List of module class names as string this module is in conflict with
+		$this->phpmin = array(5,0);					// Minimum version of PHP required by module
+		$this->need_dolibarr_version = array(3,0);	// Minimum version of Dolibarr required by module
+		$this->langfiles = array("mymodule@mymodule");
+
+		// Constants
+		// List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 'current' or 'allentities', deleteonunactive)
+		// Example: $this->const=array(0=>array('MYMODULE_MYNEWCONST1','chaine','myvalue','This is a constant to add',1),
+		//                             1=>array('MYMODULE_MYNEWCONST2','chaine','myvalue','This is another constant to add',0, 'current', 1)
+		// );
+		$this->const = array();
 
 		// Array to add new pages in new tabs
-		// Example:
-		//$this->tabs = array(
-			//	// To add a new tab identified by code tabname1
-			//	'objecttype:+tabname1:Title1:langfile@mymodule:$user->rights->mymodule->read:/mymodule/mynewtab1.php?id=__ID__',
-			//	// To add another new tab identified by code tabname2
-			//	'objecttype:+tabname2:Title2:langfile@mymodule:$user->rights->othermodule->read:/mymodule/mynewtab2.php?id=__ID__',
-			//	// To remove an existing tab identified by code tabname
-			//	'objecttype:-tabname'
-		//);
+		// Example: $this->tabs = array('objecttype:+tabname1:Title1:mylangfile@mymodule:$user->rights->mymodule->read:/mymodule/mynewtab1.php?id=__ID__',  					// To add a new tab identified by code tabname1
+        //                              'objecttype:+tabname2:SUBSTITUTION_Title2:mylangfile@mymodule:$user->rights->othermodule->read:/mymodule/mynewtab2.php?id=__ID__',  	// To add another new tab identified by code tabname2. Label will be result of calling all substitution functions on 'Title2' key.
+        //                              'objecttype:-tabname:NU:conditiontoremove');                                                     										// To remove an existing tab identified by code tabname
+		// where objecttype can be
 		// 'categories_x'	  to add a tab in category view (replace 'x' by type of category (0=product, 1=supplier, 2=customer, 3=member)
 		// 'contact'          to add a tab in contact view
 		// 'contract'         to add a tab in contract view
@@ -398,317 +147,142 @@ class modMyModule extends DolibarrModules
 		// 'stock'            to add a tab in stock view
 		// 'thirdparty'       to add a tab in third party view
 		// 'user'             to add a tab in user view
+        $this->tabs = array();
 
-		// Dictionaries
-		if (! isset($conf->mymodule->enabled)) {
-			$conf->mymodule=new stdClass();
-			$conf->mymodule->enabled = 0;
-		}
-		//$this->dictionaries = array();
-		/* Example:
-		  $this->dictionaries=array(
-			  'langs'=>'mymodule@mymodule',
-			  // List of tables we want to see into dictonary editor
-			  'tabname'=>array(
-				  MAIN_DB_PREFIX."table1",
-				  MAIN_DB_PREFIX."table2",
-				  MAIN_DB_PREFIX."table3"
-			  ),
-			  // Label of tables
-			  'tablib'=>array("Table1","Table2","Table3"),
-			  // Query to select fields
-			  'tabsql'=>array(
-				  'SELECT f.rowid as rowid, f.code, f.label, f.active'
-				  . ' FROM ' . MAIN_DB_PREFIX . 'table1 as f',
-				  'SELECT f.rowid as rowid, f.code, f.label, f.active'
-				  . ' FROM ' . MAIN_DB_PREFIX . 'table2 as f',
-				  'SELECT f.rowid as rowid, f.code, f.label, f.active'
-				  . ' FROM ' . MAIN_DB_PREFIX . 'table3 as f'
-			  ),
-			  // Sort order
-			  'tabsqlsort'=>array("label ASC","label ASC","label ASC"),
-			  // List of fields (result of select to show dictionary)
-			  'tabfield'=>array("code,label","code,label","code,label"),
-			  // List of fields (list of fields to edit a record)
-			  'tabfieldvalue'=>array("code,label","code,label","code,label"),
-			  // List of fields (list of fields for insert)
-			  'tabfieldinsert'=>array("code,label","code,label","code,label"),
-			  // Name of columns with primary key (try to always name it 'rowid')
-			  'tabrowid'=>array("rowid","rowid","rowid"),
-			  // Condition to show each dictionary
-			  'tabcond'=>array(
-				  $conf->mymodule->enabled,
-				  $conf->mymodule->enabled,
-				  $conf->mymodule->enabled
-			  )
-		  );
-		 */
+		if (! isset($conf->mymodule) || ! isset($conf->mymodule->enabled))
+        {
+        	$conf->mymodule=new stdClass();
+        	$conf->mymodule->enabled=0;
+        }
+        
+        // Dictionaries
+		$this->dictionaries=array();
+        /* Example:
+        $this->dictionaries=array(
+            'langs'=>'mylangfile@mymodule',
+            'tabname'=>array(MAIN_DB_PREFIX."table1",MAIN_DB_PREFIX."table2",MAIN_DB_PREFIX."table3"),		// List of tables we want to see into dictonnary editor
+            'tablib'=>array("Table1","Table2","Table3"),													// Label of tables
+            'tabsql'=>array('SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table1 as f','SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table2 as f','SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table3 as f'),	// Request to select fields
+            'tabsqlsort'=>array("label ASC","label ASC","label ASC"),																					// Sort order
+            'tabfield'=>array("code,label","code,label","code,label"),																					// List of fields (result of select to show dictionary)
+            'tabfieldvalue'=>array("code,label","code,label","code,label"),																				// List of fields (list of fields to edit a record)
+            'tabfieldinsert'=>array("code,label","code,label","code,label"),																			// List of fields (list of fields for insert)
+            'tabrowid'=>array("rowid","rowid","rowid"),																									// Name of columns with primary key (try to always name it 'rowid')
+            'tabcond'=>array($conf->mymodule->enabled,$conf->mymodule->enabled,$conf->mymodule->enabled)												// Condition to show each dictionary
+        );
+        */
+
+        // Boxes
+		// Add here list of php file(s) stored in core/boxes that contains class to show a box.
+        $this->boxes = array();			// List of boxes
+		// Example:
+		//$this->boxes=array(
+		//    0=>array('file'=>'myboxa.php@mymodule','note'=>'','enabledbydefaulton'=>'Home'),
+		//    1=>array('file'=>'myboxb.php@mymodule','note'=>''),
+		//    2=>array('file'=>'myboxc.php@mymodule','note'=>'')
+		//);
 
 		// Cronjobs
-		// List of cron jobs entries to add
-		//$this->cronjobs = array();
-		// Example:
-		//		$this->cronjobs = array(
-		//			0 => array(
-		//				'label' => 'My label',
-		//				'jobtype' => 'method',
-		//				'class' => '/dir/class/file.class.php',
-		//				'objectname' => 'MyClass',
-		//				'method' => 'myMethod',
-		//				'parameters' => '',
-		//				'comment' => 'Comment',
-		//				'frequency' => 2,
-		//				'unitfrequency' => 3600,
-		//				'test' => true
-		//			),
-		//			1 => array(
-		//				'label' => 'My label',
-		//				'jobtype' => 'command',
-		//				'command' => '',
-		//				'parameters' => '',
-		//				'comment' => 'Comment',
-		//				'frequency' => 1,
-		//				'unitfrequency' => 3600 * 24,
-		//				'test' => true
-		//			)
-		//		);
+		$this->cronjobs = array();			// List of cron jobs entries to add
+		// Example: $this->cronjobs=array(0=>array('label'=>'My label', 'jobtype'=>'method', 'class'=>'/dir/class/file.class.php', 'objectname'=>'MyClass', 'method'=>'myMethod', 'parameters'=>'', 'comment'=>'Comment', 'frequency'=>2, 'unitfrequency'=>3600, 'test'=>true),
+		//                                1=>array('label'=>'My label', 'jobtype'=>'command', 'command'=>'', 'parameters'=>'', 'comment'=>'Comment', 'frequency'=>1, 'unitfrequency'=>3600*24, 'test'=>true)
+		// );
 
 		// Permissions
-		//$r = 0;
-		// Add here list of permission defined by
-		// an id, a label, a boolean and two constant strings.
-		// Example:
-		//// Permission id (must not be already used)
-		//$this->rights[$r][0] = 2000;
-		//// Permission label
-		//$this->rights[$r][1] = 'Permision label';
-		//// Permission by default for new user (0/1)
-		//$this->rights[$r][3] = 1;
-		//// In php code, permission will be checked by test
-		//// if ($user->rights->permkey->level1->level2)
-		//$this->rights[$r][4] = 'level1';
-		//// In php code, permission will be checked by test
-		//// if ($user->rights->permkey->level1->level2)
-		//$this->rights[$r][5] = 'level2';
-		//$r++;
-		// Main menu entries
+		$this->rights = array();		// Permission array used by this module
+		$r=0;
 
-		// Menu entries
+		// Add here list of permission defined by an id, a label, a boolean and two constant strings.
+		// Example:
+		// $this->rights[$r][0] = $this->numero + $r;	// Permission id (must not be already used)
+		// $this->rights[$r][1] = 'Permision label';	// Permission label
+		// $this->rights[$r][3] = 1; 					// Permission by default for new user (0/1)
+		// $this->rights[$r][4] = 'level1';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		// $this->rights[$r][5] = 'level2';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		// $r++;
+
+		// Main menu entries
+		$this->menu = array();			// List of menus to add
+		$r=0;
+
+		// Add here entries to declare new menus
+		//
 		// Example to declare a new Top Menu entry and its Left menu entry:
-		//$this->menu[]=array(
-		//	// Put 0 if this is a top menu
-		//	'fk_menu'=>0,
-		//	// This is a Top menu entry
-		//	'type'=>'top',
-		// Menu's title. FIXME: use a translation key
-		//	'titre'=>'MyModule top menu',
-		// This menu's mainmenu ID
-		//	'mainmenu'=>'mymodule',
-		// This menu's leftmenu ID
-		//	'leftmenu'=>'mymodule',
-		//	'url'=>'/mymodule/pagetop.php',
-		//	// Lang file to use (without .lang) by module.
-		//	// File must be in langs/code_CODE/ directory.
-		//	'langs'=>'mylangfile',
-		//	'position'=>100,
-		//	// Define condition to show or hide menu entry.
-		//	// Use '$conf->mymodule->enabled' if entry must be visible if module is enabled.
-		//	'enabled'=>'$conf->mymodule->enabled',
-		//	// Use 'perms'=>'$user->rights->mymodule->level1->level2'
-		//	// if you want your menu with a permission rules
-		//	'perms'=>'1',
-		//	'target'=>'',
-		//	// 0=Menu for internal users, 1=external users, 2=both
-		//	'user'=>2
-		//);
-		//$this->menu[]=array(
-		//	// Use r=value where r is index key used for the parent menu entry
-		//	// (higher parent must be a top menu entry)
-		//	'fk_menu'=>'r=0',
-		//	// This is a Left menu entry
-		//	'type'=>'left',
-		// Menu's title. FIXME: use a translation key
-		//	'titre'=>'MyModule left menu',
-		// This menu's mainmenu ID
-		//	'mainmenu'=>'mymodule',
-		// This menu's leftmenu ID
-		//	'leftmenu'=>'mymodule',
-		//	'url'=>'/mymodule/pagelevel1.php',
-		//	// Lang file to use (without .lang) by module.
-		//	// File must be in langs/code_CODE/ directory.
-		//	'langs'=>'mylangfile',
-		//	'position'=>100,
-		//	// Define condition to show or hide menu entry.
-		//	// Use '$conf->mymodule->enabled' if entry must be visible if module is enabled.
-		//	'enabled'=>'$conf->mymodule->enabled',
-		//	// Use 'perms'=>'$user->rights->mymodule->level1->level2'
-		//	// if you want your menu with a permission rules
-		//	'perms'=>'1',
-		//	'target'=>'',
-		//	// 0=Menu for internal users, 1=external users, 2=both
-		//	'user'=>2
-		//);
+		// $this->menu[$r]=array(	'fk_menu'=>'',			                // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+		//							'type'=>'top',			                // This is a Top menu entry
+		//							'titre'=>'MyModule top menu',
+		//							'mainmenu'=>'mymodule',
+		//							'leftmenu'=>'mymodule',
+		//							'url'=>'/mymodule/pagetop.php',
+		//							'langs'=>'mylangfile@mymodule',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+		//							'position'=>100,
+		//							'enabled'=>'$conf->mymodule->enabled',	// Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled.
+		//							'perms'=>'1',			                // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
+		//							'target'=>'',
+		//							'user'=>2);				                // 0=Menu for internal users, 1=external users, 2=both
+		// $r++;
 		//
 		// Example to declare a Left Menu entry into an existing Top menu entry:
-		//$this->menu[]=array(
-		//	// Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy'
-		//	'fk_menu'=>'fk_mainmenu=mainmenucode',
-		//	// This is a Left menu entry
-		//	'type'=>'left',
-		// Menu's title. FIXME: use a translation key
-		//	'titre'=>'MyModule left menu',
-		// This menu's mainmenu ID
-		//	'mainmenu'=>'mainmenucode',
-		// This menu's leftmenu ID
-		//	'leftmenu'=>'mymodule',
-		//	'url'=>'/mymodule/pagelevel2.php',
-		//	// Lang file to use (without .lang) by module.
-		//	// File must be in langs/code_CODE/ directory.
-		//	'langs'=>'mylangfile',
-		//	'position'=>100,
-		//	// Define condition to show or hide menu entry.
-		//	// Use '$conf->mymodule->enabled' if entry must be visible if module is enabled.
-		//	// Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-		//	'enabled'=>'$conf->mymodule->enabled',
-		//	// Use 'perms'=>'$user->rights->mymodule->level1->level2'
-		//	// if you want your menu with a permission rules
-		//	'perms'=>'1',
-		//	'target'=>'',
-		//	// 0=Menu for internal users, 1=external users, 2=both
-		//	'user'=>2
-		//);
+		// $this->menu[$r]=array(	'fk_menu'=>'fk_mainmenu=xxx',		    // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+		//							'type'=>'left',			                // This is a Left menu entry
+		//							'titre'=>'MyModule left menu',
+		//							'mainmenu'=>'xxx',
+		//							'leftmenu'=>'mymodule',
+		//							'url'=>'/mymodule/pagelevel2.php',
+		//							'langs'=>'mylangfile@mymodule',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+		//							'position'=>100,
+		//							'enabled'=>'$conf->mymodule->enabled',  // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+		//							'perms'=>'1',			                // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
+		//							'target'=>'',
+		//							'user'=>2);				                // 0=Menu for internal users, 1=external users, 2=both
+		// $r++;
+
 
 		// Exports
-		//$r = 0;
+		$r=1;
+
 		// Example:
-		//$this->export_code[$r]=$this->rights_class.'_'.$r;
-		//// Translation key (used only if key ExportDataset_xxx_z not found)
-		//$this->export_label[$r]='CustomersInvoicesAndInvoiceLines';
-		//// Condition to show export in list (ie: '$user->id==3').
-		//// Set to 1 to always show when module is enabled.
-		//$this->export_enabled[$r]='1';
-		//$this->export_permission[$r]=array(array("facture","facture","export"));
-		//$this->export_fields_array[$r]=array(
-		//	's.rowid'=>"IdCompany",
-		//	's.nom'=>'CompanyName',
-		//	's.address'=>'Address',
-		//	's.cp'=>'Zip',
-		//	's.ville'=>'Town',
-		//	's.fk_pays'=>'Country',
-		//	's.tel'=>'Phone',
-		//	's.siren'=>'ProfId1',
-		//	's.siret'=>'ProfId2',
-		//	's.ape'=>'ProfId3',
-		//	's.idprof4'=>'ProfId4',
-		//	's.code_compta'=>'CustomerAccountancyCode',
-		//	's.code_compta_fournisseur'=>'SupplierAccountancyCode',
-		//	'f.rowid'=>"InvoiceId",
-		//	'f.facnumber'=>"InvoiceRef",
-		//	'f.datec'=>"InvoiceDateCreation",
-		//	'f.datef'=>"DateInvoice",
-		//	'f.total'=>"TotalHT",
-		//	'f.total_ttc'=>"TotalTTC",
-		//	'f.tva'=>"TotalVAT",
-		//	'f.paye'=>"InvoicePaid",
-		//	'f.fk_statut'=>'InvoiceStatus',
-		//	'f.note'=>"InvoiceNote",
-		//	'fd.rowid'=>'LineId',
-		//	'fd.description'=>"LineDescription",
-		//	'fd.price'=>"LineUnitPrice",
-		//	'fd.tva_tx'=>"LineVATRate",
-		//	'fd.qty'=>"LineQty",
-		//	'fd.total_ht'=>"LineTotalHT",
-		//	'fd.total_tva'=>"LineTotalTVA",
-		//	'fd.total_ttc'=>"LineTotalTTC",
-		//	'fd.date_start'=>"DateStart",
-		//	'fd.date_end'=>"DateEnd",
-		//	'fd.fk_product'=>'ProductId',
-		//	'p.ref'=>'ProductRef'
-		//);
-		//$this->export_entities_array[$r]=array('s.rowid'=>"company",
-		//	's.nom'=>'company',
-		//	's.address'=>'company',
-		//	's.cp'=>'company',
-		//	's.ville'=>'company',
-		//	's.fk_pays'=>'company',
-		//	's.tel'=>'company',
-		//	's.siren'=>'company',
-		//	's.siret'=>'company',
-		//	's.ape'=>'company',
-		//	's.idprof4'=>'company',
-		//	's.code_compta'=>'company',
-		//	's.code_compta_fournisseur'=>'company',
-		//	'f.rowid'=>"invoice",
-		//	'f.facnumber'=>"invoice",
-		//	'f.datec'=>"invoice",
-		//	'f.datef'=>"invoice",
-		//	'f.total'=>"invoice",
-		//	'f.total_ttc'=>"invoice",
-		//	'f.tva'=>"invoice",
-		//	'f.paye'=>"invoice",
-		//	'f.fk_statut'=>'invoice',
-		//	'f.note'=>"invoice",
-		//	'fd.rowid'=>'invoice_line',
-		//	'fd.description'=>"invoice_line",
-		//	'fd.price'=>"invoice_line",
-		//	'fd.total_ht'=>"invoice_line",
-		//	'fd.total_tva'=>"invoice_line",
-		//	'fd.total_ttc'=>"invoice_line",
-		//	'fd.tva_tx'=>"invoice_line",
-		//	'fd.qty'=>"invoice_line",
-		//	'fd.date_start'=>"invoice_line",
-		//	'fd.date_end'=>"invoice_line",
-		//	'fd.fk_product'=>'product',
-		//	'p.ref'=>'product'
-		//);
-		//$this->export_sql_start[$r] = 'SELECT DISTINCT ';
-		//$this->export_sql_end[$r] = ' FROM (' . MAIN_DB_PREFIX . 'facture as f, '
-		//	. MAIN_DB_PREFIX . 'facturedet as fd, ' . MAIN_DB_PREFIX . 'societe as s)';
-		//$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';
-		//$r++;
+		// $this->export_code[$r]=$this->rights_class.'_'.$r;
+		// $this->export_label[$r]='MyModule';	// Translation key (used only if key ExportDataset_xxx_z not found)
+        // $this->export_enabled[$r]='1';                               // Condition to show export in list (ie: '$user->id==3'). Set to 1 to always show when module is enabled.
+        // $this->export_icon[$r]='generic:MyModule';					// Put here code of icon then string for translation key of module name
+		// $this->export_permission[$r]=array(array("mymodule","level1","level2"));
+		// $this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','s.fk_pays'=>'Country','s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.code_compta'=>'CustomerAccountancyCode','s.code_compta_fournisseur'=>'SupplierAccountancyCode','f.rowid'=>"InvoiceId",'f.facnumber'=>"InvoiceRef",'f.datec'=>"InvoiceDateCreation",'f.datef'=>"DateInvoice",'f.total'=>"TotalHT",'f.total_ttc'=>"TotalTTC",'f.tva'=>"TotalVAT",'f.paye'=>"InvoicePaid",'f.fk_statut'=>'InvoiceStatus','f.note'=>"InvoiceNote",'fd.rowid'=>'LineId','fd.description'=>"LineDescription",'fd.price'=>"LineUnitPrice",'fd.tva_tx'=>"LineVATRate",'fd.qty'=>"LineQty",'fd.total_ht'=>"LineTotalHT",'fd.total_tva'=>"LineTotalTVA",'fd.total_ttc'=>"LineTotalTTC",'fd.date_start'=>"DateStart",'fd.date_end'=>"DateEnd",'fd.fk_product'=>'ProductId','p.ref'=>'ProductRef');
+		// $this->export_TypeFields_array[$r]=array('t.date'=>'Date', 't.qte'=>'Numeric', 't.poids'=>'Numeric', 't.fad'=>'Numeric', 't.paq'=>'Numeric', 't.stockage'=>'Numeric', 't.fadparliv'=>'Numeric', 't.livau100'=>'Numeric', 't.forfait'=>'Numeric', '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.code_compta'=>'Text','s.code_compta_fournisseur'=>'Text','s.tva_intra'=>'Text','f.facnumber'=>"Text",'f.datec'=>"Date",'f.datef'=>"Date",'f.date_lim_reglement'=>"Date",'f.total'=>"Numeric",'f.total_ttc'=>"Numeric",'f.tva'=>"Numeric",'f.paye'=>"Boolean",'f.fk_statut'=>'Status','f.note_private'=>"Text",'f.note_public'=>"Text",'fd.description'=>"Text",'fd.subprice'=>"Numeric",'fd.tva_tx'=>"Numeric",'fd.qty'=>"Numeric",'fd.total_ht'=>"Numeric",'fd.total_tva'=>"Numeric",'fd.total_ttc'=>"Numeric",'fd.date_start'=>"Date",'fd.date_end'=>"Date",'fd.special_code'=>'Numeric','fd.product_type'=>"Numeric",'fd.fk_product'=>'List:product:label','p.ref'=>'Text','p.label'=>'Text','p.accountancy_code_sell'=>'Text');
+		// $this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','s.fk_pays'=>'company','s.phone'=>'company','s.siren'=>'company','s.siret'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.code_compta'=>'company','s.code_compta_fournisseur'=>'company','f.rowid'=>"invoice",'f.facnumber'=>"invoice",'f.datec'=>"invoice",'f.datef'=>"invoice",'f.total'=>"invoice",'f.total_ttc'=>"invoice",'f.tva'=>"invoice",'f.paye'=>"invoice",'f.fk_statut'=>'invoice','f.note'=>"invoice",'fd.rowid'=>'invoice_line','fd.description'=>"invoice_line",'fd.price'=>"invoice_line",'fd.total_ht'=>"invoice_line",'fd.total_tva'=>"invoice_line",'fd.total_ttc'=>"invoice_line",'fd.tva_tx'=>"invoice_line",'fd.qty'=>"invoice_line",'fd.date_start'=>"invoice_line",'fd.date_end'=>"invoice_line",'fd.fk_product'=>'product','p.ref'=>'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
+		// $this->export_sql_start[$r]='SELECT DISTINCT ';
+		// $this->export_sql_end[$r]  =' FROM ('.MAIN_DB_PREFIX.'facture as f, '.MAIN_DB_PREFIX.'facturedet as fd, '.MAIN_DB_PREFIX.'societe as s)';
+		// $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';
+		// $this->export_sql_order[$r] .=' ORDER BY s.nom';
+		// $r++;
 	}
 
 	/**
-	 * Function called when module is enabled.
-	 * The init function add constants, boxes, permissions and menus
-	 * (defined in constructor) into Dolibarr database.
-	 * It also creates data directories
+	 *		Function called when module is enabled.
+	 *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
+	 *		It also creates data directories
 	 *
-	 * @param string $options Options when enabling module ('', 'noboxes')
-	 * @return int 1 if OK, 0 if KO
+     *      @param      string	$options    Options when enabling module ('', 'noboxes')
+	 *      @return     int             	1 if OK, 0 if KO
 	 */
-	public function init($options = '')
+	public function init($options='')
 	{
 		$sql = array();
 
-		$result = $this->loadTables();
+		$this->_load_tables('/mymodule/sql/');
 
 		return $this->_init($sql, $options);
 	}
 
-	/**
-	 * Create tables, keys and data required by module
-	 * Files llx_table1.sql, llx_table1.key.sql llx_data.sql with create table, create keys
-	 * and create data commands must be stored in directory /mymodule/sql/
-	 * This function is called by this->init
-	 *
-	 * @return int <=0 if KO, >0 if OK
-	 */
-	private function loadTables()
-	{
-		return $this->_load_tables('/mymodule/sql/');
-	}
-
 	/**
 	 * Function called when module is disabled.
 	 * Remove from database constants, boxes and permissions from Dolibarr database.
 	 * Data directories are not deleted
 	 *
-	 * @param string $options Options when enabling module ('', 'noboxes')
-	 * @return int 1 if OK, 0 if KO
+	 * @param      string	$options    Options when enabling module ('', 'noboxes')
+	 * @return     int             	1 if OK, 0 if KO
 	 */
 	public function remove($options = '')
 	{
@@ -716,4 +290,5 @@ class modMyModule extends DolibarrModules
 
 		return $this->_remove($sql, $options);
 	}
+
 }
diff --git a/htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_MyTrigger.class.php b/htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_Triggers.class.php
similarity index 91%
rename from htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_MyTrigger.class.php
rename to htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_Triggers.class.php
index 761a717d944..56f00ab8b02 100644
--- a/htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_MyTrigger.class.php
+++ b/htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_Triggers.class.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * \file    core/triggers/interface_99_modMyModule_MyTrigger.class.php
+ * \file    core/triggers/interface_99_modMyModule_Triggers.class.php
  * \ingroup mymodule
  * \brief   Example trigger.
  *
@@ -30,17 +30,16 @@
  * - The file must stay in core/triggers
  * - The class name must be InterfaceMytrigger
  * - The constructor method must be named InterfaceMytrigger
- * - The name property name must be Mytrigger
+ * - The name property name must be MyTrigger
  */
 
-/** Includes */
-require_once DOL_DOCUMENT_ROOT . '/core/lib/admin.lib.php';
-require_once DOL_DOCUMENT_ROOT . dol_buildpath('/mymodule/class/MyTrigger.php', 1);
+require_once DOL_DOCUMENT_ROOT.'/core/triggers/dolibarrtriggers.class.php';
+
 
 /**
- * Class InterfaceMytrigger
+ *  Class of triggers for MyModule module
  */
-class InterfaceMytrigger extends MyTrigger
+class InterfaceMyModuleTrigger extends DolibarrTriggers
 {
 	/**
 	 * @var DoliDB Database handler
@@ -58,9 +57,7 @@ class InterfaceMytrigger extends MyTrigger
 
 		$this->name = preg_replace('/^Interface/i', '', get_class($this));
 		$this->family = "demo";
-		$this->description = "Triggers of this module are empty functions."
-			. "They have no effect."
-			. "They are provided for tutorial purpose only.";
+		$this->description = "MyModule triggers.";
 		// 'development', 'experimental', 'dolibarr' or version
 		$this->version = 'development';
 		$this->picto = 'mymodule@mymodule';
@@ -86,58 +83,18 @@ class InterfaceMytrigger extends MyTrigger
 		return $this->description;
 	}
 
-	/**
-	 * Trigger version
-	 *
-	 * @return string Version of trigger file
-	 */
-	public function getVersion()
-	{
-		global $langs;
-		$langs->load("admin");
-
-		if ($this->version == 'development') {
-			return $langs->trans("Development");
-		} elseif ($this->version == 'experimental') {
-			return $langs->trans("Experimental");
-		} elseif ($this->version == 'dolibarr') {
-			return DOL_VERSION;
-		} elseif ($this->version) {
-			return $this->version;
-		} else {
-			return $langs->trans("Unknown");
-		}
-	}
-
-    // @codingStandardsIgnoreStart
-	/**
-	 * Compatibility trigger function for Dolibarr < 3.7
-	 *
-	 * @param int $action Trigger action
-	 * @param CommonObject $object Object trigged from
-	 * @param User $user User that trigged
-	 * @param Translate $langs Translations handler
-	 * @param Conf $conf Configuration
-	 * @return int                  <0 if KO, 0 if no triggered ran, >0 if OK
-	 * @deprecated Replaced by DolibarrTriggers::runTrigger()
-	 */
-	public function run_trigger($action, $object, $user, $langs, $conf)
-	{
-		return $this->runTrigger($action, $object, $user, $langs, $conf);
-	}
-	// @codingStandardsIgnoreEnd
 
 	/**
 	 * Function called when a Dolibarrr business event is done.
 	 * All functions "runTrigger" are triggered if file
 	 * is inside directory core/triggers
 	 *
-	 * @param string $action Event action code
-	 * @param CommonObject $object Object
-	 * @param User $user Object user
-	 * @param Translate $langs Object langs
-	 * @param Conf $conf Object conf
-	 * @return int              <0 if KO, 0 if no triggered ran, >0 if OK
+	 * @param string 		$action 	Event action code
+	 * @param CommonObject 	$object 	Object
+	 * @param User 			$user 		Object user
+	 * @param Translate 	$langs 		Object langs
+	 * @param Conf 			$conf 		Object conf
+	 * @return int              		<0 if KO, 0 if no triggered ran, >0 if OK
 	 */
 	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
 	{
diff --git a/htdocs/modulebuilder/template/img/object_mymodule.png b/htdocs/modulebuilder/template/img/myobject_mymodule.png
similarity index 100%
rename from htdocs/modulebuilder/template/img/object_mymodule.png
rename to htdocs/modulebuilder/template/img/myobject_mymodule.png
diff --git a/htdocs/modulebuilder/template/js/mymodule.js.php b/htdocs/modulebuilder/template/js/mymodule.js.php
index ae8ce6cbe0d..a08ae02c2fc 100644
--- a/htdocs/modulebuilder/template/js/mymodule.js.php
+++ b/htdocs/modulebuilder/template/js/mymodule.js.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * \file    js/mymodule.js.php
+ * \file    htdocs/modulebuilder/template/js/mymodule.js.php
  * \ingroup mymodule
  * \brief   Example JavaScript.
  *
diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php
index a257149c72a..6db376ff9b1 100644
--- a/htdocs/modulebuilder/template/myobject_card.php
+++ b/htdocs/modulebuilder/template/myobject_card.php
@@ -1,10 +1,10 @@
 <?php
-/* <one line to give the program's name and a brief idea of what it does.>
- * Copyright (C) <year>  <name of author>
+/* Copyright (C) 2007-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) ---Put here your own copyright and developer email---
  *
- * This program is free software: you can redistribute it and/or modify
+ * 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
+ * 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,
@@ -13,21 +13,20 @@
  * 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/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
- * \file    myobject_list.php
- * \ingroup mymodule
- * \brief   Page with list of myobject.
- *
- * List of myobject
+ *   	\file       htdocs/modulebuilder/template/myobject_card.php
+ *		\ingroup    mymodule othermodule1 othermodule2
+ *		\brief      This file is an example of a php page
+ *					Put here some comments
  */
 
-//if (! defined('NOREQUIREUSER'))	define('NOREQUIREUSER','1');
-//if (! defined('NOREQUIREDB'))		define('NOREQUIREDB','1');
-//if (! defined('NOREQUIRESOC'))	define('NOREQUIRESOC','1');
-//if (! defined('NOREQUIRETRAN'))	define('NOREQUIRETRAN','1');
+//if (! defined('NOREQUIREUSER'))  define('NOREQUIREUSER','1');
+//if (! defined('NOREQUIREDB'))    define('NOREQUIREDB','1');
+//if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
+//if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
 //if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK','1');			// Do not check anti CSRF attack test
 //if (! defined('NOSTYLECHECK'))   define('NOSTYLECHECK','1');			// Do not check style html tag into posted data
 //if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1');		// Do not check anti POST attack test
@@ -36,28 +35,31 @@
 //if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
 //if (! defined("NOLOGIN"))        define("NOLOGIN",'1');				// If this page is public (can be called outside logged session)
 
-// Change the following lines to use the correct relative path (../, ../../, etc)
+// Change this following line to use the correct relative path (../, ../../, etc)
+$res=0;
+if (! $res && file_exists("../main.inc.php")) $res=@include '../main.inc.php';					// to work if your module directory is into dolibarr root htdocs directory
+if (! $res && file_exists("../../main.inc.php")) $res=@include '../../main.inc.php';			// to work if your module directory is into a subdir of root htdocs directory
+if (! $res && file_exists("../../../dolibarr/htdocs/main.inc.php")) $res=@include '../../../dolibarr/htdocs/main.inc.php';     // Used on dev env only
+if (! $res && file_exists("../../../../dolibarr/htdocs/main.inc.php")) $res=@include '../../../../dolibarr/htdocs/main.inc.php';   // Used on dev env only
+if (! $res) die("Include of main fails");
+// Change this following line to use the correct relative path from htdocs
+include_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php');
+dol_include_once('/mymodule/class/myobject_class.class.php');
 
-// Load Dolibarr environment
-if (false === (@include '../../main.inc.php')) {  // From htdocs directory
-	require '../../../main.inc.php'; // From "custom" directory
-}
-
-require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-dol_include_once('/mymodule/class/myclass.class.php');
-
-// Load translation files required by the page
-$langs->load("mymodule@mymodule");
+// Load traductions files requiredby by page
+$langs->load("mymodule");
+$langs->load("other");
 
 // Get parameters
-$action     = GETPOST('action','alpha');
-$confirm    = GETPOST('confirm','alpha');
-
 $id			= GETPOST('id','int');
+$action		= GETPOST('action','alpha');
+$cancel     = GETPOST('cancel');
 $backtopage = GETPOST('backtopage');
-// TODO Add here list of search params
 $myparam	= GETPOST('myparam','alpha');
 
+$search_field1=GETPOST("search_field1");
+$search_field2=GETPOST("search_field2");
+
 if (empty($action) && empty($id) && empty($ref)) $action='view';
 
 // Protection if external user
@@ -67,7 +69,8 @@ if ($user->societe_id > 0)
 }
 //$result = restrictedArea($user, 'mymodule', $id);
 
-$object = new Skeleton_Class($db);
+
+$object = new MyObject_Class($db);
 $extrafields = new ExtraFields($db);
 
 // fetch optionals attributes and labels
@@ -77,7 +80,8 @@ $extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php';  // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
 
 // Initialize technical object to manage hooks of modules. Note that conf->hooks_modules contains array array
-$hookmanager->initHooks(array('skeleton'));
+$hookmanager->initHooks(array('mymodule'));
+
 
 
 /*
@@ -86,7 +90,6 @@ $hookmanager->initHooks(array('skeleton'));
  * Put here all code to do according to value of "action" parameter
  */
 
-
 $parameters=array();
 $reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
@@ -206,15 +209,16 @@ if (empty($reshook))
 
 
 
+
 /*
  * VIEW
  *
  * Put here all code to build page
  */
 
-$form = new Form($db);
+$form=new Form($db);
 
-llxHeader('', $langs->trans('MyPageName'), '');
+llxHeader('','MyPageName','');
 
 
 // Put here content of your page
@@ -293,54 +297,308 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 {
     $res = $object->fetch_optionals($object->id, $extralabels);
 
-	$head = commande_prepare_head($object);
-	dol_fiche_head($head, 'order', $langs->trans("CustomerOrder"), 0, 'order');
+	$head = mymodule_prepare_head($object);
+	dol_fiche_head($head, 'order', $langs->trans("CustomerOrder"), -1, 'order');
 		
-	print load_fiche_titre($langs->trans("MyModule"));
-    
-	dol_fiche_head();
-
+	$formconfirm = '';
+	
+	// Confirmation to delete
 	if ($action == 'delete') {
-		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('DeleteMyOjbect'), $langs->trans('ConfirmDeleteMyObject'), 'confirm_delete', '', 0, 1);
-		print $formconfirm;
+	    $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('DeleteOrder'), $langs->trans('ConfirmDeleteOrder'), 'confirm_delete', '', 0, 1);
 	}
 	
+	// Confirmation of action xxxx
+	if ($action == 'xxx')
+	{
+	    $formquestion=array();
+	    /*
+	        $formquestion = array(
+	            // 'text' => $langs->trans("ConfirmClone"),
+	            // array('type' => 'checkbox', 'name' => 'clone_content', 'label' => $langs->trans("CloneMainAttributes"), 'value' => 1),
+	            // array('type' => 'checkbox', 'name' => 'update_prices', 'label' => $langs->trans("PuttingPricesUpToDate"), 'value' => 1),
+	            // array('type' => 'other',    'name' => 'idwarehouse',   'label' => $langs->trans("SelectWarehouseForStockDecrease"), 'value' => $formproduct->selectWarehouses(GETPOST('idwarehouse')?GETPOST('idwarehouse'):'ifone', 'idwarehouse', '', 1)));
+	    }*/	
+	    $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('XXX'), $text, 'confirm_xxx', $formquestion, 0, 1, 220);
+	}
+	
+	if (! $formconfirm) {
+	    $parameters = array('lineid' => $lineid);
+	    $reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+	    if (empty($reshook)) $formconfirm.=$hookmanager->resPrint;
+	    elseif ($reshook > 0) $formconfirm=$hookmanager->resPrint;
+	}
+	
+	// Print form confirm
+	print $formconfirm;
+	
+	
+	
+	// Object card
+	// ------------------------------------------------------------
+	
+	$linkback = '<a href="' . DOL_URL_ROOT . '/mymodule/list.php' . (! empty($socid) ? '?socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
+	
+	
+	$morehtmlref='<div class="refidno">';
+	/*
+	// Ref bis
+	$morehtmlref.=$form->editfieldkey("RefBis", 'ref_client', $object->ref_client, $object, $user->rights->mymodule->creer, 'string', '', 0, 1);
+	$morehtmlref.=$form->editfieldval("RefBis", 'ref_client', $object->ref_client, $object, $user->rights->mymodule->creer, 'string', '', null, null, '', 1);
+	// Thirdparty
+	$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $soc->getNomUrl(1);
+	// Project
+	if (! empty($conf->projet->enabled))
+	{
+	    $langs->load("projects");
+	    $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
+	    if ($user->rights->mymodule->creer)
+	    {
+	        if ($action != 'classify')
+	        {
+	            $morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+	            if ($action == 'classify') {
+	                //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+	                $morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+	                $morehtmlref.='<input type="hidden" name="action" value="classin">';
+	                $morehtmlref.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+	                $morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+	                $morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+	                $morehtmlref.='</form>';
+	            } else {
+	                $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+	            }
+	        }
+	    } else {
+	        if (! empty($object->fk_project)) {
+	            $proj = new Project($db);
+	            $proj->fetch($object->fk_project);
+	            $morehtmlref.='<a href="'.DOL_URL_ROOT.'/projet/card.php?id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
+	            $morehtmlref.=$proj->ref;
+	            $morehtmlref.='</a>';
+	        } else {
+	            $morehtmlref.='';
+	        }
+	    }
+	}
+	*/
+	$morehtmlref.='</div>';
+	
+	
+	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+	
+	
+	print '<div class="fichecenter">';
+	print '<div class="fichehalfleft">';
+	print '<div class="underbanner clearboth"></div>';
 	print '<table class="border centpercent">'."\n";
 	// print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td>'.$object->label.'</td></tr>';
 	// LIST_OF_TD_LABEL_FIELDS_VIEW
+
+
+	// Other attributes
+	$cols = 2;
+	include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
+
 	print '</table>';
+	print '</div>';
+	print '<div class="fichehalfright">';
+	print '<div class="ficheaddleft">';
+	print '<div class="underbanner clearboth"></div>';
+	print '<table class="border centpercent">';
+	
+	
+
+	print '</table>';
+	print '</div>';
+	print '</div>';
+	print '</div>';
+	
+	print '<div class="clearboth"></div><br>';
 	
 	dol_fiche_end();
 
 
-	// Buttons
-	print '<div class="tabsAction">'."\n";
-	$parameters=array();
-	$reshook=$hookmanager->executeHooks('addMoreActionsButtons',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-
-	if (empty($reshook))
-	{
-		if ($user->rights->mymodule->write)
-		{
-			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a></div>'."\n";
-		}
-
-		if ($user->rights->mymodule->delete)
-		{
-			print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete">'.$langs->trans('Delete').'</a></div>'."\n";
-		}
+	// Buttons for actions
+	if ($action != 'presend' && $action != 'editline') {
+    	print '<div class="tabsAction">'."\n";
+    	$parameters=array();
+    	$reshook=$hookmanager->executeHooks('addMoreActionsButtons',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+    	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+    
+    	if (empty($reshook))
+    	{
+    		if ($user->rights->mymodule->write)
+    		{
+    			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a></div>'."\n";
+    		}
+    
+    		if ($user->rights->mymodule->delete)
+    		{
+    			print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete">'.$langs->trans('Delete').'</a></div>'."\n";
+    		}
+    	}
+    	print '</div>'."\n";
 	}
-	print '</div>'."\n";
 
+	
+	// Select mail models is same action as presend
+	if (GETPOST('modelselected')) {
+	    $action = 'presend';
+	}
+	
+	if ($action != 'presend')
+	{
+	    print '<div class="fichecenter"><div class="fichehalfleft">';
+	    print '<a name="builddoc"></a>'; // ancre
+	    // Documents
+	    $comref = dol_sanitizeFileName($object->ref);
+	    $relativepath = $comref . '/' . $comref . '.pdf';
+	    $filedir = $conf->mymodule->dir_output . '/' . $comref;
+	    $urlsource = $_SERVER["PHP_SELF"] . "?id=" . $object->id;
+	    $genallowed = $user->rights->mymodule->creer;
+	    $delallowed = $user->rights->mymodule->supprimer;
+	    print $formfile->showdocuments('mymodule', $comref, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', '', '', $soc->default_lang);
+	
+	
+	    // Show links to link elements
+	    $linktoelem = $form->showLinkToObjectBlock($object, null, array('order'));
+	    $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
+	
+	
+	    print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+	
+	    // List of actions on element
+	    include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
+	    $formactions = new FormActions($db);
+	    $somethingshown = $formactions->showactions($object, 'order', $socid);
+	
+	    print '</div></div></div>';
+	}
+	
 
-	// Example 2 : Adding links to objects
-	// Show links to link elements
-	//$linktoelem = $form->showLinkToObjectBlock($object, null, array('skeleton'));
-	//$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
+	/*
+	 * Action presend
+	 */
+    /*
+	if ($action == 'presend')
+	{
+		$object->fetch_projet();
 
+		$ref = dol_sanitizeFileName($object->ref);
+		include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
+		$fileparams = dol_most_recent_file($conf->commande->dir_output . '/' . $ref, preg_quote($ref, '/').'[^\-]+');
+		$file = $fileparams['fullname'];
+
+		// Define output language
+		$outputlangs = $langs;
+		$newlang = '';
+		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id']))
+			$newlang = $_REQUEST['lang_id'];
+		if ($conf->global->MAIN_MULTILANGS && empty($newlang))
+			$newlang = $object->thirdparty->default_lang;
+
+		if (!empty($newlang))
+		{
+			$outputlangs = new Translate('', $conf);
+			$outputlangs->setDefaultLang($newlang);
+			$outputlangs->load('commercial');
+		}
+
+		// Build document if it not exists
+		if (! $file || ! is_readable($file)) {
+			$result = $object->generateDocument(GETPOST('model') ? GETPOST('model') : $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+			if ($result <= 0) {
+				dol_print_error($db, $object->error, $object->errors);
+				exit();
+			}
+			$fileparams = dol_most_recent_file($conf->commande->dir_output . '/' . $ref, preg_quote($ref, '/').'[^\-]+');
+			$file = $fileparams['fullname'];
+		}
+
+		print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>';
+		print '<div class="clearboth"></div>';
+		print '<br>';
+		print load_fiche_titre($langs->trans('SendOrderByMail'));
+
+		dol_fiche_head('');
+
+		// Cree l'objet formulaire mail
+		include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
+		$formmail = new FormMail($db);
+		$formmail->param['langsmodels']=(empty($newlang)?$langs->defaultlang:$newlang);
+        $formmail->fromtype = (GETPOST('fromtype')?GETPOST('fromtype'):(!empty($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE)?$conf->global->MAIN_MAIL_DEFAULT_FROMTYPE:'user'));
+
+        if($formmail->fromtype === 'user'){
+            $formmail->fromid = $user->id;
+
+        }
+		$formmail->trackid='ord'.$object->id;
+		if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2))	// If bit 2 is set
+		{
+			include DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+			$formmail->frommail=dolAddEmailTrackId($formmail->frommail, 'ord'.$object->id);
+		}
+		$formmail->withfrom = 1;
+		$liste = array();
+		foreach ($object->thirdparty->thirdparty_and_contact_email_array(1) as $key => $value)
+			$liste [$key] = $value;
+		$formmail->withto = GETPOST('sendto') ? GETPOST('sendto') : $liste;
+		$formmail->withtocc = $liste;
+		$formmail->withtoccc = $conf->global->MAIN_EMAIL_USECCC;
+		if (empty($object->ref_client)) {
+			$formmail->withtopic = $outputlangs->trans('SendOrderRef', '__ORDERREF__');
+		} else if (! empty($object->ref_client)) {
+			$formmail->withtopic = $outputlangs->trans('SendOrderRef', '__ORDERREF__ (__REFCLIENT__)');
+		}
+		$formmail->withfile = 2;
+		$formmail->withbody = 1;
+		$formmail->withdeliveryreceipt = 1;
+		$formmail->withcancel = 1;
+		// Tableau des substitutions
+		$formmail->setSubstitFromObject($object);
+		$formmail->substit ['__ORDERREF__'] = $object->ref;
+
+		$custcontact = '';
+		$contactarr = array();
+		$contactarr = $object->liste_contact(- 1, 'external');
+
+		if (is_array($contactarr) && count($contactarr) > 0)
+		{
+			foreach ($contactarr as $contact)
+			{
+				if ($contact['libelle'] == $langs->trans('TypeContact_commande_external_CUSTOMER')) {	// TODO Use code and not label
+					$contactstatic = new Contact($db);
+					$contactstatic->fetch($contact ['id']);
+					$custcontact = $contactstatic->getFullName($langs, 1);
+				}
+			}
+
+			if (! empty($custcontact)) {
+				$formmail->substit['__CONTACTCIVNAME__'] = $custcontact;
+			}
+		}
+
+		// Tableau des parametres complementaires
+		$formmail->param['action'] = 'send';
+		$formmail->param['models'] = 'order_send';
+		$formmail->param['models_id']=GETPOST('modelmailselected','int');
+		$formmail->param['orderid'] = $object->id;
+		$formmail->param['returnurl'] = $_SERVER["PHP_SELF"] . '?id=' . $object->id;
+
+		// Init list of files
+		if (GETPOST("mode") == 'init') {
+			$formmail->clear_attached_files();
+			$formmail->add_attached_files($file, basename($file), dol_mimetype($file));
+		}
+
+		// Show form
+		print $formmail->get_form();
+
+		dol_fiche_end();
+	}*/
 }
 
+
 // End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index c249f165242..ad105480901 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -1,10 +1,10 @@
 <?php
-/* <one line to give the program's name and a brief idea of what it does.>
- * Copyright (C) <year>  <name of author>
+/* Copyright (C) 2007-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) ---Put here your own copyright and developer email---
  *
- * This program is free software: you can redistribute it and/or modify
+ * 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
+ * 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,
@@ -13,21 +13,20 @@
  * 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/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
- * \file    myobject_list.php
- * \ingroup mymodule
- * \brief   Page with list of myobject.
- *
- * List of myobject
+ *   	\file       htdocs/modulebuilder/template/myobject_list.php
+ *		\ingroup    mymodule othermodule1 othermodule2
+ *		\brief      This file is an example of a php page
+ *					Put here some comments
  */
 
-//if (! defined('NOREQUIREUSER'))	define('NOREQUIREUSER','1');
-//if (! defined('NOREQUIREDB'))		define('NOREQUIREDB','1');
-//if (! defined('NOREQUIRESOC'))	define('NOREQUIRESOC','1');
-//if (! defined('NOREQUIRETRAN'))	define('NOREQUIRETRAN','1');
+//if (! defined('NOREQUIREUSER'))  define('NOREQUIREUSER','1');
+//if (! defined('NOREQUIREDB'))    define('NOREQUIREDB','1');
+//if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
+//if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
 //if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK','1');			// Do not check anti CSRF attack test
 //if (! defined('NOSTYLECHECK'))   define('NOSTYLECHECK','1');			// Do not check style html tag into posted data
 //if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1');		// Do not check anti POST attack test
@@ -36,31 +35,39 @@
 //if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
 //if (! defined("NOLOGIN"))        define("NOLOGIN",'1');				// If this page is public (can be called outside logged session)
 
-// Change the following lines to use the correct relative path (../, ../../, etc)
-
-// Load Dolibarr environment
-if (false === (@include '../../main.inc.php')) {  // From htdocs directory
-	require '../../../main.inc.php'; // From "custom" directory
-}
-
+// Change this following line to use the correct relative path (../, ../../, etc)
+$res=0;
+if (! $res && file_exists("../main.inc.php")) $res=@include '../main.inc.php';					// to work if your module directory is into dolibarr root htdocs directory
+if (! $res && file_exists("../../main.inc.php")) $res=@include '../../main.inc.php';			// to work if your module directory is into a subdir of root htdocs directory
+if (! $res && file_exists("../../../dolibarr/htdocs/main.inc.php")) $res=@include '../../../dolibarr/htdocs/main.inc.php';     // Used on dev env only
+if (! $res && file_exists("../../../../dolibarr/htdocs/main.inc.php")) $res=@include '../../../../dolibarr/htdocs/main.inc.php';   // Used on dev env only
+if (! $res) die("Include of main fails");
+// Change this following line to use the correct relative path from htdocs
+require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php');
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-dol_include_once('/mymodule/class/myclass.class.php');
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+dol_include_once('/mymodule/class/skeleton_class.class.php');
 
-// Load translation files required by the page
-$langs->load("mymodule@mymodule");
+// Load traductions files requiredby by page
+$langs->load("mymodule");
+$langs->load("other");
 
-// Get parameters
-$action     = GETPOST('action','alpha');
-$massaction = GETPOST('massaction','alpha');
-$show_files = GETPOST('show_files','int');
-$confirm    = GETPOST('confirm','alpha');
-$toselect   = GETPOST('toselect', 'array');
+$action=GETPOST('action','alpha');
+$massaction=GETPOST('massaction','alpha');
+$show_files=GETPOST('show_files','int');
+$confirm=GETPOST('confirm','alpha');
+$toselect = GETPOST('toselect', 'array');
 
 $id			= GETPOST('id','int');
 $backtopage = GETPOST('backtopage');
-// TODO Add here list of search params
 $myparam	= GETPOST('myparam','alpha');
 
+$search_all=trim(GETPOST("sall"));
+$search_field1=GETPOST("search_field1");
+$search_field2=GETPOST("search_field2");
+$search_myfield=GETPOST('search_myfield');
+$optioncss = GETPOST('optioncss','alpha');
+
 // Load variable for pagination
 $limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
 $sortfield = GETPOST('sortfield','alpha');
@@ -74,11 +81,12 @@ if (! $sortfield) $sortfield="t.rowid"; // Set here default search field
 if (! $sortorder) $sortorder="ASC";
 
 // Protection if external user
+$socid=0;
 if ($user->societe_id > 0)
 {
+    $socid = $user->societe_id;
 	//accessforbidden();
 }
-//$result = restrictedArea($user, 'mymodule', $id);
 
 // Initialize technical object to manage context to save list fields
 $contextpage=GETPOST('contextpage','aZ')?GETPOST('contextpage','aZ'):'mymodulelist';
@@ -87,14 +95,41 @@ $contextpage=GETPOST('contextpage','aZ')?GETPOST('contextpage','aZ'):'mymoduleli
 $hookmanager->initHooks(array('mymodulelist'));
 $extrafields = new ExtraFields($db);
 
-// Load object if id or ref is provided as parameter
-$object = new MyClass($db);
-if (($id > 0 || ! empty($ref)) && $action != 'add') {
-	$result = $object->fetch($id, $ref);
-	if ($result < 0) dol_print_error($db);
+// fetch optionals attributes and labels
+$extralabels = $extrafields->fetch_name_optionals_label('mymodule');
+$search_array_options=$extrafields->getOptionalsFromPost($extralabels,'','search_');
+
+// List of fields to search into when doing a "search in all"
+$fieldstosearchall = array(
+    't.ref'=>'Ref',
+    't.note_public'=>'NotePublic',
+);
+if (empty($user->socid)) $fieldstosearchall["t.note_private"]="NotePrivate";
+
+// Definition of fields for list
+$arrayfields=array(
+    't.field1'=>array('label'=>"Field1", 'checked'=>1),
+    't.field2'=>array('label'=>"Field2", 'checked'=>1),
+    //'t.entity'=>array('label'=>"Entity", 'checked'=>1, 'enabled'=>(! empty($conf->multicompany->enabled) && empty($conf->multicompany->transverse_mode))),
+    't.datec'=>array('label'=>"DateCreationShort", 'checked'=>0, 'position'=>500),
+    't.tms'=>array('label'=>"DateModificationShort", 'checked'=>0, 'position'=>500),
+    //'t.statut'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000),
+);
+// Extra fields
+if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
+{
+    foreach($extrafields->attribute_label as $key => $val)
+    {
+        $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>$extrafields->attribute_list[$key], 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
+    }
 }
 
 
+$object=new Skeleton_Class($db);
+
+
+
+
 /*
  * ACTIONS
  *
@@ -116,10 +151,10 @@ if (empty($reshook))
     // Purge search criteria
     if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") ||GETPOST("button_removefilter")) // All tests are required to be compatible with all browsers
     {
-        $search_field1='';
-        $search_field2='';
-        $search_date_creation='';
-        $search_date_update='';
+    	$search_field1='';
+    	$search_field2='';
+    	$search_date_creation='';
+    	$search_date_update='';
         $toselect='';
         $search_array_options=array();
     }
@@ -134,18 +169,24 @@ if (empty($reshook))
 }
 
 
+
 /*
  * VIEW
  *
  * Put here all code to build page
  */
 
-llxHeader('', $langs->trans('MyPageName'), '');
+$now=dol_now();
 
-$form = new Form($db);
+$form=new Form($db);
+
+//$help_url="EN:Module_Customers_Orders|FR:Module_Commandes_Clients|ES:Módulo_Pedidos_de_clientes";
+$help_url='';
+$title = $langs->trans('MyModuleListTitle');
 
 // Put here content of your page
-// Example 1: Adding jquery code
+
+// Example : Adding jquery code
 print '<script type="text/javascript" language="javascript">
 jQuery(document).ready(function() {
 	function init_myfunc()
@@ -161,15 +202,368 @@ jQuery(document).ready(function() {
 </script>';
 
 
+$sql = "SELECT";
+$sql.= " t.rowid,";
+$sql.= " t.field1,";
+$sql.= " t.field2";
+// Add fields from extrafields
+foreach ($extrafields->attribute_label as $key => $val) $sql.=($extrafields->attribute_type[$key] != 'separate' ? ",ef.".$key.' as options_'.$key : '');
+// Add fields from hooks
+$parameters=array();
+$reshook=$hookmanager->executeHooks('printFieldListSelect',$parameters);    // Note that $action and $object may have been modified by hook
+$sql.=$hookmanager->resPrint;
+$sql.= " FROM ".MAIN_DB_PREFIX."mytable as t";
+if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."mytable_extrafields as ef on (t.rowid = ef.fk_object)";
+$sql.= " WHERE 1 = 1";
+//$sql.= " WHERE u.entity IN (".getEntity('mytable',1).")";
+if ($search_field1) $sql.= natural_search("field1",$search_field1);
+if ($search_field2) $sql.= natural_search("field2",$search_field2);
+if ($sall)          $sql.= natural_search(array_keys($fieldstosearchall), $sall);
+// Add where from extra fields
+foreach ($search_array_options as $key => $val)
+{
+    $crit=$val;
+    $tmpkey=preg_replace('/search_options_/','',$key);
+    $typ=$extrafields->attribute_type[$tmpkey];
+    $mode=0;
+    if (in_array($typ, array('int','double'))) $mode=1;    // Search on a numeric
+    if ($val && ( ($crit != '' && ! in_array($typ, array('select'))) || ! empty($crit))) 
+    {
+        $sql .= natural_search('ef.'.$tmpkey, $crit, $mode);
+    }
+}
+// Add where from hooks
+$parameters=array();
+$reshook=$hookmanager->executeHooks('printFieldListWhere',$parameters);    // Note that $action and $object may have been modified by hook
+$sql.=$hookmanager->resPrint;
+$sql.=$db->order($sortfield,$sortorder);
 
-// TODO
+// Count total nb of records
+$nbtotalofrecords = '';
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
+{
+	$result = $db->query($sql);
+	$nbtotalofrecords = $db->num_rows($result);
+}	
+
+$sql.= $db->plimit($limit+1, $offset);
+
+dol_syslog($script_file, LOG_DEBUG);
+$resql=$db->query($sql);
+if (! $resql)
+{
+    dol_print_error($db);
+    exit;
+}
+
+$num = $db->num_rows($resql);
+
+// Direct jump if only one record found
+if ($num == 1 && ! empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all)
+{
+    $obj = $db->fetch_object($resql);
+    $id = $obj->rowid;
+    header("Location: ".DOL_URL_ROOT.'/skeleton/card.php?id='.$id);
+    exit;
+}
+
+llxHeader('', $title, $help_url);
+
+$arrayofselected=is_array($toselect)?$toselect:array();
+
+$param='';
+if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
+if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
+if ($search_field1 != '') $param.= '&amp;search_field1='.urlencode($search_field1);
+if ($search_field2 != '') $param.= '&amp;search_field2='.urlencode($search_field2);
+if ($optioncss != '') $param.='&optioncss='.$optioncss;
+// Add $param from extra fields
+foreach ($search_array_options as $key => $val)
+{
+    $crit=$val;
+    $tmpkey=preg_replace('/search_options_/','',$key);
+    if ($val != '') $param.='&search_options_'.$tmpkey.'='.urlencode($val);
+} 
+
+$arrayofmassactions =  array(
+    'presend'=>$langs->trans("SendByMail"),
+    'builddoc'=>$langs->trans("PDFMerge"),
+);
+if ($user->rights->mymodule->supprimer) $arrayofmassactions['delete']=$langs->trans("Delete");
+if ($massaction == 'presend') $arrayofmassactions=array();
+$massactionbutton=$form->selectMassAction('', $arrayofmassactions);
+
+print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
+if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+print '<input type="hidden" name="action" value="list">';
+print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+print '<input type="hidden" name="page" value="'.$page.'">';
+print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
+
+print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_companies', 0, '', '', $limit);
+
+if ($sall)
+{
+    foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
+    print $langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall);
+}
+
+$moreforfilter = '';
+$moreforfilter.='<div class="divsearchfield">';
+$moreforfilter.= $langs->trans('MyFilter') . ': <input type="text" name="search_myfield" value="'.dol_escape_htmltag($search_myfield).'">';
+$moreforfilter.= '</div>';
+
+$parameters=array();
+$reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters);    // Note that $action and $object may have been modified by hook
+if (empty($reshook)) $moreforfilter .= $hookmanager->resPrint;
+else $moreforfilter = $hookmanager->resPrint;
+
+if (! empty($moreforfilter))
+{
+	print '<div class="liste_titre liste_titre_bydiv centpercent">';
+	print $moreforfilter;
+    print '</div>';
+}
+
+$varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
+$selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
+
+print '<div class="div-table-responsive">';
+print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
+
+// Fields title
+print '<tr class="liste_titre">';
+// LIST_OF_TD_TITLE_FIELDS
+//if (! empty($arrayfields['t.field1']['checked'])) print_liste_field_titre($arrayfields['t.field1']['label'],$_SERVER['PHP_SELF'],'t.field1','',$param,'',$sortfield,$sortorder);
+//if (! empty($arrayfields['t.field2']['checked'])) print_liste_field_titre($arrayfields['t.field2']['label'],$_SERVER['PHP_SELF'],'t.field2','',$param,'',$sortfield,$sortorder);
+// Extra fields
+if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
+{
+   foreach($extrafields->attribute_label as $key => $val) 
+   {
+       if (! empty($arrayfields["ef.".$key]['checked'])) 
+       {
+			$align=$extrafields->getAlignFlag($key);
+			$sortonfield = "ef.".$key;
+			if (! empty($extrafields->attribute_computed[$key])) $sortonfield='';
+			print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],$sortonfield,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+       }
+   }
+}
+// Hook fields
+$parameters=array('arrayfields'=>$arrayfields);
+$reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+if (! empty($arrayfields['t.datec']['checked']))  print_liste_field_titre($arrayfields['t.datec']['label'],$_SERVER["PHP_SELF"],"t.datec","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
+if (! empty($arrayfields['t.tms']['checked']))    print_liste_field_titre($arrayfields['t.tms']['label'],$_SERVER["PHP_SELF"],"t.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
+//if (! empty($arrayfields['t.status']['checked'])) print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"t.status","",$param,'align="center"',$sortfield,$sortorder);
+print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'maxwidthsearch ');
+print '</tr>'."\n";
+
+// Fields title search
+print '<tr class="liste_titre">';
+// LIST_OF_TD_TITLE_SEARCH
+//if (! empty($arrayfields['t.field1']['checked'])) print '<td class="liste_titre"><input type="text" class="flat" name="search_field1" value="'.$search_field1.'" size="10"></td>';
+//if (! empty($arrayfields['t.field2']['checked'])) print '<td class="liste_titre"><input type="text" class="flat" name="search_field2" value="'.$search_field2.'" size="10"></td>';
+// Extra fields
+if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
+{
+    foreach($extrafields->attribute_label as $key => $val) 
+    {
+        if (! empty($arrayfields["ef.".$key]['checked']))
+        {
+            $align=$extrafields->getAlignFlag($key);
+            $typeofextrafield=$extrafields->attribute_type[$key];
+            print '<td class="liste_titre'.($align?' '.$align:'').'">';
+        	if (in_array($typeofextrafield, array('varchar', 'int', 'double', 'select')) && empty($extrafields->attribute_computed[$key]))
+			{
+			    $crit=$val;
+				$tmpkey=preg_replace('/search_options_/','',$key);
+				$searchclass='';
+				if (in_array($typeofextrafield, array('varchar', 'select'))) $searchclass='searchstring';
+				if (in_array($typeofextrafield, array('int', 'double'))) $searchclass='searchnum';
+				print '<input class="flat'.($searchclass?' '.$searchclass:'').'" size="4" type="text" name="search_options_'.$tmpkey.'" value="'.dol_escape_htmltag($search_array_options['search_options_'.$tmpkey]).'">';
+			}
+            print '</td>';
+        }
+    }
+}
+// Fields from hook
+$parameters=array('arrayfields'=>$arrayfields);
+$reshook=$hookmanager->executeHooks('printFieldListOption',$parameters);    // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+if (! empty($arrayfields['t.datec']['checked']))
+{
+    // Date creation
+    print '<td class="liste_titre">';
+    print '</td>';
+}
+if (! empty($arrayfields['t.tms']['checked']))
+{
+    // Date modification
+    print '<td class="liste_titre">';
+    print '</td>';
+}
+/*if (! empty($arrayfields['u.statut']['checked']))
+{
+    // Status
+    print '<td class="liste_titre" align="center">';
+    print $form->selectarray('search_statut', array('-1'=>'','0'=>$langs->trans('Disabled'),'1'=>$langs->trans('Enabled')),$search_statut);
+    print '</td>';
+}*/
+// Action column
+print '<td class="liste_titre" align="right">';
+$searchpicto=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
+print $searchpicto;
+print '</td>';
+print '</tr>'."\n";
+    
+
+// Detect if we need a fetch on each output line
+$needToFetchEachLine=0;
+foreach ($extrafields->attribute_computed as $key => $val)
+{
+    if (preg_match('/\$object/',$val)) $needToFetchEachLine++;  // There is at least one compute field that use $object
+}
 
 
+$i=0;
+$totalarray=array();
+while ($i < min($num, $limit))
+{
+    $obj = $db->fetch_object($resql);
+    if ($obj)
+    {
+        // Show here line of result
+        print '<tr class="oddeven">';
+        // LIST_OF_TD_FIELDS_LIST
+        /*
+        if (! empty($arrayfields['t.field1']['checked'])) 
+        {
+            print '<td>'.$obj->field1.'</td>';
+		    if (! $i) $totalarray['nbfield']++;
+        }
+        if (! empty($arrayfields['t.field2']['checked'])) 
+        {
+            print '<td>'.$obj->field2.'</td>';
+		    if (! $i) $totalarray['nbfield']++;
+        }*/
+    	// Extra fields
+		if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
+		{
+		   foreach($extrafields->attribute_label as $key => $val) 
+		   {
+				if (! empty($arrayfields["ef.".$key]['checked'])) 
+				{
+					print '<td';
+					$align=$extrafields->getAlignFlag($key);
+					if ($align) print ' align="'.$align.'"';
+					print '>';
+					$tmpkey='options_'.$key;
+					print $extrafields->showOutputField($key, $obj->$tmpkey, '', 1);
+					print '</td>';
+		            if (! $i) $totalarray['nbfield']++;
+				}
+		   }
+		}
+        // Fields from hook
+	    $parameters=array('arrayfields'=>$arrayfields, 'obj'=>$obj);
+		$reshook=$hookmanager->executeHooks('printFieldListValue',$parameters);    // Note that $action and $object may have been modified by hook
+        print $hookmanager->resPrint;
+    	// Date creation
+        if (! empty($arrayfields['t.datec']['checked']))
+        {
+            print '<td align="center">';
+            print dol_print_date($db->jdate($obj->date_creation), 'dayhour');
+            print '</td>';
+		    if (! $i) $totalarray['nbfield']++;
+        }
+        // Date modification
+        if (! empty($arrayfields['t.tms']['checked']))
+        {
+            print '<td align="center">';
+            print dol_print_date($db->jdate($obj->date_update), 'dayhour');
+            print '</td>';
+		    if (! $i) $totalarray['nbfield']++;
+        }
+        // Status
+        /*
+        if (! empty($arrayfields['u.statut']['checked']))
+        {
+		  $userstatic->statut=$obj->statut;
+          print '<td align="center">'.$userstatic->getLibStatut(3).'</td>';
+        }*/
+
+        // Action column
+        print '<td class="nowrap" align="center">';
+	    if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+        {
+	        $selected=0;
+			if (in_array($obj->rowid, $arrayofselected)) $selected=1;
+			print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected?' checked="checked"':'').'>';
+        }
+	    print '</td>';
+        if (! $i) $totalarray['nbfield']++;
+
+        print '</tr>';
+    }
+    $i++;
+}
+
+// Show total line
+if (isset($totalarray['totalhtfield']))
+{
+    print '<tr class="liste_total">';
+    $i=0;
+    while ($i < $totalarray['nbfield'])
+    {
+        $i++;
+        if ($i == 1)
+        {
+            if ($num < $limit) print '<td align="left">'.$langs->trans("Total").'</td>';
+            else print '<td align="left">'.$langs->trans("Totalforthispage").'</td>';
+        }
+        elseif ($totalarray['totalhtfield'] == $i) print '<td align="right">'.price($totalarray['totalht']).'</td>';
+        elseif ($totalarray['totalvatfield'] == $i) print '<td align="right">'.price($totalarray['totalvat']).'</td>';
+        elseif ($totalarray['totalttcfield'] == $i) print '<td align="right">'.price($totalarray['totalttc']).'</td>';
+        else print '<td></td>';
+    }
+    print '</tr>';
+}
+
+$db->free($resql);
+
+$parameters=array('arrayfields'=>$arrayfields, 'sql'=>$sql);
+$reshook=$hookmanager->executeHooks('printFieldListFooter',$parameters);    // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+
+print '</table>'."\n";
+print '</div>'."\n";
+
+print '</form>'."\n";
 
 
-// Example 2: Adding links to objects
-// The class must extend CommonObject for this method to be available
-$somethingshown = $form->showLinkedObjectBlock($myobject);
+if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files)
+{
+    // Show list of available documents
+    $urlsource=$_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
+    $urlsource.=str_replace('&amp;','&',$param);
+
+    $filedir=$diroutputmassaction;
+    $genallowed=$user->rights->facture->lire;
+    $delallowed=$user->rights->facture->lire;
+
+    print $formfile->showdocuments('massfilesarea_mymodule','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$title,'');
+}
+else
+{
+    print '<br><a name="show_files"></a><a href="'.$_SERVER["PHP_SELF"].'?show_files=1'.$param.'#show_files">'.$langs->trans("ShowTempMassFilesArea").'</a>';
+}
+
 
 // End of page
 llxFooter();
+$db->close();
diff --git a/htdocs/modulebuilder/template/scripts/myobject.php b/htdocs/modulebuilder/template/scripts/myobject.php
new file mode 100644
index 00000000000..af381b0bfae
--- /dev/null
+++ b/htdocs/modulebuilder/template/scripts/myobject.php
@@ -0,0 +1,165 @@
+#!/usr/bin/env php
+<?php
+/* Copyright (C) 2007-2013 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) ---Put here your own copyright and developer email---
+ *
+ * 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/modulebuilder/template/scripts/myobject.php
+ *		\ingroup    mymodule
+ *      \brief      This file is an example for a command line script to work on MyObject
+ */
+
+$sapi_type = php_sapi_name();
+$script_file = basename(__FILE__);
+$path=dirname(__FILE__).'/';
+
+// Test if batch mode
+if (substr($sapi_type, 0, 3) == 'cgi') {
+    echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
+	exit(-1);
+}
+
+// Global variables
+$version='1.0';
+$error=0;
+
+
+// -------------------- START OF YOUR CODE HERE --------------------
+@set_time_limit(0);							// No timeout for this script
+define('EVEN_IF_ONLY_LOGIN_ALLOWED',1);		// Set this define to 0 if you want to lock your script when dolibarr setup is "locked to admin user only".
+
+// Include and load Dolibarr environment variables
+require_once($path."../../htdocs/master.inc.php");
+// After this $db, $mysoc, $langs, $conf and $hookmanager are defined (Opened $db handler to database will be closed at end of file).
+// $user is created but empty.
+
+//$langs->setDefaultLang('en_US'); 	// To change default language of $langs
+$langs->load("main");				// To load language file for default language
+
+// Load user and its permissions
+$result=$user->fetch('','admin');	// Load user for login 'admin'. Comment line to run as anonymous user.
+if (! $result > 0) { dol_print_error('',$user->error); exit; }
+$user->getrights();
+
+
+print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
+if (! isset($argv[1])) {	// Check parameters
+    print "Usage: ".$script_file." param1 param2 ...\n";
+	exit(-1);
+}
+print '--- start'."\n";
+print 'Argument 1='.$argv[1]."\n";
+print 'Argument 2='.$argv[2]."\n";
+
+
+// Start of transaction
+$db->begin();
+
+
+// Examples for manipulating class MyObject
+dol_include_once("/mymodule/class/myobject.class.php");
+$myobject=new MyObject($db);
+
+// Example for inserting creating object in database
+/*
+dol_syslog($script_file." CREATE", LOG_DEBUG);
+$myobject->prop1='value_prop1';
+$myobject->prop2='value_prop2';
+$id=$myobject->create($user);
+if ($id < 0) { $error++; dol_print_error($db,$myobject->error); }
+else print "Object created with id=".$id."\n";
+*/
+
+// Example for reading object from database
+/*
+dol_syslog($script_file." FETCH", LOG_DEBUG);
+$result=$myobject->fetch($id);
+if ($result < 0) { $error; dol_print_error($db,$myobject->error); }
+else print "Object with id=".$id." loaded\n";
+*/
+
+// Example for updating object in database ($myobject must have been loaded by a fetch before)
+/*
+dol_syslog($script_file." UPDATE", LOG_DEBUG);
+$myobject->prop1='newvalue_prop1';
+$myobject->prop2='newvalue_prop2';
+$result=$myobject->update($user);
+if ($result < 0) { $error++; dol_print_error($db,$myobject->error); }
+else print "Object with id ".$myobject->id." updated\n";
+*/
+
+// Example for deleting object in database ($myobject must have been loaded by a fetch before)
+/*
+dol_syslog($script_file." DELETE", LOG_DEBUG);
+$result=$myobject->delete($user);
+if ($result < 0) { $error++; dol_print_error($db,$myobject->error); }
+else print "Object with id ".$myobject->id." deleted\n";
+*/
+
+
+// An example of a direct SQL read without using the fetch method
+/*
+$sql = "SELECT field1, field2";
+$sql.= " FROM ".MAIN_DB_PREFIX."myobject";
+$sql.= " WHERE field3 = 'xxx'";
+$sql.= " ORDER BY field1 ASC";
+
+dol_syslog($script_file, LOG_DEBUG);
+$resql=$db->query($sql);
+if ($resql)
+{
+	$num = $db->num_rows($resql);
+	$i = 0;
+	if ($num)
+	{
+		while ($i < $num)
+		{
+			$obj = $db->fetch_object($resql);
+			if ($obj)
+			{
+				// You can use here results
+				print $obj->field1;
+				print $obj->field2;
+			}
+			$i++;
+		}
+	}
+}
+else
+{
+	$error++;
+	dol_print_error($db);
+}
+*/
+
+
+// -------------------- END OF YOUR CODE --------------------
+
+if (! $error)
+{
+	$db->commit();
+	print '--- end ok'."\n";
+}
+else
+{
+	print '--- end error code='.$error."\n";
+	$db->rollback();
+}
+
+$db->close();	// Close $db database opened handler
+
+exit($error);
diff --git a/htdocs/modulebuilder/template/scripts/myscript.php b/htdocs/modulebuilder/template/scripts/myscript.php
deleted file mode 100644
index 468729c59f3..00000000000
--- a/htdocs/modulebuilder/template/scripts/myscript.php
+++ /dev/null
@@ -1,203 +0,0 @@
-#!/usr/bin/env php
-<?php
-/* <one line to give the program's name and a brief idea of what it does.>
- * Copyright (C) <year>  <name of author>
- *
- * 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    scripts/myscript.php
- * \ingroup mymodule
- * \brief   Example command line script.
- *
- * Put detailed description here.
- */
-
-$sapi_type = php_sapi_name();
-$script_file = basename(__FILE__);
-$path = dirname(__FILE__) . '/';
-
-// Test if batch mode
-if (substr($sapi_type, 0, 3) == 'cgi') {
-	echo "Error: You are using PHP for CGI. To execute ";
-	echo $script_file;
-	echo " from command line, you must use PHP for CLI mode.\n";
-	exit;
-}
-
-// Global variables
-$version = '1.0.0';
-$error = 0;
-
-
-/*
- * -------------------- YOUR CODE STARTS HERE --------------------
- */
-/* Set this define to 0 if you want to allow execution of your script
- * even if dolibarr setup is "locked to admin user only". */
-define('EVEN_IF_ONLY_LOGIN_ALLOWED', 0);
-
-/* Include Dolibarr environment
- * Customize to your needs
- */
-require_once $path . '../../../master.inc.php';
-/* After this $db, $conf, $langs, $mysoc, $user and other Dolibarr utility variables should be defined.
- * Warning: this still requires a valid htdocs/conf.php file
- */
-
-global $conf, $db, $langs, $mysoc, $user;
-
-// No timeout for this script
-@set_time_limit(0);
-
-// Set the default language
-//$langs->setDefaultLang('en_US');
-
-// Load translations for the default language
-$langs->load("main");
-
-/* User and permissions loading
- * Loads user for login 'admin'.
- * Comment out to run as anonymous user. */
-$result = $user->fetch('', 'admin');
-if (! $result > 0) {
-	dol_print_error('', $user->error);
-	exit;
-}
-$user->getrights();
-
-// Display banner and help
-echo "***** " . $script_file . " (" . $version . ") pid=" . getmypid() . " *****\n";
-dol_syslog($script_file . " launched with arg " . join(',', $argv));
-if (! isset($argv[1])) {
-	// Check parameters
-	echo "Usage: " . $script_file . " param1 param2 ...\n";
-	exit;
-}
-echo '--- start' . "\n";
-echo 'Argument 1=' . $argv[1] . "\n";
-echo 'Argument 2=' . $argv[2] . "\n";
-
-// Start database transaction
-$db->begin();
-
-// Examples for manipulating a class
-require_once '../class/myclass.class.php';
-$myobject = new MyClass($db);
-
-// Example for inserting creating object in database
-/*
-	dol_syslog($script_file . " CREATE", LOG_DEBUG);
-	$myobject->prop1 = 'value_prop1';
-	$myobject->prop2 = 'value_prop2';
-	$id = $myobject->create($user);
-	if ($id < 0) {
-		$error++;
-		dol_print_error($db, $myobject->error);
-	} else {
-		 echo "Object created with id=" . $id . "\n";
-	}
- */
-
-// Example for reading object from database
-/*
-	dol_syslog($script_file . " FETCH", LOG_DEBUG);
-	$result = $myobject->fetch($id);
-	if ($result < 0) {
-		$error;
-		dol_print_error($db, $myobject->error);
-	} else {
-		echo "Object with id=" . $id . " loaded\n";
-	}
- */
-
-// Example for updating object in database
-// ($myobject must have been loaded by a fetch before)
-/*
-	dol_syslog($script_file . " UPDATE", LOG_DEBUG);
-	$myobject->prop1 = 'newvalue_prop1';
-	$myobject->prop2 = 'newvalue_prop2';
-	$result = $myobject->update($user);
-	if ($result < 0) {
-		$error++;
-		dol_print_error($db, $myobject->error);
-	} else {
-		echo "Object with id " . $myobject->id . " updated\n";
-	}
- */
-
-// Example for deleting object in database
-// ($myobject must have been loaded by a fetch before)
-/*
-	dol_syslog($script_file . " DELETE", LOG_DEBUG);
-	$result = $myobject->delete($user);
-	if ($result < 0) {
-		$error++;
-		dol_print_error($db, $myobject->error);
-	} else {
-		echo "Object with id " . $myobject->id . " deleted\n";
-	}
- */
-
-// An example of a direct SQL read without using the fetch method
-/*
-	$sql = "SELECT field1, field2";
-	$sql.= " FROM " . MAIN_DB_PREFIX . "c_pays";
-	$sql.= " WHERE field3 = 'xxx'";
-	$sql.= " ORDER BY field1 ASC";
-
-	dol_syslog($script_file . " sql=" . $sql, LOG_DEBUG);
-	$resql=$db->query($sql);
-	if ($resql) {
-		$num = $db->num_rows($resql);
-		$i = 0;
-		if ($num) {
-			while ($i < $num) {
-				$obj = $db->fetch_object($resql);
-				if ($obj) {
-					// You can use here results
-					echo $obj->field1;
-					echo $obj->field2;
-				}
-				$i++;
-			}
-		}
-	} else {
-		$error++;
-		dol_print_error($db);
-	}
- */
-
-
-/*
- * --------------------- YOUR CODE ENDS HERE ----------------------
- */
-
-// Error management
-if (! $error) {
-	$db->commit();
-	echo '--- end ok' . "\n";
-	$exit_status = 0; // UNIX no errors exit status
-} else {
-	echo '--- end error code=' . $error . "\n";
-	$db->rollback();
-	$exit_status = 1; // UNIX general error exit status
-}
-
-// Close database handler
-$db->close();
-
-// Return exit status code
-return $exit_status;
diff --git a/htdocs/modulebuilder/template/sql/data.sql b/htdocs/modulebuilder/template/sql/data.sql
index 90e9e0ced2b..82266dc08b3 100644
--- a/htdocs/modulebuilder/template/sql/data.sql
+++ b/htdocs/modulebuilder/template/sql/data.sql
@@ -14,6 +14,6 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-INSERT INTO llx_mytable VALUES (
+INSERT INTO llx_myobject VALUES (
 	1, 1, 'mydata'
 );
diff --git a/htdocs/modulebuilder/template/sql/llx_mytable.key.sql b/htdocs/modulebuilder/template/sql/llx_myobject.key.sql
similarity index 90%
rename from htdocs/modulebuilder/template/sql/llx_mytable.key.sql
rename to htdocs/modulebuilder/template/sql/llx_myobject.key.sql
index 56975f55a01..6fd4bb4cda6 100644
--- a/htdocs/modulebuilder/template/sql/llx_mytable.key.sql
+++ b/htdocs/modulebuilder/template/sql/llx_myobject.key.sql
@@ -14,4 +14,4 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-ALTER TABLE llx_mytable ADD UNIQUE INDEX uk_fk_othertable (fk_othertable);
+ALTER TABLE llx_myobject ADD UNIQUE INDEX uk_fk_othertable (fk_othertable);
diff --git a/htdocs/modulebuilder/template/sql/llx_mytable.sql b/htdocs/modulebuilder/template/sql/llx_myobject.sql
similarity index 97%
rename from htdocs/modulebuilder/template/sql/llx_mytable.sql
rename to htdocs/modulebuilder/template/sql/llx_myobject.sql
index 2ef08b7fca1..edcd7a7c26d 100644
--- a/htdocs/modulebuilder/template/sql/llx_mytable.sql
+++ b/htdocs/modulebuilder/template/sql/llx_myobject.sql
@@ -14,7 +14,7 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-CREATE TABLE llx_mytable(
+CREATE TABLE llx_myobject(
 	rowid INTEGER AUTO_INCREMENT PRIMARY KEY,
 	entity INTEGER DEFAULT 1 NOT NULL,
 	fk_othertable INTEGER NOT NULL,
diff --git a/htdocs/modulebuilder/template/test/functional/MyModuleFunctionalTest.php b/htdocs/modulebuilder/template/test/phpunit/MyModuleFunctionalTest.php
similarity index 100%
rename from htdocs/modulebuilder/template/test/functional/MyModuleFunctionalTest.php
rename to htdocs/modulebuilder/template/test/phpunit/MyModuleFunctionalTest.php
diff --git a/htdocs/modulebuilder/template/test/unit/MyClassTest.php b/htdocs/modulebuilder/template/test/phpunit/MyObjectTest.php
similarity index 91%
rename from htdocs/modulebuilder/template/test/unit/MyClassTest.php
rename to htdocs/modulebuilder/template/test/phpunit/MyObjectTest.php
index 94898e9209b..37a65323fda 100644
--- a/htdocs/modulebuilder/template/test/unit/MyClassTest.php
+++ b/htdocs/modulebuilder/template/test/phpunit/MyObjectTest.php
@@ -17,20 +17,18 @@
  */
 
 /**
- * \file    test/unit/MyClassTest.php
+ * \file    test/unit/MyObjectTest.php
  * \ingroup mymodule
- * \brief   Example PHPUnit test.
- *
- * Put detailed description here.
+ * \brief   PHPUnit test for MyObject class.
  */
 
 namespace test\unit;
 
 /**
- * Class MyClassTest
+ * Class MyObjectTest
  * @package Testmymodule
  */
-class MyClassTest extends \PHPUnit_Framework_TestCase
+class MyObjectTest extends \PHPUnit_Framework_TestCase
 {
 	/**
 	 * Global test setup

From 48477e00fd6d4fe6a249ae6af92cfedaba109b76 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Sun, 28 May 2017 06:49:17 +0200
Subject: [PATCH 494/505] Review payment part on expense report card

---
 htdocs/expensereport/card.php | 330 +++++++++++++++++++---------------
 1 file changed, 183 insertions(+), 147 deletions(-)

diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index fe546cd1064..1dbcbfc1335 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2003      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
- * Copyright (C) 2015-2016 Alexandre Spangaro   <aspangaro@zendsi.com>
+ * Copyright (C) 2015-2017 Alexandre Spangaro   <aspangaro@zendsi.com>
  * Copyright (C) 2017      Ferran Marcet        <fmarcet@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -37,9 +37,12 @@ require_once DOL_DOCUMENT_ROOT . '/core/lib/expensereport.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/price.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/core/modules/expensereport/modules_expensereport.php';
 require_once DOL_DOCUMENT_ROOT . '/expensereport/class/expensereport.class.php';
-require_once DOL_DOCUMENT_ROOT . '/compta/paiement/class/paiement.class.php';
+require_once DOL_DOCUMENT_ROOT . '/expensereport/class/paymentexpensereport.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php';
+if (! empty($conf->accounting->enabled)) {
+	require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php';
+}
 
 $langs->load("trips");
 $langs->load("bills");
@@ -647,14 +650,14 @@ if (empty($reshook))
    	{
    		setEventMessages($object->error, $object->errors, 'errors');
    	}
-    
+
     if ($action == "confirm_refuse" && GETPOST('confirm')=="yes" && $id > 0 && $user->rights->expensereport->approve)
     {
     	$object = new ExpenseReport($db);
     	$object->fetch($id);
-    
+
     	$result = $object->setDeny($user,GETPOST('detail_refuse'));
-    
+
     	if ($result > 0)
     	{
     		// Define output language
@@ -674,11 +677,11 @@ if (empty($reshook))
     			$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
     		}
     	}
-    
+
     	if ($result > 0)
     	{
     		// Send mail
-    
+
     		// TO
     		$destinataire = new User($db);
     		$destinataire->fetch($object->fk_user_author);
@@ -714,10 +717,10 @@ if (empty($reshook))
         			array_push($mimetype,"application/pdf");
     			}
     			*/
-        
+
         		// PREPARE SEND
         		$mailfile = new CMailFile($subject,$emailTo,$emailFrom,$message,$filedir,$mimetype,$filename);
-        
+
         		if ($mailfile)
         		{
         			// SEND
@@ -767,17 +770,17 @@ if (empty($reshook))
     {
     	setEventMessages($object->error, $object->errors, 'errors');
     }
-    
+
     //var_dump($user->id == $object->fk_user_validator);exit;
     if ($action == "confirm_cancel" && GETPOST('confirm')=="yes" && GETPOST('detail_cancel') && $id > 0 && $user->rights->expensereport->creer)
     {
     	$object = new ExpenseReport($db);
     	$object->fetch($id);
-    
+
     	if ($user->id == $object->fk_user_valid || $user->id == $object->fk_user_author)
     	{
     		$result = $object->set_cancel($user,GETPOST('detail_cancel'));
-    
+
     		if ($result > 0)
     		{
     			// Define output language
@@ -797,16 +800,16 @@ if (empty($reshook))
     				$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
     			}
     		}
-    
+
     		if ($result > 0)
     		{
     			// Send mail
-    
+
     			// TO
     			$destinataire = new User($db);
     			$destinataire->fetch($object->fk_user_author);
     			$emailTo = $destinataire->email;
-    
+
     			// FROM
     			$expediteur = new User($db);
     			$expediteur->fetch($object->fk_user_cancel);
@@ -891,7 +894,7 @@ if (empty($reshook))
     		setEventMessages($object->error, $object->errors, 'errors');
     	}
     }
-    
+
     if ($action == "confirm_brouillonner" && GETPOST('confirm')=="yes" && $id > 0 && $user->rights->expensereport->creer)
     {
     	$object = new ExpenseReport($db);
@@ -899,7 +902,7 @@ if (empty($reshook))
     	if ($user->id == $object->fk_user_author || $user->id == $object->fk_user_valid)
     	{
     		$result = $object->setStatut(0);
-    
+
     		if ($result > 0)
     		{
     			// Define output language
@@ -919,7 +922,7 @@ if (empty($reshook))
     				$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
     			}
     		}
-    
+
     		if ($result > 0)
     		{
     			header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
@@ -935,14 +938,14 @@ if (empty($reshook))
     		setEventMessages("NOT_AUTHOR", '', 'errors');
     	}
     }
-    
+
     if ($action == 'set_paid' && $id > 0 && $user->rights->expensereport->to_paid)
     {
     	$object = new ExpenseReport($db);
     	$object->fetch($id);
-    
+
     	$result = $object->set_paid($id, $user);
-    
+
     	if ($result > 0)
     	{
     		// Define output language
@@ -962,46 +965,46 @@ if (empty($reshook))
     			$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
     		}
     	}
-    
+
     	if ($result > 0)
     	{
     		// Send mail
-    
+
     		// TO
     		$destinataire = new User($db);
     		$destinataire->fetch($object->fk_user_author);
     		$emailTo = $destinataire->email;
-    
+
     		// FROM
     		$expediteur = new User($db);
     		$expediteur->fetch($user->id);
     		$emailFrom = $expediteur->email;
-    
+
     		if ($emailFrom && $emailTo)
     		{
     			$filename=array(); $filedir=array(); $mimetype=array();
     		    
     		    // SUBJECT
     			$subject = $langs->transnoentities("ExpenseReportPaid");
-    
+
     			// CONTENT
     			$link = $urlwithroot.'/expensereport/card.php?id='.$object->id;
     			$message = $langs->transnoentities("ExpenseReportPaidMessage", $object->ref, $destinataire->getFullName($langs), $expediteur->getFullName($langs), $link);
-        
+
         		// CONTENT
         		$message = "Bonjour {$destinataire->firstname},\n\n";
         		$message.= "Votre note de frais \"{$object->ref}\" vient d'être payée.\n";
         		$message.= "- Payeur : {$expediteur->firstname} {$expediteur->lastname}\n";
         		$message.= "- Lien : {$dolibarr_main_url_root}/expensereport/card.php?id={$object->id}\n\n";
         		$message.= "Bien cordialement,\n' SI";
-        
+
         		// Generate pdf before attachment
         		$object->setDocModel($user,"");
         		$resultPDF = expensereport_pdf_create($db,$object,'',"",$langs);
-        
+
         		// PREPARE SEND
         		$mailfile = new CMailFile($subject,$emailTo,$emailFrom,$message,$filedir,$mimetype,$filename);
-        
+
         		if ($mailfile)
         		{
         			// SEND
@@ -1055,45 +1058,44 @@ if (empty($reshook))
     if ($action == "addline" && $user->rights->expensereport->creer)
     {
     	$error = 0;
-    
+
     	$db->begin();
-    
+
     	$object_ligne = new ExpenseReportLine($db);
-    
+
     	$vatrate = GETPOST('vatrate');
     	$object_ligne->comments = GETPOST('comments');
     	$qty  = GETPOST('qty','int');
     	if (empty($qty)) $qty=1;
     	$object_ligne->qty = $qty;
-    
+
     	$up=price2num(GETPOST('value_unit'),'MU');
     	$object_ligne->value_unit = $up;
-    
+
     	$object_ligne->date = $date;
-    
+
     	$object_ligne->fk_c_type_fees = GETPOST('fk_c_type_fees');
-    
+
     	// if VAT is not used in Dolibarr, set VAT rate to 0 because VAT rate is necessary.
     	if (empty($vatrate)) $vatrate = "0.000";
     	$object_ligne->vatrate = price2num($vatrate);
-    
+
     	$object_ligne->fk_projet = $fk_projet;
-    	
-    
+
     	if (! GETPOST('fk_c_type_fees') > 0)
     	{
     		$error++;
     		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type")), null, 'errors');
     		$action='';
     	}
-    
+
     	if ($vatrate < 0 || $vatrate == '')
     	{
     		$error++;
     		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("VAT")), null, 'errors');
     		$action='';
     	}
-    
+
         /* Projects are never required. To force them, check module forceproject
     	if ($conf->projet->enabled)
     	{
@@ -1103,7 +1105,7 @@ if (empty($reshook))
     			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Project")), null, 'errors');
     		}
     	}*/
-    
+
     	// Si aucune date n'est rentrée
     	if (empty($object_ligne->date) || $object_ligne->date=="--")
     	{
@@ -1116,21 +1118,21 @@ if (empty($reshook))
     		$error++;
     		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("PriceUTTC")), null, 'errors');
     	}
-    
+
     	// S'il y'a eu au moins une erreur
     	if (! $error)
     	{
     		$object_ligne->fk_expensereport = $_POST['fk_expensereport'];
-    
+
     		$type = 0;	// TODO What if service ?
     		$seller = '';  // seller is unknown
     		$tmp = calcul_price_total($qty, $up, 0, $vatrate, 0, 0, 0, 'TTC', 0, $type, $seller);
-    
+
     		$object_ligne->vatrate = price2num($vatrate);
     		$object_ligne->total_ttc = $tmp[2];
     		$object_ligne->total_ht = $tmp[0];
     		$object_ligne->total_tva = $tmp[1];
-    
+
     		$result = $object_ligne->insert();
     		if ($result > 0)
     		{
@@ -1144,10 +1146,10 @@ if (empty($reshook))
     			$db->rollback();
     		}
     	}
-    
+
     	$action='';
     }
-    
+
     if ($action == 'confirm_delete_line' && GETPOST("confirm") == "yes" && $user->rights->expensereport->creer)
     {
     	$object = new ExpenseReport($db);
@@ -1157,7 +1159,7 @@ if (empty($reshook))
     	$object_ligne->fetch(GETPOST("rowid"));
     	$total_ht = $object_ligne->total_ht;
     	$total_tva = $object_ligne->total_tva;
-    
+
     	$result=$object->deleteline(GETPOST("rowid"), $user);
     	if ($result >= 0)
     	{
@@ -1190,12 +1192,12 @@ if (empty($reshook))
     		setEventMessages($object->error, $object->errors, 'errors');
     	}
     }
-    
+
     if ($action == "updateligne" && $user->rights->expensereport->creer)
     {
     	$object = new ExpenseReport($db);
     	$object->fetch($id);
-    
+
     	$rowid = $_POST['rowid'];
     	$type_fees_id = GETPOST('fk_c_type_fees');
     	$projet_id = $fk_projet;
@@ -1207,7 +1209,7 @@ if (empty($reshook))
         // if VAT is not used in Dolibarr, set VAT rate to 0 because VAT rate is necessary.
         if (empty($vatrate)) $vatrate = "0.000";
         $vatrate = price2num($vatrate);
-    
+
     	if (! GETPOST('fk_c_type_fees') > 0)
     	{
     		$error++;
@@ -1220,7 +1222,7 @@ if (empty($reshook))
     		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Vat")), null, 'errors');
     		$action='';
     	}
-    
+
     	if (! $error)
     	{
     	    // TODO Use update method of ExpenseReportLine
@@ -1258,7 +1260,7 @@ if (empty($reshook))
     		}
     	}
     }
-    
+
     // Actions to build doc
     $upload_dir = $conf->expensereport->dir_output;
     $permissioncreate = $user->rights->expensereport->creer;
@@ -1278,6 +1280,8 @@ $form = new Form($db);
 $formfile = new FormFile($db);
 $formproject = new FormProjets($db);
 $projecttmp = new Project($db);
+$paymentexpensereportstatic=new PaymentExpenseReport($db);
+$bankaccountstatic = new Account($db);
 
 // Create
 if ($action == 'create')
@@ -1320,7 +1324,7 @@ if ($action == 'create')
 	print $s;
 	print '</td>';
 	print '</tr>';
-	
+
 	print '<tr>';
 	print '<td>'.$langs->trans("VALIDATOR").'</td>';
 	print '<td>';
@@ -1376,7 +1380,7 @@ if ($action == 'create')
 	if (empty($reshook) && ! empty($extrafields->attribute_label)) {
 	    print $object->showOptionals($extrafields, 'edit');
 	}
-	
+
 	print '<tbody>';
 	print '</table>';
 
@@ -1447,7 +1451,7 @@ else
 				$userfee->fetch($object->fk_user_author);
 				print $userfee->getNomUrl(-1);
 				print '</td></tr>';
-				
+
             	// Ref
             	print '<tr><td class="titlefieldcreate">'.$langs->trans("Ref").'</td><td>';
             	print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref', '');
@@ -1542,7 +1546,7 @@ else
 				    // Paiement incomplet. On demande si motif = escompte ou autre
 				    $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('CloneExpenseReport'), $langs->trans('ConfirmCloneExpenseReport', $object->ref), 'confirm_clone', $formquestion, 'yes', 1);
 				}
-				
+
 				if ($action == 'save')
 				{
 					$formconfirm=$form->form_confirm($_SERVER["PHP_SELF"]."?id=".$id,$langs->trans("SaveTrip"),$langs->trans("ConfirmSaveTrip"),"confirm_validate","","",1);
@@ -1592,13 +1596,10 @@ else
 
 				// Print form confirm
 				print $formconfirm;
-				
-				
+
 				// Expense report card
-				
 				$linkback = '<a href="'.DOL_URL_ROOT.'/expensereport/list.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
-				
-				
+
 				$morehtmlref='<div class="refidno">';
 				/*
 				// Ref customer
@@ -1639,15 +1640,13 @@ else
 				    }
 				}*/
 				$morehtmlref.='</div>';
-				
-				
+
 				dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
-				
-				
+
 				print '<div class="fichecenter">';
 				print '<div class="fichehalfleft">';
 				print '<div class="underbanner clearboth"></div>';
-				
+
 				print '<table class="border centpercent">';
 
 				// Author
@@ -1662,7 +1661,7 @@ else
 				    print $userauthor->getNomUrl(-1);
 				}
 				print '</td></tr>';
-				
+
 				print '<tr>';
 				print '<td class="titlefield">'.$langs->trans("Period").'</td>';
 				print '<td>';
@@ -1677,29 +1676,6 @@ else
 					print '</tr>';
 				}
 
-				// Amount
-				print '<tr>';
-				print '<td>'.$langs->trans("AmountHT").'</td>';
-				print '<td>'.price($object->total_ht).'</td>';
-				$rowspan = 5;
-				if ($object->fk_statut < 3) $rowspan++;
-				elseif($object->fk_statut == 4) $rowspan+=2;
-				else $rowspan+=2;
-				if ($object->fk_statut==99 || !empty($object->detail_refuse)) $rowspan+=2;
-				if($object->fk_statut==6) $rowspan+=2;
-				print "</td>";
-				print '</tr>';
-				
-				print '<tr>';
-				print '<td>'.$langs->trans("AmountVAT").'</td>';
-				print '<td>'.price($object->total_tva).'</td>';
-				print '</tr>';
-				
-				print '<tr>';
-				print '<td>'.$langs->trans("AmountTTC").'</td>';
-				print '<td>'.price($object->total_ttc).'</td>';
-				print '</tr>';
-
 				// Validation date
 				print '<tr>';
 				print '<td>'.$langs->trans("DATE_SAVE").'</td>';
@@ -1740,7 +1716,7 @@ else
 						print $userfee->getNomUrl(-1);
 					}
 					print '</td></tr>';
-					
+
 					print '<tr>';
 					print '<td>'.$langs->trans("MOTIF_CANCEL").'</td>';
 					print '<td>'.$object->detail_cancel.'</td></tr>';
@@ -1762,7 +1738,7 @@ else
 						print $userapp->getNomUrl(-1);
 					}
 					print '</td></tr>';
-					
+
 					print '<tr>';
 					print '<td>'.$langs->trans("DateApprove").'</td>';
 					print '<td>'.dol_print_date($object->date_approve,'dayhour').'</td></tr>';
@@ -1778,7 +1754,7 @@ else
 					$userfee->fetch($object->fk_user_refuse);
 					print $userfee->getNomUrl(-1);
 					print '</td></tr>';
-					
+
 					print '<tr>';
 					print '<td>'.$langs->trans("DATE_REFUS").'</td>';
 					print '<td>'.dol_print_date($object->date_refuse,'dayhour');
@@ -1805,67 +1781,130 @@ else
 				}
 
 				// Other attributes
-				$cols = 3;
+				$cols = 2;
 				include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
-				
+
 				print '</table>';
 
 				print '</div>';
 				print '<div class="fichehalfright">';
 				print '<div class="ficheaddleft">';
-				//print '<div class="underbanner clearboth"></div>';
-				
-				// List of payments
-				$sql = "SELECT p.rowid, p.num_payment, p.datep as dp, p.amount,";
-				$sql.= "c.code as type_code,c.libelle as payment_type";
-				$sql.= " FROM ".MAIN_DB_PREFIX."payment_expensereport as p";
+				print '<div class="underbanner clearboth"></div>';
+
+				print '<table class="border centpercent">';
+
+				// Amount
+				print '<tr>';
+				print '<td class="titlefieldmiddle">'.$langs->trans("AmountHT").'</td>';
+				print '<td class="nowrap amountcard">'.price($object->total_ht, 1, '', 1, - 1, - 1, $conf->currency).'</td>';
+				$rowspan = 5;
+				if ($object->fk_statut < 3) $rowspan++;
+				elseif($object->fk_statut == 4) $rowspan+=2;
+				else $rowspan+=2;
+				if ($object->fk_statut==99 || !empty($object->detail_refuse)) $rowspan+=2;
+				if($object->fk_statut==6) $rowspan+=2;
+				print "</td>";
+				print '</tr>';
+
+				print '<tr>';
+				print '<td>'.$langs->trans("AmountVAT").'</td>';
+				print '<td class="nowrap amountcard">'.price($object->total_tva, 1, '', 1, - 1, - 1, $conf->currency).'</td>';
+				print '</tr>';
+
+				print '<tr>';
+				print '<td>'.$langs->trans("AmountTTC").'</td>';
+				print '<td class="nowrap amountcard">'.price($object->total_ttc, 1, '', 1, - 1, - 1, $conf->currency).'</td>';
+				print '</tr>';
+
+				// List of payments already done
+				$nbcols = 3;
+				if (! empty($conf->banque->enabled)) {
+					$nbrows ++;
+					$nbcols ++;
+				}
+
+				print '<table class="noborder paymenttable" width="100%">';
+
+				print '<tr class="liste_titre">';
+				print '<td class="liste_titre">' . $langs->trans('Payments') . '</td>';
+				print '<td class="liste_titre">' . $langs->trans('Date') . '</td>';
+				print '<td class="liste_titre">' . $langs->trans('Type') . '</td>';
+				if (! empty($conf->banque->enabled)) {
+					print '<td class="liste_titre" align="right">' . $langs->trans('BankAccount') . '</td>';
+				}
+				print '<td class="liste_titre" align="right">' . $langs->trans('Amount') . '</td>';
+				print '<td class="liste_titre" width="18">&nbsp;</td>';
+				print '</tr>';
+
+				// Payments already done (from payment on this expensereport)
+				$sql = "SELECT p.rowid, p.num_payment, p.datep as dp, p.amount, p.fk_bank,";
+				$sql.= "c.code as p_code, c.libelle as payment_type,";
+				$sql.= "ba.rowid as baid, ba.ref as baref, ba.label, ba.number as banumber, ba.account_number, ba.fk_accountancy_journal";
+				$sql.= " FROM ".MAIN_DB_PREFIX."expensereport as e";
 				$sql.= ", ".MAIN_DB_PREFIX."c_paiement as c ";
-				$sql.= ", ".MAIN_DB_PREFIX."expensereport as e";
+				$sql.= ", ".MAIN_DB_PREFIX."payment_expensereport as p";
+				$sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'bank as b ON p.fk_bank = b.rowid';
+				$sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'bank_account as ba ON b.fk_account = ba.rowid';
 				$sql.= " WHERE e.rowid = '".$id."'";
 				$sql.= " AND p.fk_expensereport = e.rowid";
 				$sql.= " AND e.entity = ".$conf->entity;
 				$sql.= " AND p.fk_typepayment = c.id";
 				$sql.= " ORDER BY dp";
-				
+
 				$resql = $db->query($sql);
 				if ($resql)
 				{
 				    $num = $db->num_rows($resql);
 				    $i = 0; $total = 0;
-				    print '<table class="noborder paymenttable" width="100%">';
-				    print '<tr class="liste_titre">';
-				    print '<td>'.$langs->trans("RefPayment").'</td>';
-				    print '<td>'.$langs->trans("Date").'</td>';
-				    print '<td>'.$langs->trans("Type").'</td>';
-				    print '<td align="right">'.$langs->trans("Amount").'</td>';
-				    print '<td>&nbsp;</td>';
-				    print '</tr>';
-				
-				    $var=True;
 				    while ($i < $num)
 				    {
 				        $objp = $db->fetch_object($resql);
-				        
-				        print "<tr ".$bc[$var]."><td>";
-				        print '<a href="'.DOL_URL_ROOT.'/expensereport/payment/card.php?id='.$objp->rowid.'">'.img_object($langs->trans("Payment"),"payment").' '.$objp->rowid.'</a></td>';
+
+				        print '<tr class="oddseven"><td>';
+						$paymentexpensereportstatic->id = $objp->rowid;
+						$paymentexpensereportstatic->datepaye = $db->jdate($objp->dp);
+						$paymentexpensereportstatic->ref = $objp->rowid;
+						$paymentexpensereportstatic->num_paiement = $objp->num_paiement;
+						$paymentexpensereportstatic->payment_code = $objp->payment_code;
+						print $paymentexpensereportstatic->getNomUrl(1);
+						print '</td>';
 				        print '<td>'.dol_print_date($db->jdate($objp->dp),'day')."</td>\n";
-				        $labeltype=$langs->trans("PaymentType".$objp->type_code)!=("PaymentType".$objp->type_code)?$langs->trans("PaymentType".$objp->type_code):$objp->fk_typepayment;
+				        $labeltype=$langs->trans("PaymentType".$objp->p_code)!=("PaymentType".$objp->p_code)?$langs->trans("PaymentType".$objp->p_code):$objp->fk_typepayment;
 				        print "<td>".$labeltype.' '.$objp->num_payment."</td>\n";
-				        print '<td align="right">'.price($objp->amount)."</td><td>&nbsp;".$langs->trans("Currency".$conf->currency)."</td>\n";
+						if (! empty($conf->banque->enabled)) {
+							$bankaccountstatic->id = $objp->baid;
+							$bankaccountstatic->ref = $objp->baref;
+							$bankaccountstatic->label = $objp->baref;
+							$bankaccountstatic->number = $objp->banumber;
+
+							if (! empty($conf->accounting->enabled)) {
+								$bankaccountstatic->account_number = $objp->account_number;
+
+								$accountingjournal = new AccountingJournal($db);
+								$accountingjournal->fetch($objp->fk_accountancy_journal);
+								$bankaccountstatic->accountancy_journal = $accountingjournal->getNomUrl(0,1,1,'',1);
+							}
+
+							print '<td align="right">';
+							if ($bankaccountstatic->id)
+								print $bankaccountstatic->getNomUrl(1, 'transactions');
+							print '</td>';
+						}
+				        print '<td align="right">'.price($objp->amount)."</td>";
 				        print "</tr>";
 				        $totalpaid += $objp->amount;
 				        $i++;
 				    }
-				
+
 				    if ($object->paid == 0)
 				    {
-				        print "<tr><td colspan=\"3\" align=\"right\">".$langs->trans("AlreadyPaid")." :</td><td align=\"right\">".price($totalpaid)."</td></tr>\n";
-				        print "<tr><td colspan=\"3\" align=\"right\">".$langs->trans("AmountExpected")." :</td><td align=\"right\">".price($object->total_ttc)."</td></tr>\n";
+				        print '<tr><td colspan="' . $nbcols . '" align="right">'.$langs->trans("AlreadyPaid").':</td><td align="right">'.price($totalpaid).'</td></tr>';
+				        print '<tr><td colspan="' . $nbcols . '" align="right">'.$langs->trans("AmountExpected").':</td><td align="right">'.price($object->total_ttc).'</td></tr>';
 				
 				        $remaintopay = $object->total_ttc - $totalpaid;
 				
-				        print "<tr><td colspan=\"3\" align=\"right\">".$langs->trans("RemainderToPay")." :</td>";
-				        print '<td align="right"'.($remaintopay?' class="amountremaintopay"':'').'>'.price($remaintopay)."</td></tr>\n";
+				        print '<tr><td colspan="' . $nbcols . '" align="right">'.$langs->trans("RemainderToPay").':</td>';
+				        print '<td align="right"'.($remaintopay?' class="amountremaintopay"':'').'>'.price($remaintopay).'</td></tr>';
 				    }
 				    print "</table>";
 				    $db->free($resql);
@@ -1873,15 +1912,13 @@ else
 				else
 				{
 				    dol_print_error($db);
-				}				
-				
+				}
+
 				print '</div>';
 				print '</div>';
 				print '</div>';
-				
+
 				print '<div class="clearboth"></div><br>';
-				
-				print '<br>';
 
 				// Fetch Lines of current expense report
 				$sql = 'SELECT fde.rowid, fde.fk_expensereport, fde.fk_c_type_fees, fde.fk_projet, fde.date,';
@@ -1898,18 +1935,17 @@ else
 
 				$actiontouse='updateligne';
 				if (($object->fk_statut==0 || $object->fk_statut==99) && $action != 'editline') $actiontouse='addline';
-				
+
 				print '<form name="expensereport" action="'.$_SERVER["PHP_SELF"].'" method="post">';
 				print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 				print '<input type="hidden" name="action" value="'.$actiontouse.'">';
 				print '<input type="hidden" name="id" value="'.$object->id.'">';
 				print '<input type="hidden" name="fk_expensereport" value="'.$object->id.'" />';
-				
-				
+
 				print '<div class="div-table-responsive">';
 				print '<table id="tablelines" class="noborder" width="100%">';
-				
-		        $resql = $db->query($sql);
+
+				$resql = $db->query($sql);
 				if ($resql)
 				{
 					$num_lignes = $db->num_rows($resql);
@@ -1989,7 +2025,7 @@ else
 
 									print '</td>';
 								}
-								
+
 								print '</tr>';
 							}
 
@@ -2042,7 +2078,7 @@ else
 									    print '<td style="text-align:right;">'.$langs->trans('AmountHT').'</td>';
 									    print '<td style="text-align:right;">'.$langs->trans('AmountTTC').'</td>';
 									}
-									
+
 									print '<td style="text-align:center;">';
 									print '<input type="hidden" name="rowid" value="'.$objp->rowid.'">';
 									print '<input type="submit" class="button" name="save" value="'.$langs->trans('Save').'">';
@@ -2078,11 +2114,11 @@ else
 						print '<td colspan="3"></td>';
 						print '</tr>';
 
-						
+
 						print '<tr '.$bc[true].'>';
 
 						print '<td></td>';
-						
+
 						// Select date
 						print '<td align="center">';
 						$form->select_date($date?$date:-1,'date');
@@ -2091,11 +2127,11 @@ else
 						// Select project
 						if (! empty($conf->projet->enabled))
 						{
-    						print '<td>';
-    						$formproject->select_projects(-1, $fk_projet, 'fk_projet', 0, 0, 1, 1);
-    						print '</td>';
+							print '<td>';
+							$formproject->select_projects(-1, $fk_projet, 'fk_projet', 0, 0, 1, 1);
+							print '</td>';
 						}
-						
+
 						// Select type
 						print '<td align="center">';
 						select_type_fees_id($fk_c_type_fees,'fk_c_type_fees',1);
@@ -2249,7 +2285,7 @@ if ($action != 'create' && $action != 'edit')
 		}
 	}
 
-	
+
 	// If status is Appoved
 	// --------------------
 	
@@ -2257,7 +2293,7 @@ if ($action != 'create' && $action != 'edit')
 	{
 	    print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=refuse&id='.$object->id.'">'.$langs->trans('Deny').'</a></div>';
 	}
-	
+
 	// If bank module is used
 	if ($user->rights->expensereport->to_paid && ! empty($conf->banque->enabled) && $object->fk_statut == 5)
 	{
@@ -2272,7 +2308,7 @@ if ($action != 'create' && $action != 'edit')
 		}
 	}
 	
-	// If bank module is not used	
+	// If bank module is not used
 	if (($user->rights->expensereport->to_paid || empty($conf->banque->enabled)) && $object->fk_statut == 5)
 	{
 		//if ((round($remaintopay) == 0 || empty($conf->banque->enabled)) && $object->paid == 0)

From 095545e8d95eda034cc1629931603fc2611569c9 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Sun, 28 May 2017 21:56:18 +0200
Subject: [PATCH 495/505] Fix : Correct bank transfert when we write operation
 on general ledger

---
 .../accountancy/class/bookkeeping.class.php   | 328 +++++++++---------
 htdocs/accountancy/journal/bankjournal.php    |  46 ++-
 2 files changed, 192 insertions(+), 182 deletions(-)

diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index a59d92eb63a..1da95f26ce3 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -54,18 +54,15 @@ class BookKeeping extends CommonObject
 	 * @var string Name of table without prefix where object is stored
 	 */
 	public $table_element = 'accounting_bookkeeping';  
-	
-	
+
 	public $entity = 1;
-	
-	
+
 	/**
 	 *
 	 * @var BookKeepingLine[] Lines
 	 */
 	public $lines = array ();
-	
-	
+
 	/**
 	 *
 	 * @var int ID
@@ -89,10 +86,10 @@ class BookKeeping extends CommonObject
 	public $import_key;
 	public $code_journal;
 	public $piece_num;
-	
+
 	/**
 	 */
-	
+
 	/**
 	 * Constructor
 	 *
@@ -101,7 +98,7 @@ class BookKeeping extends CommonObject
 	public function __construct(DoliDB $db) {
 		$this->db = $db;
 	}
-	
+
 	/**
 	 * Create object into database
 	 *
@@ -110,12 +107,12 @@ class BookKeeping extends CommonObject
 	 * @return int                 <0 if KO, Id of created object if OK
 	 */
 	public function create(User $user, $notrigger = false) {
-	    global $conf, $langs;
-	    
+		global $conf, $langs;
+
 		dol_syslog(__METHOD__, LOG_DEBUG);
-		
+
 		$error = 0;
-		
+
 		// Clean parameters
 		if (isset($this->doc_type)) {
 			$this->doc_type = trim($this->doc_type);
@@ -177,15 +174,14 @@ class BookKeeping extends CommonObject
             {
                 $this->errors[]=$langs->trans('ErrorFieldAccountNotDefinedForInvoiceLine', $this->fk_doc,  $this->doc_type);		    
             }
-		    
+
 		    return -1;
 		}
-		
-		
+
 		$this->db->begin();
-		
+
 		$this->piece_num = 0;
-		
+
 		// First check if line not yet already in bookkeeping
 		$sql = "SELECT count(*) as nb";
 		$sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element;
@@ -193,10 +189,10 @@ class BookKeeping extends CommonObject
 		$sql .= " AND fk_doc = " . $this->fk_doc;
 		$sql .= " AND fk_docdet = " . $this->fk_docdet;                   // This field can be 0 is record is for several lines 
 		$sql .= " AND numero_compte = '" . $this->db->escape($this->numero_compte) . "'";
-	    $sql .= " AND entity IN (" . getEntity("accountancy", 1) . ")";
-		
+		$sql .= " AND entity IN (" . getEntity("accountancy", 1) . ")";
+
 		$resql = $this->db->query($sql);
-		
+
 		if ($resql) {
 			$row = $this->db->fetch_object($resql);
 			if ($row->nb == 0) 
@@ -207,8 +203,8 @@ class BookKeeping extends CommonObject
 				$sqlnum .= " WHERE doc_type = '" . $this->db->escape($this->doc_type) . "'";		// For example doc_type = 'bank' 
 				$sqlnum .= " AND fk_docdet = " . $this->db->escape($this->fk_docdet);       		// fk_docdet is rowid into llx_bank or llx_facturedet or llx_facturefourndet, or ...
 				$sqlnum .= " AND doc_ref = '" . $this->db->escape($this->doc_ref) . "'";			// ref of source object
-			    $sqlnum .= " AND entity IN (" . getEntity("accountancy", 1) . ")";
-				
+				$sqlnum .= " AND entity IN (" . getEntity("accountancy", 1) . ")";
+
 				dol_syslog(get_class($this) . ":: create sqlnum=" . $sqlnum, LOG_DEBUG);
 				$resqlnum = $this->db->query($sqlnum);
 				if ($resqlnum) {
@@ -219,8 +215,8 @@ class BookKeeping extends CommonObject
 				if (empty($this->piece_num)) {
 					$sqlnum = "SELECT MAX(piece_num)+1 as maxpiecenum";
 					$sqlnum .= " FROM " . MAIN_DB_PREFIX . $this->table_element;
-				    $sqlnum .= " WHERE entity IN (" . getEntity("accountancy", 1) . ")";
-						
+					$sqlnum .= " WHERE entity IN (" . getEntity("accountancy", 1) . ")";
+
 					dol_syslog(get_class($this) . ":: create sqlnum=" . $sqlnum, LOG_DEBUG);
 					$resqlnum = $this->db->query($sqlnum);
 					if ($resqlnum) {
@@ -232,12 +228,12 @@ class BookKeeping extends CommonObject
 				if (empty($this->piece_num)) {
 					$this->piece_num = 1;
 				}
-				
+
 				$now = dol_now();
 				if (empty($this->date_create)) {
 					$this->date_create = $now;
 				}
-				
+
 				$sql = "INSERT INTO " . MAIN_DB_PREFIX . $this->table_element . " (";
 				$sql .= "doc_date";
 				$sql .= ", doc_type";
@@ -275,7 +271,7 @@ class BookKeeping extends CommonObject
 				$sql .= "," . $this->piece_num;
 				$sql .= ", " . (! isset($this->entity) ? '1' : $this->entity);
 				$sql .= ")";
-				
+
 				dol_syslog(get_class($this) . ":: create sql=" . $sql, LOG_DEBUG);
 				$resql = $this->db->query($sql);
 				if ($resql) {
@@ -308,7 +304,7 @@ class BookKeeping extends CommonObject
 			$this->errors[] = 'Error ' . $this->db->lasterror();
 			dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
 		}
-		
+
 		if (! $error) {
 			
 			if (! $notrigger) {
@@ -321,7 +317,7 @@ class BookKeeping extends CommonObject
 				// // End call triggers
 			}
 		}
-		
+
 		// Commit or rollback
 		if ($error) {
 			$this->db->rollback();
@@ -331,7 +327,7 @@ class BookKeeping extends CommonObject
 			return $result;
 		}
 	}
-	
+
 	/**
 	 * Create object into database
 	 *
@@ -341,11 +337,11 @@ class BookKeeping extends CommonObject
 	 */
 	public function createStd(User $user, $notrigger = false) {
 		dol_syslog(__METHOD__, LOG_DEBUG);
-		
+
 		$error = 0;
-		
+
 		// Clean parameters
-		
+
 		if (isset($this->doc_type)) {
 			$this->doc_type = trim($this->doc_type);
 		}
@@ -393,10 +389,10 @@ class BookKeeping extends CommonObject
 		}
 		if (empty($this->debit)) $this->debit = 0;
 		if (empty($this->credit)) $this->credit = 0;
-		
+
 		// Check parameters
 		// Put here code to add control on parameters values
-		
+
 		// Insert request
 		$sql = 'INSERT INTO ' . MAIN_DB_PREFIX . $this->table_element . '(';
 		$sql .= 'doc_date,';
@@ -435,19 +431,19 @@ class BookKeeping extends CommonObject
 		$sql .= ' ' . (empty($this->piece_num) ? 'NULL' : $this->piece_num).',';
 		$sql .= ' ' . (! isset($this->entity) ? '1' : $this->entity);
 		$sql .= ')';
-		
+
 		$this->db->begin();
-		
+
 		$resql = $this->db->query($sql);
 		if (! $resql) {
 			$error ++;
 			$this->errors[] = 'Error ' . $this->db->lasterror();
 			dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
 		}
-		
+
 		if (! $error) {
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . $this->table_element);
-			
+
 			if (! $notrigger) {
 				// Uncomment this and change MYOBJECT to your own tag if you
 				// want this action to call a trigger.
@@ -458,7 +454,7 @@ class BookKeeping extends CommonObject
 				// // End call triggers
 			}
 		}
-		
+
 		// Commit or rollback
 		if ($error) {
 			$this->db->rollback();
@@ -470,7 +466,7 @@ class BookKeeping extends CommonObject
 			return $this->id;
 		}
 	}
-	
+
 	/**
 	 * Load object in memory from the database
 	 *
@@ -481,9 +477,9 @@ class BookKeeping extends CommonObject
 	 */
 	public function fetch($id, $ref = null) {
 		global $conf;
-		
+
 	    dol_syslog(__METHOD__, LOG_DEBUG);
-		
+
 		$sql = 'SELECT';
 		$sql .= ' t.rowid,';
 		$sql .= " t.doc_date,";
@@ -510,15 +506,15 @@ class BookKeeping extends CommonObject
 		} else {
 			$sql .= ' AND t.rowid = ' . $id;
 		}
-		
+
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$numrows = $this->db->num_rows($resql);
 			if ($numrows) {
 				$obj = $this->db->fetch_object($resql);
-				
+
 				$this->id = $obj->rowid;
-				
+
 				$this->doc_date = $this->db->jdate($obj->doc_date);
 				$this->doc_type = $obj->doc_type;
 				$this->doc_ref = $obj->doc_ref;
@@ -537,7 +533,7 @@ class BookKeeping extends CommonObject
 				$this->piece_num = $obj->piece_num;
 			}
 			$this->db->free($resql);
-			
+
 			if ($numrows) {
 				return 1;
 			} else {
@@ -565,9 +561,9 @@ class BookKeeping extends CommonObject
 	 */
 	public function fetchAllByAccount($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND') {
 		global $conf;
-		
-	    dol_syslog(__METHOD__, LOG_DEBUG);
-		
+
+		dol_syslog(__METHOD__, LOG_DEBUG);
+
 		$sql = 'SELECT';
 		$sql .= ' t.rowid,';
 		$sql .= " t.doc_date,";
@@ -622,16 +618,16 @@ class BookKeeping extends CommonObject
 			$sql .= ' ' . $this->db->plimit($limit + 1, $offset);
 		} 
 		$this->lines = array ();
-		
+
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$num = $this->db->num_rows($resql);
-			
+
 			while ( $obj = $this->db->fetch_object($resql) ) {
 				$line = new BookKeepingLine();
-				
+
 				$line->id = $obj->rowid;
-				
+
 				$line->doc_date = $this->db->jdate($obj->doc_date);
 				$line->doc_type = $obj->doc_type;
 				$line->doc_ref = $obj->doc_ref;
@@ -648,16 +644,16 @@ class BookKeeping extends CommonObject
 				$line->import_key = $obj->import_key;
 				$line->code_journal = $obj->code_journal;
 				$line->piece_num = $obj->piece_num;
-				
+
 				$this->lines[] = $line;
 			}
 			$this->db->free($resql);
-			
+
 			return $num;
 		} else {
 			$this->errors[] = 'Error ' . $this->db->lasterror();
 			dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
-			
+
 			return - 1;
 		}
 	}
@@ -677,9 +673,9 @@ class BookKeeping extends CommonObject
 	 */
 	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND') {
 		global $conf;
-		
+
 	    dol_syslog(__METHOD__, LOG_DEBUG);
-		
+
 		$sql = 'SELECT';
 		$sql .= ' t.rowid,';
 		$sql .= " t.doc_date,";
@@ -723,7 +719,7 @@ class BookKeeping extends CommonObject
 		if (count($sqlwhere) > 0) {
 			$sql .= ' AND ' . implode(' ' . $filtermode . ' ', $sqlwhere);
 		}
-		
+
 		if (! empty($sortfield)) {
 			$sql .= $this->db->order($sortfield, $sortorder);
 		}
@@ -731,16 +727,16 @@ class BookKeeping extends CommonObject
 			$sql .= ' ' . $this->db->plimit($limit + 1, $offset);
 		}
 		$this->lines = array ();
-		
+
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$num = $this->db->num_rows($resql);
-			
+
 			while ( $obj = $this->db->fetch_object($resql) ) {
 				$line = new BookKeepingLine();
-				
+
 				$line->id = $obj->rowid;
-				
+
 				$line->doc_date = $this->db->jdate($obj->doc_date);
 				$line->doc_type = $obj->doc_type;
 				$line->doc_ref = $obj->doc_ref;
@@ -757,20 +753,20 @@ class BookKeeping extends CommonObject
 				$line->import_key = $obj->import_key;
 				$line->code_journal = $obj->code_journal;
 				$line->piece_num = $obj->piece_num;
-				
+
 				$this->lines[] = $line;
 			}
 			$this->db->free($resql);
-			
+
 			return $num;
 		} else {
 			$this->errors[] = 'Error ' . $this->db->lasterror();
 			dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
-			
+
 			return - 1;
 		}
 	}
-	
+
 	/**
 	 * Load object in memory from the database
 	 *
@@ -785,9 +781,9 @@ class BookKeeping extends CommonObject
 	 */
 	public function fetchAllBalance($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND') {
 		global $conf;
-		
+
 	    dol_syslog(__METHOD__, LOG_DEBUG);
-	
+
 		$sql = 'SELECT';
 		$sql .= " t.numero_compte,";
 		$sql .= " SUM(t.debit) as debit,";
@@ -817,9 +813,9 @@ class BookKeeping extends CommonObject
 		if (count($sqlwhere) > 0) {
 			$sql .= ' AND ' . implode(' ' . $filtermode . ' ', $sqlwhere);
 		}
-		
+
 		$sql .= ' GROUP BY t.numero_compte';
-	
+
 		if (! empty($sortfield)) {
 			$sql .= $this->db->order($sortfield, $sortorder); 
 		}
@@ -827,30 +823,30 @@ class BookKeeping extends CommonObject
 			$sql .= ' ' . $this->db->plimit($limit + 1, $offset);
 		}
 		$this->lines = array ();
-	
+
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$num = $this->db->num_rows($resql);
-	
+
 			while ( $obj = $this->db->fetch_object($resql) ) {
 				$line = new BookKeepingLine();
-				
+
 				$line->numero_compte = $obj->numero_compte;
 				$line->debit = $obj->debit;
 				$line->credit = $obj->credit;
 				$this->lines[] = $line;
 			}
 			$this->db->free($resql);
-	
+
 			return $num;
 		} else {
 			$this->errors[] = 'Error ' . $this->db->lasterror();
 			dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
-	
+
 			return - 1;
 		}
 	}
-	
+
 	/**
 	 * Update object into database
 	 *
@@ -861,11 +857,10 @@ class BookKeeping extends CommonObject
 	 */
 	public function update(User $user, $notrigger = false) {
 		$error = 0;
-		
+
 		dol_syslog(__METHOD__, LOG_DEBUG);
-		
+
 		// Clean parameters
-		
 		if (isset($this->doc_type)) {
 			$this->doc_type = trim($this->doc_type);
 		}
@@ -911,10 +906,10 @@ class BookKeeping extends CommonObject
 		if (isset($this->piece_num)) {
 			$this->piece_num = trim($this->piece_num);
 		}
-		
+
 		// Check parameters
 		// Put here code to add a control on parameters values
-		
+
 		// Update request
 		$sql = 'UPDATE ' . MAIN_DB_PREFIX . $this->table_element . ' SET';
 		$sql .= ' doc_date = ' . (! isset($this->doc_date) || dol_strlen($this->doc_date) != 0 ? "'" . $this->db->idate($this->doc_date) . "'" : 'null') . ',';
@@ -934,16 +929,16 @@ class BookKeeping extends CommonObject
 		$sql .= ' code_journal = ' . (isset($this->code_journal) ? "'" . $this->db->escape($this->code_journal) . "'" : "null") . ',';
 		$sql .= ' piece_num = ' . (isset($this->piece_num) ? $this->piece_num : "null");
 		$sql .= ' WHERE rowid=' . $this->id;
-		
+
 		$this->db->begin();
-		
+
 		$resql = $this->db->query($sql);
 		if (! $resql) {
 			$error ++;
 			$this->errors[] = 'Error ' . $this->db->lasterror();
 			dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
 		}
-		
+
 		if (! $error && ! $notrigger) {
 			// Uncomment this and change MYOBJECT to your own tag if you
 			// want this action calls a trigger.
@@ -953,19 +948,19 @@ class BookKeeping extends CommonObject
 			// if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
 			// // End call triggers
 		}
-		
+
 		// Commit or rollback
 		if ($error) {
 			$this->db->rollback();
-			
+
 			return - 1 * $error;
 		} else {
 			$this->db->commit();
-			
+
 			return 1;
 		}
 	}
-	
+
 	/**
 	 * Delete object in database
 	 *
@@ -976,27 +971,27 @@ class BookKeeping extends CommonObject
 	 */
 	public function delete(User $user, $notrigger = false) {
 		dol_syslog(__METHOD__, LOG_DEBUG);
-		
+
 		$error = 0;
-		
+
 		$this->db->begin();
-		
+
 		if (! $error) {
 			if (! $notrigger) {
 				// Uncomment this and change MYOBJECT to your own tag if you
 				// want this action calls a trigger.
-				
+
 				// // Call triggers
 				// $result=$this->call_trigger('MYOBJECT_DELETE',$user);
 				// if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
 				// // End call triggers
 			}
 		}
-		
+
 		if (! $error) {
 			$sql = 'DELETE FROM ' . MAIN_DB_PREFIX . $this->table_element;
 			$sql .= ' WHERE rowid=' . $this->id;
-			
+
 			$resql = $this->db->query($sql);
 			if (! $resql) {
 				$error ++;
@@ -1004,19 +999,19 @@ class BookKeeping extends CommonObject
 				dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
 			}
 		}
-		
+
 		// Commit or rollback
 		if ($error) {
 			$this->db->rollback();
-			
+
 			return - 1 * $error;
 		} else {
 			$this->db->commit();
-			
+
 			return 1;
 		}
 	}
-	
+
 	/**
 	 * Delete bookkepping by importkey
 	 *
@@ -1025,25 +1020,25 @@ class BookKeeping extends CommonObject
 	 */
 	function deleteByImportkey($importkey) {
 		$this->db->begin();
-		
+
 		// first check if line not yet in bookkeeping
 		$sql = "DELETE";
 		$sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element;
 		$sql .= " WHERE import_key = '" . $importkey . "'";
-		
+
 		$resql = $this->db->query($sql);
-		
+
 		if (! $resql) {
 			$this->errors[] = "Error " . $this->db->lasterror();
 			dol_syslog(get_class($this)."::delete Error " . $this->db->lasterror(), LOG_ERR);
 			$this->db->rollback();
 			return - 1;
 		}
-		
+
 		$this->db->commit();
 		return 1;
 	}
-	
+
 	/**
 	 * Delete bookkepping by year
 	 *
@@ -1053,14 +1048,14 @@ class BookKeeping extends CommonObject
 	 */
 	function deleteByYearAndJournal($delyear='', $journal='') {
 	    global $conf;
-	    
+
 	    if (empty($delyear) && empty($journal)) 
 	    {
 	        return -1;
 	    }
-	    
+
 		$this->db->begin();
-		
+
 		// first check if line not yet in bookkeeping
 		$sql = "DELETE";
 		$sql.= " FROM " . MAIN_DB_PREFIX . $this->table_element;
@@ -1069,7 +1064,7 @@ class BookKeeping extends CommonObject
 		if (! empty($journal)) $sql.= " AND code_journal = '".$journal."'";
 	    $sql .= " AND entity IN (" . getEntity("accountancy", 1) . ")";
 		$resql = $this->db->query($sql);
-		
+
 		if (! $resql) {
 			$this->errors[] = "Error " . $this->db->lasterror();
 			foreach ( $this->errors as $errmsg ) {
@@ -1079,11 +1074,11 @@ class BookKeeping extends CommonObject
 			$this->db->rollback();
 			return -1;
 		}
-		
+
 		$this->db->commit();
 		return 1;
 	}
-	
+
 	/**
 	 * Delete bookkepping by piece number
 	 *
@@ -1092,17 +1087,17 @@ class BookKeeping extends CommonObject
 	 */
 	function deleteMvtNum($piecenum) {
 	    global $conf;
-	    
+
 		$this->db->begin();
-		
+
 		// first check if line not yet in bookkeeping
 		$sql = "DELETE";
 		$sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element;
 		$sql .= " WHERE piece_num = " . $piecenum;
 	    $sql .= " AND entity IN (" . getEntity("accountancy", 1) . ")";
-		
+
 		$resql = $this->db->query($sql);
-		
+
 		if (! $resql) {
 			$this->errors[] = "Error " . $this->db->lasterror();
 			foreach ( $this->errors as $errmsg ) {
@@ -1112,11 +1107,11 @@ class BookKeeping extends CommonObject
 			$this->db->rollback();
 			return - 1;
 		}
-		
+
 		$this->db->commit();
 		return 1;
 	}
-	
+
 	/**
 	 * Load an object from its id and create a new one in database
 	 *
@@ -1126,43 +1121,43 @@ class BookKeeping extends CommonObject
 	 */
 	public function createFromClone($fromid) {
 		dol_syslog(__METHOD__, LOG_DEBUG);
-		
+
 		global $user;
 		$error = 0;
 		$object = new Accountingbookkeeping($this->db);
-		
+
 		$this->db->begin();
-		
+
 		// Load source object
 		$object->fetch($fromid);
 		// Reset object
 		$object->id = 0;
-		
+
 		// Clear fields
 		// ...
-		
+
 		// Create clone
 		$result = $object->create($user);
-		
+
 		// Other options
 		if ($result < 0) {
 			$error ++;
 			$this->errors = $object->errors;
 			dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
 		}
-		
+
 		// End
 		if (! $error) {
 			$this->db->commit();
-			
+
 			return $object->id;
 		} else {
 			$this->db->rollback();
-			
+
 			return - 1;
 		}
 	}
-	
+
 	/**
 	 * Initialise object with example values
 	 * Id must be 0 if object instance is a specimen
@@ -1171,9 +1166,9 @@ class BookKeeping extends CommonObject
 	 */
 	public function initAsSpecimen() {
 		global $user;
-		
+
 		$now=dol_now();
-		
+
 		$this->id = 0;
 		$this->doc_date = $now;
 		$this->doc_type = '';
@@ -1192,7 +1187,7 @@ class BookKeeping extends CommonObject
 		$this->code_journal = '';
 		$this->piece_num = '';
 	}
-	
+
 	/**
 	 * Load an accounting document into memory from database
 	 *
@@ -1201,17 +1196,17 @@ class BookKeeping extends CommonObject
 	 */
 	public function fetchPerMvt($piecenum) {
 		global $conf;
-		
+
 	    $sql = "SELECT piece_num,doc_date,code_journal,doc_ref,doc_type";
 		$sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element;
 		$sql .= " WHERE piece_num = " . $piecenum;
 	    $sql .= " AND entity IN (" . getEntity("accountancy", 1) . ")";
-		
+
 		dol_syslog(get_class($this) . "::" . __METHOD__, LOG_DEBUG);
 		$result = $this->db->query($sql);
 		if ($result) {
 			$obj = $this->db->fetch_object($result);
-			
+
 			$this->piece_num = $obj->piece_num;
 			$this->code_journal = $obj->code_journal;
 			$this->doc_date = $this->db->jdate($obj->doc_date);
@@ -1225,7 +1220,7 @@ class BookKeeping extends CommonObject
 		
 		return 1;
 	}
-	
+
 	/**
 	 * Return next number movement
 	 *
@@ -1234,10 +1229,10 @@ class BookKeeping extends CommonObject
 	public function getNextNumMvt() 
 	{
 	    global $conf;
-	    
+
 		$sql = "SELECT MAX(piece_num)+1 as max FROM " . MAIN_DB_PREFIX . $this->table_element;
 	    $sql .= " WHERE entity IN (" . getEntity("accountancy", 1) . ")";
-		
+
 		dol_syslog(get_class($this) . "getNextNumMvt sql=" . $sql, LOG_DEBUG);
 		$result = $this->db->query($sql);
 
@@ -1252,7 +1247,7 @@ class BookKeeping extends CommonObject
 			return - 1;
 		}
 	}
-	
+
 	/**
 	 * Load all informations of accountancy document
 	 *
@@ -1261,7 +1256,7 @@ class BookKeeping extends CommonObject
 	 */
 	function fetch_all_per_mvt($piecenum) {
 	    global $conf;
-	    
+
 		$sql = "SELECT rowid, doc_date, doc_type,";
 		$sql .= " doc_ref, fk_doc, fk_docdet, code_tiers,";
 		$sql .= " numero_compte, label_compte, debit, credit,";
@@ -1269,17 +1264,17 @@ class BookKeeping extends CommonObject
 		$sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element;
 		$sql .= " WHERE piece_num = " . $piecenum;
 	    $sql .= " AND entity IN (" . getEntity("accountancy", 1) . ")";
-		
+
 		dol_syslog(get_class($this) . "::" . __METHOD__, LOG_DEBUG);
 		$result = $this->db->query($sql);
 		if ($result) {
-			
+
 			while ( $obj = $this->db->fetch_object($result) ) {
-				
+
 				$line = new BookKeepingLine();
-				
+
 				$line->id = $obj->rowid;
-				
+
 				$line->doc_date = $this->db->jdate($obj->doc_date);
 				$line->doc_type = $obj->doc_type;
 				$line->doc_ref = $obj->doc_ref;
@@ -1294,7 +1289,7 @@ class BookKeeping extends CommonObject
 				$line->sens = $obj->sens;
 				$line->code_journal = $obj->code_journal;
 				$line->piece_num = $obj->piece_num;
-				
+
 				$this->linesmvt[] = $line;
 			}
 		} else {
@@ -1305,7 +1300,7 @@ class BookKeeping extends CommonObject
 		
 		return 1;
 	}
-	
+
 	/**
 	 * Export bookkeping
 	 *
@@ -1314,27 +1309,27 @@ class BookKeeping extends CommonObject
 	 */
 	function export_bookkeping($model = 'ebp') {
 	    global $conf;
-	    
+
 		$sql = "SELECT rowid, doc_date, doc_type,";
 		$sql .= " doc_ref, fk_doc, fk_docdet, code_tiers,";
 		$sql .= " numero_compte, label_compte, debit, credit,";
 		$sql .= " montant, sens, fk_user_author, import_key, code_journal, piece_num";
 		$sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element;
 	    $sql .= " WHERE entity IN (" . getEntity("accountancy", 1) . ")";
-		
+
 		dol_syslog(get_class($this) . "::export_bookkeping", LOG_DEBUG);
-		
+
 		$resql = $this->db->query($sql);
-		
+
 		if ($resql) {
 			$this->linesexport = array ();
-			
+
 			$num = $this->db->num_rows($resql);
 			while ( $obj = $this->db->fetch_object($resql) ) {
 				$line = new BookKeepingLine();
-				
+
 				$line->id = $obj->rowid;
-				
+
 				$line->doc_date = $this->db->jdate($obj->doc_date);
 				$line->doc_type = $obj->doc_type;
 				$line->doc_ref = $obj->doc_ref;
@@ -1349,11 +1344,11 @@ class BookKeeping extends CommonObject
 				$line->sens = $obj->sens;
 				$line->code_journal = $obj->code_journal;
 				$line->piece_num = $obj->piece_num;
-				
+
 				$this->linesexport[] = $line;
 			}
 			$this->db->free($resql);
-			
+
 			return $num;
 		} else {
 			$this->error = "Error " . $this->db->lasterror();
@@ -1433,8 +1428,7 @@ class BookKeeping extends CommonObject
         return $out;
     }
 
-  
-	
+
 	/**
 	* Description of a root accounting account 
 	*
@@ -1442,10 +1436,10 @@ class BookKeeping extends CommonObject
 	* @return 	string 	            Root account
 	*/
 	function get_compte_racine($account = null)
-	{	
+	{
 		global $conf;
 		$pcgver = $conf->global->CHARTOFACCOUNTS;
-        
+
         $sql  = "SELECT root.account_number, root.label as label";
         $sql .= " FROM " . MAIN_DB_PREFIX . "accounting_account as aa";
         $sql .= " INNER JOIN " . MAIN_DB_PREFIX . "accounting_system as asy ON aa.fk_pcg_version = asy.pcg_version";
@@ -1456,7 +1450,7 @@ class BookKeeping extends CommonObject
         $sql .= " AND parent.active = 1";
         $sql .= " AND root.active = 1";
         $sql .= " AND aa.entity IN (" . getEntity("accountancy", 1) . ")";
-        
+
 		dol_syslog(get_class($this) . "::select_account sql=" . $sql, LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql) {
@@ -1464,9 +1458,9 @@ class BookKeeping extends CommonObject
 			if ($this->db->num_rows($resql)) {
 				$obj = $this->db->fetch_object($resql);	
 			}
-							
+
 			return $obj->label;
-			
+
 		} else {
 			$this->error = "Error " . $this->db->lasterror();
 			dol_syslog(__METHOD__ . " " . $this->error, LOG_ERR);
@@ -1483,9 +1477,9 @@ class BookKeeping extends CommonObject
 	* @return 	string 	            Account desc
 	*/
 	function get_compte_desc($account = null)
-	{	
+	{
 		global $conf;
-		
+
 		$pcgver = $conf->global->CHARTOFACCOUNTS;
 		$sql  = "SELECT aa.account_number, aa.label, aa.rowid, aa.fk_pcg_version, cat.label as category";
 		$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_account as aa ";
@@ -1495,7 +1489,7 @@ class BookKeeping extends CommonObject
 		$sql .= " AND aa.active = 1";
 		$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_accounting_category as cat ON aa.fk_accounting_category = cat.rowid";
 	    $sql .= " WHERE aa.entity IN (" . getEntity("accountancy", 1) . ")";
-		
+
 		dol_syslog(get_class($this) . "::select_account sql=" . $sql, LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql) {
@@ -1503,12 +1497,10 @@ class BookKeeping extends CommonObject
 			if ($this->db->num_rows($resql)) {
 				$obj = $this->db->fetch_object($resql);	
 			}
-			
-			if(empty($obj->category)){				
+			if(empty($obj->category)){
 				return $obj->label;
 			}else{
 				return $obj->label.' ('.$obj->category.')';
-				
 			}
 		} else {
 			$this->error = "Error " . $this->db->lasterror();
diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index d1602bedf00..0b19697ef2b 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -34,6 +34,7 @@ require_once DOL_DOCUMENT_ROOT . '/core/lib/report.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/bank.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php';
 require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
 require_once DOL_DOCUMENT_ROOT . '/user/class/user.class.php';
 require_once DOL_DOCUMENT_ROOT . '/adherents/class/adherent.class.php';
@@ -63,7 +64,10 @@ $langs->load("accountancy");
 $langs->load("trips");
 $langs->load("hrm");
 
+// Old system menu
 $id_bank_account = GETPOST('id_account', 'int');
+// Multi journal
+$code_journal = GETPOST('code_journal', 'alpha');
 
 $date_startmonth = GETPOST('date_startmonth');
 $date_startday = GETPOST('date_startday');
@@ -83,9 +87,9 @@ if ($user->societe_id > 0 && empty($id_bank_account))
 /*
  * Actions
  */
-	
+
 $error = 0;
-	
+
 $year_current = strftime("%Y", dol_now());
 $pastmonth = strftime("%m", dol_now()) - 1;
 $pastmonthyear = $year_current;
@@ -134,9 +138,20 @@ $paymentsalstatic = new PaymentSalary($db);
 $paymentexpensereportstatic = new PaymentExpenseReport($db);
 
 // Get code of finance journal
-$bank_code_journal = new Account($db);
-$result = $bank_code_journal->fetch($id_bank_account);
-$journal = $bank_code_journal->accountancy_journal;
+$journal = '';
+$bankstatic = new Account($db);
+$bankstatic->fetch($id_bank_account);
+$bankstatic->rowid;
+$bankstatic->label;
+$bankstatic->fk_accountancy_journal;
+
+$accountingjournalstatic = new AccountingJournal($db);
+if(! empty($id_bank_account) {
+	$accountingjournalstatic->fetch($bankstatic->fk_accountancy_journal);
+} else {
+	$accountingjournalstatic->fetch('',$code_journal);
+}
+$journal = $accountingjournalstatic->code;
 
 dol_syslog("accountancy/journal/bankjournal.php", LOG_DEBUG);
 $result = $db->query($sql);
@@ -179,7 +194,7 @@ if ($result) {
 				'name' => $obj->name,
 		        'code_compta' => $compta_soc,
 		);
-		
+
 		$compta_user = (! empty($obj->accountancy_code) ? $obj->accountancy_code : $account_employee);
 
 		$tabuser[$obj->rowid] = array (
@@ -205,8 +220,8 @@ if ($result) {
 		if (is_array($links)) {
 		    // Now loop on each link of record in bank.
 			foreach ( $links as $key => $val ) {
-			    
-			    if (in_array($links[$key]['type'], array('sc', 'payment_sc', 'payment', 'payment_supplier', 'payment_vat', 'payment_expensereport')))     // So we excluded 'company' here
+
+			    if (in_array($links[$key]['type'], array('sc', 'payment_sc', 'payment', 'payment_supplier', 'payment_vat', 'payment_expensereport', 'banktransfert')))     // So we excluded 'company' here
 			    {
 			        // We save tabtype for a future use, to remember what kind of payment it is 
 			        $tabtype[$obj->rowid] = $links[$key]['type'];
@@ -330,11 +345,11 @@ if (! $error && $action == 'writebookkeeping') {
 
 	$error = 0;
 	foreach ( $tabpay as $key => $val ) {      // $key is rowid into llx_bank
-		
+
 	    $errorforline = 0;
-	    
+
 	    $db->begin();
-	    
+
 		// Bank
 		if (! $errorforline)
 		{
@@ -473,6 +488,9 @@ if (! $error && $action == 'writebookkeeping') {
         				}
                         $bookkeeping->code_tiers = $tabcompany[$key]['code_compta'];
         				$bookkeeping->numero_compte = $k;
+        			} else if ($tabtype[$key] == 'banktransfert') {
+						$bookkeeping->code_tiers = '';
+        				$bookkeeping->numero_compte = $k;
         			} else {
         			    // FIXME Should be a temporary account ???
         				$bookkeeping->doc_ref = $k;
@@ -705,17 +723,17 @@ if (empty($action) || $action == 'view') {
 	$invoicestatic = new Facture($db);
 	$invoicesupplierstatic = new FactureFournisseur($db);
 	$expensereportstatic = new ExpenseReport($db);
-	
+
 	llxHeader('', $langs->trans("FinanceJournal"));
 
-	$nom = $langs->trans("FinanceJournal") . ' - ' . $bank_code_journal->getNomUrl(1);
+	$nom = $langs->trans("FinanceJournal") . ' - ' . $bankstatic->getNomUrl(1);
 	$builddate = time();
 	//$description = $langs->trans("DescFinanceJournal") . '<br>';
 	$description.= $langs->trans("DescJournalOnlyBindedVisible").'<br>';
 	$period = $form->select_date($date_start, 'date_start', 0, 0, 0, '', 1, 0, 1) . ' - ' . $form->select_date($date_end, 'date_end', 0, 0, 0, '', 1, 0, 1);
 
 	$varlink = 'id_account=' . $id_bank_account;
-	
+
 	journalHead($nom, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, array('action' => ''), '', $varlink);
 
 	/*if ($conf->global->ACCOUNTING_EXPORT_MODELCSV != 1 && $conf->global->ACCOUNTING_EXPORT_MODELCSV != 2) {

From b0f2e95c7b678ea7cd1911b7b18b6e8160218380 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Sun, 28 May 2017 22:11:57 +0200
Subject: [PATCH 496/505] Debug

---
 htdocs/accountancy/journal/bankjournal.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index 0b19697ef2b..ea98d678671 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -142,11 +142,12 @@ $journal = '';
 $bankstatic = new Account($db);
 $bankstatic->fetch($id_bank_account);
 $bankstatic->rowid;
+$bankstatic->number;
 $bankstatic->label;
 $bankstatic->fk_accountancy_journal;
 
 $accountingjournalstatic = new AccountingJournal($db);
-if(! empty($id_bank_account) {
+if(! empty($id_bank_account)) {
 	$accountingjournalstatic->fetch($bankstatic->fk_accountancy_journal);
 } else {
 	$accountingjournalstatic->fetch('',$code_journal);
@@ -870,9 +871,9 @@ if (empty($action) || $action == 'view') {
 			else print $accountoshow;
 			print "</td>";
 			if ($val['soclib'] == '') {
-				print "<td>" . $bank_code_journal->label . " - " . $val["ref"] . "</td>";
+				print "<td>" . $bankstatic->label . " - " . $val["ref"] . "</td>";
 			} else {
-				print "<td>" . $bank_code_journal->label . " - " . $val['soclib'] . "</td>";
+				print "<td>" . $bankstatic->label . " - " . $val['soclib'] . "</td>";
 			}
 			print "<td>" . $val["type_payment"] . "</td>";
 			print "<td align='right'>" . ($mt >= 0 ? price($mt) : '') . "</td>";

From d03d179fa31baa67c32709e5f2d3eadc3906e309 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 28 May 2017 23:43:24 +0200
Subject: [PATCH 497/505] FIX Fullname when member is a moral entity with no
 name.

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

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 868ec97d349..529bb20a89b 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -397,8 +397,8 @@ abstract class CommonObject
         //print "lastname=".$this->lastname." name=".$this->name." nom=".$this->nom."<br>\n";
         $lastname=$this->lastname;
         $firstname=$this->firstname;
-        if (empty($lastname))  $lastname=(isset($this->lastname)?$this->lastname:(isset($this->name)?$this->name:(isset($this->nom)?$this->nom:'')));
-
+        if (empty($lastname))  $lastname=(isset($this->lastname)?$this->lastname:(isset($this->name)?$this->name:(isset($this->nom)?$this->nom:(isset($this->societe)?$this->societe:(isset($this->company)?$this->company:'')))));
+        
         $ret='';
         if ($option && $this->civility_id)
         {

From d0f01085d882f497f25ed039a0e93b167b179952 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 29 May 2017 02:44:14 +0200
Subject: [PATCH 498/505] Add more information on stripe payment

---
 htdocs/public/stripe/newpayment.php | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/htdocs/public/stripe/newpayment.php b/htdocs/public/stripe/newpayment.php
index a430baafb59..01ae19c7032 100644
--- a/htdocs/public/stripe/newpayment.php
+++ b/htdocs/public/stripe/newpayment.php
@@ -181,6 +181,13 @@ if (! empty($conf->global->STRIPE_SECURITY_TOKEN))
     }
 }
 
+// Common variables
+$creditor=$mysoc->name;
+$paramcreditor='STRIPE_CREDITOR_'.$suffix;
+if (! empty($conf->global->$paramcreditor)) $creditor=$conf->global->$paramcreditor;
+else if (! empty($conf->global->STRIPE_CREDITOR)) $creditor=$conf->global->STRIPE_CREDITOR;
+
+
 
 /*
  * Actions
@@ -218,17 +225,20 @@ if ($action == 'charge')
         dol_syslog("Create customer", LOG_DEBUG, 0, '_stripe');
         $customer = \Stripe\Customer::create(array(
             'email' => $email,
-            'card'  => $stripeToken
-            // TODO
+            'description' => ($email?'Customer for '.$email:null),
+            'metadata' => array('ipaddress'=>$_SERVER['REMOTE_ADDR']),
+            'source'  => $stripeToken           // source can be a token OR array('object'=>'card', 'exp_month'=>xx, 'exp_year'=>xxxx, 'number'=>xxxxxxx, 'cvc'=>xxx, 'name'=>'Cardholder's full name', zip ?)
         ));
-         
+        // TODO Add 'business_vat_id' ?
+        
         dol_syslog("Create charge", LOG_DEBUG, 0, '_stripe');
         $charge = \Stripe\Charge::create(array(
             'customer' => $customer->id,
             'amount'   => price2num($amount, 'MU'),
             'currency' => $currency,
             'description' => 'Stripe payment: '.$FULLTAG,
-            'statement_descriptor' => dol_trunc(dol_trunc(dol_string_unaccent($mysoc->name), 6, 'right', 'UTF-8', 1).' '.$FULLTAG, 22, 'right', 'UTF-8', 1)     // 22 chars
+            'metadata' => array("FULLTAG" => $FULLTAG, 'Recipient' => $mysoc->name),
+            'statement_descriptor' => dol_trunc(dol_trunc(dol_string_unaccent($mysoc->name), 6, 'right', 'UTF-8', 1).' '.$FULLTAG, 22, 'right', 'UTF-8', 1)     // 22 chars that appears on bank receipt
         ));
     } catch(\Stripe\Error\Card $e) {
         // Since it's a decline, \Stripe\Error\Card will be caught
@@ -330,12 +340,6 @@ if (empty($conf->global->STRIPE_LIVE))
     dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode'),'','warning');
 }
 
-// Common variables
-$creditor=$mysoc->name;
-$paramcreditor='STRIPE_CREDITOR_'.$suffix;
-if (! empty($conf->global->$paramcreditor)) $creditor=$conf->global->$paramcreditor;
-else if (! empty($conf->global->STRIPE_CREDITOR)) $creditor=$conf->global->STRIPE_CREDITOR;
-
 print '<span id="dolpaymentspan"></span>'."\n";
 print '<div class="center">'."\n";
 print '<form id="dolpaymentform" class="center" name="paymentform" action="'.$_SERVER["PHP_SELF"].'" method="POST">'."\n";

From dad1abd55b4805bce9ab9fe7bf41ad57efba8b7d Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Mon, 29 May 2017 06:22:21 +0200
Subject: [PATCH 499/505] NEW : Move employee in dol_banner in salaries

---
 htdocs/compta/salaries/card.php | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/htdocs/compta/salaries/card.php b/htdocs/compta/salaries/card.php
index 0ea91dc2857..63b5139ce29 100644
--- a/htdocs/compta/salaries/card.php
+++ b/htdocs/compta/salaries/card.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2011-2016 Alexandre Spangaro   <aspangaro.dolibarr@gmail.com>
+/* Copyright (C) 2011-2017 Alexandre Spangaro   <aspangaro.dolibarr@gmail.com>
  * Copyright (C) 2014      Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2015      Jean-François Ferry	<jfefe@aternatik.fr>
  * Copyright (C) 2015      Charlie BENKE		<charlie@patas-monkey.com> 
@@ -331,23 +331,24 @@ if ($id)
 	dol_fiche_head($head, 'card', $langs->trans("SalaryPayment"), -1, 'payment');
 
     $linkback = '<a href="'.DOL_URL_ROOT.'/compta/salaries/index.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
-	
-    dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', '');
-    
+
+	$morehtmlref='<div class="refidno">';
+
+	$userstatic=new User($db);
+	$userstatic->fetch($object->fk_user);
+
+	$morehtmlref.=$langs->trans('Employee') . ' : ' . $userstatic->getNomUrl(1);
+	$morehtmlref.='</div>';
+
+    dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', '');
+
     print '<div class="fichecenter">';
 	print '<div class="underbanner clearboth"></div>';
 
     print '<table class="border" width="100%">';
 
-	// Employee
-	print '<tr><td class="titlefield">'.$langs->trans("Employee").'</td><td>';
-	$usersal=new User($db);
-	$usersal->fetch($object->fk_user);
-	print $usersal->getNomUrl(1);
-	print '</td></tr>';
-
 	// Label
-	print '<tr><td>'.$langs->trans("Label").'</td><td>'.$object->label.'</td></tr>';
+	print '<tr><td class="titlefield">'.$langs->trans("Label").'</td><td>'.$object->label.'</td></tr>';
 
 	print "<tr>";
 	print '<td>'.$langs->trans("DateStartPeriod").'</td><td colspan="3">';

From 0d3c5bcfa8638436c8b8b78d7344f7d3aa39dd9e Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Mon, 29 May 2017 06:35:53 +0200
Subject: [PATCH 500/505] Update documents & info page - better look & feel v6

---
 htdocs/compta/salaries/card.php     |  4 +--
 htdocs/compta/salaries/document.php | 43 ++++++++++++++++-------------
 htdocs/compta/salaries/info.php     | 31 +++++++++++++++++----
 3 files changed, 51 insertions(+), 27 deletions(-)

diff --git a/htdocs/compta/salaries/card.php b/htdocs/compta/salaries/card.php
index 63b5139ce29..68f59d03cfa 100644
--- a/htdocs/compta/salaries/card.php
+++ b/htdocs/compta/salaries/card.php
@@ -391,9 +391,9 @@ if ($id)
 	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
 
 	print '</table>';
-	
+
 	print '</div>';
-    
+
 	dol_fiche_end();
 
 	
diff --git a/htdocs/compta/salaries/document.php b/htdocs/compta/salaries/document.php
index 7b24a0762f3..03a69a764cf 100644
--- a/htdocs/compta/salaries/document.php
+++ b/htdocs/compta/salaries/document.php
@@ -6,7 +6,7 @@
  * Copyright (C) 2005      Simon TOSSER          <simon@kornog-computing.com>
  * Copyright (C) 2011-2012 Juanjo Menent         <jmenent@2byte.es>
  * Copyright (C) 2013      Cédric Salvador       <csalvador@gpcsolutions.fr>
- * Copyright (C) 2015-2016 Alexandre Spangaro    <aspangaro.dolibarr@gmail.com>
+ * Copyright (C) 2015-2017 Alexandre Spangaro    <aspangaro.dolibarr@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
@@ -36,7 +36,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/salaries.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/salaries/class/paymentsalary.class.php';
 
 $langs->load("other");
+$langs->load("users");
 $langs->load("salaries");
+$langs->load('hrm');
 $langs->load("companies");
 
 $id = GETPOST('id','int');
@@ -83,7 +85,6 @@ $form = new Form($db);
 
 llxHeader("",$langs->trans("SalaryPayment"));
 
-
 if ($object->id)
 {
 	$object->fetch_thirdparty();
@@ -92,7 +93,6 @@ if ($object->id)
 
 	dol_fiche_head($head, 'documents',  $langs->trans("SalaryPayment"), 0, 'payment');
 
-
 	// Construit liste des fichiers
 	$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
 	$totalsize=0;
@@ -101,29 +101,34 @@ if ($object->id)
 		$totalsize+=$file['size'];
 	}
 
+	$linkback = '<a href="'.DOL_URL_ROOT.'/compta/salaries/index.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
 
-    print '<table class="border" width="100%">';
+	$morehtmlref='<div class="refidno">';
 
-    $linkback = '<a href="'.DOL_URL_ROOT.'/compta/salaries/index.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
+	$userstatic=new User($db);
+	$userstatic->fetch($object->fk_user);
 
-	// Ref
-	print '<tr><td class="titlefield">'.$langs->trans("Ref").'</td><td>';
-	print $form->showrefnav($object, 'id', $linkback, 1, 'rowid', 'ref', '');
-	print '</td></tr>';
+	$morehtmlref.=$langs->trans('Employee') . ' : ' . $userstatic->getNomUrl(1);
+	$morehtmlref.='</div>';
 
-	// Societe
-	//print "<tr><td>".$langs->trans("Company")."</td><td>".$object->client->getNomUrl(1)."</td></tr>";
+	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', '');
 
-    print '<tr><td>'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
-    print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.$totalsize.' '.$langs->trans("bytes").'</td></tr>';
-    print '</table>';
+	print '<div class="fichecenter">';
+	print '<div class="underbanner clearboth"></div>';
 
-    print '</div>';
+	print '<table class="border" width="100%">';
+	print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
+	print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.$totalsize.' '.$langs->trans("bytes").'</td></tr>';
+	print '</table>';
 
-    $modulepart = 'salaries';
-    $permission = $user->rights->salaries->write;
-    $param = '&id=' . $object->id;
-    include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_post_headers.tpl.php';
+	print '</div>';
+
+	dol_fiche_end();
+
+	$modulepart = 'salaries';
+	$permission = $user->rights->salaries->write;
+	$param = '&id=' . $object->id;
+	include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_post_headers.tpl.php';
 
 }
 else
diff --git a/htdocs/compta/salaries/info.php b/htdocs/compta/salaries/info.php
index f15aac021ec..05dc7835b68 100644
--- a/htdocs/compta/salaries/info.php
+++ b/htdocs/compta/salaries/info.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2005-2015  Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2015		Charlie BENKE		 <charlie@patas-monkey.com>
+ * Copyright (C) 2015       Charlie BENKE        <charlie@patas-monkey.com>
+ * Copyright (C) 2017       Alexandre Spangaro   <aspangaro@zendsi.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
@@ -29,7 +30,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 $langs->load("compta");
 $langs->load("bills");
+$langs->load("users");
 $langs->load("salaries");
+$langs->load('hrm');
 
 $id=GETPOST('id','int');
 $action=GETPOST('action','aZ09');
@@ -46,21 +49,37 @@ $result = restrictedArea($user, 'salaries', '', '', '');
 
 llxHeader("",$langs->trans("SalaryPayment"));
 
-$salpayment = new PaymentSalary($db);
-$result = $salpayment->fetch($id);
-$salpayment->info($id);
+$object = new PaymentSalary($db);
+$object->fetch($id);
+$object->info($id);
 
-$head = salaries_prepare_head($salpayment);
+$head = salaries_prepare_head($object);
 
 dol_fiche_head($head, 'info', $langs->trans("SalaryPayment"), 0, 'payment');
 
+$linkback = '<a href="'.DOL_URL_ROOT.'/compta/salaries/index.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
+
+$morehtmlref='<div class="refidno">';
+
+$userstatic=new User($db);
+$userstatic->fetch($object->fk_user);
+
+$morehtmlref.=$langs->trans('Employee') . ' : ' . $userstatic->getNomUrl(1);
+$morehtmlref.='</div>';
+
+dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', '');
+
+print '<div class="fichecenter">';
+print '<div class="underbanner clearboth"></div>';
 
 print '<table width="100%"><tr><td>';
-dol_print_object_info($salpayment);
+dol_print_object_info($object);
 print '</td></tr></table>';
 
 print '</div>';
 
+dol_fiche_end();
+
 llxFooter();
 
 $db->close();

From 70636cc59ffa1ffbc0ce3dba315d7d9b837aad04 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 29 May 2017 09:57:05 +0200
Subject: [PATCH 501/505] FIX SQL injection on user/index.php parameter
 search_statut.

---
 htdocs/core/lib/functions.lib.php |  3 +++
 htdocs/user/index.php             | 16 ++++++++--------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 2db8ecdb111..c678e0bc7df 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -286,6 +286,9 @@ function GETPOST($paramname,$check='',$method=0,$filter=NULL,$options=NULL)
 	        case 'int':
 	            if (! is_numeric($out)) { $out=''; }
 	            break;
+	        case 'intcomma':
+	            if (preg_match('/[^0-9,]+/i',$out)) $out='';
+	            break;
 	        case 'alpha':
 	            $out=trim($out);
 	            // '"' is dangerous because param in url can close the href= or src= and add javascript functions.
diff --git a/htdocs/user/index.php b/htdocs/user/index.php
index 9e7c78f9799..35a05ad4be1 100644
--- a/htdocs/user/index.php
+++ b/htdocs/user/index.php
@@ -119,9 +119,9 @@ $search_gender=GETPOST('search_gender','alpha');
 $search_employee=GETPOST('search_employee','alpha');
 $search_accountancy_code=GETPOST('search_accountancy_code','alpha');
 $search_email=GETPOST('search_email','alpha');
-$search_statut=GETPOST('search_statut','alpha');
+$search_statut=GETPOST('search_statut','intcomma');
 $search_thirdparty=GETPOST('search_thirdparty','alpha');
-$search_supervisor=GETPOST('search_supervisor','alpha');
+$search_supervisor=GETPOST('search_supervisor','intcomma');
 $search_previousconn=GETPOST('search_previousconn','alpha');
 $optioncss = GETPOST('optioncss','alpha');
 
@@ -148,7 +148,7 @@ if (empty($reshook))
     include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
     // Purge search criteria
-    if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") ||GETPOST("button_removefilter")) // All test are required to be compatible with all browsers
+    if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") ||GETPOST("button_removefilter")) // All tests are required to be compatible with all browsers
     {
     	$search_user="";
     	$search_login="";
@@ -203,8 +203,8 @@ else
 }
 if ($socid > 0) $sql.= " AND u.fk_soc = ".$socid;
 //if ($search_user != '')       $sql.=natural_search(array('u.login', 'u.lastname', 'u.firstname'), $search_user);
-if ($search_supervisor > 0)   $sql.= " AND u.fk_user = ".$search_supervisor;
-if ($search_thirdparty != '') $sql.=natural_search(array('s.nom'), $search_thirdparty);
+if ($search_supervisor > 0)   $sql.= " AND u.fk_user = ".$db->escape($search_supervisor);
+if ($search_thirdparty != '') $sql.= natural_search(array('s.nom'), $search_thirdparty);
 if ($search_login != '')      $sql.= natural_search("u.login", $search_login);
 if ($search_lastname != '')   $sql.= natural_search("u.lastname", $search_lastname);
 if ($search_firstname != '')  $sql.= natural_search("u.firstname", $search_firstname);
@@ -213,9 +213,9 @@ if (is_numeric($search_employee) && $search_employee >= 0)    {
 	$sql .= ' AND u.employee = '.(int) $search_employee;
 }
 if ($search_accountancy_code != '')  $sql.= natural_search("u.accountancy_code", $search_accountancy_code);
-if ($search_email != '')  $sql.= natural_search("u.email", $search_email);
-if ($search_statut != '' && $search_statut >= 0) $sql.= " AND (u.statut=".$search_statut.")";
-if ($sall)                    $sql.= natural_search(array_keys($fieldstosearchall), $sall);
+if ($search_email != '')             $sql.= natural_search("u.email", $search_email);
+if ($search_statut != '' && $search_statut >= 0) $sql.= " AND u.statut IN (".$db->escape($search_statut).")";
+if ($sall)                           $sql.= natural_search(array_keys($fieldstosearchall), $sall);
 // Add where from extra fields
 foreach ($search_array_options as $key => $val)
 {

From aa0a369f06c28a635e23b276c1015c9d0bcb5e94 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 29 May 2017 10:15:10 +0200
Subject: [PATCH 502/505] Fix typo

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

diff --git a/htdocs/user/class/usergroup.class.php b/htdocs/user/class/usergroup.class.php
index 81c5e986444..41cbdc44964 100644
--- a/htdocs/user/class/usergroup.class.php
+++ b/htdocs/user/class/usergroup.class.php
@@ -68,7 +68,7 @@ class UserGroup extends CommonObject
 
 
 	/**
-	 *	Charge un objet group avec toutes ces caracteristiques (excpet ->members array)
+	 *	Charge un objet group avec toutes ces caracteristiques (except ->members array)
 	 *
 	 *	@param      int		$id			id du groupe a charger
 	 *	@param      string	$groupname	name du groupe a charger

From 85c3880479740994dad8dfc82d74fdfb588cc62f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 29 May 2017 10:58:41 +0200
Subject: [PATCH 503/505] Look and feel v6

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

diff --git a/htdocs/compta/deplacement/card.php b/htdocs/compta/deplacement/card.php
index 6bc4f628ba9..aa315e5c854 100644
--- a/htdocs/compta/deplacement/card.php
+++ b/htdocs/compta/deplacement/card.php
@@ -276,7 +276,7 @@ if ($action == 'create')
 
     // Public note
     print '<tr>';
-    print '<td class="border" valign="top">'.$langs->trans('NotePublic').'</td>';
+    print '<td class="tdtop">'.$langs->trans('NotePublic').'</td>';
     print '<td valign="top" colspan="2">';
 
     $doleditor = new DolEditor('note_public', GETPOST('note_public', 'alpha'), '', 200, 'dolibarr_notes', 'In', false, true, true, ROWS_8,'90%');
@@ -288,7 +288,7 @@ if ($action == 'create')
     if (empty($user->societe_id))
     {
         print '<tr>';
-        print '<td class="border" valign="top">'.$langs->trans('NotePrivate').'</td>';
+        print '<td class="tdtop">'.$langs->trans('NotePrivate').'</td>';
         print '<td valign="top" colspan="2">';
 
         $doleditor = new DolEditor('note_private', GETPOST('note_private', 'alpha'), '', 200, 'dolibarr_notes', 'In', false, true, true, ROWS_8, '90%');

From 30bc8b9a322cd4b88bef58bf58d0c18b9776d70b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 29 May 2017 11:00:36 +0200
Subject: [PATCH 504/505] Fix typo

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

diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index a170bc3f6e1..96973ad1b46 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -741,8 +741,8 @@ Hello=Hello
 Sincerely=Sincerely
 DeleteLine=Delete line
 ConfirmDeleteLine=Are you sure you want to delete this line?
-NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
-TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s records.
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked record
+TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s record.
 NoRecordSelected=No record selected
 MassFilesArea=Area for files built by mass actions
 ShowTempMassFilesArea=Show area of files built by mass actions

From 395d361d663420e1338f9ad6ce362c9dc098d12c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 29 May 2017 11:17:33 +0200
Subject: [PATCH 505/505] Look and feel v6

---
 htdocs/accountancy/admin/account.php         | 39 ++++++++-------
 htdocs/accountancy/admin/accountmodel.php    | 50 +------------------
 htdocs/accountancy/admin/categories_list.php |  7 +--
 htdocs/accountancy/admin/defaultaccounts.php |  1 -
 htdocs/compta/paiement.php                   |  9 +++-
 htdocs/expensereport/payment/card.php        |  1 +
 htdocs/expensereport/payment/payment.php     | 52 ++++++++++++--------
 htdocs/langs/en_US/accountancy.lang          |  2 +-
 8 files changed, 65 insertions(+), 96 deletions(-)

diff --git a/htdocs/accountancy/admin/account.php b/htdocs/accountancy/admin/account.php
index 62e35fa0f57..c2b6997d96e 100644
--- a/htdocs/accountancy/admin/account.php
+++ b/htdocs/accountancy/admin/account.php
@@ -55,7 +55,6 @@ if (! $user->rights->accounting->chartofaccount) accessforbidden();
 $limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'sortorder');
-$limit = GETPOST('limit') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $page = GETPOST("page", 'int');
 if ($page == - 1) {
 	$page = 0;
@@ -63,10 +62,8 @@ if ($page == - 1) {
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (! $sortfield)
-	$sortfield = "aa.account_number";
-if (! $sortorder)
-	$sortorder = "ASC";
+if (! $sortfield) $sortfield = "aa.account_number";
+if (! $sortorder) $sortorder = "ASC";
 
 $arrayfields=array(
     'aa.account_number'=>array('label'=>$langs->trans("AccountNumber"), 'checked'=>1),
@@ -79,6 +76,9 @@ $arrayfields=array(
 
 $accounting = new AccountingAccount($db);
 
+// Initialize technical object to manage context to save list fields
+$contextpage=GETPOST('contextpage','aZ')?GETPOST('contextpage','aZ'):'accountingaccountlist';
+
 
 /*
  * Actions
@@ -145,6 +145,7 @@ if (empty($reshook))
 /*
  * View
  */
+
 $form=new Form($db);
 
 llxHeader('', $langs->trans("ListAccounts"));
@@ -170,7 +171,6 @@ if (strlen(trim($search_label)))			$sql .= natural_search("aa.label", $search_la
 if (strlen(trim($search_accountparent)))	$sql .= natural_search("aa.account_parent", $search_accountparent);
 if (strlen(trim($search_pcgtype)))			$sql .= natural_search("aa.pcg_type", $search_pcgtype);
 if (strlen(trim($search_pcgsubtype)))		$sql .= natural_search("aa.pcg_subtype", $search_pcgsubtype);
-
 $sql .= $db->order($sortfield, $sortorder);
 
 // Count total nb of records
@@ -192,22 +192,29 @@ if ($resql)
 
     $params='';
 	if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
-	if ($search_account) $params.= '&amp;search_account='.urlencode($search_account);
-	if ($search_label) $params.= '&amp;search_label='.urlencode($search_label);
-	if ($search_accountparent) $params.= '&amp;search_accountparent='.urlencode($search_accountparent);
-	if ($search_pcgtype) $params.= '&amp;search_pcgtype='.urlencode($search_pcgtype);
-	if ($search_pcgsubtype) $params.= '&amp;search_pcgsubtype='.urlencode($search_pcgsubtype);
+	if ($search_account) $params.= '&search_account='.urlencode($search_account);
+	if ($search_label) $params.= '&search_label='.urlencode($search_label);
+	if ($search_accountparent) $params.= '&search_accountparent='.urlencode($search_accountparent);
+	if ($search_pcgtype) $params.= '&search_pcgtype='.urlencode($search_pcgtype);
+	if ($search_pcgsubtype) $params.= '&search_pcgsubtype='.urlencode($search_pcgsubtype);
     if ($optioncss != '') $param.='&optioncss='.$optioncss;
 
 
-	print '<form method="GET" action="' . $_SERVER["PHP_SELF"] . '">';
+	print '<form method="POST" id="searchFormList" action="' . $_SERVER["PHP_SELF"] . '">';
+	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+	print '<input type="hidden" name="action" value="list">';
+	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+	print '<input type="hidden" name="page" value="'.$page.'">';
+	print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 	
 	$htmlbuttonadd = '<a class="butAction" href="./card.php?action=create">' . $langs->trans("Addanaccount") . '</a>';
 	
     print_barre_liste($langs->trans('ListAccounts'), $page, $_SERVER["PHP_SELF"], $params, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_accountancy', 0, $htmlbuttonadd);
 	
 	// Box to select active chart of account
-    $var = ! $var;
     print $langs->trans("Selectchartofaccounts") . " : ";
     print '<select class="flat" name="chartofaccounts" id="chartofaccounts">';
     $sql = "SELECT rowid, pcg_version, label, active";
@@ -215,12 +222,10 @@ if ($resql)
     $sql .= " WHERE active = 1";
     dol_syslog('accountancy/admin/account.php:: $sql=' . $sql);
     $resqlchart = $db->query($sql);
-    $var = true;
     if ($resqlchart) {
         $numbis = $db->num_rows($resqlchart);
         $i = 0;
         while ( $i < $numbis ) {
-            $var = ! $var;
             $row = $db->fetch_row($resqlchart);
     
             print '<option value="' . $row[0] . '"';
@@ -268,7 +273,8 @@ if ($resql)
 	$accountstatic = new AccountingAccount($db);
 	$accountparent = new AccountingAccount($db);
 
-	while ( $i < min($num, $limit) ) 
+	$i=0;
+	while ($i < min($num, $limit)) 
 	{
 		$obj = $db->fetch_object($resql);
 
@@ -367,7 +373,6 @@ if ($resql)
 		if (! $i) $totalarray['nbfield']++;
 		
 		print "</tr>\n";
-		$var = ! $var;
 		$i++;
 	}
 	
diff --git a/htdocs/accountancy/admin/accountmodel.php b/htdocs/accountancy/admin/accountmodel.php
index ca26c35c442..e63e44b4f80 100644
--- a/htdocs/accountancy/admin/accountmodel.php
+++ b/htdocs/accountancy/admin/accountmodel.php
@@ -217,21 +217,6 @@ if ($id == 25)
 	}
 }
 
-// Define localtax_typeList (used for dictionary "llx_c_tva")
-$localtax_typeList = array();
-if ($id == 10)
-{
-	$localtax_typeList = array(
-			"0" => $langs->trans("No"),
-			"1" => $langs->trans("Yes").' ('.$langs->trans("Type")." 1)",	//$langs->trans("%ageOnAllWithoutVAT"),
-			"2" => $langs->trans("Yes").' ('.$langs->trans("Type")." 2)",	//$langs->trans("%ageOnAllBeforeVAT"),
-			"3" => $langs->trans("Yes").' ('.$langs->trans("Type")." 3)",	//$langs->trans("%ageOnProductsWithoutVAT"),
-			"4" => $langs->trans("Yes").' ('.$langs->trans("Type")." 4)",	//$langs->trans("%ageOnProductsBeforeVAT"),
-			"5" => $langs->trans("Yes").' ('.$langs->trans("Type")." 5)",	//$langs->trans("%ageOnServiceWithoutVAT"),
-			"6" => $langs->trans("Yes").' ('.$langs->trans("Type")." 6)"	//$langs->trans("%ageOnServiceBeforeVAT"),
-	);
-}
-
 
 
 /*
@@ -1075,21 +1060,6 @@ if ($id)
                             	$key = $langs->trans('SizeUnit'.strtolower($obj->unit));
                                 $valuetoshow = ($obj->code && $key != 'SizeUnit'.strtolower($obj->unit) ? $key : $obj->{$fieldlist[$field]});
                             }
-
-							else if ($fieldlist[$field]=='localtax1_type') {
-							  if ($obj->localtax1 != 0)
-							    $valuetoshow=$localtax_typeList[$valuetoshow];
-							  else
-							    $valuetoshow = '';
-							  $align="right";
-							}
-							else if ($fieldlist[$field]=='localtax2_type') {
-							 if ($obj->localtax2 != 0)
-							    $valuetoshow=$localtax_typeList[$valuetoshow];
-							  else
-							    $valuetoshow = '';
-							  $align="right";
-							}
 							else if ($fieldlist[$field]=='taux') {
                                 $valuetoshow = price($valuetoshow, 0, $langs, 0, 0);
 							    $align="right";
@@ -1253,7 +1223,7 @@ function fieldListAccountModel($fieldlist, $obj='', $tabname='', $context='')
 	global $conf,$langs,$db;
 	global $form;
 	global $region_id;
-	global $elementList,$sourceList,$localtax_typeList;
+	global $elementList,$sourceList;
 	global $bc;
 
 	$formadmin = new FormAdmin($db);
@@ -1376,24 +1346,6 @@ function fieldListAccountModel($fieldlist, $obj='', $tabname='', $context='')
 		elseif ($fieldlist[$field] == 'code' && isset($obj->{$fieldlist[$field]})) {
 			print '<td><input type="text" class="flat" value="'.(! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:'').'" size="10" name="'.$fieldlist[$field].'"></td>';
 		}
-		elseif ($fieldlist[$field]=='unit') {
-			print '<td>';
-			$units = array(
-					'mm' => $langs->trans('SizeUnitmm'),
-					'cm' => $langs->trans('SizeUnitcm'),
-					'point' => $langs->trans('SizeUnitpoint'),
-					'inch' => $langs->trans('SizeUnitinch')
-			);
-			print $form->selectarray('unit', $units, (! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:''), 0, 0, 0);
-			print '</td>';
-		}
-		// Le type de taxe locale
-		elseif ($fieldlist[$field] == 'localtax1_type' || $fieldlist[$field] == 'localtax2_type')
-		{
-			print '<td align="center">';
-			print $form->selectarray($fieldlist[$field], $localtax_typeList, (! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:''));
-			print '</td>';
-		}
 		elseif ($fieldlist[$field] == 'accountancy_code' || $fieldlist[$field] == 'accountancy_code_sell' || $fieldlist[$field] == 'accountancy_code_buy')
 		{
 			print '<td>';
diff --git a/htdocs/accountancy/admin/categories_list.php b/htdocs/accountancy/admin/categories_list.php
index f3a35350084..e78737c3fb9 100644
--- a/htdocs/accountancy/admin/categories_list.php
+++ b/htdocs/accountancy/admin/categories_list.php
@@ -451,13 +451,8 @@ $formadmin=new FormAdmin($db);
 
 llxHeader();
 
-$titre=$langs->trans("DictionarySetup");
+$titre=$langs->trans($tablib[$id]);
 $linkback='';
-if ($id)
-{
-    $titre.=' - '.$langs->trans($tablib[$id]);
-    $linkback='<a href="'.$_SERVER['PHP_SELF'].'">'.$langs->trans("BackToDictionaryList").'</a>';
-}
 $titlepicto='title_setup';
 
 print load_fiche_titre($titre,$linkback,$titlepicto);
diff --git a/htdocs/accountancy/admin/defaultaccounts.php b/htdocs/accountancy/admin/defaultaccounts.php
index c2a6453ffee..aaf98a0fa8b 100644
--- a/htdocs/accountancy/admin/defaultaccounts.php
+++ b/htdocs/accountancy/admin/defaultaccounts.php
@@ -122,7 +122,6 @@ $formaccounting = new FormAccounting($db);
 $linkback = '';
 print load_fiche_titre($langs->trans('MenuDefaultAccounts'), $linkback, 'title_accountancy');
 
-print '<br>';
 print $langs->trans("DefaultBindingDesc").'<br>';
 print '<br>';
 
diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php
index 0881ce061dc..cdc5eb2e545 100644
--- a/htdocs/compta/paiement.php
+++ b/htdocs/compta/paiement.php
@@ -309,9 +309,11 @@ if (empty($reshook))
  * View
  */
 
+$form=new Form($db);
+
+
 llxHeader('', $langs->trans("Payment"));
 
-$form=new Form($db);
 
 
 if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paiement')
@@ -575,6 +577,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
                 //print '<tr><td colspan="3">';
                 print '<br>';
                 print '<table class="noborder" width="100%">';
+                
                 print '<tr class="liste_titre">';
                 print '<td>'.$arraytitle.'</td>';
                 print '<td align="center">'.$langs->trans('Date').'</td>';
@@ -741,11 +744,13 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
                     $totalrecudeposits+=$deposits;
                     $i++;
                 }
+                
                 if ($i > 1)
                 {
                     // Print total
                     print '<tr class="liste_total">';
-                    print '<td colspan="3" align="left">'.$langs->trans('TotalTTC').'</td>';
+                    print '<td colspan="2" align="left">'.$langs->trans('TotalTTC').'</td>';
+					if (!empty($conf->multicurrency->enabled)) print '<td></td>';
 					if (!empty($conf->multicurrency->enabled)) print '<td></td>';
 					if (!empty($conf->multicurrency->enabled)) print '<td></td>';
 					if (!empty($conf->multicurrency->enabled)) print '<td></td>';
diff --git a/htdocs/expensereport/payment/card.php b/htdocs/expensereport/payment/card.php
index de01f01a5df..ce6e0da8c5a 100644
--- a/htdocs/expensereport/payment/card.php
+++ b/htdocs/expensereport/payment/card.php
@@ -143,6 +143,7 @@ if ($action == 'valide')
 
 }
 
+$linkback = '';
 // $linkback = '<a href="' . DOL_URL_ROOT . '/expensereport/payment/list.php">' . $langs->trans("BackToList") . '</a>';
 
 dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', '');
diff --git a/htdocs/expensereport/payment/payment.php b/htdocs/expensereport/payment/payment.php
index 40c4fad2513..cb81598fc83 100644
--- a/htdocs/expensereport/payment/payment.php
+++ b/htdocs/expensereport/payment/payment.php
@@ -30,7 +30,8 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 $langs->load("bills");
 $langs->load("banks");
 
-$chid=GETPOST("id");
+$chid=GETPOST("id",'int');
+$ref=GETPOST('ref','alpha');
 $action=GETPOST('action','aZ09');
 $amounts = array();
 $accountid=GETPOST('accountid','int');
@@ -59,7 +60,7 @@ if ($action == 'add_payment')
 	}
 
 	$expensereport = new ExpenseReport($db);
-	$expensereport->fetch($chid);
+	$expensereport->fetch($chid, $ref);
 
 	$datepaid = dol_mktime(12, 0, 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]);
 
@@ -160,7 +161,7 @@ if ($action == 'add_payment')
         }
 	}
 
-	$_GET["action"]='create';
+	$action='create';
 }
 
 
@@ -174,10 +175,10 @@ $form=new Form($db);
 
 
 // Form to create expense report payment
-if (GETPOST('action','aZ09') == 'create')
+if ($action == 'create' || empty($action))
 {
 	$expensereport = new ExpenseReport($db);
-	$expensereport->fetch($chid);
+	$expensereport->fetch($chid, $ref);
 
 	$total = $expensereport->total_ttc;
 
@@ -189,15 +190,20 @@ if (GETPOST('action','aZ09') == 'create')
 	print '<input type="hidden" name="chid" value="'.$chid.'">';
 	print '<input type="hidden" name="action" value="add_payment">';
 	
-    dol_fiche_head();
+    dol_fiche_head(null, '0', '', -1);
 
-	print '<table cellspacing="0" class="border" width="100%" cellpadding="2">';
-
-	print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("ExpenseReport").'</td>';
-
-	print '<tr><td>'.$langs->trans("Ref").'</td><td colspan="2"><a href="'.DOL_URL_ROOT.'/expensereport/card.php?id='.$chid.'">'.$expensereport->ref.'</a></td></tr>';
-	print '<tr><td>'.$langs->trans("Period").'</td><td colspan="2">'.get_date_range($expensereport->date_debut,$expensereport->date_fin,"",$langs,0).'</td></tr>';
-	print '<tr><td>'.$langs->trans("Amount").'</td><td colspan="2">'.price($expensereport->total_ttc,0,$outputlangs,1,-1,-1,$conf->currency).'</td></tr>';
+    $linkback = '';
+    // $linkback = '<a href="' . DOL_URL_ROOT . '/expensereport/payment/list.php">' . $langs->trans("BackToList") . '</a>';
+    
+    dol_banner_tab($expensereport, 'ref', $linkback, 1, 'ref', 'ref', '');
+    
+    print '<div class="fichecenter">';
+    print '<div class="underbanner clearboth"></div>';
+    
+    print '<table class="border centpercent">'."\n";
+    
+	print '<tr><td class="titlefield">'.$langs->trans("Period").'</td><td>'.get_date_range($expensereport->date_debut,$expensereport->date_fin,"",$langs,0).'</td></tr>';
+	print '<tr><td>'.$langs->trans("Amount").'</td><td>'.price($expensereport->total_ttc,0,$outputlangs,1,-1,-1,$conf->currency).'</td></tr>';
 
 	$sql = "SELECT sum(p.amount) as total";
 	$sql.= " FROM ".MAIN_DB_PREFIX."payment_expensereport as p, ".MAIN_DB_PREFIX."expensereport as e";
@@ -210,14 +216,18 @@ if (GETPOST('action','aZ09') == 'create')
 		$sumpaid = $obj->total;
 		$db->free();
 	}
-	print '<tr><td>'.$langs->trans("AlreadyPaid").'</td><td colspan="2">'.price($sumpaid,0,$outputlangs,1,-1,-1,$conf->currency).'</td></tr>';
-	print '<tr><td class="tdtop">'.$langs->trans("RemainderToPay").'</td><td colspan="2">'.price($total-$sumpaid,0,$outputlangs,1,-1,-1,$conf->currency).'</td></tr>';
+	print '<tr><td>'.$langs->trans("AlreadyPaid").'</td><td>'.price($sumpaid,0,$outputlangs,1,-1,-1,$conf->currency).'</td></tr>';
+	print '<tr><td class="tdtop">'.$langs->trans("RemainderToPay").'</td><td>'.price($total-$sumpaid,0,$outputlangs,1,-1,-1,$conf->currency).'</td></tr>';
 
-	print '<tr class="liste_titre">';
-	print "<td colspan=\"3\">".$langs->trans("Payment").'</td>';
-	print '</tr>';
-
-	print '<tr><td class="fieldrequired">'.$langs->trans("Date").'</td><td colspan="2">';
+    print '</table>';
+    
+    print '<br>';
+    
+    print '<div class="underbanner clearboth"></div>';
+    
+    print '<table class="border centpercent">'."\n";
+	
+    print '<tr><td class="titlefield fieldrequired">'.$langs->trans("Date").'</td><td colspan="2">';
 	$datepaid = dol_mktime(12, 0, 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]);
 	$datepayment=empty($conf->global->MAIN_AUTOFILL_DATE)?(empty($_POST["remonth"])?-1:$datepaid):0;
 	$form->select_date($datepayment,'','','','',"add_payment",1,1);
@@ -251,6 +261,8 @@ if (GETPOST('action','aZ09') == 'create')
 
 	print '</table>';
 
+	print '</div>';
+	
     dol_fiche_end();
 
 	// List of expenses ereport not already paid completely
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index 33434f03394..5f3d4eef2da 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -168,7 +168,7 @@ DescThirdPartyReport=Consult here the list of the third party customers and supp
 ListAccounts=List of the accounting accounts
 
 Pcgtype=Class of account
-Pcgsubtype=Under class of account
+Pcgsubtype=Subclass of account
 
 TotalVente=Total turnover before tax
 TotalMarge=Total sales margin