lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #17704 from gmilad/patch-1

Browse Source 
Fix #16100 Update utils.class.php
This commit is contained in:
Laurent Destailleur 2021-05-25 19:48:19 +02:00 committed by GitHub
commit 5fc29169a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/admin/translation.php
View File

@ -188,7 +188,7 @@ if ($action == 'delete') {
$form = new Form($db); $form = new Form($db);
$formadmin = new FormAdmin($db); $formadmin = new FormAdmin($db);
$wikihelp = 'EN:Setup Translation|FR:Paramétrage traduction|ES:Configuración'; $wikihelp = 'EN:Setup_Translation|FR:Paramétrage_Traduction|ES:Configuración_Traducción';
llxHeader('', $langs->trans("Setup"), $wikihelp); llxHeader('', $langs->trans("Setup"), $wikihelp);
$param = '&mode='.urlencode($mode); $param = '&mode='.urlencode($mode);

6
htdocs/contrat/list.php
View File

@ -289,6 +289,12 @@ if (!empty($search_ref_customer)) {
if (!empty($search_ref_supplier)) { if (!empty($search_ref_supplier)) {
$sql .= natural_search(array('c.ref_supplier'), $search_ref_supplier); $sql .= natural_search(array('c.ref_supplier'), $search_ref_supplier);
} }
if ($search_zip) {
$sql .= natural_search(array('s.zip'), $search_zip);
}
if ($search_town) {
$sql .= natural_search(array('s.town'), $search_town);
}
if ($search_sale > 0) { if ($search_sale > 0) {
$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$search_sale; $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$search_sale;
} }

4
htdocs/core/class/utils.class.php
View File

@ -319,9 +319,9 @@ class Utils
} }
if ($dolibarr_main_db_character_set == 'utf8mb4') { if ($dolibarr_main_db_character_set == 'utf8mb4') {
// We save output into utf8mb4 charset // We save output into utf8mb4 charset
$param .= " --default-character-set=utf8mb4"; $param .= " --default-character-set=utf8mb4 --no-tablespaces";
} else { } else {
$param .= " --default-character-set=utf8"; // We always save output into utf8 charset $param .= " --default-character-set=utf8 --no-tablespaces"; // We always save output into utf8 charset
} }
$paramcrypted = $param; $paramcrypted = $param;
$paramclear = $param; $paramclear = $param;

2
htdocs/fourn/commande/card.php
View File

@ -1256,6 +1256,8 @@ if (empty($reshook)) {
$tva_tx = get_default_tva($soc, $mysoc, $lines[$i]->fk_product, $product_fourn_price_id); $tva_tx = get_default_tva($soc, $mysoc, $lines[$i]->fk_product, $product_fourn_price_id);
} }
$object->special_code = $lines[$i]->special_code;
$result = $object->addline( $result = $object->addline(
$desc, $desc,
$lines[$i]->subprice, $lines[$i]->subprice,