Merge branch '3.9' into bug-5537

ChangeLog

@@ -12,6 +12,41 @@ Upgrading to any other version or any other database system is abolutely require
 make a Dolibarr upgrade.
 
 
+***** ChangeLog for 3.9.3 compared to 3.9.2 *****
+FIX: #4383 $userid not defined
+FIX: #4448 $filebonprev is not used, $this->filename now
+FIX: #4455
+FIX: #4749
+FIX: #4756
+FIX: #4828
+FIX: #4926
+FIX: #4964 buyprice in customer from shipping buyprice wasn't load in expedition::fetch_lines
+FIX: #5004
+FIX: #5068
+FIX: #5170 tva sign with INVOICE_POSITIVE_CREDIT_NOTE option
+FIX: #5338 use of not initialized var $aphour, $apmin, etc
+FIX: #5343
+FIX: #5380
+FIX: #5383 bad object id on don delete
+FIX: #5414
+FIX: #5470 User of expense report in bank transactions page is not correct
+FIX: a case of corrupted ODT by Word that insert <text:s> when it should not.
+FIX: Can't create thirdparty or validate invoice if profid is mandatory and profid does not exists for other countries
+FIX: dasboard wrong for late invoice
+FIX: duplicate jquery.js files
+FIX: extrafield cloned on project clone
+FIX: Failed to open file
+FIX: Filter on opportunity amount and budget
+FIX: form_confirm to delete payment on supplier invoice
+FIX: javascript error with german-switzerland language
+FIX: large expense note
+FIX: Missing original .js file (license violation if sources are not provided)
+FIX: Option strict mode compatibility
+FIX: product stats all bloc module without enbaled test
+FIX: receiving link never works
+FIX: task ODT company object not correctly retrieved
+FIX: Translate group perms as it is done into user perms
+FIX: We must take the last recent defined price when using price level
 
 ***** ChangeLog for 3.9.2 compared to 3.9.1 *****
 FIX: #4813 Won translation for the key OppStatusWON instead OppStatusWIN

build/debian/dolibarr.docs

@@ -1,2 +1 @@
 README.md
-README-FR.md

build/debian/watch

@@ -2,4 +2,4 @@
 version=3
 
 #http://sf.net/dolibarr/dolibarr-(.+)\.tgz
-http://www.dolibarr.org/files/stable/standard/dolibarr-(.+)\.tgz
+http://www.dolibarr.org/files/stable/package_debian-ubuntu/dolibarr_(.+)\.orig\.tar\.gz

build/makepack-dolibarr.pl

@@ -173,6 +173,7 @@
 # now build is 0+nmu1 for example
 $FILENAMEDEBNATIVE="${PROJECT}_${MAJOR}.${MINOR}.${build}";
 $FILENAMEDEB="${PROJECT}_${MAJOR}.${MINOR}.${newbuild}";
+$FILENAMEDEBSHORT="${PROJECT}_${MAJOR}.${MINOR}.${build}";
 
 
 my $copyalreadydone=0;
@@ -388,10 +389,15 @@
 			{
 				print 'Run git tag -a -f -m "'.$MAJOR.'.'.$MINOR.'.'.$BUILD.'" "'.$MAJOR.'.'.$MINOR.'.'.$BUILD.'"'."\n";
 				$ret=`git tag -a -f -m "$MAJOR.$MINOR.$BUILD" "$MAJOR.$MINOR.$BUILD"`;
+				print 'Run git push -f --tags'."\n";
+				$ret=`git push -f --tags`;
 			}
 		}
-		print 'Run git push --tags'."\n";
-		$ret=`git push --tags`;
+		else
+		{
+			print 'Run git push --tags'."\n";
+			$ret=`git push --tags`;
+		}
 		chdir("$olddir");
 	}
 
@@ -807,7 +813,7 @@
 			$ret=`$cmd`;
 
 			print "Remove other files\n";
