X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep104.php;h=988114ae4c16b82d5fb7e68cfa9bc217635509a7;hb=e8f8879003c1918b59e6da26be7f3927115ec21f;hp=e34e5937c8a35ee7a47e302d72ace4ef385bd5f8;hpb=45b9663b6305cb70c2f3f1782406232d3ed0d755;p=fa-stable.git

diff --git a/reporting/rep104.php b/reporting/rep104.php
index e34e5937..988114ae 100644
--- a/reporting/rep104.php
+++ b/reporting/rep104.php
@@ -1,13 +1,13 @@
 <?php
 /**********************************************************************
     Copyright (C) FrontAccounting, LLC.
-	Released under the terms of the GNU Affero General Public License,
-	AGPL, as published by the Free Software Foundation, either version 
-	3 of the License, or (at your option) any later version.
+	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/agpl-3.0.html>.
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
 $page_security = 2;
 // ----------------------------------------------------------------
@@ -47,6 +47,22 @@ function fetch_items($category=0)
 
     return db_query($sql,"No transactions were returned");
 }
+
+function get_kits($category=0)
+{
+	$sql = "SELECT i.item_code AS kit_code, i.description AS kit_name, c.category_id AS cat_id, c.description AS cat_name, count(*)>1 AS kit
+			FROM
+			".TB_PREF."item_codes i
+			LEFT JOIN
+			".TB_PREF."stock_category c
+			ON i.category_id=c.category_id";
+	$sql .=	" WHERE !i.is_foreign AND i.item_code!=i.stock_id";
+	if ($category != 0)
+		$sql .= " AND c.category_id = '$category'";
+	$sql .= " GROUP BY i.item_code";
+    return db_query($sql,"No kits were returned");
+}
+
 //----------------------------------------------------------------------------------------------------
 
 function print_price_listing()
@@ -156,6 +172,38 @@ function print_price_listing()
 			$rep->NewLine(0, 1);
 	}
 	$rep->Line($rep->row  - 4);
+
+	$result = get_kits($category);
+
+	$catgor = '';
+	while ($myrow=db_fetch($result))
+	{
+		if ($catgor != $myrow['cat_name'])
+		{
+			if ($catgor == '')
+			{
+				$rep->NewLine(2);
+				$rep->fontSize += 2;
+				$rep->TextCol(0, 3, _("Sales Kits"));
+				$rep->fontSize -= 2;
+			}	
+			$rep->Line($rep->row  - $rep->lineHeight);
+			$rep->NewLine(2);
+			$rep->fontSize += 2;
+			$rep->TextCol(0, 3, $myrow['cat_id'] . " - " . $myrow['cat_name']);
+			$catgor = $myrow['cat_name'];
+			$rep->fontSize -= 2;
+			$rep->NewLine();
+		}
+		$rep->NewLine();
+		$rep->TextCol(0, 1,	$myrow['kit_code']);
+		$rep->TextCol(1, 2, $myrow['kit_name']);
+		$price = get_kit_price($myrow['kit_code'], $currency, $salestype);
+		$rep->TextCol(2, 3,	number_format2($price, $dec));
+		$rep->NewLine(0, 1);
+	}
+	$rep->Line($rep->row  - 4);
+	
     $rep->End();
 }