Skip to content

Commit 66013a2

Browse files
committed
Merge branch 'new_generick_search_js_filter' of github.com:thersane-john/dolibarr into new_generick_search_js_filter
2 parents 104e3b4 + 6af274b commit 66013a2

6 files changed

Lines changed: 12 additions & 13 deletions

File tree

dev/translation/ignore_translation_keys.lst

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,6 @@ YourTicketSuccessfullySaved
9191
........
9292
AADE_WEBSERVICE_KEY
9393
AADE_WEBSERVICE_USER
94-
APCCacheInstalledButDisabled
95-
APCInstalled
9694
API
9795
Accept
9896
AccountancyErrorMismatchLetteringCode

htdocs/admin/system/constall.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@
3434
* @var Translate $langs
3535
* @var User $user
3636
*
37-
* @var string $conffile
38-
* @var string $dolibarr_main_url_root_alt
39-
* @var string $dolibarr_main_document_root_alt
37+
* @var string $conffile
38+
* @var string $dolibarr_main_document_root_alt
39+
* @var string $dolibarr_main_url_root_alt
4040
*/
4141

4242
// Load translation files required by the page

htdocs/admin/system/database.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* Copyright (C) 2004 Sebastien Di Cintio <sdicintio@ressource-toi.org>
55
* Copyright (C) 2004 Benoit Mortier <benoit.mortier@opensides.be>
66
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
7-
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
7+
* Copyright (C) 2024-2025 Frédéric France <frederic.france@free.fr>
88
*
99
* This program is free software; you can redistribute it and/or modify
1010
* it under the terms of the GNU General Public License as published by
@@ -35,9 +35,9 @@
3535
* @var Translate $langs
3636
* @var User $user
3737
*
38-
* @var string $dolibarr_main_db_pass
39-
* @var string $dolibarr_main_db_character_set
40-
* @var string $dolibarr_main_db_collation
38+
* @var string $dolibarr_main_db_pass
39+
* @var string $dolibarr_main_db_collation
40+
* @var string $dolibarr_main_db_character_set
4141
*/
4242

4343
$langs->load("admin");

htdocs/admin/system/perf.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
/* Copyright (C) 2013-2019 Laurent Destailleur <eldy@users.sourceforge.net>
3-
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
3+
* Copyright (C) 2024-2025 Frédéric France <frederic.france@free.fr>
44
*
55
* This program is free software; you can redistribute it and/or modify
66
* it under the terms of the GNU General Public License as published by
@@ -172,7 +172,7 @@
172172
//var_dump(apc_cache_info());
173173
if (ini_get('apc.enabled')) {
174174
$foundcache++;
175-
print img_picto('', 'tick.png', 'class="pictofixedwidth"').' '.$langs->trans("APCInstalled");
175+
print img_picto('', 'tick.png', 'class="pictofixedwidth"').' '.$langs->trans("PHPModuleLoaded", "APCCache");
176176
} else {
177177
print img_picto('', 'warning', 'class="pictofixedwidth"').' '.$langs->trans("APCCacheInstalledButDisabled");
178178
}

htdocs/compta/bank/class/api_bankaccounts.class.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/*
33
* Copyright (C) 2016 Xebax Christy <xebax@wanadoo.fr>
44
* Copyright (C) 2024-2025 MDW <mdeweerd@users.noreply.github.com>
5-
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
5+
* Copyright (C) 2024-2025 Frédéric France <frederic.france@free.fr>
66
* Copyright (C) 2025 Charlene Benke <charlene@patas-monkey.com>
77
*
88
* This program is free software; you can redistribute it and/or modify
@@ -114,7 +114,7 @@ public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100,
114114
$obj = $this->db->fetch_object($result);
115115
$account = new Account($this->db);
116116
if ($account->fetch($obj->rowid) > 0) {
117-
$account->balance = $account->solde(1); // 1=Exclude future operation date
117+
$account->balance = $account->solde(1); // 1=Exclude future operation date
118118
$list[] = $this->_filterObjectProperties($this->_cleanObjectDatas($account), $properties);
119119
}
120120
}

htdocs/langs/en_US/admin.lang

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1438,6 +1438,7 @@ BrowserIsOK=You are using the %s web browser. This browser is ok for security an
14381438
BrowserIsKO=You are using the %s web browser. This browser is known to be a bad choice for security, performance and reliability. We recommend using Firefox, Chrome, Opera or Safari.
14391439
PHPModuleLoaded=PHP component %s is loaded
14401440
PreloadOPCode=Preloaded OPCode is used
1441+
APCCacheInstalledButDisabled=APCCache installed but is disabled
14411442
AddRefInList=Display Customer/Vendor ref. into combo lists.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
14421443
AddVatInList=Display Customer/Vendor VAT number into combo lists.
14431444
AddAdressInList=Display Customer/Vendor address into combo lists.<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".

0 commit comments

Comments
 (0)