From 0ee30171db1b62ff37c0c2b30ccc4fd902cb476e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Wed, 22 Nov 2017 20:24:04 +0100 Subject: [PATCH] Update html.form.class.php --- htdocs/compta/facture/class/facture.class.php | 1 - htdocs/core/class/html.form.class.php | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index 0f96e1e3ce2..73313884041 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -962,7 +962,6 @@ class Facture extends CommonInvoice * @param User $user Object user * @return int <0 if KO, 0 if nothing done, 1 if OK */ - function createFromOrder($object, User $user) { global $hookmanager; diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 88b40bb4734..ad94d06a6d1 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -1651,7 +1651,7 @@ class Form * @param int $showproperties Show properties of each attendees * @param array $listofuserid Array with properties of each user * @param array $listofcontactid Array with properties of each contact - * @param array $listofother Array with properties of each other contact + * @param array $listofotherid Array with properties of each other contact * @return string HTML select string * @see select_dolgroups */ @@ -1957,7 +1957,7 @@ class Form } if (!empty($conf->global->PRODUIT_ATTRIBUTES_HIDECHILD)) { - $sql .= " LEFT JOIN llx_product_attribute_combination pac ON pac.fk_product_child = p.rowid"; + $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_attribute_combination pac ON pac.fk_product_child = p.rowid"; } $sql.= ' WHERE p.entity IN ('.getEntity('product').')';