Next fixes to db_pager usage/behaviour.

diff --git a/dimensions/inquiry/search_dimensions.php b/dimensions/inquiry/search_dimensions.php
index 547493309dd2ec0078dac43f680fdf72475fdfe5..ceb7c4e0eab7e62668b9d9256480f28b039f13c6 100644 (file)
--- a/dimensions/inquiry/search_dimensions.php
+++ b/dimensions/inquiry/search_dimensions.php
@@ -176,6 +176,10 @@ if ($outstanding_only) {
 $table =& new_db_pager('dim_tbl', $sql, $cols);
 $table->set_marker('is_overdue', _("Marked dimensions are overdue."));
 
+if (get_post('SearchOrders')) {
+       $table->set_sql($sql);
+       $table->set_columns($cols);
+}
 start_form();
 
 display_db_pager($table);

diff --git a/includes/db_pager.inc b/includes/db_pager.inc
index 90f61ec347908c6a2aadd039e8799f980273b86d..328a424f76e0c6a442c903228ea8115735aecae1 100644 (file)
--- a/includes/db_pager.inc
+++ b/includes/db_pager.inc
@@ -375,12 +375,13 @@ function &new_db_pager($name, $sql, $coldef, $page_len = 0)  {
     if ($_SERVER['REQUEST_METHOD'] == 'GET')
                unset($_SESSION[$name]); // kill old pager if any exists on first page call
 
-       if (!isset($_SESSION[$name]))
+       if (!isset($_SESSION[$name])) {
            $_SESSION[$name] =& new db_pager($sql, $name, $page_len);
+               $_SESSION[$name]->set_sql($sql);
+               $_SESSION[$name]->set_columns($coldef);
+       }
        
        $ret = &$_SESSION[$name];
-    $ret->set_sql($sql);
-    $ret->set_columns($coldef);
 
     return $ret;
 }

diff --git a/includes/ui/db_pager_view.inc b/includes/ui/db_pager_view.inc
index 67b3ea4760d0ff4b63362fdfdf14bb8f14e18142..d44902417dcc99e3910def8b7e4a131229b96bfa 100644 (file)
--- a/includes/ui/db_pager_view.inc
+++ b/includes/ui/db_pager_view.inc
@@ -104,7 +104,10 @@ function display_db_pager(&$pager) {
                          else
                                amount_cell($cell, false); break;
                    case 'qty':
-                         qty_cell($cell); break;
+                         if ($cell=='')
+                               label_cell('');
+                         else
+                               qty_cell($cell, false, isset($col['dec']) ? $col['dec'] : null); break;
                    case 'rate':
                          rate_cell($cell);  break;
                    default:

diff --git a/inventory/inquiry/stock_movements.php b/inventory/inquiry/stock_movements.php
index 52b2aa1fb7dd75e76f197b8d4e5a21602d444d16..1731e7bfe911f55ef30794957b1f75749c966af4 100644 (file)
--- a/inventory/inquiry/stock_movements.php
+++ b/inventory/inquiry/stock_movements.php
@@ -76,7 +76,6 @@ function get_summary(&$table)
        $sum['dec'] = $item_dec = get_qty_dec($_POST['stock_id']);
 
        $table->sum = $sum;
-       $Ajax->activate('summary');
  }
 //-----------------------------------------------------------------------------
 
@@ -157,12 +156,12 @@ function before_status($pager)
                .':'."</b>", "align='right' colspan=5");
        if($pager->sum['beg']>=0) {
                $r[] = array (number_format2($pager->sum['beg'], $pager->sum['dec']),
-               "align='right'");
+                       "align='right'");
                $r[] = array("&nbsp;");
        } else {
                $r[] = array("&nbsp;");
                $r[] = array (number_format2($pager->sum['beg'], $pager->sum['dec']),
-               "align='right'");
+                       "align='right'");
        }
        return $r;
 }
@@ -174,12 +173,12 @@ function after_status($pager)
                .':'."</b>", "align='right' colspan=5");
        if($pager->sum['end']>=0) {
                $r[] = array (number_format2($pager->sum['end'], $pager->sum['dec']),
-               "align='right'");
-               $r[] = array("&nbsp;", "colspan=2");
+                       "align='right'");
+               $r[] = array("&nbsp;");
        } else {
-               $r[] = array("&nbsp;", "colspan=2");
+               $r[] = array("&nbsp;");
                $r[] = array (number_format2($pager->sum['end'], $pager->sum['dec']),
-               "align='right'");
+                       "align='right'");
        }
        return $r;
 }
