diff --git a/htdocs/compta/stats/cabyprodserv.php b/htdocs/compta/stats/cabyprodserv.php index a76a053dc27..4bd88636218 100644 --- a/htdocs/compta/stats/cabyprodserv.php +++ b/htdocs/compta/stats/cabyprodserv.php @@ -296,12 +296,6 @@ if ($date_end == dol_time_plus_duree($date_start, 1, 'y') - 1) { $periodlink = ''; } -$builddate = 0; -$calcmode = ''; -$name = ''; -$period = ''; -$periodlink = ''; - report_header($name, $namelink, $period, $periodlink, $description, $builddate, $exportlink, $tableparams, $calcmode); if (isModEnabled('accounting') && $modecompta != 'BOOKKEEPING') { diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 7e7ce5361c5..4ce6d3ff3e5 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -13290,6 +13290,7 @@ function getElementProperties($elementType) $parent_element = 'facture'; } elseif ($elementType == 'facturerec') { $classpath = 'compta/facture/class'; + $classfile = 'facture-rec'; $module = 'facture'; $classname = 'FactureRec'; } elseif ($elementType == 'commande' || $elementType == 'order') { diff --git a/htdocs/product/card.php b/htdocs/product/card.php index e10dbc20e46..6f873bd888b 100644 --- a/htdocs/product/card.php +++ b/htdocs/product/card.php @@ -1628,7 +1628,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio // Default workstation print ''.$langs->trans("DefaultWorkstation").''; print img_picto($langs->trans("DefaultWorkstation"), 'workstation', 'class="pictofixedwidth"'); - print $formproduct->selectWorkstations($object->fk_default_workstation, 'fk_default_workstation', 1); + print $formproduct->selectWorkstations((GETPOSTISSET('fk_default_workstation') ? GETPOSTINT('fk_default_workstation') : ''), 'fk_default_workstation', 1); print ''; } @@ -1643,7 +1643,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio if ($object->duration_value > 0) { print '     '; } - print 'mandatory_period == 1 ? ' checked="checked"' : '').'>'; + print ''; print '