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

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

Browse Source 
Conflicts:
	htdocs/comm/action/card.php
	htdocs/compta/paiement/list.php
	htdocs/core/class/commonobject.class.php
	htdocs/mrp/mo_list.php
	htdocs/projet/tasks/task.php
	htdocs/public/payment/newpayment.php
This commit is contained in:
Laurent Destailleur
2021-09-20 17:15:12 +02:00
parent d8545f903e 9b828532cc
commit deb1965cd5
45 changed files with 1023 additions and 713 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8230,8 +8230,8 @@ function picto_from_langcode($codelang, $moreatt = '', $notitlealt = 0)
* Return default language from country code.
* Return null if not found.
*
* @param string $countrycode Country code like 'US', 'FR', 'CA', 'ES', 'MX', ...
* @return string Value of locale like 'en_US', 'fr_FR', ...
* @param string $countrycode Country code like 'US', 'FR', 'CA', 'ES', 'IN', 'MX', ...
* @return string Value of locale like 'en_US', 'fr_FR', ... or null if not found
*/
function getLanguageCodeFromCountryCode($countrycode)
{
@@ -8281,12 +8281,12 @@ function getLanguageCodeFromCountryCode($countrycode)
'ar-SY',
'ar-TN',
'ar-YE',
'as-IN',
//'as-IN', // Moved after en-IN
'ba-RU',
'be-BY',
'bg-BG',
'bn-BD',
'bn-IN',
//'bn-IN', // Moved after en-IN
'bo-CN',
'br-FR',
'ca-ES',
@@ -8307,6 +8307,8 @@ function getLanguageCodeFromCountryCode($countrycode)
'en-GB',
'en-IE',
'en-IN',
'as-IN', // as-IN must be after en-IN (en in priority if country is IN)
'bn-IN', // bn-IN must be after en-IN (en in priority if country is IN)
'en-JM',
'en-MY',
'en-NZ',
@@ -8444,7 +8446,7 @@ function getLanguageCodeFromCountryCode($countrycode)
$locale_language = locale_get_primary_language($locale);
$locale_region = locale_get_region($locale);
if (strtoupper($countrycode) == $locale_region) {
//var_dump($locale.'-'.$locale_language.'-'.$locale_region);
//var_dump($locale.' - '.$locale_language.' - '.$locale_region);
return strtolower($locale_language).'_'.strtoupper($locale_region);
}
}
@@ -8884,7 +8886,7 @@ function natural_search($fields, $value, $mode = 0, $nofirstand = 0)
if ($newcrit != '') {
$numnewcrit = price2num($newcrit);
if (is_numeric($numnewcrit)) {
$newres .= ($i2 > 0 ? ' OR ' : '').$field.' '.$operator.' '.$db->sanitize($numnewcrit); // should be a numeric
$newres .= ($i2 > 0 ? ' OR ' : '').$field.' '.$operator.' '.((float) $numnewcrit); // should be a numeric
} else {
$newres .= ($i2 > 0 ? ' OR ' : '').'1 = 2'; // force false
}
@@ -8943,7 +8945,7 @@ function natural_search($fields, $value, $mode = 0, $nofirstand = 0)
$newres .= (($i2 > 0 || $i3 > 0) ? ' OR ' : '');
if (preg_match('/\.(id|rowid)$/', $field)) { // Special case for rowid that is sometimes a ref so used as a search field
$newres .= $field." = ".(is_numeric(trim($tmpcrit)) ?trim($tmpcrit) : '0');
$newres .= $field." = ".(is_numeric(trim($tmpcrit)) ? ((float) trim($tmpcrit)) : '0');
} else {
$newres .= $field." LIKE '";