0000900: Supplier Payment in another currency the bank charge is wrongly calculated.

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

diff --git a/purchasing/po_entry_items.php b/purchasing/po_entry_items.php
index d707dbfe11bc841776fd0deb3c779147920c02de..8cd68c21433f4662593ec8be87ed917204f7a86f 100644 (file)
--- a/purchasing/po_entry_items.php
+++ b/purchasing/po_entry_items.php
@@ -97,6 +97,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 +335,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."));