Skip to content

Commit a90d328

Browse files
aspangaroaspangaro
committed
Merge branch 'develop' into 24_accreconcilegeneralaccount
2 parents 68a7e39 + 97bdffc commit a90d328

9 files changed

Lines changed: 27 additions & 24 deletions

File tree

‎htdocs/admin/modules.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@
308308
}
309309
*/
310310

311-
// Check if module is in the remote malware list
311+
// Check if module is in the remote malware blacklist (at URL DolibarrModules::URL_FOR_BLACKLISTED_MODULES)
312312
if (!$error) {
313313
if (GETPOST('checkforcompliance') == 'on') {
314314
try {
@@ -1557,7 +1557,7 @@
15571557
print $langs->trans("YouCanSubmitFile").'<br><br><br>';
15581558

15591559
print '<span class="opacitymedium"><input class="paddingright" type="checkbox" name="checkforcompliance" id="checkforcompliance"'.(getDolGlobalString('DISABLE_CHECK_ON_MALWARE_MODULES') ? ' disabled="disabled"' : 'checked="checked"').'>';
1560-
print '<label for="checkforcompliance">'.$form->textwithpicto($langs->trans("CheckIfModuleIsNotBlackListed"), $langs->trans("CheckIfModuleIsNotBlackListedHelp")).'</label>';
1560+
print '<label for="checkforcompliance">'.$form->textwithpicto($langs->trans("CheckIfModuleIsNotBlackListed"), $langs->trans("CheckIfModuleIsNotBlackListedHelp").'<br><br>'.DolibarrModules::URL_FOR_BLACKLISTED_MODULES).'</label>';
15611561
print '</span><br><br>';
15621562

15631563
$max = getDolGlobalString('MAIN_UPLOAD_DOC'); // In Kb

‎htdocs/comm/action/card.php‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1485,7 +1485,10 @@ function setdatefields()
14851485
// Type of event
14861486
if (getDolGlobalString('AGENDA_USE_EVENT_TYPE')) {
14871487
print '<tr><td class="titlefieldcreate"><span class="fieldrequired">'.$langs->trans("Type").'</span></b></td><td>';
1488-
$default = getDolGlobalString('AGENDA_USE_EVENT_TYPE_DEFAULT', 'AC_RDV');
1488+
$default = getDolGlobalString('AGENDA_USE_EVENT_TYPE_DEFAULT', 'AC_OTH');
1489+
if (empty($default)) {
1490+
$default = 'AC_OTH';
1491+
}
14891492
print img_picto($langs->trans("ActionType"), 'square', 'class="fawidth30 inline-block" style="color: #ddd;"');
14901493
$selectedvalue = GETPOSTISSET("actioncode") ? GETPOST("actioncode", 'aZ09') : ($object->type_code ? $object->type_code : $default);
14911494
print $formactions->select_type_actions($selectedvalue, "actioncode", "systemauto", 0, -1, 0, 1); // TODO Replace 0 with -2 in onlyautoornot

‎htdocs/core/class/html.form.class.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2603,7 +2603,9 @@ public function select_dolusers($userselected = '', $htmlname = 'userid', $show_
26032603
}
26042604
if (getDolGlobalString('USER_HIDE_INACTIVE_IN_COMBOBOX') || $notdisabled) {
26052605
$sql .= " AND (u.statut <> 0";
2606-
$sql .= " OR rowid IN (".$this->db->sanitize(implode(',', $selected)).")"; // We must always keep the selected users to avoid to loose it/them when updating
2606+
if (!empty($selected)) {
2607+
$sql .= " OR rowid IN (".$this->db->sanitize(implode(',', $selected)).")"; // We must always keep the selected users to avoid to loose it/them when updating
2608+
}
26072609
$sql .= ")";
26082610
}
26092611
if (getDolGlobalString('USER_HIDE_NONEMPLOYEE_IN_COMBOBOX')) {

‎htdocs/core/lib/project.lib.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1383,7 +1383,7 @@ function projectLinesPerAction(&$inc, $parent, $fuser, $lines, &$level, &$projec
13831383
print $taskstatic->getNomUrl(1, 'withproject', 'time');
13841384
// Label task
13851385
print '<br>';
1386-
print '<div class="opacitymedium tdoverflowmax500" title="'.dol_escape_htmltag($taskstatic->label).'">'.dol_escape_htmltag($taskstatic->label).'</div>';
1386+
print '<div class="opacitymedium tdoverflowmax400 small" title="'.dol_escape_htmltag($taskstatic->label).'">'.dol_escape_htmltag($taskstatic->label).'</div>';
13871387
for ($k = 0; $k < $level; $k++) {
13881388
print "</div>";
13891389
}
@@ -1707,7 +1707,7 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
17071707
print $taskstatic->getNomUrl(1, 'withproject', 'time');
17081708
// Label task
17091709
print '<br>';
1710-
print '<div class="opacitymedium tdoverflowmax500" title="'.dol_escape_htmltag($taskstatic->label).'">'.dol_escape_htmltag($taskstatic->label).'</div>';
1710+
print '<div class="opacitymedium tdoverflowmax400 small" title="'.dol_escape_htmltag($taskstatic->label).'">'.dol_escape_htmltag($taskstatic->label).'</div>';
17111711
for ($k = 0; $k < $level; $k++) {
17121712
print "</div>";
17131713
}
@@ -2104,15 +2104,15 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
21042104
}
21052105

21062106
// Ref
2107-
print '<td class="tdoverflowmax300">';
2107+
print '<td>';
21082108
print '<!-- Task id = '.$lines[$i]->id.' (projectlinesperweek) -->';
21092109
for ($k = 0; $k < $level; $k++) {
21102110
print '<div class="marginleftonly">';
21112111
}
21122112
print $taskstatic->getNomUrl(1, 'withproject', 'time');
21132113
// Label task
21142114
print '<br>';
2115-
print '<div class="opacitymedium tdoverflowmax500" title="'.dol_escape_htmltag($taskstatic->label).'">'.dol_escape_htmltag($taskstatic->label).'</div>';
2115+
print '<div class="opacitymedium tdoverflowmax400 small" title="'.dol_escape_htmltag($taskstatic->label).'">'.dol_escape_htmltag($taskstatic->label).'</div>';
21162116
for ($k = 0; $k < $level; $k++) {
21172117
print "</div>";
21182118
}
@@ -2434,7 +2434,7 @@ function projectLinesPerMonth(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &
24342434
print $taskstatic->getNomUrl(1, 'withproject', 'time');
24352435
// Label task
24362436
print '<br>';
2437-
print '<div class="opacitymedium tdoverflowmax500" title="'.dol_escape_htmltag($taskstatic->label).'">'.dol_escape_htmltag($taskstatic->label).'</div>';
2437+
print '<div class="opacitymedium tdoverflowmax400 small" title="'.dol_escape_htmltag($taskstatic->label).'">'.dol_escape_htmltag($taskstatic->label).'</div>';
24382438
for ($k = 0; $k < $level; $k++) {
24392439
print "</div>";
24402440
}

‎htdocs/core/modules/DolibarrModules.class.php‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
139139
*/
140140
public $rights_class;
141141

142-
const URL_FOR_BLACKLISTED_MODULES = 'https://ping.dolibarr.org/modules-blacklist.txt';
142+
const URL_FOR_BLACKLISTED_MODULES = 'https://www.dolibarr.org/modules-blacklist.php';
143143

144144
const KEY_ID = 0;
145145
const KEY_LABEL = 1;
@@ -2770,11 +2770,14 @@ public function checkForCompliance($nametocheck = '')
27702770
$arrayoflines = preg_split("/[\n,]/", $result['content']);
27712771
foreach ($arrayoflines as $line) {
27722772
$tmpfieldsofline = explode(';', $line);
2773-
$modulekey = strtolower($tmpfieldsofline[0]);
2774-
$conf->cache['noncompliantmodules'][$modulekey]['name'] = $tmpfieldsofline[0];
2775-
$conf->cache['noncompliantmodules'][$modulekey]['id'] = (isset($tmpfieldsofline[1]) ? $tmpfieldsofline[1] : '');
2776-
$conf->cache['noncompliantmodules'][$modulekey]['signature'] = (isset($tmpfieldsofline[2]) ? $tmpfieldsofline[2] : '');
2777-
$conf->cache['noncompliantmodules'][$modulekey]['message'] = $langs->trans(empty($tmpfieldsofline[3]) ? 'WarningModuleAffiliatedToAReportedCompany' : $tmpfieldsofline[3]);
2773+
$modulekey = strtolower(trim($tmpfieldsofline[0]));
2774+
if (empty($modulekey)) {
2775+
continue;
2776+
}
2777+
$conf->cache['noncompliantmodules'][$modulekey]['name'] = trim($tmpfieldsofline[0]);
2778+
$conf->cache['noncompliantmodules'][$modulekey]['id'] = (isset($tmpfieldsofline[1]) ? trim($tmpfieldsofline[1]) : '');
2779+
$conf->cache['noncompliantmodules'][$modulekey]['signature'] = (isset($tmpfieldsofline[2]) ? trim($tmpfieldsofline[2]) : '');
2780+
$conf->cache['noncompliantmodules'][$modulekey]['message'] = $langs->trans(empty(isset($tmpfieldsofline[3]) ? trim($tmpfieldsofline[3]) : '') ? 'WarningModuleAffiliatedToAReportedCompany' : trim($tmpfieldsofline[3]));
27782781
if (!empty($tmpfieldsofline[4])) {
27792782
$message2 = $langs->trans("WarningModuleAffiliatedToAPiratPlatform", '{s}');
27802783
$listofillegalurl = '';

‎htdocs/core/modules/facture/doc/pdf_octopus.modules.php‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2067,10 +2067,7 @@ protected function _pagehead(&$pdf, $object, $showaddress, $outputlangs, $output
20672067
$title = $outputlangs->transnoentities("InvoiceAvoir");
20682068
}
20692069
if ($object->type == 3) {
2070-
$title = $outputlangs->transnoentities("InvoiceDeposit");
2071-
}
2072-
if ($object->type == 4) {
2073-
$title = $outputlangs->transnoentities("InvoiceProForma");
2070+
$title = $outputlangs->transnoentities("PdfInvoiceDepositTitle");
20742071
}
20752072
if ($this->situationinvoice) {
20762073
$outputlangs->loadLangs(array("other"));

‎htdocs/core/modules/facture/doc/pdf_sponge.modules.php‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2244,10 +2244,7 @@ protected function _pagehead(&$pdf, $object, $showaddress, $outputlangs, $output
22442244
$title = $outputlangs->transnoentities("InvoiceAvoir");
22452245
}
22462246
if ($object->type == 3) {
2247-
$title = $outputlangs->transnoentities("InvoiceDeposit");
2248-
}
2249-
if ($object->type == 4) {
2250-
$title = $outputlangs->transnoentities("InvoiceProForma");
2247+
$title = $outputlangs->transnoentities("PdfInvoiceDepositTitle");
22512248
}
22522249
if ($this->situationinvoice) {
22532250
$outputlangs->loadLangs(array("other"));

‎htdocs/langs/en_US/bills.lang‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ PredefinedInvoices=Predefined Invoices
6060
Invoice=Invoice
6161
PdfInvoiceTitle=Invoice
6262
PdfInvoiceSituationTitle=Invoice situation
63+
PdfInvoiceDepositTitle=Deposit
6364
Invoices=Invoices
6465
InvoiceLine=Invoice line
6566
InvoiceCustomer=Customer invoice

‎htdocs/langs/en_US/errors.lang‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,7 @@ WarningReadBankAlsoAllowedIfUserHasPermission=Warning, reading bank account is a
431431
WarningNoDataTransferedInAccountancyYet=Please note, there is no data in the accounting table. Please transfer your data recorded in the application to the accounting section or change the calculation mode to analyze the data recorded outside of accounting.
432432
WarningChangingThisMayBreakStopTaskScheduler=Warning, changing this value may disable the scheduler
433433
WarningAmountOfFileDiffersFromSumOfLines=Warning, amount of file (%s) differs from the sum of lines (%s)
434-
WarningModuleAffiliatedToAReportedCompany=Warning, this module has been reported to the Dolibarr foundation as being published by a company using illegal practices (non-compliance with the rules for using the Dolibarr brand, collecting your data without your consent or deploying malware).
434+
WarningModuleAffiliatedToAReportedCompany=Warning, this module has been reported to the Dolibarr foundation as being published by a company using illegal practices (non-compliance with the rules for using the Dolibarr brand, GPL license violation, collecting data without your consent OR deploying malware).
435435
WarningModuleAffiliatedToAPiratPlatform=Be careful when getting a module (paid or free) from a suspicious non official platform like %s
436436
WarningDNSServerNotAvailable=Warning, DNS server not available
437437
WarningSecureKeyNotSet=The value fo the securekey must not be empty

0 commit comments

Comments
 (0)