Renamed the new Sales Summary Report, Detailed to Item Sales Summary Report.

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

diff --git a/purchasing/po_entry_items.php b/purchasing/po_entry_items.php
index d707dbfe11bc841776fd0deb3c779147920c02de..1f0bfedd7cd416db42b2e84e95b938e0c50f617c 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 = '';
@@ -97,6 +100,9 @@ if (isset($_GET['AddedID']))
 
        display_note(get_trans_view_str($trans_type, $trans_no, _("&View this GRN")), 0);
 
+    $clearing_act = get_company_pref('grn_clearing_act');
+       if ($clearing_act)      
+               display_note(get_gl_view_str($trans_type, $trans_no, _("View the GL Journal Entries for this Delivery")), 1);
 // not yet
 //     display_note(print_document_link($trans_no, _("&Print This GRN"), true, $trans_type), 0, 1);
 
@@ -332,6 +338,13 @@ function can_commit()
                return false;
        } 
        
+       if ($_SESSION['PO']->trans_type != ST_PURCHORDER && !is_date_in_fiscalyear($_POST['OrderDate'])) 
+       {
+               display_error(_("The entered date is not in fiscal year"));
+               set_focus('OrderDate');
+               return false;
+       }
+
        if (($_SESSION['PO']->trans_type==ST_SUPPINVOICE) && !is_date($_POST['due_date'])) 
        {
                display_error(_("The entered due date is invalid."));
@@ -362,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."));
@@ -374,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."));
@@ -416,7 +437,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);
@@ -436,8 +458,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,