Merged changes from main CVS up to 2.1.5

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

diff --git a/sales/customer_delivery.php b/sales/customer_delivery.php
index f779333832f128c5133626e7b5820be25bf07224..23cbd79a10a2ed31f3bf1478eb9ee29660932012 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);
 
@@ -96,7 +97,7 @@ if (isset($_GET['OrderNumber']) && $_GET['OrderNumber'] > 0) {
        $ord->order_no = key($ord->trans_no);
        $ord->trans_no = 0;
        $ord->reference = references::get_next(13);
-       $ord->document_date = Today();
+       $ord->document_date = new_doc_date();
        $_SESSION['Items'] = $ord;
        copy_from_cart();
 
@@ -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"));
@@ -220,6 +220,7 @@ function copy_from_cart()
        $_POST['Location'] = $cart->Location;
        $_POST['Comments'] = $cart->Comments;
        $_POST['cart_id'] = $cart->cart_id;
+       $_POST['ref'] = $cart->reference;
 }
 //------------------------------------------------------------------------------
 
@@ -293,6 +294,7 @@ if (isset($_POST['process_delivery']) && check_data() && check_qoh()) {
        $newdelivery = ($dn->trans_no == 0);
 
        copy_to_cart();
+       if ($newdelivery) new_doc_date($dn->document_date);
        $delivery_no = $dn->write($bo_policy);
 
        processing_end();
@@ -325,7 +327,7 @@ start_row();
 //     $_POST['ref'] = references::get_next(13);
 
 if ($_SESSION['Items']->trans_no==0) {
-       ref_cells(_("Reference"), 'ref', '', $_SESSION['Items']->reference, "class='tableheader2'");
+       ref_cells(_("Reference"), 'ref', '', null, "class='tableheader2'");
 } else {
        label_cells(_("Reference"), $_SESSION['Items']->reference, "class='tableheader2'");
 }
@@ -350,12 +352,12 @@ shippers_list_cells(null, 'ship_via', $_POST['ship_via']);
 
 // set this up here cuz it's used to calc qoh
 if (!isset($_POST['DispatchDate']) || !is_date($_POST['DispatchDate'])) {
-       $_POST['DispatchDate'] = Today();
+       $_POST['DispatchDate'] = new_doc_date();
        if (!is_date_in_fiscalyear($_POST['DispatchDate'])) {
                $_POST['DispatchDate'] = end_fiscalyear();
        }
 }
-date_cells(_("Date"), 'DispatchDate', '', $_POST['DispatchDate'], 0, 0, 0, "class='tableheader2'");
+date_cells(_("Date"), 'DispatchDate', '', $_SESSION['Items']->trans_no==0, 0, 0, 0, "class='tableheader2'");
 end_row();
 
 end_table();
@@ -367,7 +369,7 @@ start_table("$table_style width=90%");
 if (!isset($_POST['due_date']) || !is_date($_POST['due_date'])) {
        $_POST['due_date'] = get_invoice_duedate($_SESSION['Items']->customer_id, $_POST['DispatchDate']);
 }
-date_row(_("Invoice Dead-line"), 'due_date', '', $_POST['due_date'], 0, 0, 0, "class='tableheader2'");
+date_row(_("Invoice Dead-line"), 'due_date', '', null, 0, 0, 0, "class='tableheader2'");
 end_table();
 
 echo "</td></tr>";