X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep110.php;h=b7aeb500c57a716cc60522683298b9505479c3d1;hb=ad96cd0abbfd826592b851b8e0cb6d89e450fdf4;hp=d30d06a94424fa5d3cbd10400e81cc866ee64174;hpb=d34add5e762a470a52fade37173b4491462ee22a;p=fa-stable.git

diff --git a/reporting/rep110.php b/reporting/rep110.php
index d30d06a9..b7aeb500 100644
--- a/reporting/rep110.php
+++ b/reporting/rep110.php
@@ -1,5 +1,14 @@
 <?php
-
+/**********************************************************************
+    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 = 2;
 // ----------------------------------------------------------------
 // $ Revision:	2.0 $
@@ -8,16 +17,15 @@ $page_security = 2;
 // Title:	Print Delivery Notes
 // draft version!
 // ----------------------------------------------------------------
-$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_deliveries();
 
 //----------------------------------------------------------------------------------------------------
@@ -25,12 +33,12 @@ print_deliveries();
 function print_deliveries()
 {
 	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'];
-	$email = $_POST['PARAM_2'];	
+	$email = $_POST['PARAM_2'];
 	$comments = $_POST['PARAM_3'];
 
 	if ($from == null)
@@ -38,22 +46,22 @@ function print_deliveries()
 	if ($to == null)
 		$to = 0;
 	$dec = user_price_dec();
-	
+
 	$fno = explode("-", $from);
 	$tno = explode("-", $to);
 
 	$cols = array(4, 60, 225, 300, 325, 385, 450, 515);
 
-	// $headers in doctext.inc	
+	// $headers in doctext.inc
 	$aligns = array('left',	'left',	'right', 'left', 'right', 'right', 'right');
-	
+
 	$params = array('comments' => $comments);
-	
+
 	$cur = get_company_Pref('curr_default');
-	
+
 	if ($email == 0)
 	{
-		$rep = new FrontReport(_('DELIVERY'), "DeliveryNoteBulk.pdf", user_pagesize());
+		$rep = new FrontReport(_('DELIVERY'), "DeliveryNoteBulk", user_pagesize());
 		$rep->currency = $cur;
 		$rep->Font();
 		$rep->Info($params, $cols, null, $aligns);
@@ -78,41 +86,45 @@ function print_deliveries()
 			else
 				$rep->title = _('DELIVERY NOTE');
 			$rep->Header2($myrow, $branch, $sales_order, '', 13);
-			
+
    		$result = get_customer_trans_details(13, $i);
 			$SubTotal = 0;
 			while ($myrow2=db_fetch($result))
 			{
-				$Net = round(((1 - $myrow2["discount_percent"]) * $myrow2["unit_price"] * $myrow2["quantity"]), 
+				$Net = round2(((1 - $myrow2["discount_percent"]) * $myrow2["unit_price"] * $myrow2["quantity"]),
 				   user_price_dec());
 				$SubTotal += $Net;
 	    		$DisplayPrice = number_format2($myrow2["unit_price"],$dec);
-	    		$DisplayQty = number_format2($myrow2["quantity"],user_qty_dec());
+	    		$DisplayQty = number_format2($myrow2["quantity"],get_qty_dec($myrow2['stock_id']));
 	    		$DisplayNet = number_format2($Net,$dec);
 	    		if ($myrow2["discount_percent"]==0)
 		  			$DisplayDiscount ="";
-	    		else 
+	    		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);
-				if ($rep->row < $rep->bottomMargin + (15 * $rep->lineHeight)) 
+				$rep->row = $newrow;
+				//$rep->NewLine(1);
+				if ($rep->row < $rep->bottomMargin + (15 * $rep->lineHeight))
 					$rep->Header2($myrow, $branch, $sales_order,'',13);
 			}
-			
+
 			$comments = get_comments(13, $i);
 			if ($comments && db_num_rows($comments))
-			{ 	
+			{
 				$rep->NewLine();
-    			while ($comment=db_fetch($comments)) 
+    			while ($comment=db_fetch($comments))
     				$rep->TextColLines(0, 6, $comment['memo_'], -2);
-			}	
-				
+			}
+
    			$DisplaySubTot = number_format2($SubTotal,$dec);
    			$DisplayFreight = number_format2($myrow["ov_freight"],$dec);
 
@@ -121,43 +133,43 @@ function print_deliveries()
 			$doctype=13;
 			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);
 			$rep->TextCol(6, 7,	$DisplaySubTot, -2);
 			$rep->NewLine();
 			$rep->TextCol(3, 6, $doc_Shipping, -2);
 			$rep->TextCol(6, 7,	$DisplayFreight, -2);
 			$rep->NewLine();
-			$tax_items = get_customer_trans_tax_details(13, $i);
-    		while ($tax_item = db_fetch($tax_items)) 
+			$tax_items = get_trans_tax_details(13, $i);
+    		while ($tax_item = db_fetch($tax_items))
     		{
     			$DisplayTax = number_format2($tax_item['amount'], $dec);
     			if ($tax_item['included_in_price'])
     			{
-					$rep->TextCol(3, 7, $doc_Included . " " . $tax_item['tax_type_name'] . 
+					$rep->TextCol(3, 7, $doc_Included . " " . $tax_item['tax_type_name'] .
 						" (" . $tax_item['rate'] . "%) " . $doc_Amount . ":" . $DisplayTax, -2);
-				}		
+				}
     			else
     			{
-					$rep->TextCol(3, 6, $tax_item['tax_type_name'] . " (" . 
+					$rep->TextCol(3, 6, $tax_item['tax_type_name'] . " (" .
 						$tax_item['rate'] . "%)", -2);
 					$rep->TextCol(6, 7,	$DisplayTax, -2);
-				}    			
+				}
 				$rep->NewLine();
     		}
     		$rep->NewLine();
 			$DisplayTotal = number_format2($myrow["ov_freight"] +$myrow["ov_freight_tax"] + $myrow["ov_gst"] +
 				$myrow["ov_amount"],$dec);
-			$rep->Font('bold');	
-			$rep->TextCol(3, 6, $doc_TOTAL_DELIVERY, - 2); 
+			$rep->Font('bold');
+			$rep->TextCol(3, 6, $doc_TOTAL_DELIVERY, - 2);
 			$rep->TextCol(6, 7,	$DisplayTotal, -2);
-			$rep->Font();	
+			$rep->Font();
 			if ($email == 1)
 			{
 				$myrow['dimension_id'] = $paylink; // helper for pmt link
@@ -167,7 +179,7 @@ function print_deliveries()
 					$myrow['DebtorName'] = $branch['br_name'];
 				}
 				$rep->End($email, $doc_Delivery_no . " " . $myrow['reference'], $myrow, 13);
-			}	
+			}
 	}
 	if ($email == 0)
 		$rep->End();