From d9693ba2f2d96e14ec184324a2466b0d8eae5f7d Mon Sep 17 00:00:00 2001
From: aspangaro <alexandre.spangaro@gmail.com>
Date: Fri, 9 Oct 2015 06:16:43 +0200
Subject: [PATCH 01/66] New : Module HRM

---
 htdocs/core/modules/modHRM.class.php | 250 +++++++++++++++++++++++++++
 1 file changed, 250 insertions(+)
 create mode 100644 htdocs/core/modules/modHRM.class.php

diff --git a/htdocs/core/modules/modHRM.class.php b/htdocs/core/modules/modHRM.class.php
new file mode 100644
index 00000000000..cfc85acff16
--- /dev/null
+++ b/htdocs/core/modules/modHRM.class.php
@@ -0,0 +1,250 @@
+<?php
+/* Copyright (C) 2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * 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/modules/modHRM.class.php
+ * \ingroup HRM
+ * \brief   Description and activation file for module HRM
+ */
+include_once (DOL_DOCUMENT_ROOT . "/core/modules/DolibarrModules.class.php");
+
+/**
+ * \class 	modHRM
+ * \brief 	Class to describe and activate the HRM module
+ */
+class modiHRM extends DolibarrModules
+{
+	/**
+	 * Constructor.
+	 * Define names, constants, directories, boxes, permissions
+	 *
+	 * @param DoliDB $db        	
+	 */
+	public function __construct($db)
+	{
+		global $langs, $conf;
+		
+		$this->db = $db;
+
+		$this->numero = 4000;
+		$this->rights_class = 'hrm';
+		
+		$this->family = "hr";
+		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+		$this->name = preg_replace ( '/^mod/i', '', get_class ( $this ) );
+		$this->description = "Gestion des ressources humaines";
+		
+		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
+		$this->version = 'develop';
+		
+		$this->const_name = 'MAIN_MODULE_' . strtoupper ( $this->name );
+		$this->special = 0;
+		// $this->picto = '';
+		
+		// define triggers
+		$this->module_parts = array (
+		
+		// Data directories to create when module is enabled
+		$this->dirs = array ();
+		
+		// Config pages
+		$this->config_page_url = array('admin_hrm.php');
+		
+		// Dependencies
+		$this->depends = array();
+		$this->requiredby = array("
+			modSalaries,
+			modExpenseReport,
+			modHoliday
+		");
+		$this->conflictwith = array();
+		$this->phpmin = array (
+			5,
+			3 
+		); // Minimum version of PHP required by module
+		$this->need_dolibarr_version = array (
+			3,
+			8 
+		); // Minimum version of Dolibarr required by module
+		$this->langfiles = array (
+			"hrm" 
+		);
+
+		// Dictionnaries
+		$this->dictionnaries=array(
+			'langs'=>'hrm',
+			'tabname'=>array(
+				MAIN_DB_PREFIX."c_ihrm_department",
+				MAIN_DB_PREFIX."c_ihrm_function"
+			),
+			'tablib'=>array(
+				"DepartmentDict",
+				"FunctionDict"
+			),
+			'tabsql'=>array(
+				'SELECT rowid, pos, code, label, active FROM '.MAIN_DB_PREFIX.'c_hrm_department',
+				'SELECT rowid, pos, code, label, c_level, active FROM '.MAIN_DB_PREFIX.'c_hrm_department'
+			),
+			'tabsqlsort'=>array(
+				'rowid ASC',
+				'rowid ASC'
+			),
+			'tabfield'=>array(
+				"code,label",
+				"code,label"
+			),
+			'tabfieldvalue'=>array(
+				"code,label",
+				"code,label"
+			),
+			'tabfieldinsert'=>array(
+				"code,label",
+				"code,label"
+			),
+			'tabrowid'=>array(
+				"rowid",
+				"rowid"
+			),
+			'tabcond'=>array(
+				'$conf->hrm->enabled',
+				'$conf->hrm->enabled'
+			)
+		);
+
+		// Constantes
+		$this->const = array ();
+		$r = 0;
+
+		// Boxes
+		$this->boxes = array ();
+		
+		// Permissions
+		$this->rights = array(); // Permission array used by this module
+		$r = 0;
+
+		$this->rights[$r][0] = 4001;
+		$this->rights[$r][1] = 'See employees';
+		$this->rights[$r][3] = 1;
+		$this->rights[$r][4] = 'employee';
+		$this->rights[$r][5] = 'read';
+		$r ++;
+		
+		$this->rights[$r][0] = 4002;
+		$this->rights[$r][1] = 'Create employees';
+		$this->rights[$r][3] = 1;
+		$this->rights[$r][4] = 'employee';
+		$this->rights[$r][5] = 'write';
+		$r ++;
+		
+		$this->rights[$r][0] = 4003;
+		$this->rights[$r][1] = 'Delete employees';
+		$this->rights[$r][3] = 1;
+		$this->rights[$r][4] = 'employee';
+		$this->rights[$r][5] = 'delete';
+		$r ++;
+		
+		$this->rights[$r][0] = 4004;
+		$this->rights[$r][1] = 'Export employees';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'employee';
+		$this->rights[$r][5] = 'export';
+		$r ++;
+
+		// Main menu entries
+		$this->menus = array (); // List of menus to add
+		$r = 0;
+
+		$this->menu[$r] = array (
+				'fk_menu' => 'fk_mainmenu=hrm',
+				'type' => 'left',
+				'titre' => 'Employees',
+				'leftmenu' => 'employee',
+				'mainmenu' => 'hrm',
+				'url' => '/hrm/employee/index.php',
+				'langs' => 'hrm',
+				'position' => 100,
+				'enabled' => '$user->rights->hrm->employee->read',
+				'perms' => '$user->rights->hrm->employee->read',
+				'target' => '',
+				'user' => 0 
+		);
+		$r ++;
+
+		$this->menu[$r] = array(
+			'fk_menu' => 'fk_mainmenu=hrm,fk_leftmenu=employee',
+			'type' => 'left',
+			'titre' => 'NewEmployee',
+			'mainmenu' => 'hrm',
+			'url' => '/hrm/employee/card.php?action=create',
+			'langs' => 'hrm',
+			'position' => 101,
+			'enabled' => '$user->rights->hrm->employee->write',
+			'perms' => '$user->rights->hrm->employee->write',
+			'target' => '',
+			'user' => 0
+		);
+		$r ++;
+
+		$this->menu[$r] = array(
+			'fk_menu' => 'fk_mainmenu=hrm,fk_leftmenu=employee',
+			'type' => 'left',
+			'titre' => 'List',
+			'mainmenu' => 'hrm',
+			'url' => '/hrm/employee/list.php',
+			'langs' => 'hrm',
+			'position' => 102,
+			'enabled' => '$user->rights->hrm->employee->read',
+			'perms' => '$user->rights->hrm->employee->read',
+			'target' => '',
+			'user' => 0
+		);
+		$r ++;
+
+		$this->menu[$r] = array(
+			'fk_menu' => 'fk_mainmenu=hrm,fk_leftmenu=employee',
+			'type' => 'left',
+			'titre' => 'Statistics',
+			'mainmenu' => 'hrm',
+			'url' => '/hrm/employee/stats.php',
+			'langs' => 'hrm',
+			'position' => 103,
+			'enabled' => '$user->rights->hrm->employee->read',
+			'perms' => '$user->rights->hrm->employee->read',
+			'target' => '',
+			'user' => 0
+		);
+		$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 Enabling module ('', 'noboxes')
+	 * @return int if OK, 0 if KO
+	 */
+	public function init($options = '')
+	{
+		$sql = array();
+		
+		$result = $this->loadTables();
+		
+		return $this->_init($sql, $options);
+	}
+}

From 6a7892ca525f25500c72e1e73f66e4c5d203f698 Mon Sep 17 00:00:00 2001
From: aspangaro <alexandre.spangaro@gmail.com>
Date: Fri, 9 Oct 2015 06:41:36 +0200
Subject: [PATCH 02/66] Add the first tables

---
 .../mysql/data/llx_c_hrm_department.sql       | 43 +++++++++
 .../install/mysql/data/llx_c_hrm_function.sql | 34 +++++++
 .../install/mysql/migration/3.9.0-4.0.0.sql   | 88 +++++++++++++++++++
 .../mysql/tables/llx_c_hrm_department.sql     | 26 ++++++
 .../mysql/tables/llx_c_hrm_function.sql       | 27 ++++++
 .../mysql/tables/llx_establishment.sql        | 41 +++++++++
 6 files changed, 259 insertions(+)
 create mode 100644 htdocs/install/mysql/data/llx_c_hrm_department.sql
 create mode 100644 htdocs/install/mysql/data/llx_c_hrm_function.sql
 create mode 100644 htdocs/install/mysql/migration/3.9.0-4.0.0.sql
 create mode 100644 htdocs/install/mysql/tables/llx_c_hrm_department.sql
 create mode 100644 htdocs/install/mysql/tables/llx_c_hrm_function.sql
 create mode 100644 htdocs/install/mysql/tables/llx_establishment.sql

diff --git a/htdocs/install/mysql/data/llx_c_hrm_department.sql b/htdocs/install/mysql/data/llx_c_hrm_department.sql
new file mode 100644
index 00000000000..0129856be95
--- /dev/null
+++ b/htdocs/install/mysql/data/llx_c_hrm_department.sql
@@ -0,0 +1,43 @@
+-- ============================================================================
+-- Copyright (C) 2013 Jean-François Ferry <jfefe@aternatik.fr>
+-- Copyright (C) 2015 Alexandre Spangaro  <aspangaro.dolibarr@gmail.com>
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program.  If not, see <http://www.gnu.org/licenses/>.
+--
+-- ============================================================================
+--
+
+--
+-- Ne pas placer de commentaire en fin de ligne, ce fichier est parsé lors
+-- de l'install et tous les sigles '--' sont supprimés.
+--
+
+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(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(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(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);
diff --git a/htdocs/install/mysql/data/llx_c_hrm_function.sql b/htdocs/install/mysql/data/llx_c_hrm_function.sql
new file mode 100644
index 00000000000..f8b56563689
--- /dev/null
+++ b/htdocs/install/mysql/data/llx_c_hrm_function.sql
@@ -0,0 +1,34 @@
+-- ============================================================================
+-- Copyright (C) 2013 Jean-François Ferry <jfefe@aternatik.fr>
+-- Copyright (C) 2015 Alexandre Spangaro  <aspangaro.dolibarr@gmail.com>
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program.  If not, see <http://www.gnu.org/licenses/>.
+--
+-- ============================================================================
+--
+
+--
+-- Ne pas placer de commentaire en fin de ligne, ce fichier est parsé lors
+-- de l'install et tous les sigles '--' sont supprimés.
+--
+
+INSERT INTO llx_c_hrm_function (rowid, pos, code, label, c_level, active) VALUES(1, 5,'EXECBOARD', 'Executive board', 0, 1);
+INSERT INTO llx_c_hrm_function (rowid, pos, code, label, c_level, active) VALUES(2, 10, 'MANAGDIR', 'Managing director', 1, 1);
+INSERT INTO llx_c_hrm_function (rowid, pos, code, label, c_level, active) VALUES(3, 15, 'ACCOUNTMANAG', 'Account manager', 0, 1);
+INSERT INTO llx_c_hrm_function (rowid, pos, code, label, c_level, active) VALUES(3, 20, 'ENGAGDIR', 'Engagement director', 1, 1);
+INSERT INTO llx_c_hrm_function (rowid, pos, code, label, c_level, active) VALUES(4, 25, 'DIRECTOR', 'Director', 1, 1);
+INSERT INTO llx_c_hrm_function (rowid, pos, code, label, c_level, active) VALUES(5, 30, 'PROJMANAG', 'Project manager', 0, 1);
+INSERT INTO llx_c_hrm_function (rowid, pos, code, label, c_level, active) VALUES(6, 35, 'DEPHEAD', 'Department head', 0, 1);
+INSERT INTO llx_c_hrm_function (rowid, pos, code, label, c_level, active) VALUES(7, 40, 'SECRETAR', 'Secretary', 0, 1);
+INSERT INTO llx_c_hrm_function (rowid, pos, code, label, c_level, active) VALUES(8, 45, 'EMPLOYEE', 'Department employee', 0, 1);
diff --git a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
new file mode 100644
index 00000000000..bea4065fab8
--- /dev/null
+++ b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
@@ -0,0 +1,88 @@
+--
+-- Be carefull to requests order.
+-- This file must be loaded by calling /install/index.php page
+-- when current version is 3.9.0 or higher.
+--
+-- To rename a table:       ALTER TABLE llx_table RENAME TO llx_table_new;
+-- To add a column:         ALTER TABLE llx_table ADD COLUMN newcol varchar(60) NOT NULL DEFAULT '0' AFTER existingcol;
+-- To rename a column:      ALTER TABLE llx_table CHANGE COLUMN oldname newname varchar(60);
+-- To drop a column:        ALTER TABLE llx_table DROP COLUMN oldname;
+-- To change type of field: ALTER TABLE llx_table MODIFY COLUMN name varchar(60);
+-- To drop a foreign key:   ALTER TABLE llx_table DROP FOREIGN KEY fk_name;
+-- To restrict request to Mysql version x.y use -- VMYSQLx.y
+-- To restrict request to Pgsql version x.y use -- VPGSQLx.y
+-- To make pk to be auto increment (mysql):    VMYSQL4.3 ALTER TABLE llx_c_shipment_mode CHANGE COLUMN rowid rowid INTEGER NOT NULL AUTO_INCREMENT;
+-- To make pk to be auto increment (postgres): VPGSQL8.2 NOT POSSIBLE. MUST DELETE/CREATE TABLE
+-- To set a field as NULL:                     VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name DROP NOT NULL;
+-- To set a field as default NULL:             VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name SET DEFAULT NULL;
+-- -- VPGSQL8.2 DELETE FROM llx_usergroup_user      WHERE fk_user      NOT IN (SELECT rowid from llx_user);
+-- -- VMYSQL4.1 DELETE FROM llx_usergroup_user      WHERE fk_usergroup NOT IN (SELECT rowid from llx_usergroup);
+
+CREATE TABLE IF NOT EXISTS llx_c_hrm_function
+(
+  rowid     integer     PRIMARY KEY,
+  pos   	tinyint DEFAULT 0 NOT NULL,
+  code    	varchar(16) NOT NULL,
+  label 	varchar(50),
+  c_level   tinyint DEFAULT 0 NOT NULL,
+  active  	tinyint DEFAULT 1  NOT NULL
+)ENGINE=innodb;
+
+INSERT INTO llx_c_hrm_function (rowid, pos, code, label, c_level, active) VALUES(1, 5,'EXECBOARD', 'Executive board', 0, 1);
+INSERT INTO llx_c_hrm_function (rowid, pos, code, label, c_level, active) VALUES(2, 10, 'MANAGDIR', 'Managing director', 1, 1);
+INSERT INTO llx_c_hrm_function (rowid, pos, code, label, c_level, active) VALUES(3, 15, 'ACCOUNTMANAG', 'Account manager', 0, 1);
+INSERT INTO llx_c_hrm_function (rowid, pos, code, label, c_level, active) VALUES(3, 20, 'ENGAGDIR', 'Engagement director', 1, 1);
+INSERT INTO llx_c_hrm_function (rowid, pos, code, label, c_level, active) VALUES(4, 25, 'DIRECTOR', 'Director', 1, 1);
+INSERT INTO llx_c_hrm_function (rowid, pos, code, label, c_level, active) VALUES(5, 30, 'PROJMANAG', 'Project manager', 0, 1);
+INSERT INTO llx_c_hrm_function (rowid, pos, code, label, c_level, active) VALUES(6, 35, 'DEPHEAD', 'Department head', 0, 1);
+INSERT INTO llx_c_hrm_function (rowid, pos, code, label, c_level, active) VALUES(7, 40, 'SECRETAR', 'Secretary', 0, 1);
+INSERT INTO llx_c_hrm_function (rowid, pos, code, label, c_level, active) VALUES(8, 45, 'EMPLOYEE', 'Department employee', 0, 1);
+
+CREATE TABLE IF NOT EXISTS llx_c_hrm_department
+(
+  rowid      	integer     PRIMARY KEY,
+  pos   		tinyint DEFAULT 0 NOT NULL,
+  code    		varchar(16) NOT NULL,
+  label 		varchar(50),
+  active  		tinyint DEFAULT 1  NOT NULL
+)ENGINE=innodb;
+
+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(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(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(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);
+
+CREATE TABLE IF NOT EXISTS llx_establishment (
+  rowid 			integer NOT NULL auto_increment PRIMARY KEY,
+  entity 			integer NOT NULL DEFAULT 1,
+  name				varchar(50),
+  address           varchar(255),
+  zip               varchar(25),
+  town              varchar(50),
+  fk_state          integer DEFAULT 0,
+  fk_country        integer DEFAULT 0,
+  profid1			varchar(20),
+  profid2			varchar(20),
+  profid3			varchar(20),
+  phone				varchar(20),
+  fk_user_author 	integer NOT NULL,
+  fk_user_mod		integer NOT NULL,
+  datec				datetime NOT NULL,
+  tms				timestamp NOT NULL,
+  statut            tinyint DEFAULT 1,
+) ENGINE=InnoDB;
+
diff --git a/htdocs/install/mysql/tables/llx_c_hrm_department.sql b/htdocs/install/mysql/tables/llx_c_hrm_department.sql
new file mode 100644
index 00000000000..f9432d8b821
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_c_hrm_department.sql
@@ -0,0 +1,26 @@
+--
+-- Copyright (C) 2013 Jean-François Ferry <jfefe@aternatik.fr>
+-- Copyright (C) 2015 Alexandre Spangaro  <aspangaro.dolibarr@gmail.com>
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+create table llx_c_hrm_department
+(
+  rowid      	integer     PRIMARY KEY,
+  pos   		tinyint DEFAULT 0 NOT NULL,
+  code    		varchar(16) NOT NULL,
+  label 		varchar(50),
+  active  		tinyint DEFAULT 1  NOT NULL
+)ENGINE=innodb;
+
diff --git a/htdocs/install/mysql/tables/llx_c_hrm_function.sql b/htdocs/install/mysql/tables/llx_c_hrm_function.sql
new file mode 100644
index 00000000000..f3f87461866
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_c_hrm_function.sql
@@ -0,0 +1,27 @@
+--
+-- Copyright (C) 2013 Jean-François Ferry <jfefe@aternatik.fr>
+-- Copyright (C) 2015 Alexandre Spangaro  <aspangaro.dolibarr@gmail.com>
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+create table llx_c_hrm_function
+(
+  rowid     integer     PRIMARY KEY,
+  pos   	tinyint DEFAULT 0 NOT NULL,
+  code    	varchar(16) NOT NULL,
+  label 	varchar(50),
+  c_level   tinyint DEFAULT 0 NOT NULL,
+  active  	tinyint DEFAULT 1  NOT NULL
+)ENGINE=innodb;
+
diff --git a/htdocs/install/mysql/tables/llx_establishment.sql b/htdocs/install/mysql/tables/llx_establishment.sql
new file mode 100644
index 00000000000..2f5c86510e0
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_establishment.sql
@@ -0,0 +1,41 @@
+-- ============================================================================
+-- Copyright (C) 2015       Alexandre Spangaro  <aspangaro.dolibarr@gmail.com>
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- 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/>.
+--
+-- ============================================================================
+--
+-- Structure de la table llx_establishment
+--
+
+CREATE TABLE IF NOT EXISTS llx_establishment (
+  rowid 			integer NOT NULL auto_increment PRIMARY KEY,
+  entity 			integer NOT NULL DEFAULT 1,
+  name				varchar(50),
+  address           varchar(255),
+  zip               varchar(25),
+  town              varchar(50),
+  fk_state          integer DEFAULT 0,
+  fk_country        integer DEFAULT 0,
+  profid1			varchar(20),
+  profid2			varchar(20),
+  profid3			varchar(20),
+  phone				varchar(20),
+  fk_user_author 	integer NOT NULL,
+  fk_user_mod		integer NOT NULL,
+  datec				datetime NOT NULL,
+  tms				timestamp NOT NULL,
+  statut            tinyint DEFAULT 1,
+) ENGINE=InnoDB;
+

From b571cc86ff91511b8019fa21b831b481000f9afd Mon Sep 17 00:00:00 2001
From: aspangaro <alexandre.spangaro@gmail.com>
Date: Fri, 9 Oct 2015 07:30:48 +0200
Subject: [PATCH 03/66] Add a yn form in user card to know if the user is also
 an employee

---
 .../install/mysql/migration/3.9.0-4.0.0.sql   |  2 ++
 htdocs/install/mysql/tables/llx_user.sql      |  2 ++
 htdocs/user/card.php                          | 19 +++++++++++++++++++
 htdocs/user/class/user.class.php              |  9 +++++++--
 4 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
index bea4065fab8..6120a946ec3 100644
--- a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
+++ b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
@@ -86,3 +86,5 @@ CREATE TABLE IF NOT EXISTS llx_establishment (
   statut            tinyint DEFAULT 1,
 ) ENGINE=InnoDB;
 
+ALTER TABLE llx_user ADD COLUMN employee tinyint DEFAULT 0 AFTER ref_int;
+
diff --git a/htdocs/install/mysql/tables/llx_user.sql b/htdocs/install/mysql/tables/llx_user.sql
index a11b0ec6b50..f95def7e503 100644
--- a/htdocs/install/mysql/tables/llx_user.sql
+++ b/htdocs/install/mysql/tables/llx_user.sql
@@ -25,6 +25,8 @@ create table llx_user
 
   ref_ext			varchar(50),				-- reference into an external system (not used by dolibarr)
   ref_int			varchar(50),				-- reference into an internal system (deprecated)
+  
+  employee          tinyint        DEFAULT 0,   -- employee 0/1
 
   datec             datetime,
   tms               timestamp,
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index b74b921c735..9744aebfbbe 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -191,6 +191,7 @@ if ($action == 'add' && $canadduser)
     {
         $object->lastname		= GETPOST("lastname",'alpha');
         $object->firstname	    = GETPOST("firstname",'alpha');
+		$object->employee		= GETPOST("employee",'int');
         $object->login		    = GETPOST("login",'alpha');
         $object->api_key		= GETPOST("api_key",'alpha');
         $object->gender		    = GETPOST("gender",'alpha');
@@ -344,6 +345,7 @@ if ($action == 'update' && ! $_POST["cancel"])
 
             $object->lastname	= GETPOST("lastname",'alpha');
             $object->firstname	= GETPOST("firstname",'alpha');
+			$object->employee   = GETPOST("employee",'int');
             $object->login		= GETPOST("login",'alpha');
             $object->gender		= GETPOST("gender",'alpha');
             $object->pass		= GETPOST("password");
@@ -762,6 +764,12 @@ if (($action == 'create') || ($action == 'adduserldap'))
     {
         print '<input size="30" type="text" name="firstname" value="'.GETPOST('firstname').'">';
     }
+    print '</td></tr>';
+
+	// Employee
+    print '<tr>';
+    print '<td>'.fieldLabel('Employee','employee',0).'</td><td>';
+    print $form->selectyesno("employee",(isset($_POST['employee'])?GETPOST('employee'):0),1);
     print '</td></tr>';
 
     // Position/Job
@@ -1224,6 +1232,11 @@ else
             print '<td colspan="2">'.$object->firstname.'</td>';
             print '</tr>'."\n";
 
+			// Employee
+            print '<tr><td>'.$langs->trans("Employee").'</td><td colspan="2">';
+            print yn($object->employee);
+            print '</td></tr>'."\n";
+
             // Position/Job
             print '<tr><td>'.$langs->trans("PostOrFunction").'</td>';
             print '<td colspan="2">'.$object->job.'</td>';
@@ -1803,6 +1816,12 @@ else
             }
             print '</td></tr>';
 
+            // Employee
+            print '<tr>';
+            print '<td>'.fieldLabel('Employee','employee',0).'</td><td>';
+            print $form->selectyesno("employee",$object->employee,1);
+            print '</td></tr>';
+
             // Position/Job
             print '<tr><td>'.$langs->trans("PostOrFunction").'</td>';
             print '<td>';
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 6dc8de8db8e..d4317a0d919 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -8,7 +8,7 @@
  * Copyright (C) 2005      Lionel Cousteix      <etm_ltd@tiscali.co.uk>
  * Copyright (C) 2011      Herve Prot           <herve.prot@symeos.com>
  * Copyright (C) 2013-2014 Philippe Grand       <philippe.grand@atoo-net.com>
- * Copyright (C) 2013      Alexandre Spangaro   <aspangaro.dolibarr@gmail.com>
+ * Copyright (C) 2013-2015 Alexandre Spangaro   <aspangaro.dolibarr@gmail.com>
  * Copyright (C) 2015      Marcos García        <marcosgdf@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -46,6 +46,7 @@ class User extends CommonObject
 	var $id=0;
 	var $ldap_sid;
 	var $search_sid;
+	var $employee;
 	var $gender;
 	var $email;
 	var $skype;
@@ -156,7 +157,7 @@ class User extends CommonObject
 		$login=trim($login);
 
 		// Get user
-		$sql = "SELECT u.rowid, u.lastname, u.firstname, u.gender, u.email, u.job, u.skype, u.signature, u.office_phone, u.office_fax, u.user_mobile,";
+		$sql = "SELECT u.rowid, u.lastname, u.firstname, u.employee, u.gender, u.email, u.job, u.skype, u.signature, u.office_phone, u.office_fax, u.user_mobile,";
 		$sql.= " u.admin, u.login, u.note,";
 		$sql.= " u.pass, u.pass_crypted, u.pass_temp, u.api_key,";
 		$sql.= " u.fk_soc, u.fk_socpeople, u.fk_member, u.fk_user, u.ldap_sid,";
@@ -215,6 +216,8 @@ class User extends CommonObject
 				$this->ldap_sid 	= $obj->ldap_sid;
 				$this->lastname		= $obj->lastname;
 				$this->firstname 	= $obj->firstname;
+				
+				$this->employee		= $obj->employee;
 
 				$this->login		= $obj->login;
 				$this->gender       = $obj->gender;
@@ -1145,6 +1148,7 @@ class User extends CommonObject
 		// Clean parameters
 		$this->lastname     = trim($this->lastname);
 		$this->firstname    = trim($this->firstname);
+		$this->employee    	= trim($this->employee);
 		$this->login        = trim($this->login);
 		$this->gender       = trim($this->gender);
 		$this->pass         = trim($this->pass);
@@ -1185,6 +1189,7 @@ class User extends CommonObject
 		$sql = "UPDATE ".MAIN_DB_PREFIX."user SET";
 		$sql.= " lastname = '".$this->db->escape($this->lastname)."'";
 		$sql.= ", firstname = '".$this->db->escape($this->firstname)."'";
+		$sql.= ", employee = ".$this->employee;
 		$sql.= ", login = '".$this->db->escape($this->login)."'";
         $sql.= ", api_key = ".($this->api_key ? "'".$this->db->escape($this->api_key)."'" : "null");
 		$sql.= ", gender = ".($this->gender != -1 ? "'".$this->db->escape($this->gender)."'" : "null");	// 'man' or 'woman'

From bde7279aa1f8ea98612a7893b5d6952a2622878c Mon Sep 17 00:00:00 2001
From: aspangaro <alexandre.spangaro@gmail.com>
Date: Fri, 9 Oct 2015 13:00:51 +0200
Subject: [PATCH 04/66] Review by Rdoursenaud. Tkanks

---
 htdocs/install/mysql/migration/3.9.0-4.0.0.sql    | 2 +-
 htdocs/install/mysql/tables/llx_establishment.sql | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
index 6120a946ec3..5f752358858 100644
--- a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
+++ b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
@@ -83,7 +83,7 @@ CREATE TABLE IF NOT EXISTS llx_establishment (
   fk_user_mod		integer NOT NULL,
   datec				datetime NOT NULL,
   tms				timestamp NOT NULL,
-  statut            tinyint DEFAULT 1,
+  status            tinyint DEFAULT 1,
 ) ENGINE=InnoDB;
 
 ALTER TABLE llx_user ADD COLUMN employee tinyint DEFAULT 0 AFTER ref_int;
diff --git a/htdocs/install/mysql/tables/llx_establishment.sql b/htdocs/install/mysql/tables/llx_establishment.sql
index 2f5c86510e0..517464588a4 100644
--- a/htdocs/install/mysql/tables/llx_establishment.sql
+++ b/htdocs/install/mysql/tables/llx_establishment.sql
@@ -36,6 +36,6 @@ CREATE TABLE IF NOT EXISTS llx_establishment (
   fk_user_mod		integer NOT NULL,
   datec				datetime NOT NULL,
   tms				timestamp NOT NULL,
-  statut            tinyint DEFAULT 1,
+  status            tinyint DEFAULT 1,
 ) ENGINE=InnoDB;
 

From 5d7e05e3137917ad81d98baa2f63f10b387a5c02 Mon Sep 17 00:00:00 2001
From: aspangaro <alexandre.spangaro@gmail.com>
Date: Sat, 10 Oct 2015 06:00:55 +0200
Subject: [PATCH 05/66] Correct review

---
 htdocs/core/modules/modHRM.class.php               | 6 +++---
 htdocs/install/mysql/data/llx_c_hrm_department.sql | 2 +-
 htdocs/install/mysql/migration/3.9.0-4.0.0.sql     | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/modules/modHRM.class.php b/htdocs/core/modules/modHRM.class.php
index cfc85acff16..68549d2cd10 100644
--- a/htdocs/core/modules/modHRM.class.php
+++ b/htdocs/core/modules/modHRM.class.php
@@ -26,7 +26,7 @@ include_once (DOL_DOCUMENT_ROOT . "/core/modules/DolibarrModules.class.php");
  * \class 	modHRM
  * \brief 	Class to describe and activate the HRM module
  */
-class modiHRM extends DolibarrModules
+class modHRM extends DolibarrModules
 {
 	/**
 	 * Constructor.
@@ -88,8 +88,8 @@ class modiHRM extends DolibarrModules
 		$this->dictionnaries=array(
 			'langs'=>'hrm',
 			'tabname'=>array(
-				MAIN_DB_PREFIX."c_ihrm_department",
-				MAIN_DB_PREFIX."c_ihrm_function"
+				MAIN_DB_PREFIX."c_hrm_department",
+				MAIN_DB_PREFIX."c_hrm_function"
 			),
 			'tablib'=>array(
 				"DepartmentDict",
diff --git a/htdocs/install/mysql/data/llx_c_hrm_department.sql b/htdocs/install/mysql/data/llx_c_hrm_department.sql
index 0129856be95..e6e4921f372 100644
--- a/htdocs/install/mysql/data/llx_c_hrm_department.sql
+++ b/htdocs/install/mysql/data/llx_c_hrm_department.sql
@@ -29,7 +29,7 @@ INSERT INTO llx_c_hrm_department (rowid, pos, code, label, active) VALUES(3, 15,
 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(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', 1);
 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);
diff --git a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
index 5f752358858..aaa1f28d41b 100644
--- a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
+++ b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
@@ -53,7 +53,7 @@ INSERT INTO llx_c_hrm_department (rowid, pos, code, label, active) VALUES(3, 15,
 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(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', 1);
 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);

From 11387a5d38052784331874d42c6886f938b0e26e Mon Sep 17 00:00:00 2001
From: aspangaro <alexandre.spangaro@gmail.com>
Date: Sat, 10 Oct 2015 06:37:43 +0200
Subject: [PATCH 06/66] Add language file

---
 .tx/config                  |  6 ++++++
 htdocs/langs/en_US/hrm.lang | 13 +++++++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 htdocs/langs/en_US/hrm.lang

diff --git a/.tx/config b/.tx/config
index 03301ded378..3c8c49e40e9 100644
--- a/.tx/config
+++ b/.tx/config
@@ -146,6 +146,12 @@ source_file = htdocs/langs/en_US/holiday.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
 
+[dolibarr.hrm]
+file_filter = htdocs/langs/<lang>/hrm.lang
+source_file = htdocs/langs/en_US/hrm.lang
+source_lang = en_US
+type = MOZILLAPROPERTIES
+
 [dolibarr.incoterm]
 file_filter = htdocs/langs/<lang>/incoterm.lang
 source_file = htdocs/langs/en_US/incoterm.lang
diff --git a/htdocs/langs/en_US/hrm.lang b/htdocs/langs/en_US/hrm.lang
new file mode 100644
index 00000000000..33c6c271261
--- /dev/null
+++ b/htdocs/langs/en_US/hrm.lang
@@ -0,0 +1,13 @@
+# Dolibarr language file - en_US - hrm
+CHARSET=UTF-8
+
+Establishments=Establishments
+Establishment=Establishment
+NewEstablishment=New establishment
+DeleteEstablishment=Delete establishment
+ConfirmDeleteEstablishment=Are-you sure to delete this establishment ?
+OpenEtablishment=Open establishment
+CloseEtablishment=Close establishment
+Employees=Employees
+Employee=Employee
+NewEmployee=New employee

From cd7c5645c790980298381b2509c24c71c6eaf29f Mon Sep 17 00:00:00 2001
From: aspangaro <alexandre.spangaro@gmail.com>
Date: Sat, 10 Oct 2015 06:38:42 +0200
Subject: [PATCH 07/66] Add library

---
 htdocs/core/lib/hrm.lib.php | 120 ++++++++++++++++++++++++++++++++++++
 1 file changed, 120 insertions(+)
 create mode 100644 htdocs/core/lib/hrm.lib.php

diff --git a/htdocs/core/lib/hrm.lib.php b/htdocs/core/lib/hrm.lib.php
new file mode 100644
index 00000000000..f7f3ed11bd8
--- /dev/null
+++ b/htdocs/core/lib/hrm.lib.php
@@ -0,0 +1,120 @@
+<?php
+/* Copyright (C) 2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * 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/lib/hrm.lib.php
+ * \ingroup HRM
+ * \brief   Library for hrm 
+ */
+$langs->load('hrm');
+
+/**
+ * Return head table for employee tabs screen
+ *
+ * @param object $object contact
+ * @return array head table of tabs
+ */
+function employee_prepare_head($object) {
+	global $langs, $conf, $user;
+	
+	$h = 0;
+	$head = array ();
+	
+	$head [$h] [0] = DOL_URL_ROOT.'/hrm/employee/card.php?id=' . $object->id;
+	$head [$h] [1] = $langs->trans("Card");
+	$head [$h] [2] = 'card';
+	$h ++;
+
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'employee');
+
+	$head [$h] [0] = DOL_URL_ROOT.'/hrm/employee/info.php?id=' . $object->id;
+	$head [$h] [1] = $langs->trans("Info");
+	$head [$h] [2] = 'info';
+	$h ++;
+
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'employee', 'remove');
+
+	return $head;
+}
+
+/**
+ * Return head table for establishment tabs screen
+ *
+ * @param   Establishment	$object		Object related to tabs
+ * @return  array						Array of tabs to show
+ */
+function establishment_prepare_head($object)
+{
+	global $langs, $conf;
+
+	$h = 0;
+	$head = array();
+
+	$head[$h][0] = DOL_URL_ROOT.'/hrm/establishment/card.php?id=' . $object->id;
+	$head[$h][1] = $langs->trans("Card");
+	$head[$h][2] = 'card';
+	$h++;
+
+	// Show more tabs from modules
+	// Entries must be declared in modules descriptor with line
+    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
+    // $this->tabs = array('entity:-tabname);   												to remove a tab
+	complete_head_from_modules($conf,$langs,$object,$head,$h,'establishment');
+
+	$head[$h][0] = DOL_URL_ROOT.'/hrm/establishment/info.php?id=' . $object->id;
+	$head[$h][1] = $langs->trans("Info");
+	$head[$h][2] = 'info';
+	$h++;
+
+	complete_head_from_modules($conf,$langs,$object,$head,$h,'establishment','remove');
+
+	return $head;
+}
+
+/**
+ *  Return array head with list of tabs to view object informations
+ *
+ *  @return	array		head
+ */
+function hrm_admin_prepare_head()
+{
+    global $langs, $conf, $user;
+
+    $h = 0;
+    $head = array();
+
+	$head[$h][0] = DOL_URL_ROOT.'/hrm/admin/admin_hrm.php';
+    $head[$h][1] = $langs->trans("Parameters");
+    $head[$h][2] = 'parameters';
+    $h++;
+
+	$head[$h][0] = DOL_URL_ROOT.'/hrm/admin/admin_establishment.php';
+    $head[$h][1] = $langs->trans("Establishments");
+    $head[$h][2] = 'establishments';
+    $h++;
+
+    // Show more tabs from modules
+    // Entries must be declared in modules descriptor with line
+    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
+    // $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
+    complete_head_from_modules($conf,$langs,'',$head,$h,'hrm_admin');
+
+    complete_head_from_modules($conf,$langs,'',$head,$h,'hrm_admin','remove');
+
+    return $head;
+}
+

From 8f8de587b8e8c2049ea721d8a6862aeaa1b3c116 Mon Sep 17 00:00:00 2001
From: aspangaro <alexandre.spangaro@gmail.com>
Date: Sat, 10 Oct 2015 06:39:59 +0200
Subject: [PATCH 08/66] Add admin & first version to manage establishment

---
 htdocs/core/modules/modHRM.class.php      |   2 +-
 htdocs/hrm/admin/admin_establishment.php  | 126 +++++++
 htdocs/hrm/admin/admin_hrm.php            |  58 +++
 htdocs/hrm/admin/index.html               |   0
 htdocs/hrm/class/establishment.class.php  | 324 +++++++++++++++++
 htdocs/hrm/class/index.html               |   0
 htdocs/hrm/establishment/card.php         | 415 ++++++++++++++++++++++
 htdocs/hrm/establishment/index.html       |   0
 htdocs/hrm/establishment/info.php         |  59 +++
 htdocs/hrm/index.html                     |   0
 htdocs/theme/eldy/img/object_building.png | Bin 0 -> 563 bytes
 htdocs/theme/md/img/object_building.png   | Bin 0 -> 563 bytes
 12 files changed, 983 insertions(+), 1 deletion(-)
 create mode 100644 htdocs/hrm/admin/admin_establishment.php
 create mode 100644 htdocs/hrm/admin/admin_hrm.php
 create mode 100644 htdocs/hrm/admin/index.html
 create mode 100644 htdocs/hrm/class/establishment.class.php
 create mode 100644 htdocs/hrm/class/index.html
 create mode 100644 htdocs/hrm/establishment/card.php
 create mode 100644 htdocs/hrm/establishment/index.html
 create mode 100644 htdocs/hrm/establishment/info.php
 create mode 100644 htdocs/hrm/index.html
 create mode 100644 htdocs/theme/eldy/img/object_building.png
 create mode 100644 htdocs/theme/md/img/object_building.png

diff --git a/htdocs/core/modules/modHRM.class.php b/htdocs/core/modules/modHRM.class.php
index 68549d2cd10..c63fa04f65e 100644
--- a/htdocs/core/modules/modHRM.class.php
+++ b/htdocs/core/modules/modHRM.class.php
@@ -62,7 +62,7 @@ class modHRM extends DolibarrModules
 		$this->dirs = array ();
 		
 		// Config pages
-		$this->config_page_url = array('admin_hrm.php');
+		$this->config_page_url = array('admin_hrm.php@hrm');
 		
 		// Dependencies
 		$this->depends = array();
diff --git a/htdocs/hrm/admin/admin_establishment.php b/htdocs/hrm/admin/admin_establishment.php
new file mode 100644
index 00000000000..2fb6507d0ba
--- /dev/null
+++ b/htdocs/hrm/admin/admin_establishment.php
@@ -0,0 +1,126 @@
+<?php
+/* Copyright (C) 2015 		Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * 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/hrm/admin/admin_establishment.php
+ * \ingroup HRM
+ * \brief 	HRM Establishment module setup page
+ */
+require('../../main.inc.php');
+require_once DOL_DOCUMENT_ROOT.'/core/lib/hrm.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/hrm/class/establishment.class.php';
+
+$langs->load("admin");
+$langs->load('hrm');
+
+if (! $user->admin)
+	accessforbidden();
+
+$error=0;
+
+$action = GETPOST('action', 'alpha');
+
+$object = new Establishment($db);
+
+/*
+ * Actions
+ */
+
+/*
+ * View
+ */
+$page_name = "Establishments";
+llxHeader('', $langs->trans($page_name));
+
+$form = new Form($db);
+
+dol_htmloutput_mesg($mesg);
+
+// Subheader
+$linkback = '<a href="' . DOL_URL_ROOT . '/admin/modules.php">' . $langs->trans("BackToModuleList") . '</a>';
+print load_fiche_titre($langs->trans($page_name), $linkback);
+
+// Configuration header
+$head = hrm_admin_prepare_head();
+dol_fiche_head($head, 'establishments', $langs->trans("HRM"), 0, "user");
+
+$sql = "SELECT e.rowid, e.name, e.address, e.zip, e.town, e.statut";
+$sql.= " FROM ".MAIN_DB_PREFIX."establishment as e";
+$sql.= " WHERE e.entity = ".$conf->entity;
+
+$result = $db->query($sql);
+if ($result)
+{
+	$var=false;
+    $num = $db->num_rows($result);
+
+    $i = 0;
+
+	// Load attribute_label
+	print '<table class="noborder" width="100%">';
+	print '<tr class="liste_titre">';
+	print '<td>'.$langs->trans("Ref").'</td>';
+	print '<td>'.$langs->trans("Name").'</td>';
+	print '<td>'.$langs->trans("Address").'</td>';
+	print '<td>'.$langs->trans("Zipcode").'</td>';
+	print '<td>'.$langs->trans("Town").'</td>';
+	print '<td align="right">'.$langs->trans("Statut").'</td>';
+	print '</tr>';
+
+	if ($num)
+    {
+	    $establishmentstatic=new Establishment($db);
+
+		while ($i < $num && $i < $max)
+        {
+            $obj = $db->fetch_object($result);
+            $fiscalyearstatic->id=$obj->rowid;
+            print '<tr '.$bc[$var].'>';
+			print '<td><a href="admin_establishment_card.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowEstablishment"),"building").' '.$obj->rowid.'</a></td>';
+            print '<td align="left">'.$obj->name.'</td>';
+            print '<td align="left">'.$obj->address.'</td>';
+			print '<td align="left">'.$obj->zip.'</td>';
+			print '<td align="left">'.$obj->town.'</td>';
+            print '<td align="right">'.$establishmentstatic->LibStatut($obj->statut,5).'</td>';
+            print '</tr>';
+            $var=!$var;
+            $i++;
+        }
+
+    }
+    else
+    {
+        print '<tr '.$bc[$var].'><td colspan="6">'.$langs->trans("None").'</td></tr>';
+    }
+
+	print '</table>';
+}
+else
+{
+	dol_print_error($db);
+}
+
+dol_fiche_end();
+
+// Buttons
+print '<div class="tabsAction">';
+print '<a class="butAction" href="../establishment/card.php?action=create">'.$langs->trans("NewEstablishment").'</a>';
+print '</div>';
+
+llxFooter();
+$db->close();
diff --git a/htdocs/hrm/admin/admin_hrm.php b/htdocs/hrm/admin/admin_hrm.php
new file mode 100644
index 00000000000..d66185315eb
--- /dev/null
+++ b/htdocs/hrm/admin/admin_hrm.php
@@ -0,0 +1,58 @@
+<?php
+/* Copyright (C) 2015 		Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * 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/hrm/admin/admin_ihrm.php
+ * \ingroup HRM
+ * \brief 	HRM module setup page
+ */
+require('../../main.inc.php');
+require_once DOL_DOCUMENT_ROOT.'/core/lib/hrm.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+
+$langs->load("admin");
+$langs->load('hrm');
+
+if (! $user->admin)
+	accessforbidden();
+
+$action = GETPOST('action', 'alpha');
+
+/*
+ * Actions
+ */
+
+/*
+ * View
+ */
+$page_name = "Parameters";
+llxHeader('', $langs->trans($page_name));
+
+$form = new Form($db);
+
+dol_htmloutput_mesg($mesg);
+
+// Subheader
+$linkback = '<a href="' . DOL_URL_ROOT . '/admin/modules.php">' . $langs->trans("BackToModuleList") . '</a>';
+print load_fiche_titre($langs->trans($page_name), $linkback);
+
+// Configuration header
+$head = hrm_admin_prepare_head();
+dol_fiche_head($head, 'parameters', $langs->trans("HRM"), 0, "user");
+
+llxFooter();
+$db->close();
diff --git a/htdocs/hrm/admin/index.html b/htdocs/hrm/admin/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/hrm/class/establishment.class.php b/htdocs/hrm/class/establishment.class.php
new file mode 100644
index 00000000000..208d38c1fd1
--- /dev/null
+++ b/htdocs/hrm/class/establishment.class.php
@@ -0,0 +1,324 @@
+<?php
+/* Copyright (C) 2015		Alexandre Spangaro	<aspangaro.dolibarr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * 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/custom/ihrm/class/establishment.class.php
+ *    \ingroup    iHRM
+ *    \brief      File of class to manage establishments
+ */
+
+require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php';
+
+/**
+ * Class to manage establishments
+ */
+class Establishment extends CommonObject
+{
+	public $element='establishment';
+	public $table_element='ihrm_establishment';
+	public $table_element_line = '';
+	public $fk_element = 'fk_establishment';
+	protected $ismultientitymanaged = 1;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
+
+	var $rowid;
+
+	var $name;
+	var $address;
+	var $zip;
+	var $town;
+	var $statut;		// 0=open, 1=closed
+	var $entity;
+
+	var $statuts=array();
+	var $statuts_short=array();
+
+	/**
+	 * Constructor
+	 *
+	 * @param	DoliDB		$db		Database handler
+	 */
+	function __construct($db)
+	{
+		$this->db = $db;
+
+		$this->statuts_short = array(0 => 'Opened', 1 => 'Closed');
+        $this->statuts = array(0 => 'Opened', 1 => 'Closed');
+
+		return 1;
+	}
+
+	/**
+	 *	Create object in database
+	 *
+	 *	@param		User	$user   User making creation
+	 *	@return 	int				<0 if KO, >0 if OK
+	 */
+	function create($user)
+	{
+		global $conf;
+
+		$error = 0;
+
+		$now=dol_now();
+
+		$this->db->begin();
+
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."ihrm_establishment (";
+		$sql.= "name";
+		$sql.= ", address";
+		$sql.= ", zip";
+		$sql.= ", town";
+		$sql.= ", statut";
+		$sql.= ", entity";
+		$sql.= ", datec";
+		$sql.= ", fk_user_author";
+		$sql.= ") VALUES (";
+		$sql.= " '".$this->name."'";
+		$sql.= ", '".$this->address."'";
+		$sql.= ", '".$this->zip."'";
+		$sql.= ", '".$this->town."'";
+		$sql.= ", ".$this->statut;
+		$sql.= ", ".$conf->entity;
+		$sql.= ", '".$this->db->idate($now)."'";
+		$sql.= ", ". $user->id;
+		$sql.= ")";
+
+		$this->db->begin();
+
+		dol_syslog(get_class($this)."::create", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if (! $resql) {
+			$error ++;
+			$this->errors[] = "Error " . $this->db->lasterror();
+		}
+
+		if (! $error) {
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . "ihrm_establishment");
+		}
+
+		// Commit or rollback
+		if ($error) {
+			foreach ( $this->errors as $errmsg ) {
+				dol_syslog(get_class($this) . "::create " . $errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', ' . $errmsg : $errmsg);
+			}
+			$this->db->rollback();
+			return - 1 * $error;
+		} else {
+			$this->db->commit();
+			return $this->id;
+		}
+	}
+
+	/**
+	 *	Update record
+	 *
+	 *	@param	User	$user		User making update
+	 *	@return	int					<0 if KO, >0 if OK
+	 */
+	function update($user)
+	{
+		global $langs;
+
+		// Check parameters
+		if (empty($this->name))
+        {
+            $this->error='ErrorBadParameter';
+            return -1;
+        }
+
+		$this->db->begin();
+
+		$sql = "UPDATE ".MAIN_DB_PREFIX."ihrm_establishment";
+		$sql .= " SET name = '".$this->name."'";
+		$sql .= ", address = '".$this->address."'";
+		$sql .= ", zip = '".$this->zip."'";
+		$sql .= ", town = '".$this->town."'";
+		$sql .= ", statut = '".$this->statut."'";
+		$sql .= ", fk_user_mod = " . $user->id;
+		$sql .= " WHERE rowid = ".$this->id;
+
+		dol_syslog(get_class($this) . "::update sql=" . $sql, LOG_DEBUG);
+		$result = $this->db->query($sql);
+		if ($result) {
+			$this->db->commit();
+			return 1;
+		} else {
+			$this->error = $this->db->lasterror();
+			$this->db->rollback();
+			return - 1;
+		}
+	}
+
+	/**
+	* Load an object from database
+	*
+	* @param	int		$id		Id of record to load
+	* @return	int				<0 if KO, >0 if OK
+	*/
+	function fetch($id)
+	{
+		$sql = "SELECT rowid, name, address, zip, town, statut";
+		$sql.= " FROM ".MAIN_DB_PREFIX."ihrm_establishment";
+		$sql.= " WHERE rowid = ".$id;
+
+		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
+		$result = $this->db->query($sql);
+		if ( $result )
+		{
+			$obj = $this->db->fetch_object($result);
+
+			$this->id			= $obj->rowid;
+			$this->name			= $obj->name;
+			$this->address		= $obj->address;
+			$this->zip			= $obj->zip;
+			$this->town			= $obj->town;
+			$this->statut	    = $obj->statut;
+
+			return 1;
+		}
+		else
+		{
+			$this->error=$this->db->lasterror();
+			return -1;
+		}
+	}
+
+   /**
+	*	Delete record
+	*
+	*	@param	int		$id		Id of record to delete
+	*	@return	int				<0 if KO, >0 if OK
+	*/
+	function delete($id)
+	{
+		$this->db->begin();
+
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."ihrm_establishment WHERE rowid = ".$id;
+
+		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			$this->db->commit();
+			return 1;
+		}
+		else
+		{
+			$this->error=$this->db->lasterror();
+			$this->db->rollback();
+			return -1;
+		}
+	}
+
+	/**
+	 * Give a label from a status
+	 *
+	 * @param	int		$mode   	0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto
+	 * @return  string   		   	Label
+	 */
+	function getLibStatut($mode=0)
+	{
+		return $this->LibStatut($this->statut,$mode);
+	}
+
+	/**
+	 *  Give a label from a status
+	 *
+	 *  @param	int		$statut     Id status
+	 *  @param  int		$mode       0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto
+	 *  @return string      		Label
+	 */
+	function LibStatut($statut,$mode=0)
+	{
+		global $langs;
+
+		if ($mode == 0)
+		{
+			return $langs->trans($this->statuts[$statut]);
+		}
+		if ($mode == 1)
+		{
+			return $langs->trans($this->statuts_short[$statut]);
+		}
+		if ($mode == 2)
+		{
+			if ($statut==0) return img_picto($langs->trans($this->statuts_short[$statut]),'statut4').' '.$langs->trans($this->statuts_short[$statut]);
+			if ($statut==1) return img_picto($langs->trans($this->statuts_short[$statut]),'statut8').' '.$langs->trans($this->statuts_short[$statut]);
+		}
+		if ($mode == 3)
+		{
+			if ($statut==0 && ! empty($this->statuts_short[$statut])) return img_picto($langs->trans($this->statuts_short[$statut]),'statut4');
+			if ($statut==1 && ! empty($this->statuts_short[$statut])) return img_picto($langs->trans($this->statuts_short[$statut]),'statut8');
+		}
+		if ($mode == 4)
+		{
+			if ($statut==0 && ! empty($this->statuts_short[$statut])) return img_picto($langs->trans($this->statuts_short[$statut]),'statut4').' '.$langs->trans($this->statuts[$statut]);
+			if ($statut==1 && ! empty($this->statuts_short[$statut])) return img_picto($langs->trans($this->statuts_short[$statut]),'statut8').' '.$langs->trans($this->statuts[$statut]);
+		}
+		if ($mode == 5)
+		{
+			if ($statut==0 && ! empty($this->statuts_short[$statut])) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),'statut4');
+			if ($statut==1 && ! empty($this->statuts_short[$statut])) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),'statut8');
+		}
+	}
+
+	/**
+	 * Information on record
+	 *
+	 * @param	int		$id      Id of record
+	 * @return	void
+	 */
+	function info($id)
+	{
+		$sql = 'SELECT e.rowid, e.datec, e.fk_user_author, e.tms, e.fk_user_mod';
+		$sql.= ' FROM '.MAIN_DB_PREFIX.'ihrm_establishment as e';
+		$sql.= ' WHERE e.rowid = '.$id;
+
+		dol_syslog(get_class($this)."::fetch info", LOG_DEBUG);
+		$result = $this->db->query($sql);
+
+		if ($result)
+		{
+			if ($this->db->num_rows($result))
+			{
+				$obj = $this->db->fetch_object($result);
+				$this->id = $obj->rowid;
+				if ($obj->fk_user_author)
+				{
+					$cuser = new User($this->db);
+					$cuser->fetch($obj->fk_user_author);
+					$this->user_creation = $cuser;
+				}
+				if ($obj->fk_user_modif)
+				{
+					$muser = new User($this->db);
+					$muser->fetch($obj->fk_user_mod);
+					$this->user_modification = $muser;
+				}
+				$this->date_creation     = $this->db->jdate($obj->datec);
+				$this->date_modification = $this->db->jdate($obj->tms);
+			}
+			$this->db->free($result);
+		}
+		else
+		{
+			dol_print_error($this->db);
+		}
+	}
+
+}
diff --git a/htdocs/hrm/class/index.html b/htdocs/hrm/class/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/hrm/establishment/card.php b/htdocs/hrm/establishment/card.php
new file mode 100644
index 00000000000..dc3b29225c2
--- /dev/null
+++ b/htdocs/hrm/establishment/card.php
@@ -0,0 +1,415 @@
+<?php
+/* Copyright (C) 2015      Alexandre Spangaro	<aspangaro.dolibarr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * 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/custom/ihrm/establishment/card.php
+ *  \brief      	Page to show an establishment
+ */
+$res = @include ("../../main.inc.php"); // For root directory
+if (! $res)
+	$res = @include ("../../../main.inc.php"); // For "custom" directory
+if (! $res)
+	die("Include of main fails");
+
+require_once ('../core/lib/ihrm.lib.php');
+require_once ('../class/establishment.class.php');
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
+
+$langs->load("admin");
+$langs->load("compta");
+
+// Security check
+if (! $user->admin) accessforbidden();
+
+$error=0;
+
+$action = GETPOST('action','alpha');
+$cancel = GETPOST('cancel', 'alpha');
+$confirm = GETPOST('confirm','alpha');
+$id = GETPOST('id','int');
+
+// List of statut
+static $tmpstatut2label=array(
+		'0'=>'OpenEtablishment',
+		'1'=>'CloseEtablishment'
+);
+$statut2label=array('');
+foreach ($tmpstatut2label as $key => $val) $statut2label[$key]=$langs->trans($val);
+
+$object = new Establishment($db);
+
+/*
+ * Actions
+ */
+
+if ($action == 'confirm_delete' && $confirm == "yes")
+{
+    $result=$object->delete($id);
+    if ($result >= 0)
+    {
+        header("Location: ../admin/admin_establishment.php");
+        exit;
+    }
+    else
+    {
+        setEventMessage($object->error, 'errors');
+    }
+}
+
+else if ($action == 'add')
+{
+    if (! $cancel)
+    {
+        $error=0;
+
+		$object->name = GETPOST('name', 'alpha');
+        if (empty($object->name))
+        {
+	        setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Name")), 'errors');
+            $error++;
+        }
+
+        if (empty($error))
+        {
+			$tmparray=getCountry(GETPOST('country_id','int'),'all',$db,$langs,0);
+			if (! empty($tmparray['id']))
+			{
+				$object->country_id   =$tmparray['id'];
+				$object->country_code =$tmparray['code'];
+				$object->country_label=$tmparray['label'];
+			}
+
+			$object->address 		= GETPOST('address', 'alpha');
+			$object->zip 			= GETPOST('zipcode', 'alpha');
+			$object->town			= GETPOST('town', 'alpha');
+			$object->fk_pays		= $object->country_id;
+			$object->statut     	= GETPOST('statut','int');
+			$object->fk_user_author	= $user->id;
+			$object->datec			= dol_now();
+
+			$id = $object->create($user);
+
+            if ($id > 0)
+            {
+                header("Location: " . $_SERVER["PHP_SELF"] . "?id=" . $id);
+                exit;
+            }
+            else
+            {
+	            setEventMessage($object->error, 'errors');
+                $action='create';
+            }
+        }
+        else
+        {
+            $action='create';
+        }
+    }
+    else
+    {
+        header("Location: ../admin/admin_establishment.php");
+        exit;
+    }
+}
+
+// Update record
+else if ($action == 'update')
+{
+	$error = 0;
+	
+	if (! $cancel) {
+
+		$name = GETPOST('name', 'alpha');
+		if (empty($name)) {
+			setEventMessage($langs->trans('ErrorFieldRequired', $langs->trans('NameProperty')), 'errors');
+			$error ++;
+		}
+		$typeid = GETPOST('typeid', 'int');
+		if (empty($typeid)) {
+			setEventMessage($langs->trans('ErrorFieldRequired', $langs->trans('TypeProperty')), 'errors');
+			$error ++;
+		}
+
+		if (empty($error)) {
+			$object->name 			= GETPOST('name', 'alpha');
+			$object->address 		= GETPOST('address', 'alpha');
+			$object->zip 			= GETPOST('zipcode', 'alpha');
+			$object->town			= GETPOST('town', 'alpha');
+			$object->fk_pays		= GETPOST('country_id', 'int');
+			$object->rowid 			= GETPOST('id');
+			$object->fk_user_mod	= $user->id;
+
+			$id = $object->update();
+
+            if ($id > 0)
+            {
+                header("Location: " . $_SERVER["PHP_SELF"] . "?id=" . $id);
+                exit;
+            }
+            else
+            {
+	            setEventMessage($object->error, 'errors');
+                $action='create';
+            }
+		}
+	} else {
+        header("Location: card.php?id=" . $id);
+        exit;
+	}
+}
+
+/*
+ * View
+ */
+
+llxHeader();
+
+$form = new Form($db);
+$formcompany = new FormCompany($db);
+
+/*
+ * Action create
+ */
+if ($action == 'create')
+{
+    print load_fiche_titre($langs->trans("NewEstablishment"));
+
+    print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    print '<input type="hidden" name="action" value="add">';
+
+	dol_fiche_head();
+
+    print '<table class="border" width="100%">';
+
+	// Name
+    print '<tr><td class="fieldrequired"><label for="name">'.$langs->trans("Name").'</label></td><td><input name="name" id="name" size="32" value="' . GETPOST("name") . '"></td></tr>';
+
+	// Address
+	print '<tr>';
+	print '<td><label for="address">' . $langs->trans("Address") . '</label></td>';
+	print '<td>';
+	print '<input name="address" id="address" size="32" value="' . $object->address . '">';
+	print '</td>';
+	print '</tr>';
+
+	// Zipcode
+	print '<tr>';
+	print '<td><label for="zipcode">' . $langs->trans('Zip') . '</label></td>';
+	print '<td>';
+	print $formcompany->select_ziptown(GETPOST('zipcode', 'alpha'), 'zipcode', array (
+			'town',
+			'selectcountry_id' 
+	), 6);
+	print '</td>';
+	print '</tr>';
+	
+	// Town
+	print '<tr>';
+	print '<td><label for="town">' . $langs->trans('Town') . '</label></td>';
+	print '<td>';
+	print $formcompany->select_ziptown(GETPOST('town', 'alpha'), 'town', array (
+			'zipcode',
+			'selectcountry_id' 
+	));
+	print '</td>';
+	print '</tr>';
+
+	// Country
+	print '<tr>';
+	print '<td><label for="selectcountry_id">' . $langs->trans("Country") . '</label></td>';
+	print '<td class="maxwidthonsmartphone">';
+	print $form->select_country($mysoc->country_id,'country_id');
+		if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+	print '</td>';
+	print '</tr>';
+
+	// Statut
+    print '<tr>';
+    print '<td class="fieldrequired"><label for="statut">'.$langs->trans("Statut").'</label></td>';
+	print '<td>';
+	print $form->selectarray('statut',$statut2label,GETPOST('statut'));
+    print '</td></tr>';
+
+    print '</table>';
+	
+	dol_fiche_end();
+
+    print '<div class="center">';
+	print '<input class="button" type="submit" value="'.$langs->trans("Save").'">';
+	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
+    print '<input class="button" type="submit" name="cancel" value="'.$langs->trans("Cancel").'">';
+	print '</div>';
+
+    print '</form>';
+}
+else if ($id)
+{
+    $result = $object->fetch($id);
+    if ($result > 0)
+    {
+        $head = establishment_prepare_head($object);
+
+        if ($action == 'edit')
+        {
+        	dol_fiche_head($head, 'card', $langs->trans("Establishment"), 0, 'building@ihrm');
+
+        	print '<form name="update" action="' . $_SERVER["PHP_SELF"] . '" method="POST">' . "\n";
+            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+            print '<input type="hidden" name="action" value="update">';
+            print '<input type="hidden" name="id" value="'.$id.'">';
+
+            print '<table class="border" width="100%">';
+
+            // Ref
+            print "<tr>";
+            print '<td width="20%">'.$langs->trans("Ref").'</td><td>';
+            print $object->rowid;
+            print '</td></tr>';
+
+            // Name
+            print '<tr><td class="fieldrequired"><label for="name">'.$langs->trans("Name").'</label></td><td>';
+            print '<input name="name" id="name" class="flat" size="32" value="'.$object->name.'">';
+            print '</td></tr>';
+
+			// Address
+			print '<tr>';
+			print '<td><label for="address">' . $langs->trans("Address") . '</label></td>';
+			print '<td>';
+			print '<input name="address" id="address" size="32" value="' . $object->address . '">';
+			print '</td>';
+			print '</tr>';
+
+			// Zipcode / Town
+			print '<tr><td><label for="zipcode">' . $langs->trans('Zip') . '</label></td><td>';
+			print $formcompany->select_ziptown($object->zip, 'zipcode', array (
+					'town',
+					'selectcountry_id' 
+			), 6) . '</tr>';
+			print '<tr><td><label for="town">' . $langs->trans('Town') . '</label></td><td>';
+			print $formcompany->select_ziptown($object->town, 'town', array (
+					'zipcode',
+					'selectcountry_id' 
+			)) . '</td></tr>';
+
+			// Country
+			print '<tr>';
+			print '<td><label for="selectcountry_id">' . $langs->trans("Country") . '</label></td>';
+			print '<td class="maxwidthonsmartphone">';
+			print $form->select_country($object->fk_pays,'country_id');
+				if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+			print '</td>';
+			print '</tr>';			
+
+			// Statut
+			print '<tr><td><label for="statut">'.$langs->trans("Statut").'</label></td><td>';
+			print $form->selectarray('statut',$statut2label,$object->statut);
+			print '</td></tr>';
+
+            print '</table>';
+
+			dol_fiche_end();
+
+            print '<div class="center">';
+			print '<input type="submit" class="button" value="'.$langs->trans("Save").'">';
+			print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
+            print '<input type="submit" name="cancel" class="button" value="'.$langs->trans("Cancel").'">';
+            print '</div>';
+
+            print '</form>';
+        }
+        else
+        {
+            /*
+             * Confirm delete
+             */
+            if ($action == 'delete')
+            {
+                print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id,$langs->trans("DeleteEstablishment"),$langs->trans("ConfirmDeleteEstablishment"),"confirm_delete");
+
+            }
+
+        	dol_fiche_head($head, 'card', $langs->trans("Establishment"), 0, 'building@ihrm');
+
+        	print '<table class="border" width="100%">';
+
+            $linkback = '<a href="../admin/admin_establishment.php">'.$langs->trans("BackToList").'</a>';
+
+            // Ref
+            print '<tr><td width="25%">'.$langs->trans("Ref").'</td><td width="50%">';
+            print $object->rowid;
+			print '</td><td width="25%">';
+			print $linkback;
+            print '</td></tr>';
+
+			// Name
+			print '<tr>';
+			print '<td>'.$langs->trans("Name").'</td>';
+			print '<td colspan="2">'.$object->name.'</td>';
+			print '</tr>';
+
+			// Address
+			print '<tr>';
+			print '<td>'.$langs->trans("Address").'</td>';
+			print '<td colspan="2">'.$object->address.'</td>';
+			print '</tr>';
+
+			// Zipcode
+			print '<tr>';
+			print '<td>'.$langs->trans("Zipcode").'</td>';
+			print '<td colspan="2">'.$object->zip.'</td>';
+			print '</tr>';
+
+			// Town
+			print '<tr>';
+			print '<td>'.$langs->trans("Town").'</td>';
+			print '<td colspan="2">'.$object->town.'</td>';
+			print '</tr>';
+
+			// Country
+			print '<tr>';
+			print '<td>'.$langs->trans("Country").'</td>';
+			print '<td colspan="2">'.getCountry($object->fk_pays,1).'</td>';
+			print '</tr>';
+
+            // Statut
+            print '<tr><td>'.$langs->trans("Status").'</td><td colspan="2">'.$object->getLibStatut(4).'</td></tr>';
+
+            print "</table>";
+
+            dol_fiche_end();
+
+            /*
+             * Barre d'actions
+            */
+
+            print '<div class="tabsAction">';
+            print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&id='.$id.'">'.$langs->trans('Modify').'</a>';
+			print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?action=delete&id='.$id.'">'.$langs->trans('Delete').'</a>';
+            print '</div>';
+        }
+    }
+    else
+    {
+        dol_print_error($db);
+    }
+}
+
+llxFooter();
+
+$db->close();
diff --git a/htdocs/hrm/establishment/index.html b/htdocs/hrm/establishment/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/hrm/establishment/info.php b/htdocs/hrm/establishment/info.php
new file mode 100644
index 00000000000..06ba9875e58
--- /dev/null
+++ b/htdocs/hrm/establishment/info.php
@@ -0,0 +1,59 @@
+<?php
+/* Copyright (C) 2015      Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * 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/custom/ihrm/establishment/info.php
+ *  \brief      	Page to show info of an establishment
+ */
+
+require '../../main.inc.php';
+
+require_once ('../core/lib/ihrm.lib.php');
+require_once ('../class/establishment.class.php');
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+
+$langs->load("admin");
+$langs->load("compta");
+
+// Security check
+if (! $user->admin) accessforbidden();
+
+$id = GETPOST('id','int');
+
+// View
+llxHeader();
+
+if ($id)
+{
+	$object = new Establishment($db);
+	$object->fetch($id);
+	$object->info($id);
+
+	$head = establishment_prepare_head($object);
+
+	dol_fiche_head($head, 'info', $langs->trans("Establishment"), 0, 'building@ihrm');
+
+    print '<table width="100%"><tr><td>';
+    dol_print_object_info($object);
+    print '</td></tr></table>';
+
+    print '</div>';
+}
+
+$db->close();
+
+llxFooter();
diff --git a/htdocs/hrm/index.html b/htdocs/hrm/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/theme/eldy/img/object_building.png b/htdocs/theme/eldy/img/object_building.png
new file mode 100644
index 0000000000000000000000000000000000000000..c9d1539dddcdce4f285117d26cab14ee97ddb90b
GIT binary patch
literal 563
zcmV-30?hr1P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00009a7bBm000XU
z000XU0RWnu7ytkOAY({UO#lFTB>(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd
zMgRZ-xk*GpRCwCNlf91;Q541RJl^EZ5JN#8OeT|1NU;U6Fig~f!it1$rN9siV~oU@
zXktZeBVil=09&xJprYJD3wA3E1qD<R!iN?jGw;Dn=HuFLv9rk*p7Q4Amve5;RS*$w
zBLcS+y*g;O+pig8&jH{M07QtGA%y%w#9|NxUpt*n_gX-qP<T-+79U6{A&z5ERTVtX
zgKRbn%jGf!0NraNSe9jZo~NWzskf@Cen7+%UDwZD*Ht*@KNBPPzQ37FCO<gmoKi|%
z*L|AL=dI~<dRZ=){Y1dwaJW;e)!sRda~j8ShB5X{2=S)TXuMi179SG<gb=^i>pd||
z^PZ}z+J3*MrfKE|gTb>(rJ^MQgb>hdHet8hK@>%xX&N|=1FcpI=JPq+!~yH~`-5CA
zM<}IK2yxCiKN${(ecQH6H@ShRR;y>n<1r(pyh{jqsVItDuh&1XRx3ZTiHOL@<MI93
zY}RFro$0#%aI@K5j7FnJp6C5ebP$GNT1tuObQ;#{_4_akSBO}ZQeqGU$pFJJK9x$P
z$59l??RI++hT&hsFuvHfop&7P`_+BrzklPu0RT6g$xfZ+63qYr002ovPDHLkV1jV+
B@KgW*

literal 0
HcmV?d00001

diff --git a/htdocs/theme/md/img/object_building.png b/htdocs/theme/md/img/object_building.png
new file mode 100644
index 0000000000000000000000000000000000000000..c9d1539dddcdce4f285117d26cab14ee97ddb90b
GIT binary patch
literal 563
zcmV-30?hr1P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00009a7bBm000XU
z000XU0RWnu7ytkOAY({UO#lFTB>(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd
zMgRZ-xk*GpRCwCNlf91;Q541RJl^EZ5JN#8OeT|1NU;U6Fig~f!it1$rN9siV~oU@
zXktZeBVil=09&xJprYJD3wA3E1qD<R!iN?jGw;Dn=HuFLv9rk*p7Q4Amve5;RS*$w
zBLcS+y*g;O+pig8&jH{M07QtGA%y%w#9|NxUpt*n_gX-qP<T-+79U6{A&z5ERTVtX
zgKRbn%jGf!0NraNSe9jZo~NWzskf@Cen7+%UDwZD*Ht*@KNBPPzQ37FCO<gmoKi|%
z*L|AL=dI~<dRZ=){Y1dwaJW;e)!sRda~j8ShB5X{2=S)TXuMi179SG<gb=^i>pd||
z^PZ}z+J3*MrfKE|gTb>(rJ^MQgb>hdHet8hK@>%xX&N|=1FcpI=JPq+!~yH~`-5CA
zM<}IK2yxCiKN${(ecQH6H@ShRR;y>n<1r(pyh{jqsVItDuh&1XRx3ZTiHOL@<MI93
zY}RFro$0#%aI@K5j7FnJp6C5ebP$GNT1tuObQ;#{_4_akSBO}ZQeqGU$pFJJK9x$P
z$59l??RI++hT&hsFuvHfop&7P`_+BrzklPu0RT6g$xfZ+63qYr002ovPDHLkV1jV+
B@KgW*

literal 0
HcmV?d00001


From 4008a076aba34e2ab0dc478bbbf23f71a130c9e2 Mon Sep 17 00:00:00 2001
From: aspangaro <alexandre.spangaro@gmail.com>
Date: Sat, 10 Oct 2015 06:58:18 +0200
Subject: [PATCH 09/66] Correct old code

---
 htdocs/hrm/admin/admin_hrm.php           |  2 +-
 htdocs/hrm/class/establishment.class.php | 18 +++++++++---------
 htdocs/hrm/establishment/card.php        | 19 +++++++------------
 htdocs/hrm/establishment/info.php        | 14 ++++++--------
 4 files changed, 23 insertions(+), 30 deletions(-)

diff --git a/htdocs/hrm/admin/admin_hrm.php b/htdocs/hrm/admin/admin_hrm.php
index d66185315eb..bc0487bad94 100644
--- a/htdocs/hrm/admin/admin_hrm.php
+++ b/htdocs/hrm/admin/admin_hrm.php
@@ -16,7 +16,7 @@
  */
 
 /**
- * \file 	htdocs/hrm/admin/admin_ihrm.php
+ * \file 	htdocs/hrm/admin/admin_hrm.php
  * \ingroup HRM
  * \brief 	HRM module setup page
  */
diff --git a/htdocs/hrm/class/establishment.class.php b/htdocs/hrm/class/establishment.class.php
index 208d38c1fd1..dccb2d6d37e 100644
--- a/htdocs/hrm/class/establishment.class.php
+++ b/htdocs/hrm/class/establishment.class.php
@@ -16,8 +16,8 @@
  */
 
 /**
- *    \file       htdocs/custom/ihrm/class/establishment.class.php
- *    \ingroup    iHRM
+ *    \file       htdocs/hrm/class/establishment.class.php
+ *    \ingroup    HRM
  *    \brief      File of class to manage establishments
  */
 
@@ -29,7 +29,7 @@ require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php';
 class Establishment extends CommonObject
 {
 	public $element='establishment';
-	public $table_element='ihrm_establishment';
+	public $table_element='establishment';
 	public $table_element_line = '';
 	public $fk_element = 'fk_establishment';
 	protected $ismultientitymanaged = 1;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
@@ -77,7 +77,7 @@ class Establishment extends CommonObject
 
 		$this->db->begin();
 
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."ihrm_establishment (";
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."establishment (";
 		$sql.= "name";
 		$sql.= ", address";
 		$sql.= ", zip";
@@ -107,7 +107,7 @@ class Establishment extends CommonObject
 		}
 
 		if (! $error) {
-			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . "ihrm_establishment");
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . "establishment");
 		}
 
 		// Commit or rollback
@@ -143,7 +143,7 @@ class Establishment extends CommonObject
 
 		$this->db->begin();
 
-		$sql = "UPDATE ".MAIN_DB_PREFIX."ihrm_establishment";
+		$sql = "UPDATE ".MAIN_DB_PREFIX."establishment";
 		$sql .= " SET name = '".$this->name."'";
 		$sql .= ", address = '".$this->address."'";
 		$sql .= ", zip = '".$this->zip."'";
@@ -173,7 +173,7 @@ class Establishment extends CommonObject
 	function fetch($id)
 	{
 		$sql = "SELECT rowid, name, address, zip, town, statut";
-		$sql.= " FROM ".MAIN_DB_PREFIX."ihrm_establishment";
+		$sql.= " FROM ".MAIN_DB_PREFIX."establishment";
 		$sql.= " WHERE rowid = ".$id;
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
@@ -208,7 +208,7 @@ class Establishment extends CommonObject
 	{
 		$this->db->begin();
 
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."ihrm_establishment WHERE rowid = ".$id;
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."establishment WHERE rowid = ".$id;
 
 		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 		$result = $this->db->query($sql);
@@ -286,7 +286,7 @@ class Establishment extends CommonObject
 	function info($id)
 	{
 		$sql = 'SELECT e.rowid, e.datec, e.fk_user_author, e.tms, e.fk_user_mod';
-		$sql.= ' FROM '.MAIN_DB_PREFIX.'ihrm_establishment as e';
+		$sql.= ' FROM '.MAIN_DB_PREFIX.'establishment as e';
 		$sql.= ' WHERE e.rowid = '.$id;
 
 		dol_syslog(get_class($this)."::fetch info", LOG_DEBUG);
diff --git a/htdocs/hrm/establishment/card.php b/htdocs/hrm/establishment/card.php
index dc3b29225c2..3df1e1cf3d6 100644
--- a/htdocs/hrm/establishment/card.php
+++ b/htdocs/hrm/establishment/card.php
@@ -16,22 +16,17 @@
  */
 
 /**
- *  \file       	htdocs/custom/ihrm/establishment/card.php
+ *  \file       	htdocs/hrm/establishment/card.php
  *  \brief      	Page to show an establishment
  */
-$res = @include ("../../main.inc.php"); // For root directory
-if (! $res)
-	$res = @include ("../../../main.inc.php"); // For "custom" directory
-if (! $res)
-	die("Include of main fails");
-
-require_once ('../core/lib/ihrm.lib.php');
-require_once ('../class/establishment.class.php');
+require('../../main.inc.php');
+require_once DOL_DOCUMENT_ROOT.'/core/lib/hrm.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/hrm/class/establishment.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 
 $langs->load("admin");
-$langs->load("compta");
+$langs->load("hrm");
 
 // Security check
 if (! $user->admin) accessforbidden();
@@ -267,7 +262,7 @@ else if ($id)
 
         if ($action == 'edit')
         {
-        	dol_fiche_head($head, 'card', $langs->trans("Establishment"), 0, 'building@ihrm');
+        	dol_fiche_head($head, 'card', $langs->trans("Establishment"), 0, 'building');
 
         	print '<form name="update" action="' . $_SERVER["PHP_SELF"] . '" method="POST">' . "\n";
             print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@@ -344,7 +339,7 @@ else if ($id)
 
             }
 
-        	dol_fiche_head($head, 'card', $langs->trans("Establishment"), 0, 'building@ihrm');
+        	dol_fiche_head($head, 'card', $langs->trans("Establishment"), 0, 'building');
 
         	print '<table class="border" width="100%">';
 
diff --git a/htdocs/hrm/establishment/info.php b/htdocs/hrm/establishment/info.php
index 06ba9875e58..2bf014481ac 100644
--- a/htdocs/hrm/establishment/info.php
+++ b/htdocs/hrm/establishment/info.php
@@ -16,18 +16,16 @@
  */
 
 /**
- *  \file       	htdocs/custom/ihrm/establishment/info.php
+ *  \file       	htdocs/hrm/establishment/info.php
  *  \brief      	Page to show info of an establishment
  */
 
-require '../../main.inc.php';
-
-require_once ('../core/lib/ihrm.lib.php');
-require_once ('../class/establishment.class.php');
-require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require('../../main.inc.php');
+require_once DOL_DOCUMENT_ROOT.'/core/lib/hrm.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/hrm/class/establishment.class.php';
 
 $langs->load("admin");
-$langs->load("compta");
+$langs->load("hrm");
 
 // Security check
 if (! $user->admin) accessforbidden();
@@ -45,7 +43,7 @@ if ($id)
 
 	$head = establishment_prepare_head($object);
 
-	dol_fiche_head($head, 'info', $langs->trans("Establishment"), 0, 'building@ihrm');
+	dol_fiche_head($head, 'info', $langs->trans("Establishment"), 0, 'building');
 
     print '<table width="100%"><tr><td>';
     dol_print_object_info($object);

From 8e37da55c36999ba2f2a5c5867bebf90aa0c3fa3 Mon Sep 17 00:00:00 2001
From: aspangaro <alexandre.spangaro@gmail.com>
Date: Sat, 10 Oct 2015 08:34:15 +0200
Subject: [PATCH 10/66] Add searchform, language key and correct code

---
 htdocs/admin/ihm.php                 | 10 ++++++----
 htdocs/core/modules/modHRM.class.php | 21 +++++++++++----------
 htdocs/langs/en_US/admin.lang        |  2 ++
 htdocs/main.inc.php                  |  6 ++++++
 4 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php
index 8d93dfc950c..1cff8cec1a7 100644
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -37,6 +37,7 @@ $langs->load("companies");
 $langs->load("products");
 $langs->load("members");
 $langs->load("projects");
+$langs->load("hrm");
 
 if (! $user->admin) accessforbidden();
 
@@ -46,10 +47,10 @@ $action = GETPOST('action');
 if (! defined("MAIN_MOTD")) define("MAIN_MOTD","");
 
 // List of supported permanent search area
-$searchform=array("MAIN_SEARCHFORM_SOCIETE", "MAIN_SEARCHFORM_CONTACT", "MAIN_SEARCHFORM_PRODUITSERVICE", "MAIN_SEARCHFORM_PRODUITSERVICE_SUPPLIER", "MAIN_SEARCHFORM_ADHERENT", "MAIN_SEARCHFORM_PROJECT");
-$searchformconst=array($conf->global->MAIN_SEARCHFORM_SOCIETE,$conf->global->MAIN_SEARCHFORM_CONTACT,$conf->global->MAIN_SEARCHFORM_PRODUITSERVICE,$conf->global->MAIN_SEARCHFORM_PRODUITSERVICE_SUPPLIER,$conf->global->MAIN_SEARCHFORM_ADHERENT,$conf->global->MAIN_SEARCHFORM_PROJECT);
-$searchformtitle=array($langs->trans("Companies"), $langs->trans("Contacts"), $langs->trans("ProductsAndServices"), $langs->trans("ProductsAndServices").' ('.$langs->trans("SupplierRef").')', $langs->trans("Members"), $langs->trans("Projects"));
-$searchformmodule=array('Module1Name','Module1Name','Module50Name','Module50Name','Module310Name','Module400Name');
+$searchform=array("MAIN_SEARCHFORM_SOCIETE", "MAIN_SEARCHFORM_CONTACT", "MAIN_SEARCHFORM_PRODUITSERVICE", "MAIN_SEARCHFORM_PRODUITSERVICE_SUPPLIER", "MAIN_SEARCHFORM_ADHERENT", "MAIN_SEARCHFORM_PROJECT", "MAIN_SEARCHFORM_EMPLOYEE");
+$searchformconst=array($conf->global->MAIN_SEARCHFORM_SOCIETE,$conf->global->MAIN_SEARCHFORM_CONTACT,$conf->global->MAIN_SEARCHFORM_PRODUITSERVICE,$conf->global->MAIN_SEARCHFORM_PRODUITSERVICE_SUPPLIER,$conf->global->MAIN_SEARCHFORM_ADHERENT,$conf->global->MAIN_SEARCHFORM_PROJECT,$conf->global->MAIN_SEARCHFORM_EMPLOYEE);
+$searchformtitle=array($langs->trans("Companies"), $langs->trans("Contacts"), $langs->trans("ProductsAndServices"), $langs->trans("ProductsAndServices").' ('.$langs->trans("SupplierRef").')', $langs->trans("Members"), $langs->trans("Projects"), $langs->trans("Employees"));
+$searchformmodule=array('Module1Name','Module1Name','Module50Name','Module50Name','Module310Name','Module4000Name');
 
 
 if ($action == 'update')
@@ -82,6 +83,7 @@ if ($action == 'update')
 	dolibarr_set_const($db, "MAIN_SEARCHFORM_PRODUITSERVICE_SUPPLIER",$_POST["MAIN_SEARCHFORM_PRODUITSERVICE_SUPPLIER"],'chaine',0,'',$conf->entity);
 	dolibarr_set_const($db, "MAIN_SEARCHFORM_ADHERENT",			$_POST["MAIN_SEARCHFORM_ADHERENT"],'chaine',0,'',$conf->entity);
 	dolibarr_set_const($db, "MAIN_SEARCHFORM_PROJECT",			$_POST["MAIN_SEARCHFORM_PROJECT"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_SEARCHFORM_EMPLOYEE",			$_POST["MAIN_SEARCHFORM_EMPLOYEE"],'chaine',0,'',$conf->entity);
 
 	dolibarr_set_const($db, "MAIN_HELPCENTER_DISABLELINK",		$_POST["MAIN_HELPCENTER_DISABLELINK"],'chaine',0,'',0);	// Param for all entities
 	dolibarr_set_const($db, "MAIN_MOTD",						dol_htmlcleanlastbr($_POST["main_motd"]),'chaine',0,'',$conf->entity);
diff --git a/htdocs/core/modules/modHRM.class.php b/htdocs/core/modules/modHRM.class.php
index c63fa04f65e..16a0edd0c04 100644
--- a/htdocs/core/modules/modHRM.class.php
+++ b/htdocs/core/modules/modHRM.class.php
@@ -56,21 +56,21 @@ class modHRM extends DolibarrModules
 		// $this->picto = '';
 		
 		// define triggers
-		$this->module_parts = array (
+		$this->module_parts = array();
 		
 		// Data directories to create when module is enabled
-		$this->dirs = array ();
+		$this->dirs = array();
 		
 		// Config pages
 		$this->config_page_url = array('admin_hrm.php@hrm');
 		
 		// Dependencies
 		$this->depends = array();
-		$this->requiredby = array("
+		$this->requiredby = array(/*"
 			modSalaries,
 			modExpenseReport,
 			modHoliday
-		");
+		"*/);
 		$this->conflictwith = array();
 		$this->phpmin = array (
 			5,
@@ -78,7 +78,7 @@ class modHRM extends DolibarrModules
 		); // Minimum version of PHP required by module
 		$this->need_dolibarr_version = array (
 			3,
-			8 
+			7 
 		); // Minimum version of Dolibarr required by module
 		$this->langfiles = array (
 			"hrm" 
@@ -239,12 +239,13 @@ class modHRM extends DolibarrModules
 	 * @param string $options Enabling module ('', 'noboxes')
 	 * @return int if OK, 0 if KO
 	 */
-	public function init($options = '')
+	function init($options='')
 	{
+		// Permissions
+		$this->remove($options);
+
 		$sql = array();
-		
-		$result = $this->loadTables();
-		
-		return $this->_init($sql, $options);
+
+		return $this->_init($sql,$options);
 	}
 }
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 0f267bd0520..f7d93819e0d 100755
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -539,6 +539,8 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind conversions capabilities
 Module3100Name=Skype
 Module3100Desc=Add a Skype button into card of adherents / third parties / contacts
+Module4000Name=HRM
+Module4000Desc=Human resources management
 Module5000Name=Multi-company
 Module5000Desc=Allows you to manage multiple companies
 Module6000Name=Workflow
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index fcef513130f..d278afd9687 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1584,6 +1584,12 @@ function left_menu($menu_array_before, $helppagename='', $moresearchform='', $me
 	        $searchform.=printSearchForm(DOL_URL_ROOT.'/projet/list.php', DOL_URL_ROOT.'/projet/list.php', $langs->trans("Projects"), 'project', 'search_all', 'M', 'searchleftproj', img_object('','projectpub'));
 	    }
 
+		if (! empty($conf->hrm->enabled) && ! empty($conf->global->MAIN_SEARCHFORM_EMPLOYEE) && $user->rights->hrm->employee->read)
+	    {
+	        $langs->load("hrm");
+	        $searchform.=printSearchForm(DOL_URL_ROOT.'/hrm/employee/list.php', DOL_URL_ROOT.'/hrm/employee/list.php', $langs->trans("Employees"), 'employee', 'search_all', 'M', 'searchleftemployee', img_object('','user'));
+	    }
+
 	    // Execute hook printSearchForm
 	    $parameters=array();
 	    $reshook=$hookmanager->executeHooks('printSearchForm',$parameters);    // Note that $action and $object may have been modified by some hooks

From 8b97196c2f0ae2dcc874f552c5cf2a998d0b24bb Mon Sep 17 00:00:00 2001
From: aspangaro <alexandre.spangaro@gmail.com>
Date: Sat, 10 Oct 2015 08:50:55 +0200
Subject: [PATCH 11/66] Correct term status & sql error

---
 htdocs/hrm/admin/admin_establishment.php          | 6 +++---
 htdocs/install/mysql/migration/3.9.0-4.0.0.sql    | 2 +-
 htdocs/install/mysql/tables/llx_establishment.sql | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/hrm/admin/admin_establishment.php b/htdocs/hrm/admin/admin_establishment.php
index 2fb6507d0ba..6a9cf961960 100644
--- a/htdocs/hrm/admin/admin_establishment.php
+++ b/htdocs/hrm/admin/admin_establishment.php
@@ -59,7 +59,7 @@ print load_fiche_titre($langs->trans($page_name), $linkback);
 $head = hrm_admin_prepare_head();
 dol_fiche_head($head, 'establishments', $langs->trans("HRM"), 0, "user");
 
-$sql = "SELECT e.rowid, e.name, e.address, e.zip, e.town, e.statut";
+$sql = "SELECT e.rowid, e.name, e.address, e.zip, e.town, e.status";
 $sql.= " FROM ".MAIN_DB_PREFIX."establishment as e";
 $sql.= " WHERE e.entity = ".$conf->entity;
 
@@ -79,7 +79,7 @@ if ($result)
 	print '<td>'.$langs->trans("Address").'</td>';
 	print '<td>'.$langs->trans("Zipcode").'</td>';
 	print '<td>'.$langs->trans("Town").'</td>';
-	print '<td align="right">'.$langs->trans("Statut").'</td>';
+	print '<td align="right">'.$langs->trans("Status").'</td>';
 	print '</tr>';
 
 	if ($num)
@@ -96,7 +96,7 @@ if ($result)
             print '<td align="left">'.$obj->address.'</td>';
 			print '<td align="left">'.$obj->zip.'</td>';
 			print '<td align="left">'.$obj->town.'</td>';
-            print '<td align="right">'.$establishmentstatic->LibStatut($obj->statut,5).'</td>';
+            print '<td align="right">'.$establishmentstatic->LibStatut($obj->status,5).'</td>';
             print '</tr>';
             $var=!$var;
             $i++;
diff --git a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
index aaa1f28d41b..231b89ee507 100644
--- a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
+++ b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
@@ -83,7 +83,7 @@ CREATE TABLE IF NOT EXISTS llx_establishment (
   fk_user_mod		integer NOT NULL,
   datec				datetime NOT NULL,
   tms				timestamp NOT NULL,
-  status            tinyint DEFAULT 1,
+  status            tinyint DEFAULT 1
 ) ENGINE=InnoDB;
 
 ALTER TABLE llx_user ADD COLUMN employee tinyint DEFAULT 0 AFTER ref_int;
diff --git a/htdocs/install/mysql/tables/llx_establishment.sql b/htdocs/install/mysql/tables/llx_establishment.sql
index 517464588a4..8ddc71e1fba 100644
--- a/htdocs/install/mysql/tables/llx_establishment.sql
+++ b/htdocs/install/mysql/tables/llx_establishment.sql
@@ -36,6 +36,6 @@ CREATE TABLE IF NOT EXISTS llx_establishment (
   fk_user_mod		integer NOT NULL,
   datec				datetime NOT NULL,
   tms				timestamp NOT NULL,
-  status            tinyint DEFAULT 1,
+  status            tinyint DEFAULT 1
 ) ENGINE=InnoDB;
 

From 2857d7cfdaedd0e0d77ff1211c13e314d283aa3e Mon Sep 17 00:00:00 2001
From: aspangaro <alexandre.spangaro@gmail.com>
Date: Sun, 11 Oct 2015 21:00:41 +0200
Subject: [PATCH 12/66] Correct

---
 htdocs/hrm/class/establishment.class.php | 40 ++++++++++++------------
 htdocs/hrm/establishment/card.php        | 26 +++++++--------
 2 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/htdocs/hrm/class/establishment.class.php b/htdocs/hrm/class/establishment.class.php
index dccb2d6d37e..c5ba77fd547 100644
--- a/htdocs/hrm/class/establishment.class.php
+++ b/htdocs/hrm/class/establishment.class.php
@@ -40,7 +40,7 @@ class Establishment extends CommonObject
 	var $address;
 	var $zip;
 	var $town;
-	var $statut;		// 0=open, 1=closed
+	var $status;		// 0=open, 1=closed
 	var $entity;
 
 	var $statuts=array();
@@ -82,7 +82,7 @@ class Establishment extends CommonObject
 		$sql.= ", address";
 		$sql.= ", zip";
 		$sql.= ", town";
-		$sql.= ", statut";
+		$sql.= ", status";
 		$sql.= ", entity";
 		$sql.= ", datec";
 		$sql.= ", fk_user_author";
@@ -91,7 +91,7 @@ class Establishment extends CommonObject
 		$sql.= ", '".$this->address."'";
 		$sql.= ", '".$this->zip."'";
 		$sql.= ", '".$this->town."'";
-		$sql.= ", ".$this->statut;
+		$sql.= ", ".$this->status;
 		$sql.= ", ".$conf->entity;
 		$sql.= ", '".$this->db->idate($now)."'";
 		$sql.= ", ". $user->id;
@@ -148,7 +148,7 @@ class Establishment extends CommonObject
 		$sql .= ", address = '".$this->address."'";
 		$sql .= ", zip = '".$this->zip."'";
 		$sql .= ", town = '".$this->town."'";
-		$sql .= ", statut = '".$this->statut."'";
+		$sql .= ", status = '".$this->status."'";
 		$sql .= ", fk_user_mod = " . $user->id;
 		$sql .= " WHERE rowid = ".$this->id;
 
@@ -172,7 +172,7 @@ class Establishment extends CommonObject
 	*/
 	function fetch($id)
 	{
-		$sql = "SELECT rowid, name, address, zip, town, statut";
+		$sql = "SELECT rowid, name, address, zip, town, status";
 		$sql.= " FROM ".MAIN_DB_PREFIX."establishment";
 		$sql.= " WHERE rowid = ".$id;
 
@@ -187,7 +187,7 @@ class Establishment extends CommonObject
 			$this->address		= $obj->address;
 			$this->zip			= $obj->zip;
 			$this->town			= $obj->town;
-			$this->statut	    = $obj->statut;
+			$this->status	    = $obj->status;
 
 			return 1;
 		}
@@ -231,49 +231,49 @@ class Establishment extends CommonObject
 	 * @param	int		$mode   	0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto
 	 * @return  string   		   	Label
 	 */
-	function getLibStatut($mode=0)
+	function getLibStatus($mode=0)
 	{
-		return $this->LibStatut($this->statut,$mode);
+		return $this->LibStatus($this->status,$mode);
 	}
 
 	/**
 	 *  Give a label from a status
 	 *
-	 *  @param	int		$statut     Id status
+	 *  @param	int		$status     Id status
 	 *  @param  int		$mode       0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto
 	 *  @return string      		Label
 	 */
-	function LibStatut($statut,$mode=0)
+	function LibStatus($status,$mode=0)
 	{
 		global $langs;
 
 		if ($mode == 0)
 		{
-			return $langs->trans($this->statuts[$statut]);
+			return $langs->trans($this->statuts[$status]);
 		}
 		if ($mode == 1)
 		{
-			return $langs->trans($this->statuts_short[$statut]);
+			return $langs->trans($this->statuts_short[$status]);
 		}
 		if ($mode == 2)
 		{
-			if ($statut==0) return img_picto($langs->trans($this->statuts_short[$statut]),'statut4').' '.$langs->trans($this->statuts_short[$statut]);
-			if ($statut==1) return img_picto($langs->trans($this->statuts_short[$statut]),'statut8').' '.$langs->trans($this->statuts_short[$statut]);
+			if ($status==0) return img_picto($langs->trans($this->statuts_short[$status]),'status4').' '.$langs->trans($this->statuts_short[$status]);
+			if ($status==1) return img_picto($langs->trans($this->statuts_short[$status]),'status8').' '.$langs->trans($this->statuts_short[$status]);
 		}
 		if ($mode == 3)
 		{
-			if ($statut==0 && ! empty($this->statuts_short[$statut])) return img_picto($langs->trans($this->statuts_short[$statut]),'statut4');
-			if ($statut==1 && ! empty($this->statuts_short[$statut])) return img_picto($langs->trans($this->statuts_short[$statut]),'statut8');
+			if ($status==0 && ! empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]),'status4');
+			if ($status==1 && ! empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]),'status8');
 		}
 		if ($mode == 4)
 		{
-			if ($statut==0 && ! empty($this->statuts_short[$statut])) return img_picto($langs->trans($this->statuts_short[$statut]),'statut4').' '.$langs->trans($this->statuts[$statut]);
-			if ($statut==1 && ! empty($this->statuts_short[$statut])) return img_picto($langs->trans($this->statuts_short[$statut]),'statut8').' '.$langs->trans($this->statuts[$statut]);
+			if ($status==0 && ! empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]),'status4').' '.$langs->trans($this->statuts[$status]);
+			if ($status==1 && ! empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]),'status8').' '.$langs->trans($this->statuts[$status]);
 		}
 		if ($mode == 5)
 		{
-			if ($statut==0 && ! empty($this->statuts_short[$statut])) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),'statut4');
-			if ($statut==1 && ! empty($this->statuts_short[$statut])) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),'statut8');
+			if ($status==0 && ! empty($this->statuts_short[$status])) return $langs->trans($this->statuts_short[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]),'status4');
+			if ($status==1 && ! empty($this->statuts_short[$status])) return $langs->trans($this->statuts_short[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]),'status8');
 		}
 	}
 
diff --git a/htdocs/hrm/establishment/card.php b/htdocs/hrm/establishment/card.php
index 3df1e1cf3d6..533ad5117ff 100644
--- a/htdocs/hrm/establishment/card.php
+++ b/htdocs/hrm/establishment/card.php
@@ -38,13 +38,13 @@ $cancel = GETPOST('cancel', 'alpha');
 $confirm = GETPOST('confirm','alpha');
 $id = GETPOST('id','int');
 
-// List of statut
-static $tmpstatut2label=array(
+// List of status
+static $tmpstatus2label=array(
 		'0'=>'OpenEtablishment',
 		'1'=>'CloseEtablishment'
 );
-$statut2label=array('');
-foreach ($tmpstatut2label as $key => $val) $statut2label[$key]=$langs->trans($val);
+$status2label=array('');
+foreach ($tmpstatus2label as $key => $val) $status2label[$key]=$langs->trans($val);
 
 $object = new Establishment($db);
 
@@ -93,7 +93,7 @@ else if ($action == 'add')
 			$object->zip 			= GETPOST('zipcode', 'alpha');
 			$object->town			= GETPOST('town', 'alpha');
 			$object->fk_pays		= $object->country_id;
-			$object->statut     	= GETPOST('statut','int');
+			$object->status     	= GETPOST('status','int');
 			$object->fk_user_author	= $user->id;
 			$object->datec			= dol_now();
 
@@ -234,11 +234,11 @@ if ($action == 'create')
 	print '</td>';
 	print '</tr>';
 
-	// Statut
+	// Status
     print '<tr>';
-    print '<td class="fieldrequired"><label for="statut">'.$langs->trans("Statut").'</label></td>';
+    print '<td class="fieldrequired"><label for="status">'.$langs->trans("Status").'</label></td>';
 	print '<td>';
-	print $form->selectarray('statut',$statut2label,GETPOST('statut'));
+	print $form->selectarray('status',$status2label,GETPOST('status'));
     print '</td></tr>';
 
     print '</table>';
@@ -311,9 +311,9 @@ else if ($id)
 			print '</td>';
 			print '</tr>';			
 
-			// Statut
-			print '<tr><td><label for="statut">'.$langs->trans("Statut").'</label></td><td>';
-			print $form->selectarray('statut',$statut2label,$object->statut);
+			// Status
+			print '<tr><td><label for="status">'.$langs->trans("Status").'</label></td><td>';
+			print $form->selectarray('status',$status2label,$object->status);
 			print '</td></tr>';
 
             print '</table>';
@@ -382,8 +382,8 @@ else if ($id)
 			print '<td colspan="2">'.getCountry($object->fk_pays,1).'</td>';
 			print '</tr>';
 
-            // Statut
-            print '<tr><td>'.$langs->trans("Status").'</td><td colspan="2">'.$object->getLibStatut(4).'</td></tr>';
+            // Status
+            print '<tr><td>'.$langs->trans("Status").'</td><td colspan="2">'.$object->getLibStatus(4).'</td></tr>';
 
             print "</table>";
 

From fd3ba131307c9cc54f69d8f7186b2786e73da9a6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 18 Oct 2015 21:33:47 +0200
Subject: [PATCH 13/66] FIX #3541 Bypass authentication when user was created
 using LDAP

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

diff --git a/htdocs/core/login/functions_dolibarr.php b/htdocs/core/login/functions_dolibarr.php
index 36596165191..c421fdb1aeb 100644
--- a/htdocs/core/login/functions_dolibarr.php
+++ b/htdocs/core/login/functions_dolibarr.php
@@ -91,7 +91,7 @@ function check_user_password_dolibarr($usertotest,$passwordtotest,$entitytotest=
 				if (! $passok)
 				{
 					if ((! $passcrypted || $passtyped)
-						&& ($passtyped == $passclear))
+						&& ($passclear && ($passtyped == $passclear)))
 					{
 						$passok=true;
 						dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentification ok - found pass in database");

From 6a90431cf1d4f0853041538203f461a05ff91d3b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 19 Oct 2015 14:04:47 +0200
Subject: [PATCH 14/66] Prepare 3.8.2

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

diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php
index ea369d8aff3..415a7addf4a 100644
--- a/htdocs/filefunc.inc.php
+++ b/htdocs/filefunc.inc.php
@@ -30,7 +30,7 @@
  *  \brief      File that include conf.php file and commons lib like functions.lib.php
  */
 
-if (! defined('DOL_VERSION')) define('DOL_VERSION','3.8.1');
+if (! defined('DOL_VERSION')) define('DOL_VERSION','3.8.2');
 
 if (! defined('EURO')) define('EURO',chr(128));
 

From 9e9f32e3bf848dc965de0a55c99c89ff6798d7bc Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Mon, 19 Oct 2015 15:38:28 +0200
Subject: [PATCH 15/66] FIX : project was not retrieved on invoice creation
 form

---
 htdocs/compta/facture.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index de0a591cf98..6368dd00831 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -1877,7 +1877,7 @@ if ($action == 'create')
 				$objectsrc->fetch_lines();
 			$objectsrc->fetch_thirdparty();
 
-			$projectid = (! empty($objectsrc->fk_project) ? $objectsrc->fk_project : '');
+			$projectid = (! empty($projectid) ? $projectid : $objectsrc->fk_project);
 			$ref_client = (! empty($objectsrc->ref_client) ? $objectsrc->ref_client : '');
 			$ref_int = (! empty($objectsrc->ref_int) ? $objectsrc->ref_int : '');
 
@@ -2257,9 +2257,6 @@ if ($action == 'create')
 	// Project
 	if (! empty($conf->projet->enabled) && $socid > 0)
 	{
-		$projectid = GETPOST('projectid')?GETPOST('projectid'):0;
-		if ($origin == 'project') $projectid = ($originid ? $originid : 0);
-
 		$langs->load('projects');
 		print '<tr><td>' . $langs->trans('Project') . '</td><td colspan="2">';
 		$numprojet = $formproject->select_projects($soc->id, $projectid, 'projectid', 0);

From 5fb6705b5c57e14523c71f655b3231d0ab394ece Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Mon, 19 Oct 2015 15:53:13 +0200
Subject: [PATCH 16/66] FIX : Search status not saved into list

---
 htdocs/compta/facture/list.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 2f87ff09e8b..2adab72dc1c 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -270,6 +270,7 @@ if ($resql)
     if ($search_user > 0)    $param.='&search_user=' .$search_user;
     if ($search_montant_ht != '')  $param.='&search_montant_ht='.$search_montant_ht;
     if ($search_montant_ttc != '') $param.='&search_montant_ttc='.$search_montant_ttc;
+	if ($search_status != '') $param.='&search_status='.$search_status;
     print_barre_liste($langs->trans('BillsCustomers').' '.($socid?' '.$soc->name:''),$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords,'title_accountancy.png');
 
     $i = 0;

From 572be23fc1e2716b64ae584d5ea288b4b9831e72 Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Mon, 19 Oct 2015 15:57:23 +0200
Subject: [PATCH 17/66] FIX : filters on supplier invoices list are not used,
 search_status instead

---
 htdocs/fourn/facture/list.php | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index dc8adddec39..a2b48c253df 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -81,7 +81,6 @@ $year = GETPOST("year","int");
 $day_lim	= GETPOST('day_lim','int');
 $month_lim	= GETPOST('month_lim','int');
 $year_lim	= GETPOST('year_lim','int');
-$filter = GETPOST("filtre");
 
 if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter"))		// Both test must be present to be compatible with all browsers
 {
@@ -91,9 +90,9 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter"))		// Both
 	$search_company="";
 	$search_amount_no_tax="";
 	$search_amount_all_tax="";
+	$search_status="";
 	$year="";
 	$month="";
-	$filter="";
 }
 
 /*
@@ -147,15 +146,6 @@ if ($socid)
 {
 	$sql .= " AND s.rowid = ".$socid;
 }
-if ($filter && $filter != -1)		// GETPOST('filtre') may be a string
-{
-	$filtrearr = explode(",", $filter);
-	foreach ($filtrearr as $fil)
-	{
-		$filt = explode(":", $fil);
-		$sql .= " AND " . $filt[0] . " = " . $filt[1];
-	}
-}
 
 if ($search_ref)
 {
@@ -214,7 +204,7 @@ if ($search_amount_all_tax != '')
 
 if ($search_status != '')
 {
-	$sql.= " AND fac.fk_statut = '".$db->escape($search_status)."'";
+	$sql.= " AND fac.fk_statut = ".$search_status;
 }
 
 $nbtotalofrecords = 0;
@@ -248,7 +238,7 @@ if ($resql)
 	if ($search_company)      	$param.='&search_company='.urlencode($search_company);
 	if ($search_amount_no_tax)	$param.='&search_amount_no_tax='.urlencode($search_amount_no_tax);
 	if ($search_amount_all_tax)	$param.='&search_amount_all_tax='.urlencode($search_amount_all_tax);
-	if ($filter && $filter != -1) $param.='&filtre='.urlencode($filter);
+	if ($search_status >= 0)  	$param.="&search_status=".$search_status;
 
 	print_barre_liste($langs->trans("BillsSuppliers").($socid?" $soc->name.":""),$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords);
 	print '<form method="GET" action="'.$_SERVER["PHP_SELF"].'">';
@@ -305,8 +295,8 @@ if ($resql)
 	print '</td><td class="liste_titre" align="right">';
 	print '<input class="flat" type="text" size="6" name="search_amount_all_tax" value="'.$search_amount_all_tax.'">';
 	print '</td><td class="liste_titre" align="right">';
-	$liststatus=array('fac.fk_statut:0'=>$langs->trans("Draft"),'fac.fk_statut:1,paye:0'=>$langs->trans("Unpaid"), 'paye:1'=>$langs->trans("Paid"));
-	print $form->selectarray('filtre', $liststatus, $filter, 1);
+	$liststatus=array('0'=>$langs->trans("Draft"),'1'=>$langs->trans("Unpaid"), '2'=>$langs->trans("Paid"));
+	print $form->selectarray('filtre', $liststatus, $search_status, 1);
 	print '</td><td class="liste_titre" align="right">';
 	print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
 	print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';

From d79fb7198762e09f0c07055f1086211878dc7f8b Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Mon, 19 Oct 2015 16:17:47 +0200
Subject: [PATCH 18/66] FIX : search_status not used in mergefusiontool

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

diff --git a/htdocs/compta/facture/mergepdftool.php b/htdocs/compta/facture/mergepdftool.php
index 5acca49d1b1..ea0eedfa36a 100644
--- a/htdocs/compta/facture/mergepdftool.php
+++ b/htdocs/compta/facture/mergepdftool.php
@@ -417,6 +417,7 @@ $search_societe = GETPOST("search_societe");
 $search_paymentmode = GETPOST("search_paymentmode");
 $search_montant_ht = GETPOST("search_montant_ht");
 $search_montant_ttc = GETPOST("search_montant_ttc");
+$search_status = GETPOST("search_status");
 $late = GETPOST("late");
 
 // Do we click on purge search criteria ?
@@ -428,6 +429,7 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both
     $search_paymentmode='';
     $search_montant_ht='';
     $search_montant_ttc='';
+    $search_status='';
 }
 
 $sortfield = GETPOST("sortfield",'alpha');
@@ -483,6 +485,7 @@ if ($search_paymentmode) $sql .= " AND f.fk_mode_reglement = ".$search_paymentmo
 if ($search_montant_ht)  $sql .= " AND f.total = '".$db->escape($search_montant_ht)."'";
 if ($search_montant_ttc) $sql .= " AND f.total_ttc = '".$db->escape($search_montant_ttc)."'";
 if (GETPOST('sf_ref'))   $sql .= " AND f.facnumber LIKE '%".$db->escape(GETPOST('sf_ref'))."%'";
+if ($search_status)      $sql .= " AND f.fk_statut = ".$search_status;
 if ($month > 0)
 {
 	if ($year > 0)
@@ -528,6 +531,7 @@ if ($resql)
 	if ($search_societe)     $param.='&amp;search_paymentmode='.urlencode($search_paymentmode);
 	if ($search_montant_ht)  $param.='&amp;search_montant_ht='.urlencode($search_montant_ht);
 	if ($search_montant_ttc) $param.='&amp;search_montant_ttc='.urlencode($search_montant_ttc);
+	if ($search_status)      $param.='&amp;search_status='.urlencode($search_status);
 	if ($late)               $param.='&amp;late='.urlencode($late);
 	if ($mode)               $param.='&amp;mode='.urlencode($mode);
 	$urlsource=$_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;

From 7d382f7997fec9d9fbdb5e199c8e5befb18dfa11 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 19 Oct 2015 18:16:28 +0200
Subject: [PATCH 19/66] FIX Revert option
 WORKFLOW_PROPAL_CAN_CLASSIFIED_BILLED_WITHOUT_INVOICES into option
 WORKFLOW_PROPAL_NEED_INVOICE_TO_BE_CLASSIFIED_BILLED for better compatibility
 with old versions

---
 htdocs/comm/propal.php           | 2 +-
 htdocs/langs/en_US/workflow.lang | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index bcfaa747cab..fd6794c3d44 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -2223,7 +2223,7 @@ if ($action == 'create')
 					}
 
 					$arrayofinvoiceforpropal = $object->getInvoiceArrayList();
-					if ((is_array($arrayofinvoiceforpropal) && count($arrayofinvoiceforpropal) > 0) || ! empty($conf->global->WORKFLOW_PROPAL_CAN_CLASSIFIED_BILLED_WITHOUT_INVOICES))
+					if ((is_array($arrayofinvoiceforpropal) && count($arrayofinvoiceforpropal) > 0) || empty($conf->global->WORKFLOW_PROPAL_NEED_INVOICE_TO_BE_CLASSIFIED_BILLED))
 					{
 						print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=classifybilled&amp;socid=' . $object->socid . '">' . $langs->trans("ClassifyBilled") . '</a></div>';
 					}
diff --git a/htdocs/langs/en_US/workflow.lang b/htdocs/langs/en_US/workflow.lang
index 7414fcb7e62..14be1a6ade6 100644
--- a/htdocs/langs/en_US/workflow.lang
+++ b/htdocs/langs/en_US/workflow.lang
@@ -3,9 +3,9 @@ WorkflowSetup=Workflow module setup
 WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
 ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
 descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a customer order after a commercial proposal is signed
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICEAutomatically create a customer invoice after a commercial proposal is signed
-descWORKFLOW_CONTRACT_AUTOCREATE_INVOICEAutomatically create a customer invoice after a contract is validated
-descWORKFLOW_ORDER_AUTOCREATE_INVOICEAutomatically create a customer invoice after a customer order is closed
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatically create a customer invoice after a commercial proposal is signed
+descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Automatically create a customer invoice after a contract is validated
+descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a customer order is closed
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer order is set to paid
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated 

From a953a66616347229b86ea3747bfbfdfaa2813dcd Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Mon, 19 Oct 2015 19:05:04 +0200
Subject: [PATCH 20/66] New : allow to define list size for object list on
 customer card

---
 htdocs/admin/ihm.php                           | 12 ++++++++++++
 htdocs/comm/card.php                           |  2 +-
 htdocs/install/mysql/data/llx_const.sql        |  1 +
 htdocs/install/mysql/migration/3.8.0-3.9.0.sql |  1 +
 4 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php
index 8d93dfc950c..fc1cdaf8971 100644
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -57,6 +57,7 @@ if ($action == 'update')
 	dolibarr_set_const($db, "MAIN_LANG_DEFAULT",				$_POST["main_lang_default"],'chaine',0,'',$conf->entity);
 	dolibarr_set_const($db, "MAIN_MULTILANGS",					$_POST["main_multilangs"],'chaine',0,'',$conf->entity);
 	dolibarr_set_const($db, "MAIN_SIZE_LISTE_LIMIT",			$_POST["main_size_liste_limit"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_SIZE_SHORTLISTE_LIMIT",		$_POST["main_size_shortliste_limit"],'chaine',0,'',$conf->entity);
 	dolibarr_set_const($db, "MAIN_DISABLE_JAVASCRIPT",			$_POST["main_disable_javascript"],'chaine',0,'',$conf->entity);
 	dolibarr_set_const($db, "MAIN_BUTTON_HIDE_UNAUTHORIZED",	$_POST["MAIN_BUTTON_HIDE_UNAUTHORIZED"],'chaine',0,'',$conf->entity);
 	dolibarr_set_const($db, "MAIN_START_WEEK",					$_POST["MAIN_START_WEEK"],'chaine',0,'',$conf->entity);
@@ -204,6 +205,12 @@ if ($action == 'edit')	// Edit
 	print '<td width="20">&nbsp;</td>';
 	print '</tr>';
 
+	// Max size of short lists on customer card
+    $var=!$var;
+    print '<tr '.$bc[$var].'><td>'.$langs->trans("DefaultMaxSizeShortListCustomerCard").'</td><td><input class="flat" name="main_size_shortliste_limit" size="4" value="' . $conf->global->MAIN_SIZE_SHORTLISTE_LIMIT . '"></td>';
+	print '<td width="20">&nbsp;</td>';
+	print '</tr>';
+	
     // Disable javascript and ajax
     $var=!$var;
     print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("DisableJavascript").'</td><td>';
@@ -385,6 +392,11 @@ else	// Show
     print '<tr '.$bc[$var].'><td>'.$langs->trans("DefaultMaxSizeList").'</td><td>' . $conf->global->MAIN_SIZE_LISTE_LIMIT . '</td>';
 	print '<td width="20">&nbsp;</td>';
 	print "</tr>";
+	
+	$var=!$var;
+    print '<tr '.$bc[$var].'><td>'.$langs->trans("DefaultMaxSizeShortListCustomerCard").'</td><td>' . $conf->global->MAIN_SIZE_SHORTLISTE_LIMIT . '</td>';
+	print '<td width="20">&nbsp;</td>';
+	print "</tr>";
 
     // Disable javascript/ajax
     $var=!$var;
diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index a44a79da1f0..edd64d97706 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -491,7 +491,7 @@ if ($id > 0)
 
 
 	// Nbre max d'elements des petites listes
-	$MAXLIST=4;
+	$MAXLIST=$conf->global->MAIN_SIZE_SHORTLISTE_LIMIT;
 	$tableaushown=1;
 
 	// Lien recap
diff --git a/htdocs/install/mysql/data/llx_const.sql b/htdocs/install/mysql/data/llx_const.sql
index 2c25765223e..95dfb2683f9 100644
--- a/htdocs/install/mysql/data/llx_const.sql
+++ b/htdocs/install/mysql/data/llx_const.sql
@@ -53,6 +53,7 @@ insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_M
 -- IHM
 --
 insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_SIZE_LISTE_LIMIT','25','chaine','Longueur maximum des listes',0,0);
+insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_SIZE_SHORTLISTE_LIMIT','4','chaine','Longueur maximum des listes courtes (fiche client)',0,0);
 insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_SHOW_WORKBOARD','1','yesno','Affichage tableau de bord de travail Dolibarr',0,0);
 
 insert into llx_const (name, value, type, note, visible) values ('MAIN_MENU_STANDARD','eldy_menu.php','chaine','Menu manager for internal users',0);
diff --git a/htdocs/install/mysql/migration/3.8.0-3.9.0.sql b/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
index 4942378e58c..34d75a695d9 100755
--- a/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
+++ b/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
@@ -20,6 +20,7 @@
 
 
 INSERT INTO llx_const (name, value, type, note, visible) values (__ENCRYPT('MAIN_DELAY_EXPENSEREPORTS_TO_PAY')__,__ENCRYPT('31')__,'chaine','Tolérance de retard avant alerte (en jours) sur les notes de frais impayées',0);
+INSERT INTO llx_const (name, value, type, note, visible) values ('MAIN_SIZE_SHORTLISTE_LIMIT','4','chaine','Longueur maximum des listes courtes (fiche client)',0);
 
 ALTER TABLE llx_accounting_system MODIFY COLUMN pcg_version varchar(32);
 ALTER TABLE llx_accountingaccount MODIFY COLUMN fk_pcg_version varchar(32);

From 55657690bf398b0fa60582f12c77ccc3b82adac7 Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Mon, 19 Oct 2015 19:07:02 +0200
Subject: [PATCH 21/66] Remove unused var

---
 htdocs/comm/card.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index edd64d97706..5b9ada6c075 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -492,7 +492,6 @@ if ($id > 0)
 
 	// Nbre max d'elements des petites listes
 	$MAXLIST=$conf->global->MAIN_SIZE_SHORTLISTE_LIMIT;
-	$tableaushown=1;
 
 	// Lien recap
 	print '<table class="noborder" width="100%">';
@@ -684,7 +683,6 @@ if ($id > 0)
             if ($num > 0) {
                 print '<table class="noborder" width="100%">';
 
-                $tableaushown=1;
                 print '<tr class="liste_titre">';
                 print '<td colspan="4"><table width="100%" class="nobordernopadding"><tr><td>'.$langs->trans("LastSendings",($num<=$MAXLIST?"":$MAXLIST)).'</td><td align="right"><a href="'.DOL_URL_ROOT.'/expedition/list.php?socid='.$object->id.'">'.$langs->trans("AllSendings").' <span class="badge">'.$num.'</span></a></td>';
                 print '<td width="20px" align="right"><a href="'.DOL_URL_ROOT.'/expedition/stats/index.php?socid='.$object->id.'">'.img_picto($langs->trans("Statistics"),'stats').'</a></td>';
@@ -868,7 +866,6 @@ if ($id > 0)
 			{
 		        print '<table class="noborder" width="100%">';
 
-			    $tableaushown=1;
 				print '<tr class="liste_titre">';
 				print '<td colspan="4"><table width="100%" class="nobordernopadding"><tr><td>'.$langs->trans("LastCustomersBills",($num<=$MAXLIST?"":$MAXLIST)).'</td><td align="right"><a href="'.DOL_URL_ROOT.'/compta/facture/list.php?socid='.$object->id.'">'.$langs->trans("AllBills").' <span class="badge">'.$num.'</span></a></td>';
                 print '<td width="20px" align="right"><a href="'.DOL_URL_ROOT.'/compta/facture/stats/index.php?socid='.$object->id.'">'.img_picto($langs->trans("Statistics"),'stats').'</a></td>';

From 4de787411877e22295549bd45c7ab5733010ee6d Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Mon, 19 Oct 2015 20:36:25 +0200
Subject: [PATCH 22/66] New : review customer account summary and balance

---
 htdocs/comm/card.php           |  26 ++---
 htdocs/compta/recap-compta.php | 173 ++++++++++++++++++---------------
 2 files changed, 107 insertions(+), 92 deletions(-)

diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index 5b9ada6c075..3e20d611785 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -376,17 +376,6 @@ if ($id > 0)
 		$limit_field_type = (! empty($conf->global->MAIN_USE_JQUERY_JEDITABLE)) ? 'numeric' : 'amount';
 		print $form->editfieldval("OutstandingBill",'outstanding_limit',$object->outstanding_limit,$object,$user->rights->societe->creer,$limit_field_type,($object->outstanding_limit != '' ? price($object->outstanding_limit) : ''));
 		if (empty($object->outstanding_limit)) print $langs->trans("NoLimit");
-		// display amount and link to unpaid bill
-		$outstandingBills = $object->get_OutstandingBill();
-		print ' (' . $langs->trans('CurrentOutstandingBill') . ': ';
-		print price($outstandingBills, '', $langs, 0, 0, - 1, $conf->currency);
-		if ($object->outstanding_limit != '') 
-		{
-			if ($outstandingBills > $object->outstanding_limit)
-				print img_warning($langs->trans("OutstandingBillReached"));
-			//print ' / ' . price($soc->outstanding_limit);
-		}
-		print ')';
 		
 		print '</td>';
 		print '</tr>';
@@ -494,10 +483,21 @@ if ($id > 0)
 	$MAXLIST=$conf->global->MAIN_SIZE_SHORTLISTE_LIMIT;
 
 	// Lien recap
+	$outstandingBills = $object->get_OutstandingBill();
+	$warn = '';
+	if ($object->outstanding_limit != '' && $object->outstanding_limit < $outstandingBills) 
+	{
+		$warn = img_warning($langs->trans("OutstandingBillReached"));
+	}
+	
 	print '<table class="noborder" width="100%">';
 	print '<tr class="liste_titre">';
-	print '<td colspan="4"><table width="100%" class="nobordernopadding"><tr><td>'.$langs->trans("Summary").'</td>';
-	print '<td align="right"><a href="'.DOL_URL_ROOT.'/compta/recap-compta.php?socid='.$object->id.'">'.$langs->trans("ShowCustomerPreview").'</a></td></tr></table></td>';
+	print '<td>'.$langs->trans("Summary").'</td>';
+	print '<td align="right"><a href="'.DOL_URL_ROOT.'/compta/recap-compta.php?socid='.$object->id.'">'.$langs->trans("ShowCustomerPreview").'</a></td>';
+	print '</tr>';
+	print '<tr class="impair">';
+	print '<td>'.$langs->trans("CurrentOutstandingBill").'</td>';
+	print '<td align="right">'.price($outstandingBills).$warn.'</td>';
 	print '</tr>';
 	print '</table>';
 	print '<br>';
diff --git a/htdocs/compta/recap-compta.php b/htdocs/compta/recap-compta.php
index cfcd0a6f746..920419a8769 100644
--- a/htdocs/compta/recap-compta.php
+++ b/htdocs/compta/recap-compta.php
@@ -25,6 +25,7 @@
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
 
 $langs->load("companies");
 if (! empty($conf->facture->enabled)) $langs->load("bills");
@@ -43,6 +44,7 @@ if ($user->societe_id > 0)
  *	View
  */
 
+$form = new Form($db);
 $userstatic=new User($db);
 
 llxHeader();
@@ -58,28 +60,7 @@ if ($socid > 0)
 	$head = societe_prepare_head($societe);
 
 	dol_fiche_head($head, 'customer', $langs->trans("ThirdParty"), 0, 'company');
-
-	print "<table width=\"100%\">\n";
-	print '<tr><td valign="top" width="50%">';
-
-	print '<table class="border" width="100%">';
-
-	// Name
-	print '<tr><td width="20%">'.$langs->trans("Name").'</td><td width="80%" colspan="3">'.$societe->name.'</td></tr>';
-
-	// Prefix
-	if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
-	{
-		print '<tr><td>'.$langs->trans("Prefix").'</td><td colspan="3">';
-		print ($societe->prefix_comm?$societe->prefix_comm:'&nbsp;');
-		print '</td></tr>';
-	}
-
-	print "</table>";
-
-	print "</td></tr></table>\n";
-
-	print '</div>';
+	dol_banner_tab($societe, 'socid', '', ($user->societe_id?0:1), 'rowid', 'nom');
 
 	if (! empty($conf->facture->enabled) && $user->rights->facture->lire)
 	{
@@ -87,6 +68,18 @@ if ($socid > 0)
 		print load_fiche_titre($langs->trans("CustomerPreview"));
 
 		print '<table class="noborder" width="100%">';
+		print '<tr class="liste_titre">';
+		print '<td width="100" align="center">'.$langs->trans("Date").'</td>';
+		print '<td>'.$langs->trans("Element").'</td>';
+		print '<td>'.$langs->trans("Status").'</td>';
+		print '<td align="right">'.$langs->trans("Debit").'</td>';
+		print '<td align="right">'.$langs->trans("Credit").'</td>';
+		print '<td align="right">'.$langs->trans("Balance").'</td>';
+		print '<td align="right">'.$langs->trans("Author").'</td>';
+		print '</tr>';
+		
+		$TData = array();
+		$TDataSort = array();
 
 		$sql = "SELECT s.nom, s.rowid as socid, f.facnumber, f.amount, f.datef as df,";
 		$sql.= " f.paye as paye, f.fk_statut as statut, f.rowid as facid,";
@@ -95,7 +88,7 @@ if ($socid > 0)
 		$sql.= " WHERE f.fk_soc = s.rowid AND s.rowid = ".$societe->id;
 		$sql.= " AND f.entity = ".$conf->entity;
 		$sql.= " AND f.fk_user_valid = u.rowid";
-		$sql.= " ORDER BY f.datef DESC";
+		$sql.= " ORDER BY f.datef ASC";
 
 		$resql=$db->query($sql);
 		if ($resql)
@@ -103,23 +96,6 @@ if ($socid > 0)
 			$var=true;
 			$num = $db->num_rows($resql);
 
-			print '<tr class="liste_titre">';
-			print '<td width="100" align="center">'.$langs->trans("Date").'</td>';
-			print '<td>&nbsp;</td>';
-			print '<td>'.$langs->trans("Status").'</td>';
-			print '<td align="right">'.$langs->trans("Debit").'</td>';
-			print '<td align="right">'.$langs->trans("Credit").'</td>';
-			print '<td align="right">'.$langs->trans("Balance").'</td>';
-			print '<td>&nbsp;</td>';
-			print '</tr>';
-
-			if (! $num > 0)
-			{
-				print '<tr '.$bc[false].'><td colspan="7">'.$langs->trans("NoInvoice").'</td></tr>';
-			}
-
-			$solde = 0;
-
 			// Boucle sur chaque facture
 			for ($i = 0 ; $i < $num ; $i++)
 			{
@@ -133,29 +109,18 @@ if ($socid > 0)
 					continue;
 				}
 				$totalpaye = $fac->getSommePaiement();
-
-				$var=!$var;
-				print "<tr ".$bc[$var].">";
-
-				print "<td align=\"center\">".dol_print_date($fac->date,'day')."</td>\n";
-				print '<td><a href="'.DOL_URL_ROOT.'/compta/facture.php?facid='.$fac->id.'">'.img_object($langs->trans("ShowBill"),"bill")." ".$fac->ref."</a></td>\n";
-
-				print '<td aling="left">'.$fac->getLibStatut(2,$totalpaye).'</td>';
-				print '<td align="right">'.price($fac->total_ttc)."</td>\n";
-				if (($fac->statut == Facture::STATUS_ABANDONED ) || ($fac->statut == Facture::STATUS_CLOSED && ! $fact->close_code) )  $solde = $solde = $solde + $totalpaye;
-				else $solde = $solde + $fac->total_ttc;
-
-				print '<td align="right">&nbsp;</td>';
-				print '<td align="right">'.price($solde)."</td>\n";
-
-				// Author
+				
 				$userstatic->id=$objf->userid;
 				$userstatic->login=$objf->login;
-				print '<td class="nowrap" align="right">';
-				print $userstatic->getLoginUrl(1);
-				print '</td>';
-
-				print "</tr>\n";
+				
+				$TData[] = array(
+					'date' => $fac->date,
+					'link' => $fac->getNomUrl(1),
+					'status' => $fac->getLibStatut(2,$totalpaye),
+					'amount' => $fac->total_ttc,
+					'author' => $userstatic->getLoginUrl(1)
+				);
+				$TDataSort[] = $fac->date;
 
 				// Paiements
 				$sql = "SELECT p.rowid, p.datep as dp, pf.amount, p.statut,";
@@ -166,6 +131,7 @@ if ($socid > 0)
 				$sql.= " WHERE pf.fk_paiement = p.rowid";
 				$sql.= " AND p.entity = ".$conf->entity;
 				$sql.= " AND pf.fk_facture = ".$fac->id;
+				$sql.= " ORDER BY p.datep ASC";
 
 				$resqlp = $db->query($sql);
 				if ($resqlp)
@@ -176,26 +142,21 @@ if ($socid > 0)
 					while ($j < $nump)
 					{
 						$objp = $db->fetch_object($resqlp);
-						//$var=!$var;
-						print "<tr ".$bc[$var].">";
-						print '<td align="center">'.dol_print_date($db->jdate($objp->dp),'day')."</td>\n";
-						print '<td>';
-						print '&nbsp; &nbsp; &nbsp; '; // Decalage
-						print '<a href="paiement/card.php?id='.$objp->rowid.'">'.img_object($langs->trans("ShowPayment"),"payment").' '.$langs->trans("Payment").' '.$objp->rowid.'</td>';
-						print "<td>&nbsp;</td>\n";
-						print "<td>&nbsp;</td>\n";
-						print '<td align="right">'.price($objp->amount).'</td>';
-						$solde = $solde - $objp->amount;
-						print '<td align="right">'.price($solde)."</td>\n";
-
-						// Author
+						
+						$paymentstatic = new Paiement($db);
+						$paymentstatic->id = $objp->rowid;
+						
 						$userstatic->id=$objp->userid;
 						$userstatic->login=$objp->login;
-						print '<td class="nowrap" align="right">';
-						print $userstatic->getLoginUrl(1);
-						print '</td>';
-
-						print '</tr>';
+						
+						$TData[] = array(
+							'date' => $db->jdate($objp->dp),
+							'link' => $langs->trans("Payment") .' '. $paymentstatic->getNomUrl(1),
+							'status' => '',
+							'amount' => -$objp->amount,
+							'author' => $userstatic->getLoginUrl(1)
+						);
+						$TDataSort[] = $db->jdate($objp->dp);
 
 						$j++;
 					}
@@ -212,9 +173,63 @@ if ($socid > 0)
 		{
 			dol_print_error($db);
 		}
+		
+		if(empty($TData)) {
+			print '<tr '.$bc[false].'><td colspan="7">'.$langs->trans("NoInvoice").'</td></tr>';
+		} else {
+		
+			// Sort array by date
+			asort($TDataSort);
+			array_multisort($TData,$TDataSort);
+			
+			// Balance calculation
+			foreach($TData as &$data1) {
+				$balance += $data1['amount'];
+				$data1['balance'] += $balance;
+			}
+			
+			// Reverse array to have last elements on top
+			$TData = array_reverse($TData);
+			
+			$totalDebit = 0;
+			$totalCredit = 0;
+			
+			// Display array
+			foreach($TData as $data) {
+				$var=!$var;
+				print "<tr ".$bc[$var].">";
+	
+				print "<td align=\"center\">".dol_print_date($data['date'],'day')."</td>\n";
+				print '<td>'.$data['link']."</td>\n";
+	
+				print '<td aling="left">'.$data['status'].'</td>';
+				print '<td align="right">'.(($data['amount'] > 0) ? price(abs($data['amount'])) : '')."</td>\n";
+				$totalDebit += ($data['amount'] > 0) ? abs($data['amount']) : 0;
+				print '<td align="right">'.(($data['amount'] > 0) ? '' : price(abs($data['amount'])))."</td>\n";
+				$totalCredit += ($data['amount'] > 0) ? 0 : abs($data['amount']);
+				print '<td align="right">'.price($data['balance'])."</td>\n";
+	
+				// Author
+				print '<td class="nowrap" align="right">';
+				print $data['author'];
+				print '</td>';
+	
+				print "</tr>\n";
+			}
+			
+			print '<tr class="liste_total">';
+			print '<td colspan="3">&nbsp;</td>';
+			print '<td align="right">'.price($totalDebit).'</td>';
+			print '<td align="right">'.price($totalCredit).'</td>';
+			print '<td colspan="2">&nbsp;</td>';
+			print "</tr>\n";
+		}
+		
 		print "</table>";
 		print "<br>";
 	}
+
+	print '</div>';
 }
 else
 {

From 5237a2afc7bf155cbdc8a73bcaeefb90264084ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Tue, 20 Oct 2015 17:45:24 +0200
Subject: [PATCH 23/66] Fix lost searchstatus on next page list

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

diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 2f87ff09e8b..87b27ef8199 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -69,7 +69,7 @@ $search_refcustomer=GETPOST('search_refcustomer','alpha');
 $search_societe=GETPOST('search_societe','alpha');
 $search_montant_ht=GETPOST('search_montant_ht','alpha');
 $search_montant_ttc=GETPOST('search_montant_ttc','alpha');
-$search_status=GETPOST('search_status','alpha');
+$search_status=GETPOST('search_status','int');
 
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
@@ -270,6 +270,7 @@ if ($resql)
     if ($search_user > 0)    $param.='&search_user=' .$search_user;
     if ($search_montant_ht != '')  $param.='&search_montant_ht='.$search_montant_ht;
     if ($search_montant_ttc != '') $param.='&search_montant_ttc='.$search_montant_ttc;
+    if ($search_status > 0) $param.='&search_status='.$search_status;
     print_barre_liste($langs->trans('BillsCustomers').' '.($socid?' '.$soc->name:''),$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords,'title_accountancy.png');
 
     $i = 0;

From 4689b0cc11846010f43b29aeb64db4d298994c39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Wed, 21 Oct 2015 17:31:51 +0200
Subject: [PATCH 24/66] Update fournisseur.commande.class.php

---
 htdocs/fourn/class/fournisseur.commande.class.php | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 492663295b8..51602cafe1c 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -1571,6 +1571,7 @@ class CommandeFournisseur extends CommonOrder
         $result=$this->call_trigger('ORDER_SUPPLIER_DELETE',$user);
         if ($result < 0)
         {
+        	$this->errors[]='ErrorWhenRunningTrigger';
         	dol_syslog(get_class($this)."::delete ".$this->error, LOG_ERR);
         	return -1;
         }
@@ -1583,6 +1584,8 @@ class CommandeFournisseur extends CommonOrder
         dol_syslog(get_class($this)."::delete", LOG_DEBUG);
         if (! $this->db->query($sql) )
         {
+            $this->error=$this->db->lasterror();
+            $this->errors[]=$this->db->lasterror();
             $error++;
         }
 
@@ -1593,12 +1596,14 @@ class CommandeFournisseur extends CommonOrder
             if ($this->db->affected_rows($resql) < 1)
             {
                 $this->error=$this->db->lasterror();
+                $this->errors[]=$this->db->lasterror();
                 $error++;
             }
         }
         else
         {
             $this->error=$this->db->lasterror();
+            $this->errors[]=$this->db->lasterror();
             $error++;
         }
 
@@ -1608,6 +1613,8 @@ class CommandeFournisseur extends CommonOrder
         	$result=$this->deleteExtraFields();
         	if ($result < 0)
         	{
+        		$this->error='FailToDeleteExtraFields';
+        		$this->errors[]='FailToDeleteExtraFields';
         		$error++;
         		dol_syslog(get_class($this)."::delete error -4 ".$this->error, LOG_ERR);
         	}
@@ -1615,7 +1622,11 @@ class CommandeFournisseur extends CommonOrder
 
 		// Delete linked object
     	$res = $this->deleteObjectLinked();
-    	if ($res < 0) $error++;
+    	if ($res < 0) {
+    		$this->error='FailToDeleteObjectLinked';
+    		$this->errors[]='FailToDeleteObjectLinked';
+    		$error++;
+    	}
 
         if (! $error)
         {
@@ -1630,6 +1641,7 @@ class CommandeFournisseur extends CommonOrder
         			if (! dol_delete_file($file,0,0,0,$this)) // For triggers
         			{
         				$this->error='ErrorFailToDeleteFile';
+        				$this->errors[]='ErrorFailToDeleteFile';
         				$error++;
         			}
         		}
@@ -1639,6 +1651,7 @@ class CommandeFournisseur extends CommonOrder
         			if (! $res)
         			{
         				$this->error='ErrorFailToDeleteDir';
+        				$this->errors[]='ErrorFailToDeleteDir';
         				$error++;
         			}
         		}

From 56ef1c7338306ae3e1c6262312be9c86e6dbe1d5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 22 Oct 2015 17:05:28 +0200
Subject: [PATCH 25/66] Fix missing )

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

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 3a573b23f4d..3df62aadcb5 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -515,7 +515,7 @@ if (! defined('NOLOGIN'))
             exit;
         }
 
-        $resultFetchUser=$user->fetch('', $login, '', 0, ($entitytotest ? $entitytotest : -1);
+        $resultFetchUser=$user->fetch('', $login, '', 0, ($entitytotest ? $entitytotest : -1));
         if ($resultFetchUser <= 0)
         {
             dol_syslog('User not found, connexion refused');

From 9f21ea58a374571e31f226f10430d609172960b4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 22 Oct 2015 17:51:05 +0200
Subject: [PATCH 26/66] A lot hooks used into PDF generation were not correctly
 implemented. We had to fix this. The result si that the following hook were
 set as hook of type "replace". This means if your module implement such
 hooks, it must return 0 to execute standard code or 1 to replace standard
 code (value to output should be set into resPrints instead).

---
 ChangeLog                               |   8 +
 htdocs/core/class/hookmanager.class.php |  15 +
 htdocs/core/lib/pdf.lib.php             | 384 +++++++++++++-----------
 3 files changed, 226 insertions(+), 181 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 57d217f8a38..4cf2322adbb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,14 @@ Following changes may create regression for some external modules, but were nece
 Dolibarr better:
 - Deprecated hidden option MAIN_USE_CUSTOM_TRANSLATION has been removed. Use table llx_overwrite_trans instead.
 - Trigger LINECONTRACT_INSERT has been renamed into LINECONTRACT_CREATE to match common denomination.
+- A lot hooks used into PDF generation were not correctly implemented. We had to fix this. The result si that
+the following hook were set as hook of type "replace". This means if your module implement such hooks, it must 
+return 0 to execute standard code or 1 to replace standard code (value to output should be set into resPrints instead).
+This is list of hooks modified:
+'pdf_getlinenum', 'pdf_getlineref', 'pdf_getlineref_supplier', 'pdf_getlinevatrate', 'pdf_getlineupexcltax',
+'pdf_getlineupwithtax', 'pdf_getlineqty', 'pdf_getlineqty_asked', 'pdf_getlineqty_shipped', 'pdf_getlineqty_keeptoship',
+'pdf_getlineunit', 'pdf_getlineremisepercent', 'pdf_getlineprogress', 'pdf_getlinetotalexcltax', 'pdf_getlinetotalwithtax'
+
 
  
 ***** ChangeLog for 3.8.1 compared to 3.8.0 *****
diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php
index a497b3cb7e2..249a6665a3f 100644
--- a/htdocs/core/class/hookmanager.class.php
+++ b/htdocs/core/class/hookmanager.class.php
@@ -144,6 +144,21 @@ class HookManager
 				'formBuilddocLineOptions',
 				'moveUploadedFile',
 				'pdf_writelinedesc',
+			    'pdf_getlinenum',
+			    'pdf_getlineref',
+			    'pdf_getlineref_supplier',
+			    'pdf_getlinevatrate',
+			    'pdf_getlineupexcltax',
+			    'pdf_getlineupwithtax',
+			    'pdf_getlineqty',
+			    'pdf_getlineqty_asked',
+			    'pdf_getlineqty_shipped',
+			    'pdf_getlineqty_keeptoship',
+			    'pdf_getlineunit',
+			    'pdf_getlineremisepercent',
+			    'pdf_getlineprogress',
+			    'pdf_getlinetotalexcltax',
+			    'pdf_getlinetotalwithtax',
 				'paymentsupplierinvoices',
 				'printAddress',
 				'printSearchForm',
diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index fc3c61fabdd..0d7f18e1c75 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -1032,20 +1032,23 @@ function pdf_writeLinkedObjects(&$pdf,$object,$outputlangs,$posx,$posy,$w,$h,$al
  *  @param  int				$hideref       		Hide reference
  *  @param  int				$hidedesc           Hide description
  * 	@param	int				$issupplierline		Is it a line for a supplier object ?
- * 	@return	string|null
+ * 	@return	string
  */
 function pdf_writelinedesc(&$pdf,$object,$i,$outputlangs,$w,$h,$posx,$posy,$hideref=0,$hidedesc=0,$issupplierline=0)
 {
 	global $db, $conf, $langs, $hookmanager;
 
 	$reshook=0;
-	if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
+	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
+	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 	{
 		$special_code = $object->lines[$i]->special_code;
 		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
 		$parameters = array('pdf'=>$pdf,'i'=>$i,'outputlangs'=>$outputlangs,'w'=>$w,'h'=>$h,'posx'=>$posx,'posy'=>$posy,'hideref'=>$hideref,'hidedesc'=>$hidedesc,'issupplierline'=>$issupplierline,'special_code'=>$special_code);
 		$action='';
 		$reshook=$hookmanager->executeHooks('pdf_writelinedesc',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+	
+		if (!empty($hookmanager->resPrint)) return $hookmanager->resPrint;
 	}
 	if (empty($reshook))
 	{
@@ -1054,6 +1057,7 @@ function pdf_writelinedesc(&$pdf,$object,$i,$outputlangs,$w,$h,$posx,$posy,$hide
 		$pdf->writeHTMLCell($w, $h, $posx, $posy, $outputlangs->convToOutputCharset($labelproductservice), 0, 1, false, true, 'J',true);
 		return $labelproductservice;
 	}
+	return '';
 }
 
 /**
@@ -1250,22 +1254,25 @@ function pdf_getlinedesc($object,$i,$outputlangs,$hideref=0,$hidedesc=0,$issuppl
  *	@param	int			$i					Current line number
  *  @param  Translate	$outputlangs		Object langs for output
  *  @param	int			$hidedetails		Hide details (0=no, 1=yes, 2=just special lines)
- * 	@return	null|string
+ * 	@return	string
  */
 function pdf_getlinenum($object,$i,$outputlangs,$hidedetails=0)
 {
 	global $hookmanager;
 
-	if (is_object($hookmanager) && (($object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line)))
+	$reshook=0;
+	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
+	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 	{
 		$special_code = $object->lines[$i]->special_code;
 		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
 		// TODO add hook function
 	}
-	else
+	if (empty($reshook))
 	{
 		return dol_htmlentitiesbr($object->lines[$i]->num);
 	}
+	return '';
 }
 
 
@@ -1276,22 +1283,25 @@ function pdf_getlinenum($object,$i,$outputlangs,$hidedetails=0)
  *	@param	int			$i					Current line number
  *  @param  Translate	$outputlangs		Object langs for output
  *  @param	int			$hidedetails		Hide details (0=no, 1=yes, 2=just special lines)
- * 	@return	null|string
+ * 	@return	string
  */
 function pdf_getlineref($object,$i,$outputlangs,$hidedetails=0)
 {
 	global $hookmanager;
 
-	if (is_object($hookmanager) && (($object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line)))
+	$reshook=0;
+	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
+	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 	{
 		$special_code = $object->lines[$i]->special_code;
 		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
 		// TODO add hook function
 	}
-	else
+	if (empty($reshook))
 	{
 		return dol_htmlentitiesbr($object->lines[$i]->product_ref);
 	}
+	return '';
 }
 
 /**
@@ -1301,22 +1311,25 @@ function pdf_getlineref($object,$i,$outputlangs,$hidedetails=0)
  *	@param	int			$i					Current line number
  *  @param  Translate	$outputlangs		Object langs for output
  *  @param	int			$hidedetails		Hide details (0=no, 1=yes, 2=just special lines)
- * 	@return	null|string
+ * 	@return	string
  */
 function pdf_getlineref_supplier($object,$i,$outputlangs,$hidedetails=0)
 {
 	global $hookmanager;
 
-	if (is_object($hookmanager) && ( ($object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code) ) || ! empty($object->lines[$i]->fk_parent_line) ) )
+	$reshook=0;
+	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
+	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 	{
 		$special_code = $object->lines[$i]->special_code;
 		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
 		// TODO add hook function
 	}
-	else
+	if (empty($reshook))
 	{
 		return dol_htmlentitiesbr($object->lines[$i]->ref_supplier);
 	}
+	return '';
 }
 
 /**
@@ -1332,7 +1345,9 @@ function pdf_getlinevatrate($object,$i,$outputlangs,$hidedetails=0)
 {
 	global $hookmanager;
 
-	if (is_object($hookmanager) && (($object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line)))
+	$reshook=0;
+	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
+	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 	{
 		$special_code = $object->lines[$i]->special_code;
 		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
@@ -1340,13 +1355,13 @@ function pdf_getlinevatrate($object,$i,$outputlangs,$hidedetails=0)
 		$action='';
 		$reshook = $hookmanager->executeHooks('pdf_getlinevatrate',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 		
-		if(!empty($hookmanager->resPrint)) return $hookmanager->resPrint;
-		else return $reshook;
+		if (!empty($hookmanager->resPrint)) return $hookmanager->resPrint;
 	}
-	else
+	if (empty($reshook))
 	{
 		if (empty($hidedetails) || $hidedetails > 1) return vatrate($object->lines[$i]->tva_tx,1,$object->lines[$i]->info_bits,1);
 	}
+	return '';
 }
 
 /**
@@ -1365,7 +1380,9 @@ function pdf_getlineupexcltax($object,$i,$outputlangs,$hidedetails=0)
 	$sign=1;
 	if (isset($object->type) && $object->type == 2 && ! empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign=-1;
 
-	if (is_object($hookmanager) && (($object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line)))
+	$reshook=0;
+	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
+	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 	{
 		$special_code = $object->lines[$i]->special_code;
 		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
@@ -1373,13 +1390,13 @@ function pdf_getlineupexcltax($object,$i,$outputlangs,$hidedetails=0)
 		$action='';
 		$reshook = $hookmanager->executeHooks('pdf_getlineupexcltax',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 		
-		if(!empty($hookmanager->resPrint)) return $hookmanager->resPrint;
-		else return $reshook;
+		if (!empty($hookmanager->resPrint)) print $hookmanager->resPrint;
 	}
-	else
+	if (empty($reshook))
 	{
 		if (empty($hidedetails) || $hidedetails > 1) return price($sign * $object->lines[$i]->subprice, 0, $outputlangs);
 	}
+	return '';
 }
 
 /**
@@ -1389,25 +1406,29 @@ function pdf_getlineupexcltax($object,$i,$outputlangs,$hidedetails=0)
  *	@param	int			$i					Current line number
  *  @param  Translate	$outputlangs		Object langs for output
  *  @param	int			$hidedetails		Hide value (0 = no,	1 = yes, 2 = just special lines)
- *  @return	void
+ *  @return	string
  */
 function pdf_getlineupwithtax($object,$i,$outputlangs,$hidedetails=0)
 {
 	global $hookmanager;
 
-	if (is_object($hookmanager) && (($object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line)))
+	$reshook=0;
+	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
+	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 	{
 		$special_code = $object->lines[$i]->special_code;
 		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
-		foreach($object->hooks as $modules)
-		{
-			if (method_exists($modules[$special_code],'pdf_getlineupwithtax')) return $modules[$special_code]->pdf_getlineupwithtax($object,$i,$outputlangs,$hidedetails);
-		}
+		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
+		$action='';
+		$reshook = $hookmanager->executeHooks('pdf_getlineupwithtax',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+		
+		if (!empty($hookmanager->resPrint)) print $hookmanager->resPrint;
 	}
-	else
+	if (empty($reshook))
 	{
 		if (empty($hidedetails) || $hidedetails > 1) return price(($object->lines[$i]->subprice) + ($object->lines[$i]->subprice)*($object->lines[$i]->tva_tx)/100, 0, $outputlangs);
 	}
+	return '';
 }
 
 /**
@@ -1423,25 +1444,25 @@ function pdf_getlineqty($object,$i,$outputlangs,$hidedetails=0)
 {
 	global $hookmanager;
 
-	if ($object->lines[$i]->special_code != 3)
+	$reshook=0;
+	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
+	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 	{
-		if (is_object($hookmanager) && (( $object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code) ) || ! empty($object->lines[$i]->fk_parent_line) ) )
-		{
-			$special_code = $object->lines[$i]->special_code;
-			if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
-			$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
-			$action='';
-			$reshook = $hookmanager->executeHooks('pdf_getlineqty',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-			
-			if(!empty($hookmanager->resPrint)) return $hookmanager->resPrint;
-			else return $reshook;
-			
-		}
-		else
-		{
-			if (empty($hidedetails) || $hidedetails > 1) return $object->lines[$i]->qty;
-		}
+		$special_code = $object->lines[$i]->special_code;
+		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
+		$action='';
+		$reshook = $hookmanager->executeHooks('pdf_getlineqty',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+		
+		if(!empty($hookmanager->resPrint)) return $hookmanager->resPrint;
+		else return $reshook;
 	}
+    if (empty($reshook))
+	{
+	   if ($object->lines[$i]->special_code == 3) return '';
+	   if (empty($hidedetails) || $hidedetails > 1) return $object->lines[$i]->qty;
+	}
+	return '';
 }
 
 /**
@@ -1457,24 +1478,24 @@ function pdf_getlineqty_asked($object,$i,$outputlangs,$hidedetails=0)
 {
 	global $hookmanager;
 
-	if ($object->lines[$i]->special_code != 3)
+	$reshook=0;
+	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
+	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 	{
-		if (is_object($hookmanager) && (( $object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code) ) || ! empty($object->lines[$i]->fk_parent_line) ) )
-		{
-			$special_code = $object->lines[$i]->special_code;
-			if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
-			$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
-			$action='';
-			$reshook = $hookmanager->executeHooks('pdf_getlineqty_asked',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-		
-			if(!empty($hookmanager->resPrint)) return $hookmanager->resPrint;
-			else return $reshook;
-		}
-		else
-		{
-			if (empty($hidedetails) || $hidedetails > 1) return $object->lines[$i]->qty_asked;
-		}
+		$special_code = $object->lines[$i]->special_code;
+		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
+		$action='';
+		$reshook = $hookmanager->executeHooks('pdf_getlineqty_asked',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+	
+		if (!empty($hookmanager->resPrint)) return $hookmanager->resPrint;
 	}
+	if (empty($reshook))
+	{
+        if ($object->lines[$i]->special_code == 3) return '';
+        if (empty($hidedetails) || $hidedetails > 1) return $object->lines[$i]->qty_asked;
+	}
+	return '';
 }
 
 /**
@@ -1490,24 +1511,24 @@ function pdf_getlineqty_shipped($object,$i,$outputlangs,$hidedetails=0)
 {
 	global $hookmanager;
 
-	if ($object->lines[$i]->special_code != 3)
+	$reshook=0;
+	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
+	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 	{
-		if (is_object($hookmanager) && (( $object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code) ) || ! empty($object->lines[$i]->fk_parent_line) ) )
-		{
-			$special_code = $object->lines[$i]->special_code;
-			if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
-			$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
-			$action='';
-			$reshook = $hookmanager->executeHooks('pdf_getlineqty_shipped',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-			
-			if(!empty($hookmanager->resPrint)) return $hookmanager->resPrint;
-			else return $reshook;
-		}
-		else
-		{
-			if (empty($hidedetails) || $hidedetails > 1) return $object->lines[$i]->qty_shipped;
-		}
+		$special_code = $object->lines[$i]->special_code;
+		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
+		$action='';
+		$reshook = $hookmanager->executeHooks('pdf_getlineqty_shipped',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+		
+		if(!empty($hookmanager->resPrint)) return $hookmanager->resPrint;
 	}
+	if (empty($reshook))
+	{
+        if ($object->lines[$i]->special_code == 3) return '';
+	    if (empty($hidedetails) || $hidedetails > 1) return $object->lines[$i]->qty_shipped;
+	}
+	return '';
 }
 
 /**
@@ -1517,30 +1538,30 @@ function pdf_getlineqty_shipped($object,$i,$outputlangs,$hidedetails=0)
  *	@param	int			$i					Current line number
  *  @param  Translate	$outputlangs		Object langs for output
  *  @param	int			$hidedetails		Hide details (0=no, 1=yes, 2=just special lines)
- * 	@return	void
+ * 	@return	string
  */
 function pdf_getlineqty_keeptoship($object,$i,$outputlangs,$hidedetails=0)
 {
 	global $hookmanager;
 
-	if ($object->lines[$i]->special_code != 3)
+	$reshook=0;
+	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
+	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 	{
-		if (is_object($hookmanager) && (( $object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code) ) || ! empty($object->lines[$i]->fk_parent_line) ) )
-		{
-			$special_code = $object->lines[$i]->special_code;
-			if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
-			$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
-			$action='';
-			$reshook = $hookmanager->executeHooks('pdf_getlineqty_keeptoship',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-			
-			if(!empty($hookmanager->resPrint)) return $hookmanager->resPrint;
-			else return $reshook;
-		}
-		else
-		{
-			if (empty($hidedetails) || $hidedetails > 1) return ($object->lines[$i]->qty_asked - $object->lines[$i]->qty_shipped);
-		}
+		$special_code = $object->lines[$i]->special_code;
+		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
+		$action='';
+		$reshook = $hookmanager->executeHooks('pdf_getlineqty_keeptoship',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+		
+		if(!empty($hookmanager->resPrint)) return $hookmanager->resPrint;
 	}
+	if (empty($reshook))
+	{
+        if ($object->lines[$i]->special_code == 3) return '';
+		if (empty($hidedetails) || $hidedetails > 1) return ($object->lines[$i]->qty_asked - $object->lines[$i]->qty_shipped);
+	}
+	return '';
 }
 
 /**
@@ -1556,31 +1577,32 @@ function pdf_getlineqty_keeptoship($object,$i,$outputlangs,$hidedetails=0)
 function pdf_getlineunit($object, $i, $outputlangs, $hidedetails = 0, $hookmanager = false)
 {
 	global $langs;
-	if ($object->lines[$i]->special_code != 3) {
-		if (is_object($hookmanager) && (($object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code)) || !empty($object->lines[$i]->fk_parent_line))) {
-			$special_code = $object->lines[$i]->special_code;
-			if (!empty($object->lines[$i]->fk_parent_line)) {
-				$special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
-			}
-			$parameters = array(
-				'i' => $i,
-				'outputlangs' => $outputlangs,
-				'hidedetails' => $hidedetails,
-				'special_code' => $special_code
-			);
-			$action = '';
-			$reshook = $hookmanager->executeHooks('pdf_getlineunit', $parameters, $object,
-				$action);    // Note that $action and $object may have been modified by some hooks
-				
-			if(!empty($hookmanager->resPrint)) return $hookmanager->resPrint;
-			else return $reshook;
-				
-		} else {
-			if (empty($hidedetails) || $hidedetails > 1) {
-				return $langs->transnoentitiesnoconv($object->lines[$i]->getLabelOfUnit('short'));
-			}
+	
+	$reshook=0;
+	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
+	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
+	{
+		$special_code = $object->lines[$i]->special_code;
+		if (!empty($object->lines[$i]->fk_parent_line)) {
+			$special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
 		}
+		$parameters = array(
+			'i' => $i,
+			'outputlangs' => $outputlangs,
+			'hidedetails' => $hidedetails,
+			'special_code' => $special_code
+		);
+		$action = '';
+		$reshook = $hookmanager->executeHooks('pdf_getlineunit', $parameters, $object, $action);    // Note that $action and $object may have been modified by some hooks
+			
+		if(!empty($hookmanager->resPrint)) return $hookmanager->resPrint;
 	}
+	if (empty($reshook))
+	{
+        if ($object->lines[$i]->special_code == 3) return '';
+	    if (empty($hidedetails) || $hidedetails > 1) return $langs->transnoentitiesnoconv($object->lines[$i]->getLabelOfUnit('short'));
+	}
+	return '';
 }
 
 
@@ -1599,24 +1621,24 @@ function pdf_getlineremisepercent($object,$i,$outputlangs,$hidedetails=0)
 
 	include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
-	if ($object->lines[$i]->special_code != 3)
+	$reshook=0;
+	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
+	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 	{
-		if (is_object($hookmanager) && ( ($object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code) ) || ! empty($object->lines[$i]->fk_parent_line) ) )
-		{
-			$special_code = $object->lines[$i]->special_code;
-			if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
-			$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
-			$action='';
-			$reshook = $hookmanager->executeHooks('pdf_getlineremisepercent',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-			
-			if(!empty($hookmanager->resPrint)) return $hookmanager->resPrint;
-			else return $reshook;
-		}
-		else
-		{
-			if (empty($hidedetails) || $hidedetails > 1) return dol_print_reduction($object->lines[$i]->remise_percent,$outputlangs);
-		}
+		$special_code = $object->lines[$i]->special_code;
+		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
+		$action='';
+		$reshook = $hookmanager->executeHooks('pdf_getlineremisepercent',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+		
+		if(!empty($hookmanager->resPrint)) return $hookmanager->resPrint;
 	}
+	if (empty($reshook))
+	{
+        if ($object->lines[$i]->special_code == 3) return '';
+	    if (empty($hidedetails) || $hidedetails > 1) return dol_print_reduction($object->lines[$i]->remise_percent,$outputlangs);
+	}
+	return '';
 }
 
 /**
@@ -1627,24 +1649,28 @@ function pdf_getlineremisepercent($object,$i,$outputlangs,$hidedetails=0)
  * @param Translate $outputlangs Object langs for output
  * @param int $hidedetails Hide details (0=no, 1=yes, 2=just special lines)
  * @param HookManager $hookmanager Hook manager instance
- * @return void
+ * @return string
  */
 function pdf_getlineprogress($object, $i, $outputlangs, $hidedetails = 0, $hookmanager = null)
 {
-	if ($object->lines[$i]->special_code != 3) {
-		if (is_object($hookmanager) && (($object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code)) || !empty($object->lines[$i]->fk_parent_line))) {
-			$special_code = $object->lines[$i]->special_code;
-			if (!empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
-			$parameters = array('i' => $i, 'outputlangs' => $outputlangs, 'hidedetails' => $hidedetails, 'special_code' => $special_code);
-			$action = '';
-			$reshook = $hookmanager->executeHooks('pdf_getlineprogress', $parameters, $object, $action);    // Note that $action and $object may have been modified by some hooks
-			
-			if(!empty($hookmanager->resPrint)) return $hookmanager->resPrint;
-			else return $reshook;
-		} else {
-			if (empty($hidedetails) || $hidedetails > 1) return $object->lines[$i]->situation_percent . '%';
-		}
+	$reshook=0;
+	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
+	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
+	{
+		$special_code = $object->lines[$i]->special_code;
+		if (!empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+		$parameters = array('i' => $i, 'outputlangs' => $outputlangs, 'hidedetails' => $hidedetails, 'special_code' => $special_code);
+		$action = '';
+		$reshook = $hookmanager->executeHooks('pdf_getlineprogress', $parameters, $object, $action);    // Note that $action and $object may have been modified by some hooks
+		
+		if(!empty($hookmanager->resPrint)) return $hookmanager->resPrint;
 	}
+	if (empty($reshook))
+	{
+        if ($object->lines[$i]->special_code == 3) return '';
+	    if (empty($hidedetails) || $hidedetails > 1) return $object->lines[$i]->situation_percent . '%';
+	}
+	return '';
 }
 
 /**
@@ -1663,27 +1689,25 @@ function pdf_getlinetotalexcltax($object,$i,$outputlangs,$hidedetails=0)
 	$sign=1;
 	if (isset($object->type) && $object->type == 2 && ! empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign=-1;
 
-	if ($object->lines[$i]->special_code == 3)
+	$reshook=0;
+	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
+	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 	{
-		return $outputlangs->transnoentities("Option");
+		$special_code = $object->lines[$i]->special_code;
+		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code, 'sign'=>$sign);
+		$action='';
+		$reshook = $hookmanager->executeHooks('pdf_getlinetotalexcltax',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+		
+		if(!empty($hookmanager->resPrint)) return $hookmanager->resPrint;
 	}
-	else
+    if (empty($reshook))
 	{
-		if (is_object($hookmanager) && (($object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line)))
-		{
-			$special_code = $object->lines[$i]->special_code;
-			if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
-			$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
-			$action='';
-			$reshook = $hookmanager->executeHooks('pdf_getlinetotalexcltax',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-			
-			if(!empty($hookmanager->resPrint)) return $hookmanager->resPrint;
-			else return $reshook;
-		}
-		else
-		{
-			if (empty($hidedetails) || $hidedetails > 1) return price($sign * $object->lines[$i]->total_ht, 0, $outputlangs);
-		}
+	    if ($object->lines[$i]->special_code == 3)
+    	{
+    		return $outputlangs->transnoentities("Option");
+    	}
+        if (empty($hidedetails) || $hidedetails > 1) return price($sign * $object->lines[$i]->total_ht, 0, $outputlangs);
 	}
 	return '';
 }
@@ -1701,27 +1725,25 @@ function pdf_getlinetotalwithtax($object,$i,$outputlangs,$hidedetails=0)
 {
 	global $hookmanager;
 
-	if ($object->lines[$i]->special_code == 3)
+	$reshook=0;
+	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
+	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 	{
-		return $outputlangs->transnoentities("Option");
+		$special_code = $object->lines[$i]->special_code;
+		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
+		$action='';
+		$reshook = $hookmanager->executeHooks('pdf_getlinetotalwithtax',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+		
+		if(!empty($hookmanager->resPrint)) return $hookmanager->resPrint;
 	}
-	else
+	if (empty($reshook))
 	{
-		if (is_object($hookmanager) && (($object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line)))
-		{
-			$special_code = $object->lines[$i]->special_code;
-			if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
-			$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
-			$action='';
-			$reshook = $hookmanager->executeHooks('pdf_getlinetotalwithtax',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-			
-			if(!empty($hookmanager->resPrint)) return $hookmanager->resPrint;
-			else return $reshook;
-		}
-		else
-		{
-			if (empty($hidedetails) || $hidedetails > 1) return price(($object->lines[$i]->total_ht) + ($object->lines[$i]->total_ht)*($object->lines[$i]->tva_tx)/100, 0, $outputlangs);
-		}
+		if ($object->lines[$i]->special_code == 3)
+    	{
+    		return $outputlangs->transnoentities("Option");
+    	}
+		if (empty($hidedetails) || $hidedetails > 1) return price(($object->lines[$i]->total_ht) + ($object->lines[$i]->total_ht)*($object->lines[$i]->tva_tx)/100, 0, $outputlangs);
 	}
 	return '';
 }

From 531ef43a27e00bcd484fa9d8fa8f2fb8affe1506 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 22 Oct 2015 19:13:16 +0200
Subject: [PATCH 27/66] Some minor look fixes.

---
 htdocs/contrat/list.php                   |  7 ++++---
 htdocs/core/class/html.formfile.class.php | 22 ++++++++++++----------
 htdocs/expedition/card.php                | 14 ++++++++------
 htdocs/langs/en_US/products.lang          |  3 ++-
 htdocs/product/document.php               | 19 ++++++++++++-------
 htdocs/societe/price.php                  | 13 +++++++------
 6 files changed, 45 insertions(+), 33 deletions(-)

diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index 07d3aa9e1c5..3751906d9fe 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -246,7 +246,7 @@ if ($resql)
     print '<input type="text" class="flat" size="6" name="search_ref_supplier value="'.dol_escape_htmltag($search_ref_supplier).'">';
     print '</td>';
     print '<td class="liste_titre">';
-    print '<input type="text" class="flat" size="12" name="search_name" value="'.dol_escape_htmltag($search_name).'">';
+    print '<input type="text" class="flat" size="8" name="search_name" value="'.dol_escape_htmltag($search_name).'">';
     print '</td>';
     print '<td class="liste_titre">&nbsp;</td>';
     //print '<td class="liste_titre">&nbsp;</td>';
@@ -292,9 +292,10 @@ if ($resql)
         			$userstatic->id=$val['id'];
         			$userstatic->lastname=$val['lastname'];
         			$userstatic->firstname=$val['firstname'];
-        			print $userstatic->getNomUrl(1);
+        			print '<div class="float">'.$userstatic->getNomUrl(1);
         			$j++;
-        			if ($j < $nbofsalesrepresentative) print '<br/>';
+        			if ($j < $nbofsalesrepresentative) print ', ';
+        			print '</div>';
         		}
         	}
         	else print $langs->trans("NoSalesRepresentativeAffected");
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 000a2a35c13..230ffa99504 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -176,22 +176,24 @@ class FormFile
 	            $out .= '<input type="hidden" id="'.$htmlname.'_link_section_id"  name="link_section_id" value="'.$sectionid.'">';
 	            $out .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 
-	            $out .= '<table width="100%" class="nobordernopadding">';
-	            $out .= '<tr>';
-	            $out .= '<td valign="middle" class="nowrap">';
-	            $out .= $langs->trans("URLToLink") . ': ';
+	            $out .= '<div>';
+	            $out .= '<div class="float" style="padding-right: 10px;">';
+	            $out .= '<label for="link">'.$langs->trans("URLToLink") . '</label>: ';
 	            $out .= '<input type="text" name="link" size="'.$maxlength.'" id="link">';
-	            $out .= ' &nbsp; ' . $langs->trans("Label") . ': ';
+	            $out .= '</div>';
+	            $out .= '<div class="float" style="padding-right: 10px;">';
+	            $out .= '<label for="label">'.$langs->trans("Label") . '</label>: ';
 	            $out .= '<input type="text" name="label" id="label">';
 	            $out .= '<input type="hidden" name="objecttype" value="' . $object->element . '">';
 	            $out .= '<input type="hidden" name="objectid" value="' . $object->id . '">';
-	            $out .= '&nbsp;';
+	            $out .= '</div>';
+	            $out .= '<div class="float" style="padding-right: 10px;">';
 	            $out .= '<input type="submit" class="button" name="linkit" value="'.$langs->trans("ToLink").'"';
 	            $out .= (empty($conf->global->MAIN_UPLOAD_DOC) || empty($perm)?' disabled':'');
 	            $out .= '>';
-	            $out .= '</td></tr>';
-	            $out .= '</table>';
-
+	            $out .= '</div>';
+                $out .= '</div>';
+                $out .= '<div class="clearboth"></div>';
 	            $out .= '</form><br>';
 	            $parameters = array('socid'=>(isset($GLOBALS['socid'])?$GLOBALS['socid']:''),'id'=>(isset($GLOBALS['id'])?$GLOBALS['id']:''), 'url'=>$url, 'perm'=>$perm);
 	            $res = $hookmanager->executeHooks('formattachOptions',$parameters,$object);
@@ -492,7 +494,7 @@ class FormFile
             $out.= '<input type="hidden" name="action" value="builddoc">';
             $out.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 
-            $out.= '<div class="titre">'.$titletoshow.'</div>';
+            $out.= load_fiche_titre($titletoshow, '', '');
             $out.= '<table class="liste formdoc noborder" summary="listofdocumentstable" width="100%">';
 
             $out.= '<tr class="liste_titre">';
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 91c570a39a7..3ca2c18bf6c 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -520,7 +520,7 @@ if ($action == 'create')
 
             dol_fiche_head('');
 
-            print '<table class="border" width="100%">';
+            print '<table class="border centpercent">';
 
             // Ref
             print '<tr><td width="30%" class="fieldrequired">';
@@ -662,6 +662,8 @@ if ($action == 'create')
 
 
             print '<br>';
+            
+            
             print '<table class="noborder" width="100%">';
 
 
@@ -1533,9 +1535,9 @@ else if ($id || $ref)
 	 */
 	if ($action != 'presend')
 	{
-		print '<table width="100%"><tr><td width="50%" valign="top">';
-
-		$objectref = dol_sanitizeFileName($object->ref);
+        print '<div class="fichecenter"><div class="fichehalfleft">';
+	    
+        $objectref = dol_sanitizeFileName($object->ref);
 		$filedir = $conf->expedition->dir_output . "/sending/" .$objectref;
 
 		$urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
@@ -1552,14 +1554,14 @@ else if ($id || $ref)
 		//$linktoelem = $form->showLinkToObjectBlock($object);
 		//if ($linktoelem) print '<br>'.$linktoelem;
 
-		print '</td><td valign="top" width="50%">';
+		print '</div><div class="fichehalfright"><div class="ficheaddleft">';
 
 		// List of actions on element
 		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
 		$formactions=new FormActions($db);
 		$somethingshown=$formactions->showactions($object,'shipping',$socid);
 
-		print '</td></tr></table>';
+		print '</div></div></div>';
 	}
 
 	/*
diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang
index 6dcf4ce60f9..e108dfff52b 100644
--- a/htdocs/langs/en_US/products.lang
+++ b/htdocs/langs/en_US/products.lang
@@ -105,6 +105,7 @@ AddPhoto=Add photo
 ListOfStockMovements=List of stock movements
 BuyingPrice=Buying price
 PriceForEachProduct=Products with specific prices
+NoPriceSpecificToCustomer=This customer has no specific prices. All standard prices for products/services will be used.
 SupplierCard=Supplier card
 CommercialCard=Commercial card
 AllWays=Path to find your product in stock
@@ -298,6 +299,6 @@ LastUpdated=Last updated
 CorrectlyUpdated=Correctly updated
 PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is 
 PropalMergePdfProductChooseFile=Select PDF files
-IncludingProductWithTag=Including product with tag
+IncludingProductWithTag=Including product/service with tag
 DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
 WarningSelectOneDocument=Please select at least one document
diff --git a/htdocs/product/document.php b/htdocs/product/document.php
index cb174e5847e..df1afe1db93 100644
--- a/htdocs/product/document.php
+++ b/htdocs/product/document.php
@@ -216,7 +216,7 @@ if ($object->id)
     include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_post_headers.tpl.php';
 
 
-    // Merge propal PDF docuemnt PDF files
+    // Merge propal PDF document PDF files
     if (!empty($conf->global->PRODUIT_PDF_MERGE_PROPAL))
     {
     	$filetomerge = new Propalmergepdfproduct($db);
@@ -233,7 +233,8 @@ if ($object->id)
     	$filearray = dol_dir_list($upload_dir, "files", 0, '', '\.meta$', 'name', SORT_ASC, 1);
 
     	// For each file build select list with PDF extention
-    	if (count($filearray) > 0) {
+    	if (count($filearray) > 0) 
+    	{
     		print '<br>';
     		// Actual file to merge is :
     		if (count($filetomerge->lines) > 0) {
@@ -315,19 +316,23 @@ if ($object->id)
     				$checked = '';
     				$filename = $filetoadd['name'];
 
-    				if ($conf->global->MAIN_MULTILANGS) {
-    					if (array_key_exists($filetoadd['name'] . '_' . $delauft_lang, $filetomerge->lines)) {
+    				if ($conf->global->MAIN_MULTILANGS) 
+    				{
+    					if (array_key_exists($filetoadd['name'] . '_' . $delauft_lang, $filetomerge->lines)) 
+    					{
     						$filename = $filetoadd['name'] . ' - ' . $langs->trans('Language_' . $delauft_lang);
     						$checked = ' checked ';
     					}
-    				} else {
-    					if (array_key_exists($filetoadd['name'], $filetomerge->lines)) {
+    				}
+    				else 
+    				{
+    					if (array_key_exists($filetoadd['name'], $filetomerge->lines)) 
+    					{
     						$checked = ' checked ';
     					}
     				}
 
     				print  '<tr class="' . $style . '"><td>';
-
     				print  '<input type="checkbox" ' . $checked . ' name="filetoadd[]" id="filetoadd" value="' . $filetoadd['name'] . '">' . $filename . '</input>';
     				print  '</td></tr>';
     			}
diff --git a/htdocs/societe/price.php b/htdocs/societe/price.php
index fd41c276bf2..e5f89779225 100644
--- a/htdocs/societe/price.php
+++ b/htdocs/societe/price.php
@@ -447,8 +447,6 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 
 		print_barre_liste($langs->trans('PriceForEachProduct'), $page, $_SERVEUR ['PHP_SELF'], $option, $sortfield, $sortorder, '', count($prodcustprice->lines), $nbtotalofrecords);
 
-		if (count($prodcustprice->lines) > 0) {
-
 			print '<form action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '" method="POST">';
 			print '<input type="hidden" name="id" value="' . $object->id . '">';
 
@@ -467,6 +465,8 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 			print '<td>&nbsp;</td>';
 			print '</tr>';
 
+		if (count($prodcustprice->lines) > 0) {
+
 			print '<tr class="liste_titre">';
 			print '<td><input type="text" class="flat" name="search_soc" value="' . $search_soc . '" size="20"></td>';
 			print '<td colspan="8">&nbsp;</td>';
@@ -522,13 +522,14 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 
 				print "</tr>\n";
 			}
+		} else {
+			print '<tr '.$bc[false].'><td colspan="10">'.$langs->trans('NoPriceSpecificToCustomer').'</td></tr>';
+		}
+
 			print "</table>";
 
 			print "</form>";
-		} else {
-			print $langs->trans('None');
-		}
-
+		
 		/* ************************************************************************** */
 		/*                                                                            */
 		/* Barre d'action                                                             */

From 1000fd1b2150bd5a74fb63042debc94bbc423ba3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 22 Oct 2015 19:43:50 +0200
Subject: [PATCH 28/66] Add field employee for hr module

---
 htdocs/install/mysql/migration/3.8.0-3.9.0.sql | 4 ++++
 htdocs/install/mysql/tables/llx_user.sql       | 1 +
 2 files changed, 5 insertions(+)

diff --git a/htdocs/install/mysql/migration/3.8.0-3.9.0.sql b/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
index 670177d1e55..775a67b27fa 100755
--- a/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
+++ b/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
@@ -100,3 +100,7 @@ ALTER TABLE llx_ecm_files ADD UNIQUE INDEX uk_ecm_files (label, entity);
 
 
 ALTER TABLE llx_product ADD COLUMN onportal tinyint DEFAULT 0 after tobuy;
+
+
+ALTER TABLE llx_user ADD COLUMN employee tinyint DEFAULT 1;
+
diff --git a/htdocs/install/mysql/tables/llx_user.sql b/htdocs/install/mysql/tables/llx_user.sql
index a11b0ec6b50..47bbedb1fef 100644
--- a/htdocs/install/mysql/tables/llx_user.sql
+++ b/htdocs/install/mysql/tables/llx_user.sql
@@ -74,6 +74,7 @@ create table llx_user
   nb_holiday		integer DEFAULT 0,
   thm				double(24,8),
   tjm				double(24,8),
+  employee          tinyint DEFAULT 1,	-- 1 if user is an employee
   salary			double(24,8),
   salaryextra		double(24,8),
   weeklyhours		double(16,8)

From 90a221ef6de9d0f1dcd374f1df5f281f322a20d6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 22 Oct 2015 19:46:30 +0200
Subject: [PATCH 29/66] Fix version of module

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

diff --git a/htdocs/core/modules/modHRM.class.php b/htdocs/core/modules/modHRM.class.php
index 16a0edd0c04..1e82db5dfc4 100644
--- a/htdocs/core/modules/modHRM.class.php
+++ b/htdocs/core/modules/modHRM.class.php
@@ -23,8 +23,7 @@
 include_once (DOL_DOCUMENT_ROOT . "/core/modules/DolibarrModules.class.php");
 
 /**
- * \class 	modHRM
- * \brief 	Class to describe and activate the HRM module
+ * Class to describe and activate the HRM module
  */
 class modHRM extends DolibarrModules
 {
@@ -49,7 +48,7 @@ class modHRM extends DolibarrModules
 		$this->description = "Gestion des ressources humaines";
 		
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
-		$this->version = 'develop';
+		$this->version = 'development';
 		
 		$this->const_name = 'MAIN_MODULE_' . strtoupper ( $this->name );
 		$this->special = 0;

From 3767ab437e6ba5cc126977ac5419ef818c4b5819 Mon Sep 17 00:00:00 2001
From: philippe grand <philippe.grand@atoo-net.com>
Date: Fri, 23 Oct 2015 12:58:30 +0200
Subject: [PATCH 30/66] [Qual] Uniformize code

---
 htdocs/accountancy/bookkeeping/card.php       | 26 +++++-----
 htdocs/accountancy/bookkeeping/list.php       |  4 +-
 htdocs/accountancy/customer/card.php          |  2 +-
 htdocs/accountancy/customer/index.php         |  4 +-
 htdocs/accountancy/customer/lines.php         |  6 +--
 htdocs/accountancy/journal/bankjournal.php    |  6 +--
 .../accountancy/journal/purchasesjournal.php  |  8 +--
 htdocs/accountancy/journal/sellsjournal.php   |  8 +--
 htdocs/accountancy/supplier/card.php          |  2 +-
 htdocs/accountancy/supplier/index.php         |  4 +-
 htdocs/accountancy/supplier/lines.php         |  6 +--
 htdocs/adherents/admin/adherent.php           |  6 +--
 htdocs/adherents/admin/public.php             |  4 +-
 htdocs/adherents/card.php                     | 50 +++++++++----------
 htdocs/adherents/card_subscriptions.php       |  6 +--
 htdocs/adherents/ldap.php                     |  4 +-
 htdocs/admin/agenda.php                       |  4 +-
 htdocs/admin/agenda_extsites.php              |  6 +--
 htdocs/admin/agenda_xcal.php                  |  4 +-
 htdocs/admin/askpricesupplier.php             | 28 +++++------
 htdocs/admin/bank.php                         |  4 +-
 htdocs/admin/barcode.php                      |  8 +--
 htdocs/admin/boxes.php                        |  4 +-
 htdocs/admin/clicktodial.php                  |  4 +-
 htdocs/admin/commande.php                     | 34 ++++++-------
 htdocs/admin/company.php                      | 12 ++---
 htdocs/admin/compta.php                       |  6 +--
 htdocs/admin/const.php                        |  8 +--
 htdocs/admin/contract.php                     | 18 +++----
 htdocs/admin/dict.php                         | 18 +++----
 htdocs/admin/menus/edit.php                   | 14 +++---
 htdocs/admin/menus/index.php                  |  4 +-
 htdocs/admin/tools/dolibarr_export.php        |  4 +-
 htdocs/admin/tools/export.php                 | 10 ++--
 htdocs/admin/tools/update.php                 | 14 +++---
 35 files changed, 175 insertions(+), 175 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php
index d4c256dfbf2..0500ac4a0a7 100644
--- a/htdocs/accountancy/bookkeeping/card.php
+++ b/htdocs/accountancy/bookkeeping/card.php
@@ -52,7 +52,7 @@ if ($action == "confirm_update") {
     $error = 0;
 
     if ((floatval($debit)!=0.0) && (floatval($credit)!=0.0)) {
-        setEventMessage($langs->trans('ErrorDebitCredit'), 'errors');
+        setEventMessages($langs->trans('ErrorDebitCredit'), null, 'errors');
         $error ++;
     }
 
@@ -61,7 +61,7 @@ if ($action == "confirm_update") {
 
         $result = $book->fetch($id);
         if ($result < 0) {
-            setEventMessage($book->errors, 'errors');
+            setEventMessages($book->error, $book->errors, 'errors');
         } else {
             $book->numero_compte = $numero_compte;
             $book->code_tiers = $code_tiers;
@@ -80,9 +80,9 @@ if ($action == "confirm_update") {
 
             $result = $book->update();
             if ($result < 0) {
-                setEventMessage($book->errors, 'errors');
+                setEventMessages($book->error, $book->errors, 'errors');
             } else {
-                setEventMessage($langs->trans('Saved'), 'mesgs');
+                setEventMessages($langs->trans('Saved'), null, 'mesgs');
                 $action = '';
             }
         }
@@ -93,7 +93,7 @@ else if ($action == "add") {
     $error = 0;
 
     if ((intval($debit) != 0) && (intval($credit) != 0)) {
-        setEventMessage($langs->trans('ErrorDebitCredit'), 'errors');
+        setEventMessages($langs->trans('ErrorDebitCredit'), null, 'errors');
         $error ++;
     }
 
@@ -124,9 +124,9 @@ else if ($action == "add") {
 
         $result = $book->create_std($user);
         if ($result < 0) {
-            setEventMessage($book->errors, 'errors');
+            setEventMessages($book->error, $book->errors, 'errors');
         } else {
-            setEventMessage($langs->trans('Saved'), 'mesgs');
+            setEventMessages($langs->trans('Saved'), null, 'mesgs');
             $action = '';
         }
     }
@@ -140,11 +140,11 @@ else if ($action == "confirm_delete") {
     $piece_num = $book->piece_num;
 
     if ($result < 0) {
-        setEventMessage($book->errors, 'errors');
+        setEventMessages($book->error, $book->errors, 'errors');
     } else {
         $result = $book->delete($user);
         if ($result < 0) {
-            setEventMessage($book->errors, 'errors');
+            setEventMessages($book->error, $book->errors, 'errors');
         }
     }
     $action = '';
@@ -168,9 +168,9 @@ else if ($action == "confirm_create") {
 
     $result = $book->create_std($user);
     if ($result < 0) {
-        setEventMessage($book->errors, 'errors');
+        setEventMessages($book->error, $book->errors, 'errors');
     } else {
-        setEventMessage($langs->trans('Saved'), 'mesgs');
+        setEventMessages($langs->trans('Saved'), null, 'mesgs');
         $action = '';
         $piece_num = $book->piece_num;
     }
@@ -246,7 +246,7 @@ if ($action == 'create') {
     $book = new BookKeeping($db);
     $result = $book->fetch_per_mvt($piece_num);
     if ($result < 0) {
-        setEventMessage($book->errors, 'errors');
+        setEventMessages($book->error, $book->errors, 'errors');
     }
     if (! empty($book->piece_num)) {
 
@@ -277,7 +277,7 @@ if ($action == 'create') {
 
         $result = $book->fetch_all_per_mvt($piece_num);
         if ($result < 0) {
-            setEventMessage($book->errors, 'errors');
+            setEventMessages($book->error, $book->errors, 'errors');
         } else {
 
             print load_fiche_titre($langs->trans("ListeMvts"));
diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index d9b6d66b503..b9164329031 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -74,7 +74,7 @@ if ($action == 'delbookkeeping') {
 		$result = $object->delete_by_importkey($import_key);
 		Header("Location: list.php");
 		if ($result < 0) {
-			setEventMessage($object->errors, 'errors');
+			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
 } // Export
@@ -86,7 +86,7 @@ else if ($action == 'export_csv') {
 	$object = new BookKeeping($db);
 	$result = $object->export_bookkeping('ebp');
 	if ($result < 0) {
-		setEventMessage($object->errors, 'errors');
+		setEventMessages($object->error, $object->errors, 'errors');
 	}
 	
 	foreach ( $object->linesexport as $line ) {
diff --git a/htdocs/accountancy/customer/card.php b/htdocs/accountancy/customer/card.php
index 09e8b24a8ea..a3e179c1701 100644
--- a/htdocs/accountancy/customer/card.php
+++ b/htdocs/accountancy/customer/card.php
@@ -54,7 +54,7 @@ if ($action == 'ventil' && $user->rights->accounting->ventilation->dispatch) {
 		dol_syslog("/accounting/customer/card.php sql=" . $sql, LOG_DEBUG);
 		$resql = $db->query($sql);
 		if (! $resql) {
-			setEventMessage($db->lasterror(), 'errors');
+			setEventMessages($db->lasterror(), null, 'errors');
 		}
 	} else {
 		header("Location: ./lines.php");
diff --git a/htdocs/accountancy/customer/index.php b/htdocs/accountancy/customer/index.php
index ea37f237455..5a6de05691a 100644
--- a/htdocs/accountancy/customer/index.php
+++ b/htdocs/accountancy/customer/index.php
@@ -83,10 +83,10 @@ if ($action == 'validatehistory') {
 	if (! $resql1) {
 		$error ++;
 		$db->rollback();
-		setEventMessage($db->lasterror(), 'errors');
+		setEventMessages($db->lasterror(), null, 'errors');
 	} else {
 		$db->commit();
-		setEventMessage($langs->trans('Dispatched'), 'mesgs');
+		setEventMessages($langs->trans('Dispatched'), null, 'mesgs');
 	}
 }
 
diff --git a/htdocs/accountancy/customer/lines.php b/htdocs/accountancy/customer/lines.php
index 01f34e700cc..a505c91c1c7 100644
--- a/htdocs/accountancy/customer/lines.php
+++ b/htdocs/accountancy/customer/lines.php
@@ -109,14 +109,14 @@ if (is_array($changeaccount) && count($changeaccount) > 0) {
 	$resql1 = $db->query($sql1);
 	if (! $resql1) {
 		$error ++;
-		setEventMessage($db->lasterror(), 'errors');
+		setEventMessages($db->lasterror(), null, 'errors');
 	}
 	if (! $error) {
 		$db->commit();
-		setEventMessage($langs->trans('Save'), 'mesgs');
+		setEventMessages($langs->trans('Save'), null, 'mesgs');
 	} else {
 		$db->rollback();
-		setEventMessage($db->lasterror(), 'errors');
+		setEventMessages($db->lasterror(), null, 'errors');
 	}
 }
 
diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index 01957fcedf5..cd0c5d06ce5 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -343,7 +343,7 @@ if ($action == 'writeBookKeeping')
 			$result = $bookkeeping->create();
 			if ($result < 0) {
 				$error ++;
-				setEventMessage($object->errors, 'errors');
+				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
 		// Third party
@@ -420,13 +420,13 @@ if ($action == 'writeBookKeeping')
 			$result = $bookkeeping->create();
 			if ($result < 0) {
 				$error ++;
-				setEventMessage($object->errors, 'errors');
+				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
 	}
 
 	if (empty($error)) {
-		setEventMessage($langs->trans("GeneralLedgerIsWritten"),'mesgs');
+		setEventMessages($langs->trans("GeneralLedgerIsWritten"), null, 'mesgs');
 	}
 }
 // Export
diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php
index 28b2dc736b6..538edaa471d 100644
--- a/htdocs/accountancy/journal/purchasesjournal.php
+++ b/htdocs/accountancy/journal/purchasesjournal.php
@@ -185,7 +185,7 @@ if ($action == 'writebookkeeping') {
 			$result = $bookkeeping->create();
 			if ($result < 0) {
 				$error ++;
-				setEventMessage($object->errors, 'errors');
+				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
 
@@ -215,7 +215,7 @@ if ($action == 'writebookkeeping') {
 					$result = $bookkeeping->create();
 					if ($result < 0) {
 						$error ++;
-						setEventMessage($object->errors, 'errors');
+						setEventMessages($object->error, $object->errors, 'errors');
 					}
 				}
 			}
@@ -246,14 +246,14 @@ if ($action == 'writebookkeeping') {
 				$result = $bookkeeping->create();
 				if ($result < 0) {
 					$error ++;
-					setEventMessage($object->errors, 'errors');
+					setEventMessages($object->error, $object->errors, 'errors');
 				}
 			}
 		}
 	}
 
 	if (empty($error)) {
-		setEventMessage($langs->trans("GeneralLedgerIsWritten"),'mesgs');
+		setEventMessages($langs->trans("GeneralLedgerIsWritten"), null, 'mesgs');
 	}
 }
 
diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php
index 4437535738a..aaf3beea8a1 100644
--- a/htdocs/accountancy/journal/sellsjournal.php
+++ b/htdocs/accountancy/journal/sellsjournal.php
@@ -220,7 +220,7 @@ if ($action == 'writebookkeeping')
 			$result = $bookkeeping->create();
 			if ($result < 0) {
 				$error ++;
-				setEventMessage($object->errors, 'errors');
+				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
 
@@ -250,7 +250,7 @@ if ($action == 'writebookkeeping')
 					$result = $bookkeeping->create();
 					if ($result < 0) {
 						$error ++;
-						setEventMessage($object->errors, 'errors');
+						setEventMessages($object->error, $object->errors, 'errors');
 					}
 				}
 			}
@@ -282,14 +282,14 @@ if ($action == 'writebookkeeping')
 				$result = $bookkeeping->create();
 				if ($result < 0) {
 					$error ++;
-					setEventMessage($object->errors, 'errors');
+					setEventMessages($object->error, $object->errors, 'errors');
 				}
 			}
 		}
 	}
 
 	if (empty($error)) {
-		setEventMessage($langs->trans("GeneralLedgerIsWritten"),'mesgs');
+		setEventMessages($langs->trans("GeneralLedgerIsWritten"), null, 'mesgs');
 	}
 }
 
diff --git a/htdocs/accountancy/supplier/card.php b/htdocs/accountancy/supplier/card.php
index f0747c8d29c..61b225fbc16 100644
--- a/htdocs/accountancy/supplier/card.php
+++ b/htdocs/accountancy/supplier/card.php
@@ -55,7 +55,7 @@ if ($action == 'ventil' && $user->rights->accounting->ventilation->dispatch) {
 		dol_syslog('accountancy/supplier/card.php:: $sql=' . $sql);
 		$resql = $db->query($sql);
 		if (! $resql) {
-			setEventMessage($db->lasterror(), 'errors');
+			setEventMessages($db->lasterror(), null, 'errors');
 		}
 	} else {
 		header("Location: ./lines.php");
diff --git a/htdocs/accountancy/supplier/index.php b/htdocs/accountancy/supplier/index.php
index 954eb60300c..ec18d8b1e23 100644
--- a/htdocs/accountancy/supplier/index.php
+++ b/htdocs/accountancy/supplier/index.php
@@ -79,10 +79,10 @@ if ($action == 'validatehistory') {
 	if (! $resql1) {
 		$error ++;
 		$db->rollback();
-		setEventMessage($db->lasterror(), 'errors');
+		setEventMessages($db->lasterror(), null, 'errors');
 	} else {
 		$db->commit();
-		setEventMessage($langs->trans('Dispatched'), 'mesgs');
+		setEventMessages($langs->trans('Dispatched'), null, 'mesgs');
 	}
 }
 
diff --git a/htdocs/accountancy/supplier/lines.php b/htdocs/accountancy/supplier/lines.php
index f475e7046ad..e703bca6f2d 100644
--- a/htdocs/accountancy/supplier/lines.php
+++ b/htdocs/accountancy/supplier/lines.php
@@ -115,14 +115,14 @@ if (is_array($changeaccount) && count($changeaccount) > 0) {
 	$resql1 = $db->query($sql1);
 	if (! $resql1) {
 		$error ++;
-		setEventMessage($db->lasterror(), 'errors');
+		setEventMessages($db->lasterror(), null, 'errors');
 	}
 	if (! $error) {
 		$db->commit();
-		setEventMessage($langs->trans('Save'), 'mesgs');
+		setEventMessages($langs->trans('Save'), null, 'mesgs');
 	} else {
 		$db->rollback();
-		setEventMessage($db->lasterror(), 'errors');
+		setEventMessages($db->lasterror(), null, 'errors');
 	}
 }
 
diff --git a/htdocs/adherents/admin/adherent.php b/htdocs/adherents/admin/adherent.php
index 5827e1d22d7..8e265eb70f7 100644
--- a/htdocs/adherents/admin/adherent.php
+++ b/htdocs/adherents/admin/adherent.php
@@ -7,7 +7,7 @@
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2011-2012 Juanjo Menent		<jmenent@2byte.es>
  * Copyright (C) 2012      J. Fernando Lagrange <fernando@demo-tic.org>
- * Copyright (C) 2015       Jean-François Ferry		<jfefe@aternatik.fr>
+ * Copyright (C) 2015      Jean-François Ferry	<jfefe@aternatik.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -69,11 +69,11 @@ if ($action == 'update' || $action == 'add')
 
 	if (! $error)
 	{
-		setEventMessage($langs->trans("SetupSaved"));
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	}
 	else
 	{
-		setEventMessage($langs->trans("Error"), 'errors');
+		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
 
diff --git a/htdocs/adherents/admin/public.php b/htdocs/adherents/admin/public.php
index 58cb7bb2f41..6f5d1de5c87 100644
--- a/htdocs/adherents/admin/public.php
+++ b/htdocs/adherents/admin/public.php
@@ -60,11 +60,11 @@ if ($action == 'update')
 
  	if (! $error)
     {
-	    setEventMessage($langs->trans("SetupSaved"));
+	    setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
     }
     else
     {
-	    setEventMessage($langs->trans("Error"), 'errors');
+	    setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
 
diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php
index 355aedb3e68..f998c2f08a3 100644
--- a/htdocs/adherents/card.php
+++ b/htdocs/adherents/card.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2004-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2012      Marcos García        <marcosgdf@gmail.com>
- * Copyright (C) 2012-2013 Philippe Grand       <philippe.grand@atoo-net.com>
+ * Copyright (C) 2012-2015 Philippe Grand       <philippe.grand@atoo-net.com>
  * Copyright (C) 2015      Alexandre Spangaro   <aspangaro.dolibarr@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -133,7 +133,7 @@ if (empty($reshook))
 			if ($userid != $user->id && $userid != $object->user_id)
 			{
 				$error++;
-				setEventMessage($langs->trans("ErrorUserPermissionAllowsToLinksToItselfOnly"), 'errors');
+				setEventMessages($langs->trans("ErrorUserPermissionAllowsToLinksToItselfOnly"), null, 'errors');
 			}
 		}
 
@@ -169,7 +169,7 @@ if (empty($reshook))
 						$thirdparty=new Societe($db);
 						$thirdparty->fetch($socid);
 						$error++;
-						setEventMessage($langs->trans("ErrorMemberIsAlreadyLinkedToThisThirdParty",$othermember->getFullName($langs),$othermember->login,$thirdparty->name), 'errors');
+						setEventMessages($langs->trans("ErrorMemberIsAlreadyLinkedToThisThirdParty",$othermember->getFullName($langs),$othermember->login,$thirdparty->name), null, 'errors');
 					}
 				}
 
@@ -195,12 +195,12 @@ if (empty($reshook))
 			if ($result < 0)
 			{
 				$langs->load("errors");
-				setEventMessage($langs->trans($nuser->error), 'errors');
+				setEventMessages($langs->trans($nuser->error), null, 'errors');
 			}
 		}
 		else
 		{
-			setEventMessage($object->error, 'errors');
+			setEventMessages($object->errors, $object->error, 'errors');
 		}
 	}
 
@@ -216,13 +216,13 @@ if (empty($reshook))
 			if ($result < 0)
 			{
 				$langs->load("errors");
-				setEventMessage($langs->trans($company->error), 'errors');
-				setEventMessage($company->errors, 'errors');
+				setEventMessages($langs->trans($company->error), null, 'errors');
+				setEventMessages($company->error, $company->errors, 'errors');
 			}
 		}
 		else
 		{
-			setEventMessage($object->error, 'errors');
+			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
 
@@ -236,7 +236,7 @@ if (empty($reshook))
 			$result=$object->send_an_email($langs->transnoentitiesnoconv("ThisIsContentOfYourCard")."\n\n%INFOS%\n\n",$langs->transnoentitiesnoconv("CardContent"));
 
 			$langs->load("mails");
-			setEventMessage($langs->trans("MailSuccessfulySent", $from, $object->email));
+			setEventMessages($langs->trans("MailSuccessfulySent", $from, $object->email), null, 'mesgs');
 		}
 	}
 
@@ -352,7 +352,7 @@ if (empty($reshook))
 							$newfile=$dir.'/'.dol_sanitizeFileName($_FILES['photo']['name']);
 							if (! dol_move_uploaded_file($_FILES['photo']['tmp_name'],$newfile,1,0,$_FILES['photo']['error']) > 0)
 							{
-								setEventMessage($langs->trans("ErrorFailedToSaveFile"), 'errors');
+								setEventMessages($langs->trans("ErrorFailedToSaveFile"), null, 'errors');
 							}
 							else
 							{
@@ -368,7 +368,7 @@ if (empty($reshook))
 					}
 					else
 					{
-						setEventMessage("ErrorBadImageFormat", 'errors');
+						setEventMessages("ErrorBadImageFormat", null, 'errors');
 					}
 				}
 				else
@@ -397,9 +397,9 @@ if (empty($reshook))
 			else
 			{
 				if ($object->error) {
-					setEventMessage($object->error, 'errors');
+					setEventMessages($object->error, $object->errors, 'errors');
 				} else {
-					setEventMessage($object->errors, 'errors');
+					setEventMessages($object->error, $object->errors, 'errors');
 				}
 				$action='';
 			}
@@ -503,7 +503,7 @@ if (empty($reshook))
 				if ($num) {
 					$error++;
 					$langs->load("errors");
-					setEventMessage($langs->trans("ErrorLoginAlreadyExists",$login), 'errors');
+					setEventMessages($langs->trans("ErrorLoginAlreadyExists",$login), null, 'errors');
 				}
 			}
 			if (empty($pass)) {
@@ -528,7 +528,7 @@ if (empty($reshook))
 		if ($conf->global->ADHERENT_MAIL_REQUIRED && ! isValidEMail($email)) {
 			$error++;
 			$langs->load("errors");
-			setEventMessage($langs->trans("ErrorBadEMail",$email), 'errors');
+			setEventMessages($langs->trans("ErrorBadEMail",$email), null, 'errors');
 		}
 		$public=0;
 		if (isset($public)) $public=1;
@@ -554,9 +554,9 @@ if (empty($reshook))
 				$db->rollback();
 
 				if ($object->error) {
-					setEventMessage($object->error, 'errors');
+					setEventMessages($object->error, $object->errors, 'errors');
 				} else {
-					setEventMessage($object->errors, 'errors');
+					setEventMessages($object->error, $object->errors, 'errors');
 				}
 
 				$action = 'create';
@@ -609,7 +609,7 @@ if (empty($reshook))
 				if ($result < 0)
 				{
 					$error++;
-					setEventMessage($object->error, 'errors');
+					setEventMessages($object->error, $object->errors, 'errors');
 				}
 			}
 		}
@@ -617,9 +617,9 @@ if (empty($reshook))
 		{
 			$error++;
 			if ($object->error) {
-				setEventMessage($object->error, 'errors');
+				setEventMessages($object->error, $object->errors, 'errors');
 			} else {
-				setEventMessage($object->errors, 'errors');
+				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
 
@@ -654,7 +654,7 @@ if (empty($reshook))
 				if ($result < 0)
 				{
 					$error++;
-					setEventMessage($object->error, 'errors');
+					setEventMessages($object->error, $object->errors, 'errors');
 				}
 			}
 			else
@@ -662,9 +662,9 @@ if (empty($reshook))
 				$error++;
 
 				if ($object->error) {
-					setEventMessage($object->error, 'errors');
+					setEventMessages($object->error, $object->errors, 'errors');
 				} else {
-					setEventMessage($object->errors, 'errors');
+					setEventMessages($object->error, $object->errors, 'errors');
 				}
 				$action='';
 			}
@@ -683,7 +683,7 @@ if (empty($reshook))
 		{
 			if (!$mailmanspip->del_to_spip($object))
 			{
-				setEventMessage($langs->trans('DeleteIntoSpipError').': '.$mailmanspip->error, 'errors');
+				setEventMessages($langs->trans('DeleteIntoSpipError').': '.$mailmanspip->error, null, 'errors');
 			}
 		}
 	}
@@ -694,7 +694,7 @@ if (empty($reshook))
 		{
 			if (!$mailmanspip->add_to_spip($object))
 			{
-				setEventMessage($langs->trans('AddIntoSpipError').': '.$mailmanspip->error, 'errors');
+				setEventMessages($langs->trans('AddIntoSpipError').': '.$mailmanspip->error, null, 'errors');
 			}
 		}
 	}
diff --git a/htdocs/adherents/card_subscriptions.php b/htdocs/adherents/card_subscriptions.php
index fa440c3bac4..9d86f618618 100644
--- a/htdocs/adherents/card_subscriptions.php
+++ b/htdocs/adherents/card_subscriptions.php
@@ -110,7 +110,7 @@ if ($action == 'confirm_create_thirdparty' && $confirm == 'yes' && $user->rights
 		{
 			$langs->load("errors");
 			$errmsg=$langs->trans($company->error);
-			setEventMessage($company->errors, 'errors');
+			setEventMessages($company->error, $company->errors, 'errors');
 		}
 		else
 		{
@@ -131,7 +131,7 @@ if ($action == 'setuserid' && ($user->rights->user->self->creer || $user->rights
         if ($_POST["userid"] != $user->id && $_POST["userid"] != $object->user_id)
         {
             $error++;
-            setEventMessage($langs->trans("ErrorUserPermissionAllowsToLinksToItselfOnly"), 'errors');
+            setEventMessages($langs->trans("ErrorUserPermissionAllowsToLinksToItselfOnly"), null, 'errors');
         }
     }
 
@@ -167,7 +167,7 @@ if ($action == 'setsocid')
                     $thirdparty=new Societe($db);
                     $thirdparty->fetch(GETPOST('socid','int'));
                     $error++;
-	                setEventMessage($langs->trans("ErrorMemberIsAlreadyLinkedToThisThirdParty",$othermember->getFullName($langs),$othermember->login,$thirdparty->name), 'errors');
+	                setEventMessages($langs->trans("ErrorMemberIsAlreadyLinkedToThisThirdParty",$othermember->getFullName($langs),$othermember->login,$thirdparty->name), null, 'errors');
                 }
             }
 
diff --git a/htdocs/adherents/ldap.php b/htdocs/adherents/ldap.php
index a2848b655b3..4d9a779d579 100644
--- a/htdocs/adherents/ldap.php
+++ b/htdocs/adherents/ldap.php
@@ -72,12 +72,12 @@ if ($action == 'dolibarr2ldap')
 
 	if ($result >= 0)
 	{
-		setEventMessage($langs->trans("MemberSynchronized"));
+		setEventMessages($langs->trans("MemberSynchronized"), null, 'mesgs');
 		$db->commit();
 	}
 	else
 	{
-		setEventMessage($ldap->error, 'errors');
+		setEventMessages($ldap->errors, $ldap->error, 'errors');
 		$db->rollback();
 	}
 }
diff --git a/htdocs/admin/agenda.php b/htdocs/admin/agenda.php
index 287f2a897eb..c11cbeff3a4 100644
--- a/htdocs/admin/agenda.php
+++ b/htdocs/admin/agenda.php
@@ -86,12 +86,12 @@ if ($action == "save" && empty($cancel))
 
  	if (! $error)
     {
-        setEventMessage($langs->trans("SetupSaved"));
+        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
         $db->commit();
     }
     else
     {
-        setEventMessage($langs->trans("Error"),'errors');
+        setEventMessages($langs->trans("Error"),null, 'errors');
         $db->rollback();
     }
 }
diff --git a/htdocs/admin/agenda_extsites.php b/htdocs/admin/agenda_extsites.php
index 9356674921e..755d1eb23f9 100644
--- a/htdocs/admin/agenda_extsites.php
+++ b/htdocs/admin/agenda_extsites.php
@@ -72,7 +72,7 @@ if ($actionsave)
 
 		if (! empty($src) && ! dol_is_url($src))
 		{
-			setEventMessage($langs->trans("ErrorParamMustBeAnUrl"),'errors');
+			setEventMessages($langs->trans("ErrorParamMustBeAnUrl"), null, 'errors');
 			$error++;
 			$errorsaved++;
 			break;
@@ -104,12 +104,12 @@ if ($actionsave)
     if (! $error)
     {
         $db->commit();
-        setEventMessage($langs->trans("SetupSaved"));
+        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
     }
     else
     {
         $db->rollback();
-        if (empty($errorsaved))	setEventMessage($langs->trans("Error"),'errors');
+        if (empty($errorsaved))	setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
 
diff --git a/htdocs/admin/agenda_xcal.php b/htdocs/admin/agenda_xcal.php
index dfdac2a8f0f..cd2406e6fdc 100644
--- a/htdocs/admin/agenda_xcal.php
+++ b/htdocs/admin/agenda_xcal.php
@@ -54,12 +54,12 @@ if ($actionsave)
     if ($i >= 4)
     {
         $db->commit();
-        setEventMessage($langs->trans("SetupSaved"));
+        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
     }
     else
     {
         $db->rollback();
-        setEventMessage($langs->trans("SaveFailed"), 'errors');
+        setEventMessages($langs->trans("SaveFailed"), null, 'errors');
     }
 }
 
diff --git a/htdocs/admin/askpricesupplier.php b/htdocs/admin/askpricesupplier.php
index 9bde4673ace..9afcd1a8f62 100644
--- a/htdocs/admin/askpricesupplier.php
+++ b/htdocs/admin/askpricesupplier.php
@@ -6,8 +6,8 @@
  * Copyright (C) 2004      Eric Seigne                 <eric.seigne@ryxeo.com>
  * Copyright (C) 2005-2012 Regis Houssin               <regis.houssin@capnetworks.com>
  * Copyright (C) 2008      Raphael Bertrand (Resultic) <raphael.bertrand@resultic.fr>
- * Copyright (C) 2011-2013 Juanjo Menent                <jmenent@2byte.es>
- * Copyright (C) 2015       Jean-François Ferry		<jfefe@aternatik.fr>
+ * Copyright (C) 2011-2013 Juanjo Menent               <jmenent@2byte.es>
+ * Copyright (C) 2015      Jean-François Ferry		   <jfefe@aternatik.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -54,11 +54,11 @@ if ($action == 'updateMask')
 
  	if (! $error)
 	{
-		setEventMessage($langs->trans("SetupSaved"));
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	}
 	else
 	{
-		setEventMessage($langs->trans("Error"),'errors');
+		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
 
@@ -96,13 +96,13 @@ if ($action == 'specimen')
 		}
 		else
 		{
-			setEventMessage($module->error,'errors');
+			setEventMessages($module->error, null, 'errors');
 			dol_syslog($module->error, LOG_ERR);
 		}
 	}
 	else
 	{
-		setEventMessage($langs->trans("ErrorModuleNotFound"),'errors');
+		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
 		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 	}
 }
@@ -116,11 +116,11 @@ if ($action == 'set_ASKPRICESUPPLIER_DRAFT_WATERMARK')
 
  	if (! $error)
 	{
-		setEventMessage($langs->trans("SetupSaved"));
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	}
 	else
 	{
-		setEventMessage($langs->trans("Error"),'errors');
+		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
 
@@ -134,11 +134,11 @@ if ($action == 'set_ASKPRICESUPPLIER_FREE_TEXT')
 
  	if (! $error)
 	{
-		setEventMessage($langs->trans("SetupSaved"));
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	}
 	else
 	{
-		setEventMessage($langs->trans("Error"),'errors');
+		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
 
@@ -150,11 +150,11 @@ if ($action == 'set_BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER')
 
     if (! $error)
     {
-        setEventMessage($langs->trans("SetupSaved"));
+        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
     }
     else
     {
-        setEventMessage($langs->trans("Error"),'errors');
+        setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
 
@@ -178,12 +178,12 @@ if ($action == 'setModuleOptions')
 	if (! $error)
 	{
 		$db->commit();
-		setEventMessage($langs->trans("SetupSaved"));
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	}
 	else
 	{
 		$db->rollback();
-		setEventMessage($langs->trans("Error"),'errors');
+		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
 
diff --git a/htdocs/admin/bank.php b/htdocs/admin/bank.php
index 8214755fd2b..048e351044d 100644
--- a/htdocs/admin/bank.php
+++ b/htdocs/admin/bank.php
@@ -56,11 +56,11 @@ if ($action == 'set_BANK_CHEQUERECEIPT_FREE_TEXT')
 
  	if (! $error)
     {
-        setEventMessage($langs->trans("SetupSaved"));
+        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
     }
     else
     {
-        setEventMessage($langs->trans("Error"),'errors');
+        setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
 
diff --git a/htdocs/admin/barcode.php b/htdocs/admin/barcode.php
index b36a222c165..0a57508c271 100644
--- a/htdocs/admin/barcode.php
+++ b/htdocs/admin/barcode.php
@@ -97,11 +97,11 @@ if ($action == 'setModuleOptions')
 
  	if (! $error)
     {
-        setEventMessage($langs->trans("SetupSaved"));
+        setEventMessages($langs->trans("SetupSaved"), null, 'msgs');
     }
     else
     {
-        setEventMessage($langs->trans("Error"),'errors');
+        setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
 
@@ -111,11 +111,11 @@ if ($action && $action != 'setcoder' && $action != 'setModuleOptions')
 
  	if (! $error)
     {
-        setEventMessage($langs->trans("SetupSaved"));
+        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
     }
     else
     {
-        setEventMessage($langs->trans("Error"),'errors');
+        setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
 
diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php
index 6b1eb71fafe..5b6d64801b5 100644
--- a/htdocs/admin/boxes.php
+++ b/htdocs/admin/boxes.php
@@ -85,7 +85,7 @@ if ($action == 'add') {
                     }
                     else
                     {
-                        setEventMessage($db->lasterror(), 'errors');
+                        setEventMessages($db->lasterror(), null, 'errors');
                         $error++;
                     }
                 }
@@ -121,7 +121,7 @@ if ($action == 'add') {
                         $resql = $db->query($sql);
                         if (! $resql)
                         {
-                            setEventMessage($db->lasterror(), 'errors');
+                            setEventMessages($db->lasterror(), null, 'errors');
                             $error++;
                         }
                     }
diff --git a/htdocs/admin/clicktodial.php b/htdocs/admin/clicktodial.php
index 1550c0ebef7..260a9514375 100644
--- a/htdocs/admin/clicktodial.php
+++ b/htdocs/admin/clicktodial.php
@@ -41,11 +41,11 @@ if ($action == 'setvalue' && $user->admin)
     $result=dolibarr_set_const($db, "CLICKTODIAL_URL", GETPOST("url"), 'chaine', 0, '', $conf->entity);
     if ($result >= 0)
     {
-		setEventMessage($langs->trans("SetupSaved"));
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
     }
     else
     {
-        setEventMessage($langs->trans("Error"),'errors');
+        setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
 
diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php
index f7e3812d74f..9e55369dac9 100644
--- a/htdocs/admin/commande.php
+++ b/htdocs/admin/commande.php
@@ -7,7 +7,7 @@
  * Copyright (C) 2005-2014 Regis Houssin                <regis.houssin@capnetworks.com>
  * Copyright (C) 2008 	   Raphael Bertrand (Resultic)  <raphael.bertrand@resultic.fr>
  * Copyright (C) 2011-2013 Juanjo Menent			    <jmenent@2byte.es>
- * Copyright (C) 2011-2013 Philippe Grand			    <philippe.grand@atoo-net.com>
+ * Copyright (C) 2011-2015 Philippe Grand			    <philippe.grand@atoo-net.com>
  * Copyright (C) 2013 	   Florian Henry			    <florian.henry@open-concept.pro>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -64,11 +64,11 @@ if ($action == 'updateMask')
 
  	if (! $error)
     {
-        setEventMessage($langs->trans("SetupSaved"));
+        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
     }
     else
     {
-        setEventMessage($langs->trans("Error"),'errors');
+        setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
 
@@ -106,13 +106,13 @@ else if ($action == 'specimen')
 		}
 		else
 		{
-			setEventMessage($module->error,'errors');
+			setEventMessages($module->error, null, 'errors');
 			dol_syslog($module->error, LOG_ERR);
 		}
 	}
 	else
 	{
-		setEventMessage($langs->trans("ErrorModuleNotFound"),'errors');
+		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
 		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 	}
 }
@@ -137,12 +137,12 @@ if ($action == 'setModuleOptions')
 	if (! $error)
 	{
 		$db->commit();
-		setEventMessage($langs->trans("SetupSaved"));
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	}
 	else
 	{
 		$db->rollback();
-		setEventMessage($langs->trans("Error"),'errors');
+		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
 
@@ -196,11 +196,11 @@ else if ($action == 'set_COMMANDE_DRAFT_WATERMARK')
 
  	if (! $error)
     {
-        setEventMessage($langs->trans("SetupSaved"));
+        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
     }
     else
     {
-        setEventMessage($langs->trans("Error"),'errors');
+        setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
 
@@ -214,11 +214,11 @@ else if ($action == 'set_ORDER_FREE_TEXT')
 
  	if (! $error)
     {
-        setEventMessage($langs->trans("SetupSaved"));
+        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
     }
     else
     {
-        setEventMessage($langs->trans("Error"),'errors');
+        setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
 
@@ -228,9 +228,9 @@ else if ($action=="setshippableiconinlist") {
     $res = dolibarr_set_const($db, "SHIPPABLE_ORDER_ICON_IN_LIST", $setshippableiconinlist,'yesno',0,'',$conf->entity);
     if (! $res > 0) $error++;
     if (! $error) {
-        setEventMessage($langs->trans("SetupSaved"));
+        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
     } else {
-        setEventMessage($langs->trans("Error"), 'errors');
+        setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
 
@@ -243,11 +243,11 @@ else if ($action == 'set_BANK_ASK_PAYMENT_BANK_DURING_ORDER')
 
     if (! $error)
     {
-        setEventMessage($langs->trans("SetupSaved"));
+        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
     }
     else
     {
-        setEventMessage($langs->trans("Error"),'errors');
+        setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
 
@@ -260,11 +260,11 @@ else if ($action == 'set_WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER')
 
     if (! $error)
     {
-        setEventMessage($langs->trans("SetupSaved"));
+        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
     }
     else
     {
-        setEventMessage($langs->trans("Error"),'errors');
+        setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
 
diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php
index b9660c8a04d..e84bdf2a3fa 100644
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2004-2013	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@capnetworks.com>
  * Copyright (C) 2010-2014	Juanjo Menent			<jmenent@2byte.es>
- * Copyright (C) 2011		Philippe Grand			<philippe.grand@atoo-net.com>
+ * Copyright (C) 2011-2015	Philippe Grand			<philippe.grand@atoo-net.com>
  * Copyright (C) 2015       Alexandre Spangaro      <aspangaro.dolibarr@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -125,19 +125,19 @@ if ( ($action == 'update' && empty($_POST["cancel"]))
 					$error++;
 					$langs->load("errors");
 					$tmparray=explode(':',$result);
-					setEventMessage($langs->trans('ErrorFileIsInfectedWithAVirus',$tmparray[1]),'errors');
+					setEventMessages($langs->trans('ErrorFileIsInfectedWithAVirus',$tmparray[1]), null, 'errors');
 				}
 				else
 				{
 					$error++;
-					setEventMessage($langs->trans("ErrorFailedToSaveFile"),'errors');
+					setEventMessages($langs->trans("ErrorFailedToSaveFile"), null, 'errors');
 				}
 			}
 			else
 			{
 				$error++;
 				$langs->load("errors");
-				setEventMessage($langs->trans("ErrorBadImageFormat"),'errors');
+				setEventMessages($langs->trans("ErrorBadImageFormat"), null, 'errors');
 			}
 		}
 	}
@@ -230,7 +230,7 @@ if ($action == 'addthumb')
 		{
 			$error++;
 			$langs->load("errors");
-			setEventMessage($langs->trans("ErrorBadImageFormat"),'errors');
+			setEventMessages($langs->trans("ErrorBadImageFormat"), null, 'errors');
 			dol_syslog($langs->transnoentities("ErrorBadImageFormat"),LOG_WARNING);
 		}
 	}
@@ -238,7 +238,7 @@ if ($action == 'addthumb')
 	{
 		$error++;
 		$langs->load("errors");
-		setEventMessage($langs->trans("ErrorFileDoesNotExists",$_GET["file"]),'errors');
+		setEventMessages($langs->trans("ErrorFileDoesNotExists",$_GET["file"]), null, 'errors');
 		dol_syslog($langs->transnoentities("ErrorFileDoesNotExists",$_GET["file"]),LOG_WARNING);
 	}
 }
diff --git a/htdocs/admin/compta.php b/htdocs/admin/compta.php
index 633f88b9cfb..38ba28e9fa4 100644
--- a/htdocs/admin/compta.php
+++ b/htdocs/admin/compta.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2011-2013 Juanjo Menent	    <jmenent@2byte.es>
- * Copyright (C) 2013      Philippe Grand	    <philippe.grand@atoo-net.com>
+ * Copyright (C) 2013-2015 Philippe Grand	    <philippe.grand@atoo-net.com>
  * Copyright (C) 2014      Marcos García        <marcosgdf@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -87,11 +87,11 @@ if ($action == 'update')
 
     if (! $error)
     {
-        setEventMessage($langs->trans("SetupSaved"));
+        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
     }
     else
     {
-        setEventMessage($langs->trans("Error"),'errors');
+        setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
 
diff --git a/htdocs/admin/const.php b/htdocs/admin/const.php
index 62f6bbaaf2c..06e3279fa54 100644
--- a/htdocs/admin/const.php
+++ b/htdocs/admin/const.php
@@ -68,7 +68,7 @@ if ($action == 'add' || (GETPOST('add') && $action != 'update'))
 	{
 		if (dolibarr_set_const($db, $constname, $constvalue, 'chaine', 1, $constnote, $entity) >= 0)
 		{
-			setEventMessage($langs->trans("RecordSaved"));
+			setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
 			$action="";
 			$constname="";
 			$constvalue="";
@@ -99,7 +99,7 @@ if (! empty($consts) && $action == 'update')
 			}
 		}
 	}
-	if ($nbmodified > 0) setEventMessage($langs->trans("RecordSaved"));
+	if ($nbmodified > 0) setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
 	$action='';
 }
 
@@ -122,7 +122,7 @@ if (! empty($consts) && $action == 'delete')
 			}
 		}
 	}
-	if ($nbdeleted > 0) setEventMessage($langs->trans("RecordDeleted"));
+	if ($nbdeleted > 0) setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
 	$action='';
 }
 
@@ -131,7 +131,7 @@ if ($action == 'delete')
 {
 	if (dolibarr_del_const($db, $rowid, $entity) >= 0)
 	{
-		setEventMessage($langs->trans("RecordDeleted"));
+		setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
 	}
 	else
 	{
diff --git a/htdocs/admin/contract.php b/htdocs/admin/contract.php
index a45045a5381..3198ad51448 100644
--- a/htdocs/admin/contract.php
+++ b/htdocs/admin/contract.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2011-2013      Juanjo Menent	    <jmenent@2byte.es>
- * Copyright (C) 2011-2014      Philippe Grand	    <philippe.grand@atoo-net.com>
+ * Copyright (C) 2011-2015      Philippe Grand	    <philippe.grand@atoo-net.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -59,11 +59,11 @@ if ($action == 'updateMask')
 
  	if (! $error)
     {
-        setEventMessage($langs->trans("SetupSaved"));
+        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
     }
     else
     {
-        setEventMessage($langs->trans("Error"),'errors');
+        setEventMessage($langs->trans("Error"), null, 'errors');
     }
 }
 
@@ -101,13 +101,13 @@ else if ($action == 'specimen') // For contract
 		}
 		else
 		{
-			setEventMessage($obj->error,'errors');
+			setEventMessages($obj->error, $obj->errors, 'errors');
 			dol_syslog($obj->error, LOG_ERR);
 		}
 	}
 	else
 	{
-		setEventMessage($langs->trans("ErrorModuleNotFound"),'errors');
+		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
 		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 	}
 }
@@ -132,12 +132,12 @@ if ($action == 'setModuleOptions')
 	if (! $error)
 	{
 		$db->commit();
-		setEventMessage($langs->trans("SetupSaved"));
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	}
 	else
 	{
 		$db->rollback();
-        setEventMessage($langs->trans("Error"),'errors');
+        setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
 
@@ -194,11 +194,11 @@ else if ($action == 'set_other')
 
  	if (! $error)
     {
-        setEventMessage($langs->trans("SetupSaved"));
+        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
     }
     else
     {
-        setEventMessage($langs->trans("Error"),'errors');
+        setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
 
diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 40b4676ba25..817019cc24b 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2004      Benoit Mortier       <benoit.mortier@opensides.be>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2010-2013 Juanjo Menent        <jmenent@2byte.es>
- * Copyright (C) 2011      Philippe Grand       <philippe.grand@atoo-net.com>
+ * Copyright (C) 2011-2015 Philippe Grand       <philippe.grand@atoo-net.com>
  * Copyright (C) 2011      Remy Younes          <ryounes@gmail.com>
  * Copyright (C) 2012-2015 Marcos García        <marcosgdf@gmail.com>
  * Copyright (C) 2012      Christophe Battarel	<christophe.battarel@ltairis.fr>
@@ -548,20 +548,20 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
             if ($fieldnamekey == 'deductible') $fieldnamekey = 'Deductible';
             if ($fieldnamekey == 'sortorder') $fieldnamekey = 'SortOrder';
 
-            setEventMessage($langs->transnoentities("ErrorFieldRequired", $langs->transnoentities($fieldnamekey)),'errors');
+            setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->transnoentities($fieldnamekey)), null, 'errors');
         }
     }
     // Other checks
     if ($tabname[$id] == MAIN_DB_PREFIX."c_actioncomm" && isset($_POST["type"]) && in_array($_POST["type"],array('system','systemauto'))) {
         $ok=0;
-        setEventMessage($langs->transnoentities('ErrorReservedTypeSystemSystemAuto'),'errors');
+        setEventMessages($langs->transnoentities('ErrorReservedTypeSystemSystemAuto'), null, 'errors');
     }
     if (isset($_POST["code"]))
     {
     	if ($_POST["code"]=='0')
     	{
         	$ok=0;
-    		setEventMessage($langs->transnoentities('ErrorCodeCantContainZero'),'errors');
+    		setEventMessages($langs->transnoentities('ErrorCodeCantContainZero'), null, 'errors');
         }
         /*if (!is_numeric($_POST['code']))	// disabled, code may not be in numeric base
     	{
@@ -578,7 +578,7 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
     	else
     	{
         	$ok=0;
-        	setEventMessage($langs->transnoentities("ErrorFieldRequired",$langs->transnoentities("Country")),'errors');
+        	setEventMessages($langs->transnoentities("ErrorFieldRequired",$langs->transnoentities("Country")), null, 'errors');
     	}
     }
 
@@ -637,13 +637,13 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
         $result = $db->query($sql);
         if ($result)	// Add is ok
         {
-            setEventMessage($langs->transnoentities("RecordSaved"));
+            setEventMessages($langs->transnoentities("RecordSaved"), null, 'mesgs');
         	$_POST=array('id'=>$id);	// Clean $_POST array, we keep only
         }
         else
         {
             if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
-                setEventMessage($langs->transnoentities("ErrorRecordAlreadyExists"),'errors');
+                setEventMessages($langs->transnoentities("ErrorRecordAlreadyExists"), null, 'errors');
             }
             else {
                 dol_print_error($db);
@@ -687,7 +687,7 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
         $resql = $db->query($sql);
         if (! $resql)
         {
-            setEventMessage($db->error(),'errors');
+            setEventMessage($db->error(), 'errors');
         }
     }
     //$_GET["id"]=GETPOST('id', 'int');       // Force affichage dictionnaire en cours d'edition
@@ -711,7 +711,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes')       // delete
     {
         if ($db->errno() == 'DB_ERROR_CHILD_EXISTS')
         {
-            setEventMessage($langs->transnoentities("ErrorRecordIsUsedByChild"),'errors');
+            setEventMessages($langs->transnoentities("ErrorRecordIsUsedByChild"), null, 'errors');
         }
         else
         {
diff --git a/htdocs/admin/menus/edit.php b/htdocs/admin/menus/edit.php
index 7c60a2ee055..b7f4b8d5b73 100644
--- a/htdocs/admin/menus/edit.php
+++ b/htdocs/admin/menus/edit.php
@@ -78,16 +78,16 @@ if ($action == 'update')
             $result=$menu->update($user);
             if ($result > 0)
             {
-	            setEventMessage($langs->trans("RecordModifiedSuccessfully"));
+	            setEventMessages($langs->trans("RecordModifiedSuccessfully"), null, 'mesgs');
             }
             else
             {
-	            setEventMessage($menu->error, 'errors');
+	            setEventMessages($menu->error, $menu->errors, 'errors');
             }
         }
         else
         {
-	        setEventMessage($menu->error, 'errors');
+	        setEventMessages($menu->error, $menu->errors, 'errors');
         }
         $_GET["menuId"] = $_POST['menuId'];
         $action = "edit";
@@ -159,13 +159,13 @@ if ($action == 'add')
     }
     if (! $error && $_POST['menuId'] && $_POST['type'] == 'top')
     {
-	    setEventMessage($langs->trans("ErrorTopMenuMustHaveAParentWithId0"), 'errors');
+	    setEventMessages($langs->trans("ErrorTopMenuMustHaveAParentWithId0"), null, 'errors');
         $action = 'create';
         $error++;
     }
     if (! $error && empty($_POST['menuId']) && $_POST['type'] == 'left')
     {
-	    setEventMessage($langs->trans("ErrorLeftMenuMustHaveAParentId"), 'errors');
+	    setEventMessages($langs->trans("ErrorLeftMenuMustHaveAParentId"), null, 'errors');
         $action = 'create';
         $error++;
     }
@@ -204,7 +204,7 @@ if ($action == 'add')
         else
         {
             $action = 'create';
-	        setEventMessage($menu->error, 'errors');
+	        setEventMessages($menu->error, $menu->errors, 'errors');
         }
     }
 }
@@ -222,7 +222,7 @@ if ($action == 'confirm_delete' && $_POST["confirm"] == 'yes')
         $this->db->commit();
 
         llxHeader();
-	    setEventMessage($langs->trans("MenuDeleted"));
+	    setEventMessages($langs->trans("MenuDeleted"), null, 'mesgs');
         llxFooter();
         exit ;
     }
diff --git a/htdocs/admin/menus/index.php b/htdocs/admin/menus/index.php
index c8699209268..7da0673b196 100644
--- a/htdocs/admin/menus/index.php
+++ b/htdocs/admin/menus/index.php
@@ -186,7 +186,7 @@ elseif ($action == 'confirm_delete' && $confirm == 'yes')
 	{
 		$db->commit();
 
-		setEventMessage($langs->trans("MenuDeleted"));
+		setEventMessages($langs->trans("MenuDeleted"), null, 'mesgs');
 
 		header("Location: ".DOL_URL_ROOT.'/admin/menus/index.php?menu_handler='.$menu_handler);
 		exit ;
@@ -359,7 +359,7 @@ if ($conf->use_javascript_ajax)
 else
 {
 	$langs->load("errors");
-	setEventMessage($langs->trans("ErrorFeatureNeedJavascript"), 'errors');
+	setEventMessages($langs->trans("ErrorFeatureNeedJavascript"), null, 'errors');
 }
 
 print '<br>';
diff --git a/htdocs/admin/tools/dolibarr_export.php b/htdocs/admin/tools/dolibarr_export.php
index a460f667e2a..49d229898b8 100644
--- a/htdocs/admin/tools/dolibarr_export.php
+++ b/htdocs/admin/tools/dolibarr_export.php
@@ -52,8 +52,8 @@ if ($action == 'delete')
 {
 	$file=$conf->admin->dir_output.'/'.GETPOST('urlfile');
     $ret=dol_delete_file($file, 1);
-    if ($ret) setEventMessage($langs->trans("FileWasRemoved", GETPOST('urlfile')));
-    else setEventMessage($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), 'errors');
+    if ($ret) setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs');
+    else setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), null, 'errors');
     $action='';
 }
 
diff --git a/htdocs/admin/tools/export.php b/htdocs/admin/tools/export.php
index 500c766ed77..cddd42a8623 100644
--- a/htdocs/admin/tools/export.php
+++ b/htdocs/admin/tools/export.php
@@ -60,8 +60,8 @@ if ($action == 'delete')
 {
 	$file=$conf->admin->dir_output.'/'.GETPOST('urlfile');
 	$ret=dol_delete_file($file, 1);
-	if ($ret) setEventMessage($langs->trans("FileWasRemoved", GETPOST('urlfile')));
-	else setEventMessage($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), 'errors');
+	if ($ret) setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs');
+	else setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), null, 'errors');
 	$action='';
 }
 
@@ -357,7 +357,7 @@ if ($what == 'postgresql')
 //{
     if ($errormsg)
     {
-    	setEventMessage($langs->trans("Error")." : ".$errormsg, 'errors');
+    	setEventMessages($langs->trans("Error")." : ".$errormsg, null, 'errors');
 
     	$resultstring='';
         $resultstring.='<div class="error">'.$langs->trans("Error")." : ".$errormsg.'</div>';
@@ -368,7 +368,7 @@ if ($what == 'postgresql')
 	{
 		if ($what)
 		{
-	        setEventMessage($langs->trans("BackupFileSuccessfullyCreated").'.<br>'.$langs->trans("YouCanDownloadBackupFile"));
+	        setEventMessages($langs->trans("BackupFileSuccessfullyCreated").'.<br>'.$langs->trans("YouCanDownloadBackupFile"), null, 'mesgs');
 
 	        $resultstring='<div class="ok">';
 	        $resultstring.=$langs->trans("BackupFileSuccessfullyCreated").'.<br>';
@@ -379,7 +379,7 @@ if ($what == 'postgresql')
 		}
 		else
 		{
-			setEventMessage($langs->trans("YouMustRunCommandFromCommandLineAfterLoginToUser",$dolibarr_main_db_user,$dolibarr_main_db_user));
+			setEventMessages($langs->trans("YouMustRunCommandFromCommandLineAfterLoginToUser",$dolibarr_main_db_user,$dolibarr_main_db_user), null, 'mesgs');
 		}
     }
 //}
diff --git a/htdocs/admin/tools/update.php b/htdocs/admin/tools/update.php
index 54a6cab9cbd..e1166e96c3d 100644
--- a/htdocs/admin/tools/update.php
+++ b/htdocs/admin/tools/update.php
@@ -34,7 +34,7 @@ $action=GETPOST('action','alpha');
 if (! $user->admin) accessforbidden();
 
 if (GETPOST('msg','alpha')) {
-	setEventMessage(GETPOST('msg','alpha'), 'errors');
+	setEventMessages(GETPOST('msg','alpha'), null, 'errors');
 }
 
 
@@ -63,7 +63,7 @@ if ($action=='install')
 	if (! $original_file)
 	{
 		$langs->load("Error");
-		setEventMessage($langs->trans("ErrorFileRequired"), 'warnings');
+		setEventMessages($langs->trans("ErrorFileRequired"), null, 'warnings');
 		$error++;
 	}
 	else
@@ -71,7 +71,7 @@ if ($action=='install')
 		if (! preg_match('/\.zip/i',$original_file))
 		{
 			$langs->load("errors");
-			setEventMessage($langs->trans("ErrorFileMustBeADolibarrPackage",$original_file), 'errors');
+			setEventMessages($langs->trans("ErrorFileMustBeADolibarrPackage",$original_file), null, 'errors');
 			$error++;
 		}
 	}
@@ -99,7 +99,7 @@ if ($action=='install')
 			if (! empty($result['error']))
 			{
 				$langs->load("errors");
-				setEventMessage($langs->trans($result['error'],$original_file), 'errors');
+				setEventMessages($langs->trans($result['error'],$original_file), null, 'errors');
 				$error++;
 			}
 			else
@@ -116,7 +116,7 @@ if ($action=='install')
 					//var_dump($modulenamedir);
 					if (! dol_is_dir($modulenamedir))
 					{
-						setEventMessage($langs->trans("ErrorModuleFileSeemsToHaveAWrongFormat"), 'errors');
+						setEventMessages($langs->trans("ErrorModuleFileSeemsToHaveAWrongFormat"), null, 'errors');
 						$error++;
 					}
 				}
@@ -128,7 +128,7 @@ if ($action=='install')
 					$result=dolCopyDir($modulenamedir, $dirins.'/'.$modulename, '0444', 1);
 					if ($result <= 0)
 					{
-						setEventMessage($langs->trans("ErrorFailedToCopy"), 'errors');
+						setEventMessages($langs->trans("ErrorFailedToCopy"), null, 'errors');
 						$error++;
 					}
 				}
@@ -142,7 +142,7 @@ if ($action=='install')
 
 	if (! $error)
 	{
-		setEventMessage($langs->trans("SetupIsReadyForUse"));
+		setEventMessages($langs->trans("SetupIsReadyForUse"), null, 'mesgs');
 	}
 }
 

From 2a412af00b3ea57ed2e2d3e72a77044275d9a44f Mon Sep 17 00:00:00 2001
From: Sergio Sanchis Climent <ssanchis@2byte.es>
Date: Fri, 23 Oct 2015 13:04:33 +0200
Subject: [PATCH 31/66] Fix: Bug: if $this->employe no exist Fix: if
 this->employee no exist default 0

---
 htdocs/install/mysql/tables/llx_user.sql | 3 +--
 htdocs/user/class/user.class.php         | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/htdocs/install/mysql/tables/llx_user.sql b/htdocs/install/mysql/tables/llx_user.sql
index 796566fb638..c9673ceb360 100644
--- a/htdocs/install/mysql/tables/llx_user.sql
+++ b/htdocs/install/mysql/tables/llx_user.sql
@@ -26,7 +26,7 @@ create table llx_user
   ref_ext			varchar(50),				-- reference into an external system (not used by dolibarr)
   ref_int			varchar(50),				-- reference into an internal system (deprecated)
   
-  employee          tinyint        DEFAULT 0,   -- employee 0/1
+  employee          tinyint        DEFAULT 0,   -- 1 if user is an employee
 
   datec             datetime,
   tms               timestamp,
@@ -76,7 +76,6 @@ create table llx_user
   nb_holiday		integer DEFAULT 0,
   thm				double(24,8),
   tjm				double(24,8),
-  employee          tinyint DEFAULT 1,	-- 1 if user is an employee
   salary			double(24,8),
   salaryextra		double(24,8),
   weeklyhours		double(16,8)
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 85a96ebe415..066da9c18da 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -1156,7 +1156,7 @@ class User extends CommonObject
 		// Clean parameters
 		$this->lastname     = trim($this->lastname);
 		$this->firstname    = trim($this->firstname);
-		$this->employee    	= trim($this->employee);
+		$this->employee    	= $this->employee?$this->employee:0;
 		$this->login        = trim($this->login);
 		$this->gender       = trim($this->gender);
 		$this->pass         = trim($this->pass);

From 8d24adc97ee54640a716258be36c9c5379246dc8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 23 Oct 2015 13:52:51 +0200
Subject: [PATCH 32/66] Remove 2 other duplicated pages. There is only one page
 now for all list of thirdarties (with a parameter type to have it specialized
 per customer, prospect or supplier profile).

---
 htdocs/comm/list.php                       | 348 ------------
 htdocs/comm/prospect/list.php              | 613 ---------------------
 htdocs/core/class/html.formother.class.php |   2 +-
 htdocs/core/menus/init_menu_auguria.sql    |   4 +-
 htdocs/core/menus/standard/eldy.lib.php    |  14 +-
 htdocs/index.php                           |   5 +-
 htdocs/societe/index.php                   |   4 +-
 htdocs/societe/list.php                    | 251 +++++++--
 8 files changed, 233 insertions(+), 1008 deletions(-)
 delete mode 100644 htdocs/comm/list.php
 delete mode 100644 htdocs/comm/prospect/list.php

diff --git a/htdocs/comm/list.php b/htdocs/comm/list.php
deleted file mode 100644
index 1cc0f2fa968..00000000000
--- a/htdocs/comm/list.php
+++ /dev/null
@@ -1,348 +0,0 @@
-<?php
-/* Copyright (C) 2001-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C) 2013      Cédric Salvador      <csalvador@gpcsolutions.fr>
- * Copyright (C) 2013-2015 Florian Henry       <florian.henry@open-concept.pro>
- * Copyright (C) 2015       Jean-François Ferry		<jfefe@aternatik.fr>
- * Copyright (C) 2015      Marcos García        <marcosgdf@gmail.com>
- *
- * This program is freei software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- *	\file       htdocs/comm/list.php
- *	\ingroup    commercial societe
- *	\brief      List of customers
- */
-
-require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-
-$langs->load("companies");
-$langs->load("customers");
-$langs->load("suppliers");
-$langs->load("commercial");
-
-// Security check
-$socid = GETPOST('socid','int');
-if ($user->societe_id) $socid=$user->societe_id;
-$result = restrictedArea($user,'societe',$socid,'');
-
-$sortfield = GETPOST('sortfield','alpha');
-$sortorder = GETPOST('sortorder','alpha');
-$page=GETPOST('page','int');
-if ($page == -1) { $page = 0 ; }
-$offset = $conf->liste_limit * $page;
-$pageprev = $page - 1;
-$pagenext = $page + 1;
-if (! $sortorder) $sortorder="ASC";
-if (! $sortfield) $sortfield="s.nom";
-
-$search_company = GETPOST("search_company");
-$search_zipcode = GETPOST("search_zipcode");
-$search_town = GETPOST("search_town");
-$search_code = GETPOST("search_code");
-$search_compta = GETPOST("search_compta");
-$search_status = GETPOST("search_status",'int');
-$search_country	= GETPOST("search_country",'int');
-$search_type_thirdparty	= GETPOST("search_type_thirdparty",'int');
-$optioncss = GETPOST('optioncss','alpha');
-
-// Load sale and categ filters
-$search_sale  = GETPOST("search_sale",'int');
-$search_categ = GETPOST("search_categ",'int');
-$catid        = GETPOST("catid",'int');
-// If the internal user must only see his customers, force searching by him
-if (!$user->rights->societe->client->voir && !$socid) $search_sale = $user->id;
-
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-$hookmanager->initHooks(array('customerlist'));
-$extrafields = new ExtraFields($db);
-
-
-/*
- * Actions
- */
-
-$parameters=array();
-$reshook=$hookmanager->executeHooks('doActions',$parameters);    // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-
-// Do we click on purge search criteria ?
-if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers
-{
-	$search_sale="";
-	$search_categ="";
-	$catid="";
-    $search_company="";
-    $search_zipcode="";
-    $search_town="";
-    $search_code='';
-    $search_compta='';
-    $search_status='';
-    $search_country="";
-    $search_type_thirdparty='';
-}
-
-if ($search_status=='') $search_status=1; // always display activ customer first
-
-
-/*
- * view
- */
-
-$formother=new FormOther($db);
-$form = new Form($db);
-$thirdpartystatic=new Societe($db);
-$formcompany=new FormCompany($db);
-
-$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
-llxHeader('',$langs->trans("ThirdParty"),$help_url);
-
-$sql = "SELECT s.rowid, s.nom as name, s.name_alias, s.client, s.zip, s.town, st.libelle as stcomm, s.prefix_comm, s.code_client, s.code_compta, s.status as status,";
-$sql.= " s.datec, s.canvas";
-$sql.= ",s.fk_pays";
-$sql.= ",typent.code as typent_code";
-if ((!$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
-// Add fields for extrafields
-foreach ($extrafields->attribute_list as $key => $val) $sql.=",ef.".$key.' as options_'.$key;
-// Add fields from hooks
-$parameters=array();
-$reshook=$hookmanager->executeHooks('printFieldListSelect',$parameters);    // Note that $action and $object may have been modified by hook
-$sql.=$hookmanager->resPrint;
-$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-if (! empty($search_categ) || ! empty($catid)) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_societe as cs ON s.rowid = cs.fk_soc"; // We need this table joined to the select in order to filter by categ
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as country on (country.rowid = s.fk_pays) ";
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_typent as typent on (typent.id = s.fk_typent) ";
-if ((!$user->rights->societe->client->voir && !$socid) || $search_sale) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
-$sql.= ", ".MAIN_DB_PREFIX."c_stcomm as st";
-$sql.= " WHERE s.fk_stcomm = st.id";
-$sql.= " AND s.client IN (1, 3)";
-$sql.= ' AND s.entity IN ('.getEntity('societe', 1).')';
-if ((!$user->rights->societe->client->voir && !$socid) || $search_sale) $sql.= " AND s.rowid = sc.fk_soc";
-if ($socid) $sql.= " AND s.rowid = ".$socid;
-if ($search_sale > 0)    $sql.= " AND s.rowid = sc.fk_soc";		// Join for the needed table to filter by sale
-if ($catid > 0)          $sql.= " AND cs.fk_categorie = ".$catid;
-if ($catid == -2)        $sql.= " AND cs.fk_categorie IS NULL";
-if ($search_categ > 0)   $sql.= " AND cs.fk_categorie = ".$search_categ;
-if ($search_categ == -2) $sql.= " AND cs.fk_categorie IS NULL";
-if ($search_company)     $sql.= natural_search(array('s.nom', 's.name_alias'), $search_company);
-if ($search_zipcode)     $sql.= natural_search("s.zip", $search_zipcode);
-if ($search_town)        $sql.= natural_search('s.town', $search_town);
-if ($search_code)        $sql.= natural_search("s.code_client", $search_code);
-if ($search_compta)      $sql.= natural_search("s.code_compta", $search_compta);
-if ($search_status!='')  $sql.= " AND s.status = ".$db->escape($search_status);
-if ($search_country) $sql .= " AND s.fk_pays IN (".$search_country.')';
-if ($search_type_thirdparty) $sql .= " AND s.fk_typent IN (".$search_type_thirdparty.')';
-if ($search_sale > 0)    $sql.= " AND sc.fk_user = ".$search_sale;
-// Add where from hooks
-$parameters=array();
-$reshook=$hookmanager->executeHooks('printFieldListWhere',$parameters);    // Note that $action and $object may have been modified by hook
-$sql.=$hookmanager->resPrint;
-
-// Count total nb of records
-$nbtotalofrecords = 0;
-if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-{
-	$result = $db->query($sql);
-	$nbtotalofrecords = $db->num_rows($result);
-}
-
-$sql.= $db->order($sortfield,$sortorder);
-$sql.= $db->plimit($conf->liste_limit +1, $offset);
-
-dol_syslog('comm/list.php:', LOG_DEBUG);
-$result = $db->query($sql);
-if ($result)
-{
-	$num = $db->num_rows($result);
-
-	$param = "&amp;search_company=".htmlspecialchars($search_company);
-	$param.="&amp;search_code=".htmlspecialchars($search_code);
-	$param.="&amp;search_zipcode=".htmlspecialchars($search_zipcode);
-	$param.="&amp;search_town=".htmlspecialchars($search_town);
- 	if ($search_categ != '') $param.='&amp;search_categ='.htmlspecialchars($search_categ);
- 	if ($search_sale > 0)	$param.='&amp;search_sale='.htmlspecialchars($search_sale);
- 	if ($search_status != '') $param.='&amp;search_status='.htmlspecialchars($search_status);
- 	if ($search_country != '') $param.='&amp;search_country='.htmlspecialchars($search_country);
- 	if ($search_type_thirdparty != '') $param.='&amp;search_type_thirdparty='.htmlspecialchars($search_type_thirdparty);
-	if ($optioncss != '') $param.='&amp;optioncss='.$optioncss;
-
-	print_barre_liste($langs->trans("ListOfCustomers"), $page, $_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords,'title_companies.png');
-
-	$i = 0;
-
-	print '<form method="GET" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">'."\n";
-    if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
-
-	// Filter on categories
- 	$moreforfilter='';
-	if (! empty($conf->categorie->enabled))
-	{
-	 	$moreforfilter.='<div class="divsearchfield">';
-	 	$moreforfilter.=$langs->trans('Categories'). ': ';
-		$moreforfilter.=$formother->select_categories(2,$search_categ,'search_categ',1);
-	 	$moreforfilter.='</div>';
-	}
- 	// If the user can view prospects other than his'
- 	if ($user->rights->societe->client->voir || $socid)
- 	{
-	 	$moreforfilter.='<div class="divsearchfield">';
-	 	$moreforfilter.=$langs->trans('SalesRepresentatives'). ': ';
-		$moreforfilter.=$formother->select_salesrepresentatives($search_sale,'search_sale',$user);
-		$moreforfilter.='</div>';
- 	}
- 	if ($moreforfilter)
-	{
-		print '<div class="liste_titre liste_titre_bydiv centpercent">';
-	    print $moreforfilter;
-    	$parameters=array();
-    	$reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters);    // Note that $action and $object may have been modified by hook
-    	print $hookmanager->resPrint;
-	    print '</div>';
-	}
-
-    print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">';
-
-	print '<tr class="liste_titre">';
-	print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom","",$param,"",$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Zip"),$_SERVER["PHP_SELF"],"s.zip","",$param,"",$sortfield,$sortorder);
-    print_liste_field_titre($langs->trans("Town"),$_SERVER["PHP_SELF"],"s.town","",$param,"",$sortfield,$sortorder);
-    print_liste_field_titre($langs->trans("Country"),$_SERVER["PHP_SELF"],"country.code_iso","",$param,'align="center"',$sortfield,$sortorder);
-    print_liste_field_titre($langs->trans("ThirdPartyType"),$_SERVER["PHP_SELF"],"typent.code","",$param,'align="center"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("CustomerCode"),$_SERVER["PHP_SELF"],"s.code_client","",$param,"",$sortfield,$sortorder);
-    print_liste_field_titre($langs->trans("AccountancyCode"),$_SERVER["PHP_SELF"],"s.code_compta","",$param,'align="left"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("DateCreation"),$_SERVER["PHP_SELF"],"datec","",$param,'align="right"',$sortfield,$sortorder);
-    $parameters=array();
-    $reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
-	print $hookmanager->resPrint;
-    print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"s.status","",$param,'align="center"',$sortfield,$sortorder);
-	print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,'maxwidthsearch ');
-	print "</tr>\n";
-
-	print '<tr class="liste_titre">';
-
-	print '<td class="liste_titre">';
-	print '<input type="text" class="flat" name="search_company" value="'.$search_company.'" size="10">';
-	print '</td>';
-
-	print '<td class="liste_titre">';
-	print '<input type="text" class="flat" name="search_zipcode" value="'.$search_zipcode.'" size="10">';
-	print '</td>';
-
-	print '<td class="liste_titre">';
-    print '<input type="text" class="flat" name="search_town" value="'.$search_town.'" size="10">';
-    print '</td>';
-
-    print '<td class="liste_titre" align="center">';
-    print $form->select_country($search_country,'search_country','',0,'maxwidth100');
-    print '</td>';
-    
-    print '<td class="liste_titre" align="center">';
-    print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 0, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT)?'ASC':$conf->global->SOCIETE_SORT_ON_TYPEENT));
-    print '</td>';
-
-    print '<td class="liste_titre">';
-    print '<input type="text" class="flat" name="search_code" value="'.$search_code.'" size="10">';
-    print '</td>';
-
-    print '<td align="left" class="liste_titre">';
-    print '<input type="text" class="flat" name="search_compta" value="'.$search_compta.'" size="10">';
-    print '</td>';
-
-    print '<td class="liste_titre" align="center">';
-    print '&nbsp;';
-    print '</td>';
-
-    $parameters=array();
-    $reshook=$hookmanager->executeHooks('printFieldListOption',$parameters);    // Note that $action and $object may have been modified by hook
-	print $hookmanager->resPrint;
-
-    print '<td class="liste_titre" align="center">';
-    print $form->selectarray('search_status', array('0'=>$langs->trans('ActivityCeased'),'1'=>$langs->trans('InActivity')),$search_status);
-    print '</td>';
-
-    print '<td class="liste_titre" align="right"><input class="liste_titre" type="image" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
-    print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
-    print '</td>';
-
-    print '</tr>'."\n";
-
-
-	$var=True;
-
-	while ($i < min($num,$conf->liste_limit))
-	{
-		$obj = $db->fetch_object($result);
-
-		$var=!$var;
-
-		print "<tr ".$bc[$var].">";
-		print '<td>';
-		$thirdpartystatic->id=$obj->rowid;
-        $thirdpartystatic->name=$obj->name;
-        $thirdpartystatic->client=$obj->client;
-        $thirdpartystatic->code_client=$obj->code_client;
-        $thirdpartystatic->canvas=$obj->canvas;
-        $thirdpartystatic->status=$obj->status;
-        $thirdpartystatic->name_alias=$obj->name_alias;
-        print $thirdpartystatic->getNomUrl(1);
-		print '</td>';
-		print '<td>'.$obj->zip.'</td>';
-        print '<td>'.$obj->town.'</td>';
-		//Country
-        print '<td align="center">';
-        $tmparray=getCountry($obj->fk_pays,'all');
-        print $tmparray['label'];
-        print '</td>';
-        //Type ent
-        print '<td align="center">';
-        if (count($typenArray)==0) $typenArray = $formcompany->typent_array(1);
-        print $typenArray[$obj->typent_code];
-        print '</td>';
-        print '<td>'.$obj->code_client.'</td>';
-        print '<td>'.$obj->code_compta.'</td>';
-        print '<td align="right">'.dol_print_date($db->jdate($obj->datec),'day').'</td>';
-
-        $parameters=array('obj' => $obj);
-        $reshook=$hookmanager->executeHooks('printFieldListValue',$parameters);    // Note that $action and $object may have been modified by hook
-	    print $hookmanager->resPrint;
-
-        print '<td align="center">'.$thirdpartystatic->getLibStatut(3);
-        print '</td>';
-
-        print '<td></td>';
-
-        print "</tr>\n";
-		$i++;
-	}
-	$db->free($result);
-
-	$parameters=array('sql' => $sql);
-	$reshook=$hookmanager->executeHooks('printFieldListFooter',$parameters);    // Note that $action and $object may have been modified by hook
-	print $hookmanager->resPrint;
-
-	print "</table>\n";
-	print "</form>\n";
-}
-else
-{
-	dol_print_error($db);
-}
-
-llxFooter();
-$db->close();
diff --git a/htdocs/comm/prospect/list.php b/htdocs/comm/prospect/list.php
deleted file mode 100644
index 8ec43d955a4..00000000000
--- a/htdocs/comm/prospect/list.php
+++ /dev/null
@@ -1,613 +0,0 @@
-<?php
-/* Copyright (C) 2001-2004  Rodolphe Quiedeville    <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2015  Laurent Destailleur     <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2012  Regis Houssin           <regis.houssin@capnetworks.com>
- * Copyright (C) 2011       Philippe Grand          <philippe.grand@atoo-net.com>
- * Copyright (C) 2013-2015  Florian Henry           <florian.henry@open-concept.pro>
- * Copyright (C) 2013       Cédric Salvador         <csalvador@gpcsolutions.fr>
- * Copyright (C) 2015       Jean-François Ferry     <jfefe@aternatik.fr>
- * Copyright (C) 2015       Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
- * Copyright (C) 2015       Marcos García        <marcosgdf@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- *	\file       htdocs/comm/prospect/list.php
- *	\ingroup    prospect
- *	\brief      Page to list prospects
- */
-
-require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/societe/class/client.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-
-$langs->load("propal");
-$langs->load("companies");
-
-// Security check
-$socid = GETPOST("socid",'int');
-if ($user->societe_id) $socid=$user->societe_id;
-$result = restrictedArea($user, 'societe',$socid,'');
-
-$action				= GETPOST('action','alpha');
-$socname            = GETPOST("socname",'alpha');
-$stcomm             = GETPOST("stcomm",'alpha');	// code
-$search_stcomm      = GETPOST("search_stcomm",'int');
-$search_nom         = GETPOST("search_nom");
-$search_zipcode     = GETPOST("search_zipcode");
-$search_town        = GETPOST("search_town");
-$search_state       = GETPOST("search_state");
-$search_datec       = GETPOST("search_datec");
-$search_categ       = GETPOST("search_categ",'int');
-$search_status		= GETPOST("search_status",'int');
-$catid              = GETPOST("catid",'int');
-$search_country		= GETPOST("search_country",'int');
-$search_type_thirdparty		= GETPOST("search_type_thirdparty",'int');
-
-$sortfield = GETPOST("sortfield",'alpha');
-$sortorder = GETPOST("sortorder",'alpha');
-$page      = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
-$offset = $conf->liste_limit * $page;
-$pageprev = $page - 1;
-$pagenext = $page + 1;
-if (! $sortorder) $sortorder="ASC";
-if (! $sortfield) $sortfield="s.nom";
-
-$search_level_from = GETPOST("search_level_from","alpha");
-$search_level_to   = GETPOST("search_level_to","alpha");
-
-// If both parameters are set, search for everything BETWEEN them
-if ($search_level_from != '' && $search_level_to != '')
-{
-	// Ensure that these parameters are numbers
-	$search_level_from = (int) $search_level_from;
-	$search_level_to = (int) $search_level_to;
-
-	// If from is greater than to, reverse orders
-	if ($search_level_from > $search_level_to)
-	{
-		$tmp = $search_level_to;
-		$search_level_to = $search_level_from;
-		$search_level_from = $tmp;
-	}
-
-	// Generate the SQL request
-	$sortwhere = '(sortorder BETWEEN '.$search_level_from.' AND '.$search_level_to.') AS is_in_range';
-}
-// If only "from" parameter is set, search for everything GREATER THAN it
-else if ($search_level_from != '')
-{
-	// Ensure that this parameter is a number
-	$search_level_from = (int) $search_level_from;
-
-	// Generate the SQL request
-	$sortwhere = '(sortorder >= '.$search_level_from.') AS is_in_range';
-}
-// If only "to" parameter is set, search for everything LOWER THAN it
-else if ($search_level_to != '')
-{
-	// Ensure that this parameter is a number
-	$search_level_to = (int) $search_level_to;
-
-	// Generate the SQL request
-	$sortwhere = '(sortorder <= '.$search_level_to.') AS is_in_range';
-}
-// If no parameters are set, dont search for anything
-else
-{
-	$sortwhere = '0 as is_in_range';
-}
-
-// Select every potentiels, and note each potentiels which fit in search parameters
-dol_syslog('prospects::prospects_prospect_level',LOG_DEBUG);
-$sql = "SELECT code, label, sortorder, ".$sortwhere;
-$sql.= " FROM ".MAIN_DB_PREFIX."c_prospectlevel";
-$sql.= " WHERE active > 0";
-$sql.= " ORDER BY sortorder";
-
-$resql = $db->query($sql);
-if ($resql)
-{
-	$tab_level = array();
-	$search_levels = array();
-
-	while ($obj = $db->fetch_object($resql))
-	{
-		// Compute level text
-		$level=$langs->trans($obj->code);
-		if ($level == $obj->code) $level=$langs->trans($obj->label);
-
-		// Put it in the array sorted by sortorder
-		$tab_level[$obj->sortorder] = $level;
-
-		// If this potentiel fit in parameters, add its code to the $search_levels array
-		if ($obj->is_in_range == 1)
-		{
-			$search_levels[] = '"'.preg_replace('[^A-Za-z0-9_-]', '', $obj->code).'"';
-		}
-	}
-
-	// Implode the $search_levels array so that it can be use in a "IN (...)" where clause.
-	// If no paramters was set, $search_levels will be empty
-	$search_levels = implode(',', $search_levels);
-}
-else dol_print_error($db);
-
-// Load sale and categ filters
-$search_sale = GETPOST('search_sale','int');
-$search_categ = GETPOST('search_categ','int');
-// If the internal user must only see his prospect, force searching by him
-if (!$user->rights->societe->client->voir && !$socid) $search_sale = $user->id;
-
-// List of available states; we'll need that for each lines (quick changing prospect states) and for search bar (filter by prospect state)
-$sts = array(-1,0,1,2,3);
-
-
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-$contextpage='prospectlist';
-$hookmanager->initHooks(array($contextpage));
-$extrafields = new ExtraFields($db);
-
-// fetch optionals attributes and labels
-$extralabels = $extrafields->fetch_name_optionals_label('thirdparty');
-$search_array_options=$extrafields->getOptionalsFromPost($extralabels,'','search_');
-
-// Do we click on purge search criteria ?
-if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers
-{
-    $socname="";
-	$stcomm="";
-	$search_stcomm="";
-	$search_nom="";
-	$search_zipcode="";
-	$search_town="";
-	$search_state="";
-	$search_datec="";
-	$search_categ="";
-	$search_status="";
-	$search_country="";
-	$search_type_thirdparty="";
-	$search_array_options=array();
-}
-
-if ($search_status=='') $search_status=1; // always display active customer first
-
-
-
-/*
- * Actions
- */
-
-$parameters=array();
-$reshook=$hookmanager->executeHooks('doActions',$parameters);    // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-
-if (empty($reshook))
-{
-	if ($action == 'setstcomm')
-	{
-		$object = new Client($db);
-		$result=$object->fetch($socid);
-		$object->stcomm_id=dol_getIdFromCode($db, GETPOST('stcomm','alpha'), 'c_stcomm');
-		$result=$object->set_commnucation_level($user);
-		if ($result < 0) setEventMessages($object->error,$object->errors,'errors');
-
-		$action=''; $socid=0;
-	}
-}
-
-
-/*
- * View
- */
-
-$formother=new FormOther($db);
-$form=new Form($db);
-$formcompany=new FormCompany($db);
-$prospectstatic=new Client($db);
-$prospectstatic->client=2;
-$prospectstatic->loadCacheOfProspStatus();
-
-$sql = "SELECT s.rowid as socid, s.nom as name, s.name_alias, s.zip, s.town, s.datec, s.status as status, s.code_client, s.client,";
-$sql.= " s.prefix_comm, s.fk_prospectlevel, s.fk_stcomm as stcomm_id,";
-$sql.= " st.libelle as stcomm_label,";
-$sql.= " d.nom as departement";
-$sql.= " ,s.fk_pays";
-$sql.= " ,typent.code as typent_code";
-if ((!$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
-// Add fields for extrafields
-if (is_array($extrafields->attribute_list) && count($extrafields->attribute_list)) foreach ($extrafields->attribute_list as $key => $val) $sql.=",ef.".$key.' as options_'.$key;
-// Add fields from hooks
-$parameters=array();
-$reshook=$hookmanager->executeHooks('printFieldListSelect',$parameters);    // Note that $action and $object may have been modified by hook
-$sql.=$hookmanager->resPrint;
-$sql .= " FROM ".MAIN_DB_PREFIX."c_stcomm as st";
-$sql.= ", ".MAIN_DB_PREFIX."societe as s";
-if (is_array($extrafields->attribute_list) && count($extrafields->attribute_list)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_extrafields as ef on (s.rowid = ef.fk_object)";
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as d on (d.rowid = s.fk_departement)";
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as country on (country.rowid = s.fk_pays) ";
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_typent as typent on (typent.id = s.fk_typent) ";
-if (! empty($search_categ) || ! empty($catid)) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_societe as cs ON s.rowid = cs.fk_soc"; // We need this table joined to the select in order to filter by categ
-if ((!$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
-$sql.= " WHERE s.fk_stcomm = st.id";
-$sql.= " AND s.client IN (2, 3)";
-$sql.= ' AND s.entity IN ('.getEntity('societe', 1).')';
-if ((!$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql.= " AND s.rowid = sc.fk_soc";
-if ($socid) $sql.= " AND s.rowid = " .$socid;
-if ($search_stcomm != '' && $search_stcomm != -2) $sql.= natural_search("s.fk_stcomm",$search_stcomm,2);
-if ($catid > 0)           $sql.= " AND cs.fk_categorie = ".$catid;
-if ($catid == -2)         $sql.= " AND cs.fk_categorie IS NULL";
-if ($search_categ > 0)    $sql.= " AND cs.fk_categorie = ".$search_categ;
-if ($search_categ == -2)  $sql.= " AND cs.fk_categorie IS NULL";
-if ($search_nom) $sql .= natural_search(array('s.nom','s.name_alias'), $search_nom);
-if ($search_zipcode) $sql .= " AND s.zip LIKE '".$db->escape(strtolower($search_zipcode))."%'";
-if ($search_town)    $sql .= natural_search('s.town', $search_town);
-if ($search_state)   $sql .= natural_search('d.nom', $search_state);
-if ($search_datec)   $sql .= " AND s.datec LIKE '%".$db->escape($search_datec)."%'";
-if ($search_status!='') $sql .= " AND s.status = ".$db->escape($search_status);
-// Insert levels filters
-if ($search_levels)  $sql .= " AND s.fk_prospectlevel IN (".$search_levels.')';
-if ($search_country) $sql .= " AND s.fk_pays IN (".$search_country.')';
-if ($search_type_thirdparty) $sql .= " AND s.fk_typent IN (".$search_type_thirdparty.')';
-// Insert sale filter
-if ($search_sale > 0) $sql .= " AND sc.fk_user = ".$db->escape($search_sale);
-if ($socname)
-{
-	$sql .= natural_search('s.nom', $search_nom);
-	$sortfield = "s.nom";
-	$sortorder = "ASC";
-}
-// Add where from extra fields
-foreach ($search_array_options as $key => $val)
-{
-    $crit=$val;
-    $tmpkey=preg_replace('/search_options_/','',$key);
-    $typ=$extrafields->attribute_type[$tmpkey];
-    $mode=0;
-    if (in_array($typ, array('int'))) $mode=1;    // Search on a numeric
-    if ($val && ( ($crit != '' && ! in_array($typ, array('select'))) || ! empty($crit))) 
-    {
-        $sql .= natural_search('ef.'.$tmpkey, $crit, $mode);
-    }
-}
-// Add where from hooks
-$parameters=array();
-$reshook=$hookmanager->executeHooks('printFieldListWhere',$parameters);    // Note that $action and $object may have been modified by hook
-$sql.=$hookmanager->resPrint;
-// Count total nb of records
-$nbtotalofrecords = 0;
-if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-{
-	$result = $db->query($sql);
-	$nbtotalofrecords = $db->num_rows($result);
-}
-$sql.= " ORDER BY $sortfield $sortorder, s.nom ASC";
-$sql.= $db->plimit($conf->liste_limit+1, $offset);
-//print $sql;
-
-dol_syslog('comm/prospect/list.php', LOG_DEBUG);
-$resql = $db->query($sql);
-if ($resql)
-{
-	$num = $db->num_rows($resql);
-
-	if ($num == 1 && $socname)
-	{
-		$obj = $db->fetch_object($resql);
-		header("Location: card.php?socid=".$obj->socid);
-		exit;
-	}
-	else
-	{
-        $help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
-        llxHeader('',$langs->trans("ThirdParty"),$help_url);
-	}
-
-	$param='&search_stcomm='.$search_stcomm;
-	$param.='&search_nom='.urlencode($search_nom);
-	$param.='&search_zipcode='.urlencode($search_zipcode);
-	$param.='&search_town='.urlencode($search_town);
- 	// Store the status filter in the URL
- 	if (isSet($search_setstcomm))
- 	{
- 		foreach ($search_setstcomm as $key => $value)
- 		{
- 			if ($value == 'true')
- 				$param.='&search_setstcomm['.((int) $key).']=true';
- 			else
- 				$param.='&search_setstcomm['.((int) $key).']=false';
- 		}
- 	}
- 	if ($search_level_from != '') $param.='&search_level_from='.$search_level_from;
- 	if ($search_level_to != '') $param.='&search_level_to='.$search_level_to;
- 	if ($search_categ != '') $param.='&search_categ='.urlencode($search_categ);
- 	if ($search_sale > 0) $param.='&search_sale='.$search_sale;
- 	if ($search_status != '') $param.='&search_status='.$search_status;
- 	if ($search_country != '') $param.='&amp;search_country='.$search_country;
- 	if ($search_type_thirdparty != '') $param.='&amp;search_type_thirdparty='.$search_type_thirdparty;
-    // Add $param from extra fields
- 	foreach ($search_array_options as $key => $val)
-    {
-        $crit=$val;
-        $tmpkey=preg_replace('/search_options_/','',$key);
-        $param.='&search_options_'.$tmpkey.'='.urlencode($val);
-    } 	
- 	
-	print_barre_liste($langs->trans("ListOfProspects"), $page, $_SERVER["PHP_SELF"], $param, $sortfield,$sortorder,'',$num,$nbtotalofrecords,'title_companies.png');
-
-
- 	// Print the search-by-sale and search-by-categ filters
- 	print '<form method="GET" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
-
-	// Filter on categories
- 	$moreforfilter='';
-	if (! empty($conf->categorie->enabled))
-	{
-		require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
-		$moreforfilter.='<div class="divsearchfield">';
-	 	$moreforfilter.=$langs->trans('Categories'). ': ';
-		$moreforfilter.=$formother->select_categories(Categorie::TYPE_CUSTOMER,$search_categ,'search_categ',1);
-	 	$moreforfilter.='</div>';
-	}
- 	// If the user can view prospects other than his'
- 	if ($user->rights->societe->client->voir || $socid)
- 	{
-	 	$moreforfilter.='<div class="divsearchfield">';
-	 	$moreforfilter.=$langs->trans('SalesRepresentatives'). ': ';
-		$moreforfilter.=$formother->select_salesrepresentatives($search_sale,'search_sale',$user);
-		$moreforfilter.='</div>';
- 	}
- 	if ($moreforfilter)
-	{
-		print '<div class="liste_titre liste_titre_bydiv centpercent">';
-	    print $moreforfilter;
-    	$parameters=array();
-    	$reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters);    // Note that $action and $object may have been modified by hook
-    	print $hookmanager->resPrint;
-	    print '</div>';
-	}
-
-    print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">';
-
-	print '<tr class="liste_titre">';
-	print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom","",$param,'',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Zip"),$_SERVER["PHP_SELF"],"s.zip","",$param,"",$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Town"),$_SERVER["PHP_SELF"],"s.town","",$param,"",$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("StateShort"),$_SERVER["PHP_SELF"],"s.fk_departement","",$param,'align="center"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Country"),$_SERVER["PHP_SELF"],"country.code_iso","",$param,'align="center"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("ThirdPartyType"),$_SERVER["PHP_SELF"],"typent.code","",$param,'align="center"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("DateCreation"),$_SERVER["PHP_SELF"],"s.datec","",$param,'align="center"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("ProspectLevelShort"),$_SERVER["PHP_SELF"],"s.fk_prospectlevel","",$param,'align="center"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("StatusProsp"),$_SERVER["PHP_SELF"],"s.fk_stcomm","",$param,'align="center"',$sortfield,$sortorder);
-	print_liste_field_titre('');
-    
-    // Extrafields
-	if (is_array($extrafields->attribute_list) && count($extrafields->attribute_list))
-	{
-	   foreach($extrafields->attribute_list as $key => $val) 
-	   {
-	       if ($val)
-	       {
-	           print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],"ef.".$key,"",$param,"",$sortfield,$sortorder);
-	       }
-	   }
-	}
-	// Hook fields
-	$parameters=array();
-    $reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
-	print $hookmanager->resPrint;
-
-	print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"s.status","",$param,'align="right"',$sortfield,$sortorder);
-    print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,'maxwidthsearch ');
-	print "</tr>\n";
-
-	print '<tr class="liste_titre">';
-	print '<td class="liste_titre">';
-	print '<input type="text" class="flat" name="search_nom" size="10" value="'.$search_nom.'">';
-	print '</td>';
-	print '<td class="liste_titre">';
-	print '<input type="text" class="flat" name="search_zipcode" size="6" value="'.$search_zipcode.'">';
-	print '</td>';
-	print '<td class="liste_titre">';
-	print '<input type="text" class="flat" name="search_town" size="8" value="'.$search_town.'">';
-	print '</td>';
- 	print '<td class="liste_titre" align="center">';
-    print '<input type="text" class="flat" name="search_state" size="8" value="'.$search_state.'">';
-    print '</td>';
-    print '<td class="liste_titre" align="center">';
-    print $form->select_country($search_country,'search_country','',0,'maxwidth100');
-    print '</td>';
-    print '<td class="liste_titre" align="center">';
-    print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 0, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT)?'ASC':$conf->global->SOCIETE_SORT_ON_TYPEENT));
-    print '</td>';
-    print '<td align="center" class="liste_titre">';
-	print '<input class="flat" type="text" size="6" name="search_datec" value="'.$search_datec.'">';
-    print '</td>';
-
- 	// Prospect level
- 	print '<td class="liste_titre" align="center">';
- 	$options_from = '<option value="">&nbsp;</option>';	 	// Generate in $options_from the list of each option sorted
- 	foreach ($tab_level as $tab_level_sortorder => $tab_level_label)
- 	{
- 		$options_from .= '<option value="'.$tab_level_sortorder.'"'.($search_level_from == $tab_level_sortorder ? ' selected':'').'>';
- 		$options_from .= $langs->trans($tab_level_label);
- 		$options_from .= '</option>';
- 	}
- 	array_reverse($tab_level, true);	// Reverse the list
- 	$options_to = '<option value="">&nbsp;</option>';		// Generate in $options_to the list of each option sorted in the reversed order
- 	foreach ($tab_level as $tab_level_sortorder => $tab_level_label)
- 	{
- 		$options_to .= '<option value="'.$tab_level_sortorder.'"'.($search_level_to == $tab_level_sortorder ? ' selected':'').'>';
- 		$options_to .= $langs->trans($tab_level_label);
- 		$options_to .= '</option>';
- 	}
-
- 	// Print these two select
- 	print $langs->trans("From").' <select class="flat" name="search_level_from">'.$options_from.'</select>';
- 	print ' ';
- 	print $langs->trans("to").' <select class="flat" name="search_level_to">'.$options_to.'</select>';
-
-    print '</td>';
-
-    // Prospect status
-    print '<td class="liste_titre" align="center">';
-    $arraystcomm=array();
-	foreach($prospectstatic->cacheprospectstatus as $key => $val)
-	{
-		$arraystcomm[$val['id']]=$val['label'];
-	}
-    print $form->selectarray('search_stcomm', $arraystcomm, $search_stcomm, -2);
-    print '</td>';
-
-    print '<td class="liste_titre" align="center">';
-    print '&nbsp;';
-    print '</td>';
-
-    // Extrafields
-	if (is_array($extrafields->attribute_list) && count($extrafields->attribute_list))
-	{
-	   foreach($extrafields->attribute_list as $key => $val) 
-	   {
-	       if ($val)
-	       {
-	           $crit=$search_array_options['search_options_'.$key];
-	           print '<td class="liste_titre">';
-               print $extrafields->showInputField($key, $crit, '', '', 'search_', 4);
-               print '</td>';
-	       }
-	   }
-	}
-    // Hook fields
-    $parameters=array();
-	$reshook=$hookmanager->executeHooks('printFieldListSearch',$parameters);    // Note that $action and $object may have been modified by hook
-	print $hookmanager->resPrint;
-
-	// Status
-    print '<td class="liste_titre" align="right">';
-    print $form->selectarray('search_status', array('0'=>$langs->trans('ActivityCeased'),'1'=>$langs->trans('InActivity')),$search_status);
-    print '</td>';
-
-    // Print the search button
-    print '<td class="liste_titre" align="right"><input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
-	print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
-    print "</td></tr>\n";
-
-	print "</tr>\n";
-
-	$i = 0;
-	$var=true;
-
-	while ($i < min($num,$conf->liste_limit))
-	{
-		$obj = $db->fetch_object($resql);
-
-		$var=!$var;
-
-		print '<tr '.$bc[$var].'>';
-		print '<td>';
-		$prospectstatic->id=$obj->socid;
-		$prospectstatic->name=$obj->name;
-        $prospectstatic->status=$obj->status;
-        $prospectstatic->code_client=$obj->code_client;
-        $prospectstatic->client=$obj->client;
-        $prospectstatic->fk_prospectlevel=$obj->fk_prospectlevel;
-        $prospectstatic->name_alias=$obj->name_alias;
-		print $prospectstatic->getNomUrl(1,'prospect');
-        print '</td>';
-        print "<td>".$obj->zip."</td>";
-		print "<td>".$obj->town."</td>";
-		print '<td align="center">'.$obj->departement.'</td>';
-		//Country
-		print '<td align="center">';
-		$tmparray=getCountry($obj->fk_pays,'all');
-		print $tmparray['label'];
-		print '</td>';
-		//Type ent
-		print '<td align="center">';
-		if (count($typenArray)==0) $typenArray = $formcompany->typent_array(1);
-		print $typenArray[$obj->typent_code];
-		print '</td>';
-		// Creation date
-		print '<td align="center">'.dol_print_date($db->jdate($obj->datec)).'</td>';
-		// Level
-		print '<td align="center">';
-		print $prospectstatic->getLibProspLevel();
-		print "</td>";
-		// Statut
-		print '<td align="center" class="nowrap">';
-		print $prospectstatic->LibProspCommStatut($obj->stcomm_id,2,$prospectstatic->cacheprospectstatus[$obj->stcomm_id]['label']);
-		print "</td>";
-
-		print '<td align="center" class="nowrap">';
-		foreach($prospectstatic->cacheprospectstatus as $key => $val)
-		{
-			$titlealt='default';
-			if (! empty($val['code']) && ! in_array($val['code'], array('ST_NO', 'ST_NEVER', 'ST_TODO', 'ST_PEND', 'ST_DONE'))) $titlealt=$val['label'];
-			if ($obj->stcomm_id != $val['id']) print '<a class="pictosubstatus" href="'.$_SERVER["PHP_SELF"].'?socid='.$obj->socid.'&stcomm='.$val['code'].'&action=setstcomm'.$param.($page?'&page='.urlencode($page):'').'">'.img_action($titlealt,$val['code']).'</a>';
-		}
-		print '</td>';
-
-	    // Extrafields
-    	if (is_array($extrafields->attribute_list) && count($extrafields->attribute_list))
-    	{
-    	   foreach($extrafields->attribute_list as $key => $val) 
-    	   {
-    	       if ($val)
-    	       {
-                    print '<td>';
-                    $paramkey='options_'.$key;
-                    print $extrafields->showOutputField($key, $obj->$paramkey);
-                    print '</td>';
-    	       }
-    	   }
-    	}		
-		// Hook fields
-        $parameters=array('obj' => $obj);
-        $reshook=$hookmanager->executeHooks('printFieldListValue',$parameters);    // Note that $action and $object may have been modified by hook
-	    print $hookmanager->resPrint;
-
-		print '<td align="right">';
-		print $prospectstatic->LibStatut($prospectstatic->status,5);
-        print '</td>';
-
-        print '<td></td>';
-
-        print "</tr>\n";
-		$i++;
-	}
-
-	if ($num > $conf->liste_limit || $page > 0) print_barre_liste('', $page, $_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords);
-
-	print "</table>";
-
-	print "</form>";
-
-	$db->free($resql);
-
-	$parameters=array('sql' => $sql);
-	$reshook=$hookmanager->executeHooks('printFieldListFooter',$parameters);    // Note that $action and $object may have been modified by hook
-    print $hookmanager->resPrint;
-}
-else
-{
-	dol_print_error($db);
-}
-
-
-llxFooter();
-$db->close();
diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php
index 7adabcf819b..51cf8a9c7a7 100644
--- a/htdocs/core/class/html.formother.class.php
+++ b/htdocs/core/class/html.formother.class.php
@@ -302,7 +302,7 @@ class FormOther
     /**
      * Return select list for categories (to use in form search selectors)
      *
-     * @param	int		$type			Type of categories (0=product, 1=suppliers, 2=customers, 3=members)
+     * @param	int		$type			Type of categories (0=product, 1=supplier, 2=customer, 3=member, 4=contact)
      * @param   integer	$selected     	Preselected value
      * @param   string	$htmlname      	Name of combo list
      * @param	int		$nocateg		Show also an entry "Not categorized"
diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql
index ffcb21e6535..df0b9e46488 100644
--- a/htdocs/core/menus/init_menu_auguria.sql
+++ b/htdocs/core/menus/init_menu_auguria.sql
@@ -71,9 +71,9 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->societe->enabled', __HANDLER__, 'left', 502__+MAX_llx_menu__, 'companies', '', 500__+MAX_llx_menu__, '/societe/list.php?action=create', 'List', 1, 'companies', '$user->rights->societe->lire', '', 2, 0, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->societe->enabled && $conf->fournisseur->enabled', __HANDLER__, 'left', 503__+MAX_llx_menu__, 'companies', '', 500__+MAX_llx_menu__, '/societe/list.php?type=f&leftmenu=suppliers', 'ListSuppliersShort', 1, 'suppliers', '$user->rights->societe->lire && $user->rights->fournisseur->lire', '', 2, 5, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->societe->enabled && $conf->fournisseur->enabled', __HANDLER__, 'left', 504__+MAX_llx_menu__, 'companies', '', 503__+MAX_llx_menu__, '/societe/soc.php?leftmenu=supplier&amp;action=create&amp;type=f', 'NewSupplier', 2, 'suppliers', '$user->rights->societe->creer', '', 2, 0, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->societe->enabled', __HANDLER__, 'left', 506__+MAX_llx_menu__, 'companies', '', 500__+MAX_llx_menu__, '/comm/prospect/list.php?leftmenu=prospects', 'ListProspectsShort', 1, 'companies', '$user->rights->societe->lire', '', 2, 3, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->societe->enabled', __HANDLER__, 'left', 506__+MAX_llx_menu__, 'companies', '', 500__+MAX_llx_menu__, '/societe/list.php?type=p&leftmenu=prospects', 'ListProspectsShort', 1, 'companies', '$user->rights->societe->lire', '', 2, 3, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->societe->enabled', __HANDLER__, 'left', 507__+MAX_llx_menu__, 'companies', '', 506__+MAX_llx_menu__, '/societe/soc.php?leftmenu=prospects&amp;action=create&amp;type=p', 'MenuNewProspect', 2, 'companies', '$user->rights->societe->creer', '', 2, 0, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->societe->enabled', __HANDLER__, 'left', 509__+MAX_llx_menu__, 'companies', '', 500__+MAX_llx_menu__, '/comm/list.php?leftmenu=customers', 'ListCustomersShort', 1, 'companies', '$user->rights->societe->lire', '', 2, 4, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->societe->enabled', __HANDLER__, 'left', 509__+MAX_llx_menu__, 'companies', '', 500__+MAX_llx_menu__, '/societe/list.php?type=c&leftmenu=customers', 'ListCustomersShort', 1, 'companies', '$user->rights->societe->lire', '', 2, 4, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->societe->enabled', __HANDLER__, 'left', 510__+MAX_llx_menu__, 'companies', '', 509__+MAX_llx_menu__, '/societe/soc.php?leftmenu=customers&amp;action=create&amp;type=c', 'MenuNewCustomer', 2, 'companies', '$user->rights->societe->creer', '', 2, 0, __ENTITY__);
 -- Third parties - Contacts
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->societe->enabled', __HANDLER__, 'left', 600__+MAX_llx_menu__, 'companies', 'contacts', 2__+MAX_llx_menu__, '/contact/list.php?leftmenu=contacts', 'ContactsAddresses', 0, 'companies', '$user->rights->societe->lire', '', 2, 1, __ENTITY__);
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 42701456c6e..49c076de4c8 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -590,13 +590,13 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 			if (! empty($conf->societe->enabled) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS))
 			{
 				$langs->load("commercial");
-				$newmenu->add("/comm/prospect/list.php?leftmenu=prospects", $langs->trans("ListProspectsShort"), 1, $user->rights->societe->lire, '', $mainmenu, 'prospects');
+				$newmenu->add("/societe/list.php?type=p&leftmenu=prospects", $langs->trans("ListProspectsShort"), 1, $user->rights->societe->lire, '', $mainmenu, 'prospects');
 				/* no more required, there is a filter that can do more
-				if (empty($leftmenu) || $leftmenu=="prospects") $newmenu->add("/comm/prospect/list.php?sortfield=s.datec&amp;sortorder=desc&amp;begin=&amp;search_stcomm=-1", $langs->trans("LastProspectDoNotContact"), 2, $user->rights->societe->lire);
-				if (empty($leftmenu) || $leftmenu=="prospects") $newmenu->add("/comm/prospect/list.php?sortfield=s.datec&amp;sortorder=desc&amp;begin=&amp;search_stcomm=0", $langs->trans("LastProspectNeverContacted"), 2, $user->rights->societe->lire);
-				if (empty($leftmenu) || $leftmenu=="prospects") $newmenu->add("/comm/prospect/list.php?sortfield=s.datec&amp;sortorder=desc&amp;begin=&amp;search_stcomm=1", $langs->trans("LastProspectToContact"), 2, $user->rights->societe->lire);
-				if (empty($leftmenu) || $leftmenu=="prospects") $newmenu->add("/comm/prospect/list.php?sortfield=s.datec&amp;sortorder=desc&amp;begin=&amp;search_stcomm=2", $langs->trans("LastProspectContactInProcess"), 2, $user->rights->societe->lire);
-				if (empty($leftmenu) || $leftmenu=="prospects") $newmenu->add("/comm/prospect/list.php?sortfield=s.datec&amp;sortorder=desc&amp;begin=&amp;search_stcomm=3", $langs->trans("LastProspectContactDone"), 2, $user->rights->societe->lire);
+				if (empty($leftmenu) || $leftmenu=="prospects") $newmenu->add("/societe/list.php?type=p&amp;sortfield=s.datec&amp;sortorder=desc&amp;begin=&amp;search_stcomm=-1", $langs->trans("LastProspectDoNotContact"), 2, $user->rights->societe->lire);
+				if (empty($leftmenu) || $leftmenu=="prospects") $newmenu->add("/societe/list.php?type=p&amp;sortfield=s.datec&amp;sortorder=desc&amp;begin=&amp;search_stcomm=0", $langs->trans("LastProspectNeverContacted"), 2, $user->rights->societe->lire);
+				if (empty($leftmenu) || $leftmenu=="prospects") $newmenu->add("/societe/list.php?type=p&amp;sortfield=s.datec&amp;sortorder=desc&amp;begin=&amp;search_stcomm=1", $langs->trans("LastProspectToContact"), 2, $user->rights->societe->lire);
+				if (empty($leftmenu) || $leftmenu=="prospects") $newmenu->add("/societe/list.php?type=p&amp;sortfield=s.datec&amp;sortorder=desc&amp;begin=&amp;search_stcomm=2", $langs->trans("LastProspectContactInProcess"), 2, $user->rights->societe->lire);
+				if (empty($leftmenu) || $leftmenu=="prospects") $newmenu->add("/societe/list.php?type=p&amp;sortfield=s.datec&amp;sortorder=desc&amp;begin=&amp;search_stcomm=3", $langs->trans("LastProspectContactDone"), 2, $user->rights->societe->lire);
 				*/
 				$newmenu->add("/societe/soc.php?leftmenu=prospects&amp;action=create&amp;type=p", $langs->trans("MenuNewProspect"), 2, $user->rights->societe->creer);
 				//$newmenu->add("/contact/list.php?leftmenu=customers&amp;type=p", $langs->trans("Contacts"), 2, $user->rights->societe->contact->lire);
@@ -606,7 +606,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 			if (! empty($conf->societe->enabled) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))
 			{
 				$langs->load("commercial");
-				$newmenu->add("/comm/list.php?leftmenu=customers", $langs->trans("ListCustomersShort"), 1, $user->rights->societe->lire, '', $mainmenu, 'customers');
+				$newmenu->add("/societe/list.php?type=c&leftmenu=customers", $langs->trans("ListCustomersShort"), 1, $user->rights->societe->lire, '', $mainmenu, 'customers');
 
 				$newmenu->add("/societe/soc.php?leftmenu=customers&amp;action=create&amp;type=c", $langs->trans("MenuNewCustomer"), 2, $user->rights->societe->creer);
 				//$newmenu->add("/contact/list.php?leftmenu=customers&amp;type=c", $langs->trans("Contacts"), 2, $user->rights->societe->contact->lire);
diff --git a/htdocs/index.php b/htdocs/index.php
index 2e1d019d2e7..5db358aa34b 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -231,8 +231,9 @@ if (empty($user->societe_id))
 	                  "SuppliersInvoices",
 					  "ExpenseReports");
 	    // Dashboard Link lines
-	    $links=array(DOL_URL_ROOT.'/comm/list.php',
-	    DOL_URL_ROOT.'/comm/prospect/list.php',
+	    $links=array(
+	    DOL_URL_ROOT.'/societe/list.php?type=c',
+	    DOL_URL_ROOT.'/societe/list.php?type=p',
 	    DOL_URL_ROOT.'/societe/list.php?type=f',
 	    DOL_URL_ROOT.'/adherents/list.php?statut=1&mainmenu=members',
 	    DOL_URL_ROOT.'/product/list.php?type=0&mainmenu=products',
diff --git a/htdocs/societe/index.php b/htdocs/societe/index.php
index 86de804c6a1..ebe4b4c0342 100644
--- a/htdocs/societe/index.php
+++ b/htdocs/societe/index.php
@@ -143,13 +143,13 @@ else
     if (! empty($conf->societe->enabled) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS_STATS))
     {
         $statstring = "<tr ".$bc[0].">";
-        $statstring.= '<td><a href="'.DOL_URL_ROOT.'/comm/prospect/list.php">'.$langs->trans("Prospects").'</a></td><td align="right">'.round($third['prospect']).'</td>';
+        $statstring.= '<td><a href="'.DOL_URL_ROOT.'/societe/list.php?type=p">'.$langs->trans("Prospects").'</a></td><td align="right">'.round($third['prospect']).'</td>';
         $statstring.= "</tr>";
     }
     if (! empty($conf->societe->enabled) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS_STATS))
     {
         $statstring.= "<tr ".$bc[1].">";
-        $statstring.= '<td><a href="'.DOL_URL_ROOT.'/comm/list.php">'.$langs->trans("Customers").'</a></td><td align="right">'.round($third['customer']).'</td>';
+        $statstring.= '<td><a href="'.DOL_URL_ROOT.'/societe/list.php?type=c">'.$langs->trans("Customers").'</a></td><td align="right">'.round($third['customer']).'</td>';
         $statstring.= "</tr>";
     }
     if (! empty($conf->fournisseur->enabled) && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_STATS))
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 19301efd6e0..98795e27667 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -31,10 +31,12 @@ include_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
+require_once DOL_DOCUMENT_ROOT.'/societe/class/client.class.php';
 
 $langs->load("companies");
 $langs->load("customers");
 $langs->load("suppliers");
+$langs->load("bills");
 
 // Security check
 $socid = GETPOST('socid','int');
@@ -64,10 +66,14 @@ $search_country=GETPOST("search_country",'int');
 $search_type_thirdparty=GETPOST("search_type_thirdparty",'int');
 $search_type=GETPOST('search_type','alpha');
 $search_status=GETPOST("search_status",'int');
+$search_level_from = GETPOST("search_level_from","alpha");
+$search_level_to   = GETPOST("search_level_to","alpha");
+$search_stcomm=GETPOST('search_stcomm','int');
 
 $type=GETPOST('type');
 $optioncss=GETPOST('optioncss','alpha');
 $mode=GETPOST("mode");
+$action=GETPOST('action');
 
 $sortfield=GETPOST("sortfield",'alpha');
 $sortorder=GETPOST("sortorder",'alpha');
@@ -116,6 +122,7 @@ if (($tmp = $langs->transnoentities("ProfId6".$mysoc->country_code)) && $tmp !=
 if (!empty($conf->barcode->enabled)) $fieldstosearchall['s.barcode']='Gencod';
 
 
+
 /*
  * Actions
  */
@@ -126,6 +133,20 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
+if (empty($reshook))
+{
+	if ($action == 'setstcomm')
+	{
+		$object = new Client($db);
+		$result=$object->fetch(GETPOST('stcommsocid'));
+		$object->stcomm_id=dol_getIdFromCode($db, GETPOST('stcomm','alpha'), 'c_stcomm');
+		$result=$object->set_commnucation_level($user);
+		if ($result < 0) setEventMessages($object->error,$object->errors,'errors');
+
+		$action='';
+	}
+}
+
 // special search
 /*if ($mode == 'search')
 {
@@ -176,20 +197,6 @@ include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 }
 */
 
-
-/*
- * View
- */
-
-$form=new Form($db);
-$formother=new FormOther($db);
-$companystatic=new Societe($db);
-$formcompany=new FormCompany($db);
-
-$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
-llxHeader('',$langs->trans("ThirdParty"),$help_url);
-
-
 // Do we click on purge search criteria ?
 if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers
 {
@@ -212,14 +219,18 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETP
 	$search_country='';
 	$search_type_thirdparty='';
 	$search_status='';
+	$search_stcomm='';
+ 	$search_level_from='';
+ 	$search_level_to='';
 	$search_array_options=array();
 }
 
 if ($search_status=='') $search_status=1; // always display active thirdparty first
 
 
+
 /*
- * Mode List
+ * View
  */
 
 /*
@@ -230,13 +241,103 @@ if ($search_status=='') $search_status=1; // always display active thirdparty fi
  External user socid=x + Permission to see ALL customers    => Can see only himself
  External user socid=x + No permission to see ALL customers => Can see only himself
  */
+
+$form=new Form($db);
+$formother=new FormOther($db);
+$companystatic=new Societe($db);
+$formcompany=new FormCompany($db);
+$prospectstatic=new Client($db);
+$prospectstatic->client=2;
+$prospectstatic->loadCacheOfProspStatus();
+
+$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
+llxHeader('',$langs->trans("ThirdParty"),$help_url);
+
+
 $title=$langs->trans("ListOfThirdParties");
 if ($type == 'c' && (empty($search_type) || ($search_type == '1,3'))) $title=$langs->trans("ListOfCustomers");
 if ($type == 'p' && (empty($search_type) || ($search_type == '2,3'))) $title=$langs->trans("ListOfProspects");
 if ($type == 'f' && (empty($search_type) || ($search_type == '4'))) $title=$langs->trans("ListOfSuppliers");
 
-$sql = "SELECT s.rowid, s.nom as name, s.barcode, s.town, s.zip, s.datec, s.code_client, s.code_fournisseur, ";
-$sql.= " st.libelle as stcomm, s.prefix_comm, s.client, s.fournisseur, s.canvas, s.status as status,";
+// If both parameters are set, search for everything BETWEEN them
+if ($search_level_from != '' && $search_level_to != '')
+{
+	// Ensure that these parameters are numbers
+	$search_level_from = (int) $search_level_from;
+	$search_level_to = (int) $search_level_to;
+
+	// If from is greater than to, reverse orders
+	if ($search_level_from > $search_level_to)
+	{
+		$tmp = $search_level_to;
+		$search_level_to = $search_level_from;
+		$search_level_from = $tmp;
+	}
+
+	// Generate the SQL request
+	$sortwhere = '(sortorder BETWEEN '.$search_level_from.' AND '.$search_level_to.') AS is_in_range';
+}
+// If only "from" parameter is set, search for everything GREATER THAN it
+else if ($search_level_from != '')
+{
+	// Ensure that this parameter is a number
+	$search_level_from = (int) $search_level_from;
+
+	// Generate the SQL request
+	$sortwhere = '(sortorder >= '.$search_level_from.') AS is_in_range';
+}
+// If only "to" parameter is set, search for everything LOWER THAN it
+else if ($search_level_to != '')
+{
+	// Ensure that this parameter is a number
+	$search_level_to = (int) $search_level_to;
+
+	// Generate the SQL request
+	$sortwhere = '(sortorder <= '.$search_level_to.') AS is_in_range';
+}
+// If no parameters are set, dont search for anything
+else
+{
+	$sortwhere = '0 as is_in_range';
+}
+
+// Select every potentiels, and note each potentiels which fit in search parameters
+dol_syslog('societe/list.php',LOG_DEBUG);
+$sql = "SELECT code, label, sortorder, ".$sortwhere;
+$sql.= " FROM ".MAIN_DB_PREFIX."c_prospectlevel";
+$sql.= " WHERE active > 0";
+$sql.= " ORDER BY sortorder";
+
+$resql = $db->query($sql);
+if ($resql)
+{
+	$tab_level = array();
+	$search_levels = array();
+
+	while ($obj = $db->fetch_object($resql))
+	{
+		// Compute level text
+		$level=$langs->trans($obj->code);
+		if ($level == $obj->code) $level=$langs->trans($obj->label);
+
+		// Put it in the array sorted by sortorder
+		$tab_level[$obj->sortorder] = $level;
+
+		// If this potentiel fit in parameters, add its code to the $search_levels array
+		if ($obj->is_in_range == 1)
+		{
+			$search_levels[] = '"'.preg_replace('[^A-Za-z0-9_-]', '', $obj->code).'"';
+		}
+	}
+
+	// Implode the $search_levels array so that it can be use in a "IN (...)" where clause.
+	// If no paramters was set, $search_levels will be empty
+	$search_levels = implode(',', $search_levels);
+}
+else dol_print_error($db);
+
+$sql = "SELECT s.rowid, s.nom as name, s.name_alias, s.barcode, s.town, s.zip, s.datec, s.code_client, s.code_fournisseur, ";
+$sql.= " st.libelle as stcomm, s.fk_stcomm as stcomm_id, s.fk_prospectlevel, s.prefix_comm, s.client, s.fournisseur, s.canvas, s.status as status,";
 $sql.= " s.siren as idprof1, s.siret as idprof2, ape as idprof3, idprof4 as idprof4,";
 $sql.= " s.fk_pays, s.tms as date_update, s.datec as date_creation,";
 $sql.= " typent.code as typent_code";
@@ -291,6 +392,8 @@ if ($search_status!='') $sql .= " AND s.status = ".$db->escape($search_status);
 if (!empty($conf->barcode->enabled) && $search_barcode) $sql.= " AND s.barcode LIKE '%".$db->escape($search_barcode)."%'";
 if ($search_country) $sql .= " AND s.fk_pays IN (".$search_country.')';
 if ($search_type_thirdparty) $sql .= " AND s.fk_typent IN (".$search_type_thirdparty.')';
+if ($search_levels)  $sql .= " AND s.fk_prospectlevel IN (".$search_levels.')';
+if ($search_stcomm != '' && $search_stcomm != -2) $sql.= natural_search("s.fk_stcomm",$search_stcomm,2);
 // Add where from extra fields
 foreach ($search_array_options as $key => $val)
 {
@@ -348,6 +451,9 @@ if ($resql)
 	if ($search_type_thirdparty != '') $param.='&amp;search_type_thirdparty='.urlencode($search_type_thirdparty);
 	if ($optioncss != '') $param.='&amp;optioncss='.urlencode($optioncss);
     if ($search_status != '') $param.='&amp;search_status='.urlencode($search_status);
+	if ($search_stcomm != '') $param.='&search_stcomm='.$search_stcomm;
+ 	if ($search_level_from != '') $param.='&search_level_from='.$search_level_from;
+ 	if ($search_level_to != '') $param.='&search_level_to='.$search_level_to;
     if ($type != '') $param.='&amp;type='.urlencode($type);
     // Add $param from extra fields
     foreach ($search_array_options as $key => $val)
@@ -400,7 +506,7 @@ if ($resql)
 			require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
 			$moreforfilter.='<div class="divsearchfield">';
 		 	$moreforfilter.=$langs->trans('Categories'). ': ';
-			$moreforfilter.=$formother->select_categories(Categorie::TYPE_CUSTOMER,$search_categ,'search_categ',1);
+			$moreforfilter.=$formother->select_categories('customer',$search_categ,'search_categ',1);
 		 	$moreforfilter.='</div>';
 		}
 	 	// If the user can view prospects other than his'
@@ -419,7 +525,7 @@ if ($resql)
 			require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
 			$moreforfilter.='<div class="divsearchfield">';
 			$moreforfilter.=$langs->trans('Categories'). ': ';
-			$moreforfilter.=$formother->select_categories(Categorie::TYPE_SUPPLIER,$search_categ,'search_categ',1);
+			$moreforfilter.=$formother->select_categories('supplier',$search_categ,'search_categ',1);
 			$moreforfilter.='</div>';
 		}
 	}
@@ -436,16 +542,21 @@ if ($resql)
 	// Define list of fields to show into list
 	$checkedcustomercode=(in_array($contextpage, array('thirdpartylist', 'customerlist', 'prospectlist')) ? 1 : 0);
 	$checkedsuppliercode=(in_array($contextpage, array('supplierlist')) ? 1 : 0);
-	$checkedcustomeraccountcode=(in_array($contextpage, array('thirdpartylist', 'customerlist', 'prospectlist')) ? 1 : 0);
+	$checkedcustomeraccountcode=(in_array($contextpage, array('customerlist')) ? 1 : 0);
 	$checkedsupplieraccountcode=(in_array($contextpage, array('supplierlist')) ? 1 : 0);
 	$checkedtypetiers=1;
+	$checkedprofid1=0;
+	$checkedprofid2=0;
+	$checkedprofid3=0;
 	$checkedprofid4=0;
 	$checkedprofid5=0;
 	$checkedprofid6=0;
 	//$checkedprofid4=((($tmp = $langs->transnoentities("ProfId4".$mysoc->country_code)) && $tmp != "ProfId4".$mysoc->country_code && $tmp != '-') ? 1 : 0);
 	//$checkedprofid5=((($tmp = $langs->transnoentities("ProfId5".$mysoc->country_code)) && $tmp != "ProfId5".$mysoc->country_code && $tmp != '-') ? 1 : 0);
 	//$checkedprofid6=((($tmp = $langs->transnoentities("ProfId6".$mysoc->country_code)) && $tmp != "ProfId6".$mysoc->country_code && $tmp != '-') ? 1 : 0);
-    $arrayfields=array(
+	$checkprospectlevel=(in_array($contextpage, array('prospectlist')) ? 1 : 0);
+	$checkstcomm=(in_array($contextpage, array('prospectlist')) ? 1 : 0);
+	$arrayfields=array(
         's.nom'=>array('label'=>$langs->trans("Company"), 'checked'=>1),
         's.barcode'=>array('label'=>$langs->trans("Gencod"), 'checked'=>1, 'enabled'=>(! empty($conf->barcode->enabled))),
         's.code_client'=>array('label'=>$langs->trans("CustomerCodeShort"), 'checked'=>$checkedcustomercode),
@@ -456,12 +567,14 @@ if ($resql)
         's.zip'=>array('label'=>$langs->trans("Zip"), 'checked'=>1),
         'country.code_iso'=>array('label'=>$langs->trans("Country"), 'checked'=>0),
         'typent.code'=>array('label'=>$langs->trans("ThirdPartyType"), 'checked'=>$checkedtypetiers),
-        's.siren'=>array('label'=>$langs->trans("ProfId1Short"), 'checked'=>1),
-        's.siret'=>array('label'=>$langs->trans("ProfId2Short"), 'checked'=>1),
-        's.ape'=>array('label'=>$langs->trans("ProfId3Short"), 'checked'=>1),
+        's.siren'=>array('label'=>$langs->trans("ProfId1Short"), 'checked'=>$checkedprofid1),
+        's.siret'=>array('label'=>$langs->trans("ProfId2Short"), 'checked'=>$checkedprofid2),
+        's.ape'=>array('label'=>$langs->trans("ProfId3Short"), 'checked'=>$checkedprofid3),
         's.idprof4'=>array('label'=>$langs->trans("ProfId4Short"), 'checked'=>$checkedprofid4),
         's.idprof5'=>array('label'=>$langs->trans("ProfId5Short"), 'checked'=>$checkedprofid5),
         's.idprof6'=>array('label'=>$langs->trans("ProfId6Short"), 'checked'=>$checkedprofid6),
+    	's.fk_prospectlevel'=>array('label'=>$langs->trans("ProspectLevelShort"), 'checked'=>$checkprospectlevel),
+    	's.fk_stcomm'=>array('label'=>$langs->trans("StatusProsp"), 'checked'=>$checkstcomm),
         's.status'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>200),
         's.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
         's.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500),
@@ -488,7 +601,9 @@ if ($resql)
 	if (! empty($arrayfields['s.idprof5']['checked']))        print_liste_field_titre($form->textwithpicto($langs->trans("ProfId5Short"),$textprofid[4],1,0),$_SERVER["PHP_SELF"],"s.idprof5","",$param,'class="nowrap"',$sortfield,$sortorder);
 	if (! empty($arrayfields['s.idprof6']['checked']))        print_liste_field_titre($form->textwithpicto($langs->trans("ProfId6Short"),$textprofid[4],1,0),$_SERVER["PHP_SELF"],"s.idprof6","",$param,'class="nowrap"',$sortfield,$sortorder);
 	print_liste_field_titre('');   // type of customer
-    // Extra fields
+	if (! empty($arrayfields['s.fk_prospectlevel']['checked'])) print_liste_field_titre($arrayfields['s.fk_prospectlevel']['label'],$_SERVER["PHP_SELF"],"s.fk_prospectlevel","",$param,'align="center"',$sortfield,$sortorder);
+	if (! empty($arrayfields['s.fk_stcomm']['checked']))      print_liste_field_titre($arrayfields['s.fk_stcomm']['label'],$_SERVER["PHP_SELF"],"s.fk_stcomm","",$param,'align="center"',$sortfield,$sortorder);
+	// Extra fields
 	if (is_array($extrafields->attribute_list) && count($extrafields->attribute_list))
 	{
 	   foreach($extrafields->attribute_list as $key => $val) 
@@ -623,6 +738,7 @@ if ($resql)
     	print '<input class="flat" size="4" type="text" name="search_idprof6" value="'.dol_escape_htmltag($search_idprof6).'">';
     	print '</td>';
     }
+    
     // Type (customer/prospect/supplier)
     print '<td class="liste_titre" align="middle">';
 	print '<select class="flat" name="search_type">';
@@ -633,6 +749,48 @@ if ($resql)
 	print '<option value="4"'.($search_type=='4'?' selected':'').'>'.$langs->trans('Supplier').'</option>';
 	print '<option value="0"'.($search_type=='0'?' selected':'').'>'.$langs->trans('Others').'</option>';
 	print '</select></td>';
+    
+    if (! empty($arrayfields['s.fk_prospectlevel']['checked']))
+    {
+	    // Prospect level
+	 	print '<td class="liste_titre" align="center">';
+	 	$options_from = '<option value="">&nbsp;</option>';	 	// Generate in $options_from the list of each option sorted
+	 	foreach ($tab_level as $tab_level_sortorder => $tab_level_label)
+	 	{
+	 		$options_from .= '<option value="'.$tab_level_sortorder.'"'.($search_level_from == $tab_level_sortorder ? ' selected':'').'>';
+	 		$options_from .= $langs->trans($tab_level_label);
+	 		$options_from .= '</option>';
+	 	}
+	 	array_reverse($tab_level, true);	// Reverse the list
+	 	$options_to = '<option value="">&nbsp;</option>';		// Generate in $options_to the list of each option sorted in the reversed order
+	 	foreach ($tab_level as $tab_level_sortorder => $tab_level_label)
+	 	{
+	 		$options_to .= '<option value="'.$tab_level_sortorder.'"'.($search_level_to == $tab_level_sortorder ? ' selected':'').'>';
+	 		$options_to .= $langs->trans($tab_level_label);
+	 		$options_to .= '</option>';
+	 	}
+    
+	    // Print these two select
+	 	print $langs->trans("From").' <select class="flat" name="search_level_from">'.$options_from.'</select>';
+	 	print ' ';
+	 	print $langs->trans("to").' <select class="flat" name="search_level_to">'.$options_to.'</select>';
+	
+	    print '</td>';
+    }
+    
+    if (! empty($arrayfields['s.fk_stcomm']['checked']))
+    {
+	    // Prospect status
+	    print '<td class="liste_titre" align="center">';
+	    $arraystcomm=array();
+		foreach($prospectstatic->cacheprospectstatus as $key => $val)
+		{
+			$arraystcomm[$val['id']]=$val['label'];
+		}
+	    print $form->selectarray('search_stcomm', $arraystcomm, $search_stcomm, -2);
+	    print '</td>';
+    }
+        
     // Fields from hook
 	$parameters=array('arrayfields'=>$arrayfields);
     $reshook=$hookmanager->executeHooks('printFieldListOption',$parameters);    // Note that $action and $object may have been modified by hook
@@ -671,18 +829,22 @@ if ($resql)
 	{
 		$obj = $db->fetch_object($resql);
 		$var=!$var;
+		
+		$companystatic->id=$obj->rowid;
+		$companystatic->name=$obj->name;
+		$companystatic->canvas=$obj->canvas;
+		$companystatic->client=$obj->client;
+		$companystatic->status=$obj->status;
+		$companystatic->fournisseur=$obj->fournisseur;
+		$companystatic->code_client=$obj->code_client;
+		$companystatic->code_fournisseur=$obj->code_fournisseur;
+        $companystatic->fk_prospectlevel=$obj->fk_prospectlevel;
+        $companystatic->name_alias=$obj->name_alias;
+		
 		print "<tr ".$bc[$var].">";
 		if (! empty($arrayfields['s.nom']['checked']))
 		{
     		print "<td>";
-    		$companystatic->id=$obj->rowid;
-    		$companystatic->name=$obj->name;
-    		$companystatic->canvas=$obj->canvas;
-            $companystatic->client=$obj->client;
-            $companystatic->status=$obj->status;
-            $companystatic->fournisseur=$obj->fournisseur;
-            $companystatic->code_client=$obj->code_client;
-            $companystatic->code_fournisseur=$obj->code_fournisseur;
     		print $companystatic->getNomUrl(1,'',100);
     		print "</td>\n";
 		}
@@ -761,6 +923,7 @@ if ($resql)
         {
             print "<td>".$obj->idprof6."</td>\n";
         }
+        // Type
         print '<td align="center">';
 		$s='';
 		if (($obj->client==1 || $obj->client==3) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))
@@ -782,6 +945,28 @@ if ($resql)
 		}
 		print $s;
 		print '</td>';
+	    if (! empty($arrayfields['s.fk_prospectlevel']['checked']))
+        {
+			// Prospect level
+			print '<td align="center">';
+			print $companystatic->getLibProspLevel();
+			print "</td>";
+        }
+	    if (! empty($arrayfields['s.fk_stcomm']['checked']))
+        {
+	        // Prospect status
+			print '<td align="center" class="nowrap"><div class="nowrap">';
+			print '<div class="inline-block">'.$companystatic->LibProspCommStatut($obj->stcomm_id,2,$prospectstatic->cacheprospectstatus[$obj->stcomm_id]['label']);
+			print '</div> - <div class="inline-block">';
+			foreach($prospectstatic->cacheprospectstatus as $key => $val)
+			{
+				$titlealt='default';
+				if (! empty($val['code']) && ! in_array($val['code'], array('ST_NO', 'ST_NEVER', 'ST_TODO', 'ST_PEND', 'ST_DONE'))) $titlealt=$val['label'];
+				if ($obj->stcomm_id != $val['id']) print '<a class="pictosubstatus" href="'.$_SERVER["PHP_SELF"].'?stcommsocid='.$obj->rowid.'&stcomm='.$val['code'].'&action=setstcomm'.$param.($page?'&page='.urlencode($page):'').'">'.img_action($titlealt,$val['code']).'</a>';
+			}
+			print '</div></div></td>';
+        }
+        		
         // Fields from hook
 	    $parameters=array('arrayfields'=>$arrayfields, 'obj'=>$obj);
 		$reshook=$hookmanager->executeHooks('printFieldListValue',$parameters);    // Note that $action and $object may have been modified by hook

From f6d30d8b9e908c7d44ff9862ff7dbe19c990582c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 23 Oct 2015 14:40:45 +0200
Subject: [PATCH 33/66] Fix: W3C no form into table

---
 htdocs/admin/mailman.php      | 30 +++++++++++-----
 htdocs/admin/spip.php         | 66 +++++++++++++++++++++--------------
 htdocs/core/lib/admin.lib.php |  6 ++--
 3 files changed, 63 insertions(+), 39 deletions(-)

diff --git a/htdocs/admin/mailman.php b/htdocs/admin/mailman.php
index 686da7fc68c..e3aab979a41 100644
--- a/htdocs/admin/mailman.php
+++ b/htdocs/admin/mailman.php
@@ -99,7 +99,7 @@ if (($action == 'testsubscribe' || $action == 'testunsubscribe') && ! empty($con
     if (! isValidEmail($email))
     {
         $langs->load("errors");
-        setEventMessage($langs->trans("ErrorBadEMail",$email),'errors');
+        setEventMessages($langs->trans("ErrorBadEMail",$email), null, 'errors');
     }
     else
     {
@@ -118,11 +118,11 @@ if (($action == 'testsubscribe' || $action == 'testunsubscribe') && ! empty($con
 			if ($result < 0)
 			{
 				$error++;
-				setEventMessage($mailmanspip->error,'errors');
+				setEventMessages($mailmanspip->error,$mailmanspip->errors,'errors');
 			}
 			else
 			{
-				setEventMessage($langs->trans("MailmanCreationSuccess"));
+				setEventMessages($langs->trans("MailmanCreationSuccess"), null);
 			}
         }
         if ($action == 'testunsubscribe')
@@ -131,11 +131,11 @@ if (($action == 'testsubscribe' || $action == 'testunsubscribe') && ! empty($con
         			if ($result < 0)
 			{
 				$error++;
-				setEventMessage($mailmanspip->error,'errors');
+				setEventMessages($mailmanspip->error,$mailmanspip->errors,'errors');
 			}
 			else
 			{
-				setEventMessage($langs->trans("MailmanDeletionSuccess"));
+				setEventMessages($langs->trans("MailmanDeletionSuccess"), null);
 			}
         }
     }
@@ -156,12 +156,15 @@ print load_fiche_titre($langs->trans("MailmanSpipSetup"),$linkback,'title_setup'
 
 $head = mailmanspip_admin_prepare_head();
 
-dol_fiche_head($head, 'mailman', $langs->trans("Setup"), 0, 'user');
 
 $var=true;
 
 if (! empty($conf->global->ADHERENT_USE_MAILMAN))
 {
+    print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+
+    dol_fiche_head($head, 'mailman', $langs->trans("Setup"), 0, 'user');
+    
     //$link=img_picto($langs->trans("Active"),'tick').' ';
     $link='<a href="'.$_SERVER["PHP_SELF"].'?action=unset&value=0&name=ADHERENT_USE_MAILMAN">';
     //$link.=$langs->trans("Disable");
@@ -200,21 +203,30 @@ if (! empty($conf->global->ADHERENT_USE_MAILMAN))
 	});
     </script>';
 
-    form_constantes($constantes,1);
-
+    form_constantes($constantes,2);
+    
     print '*'.$langs->trans("FollowingConstantsWillBeSubstituted").'<br>';
     print '%LISTE%, %MAILMAN_ADMINPW%, %EMAIL% <br>';
+    
+    dol_fiche_end();
+
+    print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Update").'" name="update"></div>';
+
+    print '</form>';
 }
 else
 {
+    dol_fiche_head($head, 'mailman', $langs->trans("Setup"), 0, 'user');
+    
     $link='<a href="'.$_SERVER["PHP_SELF"].'?action=set&value=1&name=ADHERENT_USE_MAILMAN">';
     //$link.=img_$langs->trans("Activate")
     $link.=img_picto($langs->trans("Disabled"),'switch_off');
     $link.='</a>';
     print load_fiche_titre($langs->trans('MailmanTitle'), $link,'');
+
+    dol_fiche_end();
 }
 
-dol_fiche_end();
 
 if (! empty($conf->global->ADHERENT_USE_MAILMAN))
 {
diff --git a/htdocs/admin/spip.php b/htdocs/admin/spip.php
index e46d9b8f5b7..13d959eb38c 100644
--- a/htdocs/admin/spip.php
+++ b/htdocs/admin/spip.php
@@ -54,28 +54,30 @@ if ($action == 'update' || $action == 'add')
 	$constname=GETPOST("constname");
 	$constvalue=GETPOST("constvalue");
 
-	if (($constname=='ADHERENT_CARD_TYPE' || $constname=='ADHERENT_ETIQUETTE_TYPE') && $constvalue == -1) $constvalue='';
-	if ($constname=='ADHERENT_LOGIN_NOT_REQUIRED') // Invert choice
-	{
-		if ($constvalue) $constvalue=0;
-		else $constvalue=1;
-	}
+    // Action mise a jour ou ajout d'une constante
+    if ($action == 'update' || $action == 'add')
+    {
+    	foreach($_POST['constname'] as $key => $val)
+    	{
+    		$constname=$_POST["constname"][$key];
+    		$constvalue=$_POST["constvalue"][$key];
+    		$consttype=$_POST["consttype"][$key];
+    		$constnote=$_POST["constnote"][$key];
 
-	if (in_array($constname,array('ADHERENT_MAIL_VALID','ADHERENT_MAIL_COTIS','ADHERENT_MAIL_RESIL'))) $constvalue=$_POST["constvalue".$constname];
-	$consttype=$_POST["consttype"];
-	$constnote=GETPOST("constnote");
-	$res=dolibarr_set_const($db,$constname,$constvalue,$type[$consttype],0,$constnote,$conf->entity);
-
-	if (! $res > 0) $error++;
-
-	if (! $error)
-	{
-		setEventMessage($langs->trans("SetupSaved"));
-	}
-	else
-	{
-		setEventMessage($langs->trans("Error"),'errors');
-	}
+        	$res=dolibarr_set_const($db,$constname,$constvalue,$type[$consttype],0,$constnote,$conf->entity);
+    		
+    		if (! $res > 0) $error++;
+    	}
+    
+     	if (! $error)
+        {
+            setEventMessage($langs->trans("SetupSaved"));
+        }
+        else
+        {
+            setEventMessage($langs->trans("Error"),'errors');
+        }
+    }
 }
 
 // Action activation d'un sous module du module adherent
@@ -115,7 +117,6 @@ print load_fiche_titre($langs->trans("MailmanSpipSetup"),$linkback,'title_setup'
 
 $head = mailmanspip_admin_prepare_head();
 
-dol_fiche_head($head, 'spip', $langs->trans("Setup"), 0, 'user');
 
 $var=true;
 
@@ -124,6 +125,10 @@ $var=true;
  */
 if (! empty($conf->global->ADHERENT_USE_SPIP))
 {
+	print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+	
+	dol_fiche_head($head, 'spip', $langs->trans("Setup"), 0, 'user');
+    
     //$link=img_picto($langs->trans("Active"),'tick').' ';
     $link='<a href="'.$_SERVER["PHP_SELF"].'?action=unset&value=0&name=ADHERENT_USE_SPIP">';
     //$link.=$langs->trans("Disable");
@@ -139,21 +144,28 @@ if (! empty($conf->global->ADHERENT_USE_SPIP))
 
     print load_fiche_titre($langs->trans('SPIPTitle'), $link, '');
 	print '<br>';
-    form_constantes($constantes);
-    print '<br>';
+    
+	form_constantes($constantes,2);
+	
+    dol_fiche_end();
+
+    print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Update").'" name="update"></div>';
+    
+    print '</form>';
 }
 else
 {
+    dol_fiche_head($head, 'spip', $langs->trans("Setup"), 0, 'user');
+    
     $link='<a href="'.$_SERVER["PHP_SELF"].'?action=set&value=1&name=ADHERENT_USE_SPIP">';
     //$link.=$langs->trans("Activate");
     $link.=img_picto($langs->trans("Disabled"),'switch_off');
     $link.='</a>';
     print load_fiche_titre($langs->trans('SPIPTitle'), $link, '');
+    
+    dol_fiche_end();
 }
 
-
-dol_fiche_end();
-
 llxFooter();
 
 $db->close();
diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php
index 3d887f1bd18..7b22a2e8dbe 100644
--- a/htdocs/core/lib/admin.lib.php
+++ b/htdocs/core/lib/admin.lib.php
@@ -1053,7 +1053,7 @@ function complete_elementList_with_modules(&$elementList)
  *	Show array with constants to edit
  *
  *	@param	array	$tableau		Array of constants
- *	@param	int		$strictw3c		Respect W3C (no form into table)
+ *	@param	int		$strictw3c		0=Include form into table (deprecated), 1=Form is outside table to respect W3C (no form into table), 2=No form nor button at all
  *	@return	void
  */
 function form_constantes($tableau,$strictw3c=0)
@@ -1062,7 +1062,7 @@ function form_constantes($tableau,$strictw3c=0)
 
     $form = new Form($db);
 
-    if (! empty($strictw3c)) print "\n".'<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+    if (! empty($strictw3c) && $strictw3c == 1) print "\n".'<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 
     print '<table class="noborder" width="100%">';
     print '<tr class="liste_titre">';
@@ -1199,7 +1199,7 @@ function form_constantes($tableau,$strictw3c=0)
     }
     print '</table>';
 
-    if (! empty($strictw3c))
+    if (! empty($strictw3c) && $strictw3c == 1)
     {
     	print '<div align="center"><input type="submit" class="button" value="'.$langs->trans("Update").'" name="update"></div>';
     	print "</form>\n";

From a01a85c3f6eb7afc589f7c666a2533647d8e9d32 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 23 Oct 2015 15:13:02 +0200
Subject: [PATCH 34/66] FIX tag object_total_vat_x need x to be a string with
 unknown decimal lenght. Now use for x the real vat real with no more decimal
 (x = 20 or x = 8.5 or x = 5.99, ...)

---
 htdocs/core/class/commondocgenerator.class.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index 41ae45ef638..24c2fe34a93 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -388,11 +388,16 @@ abstract class CommonDocGenerator
 		// Add vat by rates
 		foreach ($object->lines as $line)
 		{
+		    // $line->tva_tx format depends on database field accuraty, no reliable. This is kept for backward comaptibility 
 			if (empty($resarray[$array_key.'_total_vat_'.$line->tva_tx])) $resarray[$array_key.'_total_vat_'.$line->tva_tx]=0;
 			$resarray[$array_key.'_total_vat_'.$line->tva_tx]+=$line->total_tva;
 			$resarray[$array_key.'_total_vat_locale_'.$line->tva_tx]=price($resarray[$array_key.'_total_vat_'.$line->tva_tx]);
+		    // $vatformated is vat without not expected chars (so 20, or 8.5 or 5.99 for example)
+			$vatformated=vatrate($line->tva_tx);
+			if (empty($resarray[$array_key.'_total_vat_'.$vatformated])) $resarray[$array_key.'_total_vat_'.$vatformated]=0;
+			$resarray[$array_key.'_total_vat_'.$vatformated]+=$line->total_tva;
+			$resarray[$array_key.'_total_vat_locale_'.$vatformated]=price($resarray[$array_key.'_total_vat_'.$vatformated]);
 		}
-
 		// Retrieve extrafields
 		if (is_array($object->array_options) && count($object->array_options))
 		{

From 016dbd39ee6535bb8099a9b2a2d3ed31305e951f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 23 Oct 2015 15:24:47 +0200
Subject: [PATCH 35/66] Fix sql phpunit regression

---
 htdocs/install/mysql/migration/3.9.0-4.0.0.sql |  2 --
 htdocs/install/mysql/tables/llx_user.sql       |  2 +-
 htdocs/user/class/user.class.php               | 10 +++++++---
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
index 231b89ee507..accf65266c1 100644
--- a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
+++ b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
@@ -86,5 +86,3 @@ CREATE TABLE IF NOT EXISTS llx_establishment (
   status            tinyint DEFAULT 1
 ) ENGINE=InnoDB;
 
-ALTER TABLE llx_user ADD COLUMN employee tinyint DEFAULT 0 AFTER ref_int;
-
diff --git a/htdocs/install/mysql/tables/llx_user.sql b/htdocs/install/mysql/tables/llx_user.sql
index c9673ceb360..e1fc421c911 100644
--- a/htdocs/install/mysql/tables/llx_user.sql
+++ b/htdocs/install/mysql/tables/llx_user.sql
@@ -26,7 +26,7 @@ create table llx_user
   ref_ext			varchar(50),				-- reference into an external system (not used by dolibarr)
   ref_int			varchar(50),				-- reference into an internal system (deprecated)
   
-  employee          tinyint        DEFAULT 0,   -- 1 if user is an employee
+  employee          tinyint        DEFAULT 1,   -- 1 if user is an employee
 
   datec             datetime,
   tms               timestamp,
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 066da9c18da..ae56be28aec 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -126,13 +126,17 @@ class User extends CommonObject
 	{
 		$this->db = $db;
 
-		// Preference utilisateur
+		// User preference
 		$this->liste_limit = 0;
 		$this->clicktodial_loaded = 0;
 
+		// For cache usage
 		$this->all_permissions_are_loaded = 0;
-		$this->admin=0;
-
+		
+		// Force some default values 
+		$this->admin = 0;
+		$this->employee = 1;
+		
 		$this->conf				    = new stdClass();
 		$this->rights				= new stdClass();
 		$this->rights->user			= new stdClass();

From 2cbfb69f9b70c851cd2e13a25010d91ab472f843 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 23 Oct 2015 15:28:14 +0200
Subject: [PATCH 36/66] Update template

---
 .../invoices/template_invoice.odt             | Bin 25534 -> 37996 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/htdocs/install/doctemplates/invoices/template_invoice.odt b/htdocs/install/doctemplates/invoices/template_invoice.odt
index e9cd7c836fb0363394d73d3579ca7f84cb33cb01..dad29a292efcae907c1af651f8caae0fba453ec1 100644
GIT binary patch
delta 36631
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
Q8tJGz?h?nUG7eGy0kU*u5&!@I

literal 25534
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
L?;oxV5PSavnVUL{


From 8fffdae1fbcc21998d6a85f1804727f85fae1f87 Mon Sep 17 00:00:00 2001
From: Philippe Grand <philippe.grand@atoo-net.com>
Date: Fri, 23 Oct 2015 19:01:50 +0200
Subject: [PATCH 37/66] Update index.php

---
 htdocs/accountancy/customer/index.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/accountancy/customer/index.php b/htdocs/accountancy/customer/index.php
index ea37f237455..5cf4dac19b1 100644
--- a/htdocs/accountancy/customer/index.php
+++ b/htdocs/accountancy/customer/index.php
@@ -86,7 +86,7 @@ if ($action == 'validatehistory') {
 		setEventMessage($db->lasterror(), 'errors');
 	} else {
 		$db->commit();
-		setEventMessage($langs->trans('Dispatched'), 'mesgs');
+		setEventMessages($langs->trans('Dispatched'), null, 'mesgs');
 	}
 }
 
@@ -346,4 +346,4 @@ print "</table>\n";
 print '</td></tr></table>';
 
 llxFooter();
-$db->close();
\ No newline at end of file
+$db->close();

From c007ae9361777c261ac107a3014b6451b39d476c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 24 Oct 2015 13:16:59 +0200
Subject: [PATCH 38/66] Fix php code not executed with some php version

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

diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 45ca3a5b728..1307304d1d6 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -699,7 +699,7 @@ div#tmenu_tooltip {
 <?php if (GETPOST("optioncss") == 'print') {  ?>
 	display:none;
 <?php } else { ?>
-	padding-<?php echo $right; ?>: <? echo ($maxwidthloginblock - 10); ?>px;
+	padding-<?php echo $right; ?>: <?php echo ($maxwidthloginblock - 10); ?>px;
 <?php } ?>
 }
 
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 0fa988c16e8..4749d52f89c 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -731,7 +731,7 @@ div#tmenu_tooltip {
 <?php if (GETPOST("optioncss") == 'print') {  ?>
 	display:none;
 <?php } else { ?>
-	/* padding-<?php echo $right; ?>: <? echo ($maxwidthloginblock - 10); ?>px; */
+	/* padding-<?php echo $right; ?>: <?php echo ($maxwidthloginblock - 10); ?>px; */
 <?php } ?>
 }
 

From 43c80bec7d81a61c4f38759e3232562a6826f9fb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 24 Oct 2015 13:52:35 +0200
Subject: [PATCH 39/66] A better responsive menu for very small screen

---
 htdocs/main.inc.php              | 12 ++++--------
 htdocs/theme/eldy/style.css.php  | 21 +++++++++++++++++----
 htdocs/theme/md/style.css.php    | 20 +++++++++++++++++---
 htdocs/user/class/user.class.php | 31 +++++++++++++++++++++----------
 4 files changed, 59 insertions(+), 25 deletions(-)

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index ffc7d7c4777..4ece8af95c2 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1485,14 +1485,10 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
 	    // Add login user link
 	    $toprightmenu.='<div class="login_block_user">';
 
-	    // User photo
-	    $toprightmenu.='<div class="inline-block nowrap"><div class="inline-block login_block_elem" style="padding: 0px;">';
-	    $toprightmenu.=$user->getPhotoUrl(0,0,'loginphoto');
-	    $toprightmenu.='</div></div>';
-
-	    // Login name with tooltip
-		$toprightmenu.='<div class="inline-block nowrap"><div class="inline-block login_block_elem login_block_elem_name" style="padding: 0px;">';
-        $toprightmenu.=$user->getNomurl(0, '', true, 0, 11, 0, ($user->firstname ? 'firstname' : -1),'atoplogin');
+	    // Login name with photo and tooltip
+		$mode=-1;
+	    $toprightmenu.='<div class="inline-block nowrap"><div class="inline-block login_block_elem login_block_elem_name" style="padding: 0px;">';
+        $toprightmenu.=$user->getNomurl($mode, '', true, 0, 11, 0, ($user->firstname ? 'firstname' : -1),'atoplogin');
         $toprightmenu.='</div></div>';
 
 		$toprightmenu.='</div>';
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 1307304d1d6..c152e1d93a3 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -888,7 +888,6 @@ div.mainmenu.members {
 
 div.mainmenu.products {
 	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/products.png',1) ?>);
-	margin-left: 10px;
 }
 
 div.mainmenu.project {
@@ -3877,7 +3876,22 @@ border-top-right-radius: 6px;
 }
 @media only screen and (max-width: 570px)
 {
-    div.mainmenu {
+	/* Reduce login top right info */
+	.usertextatoplogin {
+		display: none;
+	}
+	div#tmenu_tooltip {
+	<?php if (GETPOST("optioncss") == 'print') {  ?>
+		display:none;
+	<?php } else { ?>
+		padding-<?php echo $right; ?>: 78px;
+	<?php } ?>
+	}
+	div.login_block {
+		top: 9px;
+	}
+	
+	div.mainmenu {
     	min-width: 20px;
     }
 	.topmenuimage {
@@ -3887,9 +3901,8 @@ border-top-right-radius: 6px;
 	#tooltip {
 		position: absolute;
 		width: <?php print dol_size(300,'width'); ?>px;
-	}	
+	}
 }
 
-
 <?php
 if (is_object($db)) $db->close();
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 4749d52f89c..db6cfa50f86 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -499,7 +499,7 @@ div.confirmmessage {
 .maxwidth100 { max-width: 100px; }
 .maxwidth200 { max-width: 200px; }
 .maxwidth300 { max-width: 300px; }
-.titlefield { width: 25%; }
+.titlefield { width: 30%; }
 <?php if (! empty($dol_optimize_smallscreen)) { ?>
 .hideonsmartphone { display: none; }
 .noenlargeonsmartphone { width : 50px !important; display: inline !important; }
@@ -913,7 +913,6 @@ div.mainmenu.members {
 
 div.mainmenu.products {
 	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/products.png',1) ?>);
-	margin-left: 10px;
 }
 
 div.mainmenu.project {
@@ -3715,7 +3714,22 @@ border-top-right-radius: 6px;
 }
 @media only screen and (max-width: 570px)
 {
-    div.mainmenu {
+	/* Reduce login top right info */
+	.usertextatoplogin {
+		display: none;
+	}
+	div#tmenu_tooltip {
+	<?php if (GETPOST("optioncss") == 'print') {  ?>
+		display:none;
+	<?php } else { ?>
+		/* padding-<?php echo $right; ?>: 78px; */
+	<?php } ?>
+	}
+	div.login_block {
+		top: 9px;
+	}
+
+	div.mainmenu {
     	min-width: 20px;
     }
 	.topmenuimage {
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index ae56be28aec..965ac2544b8 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -1842,23 +1842,24 @@ class User extends CommonObject
 	 *  Return a link to the user card (with optionaly the picto)
 	 * 	Use this->id,this->lastname, this->firstname
 	 *
-	 *	@param	int		$withpicto			Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
+	 *	@param	int		$withpictoimg		Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto, -1=Include photo into link, -2=Only picto photo)
 	 *	@param	string	$option				On what the link point to
      *  @param  integer $infologin      	Add connection info to the tooltip
-     *  @param	integer	$notooltip			1=Disable tooltip
+     *  @param	integer	$notooltip			1=Disable tooltip on picto and name
      *  @param	int		$maxlen				Max length of visible user name
      *  @param	int		$hidethirdpartylogo	Hide logo of thirdparty if user is external user
      *  @param  string  $mode               'firstname'=Show only firstname
      *  @param  string  $morecss            Add more css on link
 	 *	@return	string						String with URL
 	 */
-	function getNomUrl($withpicto=0, $option='', $infologin=0, $notooltip=0, $maxlen=24, $hidethirdpartylogo=0, $mode='',$morecss='')
+	function getNomUrl($withpictoimg=0, $option='', $infologin=0, $notooltip=0, $maxlen=24, $hidethirdpartylogo=0, $mode='',$morecss='')
 	{
 		global $langs, $conf, $db;
         global $dolibarr_main_authentication, $dolibarr_main_demo;
         global $menumanager;
 
-
+		if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && $withpictoimg) $withpictoimg=0;
+			
         $result = '';
         $companylink = '';
 
@@ -1908,18 +1909,28 @@ class User extends CommonObject
             if (! empty($_SESSION["disablemodules"])) $label.= '<br><b>'.$langs->trans("DisabledModules").':</b> <br>'.join(', ',explode(',',$_SESSION["disablemodules"]));
         }
 
-
-        $link = '<a href="'.DOL_URL_ROOT.'/user/card.php?id='.$this->id.'"';
+        $link.= '<a href="'.DOL_URL_ROOT.'/user/card.php?id='.$this->id.'"';
         $link.= ($notooltip?'':' title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip'.($morecss?' '.$morecss:'').'"');
         $link.= '>';
 		$linkend='</a>';
 
-        if ($withpicto)
+        if (abs($withpictoimg) == 1) $result.='<div class="nowrap">';
+		$result.=$link;
+        if ($withpictoimg)
         {
-            $result.=($link.img_object(($notooltip?'':$label), 'user', ($notooltip?'':'class="classfortooltip"')).$linkend);
-            if ($withpicto != 2) $result.=' ';
+        	$paddafterimage='';
+            if (abs($withpictoimg) == 1) $paddafterimage='style="padding-right: 3px;"';
+        	if ($withpictoimg > 0) $picto='<div class="inline-block valignmiddle'.($morecss?' userimg'.$morecss:'').'">'.img_object('', 'user', $paddafterimage.' '.($notooltip?'':'class="classfortooltip"')).'</div>';
+        	else $picto='<div class="inline-block valignmiddle'.($morecss?' userimg'.$morecss:'').'"'.($paddafterimage?' '.$paddafterimage:'').'>'.Form::showphoto('userphoto', $this, 0, 0, 0, 'loginphoto').'</div>';
+            $result.=$picto;
 		}
-		$result.= $link . $this->getFullName($langs,'',($mode == 'firstname' ? 2 : -1),$maxlen) . $linkend . $companylink;
+		if (abs($withpictoimg) != 2) 
+		{
+			$result.='<div class="inline-block valignmiddle'.($morecss?' usertext'.$morecss:'').'">'.$this->getFullName($langs,'',($mode == 'firstname' ? 2 : -1),$maxlen).'</div>';
+		}
+		$result.=$linkend;
+		if (abs($withpictoimg) == 1) $result.='</div>';
+		$result.=$companylink;
 		return $result;
 	}
 

From 082e41b6c0dfbe5473e3cb6dcc41b5b280e417bd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 24 Oct 2015 13:58:28 +0200
Subject: [PATCH 40/66] Bette translation

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

diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang
index 7ea9f32830d..94e1fa60251 100644
--- a/htdocs/langs/en_US/bills.lang
+++ b/htdocs/langs/en_US/bills.lang
@@ -216,8 +216,8 @@ DateEcheance=Due date limit
 DateInvoice=Invoice date
 NoInvoice=No invoice
 ClassifyBill=Classify invoice
-SupplierBillsToPay=Suppliers invoices to pay
-CustomerBillsUnpaid=Unpaid customers invoices
+SupplierBillsToPay=Unpaid supplier invoices
+CustomerBillsUnpaid=Unpaid customer invoices
 NonPercuRecuperable=Non-recoverable
 SetConditions=Set payment terms
 SetMode=Set payment mode

From 3015a0388a41458fabc27d3bd7e40b5bde42b7ba Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 24 Oct 2015 16:09:26 +0200
Subject: [PATCH 41/66] NEW List of projects of a thirdparty are visible on a
 project tab

---
 htdocs/core/lib/company.lib.php        |  26 ++--
 htdocs/projet/card.php                 |   4 +-
 htdocs/societe/agenda.php              |  41 ++---
 htdocs/societe/class/societe.class.php |  14 +-
 htdocs/societe/notify/card.php         |   2 +
 htdocs/societe/price.php               | 208 +++++++++++++------------
 htdocs/societe/project.php             | 156 +++++++++++++++++++
 htdocs/societe/soc.php                 |   3 -
 8 files changed, 318 insertions(+), 136 deletions(-)
 create mode 100644 htdocs/societe/project.php

diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index 86c5f717f4b..70988d7e330 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -91,6 +91,13 @@ function societe_prepare_head(Societe $object)
     	$head[$h][2] = 'agenda';
     	$h++;
     }
+    if (! empty($conf->projet->enabled) && (!empty($user->rights->projet->lire) ))
+    {
+    	$head[$h][0] = DOL_URL_ROOT.'/societe/project.php?socid='.$object->id;
+    	$head[$h][1] = $langs->trans("Projects");
+    	$head[$h][2] = 'project';
+    	$h++;
+    }
     //show categorie tab
     /*if (! empty($conf->categorie->enabled)  && ! empty($user->rights->categorie->lire))
     {
@@ -456,9 +463,10 @@ function getFormeJuridiqueLabel($code)
  * 		@param	DoliDB		$db				Database handler
  * 		@param	Object		$object			Third party object
  *      @param  string		$backtopage		Url to go once contact is created
+ *      @param  int         $nocreatelink   1=Hide create project link
  *      @return	void
  */
-function show_projects($conf,$langs,$db,$object,$backtopage='')
+function show_projects($conf, $langs, $db, $object, $backtopage='', $nocreatelink=0)
 {
     global $user;
     global $bc;
@@ -470,7 +478,7 @@ function show_projects($conf,$langs,$db,$object,$backtopage='')
         $langs->load("projects");
 
         $buttoncreate='';
-        if (! empty($conf->projet->enabled) && $user->rights->projet->creer)
+        if (! empty($conf->projet->enabled) && $user->rights->projet->creer && empty($nocreatelink))
         {
             //$buttoncreate='<a class="butAction" href="'.DOL_URL_ROOT.'/projet/card.php?socid='.$object->id.'&action=create&amp;backtopage='.urlencode($backtopage).'">'.$langs->trans("AddProject").'</a>';
 			$buttoncreate='<a class="addnewrecord" href="'.DOL_URL_ROOT.'/projet/card.php?socid='.$object->id.'&amp;action=create&amp;backtopage='.urlencode($backtopage).'">'.$langs->trans("AddProject");
@@ -864,13 +872,13 @@ function show_addresses($conf,$langs,$db,$object,$backtopage='')
 /**
  *    	Show html area with actions to do
  *
- * 		@param	Conf		$conf		Object conf
- * 		@param	Translate	$langs		Object langs
- * 		@param	DoliDB		$db			Object db
- * 		@param	Adherent|Societe		$object		Object third party or member
- * 		@param	Contact		$objcon		Object contact
- *      @param  int			$noprint	Return string but does not output it
- *      @return	mixed					Return html part or void if noprint is 1
+ * 		@param	Conf		$conf		       Object conf
+ * 		@param	Translate	$langs		       Object langs
+ * 		@param	DoliDB		$db			       Object db
+ * 		@param	Adherent|Societe    $object    Object third party or member
+ * 		@param	Contact		$objcon	           Object contact
+ *      @param  int			$noprint	       Return string but does not output it
+ *      @return	mixed						   Return html part or void if noprint is 1
  */
 function show_actions_todo($conf,$langs,$db,$object,$objcon='',$noprint=0)
 {
diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index e5000d008f2..748f91dbefe 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -624,7 +624,7 @@ else
         print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td>';
         print '<td><input size="40" name="title" value="'.$object->title.'"></td></tr>';
 
-        // Customer
+        // Thirdparty
         print '<tr><td>'.$langs->trans("ThirdParty").'</td><td>';
 	    $filteronlist='';
 	    if (! empty($conf->global->PROJECT_FILTER_FOR_THIRDPARTY_LIST)) $filteronlist=$conf->global->PROJECT_FILTER_FOR_THIRDPARTY_LIST;
@@ -713,7 +713,7 @@ else
 
         // Third party
         print '<tr><td>'.$langs->trans("ThirdParty").'</td><td>';
-        if ($object->thirdparty->id > 0) print $object->thirdparty->getNomUrl(1);
+        if ($object->thirdparty->id > 0) print $object->thirdparty->getNomUrl(1, 'project');
         else print'&nbsp;';
         print '</td></tr>';
 
diff --git a/htdocs/societe/agenda.php b/htdocs/societe/agenda.php
index b35715ce1ab..3d72ad9d328 100644
--- a/htdocs/societe/agenda.php
+++ b/htdocs/societe/agenda.php
@@ -121,17 +121,34 @@ if ($socid)
 
 	dol_fiche_end();
 
-    /*
+
+	
+	/*
      * Barre d'action
      */
 
-    print '<div class="tabsAction">';
+    $objthirdparty=$object;
+    $objcon=new stdClass();
+	
+    $out='';
+    $permok=$user->rights->agenda->myactions->create;
+    if ((! empty($objthirdparty->id) || ! empty($objcon->id)) && $permok)
+    {
+        //$out.='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create';
+        if (get_class($objthirdparty) == 'Societe') $out.='&amp;socid='.$objthirdparty->id;
+        $out.=(! empty($objcon->id)?'&amp;contactid='.$objcon->id:'').'&amp;backtopage=1&amp;percentage=-1';
+    	//$out.=$langs->trans("AddAnAction").' ';
+    	//$out.=img_picto($langs->trans("AddAnAction"),'filenew');
+    	//$out.="</a>";
+	}
+
+	print '<div class="tabsAction">';
 
     if (! empty($conf->agenda->enabled))
     {
     	if (! empty($user->rights->agenda->myactions->create) || ! empty($user->rights->agenda->allactions->create))
     	{
-        	print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&socid='.$socid.'">'.$langs->trans("AddAction").'</a>';
+        	print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out.'">'.$langs->trans("AddAction").'</a>';
     	}
     	else
     	{
@@ -143,25 +160,11 @@ if ($socid)
 
     print '<br>';
 
-    $objthirdparty=$object;
-    $objcon=new stdClass();
 
-    $out='';
-    $permok=$user->rights->agenda->myactions->create;
-    if ((! empty($objthirdparty->id) || ! empty($objcon->id)) && $permok)
-    {
-        $out.='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create';
-        if (get_class($objthirdparty) == 'Societe') $out.='&amp;socid='.$objthirdparty->id;
-        $out.=(! empty($objcon->id)?'&amp;contactid='.$objcon->id:'').'&amp;backtopage=1&amp;percentage=-1">';
-    	$out.=$langs->trans("AddAnAction").' ';
-    	$out.=img_picto($langs->trans("AddAnAction"),'filenew');
-    	$out.="</a>";
-	}
-
-    print load_fiche_titre($langs->trans("ActionsOnCompany"),$out,'');
+    print load_fiche_titre($langs->trans("ActionsOnCompany"),'','');
 
     // List of todo actions
-    show_actions_todo($conf,$langs,$db,$object);
+    show_actions_todo($conf,$langs,$db,$object,null,0,1);
 
     // List of done actions
     show_actions_done($conf,$langs,$db,$object);
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 21de67bfcf7..1f5f10c9178 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -1747,12 +1747,12 @@ class Societe extends CommonObject
      *    	Return a link on thirdparty (with picto)
      *
      *		@param	int		$withpicto		Add picto into link (0=No picto, 1=Include picto with link, 2=Picto only)
-     *		@param	string	$option			Target of link ('', 'customer', 'prospect', 'supplier')
+     *		@param	string	$option			Target of link ('', 'customer', 'prospect', 'supplier', 'project')
      *		@param	int		$maxlen			Max length of name
      *      @param	integer	$notooltip		1=Disable tooltip
      *		@return	string					String with URL
      */
-    function getNomUrl($withpicto=0,$option='',$maxlen=0,$notooltip=0)
+    function getNomUrl($withpicto=0, $option='', $maxlen=0, $notooltip=0)
     {
         global $conf,$langs;
 
@@ -1795,6 +1795,16 @@ class Societe extends CommonObject
             $label.= '<u>' . $langs->trans("ShowSupplier") . '</u>';
             $link = '<a href="'.DOL_URL_ROOT.'/fourn/card.php?socid='.$this->id;
         }
+        else if ($option == 'agenda')
+        {
+            $label.= '<u>' . $langs->trans("ShowAgenda") . '</u>';
+            $link = '<a href="'.DOL_URL_ROOT.'/societe/agenda.php?socid='.$this->id;
+        }
+        else if ($option == 'project')
+        {
+            $label.= '<u>' . $langs->trans("ShowProject") . '</u>';
+            $link = '<a href="'.DOL_URL_ROOT.'/societe/project.php?socid='.$this->id;
+        }
         else if ($option == 'category')
         {
             $label.= '<u>' . $langs->trans("ShowCategory") . '</u>';
diff --git a/htdocs/societe/notify/card.php b/htdocs/societe/notify/card.php
index 291f81a6fe8..6a6fb7ab1df 100644
--- a/htdocs/societe/notify/card.php
+++ b/htdocs/societe/notify/card.php
@@ -195,6 +195,8 @@ if ($result > 0)
 
     print "\n";
 
+    print '<br>';
+    
     // Add notification form
     print load_fiche_titre($langs->trans("AddNewNotification"),'','');
 
diff --git a/htdocs/societe/price.php b/htdocs/societe/price.php
index e5f89779225..f739c0ac6fa 100644
--- a/htdocs/societe/price.php
+++ b/htdocs/societe/price.php
@@ -429,107 +429,8 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 	} 
 	else 
 	{
+        // View mode
 
-		// View mode
-
-		// Count total nb of records
-		$nbtotalofrecords = 0;
-		if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
-			$nbtotalofrecords = $prodcustprice->fetch_all('', '', 0, 0, $filter);
-		}
-
-		$result = $prodcustprice->fetch_all($sortorder, $sortfield, $conf->liste_limit, $offset, $filter);
-		if ($result < 0) {
-			setEventMessage($prodcustprice->error, 'errors');
-		}
-
-		$option = '&search_soc=' . $search_soc . '&id=' . $object->id;
-
-		print_barre_liste($langs->trans('PriceForEachProduct'), $page, $_SERVEUR ['PHP_SELF'], $option, $sortfield, $sortorder, '', count($prodcustprice->lines), $nbtotalofrecords);
-
-			print '<form action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '" method="POST">';
-			print '<input type="hidden" name="id" value="' . $object->id . '">';
-
-			print '<table class="noborder" width="100%">';
-
-			print '<tr class="liste_titre">';
-			print '<td>' . $langs->trans("Product") . '</td>';
-			print '<td>' . $langs->trans("AppliedPricesFrom") . '</td>';
-			print '<td align="center">' . $langs->trans("PriceBase") . '</td>';
-			print '<td align="right">' . $langs->trans("VAT") . '</td>';
-			print '<td align="right">' . $langs->trans("HT") . '</td>';
-			print '<td align="right">' . $langs->trans("TTC") . '</td>';
-			print '<td align="right">' . $langs->trans("MinPrice") . ' ' . $langs->trans("HT") . '</td>';
-			print '<td align="right">' . $langs->trans("MinPrice") . ' ' . $langs->trans("TTC") . '</td>';
-			print '<td align="right">' . $langs->trans("ChangedBy") . '</td>';
-			print '<td>&nbsp;</td>';
-			print '</tr>';
-
-		if (count($prodcustprice->lines) > 0) {
-
-			print '<tr class="liste_titre">';
-			print '<td><input type="text" class="flat" name="search_soc" value="' . $search_soc . '" size="20"></td>';
-			print '<td colspan="8">&nbsp;</td>';
-			// Print the search button
-			print '<td class="liste_titre" align="right">';
-			print '<input class="liste_titre" name="button_search" type="image" src="' . DOL_URL_ROOT . '/theme/' . $conf->theme . '/img/search.png" value="' . dol_escape_htmltag($langs->trans("Search")) . '" title="' . dol_escape_htmltag($langs->trans("Search")) . '">';
-			print '</td>';
-			print '</tr>';
-
-			$var = False;
-
-			foreach($prodcustprice->lines as $line)
-			{
-				print "<tr ".$bc[$var].">";
-
-				$staticprod = new Product($db);
-				$staticprod->fetch($line->fk_product);
-
-				print "<td>" . $staticprod->getNomUrl(1) . "</td>";
-				print "<td>" . dol_print_date($line->datec, "dayhour") . "</td>";
-
-				print '<td align="center">' . $langs->trans($line->price_base_type) . "</td>";
-				print '<td align="right">' . vatrate($line->tva_tx, true, $line->recuperableonly) . "</td>";
-				print '<td align="right">' . price($line->price) . "</td>";
-				print '<td align="right">' . price($line->price_ttc) . "</td>";
-				print '<td align="right">' . price($line->price_min) . '</td>';
-				print '<td align="right">' . price($line->price_min_ttc) . '</td>';
-
-				// User
-				$userstatic = new User($db);
-				$userstatic->fetch($line->fk_user);
-				print '<td align="right">';
-				print $userstatic->getLoginUrl(1);
-				print '</td>';
-
-				// Todo Edit or delete button
-				// Action
-				if ($user->rights->produit->creer || $user->rights->service->creer) {
-					print '<td align="right">';
-					print '<a href="' . $_SERVER["PHP_SELF"] . '?action=showlog_customer_price&amp;socid=' . $object->id . '&amp;prodid=' . $line->fk_product . '">';
-					print img_info();
-					print '</a>';
-					print ' ';
-					print '<a href="' . $_SERVER["PHP_SELF"] . '?action=edit_customer_price&amp;socid=' . $object->id . '&amp;lineid=' . $line->id . '">';
-					print img_edit('default', 0, 'style="vertical-align: middle;"');
-					print '</a>';
-					print ' ';
-					print '<a href="' . $_SERVER["PHP_SELF"] . '?action=delete_customer_price&amp;socid=' . $object->id . '&amp;lineid=' . $line->id . '">';
-					print img_delete('default', 'style="vertical-align: middle;"');
-					print '</a>';
-					print '</td>';
-				}
-
-				print "</tr>\n";
-			}
-		} else {
-			print '<tr '.$bc[false].'><td colspan="10">'.$langs->trans('NoPriceSpecificToCustomer').'</td></tr>';
-		}
-
-			print "</table>";
-
-			print "</form>";
-		
 		/* ************************************************************************** */
 		/*                                                                            */
 		/* Barre d'action                                                             */
@@ -541,7 +442,112 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 		if ($user->rights->produit->creer || $user->rights->service->creer) {
 			print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?action=add_customer_price&amp;socid=' . $object->id . '">' . $langs->trans("AddCustomerPrice") . '</a></div>';
 		}
-		print "\n</div><br>\n";
+		print "\n</div>\n";
+	    
+	    
+        // Count total nb of records
+        $nbtotalofrecords = 0;
+        if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
+        {
+            $nbtotalofrecords = $prodcustprice->fetch_all('', '', 0, 0, $filter);
+        }
+        
+        $result = $prodcustprice->fetch_all($sortorder, $sortfield, $conf->liste_limit, $offset, $filter);
+        if ($result < 0)
+        {
+            setEventMessage($prodcustprice->error, 'errors');
+        }
+        
+        $option = '&search_soc=' . $search_soc . '&id=' . $object->id;
+        
+        print_barre_liste($langs->trans('PriceForEachProduct'), $page, $_SERVEUR['PHP_SELF'], $option, $sortfield, $sortorder, '', count($prodcustprice->lines), $nbtotalofrecords, '');
+        
+        print '<form action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '" method="POST">';
+        print '<input type="hidden" name="id" value="' . $object->id . '">';
+        
+        print '<table class="noborder" width="100%">';
+        
+        print '<tr class="liste_titre">';
+        print '<td>' . $langs->trans("Product") . '</td>';
+        print '<td>' . $langs->trans("AppliedPricesFrom") . '</td>';
+        print '<td align="center">' . $langs->trans("PriceBase") . '</td>';
+        print '<td align="right">' . $langs->trans("VAT") . '</td>';
+        print '<td align="right">' . $langs->trans("HT") . '</td>';
+        print '<td align="right">' . $langs->trans("TTC") . '</td>';
+        print '<td align="right">' . $langs->trans("MinPrice") . ' ' . $langs->trans("HT") . '</td>';
+        print '<td align="right">' . $langs->trans("MinPrice") . ' ' . $langs->trans("TTC") . '</td>';
+        print '<td align="right">' . $langs->trans("ChangedBy") . '</td>';
+        print '<td>&nbsp;</td>';
+        print '</tr>';
+        
+        if (count($prodcustprice->lines) > 0)
+        {
+            
+            print '<tr class="liste_titre">';
+            print '<td><input type="text" class="flat" name="search_soc" value="' . $search_soc . '" size="20"></td>';
+            print '<td colspan="8">&nbsp;</td>';
+            // Print the search button
+            print '<td class="liste_titre" align="right">';
+            print '<input class="liste_titre" name="button_search" type="image" src="' . DOL_URL_ROOT . '/theme/' . $conf->theme . '/img/search.png" value="' . dol_escape_htmltag($langs->trans("Search")) . '" title="' . dol_escape_htmltag($langs->trans("Search")) . '">';
+            print '</td>';
+            print '</tr>';
+            
+            $var = False;
+            
+            foreach ($prodcustprice->lines as $line)
+            {
+                print "<tr " . $bc[$var] . ">";
+                
+                $staticprod = new Product($db);
+                $staticprod->fetch($line->fk_product);
+                
+                print "<td>" . $staticprod->getNomUrl(1) . "</td>";
+                print "<td>" . dol_print_date($line->datec, "dayhour") . "</td>";
+                
+                print '<td align="center">' . $langs->trans($line->price_base_type) . "</td>";
+                print '<td align="right">' . vatrate($line->tva_tx, true, $line->recuperableonly) . "</td>";
+                print '<td align="right">' . price($line->price) . "</td>";
+                print '<td align="right">' . price($line->price_ttc) . "</td>";
+                print '<td align="right">' . price($line->price_min) . '</td>';
+                print '<td align="right">' . price($line->price_min_ttc) . '</td>';
+                
+                // User
+                $userstatic = new User($db);
+                $userstatic->fetch($line->fk_user);
+                print '<td align="right">';
+                print $userstatic->getLoginUrl(1);
+                print '</td>';
+                
+                // Todo Edit or delete button
+                // Action
+                if ($user->rights->produit->creer || $user->rights->service->creer)
+                {
+                    print '<td align="right">';
+                    print '<a href="' . $_SERVER["PHP_SELF"] . '?action=showlog_customer_price&amp;socid=' . $object->id . '&amp;prodid=' . $line->fk_product . '">';
+                    print img_info();
+                    print '</a>';
+                    print ' ';
+                    print '<a href="' . $_SERVER["PHP_SELF"] . '?action=edit_customer_price&amp;socid=' . $object->id . '&amp;lineid=' . $line->id . '">';
+                    print img_edit('default', 0, 'style="vertical-align: middle;"');
+                    print '</a>';
+                    print ' ';
+                    print '<a href="' . $_SERVER["PHP_SELF"] . '?action=delete_customer_price&amp;socid=' . $object->id . '&amp;lineid=' . $line->id . '">';
+                    print img_delete('default', 'style="vertical-align: middle;"');
+                    print '</a>';
+                    print '</td>';
+                }
+                
+                print "</tr>\n";
+            }
+        } else
+        {
+            print '<tr ' . $bc[false] . '><td colspan="10">' . $langs->trans('NoPriceSpecificToCustomer') . '</td></tr>';
+        }
+        
+        print "</table>";
+        
+        print "</form>";
+		
 	}
 }
 
diff --git a/htdocs/societe/project.php b/htdocs/societe/project.php
new file mode 100644
index 00000000000..6eb9765d034
--- /dev/null
+++ b/htdocs/societe/project.php
@@ -0,0 +1,156 @@
+<?php
+/* Copyright (C) 2001-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2005      Brice Davoleau       <brice.davoleau@gmail.com>
+ * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2006-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2007      Patrick Raguin  		<patrick.raguin@gmail.com>
+ * Copyright (C) 2010      Juanjo Menent        <jmenent@2byte.es>
+ * Copyright (C) 2015      Marcos García        <marcosgdf@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * 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/societe/project.php
+ *  \ingroup    societe
+ *  \brief      Page of third party projects
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+
+$langs->load("companies");
+
+// Security check
+$socid = GETPOST('socid','int');
+if ($user->societe_id) $socid=$user->societe_id;
+$result = restrictedArea($user, 'societe', $socid, '&societe');
+
+// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+$hookmanager->initHooks(array('projectthirdparty'));
+
+
+/*
+ *	Actions
+ */
+
+$parameters=array('id'=>$socid);
+$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+
+
+/*
+ *	View
+ */
+
+$contactstatic = new Contact($db);
+
+$form = new Form($db);
+
+if ($socid)
+{
+	require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+	require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+
+	$langs->load("companies");
+
+
+	$object = new Societe($db);
+	$result = $object->fetch($socid);
+
+	$title=$langs->trans("Agenda");
+	if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
+	llxHeader('',$title);
+
+	if (! empty($conf->notification->enabled)) $langs->load("mails");
+	$head = societe_prepare_head($object);
+
+	dol_fiche_head($head, 'project', $langs->trans("ThirdParty"),0,'company');
+
+    dol_banner_tab($object, 'socid', '', ($user->societe_id?0:1), 'rowid', 'nom');
+        
+    print '<div class="fichecenter">';
+    
+    print '<div class="underbanner clearboth"></div>';
+	print '<table class="border centpercent">';
+
+	// Alias names (commercial, trademark or alias names)
+	print '<tr><td class="titlefield">'.$langs->trans('AliasNames').'</td><td colspan="3">';
+	print $object->name_alias;
+	print "</td></tr>";
+
+    if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
+    {
+        print '<tr><td>'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
+    }
+
+	if ($object->client)
+	{
+		print '<tr><td>';
+		print $langs->trans('CustomerCode').'</td><td colspan="3">';
+		print $object->code_client;
+		if ($object->check_codeclient() <> 0) print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+		print '</td></tr>';
+	}
+
+	if ($object->fournisseur)
+	{
+		print '<tr><td>';
+		print $langs->trans('SupplierCode').'</td><td colspan="3">';
+		print $object->code_fournisseur;
+		if ($object->check_codefournisseur() <> 0) print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+		print '</td></tr>';
+	}
+
+	print '</table>';
+
+	print '</div>';
+
+	dol_fiche_end();
+
+	
+    /*
+     * Barre d'action
+     */
+
+    print '<div class="tabsAction">';
+
+    if (! empty($conf->projet->enabled))
+    {
+    	if (! empty($conf->projet->enabled) && ! empty($user->rights->projet->creer))
+    	{
+        	print '<a class="butAction" href="'.DOL_URL_ROOT.'/projet/card.php?action=create&socid='.$object->id.'&amp;backtopage='.urlencode($backtopage).'">'.$langs->trans("AddProject").'</a>';
+    	}
+    	else
+    	{
+        	print '<a class="butActionRefused" href="#">'.$langs->trans("AddProject").'</a>';
+    	}
+    }
+
+    print '</div>';
+    
+	
+    print '<br>';
+
+    
+    // Projects list
+    $result=show_projects($conf, $langs, $db, $object, $_SERVER["PHP_SELF"].'?socid='.$object->id, 1);
+}
+
+
+llxFooter();
+
+$db->close();
diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php
index 9fa6e117279..93fff61d1f1 100644
--- a/htdocs/societe/soc.php
+++ b/htdocs/societe/soc.php
@@ -2481,9 +2481,6 @@ else
 	        {
 	        	$result=show_addresses($conf,$langs,$db,$object,$_SERVER["PHP_SELF"].'?socid='.$object->id);
 	        }
-
-	        // Projects list
-	        $result=show_projects($conf,$langs,$db,$object,$_SERVER["PHP_SELF"].'?socid='.$object->id);
 		}
     }
 

From 5181afd49d17a7f3c641fe5e03146096e0459a18 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 24 Oct 2015 19:29:41 +0200
Subject: [PATCH 42/66] Disable dead code

---
 htdocs/comm/card.php     | 5 +++--
 htdocs/societe/price.php | 2 ++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index 3e20d611785..fe164006a29 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -184,7 +184,7 @@ $help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
 llxHeader('',$title,$help_url);
 
 
-
+/*
 if ($mode == 'search')
 {
 	if ($modesearch == 'soc')
@@ -209,7 +209,7 @@ if ($mode == 'search')
 		$db->free($resql);
 	}
 }
-
+*/
 
 if ($id > 0)
 {
@@ -1021,6 +1021,7 @@ if ($id > 0)
         // List of done actions
 		show_actions_done($conf,$langs,$db,$object);
 	}
+
 }
 else
 {
diff --git a/htdocs/societe/price.php b/htdocs/societe/price.php
index f739c0ac6fa..159dcb69d18 100644
--- a/htdocs/societe/price.php
+++ b/htdocs/societe/price.php
@@ -172,6 +172,8 @@ print '</div>';
 
 dol_fiche_end();
 
+
+
 if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 
 	$prodcustprice = new Productcustomerprice($db);

From b88a28b660f6073416575c2370b69c7ea88366d3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 24 Oct 2015 19:45:41 +0200
Subject: [PATCH 43/66] Restore compatibility with old version

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

diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 965ac2544b8..2addea47f87 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -1862,6 +1862,7 @@ class User extends CommonObject
 			
         $result = '';
         $companylink = '';
+        $link = '';
 
         $label = '<u>' . $langs->trans("User") . '</u>';
         $label.= '<div width="100%">';
@@ -1914,7 +1915,7 @@ class User extends CommonObject
         $link.= '>';
 		$linkend='</a>';
 
-        if (abs($withpictoimg) == 1) $result.='<div class="nowrap">';
+        //if ($withpictoimg == -1) $result.='<div class="nowrap">';
 		$result.=$link;
         if ($withpictoimg)
         {
@@ -1929,7 +1930,7 @@ class User extends CommonObject
 			$result.='<div class="inline-block valignmiddle'.($morecss?' usertext'.$morecss:'').'">'.$this->getFullName($langs,'',($mode == 'firstname' ? 2 : -1),$maxlen).'</div>';
 		}
 		$result.=$linkend;
-		if (abs($withpictoimg) == 1) $result.='</div>';
+		//if ($withpictoimg == -1) $result.='</div>';
 		$result.=$companylink;
 		return $result;
 	}

From 9d26d0fa4d09bdd8289e7592d477628099c6cafa Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 24 Oct 2015 21:13:28 +0200
Subject: [PATCH 44/66] Restore compatibility with old version

---
 htdocs/core/class/html.form.class.php | 11 ++++++-----
 htdocs/user/class/user.class.php      |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 7b472b2a163..bc26812bd29 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -5255,9 +5255,10 @@ class Form
      * 		@param	int			$caneditfield		Add edit fields
      * 		@param	string		$cssclass			CSS name to use on img for photo
      * 		@param	int			$genericifundef		Use a generic image if no image avaiable
+     *      @param  int         $addlinktofullsize  Add link to fullsize image
      * 	  	@return string    						HTML code to output photo
      */
-    static function showphoto($modulepart, $object, $width=100, $height=0, $caneditfield=0, $cssclass='photowithmargin', $genericifundef=0)
+    static function showphoto($modulepart, $object, $width=100, $height=0, $caneditfield=0, $cssclass='photowithmargin', $genericifundef=0,$addlinktofullsize=1)
     {
         global $conf,$langs;
 
@@ -5303,15 +5304,15 @@ class Form
             $cache='0';
             if ($file && file_exists($dir."/".$file))
             {
-                $ret.='<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$entity.'&file='.urlencode($file).'&cache='.$cache.'">';
+                if ($addlinktofullsize) $ret.='<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$entity.'&file='.urlencode($file).'&cache='.$cache.'">';
                 $ret.='<img alt="Photo" id="photologo'.(preg_replace('/[^a-z]/i','_',$file)).'" class="'.$cssclass.'" '.($width?' width="'.$width.'"':'').($height?' height="'.$height.'"':'').' src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$entity.'&file='.urlencode($file).'&cache='.$cache.'">';
-                $ret.='</a>';
+                if ($addlinktofullsize) $ret.='</a>';
             }
             else if ($altfile && file_exists($dir."/".$altfile))
             {
-                $ret.='<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$entity.'&file='.urlencode($file).'&cache='.$cache.'">';
+                if ($addlinktofullsize) $ret.='<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$entity.'&file='.urlencode($file).'&cache='.$cache.'">';
                 $ret.='<img alt="Photo alt" id="photologo'.(preg_replace('/[^a-z]/i','_',$file)).'" class="'.$cssclass.'" '.($width?' width="'.$width.'"':'').($height?' height="'.$height.'"':'').' src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$entity.'&file='.urlencode($altfile).'&cache='.$cache.'">';
-                $ret.='</a>';
+                if ($addlinktofullsize) $ret.='</a>';
             }
             else
 			{
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 2addea47f87..ae985b22be5 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -1922,7 +1922,7 @@ class User extends CommonObject
         	$paddafterimage='';
             if (abs($withpictoimg) == 1) $paddafterimage='style="padding-right: 3px;"';
         	if ($withpictoimg > 0) $picto='<div class="inline-block valignmiddle'.($morecss?' userimg'.$morecss:'').'">'.img_object('', 'user', $paddafterimage.' '.($notooltip?'':'class="classfortooltip"')).'</div>';
-        	else $picto='<div class="inline-block valignmiddle'.($morecss?' userimg'.$morecss:'').'"'.($paddafterimage?' '.$paddafterimage:'').'>'.Form::showphoto('userphoto', $this, 0, 0, 0, 'loginphoto').'</div>';
+        	else $picto='<div class="inline-block valignmiddle'.($morecss?' userimg'.$morecss:'').'"'.($paddafterimage?' '.$paddafterimage:'').'>'.Form::showphoto('userphoto', $this, 0, 0, 0, 'loginphoto',0,0).'</div>';
             $result.=$picto;
 		}
 		if (abs($withpictoimg) != 2) 

From 461771d4885892f26df470ce5357785d491f2f93 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 24 Oct 2015 21:13:28 +0200
Subject: [PATCH 45/66] Currency is on title only.

---
 htdocs/compta/bank/account.php        |  8 ++++----
 htdocs/core/class/html.form.class.php | 11 ++++++-----
 htdocs/user/class/user.class.php      |  2 +-
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php
index 500cf63b021..e3bc2a3fc2c 100644
--- a/htdocs/compta/bank/account.php
+++ b/htdocs/compta/bank/account.php
@@ -952,7 +952,7 @@ if ($id > 0 || ! empty($ref))
 			if ($sep > 0) print '&nbsp;';	// If we had at least one line in future
 			else print $langs->trans("CurrentBalance");
 			print ' '.$object->currency_code.'</td>';
-			print '<td align="right" class="nowrap"><b>'.price($total, 0, $langs, 0, 0, -1, $object->currency_code).'</b></td>';
+			print '<td align="right" class="nowrap"><b>'.price($total).'</b></td>';
 			print '<td>&nbsp;</td>';
 			print '</tr>';
 		} else {
@@ -961,9 +961,9 @@ if ($id > 0 || ! empty($ref))
 			if ($sep > 0) print '&nbsp;';	// If we had at least one line in future
 			else print $langs->trans("Total");
 			print ' '.$object->currency_code.'</td>';
-			print '<td align="right" class="nowrap"><b>'.price($total_deb*-1, 0, $langs, 0, 0, -1, $object->currency_code).'</b></td>';
-			print '<td align="right" class="nowrap"><b>'.price($total_cred, 0, $langs, 0, 0, -1, $object->currency_code).'</b></td>';
-			print '<td align="right" class="nowrap"><b>'.price($total_cred-($total_deb*-1), 0, $langs, 0, 0, -1, $object->currency_code).'</b></td>';
+			print '<td align="right" class="nowrap"><b>'.price($total_deb*-1).'</b></td>';
+			print '<td align="right" class="nowrap"><b>'.price($total_cred).'</b></td>';
+			print '<td align="right" class="nowrap"><b>'.price($total_cred-($total_deb*-1)).'</b></td>';
 			print '<td>&nbsp;</td>';
 			print '</tr>';
 		}
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 7b472b2a163..bc26812bd29 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -5255,9 +5255,10 @@ class Form
      * 		@param	int			$caneditfield		Add edit fields
      * 		@param	string		$cssclass			CSS name to use on img for photo
      * 		@param	int			$genericifundef		Use a generic image if no image avaiable
+     *      @param  int         $addlinktofullsize  Add link to fullsize image
      * 	  	@return string    						HTML code to output photo
      */
-    static function showphoto($modulepart, $object, $width=100, $height=0, $caneditfield=0, $cssclass='photowithmargin', $genericifundef=0)
+    static function showphoto($modulepart, $object, $width=100, $height=0, $caneditfield=0, $cssclass='photowithmargin', $genericifundef=0,$addlinktofullsize=1)
     {
         global $conf,$langs;
 
@@ -5303,15 +5304,15 @@ class Form
             $cache='0';
             if ($file && file_exists($dir."/".$file))
             {
-                $ret.='<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$entity.'&file='.urlencode($file).'&cache='.$cache.'">';
+                if ($addlinktofullsize) $ret.='<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$entity.'&file='.urlencode($file).'&cache='.$cache.'">';
                 $ret.='<img alt="Photo" id="photologo'.(preg_replace('/[^a-z]/i','_',$file)).'" class="'.$cssclass.'" '.($width?' width="'.$width.'"':'').($height?' height="'.$height.'"':'').' src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$entity.'&file='.urlencode($file).'&cache='.$cache.'">';
-                $ret.='</a>';
+                if ($addlinktofullsize) $ret.='</a>';
             }
             else if ($altfile && file_exists($dir."/".$altfile))
             {
-                $ret.='<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$entity.'&file='.urlencode($file).'&cache='.$cache.'">';
+                if ($addlinktofullsize) $ret.='<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$entity.'&file='.urlencode($file).'&cache='.$cache.'">';
                 $ret.='<img alt="Photo alt" id="photologo'.(preg_replace('/[^a-z]/i','_',$file)).'" class="'.$cssclass.'" '.($width?' width="'.$width.'"':'').($height?' height="'.$height.'"':'').' src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$entity.'&file='.urlencode($altfile).'&cache='.$cache.'">';
-                $ret.='</a>';
+                if ($addlinktofullsize) $ret.='</a>';
             }
             else
 			{
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 2addea47f87..ae985b22be5 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -1922,7 +1922,7 @@ class User extends CommonObject
         	$paddafterimage='';
             if (abs($withpictoimg) == 1) $paddafterimage='style="padding-right: 3px;"';
         	if ($withpictoimg > 0) $picto='<div class="inline-block valignmiddle'.($morecss?' userimg'.$morecss:'').'">'.img_object('', 'user', $paddafterimage.' '.($notooltip?'':'class="classfortooltip"')).'</div>';
-        	else $picto='<div class="inline-block valignmiddle'.($morecss?' userimg'.$morecss:'').'"'.($paddafterimage?' '.$paddafterimage:'').'>'.Form::showphoto('userphoto', $this, 0, 0, 0, 'loginphoto').'</div>';
+        	else $picto='<div class="inline-block valignmiddle'.($morecss?' userimg'.$morecss:'').'"'.($paddafterimage?' '.$paddafterimage:'').'>'.Form::showphoto('userphoto', $this, 0, 0, 0, 'loginphoto',0,0).'</div>';
             $result.=$picto;
 		}
 		if (abs($withpictoimg) != 2) 

From 1b8234d9fe416d531d7951ead1ef830893c672d7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 25 Oct 2015 11:09:50 +0100
Subject: [PATCH 46/66] Bette behaviour for blind people

---
 htdocs/contact/class/contact.class.php | 11 +++++++++--
 htdocs/core/boxes/box_contacts.php     | 22 +++++++++++++++++-----
 htdocs/index.php                       |  4 ++--
 htdocs/langs/en_US/companies.lang      |  2 +-
 htdocs/societe/class/societe.class.php | 18 +++++++++++++++---
 htdocs/user/class/user.class.php       | 16 ++++++++++++++--
 6 files changed, 58 insertions(+), 15 deletions(-)

diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index 9a887bf9fdb..723784d9a5d 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -908,7 +908,7 @@ class Contact extends CommonObject
 	 */
 	function getNomUrl($withpicto=0,$option='',$maxlen=0,$moreparam='')
 	{
-		global $langs;
+		global $conf, $langs;
 
 		$result='';
         $label = '<u>' . $langs->trans("ShowContact") . '</u>';
@@ -923,7 +923,14 @@ class Contact extends CommonObject
         $label.= '<br><b>' . $langs->trans("Phone") . ':</b> '.join(', ',$phonelist);
         $label.= '<br><b>' . $langs->trans("Address") . ':</b> '.dol_format_address($this, 1, ' ', $langs);
 
-        $link = '<a href="'.DOL_URL_ROOT.'/contact/card.php?id='.$this->id.$moreparam.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
+        $link = '<a href="'.DOL_URL_ROOT.'/contact/card.php?id='.$this->id.$moreparam.'"';
+    	if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) 
+        {
+            $label=$langs->trans("ShowContact");
+            $link.=' alt="'.dol_escape_htmltag($label, 1).'"'; 
+        }
+        $link.= ' title="'.dol_escape_htmltag($label, 1).'"';
+        $link.= ' class="classfortooltip">';
 		$linkend='</a>';
 
 		if ($option == 'xxx')
diff --git a/htdocs/core/boxes/box_contacts.php b/htdocs/core/boxes/box_contacts.php
index 18a09af6ace..a1fc2768ba1 100644
--- a/htdocs/core/boxes/box_contacts.php
+++ b/htdocs/core/boxes/box_contacts.php
@@ -63,8 +63,9 @@ class box_contacts extends ModeleBoxes
 		if ($user->rights->societe->lire)
 		{
 			$sql = "SELECT sp.rowid as id, sp.lastname, sp.firstname, sp.civility as civility_id, sp.datec, sp.tms, sp.fk_soc, sp.statut as status";
-			$sql.= ", s.nom as socname";
-            $sql.= ", s.code_client";
+			$sql.= ", sp.address, sp.zip, sp.town, sp.phone, sp.phone_perso, sp.phone_mobile";
+			$sql.= ", s.nom as socname, s.name_alias";
+            $sql.= ", s.client, s.fournisseur, s.code_client, s.code_fournisseur";
 			$sql.= " FROM ".MAIN_DB_PREFIX."socpeople as sp";
 			$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON sp.fk_soc = s.rowid";
 			if (! $user->rights->societe->client->voir && ! $user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -93,10 +94,21 @@ class box_contacts extends ModeleBoxes
                     $contactstatic->firstname=$objp->firstname;
                     $contactstatic->civility_id=$objp->civility_id;
 					$contactstatic->statut=$objp->status;
-                    $societestatic->id = $objp->fk_soc;
-                    $societestatic->code_client = $objp->code_client;
+                    $contactstatic->phone_pro = $objp->phone;
+                    $contactstatic->phone_perso = $objp->phone_perso;
+                    $contactstatic->phone_mobile = $objp->phone_mobile;
+                    $contactstatic->address = $objp->address;
+                    $contactstatic->zip = $objp->zip;
+                    $contactstatic->town = $objp->town;
+					
+					$societestatic->id = $objp->fk_soc;
                     $societestatic->name = $objp->socname;
-
+                    $societestatic->name_alias = $objp->name_alias;
+                    $societestatic->code_client = $objp->code_client;
+                    $societestatic->code_fournisseur = $objp->code_fournisseur;
+                    $societestatic->client = $objp->client;
+                    $societestatic->fournisseur = $objp->fournisseur;
+                    
                     $this->info_box_contents[$line][] = array(
                         'td' => 'align="left"',
                         'text' => $contactstatic->getNomUrl(1),
diff --git a/htdocs/index.php b/htdocs/index.php
index 5db358aa34b..818da8f9ecd 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -103,7 +103,7 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
  * Informations area
  */
 
-print '<table class="noborder" width="100%">';
+print '<table summary="Login info" class="noborder" width="100%">';
 print '<tr class="liste_titre"><th class="liste_titre" colspan="2">'.$langs->trans("Informations").'</th></tr>';
 print '<tr '.$bc[false].'>';
 print '<td class="nowrap">'.$langs->trans("User").'</td><td>'.$user->getNomUrl(0).'</td></tr>';
@@ -129,7 +129,7 @@ $langs->load("contracts");
 if (empty($user->societe_id))
 {
     print '<br>';
-    print '<table class="noborder" width="100%">';
+    print '<table  summary="'.$langs->trans("DolibarrStateBoard").'" class="noborder" width="100%">';
     print '<tr class="liste_titre">';
     print '<th class="liste_titre" colspan="2">'.$langs->trans("DolibarrStateBoard").'</th>';
     print '<th class="liste_titre" align="right">&nbsp;</th>';
diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang
index e3fd6fadeec..3e93a48d7b5 100644
--- a/htdocs/langs/en_US/companies.lang
+++ b/htdocs/langs/en_US/companies.lang
@@ -305,7 +305,7 @@ ListOfCustomersContacts=List of customer contacts
 ListOfSuppliersContacts=List of supplier contacts
 ListOfCompanies=List of companies
 ListOfThirdParties=List of third parties
-ShowCompany=Show company
+ShowCompany=Show thirdparty
 ShowContact=Show contact
 ContactsAllShort=All (No filter)
 ContactType=Contact type
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 1f5f10c9178..fb99f819af2 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -1824,10 +1824,13 @@ class Societe extends CommonObject
         }
 
         if (! empty($this->name))
+        {
             $label.= '<br><b>' . $langs->trans('Name') . ':</b> '. $this->name;
-        if (! empty($this->code_client))
+            if (! empty($this->name_alias)) $label.=' ('.$this->name_alias.')';
+        }
+        if (! empty($this->code_client) && $this->client)
             $label.= '<br><b>' . $langs->trans('CustomerCode') . ':</b> '. $this->code_client;
-        if (! empty($this->code_fournisseur))
+        if (! empty($this->code_fournisseur) && $this->fournisseur)
             $label.= '<br><b>' . $langs->trans('SupplierCode') . ':</b> '. $this->code_fournisseur;
 
         if (! empty($this->logo))
@@ -1841,7 +1844,16 @@ class Societe extends CommonObject
 
         // Add type of canvas
         $link.=(!empty($this->canvas)?'&canvas='.$this->canvas:'').'"';
-        $link.=($notooltip?'':' title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip"');
+        if (empty($notooltip))
+        {
+            if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) 
+            {
+                $label=$langs->trans("ShowCompany");
+                $link.=' alt="'.dol_escape_htmltag($label, 1).'"'; 
+            }
+            $link.= ' title="'.dol_escape_htmltag($label, 1).'"';
+            $link.=' class="classfortooltip"';
+        }
         $link.='>';
         $linkend='</a>';
 
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index ae985b22be5..a165a735f84 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -1911,7 +1911,17 @@ class User extends CommonObject
         }
 
         $link.= '<a href="'.DOL_URL_ROOT.'/user/card.php?id='.$this->id.'"';
-        $link.= ($notooltip?'':' title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip'.($morecss?' '.$morecss:'').'"');
+        if (empty($notooltip))
+        {
+            if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) 
+            {
+                $langs->load("users");
+                $label=$langs->trans("ShowUser");
+                $link.=' alt="'.dol_escape_htmltag($label, 1).'"'; 
+            }
+            $link.= ' title="'.dol_escape_htmltag($label, 1).'"';
+            $link.= ' class="classfortooltip'.($morecss?' '.$morecss:'').'"';
+        }
         $link.= '>';
 		$linkend='</a>';
 
@@ -1927,7 +1937,9 @@ class User extends CommonObject
 		}
 		if (abs($withpictoimg) != 2) 
 		{
-			$result.='<div class="inline-block valignmiddle'.($morecss?' usertext'.$morecss:'').'">'.$this->getFullName($langs,'',($mode == 'firstname' ? 2 : -1),$maxlen).'</div>';
+			if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) $result.='<div class="inline-block valignmiddle'.($morecss?' usertext'.$morecss:'').'">';
+			$result.=$this->getFullName($langs,'',($mode == 'firstname' ? 2 : -1),$maxlen);
+			if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) $result.='</div>';
 		}
 		$result.=$linkend;
 		//if ($withpictoimg == -1) $result.='</div>';

From 1261ad43a1d30bd3703083aad451bb9e4f52a6d9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 25 Oct 2015 18:15:37 +0100
Subject: [PATCH 47/66] NEW Can select which field to show into list of users.

---
 htdocs/societe/list.php |  44 ++---
 htdocs/user/index.php   | 426 ++++++++++++++++++++++++++++++----------
 2 files changed, 340 insertions(+), 130 deletions(-)

diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 98795e27667..0e102af33f9 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -338,8 +338,8 @@ else dol_print_error($db);
 
 $sql = "SELECT s.rowid, s.nom as name, s.name_alias, s.barcode, s.town, s.zip, s.datec, s.code_client, s.code_fournisseur, ";
 $sql.= " st.libelle as stcomm, s.fk_stcomm as stcomm_id, s.fk_prospectlevel, s.prefix_comm, s.client, s.fournisseur, s.canvas, s.status as status,";
-$sql.= " s.siren as idprof1, s.siret as idprof2, ape as idprof3, idprof4 as idprof4,";
-$sql.= " s.fk_pays, s.tms as date_update, s.datec as date_creation,";
+$sql.= " s.siren as idprof1, s.siret as idprof2, ape as idprof3, idprof4 as idprof4, s.fk_pays,";
+$sql.= " s.tms as date_update, s.datec as date_creation,";
 $sql.= " typent.code as typent_code";
 // We'll need these fields in order to filter by sale (including the case where the user can only see his prospects)
 if ($search_sale) $sql .= ", sc.fk_soc, sc.fk_user";
@@ -575,10 +575,10 @@ if ($resql)
         's.idprof6'=>array('label'=>$langs->trans("ProfId6Short"), 'checked'=>$checkedprofid6),
     	's.fk_prospectlevel'=>array('label'=>$langs->trans("ProspectLevelShort"), 'checked'=>$checkprospectlevel),
     	's.fk_stcomm'=>array('label'=>$langs->trans("StatusProsp"), 'checked'=>$checkstcomm),
-        's.status'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>200),
         's.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
         's.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500),
-    );
+        's.status'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000),
+	);
     $varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
     $selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
 	print '<table class="liste '.($moreforfilter?"listwithfilterbefore":"").'">';
@@ -618,9 +618,9 @@ if ($resql)
 	$parameters=array('arrayfields'=>$arrayfields);
     $reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
     print $hookmanager->resPrint;
-	if (! empty($arrayfields['s.status']['checked'])) print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"s.status","",$param,'align="center"',$sortfield,$sortorder);
 	if (! empty($arrayfields['s.datec']['checked']))  print_liste_field_titre($langs->trans("DateCreationShort"),$_SERVER["PHP_SELF"],"s.datec","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
 	if (! empty($arrayfields['s.tms']['checked']))    print_liste_field_titre($langs->trans("DateModificationShort"),$_SERVER["PHP_SELF"],"s.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
+	if (! empty($arrayfields['s.status']['checked'])) print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"s.status","",$param,'align="center"',$sortfield,$sortorder);
 	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
 	print "</tr>\n";
 
@@ -795,25 +795,25 @@ if ($resql)
 	$parameters=array('arrayfields'=>$arrayfields);
     $reshook=$hookmanager->executeHooks('printFieldListOption',$parameters);    // Note that $action and $object may have been modified by hook
     print $hookmanager->resPrint;
-    if (! empty($arrayfields['s.status']['checked']))
-    {
-        // Status
-        print '<td class="liste_titre" align="center">';
-        print $form->selectarray('search_status', array('0'=>$langs->trans('ActivityCeased'),'1'=>$langs->trans('InActivity')),$search_status);
-        print '</td>';
-    }
+    // Date creation
     if (! empty($arrayfields['s.datec']['checked']))
     {
-        // Date creation
         print '<td class="liste_titre">';
         print '</td>';
     }
+    // Date modification
     if (! empty($arrayfields['s.tms']['checked']))
     {
-        // Date modification
         print '<td class="liste_titre">';
         print '</td>';
     }
+    // Status
+    if (! empty($arrayfields['s.status']['checked']))
+    {
+        print '<td class="liste_titre" align="center">';
+        print $form->selectarray('search_status', array('0'=>$langs->trans('ActivityCeased'),'1'=>$langs->trans('InActivity')),$search_status);
+        print '</td>';
+    }
     // Action column
 	print '<td class="liste_titre" align="right">';
 	if ($type != '') print '<input type="hidden" name="type" value="'.$type.'">';
@@ -971,24 +971,24 @@ if ($resql)
 	    $parameters=array('arrayfields'=>$arrayfields, 'obj'=>$obj);
 		$reshook=$hookmanager->executeHooks('printFieldListValue',$parameters);    // Note that $action and $object may have been modified by hook
         print $hookmanager->resPrint;
-        // Status
-        if (! empty($arrayfields['s.status']['checked']))
+        // Date creation
+        if (! empty($arrayfields['s.datec']['checked']))
         {
-            print '<td align="center">'.$companystatic->getLibStatut(3).'</td>';
-        }
-	    if (! empty($arrayfields['s.datec']['checked']))
-        {
-            // Date creation
             print '<td align="center">';
             print dol_print_date($obj->date_creation, 'dayhour');
             print '</td>';
         }
+        // Date modification
         if (! empty($arrayfields['s.tms']['checked']))
         {
-            // Date modification
             print '<td align="center">';
             print dol_print_date($obj->date_update, 'dayhour');
             print '</td>';
+        }
+	    // Status
+        if (! empty($arrayfields['s.status']['checked']))
+        {
+            print '<td align="center">'.$companystatic->getLibStatut(3).'</td>';
         }
         // Action column
         print '<td></td>';
diff --git a/htdocs/user/index.php b/htdocs/user/index.php
index 921697ade51..40fe8353093 100644
--- a/htdocs/user/index.php
+++ b/htdocs/user/index.php
@@ -47,6 +47,8 @@ $search_lastname=GETPOST('search_lastname','alpha');
 $search_firstname=GETPOST('search_firstname','alpha');
 $search_statut=GETPOST('search_statut','alpha');
 $search_thirdparty=GETPOST('search_thirdparty','alpha');
+$search_supervisor=GETPOST('search_supervisor','alpha');
+$search_previousconn=GETPOST('search_previousconn','alpha');
 $optioncss = GETPOST('optioncss','alpha');
 
 if ($search_statut == '') $search_statut='1';
@@ -62,6 +64,14 @@ $limit = $conf->liste_limit;
 if (! $sortfield) $sortfield="u.login";
 if (! $sortorder) $sortorder="ASC";
 
+// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+$hookmanager->initHooks(array('userlist'));
+$extrafields = new ExtraFields($db);
+
+// fetch optionals attributes and labels
+$extralabels = $extrafields->fetch_name_optionals_label('user');
+$search_array_options=$extrafields->getOptionalsFromPost($extralabels,'','search_');
+
 $userstatic=new User($db);
 $companystatic = new Societe($db);
 $form = new Form($db);
@@ -74,8 +84,35 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both
 	$search_firstname="";
 	$search_statut="";
 	$search_thirdparty="";
+	$search_supervisor="";
+	$search_datelastlogin="";
+	$search_datepreviouslogin="";
+	$search_date_creation="";
+	$search_date_update="";
 }
 
+// List of fields to search into when doing a "search in all"
+$fieldstosearchall = array(
+	'u.login'=>"Login",
+	'u.firstname'=>"Firstname",
+    'u.lastname'=>"Lastname",
+	'u.accountancy_code'=>"AccountancyCode",
+	'u.email'=>"EMail",
+    'u.note'=>"Note"
+);
+
+
+/*
+ * Actions
+ */
+ 
+$parameters=array();
+$reshook=$hookmanager->executeHooks('doActions',$parameters);    // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+
+
 
 /*
  * View
@@ -88,12 +125,17 @@ $buttonviewhierarchy='<form action="'.DOL_URL_ROOT.'/user/hierarchy.php'.(($sear
 print load_fiche_titre($langs->trans("ListOfUsers"), $buttonviewhierarchy);
 
 $sql = "SELECT u.rowid, u.lastname, u.firstname, u.admin, u.fk_soc, u.login, u.email, u.gender,";
-$sql.= " u.datec,";
-$sql.= " u.tms as datem,";
-$sql.= " u.datelastlogin,";
+$sql.= " u.datelastlogin, u.datepreviouslogin,";
 $sql.= " u.ldap_sid, u.statut, u.entity,";
+$sql.= " u.tms as date_update, u.datec as date_creation,";
 $sql.= " u2.login as login2, u2.firstname as firstname2, u2.lastname as lastname2,";
 $sql.= " s.nom as name, s.canvas";
+// Add fields from extrafields
+foreach ($extrafields->attribute_list as $key => $val) $sql.=",ef.".$key.' as options_'.$key;
+// Add fields from hooks
+$parameters=array();
+$reshook=$hookmanager->executeHooks('printFieldListSelect',$parameters);    // Note that $action and $object may have been modified by hook
+$sql.=$hookmanager->resPrint;
 $sql.= " FROM ".MAIN_DB_PREFIX."user as u";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON u.fk_soc = s.rowid";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."user as u2 ON u.fk_user = u2.rowid";
@@ -106,14 +148,33 @@ else
 	$sql.= " WHERE u.entity IN (".getEntity('user',1).")";
 }
 if ($socid > 0) $sql.= " AND u.fk_soc = ".$socid;
-if ($search_user != '') $sql.=natural_search(array('u.login', 'u.lastname', 'u.firstname'), $search_user);
+if ($search_user != '')       $sql.=natural_search(array('u.login', 'u.lastname', 'u.firstname'), $search_user);
+if ($search_supervisor > 0)   $sql.= " AND u.fk_user = ".$search_supervisor;
 if ($search_thirdparty != '') $sql.=natural_search(array('s.nom'), $search_thirdparty);
-if ($search_login != '') $sql.= natural_search("u.login", $search_login);
-if ($search_lastname != '') $sql.= natural_search("u.lastname", $search_lastname);
-if ($search_firstname != '') $sql.= natural_search("u.firstname", $search_firstname);
+if ($search_login != '')      $sql.= natural_search("u.login", $search_login);
+if ($search_lastname != '')   $sql.= natural_search("u.lastname", $search_lastname);
+if ($search_firstname != '')  $sql.= natural_search("u.firstname", $search_firstname);
 if ($search_statut != '' && $search_statut >= 0) $sql.= " AND (u.statut=".$search_statut.")";
-if ($sall) $sql.= natural_search(array('u.login', 'u.lastname', 'u.firstname', 'u.email', 'u.note'), $sall);
+if ($sall)                    $sql.= natural_search($fieldstosearchall, $sall);
+// Add where from extra fields
+foreach ($search_array_options as $key => $val)
+{
+    $crit=$val;
+    $tmpkey=preg_replace('/search_options_/','',$key);
+    $typ=$extrafields->attribute_type[$tmpkey];
+    $mode=0;
+    if (in_array($typ, array('int'))) $mode=1;    // Search on a numeric
+    if ($val && ( ($crit != '' && ! in_array($typ, array('select'))) || ! empty($crit))) 
+    {
+        $sql .= natural_search('ef.'.$tmpkey, $crit, $mode);
+    }
+}
+// Add where from hooks
+$parameters=array();
+$reshook=$hookmanager->executeHooks('printFieldListWhere',$parameters);    // Note that $action and $object may have been modified by hook
+$sql.=$hookmanager->resPrint;
 $sql.=$db->order($sortfield,$sortorder);
+//$sql.= $db->plimit($conf->liste_limit+1, $offset);
 
 $result = $db->query($sql);
 if ($result)
@@ -121,54 +182,153 @@ if ($result)
     $num = $db->num_rows($result);
     $i = 0;
 
+    $param='';
+    if ($sall != '') $param.='&sall='.urlencode($sall);
+    if ($search_user != '') $param.="&search_user=".$search_user;
+    if ($search_login != '') $param.="&search_login=".$search_login;
+    if ($search_lastname != '') $param.="&search_lastname=".$search_lastname;
+    if ($search_firstname != '') $param.="&search_firstname=".$search_firstname;
+    if ($search_supervisor > 0) $param.="&search_supervisor=".$search_supervisor;
+    if ($search_statut != '') $param.="&search_statut=".$search_statut;
+    if ($optioncss != '') $param.='&optioncss='.$optioncss;
+    // Add $param from extra fields
+    foreach ($search_array_options as $key => $val)
+    {
+        $crit=$val;
+        $tmpkey=preg_replace('/search_options_/','',$key);
+        if ($val != '') $param.='&search_options_'.$tmpkey.'='.urlencode($val);
+    } 	
+    
+    
     print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">'."\n";
     if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
-
-    $param="search_user=".$search_user."&sall=".$sall;
-    $param.="&search_statut=".$search_statut;
-    if ($optioncss != '') $param.='&optioncss='.$optioncss;
-
+	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+    
+    if ($sall)
+    {
+        foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
+        print $langs->trans("FilterOnInto", $sall, join(', ',$fieldstosearchall));
+    }
+	
+	$arrayfields=array(
+        'u.login'=>array('label'=>$langs->trans("Login"), 'checked'=>1),
+	    'u.lastname'=>array('label'=>$langs->trans("Lastname"), 'checked'=>1),
+        'u.firstname'=>array('label'=>$langs->trans("Firstname"), 'checked'=>1),
+        'u.fk_soc'=>array('label'=>$langs->trans("Company"), 'checked'=>1),
+	    'u.entity'=>array('label'=>$langs->trans("Entity"), 'checked'=>1, 'enabled'=>(! empty($conf->multicompany->enabled) && empty($conf->multicompany->transverse_mode))),
+	    'u.fk_user'=>array('label'=>$langs->trans("HierarchicalResponsible"), 'checked'=>1),
+	    'u.datelastlogin'=>array('label'=>$langs->trans("LastConnexion"), 'checked'=>1, 'position'=>100),
+	    'u.datepreviouslogin'=>array('label'=>$langs->trans("PreviousConnexion"), 'checked'=>0, 'position'=>110),
+	    'u.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
+        'u.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500),
+        'u.statut'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000),
+	);
+    $varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
+    $selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
     print '<table class="noborder" width="100%">';
     print '<tr class="liste_titre">';
-    print_liste_field_titre($langs->trans("Login"),$_SERVER['PHP_SELF'],"u.login",$param,"","",$sortfield,$sortorder);
-    print_liste_field_titre($langs->trans("LastName"),$_SERVER['PHP_SELF'],"u.lastname",$param,"","",$sortfield,$sortorder);
-    print_liste_field_titre($langs->trans("FirstName"),$_SERVER['PHP_SELF'],"u.firstname",$param,"","",$sortfield,$sortorder);
-    print_liste_field_titre($langs->trans("Company"),$_SERVER['PHP_SELF'],"u.fk_soc",$param,"","",$sortfield,$sortorder);
-    if (! empty($conf->multicompany->enabled) && empty($conf->multicompany->transverse_mode))
-    {
-	    print_liste_field_titre($langs->trans("Entity"),$_SERVER['PHP_SELF'],"u.entity",$param,"","",$sortfield,$sortorder);
-    }
-    print_liste_field_titre($langs->trans("DateCreation"),$_SERVER['PHP_SELF'],"u.datec",$param,"",'align="center"',$sortfield,$sortorder);
-    print_liste_field_titre($langs->trans("LastConnexion"),$_SERVER['PHP_SELF'],"u.datelastlogin",$param,"",'align="center"',$sortfield,$sortorder);
-    print_liste_field_titre($langs->trans("HierarchicalResponsible"),$_SERVER['PHP_SELF'],"u2.login",$param,"",'align="center"',$sortfield,$sortorder);
-    print_liste_field_titre($langs->trans("Status"),$_SERVER['PHP_SELF'],"u.statut",$param,"",'align="right"',$sortfield,$sortorder);
-    print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,'maxwidthsearch ');
+    if (! empty($arrayfields['u.login']['checked']))          print_liste_field_titre($langs->trans("Login"),$_SERVER['PHP_SELF'],"u.login",$param,"","",$sortfield,$sortorder);
+    if (! empty($arrayfields['u.lastname']['checked']))       print_liste_field_titre($langs->trans("Lastname"),$_SERVER['PHP_SELF'],"u.lastname",$param,"","",$sortfield,$sortorder);
+    if (! empty($arrayfields['u.firstname']['checked']))      print_liste_field_titre($langs->trans("FirstName"),$_SERVER['PHP_SELF'],"u.firstname",$param,"","",$sortfield,$sortorder);
+    if (! empty($arrayfields['u.fk_soc']['checked']))         print_liste_field_titre($langs->trans("Company"),$_SERVER['PHP_SELF'],"u.fk_soc",$param,"","",$sortfield,$sortorder);
+    if (! empty($arrayfields['u.entity']['checked']))         print_liste_field_titre($langs->trans("Entity"),$_SERVER['PHP_SELF'],"u.entity",$param,"","",$sortfield,$sortorder);
+    if (! empty($arrayfields['u.fk_user']['checked']))        print_liste_field_titre($langs->trans("HierarchicalResponsible"),$_SERVER['PHP_SELF'],"u.fk_user",$param,"","",$sortfield,$sortorder);
+    if (! empty($arrayfields['u.datelastlogin']['checked']))  print_liste_field_titre($langs->trans("LastConnexion"),$_SERVER['PHP_SELF'],"u.datelastlogin",$param,"",'align="center"',$sortfield,$sortorder);
+    if (! empty($arrayfields['u.datepreviouslogin']['checked'])) print_liste_field_titre($langs->trans("PreviousConnexion"),$_SERVER['PHP_SELF'],"u.datepreviouslogin",$param,"",'align="center"',$sortfield,$sortorder);
+	// Extra fields
+	if (is_array($extrafields->attribute_list) && count($extrafields->attribute_list))
+	{
+	   foreach($extrafields->attribute_list as $key => $val) 
+	   {
+	       if ($val)
+	       {
+	           if (! empty($arrayfields["ef.".$key]['checked'])) print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],"ef.".$key,"",$param,"",$sortfield,$sortorder);
+	       }
+	   }
+	}
+	// Hook fields
+	$parameters=array('arrayfields'=>$arrayfields);
+    $reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
+    print $hookmanager->resPrint;
+	if (! empty($arrayfields['u.datec']['checked']))  print_liste_field_titre($langs->trans("DateCreationShort"),$_SERVER["PHP_SELF"],"u.datec","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
+	if (! empty($arrayfields['u.tms']['checked']))    print_liste_field_titre($langs->trans("DateModificationShort"),$_SERVER["PHP_SELF"],"u.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
+	if (! empty($arrayfields['u.statut']['checked'])) print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"u.statut","",$param,'align="center"',$sortfield,$sortorder);
+	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
     print "</tr>\n";
 
     // Search bar
-    $colspan=3;
-    if (! empty($conf->multicompany->enabled) && empty($conf->multicompany->transverse_mode)) $colspan++;
     print '<tr class="liste_titre">';
-    print '<td><input type="text" name="search_login" size="6" value="'.$search_login.'"></td>';
-    print '<td><input type="text" name="search_lastname" size="6" value="'.$search_lastname.'"></td>';
-    print '<td><input type="text" name="search_firstname" size="6" value="'.$search_firstname.'"></td>';
-    print '<td><input type="text" name="search_thirdparty" size="6" value="'.$search_thirdparty.'"></td>';
-    print '<td colspan="'.$colspan.'">&nbsp;</td>';
-
-	// Status
-    print '<td align="right">';
-    print $form->selectarray('search_statut', array('-1'=>'','0'=>$langs->trans('Disabled'),'1'=>$langs->trans('Enabled')),$search_statut);
-    print '</td>';
-
-	print '<td class="liste_titre" align="right"><input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
+    if (! empty($arrayfields['u.login']['checked']))
+    {
+        print '<td><input type="text" name="search_login" size="6" value="'.$search_login.'"></td>';
+    }
+    if (! empty($arrayfields['u.lastname']['checked']))
+    {
+        print '<td><input type="text" name="search_lastname" size="6" value="'.$search_lastname.'"></td>';
+    }
+    if (! empty($arrayfields['u.firstname']['checked']))
+    {
+        print '<td><input type="text" name="search_firstname" size="6" value="'.$search_firstname.'"></td>';
+    }
+    if (! empty($arrayfields['u.fk_soc']['checked']))
+    {
+        print '<td><input type="text" name="search_thirdparty" size="6" value="'.$search_thirdparty.'"></td>';
+    }
+    if (! empty($arrayfields['u.entity']['checked']))
+    {
+        print '<td></td>';
+    }
+    if (! empty($arrayfields['u.fk_user']['checked']))
+    {
+        print '<td></td>';
+    }
+    if (! empty($arrayfields['u.datelastlogin']['checked']))
+    {
+        print '<td></td>';
+    }
+    if (! empty($arrayfields['u.datepreviouslogin']['checked']))
+    {
+        print '<td></td>';
+    }
+    
+    // Fields from hook
+	$parameters=array('arrayfields'=>$arrayfields);
+    $reshook=$hookmanager->executeHooks('printFieldListOption',$parameters);    // Note that $action and $object may have been modified by hook
+    print $hookmanager->resPrint;
+    if (! empty($arrayfields['u.datec']['checked']))
+    {
+        // Date creation
+        print '<td class="liste_titre">';
+        print '</td>';
+    }
+    if (! empty($arrayfields['u.tms']['checked']))
+    {
+        // Date modification
+        print '<td class="liste_titre">';
+        print '</td>';
+    }
+    if (! empty($arrayfields['u.statut']['checked']))
+    {
+        // Status
+        print '<td class="liste_titre" align="center">';
+        print $form->selectarray('search_statut', array('-1'=>'','0'=>$langs->trans('Disabled'),'1'=>$langs->trans('Enabled')),$search_statut);
+        print '</td>';
+    }
+    // Action column
+	print '<td class="liste_titre" align="right">';
+	print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
 	print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
 	print '</td>';
-
+	
     print "</tr>\n";
 
     $user2=new User($db);
 
     $var=True;
+	//while ($i < min($num,$conf->liste_limit))
     while ($i < $num)
     {
         $obj = $db->fetch_object($result);
@@ -183,87 +343,137 @@ if ($result)
 	    $userstatic->societe_id=$obj->fk_soc;
 	    $userstatic->firstname='';
 		$userstatic->lastname=$obj->login;
-
+        
 		$li=$userstatic->getNomUrl(1,'',0,0,24,1);
 
         print "<tr ".$bc[$var].">";
-        print '<td>';
-        print $li;
-        if (! empty($conf->multicompany->enabled) && $obj->admin && ! $obj->entity)
-        {
-          	print img_picto($langs->trans("SuperAdministrator"),'redstar');
-        }
-        else if ($obj->admin)
-        {
-        	print img_picto($langs->trans("Administrator"),'star');
-        }
-        print '</td>';
-        print '<td>'.ucfirst($obj->lastname).'</td>';
-        print '<td>'.ucfirst($obj->firstname).'</td>';
-        print "<td>";
-        if ($obj->fk_soc)
-        {
-            $companystatic->id=$obj->fk_soc;
-            $companystatic->name=$obj->name;
-            $companystatic->canvas=$obj->canvas;
-            print $companystatic->getNomUrl(1);
-        }
-        else if ($obj->ldap_sid)
-        {
-        	print $langs->trans("DomainUser");
-        }
-        else
-       {
-        	print $langs->trans("InternalUser");
-        }
-        print '</td>';
-
+        if (! empty($arrayfields['u.login']['checked']))
+		{
+		    print '<td>';
+    		print $li;
+            if (! empty($conf->multicompany->enabled) && $obj->admin && ! $obj->entity)
+            {
+              	print img_picto($langs->trans("SuperAdministrator"),'redstar');
+            }
+            else if ($obj->admin)
+            {
+            	print img_picto($langs->trans("Administrator"),'star');
+            }
+            print '</td>';
+		}
+        if (! empty($arrayfields['u.lastname']['checked']))
+		{
+		      print '<td>'.ucfirst($obj->lastname).'</td>';
+		}
+        if (! empty($arrayfields['u.firstname']['checked']))
+		{
+		  print '<td>'.ucfirst($obj->firstname).'</td>';
+		}
+        if (! empty($arrayfields['u.fk_soc']['checked']))
+		{
+    		print "<td>";
+            if ($obj->fk_soc)
+            {
+                $companystatic->id=$obj->fk_soc;
+                $companystatic->name=$obj->name;
+                $companystatic->canvas=$obj->canvas;
+                print $companystatic->getNomUrl(1);
+            }
+            else if ($obj->ldap_sid)
+            {
+            	print $langs->trans("DomainUser");
+            }
+            else
+           {
+            	print $langs->trans("InternalUser");
+            }
+            print '</td>';
+		}
         // Multicompany enabled
         if (! empty($conf->multicompany->enabled) && empty($conf->multicompany->transverse_mode))
         {
-        	print '<td>';
-        	if (! $obj->entity)
-        	{
-        		print $langs->trans("AllEntities");
-        	}
-        	else
-        	{
-        		// $mc is defined in conf.class.php if multicompany enabled.
-        		if (is_object($mc))
-        		{
-        			$mc->getInfo($obj->entity);
-        			print $mc->label;
-        		}
-        	}
-        	print '</td>';
+            if (! empty($arrayfields['u.entity']['checked']))
+    		{
+                print '<td>';
+            	if (! $obj->entity)
+            	{
+            		print $langs->trans("AllEntities");
+            	}
+            	else
+            	{
+            		// $mc is defined in conf.class.php if multicompany enabled.
+            		if (is_object($mc))
+            		{
+            			$mc->getInfo($obj->entity);
+            			print $mc->label;
+            		}
+            	}
+            	print '</td>';
+    		}
         }
-
-        // Date creation
-        print '<td class="nowrap" align="center">'.dol_print_date($db->jdate($obj->datec),"dayhour").'</td>';
-
+        // Supervisor
+        if (! empty($arrayfields['u.fk_user']['checked']))
+		{
+    		// Resp
+            print '<td class="nowrap">';
+            if ($obj->login2)
+            {
+    	        $user2->login=$obj->login2;
+    	        //$user2->lastname=$obj->lastname2;
+    	        //$user2->firstname=$obj->firstname2;
+    	        $user2->lastname=$user2->login;
+    	        $user2->firstname='';
+    	        print $user2->getNomUrl(1);
+            }
+            print '</td>';
+		}		
+        
         // Date last login
-        print '<td class="nowrap" align="center">'.dol_print_date($db->jdate($obj->datelastlogin),"dayhour").'</td>';
-
-        // Resp
-        print '<td class="nowrap" align="center">';
-        if ($obj->login2)
+        if (! empty($arrayfields['u.datelastlogin']['checked']))
+    	{
+            print '<td class="nowrap" align="center">'.dol_print_date($db->jdate($obj->datelastlogin),"dayhour").'</td>';
+    	}
+        // Date previous login
+        if (! empty($arrayfields['u.datepreviouslogin']['checked']))
+    	{
+            print '<td class="nowrap" align="center">'.dol_print_date($db->jdate($obj->datepreviouslogin),"dayhour").'</td>';
+    	}
+        
+        // Fields from hook
+	    $parameters=array('arrayfields'=>$arrayfields, 'obj'=>$obj);
+		$reshook=$hookmanager->executeHooks('printFieldListValue',$parameters);    // Note that $action and $object may have been modified by hook
+        print $hookmanager->resPrint;
+        // Date creation
+        if (! empty($arrayfields['u.datec']['checked']))
         {
-	        $user2->login=$obj->login2;
-	        //$user2->lastname=$obj->lastname2;
-	        //$user2->firstname=$obj->firstname2;
-	        $user2->lastname=$user2->login;
-	        $user2->firstname='';
-	        print $user2->getNomUrl(1);
+            print '<td align="center">';
+            print dol_print_date($obj->date_creation, 'dayhour');
+            print '</td>';
         }
-        print '</td>';
+        // Date modification
+        if (! empty($arrayfields['u.tms']['checked']))
+        {
+            print '<td align="center">';
+            print dol_print_date($obj->date_update, 'dayhour');
+            print '</td>';
+        }
+        // Status
+        if (! empty($arrayfields['u.statut']['checked']))
+        {
+		  $userstatic->statut=$obj->statut;
+          print '<td align="center">'.$userstatic->getLibStatut(3).'</td>';
+        }
+        // Action column
+        print '<td></td>';
 
-        // Statut
-		$userstatic->statut=$obj->statut;
-		print '<td align="right">'.$userstatic->getLibStatut(5).'</td>';
-        print '<td>&nbsp;</td>';
         print "</tr>\n";
         $i++;
     }
+
+	$parameters=array('arrayfields'=>$arrayfields, 'sql'=>$sql);
+	$reshook=$hookmanager->executeHooks('printFieldListFooter',$parameters);    // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
+
     print "</table>";
     print "</form>\n";
     $db->free($result);

From b49d63c12f2389d310c03d9908f528feae4062a5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 25 Oct 2015 19:31:13 +0100
Subject: [PATCH 48/66] NEW Show photo of user into user list. A new function
 getImageFileNameForSize was also introduced to choose image best size
 according to usage to save bandwith.

---
 htdocs/core/class/html.form.class.php |  39 ++++++++++++++++++++------
 htdocs/core/lib/functions.lib.php     |  30 ++++++++++++++++++++
 htdocs/core/lib/images.lib.php        |   4 +--
 htdocs/theme/eldy/img/object_user.png | Bin 607 -> 651 bytes
 htdocs/user/class/user.class.php      |  12 ++++----
 htdocs/user/group/index.php           |   2 +-
 htdocs/user/hierarchy.php             |   8 ++++--
 htdocs/user/index.php                 |  33 +++++++++++++++-------
 8 files changed, 99 insertions(+), 29 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index bc26812bd29..6bb8049f6f6 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -5254,11 +5254,11 @@ class Form
      * 		@param	int			$height				Height of photo (auto if 0)
      * 		@param	int			$caneditfield		Add edit fields
      * 		@param	string		$cssclass			CSS name to use on img for photo
-     * 		@param	int			$genericifundef		Use a generic image if no image avaiable
+     * 		@param	string		$imagesize		    'mini', 'small' or '' (original)
      *      @param  int         $addlinktofullsize  Add link to fullsize image
      * 	  	@return string    						HTML code to output photo
      */
-    static function showphoto($modulepart, $object, $width=100, $height=0, $caneditfield=0, $cssclass='photowithmargin', $genericifundef=0,$addlinktofullsize=1)
+    static function showphoto($modulepart, $object, $width=100, $height=0, $caneditfield=0, $cssclass='photowithmargin', $imagesize='',$addlinktofullsize=1)
     {
         global $conf,$langs;
 
@@ -5272,29 +5272,52 @@ class Form
             $dir=$conf->societe->multidir_output[$entity];
             $smallfile=$object->logo;
             $smallfile=preg_replace('/(\.png|\.gif|\.jpg|\.jpeg|\.bmp)/i','_small\\1',$smallfile);
-            if (! empty($object->logo)) $file=$id.'/logos/thumbs/'.$smallfile;
+            if (! empty($object->logo)) 
+            {
+                if ($imagesize == 'mini') $file=$id.'/logos/thumbs/'.getImageFileNameForSize($object->logo, '_mini');
+                else if ($imagesize == 'small') $file=$id.'/logos/thumbs/'.getImageFileNameForSize($object->logo, '_small');
+                else $file=$id.'/logos/thumbs/'.$smallfile;
+            }
         }
         else if ($modulepart=='contact')
         {
             $dir=$conf->societe->multidir_output[$entity].'/contact';
-            $file=$id.'/photos/'.$object->photo;
+            if (! empty($object->photo))
+            {
+                if ($imagesize == 'mini') $file=$id.'/photos/thumbs/'.getImageFileNameForSize($object->photo, '_mini');
+                else if ($imagesize == 'small') $file=$id.'/photos/thumbs/'.getImageFileNameForSize($object->photo, '_small');
+                else $file=$id.'/photos/'.$object->photo;
+            }
         }
         else if ($modulepart=='userphoto')
         {
             $dir=$conf->user->dir_output;
-            if (! empty($object->photo)) $file=get_exdir($id, 2, 0, 0, $object, 'user').$object->photo;
+            if (! empty($object->photo))
+            {
+                //var_dump(getImageFileNameForSize($object->photo, '_mini'));
+                if ($imagesize == 'mini') $file=get_exdir($id, 2, 0, 0, $object, 'user').getImageFileNameForSize($object->photo, '_mini');
+                else if ($imagesize == 'small') $file=get_exdir($id, 2, 0, 0, $object, 'user').getImageFileNameForSize($object->photo, '_small');
+                else $file=get_exdir($id, 2, 0, 0, $object, 'user').$object->photo;
+            }
             if (! empty($conf->global->MAIN_OLD_IMAGE_LINKS)) $altfile=$object->id.".jpg";	// For backward compatibility
             $email=$object->email;
         }
         else if ($modulepart=='memberphoto')
         {
             $dir=$conf->adherent->dir_output;
-            if (! empty($object->photo)) $file=get_exdir($id, 2, 0, 0, $object, 'invoice_supplier').'photos/'.$object->photo;
+            if (! empty($object->photo)) 
+            {
+                if ($imagesize == 'mini') $file=get_exdir($id, 2, 0, 0, $object, 'member').'photos/'.getImageFileNameForSize($object->photo, '_mini');
+                else if ($imagesize == 'small') $file=get_exdir($id, 2, 0, 0, $object, 'member').'photos/'.getImageFileNameForSize($object->photo, '_small');
+                else $file=get_exdir($id, 2, 0, 0, $object, 'member').'photos/'.$object->photo;
+            }
             if (! empty($conf->global->MAIN_OLD_IMAGE_LINKS)) $altfile=$object->id.".jpg";	// For backward compatibility
             $email=$object->email;
-        } else {
+        } 
+        else 
+        {
         	$dir=$conf->$modulepart->dir_output;
-        	if (! empty($object->photo)) $file=get_exdir($id, 2, 0, 0, $object, 'member').'photos/'.$object->photo;
+        	if (! empty($object->photo)) $file=get_exdir($id, 2, 0, 0, $object, $modulepart).'photos/'.$object->photo;
         	if (! empty($conf->global->MAIN_OLD_IMAGE_LINKS)) $altfile=$object->id.".jpg";	// For backward compatibility
         	$email=$object->email;
         }
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 896cc0824d0..0750d1d24b0 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -5223,3 +5223,33 @@ function natural_search($fields, $value, $mode=0, $nofirstand=0)
     return $res;
 }
 
+
+/**
+ * Return the filename of file to get the thumbs
+ * 
+ * @param   string  $file           Original filename
+ * @param   string  $extName        Extension to differenciate thumb file name ('', '_small', '_mini')
+ * @param   string  $extImgTarget   Force image format for thumbs. Use '' to keep same extension than original image.
+ * @return  string                  New file name
+ */
+function getImageFileNameForSize($file, $extName, $extImgTarget='')
+{
+	$dirName = dirname($file);
+	if ($dirName == '.') $dirName='';
+	
+    $fileName = preg_replace('/(\.gif|\.jpeg|\.jpg|\.png|\.bmp)$/i','',$file);	// On enleve extension quelquesoit la casse
+	$fileName = basename($fileName);
+	
+	if (empty($extImgTarget)) $extImgTarget = (preg_match('/\.jpg$/i',$file)?'.jpg':'');
+    if (empty($extImgTarget)) $extImgTarget = (preg_match('/\.jpeg$/i',$file)?'.jpeg':'');
+    if (empty($extImgTarget)) $extImgTarget = (preg_match('/\.gif$/i',$file)?'.gif':'');
+    if (empty($extImgTarget)) $extImgTarget = (preg_match('/\.png$/i',$file)?'.png':'');
+    if (empty($extImgTarget)) $extImgTarget = (preg_match('/\.bmp$/i',$file)?'.bmp':'');
+
+    if (! $extImgTarget) return $file;
+	
+    $subdir='';
+    if ($extName) $subdir = 'thumbs/';
+    
+    return $dirName.$subdir.$fileName.$extName.$extImgTarget; // New filename for thumb
+}
diff --git a/htdocs/core/lib/images.lib.php b/htdocs/core/lib/images.lib.php
index 7e47f755a7e..e61dc22eeb0 100644
--- a/htdocs/core/lib/images.lib.php
+++ b/htdocs/core/lib/images.lib.php
@@ -483,7 +483,7 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName='_small', $
             break;
 		case IMAGETYPE_JPEG:    // 2
             $trans_colour = imagecolorallocatealpha($imgThumb, 255, 255, 255, 0);
-            $extImgTarget = (preg_match('/\.jpeg$/',$file)?'.jpeg':'.jpg');
+            $extImgTarget = (preg_match('/\.jpeg$/i',$file)?'.jpeg':'.jpg');
             $newquality=$quality;
             break;
 		case IMAGETYPE_PNG:	    // 3
@@ -512,7 +512,7 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName='_small', $
 
 	$fileName = preg_replace('/(\.gif|\.jpeg|\.jpg|\.png|\.bmp)$/i','',$file);	// On enleve extension quelquesoit la casse
 	$fileName = basename($fileName);
-	$imgThumbName = $dirthumb.'/'.$fileName.$extName.$extImgTarget; // Chemin complet du fichier de la vignette
+	$imgThumbName = $dirthumb.'/'.getImageFileNameForSize($file, $extName, $extImgTarget); // Chemin complet du fichier de la vignette
 
 	// Check if permission are ok
 	//$fp = fopen($imgThumbName, "w");
diff --git a/htdocs/theme/eldy/img/object_user.png b/htdocs/theme/eldy/img/object_user.png
index d26d8899ee80f1e4976260b265a3e7d75ebab61d..6452b94da6803fa598cfacb8c6bbe0b61232a0b1 100644
GIT binary patch
delta 637
zcmV-@0)qYD1d9cb8Gi-<0019IEztk~00v@9M??Vs0RI60puMM)00009a7bBm000XU
z000XU0RWnu7ytkO2XskIMF-ys84(~Mj1>7*0006QNkl<ZD9>$@!A=uV6o$WhXUdeO
z&;o*Bi3^BOT@;w25H_+maigwWn7G0xa3@c|Gxz{J0S{nIG=I)Q)<h7bf-TcR%XDsM
z?r~MEhJSTVa=!fk$vKMuwBoN!tgo$YmrAAQX=<Ir!^8Kdr>EO{dwa3(`vgG%fZGRr
z-=|P0xDOw#?##}XUWLsNi?Fm@c`ITIz?(h<p!-D-1S~Hv<vh=OS#LBju_5kuIX*dN
zetvEX$PXsdgMUru`Z_BjZXCzN#$b%Wm>8usW5uz#!C7~(IXgS+Dy^<YNAn}b#Mso5
zqzSE7i?A7<-{|Q3KJ{PqI8Bm|J=4R)hA4^%!zPV-BLaTj2nIpG{@49p(n~&EM_sPk
zSF|o$WV0R@VYmxWtycelPPJNPW@d(3twwBODHe)9@_!@wXHhpAbsPtU?tcFC<w>&{
zc51cSU&oD&wf=4N!o7vEo5|cy(lk~|0bq<dDVG<k<;C&?!0E5005&%tuTM;jzZ=R9
z-A&W<j@G)Erl|tZ+5wTe<2dJ0H?AFhJ9-@i!FQ)psSMwqp57VqGEadiVAxu#`jJEg
z6gd%@bape&oKkxB;NW1_otm7?Da9&)wU(PCA_#)A3eU^D0C0P0;v`8TZtAu{6re=@
zc??ks0jyHWiikH>yp?yGt#;?)qPZnv$3cytbY2uWP@V=X5-X98Sh=(!ms-)DTbSoJ
X@GAtI0IY4*00000NkvXXu0mjfk?J6G

literal 607
zcmb`C&ubGw6vwx=AvHCnNGddzqJm)cVo^$q7qcXqge1h6Rtz3m7V$@{s9Or@s-SGu
z+713-5yjDiFhbKzAmD&0OfSMvQT8CXD&k&R9MjA6)Zh<@v;GZ!c<=jt?;RfR&8AaF
z{l1`2k|cjD8qNssbhEux=$=R4R)l#cW66m3i??^{?tMO1d@DwqFGWwPlH^-=vqdf+
zd@P1-XF|!4BvtQq{2BL%el4BIMuz+2@<2u&$i;{Axww+cXo`~0E1Ih4YTi^;O;dGE
zH4R-ibi>ers7%BB2Lgr$OdYsD2y_Sx2oQ7;iV-xCs}#9lgeZnU7{($5gg}E}NH8VD
zBm@ycDAXx|lv2wAmSx#Cwr$(7f#YDuaTrpWLl}dMA;vIcqP7@goFUFI=a6%ugmcQd
z%{gyy+~Bm)5YcEho5dixD85cjW>UvR`~Q&2$={aP{5%#8W!pa~>z+;io<h&%Lf2f&
zo#IS)VD)s{&mE`yslMxdol}F`Li<mEk?ifKPi7z7=y*S39#97#u6Ez=YE_G<Jkk5?
z!bCE#^GNOM=b_qSp&pc9FKv7uof<tqou0dT?IV5_@Q-i&TC2}5Y%jg3-Mv-XOQ%1i
zD~m6xFPCQKcj*h2vp>ep)mIc>bvd1gCc@!dZp*SqI`po8=<t<eC2^?~i=@I8dF<w2
D`9xIC

diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index a165a735f84..dd63a144226 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -1848,7 +1848,7 @@ class User extends CommonObject
      *  @param	integer	$notooltip			1=Disable tooltip on picto and name
      *  @param	int		$maxlen				Max length of visible user name
      *  @param	int		$hidethirdpartylogo	Hide logo of thirdparty if user is external user
-     *  @param  string  $mode               'firstname'=Show only firstname
+     *  @param  string  $mode               ''=Show firstname and lastname, 'firstname'=Show only firstname, 'login'=Show login
      *  @param  string  $morecss            Add more css on link
 	 *	@return	string						String with URL
 	 */
@@ -1885,7 +1885,7 @@ class User extends CommonObject
         if (! empty($this->photo))
         {
         	$label.= '<div class="photointooltip">';
-            $label.= Form::showphoto('userphoto', $this, 80, 0, 0, 'photowithmargin photologintooltip');
+            $label.= Form::showphoto('userphoto', $this, 80, 0, 0, 'photowithmargin photologintooltip', 'small');
         	$label.= '</div><div style="clear: both;"></div>';
         }
 
@@ -1932,13 +1932,14 @@ class User extends CommonObject
         	$paddafterimage='';
             if (abs($withpictoimg) == 1) $paddafterimage='style="padding-right: 3px;"';
         	if ($withpictoimg > 0) $picto='<div class="inline-block valignmiddle'.($morecss?' userimg'.$morecss:'').'">'.img_object('', 'user', $paddafterimage.' '.($notooltip?'':'class="classfortooltip"')).'</div>';
-        	else $picto='<div class="inline-block valignmiddle'.($morecss?' userimg'.$morecss:'').'"'.($paddafterimage?' '.$paddafterimage:'').'>'.Form::showphoto('userphoto', $this, 0, 0, 0, 'loginphoto',0,0).'</div>';
+        	else $picto='<div class="inline-block valignmiddle'.($morecss?' userimg'.$morecss:'').'"'.($paddafterimage?' '.$paddafterimage:'').'>'.Form::showphoto('userphoto', $this, 0, 0, 0, 'loginphoto', 0, 0, 'mini').'</div>';
             $result.=$picto;
 		}
 		if (abs($withpictoimg) != 2) 
 		{
 			if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) $result.='<div class="inline-block valignmiddle'.($morecss?' usertext'.$morecss:'').'">';
-			$result.=$this->getFullName($langs,'',($mode == 'firstname' ? 2 : -1),$maxlen);
+			if ($mode == 'login') $result.=dol_trunc($this->login, $maxlen);
+			else $result.=$this->getFullName($langs,'',($mode == 'firstname' ? 2 : -1),$maxlen);
 			if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) $result.='</div>';
 		}
 		$result.=$linkend;
@@ -2398,7 +2399,7 @@ class User extends CommonObject
 		$this->load_parentof();
 
 		// Init $this->users array
-		$sql = "SELECT DISTINCT u.rowid, u.firstname, u.lastname, u.fk_user, u.fk_soc, u.login, u.email, u.gender, u.admin, u.statut, u.entity";	// Distinct reduce pb with old tables with duplicates
+		$sql = "SELECT DISTINCT u.rowid, u.firstname, u.lastname, u.fk_user, u.fk_soc, u.login, u.email, u.gender, u.admin, u.statut, u.photo, u.entity";	// Distinct reduce pb with old tables with duplicates
 		$sql.= " FROM ".MAIN_DB_PREFIX."user as u";
 		if(! empty($conf->multicompany->enabled) && $conf->entity == 1 && (! empty($conf->multicompany->transverse_mode) || (! empty($user->admin) && empty($user->entity))))
 		{
@@ -2429,6 +2430,7 @@ class User extends CommonObject
 				$this->users[$obj->rowid]['email'] = $obj->email;
 				$this->users[$obj->rowid]['gender'] = $obj->gender;
 				$this->users[$obj->rowid]['admin'] = $obj->admin;
+				$this->users[$obj->rowid]['photo'] = $obj->photo;
 				$i++;
 			}
 		}
diff --git a/htdocs/user/group/index.php b/htdocs/user/group/index.php
index 058f3ac92e2..f515c8307e7 100644
--- a/htdocs/user/group/index.php
+++ b/htdocs/user/group/index.php
@@ -94,7 +94,7 @@ if ($resql)
     	print_liste_field_titre($langs->trans("Entity"),$_SERVER["PHP_SELF"],"g.entity",$param,"",'align="center"',$sortfield,$sortorder);
     }
     print_liste_field_titre($langs->trans("NbOfUsers"),$_SERVER["PHP_SELF"],"nb",$param,"",'align="center"',$sortfield,$sortorder);
-    print_liste_field_titre($langs->trans("DateCreation"),$_SERVER["PHP_SELF"],"g.datec",$param,"",'align="right"',$sortfield,$sortorder);
+    print_liste_field_titre($langs->trans("DateCreationShort"),$_SERVER["PHP_SELF"],"g.datec",$param,"",'align="right"',$sortfield,$sortorder);
     print "</tr>\n";
     $var=True;
     while ($i < $num)
diff --git a/htdocs/user/hierarchy.php b/htdocs/user/hierarchy.php
index a9aef6ed783..14b8ec4265b 100644
--- a/htdocs/user/hierarchy.php
+++ b/htdocs/user/hierarchy.php
@@ -82,6 +82,7 @@ foreach($fulltree as $key => $val)
 {
 	$userstatic->id=$val['id'];
 	$userstatic->ref=$val['label'];
+	$userstatic->login=$val['login'];
 	$userstatic->firstname=$val['firstname'];
 	$userstatic->lastname=$val['lastname'];
 	$userstatic->statut=$val['statut'];
@@ -90,6 +91,7 @@ foreach($fulltree as $key => $val)
 	$userstatic->societe_id=$val['fk_soc'];
 	$userstatic->admin=$val['admin'];
 	$userstatic->entity=$val['entity'];
+	$userstatic->photo=$val['photo'];
 	
 	$entity=$val['entity'];
 	$entitystring='';
@@ -111,7 +113,7 @@ foreach($fulltree as $key => $val)
 		}
 	}
 
-	$li=$userstatic->getNomUrl(1,'',0,1);
+	$li=$userstatic->getNomUrl(-1,'',0,1);
 	if (! empty($conf->multicompany->enabled) && $userstatic->admin && ! $userstatic->entity)
 	{
 		$li.=img_picto($langs->trans("SuperAdministrator"),'redstar');
@@ -121,12 +123,12 @@ foreach($fulltree as $key => $val)
 		$li.=img_picto($langs->trans("Administrator"),'star');
 	}
 	$li.=' ('.$val['login'].($entitystring?' - '.$entitystring:'').')';
-
+	
 	$data[] = array(
 		'rowid'=>$val['rowid'],
 		'fk_menu'=>$val['fk_user'],
 		'statut'=>$val['statut'],
-		'entry'=>'<table class="nobordernopadding centpercent"><tr><td class="'.($val['statut']?'usertdenabled':'usertddisabled').'">'.$li.'</td><td align="right" class="'.($val['statut']?'usertdenabled':'usertddisabled').'">'.$userstatic->getLibStatut(5).'</td></tr></table>'
+		'entry'=>'<table class="nobordernopadding centpercent"><tr><td class="'.($val['statut']?'usertdenabled':'usertddisabled').'">'.$li.'</td><td align="right" class="'.($val['statut']?'usertdenabled':'usertddisabled').'">'.$userstatic->getLibStatut(3).'</td></tr></table>'
 	);
 }
 
diff --git a/htdocs/user/index.php b/htdocs/user/index.php
index 40fe8353093..7688cadbe05 100644
--- a/htdocs/user/index.php
+++ b/htdocs/user/index.php
@@ -124,11 +124,11 @@ $buttonviewhierarchy='<form action="'.DOL_URL_ROOT.'/user/hierarchy.php'.(($sear
 
 print load_fiche_titre($langs->trans("ListOfUsers"), $buttonviewhierarchy);
 
-$sql = "SELECT u.rowid, u.lastname, u.firstname, u.admin, u.fk_soc, u.login, u.email, u.gender,";
+$sql = "SELECT u.rowid, u.lastname, u.firstname, u.admin, u.fk_soc, u.login, u.email, u.gender, u.photo,";
 $sql.= " u.datelastlogin, u.datepreviouslogin,";
 $sql.= " u.ldap_sid, u.statut, u.entity,";
 $sql.= " u.tms as date_update, u.datec as date_creation,";
-$sql.= " u2.login as login2, u2.firstname as firstname2, u2.lastname as lastname2,";
+$sql.= " u2.rowid as id2, u2.login as login2, u2.firstname as firstname2, u2.lastname as lastname2, u2.admin as admin2, u2.fk_soc as fk_soc2, u2.email as email2, u2.gender as gender2, u2.photo as photo2, u2.entity as entity2,";
 $sql.= " s.nom as name, s.canvas";
 // Add fields from extrafields
 foreach ($extrafields->attribute_list as $key => $val) $sql.=",ef.".$key.' as options_'.$key;
@@ -341,10 +341,11 @@ if ($result)
 	    $userstatic->email=$obj->email;
 	    $userstatic->gender=$obj->gender;
 	    $userstatic->societe_id=$obj->fk_soc;
-	    $userstatic->firstname='';
-		$userstatic->lastname=$obj->login;
+	    $userstatic->firstname=$obj->firstname;
+		$userstatic->lastname=$obj->lastname;
+		$userstatic->photo=$obj->photo;
         
-		$li=$userstatic->getNomUrl(1,'',0,0,24,1);
+		$li=$userstatic->getNomUrl(-1,'',0,0,24,1,'login');
 
         print "<tr ".$bc[$var].">";
         if (! empty($arrayfields['u.login']['checked']))
@@ -418,12 +419,24 @@ if ($result)
             print '<td class="nowrap">';
             if ($obj->login2)
             {
+    	        $user2->id=$obj->id2;
     	        $user2->login=$obj->login2;
-    	        //$user2->lastname=$obj->lastname2;
-    	        //$user2->firstname=$obj->firstname2;
-    	        $user2->lastname=$user2->login;
-    	        $user2->firstname='';
-    	        print $user2->getNomUrl(1);
+    	        $user2->lastname=$obj->lastname2;
+    	        $user2->firstname=$obj->firstname2;
+    	        $user2->gender=$obj->gender2;
+    	        $user2->photo=$obj->photo2;
+    	        $user2->admin=$obj->admin2;
+    	        $user2->email=$obj->email2;
+    	        $user2->societe_id=$obj->fk_soc2;
+    	        print $user2->getNomUrl(-1,'',0,0,24,0,'');
+                if (! empty($conf->multicompany->enabled) && $obj->admin2 && ! $obj->entity2)
+                {
+                  	print img_picto($langs->trans("SuperAdministrator"),'redstar');
+                }
+                else if ($obj->admin2)
+                {
+                	print img_picto($langs->trans("Administrator"),'star');
+                }
             }
             print '</td>';
 		}		

From 48ed8d440869b64f532c079055660bbb42fefe8b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 25 Oct 2015 19:42:00 +0100
Subject: [PATCH 49/66] FIX The thumb of user into top menu was using the image
 in full size. This make a large download at each page call. We must use the
 mini thumbs.

---
 htdocs/core/class/html.form.class.php | 10 +++++++--
 htdocs/core/lib/functions.lib.php     | 29 +++++++++++++++++++++++++++
 htdocs/main.inc.php                   |  2 +-
 htdocs/user/class/user.class.php      |  5 +++--
 4 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index b75bd01d2aa..9b0ef17b465 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -5134,10 +5134,11 @@ class Form
      * 		@param	int			$width			Width of photo
      * 		@param	int			$height			Height of photo (auto if 0)
      * 		@param	int			$caneditfield	Add edit fields
+     * 		@param	string		$imagesize		'mini', 'small' or '' (original)
      * 		@param	string		$cssclass		CSS name to use on img for photo
      * 	  	@return string    					HTML code to output photo
      */
-    static function showphoto($modulepart, $object, $width=100, $height=0, $caneditfield=0, $cssclass='photowithmargin')
+    static function showphoto($modulepart, $object, $width=100, $height=0, $caneditfield=0, $cssclass='photowithmargin', $imagesize='')
     {
         global $conf,$langs;
 
@@ -5156,7 +5157,12 @@ class Form
         else if ($modulepart=='userphoto')
         {
             $dir=$conf->user->dir_output;
-            if ($object->photo) $file=get_exdir($id, 2, 0, 0, $object, 'user').$object->photo;
+            if (! empty($object->photo))
+            {
+                if ($imagesize == 'mini') $file=get_exdir($id, 2, 0, 0, $object, 'user').getImageFileNameForSize($object->photo, '_mini');
+                else if ($imagesize == 'small') $file=get_exdir($id, 2, 0, 0, $object, 'user').getImageFileNameForSize($object->photo, '_small');
+                else $file=get_exdir($id, 2, 0, 0, $object, 'user').$object->photo;
+            }
             if (! empty($conf->global->MAIN_OLD_IMAGE_LINKS)) $altfile=$object->id.".jpg";	// For backward compatibility
             $email=$object->email;
         }
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 290cdb2300b..04c2c02a7d5 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -5118,3 +5118,32 @@ function natural_search($fields, $value, $mode=0, $nofirstand=0)
     return $res;
 }
 
+/**
+ * Return the filename of file to get the thumbs
+ * 
+ * @param   string  $file           Original filename
+ * @param   string  $extName        Extension to differenciate thumb file name ('', '_small', '_mini')
+ * @param   string  $extImgTarget   Force image format for thumbs. Use '' to keep same extension than original image.
+ * @return  string                  New file name
+ */
+function getImageFileNameForSize($file, $extName, $extImgTarget='')
+{
+	$dirName = dirname($file);
+	if ($dirName == '.') $dirName='';
+	
+    $fileName = preg_replace('/(\.gif|\.jpeg|\.jpg|\.png|\.bmp)$/i','',$file);	// On enleve extension quelquesoit la casse
+	$fileName = basename($fileName);
+	
+	if (empty($extImgTarget)) $extImgTarget = (preg_match('/\.jpg$/i',$file)?'.jpg':'');
+    if (empty($extImgTarget)) $extImgTarget = (preg_match('/\.jpeg$/i',$file)?'.jpeg':'');
+    if (empty($extImgTarget)) $extImgTarget = (preg_match('/\.gif$/i',$file)?'.gif':'');
+    if (empty($extImgTarget)) $extImgTarget = (preg_match('/\.png$/i',$file)?'.png':'');
+    if (empty($extImgTarget)) $extImgTarget = (preg_match('/\.bmp$/i',$file)?'.bmp':'');
+
+    if (! $extImgTarget) return $file;
+	
+    $subdir='';
+    if ($extName) $subdir = 'thumbs/';
+    
+    return $dirName.$subdir.$fileName.$extName.$extImgTarget; // New filename for thumb
+}
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 51147a03a9c..92d421d42cb 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1443,7 +1443,7 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
 
 	    // User photo
 	    $toprightmenu.='<div class="inline-block nowrap"><div class="inline-block login_block_elem" style="padding: 0px;">';
-	    $toprightmenu.=$user->getPhotoUrl(16,16,'loginphoto');
+	    $toprightmenu.=$user->getPhotoUrl(16,16,'loginphoto','mini');
 	    $toprightmenu.='</div></div>';
 
 	    // Login name with tooltip
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index e375a3c3d80..4459dfc3fc0 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -1813,14 +1813,15 @@ class User extends CommonObject
 	 *	@param	int		$width			Width of image
 	 *	@param	int		$height			Height of image
 	 *  @param	string	$cssclass		Force a css class
+     * 	@param	string	$imagesize		'mini', 'small' or '' (original)
 	 *	@return	string					String with URL link
 	 */
-	function getPhotoUrl($width, $height, $cssclass='')
+	function getPhotoUrl($width, $height, $cssclass='', $imagesize='')
 	{
 		$result='';
 
 		$result.='<a href="'.DOL_URL_ROOT.'/user/card.php?id='.$this->id.'">';
-	    $result.=Form::showphoto('userphoto', $this, $width, $height, 0, $cssclass);
+	    $result.=Form::showphoto('userphoto', $this, $width, $height, 0, $cssclass, $imagesize);
 	    $result.='</a>';
 
 	    return $result;

From d7761ece58ea0cfaf8ede926b3e3a5dc42427cdd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 25 Oct 2015 19:42:54 +0100
Subject: [PATCH 50/66] FIX The thumb of user into top menu was using the image
 in full size. This make a large download at each page call. We must use the
 mini thumbs.

---
 htdocs/core/class/html.form.class.php | 3 +--
 htdocs/user/class/user.class.php      | 5 +++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 6bb8049f6f6..a192b54c200 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -5258,7 +5258,7 @@ class Form
      *      @param  int         $addlinktofullsize  Add link to fullsize image
      * 	  	@return string    						HTML code to output photo
      */
-    static function showphoto($modulepart, $object, $width=100, $height=0, $caneditfield=0, $cssclass='photowithmargin', $imagesize='',$addlinktofullsize=1)
+    static function showphoto($modulepart, $object, $width=100, $height=0, $caneditfield=0, $cssclass='photowithmargin', $imagesize='', $addlinktofullsize=1)
     {
         global $conf,$langs;
 
@@ -5294,7 +5294,6 @@ class Form
             $dir=$conf->user->dir_output;
             if (! empty($object->photo))
             {
-                //var_dump(getImageFileNameForSize($object->photo, '_mini'));
                 if ($imagesize == 'mini') $file=get_exdir($id, 2, 0, 0, $object, 'user').getImageFileNameForSize($object->photo, '_mini');
                 else if ($imagesize == 'small') $file=get_exdir($id, 2, 0, 0, $object, 'user').getImageFileNameForSize($object->photo, '_small');
                 else $file=get_exdir($id, 2, 0, 0, $object, 'user').$object->photo;
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index dd63a144226..e281f4002f3 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -1825,14 +1825,15 @@ class User extends CommonObject
 	 *	@param	int		$width			Width of image
 	 *	@param	int		$height			Height of image
 	 *  @param	string	$cssclass		Force a css class
+     * 	@param	string	$imagesize		'mini', 'small' or '' (original)
 	 *	@return	string					String with URL link
 	 */
-	function getPhotoUrl($width, $height, $cssclass='')
+	function getPhotoUrl($width, $height, $cssclass='', $imagesize='')
 	{
 		$result='';
 
 		$result.='<a href="'.DOL_URL_ROOT.'/user/card.php?id='.$this->id.'">';
-	    $result.=Form::showphoto('userphoto', $this, $width, $height, 0, $cssclass);
+	    $result.=Form::showphoto('userphoto', $this, $width, $height, 0, $cssclass, $imagesize);
 	    $result.='</a>';
 
 	    return $result;

From 24732cf454405793f35ddae77d02f343bb4824bf Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 25 Oct 2015 20:01:39 +0100
Subject: [PATCH 51/66] Fix to avoid duplicate tooltip

---
 htdocs/adherents/class/adherent.class.php | 2 +-
 htdocs/user/class/user.class.php          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index e828117327b..77437667c33 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -1575,7 +1575,7 @@ class Adherent extends CommonObject
 
         $picto='user';
 
-        if ($withpicto) $result.=($link.img_object($label, $picto, 'class="classfortooltip"').$linkend);
+        if ($withpicto) $result.=($link.img_object('', $picto, 'class="classfortooltip"').$linkend);
         if ($withpicto && $withpicto != 2) $result.=' ';
         $result.=$link.($maxlen?dol_trunc($this->ref,$maxlen):$this->ref).$linkend;
         return $result;
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index e281f4002f3..d4358bb2b0a 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -1845,7 +1845,7 @@ class User extends CommonObject
 	 *
 	 *	@param	int		$withpictoimg		Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto, -1=Include photo into link, -2=Only picto photo)
 	 *	@param	string	$option				On what the link point to
-     *  @param  integer $infologin      	Add connection info to the tooltip
+     *  @param  integer $infologin      	Add complete info tooltip
      *  @param	integer	$notooltip			1=Disable tooltip on picto and name
      *  @param	int		$maxlen				Max length of visible user name
      *  @param	int		$hidethirdpartylogo	Hide logo of thirdparty if user is external user

From 54883f2d84c788182fadf10a4c11f1bcf990b604 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 25 Oct 2015 20:14:57 +0100
Subject: [PATCH 52/66] FIX Bad picto for expense report

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

diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index 920c6aa16d7..0dba68b5b5c 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -1534,7 +1534,7 @@ class ExpenseReport extends CommonObject
 	        $response->warning_delay=$conf->expensereport->payment->warning_delay/60/60/24;
 	        $response->label=$langs->trans("ExpenseReportsToPay");
 	        $response->url=DOL_URL_ROOT.'/expensereport/list.php?mainmenu=hrm&amp;statut=5';
-	        $response->img=img_object($langs->trans("ExpenseReports"),"user");
+	        $response->img=img_object($langs->trans("ExpenseReports"),"trip");
 
             while ($obj=$this->db->fetch_object($resql))
             {

From 9a4b62c279dc0c16c1457c787ea0c7a5fdeb67a2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 25 Oct 2015 20:15:52 +0100
Subject: [PATCH 53/66] NEW Introduce use of cache for thumbs images of users

---
 htdocs/core/class/html.form.class.php | 27 ++++++++++++++++-----------
 htdocs/user/class/user.class.php      |  4 ++--
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index a192b54c200..5f714a85bcd 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -5256,9 +5256,10 @@ class Form
      * 		@param	string		$cssclass			CSS name to use on img for photo
      * 		@param	string		$imagesize		    'mini', 'small' or '' (original)
      *      @param  int         $addlinktofullsize  Add link to fullsize image
+     *      @param  int         $cache              1=Accept to use image in cache
      * 	  	@return string    						HTML code to output photo
      */
-    static function showphoto($modulepart, $object, $width=100, $height=0, $caneditfield=0, $cssclass='photowithmargin', $imagesize='', $addlinktofullsize=1)
+    static function showphoto($modulepart, $object, $width=100, $height=0, $caneditfield=0, $cssclass='photowithmargin', $imagesize='', $addlinktofullsize=1, $cache=0)
     {
         global $conf,$langs;
 
@@ -5274,8 +5275,8 @@ class Form
             $smallfile=preg_replace('/(\.png|\.gif|\.jpg|\.jpeg|\.bmp)/i','_small\\1',$smallfile);
             if (! empty($object->logo)) 
             {
-                if ($imagesize == 'mini') $file=$id.'/logos/thumbs/'.getImageFileNameForSize($object->logo, '_mini');
-                else if ($imagesize == 'small') $file=$id.'/logos/thumbs/'.getImageFileNameForSize($object->logo, '_small');
+                if ((string) $imagesize == 'mini') $file=$id.'/logos/thumbs/'.getImageFileNameForSize($object->logo, '_mini');
+                else if ((string) $imagesize == 'small') $file=$id.'/logos/thumbs/'.getImageFileNameForSize($object->logo, '_small');
                 else $file=$id.'/logos/thumbs/'.$smallfile;
             }
         }
@@ -5284,8 +5285,8 @@ class Form
             $dir=$conf->societe->multidir_output[$entity].'/contact';
             if (! empty($object->photo))
             {
-                if ($imagesize == 'mini') $file=$id.'/photos/thumbs/'.getImageFileNameForSize($object->photo, '_mini');
-                else if ($imagesize == 'small') $file=$id.'/photos/thumbs/'.getImageFileNameForSize($object->photo, '_small');
+                if ((string) $imagesize == 'mini') $file=$id.'/photos/thumbs/'.getImageFileNameForSize($object->photo, '_mini');
+                else if ((string) $imagesize == 'small') $file=$id.'/photos/thumbs/'.getImageFileNameForSize($object->photo, '_small');
                 else $file=$id.'/photos/'.$object->photo;
             }
         }
@@ -5294,8 +5295,8 @@ class Form
             $dir=$conf->user->dir_output;
             if (! empty($object->photo))
             {
-                if ($imagesize == 'mini') $file=get_exdir($id, 2, 0, 0, $object, 'user').getImageFileNameForSize($object->photo, '_mini');
-                else if ($imagesize == 'small') $file=get_exdir($id, 2, 0, 0, $object, 'user').getImageFileNameForSize($object->photo, '_small');
+                if ((string) $imagesize == 'mini') $file=get_exdir($id, 2, 0, 0, $object, 'user').getImageFileNameForSize($object->photo, '_mini');
+                else if ((string) $imagesize == 'small') $file=get_exdir($id, 2, 0, 0, $object, 'user').getImageFileNameForSize($object->photo, '_small');
                 else $file=get_exdir($id, 2, 0, 0, $object, 'user').$object->photo;
             }
             if (! empty($conf->global->MAIN_OLD_IMAGE_LINKS)) $altfile=$object->id.".jpg";	// For backward compatibility
@@ -5306,8 +5307,8 @@ class Form
             $dir=$conf->adherent->dir_output;
             if (! empty($object->photo)) 
             {
-                if ($imagesize == 'mini') $file=get_exdir($id, 2, 0, 0, $object, 'member').'photos/'.getImageFileNameForSize($object->photo, '_mini');
-                else if ($imagesize == 'small') $file=get_exdir($id, 2, 0, 0, $object, 'member').'photos/'.getImageFileNameForSize($object->photo, '_small');
+                if ((string) $imagesize == 'mini') $file=get_exdir($id, 2, 0, 0, $object, 'member').'photos/'.getImageFileNameForSize($object->photo, '_mini');
+                else if ((string) $imagesize == 'small') $file=get_exdir($id, 2, 0, 0, $object, 'member').'photos/'.getImageFileNameForSize($object->photo, '_small');
                 else $file=get_exdir($id, 2, 0, 0, $object, 'member').'photos/'.$object->photo;
             }
             if (! empty($conf->global->MAIN_OLD_IMAGE_LINKS)) $altfile=$object->id.".jpg";	// For backward compatibility
@@ -5316,14 +5317,18 @@ class Form
         else 
         {
         	$dir=$conf->$modulepart->dir_output;
-        	if (! empty($object->photo)) $file=get_exdir($id, 2, 0, 0, $object, $modulepart).'photos/'.$object->photo;
+        	if (! empty($object->photo)) 
+        	{
+                if ((string) $imagesize == 'mini') $file=get_exdir($id, 2, 0, 0, $object, $modulepart).'photos/'.getImageFileNameForSize($object->photo, '_mini');
+                else if ((string) $imagesize == 'small') $file=get_exdir($id, 2, 0, 0, $object, $modulepart).'photos/'.getImageFileNameForSize($object->photo, '_small');
+        	    else $file=get_exdir($id, 2, 0, 0, $object, $modulepart).'photos/'.$object->photo;
+        	}
         	if (! empty($conf->global->MAIN_OLD_IMAGE_LINKS)) $altfile=$object->id.".jpg";	// For backward compatibility
         	$email=$object->email;
         }
 
         if ($dir)
         {
-            $cache='0';
             if ($file && file_exists($dir."/".$file))
             {
                 if ($addlinktofullsize) $ret.='<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$entity.'&file='.urlencode($file).'&cache='.$cache.'">';
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index d4358bb2b0a..f16af2ee72d 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -1886,7 +1886,7 @@ class User extends CommonObject
         if (! empty($this->photo))
         {
         	$label.= '<div class="photointooltip">';
-            $label.= Form::showphoto('userphoto', $this, 80, 0, 0, 'photowithmargin photologintooltip', 'small');
+            $label.= Form::showphoto('userphoto', $this, 80, 0, 0, 'photowithmargin photologintooltip', 'small', 0, 1);
         	$label.= '</div><div style="clear: both;"></div>';
         }
 
@@ -1933,7 +1933,7 @@ class User extends CommonObject
         	$paddafterimage='';
             if (abs($withpictoimg) == 1) $paddafterimage='style="padding-right: 3px;"';
         	if ($withpictoimg > 0) $picto='<div class="inline-block valignmiddle'.($morecss?' userimg'.$morecss:'').'">'.img_object('', 'user', $paddafterimage.' '.($notooltip?'':'class="classfortooltip"')).'</div>';
-        	else $picto='<div class="inline-block valignmiddle'.($morecss?' userimg'.$morecss:'').'"'.($paddafterimage?' '.$paddafterimage:'').'>'.Form::showphoto('userphoto', $this, 0, 0, 0, 'loginphoto', 0, 0, 'mini').'</div>';
+        	else $picto='<div class="inline-block valignmiddle'.($morecss?' userimg'.$morecss:'').'"'.($paddafterimage?' '.$paddafterimage:'').'>'.Form::showphoto('userphoto', $this, 0, 0, 0, 'loginphoto', 'mini', 0, 1).'</div>';
             $result.=$picto;
 		}
 		if (abs($withpictoimg) != 2) 

From 080ba15e0de42ec5477be20dfc72fec7f216d8f3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 25 Oct 2015 22:50:05 +0100
Subject: [PATCH 54/66] FIX The price per level just never correctly manage the
 vat. Vat is not per level but depends on seller and supplyer. I kept a hidden
 option to keep old behaviour that was bugged.

---
 htdocs/compta/facture.php        |  34 +++---
 htdocs/langs/en_US/products.lang |   2 +
 htdocs/product/price.php         | 192 +++++++++++++++++++++++--------
 3 files changed, 166 insertions(+), 62 deletions(-)

diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index f2148f8e063..983331bd412 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -1283,7 +1283,8 @@ if (empty($reshook))
 			// Ecrase $txtva par celui du produit
 			// Ecrase $base_price_type par celui du produit
 			// Replaces $fk_unit with the product's
-			if (! empty($idprod)) {
+			if (! empty($idprod)) 
+			{
 				$prod = new Product($db);
 				$prod->fetch($idprod);
 
@@ -1304,8 +1305,11 @@ if (empty($reshook))
 						$pu_ttc = $prod->multiprices_ttc[$object->thirdparty->price_level];
 						$price_min = $prod->multiprices_min[$object->thirdparty->price_level];
 						$price_base_type = $prod->multiprices_base_type[$object->thirdparty->price_level];
-						if (isset($prod->multiprices_tva_tx[$object->thirdparty->price_level])) $tva_tx=$prod->multiprices_tva_tx[$object->thirdparty->price_level];
-						if (isset($prod->multiprices_recuperableonly[$object->thirdparty->price_level])) $tva_npr=$prod->multiprices_recuperableonly[$object->thirdparty->price_level];
+						if (! empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL))  // using this option is a bug. kept for backward compatibility
+						{
+                            if (isset($prod->multiprices_tva_tx[$object->thirdparty->price_level])) $tva_tx=$prod->multiprices_tva_tx[$object->thirdparty->price_level];
+                            if (isset($prod->multiprices_recuperableonly[$object->thirdparty->price_level])) $tva_npr=$prod->multiprices_recuperableonly[$object->thirdparty->price_level];
+						}
 					}
 					elseif (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 					{
@@ -1318,26 +1322,30 @@ if (empty($reshook))
 						$result = $prodcustprice->fetch_all('', '', 0, 0, $filter);
 						if ($result) {
 							if (count($prodcustprice->lines) > 0) {
-								$pu_ht = price($prodcustprice->lines [0]->price);
-								$pu_ttc = price($prodcustprice->lines [0]->price_ttc);
-								$price_base_type = $prodcustprice->lines [0]->price_base_type;
-								$prod->tva_tx = $prodcustprice->lines [0]->tva_tx;
+								$pu_ht = price($prodcustprice->lines[0]->price);
+								$pu_ttc = price($prodcustprice->lines[0]->price_ttc);
+								$price_base_type = $prodcustprice->lines[0]->price_base_type;
+								$prod->tva_tx = $prodcustprice->lines[0]->tva_tx;
 							}
 						}
 					}
 
-					// if price ht is forced (ie: calculated by margin rate and cost price)
-					if (! empty($price_ht)) {
+					// if price ht was forced (ie: from gui when calculated by margin rate and cost price)
+					if (! empty($price_ht))
+					{
 						$pu_ht = price2num($price_ht, 'MU');
 						$pu_ttc = price2num($pu_ht * (1 + ($tva_tx / 100)), 'MU');
 					}
-
 					// On reevalue prix selon taux tva car taux tva transaction peut etre different
 					// de ceux du produit par defaut (par exemple si pays different entre vendeur et acheteur).
-					elseif ($tva_tx != $prod->tva_tx) {
-						if ($price_base_type != 'HT') {
+					elseif ($tva_tx != $prod->tva_tx) 
+					{
+						if ($price_base_type != 'HT') 
+						{
 							$pu_ht = price2num($pu_ttc / (1 + ($tva_tx / 100)), 'MU');
-						} else {
+						}
+						else 
+						{
 							$pu_ttc = price2num($pu_ht * (1 + ($tva_tx / 100)), 'MU');
 						}
 					}
diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang
index e108dfff52b..1759eb12e9f 100644
--- a/htdocs/langs/en_US/products.lang
+++ b/htdocs/langs/en_US/products.lang
@@ -67,6 +67,8 @@ ProductStatusNotOnBuy=Not for purchase
 ProductStatusOnBuyShort=For purchase
 ProductStatusNotOnBuyShort=Not for purchase
 UpdatePrice=Update price
+UpdateVAT=Update vat
+UpdateDefaultPrice=Update default price
 AppliedPricesFrom=Applied prices from
 SellingPrice=Selling price
 SellingPriceHT=Selling price (net of tax)
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index 9c7defc4643..ac611faf5c3 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -84,8 +84,37 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 if (empty($reshook))
 {
-	if ($action == 'update_price' && !$cancel && ($user->rights->produit->creer || $user->rights->service->creer))
+	if (($action == 'update_vat') && !$cancel && ($user->rights->produit->creer || $user->rights->service->creer))
 	{
+	    $object->tva_tx = GETPOST('tva_tx');
+	    
+	    $db->begin();
+	    
+	    $resql = $object->update($object->id, $user);
+	    if (! $resql)
+	    {
+	        $error++;
+	    }
+	    
+	    if ($error)
+	    {
+	       $object->updatePrice($newprice, $newpricebase, $user, $newvat, $newprice_min, $level, $newnpr, $newpsq);
+	    }
+	    
+	    if (! $error)
+	    {
+	        $db->commit();
+	    }
+	    else
+	    {
+	        $db->rollback();
+	    }
+	    
+	    $action='';
+	}
+	    
+	if (($action == 'update_price') && !$cancel && ($user->rights->produit->creer || $user->rights->service->creer))
+    {
 		$maxpricesupplier = $object->min_recommended_price();
 		$object->fk_price_expression = empty($eid) ? 0 : $eid; //0 discards expression
 
@@ -399,6 +428,11 @@ if ($isphoto) {
 
 print '</tr>';
 
+// Status (to sell)
+print '<tr><td>' . $langs->trans("Status") . ' (' . $langs->trans("Sell") . ')</td><td colspan="2">';
+print $object->getLibStatut(2, 0);
+print '</td></tr>';
+
 // MultiPrix
 if (! empty($conf->global->PRODUIT_MULTIPRICES))
 {
@@ -433,14 +467,32 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES))
 			print price($object->multiprices_min["$soc->price_level"]) . ' ' . $langs->trans(empty($object->multiprices_base_type["$soc->price_level"])?'HT':$object->multiprices_base_type["$soc->price_level"]);
 		}
 		print '</td></tr>';
-
-		// TVA
-		print '<tr><td>' . $langs->trans("VATRate") . '</td><td colspan="2">' . vatrate($object->multiprices_tva_tx["$soc->price_level"], true) . '</td></tr>';
+        
+		if (! empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL))  // using this option is a bug. kept for backward compatibility
+		{
+    	   // TVA
+	       print '<tr><td>' . $langs->trans("VATRate") . '</td><td colspan="2">' . vatrate($object->multiprices_tva_tx["$soc->price_level"], true) . '</td></tr>';
+		}
+		else
+		{
+        	// TVA
+        	print '<tr><td>' . $langs->trans("VATRate") . '</td><td>' . vatrate($object->tva_tx . ($object->tva_npr ? '*' : ''), true) . '</td></tr>';
+		}
+		
 	}
 	else
 	{
-		// We show only vat for level 1
-		print '<tr><td>' . $langs->trans("VATRate") . '</td><td colspan="2">' . vatrate($object->multiprices_tva_tx [1], true) . '</td></tr>';
+		if (! empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL))  // using this option is a bug. kept for backward compatibility
+		{
+    	   // We show only vat for level 1
+	       print '<tr><td>' . $langs->trans("VATRate") . '</td><td colspan="2">' . vatrate($object->multiprices_tva_tx [1], true) . '</td></tr>';
+		}
+		else
+		{
+            // TVA
+	        print '<tr><td>' . $langs->trans("VATRate") . '</td><td>' . vatrate($object->tva_tx . ($object->tva_npr ? '*' : ''), true) . '</td></tr>';
+		}
+	   
 		print '<tr class="liste_titre"><td style="text-align: center">'.$langs->trans("PriceLevel").'</td><td style="text-align: center">'.$langs->trans("SellingPrice").'</td><td style="text-align: center">'.$langs->trans("MinPrice").'</td></tr>';
 
 		for($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i ++)
@@ -551,7 +603,9 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES))
 			}
 		}
 	}
-} else {
+} 
+else 
+{
 	// TVA
 	print '<tr><td>' . $langs->trans("VATRate") . '</td><td>' . vatrate($object->tva_tx . ($object->tva_npr ? '*' : ''), true) . '</td></tr>';
 
@@ -649,11 +703,6 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES))
 	}
 }
 
-// Status (to sell)
-print '<tr><td>' . $langs->trans("Status") . ' (' . $langs->trans("Sell") . ')</td><td colspan="2">';
-print $object->getLibStatut(2, 0);
-print '</td></tr>';
-
 print "</table>\n";
 
 dol_fiche_end();
@@ -669,16 +718,69 @@ if (! $action || $action == 'delete' || $action == 'showlog_customer_price' || $
 {
 	print "\n" . '<div class="tabsAction">' . "\n";
 
-	if ($user->rights->produit->creer || $user->rights->service->creer) {
-		print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?action=edit_price&amp;id=' . $object->id . '">' . $langs->trans("UpdatePrice") . '</a></div>';
+	if (empty($conf->global->PRODUIT_MULTIPRICES))
+	{
+    	if ($user->rights->produit->creer || $user->rights->service->creer) {
+    		print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?action=edit_price&amp;id=' . $object->id . '">' . $langs->trans("UpdateDefaultPrice") . '</a></div>';
+    	}
 	}
-
+	else
+	{
+	    if ($user->rights->produit->creer || $user->rights->service->creer) {
+    		print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?action=edit_vat&amp;id=' . $object->id . '">' . $langs->trans("UpdateVAT") . '</a></div>';
+    	}
+	    
+	    if ($user->rights->produit->creer || $user->rights->service->creer) {
+    		print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?action=edit_price&amp;id=' . $object->id . '">' . $langs->trans("UpdateDefaultPrice") . '</a></div>';
+    	}
+	}
+    if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
+    {
+        if ($user->rights->produit->creer || $user->rights->service->creer) {
+    		print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?action=add_customer_price&amp;id=' . $object->id . '">' . $langs->trans("AddCustomerPrice") . '</a></div>';
+    	}
+    }
+    
 	print "\n</div>\n";
 }
 
+
+
 /*
- * Edition du prix
+ * Edit price area
  */
+ 
+if ($action == 'edit_vat' && ($user->rights->produit->creer || $user->rights->service->creer))
+{
+	print load_fiche_titre($langs->trans("UpdateVAT"), '');
+
+	print '<form action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '" method="POST">';
+	print '<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">';
+	print '<input type="hidden" name="action" value="update_vat">';
+	print '<input type="hidden" name="id" value="' . $object->id . '">';
+
+	dol_fiche_head('');
+	
+	print '<table class="border" width="100%">';
+
+	// VAT
+	print '<tr><td>' . $langs->trans("VATRate") . '</td><td>';
+	print $form->load_tva("tva_tx", $object->tva_tx, $mysoc, '', $object->id, $object->tva_npr);
+	print '</td></tr>';
+
+	print '</table>';
+
+	dol_fiche_end();
+
+	print '<div class="center">';
+	print '<input type="submit" class="button" value="' . $langs->trans("Save") . '">';
+	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
+	print '<input type="submit" class="button" name="cancel" value="' . $langs->trans("Cancel") . '">';
+	print '</div>';
+
+	print '<br></form><br>';
+}
+ 
 if ($action == 'edit_price' && ($user->rights->produit->creer || $user->rights->service->creer))
 {
 	print load_fiche_titre($langs->trans("NewPrice"), '');
@@ -785,26 +887,31 @@ if ($action == 'edit_price' && ($user->rights->produit->creer || $user->rights->
 	}
 	else
 	{
-		for($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i ++)
+		dol_fiche_head('');
+		
+	    for ($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i ++)
 		{
+		    if ($i > 1) print '<br>';
+		    
 			print '<form action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '" method="POST">';
-			print '<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">';
+			print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
 			print '<input type="hidden" name="action" value="update_price">';
 			print '<input type="hidden" name="id" value="' . $object->id . '">';
+			if (empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL))
+			{
+				print '<input type="hidden" name="tva_tx_' . $i . '" value="' . $object->tva_tx . '">';
+			}
 			
-			dol_fiche_head('');
-		
 			print '<table class="border" width="100%">';
 
 			// VAT
-			if ($i == 1) {
+			if (! empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL))
+			{
 				print '<tr><td>' . $langs->trans("VATRate") . '</td><td>';
-				print $form->load_tva("tva_tx_" . $i, $object->multiprices_tva_tx ["$i"], $mysoc, '', $object->id);
+				print $form->load_tva("tva_tx_" . $i, $object->multiprices_tva_tx["$i"], $mysoc, '', $object->id);
 				print '</td></tr>';
-			} else { // We always use the vat rate of price level 1 (A vat rate does not depends on customer)
-				print '<input type="hidden" name="tva_tx_' . $i . '" value="' . $object->multiprices_tva_tx [1] . '">';
 			}
-
+			
 			// Selling price
 			print '<tr><td width="20%">';
 			$text = $langs->trans('SellingPrice') . ' ' . $i;
@@ -839,10 +946,10 @@ if ($action == 'edit_price' && ($user->rights->produit->creer || $user->rights->
 			
 			print '</table>';
 
-			dol_fiche_end();
-
 			print '</form>';
 		}
+	
+		dol_fiche_end();
 	}
 }
 
@@ -886,14 +993,14 @@ if ($result)
 		print '<td>' . $langs->trans("AppliedPricesFrom") . '</td>';
 
 		if (! empty($conf->global->PRODUIT_MULTIPRICES)) {
-			print '<td align="center">' . $langs->trans("MultiPriceLevelsName") . '</td>';
+			print '<td align="center">' . $langs->trans("PriceLevel") . '</td>';
 		}
 		if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY)) {
 			print '<td align="center">' . $langs->trans("Type") . '</td>';
 		}
 
 		print '<td align="center">' . $langs->trans("PriceBase") . '</td>';
-		print '<td align="right">' . $langs->trans("VAT") . '</td>';
+		if (! empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL) || ! empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY)) print '<td align="right">' . $langs->trans("VATRate") . '</td>';
 		print '<td align="right">' . $langs->trans("HT") . '</td>';
 		print '<td align="right">' . $langs->trans("TTC") . '</td>';
 		if (! empty($conf->dynamicprices->enabled)) {
@@ -928,7 +1035,7 @@ if ($result)
 			}
 
 			print '<td align="center">' . $langs->trans($objp->price_base_type) . "</td>";
-			print '<td align="right">' . vatrate($objp->tva_tx, true, $objp->recuperableonly) . "</td>";
+			if (! empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL) || ! empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY)) print '<td align="right">' . vatrate($objp->tva_tx, true, $objp->recuperableonly) . "</td>";
 
 			//Price
 			if (! empty($objp->fk_price_expression) && ! empty($conf->dynamicprices->enabled))
@@ -942,14 +1049,14 @@ if ($result)
 			}
 			else
 			{
-				print '<td align="right">' . price($objp->price) . "</td>";
-				print '<td align="right">' . price($objp->price_ttc) . "</td>";
+				print '<td align="right">' . ($objp->price_base_type != 'TTC' ? price($objp->price) : ''). "</td>";
+				print '<td align="right">' . ($objp->price_base_type == 'TTC' ? price($objp->price_ttc) : '') . "</td>";
 				if (! empty($conf->dynamicprices->enabled)) { //Only if module is enabled
 					print '<td align="right"></td>';
 				}
 			}
-			print '<td align="right">' . price($objp->price_min) . '</td>';
-			print '<td align="right">' . price($objp->price_min_ttc) . '</td>';
+			print '<td align="right">' . ($objp->price_base_type != 'TTC' ? price($objp->price_min) : '') . '</td>';
+			print '<td align="right">' . ($objp->price_base_type == 'TTC' ? price($objp->price_min_ttc) : '') . '</td>';
 
 			// User
 			print '<td align="right"><a href="' . DOL_URL_ROOT . '/user/card.php?id=' . $objp->user_id . '">' . img_object($langs->trans("ShowUser"), 'user') . ' ' . $objp->login . '</a></td>';
@@ -1202,7 +1309,7 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 			print '<td>' . $langs->trans("ThirdParty") . '</td>';
 			print '<td>' . $langs->trans("AppliedPricesFrom") . '</td>';
 			print '<td align="center">' . $langs->trans("PriceBase") . '</td>';
-			print '<td align="right">' . $langs->trans("VAT") . '</td>';
+			print '<td align="right">' . $langs->trans("VATRate") . '</td>';
 			print '<td align="right">' . $langs->trans("HT") . '</td>';
 			print '<td align="right">' . $langs->trans("TTC") . '</td>';
 			print '<td align="right">' . $langs->trans("MinPrice") . ' ' . $langs->trans("HT") . '</td>';
@@ -1275,7 +1382,7 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 		print '<td>' . $langs->trans("ThirdParty") . '</td>';
 		print '<td>' . $langs->trans("AppliedPricesFrom") . '</td>';
 		print '<td align="center">' . $langs->trans("PriceBase") . '</td>';
-		print '<td align="right">' . $langs->trans("VAT") . '</td>';
+		print '<td align="right">' . $langs->trans("VATRate") . '</td>';
 		print '<td align="right">' . $langs->trans("HT") . '</td>';
 		print '<td align="right">' . $langs->trans("TTC") . '</td>';
 		print '<td align="right">' . $langs->trans("MinPrice") . ' ' . $langs->trans("HT") . '</td>';
@@ -1355,19 +1462,6 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 		print "</table>";
 
 		print "</form>";
-
-		/* ************************************************************************** */
-		/*                                                                            */
-		/* Barre d'action                                                             */
-		/*                                                                            */
-		/* ************************************************************************** */
-
-		print "\n" . '<div class="tabsAction">' . "\n";
-
-		if ($user->rights->produit->creer || $user->rights->service->creer) {
-			print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?action=add_customer_price&amp;id=' . $object->id . '">' . $langs->trans("AddCustomerPrice") . '</a></div>';
-		}
-		print "\n</div><br>\n";
 	}
 }
 

From 132bc610b6ccd5ba7a8616289454aba76315aa98 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 25 Oct 2015 23:32:49 +0100
Subject: [PATCH 55/66] Icon for contact contains a part of thirdparty icon to
 make things easier to understand

---
 htdocs/comm/card.php                     |   2 +-
 htdocs/societe/soc.php                   |  12 +++++++++++-
 htdocs/theme/eldy/img/object_contact.png | Bin 593 -> 666 bytes
 htdocs/theme/eldy/img/object_group.png   | Bin 912 -> 655 bytes
 htdocs/theme/eldy/img/object_user.png    | Bin 651 -> 581 bytes
 htdocs/theme/md/img/object_contact.png   | Bin 593 -> 666 bytes
 htdocs/theme/md/img/object_group.png     | Bin 912 -> 655 bytes
 htdocs/theme/md/img/object_user.png      | Bin 607 -> 581 bytes
 8 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index fe164006a29..b874eeefde5 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -226,7 +226,7 @@ if ($id > 0)
 	print '<table class="border" width="100%">';
 
 	// Alias name (commercial, trademark or alias name)
-	print '<tr><td class="titelfield">'.$langs->trans('AliasNameShort').'</td><td colspan="3">';
+	print '<tr><td class="titelfield">'.$langs->trans('AliasNames').'</td><td colspan="3">';
 	print $object->name_alias;
 	print "</td></tr>";
 
diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php
index 93fff61d1f1..71fa3b66a74 100644
--- a/htdocs/societe/soc.php
+++ b/htdocs/societe/soc.php
@@ -1908,7 +1908,17 @@ else
 	    print $object->name_alias;
 	    print "</td></tr>";
 
-        // Prefix
+    	// Prospect/Customer
+    	print '<tr><td>'.$langs->trans('ProspectCustomer').'</td><td>';
+    	print $object->getLibCustProspStatut();
+    	print '</td></tr>';
+	    
+    	// Prospect/Customer
+    	print '<tr><td>'.$langs->trans('Supplier').'</td><td>';
+    	print yn($object->fournsseur);
+    	print '</td></tr>';
+    	
+    	// Prefix
         if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
         {
             print '<tr><td>'.$langs->trans('Prefix').'</td><td>'.$object->prefix_comm.'</td>';
diff --git a/htdocs/theme/eldy/img/object_contact.png b/htdocs/theme/eldy/img/object_contact.png
index e98202b367d15cdb2509122e8d4f0e009396f2ba..d4272f367c6e5eae37c9ddc745fd8a9be7d05bb7 100644
GIT binary patch
delta 653
zcmV;80&@M)1eyhq8Gi-<0019IEztk~00v@9M??Vs0RI60puMM)00009a7bBm000XU
z000XU0RWnu7ytkO2XskIMF-ys85SN9?nlG{0006fNkl<ZD9?qGziSg=7{@>N=8P8;
z^8?E@F+mzhZ3`l;h$*;~4qbGqNS6*yb@4B7@~?2If;cpTyMJATZZ?RJLb1I?nrvxo
z^sXi)?_KV_*CC`-5Pjz7^ZkCGhp)kZrqMXk4X26cO0eMZ@?CD;EEwWnP`mAF$2q2)
z&jFHlv(2m82aejVHpffz^Yhmh7Z+a^i^V5OsaUJkdi(nQM;_d+u)X6T<$$*5;klAp
zb_Zi?YuDP`e18#EtJOE9Qt7Gdx@fJ*WHM+SV`=FTPV@LYMZS=w-f%Fn2p1L>uEgW<
z^=`LI7=|dN==FM}(`okh4mmtJ1;CRomSs^W<S+m>Ha2YAwmV}eiXw)?A(NAn%*@;)
z2+|A~0FcWjaGW+KK&R7@LWo{EoxU0b0bv*tMG>Cok$=hLI5|<sfdoKWfW-*xcDuf9
z+jZafSArm5I2_XN_X$JA!ND$HzFj)MF#(k43L|iTe}7o1R6YqIR?g1OkW!LLrI?+a
z!M3YBv|+%2ga!F*j=Iwvf&G3zYPDLmsi~=FQp%!fnrN;0sV0bh|IF75j$CjQl}hE7
zX`0hYDSuyxQ77VY3)y!m-I-&en8g1TkVrs2KXNoyS68<!%etYIx-NvsDy0knAq2@}
zl2j^#??;r&_c2ozQjVTutgWqS!!XcVqqY7cl3^H(MNa#d@uF!GS$Mv_Ji0N8qQ7=^
nEEGi%F@8|rerEve)ZjOtBmAKC?9K@Q0000<MFvhpu0mjf##$}T

literal 593
zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh3?wzC-F*zC*h@TpUD<DPunHPT=(k#j0fjgV
zJR*x37`Q%wFr(8NlNmrkmUKs7M+SzC{oH>NSs54@nF4%5T<t-?&EC<~$=So++27tN
z#MRx$#Usem+cz-4FC-+yJ*3Pxs?;w$KP;{&F{eI1Kd-*N-Ya%?U~+G0T1QYyS4ht4
z@bvEZy#9pz-h`ql2}LtA%lhJq7sZzDOs-g(T(vHtYFAwKp|qys$<3!ST92o<p3Lq(
zm)Cc_aMG26DR=8<oU538rF8oBidlDyXMU-lf4ySy^Qxtv>lQt)Tl}G6#jD1Z-zW8T
z&YspcYu2oFE0^xrx@rI3JspcK^{>3yvF3Tl#!uawKD2K9(YO2mqKzk4?!3Qu@1bS8
zKP@}-ebbSbyH3A5b>_<5>lg0czIp5JqeEA}AHDnk?&Hr-9^d`><;DO1zyJULZ<^0>
z92h!bB|(0{KrZzGgO_j4O`r`0o-U3d9M_XMSeX@FT@B7MJj^<|uxRUqok@OvR*MSO
zE!wtr+gu^}DcUO*EnT^6p{5$g!&MnAQqtNjuRb^JRIu)mIdXt!#mQygqCC{3ttBk9
zm3FkT{W<rDW8LJE70dMItX{fWLMwS0$Kzcc3^P9|=rPREFiG-YvDF6J&EV<k=d#Wz
Gp$PyTtUNFP

diff --git a/htdocs/theme/eldy/img/object_group.png b/htdocs/theme/eldy/img/object_group.png
index 552eb39fa314968d61faac60b024ed0210ad9e7e..be0255f7ec2679667491349672d653bfaea6ab89 100644
GIT binary patch
delta 641
zcmV-{0)G9F2ag4i8Gi-<0019IEztk~00v@9M??Vs0RI60puMM)00009a7bBm000XU
z000XU0RWnu7ytkO2XskIMF-ys85SEX%UFC>0006UNkl<ZD9?40KWkHA9EG3vz1O4=
z|D@E(fGMqFte}D)L3bB-SB1_xX6$6?=umKTsb8RjZsI2DAb)NRSfkk7+%)aI$@}m3
zb4qd0vmTzqfpZMN*4Ea_>gsC0-EKb;k*p|+SJUaVzqz^T_>c0Pot?bf?Y?NY+mGwI
z2B6dFJXh6Az|;SMW^ZrrVzb#SthISc2~{PfgoyC&-P@O)PUm4tk_`rfSHt13zrVll
z0CMmBQlrtxV}Fc@2qHp^k>T(MH#d4u%1Mc!+_`)ExvHGCu+!;uURBkJh>%hu#z>5T
za#AuX3cT~U`JC^E-&tQ@djgyXuvJw#RsFDlQc9ejR;Vh@Ih^-+@A2MYtYx{qyar&0
z!(oUqz7HYboTIL5@;ql$6hS26y~BG?2!Z3{W6DYS8-KuVZ*R+ZJboQQ_z^<DT8lAe
z9z%E^e84-;Y&N4TClsS%2K)lZ`~7~;T6<kpoiPT0l+t0dv2<9^=2X=Q&N*7G7UQzq
zJKM3_?Y<F_D<aYcP*t)lySBczw(|Ac*XW$fvn(S;nScKD<=FzXs(K4p77+s=B8)~O
zPEJpk6?*bT3-A45uXp2K??!I}$jt8Ut}arJj*b`%4oDKIXElq70IbbGb(Ce<@7dh_
z%vH4lOpMVU92}gROvjlq231A%EEAE0G3Ihg>2kAqZo@2$2lwx<v@WzhHkTS#{|5f~
bQ)Bo8`{Q1G;Prk`00000NkvXXu0mjf5k@&V

delta 900
zcmV-~1AF|B1&{}j8Gi!+001bK-QxfN00(qQO+^RU2OJVJ8!)B_vH$=832;bRa{vGe
z@Bjb`@Bu=sG?)MY00d`2O+f$vv5yP<VFdsH0yI!eR7C&)009920|NmC1qBZc1Pcob
z5)ld!5Dpd;3mFy-8Ws*384n^M8!#>%IW!$DEh;%UDLFVYFn=OOH7HIvDO*N6A3#1X
zKr~B4H(g3UUPwkQO-3$LOes}LDqBh_Q&2xySUzfADrH|kZeBEVYd=p<Pf}4!UR_09
zR#I76Sy@qSWn)WWVOwWsUu$PkZf#I*ZCP(_SZ;1wa%VztZcA`)QgCiuaBf|7c3)*@
zW^8P1XmM|EaDQrQba8!pY;|>XaCvrrd~tbsd3$?%etv#pSb%Y9h;(d=cyWz=dWU&)
zkb-e8iF-the@cmeRDpkRl!ZN(j8=hwaEXU@kB)zqkZ+-sR;!&^s-JASt!=WXd%3Z7
z!nJb2w|0ewhK7cQhlhuWiG_%Wh>DAfh>nbnjg5_on}3m!kCl~;n39T}osX85mXVv8
zo|%=No|l)CqMxd#mb9#&v8<w<u%n)_q@KO6tDCZ|g}b?wqN1Xtq@<;!r>3H>uCAr2
zsj925uCA`GudlDAp}L^Fw5zhQthKVUvaPeTv$L|bwzadhwYa*vx|+kdn#8!Cz_`-N
zi_yrP*niTS+0&lf)||=1rO3yi#m2GD%&^qXqt?@;*wm!l*P!3prQ6!D;Mt(#+pXf>
zso~zN<=w02;h^f}sOjXb=;W^K=%?=Jtnccz@a(tn=(zFhx$^G1^Y6R#?7YUs%gW2f
z$jHvi%FfQr&(+$*+t$_L<<{ir+2-uo_V32^@_)i0C2-LI0004WQchC<K<3zH0002e
zNkl<Z2-jm^knr&Es9^~6^)W7EU|<k-FKsH$cZ`}arOYmvfkDJA&C69IEG9A{)L%Y}
zK{9h{u9jRtY`C|gjBzkS`NZW5EBvAt_Xnyd=>;>)nZ0z?nn{zFtXME>=G-g>h8gqM
z?|oW5Z`sPV>vm6{&cG0#)X<$8zjgc09UFm?3@+J??UhctwbQadyzGRk`j*x>ql~-|
zbs*O{xuChP$i_asx-J;#4Cj=>-ku!o#EuP{I!zcDtSqf<9V~*nHgDUur41+z0>MEL
a5DWnIMoJ6<)(Eu#0000<MNUMnLSTY^7quAx

diff --git a/htdocs/theme/eldy/img/object_user.png b/htdocs/theme/eldy/img/object_user.png
index 6452b94da6803fa598cfacb8c6bbe0b61232a0b1..efd446a1a4c05b50932240855227fec33c4564c2 100644
GIT binary patch
delta 507
zcmV<X0R;Yw1;qrARDTu;0D*L1WdHyH(n&-?R4C7#lFe>XQ51#OKIg)v2$UbGjSvSk
zZD*94YCE$G9GN&#M-EIJ=@U4!Pta%Z0r~_yfHBdOq;^cCR#EDu7o_Fhb2#U0XAL$o
zanIJyTG=}*AMl?;*B6_2H%mL)+k2Ht<*Bt!cDvnoy<Tsx)qiTKS)Vs6n$4zn@BY?)
zwOV-*4nsIFHX8Le%x)3D>shau6^+J5+V}nE!C(NbG*lep^xG*`R%)*RWab7hCzBL2
zdrB!Nt)aDs)(Rv93i(29?yLQNKPExrTrQK<TESTdV+}^55yD}3HuqxiD^S*$4^usb
zRvJ+hAq<BY1b>4Fz|XnC<Il%aGd1rgQH=4$7^B}Kq*6Z4!|>pG`*Kz&tvJ7!|DMTa
zo<wn!lTv~p;!htB9}S1$<-DL+TU}c(6pQQW8|jD6*#Z&48r#ifb4Q-^62Txi2f$YV
z?Cw6;DV2(Eld0q#Ywc|zMBZ9U03d_}m;)*0Srn@uCv;y<Ubfrqud-gRFWg#Q-cS08
z#{iZ9EI8+`h+<}dkY?txmyk6gQSEd(2i{V-oF>8+066FV$t5#`!5~NQ{lqf>@TS&C
xV+?!Ny8xH~5c6McGZ7eoBO=Glej$G|^9Mvg*wk5w1(*N;002ovPDHLkV1jqH=U4y$

delta 578
zcmV-I0=@mk1d9cbRDTg5A&eCHRR9127)eAyR4C7FlEF?BQ51&1duPg&rqBX{V2KNe
zP+b(5q7XK+H*uq`T$s4RCvYcEz%%#&JOK}2Of=3y)<h7bf-TcR%XDsM?r~MEhJSTV
za=!fk$vKMuwBoN!tgo$YmrAAQX=<Ir!^8Kdr>EO{dwa3(`+o#M0D#*EeBY-~D7X(F
zt?taumR^O;5R0(1TzM;E3&5K`1fcsx5CkkQFXcSXds%NZFtH)-b~!#dW`2Hd3&;;9
z(}PXt`Z_BjZXCzN#$b%Wm>8usW5uz#!C7~(IXgS+Dy^<YNAn}b#Mso5qzSE7i?A7<
z-{|Q3KJ{PqIDbu&k3G}F#D*w}2*W0gdLsgU-UtRk!2Z|$UeZfGTt{85+E=tLTV%5y
z7h$*yP_0(~fKIhqWoBlETCGNGVks7iKk_5_XHhpAbsPtU?tcFC<w>&{c51cSU&oD&
zwf=4N!o7vEo5|cy(lk~|0bq<dDVG<k<;C&?!0E500Dm?&AFoeLjK3So4&6=D^p4iL
zn5L-$(Aoi!y5l(KQ8%s~eLH#`1i^QwQmG8zo}S(r@-k0>DPY)ItNM{d1Qa<DnRGMG
zoKkxB;NW1_otm7?Da9&)wU(PCA_#)A3eU^D0C0P0;v`8TZtAu{6re=@c??ks0jyHW
ziikH>ygQY5o2_=|;-a}FV#h&^pmbgoIZ&PkED|e`j##<0B9~gxo?DpbH}ES2oB*tC
Q)c^nh07*qoM6N<$f(Stpr2qf`

diff --git a/htdocs/theme/md/img/object_contact.png b/htdocs/theme/md/img/object_contact.png
index e98202b367d15cdb2509122e8d4f0e009396f2ba..d4272f367c6e5eae37c9ddc745fd8a9be7d05bb7 100644
GIT binary patch
delta 653
zcmV;80&@M)1eyhq8Gi-<0019IEztk~00v@9M??Vs0RI60puMM)00009a7bBm000XU
z000XU0RWnu7ytkO2XskIMF-ys85SN9?nlG{0006fNkl<ZD9?qGziSg=7{@>N=8P8;
z^8?E@F+mzhZ3`l;h$*;~4qbGqNS6*yb@4B7@~?2If;cpTyMJATZZ?RJLb1I?nrvxo
z^sXi)?_KV_*CC`-5Pjz7^ZkCGhp)kZrqMXk4X26cO0eMZ@?CD;EEwWnP`mAF$2q2)
z&jFHlv(2m82aejVHpffz^Yhmh7Z+a^i^V5OsaUJkdi(nQM;_d+u)X6T<$$*5;klAp
zb_Zi?YuDP`e18#EtJOE9Qt7Gdx@fJ*WHM+SV`=FTPV@LYMZS=w-f%Fn2p1L>uEgW<
z^=`LI7=|dN==FM}(`okh4mmtJ1;CRomSs^W<S+m>Ha2YAwmV}eiXw)?A(NAn%*@;)
z2+|A~0FcWjaGW+KK&R7@LWo{EoxU0b0bv*tMG>Cok$=hLI5|<sfdoKWfW-*xcDuf9
z+jZafSArm5I2_XN_X$JA!ND$HzFj)MF#(k43L|iTe}7o1R6YqIR?g1OkW!LLrI?+a
z!M3YBv|+%2ga!F*j=Iwvf&G3zYPDLmsi~=FQp%!fnrN;0sV0bh|IF75j$CjQl}hE7
zX`0hYDSuyxQ77VY3)y!m-I-&en8g1TkVrs2KXNoyS68<!%etYIx-NvsDy0knAq2@}
zl2j^#??;r&_c2ozQjVTutgWqS!!XcVqqY7cl3^H(MNa#d@uF!GS$Mv_Ji0N8qQ7=^
nEEGi%F@8|rerEve)ZjOtBmAKC?9K@Q0000<MFvhpu0mjf##$}T

literal 593
zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh3?wzC-F*zC*h@TpUD<DPunHPT=(k#j0fjgV
zJR*x37`Q%wFr(8NlNmrkmUKs7M+SzC{oH>NSs54@nF4%5T<t-?&EC<~$=So++27tN
z#MRx$#Usem+cz-4FC-+yJ*3Pxs?;w$KP;{&F{eI1Kd-*N-Ya%?U~+G0T1QYyS4ht4
z@bvEZy#9pz-h`ql2}LtA%lhJq7sZzDOs-g(T(vHtYFAwKp|qys$<3!ST92o<p3Lq(
zm)Cc_aMG26DR=8<oU538rF8oBidlDyXMU-lf4ySy^Qxtv>lQt)Tl}G6#jD1Z-zW8T
z&YspcYu2oFE0^xrx@rI3JspcK^{>3yvF3Tl#!uawKD2K9(YO2mqKzk4?!3Qu@1bS8
zKP@}-ebbSbyH3A5b>_<5>lg0czIp5JqeEA}AHDnk?&Hr-9^d`><;DO1zyJULZ<^0>
z92h!bB|(0{KrZzGgO_j4O`r`0o-U3d9M_XMSeX@FT@B7MJj^<|uxRUqok@OvR*MSO
zE!wtr+gu^}DcUO*EnT^6p{5$g!&MnAQqtNjuRb^JRIu)mIdXt!#mQygqCC{3ttBk9
zm3FkT{W<rDW8LJE70dMItX{fWLMwS0$Kzcc3^P9|=rPREFiG-YvDF6J&EV<k=d#Wz
Gp$PyTtUNFP

diff --git a/htdocs/theme/md/img/object_group.png b/htdocs/theme/md/img/object_group.png
index 552eb39fa314968d61faac60b024ed0210ad9e7e..be0255f7ec2679667491349672d653bfaea6ab89 100644
GIT binary patch
delta 641
zcmV-{0)G9F2ag4i8Gi-<0019IEztk~00v@9M??Vs0RI60puMM)00009a7bBm000XU
z000XU0RWnu7ytkO2XskIMF-ys85SEX%UFC>0006UNkl<ZD9?40KWkHA9EG3vz1O4=
z|D@E(fGMqFte}D)L3bB-SB1_xX6$6?=umKTsb8RjZsI2DAb)NRSfkk7+%)aI$@}m3
zb4qd0vmTzqfpZMN*4Ea_>gsC0-EKb;k*p|+SJUaVzqz^T_>c0Pot?bf?Y?NY+mGwI
z2B6dFJXh6Az|;SMW^ZrrVzb#SthISc2~{PfgoyC&-P@O)PUm4tk_`rfSHt13zrVll
z0CMmBQlrtxV}Fc@2qHp^k>T(MH#d4u%1Mc!+_`)ExvHGCu+!;uURBkJh>%hu#z>5T
za#AuX3cT~U`JC^E-&tQ@djgyXuvJw#RsFDlQc9ejR;Vh@Ih^-+@A2MYtYx{qyar&0
z!(oUqz7HYboTIL5@;ql$6hS26y~BG?2!Z3{W6DYS8-KuVZ*R+ZJboQQ_z^<DT8lAe
z9z%E^e84-;Y&N4TClsS%2K)lZ`~7~;T6<kpoiPT0l+t0dv2<9^=2X=Q&N*7G7UQzq
zJKM3_?Y<F_D<aYcP*t)lySBczw(|Ac*XW$fvn(S;nScKD<=FzXs(K4p77+s=B8)~O
zPEJpk6?*bT3-A45uXp2K??!I}$jt8Ut}arJj*b`%4oDKIXElq70IbbGb(Ce<@7dh_
z%vH4lOpMVU92}gROvjlq231A%EEAE0G3Ihg>2kAqZo@2$2lwx<v@WzhHkTS#{|5f~
bQ)Bo8`{Q1G;Prk`00000NkvXXu0mjf5k@&V

delta 900
zcmV-~1AF|B1&{}j8Gi!+001bK-QxfN00(qQO+^RU2OJVJ8!)B_vH$=832;bRa{vGe
z@Bjb`@Bu=sG?)MY00d`2O+f$vv5yP<VFdsH0yI!eR7C&)009920|NmC1qBZc1Pcob
z5)ld!5Dpd;3mFy-8Ws*384n^M8!#>%IW!$DEh;%UDLFVYFn=OOH7HIvDO*N6A3#1X
zKr~B4H(g3UUPwkQO-3$LOes}LDqBh_Q&2xySUzfADrH|kZeBEVYd=p<Pf}4!UR_09
zR#I76Sy@qSWn)WWVOwWsUu$PkZf#I*ZCP(_SZ;1wa%VztZcA`)QgCiuaBf|7c3)*@
zW^8P1XmM|EaDQrQba8!pY;|>XaCvrrd~tbsd3$?%etv#pSb%Y9h;(d=cyWz=dWU&)
zkb-e8iF-the@cmeRDpkRl!ZN(j8=hwaEXU@kB)zqkZ+-sR;!&^s-JASt!=WXd%3Z7
z!nJb2w|0ewhK7cQhlhuWiG_%Wh>DAfh>nbnjg5_on}3m!kCl~;n39T}osX85mXVv8
zo|%=No|l)CqMxd#mb9#&v8<w<u%n)_q@KO6tDCZ|g}b?wqN1Xtq@<;!r>3H>uCAr2
zsj925uCA`GudlDAp}L^Fw5zhQthKVUvaPeTv$L|bwzadhwYa*vx|+kdn#8!Cz_`-N
zi_yrP*niTS+0&lf)||=1rO3yi#m2GD%&^qXqt?@;*wm!l*P!3prQ6!D;Mt(#+pXf>
zso~zN<=w02;h^f}sOjXb=;W^K=%?=Jtnccz@a(tn=(zFhx$^G1^Y6R#?7YUs%gW2f
z$jHvi%FfQr&(+$*+t$_L<<{ir+2-uo_V32^@_)i0C2-LI0004WQchC<K<3zH0002e
zNkl<Z2-jm^knr&Es9^~6^)W7EU|<k-FKsH$cZ`}arOYmvfkDJA&C69IEG9A{)L%Y}
zK{9h{u9jRtY`C|gjBzkS`NZW5EBvAt_Xnyd=>;>)nZ0z?nn{zFtXME>=G-g>h8gqM
z?|oW5Z`sPV>vm6{&cG0#)X<$8zjgc09UFm?3@+J??UhctwbQadyzGRk`j*x>ql~-|
zbs*O{xuChP$i_asx-J;#4Cj=>-ku!o#EuP{I!zcDtSqf<9V~*nHgDUur41+z0>MEL
a5DWnIMoJ6<)(Eu#0000<MNUMnLSTY^7quAx

diff --git a/htdocs/theme/md/img/object_user.png b/htdocs/theme/md/img/object_user.png
index d26d8899ee80f1e4976260b265a3e7d75ebab61d..efd446a1a4c05b50932240855227fec33c4564c2 100644
GIT binary patch
delta 567
zcmV-70?7T}1jPi98Gi-<0019IEztk~00v@9M??Vs0RI60puMM)00009a7bBm000XU
z000XU0RWnu7ytkO2XskIMF-ys85RiufplPH0005fNkl<ZD9@de&2Car6ouD5=fb53
zlpm>$5C=4EXOx<1JF^TNnK)5L4on>B6F9R^&}Z-g`UE_HF@MpNq;^cCR#EDu7o_Fh
zb2#U0XAL$oanIJyTG=}*AMl?;*B6_2H%mL)+k2Ht<*Bt!cDvnoy<Tsx)oQ6(pEoO-
z&8Bzn{?>lAT6qx;LpU%t8ud5KZV|xiS+AHCjmAdW_x<O=U;wQ&R2<{<+bLF7YOerf
z<_0e(lN2+1N`EORt)aDs)(Rv93i(29?yLQNKPExrTrQK<TESTdV+}^55yD}3Huqxi
zD^S*$4^usbRvJ+hAq<BY1cL~`&$+?l&&N|UHSZ@;jPb=7qu(Q>Qa;YZ@Zfs;a#kp<
zIKP<xp2=pOL~)dpQi34jPah8-4Ts_7yr5WHU0W{{i+}6s8|jD6*#Z&48r#ifb4Q-^
z62Txi2f$YV?Cw6;DV2(Eld0q#Ywc|zMBZ9U03d_}m;)*0Srn@uCtprpw%hHmvR<z*
z+*)4VPx^_+0G0qOIOnd2VrGDlX6CY&kToJv?Q}W^-cq@oCc+i~IOqP!B{PG;AV={1
z#4`Z!rZCn>V+?!Ny8xH~5c6McGZ7eoBO=Glej$G|^9Mvg*wk5w1(*N;002ovPDHLk
FV1lvm^<Mx0

literal 607
zcmb`C&ubGw6vwx=AvHCnNGddzqJm)cVo^$q7qcXqge1h6Rtz3m7V$@{s9Or@s-SGu
z+713-5yjDiFhbKzAmD&0OfSMvQT8CXD&k&R9MjA6)Zh<@v;GZ!c<=jt?;RfR&8AaF
z{l1`2k|cjD8qNssbhEux=$=R4R)l#cW66m3i??^{?tMO1d@DwqFGWwPlH^-=vqdf+
zd@P1-XF|!4BvtQq{2BL%el4BIMuz+2@<2u&$i;{Axww+cXo`~0E1Ih4YTi^;O;dGE
zH4R-ibi>ers7%BB2Lgr$OdYsD2y_Sx2oQ7;iV-xCs}#9lgeZnU7{($5gg}E}NH8VD
zBm@ycDAXx|lv2wAmSx#Cwr$(7f#YDuaTrpWLl}dMA;vIcqP7@goFUFI=a6%ugmcQd
z%{gyy+~Bm)5YcEho5dixD85cjW>UvR`~Q&2$={aP{5%#8W!pa~>z+;io<h&%Lf2f&
zo#IS)VD)s{&mE`yslMxdol}F`Li<mEk?ifKPi7z7=y*S39#97#u6Ez=YE_G<Jkk5?
z!bCE#^GNOM=b_qSp&pc9FKv7uof<tqou0dT?IV5_@Q-i&TC2}5Y%jg3-Mv-XOQ%1i
zD~m6xFPCQKcj*h2vp>ep)mIc>bvd1gCc@!dZp*SqI`po8=<t<eC2^?~i=@I8dF<w2
D`9xIC


From f15e672c56445d3a91bba2f8f460313eb1e6f6d2 Mon Sep 17 00:00:00 2001
From: aspangaro <alexandre.spangaro@gmail.com>
Date: Mon, 26 Oct 2015 05:40:34 +0100
Subject: [PATCH 56/66] Typo

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

diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php
index 71fa3b66a74..8b640040b80 100644
--- a/htdocs/societe/soc.php
+++ b/htdocs/societe/soc.php
@@ -1915,7 +1915,7 @@ else
 	    
     	// Prospect/Customer
     	print '<tr><td>'.$langs->trans('Supplier').'</td><td>';
-    	print yn($object->fournsseur);
+    	print yn($object->fournisseur);
     	print '</td></tr>';
     	
     	// Prefix

From 71da059ef09642143407e992e911acaab0810538 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 26 Oct 2015 11:23:31 +0100
Subject: [PATCH 57/66] NEW Add a new widget $form->selectArrayAjax() to use
 combo list with content coming from an Ajax URL.

---
 htdocs/core/ajax/selectsearchbox.php  | 10 +++----
 htdocs/core/class/html.form.class.php | 41 +++++++++++++++++----------
 htdocs/public/test/test_forms.php     |  4 +--
 3 files changed, 33 insertions(+), 22 deletions(-)

diff --git a/htdocs/core/ajax/selectsearchbox.php b/htdocs/core/ajax/selectsearchbox.php
index 4fe9b905eda..565866e2d90 100644
--- a/htdocs/core/ajax/selectsearchbox.php
+++ b/htdocs/core/ajax/selectsearchbox.php
@@ -44,14 +44,14 @@ if ((( ! empty($conf->societe->enabled) && (empty($conf->global->SOCIETE_DISABLE
 {
     $langs->load("companies");
     //$searchform.=printSearchForm(DOL_URL_ROOT.'/societe/list.php', DOL_URL_ROOT.'/societe/list.php', $langs->trans("ThirdParties"), 'soc', 'sall', 'T', 'searchleftt', img_object('','company'));
-	$arrayresult['searchintothirdparty']=img_picto('','object_company').' '.$langs->trans("SearchIntoThirdparties", $search_boxvalue);
+	$arrayresult['searchintothirdparty']=array('text'=>img_picto('','object_company').' '.$langs->trans("SearchIntoThirdparties", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/societe/list.php?sall='.urlencode($search_boxvalue));
 }
 
 if (! empty($conf->societe->enabled) && ! empty($conf->global->MAIN_SEARCHFORM_CONTACT) && $user->rights->societe->lire)
 {
     $langs->load("companies");
     //$searchform.=printSearchForm(DOL_URL_ROOT.'/contact/list.php', DOL_URL_ROOT.'/contact/list.php', $langs->trans("Contacts"), 'contact', 'sall', 'A', 'searchleftc', img_object('','contact'));
-	$arrayresult['searchintocontact']=img_picto('','object_contact').' '.$langs->trans("SearchIntoContacts", $search_boxvalue);
+	$arrayresult['searchintocontact']=array('text'=>img_picto('','object_contact').' '.$langs->trans("SearchIntoContacts", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/contact/list.php?sall='.urlencode($search_boxvalue));
 }
 
 if (((! empty($conf->product->enabled) && $user->rights->produit->lire) || (! empty($conf->service->enabled) && $user->rights->service->lire))
@@ -59,7 +59,7 @@ if (((! empty($conf->product->enabled) && $user->rights->produit->lire) || (! em
 {
     $langs->load("products");
     //$searchform.=printSearchForm(DOL_URL_ROOT.'/product/list.php', DOL_URL_ROOT.'/product/list.php', $langs->trans("Products")."/".$langs->trans("Services"), 'products', 'sall', 'P', 'searchleftp', img_object('','product'));
-	$arrayresult['searchintoproduct']=img_picto('','object_product').' '.$langs->trans("SearchIntoProductsOrServices", $search_boxvalue);
+	$arrayresult['searchintoproduct']=array('text'=>img_picto('','object_product').' '.$langs->trans("SearchIntoProductsOrServices", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/product/list.php?sall='.urlencode($search_boxvalue));
 }
 
 /*if (((! empty($conf->product->enabled) && $user->rights->produit->lire) || (! empty($conf->service->enabled) && $user->rights->service->lire)) && ! empty($conf->fournisseur->enabled)
@@ -73,14 +73,14 @@ if (! empty($conf->adherent->enabled) && ! empty($conf->global->MAIN_SEARCHFORM_
 {
     $langs->load("members");
     //$searchform.=printSearchForm(DOL_URL_ROOT.'/adherents/list.php', DOL_URL_ROOT.'/adherents/list.php', $langs->trans("Members"), 'member', 'sall', 'M', 'searchleftm', img_object('','user'));
-	$arrayresult['searchintomember']=img_picto('','object_user').' '.$langs->trans("SearchIntoMembers", $search_boxvalue);
+	$arrayresult['searchintomember']=array('text'=>img_picto('','object_user').' '.$langs->trans("SearchIntoMembers", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/adherents/list.php?sall='.urlencode($search_boxvalue));
 }
 
 if (! empty($conf->projet->enabled) && ! empty($conf->global->MAIN_SEARCHFORM_PROJECT) && $user->rights->projet->lire)
 {
     $langs->load("projects");
     //$searchform.=printSearchForm(DOL_URL_ROOT.'/projet/list.php', DOL_URL_ROOT.'/projet/list.php', $langs->trans("Projects"), 'project', 'search_all', 'Q', 'searchleftproj', img_object('','projectpub'));
-	$arrayresult['searchintoprojects']=img_picto('','object_projectpub').' '.$langs->trans("SearchIntoProjects", $search_boxvalue);
+	$arrayresult['searchintoprojects']=array('text'=>img_picto('','object_projectpub').' '.$langs->trans("SearchIntoProjects", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/projet/list.php?search_all='.urlencode($search_boxvalue));
 }
 
 // Execute hook printSearchForm
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 5f714a85bcd..1e11f103a39 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -4504,16 +4504,17 @@ class Form
      *  Note: Do not apply langs->trans function on returned content of Ajax service, content may be entity encoded twice.
      *
      *	@param	string	$htmlname       		Name of html select area
-     *	@param	string	$url					Url
+     *	@param	string	$url					Url. Must return a json_encode of array(key=>array('text'=>'A text', 'url'=>'An url'), ...)
      *	@param	string	$id             		Preselected key
      *	@param  string	$moreparam      		Add more parameters onto the select tag
      *	@param  string	$moreparamtourl 		Add more parameters onto the Ajax called URL
      * 	@param	int		$disabled				Html select box is disabled
      *  @param	int		$minimumInputLength		Minimum Input Length
      *  @param	string	$morecss				Add more class to css styles
+     *  @param  int     $callurlonselect        If set to 1, some code is added so an url return by the ajax is called when value is selected.
      * 	@return	string							HTML select string.
      */
-    static function selectArrayAjax($htmlname, $url, $id='', $moreparam='', $moreparamtourl='', $disabled=0, $minimumInputLength=1, $morecss='')
+    static function selectArrayAjax($htmlname, $url, $id='', $moreparam='', $moreparamtourl='', $disabled=0, $minimumInputLength=1, $morecss='', $callurlonselect=0)
     {
     	$out = '';
 
@@ -4521,7 +4522,10 @@ class Form
     	$out.='<!-- JS CODE TO ENABLE '.$tmpplugin.' for id '.$htmlname.' -->
 	    	<script type="text/javascript">
 	    	$(document).ready(function () {
-		    	$(".'.$htmlname.'").select2({
+    	      
+    	      '.($callurlonselect ? 'var saveRemoteData = [];':'').'
+    	    
+              $(".'.$htmlname.'").select2({
 			    	ajax: {
 				    	dir: "ltr",
 				    	url: "'.$url.'",
@@ -4534,12 +4538,13 @@ class Form
 				    		};
 			    		},
 			    		results: function (remoteData, pageNumber, query) {
-			    			//console.log(remoteData);
+			    			console.log(remoteData);
+				    	    saveRemoteData = remoteData;
+				    	    /* format json result for select2 */
 				    	    result = []
 				    	    $.each( remoteData, function( key, value ) {
-				    	       result.push({id: key, text: value});
+				    	       result.push({id: key, text: value.text});
                             });
-				    	    //console.log(result);
 			    			//return {results:[{id:\'none\', text:\'aa\'}, {id:\'rrr\', text:\'Red\'},{id:\'bbb\', text:\'Search a into projects\'}], more:false}
 			    			return {results: result, more:false}
     					},
@@ -4556,17 +4561,23 @@ class Form
 			    	},
 			    	escapeMarkup: function (markup) { return markup; }, // let our custom formatter work
 			    	minimumInputLength: '.$minimumInputLength.',
-			    	//templateResult: formatRepo, // omitted for brevity, see the source of this page
-			    	//templateSelection: formatRepoSelection // omitted for brevity, see the source of this page
+			        formatResult: function(result, container, query, escapeMarkup) {
+                        return escapeMarkup(result.text);
+                    }
 			    });
 			    
-			    $(".'.$htmlname.'").change(function() { 
-			    	alert(\'eee\');
-			    	/* $(".'.$htmlname.'").select2("search",""); */
-			    	$(".'.$htmlname.'").select2("val","");  /* reset combo box */
-    			} );
-
-    			
+                '.($callurlonselect ? '
+                $(".'.$htmlname.'").change(function() { 
+			    	var selected = $(".'.$htmlname.'").select2("val");
+			        $(".'.$htmlname.'").select2("val","");  /* reset visible combo value */
+    			    $.each( saveRemoteData, function( key, value ) {
+    				        if (key == selected)
+    			            {
+    			                 console.log("Do a redirect into selectArrayAjax to "+value.url)
+    			                 location.assign(value.url);
+    			            }
+                    });
+    			});' : '' ) . '
     			
     	});
 	    </script>';
diff --git a/htdocs/public/test/test_forms.php b/htdocs/public/test/test_forms.php
index 5e7b2f2434f..a189ee836b1 100644
--- a/htdocs/public/test/test_forms.php
+++ b/htdocs/public/test/test_forms.php
@@ -64,11 +64,11 @@ print $form->selectarray('selectarray',$array);
 
 print '<br><br>'."\n";
 
-print "Test 4d: a select with ajax refresh<br>\n";
+print "Test 4d: a select with ajax refresh and with onchange call of url<br>\n";
 //$array=array(0=>'',1=>'Search into xxx',2=>'Search into yyy',3=>'Search into zzz');
 $array=array();
 $selected=-1;
-print $form->selectArrayAjax('testselectc', DOL_URL_ROOT.'/core/ajax/selectsearchbox.php', $selected, 'style="min-width: 250px;"', '', 0, 1, '');
+print $form->selectArrayAjax('testselectc', DOL_URL_ROOT.'/core/ajax/selectsearchbox.php', $selected, 'style="min-width: 250px;"', '', 0, 1, '', 1);
 
 
 print '<br><br>'."\n";

From 4fd0086862af66e5a67530ee9903088f8d24772b Mon Sep 17 00:00:00 2001
From: Sergio Sanchis Climent <ssanchis@2byte.es>
Date: Mon, 26 Oct 2015 11:33:43 +0100
Subject: [PATCH 58/66] Fix: error  this.price > 0 if no parse this.price when
 compare this.price and 0 always false

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

diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index ccf63983539..e8bacede84a 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -521,6 +521,7 @@ jQuery(document).ready(function() {
 	      			if (this.id != 'pmpprice')
 		      		{
 		        		i++;
+                        this.price = parseFloat(this.price);//fix this.price >0
 
 			      		// If margin is calculated on best supplier price, we set it by defaut (but only if value is not 0)
 		      			var defaultbuyprice = '<?php echo ((isset($conf->global->MARGIN_TYPE) && $conf->global->MARGIN_TYPE == '1')?'bestsupplierprice':''); ?>';

From 5c4ac0bf62d65b788a8add89953831346b95253a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 26 Oct 2015 12:16:40 +0100
Subject: [PATCH 59/66] NEW Merge all left menu search boxes into one.

---
 htdocs/core/ajax/selectsearchbox.php  | 52 +++++++++++++++------------
 htdocs/core/class/html.form.class.php |  6 +++-
 htdocs/langs/en_US/main.lang          |  1 +
 htdocs/main.inc.php                   | 22 +++++++-----
 htdocs/public/test/test_forms.php     |  2 --
 htdocs/theme/eldy/style.css.php       | 14 +++++---
 htdocs/theme/md/style.css.php         |  4 +++
 htdocs/user/index.php                 | 44 ++++++++++++++++++-----
 8 files changed, 99 insertions(+), 46 deletions(-)

diff --git a/htdocs/core/ajax/selectsearchbox.php b/htdocs/core/ajax/selectsearchbox.php
index 565866e2d90..a7149400f80 100644
--- a/htdocs/core/ajax/selectsearchbox.php
+++ b/htdocs/core/ajax/selectsearchbox.php
@@ -40,14 +40,14 @@ $search_boxvalue=GETPOST('q');
 $arrayresult=array();
 
 // Define $searchform
-if ((( ! empty($conf->societe->enabled) && (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) || empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))) || ! empty($conf->fournisseur->enabled)) && ! empty($conf->global->MAIN_SEARCHFORM_SOCIETE) && $user->rights->societe->lire)
+if ((( ! empty($conf->societe->enabled) && (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) || empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))) || ! empty($conf->fournisseur->enabled)) && empty($conf->global->MAIN_SEARCHFORM_SOCIETE_DISABLED) && $user->rights->societe->lire)
 {
     $langs->load("companies");
     //$searchform.=printSearchForm(DOL_URL_ROOT.'/societe/list.php', DOL_URL_ROOT.'/societe/list.php', $langs->trans("ThirdParties"), 'soc', 'sall', 'T', 'searchleftt', img_object('','company'));
 	$arrayresult['searchintothirdparty']=array('text'=>img_picto('','object_company').' '.$langs->trans("SearchIntoThirdparties", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/societe/list.php?sall='.urlencode($search_boxvalue));
 }
 
-if (! empty($conf->societe->enabled) && ! empty($conf->global->MAIN_SEARCHFORM_CONTACT) && $user->rights->societe->lire)
+if (! empty($conf->societe->enabled) && empty($conf->global->MAIN_SEARCHFORM_CONTACT_DISABLED) && $user->rights->societe->lire)
 {
     $langs->load("companies");
     //$searchform.=printSearchForm(DOL_URL_ROOT.'/contact/list.php', DOL_URL_ROOT.'/contact/list.php', $langs->trans("Contacts"), 'contact', 'sall', 'A', 'searchleftc', img_object('','contact'));
@@ -55,42 +55,50 @@ if (! empty($conf->societe->enabled) && ! empty($conf->global->MAIN_SEARCHFORM_C
 }
 
 if (((! empty($conf->product->enabled) && $user->rights->produit->lire) || (! empty($conf->service->enabled) && $user->rights->service->lire))
-&& ! empty($conf->global->MAIN_SEARCHFORM_PRODUITSERVICE))
+&& empty($conf->global->MAIN_SEARCHFORM_PRODUITSERVICE_DISABLED))
 {
     $langs->load("products");
     //$searchform.=printSearchForm(DOL_URL_ROOT.'/product/list.php', DOL_URL_ROOT.'/product/list.php', $langs->trans("Products")."/".$langs->trans("Services"), 'products', 'sall', 'P', 'searchleftp', img_object('','product'));
 	$arrayresult['searchintoproduct']=array('text'=>img_picto('','object_product').' '.$langs->trans("SearchIntoProductsOrServices", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/product/list.php?sall='.urlencode($search_boxvalue));
 }
 
-/*if (((! empty($conf->product->enabled) && $user->rights->produit->lire) || (! empty($conf->service->enabled) && $user->rights->service->lire)) && ! empty($conf->fournisseur->enabled)
-&& ! empty($conf->global->MAIN_SEARCHFORM_PRODUITSERVICE_SUPPLIER))
-{
-    $langs->load("products");
-    $searchform.=printSearchForm(DOL_URL_ROOT.'/fourn/product/list.php', DOL_URL_ROOT.'/fourn/product/list.php', $langs->trans("SupplierRef"), 'products', 'srefsupplier', '', 'searchlefts', img_object('','product'));
-}*/
-
-if (! empty($conf->adherent->enabled) && ! empty($conf->global->MAIN_SEARCHFORM_ADHERENT) && $user->rights->adherent->lire)
-{
-    $langs->load("members");
-    //$searchform.=printSearchForm(DOL_URL_ROOT.'/adherents/list.php', DOL_URL_ROOT.'/adherents/list.php', $langs->trans("Members"), 'member', 'sall', 'M', 'searchleftm', img_object('','user'));
-	$arrayresult['searchintomember']=array('text'=>img_picto('','object_user').' '.$langs->trans("SearchIntoMembers", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/adherents/list.php?sall='.urlencode($search_boxvalue));
-}
-
-if (! empty($conf->projet->enabled) && ! empty($conf->global->MAIN_SEARCHFORM_PROJECT) && $user->rights->projet->lire)
+if (! empty($conf->projet->enabled) && empty($conf->global->MAIN_SEARCHFORM_PROJECT_DISABLED) && $user->rights->projet->lire)
 {
     $langs->load("projects");
     //$searchform.=printSearchForm(DOL_URL_ROOT.'/projet/list.php', DOL_URL_ROOT.'/projet/list.php', $langs->trans("Projects"), 'project', 'search_all', 'Q', 'searchleftproj', img_object('','projectpub'));
 	$arrayresult['searchintoprojects']=array('text'=>img_picto('','object_projectpub').' '.$langs->trans("SearchIntoProjects", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/projet/list.php?search_all='.urlencode($search_boxvalue));
 }
 
-// Execute hook printSearchForm
+if (! empty($conf->adherent->enabled) && empty($conf->global->MAIN_SEARCHFORM_ADHERENT_DISABLED) && $user->rights->adherent->lire)
+{
+    $langs->load("members");
+    //$searchform.=printSearchForm(DOL_URL_ROOT.'/adherents/list.php', DOL_URL_ROOT.'/adherents/list.php', $langs->trans("Members"), 'member', 'sall', 'M', 'searchleftm', img_object('','user'));
+	$arrayresult['searchintomember']=array('text'=>img_picto('','object_user').' '.$langs->trans("SearchIntoMembers", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/adherents/list.php?sall='.urlencode($search_boxvalue));
+}
+
+if (! empty($conf->user->enabled) && empty($conf->global->MAIN_SEARCHFORM_PROJECT_DISABLED) && $user->rights->user->user->lire)
+{
+    $langs->load("users");
+    //$searchform.=printSearchForm(DOL_URL_ROOT.'/projet/list.php', DOL_URL_ROOT.'/projet/list.php', $langs->trans("Projects"), 'project', 'search_all', 'Q', 'searchleftproj', img_object('','projectpub'));
+	$arrayresult['searchintouser']=array('text'=>img_picto('','object_user').' '.$langs->trans("SearchIntoUsers", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/user/index.php?sall='.urlencode($search_boxvalue));
+}
+
+/* Do we really need this. We already have a select for users, and we should be able to filter into user list on employee flag 
+if (! empty($conf->hrm->enabled) && ! empty($conf->global->MAIN_SEARCHFORM_EMPLOYEE) && $user->rights->hrm->employee->read)
+{
+    $langs->load("hrm");
+    $searchform.=printSearchForm(DOL_URL_ROOT.'/hrm/employee/list.php', DOL_URL_ROOT.'/hrm/employee/list.php', $langs->trans("Employees"), 'employee', 'search_all', 'M', 'searchleftemployee', img_object('','user'));
+}
+*/
+
+// Execute hook addSearchEntry
 $parameters=array();
-$reshook=$hookmanager->executeHooks('printSearchForm',$parameters);    // Note that $action and $object may have been modified by some hooks
+$reshook=$hookmanager->executeHooks('addSearchEntry',$parameters);
 if (empty($reshook))
 {
-	$searchform.=$hookmanager->resPrint;
+	$arrayresult=array_merge($arrayresult, $hookmanager->resArray);
 }
-else $searchform=$hookmanager->resPrint;
+else $arrayresult=$hookmanager->resArray;
 
 
 
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 1e11f103a39..a9f66d80f22 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -4512,10 +4512,13 @@ class Form
      *  @param	int		$minimumInputLength		Minimum Input Length
      *  @param	string	$morecss				Add more class to css styles
      *  @param  int     $callurlonselect        If set to 1, some code is added so an url return by the ajax is called when value is selected.
+     *  @param  string  $placeholder            String to use as placeholder
      * 	@return	string							HTML select string.
      */
-    static function selectArrayAjax($htmlname, $url, $id='', $moreparam='', $moreparamtourl='', $disabled=0, $minimumInputLength=1, $morecss='', $callurlonselect=0)
+    static function selectArrayAjax($htmlname, $url, $id='', $moreparam='', $moreparamtourl='', $disabled=0, $minimumInputLength=1, $morecss='', $callurlonselect=0, $placeholder='')
     {
+        global $langs;
+        
     	$out = '';
 
     	$tmpplugin='select2';
@@ -4559,6 +4562,7 @@ class Form
 			    		},*/
 			    		cache: true
 			    	},
+				    placeholder: "'.dol_escape_js($placeholder).'",
 			    	escapeMarkup: function (markup) { return markup; }, // let our custom formatter work
 			    	minimumInputLength: '.$minimumInputLength.',
 			        formatResult: function(result, container, query, escapeMarkup) {
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index b8c6735be80..648ce25b9ce 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -755,5 +755,6 @@ SetRef=Set ref
 SearchIntoThirdparties=Search %s into thirdparties
 SearchIntoContacts=Search %s into contacts
 SearchIntoMembers=Search %s into members
+SearchIntoUsers=Search %s into users
 SearchIntoProductsOrServices=Search %s into products or services
 SearchIntoProjects=Search %s into projects
\ No newline at end of file
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 608957aa52d..8db9b6aa2ac 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1551,7 +1551,7 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
  */
 function left_menu($menu_array_before, $helppagename='', $moresearchform='', $menu_array_after='', $leftmenuwithoutmainarea=0, $title='')
 {
-    global $user, $conf, $langs, $db;
+    global $user, $conf, $langs, $db, $form;
     global $hookmanager, $menumanager;
 
     $searchform='';
@@ -1567,7 +1567,12 @@ function left_menu($menu_array_before, $helppagename='', $moresearchform='', $me
 
 	    print "\n";
 
+	    if (! is_object($form)) $form=new Form($db);
+	    $selected=-1;
+        $searchform.=$form->selectArrayAjax('searchselectcombo', DOL_URL_ROOT.'/core/ajax/selectsearchbox.php', $selected, '', '', 0, 1, 'vmenusearchselectcombo', 1, $langs->trans("Search"));
+	    
 	    // Define $searchform
+	    /*
 	    if ((( ! empty($conf->societe->enabled) && (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) || empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))) || ! empty($conf->fournisseur->enabled)) && ! empty($conf->global->MAIN_SEARCHFORM_SOCIETE) && $user->rights->societe->lire)
 	    {
 	        $langs->load("companies");
@@ -1594,18 +1599,18 @@ function left_menu($menu_array_before, $helppagename='', $moresearchform='', $me
 	        $searchform.=printSearchForm(DOL_URL_ROOT.'/fourn/product/list.php', DOL_URL_ROOT.'/fourn/product/list.php', $langs->trans("SupplierRef"), 'products', 'srefsupplier', '', 'searchlefts', img_object('','product'));
 	    }
 
+        if (! empty($conf->projet->enabled) && ! empty($conf->global->MAIN_SEARCHFORM_PROJECT) && $user->rights->projet->lire)
+	    {
+	        $langs->load("projects");
+	        $searchform.=printSearchForm(DOL_URL_ROOT.'/projet/list.php', DOL_URL_ROOT.'/projet/list.php', $langs->trans("Projects"), 'project', 'search_all', 'Q', 'searchleftproj', img_object('','projectpub'));
+	    }
+
 	    if (! empty($conf->adherent->enabled) && ! empty($conf->global->MAIN_SEARCHFORM_ADHERENT) && $user->rights->adherent->lire)
 	    {
 	        $langs->load("members");
 	        $searchform.=printSearchForm(DOL_URL_ROOT.'/adherents/list.php', DOL_URL_ROOT.'/adherents/list.php', $langs->trans("Members"), 'member', 'sall', 'M', 'searchleftm', img_object('','user'));
 	    }
 
-    	if (! empty($conf->projet->enabled) && ! empty($conf->global->MAIN_SEARCHFORM_PROJECT) && $user->rights->projet->lire)
-	    {
-	        $langs->load("projects");
-	        $searchform.=printSearchForm(DOL_URL_ROOT.'/projet/list.php', DOL_URL_ROOT.'/projet/list.php', $langs->trans("Projects"), 'project', 'search_all', 'Q', 'searchleftproj', img_object('','projectpub'));
-	    }
-
 		if (! empty($conf->hrm->enabled) && ! empty($conf->global->MAIN_SEARCHFORM_EMPLOYEE) && $user->rights->hrm->employee->read)
 	    {
 	        $langs->load("hrm");
@@ -1620,7 +1625,8 @@ function left_menu($menu_array_before, $helppagename='', $moresearchform='', $me
 			$searchform.=$hookmanager->resPrint;
 		}
 		else $searchform=$hookmanager->resPrint;
-
+        */
+        
 	    // Define $bookmarks
 	    if (! empty($conf->bookmark->enabled) && $user->rights->bookmark->lire)
 	    {
diff --git a/htdocs/public/test/test_forms.php b/htdocs/public/test/test_forms.php
index a189ee836b1..f1c00f94acf 100644
--- a/htdocs/public/test/test_forms.php
+++ b/htdocs/public/test/test_forms.php
@@ -65,8 +65,6 @@ print $form->selectarray('selectarray',$array);
 print '<br><br>'."\n";
 
 print "Test 4d: a select with ajax refresh and with onchange call of url<br>\n";
-//$array=array(0=>'',1=>'Search into xxx',2=>'Search into yyy',3=>'Search into zzz');
-$array=array();
 $selected=-1;
 print $form->selectArrayAjax('testselectc', DOL_URL_ROOT.'/core/ajax/selectsearchbox.php', $selected, 'style="min-width: 250px;"', '', 0, 1, '', 1);
 
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index c152e1d93a3..641b13030ee 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -1145,6 +1145,10 @@ div.vmenu, td.vmenu {
 	<?php } ?>
 }
 
+.vmenusearchselectcombo {
+	width: 172px;
+}
+
 .menu_contenu { 
 	padding-top: 3px; 
 	padding-bottom: 2px;
@@ -1219,17 +1223,17 @@ div.blockvmenusearch
 	color: #000000;
 	text-align: <?php print $left; ?>;
 	text-decoration: none;
-    padding-left: 5px;
+    /*padding-left: 5px;
     padding-right: 1px;
     padding-top: 3px;
-    padding-bottom: 3px;
-    margin: 1px 0px 8px 2px;
+    padding-bottom: 3px; */
+    margin: 1px 0px 4px 2px;
 	background: rgb(<?php echo $colorbackvmenu1; ?>);
 
-    border-left: 1px solid #AAA;
+    /*border-left: 1px solid #AAA;
     border-right: 1px solid #BBB;
     border-bottom: 1px solid #BBB;
-    border-top: 1px solid #BBB;
+    border-top: 1px solid #BBB;*/
     /*border-radius: 4px;
 	-moz-border-radius: 4px;
     -moz-box-shadow: 3px 3px 4px #DDD;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index db6cfa50f86..55ef8a3b991 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -1173,6 +1173,10 @@ div.vmenu, td.vmenu {
 	<?php } ?>
 }
 
+.vmenusearchselectcombo {
+	width: 170px;
+}
+
 .menu_contenu { padding-top: 4px; padding-bottom: 3px;}
 #menu_contenu_logo { padding-right: 4px; }
 
diff --git a/htdocs/user/index.php b/htdocs/user/index.php
index 7688cadbe05..6b618552dc6 100644
--- a/htdocs/user/index.php
+++ b/htdocs/user/index.php
@@ -45,6 +45,8 @@ $search_user=GETPOST('search_user','alpha');
 $search_login=GETPOST('search_login','alpha');
 $search_lastname=GETPOST('search_lastname','alpha');
 $search_firstname=GETPOST('search_firstname','alpha');
+$search_accountancy_code=GETPOST('search_accountancy_code','alpha');
+$search_email=GETPOST('search_email','alpha');
 $search_statut=GETPOST('search_statut','alpha');
 $search_thirdparty=GETPOST('search_thirdparty','alpha');
 $search_supervisor=GETPOST('search_supervisor','alpha');
@@ -82,6 +84,8 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both
 	$search_login="";
 	$search_lastname="";
 	$search_firstname="";
+	$search_accountancy_code="";
+	$search_email="";
 	$search_statut="";
 	$search_thirdparty="";
 	$search_supervisor="";
@@ -94,8 +98,8 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array(
 	'u.login'=>"Login",
-	'u.firstname'=>"Firstname",
     'u.lastname'=>"Lastname",
+    'u.firstname'=>"Firstname",
 	'u.accountancy_code'=>"AccountancyCode",
 	'u.email'=>"EMail",
     'u.note'=>"Note"
@@ -124,7 +128,7 @@ $buttonviewhierarchy='<form action="'.DOL_URL_ROOT.'/user/hierarchy.php'.(($sear
 
 print load_fiche_titre($langs->trans("ListOfUsers"), $buttonviewhierarchy);
 
-$sql = "SELECT u.rowid, u.lastname, u.firstname, u.admin, u.fk_soc, u.login, u.email, u.gender, u.photo,";
+$sql = "SELECT u.rowid, u.lastname, u.firstname, u.admin, u.fk_soc, u.login, u.email, u.accountancy_code, u.gender, u.photo,";
 $sql.= " u.datelastlogin, u.datepreviouslogin,";
 $sql.= " u.ldap_sid, u.statut, u.entity,";
 $sql.= " u.tms as date_update, u.datec as date_creation,";
@@ -148,14 +152,16 @@ else
 	$sql.= " WHERE u.entity IN (".getEntity('user',1).")";
 }
 if ($socid > 0) $sql.= " AND u.fk_soc = ".$socid;
-if ($search_user != '')       $sql.=natural_search(array('u.login', 'u.lastname', 'u.firstname'), $search_user);
+//if ($search_user != '')       $sql.=natural_search(array('u.login', 'u.lastname', 'u.firstname'), $search_user);
 if ($search_supervisor > 0)   $sql.= " AND u.fk_user = ".$search_supervisor;
 if ($search_thirdparty != '') $sql.=natural_search(array('s.nom'), $search_thirdparty);
 if ($search_login != '')      $sql.= natural_search("u.login", $search_login);
 if ($search_lastname != '')   $sql.= natural_search("u.lastname", $search_lastname);
 if ($search_firstname != '')  $sql.= natural_search("u.firstname", $search_firstname);
+if ($search_accountancy_code != '')  $sql.= natural_search("u.accountancy_code", $search_accountancy_code);
+if ($search_email != '')  $sql.= natural_search("u.email", $search_email);
 if ($search_statut != '' && $search_statut >= 0) $sql.= " AND (u.statut=".$search_statut.")";
-if ($sall)                    $sql.= natural_search($fieldstosearchall, $sall);
+if ($sall)                    $sql.= natural_search(array_keys($fieldstosearchall), $sall);
 // Add where from extra fields
 foreach ($search_array_options as $key => $val)
 {
@@ -188,6 +194,8 @@ if ($result)
     if ($search_login != '') $param.="&search_login=".$search_login;
     if ($search_lastname != '') $param.="&search_lastname=".$search_lastname;
     if ($search_firstname != '') $param.="&search_firstname=".$search_firstname;
+    if ($search_accountancy_code != '') $param.="&search_accountancy_code=".$search_accountancy_code;
+    if ($search_email != '') $param.="&search_email=".$search_email;
     if ($search_supervisor > 0) $param.="&search_supervisor=".$search_supervisor;
     if ($search_statut != '') $param.="&search_statut=".$search_statut;
     if ($optioncss != '') $param.='&optioncss='.$optioncss;
@@ -217,7 +225,9 @@ if ($result)
         'u.login'=>array('label'=>$langs->trans("Login"), 'checked'=>1),
 	    'u.lastname'=>array('label'=>$langs->trans("Lastname"), 'checked'=>1),
         'u.firstname'=>array('label'=>$langs->trans("Firstname"), 'checked'=>1),
-        'u.fk_soc'=>array('label'=>$langs->trans("Company"), 'checked'=>1),
+        'u.accountancy_code'=>array('label'=>$langs->trans("AccountancyCode"), 'checked'=>0),
+	    'u.email'=>array('label'=>$langs->trans("EMail"), 'checked'=>1),
+	    'u.fk_soc'=>array('label'=>$langs->trans("Company"), 'checked'=>1),
 	    'u.entity'=>array('label'=>$langs->trans("Entity"), 'checked'=>1, 'enabled'=>(! empty($conf->multicompany->enabled) && empty($conf->multicompany->transverse_mode))),
 	    'u.fk_user'=>array('label'=>$langs->trans("HierarchicalResponsible"), 'checked'=>1),
 	    'u.datelastlogin'=>array('label'=>$langs->trans("LastConnexion"), 'checked'=>1, 'position'=>100),
@@ -233,6 +243,8 @@ if ($result)
     if (! empty($arrayfields['u.login']['checked']))          print_liste_field_titre($langs->trans("Login"),$_SERVER['PHP_SELF'],"u.login",$param,"","",$sortfield,$sortorder);
     if (! empty($arrayfields['u.lastname']['checked']))       print_liste_field_titre($langs->trans("Lastname"),$_SERVER['PHP_SELF'],"u.lastname",$param,"","",$sortfield,$sortorder);
     if (! empty($arrayfields['u.firstname']['checked']))      print_liste_field_titre($langs->trans("FirstName"),$_SERVER['PHP_SELF'],"u.firstname",$param,"","",$sortfield,$sortorder);
+    if (! empty($arrayfields['u.accountancy_code']['checked'])) print_liste_field_titre($langs->trans("AccountancyCode"),$_SERVER['PHP_SELF'],"u.accountancy_code",$param,"","",$sortfield,$sortorder);
+    if (! empty($arrayfields['u.email']['checked']))          print_liste_field_titre($langs->trans("EMail"),$_SERVER['PHP_SELF'],"u.email",$param,"","",$sortfield,$sortorder);
     if (! empty($arrayfields['u.fk_soc']['checked']))         print_liste_field_titre($langs->trans("Company"),$_SERVER['PHP_SELF'],"u.fk_soc",$param,"","",$sortfield,$sortorder);
     if (! empty($arrayfields['u.entity']['checked']))         print_liste_field_titre($langs->trans("Entity"),$_SERVER['PHP_SELF'],"u.entity",$param,"","",$sortfield,$sortorder);
     if (! empty($arrayfields['u.fk_user']['checked']))        print_liste_field_titre($langs->trans("HierarchicalResponsible"),$_SERVER['PHP_SELF'],"u.fk_user",$param,"","",$sortfield,$sortorder);
@@ -273,6 +285,14 @@ if ($result)
     {
         print '<td><input type="text" name="search_firstname" size="6" value="'.$search_firstname.'"></td>';
     }
+    if (! empty($arrayfields['u.accountancy_code']['checked']))
+    {
+        print '<td><input type="text" name="search_accountancy_code" size="4" value="'.$search_accountancy_code.'"></td>';
+    }
+    if (! empty($arrayfields['u.email']['checked']))
+    {
+        print '<td><input type="text" name="search_email" size="6" value="'.$search_email.'"></td>';
+    }
     if (! empty($arrayfields['u.fk_soc']['checked']))
     {
         print '<td><input type="text" name="search_thirdparty" size="6" value="'.$search_thirdparty.'"></td>';
@@ -364,13 +384,21 @@ if ($result)
 		}
         if (! empty($arrayfields['u.lastname']['checked']))
 		{
-		      print '<td>'.ucfirst($obj->lastname).'</td>';
+		      print '<td>'.$obj->lastname.'</td>';
 		}
         if (! empty($arrayfields['u.firstname']['checked']))
 		{
-		  print '<td>'.ucfirst($obj->firstname).'</td>';
+		  print '<td>'.$obj->firstname.'</td>';
 		}
-        if (! empty($arrayfields['u.fk_soc']['checked']))
+        if (! empty($arrayfields['u.accountancy_code']['checked']))
+		{
+		  print '<td>'.$obj->accountancy_code.'</td>';
+		}
+        if (! empty($arrayfields['u.email']['checked']))
+		{
+		  print '<td>'.$obj->email.'</td>';
+		}
+		if (! empty($arrayfields['u.fk_soc']['checked']))
 		{
     		print "<td>";
             if ($obj->fk_soc)

From d5e42478a999246a713de7ba0594ed211dbfa245 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 26 Oct 2015 12:37:36 +0100
Subject: [PATCH 60/66] Removed deprecated options to show or not forms. Such
 forms does not exists anymore.

---
 htdocs/admin/ihm.php          | 40 ++++++++++++++++++++---------------
 htdocs/langs/en_US/admin.lang |  3 ++-
 2 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php
index 6e7a4f7d868..38d766e77fb 100644
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -47,11 +47,12 @@ $action = GETPOST('action');
 if (! defined("MAIN_MOTD")) define("MAIN_MOTD","");
 
 // List of supported permanent search area
+/*
 $searchform=array("MAIN_SEARCHFORM_SOCIETE", "MAIN_SEARCHFORM_CONTACT", "MAIN_SEARCHFORM_PRODUITSERVICE", "MAIN_SEARCHFORM_PRODUITSERVICE_SUPPLIER", "MAIN_SEARCHFORM_ADHERENT", "MAIN_SEARCHFORM_PROJECT", "MAIN_SEARCHFORM_EMPLOYEE");
 $searchformconst=array($conf->global->MAIN_SEARCHFORM_SOCIETE,$conf->global->MAIN_SEARCHFORM_CONTACT,$conf->global->MAIN_SEARCHFORM_PRODUITSERVICE,$conf->global->MAIN_SEARCHFORM_PRODUITSERVICE_SUPPLIER,$conf->global->MAIN_SEARCHFORM_ADHERENT,$conf->global->MAIN_SEARCHFORM_PROJECT,$conf->global->MAIN_SEARCHFORM_EMPLOYEE);
 $searchformtitle=array($langs->trans("Companies"), $langs->trans("Contacts"), $langs->trans("ProductsAndServices"), $langs->trans("ProductsAndServices").' ('.$langs->trans("SupplierRef").')', $langs->trans("Members"), $langs->trans("Projects"), $langs->trans("Employees"));
 $searchformmodule=array('Module1Name','Module1Name','Module50Name','Module50Name','Module310Name','Module4000Name');
-
+*/
 
 if ($action == 'update')
 {
@@ -78,6 +79,7 @@ if ($action == 'update')
 	if ($val == '') dolibarr_del_const($db, 'THEME_ELDY_BACKTITLE1', $conf->entity);
     else dolibarr_set_const($db, 'THEME_ELDY_BACKTITLE1', join(',',colorStringToArray(GETPOST('THEME_ELDY_BACKTITLE1'),array())),'chaine',0,'',$conf->entity);
 
+    /*
     dolibarr_set_const($db, "MAIN_SEARCHFORM_CONTACT",			$_POST["MAIN_SEARCHFORM_CONTACT"],'chaine',0,'',$conf->entity);
 	dolibarr_set_const($db, "MAIN_SEARCHFORM_SOCIETE",			$_POST["MAIN_SEARCHFORM_SOCIETE"],'chaine',0,'',$conf->entity);
 	dolibarr_set_const($db, "MAIN_SEARCHFORM_PRODUITSERVICE",	$_POST["MAIN_SEARCHFORM_PRODUITSERVICE"],'chaine',0,'',$conf->entity);
@@ -85,7 +87,8 @@ if ($action == 'update')
 	dolibarr_set_const($db, "MAIN_SEARCHFORM_ADHERENT",			$_POST["MAIN_SEARCHFORM_ADHERENT"],'chaine',0,'',$conf->entity);
 	dolibarr_set_const($db, "MAIN_SEARCHFORM_PROJECT",			$_POST["MAIN_SEARCHFORM_PROJECT"],'chaine',0,'',$conf->entity);
 	dolibarr_set_const($db, "MAIN_SEARCHFORM_EMPLOYEE",			$_POST["MAIN_SEARCHFORM_EMPLOYEE"],'chaine',0,'',$conf->entity);
-
+    */
+    
 	dolibarr_set_const($db, "MAIN_HELPCENTER_DISABLELINK",		$_POST["MAIN_HELPCENTER_DISABLELINK"],'chaine',0,'',0);	// Param for all entities
 	dolibarr_set_const($db, "MAIN_MOTD",						dol_htmlcleanlastbr($_POST["main_motd"]),'chaine',0,'',$conf->entity);
 	dolibarr_set_const($db, "MAIN_HOME",						dol_htmlcleanlastbr($_POST["main_home"]),'chaine',0,'',$conf->entity);
@@ -209,7 +212,7 @@ if ($action == 'edit')	// Edit
 
 	// Max size of short lists on customer card
     $var=!$var;
-    print '<tr '.$bc[$var].'><td>'.$langs->trans("DefaultMaxSizeShortListCustomerCard").'</td><td><input class="flat" name="main_size_shortliste_limit" size="4" value="' . $conf->global->MAIN_SIZE_SHORTLISTE_LIMIT . '"></td>';
+    print '<tr '.$bc[$var].'><td>'.$langs->trans("DefaultMaxSizeShortList").'</td><td><input class="flat" name="main_size_shortliste_limit" size="4" value="' . $conf->global->MAIN_SIZE_SHORTLISTE_LIMIT . '"></td>';
 	print '<td width="20">&nbsp;</td>';
 	print '</tr>';
 	
@@ -357,20 +360,23 @@ else	// Show
     print '<br>';
 
 
-    // Liste des zone de recherches permanentes supportees
-    print '<table class="noborder" width="100%">';
-    print '<tr class="liste_titre"><td width="35%">'.$langs->trans("PermanentLeftSearchForm").'</td><td>'.$langs->trans("Activated").'</td><td>&nbsp;</td></tr>';
-    $var=true;
-    foreach ($searchform as $key => $value)
+    // List of search forms to show
+    /*
+    if (! empty($searchform))
     {
-        $var=!$var;
-        print '<tr '.$bc[$var].'><td width="35%">'.$searchformtitle[$key].'</td><td>'.yn($searchformconst[$key]).'</td>';
-		print '<td align="left">'.$langs->trans("IfModuleEnabled",$langs->transnoentitiesnoconv($searchformmodule[$key]));
-        print '</td></tr>';
-    }
-    print '</table>';
-    print '<br>';
-
+        print '<table class="noborder" width="100%">';
+        print '<tr class="liste_titre"><td width="35%">'.$langs->trans("PermanentLeftSearchForm").'</td><td>'.$langs->trans("Activated").'</td><td>&nbsp;</td></tr>';
+        $var=true;
+        foreach ($searchform as $key => $value)
+        {
+            $var=!$var;
+            print '<tr '.$bc[$var].'><td width="35%">'.$searchformtitle[$key].'</td><td>'.yn($searchformconst[$key]).'</td>';
+    		print '<td align="left">'.$langs->trans("IfModuleEnabled",$langs->transnoentitiesnoconv($searchformmodule[$key]));
+            print '</td></tr>';
+        }
+        print '</table>';
+        print '<br>';
+    }*/
 
     // Other
     $var=true;
@@ -396,7 +402,7 @@ else	// Show
 	print "</tr>";
 	
 	$var=!$var;
-    print '<tr '.$bc[$var].'><td>'.$langs->trans("DefaultMaxSizeShortListCustomerCard").'</td><td>' . $conf->global->MAIN_SIZE_SHORTLISTE_LIMIT . '</td>';
+    print '<tr '.$bc[$var].'><td>'.$langs->trans("DefaultMaxSizeShortList").'</td><td>' . $conf->global->MAIN_SIZE_SHORTLISTE_LIMIT . '</td>';
 	print '<td width="20">&nbsp;</td>';
 	print "</tr>";
 
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 9bf9233f76b..c924d80639e 100755
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -936,7 +936,8 @@ DefaultMenuSmartphoneManager=Smartphone menu manager
 Skin=Skin theme
 DefaultSkin=Default skin theme
 MaxSizeList=Max length for list
-DefaultMaxSizeList=Default max length for list
+DefaultMaxSizeList=Default max length for lists
+DefaultMaxSizeShortList=Default max length for short lists (ie in customer card)
 MessageOfDay=Message of the day
 MessageLogin=Login page message
 PermanentLeftSearchForm=Permanent search form on left menu

From 4b2db78c3ade9da7ecca14814c6ecc5005d4788d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 26 Oct 2015 12:50:32 +0100
Subject: [PATCH 61/66] Keep deprecated options to show or not forms for blind
 people.

---
 htdocs/admin/ihm.php |  45 +++++++++--------
 htdocs/main.inc.php  | 113 ++++++++++++++++++++++---------------------
 2 files changed, 83 insertions(+), 75 deletions(-)

diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php
index 38d766e77fb..6907e30f979 100644
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -47,12 +47,14 @@ $action = GETPOST('action');
 if (! defined("MAIN_MOTD")) define("MAIN_MOTD","");
 
 // List of supported permanent search area
-/*
-$searchform=array("MAIN_SEARCHFORM_SOCIETE", "MAIN_SEARCHFORM_CONTACT", "MAIN_SEARCHFORM_PRODUITSERVICE", "MAIN_SEARCHFORM_PRODUITSERVICE_SUPPLIER", "MAIN_SEARCHFORM_ADHERENT", "MAIN_SEARCHFORM_PROJECT", "MAIN_SEARCHFORM_EMPLOYEE");
-$searchformconst=array($conf->global->MAIN_SEARCHFORM_SOCIETE,$conf->global->MAIN_SEARCHFORM_CONTACT,$conf->global->MAIN_SEARCHFORM_PRODUITSERVICE,$conf->global->MAIN_SEARCHFORM_PRODUITSERVICE_SUPPLIER,$conf->global->MAIN_SEARCHFORM_ADHERENT,$conf->global->MAIN_SEARCHFORM_PROJECT,$conf->global->MAIN_SEARCHFORM_EMPLOYEE);
-$searchformtitle=array($langs->trans("Companies"), $langs->trans("Contacts"), $langs->trans("ProductsAndServices"), $langs->trans("ProductsAndServices").' ('.$langs->trans("SupplierRef").')', $langs->trans("Members"), $langs->trans("Projects"), $langs->trans("Employees"));
-$searchformmodule=array('Module1Name','Module1Name','Module50Name','Module50Name','Module310Name','Module4000Name');
-*/
+$searchform=array();
+if (empty($conf->use_javascript_ajax))
+{
+    $searchform=array("MAIN_SEARCHFORM_SOCIETE", "MAIN_SEARCHFORM_CONTACT", "MAIN_SEARCHFORM_PRODUITSERVICE", "MAIN_SEARCHFORM_PRODUITSERVICE_SUPPLIER", "MAIN_SEARCHFORM_ADHERENT", "MAIN_SEARCHFORM_PROJECT", "MAIN_SEARCHFORM_EMPLOYEE");
+    $searchformconst=array($conf->global->MAIN_SEARCHFORM_SOCIETE,$conf->global->MAIN_SEARCHFORM_CONTACT,$conf->global->MAIN_SEARCHFORM_PRODUITSERVICE,$conf->global->MAIN_SEARCHFORM_PRODUITSERVICE_SUPPLIER,$conf->global->MAIN_SEARCHFORM_ADHERENT,$conf->global->MAIN_SEARCHFORM_PROJECT,$conf->global->MAIN_SEARCHFORM_EMPLOYEE);
+    $searchformtitle=array($langs->trans("Companies"), $langs->trans("Contacts"), $langs->trans("ProductsAndServices"), $langs->trans("ProductsAndServices").' ('.$langs->trans("SupplierRef").')', $langs->trans("Members"), $langs->trans("Projects"), $langs->trans("Users"));
+    $searchformmodule=array('Module1Name','Module1Name','Module50Name','Module50Name','Module310Name','Module400Name');
+}
 
 if ($action == 'update')
 {
@@ -167,19 +169,22 @@ if ($action == 'edit')	// Edit
     print '<br>';
 
     // Liste des zone de recherche permanantes supportees
-    print '<table summary="search" class="noborder" width="100%">';
-    print '<tr class="liste_titre"><td width="35%">'.$langs->trans("PermanentLeftSearchForm").'</td><td colspan="2">'.$langs->trans("Activated").'</td></tr>';
-    $var=True;
-    foreach ($searchform as $key => $value)
+    if (! empty($searchform))
     {
-        $var=!$var;
-        print '<tr '.$bc[$var].'><td width="35%">'.$searchformtitle[$key].'</td><td colspan="2">';
-        print $form->selectyesno($searchform[$key],$searchformconst[$key],1);
-        print '</td></tr>';
+        print '<table summary="search" class="noborder" width="100%">';
+        print '<tr class="liste_titre"><td width="35%">'.$langs->trans("PermanentLeftSearchForm").'</td><td colspan="2">'.$langs->trans("Activated").'</td></tr>';
+        $var=True;
+        foreach ($searchform as $key => $value)
+        {
+            $var=!$var;
+            print '<tr '.$bc[$var].'><td width="35%">'.$searchformtitle[$key].'</td><td colspan="2">';
+            print $form->selectyesno($searchform[$key],$searchformconst[$key],1);
+            print '</td></tr>';
+        }
+        print '</table>';
+        print '<br>';
     }
-    print '</table>';
-    print '<br>';
-
+    
     // Other
     print '<table summary="edit" class="noborder" width="100%">';
     print '<tr class="liste_titre"><td width="35%">'.$langs->trans("Parameters").'</td><td>'.$langs->trans("Value").'</td>';
@@ -361,7 +366,6 @@ else	// Show
 
 
     // List of search forms to show
-    /*
     if (! empty($searchform))
     {
         print '<table class="noborder" width="100%">';
@@ -371,12 +375,13 @@ else	// Show
         {
             $var=!$var;
             print '<tr '.$bc[$var].'><td width="35%">'.$searchformtitle[$key].'</td><td>'.yn($searchformconst[$key]).'</td>';
-    		print '<td align="left">'.$langs->trans("IfModuleEnabled",$langs->transnoentitiesnoconv($searchformmodule[$key]));
+    		print '<td align="left">';
+    		if (! empty($searchformmodule[$key])) print $langs->trans("IfModuleEnabled",$langs->transnoentitiesnoconv($searchformmodule[$key]));
             print '</td></tr>';
         }
         print '</table>';
         print '<br>';
-    }*/
+    }
 
     // Other
     $var=true;
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 8db9b6aa2ac..dd4cd684970 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1567,65 +1567,68 @@ function left_menu($menu_array_before, $helppagename='', $moresearchform='', $me
 
 	    print "\n";
 
-	    if (! is_object($form)) $form=new Form($db);
-	    $selected=-1;
-        $searchform.=$form->selectArrayAjax('searchselectcombo', DOL_URL_ROOT.'/core/ajax/selectsearchbox.php', $selected, '', '', 0, 1, 'vmenusearchselectcombo', 1, $langs->trans("Search"));
-	    
-	    // Define $searchform
-	    /*
-	    if ((( ! empty($conf->societe->enabled) && (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) || empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))) || ! empty($conf->fournisseur->enabled)) && ! empty($conf->global->MAIN_SEARCHFORM_SOCIETE) && $user->rights->societe->lire)
+	    if ($conf->use_javascript_ajax)
 	    {
-	        $langs->load("companies");
-	        $searchform.=printSearchForm(DOL_URL_ROOT.'/societe/list.php', DOL_URL_ROOT.'/societe/list.php', $langs->trans("ThirdParties"), 'soc', 'sall', 'T', 'searchleftt', img_object('','company'));
+    	    if (! is_object($form)) $form=new Form($db);
+    	    $selected=-1;
+            $searchform.=$form->selectArrayAjax('searchselectcombo', DOL_URL_ROOT.'/core/ajax/selectsearchbox.php', $selected, '', '', 0, 1, 'vmenusearchselectcombo', 1, $langs->trans("Search"));
 	    }
-
-	    if (! empty($conf->societe->enabled) && ! empty($conf->global->MAIN_SEARCHFORM_CONTACT) && $user->rights->societe->lire)
+	    else
 	    {
-	        $langs->load("companies");
-	        $searchform.=printSearchForm(DOL_URL_ROOT.'/contact/list.php', DOL_URL_ROOT.'/contact/list.php', $langs->trans("Contacts"), 'contact', 'sall', 'A', 'searchleftc', img_object('','contact'));
+    	    // Define $searchform
+    	    if ((( ! empty($conf->societe->enabled) && (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) || empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))) || ! empty($conf->fournisseur->enabled)) && ! empty($conf->global->MAIN_SEARCHFORM_SOCIETE) && $user->rights->societe->lire)
+    	    {
+    	        $langs->load("companies");
+    	        $searchform.=printSearchForm(DOL_URL_ROOT.'/societe/list.php', DOL_URL_ROOT.'/societe/list.php', $langs->trans("ThirdParties"), 'soc', 'sall', 'T', 'searchleftt', img_object('','company'));
+    	    }
+    
+    	    if (! empty($conf->societe->enabled) && ! empty($conf->global->MAIN_SEARCHFORM_CONTACT) && $user->rights->societe->lire)
+    	    {
+    	        $langs->load("companies");
+    	        $searchform.=printSearchForm(DOL_URL_ROOT.'/contact/list.php', DOL_URL_ROOT.'/contact/list.php', $langs->trans("Contacts"), 'contact', 'sall', 'A', 'searchleftc', img_object('','contact'));
+    	    }
+    
+    	    if (((! empty($conf->product->enabled) && $user->rights->produit->lire) || (! empty($conf->service->enabled) && $user->rights->service->lire))
+    	    && ! empty($conf->global->MAIN_SEARCHFORM_PRODUITSERVICE))
+    	    {
+    	        $langs->load("products");
+    	        $searchform.=printSearchForm(DOL_URL_ROOT.'/product/list.php', DOL_URL_ROOT.'/product/list.php', $langs->trans("Products")."/".$langs->trans("Services"), 'products', 'sall', 'P', 'searchleftp', img_object('','product'));
+    	    }
+    
+    	    if (((! empty($conf->product->enabled) && $user->rights->produit->lire) || (! empty($conf->service->enabled) && $user->rights->service->lire)) && ! empty($conf->fournisseur->enabled)
+    	    && ! empty($conf->global->MAIN_SEARCHFORM_PRODUITSERVICE_SUPPLIER))
+    	    {
+    	        $langs->load("products");
+    	        $searchform.=printSearchForm(DOL_URL_ROOT.'/fourn/product/list.php', DOL_URL_ROOT.'/fourn/product/list.php', $langs->trans("SupplierRef"), 'products', 'srefsupplier', '', 'searchlefts', img_object('','product'));
+    	    }
+    
+            if (! empty($conf->projet->enabled) && ! empty($conf->global->MAIN_SEARCHFORM_PROJECT) && $user->rights->projet->lire)
+    	    {
+    	        $langs->load("projects");
+    	        $searchform.=printSearchForm(DOL_URL_ROOT.'/projet/list.php', DOL_URL_ROOT.'/projet/list.php', $langs->trans("Projects"), 'project', 'search_all', 'Q', 'searchleftproj', img_object('','projectpub'));
+    	    }
+    
+    	    if (! empty($conf->adherent->enabled) && ! empty($conf->global->MAIN_SEARCHFORM_ADHERENT) && $user->rights->adherent->lire)
+    	    {
+    	        $langs->load("members");
+    	        $searchform.=printSearchForm(DOL_URL_ROOT.'/adherents/list.php', DOL_URL_ROOT.'/adherents/list.php', $langs->trans("Members"), 'member', 'sall', 'M', 'searchleftm', img_object('','user'));
+    	    }
+    
+    		if (! empty($conf->user->enabled) && ! empty($conf->global->MAIN_SEARCHFORM_USER) && $user->rights->user->user->lire)
+    	    {
+    	        $langs->load("users");
+    	        $searchform.=printSearchForm(DOL_URL_ROOT.'/user/list.php', DOL_URL_ROOT.'/user/list.php', $langs->trans("Users"), 'user', 'sall', 'M', 'searchleftuser', img_object('','user'));
+    	    }
+    
+    	    // Execute hook printSearchForm
+    	    $parameters=array();
+    	    $reshook=$hookmanager->executeHooks('printSearchForm',$parameters);    // Note that $action and $object may have been modified by some hooks
+    		if (empty($reshook))
+    		{
+    			$searchform.=$hookmanager->resPrint;
+    		}
+    		else $searchform=$hookmanager->resPrint;
 	    }
-
-	    if (((! empty($conf->product->enabled) && $user->rights->produit->lire) || (! empty($conf->service->enabled) && $user->rights->service->lire))
-	    && ! empty($conf->global->MAIN_SEARCHFORM_PRODUITSERVICE))
-	    {
-	        $langs->load("products");
-	        $searchform.=printSearchForm(DOL_URL_ROOT.'/product/list.php', DOL_URL_ROOT.'/product/list.php', $langs->trans("Products")."/".$langs->trans("Services"), 'products', 'sall', 'P', 'searchleftp', img_object('','product'));
-	    }
-
-	    if (((! empty($conf->product->enabled) && $user->rights->produit->lire) || (! empty($conf->service->enabled) && $user->rights->service->lire)) && ! empty($conf->fournisseur->enabled)
-	    && ! empty($conf->global->MAIN_SEARCHFORM_PRODUITSERVICE_SUPPLIER))
-	    {
-	        $langs->load("products");
-	        $searchform.=printSearchForm(DOL_URL_ROOT.'/fourn/product/list.php', DOL_URL_ROOT.'/fourn/product/list.php', $langs->trans("SupplierRef"), 'products', 'srefsupplier', '', 'searchlefts', img_object('','product'));
-	    }
-
-        if (! empty($conf->projet->enabled) && ! empty($conf->global->MAIN_SEARCHFORM_PROJECT) && $user->rights->projet->lire)
-	    {
-	        $langs->load("projects");
-	        $searchform.=printSearchForm(DOL_URL_ROOT.'/projet/list.php', DOL_URL_ROOT.'/projet/list.php', $langs->trans("Projects"), 'project', 'search_all', 'Q', 'searchleftproj', img_object('','projectpub'));
-	    }
-
-	    if (! empty($conf->adherent->enabled) && ! empty($conf->global->MAIN_SEARCHFORM_ADHERENT) && $user->rights->adherent->lire)
-	    {
-	        $langs->load("members");
-	        $searchform.=printSearchForm(DOL_URL_ROOT.'/adherents/list.php', DOL_URL_ROOT.'/adherents/list.php', $langs->trans("Members"), 'member', 'sall', 'M', 'searchleftm', img_object('','user'));
-	    }
-
-		if (! empty($conf->hrm->enabled) && ! empty($conf->global->MAIN_SEARCHFORM_EMPLOYEE) && $user->rights->hrm->employee->read)
-	    {
-	        $langs->load("hrm");
-	        $searchform.=printSearchForm(DOL_URL_ROOT.'/hrm/employee/list.php', DOL_URL_ROOT.'/hrm/employee/list.php', $langs->trans("Employees"), 'employee', 'search_all', 'M', 'searchleftemployee', img_object('','user'));
-	    }
-
-	    // Execute hook printSearchForm
-	    $parameters=array();
-	    $reshook=$hookmanager->executeHooks('printSearchForm',$parameters);    // Note that $action and $object may have been modified by some hooks
-		if (empty($reshook))
-		{
-			$searchform.=$hookmanager->resPrint;
-		}
-		else $searchform=$hookmanager->resPrint;
-        */
         
 	    // Define $bookmarks
 	    if (! empty($conf->bookmark->enabled) && $user->rights->bookmark->lire)

From 07b277b23f262b5ef86c7928d8f4cb7a50902d7c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 26 Oct 2015 15:21:22 +0100
Subject: [PATCH 62/66] Prepare fields in dtabase to store if time spent was
 invoiced or not.

---
 htdocs/install/mysql/migration/3.8.0-3.9.0.sql       | 5 +++++
 htdocs/install/mysql/tables/llx_projet_task_time.sql | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/htdocs/install/mysql/migration/3.8.0-3.9.0.sql b/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
index d426cd72105..92ab08d141d 100755
--- a/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
+++ b/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
@@ -105,3 +105,8 @@ ALTER TABLE llx_product ADD COLUMN onportal tinyint DEFAULT 0 after tobuy;
 
 ALTER TABLE llx_user ADD COLUMN employee tinyint DEFAULT 1;
 
+
+ALTER TABLE llx_projet_task_time ADD COLUMN invoice_id integer DEFAULT NULL;
+ALTER TABLE llx_projet_task_time ADD COLUMN invoice_line_id integer DEFAULT NULL;
+
+
diff --git a/htdocs/install/mysql/tables/llx_projet_task_time.sql b/htdocs/install/mysql/tables/llx_projet_task_time.sql
index 6c34440a58b..3ca161ed07d 100644
--- a/htdocs/install/mysql/tables/llx_projet_task_time.sql
+++ b/htdocs/install/mysql/tables/llx_projet_task_time.sql
@@ -26,5 +26,7 @@ create table llx_projet_task_time
   task_duration    double,
   fk_user          integer,
   thm			   double(24,8),
+  invoice_id       integer DEFAULT NULL,				-- If we need to invoice each line of timespent, we can save invoice id here
+  invoice_line_id  integer DEFAULT NULL,                -- If we need to invoice each line of timespent, we can save invoice line id here
   note             text
 )ENGINE=innodb;

From 6493438e876168be2f31795d697197340125a591 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 26 Oct 2015 16:20:09 +0100
Subject: [PATCH 63/66] NEW The clicktodial module is now able to provide link
 "tel:" on phone numbers. So it is also possible to use clicktodial with a
 client solution like the "xivo" local client.

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

diff --git a/htdocs/admin/clicktodial.php b/htdocs/admin/clicktodial.php
index 1550c0ebef7..6b82c5237ea 100644
--- a/htdocs/admin/clicktodial.php
+++ b/htdocs/admin/clicktodial.php
@@ -36,10 +36,13 @@ $action = GETPOST("action");
 /*
  *	Actions
  */
+ 
 if ($action == 'setvalue' && $user->admin)
 {
-    $result=dolibarr_set_const($db, "CLICKTODIAL_URL", GETPOST("url"), 'chaine', 0, '', $conf->entity);
-    if ($result >= 0)
+    $result=dolibarr_set_const($db, "CLICKTODIAL_USE_TEL_LINK_ON_PHONE_NUMBERS", GETPOST("CLICKTODIAL_USE_TEL_LINK_ON_PHONE_NUMBERS"), 'chaine', 0, '', $conf->entity);
+    $result=dolibarr_set_const($db, "CLICKTODIAL_URL", GETPOST("CLICKTODIAL_URL"), 'chaine', 0, '', $conf->entity);
+    
+    if ($result1 >= 0 && $result2 >= 0)
     {
 		setEventMessage($langs->trans("SetupSaved"));
     }
@@ -73,13 +76,22 @@ $var=true;
 
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
-print '<td width="120">'.$langs->trans("Name").'</td>';
+print '<td>'.$langs->trans("Name").'</td>';
 print '<td>'.$langs->trans("Value").'</td>';
 print "</tr>\n";
+
 $var=!$var;
-print '<tr '.$bc[$var].'><td valign="top">';
+print '<tr '.$bc[$var].'><td>';
+print $langs->trans("ClickToDialUseTelLink").'</td><td>';
+print $form->selectyesno("CLICKTODIAL_USE_TEL_LINK_ON_PHONE_NUMBERS", $conf->global->CLICKTODIAL_USE_TEL_LINK_ON_PHONE_NUMBERS, 1).'<br>';
+print '<br>';
+print $langs->trans("ClickToDialUseTelLinkDesc");
+print '</td></tr>';
+
+$var=!$var;
+print '<tr '.$bc[$var].'><td>';
 print $langs->trans("DefaultLink").'</td><td>';
-print '<input size="92" type="text" name="url" value="'.$conf->global->CLICKTODIAL_URL.'"><br>';
+print '<input size="92" type="text" name="CLICKTODIAL_URL"'.($conf->global->CLICKTODIAL_USE_TEL_LINK_ON_PHONE_NUMBERS?' disabled="disabled"':'').' value="'.$conf->global->CLICKTODIAL_URL.'"><br>';
 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/functions.lib.php b/htdocs/core/lib/functions.lib.php
index b7db522458e..5b990ac509c 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1544,9 +1544,9 @@ function dol_print_phone($phone,$countrycode='',$cid=0,$socid=0,$addlink='',$sep
 		}
 	}
 
-	if (! empty($addlink))	// Link on phone number + link to add action (if conf->global->AGENDA_ADDACTIONFORPHONE set)
+	if (! empty($addlink))	// Link on phone number (+ link to add action if conf->global->AGENDA_ADDACTIONFORPHONE set)
 	{
-		if (! empty($conf->browser->phone))	// If phone, we use link of phone
+		if (! empty($conf->browser->phone) || (! empty($conf->clicktodial->enabled) && ! empty($conf->global->CLICKTODIAL_USE_TEL_LINK_ON_PHONE_NUMBERS)))	// If phone or option for, we use link of phone
 		{
 			$newphone ='<a href="tel:'.$phone.'"';
 			$newphone.='>'.$phone.'</a>';
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index c924d80639e..f6399bffa6b 100755
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1560,7 +1560,9 @@ AGENDA_DEFAULT_FILTER_TYPE=Set automatically this type of event into search filt
 AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into search filter of agenda view
 AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
 ##### ClickToDial #####
-ClickToDialDesc=This module allows to add an icon after phone numbers. A click on this icon will call a server with a particular URL you define below. This can be used to call a call center system from Dolibarr that can call the phone number on a SIP system for example.
+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 an interface install 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, you must set this to "No" and fill next field.
 ##### Point Of Sales (CashDesk) #####
 CashDesk=Point of sales
 CashDeskSetup=Point of sales module setup

From 6f1d758eaecd2105fab08f2f676a5f8e657baa24 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 26 Oct 2015 16:42:31 +0100
Subject: [PATCH 64/66] Fix print feature for md theme

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

diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 55ef8a3b991..a4da1e4205b 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -560,11 +560,16 @@ td.showDragHandle {
 }
 #id-right {	/* This must stay id-right and not be replaced with echo $right */
 	width: 100%;
+<?php if (GETPOST("optioncss") != 'print') { ?>
 	padding-left: 194px;
 	padding-top: 12px;
+<?php } ?>	
 }
 
 .side-nav {
+<?php if (GETPOST("optioncss") == 'print') { ?>
+	display: none;
+<?php } else { ?>
 	background: #FFF;
 	border-right: 1px solid rgba(0,0,0,0.2);
 	bottom: 0;
@@ -600,6 +605,7 @@ td.showDragHandle {
 	-webkit-overflow-scrolling: touch;
 	overflow-x: hidden;
 	overflow-y: auto;
+<?php } ?>
 }
 .side-nav-vert {
 	margin-left: 194px;

From 24c3491ff74bb2a81dc32e49f5a75960aee3ae16 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 26 Oct 2015 22:56:54 +0100
Subject: [PATCH 65/66] Code comment

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

diff --git a/htdocs/install/mysql/tables/llx_actioncomm_resources.sql b/htdocs/install/mysql/tables/llx_actioncomm_resources.sql
index 484cd39fb82..7632b1fd810 100644
--- a/htdocs/install/mysql/tables/llx_actioncomm_resources.sql
+++ b/htdocs/install/mysql/tables/llx_actioncomm_resources.sql
@@ -16,8 +16,8 @@
 -- along with this program. If not, see <http://www.gnu.org/licenses/>.
 --
 -- ============================================================================
--- Table used for relations between elements of different types:
--- invoice-propal, propal-order, etc...
+-- Table used for relations between an action event and a resource (in most cases
+-- a 'user', but can also be a 'resource' like a room, or a hardware)
 -- ============================================================================
 
 create table llx_actioncomm_resources

From 0a3ba3a0c601afd5293d2124f920ada4f38cf0aa Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 26 Oct 2015 23:36:05 +0100
Subject: [PATCH 66/66] Fix picto

---
 htdocs/theme/md/img/search.png      | Bin 432 -> 215 bytes
 htdocs/theme/md/img/searchclear.png | Bin 436 -> 356 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/htdocs/theme/md/img/search.png b/htdocs/theme/md/img/search.png
index 4c52b1e401ebbd8410dce1b60d40fc1d3e8e8e18..f0d4e97577508554557c9073d1607218a48a9215 100644
GIT binary patch
literal 215
zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+0wn(&ce?|m=6Sj}hEy<aJ*Ak(<S4>$!Cb2S
zz#@wSU0t@Pto$0DvY0ANJfO+Jc_%@IDc0TTlGYW4ge=dxOQv65K9}b?`&LHRx8cR%
ztCu6g?)Y}Lt=ngk@Z`Zl(KEKD3~YMen&xf}*ET;G_$_N8$FwfNh9@fAYVY{i6n=)3
zDh2b4Yjdk#-9FRh%B|g+o6h-co%%=f<|?zlxr?K|Z{I4PY&&VA`EOR~T>aDCXT#Nj
PE@kj^^>bP0l+XkKwR2O_

literal 432
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJdx@v7EBjSec0Oh;MG5s+Kq1Zo
zkH}&M25un`X1sK_?hjCqCEd~2k%3`jKlh(RRv>?SfKP}kkoJ<`2(q+{(&R|Clt_;1
zNltDlw&W=G(kw3SDPDT7c<u9QCxL1&iRz`ts+XRtUVE>4>$Mgqj+X4~mbJ%P_P%d9
z_r2vB5dH6Q;^+x7?AiLfXYcc#Yu|hB{hxB|`IP7X=VV*XS-W@6-g|S--JA3L`<(ax
zmma&e^!@*}*_vxxoYr2uw>4X0Ymd{`bN9A>|G)MB|Gnp~?fw3L@BjbDiY1Qy|9|fP
z|7-vM-&-1V@BjbjYrURtje7q5|E#$=-+)eMED7=pW^j0RBMr#O_jGX#k+__kpupwP
zeM&?5^Uk9wsi{u|Yw8SZm3c#XOLs6#Uo&yy#El!xVjLV|9Pghw6T`1}K%Grw!<IlN
z38fWWA_h-H+&Vf|WN2^X%=TKiqc!y6DHjgcmhkIQ?Xs>dk*Ar0Tg0#W>&W=bkYi;y
X{D&*ed<(lF&}s%xS3j3^P6<r_QC+)q

diff --git a/htdocs/theme/md/img/searchclear.png b/htdocs/theme/md/img/searchclear.png
index 203a85e10c4c0d1f76f0203cf266b6b7b62353be..12437f848238b68f5e1b716b5f56a7a5fe076df1 100644
GIT binary patch
literal 356
zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+0wn(&ce?|m7>k44ofy`glX(f`FeQ1ryD<E3
z??1C2$m1;Vh%9Dc;1&j9Muu5)B!GhKC7!;n?Dtvu#92heqcfO+LN7dB978nDPran*
zf2dI4*vIq!>POuQjAy=R>RjeHIlm#&Bx0?Lj!2J-!4EEu9*0Yh+!B-dghS1mI!_+)
z{TX@3;h*1^%<aGL-QB$VF@Kc%?Y20j&2L@G<>pmx(qFq`<y$YdJK1&Xt;BoJd@1$W
zoB2XZce|f-=ca_y2hL<(ioEC(=HeG(cE!udw^m^Pny_B+%h?J~Syju69)xOf+TI8~
z*r>qOR~OOQQ_ehFp<~e@qe;c9A07?}b@ew9jMY=B?C+a+-N@`}V1eSS8?&9w`Gg-g
wX9vdq_`A$8HYB?Ds?F`luZoGLpW<to*2%l5)(SSy2Kt%7)78&qol`;+0Lkl!Q2+n{

literal 436
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJdx@v7EBjSec7A?_@GGa;fkK=G
z9+AZi3|t>Tn9*sC$qb+%OS+@4BLl<6e(pbstU&(u0G|+7Anhf=5oBo@rOA<ODUlr2
zlbqaAY{^mVrCD6uQ@r$E@!IFrP6E|l64gtORWChPz4l)9)@v<J94*<|Eo+ap?0w&I
z?t9BMAo}0q#L*LE*t7L{&)(-f*S`1M`#<H_^C{2&&&jr&vv%*Cz4zvvyEo_g_c`zX
zFFkf`>HGg{vo+VYIIX>QZ)>*1)*h#==k9I&{(tNL|9j6}+xz|h-v9rP6-ylZ|Nq?o
z|JVNizqd5#-v9s4*LpqQ8uk49|5<Z$z5$)iSQ6wH%;50sMjDV)?CIhdB5^r6L4nJo
z`;>-qMG()Oq)nSPeR5#)aq+tE;T+0!F8#rzsYXVVjIOnDb988Xc+Q;p`XK9%BO*)A
zEXkQNp=atP^UYHpiMT~5FIu$rh#IT0nAb+FsF@rKcl3o{k7}27ZHYY16x<?y)n7-(
cXNDXrLvJq^w@G2r51{o7p00i_>zopr0Dc3&>Hq)$