Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur
2022-09-14 17:26:20 +02:00
parent 7d5d04a30d 5f27435ffc
commit 35d8320328
15 changed files with 111 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
htdocs/admin/modulehelp.php
View File

@@ -384,15 +384,16 @@ if ($mode == 'feature') {
$text .= '<br><br>';
$text .= '<br><strong>'.$langs->trans("AddDataTables").':</strong> ';
$sqlfiles = dol_dir_list(dol_buildpath($moduledir.'/sql/'), 'files', 0, 'llx.*\.sql', array('\.key\.sql', '\.sql\.back'));
$listofsqlfiles1 = dol_dir_list(DOL_DOCUMENT_ROOT.'/install/mysql/tables/', 'files', 0, 'llx.*-'.$moduledir.'\.sql', array('\.key\.sql', '\.sql\.back'));
$listofsqlfiles2 = dol_dir_list(dol_buildpath($moduledir.'/sql/'), 'files', 0, 'llx.*\.sql', array('\.key\.sql', '\.sql\.back'));
$sqlfiles = array_merge($listofsqlfiles1, $listofsqlfiles2);
if (count($sqlfiles) > 0) {
$text .= $langs->trans("Yes").' (';
$i = 0;
foreach ($sqlfiles as $val) {
$text .= ($i ? ', ' : '').preg_replace('/\.sql$/', '', preg_replace('/llx_/', '', $val['name']));
$text .= ($i ? ', ' : '').preg_replace('/\-'.$moduledir.'$/', '', preg_replace('/\.sql$/', '', preg_replace('/llx_/', '', $val['name'])));
$i++;
}
$text .= ')';
} else {
$text .= $langs->trans("No");
}
@@ -415,7 +416,7 @@ if ($mode == 'feature') {
$text .= '<br><strong>'.$langs->trans("AddData").':</strong> ';
$filedata = dol_buildpath($moduledir.'/sql/data.sql');
if (dol_is_file($filedata)) {
$text .= $langs->trans("Yes").' ('.$moduledir.'/sql/data.sql)';
$text .= $langs->trans("Yes").' <span class="opacitymedium">('.$moduledir.'/sql/data.sql)</span>';
} else {
$text .= $langs->trans("No");
}