From c0ad86cd5c6ae6745be083caa76fd50527041cc5 Mon Sep 17 00:00:00 2001
From: Florian Henry <florian.henry@open-concept.pro>
Date: Thu, 31 Oct 2013 13:23:38 +0100
Subject: [PATCH 1/9] Add column   fk_c_element_role	into
 llx_actioncomm_ressource to manage role of linked element In this exemple we
 can have fk_element = 1 element_type= "user" or contact or place or whatever
 element fk_c_element_role = 1 // 'Guest' or Host or whatever define in
 dictionnary fk_c_element_status = Present // or whatever define in
 dictionnary according element type

---
 htdocs/install/mysql/migration/3.4.0-3.5.0.sql           | 3 ++-
 htdocs/install/mysql/tables/llx_actioncomm_resources.sql | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/htdocs/install/mysql/migration/3.4.0-3.5.0.sql b/htdocs/install/mysql/migration/3.4.0-3.5.0.sql
index e417a408d50..809c1edb6a7 100755
--- a/htdocs/install/mysql/migration/3.4.0-3.5.0.sql
+++ b/htdocs/install/mysql/migration/3.4.0-3.5.0.sql
@@ -325,7 +325,8 @@ create table llx_actioncomm_resources
   fk_actioncomm		integer NOT NULL,
   element_type		varchar(50) NOT NULL,
   fk_element		integer NOT NULL,
-  fk_element_status	varchar(32) NULL
+  fk_c_element_role	integer NOT NULL,
+  fk_c_element_status	varchar(32) NULL
 ) ENGINE=innodb;
 ALTER TABLE llx_actioncomm_resources ADD UNIQUE INDEX idx_actioncomm_resources_idx1 (fk_actioncomm, element_type, fk_element);
 ALTER TABLE llx_actioncomm_resources ADD INDEX idx_actioncomm_resources_fk_element (fk_element);
diff --git a/htdocs/install/mysql/tables/llx_actioncomm_resources.sql b/htdocs/install/mysql/tables/llx_actioncomm_resources.sql
index 781744e7c60..e475efce388 100644
--- a/htdocs/install/mysql/tables/llx_actioncomm_resources.sql
+++ b/htdocs/install/mysql/tables/llx_actioncomm_resources.sql
@@ -26,5 +26,6 @@ create table llx_actioncomm_resources
   fk_actioncomm		integer NOT NULL,
   element_type		varchar(50) NOT NULL,
   fk_element		integer NOT NULL,
-  fk_element_status	varchar(32) NULL
+  fk_c_element_role	integer NOT NULL,
+  fk_c_element_status	varchar(32) NULL
 ) ENGINE=innodb;

From 7db319975f554744a9daf81f6385f40e1c277705 Mon Sep 17 00:00:00 2001
From: Florian Henry <florian.henry@open-concept.pro>
Date: Fri, 1 Nov 2013 13:47:17 +0100
Subject: [PATCH 2/9] Use good icon for status caesed societe

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

diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 162550a162b..9d3705a0bc6 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -1518,22 +1518,22 @@ class Societe extends CommonObject
         }
         if ($mode == 2)
         {
-            if ($statut==0) return img_picto($langs->trans("ActivityCeased"),'statut6').' '.$langs->trans("ActivityCeased");
+            if ($statut==0) return img_picto($langs->trans("ActivityCeased"),'statut1').' '.$langs->trans("ActivityCeased");
             if ($statut==1) return img_picto($langs->trans("InActivity"),'statut4').' '.$langs->trans("InActivity");
         }
         if ($mode == 3)
         {
-            if ($statut==0) return img_picto($langs->trans("ActivityCeased"),'statut6');
+            if ($statut==0) return img_picto($langs->trans("ActivityCeased"),'statut1');
             if ($statut==1) return img_picto($langs->trans("InActivity"),'statut4');
         }
         if ($mode == 4)
         {
-            if ($statut==0) return img_picto($langs->trans("ActivityCeased"),'statut6').' '.$langs->trans("ActivityCeased");
+            if ($statut==0) return img_picto($langs->trans("ActivityCeased"),'statut1').' '.$langs->trans("ActivityCeased");
             if ($statut==1) return img_picto($langs->trans("InActivity"),'statut4').' '.$langs->trans("InActivity");
         }
         if ($mode == 5)
         {
-            if ($statut==0) return $langs->trans("ActivityCeased").' '.img_picto($langs->trans("ActivityCeased"),'statut6');
+            if ($statut==0) return $langs->trans("ActivityCeased").' '.img_picto($langs->trans("ActivityCeased"),'statut1');
             if ($statut==1) return $langs->trans("InActivity").' '.img_picto($langs->trans("InActivity"),'statut4');
         }
     }

