Merge branch '3.3' of git://github.com/Dolibarr/dolibarr into bug-866

Conflicts:
	ChangeLog

ChangeLog

@@ -26,7 +26,11 @@ English Dolibarr ChangeLog
 - Fix: [ bug #855 ] Holiday approval email in French
 - Fix: [ bug #856 ] (Holidays module) Mail error if destination user doesn't have an email
 - Fix: [ bug #857 ] Invoice created from shipment does not have the order discount
+- Fix: [ bug #861 ] Impossible to create a new event in agenda
+- Fix: [ bug #827 ] AJAX search does not respect multiprice level
+- Fix: [ bug #865 ] Dolibarr navigation array in project/task do not work
 - Fix: [ bug #866 ] Standing order from an invoice suggests invoice total amount instead of remaining to pay
+- Fix: [ bug #788 ] Date of linked interventions are not shown
 
 
 ***** ChangeLog for 3.3.1 compared to 3.3 *****

htdocs/compta/clients.php

@@ -140,6 +140,8 @@ if ($resql)
 	$num = $db->num_rows($resql);
 	$i = 0;
 
+	$langs->load('commercial');
+	
 	print_barre_liste($langs->trans("ListOfCustomers"), $page, $_SERVER["PHP_SELF"],"",$sortfield,$sortorder,'',$num);
 
 	print '<form method="GET" action="'.$_SERVER["PHP_SELF"].'">';

htdocs/compta/prelevement/bons.php

@@ -27,7 +27,7 @@
 require '../bank/pre.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php';
 
-$langs->load("widthdrawals");
+$langs->load("withdrawals");
 $langs->load("categories");
 
 // Security check

htdocs/compta/prelevement/factures.php

@@ -33,6 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
 $langs->load("companies");
 $langs->load("categories");
 $langs->load('withdrawals');
+$langs->load('bills');
 
 // Securite acces client
 if ($user->societe_id > 0) accessforbidden();

htdocs/compta/prelevement/fiche-rejet.php

@@ -32,6 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
 
 $langs->load("categories");
 $langs->load('withdrawals');
+$langs->load('bills');
 
 // Securite acces client
 if ($user->societe_id > 0) accessforbidden();

htdocs/compta/prelevement/fiche-stat.php

@@ -33,6 +33,7 @@ if ($user->societe_id > 0) accessforbidden();
 
 $langs->load("withdrawals");
 $langs->load("categories");
+$langs->load('bills');
 
 // Get supervariables
 $prev_id = GETPOST('id','int');

htdocs/compta/prelevement/lignes.php

@@ -36,6 +36,7 @@ if ($user->societe_id > 0) accessforbidden();
 
 $langs->load("categories");
 $langs->load('withdrawals');
+$langs->load('bills');
 
 // Get supervariables
 $prev_id = GETPOST('id','int');

htdocs/compta/prelevement/rejets.php

@@ -26,6 +26,7 @@
 
 require '../bank/pre.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/rejetprelevement.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/ligneprelevement.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
 
 $langs->load("withdrawals");
@@ -56,6 +57,7 @@ if ($sortorder == "") $sortorder="DESC";
 if ($sortfield == "") $sortfield="p.datec";
 
 $rej = new RejetPrelevement($db, $user);
+$ligne = new LignePrelevement($db);
 
 /*
  * Liste des factures
@@ -84,7 +86,7 @@ if ($result)
 	print"\n<!-- debut table -->\n";
 	print '<table class="noborder" width="100%" cellspacing="0" cellpadding="4">';
 	print '<tr class="liste_titre">';
-	print_liste_field_titre($langs->trans("Nb"),"rejets.php","p.ref",'',$urladd);
+	print_liste_field_titre($langs->trans("Line"),"rejets.php","p.ref",'',$urladd);
 	print_liste_field_titre($langs->trans("ThirdParty"),"rejets.php","s.nom",'',$urladd);
 	print_liste_field_titre($langs->trans("Reason"),"rejets.php","pr.motif","",$urladd);
 	print '</tr>';
@@ -98,7 +100,7 @@ if ($result)
 		$obj = $db->fetch_object($result);
 
 		print "<tr $bc[$var]><td>";
-		print '<img border="0" src="./img/statut'.$obj->statut.'.png"></a>&nbsp;';
+		print $ligne->LibStatut($obj->statut,2).'&nbsp;';
 		print '<a href="'.DOL_URL_ROOT.'/compta/prelevement/ligne.php?id='.$obj->rowid.'">';
 
 		print substr('000000'.$obj->rowid, -6)."</a></td>";

htdocs/contrat/class/contrat.class.php

@@ -524,20 +524,20 @@ class Contrat extends CommonObject
 				$objp                  = $this->db->fetch_object($result);
 
 				$line                 = new ContratLigne($this->db);
-				$line->id 			   = $objp->rowid;
+				$line->id 			  = $objp->rowid;
 				$line->fk_contrat     = $objp->fk_contrat;
 				$line->libelle        = $objp->description;
 				$line->desc           = $objp->description;
 				$line->qty            = $objp->qty;
-				$line->statut 		   = $objp->statut;
+				$line->statut 		  = $objp->statut;
-				$line->ref            = $objp->ref;
+				$line->ref            = (isset($objp->ref)?$objp->ref:NULL);
 				$line->tva_tx         = $objp->tva_tx;
 				$line->localtax1_tx   = $objp->localtax1_tx;
 				$line->localtax2_tx   = $objp->localtax2_tx;
 				$line->subprice       = $objp->subprice;
 				$line->remise_percent = $objp->remise_percent;
 				$line->price_ht       = $objp->price_ht;
-				$line->price          = $objp->price;	// For backward compatibility
+				$line->price          = (isset($objp->price)?$objp->price:NULL);	// For backward compatibility
 				$line->total_ht       = $objp->total_ht;
 				$line->total_tva      = $objp->total_tva;
 				$line->total_localtax1= $objp->total_localtax1;

htdocs/core/lib/security.lib.php

@@ -219,7 +219,9 @@ function restrictedArea($user, $features, $objectid=0, $dbtablename='', $feature
             {
             	foreach($feature2 as $subfeature)
             	{
-            		if (empty($user->rights->$feature->$subfeature->creer) && empty($user->rights->$feature->$subfeature->write)) $createok=0;
+            		if (empty($user->rights->$feature->$subfeature->creer) 
+            		&& empty($user->rights->$feature->$subfeature->write)
+            		&& empty($user->rights->$feature->$subfeature->create)) $createok=0;
             		else { $createok=1; break; } // For bypass the second test if the first is ok
             	}
             }

htdocs/langs/es_ES/admin.lang

@@ -646,8 +646,8 @@ Permission1002=Crear/modificar stocks
 Permission1003=Eliminar stocks
 Permission1004=Consultar movimientos de stock
 Permission1005=Crear/modificar movimientos de stock
-Permission1101=Consultar ordenes de envío
+Permission1101=Consultar órdenes de envío
-Permission1102=Crear/modificar ordenes de envío
+Permission1102=Crear/modificar órdenes de envío
 Permission1104=Validar orden de envío
 Permission1109=Eliminar orden de envío
 Permission1181=Consultar proveedores

htdocs/langs/es_ES/withdrawals.lang

@@ -9,7 +9,7 @@ StandingOrderToProcess=A procesar
 StandingOrderProcessed=Procesados
 Withdrawals=Reintegros
 Withdrawal=Reintegro
-WithdrawalsReceipts=Ordenes domiciliadas
+WithdrawalsReceipts=Órdenes domiciliadas
 WithdrawalReceipt=Orden domiciliación
 WithdrawalReceiptShort=Orden
 LastWithdrawalReceipts=Las %s últimas órdenes de domiciliación

htdocs/product/ajax/products.php

@@ -157,7 +157,7 @@ else
 	$form = new Form($db);
 	if (empty($mode) || $mode == 1)
 	{
-		$arrayresult=$form->select_produits_do("",$htmlname,$type,"",$pricelevel,$searchkey,$status,2,$outjson);
+		$arrayresult=$form->select_produits_do("",$htmlname,$type,"",$price_level,$searchkey,$status,2,$outjson);
 	}
 	elseif ($mode == 2)
 	{

htdocs/product/class/product.class.php

@@ -431,7 +431,7 @@ class Product extends CommonObject
 		$this->ref = dol_string_nospecial(trim($this->ref));
 		$this->libelle = trim($this->libelle);
 		$this->description = trim($this->description);
-		$this->note = trim($this->note);
+		$this->note = (isset($this->note)? trim($this->note):"null");
 		$this->weight = price2num($this->weight);
 		$this->weight_units = trim($this->weight_units);
 		$this->length = price2num($this->length);

htdocs/projet/element.php

@@ -223,6 +223,7 @@ foreach ($listofreferent as $key => $value)
 				$date=$element->date;
 				if (empty($date)) $date=$element->datep;
 				if (empty($date)) $date=$element->date_contrat;
+				if (empty($date)) $date=$element->datev; //Fiche inter
 				print '<td align="center">'.dol_print_date($date,'day').'</td>';
 
 				// Third party