@@ -207,8 +206,8 @@ $cols = array(
        _("Reference"), 
        _("Date") => array('date', 'ord'=>'desc'), 
        _("Detail") => array('fun'=>'show_details' ), 
-       _("Quantity In") => array('type'=>'amount', 'dec'=> $item_dec, 'insert'=>true,'fun'=>'qty_in' ),
-       _("Quantity Out") => array('type'=>'amount', 'dec'=> $item_dec,'insert'=>true,'fun'=>'qty_out' ), 
+       _("Quantity In") => array('type'=>'qty', 'dec'=> $item_dec, 'insert'=>true,'fun'=>'qty_in' ),
+       _("Quantity Out") => array('type'=>'qty', 'dec'=> $item_dec,'insert'=>true,'fun'=>'qty_out' ), 
 //     _("Quantity On Hand") => array('insert'=>true,'type'=>'amount', 'fun'=>'show_qoh' )
 );
 
@@ -217,8 +216,12 @@ $table->set_header('before_status');
 $table->set_footer('after_status');
 
 if (!$table->ready)  // new sql query - update summary
-       get_summary(&$table);
+       get_summary($table);
 
+if (get_post('ShowMoves')) {
+       $table->set_sql($sql);
+       $table->set_columns($cols);
+}
 start_form();
 
 display_db_pager($table);

diff --git a/manufacturing/inquiry/where_used_inquiry.php b/manufacturing/inquiry/where_used_inquiry.php
index 2c3f876ae8187bac5b5ad905aa398e66eff199d9..bd9aa64d9e76e896580a8fc38deaa6194753bb0b 100644 (file)
--- a/manufacturing/inquiry/where_used_inquiry.php
+++ b/manufacturing/inquiry/where_used_inquiry.php
@@ -52,6 +52,9 @@ $sql = "SELECT
 
 $table =& new_db_pager('usage_table', $sql, $cols);
 
+if (get_post('_stock_id_update'))
+       $table->set_sql($sql);
+
 display_db_pager($table);
 
 end_form();

