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

diff --git a/reporting/rep110.php b/reporting/rep110.php
index b7aeb500..9f418f7c 100644
--- a/reporting/rep110.php
+++ b/reporting/rep110.php
@@ -9,7 +9,8 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
-$page_security = 2;
+$page_security = $_POST['PARAM_0'] == $_POST['PARAM_1'] ?
+	'SA_SALESTRANSVIEW' : 'SA_SALESBULKREP';
 // ----------------------------------------------------------------
 // $ Revision:	2.0 $
 // Creator:	Janusz Dobrwolski
@@ -24,6 +25,7 @@ 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");
 
+$packing_slip = 0;
 //----------------------------------------------------------------------------------------------------
 
 print_deliveries();
@@ -32,14 +34,15 @@ print_deliveries();
 
 function print_deliveries()
 {
-	global $path_to_root;
+	global $path_to_root, $packing_slip;
 
 	include_once($path_to_root . "/reporting/includes/pdf_report.inc");
 
 	$from = $_POST['PARAM_0'];
 	$to = $_POST['PARAM_1'];
 	$email = $_POST['PARAM_2'];
-	$comments = $_POST['PARAM_3'];
+	$packing_slip = $_POST['PARAM_3'];
+	$comments = $_POST['PARAM_4'];
 
 	if ($from == null)
 		$from = 0;
@@ -61,7 +64,10 @@ function print_deliveries()
 
 	if ($email == 0)
 	{
-		$rep = new FrontReport(_('DELIVERY'), "DeliveryNoteBulk", user_pagesize());
+		if ($packing_slip == 0)
+			$rep = new FrontReport(_('DELIVERY'), "DeliveryNoteBulk", user_pagesize());
+		else
+			$rep = new FrontReport(_('PACKING SLIP'), "PackingSlipBulk", user_pagesize());
 		$rep->currency = $cur;
 		$rep->Font();
 		$rep->Info($params, $cols, null, $aligns);
@@ -69,28 +75,39 @@ function print_deliveries()
 
 	for ($i = $fno[0]; $i <= $tno[0]; $i++)
 	{
-			if (!exists_customer_trans(13, $i))
+			if (!exists_customer_trans(ST_CUSTDELIVERY, $i))
 				continue;
-			$myrow = get_customer_trans($i, 13);
+			$myrow = get_customer_trans($i, ST_CUSTDELIVERY);
 			$branch = get_branch($myrow["branch_code"]);
-			$sales_order = get_sales_order_header($myrow["order_"]); // ?
+			$sales_order = get_sales_order_header($myrow["order_"], ST_SALESORDER); // ?
 			if ($email == 1)
 			{
 				$rep = new FrontReport("", "", user_pagesize());
 				$rep->currency = $cur;
 				$rep->Font();
+				if ($packing_slip == 0)
+				{
 					$rep->title = _('DELIVERY NOTE');
 					$rep->filename = "Delivery" . $myrow['reference'] . ".pdf";
+				}
+				else
+				{
+					$rep->title = _('PACKING SLIP');
+					$rep->filename = "Packing_slip" . $myrow['reference'] . ".pdf";
+				}
 				$rep->Info($params, $cols, null, $aligns);
 			}
 			else
 				$rep->title = _('DELIVERY NOTE');
-			$rep->Header2($myrow, $branch, $sales_order, '', 13);
+			$rep->Header2($myrow, $branch, $sales_order, '', ST_CUSTDELIVERY);
 
-   		$result = get_customer_trans_details(13, $i);
+   			$result = get_customer_trans_details(ST_CUSTDELIVERY, $i);
 			$SubTotal = 0;
 			while ($myrow2=db_fetch($result))
 			{
+				if ($myrow2["quantity"] == 0)
+					continue;
+					
 				$Net = round2(((1 - $myrow2["discount_percent"]) * $myrow2["unit_price"] * $myrow2["quantity"]),
 				   user_price_dec());
 				$SubTotal += $Net;
@@ -108,16 +125,19 @@ function print_deliveries()
 				$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);
+				if ($packing_slip == 0)
+				{
+					$rep->TextCol(4, 5,	$DisplayPrice, -2);
+					$rep->TextCol(5, 6,	$DisplayDiscount, -2);
+					$rep->TextCol(6, 7,	$DisplayNet, -2);
+				}	
 				$rep->row = $newrow;
 				//$rep->NewLine(1);
 				if ($rep->row < $rep->bottomMargin + (15 * $rep->lineHeight))
-					$rep->Header2($myrow, $branch, $sales_order,'',13);
+					$rep->Header2($myrow, $branch, $sales_order,'',ST_CUSTDELIVERY);
 			}
 
-			$comments = get_comments(13, $i);
+			$comments = get_comments(ST_CUSTDELIVERY, $i);
 			if ($comments && db_num_rows($comments))
 			{
 				$rep->NewLine();
@@ -130,7 +150,7 @@ function print_deliveries()
 
     		$rep->row = $rep->bottomMargin + (15 * $rep->lineHeight);
 			$linetype = true;
-			$doctype=13;
+			$doctype=ST_CUSTDELIVERY;
 			if ($rep->currency != $myrow['curr_code'])
 			{
 				include($path_to_root . "/reporting/includes/doctext2.inc");
@@ -139,46 +159,53 @@ function print_deliveries()
 			{
 				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_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'] .
-						" (" . $tax_item['rate'] . "%) " . $doc_Amount . ":" . $DisplayTax, -2);
-				}
-    			else
-    			{
-					$rep->TextCol(3, 6, $tax_item['tax_type_name'] . " (" .
-						$tax_item['rate'] . "%)", -2);
-					$rep->TextCol(6, 7,	$DisplayTax, -2);
-				}
+			if ($packing_slip == 0)
+			{
+				$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();
-    		}
-    		$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->TextCol(6, 7,	$DisplayTotal, -2);
-			$rep->Font();
+				$tax_items = get_trans_tax_details(ST_CUSTDELIVERY, $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'] .
+							" (" . $tax_item['rate'] . "%) " . $doc_Amount . ": " . $DisplayTax, -2);
+					}
+    				else
+    				{
+						$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->TextCol(6, 7,	$DisplayTotal, -2);
+				$words = price_in_words($myrow['Total'], ST_CUSTDELIVERY);
+				if ($words != "")
+				{
+					$rep->NewLine(1);
+					$rep->TextCol(1, 7, $myrow['curr_code'] . ": " . $words, - 2);
+				}	
+				$rep->Font();
+			}	
 			if ($email == 1)
 			{
-				$myrow['dimension_id'] = $paylink; // helper for pmt link
 				if ($myrow['email'] == '')
 				{
 					$myrow['email'] = $branch['email'];
 					$myrow['DebtorName'] = $branch['br_name'];
 				}
-				$rep->End($email, $doc_Delivery_no . " " . $myrow['reference'], $myrow, 13);
+				$rep->End($email, $doc_Delivery_no . " " . $myrow['reference'], $myrow, ST_CUSTDELIVERY);
 			}
 	}
 	if ($email == 0)