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

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

Revision: 4754
          http://web-erp.svn.sourceforge.net/web-erp/?rev=4754&view=rev
Author:   daintree
Date:     2011-11-26 20:51:02 +0000 (Sat, 26 Nov 2011)
Log Message:
-----------


Modified Paths:
--------------
    trunk/GLTagProfit_Loss.php
    trunk/doc/Change.log

Modified: trunk/GLTagProfit_Loss.php
===================================================================
--- trunk/GLTagProfit_Loss.php	2011-11-26 07:58:19 UTC (rev 4753)
+++ trunk/GLTagProfit_Loss.php	2011-11-26 20:51:02 UTC (rev 4754)
@@ -655,7 +655,7 @@
 							</tr>',
 							$Sections[$Section],
 							locale_number_format($SectionPrdActual,$_SESSION['CompanyRecord']['decimalplaces']));
-					$TotalIncome -= $SectionPrdActual;
+
 				} else {
 					echo '<tr>
 							<td colspan="2"></td>
@@ -669,6 +669,10 @@
 							$Sections[$Section],
 							locale_number_format($SectionPrdActual,$_SESSION['CompanyRecord']['decimalplaces']));
 				}
+				if ($Section==1) {
+					$TotalIncome+=$SectionPrdActual;
+				}
+
 				if ($Section==2){ /*Cost of Sales - need sub total for Gross Profit*/
 					echo '<tr>
 							<td colspan="2"></td>

Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log	2011-11-26 07:58:19 UTC (rev 4753)
+++ trunk/doc/Change.log	2011-11-26 20:51:02 UTC (rev 4754)
@@ -1,5 +1,11 @@
 webERP Change Log
 
+27/11/11 Tim: GLTagProfit_Loss Gross Profit calculation error was = COGS - fixed
+26/11/11 Phil: SupplierInvoice.php attempt to update salesanalysis cost if goods sold prior to purchase invoice being entered
+26/11/11 Phil: Added missing images to aguapop theme - for customer inquiry
+26/11/11 Phil: ConfirmDispatchControlledInvoice.php now uses $identifier in session variable name to ensure uniqueness
+26/11/11 Phil: PcAssignCashToTab.php removed unecssary DB_escape_string() calls
+26/11/11 Phil: StockCostUpdate.php fix link to StockStatus.php
 23/11/11 Phil: UserSettings.php - now only checks password if != ''
 22/11/11 Phil: StockCategories number_formatting of minumum and maximum values of stock category properties
 22/11/11 Felix Lim: StockSerialItems.php closing quote typo.

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