Updated gettext template.

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

diff --git a/purchasing/po_entry_items.php b/purchasing/po_entry_items.php
index 3820d7ef5383b6f3adaf2f5706b81e69a891072a..278c5199507b2ca00b98f730663545954afb05e7 100644 (file)
--- a/purchasing/po_entry_items.php
+++ b/purchasing/po_entry_items.php
@@ -14,6 +14,7 @@ $page_security = 'SA_PURCHASEORDER';
 include_once($path_to_root . "/purchasing/includes/po_class.inc");
 include_once($path_to_root . "/includes/session.inc");
 include_once($path_to_root . "/purchasing/includes/purchasing_ui.inc");
+include_once($path_to_root . "/purchasing/includes/db/suppliers_db.inc");
 include_once($path_to_root . "/reporting/includes/reporting.inc");
 
 set_page_security( @$_SESSION['PO']->trans_type,
@@ -77,7 +78,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");
 
@@ -317,6 +318,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."));
@@ -347,7 +355,6 @@ function can_commit()
                set_focus('delivery_address');
                return false;
        } 
-       
        if (get_post('StkLocation') == '')
        {
                display_error(_("There is no location specified to move any items into."));
@@ -406,13 +413,13 @@ function handle_commit_order()
                        meta_forward($_SERVER['PHP_SELF'], "AddedGRN=$grn_no");
                        }
 //                     Direct Purchase Invoice
-                       $inv = new supp_trans;
-                       $inv->is_invoice = true;
+                       $inv = new supp_trans(ST_SUPPINVOICE);
                        $inv->Comments = $cart->Comments;
                        $inv->supplier_id = $cart->supplier_id;
                        $inv->tran_date = $cart->orig_order_date;
                        $inv->reference = $ref;
                        $inv->supp_reference = $cart->supp_ref;
+                       $inv->tax_included = $cart->tax_included;
                        $supp = get_supplier($cart->supplier_id);
                        $inv->tax_group_id = $supp['tax_group_id'];
 //                     $inv->ov_discount 'this isn't used at all'