[00000257] Bad Layout in sales order inquiry etc. (long item descriptions)

Other layout improvements.

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index bf946aa7e59b0e084ca6e6d33cff6adacfb0f064..e4b31a264aea2b6a4af42d2efe8cafd404f6f97a 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,6 +19,19 @@ Legend:
 ! -> Note
 $ -> Affected files
 
+05-Oct-2010 Joe Hunt
+# [00000257] Bad Layout in sales order inquiry etc. (long item descriptions)
+$ /sales/inquiry/sales_orders_view.php
+  /sales/inquiry/sales_deliveries_view.php
+  /purchasing/inquiry/po_search.php
+  /purchasing/inquiry/po_search_completed.php
+  /inventory/inquiry/stock_movements.php
+  /gl/inquiry/gl_account_inquiry.php
+! Other layour improvements
+  /admin/fiscalyears.php
+  /taxes/tax_groups.php
+  /taxes/tax_types.php
+  
 05-Oct-2010 Janusz Dobrowolski
 # Fixed contact type for language selection
 $ reporting/rep107.php

diff --git a/admin/fiscalyears.php b/admin/fiscalyears.php
index 6f3071648c879be0f5cf58ca1f7771a3ab57148a..b2d2913b9102c8abf3eda152fc1c15ebba3bea3c 100644 (file)
--- a/admin/fiscalyears.php
+++ b/admin/fiscalyears.php
@@ -126,7 +126,7 @@ function display_fiscalyears()
        start_form();
        display_note(_("Warning: Deleting a fiscal year all transactions 
                are removed and converted into relevant balances. This process is irreversible!"), 
-               0, 0, "class='currentfg'");
+               0, 1, "class='currentfg'");
        start_table(TABLESTYLE);
 
        $th = array(_("Fiscal Year Begin"), _("Fiscal Year End"), _("Closed"), "", "");

diff --git a/gl/inquiry/gl_account_inquiry.php b/gl/inquiry/gl_account_inquiry.php
index 6641f4841d76db96506d0d841984d5b35184bae5..5bef33f95079912195fd7871f88232e8408f561c 100644 (file)
--- a/gl/inquiry/gl_account_inquiry.php
+++ b/gl/inquiry/gl_account_inquiry.php
@@ -72,7 +72,7 @@ function gl_inquiry_controls()
     end_row();
        end_table();
 
-       start_table();
+       start_table(TABLESTYLE_NOBORDER);
        start_row();
        if ($dim >= 1)
                dimensions_list_cells(_("Dimension")." 1:", 'Dimension', null, true, " ", false, 1);

diff --git a/inventory/inquiry/stock_movements.php b/inventory/inquiry/stock_movements.php
index 020ab3f4fedec8ee9373337fc921f5a26b7d1f98..1dd1382733810d280c45e26ea2db506279e8ff2d 100644 (file)
--- a/inventory/inquiry/stock_movements.php
+++ b/inventory/inquiry/stock_movements.php
@@ -45,8 +45,13 @@ if (!isset($_POST['stock_id']))
        $_POST['stock_id'] = get_global_stock_item();
 
 start_table(TABLESTYLE_NOBORDER);
-
+start_row();
 stock_items_list_cells(_("Item:"), 'stock_id', $_POST['stock_id']);
+end_row();
+end_table();
+
+start_table(TABLESTYLE_NOBORDER);
+start_row();
 
 locations_list_cells(_("From Location:"), 'StockLocation', null);
 
@@ -54,6 +59,7 @@ date_cells(_("From:"), 'AfterDate', '', null, -30);
 date_cells(_("To:"), 'BeforeDate');
 
 submit_cells('ShowMoves',_("Show Movements"),'',_('Refresh Inquiry'), 'default');
+end_row();
 end_table();
 end_form();
 

diff --git a/purchasing/inquiry/po_search.php b/purchasing/inquiry/po_search.php
index 54cb22ef17a5b3b07cab16b4a8264a7349f886e9..220b1e1a325d62e2c36d2452ee939ca1dd268f34 100644 (file)
--- a/purchasing/inquiry/po_search.php
+++ b/purchasing/inquiry/po_search.php
@@ -65,12 +65,17 @@ date_cells(_("from:"), 'OrdersAfterDate', '', null, -30);
 date_cells(_("to:"), 'OrdersToDate');
 
 locations_list_cells(_("Location:"), 'StockLocation', null, true);
+end_row();
+end_table();
+
+start_table(TABLESTYLE_NOBORDER);
+start_row();
 
 stock_items_list_cells(_("Item:"), 'SelectStockFromList', null, true);
 
 submit_cells('SearchOrders', _("Search"),'',_('Select documents'), 'default');
 end_row();
