From: Joe Hunt Date: Sat, 17 Jan 2009 15:28:54 +0000 (+0000) Subject: Changed all smaller forms and tables to be uniform. Copyright notes. X-Git-Tag: v2.4.2~19^2~1605 X-Git-Url: https://delta.frontaccounting.com/gitweb/?p=fa-stable.git;a=commitdiff_plain;h=b61fe995e432d77ff3ff0b5850bb921920f3befb Changed all smaller forms and tables to be uniform. Copyright notes. --- diff --git a/CHANGELOG.txt b/CHANGELOG.txt index ea20a760..8f1d6f39 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,7 +1,7 @@ /** * @version $Id$ * @package FrontAccounting -* @copyright (C) 2005 - 2008 FrontAccounting +* @copyright (C) 2005 - 2009 FrontAccounting * @license http://www.gnu.org/copyleft/agpl-3.0.html GNU/AGPL * FrontAccounting is Free Software */ @@ -19,6 +19,10 @@ Legend: ! -> Note $ -> Affected files +17-Jan-2009 Joe Hunt +! Changed all smaller forms and tables to be uniform. Copyright notes. +$ All files with small forms and tables. + 16-Jan-2009 Janusz Dobrowolski ! Fixed new pager generation on first display. $ /gl/manage/exchange_rates.php diff --git a/admin/attachments.php b/admin/attachments.php index 5ecc7c5a..6481449e 100644 --- a/admin/attachments.php +++ b/admin/attachments.php @@ -213,7 +213,7 @@ if (isset($_POST['filterType'])) start_form(true); -start_table("$table_style2 width=30%"); +start_table($table_style2); if ($selected_id != -1) { diff --git a/admin/forms_setup.php b/admin/forms_setup.php index 828a36fd..23de52ef 100644 --- a/admin/forms_setup.php +++ b/admin/forms_setup.php @@ -37,6 +37,7 @@ if (isset($_POST['setprefs'])) } start_form(); + start_table("class='tablestyle'"); $systypes = get_systypes(); diff --git a/gl/manage/exchange_rates.php b/gl/manage/exchange_rates.php index 39ad4bea..a589de56 100644 --- a/gl/manage/exchange_rates.php +++ b/gl/manage/exchange_rates.php @@ -1,5 +1,14 @@ . +***********************************************************************/ $page_security = 9; $path_to_root="../.."; include($path_to_root . "/includes/db_pager.inc"); diff --git a/gl/manage/gl_quick_entries.php b/gl/manage/gl_quick_entries.php index 323580a7..c042c213 100644 --- a/gl/manage/gl_quick_entries.php +++ b/gl/manage/gl_quick_entries.php @@ -1,6 +1,6 @@ . +***********************************************************************/ $page_security = 11; $path_to_root="../.."; include($path_to_root . "/includes/session.inc"); @@ -86,7 +95,7 @@ while ($myrow = db_fetch($result)) label_cell($myrow["description"]); edit_button_cell("Edit".$myrow[0], _("Edit")); - edit_button_cell("Delete".$myrow[0], _("Delete")); + delete_button_cell("Delete".$myrow[0], _("Delete")); end_row(); } @@ -97,7 +106,7 @@ echo '
'; start_form(); -start_table("class='tablestyle_noborder'"); +start_table($table_style2); if ($selected_id != -1) { diff --git a/inventory/manage/item_units.php b/inventory/manage/item_units.php index b8e432bc..fa84a350 100644 --- a/inventory/manage/item_units.php +++ b/inventory/manage/item_units.php @@ -1,4 +1,14 @@ . +***********************************************************************/ $page_security = 11; $path_to_root="../.."; include($path_to_root . "/includes/session.inc"); @@ -71,7 +81,7 @@ if ($Mode == 'RESET') $result = get_all_item_units(); start_form(); -start_table("$table_style width=50%"); +start_table("$table_style width=40%"); $th = array(_('Unit'), _('Description'), _('Decimals'), "", ""); table_header($th); @@ -87,7 +97,7 @@ while ($myrow = db_fetch($result)) label_cell(($myrow["decimals"]==-1?_("User Quantity Decimals"):$myrow["decimals"])); edit_button_cell("Edit".$myrow[0], _("Edit")); - edit_button_cell("Delete".$myrow[0], _("Delete")); + delete_button_cell("Delete".$myrow[0], _("Delete")); end_row(); } @@ -99,7 +109,7 @@ echo '
'; start_form(); -start_table("class='tablestyle_noborder'"); +start_table($table_style2); if ($selected_id != '') { diff --git a/inventory/manage/movement_types.php b/inventory/manage/movement_types.php index fb866fc2..5d114be7 100644 --- a/inventory/manage/movement_types.php +++ b/inventory/manage/movement_types.php @@ -1,5 +1,14 @@ . +***********************************************************************/ $page_security = 3; $path_to_root="../.."; include($path_to_root . "/includes/session.inc"); @@ -95,7 +104,7 @@ while ($myrow = db_fetch($result)) label_cell($myrow["name"]); edit_button_cell("Edit".$myrow['id'], _("Edit")); - edit_button_cell("Delete".$myrow['id'], _("Delete")); + delete_button_cell("Delete".$myrow['id'], _("Delete")); end_row(); } @@ -107,7 +116,7 @@ echo '
'; start_form(); -start_table(); +start_table($table_style2); if ($selected_id != -1) { diff --git a/manufacturing/manage/work_centres.php b/manufacturing/manage/work_centres.php index 4155fae8..e67bdbfb 100644 --- a/manufacturing/manage/work_centres.php +++ b/manufacturing/manage/work_centres.php @@ -1,5 +1,14 @@ . +***********************************************************************/ $page_security = 3; $path_to_root="../.."; include($path_to_root . "/includes/session.inc"); @@ -105,7 +114,7 @@ while ($myrow = db_fetch($result)) label_cell($myrow["name"]); label_cell($myrow["description"]); edit_button_cell("Edit".$myrow['id'], _("Edit")); - edit_button_cell("Delete".$myrow['id'], _("Delete")); + delete_button_cell("Delete".$myrow['id'], _("Delete")); end_row(); } diff --git a/sales/manage/credit_status.php b/sales/manage/credit_status.php index 6b0ee02d..1e05949f 100644 --- a/sales/manage/credit_status.php +++ b/sales/manage/credit_status.php @@ -1,5 +1,14 @@ . +***********************************************************************/ $page_security = 3; $path_to_root="../.."; include($path_to_root . "/includes/session.inc"); @@ -108,7 +117,7 @@ while ($myrow = db_fetch($result)) label_cell($myrow["reason_description"]); label_cell($disallow_text); edit_button_cell("Edit".$myrow['id'], _("Edit")); - edit_button_cell("Delete".$myrow['id'], _("Delete")); + delete_button_cell("Delete".$myrow['id'], _("Delete")); end_row(); } @@ -120,7 +129,7 @@ echo '
'; start_form(); -start_table("$table_style2 width=40%"); +start_table($table_style2); if ($selected_id != -1) { diff --git a/sales/manage/recurrent_invoices.php b/sales/manage/recurrent_invoices.php index becc9fd2..70ac0151 100644 --- a/sales/manage/recurrent_invoices.php +++ b/sales/manage/recurrent_invoices.php @@ -1,6 +1,14 @@ . +***********************************************************************/ $page_security = 3; $path_to_root="../.."; include($path_to_root . "/includes/session.inc"); @@ -14,7 +22,6 @@ if ($use_date_picker) page(_("Recurrent Invoices"), false, false, "", $js); - simple_page_mode(true); if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM') @@ -124,7 +131,7 @@ while ($myrow = db_fetch($result)) label_cell($end); label_cell($last_sent); edit_button_cell("Edit".$myrow["id"], _("Edit")); - edit_button_cell("Delete".$myrow["id"], _("Delete")); + delete_button_cell("Delete".$myrow["id"], _("Delete")); end_row(); } end_table(); @@ -136,7 +143,7 @@ echo '
'; start_form(); -start_table("$table_style2 width=40%"); +start_table($table_style2); if ($selected_id != -1) { diff --git a/sales/manage/sales_areas.php b/sales/manage/sales_areas.php index 2f350ab8..e1a54301 100644 --- a/sales/manage/sales_areas.php +++ b/sales/manage/sales_areas.php @@ -1,6 +1,14 @@ . +***********************************************************************/ $page_security = 3; $path_to_root="../.."; include($path_to_root . "/includes/session.inc"); @@ -78,7 +86,7 @@ $sql = "SELECT * FROM ".TB_PREF."areas"; $result = db_query($sql,"could not get areas"); start_form(); -start_table("$table_style width=40%"); +start_table("$table_style width=30%"); $th = array(_("Area Name"), "", ""); table_header($th); $k = 0; @@ -90,7 +98,7 @@ while ($myrow = db_fetch($result)) label_cell($myrow["description"]); edit_button_cell("Edit".$myrow["area_code"], _("Edit")); - edit_button_cell("Delete".$myrow["area_code"], _("Delete")); + delete_button_cell("Delete".$myrow["area_code"], _("Delete")); end_row(); } @@ -103,7 +111,7 @@ echo '
'; start_form(); -start_table("$table_style2 width=40%"); +start_table($table_style2); if ($selected_id != -1) { diff --git a/sales/manage/sales_groups.php b/sales/manage/sales_groups.php index 1e165779..f2c4126f 100644 --- a/sales/manage/sales_groups.php +++ b/sales/manage/sales_groups.php @@ -1,6 +1,14 @@ . +***********************************************************************/ $page_security = 3; $path_to_root="../.."; include($path_to_root . "/includes/session.inc"); @@ -78,7 +86,7 @@ $sql = "SELECT * FROM ".TB_PREF."groups ORDER BY description"; $result = db_query($sql,"could not get groups"); start_form(); -start_table("$table_style width=40%"); +start_table("$table_style width=30%"); $th = array(_("Group Name"), "", ""); table_header($th); $k = 0; @@ -90,7 +98,7 @@ while ($myrow = db_fetch($result)) label_cell($myrow["description"]); edit_button_cell("Edit".$myrow["id"], _("Edit")); - edit_button_cell("Delete".$myrow["id"], _("Delete")); + delete_button_cell("Delete".$myrow["id"], _("Delete")); end_row(); } @@ -103,7 +111,7 @@ echo '
'; start_form(); -start_table("$table_style2 width=40%"); +start_table($table_style2); if ($selected_id != -1) { diff --git a/sales/manage/sales_people.php b/sales/manage/sales_people.php index aef3ad25..bf4899e5 100644 --- a/sales/manage/sales_people.php +++ b/sales/manage/sales_people.php @@ -171,7 +171,7 @@ if ($selected_id != -1) $_POST['provision2'] = percent_format(0); } -start_table("$table_style2 width=60%"); +start_table($table_style2); text_row_ex(_("Sales person name:"), 'salesman_name', 30); text_row_ex(_("Telephone number:"), 'salesman_phone', 20); diff --git a/sales/manage/sales_points.php b/sales/manage/sales_points.php index 7aaac358..6ad6086e 100644 --- a/sales/manage/sales_points.php +++ b/sales/manage/sales_points.php @@ -1,5 +1,14 @@ . +***********************************************************************/ $page_security = 15; $path_to_root="../.."; include_once($path_to_root . "/includes/session.inc"); @@ -86,7 +95,7 @@ while ($myrow = db_fetch($result)) label_cell($myrow["location_name"], ""); label_cell($myrow["bank_account_name"], ""); edit_button_cell("Edit".$myrow['id'], _("Edit")); - edit_button_cell("Delete".$myrow['id'], _("Delete")); + delete_button_cell("Delete".$myrow['id'], _("Delete")); end_row(); } @@ -97,7 +106,7 @@ echo '
'; start_form(); -start_table("$table_style2 width=30%"); +start_table($table_style2); if ($selected_id != -1) { diff --git a/sales/manage/sales_types.php b/sales/manage/sales_types.php index a99c322b..4365a78e 100644 --- a/sales/manage/sales_types.php +++ b/sales/manage/sales_types.php @@ -1,5 +1,14 @@ . +***********************************************************************/ $page_security = 14; $path_to_root="../.."; include_once($path_to_root . "/includes/session.inc"); @@ -117,7 +126,7 @@ while ($myrow = db_fetch($result)) label_cell($f); label_cell($myrow["tax_included"] ? _('Yes'):_('No'), 'align=center'); edit_button_cell("Edit".$myrow['id'], _("Edit")); - edit_button_cell("Delete".$myrow['id'], _("Delete")); + delete_button_cell("Delete".$myrow['id'], _("Delete")); end_row(); } @@ -133,7 +142,7 @@ start_form(); if (!isset($_POST['base'])) $_POST['base'] = 0; -start_table("$table_style2 width=30%"); +start_table($table_style2); if ($selected_id != -1) { diff --git a/update.html b/update.html index 0b3ba9ca..17f61576 100644 --- a/update.html +++ b/update.html @@ -48,7 +48,7 @@ process earlier).
  • When updating release 2.0.X to release 2.1.X, you must immediately, after login (admin), go to the 'Setup' tab and run 'Software Upgrade'. -Mark the checkbox 'Force upgrade' and press 'Upgrade System'.  This will upgrade ALL your companies.
  • There are no database changes during a major and minor release. Like from 2.1 to 2.1.1 - 2.1.5 .
    • +Mark the checkbox 'Install' and press 'Upgrade System'.  This will upgrade ALL your companies.
  • If something goes wrong during upgrade, you can enter here again and try 'Force Upgrade', and press 'Upgrade System' again.
  • There are no database changes during a major and minor release. Like from 2.1 to 2.1.1 - 2.1.5 .

    •