diff --git a/manufacturing/search_work_orders.php b/manufacturing/search_work_orders.php
index 70f297887a044f7766ff6ec9cdae5b5017221cb8..cff20c0500862255abac865f001055fd85a4e12b 100644 (file)
--- a/manufacturing/search_work_orders.php
+++ b/manufacturing/search_work_orders.php
@@ -201,6 +201,10 @@ $cols = array(
 $table =& new_db_pager('orders_tbl', $sql, $cols);
 $table->set_marker('check_overdue', _("Marked orders are overdue."));
 
+if (get_post('SearchOrders')) {
+       $table->set_sql($sql);
+       $table->set_columns($cols);
+}
 start_form();
 
 display_db_pager($table);

diff --git a/purchasing/allocations/supplier_allocation_main.php b/purchasing/allocations/supplier_allocation_main.php
index b7cfb1a5453cb6f02e0c44be83694dfd24744da2..b52f9ada86018edd000c88dc19f89e14790dc8bd 100644 (file)
--- a/purchasing/allocations/supplier_allocation_main.php
+++ b/purchasing/allocations/supplier_allocation_main.php
@@ -44,8 +44,7 @@ start_form();
     echo "<br>";
     check(_("Show Settled Items:"), 'ShowSettled', null, true);
        echo "</center><br><br>";
-
-end_form();
+       end_form();
        set_global_supplier($_POST['supplier_id']);
 
        if (isset($_POST['supplier_id']) && ($_POST['supplier_id'] == reserved_words::get_all())) 
@@ -119,13 +118,11 @@ $table->set_marker('check_settled', _("Marked items are settled."), 'settledbg',
 if (get_post('_ShowSettled_update') || get_post('_supplier_id_update') ) {
        $table->set_sql($sql);
        $table->set_columns($cols);
-       $Ajax->activate('alloc_tbl');
 }
+start_form();
 
-       start_form();
-       display_db_pager($table);
-       end_form();
-end_page();
-
+display_db_pager($table);
 
+end_form();
+end_page();
 ?>
\ No newline at end of file

diff --git a/purchasing/inquiry/po_search.php b/purchasing/inquiry/po_search.php
index 3427e101555478a6ead27a800b7d39e3feaa1481..753fe2ff0f4ebabbd7c6742c3540fc7333d70126 100644 (file)
--- a/purchasing/inquiry/po_search.php
+++ b/purchasing/inquiry/po_search.php
@@ -62,9 +62,7 @@ stock_items_list_cells(_("Item:"), 'SelectStockFromList', null, true);
 submit_cells('SearchOrders', _("Search"),'',_('Select documents'), true);
 end_row();
 end_table();
-
 end_form();
-
 //---------------------------------------------------------------------------------------------
 function trans_view($trans)
 {
@@ -182,6 +180,10 @@ if (get_post('StockLocation') != $all_items) {
 $table =& new_db_pager('orders_tbl', $sql, $cols);
 $table->set_marker('check_overdue', _("Marked orders have overdue items."));
 
+if (get_post('SearchOrders')) {
+       $table->set_sql($sql);
+       $table->set_columns($cols);
+}
 start_form();
 
 display_db_pager($table);

diff --git a/purchasing/inquiry/po_search_completed.php b/purchasing/inquiry/po_search_completed.php
index 0fddf251604ef6532069c6c13f59dd84e85007cb..56945c6bc8ea37aee139e5bd4aec78d8f8b814e2 100644 (file)
--- a/purchasing/inquiry/po_search_completed.php
+++ b/purchasing/inquiry/po_search_completed.php
@@ -60,9 +60,7 @@ stock_items_list_cells(_("for item:"), 'SelectStockFromList', null, true);
 submit_cells('SearchOrders', _("Search"),'',_('Select documents'), true);
 end_row();
 end_table();
-
 end_form();
-
 //---------------------------------------------------------------------------------------------
 if (isset($_POST['order_number']))
 {
@@ -155,6 +153,10 @@ if (get_post('StockLocation') != $all_items) {
 
 $table =& new_db_pager('orders_tbl', $sql, $cols);
 
+if (get_post('SearchOrders')) {
+       $table->set_sql($sql);
+       $table->set_columns($cols);
+}
 start_form();
 
 display_db_pager($table);

diff --git a/purchasing/inquiry/supplier_allocation_inquiry.php b/purchasing/inquiry/supplier_allocation_inquiry.php
index b9f7a8417ee3846773c4fccdf4c1c73712ccf080..ee78a35271f1c4017e39aecd8df1730940c7aa94 100644 (file)
--- a/purchasing/inquiry/supplier_allocation_inquiry.php
+++ b/purchasing/inquiry/supplier_allocation_inquiry.php
@@ -185,6 +185,10 @@ if ($_POST['supplier_id'] != reserved_words::get_all()) {
 $table =& new_db_pager('doc_tbl', $sql, $cols);
 $table->set_marker('check_overdue', _("Marked items are overdue."));
 
+if (get_post('RefreshInquiry')) {
+       $table->set_sql($sql);
+       $table->set_columns($cols);
+}
 start_form();
 
 display_db_pager($table);

diff --git a/purchasing/inquiry/supplier_inquiry.php b/purchasing/inquiry/supplier_inquiry.php
index d65e3b81a104966d3e7c89b3d81b41f1deca1789..e2f237db9b1a3506ea133292053529771e4fed4e 100644 (file)
--- a/purchasing/inquiry/supplier_inquiry.php
+++ b/purchasing/inquiry/supplier_inquiry.php
@@ -45,9 +45,7 @@ submit_cells('RefreshInquiry', _("Search"),'',_('Refresh Inquiry'), true);
 
 end_row();
 end_table();
-
 end_form();
-
 set_global_supplier($_POST['supplier_id']);
 
 //------------------------------------------------------------------------------------------------
@@ -215,6 +213,10 @@ if ($_POST['supplier_id'] != reserved_words::get_all())
 $table =& new_db_pager('trans_tbl', $sql, $cols);
 $table->set_marker('check_overdue', _("Marked items are overdue."));
 
+if (get_post('RefreshInquiry')) {
+       $table->set_sql($sql);
+       $table->set_columns($cols);
+}
 start_form();
 
 display_db_pager($table);

diff --git a/sales/allocations/customer_allocation_main.php b/sales/allocations/customer_allocation_main.php
index b0c3c6dedfa08bd8d0146dc2ee048df8ca8db1b3..4ba875bd9524161fa9ab081e0223281a28cbe007 100644 (file)
--- a/sales/allocations/customer_allocation_main.php
+++ b/sales/allocations/customer_allocation_main.php
@@ -38,8 +38,6 @@ start_form();
     check(_("Show Settled Items:"), 'ShowSettled', null, true);
        echo "</center><br><br>";
 
-end_form();
-
        set_global_customer($_POST['customer_id']);
 
        if (isset($_POST['customer_id']) && ($_POST['customer_id'] == reserved_words::get_all()))
@@ -116,12 +114,10 @@ $table->set_marker('check_settled', _("Marked items are settled."), 'settledbg',
 if (get_post('_ShowSettled_update') || get_post('_customer_id_update')) {
        $table->set_sql($sql);
        $table->set_columns($cols);
-       $Ajax->activate('alloc_tbl');
 }
 
-       start_form();
-       display_db_pager($table);
-       end_form();
-end_page();
+display_db_pager($table);
+end_form();
 
+end_page();
 ?>
\ No newline at end of file

diff --git a/sales/inquiry/customer_allocation_inquiry.php b/sales/inquiry/customer_allocation_inquiry.php
index 410678326d8514193ccdf6c2580eaff7701460e2..dde0a8a535e9fc77d1b1dcfece5a25946ecfa104 100644 (file)
--- a/sales/inquiry/customer_allocation_inquiry.php
+++ b/sales/inquiry/customer_allocation_inquiry.php
@@ -46,7 +46,6 @@ set_global_customer($_POST['customer_id']);
 end_row();
 end_table();
 end_form();
-
 //------------------------------------------------------------------------------------------------
 function check_overdue($row)
 {
@@ -214,6 +213,10 @@ if ($_POST['customer_id'] != reserved_words::get_all()) {
 $table =& new_db_pager('doc_tbl', $sql, $cols);
 $table->set_marker('check_overdue', _("Marked items are overdue."));
 
+if (get_post('RefreshInquiry')) {
+       $table->set_sql($sql);
+       $table->set_columns($cols);
+}
 start_form();
 
 display_db_pager($table);

diff --git a/sales/inquiry/customer_inquiry.php b/sales/inquiry/customer_inquiry.php
index 87ea76ecca9da474dd587e6002c8d2c65705e550..52b82ef92f54cb43eee991548a366a9ff039dbca 100644 (file)
--- a/sales/inquiry/customer_inquiry.php
+++ b/sales/inquiry/customer_inquiry.php
@@ -45,9 +45,7 @@ cust_allocations_list_cells(null, 'filterType', $_POST['filterType'], true);
 submit_cells('RefreshInquiry', _("Search"),'',_('Refresh Inquiry'), true);
 end_row();
 end_table();
-
 end_form();
-
 set_global_customer($_POST['customer_id']);
 
 //------------------------------------------------------------------------------------------------
@@ -82,7 +80,7 @@ function display_customer_summary($customer_record)
        amount_cell($customer_record["Balance"]);
        end_row();
 
-       end_table();;
+       end_table();
 }
 //------------------------------------------------------------------------------------------------
 
@@ -280,9 +278,11 @@ if ($_POST['customer_id'] != reserved_words::get_all()) {
 $table =& new_db_pager('trans_tbl', $sql, $cols);
 $table->set_marker('check_overdue', _("Marked items are overdue."));
 
-
+if (get_post('RefreshInquiry')) {
+       $table->set_sql($sql);
+       $table->set_columns($cols);
+}
 start_form();
-
 display_db_pager($table);
 
 end_form();

diff --git a/sales/inquiry/sales_deliveries_view.php b/sales/inquiry/sales_deliveries_view.php
index 794378b5c0bc97cc8ede37ec88d713a8a825c977..d55bc0812ded960e883b6839e2f60d71570d801a 100644 (file)
--- a/sales/inquiry/sales_deliveries_view.php
+++ b/sales/inquiry/sales_deliveries_view.php
@@ -106,7 +106,7 @@ hidden('OutstandingOnly', $_POST['OutstandingOnly']);
 end_row();
 
 end_table();
-
+end_form();
 //---------------------------------------------------------------------------------------------
 
 if (isset($_POST['SelectStockFromList']) && ($_POST['SelectStockFromList'] != "") &&
@@ -246,6 +246,10 @@ if (isset($_SESSION['Batch']))
 $table =& new_db_pager('deliveries_tbl', $sql, $cols);
 $table->set_marker('check_overdue', _("Marked items are overdue."));
 
+if (get_post('SearchOrders')) {
+       $table->set_sql($sql);
+       $table->set_columns($cols);
+}
 start_form();
 
 display_db_pager($table);

diff --git a/sales/inquiry/sales_orders_view.php b/sales/inquiry/sales_orders_view.php
index 5dde39a833e77e363ad6a984376a6181ce449618..aba6a1cf7703bd51578c1d72e9c910a12dad8111 100644 (file)
--- a/sales/inquiry/sales_orders_view.php
+++ b/sales/inquiry/sales_orders_view.php
@@ -185,7 +185,6 @@ end_row();
 
 end_table(1);
 end_form();
-
 //---------------------------------------------------------------------------------------------
 //     Orders inquiry table
 //
@@ -289,6 +288,10 @@ if ($_POST['order_view_mode'] == 'OutstandingOnly') {
 $table =& new_db_pager('orders_tbl', $sql, $cols);
 $table->set_marker('check_overdue', _("Marked items are overdue."));
 
+if (get_post('SearchOrders')) {
+       $table->set_sql($sql);
+       $table->set_columns($cols);
+}
 start_form();
 
 display_db_pager($table);