From d635061b77d9815f378a18b8a0a984b2fe962433 Mon Sep 17 00:00:00 2001 From: Joe Hunt Date: Mon, 8 Dec 2008 00:32:52 +0000 Subject: [PATCH] Bad and missing parameter to header2 funciton Rerun of invoice_ui.inc --- CHANGELOG.txt | 7 +++++++ purchasing/includes/ui/invoice_ui.inc | 20 ++++++++++---------- reporting/rep109.php | 2 +- reporting/rep209.php | 2 +- 4 files changed, 19 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 473cf40f..a5383b19 100644 --- 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 86b2f72c..7b0968d9 100644 --- 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 ""; - echo ""; + + start_outer_table("width=100%"); + + display_heading($heading); + if ($mode == 1) { - submit_cells('InvGRNAll', _("Add All Items"), "align=right",false,true); if ($heading2 != "") - { - echo "\n"; - } + display_note($heading2."", 0, 0, "class='overduefg'"); + submit_cells('InvGRNAll', _("Add All Items"), "align=right",false,true); } - echo "
$heading
"; - display_note($heading2, 0, 0, "class='overduefg'"); - echo "
"; - 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 0360afdc..1bbf662a 100644 --- 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 c6e0240f..cc3d93ba 100644 --- 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'] != "") { -- 2.30.2