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

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

Revision: 3418
          http://web-erp.svn.sourceforge.net/web-erp/?rev=3418&view=rev
Author:   tim_schofield
Date:     2010-04-14 23:12:11 +0000 (Wed, 14 Apr 2010)

Log Message:
-----------
Tim: SystemParameters.php - Add in picking note parameter

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

Modified: trunk/SystemParameters.php
===================================================================
--- trunk/SystemParameters.php	2010-04-14 15:21:11 UTC (rev 3417)
+++ trunk/SystemParameters.php	2010-04-14 23:12:11 UTC (rev 3418)
@@ -219,6 +219,9 @@
 		if ($_SESSION['AllowOrderLineItemNarrative'] != $_POST['X_AllowOrderLineItemNarrative'] ) {
 			$sql[] = "UPDATE config SET confvalue = '". $_POST['X_AllowOrderLineItemNarrative']."' WHERE confname = 'AllowOrderLineItemNarrative'";
 		}
+		if ($_SESSION['RequirePickingNote'] != $_POST['X_RequirePickingNote'] ) {
+			$sql[] = "UPDATE config SET confvalue = '". $_POST['X_RequirePickingNote']."' WHERE confname = 'RequirePickingNote'";
+		}
 		if ($_SESSION['geocode_integration'] != $_POST['X_geocode_integration'] ) {
 			$sql[] = "UPDATE config SET confvalue = '". $_POST['X_geocode_integration']."' WHERE confname = 'geocode_integration'";
 		}
@@ -382,6 +385,16 @@
 	</select></td>
 	<td>' . _('Select whether or not to allow entry of narrative on order line items. This narrative will appear on invoices and packing slips. Useful mainly for service businesses.') . '</td>
 	</tr>';
+
+//'RequirePickingNote'
+echo '<tr><td>' . _('A picking note must be produced before an order can be delivered') . ':</td>
+	<td><select Name="X_RequirePickingNote">
+	<option '.($_SESSION['RequirePickingNote']=='1'?'selected ':'').'value="1">'._('Yes').'
+	<option '.($_SESSION['RequirePickingNote']=='0'?'selected ':'').'value="0">'._('No').'
+	</select></td>
+	<td>' . _('Select whether or not a picking note must be produced before an order can be delivered to a customer.') . '</td>
+	</tr>';
+
 //UpdateCurrencyRatesDaily
 echo '<tr><td>' . _('Auto Update Exchange Rates Daily') . ':</td>
 	<td><select Name="X_UpdateCurrencyRatesDaily">

Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html	2010-04-14 15:21:11 UTC (rev 3417)
+++ trunk/doc/Change.log.html	2010-04-14 23:12:11 UTC (rev 3418)
@@ -1,5 +1,6 @@
 <p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
 <p></p>
+<p>15/04/10 Tim: SystemParameters.php - Add in picking note parameter</p>
 <p>14/04/10 Tim: SelectOrdderitems.php and DeliveryDetails.php - Improvements to layout and design of sales order entry</p>
 <p>08/04/10 Tim: SuppTransGLAnalysis.php - Correct typo in sql statement.</p>
 <p>07/04/10 Tim: SelectOrdderitems.php and DeliveryDetails.php - Improvements to layout.</p>

Modified: trunk/sql/mysql/upgrade3.11.1-3.12.sql
===================================================================
--- trunk/sql/mysql/upgrade3.11.1-3.12.sql	2010-04-14 15:21:11 UTC (rev 3417)
+++ trunk/sql/mysql/upgrade3.11.1-3.12.sql	2010-04-14 23:12:11 UTC (rev 3418)
@@ -128,4 +128,6 @@
 ALTER TABLE `debtortrans`
   ADD COLUMN `inputdate` datetime NOT NULL AFTER `trandate` ;
 
-ALTER TABLE `reportfields` CHANGE COLUMN `fieldname` `fieldname` VARCHAR(60) NOT NULL DEFAULT '';
\ No newline at end of file
+ALTER TABLE `reportfields` CHANGE COLUMN `fieldname` `fieldname` VARCHAR(60) NOT NULL DEFAULT '';
+
+INSERT INTO `config` (`confname`, `confvalue`) VALUES ('RequirePickingNote',0);


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