X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=sales%2Fcustomer_credit_invoice.php;h=e87113ffa5c6aa850c1094ca6e0fa0d5f40c6fe0;hb=5b8f4c4b4aa8cf996bc071f116bfce1273200fa2;hp=e687ec490cf79c504d05792c4c3e7462cb4f93ce;hpb=bb991dc5b071e966b39954bb53d3b0efe8420938;p=fa-stable.git

diff --git a/sales/customer_credit_invoice.php b/sales/customer_credit_invoice.php
index e687ec49..e87113ff 100644
--- a/sales/customer_credit_invoice.php
+++ b/sales/customer_credit_invoice.php
@@ -30,7 +30,7 @@ if ($use_popup_windows) {
 	$js .= get_js_open_window(900, 500);
 }
 
-if ($use_date_picker) {
+if (user_use_date_picker()) {
 	$js .= get_js_date_picker();
 }
 
@@ -54,10 +54,13 @@ if (isset($_GET['AddedID'])) {
 
 	display_note(get_customer_trans_view_str($trans_type, $credit_no, _("&View This Credit Note")), 0, 0);
 
-	display_note(print_document_link($credit_no, _("&Print This Credit Note"), true, $trans_type),1);
+	display_note(print_document_link($credit_no."-".$trans_type, _("&Print This Credit Note"), true, $trans_type),1);
+	display_note(print_document_link($credit_no."-".$trans_type, _("&Email This Credit Note"), true, $trans_type, false, "printlink", "", 1),1);
 
  	display_note(get_gl_view_str($trans_type, $credit_no, _("View the GL &Journal Entries for this Credit Note")),1);
 
+	hyperlink_params("$path_to_root/admin/attachments.php", _("Add an Attachment"), "filterType=$trans_type&trans_no=$credit_no");
+
 	display_footer_exit();
 
 } elseif (isset($_GET['UpdatedID'])) {
@@ -68,13 +71,14 @@ if (isset($_GET['AddedID'])) {
 
 	display_note(get_customer_trans_view_str($trans_type, $credit_no, _("&View This Credit Note")), 0, 0);
 
-	display_note(print_document_link($credit_no, _("&Print This Credit Note"), true, $trans_type),1);
+	display_note(print_document_link($credit_no."-".$trans_type, _("&Print This Credit Note"), true, $trans_type),1);
+	display_note(print_document_link($credit_no."-".$trans_type, _("&Email This Credit Note"), true, $trans_type, false, "printlink", "", 1),1);
 
  	display_note(get_gl_view_str($trans_type, $credit_no, _("View the GL &Journal Entries for this Credit Note")),1);
 
 	display_footer_exit();
 } else
-	check_edit_conflicts();
+	check_edit_conflicts(get_post('cart_id'));
 
 
 //-----------------------------------------------------------------------------
@@ -88,7 +92,7 @@ function can_process()
 		set_focus('CreditDate');
 		return false;
 	} elseif (!is_date_in_fiscalyear($_POST['CreditDate']))	{
-		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('CreditDate');
 		return false;
 	}
@@ -100,11 +104,6 @@ function can_process()
 			return false;
 		}
 
-		if (!is_new_reference($_POST['ref'], ST_CUSTCREDIT)) {
-			display_error(_("The entered reference is already in use."));;
-			set_focus('ref');
-			return false;
-		}
     }
 	if (!check_num('ChargeFreightCost', 0)) {
 		display_error(_("The entered shipping cost is invalid or less than zero."));;
@@ -122,25 +121,12 @@ function can_process()
 
 if (isset($_GET['InvoiceNumber']) && $_GET['InvoiceNumber'] > 0) {
 
-    $ci = new Cart(ST_SALESINVOICE, $_GET['InvoiceNumber'], true);
-
-    $ci->trans_type = ST_CUSTCREDIT;
-    $ci->src_docs = $ci->trans_no;
-    $ci->src_date = $ci->document_date;
-    $ci->trans_no = 0;
-    $ci->document_date = new_doc_date();
-    $ci->reference = $Refs->get_next(ST_CUSTCREDIT);
-
-    for ($line_no=0; $line_no<count($ci->line_items); $line_no++) {
-	$ci->line_items[$line_no]->qty_dispatched = '0';
-    }
-
-    $_SESSION['Items'] = $ci;
+    $_SESSION['Items'] = new Cart(ST_SALESINVOICE, $_GET['InvoiceNumber'], true);
 	copy_from_cart();
 
 } elseif ( isset($_GET['ModifyCredit']) && $_GET['ModifyCredit']>0) {
 
-	$_SESSION['Items'] = new Cart(ST_CUSTCREDIT,$_GET['ModifyCredit']);
+	$_SESSION['Items'] = new Cart(ST_CUSTCREDIT, $_GET['ModifyCredit']);
 	copy_from_cart();
 
 } elseif (!processing_active()) {
@@ -162,10 +148,10 @@ function check_quantities()
 				$_SESSION['Items']->line_items[$line_no]->qty_dispatched =
 				  input_num('Line'.$line_no);
 			}
+			else {
+				$ok = 0;
+			}
 	  	}
-		else {
-			$ok = 0;
-		}
 
 		if (isset($_POST['Line'.$line_no.'Desc'])) {
 			$line_desc = $_POST['Line'.$line_no.'Desc'];
@@ -184,7 +170,7 @@ function copy_to_cart()
 	$cart->ship_via = $_POST['ShipperID'];
 	$cart->freight_cost = input_num('ChargeFreightCost');
 	$cart->document_date =  $_POST['CreditDate'];
-	$cart->Location = $_POST['Location'];
+	$cart->Location = (isset($_POST['Location']) ? $_POST['Location'] : "");
 	$cart->Comments = $_POST['CreditText'];
 	if ($_SESSION['Items']->trans_no == 0)
 		$cart->reference = $_POST['ref'];
@@ -205,21 +191,26 @@ function copy_from_cart()
 //-----------------------------------------------------------------------------
 
 if (isset($_POST['ProcessCredit']) && can_process()) {
+	$new_credit = ($_SESSION['Items']->trans_no == 0);
 
-    $new_credit = ($_SESSION['Items']->trans_no == 0);
-
-    if (!isset($_POST['WriteOffGLCode']))
+	if (!isset($_POST['WriteOffGLCode']))
 		$_POST['WriteOffGLCode'] = 0;
 
 	copy_to_cart();
-	if ($new_credit) new_doc_date($_SESSION['Items']->document_date);
-    $credit_no = $_SESSION['Items']->write($_POST['WriteOffGLCode']);
-
-	processing_end();
-	if ($new_credit) {
-	   	meta_forward($_SERVER['PHP_SELF'], "AddedID=$credit_no");
-	} else {
-	   	meta_forward($_SERVER['PHP_SELF'], "UpdatedID=$credit_no");
+	if ($new_credit) 
+		new_doc_date($_SESSION['Items']->document_date);
+	$credit_no = $_SESSION['Items']->write($_POST['WriteOffGLCode']);
+	if ($credit_no == -1)
+	{
+		display_error(_("The entered reference is already in use."));
+		set_focus('ref');
+	} elseif($credit_no) {
+		processing_end();
+		if ($new_credit) {
+			meta_forward($_SERVER['PHP_SELF'], "AddedID=$credit_no");
+		} else {
+			meta_forward($_SERVER['PHP_SELF'], "UpdatedID=$credit_no");
+		}
 	}
 }
 
@@ -396,4 +387,3 @@ end_form();
 
 end_page();
 
-?>