X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fcustomer_credit_invoice.php;h=5c62eba6e8a87deee9d311e09462e70ba999b416;hb=ddadb47f2620ce6902ad4694ce6512568862ba05;hp=70f244fa7449146faa293aa2f0de1ec46b55d1c5;hpb=e91772a2716825a6aeb358d1defba47d5f3892c1;p=fa-stable.git

diff --git a/sales/customer_credit_invoice.php b/sales/customer_credit_invoice.php
index 70f244fa..5c62eba6 100644
--- a/sales/customer_credit_invoice.php
+++ b/sales/customer_credit_invoice.php
@@ -14,7 +14,7 @@
 //	Entry/Modify Credit Note for selected Sales Invoice
 //
 
-$page_security = 3;
+$page_security = 'SA_SALESCREDITINV';
 $path_to_root = "..";
 
 include_once($path_to_root . "/sales/includes/cart_class.inc");
@@ -48,13 +48,13 @@ page($_SESSION['page_title'], false, false, "", $js);
 
 if (isset($_GET['AddedID'])) {
 	$credit_no = $_GET['AddedID'];
-	$trans_type = 11;
+	$trans_type = ST_CUSTCREDIT;
 
 	display_notification_centered(_("Credit Note has been processed"));
 
 	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, 11),1);
+	display_note(print_document_link($credit_no, _("&Print This Credit Note"), true, $trans_type),1);
 
  	display_note(get_gl_view_str($trans_type, $credit_no, _("View the GL &Journal Entries for this Credit Note")),1);
 
@@ -62,13 +62,13 @@ if (isset($_GET['AddedID'])) {
 
 } elseif (isset($_GET['UpdatedID'])) {
 	$credit_no = $_GET['UpdatedID'];
-	$trans_type = 11;
+	$trans_type = ST_CUSTCREDIT;
 
 	display_notification_centered(_("Credit Note has been updated"));
 
 	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, 11),1);
+	display_note(print_document_link($credit_no, _("&Print This Credit Note"), true, $trans_type),1);
 
  	display_note(get_gl_view_str($trans_type, $credit_no, _("View the GL &Journal Entries for this Credit Note")),1);
 
@@ -81,6 +81,8 @@ if (isset($_GET['AddedID'])) {
 
 function can_process()
 {
+	global $Refs;
+
 	if (!is_date($_POST['CreditDate'])) {
 		display_error(_("The entered date is invalid."));;
 		set_focus('CreditDate');
@@ -92,13 +94,13 @@ function can_process()
 	}
 
     if ($_SESSION['Items']->trans_no==0) {
-		if (!references::is_valid($_POST['ref'])) {
+		if (!$Refs->is_valid($_POST['ref'])) {
 			display_error(_("You must enter a reference."));;
 			set_focus('ref');
 			return false;
 		}
 
-		if (!is_new_reference($_POST['ref'], 11)) {
+		if (!is_new_reference($_POST['ref'], ST_CUSTCREDIT)) {
 			display_error(_("The entered reference is already in use."));;
 			set_focus('ref');
 			return false;
@@ -120,14 +122,14 @@ function can_process()
 
 if (isset($_GET['InvoiceNumber']) && $_GET['InvoiceNumber'] > 0) {
 
-    $ci = new Cart(10, $_GET['InvoiceNumber'], true);
+    $ci = new Cart(ST_SALESINVOICE, $_GET['InvoiceNumber'], true);
 
-    $ci->trans_type = 11;
+    $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 = references::get_next(11);
+    $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';
@@ -138,7 +140,7 @@ if (isset($_GET['InvoiceNumber']) && $_GET['InvoiceNumber'] > 0) {
 
 } elseif ( isset($_GET['ModifyCredit']) && $_GET['ModifyCredit']>0) {
 
-	$_SESSION['Items'] = new Cart(11,$_GET['ModifyCredit']);
+	$_SESSION['Items'] = new Cart(ST_CUSTCREDIT,$_GET['ModifyCredit']);
 	copy_from_cart();
 
 } elseif (!processing_active()) {
@@ -178,24 +180,27 @@ function check_quantities()
 
 function copy_to_cart()
 {
-  $cart = &$_SESSION['Items'];
-  $cart->ship_via = $_POST['ShipperID'];
-  $cart->freight_cost = input_num('ChargeFreightCost');
-  $cart->document_date =  $_POST['CreditDate'];
-  $cart->Location = $_POST['Location'];
-  $cart->Comments = $_POST['CreditText'];
+	$cart = &$_SESSION['Items'];
+	$cart->ship_via = $_POST['ShipperID'];
+	$cart->freight_cost = input_num('ChargeFreightCost');
+	$cart->document_date =  $_POST['CreditDate'];
+	$cart->Location = $_POST['Location'];
+	$cart->Comments = $_POST['CreditText'];
+	if ($_SESSION['Items']->trans_no == 0)
+		$cart->reference = $_POST['ref'];
 }
 //-----------------------------------------------------------------------------
 
 function copy_from_cart()
 {
-  $cart = &$_SESSION['Items'];
-  $_POST['ShipperID'] = $cart->ship_via;
-  $_POST['ChargeFreightCost'] = price_format($cart->freight_cost);
-  $_POST['CreditDate']= $cart->document_date;
-  $_POST['Location']= $cart->Location;
-  $_POST['CreditText']= $cart->Comments;
-  $_POST['cart_id'] = $cart->cart_id;
+	$cart = &$_SESSION['Items'];
+	$_POST['ShipperID'] = $cart->ship_via;
+	$_POST['ChargeFreightCost'] = price_format($cart->freight_cost);
+	$_POST['CreditDate']= $cart->document_date;
+	$_POST['Location']= $cart->Location;
+	$_POST['CreditText']= $cart->Comments;
+	$_POST['cart_id'] = $cart->cart_id;
+	$_POST['ref'] = $cart->reference;
 }
 //-----------------------------------------------------------------------------
 
@@ -245,15 +250,14 @@ function display_credit_items()
     start_row();
 
 //	if (!isset($_POST['ref']))
-//		$_POST['ref'] = references::get_next(11);
+//		$_POST['ref'] = $Refs->get_next(11);
 
     if ($_SESSION['Items']->trans_no==0) {
-		ref_cells(_("Reference"), 'ref', '', $_SESSION['Items']->reference, "class='tableheader2'");
+		ref_cells(_("Reference"), 'ref', '', null, "class='tableheader2'");
 	} else {
 		label_cells(_("Reference"), $_SESSION['Items']->reference, "class='tableheader2'");
 	}
-//    label_cells(_("Crediting Invoice"), get_customer_trans_view_str(10, $_SESSION['InvoiceToCredit']), "class='tableheader2'");
-    label_cells(_("Crediting Invoice"), get_customer_trans_view_str(10, array_keys($_SESSION['Items']->src_docs)), "class='tableheader2'");
+    label_cells(_("Crediting Invoice"), get_customer_trans_view_str(ST_SALESINVOICE, array_keys($_SESSION['Items']->src_docs)), "class='tableheader2'");
 
 	if (!isset($_POST['ShipperID'])) {
 		$_POST['ShipperID'] = $_SESSION['Items']->ship_via;