Fixed bug 0000004 and nested forms in supplier invoice/credit

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index e73ce99f3fc6eddadd3a6377b4c7adc6e3131808..5f732d5893b5cd3308b4cf5c675c281cc68868ea 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,6 +19,10 @@ Legend:
 ! -> Note
 $ -> Affected files
 
+25-Jun-2008 Janusz Dobrowolski
+# Fixed bug 0000004, removed nested forms in supplier invoice/credit
+$ /purchasing/includes/ui/invoice_ui.inc
+
 25-Jun-2008 Joe Hunt
 # Fixed bug when updating/saving Tax Group Items
 $ /includes/ui/ui_lists.inc
@@ -36,7 +40,7 @@ $ /sales/sales_order_entry.php
 
 23-Jun-2008 Janusz Dobrowolski
 + Ajax additions to sales and purchasing modules
-  /purchasing/po_receive_items.php
+$ /purchasing/po_receive_items.php
   /purchasing/supplier_credit.php
   /purchasing/supplier_credit_grns.php
   /purchasing/supplier_invoice.php
@@ -47,12 +51,12 @@ $ /sales/sales_order_entry.php
   /sales/customer_credit_invoice.php
   /sales/allocations/customer_allocate.php
 # Fixed edition of purchase order (bug #0000001)
-  /purchasing/includes/ui/po_ui.inc
+$ /purchasing/includes/ui/po_ui.inc
 ! Improved client side allocation functions
 $ /js/allocate.js
-  /js/inserts.js
 + Optional coloured price_format()
-  /js/utils.js
+$ /js/utils.js
+  /js/inserts.js
 ! Async update of locations selector
 $ /includes/ui/ui_lists.inc
 # Fixed warning on pages without default focus.

diff --git a/purchasing/includes/ui/invoice_ui.inc b/purchasing/includes/ui/invoice_ui.inc
index 13115116c927a32d5d96b939b86ec8155426554d..22fa013d90325261958ad601ef34df8b92b995bb 100644 (file)
--- a/purchasing/includes/ui/invoice_ui.inc
+++ b/purchasing/includes/ui/invoice_ui.inc
@@ -186,7 +186,6 @@ function display_gl_items(&$supp_trans, $mode=0)
        echo "</td></tr><tr><td>"; // ouer table
 
        div_start('gl_items');
-       start_form();
        echo "<table width=100% $table_style>";
 
        $dim = get_company_pref('use_dimension');
@@ -249,7 +248,6 @@ function display_gl_items(&$supp_trans, $mode=0)
     echo "</td></tr>";
 
     end_table(); // outertable
-       end_form();
        div_end();
        return $total_gl_value;
 }
@@ -298,7 +296,6 @@ function display_grn_items(&$supp_trans, $mode=0)
        echo "</td></tr><tr><td>"; // outer table
 
   div_start('grn_items');
-  start_form();
        echo "<table width=100% $table_style>";
        $th = array(_("Delivery Sequence #"), _("Item"), _("Description"),
                _("Quantity"), _("Price"), _("Line Value"));
@@ -343,8 +340,7 @@ function display_grn_items(&$supp_trans, $mode=0)
        label_row(_("Total"), price_format($total_grn_value),
                "colspan=5 align=right", "nowrap align=right");
     echo "</table>";
-  end_form();
-  div_end();
+    div_end();
     echo "</td></tr>";
 
     end_table(); // outertable