diff --git a/htdocs/bom/tpl/objectline_create.tpl.php b/htdocs/bom/tpl/objectline_create.tpl.php index 0e6ef2b8fbd..a32110f782f 100644 --- a/htdocs/bom/tpl/objectline_create.tpl.php +++ b/htdocs/bom/tpl/objectline_create.tpl.php @@ -6,7 +6,7 @@ * Copyright (C) 2014 Florian Henry * Copyright (C) 2014 Raphaël Doursenaud * Copyright (C) 2015-2016 Marcos García - * Copyright (C) 2018 Frédéric France + * Copyright (C) 2018-2019 Frédéric France * Copyright (C) 2018 Ferran Marcet * * This program is free software; you can redistribute it and/or modify @@ -52,7 +52,7 @@ print "\n"; $nolinesbefore=(count($this->lines) == 0 || $forcetoshowtitlelines); if ($nolinesbefore) { - print ''; + print ''; if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER)) { print ''; } diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php index 789490a605c..7d3c64019a9 100644 --- a/htdocs/categories/viewcat.php +++ b/htdocs/categories/viewcat.php @@ -372,7 +372,7 @@ if ($type == Categorie::TYPE_PRODUCT) print ''; print ''; print ''; print '
'; print $langs->trans("AddProductServiceIntoCategory").'  '; - print $form->select_produits('', 'elemid', '', 0, 0, -1, 2, '', 1); + $form->select_produits('', 'elemid', '', 0, 0, -1, 2, '', 1); print '
'; diff --git a/htdocs/margin/productMargins.php b/htdocs/margin/productMargins.php index 73614030e24..66f9f1bcf1c 100644 --- a/htdocs/margin/productMargins.php +++ b/htdocs/margin/productMargins.php @@ -105,7 +105,7 @@ print ''; if ($id > 0) { print ''; print ''; if (! $sortorder) $sortorder="DESC"; @@ -114,7 +114,7 @@ if ($id > 0) { else { print ''; print ''; } diff --git a/htdocs/product/stock/massstockmove.php b/htdocs/product/stock/massstockmove.php index 22c8787348a..444440df4a3 100644 --- a/htdocs/product/stock/massstockmove.php +++ b/htdocs/product/stock/massstockmove.php @@ -369,7 +369,7 @@ else $limit = $conf->global->PRODUIT_LIMIT_SIZE; } -print $form->select_produits($id_product, 'productid', $filtertype, $limit, 0, -1, 2, '', 0, array(), 0, '1', 0, 'minwidth200imp maxwidth300', 1); +$form->select_produits($id_product, 'productid', $filtertype, $limit, 0, -1, 2, '', 0, array(), 0, '1', 0, 'minwidth200imp maxwidth300', 1); print ''; // Batch number if ($conf->productbatch->enabled) diff --git a/htdocs/product/stock/tpl/stockcorrection.tpl.php b/htdocs/product/stock/tpl/stockcorrection.tpl.php index 9f0c4dd376e..e2e7745fd0d 100644 --- a/htdocs/product/stock/tpl/stockcorrection.tpl.php +++ b/htdocs/product/stock/tpl/stockcorrection.tpl.php @@ -81,7 +81,7 @@ if ($object->element == 'stock') { print ''; print ''; print ''; } diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php index 9d9b8e69516..31d79c639e0 100644 --- a/htdocs/projet/tasks.php +++ b/htdocs/projet/tasks.php @@ -605,7 +605,7 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $taskstatic, $action); // Note that $action and $object may have been modified by hook print $hookmanager->resPrint; - if (empty($reshook) && !empty($extrafields[$taskstatic->table_element]['label'])) + if (empty($reshook) && !empty($extrafields->attributes[$taskstatic->table_element]['label'])) { print $taskstatic->showOptionals($extrafields, 'edit'); // Do not use $object here that is object of project but use $taskstatic } diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php index 0f9e9fb6357..e5ed76cfc84 100644 --- a/htdocs/projet/tasks/time.php +++ b/htdocs/projet/tasks/time.php @@ -853,7 +853,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0) print $langs->trans('ServiceToUseOnLines'); print ''; print ''; print ''; } diff --git a/htdocs/societe/admin/societe.php b/htdocs/societe/admin/societe.php index 93893060f75..36887b736af 100644 --- a/htdocs/societe/admin/societe.php +++ b/htdocs/societe/admin/societe.php @@ -414,7 +414,7 @@ foreach($arrayofmodules as $file => $modCodeTiers) } else { - $disabled = (! empty($conf->multicompany->enabled) && (is_object($mc) && ! empty($mc->sharings['referent']) && $mc->sharings['referent'] == $conf->entity) ? false : true); + $disabled = (! empty($conf->multicompany->enabled) && (is_object($mc) && ! empty($mc->sharings['referent']) && $mc->sharings['referent'] != $conf->entity) ? true : false); print ''; print ''; print ''; print '';
'.$langs->trans('ChooseProduct/Service').''; - print $form->select_produits($id, 'id', '', 20, 0, 1, 2, '', 1, array(), 0, 'All'); + $form->select_produits($id, 'id', '', 20, 0, 1, 2, '', 1, array(), 0, 'All'); print '
'.$langs->trans('ChooseProduct/Service').''; - print $form->select_produits('', 'id', '', 20, 0, 1, 2, '', 1, array(), 0, 'All'); + $form->select_produits('', 'id', '', 20, 0, 1, 2, '', 1, array(), 0, 'All'); print '
'.$langs->trans("Product").''; - print $form->select_produits(GETPOST('product_id', 'int'), 'product_id', (empty($conf->global->STOCK_SUPPORTS_SERVICES)?'0':''), 0, 0, -1, 2, '', 0, null, 0, 1, 0, 'maxwidth500'); + $form->select_produits(GETPOST('product_id', 'int'), 'product_id', (empty($conf->global->STOCK_SUPPORTS_SERVICES)?'0':''), 0, 0, -1, 2, '', 0, null, 0, 1, 0, 'maxwidth500'); print '   '.$langs->trans("Product").''; - print $form->select_produits(GETPOST('product_id', 'int'), 'product_id', (empty($conf->global->STOCK_SUPPORTS_SERVICES)?'0':''), 0, 0, -1, 2, '', 0, null, 0, 1, 0, 'maxwidth500'); + $form->select_produits(GETPOST('product_id', 'int'), 'product_id', (empty($conf->global->STOCK_SUPPORTS_SERVICES)?'0':''), 0, 0, -1, 2, '', 0, null, 0, 1, 0, 'maxwidth500'); print ''; - print $form->select_produits('', 'productid', '1', 0, 0, 1, 2, '', 0, array(), 0, 'None', 0, 'maxwidth500'); + $form->select_produits('', 'productid', '1', 0, 0, 1, 2, '', 0, array(), 0, 'None', 0, 'maxwidth500'); print '
'; if (! $disabled) print ''; print img_picto($langs->trans("Disabled"), 'switch_off'); diff --git a/htdocs/societe/price.php b/htdocs/societe/price.php index 722d2ba2273..3d91fac7c29 100644 --- a/htdocs/societe/price.php +++ b/htdocs/societe/price.php @@ -263,7 +263,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) { print '
'.$langs->trans('Product').''; - print $form->select_produits('', 'prodid', '', 0); + $form->select_produits('', 'prodid', '', 0); print '