Implemented customizable authentication timeout.

[fa-stable.git] / sales / customer_delivery.php

diff --git a/sales/customer_delivery.php b/sales/customer_delivery.php
index 9d710729de24b5d2e7d2fff09f6ae783d4f38247..c0da3f3bb2741fdcae21e7175ca05b4580d2c98b 100644 (file)
--- a/sales/customer_delivery.php
+++ b/sales/customer_delivery.php
@@ -47,11 +47,12 @@ page($_SESSION['page_title'], false, false, "", $js);
 if (isset($_GET['AddedID'])) {
        $dispatch_no = $_GET['AddedID'];
 
-       display_notification(_("Dispatch processed:") . ' '.$_GET['AddedID'], true);
+       display_notification_centered(sprintf(_("Delivery # %d has been entered."),$dispatch_no));
 
-       display_note(get_customer_trans_view_str(13, $dispatch_no, _("View this dispatch")), 0, 1);
+       display_note(get_customer_trans_view_str(13, $dispatch_no, _("&View This Delivery")), 0, 1);
 
-       display_note(print_document_link($dispatch_no, _("Print this delivery"), true, 13));
+       display_note(print_document_link($dispatch_no, _("&Print Delivery Note"), true, 13));
+       display_note(print_document_link($dispatch_no, _("&Email Delivery Note"), true, 13, false, "", "", 1),0, 1);
 
        display_note(get_gl_view_str(13, $dispatch_no, _("View the GL Journal Entries for this Dispatch")),1);
 
@@ -128,8 +129,7 @@ if (isset($_GET['OrderNumber']) && $_GET['OrderNumber'] > 0) {
        check_edit_conflicts();
 
        if (!check_quantities()) {
-               display_error(_("Selected quantity cannot be less than quantity invoiced nor more than quantity
-                       not dispatched on sales order."));
+               display_error(_("Selected quantity cannot be less than quantity invoiced nor more than quantity not dispatched on sales order."));
 
        } elseif(!check_num('ChargeFreightCost', 0))
                display_error(_("Freight cost cannot be less than zero"));
@@ -293,7 +293,7 @@ if (isset($_POST['process_delivery']) && check_data() && check_qoh()) {
        $newdelivery = ($dn->trans_no == 0);
 
        copy_to_cart();
-       if ($new_delivery) new_doc_date($dn->document_date);
+       if ($newdelivery) new_doc_date($dn->document_date);
        $delivery_no = $dn->write($bo_policy);
 
        processing_end();