Fixed query table content after changed customer selector.

diff --git a/sales/inquiry/customer_allocation_inquiry.php b/sales/inquiry/customer_allocation_inquiry.php
index c16cb253405f87e918fbb0797a4304a903ebcc38..b82dda856eae43a6d0025e5d159f84dfe4ad0ccb 100644 (file)
--- a/sales/inquiry/customer_allocation_inquiry.php
+++ b/sales/inquiry/customer_allocation_inquiry.php
@@ -206,8 +206,8 @@ $cols = array(
        _("Order") => array('type'=>'spec', 'fun'=>'order_link'), 
        _("Date") => array('type'=>'date', 'ord'=>'asc'),
        _("Due Date") => array('type'=>'spec', 'fun'=>'due_date'),
-       _("Customer"), 
-       _("Currency"),
+       _("Customer") => 'text', 
+       _("Currency") => 'text',
        _("Debit") => array('type'=>'spec', 'fun'=>'fmt_debit'), 
        _("Credit") => array('type'=>'insert', 'fun'=>'fmt_credit'), 
        _("Allocated") => 'amount', 
@@ -216,7 +216,8 @@ $cols = array(
        );
 
 if ($_POST['customer_id'] != reserved_words::get_all()) {
-       array_remove($cols, 6, 2);
+       $cols[_("Customer")] = 'skip';
+       $cols[_("Currency")] = 'skip';
 }
 
 $table =& new_db_pager('doc_tbl', $sql, $cols);
@@ -226,6 +227,7 @@ $table->set_marker('check_overdue', _("Marked items are overdue."));
 if(get_post('RefreshInquiry')) 
 {
        $table->set_sql($sql);
+       $table->set_columns($cols);
        $Ajax->activate('doc_tbl');
 }
 

diff --git a/sales/inquiry/customer_inquiry.php b/sales/inquiry/customer_inquiry.php
index b9669feb858445690d27efef649999e7c8d12bd1..db516ee0c7f5e8e382011be8f1a7b8265f463dc6 100644 (file)
--- a/sales/inquiry/customer_inquiry.php
+++ b/sales/inquiry/customer_inquiry.php
@@ -116,7 +116,7 @@ function trans_view($trans)
 
 function due_date($row)
 {
-       return $row["type"] == 10 ? sql2date($row["due_date"]) : '';
+       return ($row["type"]==20 || $row["type"]==21)? sql2date($row["due_date"]) : '';
 }
 
 function fmt_balance($row)
@@ -146,6 +146,11 @@ function fmt_credit($row)
        return $value>0 ? price_format($value) : '';
 }
 
+function gl_link($row)
+{
+       return get_gl_view_str($row["type"], $row["trans_no"]);
+}
+
 function alloc_link($row)
 {
        if ($row['type'] == 10)
@@ -272,9 +277,10 @@ $cols = array(
        _("Due Date") => array('type'=>'spec', 'fun'=>'due_date'),
        _("Customer") => array('ord'=>''), 
        _("Branch") => array('ord'=>''), 
-       _("Currency"),
+       _("Currency") => 'text',
        _("Debit") => array('type'=>'spec', 'fun'=>'fmt_debit'), 
        _("Credit") => array('type'=>'insert', 'fun'=>'fmt_credit'), 
+               array('type'=>'insert', 'fun'=>'gl_view'),
                array('type'=>'insert', 'fun'=>'alloc_link'),
                array('type'=>'insert', 'fun'=>'credit_link'),
                array('type'=>'insert', 'fun'=>'edit_link'),
@@ -282,8 +288,8 @@ $cols = array(
        );
 
 if ($_POST['customer_id'] != reserved_words::get_all()) {
-       array_remove($cols, 6);
-       array_remove($cols, 8);
+       $cols[_("Customer")] = 'skip';
+       $cols[_("Currency")] = 'skip';
 }
 
 
@@ -294,6 +300,7 @@ $table->set_marker('check_overdue', _("Marked items are overdue."));
 if(get_post('RefreshInquiry'))
 {
        $table->set_sql($sql);
+       $table->set_columns($cols);
        $Ajax->activate('trans_tbl');
        $Ajax->activate('totals_tbl');
 }

diff --git a/sales/inquiry/sales_deliveries_view.php b/sales/inquiry/sales_deliveries_view.php
index 0194d5c3c2bbead0864c547eccc1e519065f5876..1d879a87df3102a68e8d43e552a5d02b18972589 100644 (file)
--- a/sales/inquiry/sales_deliveries_view.php
+++ b/sales/inquiry/sales_deliveries_view.php
@@ -256,6 +256,7 @@ $table->set_marker('check_overdue', _("Marked items are overdue."));
 if(get_post('SearchOrders')) 
 {
        $table->set_sql($sql);
+       $table->set_columns($cols);
        $Ajax->activate('doc_tbl');
 }
 

diff --git a/sales/inquiry/sales_orders_view.php b/sales/inquiry/sales_orders_view.php
index 0c9fd701a137c01f3c9b8f48741dfcdf7da02569..6d3cfee586983d96ef05fd4ec3b808d382002a70 100644 (file)
--- a/sales/inquiry/sales_orders_view.php
+++ b/sales/inquiry/sales_orders_view.php
@@ -293,6 +293,7 @@ $table->set_marker('check_overdue', _("Marked items are overdue."));
 if (get_post('SearchOrders')) 
 {
        $table->set_sql($sql);
+       $table->set_columns($cols);
        $Ajax->activate('orders_tbl');
 } 
        start_form();