X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fcredit_note_entry.php;h=7fc278a82643a698fd9542b3841b7ecc7b5f11ec;hb=7840540918bfd37c886877a5d52e3ba0b3373289;hp=1d5fbc3e586c16eb5b5b832dadbf2ffb3a7cb36d;hpb=b611def496e4942321d66f183fe0e1d95417c99f;p=fa-stable.git

diff --git a/sales/credit_note_entry.php b/sales/credit_note_entry.php
index 1d5fbc3e..7fc278a8 100644
--- a/sales/credit_note_entry.php
+++ b/sales/credit_note_entry.php
@@ -74,6 +74,8 @@ if (isset($_GET['AddedID'])) {
 
 	hyperlink_params($_SERVER['PHP_SELF'], _("Enter Another &Credit Note"), "NewCredit=yes");
 
+	hyperlink_params("$path_to_root/admin/attachments.php", _("Add an Attachment"), "filterType=$trans_type&trans_no=$credit_no");
+
 	display_footer_exit();
 } else
 	check_edit_conflicts();
@@ -94,9 +96,10 @@ function copy_to_cn()
 	$cart->Comments = $_POST['CreditText'];
 	$cart->document_date = $_POST['OrderDate'];
 	$cart->freight_cost = input_num('ChargeFreightCost');
-	$cart->Location = $_POST["Location"];
+	$cart->Location = (isset($_POST["Location"]) ? $_POST["Location"] : "");
 	$cart->sales_type = $_POST['sales_type_id'];
-	$cart->reference = $_POST['ref'];
+	if ($cart->trans_no == 0)
+		$cart->reference = $_POST['ref'];
 	$cart->ship_via = $_POST['ShipperID'];
 	$cart->dimension_id = $_POST['dimension_id'];
 	$cart->dimension2_id = $_POST['dimension2_id'];
@@ -112,7 +115,8 @@ function copy_from_cn()
 	$_POST['ChargeFreightCost'] = price_format($cart->freight_cost);
 	$_POST['Location'] = $cart->Location;
 	$_POST['sales_type_id'] = $cart->sales_type;
-	$_POST['ref'] = $cart->reference;
+	if ($cart->trans_no == 0)
+		$_POST['ref'] = $cart->reference;
 	$_POST['ShipperID'] = $cart->ship_via;
 	$_POST['dimension_id'] = $cart->dimension_id;
 	$_POST['dimension2_id'] = $cart->dimension2_id;
@@ -124,7 +128,7 @@ function copy_from_cn()
 function handle_new_credit($trans_no)
 {
 	processing_start();
-	$_SESSION['Items'] = new Cart(11,$trans_no);
+	$_SESSION['Items'] = new Cart(ST_CUSTCREDIT,$trans_no);
 	copy_from_cn();
 }
 
@@ -154,7 +158,7 @@ function can_process()
 		set_focus('OrderDate');
 		$input_error = 1;
 	} elseif (!is_date_in_fiscalyear($_POST['OrderDate'])) {
-		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('OrderDate');
 		$input_error = 1;
 	}
@@ -253,7 +257,7 @@ if (isset($_POST['CancelItemChanges']))
 //-----------------------------------------------------------------------------
 
 if (!processing_active()) {
-	handle_new_credit();
+	handle_new_credit(0);
 }
 
 //-----------------------------------------------------------------------------