From 48c8b470af2456cf6513fccbaefcc5524e46db80 Mon Sep 17 00:00:00 2001
From: Florian Henry <florian.henry@open-concept.pro>
Date: Fri, 1 Nov 2013 18:59:00 +0100
Subject: [PATCH 3/9] Add hook into product/document.php

---
 htdocs/product/document.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/htdocs/product/document.php b/htdocs/product/document.php
index 0adff43ac47..0ba03e0c7c0 100644
--- a/htdocs/product/document.php
+++ b/htdocs/product/document.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2005      Marc Barilley / Ocebo <marc@ocebo.com>
  * Copyright (C) 2005-2012 Regis Houssin         <regis.houssin@capnetworks.com>
  * Copyright (C) 2005      Simon TOSSER          <simon@kornog-computing.com>
+ * Copyright (C) 2013      Florian Henry          <florian.henry@open-concept.pro>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -46,6 +47,9 @@ $fieldtype = (! empty($ref) ? 'ref' : 'rowid');
 if ($user->societe_id) $socid=$user->societe_id;
 $result=restrictedArea($user,'produit|service',$fieldvalue,'product&product','','',$fieldtype);
 
+// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+$hookmanager->initHooks(array('productdocuments'));
+
 // Get parameters
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
@@ -68,6 +72,10 @@ if ($id > 0 || ! empty($ref))
 }
 $modulepart='produit';
 
+$parameters=array('id'=>$id);
+$reshook=$hookmanager->executeHooks('doActions',$parameters,$product,$action);    // Note that $action and $object may have been modified by some hooks
+
+
 /*
  * Action envoie fichier
  */
@@ -106,6 +114,8 @@ if ($object->id)
 	$picto=($object->type==1?'service':'product');
 	dol_fiche_head($head, 'documents', $titre, 0, $picto);
 
