X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep103.php;h=84fbd6d6951f00e7e3e8894016090edb42071a88;hb=7bcdbd3d9ee403fd3555fd8e9a4de6a654883b5c;hp=fcdd07336e9e7dc5843ff72559da525014b02729;hpb=ae5a4010b62224b1e3d8439517588eb2149478b9;p=fa-stable.git

diff --git a/reporting/rep103.php b/reporting/rep103.php
index fcdd0733..84fbd6d6 100644
--- a/reporting/rep103.php
+++ b/reporting/rep103.php
@@ -32,6 +32,9 @@ function get_customer_details_for_report($area=0, $salesid=0)
 	$sql = "SELECT ".TB_PREF."debtors_master.debtor_no,
 			".TB_PREF."debtors_master.name,
 			".TB_PREF."debtors_master.address,
+			".TB_PREF."debtors_master.curr_code,
+			".TB_PREF."debtors_master.dimension_id,
+			".TB_PREF."debtors_master.dimension2_id,
 			".TB_PREF."sales_types.sales_type,
 			".TB_PREF."cust_branch.branch_code,
 			".TB_PREF."cust_branch.br_name,
@@ -68,6 +71,17 @@ function get_customer_details_for_report($area=0, $salesid=0)
     return db_query($sql,"No transactions were returned");
 }
 
+function get_contacts_for_branch($branch)
+{
+	$sql = "SELECT p.*, r.action, r.type, CONCAT(r.type,'.',r.action) as ext_type 
+		FROM ".TB_PREF."crm_persons p,".TB_PREF."crm_contacts r WHERE r.person_id=p.id AND r.type='cust_branch' 
+			AND r.entity_id=".db_escape($branch);
+	$res = db_query($sql, "can't retrieve branch contacts");
+	$results = array();
+	while($contact = db_fetch($res))
+		$results[] = $contact;
+	return $results;
+}
 
 function getTransactions($debtorno, $branchcode, $date)
 {
@@ -133,7 +147,7 @@ function print_customer_details_listing()
 	$more = (double)$more;
 	$less = (double)$less;
 
-	$cols = array(0, 150, 300, 400, 550);
+	$cols = array(0, 150, 300, 425, 550);
 
 	$headers = array(_('Customer Postal Address'), _('Price/Turnover'),	_('Branch Contact Information'),
 		_('Branch Delivery Address'));
@@ -144,7 +158,7 @@ function print_customer_details_listing()
     				    1 => array('text' => _('Activity Since'), 	'from' => $from, 		'to' => ''),
     				    2 => array('text' => _('Sales Areas'), 		'from' => $sarea, 		'to' => ''),
     				    3 => array('text' => _('Sales Folk'), 		'from' => $salesfolk, 	'to' => ''),
-    				    4 => array('text' => _('Activity'), 		'from' => $morestr, 	'to' => $lessstr));
+    				    4 => array('text' => _('Activity'), 		'from' => $morestr, 	'to' => $lessstr . " " . get_company_pref("curr_default")));
 
     $rep = new FrontReport(_('Customer Details Listing'), "CustomerDetailsListing", user_pagesize(), 9, $orientation);
     if ($orientation == 'L')
@@ -195,7 +209,7 @@ function print_customer_details_listing()
 			}
 			$rep->NewLine();
 			// Here starts the new report lines 2010-11-02 Joe Hunt
-			$contacts = get_branch_contacts($myrow['branch_code']);
+			$contacts = get_contacts_for_branch($myrow['branch_code']);
 			$rep->TextCol(0, 1,	$myrow['name']);
 			$rep->TextCol(1, 2,	_('Price List') . ": " . $myrow['sales_type']);
 			$rep->TextCol(2, 3,	$myrow['br_name']);
@@ -207,15 +221,19 @@ function print_customer_details_listing()
 			$count1 = max($count1, $count2);
 			if (isset($adr[0]))
 				$rep->TextCol(0, 1, $adr[0]);
-			if ($more != 0.0 || $less != 0.0)
-				$rep->TextCol(1, 2,	_('Turnover') . ": " . number_format2($turnover, $dec));
+			$rep->TextCol(1, 2,	_('Currency') . ": " . $myrow['curr_code']);
 			if (isset($contacts[0]))
-				$rep->TextCol(2, 3, $contacts[0]['name']);
+				$rep->TextCol(2, 3, $contacts[0]['name']. " " .$contacts[0]['name2']);
 			if (isset($adr2[0]))	
 				$rep->TextCol(3, 4, $adr2[0]);
 			$rep->NewLine();
 			if (isset($adr[1]))
 				$rep->TextCol(0, 1, $adr[1]);
+			if ($myrow['dimension_id'] != 0)
+			{
+				$dim = get_dimension($myrow['dimension_id']);
+				$rep->TextCol(1, 2,	_('Dimension') . ": " . $dim['name']);
+			}		
 			if (isset($contacts[0]))
 				$rep->TextCol(2, 3, _('Ph') . ": " . $contacts[0]['phone']);
 			if (isset($adr2[1]))
@@ -223,10 +241,17 @@ function print_customer_details_listing()
 			$rep->NewLine();
 			if (isset($adr[2]))
 				$rep->TextCol(0, 1, $adr[2]);
+			if ($myrow['dimension2_id'] != 0)
+			{
+				$dim = get_dimension($myrow['dimension2_id']);
+				$rep->TextCol(1, 2,	_('Dimension') . " 2: " . $dim['name']);
+			}	
 			if (isset($contacts[0]))
 				$rep->TextCol(2, 3, _('Fax') . ": " . $contacts[0]['fax']);
 			if (isset($adr2[2]))
 				$rep->TextCol(3, 4, $adr2[2]);
+			if ($more != 0.0 || $less != 0.0)
+				$rep->TextCol(1, 2,	_('Turnover') . ": " . number_format2($turnover, $dec));
 			for ($i = 3; $i < $count1; $i++)
 			{
 				$rep->NewLine();
@@ -235,6 +260,11 @@ function print_customer_details_listing()
 				if (isset($adr2[$i]))
 					$rep->TextCol(0, 1, $adr2[$i]);
 			}	
+			if (isset($contacts[0]) && isset($contacts[0]['email']))
+			{
+				$rep->NewLine();
+				$rep->TextCol(2, 4, _('Email') . ": " . $contacts[0]['email']);
+			}		
 			$rep->NewLine();
 			/*
 			$rep->TextCol(0, 1,	$myrow['name']);