Skip to content

Commit

Permalink
Improvements to dispatch of serial/batch numbers
Browse files Browse the repository at this point in the history
  • Loading branch information
timschofield committed May 8, 2012
1 parent 89770a5 commit 21d80eb
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
8 changes: 5 additions & 3 deletions ConfirmDispatchControlled_Invoice.php
Expand Up @@ -11,6 +11,8 @@
/* Session started in header.inc for password checking and authorisation level check */
include('includes/header.inc');

echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/magnifier.png" title="" alt="" />' . ' ' . $title . '</p>';

if (isset($_GET['LineNo'])){
$LineNo = (int)$_GET['LineNo'];
} elseif (isset($_POST['LineNo'])){
Expand Down Expand Up @@ -54,9 +56,7 @@
********************************************/
echo '<div class="centre">';

echo '<br /><a href="'. $rootpath. '/ConfirmDispatch_Invoice.php">'. _('Back to Confirmation of Dispatch') . '/' . _('Invoice'). '</a>';

echo '<br /><font size="2"><b>'. _('Dispatch of up to').' '. number_format($LineItem->Quantity-$LineItem->QtyInv, $LineItem->DecimalPlaces). ' '. _('Controlled items').' ' . $LineItem->StockID . ' - ' . $LineItem->ItemDescription . ' '. _('on order').' ' . $_SESSION['Items']->OrderNo . ' '. _('to'). ' ' . $_SESSION['Items']->CustomerName . '</b></font></div>';
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/magnifier.png" title="" alt="" />'. _('Dispatch of up to').' '. number_format($LineItem->Quantity-$LineItem->QtyInv, $LineItem->DecimalPlaces). ' '. _('Controlled items').' ' . $LineItem->StockID . ' - ' . $LineItem->ItemDescription . ' '. _('on order').' ' . $_SESSION['Items']->OrderNo . ' '. _('to'). ' ' . $_SESSION['Items']->CustomerName . '</p>';

/** vars needed by InputSerialItem : **/
$StockID = $LineItem->StockID;
Expand All @@ -72,6 +72,8 @@
of the item selected for dispatch */
$_SESSION['Items']->LineItems[$LineNo]->QtyDispatched = $TotalQuantity;

echo '<br /><div style="text-align: right"><a href="'. $rootpath. '/ConfirmDispatch_Invoice.php">'. _('Back to Confirmation of Dispatch') . '/' . _('Invoice'). '</a></div>';

include('includes/footer.inc');
exit;
?>
2 changes: 1 addition & 1 deletion includes/OutputSerialItems.php
Expand Up @@ -197,7 +197,7 @@
}

echo '</table>';
echo '<br /><div class="centre"><input type="submit" name="AddBatches" value="'. _('Enter'). '" /></div>';
echo '<br /><div class="centre"><button type="submit" name="AddBatches" value="">'. _('Enter'). '</button></div>';
echo '</form></td><td valign=top>';
$ShowExisting=True;
$_POST['EntryType']='Sequential';
Expand Down

0 comments on commit 21d80eb

Please sign in to comment.