X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Fincludes%2Freporting.inc;h=8dc119f6629dbd1cb924bf5aec88a44264511c8e;hb=7e830126b96477e969fe3b48d9fc0e78f6c1fe00;hp=e38ed6a225119a276ea76359fa7bc65f1a4505b9;hpb=ddadb47f2620ce6902ad4694ce6512568862ba05;p=fa-stable.git

diff --git a/reporting/includes/reporting.inc b/reporting/includes/reporting.inc
index e38ed6a2..8dc119f6 100644
--- a/reporting/includes/reporting.inc
+++ b/reporting/includes/reporting.inc
@@ -15,7 +15,7 @@
 // You only need full parameter list for invoices/credit notes
 
 function print_document_link($doc_no, $link_text, $link=true, $type_no, 
-	$icon=false, $class='printlink', $id='', $email=0)
+	$icon=false, $class='printlink', $id='', $email=0, $extra=0)
 {
 	global $path_to_root;
 	include_once($path_to_root . "/includes/types.inc");
@@ -30,10 +30,9 @@ function print_document_link($doc_no, $link_text, $link=true, $type_no,
 			$ar = array(
 				'PARAM_0' => $doc_no, 
 				'PARAM_1' => $doc_no, 
-				'PARAM_2' => "", 
-				'PARAM_3' => get_first_bank_account(), 
-				'PARAM_4' => $email, 
-				'PARAM_5' => "");
+				'PARAM_2' => '', 
+				'PARAM_3' => $email, 
+				'PARAM_4' => '');
 			break;
 		case ST_SALESORDER :
 			$rep = 109;
@@ -41,11 +40,10 @@ function print_document_link($doc_no, $link_text, $link=true, $type_no,
 			$ar = array(
 				'PARAM_0' => $doc_no, 
 				'PARAM_1' => $doc_no, 
-				'PARAM_2' => "", 
-				'PARAM_3' => get_first_bank_account(), 
-				'PARAM_4' => $email, 
-				'PARAM_5' => 0, 
-				'PARAM_6' => "");
+				'PARAM_2' => '', 
+				'PARAM_3' => $email, 
+				'PARAM_4' => 0, 
+				'PARAM_5' => '');
 			break;
 		case ST_CUSTDELIVERY :
 			$rep = 110;
@@ -53,22 +51,21 @@ function print_document_link($doc_no, $link_text, $link=true, $type_no,
 			$ar = array(
 				'PARAM_0' => $doc_no, 
 				'PARAM_1' => $doc_no, 
-				'PARAM_2' => $email, 
-				'PARAM_3' => "");
+				'PARAM_2' => $email,
+				'PARAM_3' => $extra);
 			break;
 		case ST_SALESINVOICE : // Sales Invoice
 		case ST_CUSTCREDIT : // Customer Credit Note
-			$rep = 107;
+			$rep = $type_no==ST_CUSTCREDIT ? 113 : 107;
 			// from, to, currency, bank acc, email, paylink, comments, type
 			$ar = array(
 				'PARAM_0' => $doc_no, 
 				'PARAM_1' => $doc_no, 
-				'PARAM_2' => "", 
-				'PARAM_3' => get_first_bank_account(), 
-				'PARAM_4' => $email, 
-				'PARAM_5' => "",
-				'PARAM_6' => "", 
-				'PARAM_7' => $type_no);
+				'PARAM_2' => '', 
+				'PARAM_3' => $email, 
+				'PARAM_4' => '',
+				'PARAM_5' => '', 
+				'PARAM_6' => $type_no);
 			break;
 		case ST_PURCHORDER :
 			$rep = 209;
@@ -76,10 +73,38 @@ function print_document_link($doc_no, $link_text, $link=true, $type_no,
 			$ar = array(
 				'PARAM_0' => $doc_no, 
 				'PARAM_1' => $doc_no, 
-				'PARAM_2' => "", 
-				'PARAM_3' => get_first_bank_account(), 
-				'PARAM_4' => $email, 
-				'PARAM_5' => "");
+				'PARAM_2' => '', 
+				'PARAM_3' => $email, 
+				'PARAM_4' => '');
+			break;
+		case ST_CUSTPAYMENT :
+			$rep = 112;
+			// from, to, currency, bank acc, email, comments
+			$ar = array(
+				'PARAM_0' => $doc_no, 
+				'PARAM_1' => $doc_no, 
+				'PARAM_2' => '', 
+				'PARAM_4' => '');
+			break;
+		case ST_SUPPAYMENT :
+			$rep = 210;
+			// from, to, currency, bank acc, email, comments
+			$ar = array(
+				'PARAM_0' => $doc_no, 
+				'PARAM_1' => $doc_no, 
+				'PARAM_2' => '', 
+				'PARAM_3' => $email, 
+				'PARAM_4' => '');
+			break;
+		case ST_WORKORDER :
+			$rep = 409;
+			// from, to, currency, bank acc, email, comments
+			$ar = array(
+				'PARAM_0' => $doc_no, 
+				'PARAM_1' => $doc_no, 
+				'PARAM_2' => $email, 
+				'PARAM_3' => '', 
+				'PARAM_4' => '');
 			break;
 //		default: $ar = array();
 	}
@@ -113,12 +138,4 @@ function print_link($link_text, $rep, $pars = array(), $dir = '',
 	return "<a target='_blank' href='$url'$id$class $pars[1]>$pars[0]</a>";
 }
 
-function get_first_bank_account()
-{
-	$sql = "SELECT ".TB_PREF."bank_accounts.id FROM ".TB_PREF."bank_accounts, ".TB_PREF."company
-		WHERE bank_curr_code=curr_default LIMIT 0, 1";
-	$result = db_query($sql);
-	$row = db_fetch_row($result);
-	return $row[0];
-}
 ?>
\ No newline at end of file