+	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$product,$action);    // Note that $action and $object may have been modified by hook
+	
 
 	// Construit liste des fichiers
 	$filearray=dol_dir_list($upload_dir,"files",0,'','\.meta$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);

From 11d2af0f7e5a58ed86b18b9990fe0ec2b1336d77 Mon Sep 17 00:00:00 2001
From: Florian Henry <florian.henry@open-concept.pro>
Date: Fri, 1 Nov 2013 23:20:10 +0100
Subject: [PATCH 4/9] Fix hook object call

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

diff --git a/htdocs/product/document.php b/htdocs/product/document.php
index 0ba03e0c7c0..22de2273820 100644
--- a/htdocs/product/document.php
+++ b/htdocs/product/document.php
@@ -73,7 +73,7 @@ if ($id > 0 || ! empty($ref))
 $modulepart='produit';
 
 $parameters=array('id'=>$id);
-$reshook=$hookmanager->executeHooks('doActions',$parameters,$product,$action);    // Note that $action and $object may have been modified by some hooks
+$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 
 
 /*
@@ -114,7 +114,7 @@ if ($object->id)
 	$picto=($object->type==1?'service':'product');
 	dol_fiche_head($head, 'documents', $titre, 0, $picto);
 
-	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$product,$action);    // Note that $action and $object may have been modified by hook
+	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
 	
 
 	// Construit liste des fichiers

From f727e832d93d1b515870c216db4aa538b7a8d0c7 Mon Sep 17 00:00:00 2001
From: Florian Henry <florian.henry@open-concept.pro>
Date: Sat, 2 Nov 2013 02:25:06 +0100
Subject: [PATCH 5/9] Add mandatory and transparent into
 llx_actioncomm_ressource

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

diff --git a/htdocs/install/mysql/tables/llx_actioncomm_resources.sql b/htdocs/install/mysql/tables/llx_actioncomm_resources.sql
index e475efce388..7810c500723 100644
--- a/htdocs/install/mysql/tables/llx_actioncomm_resources.sql
+++ b/htdocs/install/mysql/tables/llx_actioncomm_resources.sql
@@ -27,5 +27,7 @@ create table llx_actioncomm_resources
   element_type		varchar(50) NOT NULL,
   fk_element		integer NOT NULL,
   fk_c_element_role	integer NOT NULL,
-  fk_c_element_status	varchar(32) NULL
+  fk_c_element_status	varchar(32) NULL,
+  mandatory		smallint,
+  transparent		smallint
 ) ENGINE=innodb;

From b52b49cbb0dcf0b5f45ffb3d2bce47f1219d760a Mon Sep 17 00:00:00 2001
From: Florian Henry <florian.henry@open-concept.pro>
Date: Sat, 2 Nov 2013 02:42:44 +0100
Subject: [PATCH 6/9] USe good icons for customer status

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

diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 9d3705a0bc6..96863a078d8 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -1518,22 +1518,22 @@ class Societe extends CommonObject
         }
         if ($mode == 2)
         {
-            if ($statut==0) return img_picto($langs->trans("ActivityCeased"),'statut1').' '.$langs->trans("ActivityCeased");
+            if ($statut==0) return img_picto($langs->trans("ActivityCeased"),'statut8').' '.$langs->trans("ActivityCeased");
             if ($statut==1) return img_picto($langs->trans("InActivity"),'statut4').' '.$langs->trans("InActivity");
         }
         if ($mode == 3)
         {
-            if ($statut==0) return img_picto($langs->trans("ActivityCeased"),'statut1');
+            if ($statut==0) return img_picto($langs->trans("ActivityCeased"),'statut8');
             if ($statut==1) return img_picto($langs->trans("InActivity"),'statut4');
         }
         if ($mode == 4)
         {
-            if ($statut==0) return img_picto($langs->trans("ActivityCeased"),'statut1').' '.$langs->trans("ActivityCeased");
+            if ($statut==0) return img_picto($langs->trans("ActivityCeased"),'statut8').' '.$langs->trans("ActivityCeased");
             if ($statut==1) return img_picto($langs->trans("InActivity"),'statut4').' '.$langs->trans("InActivity");
         }
         if ($mode == 5)
         {
-            if ($statut==0) return $langs->trans("ActivityCeased").' '.img_picto($langs->trans("ActivityCeased"),'statut1');
+            if ($statut==0) return $langs->trans("ActivityCeased").' '.img_picto($langs->trans("ActivityCeased"),'statut8');
             if ($statut==1) return $langs->trans("InActivity").' '.img_picto($langs->trans("InActivity"),'statut4');
         }
     }

From 8f43b2f2c0ebbc3a963836cee47d7746a96cf85a Mon Sep 17 00:00:00 2001
From: Grand Philippe <contact@atoo-net.com>
Date: Mon, 4 Nov 2013 14:11:33 +0100
Subject: [PATCH 7/9] language

---
 ChangeLog | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ba614a9cf9a..72a1ecf49ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,7 +3,7 @@ English Dolibarr ChangeLog
 --------------------------------------------------------------
 ***** ChangeLog for 3.4.2 compared to 3.4.1 *****
 Fix: Bad rounding on margin calculations and display.
-Fix: Option drpo table into backup was broken.
+Fix: Option drop table into backup was broken.
 
 ***** ChangeLog for 3.5 compared to 3.4.* *****
 For users:
@@ -11,7 +11,7 @@ For users:
 - New: More options to select status of users into select user list.
 - New: [ task #862 ] Add ODT on shipments.
 - New: [ task #149 ] Add # of notes and attachments in tabs.
-- New: Can edit customer ref at eny time.
+- New: Can edit customer ref at any time.
 - New: [ task #877 ] Reorganize menus.
 - New: [ task #858 ] Holiday module: note on manual holiday assignation.
 - New: [ task #892 ] Add hidden option in thirdparty customer/supplier module to hide non active
@@ -21,10 +21,10 @@ For users:
 - New: Add script export-bank-receipts.php
 - New: Add option "filter=bank" onto script rebuild_merge_pdf.php to merge PDF that
   has one payment on a specific bank account.*
-- New: [ task #901 ] Add Extrafeild on Fiche Inter.
+- New: [ task #901 ] Add Extrafield on Fiche Inter.
 - New: Show process id in all command line scripts.
 - New: Module mailman can subscribe/unsubscribe to ML according to categories or type of member.
-- New: Add object_hour and object_date_rfc as substitution tag for opendocument generation.
+- New: Add object_hour and object_date_rfc as substitution tag for open document generation.
 - New: Add options to send an email when paypal or paybox payment is done.
 - New: Clone product/service composition.
 - New: [ task #926 ] Add extrafield feature on order lines.
@@ -34,17 +34,17 @@ For users:
 - New: Add a cron module to define scheduled jobs.
 - New: Add new graphical boxes (customer and supplier invoices and orders per month).
 - New: [ task #286 ] Enhance rounding function of prices to allow round of sum instead of sum of rounding.
-- New: Can add an event automatically when a projet is create. 
+- New: Can add an event automatically when a project is create. 
 - New: Add option MAIN_GENERATE_DOCUMENT_WITH_PICTURE.
 - New: Add option excludethirdparties and onlythirdparties into merge pdf scripts.
 - New: [ task #925 ] Add ODT document generation for Tasks in project module.
 - New: [ task #924 ] Add numbering rule on task.
 - New: [ task #165 ] Add import/export of multiprices.
 - New: Add Maghreb regions and departments.
-- New: A more responsive desgin for statistic box of home page.
+- New: A more responsive design for statistic box of home page.
 - New: [ task #1005 ] Adapting to Spanish legislation bill numbering
 - New: [ task #1011 ] Now supplier order and invoice deal with payment terms and mode.
-- New: [ task #1014 ] Add option to recursivly add parent category.
+- New: [ task #1014 ] Add option to recursively add parent category.
 - New: [ task #1016 ] Can define a specific numbering for deposits.
 - New: [ task #918 ] Stock replenishment.
 - New : Add pdf link into supplier invoice list and supplier order list.
@@ -61,7 +61,7 @@ For users:
 - New: Add hidden option MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS.
 - New: Can send an email from thirdparty card.
 - New: Can cancel holidays that were previously validated.
-- New: Can choose contact on event (action com) creation, and filtred by thirdparty.
+- New: Can choose contact on event (action com) creation, and filtered by thirdparty.
 - New: Add hidden option MAIN_FORCE_DEFAULT_STATE_ID.
 - New: Add page to make mass stock movement.
 - New: Add field oustanding limit into thirdparty properties.
@@ -74,8 +74,8 @@ For users:
 - Fix: Better management of using ajax for upload form (to solve problem when enabling ajax jquery multifile upload in some cases).
 
 For translators:
-- Qual: Normalized sort order of all languages files with english reference files.
-- New: Add language code files for South Africa, France new caledonia, Vietnam.
+- Qual: Normalized sort order of all languages files with English reference files.
+- New: Add language code files for South Africa, France new Caledonia, Vietnam.
 - New: Translate string for email to change password.
 
 For developers:
@@ -93,14 +93,14 @@ For developers:
   key to use a specific language file.
 - New: Make some changes to allow usage of several alternative $dolibarr_main_url_root variables.
 - Qual: All nowrap properties are now using CSS class nowrap.
-- Qual: Move hardcoded code of module mailmanspip into trigger.
-- New: Into POST forms, if you can add a parameter DOL_AUTOSET_COOKIE with a vlue that is list name,
+- Qual: Move hard coded code of module mailmanspip into trigger.
+- New: Into POST forms, if you can add a parameter DOL_AUTOSET_COOKIE with a value that is list name,
   separated by a coma, of other POST parameters, Dolibarr will automatically save this parameters
   into user cookies.
 - New: Add hook addHomeSetup.
 - New: Add trigger CATEGORY_LINK and CATEGORY_UNLINK.
 - New: A trigger can return an array of error strings instead of one error string.
-- New: Add method to use a dictionnary as a combo box.
+- New: Add method to use a dictionary as a combo box.
 - New: Add update method for web service product.
 - Fix also several bugs with old code. 
 
@@ -116,11 +116,11 @@ be replaced by a "return 0";
 Goal is to fix old compatibility code that does not match hook specifications: 
  http://wiki.dolibarr.org/index.php/Hooks_system   
 
-2) If you implemented hook printTopRightMenu, check that output does not include '<td>' tags anymore.
+2) If you implemented hook printTopRightMenu, check that output does not include '<td>' tags any more.
 All content added must be tagged by a '<div>' with css class="login_block_elem"
 
 3) Some methods object->addline used a first parameter that was object->id, some not. Of course
-this was not a good pratice, since object->id is already known, there is no need to provide id as 
+this was not a good practice, since object->id is already known, there is no need to provide id as 
 parameter. All methods addline in this case were modified to remove this parameter. 
 
 4) Method ->classer_facturee() is deprecated. It must be replace with ->classifyBilled().
@@ -135,18 +135,18 @@ Fix: Reordering supplier products in list by supplier or supplier ref was crashi
 Fix: [ bug #1029 ] Tulip numbering mask
 Fix: Supplier invoice and supplier order are not displayed into object link into agenda event card
 Fix: [ bug #1033 ] SUPPLIER REF disappeared
-Fix: update extrafield do not display immediatly after update
+Fix: update extrafield do not display immediately after update
 Fix: Fix bug with canvas thirdparty
 Fix: [ bug #1037 ] Consumption> Supplier invoices related
 Fix: User group name do not display in card (view or edit mode)
-Fix: Link "Show all supplier invoice" on suplier card not working 
+Fix: Link "Show all supplier invoice" on supplier card not working 
 Fix: [ bug #1039 ] Pre-defined invoices conversion
 Fix: If only service module is activated, it's impossible to delete service
 Fix: [ bug #1043 ] Bad interventions ref numbering
 Fix: Mailing module : if an email is already in destinaires list all other email from selector was not inserted
 Fix: Localtaxes balance not showing
 Fix: Intervention box links to contracts id
-Fix: Compatiblity with multicompany module
+Fix: Compatibility with multicompany module
 Fix: Edit propal line was losing product supplier price id
 Fix: Delete linked element to supplier invoice when deleted 
 Fix: [ bug #1061 ] Bad info shipped products

From a57afb6d4052725536089d3f3ef9df9cc9aae7a3 Mon Sep 17 00:00:00 2001
From: Florian Henry <florian.henry@open-concept.pro>
Date: Mon, 4 Nov 2013 19:21:13 +0100
Subject: [PATCH 8/9] [ task #1127 ] Add feature filter on extrafield type :
 select for table

---
 htdocs/core/actions_extrafields.inc.php | 40 +++++++++++++++++++------
 htdocs/core/class/extrafields.class.php | 24 +++++++++++++--
 htdocs/langs/en_US/admin.lang           |  2 +-
 htdocs/langs/fr_FR/admin.lang           |  2 +-
 4 files changed, 54 insertions(+), 14 deletions(-)

diff --git a/htdocs/core/actions_extrafields.inc.php b/htdocs/core/actions_extrafields.inc.php
index 4861ee6b856..74bf7c40ad8 100644
--- a/htdocs/core/actions_extrafields.inc.php
+++ b/htdocs/core/actions_extrafields.inc.php
@@ -87,7 +87,7 @@ if ($action == 'add')
         	$mesg[]=$langs->trans("ErrorNoValueForRadioType");
         	$action = 'create';
         }
-        if  (((GETPOST('type')=='radio') || (GETPOST('type')=='checkbox') || (GETPOST('type')=='radio')) && GETPOST('param')) 
+        if  (((GETPOST('type')=='radio') || (GETPOST('type')=='checkbox')) && GETPOST('param')) 
         {
         	// Construct array for parameter (value of select list)
     		$parameters = GETPOST('param');
@@ -124,11 +124,22 @@ if ($action == 'add')
         		$default_value = GETPOST('default_value');
     			$parameters = GETPOST('param');
     			$parameters_array = explode("\r\n",$parameters);
-    			foreach($parameters_array as $param_ligne)
+    			//In sellist we have only one line and it can have come to do SQL expression
+    			if (GETPOST('type')=='sellist') {
+    				foreach($parameters_array as $param_ligne)
+    				{
+    					$params['options'] = array($parameters=>null);
+    				}
+    			}
+    			else
     			{
-    				list($key,$value) = explode(',',$param_ligne);
-    				$params['options'][$key] = $value;
-    			}  			 
+    				//Esle it's separated key/value and coma list
+    				foreach($parameters_array as $param_ligne)
+    				{
+    					list($key,$value) = explode(',',$param_ligne);
+    					$params['options'][$key] = $value;
+    				}
+    			}		 
     			
                 $result=$extrafields->addExtraField($_POST['attrname'],$_POST['label'],$_POST['type'],$_POST['pos'],$extrasize,$elementtype,(GETPOST('unique')?1:0),(GETPOST('required')?1:0),$default_value,$params);
     			if ($result > 0)
@@ -215,7 +226,7 @@ if ($action == 'update')
         	$mesg[]=$langs->trans("ErrorNoValueForRadioType");
         	$action = 'edit';
         }
-        if  (((GETPOST('type')=='radio') || (GETPOST('type')=='checkbox') || (GETPOST('type')=='radio')) && GETPOST('param'))
+        if  (((GETPOST('type')=='radio') || (GETPOST('type')=='checkbox')) && GETPOST('param'))
         {
         	// Construct array for parameter (value of select list)
         	$parameters = GETPOST('param');
@@ -251,10 +262,21 @@ if ($action == 'update')
     			// Construct array for parameter (value of select list)
     			$parameters = GETPOST('param');
     			$parameters_array = explode("\r\n",$parameters);
-    			foreach($parameters_array as $param_ligne)
+    			//In sellist we have only one line and it can have come to do SQL expression
+    			if (GETPOST('type')=='sellist') {
+    				foreach($parameters_array as $param_ligne)
+    				{
+    					$params['options'] = array($parameters=>null);
+    				}
+    			}
+    			else
     			{
-    				list($key,$value) = explode(',',$param_ligne);
-    				$params['options'][$key] = $value;
+    				//Esle it's separated key/value and coma list
+    				foreach($parameters_array as $param_ligne)
+    				{
+    					list($key,$value) = explode(',',$param_ligne);
+    					$params['options'][$key] = $value;
+    				}
     			}
     			$result=$extrafields->update($_POST['attrname'],$_POST['label'],$_POST['type'],$extrasize,$elementtype,(GETPOST('unique')?1:0),(GETPOST('required')?1:0),$pos,$params);
     			if ($result > 0)
diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index f4271d05070..c651603451d 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -693,15 +693,23 @@ class ExtraFields
 				// 1 2 : label field name Nom du champ contenant le libelle
 				// 2 3 : key fields name (if differ of rowid)
 				// 3 4 : key field parent (for dependent lists)
+				// 4 5 : where clause filter on column or table extrafield, syntax field='value' or extra.field=value
+				
 
 				$keyList='rowid';
 
-				if (count($InfoFieldList)>=3)
-					$keyList=$InfoFieldList[2].' as rowid';
-				if (count($InfoFieldList)>=4) {
+				if (count($InfoFieldList)>=3) {
 					list($parentName, $parentField) = explode('|', $InfoFieldList[3]);
 					$keyList.= ', '.$parentField;
 				}
+				if (count($InfoFieldList)>=4 && !empty($InfoFieldList[4])) {
+					if (strpos($InfoFieldList[4], 'extra')!==false) {
+						$keyList='main.'.$InfoFieldList[2].' as rowid';
+					}else {
+						$keyList=$InfoFieldList[2].' as rowid';
+					}
+				}
+				
 
 				$fields_label = explode('|',$InfoFieldList[1]);
 				if(is_array($fields_label)) {
@@ -717,6 +725,16 @@ class ExtraFields
 
 				$sql = 'SELECT '.$keyList;
 				$sql.= ' FROM '.MAIN_DB_PREFIX .$InfoFieldList[0];
+				if (!empty($InfoFieldList[4])) {
+						
+					//We have to join on extrafield table
+					if (strpos($InfoFieldList[4], 'extra')!==false) {
+						$sql.= ' as main, '.MAIN_DB_PREFIX .$InfoFieldList[0].'_extrafields as extra';
+						$sql.= ' WHERE  extra.fk_object=main.'.$InfoFieldList[2]. ' AND '.$InfoFieldList[4];
+					}else {
+						$sql.= ' WHERE '.$InfoFieldList[4];
+					}
+				}
 				//$sql.= ' WHERE entity = '.$conf->entity;
 				//print $sql;
 
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 3aaba60e9e0..8e73c2fe560 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -368,7 +368,7 @@ ExtrafieldRadio=Radio button
 ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for exemple : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another :<br>1,value1|parent_list_code:parent_key<br>2,value2|parent_list_code:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value<br><br> for exemple : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for exemple : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=Parameters list have come from table<br><br> for exemple : <br>c_typent:libelle:id<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column
+ExtrafieldParamHelpsellist=Parameters list have come from table<br><br> for exemple : <br>c_typent:libelle:id::filter<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter <br> filter can be a simple test (eg active=1) to display only active value <br> if you want to filter on extrafields use syntaxt  extra.fieldcode=... (where field code is the code of extrafield)  
 LibraryToBuildPDF=Library used to build PDF
 WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>   
 LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (vat is not applied on local tax)<br>2 : local tax apply on products and services before vat (vat is calculated on amount + localtax)<br>3 : local tax apply on products without vat (vat is not applied on local tax)<br>4 : local tax apply on products before vat (vat is calculated on amount + localtax)<br>5 : local tax apply on services without vat (vat is not applied on local tax)<br>6 : local tax apply on services before vat (vat is calculated on amount + localtax)
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index 1c27019bce1..58df5bf983b 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -368,7 +368,7 @@ ExtrafieldRadio=Bouton radio
 ExtrafieldParamHelpselect=La liste doit être de la forme clef,valeur<br><br> par exemple : <br>1,valeur1<br>2,valeur2<br>3,valeur3<br>...<br><br>Pour que la liste soit dépendante d'une autre :<br>1,valeur1|code_liste_parent:clef_parent<br>2,valeur2|code_liste_parent:clef_parent
 ExtrafieldParamHelpcheckbox=La liste doit être de la forme clef,valeur<br><br> par exemple : <br>1,valeur1<br>2,valeur2<br>3,valeur3<br>...
 ExtrafieldParamHelpradio=La liste doit être de la forme clef,valeur<br><br> par exemple : <br>1,valeur1<br>2,valeur2<br>3,valeur3<br>...
-ExtrafieldParamHelpsellist=La liste vient d'une table<br><br> par exemple : <br>c_typent:libelle:id<br><br>Pour que la liste soit dépendante d'une autre :<br>c_typent:libelle:id:code_liste_parent|colonne_parent
+ExtrafieldParamHelpsellist=La liste vient d'une table<br><br> par exemple : <br>c_typent:libelle:id::filter<br><br>Pour que la liste soit dépendante d'une autre :<br>c_typent:libelle:id:code_liste_parent|colonne_parent:filter<br> filter peux être un test simple active=1 pour ne proposer que les valeur active<br> si vous voulez faire un filtre sur des attributs supplémentaires utiliser la syntax extra.champ=...(où champ est la code de l'attribut supplémentaire)  
 LibraryToBuildPDF=Bibliothèque utilisée pour la génération des PDF
 WarningUsingFPDF=Attention : votre fichier <b>conf.php</b> contient la directive <b>dolibarr_pdf_force_fpdf=1</b>. Cela signifie que vous utilisez la librairie FPDF pour générer vos fichiers PDF. Cette librairie est ancienne et ne couvre pas de nombreuses fonctionnalités (Unicode, transparence des images, langues cyrilliques, arabes ou asiatiques...), aussi vous pouvez rencontrer des problèmes durant la génération des PDF.<br>Pour résoudre cela et avoir une prise en charge complète de PDF, vous pouvez télécharger la <a href="http://www.tcpdf.org/" target="_blank">bibliothèque TCPDF</a> puis commenter ou supprimer la ligne <b>$dolibarr_pdf_force_fpdf=1</b>, et ajouter à la place <b>$dolibarr_lib_TCPDF_PATH='chemin_vers_TCPDF'</b>
 LocalTaxDesc=Certains pays appliquent 2 voire 3 taux sur chaque ligne de facture. Si c'est le cas, choisissez le type du deuxième et troisième taux et sa valeur. Les types possibles sont:<br>1 : taxe locale sur les produits et services hors tva (la tva n'est pas appliquée sur la taxe locale)<br>2 : taxe locale sur les produits et services avant tva (la tva est appliquée sur le montant + la taxe locale)<br>3 : taxe locale uniquement sur les produits hors tva (la tva n'est pas appliquée sur la taxe locale)<br>4 : taxe locale uniquement sur les produits avant tva (la tva est appliquée sur le montant + la taxe locale)<br>5 : taxe locale uniquement sur les services hors tva (la tva n'est pas appliquée sur la taxe locale)<br>6 : taxe locale uniquement sur les service avant tva (la tva est appliquée sur le montant + la taxe locale)

From c465cc621da05487aaa672017d4b53b15bb81c03 Mon Sep 17 00:00:00 2001
From: Florian Henry <florian.henry@open-concept.pro>
Date: Mon, 4 Nov 2013 19:27:59 +0100
Subject: [PATCH 9/9] Fix actioncomm_ressource column name

---
 htdocs/install/mysql/migration/3.4.0-3.5.0.sql           | 5 +++--
 htdocs/install/mysql/tables/llx_actioncomm_resources.sql | 3 +--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/install/mysql/migration/3.4.0-3.5.0.sql b/htdocs/install/mysql/migration/3.4.0-3.5.0.sql
index 809c1edb6a7..75614321fbc 100755
--- a/htdocs/install/mysql/migration/3.4.0-3.5.0.sql
+++ b/htdocs/install/mysql/migration/3.4.0-3.5.0.sql
@@ -325,8 +325,9 @@ create table llx_actioncomm_resources
   fk_actioncomm		integer NOT NULL,
   element_type		varchar(50) NOT NULL,
   fk_element		integer NOT NULL,
-  fk_c_element_role	integer NOT NULL,
-  fk_c_element_status	varchar(32) NULL
+  answer_status		varchar(50) NULL,
+  mandatory		smallint,
+  transparent		smallint
 ) ENGINE=innodb;
 ALTER TABLE llx_actioncomm_resources ADD UNIQUE INDEX idx_actioncomm_resources_idx1 (fk_actioncomm, element_type, fk_element);
 ALTER TABLE llx_actioncomm_resources ADD INDEX idx_actioncomm_resources_fk_element (fk_element);
diff --git a/htdocs/install/mysql/tables/llx_actioncomm_resources.sql b/htdocs/install/mysql/tables/llx_actioncomm_resources.sql
index 7810c500723..bd48ad4f66d 100644
--- a/htdocs/install/mysql/tables/llx_actioncomm_resources.sql
+++ b/htdocs/install/mysql/tables/llx_actioncomm_resources.sql
@@ -26,8 +26,7 @@ create table llx_actioncomm_resources
   fk_actioncomm		integer NOT NULL,
   element_type		varchar(50) NOT NULL,
   fk_element		integer NOT NULL,
-  fk_c_element_role	integer NOT NULL,
-  fk_c_element_status	varchar(32) NULL,
+  answer_status		varchar(50) NULL,
   mandatory		smallint,
   transparent		smallint
 ) ENGINE=innodb;