X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fcustomer_credit_invoice.php;h=e482386b971a7f9f14998fca9fd46cc814b75e6b;hb=efa2530a7c385a329c3fc76f4560b28ba97c3efe;hp=fcc934bd224d945c98e222a78b82e164072d6599;hpb=3f3cfa578adbc2b71f4fd9c8d0f5536d26af43d8;p=fa-stable.git

diff --git a/sales/customer_credit_invoice.php b/sales/customer_credit_invoice.php
index fcc934bd..e482386b 100644
--- a/sales/customer_credit_invoice.php
+++ b/sales/customer_credit_invoice.php
@@ -20,17 +20,16 @@ $path_to_root = "..";
 include_once($path_to_root . "/sales/includes/cart_class.inc");
 include_once($path_to_root . "/includes/session.inc");
 include_once($path_to_root . "/includes/data_checks.inc");
-include_once($path_to_root . "/includes/manufacturing.inc");
 include_once($path_to_root . "/sales/includes/sales_db.inc");
 include_once($path_to_root . "/sales/includes/sales_ui.inc");
 include_once($path_to_root . "/reporting/includes/reporting.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();
 }
 
@@ -78,7 +77,7 @@ if (isset($_GET['AddedID'])) {
 
 	display_footer_exit();
 } else
-	check_edit_conflicts();
+	check_edit_conflicts(get_post('cart_id'));
 
 
 //-----------------------------------------------------------------------------
@@ -88,7 +87,7 @@ function can_process()
 	global $Refs;
 
 	if (!is_date($_POST['CreditDate'])) {
-		display_error(_("The entered date is invalid."));;
+		display_error(_("The entered date is invalid."));
 		set_focus('CreditDate');
 		return false;
 	} elseif (!is_date_in_fiscalyear($_POST['CreditDate']))	{
@@ -98,15 +97,15 @@ function can_process()
 	}
 
     if ($_SESSION['Items']->trans_no==0) {
-		if (!$Refs->is_valid($_POST['ref'])) {
-			display_error(_("You must enter a reference."));;
+		if (!$Refs->is_valid($_POST['ref'], ST_CUSTCREDIT)) {
+			display_error(_("You must enter a reference."));
 			set_focus('ref');
 			return false;
 		}
 
     }
 	if (!check_num('ChargeFreightCost', 0)) {
-		display_error(_("The entered shipping cost is invalid or less than zero."));;
+		display_error(_("The entered shipping cost is invalid or less than zero."));
 		set_focus('ChargeFreightCost');
 		return false;
 	}
@@ -227,10 +226,10 @@ function display_credit_items()
     start_form();
 	hidden('cart_id');
 
-	start_table(TABLESTYLE2, "width=80%", 5);
+	start_table(TABLESTYLE2, "width='80%'", 5);
 	echo "<tr><td>"; // outer table
 
-    start_table(TABLESTYLE, "width=100%");
+    start_table(TABLESTYLE, "width='100%'");
     start_row();
     label_cells(_("Customer"), $_SESSION['Items']->customer_name, "class='tableheader2'");
 	label_cells(_("Branch"), get_branch_name($_SESSION['Items']->Branch), "class='tableheader2'");
@@ -238,11 +237,11 @@ function display_credit_items()
     end_row();
     start_row();
 
-//	if (!isset($_POST['ref']))
-//		$_POST['ref'] = $Refs->get_next(11);
-
     if ($_SESSION['Items']->trans_no==0) {
-		ref_cells(_("Reference"), 'ref', '', null, "class='tableheader2'");
+		ref_cells(_("Reference"), 'ref', '', null, "class='tableheader2'", false, ST_CUSTCREDIT,
+		array('customer' => $_SESSION['Items']->customer_id,
+			'branch' => $_SESSION['Items']->Branch,
+			'date' => get_post('CreditDate')));
 	} else {
 		label_cells(_("Reference"), $_SESSION['Items']->reference, "class='tableheader2'");
 	}
@@ -253,17 +252,13 @@ function display_credit_items()
 	}
 	label_cell(_("Shipping Company"), "class='tableheader2'");
 	shippers_list_cells(null, 'ShipperID', $_POST['ShipperID']);
-//	if (!isset($_POST['sales_type_id']))
-//	  $_POST['sales_type_id'] = $_SESSION['Items']->sales_type;
-//	label_cell(_("Sales Type"), "class='tableheader2'");
-//	sales_types_list_cells(null, 'sales_type_id', $_POST['sales_type_id']);
 
 	end_row();
 	end_table();
 
     echo "</td><td>";// outer table
 
-    start_table(TABLESTYLE, "width=100%");
+    start_table(TABLESTYLE, "width='100%'");
 
     label_row(_("Invoice Date"), $_SESSION['Items']->src_date, "class='tableheader2'");
 
@@ -276,7 +271,7 @@ function display_credit_items()
 	end_table(1); // outer table
 
 	div_start('credit_items');
-    start_table(TABLESTYLE, "width=80%");
+    start_table(TABLESTYLE, "width='80%'");
     $th = array(_("Item Code"), _("Item Description"), _("Invoiced Quantity"), _("Units"),
     	_("Credit Quantity"), _("Price"), _("Discount %"), _("Total"));
     table_header($th);
@@ -369,6 +364,7 @@ function display_credit_options()
 //-----------------------------------------------------------------------------
 if (get_post('Update'))
 {
+	copy_to_cart();
 	$Ajax->activate('credit_items');
 }
 //-----------------------------------------------------------------------------
@@ -387,4 +383,3 @@ end_form();
 
 end_page();
 
-?>