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

diff --git a/sales/credit_note_entry.php b/sales/credit_note_entry.php
index 7dcc461d..7fc278a8 100644
--- a/sales/credit_note_entry.php
+++ b/sales/credit_note_entry.php
@@ -34,12 +34,12 @@ if ($use_date_picker) {
 }
 
 if(isset($_GET['NewCredit'])) {
-	$_SESSION['page_title'] = _("Customer Credit Note");
+	$_SESSION['page_title'] = _($help_context = "Customer Credit Note");
 	handle_new_credit(0);
 } elseif (isset($_GET['ModifyCredit'])) {
 	$_SESSION['page_title'] = sprintf(_("Modifying Customer Credit Note #%d"), $_GET['ModifyCredit']);
 	handle_new_credit($_GET['ModifyCredit']);
-	$help_page_title = _("Modifying Customer Credit Note");
+	$help_context = "Modifying Customer Credit Note";
 }
 
 page($_SESSION['page_title'],false, false, "", $js);
@@ -61,19 +61,21 @@ if (list_updated('branch_id')) {
 
 if (isset($_GET['AddedID'])) {
 	$credit_no = $_GET['AddedID'];
-	$trans_type = 11;
+	$trans_type = ST_CUSTCREDIT;
 
 	display_notification_centered(sprintf(_("Credit Note # %d has been processed"),$credit_no));
 
 	display_note(get_customer_trans_view_str($trans_type, $credit_no, _("&View this credit note")), 0, 1);
 
-	display_note(print_document_link($credit_no, _("&Print This Credit Invoice"), true, 11),0, 1);
-	display_note(print_document_link($credit_no, _("&Email This Credit Invoice"), true, 11, false, "", "", 1),0, 1);
+	display_note(print_document_link($credit_no."-".$trans_type, _("&Print This Credit Invoice"), true, ST_CUSTCREDIT),0, 1);
+	display_note(print_document_link($credit_no."-".$trans_type, _("&Email This Credit Invoice"), true, ST_CUSTCREDIT, false, "printlink", "", 1),0, 1);
 
 	display_note(get_gl_view_str($trans_type, $credit_no, _("View the GL &Journal Entries for this Credit Note")));
 
 	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();
 }
 
@@ -143,7 +147,7 @@ function can_process()
 		display_error( _("You must enter a reference."));
 		set_focus('ref');
 		$input_error = 1;
-	    } elseif (!is_new_reference($_POST['ref'], 11))	{
+	    } elseif (!is_new_reference($_POST['ref'], ST_CUSTCREDIT))	{
 		display_error( _("The entered reference is already in use."));
 		set_focus('ref');
 		$input_error = 1;
@@ -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);
 }
 
 //-----------------------------------------------------------------------------
@@ -264,7 +268,7 @@ hidden('cart_id');
 $customer_error = display_credit_header($_SESSION['Items']);
 
 if ($customer_error == "") {
-	start_table("$table_style width=80%", 10);
+	start_table(TABLESTYLE, "width=80%", 10);
 	echo "<tr><td>";
 	display_credit_items(_("Credit Note Items"), $_SESSION['Items']);
 	credit_options_controls($_SESSION['Items']);