Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[7349] trunk
|
From: <rc...@us...> - 2015-09-14 14:43:22
|
Revision: 7349
http://sourceforge.net/p/web-erp/reponame/7349
Author: rchacon
Date: 2015-09-14 14:43:19 +0000 (Mon, 14 Sep 2015)
Log Message:
-----------
In AnalysisHorizontalIncome.php, delete duplicated tag. Replaces text "Absolute/Relative variation" with "Absolute/Relative difference" to avoid confusions.
Modified Paths:
--------------
trunk/AnalysisHorizontalIncome.php
trunk/AnalysisHorizontalPosition.php
trunk/doc/Change.log
Modified: trunk/AnalysisHorizontalIncome.php
===================================================================
--- trunk/AnalysisHorizontalIncome.php 2015-09-13 17:21:49 UTC (rev 7348)
+++ trunk/AnalysisHorizontalIncome.php 2015-09-14 14:43:19 UTC (rev 7349)
@@ -2,8 +2,8 @@
/* $Id: AnalysisHorizontalIncome.php 7332 2015-08-04 03:27:51Z rchacon $*/
/* Shows the horizontal analysis of the statement of comprehensive income. */
-function RelativeVariation($SelectedPeriod, $PreviousPeriod) {
- // Calculates the relative variation between selected and previous periods. Uses percent in locale number format.
+function RelativeDifference($SelectedPeriod, $PreviousPeriod) {
+ // Calculates the relative difference between selected and previous periods. Uses percent in locale number format.
if($PreviousPeriod<>0) {
return locale_number_format(($SelectedPeriod-$PreviousPeriod)*100/$PreviousPeriod,$_SESSION['CompanyRecord']['decimalplaces']) . '%';
} else {
@@ -16,7 +16,7 @@
$ViewTopic= 'GeneralLedger';// Filename's id in ManualContents.php's TOC.
$BookMark = 'AnalysisHorizontalIncome';// Anchor's id in the manual's html document.
include('includes/SQL_CommonFunctions.inc');
-include('includes/AccountSectionsDef.inc'); // This loads the $Sections variable
+include('includes/AccountSectionsDef.inc');// This loads the $Sections variable
if(isset($_POST['FromPeriod']) and ($_POST['FromPeriod'] > $_POST['ToPeriod'])) {
prnMsg(_('The selected period from is actually after the period to') . '! ' . _('Please reselect the reporting period'),'error');
@@ -32,7 +32,7 @@
echo '<div class="page_help_text">',
_('Horizontal analysis (also known as trend analysis) is a financial statement analysis technique that shows changes in the amounts of corresponding financial statement items over a period of time. It is a useful tool to evaluate trend situations.'), '<br />',
- _('The statements for two periods are used in horizontal analysis. The earliest period is used as the base period. The items on the later statement are compared with items on the statement of the base period. The changes are shown both in currency (absolute variation) and percentage (relative variation).'), '<br />',
+ _('The statements for two periods are used in horizontal analysis. The earliest period is used as the base period. The items on the later statement are compared with items on the statement of the base period. The changes are shown both in currency (absolute difference) and percentage (relative difference).'), '<br />',
_('webERP is an "accrual" based system (not a "cash based" system). Accrual systems include items when they are invoiced to the customer, and when expenses are owed based on the supplier invoice date.'), '</div>',
// Show a form to allow input of criteria for the report to show:
'<form method="post" action="', htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8'), '">',
@@ -140,7 +140,6 @@
// Page title as IAS 1, numerals 10 and 51:
include_once('includes/CurrenciesArray.php');// Array to retrieve currency name.
- echo '<div id="Report">';// Division to identify the report block.
echo '<div id="Report">', // Division to identify the report block.
'<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme,
'/images/gl.png" title="', // Icon image.
@@ -160,16 +159,16 @@
}
echo '<th class="number">', ' - ', $myrow[0], '</th>
<th class="number">', _('Last Year'), '</th>
- <th class="number">', _('Absolute variation'), '</th>
- <th class="number">', _('Relative variation'), '</th>
+ <th class="number">', _('Absolute difference'), '</th>
+ <th class="number">', _('Relative difference'), '</th>
</tr>
</thead>
<tfoot>
<tr>
- <td class="text" colspan="6">',// Prints an explanation of signs in absolute and relative variations:
+ <td class="text" colspan="6">',// Prints an explanation of signs in absolute and relative differences:
'<br /><b>', _('Notes'), ':</b><br />',
- _('Absolute variation signs: a positive number indicates a variation that increases the net profit; a negative number indicates a variation that decreases the net profit.'), '<br />',
- _('Relative variation signs: a positive number indicates an increase in the amount of that account; a negative number indicates a decrease in the amount of that account.'), '<br />',
+ _('Absolute difference signs: a positive number indicates a variation that increases the net profit; a negative number indicates a variation that decreases the net profit.'), '<br />',
+ _('Relative difference signs: a positive number indicates an increase in the amount of that account; a negative number indicates a decrease in the amount of that account.'), '<br />',
'</td>
</tr>
</tfoot>
@@ -237,7 +236,7 @@
<td class="number">', locale_number_format(-$GrpTotal[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
<td class="number">', locale_number_format(-$GrpTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
<td class="number">', locale_number_format(-$GrpTotal[$Level]+$GrpTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
- <td class="number">', RelativeVariation(-$GrpTotal[$Level],-$GrpTotalLY[$Level]), '</td>
+ <td class="number">', RelativeDifference(-$GrpTotal[$Level],-$GrpTotalLY[$Level]), '</td>
</tr>';
$GrpTotal[$Level]=0;
$GrpTotalLY[$Level]=0;
@@ -261,7 +260,7 @@
<td class="number">', locale_number_format(-$GrpTotal[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
<td class="number">', locale_number_format(-$GrpTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
<td class="number">', locale_number_format(-$GrpTotal[$Level]+$GrpTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
- <td class="number">', RelativeVariation(-$GrpTotal[$Level],-$GrpTotalLY[$Level]), '</td>
+ <td class="number">', RelativeDifference(-$GrpTotal[$Level],-$GrpTotalLY[$Level]), '</td>
</tr>';
} else {// Costs
// <---
@@ -270,7 +269,7 @@
<td class="number">', locale_number_format(-$GrpTotal[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
<td class="number">', locale_number_format(-$GrpTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
<td class="number">', locale_number_format(-$GrpTotal[$Level]+$GrpTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
- <td class="number">', RelativeVariation(-$GrpTotal[$Level],-$GrpTotalLY[$Level]), '</td>
+ <td class="number">', RelativeDifference(-$GrpTotal[$Level],-$GrpTotalLY[$Level]), '</td>
</tr>';
// --->
}
@@ -292,7 +291,7 @@
<td class="number"><h2>', locale_number_format(-$SectionTotal,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
<td class="number"><h2>', locale_number_format(-$SectionTotalLY,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
<td class="number"><h2>', locale_number_format(-$SectionTotal+$SectionTotalLY,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
- <td class="number"><h2>', RelativeVariation(-$SectionTotal,-$SectionTotalLY), '</h2></td>
+ <td class="number"><h2>', RelativeDifference(-$SectionTotal,-$SectionTotalLY), '</h2></td>
</tr>';
$GPIncome = $SectionTotal;
$GPIncomeLY = $SectionTotalLY;
@@ -302,7 +301,7 @@
<td class="number"><h2>', locale_number_format(-$SectionTotal,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
<td class="number"><h2>', locale_number_format(-$SectionTotalLY,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
<td class="number"><h2>', locale_number_format(-$SectionTotal+$SectionTotalLY,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
- <td class="number"><h2>', RelativeVariation(-$SectionTotal,-$SectionTotalLY), '</h2></td>
+ <td class="number"><h2>', RelativeDifference(-$SectionTotal,-$SectionTotalLY), '</h2></td>
</tr>';
}
@@ -313,7 +312,7 @@
<td class="number"><h2>', locale_number_format(-($GPIncome+$SectionTotal),$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
<td class="number"><h2>', locale_number_format(-($GPIncomeLY+$SectionTotalLY),$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
<td class="number"><h2>', locale_number_format(-($GPIncome+$SectionTotal)+($GPIncomeLY+$SectionTotalLY),$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
- <td class="number"><h2>', RelativeVariation(-($GPIncome+$SectionTotal),-($GPIncomeLY+$SectionTotalLY)), '</h2></td>
+ <td class="number"><h2>', RelativeDifference(-($GPIncome+$SectionTotal),-($GPIncomeLY+$SectionTotalLY)), '</h2></td>
</tr>';
}
@@ -324,7 +323,7 @@
<td class="number"><h2>', locale_number_format(-$PeriodTotal,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
<td class="number"><h2>', locale_number_format(-$PeriodTotalLY,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
<td class="number"><h2>', locale_number_format(-$PeriodTotal+$PeriodTotalLY,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
- <td class="number"><h2>', RelativeVariation(-$PeriodTotal,-$PeriodTotalLY), '</h2></td>
+ <td class="number"><h2>', RelativeDifference(-$PeriodTotal,-$PeriodTotalLY), '</h2></td>
</tr>';
echo $DrawTotalLine;
}
@@ -384,7 +383,7 @@
<td class="number">', locale_number_format(-$AccountTotal,$_SESSION['CompanyRecord']['decimalplaces']), '</td>
<td class="number">', locale_number_format(-$AccountTotalLY,$_SESSION['CompanyRecord']['decimalplaces']), '</td>
<td class="number">', locale_number_format(-$AccountTotal+$AccountTotalLY,$_SESSION['CompanyRecord']['decimalplaces']), '</td>
- <td class="number">', RelativeVariation(-$AccountTotal,-$AccountTotalLY), '</td>
+ <td class="number">', RelativeDifference(-$AccountTotal,-$AccountTotalLY), '</td>
</tr>';
} else {
// <---
@@ -392,7 +391,7 @@
<td class="number">', locale_number_format(-$AccountTotal,$_SESSION['CompanyRecord']['decimalplaces']), '</td>
<td class="number">', locale_number_format(-$AccountTotalLY,$_SESSION['CompanyRecord']['decimalplaces']), '</td>
<td class="number">', locale_number_format(-$AccountTotal+$AccountTotalLY,$_SESSION['CompanyRecord']['decimalplaces']), '</td>
- <td class="number">', RelativeVariation(-$AccountTotal,-$AccountTotalLY), '</td>
+ <td class="number">', RelativeDifference(-$AccountTotal,-$AccountTotalLY), '</td>
</tr>';
}
}
@@ -415,7 +414,7 @@
<td class="number">', locale_number_format(-$GrpTotal[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
<td class="number">', locale_number_format(-$GrpTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
<td class="number">', locale_number_format(-$GrpTotal[$Level]+$GrpTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
- <td class="number">', RelativeVariation(-$GrpTotal[$Level],-$GrpTotalLY[$Level]), '</td>
+ <td class="number">', RelativeDifference(-$GrpTotal[$Level],-$GrpTotalLY[$Level]), '</td>
</tr>';
} else {// Costs.
// <---
@@ -424,7 +423,7 @@
<td class="number">', locale_number_format(-$GrpTotal[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
<td class="number">', locale_number_format(-$GrpTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
<td class="number">', locale_number_format(-$GrpTotal[$Level]+$GrpTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
- <td class="number">', RelativeVariation(-$GrpTotal[$Level],-$GrpTotalLY[$Level]), '</td>
+ <td class="number">', RelativeDifference(-$GrpTotal[$Level],-$GrpTotalLY[$Level]), '</td>
</tr>';
}
$GrpTotal[$Level]=0;
@@ -444,7 +443,7 @@
<td class="number">', locale_number_format(-$GrpTotal[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
<td class="number">', locale_number_format(-$GrpTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
<td class="number">', locale_number_format(-$GrpTotal[$Level]+$GrpTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
- <td class="number">', RelativeVariation(-$GrpTotal[$Level],-$GrpTotalLY[$Level]), '</td>
+ <td class="number">', RelativeDifference(-$GrpTotal[$Level],-$GrpTotalLY[$Level]), '</td>
</tr>';
$GrpTotal[$Level]=0;
$GrpTotalLY[$Level]=0;
@@ -461,7 +460,7 @@
<td class="number"><h2>', locale_number_format(-$SectionTotal,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
<td class="number"><h2>', locale_number_format(-$SectionTotalLY,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
<td class="number"><h2>', locale_number_format(-$SectionTotal+$SectionTotalLY,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
- <td class="number"><h2>', RelativeVariation(-$SectionTotal,-$SectionTotalLY), '</h2></td>
+ <td class="number"><h2>', RelativeDifference(-$SectionTotal,-$SectionTotalLY), '</h2></td>
</tr>';
$GPIncome = $SectionTotal;
$GPIncomeLY = $SectionTotalLY;
@@ -472,7 +471,7 @@
<td class="number"><h2>', locale_number_format(-$SectionTotal,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
<td class="number"><h2>', locale_number_format(-$SectionTotalLY,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
<td class="number"><h2>', locale_number_format(-$SectionTotal+$SectionTotalLY,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
- <td class="number"><h2>', RelativeVariation(-$SectionTotal,-$SectionTotalLY), '</h2></td>
+ <td class="number"><h2>', RelativeDifference(-$SectionTotal,-$SectionTotalLY), '</h2></td>
</tr>';
}
if($Section==2) {// Cost of Sales - need sub total for Gross Profit.
@@ -482,7 +481,7 @@
<td class="number"><h2>', locale_number_format(-($GPIncome+$SectionTotal),$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
<td class="number"><h2>', locale_number_format(-($GPIncomeLY+$SectionTotalLY),$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
<td class="number"><h2>', locale_number_format(-($GPIncome+$SectionTotal)+($GPIncomeLY+$SectionTotalLY),$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
- <td class="number"><h2>', RelativeVariation(-($GPIncome+$SectionTotal),-($GPIncomeLY+$SectionTotalLY)), '</h2></td>
+ <td class="number"><h2>', RelativeDifference(-($GPIncome+$SectionTotal),-($GPIncomeLY+$SectionTotalLY)), '</h2></td>
</tr>';
}
$Section = $myrow['sectioninaccounts'];
@@ -502,12 +501,12 @@
<td class="number"><h2>', locale_number_format(-$PeriodTotal,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
<td class="number"><h2>', locale_number_format(-$PeriodTotalLY,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
<td class="number"><h2>', locale_number_format(-$PeriodTotal+$PeriodTotalLY,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
- <td class="number"><h2>', RelativeVariation(-$PeriodTotal,-$PeriodTotalLY), '</h2></td>
+ <td class="number"><h2>', RelativeDifference(-$PeriodTotal,-$PeriodTotalLY), '</h2></td>
</tr>';
echo $DrawTotalLine;
echo '</tbody>', // See comment at the begin of the table.
'</table>
- </div>'; // Close div id="Report".
+ </div>';// End div id="Report".
echo '<br />',
'<form method="post" action="', htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8'), '">',
'<input type="hidden" name="FormID" value="', $_SESSION['FormID'], '" />',
Modified: trunk/AnalysisHorizontalPosition.php
===================================================================
--- trunk/AnalysisHorizontalPosition.php 2015-09-13 17:21:49 UTC (rev 7348)
+++ trunk/AnalysisHorizontalPosition.php 2015-09-14 14:43:19 UTC (rev 7349)
@@ -2,8 +2,8 @@
/* $Id: AnalysisHorizontalPosition.php 7338 2015-08-13 18:51:07Z rchacon $*/
/* Shows the horizontal analysis of the statement of financial position. */
-function RelativeVariation($SelectedPeriod, $PreviousPeriod) {
- // Calculates the relative variation between selected and previous periods. Uses percent in locale number format.
+function RelativeDifference($SelectedPeriod, $PreviousPeriod) {
+ // Calculates the relative difference between selected and previous periods. Uses percent in locale number format.
if($PreviousPeriod<>0) {
return locale_number_format(($SelectedPeriod-$PreviousPeriod)*100/$PreviousPeriod,$_SESSION['CompanyRecord']['decimalplaces']) . '%';
} else {
@@ -29,7 +29,7 @@
echo '<div class="page_help_text">',
_('Horizontal analysis (also known as trend analysis) is a financial statement analysis technique that shows changes in the amounts of corresponding financial statement items over a period of time. It is a useful tool to evaluate trend situations.'), '<br />',
- _('The statements for two periods are used in horizontal analysis. The earliest period is used as the base period. The items on the later statement are compared with items on the statement of the base period. The changes are shown both in currency (absolute variation) and percentage (relative variation).'), '<br />',
+ _('The statements for two periods are used in horizontal analysis. The earliest period is used as the base period. The items on the later statement are compared with items on the statement of the base period. The changes are shown both in currency (absolute difference) and percentage (relative difference).'), '<br />',
_('webERP is an "accrual" based system (not a "cash based" system). Accrual systems include items when they are invoiced to the customer, and when expenses are owed based on the supplier invoice date.'), '</div>',
// Show a form to allow input of criteria for the report to show:
'<form method="post" action="', htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8'), '">',
@@ -122,16 +122,16 @@
}
echo '<th class="number">', $BalanceDate, '</th>
<th class="number">', _('Last Year'), '</th>
- <th class="number">', _('Absolute variation'), '</th>
- <th class="number">', _('Relative variation'), '</th>
+ <th class="number">', _('Absolute difference'), '</th>
+ <th class="number">', _('Relative difference'), '</th>
</tr>
</thead>
<tfoot>
<tr>
- <td class="text" colspan="6">',// Prints an explanation of signs in absolute and relative variations:
+ <td class="text" colspan="6">',// Prints an explanation of signs in absolute and relative differences:
'<br /><b>', _('Notes'), ':</b><br />',
- _('Absolute variation signs: a positive number indicates a source of funds; a negative number indicates an application of funds.'), '<br />',
- _('Relative variation signs: a positive number indicates an increase in the amount of that account; a negative number indicates a decrease in the amount of that account.'), '<br />',
+ _('Absolute difference signs: a positive number indicates a source of funds; a negative number indicates an application of funds.'), '<br />',
+ _('Relative difference signs: a positive number indicates an increase in the amount of that account; a negative number indicates a decrease in the amount of that account.'), '<br />',
'</td>
</tr>
</tfoot>
@@ -216,7 +216,7 @@
<td class="number">', locale_number_format($GroupTotal[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
<td class="number">', locale_number_format($GroupTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
<td class="number">', locale_number_format(-$GroupTotal[$Level]+$GroupTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
- <td class="number">', RelativeVariation(-$GroupTotal[$Level],-$GroupTotalLY[$Level]), '</td>
+ <td class="number">', RelativeDifference(-$GroupTotal[$Level],-$GroupTotalLY[$Level]), '</td>
</tr>';
$GroupTotal[$Level]=0;
$GroupTotalLY[$Level]=0;
@@ -231,7 +231,7 @@
<td class="number">', locale_number_format($GroupTotal[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
<td class="number">', locale_number_format($GroupTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
<td class="number">', locale_number_format(-$GroupTotal[$Level]+$GroupTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
- <td class="number">', RelativeVariation(-$GroupTotal[$Level],-$GroupTotalLY[$Level]), '</td>
+ <td class="number">', RelativeDifference(-$GroupTotal[$Level],-$GroupTotalLY[$Level]), '</td>
</tr>';
$GroupTotal[$Level]=0;
$GroupTotalLY[$Level]=0;
@@ -246,7 +246,7 @@
<td class="number"><h2>', locale_number_format($SectionBalance,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
<td class="number"><h2>', locale_number_format($SectionBalanceLY,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
<td class="number"><h2>', locale_number_format(-$SectionBalance+$SectionBalanceLY,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
- <td class="number"><h2>', RelativeVariation(-$SectionBalance,-$SectionBalanceLY), '</h2></td>
+ <td class="number"><h2>', RelativeDifference(-$SectionBalance,-$SectionBalanceLY), '</h2></td>
</tr>';
}
$SectionBalance=0;
@@ -300,7 +300,7 @@
<td class="number">', locale_number_format($AccountBalance,$_SESSION['CompanyRecord']['decimalplaces']), '</td>
<td class="number">', locale_number_format($AccountBalanceLY,$_SESSION['CompanyRecord']['decimalplaces']), '</td>
<td class="number">', locale_number_format(-$AccountBalance+$AccountBalanceLY,$_SESSION['CompanyRecord']['decimalplaces']), '</td>
- <td class="number">', RelativeVariation(-$AccountBalance,-$AccountBalanceLY), '</td>
+ <td class="number">', RelativeDifference(-$AccountBalance,-$AccountBalanceLY), '</td>
</tr>';
}
}
@@ -315,7 +315,7 @@
<td class="number">', locale_number_format($GroupTotal[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
<td class="number">', locale_number_format($GroupTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
<td class="number">', locale_number_format(-$GroupTotal[$Level]+$GroupTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
- <td class="number">', RelativeVariation(-$GroupTotal[$Level],-$GroupTotalLY[$Level]), '</td>
+ <td class="number">', RelativeDifference(-$GroupTotal[$Level],-$GroupTotalLY[$Level]), '</td>
</tr>';
$Level--;
}
@@ -327,7 +327,7 @@
<td class="number">', locale_number_format($GroupTotal[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
<td class="number">', locale_number_format($GroupTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
<td class="number">', locale_number_format(-$GroupTotal[$Level]+$GroupTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
- <td class="number">', RelativeVariation(-$GroupTotal[$Level],-$GroupTotalLY[$Level]), '</td>
+ <td class="number">', RelativeDifference(-$GroupTotal[$Level],-$GroupTotalLY[$Level]), '</td>
</tr>';
echo $DrawTotalLine;
echo '<tr>
@@ -335,7 +335,7 @@
<td class="number"><h2>', locale_number_format($SectionBalance,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
<td class="number"><h2>', locale_number_format($SectionBalanceLY,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
<td class="number"><h2>', locale_number_format(-$SectionBalance+$SectionBalanceLY,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
- <td class="number"><h2>', RelativeVariation(-$SectionBalance,-$SectionBalanceLY), '</h2></td>
+ <td class="number"><h2>', RelativeDifference(-$SectionBalance,-$SectionBalanceLY), '</h2></td>
</tr>';
$Section = $myrow['sectioninaccounts'];
@@ -351,7 +351,7 @@
<td class="number"><h2>', locale_number_format($CheckTotal,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
<td class="number"><h2>', locale_number_format($CheckTotalLY,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
<td class="number"><h2>', locale_number_format(-$CheckTotal+$CheckTotalLY,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
- <td class="number"><h2>', RelativeVariation(-$CheckTotal,-$CheckTotalLY), '</h2></td>
+ <td class="number"><h2>', RelativeDifference(-$CheckTotal,-$CheckTotalLY), '</h2></td>
</tr>';
echo $DrawTotalLine;
echo '</tbody>', // See comment at the begin of the table.
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-09-13 17:21:49 UTC (rev 7348)
+++ trunk/doc/Change.log 2015-09-14 14:43:19 UTC (rev 7349)
@@ -1,5 +1,6 @@
webERP Change Log
+14/9/15 RChacon: In AnalysisHorizontalIncome.php, delete duplicated tag. Replaces text "Absolute/Relative variation" with "Absolute/Relative difference" to avoid confusions.
13/9/15 RChacon: In AccountSections.php, add modifications for direct printing.
4/9/15 Wes Wolfenbarger: Fix to Z_ImportStocks.php added quotes to descriptions - also fixes error message when the csv does not match the template
27/08/15 Exson: Fixed the allocation status of involved invoice and credit notes in Credit_Invoice.php.
|
