Bad and missing parameter to header2 funciton

Rerun of invoice_ui.inc

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 473cf40ffe3b9a7da689b593d5bcc4ff81c2a351..a5383b192405f32c07bdae815d8ddee57a878c6e 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -37,6 +37,13 @@ $ /admin/db/maintenance_db.inc
 # Fixed warnings display
 $ /includes/errors.inc
 
+08-Dec-2008 Joe Hunt
+# Bad and missing parameter to header2 funciton
+$ /reporting/rep109.php
+  /reporting/rep209.php
+! Rerun of invoice_ui.inc
+$ /purchasing/includes/ui/invoice_ui.inc
+
 07-Dec-2008 Joe Hunt
 ! Better layout. Copyright notes. Mailto links, outer table routines.
 $ /admin/company_preferences.php

diff --git a/purchasing/includes/ui/invoice_ui.inc b/purchasing/includes/ui/invoice_ui.inc
index 86b2f72ce701d414aacc66071c57c68387ec479c..7b0968d9581335b7d28f7d2439d20bee88236fb1 100644 (file)
--- a/purchasing/includes/ui/invoice_ui.inc
+++ b/purchasing/includes/ui/invoice_ui.inc
@@ -194,6 +194,8 @@ function display_gl_items(&$supp_trans, $mode=0)
        else
                $heading = _("GL Items for this Credit Note");
 
+       display_heading($heading);
+
        vertical_space(); // ouer table
 
        div_start('gl_items');
@@ -381,21 +383,19 @@ function display_grn_items(&$supp_trans, $mode=0)
                else
                        $heading = _("Received Items Credited on this Note");
        }               
-       echo "<table width=100% >";
-       echo "<tr><td align=center><span class='headingtext'>$heading</span></td>";
+
+       start_outer_table("width=100%");
+
+       display_heading($heading);
+
        if ($mode == 1)
        {
-               submit_cells('InvGRNAll', _("Add All Items"), "align=right",false,true);
                if ($heading2 != "")
-               {
-                       echo "</tr><td>";
-                       display_note($heading2, 0, 0, "class='overduefg'");
-                       echo "</td>\n";
-               }
+                       display_note($heading2."</td>", 0, 0, "class='overduefg'");
+               submit_cells('InvGRNAll', _("Add All Items"), "align=right",false,true);
        }       
-       echo "</tr></table>";
 
-       vertical_space(); // outer table
+       end_outer_table(0, false);
 
        div_start('grn_items');
        start_table("$table_style width=100%");

diff --git a/reporting/rep109.php b/reporting/rep109.php
index 0360afdca41214e31846e28bae8dda522cf0c9ae..1bbf662a94bebc10df8ab9395e6f4d88069d43d2 100644 (file)
--- a/reporting/rep109.php
+++ b/reporting/rep109.php
@@ -111,7 +111,7 @@ function print_sales_orders()
                        $rep->TextCol(6, 7,     $DisplayNet, -2);
                        $rep->NewLine(1);
                        if ($rep->row < $rep->bottomMargin + (15 * $rep->lineHeight))
-                               $rep->Header2($myrow, $branch, $sales_order, $baccount);
+                               $rep->Header2($myrow, $branch, $myrow, $baccount, 9);
                }
                if ($myrow['comments'] != "")
                {

diff --git a/reporting/rep209.php b/reporting/rep209.php
index c6e0240f2289033aa1be1a934e4c01e6eb6adaef..cc3d93bafc430b1d34572c3b1a34cbffe35a3f63 100644 (file)
--- a/reporting/rep209.php
+++ b/reporting/rep209.php
@@ -118,7 +118,7 @@ function print_po()
                        $rep->TextCol(6, 7,     $DisplayNet, -2);
                        $rep->NewLine(1);
                        if ($rep->row < $rep->bottomMargin + (15 * $rep->lineHeight))
-                               $rep->Header2($myrow, $branch, $sales_order, $baccount);
+                               $rep->Header2($myrow, $branch, $myrow, $baccount, 8);
                }
                if ($myrow['comments'] != "")
                {