Layout adjustments

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 85569f0775225b3e2ba8ea8199c573bac9c40bc5..5705d78874080869bd83ddae4ed7bc25f388905c 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -32,8 +32,12 @@ $ /admin/gl_setup.php
   /sales/includes/db/sales_credit_db.inc
 ! New tcpdf.php file. Minor bugfixes from tcpdf.org
   /reporting/includes/tcpdf.php
+! Layout adjustments
+  /dimensions/includes/dimensions_ui.inc
+  /dimensions/view/view_dimension.php
+  /inventory/view/view_adjustment.php
+  /manufacturing/view/work_order_view.php
   
-
 18-Sep-2008 Janusz Dobrowolski
 + Support for calling external pages during document entry (e.g. for adding customer/supplier/items).
 $ /index.php

diff --git a/dimensions/includes/dimensions_ui.inc b/dimensions/includes/dimensions_ui.inc
index bc56479fd88e946f7a1eb379fd4ed4a23f2df916..9355c99992e573e3afb700188401acd6ae802ae9 100644 (file)
--- a/dimensions/includes/dimensions_ui.inc
+++ b/dimensions/includes/dimensions_ui.inc
@@ -8,7 +8,9 @@ function display_dimension_payments($id)
 {
        global $path_to_root, $table_style;
 
-    $result = get_bank_trans(null, null, payment_person_types::dimension(), $id);
+       $sql = "SELECT * FROM ".TB_PREF."gl_trans WHERE dimension_id = $id OR dimension2_id = $id
+               ORDER BY account,tran_date";
+       $result = db_query($sql, "Transactions could not be calculated");
 
     echo "<br>";
 
@@ -20,7 +22,7 @@ function display_dimension_payments($id)
     {
                display_heading2(_("Transactions for this Dimension"));
                start_table($table_style);
-               $th = array(_("Type"), _("#"), _("Reference"),
+               $th = array(_("Type"), _("#"), _("Account"),
                        _("Date"), _("Debit"), _("Credit"));
                table_header($th);
 
@@ -31,17 +33,13 @@ function display_dimension_payments($id)
 
                        alt_table_row_color($k);
 
-                       // projects are always in home currency...get the home equivalent of the banktrans
-                       // from it's gl postings
-                       $home_value = get_gl_trans_value($myrow["bank_act"], $myrow["type"], $myrow["trans_no"]);
-
                label_cell(systypes::name($myrow["type"]));
-                       label_cell(get_trans_view_str($myrow["type"], $myrow["trans_no"]));
-                       label_cell($myrow["ref"]);
-                       label_cell(sql2date($myrow["trans_date"]));
-                       display_debit_or_credit_cells($home_value);
+                       label_cell(get_gl_view_str($myrow["type"], $myrow["type_no"], $myrow["type_no"], true));
+                       label_cell($myrow["account"]);
+                       label_cell(sql2date($myrow["tran_date"]));
+                       display_debit_or_credit_cells($myrow["amount"]);
 
-                       $total += $home_value;
+                       $total += $myrow["amount"];
 
                        end_row();
                }

diff --git a/dimensions/view/view_dimension.php b/dimensions/view/view_dimension.php
index 5929432cbf86ef2be1fe58a3852e1fa326cd70a4..843da185a24a2b0e37231889b72d4b236e5cdf74 100644 (file)
--- a/dimensions/view/view_dimension.php
+++ b/dimensions/view/view_dimension.php
@@ -25,6 +25,7 @@ if ($_GET['trans_no'] != "")
 
 display_heading(systypes::name(systypes::dimension()) . " # " . $id);
 
+br(1);
 $myrow = get_dimension($id);
 
 if (strlen($myrow[0]) == 0)

diff --git a/inventory/view/view_adjustment.php b/inventory/view/view_adjustment.php
index a4eb1fe9b3f37e06e61cb80d2b5b4ccb6b7ffa75..9aac2fd83c5e5cf8acf816d3ca30969e86c8c17d 100644 (file)
--- a/inventory/view/view_adjustment.php
+++ b/inventory/view/view_adjustment.php
@@ -18,6 +18,7 @@ if (isset($_GET["trans_no"]))
 
 display_heading(systypes::name(systypes::inventory_adjustment()) . " #$trans_no");
 
+br(1);
 $adjustment_items = get_stock_adjustment_items($trans_no);
 $k = 0;
 $header_shown = false;

diff --git a/manufacturing/view/work_order_view.php b/manufacturing/view/work_order_view.php
index d63f2de351d00b1b0c36ed52a6b7d3820197ce17..7b114995eb9eb745bfd79c1e1f994b2e5d5e582f 100644 (file)
--- a/manufacturing/view/work_order_view.php
+++ b/manufacturing/view/work_order_view.php
@@ -25,6 +25,7 @@ if ($_GET['trans_no'] != "")
 
 display_heading(systypes::name(systypes::work_order()) . " # " . $woid);
 
+br(1);
 $myrow = get_work_order($woid);
 
 if ($myrow["type"]  == wo_types::advanced())
@@ -35,7 +36,7 @@ else
 echo "<center>";
 
 // display the WO requirements
-echo "<br>";
+br(1);
 if ($myrow["released"] == false)
 {
     display_heading2(_("BOM for item:") . " " . $myrow["StockItemName"]);