Merge branch '3.1' of https://eldy@github.com/Dolibarr/dolibarr.git into 3.1

htdocs/admin/boxes.php

@@ -29,8 +29,9 @@ include_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 
 $langs->load("admin");
 
-if (!$user->admin)
-  accessforbidden();
+$id=GETPOST('rowid','int');
+
+if (!$user->admin) accessforbidden();
 
 // Definition des positions possibles pour les boites
 $pos_array = array(0);                             // Positions possibles pour une boite (0,1,2,...)
@@ -101,7 +102,7 @@ if ($_GET["action"] == 'delete')
 	$db->begin();
 
 	$sql = "DELETE FROM ".MAIN_DB_PREFIX."boxes";
-	$sql.= " WHERE rowid=".$_GET["rowid"];
+	$sql.= " WHERE rowid=".$id;
 	$resql = $db->query($sql);
 
 	// Remove all personalized setup when a box is activated or disabled
@@ -288,7 +289,7 @@ if ($resql)
 
 		dol_include_once($sourcefile);
 		$box=new $boxname($db,$obj->note);
-		
+
 		$enabled=true;
 		if ($box->depends && sizeof($box->depends) > 0)
 		{
@@ -297,7 +298,7 @@ if ($resql)
 				if (empty($conf->$module->enabled)) $enabled=false;
 			}
 		}
-		
+
 		if ($enabled)
 		{
 			//if (in_array($obj->rowid, $actives) && $box->box_multiple <> 1)
@@ -308,7 +309,7 @@ if ($resql)
 			else
 			{
 				$var=!$var;
-	
+
 				if (preg_match('/^([^@]+)@([^@]+)$/i',$box->boximg))
 				{
 					$logo = $box->boximg;
@@ -317,14 +318,14 @@ if ($resql)
 				{
 					$logo=preg_replace("/^object_/i","",$box->boximg);
 				}
-	
+
 				print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 				print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 				print '<tr '.$bc[$var].'>';
 				print '<td>'.img_object("",$logo).' '.$box->boxlabel.'</td>';
 				print '<td>' . ($obj->note?$obj->note:'&nbsp;') . '</td>';
 				print '<td>' . $sourcefile . '</td>';
-	
+
 				// Pour chaque position possible, on affiche un lien
 				// d'activation si boite non deja active pour cette position
 				print '<td>';
@@ -333,11 +334,11 @@ if ($resql)
 				print '<input type="hidden" name="boxid" value="'.$obj->rowid.'">';
 				print ' <input type="submit" class="button" name="button" value="'.$langs->trans("Activate").'">';
 				print '</td>';
-	
+
 				print '</tr></form>';
 			}
 		}
-		
+
 		$i++;
 	}
 

htdocs/admin/ihm.php

@@ -38,8 +38,7 @@ $langs->load("companies");
 $langs->load("products");
 $langs->load("members");
 
-if (!$user->admin)
-  accessforbidden();
+if (!$user->admin) accessforbidden();
 
 
 if (! defined("MAIN_MOTD")) define("MAIN_MOTD","");

htdocs/admin/tools/purge.php

@@ -27,8 +27,11 @@ include_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php');
 
 $langs->load("admin");
 
-if (! $user->admin)
-accessforbidden();
+$action=GETPOST('action');
+$confirm=GETPOST('confirm');
+$choice=GETPOST('choice');
+
+if (! $user->admin) accessforbidden();
 
 if ($_GET["msg"]) $message='<div class="error">'.$_GET["msg"].'</div>';
 
@@ -44,11 +47,11 @@ if ($conf->syslog->enabled)
 /*
  *	Actions
  */
