X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fui%2Fsales_credit_ui.inc;h=1a69deee97c3dfeef95208d9ee26b6b72943469e;hb=8eb8e44cb90ab144f0849d1ecd2153175b619786;hp=b75aac1ef7091f11bb7ec1aba8619bcfb0b11ee7;hpb=53d942f2a0d20cce5e9c409c6485867ce0869e4d;p=fa-stable.git

diff --git a/sales/includes/ui/sales_credit_ui.inc b/sales/includes/ui/sales_credit_ui.inc
index b75aac1e..1a69deee 100644
--- a/sales/includes/ui/sales_credit_ui.inc
+++ b/sales/includes/ui/sales_credit_ui.inc
@@ -17,7 +17,7 @@ function display_credit_header(&$order)
 {
 	global $Ajax, $Refs;
 
-	start_outer_table(TABLESTYLE, "width=80%");
+	start_outer_table(TABLESTYLE, "width='80%'");
 	table_section(1);
 
 	$customer_error = "";
@@ -35,52 +35,48 @@ function display_credit_header(&$order)
 	}
 
 	customer_branches_list_row(_("Branch:"), $_POST['customer_id'], 
-	  'branch_id', null, false, true, true, true);
+	  	'branch_id', null, false, true, true, true);
 
-	//if (($_SESSION['credit_items']->order_no == 0) ||
-	//	($order->customer_id != $_POST['customer_id']) ||
-	//	($order->Branch != $_POST['branch_id']))
-	//	$customer_error = get_customer_details_to_order($order, $_POST['customer_id'], $_POST['branch_id']);
 	if (($order->customer_id != $_POST['customer_id']) ||
 		($order->Branch != $_POST['branch_id']))
-	  {
-
-				$old_order = (PHP_VERSION<5) ? $order : clone( $order );
-				$customer_error = get_customer_details_to_order($order, $_POST['customer_id'], $_POST['branch_id']);
-
-				$_POST['Location'] = $order->Location;
-				$_POST['deliver_to'] = $order->deliver_to;
-				$_POST['delivery_address'] = $order->delivery_address;
-				$_POST['phone'] = $order->phone;
-				$Ajax->activate('Location');
-				$Ajax->activate('deliver_to');
-				$Ajax->activate('phone');
-				$Ajax->activate('delivery_address');
-				// change prices if necessary
-				// what about discount in template case?
-				if ($old_order->customer_currency != $order->customer_currency) {
-				    $change_prices = 1;
-				}
-				if ($old_order->sales_type != $order->sales_type) {
-				//  || $old_order->default_discount!=$order->default_discount
-					$_POST['sales_type_id'] = $order->sales_type;
-				    $Ajax->activate('sales_type_id');
-				    $change_prices = 1;
-				}
-				if ($old_order->dimension_id != $order->dimension_id) {
-					$_POST['dimension_id'] = $order->dimension_id;
-				    $Ajax->activate('dimension_id');
-				}
-				if ($old_order->dimension2_id != $order->dimension2_id) {
-					$_POST['dimension2_id'] = $order->dimension2_id;
-				    $Ajax->activate('dimension2_id');
-				}
-				unset($old_order);
-	  }
+	{
+
+		$old_order = (PHP_VERSION<5) ? $order : clone $order;
+		$customer_error = get_customer_details_to_order($order, $_POST['customer_id'], $_POST['branch_id']);
+
+		$_POST['Location'] = $order->Location;
+		$_POST['deliver_to'] = $order->deliver_to;
+		$_POST['delivery_address'] = $order->delivery_address;
+		$_POST['phone'] = $order->phone;
+		$Ajax->activate('Location');
+		$Ajax->activate('deliver_to');
+		$Ajax->activate('phone');
+		$Ajax->activate('delivery_address');
+		// change prices if necessary
+		// what about discount in template case?
+		if ($old_order->customer_currency != $order->customer_currency) {
+			$change_prices = 1;
+		}
+		if ($old_order->sales_type != $order->sales_type) {
+			$_POST['sales_type_id'] = $order->sales_type;
+			$Ajax->activate('sales_type_id');
+			$change_prices = 1;
+		}
+		if ($old_order->dimension_id != $order->dimension_id) {
+			$_POST['dimension_id'] = $order->dimension_id;
+			$Ajax->activate('dimension_id');
+		}
+		if ($old_order->dimension2_id != $order->dimension2_id) {
+			$_POST['dimension2_id'] = $order->dimension2_id;
+			$Ajax->activate('dimension2_id');
+		}
+		unset($old_order);
+	}
 	set_global_customer($_POST['customer_id']);
 
 	if (!isset($_POST['ref']))
-		$_POST['ref'] = $Refs->get_next(ST_CUSTCREDIT);
+		$_POST['ref'] = $Refs->get_next(ST_CUSTCREDIT, null, array('customer' => get_post('customer_id'),
+			'branch' => get_post('branch_id'), 'date' => get_post('OrderDate')));
 	if ($order->trans_no==0)
 	    ref_row(_("Reference").':', 'ref');
 	else
@@ -92,7 +88,7 @@ function display_credit_header(&$order)
 		table_section(2);
 		
 		label_row(_("Customer Currency:"), $order->customer_currency);
-		exchange_rate_display($order->customer_currency, get_company_currency(),
+		exchange_rate_display(get_company_currency(), $order->customer_currency,
 			$_POST['OrderDate']);
 	}
 	table_section(3);
@@ -109,7 +105,7 @@ function display_credit_header(&$order)
 		$change_prices = 1;
 	}
 
-    shippers_list_row(_("Shipping Company:"), 'ShipperID', $order->ship_via);
+    shipping_methods_list_row(_("Shipping:"), 'ShipperID', $order->ship_via);
 
 	label_row(_("Customer Discount:"), ($order->default_discount * 100) . "%");
 
@@ -126,7 +122,7 @@ function display_credit_header(&$order)
 		}
 		$Ajax->activate('_ex_rate');
 	}
-	// 2008-11-12 Joe Hunt added dimensions
+	// added dimensions
 	$dim = get_company_pref('use_dimension');
 	if ($dim > 0)
 		dimensions_list_row(_("Dimension").":", 'dimension_id', 
@@ -146,7 +142,6 @@ function display_credit_header(&$order)
 			$line = &$order->line_items[$line_no];
 			$line->price = get_price($line->stock_id, $order->customer_currency,
 				$order->sales_type, $order->price_factor, get_post('OrderDate'));
-		//		$line->discount_percent = $order->default_discount;
 		}
 	    $Ajax->activate('items_table');
 	}
@@ -163,9 +158,9 @@ function display_credit_items($title, &$order)
 
     display_heading($title);
     div_start('items_table');
-    start_table(TABLESTYLE, "width=90%");
+    start_table(TABLESTYLE, "width='90%'");
     $th = array(_("Item Code"), _("Item Description"), _("Quantity"), _("Unit"),
-	_("Price"), _("Discount %"), _("Total"),'');
+		_("Price"), _("Discount %"), _("Total"),'');
 
     if (count($order->line_items)) $th[]= '';
 
@@ -344,4 +339,3 @@ function credit_options_controls($credit)
 
 //---------------------------------------------------------------------------------
 
-?>
\ No newline at end of file