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

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

Revision: 4112
          http://web-erp.svn.sourceforge.net/web-erp/?rev=4112&view=rev
Author:   tim_schofield
Date:     2010-10-27 01:28:50 +0000 (Wed, 27 Oct 2010)

Log Message:
-----------
Fix discount category bug

Modified Paths:
--------------
    trunk/DiscountMatrix.php
    trunk/doc/Change.log.html

Modified: trunk/DiscountMatrix.php
===================================================================
--- trunk/DiscountMatrix.php	2010-10-26 21:02:29 UTC (rev 4111)
+++ trunk/DiscountMatrix.php	2010-10-27 01:28:50 UTC (rev 4112)
@@ -125,6 +125,8 @@
 		echo '</option>';
 	}
 	echo '</select></td>';
+} else {
+	echo '<input type="hidden" name="DiscountCategory" value="">';
 }
 
 echo '<tr><td>' . _('Quantity Break') . ":</td><td><input class='number' tabindex=3 "
@@ -178,7 +180,7 @@
 		$myrow['sales_type'],
 		$myrow['discountcategory'],
 		$myrow['quantitybreak'],
-		number_format($myrow['discountrate']*100,2) ,
+		$myrow['discountrate']*100 ,
 		$DeleteURL);
 
 }

Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html	2010-10-26 21:02:29 UTC (rev 4111)
+++ trunk/doc/Change.log.html	2010-10-27 01:28:50 UTC (rev 4112)
@@ -1,5 +1,6 @@
 <p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
 <p></p>
+<p>26/10/10 Tim: Discountmatrix.php - Fix discount category bug</p>
 <p>26/10/10 Tim: Discountmatrix.php - Increase the number of decimal places that can be entered</p>
 <p>26/10/10 Tim: StockLocTransfer.php - Check there is sufficient stock for the transfer</p>
 <p>25/10/10 Marcos Garcia Trejo: New labelprinting functionality </p>


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