From 795cb201893b54ea61d93b74b20fa09df515c310 Mon Sep 17 00:00:00 2001 From: Joe Hunt Date: Thu, 15 Jan 2009 22:20:40 +0000 Subject: [PATCH] Adjustment of db pager width. Copyright notes. --- CHANGELOG.txt | 4 ++ dimensions/inquiry/search_dimensions.php | 1 + gl/bank_account_reconcile.php | 1 + manufacturing/inquiry/where_used_inquiry.php | 12 ++++- manufacturing/search_work_orders.php | 1 + .../allocations/supplier_allocation_main.php | 1 + purchasing/inquiry/po_search.php | 1 + purchasing/inquiry/po_search_completed.php | 1 + .../inquiry/supplier_allocation_inquiry.php | 3 +- purchasing/inquiry/supplier_inquiry.php | 12 ++++- .../allocations/customer_allocation_main.php | 1 + sales/inquiry/customer_allocation_inquiry.php | 3 +- sales/inquiry/customer_inquiry.php | 2 + sales/inquiry/sales_deliveries_view.php | 4 +- sales/inquiry/sales_orders_view.php | 1 + sql/en_US-demo.sql | 44 +++++++++---------- sql/en_US-new.sql | 2 +- update.html | 4 +- 18 files changed, 67 insertions(+), 31 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index ea38e5f5..3e8b25d1 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -19,6 +19,10 @@ Legend: ! -> Note $ -> Affected files +15-Jan-2009 Joe Hunt +! Adjustment of db pager width. Copyright notes. +$ All files with db pager + 15-Jan-2009 Janusz Dobrowolski ! Rewritten reconciliation page. $ /gl/bank_account_reconcile.php diff --git a/dimensions/inquiry/search_dimensions.php b/dimensions/inquiry/search_dimensions.php index 480e7094..ab4d804e 100644 --- a/dimensions/inquiry/search_dimensions.php +++ b/dimensions/inquiry/search_dimensions.php @@ -189,6 +189,7 @@ if (get_post('SearchOrders')) { $table->set_sql($sql); $table->set_columns($cols); } +$table->width = "80%"; start_form(); display_db_pager($table); diff --git a/gl/bank_account_reconcile.php b/gl/bank_account_reconcile.php index 51603f69..2920af3a 100644 --- a/gl/bank_account_reconcile.php +++ b/gl/bank_account_reconcile.php @@ -267,6 +267,7 @@ display_heading($act['bank_account_name']." - ".$act['bank_curr_code']); $table->set_sql($sql); $table->set_columns($cols); } + $table->width = "60%"; display_db_pager($table); br(1); diff --git a/manufacturing/inquiry/where_used_inquiry.php b/manufacturing/inquiry/where_used_inquiry.php index bd9aa64d..3439fa40 100644 --- a/manufacturing/inquiry/where_used_inquiry.php +++ b/manufacturing/inquiry/where_used_inquiry.php @@ -1,5 +1,14 @@ . +***********************************************************************/ $page_security = 2; $path_to_root="../.."; include($path_to_root . "/includes/db_pager.inc"); @@ -55,6 +64,7 @@ $table =& new_db_pager('usage_table', $sql, $cols); if (get_post('_stock_id_update')) $table->set_sql($sql); +$table->width = "80%"; display_db_pager($table); end_form(); diff --git a/manufacturing/search_work_orders.php b/manufacturing/search_work_orders.php index 94100133..921783db 100644 --- a/manufacturing/search_work_orders.php +++ b/manufacturing/search_work_orders.php @@ -214,6 +214,7 @@ if (get_post('SearchOrders')) { $table->set_sql($sql); $table->set_columns($cols); } +$table->width = "90%"; start_form(); display_db_pager($table); diff --git a/purchasing/allocations/supplier_allocation_main.php b/purchasing/allocations/supplier_allocation_main.php index e10436b5..e58582f7 100644 --- a/purchasing/allocations/supplier_allocation_main.php +++ b/purchasing/allocations/supplier_allocation_main.php @@ -128,6 +128,7 @@ if (get_post('_ShowSettled_update') || get_post('_supplier_id_update') ) { $table->set_sql($sql); $table->set_columns($cols); } +$table->width = "80%"; start_form(); display_db_pager($table); diff --git a/purchasing/inquiry/po_search.php b/purchasing/inquiry/po_search.php index 659726fe..792170c5 100644 --- a/purchasing/inquiry/po_search.php +++ b/purchasing/inquiry/po_search.php @@ -193,6 +193,7 @@ if (get_post('SearchOrders')) { $table->set_sql($sql); $table->set_columns($cols); } +$table->width = "80%"; start_form(); display_db_pager($table); diff --git a/purchasing/inquiry/po_search_completed.php b/purchasing/inquiry/po_search_completed.php index cacc3bae..905fdc00 100644 --- a/purchasing/inquiry/po_search_completed.php +++ b/purchasing/inquiry/po_search_completed.php @@ -166,6 +166,7 @@ if (get_post('SearchOrders')) { $table->set_sql($sql); $table->set_columns($cols); } +$table->width = "80%"; start_form(); display_db_pager($table); diff --git a/purchasing/inquiry/supplier_allocation_inquiry.php b/purchasing/inquiry/supplier_allocation_inquiry.php index f0320546..0216392f 100644 --- a/purchasing/inquiry/supplier_allocation_inquiry.php +++ b/purchasing/inquiry/supplier_allocation_inquiry.php @@ -171,7 +171,7 @@ function fmt_credit($row) $cols = array( _("Type") => array('fun'=>'systype_name'), - _("Number") => array('fun'=>'view_link', 'ord'=>''), + _("#") => array('fun'=>'view_link', 'ord'=>''), _("Reference"), _("Supplier") => array('ord'=>''), _("Supp Reference"), @@ -198,6 +198,7 @@ if (get_post('RefreshInquiry')) { $table->set_sql($sql); $table->set_columns($cols); } +$table->width = "90%"; start_form(); display_db_pager($table); diff --git a/purchasing/inquiry/supplier_inquiry.php b/purchasing/inquiry/supplier_inquiry.php index c00b0613..a2f18aaa 100644 --- a/purchasing/inquiry/supplier_inquiry.php +++ b/purchasing/inquiry/supplier_inquiry.php @@ -1,5 +1,14 @@ . +***********************************************************************/ $page_security=2; $path_to_root="../.."; include($path_to_root . "/includes/db_pager.inc"); @@ -227,6 +236,7 @@ if (get_post('RefreshInquiry')) { $table->set_sql($sql); $table->set_columns($cols); } +$table->width = "85%"; start_form(); display_db_pager($table); diff --git a/sales/allocations/customer_allocation_main.php b/sales/allocations/customer_allocation_main.php index 5f5482f9..3489004d 100644 --- a/sales/allocations/customer_allocation_main.php +++ b/sales/allocations/customer_allocation_main.php @@ -123,6 +123,7 @@ if (get_post('_ShowSettled_update') || get_post('_customer_id_update')) { $table->set_sql($sql); $table->set_columns($cols); } +$table->width = "75%"; display_db_pager($table); end_form(); diff --git a/sales/inquiry/customer_allocation_inquiry.php b/sales/inquiry/customer_allocation_inquiry.php index 4e4a341c..d7a02dc6 100644 --- a/sales/inquiry/customer_allocation_inquiry.php +++ b/sales/inquiry/customer_allocation_inquiry.php @@ -200,7 +200,7 @@ function fmt_credit($row) $cols = array( _("Type") => array('fun'=>'systype_name'), - _("Number") => array('fun'=>'view_link'), + _("#") => array('fun'=>'view_link'), _("Reference"), _("Order") => array('fun'=>'order_link'), _("Date") => array('type'=>'date', 'ord'=>'asc'), @@ -226,6 +226,7 @@ if (get_post('RefreshInquiry')) { $table->set_sql($sql); $table->set_columns($cols); } +$table->width = "80%"; start_form(); display_db_pager($table); diff --git a/sales/inquiry/customer_inquiry.php b/sales/inquiry/customer_inquiry.php index 24f31483..8e548611 100644 --- a/sales/inquiry/customer_inquiry.php +++ b/sales/inquiry/customer_inquiry.php @@ -298,6 +298,8 @@ if (get_post('RefreshInquiry')) { $table->set_sql($sql); $table->set_columns($cols); } +$table->width = "85%"; + start_form(); display_db_pager($table); diff --git a/sales/inquiry/sales_deliveries_view.php b/sales/inquiry/sales_deliveries_view.php index c1dc48f8..3cd838b6 100644 --- a/sales/inquiry/sales_deliveries_view.php +++ b/sales/inquiry/sales_deliveries_view.php @@ -237,7 +237,7 @@ $cols = array( _("Due By") => 'date', _("Delivery Total") => array('type'=>'amount', 'ord'=>''), _("Currency") => array('align'=>'center'), - submit('BatchInvoice','Batch Inv', false) + submit('BatchInvoice',_("Batch"), false, _("Batch Invoicing")) => array('insert'=>true, 'fun'=>'batch_checkbox', 'align'=>'center'), array('insert'=>true, 'fun'=>'edit_link'), array('insert'=>true, 'fun'=>'invoice_link'), @@ -259,6 +259,8 @@ if (get_post('SearchOrders')) { $table->set_sql($sql); $table->set_columns($cols); } +//$table->width = "92%"; + start_form(); display_db_pager($table); diff --git a/sales/inquiry/sales_orders_view.php b/sales/inquiry/sales_orders_view.php index abe17b41..511ba5ad 100644 --- a/sales/inquiry/sales_orders_view.php +++ b/sales/inquiry/sales_orders_view.php @@ -299,6 +299,7 @@ if (get_post('SearchOrders')) { $table->set_sql($sql); $table->set_columns($cols); } +$table->width = "80%"; start_form(); display_db_pager($table); diff --git a/sql/en_US-demo.sql b/sql/en_US-demo.sql index 80c6cb26..f2f89ab8 100644 --- a/sql/en_US-demo.sql +++ b/sql/en_US-demo.sql @@ -95,7 +95,7 @@ CREATE TABLE `0_bank_trans` ( `dimension2_id` int(11) NOT NULL default '0', `person_type_id` int(11) NOT NULL default '0', `person_id` tinyblob, - `reconciled` tinyint(1) NOT NULL default '0', + `reconciled` date default NULL, PRIMARY KEY (`id`), KEY `bank_act` (`bank_act`,`ref`), KEY `type` (`type`,`trans_no`) @@ -104,27 +104,27 @@ CREATE TABLE `0_bank_trans` ( ### Data of table `0_bank_trans` ### -INSERT INTO `0_bank_trans` VALUES ('1', '12', '2', '1', '111', '2006-01-18', '1', '5000', '0', '0', '2', '1', '0'); -INSERT INTO `0_bank_trans` VALUES ('2', '12', '3', '1', '112', '2006-01-18', '1', '240', '0', '0', '2', '2', '0'); -INSERT INTO `0_bank_trans` VALUES ('3', '12', '4', '1', '113', '2006-01-18', '1', '360', '0', '0', '2', '2', '0'); -INSERT INTO `0_bank_trans` VALUES ('4', '12', '5', '1', '114', '2006-01-18', '1', '500', '0', '0', '2', '1', '0'); -INSERT INTO `0_bank_trans` VALUES ('8', '4', '2', '1', '4', '2006-01-18', '1', '-300', '0', '0', '0', '', '0'); -INSERT INTO `0_bank_trans` VALUES ('9', '4', '2', '3', '4', '2006-01-18', '1', '250', '0', '0', '0', '', '0'); -INSERT INTO `0_bank_trans` VALUES ('10', '22', '2', '1', '1', '2006-01-18', '1', '-5000', '0', '0', '3', '1', '0'); -INSERT INTO `0_bank_trans` VALUES ('11', '22', '3', '3', '2', '2006-01-18', '1', '-3300', '0', '0', '3', '2', '0'); -INSERT INTO `0_bank_trans` VALUES ('12', '2', '2', '1', '11', '2006-01-20', '1', '1050', '0', '0', '0', '', '0'); -INSERT INTO `0_bank_trans` VALUES ('13', '12', '6', '1', '115', '2007-01-30', '1', '200', '0', '0', '2', '1', '0'); -INSERT INTO `0_bank_trans` VALUES ('15', '2', '3', '1', '12', '2007-01-30', '3', '70', '0', '0', '4', '2', '0'); -INSERT INTO `0_bank_trans` VALUES ('16', '4', '3', '1', '5', '2007-03-09', '1', '-222', '0', '0', '0', '', '0'); -INSERT INTO `0_bank_trans` VALUES ('17', '4', '3', '2', '5', '2007-03-09', '1', '222', '0', '0', '0', '', '0'); -INSERT INTO `0_bank_trans` VALUES ('18', '2', '4', '1', '13', '2007-03-09', '3', '200', '0', '0', '2', '1', '0'); -INSERT INTO `0_bank_trans` VALUES ('20', '1', '7', '1', '6', '2007-03-22', '1', '-125', '0', '0', '0', 'Gas Transport', '0'); -INSERT INTO `0_bank_trans` VALUES ('21', '12', '7', '1', '6', '2008-03-06', '1', '100', '0', '0', '2', '1', '0'); -INSERT INTO `0_bank_trans` VALUES ('22', '12', '8', '1', '7', '2008-03-06', '1', '100', '0', '0', '2', '4', '0'); -INSERT INTO `0_bank_trans` VALUES ('23', '12', '9', '1', '8', '2008-03-07', '1', '2000', '0', '0', '2', '1', '0'); -INSERT INTO `0_bank_trans` VALUES ('24', '12', '10', '1', '9', '2009-01-10', '', '1000', '0', '0', '2', '1', '0'); -INSERT INTO `0_bank_trans` VALUES ('25', '12', '11', '1', '10', '2009-01-10', '', '183.62116393597', '0', '0', '2', '3', '0'); -INSERT INTO `0_bank_trans` VALUES ('26', '22', '4', '1', '3', '2009-01-10', '', '-200', '0', '0', '3', '1', '0'); +INSERT INTO `0_bank_trans` VALUES ('1', '12', '2', '1', '111', '2006-01-18', '1', '5000', '0', '0', '2', '1', NULL); +INSERT INTO `0_bank_trans` VALUES ('2', '12', '3', '1', '112', '2006-01-18', '1', '240', '0', '0', '2', '2', NULL); +INSERT INTO `0_bank_trans` VALUES ('3', '12', '4', '1', '113', '2006-01-18', '1', '360', '0', '0', '2', '2', NULL); +INSERT INTO `0_bank_trans` VALUES ('4', '12', '5', '1', '114', '2006-01-18', '1', '500', '0', '0', '2', '1', NULL); +INSERT INTO `0_bank_trans` VALUES ('8', '4', '2', '1', '4', '2006-01-18', '1', '-300', '0', '0', '0', '', NULL); +INSERT INTO `0_bank_trans` VALUES ('9', '4', '2', '3', '4', '2006-01-18', '1', '250', '0', '0', '0', '', NULL); +INSERT INTO `0_bank_trans` VALUES ('10', '22', '2', '1', '1', '2006-01-18', '1', '-5000', '0', '0', '3', '1', NULL); +INSERT INTO `0_bank_trans` VALUES ('11', '22', '3', '3', '2', '2006-01-18', '1', '-3300', '0', '0', '3', '2', NULL); +INSERT INTO `0_bank_trans` VALUES ('12', '2', '2', '1', '11', '2006-01-20', '1', '1050', '0', '0', '0', '', NULL); +INSERT INTO `0_bank_trans` VALUES ('13', '12', '6', '1', '115', '2007-01-30', '1', '200', '0', '0', '2', '1', NULL); +INSERT INTO `0_bank_trans` VALUES ('15', '2', '3', '1', '12', '2007-01-30', '3', '70', '0', '0', '4', '2', NULL); +INSERT INTO `0_bank_trans` VALUES ('16', '4', '3', '1', '5', '2007-03-09', '1', '-222', '0', '0', '0', '', NULL); +INSERT INTO `0_bank_trans` VALUES ('17', '4', '3', '2', '5', '2007-03-09', '1', '222', '0', '0', '0', '', NULL); +INSERT INTO `0_bank_trans` VALUES ('18', '2', '4', '1', '13', '2007-03-09', '3', '200', '0', '0', '2', '1', NULL); +INSERT INTO `0_bank_trans` VALUES ('20', '1', '7', '1', '6', '2007-03-22', '1', '-125', '0', '0', '0', 'Gas Transport', NULL); +INSERT INTO `0_bank_trans` VALUES ('21', '12', '7', '1', '6', '2008-03-06', '1', '100', '0', '0', '2', '1', NULL); +INSERT INTO `0_bank_trans` VALUES ('22', '12', '8', '1', '7', '2008-03-06', '1', '100', '0', '0', '2', '4', NULL); +INSERT INTO `0_bank_trans` VALUES ('23', '12', '9', '1', '8', '2008-03-07', '1', '2000', '0', '0', '2', '1', NULL); +INSERT INTO `0_bank_trans` VALUES ('24', '12', '10', '1', '9', '2009-01-10', '', '1000', '0', '0', '2', '1', NULL); +INSERT INTO `0_bank_trans` VALUES ('25', '12', '11', '1', '10', '2009-01-10', '', '183.62116393597', '0', '0', '2', '3', NULL); +INSERT INTO `0_bank_trans` VALUES ('26', '22', '4', '1', '3', '2009-01-10', '', '-200', '0', '0', '3', '1', NULL); ### Structure of table `0_bom` ### diff --git a/sql/en_US-new.sql b/sql/en_US-new.sql index c43ff5b4..91905a1e 100644 --- a/sql/en_US-new.sql +++ b/sql/en_US-new.sql @@ -91,7 +91,7 @@ CREATE TABLE `0_bank_trans` ( `dimension2_id` int(11) NOT NULL default '0', `person_type_id` int(11) NOT NULL default '0', `person_id` tinyblob, - `reconciled` tinyint(1) NOT NULL default '0', + `reconciled` date default NULL, PRIMARY KEY (`id`), KEY `bank_act` (`bank_act`,`ref`), KEY `type` (`type`,`trans_no`) diff --git a/update.html b/update.html index cd68f0e9..0b3ba9ca 100644 --- a/update.html +++ b/update.html @@ -48,9 +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'.  If -you have more companies, you must logout and login on every company and -do the same procedure.
  • 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 '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 .

    •  

    -- 2.30.2