Journal Entry: cleanup in reconcillation status update during edition.

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

diff --git a/purchasing/supplier_credit.php b/purchasing/supplier_credit.php
index 8a0ab8cb49b3296385eda82b417bdadd162c0bda..cbb10a8d4ba4158efd6e0fb2e0eda4add40a8714 100644 (file)
--- a/purchasing/supplier_credit.php
+++ b/purchasing/supplier_credit.php
@@ -28,10 +28,8 @@ if (user_use_date_picker())
 
 //----------------------------------------------------------------------------------------
 
-check_db_has_suppliers(_("There are no suppliers defined in the system."));
-
 if (isset($_GET['ModifyCredit']))
-       check_is_editable(ST_SUPPINVOICE, $_GET['ModifyCredit']);
+       check_is_editable(ST_SUPPCREDIT, $_GET['ModifyCredit']);
 
 //---------------------------------------------------------------------------------------------------
 
@@ -47,13 +45,12 @@ if (isset($_GET['New']))
        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']->src_docs = array( $_GET['invoice_no'] => $_SESSION['supp_trans']->supp_reference);
 
 
                $_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");
 
@@ -65,6 +62,8 @@ if (isset($_GET['New']))
 }
 page($_SESSION['page_title'], false, false, "", $js);
 
+check_db_has_suppliers(_("There are no suppliers defined in the system."));
+
 //---------------------------------------------------------------------------------------------------------------
 
 if (isset($_GET['AddedID'])) 
@@ -161,7 +160,7 @@ if (isset($_POST['AddGLCodeToTrans'])) {
 
 function check_data()
 {
-       global $Refs, $SysPrefs;
+       global $SysPrefs;
 
        if (!$_SESSION['supp_trans']->is_valid_trans_to_post())
        {
@@ -195,6 +194,20 @@ function check_data()
                return false;
        }
 
+       if (trim(get_post('supp_reference')) == false)
+       {
+               display_error(_("You must enter a supplier's invoice reference."));
+               set_focus('supp_reference');
+               return false;
+       }
+
+       if (is_reference_already_there($_SESSION['supp_trans']->supplier_id, $_POST['supp_reference'], $_SESSION['supp_trans']->trans_no))
+       {       /*Transaction reference already entered */
+               display_error(_("This invoice number has already been entered. It cannot be entered again.") . " (" . $_POST['supp_reference'] . ")");
+               set_focus('supp_reference');
+               return false;
+       }
+
        if (!$SysPrefs->allow_negative_stock()) {
                foreach ($_SESSION['supp_trans']->grn_items as $n => $item) {
                        if (is_inventory_item($item->item_code))
@@ -223,10 +236,7 @@ function handle_commit_credit_note()
        if (!check_data())
                return;
 
-       if (isset($_POST['invoice_no']))
-               $invoice_no = add_supp_invoice($_SESSION['supp_trans'], $_POST['invoice_no']);
-       else
-               $invoice_no = add_supp_invoice($_SESSION['supp_trans']);
+       $invoice_no = add_supp_invoice($_SESSION['supp_trans']);
 
     $_SESSION['supp_trans']->clear_items();
     unset($_SESSION['supp_trans']);
@@ -257,7 +267,7 @@ function check_item_data($n)
                set_focus('ChgPrice'.$n);
                return false;
        }
-
+       
        return true;
 }
 
@@ -265,12 +275,12 @@ function commit_item_data($n)
 {
        if (check_item_data($n))
        {
+               $item = get_grn_item($n);
                $_SESSION['supp_trans']->add_grn_to_trans($n,
-               $_POST['po_detail_item'.$n], $_POST['item_code'.$n],
-               $_POST['item_description'.$n], $_POST['qty_recd'.$n],
-               $_POST['prev_quantity_inv'.$n], input_num('This_QuantityCredited'.$n),
-               $_POST['order_price'.$n], input_num('ChgPrice'.$n),
-               $_POST['std_cost_unit'.$n], "");
+               $item['po_detail_item'], $item['item_code'],
+               $item['description'], $item['qty_recd'],
+               $item['quantity_inv'], input_num('This_QuantityCredited'.$n),
+               $item['unit_price'], input_num('ChgPrice'.$n), $item['std_cost_unit']);
                reset_tax_input();
        }
 }