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

[<vv...@us...>]

Revision: 7188
          http://sourceforge.net/p/web-erp/reponame/7188
Author:   vvs2012
Date:     2015-03-05 01:57:24 +0000 (Thu, 05 Mar 2015)
Log Message:
-----------
Display Phantom assembly type correctly in SelectProduct.php

Modified Paths:
--------------
    trunk/SelectProduct.php
    trunk/doc/Change.log

Modified: trunk/SelectProduct.php
===================================================================
--- trunk/SelectProduct.php	2015-03-05 01:28:14 UTC (rev 7187)
+++ trunk/SelectProduct.php	2015-03-05 01:57:24 UTC (rev 7188)
@@ -101,6 +101,11 @@
 			echo _('Assembly Item');
 			$Its_A_Kitset_Assembly_Or_Dummy = True;
 		break;
+        case 'G':
+            echo _('Phantom Assembly Item');
+            $Its_A_Kitset_Assembly_Or_Dummy = True;
+            $Its_A_Kitset = True;
+        break;
 		case 'K':
 			echo _('Kitset Item');
 			$Its_A_Kitset_Assembly_Or_Dummy = True;
@@ -147,7 +152,7 @@
 								AND branchcode=''
 								AND startdate <= '". Date('Y-m-d') ."' AND ( enddate >= '" . Date('Y-m-d') . "' OR enddate = '0000-00-00')
 								AND stockid='" . $StockID . "'");
-		if ($myrow['mbflag'] == 'K' OR $myrow['mbflag'] == 'A') {
+		if ($myrow['mbflag'] == 'K' OR $myrow['mbflag'] == 'A' OR $myrow['mbflag'] == 'G') {
 			$CostResult = DB_query("SELECT SUM(bom.quantity * (stockmaster.materialcost+stockmaster.labourcost+stockmaster.overheadcost)) AS cost
 									FROM bom INNER JOIN stockmaster
 									ON bom.component=stockmaster.stockid

Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log	2015-03-05 01:28:14 UTC (rev 7187)
+++ trunk/doc/Change.log	2015-03-05 01:57:24 UTC (rev 7188)
@@ -1,5 +1,6 @@
 webERP Change Log
 
+3/4/15 Vitaly: Display Phantom assembly type correctly in SelectProduct.php
 3/4/15 Vitaly: Added missing comma to SQL statement in Credit_Invoice.php
 3/3/15 RChacon: Adds cross.png to all css images for use in Reset or Cancel buttons as needed.
 2/3/15 RChacon: Completes table-row colums, regroups price, cost and gross profit in one table-row, uses company decimal places for gross profit in SelectProduct.php.