Merge remote-tracking branch 'origin/3.6' into 3.7

Conflicts:
	build/debian/changelog
	build/makepack-dolibarr.pl
	build/makepack-howto.txt
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/filefunc.inc.php
	htdocs/product/class/product.class.php

ChangeLog

@@ -418,6 +418,7 @@ Fix: [ bug #2583 ] Unable to create a bank transfer with localized numbers
 Fix: [ bug #2577 ] Incorrect invoice status in "Linked objects" page of a project
 Fix: [ bug #2576 ] Unable to edit a dictionary entry that has # in its ref
 Fix: [ bug #2758 ] Product::update sets product note to "null" when $prod->note is null
+Fix: [ bug #2757 ] Deleting product category photo gives "Forbidden access" error
 
 ***** ChangeLog for 3.5.6 compared to 3.5.5 *****
 Fix: Avoid missing class error for fetch_thirdparty method #1973

build/debian/changelog

@@ -3,4 +3,4 @@ dolibarr (3.7.1-3) UNRELEASED; urgency=low
   [ Laurent Destailleur (eldy) ]
   * New upstream release.
     
- -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net>  Sun, 21 March 2015 12:00:00 +0100
+ -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net>  Tue, 12 May 2015 12:00:00 +0100     

build/exe/doliwamp/doliwamp.iss

@@ -32,7 +32,7 @@ AppPublisherURL=http://www.nltechno.com
 AppSupportURL=http://www.dolibarr.org
 AppUpdatesURL=http://www.dolibarr.org
 AppComments=DoliWamp includes Dolibarr, Apache, PHP and Mysql softwares.
-AppCopyright=Copyright (C) 2008-2014 Laurent Destailleur, NLTechno
+AppCopyright=Copyright (C) 2008-2015 Laurent Destailleur, NLTechno
 DefaultDirName=c:\dolibarr
 DefaultGroupName=Dolibarr
 ;LicenseFile=COPYING
@@ -108,7 +108,11 @@ Source: "C:\Program Files\Wamp\bin\mysql\mysql5.0.45\*.*"; DestDir: "{app}\bin\m
 ; Mysql data files (does not overwrite if exists)
 Source: "build\exe\doliwamp\mysql\*.*"; DestDir: "{app}\bin\mysql\data\mysql"; Flags: onlyifdoesntexist ignoreversion recursesubdirs; Excludes: ".gitignore,.project,CVS\*,Thumbs.db"
 ; Dolibarr
+<<<<<<< HEAD
 Source: "htdocs\*.*"; DestDir: "{app}\www\dolibarr\htdocs"; Flags: ignoreversion recursesubdirs; Excludes: ".gitignore,.project,CVS\*,Thumbs.db,custom\*,custom2\*,documents\*,nltechno*\*,includes\ckeditor\_source\*,includes\savant\*,includes\phpmailer\*,jquery\plugins\template\*,PHPExcel\Shared\PDF\*,PHPExcel\Shared\PCLZip\*,tcpdf\fonts\dejavu-fonts-ttf-2.33\*,tcpdf\fonts\freefont-20100919\*,tcpdf\fonts\utils\*,*\conf.php,*\conf.php.mysql,*\conf.php.old,*\conf.php.postgres,*\conf.php.sav,*\install.forced.php"
+=======
+Source: "htdocs\*.*"; DestDir: "{app}\www\dolibarr\htdocs"; Flags: ignoreversion recursesubdirs; Excludes: ".gitignore,.project,CVS\*,Thumbs.db,custom\*,custom2\*,documents\*,includes\ckeditor\_source\*,includes\savant\*,includes\phpmailer\*,jquery\plugins\template\*,nltechno*,PHPExcel\Shared\PDF\*,PHPExcel\Shared\PCLZip\*,tcpdf\fonts\dejavu-fonts-ttf-2.33\*,tcpdf\fonts\freefont-20100919\*,tcpdf\fonts\utils\*,*\conf.php,*\conf.php.mysql,*\conf.php.old,*\conf.php.postgres,*\conf.php.sav,*\install.forced.php"
+>>>>>>> refs/remotes/origin/3.5
 Source: "dev\*.*"; DestDir: "{app}\www\dolibarr\dev"; Flags: ignoreversion recursesubdirs; Excludes: ".gitignore,.project,CVS\*,Thumbs.db,dbmodel\*,fpdf\*,initdata\*,iso-normes\*,licence\*,phpcheckstyle\*,phpunit\*,samples\*,test\*,uml\*,vagrant\*,xdebug\*"
 Source: "doc\*.*"; DestDir: "{app}\www\dolibarr\doc"; Flags: ignoreversion recursesubdirs; Excludes: ".gitignore,.project,CVS\*,Thumbs.db,wiki\*,plaquette\*,dev\*,images\dolibarr_screenshot2.png,images\dolibarr_screenshot3.png,images\dolibarr_screenshot4.png,images\dolibarr_screenshot5.png,images\dolibarr_screenshot6.png,images\dolibarr_screenshot7.png,images\dolibarr_screenshot8.png,images\dolibarr_screenshot9.png,images\dolibarr_screenshot10.png,images\dolibarr_screenshot11.png,images\dolibarr_screenshot12.png"
 Source: "scripts\*.*"; DestDir: "{app}\www\dolibarr\scripts"; Flags: ignoreversion recursesubdirs; Excludes: ".gitignore,.project,CVS\*,Thumbs.db,product\materiel.net.php,product\import-product.php"

build/makepack-dolibarr.pl

@@ -207,7 +207,10 @@ else {
 	my $NUM_SCRIPT;
 	my $cpt=0;
 	while (! $found) {
-		printf(" %2d - %-14s  (%s)\n",$cpt,"ALL (1..9)","Need ".join(",",values %REQUIREMENTTARGET));
+		$cpt=0;
+		printf(" %2d - %-14s  (%s)\n",$cpt,"ALL (1..10)","Need ".join(",",values %REQUIREMENTTARGET));
+		$cpt++;
+		printf(" %2d - %-14s\n",$cpt,"Generate check file");
 		foreach my $target (@LISTETARGET) {
 			$cpt++;
 			printf(" %2d - %-14s  (%s)\n",$cpt,$target,"Need ".$REQUIREMENTTARGET{$target});
@@ -218,7 +221,7 @@ else {
 		printf(" %2d - %-14s  (%s)\n",$cpt,"SF (publish)","Need ".$REQUIREMENTPUBLISH{"SF"});
 	
 		# Ask which target to build
-		print "Choose one package number or several separated with space (0 - ".$cpt."): ";
+		print "Choose one target number or several separated with space (0 - ".$cpt."): ";
 		$NUM_SCRIPT=<STDIN>; 
 		chomp($NUM_SCRIPT);
 		if ($NUM_SCRIPT !~ /^[0-9\s]+$/)
@@ -235,30 +238,30 @@ else {
 	if ($NUM_SCRIPT eq "98") {
 		$CHOOSEDPUBLISH{"ASSO"}=1;
 	}
-	else 
+	elsif ($NUM_SCRIPT eq "99") {
-	{
+		$CHOOSEDPUBLISH{"SF"}=1;
-		if ($NUM_SCRIPT eq "99") {
+	}
-			$CHOOSEDPUBLISH{"SF"}=1;
+	elsif ($NUM_SCRIPT eq "0") {
+		$CHOOSEDTARGET{"-CHKSUM"}=1;
+		foreach my $key (@LISTETARGET) {
+			if ($key ne 'SNAPSHOT' && $key ne 'ASSO' && $key ne 'SF') { $CHOOSEDTARGET{$key}=1; }
 		}
-		else {
+	}
-			if ($NUM_SCRIPT eq "0") {
+	elsif ($NUM_SCRIPT eq "1") {
-				foreach my $key (@LISTETARGET) {
+		$CHOOSEDTARGET{"-CHKSUM"}=1
-					if ($key ne 'SNAPSHOT' && $key ne 'ASSO' && $key ne 'SF') { $CHOOSEDTARGET{$key}=1; }
+	}
-				}
+	else {
-			}
+		foreach my $num (split(/\s+/,$NUM_SCRIPT)) {
-			else {
+			$CHOOSEDTARGET{$LISTETARGET[$num-2]}=1;
-				foreach my $num (split(/\s+/,$NUM_SCRIPT)) {
-					$CHOOSEDTARGET{$LISTETARGET[$num-1]}=1;
-				}
-			}
 		}
 	}
 }
 
+
 # Test if requirement is ok
 #--------------------------
 $atleastonerpm=0;
-foreach my $target (keys %CHOOSEDTARGET) {
+foreach my $target (sort keys %CHOOSEDTARGET) {
 	if ($target =~ /RPM/i)
 	{
 		if ($atleastonerpm && ($DESTI eq "$SOURCE/build"))
@@ -300,20 +303,32 @@ foreach my $target (keys %CHOOSEDTARGET) {
 
 print "\n";
 
-# Check if there is at least on target to build
+# Build xml check file
+#-----------------------
+if ($CHOOSEDTARGET{'-CHKSUM'})
+{
+   	print 'Create xml check file with md5 checksum with command php '.$SOURCE.'/build/generate_filecheck_xml.php release='.$MAJOR.'.'.$MINOR.'.'.$BUILD."\n";
+  	$ret=`php $SOURCE/build/generate_filecheck_xml.php release=$MAJOR.$MINOR.$BUILD`;
+  	print $ret."\n";
+}
+
+
+#print join(',',sort keys %CHOOSEDTARGET)."\n";
+
+# Check if there is at least one target to build
 #----------------------------------------------
 $nboftargetok=0;
 $nboftargetneedbuildroot=0;
 $nbofpublishneedtag=0;
-foreach my $target (keys %CHOOSEDTARGET) {
+foreach my $target (sort keys %CHOOSEDTARGET) {
 	if ($CHOOSEDTARGET{$target} < 0) { next; }
-	if ($target ne 'EXE' && $target ne 'EXEDOLIWAMP') 
+	if ($target ne 'EXE' && $target ne 'EXEDOLIWAMP' && $target ne '-CHKSUM') 
 	{
 		$nboftargetneedbuildroot++;
 	}
 	$nboftargetok++;
 }
-foreach my $target (keys %CHOOSEDPUBLISH) {
+foreach my $target (sort keys %CHOOSEDPUBLISH) {
 	if ($CHOOSEDPUBLISH{$target} < 0) { next; }
 	if ($target eq 'ASSO') { $nbofpublishneedtag++; }
 	if ($target eq 'SF') { $nbofpublishneedtag++; }
@@ -368,6 +383,7 @@ if ($nboftargetok) {
 		print "Clean $BUILDROOT\n";
 		$ret=`rm -f  $BUILDROOT/$PROJECT/.buildpath`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/.cache`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/.editorconfig`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/.externalToolBuilders`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/.git*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/.project`;
@@ -376,7 +392,6 @@ if ($nboftargetok) {
 		$ret=`rm -fr $BUILDROOT/$PROJECT/.travis.yml`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/.tx`;
 		$ret=`rm -f  $BUILDROOT/$PROJECT/build.xml`;
-		$ret=`rm -f  $BUILDROOT/$PROJECT/quickbuild.xml`;
 		$ret=`rm -f  $BUILDROOT/$PROJECT/pom.xml`;
 		
 		$ret=`rm -fr $BUILDROOT/$PROJECT/build/html`;
@@ -435,24 +450,25 @@ if ($nboftargetok) {
 		$ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot11.png`;
 		$ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot12.png`;
 
-		
 		# Security to avoid to package data files 
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/document`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/document`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/documents`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/documents`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/document`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/document`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/documents`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/documents`;
-		# Security to avoid to package external modules installed for dolistore validation 
+		# Removed known external modules to avoir any error when packaging on test env 
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/ancotec*`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/calling*`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/bootstrap*`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/factory*`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/management*`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/management*`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/multicompany*`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/multicompany*`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/nltechno*`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/nltechno*`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/oscim*`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/pos*`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/pos*`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/teclib*`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/public/test`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/teclib*`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/timesheet*`;
 		# Removed other test files
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/themes/oblyon*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/themes/eldy/*.new`;
@@ -484,9 +500,10 @@ if ($nboftargetok) {
 
 	# Build package for each target
 	#------------------------------
-	foreach my $target (keys %CHOOSEDTARGET) 
+	foreach my $target (sort keys %CHOOSEDTARGET) 
 	{
 		if ($CHOOSEDTARGET{$target} < 0) { next; }
+		if ($target eq '-CHKSUM') { next; }
 		
 		print "\nBuild package for target $target\n";
 
@@ -659,6 +676,11 @@ if ($nboftargetok) {
 			if ($target =~ /MAND/i) { $BUILDFICSRC="${FILENAME}_mandriva.spec"; }
 			if ($target =~ /OPEN/i) { $BUILDFICSRC="${FILENAME}_opensuse.spec"; }
 			
+			use Date::Language;
+			$lang=Date::Language->new('English');
+			$datestring = $lang->time2str("%a %b %e %Y", time);
+    		$changelogstring="* ".$datestring." Laurent Destailleur $MAJOR.$MINOR.$REL1-$RPMSUBVERSION\n- Upstream release\n";
+
 			print "Generate file $BUILDROOT/$BUILDFIC from $SOURCE/build/rpm/${BUILDFICSRC}\n";
 			open (SPECFROM,"<$SOURCE/build/rpm/${BUILDFICSRC}") || die "Error";
 			open (SPECTO,">$BUILDROOT/$BUILDFIC") || die "Error";
@@ -666,6 +688,7 @@ if ($nboftargetok) {
 				$_ =~ s/__FILENAMETGZ__/$FILENAMETGZ/;
 				$_ =~ s/__VERSION__/$MAJOR.$MINOR.$REL1/;
 				$_ =~ s/__RELEASE__/$RPMSUBVERSION/;
+                $_ =~ s/__CHANGELOGSTRING__/$changelogstring/;
 				print SPECTO $_;
 			}
 			close SPECFROM;
@@ -989,7 +1012,7 @@ if ($nboftargetok) {
 
 	# Publish package for each target
 	#--------------------------------
-	foreach my $target (keys %CHOOSEDPUBLISH) 
+	foreach my $target (sort keys %CHOOSEDPUBLISH) 
 	{
 		if ($CHOOSEDPUBLISH{$target} < 0) { next; }
 	
@@ -1079,7 +1102,8 @@ if ($nboftargetok) {
 }
 
 print "\n----- Summary -----\n";
-foreach my $target (keys %CHOOSEDTARGET) {
+foreach my $target (sort keys %CHOOSEDTARGET) {
+	if ($target eq '-CHKSUM') { print "Checksum was generated"; next; }
 	if ($CHOOSEDTARGET{$target} < 0) {
 		print "Package $target not built (bad requirement).\n";
 	} else {

build/makepack-howto.txt

@@ -11,7 +11,6 @@ beta version of Dolibarr, step by step.
 - Update version/info in ChangeLog. To generate a changelog, you can do "git log x.y.z..HEAD --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIXED\|NEW'"
 - Update version number with x.y.z-w in htdocs/filefunc.inc.php
 - Update version number with x.y.z-w in build/debian/changelog
-- Update version number with x.y.z-w in build/rpm/*.spec
 - Commit all changes.
 - Add a Tag (x.y.betaz_YYYYMMDD) and push it: git push --tags
 - Create a branch (x.y).
@@ -33,7 +32,6 @@ complete release of Dolibarr, step by step.
 - Update version/info in ChangeLog. To generate a changelog, you can do "git log x.y.z..HEAD --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^Fix\|New\|Sec'"
 - Update version number with x.y.z in htdocs/filefunc.inc.php
 - Update version number with x.y.z in build/debian/changelog
-- Update version number with x.y.z in build/rpm/*.spec
 - Commit all changes.
 
 - Run makepack-dolibarr.pl to generate all packages.

build/rpm/dolibarr_fedora.spec

@@ -332,5 +332,4 @@ fi
 
 # version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release
 %changelog
-* Wed Oct 29 2014 Laurent Destailleur 3.7.1-0.3
+__CHANGELOGSTRING__
-- Upstream release

build/rpm/dolibarr_generic.spec

@@ -568,7 +568,4 @@ fi
 
 # version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release
 %changelog
-* Wed Oct 29 2014 Laurent Destailleur 3.7.1-0.3
+__CHANGELOGSTRING__
-- Upstream release
-
-

build/rpm/dolibarr_mandriva.spec

@@ -337,7 +337,4 @@ fi
 
 # version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release
 %changelog
-* Wed Oct 29 2014 Laurent Destailleur 3.7.1-0.3
+__CHANGELOGSTRING__
-- Upstream release
-
-

build/rpm/dolibarr_opensuse.spec

@@ -348,7 +348,4 @@ fi
 
 # version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release
 %changelog
-* Wed Oct 29 2014 Laurent Destailleur 3.7.1-0.3
+__CHANGELOGSTRING__
-- Upstream release
-
-