-if ($_REQUEST["action"]=='purge' && ! preg_match('/^confirm/i',$_REQUEST["choice"]) && ($_REQUEST["choice"] != 'allfiles' || $_REQUEST["confirm"] == 'yes') )
+if ($action=='purge' && ! preg_match('/^confirm/i',$choice) && ($choice != 'allfiles' || $confirm == 'yes') )
 {
 	$filesarray=array();
 
-	if ($_REQUEST["choice"]=='tempfiles')
+	if ($choice=='tempfiles')
 	{
 		// Delete temporary files
 		if ($dolibarr_main_data_root)
@@ -57,16 +60,16 @@ if ($_REQUEST["action"]=='purge' && ! preg_match('/^confirm/i',$_REQUEST["choice
 		}
 	}
 
-	if ($_REQUEST["choice"]=='allfiles')
+	if ($choice=='allfiles')
 	{
 		// Delete all files
 		if ($dolibarr_main_data_root)
 		{
-			$filesarray=dol_dir_list($dolibarr_main_data_root,"all",0);
+			$filesarray=dol_dir_list($dolibarr_main_data_root,"all",0,'','install\.lock$');
 		}
 	}
 
-	if ($_REQUEST["choice"]=='logfile')
+	if ($choice=='logfile')
 	{
 		$filesarray[]=array('fullname'=>$filelog,'type'=>'file');
 	}
@@ -85,7 +88,7 @@ if ($_REQUEST["action"]=='purge' && ! preg_match('/^confirm/i',$_REQUEST["choice
 			elseif ($filesarray[$key]['type'] == 'file')
 			{
 				// If (file that is not logfile) or (if logfile with option logfile)
-				if ($filesarray[$key]['fullname'] != $filelog || $_POST["choice"]=='logfile')
+				if ($filesarray[$key]['fullname'] != $filelog || $choice=='logfile')
 				{
 					$count+=dol_delete_file($filesarray[$key]['fullname']);
 				}
@@ -93,7 +96,7 @@ if ($_REQUEST["action"]=='purge' && ! preg_match('/^confirm/i',$_REQUEST["choice
 		}
 
 		// Update cachenbofdoc
-		if ($conf->ecm->enabled && $_REQUEST["choice"]=='allfiles')
+		if ($conf->ecm->enabled && $choice=='allfiles')
 		{
 			require_once(DOL_DOCUMENT_ROOT."/ecm/class/ecmdirectory.class.php");
 			$ecmdirstatic = new ECMDirectory($db);
@@ -133,21 +136,21 @@ print '<tr class="border"><td style="padding: 4px">';
 if ($conf->syslog->enabled)
 {
 	print '<input type="radio" name="choice" value="logfile"';
-	print ($_REQUEST["choice"] && $_REQUEST["choice"]=='logfile') ? ' checked="true"' : '';
+	print ($choice && $choice=='logfile') ? ' checked="checked"' : '';
 	print '> '.$langs->trans("PurgeDeleteLogFile",$filelog).'<br><br>';
 }
 
 print '<input type="radio" name="choice" value="tempfiles"';
-print (! $_REQUEST["choice"] || $_REQUEST["choice"]=='tempfiles' || $_REQUEST["choice"]=='allfiles') ? ' checked="true"' : '';
+print (! $choice || $choice=='tempfiles' || $choice=='allfiles') ? ' checked="checked"' : '';
 print '> '.$langs->trans("PurgeDeleteTemporaryFiles").'<br><br>';
 
 print '<input type="radio" name="choice" value="confirm_allfiles"';
-print ($_REQUEST["choice"] && $_REQUEST["choice"]=='confirm_allfiles') ? ' checked="true"' : '';
+print ($choice && $choice=='confirm_allfiles') ? ' checked="checked"' : '';
 print '> '.$langs->trans("PurgeDeleteAllFilesInDocumentsDir",$dolibarr_main_data_root).'<br>';
 
 print '</td></tr></table>';
 
-if ($_REQUEST['choice'] != 'confirm_allfiles')
+if ($choice != 'confirm_allfiles')
 {
 	print '<br>';
 	print '<center><input class="button" type="submit" value="'.$langs->trans("PurgeRunNow").'"></center>';
@@ -162,7 +165,7 @@ if ($message)
 	print "\n";
 }
 
-if (preg_match('/^confirm/i',$_REQUEST["choice"]))
+if (preg_match('/^confirm/i',$choice))
 {
 	print '<br>';
 	$formquestion=array();

htdocs/compta/deplacement/index.php

@@ -65,6 +65,7 @@ llxHeader('',$langs->trans("ListOfFees"),$help_url);
 $totalnb=0;
 $sql = "SELECT count(d.rowid) as nb, sum(d.km) as km, d.type";
 $sql.= " FROM ".MAIN_DB_PREFIX."deplacement as d";
+$sql.= " WHERE d.entity = ".$conf->entity;
 $sql.= " GROUP BY d.type";
 $sql.= " ORDER BY d.type";
 

htdocs/compta/facture.php

@@ -738,6 +738,8 @@ if ($action == 'add' && $user->rights->facture->creer)
 
                         for ($i=0;$i<$num;$i++)
                         {
+                            $desc=($lines[$i]->desc?$lines[$i]->desc:$lines[$i]->libelle);
+
                             if ($lines[$i]->subprice < 0)
                             {
                                 // Negative line, we create a discount line
@@ -765,7 +767,6 @@ if ($action == 'add' && $user->rights->facture->creer)
                             else
                             {
                                 // Positive line
-                                $desc=($lines[$i]->desc?$lines[$i]->desc:$lines[$i]->libelle);
                                 $product_type=($lines[$i]->product_type?$lines[$i]->product_type:0);
 
                                 // Date start

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

@@ -1117,10 +1117,11 @@ class Form
     function select_produits_fournisseurs($socid,$selected='',$htmlname='productid',$filtertype='',$filtre)
     {
         global $langs,$conf;
+
         if ($conf->global->PRODUIT_USE_SEARCH_TO_SELECT)
         {
             // mode=2 means suppliers products
-            print ajax_autocompleter('', $htmlname, DOL_URL_ROOT.'/product/ajaxproducts.php', 'htmlname='.$htmlname.'&outjson=1&price_level='.$price_level.'&type='.$filtertype.'&mode=2&status='.$status.'&finished='.$finished, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT);
+            print ajax_autocompleter('', $htmlname, DOL_URL_ROOT.'/product/ajaxproducts.php', ($socid > 0?'socid='.$socid.'&':'').'htmlname='.$htmlname.'&outjson=1&price_level='.$price_level.'&type='.$filtertype.'&mode=2&status='.$status.'&finished='.$finished, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT);
             print $langs->trans("RefOrLabel").' : <input type="text" size="16" name="search_'.$htmlname.'" id="search_'.$htmlname.'">';
             print '<br>';
         }

htdocs/core/class/notify.class.php

@@ -98,7 +98,7 @@ class Notify
         $sql.= " AND n.fk_soc = s.rowid";
         if (is_numeric($action)) $sql.= " AND n.fk_action = ".$action;	// Old usage
         else $sql.= " AND a.code = '".$action."'";	// New usage
-        $sql.= " AND a.entity = ".$conf->entity;
+        //$sql.= " AND n.entity = ".$conf->entity;
         $sql.= " AND s.rowid = ".$socid;
 
 		dol_syslog("Notify.class::countDefinedNotifications $action, $socid");

htdocs/fichinter/fiche.php

@@ -906,7 +906,7 @@ elseif ($fichinterid)
                 print '<tr '.$bc[$var].'>';
                 print '<td>';
                 print '<a name="'.$objp->rowid.'"></a>'; // ancre pour retourner sur la ligne
-                print nl2br($objp->description);
+                print dol_htmlentitiesbr($objp->description);
 
                 // Date
                 print '<td align="center" width="150">'.dol_print_date($db->jdate($objp->date_intervention),'dayhour').'</td>';

htdocs/fourn/facture/fiche.php

@@ -407,8 +407,8 @@ if ($_REQUEST['action'] == 'update_line')
             if (trim($_POST['label']) != trim($label)) $label=$_POST['label'];
 
             $type = $prod->type;
-            $localtax1_tx = $prod->localtax1_tx;
-            $localtax2_tx = $prod->localtax2_tx;
+            $localtax1tx = $prod->localtax1_tx;
+            $localtax2tx = $prod->localtax2_tx;
         }
         else
         {
@@ -468,7 +468,7 @@ if ($_GET['action'] == 'addline')
 
             $type = $product->type;
 
-            $result=$facfou->addline($label, $product->fourn_pu, $tvatx, $localtax2tx, $localtax2tx ,$_POST['qty'], $idprod);
+            $result=$facfou->addline($label, $product->fourn_pu, $tvatx, $localtax1tx, $localtax2tx ,$_POST['qty'], $idprod);
         }
         if ($idprod == -1)
         {

htdocs/fourn/liste.php

@@ -40,13 +40,13 @@ $search_compta_fournisseur = GETPOST("search_compta_fournisseur");
 $search_datec              = GETPOST("search_datec");
 
 // Security check
-$socid = isset($_GET["socid"])?$_GET["socid"]:'';
+$socid = GETPOST('socid');
 if ($user->societe_id) $socid=$user->societe_id;
-$result = restrictedArea($user, 'societe',$socid,'');
+$result = restrictedArea($user,'societe',$socid,'');
 
-$page = isset($_GET["page"])?$_GET["page"]:'';
-$sortorder = isset($_GET["sortorder"])?$_GET["sortorder"]:'';
-$sortfield = isset($_GET["sortfield"])?$_GET["sortfield"]:'';
+$page = GETPOST('page');
+$sortorder = GETPOST('sortorder');
+$sortfield = GETPOST('sortfield');
 if ($page == -1) { $page = 0 ; }
 $offset = $conf->liste_limit * $page ;
 $pageprev = $page - 1;
@@ -55,7 +55,7 @@ if (! $sortorder) $sortorder="ASC";
 if (! $sortfield) $sortfield="nom";
 
 // Load categ filters
-$search_categ = isset($_GET["search_categ"])?$_GET["search_categ"]:$_POST["search_categ"];
+$search_categ = GETPOST('search_categ');
 
 
 /*
@@ -74,12 +74,14 @@ if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.f
 $sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."c_stcomm as st";
 if ($search_categ) $sql.= ", ".MAIN_DB_PREFIX."categorie_fournisseur as cf";
 if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-$sql.= " WHERE s.fk_stcomm = st.id AND s.fournisseur=1";
+$sql.= " WHERE s.fk_stcomm = st.id AND s.fournisseur = 1";
+$sql.= " AND s.entity = ".$conf->entity;
 if ($search_categ) $sql.= " AND s.rowid = cf.fk_societe";	// Join for the needed table to filter by categ
 if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 if ($socid) $sql .= " AND s.rowid = ".$socid;
-if ($socname) {
-	$sql .= " AND s.nom like '%".$db->escape($socname)."%'";
+if ($socname)
+{
+	$sql .= " AND s.nom LIKE '%".$db->escape($socname)."%'";
 	$sortfield = "s.nom";
 	$sortorder = "ASC";
 }

htdocs/includes/modules/facture/doc/doc_generic_invoice_odt.modules.php

@@ -101,7 +101,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 		{
         	$invoice_source->fetch($object->fk_facture_source);
 		}
-		$alreadypayed=price($object->getSommePaiement(),'MT');
+		$alreadypayed=price($object->getSommePaiement(),0,$outputlangs);
 
         return array(
             'object_id'=>$object->id,
@@ -117,15 +117,15 @@ class doc_generic_invoice_odt extends ModelePDFFactures
             'object_date_validation'=>dol_print_date($object->date_validation,'dayhour'),
             'object_payment_mode'=>$object->mode_reglement,
             'object_payment_term'=>$object->cond_reglement,
-        	'object_total_ht'=>price($object->total_ht),
-            'object_total_vat'=>price($object->total_tva),
-            'object_total_ttc'=>price($object->total_ttc),
+        	'object_total_ht'=>price($object->total_ht,0,$outputlangs),
+            'object_total_vat'=>price($object->total_tva,0,$outputlangs),
+            'object_total_ttc'=>price($object->total_ttc,0,$outputlangs),
             'object_vatrate'=>vatrate($object->tva),
             'object_note_private'=>$object->note,
             'object_note'=>$object->note_public,
         	// Payments
             'object_already_payed'=>$alreadypayed,
-            'object_remain_to_pay'=>price($object->total_ttc - $alreadypayed,'MT')
+            'object_remain_to_pay'=>price($object->total_ttc - $alreadypayed,0,$outputlangs)
         );
     }
 

htdocs/install/mysql/migration/3.0.0-3.1.0.sql

@@ -490,3 +490,17 @@ ALTER TABLE llx_element_element MODIFY targettype varchar(32) NOT NULL;
 
 ALTER TABLE llx_societe_prices MODIFY tms timestamp NULL;
 -- ALTER TABLE llx_societe_prices ALTER COLUMN tms DROP NOT NULL;
+
+-- Fix: It seems this is missing for some users
+insert into llx_c_actioncomm (id, code, type, libelle, module, position) values ( 1,  'AC_TEL',     'system', 'Phone call'                            ,NULL, 2);
+insert into llx_c_actioncomm (id, code, type, libelle, module, position) values ( 2,  'AC_FAX',     'system', 'Send Fax'                            ,NULL, 3);
+insert into llx_c_actioncomm (id, code, type, libelle, module, position) values ( 3,  'AC_PROP',    'system', 'Send commercial proposal by email'    ,'propal',  10);
+insert into llx_c_actioncomm (id, code, type, libelle, module, position) values ( 4,  'AC_EMAIL',   'system', 'Send Email'                            ,NULL, 4);
+insert into llx_c_actioncomm (id, code, type, libelle, module, position) values ( 5,  'AC_RDV',     'system', 'Rendez-vous'                            ,NULL, 1);
+insert into llx_c_actioncomm (id, code, type, libelle, module, position) values ( 8,  'AC_COM',     'system', 'Send customer order by email'        ,'order',   8);
+insert into llx_c_actioncomm (id, code, type, libelle, module, position) values ( 9,  'AC_FAC',     'system', 'Send customer invoice by email'        ,'invoice', 6);
+insert into llx_c_actioncomm (id, code, type, libelle, module, position) values ( 10, 'AC_SHIP',    'system', 'Send shipping by email'                ,'shipping', 11);
+insert into llx_c_actioncomm (id, code, type, libelle, module, position) values ( 30, 'AC_SUP_ORD', 'system', 'Send supplier order by email'        ,'order_supplier',    9);
+insert into llx_c_actioncomm (id, code, type, libelle, module, position) values  (31, 'AC_SUP_INV', 'system', 'Send supplier invoice by email'        ,'invoice_supplier', 7);
+insert into llx_c_actioncomm (id, code, type, libelle, module, position) values ( 50, 'AC_OTH',     'system', 'Other'                                ,NULL, 5);
+

htdocs/langs/ca_ES/stocks.lang

@@ -3,6 +3,7 @@ CHARSET=UTF-8
 WarehouseCard=Fitxa magatzem
 Warehouse=Magatzem
 NewWarehouse=Nou magatzem o zona d'emmagatzematge
+WarehouseEdit=Edició magatzem
 MenuNewWarehouse=Nou magatzem
 WarehouseOpened=Magatzem obert
 WarehouseClosed=Magatzem tancat