Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[6962] trunk
|
From: <te...@us...> - 2014-11-06 02:59:18
|
Revision: 6962
http://sourceforge.net/p/web-erp/reponame/6962
Author: tehonu
Date: 2014-11-06 02:59:12 +0000 (Thu, 06 Nov 2014)
Log Message:
-----------
More flexible selection of inventory categories
Modified Paths:
--------------
trunk/InventoryPlanning.php
trunk/InventoryValuation.php
trunk/PDFPriceList.php
trunk/StockCheck.php
Modified: trunk/InventoryPlanning.php
===================================================================
--- trunk/InventoryPlanning.php 2014-11-06 02:29:31 UTC (rev 6961)
+++ trunk/InventoryPlanning.php 2014-11-06 02:59:12 UTC (rev 6962)
@@ -9,11 +9,7 @@
include ('includes/SQL_CommonFunctions.inc');
-if (isset($_POST['PrintPDF'])
- and isset($_POST['FromCriteria'])
- and mb_strlen($_POST['FromCriteria'])>=1
- and isset($_POST['ToCriteria'])
- and mb_strlen($_POST['ToCriteria'])>=1) {
+if (isset($_POST['PrintPDF'])) {
include ('includes/class.pdf.php');
@@ -69,8 +65,7 @@
AND stockmaster.discontinued = 0
AND stockmaster.categoryid=stockcategory.categoryid
AND (stockmaster.mbflag='B' OR stockmaster.mbflag='M')
- AND stockmaster.categoryid >= '" . $_POST['FromCriteria'] . "'
- AND stockmaster.categoryid <= '" . $_POST['ToCriteria'] . "'
+ AND stockmaster.categoryid IN ('". implode("','",$_POST['Categories'])."')
GROUP BY stockmaster.categoryid,
stockmaster.description,
stockcategory.categorydescription,
@@ -90,9 +85,8 @@
stockcategory
WHERE locstock.stockid=stockmaster.stockid
AND stockmaster.discontinued = 0
- AND stockmaster.categoryid >= '" . $_POST['FromCriteria'] . "'
+ AND stockmaster.categoryid IN ('". implode("','",$_POST['Categories'])."')
AND stockmaster.categoryid=stockcategory.categoryid
- AND stockmaster.categoryid <= '" . $_POST['ToCriteria'] . "'
AND (stockmaster.mbflag='B' OR stockmaster.mbflag='M')
AND locstock.loccode = '" . $_POST['Location'] . "'
ORDER BY stockmaster.categoryid,
@@ -123,14 +117,14 @@
$Category = '';
- $CurrentPeriod = GetPeriod(Date($_SESSION['DefaultDateFormat']),$db);
+ $CurrentPeriod = GetPeriod(Date($_SESSION['DefaultDateFormat']));
$Period_1 = $CurrentPeriod -1;
$Period_2 = $CurrentPeriod -2;
$Period_3 = $CurrentPeriod -3;
$Period_4 = $CurrentPeriod -4;
$Period_5 = $CurrentPeriod -5;
- while ($InventoryPlan = DB_fetch_array($InventoryResult,$db)){
+ while ($InventoryPlan = DB_fetch_array($InventoryResult)){
if ($Category!=$InventoryPlan['categoryid']){
$FontSize=10;
@@ -359,81 +353,71 @@
echo '<p class="page_title_text">
<img src="'.$RootPath.'/css/'.$Theme.'/images/inventory.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title . '</p>';
- if (empty($_POST['FromCriteria']) or empty($_POST['ToCriteria'])) {
- /*if $FromCriteria is not set then show a form to allow input */
-
- echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">';
- echo '<div>';
- echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
- echo '<table class="selection">';
-
- echo '<tr>
- <td>' . _('From Inventory Category Code') . ':</td>
- <td><select name="FromCriteria">';
-
- $sql="SELECT categoryid, categorydescription FROM stockcategory ORDER BY categorydescription";
- $CatResult= DB_query($sql);
- while ($myrow = DB_fetch_array($CatResult)){
- echo '<option value="' . $myrow['categoryid'] . '">' . $myrow['categorydescription'] . ' - ' . $myrow['categoryid'] . '</option>';
+ echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">';
+ echo '<div>';
+ echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+ echo '<table class="selection">
+ <tr>
+ <td>' . _('Select Inventory Categories') . ':</td>
+ <td><select autofocus="autofocus" required="required" minlength="1" size="12" name="Categories[]"multiple="multiple">';
+ $SQL = 'SELECT categoryid, categorydescription
+ FROM stockcategory
+ ORDER BY categorydescription';
+ $CatResult = DB_query($SQL);
+ while ($MyRow = DB_fetch_array($CatResult)) {
+ if (isset($_POST['Categories']) AND in_array($MyRow['categoryid'], $_POST['Categories'])) {
+ echo '<option selected="selected" value="' . $MyRow['categoryid'] . '">' . $MyRow['categorydescription'] .'</option>';
+ } else {
+ echo '<option value="' . $MyRow['categoryid'] . '">' . $MyRow['categorydescription'] . '</option>';
}
- echo '</select>
+ }
+ echo '</select>
</td>
- </tr>
- <tr>
- <td>' . _('To Inventory Category Code') . ':</td>
- <td><select name="ToCriteria">';
+ </tr>';
+
+ echo '<tr>
+ <td>' . _('For Inventory in Location') . ':</td>
+ <td><select name="Location">';
- /*Set the index for the categories result set back to 0 */
- DB_data_seek($CatResult,0);
+ $sql = "SELECT locations.loccode, locationname FROM locations INNER JOIN locationusers ON locationusers.loccode=locations.loccode AND locationusers.userid='" . $_SESSION['UserID'] . "' AND locationusers.canview=1";
+ $LocnResult=DB_query($sql);
- while ($myrow = DB_fetch_array($CatResult)){
- echo '<option value="' . $myrow['categoryid'] . '">' . $myrow['categorydescription'] . ' - ' . $myrow['categoryid'] . '</option>';
- }
- echo '</select></td>
- </tr>
- <tr>
- <td>' . _('For Inventory in Location') . ':</td>
- <td><select name="Location">';
+ echo '<option value="All">' . _('All Locations') . '</option>';
- $sql = "SELECT locations.loccode, locationname FROM locations INNER JOIN locationusers ON locationusers.loccode=locations.loccode AND locationusers.userid='" . $_SESSION['UserID'] . "' AND locationusers.canview=1";
- $LocnResult=DB_query($sql);
+ while ($myrow=DB_fetch_array($LocnResult)){
+ echo '<option value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
+ }
+ echo '</select>
+ </td>
+ </tr>';
- echo '<option value="All">' . _('All Locations') . '</option>';
+ echo '<tr>
+ <td>' . _('Stock Planning') . ':</td>
+ <td><select name="NumberMonthsHolding">
+ <option selected="selected" value="1">' . _('One Month MAX') . '</option>
+ <option value="1.5">' . _('One Month and a half MAX') . '</option>
+ <option value="2">' . _('Two Months MAX') . '</option>
+ <option value="2.5">' . _('Two Month and a half MAX') . '</option>
+ <option value="3">' . _('Three Months MAX') . '</option>
+ <option value="4">' . _('Four Months MAX') . '</option>
+ <option value="11">' . _('One Month AVG') . '</option>
+ <option value="11.5">' . _('One Month and a half AVG') . '</option>
+ <option value="12">' . _('Two Months AVG') . '</option>
+ <option value="12.5">' . _('Two Month and a half AVG') . '</option>
+ <option value="13">' . _('Three Months AVG') . '</option>
+ <option value="14">' . _('Four Months AVG') . '</option>
+ </select>
+ </td>
+ </tr>
+ </table>
+ <br />
+ <div class="centre">
+ <input type="submit" name="PrintPDF" value="' . _('Print PDF') . '" />
+ </div>
+ </div>
+ </form>';
- while ($myrow=DB_fetch_array($LocnResult)){
- echo '<option value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
- }
- echo '</select>
- </td>
- </tr>';
-
- echo '<tr>
- <td>' . _('Stock Planning') . ':</td>
- <td><select name="NumberMonthsHolding">
- <option selected="selected" value="1">' . _('One Month MAX') . '</option>
- <option value="1.5">' . _('One Month and a half MAX') . '</option>
- <option value="2">' . _('Two Months MAX') . '</option>
- <option value="2.5">' . _('Two Month and a half MAX') . '</option>
- <option value="3">' . _('Three Months MAX') . '</option>
- <option value="4">' . _('Four Months MAX') . '</option>
- <option value="11">' . _('One Month AVG') . '</option>
- <option value="11.5">' . _('One Month and a half AVG') . '</option>
- <option value="12">' . _('Two Months AVG') . '</option>
- <option value="12.5">' . _('Two Month and a half AVG') . '</option>
- <option value="13">' . _('Three Months AVG') . '</option>
- <option value="14">' . _('Four Months AVG') . '</option>
- </select>
- </td>
- </tr>
- </table>
- <br />
- <div class="centre">
- <input type="submit" name="PrintPDF" value="' . _('Print PDF') . '" />
- </div>
- </div>
- </form>';
- }
include('includes/footer.inc');
} /*end of else not PrintPDF */
Modified: trunk/InventoryValuation.php
===================================================================
--- trunk/InventoryValuation.php 2014-11-06 02:29:31 UTC (rev 6961)
+++ trunk/InventoryValuation.php 2014-11-06 02:59:12 UTC (rev 6962)
@@ -3,11 +3,7 @@
/* $Id$ */
include('includes/session.inc');
-if ((isset($_POST['PrintPDF']) OR isset($_POST['CSV']))
- AND isset($_POST['FromCriteria'])
- AND mb_strlen($_POST['FromCriteria'])>=1
- AND isset($_POST['ToCriteria'])
- AND mb_strlen($_POST['ToCriteria'])>=1){
+if (isset($_POST['PrintPDF']) OR isset($_POST['CSV'])){
/*Now figure out the inventory data to report for the category range under review */
if ($_POST['Location']=='All'){
@@ -37,8 +33,7 @@
stockmaster.stockid,
stockmaster.description
HAVING SUM(locstock.quantity)!=0
- AND stockcategory.categorydescription >= '" . $_POST['FromCriteria'] . "'
- AND stockcategory.categorydescription <= '" . $_POST['ToCriteria'] . "'
+ AND stockmaster.categoryid IN ('". implode("','",$_POST['Categories'])."')
ORDER BY stockcategory.categorydescription,
stockmaster.stockid";
} else {
@@ -58,8 +53,7 @@
WHERE stockmaster.stockid=locstock.stockid
AND stockmaster.categoryid=stockcategory.categoryid
AND locstock.quantity!=0
- AND stockcategory.categorydescription >= '" . $_POST['FromCriteria'] . "'
- AND stockcategory.categorydescription <= '" . $_POST['ToCriteria'] . "'
+ AND stockmaster.categoryid IN ('". implode("','",$_POST['Categories'])."')
AND locstock.loccode = '" . $_POST['Location'] . "'
ORDER BY stockcategory.categorydescription,
stockmaster.stockid";
@@ -79,11 +73,7 @@
}
}
-if (isset($_POST['PrintPDF'])
- AND isset($_POST['FromCriteria'])
- AND mb_strlen($_POST['FromCriteria'])>=1
- AND isset($_POST['ToCriteria'])
- AND mb_strlen($_POST['ToCriteria'])>=1){
+if (isset($_POST['PrintPDF'])){
include('includes/PDFStarter.php');
@@ -111,7 +101,7 @@
$CatTot_Val=0;
$CatTot_Qty=0;
- while ($InventoryValn = DB_fetch_array($InventoryResult,$db)){
+ while ($InventoryValn = DB_fetch_array($InventoryResult)){
if ($Category!=$InventoryValn['categoryid']){
$FontSize=10;
@@ -205,7 +195,7 @@
} elseif (isset($_POST['CSV'])) {
$CSVListing = _('Category ID') .','. _('Category Description') .','. _('Stock ID') .','. _('Description') .','. _('Decimal Places') .','. _('Qty On Hand') .','. _('Units') .','. _('Unit Cost') .','. _('Total') . "\n";
- while ($InventoryValn = DB_fetch_row($InventoryResult, $db)) {
+ while ($InventoryValn = DB_fetch_row($InventoryResult)) {
$CSVListing .= '"';
$CSVListing .= implode('","', $InventoryValn) . '"' . "\n";
}
@@ -223,82 +213,68 @@
$Title=_('Inventory Valuation Reporting');
include('includes/header.inc');
+ echo '<p class="page_title_text">
+ <img src="'.$RootPath.'/css/'.$Theme.'/images/inventory.png" title="' . _('Inventory') . '" alt="" />' . ' ' . $Title . '
+ </p>';
- if (empty($_POST['FromCriteria']) OR empty($_POST['ToCriteria'])) {
+ echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">
+ <div>
+ <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
- /*if $FromCriteria is not set then show a form to allow input */
- echo '<p class="page_title_text">
- <img src="'.$RootPath.'/css/'.$Theme.'/images/inventory.png" title="' . _('Inventory') . '" alt="" />' . ' ' . $Title . '
- </p>';
-
- echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">
- <div>
- <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
- <table class="selection">
+ echo '<table class="selection">
<tr>
- <td>' . _('From Inventory Category Code') . ':</td>
- <td><select name="FromCriteria">';
-
- $sql="SELECT categoryid,
- categorydescription
- FROM stockcategory
- ORDER BY categorydescription";
-
- $CatResult= DB_query($sql);
- While ($myrow = DB_fetch_array($CatResult)){
- echo '<option value="' . $myrow['categorydescription'] . '">' . $myrow['categorydescription'] . ' - ' . $myrow['categoryid'] . '</option>';
+ <td>' . _('Select Inventory Categories') . ':</td>
+ <td><select autofocus="autofocus" required="required" minlength="1" size="12" name="Categories[]"multiple="multiple">';
+ $SQL = 'SELECT categoryid, categorydescription
+ FROM stockcategory
+ ORDER BY categorydescription';
+ $CatResult = DB_query($SQL);
+ while ($MyRow = DB_fetch_array($CatResult)) {
+ if (isset($_POST['Categories']) AND in_array($MyRow['categoryid'], $_POST['Categories'])) {
+ echo '<option selected="selected" value="' . $MyRow['categoryid'] . '">' . $MyRow['categorydescription'] .'</option>';
+ } else {
+ echo '<option value="' . $MyRow['categoryid'] . '">' . $MyRow['categorydescription'] . '</option>';
}
- echo '</select></td>
- </tr>';
+ }
+ echo '</select>
+ </td>
+ </tr>';
- echo '<tr>
- <td>' . _('To Inventory Category Code') . ':</td>
- <td><select name="ToCriteria">';
+ echo '<tr>
+ <td>' . _('For Inventory in Location') . ':</td>
+ <td><select name="Location">';
- /*Set the index for the categories result set back to 0 */
- DB_data_seek($CatResult,0);
+ $sql = "SELECT locations.loccode,
+ locationname
+ FROM locations
+ INNER JOIN locationusers ON locationusers.loccode=locations.loccode AND locationusers.userid='" . $_SESSION['UserID'] . "' AND locationusers.canview=1";
- While ($myrow = DB_fetch_array($CatResult)){
- echo '<option value="' . $myrow['categorydescription'] . '">' . $myrow['categorydescription'] . ' - ' . $myrow['categoryid'] . '</option>';
- }
- echo '</select></td>
- </tr>';
+ $LocnResult=DB_query($sql);
- echo '<tr>
- <td>' . _('For Inventory in Location') . ':</td>
- <td><select name="Location">';
+ echo '<option value="All">' . _('All Locations') . '</option>';
- $sql = "SELECT locations.loccode,
- locationname
- FROM locations
- INNER JOIN locationusers ON locationusers.loccode=locations.loccode AND locationusers.userid='" . $_SESSION['UserID'] . "' AND locationusers.canview=1";
+ while ($myrow=DB_fetch_array($LocnResult)){
+ echo '<option value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
+ }
+ echo '</select></td>
+ </tr>';
- $LocnResult=DB_query($sql);
+ echo '<tr>
+ <td>' . _('Summary or Detailed Report') . ':</td>
+ <td><select name="DetailedReport">
+ <option selected="selected" value="No">' . _('Summary Report') . '</option>
+ <option value="Yes">' . _('Detailed Report') . '</option>
+ </select></td>
+ </tr>
+ </table>
+ <br />
+ <div class="centre">
+ <input type="submit" name="PrintPDF" value="' . _('Print PDF') . '" />
+ <input type="submit" name="CSV" value="' . _('Output to CSV') . '" />
+ </div>';
+ echo '</div>
+ </form>';
- echo '<option value="All">' . _('All Locations') . '</option>';
-
- while ($myrow=DB_fetch_array($LocnResult)){
- echo '<option value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
- }
- echo '</select></td>
- </tr>';
-
- echo '<tr>
- <td>' . _('Summary or Detailed Report') . ':</td>
- <td><select name="DetailedReport">
- <option selected="selected" value="No">' . _('Summary Report') . '</option>
- <option value="Yes">' . _('Detailed Report') . '</option>
- </select></td>
- </tr>
- </table>
- <br />
- <div class="centre">
- <input type="submit" name="PrintPDF" value="' . _('Print PDF') . '" />
- <input type="submit" name="CSV" value="' . _('Output to CSV') . '" />
- </div>';
- echo '</div>
- </form>';
- }
include('includes/footer.inc');
} /*end of else not PrintPDF */
Modified: trunk/PDFPriceList.php
===================================================================
--- trunk/PDFPriceList.php 2014-11-06 02:29:31 UTC (rev 6961)
+++ trunk/PDFPriceList.php 2014-11-06 02:59:12 UTC (rev 6962)
@@ -284,79 +284,75 @@
echo '<p class="page_title_text"><img alt="" src="' . $RootPath . '/css/' . $Theme . '/images/customer.png" title="' .
_('Price List') . '" />' . ' ' . _('Print a price list by inventory category') . '</p>';
- if (!isset($_POST['FromCriteria']) or !isset($_POST['ToCriteria'])) {
- /*if $FromCriteria is not set then show a form to allow input */
+ echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">';
+ echo '<div>';
+ echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
- echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">';
- echo '<div>';
- echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
- echo '<table class="selection">';
+ echo '<table class="selection">
+ <tr>
+ <td>' . _('Select Inventory Categories') . ':</td>
+ <td><select autofocus="autofocus" required="required" minlength="1" size="12" name="Categories[]"multiple="multiple">';
+ $SQL = 'SELECT categoryid, categorydescription
+ FROM stockcategory
+ ORDER BY categorydescription';
+ $CatResult = DB_query($SQL);
+ while ($MyRow = DB_fetch_array($CatResult)) {
+ if (isset($_POST['Categories']) AND in_array($MyRow['categoryid'], $_POST['Categories'])) {
+ echo '<option selected="selected" value="' . $MyRow['categoryid'] . '">' . $MyRow['categorydescription'] .'</option>';
+ } else {
+ echo '<option value="' . $MyRow['categoryid'] . '">' . $MyRow['categorydescription'] . '</option>';
+ }
+ }
+ echo '</select>
+ </td>
+ </tr>';
- echo '<table class="selection">
- <tr>
- <td>' . _('Select Inventory Categories') . ':</td>
- <td><select autofocus="autofocus" required="required" minlength="1" size="12" name="Categories[]"multiple="multiple">';
- $SQL = 'SELECT categoryid, categorydescription
- FROM stockcategory
- ORDER BY categorydescription';
- $CatResult = DB_query($SQL);
- while ($MyRow = DB_fetch_array($CatResult)) {
- if (isset($_POST['Categories']) AND in_array($MyRow['categoryid'], $_POST['Categories'])) {
- echo '<option selected="selected" value="' . $MyRow['categoryid'] . '">' . $MyRow['categorydescription'] .'</option>';
- } else {
- echo '<option value="' . $MyRow['categoryid'] . '">' . $MyRow['categorydescription'] . '</option>';
- }
- }
- echo '</select>
- </td>
- </tr>';
+ echo '<tr><td>' . _('For Sales Type/Price List').':</td>
+ <td><select name="SalesType">';
+ $sql = "SELECT sales_type, typeabbrev FROM salestypes";
+ $SalesTypesResult=DB_query($sql);
- echo '<tr><td>' . _('For Sales Type/Price List').':</td>
- <td><select name="SalesType">';
- $sql = "SELECT sales_type, typeabbrev FROM salestypes";
- $SalesTypesResult=DB_query($sql);
+ while ($myrow=DB_fetch_array($SalesTypesResult)) {
+ echo '<option value="' . $myrow['typeabbrev'] . '">' . $myrow['sales_type'] . '</option>';
+ }
+ echo '</select></td></tr>';
- while ($myrow=DB_fetch_array($SalesTypesResult)) {
- echo '<option value="' . $myrow['typeabbrev'] . '">' . $myrow['sales_type'] . '</option>';
- }
- echo '</select></td></tr>';
+ echo '<tr><td>' . _('For Currency').':</td>
+ <td><select name="Currency">';
+ $sql = "SELECT currabrev, currency FROM currencies ORDER BY currency";
+ $CurrencyResult=DB_query($sql);
+ echo '<option selected="selected" value="All">' . _('All') . '</option>';
+ while ($myrow=DB_fetch_array($CurrencyResult)) {
+ echo '<option value="' . $myrow['currabrev'] . '">' . $myrow['currency'] . '</option>';
+ }
+ echo '</select></td></tr>';
- echo '<tr><td>' . _('For Currency').':</td>
- <td><select name="Currency">';
- $sql = "SELECT currabrev, currency FROM currencies ORDER BY currency";
- $CurrencyResult=DB_query($sql);
- echo '<option selected="selected" value="All">' . _('All') . '</option>';
- while ($myrow=DB_fetch_array($CurrencyResult)) {
- echo '<option value="' . $myrow['currabrev'] . '">' . $myrow['currency'] . '</option>';
- }
- echo '</select></td></tr>';
+ echo '<tr>
+ <td>' . _('Show Gross Profit %') . ':</td>
+ <td><select name="ShowGPPercentages">
+ <option selected="selected" value="No">' . _('Prices Only') . '</option>
+ <option value="Yes">' . _('Show GP % too') . '</option>
+ </select></td>
+ </tr>
+ <tr>
+ <td>' . _('Price Listing Type'). ':</td><td><select name="CustomerSpecials">
+ <option selected="selected" value="Sales Type Prices">' . _('Default Sales Type Prices') . '</option>
+ <option value="Customer Special Prices Only">' . _('Customer Special Prices Only') . '</option>
+ <option value="Full Description">' . _('Full Description') . '</option>
+ </select></td>
+ </tr>
+ <tr>
+ <td>' . _('Effective As At') . ':</td>
+ <td><input type="text" required="required" size="11" class="date" alt="' . $_SESSION['DefaultDateFormat'] . '" name="EffectiveDate" value="' . Date($_SESSION['DefaultDateFormat']) . '" /></td>
+ </tr>
+ </table>
+ <br />
+ <div class="centre">
+ <input type="submit" name="PrintPDF" value="'. _('Print PDF'). '" />
+ </div>
+ </div>
+ </form>';
- echo '<tr>
- <td>' . _('Show Gross Profit %') . ':</td>
- <td><select name="ShowGPPercentages">
- <option selected="selected" value="No">' . _('Prices Only') . '</option>
- <option value="Yes">' . _('Show GP % too') . '</option>
- </select></td>
- </tr>
- <tr>
- <td>' . _('Price Listing Type'). ':</td><td><select name="CustomerSpecials">
- <option selected="selected" value="Sales Type Prices">' . _('Default Sales Type Prices') . '</option>
- <option value="Customer Special Prices Only">' . _('Customer Special Prices Only') . '</option>
- <option value="Full Description">' . _('Full Description') . '</option>
- </select></td>
- </tr>
- <tr>
- <td>' . _('Effective As At') . ':</td>
- <td><input type="text" required="required" size="11" class="date" alt="' . $_SESSION['DefaultDateFormat'] . '" name="EffectiveDate" value="' . Date($_SESSION['DefaultDateFormat']) . '" /></td>
- </tr>
- </table>
- <br />
- <div class="centre">
- <input type="submit" name="PrintPDF" value="'. _('Print PDF'). '" />
- </div>
- </div>
- </form>';
- }
include('includes/footer.inc');
} /*end of else not PrintPDF */
Modified: trunk/StockCheck.php
===================================================================
--- trunk/StockCheck.php 2014-11-06 02:29:31 UTC (rev 6961)
+++ trunk/StockCheck.php 2014-11-06 02:59:12 UTC (rev 6962)
@@ -4,11 +4,7 @@
include('includes/session.inc');
-If (isset($_POST['PrintPDF'])
- AND isset($_POST['FromCriteria'])
- AND mb_strlen($_POST['FromCriteria'])>=1
- AND isset($_POST['ToCriteria'])
- AND mb_strlen($_POST['ToCriteria'])>=1){
+If (isset($_POST['PrintPDF'])){
include('includes/PDFStarter.php');
$pdf->addInfo('Title',_('Stock Count Sheets'));
@@ -31,12 +27,12 @@
'" . Date('Y-m-d') . "'
FROM locstock,
stockmaster
- WHERE locstock.stockid=stockmaster.stockid AND locstock.loccode='" . $_POST['Location'] . "' AND
- stockmaster.categoryid>='" . $_POST['FromCriteria'] . "' AND
- stockmaster.categoryid<='" . $_POST['ToCriteria'] . "' AND
- stockmaster.mbflag!='A' AND
- stockmaster.mbflag!='K' AND
- stockmaster.mbflag!='D'";
+ WHERE locstock.stockid=stockmaster.stockid
+ AND locstock.loccode='" . $_POST['Location'] . "'
+ AND stockmaster.categoryid IN ('". implode("','",$_POST['Categories'])."')
+ AND stockmaster.mbflag!='A'
+ AND stockmaster.mbflag!='K'
+ AND stockmaster.mbflag!='D'";
$result = DB_query($sql,'','',false,false);
if (DB_error_no() !=0) {
@@ -56,8 +52,7 @@
$sql = "DELETE stockcheckfreeze
FROM stockcheckfreeze
INNER JOIN stockmaster ON stockcheckfreeze.stockid=stockmaster.stockid
- WHERE stockmaster.categoryid >='" . $_POST['FromCriteria'] . "'
- AND stockmaster.categoryid<='" . $_POST['ToCriteria'] . "'
+ WHERE stockmaster.categoryid IN ('". implode("','",$_POST['Categories'])."')
AND stockcheckfreeze.loccode='" . $_POST['Location'] . "'";
$result = DB_query($sql,'','',false,false);
@@ -84,8 +79,7 @@
FROM locstock INNER JOIN stockmaster
ON locstock.stockid=stockmaster.stockid
WHERE locstock.loccode='" . $_POST['Location'] . "'
- AND stockmaster.categoryid>='" . $_POST['FromCriteria'] . "'
- AND stockmaster.categoryid<='" . $_POST['ToCriteria'] . "'
+ AND stockmaster.categoryid IN ('". implode("','",$_POST['Categories'])."')
AND stockmaster.mbflag!='A'
AND stockmaster.mbflag!='K'
AND stockmaster.mbflag!='G'
@@ -123,8 +117,7 @@
ON stockcheckfreeze.stockid=stockmaster.stockid
INNER JOIN stockcategory
ON stockmaster.categoryid=stockcategory.categoryid
- WHERE stockmaster.categoryid >= '" . $_POST['FromCriteria'] . "'
- AND stockmaster.categoryid <= '" . $_POST['ToCriteria'] . "'
+ WHERE stockmaster.categoryid IN ('". implode("','",$_POST['Categories'])."')
AND (stockmaster.mbflag='B' OR mbflag='M')
AND stockcheckfreeze.loccode = '" . $_POST['Location'] . "'";
if (isset($_POST['NonZerosOnly']) and $_POST['NonZerosOnly']==true){
@@ -258,109 +251,101 @@
$Title=_('Stock Check Sheets');
include('includes/header.inc');
- if (!isset($_POST['FromCriteria']) and !isset($_POST['ToCriteria'])) {
+ echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/printer.png" title="'
+ . _('print') . '" alt="" />' . ' ' . $Title . '</p><br />';
- /*if $FromCriteria is not set then show a form to allow input */
- echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/printer.png" title="'
- . _('print') . '" alt="" />' . ' ' . $Title . '</p><br />';
-
- echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">';
- echo '<div>';
- echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
- echo '<table class="selection">';
-
- echo '<tr><td>' . _('From Inventory Category Code') . ':</td>
- <td><select name="FromCriteria">';
-
- $sql="SELECT categoryid, categorydescription FROM stockcategory ORDER BY categorydescription";
- $CatResult= DB_query($sql);
- While ($myrow = DB_fetch_array($CatResult)){
- echo '<option value="' . $myrow['categoryid'] . '">' . $myrow['categorydescription'] . ' - ' . $myrow['categoryid'] . '</option>';
+ echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">';
+ echo '<div>';
+ echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+ echo '<table class="selection">
+ <tr>
+ <td>' . _('Select Inventory Categories') . ':</td>
+ <td><select autofocus="autofocus" required="required" minlength="1" size="12" name="Categories[]"multiple="multiple">';
+ $SQL = 'SELECT categoryid, categorydescription
+ FROM stockcategory
+ ORDER BY categorydescription';
+ $CatResult = DB_query($SQL);
+ while ($MyRow = DB_fetch_array($CatResult)) {
+ if (isset($_POST['Categories']) AND in_array($MyRow['categoryid'], $_POST['Categories'])) {
+ echo '<option selected="selected" value="' . $MyRow['categoryid'] . '">' . $MyRow['categorydescription'] .'</option>';
+ } else {
+ echo '<option value="' . $MyRow['categoryid'] . '">' . $MyRow['categorydescription'] . '</option>';
}
- echo '</select></td></tr>';
+ }
+ echo '</select>
+ </td>
+ </tr>';
- echo '<tr>
- <td>' . _('To Inventory Category Code') . ':</td>
- <td><select name="ToCriteria">';
+ echo '<tr>
+ <td>' . _('For Inventory in Location') . ':</td>
+ <td><select name="Location">';
+ $sql = "SELECT locations.loccode, locationname FROM locations
+ INNER JOIN locationusers ON locationusers.loccode=locations.loccode AND locationusers.userid='" . $_SESSION['UserID'] . "' AND locationusers.canupd=1
+ ORDER BY locationname";
+ $LocnResult=DB_query($sql);
- /*Set the index for the categories result set back to 0 */
- DB_data_seek($CatResult,0);
-
- While ($myrow = DB_fetch_array($CatResult)){
- echo '<option value="' . $myrow['categoryid'] . '">' . $myrow['categorydescription'] . ' - ' . $myrow['categoryid'] . '</option>';
+ while ($myrow=DB_fetch_array($LocnResult)){
+ echo '<option value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
}
- echo '</select></td></tr>';
+ echo '</select>
+ </td>
+ </tr>';
- echo '<tr>
- <td>' . _('For Inventory in Location') . ':</td>
- <td><select name="Location">';
- $sql = "SELECT locations.loccode, locationname FROM locations
- INNER JOIN locationusers ON locationusers.loccode=locations.loccode AND locationusers.userid='" . $_SESSION['UserID'] . "' AND locationusers.canupd=1
- ORDER BY locationname";
- $LocnResult=DB_query($sql);
+ echo '<tr>
+ <td>' . _('Action for Stock Check Freeze') . ':</td>
+ <td><select name="MakeStkChkData">';
- while ($myrow=DB_fetch_array($LocnResult)){
- echo '<option value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
- }
- echo '</select>
- </td>
- </tr>';
+ if (!isset($_POST['MakeStkChkData'])){
+ $_POST['MakeStkChkData'] = 'PrintOnly';
+ }
+ if ($_POST['MakeStkChkData'] =='New'){
+ echo '<option selected="selected" value="New">' . _('Make new stock check data file') . '</option>';
+ } else {
+ echo '<option value="New">' . _('Make new stock check data file') . '</option>';
+ }
+ if ($_POST['MakeStkChkData'] =='AddUpdate'){
+ echo '<option selected="selected" value="AddUpdate">' . _('Add/update existing stock check file') . '</option>';
+ } else {
+ echo '<option value="AddUpdate">' . _('Add/update existing stock check file') . '</option>';
+ }
+ if ($_POST['MakeStkChkData'] =='PrintOnly'){
+ echo '<option selected="selected" value="PrintOnly">' . _('Print Stock Check Sheets Only') . '</option>';
+ } else {
+ echo '<option value="PrintOnly">' . _('Print Stock Check Sheets Only') . '</option>';
+ }
+ echo '</select></td></tr>';
- echo '<tr>
- <td>' . _('Action for Stock Check Freeze') . ':</td>
- <td><select name="MakeStkChkData">';
+ echo '<tr>
+ <td>' . _('Show system quantity on sheets') . ':</td>
+ <td>';
- if (!isset($_POST['MakeStkChkData'])){
- $_POST['MakeStkChkData'] = 'PrintOnly';
- }
- if ($_POST['MakeStkChkData'] =='New'){
- echo '<option selected="selected" value="New">' . _('Make new stock check data file') . '</option>';
- } else {
- echo '<option value="New">' . _('Make new stock check data file') . '</option>';
- }
- if ($_POST['MakeStkChkData'] =='AddUpdate'){
- echo '<option selected="selected" value="AddUpdate">' . _('Add/update existing stock check file') . '</option>';
- } else {
- echo '<option value="AddUpdate">' . _('Add/update existing stock check file') . '</option>';
- }
- if ($_POST['MakeStkChkData'] =='PrintOnly'){
- echo '<option selected="selected" value="PrintOnly">' . _('Print Stock Check Sheets Only') . '</option>';
- } else {
- echo '<option value="PrintOnly">' . _('Print Stock Check Sheets Only') . '</option>';
- }
- echo '</select></td></tr>';
+ if (isset($_POST['ShowInfo']) and $_POST['ShowInfo'] == false){
+ echo '<input type="checkbox" name="ShowInfo" value="false" />';
+ } else {
+ echo '<input type="checkbox" name="ShowInfo" value="true" />';
+ }
+ echo '</td>
+ </tr>';
- echo '<tr>
- <td>' . _('Show system quantity on sheets') . ':</td>
- <td>';
+ echo '<tr>
+ <td>' . _('Only print items with non zero quantities') . ':</td>
+ <td>';
+ if (isset($_POST['NonZerosOnly']) and $_POST['NonZerosOnly'] == false){
+ echo '<input type="checkbox" name="NonZerosOnly" value="false" />';
+ } else {
+ echo '<input type="checkbox" name="NonZerosOnly" value="true" />';
+ }
- if (isset($_POST['ShowInfo']) and $_POST['ShowInfo'] == false){
- echo '<input type="checkbox" name="ShowInfo" value="false" />';
- } else {
- echo '<input type="checkbox" name="ShowInfo" value="true" />';
- }
- echo '</td>
- </tr>';
+ echo '</td>
+ </tr>
+ </table>
+ <br />
+ <div class="centre">
+ <input type="submit" name="PrintPDF" value="' . _('Print and Process') . '" />
+ </div>
+ </div>
+ </form>';
- echo '<tr>
- <td>' . _('Only print items with non zero quantities') . ':</td>
- <td>';
- if (isset($_POST['NonZerosOnly']) and $_POST['NonZerosOnly'] == false){
- echo '<input type="checkbox" name="NonZerosOnly" value="false" />';
- } else {
- echo '<input type="checkbox" name="NonZerosOnly" value="true" />';
- }
-
- echo '</td>
- </tr>
- </table>
- <br />
- <div class="centre">
- <input type="submit" name="PrintPDF" value="' . _('Print and Process') . '" />
- </div>
- </div>
- </form>';
- }
include('includes/footer.inc');
} /*end of else not PrintPDF */
|
