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

Merge branch 'NEW_OF_Child' of github.com:atm-lena/dolibarr into NEW_OF_Child

Browse Source
This commit is contained in:
atm-lena 2022-02-21 10:06:30 +01:00
commit 0cbf374fa5
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/mrp/tpl/originproductline.tpl.php
View File

@ -28,7 +28,6 @@ if (!is_object($form)) {
$form = new Form($db); $form = new Form($db);
} }
$qtytoconsumeforline = $this->tpl['qty'] / ( ! empty($this->tpl['efficiency']) ? $this->tpl['efficiency'] : 1 ); $qtytoconsumeforline = $this->tpl['qty'] / ( ! empty($this->tpl['efficiency']) ? $this->tpl['efficiency'] : 1 );
/*if ((empty($this->tpl['qty_frozen']) && $this->tpl['qty_bom'] > 1)) { /*if ((empty($this->tpl['qty_frozen']) && $this->tpl['qty_bom'] > 1)) {
$qtytoconsumeforline = $qtytoconsumeforline / $this->tpl['qty_bom']; $qtytoconsumeforline = $qtytoconsumeforline / $this->tpl['qty_bom'];
@ -48,7 +47,7 @@ print '<tr class="oddeven'.(empty($this->tpl['strike']) ? '' : ' strikefordisabl
print '<td>'; print '<td>';
if ($res) { if ($res) {
print $tmpproduct->getNomUrl(1); print $tmpproduct->getNomUrl(1);
if($tmpbom->id) { if ($tmpbom->id) {
print ' ' . $langs->trans("or") . ' '; print ' ' . $langs->trans("or") . ' ';
print $tmpbom->getNomUrl(1); print $tmpbom->getNomUrl(1);
print ' <a class="collapse_bom" id="collapse-' . $line->id . '" href="#">'; print ' <a class="collapse_bom" id="collapse-' . $line->id . '" href="#">';