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

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

Revision: 7240
          http://sourceforge.net/p/web-erp/reponame/7240
Author:   daintree
Date:     2015-03-29 06:47:12 +0000 (Sun, 29 Mar 2015)
Log Message:
-----------
allow dummy/service items to be downloaded with the data refresh to the POS

Modified Paths:
--------------
    trunk/doc/Change.log
    trunk/includes/Z_POSDataCreation.php

Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log	2015-03-27 13:57:20 UTC (rev 7239)
+++ trunk/doc/Change.log	2015-03-29 06:47:12 UTC (rev 7240)
@@ -1,9 +1,10 @@
 webERP Change Log
 
+29/3/15  Phil: Allow dummy/service items to be propogated to CounterLogic POS installs through the api
 27/03/15 Exson: Remove redundant code from PrintCustTrans.php.
 27/03/15 Exson: Make credit not for freight only is printable in PrintCustTrans.php.
 26/03/15 Exson: Fixed disabletrans status bug in CustomerBranches.php and fix index undefined noise.
-25/03/15 Exson: Add planned accumulation in MRP report. 
+25/03/15 Exson: Add planned accumulation in MRP report.
 14/03/15 Exson: Fixed undefined index noise in Credit_Invoice.php.
 13/03/15 Exson: fixed the undefined index noise in WorkOrderReceive.php.
 13/03/15 Exson: Fixed the undefined index noise in SelectWorkOrder.php.
@@ -13,7 +14,7 @@
 11/3/15 Exson: Fixed wrong handling for dummy parts receiving from PO in GoodsReceived.php.
 09/03/15 Vitaly: Page refresh when credit type changes in Credit_Invoce.php
 09/03/15 RChacon: In DailyBankTransactions.php: Improves page_title_text. Orders by banktrans.transdate ascending and banktrans.banktransid ascending. Adds division to identify the report block. Groups table-header cells inside thead tags. Groups table-data cells inside tbody tags. Adds th.text class to left align. Adds "Print This" and "Return" buttons with icon.
-09/03/15 Exson: Fixed undefined index noise of $_POST['SupplierContact'] in PO_Header.php. 
+09/03/15 Exson: Fixed undefined index noise of $_POST['SupplierContact'] in PO_Header.php.
 08/03/15 Vitaly: Fit HTML view of invoices to one screen
 08/03/15 Exson: Fixed undefined index noise in PO_Items.php.
 07/03/15 RChacon: Deletes class="invoice" (it does not exist in css). Creates division id="Report" to identify the report block. Moves full width style to print.css (thanks Tim Schofield).

Modified: trunk/includes/Z_POSDataCreation.php
===================================================================
--- trunk/includes/Z_POSDataCreation.php	2015-03-27 13:57:20 UTC (rev 7239)
+++ trunk/includes/Z_POSDataCreation.php	2015-03-29 06:47:12 UTC (rev 7240)
@@ -122,7 +122,7 @@
 	fwrite($FileHandle,"DELETE FROM stockmaster;\n");
 
 
-	$result = DB_query("SELECT stockid, categoryid, description, longdescription, units, barcode, taxcatid, decimalplaces, discountcategory FROM stockmaster WHERE (mbflag='B' OR mbflag='M') AND discontinued=0 AND controlled=0");
+	$result = DB_query("SELECT stockid, categoryid, description, longdescription, units, barcode, taxcatid, decimalplaces, discountcategory FROM stockmaster WHERE (mbflag='B' OR mbflag='M' OR mbflag='D') AND discontinued=0 AND controlled=0");
 
 	while ($myrow = DB_fetch_array($result)) {