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

Fixing style errors.

Browse Source
This commit is contained in:
stickler-ci 2022-07-12 08:09:45 +00:00
parent c068eebc43
commit a41dee9e06
10 changed files with 42 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/bom/ajax/ajax.php
View File

@ -66,11 +66,10 @@ $idproduct = GETPOST('idproduct', 'int');
top_httphead(); top_httphead();
if ($action == 'getDurationUnitByProduct') { if ($action == 'getDurationUnitByProduct') {
$product = new Product($db); $product = new Product($db);
$res = $product->fetch($idproduct); $res = $product->fetch($idproduct);
if($res > 0){ if ($res > 0) {
$return = $product->duration_unit; $return = $product->duration_unit;
} }

11
htdocs/bom/bom_card.php
View File

@ -167,7 +167,7 @@ if (empty($reshook)) {
$qty_frozen = price2num(GETPOST('qty_frozen', 'alpha'), 'MS'); $qty_frozen = price2num(GETPOST('qty_frozen', 'alpha'), 'MS');
$disable_stock_change = GETPOST('disable_stock_change', 'int'); $disable_stock_change = GETPOST('disable_stock_change', 'int');
$efficiency = price2num(GETPOST('efficiency', 'alpha')); $efficiency = price2num(GETPOST('efficiency', 'alpha'));
$duration_unit = GETPOST('duration_unit','alphanohtml'); $duration_unit = GETPOST('duration_unit', 'alphanohtml');
if ($qty == '') { if ($qty == '') {
setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Qty')), null, 'errors'); setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Qty')), null, 'errors');
$error++; $error++;
@ -227,7 +227,7 @@ if (empty($reshook)) {
$qty_frozen = price2num(GETPOST('qty_frozen', 'alpha'), 'MS'); $qty_frozen = price2num(GETPOST('qty_frozen', 'alpha'), 'MS');
$disable_stock_change = GETPOST('disable_stock_change', 'int'); $disable_stock_change = GETPOST('disable_stock_change', 'int');
$efficiency = price2num(GETPOST('efficiency', 'alpha')); $efficiency = price2num(GETPOST('efficiency', 'alpha'));
$duration_unit = GETPOST('duration_unit','alphanohtml'); $duration_unit = GETPOST('duration_unit', 'alphanohtml');
if ($qty == '') { if ($qty == '') {
setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Qty')), null, 'errors'); setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Qty')), null, 'errors');
@ -549,13 +549,11 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
*/ */
if (!empty($object->table_element_line)) { if (!empty($object->table_element_line)) {
//Products //Products
$res = $object->fetchLinesbytypeproduct(0); $res = $object->fetchLinesbytypeproduct(0);
$object->calculateCosts(); $object->calculateCosts();
if($res > 0) { if ($res > 0) {
print load_fiche_titre($langs->trans('BOMProductsList'), '', 'product'); print load_fiche_titre($langs->trans('BOMProductsList'), '', 'product');
print ' <form name="addproduct" id="addproduct" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . (($action != 'editline') ? '' : '') . '" method="POST"> print ' <form name="addproduct" id="addproduct" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . (($action != 'editline') ? '' : '') . '" method="POST">
@ -601,7 +599,6 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
print "</form>\n"; print "</form>\n";
mrpCollapseBomManagement(); mrpCollapseBomManagement();
} }
//Services //Services
@ -609,7 +606,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
$res = $object->fetchLinesbytypeproduct(1); $res = $object->fetchLinesbytypeproduct(1);
$object->calculateCosts(); $object->calculateCosts();
if($res > 0) { if ($res > 0) {
print load_fiche_titre($langs->trans('BOMServicesList'), '', 'service'); print load_fiche_titre($langs->trans('BOMServicesList'), '', 'service');

9
htdocs/bom/class/bom.class.php
View File

@ -1098,7 +1098,7 @@ class BOM extends CommonObject
$tmpproduct->pmp = 0; $tmpproduct->pmp = 0;
$result = $tmpproduct->fetch($line->fk_product, '', '', '', 0, 1, 1); // We discard selling price and language loading $result = $tmpproduct->fetch($line->fk_product, '', '', '', 0, 1, 1); // We discard selling price and language loading
if($tmpproduct->type == $tmpproduct::TYPE_PRODUCT) { if ($tmpproduct->type == $tmpproduct::TYPE_PRODUCT) {
if (empty($line->fk_bom_child)) { if (empty($line->fk_bom_child)) {
if ($result < 0) { if ($result < 0) {
$this->error = $tmpproduct->error; $this->error = $tmpproduct->error;
@ -1127,16 +1127,15 @@ class BOM extends CommonObject
} }
} }
} else { } else {
//Convert qty to hour //Convert qty to hour
$qty = convertDurationtoHour($line->qty, $line->duration_unit); $qty = convertDurationtoHour($line->qty, $line->duration_unit);
if($conf->workstation->enabled){ if ($conf->workstation->enabled) {
if($tmpproduct->fk_default_workstation) { if ($tmpproduct->fk_default_workstation) {
$workstation = new Workstation($this->db); $workstation = new Workstation($this->db);
$res = $workstation->fetch($tmpproduct->fk_default_workstation); $res = $workstation->fetch($tmpproduct->fk_default_workstation);
if($res > 0) $line->total_cost = price2num($qty * ($workstation->thm_operator_estimated + $workstation->thm_machine_estimated), 'MT'); if ($res > 0) $line->total_cost = price2num($qty * ($workstation->thm_operator_estimated + $workstation->thm_machine_estimated), 'MT');
else { else {
$this->error = $workstation->error; $this->error = $workstation->error;
return -3; return -3;

23
htdocs/bom/tpl/objectline_create.tpl.php
View File

@ -44,7 +44,7 @@ if (empty($forceall)) {
$forceall = 0; $forceall = 0;
} }
if(empty($filtertype)) $filtertype = 0; if (empty($filtertype)) $filtertype = 0;
if (!empty($object->element) && $object->element == 'contrat' && empty($conf->global->STOCK_SUPPORT_SERVICES)) { if (!empty($object->element) && $object->element == 'contrat' && empty($conf->global->STOCK_SUPPORT_SERVICES)) {
$filtertype = -1; $filtertype = -1;
} }
@ -72,7 +72,7 @@ if ($nolinesbefore) {
print '</td>'; print '</td>';
print '<td class="linecolqty right">'.$langs->trans('Qty').'</td>'; print '<td class="linecolqty right">'.$langs->trans('Qty').'</td>';
if($filtertype != 1) { if ($filtertype != 1) {
if (!empty($conf->global->PRODUCT_USE_UNITS)) { if (!empty($conf->global->PRODUCT_USE_UNITS)) {
print '<td class="linecoluseunit left">'; print '<td class="linecoluseunit left">';
print '<span id="title_units">'; print '<span id="title_units">';
@ -82,10 +82,9 @@ if ($nolinesbefore) {
print '<td class="linecolqtyfrozen right">' . $form->textwithpicto($langs->trans('QtyFrozen'), $langs->trans("QuantityConsumedInvariable")) . '</td>'; print '<td class="linecolqtyfrozen right">' . $form->textwithpicto($langs->trans('QtyFrozen'), $langs->trans("QuantityConsumedInvariable")) . '</td>';
print '<td class="linecoldisablestockchange right">' . $form->textwithpicto($langs->trans('DisableStockChange'), $langs->trans('DisableStockChangeHelp')) . '</td>'; print '<td class="linecoldisablestockchange right">' . $form->textwithpicto($langs->trans('DisableStockChange'), $langs->trans('DisableStockChangeHelp')) . '</td>';
print '<td class="linecollost right">' . $form->textwithpicto($langs->trans('ManufacturingEfficiency'), $langs->trans('ValueOfMeansLoss')) . '</td>'; print '<td class="linecollost right">' . $form->textwithpicto($langs->trans('ManufacturingEfficiency'), $langs->trans('ValueOfMeansLoss')) . '</td>';
} } else {
else {
print '<td class="linecolunit right">' . $form->textwithpicto($langs->trans('Unit'), '').'</td>'; print '<td class="linecolunit right">' . $form->textwithpicto($langs->trans('Unit'), '').'</td>';
if($conf->workstation->enabled) print '<td class="linecolworkstation right">' . $form->textwithpicto($langs->trans('Workstation'), '') . '</td>'; if ($conf->workstation->enabled) print '<td class="linecolworkstation right">' . $form->textwithpicto($langs->trans('Workstation'), '') . '</td>';
print '<td class="linecoltotalcost right">' . $form->textwithpicto($langs->trans('TotalCost'), '') . '</td>'; print '<td class="linecoltotalcost right">' . $form->textwithpicto($langs->trans('TotalCost'), '') . '</td>';
} }
@ -106,10 +105,9 @@ print '<td class="bordertop nobottom linecoldescription minwidth500imp">';
// Predefined product/service // Predefined product/service
if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) { if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) {
if($filtertype == 1){ if ($filtertype == 1) {
print $langs->trans("Service"); print $langs->trans("Service");
} } elseif (!empty($conf->global->BOM_SUB_BOM)) {
elseif (!empty($conf->global->BOM_SUB_BOM)) {
print $langs->trans("Product"); print $langs->trans("Product");
} }
echo '<span class="prod_entry_mode_predef">'; echo '<span class="prod_entry_mode_predef">';
@ -118,8 +116,7 @@ if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) {
if (!empty($conf->global->ENTREPOT_EXTRA_STATUS)) { if (!empty($conf->global->ENTREPOT_EXTRA_STATUS)) {
// hide products in closed warehouse, but show products for internal transfer // hide products in closed warehouse, but show products for internal transfer
$form->select_produits(GETPOST('idprod', 'int'), (($filtertype == 1) ? 'idprodservice' : 'idprod'), $filtertype, $conf->product->limit_size, $buyer->price_level, $statustoshow, 2, '', 1, array(), $buyer->id, '1', 0, 'maxwidth500', 0, 'warehouseopen,warehouseinternal', GETPOST('combinations', 'array')); $form->select_produits(GETPOST('idprod', 'int'), (($filtertype == 1) ? 'idprodservice' : 'idprod'), $filtertype, $conf->product->limit_size, $buyer->price_level, $statustoshow, 2, '', 1, array(), $buyer->id, '1', 0, 'maxwidth500', 0, 'warehouseopen,warehouseinternal', GETPOST('combinations', 'array'));
} } else {
else {
$form->select_produits(GETPOST('idprod', 'int'), (($filtertype == 1) ? 'idprodservice' : 'idprod'), $filtertype, $conf->product->limit_size, $buyer->price_level, $statustoshow, 2, '', 1, array(), $buyer->id, '1', 0, 'maxwidth500', 0, '', GETPOST('combinations', 'array')); $form->select_produits(GETPOST('idprod', 'int'), (($filtertype == 1) ? 'idprodservice' : 'idprod'), $filtertype, $conf->product->limit_size, $buyer->price_level, $statustoshow, 2, '', 1, array(), $buyer->id, '1', 0, 'maxwidth500', 0, '', GETPOST('combinations', 'array'));
} }
@ -137,7 +134,7 @@ $coldisplay++;
print '<td class="bordertop nobottom linecolqty right"><input type="text" size="2" name="qty" id="qty" class="flat right" value="'.(GETPOSTISSET("qty") ? GETPOST("qty", 'alpha', 2) : 1).'">'; print '<td class="bordertop nobottom linecolqty right"><input type="text" size="2" name="qty" id="qty" class="flat right" value="'.(GETPOSTISSET("qty") ? GETPOST("qty", 'alpha', 2) : 1).'">';
print '</td>'; print '</td>';
if($filtertype != 1) { if ($filtertype != 1) {
if (!empty($conf->global->PRODUCT_USE_UNITS)) { if (!empty($conf->global->PRODUCT_USE_UNITS)) {
$coldisplay++; $coldisplay++;
print '<td class="nobottom linecoluseunit left">'; print '<td class="nobottom linecoluseunit left">';
@ -213,11 +210,11 @@ jQuery(document).ready(function() {
}); });
//change unit selected if we change service selected //change unit selected if we change service selected
<?php if($filtertype == 1) { ?> <?php if ($filtertype == 1) { ?>
$('#idprodservice').change(function(){ $('#idprodservice').change(function(){
var idproduct = $(this).val(); var idproduct = $(this).val();
$.ajax({ $.ajax({
url : "<?php echo dol_buildpath('/bom/ajax/ajax.php',1); ?>" url : "<?php echo dol_buildpath('/bom/ajax/ajax.php', 1); ?>"
,type: 'POST' ,type: 'POST'
,data: { ,data: {
'action': 'getDurationUnitByProduct' 'action': 'getDurationUnitByProduct'

5
htdocs/bom/tpl/objectline_edit.tpl.php
View File

@ -47,7 +47,7 @@ if (empty($forceall)) {
$forceall = 0; $forceall = 0;
} }
if(empty($filtertype)) $filtertype = 0; if (empty($filtertype)) $filtertype = 0;
$formproduct = new FormProduct($object->db); $formproduct = new FormProduct($object->db);
@ -115,7 +115,7 @@ if (($line->info_bits & 2) != 2) {
} }
print '</td>'; print '</td>';
if($filtertype != 1) { if ($filtertype != 1) {
if (!empty($conf->global->PRODUCT_USE_UNITS)) { if (!empty($conf->global->PRODUCT_USE_UNITS)) {
$coldisplay++; $coldisplay++;
print '<td class="nobottom linecoluseunit left">'; print '<td class="nobottom linecoluseunit left">';
@ -151,7 +151,6 @@ if($filtertype != 1) {
$coldisplay++; $coldisplay++;
print '<td class="nobottom nowrap linecolcostprice right">'; print '<td class="nobottom nowrap linecolcostprice right">';
print '</td>'; print '</td>';
} }
$coldisplay += $colspan; $coldisplay += $colspan;

14
htdocs/bom/tpl/objectline_title.tpl.php
View File

@ -40,7 +40,7 @@ if (empty($object) || !is_object($object)) {
} }
global $filtertype; global $filtertype;
if(empty($filtertype)) $filtertype = 0; if (empty($filtertype)) $filtertype = 0;
print "<!-- BEGIN PHP TEMPLATE objectline_title.tpl.php -->\n"; print "<!-- BEGIN PHP TEMPLATE objectline_title.tpl.php -->\n";
@ -66,28 +66,26 @@ print '</td>';
// Qty // Qty
print '<td class="linecolqty right">'.$form->textwithpicto($langs->trans('Qty'), ($filtertype != 1) ? $langs->trans("QtyRequiredIfNoLoss") : '').'</td>'; print '<td class="linecolqty right">'.$form->textwithpicto($langs->trans('Qty'), ($filtertype != 1) ? $langs->trans("QtyRequiredIfNoLoss") : '').'</td>';
if($filtertype != 1) { if ($filtertype != 1) {
if (!empty($conf->global->PRODUCT_USE_UNITS)) { if (!empty($conf->global->PRODUCT_USE_UNITS)) {
print '<td class="linecoluseunit left">' . $langs->trans('Unit') . '</td>'; print '<td class="linecoluseunit left">' . $langs->trans('Unit') . '</td>';
} }
// Qty frozen // Qty frozen
print '<td class="linecolqtyfrozen right">' . $form->textwithpicto($langs->trans('QtyFrozen'), $langs->trans("QuantityConsumedInvariable")) . '</td>'; print '<td class="linecolqtyfrozen right">' . $form->textwithpicto($langs->trans('QtyFrozen'), $langs->trans("QuantityConsumedInvariable")) . '</td>';
// Disable stock change // Disable stock change
print '<td class="linecoldisablestockchange right">' . $form->textwithpicto($langs->trans('DisableStockChange'), $langs->trans('DisableStockChangeHelp')) . '</td>'; print '<td class="linecoldisablestockchange right">' . $form->textwithpicto($langs->trans('DisableStockChange'), $langs->trans('DisableStockChangeHelp')) . '</td>';
// Efficiency // Efficiency
print '<td class="linecolefficiency right">' . $form->textwithpicto($langs->trans('ManufacturingEfficiency'), $langs->trans('ValueOfMeansLoss')) . '</td>'; print '<td class="linecolefficiency right">' . $form->textwithpicto($langs->trans('ManufacturingEfficiency'), $langs->trans('ValueOfMeansLoss')) . '</td>';
// Cost // Cost
print '<td class="linecolcost right">'.$form->textwithpicto($langs->trans("TotalCost"), $langs->trans("BOMTotalCost")).'</td>'; print '<td class="linecolcost right">'.$form->textwithpicto($langs->trans("TotalCost"), $langs->trans("BOMTotalCost")).'</td>';
} else { } else {
print '<td class="linecolunit right">' . $form->textwithpicto($langs->trans('Unit'), '').'</td>'; print '<td class="linecolunit right">' . $form->textwithpicto($langs->trans('Unit'), '').'</td>';
if($conf->workstation->enabled) print '<td class="linecolworkstation right">' . $form->textwithpicto($langs->trans('DefaultWorkstation'), '') . '</td>'; if ($conf->workstation->enabled) print '<td class="linecolworkstation right">' . $form->textwithpicto($langs->trans('DefaultWorkstation'), '') . '</td>';
// Cost // Cost
print '<td class="linecolcost right">'.$form->textwithpicto($langs->trans("TotalCost"), $langs->trans("BOMTotalCostService")).'</td>'; print '<td class="linecolcost right">'.$form->textwithpicto($langs->trans("TotalCost"), $langs->trans("BOMTotalCostService")).'</td>';

10
htdocs/bom/tpl/objectline_view.tpl.php
View File

@ -43,7 +43,7 @@ if (empty($object) || !is_object($object)) {
} }
global $filtertype; global $filtertype;
if(empty($filtertype)) $filtertype = 0; if (empty($filtertype)) $filtertype = 0;
global $forceall, $senderissupplier, $inputalsopricewithtax, $outputalsopricetotalwithtax, $langs; global $forceall, $senderissupplier, $inputalsopricewithtax, $outputalsopricetotalwithtax, $langs;
@ -105,7 +105,7 @@ $coldisplay++;
echo price($line->qty, 0, '', 0, 0); // Yes, it is a quantity, not a price, but we just want the formating role of function price echo price($line->qty, 0, '', 0, 0); // Yes, it is a quantity, not a price, but we just want the formating role of function price
print '</td>'; print '</td>';
if($filtertype != 1) { if ($filtertype != 1) {
if (!empty($conf->global->PRODUCT_USE_UNITS)) { if (!empty($conf->global->PRODUCT_USE_UNITS)) {
print '<td class="linecoluseunit nowrap left">'; print '<td class="linecoluseunit nowrap left">';
$label = $tmpproduct->getLabelOfUnit('long'); $label = $tmpproduct->getLabelOfUnit('long');
@ -137,7 +137,7 @@ if($filtertype != 1) {
} elseif ($tmpproduct->duration_value > 0) { } elseif ($tmpproduct->duration_value > 0) {
$dur = array("s"=>$langs->trans("Second"), "i"=>$langs->trans("Minute"), "h"=>$langs->trans("Hour"), "d"=>$langs->trans("Day"), "w"=>$langs->trans("Week"), "m"=>$langs->trans("Month"), "y"=>$langs->trans("Year")); $dur = array("s"=>$langs->trans("Second"), "i"=>$langs->trans("Minute"), "h"=>$langs->trans("Hour"), "d"=>$langs->trans("Day"), "w"=>$langs->trans("Week"), "m"=>$langs->trans("Month"), "y"=>$langs->trans("Year"));
} }
if(!empty($line->duration_unit)){ if (!empty($line->duration_unit)) {
print (isset($dur[$line->duration_unit]) ? "&nbsp;".$langs->trans($dur[$line->duration_unit])."&nbsp;" : ''); print (isset($dur[$line->duration_unit]) ? "&nbsp;".$langs->trans($dur[$line->duration_unit])."&nbsp;" : '');
} else { } else {
print (!empty($tmpproduct->duration_unit) && isset($dur[$tmpproduct->duration_unit]) ? "&nbsp;" . $langs->trans($dur[$tmpproduct->duration_unit]) . "&nbsp;" : ''); print (!empty($tmpproduct->duration_unit) && isset($dur[$tmpproduct->duration_unit]) ? "&nbsp;" . $langs->trans($dur[$tmpproduct->duration_unit]) . "&nbsp;" : '');
@ -145,13 +145,13 @@ if($filtertype != 1) {
print '</td>'; print '</td>';
//Poste de travail //Poste de travail
if($conf->workstation->enabled) { if ($conf->workstation->enabled) {
$workstation = new Workstation($object->db); $workstation = new Workstation($object->db);
$res = $workstation->fetch($tmpproduct->fk_default_workstation); $res = $workstation->fetch($tmpproduct->fk_default_workstation);
print '<td class="linecolunit nowrap right">'; print '<td class="linecolunit nowrap right">';
$coldisplay++; $coldisplay++;
if($res > 0) echo $workstation->getNomUrl(); if ($res > 0) echo $workstation->getNomUrl();
print '</td>'; print '</td>';
} }
} }

14
htdocs/core/lib/date.lib.php
View File

@ -328,13 +328,13 @@ function convertDurationtoHour($duration_value, $duration_unit)
{ {
$result = 0; $result = 0;
if($duration_unit == 's') $result = $duration_value / 3600; if ($duration_unit == 's') $result = $duration_value / 3600;
if($duration_unit == 'i') $result = $duration_value / 60; if ($duration_unit == 'i') $result = $duration_value / 60;
if($duration_unit == 'h') $result = $duration_value; if ($duration_unit == 'h') $result = $duration_value;
if($duration_unit == 'd') $result = $duration_value * 24; if ($duration_unit == 'd') $result = $duration_value * 24;
if($duration_unit == 'w') $result = $duration_value * 24 * 7; if ($duration_unit == 'w') $result = $duration_value * 24 * 7;
if($duration_unit == 'm') $result = $duration_value * 730.484; if ($duration_unit == 'm') $result = $duration_value * 730.484;
if($duration_unit == 'y') $result = $duration_value * 365 * 24; if ($duration_unit == 'y') $result = $duration_value * 365 * 24;
return $result; return $result;
} }

6
htdocs/product/card.php
View File

@ -1468,7 +1468,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
} }
} }
if($type == 1 && $conf->workstation->enabled){ if ($type == 1 && $conf->workstation->enabled) {
// Default workstation // Default workstation
print '<tr><td>'.$langs->trans("DefaultWorkstation").'</td><td>'; print '<tr><td>'.$langs->trans("DefaultWorkstation").'</td><td>';
print img_picto($langs->trans("DefaultWorkstation"), 'workstation', 'class="pictofixedwidth"'); print img_picto($langs->trans("DefaultWorkstation"), 'workstation', 'class="pictofixedwidth"');
@ -2016,7 +2016,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
*/ */
} }
if($object->isService() && $conf->workstation->enabled) { if ($object->isService() && $conf->workstation->enabled) {
// Default workstation // Default workstation
print '<tr><td>'.$langs->trans("DefaultWorkstation").'</td><td>'; print '<tr><td>'.$langs->trans("DefaultWorkstation").'</td><td>';
print img_picto($langs->trans("DefaultWorkstation"), 'workstation', 'class="pictofixedwidth"'); print img_picto($langs->trans("DefaultWorkstation"), 'workstation', 'class="pictofixedwidth"');
@ -2505,7 +2505,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
print '</td>'; print '</td>';
} }
if($object->isService() && $conf->workstation->enabled) { if ($object->isService() && $conf->workstation->enabled) {
$workstation = new Workstation($db); $workstation = new Workstation($db);
$res = $workstation->fetch($object->fk_default_workstation); $res = $workstation->fetch($object->fk_default_workstation);

1
htdocs/product/class/html.formproduct.class.php
View File

@ -434,7 +434,6 @@ class FormProduct
$out .= '<option value="-1">'.($empty_label ? $empty_label : '&nbsp;').'</option>'; $out .= '<option value="-1">'.($empty_label ? $empty_label : '&nbsp;').'</option>';
} }
foreach ($this->cache_workstations as $id => $arraytypes) { foreach ($this->cache_workstations as $id => $arraytypes) {
$label = $arraytypes['label']; $label = $arraytypes['label'];
$out .= '<option value="'.$id.'"'; $out .= '<option value="'.$id.'"';