X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fsupplier_credit.php;h=fdd04dd912666520fb366e00f4d467285754abb7;hb=96f82e64b766fa59a3ebc3176e4efd17736f6878;hp=7cea70211027571f904ec925e441338d0a999a41;hpb=b2c3e28bed892d30cb24e8dd766f1f0b39146cb2;p=fa-stable.git

diff --git a/purchasing/supplier_credit.php b/purchasing/supplier_credit.php
index 7cea7021..fdd04dd9 100644
--- a/purchasing/supplier_credit.php
+++ b/purchasing/supplier_credit.php
@@ -25,12 +25,47 @@ 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");
+
+		$_SESSION['supp_trans'] = new supp_trans(ST_SUPPCREDIT);
+	} elseif (isset($_GET['ModifyInvoice'])) {
+		$help_context = 'Modifying Purchase Invoice';
+		$_SESSION['page_title'] = sprintf( _("Modifying Supplier Credit # %d"), $_GET['ModifyCredit']);
+		$_SESSION['supp_trans'] = new supp_trans(ST_SUPPCREDIT, $_GET['ModifyCredit']);
+	}
+}
+page($_SESSION['page_title'], false, false, "", $js);
+
 //---------------------------------------------------------------------------------------------------------------
 
 if (isset($_GET['AddedID'])) 
@@ -47,26 +82,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()
@@ -91,7 +108,7 @@ if (isset($_POST['ClearFields']))
 	clear_fields();
 }
 
-if (isset($_POST['AddGLCodeToTrans'])){
+if (isset($_POST['AddGLCodeToTrans'])) {
 
 	$Ajax->activate('gl_items');
 	$input_error = false;
@@ -136,7 +153,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."));
@@ -151,7 +168,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');
@@ -173,7 +190,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;
 	}
@@ -194,7 +211,7 @@ function check_data()
 		foreach ($_SESSION['supp_trans']->grn_items as $n => $item) {
 			if (is_inventory_item($item->item_code))
 			{
-				$qoh = get_qoh_on_date($item->item_code, $item->location, $_SESSION['supp_trans']->tran_date);
+				$qoh = get_qoh_on_date($item->item_code, null, $_SESSION['supp_trans']->tran_date);
 				if ($item->qty_recd > $qoh)
 				{
 					$stock = get_item($item->item_code);