X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=inline;f=sales%2Fcustomer_delivery.php;h=2284f18a87ad9ec73a293b7a919f060c7971cade;hb=c356acfd88575bc518efdb9fb77e0a6b6c645eec;hp=26bd6eeccde8dd9dcc4790094ddf4556824c55c8;hpb=332bb2b00f809bf108fd504ce10273c9c7529143;p=fa-stable.git diff --git a/sales/customer_delivery.php b/sales/customer_delivery.php index 26bd6eec..2284f18a 100644 --- a/sales/customer_delivery.php +++ b/sales/customer_delivery.php @@ -35,10 +35,10 @@ if ($use_date_picker) { if (isset($_GET['ModifyDelivery'])) { $_SESSION['page_title'] = sprintf(_("Modifying Delivery Note # %d."), $_GET['ModifyDelivery']); - $help_page_title = _("Modifying Delivery Note"); + $help_context = "Modifying Delivery Note"; processing_start(); } elseif (isset($_GET['OrderNumber'])) { - $_SESSION['page_title'] = _("Deliver Items for a Sales Order"); + $_SESSION['page_title'] = _($help_context = "Deliver Items for a Sales Order"); processing_start(); } @@ -52,9 +52,9 @@ if (isset($_GET['AddedID'])) { display_note(get_customer_trans_view_str(ST_CUSTDELIVERY, $dispatch_no, _("&View This Delivery")), 0, 1); display_note(print_document_link($dispatch_no, _("&Print Delivery Note"), true, ST_CUSTDELIVERY)); - display_note(print_document_link($dispatch_no, _("&Email Delivery Note"), true, ST_CUSTDELIVERY, false, "", "", 1), 1, 1); - display_note(print_document_link($dispatch_no, _("P&rint as Packing Slip"), true, ST_CUSTDELIVERY, false, "", "", 0, 1)); - display_note(print_document_link($dispatch_no, _("E&mail as Packing Slip"), true, ST_CUSTDELIVERY, false, "", "", 1, 1), 1); + display_note(print_document_link($dispatch_no, _("&Email Delivery Note"), true, ST_CUSTDELIVERY, false, "printlink", "", 1), 1, 1); + display_note(print_document_link($dispatch_no, _("P&rint as Packing Slip"), true, ST_CUSTDELIVERY, false, "printlink", "", 0, 1)); + display_note(print_document_link($dispatch_no, _("E&mail as Packing Slip"), true, ST_CUSTDELIVERY, false, "printlink", "", 1, 1), 1); display_note(get_gl_view_str(13, $dispatch_no, _("View the GL Journal Entries for this Dispatch")),1); @@ -73,9 +73,9 @@ if (isset($_GET['AddedID'])) { display_note(get_trans_view_str(ST_CUSTDELIVERY, $delivery_no, _("View this delivery")), 0, 1); display_note(print_document_link($delivery_no, _("&Print Delivery Note"), true, ST_CUSTDELIVERY)); - display_note(print_document_link($delivery_no, _("&Email Delivery Note"), true, ST_CUSTDELIVERY, false, "", "", 1), 1, 1); - display_note(print_document_link($delivery_no, _("P&rint as Packing Slip"), true, ST_CUSTDELIVERY, false, "", "", 0, 1)); - display_note(print_document_link($delivery_no, _("E&mail as Packing Slip"), true, ST_CUSTDELIVERY, false, "", "", 1, 1), 1); + display_note(print_document_link($delivery_no, _("&Email Delivery Note"), true, ST_CUSTDELIVERY, false, "printlink", "", 1), 1, 1); + display_note(print_document_link($delivery_no, _("P&rint as Packing Slip"), true, ST_CUSTDELIVERY, false, "printlink", "", 0, 1)); + display_note(print_document_link($delivery_no, _("E&mail as Packing Slip"), true, ST_CUSTDELIVERY, false, "printlink", "", 1, 1), 1); hyperlink_params($path_to_root . "/sales/customer_invoice.php", _("Confirm Delivery and Invoice"), "DeliveryNumber=$delivery_no"); @@ -136,9 +136,10 @@ if (isset($_GET['OrderNumber']) && $_GET['OrderNumber'] > 0) { if (!check_quantities()) { display_error(_("Selected quantity cannot be less than quantity invoiced nor more than quantity not dispatched on sales order.")); - } elseif(!check_num('ChargeFreightCost', 0)) + } elseif(!check_num('ChargeFreightCost', 0)) { display_error(_("Freight cost cannot be less than zero")); set_focus('ChargeFreightCost'); + } } //----------------------------------------------------------------------------- @@ -194,8 +195,6 @@ function check_data() } if (!check_quantities()) { - display_error(_("Selected quantity cannot be less than quantity invoiced nor more than quantity - not dispatched on sales order.")); return false; } @@ -212,7 +211,7 @@ function copy_to_cart() $cart->Location = $_POST['Location']; $cart->Comments = $_POST['Comments']; if ($cart->trans_no == 0) - $dn->ref = $_POST['ref']; + $cart->reference = $_POST['ref']; } //------------------------------------------------------------------------------ @@ -321,10 +320,10 @@ if (isset($_POST['Update']) || isset($_POST['_Location_update'])) { start_form(); hidden('cart_id'); -start_table("$table_style2 width=80%", 5); +start_table(TABLESTYLE2, "width=80%", 5); echo "