Adjustment of db pager width. Copyright notes.

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index ea38e5f515e0cef397b0756ec2dd0f476b016cba..3e8b25d171de31bb4d6d7c5d7972190bc33b0600 100644 (file)
--- 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 480e7094281db68ad193e1d823f5b155d525d33b..ab4d804e690a8d300d114bb15b4c14a8b3b34640 100644 (file)
--- 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 51603f6998feafe5a35136c6022465cab6dc87ec..2920af3a2c2d845d961cc3f9b19000387ad4a5e0 100644 (file)
--- 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 bd9aa64d9e76e896580a8fc38deaa6194753bb0b..3439fa40c026c731c9780d1a662c06e068e1c41a 100644 (file)
--- a/manufacturing/inquiry/where_used_inquiry.php
+++ b/manufacturing/inquiry/where_used_inquiry.php
@@ -1,5 +1,14 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+       Released under the terms of the GNU Affero General Public License,
+       AGPL, as published by the Free Software Foundation, either version 
+       3 of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/agpl-3.0.html>.
+***********************************************************************/
 $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 94100133d0521844a53f6102310ebdc7872ea2cb..921783db20f25f2988a5dcf8c71d9ee1975cd7d0 100644 (file)
--- 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 e10436b5e58b473df3c144023079bb1cc9b126c7..e58582f7dadb735f946723ea0724e09d680a299c 100644 (file)
--- 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 659726fedd1776e24b5aa09358c5dc71beb5d222..792170c5384d35cd2a03edc3678e888e5f5abea5 100644 (file)
--- 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 cacc3baee41b5fa5d9bdb64a2474b7f003e0a429..905fdc00fc74e2f5ad276662724db7c759154a77 100644 (file)
--- 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 f03205467b6c99d5807a6d3d02e533e13aa75f5e..0216392f6d2624a3c2ebff68c73330d778456b1f 100644 (file)
--- 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 c00b0613d05d90052d4d63d3014c47b69d8c3672..a2f18aaae665930f784b98251649f9e338a6ad40 100644 (file)
--- a/purchasing/inquiry/supplier_inquiry.php
+++ b/purchasing/inquiry/supplier_inquiry.php
@@ -1,5 +1,14 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+       Released under the terms of the GNU Affero General Public License,
+       AGPL, as published by the Free Software Foundation, either version 
+       3 of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/agpl-3.0.html>.
+***********************************************************************/
 $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 5f5482f9fe6565b749c0650a972bdd9e11253c7c..3489004d87ce44e4854e38010bb3c8582a0690bf 100644 (file)
--- 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 4e4a341c58168996889e76e061d213f55510b62b..d7a02dc6f5e44d7461a8be01acc3bed2b318f89a 100644 (file)
--- 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 24f3148300c3057d1a2fefca48e61032823f6155..8e54861131eda0a8ae0ddfb321a8a01ea6887876 100644 (file)
--- 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 c1dc48f8e859939109a13b160738c4100611ea44..3cd838b623f480d49fa3425c938186d22cc8174c 100644 (file)
--- 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 abe17b41b17b94c00d45f0c25895efbf2783ea08..511ba5ad490fc5b5499c32cbd235bd03cf160357 100644 (file)
--- 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 80c6cb26fd016332582003afd18b50f534ddb512..f2f89ab8b32efff1bdc6e3830dd3a8035e66d26e 100644 (file)
--- 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 c43ff5b4e3bbc1bae9f7854a23cfd893dbcd4b8d..91905a1e2dd0e8de1f6e74e12eb0d931b71dffb2 100644 (file)
--- 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 cd68f0e958171417c219425455c6650822cf6385..0b3ba9ca2141edb3c45667a06be009de01f86a8d 100644 (file)
--- a/update.html
+++ b/update.html
@@ -48,9 +48,7 @@ process earlier). </li>
   </li><li><strong>When
 updating release&nbsp;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'. &nbsp;If
-you have more companies, you must logout and login on every company and
-do the same procedure.</strong></li><li><strong></strong><strong>There are no database changes during a major and minor release. Like from 2.1 to 2.1.1 - 2.1.5 .</strong></li>
+Mark the checkbox 'Force upgrade' and press 'Upgrade System'. &nbsp;This will upgrade ALL your companies.</strong></li><li><strong></strong><strong>There are no database changes during a major and minor release. Like from 2.1 to 2.1.1 - 2.1.5 .</strong></li>
 </ul>
 
 <p>&nbsp;</p>