X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fsupplier_credit.php;h=19337cbef13a094288de4dba7eca5b08cf439cf5;hb=477c1f221df891f39e9363f7b34e6ff1eb4ad4c7;hp=b4f31966d9aa7f8f7e82368b5625a6960c0a5991;hpb=ec51d9a922df61d39de8444cd0a3aaf51ebcbf2b;p=fa-stable.git

diff --git a/purchasing/supplier_credit.php b/purchasing/supplier_credit.php
index b4f31966..19337cbe 100644
--- a/purchasing/supplier_credit.php
+++ b/purchasing/supplier_credit.php
@@ -21,16 +21,50 @@ include_once($path_to_root . "/includes/data_checks.inc");
 include_once($path_to_root . "/purchasing/includes/purchasing_db.inc");
 include_once($path_to_root . "/purchasing/includes/purchasing_ui.inc");
 $js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
 	$js .= get_js_open_window(900, 500);
-if ($use_date_picker)
+if (user_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;
@@ -145,8 +161,8 @@ if (isset($_POST['AddGLCodeToTrans'])){
 
 function check_data()
 {
-	global $total_grn_value, $total_gl_value, $Refs, $SysPrefs;
-	
+	global $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."));
@@ -154,27 +170,12 @@ function check_data()
 		return false;
 	}
 
-	if (!$Refs->is_valid($_SESSION['supp_trans']->reference)) 
+	if (!check_reference($_SESSION['supp_trans']->reference, ST_SUPPCREDIT, $_SESSION['supp_trans']->trans_no))
 	{
-		display_error(_("You must enter an credit note reference."));
 		set_focus('reference');
 		return false;
 	}
 
-	if (!is_new_reference($_SESSION['supp_trans']->reference, ST_SUPPCREDIT)) 
-	{
-		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."));
@@ -183,7 +184,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,12 +195,6 @@ function check_data()
 		return false;
 	}
 
-	if ($_SESSION['supp_trans']->ov_amount < ($total_gl_value + $total_grn_value))
-	{
-		display_error(_("The credit note total as entered is less than the sum of the the general ledger entires (if any) and the charges for goods received. There must be a mistake somewhere, the credit note as entered will not be processed."));
-		return false;
-	}
-
 	if (!$SysPrefs->allow_negative_stock()) {
 		foreach ($_SESSION['supp_trans']->grn_items as $n => $item) {
 			if (is_inventory_item($item->item_code))
@@ -340,9 +335,9 @@ invoice_header($_SESSION['supp_trans']);
 if ($_POST['supplier_id']=='') 
 	display_error('No supplier found for entered search text');
 else {
-	$total_grn_value = display_grn_items($_SESSION['supp_trans'], 1);
+	display_grn_items($_SESSION['supp_trans'], 1);
 
-	$total_gl_value = display_gl_items($_SESSION['supp_trans'], 1);
+	display_gl_items($_SESSION['supp_trans'], 1);
 
 	div_start('inv_tot');
 	invoice_totals($_SESSION['supp_trans']);
@@ -364,4 +359,3 @@ br();
 
 end_form();
 end_page();
-?>