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/116] 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 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 002/116] 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 003/116] 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 004/116] 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 005/116] 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 006/116] 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
zcmZ{lX*3(?9>&822~viNsg4qwu~r48mJ=dMOk>Y2Wo%QL#J&qgL@l*c2PvXOtG0v|
z4HeOr1QSB3-7rPaP%cHabz5~!I^XVx`~KhO|2yw<&hza#=goC>c7RB$NCN->h$F_%
zT}1V70!fN?Y;y7k5rBA<6AA#B1HNX?i;Lcpzg~8*0~~*w2QM0^A_p9Wxf&}X<{#Pf
zLy_OigeVkVMD>4k^GijgD5~jbhr)UFO?witIQ+@fjF~H?I=(pFT357=t^NZij3WFj
zFYi*ZDNk*}F1=R8%p{L^x47^pp%luFfIw(t>h!td?kG@`R{#YB!ivq=Nfrj%T+I%a
zjChs0Jcq(_7*6-de11yg^~J<jiDj`npx)y^os-fqOG}>w;gFK?Q}3f4MRkp824f@t
zrkvVOaR~`kL?UsIop#*qk(9)q{v%&`WMXpiIH_i~*;lc*uP?Z~ynM~!_cN)i?r!AX
z-s*sfp`lG`YU<<*uZ4w$L^Ugt{L<^!zjf8uueGhLtjKw|yDvIpv3FKe&HYb-!Ql5z
zo-ISmDBeAi-?Ox1^70!#l?Se^ub0+xt{^ovHR+L~qFN<+%c&R6aR)&K05lq%xpP5%
zHh*bGTq&EfwEHiy-lE&LZ-*Xi&0VXoiHTtfR#)4=K$V7uhTQ6L0>;=FeV3tgSG*su
z$l2LNg7Ct33(r(9w%dEUxfKb7LgCcn;-VE2=?sBDrfPBSXumTI3V+;<3O1wxVu;dy
zHvM_lO7e1Z!r`*uy}dnqu&kWiWaUfj=IG#qi3jSNEiK2xnrRt;bp;Il{4brYo^(3>
z;?djj8e>-E5_z3haQe#h^fVL>hhGM(j|#K0rsSdapNoo2D6}5kbRLg)#ovF)C6h*@
z`Ma%q#K*_yr5wBy_L8tfBEy(@d@7yKcMJ&+uY+a^<S1wjVHSgiI)O-MGMT^0$jDft
z49ZfZfWS8k&y%Re-uXZxe`Msy+}b)#xp+(|xW1yYvX0GW<7wReCV3kP4{z`J-*eiP
zZu&%ohW=YwK_Nz}VfJAyRQ~>`4=VzW4(g5+`B24%hMN{$UG!&<3#Oc$YSWcT#vb6^
zK=tcgIXNI``Yeqi+uFfo&d0wUtM)fCGUBBK$mW`XT25-}*K9F0NObn|iaeLfhkiJ&
z><S-<l}K@A;BHGuN`5hzhn`h{QU*pVEz>&VHr(ZGxv=sKv-W~cPYz+29g8D<(uY**
zk~EP848cK2Xy{+8h=t7vjMSfSwTqUPX{u1@70BaR6uX~RQd%;;uob2&QS{^qf(pi*
z5gax)HinR1FAKOCk{1SLz3}1TN1vZu8;B_^v><eAzo;>^l9;`h9CGx_ath8jtFEr@
zF^k1=gPlajycsN7)#hI%h*uxxp5-Z1U7Ds17_#UwYj*AFd>|PwZke#<)d3qCo9jlO
zDEzrj0|!F2(|daES0Ph%6E2zldTVfBYj#IMPa!HXaeeso#iRIkzi7>Oq>_>noU5x%
zVYoB|5{&rXY-%G;<NMrO)zr(t{|o`uZF%4d>oh-*wDdgXlnvK$P?9vM<x=GeJDaq>
zHqsuwYCq44R1=kFTw7)G>({R`z$&xRyhfLR!%y4U-~dgSsp$;F=+O#we{Dj?TuRgm
zP_W&fnO0U-ASKQ0+_Y;sl%NXk0Z8~B*oj1ZN6vL>_z1=bMwV6I9~@})7l(y~ft1i&
z=iC}U-nwkAUL+8coOFl2e8g&NGcHUra;pf+Ibc1nMv8U+EWrQwOqGU~mR2tXwwZ+#
zGu16x!#8VSy(^oWo5k{b4_0DgV-*$UGuGqD>0o`)K^UZ4<1@A(Sl2sLDq4Saf?roG
zr0yf%p6>(AnQuk1=w|1e>2z(e<^{lkXY9l|2b=q#)3&2ICFwH;D#GttLt@~81h{N1
ze0SHuux*I2r^y8d9URi6j9d?OW%az@WD@%2KPcWoAP}%mDc#KL0rf!}!V{Q5y$Eh;
z=**+5(Yh>P2dsnZ%0YSuI@*00E_7^7W+t=}U~28r(a{4>b~ejC`*6xTRe&9+?0eDD
z;SLT1k6@hbwjaEIi0$;};8#9mdMl&3NgSDNU)3Lf+^Si+QRYh~lW(xupHmDB3>pfb
zA{2JR<b68AK7)r!;{=>^D|(RXnzYg&)}|wV>r|n~!*{-=s((QAPs}89mf@}7sI@T|
z@7dP&c8@LVaBX+FFM51@yeF_L&tArFXJdo-zQ?3I*Xt>!VxOS;N|`f2(cJx#_EGAu
zmtGr3VC=0Ono$eIRP=Aa<1Tr{1qH?hTU?6?76D*nXlQ;;bP>ilgt3K@sfCHDo}rP2
kp`jGvVekJ0!Xtx-*OUH#AmM@vSrh;`UUIf;whg%PHyWxmfdBvi

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 007/116] 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 008/116] 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 009/116] 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 010/116] 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 011/116] 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 012/116] 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 013/116] 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 014/116] 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 015/116] 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 016/116] 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 017/116] 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 018/116] 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 019/116] 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 020/116] 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 021/116] 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 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 022/116] 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 023/116] 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 024/116] 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 025/116] 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 026/116] 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 027/116] 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 028/116] 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 029/116] 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 030/116] 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 031/116] 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 032/116] 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 033/116] 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 034/116] 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 035/116] 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 036/116] 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 037/116] 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 038/116] 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 039/116] 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 040/116] 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 041/116] 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 042/116] 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 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 043/116] 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 044/116] 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 045/116] 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 046/116] 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 047/116] 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 048/116] 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 049/116] 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 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 050/116] 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 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 051/116] 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 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 052/116] 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 053/116] 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 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 054/116] 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 055/116] 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 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 056/116] 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 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 057/116] 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 058/116] 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 059/116] 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 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 060/116] 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 061/116] 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 062/116] 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 063/116] 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 064/116] 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 065/116] 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 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 066/116] 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 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 067/116] 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 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 068/116] 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 069/116] 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 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 070/116] 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 071/116] 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 072/116] 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 073/116] 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 074/116] 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 075/116] 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 076/116] 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 077/116] 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 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 078/116] 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 079/116] 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 080/116] 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 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 081/116] 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 082/116] 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 083/116] 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 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 084/116] 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 085/116] 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 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 086/116] 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 087/116] 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 088/116] 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 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 089/116] 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 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 090/116] 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 091/116] 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 092/116] 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 093/116] 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 094/116] 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 095/116] 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 096/116] 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 097/116] 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 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 098/116] 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 099/116] 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 100/116] 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 101/116] 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 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 102/116] 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 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 103/116] 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 104/116] 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 105/116] 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 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 106/116] 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 107/116] 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 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 108/116] 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 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 109/116] 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 110/116] 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 111/116] 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 112/116] 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 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 113/116] 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 114/116] 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 115/116] 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 116/116] 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