Stable branch merged up to 2.3.21

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

diff --git a/purchasing/supplier_credit.php b/purchasing/supplier_credit.php
index 57e8696eda925d5ef974100877afc3213f0a7632..a89acc7f8f33feff48720b5155aedbab09cb090b 100644 (file)
--- a/purchasing/supplier_credit.php
+++ b/purchasing/supplier_credit.php
@@ -25,12 +25,46 @@ if ($use_popup_windows)
        $js .= get_js_open_window(900, 500);
 if ($use_date_picker)
        $js .= get_js_date_picker();
-page(_($help_context = "Supplier Credit Note"), false, false, "", $js);
 
 //----------------------------------------------------------------------------------------
 
 check_db_has_suppliers(_("There are no suppliers defined in the system."));
 
+if (isset($_GET['ModifyCredit']))
+       check_is_editable(ST_SUPPINVOICE, $_GET['ModifyCredit']);
+
+//---------------------------------------------------------------------------------------------------
+
+if (isset($_GET['New']))
+{
+       if (isset( $_SESSION['supp_trans']))
+       {
+               unset ($_SESSION['supp_trans']->grn_items);
+               unset ($_SESSION['supp_trans']->gl_codes);
+               unset ($_SESSION['supp_trans']);
+       }
+
+       if (isset($_GET['invoice_no']))
+       {
+               $_SESSION['supp_trans'] = new supp_trans(ST_SUPPINVOICE, $_GET['invoice_no']);
+               $_SESSION['supp_trans']->src_doc = $_GET['invoice_no'];
+
+
+               $_SESSION['supp_trans']->trans_type = ST_SUPPCREDIT;
+               $_SESSION['supp_trans']->trans_no = 0;
+               $_SESSION['supp_trans']->supp_reference = '';
+               //              $_SESSION['supp_trans']->supp_reference = $_POST['invoice_no'] = $_GET['invoice_no'];
+               $help_context = "Supplier Credit Note";
+               $_SESSION['page_title'] = _("Supplier Credit Note");
+
+       } else {
+               $help_context = "Supplier Credit Note";
+               $_SESSION['page_title'] = _("Supplier Credit Note");
+               $_SESSION['supp_trans'] = new supp_trans(ST_SUPPCREDIT);
+       }
+}
+page($_SESSION['page_title'], false, false, "", $js);
+
 //---------------------------------------------------------------------------------------------------------------
 
 if (isset($_GET['AddedID'])) 
@@ -47,26 +81,8 @@ if (isset($_GET['AddedID']))
 
     hyperlink_params($_SERVER['PHP_SELF'], _("Enter Another Credit Note"), "New=1");
        hyperlink_params("$path_to_root/admin/attachments.php", _("Add an Attachment"), "filterType=$trans_type&trans_no=$invoice_no");
-       
-       display_footer_exit();
-}
-
-//---------------------------------------------------------------------------------------------------
-
-if (isset($_GET['New']))
-{
-       if (isset( $_SESSION['supp_trans']))
-       {
-               unset ($_SESSION['supp_trans']->grn_items);
-               unset ($_SESSION['supp_trans']->gl_codes);
-               unset ($_SESSION['supp_trans']);
-       }
 
-       $_SESSION['supp_trans'] = new supp_trans(ST_SUPPCREDIT);
-       if (isset($_GET['invoice_no']))
-       {
-               $_SESSION['supp_trans']->supp_reference = $_POST['invoice_no'] = $_GET['invoice_no'];
-       }
+       display_footer_exit();
 }
 
 function clear_fields()
@@ -100,7 +116,7 @@ if (isset($_POST['ClearFields']))
        clear_fields();
 }
 
-if (isset($_POST['AddGLCodeToTrans'])){
+if (isset($_POST['AddGLCodeToTrans'])) {
 
        $Ajax->activate('gl_items');
        $input_error = false;
@@ -146,7 +162,7 @@ if (isset($_POST['AddGLCodeToTrans'])){
 function check_data()
 {
        global $total_grn_value, $total_gl_value, $Refs, $SysPrefs;
-       
+
        if (!$_SESSION['supp_trans']->is_valid_trans_to_post())
        {
                display_error(_("The credit note cannot be processed because the there are no items or values on the invoice.  Credit notes are expected to have a charge."));
@@ -161,7 +177,7 @@ function check_data()
                return false;
        }
 
-       if (!is_new_reference($_SESSION['supp_trans']->reference, ST_SUPPCREDIT)) 
+       if (!is_new_reference($_SESSION['supp_trans']->reference, ST_SUPPCREDIT, $_SESSION['supp_trans']->trans_no))
        {
                display_error(_("The entered reference is already in use."));
                set_focus('reference');
@@ -183,7 +199,7 @@ function check_data()
        } 
        elseif (!is_date_in_fiscalyear($_SESSION['supp_trans']->tran_date)) 
        {
-               display_error(_("The entered date is not in fiscal year."));
+               display_error(_("The entered date is out of fiscal year or is closed for further data entry."));
                set_focus('tran_date');
                return false;
        }