[Weberp-svn] SF.net SVN: weberp:[8360] trunk

[<tim...@us...>]

Revision: 8360
          http://weberp.svn.sourceforge.net/weberp/?rev=8360&view=rev
Author:   tim_schofield
Date:     2011-11-27 12:11:42 +0000 (Sun, 27 Nov 2011)
Log Message:
-----------
New sales inquiry by sales type script

Modified Paths:
--------------
    trunk/includes/session.inc
    trunk/index.php

Added Paths:
-----------
    trunk/SalesByTypePeriodInquiry.php
    trunk/sql/mysql/updates/104.php

Added: trunk/SalesByTypePeriodInquiry.php
===================================================================
--- trunk/SalesByTypePeriodInquiry.php	                        (rev 0)
+++ trunk/SalesByTypePeriodInquiry.php	2011-11-27 12:11:42 UTC (rev 8360)
@@ -0,0 +1,567 @@
+<?php
+
+/* $Id: SalesByTypePeriodInquiry.php 4261 2010-12-22 15:56:50Z tim_schofield $*/
+
+include('includes/session.inc');
+$title = _('Sales Report');
+include('includes/header.inc');
+include('includes/DefineCartClass.php');
+
+echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/transactions.png" title="' . _('Sales Report') . '" alt="" />' . ' ' . _('Sales Report') . '</p>';
+echo '<div class="page_help_text">' . _('Select the parameters for the report') . '</div><br />';
+
+if (!isset($_POST['DisplayData'])){
+	/* then assume to display daily - maybe wrong to do this but hey better than reporting an error?*/
+	$_POST['DisplayData']='Weekly';
+}
+if (!isset($_POST['DateRange'])){
+	/* then assume report is for This Month - maybe wrong to do this but hey better than reporting an error?*/
+	$_POST['DateRange']='ThisMonth';
+}
+
+echo '<form name="Form1" action="' . htmlspecialchars($_SERVER['PHP_SELF']) . '" method="post">';
+echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+
+echo '<table cellpadding=2 class="selection">
+		<tr><td valign=top>
+		<table>';
+
+echo '<tr><th colspan="2" class="centre">' . _('Date Selection') . '</th>
+		</tr>
+	<tr>
+		<td>' . _('Custom Range') . ':</td>
+		<td><input type="radio" name="DateRange" value="Custom" ';
+if ($_POST['DateRange']=='Custom'){
+	echo 'checked';
+}
+echo	' onChange="ReloadForm(Form1.ShowSales)"/></td>
+		</tr>
+	<tr>
+		<td>' . _('This Week') . ':</td>
+		<td><input type="radio" name="DateRange" value="ThisWeek" ';
+if ($_POST['DateRange']=='ThisWeek'){
+	echo 'checked';
+}
+echo	' onChange="ReloadForm(Form1.ShowSales)" /></td>
+		</tr>
+	<tr>
+		<td>' . _('This Month') . ':</td>
+		<td><input type="radio" name="DateRange" value="ThisMonth" ';
+if ($_POST['DateRange']=='ThisMonth'){
+	echo 'checked';
+}
+echo	' onChange="ReloadForm(Form1.ShowSales)" /></td>
+		</tr>
+	<tr>
+		<td>' . _('This Quarter') . ':</td>
+		<td><input type="radio" name="DateRange" value="ThisQuarter" ';
+if ($_POST['DateRange']=='ThisQuarter'){
+	echo 'checked';
+}
+echo	' onChange="ReloadForm(Form1.ShowSales)" /></td>
+		</tr>';
+if ($_POST['DateRange']=='Custom'){
+	if (!isset($_POST['ToDate'])){
+		$_POST['FromDate'] = Date($_SESSION['DefaultDateFormat'],mktime(1,1,1,Date('m')-12,Date('d')+1,Date('Y')));
+		$_POST['ToDate'] = Date($_SESSION['DefaultDateFormat']);
+	}
+	echo '<tr>
+			<td>' . _('Date From') . ':</td>
+			<td><input type="text" class="date" alt="' . $_SESSION['DefaultDateFormat'] . '" name="FromDate" maxlength="10" size="11" value="' . $_POST['FromDate'] . '" /></td>
+			</tr>';
+	echo '<tr>
+			<td>' . _('Date To') . ':</td>
+			<td><input type="text" class="date" alt="' . $_SESSION['DefaultDateFormat'] . '" name="ToDate" maxlength="10" size="11" value="' . $_POST['ToDate'] . '" /></td>
+			</tr>';
+}
+echo '</table>
+		</td><td valign="top">
+		<table>';
+		
+echo '<tr><th colspan="2" class="centre">' . _('Display Data') . '</th>
+		</tr>
+	<tr>
+		<td>' . _('Daily') . ':</td>
+		<td><input type="radio" name="DisplayData" value="Daily" ';
+if ($_POST['DisplayData']=='Daily'){
+	echo 'checked';
+}
+echo	' onChange="ReloadForm(Form1.ShowSales)" /></td>
+		</tr>
+	<tr>
+		<td>' . _('Weekly') . ':</td>
+		<td><input type="radio" name="DisplayData" value="Weekly" ';
+if ($_POST['DisplayData']=='Weekly'){
+	echo 'checked';
+}
+echo	' onChange="ReloadForm(Form1.ShowSales)" /></td>
+		</tr>
+	<tr>
+		<td>' . _('Monthly') . ':</td>
+		<td><input type="radio" name="DisplayData" value="Monthly" ';
+if ($_POST['DisplayData']=='Monthly'){
+	echo 'checked';
+}
+echo	' onChange="ReloadForm(Form1.ShowSales)" /></td>
+		</tr>
+	<tr>
+		<td>' . _('Quarterly') . ':</td>
+		<td><input type="radio" name="DisplayData" value="Quarterly" ';
+if ($_POST['DisplayData']=='Quarterly'){
+	echo 'checked';
+}
+echo	' onChange="ReloadForm(Form1.ShowSales)" /></td>
+		</tr>';
+echo '</table>
+		</td></tr>
+	</table>';
+
+
+echo '<br />
+		<div class="centre">
+			<input tabindex="4" type="submit" name="ShowSales" value="' . _('Show Sales') . '" />
+		</div>
+		</form>
+		<br />';
+
+if ($_POST['DateRange']=='Custom' AND !isset($_POST['FromDate']) AND !isset($_POST['ToDate'])){
+	//Don't run the report until custom dates entered
+	unset($_POST['ShowSales']);
+}
+
+if (isset($_POST['ShowSales'])){
+	$InputError=0; //assume no input errors now test for errors
+	if ($_POST['DateRange']=='Custom'){
+		if (!Is_Date($_POST['FromDate'])){
+			$InputError = 1;
+			prnMsg(_('The date entered for the from date is not in the appropriate format. Dates must be entered in the format') . ' ' . $_SESSION['DefaultDateFormat'], 'error');
+		}
+		if (!Is_Date($_POST['ToDate'])){
+			$InputError = 1;
+			prnMsg(_('The date entered for the to date is not in the appropriate format. Dates must be entered in the format') . ' ' . $_SESSION['DefaultDateFormat'], 'error');
+		}
+		if (Date1GreaterThanDate2($_POST['FromDate'],$_POST['ToDate'])){
+			$InputError = 1;
+			prnMsg(_('The from date is expected to be a date prior to the to date. Please review the selected date range'),'error');
+		}
+	}
+	switch ($_POST['DateRange']) {
+		case 'ThisWeek':
+			$FromDate = date('Y-m-d',mktime(0,0,0,date('m'),date('d')-date('w')+1,date('Y')));
+			$ToDate = date('Y-m-d');
+			break;
+		case 'ThisMonth':
+			$FromDate = date('Y-m-d',mktime(0,0,0,date('m'),1,date('Y')));
+			$ToDate = date('Y-m-d');
+			break;
+		case 'ThisQuarter':
+			switch (date('m')) {
+				case 1:
+				case 2:
+				case 3:
+					$QuarterStartMonth=1;
+					break;
+				case 4:
+				case 5:
+				case 6:
+					$QuarterStartMonth=4;
+					break;
+				case 7:
+				case 8:
+				case 9:
+					$QuarterStartMonth=7;
+					break;
+				default:
+					$QuarterStartMonth=10;
+			}
+			$FromDate = date('Y-m-d',mktime(0,0,0,$QuarterStartMonth,1,date('Y')));
+			$ToDate = date('Y-m-d');
+			break;
+		case 'Custom':
+			$FromDate = FormatDateForSQL($_POST['FromDate']);
+			$ToDate = FormatDateForSQL($_POST['ToDate']);
+	}
+	switch ($_POST['DisplayData']) {
+		case 'Daily':
+			$sql = "SELECT debtortrans.trandate,
+							debtortrans.tpe,
+						SUM(CASE WHEN stockmoves.type=10 THEN 
+							price*(1-discountpercent)* -qty
+							ELSE 0 END)
+						 as salesvalue,
+						 SUM(CASE WHEN stockmoves.type=10 THEN 
+							1 ELSE 0 END)
+						 as nooforders,
+						 SUM(CASE WHEN stockmoves.type=11 THEN 
+							price*(1-discountpercent)* (-qty)
+							ELSE 0 END)
+						 as returnvalue,
+						SUM((standardcost * -qty)) as cost
+					FROM stockmoves
+					INNER JOIN custbranch 
+					ON stockmoves.debtorno=custbranch.debtorno
+					AND stockmoves.branchcode=custbranch.branchcode
+					INNER JOIN debtortrans
+					ON stockmoves.type=debtortrans.type
+					AND stockmoves.transno=debtortrans.transno
+					WHERE (stockmoves.type=10 or stockmoves.type=11)
+					AND show_on_inv_crds =1
+					AND debtortrans.trandate>='" . $FromDate . "'
+					AND debtortrans.trandate<='" . $ToDate . "'
+					GROUP BY debtortrans.trandate,
+							tpe
+					ORDER BY debtortrans.trandate,
+							tpe";
+							
+			break;
+		case 'Weekly':
+			$sql = "SELECT WEEKOFYEAR(debtortrans.trandate) as week_no,
+							YEAR(debtortrans.trandate) as transyear,
+							debtortrans.tpe,
+						SUM(CASE WHEN stockmoves.type=10 THEN 
+							price*(1-discountpercent)* -qty
+							ELSE 0 END)
+						 as salesvalue,
+						 SUM(CASE WHEN stockmoves.type=10 THEN 
+							1 ELSE 0 END)
+						 as nooforders,
+						 SUM(CASE WHEN stockmoves.type=11 THEN 
+							price*(1-discountpercent)* (-qty)
+							ELSE 0 END)
+						as returnvalue,
+						SUM((standardcost * -qty)) as cost
+					FROM stockmoves
+					INNER JOIN custbranch 
+					ON stockmoves.debtorno=custbranch.debtorno
+					AND stockmoves.branchcode=custbranch.branchcode
+					INNER JOIN debtortrans
+					ON stockmoves.type=debtortrans.type
+					AND stockmoves.transno=debtortrans.transno
+					WHERE (stockmoves.type=10 or stockmoves.type=11)
+					AND show_on_inv_crds =1
+					AND debtortrans.trandate>='" . $FromDate . "'
+					AND debtortrans.trandate<='" . $ToDate . "'
+					GROUP BY week_no,
+							transyear,
+							tpe
+					ORDER BY transyear,
+							week_no,
+							tpe";
+							
+			break;
+		case 'Monthly':
+			$sql = "SELECT MONTH(debtortrans.trandate) as month_no,
+							MONTHNAME(debtortrans.trandate) as month_name,
+							YEAR(debtortrans.trandate) as transyear,
+							debtortrans.tpe,
+						SUM(CASE WHEN stockmoves.type=10 THEN 
+							price*(1-discountpercent)* -qty
+							ELSE 0 END)
+						 as salesvalue,
+						 SUM(CASE WHEN stockmoves.type=10 THEN 
+							1 ELSE 0 END)
+						 as nooforders,
+						 SUM(CASE WHEN stockmoves.type=11 THEN 
+							price*(1-discountpercent)* (-qty)
+							ELSE 0 END)
+						as returnvalue,
+						SUM((standardcost * -qty)) as cost
+					FROM stockmoves
+					INNER JOIN custbranch 
+					ON stockmoves.debtorno=custbranch.debtorno
+					AND stockmoves.branchcode=custbranch.branchcode
+					INNER JOIN debtortrans
+					ON stockmoves.type=debtortrans.type
+					AND stockmoves.transno=debtortrans.transno
+					WHERE (stockmoves.type=10 or stockmoves.type=11)
+					AND show_on_inv_crds =1
+					AND debtortrans.trandate>='" . $FromDate . "'
+					AND debtortrans.trandate<='" . $ToDate . "'
+					GROUP BY month_no,
+							month_name,
+							transyear,
+							debtortrans.tpe
+					ORDER BY transyear,
+							month_no,
+							tpe";
+			
+			break;
+		case 'Quarterly':
+			$sql = "SELECT QUARTER(debtortrans.trandate) as quarter_no,
+							YEAR(debtortrans.trandate) as transyear,
+							debtortrans.tpe,
+						SUM(CASE WHEN stockmoves.type=10 THEN 
+							price*(1-discountpercent)* -qty
+							ELSE 0 END)
+						 as salesvalue,
+						 SUM(CASE WHEN stockmoves.type=10 THEN 
+							1 ELSE 0 END)
+						 as nooforders,
+						 SUM(CASE WHEN stockmoves.type=11 THEN 
+							price*(1-discountpercent)* (-qty)
+							ELSE 0 END)
+						as returnvalue,
+						SUM((standardcost * -qty)) as cost
+					FROM stockmoves
+					INNER JOIN custbranch 
+					ON stockmoves.debtorno=custbranch.debtorno
+					AND stockmoves.branchcode=custbranch.branchcode
+					INNER JOIN debtortrans
+					ON stockmoves.type=debtortrans.type
+					AND stockmoves.transno=debtortrans.transno
+					WHERE (stockmoves.type=10 or stockmoves.type=11)
+					AND show_on_inv_crds =1
+					AND debtortrans.trandate>='" . $FromDate . "'
+					AND debtortrans.trandate<='" . $ToDate . "'
+					GROUP BY quarter_no,
+							transyear,
+							tpe 
+					ORDER BY transyear,
+							quarter_no,
+							tpe";
+							
+			break;
+		}
+	
+	$ErrMsg = _('The sales data could not be retrieved because') . ' - ' . DB_error_msg($db);
+	$SalesResult = DB_query($sql,$db,$ErrMsg);
+
+	
+	echo '<table cellpadding=2 class="selection">';
+	
+	echo'<tr>
+		<th>' . _('Period') . '</th>
+		<th>' . _('Sales') . '<br />' . _('Type') . '</th>
+		<th>' . _('No Orders') . '</th>
+		<th>' . _('Total Sales') . '</th>
+		<th>' . _('Refunds') . '</th>
+		<th>' . _('Net Sales') . '</th>
+		<th>' . _('Cost of Sales') . '</th>
+		<th>' . _('Gross Profit') . '</th>
+		</tr>';
+	
+	$CumulativeTotalSales = 0;
+	$CumulativeTotalOrders = 0;
+	$CumulativeTotalRefunds = 0;
+	$CumulativeTotalNetSales = 0;
+	$CumulativeTotalCost = 0;
+	$CumulativeTotalGP = 0;
+	
+	$PrdTotalOrders =0;
+	$PrdTotalSales=0;
+	$PrdTotalRefunds=0;
+	$PrdTotalNetSales=0;
+	$PrdTotalCost=0;
+	$PrdTotalGP=0;
+	
+	$PeriodHeadingDone = false;
+	$LastPeriodHeading = 'First Run Through';
+	$k=0;
+	while ($SalesRow=DB_fetch_array($SalesResult)) {
+		if ($k==1){
+			echo '<tr class="EvenTableRows">';
+			$k=0;
+		} else {
+			echo '<tr class="OddTableRows">';
+			$k=1;
+		}
+		switch ($_POST['DisplayData']){
+			case 'Daily':
+				if ($LastPeriodHeading != ConvertSQLDate($SalesRow['trandate'])) {
+					$PeriodHeadingDone=false;
+					if ($LastPeriodHeading != 'First Run Through'){ //print the footer for the period
+						echo '<td colspan="2" class="number">' . _('Total') . '-' . $LastPeriodHeading . '</td>
+							<td class="number">' . $PrdTotalOrders . '</td>
+							<td class="number">' . locale_number_format($PrdTotalSales,$_SESSION['CompanyRecord']['decimalplaces']) . '</td>
+							<td class="number">' . locale_number_format($PrdTotalRefunds,$_SESSION['CompanyRecord']['decimalplaces']) . '</td>
+							<td class="number">' . locale_number_format($PrdTotalNetSales,$_SESSION['CompanyRecord']['decimalplaces']) . '</td>
+							<td class="number">' . locale_number_format($PrdTotalCost,$_SESSION['CompanyRecord']['decimalplaces']) . '</td>
+							<td class="number">' . locale_number_format($PrdTotalGP,$_SESSION['CompanyRecord']['decimalplaces']) . '</td>
+						</tr>';
+						if ($k==1){
+							echo '<tr class="EvenTableRows"><td colspan="8"><hr></td></tr>';
+							echo '<tr class="OddTableRows">';
+						} else {
+							echo '<tr class="OddTableRows"><td colspan="8"><hr></td></tr>';
+							echo '<tr class="EvenTableRows">';
+						}
+						$PrdTotalOrders =0;
+						$PrdTotalSales=0;
+						$PrdTotalRefunds=0;
+						$PrdTotalNetSales=0;
+						$PrdTotalCost=0;
+						$PrdTotalGP=0;
+					}
+				}
+				if (! $PeriodHeadingDone){
+					echo '<td>' . ConvertSQLDate($SalesRow['trandate']) . '</td>';
+					$LastPeriodHeading = ConvertSQLDate($SalesRow['trandate']);
+					$PeriodHeadingDone = true;
+				} else {
+					echo '<td></td>';
+				} 
+				break;
+			case 'Weekly':
+				if ($LastPeriodHeading != _('wk'). '-' . $SalesRow['week_no'] . ' ' . $SalesRow['transyear']) {
+					$PeriodHeadingDone=false;
+					if ($LastPeriodHeading != 'First Run Through'){
+						echo '<td colspan="2" class="number">' . _('Total') . '-' . $LastPeriodHeading . '</td>
+							<td class="number">' . $PrdTotalOrders . '</td>
+							<td class="number">' . locale_number_format($PrdTotalSales,$_SESSION['CompanyRecord']['decimalplaces']) . '</td>
+							<td class="number">' . locale_number_format($PrdTotalRefunds,$_SESSION['CompanyRecord']['decimalplaces']) . '</td>
+							<td class="number">' . locale_number_format($PrdTotalNetSales,$_SESSION['CompanyRecord']['decimalplaces']) . '</td>
+							<td class="number">' . locale_number_format($PrdTotalCost,$_SESSION['CompanyRecord']['decimalplaces']) . '</td>
+							<td class="number">' . locale_number_format($PrdTotalGP,$_SESSION['CompanyRecord']['decimalplaces']) . '</td>
+						</tr>';
+						if ($k==1){
+							echo '<tr class="EvenTableRows"><td colspan="8"><hr></td></tr>';
+							echo '<tr class="OddTableRows">';
+						} else {
+							echo '<tr class="OddTableRows"><td colspan="8"><hr></td></tr>';
+							echo '<tr class="EvenTableRows">';
+						}
+						$PrdTotalOrders =0;
+						$PrdTotalSales=0;
+						$PrdTotalRefunds=0;
+						$PrdTotalNetSales=0;
+						$PrdTotalCost=0;
+						$PrdTotalGP=0;
+					}
+				}
+				if (! $PeriodHeadingDone){
+					echo '<td>' . _('wk'). '-' . $SalesRow['week_no'] . ' ' . $SalesRow['transyear'] . '</td>';
+					$LastPeriodHeading = _('wk'). '-' . $SalesRow['week_no'] . ' ' . $SalesRow['transyear'];
+					$PeriodHeadingDone = true;
+				} else {
+					echo '<td></td>';
+				} 
+				break;
+			case 'Monthly':
+				if ($LastPeriodHeading != $SalesRow['month_name'] . ' ' . $SalesRow['transyear']) {
+					$PeriodHeadingDone=false;
+					if ($LastPeriodHeading != 'First Run Through'){
+						echo '<td colspan="2" class="number">' . _('Total') . '-' . $LastPeriodHeading . '</td>
+							<td class="number">' . $PrdTotalOrders . '</td>
+							<td class="number">' . locale_number_format($PrdTotalSales,$_SESSION['CompanyRecord']['decimalplaces']) . '</td>
+							<td class="number">' . locale_number_format($PrdTotalRefunds,$_SESSION['CompanyRecord']['decimalplaces']) . '</td>
+							<td class="number">' . locale_number_format($PrdTotalNetSales,$_SESSION['CompanyRecord']['decimalplaces']) . '</td>
+							<td class="number">' . locale_number_format($PrdTotalCost,$_SESSION['CompanyRecord']['decimalplaces']) . '</td>
+							<td class="number">' . locale_number_format($PrdTotalGP,$_SESSION['CompanyRecord']['decimalplaces']) . '</td>
+						</tr>';
+						if ($k==1){
+							echo '<tr class="EvenTableRows"><td colspan="8"><hr></td></tr>';
+							echo '<tr class="OddTableRows">';
+						} else {
+							echo '<tr class="OddTableRows"><td colspan="8"><hr></td></tr>';
+							echo '<tr class="EvenTableRows">';
+						}
+						$PrdTotalOrders =0;
+						$PrdTotalSales=0;
+						$PrdTotalRefunds=0;
+						$PrdTotalNetSales=0;
+						$PrdTotalCost=0;
+						$PrdTotalGP=0;
+					}
+				}
+				if (! $PeriodHeadingDone){
+					echo '<td>' . $SalesRow['month_name'] . ' ' . $SalesRow['transyear'] . '</td>';
+					$LastPeriodHeading = $SalesRow['month_name'] . ' ' . $SalesRow['transyear'];
+					$PeriodHeadingDone = true;
+				} else {
+					echo '<td></td>';
+				}
+				break;
+			case 'Quarterly':
+				if ($LastPeriodHeading != _('Qtr'). '-' . $SalesRow['quarter_no'] . ' ' . $SalesRow['transyear']) {
+					$PeriodHeadingDone=false;
+					if ($LastPeriodHeading != 'First Run Through'){
+						echo '<td colspan="2" class="number">' . _('Total') . '-'. $LastPeriodHeading . '</td>
+							<td class="number">' . $PrdTotalOrders . '</td>
+							<td class="number">' . locale_number_format($PrdTotalSales,$_SESSION['CompanyRecord']['decimalplaces']) . '</td>
+							<td class="number">' . locale_number_format($PrdTotalRefunds,$_SESSION['CompanyRecord']['decimalplaces']) . '</td>
+							<td class="number">' . locale_number_format($PrdTotalNetSales,$_SESSION['CompanyRecord']['decimalplaces']) . '</td>
+							<td class="number">' . locale_number_format($PrdTotalCost,$_SESSION['CompanyRecord']['decimalplaces']) . '</td>
+							<td class="number">' . locale_number_format($PrdTotalGP,$_SESSION['CompanyRecord']['decimalplaces']) . '</td>
+						</tr>';
+						if ($k==1){
+							echo '<tr class="EvenTableRows"><td colspan="8"><hr></td></tr>';
+							echo '<tr class="OddTableRows">';
+						} else {
+							echo '<tr class="OddTableRows"><td colspan="8"><hr></td></tr>';
+							echo '<tr class="EvenTableRows">';
+						}
+						$PrdTotalOrders =0;
+						$PrdTotalSales=0;
+						$PrdTotalRefunds=0;
+						$PrdTotalNetSales=0;
+						$PrdTotalCost=0;
+						$PrdTotalGP=0;
+					}
+				}
+				if (! $PeriodHeadingDone){
+					echo '<td>' . _('Qtr'). '-' . $SalesRow['quarter_no'] . ' ' . $SalesRow['transyear'] . '</td>';
+					$LastPeriodHeading = _('Qtr'). '-' . $SalesRow['quarter_no'] . ' ' . $SalesRow['transyear'];
+					$PeriodHeadingDone = true;
+				} else {
+					echo '<td></td>';
+				}
+				break;
+		}
+		echo '<td>' . $SalesRow['tpe'] . '</td>
+				<td class="number">' . $SalesRow['nooforders'] . '</td>
+				<td class="number">' . locale_number_format($SalesRow['salesvalue'],$_SESSION['CompanyRecord']['decimalplaces']) . '</td>
+				<td class="number">' . locale_number_format($SalesRow['returnvalue'],$_SESSION['CompanyRecord']['decimalplaces']) . '</td>
+				<td class="number">' . locale_number_format($SalesRow['salesvalue']+$SalesRow['returnvalue'],$_SESSION['CompanyRecord']['decimalplaces']) . '</td>
+				<td class="number">' . locale_number_format($SalesRow['cost'],$_SESSION['CompanyRecord']['decimalplaces']) . '</td>
+				<td class="number">' . locale_number_format(($SalesRow['salesvalue']+$SalesRow['returnvalue']-$SalesRow['cost']),$_SESSION['CompanyRecord']['decimalplaces']) . '</td>
+			</tr>';
+		$PrdTotalOrders +=$SalesRow['nooforders'];
+		$PrdTotalSales += $SalesRow['salesvalue'];
+		$PrdTotalRefunds += $SalesRow['returnvalue'];
+		$PrdTotalNetSales += ($SalesRow['salesvalue']+$SalesRow['returnvalue']);
+		$PrdTotalCost += $SalesRow['cost'];
+		$PrdTotalGP += ($SalesRow['salesvalue']+$SalesRow['returnvalue']-$SalesRow['cost']);
+		
+		$CumulativeTotalSales += $SalesRow['salesvalue'];
+		$CumulativeTotalOrders = $SalesRow['nooforders'];
+		$CumulativeTotalRefunds += $SalesRow['returnvalue'];
+		$CumulativeTotalNetSales += ($SalesRow['salesvalue']+$SalesRow['returnvalue']);
+		$CumulativeTotalCost += $SalesRow['cost'];
+		$CumulativeTotalGP += ($SalesRow['salesvalue']+$SalesRow['returnvalue']-$SalesRow['cost']);
+	}
+	if ($k==1){
+		echo '<tr class="EvenTableRows">';
+		$k=0;
+	} else {
+		echo '<tr class="OddTableRows">';
+		$k=1;
+	}
+	echo '<td colspan="2" class="number">' . _('Total') . ' ' . $LastPeriodHeading . '</td>
+		<td class="number">' . $PrdTotalOrders . '</td>
+		<td class="number">' . locale_number_format($PrdTotalSales,$_SESSION['CompanyRecord']['decimalplaces']) . '</td>
+		<td class="number">' . locale_number_format($PrdTotalRefunds,$_SESSION['CompanyRecord']['decimalplaces']) . '</td>
+		<td class="number">' . locale_number_format($PrdTotalNetSales,$_SESSION['CompanyRecord']['decimalplaces']) . '</td>
+		<td class="number">' . locale_number_format($PrdTotalCost,$_SESSION['CompanyRecord']['decimalplaces']) . '</td>
+		<td class="number">' . locale_number_format($PrdTotalGP,$_SESSION['CompanyRecord']['decimalplaces']) . '</td>
+	</tr>';
+	if ($k==1){
+		echo '<tr class="EvenTableRows"><td colspan="8"><hr></td></tr>';
+		echo '<tr class="OddTableRows">';
+	} else {
+		echo '<tr class="OddTableRows"><td colspan="8"><hr></td></tr>';
+		echo '<tr class="EvenTableRows">';
+	}
+	echo '<td colspan="2" class="number">' . _('GRAND Total') . '</td>
+		<td class="number">' . $CumulativeTotalOrders . '</td>
+		<td class="number">' . locale_number_format($CumulativeTotalSales,$_SESSION['CompanyRecord']['decimalplaces']) . '</td>
+		<td class="number">' . locale_number_format($CumulativeTotalRefunds,$_SESSION['CompanyRecord']['decimalplaces']) . '</td>
+		<td class="number">' . locale_number_format($CumulativeTotalNetSales,$_SESSION['CompanyRecord']['decimalplaces']) . '</td>
+		<td class="number">' . locale_number_format($CumulativeTotalCost,$_SESSION['CompanyRecord']['decimalplaces']) . '</td>
+		<td class="number">' . locale_number_format($CumulativeTotalGP,$_SESSION['CompanyRecord']['decimalplaces']) . '</td>
+		</tr>';
+	
+	echo '</table>';
+
+} //end of if user hit show sales
+include('includes/footer.inc');
+?>
\ No newline at end of file

