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

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

Revision: 5747
          http://sourceforge.net/p/web-erp/reponame/5747
Author:   daintree
Date:     2012-11-29 09:06:53 +0000 (Thu, 29 Nov 2012)
Log Message:
-----------
jtrick: start on work to map database names to company names and remove dependence on the company directory name

Modified Paths:
--------------
    trunk/CounterReturns.php
    trunk/CounterSales.php
    trunk/StockCategories.php
    trunk/doc/Change.log
    trunk/install/index.php
    trunk/install/save.php

Added Paths:
-----------
    trunk/companies/companies.inf

Modified: trunk/CounterReturns.php
===================================================================
--- trunk/CounterReturns.php	2012-11-25 11:12:57 UTC (rev 5746)
+++ trunk/CounterReturns.php	2012-11-29 09:06:53 UTC (rev 5747)
@@ -844,9 +844,14 @@
 
 	echo '</table>'; //end the sub table in the second column of master table
 	echo '</th></tr></table>';	//end of column/row/master table
-	echo '<br /><div class="centre"><input type="submit" name="Recalculate" value="' . _('Re-Calculate') . '" />
-				<input type="submit" name="ProcessReturn" value="' . _('Process The Return') . '" /></div><hr />';
-
+	if (!isset($_POST['ProcessReturn'])){
+		echo '<br />
+				<div class="centre">
+					<input type="submit" name="Recalculate" value="' . _('Re-Calculate') . '" />
+					<input type="submit" name="ProcessReturn" value="' . _('Process The Return') . '" />
+				</div>';
+	}
+	echo '<hr />';
 } # end of if lines
 
 /* **********************************

Modified: trunk/CounterSales.php
===================================================================
--- trunk/CounterSales.php	2012-11-25 11:12:57 UTC (rev 5746)
+++ trunk/CounterSales.php	2012-11-29 09:06:53 UTC (rev 5747)
@@ -764,7 +764,7 @@
 	$k =0;  //row colour counter
 	foreach ($_SESSION['Items'.$identifier]->LineItems as $OrderLine) {
 
-		$SubTotal = $OrderLine->Quantity * $OrderLine->Price * (1 - $OrderLine->DiscountPercent);
+		$SubTotal = round($OrderLine->Quantity * $OrderLine->Price * (1 - $OrderLine->DiscountPercent),$_SESSION['Items'.$identifier]->CurrDecimalPlaces);
 		$DisplayDiscount = locale_number_format(($OrderLine->DiscountPercent * 100),2);
 		$QtyOrdered = $OrderLine->Quantity;
 		$QtyRemain = $QtyOrdered - $OrderLine->QtyInv;
@@ -938,12 +938,14 @@
 	echo '</th>
 		</tr>
 		</table>';	//end of column/row/master table
-	echo '<br />
-			<div class="centre">
-				<input type="submit" name="Recalculate" value="' . _('Re-Calculate') . '" />
-				<input type="submit" name="ProcessSale" value="' . _('Process The Sale') . '" />
-			</div>
-			<hr />'