From 976b5c26c76335e59dc1fb8ec8858a2a095b101d Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 9 Apr 2018 12:26:39 +0200 Subject: [PATCH 1/6] Fix: TODO get_charset() function don't exists --- htdocs/install/upgrade.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/htdocs/install/upgrade.php b/htdocs/install/upgrade.php index fce91f7925d..6186cee02b3 100644 --- a/htdocs/install/upgrade.php +++ b/htdocs/install/upgrade.php @@ -183,7 +183,8 @@ if (! GETPOST('action','aZ09') || preg_match('/upgrade/i',GETPOST('action','aZ09 print ''.$langs->trans("ServerVersion").''; print ''.$version.''; dolibarr_install_syslog("upgrade: " . $langs->transnoentities("ServerVersion") . ": " .$version); - if ($db->type == 'mysqli') + // TODO get_charset() function don't exists + /*if ($db->type == 'mysqli') { $tmparray = $db->db->get_charset(); print ''.$langs->trans("ClientCharset").''; @@ -192,7 +193,7 @@ if (! GETPOST('action','aZ09') || preg_match('/upgrade/i',GETPOST('action','aZ09 print ''.$langs->trans("ClientSortingCharset").''; print ''.$tmparray->collation.''; dolibarr_install_syslog("upgrade: " . $langs->transnoentities("ClientCollation") . ": " .$tmparray->collation); - } + }*/ // Test database version requirement $versionmindb=explode('.',$db::VERSIONMIN); From 89ec185f514528c5461a1776b54410b02ce967c8 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 9 Apr 2018 12:53:03 +0200 Subject: [PATCH 2/6] Fix: avoid Error: Call to undefined method mysqli::get_charset() --- htdocs/install/upgrade.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/htdocs/install/upgrade.php b/htdocs/install/upgrade.php index 6186cee02b3..5132168c076 100644 --- a/htdocs/install/upgrade.php +++ b/htdocs/install/upgrade.php @@ -183,8 +183,7 @@ if (! GETPOST('action','aZ09') || preg_match('/upgrade/i',GETPOST('action','aZ09 print ''.$langs->trans("ServerVersion").''; print ''.$version.''; dolibarr_install_syslog("upgrade: " . $langs->transnoentities("ServerVersion") . ": " .$version); - // TODO get_charset() function don't exists - /*if ($db->type == 'mysqli') + if ($db->type == 'mysqli' && function_exists('mysqli_get_charset')) { $tmparray = $db->db->get_charset(); print ''.$langs->trans("ClientCharset").''; @@ -193,7 +192,7 @@ if (! GETPOST('action','aZ09') || preg_match('/upgrade/i',GETPOST('action','aZ09 print ''.$langs->trans("ClientSortingCharset").''; print ''.$tmparray->collation.''; dolibarr_install_syslog("upgrade: " . $langs->transnoentities("ClientCollation") . ": " .$tmparray->collation); - }*/ + } // Test database version requirement $versionmindb=explode('.',$db::VERSIONMIN); From 97bf6fff7f8ed115355a907909f07a3534b2a1de Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Tue, 10 Apr 2018 08:07:23 +0200 Subject: [PATCH 3/6] Fix: missing User object with API REST --- htdocs/blockedlog/class/blockedlog.class.php | 5 ++++- .../interface_50_modBlockedlog_ActionsBlockedLog.class.php | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/htdocs/blockedlog/class/blockedlog.class.php b/htdocs/blockedlog/class/blockedlog.class.php index 77bf90e2717..20dda286dbd 100644 --- a/htdocs/blockedlog/class/blockedlog.class.php +++ b/htdocs/blockedlog/class/blockedlog.class.php @@ -313,12 +313,15 @@ class BlockedLog * @param Object $object object to store * @param string $action action * @param string $amounts amounts + * @param User $fuser User object (forced) * @return int >0 if OK, <0 if KO */ - public function setObjectData(&$object, $action, $amounts) + public function setObjectData(&$object, $action, $amounts, $fuser = null) { global $langs, $user, $mysoc; + if (is_object($fuser)) $user = $fuser; + // Generic fields // action diff --git a/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php b/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php index f97d1400018..6666cdec47b 100644 --- a/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php +++ b/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php @@ -111,7 +111,7 @@ class InterfaceActionsBlockedLog extends DolibarrTriggers return 0; // not implemented action log } - $result = $b->setObjectData($object, $action, $amounts); // Set field date_object, ref_object, fk_object, element, object_data + $result = $b->setObjectData($object, $action, $amounts, $user); // Set field date_object, ref_object, fk_object, element, object_data if ($result < 0) { From 6277928b6773f2e02ac1bc65085c6727a3084665 Mon Sep 17 00:00:00 2001 From: atm-quentin Date: Tue, 10 Apr 2018 14:01:35 +0200 Subject: [PATCH 4/6] FIX issue #8470 --- htdocs/societe/class/societe.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php index e36caf49a3e..9dcd4c67035 100644 --- a/htdocs/societe/class/societe.class.php +++ b/htdocs/societe/class/societe.class.php @@ -942,7 +942,7 @@ class Societe extends CommonObject $sql .= ",fk_effectif = ".(! empty($this->effectif_id)?"'".$this->db->escape($this->effectif_id)."'":"null"); if (isset($this->stcomm_id)) { - $sql .= ",fk_stcomm=".($this->stcomm_id > 0 ? $this->stcomm_id : "0"); + $sql .= ",fk_stcomm=".(!empty($this->stcomm_id) ? $this->stcomm_id : "0"); } $sql .= ",fk_typent = ".(! empty($this->typent_id)?"'".$this->db->escape($this->typent_id)."'":"0"); From d24b36f768e921763e978924db5c412366ea0a82 Mon Sep 17 00:00:00 2001 From: atm-arnaud Date: Tue, 10 Apr 2018 14:10:40 +0200 Subject: [PATCH 5/6] FIX #8359 --- htdocs/categories/viewcat.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php index daa5ade05b5..c613190588a 100644 --- a/htdocs/categories/viewcat.php +++ b/htdocs/categories/viewcat.php @@ -674,7 +674,7 @@ if ($type == Categorie::TYPE_PROJECT) { print "\t".''."\n"; print ''; - print $project->getNomUrl(1,0); + print $project->getNomUrl(1); print "\n"; print ''.$project->ref."\n"; print ''.$project->title."\n"; From cb1a011b507d83da73823a09aead4a81b567d163 Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Tue, 10 Apr 2018 14:14:16 +0200 Subject: [PATCH 6/6] Fix default currency not set on supplier order creation from commercial menu #8459 --- htdocs/fourn/commande/card.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php index ad27a496672..294f1da7f62 100644 --- a/htdocs/fourn/commande/card.php +++ b/htdocs/fourn/commande/card.php @@ -1356,6 +1356,8 @@ if ($action=='create') dol_htmloutput_events(); + $currency_code = $conf->currency; + $societe=''; if ($socid>0) {