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

Dolibarr · Mar 15, 2016 · ac1b4a9 · ac1b4a9
2 parents adc552d + 76c1af0
commit ac1b4a9
Show file tree

Hide file tree

Showing 7 changed files with 8,241 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@ Dolibarr ERP & CRM is a modern software to manage your organization's activity (
 
 It's an Open Source software (wrote in PHP language) designed for small and medium companies, foundation and freelances.
 
-You can freely use, study, modify or distribute it according to it's Free Software licence.
+You can freely use, study, modify or distribute it according to its Free Software licence.
 
 You can use it as a standalone application or as a web application to be able to access it from the Internet or a LAN.
 

diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl
@@ -1159,10 +1159,13 @@
 	    		if ($target eq 'SF') { 
 	    			$destFolder="$NEWPUBLISH/$filestoscan{$file}/".$MAJOR.'.'.$MINOR.'.'.$BUILD;
 	    		}
-	    		elsif ($target eq 'ASSO' && $NEWPUBLISH =~ /stable/) {
+	    		elsif ($target eq 'ASSO' and $NEWPUBLISH =~ /stable/) {
 	    			$destFolder="$NEWPUBLISH/$filestoscanstableasso{$file}";
 	    		} 
-	    		else
+	    		elsif ($target eq 'ASSO' and $NEWPUBLISH !~ /stable/) {
+	    			$destFolder="$NEWPUBLISH";
+	    		} 
+	    		else	# No more used
 	    		{
 	    			$dirnameonly=$file;
 	    			$dirnameonly =~ s/.*\/([^\/]+)\/[^\/]+$/$1/;  

diff --git a/dev/initdata/mysqldump_dolibarr_3.9.0.sql b/dev/initdata/mysqldump_dolibarr_3.9.0.sql
diff --git a/dev/initdata/savedemo.sh b/dev/initdata/savedemo.sh
@@ -174,6 +174,10 @@ export list="
     --ignore-table=$base.llx_advanced_extrafields 
     --ignore-table=$base.llx_advanced_extrafields_options 
     --ignore-table=$base.llx_advanced_extrafields_values
+    --ignore-table=$base.llx_askpricesupplier
+    --ignore-table=$base.llx_askpricesupplier_extrafields
+    --ignore-table=$base.llx_askpricesupplierdet
+    --ignore-table=$base.llx_askpricesupplierdet_extrafields
     --ignore-table=$base.llx_bookkeeping
 	--ignore-table=$base.llx_bootstrap
 	--ignore-table=$base.llx_bt_namemap
@@ -196,6 +200,11 @@ export list="
 	--ignore-table=$base.llx_cabinetmed_motifcons
 	--ignore-table=$base.llx_cabinetmed_patient
 	--ignore-table=$base.llx_cabinetmed_societe
+	--ignore-table=$base.llx_congespayes
+	--ignore-table=$base.llx_congespayes_config
+	--ignore-table=$base.llx_congespayes_events
+	--ignore-table=$base.llx_congespayes_logs
+	--ignore-table=$base.llx_congespayes_users
 	--ignore-table=$base.llx_dolicloud_customers
 	--ignore-table=$base.llx_dolicloud_stats
 	--ignore-table=$base.llx_dolicloud_emailstemplates
@@ -205,6 +214,7 @@ export list="
 	--ignore-table=$base.llx_filemanager_roots
 	--ignore-table=$base.llx_fournisseur_ca
 	--ignore-table=$base.llx_google_maps
+	--ignore-table=$base.llx_milestone
 	--ignore-table=$base.llx_monitoring_probes
 	--ignore-table=$base.llx_notes
 	--ignore-table=$base.llx_pos_cash

diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php
@@ -142,13 +142,14 @@
 		// Situation invoices handling
 		$line = new FactureLigne($db);
 		$line->fetch($obj->fdid); // id of line
-		$prev_progress = $line->get_prev_progress($obj->rowid);   // id of invoice
+		$prev_progress = 0;
 		if ($obj->type == Facture::TYPE_SITUATION) {
-			// Avoid divide by 0
+		    // Avoid divide by 0
 			if ($obj->situation_percent == 0) {
 				$situation_ratio = 0;
 			} else {
-				$situation_ratio = ($obj->situation_percent - $prev_progress) / $obj->situation_percent;
+		        $prev_progress = $line->get_prev_progress($obj->rowid);   // id of invoice
+			    $situation_ratio = ($obj->situation_percent - $prev_progress) / $obj->situation_percent;
 			}
 		} else {
 			$situation_ratio = 1;

diff --git a/htdocs/compta/journal/sellsjournal.php b/htdocs/compta/journal/sellsjournal.php
@@ -167,13 +167,14 @@
 		// Situation invoices handling
 		$line = new FactureLigne($db);
 		$line->fetch($obj->id);   // id of line
-		$prev_progress = $line->get_prev_progress($obj->rowid);   // id on invoice
+		$prev_progress = 0;
 		if ($obj->type==Facture::TYPE_SITUATION) {
 			// Avoid divide by 0
 			if ($obj->situation_percent == 0) { 
 				$situation_ratio = 0;
 			} else {
-				$situation_ratio = ($obj->situation_percent - $prev_progress) / $obj->situation_percent;
+		        $prev_progress = $line->get_prev_progress($obj->rowid);   // id on invoice
+			    $situation_ratio = ($obj->situation_percent - $prev_progress) / $obj->situation_percent;
 			}
 		} else {
 			$situation_ratio = 1;

diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php
@@ -31,7 +31,7 @@
  */
 
 if (! defined('DOL_APPLICATION_TITLE')) define('DOL_APPLICATION_TITLE','Dolibarr');
-if (! defined('DOL_VERSION')) define('DOL_VERSION','3.9.0-rc2');
+if (! defined('DOL_VERSION')) define('DOL_VERSION','3.9.0');
 
 if (! defined('EURO')) define('EURO',chr(128));