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

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

Revision: 6555
          http://sourceforge.net/p/web-erp/reponame/6555
Author:   daintree
Date:     2014-01-31 22:37:33 +0000 (Fri, 31 Jan 2014)
Log Message:
-----------
Andrew Galuski: P & L without zero accounts fix

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

Modified: trunk/GLProfit_Loss.php
===================================================================
--- trunk/GLProfit_Loss.php	2014-01-31 22:16:56 UTC (rev 6554)
+++ trunk/GLProfit_Loss.php	2014-01-31 22:37:33 UTC (rev 6555)
@@ -406,9 +406,10 @@
 		$SectionPrdBudget +=$AccountPeriodBudget;
 
 		if ($_POST['Detail'] == 'Detailed') {
-			$LeftOvers = $pdf->addTextWrap($Left_Margin,$YPos,60,$FontSize,$myrow['accountcode']);
-			$LeftOvers = $pdf->addTextWrap($Left_Margin+60,$YPos,190,$FontSize,$myrow['accountname']);
+			
 			if (isset($_POST['ShowZeroBalances']) OR (!isset($_POST['ShowZeroBalances']) AND ($AccountPeriodActual <> 0 OR $AccountPeriodBudget <> 0 OR $AccountPeriodLY <> 0))){ //condition for pdf
+				$LeftOvers = $pdf->addTextWrap($Left_Margin,$YPos,60,$FontSize,$myrow['accountcode']);
+				$LeftOvers = $pdf->addTextWrap($Left_Margin+60,$YPos,190,$FontSize,$myrow['accountname']);
 
 				if ($Section == 1) { /*Income*/
 					$LeftOvers = $pdf->addTextWrap($Left_Margin+310,$YPos,70,$FontSize,locale_number_format(-$AccountPeriodActual,$_SESSION['CompanyRecord']['decimalplaces']),'right');
@@ -1295,4 +1296,4 @@
 echo '</form>';
 include('includes/footer.inc');
 
-?>
\ No newline at end of file
+?>

Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log	2014-01-31 22:16:56 UTC (rev 6554)
+++ trunk/doc/Change.log	2014-01-31 22:37:33 UTC (rev 6555)
@@ -1,5 +1,6 @@
 webERP Change Log
 
+31/1/14 Andrew Galuski: Profit and Loss format fixed for detailed - don't show zero balances accounts
 31/1/14 Muthu: Added sequence field to BOMs.php
 30/1/14 gilberto dos santos alves: Updated pt_BR and also applied to pt_PT translation since pt_PT translation was quite old
 28/01/14 Exson: Update the hold reason table default data dissallowinvoice to make customers' credit on watch is workable.