Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap

.travis.yml

@@ -325,18 +325,21 @@ script:
   set +e
   echo
   #cat $TRAVIS_BUILD_DIR/upgrade400500-2.log
+  #cat $TRAVIS_BUILD_DIR/upgrade500600.log
+  #cat $TRAVIS_BUILD_DIR/upgrade500600-2.log
+  #cat $TRAVIS_BUILD_DIR/upgrade500600-3.log
   #cat /tmp/dolibarr_install.log
   
 - |
   echo "Unit testing"
-  # Ensure we catch errors. Set this to +e if you want to go to the end to see log file.
+  # Ensure we catch errors. Set this to +e if you want to go to the end to see dolibarr.log file.
   set -e
   phpunit -d memory_limit=-1 -c test/phpunit/phpunittest.xml test/phpunit/AllTests.php
   set +e
 
 - |
   #echo "Output dolibarr.log"
-  #echo cat documents/dolibarr.log
+  #cat documents/dolibarr.log
 
 after_script:
 - |

ChangeLog

@@ -16,6 +16,8 @@ Following changes may create regressions for some external modules, but were nec
 * The substitution key for reference of object is now __REF__ whatever is the object (it replaces __ORDERREF__, 
   __PROPALREF__, ...)
 * Some REST API to access the dictionary (country, town, ...) were moved into a common API. 
+* Page bank/index.php and bank/bankentries.php were renamed into bank/list.php and bank/bankentries_list.php to
+  follow page naming conventions (so default filter/sort order features can also work).
 
 
 ***** ChangeLog for 6.0.1 compared to 6.0.* *****

dev/initdata/import-thirdparties.php

@@ -21,7 +21,7 @@
 
 /**
  *      \file       dev/initdata/import-thirdparties.php
- *		\brief      Script example to insert thirdparties from a csv file. 
+ *		\brief      Script example to insert thirdparties from a csv file.
  *                  To purge data, you can have a look at purge-data.php
  */
 
@@ -123,15 +123,15 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
     if ($endlinenb && $i > $endlinenb) continue;
 
     $nboflines++;
-    
+
     $object = new Societe($db);
     $object->state = $fields[6];
     $object->client = $fields[7];
     $object->fournisseur = $fields[8];
-    
+
     $object->name = $fields[13]?trim($fields[13]):$fields[0];
     $object->name_alias = $fields[0]!=$fields[13]?trim($fields[0]):'';
-    
+
     $object->address = trim($fields[14]);
     $object->zip = trim($fields[15]);
     $object->town = trim($fields[16]);
@@ -149,7 +149,7 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
         $condpayment = trim($fields[36]);
         if ($condpayment == 'A la commande') $condpayment = 'A réception de commande';
         if ($condpayment == 'A reception facture') $condpayment = 'Réception de facture';
-        $object->cond_reglement_id = dol_getIdFromCode($db, $condpayment, 'c_payment_term', 'libelle_facture', 'rowid');
+        $object->cond_reglement_id = dol_getIdFromCode($db, $condpayment, 'c_payment_term', 'libelle_facture', 'rowid', 1);
         if (empty($object->cond_reglement_id))
         {
             print " - Error cant find payment mode for ".$condpayment."\n";
@@ -166,7 +166,7 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
     // Set price level
     $object->price_level = 1;
     if ($labeltype == 'Revendeur') $object->price_level = 2;
-    
+
     print "Process line nb ".$i.", name ".$object->name;
 
 
@@ -182,7 +182,7 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
             print " - Error in create result code = ".$ret." - ".$object->errorsToString();
             $errorrecord++;
         }
-    	else 
+    	else
     	{
     	    print " - Creation OK with name ".$object->name." - id = ".$ret;
     	}
@@ -198,7 +198,7 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
 	if (! $errorrecord && $fields[3])
 	{
     	$salesrep=new User($db);
-    	
+
     	$tmp=explode(' ',$fields[3],2);
     	$salesrep->firstname = trim($tmp[0]);
     	$salesrep->lastname = trim($tmp[1]);
@@ -206,7 +206,7 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
     	else $salesrep->login=strtolower($salesrep->firstname);
     	$salesrep->login=preg_replace('/ /','',$salesrep->login);
     	$salesrep->fetch(0,$salesrep->login);
-    
+
     	$result = $object->add_commercial($user, $salesrep->id);
     	if ($result < 0)
     	{
@@ -217,14 +217,14 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
     	{
     	    print " - create link sale representative OK";
     	}
-	}	
+	}
-	
+
 	dol_syslog("Add invoice contacts");
 	// Insert an invoice contact if there is an invoice email != standard email
 	if (! $errorrecord && $fields[27] && $fields[26] != $fields[27])
 	{
 	    $ret1=$ret2=0;
-	    
+
 	    $contact = new Contact($db);
 	    $contact->lastname = $object->name;
 	    $contact->address=$object->address;
@@ -233,7 +233,7 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
 	    $contact->country_id=$object->country_id;
 	    $contact->email=$fields[27];
 	    $contact->socid=$object->id;
-	    
+
 	    $ret1=$contact->create($user);
 	    if ($ret1 > 0)
 	    {
@@ -244,18 +244,18 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
             print " - Error in create contact result code = ".$ret1." ".$ret2." - ".$object->errorsToString();
             $errorrecord++;
         }
-    	else 
+    	else
     	{
     	    print " - create contact OK";
     	}
 	}
-	
+
 	dol_syslog("Add delivery contacts");
 	// Insert a delivery contact
 	if (! $errorrecord && $fields[47])
 	{
 	    $ret1=$ret2=0;
-	    
+
 	    $contact2 = new Contact($db);
 	    $contact2->lastname = 'Service livraison - '.$fields[47];
 	    $contact2->address = $fields[48];
@@ -264,10 +264,10 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
 	    $contact2->country_id=dol_getIdFromCode($db, trim($fields[52]), 'c_country', 'code', 'rowid');
 	    $contact2->note_public=$fields[54];
 	    $contact2->socid=$object->id;
-	    
+
 	    // Extrafields
 	    $contact2->array_options['options_anazoneliv']=price2num($fields[53]);
-	    
+
 	    $ret1=$contact2->create($user);
 	    if ($ret1 > 0)
 	    {
@@ -278,16 +278,16 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
             print " - Error in create contact result code = ".$ret1." ".$ret2." - ".$object->errorsToString();
             $errorrecord++;
         }
-    	else 
+    	else
     	{
     	    print " - create contact OK";
     	}
 	}
-	
+
 
 	print "\n";
