Merged changes form main trunk (2.2.8, 2.2.9)

[fa-stable.git] / purchasing / po_entry_items.php

diff --git a/purchasing/po_entry_items.php b/purchasing/po_entry_items.php
index 3ce35fdadb3944e653acfaed84cea9b38237ce35..83923ccbaf09887ac24026c83c0368b3ee5f18f6 100644 (file)
--- a/purchasing/po_entry_items.php
+++ b/purchasing/po_entry_items.php
@@ -77,7 +77,7 @@ if (isset($_GET['AddedID']))
 
        display_note(print_document_link($order_no, _("&Print This Order"), true, $trans_type), 0, 1);
 
-       display_note(print_document_link($order_no, _("&Email This Order"), true, $trans_type, false, "", "", 1));
+       display_note(print_document_link($order_no, _("&Email This Order"), true, $trans_type, false, "printlink", "", 1));
 
        hyperlink_params($path_to_root . "/purchasing/po_receive_items.php", _("&Receive Items on this Purchase Order"), "PONumber=$order_no");
 
@@ -94,7 +94,7 @@ if (isset($_GET['AddedID']))
 
        display_notification_centered(_("Direct GRN has been entered"));
 
-       display_note(get_trans_view_str($trans_type, $trans_no, _("&View this GRN")), 0, 1);
+       display_note(get_trans_view_str($trans_type, $trans_no, _("&View this GRN")), 0);
 
 // not yet
 //     display_note(print_document_link($trans_no, _("&Print This GRN"), true, $trans_type), 0, 1);
@@ -317,6 +317,13 @@ function can_commit()
 {
        global $Refs;
 
+       if (!get_post('supplier_id')) 
+       {
+               display_error(_("There is no supplier selected."));
+               set_focus('supplier_id');
+               return false;
+       } 
+       
        if (!is_date($_POST['OrderDate'])) 
        {
                display_error(_("The entered order date is invalid."));
@@ -478,7 +485,7 @@ echo "<br>";
 
 display_po_items($_SESSION['PO']);
 
-start_table($table_style2);
+start_table(TABLESTYLE2);
 textarea_row(_("Memo:"), 'Comments', null, 70, 4);
 
 end_table(1);