From c2d1d41a4a15b650b8f028ac0e8ad8137ad27d7a Mon Sep 17 00:00:00 2001 From: Joe Hunt Date: Tue, 9 Jun 2009 14:33:18 +0000 Subject: [PATCH] Code cleaning --- sales/customer_delivery.php | 6 +++--- sales/sales_order_entry.php | 8 ++++++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/sales/customer_delivery.php b/sales/customer_delivery.php index 8ed9ad27..97f04590 100644 --- a/sales/customer_delivery.php +++ b/sales/customer_delivery.php @@ -47,11 +47,11 @@ 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(get_gl_view_str(13, $dispatch_no, _("View the GL Journal Entries for this Dispatch")),1); diff --git a/sales/sales_order_entry.php b/sales/sales_order_entry.php index f6cf66d3..cb77b3f6 100644 --- a/sales/sales_order_entry.php +++ b/sales/sales_order_entry.php @@ -108,10 +108,12 @@ if (isset($_GET['AddedID'])) { display_notification_centered(sprintf(_("Delivery # %d has been entered."),$delivery)); - display_note(get_trans_view_str(13, $delivery, _("&View This Delivery"))); - echo '
'; + display_note(get_trans_view_str(13, $delivery, _("&View This Delivery")), 0, 1); + display_note(print_document_link($delivery, _("&Print Delivery Note"), true, 13)); + display_note(get_gl_view_str(13, $delivery, _("View the GL Journal Entries for this Dispatch")),1); + hyperlink_params($path_to_root . "/sales/customer_invoice.php", _("Make &Invoice Against This Delivery"), "DeliveryNumber=$delivery"); @@ -132,6 +134,8 @@ if (isset($_GET['AddedID'])) { echo '
'; display_note(print_document_link($invoice, _("&Print Sales Invoice"), true, 10)); + display_note(get_gl_view_str(10, $invoice, _("View the GL &Journal Entries for this Invoice")),1); + if ((isset($_GET['Type']) && $_GET['Type'] == 1)) hyperlink_params("inquiry/sales_orders_view.php", _("Enter a &New Template Invoice"), "InvoiceTemplates=Yes"); -- 2.30.2