Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[7663] trunk
|
From: <rc...@us...> - 2016-11-07 03:25:51
|
Revision: 7663
http://sourceforge.net/p/web-erp/reponame/7663
Author: rchacon
Date: 2016-11-07 03:25:49 +0000 (Mon, 07 Nov 2016)
Log Message:
-----------
Standardise Return button.
Modified Paths:
--------------
trunk/AnalysisHorizontalIncome.php
trunk/AnalysisHorizontalPosition.php
trunk/DailyBankTransactions.php
trunk/GLAccountUsers.php
trunk/GLBalanceSheet.php
trunk/GLProfit_Loss.php
trunk/GLTrialBalance.php
trunk/UserGLAccounts.php
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
Modified: trunk/AnalysisHorizontalIncome.php
===================================================================
--- trunk/AnalysisHorizontalIncome.php 2016-11-06 18:46:52 UTC (rev 7662)
+++ trunk/AnalysisHorizontalIncome.php 2016-11-07 03:25:49 UTC (rev 7663)
@@ -117,8 +117,8 @@
'<div class="centre noprint">',
'<button name="ShowPL" type="submit" value="', _('Show on Screen (HTML)'), '"><img alt="" src="', $RootPath, '/css/', $Theme,
'/images/gl.png" /> ', _('Show on Screen (HTML)'), '</button> ', // "Show on Screen (HTML)" button.
- '<button formaction="index.php?Application=GL" type="submit"><img alt="" src="', $RootPath, '/css/', $Theme,
- '/images/previous.png" /> ', _('Return'), '</button>', // "Return" button.
+ '<button onclick="window.location=\'index.php?Application=GL\'" type="button"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/return.svg" /> ', _('Return'), '</button>', // "Return" button.
'</div>';
// Now do the posting while the user is thinking about the period to select:
@@ -518,8 +518,8 @@
'/images/printer.png" /> ', _('Print This'), '</button> ', // "Print This" button.
'<button name="SelectADifferentPeriod" type="submit" value="', _('Select A Different Period'), '"><img alt="" src="', $RootPath, '/css/', $Theme,
'/images/gl.png" /> ', _('Select A Different Period'), '</button> ', // "Select A Different Period" button.
- '<button formaction="index.php?Application=GL" type="submit"><img alt="" src="', $RootPath, '/css/', $Theme,
- '/images/previous.png" /> ', _('Return'), '</button>', // "Return" button.
+ '<button onclick="window.location=\'index.php?Application=GL\'" type="button"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/return.svg" /> ', _('Return'), '</button>', // "Return" button.
'</div>';
}
echo '</form>';
Modified: trunk/AnalysisHorizontalPosition.php
===================================================================
--- trunk/AnalysisHorizontalPosition.php 2016-11-06 18:46:52 UTC (rev 7662)
+++ trunk/AnalysisHorizontalPosition.php 2016-11-07 03:25:49 UTC (rev 7663)
@@ -75,8 +75,8 @@
'<div class="centre noprint">',
'<button name="ShowBalanceSheet" type="submit" value="', _('Show on Screen (HTML)'), '"><img alt="" src="', $RootPath, '/css/', $Theme,
'/images/gl.png" /> ', _('Show on Screen (HTML)'), '</button> ', // "Show on Screen (HTML)" button.
- '<button formaction="index.php?Application=GL" type="submit"><img alt="" src="', $RootPath, '/css/', $Theme,
- '/images/previous.png" /> ', _('Return'), '</button>', // "Return" button.
+ '<button onclick="window.location=\'index.php?Application=GL\'" type="button"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/return.svg" /> ', _('Return'), '</button>', // "Return" button.
'</div>';
// Now do the posting while the user is thinking about the period to select:
@@ -358,8 +358,8 @@
'/images/printer.png" /> ', _('Print This'), '</button> ', // "Print This" button.
'<button name="SelectADifferentPeriod" type="submit" value="', _('Select A Different Period'), '"><img alt="" src="', $RootPath, '/css/', $Theme,
'/images/gl.png" /> ', _('Select A Different Period'), '</button> ', // "Select A Different Period" button.
- '<button formaction="index.php?Application=GL" type="submit"><img alt="" src="', $RootPath, '/css/', $Theme,
- '/images/previous.png" /> ', _('Return'), '</button>', // "Return" button.
+ '<button onclick="window.location=\'index.php?Application=GL\'" type="button"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/return.svg" /> ', _('Return'), '</button>', // "Return" button.
'</div>';
}
echo '</form>';
Modified: trunk/DailyBankTransactions.php
===================================================================
--- trunk/DailyBankTransactions.php 2016-11-06 18:46:52 UTC (rev 7662)
+++ trunk/DailyBankTransactions.php 2016-11-07 03:25:49 UTC (rev 7663)
@@ -92,7 +92,7 @@
$BankResult = DB_query($SQL,_('Could not retrieve the bank account details'));
- $sql="SELECT (SELECT sum(banktrans.amount) FROM banktrans
+ $sql="SELECT (SELECT sum(banktrans.amount) FROM banktrans
WHERE transdate < '" . FormatDateForSQL($_POST['FromTransDate']) . "'
AND bankact='" . $_POST['BankAccount'] ."') AS prebalance,
banktrans.currcode,
@@ -125,7 +125,7 @@
_('Bank Transactions Inquiry') . '" /> ' .// Icon title.
_('Bank Transactions Inquiry') . '</p>';// Page title.
prnMsg(_('There are no transactions for this account in the date range selected'), 'info');
-
+
$sql = "SELECT sum(banktrans.amount) FROM banktrans WHERE bankact='" . $_POST['BankAccount'] . "'";
$ErrMsg = _('Failed to retrive balance data');
$balresult = DB_query($sql,$ErrMsg);
@@ -136,7 +136,7 @@
echo '<p class="page_title_text">' . _('The Bank Account Balance Is in') . ' ' . $BankDetailRow['currcode'] . ' <span style="font-weight:bold">' . locale_number_format($Balance,$BankDetailRow['decimalplaces']) . '</span></p>';
}
}
-
+
} else {
echo '<div id="Report">';// Division to identify the report block.
echo '<p class="page_title_text"><img alt="" src="'.$RootPath.'/css/'.$Theme.
@@ -168,7 +168,7 @@
$j = 0;
$k = 0;
while ($myrow = DB_fetch_array($result)){
-
+
if ($j == 0) {
if (ABS($myrow['prebalance'])>0.0001) {
if ($k == 0) {
@@ -184,7 +184,7 @@
<td colspan="5"></td></tr>';
$j++;
- }
+ }
}
if ($k == 0) {
echo '<tr class="OddTableRows">';
@@ -210,7 +210,7 @@
$Balance += $myrow['amount']/$myrow['exrate'];
$AccountCurrTotal += $myrow['amount']/$myrow['exrate'];
$LocalCurrTotal += $myrow['amount']/$myrow['functionalexrate']/$myrow['exrate'];
-
+
if ($myrow['amount']==$myrow['amountcleared']) {
$Matched=_('Yes');
} else {
@@ -253,9 +253,8 @@
'<button name="SelectADifferentPeriod" type="submit" value="'. _('Select A Different Period') .'"><img alt="" src="'.$RootPath.'/css/'.$Theme.
'/images/gl.png" /> ' .
_('Select Another Date') . '</button>'.// "Select A Different Period" button.
- '<button formaction="index.php?Application=GL" type="submit"><img alt="" src="'.$RootPath.'/css/'.$Theme.
- '/images/previous.png" /> ' .
- _('Return') . '</button>'.// "Return" button.
+ '<button onclick="window.location=\'index.php?Application=GL\'" type="button"><img alt="" src="'.$RootPath.'/css/'.$Theme.
+ '/images/return.svg" /> ', _('Return'), '</button>', // "Return" button.
'</div>
</form>';
}
Modified: trunk/GLAccountUsers.php
===================================================================
--- trunk/GLAccountUsers.php 2016-11-06 18:46:52 UTC (rev 7662)
+++ trunk/GLAccountUsers.php 2016-11-07 03:25:49 UTC (rev 7663)
@@ -249,8 +249,8 @@
'<button formaction="GLAccountUsers.php?Cancel" type="submit"><img alt="" src="', $RootPath, '/css/', $Theme,
'/images/gl.png" /> ', _('Select A Different GL account'), '</button>'; // "Select A Different GL account" button.
}
-echo '<button formaction="index.php?Application=GL" type="submit" value="Submit"><img alt="" src="', $RootPath, '/css/', $Theme,
- '/images/previous.png" /> ', _('Return'), '</button>', // "Return" button.
+echo '<button onclick="window.location=\'index.php?Application=GL\'" type="button"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/return.svg" /> ', _('Return'), '</button>', // "Return" button.
'</div>
</form>';
Modified: trunk/GLBalanceSheet.php
===================================================================
--- trunk/GLBalanceSheet.php 2016-11-06 18:46:52 UTC (rev 7662)
+++ trunk/GLBalanceSheet.php 2016-11-07 03:25:49 UTC (rev 7663)
@@ -130,8 +130,8 @@
chartmaster.accountname,
Sum(CASE WHEN chartdetails.period='" . $_POST['BalancePeriodEnd'] . "' THEN chartdetails.bfwd + chartdetails.actual ELSE 0 END) AS balancecfwd,
Sum(CASE WHEN chartdetails.period='" . ($_POST['BalancePeriodEnd'] - 12) . "' THEN chartdetails.bfwd + chartdetails.actual ELSE 0 END) AS lybalancecfwd
- FROM chartmaster
- INNER JOIN accountgroups ON chartmaster.group_ = accountgroups.groupname
+ FROM chartmaster
+ INNER JOIN accountgroups ON chartmaster.group_ = accountgroups.groupname
INNER JOIN chartdetails ON chartmaster.accountcode= chartdetails.accountcode
INNER JOIN glaccountusers ON glaccountusers.accountcode=chartmaster.accountcode AND glaccountusers.userid='" . $_SESSION['UserID'] . "' AND glaccountusers.canview=1
WHERE accountgroups.pandl=0
@@ -373,8 +373,8 @@
chartmaster.accountname,
Sum(CASE WHEN chartdetails.period='" . $_POST['BalancePeriodEnd'] . "' THEN chartdetails.bfwd + chartdetails.actual ELSE 0 END) AS balancecfwd,
Sum(CASE WHEN chartdetails.period='" . ($_POST['BalancePeriodEnd'] - 12) . "' THEN chartdetails.bfwd + chartdetails.actual ELSE 0 END) AS lybalancecfwd
- FROM chartmaster
- INNER JOIN accountgroups ON chartmaster.group_ = accountgroups.groupname
+ FROM chartmaster
+ INNER JOIN accountgroups ON chartmaster.group_ = accountgroups.groupname
INNER JOIN chartdetails ON chartmaster.accountcode= chartdetails.accountcode
INNER JOIN glaccountusers ON glaccountusers.accountcode=chartmaster.accountcode AND glaccountusers.userid='" . $_SESSION['UserID'] . "' AND glaccountusers.canview=1
WHERE accountgroups.pandl=0
@@ -716,8 +716,8 @@
'/images/printer.png" /> ' . _('Print This') . '</button>'.// "Print This" button.
'<button name="SelectADifferentPeriod" type="submit" value="'. _('Select A Different Period') .'"><img alt="" src="'.$RootPath.'/css/'.$Theme.
'/images/gl.png" /> ' . _('Select A Different Balance Date') . '</button>'.// "Select A Different Period" button.
- '<button formaction="index.php?Application=GL" type="submit"><img alt="" src="'.$RootPath.'/css/'.$Theme.
- '/images/previous.png" /> ' . _('Return') . '</button>'.// "Return" button.
+ '<button onclick="window.location=\'index.php?Application=GL\'" type="button"><img alt="" src="'.$RootPath.'/css/'.$Theme.
+ '/images/return.svg" /> ', _('Return'), '</button>', // "Return" button.
'</div>';
echo '</div>';// div class=?
Modified: trunk/GLProfit_Loss.php
===================================================================
--- trunk/GLProfit_Loss.php 2016-11-06 18:46:52 UTC (rev 7662)
+++ trunk/GLProfit_Loss.php 2016-11-07 03:25:49 UTC (rev 7663)
@@ -166,8 +166,8 @@
Sum(CASE WHEN chartdetails.period='" . ($_POST['FromPeriod'] - 12) . "' THEN chartdetails.bfwd ELSE 0 END) AS lyfirstprdbfwd,
Sum(CASE WHEN chartdetails.period='" . ($_POST['ToPeriod']-12) . "' THEN chartdetails.bfwd + chartdetails.actual ELSE 0 END) AS lylastprdcfwd,
Sum(CASE WHEN chartdetails.period='" . $_POST['ToPeriod'] . "' THEN chartdetails.bfwdbudget + chartdetails.budget ELSE 0 END) AS lastprdbudgetcfwd
- FROM chartmaster
- INNER JOIN accountgroups ON chartmaster.group_ = accountgroups.groupname
+ FROM chartmaster
+ INNER JOIN accountgroups ON chartmaster.group_ = accountgroups.groupname
INNER JOIN chartdetails ON chartmaster.accountcode= chartdetails.accountcode
INNER JOIN glaccountusers ON glaccountusers.accountcode=chartmaster.accountcode AND glaccountusers.userid='" . $_SESSION['UserID'] . "' AND glaccountusers.canview=1
WHERE accountgroups.pandl=1
@@ -595,8 +595,8 @@
SUM(CASE WHEN chartdetails.period='" . ($_POST['FromPeriod'] - 12) . "' THEN chartdetails.bfwd ELSE 0 END) AS lyfirstprdbfwd,
SUM(CASE WHEN chartdetails.period='" . ($_POST['ToPeriod']-12) . "' THEN chartdetails.bfwd + chartdetails.actual ELSE 0 END) AS lylastprdcfwd,
SUM(CASE WHEN chartdetails.period='" . $_POST['ToPeriod'] . "' THEN chartdetails.bfwdbudget + chartdetails.budget ELSE 0 END) AS lastprdbudgetcfwd
- FROM chartmaster
- INNER JOIN accountgroups ON chartmaster.group_ = accountgroups.groupname
+ FROM chartmaster
+ INNER JOIN accountgroups ON chartmaster.group_ = accountgroups.groupname
INNER JOIN chartdetails ON chartmaster.accountcode= chartdetails.accountcode
INNER JOIN glaccountusers ON glaccountusers.accountcode=chartmaster.accountcode AND glaccountusers.userid='" . $_SESSION['UserID'] . "' AND glaccountusers.canview=1
WHERE accountgroups.pandl=1
@@ -1313,8 +1313,8 @@
'/images/printer.png" /> ', _('Print This'), '</button> ', // "Print This" button.
'<button name="SelectADifferentPeriod" type="submit" value="', _('Select A Different Period'), '"><img alt="" src="', $RootPath, '/css/', $Theme,
'/images/gl.png" /> ', _('Select A Different Period'), '</button> ', // "Select A Different Period" button.
- '<button formaction="index.php?Application=GL" type="submit"><img alt="" src="', $RootPath, '/css/', $Theme,
- '/images/previous.png" /> ', _('Return'), '</button>', // "Return" button.
+ '<button onclick="window.location=\'index.php?Application=GL\'" type="button"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/return.svg" /> ', _('Return'), '</button>', // "Return" button.
'</div>';
}
echo '</div>';// div class=?
Modified: trunk/GLTrialBalance.php
===================================================================
--- trunk/GLTrialBalance.php 2016-11-06 18:46:52 UTC (rev 7662)
+++ trunk/GLTrialBalance.php 2016-11-07 03:25:49 UTC (rev 7663)
@@ -147,7 +147,7 @@
Sum(CASE WHEN chartdetails.period='" . $_POST['ToPeriod'] . "' THEN chartdetails.actual ELSE 0 END) AS monthactual,
Sum(CASE WHEN chartdetails.period='" . $_POST['ToPeriod'] . "' THEN chartdetails.budget ELSE 0 END) AS monthbudget,
Sum(CASE WHEN chartdetails.period='" . $_POST['ToPeriod'] . "' THEN chartdetails.bfwdbudget + chartdetails.budget ELSE 0 END) AS lastprdbudgetcfwd
- FROM chartmaster
+ FROM chartmaster
INNER JOIN accountgroups ON chartmaster.group_ = accountgroups.groupname
INNER JOIN chartdetails ON chartmaster.accountcode= chartdetails.accountcode
INNER JOIN glaccountusers ON glaccountusers.accountcode=chartmaster.accountcode AND glaccountusers.userid='" . $_SESSION['UserID'] . "' AND glaccountusers.canview=1
@@ -419,7 +419,7 @@
Sum(CASE WHEN chartdetails.period='" . $_POST['ToPeriod'] . "' THEN chartdetails.actual ELSE 0 END) AS monthactual,
Sum(CASE WHEN chartdetails.period='" . $_POST['ToPeriod'] . "' THEN chartdetails.budget ELSE 0 END) AS monthbudget,
Sum(CASE WHEN chartdetails.period='" . $_POST['ToPeriod'] . "' THEN chartdetails.bfwdbudget + chartdetails.budget ELSE 0 END) AS lastprdbudgetcfwd
- FROM chartmaster
+ FROM chartmaster
INNER JOIN accountgroups ON chartmaster.group_ = accountgroups.groupname
INNER JOIN chartdetails ON chartmaster.accountcode= chartdetails.accountcode
INNER JOIN glaccountusers ON glaccountusers.accountcode=chartmaster.accountcode AND glaccountusers.userid='" . $_SESSION['UserID'] . "' AND glaccountusers.canview=1
@@ -736,8 +736,8 @@
'/images/printer.png" /> ' . _('Print This') . '</button>'.// "Print This" button.
'<button name="SelectADifferentPeriod" type="submit" value="'. _('Select A Different Period') .'"><img alt="" src="'.$RootPath.'/css/'.$Theme.
'/images/gl.png" /> ' . _('Select A Different Period') . '</button>'.// "Select A Different Period" button.
- '<button formaction="index.php" type="submit"><img alt="" src="'.$RootPath.'/css/'.$Theme.
- '/images/previous.png" /> ' . _('Return') . '</button>'.// "Return" button.
+ '<button onclick="window.location=\'index.php?Application=GL\'" type="button"><img alt="" src="'.$RootPath.'/css/'.$Theme.
+ '/images/return.svg" /> ', _('Return'), '</button>', // "Return" button.
'</div>';
}
echo '</div>
Modified: trunk/UserGLAccounts.php
===================================================================
--- trunk/UserGLAccounts.php 2016-11-06 18:46:52 UTC (rev 7662)
+++ trunk/UserGLAccounts.php 2016-11-07 03:25:49 UTC (rev 7663)
@@ -255,8 +255,8 @@
'<button formaction="UserGLAccounts.php?Cancel" type="submit"><img alt="" src="', $RootPath, '/css/', $Theme,
'/images/user.png" /> ', _('Select A Different User'), '</button>'; // "Select A Different User" button.
}
-echo '<button formaction="index.php?Application=GL" type="submit"><img alt="" src="', $RootPath, '/css/', $Theme,
- '/images/previous.png" /> ', _('Return'), '</button>', // "Return" button.
+echo '<button onclick="window.location=\'index.php?Application=GL\'" type="button"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/return.svg" /> ', _('Return'), '</button>', // "Return" button.
'</div>
</form>';
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-11-06 18:46:52 UTC (rev 7662)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2016-11-07 03:25:49 UTC (rev 7663)
@@ -8,7 +8,7 @@
"Project-Id-Version: webERP 4.12.2\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-10-31 20:01-0600\n"
-"PO-Revision-Date: 2016-11-06 11:51-0600\n"
+"PO-Revision-Date: 2016-11-06 21:23-0600\n"
"Last-Translator: Rafael E. Chacón <raf...@gm...>\n"
"Language-Team: TecnoSoluciones.com <web...@te...>\n"
"Language: es_ES\n"
@@ -14616,7 +14616,7 @@
#: GLAccountInquiry.php:272
msgid "Period difference"
-msgstr "Diferencia del Período"
+msgstr "Diferencia del período"
#: GLAccountInquiry.php:295
msgid "Failed to retrieve bank data"
@@ -15360,7 +15360,7 @@
#: includes/PDFTagProfitAndLossPageHeader.inc:36
#: includes/PDFTrialBalancePageHeader.inc:33
msgid "Period Budget"
-msgstr "Presupuesto del Período"
+msgstr "Presupuesto del período"
#: GLProfit_Loss.php:912
#, php-format
@@ -15524,7 +15524,7 @@
#: GLTrialBalance.php:455 includes/PDFTrialBalancePageHeader.inc:31
msgid "Month Budget"
-msgstr "Presupuesto Mensual"
+msgstr "Presupuesto mensual"
#: GoodsReceivedControlled.php:9
msgid "Receive Controlled Items"
@@ -22399,7 +22399,7 @@
#: PeriodsInquiry.php:7
msgid "Periods Inquiry"
-msgstr "Consultar Períodos"
+msgstr "Consultar períodos"
#: PeriodsInquiry.php:16
msgid "No periods were returned by the SQL because"
@@ -24667,7 +24667,7 @@
#: PrintCustStatements.php:103
msgid "Account #"
-msgstr ""
+msgstr "Cuenta #"
#: PrintCustStatements.php:105
msgid "Recipients"
@@ -30461,7 +30461,7 @@
#: ShopParameters.php:344
msgid "Add surcharges for different payment methods."
-msgstr ""
+msgstr "Añadir recargos para diferentes métodos de pago."
#: ShopParameters.php:349
msgid "Surcharges Stock Item"
@@ -39671,7 +39671,7 @@
#: WorkOrderEntry.php:1055
msgid "Add To Work Order"
-msgstr ""
+msgstr "Añadir a la orden de trabajo"
#: WorkOrderIssue.php:5
msgid "Issue Materials To Work Order"
@@ -51451,7 +51451,7 @@
#: reportwriter/languages/en_US/reports.php:55
msgid "Align"
-msgstr ""
+msgstr "Alinear"
#: reportwriter/languages/en_US/reports.php:57
msgid "Bottom"
@@ -51624,7 +51624,7 @@
#: reportwriter/languages/en_US/reports.php:135
msgid "Change"
-msgstr ""
+msgstr "Cambiar"
#: reportwriter/languages/en_US/reports.php:136
msgid "Continue"
|
