Reports/SalesOrderBookingDetail.php

diff --git a/Reports/SalesOrderBookingDetail.php b/Reports/SalesOrderBookingDetail.php
index 38400cb..177ac2e 100644 (file)
--- a/Reports/SalesOrderBookingDetail.php
+++ b/Reports/SalesOrderBookingDetail.php
@@ -130,6 +130,7 @@ class Pman_Xtuple_Reports_SalesOrderBookingDetail extends Pman_Xtuple_Reports_Ba
                                 'format' => 'center',
                                 'txtrenderer' => function( $v, $worksheet, $row, $col, $o) {
                                     $address = '香港';
+                                    $address .= strlen($o->vend_name) ? "[{$o->vend_name}]" : '';
                                     $address .= ($v) ? preg_replace('/,|\n/', '|', $v) : '';
                                     $address .= ($o->coitem_cohead_id_cohead_shiptoaddress2) ? "|" . preg_replace('/,|\n/', '|', $o->coitem_cohead_id_cohead_shiptoaddress2) : '';
                                     $address .= ($o->coitem_cohead_id_cohead_shiptoaddress3) ? "|" . preg_replace('/,|\n/', '|', $o->coitem_cohead_id_cohead_shiptoaddress3) : '';
@@ -139,6 +140,8 @@ class Pman_Xtuple_Reports_SalesOrderBookingDetail extends Pman_Xtuple_Reports_Ba
                                     $address .= ($o->coitem_cohead_id_cohead_shiptostate) ? "|" . preg_replace('/,|\n/', '|', $o->coitem_cohead_id_cohead_shiptostate) : '';
                                     $address .= ($o->coitem_cohead_id_cohead_shiptozipcode) ? "|" . preg_replace('/,|\n/', '|', $o->coitem_cohead_id_cohead_shiptozipcode) : '';
                                     $address .= ($o->coitem_cohead_id_cohead_shiptocountry) ? "|" . preg_replace('/,|\n/', '|', $o->coitem_cohead_id_cohead_shiptocountry) : '';
+                                    $address .= strlen($o->vendaddr_code) ? "({$o->vendaddr_code})" : '';
+                                    
                                     return "$address"; 
                                 }
                             ),