[0004904] Customer Credit Note: fixed invalid inventory GL postings for service items.

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

diff --git a/purchasing/supplier_credit.php b/purchasing/supplier_credit.php
index c2fe7c6113f9d7cfcdb62c792b55392903396107..461c80443496d3c64ca223dd2e8aa77d1c2266b0 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())
        {
@@ -170,27 +169,12 @@ function check_data()
                return false;
        }
 
-       if (!$Refs->is_valid($_SESSION['supp_trans']->reference)) 
-       {
-               display_error(_("You must enter an credit note reference."));
-               set_focus('reference');
-               return false;
-       }
-
-       if (!is_new_reference($_SESSION['supp_trans']->reference, ST_SUPPCREDIT, $_SESSION['supp_trans']->trans_no))
+       if (!check_reference($_SESSION['supp_trans']->reference, ST_SUPPCREDIT, $_SESSION['supp_trans']->trans_no))
        {
-               display_error(_("The entered reference is already in use."));
                set_focus('reference');
                return false;
        }
 
-       if (!$Refs->is_valid($_SESSION['supp_trans']->supp_reference)) 
-       {
-               display_error(_("You must enter a supplier's credit note reference."));
-               set_focus('supp_reference');
-               return false;
-       }
-
        if (!is_date($_SESSION['supp_trans']->tran_date))
        {
                display_error(_("The credit note as entered cannot be processed because the date entered is not valid."));
@@ -210,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))
@@ -219,7 +217,8 @@ function check_data()
                                        $stock = get_item($item->item_code);
                                        display_error(_("The return cannot be processed because there is an insufficient quantity for item:") .
                                                " " . $stock['stock_id'] . " - " . $stock['description'] . " - " .
-                                               _("Quantity On Hand") . " = " . number_format2($qoh, get_qty_dec($stock['stock_id'])));
+                                               _("Quantity On Hand") . " = " . number_format2(get_qoh_on_date($stock['stock_id'], null, 
+                                               $_SESSION['supp_trans']->tran_date), get_qty_dec($stock['stock_id'])));
                                        return false;
                                }
                        }
@@ -283,8 +282,8 @@ function commit_item_data($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], "");
+               $_POST['order_price'.$n], input_num('ChgPrice'.$n));
+               reset_tax_input();
        }
 }