-	
+
-	if ($errorrecord) 
+	if ($errorrecord)
 	{
 	    fwrite($fhandleerr, 'Error on record nb '.$i." - ".$object->errorsToString()."\n");
 	    $error++;    // $errorrecord will be reset

dev/resources/iso-normes/code_nace.txt

@@ -0,0 +1 @@
+http://ec.europa.eu/eurostat/ramon/nomenclatures/index.cfm?TargetUrl=LST_CLS_DLD&StrNom=NACE_REV2&StrLanguageCode=FR&StrLayoutCode=#

htdocs/adherents/agenda.php

@@ -87,21 +87,21 @@ if ($object->id > 0)
 
 	dol_fiche_head($head, 'agenda', $langs->trans("Member"), -1, 'user');
 
-	$linkback = '<a href="'.DOL_URL_ROOT.'/adherents/list.php">'.$langs->trans("BackToList").'</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/adherents/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
-	
+
 	dol_banner_tab($object, 'rowid', $linkback);
-    
+
 	print '<div class="fichecenter">';
-	
+
 	print '<div class="underbanner clearboth"></div>';
-	
+
 	$object->info($id);
 	print dol_print_object_info($object, 1);
-	
+
-	print '</div>';	
+	print '</div>';
 
 	dol_fiche_end();
-	
+
 
     /*
      * Barre d'action

htdocs/adherents/card.php

@@ -1431,7 +1431,7 @@ else
 		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) $rowspan++;
 		if (! empty($conf->societe->enabled)) $rowspan++;
 
-		$linkback = '<a href="'.DOL_URL_ROOT.'/adherents/list.php">'.$langs->trans("BackToList").'</a>';
+		$linkback = '<a href="'.DOL_URL_ROOT.'/adherents/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
 		dol_banner_tab($object, 'rowid', $linkback);
 

htdocs/adherents/class/adherent.class.php

@@ -1558,16 +1558,17 @@ class Adherent extends CommonObject
     }
 
     /**
-     *    	Return clicable name (with picto eventually)
+     *  Return clicable name (with picto eventually)
      *
-     *		@param	int		$withpictoimg	0=No picto, 1=Include picto into link, 2=Only picto, -1=Include photo into link, -2=Only picto photo, -3=Only photo very small)
+     *	@param	int		$withpictoimg				0=No picto, 1=Include picto into link, 2=Only picto, -1=Include photo into link, -2=Only picto photo, -3=Only photo very small)
-     *		@param	int		$maxlen			length max label
+     *	@param	int		$maxlen						length max label
-     *		@param	string	$option			Page for link
+     *	@param	string	$option						Page for link
-     *      @param  string  $mode           ''=Show firstname and lastname, 'firstname'=Show only firstname, 'login'=Show login, 'ref'=Show ref
+     *  @param  string  $mode           			''=Show firstname and lastname, 'firstname'=Show only firstname, 'login'=Show login, 'ref'=Show ref
-     *      @param  string  $morecss        Add more css on link
+     *  @param  string  $morecss        			Add more css on link
-     *		@return	string					Chaine avec URL
+     *  @param  int     $save_lastsearch_value    	-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+     *	@return	string								Chaine avec URL
      */
-    function getNomUrl($withpictoimg=0,$maxlen=0,$option='card',$mode='',$morecss='')
+    function getNomUrl($withpictoimg=0, $maxlen=0, $option='card', $mode='', $morecss='', $save_lastsearch_value=-1)
     {
         global $conf, $langs;
 
@@ -1591,15 +1592,24 @@ class Adherent extends CommonObject
             $label.= '<br><b>' . $langs->trans('Name') . ':</b> ' . $this->getFullName($langs);
         $label.='</div>';
 
-        if ($option == 'card' || $option == 'category')
+        if (empty($option) || $option == 'card' || $option == 'category')
         {
-            $link = '<a href="'.DOL_URL_ROOT.'/adherents/card.php?rowid='.$this->id.'"';
+            $url = DOL_URL_ROOT.'/adherents/card.php?rowid='.$this->id;
         }
         if ($option == 'subscription')
         {
-            $link = '<a href="'.DOL_URL_ROOT.'/adherents/subscription.php?rowid='.$this->id.'"';
+            $url = DOL_URL_ROOT.'/adherents/subscription.php?rowid='.$this->id;
         }
 
+        if ($option != 'nolink')
+        {
+        	// Add param to save lastsearch_values or not
+        	$add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
+        	if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
+        	if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
+        }
+
+        $link = '<a href="'.$url.'"';
         $linkclose="";
         if (empty($notooltip))
         {

htdocs/adherents/document.php

@@ -94,7 +94,7 @@ if ($id > 0)
     $result=$membert->fetch($object->typeid);
 	if ($result > 0)
 	{
-			
+
 		// Construit liste des fichiers
 		$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
 		$totalsize=0;
@@ -102,7 +102,7 @@ if ($id > 0)
 		{
 			$totalsize+=$file['size'];
 		}
-	    
+
 	    if (! empty($conf->notification->enabled))
 			$langs->load("mails");
 
@@ -110,12 +110,12 @@ if ($id > 0)
 
 		dol_fiche_head($head, 'document', $langs->trans("Member"), -1, 'user');
 
-    	$linkback = '<a href="'.DOL_URL_ROOT.'/adherents/list.php">'.$langs->trans("BackToList").'</a>';
+    	$linkback = '<a href="'.DOL_URL_ROOT.'/adherents/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
-    	
+
     	dol_banner_tab($object, 'rowid', $linkback);
-        
+
         print '<div class="fichecenter">';
-        
+
         print '<div class="underbanner clearboth"></div>';
 		print '<table class="border centpercent">';
 
@@ -153,7 +153,7 @@ if ($id > 0)
 		print '</table>';
 
 		print '</div>';
-		
+
 		dol_fiche_end();
 
 		$modulepart = 'member';

htdocs/adherents/ldap.php

@@ -93,7 +93,7 @@ $head = member_prepare_head($object);
 
 dol_fiche_head($head, 'ldap', $langs->trans("Member"), 0, 'user');
 
-$linkback = '<a href="'.DOL_URL_ROOT.'/adherents/list.php">'.$langs->trans("BackToList").'</a>';
+$linkback = '<a href="'.DOL_URL_ROOT.'/adherents/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
 dol_banner_tab($object, 'rowid', $linkback);
 

htdocs/adherents/note.php

@@ -74,12 +74,12 @@ if ($id)
 	print "<form method=\"post\" action=\"".$_SERVER['PHP_SELF']."\">";
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 
-	$linkback = '<a href="'.DOL_URL_ROOT.'/adherents/list.php">'.$langs->trans("BackToList").'</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/adherents/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
-	
+
 	dol_banner_tab($object, 'rowid', $linkback);
-    
+
     print '<div class="fichecenter">';
-    
+
     print '<div class="underbanner clearboth"></div>';
 	print '<table class="border centpercent">';
 

htdocs/adherents/subscription.php

@@ -461,7 +461,7 @@ if ($user->rights->adherent->cotisation->creer && $action == 'subscription' && !
                     $paiement = new Paiement($db);
                     $paiement->datepaye     = $paymentdate;
                     $paiement->amounts      = $amounts;
-                    $paiement->paiementid   = dol_getIdFromCode($db,$operation,'c_paiement');
+                    $paiement->paiementid   = dol_getIdFromCode($db,$operation,'c_paiement','code','id',1);
                     $paiement->num_paiement = $num_chq;
                     $paiement->note         = $label;
 
@@ -601,7 +601,7 @@ if ($rowid > 0)
 
     dol_fiche_head($head, 'subscription', $langs->trans("Member"), -1, 'user');
 
-    $linkback = '<a href="'.DOL_URL_ROOT.'/adherents/list.php">'.$langs->trans("BackToList").'</a>';
+    $linkback = '<a href="'.DOL_URL_ROOT.'/adherents/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
     dol_banner_tab($object, 'rowid', $linkback);
 

htdocs/adherents/type.php

@@ -365,7 +365,7 @@ if ($rowid > 0)
 
 		dol_fiche_head($head, 'card', $langs->trans("MemberType"), -1, 'group');
 
-		$linkback = '<a href="'.DOL_URL_ROOT.'/adherents/type.php">'.$langs->trans("BackToList").'</a>';
+		$linkback = '<a href="'.DOL_URL_ROOT.'/adherents/type.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
 		dol_banner_tab($object, 'rowid', $linkback);
 

htdocs/adherents/type_ldap.php

@@ -93,7 +93,7 @@ $head = member_type_prepare_head($object);
 
 dol_fiche_head($head, 'ldap', $langs->trans("MemberType"), -1, 'group');
 
-$linkback = '<a href="'.DOL_URL_ROOT.'/adherents/type.php">'.$langs->trans("BackToList").'</a>';
+$linkback = '<a href="'.DOL_URL_ROOT.'/adherents/type.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
 dol_banner_tab($object, 'rowid', $linkback);
 

htdocs/admin/agenda.php

@@ -80,8 +80,7 @@ if ($action == "save" && empty($cancel))
 	{
 		$param='MAIN_AGENDA_ACTIONAUTO_'.$trigger['code'];
 		//print "param=".$param." - ".$_POST[$param];
-		if (GETPOST($param,'alpha')) $res = dolibarr_set_const($db,$param,GETPOST($param,'alpha'),'chaine',0,'',$conf->entity);
+		$res = dolibarr_set_const($db,$param,(GETPOST($param,'alpha')?GETPOST($param,'alpha'):''),'chaine',0,'',$conf->entity);
-		else $res = dolibarr_del_const($db,$param,$conf->entity);
 		if (! $res > 0) $error++;
 	}
 

htdocs/admin/defaultvalues.php

@@ -269,12 +269,12 @@ if ($mode != 'focus')
 {
     if ($mode != 'sortorder')
     {
-        $substitutionarray=getCommonSubstitutionArray($langs, 0, array('object')); // Must match list into GETPOST
+        $substitutionarray=getCommonSubstitutionArray($langs, 2, array('object','objectamount')); // Must match list into GETPOST
-        $substitutionarray['__(AnyTranslationKey)__']=$langs->trans("Translation");
+		unset($substitutionarray['__USER_SIGNATURE__']);
         $texthelp=$langs->trans("FollowingConstantsWillBeSubstituted").'<br>';
         foreach($substitutionarray as $key => $val)
         {
-            $texthelp.=$key.'<br>';
+            $texthelp.=$key.' -> '.$val.'<br>';
         }
         $textvalue=$form->textwithpicto($langs->trans("Value"), $texthelp, 1, 'help', '', 0, 2, '');    // No tooltip on click, this also triggers the sort click
     }

htdocs/admin/delais.php

@@ -137,7 +137,17 @@ if ($action == 'update')
     	}
 	}
 
-    dolibarr_set_const($db, "MAIN_DISABLE_METEO",$_POST["MAIN_DISABLE_METEO"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_DISABLE_METEO",$_POST["MAIN_DISABLE_METEO"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_USE_METEO_WITH_PERCENTAGE",GETPOST("MAIN_USE_METEO_WITH_PERCENTAGE"),'chaine',0,'',$conf->entity);
+
+	// For update value with percentage
+	$plus='';
+	if(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) $plus = '_PERCENTAGE';
+	// Update values
+	for($i=0;$i<4;$i++) {
+    	if(isset($_POST['MAIN_METEO'.$plus.'_LEVEL'.$i])) dolibarr_set_const($db, 'MAIN_METEO'.$plus.'_LEVEL'.$i, GETPOST('MAIN_METEO'.$plus.'_LEVEL'.$i, 'int'),'chaine',0,'',$conf->entity);
+    }
+
 }
 
 
@@ -196,13 +206,6 @@ if ($action == 'edit')
 	print '<td>'.$langs->trans("MAIN_DISABLE_METEO").'</td><td class="center">' .$form->selectyesno('MAIN_DISABLE_METEO',(empty($conf->global->MAIN_DISABLE_METEO)?0:1),1) . '</td></tr>';
 
 	print '</table>';
-
-	print '<br>';
-
-    print '<br><div class="center"><input type="submit" class="button" value="'.$langs->trans("Save").'"></div>';
-    print '<br>';
-
-    print '</form>';
 }
 else
 {
@@ -244,21 +247,30 @@ else
 
 	print '</table>';
 
-	print '<br>';
-
-    // Boutons d'action
-    print '<div class="tabsAction">';
-    print '<a class="butAction" href="delais.php?action=edit">'.$langs->trans("Modify").'</a>';
-    print '</div>';
-
 }
 
 print '<br>';
 
-
 // Show logo for weather
 print $langs->trans("DescWeather").'<br>';
 
+if($action == 'edit') {
+
+	$str_mode_std = $langs->trans('MeteoStdModEnabled').' : '.$langs->trans('MeteoUseMod', $langs->trans('MeteoPercentageMod'));
+	$str_mode_percentage = $langs->trans('MeteoPercentageModEnabled').' : '.$langs->trans('MeteoUseMod', $langs->trans('MeteoStdMod'));
+	if(empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) $str_mode_enabled = $str_mode_std;
+	else $str_mode_enabled = $str_mode_percentage;
+	print '<a href="#" onclick="return false;" id="change_mode">'.$str_mode_enabled.'</a>';
+	print '<input type="hidden" id="MAIN_USE_METEO_WITH_PERCENTAGE" name="MAIN_USE_METEO_WITH_PERCENTAGE" value="'.$conf->global->MAIN_USE_METEO_WITH_PERCENTAGE.'" />';
+
+	print '<br><br>';
+
+} else {
+	if(empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) print $langs->trans('MeteoStdModEnabled');
+	else print $langs->trans('MeteoPercentageModEnabled');
+	print '<br><br>';
+}
+
 $offset=0;
 $cursor=10; // By default
 //if (! empty($conf->global->MAIN_METEO_OFFSET)) $offset=$conf->global->MAIN_METEO_OFFSET;
@@ -267,36 +279,143 @@ $level0=$offset;           if (! empty($conf->global->MAIN_METEO_LEVEL0)) $level
 $level1=$offset+1*$cursor; if (! empty($conf->global->MAIN_METEO_LEVEL1)) $level1=$conf->global->MAIN_METEO_LEVEL1;
 $level2=$offset+2*$cursor; if (! empty($conf->global->MAIN_METEO_LEVEL2)) $level2=$conf->global->MAIN_METEO_LEVEL2;
 $level3=$offset+3*$cursor; if (! empty($conf->global->MAIN_METEO_LEVEL3)) $level3=$conf->global->MAIN_METEO_LEVEL3;
-$text=''; $options='height="60px"';
+$text=''; $options='class="valignmiddle" height="60px"';
-print '<table>';
-print '<tr>';
-print '<td>';
-print img_weather($text,'weather-clear.png',$options);
-print '</td><td>= '.$level0.'</td>';
-print '<td> &nbsp; &nbsp; &nbsp; &nbsp; </td>';
-print '<td>';
-print img_weather($text,'weather-few-clouds.png',$options);
-print '</td><td>&lt;= '.$level1.'</td>';
-print '<td> &nbsp; &nbsp; &nbsp; &nbsp; </td>';
-print '<td>';
-print img_weather($text,'weather-clouds.png',$options);
-print '</td><td>&lt;= '.$level2.'</td>';
-print '</tr>';
 
-print '<tr><td>';
-print img_weather($text,'weather-many-clouds.png',$options);
-print '</td><td>&lt;= '.$level3.'</td>';
-print '<td> &nbsp; &nbsp; &nbsp; &nbsp; </td>';
-print '<td>';
-print img_weather($text,'weather-storm.png',$options);
-print '</td><td>&gt; '.$level3.'</td>';
-print '<td> &nbsp; &nbsp; &nbsp; &nbsp; </td>';
-print '<td> &nbsp; &nbsp; &nbsp; &nbsp; </td>';
-print '<td> &nbsp; &nbsp; &nbsp; &nbsp; </td>';
-print '</tr>';
 
-print '</table>';
+if ($action == 'edit') {
 
 
+	print '<div id="standard" '.(empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE) ? '' : 'style="display:none;"').'>';
+
+	print '<div>';
+	print '<div class="inline-block" style="padding-right: 20px">';
+	print img_weather($text,'weather-clear.png', $options);
+	print '= <input type="text" size="2" name="MAIN_METEO_LEVEL0" value="'.$level0.'"/></td>';
+	print '</div><div class="inline-block" style="padding-right: 20px">';
+	print img_weather($text,'weather-few-clouds.png',$options);
+	print '&lt;= <input type="text" size="2" name="MAIN_METEO_LEVEL1" value="'.$level1.'"/></td>';
+	print '</div><div class="inline-block" style="padding-right: 20px">';
+	print img_weather($text,'weather-clouds.png',$options);
+	print '&lt;= <input type="text" size="2" name="MAIN_METEO_LEVEL2" value="'.$level2.'"/></td>';
+	print '</div><div class="inline-block" style="padding-right: 20px">';
+	print img_weather($text,'weather-many-clouds.png',$options);
+	print '&lt;= <input type="text" size="2" name="MAIN_METEO_LEVEL3" value="'.$level3.'"/></td>';
+	print '</div>';
+	print '</div>';
+
+	print '</div>';
+
+	print '<div id="percentage" '.(empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE) ? 'style="display:none;"' : '').'>';
+
+	print '<div>';
+	print '<div class="inline-block" style="padding-right: 20px">';
+	print img_weather($text,'weather-clear.png',$options);
+	print '= <input type="text" size="2" name="MAIN_METEO_PERCENTAGE_LEVEL0" value="'.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL0.'"/>&nbsp;%</td>';
+	print '</div><div class="inline-block" style="padding-right: 20px">';
+	print img_weather($text,'weather-few-clouds.png',$options);
+	print '&lt;= <input type="text" size="2" name="MAIN_METEO_PERCENTAGE_LEVEL1" value="'.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL1.'"/>&nbsp;%</td>';
+	print '</div><div class="inline-block" style="padding-right: 20px">';
+	print img_weather($text,'weather-clouds.png',$options);
+	print '&lt;= <input type="text" size="2" name="MAIN_METEO_PERCENTAGE_LEVEL2" value="'.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL2.'"/>&nbsp;%</td>';
+	print '</div><div class="inline-block" style="padding-right: 20px">';
+	print img_weather($text,'weather-many-clouds.png',$options);
+	print '&lt;= <input type="text" size="2" name="MAIN_METEO_PERCENTAGE_LEVEL3" value="'.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL3.'"/>&nbsp;%</td>';
+	print '</div>';
+	print '</div>';
+
+	print '</div>';
+
+	?>
+
+	<script type="text/javascript">
+
+		$(document).ready(function() {
+
+			$("#change_mode").click(function() {
+				var use_percent = $("#MAIN_USE_METEO_WITH_PERCENTAGE");
+				var str_mode_std = "<?php print $str_mode_std; ?>";
+				var str_mode_percentage = "<?php print $str_mode_percentage; ?>";
+
+				if(use_percent.val() == 1) {
+					use_percent.val(0);
+					$("#standard").show();
+					$("#percentage").hide();
+					$(this).html(str_mode_std);
+				} else {
+					use_percent.val(1);
+					$("#standard").hide();
+					$("#percentage").show();
+					$(this).html(str_mode_percentage);
+				}
+			});
+
+		});
+
+	</script>
+
+	<?php
+
+} else {
+
+	if(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) {
+
+		print '<div>';
+		print '<div class="inline-block" style="padding-right: 20px">';
+		print img_weather($text,'weather-clear.png',$options);
+		print '= '.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL0.'&nbsp;%</td>';
+		print '</div><div class="inline-block" style="padding-right: 20px">';
+		print img_weather($text,'weather-few-clouds.png',$options);
+		print '&lt;= '.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL1.'&nbsp;%</td>';
+		print '</div><div class="inline-block" style="padding-right: 20px">';
+		print img_weather($text,'weather-clouds.png',$options);
+		print '&lt;= '.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL2.'&nbsp;%</td>';
+		print '</div><div class="inline-block" style="padding-right: 20px">';
+		print img_weather($text,'weather-many-clouds.png',$options);
+		print '&lt;= '.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL3.'&nbsp;%</td>';
+		print '</div><div class="inline-block" style="padding-right: 20px">';
+		print img_weather($text,'weather-storm.png',$options);
+		print '&gt; '.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL3.'&nbsp;%</td>';
+		print '</div>';
+		print '</div>';
+
+	} else {
+
+		print '<div>';
+		print '<div class="inline-block" style="padding-right: 20px">';
+		print img_weather($text,'weather-clear.png',$options);
+		print '= '.$level0;
+		print '</div><div class="inline-block" style="padding-right: 20px">';
+		print img_weather($text,'weather-few-clouds.png',$options);
+		print '&lt;= '.$level1;
+		print '</div><div class="inline-block" style="padding-right: 20px">';
+		print img_weather($text,'weather-clouds.png',$options);
+		print '&lt;= '.$level2;
+		print '</div><div class="inline-block" style="padding-right: 20px">';
+		print img_weather($text,'weather-many-clouds.png',$options);
+		print '&lt;= '.$level3;
+		print '</div><div class="inline-block" style="padding-right: 20px">';
+		print img_weather($text,'weather-storm.png',$options);
+		print '&gt; '.$level3;
+		print '</div>';
+		print '</div>';
+
+	}
+}
+
+print '</div>';
+
+if($action == 'edit') {
+
+	print '<br><div class="center"><input type="submit" class="button" value="'.$langs->trans("Save").'"></div>';
+	print '<br></form>';
+
+} else {
+
+	// Boutons d'action
+	print '<br><div class="tabsAction">';
+	print '<a class="butAction" href="delais.php?action=edit">'.$langs->trans("Modify").'</a></div>';
+
+}
+
 llxFooter();
 $db->close();

htdocs/admin/dict.php

@@ -1,16 +1,16 @@
 <?php
-/* Copyright (C) 2004       Rodolphe Quiedeville    <rodolphe@quiedeville.org>
+/* Copyright (C) 2004		Rodolphe Quiedeville	<rodolphe@quiedeville.org>
- * Copyright (C) 2004-2015  Laurent Destailleur     <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2015	Laurent Destailleur		<eldy@users.sourceforge.net>
- * Copyright (C) 2004       Benoit Mortier          <benoit.mortier@opensides.be>
+ * Copyright (C) 2004		Benoit Mortier			<benoit.mortier@opensides.be>
- * Copyright (C) 2005-2012  Regis Houssin           <regis.houssin@capnetworks.com>
+ * Copyright (C) 2005-2017	Regis Houssin			<regis.houssin@capnetworks.com>
- * Copyright (C) 2010-2016  Juanjo Menent           <jmenent@2byte.es>
+ * Copyright (C) 2010-2016	Juanjo Menent			<jmenent@2byte.es>
- * Copyright (C) 2011-2015  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) 2011		Remy Younes				<ryounes@gmail.com>
- * Copyright (C) 2012-2015  Marcos García           <marcosgdf@gmail.com>
+ * Copyright (C) 2012-2015	Marcos García			<marcosgdf@gmail.com>
- * Copyright (C) 2012       Christophe Battarel     <christophe.battarel@ltairis.fr>
+ * Copyright (C) 2012		Christophe Battarel		<christophe.battarel@ltairis.fr>
- * Copyright (C) 2011-2016  Alexandre Spangaro      <aspangaro.dolibarr@gmail.com>
+ * Copyright (C) 2011-2016	Alexandre Spangaro		<aspangaro.dolibarr@gmail.com>
- * Copyright (C) 2015       Ferran Marcet           <fmarcet@2byte.es>
+ * Copyright (C) 2015		Ferran Marcet			<fmarcet@2byte.es>
- * Copyright (C) 2016       Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
+ * Copyright (C) 2016		Raphaël Doursenaud		<rdoursenaud@gpcsolutions.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -54,6 +54,7 @@ $action=GETPOST('action','alpha')?GETPOST('action','alpha'):'view';
 $confirm=GETPOST('confirm','alpha');
 $id=GETPOST('id','int');
 $rowid=GETPOST('rowid','alpha');
+$entity=GETPOST('entity','int');
 $code=GETPOST('code','alpha');
 
 $allowed=$user->admin;
@@ -181,8 +182,8 @@ $tabsql[8] = "SELECT t.id	 as rowid, t.code as code, t.libelle, t.fk_country as
 $tabsql[9] = "SELECT c.code_iso as code, c.label, c.unicode, c.active FROM ".MAIN_DB_PREFIX."c_currencies AS c";
 $tabsql[10]= "SELECT t.rowid, t.code, t.taux, t.localtax1_type, t.localtax1, t.localtax2_type, t.localtax2, c.label as country, c.code as country_code, t.fk_pays as country_id, t.recuperableonly, t.note, t.active, t.accountancy_code_sell, t.accountancy_code_buy FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c WHERE t.fk_pays=c.rowid";
 $tabsql[11]= "SELECT t.rowid as rowid, t.element, t.source, t.code, t.libelle, t.position, t.active FROM ".MAIN_DB_PREFIX."c_type_contact AS t";
-$tabsql[12]= "SELECT c.rowid as rowid, c.code, c.libelle, c.libelle_facture, c.nbjour, c.type_cdr, c.decalage, c.active, c.sortorder FROM ".MAIN_DB_PREFIX.'c_payment_term AS c';
+$tabsql[12]= "SELECT c.rowid as rowid, c.code, c.libelle, c.libelle_facture, c.nbjour, c.type_cdr, c.decalage, c.active, c.sortorder, c.entity FROM ".MAIN_DB_PREFIX."c_payment_term AS c WHERE c.entity = " . getEntity($tabname[12]);
-$tabsql[13]= "SELECT c.id    as rowid, c.code, c.libelle, c.type, c.active, c.accountancy_code FROM ".MAIN_DB_PREFIX."c_paiement AS c";
+$tabsql[13]= "SELECT c.id    as rowid, c.code, c.libelle, c.type, c.active, c.accountancy_code, c.entity FROM ".MAIN_DB_PREFIX."c_paiement AS c WHERE c.entity = " . getEntity($tabname[13]);
 $tabsql[14]= "SELECT e.rowid as rowid, e.code as code, e.libelle, e.price, e.organization, e.fk_pays as country_id, c.code as country_code, c.label as country, e.active FROM ".MAIN_DB_PREFIX."c_ecotaxe AS e, ".MAIN_DB_PREFIX."c_country as c WHERE e.fk_pays=c.rowid and c.active=1";
 $tabsql[15]= "SELECT rowid   as rowid, code, label as libelle, width, height, unit, active FROM ".MAIN_DB_PREFIX."c_paper_format";
 $tabsql[16]= "SELECT code, label as libelle, sortorder, active FROM ".MAIN_DB_PREFIX."c_prospectlevel";
@@ -259,8 +260,8 @@ $tabfield[8] = "code,libelle,country_id,country".(! empty($conf->global->SOCIETE
 $tabfield[9] = "code,label,unicode";
 $tabfield[10]= "country_id,country,code,taux,localtax1_type,localtax1,localtax2_type,localtax2,recuperableonly,accountancy_code_sell,accountancy_code_buy,note";
 $tabfield[11]= "element,source,code,libelle,position";
-$tabfield[12]= "code,libelle,libelle_facture,nbjour,type_cdr,decalage,sortorder";
+$tabfield[12]= "code,libelle,libelle_facture,nbjour,type_cdr,decalage,sortorder,entity";
-$tabfield[13]= "code,libelle,type,accountancy_code";
+$tabfield[13]= "code,libelle,type,accountancy_code,entity";
 $tabfield[14]= "code,libelle,price,organization,country_id,country";
 $tabfield[15]= "code,libelle,width,height,unit";
 $tabfield[16]= "code,libelle,sortorder";
@@ -335,8 +336,8 @@ $tabfieldinsert[8] = "code,libelle,fk_country".(! empty($conf->global->SOCIETE_S
 $tabfieldinsert[9] = "code_iso,label,unicode";
 $tabfieldinsert[10]= "fk_pays,code,taux,localtax1_type,localtax1,localtax2_type,localtax2,recuperableonly,accountancy_code_sell,accountancy_code_buy,note";
 $tabfieldinsert[11]= "element,source,code,libelle,position";
-$tabfieldinsert[12]= "code,libelle,libelle_facture,nbjour,type_cdr,decalage,sortorder";
+$tabfieldinsert[12]= "code,libelle,libelle_facture,nbjour,type_cdr,decalage,sortorder,entity";
-$tabfieldinsert[13]= "code,libelle,type,accountancy_code";
+$tabfieldinsert[13]= "code,libelle,type,accountancy_code,entity";
 $tabfieldinsert[14]= "code,libelle,price,organization,fk_pays";
 $tabfieldinsert[15]= "code,label,width,height,unit";
 $tabfieldinsert[16]= "code,label,sortorder";
@@ -733,7 +734,7 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
             	$_POST[$listfieldvalue[$i]] = price2num($_POST[$listfieldvalue[$i]],'MU');
             }
             else if ($value == 'entity') {
-            	$_POST[$listfieldvalue[$i]] = $conf->entity;
+            	$_POST[$listfieldvalue[$i]] = getEntity($tabname[$id]);
             }
             if ($i) $sql.=",";
             if ($listfieldvalue[$i] == 'sortorder')		// For column name 'sortorder', we use the field name 'position'
@@ -785,7 +786,7 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
             	$_POST[$listfieldvalue[$i]] = price2num($_POST[$listfieldvalue[$i]],'MU');
             }
             else if ($field == 'entity') {
-            	$_POST[$listfieldvalue[$i]] = $conf->entity;
+            	$_POST[$listfieldvalue[$i]] = getEntity($tabname[$id]);
             }
             if ($i) $sql.=",";
             $sql.= $field."=";
@@ -798,6 +799,7 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
             $i++;
         }
         $sql.= " WHERE ".$rowidcol." = '".$rowid."'";
+        $sql.= " AND entity = '".getEntity($tabname[$id])."'";
 
         dol_syslog("actionmodify", LOG_DEBUG);
         //print $sql;
@@ -820,7 +822,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes')       // delete
     if ($tabrowid[$id]) { $rowidcol=$tabrowid[$id]; }
     else { $rowidcol="rowid"; }
 
-    $sql = "DELETE from ".$tabname[$id]." WHERE ".$rowidcol."='".$rowid."'";
+    $sql = "DELETE FROM ".$tabname[$id]." WHERE ".$rowidcol."='".$rowid."'".($entity != '' ? " AND entity = " . (int) $entity : '');
 
     dol_syslog("delete", LOG_DEBUG);
     $result = $db->query($sql);
@@ -844,10 +846,10 @@ if ($action == $acts[0])
     else { $rowidcol="rowid"; }
 
     if ($rowid) {
-        $sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE ".$rowidcol."='".$rowid."'";
+    	$sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE ".$rowidcol."='".$rowid."'".($entity != '' ? " AND entity = " . (int) $entity : '');
     }
     elseif ($code) {
-        $sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE code='".dol_escape_htmltag($code)."'";
+    	$sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE code='".dol_escape_htmltag($code)."'".($entity != '' ? " AND entity = " . (int) $entity : '');
     }
 
     $result = $db->query($sql);
@@ -864,10 +866,10 @@ if ($action == $acts[1])
     else { $rowidcol="rowid"; }
 
     if ($rowid) {
-        $sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE ".$rowidcol."='".$rowid."'";
+    	$sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE ".$rowidcol."='".$rowid."'".($entity != '' ? " AND entity = " . (int) $entity : '');
     }
     elseif ($code) {
-        $sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE code='".dol_escape_htmltag($code)."'";
+    	$sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE code='".dol_escape_htmltag($code)."'".($entity != '' ? " AND entity = " . (int) $entity : '');
     }
 
     $result = $db->query($sql);
@@ -884,10 +886,10 @@ if ($action == 'activate_favorite')
     else { $rowidcol="rowid"; }
 
     if ($rowid) {
-        $sql = "UPDATE ".$tabname[$id]." SET favorite = 1 WHERE ".$rowidcol."='".$rowid."'";
+    	$sql = "UPDATE ".$tabname[$id]." SET favorite = 1 WHERE ".$rowidcol."='".$rowid."'".($entity != '' ? " AND entity = " . (int) $entity : '');
     }
     elseif ($code) {
-        $sql = "UPDATE ".$tabname[$id]." SET favorite = 1 WHERE code='".dol_escape_htmltag($code)."'";
+    	$sql = "UPDATE ".$tabname[$id]." SET favorite = 1 WHERE code='".dol_escape_htmltag($code)."'".($entity != '' ? " AND entity = " . (int) $entity : '');
     }
 
     $result = $db->query($sql);
@@ -904,10 +906,10 @@ if ($action == 'disable_favorite')
     else { $rowidcol="rowid"; }
 
     if ($rowid) {
-        $sql = "UPDATE ".$tabname[$id]." SET favorite = 0 WHERE ".$rowidcol."='".$rowid."'";
+    	$sql = "UPDATE ".$tabname[$id]." SET favorite = 0 WHERE ".$rowidcol."='".$rowid."'".($entity != '' ? " AND entity = " . (int) $entity : '');
     }
     elseif ($code) {
-        $sql = "UPDATE ".$tabname[$id]." SET favorite = 0 WHERE code='".dol_escape_htmltag($code)."'";
+    	$sql = "UPDATE ".$tabname[$id]." SET favorite = 0 WHERE code='".dol_escape_htmltag($code)."'".($entity != '' ? " AND entity = " . (int) $entity : '');
     }
 
     $result = $db->query($sql);
@@ -959,6 +961,7 @@ print "<br>\n";
 $param = '&id='.$id;
 if ($search_country_id > 0) $param.= '&search_country_id='.$search_country_id;
 if ($search_code != '')     $param.= '&search_code='.urlencode($search_country_id);
+if ($entity != '') $param.= '&entity=' . (int) $entity;
 $paramwithsearch = $param;
 if ($sortorder) $paramwithsearch.= '&sortorder='.$sortorder;
 if ($sortfield) $paramwithsearch.= '&sortfield='.$sortfield;
@@ -1016,6 +1019,7 @@ if ($id)
     if ($tabname[$id])
     {
         $alabelisused=0;
+        $withentity=null;
 
         $fieldlist=explode(',',$tabfield[$id]);
 
@@ -1026,6 +1030,11 @@ if ($id)
         print '<tr class="liste_titre">';
         foreach ($fieldlist as $field => $value)
         {
+        	if ($fieldlist[$field] == 'entity') {
+        		$withentity = getEntity($tabname[$id]);
+        		continue;
+        	}
+
             // Determine le nom du champ par rapport aux noms possibles
             // dans les dictionnaires de donnees
             $valuetoshow=ucfirst($fieldlist[$field]);   // Par defaut
@@ -1119,6 +1128,8 @@ if ($id)
         if ($id == 4) print '<td></td>';
         print '<td>';
         print '<input type="hidden" name="id" value="'.$id.'">';
+        if (! is_null($withentity))
+        	print '<input type="hidden" name="entity" value="'.$withentity.'">';
         print '</td>';
         print '<td style="min-width: 26px;"></td>';
         print '<td style="min-width: 26px;"></td>';
@@ -1197,7 +1208,9 @@ if ($id)
         $filterfound=0;
         foreach ($fieldlist as $field => $value)
         {
-            $showfield=1;							  	// By defaut
+        	if ($fieldlist[$field] == 'entity') continue;
+
+            $showfield=1;	// By default
 
             if ($fieldlist[$field]=='region_id' || $fieldlist[$field]=='country_id') { $showfield=0; }
 
@@ -1239,6 +1252,8 @@ if ($id)
         print '<tr class="liste_titre">';
         foreach ($fieldlist as $field => $value)
         {
+        	if ($fieldlist[$field] == 'entity') continue;
+
             // Determine le nom du champ par rapport aux noms possibles
             // dans les dictionnaires de donnees
             $showfield=1;							  	// By defaut
@@ -1349,12 +1364,16 @@ if ($id)
                     $error=$hookmanager->error; $errors=$hookmanager->errors;
 
                     // Show fields
-                    if (empty($reshook)) fieldList($fieldlist, $obj, $tabname[$id], 'edit');
+                    if (empty($reshook)) {
+                    	$withentity = fieldList($fieldlist, $obj, $tabname[$id], 'edit');
+                    }
 
                     print '<td colspan="3" align="center">';
                     print '<div name="'.(! empty($obj->rowid)?$obj->rowid:$obj->code).'"></div>';
                     print '<input type="hidden" name="page" value="'.$page.'">';
                     print '<input type="hidden" name="rowid" value="'.$rowid.'">';
+                    if (! is_null($withentity))
+                    	print '<input type="hidden" name="entity" value="'.$withentity.'">';
                     print '<input type="submit" class="button" name="actionmodify" value="'.$langs->trans("Modify").'">';
                     print '<input type="submit" class="button" name="actioncancel" value="'.$langs->trans("Cancel").'">';
                     print '</td>';
@@ -1369,11 +1388,19 @@ if ($id)
 
                     if (empty($reshook))
                     {
+                    	$withentity=null;
+
                         foreach ($fieldlist as $field => $value)
                         {
-                            $showfield=1;
+                        	$showfield=1;
                         	$align="left";
-                            $valuetoshow=$obj->{$fieldlist[$field]};
+                        	$valuetoshow=$obj->{$fieldlist[$field]};
+
+                        	if ($fieldlist[$field] == 'entity') {
+                        		$withentity = $valuetoshow;
+                        		continue;
+                        	}
+
                             if ($value == 'element')
                             {
                                 $valuetoshow = isset($elementList[$valuetoshow])?$elementList[$valuetoshow]:$valuetoshow;
@@ -1588,7 +1615,8 @@ if ($id)
                     // If rowidcol not defined
                     if (empty($rowidcol) || in_array($id, array(6,7,8,13,17,19,27))) $rowidcol='rowid';
                     $url = $_SERVER["PHP_SELF"].'?'.($page?'page='.$page.'&':'').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.((! empty($obj->{$rowidcol}) || $obj->{$rowidcol} == '0')?$obj->{$rowidcol}:(! empty($obj->code)?urlencode($obj->code):'')).'&code='.(! empty($obj->code)?urlencode($obj->code):'');
-                    if ($param) $url .= '&'.$param;
+                    if (! empty($param)) $url .= '&'.$param;
+                    if (! is_null($withentity)) $url .= '&entity='.$withentity;
                     $url.='&';
 
 					// Favorite
@@ -1735,8 +1763,15 @@ function fieldList($fieldlist, $obj='', $tabname='', $context='')
 	$formcompany = new FormCompany($db);
 	if (! empty($conf->accounting->enabled)) $formaccounting = new FormAccounting($db);
 
+	$withentity=null;
+
 	foreach ($fieldlist as $field => $value)
 	{
+		if ($fieldlist[$field] == 'entity') {
+			$withentity = $obj->{$fieldlist[$field]};
+			continue;
+		}
+
 	    if (in_array($fieldlist[$field], array('code', 'libelle', 'type')) && $tabname == MAIN_DB_PREFIX."c_actioncomm" && in_array($obj->type, array('system','systemauto')))
         {
             $hidden = (! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:'');
@@ -1948,5 +1983,7 @@ function fieldList($fieldlist, $obj='', $tabname='', $context='')
 			print '</td>';
 		}
 	}
+
+	return $withentity;
 }
 

htdocs/admin/security_file.php

@@ -1,7 +1,7 @@
 <?php
-/* Copyright (C) 2004-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2004-2017	Laurent Destailleur	<eldy@users.sourceforge.net>
- * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2005-2017	Regis Houssin		<regis.houssin@capnetworks.com>
- * Copyright (C) 2013      Juanjo Menent 		<jmenent@2byte.es>
+ * Copyright (C) 2013		Juanjo Menent		<jmenent@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -54,7 +54,7 @@ if (GETPOST('sendit') && ! empty($conf->global->MAIN_UPLOAD_DOC))
 if (preg_match('/set_(.*)/',$action,$reg))
 {
 	$code=$reg[1];
-	$value=(GETPOST($code) ? GETPOST($code) : 1);
+	$value=(GETPOST($code, 'alpha') ? GETPOST($code, 'alpha') : 1);
 	if (dolibarr_set_const($db, $code, $value, 'chaine', 0, '', $conf->entity) > 0)
 	{
 		Header("Location: ".$_SERVER["PHP_SELF"]);
@@ -82,10 +82,10 @@ else if (preg_match('/del_(.*)/',$action,$reg))
 
 else if ($action == 'updateform')
 {
-	$res3=dolibarr_set_const($db, 'MAIN_UPLOAD_DOC',$_POST["MAIN_UPLOAD_DOC"],'chaine',0,'',$conf->entity);
+	$res3=dolibarr_set_const($db, 'MAIN_UPLOAD_DOC',GETPOST('MAIN_UPLOAD_DOC','alpha'),'chaine',0,'',$conf->entity);
-    $res4=dolibarr_set_const($db, "MAIN_UMASK", $_POST["MAIN_UMASK"],'chaine',0,'',$conf->entity);
+	$res4=dolibarr_set_const($db, "MAIN_UMASK", GETPOST('MAIN_UMASK','alpha'),'chaine',0,'',$conf->entity);
-    $res5=dolibarr_set_const($db, "MAIN_ANTIVIRUS_COMMAND", $_POST["MAIN_ANTIVIRUS_COMMAND"],'chaine',0,'',$conf->entity);
+	$res5=dolibarr_set_const($db, "MAIN_ANTIVIRUS_COMMAND", trim(GETPOST('MAIN_ANTIVIRUS_COMMAND','none')),'chaine',0,'',$conf->entity);    // Use GETPOST none because we must accept "
-    $res6=dolibarr_set_const($db, "MAIN_ANTIVIRUS_PARAM", $_POST["MAIN_ANTIVIRUS_PARAM"],'chaine',0,'',$conf->entity);
+	$res6=dolibarr_set_const($db, "MAIN_ANTIVIRUS_PARAM", trim(GETPOST('MAIN_ANTIVIRUS_PARAM','none')),'chaine',0,'',$conf->entity);	// Use GETPOST none because we must accept "
 	if ($res3 && $res4 && $res5 && $res6) setEventMessages($langs->trans("RecordModifiedSuccessfully"), null, 'mesgs');
 }
 
@@ -178,7 +178,7 @@ if (ini_get('safe_mode') && ! empty($conf->global->MAIN_ANTIVIRUS_COMMAND))
         dol_syslog("safe_mode is on, basedir is ".$basedir.", safe_mode_exec_dir is ".ini_get('safe_mode_exec_dir'), LOG_WARNING);
     }
 }
-print '<input type="text" name="MAIN_ANTIVIRUS_COMMAND" class="minwidth500imp" value="'.(! empty($conf->global->MAIN_ANTIVIRUS_COMMAND)?dol_htmlentities($conf->global->MAIN_ANTIVIRUS_COMMAND):'').'">';
+print '<input type="text" name="MAIN_ANTIVIRUS_COMMAND" class="minwidth500imp" value="'.(! empty($conf->global->MAIN_ANTIVIRUS_COMMAND)?dol_escape_htmltag($conf->global->MAIN_ANTIVIRUS_COMMAND):'').'">';
 print "</td>";
 print '</tr>';
 
@@ -189,7 +189,7 @@ print '<td colspan="2">'.$langs->trans("AntiVirusParam").'<br>';
 print $langs->trans("AntiVirusParamExample");
 print '</td>';
 print '<td>';
-print '<input type="text" name="MAIN_ANTIVIRUS_PARAM" class="minwidth500imp" value="'.(! empty($conf->global->MAIN_ANTIVIRUS_PARAM)?dol_htmlentities($conf->global->MAIN_ANTIVIRUS_PARAM):'').'">';
+print '<input type="text" name="MAIN_ANTIVIRUS_PARAM" class="minwidth500imp" value="'.(! empty($conf->global->MAIN_ANTIVIRUS_PARAM)?dol_escape_htmltag($conf->global->MAIN_ANTIVIRUS_PARAM):'').'">';
 print "</td>";
 print '</tr>';
 

htdocs/api/class/api.class.php

@@ -56,9 +56,14 @@ class DolibarrApi
         $this->db = $db;
         $production_mode = ( empty($conf->global->API_PRODUCTION_MODE) ? false : true );
         $this->r = new Restler($production_mode, $refreshCache);
+
         $urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
         $urlwithroot=$urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
-	$this->r->setBaseUrls(DOL_MAIN_URL_ROOT, $urlwithroot);
+
+        $urlwithouturlrootautodetect=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim(DOL_MAIN_URL_ROOT));
+        $urlwithrootautodetect=$urlwithouturlroot.DOL_URL_ROOT; // This is to use local domain autodetected by dolibarr from url
+
+        $this->r->setBaseUrls($urlwithouturlroot, $urlwithouturlrootautodetect);
         $this->r->setAPIVersion(1);
     }
 

htdocs/api/class/api_dictionary.class.php

@@ -1,5 +1,9 @@
 <?php
-/* Copyright (C) 2017	Neil Orley	<neil.orley@oeris.fr>
+/* Copyright (C) 2016   Xebax Christy           <xebax@wanadoo.fr>
+ * Copyright (C) 2016	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2017	Regis Houssin	<regis.houssin@capnetworks.com>
+ * Copyright (C) 2017	Neil Orley	<neil.orley@oeris.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
@@ -21,7 +25,7 @@ require_once DOL_DOCUMENT_ROOT.'/main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/ccountry.class.php';
 
 /**
- * API class for payment type (content of the paiement dictionary)
+ * API class for dictionaries
  *
  * @access protected
  * @class DolibarrApiAccess {@requires user,external}
@@ -47,13 +51,14 @@ class Dictionary extends DolibarrApi
      * @param int       $limit      Number of items per page
      * @param int       $page       Page number {@min 0}
      * @param int       $active     Payment type is active or not {@min 0} {@max 1}
-     * @param string    $sqlfilters SQL criteria to filter. Syntax example "(t.code:=:'CHQ')"
+     * @param string    $sqlfilters SQL criteria to filter with. Syntax example "(t.code:=:'CHQ')"
      * 
-     * @url     GET payments
+     * @url     GET payment/types
      *
-     * @return List of payment types
+     * @return array [List of payment types]
-     *
+     *     
-     * @throws RestException
+     * @throws 400 RestException
+     * @throws 200 OK
      */
     function getPaymentTypes($sortfield = "code", $sortorder = 'ASC', $limit = 100, $page = 0, $active = 1, $sqlfilters = '')
     {
@@ -67,9 +72,9 @@ class Dictionary extends DolibarrApi
         {
             if (! DolibarrApi::_checkFilters($sqlfilters))
             {
-                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+                throw new RestException(400, 'error when validating parameter sqlfilters '.$sqlfilters);
             }
-	        $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+	          $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
             $sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
         }
 
@@ -94,7 +99,7 @@ class Dictionary extends DolibarrApi
                 $list[] = $this->db->fetch_object($result);
             }
         } else {
-            throw new RestException(503, 'Error when retrieving list of payment types : '.$this->db->lasterror());
+            throw new RestException(400, $this->db->lasterror());
         }
 
         return $list;
@@ -447,6 +452,68 @@ class Dictionary extends DolibarrApi
         }
         
         return $list;
-    }       
+    } 
+
+    /**
+     * Get the list of payments terms.
+     *
+     * @param string    $sortfield  Sort field
+     * @param string    $sortorder  Sort order
+     * @param int       $limit      Number of items per page
+     * @param int       $page       Page number {@min 0}
+     * @param int       $active     Payment term is active or not {@min 0} {@max 1}
+     * @param string    $sqlfilters SQL criteria to filter. Syntax example "(t.code:=:'CHQ')"
+     *
+     * @url     GET payment/terms
+     *
+     * @return array List of payment terms
+     *
+     * @throws 400 RestException
+     * @throws 200 OK
+     */
+    function getPaymentTerms($sortfield = "sortorder", $sortorder = 'ASC', $limit = 100, $page = 0, $active = 1, $sqlfilters = '')
+    {
+        $list = array();
+
+        $sql = "SELECT rowid as id, code, sortorder, libelle as label, libelle_facture as descr, type_cdr, nbjour, decalage, module";
+        $sql.= " FROM ".MAIN_DB_PREFIX."c_payment_term as t";
+        $sql.= " WHERE t.active = ".$active;
+        // Add sql filters
+        if ($sqlfilters)
+        {
+            if (! DolibarrApi::_checkFilters($sqlfilters))
+            {
+                throw new RestException(400, 'Error when validating parameter sqlfilters '.$sqlfilters);
+            }
+                $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+            $sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+        }
+
+
+        $sql.= $this->db->order($sortfield, $sortorder);
+
+        if ($limit) {
+            if ($page < 0) {
+                $page = 0;
+            }
+            $offset = $limit * $page;
+
+            $sql .= $this->db->plimit($limit, $offset);
+        }
+
+        $result = $this->db->query($sql);
+
+        if ($result) {
+            $num = $this->db->num_rows($result);
+            $min = min($num, ($limit <= 0 ? $num : $limit));
+            for ($i = 0; $i < $min; $i++) {
+                $list[] = $this->db->fetch_object($result);
+            }
+        } else {
+            throw new RestException(400, $this->db->lasterror());
+        }
+
+        return $list;
+    }
 
 }

htdocs/api/class/api_documents.class.php

@@ -22,6 +22,7 @@ use Luracast\Restler\Format\UploadFormat;
 
 
 require_once DOL_DOCUMENT_ROOT.'/main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 /**
  * API class for receive files
@@ -54,13 +55,57 @@ class Documents extends DolibarrApi
      *
      * @param   string  $module_part    Name of module or area concerned by file download ('facture', ...)
      * @param   string  $ref            Reference of object (This will define subdir automatically)
-     * @param   string  $subdir         Subdirectory (Only if ref not provided)
+     * @param   string  $subdir         NOT YET AVAILABLE : Subdirectory (Only if ref not provided)
      * @return  array                   List of documents
      *
-     * @throws RestException
+     * @throws 400
+     * @throws 401
+     * @throws 200 OK
      */
     public function index($module_part, $ref='', $subdir='') {
-        return array('note'=>'FeatureNotYetAvailable');
+	global $conf;
+
+	if (empty($module_part)) {
+            throw new RestException(400, 'bad value for parameter modulepart');
+	}
+        if (empty($ref) && empty($subdir)) {
+            throw new RestException(400, 'bad value for parameter ref or subdir');
+        }
+        if (empty($ref)) {
+            throw new RestException(404, 'FeatureNotYetAvailable');
+        }
+	if (!DolibarrApiAccess::$user->rights->ecm->read) {
+            throw new RestException(401);
+        }
+
+	$original_file = str_replace("../","/", $ref.'/'.$ref.'.pdf');
+	$refname=basename(dirname($original_file)."/");
+	$entity=$conf->entity;
+
+	$check_access = dol_check_secure_access_document($module_part,$original_file,$entity,DolibarrApiAccess::$user);
+	$accessallowed              = $check_access['accessallowed'];
+	$sqlprotectagainstexternals = $check_access['sqlprotectagainstexternals'];
+	$original_file              = $check_access['original_file'];
+
+	if (preg_match('/\.\./',$original_file) || preg_match('/[<>|]/',$original_file))
+	{
+	    throw new RestException(401);
+	}
+        if (!$accessallowed) {
+            throw new RestException(401);
+        }
+
+
+	$filename = basename($original_file);
+	$original_file_osencoded=dol_osencode($original_file);	// New file name encoded in OS encoding charset
+
+	if (! file_exists($original_file_osencoded))
+	{
+	    throw new RestException(404, 'File not found');
+	}
+
+	$file_content=file_get_contents($original_file_osencoded);
+        return array('filename'=>$filename, 'content'=>base64_encode($file_content), 'encoding'=>'MIME base64 (base64_encode php function, http://php.net/manual/en/function.base64-encode.php)' );
     }
     
     

htdocs/cashdesk/validation_verif.php

