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

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

Revision: 6455
          http://sourceforge.net/p/web-erp/reponame/6455
Author:   daintree
Date:     2013-11-29 07:30:02 +0000 (Fri, 29 Nov 2013)
Log Message:
-----------
Phil: Apply Tims idea for stripping slashes from incorrectly displayed items PO_Items.php and DeliveryDetails.php

Modified Paths:
--------------
    trunk/DeliveryDetails.php
    trunk/PO_Items.php
    trunk/SuppInvGRNs.php
    trunk/doc/Change.log

Modified: trunk/DeliveryDetails.php
===================================================================
--- trunk/DeliveryDetails.php	2013-11-29 03:58:36 UTC (rev 6454)
+++ trunk/DeliveryDetails.php	2013-11-29 07:30:02 UTC (rev 6455)
@@ -995,7 +995,7 @@
 	<table class="selection">
 	<tr>
 		<td>' .  _('Deliver To') .':</td>
-		<td><input type="text" autofocus="autofocus" required="required" size="42" maxlength="40" name="DeliverTo" value="' . $_SESSION['Items'.$identifier]->DeliverTo . '" title="' . _('Enter the name of the customer to deliver this order to') . '" /></td>
+		<td><input type="text" autofocus="autofocus" required="required" size="42" maxlength="40" name="DeliverTo" value="' .  stripslashes($_SESSION['Items' . $identifier]->DeliverTo . '" title="' . _('Enter the name of the customer to deliver this order to') . '" /></td>
 	</tr>';
 
 echo '<tr>

Modified: trunk/PO_Items.php
===================================================================
--- trunk/PO_Items.php	2013-11-29 03:58:36 UTC (rev 6454)
+++ trunk/PO_Items.php	2013-11-29 07:30:02 UTC (rev 6455)
@@ -756,7 +756,7 @@
 			}
 
 			echo '<td>' . $POLine->StockID  . '</td>
-                <td><input type="text" name="ItemDescription' . $POLine->LineNo.'" size="30" value="' .$POLine->ItemDescription .'" /></td>
+                <td><input type="text" name="ItemDescription' . $POLine->LineNo.'" size="30" value="' . stripslashes($POLine->ItemDescription) . '" /></td>
 				<td class="number">' . locale_number_format($POLine->Quantity,$POLine->DecimalPlaces) . '</td>
 				<td>' . $POLine->Units . '</td>
 				<td class="number">' . $DisplayPrice . '</td>

Modified: trunk/SuppInvGRNs.php
===================================================================
--- trunk/SuppInvGRNs.php	2013-11-29 03:58:36 UTC (rev 6454)
+++ trunk/SuppInvGRNs.php	2013-11-29 07:30:02 UTC (rev 6455)
@@ -65,16 +65,6 @@
 			$Complete = False;
 		}
 
-		/* It is not logical to allow being charged for more than was received  - and doing so would leave the goods received suspense account out of balance */
-		/*
-		if ($_SESSION['Check_Qty_Charged_vs_Del_Qty']==True) {
-			if ((filter_number_format($_POST['This_QuantityInv'])+ $_POST['Prev_QuantityInv'])/($_POST['QtyRecd'] ) > (1+ ($_SESSION['OverChargeProportion'] / 100))){
-				prnMsg(_('The quantity being invoiced is more than the outstanding quantity by more than') . ' ' . $_SESSION['OverChargeProportion'] . ' ' .
-				 _('percent. The system is set up to prohibit this so will put this invoice on hold until it is authorised'),'warn');
-				$Hold = True;
-			}
-		}
-		*/
 		if (filter_number_format($_POST['This_QuantityInv'+$i])+$_SESSION['SuppTrans']->GRNs[$_POST['GRNNo'.$i]]->Prev_QuantityInv-$_SESSION['SuppTrans']->GRNs[$_POST['GRNNo'.$i]]->QtyRecd > 0){
 			prnMsg(_('The quantity being invoiced is more than the outstanding quantity that was delivered. It is not possible to enter an invoice for a quantity more than was received into stock'),'warn');
 			$InputError = True;

Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log	2013-11-29 03:58:36 UTC (rev 6454)
+++ trunk/doc/Change.log	2013-11-29 07:30:02 UTC (rev 6455)
@@ -1,9 +1,11 @@
 webERP Change Log
-2013/11/28 Thumb: Add salesman constraints to ConfirmDispatch_Invoice.php to ensure that sales can only print his own sales orders' invoice. 
-2013/11/28 Thumb: Add constraints to salesman that he can only print his own sales orders in PrintCustOrder_generic.php
-2013/11/28 Thumb: Add constraints to salesman that he can only print his own sales orders in PrintCustOrder.php
-2013/11/28 Thumb: Add salesman login constraint to only their own customers available in SelectOrderItems.php and fixed SQL error of customers login. 
-2013/11/27 Thumb: Add create new scripts to import Customers and Debtors. 
+
+28/11/13 Phil: Apply Tim's idea for stripping slashes from incorrectly displayed items PO_Items.php and DeliveryDetails.php
+28/11/13 Thumb: Add salesman constraints to ConfirmDispatch_Invoice.php to ensure that sales can only print his own sales orders' invoice. 
+28/11/13 Thumb: Add constraints to salesman that he can only print his own sales orders in PrintCustOrder_generic.php
+28/11/13 Thumb: Add constraints to salesman that he can only print his own sales orders in PrintCustOrder.php
+28/11/13 Thumb: Add salesman login constraint to only their own customers available in SelectOrderItems.php and fixed SQL error of customers login. 
+27/11/13 Thumb: Add create new scripts to import Customers and Debtors. 
 26/11/13 Phil: Supplier invoice entry now allows modification of invoice quantities and prices for multiple goods received lines in line rather than having to go into each line to modify individually.
 20/11/13 rchacon: Translate the name of each language to the name in their respective language.
 20/11/13 Phil: Payments.php FunctionalExchangeRate was not defaulted appropriately when entering a supplier payment in FX from a bank account of the same currency selected and the transaction was posted immediately without update first. Fixed