X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep106.php;h=ca1c84725b1b7a8bc07dabf96f6cf5331c1e92c4;hb=fff65dd000727b3403f641cb265c7b327b4fe22d;hp=ad26d7dd4ff177c9d1df5b6997448e1ae4d1da6c;hpb=654b2cb832f5ad2313cfbbd98832681fae05943a;p=fa-stable.git

diff --git a/reporting/rep106.php b/reporting/rep106.php
index ad26d7dd..ca1c8472 100644
--- a/reporting/rep106.php
+++ b/reporting/rep106.php
@@ -1,23 +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 = 'SA_SALESMANREP';
 // ----------------------------------------------------------------
 // $ Revision:	2.0 $
 // Creator:	Joe Hunt
 // date_:	2005-05-19
-// Title:	Order Status List
+// Title:	Salesman Report
 // ----------------------------------------------------------------
-$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 . "inventory/includes/db/items_category_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");
+include_once($path_to_root . "/inventory/includes/db/items_category_db.inc");
 
 //----------------------------------------------------------------------------------------------------
 
-// trial_inquiry_controls();
 print_salesman_list();
 
 //----------------------------------------------------------------------------------------------------
@@ -37,7 +45,7 @@ function GetSalesmanTrans($from, $to)
 		    AND ".TB_PREF."sales_orders.branch_code=".TB_PREF."cust_branch.branch_code
 		    AND ".TB_PREF."cust_branch.salesman=".TB_PREF."salesman.salesman_code
 		    AND ".TB_PREF."debtor_trans.debtor_no=".TB_PREF."debtors_master.debtor_no
-		    AND (".TB_PREF."debtor_trans.type=10 OR ".TB_PREF."debtor_trans.type=11)
+		    AND (".TB_PREF."debtor_trans.type=".ST_SALESINVOICE." OR ".TB_PREF."debtor_trans.type=".ST_CUSTCREDIT.")
 		    AND ".TB_PREF."debtor_trans.tran_date>='$fromdate'
 		    AND ".TB_PREF."debtor_trans.tran_date<='$todate'
 		ORDER BY ".TB_PREF."salesman.salesman_code, ".TB_PREF."debtor_trans.tran_date";
