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

Update html.form.class.php

Browse Source
This commit is contained in:
Frédéric FRANCE 2017-11-22 20:24:04 +01:00 committed by Frédéric FRANCE
parent b405a877b9
commit 0ee30171db
No known key found for this signature in database
GPG Key ID: 06809324E4B2ABC1
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/compta/facture/class/facture.class.php
View File

@ -962,7 +962,6 @@ class Facture extends CommonInvoice
* @param User $user Object user * @param User $user Object user
* @return int <0 if KO, 0 if nothing done, 1 if OK * @return int <0 if KO, 0 if nothing done, 1 if OK
*/ */
function createFromOrder($object, User $user) function createFromOrder($object, User $user)
{ {
global $hookmanager; global $hookmanager;

4
htdocs/core/class/html.form.class.php
View File

@ -1651,7 +1651,7 @@ class Form
* @param int $showproperties Show properties of each attendees * @param int $showproperties Show properties of each attendees
* @param array $listofuserid Array with properties of each user * @param array $listofuserid Array with properties of each user
* @param array $listofcontactid Array with properties of each contact * @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 * @return string HTML select string
* @see select_dolgroups * @see select_dolgroups
*/ */
@ -1957,7 +1957,7 @@ class Form
} }
if (!empty($conf->global->PRODUIT_ATTRIBUTES_HIDECHILD)) { 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').')'; $sql.= ' WHERE p.entity IN ('.getEntity('product').')';