Removed obsolete submit_on_change option from sales_credit_note dimension lists.

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 8e206b25448b04b620bb2688a16db30d79b9e073..77d9da68b7b227c0e4629d7493f7d93cb83cea1c 100644 (file)
--- 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 c05a58bb91b44c5756a88bec58909be214d1eb8b..e64bc8cd1b2e70d73a139f08149695d9d403ba7b 100644 (file)
--- 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 9a52b8ae48358fbf555d7eb4fbeaabc66a83e6f6..1b68d087cd803cda78c87a5f360e24b14ebabef8 100644 (file)
--- 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'),