Backport fix for mysql 8 export

Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2024-10-29 15:32:54 +01:00 · 2024-09-29 19:28:05 +02:00 · 2024-09-29 19:25:49 +02:00 · 2024-09-29 15:57:05 +02:00 · 2024-09-26 18:46:30 +02:00 · 2024-09-26 18:41:41 +02:00
4 changed files with 9 additions and 18 deletions
--- a/htdocs/compta/stats/cabyprodserv.php
+++ b/htdocs/compta/stats/cabyprodserv.php
@@ -418,7 +418,7 @@ if ($modecompta == 'CREANCES-DETTES')

 			// Quantity
 			print '<td class="right">';
-			print $qty[$key];
+			print price($qty[$key], 1, $langs, 0, 0);
 			print '</td>';

 			// Percent;
--- a/htdocs/core/class/utils.class.php
+++ b/htdocs/core/class/utils.class.php
@@ -390,7 +390,7 @@ class Utils
 				if ($compression == 'none') fclose($handle);
 				if ($compression == 'gz')   gzclose($handle);
 				if ($compression == 'bz')   bzclose($handle);
-				if ($ok && preg_match('/^-- (MySql|MariaDB)/i', $errormsg))	{	// No error
+				if ($ok && preg_match('/^-- (MySql|MariaDB)/i', $errormsg) || preg_match('/^\/\*M?!999999/', $errormsg)) {	// Start of file is ok, NOT an error
 					$errormsg = '';
 				}
 				else
--- a/htdocs/core/lib/product.lib.php
+++ b/htdocs/core/lib/product.lib.php
@@ -367,7 +367,7 @@ function show_stats_for_company($product, $socid)
 		print '</td><td class="right">';
 		print $product->stats_propale['nb'];
 		print '</td><td class="right">';
-		print $product->stats_propale['qty'];
+		print price($product->stats_propale['qty'], 1, $langs, 0, 0);
 		print '</td>';
 		print '</tr>';
 	}
@@ -385,7 +385,7 @@ function show_stats_for_company($product, $socid)
 		print '</td><td class="right">';
 		print $product->stats_proposal_supplier['nb'];
 		print '</td><td class="right">';
-		print $product->stats_proposal_supplier['qty'];
+		print price($product->stats_proposal_supplier['qty'], 1, $langs, 0, 0);
 		print '</td>';
 		print '</tr>';
 	}
@@ -403,7 +403,7 @@ function show_stats_for_company($product, $socid)
 		print '</td><td class="right">';
 		print $product->stats_commande['nb'];
 		print '</td><td class="right">';
-		print $product->stats_commande['qty'];
+		print price($product->stats_commande['qty'], 1, $langs, 0, 0);
 		print '</td>';
 		print '</tr>';
 	}
@@ -421,7 +421,7 @@ function show_stats_for_company($product, $socid)
 		print '</td><td class="right">';
 		print $product->stats_commande_fournisseur['nb'];
 		print '</td><td class="right">';
-		print $product->stats_commande_fournisseur['qty'];
+		print price($product->stats_commande_fournisseur['qty'], 1, $langs, 0, 0);
 		print '</td>';
 		print '</tr>';
 	}
@@ -439,7 +439,7 @@ function show_stats_for_company($product, $socid)
 		print '</td><td class="right">';
 		print $product->stats_facture['nb'];
 		print '</td><td class="right">';
-		print $product->stats_facture['qty'];
+		print price($product->stats_facture['qty'], 1, $langs, 0, 0);
 		print '</td>';
 		print '</tr>';
 	}
@@ -457,7 +457,7 @@ function show_stats_for_company($product, $socid)
 		print '</td><td class="right">';
 		print $product->stats_facture_fournisseur['nb'];
 		print '</td><td class="right">';
-		print $product->stats_facture_fournisseur['qty'];
+		print price($product->stats_facture_fournisseur['qty'], 1, $langs, 0, 0);
 		print '</td>';
 		print '</tr>';
 	}
@@ -476,7 +476,7 @@ function show_stats_for_company($product, $socid)
 		print '</td><td class="right">';
 		print $product->stats_contrat['nb'];
 		print '</td><td class="right">';
-		print $product->stats_contrat['qty'];
+		print price($product->stats_contrat['qty'], 1, $langs, 0, 0);
 		print '</td>';
 		print '</tr>';
 	}
--- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
@@ -1478,19 +1478,10 @@ class pdf_azur extends ModelePDFPropales
 			if ($this->emetteur->logo)
 			{
 				$logodir = $conf->mycompany->dir_output;
-<<<<<<< HEAD
-				if (! empty($conf->mycompany->multidir_output[$object->entity])) $logodir = $conf->mycompany->multidir_output[$object->entity];
-				if (empty($conf->global->MAIN_PDF_USE_LARGE_LOGO))
-				{
-					$logo = $logodir.'/logos/thumbs/'.$this->emetteur->logo_small;
-				}
-				else {
-=======
 				if (!empty($conf->mycompany->multidir_output[$object->entity])) $logodir = $conf->mycompany->multidir_output[$object->entity];
 				if (empty($conf->global->MAIN_PDF_USE_LARGE_LOGO)) {
 					$logo = $logodir.'/logos/thumbs/'.$this->emetteur->logo_small;
 				} else {
->>>>>>> branch '10.0' of git@github.com:Dolibarr/dolibarr.git
 					$logo = $logodir.'/logos/'.$this->emetteur->logo;
 				}
 				if (is_readable($logo))
Author	SHA1	Message	Date
Laurent Destailleur	a186e16568	Backport fix for mysql 8 export	2024-10-29 15:32:54 +01:00
Laurent Destailleur	a621032643	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0	2024-09-29 19:28:05 +02:00
Laurent Destailleur	32646cb7f4	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0	2024-09-29 19:25:49 +02:00
Florian Mortgat	74b67eb6c6	FIX - use price() to display qty on a product's stats tab to avoid showing too many decimals when rounding errors are possible (#31165 )	2024-09-29 15:57:05 +02:00
Laurent Destailleur	667890247c	Merge remote-tracking branch 'origin/10.0' into 11.0	2024-09-26 18:46:30 +02:00
Florian Mortgat	c727bbb530	FIX: when qty is not an integer, apply price() (#31138 ) * FIX: when qty is not an integer, apply price() to avoid displaying precision errors if php.ini's precision settings are too high * Apply eldy's suggestion to use price's parameters rather than a test	2024-09-26 18:41:41 +02:00
Laurent Destailleur	973a2ede97	Fix syntax error	2023-08-10 11:35:19 +02:00