Customer Transactions, Allocations and Supplier Transactions, Allocations has got...

diff --git a/includes/ui/ui_lists.inc b/includes/ui/ui_lists.inc
index 45253e32fd01c20585149b7fb935d012d4d7d051..43a4d685b84438a6e3f0786b96697aade6f56daf 100644 (file)
--- a/includes/ui/ui_lists.inc
+++ b/includes/ui/ui_lists.inc
@@ -2145,7 +2145,8 @@ function cust_allocations_list_cells($label, $name, $selected=null, $submit_on_c
                '2'=> _("Unsettled transactions"),
                '3' => _("Payments"),
                '4' => _("Credit Notes"),
-               '5' => _("Delivery Notes")
+               '5' => _("Delivery Notes"),
+               '6' => _("Journal Entries")
        );
        echo array_selector($name, $selected, $allocs, array('select_submit'=> $submit_on_change));
        echo "</td>\n";
@@ -2161,7 +2162,8 @@ function supp_allocations_list_cell($name, $selected=null)
                '2'=> _("Overdue Invoices"),
                '3' => _("Payments"),
                '4' => _("Credit Notes"),
-               '5' => _("Overdue Credit Notes")
+               '5' => _("Overdue Credit Notes"),
+               '6' => _("Journal Entries")
        );
        echo array_selector($name, $selected, $allocs);
        echo "</td>\n";
@@ -2178,7 +2180,8 @@ function supp_transactions_list_cell($name, $selected=null, $submit_on_change=fa
                '2'=> _("Unsettled transactions"),
                '3' => _("Payments"),
                '4' => _("Credit Notes"),
-               '5' => _("Overdue Credit Notes")
+               '5' => _("Overdue Credit Notes"),
+               '7' => _("Journal Entries")
        );
 
        echo array_selector($name, $selected, $allocs, array('select_submit'=> $submit_on_change));

diff --git a/purchasing/includes/db/supp_trans_db.inc b/purchasing/includes/db/supp_trans_db.inc
index aa9490afc707e048723376ab87c05c1704a1fff1..2d3a46ddb4e01859ae1dbfbc12d9d1572d9df24b 100644 (file)
--- a/purchasing/includes/db/supp_trans_db.inc
+++ b/purchasing/includes/db/supp_trans_db.inc
@@ -288,6 +288,10 @@ function get_sql_for_supplier_inquiry($filter, $after_date, $to_date, $supplier_
                {
                        $sql .= " AND trans.type = ".ST_SUPPCREDIT."  ";
                }
+               elseif (($filter == '7')) 
+               {
+                       $sql .= " AND trans.type = ".ST_JOURNAL."  ";
+               }
 
                if (($filter == '2') || ($filter == '5')) 
                {

diff --git a/purchasing/includes/db/suppalloc_db.inc b/purchasing/includes/db/suppalloc_db.inc
index cf996d602d0e72db63625d953053293cf3c60c11..228f7b1c4a72335b4dfc9604c5c625fe613cf8ba 100644 (file)
--- a/purchasing/includes/db/suppalloc_db.inc
+++ b/purchasing/includes/db/suppalloc_db.inc
@@ -302,6 +302,10 @@ function get_sql_for_supplier_allocation_inquiry()
                {
                        $sql .= " AND trans.type = ".ST_SUPPCREDIT." ";
                }
+               elseif ($_POST['filterType'] == '6')    // Journal
+               {
+                       $sql .= " AND trans.type = ".ST_JOURNAL." ";
+               }
 
                if (($_POST['filterType'] == '2') || ($_POST['filterType'] == '5')) // overdude 
                {

diff --git a/sales/includes/db/cust_trans_db.inc b/sales/includes/db/cust_trans_db.inc
index 602c412744c830c41b4819e7502ffb68b943dea6..1492cba98a32cbdc54c2c0ae8707f32dfedbb7d1 100644 (file)
--- a/sales/includes/db/cust_trans_db.inc
+++ b/sales/includes/db/cust_trans_db.inc
@@ -386,6 +386,10 @@ function get_sql_for_customer_inquiry($from, $to, $cust_id = ALL_TEXT, $filter =
                {
                        $sql .= " AND trans.type = ".ST_CUSTDELIVERY." ";
                }
+               elseif ($filter == '6')
+               {
+                       $sql .= " AND trans.type = ".ST_JOURNAL." ";
+               }
 
        if ($filter == '2')
        {

diff --git a/sales/includes/db/custalloc_db.inc b/sales/includes/db/custalloc_db.inc
index a202d313980beb2d4bb21574b6e2756cdd77dcbc..ea7db7da363fe2fc1f5cd07b4418df3de18cc87d 100644 (file)
--- a/sales/includes/db/custalloc_db.inc
+++ b/sales/includes/db/custalloc_db.inc
@@ -322,6 +322,10 @@ function get_sql_for_customer_allocation_inquiry($from, $to, $customer, $filterT
                {
                        $sql .= " AND trans.type = ".ST_CUSTCREDIT." ";
                }
+               elseif ($filterType == '6')
+               {
+                       $sql .= " AND trans.type = ".ST_JOURNAL." ";
+               }
 
        if ($filterType == '2')
        {