diff --git a/AgedControlledInventory.php b/AgedControlledInventory.php index b82c41ac0..20ad3e21f 100644 --- a/AgedControlledInventory.php +++ b/AgedControlledInventory.php @@ -11,8 +11,7 @@ include('includes/header.php'); echo '
- ' . $Title. ' + ', $Title, '
'; $sql = "SELECT stockserialitems.stockid, @@ -20,6 +19,7 @@ stockserialitems.serialno, stockserialitems.quantity, stockmoves.trandate, + stockmaster.units, stockmaster.materialcost+stockmaster.labourcost+stockmaster.overheadcost AS cost, createdate, decimalplaces @@ -46,24 +46,25 @@ echo '' . _('Stock') . ' | -' . _('Description') . ' | -' . _('Batch') . ' | -' . _('Quantity Remaining') . ' | -' . _('Inventory Value') . ' | -' . _('Date') . ' | -' . _('Days Old') . ' | +', _('Stock'), ' | +', _('Description'), ' | +', _('Batch'), ' | +', _('Quantity Remaining'), ' | +', _('Units'), ' | +', _('Inventory Value'), ' | +', _('Date'), ' | +', _('Days Old'), ' |
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
%s | %s | %s | +%s | %s | %s | %s | @@ -79,6 +81,7 @@ $LocQtyRow['description'], $LocQtyRow['serialno'], locale_number_format($LocQtyRow['quantity'],$LocQtyRow['decimalplaces']), + $LocQtyRow['units'], $DispVal, ConvertSQLDate($LocQtyRow['createdate']), $DaysOld @@ -87,9 +90,9 @@ echo '||||||||
' . _('Total') . ' | -' . locale_number_format($TotalQty,2) . ' | -' . locale_number_format($TotalVal,2) . ' | +', _('Total'), ' | +', locale_number_format($TotalQty,2), ' | +', locale_number_format($TotalVal,2), ' |