Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[6849] trunk
|
From: <rc...@us...> - 2014-08-28 15:24:38
|
Revision: 6849
http://sourceforge.net/p/web-erp/reponame/6849
Author: rchacon
Date: 2014-08-28 15:24:35 +0000 (Thu, 28 Aug 2014)
Log Message:
-----------
In Tax.php: Fixes SQL select order-by from transaction-date to record-number (primary key). Minor improvements.
Modified Paths:
--------------
trunk/Tax.php
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.mo
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po
Modified: trunk/Tax.php
===================================================================
--- trunk/Tax.php 2014-08-28 15:15:31 UTC (rev 6848)
+++ trunk/Tax.php 2014-08-28 15:24:35 UTC (rev 6849)
@@ -18,11 +18,11 @@
$result = DB_query("SELECT description FROM taxauthorities WHERE taxid='" . $_POST['TaxAuthority'] . "'",$db);
$TaxAuthDescription = DB_fetch_row($result);
- $TaxAuthorityName = $TaxAuthDescription[0];
+ $TaxAuthorityName = $TaxAuthDescription[0];
include('includes/PDFStarter.php');
$pdf->addInfo('Title', _('Tax Report') . ': ' . $TaxAuthorityName);
- $pdf->addInfo('Subject', $_POST['NoOfPeriods'] . ' ' . _('months to') . ' ' . $PeriodEnd);
+ $pdf->addInfo('Subject', $_POST['NoOfPeriods'] . ' ' . _('months to') . ' ' . $PeriodEnd);
/*Now get the invoices for the tax report */
/* The amounts of taxes are inserted into debtortranstaxes.taxamount in
@@ -42,11 +42,11 @@
INNER JOIN debtorsmaster ON debtortrans.debtorno=debtorsmaster.debtorno
INNER JOIN systypes ON debtortrans.type=systypes.typeid
INNER JOIN debtortranstaxes ON debtortrans.id = debtortranstaxes.debtortransid
- WHERE debtortrans.prd >= '" .($_POST['ToPeriod'] - $_POST['NoOfPeriods'] + 1) . "'
+ WHERE debtortrans.prd >= '" . ($_POST['ToPeriod'] - $_POST['NoOfPeriods'] + 1) . "'
AND debtortrans.prd <= '" . $_POST['ToPeriod'] . "'
AND (debtortrans.type=10 OR debtortrans.type=11)
AND debtortranstaxes.taxauthid = '" . $_POST['TaxAuthority'] . "'
- ORDER BY debtortrans.trandate";// RChacon: ORDER BY debtortrans.recno ?
+ ORDER BY debtortrans.id";// Order by debtortrans record number (primary key).
$DebtorTransResult = DB_query($SQL,$db,'','',false,false); //don't trap errors in DB_query
@@ -62,7 +62,7 @@
exit;
}
- $SalesCount = 0;
+ $SalesCount = 0;
$SalesNet = 0;
$SalesTax = 0;
if($_POST['DetailOrSummary']=='Detail') {
@@ -90,7 +90,7 @@
include('includes/PDFTaxPageHeader.inc');
PageHeaderDetail();
}
- $SalesCount ++;// Counts sales transactions.
+ $SalesCount ++;// Counts sales transactions.
$SalesNet += $DebtorTransRow['netamount'];// Accumulates sales net.
$SalesTax += $DebtorTransRow['tax'];// Accumulates sales tax.
} /*end listing while loop */
@@ -115,7 +115,7 @@
} else {
while($DebtorTransRow = DB_fetch_array($DebtorTransResult,$db)) {
- $SalesCount ++;// Counts sales transactions.
+ $SalesCount ++;// Counts sales transactions.
$SalesNet += $DebtorTransRow['netamount'];// Accumulates sales net.
$SalesTax += $DebtorTransRow['tax'];// Accumulates sales tax.
} /*end listing while loop */
@@ -150,7 +150,7 @@
supptrans.transno,
suppliers.suppname,
supptrans.suppreference,
- supptrans.ovamount/supptrans.rate AS netamount,
+ supptrans.ovamount/supptrans.rate AS netamount,
supptranstaxes.taxamount/supptrans.rate AS taxamt
FROM supptrans
INNER JOIN suppliers ON supptrans.supplierno=suppliers.supplierid
@@ -160,7 +160,7 @@
AND supptrans.trandate <= '" . FormatDateForSQL($PeriodEnd) . "'
AND (supptrans.type=20 OR supptrans.type=21)
AND supptranstaxes.taxauthid = '" . $_POST['TaxAuthority'] . "'
- ORDER BY supptrans.trandate";// ORDER BY supptrans.recno ?
+ ORDER BY supptrans.id";// Order by supptrans record number (primary key).
$SuppTransResult = DB_query($SQL,$db,'','',false,false); //doint trap errors in DB_query
@@ -176,7 +176,7 @@
exit;
}
- $PurchasesCount = 0;
+ $PurchasesCount = 0;
$PurchasesNet = 0;
$PurchasesTax = 0;
if($_POST['DetailOrSummary']=='Detail') {
@@ -203,7 +203,7 @@
include('includes/PDFTaxPageHeader.inc');
PageHeaderDetail();
}
- $PurchasesCount ++;// Counts purchases transactions.
+ $PurchasesCount ++;// Counts purchases transactions.
$PurchasesNet += $SuppTransRow['netamount'];// Accumulates purchases net.
$PurchasesTax += $SuppTransRow['taxamt'];// Accumulates purchases tax.
} /*end listing while loop */
@@ -228,7 +228,7 @@
} else {
while($SuppTransRow = DB_fetch_array($SuppTransResult,$db)) {
- $PurchasesCount ++;// Counts purchases transactions.
+ $PurchasesCount ++;// Counts purchases transactions.
$PurchasesNet += $SuppTransRow['netamount'];// Accumulates purchases net.
$PurchasesTax += $SuppTransRow['taxamt'];// Accumulates purchases tax.
} /*end listing while loop */
@@ -296,24 +296,24 @@
$YPos -= $FontSize*4;// Jumps additional lines.
- $pdf->addText($Left_Margin, $YPos, $FontSize, _('Adjustments for Tax paid to Customs, FBT, entertainments etc must also be entered'));
+ $pdf->addText($Left_Margin, $YPos, $FontSize, _('Adjustments for tax paid to Customs, FBT, entertainments, etc. must also be entered.'));
$YPos -= $FontSize;
$LeftOvers = $pdf->addTextWrap($Left_Margin, $YPos-$FontSize, $Page_Width-$Left_Margin-$Right_Margin, $FontSize,
- _('This information excludes Tax on journal entries/payments/receipts all Tax should be entered through AR/AP'));
+ _('This information excludes tax on journal entries/payments/receipts. All tax should be entered through AR/AP.'));
$YPos -= $FontSize;
$LeftOvers = $pdf->addTextWrap($Left_Margin, $YPos-$FontSize, $Page_Width-$Left_Margin-$Right_Margin, $FontSize, $LeftOvers);
- if($SalesCount+$PurchasesCount == 0) {
+ if($SalesCount+$PurchasesCount == 0) {
$Title = _('Taxation Reporting Error');
include('includes/header.inc');
prnMsg(_('There are no tax entries to list'),'info');
echo '<br /><a href="' . $RootPath . '/index.php">' . _('Back to the menu') . '</a>';
include('includes/footer.inc');
exit;
- } else {
- $pdf->OutputD($_SESSION['DatabaseName'] . '_Tax_Report_' . Date('Y-m-d'));
- }
- $pdf->__destruct();
+ } else {
+ $pdf->OutputD($_SESSION['DatabaseName'] . '_Tax_Report_' . Date('Y-m-d'));
+ }
+ $pdf->__destruct();
} else { /*The option to print PDF was not hit */
$Title =_('Tax Reporting');
@@ -324,11 +324,11 @@
_('Tax Report') . '" />' . ' ' . _('Tax Reporting') . '</p>';
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">';
- echo '<div>';
- echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+ echo '<div>';
+ echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<table class="selection">';
- echo '<tr><td>' . _('Tax Authority To Report On:') . ':</td>
+ echo '<tr><td>' . _('Tax Authority To Report On') . ':</td>
<td><select name="TaxAuthority">';
$result = DB_query("SELECT taxid, description FROM taxauthorities",$db);
@@ -340,12 +340,12 @@
<td>' . _('Return Covering') . ':</td>
<td><select name="NoOfPeriods">' .
'<option selected="selected" value="1">' . _('One Month') . '</option>' .
- '<option value="2">' . _('2 Months') . '</option>' .
+ '<option value="2">' . _('2 Months') . '</option>' .
'<option value="3">' . _('3 Months') . '</option>' .
- '<option value="6">' . _('6 Months') . '</option>' .
- '<option value="12">' . _('12 Months') . '</option>' .
- '<option value="24">' . _('24 Months') . '</option>' .
- '<option value="48">' . _('48 Months') . '</option>' .
+ '<option value="6">' . _('6 Months') . '</option>' .
+ '<option value="12">' . _('12 Months') . '</option>' .
+ '<option value="24">' . _('24 Months') . '</option>' .
+ '<option value="48">' . _('48 Months') . '</option>' .
'</select></td>
</tr>';
@@ -384,7 +384,7 @@
<div class="centre">
<input type="submit" name="PrintPDF" value="' . _('Print PDF') . '" />
</div>
- </div>
+ </div>
</form>';
include('includes/footer.inc');
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 2014-08-28 15:15:31 UTC (rev 6848)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2014-08-28 15:24:35 UTC (rev 6849)
@@ -7,8 +7,8 @@
msgstr ""
"Project-Id-Version: webERP 4.11.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-27 22:51-0600\n"
-"PO-Revision-Date: 2014-08-27 22:55-0600\n"
+"POT-Creation-Date: 2014-08-28 08:46-0600\n"
+"PO-Revision-Date: 2014-08-28 09:16-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: TecnoSoluciones.com <web...@te...>\n"
"Language: es_ES\n"
@@ -11244,7 +11244,7 @@
#: GLProfit_Loss.php:107 GLTagProfit_Loss.php:120 POReport.php:1507
#: SalesInquiry.php:1069 Tax.php:433
msgid "Summary"
-msgstr "Sumario"
+msgstr "Resumen"
#: EDIMessageFormat.php:240
msgid "Line Text"
@@ -13785,7 +13785,7 @@
#: GLBalanceSheet.php:56 GLProfit_Loss.php:105 GLTagProfit_Loss.php:118
msgid "Detail Or Summary"
-msgstr "Detalle ó Sumario"
+msgstr "Detalle o resumen"
#: GLBalanceSheet.php:57
msgid "Selecting Summary will show on the totals at the account group level"
@@ -35589,7 +35589,7 @@
#: Tax.php:24 Tax.php:324 includes/PDFTaxPageHeader.inc:25
msgid "Tax Report"
-msgstr ""
+msgstr "Informe de impuestos"
#: Tax.php:54 Tax.php:168 Tax.php:307
msgid "Taxation Reporting Error"
@@ -35608,7 +35608,7 @@
#: Tax.php:107
msgid "Total Outputs"
-msgstr "Egresos Totales"
+msgstr "Egresos totales"
#: Tax.php:170
msgid "The accounts payable transaction details could not be retrieved because"
@@ -35622,7 +35622,7 @@
#: Tax.php:220
msgid "Total Inputs"
-msgstr "Ingresos Totales"
+msgstr "Ingresos totales"
#: Tax.php:269 includes/MainMenuLinksArray.php:24
#: reportwriter/languages/en_US/reports.php:241
@@ -35639,19 +35639,19 @@
#: Tax.php:299
msgid ""
-"Adjustments for Tax paid to Customs, FBT, entertainments etc must also be "
-"entered"
+"Adjustments for tax paid to Customs, FBT, entertainments, etc. must also be "
+"entered."
msgstr ""
-"Deben introducirse los ajustes para los Impuestos pagados a Aduanas. "
-"entretenimientos, etc."
+"Ajustes por impuestos pagados a la Aduana, FBT, entretenimientos, etc. "
+"también se deben introducir."
#: Tax.php:302
msgid ""
-"This information excludes Tax on journal entries/payments/receipts all Tax "
-"should be entered through AR/AP"
+"This information excludes tax on journal entries/payments/receipts. All tax "
+"should be entered through AR/AP."
msgstr ""
-"Esta información excluye Impuestos en asientos/pagos/ingresos del diario. "
-"Todos los Impuestos deberían ser entrados a través de Cuentas a Cobrar/Pagar"
+"Esta información excluye impuesto sobre entradas/pagos/recibos de Diarios. "
+"Todo impuesto debe ser introducido mediante CxC/CxP."
#: Tax.php:309
msgid "There are no tax entries to list"
@@ -35662,12 +35662,12 @@
msgstr "Informe impositivo"
#: Tax.php:331
-msgid "Tax Authority To Report On:"
-msgstr "Declarar a la Autoridad Fiscal:"
+msgid "Tax Authority To Report On"
+msgstr "Declarar a la Autoridad Fiscal"
#: Tax.php:340
msgid "Return Covering"
-msgstr "Regresar Cubierta"
+msgstr "Período"
#: Tax.php:343
msgid "2 Months"
@@ -35695,7 +35695,7 @@
#: Tax.php:353
msgid "Return To"
-msgstr "Regresar A"
+msgstr "Corte al"
#: Tax.php:362
msgid "Could not retrieve the period data because"
@@ -35703,15 +35703,15 @@
#: Tax.php:376
msgid "Detail Or Summary Only"
-msgstr "Detalle ó Sumario"
+msgstr "Solo detalle o resumen"
#: Tax.php:378
msgid "Detail and Summary"
-msgstr "Detalle y Resumen"
+msgstr "Detalle y resumen"
#: Tax.php:379
msgid "Summary Only"
-msgstr "Sólo Sumario"
+msgstr "Sólo resumen"
#: TaxAuthorities.php:6 TaxAuthorityRates.php:134
msgid "Tax Authorities"
@@ -35805,11 +35805,11 @@
#: TaxAuthorities.php:310
msgid "Bank Name"
-msgstr "Nombre del Banco"
+msgstr "Nombre del banco"
#: TaxAuthorities.php:311
msgid "Not more than 40 chacraters"
-msgstr ""
+msgstr "No más de 40 caracteres"
#: TaxAuthorities.php:314
msgid "Bank Account Type"
@@ -35817,7 +35817,7 @@
#: TaxAuthorities.php:315 TaxAuthorities.php:319
msgid "No more than 20 characters"
-msgstr ""
+msgstr "No más de 20caracteres"
#: TaxAuthorities.php:322
msgid "Bank Swift No"
@@ -35825,7 +35825,7 @@
#: TaxAuthorities.php:323
msgid "No more than 15 characters"
-msgstr ""
+msgstr "No más de 15 caracteres"
#: TaxAuthorityRates.php:12
msgid "Tax Rates"
@@ -35866,7 +35866,7 @@
#: TaxAuthorityRates.php:112
#, php-format
msgid "Input must be numeric"
-msgstr ""
+msgstr "La cantidad debe ser numérica"
#: TaxAuthorityRates.php:126
msgid "Update Rates"
@@ -50527,3 +50527,20 @@
#: ../webSHOP/includes/session.php:137
msgid "Bank Transfer"
msgstr ""
+
+#~ msgid "Tax Authority To Report On:"
+#~ msgstr "Declarar a la Autoridad Fiscal"
+
+#~ msgid ""
+#~ "Adjustments for Tax paid to Customs, FBT, entertainments etc must also be "
+#~ "entered"
+#~ msgstr ""
+#~ "Ajustes por impuestos pagados a la Aduana, FBT, entretenimientos, etc "
+#~ "también se deben introducir"
+
+#~ msgid ""
+#~ "This information excludes Tax on journal entries/payments/receipts all "
+#~ "Tax should be entered through AR/AP"
+#~ msgstr ""
+#~ "Esta información excluye impuesto sobre entradas/pagos/recibos de "
+#~ "Diarios. Todo impuesto debe ser introducido mediante CxC/CxP."
Modified: trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po 2014-08-28 15:15:31 UTC (rev 6848)
+++ trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po 2014-08-28 15:24:35 UTC (rev 6849)
@@ -8,8 +8,8 @@
msgstr ""
"Project-Id-Version: webERP 4.11.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-27 22:51-0600\n"
-"PO-Revision-Date: 2014-08-27 22:58-0600\n"
+"POT-Creation-Date: 2014-08-28 08:46-0600\n"
+"PO-Revision-Date: 2014-08-28 08:50-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: French <none>\n"
"Language: fr_FR\n"
@@ -34829,23 +34829,23 @@
#: SystemParameters.php:372
msgid "d/m/Y"
-msgstr ""
+msgstr "j/m/A"
#: SystemParameters.php:373
msgid "d.m.Y"
-msgstr ""
+msgstr "j.m.A"
#: SystemParameters.php:374
msgid "m/d/Y"
-msgstr ""
+msgstr "m/j/A"
#: SystemParameters.php:375
msgid "Y/m/d"
-msgstr ""
+msgstr "A/m/j"
#: SystemParameters.php:376
msgid "Y-m-d"
-msgstr ""
+msgstr "A-m-j"
# JDN
#: SystemParameters.php:378
@@ -34990,15 +34990,13 @@
msgid "Order Entry allows Line Item Narrative"
msgstr "Autoriser les commentaires"
-# JDN
#: SystemParameters.php:441
msgid "Allow Narrative Entry"
-msgstr "Oui"
+msgstr "Autoriser l'entrée Narrative"
-# JDN
#: SystemParameters.php:442
msgid "No Narrative Line"
-msgstr "Non"
+msgstr "Pas de ligne narrative"
# JDN
#: SystemParameters.php:444
@@ -35057,7 +35055,7 @@
#: SystemParameters.php:485
msgid "Google"
-msgstr ""
+msgstr "Google"
#: SystemParameters.php:487
msgid "Specify the source to use for exchange rates"
@@ -36013,7 +36011,7 @@
#: Tax.php:24 Tax.php:324 includes/PDFTaxPageHeader.inc:25
msgid "Tax Report"
-msgstr ""
+msgstr "Rapport d'impôts"
#: Tax.php:54 Tax.php:168 Tax.php:307
msgid "Taxation Reporting Error"
@@ -36059,16 +36057,16 @@
#: Tax.php:299
msgid ""
-"Adjustments for Tax paid to Customs, FBT, entertainments etc must also be "
-"entered"
+"Adjustments for tax paid to Customs, FBT, entertainments, etc. must also be "
+"entered."
msgstr ""
"Ajustements de la taxe payée à la douane, FBT, etc divertissements doivent "
"aussi être indiqués"
#: Tax.php:302
msgid ""
-"This information excludes Tax on journal entries/payments/receipts all Tax "
-"should be entered through AR/AP"
+"This information excludes tax on journal entries/payments/receipts. All tax "
+"should be entered through AR/AP."
msgstr ""
"Cette information ne comprend pas la taxe sur les entrées du journal / "
"paiements / recettes fiscales devraient tous être entré par AR / AP"
@@ -36082,12 +36080,12 @@
msgstr "Rapport T.V.A."
#: Tax.php:331
-msgid "Tax Authority To Report On:"
-msgstr "Administration fiscale à formuler sur:"
+msgid "Tax Authority To Report On"
+msgstr "Administration fiscale à formuler sur"
#: Tax.php:340
msgid "Return Covering"
-msgstr ""
+msgstr "Retour Couvrant"
#: Tax.php:343
msgid "2 Months"
@@ -36183,11 +36181,11 @@
#: TaxAuthorities.php:148
msgid "Input Tax"
-msgstr "Taxe"
+msgstr "Taxes reçues"
#: TaxAuthorities.php:149
msgid "Output Tax"
-msgstr ""
+msgstr "Taxes payées"
#: TaxAuthorities.php:152
msgid "Bank Act Type"
@@ -50928,3 +50926,20 @@
#: ../webSHOP/includes/session.php:137
msgid "Bank Transfer"
msgstr ""
+
+#~ msgid "Tax Authority To Report On:"
+#~ msgstr "Administration fiscale à formuler sur:"
+
+#~ msgid ""
+#~ "Adjustments for Tax paid to Customs, FBT, entertainments etc must also be "
+#~ "entered"
+#~ msgstr ""
+#~ "Ajustements de la taxe payée à la douane, FBT, etc divertissements "
+#~ "doivent aussi être indiqués"
+
+#~ msgid ""
+#~ "This information excludes Tax on journal entries/payments/receipts all "
+#~ "Tax should be entered through AR/AP"
+#~ msgstr ""
+#~ "Cette information ne comprend pas la taxe sur les entrées du journal / "
+#~ "paiements / recettes fiscales devraient tous être entré par AR / AP"
|
