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

Fix calculation from a BOM > 1

Browse Source
This commit is contained in:
Laurent Destailleur 2020-04-22 12:56:52 +02:00
parent 8754fc1d1e
commit a5def19cff
5 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/langs/en_US/mrp.lang
View File

@ -60,7 +60,7 @@ ConsumeOrProduce=Consume or Produce
ConsumeAndProduceAll=Consume and Produce All ConsumeAndProduceAll=Consume and Produce All
Manufactured=Manufactured Manufactured=Manufactured
TheProductXIsAlreadyTheProductToProduce=The product to add is already the product to produce. TheProductXIsAlreadyTheProductToProduce=The product to add is already the product to produce.
ForAQuantityOf1=For a quantity to produce of 1 ForAQuantityOf=For a quantity to produce of %s
ConfirmValidateMo=Are you sure you want to validate this Manufacturing Order? ConfirmValidateMo=Are you sure you want to validate this Manufacturing Order?
ConfirmProductionDesc=By clicking on '%s', you will validate the consumption and/or production for the quantities set. This will also update the stock and record stock movements. ConfirmProductionDesc=By clicking on '%s', you will validate the consumption and/or production for the quantities set. This will also update the stock and record stock movements.
ProductionForRef=Production of %s ProductionForRef=Production of %s

7
htdocs/mrp/class/mo.class.php
View File

@ -1268,7 +1268,7 @@ class Mo extends CommonObject
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td>'.$langs->trans('Ref').'</td>'; print '<td>'.$langs->trans('Ref').'</td>';
print '<td class="right">'.$langs->trans('Qty').' <span class="opacitymedium">('.$langs->trans("ForAQuantityOf1").')</span></td>'; print '<td class="right">'.$langs->trans('Qty').' <span class="opacitymedium">('.$langs->trans("ForAQuantityOf", $this->bom->qty).')</span></td>';
print '<td class="center">'.$langs->trans('QtyFrozen').'</td>'; print '<td class="center">'.$langs->trans('QtyFrozen').'</td>';
print '<td class="center">'.$langs->trans('DisableStockChange').'</td>'; print '<td class="center">'.$langs->trans('DisableStockChange').'</td>';
//print '<td class="right">'.$langs->trans('Efficiency').'</td>'; //print '<td class="right">'.$langs->trans('Efficiency').'</td>';
@ -1334,6 +1334,11 @@ class Mo extends CommonObject
// TODO // TODO
} }
$this->tpl['qty_bom'] = 1;
if (is_object($this->bom) && $this->bom->qty > 1) {
$this->tpl['qty_bom'] = $this->bom->qty;
}
$this->tpl['qty'] = $line->qty; $this->tpl['qty'] = $line->qty;
$this->tpl['qty_frozen'] = $line->qty_frozen; $this->tpl['qty_frozen'] = $line->qty_frozen;
$this->tpl['disable_stock_change'] = $line->disable_stock_change; $this->tpl['disable_stock_change'] = $line->disable_stock_change;

1
htdocs/mrp/mo_card.php
View File

@ -293,6 +293,7 @@ if ($action == 'create')
print '<table class="noborder centpercent">'; print '<table class="noborder centpercent">';
$object->lines = $objectbom->lines; $object->lines = $objectbom->lines;
$object->bom = $objectbom;
$object->printOriginLinesList('', array()); $object->printOriginLinesList('', array());

2
htdocs/mrp/mo_production.php
View File

@ -691,7 +691,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
print '<td class="right"><input type="text" name="qtytoadd" value="1" class="width50 right"></td>'; print '<td class="right"><input type="text" name="qtytoadd" value="1" class="width50 right"></td>';
print '<td class="right"></td>'; print '<td class="right"></td>';
print '<td>'; print '<td>';
print '<input type="submit" class="button" name="addconsumelinebutton" value="'.$langs->trans("Add").'">'; print '<input type="submit" class="button buttongen" name="addconsumelinebutton" value="'.$langs->trans("Add").'">';
print '</td>'; print '</td>';
if ($conf->productbatch->enabled) { if ($conf->productbatch->enabled) {
print '<td></td>'; print '<td></td>';

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

@ -24,13 +24,20 @@ if (empty($conf) || !is_object($conf))
} }
if (!is_object($form)) $form = new Form($db); if (!is_object($form)) $form = new Form($db);
$qtytoconsumeforline = $this->tpl['qty'] / $this->tpl['efficiency'];
/*if ((empty($this->tpl['qty_frozen']) && $this->tpl['qty_bom'] > 1)) {
$qtytoconsumeforline = $qtytoconsumeforline / $this->tpl['qty_bom'];
}*/
$qtytoconsumeforline = price2num($qtytoconsumeforline, 'MS');
?> ?>
<!-- BEGIN PHP TEMPLATE originproductline.tpl.php --> <!-- BEGIN PHP TEMPLATE originproductline.tpl.php -->
<?php <?php
print '<tr class="oddeven'.(empty($this->tpl['strike']) ? '' : ' strikefordisabled').'">'; print '<tr class="oddeven'.(empty($this->tpl['strike']) ? '' : ' strikefordisabled').'">';
print '<td>'.$this->tpl['label'].'</td>'; print '<td>'.$this->tpl['label'].'</td>';
print '<td class="right">'.$this->tpl['qty'].(($this->tpl['efficiency'] > 0 && $this->tpl['efficiency'] < 1) ? ' / '.$form->textwithpicto($this->tpl['efficiency'], $langs->trans("ValueOfMeansLoss")).' = '.round($this->tpl['qty'] / $this->tpl['efficiency'], 2) : '').'</td>'; print '<td class="right">'.$this->tpl['qty'].(($this->tpl['efficiency'] > 0 && $this->tpl['efficiency'] < 1) ? ' / '.$form->textwithpicto($this->tpl['efficiency'], $langs->trans("ValueOfMeansLoss")).' = '.$qtytoconsumeforline : '').'</td>';
print '<td class="center">'.($this->tpl['qty_frozen'] ? yn($this->tpl['qty_frozen']) : '').'</td>'; print '<td class="center">'.($this->tpl['qty_frozen'] ? yn($this->tpl['qty_frozen']) : '').'</td>';
print '<td class="center">'.($this->tpl['disable_stock_change'] ? yn($this->tpl['disable_stock_change']) : '').'</td>'; print '<td class="center">'.($this->tpl['disable_stock_change'] ? yn($this->tpl['disable_stock_change']) : '').'</td>';
//print '<td class="right">'.$this->tpl['efficiency'].'</td>'; //print '<td class="right">'.$this->tpl['efficiency'].'</td>';