X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep107.php;h=a265bd603a69c9442ff3f5ad4fb38c427628d405;hb=7ba24fed715d41c0210f4395fd885ef34a483d5e;hp=06e30233e0cbedd476e441849ba85acad44a4cd8;hpb=d34add5e762a470a52fade37173b4491462ee22a;p=fa-stable.git

diff --git a/reporting/rep107.php b/reporting/rep107.php
index 06e30233..a265bd60 100644
--- a/reporting/rep107.php
+++ b/reporting/rep107.php
@@ -1,22 +1,31 @@
 <?php
-
-$page_security = 2;
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+	Released under the terms of the GNU General Public License, GPL, 
+	as published by the Free Software Foundation, either version 3 
+	of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
+***********************************************************************/
+$page_security = $_POST['PARAM_0'] == $_POST['PARAM_1'] ?
+	'SA_SALESTRANSVIEW' : 'SA_SALESBULKREP';
 // ----------------------------------------------------------------
 // $ Revision:	2.0 $
 // Creator:	Joe Hunt
 // date_:	2005-05-19
 // Title:	Print Invoices
 // ----------------------------------------------------------------
-$path_to_root="../";
+$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 . "sales/includes/sales_db.inc");
+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 . "/sales/includes/sales_db.inc");
 
 //----------------------------------------------------------------------------------------------------
 
-// trial_inquiry_controls();
 print_invoices();
 
 //----------------------------------------------------------------------------------------------------
@@ -24,8 +33,8 @@ print_invoices();
 function print_invoices()
 {
 	global $path_to_root;
-
-	include_once($path_to_root . "reporting/includes/pdf_report.inc");
+	
+	include_once($path_to_root . "/reporting/includes/pdf_report.inc");
 
 	$from = $_POST['PARAM_0'];
 	$to = $_POST['PARAM_1'];
@@ -41,7 +50,7 @@ function print_invoices()
 		$to = 0;
 	$dec = user_price_dec();
 
-	$fno = explode("-", $from);
+ 	$fno = explode("-", $from);
 	$tno = explode("-", $to);
 
 	$cols = array(4, 60, 225, 300, 325, 385, 450, 515);
@@ -57,7 +66,7 @@ function print_invoices()
 
 	if ($email == 0)
 	{
-		$rep = new FrontReport(_('INVOICE'), "InvoiceBulk.pdf", user_pagesize());
+		$rep = new FrontReport(_('INVOICE'), "InvoiceBulk", user_pagesize());
 		$rep->currency = $cur;
 		$rep->Font();
 		$rep->Info($params, $cols, null, $aligns);
@@ -76,7 +85,7 @@ function print_invoices()
 			$branch = get_branch($myrow["branch_code"]);
 			$branch['disable_branch'] = $paylink; // helper
 			if ($j == 10)
-				$sales_order = get_sales_order_header($myrow["order_"]);
+				$sales_order = get_sales_order_header($myrow["order_"], 30);
 			else
 				$sales_order = null;
 			if ($email == 1)
@@ -104,24 +113,28 @@ function print_invoices()
 			$SubTotal = 0;
 			while ($myrow2=db_fetch($result))
 			{
-			$Net = round($sign * ((1 - $myrow2["discount_percent"]) * $myrow2["unit_price"] * $myrow2["quantity"]), 
-			   user_price_dec());
-			$SubTotal += $Net;
+				$Net = round2($sign * ((1 - $myrow2["discount_percent"]) * $myrow2["unit_price"] * $myrow2["quantity"]),
+				   user_price_dec());
+				$SubTotal += $Net;
 	    		$DisplayPrice = number_format2($myrow2["unit_price"],$dec);
-	    		$DisplayQty = number_format2($sign*$myrow2["quantity"],user_qty_dec());
+	    		$DisplayQty = number_format2($sign*$myrow2["quantity"],get_qty_dec($myrow2['stock_id']));
 	    		$DisplayNet = number_format2($Net,$dec);
 	    		if ($myrow2["discount_percent"]==0)
 		  			$DisplayDiscount ="";
 	    		else
 		  			$DisplayDiscount = number_format2($myrow2["discount_percent"]*100,user_percent_dec()) . "%";
 				$rep->TextCol(0, 1,	$myrow2['stock_id'], -2);
-				$rep->TextCol(1, 2,	$myrow2['StockDescription'], -2);
+				$oldrow = $rep->row;
+				$rep->TextColLines(1, 2, $myrow2['StockDescription'], -2);
+				$newrow = $rep->row;
+				$rep->row = $oldrow;
 				$rep->TextCol(2, 3,	$DisplayQty, -2);
 				$rep->TextCol(3, 4,	$myrow2['units'], -2);
 				$rep->TextCol(4, 5,	$DisplayPrice, -2);
 				$rep->TextCol(5, 6,	$DisplayDiscount, -2);
 				$rep->TextCol(6, 7,	$DisplayNet, -2);
-				$rep->NewLine(1);
+				$rep->row = $newrow;
+				//$rep->NewLine(1);
 				if ($rep->row < $rep->bottomMargin + (15 * $rep->lineHeight))
 					$rep->Header2($myrow, $branch, $sales_order, $baccount,$j);
 			}
@@ -137,16 +150,16 @@ function print_invoices()
    			$DisplaySubTot = number_format2($SubTotal,$dec);
    			$DisplayFreight = number_format2($sign*$myrow["ov_freight"],$dec);
 
-    			$rep->row = $rep->bottomMargin + (15 * $rep->lineHeight);
+    		$rep->row = $rep->bottomMargin + (15 * $rep->lineHeight);
 			$linetype = true;
 			$doctype = $j;
 			if ($rep->currency != $myrow['curr_code'])
 			{
-				include($path_to_root . "reporting/includes/doctext2.inc");
+				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);
@@ -155,11 +168,11 @@ function print_invoices()
 			$rep->TextCol(3, 6, $doc_Shipping, -2);
 			$rep->TextCol(6, 7,	$DisplayFreight, -2);
 			$rep->NewLine();
-			$tax_items = get_customer_trans_tax_details($j, $i);
+			$tax_items = get_trans_tax_details($j, $i);
     		while ($tax_item = db_fetch($tax_items))
     		{
     			$DisplayTax = number_format2($sign*$tax_item['amount'], $dec);
-			
+
     			if ($tax_item['included_in_price'])
     			{
 					$rep->TextCol(3, 7, $doc_Included . " " . $tax_item['tax_type_name'] .