[Web-erp-svn] SF.net SVN: web-erp:[7145] trunk

[<dai...@us...>]

Revision: 7145
          http://sourceforge.net/p/web-erp/reponame/7145
Author:   daintree
Date:     2015-02-10 04:55:43 +0000 (Tue, 10 Feb 2015)
Log Message:
-----------
Reinstate Andews custitems search option in searching for items in order entry

Modified Paths:
--------------
    trunk/SelectOrderItems.php
    trunk/doc/Change.log
    trunk/includes/MainMenuLinksArray.php
    trunk/sql/mysql/upgrade4.12-4.13.sql

Modified: trunk/SelectOrderItems.php
===================================================================
--- trunk/SelectOrderItems.php	2015-02-09 23:07:16 UTC (rev 7144)
+++ trunk/SelectOrderItems.php	2015-02-10 04:55:43 UTC (rev 7145)
@@ -707,10 +707,10 @@
 		}
 		if(!empty($_POST['CustItemFlag'])){
 			$IncludeCustItem = " INNER JOIN custitem ON custitem.stockid=stockmaster.stockid
-								AND custitem.debtorno='" .  $_SESSION['Items'.$identifier]->DebtorNo . "'";
-		}else{
+								AND custitem.debtorno='" .  $_SESSION['Items'.$identifier]->DebtorNo . "' ";
+		} else {
 			$IncludeCustItem = " LEFT OUTER JOIN custitem ON custitem.stockid=stockmaster.stockid
-								AND custitem.debtorno='" .  $_SESSION['Items'.$identifier]->DebtorNo . "'";
+								AND custitem.debtorno='" .  $_SESSION['Items'.$identifier]->DebtorNo . "' ";
 		}
 
 		if ($_POST['Keywords']!='' AND $_POST['StockCode']=='') {
@@ -721,14 +721,18 @@
 			$msg='<div class="page_help_text">' . _('Stock Category has been used in search') . '.</div>';
 		}
 		$SQL = "SELECT stockmaster.stockid,
-								stockmaster.description,
-								stockmaster.longdescription,
-								stockmaster.units
-						FROM stockmaster INNER JOIN stockcategory
-						ON stockmaster.categoryid=stockcategory.categoryid
-						WHERE (stockcategory.stocktype='F' OR stockcategory.stocktype='D' OR stockcategory.stocktype='L')
-						AND stockmaster.mbflag <>'G'
-						AND stockmaster.discontinued=0 ";
+						stockmaster.description,
+						stockmaster.longdescription,
+						stockmaster.units,
+						custitem.cust_part,
+						custitem.cust_description
+				FROM stockmaster INNER JOIN stockcategory
+				ON stockmaster.categoryid=stockcategory.categoryid
+				" . $IncludeCustItem . "
+				WHERE (stockcategory.stocktype='F' OR stockcategory.stocktype='D' OR stockcategory.stocktype='L')
+				AND stockmaster.mbflag <>'G'
+				AND stockmaster.discontinued=0 ";
+
 		if (isset($_POST['Keywords']) AND mb_strlen($_POST['Keywords'])>0) {
 			//insert wildcard characters in spaces
 			$_POST['Keywords'] = mb_strtoupper($_POST['Keywords']);

Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log	2015-02-09 23:07:16 UTC (rev 7144)
+++ trunk/doc/Change.log	2015-02-10 04:55:43 UTC (rev 7145)
@@ -1,10 +1,11 @@
 webERP Change Log
 
+10/2/15 Phil: Reinstate Andrew Galuski's lost functionality that shows only the items that are defined for a customer (in the custitems table) when searching for items for a sales order/quote.
 9/2/15 RChacon: Standardise to currency.png. Delete currency.gif.
 8/2/15 RChacon: Changes from email.gif to email.png. Delete email.gif.
-8/2/15 InventoryPlanning.php now has an option to export the last 24 months usage to CSV
+8/2/15 Phil: InventoryPlanning.php now has an option to export the last 24 months usage to CSV
 8/2/15 RChacon:  Add credit.png, email.png, folders.png and currency.png. Delete bank.gif.
-7/2/15 New script CustomerAccount.php - on screen statement similar to CustomerInquiry.php
+7/2/15 Phil: New script CustomerAccount.php - on screen statement similar to CustomerInquiry.php
 
 6/2/15 Version 4.12.2
 

Modified: trunk/includes/MainMenuLinksArray.php
===================================================================
--- trunk/includes/MainMenuLinksArray.php	2015-02-09 23:07:16 UTC (rev 7144)
+++ trunk/includes/MainMenuLinksArray.php	2015-02-10 04:55:43 UTC (rev 7145)
@@ -56,6 +56,7 @@
 													_('Daily Sales Inquiry'),
 													_('Sales By Sales Type Inquiry'),
 													_('Sales By Category Inquiry'),
+													_('Sales By Category By Item Inquiry'),
 													_('Top Sellers Inquiry'),
 													_('Order Delivery Differences Report'),
 													_('Delivery In Full On Time (DIFOT) Report'),
@@ -73,6 +74,7 @@
 												'/DailySalesInquiry.php',
 												'/SalesByTypePeriodInquiry.php',
 												'/SalesCategoryPeriodInquiry.php',
+												'/StockCategorySalesInquiry.php',
 												'/SalesTopItemsInquiry.php',
 												'/PDFDeliveryDifferences.php',
 												'/PDFDIFOT.php',

Modified: trunk/sql/mysql/upgrade4.12-4.13.sql
===================================================================
--- trunk/sql/mysql/upgrade4.12-4.13.sql	2015-02-09 23:07:16 UTC (rev 7144)
+++ trunk/sql/mysql/upgrade4.12-4.13.sql	2015-02-10 04:55:43 UTC (rev 7145)
@@ -1,3 +1,3 @@
 INSERT INTO `scripts` (`script`, `pagesecurity`, `description`) VALUES ('CustomerAccount.php', '1', 'Shows customer account/statement on screen rather than PDF');
-
+INSERT INTO `scripts` (`script`, `pagesecurity`, `description`) VALUES ('StockCategorySalesInquiry.php', '2', 'Sales inquiry by stock category showing top items');
 -----UPDATE config SET confvalue='4.13' WHERE confname='VersionNumber';
\ No newline at end of file