Merged changes up to 2.3.16 into unstable

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

diff --git a/purchasing/po_entry_items.php b/purchasing/po_entry_items.php
index f3a78ca510358110ff91f882aaa097a5b855e439..f8f4a45c5e325f1dc0005a6aae3ebfe95bc35525 100644 (file)
--- a/purchasing/po_entry_items.php
+++ b/purchasing/po_entry_items.php
@@ -23,8 +23,11 @@ set_page_security( @$_SESSION['PO']->trans_type,
                        ST_SUPPINVOICE => 'SA_SUPPLIERINVOICE'),
        array(  'NewOrder' => 'SA_PURCHASEORDER',
                        'ModifyOrderNumber' => 'SA_PURCHASEORDER',
+                       'AddedID' => 'SA_PURCHASEORDER',
                        'NewGRN' => 'SA_GRN',
-                       'NewInvoice' => 'SA_SUPPLIERINVOICE')
+                       'AddedGRN' => 'SA_GRN',
+                       'NewInvoice' => 'SA_SUPPLIERINVOICE',
+                       'AddedPI' => 'SA_SUPPLIERINVOICE')
 );
 
 $js = '';
@@ -393,7 +396,8 @@ function can_commit()
                set_focus('StkLocation');
                return false;
        } 
-       
+       if (!db_has_currency_rates($_SESSION['PO']->curr_code, $_POST['OrderDate']))
+               return false;
        if ($_SESSION['PO']->order_has_items() == false)
        {
        display_error (_("The order cannot be placed because there are no lines entered on this order."));
@@ -443,7 +447,8 @@ function handle_commit_order()
                        //Direct GRN
                        if ($cart->trans_type == ST_SUPPRECEIVE)
                                $cart->reference = $ref;
-                       $cart->Comments = $cart->reference; //grn does not hold supp_ref
+                       if ($cart->trans_type != ST_SUPPINVOICE)        
+                               $cart->Comments = $cart->reference; //grn does not hold supp_ref
                        foreach($cart->line_items as $key => $line)
                                $cart->line_items[$key]->receive_qty = $line->quantity;
                        $grn_no = add_grn($cart);