-			$ret=`rm -f  $BUILDROOT/$PROJECT.tmp/README-FR`;
+			$ret=`rm -f  $BUILDROOT/$PROJECT.tmp/README-FR.md`;
 			$ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/README`;
 			$ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/README-FR`;
 			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/aps`;
@@ -1104,13 +1110,15 @@
 		%filestoscansf=(
 			"$DESTI/package_rpm_generic/$FILENAMERPM"=>'Dolibarr installer for Fedora-Redhat-Mandriva-Opensuse (DoliRpm)',
 			"$DESTI/package_debian-ubuntu/${FILENAMEDEB}_all.deb"=>'Dolibarr installer for Debian-Ubuntu (DoliDeb)',
+			"$DESTI/package_debian-ubuntu/${FILENAMEDEBSHORT}.orig.tar.gz"=>'none',
 			"$DESTI/package_windows/$FILENAMEEXEDOLIWAMP.exe"=>'Dolibarr installer for Windows (DoliWamp)',
 			"$DESTI/standard/$FILENAMETGZ.tgz"=>'Dolibarr ERP-CRM',
 			"$DESTI/standard/$FILENAMETGZ.zip"=>'Dolibarr ERP-CRM'
 		);
 		%filestoscanstableasso=(
 			"$DESTI/package_rpm_generic/$FILENAMERPM"=>'package_rpm_generic',
 			"$DESTI/package_debian-ubuntu/${FILENAMEDEB}_all.deb"=>'package_debian-ubuntu',
+			"$DESTI/package_debian-ubuntu/${FILENAMEDEBSHORT}.orig.tar.gz"=>'package_debian-ubuntu',
 			"$DESTI/package_windows/$FILENAMEEXEDOLIWAMP.exe"=>'package_windows',
 			"$DESTI/standard/$FILENAMETGZ.tgz"=>'standard',
 			"$DESTI/standard/$FILENAMETGZ.zip"=>'standard'
@@ -1156,7 +1164,7 @@
 
 				print "\n";
 
-	    		if ($target eq 'SF') { 
+	    		if ($target eq 'SF' && $filestoscan{$file} ne 'none') { 
 	    			$destFolder="$NEWPUBLISH/$filestoscan{$file}/".$MAJOR.'.'.$MINOR.'.'.$BUILD;
 	    		}
 	    		elsif ($target eq 'ASSO' and $NEWPUBLISH =~ /stable/) {

dev/initdata/generate-invoice.php

@@ -31,8 +31,8 @@
 }
 
 // Recupere root dolibarr
-$path=preg_replace('/generate-facture.php/i','',$_SERVER["PHP_SELF"]);
-require ($path."../../htdocs/master.inc.php");
+//$path=preg_replace('/generate-produit.php/i','',$_SERVER["PHP_SELF"]);
+require (__DIR__. '/../../htdocs/master.inc.php');
 require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
 require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php");
 

dev/initdata/generate-order.php

@@ -32,8 +32,8 @@
 }
 
 // Recupere root dolibarr
-$path=preg_replace('/generate-commande.php/i','',$_SERVER["PHP_SELF"]);
-require ($path."../../htdocs/master.inc.php");
+//$path=preg_replace('/generate-commande.php/i','',$_SERVER["PHP_SELF"]);
+require (__DIR__. '/../../htdocs/master.inc.php');
 include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 include_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';

dev/initdata/generate-product.php

@@ -32,8 +32,8 @@
 }
 
 // Recupere root dolibarr
-$path=preg_replace('/generate-produit.php/i','',$_SERVER["PHP_SELF"]);
-require ($path."../../htdocs/master.inc.php");
+//$path=preg_replace('/generate-produit.php/i','',$_SERVER["PHP_SELF"]);
+require (__DIR__. '/../../htdocs/master.inc.php');
 include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 include_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';

dev/initdata/generate-proposal.php

@@ -32,8 +32,8 @@
 }
 
 // Recupere root dolibarr
-$path=preg_replace('/generate-propale.php/i','',$_SERVER["PHP_SELF"]);
-require ($path."../../htdocs/master.inc.php");
+//$path=preg_replace('/generate-propale.php/i','',$_SERVER["PHP_SELF"]);
+require (__DIR__. '/../../htdocs/master.inc.php');
 require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
 require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php");
 require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php");

dev/initdata/generate-thirdparty.php

@@ -32,8 +32,8 @@
 }
 
 // Recupere root dolibarr
-$path=preg_replace('/generate-societe.php/i','',$_SERVER["PHP_SELF"]);
-require ($path."../../htdocs/master.inc.php");
+//$path=preg_replace('/generate-societe.php/i','',$_SERVER["PHP_SELF"]);
+require (__DIR__. '/../../htdocs/master.inc.php');
 include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 include_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';

htdocs/adherents/list.php

@@ -81,7 +81,7 @@
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array(
     'd.rowid'=>'Ref',
-    //'d.ref'=>'Ref',
+    'd.login'=>'Login',
     'd.lastname'=>'Lastname',
     'd.firstname'=>'Firstname',
     'd.societe'=>"Company",

htdocs/comm/remx.php

@@ -130,7 +130,7 @@
 	}
 }
 
-if ($action == 'setremise')
+if ($action == 'setremise' && $user->rights->societe->creer)
 {
 	//if ($user->rights->societe->creer)
 	//if ($user->rights->facture->creer)
@@ -257,38 +257,48 @@
 	print '<tr><td class="titlefield">'.$langs->trans("CustomerAbsoluteDiscountAllUsers").'</td>';
 	print '<td>'.$remise_all.'&nbsp;'.$langs->trans("Currency".$conf->currency).' '.$langs->trans("HT").'</td></tr>';
 
-	print '<tr><td>'.$langs->trans("CustomerAbsoluteDiscountMy").'</td>';
-	print '<td>'.$remise_user.'&nbsp;'.$langs->trans("Currency".$conf->currency).' '.$langs->trans("HT").'</td></tr>';
+	if (! empty($user->fk_soc))    // No need to show this for external users
+	{
+    	print '<tr><td>'.$langs->trans("CustomerAbsoluteDiscountMy").'</td>';
+    	print '<td>'.$remise_user.'&nbsp;'.$langs->trans("Currency".$conf->currency).' '.$langs->trans("HT").'</td></tr>';
+	}
 	print '</table>';
-	print '<br>';
-
-	print load_fiche_titre($langs->trans("NewGlobalDiscount"),'','');
-	print '<table class="border" width="100%">';
-	print '<tr><td width="38%">'.$langs->trans("AmountHT").'</td>';
-	print '<td><input type="text" size="5" name="amount_ht" value="'.$_POST["amount_ht"].'">';
-	print '<span class="hideonsmartphone">&nbsp;'.$langs->trans("Currency".$conf->currency).'</span></td></tr>';
-	print '<tr><td width="38%">'.$langs->trans("VAT").'</td>';
-	print '<td>';
-	print $form->load_tva('tva_tx',GETPOST('tva_tx'),$mysoc,$object);
-	print '</td></tr>';
-	print '<tr><td>'.$langs->trans("NoteReason").'</td>';
-	print '<td><input type="text" size="60" name="desc" value="'.$_POST["desc"].'"></td></tr>';
-
-	print "</table>";
 
+	if ($user->rights->societe->creer)
+	{
+    	print '<br>';
+
+    	print load_fiche_titre($langs->trans("NewGlobalDiscount"),'','');
+    	print '<table class="border" width="100%">';
+    	print '<tr><td width="38%">'.$langs->trans("AmountHT").'</td>';
+    	print '<td><input type="text" size="5" name="amount_ht" value="'.$_POST["amount_ht"].'">';
+    	print '<span class="hideonsmartphone">&nbsp;'.$langs->trans("Currency".$conf->currency).'</span></td></tr>';
+    	print '<tr><td width="38%">'.$langs->trans("VAT").'</td>';
+    	print '<td>';
+    	print $form->load_tva('tva_tx',GETPOST('tva_tx'),$mysoc,$object);
+    	print '</td></tr>';
+    	print '<tr><td>'.$langs->trans("NoteReason").'</td>';
+    	print '<td><input type="text" size="60" name="desc" value="'.$_POST["desc"].'"></td></tr>';
+
+    	print "</table>";
+	}
+
 	print '</div>';
 
 	dol_fiche_end();
 
-	print '<div class="center">';
-	print '<input type="submit" class="button" name="submit" value="'.$langs->trans("AddGlobalDiscount").'">';
-    if (! empty($backtopage))
-    {
-        print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	    print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
-    }
-	print '</div>';
-
+	if ($user->rights->societe->creer)
+	{
+    	print '<div class="center">';
+    	print '<input type="submit" class="button" name="submit" value="'.$langs->trans("AddGlobalDiscount").'">';
+        if (! empty($backtopage))
+        {
+            print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
+    	    print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+        }
+    	print '</div>';
+	}
+
 	print '</form>';
 
 
@@ -414,7 +424,7 @@
 	print '<br>';
 
 	/*
-	 * Liste ristournes appliquees (=liees a une ligne de facture ou facture)
+	 * List discount consumed (=liees a une ligne de facture ou facture)
 	 */
 
 	// Remises liees a lignes de factures