From 61027f425da0c66e2802076d6b48472462f3cf3b Mon Sep 17 00:00:00 2001 From: Joe Hunt Date: Tue, 27 May 2008 20:47:13 +0000 Subject: [PATCH] Changed more files with new html/css. --- CHANGELOG.txt | 6 ++++ includes/page/header.inc | 4 +-- .../inquiry/supplier_allocation_inquiry.php | 34 ++++++++++--------- sales/credit_note_entry.php | 4 +-- 4 files changed, 28 insertions(+), 20 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 90982c47..00a7f459 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -19,6 +19,12 @@ Legend: ! -> Note $ -> Affected files +27-May-2008 Joe Hunt +# Changed more files with new html/css. +$ /includes/page/header.inc + /purchasing/inquiry/supplier_allocation_inquiry.php + /sales/credit_note_entry.php + 26-May-2008 Joe Hunt # Fixed many minor bugs, new ones as well as debtor_trans related. ! Changed to use DOCTYPE html 4.01 transitionel. Some files/css needed change. diff --git a/includes/page/header.inc b/includes/page/header.inc index b8f08e6b..893527e8 100644 --- a/includes/page/header.inc +++ b/includes/page/header.inc @@ -104,9 +104,9 @@ function page_header($title, $no_menu=false, $is_index=false, $onload="", $js="" echo "$title"; $local_stylesheet = $_SESSION['language']->get_stylesheet(); echo ""; - echo " \n"; + echo " \n"; if (file_exists($local_path_to_root. "/".$local_stylesheet)) - echo " \n"; + echo " \n"; send_scripts($js); echo " \n"; diff --git a/purchasing/inquiry/supplier_allocation_inquiry.php b/purchasing/inquiry/supplier_allocation_inquiry.php index e8020139..3e233b14 100644 --- a/purchasing/inquiry/supplier_allocation_inquiry.php +++ b/purchasing/inquiry/supplier_allocation_inquiry.php @@ -76,27 +76,27 @@ function get_transactions() $sql .= " AND ".TB_PREF."supp_trans.supplier_id = '" . $_POST['supplier_id'] . "'"; if (isset($_POST['filterType']) && $_POST['filterType'] != reserved_words::get_all()) { - if (($_POST['filterType'] == '1') || ($_POST['filterType'] == '2')) + if (($_POST['filterType'] == '1') || ($_POST['filterType'] == '2')) { $sql .= " AND ".TB_PREF."supp_trans.type = 20 "; - } - elseif ($_POST['filterType'] == '3') + } + elseif ($_POST['filterType'] == '3') { $sql .= " AND ".TB_PREF."supp_trans.type = 22 "; - } - elseif (($_POST['filterType'] == '4') || ($_POST['filterType'] == '5')) + } + elseif (($_POST['filterType'] == '4') || ($_POST['filterType'] == '5')) { $sql .= " AND ".TB_PREF."supp_trans.type = 21 "; } - if (($_POST['filterType'] == '2') || ($_POST['filterType'] == '5')) + if (($_POST['filterType'] == '2') || ($_POST['filterType'] == '5')) { $today = date2sql(Today()); $sql .= " AND ".TB_PREF."supp_trans.due_date < '$today' "; } } - if (!check_value('showSettled')) + if (!check_value('showSettled')) { $sql .= " AND (round(abs(ov_amount + ov_gst + ov_discount) - alloc,6) != 0) "; } @@ -121,28 +121,28 @@ if (db_num_rows($result) == 0) /*show a table of the transactions returned by the sql */ -start_table("$table_style width=80%"); +start_table("$table_style width=90%"); if ($_POST['supplier_id'] == reserved_words::get_all()) $th = array(_("Type"), _("Number"), _("Reference"), _("Supplier"), _("Supp Reference"), _("Date"), _("Due Date"), _("Currency"), - _("Debit"), _("Credit"), _("Allocated"), _("Balance")); -else + _("Debit"), _("Credit"), _("Allocated"), _("Balance"), ""); +else $th = array(_("Type"), _("Number"), _("Reference"), _("Supp Reference"), _("Date"), _("Due Date"), - _("Debit"), _("Credit"), _("Allocated"), _("Balance")); + _("Debit"), _("Credit"), _("Allocated"), _("Balance"), ""); table_header($th); $j = 1; $k = 0; //row colour counter $over_due = false; -while ($myrow = db_fetch($result)) +while ($myrow = db_fetch($result)) { if ($myrow['OverDue'] == 1) { start_row("class='overduebg'"); $over_due = true; - } - else + } + else { alt_table_row_color($k); } @@ -170,7 +170,7 @@ while ($myrow = db_fetch($result)) amount_cell($myrow["Allocated"]); if ($myrow["type"] == 1 || $myrow["type"] == 21 || $myrow["type"] == 22) $balance = -$myrow["TotalAmount"] - $myrow["Allocated"]; - else + else $balance = $myrow["TotalAmount"] - $myrow["Allocated"]; amount_cell($balance); @@ -179,9 +179,11 @@ while ($myrow = db_fetch($result)) if (($myrow["type"] == 1 || $myrow["type"] == 21 || $myrow["type"] == 22) && $balance > 0) { - label_cell("" . _("Allocations") . ""); } + else + label_cell(""); end_row(); diff --git a/sales/credit_note_entry.php b/sales/credit_note_entry.php index fe9bd274..1946aca1 100644 --- a/sales/credit_note_entry.php +++ b/sales/credit_note_entry.php @@ -113,7 +113,7 @@ function can_process() display_error( _("The entered reference is already in use.")); set_focus('ref'); $input_error = 1; - } + } } if (!is_date($_POST['OrderDate'])) { display_error(_("The entered date for the credit note is invalid.")); @@ -246,7 +246,7 @@ if ($customer_error == "") { echo "
"; submit_cells('Update', _("Update")); submit_cells('ProcessCredit', _("Process Credit Note")); -echo "
"; +echo "
"; end_form(); end_page(); -- 2.30.2