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-02-10 09:22:53 +00:00
parent 2260276bed
commit 7cf9448609
2 changed files with 34 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
htdocs/bom/bom_net_needs.php
View File

@ -110,9 +110,8 @@ if (empty($reshook)) {
} }
} }
} }
if($action == 'treeview') $object->getNetNeedsTree($TChildBom,1); if ($action == 'treeview') $object->getNetNeedsTree($TChildBom, 1);
else $object->getNetNeeds($TChildBom, 1); else $object->getNetNeeds($TChildBom, 1);
} }
@ -234,7 +233,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
print "<thead>\n"; print "<thead>\n";
print '<tr class="liste_titre nodrag nodrop">'; print '<tr class="liste_titre nodrag nodrop">';
print '<td class="linecoldescription">'.$langs->trans('Product'); print '<td class="linecoldescription">'.$langs->trans('Product');
if(! empty($conf->global->BOM_SUB_BOM) && $action == 'treeview') { if (! empty($conf->global->BOM_SUB_BOM) && $action == 'treeview') {
print ' &nbsp; <a id="show_all" href="#">'.img_picto('', 'folder-open', 'class="paddingright"').$langs->trans("ExpandAll").'</a>&nbsp;&nbsp;'; print ' &nbsp; <a id="show_all" href="#">'.img_picto('', 'folder-open', 'class="paddingright"').$langs->trans("ExpandAll").'</a>&nbsp;&nbsp;';
print '<a id="hide_all" href="#">'.img_picto('', 'folder', 'class="paddingright"').$langs->trans("UndoExpandAll").'</a>&nbsp;'; print '<a id="hide_all" href="#">'.img_picto('', 'folder', 'class="paddingright"').$langs->trans("UndoExpandAll").'</a>&nbsp;';
} }
@ -243,12 +242,12 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
print '<td class="linecolstock">'.$form->textwithpicto($langs->trans("PhysicalStock"), $text_stock_options, 1).'</td>'; print '<td class="linecolstock">'.$form->textwithpicto($langs->trans("PhysicalStock"), $text_stock_options, 1).'</td>';
print '<td class="linecoltheoricalstock">'.$form->textwithpicto($langs->trans("VirtualStock"), $langs->trans("VirtualStockDesc")).'</td>'; print '<td class="linecoltheoricalstock">'.$form->textwithpicto($langs->trans("VirtualStock"), $langs->trans("VirtualStockDesc")).'</td>';
print '</tr>'; print '</tr>';
if(! empty($TChildBom)) { if (! empty($TChildBom)) {
if($action == 'treeview') { if ($action == 'treeview') {
foreach($TChildBom as $fk_bom => $TProduct) { foreach ($TChildBom as $fk_bom => $TProduct) {
$repeatChar = '&emsp;'; $repeatChar = '&emsp;';
if(! empty($TProduct['bom'])) { if (! empty($TProduct['bom'])) {
if($TProduct['parentid'] != $object->id) print '<tr class="sub_bom_lines oddeven" parentid="'.$TProduct['parentid'].'">'; if ($TProduct['parentid'] != $object->id) print '<tr class="sub_bom_lines oddeven" parentid="'.$TProduct['parentid'].'">';
else print '<tr class="oddeven">'; else print '<tr class="oddeven">';
print '<td class="linecoldescription">'.str_repeat($repeatChar, $TProduct['level']).$TProduct['bom']->getNomUrl(1); print '<td class="linecoldescription">'.str_repeat($repeatChar, $TProduct['level']).$TProduct['bom']->getNomUrl(1);
print ' <a class="collapse_bom" id="collapse-'.$fk_bom.'" href="#">'; print ' <a class="collapse_bom" id="collapse-'.$fk_bom.'" href="#">';
@ -260,13 +259,13 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
print '<td class="linecoltheoricalstock"></td>'; print '<td class="linecoltheoricalstock"></td>';
print '</tr>'; print '</tr>';
} }
if(! empty($TProduct['product'])) { if (! empty($TProduct['product'])) {
foreach($TProduct['product'] as $fk_product => $TInfos) { foreach ($TProduct['product'] as $fk_product => $TInfos) {
$prod = new Product($db); $prod = new Product($db);
$prod->fetch($fk_product); $prod->fetch($fk_product);
$prod->load_virtual_stock(); $prod->load_virtual_stock();
if(empty($prod->stock_reel)) $prod->stock_reel = 0; if (empty($prod->stock_reel)) $prod->stock_reel = 0;
if($fk_bom != $object->id) print '<tr class="sub_bom_lines oddeven" parentid="'.$fk_bom.'">'; if ($fk_bom != $object->id) print '<tr class="sub_bom_lines oddeven" parentid="'.$fk_bom.'">';
else print '<tr class="oddeven">'; else print '<tr class="oddeven">';
print '<td class="linecoldescription">'.str_repeat($repeatChar, $TInfos['level']).$prod->getNomUrl(1).'</td>'; print '<td class="linecoldescription">'.str_repeat($repeatChar, $TInfos['level']).$prod->getNomUrl(1).'</td>';
print '<td class="linecolqty">'.$TInfos['qty'].'</td>'; print '<td class="linecolqty">'.$TInfos['qty'].'</td>';
@ -276,13 +275,12 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
} }
} }
} }
} } else {
else { foreach ($TChildBom as $fk_product => $qty) {
foreach($TChildBom as $fk_product => $qty) {
$prod = new Product($db); $prod = new Product($db);
$prod->fetch($fk_product); $prod->fetch($fk_product);
$prod->load_virtual_stock(); $prod->load_virtual_stock();
if(empty($prod->stock_reel)) $prod->stock_reel = 0; if (empty($prod->stock_reel)) $prod->stock_reel = 0;
print '<tr class="oddeven">'; print '<tr class="oddeven">';
print '<td class="linecoldescription">'.$prod->getNomUrl(1).'</td>'; print '<td class="linecoldescription">'.$prod->getNomUrl(1).'</td>';
print '<td class="linecolqty">'.$qty.'</td>'; print '<td class="linecolqty">'.$qty.'</td>';
@ -297,18 +295,18 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
/* /*
* ButAction * ButAction
*/ */
print '<div class="tabsAction">'."\n"; print '<div class="tabsAction">'."\n";
$parameters = array(); $parameters = array();
$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook $reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
if($reshook < 0) { if ($reshook < 0) {
setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
} }
if(empty($reshook)) { if (empty($reshook)) {
if($action != 'treeview') print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=treeview&token='.newToken().'">'.$langs->trans("DisplayInTreeStructure").'</a>'."\n"; if ($action != 'treeview') print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=treeview&token='.newToken().'">'.$langs->trans("DisplayInTreeStructure").'</a>'."\n";
else print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=view&token='.newToken().'">'.$langs->trans("BackToStandardView").'</a>'."\n"; else print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=view&token='.newToken().'">'.$langs->trans("BackToStandardView").'</a>'."\n";
} }
@ -356,7 +354,6 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
</script> </script>
<?php <?php
} }
// End of page // End of page

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

@ -1110,13 +1110,13 @@ class BOM extends CommonObject
* @param int $qty * @param int $qty
* @return void * @return void
*/ */
public function getNetNeeds(&$TNetNeeds = array(), $qty = 0) { public function getNetNeeds(&$TNetNeeds = array(), $qty = 0)
if(! empty($this->lines)) { {
foreach($this->lines as $line) { if (! empty($this->lines)) {
if(! empty($line->childBom)) { foreach ($this->lines as $line) {
foreach($line->childBom as $childBom) $childBom->getNetNeeds($TNetNeeds, $line->qty*$qty); if (! empty($line->childBom)) {
} foreach ($line->childBom as $childBom) $childBom->getNetNeeds($TNetNeeds, $line->qty*$qty);
else { } else {
$TNetNeeds[$line->fk_product] += $line->qty*$qty; $TNetNeeds[$line->fk_product] += $line->qty*$qty;
} }
} }
@ -1131,26 +1131,25 @@ class BOM extends CommonObject
* @param int $level * @param int $level
* @return void * @return void
*/ */
public function getNetNeedsTree(&$TNetNeeds = array(), $qty = 0, $level = 0) { public function getNetNeedsTree(&$TNetNeeds = array(), $qty = 0, $level = 0)
if(! empty($this->lines)) { {
foreach($this->lines as $line) { if (! empty($this->lines)) {
if(! empty($line->childBom)) { foreach ($this->lines as $line) {
foreach($line->childBom as $childBom) { if (! empty($line->childBom)) {
foreach ($line->childBom as $childBom) {
$TNetNeeds[$childBom->id]['bom'] = $childBom; $TNetNeeds[$childBom->id]['bom'] = $childBom;
$TNetNeeds[$childBom->id]['parentid'] = $this->id; $TNetNeeds[$childBom->id]['parentid'] = $this->id;
$TNetNeeds[$childBom->id]['qty'] = $line->qty*$qty; $TNetNeeds[$childBom->id]['qty'] = $line->qty*$qty;
$TNetNeeds[$childBom->id]['level'] = $level; $TNetNeeds[$childBom->id]['level'] = $level;
$childBom->getNetNeedsTree($TNetNeeds, $line->qty*$qty, $level+1); $childBom->getNetNeedsTree($TNetNeeds, $line->qty*$qty, $level+1);
} }
} } else {
else {
$TNetNeeds[$this->id]['product'][$line->fk_product]['qty'] += $line->qty * $qty; $TNetNeeds[$this->id]['product'][$line->fk_product]['qty'] += $line->qty * $qty;
$TNetNeeds[$this->id]['product'][$line->fk_product]['level'] = $level; $TNetNeeds[$this->id]['product'][$line->fk_product]['level'] = $level;
} }
} }
} }
} }
} }