Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[7706] trunk
|
From: <rc...@us...> - 2016-12-16 21:22:11
|
Revision: 7706
http://sourceforge.net/p/web-erp/reponame/7706
Author: rchacon
Date: 2016-12-16 21:22:07 +0000 (Fri, 16 Dec 2016)
Log Message:
-----------
Groups numeric columns to easy reading.
Modified Paths:
--------------
trunk/GLAccountInquiry.php
trunk/doc/Manual/ManualGeneralLedger.html
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
Modified: trunk/GLAccountInquiry.php
===================================================================
--- trunk/GLAccountInquiry.php 2016-12-13 00:30:22 UTC (rev 7705)
+++ trunk/GLAccountInquiry.php 2016-12-16 21:22:07 UTC (rev 7706)
@@ -15,23 +15,23 @@
include('includes/GLPostings.inc');
-if (isset($_POST['Account'])){
+if(isset($_POST['Account'])) {
$SelectedAccount = $_POST['Account'];
-} elseif (isset($_GET['Account'])){
+} elseif(isset($_GET['Account'])) {
$SelectedAccount = $_GET['Account'];
}
-if (isset($_POST['Period'])){
+if(isset($_POST['Period'])) {
$SelectedPeriod = $_POST['Period'];
-} elseif (isset($_GET['Period'])){
+} elseif(isset($_GET['Period'])) {
$SelectedPeriod = array($_GET['Period']);
}
/* Get the start and periods, depending on how this script was called*/
-if (isset($SelectedPeriod)) { //If it was called from itself (in other words an inquiry was run and we wish to leave the periods selected unchanged
+if(isset($SelectedPeriod)) { //If it was called from itself (in other words an inquiry was run and we wish to leave the periods selected unchanged
$FirstPeriodSelected = min($SelectedPeriod);
$LastPeriodSelected = max($SelectedPeriod);
-} elseif (isset($_GET['FromPeriod'])) { //If it was called from the Trial Balance/P&L or Balance sheet
+} elseif(isset($_GET['FromPeriod'])) { //If it was called from the Trial Balance/P&L or Balance sheet
$FirstPeriodSelected = $_GET['FromPeriod'];
$LastPeriodSelected = $_GET['ToPeriod'];
} else { // Otherwise just highlight the current period
@@ -40,7 +40,6 @@
}
echo '<div class="page_help_text noprint">' . _('Use the keyboard Shift key to select multiple periods') . '</div><br />';
-
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
echo '<div class="noprint">';// Begin input of criteria div.
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
@@ -63,9 +62,9 @@
INNER JOIN glaccountusers ON glaccountusers.accountcode=chartmaster.accountcode AND glaccountusers.userid='" . $_SESSION['UserID'] . "' AND glaccountusers.canview=1
ORDER BY chartmaster.accountcode";
$Account = DB_query($sql);
-while ($myrow=DB_fetch_array($Account,$db)){
- if($myrow['accountcode'] == $SelectedAccount){
- if (!is_null($myrow['bankact'])) {
+while($myrow=DB_fetch_array($Account,$db)) {
+ if($myrow['accountcode'] == $SelectedAccount) {
+ if(!is_null($myrow['bankact'])) {
$BankAccount = true;
}
echo '<option selected="selected" value="' . $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' ' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8', false) . '</option>';
@@ -89,8 +88,8 @@
$result=DB_query($SQL);
echo '<option value="0">0 - '._('All tags') . '</option>';
-while ($myrow=DB_fetch_array($result)){
- if (isset($_POST['tag']) and $_POST['tag']==$myrow['tagref']){
+while($myrow=DB_fetch_array($result)) {
+ if(isset($_POST['tag']) and $_POST['tag']==$myrow['tagref']) {
echo '<option selected="selected" value="' . $myrow['tagref'] . '">' . $myrow['tagref'].' - ' .$myrow['tagdescription'] . '</option>';
} else {
echo '<option value="' . $myrow['tagref'] . '">' . $myrow['tagref'].' - ' .$myrow['tagdescription'] . '</option>';
@@ -105,8 +104,8 @@
$sql = "SELECT periodno, lastdate_in_period FROM periods ORDER BY periodno DESC";
$Periods = DB_query($sql);
-while ($myrow=DB_fetch_array($Periods,$db)){
- if (isset($FirstPeriodSelected) AND $myrow['periodno'] >= $FirstPeriodSelected AND $myrow['periodno'] <= $LastPeriodSelected) {
+while($myrow=DB_fetch_array($Periods,$db)) {
+ if(isset($FirstPeriodSelected) AND $myrow['periodno'] >= $FirstPeriodSelected AND $myrow['periodno'] <= $LastPeriodSelected) {
echo '<option selected="selected" value="' . $myrow['periodno'] . '">' . _(MonthAndYearFromSQLDate($myrow['lastdate_in_period'])) . '</option>';
} else {
echo '<option value="' . $myrow['periodno'] . '">' . _(MonthAndYearFromSQLDate($myrow['lastdate_in_period'])) . '</option>';
@@ -124,9 +123,9 @@
/* End of the Form rest of script is what happens if the show button is hit*/
-if (isset($_POST['Show'])){
+if(isset($_POST['Show'])) {
- if (!isset($SelectedPeriod)){
+ if(!isset($SelectedPeriod)) {
prnMsg(_('A period or range of periods must be selected from the list box'),'info');
include('includes/footer.inc');
exit;
@@ -137,9 +136,9 @@
INNER JOIN chartmaster ON accountgroups.groupname=chartmaster.group_
WHERE chartmaster.accountcode='" . $SelectedAccount ."'");
$PandLRow = DB_fetch_row($result);
- if ($PandLRow[0]==1){
+ if($PandLRow[0]==1) {
$PandLAccount = True;
- }else{
+ } else {
$PandLAccount = False; /*its a balance sheet account */
}
@@ -165,7 +164,7 @@
AND periodno>='" . $FirstPeriodSelected . "'
AND periodno<='" . $LastPeriodSelected . "'";
- if ($_POST['tag']!=0) {
+ if($_POST['tag']!=0) {
$sql = $sql . " AND tag='" . $_POST['tag'] . "'";
}
@@ -176,10 +175,11 @@
$SelectedAccountName=$namerow['accountname'];
$ErrMsg = _('The transactions for account') . ' ' . $SelectedAccount . ' ' . _('could not be retrieved because') ;
$TransResult = DB_query($sql,$ErrMsg);
- $BankAccountInfo = isset($BankAccount)?'<th>' . _('Org Currency') . '</th>
- <th>' . _('Amount in Org Currency') . '</th>
- <th>' . _('Bank Ref') .'</th>':'';
-
+ $BankAccountInfo = isset($BankAccount)
+ ? '<th>' . _('Org Currency') . '</th>
+ <th>' . _('Amount in Org Currency') . '</th>
+ <th>' . _('Bank Ref') . '</th>'
+ : '' ;
echo '<br />
<table class="selection">
<thead>
@@ -187,57 +187,53 @@
<th colspan="11"><b>', _('Transactions for account'), ' ', $SelectedAccount, ' - ', $SelectedAccountName, '</b></th>
</tr>
<tr>
- <th class="text">', _('Type'), '</th>
- <th class="number">', _('Number'), '</th>
- <th class="centre">', ('Date'), '</th>
- <th class="number">', _('Debit'), '</th>
- <th class="number">', _('Credit'), '</th>' .
- $BankAccountInfo .'
- <th class="text">', _('Narrative'), '</th>
- <th class="number">', _('Balance'), '</th>
- <th class="text">', _('Tag'), '</th>
+ <th>', _('Type'), '</th>
+ <th>', _('Number'), '</th>
+ <th>', ('Date'), '</th>
+ <th>', _('Narrative'), '</th>
+ <th>', _('Debit'), '</th>
+ <th>', _('Credit'), '</th>
+ <th>', _('Balance'), '</th>
+ <th>', _('Tag'), '</th>',
+ $BankAccountInfo, '
</tr>
</thead><tbody>';
- if ($PandLAccount==True) {
+ if($PandLAccount==True) {
$RunningTotal = 0;
} else {
- // added to fix bug with Brought Forward Balance always being zero
- $sql = "SELECT bfwd,
+ // added to fix bug with Brought Forward Balance always being zero
+ $Sql = "SELECT bfwd,
actual,
period
FROM chartdetails
WHERE chartdetails.accountcode='" . $SelectedAccount . "'
AND chartdetails.period='" . $FirstPeriodSelected . "'";
-
$ErrMsg = _('The chart details for account') . ' ' . $SelectedAccount . ' ' . _('could not be retrieved');
- $ChartDetailsResult = DB_query($sql,$ErrMsg);
+ $ChartDetailsResult = DB_query($Sql, $ErrMsg);
$ChartDetailRow = DB_fetch_array($ChartDetailsResult);
-
$RunningTotal = $ChartDetailRow['bfwd'];
- echo '<tr>
- <td colspan="3"><b>', _('Brought Forward Balance'), '</b></td>
- ';
+ echo '<tr>
+ <td colspan="4"><b>', _('Brought Forward Balance'), '</b></td>';
if($RunningTotal < 0 ) {// It is a credit balance b/fwd
- echo ' <td> </td>
- <td class="number"><b>', locale_number_format(-$RunningTotal,$_SESSION['CompanyRecord']['decimalplaces']), '</b></td>
- <td colspan="6"> </td>
- </tr>';
+ echo '<td> </td>
+ <td class="number"><b>', locale_number_format(-$RunningTotal,$_SESSION['CompanyRecord']['decimalplaces']), '</b></td>';
} else {// It is a debit balance b/fwd
- echo ' <td class="number"><b>', locale_number_format($RunningTotal,$_SESSION['CompanyRecord']['decimalplaces']), '</b></td>
- <td colspan="7"> </td>
+ echo '<td class="number"><b>', locale_number_format($RunningTotal,$_SESSION['CompanyRecord']['decimalplaces']), '</b></td>
+ <td> </td>';
+ }
+ echo '<td colspan="5"> </td>
</tr>';
- }
}
$PeriodTotal = 0;
$PeriodNo = -9999;
$ShowIntegrityReport = False;
$j = 1;
- $k=0; //row colour counter
+ $k = 0; //row colour counter
$IntegrityReport='';
- while ($myrow=DB_fetch_array($TransResult)) {
- if ($myrow['periodno']!=$PeriodNo){
- if ($PeriodNo!=-9999){ //ie its not the first time around
+ while($myrow=DB_fetch_array($TransResult)) {
+ if($myrow['periodno']!=$PeriodNo) {
+ if($PeriodNo!=-9999) { //ie its not the first time around
/*Get the ChartDetails balance b/fwd and the actual movement in the account for the period as recorded in the chart details - need to ensure integrity of transactions to the chart detail movements. Also, for a balance sheet account it is the balance carried forward that is important, not just the transactions*/
$sql = "SELECT bfwd,
@@ -252,26 +248,22 @@
$ChartDetailRow = DB_fetch_array($ChartDetailsResult);
echo '<tr>
- <td colspan="3"><b>' . _('Total for period') . ' ' . $PeriodNo . '</b></td>';
+ <td colspan="4"><b>' . _('Total for period') . ' ' . $PeriodNo . '</b></td>';
+ if($PandLAccount==True) {
+ $RunningTotal = 0;
+ }
if($PeriodTotal < 0 ) {// It is a credit balance b/fwd
- if ($PandLAccount==True) {
- $RunningTotal = 0;
- }
- echo ' <td> </td>
- <td class="number"><b>', locale_number_format(-$PeriodTotal,$_SESSION['CompanyRecord']['decimalplaces']), '</b></td>
- <td colspan="6"> </td>
- </tr>';
+ echo '<td> </td>
+ <td class="number"><b>', locale_number_format(-$PeriodTotal,$_SESSION['CompanyRecord']['decimalplaces']), '</b></td>';
} else {// It is a debit balance b/fwd
- if($PandLAccount==True) {
- $RunningTotal = 0;
- }
- echo ' <td class="number"><b>', locale_number_format($PeriodTotal,$_SESSION['CompanyRecord']['decimalplaces']), '</b></td>
- <td colspan="7"> </td>
+ echo '<td class="number"><b>', locale_number_format($PeriodTotal,$_SESSION['CompanyRecord']['decimalplaces']), '</b></td>
+ <td> </td>';
+ }
+ echo '<td colspan="5"> </td>
</tr>';
- }
$IntegrityReport .= '<br />' . _('Period') . ': ' . $PeriodNo . _('Account movement per transaction') . ': ' . locale_number_format($PeriodTotal,$_SESSION['CompanyRecord']['decimalplaces']) . ' ' . _('Movement per ChartDetails record') . ': ' . locale_number_format($ChartDetailRow['actual'],$_SESSION['CompanyRecord']['decimalplaces']) . ' ' . _('Period difference') . ': ' . locale_number_format($PeriodTotal -$ChartDetailRow['actual'],3);
- if (ABS($PeriodTotal -$ChartDetailRow['actual'])>0.01){
+ if(ABS($PeriodTotal -$ChartDetailRow['actual'])>0.01) {
$ShowIntegrityReport = True;
}
}
@@ -279,7 +271,7 @@
$PeriodTotal = 0;
}
- if ($k==1){
+ if($k==1) {
echo '<tr class="EvenTableRows">';
$k=0;
} else {
@@ -289,25 +281,25 @@
$BankRef = '';
$OrgAmt = '';
$Currency = '';
- if ($myrow['type'] == 12 OR $myrow['type'] == 22 OR $myrow['type'] == 2 OR $myrow['type'] == 1) {
+ if($myrow['type'] == 12 OR $myrow['type'] == 22 OR $myrow['type'] == 2 OR $myrow['type'] == 1) {
$banksql = "SELECT ref,currcode,amount FROM banktrans
WHERE type='" .$myrow['type']."' AND transno='" . $myrow['typeno'] . "' AND bankact='" . $SelectedAccount . "'";
$ErrMsg = _('Failed to retrieve bank data');
$bankresult = DB_query($banksql,$ErrMsg);
- if (DB_num_rows($bankresult)>0) {
+ if(DB_num_rows($bankresult)>0) {
$bankrow = DB_fetch_array($bankresult);
$BankRef = $bankrow['ref'];
$OrgAmt = $bankrow['amount'];
$Currency = $bankrow['currcode'];
- } elseif ($myrow['type'] == 1) {
+ } elseif($myrow['type'] == 1) {
//We should find out when transaction happens between bank accounts;
$bankreceivesql = "SELECT ref,type,transno,currcode,amount FROM banktrans
WHERE ref LIKE '@%' AND transdate='" . $myrow['trandate'] . "' AND bankact='" . $SelectedAccount . "'";
$ErrMsg = _('Failed to retrieve bank receive data');
$bankresult = DB_query($bankreceivesql,$ErrMsg);
- if (DB_num_rows($bankresult)>0) {
- while ($bankrow = DB_fetch_array($bankresult)) {
- if (substr($bankrow['ref'],1,strpos($bankrow['ref'],' ')-1) == $myrow['typeno']) {
+ if(DB_num_rows($bankresult)>0) {
+ while($bankrow = DB_fetch_array($bankresult)) {
+ if(substr($bankrow['ref'],1,strpos($bankrow['ref'],' ')-1) == $myrow['typeno']) {
$BankRef = $bankrow['ref'];
$OrgAmt = $bankrow['amount'];
$Currency = $bankrow['currcode'];
@@ -316,108 +308,69 @@
}
}
}
- if (!isset($BankReceipt)) {
+ if(!isset($BankReceipt)) {
$BankRef = '';
$OrgAmt = $myrow['amount'];
$Currency = $_SESSION['CompanyRecord']['currencydefault'];
}
- } elseif(isset($BankAccount)){
+ } elseif(isset($BankAccount)) {
$BankRef = '';
$OrgAmt = $myrow['amount'];
$Currency = $_SESSION['CompanyRecord']['currencydefault'];
}
}
- $RunningTotal += $myrow['amount'];
- $PeriodTotal += $myrow['amount'];
- if($myrow['amount']>=0){
- $DebitAmount = locale_number_format($myrow['amount'],$_SESSION['CompanyRecord']['decimalplaces']);
+ $URL_to_TransDetail = $RootPath . '/GLTransInquiry.php?TypeID=' . $myrow['type'] . '&TransNo=' . $myrow['typeno'];
+ $FormatedTranDate = ConvertSQLDate($myrow['trandate']);
+ if($myrow['amount']>=0) {
+ $DebitAmount = locale_number_format($myrow['amount'], $_SESSION['CompanyRecord']['decimalplaces']);
$CreditAmount = '';
} else {
- $CreditAmount = locale_number_format(-$myrow['amount'],$_SESSION['CompanyRecord']['decimalplaces']);
+ $CreditAmount = locale_number_format(-$myrow['amount'], $_SESSION['CompanyRecord']['decimalplaces']);
$DebitAmount = '';
}
-
- $FormatedTranDate = ConvertSQLDate($myrow['trandate']);
- $URL_to_TransDetail = $RootPath . '/GLTransInquiry.php?TypeID=' . $myrow['type'] . '&TransNo=' . $myrow['typeno'];
- if (isset($BankAccount)) {
- printf('<td class="text">%s</td>
- <td class="number"><a href="%s">%s</a></td>
- <td class="centre">%s</td>
- <td class="number">%s</td>
- <td class="number">%s</td>
- <td class="text">%s</td>
- <td class="number"><b>%s</b></td>
- <td class="text">%s</td>
- <td class="text">%s</td>
- <td class="number">%s</td>
- <td class="text">%s</td>
- </tr>',
- _($myrow['typename']),
- $URL_to_TransDetail,
- $myrow['typeno'],
- $FormatedTranDate,
- $DebitAmount,
- $CreditAmount,
- $Currency,
- locale_number_format($OrgAmt,$_SESSION['CompanyRecord']['decimalplaces']),
- $BankRef,
- $myrow['narrative'],
- locale_number_format($RunningTotal,$_SESSION['CompanyRecord']['decimalplaces']),
- $myrow['tagdescription']
- );
- } else {
- printf('<td class="text">%s</td>
- <td class="number"><a href="%s">%s</a></td>
- <td class="centre">%s</td>
- <td class="number">%s</td>
- <td class="number">%s</td>
- <td class="text">%s</td>
- <td class="number">%s</td>
- <td class="text">%s</td>
- </tr>',
- _($myrow['typename']),
- $URL_to_TransDetail,
- $myrow['typeno'],
- $FormatedTranDate,
- $DebitAmount,
- $CreditAmount,
- $myrow['narrative'],
- locale_number_format($RunningTotal,$_SESSION['CompanyRecord']['decimalplaces']),
- $myrow['tagdescription']
- );
+ $RunningTotal += $myrow['amount'];
+ $PeriodTotal += $myrow['amount'];
+ echo '<td class="text">', _($myrow['typename']), '</td>
+ <td class="number"><a href="', $URL_to_TransDetail, '">', $myrow['typeno'], '</a></td>
+ <td class="centre">', $FormatedTranDate, '</td>
+ <td class="text">', $myrow['narrative'], '</td>
+ <td class="number">', $DebitAmount, '</td>
+ <td class="number">', $CreditAmount, '</td>
+ <td class="number">', locale_number_format($RunningTotal, $_SESSION['CompanyRecord']['decimalplaces']), '</td>
+ <td class="text">', $myrow['tagdescription'], '</td>';
+ if(isset($BankAccount)) {
+ echo '<td class="text">', $Currency, '</td>
+ <td class="number"><b>', locale_number_format($OrgAmt, $_SESSION['CompanyRecord']['decimalplaces']), '</b></td>
+ <td class="text">', $BankRef, '</td>';
}
-
+ echo '</tr>';
}
echo '<tr>
- <td colspan="3"><b>';
- if ($PandLAccount==True){
- echo _('Total Period Movement');
+ <td colspan="4"><b>';
+ if($PandLAccount==True) {
+ echo _('Total Period Movement');/* RChacon: "Total for period XX"? */
} else { /*its a balance sheet account*/
echo _('Balance C/Fwd');
}
echo '</b></td>';
-
if($RunningTotal < 0) {// It is a debit Total Period Movement or Balance C/Fwd
- echo ' <td> </td>
- <td class="number"><b>', locale_number_format((-$RunningTotal),$_SESSION['CompanyRecord']['decimalplaces']), '</b></td>
- <td colspan="6"></td>
- </tr>';
+ echo '<td> </td>
+ <td class="number"><b>', locale_number_format((-$RunningTotal), $_SESSION['CompanyRecord']['decimalplaces']), '</b></td>';
} else {// It is a credit Total Period Movement or Balance C/Fwd
- echo ' <td class="number"><b>', locale_number_format(($RunningTotal),$_SESSION['CompanyRecord']['decimalplaces']), '</b></td>
- <td colspan="7"></td>
- </tr>';
+ echo '<td class="number"><b>', locale_number_format(($RunningTotal), $_SESSION['CompanyRecord']['decimalplaces']), '</b></td>
+ <td> </td>';
}
- echo '</tbody></table>';
+ echo '<td colspan="5"> </td>
+ </tr>
+ </tbody></table>';
} /* end of if Show button hit */
-
-
-if (isset($ShowIntegrityReport) AND $ShowIntegrityReport==True AND $_POST['tag']=='0'){
- if (!isset($IntegrityReport)) {
+if(isset($ShowIntegrityReport) AND $ShowIntegrityReport==True AND $_POST['tag']=='0') {
+ if(!isset($IntegrityReport)) {
$IntegrityReport='';
}
prnMsg( _('There are differences between the sum of the transactions and the recorded movements in the ChartDetails table') . '. ' . _('A log of the account differences for the periods report shows below'),'warn');
Modified: trunk/doc/Manual/ManualGeneralLedger.html
===================================================================
--- trunk/doc/Manual/ManualGeneralLedger.html 2016-12-13 00:30:22 UTC (rev 7705)
+++ trunk/doc/Manual/ManualGeneralLedger.html 2016-12-16 21:22:07 UTC (rev 7706)
@@ -72,7 +72,7 @@
<!-- Help End: GLAccounts -->
<h2><a id="GLTags">General Ledger Tags (Or Cost Centres)</a></h2>
-<p>General Ledger tags provide an alternative way of viewing General Ledger transactions. Each income or expenditure transaction can be given its own tag, and then reports acan be run based on tags.</p>
+<p>General Ledger tags provide an alternative way of viewing General Ledger transactions. Each income or expenditure transaction can be given its own tag, and then reports can be run based on tags.</p>
<p>As an example consider an organisation with several vehicles and the organisation wishes to report on how much each vehicle costs to run. A tag can be setup for each vehicle, and then when there is any expense, such as fuel, maintenance, licensing, insurance etc then each transaction can be tagged to individual vehicles, and then a report be produced for the cost of each tag corresponding to each vehicle.</p>
<p>Tags effectively add another dimension to the general ledger - or "cost centre" functionality. There is a "tag" profit and loss account so you can produce a p & l for each "tag".
<p>The tag is offered up each time you create a general ledger transaction or purchase invoice or stock adjustment so all general ledger transactions can be captured with the "tag" or "cost centre" they relate to and the P & L can be reported by "tag" (or "cost centre").</p>
@@ -350,8 +350,8 @@
</li>
<!-- ----------------------------------------------------------------------- -->
<li>
- <h3><a id="GLCashFlows">Statement of Cash Flows</a></h3>
- <p>The purpose of the statement of cash flows is to show where the company got their money from and how it was spent during the period being reported for a user selectable range of periods.</p>
+ <h3><a id="GLCashFlows">Statement of Cash Flows</a></h3>
+ <p>The purpose of the statement of cash flows is to show where the company got their money from and how it was spent during the period being reported for a user selectable range of periods.</p>
<p>The statement of cash flows, also known as the successor of the old source and application of funds statement, reports how changes in balance sheet accounts and income affect cash and cash equivalents, and breaks the analysis down to operating, investing and financing activities (see <a href="ManualContents.php?
ViewTopic=GeneralLedger#GLCashFlowsSetup">GLCashFlowsSetup</a>).</p>
<p>It can be generated using either direct method or indirect method. The main difference between them is the cash flows from operating activities, the first section of the statement of cash flows; there is no difference in the investing and financing activities sections.</p>
@@ -370,7 +370,7 @@
</ul>
<p><b>Note 1</b>. The "<i>net profit for the period</i>" is calculated from the accounts of the <i>statement of comprehensive income</i>.</p>
<p><b>Note 2</b>. The "<i>dividends</i>" are calculated as "<i>net profit for the period</i>" minus "<i>retained earnings</i>". The "<i>retained earnings</i>" are calculated using the complement method; that is: the changes of retained earnings are equal to the opposite of changes in other <i>statement of financial position</i> accounts. This is done to correct the impact of the "<i>net profit for the period</i>" underreporting before the end of that period; so, if you have differences between dividents in this report and the real dividend payments, check retained earnings related accounts.</p>
- <p><b>Warning!</b> Although the standard states that "<i>Net profit for the period</i>", "<i>Dividends</i>", and "<i>No effect on cash flow</i>" are part of section "<i>Operating activities</i>", in this report they are shown separately to cover those accountants that use that practice.</p>
+ <p><b>Warning!</b> Although the standard states that "<i>Net profit for the period</i>", "<i>Dividends</i>", and "<i>No effect on cash flow</i>" are part of section "<i>Operating activities</i>", in this report they are shown separately to cover the accountants that use to separate those accounts.</p>
</li>
<!-- ----------------------------------------------------------------------- -->
<li>
@@ -418,6 +418,26 @@
<div class="floatright"><a class="minitext" href="#top">⬆ Top</a></div>
<h2>Maintenance</h2>
+<!--h3><a id="BankAccounts">Bank Accounts</a></h3>
+<p>.</p-->
+
+<h3><a id="BankAccountUsers">Bank Account Authorised Users</a></h3>
+<p>This software has methods to assign permissions or access rights to specific users and groups of users. The system controls the ability of the users to view and make changes to the contents of the bank accounts.</p>
+<p>With this script, you can add or remove the access permission for each user that grants or denies his ability to view or update that bank account.</p>
+
+<h3><a id="UserBankAccounts">User Authorised Bank Accounts</a></h3>
+<p>This software has methods to assign permissions or access rights to specific users and groups of users. The system controls the ability of the users to view and make changes to the contents of the bank accounts.</p>
+<p>With this script, you can add or remove the access permission for each bank account that grants or denies the ability of that user to view or update it.</p>
+
+<!--h3><a id="AccountSections">Account Sections</a></h3>
+<p>.</p-->
+
+<!--h3><a id="AccountGroups">Account Groups</a></h3>
+<p>.</p-->
+
+<!--h3><a id="GLAccounts">GL Accounts</a></h3>
+<p>.</p-->
+
<h3><a id="GLAccountUsers">GL Account Authorised Users</a></h3>
<p>This software has methods to assign permissions or access rights to specific users and groups of users. The system controls the ability of the users to view or make changes to the contents of the GL accounts.</p>
<p>With this script, you can change a specific GL account access permissions for users:</p>
@@ -438,13 +458,8 @@
<p>If you need to copy the access rights to general ledger accounts from one user to another, you can use an utility. See: <a href="ManualContents.php?
ViewTopic=SpecialUtilities#Z_GLAccountUsersCopyAuthority">Copy Authority of GL Accounts from one user to another</a>.</p>
-<!--h3><a id="BankAccounts.php">Bank Accounts</a></h3>
+<!--h3><a id="GLBudgets">GL Budgets</a></h3>
<p>.</p-->
-<h3><a id="BankAccountUsers">Bank Account Authorised Users</a></h3>
-<p>This software has methods to assign permissions or access rights to specific users and groups of users. The system controls the ability of the users to view and make changes to the contents of the bank accounts.</p>
-<p>With this script, you can add or remove the access permission for each user that grants or denies his ability to view or update that bank account.</p>
-
-<h3><a id="UserBankAccounts">User Authorised Bank Accounts</a></h3>
-<p>This software has methods to assign permissions or access rights to specific users and groups of users. The system controls the ability of the users to view and make changes to the contents of the bank accounts.</p>
-<p>With this script, you can add or remove the access permission for each bank account that grants or denies the ability of that user to view or update it.</p>
+<h3><a id="GLTagsMaintenance">GL Tags (maintenance)</a></h3>
+<p>This software allows the use of accounting tags to help you track specific units within your organization. You can set up any quantity of accounting tags. In this way, you can group transactions and assign them to cost centres, profit centres, activities centres, divisions, departments, or any units for which you need to produce a statement of comprehensive income for each "<i>tag</i>". See: <a href="#GLTags">GL Tags</a>.</p>
\ No newline at end of file
Modified: trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2016-12-13 00:30:22 UTC (rev 7705)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2016-12-16 21:22:07 UTC (rev 7706)
@@ -8,7 +8,7 @@
"Project-Id-Version: webERP 4.13\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-11-24 08:54-0600\n"
-"PO-Revision-Date: 2016-12-02 12:32-0600\n"
+"PO-Revision-Date: 2016-12-16 11:38-0600\n"
"Last-Translator: Rafael E. Chacón <raf...@gm...>\n"
"Language-Team: TecnoSoluciones.com <web...@te...>\n"
"Language: es_ES\n"
@@ -10528,7 +10528,7 @@
#: Payments.php:1135 PcExpenses.php:193 PcExpenses.php:325
#: SuppTransGLAnalysis.php:111 SupplierCredit.php:461 SupplierInvoice.php:835
msgid "Tag"
-msgstr "Centro de Costo (Tag)"
+msgstr "Etiqueta"
#: CustomerReceipt.php:1025
msgid ""
@@ -15595,7 +15595,7 @@
#: GLTags.php:81
msgid "Tag ID"
-msgstr "ID Centro de Costo"
+msgstr "Identificación de la etiqueta"
#: GLTags.php:97
msgid "Are you sure you wish to delete this GL tag?"
@@ -43139,7 +43139,7 @@
#: Z_ImportGLTransactions.php:114
msgid "Tag ref"
-msgstr ""
+msgstr "Referencia de la etiqueta"
#: Z_ImportGLTransactions.php:114 Z_ImportPriceList.php:81
#: Z_ImportPriceList.php:89 Z_ImportPriceList.php:98
@@ -47590,7 +47590,7 @@
#: includes/PDFGLJournalHeader.inc:23
msgid "Tag Details"
-msgstr ""
+msgstr "Detalles de la etiqueta"
#: includes/PDFGrnHeader.inc:20
msgid "GRN number "
|
