[Weberp-cvs] SF.net SVN: web-erp:[3485] trunk

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

Revision: 3485
          http://web-erp.svn.sourceforge.net/web-erp/?rev=3485&view=rev
Author:   tim_schofield
Date:     2010-06-08 13:53:28 +0000 (Tue, 08 Jun 2010)

Log Message:
-----------
Add option to exclude value information from GRN screen

Modified Paths:
--------------
    trunk/GoodsReceived.php
    trunk/SystemParameters.php
    trunk/doc/Change.log.html
    trunk/sql/mysql/upgrade3.11.1-3.12.sql

Modified: trunk/GoodsReceived.php
===================================================================
--- trunk/GoodsReceived.php	2010-06-07 19:58:17 UTC (rev 3484)
+++ trunk/GoodsReceived.php	2010-06-08 13:53:28 UTC (rev 3485)
@@ -71,10 +71,11 @@
 	<th>' . _('Quantity') . '<br>' . _('Ordered') . '</th>
 	<th>' . _('Units') . '</th>
 	<th>' . _('Already Received') . '</th>
-	<th>' . _('This Delivery') . '<br>' . _('Quantity') . '</th>
-	<th>' . _('Price') . '</th>
-	<th>' . _('Total Value') . '<br>' . _('Received') . '</th>';
+	<th>' . _('This Delivery') . '<br>' . _('Quantity') . '</th>';
 
+if ($_SESSION['ShowValueOnGRN']==1) {
+	echo '<th>' . _('Price') . '</th><th>' . _('Total Value') . '<br>' . _('Received') . '</th>';
+}
 
 echo '<td>&nbsp;</td>
 	</tr>';
@@ -151,8 +152,10 @@
 			echo '<input type=text class=number name="RecvQty_' . $LnItm->LineNo . '" maxlength=10 size=10 value="' . $LnItm->ReceiveQty . '"></td>';
 		}
 
-		echo '<td class=number><font size=2>' . $DisplayPrice . '</td>';
-		echo '<td class=number><font size=2>' . $DisplayLineTotal . '</font></td>';
+		if ($_SESSION['ShowValueOnGRN']==1) {
+			echo '<td class=number><font size=2>' . $DisplayPrice . '</td>';
+			echo '<td class=number><font size=2>' . $DisplayLineTotal . '</font></td>';
+		}
 
 
 		if ($LnItm->Controlled == 1) {
@@ -170,9 +173,13 @@
 }//If count(LineItems) > 0
 
 $DisplayTotal = number_format($_SESSION['PO']->total,2);
-echo '<tr><td colspan=7 class=number><b>' . _('Total value of goods received'). '</b></td>
-	<td class=number><font size=2><b>'. $DisplayTotal. '</b></font></td>
-</tr></table>';
+if ($_SESSION['ShowValueOnGRN']==1) {
+	echo '<tr><td colspan=7 class=number><b>' . _('Total value of goods received'). '</b></td>
+		<td class=number><font size=2><b>'. $DisplayTotal. '</b></font></td>
+		</tr></table>';
+} else {
+	echo '</table>';
+}
 
 $SomethingReceived = 0;
 if (count($_SESSION['PO']->LineItems)>0){

Modified: trunk/SystemParameters.php
===================================================================
--- trunk/SystemParameters.php	2010-06-07 19:58:17 UTC (rev 3484)
+++ trunk/SystemParameters.php	2010-06-08 13:53:28 UTC (rev 3485)
@@ -198,6 +198,9 @@
 		if ($_SESSION['DefaultBlindPackNote'] != $_POST['X_DefaultBlindPackNote'] ) {
 			$sql[] = "UPDATE config SET confvalue = '". ($_POST['X_DefaultBlindPackNote'])."' WHERE confname = 'DefaultBlindPackNote'";
 		}
+		if ($_SESSION['ShowValueOnGRN'] != $_POST['X_ShowValueOnGRN'] ) {
+			$sql[] = "UPDATE config SET confvalue = '". ($_POST['X_ShowValueOnGRN'])."' WHERE confname = 'ShowValueOnGRN'";
+		}
 		if ($_SESSION['PackNoteFormat'] != $_POST['X_PackNoteFormat'] ) {
 			$sql[] = "UPDATE config SET confvalue = '". ($_POST['X_PackNoteFormat'])."' WHERE confname = 'PackNoteFormat'";
 		}
@@ -431,7 +434,16 @@
 	<td>' . _('Customer branches can be set by default not to print packing slips with the company logo and address. This is useful for companies that ship to customers customers and to show the source of the shipment would be inappropriate. There is an option on the setup of customer branches to ship blind, this setting is the default applied to all new customer branches') . '</td>
 	</tr>';
 
+//Show values on GRN
+echo '<tr><td>' . _('Show order values on GRN') . ':</td>
+	<td><select Name="X_ShowValueOnGRN">
+	<option '.($_SESSION['ShowValueOnGRN']?'selected ':'').'value="1">'._('Yes').'
+	<option '.(!$_SESSION['ShowValueOnGRN']?'selected ':'').'value="0">'._('No').'
+	</select></td>
+	<td>' . _('Should the value of the purchased stock be shown on the GRN screen') . '</td>
+	</tr>';
 
+
 // DispatchCutOffTime
 echo '<tr><td>' . _('Dispatch Cut-Off Time') . ':</td>
 	<td><select Name="X_DispatchCutOffTime">';

Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html	2010-06-07 19:58:17 UTC (rev 3484)
+++ trunk/doc/Change.log.html	2010-06-08 13:53:28 UTC (rev 3485)
@@ -1,5 +1,6 @@
 <p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
 <p></p>
+<p>08/06/10 Tim: Add option to exclude value information from GRN screen</p>
 <p>07/06/10 Tim: Various changes to correctly deal with suppliers uom plus layout changes to puirchase orders and goods received notes</p>
 <p>06/06/10 Zhiguo Yuan: WorkOrderReceive.php - Change to make rollup costs change when more labour or overheadcosts change</p>
 <p>03/06/10 Phil: Added a bit of error trapping to ensure customer/branch set up when going into CounterSales.php</p>

Modified: trunk/sql/mysql/upgrade3.11.1-3.12.sql
===================================================================
--- trunk/sql/mysql/upgrade3.11.1-3.12.sql	2010-06-07 19:58:17 UTC (rev 3484)
+++ trunk/sql/mysql/upgrade3.11.1-3.12.sql	2010-06-08 13:53:28 UTC (rev 3485)
@@ -4,7 +4,7 @@
   PRIMARY KEY  (`locationid`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
-DROP TABLE `assetmanager`;
+DROP TABLE IF EXISTS `assetmanager`;
 
 CREATE TABLE `assetmanager` (
   `id` int(11) NOT NULL auto_increment,
@@ -227,3 +227,4 @@
 
 
 ALTER TABLE `salestypes` CHANGE COLUMN `sales_type` `sales_type` VARCHAR(40) NOT NULL DEFAULT '';>>>>>>> .r3482
+INSERT INTO `config` VALUES ('ShowValueOnGRN', 1);


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