X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep209.php;h=c2892cf0b37254b2110ff23bf87920335527fb54;hb=9b7ac7414c4ec6b3284adb22876cd5142ac78fa3;hp=57c55ae39d29a0a9a99b9b59195ad46d32d925f4;hpb=b37623cf1de2cfce6825744557d76475f002321f;p=fa-stable.git

diff --git a/reporting/rep209.php b/reporting/rep209.php
index 57c55ae3..c2892cf0 100644
--- a/reporting/rep209.php
+++ b/reporting/rep209.php
@@ -23,6 +23,7 @@ $path_to_root="..";
 include_once($path_to_root . "/includes/session.inc");
 include_once($path_to_root . "/includes/date_functions.inc");
 include_once($path_to_root . "/includes/data_checks.inc");
+include_once($path_to_root . "/includes/db/crm_contacts_db.inc");
 
 //----------------------------------------------------------------------------------------------------
 
@@ -31,9 +32,10 @@ print_po();
 //----------------------------------------------------------------------------------------------------
 function get_po($order_no)
 {
-   	$sql = "SELECT ".TB_PREF."purch_orders.*, ".TB_PREF."suppliers.supp_name,  ".TB_PREF."suppliers.supp_account_no,
+   	$sql = "SELECT ".TB_PREF."purch_orders.*, ".TB_PREF."suppliers.supp_name,  "
+   		.TB_PREF."suppliers.supp_account_no,
    		".TB_PREF."suppliers.curr_code, ".TB_PREF."suppliers.payment_terms, ".TB_PREF."locations.location_name,
-   		".TB_PREF."suppliers.email, ".TB_PREF."suppliers.address, ".TB_PREF."suppliers.contact
+   		".TB_PREF."suppliers.address, ".TB_PREF."suppliers.contact
 		FROM ".TB_PREF."purch_orders, ".TB_PREF."suppliers, ".TB_PREF."locations
 		WHERE ".TB_PREF."purch_orders.supplier_id = ".TB_PREF."suppliers.supplier_id
 		AND ".TB_PREF."locations.loc_code = into_stock_location
@@ -107,7 +109,8 @@ function print_po()
 		}
 		else
 			$rep->title = _('PURCHASE ORDER');
-		$rep->SetCommonData($myrow, null, $myrow, $baccount, ST_PURCHORDER);
+		$contacts = get_supplier_contacts($myrow['supplier_id'], 'order');
+		$rep->SetCommonData($myrow, null, $myrow, $baccount, ST_PURCHORDER, $contacts);
 		$rep->NewPage();
 
 		$result = get_po_details($i);
@@ -154,14 +157,7 @@ function print_po()
 		$rep->row = $rep->bottomMargin + (15 * $rep->lineHeight);
 		$linetype = true;
 		$doctype = ST_PURCHORDER;
-		if ($rep->currency != $myrow['curr_code'])
-		{
-			include($path_to_root . "/reporting/includes/doctext2.inc");
-		}
-		else
-		{
-			include($path_to_root . "/reporting/includes/doctext.inc");
-		}
+		include($path_to_root . "/reporting/includes/doctext.inc");
 
 		$rep->TextCol(3, 6, $doc_Sub_total, -2);
 		$rep->TextCol(6, 7,	$DisplaySubTot, -2);
@@ -179,10 +175,11 @@ function print_po()
 		$rep->Font();
 		if ($email == 1)
 		{
-			$myrow['contact_email'] = $myrow['email'];
+//			$myrow['contact_email'] = $myrow['email'];
 			$myrow['DebtorName'] = $myrow['supp_name'];
-			if ($myrow['contact'] != '') $myrow['DebtorName'] = $myrow['contact'];
-			$myrow['reference'] = $myrow['order_no'];
+
+			if ($myrow['reference'] == "")
+				$myrow['reference'] = $myrow['order_no'];
 			$rep->End($email, $doc_Order_no . " " . $myrow['reference'], $myrow);
 		}
 	}