Passage à la version 6.0.4

atgp · Nov 22, 2024 · cf227fc · cf227fc
1 parent d2389a0
commit cf227fc
Show file tree

Hide file tree

Showing 31 changed files with 953 additions and 415 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,10 +1,18 @@
 # ChangeLog MODULE CONCATPDF FOR <a href="https://www.dolibarr.org">DOLIBARR ERP CRM</a>
 
 
-# Unreleased
+# 6.0.4
 
+FIX: The value shown as the Default is wrong when you allow selection of several files to concat 
+
+
+# 6.0.3
+
+FIX: Fix fatal error on concat on contract
 FIX: Use page size in setup
-FIX: Minimum version is 8.0
+FIX: Minimum version is Dolibarr 16.0
+FIX: Failed to concat when var with name of file to concat ends with .PDF or .pdf
+NEW: Can set several default concat templates
 
 ## 6.0.2
 

diff --git a/README.md b/README.md
@@ -13,4 +13,6 @@ Objects that are supported (with version 3.7.2 or more of module):
 * Supplier invoices
 * Contracts
 
+![Screenshot statistic](img/screen_shot_concatpdf.png?raw=true "ConcatPDF screenshot")
+
 More information <a href="https://wiki.dolibarr.org/index.php/Module_Concat_PDF" target="_new">this wiki page</a>.
diff --git a/admin/about.php b/admin/about.php
@@ -17,32 +17,26 @@
  */
 
 /**
- *        \file       htdocs/concatpdf/admin/about.php
+ *	    \file       htdocs/concatpdf/admin/about.php
  *      \ingroup    concatpdf
  *      \brief      Page about
  */
 
 // Load Dolibarr environment
-$res = 0;
+$res=0;
 // Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
-if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) $res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"] . "/main.inc.php";
+if (! $res && ! empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) $res=@include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
 // Try main.inc.php into web root detected using web root caluclated from SCRIPT_FILENAME
-$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME'];
-$tmp2 = realpath(__FILE__);
-$i = strlen($tmp) - 1;
-$j = strlen($tmp2) - 1;
-while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) {
-	$i--;
-	$j--;
-}
-if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1)) . "/main.inc.php")) $res = @include substr($tmp, 0, ($i + 1)) . "/main.inc.php";
-if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1))) . "/main.inc.php")) $res = @include dirname(substr($tmp, 0, ($i + 1))) . "/main.inc.php";
+$tmp=empty($_SERVER['SCRIPT_FILENAME'])?'':$_SERVER['SCRIPT_FILENAME'];$tmp2=realpath(__FILE__); $i=strlen($tmp)-1; $j=strlen($tmp2)-1;
+while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i]==$tmp2[$j]) { $i--; $j--; }
+if (! $res && $i > 0 && file_exists(substr($tmp, 0, ($i+1))."/main.inc.php")) $res=@include substr($tmp, 0, ($i+1))."/main.inc.php";
+if (! $res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i+1)))."/main.inc.php")) $res=@include dirname(substr($tmp, 0, ($i+1)))."/main.inc.php";
 // Try main.inc.php using relative path
-if (!$res && file_exists("../../main.inc.php")) $res = @include "../../main.inc.php";
-if (!$res && file_exists("../../../main.inc.php")) $res = @include "../../../main.inc.php";
-if (!$res) die("Include of main fails");
+if (! $res && file_exists("../../main.inc.php")) $res=@include "../../main.inc.php";
+if (! $res && file_exists("../../../main.inc.php")) $res=@include "../../../main.inc.php";
+if (! $res) die("Include of main fails");
 
-require_once DOL_DOCUMENT_ROOT . "/core/lib/admin.lib.php";
+require_once DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php";
 
 
 if (!$user->admin) accessforbidden();
@@ -57,14 +51,15 @@
  * View
  */
 
-$help_url = '';
+$help_url='';
 llxHeader('', '', $help_url);
 
-$linkback = '<a href="' . DOL_URL_ROOT . '/admin/modules.php?restore_lastsearch_values=1">' . $langs->trans("BackToModuleList") . '</a>';
+$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
 print_fiche_titre($langs->trans("ConcatPdfSetup"), $linkback, 'setup');
-print '<br>';
 
-$h = 0;
+$head = array();
+
+$h=0;
 $head[$h][0] = 'concatpdf.php';
 $head[$h][1] = $langs->trans("Setup");
 $head[$h][2] = 'tabsetup';
@@ -75,31 +70,36 @@
 $head[$h][2] = 'tababout';
 $h++;
 
-dol_fiche_head($head, 'tababout', '');
+dol_fiche_head($head, 'tababout', '', -1);
 
 dol_include_once('/concatpdf/core/modules/modConcatPdf.class.php');
 $tmpmodule = new modConcatPdf($db);
-if (method_exists($tmpmodule, 'getDescLong')) print $tmpmodule->getDescLong();
+if (method_exists($tmpmodule, 'getDescLong')) {
+	print $tmpmodule->getDescLong();
+}
 
 print '<br><hr><br>';
 
-print $langs->trans("AboutInfo") . '<br>';
+print $langs->trans("AboutInfo").'<br>';
 
-print $langs->trans("MoreModules") . '<br>';
-print '&nbsp; &nbsp; &nbsp; ' . $langs->trans("MoreModulesLink") . '<br>';
-$url = 'https://www.dolistore.com/search.php?search_query=nltechno';
-print '<a href="' . $url . '" target="_blank"><img border="0" width="180" src="' . DOL_URL_ROOT . '/theme/dolistore_logo.png"></a><br><br><br>';
+print $langs->trans("MoreModules").'<br>';
+print '<br>';
+print $langs->trans("MoreModulesLink").'<br>';
+$url='https://www.dolistore.com/search.php?search_query=dolicloud';
+print '<a href="'.$url.'" target="_blank"><img border="0" width="180" src="'.DOL_URL_ROOT.'/theme/dolistore_logo.png"></a><br><br><br>';
 
 print '<br>';
-print $langs->trans("MoreCloudHosting") . '<br>';
-print '&nbsp; &nbsp; &nbsp; ' . $langs->trans("MoreCloudHostingLink") . '<br>';
-$url = 'https://www.dolicloud.com';
-print '<a href="' . $url . '" target="_blank"><img border="0" width="180" src="../img/dolicloud_logo.png"></a><br><br><br>';
+print $langs->trans("MoreCloudHosting").'<br>';
+print '<br>';
+print $langs->trans("MoreCloudHostingLink").'<br>';
+$url='https://www.dolicloud.com?origin=dolimods';
+print '<a href="'.$url.'" target="_blank"><img border="0" width="180" src="../img/dolicloud_logo.png"></a><br><br><br>';
 
 print '<br>';
-print $langs->trans("CompatibleWithDoliDroid") . '<br>';
-$url = 'https://play.google.com/store/apps/details?id=com.nltechno.dolidroidpro';
-print '<a href="' . $url . '" target="_blank"><img border="0" width="180" src="../img/dolidroid_512x512_en.png"></a><br><br>';
+print $langs->trans("CompatibleWithDoliDroid").'<br>';
+print '<br>';
+$url='https://play.google.com/store/apps/details?id=com.nltechno.dolidroidpro';
+print '<a href="'.$url.'" target="_blank"><img border="0" width="180" src="../img/dolidroid_512x512_en.png"></a><br><br>';
 
 print '<br>';