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

FIX Option "showstock" was not effective into warehouse list

Browse Source
This commit is contained in:
Laurent Destailleur 2016-04-01 11:05:15 +02:00
parent 0981039573
commit c340745b78
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/expedition/card.php
View File

@ -907,7 +907,8 @@ if ($action == 'create')
$tmpentrepot_id = is_numeric(GETPOST($ent,'int'))?GETPOST($ent,'int'):$warehouse_id; $tmpentrepot_id = is_numeric(GETPOST($ent,'int'))?GETPOST($ent,'int'):$warehouse_id;
if ($line->fk_product > 0) if ($line->fk_product > 0)
{ {
print $formproduct->selectWarehouses($tmpentrepot_id,'entl'.$indiceAsked,'',1,0,$line->fk_product); print '<!-- Show warehouse selection -->';
print $formproduct->selectWarehouses($tmpentrepot_id, 'entl'.$indiceAsked, '', 1, 0, $line->fk_product, '', 1);
if ($tmpentrepot_id > 0 && $tmpentrepot_id == $warehouse_id) if ($tmpentrepot_id > 0 && $tmpentrepot_id == $warehouse_id)
{ {
//print $stock.' '.$quantityToBeDelivered; //print $stock.' '.$quantityToBeDelivered;

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

@ -165,7 +165,7 @@ class FormProduct
if ($selected == $id || ($selected == 'ifone' && $nbofwarehouses == 1)) $out.=' selected'; if ($selected == $id || ($selected == 'ifone' && $nbofwarehouses == 1)) $out.=' selected';
$out.='>'; $out.='>';
$out.=$arraytypes['label']; $out.=$arraytypes['label'];
if (($fk_product || ($showstock > 0)) && ($arraytypes['stock'] != 0)) $out.='('.$langs->trans("Stock").':'.$arraytypes['stock'].')'; if (($fk_product || ($showstock > 0)) && ($arraytypes['stock'] != 0 || ($showstock > 0))) $out.=' ('.$langs->trans("Stock").':'.$arraytypes['stock'].')';
$out.='</option>'; $out.='</option>';
} }
$out.='</select>'; $out.='</select>';