Modified: trunk/includes/session.inc
===================================================================
--- trunk/includes/session.inc	2011-11-27 12:11:28 UTC (rev 8359)
+++ trunk/includes/session.inc	2011-11-27 12:11:42 UTC (rev 8360)
@@ -13,7 +13,7 @@
 	header('Location:' . $rootpath . '/install/index.php');
 }
 include($PathPrefix . 'config.php');
-$DBVersion=103;
+$DBVersion=104;
 if (isset($SessionSavePath)){
 	session_save_path($SessionSavePath);
 }

Modified: trunk/index.php
===================================================================
--- trunk/index.php	2011-11-27 12:11:28 UTC (rev 8359)
+++ trunk/index.php	2011-11-27 12:11:42 UTC (rev 8360)
@@ -53,6 +53,7 @@
 													_('Order Status Report'),
 													_('Orders Invoiced Reports'),
 													_('Daily Sales Inquiry'),
+													_('Sales By Sales Type Inquiry'),
 													_('Sales By Category Inquiry'),
 													_('Top Sellers Inquiry'),
 													_('Order Delivery Differences Report'),
@@ -67,6 +68,7 @@
 												'/PDFOrderStatus.php',
 												'/PDFOrdersInvoiced.php',
 												'/DailySalesInquiry.php',
+												'/SalesByTypePeriodInquiry.php',
 												'/SalesCategoryPeriodInquiry.php',
 												'/SalesTopItemsInquiry.php',
 												'/PDFDeliveryDifferences.php',

Added: trunk/sql/mysql/updates/104.php
===================================================================
--- trunk/sql/mysql/updates/104.php	                        (rev 0)
+++ trunk/sql/mysql/updates/104.php	2011-11-27 12:11:42 UTC (rev 8360)
@@ -0,0 +1,10 @@
+<?php
+
+/* Include the new script for printing quotations in Portrait
+ */
+
+InsertRecord('pagesecurity', array('script', 'security'), array('SalesByTypePeriodInquiry.php',1), array('script', 'security'), array('SalesByTypePeriodInquiry.php',1), $db);
+
+UpdateDBNo(104, $db);
+
+?>
\ No newline at end of file

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.