[Web-erp-svn] SF.net SVN: web-erp:[6649] trunk

[<rc...@us...>]

Revision: 6649
          http://sourceforge.net/p/web-erp/reponame/6649
Author:   rchacon
Date:     2014-03-29 00:40:57 +0000 (Sat, 29 Mar 2014)
Log Message:
-----------
Fix on tax amount in tax report. Minor fixes in Spanish translation.

Modified Paths:
--------------
    trunk/Tax.php
    trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
    trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po

Modified: trunk/Tax.php
===================================================================
--- trunk/Tax.php	2014-03-28 11:27:31 UTC (rev 6648)
+++ trunk/Tax.php	2014-03-29 00:40:57 UTC (rev 6649)
@@ -31,8 +31,9 @@
 	$PageNumber=0;
 	$line_height=12;
 
-      /*Now get the invoices for the tax report */
+	/*Now get the invoices for the tax report */
 
+	/*rchacon: The amounts of taxes are inserted into debtortranstaxes.taxamount in local currency and they are accumulated in debtortrans.ovgst in original currency.*/
 	$SQL = "SELECT debtortrans.transno,
 					debtortrans.type,
 					systypes.typename,
@@ -43,7 +44,7 @@
 					debtortrans.order_,
 					(debtortrans.ovamount+debtortrans.ovfreight)/debtortrans.rate AS netamount,
 					debtortrans.ovfreight/debtortrans.rate AS freightamount,
-					debtortranstaxes.taxamount/debtortrans.rate AS tax
+					debtortranstaxes.taxamount AS tax
 			FROM debtortrans
 			INNER JOIN debtorsmaster ON debtortrans.debtorno=debtorsmaster.debtorno
 			INNER JOIN systypes ON debtortrans.type=systypes.typeid
@@ -357,4 +358,4 @@
 	include('includes/footer.inc');
 } /*end of else not PrintPDF */
 
-?>
\ 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	2014-03-28 11:27:31 UTC (rev 6648)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po	2014-03-29 00:40:57 UTC (rev 6649)
@@ -8,7 +8,7 @@
 "Project-Id-Version: WebERP 4.081\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-02-08 17:33+1300\n"
-"PO-Revision-Date: 2014-03-19 11:26-0600\n"
+"PO-Revision-Date: 2014-03-28 18:29-0600\n"
 "Last-Translator: Rafael Chacon <raf...@gm...>\n"
 "Language-Team: TecnoSoluciones.com <web...@te...>\n"
 "Language: es_ES\n"
@@ -18494,11 +18494,11 @@
 #: PcAuthorizeExpenses.php:45 PcAuthorizeExpenses.php:48 SuppLoginSetup.php:28
 #: WWW_Users.php:20 includes/MainMenuLinksArray.php:30
 msgid "Petty Cash"
-msgstr "Caja Chica"
+msgstr "Caja chica"
 
 #: PcAuthorizeExpenses.php:46 PcAuthorizeExpenses.php:49
 msgid "Authorisation Of Petty Cash Expenses "
-msgstr "Autorización de Gastos de Caja Chica"
+msgstr "Autorización de Gastos de caja chica"
 
 #: PcAuthorizeExpenses.php:64
 msgid "Detail Of Movement For Last "
@@ -18506,7 +18506,7 @@
 
 #: PcAuthorizeExpenses.php:142
 msgid "PettyCash"
-msgstr "Caja Chica"
+msgstr "Caja chica"
 
 #: PcAuthorizeExpenses.php:314
 msgid "Authorise expenses to Petty Cash Tab"
@@ -33443,7 +33443,7 @@
 
 #: SuppLoginSetup.php:27 WWW_Users.php:19 includes/MainMenuLinksArray.php:29
 msgid "Asset Manager"
-msgstr "Maestro de Activos"
+msgstr "Gestor de activos"
 
 #: SuppLoginSetup.php:102
 msgid "A new supplier login has been created"
@@ -35587,7 +35587,7 @@
 
 #: Tax.php:286
 msgid "Tax Reporting"
-msgstr "Informe Impositivo"
+msgstr "Informe impositivo"
 
 #: Tax.php:297
 msgid "Tax Authority To Report On:"
@@ -35599,11 +35599,11 @@
 
 #: Tax.php:310
 msgid "Quarter"
-msgstr "Cuarto"
+msgstr "Tres meses"
 
 #: Tax.php:311
 msgid "Six Months"
-msgstr "Seis Meses"
+msgstr "Seis meses"
 
 #: Tax.php:317
 msgid "Return To"
@@ -43220,7 +43220,7 @@
 
 #: includes/MainMenuLinksArray.php:354
 msgid "Tax Reports"
-msgstr "Informes de Impuestos"
+msgstr "Informes de impuestos"
 
 #: includes/MainMenuLinksArray.php:371
 msgid "GL Accounts"