From 0c07d137e821125e2bbd3034c01ce4cbc376d00b Mon Sep 17 00:00:00 2001 From: Joe Hunt Date: Tue, 5 Oct 2010 13:18:43 +0000 Subject: [PATCH] [00000257] Bad Layout in sales order inquiry etc. (long item descriptions) Other layout improvements. --- CHANGELOG.txt | 13 +++++++++++++ admin/fiscalyears.php | 2 +- gl/inquiry/gl_account_inquiry.php | 2 +- inventory/inquiry/stock_movements.php | 8 +++++++- purchasing/inquiry/po_search.php | 7 ++++++- purchasing/inquiry/po_search_completed.php | 7 ++++++- sales/inquiry/sales_deliveries_view.php | 7 ++++++- sales/inquiry/sales_orders_view.php | 7 ++++++- taxes/tax_groups.php | 2 +- taxes/tax_types.php | 2 +- 10 files changed, 48 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index bf946aa7..e4b31a26 100644 --- 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 6f307164..b2d2913b 100644 --- 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 6641f484..5bef33f9 100644 --- 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 020ab3f4..1dd13827 100644 --- 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 54cb22ef..220b1e1a 100644 --- 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 c612639f..ba77bf7a 100644 --- 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 73b3c4bb..5a29b434 100644 --- 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 0a45cde7..53de2699 100644 --- 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 7c3f9462..bf888159 100644 --- 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 a467b648..6b9c8832 100644 --- 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 (%)"), -- 2.30.2