@@ -136,7 +136,7 @@ switch ($action)
 				$cond_reglement_id = 0;
 				break;
 			case 'ESP':
-				$mode_reglement_id = dol_getIdFromCode($db,'LIQ','c_paiement');
+				$mode_reglement_id = dol_getIdFromCode($db,'LIQ','c_paiement','code','id',1);
 				$cond_reglement_id = 0;
 				$note .= $langs->trans("Cash")."\n";
 				$note .= $langs->trans("Received").' : '.$obj_facturation->montantEncaisse()." ".$conf->currency."\n";
@@ -145,11 +145,11 @@ switch ($action)
 				$note .= '--------------------------------------'."\n\n";
 				break;
 			case 'CB':
-				$mode_reglement_id = dol_getIdFromCode($db,'CB','c_paiement');
+				$mode_reglement_id = dol_getIdFromCode($db,'CB','c_paiement','code','id',1);
 				$cond_reglement_id = 0;
 				break;
 			case 'CHQ':
-				$mode_reglement_id = dol_getIdFromCode($db,'CHQ','c_paiement');
+				$mode_reglement_id = dol_getIdFromCode($db,'CHQ','c_paiement','code','id',1);
 				$cond_reglement_id = 0;
 				break;
 		}

htdocs/comm/action/class/actioncomm.class.php

@@ -907,59 +907,66 @@ class ActionComm extends CommonObject
             return $db->lasterror();
         }
     }
-
+    
     /**
      * Load indicators for dashboard (this->nbtodo and this->nbtodolate)
      *
-     * @param	User	$user   Objet user
+     * @param	User	$user   			Objet user
+     * @param	int		$load_state_board	Charge indicateurs this->nb de tableau de bord
      * @return WorkboardResponse|int <0 if KO, WorkboardResponse if OK
      */
-    function load_board($user)
+    function load_board($user, $load_state_board=0)
     {
-        global $conf, $langs;
+    	global $conf, $langs;
-
+    	
-        $sql = "SELECT a.id, a.datep as dp";
+    	if(empty($load_state_board)) $sql = "SELECT a.id, a.datep as dp";
-        $sql.= " FROM (".MAIN_DB_PREFIX."actioncomm as a";
+    	else {
-        $sql.= ")";
+    		$this->nb=array();
-        if (! $user->rights->societe->client->voir && ! $user->societe_id) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON a.fk_soc = sc.fk_soc";
+    		$sql = "SELECT count(a.id) as nb";
-        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON a.fk_soc = s.rowid";
+    	}
-        $sql.= " WHERE a.percent >= 0 AND a.percent < 100";
+    	$sql.= " FROM (".MAIN_DB_PREFIX."actioncomm as a";
-        $sql.= " AND a.entity IN (".getEntity('agenda').")";
+    	$sql.= ")";
-        if (! $user->rights->societe->client->voir && ! $user->societe_id) $sql.= " AND (a.fk_soc IS NULL OR sc.fk_user = " .$user->id . ")";
+    	if (! $user->rights->societe->client->voir && ! $user->societe_id) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON a.fk_soc = sc.fk_soc";
-        if ($user->societe_id) $sql.=" AND a.fk_soc = ".$user->societe_id;
+    	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON a.fk_soc = s.rowid";
-        if (! $user->rights->agenda->allactions->read) $sql.= " AND (a.fk_user_author = ".$user->id . " OR a.fk_user_action = ".$user->id . " OR a.fk_user_done = ".$user->id . ")";
+    	$sql.= " WHERE 1";
-
+    	if(empty($load_state_board)) $sql.= " AND a.percent >= 0 AND a.percent < 100";
-        $resql=$this->db->query($sql);
+    	$sql.= " AND a.entity IN (".getEntity('agenda').")";
-        if ($resql)
+    	if (! $user->rights->societe->client->voir && ! $user->societe_id) $sql.= " AND (a.fk_soc IS NULL OR sc.fk_user = " .$user->id . ")";
-        {
+    	if ($user->societe_id) $sql.=" AND a.fk_soc = ".$user->societe_id;
-            $agenda_static = new ActionComm($this->db);
+    	if (! $user->rights->agenda->allactions->read) $sql.= " AND (a.fk_user_author = ".$user->id . " OR a.fk_user_action = ".$user->id . " OR a.fk_user_done = ".$user->id . ")";
-
+    	
-	        $response = new WorkboardResponse();
+    	$resql=$this->db->query($sql);
-	        $response->warning_delay = $conf->agenda->warning_delay/60/60/24;
+    	if ($resql)
-	        $response->label = $langs->trans("ActionsToDo");
+    	{
-	        $response->url = DOL_URL_ROOT.'/comm/action/listactions.php?status=todo&amp;mainmenu=agenda';
+    		if(empty($load_state_board)) {
-	        if ($user->rights->agenda->allactions->read) $response->url.='&amp;filtert=-1';
+	    		$agenda_static = new ActionComm($this->db);
-	        $response->img = img_object('',"action",'class="inline-block valigntextmiddle"');
+	    		$response = new WorkboardResponse();
-
+	    		$response->warning_delay = $conf->agenda->warning_delay/60/60/24;
-            // This assignment in condition is not a bug. It allows walking the results.
+	    		$response->label = $langs->trans("ActionsToDo");
-            while ($obj=$this->db->fetch_object($resql))
+	    		$response->url = DOL_URL_ROOT.'/comm/action/listactions.php?status=todo&amp;mainmenu=agenda';
-            {
+	    		if ($user->rights->agenda->allactions->read) $response->url.='&amp;filtert=-1';
-	            $response->nbtodo++;
+	    		$response->img = img_object('',"action",'class="inline-block valigntextmiddle"');
-
+    		}
-                $agenda_static->datep = $this->db->jdate($obj->dp);
+    		// This assignment in condition is not a bug. It allows walking the results.
-
+    		while ($obj=$this->db->fetch_object($resql))
-                if ($agenda_static->hasDelay()) {
+    		{
-	                $response->nbtodolate++;
+    			if(empty($load_state_board)) {
-                }
+	    			$response->nbtodo++;
-            }
+	    			$agenda_static->datep = $this->db->jdate($obj->dp);
-
+	    			if ($agenda_static->hasDelay()) $response->nbtodolate++;
-            return $response;
+    			} else $this->nb["actionscomm"]=$obj->nb;
-        }
+    		}
-        else
+    		
-        {
+    		$this->db->free($resql);
-            $this->error=$this->db->error();
+    		if(empty($load_state_board)) return $response;
-            return -1;
+    		else return 1;
-        }
+    	}
+    	else
+    	{
+    		dol_print_error($this->db);
+    		$this->error=$this->db->error();
+    		return -1;
+    	}
     }
 
 

htdocs/comm/propal/class/propal.class.php

@@ -1271,8 +1271,8 @@ class Propal extends CommonObject
         $sql.= ", cr.code as cond_reglement_code, cr.libelle as cond_reglement, cr.libelle_facture as cond_reglement_libelle_doc";
         $sql.= ", cp.code as mode_reglement_code, cp.libelle as mode_reglement";
         $sql.= " FROM ".MAIN_DB_PREFIX."c_propalst as c, ".MAIN_DB_PREFIX."propal as p";
-        $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as cp ON p.fk_mode_reglement = cp.id';
+        $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as cp ON p.fk_mode_reglement = cp.id AND cp.entity IN (' . getEntity('c_paiement').')';
-        $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_payment_term as cr ON p.fk_cond_reglement = cr.rowid';
+        $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_payment_term as cr ON p.fk_cond_reglement = cr.rowid AND cr.entity IN (' . getEntity('c_payment_term').')';
         $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_availability as ca ON p.fk_availability = ca.rowid';
         $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_input_reason as dr ON p.fk_input_reason = dr.rowid';
 		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON p.fk_incoterms = i.rowid';

htdocs/commande/card.php

@@ -1716,7 +1716,7 @@ if ($action == 'create' && $user->rights->commande->creer)
 	print '<div class="center">';
 	print '<input type="submit" class="button" name="bouton" value="' . $langs->trans('CreateDraft') . '">';
 	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input type="submit" class="button" name="cancel" value="' . $langs->trans("Cancel") . '">';
+	print '<input type="button" class="button" name="cancel" value="' . $langs->trans("Cancel") . '" onclick="javascript:history.go(-1)">';
 	print '</div>';
 
 	print '</form>';

htdocs/commande/class/commande.class.php

@@ -1559,10 +1559,10 @@ class Commande extends CommonOrder
         $sql.= ', ca.code as availability_code, ca.label as availability_label';
         $sql.= ', dr.code as demand_reason_code';
         $sql.= ' FROM '.MAIN_DB_PREFIX.'commande as c';
-        $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_payment_term as cr ON (c.fk_cond_reglement = cr.rowid)';
+        $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_payment_term as cr ON c.fk_cond_reglement = cr.rowid AND cr.entity IN (' . getEntity('c_payment_term') . ')';
-        $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as p ON (c.fk_mode_reglement = p.id)';
+        $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as p ON c.fk_mode_reglement = p.id AND p.entity IN (' . getEntity('c_paiement') . ')';
-        $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_availability as ca ON (c.fk_availability = ca.rowid)';
+        $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_availability as ca ON c.fk_availability = ca.rowid';
-        $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_input_reason as dr ON (c.fk_input_reason = ca.rowid)';
+        $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_input_reason as dr ON c.fk_input_reason = ca.rowid';
 		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON c.fk_incoterms = i.rowid';
         $sql.= " WHERE c.entity IN (".getEntity('commande').")";
         if ($id)   	  $sql.= " AND c.rowid=".$id;

htdocs/compta/bank/annuel.php

