Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[4829] trunk
|
From: <dai...@us...> - 2012-01-22 00:19:45
|
Revision: 4829
http://web-erp.svn.sourceforge.net/web-erp/?rev=4829&view=rev
Author: daintree
Date: 2012-01-22 00:19:38 +0000 (Sun, 22 Jan 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/GLAccountInquiry.php
trunk/Z_poEditLangModule.php
Modified: trunk/GLAccountInquiry.php
===================================================================
--- trunk/GLAccountInquiry.php 2012-01-21 22:05:14 UTC (rev 4828)
+++ trunk/GLAccountInquiry.php 2012-01-22 00:19:38 UTC (rev 4829)
@@ -180,13 +180,13 @@
echo '<tr bgcolor="#FDFEEF">
<td colspan="3"><b>' . _('Brought Forward Balance') . '</b><td>
</td></td>
- <td class="number"><b>' . locale_number_format(-$RunningTotal,2) . '</b></td>
+ <td class="number"><b>' . locale_number_format(-$RunningTotal,$_SESSION['CompanyRecord']['decimalplaces']) . '</b></td>
<td></td>
</tr>';
} else { //its a debit balance b/fwd
echo '<tr bgcolor="#FDFEEF">
<td colspan="3"><b>' . _('Brought Forward Balance') . '</b></td>
- <td class="number"><b>' . locale_number_format($RunningTotal,2) . '</b></td>
+ <td class="number"><b>' . locale_number_format($RunningTotal,$_SESSION['CompanyRecord']['decimalplaces']) . '</b></td>
<td colspan="2"></td>
</tr>';
}
@@ -220,18 +220,18 @@
$RunningTotal = 0;
}
echo '<td></td>
- <td class="number"><b>' . locale_number_format(-$PeriodTotal,2) . '</b></td>
+ <td class="number"><b>' . locale_number_format(-$PeriodTotal,$_SESSION['CompanyRecord']['decimalplaces']) . '</b></td>
<td></td>
</tr>';
} else { //its a debit balance b/fwd
if ($PandLAccount==True) {
$RunningTotal = 0;
}
- echo '<td class="number"><b>' . locale_number_format($PeriodTotal,2) . '</b></td>
+ echo '<td class="number"><b>' . locale_number_format($PeriodTotal,$_SESSION['CompanyRecord']['decimalplaces']) . '</b></td>
<td colspan="2"></td>
</tr>';
}
- $IntegrityReport .= '<br />' . _('Period') . ': ' . $PeriodNo . _('Account movement per transaction') . ': ' . locale_number_format($PeriodTotal,2) . ' ' . _('Movement per ChartDetails record') . ': ' . locale_number_format($ChartDetailRow['actual'],2) . ' ' . _('Period difference') . ': ' . locale_number_format($PeriodTotal -$ChartDetailRow['actual'],3);
+ $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){
$ShowIntegrityReport = True;
@@ -253,10 +253,10 @@
$PeriodTotal += $myrow['amount'];
if($myrow['amount']>=0){
- $DebitAmount = locale_number_format($myrow['amount'],2);
+ $DebitAmount = locale_number_format($myrow['amount'],$_SESSION['CompanyRecord']['decimalplaces']);
$CreditAmount = '';
} else {
- $CreditAmount = locale_number_format(-$myrow['amount'],2);
+ $CreditAmount = locale_number_format(-$myrow['amount'],$_SESSION['CompanyRecord']['decimalplaces']);
$DebitAmount = '';
}
@@ -285,7 +285,7 @@
$DebitAmount,
$CreditAmount,
$myrow['narrative'],
- locale_number_format($RunningTotal,2),
+ locale_number_format($RunningTotal,$_SESSION['CompanyRecord']['decimalplaces']),
$tagrow['tagdescription']);
}
@@ -299,9 +299,9 @@
echo '</b></td>';
if ($RunningTotal >0){
- echo '<td class="number"><b>' . locale_number_format(($RunningTotal),2) . '</b></td><td colspan="2"></td></tr>';
+ echo '<td class="number"><b>' . locale_number_format(($RunningTotal),$_SESSION['CompanyRecord']['decimalplaces']) . '</b></td><td colspan="2"></td></tr>';
}else {
- echo '<td></td><td class="number"><b>' . locale_number_format((-$RunningTotal),2) . '</b></td><td colspan="2"></td></tr>';
+ echo '<td></td><td class="number"><b>' . locale_number_format((-$RunningTotal),$_SESSION['CompanyRecord']['decimalplaces']) . '</b></td><td colspan="2"></td></tr>';
}
echo '</table>';
} /* end of if Show button hit */
Modified: trunk/Z_poEditLangModule.php
===================================================================
--- trunk/Z_poEditLangModule.php 2012-01-21 22:05:14 UTC (rev 4828)
+++ trunk/Z_poEditLangModule.php 2012-01-22 00:19:38 UTC (rev 4829)
@@ -20,7 +20,7 @@
$PathToLanguage = './locale/' . $_SESSION['Language'] . '/LC_MESSAGES/messages.po';
$PathToNewLanguage = './locale/' . $_SESSION['Language'] . '/LC_MESSAGES/messages.po.new';
-echo "<br /> <a href='" . $rootpath . "/Z_poAdmin.php'>" . _('Back to the translation menu') . "</a>";
+echo '<br /> <a href="' . $rootpath . '/Z_poAdmin.php">' . _('Back to the translation menu') . '</a>';
echo '<br /><br /> ' . _('Utility to edit a language file module');
echo '<br /> ' . _('Current language is') . ' ' . $_SESSION['Language'];
echo '<br /><br /> ' . _('To change language click on the user name at the top left, change to language desired and click Modify');
@@ -130,12 +130,12 @@
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '</div';
echo '<table>';
- echo '<tr><th ALIGN="center">' . _('Language File for') . ' "' . $_POST['language'] . '"</th></tr>';
- echo '<tr><td ALIGN="center">' . _('Module') . ' "' . $_POST['module'] . '"</td></tr>';
+ echo '<tr><th align="center">' . _('Language File for') . ' "' . $_POST['language'] . '"</th></tr>';
+ echo '<tr><td align="center">' . _('Module') . ' "' . $_POST['module'] . '"</td></tr>';
echo '<tr><td></td></tr>';
echo '<tr><td>';
- echo '<table WIDTH="100%">';
+ echo '<table width="100%">';
echo '<tr>';
echo '<th>' . _('Default text') . '</th>';
echo '<th>' . _('Translation') . '</th>';
@@ -151,9 +151,9 @@
} else {
echo '<tr>';
- echo '<td VALIGN="top"><I>' . $DefaultText[$i] . '</I></td>';
- echo '<td VALIGN="top"><input type="text" size="60" name="moduletext_' . $msgstr[$i] . '" VALUE="' . $ModuleText[$i] . '" /></td>';
- echo '<td VALIGN="top">' . $AlsoIn[$i] . '<input type="hidden" name="msgstr_' . $msgstr[$i] . '" VALUE="' . $msgstr[$i] . '" /></td>';
+ echo '<td valign="top"><i>' . $DefaultText[$i] . '</i></td>';
+ echo '<td valign="top"><input type="text" size="60" name="moduletext_' . $msgstr[$i] . '" value="' . $ModuleText[$i] . '" /></td>';
+ echo '<td valign="top">' . $AlsoIn[$i] . '<input type="hidden" name="msgstr_' . $msgstr[$i] . '" value="' . $msgstr[$i] . '" /></td>';
echo '</tr>';
echo '<tr><th colspan="3"></th></tr>';
}
@@ -165,8 +165,8 @@
echo '</td></tr>';
echo '</table>';
echo '<br /><div class="centre">';
- echo '<input type="submit" name="submit" VALUE="' . _('Modify') . '" /> ';
- echo '<input type="hidden" name="module" VALUE="' . $_POST['module'] . '" />';
+ echo '<input type="submit" name="submit" value="' . _('Modify') . '" /> ';
+ echo '<input type="hidden" name="module" value="' . $_POST['module'] . '" />';
echo '</form>';
echo '</div>';
@@ -213,8 +213,11 @@
}
else
{
- echo '<br /><table><tr><td>';
- echo '<form method="post" action=' . htmlspecialchars($_SERVER['PHP_SELF']) . '?' . SID . '>';
+ echo '<br />
+ <table>
+ <tr>
+ <td>';
+ echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF']) . '" >';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<table>';
@@ -228,11 +231,13 @@
echo '</tr></table>';
echo '<br />';
- echo '<div class="centre">';
- echo '<input type="submit" name="proceed" VALUE="' . _('Proceed') . '" /> ';
- echo '<br /><br /><input type="submit" name="ReMergePO" VALUE="' . _('Refresh messages with latest strings') . '">';
- echo '</div>';
- echo '</form>';
+ echo '<div class="centre">
+ <input type="submit" name="proceed" value="' . _('Proceed') . '" />
+ <br />
+ <br />
+ <input type="submit" name="ReMergePO" value="' . _('Refresh messages with latest strings') . '" />
+ </div>
+ </form>';
echo '</td></tr></table>';
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
