Rerun of Rep 704 GL Account Transactions report shows html code on Person/Item.

diff --git a/includes/types.inc b/includes/types.inc
index a47e265fc5884d272e3c96b22d2bc22af76f4e61..f5e26d13db7dd618bd1be5976298ba740e2aed47 100644 (file)
--- a/includes/types.inc
+++ b/includes/types.inc
@@ -132,7 +132,7 @@ function payment_person_name($type, $person_id, $full=true) {
                        return ($full ? $payment_person_types[$type] . " ":"") . $qe["description"];
                case PT_WORKORDER :
                        global $wo_cost_types;
-                       return get_trans_view_str(ST_WORKORDER, $person_id, _('Work Order').' '.$person_id);
+                       return (!$full ? _('Work Order').' '.$person_id : get_trans_view_str(ST_WORKORDER, $person_id, _('Work Order').' '.$person_id));
                case PT_CUSTOMER :
                        return ($full ?$payment_person_types[$type] . " ":"") . sprintf("[%05s] %s", $person_id, get_customer_name($person_id));
                case PT_SUPPLIER :

diff --git a/reporting/rep601.php b/reporting/rep601.php
index e5411bd5c8d425c533c4c9c10bf852af4aa67aeb..2566216c5b981fe229ae65ffe3b6d57d6f4f113f 100644 (file)
--- a/reporting/rep601.php
+++ b/reporting/rep601.php
@@ -133,7 +133,7 @@ function print_bank_transactions()
                                        $rep->TextCol(1, 2,     $myrow['trans_no']);
                                        $rep->TextCol(2, 3,     $myrow['ref']);
                                        $rep->DateCol(3, 4,     $myrow["trans_date"], true);
-                                       $rep->TextCol(4, 5,     get_counterparty_name($myrow["type"], $myrow["trans_no"], false));
+                                       $rep->TextCol(4, 5,     payment_person_name($myrow["person_type_id"],$myrow["person_id"], false));
                                        if ($myrow['amount'] > 0.0)
                                        {
                                                $rep->AmountCol(5, 6, abs($myrow['amount']), $dec);

diff --git a/reporting/rep704.php b/reporting/rep704.php
index e820655bfff10cc558a4990c169f5776097f8ed9..f62b2d192bc98d412ce4b2816dda1ba0df19a707 100644 (file)
--- a/reporting/rep704.php
+++ b/reporting/rep704.php
@@ -172,10 +172,7 @@ function print_GL_transactions()
                                        $rep->TextCol(4, 5,     get_dimension_string($myrow['dimension_id']));
                                if ($dim > 1)
                                        $rep->TextCol(5, 6,     get_dimension_string($myrow['dimension2_id']));
-                               if ($myrow["person_type_id"] == PT_WORKORDER)
-                                       $txt = "";
-                               else    
-                                       $txt = payment_person_name($myrow["person_type_id"],$myrow["person_id"], false);
+                               $txt = payment_person_name($myrow["person_type_id"],$myrow["person_id"], false);
                                $memo = $myrow['memo_'];
                                if ($txt != "")
                                {