@@ -149,7 +149,7 @@ dol_fiche_head($head, 'annual', $langs->trans("FinancialAccount"), -1, 'account'
 $title=$langs->trans("FinancialAccount")." : ".$object->label;
 $link=($year_start?"<a href='".$_SERVER["PHP_SELF"]."?account=".$object->id."&year_start=".($year_start-1)."'>".img_previous('', 'class="valignbottom"')."</a> ".$langs->trans("Year")." <a href='".$_SERVER["PHP_SELF"]."?account=".$object->id."&year_start=".($year_start+1)."'>".img_next('', 'class="valignbottom"')."</a>":"");
 
-$linkback = '<a href="'.DOL_URL_ROOT.'/compta/bank/index.php">'.$langs->trans("BackToList").'</a>';
+$linkback = '<a href="'.DOL_URL_ROOT.'/compta/bank/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
 
 if (!empty($id))
@@ -203,7 +203,7 @@ print '</tr>';
 $var=true;
 for ($mois = 1 ; $mois < 13 ; $mois++)
 {
-	
+
 	print '<tr class="oddeven">';
 	print "<td>".dol_print_date(dol_mktime(1,1,1,$mois,1,2000),"%B")."</td>";
 	for ($annee = $year_start ; $annee <= $year_end ; $annee++)

htdocs/compta/bank/bankentries_list.php

@@ -23,7 +23,7 @@
  */
 
 /**
- *	\file       htdocs/compta/bank/bankentries.php
+ *	\file       htdocs/compta/bank/bankentries_list.php
  *	\ingroup    banque
  *	\brief      List of bank transactions
  */
@@ -405,7 +405,7 @@ if ($id > 0 || ! empty($ref))
     $head=bank_prepare_head($object);
     dol_fiche_head($head,'journal',$langs->trans("FinancialAccount"),0,'account');
 
-    $linkback = '<a href="'.DOL_URL_ROOT.'/compta/bank/index.php">'.$langs->trans("BackToList").'</a>';
+    $linkback = '<a href="'.DOL_URL_ROOT.'/compta/bank/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
     dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0, '', '', 1);
 
@@ -447,7 +447,7 @@ if ($id > 0 || ! empty($ref))
         if ($object->canBeConciliated() > 0) {
             // If not cash account and can be reconciliate
             if ($user->rights->banque->consolidate) {
-                print '<a class="butAction" href="'.DOL_URL_ROOT.'/compta/bank/bankentries.php?action=reconcile&search_conciliated=0'.$param.'">'.$langs->trans("Conciliate").'</a>';
+                print '<a class="butAction" href="'.DOL_URL_ROOT.'/compta/bank/bankentries_list.php?action=reconcile&search_conciliated=0'.$param.'">'.$langs->trans("Conciliate").'</a>';
             } else {
                 print '<a class="butActionRefused" title="'.$langs->trans("NotEnoughPermissions").'" href="#">'.$langs->trans("Conciliate").'</a>';
             }
@@ -559,7 +559,7 @@ if (! empty($thirdparty)) $mode_balance_ok=false;
 
 $sql.= $db->plimit($limit+1,$offset);
 
-dol_syslog('compta/bank/bankentries.php', LOG_DEBUG);
+dol_syslog('compta/bank/bankentries_list.php', LOG_DEBUG);
 $resql = $db->query($sql);
 if ($resql)
 {
@@ -1161,7 +1161,7 @@ if ($resql)
     	if (! empty($arrayfields['type']['checked']))
     	{
         	print '<td align="center" class="nowrap">';
-	        $labeltype=($langs->trans("PaymentTypeShort".$objp->fk_type)!="PaymentTypeShort".$objp->fk_type)?$langs->trans("PaymentTypeShort".$objp->fk_type):$langs->getLabelFromKey($db,$objp->fk_type,'c_paiement','code','libelle');
+	        $labeltype=($langs->trans("PaymentTypeShort".$objp->fk_type)!="PaymentTypeShort".$objp->fk_type)?$langs->trans("PaymentTypeShort".$objp->fk_type):$langs->getLabelFromKey($db,$objp->fk_type,'c_paiement','code','libelle','',1);
 	        if ($labeltype == 'SOLD') print '&nbsp;'; //$langs->trans("InitialBankBalance");
 	        else print $labeltype;
 	        print "</td>\n";

htdocs/compta/bank/budget.php

@@ -74,9 +74,9 @@ if ($result)
 	while ($i < $num)
 	{
 		$objp = $db->fetch_object($result);
-		
+
 		print '<tr class="oddeven">';
-		print "<td><a href=\"".DOL_URL_ROOT."/compta/bank/bankentries.php?bid=$objp->rowid\">$objp->label</a></td>";
+		print "<td><a href=\"".DOL_URL_ROOT."/compta/bank/bankentries_list.php?bid=$objp->rowid\">$objp->label</a></td>";
 		print '<td align="right">'.$objp->nombre.'</td>';
 		print '<td align="right">'.price(abs($objp->somme))."</td>";
 		print '<td align="right">'.price(abs(price2num($objp->somme / $objp->nombre,'MT')))."</td>";

htdocs/compta/bank/card.php

@@ -262,7 +262,7 @@ if ($action == 'confirm_delete' && $_POST["confirm"] == "yes" && $user->rights->
     if ($result > 0)
     {
         setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
-        header("Location: ".DOL_URL_ROOT."/compta/bank/index.php");
+        header("Location: ".DOL_URL_ROOT."/compta/bank/list.php");
         exit;
     }
     else
@@ -576,7 +576,7 @@ else
 		// Print form confirm
 		print $formconfirm;
 
-		$linkback = '<a href="'.DOL_URL_ROOT.'/compta/bank/index.php">'.$langs->trans("BackToList").'</a>';
+		$linkback = '<a href="'.DOL_URL_ROOT.'/compta/bank/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
 		$morehtmlref='';
 		dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);

htdocs/compta/bank/class/account.class.php

@@ -412,8 +412,9 @@ class Account extends CommonObject
 
         if (is_numeric($oper))    // Clean oper to have a code instead of a rowid
         {
-            $sql ="SELECT code FROM ".MAIN_DB_PREFIX."c_paiement";
+            $sql = "SELECT code FROM ".MAIN_DB_PREFIX."c_paiement";
-            $sql.=" WHERE id=".$oper;
+            $sql.= " WHERE id=".$oper;
+            $sql.= " AND entity = " . getEntity('c_paiement') . ")";
             $resql=$this->db->query($sql);
             if ($resql)
             {
@@ -1161,50 +1162,88 @@ class Account extends CommonObject
      */
     function load_board(User $user, $filteraccountid = 0)
     {
-        global $conf, $langs;
+    	global $conf, $langs;
 
-        if ($user->societe_id) return -1;   // protection pour eviter appel par utilisateur externe
+    	if ($user->societe_id) return -1;   // protection pour eviter appel par utilisateur externe
 
-        $sql = "SELECT b.rowid, b.datev as datefin";
+    	$sql = "SELECT b.rowid, b.datev as datefin";
-        $sql.= " FROM ".MAIN_DB_PREFIX."bank as b,";
+    	$sql.= " FROM ".MAIN_DB_PREFIX."bank as b,";
-        $sql.= " ".MAIN_DB_PREFIX."bank_account as ba";
+    	$sql.= " ".MAIN_DB_PREFIX."bank_account as ba";
-        $sql.= " WHERE b.rappro=0";
+    	$sql.= " WHERE b.rappro=0";
-        $sql.= " AND b.fk_account = ba.rowid";
+    	$sql.= " AND b.fk_account = ba.rowid";
-        $sql.= " AND ba.entity IN (".getEntity('bank_account').")";
+    	$sql.= " AND ba.entity IN (".getEntity('bank_account').")";
-        $sql.= " AND (ba.rappro = 1 AND ba.courant != 2)";	// Compte rapprochable
+    	$sql.= " AND (ba.rappro = 1 AND ba.courant != 2)";	// Compte rapprochable
-        $sql.= " AND clos = 0";
+    	$sql.= " AND clos = 0";
-        if ($filteraccountid) $sql.=" AND ba.rowid = ".$filteraccountid;
+    	if ($filteraccountid) $sql.=" AND ba.rowid = ".$filteraccountid;
 
-        $resql=$this->db->query($sql);
+    	$resql=$this->db->query($sql);
-        if ($resql)
+    	if ($resql)
-        {
+    	{
-	        $langs->load("banks");
+    		$langs->load("banks");
-	        $now=dol_now();
+    		$now=dol_now();
 
-            require_once DOL_DOCUMENT_ROOT.'/core/class/workboardresponse.class.php';
+    		require_once DOL_DOCUMENT_ROOT.'/core/class/workboardresponse.class.php';
 
-	        $response = new WorkboardResponse();
+    		$response = new WorkboardResponse();
-	        $response->warning_delay=$conf->bank->rappro->warning_delay/60/60/24;
+    		$response->warning_delay=$conf->bank->rappro->warning_delay/60/60/24;
-	        $response->label=$langs->trans("TransactionsToConciliate");
+    		$response->label=$langs->trans("TransactionsToConciliate");
-	        $response->url=DOL_URL_ROOT.'/compta/bank/index.php?leftmenu=bank&mainmenu=bank';
+    		$response->url=DOL_URL_ROOT.'/compta/bank/list.php?leftmenu=bank&mainmenu=bank';
-	        $response->img=img_object('',"payment");
+    		$response->img=img_object('',"payment");
 
-            while ($obj=$this->db->fetch_object($resql))
+    		while ($obj=$this->db->fetch_object($resql))
-            {
+    		{
-                $response->nbtodo++;
+    			$response->nbtodo++;
-                if ($this->db->jdate($obj->datefin) < ($now - $conf->bank->rappro->warning_delay)) {
+    			if ($this->db->jdate($obj->datefin) < ($now - $conf->bank->rappro->warning_delay)) {
-	                $response->nbtodolate++;
+    				$response->nbtodolate++;
-                }
+    			}
-            }
+    		}
 
-            return $response;
+    		return $response;
-        }
+    	}
-        else
+    	else
-        {
+    	{
-            dol_print_error($this->db);
+    		dol_print_error($this->db);
-            $this->error=$this->db->error();
+    		$this->error=$this->db->error();
-            return -1;
+    		return -1;
-        }
+    	}
+    }
+
+    /**
+     *      Charge indicateurs this->nb de tableau de bord
+     *		@param		int			$filteraccountid	To get info for a particular account id
+     *      @return     int         <0 if ko, >0 if ok
+     */
+    function load_state_board($filteraccountid = 0)
+    {
+    	global $user;
+
+    	if ($user->societe_id) return -1;   // protection pour eviter appel par utilisateur externe
+
+    	$sql = "SELECT count(b.rowid) as nb";
+    	$sql.= " FROM ".MAIN_DB_PREFIX."bank as b,";
+    	$sql.= " ".MAIN_DB_PREFIX."bank_account as ba";
+    	$sql.= " WHERE b.fk_account = ba.rowid";
+    	$sql.= " AND ba.entity IN (".getEntity('bank_account').")";
+    	$sql.= " AND (ba.rappro = 1 AND ba.courant != 2)";	// Compte rapprochable
+    	$sql.= " AND clos = 0";
+    	if ($filteraccountid) $sql.=" AND ba.rowid = ".$filteraccountid;
+
+    	$resql=$this->db->query($sql);
+    	if ($resql)
+    	{
+    		while ($obj=$this->db->fetch_object($resql))
+    		{
+    			$this->nb["banklines"]=$obj->nb;
+    		}
+    		$this->db->free($resql);
+    		return 1;
+    	}
+    	else
+    	{
+    		dol_print_error($this->db);
+    		$this->error=$this->db->error();
+    		return -1;
+    	}
     }
 
 
@@ -1241,14 +1280,15 @@ class Account extends CommonObject
     }
 
     /**
-     *    	Return clicable name (with picto eventually)
+     *  Return clicable name (with picto eventually)
      *
-     *		@param	int		$withpicto		Include picto into link
+     *	@param	int		$withpicto					Include picto into link
-     *      @param  string	$mode           ''=Link to card, 'transactions'=Link to transactions card
+     *  @param  string	$mode           			''=Link to card, 'transactions'=Link to transactions card
-     *      @param  string  $option         ''=Show ref, 'reflabel'=Show ref+label
+     *  @param  string  $option         			''=Show ref, 'reflabel'=Show ref+label
-     *		@return	string					Chaine avec URL
+     *  @param  int     $save_lastsearch_value    	-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+     *	@return	string								Chaine avec URL
      */
-    function getNomUrl($withpicto=0, $mode='', $option='')
+    function getNomUrl($withpicto=0, $mode='', $option='', $save_lastsearch_value=-1)
     {
         global $conf, $langs;
 
@@ -1268,20 +1308,28 @@ class Account extends CommonObject
 
         if (empty($mode))
         {
-            $link = '<a href="'.DOL_URL_ROOT.'/compta/bank/card.php?id='.$this->id.$linkclose;
+            $url = DOL_URL_ROOT.'/compta/bank/card.php?id='.$this->id;
-            $linkend='</a>';
         }
         else if ($mode == 'transactions')
         {
-            $link = '<a href="'.DOL_URL_ROOT.'/compta/bank/bankentries.php?id='.$this->id.$linkclose;
+            $url = DOL_URL_ROOT.'/compta/bank/bankentries_list.php?id='.$this->id;
-            $linkend='</a>';
         }
         else if ($mode == 'receipts')
         {
-            $link = '<a href="'.DOL_URL_ROOT.'/compta/bank/releve.php?account='.$this->id.$linkclose;
+            $url = DOL_URL_ROOT.'/compta/bank/releve.php?account='.$this->id;
-            $linkend='</a>';
         }
 
+        if ($option != 'nolink')
+        {
+        	// Add param to save lastsearch_values or not
+        	$add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
+        	if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
+        	if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
+        }
+
+        $link = '<a href="'.$url.$linkclose;
+        $linkend='</a>';
+
         if ($withpicto) $result.=($link.img_object($label, 'account', 'class="classfortooltip"').$linkend.' ');
         $result.=$link.$this->ref.($option == 'reflabel' && $this->label ? ' - '.$this->label : '').$linkend;
         return $result;

htdocs/compta/bank/document.php

@@ -117,7 +117,7 @@ if ($id > 0 || !empty($ref)) {
             $totalsize+=$file['size'];
         }
 
-        $linkback = '<a href="'.DOL_URL_ROOT.'/compta/bank/index.php">'.$langs->trans("BackToList").'</a>';
+        $linkback = '<a href="'.DOL_URL_ROOT.'/compta/bank/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
         dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 

htdocs/compta/bank/graph.php

@@ -108,7 +108,7 @@ else
 		dol_print_error($db);
 	}
 	if (empty($min)) $min = dol_now - 3600 * 24;
-	
+
 	$log="graph.php: min=".$min." max=".$max;
 	dol_syslog($log);
 
@@ -760,7 +760,7 @@ $head=bank_prepare_head($object);
 dol_fiche_head($head,'graph',$langs->trans("FinancialAccount"),0,'account');
 
 
-$linkback = '<a href="'.DOL_URL_ROOT.'/compta/bank/index.php">'.$langs->trans("BackToList").'</a>';
+$linkback = '<a href="'.DOL_URL_ROOT.'/compta/bank/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
 if ($account)
 {

htdocs/compta/bank/info.php

@@ -58,7 +58,7 @@ $h++;
 
 dol_fiche_head($head, $hselected, $langs->trans("LineRecord"), -1, 'account');
 
-$linkback = '<a href="'.DOL_URL_ROOT.'/compta/bank/bankentries.php">'.$langs->trans("BackToList").'</a>';
+$linkback = '<a href="'.DOL_URL_ROOT.'/compta/bank/bankentries_list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
 
 dol_banner_tab($object, 'rowid', $linkback);

htdocs/compta/bank/ligne.php

@@ -152,7 +152,7 @@ if ($user->rights->banque->modifier && $action == "update")
 		{
 		    $error++;
 		}
-		
+
 		if (! $error)
 		{
             $arrayofcategs=GETPOST('custcats', 'array');
@@ -175,8 +175,8 @@ if ($user->rights->banque->modifier && $action == "update")
         		}
         		// $arrayselected will be loaded after in page output
     		}
-		}		
+		}
-		
+
 		if (! $error)
 		{
 			setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
@@ -296,14 +296,14 @@ if ($result)
         print '<input type="hidden" name="id" value="'.$acct->id.'">';
 
         dol_fiche_head($tabs, 0, $langs->trans('LineRecord'), 0, 'account');
-        
-        $linkback = '<a href="'.DOL_URL_ROOT.'/compta/bank/bankentries.php">'.$langs->trans("BackToList").'</a>';
 
-        
+        $linkback = '<a href="'.DOL_URL_ROOT.'/compta/bank/bankentries_list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+
+
         dol_banner_tab($bankline, 'rowid', $linkback);
-        
 
-        print '<div class="underbanner clearboth"></div>';       
+
+        print '<div class="underbanner clearboth"></div>';
         print '<table class="border" width="100%">';
 
         // Ref
@@ -314,7 +314,7 @@ if ($result)
         print '</td>';
         print '</tr>';
         */
-        
+
         $i++;
 
         // Bank account
@@ -582,7 +582,7 @@ if ($result)
         if (! empty($conf->categorie->enabled)  && ! empty($user->rights->categorie->lire))
         {
             $langs->load('categories');
-        
+
             // Bank line
             print '<tr><td class="toptd">' . fieldLabel('RubriquesTransactions', 'custcats') . '</td><td>';
             $cate_arbo = $form->select_all_categories(Categorie::TYPE_BANK_LINE, null, 'parent', null, null, 1);
@@ -591,28 +591,28 @@ if ($result)
         }
 
         print "</table>";
-        
+
         dol_fiche_end();
-        
+
-        
+
         print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Update").'"></div><br>';
-        
+
         print "</form>";
 
-        
+
-        
+
         // Releve rappro
         if ($acct->canBeConciliated() > 0)  // Si compte rapprochable
         {
             print load_fiche_titre($langs->trans("Reconciliation"), '', 'title_bank.png');
             print '<hr>'."\n";
-            
+
             print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'?rowid='.$objp->rowid.'">';
             print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
             print '<input type="hidden" name="action" value="setreconcile">';
             print '<input type="hidden" name="orig_account" value="'.$orig_account.'">';
             print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
-            
+
             print '<table class="border" width="100%">';
 
             print '<tr><td class="titlefield">'.$langs->trans("Conciliation")."</td>";
@@ -652,13 +652,13 @@ if ($result)
             print '</table>';
 
             print '<div class="center">';
-            
+
             print '<input type="submit" class="button" value="'.$langs->trans("Update").'">';
             if ($backtopage)
             {
                 print ' &nbsp; ';
                 print '<input type="submit" name="cancel" class="button" value="'.$langs->trans("Cancel").'">';
-            }            
+            }
             print '</div>';
 
 			print '</form>';

htdocs/compta/bank/list.php

@@ -19,7 +19,7 @@
  */
 
 /**
- *       \file       htdocs/compta/bank/index.php
+ *       \file       htdocs/compta/bank/list.php
  *       \ingroup    banque
  *       \brief      Home page of bank module
  */
@@ -611,7 +611,7 @@ foreach ($accounts as $key=>$type)
     if (! empty($arrayfields['balance']['checked']))
     {
 		print '<td align="right">';
-		print '<a href="'.DOL_URL_ROOT.'/compta/bank/bankentries.php?id='.$obj->id.'">'.price($solde, 0, $langs, 0, 0, -1, $obj->currency_code).'</a>';
+		print '<a href="'.DOL_URL_ROOT.'/compta/bank/bankentries_list.php?id='.$obj->id.'">'.price($solde, 0, $langs, 0, 0, -1, $obj->currency_code).'</a>';
 		print '</td>';
 		if (! $i) $totalarray['nbfield']++;
 		if (! $i) $totalarray['totalbalancefield']=$totalarray['nbfield'];

htdocs/compta/bank/releve.php

@@ -328,7 +328,7 @@ if (empty($numref))
 		$head=bank_prepare_head($object);
 		dol_fiche_head($head,'statement',$langs->trans("FinancialAccount"),0,'account');
 
-		$linkback = '<a href="'.DOL_URL_ROOT.'/compta/bank/index.php">'.$langs->trans("BackToList").'</a>';
+		$linkback = '<a href="'.DOL_URL_ROOT.'/compta/bank/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
 		dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0, '', '', 1);
 
@@ -340,7 +340,7 @@ if (empty($numref))
 		if ($object->canBeConciliated() > 0) {
 			// If not cash account and can be reconciliate
 			if ($user->rights->banque->consolidate) {
-				print '<a class="butAction" href="'.DOL_URL_ROOT.'/compta/bank/bankentries.php?action=reconcile&search_conciliated=0'.$param.'">'.$langs->trans("Conciliate").'</a>';
+				print '<a class="butAction" href="'.DOL_URL_ROOT.'/compta/bank/bankentries_list.php?action=reconcile&search_conciliated=0'.$param.'">'.$langs->trans("Conciliate").'</a>';
 			} else {
 				print '<a class="butActionRefused" title="'.$langs->trans("NotEnoughPermissions").'" href="#">'.$langs->trans("Conciliate").'</a>';
 			}

htdocs/compta/bank/treso.php

@@ -93,14 +93,14 @@ if ($_REQUEST["account"] || $_REQUEST["ref"])
 	$head=bank_prepare_head($object);
 	dol_fiche_head($head, 'cash', $langs->trans("FinancialAccount"), -1, 'account');
 
-	$linkback = '<a href="'.DOL_URL_ROOT.'/compta/bank/index.php">'.$langs->trans("BackToList").'</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/compta/bank/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
 	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0, '', '', 1);
 
 	dol_fiche_end();
-	
+
     print '<br>';
-    
+
 	$solde = $object->solde(0);
 
 	// Show next coming entries
@@ -120,13 +120,13 @@ if ($_REQUEST["account"] || $_REQUEST["ref"])
 	$var=true;
 
 	// Current balance
-	
+
 	print '<tr class="liste_total">';
 	print '<td align="left" colspan="5">'.$langs->trans("CurrentBalance").'</td>';
 	print '<td align="right" class="nowrap">'.price($solde).'</td>';
 	print '</tr>';
 
-	
+
 	print '<tr class="liste_titre">';
 	print '<td align="left" colspan="5">'.$langs->trans("RemainderToPay").'</td>';
 	print '<td align="right" class="nowrap">&nbsp;</td>';
@@ -295,7 +295,7 @@ if ($_REQUEST["account"] || $_REQUEST["ref"])
 			// We discard lines with a remainder to pay to 0
 			if (price2num($total_ttc) != 0)
 			{
-                
+
 
     			// Show line
     			print '<tr class="oddeven">';
@@ -320,7 +320,7 @@ if ($_REQUEST["account"] || $_REQUEST["ref"])
 	}
 
 	// Solde actuel
-	
+
 	print '<tr class="liste_total">';
 	print '<td align="left" colspan="5">'.$langs->trans("FutureBalance").' ('.$object->currency_code.')</td>';
 	print '<td align="right" class="nowrap">'.price($solde, 0, $langs, 0, 0, -1, $object->currency_code).'</td>';

htdocs/compta/bank/various_payment/index.php

@@ -96,7 +96,7 @@ $sql = "SELECT v.rowid, v.amount, v.label, v.datep as datep, v.datev as datev, v
 $sql.= " ba.rowid as bid, ba.ref as bref, ba.number as bnumber, ba.account_number as bank_account_number, ba.fk_accountancy_journal as accountancy_journal, ba.label as blabel,";
 $sql.= " pst.code as payment_code";
 $sql.= " FROM ".MAIN_DB_PREFIX."payment_various as v";
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as pst ON v.fk_typepayment = pst.id";
+$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as pst ON v.fk_typepayment = pst.id AND pst.entity = " . getEntity('c_paiement');
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON v.fk_bank = b.rowid";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."bank_account as ba ON b.fk_account = ba.rowid";
 $sql.= " WHERE v.entity = ".$conf->entity;

htdocs/compta/charges/index.php

@@ -139,7 +139,7 @@ if (! empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
 	$sql.= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c,";
 	$sql.= " ".MAIN_DB_PREFIX."chargesociales as cs";
 	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiementcharge as pc ON pc.fk_charge = cs.rowid";
-	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as pct ON pc.fk_typepaiement = pct.id";
+	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as pct ON pc.fk_typepaiement = pct.id AND pct.entity = " . getEntity('c_paiement');
 	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON pc.fk_bank = b.rowid";
 	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."bank_account as ba ON b.fk_account = ba.rowid";
 	$sql.= " WHERE cs.fk_type = c.id";
@@ -260,7 +260,7 @@ if (! empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
 		$sql.= " FROM ".MAIN_DB_PREFIX."tva as pv";
 		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON pv.fk_bank = b.rowid";
 		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."bank_account as ba ON b.fk_account = ba.rowid";
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as pct ON pv.fk_typepayment = pct.id";
+		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as pct ON pv.fk_typepayment = pct.id AND pct.entity = " . getEntity('c_paiement');
 		$sql.= " WHERE pv.entity = ".$conf->entity;
 		if ($year > 0)
 		{
@@ -474,7 +474,7 @@ if (! empty($conf->salaries->enabled) && $user->rights->salaries->read)
         $sql.= " FROM ".MAIN_DB_PREFIX."payment_salary as s";
 		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON s.fk_bank = b.rowid";
 		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."bank_account as ba ON b.fk_account = ba.rowid";
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as pct ON s.fk_typepayment = pct.id";
+		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as pct ON s.fk_typepayment = pct.id AND pct.entity = " . getEntity('c_paiement');
 		$sql.= " , ".MAIN_DB_PREFIX."user as u";
         $sql.= " WHERE s.entity IN (".getEntity('user').")";
         $sql.= " AND u.rowid = s.fk_user";

htdocs/compta/facture/card.php

@@ -716,9 +716,13 @@ if (empty($reshook))
 			if ($object->type == Facture::TYPE_STANDARD || $object->type == Facture::TYPE_REPLACEMENT || $object->type == Facture::TYPE_SITUATION)
 			{
 				// If we're on a standard invoice, we have to get excess received to create a discount in TTC without VAT
-				$sql = 'SELECT SUM(pf.amount) as total_paiements
+
-						FROM llx_c_paiement as c, llx_paiement_facture as pf, llx_paiement as p
+				$sql = 'SELECT SUM(pf.amount) as total_paiements';
-						WHERE pf.fk_facture = '.$object->id.' AND p.fk_paiement = c.id AND pf.fk_paiement = p.rowid';
+				$sql.= ' FROM '.MAIN_DB_PREFIX.'c_paiement as c, '.MAIN_DB_PREFIX.'paiement_facture as pf, '.MAIN_DB_PREFIX.'paiement as p';
+				$sql.= ' WHERE pf.fk_facture = '.$object->id;
+				$sql.= ' AND p.fk_paiement = c.id AND pf.fk_paiement = p.rowid';
+				$sql.= ' AND c.entity IN (' . getEntity('c_paiement').')';
+				$sql.= ' ORDER BY p.datep, p.tms';
 
 				$resql = $db->query($sql);
 				if (! $resql) dol_print_error($db);
@@ -3798,6 +3802,7 @@ else if ($id > 0 || ! empty($ref))
     $sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'bank as b ON p.fk_bank = b.rowid';
     $sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'bank_account as ba ON b.fk_account = ba.rowid';
     $sql .= ' WHERE pf.fk_facture = ' . $object->id . ' AND p.fk_paiement = c.id AND pf.fk_paiement = p.rowid';
+    $sql .= ' AND c.entity IN (' . getEntity('c_paiement').')';
     $sql .= ' ORDER BY p.datep, p.tms';
 
     $result = $db->query($sql);
@@ -4324,7 +4329,7 @@ else if ($id > 0 || ! empty($ref))
 			// Delete
 			if ($user->rights->facture->supprimer)
 			{
-				if (! $object->is_erasable()) {
+				if ($object->is_erasable() <= 0) {
 					print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="' . $langs->trans("DisabledBecauseNotErasable") . '">' . $langs->trans('Delete') . '</a></div>';
 				} else if ($objectidnext) {
 					print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="' . $langs->trans("DisabledBecauseReplacedInvoice") . '">' . $langs->trans('Delete') . '</a></div>';

htdocs/compta/facture/class/api_invoices.class.php

@@ -378,7 +378,59 @@ class Invoices extends DolibarrApi
     }
 
     /**
-     * Validate an order
+     * Sets an invoice as draft
+     *
+     * @param   int $id             Order ID
+     * @param   int $idwarehouse    Warehouse ID
+     *
+     * @url POST    {id}/settodraft
+     *
+     * @return  array
+     * 
+     * @throws 200
+     * @throws 304
+     * @throws 401
+     * @throws 404
+     * @throws 500
+     * 
+     */
+    function settodraft($id, $idwarehouse=-1)
+    {
+        if(! DolibarrApiAccess::$user->rights->facture->creer) {
+                throw new RestException(401);
+        }
+        $result = $this->invoice->fetch($id);
+        if( ! $result ) {
+                throw new RestException(404, 'Invoice not found');
+        }
+
+        if( ! DolibarrApi::_checkAccessToResource('facture',$this->invoice->id)) {
+                throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        }
+
+        $result = $this->invoice->set_draft(DolibarrApiAccess::$user, $idwarehouse);
+        if ($result == 0) {
+                throw new RestException(304, 'Nothing done.');
+        }
+        if ($result < 0) {
+                throw new RestException(500, 'Error : '.$this->invoice->error);
+        }
+
+        $result = $this->invoice->fetch($id);
+        if( ! $result ) {
+            throw new RestException(404, 'Invoice not found');
+        }
+
+        if( ! DolibarrApi::_checkAccessToResource('facture',$this->invoice->id)) {
+            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        }
+
+        return $this->_cleanObjectDatas($this->invoice);
+    }
+
+
+    /**
+     * Validate an invoice
      *
      * @param   int $id             Order ID
      * @param   int $idwarehouse    Warehouse ID
@@ -411,20 +463,82 @@ class Invoices extends DolibarrApi
 
     	$result = $this->invoice->validate(DolibarrApiAccess::$user, '', $idwarehouse, $notrigger);
     	if ($result == 0) {
-    		throw new RestException(500, 'Error nothing done. May be object is already validated');
+    		throw new RestException(304, 'Error nothing done. May be object is already validated');
     	}
     	if ($result < 0) {
     		throw new RestException(500, 'Error when validating Invoice: '.$this->invoice->error);
     	}
 
-    	return array(
+
-	    	'success' => array(
+        $result = $this->invoice->fetch($id);
-		    	'code' => 200,
+        if( ! $result ) {
-		    	'message' => 'Invoice validated (Ref='.$this->invoice->ref.')'
+            throw new RestException(404, 'Invoice not found');
-	    	)
+        }
-    	);
+
+        if( ! DolibarrApi::_checkAccessToResource('facture',$this->invoice->id)) {
+            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        }
+
+        return $this->_cleanObjectDatas($this->invoice);
+
+
     }
 
+    /**
+     * Sets an invoice as paid
+     *
+     * @param   int 	$id            Order ID
+     * @param   string 	$close_code    Code renseigne si on classe a payee completement alors que paiement incomplet (cas escompte par exemple)
+     * @param   string 	$close_note    Commentaire renseigne si on classe a payee alors que paiement incomplet (cas escompte par exemple)
+     *
+     * @url POST    {id}/settopaid
+     *
+     * @return  array 	An invoice object
+     *
+     * @throws 200
+     * @throws 304
+     * @throws 401
+     * @throws 404
+     * @throws 500
+     */
+    function settopaid($id, $close_code='', $close_note='')
+    {
+        if(! DolibarrApiAccess::$user->rights->facture->creer) {
+                throw new RestException(401);
+        }
+        $result = $this->invoice->fetch($id);
+        if( ! $result ) {
+                throw new RestException(404, 'Invoice not found');
+        }
+
+        if( ! DolibarrApi::_checkAccessToResource('facture',$this->invoice->id)) {
+                throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        }
+
+        $result = $this->invoice->set_paid(DolibarrApiAccess::$user, $close_code, $close_note);
+        if ($result == 0) {
+                throw new RestException(304, 'Error nothing done. May be object is already validated');
+        }
+        if ($result < 0) {
+                throw new RestException(500, 'Error : '.$this->invoice->error);
+        }
+
+
+        $result = $this->invoice->fetch($id);
+        if( ! $result ) {
+            throw new RestException(404, 'Invoice not found');
+        }
+
+        if( ! DolibarrApi::_checkAccessToResource('facture',$this->invoice->id)) {
+            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        }
+
+        return $this->_cleanObjectDatas($this->invoice);
+
+
+    }
+
+
     /**
      * Clean sensible object datas
      *

htdocs/compta/facture/class/facture-rec.class.php

@@ -262,8 +262,8 @@ class FactureRec extends CommonInvoice
 		$sql.= ', c.code as cond_reglement_code, c.libelle as cond_reglement_libelle, c.libelle_facture as cond_reglement_libelle_doc';
 		//$sql.= ', el.fk_source';
 		$sql.= ' FROM '.MAIN_DB_PREFIX.'facture_rec as f';
-		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_payment_term as c ON f.fk_cond_reglement = c.rowid';
+		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_payment_term as c ON f.fk_cond_reglement = c.rowid AND c.entity IN (' . getEntity('c_payment_term').')';
-		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as p ON f.fk_mode_reglement = p.id';
+		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as p ON f.fk_mode_reglement = p.id AND p.entity IN (' . getEntity('c_paiement').')';
 		//$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON el.fk_target = f.rowid AND el.targettype = 'facture'";
 		if ($rowid) $sql.= ' WHERE f.rowid='.$rowid;
 		elseif ($ref) $sql.= " WHERE f.titre='".$this->db->escape($ref)."'";

htdocs/compta/facture/class/facture.class.php

@@ -1076,18 +1076,19 @@ class Facture extends CommonInvoice
 	}
 
 	/**
-	 *      Return clicable link of object (with eventually picto)
+	 *  Return clicable link of object (with eventually picto)
 	 *
-	 *      @param	int		$withpicto       Add picto into link
+	 *  @param	int		$withpicto       			Add picto into link
-	 *      @param  string	$option          Where point the link
+	 *  @param  string	$option          			Where point the link
-	 *      @param  int		$max             Maxlength of ref
+	 *  @param  int		$max             			Maxlength of ref
-	 *      @param  int		$short           1=Return just URL
+	 *  @param  int		$short           			1=Return just URL
-	 *      @param  string  $moretitle       Add more text to title tooltip
+	 *  @param  string  $moretitle       			Add more text to title tooltip
-     *      @param	int  	$notooltip		 1=Disable tooltip
+     *  @param	int  	$notooltip		 			1=Disable tooltip
-     *      @param  int     $addlinktonotes  1=Add link to notes
+     *  @param  int     $addlinktonotes  			1=Add link to notes
-	 *      @return string 			         String with URL
+     *  @param  int     $save_lastsearch_value		-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+	 *  @return string 			         			String with URL
 	 */
-	function getNomUrl($withpicto=0,$option='',$max=0,$short=0,$moretitle='',$notooltip=0,$addlinktonotes=0)
+	function getNomUrl($withpicto=0, $option='', $max=0, $short=0, $moretitle='', $notooltip=0, $addlinktonotes=0, $save_lastsearch_value=-1)
 	{
 		global $langs, $conf, $user, $form;
 
@@ -1100,6 +1101,14 @@ class Facture extends CommonInvoice
 
 		if ($short) return $url;
 
+		if ($option !== 'nolink')
+		{
+			// Add param to save lastsearch_values or not
+			$add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
+			if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
+		}
+
 		$picto='bill';
 		if ($this->type == self::TYPE_REPLACEMENT) $picto.='r';	// Replacement invoice
 		if ($this->type == self::TYPE_CREDIT_NOTE) $picto.='a';	// Credit note
@@ -1197,8 +1206,8 @@ class Facture extends CommonInvoice
         $sql.= ', f.fk_incoterms, f.location_incoterms';
         $sql.= ", i.libelle as libelle_incoterms";
 		$sql.= ' FROM '.MAIN_DB_PREFIX.'facture as f';
-		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_payment_term as c ON f.fk_cond_reglement = c.rowid';
+		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_payment_term as c ON f.fk_cond_reglement = c.rowid AND c.entity IN (' . getEntity('c_payment_term').')';
-		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as p ON f.fk_mode_reglement = p.id';
+		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as p ON f.fk_mode_reglement = p.id AND p.entity IN (' . getEntity('c_paiement').')';
 		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON f.fk_incoterms = i.rowid';
 		$sql.= ' WHERE f.entity = '.$conf->entity;
 		if ($rowid)   $sql.= " AND f.rowid=".$rowid;
@@ -1737,20 +1746,24 @@ class Facture extends CommonInvoice
 	 *	@param     	User	$user      	    User making the deletion.
 	 *	@param		int		$notrigger		1=Does not execute triggers, 0= execute triggers
 	 *	@param		int		$idwarehouse	Id warehouse to use for stock change.
-	 *	@return		int						<0 if KO, >0 if OK
+	 *	@return		int						<0 if KO, 0=Refused, >0 if OK
 	 */
 	function delete($user, $notrigger=0, $idwarehouse=-1)
 	{
 		global $langs,$conf;
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-		if (empty($rowid)) $rowid=$this->id;
+		$rowid=$this->id;
 
-		dol_syslog(get_class($this)."::delete rowid=".$rowid, LOG_DEBUG);
+		dol_syslog(get_class($this)."::delete rowid=".$rowid.", ref=".$this->ref.", thirdparty=".$this->thirdparty->name, LOG_DEBUG);
 
-		// TODO Test if there is at least one payment. If yes, refuse to delete.
+		// Test to avoid invoice deletion (allowed if draft)
+		$test = $this->is_erasable();
+
+		if ($test <= 0) return $test;
 
 		$error=0;
+
 		$this->db->begin();
 
 		if (! $error && ! $notrigger)
@@ -2072,7 +2085,7 @@ class Facture extends CommonInvoice
 	 * @param   string	$force_number	Reference to force on invoice
 	 * @param	int		$idwarehouse	Id of warehouse to use for stock decrease if option to decreasenon stock is on (0=no decrease)
 	 * @param	int		$notrigger		1=Does not execute triggers, 0= execute triggers
-     * @return	int						<0 if KO, >0 if OK
+     * @return	int						<0 if KO, 0=Nothing done because invoice is not a draft, >0 if OK
 	 */
 	function validate($user, $force_number='', $idwarehouse=0, $notrigger=0)
 	{
@@ -3167,6 +3180,7 @@ class Facture extends CommonInvoice
 		//$sql.= ' WHERE pf.'.$field.' = 1';
 		$sql.= ' AND pf.'.$field2.' = p.rowid';
 		$sql.= ' AND p.fk_paiement = t.id';
+		$sql.= ' AND t.entity IN (' . getEntity('c_paiement').')';
 		if ($filtertype) $sql.=" AND t.code='PRE'";
 
 		dol_syslog(get_class($this)."::getListOfPayments", LOG_DEBUG);
@@ -3213,6 +3227,8 @@ class Facture extends CommonInvoice
 
 		if (! empty($conf->global->FACTURE_ADDON))
 		{
+			dol_syslog("Call getNextNumRef with FACTURE_ADDON = ".$conf->global->FACTURE_ADDON.", thirdparty=".$soc->nom.", type=".$soc->typent_code, LOG_DEBUG);
+
 			$mybool=false;
 
 			$file = $conf->global->FACTURE_ADDON.".php";
@@ -3356,40 +3372,49 @@ class Facture extends CommonInvoice
 	/**
 	 *  Return if an invoice can be deleted
 	 *	Rule is:
-	 *	If hidden option INVOICE_CAN_ALWAYS_BE_REMOVED is on, we can
-	 *  If invoice has a definitive ref, is last, without payment and not dipatched into accountancy -> yes end of rule
 	 *  If invoice is draft and ha a temporary ref -> yes
+	 *	If hidden option INVOICE_CAN_ALWAYS_BE_REMOVED is on, we can. If hidden option INVOICE_CAN_NEVER_BE_REMOVED is on, we can't.
+	 *  If invoice has a definitive ref, is last, without payment and not dipatched into accountancy -> yes end of rule
 	 *
-	 *  @return    int         <0 if KO, 0=no, 1=yes
+	 *  @return    int         <0 if KO, 0=no, >0=yes
 	 */
 	function is_erasable()
 	{
 		global $conf;
 
-		if (! empty($conf->global->INVOICE_CAN_ALWAYS_BE_REMOVED)) return 1;
+		// we check if invoice is a temporary number (PROVxxxx)
+		$tmppart = substr($this->ref, 1, 4);
+
+		if ($this->statut == self::STATUS_DRAFT && $tmppart === 'PROV') // If draft invoice and ref not yet defined
+		{
+			return 1;
+		}
+
+		if (! empty($conf->global->INVOICE_CAN_ALWAYS_BE_REMOVED)) return 2;
 		if (! empty($conf->global->INVOICE_CAN_NEVER_BE_REMOVED))  return 0;
 
-		// on verifie si la facture est en numerotation provisoire
+		// TODO Test if there is at least one payment. If yes, refuse to delete.
-		$facref = substr($this->ref, 1, 4);
+		// ...
 
 		// If not a draft invoice and not temporary invoice
-		if ($facref != 'PROV')
+		if ($tmppart !== 'PROV')
 		{
+			// We need to have this->thirdparty defined, in case of numbering rule use tags that depend on thirdparty (like {t} tag).
+			if (empty($this->thirdparty)) $this->fetch_thirdparty();
+
 			$maxfacnumber = $this->getNextNumRef($this->thirdparty,'last');
 			$ventilExportCompta = $this->getVentilExportCompta();
+
 			// If there is no invoice into the reset range and not already dispatched, we can delete
-			if ($maxfacnumber == '' && $ventilExportCompta == 0) return 1;
+			if ($maxfacnumber == '' && $ventilExportCompta == 0) return 3;
 			// If invoice to delete is last one and not already dispatched, we can delete
-			if ($maxfacnumber == $this->ref && $ventilExportCompta == 0) return 1;
+			if ($maxfacnumber == $this->ref && $ventilExportCompta == 0) return 4;
+
 			if ($this->situation_cycle_ref) {
 				$last = $this->is_last_in_cycle();
 				return $last;
 			}
 		}
-		else if ($this->statut == self::STATUS_DRAFT && $facref == 'PROV') // Si facture brouillon et provisoire
-		{
-			return 1;
-		}
 
 		return 0;
 	}
@@ -3649,7 +3674,7 @@ class Facture extends CommonInvoice
         			if (! $error)
         			{
         				// Force payment mode of invoice to withdraw
-        				$payment_mode_id = dol_getIdFromCode($this->db, 'PRE', 'c_paiement');
+        				$payment_mode_id = dol_getIdFromCode($this->db, 'PRE', 'c_paiement', 'code', 'id', 1);
         				if ($payment_mode_id > 0)
         				{
         					$result=$this->setPaymentMethods($payment_mode_id);

htdocs/compta/facture/class/paymentterm.class.php

@@ -91,6 +91,7 @@ class PaymentTerm // extends CommonObject
         // Insert request
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."c_payment_term(";
 		$sql.= "rowid,";
+		$sql.= "entity,";
 		$sql.= "code,";
 		$sql.= "sortorder,";
 		$sql.= "active,";
@@ -101,6 +102,7 @@ class PaymentTerm // extends CommonObject
 		$sql.= "decalage";
         $sql.= ") VALUES (";
 		$sql.= " ".(! isset($this->rowid)?'NULL':"'".$this->db->escape($this->rowid)."'").",";
+		$sql.= " ".(! isset($this->entity)?getEntity('c_payment_term'):"'".$this->db->escape($this->entity)."'").",";
 		$sql.= " ".(! isset($this->code)?'NULL':"'".$this->db->escape($this->code)."'").",";
 		$sql.= " ".(! isset($this->sortorder)?'NULL':"'".$this->db->escape($this->sortorder)."'").",";
 		$sql.= " ".(! isset($this->active)?'NULL':"'".$this->db->escape($this->active)."'").",";
@@ -165,6 +167,7 @@ class PaymentTerm // extends CommonObject
     	global $langs;
         $sql = "SELECT";
 		$sql.= " t.rowid,";
+		$sql.= " t.entity";
 
 		$sql.= " t.code,";
 		$sql.= " t.sortorder,";
@@ -178,6 +181,7 @@ class PaymentTerm // extends CommonObject
 
         $sql.= " FROM ".MAIN_DB_PREFIX."c_payment_term as t";
         $sql.= " WHERE t.rowid = ".$id;
+        $sql.= " AND t.entity = " . getEntity('c_payment_term');
 
     	dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
         $resql=$this->db->query($sql);
@@ -227,6 +231,7 @@ class PaymentTerm // extends CommonObject
 		$sql.= " t.rowid";
         $sql.= " FROM ".MAIN_DB_PREFIX."c_payment_term as t";
         $sql.= " WHERE t.code = 'RECEP'";
+        $sql.= " AND t.entity = " . getEntity('c_payment_term');
 
     	dol_syslog(get_class($this)."::getDefaultId", LOG_DEBUG);
         $resql=$this->db->query($sql);
@@ -255,9 +260,10 @@ class PaymentTerm // extends CommonObject
      *      @param      int		$notrigger	    0=launch triggers after, 1=disable triggers
      *      @return     int       			  	<0 if KO, >0 if OK
      */
-    function update($user=null, $notrigger=0)
+	function update($user=null, $notrigger=0)
-    {
+	{
-    	global $conf, $langs;
+		global $conf, $langs;
+
 		$error=0;
 
 		// Clean parameters
@@ -276,8 +282,8 @@ class PaymentTerm // extends CommonObject
 		// Check parameters
 		// Put here code to add control on parameters values
 
-        // Update request
+		// Update request
-        $sql = "UPDATE ".MAIN_DB_PREFIX."c_payment_term SET";
+		$sql = "UPDATE ".MAIN_DB_PREFIX."c_payment_term SET";
 		$sql.= " code=".(isset($this->code)?"'".$this->db->escape($this->code)."'":"null").",";
 		$sql.= " sortorder=".(isset($this->sortorder)?$this->sortorder:"null").",";
 		$sql.= " active=".(isset($this->active)?$this->active:"null").",";
@@ -286,37 +292,38 @@ class PaymentTerm // extends CommonObject
 		$sql.= " type_cdr=".(isset($this->type_cdr)?$this->type_cdr:"null").",";
 		$sql.= " nbjour=".(isset($this->nbjour)?$this->nbjour:"null").",";
 		$sql.= " decalage=".(isset($this->decalage)?$this->decalage:"null")."";
-        $sql.= " WHERE rowid=".$this->id;
+		$sql.= " WHERE rowid = " . $this->id;
+		$sql.= " AND entity = " . getEntity('c_payment_term');
 
 		$this->db->begin();
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
-        $resql = $this->db->query($sql);
+		$resql = $this->db->query($sql);
-    	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+		if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
 
 		if (! $error)
 		{
 			if (! $notrigger)
 			{
-	            // Uncomment this and change MYOBJECT to your own tag if you
+				// Uncomment this and change MYOBJECT to your own tag if you
-	            // want this action call a trigger.
+				// want this action call a trigger.
 
-	            //// Call triggers
+				// Call triggers
-	            //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+				//include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-	            //$interface=new Interfaces($this->db);
+				//$interface=new Interfaces($this->db);
-	            //$result=$interface->run_triggers('MYOBJECT_MODIFY',$this,$user,$langs,$conf);
+				//$result=$interface->run_triggers('MYOBJECT_MODIFY',$this,$user,$langs,$conf);
-	            //if ($result < 0) { $error++; $this->errors=$interface->errors; }
+				//if ($result < 0) { $error++; $this->errors=$interface->errors; }
-	            //// End call triggers
+				// End call triggers
-	    	}
+			}
 		}
 
-        // Commit or rollback
+		// Commit or rollback
 		if ($error)
 		{
 			foreach($this->errors as $errmsg)
 			{
-	            dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
+				dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
-	            $this->error.=($this->error?', '.$errmsg:$errmsg);
+				$this->error.=($this->error?', '.$errmsg:$errmsg);
 			}
 			$this->db->rollback();
 			return -1*$error;
@@ -326,7 +333,7 @@ class PaymentTerm // extends CommonObject
 			$this->db->commit();
 			return 1;
 		}
-    }
+	}
 
 
  	/**
@@ -342,7 +349,8 @@ class PaymentTerm // extends CommonObject
 		$error=0;
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."c_payment_term";
-		$sql.= " WHERE rowid=".$this->id;
+		$sql.= " WHERE rowid = " . $this->id;
+		$sql.= " AND t.entity = " . getEntity('c_payment_term');
 
 		$this->db->begin();
 

htdocs/compta/facture/contact.php

@@ -139,13 +139,13 @@ if ($id > 0 || ! empty($ref))
 		$head = facture_prepare_head($object);
 
 		$totalpaye = $object->getSommePaiement();
-		
+
 		dol_fiche_head($head, 'contact', $langs->trans('InvoiceCustomer'), -1, 'bill');
 
 		// Invoice content
-		
+
-		$linkback = '<a href="' . DOL_URL_ROOT . '/compta/facture/list.php' . (! empty($socid) ? '?socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
+		$linkback = '<a href="' . DOL_URL_ROOT . '/compta/facture/list.php?restore_lastsearch_values=1' . (! empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
-	
+
 		$morehtmlref='<div class="refidno">';
 		// Ref customer
 		$morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
@@ -186,11 +186,11 @@ if ($id > 0 || ! empty($ref))
 		    }
 		}
 		$morehtmlref.='</div>';
-	
+
 		$object->totalpaye = $totalpaye;   // To give a chance to dol_banner_tab to use already paid amount to show correct status
-	
+
 		dol_banner_tab($object, 'ref', $linkback, 1, 'facnumber', 'ref', $morehtmlref, '', 0, '', '', 1);
-		
+
 		dol_fiche_end();
 
 		print '<br>';

htdocs/compta/facture/document.php

@@ -113,7 +113,7 @@ if ($id > 0 || ! empty($ref))
 
 	    // Invoice content
 
-	    $linkback = '<a href="' . DOL_URL_ROOT . '/compta/facture/list.php' . (! empty($socid) ? '?socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
+	    $linkback = '<a href="' . DOL_URL_ROOT . '/compta/facture/list.php?restore_lastsearch_values=1' . (! empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
 
 	    $morehtmlref='<div class="refidno">';
 	    // Ref customer

htdocs/compta/facture/fiche-rec.php

@@ -1169,7 +1169,7 @@ else
 
 		// Recurring invoice content
 
-		$linkback = '<a href="' . DOL_URL_ROOT . '/compta/facture/invoicetemplate_list.php' . (! empty($socid) ? '?socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
+		$linkback = '<a href="' . DOL_URL_ROOT . '/compta/facture/invoicetemplate_list.php?restore_lastsearch_values=1' . (! empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
 
 		$morehtmlref='';
 		if ($action != 'editref') $morehtmlref.=$form->editfieldkey($object->ref, 'ref', $object->ref, $object, $user->rights->facture->creer, '', '', 0, 2);

htdocs/compta/facture/info.php

@@ -58,7 +58,7 @@ $totalpaye = $object->getSommePaiement();
 
 // Invoice content
 
-$linkback = '<a href="' . DOL_URL_ROOT . '/compta/facture/list.php' . (! empty($socid) ? '?socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
+$linkback = '<a href="' . DOL_URL_ROOT . '/compta/facture/list.php?restore_lastsearch_values=1' . (! empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
 
 $morehtmlref='<div class="refidno">';
 // Ref customer

htdocs/compta/facture/note.php

@@ -74,14 +74,14 @@ if ($id > 0 || ! empty($ref))
 	$object->fetch_thirdparty();
 
     $head = facture_prepare_head($object);
-	
+
     $totalpaye = $object->getSommePaiement();
-    
+
     dol_fiche_head($head, 'note', $langs->trans("InvoiceCustomer"), -1, 'bill');
 
     // Invoice content
 
-    $linkback = '<a href="' . DOL_URL_ROOT . '/compta/facture/list.php' . (! empty($socid) ? '?socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
+    $linkback = '<a href="' . DOL_URL_ROOT . '/compta/facture/list.php?restore_lastsearch_values=1' . (! empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
 
     $morehtmlref='<div class="refidno">';
     // Ref customer
@@ -130,8 +130,8 @@ if ($id > 0 || ! empty($ref))
 
 	print '<div class="fichecenter">';
 	print '<div class="underbanner clearboth"></div>';
-	
+
-	
+
 	$cssclass="titlefield";
     include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
 

htdocs/compta/facture/prelevement.php

@@ -151,7 +151,7 @@ if ($object->id > 0)
 
 	// Invoice content
 
-	$linkback = '<a href="' . DOL_URL_ROOT . '/compta/facture/list.php' . (! empty($socid) ? '?socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
+	$linkback = '<a href="' . DOL_URL_ROOT . '/compta/facture/list.php?restore_lastsearch_values=1' . (! empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
 
 	$morehtmlref='<div class="refidno">';
 	// Ref customer
@@ -425,28 +425,28 @@ if ($object->id > 0)
 	print '<tr><td>'.$langs->trans("RIB").'</td><td colspan="3">';
 	print $object->thirdparty->display_rib();
 	print '</td></tr>';
-	
+
 	print '</table>';
 
 	print '</div>';
 	print '<div class="fichehalfright">';
 	print '<div class="ficheaddleft">';
 	print '<div class="underbanner clearboth"></div>';
-	
+
 	print '<table class="border centpercent">';
-	
+
 	if (!empty($conf->multicurrency->enabled) && ($object->multicurrency_code != $conf->currency))
 	{
 	    // Multicurrency Amount HT
 	    print '<tr><td class="titlefieldmiddle">' . fieldLabel('MulticurrencyAmountHT','multicurrency_total_ht') . '</td>';
 	    print '<td class="nowrap">' . price($object->multicurrency_total_ht, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
 	    print '</tr>';
-	
+
 	    // Multicurrency Amount VAT
 	    print '<tr><td>' . fieldLabel('MulticurrencyAmountVAT','multicurrency_total_tva') . '</td>';
 	    print '<td class="nowrap">' . price($object->multicurrency_total_tva, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
 	    print '</tr>';
-	
+
 	    // Multicurrency Amount TTC
 	    print '<tr><td>' . fieldLabel('MulticurrencyAmountTTC','multicurrency_total_ttc') . '</td>';
 	    print '<td class="nowrap">' . price($object->multicurrency_total_ttc, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
@@ -507,16 +507,16 @@ if ($object->id > 0)
 
     // TODO Replace this by an include with same code to show already done payment visible in invoice card
     print '<tr><td>'.$langs->trans('RemainderToPay').'</td><td class="nowrap">'.price($resteapayer, 1, '', 1, - 1, - 1, $conf->currency).'</td></tr>';
-	
+
 	print '</table>';
-	
+
 	print '</div>';
 	print '</div>';
 	print '</div>';
 
 	print '<div class="clearboth"></div>';
-		
+
-	
+
 	dol_fiche_end();
 
 
@@ -612,7 +612,7 @@ if ($object->id > 0)
 		while ($i < $num)
 		{
 			$obj = $db->fetch_object($result_sql);
-			
+
 
 			print '<tr class="oddeven">';
 			print '<td align="left">'.dol_print_date($db->jdate($obj->date_demande),'day')."</td>\n";
@@ -640,7 +640,7 @@ if ($object->id > 0)
 	}
 
 	// Closed requests
-	
+
 	$sql = "SELECT pfd.rowid, pfd.traite, pfd.date_demande,";
 	$sql.= " pfd.date_traite, pfd.fk_prelevement_bons, pfd.amount,";
 	$sql.= " pb.ref,";
@@ -663,7 +663,7 @@ if ($object->id > 0)
 		while ($i < $num)
 		{
 			$obj = $db->fetch_object($result);
-			
+
 
 			print '<tr class="oddeven">';
 

htdocs/compta/paiement.php

@@ -251,7 +251,7 @@ if (empty($reshook))
 	    $paiement->datepaye     = $datepaye;
 	    $paiement->amounts      = $amounts;   // Array with all payments dispatching with invoice id
 	    $paiement->multicurrency_amounts = $multicurrency_amounts;   // Array with all payments dispatching
-	    $paiement->paiementid   = dol_getIdFromCode($db,GETPOST('paiementcode'),'c_paiement');
+	    $paiement->paiementid   = dol_getIdFromCode($db,GETPOST('paiementcode'),'c_paiement','code','id',1);
 	    $paiement->num_paiement = GETPOST('num_paiement');
 	    $paiement->note         = GETPOST('comment');
 
@@ -526,21 +526,19 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
          * List of unpaid invoices
          */
 
-        $sql = 'SELECT f.rowid as facid, f.facnumber, f.total_ttc, f.multicurrency_code, f.multicurrency_total_ttc, f.type, ';
+        $sql = 'SELECT f.rowid as facid, f.facnumber, f.total_ttc, f.multicurrency_code, f.multicurrency_total_ttc, f.type,';
         $sql.= ' f.datef as df, f.fk_soc as socid';
         $sql.= ' FROM '.MAIN_DB_PREFIX.'facture as f';
-
+		$sql.= ' WHERE f.entity IN ('.getEntity('facture', $conf->entity).')';
-		if(!empty($conf->global->FACTURE_PAYMENTS_ON_DIFFERENT_THIRDPARTIES_BILLS)) {
-			$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON (f.fk_soc = s.rowid)';
-		}
-
-		$sql.= ' WHERE f.entity = '.$conf->entity;
         $sql.= ' AND (f.fk_soc = '.$facture->socid;
-
+		// Can pay invoices of all child of parent company
 		if(!empty($conf->global->FACTURE_PAYMENTS_ON_DIFFERENT_THIRDPARTIES_BILLS) && !empty($facture->thirdparty->parent)) {
 			$sql.= ' OR f.fk_soc IN (SELECT rowid FROM '.MAIN_DB_PREFIX.'societe WHERE parent = '.$facture->thirdparty->parent.')';
 		}
-
+		// Can pay invoices of all child of myself
+		if(!empty($conf->global->FACTURE_PAYMENTS_ON_SUBSIDIARY_COMPANIES)){
+			$sql.= ' OR f.fk_soc IN (SELECT rowid FROM '.MAIN_DB_PREFIX.'societe WHERE parent = '.$facture->thirdparty->id.')';
+		}
         $sql.= ') AND f.paye = 0';
         $sql.= ' AND f.fk_statut = 1'; // Statut=0 => not validated, Statut=2 => canceled
         if ($facture->type != 2)
@@ -831,7 +829,8 @@ if (! GETPOST('action','aZ09'))
     $sql.=', f.rowid as facid, c.libelle as paiement_type, p.num_paiement';
     $sql.= ' FROM '.MAIN_DB_PREFIX.'paiement as p, '.MAIN_DB_PREFIX.'facture as f, '.MAIN_DB_PREFIX.'c_paiement as c';
     $sql.= ' WHERE p.fk_facture = f.rowid AND p.fk_paiement = c.id';
-    $sql.= ' AND f.entity = '.$conf->entity;
+    $sql.= ' AND f.entity IN (' . getEntity('facture').')';
+    $sql.= ' AND c.entity IN (' . getEntity('c_paiement').')';
     if ($socid)
     {
         $sql.= ' AND f.fk_soc = '.$socid;

htdocs/compta/paiement/avalider.php

@@ -71,7 +71,8 @@ if ($socid)
     $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."facture as f ON pf.fk_facture = f.rowid";
 }
 $sql.= " WHERE p.fk_paiement = c.id";
-$sql.= " AND p.entity = ".$conf->entity;
+$sql.= " AND p.entity = " . $conf->entity;
+$sql.= " AND c.entity = " . getEntity('c_paiement');
 if ($socid)
 {
     $sql.= " AND f.fk_soc = ".$socid;

htdocs/compta/paiement/cheque/class/remisecheque.class.php

@@ -36,7 +36,7 @@ class RemiseCheque extends CommonObject
 	public $element='chequereceipt';
 	public $table_element='bordereau_cheque';
 	public $picto = 'payment';
-	
+
 	var $num;
 	var $intitule;
 	//! Numero d'erreur Plage 1024-1279
@@ -345,7 +345,7 @@ class RemiseCheque extends CommonObject
 		$this->errno = 0;
 
 		$this->db->begin();
-		
+
 		$numref = $this->getNextNumRef();
 
 		if ($this->errno == 0 && $numref)
@@ -481,10 +481,10 @@ class RemiseCheque extends CommonObject
 
 
 	/**
-     *      Load indicators for dashboard (this->nbtodo and this->nbtodolate)
+	 *      Load indicators for dashboard (this->nbtodo and this->nbtodolate)
-     *
+	 *
-     *      @param      User	$user       Objet user
+	 *      @param      User	$user       Objet user
-     *      @return WorkboardResponse|int <0 if KO, WorkboardResponse if OK
+	 *      @return WorkboardResponse|int <0 if KO, WorkboardResponse if OK
 	 */
 	function load_board($user)
 	{
@@ -533,6 +533,45 @@ class RemiseCheque extends CommonObject
 	}
 
 
+	/**
+	 *      Charge indicateurs this->nb de tableau de bord
+	 *
+	 *      @return     int         <0 if ko, >0 if ok
+	 */
+	function load_state_board()
+	{
+		global $user;
+
+		if ($user->societe_id) return -1;   // protection pour eviter appel par utilisateur externe
+
+		$sql = "SELECT count(b.rowid) as nb";
+		$sql.= " FROM ".MAIN_DB_PREFIX."bank as b";
+		$sql.= ", ".MAIN_DB_PREFIX."bank_account as ba";
+		$sql.= " WHERE b.fk_account = ba.rowid";
+		$sql.= " AND ba.entity IN (".getEntity('bank_account').")";
+		$sql.= " AND b.fk_type = 'CHQ'";
+		$sql.= " AND b.amount > 0";
+
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+
+			while ($obj=$this->db->fetch_object($resql))
+			{
+				$this->nb["cheques"]=$obj->nb;
+			}
+			$this->db->free($resql);
+			return 1;
+		}
+		else
+		{
+			dol_print_error($this->db);
+			$this->error=$this->db->error();
+			return -1;
+		}
+	}
+
+
 	/**
 	 *	Build document
 	 *
@@ -716,7 +755,7 @@ class RemiseCheque extends CommonObject
 	 *
 	 *	@param	int		$bank_id 		   Id of bank transaction line concerned
 	 *	@param	date	$rejection_date    Date to use on the negative payment
-	 * 	@return	int                        Id of negative payment line created 
+	 * 	@return	int                        Id of negative payment line created
 	 */
 	function rejectCheck($bank_id, $rejection_date)
 	{
@@ -727,19 +766,19 @@ class RemiseCheque extends CommonObject
 
 		$bankline = new AccountLine($db);
 		$bankline->fetch($bank_id);
-		
+
 		/* Conciliation is allowed because when check is returned, a new line is created onto bank transaction log.
 		if ($bankline->rappro)
 		{
             $this->error='ActionRefusedLineAlreadyConciliated';
 		    return -1;
 		}*/
-		
+
 		$this->db->begin();
-		
+
 		// Not conciliated, we can delete it
-		//$bankline->delete($user);    // We delete 
+		//$bankline->delete($user);    // We delete
-			    
+
 		$bankaccount = $payment->fk_account;
 
 		// Get invoices list to reopen them
@@ -753,7 +792,7 @@ class RemiseCheque extends CommonObject
 			$rejectedPayment = new Paiement($db);
 			$rejectedPayment->amounts = array();
 			$rejectedPayment->datepaye = $rejection_date;
-			$rejectedPayment->paiementid = dol_getIdFromCode($this->db, 'CHQ', 'c_paiement');
+			$rejectedPayment->paiementid = dol_getIdFromCode($this->db, 'CHQ', 'c_paiement','code','id',1);
 			$rejectedPayment->num_paiement = $payment->numero;
 
 			while($obj = $db->fetch_object($resql))

htdocs/compta/paiement/cheque/list.php

@@ -203,7 +203,7 @@ if ($resql)
 
     		// Bank
     		print '<td>';
-    		if ($objp->bid) print '<a href="'.DOL_URL_ROOT.'/compta/bank/bankentries.php?account='.$objp->bid.'">'.img_object($langs->trans("ShowAccount"),'account').' '.$objp->label.'</a>';
+    		if ($objp->bid) print '<a href="'.DOL_URL_ROOT.'/compta/bank/bankentries_list.php?account='.$objp->bid.'">'.img_object($langs->trans("ShowAccount"),'account').' '.$objp->label.'</a>';
     		else print '&nbsp;';
     		print '</td>';
 

htdocs/compta/paiement/class/paiement.class.php

@@ -93,6 +93,7 @@ class Paiement extends CommonObject
 		$sql.= ' FROM '.MAIN_DB_PREFIX.'c_paiement as c, '.MAIN_DB_PREFIX.'paiement as p';
 		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank as b ON p.fk_bank = b.rowid ';
 		$sql.= ' WHERE p.fk_paiement = c.id';
+		$sql.= ' AND c.entity IN (' . getEntity('c_paiement').')';
 		if ($id > 0)
 			$sql.= ' AND p.rowid = '.$id;
 		else if ($ref)

htdocs/compta/paiement/list.php

@@ -119,7 +119,8 @@ if (GETPOST("orphelins"))
     $sql.= " ".MAIN_DB_PREFIX."c_paiement as c)";
     $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON p.rowid = pf.fk_paiement";
     $sql.= " WHERE p.fk_paiement = c.id";
-    $sql.= " AND p.entity = ".$conf->entity;
+    $sql.= " AND p.entity = " . $conf->entity;
+    $sql.= " AND c.entity = " . getEntity('c_paiement');
     $sql.= " AND pf.fk_facture IS NULL";
 	// Add where from hooks
 	$parameters=array();
@@ -150,7 +151,8 @@ else
         $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
     }
     $sql.= " WHERE p.fk_paiement = c.id";
-    $sql.= " AND p.entity = ".$conf->entity;
+    $sql.= " AND p.entity = " . $conf->entity;
+    $sql.= " AND c.entity = " . getEntity('c_paiement');
     if (! $user->rights->societe->client->voir && ! $socid)
     {
         $sql.= " AND sc.fk_user = " .$user->id;

htdocs/compta/resultat/clientfourn.php

@@ -822,7 +822,7 @@ else
 				$sql.= " FROM ".MAIN_DB_PREFIX."expensereport as p";
 				$sql.= " INNER JOIN ".MAIN_DB_PREFIX."user as u ON u.rowid=p.fk_user_author";
 				$sql.= " INNER JOIN ".MAIN_DB_PREFIX."payment_expensereport as pe ON pe.fk_expensereport = p.rowid";
-				$sql.= " INNER JOIN ".MAIN_DB_PREFIX."c_paiement as c ON pe.fk_typepayment = c.id";
+				$sql.= " INNER JOIN ".MAIN_DB_PREFIX."c_paiement as c ON pe.fk_typepayment = c.id AND c.entity = " . getEntity('c_paiement');
 				$sql.= " WHERE p.entity = ".getEntity('expensereport');
 				$sql.= " AND p.fk_statut>=5";
 
@@ -906,7 +906,7 @@ else
 			    $sql = "SELECT p.societe as nom, p.firstname, p.lastname, date_format(p.datedon,'%Y-%m') as dm, sum(p.amount) as amount";
 			    $sql.= " FROM ".MAIN_DB_PREFIX."don as p";
 			    $sql.= " INNER JOIN ".MAIN_DB_PREFIX."payment_donation as pe ON pe.fk_donation = p.rowid";
-			    $sql.= " INNER JOIN ".MAIN_DB_PREFIX."c_paiement as c ON pe.fk_typepayment = c.id";
+			    $sql.= " INNER JOIN ".MAIN_DB_PREFIX."c_paiement as c ON pe.fk_typepayment = c.id AND c.entity = " . getEntity('c_paiement');
 			    $sql.= " WHERE p.entity = ".getEntity('donation');
 			    $sql.= " AND fk_statut >= 2";
 			}

htdocs/compta/resultat/index.php

@@ -698,7 +698,7 @@ if (! empty($conf->expensereport->enabled) && ($modecompta == 'CREANCES-DETTES'
 		$sql.= " FROM ".MAIN_DB_PREFIX."expensereport as p";
 		$sql.= " INNER JOIN ".MAIN_DB_PREFIX."user as u ON u.rowid=p.fk_user_author";
 		$sql.= " INNER JOIN ".MAIN_DB_PREFIX."payment_expensereport as pe ON pe.fk_expensereport = p.rowid";
-		$sql.= " INNER JOIN ".MAIN_DB_PREFIX."c_paiement as c ON pe.fk_typepayment = c.id";
+		$sql.= " INNER JOIN ".MAIN_DB_PREFIX."c_paiement as c ON pe.fk_typepayment = c.id AND c.entity = " . getEntity('c_paiement');
 		$sql.= " WHERE p.entity = ".getEntity('expensereport');
 		$sql.= " AND p.fk_statut>=5";
 
@@ -761,7 +761,7 @@ if (! empty($conf->don->enabled) && ($modecompta == 'CREANCES-DETTES' || $modeco
         $sql = "SELECT p.societe as nom, p.firstname, p.lastname, date_format(pe.datep,'%Y-%m') as dm, sum(p.amount) as amount";
         $sql.= " FROM ".MAIN_DB_PREFIX."don as p";
 		$sql.= " INNER JOIN ".MAIN_DB_PREFIX."payment_donation as pe ON pe.fk_donation = p.rowid";
-		$sql.= " INNER JOIN ".MAIN_DB_PREFIX."c_paiement as c ON pe.fk_typepayment = c.id";
+		$sql.= " INNER JOIN ".MAIN_DB_PREFIX."c_paiement as c ON pe.fk_typepayment = c.id AND c.entity = " . getEntity('c_paiement');
 		$sql.= " WHERE p.entity = ".getEntity('donation');
    	    $sql.= " AND fk_statut >= 2";
 		if (! empty($date_start) && ! empty($date_end))

htdocs/compta/salaries/card.php

@@ -214,6 +214,12 @@ if ($action == 'create')
 		$pastmonthyear--;
 	}
 
+	$datespmonth = GETPOST('datespmonth', 'int');
+	$datespday = GETPOST('datespday', 'int');
+	$datespyear = GETPOST('datespyear', 'int');
+	$dateepmonth = GETPOST('dateepmonth', 'int');
+	$dateepday = GETPOST('dateepday', 'int');
+	$dateepyear = GETPOST('dateepyear', 'int');
 	$datesp=dol_mktime(0, 0, 0, $datespmonth, $datespday, $datespyear);
 	$dateep=dol_mktime(23, 59, 59, $dateepmonth, $dateepday, $dateepyear);
 
@@ -253,7 +259,7 @@ if ($action == 'create')
 	// Label
 	print '<tr><td>';
 	print fieldLabel('Label','label',1).'</td><td>';
-	print '<input name="label" id="label" class="minwidth300" value="'.($_POST["label"]?GETPOST("label",'',2):$langs->trans("SalaryPayment")).'">';
+	print '<input name="label" id="label" class="minwidth300" value="'.(GETPOST("label")?GETPOST("label"):$langs->trans("SalaryPayment")).'">';
 	print '</td></tr>';
 
 	// Date start period

htdocs/compta/salaries/index.php

@@ -105,7 +105,7 @@ $sql.= " s.rowid, s.fk_user, s.amount, s.salary, s.label, s.datep as datep, s.da
 $sql.= " ba.rowid as bid, ba.ref as bref, ba.number as bnumber, ba.account_number, ba.fk_accountancy_journal, ba.label as blabel,";
 $sql.= " pst.code as payment_code";
 $sql.= " FROM ".MAIN_DB_PREFIX."payment_salary as s";
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as pst ON s.fk_typepayment = pst.id";
+$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as pst ON s.fk_typepayment = pst.id AND pst.entity = " . getEntity('c_paiement');
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON s.fk_bank = b.rowid";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."bank_account as ba ON b.fk_account = ba.rowid,";
 $sql.= " ".MAIN_DB_PREFIX."user as u";

htdocs/compta/sociales/card.php

@@ -581,6 +581,7 @@ if ($id > 0)
 		$sql.= " AND p.fk_charge = cs.rowid";
 		$sql.= " AND cs.entity = ".$conf->entity;
 		$sql.= " AND p.fk_typepaiement = c.id";
+		$sql.= " AND c.entity = " . getEntity('c_paiement');
 		$sql.= " ORDER BY dp DESC";
 
 		//print $sql;

htdocs/compta/sociales/class/chargesociales.class.php

@@ -83,7 +83,7 @@ class ChargeSociales extends CommonObject
         $sql.= ', p.code as mode_reglement_code, p.libelle as mode_reglement_libelle';
         $sql.= " FROM ".MAIN_DB_PREFIX."chargesociales as cs";
         $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_chargesociales as c ON cs.fk_type = c.id";
-        $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as p ON cs.fk_mode_reglement = p.id';
+        $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as p ON cs.fk_mode_reglement = p.id AND p.entity IN (' . getEntity('c_paiement').')';
         if ($ref) $sql.= " WHERE cs.rowid = ".$ref;
         else $sql.= " WHERE cs.rowid = ".$id;
 

htdocs/compta/sociales/class/paymentsocialcontribution.class.php

@@ -78,7 +78,7 @@ class PaymentSocialContribution extends CommonObject
         $now=dol_now();
 
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
-        
+
 		// Validate parametres
 		if (! $this->datepaye)
 		{
@@ -125,7 +125,7 @@ class PaymentSocialContribution extends CommonObject
 			if ($resql)
 			{
 				$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."paiementcharge");
-				
+
 				// Insere tableau des montants / factures
 				foreach ($this->amounts as $key => $amount)
 				{
@@ -137,7 +137,7 @@ class PaymentSocialContribution extends CommonObject
 						// If we want to closed payed invoices
 						if ($closepaidcontrib)
 						{
-							
+
 							$contrib=new ChargeSociales($this->db);
 							$contrib->fetch($contribid);
 							$paiement = $contrib->getSommePaiement();
@@ -205,6 +205,7 @@ class PaymentSocialContribution extends CommonObject
 		$sql.= " FROM (".MAIN_DB_PREFIX."c_paiement as pt, ".MAIN_DB_PREFIX."paiementcharge as t)";
 		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank as b ON t.fk_bank = b.rowid';
 		$sql.= " WHERE t.rowid = ".$id." AND t.fk_typepaiement = pt.id";
+		$sql.= " AND pt.entity = " . getEntity('c_paiement');
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$resql=$this->db->query($sql);

htdocs/compta/sociales/payments.php

@@ -133,7 +133,7 @@ if (! empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
 	$sql.= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c,";
 	$sql.= " ".MAIN_DB_PREFIX."chargesociales as cs,";
 	$sql.= " ".MAIN_DB_PREFIX."paiementcharge as pc";
-	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as pct ON pc.fk_typepaiement = pct.id";
+	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as pct ON pc.fk_typepaiement = pct.id AND pct.entity = " . getEntity('c_paiement');
 	$sql.= " WHERE cs.fk_type = c.id AND pc.fk_charge = cs.rowid";
 	$sql.= " AND cs.entity = ".$conf->entity;
 	if ($year > 0)

htdocs/compta/tva/reglement.php

@@ -100,7 +100,7 @@ $bankstatic = new Account($db);
 $sql = "SELECT t.rowid, t.amount, t.label, t.datev as dv, t.datep as dp, t.fk_typepayment as type, t.num_payment, t.fk_bank, pst.code as payment_code,";
 $sql.= " ba.rowid as bid, ba.ref as bref, ba.number as bnumber, ba.account_number, ba.fk_accountancy_journal, ba.label as blabel";
 $sql.= " FROM ".MAIN_DB_PREFIX."tva as t";
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as pst ON t.fk_typepayment = pst.id";
+$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as pst ON t.fk_typepayment = pst.id AND pst.entity = " . getEntity('c_paiement');
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON t.fk_bank = b.rowid";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."bank_account as ba ON b.fk_account = ba.rowid";
 $sql.= " WHERE t.entity = ".$conf->entity;

htdocs/contact/agenda.php

@@ -210,7 +210,7 @@ else
 
         dol_fiche_head($head, 'agenda', $title, -1, 'contact');
 
-        $linkback = '<a href="'.DOL_URL_ROOT.'/contact/list.php">'.$langs->trans("BackToList").'</a>';
+        $linkback = '<a href="'.DOL_URL_ROOT.'/contact/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
         $morehtmlref='<div class="refidno">';
         if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))

htdocs/contact/card.php

@@ -1064,7 +1064,7 @@ else
 
         }
 
-        $linkback = '<a href="'.DOL_URL_ROOT.'/contact/list.php">'.$langs->trans("BackToList").'</a>';
+        $linkback = '<a href="'.DOL_URL_ROOT.'/contact/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
         $morehtmlref='<div class="refidno">';
         if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))

htdocs/contact/class/contact.class.php

@@ -987,38 +987,52 @@ class Contact extends CommonObject
 	 *  Return name of contact with link (and eventually picto)
 	 *	Use $this->id, $this->lastname, $this->firstname, this->civility_id
 	 *
-	 *	@param		int			$withpicto		Include picto with link
+	 *	@param		int			$withpicto					Include picto with link
-	 *	@param		string		$option			Where the link point to
+	 *	@param		string		$option						Where the link point to
-	 *	@param		int			$maxlen			Max length of
+	 *	@param		int			$maxlen						Max length of
-	 *  @param		string		$moreparam		Add more param into URL
+	 *  @param		string		$moreparam					Add more param into URL
-	 *	@return		string						String with URL
+     *  @param      int     	$save_lastsearch_value		-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+	 *	@return		string									String with URL
 	 */
-	function getNomUrl($withpicto=0,$option='',$maxlen=0,$moreparam='')
+	function getNomUrl($withpicto=0, $option='', $maxlen=0, $moreparam='', $save_lastsearch_value=-1)
 	{
 		global $conf, $langs, $hookmanager;
 
 		$result='';
-	        $label = '<u>' . $langs->trans("ShowContact") . '</u>';
-	        $label.= '<br><b>' . $langs->trans("Name") . ':</b> '.$this->getFullName($langs);
-	        //if ($this->civility_id) $label.= '<br><b>' . $langs->trans("Civility") . ':</b> '.$this->civility_id;		// TODO Translate cibilty_id code
-	        if (! empty($this->poste)) $label.= '<br><b>' . $langs->trans("Poste") . ':</b> '.$this->poste;
-	        $label.= '<br><b>' . $langs->trans("EMail") . ':</b> '.$this->email;
-	        $phonelist=array();
-	        if ($this->phone_pro) $phonelist[]=$this->phone_pro;
-	        if ($this->phone_mobile) $phonelist[]=$this->phone_mobile;
-	        if ($this->phone_perso) $phonelist[]=$this->phone_perso;
-	        $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.'"';
+        $label = '<u>' . $langs->trans("ShowContact") . '</u>';
-	        $linkclose="";
+        $label.= '<br><b>' . $langs->trans("Name") . ':</b> '.$this->getFullName($langs);
-	    	if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+        //if ($this->civility_id) $label.= '<br><b>' . $langs->trans("Civility") . ':</b> '.$this->civility_id;		// TODO Translate cibilty_id code
-	        {
+        if (! empty($this->poste)) $label.= '<br><b>' . $langs->trans("Poste") . ':</b> '.$this->poste;
-	            $label=$langs->trans("ShowContact");
+        $label.= '<br><b>' . $langs->trans("EMail") . ':</b> '.$this->email;
-	            $linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
+        $phonelist=array();
-	        }
+        if ($this->phone_pro) $phonelist[]=$this->phone_pro;
-	       	$linkclose.= ' title="'.dol_escape_htmltag($label, 1).'"';
+        if ($this->phone_mobile) $phonelist[]=$this->phone_mobile;
-	       	$linkclose.= ' class="classfortooltip">';
+        if ($this->phone_perso) $phonelist[]=$this->phone_perso;
+        $label.= '<br><b>' . $langs->trans("Phone") . ':</b> '.join(', ',$phonelist);
+        $label.= '<br><b>' . $langs->trans("Address") . ':</b> '.dol_format_address($this, 1, ' ', $langs);
+
+        $url = DOL_URL_ROOT.'/contact/card.php?id='.$this->id;
+
+        if ($option !== 'nolink')
+        {
+        	// Add param to save lastsearch_values or not
+        	$add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
+        	if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
+        	if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
+        }
+
+        $url .= $moreparam;
+
+        $linkstart = '<a href="'.$url.'"';
+        $linkclose="";
+    	if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+        {
+            $label=$langs->trans("ShowContact");
+            $linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
+        }
+       	$linkclose.= ' title="'.dol_escape_htmltag($label, 1).'"';
+       	$linkclose.= ' class="classfortooltip">';
 
 		if (! is_object($hookmanager))
 		{
@@ -1030,18 +1044,17 @@ class Contact extends CommonObject
 		$reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) $linkclose = $hookmanager->resPrint;
 
-		$link.=$linkclose;
+		$linkstart.=$linkclose;
-
 		$linkend='</a>';
 
 		if ($option == 'xxx')
 		{
-			$link = '<a href="'.DOL_URL_ROOT.'/contact/card.php?id='.$this->id.$moreparam.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
+			$linkstart = '<a href="'.DOL_URL_ROOT.'/contact/card.php?id='.$this->id.$moreparam.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
 			$linkend='</a>';
 		}
 
-	        if ($withpicto) $result.=($link.img_object($label, 'contact', 'class="classfortooltip"').$linkend.' ');
+	        if ($withpicto) $result.=($linkstart.img_object($label, 'contact', 'class="classfortooltip"').$linkend.' ');
-			$result.=$link.($maxlen?dol_trunc($this->getFullName($langs),$maxlen):$this->getFullName($langs)).$linkend;
+			$result.=$linkstart.($maxlen?dol_trunc($this->getFullName($langs),$maxlen):$this->getFullName($langs)).$linkend;
 		return $result;
 	}
 

htdocs/contact/document.php

@@ -107,8 +107,8 @@ if ($object->id)
         $totalsize+=$file['size'];
     }
 
-    $linkback = '<a href="'.DOL_URL_ROOT.'/contact/list.php">'.$langs->trans("BackToList").'</a>';
+    $linkback = '<a href="'.DOL_URL_ROOT.'/contact/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
-    
+
     $morehtmlref='<div class="refidno">';
     if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
     {
@@ -120,11 +120,11 @@ if ($object->id)
         else $morehtmlref.=$langs->trans("ContactNotLinkedToCompany");
     }
     $morehtmlref.='</div>';
-    
+
     dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref);
-        
+
     print '<div class="fichecenter">';
-    
+
     print '<div class="underbanner clearboth"></div>';
     print '<table class="border centpercent">';
 
@@ -147,7 +147,7 @@ if ($object->id)
     		print '</td></tr>';
     	}
     }*/
-    
+
     // Civility
     print '<tr><td class="titlefield">'.$langs->trans("UserTitle").'</td><td colspan="3">';
     print $object->getCivilityLabel();
@@ -160,7 +160,7 @@ if ($object->id)
     print '</div>';
 
     dol_fiche_end();
-    
+
     $modulepart = 'contact';
     $permission = $user->rights->societe->contact->creer;
     $permtoedit = $user->rights->societe->contact->creer;

htdocs/contact/info.php

@@ -61,7 +61,7 @@ if ($id > 0)
 
 	dol_fiche_head($head, 'info', $title, -1, 'contact');
 
-	$linkback = '<a href="'.DOL_URL_ROOT.'/contact/list.php">'.$langs->trans("BackToList").'</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/contact/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
 	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', '');
 
@@ -71,11 +71,11 @@ if ($id > 0)
 	print '<div class="underbanner clearboth"></div>';
 
 	print '<br>';
-	
+
 	dol_print_object_info($object);
 
 	print '</div>';
-	
+
 	dol_fiche_end();
 }
 

htdocs/contact/ldap.php

@@ -90,6 +90,8 @@ $head = contact_prepare_head($object);
 
 dol_fiche_head($head, 'ldap', $title, -1, 'contact');
 
+$linkback = '<a href="'.DOL_URL_ROOT.'/contact/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+
 dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', '');
 
 print '<div class="fichecenter">';

htdocs/contact/note.php

@@ -74,8 +74,8 @@ if ($id > 0)
     $head = contact_prepare_head($object);
 
     dol_fiche_head($head, 'note', $title, -1, 'contact');
-    
+
-    $linkback = '<a href="'.DOL_URL_ROOT.'/contact/list.php">'.$langs->trans("BackToList").'</a>';
+    $linkback = '<a href="'.DOL_URL_ROOT.'/contact/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
     $morehtmlref='<div class="refidno">';
     if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
@@ -88,13 +88,13 @@ if ($id > 0)
         else $morehtmlref.=$langs->trans("ContactNotLinkedToCompany");
     }
     $morehtmlref.='</div>';
-    
+
     dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref);
-    
+
     $cssclass='titlefield';
     //if ($action == 'editnote_public') $cssclass='titlefieldcreate';
     //if ($action == 'editnote_private') $cssclass='titlefieldcreate';
-    
+
     print '<div class="fichecenter">';
     print '<div class="underbanner clearboth"></div>';
 
@@ -107,12 +107,12 @@ if ($id > 0)
 
     print "</table>";
 
-    
+
 	$cssclass="titlefield";
 	include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
 
 	print '</div>';
-	
+
     dol_fiche_end();
 }
 

htdocs/contact/perso.php

@@ -60,7 +60,7 @@ if ($action == 'update' && ! $_POST["cancel"] && $user->rights->societe->contact
 		$object->old_firstname='';
 		// Logo/Photo save
 		$dir= $conf->societe->dir_output.'/contact/' . get_exdir($object->id,0,0,1,$object,'contact').'/photos';
-		
+
 		$file_OK = is_uploaded_file($_FILES['photo']['tmp_name']);
 		if ($file_OK)
 		{
@@ -88,7 +88,7 @@ if ($action == 'update' && ! $_POST["cancel"] && $user->rights->societe->contact
 					else
 					{
 					    // Create thumbs
-					    $object->addThumbs($newfile);					    
+					    $object->addThumbs($newfile);
 					}
 				}
 			}
@@ -147,26 +147,26 @@ if ($action == 'edit')
     print '<input type="hidden" name="id" value="'.$object->id.'">';
 
     dol_fiche_head($head, 'perso', $title, 0, 'contact');
-    
+
     print '<table class="border" width="100%">';
 
     // Ref
     print '<tr><td class="titlefieldcreate">'.$langs->trans("Ref").'</td><td colspan="3">';
     print $object->id;
     print '</td>';
-    
+
     // Photo
     print '<td align="center" class="hideonsmartphone" valign="middle" rowspan="6">';
     print $form->showphoto('contact',$object)."\n";
     if ($object->photo) print "<br>\n";
-    
+
     print '<table class="nobordernopadding">';
-    
+
     if ($object->photo) print '<tr><td align="center"><input type="checkbox" class="flat photodelete" name="deletephoto" id="photodelete"> '.$langs->trans("Delete").'<br><br></td></tr>';
     print '<tr><td>'.$langs->trans("PhotoFile").'</td></tr>';
     print '<tr><td><input type="file" class="flat" name="photo" id="photoinput"></td></tr>';
     print '</table>';
-    
+
     print '</td></tr>';
 
     // Name
@@ -216,7 +216,7 @@ if ($action == 'edit')
     print "</table>";
 
     dol_fiche_end();
-    
+
     print '<div class="center">';
     print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
     print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
@@ -228,11 +228,11 @@ if ($action == 'edit')
 else
 {
     // View mode
-    
+
     dol_fiche_head($head, 'perso', $title, -1, 'contact');
-    
+
-    $linkback = '<a href="'.DOL_URL_ROOT.'/contact/list.php">'.$langs->trans("BackToList").'</a>';
+    $linkback = '<a href="'.DOL_URL_ROOT.'/contact/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
-    
+
     $morehtmlref='<div class="refidno">';
     if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
     {
@@ -244,13 +244,13 @@ else
         else $morehtmlref.=$langs->trans("ContactNotLinkedToCompany");
     }
     $morehtmlref.='</div>';
-    
+
-    
+
     dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref);
-    
+
-    
+
     print '<div class="fichecenter">';
-    
+
     print '<div class="underbanner clearboth"></div>';
     print '<table class="border centpercent">';
 

htdocs/contrat/card.php

@@ -1311,7 +1311,7 @@ else
 
 		// Contract card
 
-        $linkback = '<a href="'.DOL_URL_ROOT.'/contrat/list.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
+        $linkback = '<a href="'.DOL_URL_ROOT.'/contrat/list.php?restore_lastsearch_values=1'.(! empty($socid)?'&socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
 
 
         $morehtmlref='';

htdocs/contrat/class/contrat.class.php

@@ -1938,19 +1938,29 @@ class Contrat extends CommonObject
 	/**
 	 *	Return clicable name (with picto eventually)
 	 *
-	 *	@param	int		$withpicto		0=No picto, 1=Include picto into link, 2=Only picto
+	 *	@param	int		$withpicto					0=No picto, 1=Include picto into link, 2=Only picto
-	 *	@param	int		$maxlength		Max length of ref
+	 *	@param	int		$maxlength					Max length of ref
-     *  @param	int     $notooltip		1=Disable tooltip
+     *  @param	int     $notooltip					1=Disable tooltip
-	 *	@return	string					Chaine avec URL
+     *  @param  int     $save_lastsearch_value		-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+	 *	@return	string								Chaine avec URL
 	 */
-	function getNomUrl($withpicto=0,$maxlength=0,$notooltip=0)
+	function getNomUrl($withpicto=0, $maxlength=0, $notooltip=0, $save_lastsearch_value=-1)
 	{
 		global $conf, $langs, $user;
 
 		$result='';
 
 		$url = DOL_URL_ROOT.'/contrat/card.php?id='.$this->id;
-        $picto = 'contract';
+
+		//if ($option !== 'nolink')
+		//{
+			// Add param to save lastsearch_values or not
+			$add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
+			if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
+		//}
+
+		$picto = 'contract';
         $label = '';
 
         if ($user->rights->contrat->lire) {

htdocs/contrat/contact.php

@@ -134,9 +134,9 @@ if ($id > 0 || ! empty($ref))
 
 		// Contract card
 
-        $linkback = '<a href="'.DOL_URL_ROOT.'/contrat/list.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
+        $linkback = '<a href="'.DOL_URL_ROOT.'/contrat/list.php?restore_lastsearch_values=1'.(! empty($socid)?'&socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
+
 
-        
         $morehtmlref='';
         //if (! empty($modCodeContract->code_auto)) {
             $morehtmlref.=$object->ref;
@@ -144,7 +144,7 @@ if ($id > 0 || ! empty($ref))
             $morehtmlref.=$form->editfieldkey("",'ref',$object->ref,0,'string','',0,3);
             $morehtmlref.=$form->editfieldval("",'ref',$object->ref,0,'string','',0,2);
         }*/
-        
+
 		$morehtmlref.='<div class="refidno">';
 		// Ref customer
 		$morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_customer', $object->ref_customer, $object, 0, 'string', '', 0, 1);
@@ -196,10 +196,10 @@ if ($id > 0 || ! empty($ref))
 
 	    print '<div class="fichecenter">';
 	    print '<div class="underbanner clearboth"></div>';
-		
+
 		print '<table class="border" width="100%">';
 
-	    
+
         // Ligne info remises tiers
         print '<tr><td class="titlefield">'.$langs->trans('Discount').'</td><td colspan="3">';
         if ($object->thirdparty->remise_percent) print $langs->trans("CompanyHasRelativeDiscount",$object->thirdparty->remise_percent);
@@ -225,7 +225,7 @@ if ($id > 0 || ! empty($ref))
 		print '</div>';
 
 		dol_fiche_end();
-		
+
 		print '<br>';
 
 		// Contacts lines

htdocs/contrat/document.php

@@ -107,7 +107,7 @@ if ($object->id)
 
 	// Contract card
 
-	$linkback = '<a href="'.DOL_URL_ROOT.'/contrat/list.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/contrat/list.php?restore_lastsearch_values=1'.(! empty($socid)?'&socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
 
 
 	$morehtmlref='';
@@ -170,7 +170,7 @@ if ($object->id)
 	print '<div class="fichecenter">';
 	print '<div class="underbanner clearboth"></div>';
 
-	    
+
     print '<table class="border" width="100%">';
     print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
     print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.$totalsize.' '.$langs->trans("bytes").'</td></tr>';
@@ -179,7 +179,7 @@ if ($object->id)
     print '</div>';
 
     dol_fiche_end();
-    
+
     $modulepart = 'contract';
     $permission = $user->rights->contrat->creer;
     $permtoedit = $user->rights->contrat->creer;

htdocs/contrat/info.php

@@ -62,7 +62,7 @@ dol_fiche_head($head, 'info', $langs->trans("Contract"), -1, 'contract');
 
 // Contract card
 
-$linkback = '<a href="'.DOL_URL_ROOT.'/contrat/list.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
+$linkback = '<a href="'.DOL_URL_ROOT.'/contrat/list.php?restore_lastsearch_values=1'.(! empty($socid)?'&socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
 
 
 $morehtmlref='';

htdocs/contrat/list.php

@@ -323,16 +323,17 @@ if ($resql)
 	}
 
     $param='';
-    if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
+    if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.urlencode($contextpage);
     if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
-    if ($sall != '')                $param.='&sall='.$sall;
+    if ($sall != '')                $param.='&sall='.urlencode($sall);
-    if ($search_contract != '')     $param.='&search_contract='.$search_contract;
+    if ($search_contract != '')     $param.='&search_contract='.urlencode($search_contract);
-    if ($search_name != '')         $param.='&search_name='.$search_name;
+    if ($search_name != '')         $param.='&search_name='.urlencode($search_name);
-    if ($search_email != '')        $param.='&search_email='.$search_email;
+    if ($search_email != '')        $param.='&search_email='.urlencode($search_email);
-    if ($search_ref_supplier != '') $param.='&search_ref_supplier='.$search_ref_supplier;
+    if ($search_ref_customer != '') $param.='&search_ref_customer='.urlencode($search_ref_customer);
-    if ($search_sale != '')         $param.='&search_sale=' .$search_sale;
+    if ($search_ref_supplier != '') $param.='&search_ref_supplier='.urlencode($search_ref_supplier);
-    if ($show_files)                $param.='&show_files=' .$show_files;
+    if ($search_sale != '')         $param.='&search_sale=' .urlencode($search_sale);
-    if ($optioncss != '')           $param.='&optioncss='.$optioncss;
+    if ($show_files)                $param.='&show_files=' .urlencode($show_files);
+    if ($optioncss != '')           $param.='&optioncss='.urlencode($optioncss);
     // Add $param from extra fields
     foreach ($search_array_options as $key => $val)
     {
@@ -600,6 +601,11 @@ if ($resql)
         $contracttmp->ref_customer=$obj->ref_customer;
         $contracttmp->ref_supplier=$obj->ref_supplier;
 
+        if ($obj->socid > 0)
+        {
+        	$result=$socstatic->fetch($obj->socid);
+        }
+
         print '<tr class="oddeven">';
         if (! empty($arrayfields['c.ref']['checked']))
         {
@@ -631,7 +637,13 @@ if ($resql)
         }
         if (! empty($arrayfields['s.nom']['checked']))
         {
-            print '<td><a href="../comm/card.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.$obj->name.'</a></td>';
+            print '<td>';
+            //print '<a href="../comm/card.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.$obj->name.'</a>';
+            if ($obj->socid > 0)
+            {
+            	print $socstatic->getNomUrl(1, '');
+            }
+            print '</td>';
         }
         if (! empty($arrayfields['s.email']['checked']))
         {
@@ -683,7 +695,6 @@ if ($resql)
             print '<td>';
             if ($obj->socid > 0)
             {
-            	$result=$socstatic->fetch($obj->socid);
             	$listsalesrepresentatives=$socstatic->getSalesRepresentatives($user);
             	if ($listsalesrepresentatives < 0) dol_print_error($db);
             	$nbofsalesrepresentative=count($listsalesrepresentatives);

htdocs/contrat/note.php

@@ -74,7 +74,7 @@ if ($id > 0 || ! empty($ref))
 
     // Contract card
 
-    $linkback = '<a href="'.DOL_URL_ROOT.'/contrat/list.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
+    $linkback = '<a href="'.DOL_URL_ROOT.'/contrat/list.php?restore_lastsearch_values=1'.(! empty($socid)?'&socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
 
 
     $morehtmlref='';
@@ -139,7 +139,7 @@ if ($id > 0 || ! empty($ref))
 
     print '<table class="border" width="100%">';
 
-     
+
     // Ligne info remises tiers
     print '<tr><td class="titlefield">'.$langs->trans('Discount').'</td><td colspan="3">';
     if ($object->thirdparty->remise_percent) print $langs->trans("CompanyHasRelativeDiscount",$object->thirdparty->remise_percent);
@@ -161,9 +161,9 @@ if ($id > 0 || ! empty($ref))
     print '</tr>';
 
 	print "</table>";
-	
+
 	print '</div>';
-	
+
 	//print '<br>';
 
 	include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';

htdocs/core/actions_linkedfiles.inc.php

@@ -30,9 +30,9 @@ if (GETPOST('sendit') && ! empty($conf->global->MAIN_UPLOAD_DOC))
     if ($object->id)
     {
     	if (! empty($upload_dirold) && ! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))
-            $result = dol_add_file_process($upload_dirold, 0, 1, 'userfile', GETPOST('savingdocmask'));
+            $result = dol_add_file_process($upload_dirold, 0, 1, 'userfile', GETPOST('savingdocmask', 'alpha'));
         else
-            $result = dol_add_file_process($upload_dir, 0, 1, 'userfile', GETPOST('savingdocmask'));
+            $result = dol_add_file_process($upload_dir, 0, 1, 'userfile', GETPOST('savingdocmask', 'alpha'));
     }
 }
 elseif (GETPOST('linkit') && ! empty($conf->global->MAIN_UPLOAD_DOC))
@@ -57,7 +57,7 @@ if ($action == 'confirm_deletefile' && $confirm == 'yes')
     if ($object->id)
     {
         $urlfile = GETPOST('urlfile', 'alpha');	// Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP).
-        if (GETPOST('section')) $file = $upload_dir . "/" . $urlfile;	// For a delete of GED module urlfile contains full path from upload_dir
+        if (GETPOST('section', 'alpha')) $file = $upload_dir . "/" . $urlfile;	// For a delete of GED module urlfile contains full path from upload_dir
         else															// For documents pages, upload_dir contains already path to file from module dir, so we clean path into urlfile.
 		{
        		$urlfile=basename($urlfile);
@@ -116,7 +116,7 @@ if ($action == 'confirm_deletefile' && $confirm == 'yes')
         exit;
     }
 }
-elseif ($action == 'confirm_updateline' && GETPOST('save') && GETPOST('link', 'alpha'))
+elseif ($action == 'confirm_updateline' && GETPOST('save','alpha') && GETPOST('link', 'alpha'))
 {
     require_once DOL_DOCUMENT_ROOT . '/core/class/link.class.php';
     $langs->load('link');
@@ -150,8 +150,8 @@ elseif ($action == 'renamefile' && GETPOST('renamefilesave'))
         //var_dump($upload_dir);exit;
         if (! empty($upload_dir))
         {
-            $filenamefrom=dol_sanitizeFileName(GETPOST('renamefilefrom'));
+            $filenamefrom=dol_sanitizeFileName(GETPOST('renamefilefrom','alpha'));
-            $filenameto=dol_sanitizeFileName(GETPOST('renamefileto'));
+            $filenameto=dol_sanitizeFileName(GETPOST('renamefileto','alpha'));
 
             // Security:
             // Disallow file with some extensions. We rename them.

htdocs/core/class/antivir.class.php

@@ -63,9 +63,9 @@ class AntiVir
 		if (preg_match('/\.virus$/i', $file))
 		{
 		    $this->errors='File has an extension saying file is a virus';
-		    return -97;		    
+		    return -97;
 		}
-		
+
 		$fullcommand=$this->getCliCommand($file);
 		//$fullcommand='"c:\Program Files (x86)\ClamWin\bin\clamscan.exe" --database="C:\Program Files (x86)\ClamWin\lib" "c:\temp\aaa.txt"';
         $fullcommand.=' 2>&1';      // This is to get error output

htdocs/core/class/commondocgenerator.class.php

@@ -418,6 +418,21 @@ abstract class CommonDocGenerator
 			$resarray[$array_key.'_total_discount_ht'] = '';
 		}
 
+		// Fetch project information if there is a project assigned to this object
+		if ($object->element != "project" && ! empty($object->fk_project) && $object->fk_project > 0)
+		{
+			if (! is_object($object->project))
+			{
+				$object->fetch_projet();
+			}
+			
+			$resarray[$array_key.'_project_ref'] = $object->project->ref;
+			$resarray[$array_key.'_project_title'] = $object->project->title;
+			$resarray[$array_key.'_project_description'] = $object->project->description;
+			$resarray[$array_key.'_project_date_start'] = dol_print_date($object->project->date_start, 'day');
+			$resarray[$array_key.'_project_date_end'] = dol_print_date($object->project->date_end, 'day');
+		}
+
 		// Add vat by rates
 		if (is_array($object->lines) && count($object->lines)>0)
 		{

htdocs/core/class/commoninvoice.class.php

@@ -450,8 +450,9 @@ abstract class CommonInvoice extends CommonObject
 
 		$sqltemp = 'SELECT c.type_cdr,c.nbjour,c.decalage';
 		$sqltemp.= ' FROM '.MAIN_DB_PREFIX.'c_payment_term as c';
-		if (is_numeric($cond_reglement)) $sqltemp.= " WHERE c.rowid=".$cond_reglement;
+		$sqltemp.= " WHERE c.entity IN (" . getEntity('c_payment_term').")";
-		else $sqltemp.= " WHERE c.code='".$this->db->escape($cond_reglement)."'";
+		if (is_numeric($cond_reglement)) $sqltemp.= " AND c.rowid=".$cond_reglement;
+		else $sqltemp.= " AND c.code='".$this->db->escape($cond_reglement)."'";
 
 		dol_syslog(get_class($this).'::calculate_date_lim_reglement', LOG_DEBUG);
 		$resqltemp=$this->db->query($sqltemp);

htdocs/core/class/commonobject.class.php

@@ -4594,23 +4594,28 @@ abstract class CommonObject
 				}else {
 					$colspan='3';
 				}
+
 				switch($mode) {
 					case "view":
 						$value=$this->array_options["options_".$key];
 						break;
 					case "edit":
-						if (isset($_POST["options_" . $key])) {
+						// GETPOST("options_" . $key) can be 'abc' or array(0=>'abc')
-							if (is_array($_POST["options_" . $key])) {
+						$getposttemp = GETPOST('options_'.$key, 'none');				// GETPOST can get value from GET, POST or setup of default values.
-								// $_POST["options"] is an array but following code expects a comma separated string
+						if (isset($getposttemp)) {
-								$value = implode(",", $_POST["options_" . $key]);
+							if (is_array($getposttemp)) {
+								// $getposttemp is an array but following code expects a comma separated string
+								$value = implode(",", $getposttemp);
 							} else {
-								$value = $_POST["options_" . $key];
+								$value = $getposttemp;
 							}
 						} else {
-							$value = $this->array_options["options_" . $key];
+							$value = $this->array_options["options_" . $key];			// No GET, no POST, no default value, so we take value of object.
 						}
 						break;
 				}
+				//var_dump($value);
+
 				if ($extrafields->attribute_type[$key] == 'separate')
 				{
 					$out .= $extrafields->showSeparator($key);

htdocs/core/class/extrafields.class.php

@@ -893,7 +893,7 @@ class ExtraFields
 			if (! is_object($form)) $form=new Form($this->db);
 
 			// TODO Must also support $moreparam
-			$out = $form->select_date($value, $keysuffix.'options_'.$key.$keyprefix, $showtime, $showtime, $required, '', 1, 1, 1, 0, 1);
+			$out = $form->select_date($value, $keysuffix.'options_'.$key.$keyprefix, $showtime, $showtime, $required, '', 1, ($keysuffix != 'search_' ? 1 : 0), 1, 0, 1);
 		}
 		elseif (in_array($type,array('int')))
 		{
@@ -1323,7 +1323,8 @@ class ExtraFields
 		}
 		elseif ($type == 'password')
 		{
-			$out='<input type="password" class="flat '.$showsize.'" name="'.$keysuffix.'options_'.$key.$keyprefix.'" value="'.$value.'" '.($moreparam?$moreparam:'').'>';
+			// If prefix is 'search_', field is used as a filter, we use a common text field.
+			$out='<input type="'.($keysuffix=='search_'?'text':'password').'" class="flat '.$showsize.'" name="'.$keysuffix.'options_'.$key.$keyprefix.'" value="'.$value.'" '.($moreparam?$moreparam:'').'>';
 		}
 		if (!empty($hidden)) {
 			$out='<input type="hidden" value="'.$value.'" name="'.$keysuffix.'options_'.$key.$keyprefix.'" id="'.$keysuffix.'options_'.$key.$keyprefix.'"/>';

htdocs/core/class/html.form.class.php

@@ -2737,7 +2737,8 @@ class Form
 
         $sql = "SELECT rowid, code, libelle as label";
         $sql.= " FROM ".MAIN_DB_PREFIX.'c_payment_term';
-        $sql.= " WHERE active > 0";
+        $sql.= " WHERE entity = " . getEntity('c_payment_term');
+        $sql.= " AND active > 0";
         $sql.= " ORDER BY sortorder";
 
         $resql = $this->db->query($sql);
@@ -2951,7 +2952,8 @@ class Form
 
         $sql = "SELECT id, code, libelle as label, type, active";
         $sql.= " FROM ".MAIN_DB_PREFIX."c_paiement";
-        //if ($active >= 0) $sql.= " WHERE active = ".$active;
+        $sql.= " WHERE entity = " . getEntity('c_paiement');
+        //if ($active >= 0) $sql.= " AND active = ".$active;
 
         $resql = $this->db->query($sql);
         if ($resql)

htdocs/core/class/html.formfile.class.php

@@ -57,21 +57,22 @@ class FormFile
     /**
      *  Show form to upload a new file
 	 *
-     *  @param  string	$url			Url
+     *  @param  string		$url			Url
-     *  @param  string	$title			Title zone (Title or '' or 'none')
+     *  @param  string		$title			Title zone (Title or '' or 'none')
      *  @param  int		$addcancel		1=Add 'Cancel' button
      *	@param	int		$sectionid		If upload must be done inside a particular ECM section
      * 	@param	int		$perm			Value of permission to allow upload
-     *  @param  int		$size           Length of input file area. Deprecated.
+     *  @param  int		$size          		Length of input file area. Deprecated.
-     *  @param	Object	$object			Object to use (when attachment is done on an element)
+     *  @param	Object		$object			Object to use (when attachment is done on an element)
-     *  @param	string	$options		Add an option column
+     *  @param	string		$options		Add an option column
-     *  @param	integer	$useajax		Use fileupload ajax (0=never, 1=if enabled, 2=always whatever is option). 2 should never be used.
+     *  @param	integer		$useajax		Use fileupload ajax (0=never, 1=if enabled, 2=always whatever is option). 2 should never be used.
-     *  @param	string	$savingdocmask	Mask to use to define output filename. For example 'XXXXX-__YYYYMMDD__-__file__'
+     *  @param	string		$savingdocmask		Mask to use to define output filename. For example 'XXXXX-__YYYYMMDD__-__file__'
-     *  @param	integer	$linkfiles		1=Also add form to link files, 0=Do not show form to link files
+     *  @param	integer		$linkfiles		1=Also add form to link files, 0=Do not show form to link files
-     *  @param	string	$htmlname		Name and id of HTML form ('formuserfile' by default, 'formuserfileecm' when used to upload a file in ECM)
+     *  @param	string		$htmlname		Name and id of HTML form ('formuserfile' by default, 'formuserfileecm' when used to upload a file in ECM)
+     *  @param	string		$accept			Specifies the types of files accepted (This is not a security check but an user interface facility. eg '.pdf,image/*' or '.png,.jpg' or 'video/*')
      * 	@return	int						<0 if KO, >0 if OK
      */
-    function form_attach_new_file($url, $title='', $addcancel=0, $sectionid=0, $perm=1, $size=50, $object='', $options='', $useajax=1, $savingdocmask='', $linkfiles=1, $htmlname='formuserfile')
+    function form_attach_new_file($url, $title='', $addcancel=0, $sectionid=0, $perm=1, $size=50, $object='', $options='', $useajax=1, $savingdocmask='', $linkfiles=1, $htmlname='formuserfile', $accept='')
     {
         global $conf,$langs, $hookmanager;
         $hookmanager->initHooks(array('formfile'));
@@ -130,6 +131,7 @@ class FormFile
             $out .= '<input class="flat minwidth400" type="file"';
             $out .= ((! empty($conf->global->MAIN_DISABLE_MULTIPLE_FILEUPLOAD) || $conf->browser->layout != 'classic')?' name="userfile"':' name="userfile[]" multiple');
             $out .= (empty($conf->global->MAIN_UPLOAD_DOC) || empty($perm)?' disabled':'');
+            $out .= (!empty($accept)?' accept="'.$accept.'"':'accept=""');
             $out .= '>';
             $out .= ' ';
             $out .= '<input type="submit" class="button" name="sendit" value="'.$langs->trans("Upload").'"';

htdocs/core/class/translate.class.php

@@ -151,7 +151,7 @@ class Translate
 	        $this->load($domain);
 	    }
 	}
-	
+
 	/**
 	 *  Load translation key-value for a particular file, into a memory array.
 	 *  If data for file already loaded, do nothing.
@@ -177,7 +177,7 @@ class Translate
 		global $conf,$db;
 
 		//dol_syslog("Translate::Load Start domain=".$domain." alt=".$alt." forcelangdir=".$forcelangdir." this->defaultlang=".$this->defaultlang);
-		
+
 		// Check parameters
 		if (empty($domain))
 		{
@@ -185,8 +185,8 @@ class Translate
 		    return -1;
 		}
 		if ($this->defaultlang == 'none_NONE') return 0;    // Special language code to not translate keys
-		
+
-		
+
 		// Load $this->tab_translate[] from database
 		if (empty($loadfromfileonly) && count($this->tab_translate) == 0) $this->loadFromDatabase($db);      // Nothing was loaded yet, so we load database.
 
@@ -278,14 +278,14 @@ class Translate
 						 * and split the rest until a line feed.
 						 * This is more efficient than fgets + explode + trim by a factor of ~2.
 						 */
-						while ($line = fscanf($fp, "%[^= ]%*[ =]%[^\n]")) 
+						while ($line = fscanf($fp, "%[^= ]%*[ =]%[^\n]"))
 						{
-							if (isset($line[1])) 
+							if (isset($line[1]))
 							{
 								list($key, $value) = $line;
 								//if ($domain == 'orders') print "Domain=$domain, found a string for $tab[0] with value $tab[1]. Currently in cache ".$this->tab_translate[$key]."<br>";
 								//if ($key == 'Order') print "Domain=$domain, found a string for key=$key=$tab[0] with value $tab[1]. Currently in cache ".$this->tab_translate[$key]."<br>";
-								if (empty($this->tab_translate[$key])) 
+								if (empty($this->tab_translate[$key]))
 								{ // If translation was already found, we must not continue, even if MAIN_FORCELANGDIR is set (MAIN_FORCELANGDIR is to replace lang dir, not to overwrite entries)
 									$value = preg_replace('/\\n/', "\n", $value); // Parse and render carriage returns
 									if ($key == 'DIRECTION') { // This is to declare direction of language
@@ -375,8 +375,8 @@ class Translate
                     if (! empty($tmparray2[1])) $this->tab_translate[$tmparray2[0]]=$tmparray2[1];
                 }
             }
-		}		
+		}
-        
+
         // Check to be sure that SeparatorDecimal differs from SeparatorThousand
 		if (! empty($this->tab_translate["SeparatorDecimal"]) && ! empty($this->tab_translate["SeparatorThousand"])
 		&& $this->tab_translate["SeparatorDecimal"] == $this->tab_translate["SeparatorThousand"]) $this->tab_translate["SeparatorThousand"]='';
@@ -401,7 +401,7 @@ class Translate
 		global $conf;
 
 		$domain='database';
-		
+
 		// Check parameters
 		if (empty($db)) return 0;    // Database handler can't be used
 
@@ -418,7 +418,7 @@ class Translate
 		}
 
 		$this->_tab_loaded[$newdomain] = 1;   // We want to be sure this function is called once only.
-		
+
         $fileread=0;
 		$langofdir=(empty($forcelangdir)?$this->defaultlang:$forcelangdir);
 
@@ -467,24 +467,24 @@ class Translate
 		if (! $found && ! empty($conf->global->MAIN_ENABLE_OVERWRITE_TRANSLATION))
 		{
     		// Overwrite translation with database read
-            $sql="SELECT transkey, transvalue FROM ".MAIN_DB_PREFIX."overwrite_trans where lang='".$db->escape($this->defaultlang)."'";            
+            $sql="SELECT transkey, transvalue FROM ".MAIN_DB_PREFIX."overwrite_trans where lang='".$db->escape($this->defaultlang)."'";
 		    $resql=$db->query($sql);
-		    
+
 		    if ($resql)
 		    {
     		    $num = $db->num_rows($resql);
     		    if ($num)
     		    {
     				if ($usecachekey) $tabtranslatedomain=array();	// To save lang content in cache
-    
+
     				$i = 0;
     				while ($i < $num)	// Ex: Need 225ms for all fgets on all lang file for Third party page. Same speed than file_get_contents
     				{
     				    $obj=$db->fetch_object($resql);
-    
+
     				    $key=$obj->transkey;
     					$value=$obj->transvalue;
-    					
+
 						//print "Domain=$domain, found a string for $tab[0] with value $tab[1]<br>";
 						if (empty($this->tab_translate[$key]))    // If translation was already found, we must not continue, even if MAIN_FORCELANGDIR is set (MAIN_FORCELANGDIR is to replace lang dir, not to overwrite entries)
 						{
@@ -493,12 +493,12 @@ class Translate
 							$this->tab_translate[$key]=$value;
 							if ($usecachekey) $tabtranslatedomain[$key]=$value;	// To save lang content in cache
 						}
-    					
+
     					$i++;
     				}
-    
+
     				$fileread=1;
-    
+
     				// TODO Move cache write out of loop on dirs
     				// To save lang content for usecachekey into cache
     				if ($usecachekey && count($tabtranslatedomain))
@@ -524,9 +524,9 @@ class Translate
 
 		return 1;
 	}
-	
+
-	
+
-                
+
 	/**
 	 * Return translated value of key for special keys ("Currency...", "Civility...", ...).
 	 * Search in lang file, then into database. Key must be any complete entry into lang file: CurrencyEUR, ...
@@ -559,7 +559,7 @@ class Translate
 		}
         elseif (preg_match('/^PaymentTypeShort([0-9A-Z]+)$/i',$key,$reg))
         {
-            $newstr=$this->getLabelFromKey($db,$reg[1],'c_paiement','code','libelle');
+            $newstr=$this->getLabelFromKey($db,$reg[1],'c_paiement','code','libelle','',1);
         }
 		elseif (preg_match('/^OppStatusShort([0-9A-Z]+)$/i',$key,$reg))
         {
@@ -611,8 +611,8 @@ class Translate
                     $str=preg_replace('/'.preg_quote($tmparray2[0]).'/',$tmparray2[1],$str);
                 }
             }
-        
+
-            if (! preg_match('/^Format/',$key)) 
+            if (! preg_match('/^Format/',$key))
             {
             	//print $str;
             	$str=sprintf($str,$param1,$param2,$param3,$param4);	// Replace %s and %d except for FormatXXX strings.
@@ -690,9 +690,9 @@ class Translate
                     $tmparray2=explode(':',$tmp);
                     $str=preg_replace('/'.preg_quote($tmparray2[0]).'/',$tmparray2[1],$str);
                 }
-            }    		
+            }
 
-            if (! preg_match('/^Format/',$key)) 
+            if (! preg_match('/^Format/',$key))
             {
             	//print $str;
            		$str=sprintf($str,$param1,$param2,$param3,$param4);	// Replace %s and %d except for FormatXXX strings.
@@ -867,10 +867,11 @@ class Translate
 	 * 		@param	string	$fieldkey		Field for key
 	 * 		@param	string	$fieldlabel		Field for label
 	 *      @param	string	$keyforselect	Use another value than the translation key for the where into select
+	 *      @param  int		$filteronentity	Use a filter on entity
 	 *      @return string					Label in UTF8 (but without entities)
 	 *      @see dol_getIdFromCode
 	 */
-	function getLabelFromKey($db,$key,$tablename,$fieldkey,$fieldlabel,$keyforselect='')
+	function getLabelFromKey($db,$key,$tablename,$fieldkey,$fieldlabel,$keyforselect='',$filteronentity=0)
 	{
 		// If key empty
 		if ($key == '') return '';
@@ -893,6 +894,7 @@ class Translate
 		$sql = "SELECT ".$fieldlabel." as label";
 		$sql.= " FROM ".MAIN_DB_PREFIX.$tablename;
 		$sql.= " WHERE ".$fieldkey." = '".($keyforselect?$keyforselect:$key)."'";
+		if ($filteronentity) $sql.= " AND entity IN (" . getEntity($tablename). ')';
 		dol_syslog(get_class($this).'::getLabelFromKey', LOG_DEBUG);
 		$resql = $db->query($sql);
 		if ($resql)
@@ -930,7 +932,7 @@ class Translate
 	}
 
 	/**
-	 *	Return a currency code into its symbol. 
+	 *	Return a currency code into its symbol.
 	 *  If mb_convert_encoding is not available, return currency code.
 	 *
 	 *  @param	string	$currency_code		Currency code

htdocs/core/js/lib_head.js.php

@@ -506,26 +506,26 @@ function getDateFromFormat(val,format)
         if (substr == "MM" ||substr == "M")
         {
             month=getIntegerInString(val,d,1,2);
-            d -= 2- month.length;
+            if (month) d -= 2- month.length;
         }
         if (substr == "dd")
         {
             day=getIntegerInString(val,d,1,2);
-            d -= 2- day.length;
+            if (day) d -= 2- day.length;
         }
         if (substr == "HH" ||substr == "hh" )
         {
             hour=getIntegerInString(val,d,1,2);
-            d -= 2- hour.length;
+            if (dhouray) d -= 2- hour.length;
         }
         if (substr == "mm"){
             minute=getIntegerInString(val,d,1,2);
-            d -= 2- minute.length;
+            if (minute) d -= 2- minute.length;
         }
         if (substr == "ss")
         {
             seconde=getIntegerInString(val,d,1,2);
-            d -= 2- seconde.length;
+            if (seconde) d -= 2- seconde.length;
         }
 
 		i+=substr.length;

htdocs/core/lib/bank.lib.php

@@ -42,7 +42,7 @@ function bank_prepare_head(Account $object)
     $head[$h][2] = 'bankname';
     $h++;
 
-    $head[$h][0] = DOL_URL_ROOT . "/compta/bank/bankentries.php?id=" . $object->id;
+    $head[$h][0] = DOL_URL_ROOT . "/compta/bank/bankentries_list.php?id=" . $object->id;
     $head[$h][1] = $langs->trans("BankTransactions");
     $head[$h][2] = 'journal';
     $h++;
@@ -95,7 +95,7 @@ function bank_prepare_head(Account $object)
     $head[$h][1] = $langs->trans("Info");
     $head[$h][2] = 'info';
     $h++;*/
-    
+
 	complete_head_from_modules($conf, $langs, $object, $head, $h, 'bank', 'remove');
 
     return $head;
@@ -146,9 +146,9 @@ function bank_admin_prepare_head($object)
  * @return  array				Array of tabs to shoc
  */
 function various_payment_prepare_head($object) {
-	
+
 	global $db, $langs, $conf;
-	
+
 	$h = 0;
 	$head = array();
 
@@ -178,7 +178,7 @@ function various_payment_prepare_head($object) {
 	$head[$h][1] = $langs->trans("Info");
 	$head[$h][2] = 'info';
 	$h++;
-    
+
 	complete_head_from_modules($conf,$langs,$object,$head,$h,'various_payment', 'remove');
 
 	return $head;
@@ -247,7 +247,7 @@ function checkBanForAccount($account)
         $rib = strtr($rib, "abcdefghijklmnopqrstuvwxyz", "12345678912345678923456789");
         // Separation du rib en 3 groupes de 7 + 1 groupe de 2.
         // Multiplication de chaque groupe par les coef du tableau
-    
+
         for ($i = 0, $s = 0; $i < 3; $i++) {
             $code = substr($rib, 7 * $i, 7);
             $s += (0 + (int) $code) * $coef[$i];

htdocs/core/lib/files.lib.php

@@ -1475,19 +1475,17 @@ function dol_add_file_process($upload_dir, $allowoverwrite=0, $donotupdatesessio
 				$destfull=$upload_dir . "/" . $TFile['name'][$i];
 				$destfile=$TFile['name'][$i];
 
-				$savingdocmask = dol_sanitizeFileName($savingdocmask);
-
 				if ($savingdocmask)
 				{
 					$destfull=$upload_dir . "/" . preg_replace('/__file__/',$TFile['name'][$i],$savingdocmask);
 					$destfile=preg_replace('/__file__/',$TFile['name'][$i],$savingdocmask);
 				}
 
-				// lowercase extension
+				// dol_sanitizeFileName the file name and lowercase extension
 				$info = pathinfo($destfull);
-				$destfull = $info['dirname'].'/'.$info['filename'].'.'.strtolower($info['extension']);
+				$destfull = $info['dirname'].'/'.dol_sanitizeFileName($info['filename'].'.'.strtolower($info['extension']));
 				$info = pathinfo($destfile);
-				$destfile = $info['filename'].'.'.strtolower($info['extension']);
+				$destfile = dol_sanitizeFileName($info['filename'].'.'.strtolower($info['extension']));
 
 				$resupload = dol_move_uploaded_file($TFile['tmp_name'][$i], $destfull, $allowoverwrite, 0, $TFile['error'][$i], 0, $varfiles);
 

htdocs/core/lib/functions.lib.php

@@ -102,18 +102,21 @@ function getDoliDBInstance($type, $host, $user, $pass, $name, $port)
 /**
  * 	Get list of entity id to use.
  *
- * 	@param	string	$element	Current element
+ * 	@param	string	$element		Current element
- *                              'societe', 'socpeople', 'actioncomm', 'agenda', 'resource',
+ *									'societe', 'socpeople', 'actioncomm', 'agenda', 'resource',
- *                              'product', 'productprice', 'stock',
+ *									'product', 'productprice', 'stock',
- *                              'propal', 'supplier_proposal', 'facture', 'facture_fourn',
+ *									'propal', 'supplier_proposal', 'facture', 'facture_fourn',
- *                              'categorie', 'bank_account', 'bank_account', 'adherent', 'user',
+ *									'categorie', 'bank_account', 'bank_account', 'adherent', 'user',
- *                              'commande', 'commande_fournisseur', 'expedition', 'intervention', 'survey',
+ *									'commande', 'commande_fournisseur', 'expedition', 'intervention', 'survey',
- *                              'contract', 'tax', 'expensereport', 'holiday', 'multicurrency', 'project',
+ *									'contract', 'tax', 'expensereport', 'holiday', 'multicurrency', 'project',
- *                              'email_template', 'event',
+ *									'email_template', 'event',
- * 	@param	int	     $shared	1=Return id of current entity + shared entities (default), 0=Return id of current entity only
+ *									'c_paiement', ...
+ * 	@param	int		$shared			0=Return id of current entity only,
+ * 									1=Return id of current entity + shared entities (default)
+ *  @param	int		$forceentity	Entity id
  * 	@return	mixed				Entity id(s) to use
  */
-function getEntity($element, $shared=1)
+function getEntity($element, $shared=1, $forceentity=null)
 {
 	global $conf, $mc;
 
@@ -124,7 +127,7 @@ function getEntity($element, $shared=1)
 
 	if (is_object($mc))
 	{
-		return $mc->getEntity($element, $shared);
+		return $mc->getEntity($element, $shared, $forceentity);
 	}
 	else
 	{
@@ -312,111 +315,126 @@ function GETPOST($paramname, $check='alpha', $method=0, $filter=NULL, $options=N
 	    {
 	    	if (! empty($_GET['action']) && $_GET['action'] == 'create' && ! isset($_GET[$paramname]) && ! isset($_POST[$paramname]))
 	        {
-	            if (! empty($user->default_values))		// $user->default_values defined from menu default values
+	            if (! empty($user->default_values))		// $user->default_values defined from menu 'Setup - Default values'
 	            {
-					$qualified=1;
+					if (isset($user->default_values[$relativepathstring]['createform']))
-                	if (isset($user->default_values[$relativepathstring]['createform_queries']))	// Even if paramname is sortfield, data are stored into ['sortorder...']
-                	{
-                		$tmpqueryarraytohave=explode('&', $user->default_values[$relativepathstring]['createform_queries']);
-                		$tmpqueryarraywehave=explode('&', dol_string_nohtmltag($_SERVER['QUERY_STRING']));
-                		foreach($tmpqueryarraytohave as $tmpquerytohave)
-                		{
-                			if (! in_array($tmpquerytohave, $tmpqueryarraywehave)) $qualified=0;
-                		}
-                	}
-					if ($qualified)
 					{
-		            	//var_dump($user->default_values[$relativepathstring]['createform']);
+						foreach($user->default_values[$relativepathstring]['createform'] as $defkey => $defval)
-		                if (isset($user->default_values[$relativepathstring]['createform'][$paramname])) $out = $user->default_values[$relativepathstring]['createform'][$paramname];
+						{
+							$qualified = 0;
+							if ($defkey != '_noquery_')
+							{
+								$tmpqueryarraytohave=explode('&', $defkey);
+								$tmpqueryarraywehave=explode('&', dol_string_nohtmltag($_SERVER['QUERY_STRING']));
+								$foundintru=0;
+								foreach($tmpqueryarraytohave as $tmpquerytohave)
+								{
+									if (! in_array($tmpquerytohave, $tmpqueryarraywehave)) $foundintru=1;
+								}
+								if (! $foundintru) $qualified=1;
+								//var_dump($defkey.'-'.$qualified);
+							}
+							else $qualified = 1;
+
+							if ($qualified)
+							{
+				            	//var_dump($user->default_values[$relativepathstring][$defkey]['createform']);
+				                if (isset($user->default_values[$relativepathstring]['createform'][$defkey][$paramname]))
+				                {
+				                	$out = $user->default_values[$relativepathstring]['createform'][$defkey][$paramname];
+				                	break;
+				                }
+							}
+						}
 					}
-	            }
+				}
 	        }
 	        // Management of default search_filters and sort order
 	        //elseif (preg_match('/list.php$/', $_SERVER["PHP_SELF"]) && ! empty($paramname) && ! isset($_GET[$paramname]) && ! isset($_POST[$paramname]))
 	        elseif (! empty($paramname) && ! isset($_GET[$paramname]) && ! isset($_POST[$paramname]))
 	        {
-	            if (! empty($user->default_values))		// $user->default_values defined from menu default values
+	            if (! empty($user->default_values))		// $user->default_values defined from menu 'Setup - Default values'
 	            {
 	                //var_dump($user->default_values[$relativepathstring]);
-	                if ($paramname == 'sortfield')			// Sorted on which fields ?
+	                if ($paramname == 'sortfield' || $paramname == 'sortorder')			// Sorted on which fields ? ASC or DESC ?
 	                {
-	                	$qualified=1;
+	                	if (isset($user->default_values[$relativepathstring]['sortorder']))	// Even if paramname is sortfield, data are stored into ['sortorder...']
-	                	if (isset($user->default_values[$relativepathstring]['sortorder_queries']))	// Even if paramname is sortfield, data are stored into ['sortorder...']
 	                	{
-	                		$tmpqueryarraytohave=explode('&', $user->default_values[$relativepathstring]['sortorder_queries']);
+	                		foreach($user->default_values[$relativepathstring]['sortorder'] as $defkey => $defval)
-	                		$tmpqueryarraywehave=explode('&', dol_string_nohtmltag($_SERVER['QUERY_STRING']));
-	                		foreach($tmpqueryarraytohave as $tmpquerytohave)
 	                		{
-	                			if (! in_array($tmpquerytohave, $tmpqueryarraywehave)) $qualified=0;
+	                			$qualified = 0;
-	                		}
+	                			if ($defkey != '_noquery_')
-	                	}
+	                			{
-						if ($qualified)
+	                				$tmpqueryarraytohave=explode('&', $defkey);
-						{
+	                				$tmpqueryarraywehave=explode('&', dol_string_nohtmltag($_SERVER['QUERY_STRING']));
-		                	if (isset($user->default_values[$relativepathstring]['sortorder']))    // We will use the key of $user->default_values[path][sortorder]
+	                				$foundintru=0;
-		                    {
+	                				foreach($tmpqueryarraytohave as $tmpquerytohave)
-		                        $forbidden_chars_to_replace=array(" ","'","/","\\",":","*","?","\"","<",">","|","[","]",";","=");  // we accept _, -, . and ,
+	                				{
-		                        foreach($user->default_values[$relativepathstring]['sortorder'] as $key => $val)
+	                					if (! in_array($tmpquerytohave, $tmpqueryarraywehave)) $foundintru=1;
-		                        {
+	                				}
-		                            if ($out) $out.=', ';
+	                				if (! $foundintru) $qualified=1;
-		                            $out.=dol_string_nospecial($key, '', $forbidden_chars_to_replace);
+	                				//var_dump($defkey.'-'.$qualified);
-		                        }
+	                			}
+	                			else $qualified = 1;
+
+	                			if ($qualified)
+	                			{
+		                        	$forbidden_chars_to_replace=array(" ","'","/","\\",":","*","?","\"","<",">","|","[","]",";","=");  // we accept _, -, . and ,
+		                        	foreach($user->default_values[$relativepathstring]['sortorder'][$defkey] as $key => $val)
+		                        	{
+		                        		if ($out) $out.=', ';
+		                        		if ($paramname == 'sortfield')
+		                        		{
+	                            			$out.=dol_string_nospecial($key, '', $forbidden_chars_to_replace);
+		                        		}
+	                        			if ($paramname == 'sortorder')
+	                        			{
+		                        			$out.=dol_string_nospecial($val, '', $forbidden_chars_to_replace);
+		                        		}
+		                        	}
+	                            	//break;	// No break for sortfield and sortorder so we can cumulate fields (is it realy usefull ?)
+	                			}
 		                    }
 						}
 	                }
-	                elseif ($paramname == 'sortorder')		// ASC or DESC ?
+	                elseif (isset($user->default_values[$relativepathstring]['filters']))
 	                {
-	                	$qualified=1;
+	                	foreach($user->default_values[$relativepathstring]['filters'] as $defkey => $defval)
-	                	if (isset($user->default_values[$relativepathstring]['sortorder_queries']))
 	                	{
-	                		$tmpqueryarraytohave=explode('&', $user->default_values[$relativepathstring]['sortorder_queries']);
+		                	$qualified = 0;
-	                		$tmpqueryarraywehave=explode('&', dol_string_nohtmltag($_SERVER['QUERY_STRING']));
+		                	if ($defkey != '_noquery_')
-	                		foreach($tmpqueryarraytohave as $tmpquerytohave)
-	                		{
-	                			if (! in_array($tmpquerytohave, $tmpqueryarraywehave)) $qualified=0;
-	                		}
-	                	}
-						if ($qualified)
-						{
-		                	if (isset($user->default_values[$relativepathstring]['sortorder']))    // We will use the val of $user->default_values[path][sortorder]
-		                    {
-		                        $forbidden_chars_to_replace=array(" ","'","/","\\",":","*","?","\"","<",">","|","[","]",";","=");  // we accept _, -, . and ,
-		                        foreach($user->default_values[$relativepathstring]['sortorder'] as $key => $val)
-		                        {
-		                            if ($out) $out.=', ';
-		                            $out.=dol_string_nospecial($val, '', $forbidden_chars_to_replace);
-		                        }
-		                    }
-						}
-	                }
-	                elseif (isset($user->default_values[$relativepathstring]['filters'][$paramname]))
-	                {
-	                	$qualified=1;
-	                	if (isset($user->default_values[$relativepathstring]['filters_queries']))
-	                	{
-	                		$tmpqueryarraytohave=explode('&', $user->default_values[$relativepathstring]['filters_queries']);
-	                		$tmpqueryarraywehave=explode('&', dol_string_nohtmltag($_SERVER['QUERY_STRING']));
-	                		foreach($tmpqueryarraytohave as $tmpquerytohave)
-	                		{
-	                			if (! in_array($tmpquerytohave, $tmpqueryarraywehave)) $qualified=0;
-	                		}
-	                	}
-						if ($qualified)
-						{
-		                	if (isset($_POST['sall']) || isset($_POST['search_all']) || isset($_GET['sall']) || isset($_GET['search_all']))
 		                	{
-		                		// We made a search from quick search menu, do we still use default filter ?
+		                		$tmpqueryarraytohave=explode('&', $defkey);
-		                		if (empty($conf->global->MAIN_DISABLE_DEFAULT_FILTER_FOR_QUICK_SEARCH))
+		                		$tmpqueryarraywehave=explode('&', dol_string_nohtmltag($_SERVER['QUERY_STRING']));
+		                		$foundintru=0;
+		                		foreach($tmpqueryarraytohave as $tmpquerytohave)
 		                		{
-		                    		$forbidden_chars_to_replace=array(" ","'","/","\\",":","*","?","\"","<",">","|","[","]",";","=");  // we accept _, -, . and ,
+		                			if (! in_array($tmpquerytohave, $tmpqueryarraywehave)) $foundintru=1;
-		                    		$out = dol_string_nospecial($user->default_values[$relativepathstring]['filters'][$paramname], '', $forbidden_chars_to_replace);
 		                		}
+		                		if (! $foundintru) $qualified=1;
+		                		//var_dump($defkey.'-'.$qualified);
 		                	}
-		                	else
+		                	else $qualified = 1;
-		                	{
+
-		                    	$forbidden_chars_to_replace=array(" ","'","/","\\",":","*","?","\"","<",">","|","[","]",";","=");  // we accept _, -, . and ,
+							if ($qualified)
-		                    	$out = dol_string_nospecial($user->default_values[$relativepathstring]['filters'][$paramname], '', $forbidden_chars_to_replace);
+							{
-		                	}
+			                	if (isset($_POST['sall']) || isset($_POST['search_all']) || isset($_GET['sall']) || isset($_GET['search_all']))
-						}
+			                	{
+			                		// We made a search from quick search menu, do we still use default filter ?
+			                		if (empty($conf->global->MAIN_DISABLE_DEFAULT_FILTER_FOR_QUICK_SEARCH))
+			                		{
+			                    		$forbidden_chars_to_replace=array(" ","'","/","\\",":","*","?","\"","<",">","|","[","]",";","=");  // we accept _, -, . and ,
+			                    		$out = dol_string_nospecial($user->default_values[$relativepathstring]['filters'][$defkey][$paramname], '', $forbidden_chars_to_replace);
+			                		}
+			                	}
+			                	else
+			                	{
+			                    	$forbidden_chars_to_replace=array(" ","'","/","\\",":","*","?","\"","<",">","|","[","]",";","=");  // we accept _, -, . and ,
+			                    	$out = dol_string_nospecial($user->default_values[$relativepathstring]['filters'][$defkey][$paramname], '', $forbidden_chars_to_replace);
+			                	}
+			                	break;
+							}
+	                	}
 	                }
 	            }
 	        }
@@ -424,14 +442,14 @@ function GETPOST($paramname, $check='alpha', $method=0, $filter=NULL, $options=N
 
 	}
 
-	    // Substitution variables for GETPOST (used to get final url with variable parameters or final default value with variable paramaters)
+	// Substitution variables for GETPOST (used to get final url with variable parameters or final default value with variable paramaters)
-	    // Example of variables: __DAY__, __MONTH__, __YEAR__, __MYCOUNTRYID__, __USERID__, __ENTITYID__, ...
+	// Example of variables: __DAY__, __MONTH__, __YEAR__, __MYCOUNTRYID__, __USERID__, __ENTITYID__, ...
-	    // We do this only if var is a GET. If it is a POST, may be we want to post the text with vars as the setup text.
+	// We do this only if var is a GET. If it is a POST, may be we want to post the text with vars as the setup text.
-	    if (! is_array($out) && empty($_POST[$paramname]))
+	if (! is_array($out) && empty($_POST[$paramname]))
+	{
+	    $maxloop=20; $loopnb=0;    // Protection against infinite loop
+	    while (preg_match('/__([A-Z0-9]+_?[A-Z0-9]+)__/i', $out, $reg) && ($loopnb < $maxloop))    // Detect '__ABCDEF__' as key 'ABCDEF' and '__ABC_DEF__' as key 'ABC_DEF'. Detection is also correct when 2 vars are side by side.
 	    {
-	        $maxloop=20; $loopnb=0;    // Protection against infinite loop
-	        while (preg_match('/__([A-Z0-9]+_?[A-Z0-9]+)__/i', $out, $reg) && ($loopnb < $maxloop))    // Detect '__ABCDEF__' as key 'ABCDEF' and '__ABC_DEF__' as key 'ABC_DEF'. Detection is also correct when 2 vars are side by side.
-	        {
 	            $loopnb++; $newout = '';
 
     	        if ($reg[1] == 'DAY')                { $tmp=dol_getdate(dol_now(), true); $newout = $tmp['mday']; }
@@ -462,57 +480,57 @@ function GETPOST($paramname, $check='alpha', $method=0, $filter=NULL, $options=N
     	        else $newout = '';     // Key not found, we replace with empty string
     	        //var_dump('__'.$reg[1].'__ -> '.$newout);
     	        $out = preg_replace('/__'.preg_quote($reg[1],'/').'__/', $newout, $out);
-	        }
 	    }
+	}
 
-	    // Check is done after replacement
+    // Check is done after replacement
-	    switch ($check)
+    switch ($check)
-	    {
+    {
-	        case 'none':
+        case 'none':
-	            break;
+            break;
-	        case 'int':    // Check param is a numeric value (integer but also float or hexadecimal)
+        case 'int':    // Check param is a numeric value (integer but also float or hexadecimal)
-	            if (! is_numeric($out)) { $out=''; }
+            if (! is_numeric($out)) { $out=''; }
-	            break;
+            break;
-	        case 'intcomma':
+        case 'intcomma':
-	            if (preg_match('/[^0-9,]+/i',$out)) $out='';
+            if (preg_match('/[^0-9,]+/i',$out)) $out='';
-	            break;
+            break;
-	        case 'alpha':
+        case 'alpha':
-	            $out=trim($out);
+            $out=trim($out);
-	            // '"' is dangerous because param in url can close the href= or src= and add javascript functions.
+            // '"' is dangerous because param in url can close the href= or src= and add javascript functions.
-	            // '../' is dangerous because it allows dir transversals
+            // '../' is dangerous because it allows dir transversals
-	            if (preg_match('/"/',$out)) $out='';
+            if (preg_match('/"/',$out)) $out='';
-	            else if (preg_match('/\.\.\//',$out)) $out='';
+            else if (preg_match('/\.\.\//',$out)) $out='';
-	            break;
+            break;
-	        case 'san_alpha':
+        case 'san_alpha':
-	            $out=filter_var($out,FILTER_SANITIZE_STRING);
+            $out=filter_var($out,FILTER_SANITIZE_STRING);
-	            break;
+            break;
-	        case 'aZ':
+        case 'aZ':
-	            $out=trim($out);
+            $out=trim($out);
-	            if (preg_match('/[^a-z]+/i',$out)) $out='';
+            if (preg_match('/[^a-z]+/i',$out)) $out='';
-	            break;
+            break;
-	        case 'aZ09':
+        case 'aZ09':
-	            $out=trim($out);
+            $out=trim($out);
-	            if (preg_match('/[^a-z0-9_\-\.]+/i',$out)) $out='';
+            if (preg_match('/[^a-z0-9_\-\.]+/i',$out)) $out='';
-	            break;
+            break;
-	        case 'array':
+        case 'array':
-	            if (! is_array($out) || empty($out)) $out=array();
+            if (! is_array($out) || empty($out)) $out=array();
-	            break;
+            break;
-			case 'nohtml':
+		case 'nohtml':
-			    $out=dol_string_nohtmltag($out);
+		    $out=dol_string_nohtmltag($out);
-				break;
+			break;
-			case 'alphanohtml':	// Recommended for search params
+		case 'alphanohtml':	// Recommended for search params
-	            $out=trim($out);
+            $out=trim($out);
-	            // '"' is dangerous because param in url can close the href= or src= and add javascript functions.
+            // '"' is dangerous because param in url can close the href= or src= and add javascript functions.
-	            // '../' is dangerous because it allows dir transversals
+            // '../' is dangerous because it allows dir transversals
-	            if (preg_match('/"/',$out)) $out='';
+            if (preg_match('/"/',$out)) $out='';
-	            else if (preg_match('/\.\.\//',$out)) $out='';
+            else if (preg_match('/\.\.\//',$out)) $out='';
-			    $out=dol_string_nohtmltag($out);
+		    $out=dol_string_nohtmltag($out);
-				break;
+			break;
-			case 'custom':
+		case 'custom':
-	            if (empty($filter)) return 'BadFourthParameterForGETPOST';
+            if (empty($filter)) return 'BadFourthParameterForGETPOST';
-	            $out=filter_var($out, $filter, $options);
+            $out=filter_var($out, $filter, $options);
-	            break;
+            break;
-	    }
+    }
 
     // Code for search criteria persistence.
 	// Save data into session if key start with 'search_' or is 'smonth', 'syear', 'month', 'year'
@@ -745,7 +763,7 @@ function dol_size($size,$type='')
  */
 function dol_sanitizeFileName($str,$newstr='_',$unaccent=1)
 {
-	$filesystem_forbidden_chars = array('<','>',':','/','\\','?','*','|','"','°');
+	$filesystem_forbidden_chars = array('<','>','/','\\','?','*','|','"','°');
 	return dol_string_nospecial($unaccent?dol_string_unaccent($str):$str, $newstr, $filesystem_forbidden_chars);
 }
 
@@ -882,16 +900,15 @@ function dol_escape_js($stringtoescape, $mode=0, $noescapebackslashn=0)
  *  @param		int			$keepb				1=Preserve b tags (otherwise, remove them)
  *  @param      int         $keepn              1=Preserve \r\n strings (otherwise, remove them)
  *  @return     string     				 		Escaped string
- *
  *  @see		dol_string_nohtmltag
  */
 function dol_escape_htmltag($stringtoescape, $keepb=0, $keepn=0)
 {
 	// escape quotes and backslashes, newlines, etc.
-	$tmp=dol_html_entity_decode($stringtoescape,ENT_COMPAT,'UTF-8');
+	$tmp=html_entity_decode($stringtoescape, ENT_COMPAT, 'UTF-8');		// TODO Use htmlspecialchars_decode instead, that make only required change for html form content
 	if (! $keepb) $tmp=strtr($tmp, array("<b>"=>'','</b>'=>''));
 	if (! $keepn) $tmp=strtr($tmp, array("\r"=>'\\r',"\n"=>'\\n'));
-	return dol_htmlentities($tmp,ENT_COMPAT,'UTF-8');
+	return htmlentities($tmp, ENT_COMPAT, 'UTF-8');						// TODO Use htmlspecialchars instead, that make only required change for html form content
 }
 
 
@@ -5032,13 +5049,13 @@ function dol_html_entity_decode($a,$b,$c='UTF-8')
 }
 
 /**
- * Replace htmlentities functions to manage errors http://php.net/manual/en/function.htmlentities.php
+ * Replace htmlentities functions.
  * Goal of this function is to be sure to have default values of htmlentities that match what we need.
  *
- * @param   string  $string         The input string.
+ * @param   string  $string         The input string to encode
- * @param   int     $flags          Flags(see PHP doc above)
+ * @param   int     $flags          Flags (see PHP doc above)
- * @param   string  $encoding       Encoding
+ * @param   string  $encoding       Encoding page code
- * @param   bool    $double_encode  When double_encode is turned off PHP will not encode existing html entities
+ * @param   bool    $double_encode  When double_encode is turned off, PHP will not encode existing html entities
  * @return  string  $ret            Encoded string
  */
 function dol_htmlentities($string, $flags=null, $encoding='UTF-8', $double_encode=false)
@@ -5046,7 +5063,6 @@ function dol_htmlentities($string, $flags=null, $encoding='UTF-8', $double_encod
 	return htmlentities($string, $flags, $encoding, $double_encode);
 }
 
-
 /**
  *	Check if a string is a correct iso string
  *	If not, it will we considered not HTML encoded even if it is by FPDF.
@@ -5937,15 +5953,16 @@ function dol_osencode($str)
  *      Return an id or code from a code or id.
  *      Store also Code-Id into a cache to speed up next request on same key.
  *
- * 		@param	DoliDB	$db			Database handler
+ * 		@param	DoliDB	$db				Database handler
- * 		@param	string	$key		Code or Id to get Id or Code
+ * 		@param	string	$key				Code or Id to get Id or Code
- * 		@param	string	$tablename	Table name without prefix
+ * 		@param	string	$tablename		Table name without prefix
- * 		@param	string	$fieldkey	Field for search ('code' or 'id')
+ * 		@param	string	$fieldkey		Field for code
- * 		@param	string	$fieldid	Field to get ('id' or 'code')
+ * 		@param	string	$fieldid			Field for id
- *      @return int					<0 if KO, Id of code if OK
+ *      @param  int		$entityfilter	Filter by entity
+ *      @return int						<0 if KO, Id of code if OK
  *      @see $langs->getLabelFromKey
  */
-function dol_getIdFromCode($db,$key,$tablename,$fieldkey='code',$fieldid='id')
+function dol_getIdFromCode($db,$key,$tablename,$fieldkey='code',$fieldid='id',$entityfilter=0)
 {
 	global $cache_codes;
 
@@ -5961,6 +5978,8 @@ function dol_getIdFromCode($db,$key,$tablename,$fieldkey='code',$fieldid='id')
 	$sql = "SELECT ".$fieldid." as valuetoget";
 	$sql.= " FROM ".MAIN_DB_PREFIX.$tablename;
 	$sql.= " WHERE ".$fieldkey." = '".$db->escape($key)."'";
+	if (! empty($entityfilter))
+		$sql.= " AND entity IN (" . getEntity($tablename) . ")";
 	dol_syslog('dol_getIdFromCode', LOG_DEBUG);
 	$resql = $db->query($sql);
 	if ($resql)

htdocs/core/lib/functions2.lib.php

@@ -723,6 +723,7 @@ function get_next_value($db,$mask,$table,$field,$where='',$objsoc='',$date='',$m
     // but we should use local year and month of user
 
     // For debugging
+    //dol_syslog("mask=".$mask, LOG_DEBUG);
     //include_once(DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php');
     //$mask='FA{yy}{mm}-{0000@99}';
     //$date=dol_mktime(12, 0, 0, 1, 1, 1900);
@@ -1147,6 +1148,7 @@ function get_next_value($db,$mask,$table,$field,$where='',$objsoc='',$date='',$m
     dol_syslog("functions2::get_next_value return ".$numFinal,LOG_DEBUG);
     return $numFinal;
 }
+
 function get_string_between($string, $start, $end){
     $string = " ".$string;
      $ini = strpos($string,$start);
@@ -1155,6 +1157,7 @@ function get_string_between($string, $start, $end){
      $len = strpos($string,$end,$ini) - $ini;
      return substr($string,$ini,$len);
 }
+
 /**
  * Check value
  *

htdocs/core/lib/geturl.lib.php

@@ -55,7 +55,7 @@ function getURLContent($url,$postorget='GET',$param='',$followlocation=1,$addhea
 	curl_setopt($ch, CURLOPT_USERAGENT, 'Dolibarr geturl function');
 
 	@curl_setopt($ch, CURLOPT_FOLLOWLOCATION, ($followlocation?true:false));   // We use @ here because this may return warning if safe mode is on or open_basedir is on
-	
+
 	if (count($addheaders)) curl_setopt($ch, CURLOPT_HTTPHEADER, $addheaders);
 	curl_setopt($ch, CURLINFO_HEADER_OUT, true);	// To be able to retrieve request header and log it
 
@@ -63,7 +63,7 @@ function getURLContent($url,$postorget='GET',$param='',$followlocation=1,$addhea
 	// You can force, if supported a version like TLSv1 or TLSv1.2
 	if (! empty($conf->global->MAIN_CURL_SSLVERSION)) curl_setopt($ch, CURLOPT_SSLVERSION, $conf->global->MAIN_CURL_SSLVERSION);
 	//curl_setopt($ch, CURLOPT_SSLVERSION, 6); for tls 1.2
-	
+
     //turning off the server and peer verification(TrustManager Concept).
     curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, FALSE);
     curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, FALSE);
@@ -82,12 +82,12 @@ function getURLContent($url,$postorget='GET',$param='',$followlocation=1,$addhea
     {
     	curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'PUT'); // HTTP request is 'PUT'
     	if (! is_array($param)) parse_str($param, $array_param);
-    	else 
+    	else
     	{
     	    dol_syslog("parameter param must be a string", LOG_WARNING);
     	    $array_param=$param;
     	}
-    	curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($array_param));	// Setting param x=a&y=z as PUT fields	
+    	curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($array_param));	// Setting param x=a&y=z as PUT fields
     }
     else if ($postorget == 'PUTALREADYFORMATED')
     {
@@ -121,7 +121,7 @@ function getURLContent($url,$postorget='GET',$param='',$followlocation=1,$addhea
     $response = curl_exec($ch);
 
     $request = curl_getinfo($ch, CURLINFO_HEADER_OUT);	// Reading of request must be done after sending request
-    
+
     dol_syslog("getURLContent request=".$request);
     dol_syslog("getURLContent response=".$response);
 
@@ -130,7 +130,7 @@ function getURLContent($url,$postorget='GET',$param='',$followlocation=1,$addhea
     {
         // Ad keys to $rep
         $rep['content']=$response;
-        
+
         // moving to display page to display curl errors
 		$rep['curl_error_no']=curl_errno($ch);
         $rep['curl_error_msg']=curl_error($ch);
@@ -146,12 +146,12 @@ function getURLContent($url,$postorget='GET',$param='',$followlocation=1,$addhea
     	//$rep['header_size']=$info['header_size'];
     	//$rep['http_code']=$info['http_code'];
     	dol_syslog("getURLContent http_code=".$rep['http_code']);
-    	
+
         // Add more keys to $rep
         $rep['content']=$response;
     	$rep['curl_error_no']='';
     	$rep['curl_error_msg']='';
-    	 
+
     	//closing the curl
         curl_close($ch);
     }
@@ -159,3 +159,19 @@ function getURLContent($url,$postorget='GET',$param='',$followlocation=1,$addhea
     return $rep;
 }
 
+
+/**
+ * Function get second level domain name.
+ * For example: https://www.abc.mydomain.com/dir/page.html return 'mydomain'
+ *
+ * @param	string	  $url 				    Full URL.
+ * @return	string						    Returns domaine name
+ */
+function getDomainFromURL($url)
+{
+	$tmpdomain = preg_replace('/^https?:\/\//i', '', $url);				// Remove http(s)://
+	$tmpdomain = preg_replace('/\/.*$/i', '', $tmpdomain);				// Remove part after domain
+	$tmpdomain = preg_replace('/\.[^\.]+$/', '', $tmpdomain);			// Remove first level domain (.com, .net, ...)
+	$tmpdomain = preg_replace('/^[^\.]+\./', '', $tmpdomain);			// Remove part www. before domain name
+	return $tmpdomain;
+}

htdocs/core/lib/security.lib.php

@@ -253,7 +253,8 @@ function restrictedArea($user, $features, $objectid=0, $tableandshare='', $featu
             {
                 //print '<br>feature='.$feature.' creer='.$user->rights->$feature->creer.' write='.$user->rights->$feature->write;
                 if (empty($user->rights->$feature->creer)
-                && empty($user->rights->$feature->write)) { $createok=0; $nbko++; }
+                && empty($user->rights->$feature->write)
+                && empty($user->rights->$feature->create)) { $createok=0; $nbko++; }
             }
         }
 
@@ -308,6 +309,10 @@ function restrictedArea($user, $features, $objectid=0, $tableandshare='', $featu
             {
                 if (! $user->rights->ftp->write) $deleteok=0;
             }
+            else if ($feature == 'salaries')
+            {
+                if (! $user->rights->salaries->delete) $deleteok=0;
+            }
             else if (! empty($feature2))	// This should be used for future changes
             {
             	foreach($feature2 as $subfeature)

htdocs/core/menus/init_menu_auguria.sql

@@ -14,7 +14,7 @@ insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, left
 insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('propal|commande|fournisseur|contrat|ficheinter', '$conf->propal->enabled || $conf->commande->enabled || $conf->supplier_order->enabled || $conf->contrat->enabled || $conf->ficheinter->enabled', 5__+MAX_llx_menu__, __HANDLER__, 'top', 'commercial',  '', 0, '/comm/index.php?mainmenu=commercial&leftmenu=', 'Commercial', -1, 'commercial', '$user->rights->societe->lire || $user->rights->societe->contact->lire', '', 2, 40, __ENTITY__);
 insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('facture|don|tax|salaries|loan|banque', '$conf->comptabilite->enabled || $conf->accounting->enabled || $conf->facture->enabled || $conf->don->enabled  || $conf->tax->enabled || $conf->salaries->enabled || $conf->supplier_invoice->enabled || $conf->loan->enabled || $conf->banque->enabled', 6__+MAX_llx_menu__, __HANDLER__, 'top', 'billing', '', 0, '/compta/index.php?mainmenu=billing&leftmenu=', 'MenuFinancial', -1, 'compta', '$user->rights->facture->lire|| $user->rights->don->lire || $user->rights->tax->charges->lire || $user->rights->salaries->read || $user->rights->loan->read || $user->rights->banque->lire', '', 2, 50, __ENTITY__);
 insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('comptabilite|accounting', '$conf->comptabilite->enabled || $conf->accounting->enabled || $conf->facture->enabled || $conf->don->enabled  || $conf->tax->enabled || $conf->salaries->enabled || $conf->supplier_invoice->enabled || $conf->loan->enabled || $conf->banque->enabled', 9__+MAX_llx_menu__, __HANDLER__, 'top', 'accountancy', '', 0, '/compta/index.php?mainmenu=accountancy&leftmenu=accountancy', 'Accountancy', -1, 'compta', '$user->rights->compta->resultat->lire || $user->rights->accounting->mouvements->lire', '', 2, 51, __ENTITY__);
-insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('banque|prelevement', '$conf->banque->enabled || $conf->prelevement->enabled', 14__+MAX_llx_menu__, __HANDLER__, 'top', 'bank', '', 0, '/compta/bank/index.php?mainmenu=bank&leftmenu=bank', 'MenuBankCash', -1, 'banks', '$user->rights->banque->lire || $user->rights->prelevement->bons->lire', '', 0, 60, __ENTITY__);
+insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('banque|prelevement', '$conf->banque->enabled || $conf->prelevement->enabled', 14__+MAX_llx_menu__, __HANDLER__, 'top', 'bank', '', 0, '/compta/bank/list.php?mainmenu=bank&leftmenu=bank', 'MenuBankCash', -1, 'banks', '$user->rights->banque->lire || $user->rights->prelevement->bons->lire', '', 0, 60, __ENTITY__);
 insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('projet', '$conf->projet->enabled', 7__+MAX_llx_menu__, __HANDLER__, 'top', 'project',     '', 0, '/projet/index.php?mainmenu=project&leftmenu=', 'Projects', -1, 'projects', '$user->rights->projet->lire', '', 2, 70, __ENTITY__);
 insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '', 8__+MAX_llx_menu__, __HANDLER__, 'top', 'tools',       '', 0, '/core/tools.php?mainmenu=tools&leftmenu=', 'Tools', -1, 'other', '', '', 2, 90, __ENTITY__);
 insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('adherent', '$conf->adherent->enabled', 13__+MAX_llx_menu__, __HANDLER__, 'top', 'members',     '', 0, '/adherents/index.php?mainmenu=members&leftmenu=', 'Members', -1, 'members', '$user->rights->adherent->lire', '', 2, 110, __ENTITY__);
@@ -224,7 +224,7 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
 	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2457__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_chart_group',   2451__+MAX_llx_menu__, '/accountancy/admin/categories_list.php?id=32&mainmenu=accountancy&leftmenu=accountancy_admin', 'AccountingCategory', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 41, __ENTITY__);
 	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2458__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_default',       2451__+MAX_llx_menu__, '/accountancy/admin/defaultaccounts.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'MenuDefaultAccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 50, __ENTITY__);
 
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2459__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_vat',           2451__+MAX_llx_menu__, '/compta/bank/index.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'MenuBankAccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 51, __ENTITY__);
+	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2459__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_vat',           2451__+MAX_llx_menu__, '/compta/bank/list.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'MenuBankAccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 51, __ENTITY__);
 
 	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2460__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_vat',           2451__+MAX_llx_menu__, '/admin/dict.php?id=10&from=accountancy&search_country_id=__MYCOUNTRYID__&mainmenu=accountancy&leftmenu=accountancy_admin', 'MenuVatAccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 52, __ENTITY__);
 	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2461__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_tax',           2451__+MAX_llx_menu__, '/admin/dict.php?id=7&from=accountancy&search_country_id=__MYCOUNTRYID__&mainmenu=accountancy&leftmenu=accountancy_admin', 'MenuTaxAccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 53, __ENTITY__);
@@ -283,10 +283,10 @@ 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->prelevement->enabled && $leftmenu=="withdraw"', __HANDLER__, 'left', 2506__+MAX_llx_menu__, 'accountancy', '', 2500__+MAX_llx_menu__, '/compta/prelevement/rejets.php?leftmenu=withdraw', 'Rejects', 1, 'withdrawals', '$user->rights->prelevement->bons->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->prelevement->enabled && $leftmenu=="withdraw"', __HANDLER__, 'left', 2507__+MAX_llx_menu__, 'accountancy', '', 2500__+MAX_llx_menu__, '/compta/prelevement/stats.php?leftmenu=withdraw', 'Statistics', 1, 'withdrawals', '$user->rights->prelevement->bons->lire', '', 2, 6, __ENTITY__);
 -- Bank
-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->banque->enabled', __HANDLER__, 'left', 2600__+MAX_llx_menu__, 'accountancy', 'bank', 14__+MAX_llx_menu__, '/compta/bank/index.php?leftmenu=bank&mainmenu=bank', 'MenuBankCash', 0, 'banks', '$user->rights->banque->lire', '', 0, 1, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->banque->enabled', __HANDLER__, 'left', 2600__+MAX_llx_menu__, 'accountancy', 'bank', 14__+MAX_llx_menu__, '/compta/bank/list.php?leftmenu=bank&mainmenu=bank', 'MenuBankCash', 0, 'banks', '$user->rights->banque->lire', '', 0, 1, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->banque->enabled && ($leftmenu=="bank" || $leftmenu=="checks" || $leftmenu=="withdraw")', __HANDLER__, 'left', 2601__+MAX_llx_menu__, 'accountancy', '', 2600__+MAX_llx_menu__, '/compta/bank/card.php?action=create&leftmenu=bank', 'MenuNewFinancialAccount', 1, 'banks', '$user->rights->banque->configurer', '', 0, 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->banque->enabled && ($leftmenu=="bank" || $leftmenu=="checks" || $leftmenu=="withdraw")', __HANDLER__, 'left', 2602__+MAX_llx_menu__, 'accountancy', '', 2600__+MAX_llx_menu__, '/compta/bank/categ.php?leftmenu=bank', 'Rubriques', 1, 'categories', '$user->rights->banque->configurer', '', 0, 1, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->banque->enabled && ($leftmenu=="bank" || $leftmenu=="checks" || $leftmenu=="withdraw")', __HANDLER__, 'left', 2603__+MAX_llx_menu__, 'accountancy', '', 2600__+MAX_llx_menu__, '/compta/bank/bankentries.php?leftmenu=bank', 'ListTransactions', 1, 'banks', '$user->rights->banque->lire', '', 0, 2, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->banque->enabled && ($leftmenu=="bank" || $leftmenu=="checks" || $leftmenu=="withdraw")', __HANDLER__, 'left', 2603__+MAX_llx_menu__, 'accountancy', '', 2600__+MAX_llx_menu__, '/compta/bank/bankentries_list.php?leftmenu=bank', 'ListTransactions', 1, 'banks', '$user->rights->banque->lire', '', 0, 2, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->banque->enabled && ($leftmenu=="bank" || $leftmenu=="checks" || $leftmenu=="withdraw")', __HANDLER__, 'left', 2604__+MAX_llx_menu__, 'accountancy', '', 2600__+MAX_llx_menu__, '/compta/bank/budget.php?leftmenu=bank', 'ListTransactionsByCategory', 1, 'banks', '$user->rights->banque->lire', '', 0, 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->banque->enabled && ($leftmenu=="bank" || $leftmenu=="checks" || $leftmenu=="withdraw")', __HANDLER__, 'left', 2606__+MAX_llx_menu__, 'accountancy', '', 2600__+MAX_llx_menu__, '/compta/bank/transfer.php?leftmenu=bank', 'BankTransfers', 1, 'banks', '$user->rights->banque->transfer', '', 0, 5, __ENTITY__);
 -- Bank - Categories

htdocs/core/menus/standard/auguria.lib.php

@@ -339,7 +339,7 @@ function print_left_auguria_menu($db,$menu_array_before,$menu_array_after,&$tabM
 			$numr = $db->num_rows($resql);
 			$i = 0;
 
-			if ($numr > 0) 	$newmenu->add('/compta/bank/index.php',$langs->trans("BankAccounts"),0,$user->rights->banque->lire);
+			if ($numr > 0) 	$newmenu->add('/compta/bank/list.php',$langs->trans("BankAccounts"),0,$user->rights->banque->lire);
 
 			while ($i < $numr)
 			{
@@ -347,7 +347,7 @@ function print_left_auguria_menu($db,$menu_array_before,$menu_array_after,&$tabM
 				$newmenu->add('/compta/bank/card.php?id='.$objp->rowid,$objp->label,1,$user->rights->banque->lire);
 				if ($objp->rappro && $objp->courant != Account::TYPE_CASH && empty($objp->clos))  // If not cash account and not closed and can be reconciliate
 				{
-					$newmenu->add('/compta/bank/bankentries.php?id='.$objp->rowid,$langs->trans("Conciliate"),2,$user->rights->banque->consolidate);
+					$newmenu->add('/compta/bank/bankentries_list.php?id='.$objp->rowid,$langs->trans("Conciliate"),2,$user->rights->banque->consolidate);
 				}
 				$i++;
 			}

htdocs/core/menus/standard/auguria_menu.php

@@ -163,13 +163,13 @@ class MenuManager
         			$canonurl=preg_replace('/\?.*$/','',$val['url']);
 
         			print '<a class="alilevel0" href="#">';
-        			
+
 					// Add font-awesome
 					if ($val['level'] == 0 && $val['mainmenu'] == 'home') print '<span class="fa fa-home fa-fw paddingright" aria-hidden="true"></span>';
-        			
+
 					print $val['titre'];
         			print '</a>'."\n";
-        			
+
         			// Search submenu fot this mainmenu entry
         			$tmpmainmenu=$val['mainmenu'];
         			$tmpleftmenu='all';
@@ -183,7 +183,7 @@ class MenuManager
         			//var_dump($canonnexturl);
         			print '<ul>'."\n";
         			if (($canonrelurl != $canonnexturl && ! in_array($val['mainmenu'],array('tools')))
-        				|| (strpos($canonrelurl,'/product/index.php') !== false || strpos($canonrelurl,'/compta/bank/index.php') !== false))
+        				|| (strpos($canonrelurl,'/product/index.php') !== false || strpos($canonrelurl,'/compta/bank/list.php') !== false))
 					{
 						// We add sub entry
 						print str_pad('',1).'<li class="lilevel1 ui-btn-icon-right ui-btn">';	 // ui-btn to highlight on clic