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

Merge branch 'develop' into fix_element_type_part_03

Browse Source
This commit is contained in:
Laurent Destailleur
2024-03-08 22:04:51 +01:00
committed by GitHub
parent 8d26140908 d93fd1839c
commit defc98f471
96 changed files with 886 additions and 1038 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/core/lib/company.lib.php
View File

@@ -197,9 +197,6 @@ function societe_prepare_head(Societe $object)
$title = $langs->trans("PaymentModes");
if (isModEnabled('stripe')) {
//$langs->load("stripe");
//$title = $langs->trans("BankAccountsAndGateways");
$servicestatus = 0;
if (getDolGlobalString('STRIPE_LIVE') && !GETPOST('forcesandbox', 'alpha')) {
$servicestatus = 1;
@@ -1001,7 +998,7 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '', $showuserl
$sortorder = GETPOST('sortorder', 'aZ09comma');
$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
$search_status = GETPOSTINT("search_status");
$search_status = GETPOST("search_status", "intcomma");
if ($search_status == '') {
$search_status = 1; // always display active customer first
}

1
htdocs/core/lib/functions.lib.php
View File

@@ -4272,6 +4272,7 @@ function isValidEmail($address, $acceptsupervisorkey = 0, $acceptuserkey = 0)
* @param string $domain Domain name (Ex: "yahoo.com", "yhaoo.com", "dolibarr.fr")
* @return int -1 if error (function not available), 0=Not valid, 1=Valid
* @see isValidEmail()
* @suppress PhanDeprecatedFunctionInternal Error in Phan plugins incorrectly tags some functions here
*/
function isValidMXRecord($domain)
{

2
htdocs/core/lib/json.lib.php
View File

@@ -267,7 +267,7 @@ function dol_json_decode($json, $assoc = false)
} else {
$out .= $json[$i];
}
if ($i > 0 && $json[$i] == '"' && $json[($i - 1)] != "\\") {
if ($i >= 1 && $json[$i] == '"' && $json[$i - 1] != "\\") {
$comment = !$comment;
}
}