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

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

@ -66,7 +66,6 @@ $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);

3
htdocs/bom/bom_card.php
View File

@ -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

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

@ -1127,7 +1127,6 @@ 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);

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

@ -82,8 +82,7 @@ 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>';
@ -108,8 +107,7 @@ print '<td class="bordertop nobottom linecoldescription minwidth500imp">';
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'));
} }

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

@ -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;

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

@ -82,9 +82,7 @@ if($filtertype != 1) {
// 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>';

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.'"';