@@ -51,19 +59,22 @@ function print_salesman_list()
 {
 	global $path_to_root;
 
-	include_once($path_to_root . "reporting/includes/pdf_report.inc");
-
 	$from = $_POST['PARAM_0'];
 	$to = $_POST['PARAM_1'];
 	$summary = $_POST['PARAM_2'];
 	$comments = $_POST['PARAM_3'];
+	$destination = $_POST['PARAM_4'];
+	if ($destination)
+		include_once($path_to_root . "/reporting/includes/excel_report.inc");
+	else
+		include_once($path_to_root . "/reporting/includes/pdf_report.inc");
 
 	if ($summary == 0)
 		$sum = _("No");
 	else
 		$sum = _("Yes");
 
-	$dec = user_qty_dec();
+	$dec = user_price_dec();
 
 	$cols = array(0, 60, 150, 220, 325,	385, 450, 515);
 
@@ -82,11 +93,11 @@ function print_salesman_list()
 	$cols2 = $cols;
 	$aligns2 = $aligns;
 
-	$rep = new FrontReport(_('Salesman Listing'), "SalesmanListing.pdf", user_pagesize());
+	$rep = new FrontReport(_('Salesman Listing'), "SalesmanListing", user_pagesize());
 	$rep->Font();
 	$rep->Info($params, $cols, $headers, $aligns, $cols2, $headers2, $aligns2);
 
-	$rep->Header();
+	$rep->NewPage();
 	$salesman = 0;
 	$subtotal = $total = $subprov = $provtotal = 0;
 
@@ -94,11 +105,6 @@ function print_salesman_list()
 
 	while ($myrow=db_fetch($result))
 	{
-		if ($rep->row < $rep->bottomMargin + (2 * $rep->lineHeight))
-		{
-			$salesman = 0;
-			$rep->Header();
-		}
 		$rep->NewLine(0, 2, false, $salesman);
 		if ($salesman != $myrow['salesman_code'])
 		{
@@ -107,17 +113,16 @@ function print_salesman_list()
 				$rep->Line($rep->row - 8);
 				$rep->NewLine(2);
 				$rep->TextCol(0, 3, _('Total'));
-				$rep->TextCol(5, 6, number_format2($subtotal, $dec));
-				$rep->TextCol(6, 7, number_format2($subprov, $dec));
+				$rep->AmountCol(5, 6, $subtotal, $dec);
+				$rep->AmountCol(6, 7, $subprov, $dec);
     			$rep->Line($rep->row  - 4);
     			$rep->NewLine(2);
-				//$rep->Line($rep->row);
 			}
 			$rep->TextCol(0, 2,	$myrow['salesman_code']." ".$myrow['salesman_name']);
 			$rep->TextCol(2, 3,	$myrow['salesman_phone']);
 			$rep->TextCol(3, 4,	$myrow['salesman_email']);
 			$rep->TextCol(4, 5,	number_format2($myrow['provision'], user_percent_dec()) ." %");
-			$rep->TextCol(5, 6,	number_format2($myrow['break_pt'], $dec));
+			$rep->AmountCol(5, 6, $myrow['break_pt'], $dec);
 			$rep->TextCol(6, 7,	number_format2($myrow['provision2'], user_percent_dec()) ." %");
 			$rep->NewLine(2);
 			$salesman = $myrow['salesman_code'];
@@ -126,7 +131,6 @@ function print_salesman_list()
 			$subtotal = 0;
 			$subprov = 0;
 		}
-		$date = sql2date($myrow['tran_date']);
 		$rate = $myrow['rate'];
 		$amt = $myrow['InvoiceTotal'] * $rate;
 		if ($subprov > $myrow['break_pt'] && $myrow['provision2'] != 0)
@@ -139,15 +143,10 @@ function print_salesman_list()
 			$rep->TextCol(1, 2,	$myrow['DebtorName']);
 			$rep->TextCol(2, 3,	$myrow['br_name']);
 			$rep->TextCol(3, 4,	$myrow['contact_name']);
-			$rep->TextCol(4, 5,	$date);
-			$rep->TextCol(5, 6,	number_format2($amt, $dec));
-			$rep->TextCol(6, 7,	number_format2($prov, $dec));
+			$rep->DateCol(4, 5,	$myrow['tran_date'], true);
+			$rep->AmountCol(5, 6, $amt, $dec);
+			$rep->AmountCol(6, 7, $prov, $dec);
 			$rep->NewLine();
-			if ($rep->row < $rep->bottomMargin + (2 * $rep->lineHeight))
-			{
-				$salesman = 0;
-				$rep->Header();
-			}
 		}
 		$subtotal += $amt;
 		$subprov += $prov;
@@ -157,20 +156,20 @@ function print_salesman_list()
 		$rep->Line($rep->row - 4);
 		$rep->NewLine(2);
 		$rep->TextCol(0, 3, _('Total'));
-		$rep->TextCol(5, 6, number_format2($subtotal, $dec));
-		$rep->TextCol(6, 7, number_format2($subprov, $dec));
+		$rep->AmountCol(5, 6, $subtotal, $dec);
+		$rep->AmountCol(6, 7, $subprov, $dec);
 		$rep->Line($rep->row  - 4);
 		$rep->NewLine(2);
-		//$rep->Line($rep->row);
 		$total += $subtotal;
 		$provtotal += $subprov;
 	}
 	$rep->fontSize += 2;
 	$rep->TextCol(0, 3, _('Grand Total'));
 	$rep->fontSize -= 2;
-	$rep->TextCol(5, 6, number_format2($total, $dec));
-	$rep->TextCol(6, 7, number_format2($provtotal, $dec));
+	$rep->AmountCol(5, 6, $total, $dec);
+	$rep->AmountCol(6, 7, $provtotal, $dec);
 	$rep->Line($rep->row  - 4);
+	$rep->NewLine();
 	$rep->End();
 }