From 425942b6c30c1722da6d7e5bf99462e07249bc45 Mon Sep 17 00:00:00 2001
From: Janusz Dobrowolski <janusz@frontaccounting.eu>
Date: Thu, 13 Nov 2008 22:39:43 +0000
Subject: [PATCH] Removed obsolete submit_on_change option from
 sales_credit_note dimension lists.

---
 CHANGELOG.txt                         |  2 ++
 sales/credit_note_entry.php           |  1 +
 sales/includes/ui/sales_credit_ui.inc | 30 +++++++++------------------
 3 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 8e206b25..77d9da68 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -24,6 +24,8 @@ $ -> Affected files
 $ /dimensions/inquiry/search_dimensions.php
 # Removed obsolete dimension list submit_on_change option.
 $ /sales/includes/ui/sales_order_ui.inc
+  /sales/credit_note_entry.php
+  /sales/includes/ui/sales_credit_ui.inc
 
 12-Nov-2008 Janusz Dobrowolski
 ! Rewritten for paged query results.
diff --git a/sales/credit_note_entry.php b/sales/credit_note_entry.php
index c05a58bb..e64bc8cd 100644
--- a/sales/credit_note_entry.php
+++ b/sales/credit_note_entry.php
@@ -152,6 +152,7 @@ function can_process()
 //-----------------------------------------------------------------------------
 
 if (isset($_POST['ProcessCredit']) && can_process()) {
+	copy_to_cn();
 	if ($_POST['CreditType'] == "WriteOff" && (!isset($_POST['WriteOffGLCode']) ||
 		$_POST['WriteOffGLCode'] == '')) {
 		display_note(_("For credit notes created to write off the stock, a general ledger account is required to be selected."), 1, 0);
diff --git a/sales/includes/ui/sales_credit_ui.inc b/sales/includes/ui/sales_credit_ui.inc
index 9a52b8ae..1b68d087 100644
--- a/sales/includes/ui/sales_credit_ui.inc
+++ b/sales/includes/ui/sales_credit_ui.inc
@@ -129,26 +129,16 @@ function display_credit_header(&$order)
 	// 2008-11-12 Joe Hunt added dimensions
 	$dim = get_company_pref('use_dimension');
 	if ($dim > 0)
-	{
-		if ($order->dimension_id != $_POST['dimension_id']) {
-			$order->dimension_id = $_POST['dimension_id'];
-			$Ajax->activate('dimension_id');
-		}	
-		dimensions_list_row(_("Dimension:"), 'dimension_id', null, true, ' ', false, 1, true);
-		if ($dim > 1)
-		{
-			if ($order->dimension2_id != $_POST['dimension2_id']) {
-				$order->dimension2_id = $_POST['dimension2_id'];
-				$Ajax->activate('dimension2_id');
-			}	
-			dimensions_list_row(_("Dimension")." 2:", 'dimension2_id', null, true, ' ', false, 2, true);
-		}	
-	}		
-	if ($dim < 2)
-		hidden('dimension2_id', 0);
-	if ($dim < 1)
+		dimensions_list_row(_("Dimension").":", 'dimension_id', 
+			null, true, ' ', false, 1, false);
+	else
 		hidden('dimension_id', 0);
-	
+	if ($dim > 1)
+		dimensions_list_row(_("Dimension")." 2:", 'dimension2_id', 
+			null, true, ' ', false, 2, false);
+	else
+		hidden('dimension2_id', 0);
+
 	echo "</table>";
 
 	echo "</td></tr>";
@@ -205,7 +195,7 @@ function display_credit_items($title, &$order)
     	    label_cell($line->units);
     	    amount_cell($line->price);
 
-	    amount_cell($line->discount_percent * 100);
+	    	percent_cell($line->discount_percent * 100);
     	    amount_cell($line_total);
 
     	    edit_button_cell("Edit$line_no", _('Edit'),
-- 
2.30.2