X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep210.php;h=072e8d90721620324d92d69496005342fc4a301c;hb=36b1fadae4301de56c7dc2e3ffdf200c4a5a8344;hp=27d56cd704a3ad7f51053bda7a44b284f37b04c4;hpb=a3c366442e07bfa82a326df8fea3d9d4b35a3dd8;p=fa-stable.git

diff --git a/reporting/rep210.php b/reporting/rep210.php
index 27d56cd7..072e8d90 100644
--- a/reporting/rep210.php
+++ b/reporting/rep210.php
@@ -16,13 +16,14 @@ $page_security = $_POST['PARAM_0'] == $_POST['PARAM_1'] ?
 // $ Revision:	2.0 $
 // Creator:	Joe Hunt
 // date_:	2005-05-19
-// Title:	Purchase Orders
+// Title:	Purchase Remittance
 // ----------------------------------------------------------------
 $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");
 
 //----------------------------------------------------------------------------------------------------
 
@@ -33,9 +34,9 @@ function get_remittance($type, $trans_no)
 {
    	$sql = "SELECT ".TB_PREF."supp_trans.*, 
    		(".TB_PREF."supp_trans.ov_amount+".TB_PREF."supp_trans.ov_gst+".TB_PREF."supp_trans.ov_discount) AS Total, 
-   		".TB_PREF."suppliers.supp_name,  ".TB_PREF."suppliers.supp_account_no,
+   		".TB_PREF."suppliers.supp_name,  ".TB_PREF."suppliers.supp_account_no, 
    		".TB_PREF."suppliers.curr_code, ".TB_PREF."suppliers.payment_terms, ".TB_PREF."suppliers.gst_no AS tax_id, 
-   		".TB_PREF."suppliers.email, ".TB_PREF."suppliers.address, ".TB_PREF."suppliers.contact
+   		".TB_PREF."suppliers.address
 		FROM ".TB_PREF."supp_trans, ".TB_PREF."suppliers
 		WHERE ".TB_PREF."supp_trans.supplier_id = ".TB_PREF."suppliers.supplier_id
 		AND ".TB_PREF."supp_trans.type = ".db_escape($type)."
@@ -91,6 +92,7 @@ function print_remittances()
 	if ($email == 0)
 	{
 		$rep = new FrontReport(_('REMITTANCE'), "RemittanceBulk", user_pagesize());
+		$rep->SetHeaderType('Header2');
 		$rep->currency = $cur;
 		$rep->Font();
 		$rep->Info($params, $cols, null, $aligns);
@@ -113,6 +115,7 @@ function print_remittances()
 			if ($email == 1)
 			{
 				$rep = new FrontReport("", "", user_pagesize());
+				$rep->SetHeaderType('Header2');
 				$rep->currency = $cur;
 				$rep->Font();
 				$rep->title = _('REMITTANCE');
@@ -121,22 +124,15 @@ function print_remittances()
 			}
 			else
 				$rep->title = _('REMITTANCE');
-			$rep->Header2($myrow, null, $myrow, $baccount, ST_SUPPAYMENT);
+			$contacts = get_supplier_contacts($myrow['supplier_id'], 'invoice');
+			$rep->SetCommonData($myrow, null, $myrow, $baccount, ST_SUPPAYMENT, $contacts);
+			$rep->NewPage();
 			$result = get_allocations_for_remittance($myrow['supplier_id'], $myrow['type'], $myrow['trans_no']);
 
-			$linetype = true;
 			$doctype = ST_SUPPAYMENT;
-			if ($rep->currency != $myrow['curr_code'])
-			{
-				include($path_to_root . "/reporting/includes/doctext2.inc");
-			}
-			else
-			{
-				include($path_to_root . "/reporting/includes/doctext.inc");
-			}
 
 			$total_allocated = 0;
-			$rep->TextCol(0, 4,	$doc_Towards, -2);
+			$rep->TextCol(0, 4,	_("As advance / full / part / payment towards:"), -2);
 			$rep->NewLine(2);
 			
 			while ($myrow2=db_fetch($result))
@@ -152,20 +148,20 @@ function print_remittances()
 				$total_allocated += $myrow2['amt'];
 				$rep->NewLine(1);
 				if ($rep->row < $rep->bottomMargin + (15 * $rep->lineHeight))
-					$rep->Header2($myrow, null, $myrow, $baccount, ST_SUPPAYMENT);
+					$rep->NewPage();
 			}
 
 			$rep->row = $rep->bottomMargin + (15 * $rep->lineHeight);
 
-			$rep->TextCol(3, 6, $doc_Total_Allocated, -2);
+			$rep->TextCol(3, 6, _("Total Allocated"), -2);
 			$rep->AmountCol(6, 7, $total_allocated, $dec, -2);
 			$rep->NewLine();
-			$rep->TextCol(3, 6, $doc_Left_To_Allocate, -2);
+			$rep->TextCol(3, 6, _("Left to Allocate"), -2);
 			$myrow['Total'] *= -1;
 			$rep->AmountCol(6, 7, $myrow['Total'] - $total_allocated, $dec, -2);
 			$rep->NewLine();
 			$rep->Font('bold');
-			$rep->TextCol(3, 6, $doc_Total_Payment, - 2);
+			$rep->TextCol(3, 6, _("TOTAL REMITTANCE"), - 2);
 			$rep->AmountCol(6, 7, $myrow['Total'], $dec, -2);
 			$words = price_in_words($myrow['Total'], ST_SUPPAYMENT);
 			if ($words != "")
@@ -176,10 +172,8 @@ function print_remittances()
 			$rep->Font();
 			if ($email == 1)
 			{
-				$myrow['contact_email'] = $myrow['email'];
 				$myrow['DebtorName'] = $myrow['supp_name'];
-				if ($myrow['contact'] != '') $myrow['DebtorName'] = $myrow['contact'];
-				$rep->End($email, $doc_Order_no . " " . $myrow['reference'], $myrow);
+				$rep->End($email);
 			}
 		}	
 	}