-end_table();
+end_table(1);
 //---------------------------------------------------------------------------------------------
 function trans_view($trans)
 {

diff --git a/purchasing/inquiry/po_search_completed.php b/purchasing/inquiry/po_search_completed.php
index c612639f86ad7830f4025bd625891ff8b16582a5..ba77bf7a91222026e43ef12ea5b15f57192fb59e 100644 (file)
--- a/purchasing/inquiry/po_search_completed.php
+++ b/purchasing/inquiry/po_search_completed.php
@@ -63,12 +63,17 @@ date_cells(_("from:"), 'OrdersAfterDate', '', null, -30);
 date_cells(_("to:"), 'OrdersToDate');
 
 locations_list_cells(_("into location:"), 'StockLocation', null, true);
+end_row();
+end_table();
+
+start_table(TABLESTYLE_NOBORDER);
+start_row();
 
 stock_items_list_cells(_("for item:"), 'SelectStockFromList', null, true);
 
 submit_cells('SearchOrders', _("Search"),'',_('Select documents'), 'default');
 end_row();
-end_table();
+end_table(1);
 //---------------------------------------------------------------------------------------------
 if (isset($_POST['order_number']))
 {

diff --git a/sales/inquiry/sales_deliveries_view.php b/sales/inquiry/sales_deliveries_view.php
index 73b3c4bb124c1f5b9159729d9149098120f026ab..5a29b43401ad61c6d46cb32ac79cff88e464fa5d 100644 (file)
--- a/sales/inquiry/sales_deliveries_view.php
+++ b/sales/inquiry/sales_deliveries_view.php
@@ -105,6 +105,11 @@ date_cells(_("from:"), 'DeliveryAfterDate', '', null, -30);
 date_cells(_("to:"), 'DeliveryToDate', '', null, 1);
 
 locations_list_cells(_("Location:"), 'StockLocation', null, true);
+end_row();
+
+end_table();
+start_table(TABLESTYLE_NOBORDER);
+start_row();
 
 stock_items_list_cells(_("Item:"), 'SelectStockFromList', null, true);
 
@@ -114,7 +119,7 @@ hidden('OutstandingOnly', $_POST['OutstandingOnly']);
 
 end_row();
 
-end_table();
+end_table(1);
 //---------------------------------------------------------------------------------------------
 
 if (isset($_POST['SelectStockFromList']) && ($_POST['SelectStockFromList'] != "") &&

diff --git a/sales/inquiry/sales_orders_view.php b/sales/inquiry/sales_orders_view.php
index 0a45cde718ed3dd4c97e58547127938ac3042a6b..53de2699fbf05f87d8ee84d2084972640247423c 100644 (file)
--- a/sales/inquiry/sales_orders_view.php
+++ b/sales/inquiry/sales_orders_view.php
@@ -230,13 +230,18 @@ if ($_POST['order_view_mode'] != 'DeliveryTemplates' && $_POST['order_view_mode'
        date_cells(_("to:"), 'OrdersToDate', '', null, 1);
 }
 locations_list_cells(_("Location:"), 'StockLocation', null, true);
+end_row();
+end_table();
+
+start_table(TABLESTYLE_NOBORDER);
+start_row();
 
 stock_items_list_cells(_("Item:"), 'SelectStockFromList', null, true);
 
 if ($trans_type == ST_SALESQUOTE)
        check_cells(_("Show All:"), 'show_all');
-submit_cells('SearchOrders', _("Search"),'',_('Select documents'), 'default');
 
+submit_cells('SearchOrders', _("Search"),'',_('Select documents'), 'default');
 hidden('order_view_mode', $_POST['order_view_mode']);
 hidden('type', $trans_type);
 

diff --git a/taxes/tax_groups.php b/taxes/tax_groups.php
index 7c3f946291c7b3e5b7a6d46af34dd584c0537251..bf888159043376a45cfdcb14c72bec0f5d09707f 100644 (file)
--- a/taxes/tax_groups.php
+++ b/taxes/tax_groups.php
@@ -206,7 +206,7 @@ yesno_list_row(_("Tax applied to Shipping:"), 'tax_shipping', null, "", "", true
 
 end_table();
 
-display_note(_("Select the taxes that are included in this group."), 1);
+display_note(_("Select the taxes that are included in this group."), 1, 1);
 
 start_table(TABLESTYLE2);
 //$th = array(_("Tax"), _("Default Rate (%)"), _("Rate (%)"));

diff --git a/taxes/tax_types.php b/taxes/tax_types.php
index a467b6487b22ae1316108540ac5abadc2a7ddbf3..6b9c8832f2d763e17b552831217271950f614ea3 100644 (file)
--- a/taxes/tax_types.php
+++ b/taxes/tax_types.php
@@ -109,7 +109,7 @@ $result = get_all_tax_types(check_value('show_inactive'));
 
 start_form();
 
-display_note(_("To avoid problems with manual journal entry all tax types should have unique Sales/Purchasing GL accounts."));
+display_note(_("To avoid problems with manual journal entry all tax types should have unique Sales/Purchasing GL accounts."), 0, 1);
 start_table(TABLESTYLE);
 
 $th = array(_("Description"), _("Default Rate (%)"),