Fixed write test for main directory during install.

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

diff --git a/purchasing/po_entry_items.php b/purchasing/po_entry_items.php
index 8cd68c21433f4662593ec8be87ed917204f7a86f..a2c3d5f7f423af75e47bef2c119d062e7b199cf0 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 = '';
@@ -372,6 +375,13 @@ function can_commit()
                set_focus('supp_ref');
                return false;
        }
+       if ($_SESSION['PO']->trans_type==ST_SUPPINVOICE 
+               && is_reference_already_there($_SESSION['PO']->supplier_id, get_post('supp_ref'), $_SESSION['PO']->order_no))
+       {
+               display_error(_("This invoice number has already been entered. It cannot be entered again.") . " (" . get_post('supp_ref') . ")");
+               set_focus('supp_ref');
+               return false;
+       }
        if ($_SESSION['PO']->trans_type == ST_PURCHORDER && get_post('delivery_address') == '')
        {
                display_error(_("There is no delivery address specified."));
@@ -384,7 +394,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."));
@@ -446,8 +457,8 @@ function handle_commit_order()
                        $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'
-                       $inv->ov_amount = $inv->ov_gst = 0;
+
+                       $inv->ov_amount = $inv->ov_gst = $inv->ov_discount = 0;
                        
                        foreach($cart->line_items as $key => $line) {
                                $inv->add_grn_to_trans($line->grn_item_id, $line->po_detail_rec, $line->stock_id,