Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[6847] trunk
|
From: <rc...@us...> - 2014-08-28 05:26:21
|
Revision: 6847
http://sourceforge.net/p/web-erp/reponame/6847
Author: rchacon
Date: 2014-08-28 05:26:07 +0000 (Thu, 28 Aug 2014)
Log Message:
-----------
Adds code comments, clean-up unneeded variables, simplies and reorder SQL select, reduces if() calls, replaces addTextWarp-left-align with addText, replaces line-drawing a box with Rectangle(), fixes start-date for 'Y/m/d' format, adds start-date for 'Y-m-d' format, adds a summary section for the report, adds ViewTopic and BookMark, adds more NoOfPeriods.
Modified Paths:
--------------
trunk/PDFPriceList.php
trunk/Tax.php
trunk/doc/Change.log
trunk/includes/PDFTaxPageHeader.inc
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/PDFPriceList.php
===================================================================
--- trunk/PDFPriceList.php 2014-08-27 03:14:38 UTC (rev 6846)
+++ trunk/PDFPriceList.php 2014-08-28 05:26:07 UTC (rev 6847)
@@ -210,11 +210,11 @@
if ($PriceList['price']!=0) {
$DisplayGPPercent = locale_number_format((($PriceList['price']-$PriceList['standardcost'])*100/$PriceList['price']), 2) . '%';
}
- /*$LeftOvers = */$pdf->addTextWrap($Page_Width-$Right_Margin-128, $YPos-$FontSize, 32, $FontSize,
+ $pdf->addTextWrap($Page_Width-$Right_Margin-128, $YPos-$FontSize, 32, $FontSize,
$DisplayGPPercent, 'right');
}
// Displays unit price:
- /*$LeftOvers = */$pdf->addTextWrap($Page_Width-$Right_Margin-96, $YPos-$FontSize, 96, $FontSize,
+ $pdf->addTextWrap($Page_Width-$Right_Margin-96, $YPos-$FontSize, 96, $FontSize,
locale_number_format($PriceList['price'],$PriceList['decimalplaces']), 'right');
if ($_POST['CustomerSpecials']=='Customer Special Prices Only') {
@@ -281,8 +281,8 @@
$ViewTopic = 'SalesTypes';// Filename in ManualContents.php's TOC.
$BookMark = 'PDFPriceList';// Anchor's id in the manual's html document.
include('includes/header.inc');
- echo '<p class="page_title_text"><img src="' . $RootPath . '/css/' . $Theme . '/images/customer.png" title="' . _('Price List') . '" alt="" />
- ' . ' ' . _('Print a price list by inventory category') . '</p>';
+ echo '<p class="page_title_text"><img alt="" src="' . $RootPath . '/css/' . $Theme . '/images/customer.png" title="' .
+ _('Price List') . '" />' . ' ' . _('Print a price list by inventory category') . '</p>';
if (!isset($_POST['FromCriteria']) or !isset($_POST['ToCriteria'])) {
/*if $FromCriteria is not set then show a form to allow input */
@@ -360,13 +360,13 @@
global $SalesTypeName;
global $CustomerName;
- $PageNumber++;
- if ($PageNumber>1) {
+ $PageNumber ++;// Increments $PageNumber before printing.
+ if ($PageNumber>1) {// Inserts a page break if it is not the first page.
$pdf->newPage();
}
$YPos = $Page_Height-$Top_Margin;
- $FontSizeExt = $FontSize;// To preserve the main font size.
+ $FontSizeLast = $FontSize;// To preserve the main font size.
$FontSize = 10;
$pdf->addText($Left_Margin, $YPos, $FontSize,
$_SESSION['CompanyRecord']['coyname']);// Company name.
@@ -434,6 +434,6 @@
/* $YPos -= $FontSize;// Jumps additional line after the table headings.*/
- $FontSize = $FontSizeExt;// Resets to the main font size.
+ $FontSize = $FontSizeLast;// Resets to the main font size.
}
?>
Modified: trunk/Tax.php
===================================================================
--- trunk/Tax.php 2014-08-27 03:14:38 UTC (rev 6846)
+++ trunk/Tax.php 2014-08-28 05:26:07 UTC (rev 6847)
@@ -1,16 +1,13 @@
<?php
-
/* $Id$*/
include('includes/session.inc');
-if (isset($_POST['TaxAuthority']) AND
+if(isset($_POST['TaxAuthority']) AND
isset($_POST['PrintPDF']) AND
isset($_POST['NoOfPeriods']) AND
- isset($_POST['ToPeriod'])){
+ isset($_POST['ToPeriod'])) {
- include('includes/PDFStarter.php');
-
$sql = "SELECT lastdate_in_period
FROM periods
WHERE periodno='" . $_POST['ToPeriod'] . "'";
@@ -23,131 +20,136 @@
$TaxAuthDescription = DB_fetch_row($result);
$TaxAuthorityName = $TaxAuthDescription[0];
- $pdf->addInfo('Title',_('Taxation Report'));
- $ReportTitle = $TaxAuthorityName . ' ' . _('Tax Report for') . ' ' . $_POST['NoOfPeriods'] . ' ' . _('months to') . ' ' . $PeriodEnd;
- $pdf->addInfo('Subject', $ReportTitle);
+ include('includes/PDFStarter.php');
+ $pdf->addInfo('Title', _('Tax Report') . ': ' . $TaxAuthorityName);
+ $pdf->addInfo('Subject', $_POST['NoOfPeriods'] . ' ' . _('months to') . ' ' . $PeriodEnd);
- $FontSize=12;
- $PageNumber=0;
- $line_height=12;
-
/*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,
- debtortrans.trandate,
- debtortrans.debtorno,
- debtorsmaster.name,
- debtortrans.branchcode,
- debtortrans.order_,
- (debtortrans.ovamount+debtortrans.ovfreight)/debtortrans.rate AS netamount,
- debtortrans.ovfreight/debtortrans.rate AS freightamount,
- debtortranstaxes.taxamount AS tax
+ /* 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.trandate,
+ debtortrans.type,
+ systypes.typename,
+ debtortrans.transno,
+ debtortrans.debtorno,
+ debtorsmaster.name,
+ debtortrans.branchcode,
+ (debtortrans.ovamount+debtortrans.ovfreight)/debtortrans.rate AS netamount,
+ debtortranstaxes.taxamount AS tax
FROM debtortrans
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.id";
+ ORDER BY debtortrans.trandate";// RChacon: ORDER BY debtortrans.recno ?
$DebtorTransResult = DB_query($SQL,$db,'','',false,false); //don't trap errors in DB_query
- if (DB_error_no($db) !=0) {
+ if(DB_error_no($db) !=0) {
$Title = _('Taxation Reporting Error');
include('includes/header.inc');
prnMsg(_('The accounts receivable transaction details could not be retrieved because') . ' ' . DB_error_msg($db),'error');
echo '<br /><a href="' . $RootPath . '/index.php">' . _('Back to the menu') . '</a>';
- if ($debug==1){
+ if($debug==1) {
echo '<br />' . $SQL;
}
include('includes/footer.inc');
exit;
}
- if ($_POST['DetailOrSummary']=='Detail'){
- include ('includes/PDFTaxPageHeader.inc');
- $LeftOvers = $pdf->addTextWrap($Left_Margin,$YPos,120,$FontSize+2, _('Tax On Sales'),'left');
- $YPos -=$line_height;
- }
+ $SalesCount = 0;
+ $SalesNet = 0;
+ $SalesTax = 0;
+ if($_POST['DetailOrSummary']=='Detail') {
+ include('includes/PDFTaxPageHeader.inc');
+ PageHeaderDetail();
- $Outputs =0;
- $OutputTax =0;
- $Inputs =0;
- $InputTax =0;
+ $FontSize = 10;
+ $YPos -= $FontSize;// Jumps additional line.
+ $pdf->addText($Left_Margin, $YPos, $FontSize, _('Tax On Sales'));
+ $YPos -= $FontSize;
- $ListCount = 0;
-
- While ($DebtorTransRow = DB_fetch_array($DebtorTransResult,$db)){
-
- $ListCount ++;
-
- if ($_POST['DetailOrSummary']=='Detail'){
- $LeftOvers = $pdf->addTextWrap($Left_Margin,$YPos,60,$FontSize, $DebtorTransRow['typename'],'left');
- $LeftOvers = $pdf->addTextWrap(100,$YPos,40,$FontSize, $DebtorTransRow['transno'],'left');
- $LeftOvers = $pdf->addTextWrap(140,$YPos,60,$FontSize,ConvertSQLDate($DebtorTransRow['trandate']),'left');
- $LeftOvers = $pdf->addTextWrap(200,$YPos,150,$FontSize, $DebtorTransRow['name'],'left');
- $LeftOvers = $pdf->addTextWrap(350,$YPos,60,$FontSize, $DebtorTransRow['branchcode'],'left');
- $LeftOvers = $pdf->addTextWrap(410,$YPos,60,$FontSize, locale_number_format($DebtorTransRow['netamount'],$_SESSION['CompanyRecord']['decimalplaces']),'right');
- $LeftOvers = $pdf->addTextWrap(470,$YPos,60,$FontSize, locale_number_format($DebtorTransRow['tax'],$_SESSION['CompanyRecord']['decimalplaces']),'right');
-
- $YPos -=$line_height;
- if ($YPos < $Bottom_Margin + $line_height){
+ $FontSize = 8;
+ while($DebtorTransRow = DB_fetch_array($DebtorTransResult,$db)) {
+ $pdf->addText($Left_Margin, $YPos, $FontSize, ConvertSQLDate($DebtorTransRow['trandate']));
+ $pdf->addText(82, $YPos, $FontSize, _($DebtorTransRow['typename']));
+ $pdf->addTextWrap(140, $YPos-$FontSize, 40, $FontSize, $DebtorTransRow['transno'], 'right');
+ $pdf->addText(180, $YPos, $FontSize, $DebtorTransRow['name']);
+ $LeftOvers = $pdf->addTextWrap(380, $YPos-$FontSize,60,$FontSize, $DebtorTransRow['branchcode'],'left');// RChacon: This data or debtor.reference ?
+ $pdf->addTextWrap(450, $YPos-$FontSize, 60, $FontSize,
+ locale_number_format($DebtorTransRow['netamount'],$_SESSION['CompanyRecord']['decimalplaces']), 'right');
+ $pdf->addTextWrap($Page_Width-$Right_Margin-60, $YPos-$FontSize, 60, $FontSize,
+ locale_number_format($DebtorTransRow['tax'],$_SESSION['CompanyRecord']['decimalplaces']), 'right');
+ $YPos -= $FontSize;// End-of-line line-feed.
+ if($YPos < $Bottom_Margin + $FontSize) {
include('includes/PDFTaxPageHeader.inc');
+ PageHeaderDetail();
}
- }
- $Outputs += $DebtorTransRow['netamount'];
- $OutputTax += $DebtorTransRow['tax'];
- } /*end listing while loop */
+ $SalesCount ++;// Counts sales transactions.
+ $SalesNet += $DebtorTransRow['netamount'];// Accumulates sales net.
+ $SalesTax += $DebtorTransRow['tax'];// Accumulates sales tax.
+ } /*end listing while loop */
- if ($_POST['DetailOrSummary']=='Detail'){
- $YPos -=$line_height;
-
- if ($YPos < $Bottom_Margin + $line_height){
+ // Prints out the sales totals:
+ $FontSize = 10;
+ if($YPos < $Bottom_Margin + $FontSize*4) {
include('includes/PDFTaxPageHeader.inc');
+ PageHeaderDetail();
}
+ $YPos -= $FontSize;
+ $pdf->line(306, $YPos-$FontSize/2, $Page_Width-$Right_Margin, $YPos-$FontSize/2);
+ $YPos -= $FontSize;
+ $pdf->addText(306, $YPos, $FontSize, _('Total Outputs'));
+ $pdf->addTextWrap(450, $YPos-$FontSize, 60, $FontSize,
+ locale_number_format($SalesNet,$_SESSION['CompanyRecord']['decimalplaces']), 'right');
+ $pdf->addTextWrap($Page_Width-$Right_Margin-60, $YPos-$FontSize, 60, $FontSize,
+ locale_number_format($SalesTax,$_SESSION['CompanyRecord']['decimalplaces']), 'right');
+ $YPos -= $FontSize;
+ $pdf->line(306, $YPos-$FontSize/2, $Page_Width-$Right_Margin, $YPos-$FontSize/2);// Rule off under output totals.
+ $YPos -= $FontSize;
- $pdf->line(410, $YPos+$line_height,530, $YPos+$line_height);
-
- $LeftOvers = $pdf->addTextWrap($Left_Margin,$YPos,350,12, _('Total Outputs'),'right');
+ } else {
+ while($DebtorTransRow = DB_fetch_array($DebtorTransResult,$db)) {
+ $SalesCount ++;// Counts sales transactions.
+ $SalesNet += $DebtorTransRow['netamount'];// Accumulates sales net.
+ $SalesTax += $DebtorTransRow['tax'];// Accumulates sales tax.
+ } /*end listing while loop */
}
-
- if ($_POST['DetailOrSummary']=='Detail'){
- /*Print out the outputs totals */
- $LeftOvers = $pdf->addTextWrap(410,$YPos,60,8, locale_number_format($Outputs,$_SESSION['CompanyRecord']['decimalplaces']),'right');
- $LeftOvers = $pdf->addTextWrap(470,$YPos,60,8, locale_number_format($OutputTax,$_SESSION['CompanyRecord']['decimalplaces']),'right');
-
- /*Rule off under output totals */
- $pdf->line(410, $YPos-5,530, $YPos-5);
- }
-
/*Now do the inputs from SuppTrans */
/*Only have dates in SuppTrans no periods so need to get the starting date */
- if (mb_strpos($PeriodEnd,'/')) {
+ if(mb_strpos($PeriodEnd,'/')) {
$Date_Array = explode('/',$PeriodEnd);
- } elseif (mb_strpos($PeriodEnd,'.')) {
+ } elseif(mb_strpos($PeriodEnd,'.')) {
$Date_Array = explode('.',$PeriodEnd);
+ } elseif(mb_strpos($PeriodEnd,'-')) {
+ $Date_Array = explode('-',$PeriodEnd);
}
- if ($_SESSION['DefaultDateFormat']=='d/m/Y'){
+ if($_SESSION['DefaultDateFormat']=='d/m/Y') {
$StartDateSQL = Date('Y-m-d', mktime(0,0,0, (int)$Date_Array[1]-$_POST['NoOfPeriods']+1,1,(int)$Date_Array[2]));
- } elseif ($_SESSION['DefaultDateFormat']=='m/d/Y') {
+ } elseif($_SESSION['DefaultDateFormat']=='m/d/Y') {
$StartDateSQL = Date('Y-m-d', mktime(0,0,0, (int)$Date_Array[0]-$_POST['NoOfPeriods']+1,1,(int)$Date_Array[2]));
- } elseif ($_SESSION['DefaultDateFormat']=='Y/m/d') {
- $StartDateSQL = Date('Y-m-d', mktime(0,0,0, (int)$Date_Array[2]-$_POST['NoOfPeriods']+1,1,(int)$Date_Array[1]));
- } elseif ($_SESSION['DefaultDateFormat']=='d.m.Y') {
+ } elseif($_SESSION['DefaultDateFormat']=='Y/m/d') {
+ $StartDateSQL = Date('Y-m-d', mktime(0,0,0, (int)$Date_Array[1]-$_POST['NoOfPeriods']+1,1,(int)$Date_Array[0]));
+ } elseif($_SESSION['DefaultDateFormat']=='d.m.Y') {
$StartDateSQL = Date('Y-m-d', mktime(0,0,0, (int)$Date_Array[1]-$_POST['NoOfPeriods']+1,1,(int)$Date_Array[2]));
+ } elseif($_SESSION['DefaultDateFormat']=='Y-m-d') {
+ $StartDateSQL = Date('Y-m-d', mktime(0,0,0, (int)$Date_Array[1]-$_POST['NoOfPeriods']+1,1,(int)$Date_Array[0]));
}
- $SQL = "SELECT supptrans.type,
- supptrans.suppreference,
+ $SQL =
+ "SELECT
+ supptrans.trandate,
+ supptrans.type,
systypes.typename,
- supptrans.trandate,
+ supptrans.transno,
suppliers.suppname,
+ supptrans.suppreference,
supptrans.ovamount/supptrans.rate AS netamount,
supptranstaxes.taxamount/supptrans.rate AS taxamt
FROM supptrans
@@ -158,123 +160,153 @@
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.trandate";// ORDER BY supptrans.recno ?
$SuppTransResult = DB_query($SQL,$db,'','',false,false); //doint trap errors in DB_query
- if (DB_error_no($db) !=0) {
+ if(DB_error_no($db) !=0) {
$Title = _('Taxation Reporting Error');
include('includes/header.inc');
echo _('The accounts payable transaction details could not be retrieved because') . ' ' . DB_error_msg($db);
echo '<br /><a href="' . $RootPath . '/index.php?">' . _('Back to the menu') . '</a>';
- if ($debug==1){
+ if($debug==1) {
echo '<br />' . $SQL;
}
include('includes/footer.inc');
exit;
}
- if ($_POST['DetailOrSummary']=='Detail'){
- include ('includes/PDFTaxPageHeader.inc');
- $LeftOvers = $pdf->addTextWrap($Left_Margin,$YPos,120,$FontSize+2, _('Tax On Purchases'),'left');
- $YPos -=$line_height;
- }
+ $PurchasesCount = 0;
+ $PurchasesNet = 0;
+ $PurchasesTax = 0;
+ if($_POST['DetailOrSummary']=='Detail') {
+ $FontSize = 10;
+ $YPos -= $FontSize;// Jumps additional line.
+ $pdf->addText($Left_Margin, $YPos+$FontSize, $FontSize, _('Tax On Purchases'));
+ $YPos -= $FontSize;
- While ($SuppTransRow = DB_fetch_array($SuppTransResult,$db)){
-
- $ListCount ++;
-
- if ($_POST['DetailOrSummary']=='Detail'){
- $LeftOvers = $pdf->addTextWrap($Left_Margin,$YPos,60,$FontSize, $SuppTransRow['typename'],'left');
- $LeftOvers = $pdf->addTextWrap(100,$YPos,40,$FontSize, $SuppTransRow['suppreference'],'left');
- $LeftOvers = $pdf->addTextWrap(140,$YPos,60,$FontSize,ConvertSQLDate($SuppTransRow['trandate']),'left');
- $LeftOvers = $pdf->addTextWrap(200,$YPos,150,$FontSize, $SuppTransRow['suppname'],'left');
-
- $LeftOvers = $pdf->addTextWrap(410,$YPos,60,$FontSize, locale_number_format($SuppTransRow['netamount'],$_SESSION['CompanyRecord']['decimalplaces']),'right');
- $LeftOvers = $pdf->addTextWrap(470,$YPos,60,$FontSize, locale_number_format($SuppTransRow['taxamt'],$_SESSION['CompanyRecord']['decimalplaces']),'right');
-
- $YPos -=$line_height;
- if ($YPos < $Bottom_Margin + $line_height){
+ // Prints out lines:
+ $FontSize = 8;
+ while($SuppTransRow = DB_fetch_array($SuppTransResult,$db)) {
+ $pdf->addText($Left_Margin, $YPos, $FontSize,ConvertSQLDate($SuppTransRow['trandate']));
+ $pdf->addText(82, $YPos, $FontSize, _($SuppTransRow['typename']));
+ $pdf->addTextWrap(140, $YPos-$FontSize, 40, $FontSize, $SuppTransRow['transno'],'right');
+ $pdf->addText(180, $YPos, $FontSize, $SuppTransRow['suppname']);
+ $pdf->addText(380, $YPos, $FontSize, $SuppTransRow['suppreference']);//****************NEW
+ $pdf->addTextWrap(450, $YPos-$FontSize, 60, $FontSize,
+ locale_number_format($SuppTransRow['netamount'],$_SESSION['CompanyRecord']['decimalplaces']),'right');
+ $pdf->addTextWrap($Page_Width-$Right_Margin-60, $YPos-$FontSize, 60, $FontSize,
+ locale_number_format($SuppTransRow['taxamt'],$_SESSION['CompanyRecord']['decimalplaces']),'right');
+ $YPos -= $FontSize;// End-of-line line-feed.
+ if($YPos < $Bottom_Margin + $FontSize) {
include('includes/PDFTaxPageHeader.inc');
+ PageHeaderDetail();
}
- }
- $Inputs += $SuppTransRow['netamount'];
- $InputTax += $SuppTransRow['taxamt'];
- } /*end listing while loop */
+ $PurchasesCount ++;// Counts purchases transactions.
+ $PurchasesNet += $SuppTransRow['netamount'];// Accumulates purchases net.
+ $PurchasesTax += $SuppTransRow['taxamt'];// Accumulates purchases tax.
+ } /*end listing while loop */
- if ($_POST['DetailOrSummary']=='Detail'){
- $YPos -=$line_height;
-
- if ($YPos < $Bottom_Margin + $line_height){
+ // Print out the purchases totals:
+ $FontSize = 10;
+ if($YPos < $Bottom_Margin + $FontSize*4) {
include('includes/PDFTaxPageHeader.inc');
+ PageHeaderDetail();
}
+ $YPos -= $FontSize;
+ $pdf->line(306, $YPos-$FontSize/2, $Page_Width-$Right_Margin, $YPos-$FontSize/2);
+ $YPos -= $FontSize;
+ $pdf->addText(306, $YPos, $FontSize, _('Total Inputs'));
+ $pdf->addTextWrap(450, $YPos-$FontSize, 60, $FontSize,
+ locale_number_format($PurchasesNet,$_SESSION['CompanyRecord']['decimalplaces']),'right');
+ $pdf->addTextWrap($Page_Width-$Right_Margin-60, $YPos-$FontSize, 60, $FontSize,
+ locale_number_format($PurchasesTax,$_SESSION['CompanyRecord']['decimalplaces']),'right');
+ $YPos -= $FontSize;
+ $pdf->line(306, $YPos-$FontSize/2, $Page_Width-$Right_Margin, $YPos-$FontSize/2);// Rule off under output totals.
+ $YPos -= $FontSize;
- $pdf->line(410, $YPos+$line_height,530, $YPos+$line_height);
-
- $LeftOvers = $pdf->addTextWrap($Left_Margin,$YPos,350,12, _('Total Inputs'),'right');
+ } else {
+ while($SuppTransRow = DB_fetch_array($SuppTransResult,$db)) {
+ $PurchasesCount ++;// Counts purchases transactions.
+ $PurchasesNet += $SuppTransRow['netamount'];// Accumulates purchases net.
+ $PurchasesTax += $SuppTransRow['taxamt'];// Accumulates purchases tax.
+ } /*end listing while loop */
}
- /*Accumulate the input totals */
- if ($_POST['DetailOrSummary']=='Detail'){
- /*Print out the input totals */
- $LeftOvers = $pdf->addTextWrap(410,$YPos,60,8, locale_number_format($Inputs,$_SESSION['CompanyRecord']['decimalplaces']),'right');
- $LeftOvers = $pdf->addTextWrap(470,$YPos,60,8, locale_number_format($InputTax,$_SESSION['CompanyRecord']['decimalplaces']),'right');
-
- /*Rule off under input totals */
- $pdf->line(410, $YPos-5,530, $YPos-5);
-
- /*New page before summary */
- $PageNumber++;
- $pdf->newPage();
- }
/*OK and now the summary */
- if ($PageNumber ==0) $PageNumber=1; //when only summary is run.
- $FontSize=8;
- $YPos= $Page_Height-$Top_Margin;
- $pdf->addText($Left_Margin, $YPos,$FontSize, html_entity_decode($_SESSION['CompanyRecord']['coyname']));
+ include('includes/PDFTaxPageHeader.inc');
+ PageHeaderSummary();
- $YPos -=$line_height;
+ $FontSize = 10;
+ $YPos -= $FontSize;// Jumps additional line.
- $FontSize =10;
- $pdf->addText($Left_Margin, $YPos, $FontSize, $ReportTitle . ' ' . _('Summary'));
+ // Table headings:
+ $pdf->addText($Left_Margin, $YPos, $FontSize, _('Transactions'));
+ $pdf->addTextWrap(150, $YPos-$FontSize, 100, $FontSize, _('Quantity'), 'right');
+ $pdf->addTextWrap(250, $YPos-$FontSize, 100, $FontSize, _('Net'), 'right');
+ $pdf->addTextWrap(350, $YPos-$FontSize, 100, $FontSize, _('Tax'), 'right');
+ $pdf->addTextWrap(450, $YPos-$FontSize, 100, $FontSize, _('Total'), 'right');
+ $YPos -= $FontSize;
- $FontSize = 8;
- $pdf->addText($Page_Width-$Right_Margin-120,$YPos,$FontSize, _('Printed') . ': ' . Date($_SESSION['DefaultDateFormat']) . ' ' . _('Page') . ' ' . $PageNumber);
+ $YPos -= $FontSize;// Jumps additional line.
- $YPos -=(3*$line_height);
+ // Sales totals:
+ $pdf->addText($Left_Margin, $YPos, $FontSize, _('Sales'));
+ $pdf->addTextWrap(150, $YPos-$FontSize, 100, $FontSize,
+ locale_number_format($SalesCount), 'right');
+ $pdf->addTextWrap(250, $YPos-$FontSize, 100, $FontSize,
+ locale_number_format($SalesNet,$_SESSION['CompanyRecord']['decimalplaces']), 'right');
+ $pdf->addTextWrap(350, $YPos-$FontSize, 100, $FontSize,
+ locale_number_format($SalesTax,$_SESSION['CompanyRecord']['decimalplaces']), 'right');
+ $SalesTotal = $SalesNet+$SalesTax;
+ $pdf->addTextWrap(450, $YPos-$FontSize, 100, $FontSize,
+ locale_number_format($SalesTotal,$_SESSION['CompanyRecord']['decimalplaces']), 'right');
+ $YPos -= $FontSize;
+ // Purchases totals:
+ $pdf->addText($Left_Margin, $YPos, $FontSize, _('Purchases'));
+ $pdf->addTextWrap(150, $YPos-$FontSize, 100, $FontSize,
+ locale_number_format($PurchasesCount),'right');
+ $pdf->addTextWrap(250, $YPos-$FontSize, 100, $FontSize,
+ locale_number_format($PurchasesNet,$_SESSION['CompanyRecord']['decimalplaces']),'right');
+ $pdf->addTextWrap(350, $YPos-$FontSize, 100, $FontSize,
+ locale_number_format($PurchasesTax,$_SESSION['CompanyRecord']['decimalplaces']),'right');
+ $PurchasesTotal = $PurchasesNet+$PurchasesTax;
+ $pdf->addTextWrap(450, $YPos-$FontSize, 100, $FontSize,
+ locale_number_format($PurchasesTotal,$_SESSION['CompanyRecord']['decimalplaces']),'right');
+ $YPos -= $FontSize;
- $pdf->line($Page_Width-$Right_Margin, $YPos+$line_height,$Left_Margin, $YPos+$line_height);
+ $pdf->line(140, $YPos-$FontSize/2, $Page_Width-$Right_Margin, $YPos-$FontSize/2);// Rule off under output totals.
+ $YPos -= $FontSize;
- $YPos =$YPos - $line_height;
+ // Sales minus Purchases:
+ $pdf->addText($Left_Margin, $YPos, $FontSize, _('Difference'));
+ $pdf->addTextWrap(150, $YPos-$FontSize, 100, $FontSize,
+ locale_number_format($SalesCount-$PurchasesCount),'right');
+ $pdf->addTextWrap(250, $YPos-$FontSize, 100, $FontSize,
+ locale_number_format($SalesNet-$PurchasesNet,$_SESSION['CompanyRecord']['decimalplaces']),'right');
+ $pdf->addTextWrap(350, $YPos-$FontSize, 100, $FontSize,
+ locale_number_format($SalesTax-$PurchasesTax,$_SESSION['CompanyRecord']['decimalplaces']),'right');
+ $PurchasesTotal = $PurchasesNet+$PurchasesTax;
+ $pdf->addTextWrap(450, $YPos-$FontSize, 100, $FontSize,
+ locale_number_format($SalesTotal-$PurchasesTotal,$_SESSION['CompanyRecord']['decimalplaces']),'right');
+ $YPos -= $FontSize;
- $LeftOvers = $pdf->addTextWrap(40,$YPos,180,$FontSize,_('Return Suggested Entries'),'left');
- $YPos -= (2*$line_height);
+ $YPos -= $FontSize*4;// Jumps additional lines.
- $LeftOvers = $pdf->addTextWrap(40,$YPos,180,$FontSize,_('Total Sales and Income (incl Tax)'),'left');
- $LeftOvers = $pdf->addTextWrap(220,$YPos,100,$FontSize,locale_number_format($Outputs+$OutputTax,$_SESSION['CompanyRecord']['decimalplaces']),'right');
+ $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'));
+ $YPos -= $FontSize;
+ $LeftOvers = $pdf->addTextWrap($Left_Margin, $YPos-$FontSize, $Page_Width-$Left_Margin-$Right_Margin, $FontSize, $LeftOvers);
- $YPos -= $line_height;
-
- $LeftOvers = $pdf->addTextWrap(40,$YPos,180,$FontSize,_('Tax On Liable Sales'),'left');
- $LeftOvers = $pdf->addTextWrap(220,$YPos,100,$FontSize,locale_number_format($OutputTax,$_SESSION['CompanyRecord']['decimalplaces']),'right');
-
-
- $YPos -= $line_height;
- $LeftOvers = $pdf->addTextWrap(40,$YPos,200,$FontSize,_('Tax On Purchases'),'left');
- $LeftOvers = $pdf->addTextWrap(220,$YPos,100,$FontSize,locale_number_format($InputTax,$_SESSION['CompanyRecord']['decimalplaces']),'right');
-
- $YPos -= (2*$line_height);
- $LeftOvers = $pdf->addTextWrap(40,$YPos,500,$FontSize,_('Adjustments for Tax paid to Customs, FBT, entertainments etc must also be entered'),'left');
- $YPos -= $line_height;
- $LeftOvers = $pdf->addTextWrap(40,$YPos,500,$FontSize,_('This information excludes Tax on journal entries/payments/receipts all Tax should be entered through AR/AP'),'left');
-
- if ($ListCount == 0) {
+ if($SalesCount+$PurchasesCount == 0) {
$Title = _('Taxation Reporting Error');
include('includes/header.inc');
- prnMsg (_('There are no tax entries to list'),'info');
+ 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;
@@ -284,12 +316,13 @@
$pdf->__destruct();
} else { /*The option to print PDF was not hit */
- $Title=_('Tax Reporting');
+ $Title =_('Tax Reporting');
+ $ViewTopic = 'Tax';// Filename in ManualContents.php's TOC.
+ $BookMark = 'Tax';// Anchor's id in the manual's html document.
include('includes/header.inc');
+ echo '<p class="page_title_text"><img alt="" src="' . $RootPath . '/css/' . $Theme . '/images/money_delete.png" title="' .
+ _('Tax Report') . '" />' . ' ' . _('Tax Reporting') . '</p>';
- echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/maintenance.png" title="' . _('Supplier Types')
- . '" alt="" />' . $Title. '</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'] . '" />';
@@ -299,21 +332,23 @@
<td><select name="TaxAuthority">';
$result = DB_query("SELECT taxid, description FROM taxauthorities",$db);
- while ($myrow = DB_fetch_array($result)){
+ while($myrow = DB_fetch_array($result)) {
echo '<option value="' . $myrow['taxid'] . '">' . $myrow['description'] . '</option>';
}
echo '</select></td></tr>';
echo '<tr>
<td>' . _('Return Covering') . ':</td>
- <td><select name="NoOfPeriods">
- <option value="1">' . _('One Month') . '</option>' .
- '<option selected="selected" value="2">' ._('Two Months') . '</option>' .
- '<option value="3">' . _('Quarter') . '</option>' .
- '<option value="6">' . _('Six Months') . '</option>' .
+ <td><select name="NoOfPeriods">' .
+ '<option selected="selected" value="1">' . _('One Month') . '</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>' .
'</select></td>
</tr>';
-
echo '<tr>
<td>' . _('Return To') . ':</td>
<td><select name="ToPeriod">';
@@ -327,8 +362,8 @@
$ErrMsg = _('Could not retrieve the period data because');
$Periods = DB_query($sql,$db,$ErrMsg);
- while ($myrow = DB_fetch_array($Periods,$db)){
- if ($myrow['periodno']==$DefaultPeriod){
+ while($myrow = DB_fetch_array($Periods,$db)) {
+ if($myrow['periodno']==$DefaultPeriod) {
echo '<option selected="selected" value="' . $myrow['periodno'] . '">' . ConvertSQLDate($myrow['lastdate_in_period']) . '</option>';
} else {
echo '<option value="' . $myrow['periodno'] . '">' . ConvertSQLDate($myrow['lastdate_in_period']) . '</option>';
@@ -336,18 +371,15 @@
}
echo '</select></td>
- </tr>';
-
- echo '<tr>
+ </tr>
+ <tr>
<td>' . _('Detail Or Summary Only') . ':</td>
<td><select name="DetailOrSummary">
<option value="Detail">' . _('Detail and Summary') . '</option>
<option selected="selected" value="Summary">' . _('Summary Only') . '</option>
</select></td>
- </tr>';
-
-
- echo '</table>
+ </tr>
+ </table>
<br />
<div class="centre">
<input type="submit" name="PrintPDF" value="' . _('Print PDF') . '" />
@@ -358,4 +390,48 @@
include('includes/footer.inc');
} /*end of else not PrintPDF */
+function PageHeaderDetail() {
+ global $pdf;
+ global $Page_Width;
+ global $Left_Margin;
+ global $Right_Margin;
+ global $YPos;
+ $FontSize = 8;
+ // Draws a rectangle to put the headings in:
+ $pdf->Rectangle(
+ $Left_Margin,// Rectangle $XPos.
+ $YPos-$FontSize/2,// Rectangle $YPos.
+ $Page_Width-$Left_Margin-$Right_Margin,// Rectangle $Width.
+ $FontSize*2);// Rectangle $Height.
+ $YPos -= $FontSize;
+ // Prints the table headings:
+ $pdf->addText($Left_Margin, $YPos, $FontSize, _('Date'));
+ $pdf->addText(82, $YPos, $FontSize, _('Type'));
+ $pdf->addTextWrap(140, $YPos-$FontSize, 40, $FontSize, _('Number'),'right');
+ $pdf->addText(180, $YPos, $FontSize, _('Name'));
+ $pdf->addText(380, $YPos, $FontSize, _('Reference'));
+ $pdf->addTextWrap(450, $YPos-$FontSize, 60, $FontSize, _('Net'),'right');
+ $pdf->addTextWrap($Page_Width-$Right_Margin-60, $YPos-$FontSize, 60, $FontSize, _('Tax'),'right');
+ $YPos -= $FontSize*2;
+}
+
+function PageHeaderSummary() {
+ global $pdf;
+ global $Page_Width;
+ global $Left_Margin;
+ global $Right_Margin;
+ global $YPos;
+ $FontSize = 10;
+ // Draws a rectangle to put the headings in:
+ $pdf->Rectangle(
+ $Left_Margin,// Rectangle $XPos.
+ $YPos-$FontSize/2,// Rectangle $YPos.
+ $Page_Width-$Left_Margin-$Right_Margin,// Rectangle $Width.
+ $FontSize*2);// Rectangle $Height.
+ $YPos -= $FontSize;
+ // Prints the table headings:
+ $pdf->addTextWrap($Left_Margin, $YPos-$FontSize, $Page_Width-$Left_Margin-$Right_Margin, $FontSize, _('Summary'),'center');
+ $YPos -= $FontSize*2;
+}
+
?>
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2014-08-27 03:14:38 UTC (rev 6846)
+++ trunk/doc/Change.log 2014-08-28 05:26:07 UTC (rev 6847)
@@ -1,5 +1,6 @@
webERP Change Log
+28/08/14 RChacon: In Tax.php: Adds code comments, clean-up unneeded variables, simplies and reorder SQL select, reduces if() calls, replaces addTextWarp-left-align with addText, replaces line-drawing a box with Rectangle(), fixes start-date for 'Y/m/d' format, adds start-date for 'Y-m-d' format, adds a summary section for the report, adds ViewTopic and BookMark, adds more NoOfPeriods.
26/08/14 RChacon: In PDFPriceList.php: Adds code comments, adds PageHeader() print for currabrev and categoryid, replaces addTextWarp-left-align with addText, replaces line-drawing a box with Rectangle(), adds 'Prices excluding tax' warning.
15/08/14 RChacon: Fixes double line feed in PDFQuotationPortrait.php reported by Arwan Galaya. Uniforms code between PDFQuotation.php and PDFQuotationPortrait.php.
14/08/14 RChacon: In CustomerInquiry.php and SupplierInquiry.php makes translatable the systypes.typename.
Modified: trunk/includes/PDFTaxPageHeader.inc
===================================================================
--- trunk/includes/PDFTaxPageHeader.inc 2014-08-27 03:14:38 UTC (rev 6846)
+++ trunk/includes/PDFTaxPageHeader.inc 2014-08-28 05:26:07 UTC (rev 6847)
@@ -1,44 +1,37 @@
<?php
/* $Id$*/
-/*PDF page header for aged analysis reports */
-$PageNumber++;
-if ($PageNumber>1){
+/* Please note that addTextWrap() YPos is a font-size-height further down than
+ addText() and other functions. Use addText() instead of addTextWrap() to
+ print left aligned elements.*/
+
+// $PageNumber is initialised in 0 by includes/PDFStarter.php.
+$PageNumber ++;// Increments $PageNumber before printing.
+if ($PageNumber>1) {// Inserts a page break if it is not the first page.
$pdf->newPage();
}
-$FontSize=8;
-$YPos= $Page_Height-$Top_Margin;
+$YPos = $Page_Height-$Top_Margin;
+$FontSizeLast = $FontSize;// To preserve the main font size.
-$pdf->addText($Left_Margin, $YPos,$FontSize, html_entity_decode($_SESSION['CompanyRecord']['coyname']));
+$FontSize = 10;
+$pdf->addText($Left_Margin, $YPos, $FontSize,
+ $_SESSION['CompanyRecord']['coyname']);// Prints company name.
+$pdf->addTextWrap($Page_Width-$Right_Margin-140, $YPos-$FontSize, 140, $FontSize,
+ _('Page'). ' ' . $PageNumber, 'right');// Page number.
+$YPos -= $FontSize;
-$YPos -=$line_height;
+$pdf->addText($Left_Margin, $YPos, $FontSize,
+ _('Tax Report') . ': ' . $TaxAuthorityName);// Prints tax authority name.
+$pdf->addTextWrap($Page_Width-$Right_Margin-140, $YPos-$FontSize, 140, $FontSize,
+ _('Printed') . ': ' . date($_SESSION['DefaultDateFormat']), 'right');// Date printed.
+$YPos -= $FontSize;
-$FontSize =10;
-$pdf->addText($Left_Margin, $YPos, $FontSize, $ReportTitle);
+$pdf->addText($Left_Margin, $YPos, $FontSize,
+ $_POST['NoOfPeriods'] . ' ' . _('months to') . ' ' . $PeriodEnd);// Prints NoOfPeriods and PeriodEnd.
+$pdf->addTextWrap($Page_Width-$Right_Margin-140, $YPos-$FontSize, 140, $FontSize,
+ date('H:i:s'), 'right');// Time printed.
+$YPos -= $FontSize;
-$FontSize = 8;
-$pdf->addText($Page_Width-$Right_Margin-120,$YPos,$FontSize, _('Printed') . ': ' . Date("d M Y") . ' ' . _('Page') . ' ' . $PageNumber);
-
-$YPos -=(3*$line_height);
-
-/*Draw a rectangle to put the headings in */
-$pdf->line($Page_Width-$Right_Margin, $YPos-5,$Left_Margin, $YPos-5);
-$pdf->line($Page_Width-$Right_Margin, $YPos+$line_height,$Left_Margin, $YPos+$line_height);
-$pdf->line($Page_Width-$Right_Margin, $YPos+$line_height,$Page_Width-$Right_Margin, $YPos-5);
-$pdf->line($Left_Margin, $YPos+$line_height,$Left_Margin, $YPos-5);
-
-/*set up the headings */
-$Xpos = $Left_Margin+1;
-
-$LeftOvers = $pdf->addTextWrap(40,$YPos,60 - $Left_Margin,$FontSize,_('Type'),'centre');
-$LeftOvers = $pdf->addTextWrap(100,$YPos,40 - $Left_Margin,$FontSize,_('No'),'centre');
-$LeftOvers = $pdf->addTextWrap(140,$YPos,60,$FontSize,_('Date'),'centre');
-$LeftOvers = $pdf->addTextWrap(240,$YPos,60,$FontSize,_('Name'),'centre');
-$LeftOvers = $pdf->addTextWrap(350,$YPos,60,$FontSize,_('Code'),'centre');
-$LeftOvers = $pdf->addTextWrap(450,$YPos,60,$FontSize,_('Net'),'centre');
-$LeftOvers = $pdf->addTextWrap(510,$YPos,60,$FontSize,_('Tax'),'centre');
-
-$YPos =$YPos - (2*$line_height);
-
+$FontSize = $FontSizeLast;// Resets to the main font size.
?>
\ 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-08-27 03:14:38 UTC (rev 6846)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2014-08-28 05:26:07 UTC (rev 6847)
@@ -7,8 +7,8 @@
msgstr ""
"Project-Id-Version: webERP 4.11.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-26 18:46-0600\n"
-"PO-Revision-Date: 2014-08-26 18:54-0600\n"
+"POT-Creation-Date: 2014-08-27 22:51-0600\n"
+"PO-Revision-Date: 2014-08-27 22:55-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: TecnoSoluciones.com <web...@te...>\n"
"Language: es_ES\n"
@@ -405,7 +405,6 @@
#: SystemParameters.php:1123 SystemParameters.php:1127 TaxGroups.php:312
#: TaxGroups.php:315 TaxGroups.php:373 WWW_Users.php:504 WWW_Users.php:508
#: WWW_Users.php:677 WWW_Users.php:681 includes/PDFLowGPPageHeader.inc:44
-#: includes/PDFTaxPageHeader.inc:35
#: reportwriter/languages/en_US/reports.php:82
msgid "No"
msgstr "No"
@@ -683,9 +682,8 @@
#: CustomerBranches.php:408 Customers.php:1119 Customers.php:1127
#: ImportBankTransAnalysis.php:207 SalesPeople.php:200 SelectCustomer.php:609
#: StockDispatch.php:275 StockDispatch.php:286 StockDispatch.php:297
-#: SuppTransGLAnalysis.php:108 SupplierContacts.php:152
-#: includes/PDFTaxPageHeader.inc:37 includes/InputSerialItemsFile.php:92
-#: includes/InputSerialItemsFile.php:144
+#: SuppTransGLAnalysis.php:108 SupplierContacts.php:152 Tax.php:411
+#: includes/InputSerialItemsFile.php:92 includes/InputSerialItemsFile.php:144
msgid "Name"
msgstr "Nombre"
@@ -806,11 +804,10 @@
#: StockDispatch.php:299 StockLocMovements.php:92 StockMovements.php:99
#: StockSerialItemResearch.php:82 SupplierAllocations.php:456
#: SupplierAllocations.php:569 SupplierAllocations.php:644
-#: SupplierInquiry.php:209 SupplierTransInquiry.php:105
+#: SupplierInquiry.php:209 SupplierTransInquiry.php:105 Tax.php:408
#: includes/PDFQuotationPageHeader.inc:23
#: includes/PDFQuotationPortraitPageHeader.inc:80
-#: includes/PDFStatementPageHeader.inc:169 includes/PDFTaxPageHeader.inc:36
-#: includes/PDFTransPageHeader.inc:51
+#: includes/PDFStatementPageHeader.inc:169 includes/PDFTransPageHeader.inc:51
#: includes/PDFTransPageHeaderPortrait.inc:63
#: reportwriter/languages/en_US/reports.php:64
msgid "Date"
@@ -1030,7 +1027,7 @@
#: SuppContractChgs.php:107 SuppFixedAssetChgs.php:97 SuppShiptChgs.php:97
#: SuppTransGLAnalysis.php:139 SupplierAllocations.php:458
#: SupplierAllocations.php:570 SupplierAllocations.php:645
-#: SupplierCredit.php:407 SupplierInquiry.php:214
+#: SupplierCredit.php:407 SupplierInquiry.php:214 Tax.php:250
#: Z_CheckDebtorsControl.php:149 api/api_debtortransactions.php:1271
#: api/api_debtortransactions.php:1284 api/api_debtortransactions.php:1581
#: includes/PDFQuotationPageHeader.inc:109
@@ -1132,7 +1129,7 @@
#: StockDispatch.php:128 StockDispatch.php:141 SuppPaymentRun.php:112
#: SuppPaymentRun.php:122 SuppPaymentRun.php:186 SuppPaymentRun.php:217
#: SuppPriceList.php:142 SupplierBalsAtPeriodEnd.php:54
-#: SupplierBalsAtPeriodEnd.php:65 Tax.php:64 Tax.php:169 Tax.php:278
+#: SupplierBalsAtPeriodEnd.php:65 Tax.php:57 Tax.php:171 Tax.php:310
#: Z_DataExport.php:72 Z_DataExport.php:168 Z_DataExport.php:259
#: Z_DataExport.php:308 Z_DataExport.php:347 Z_DataExport.php:383
#: Z_DataExport.php:419 Z_DataExport.php:471 Z_poRebuildDefault.php:41
@@ -1280,7 +1277,7 @@
#: PDFPriceList.php:340 PDFRemittanceAdvice.php:175
#: PDFStockCheckComparison.php:371 PrintCustTrans.php:572
#: PrintCustTransPortrait.php:614 ReorderLevel.php:259 StockDispatch.php:447
-#: SuppPriceList.php:263 SupplierBalsAtPeriodEnd.php:159 Tax.php:353
+#: SuppPriceList.php:263 SupplierBalsAtPeriodEnd.php:159 Tax.php:385
msgid "Print PDF"
msgstr "Imprimir PDF"
@@ -1541,11 +1538,10 @@
#: SalesByTypePeriodInquiry.php:356 SelectCustomer.php:424
#: ShipmentCosting.php:536 ShipmentCosting.php:613 StockLocMovements.php:90
#: StockMovements.php:97 SupplierAllocations.php:454 SupplierInquiry.php:210
-#: SupplierTransInquiry.php:20 SupplierTransInquiry.php:102
+#: SupplierTransInquiry.php:20 SupplierTransInquiry.php:102 Tax.php:409
#: Z_CheckAllocationsFrom.php:32 Z_CheckAllocationsFrom.php:57
#: Z_CheckAllocs.php:62 Z_CheckGLTransBalance.php:11
-#: includes/PDFTaxPageHeader.inc:34 includes/InputSerialItemsFile.php:94
-#: includes/InputSerialItemsFile.php:152
+#: includes/InputSerialItemsFile.php:94 includes/InputSerialItemsFile.php:152
#: reportwriter/languages/en_US/reports.php:111
msgid "Type"
msgstr "Tipo"
@@ -1640,10 +1636,11 @@
#: SuppCreditGRNs.php:291 SuppCreditGRNs.php:292 SupplierCredit.php:318
#: SupplierTenderCreate.php:435 SupplierTenderCreate.php:856
#: SupplierTenders.php:124 SupplierTenders.php:327 SupplierTenders.php:531
-#: SupplierTenders.php:534 SupplierTenders.php:690 WOSerialNos.php:263
-#: WOSerialNos.php:269 WOSerialNos.php:303 WorkOrderReceive.php:956
-#: api/api_xml-rpc.php:2533 api/api_xml-rpc.php:2579 api/api_xml-rpc.php:2775
-#: includes/PDFBOMListingPageHeader.inc:44 includes/PDFDIFOTPageHeader.inc:42
+#: SupplierTenders.php:534 SupplierTenders.php:690 Tax.php:247
+#: WOSerialNos.php:263 WOSerialNos.php:269 WOSerialNos.php:303
+#: WorkOrderReceive.php:956 api/api_xml-rpc.php:2533 api/api_xml-rpc.php:2579
+#: api/api_xml-rpc.php:2775 includes/PDFBOMListingPageHeader.inc:44
+#: includes/PDFDIFOTPageHeader.inc:42
#: includes/PDFDeliveryDifferencesPageHeader.inc:43
#: includes/PDFInventoryValnPageHeader.inc:33
#: includes/PDFInventoryValnPageHeader.inc:39
@@ -1703,10 +1700,10 @@
#: GLAccountReport.php:327 InventoryPlanningPrefSupplier.php:58
#: InventoryQuantities.php:234 MRPPlannedPurchaseOrders.php:320
#: MRPPlannedWorkOrders.php:374 MRPReport.php:817 MRPReschedules.php:180
-#: MRPShortages.php:334 PDFOrderStatus.php:323 PDFPriceList.php:383
+#: MRPShortages.php:334 PDFOrderStatus.php:323 PDFPriceList.php:384
#: PDFReceipt.php:34 PO_Header.php:845 PO_PDFPurchOrder.php:64
#: PO_SelectOSPurchOrder.php:547 ReorderLevel.php:283 StockDispatch.php:477
-#: SuppPriceList.php:292 Tax.php:244 includes/PDFAgedDebtorsPageHeader.inc:34
+#: SuppPriceList.php:292 includes/PDFAgedDebtorsPageHeader.inc:34
#: includes/PDFAgedSuppliersPageHeader.inc:21
#: includes/PDFBOMListingPageHeader.inc:26
#: includes/PDFBalanceSheetPageHeader.inc:25
@@ -1731,7 +1728,7 @@
#: includes/PDFSupplierBalsPageHeader.inc:20
#: includes/PDFTabReportHeader.inc:15
#: includes/PDFTagProfitAndLossPageHeader.inc:29
-#: includes/PDFTaxPageHeader.inc:21 includes/PDFTopItemsHeader.inc:34
+#: includes/PDFTaxPageHeader.inc:27 includes/PDFTopItemsHeader.inc:34
#: includes/PDFTrialBalancePageHeader.inc:18
#: reportwriter/languages/en_US/reports.php:88
msgid "Printed"
@@ -1742,12 +1739,12 @@
#: InventoryPlanningPrefSupplier.php:58 InventoryQuantities.php:235
#: MRPPlannedPurchaseOrders.php:321 MRPPlannedWorkOrders.php:375
#: MRPReport.php:818 MRPReschedules.php:181 MRPShortages.php:335
-#: PDFPriceList.php:373 PDFReceipt.php:34 PDFRemittanceAdvice.php:218
+#: PDFPriceList.php:374 PDFReceipt.php:34 PDFRemittanceAdvice.php:218
#: PrintCustOrder.php:175 PrintCustTrans.php:773 PrintCustTrans.php:982
#: PrintCustTrans.php:1031 PrintCustTransPortrait.php:818
#: PrintCustTransPortrait.php:1040 PrintCustTransPortrait.php:1096
#: ReorderLevel.php:284 StockDispatch.php:478 SuppPriceList.php:293
-#: Tax.php:244 includes/PDFAgedDebtorsPageHeader.inc:34
+#: includes/PDFAgedDebtorsPageHeader.inc:34
#: includes/PDFAgedSuppliersPageHeader.inc:21
#: includes/PDFBOMListingPageHeader.inc:26
#: includes/PDFBalanceSheetPageHeader.inc:26
@@ -2058,9 +2055,8 @@
#: SuppPriceList.php:308 SupplierPriceList.php:270 SupplierPriceList.php:455
#: SupplierTenderCreate.php:617 SupplierTenderCreate.php:852
#: SupplierTenders.php:686 TopItems.php:166 WorkOrderEntry.php:732
-#: WorkOrderIssue.php:754 includes/PDFTaxPageHeader.inc:38
-#: includes/PDFTopItemsHeader.inc:49 includes/PO_PDFOrderPageHeader.inc:75
-#: ../webSHOP/ItemDetails.php:72
+#: WorkOrderIssue.php:754 includes/PDFTopItemsHeader.inc:49
+#: includes/PO_PDFOrderPageHeader.inc:75 ../webSHOP/ItemDetails.php:72
msgid "Code"
msgstr "Código"
@@ -3225,8 +3221,9 @@
#: PrintCustTransPortrait.php:1023 PrintCustTransPortrait.php:1078
#: StockMovements.php:98 SupplierAllocations.php:455
#: SupplierAllocations.php:568 SupplierAllocations.php:643
-#: SupplierInquiry.php:211 SupplierTransInquiry.php:103 Z_CheckAllocs.php:63
-#: Z_CheckGLTransBalance.php:12 includes/PDFQuotationPageHeader.inc:21
+#: SupplierInquiry.php:211 SupplierTransInquiry.php:103 Tax.php:410
+#: Z_CheckAllocs.php:63 Z_CheckGLTransBalance.php:12
+#: includes/PDFQuotationPageHeader.inc:21
#: includes/PDFQuotationPortraitPageHeader.inc:78
#: includes/PDFStatementPageHeader.inc:168
#: includes/PDFStatementPageHeader.inc:179 includes/PDFTransPageHeader.inc:47
@@ -3242,7 +3239,7 @@
#: PaymentAllocations.php:64 PaymentAllocations.php:65 Payments.php:921
#: ShiptsList.php:37 StockCounts.php:144 StockCounts.php:169
#: StockCounts.php:216 StockLocMovements.php:95 StockMovements.php:103
-#: SupplierInquiry.php:212 Z_CheckAllocs.php:64
+#: SupplierInquiry.php:212 Tax.php:412 Z_CheckAllocs.php:64
#: includes/PDFBankingSummaryPageHeader.inc:40
#: includes/PDFCustTransListingPageHeader.inc:49
#: includes/PDFPeriodStockTransListingPageHeader.inc:48
@@ -3406,8 +3403,8 @@
#: COGSGLPostings.php:316 Customers.php:513 Customers.php:850
#: EDIProcessOrders.php:386 PDFCustomerList.php:334 PDFPriceList.php:31
-#: PDFPriceList.php:144 PDFPriceList.php:284 PDFPriceList.php:378
-#: PDFPriceList.php:380 PricesBasedOnMarkUp.php:226 PricesByCost.php:268
+#: PDFPriceList.php:144 PDFPriceList.php:285 PDFPriceList.php:379
+#: PDFPriceList.php:381 PricesBasedOnMarkUp.php:226 PricesByCost.php:268
#: SalesGLPostings.php:363 SelectOrderItems.php:697 SuppPriceList.php:138
#: SuppPriceList.php:251
msgid "Price List"
@@ -3907,7 +3904,7 @@
#: CounterReturns.php:1819 CounterSales.php:747 CounterSales.php:2431
#: Credit_Invoice.php:291 DeliveryDetails.php:870 GoodsReceived.php:100
#: InternalStockRequest.php:271 Labels.php:577 Labels.php:579 Labels.php:621
-#: OrderDetails.php:168 OutstandingGRNs.php:179 PDFPriceList.php:403
+#: OrderDetails.php:168 OutstandingGRNs.php:179 PDFPriceList.php:404
#: PDFPrintLabel.php:64 PO_Items.php:715 PO_OrderDetails.php:186
#: PrintCustTrans.php:896 PrintCustTrans.php:985 PrintCustTrans.php:1034
#: PrintCustTransPortrait.php:947 PrintCustTransPortrait.php:1045
@@ -3936,7 +3933,7 @@
#: CounterSales.php:748 Credit_Invoice.php:292 DeliveryDetails.php:871
#: DeliveryDetails.php:941 InternalStockRequest.php:158
#: InternalStockRequest.php:272 Labels.php:582 OrderDetails.php:169
-#: PDFPriceList.php:407 PDFPrintLabel.php:65 PO_Items.php:792
+#: PDFPriceList.php:408 PDFPrintLabel.php:65 PO_Items.php:792
#: PO_OrderDetails.php:187 PrintCustTrans.php:897 PrintCustTrans.php:986
#: PrintCustTrans.php:1035 PrintCustTransPortrait.php:948
#: PrintCustTransPortrait.php:1046 PrintCustTransPortrait.php:1102
@@ -3981,7 +3978,7 @@
#: DeliveryDetails.php:944 GoodsReceived.php:113 Labels.php:592 Labels.php:594
#: Labels.php:624 OffersReceived.php:110 OffersReceived.php:218
#: OffersReceived.php:278 OrderDetails.php:172 PDFOrdersInvoiced.php:378
-#: PDFPriceList.php:426 PDFPrintLabel.php:66 PO_AuthoriseMyOrders.php:116
+#: PDFPriceList.php:427 PDFPrintLabel.php:66 PO_AuthoriseMyOrders.php:116
#: PriceMatrix.php:224 Prices.php:222 Prices.php:334 PricesByCost.php:253
#: Prices_Customer.php:361 PrintCustTrans.php:900 PrintCustTrans.php:989
#: PrintCustTrans.php:1038 PrintCustTransPortrait.php:951
@@ -4033,7 +4030,7 @@
#: Credit_Invoice.php:300 Credit_Invoice.php:301 PrintCustTrans.php:423
#: PrintCustTrans.php:1077 PrintCustTransPortrait.php:480
#: PrintCustTransPortrait.php:1144 SelectCreditItems.php:694
-#: SelectCreditItems.php:695 includes/PDFTaxPageHeader.inc:40
+#: SelectCreditItems.php:695 Tax.php:249 Tax.php:414
msgid "Tax"
msgstr "Impuestos"
@@ -5996,7 +5993,7 @@
#: Contracts.php:779 CustomerInquiry.php:220 CustomerTransInquiry.php:108
#: Dashboard.php:668 FTP_RadioBeacon.php:52 PDFOrderStatus.php:294
-#: PDFOrdersInvoiced.php:293 PDFPriceList.php:417 PricesByCost.php:155
+#: PDFOrdersInvoiced.php:293 PDFPriceList.php:418 PricesByCost.php:155
#: Prices_Customer.php:263 Prices_Customer.php:337 PrintCustTrans.php:846
#: PrintCustTransPortrait.php:892 SelectCompletedOrder.php:557
#: SelectCreditItems.php:243 SelectCustomer.php:422 SelectOrderItems.php:595
@@ -6121,7 +6118,7 @@
#: Contracts.php:937 GLProfit_Loss.php:321 GLProfit_Loss.php:514
#: GLProfit_Loss.php:816 GLProfit_Loss.php:1173 GLTagProfit_Loss.php:309
#: GLTagProfit_Loss.php:447 GLTagProfit_Loss.php:686 GLTagProfit_Loss.php:885
-#: PDFPriceList.php:421 SalesAnalReptCols.php:31 SalesAnalReptCols.php:33
+#: PDFPriceList.php:422 SalesAnalReptCols.php:31 SalesAnalReptCols.php:33
#: SalesByTypePeriodInquiry.php:362 SalesCategoryPeriodInquiry.php:169
#: SalesGraph.php:192 SalesGraph.php:211 SalesGraph.php:274
#: SelectProduct.php:170
@@ -6445,7 +6442,7 @@
#: CounterReturns.php:674 CounterSales.php:757 PrintCustTrans.php:902
#: PrintCustTrans.php:991 PrintCustTrans.php:1040
#: PrintCustTransPortrait.php:953 PrintCustTransPortrait.php:1051
-#: PrintCustTransPortrait.php:1107 includes/PDFTaxPageHeader.inc:39
+#: PrintCustTransPortrait.php:1107 Tax.php:248 Tax.php:413
msgid "Net"
msgstr "Neto"
@@ -11245,7 +11242,7 @@
#: EDIMessageFormat.php:224 EDIMessageFormat.php:226 GLBalanceSheet.php:58
#: GLProfit_Loss.php:107 GLTagProfit_Loss.php:120 POReport.php:1507
-#: SalesInquiry.php:1069 Tax.php:241
+#: SalesInquiry.php:1069 Tax.php:433
msgid "Summary"
msgstr "Sumario"
@@ -14236,7 +14233,8 @@
msgid "Statement of Profit and Loss for the"
msgstr "Estado de Ganancias y Pérdidas para el"
-#: GLProfit_Loss.php:611 GLTagProfit_Loss.php:529 Tax.php:27
+#: GLProfit_Loss.php:611 GLTagProfit_Loss.php:529 Tax.php:25
+#: includes/PDFTaxPageHeader.inc:31
msgid "months to"
msgstr "meses hasta"
@@ -15972,16 +15970,15 @@
msgstr "Dos Semanas"
#: InventoryPlanningPrefSupplier.php:511 InventoryPlanningPrefSupplier.php:513
-#: Tax.php:309
+#: Tax.php:342
msgid "One Month"
msgstr "Un mes"
#: InventoryPlanningPrefSupplier.php:516 InventoryPlanningPrefSupplier.php:518
msgid "Six Weeks"
-msgstr "Seis Semanas"
+msgstr "Seis semanas"
#: InventoryPlanningPrefSupplier.php:521 InventoryPlanningPrefSupplier.php:523
-#: Tax.php:310
msgid "Two Months"
msgstr "Dos meses"
@@ -18400,7 +18397,8 @@
msgid "Customer transaction listing from"
msgstr "Lista de transacciones de cliente de"
-#: PDFCustTransListing.php:137 PDFSuppTransListing.php:131 index.php:94
+#: PDFCustTransListing.php:137 PDFSuppTransListing.php:131 Tax.php:246
+#: index.php:94
msgid "Transactions"
msgstr "Transacciones"
@@ -19037,7 +19035,7 @@
msgid "Price list by inventory category"
msgstr ""
-#: PDFPriceList.php:37 PDFPriceList.php:329 PDFPriceList.php:377
+#: PDFPriceList.php:37 PDFPriceList.php:329 PDFPriceList.php:378
msgid "Customer Special Prices Only"
msgstr "Solamente Precios Especiales para clientes"
@@ -19134,21 +19132,21 @@
msgid "Full Description"
msgstr "Descripción completa"
-#: PDFPriceList.php:334 PDFPriceList.php:388 PDFPrintLabel.php:345
+#: PDFPriceList.php:334 PDFPriceList.php:389 PDFPrintLabel.php:345
msgid "Effective As At"
msgstr "Efectivo al"
-#: PDFPriceList.php:387 StockClone.php:1087 Stocks.php:1397 Stocks.php:1404
+#: PDFPriceList.php:388 StockClone.php:1087 Stocks.php:1397 Stocks.php:1404
#: ../webSHOP/includes/Functions.php:127
#: ../webSHOP/includes/ShowSalesCategoriesMenu.php:15
msgid "Categories"
msgstr "Categorías"
-#: PDFPriceList.php:411
+#: PDFPriceList.php:412
msgid "Effective Date Range"
msgstr "Rango de fechas efectivas"
-#: PDFPriceList.php:431
+#: PDFPriceList.php:432
msgid "Prices excluding tax"
msgstr "Precios sin impuesto"
@@ -24503,7 +24501,7 @@
#: ReverseGRN.php:31 SalesByTypePeriodInquiry.php:356
#: SalesTopCustomersInquiry.php:218 SalesTopItemsInquiry.php:225
-#: SelectSalesOrder.php:403 includes/MainMenuLinksArray.php:22
+#: SelectSalesOrder.php:403 Tax.php:256 includes/MainMenuLinksArray.php:22
msgid "Sales"
msgstr "Ventas"
@@ -32259,9 +32257,8 @@
"confirmar los cambios a la base de datos porque"
#: SuppPaymentRun.php:240 SupplierTypes.php:6 SupplierTypes.php:21
-#: SystemParameters.php:13 Tax.php:290 TaxAuthorities.php:10
-#: TaxAuthorityRates.php:16 TaxCategories.php:10
-#: includes/MainMenuLinksArray.php:477
+#: SystemParameters.php:13 TaxAuthorities.php:10 TaxAuthorityRates.php:16
+#: TaxCategories.php:10 includes/MainMenuLinksArray.php:477
msgid "Supplier Types"
msgstr "Tipos de Proveedor"
@@ -35582,27 +35579,23 @@
"si escoge Sí en esta selección, puede utilizar el conjunto de SMTP en la "
"sección de configuración."
-#: Tax.php:17
+#: Tax.php:14
msgid "Could not determine the last date of the period selected"
msgstr "No se puede determinar la última fecha del período seleccionado"
-#: Tax.php:17
+#: Tax.php:14
msgid "The sql returned the following error"
msgstr "El SQL devolvió el siguiente error"
-#: Tax.php:26
-msgid "Taxation Report"
-msgstr "Informe de Fiscalidad"
+#: Tax.php:24 Tax.php:324 includes/PDFTaxPageHeader.inc:25
+msgid "Tax Report"
+msgstr ""
-#: Tax.php:27
-msgid "Tax Report for"
-msgstr "Informe Fiscal de"
-
-#: Tax.php:61 Tax.php:166 Tax.php:275
+#: Tax.php:54 Tax.php:168 Tax.php:307
msgid "Taxation Reporting Error"
msgstr "Error en el Informe de Fiscalidad"
-#: Tax.php:63
+#: Tax.php:56
msgid ""
"The accounts receivable transaction details could not be retrieved because"
msgstr ""
@@ -35613,37 +35606,38 @@
msgid "Tax On Sales"
msgstr "Impuesto en ventas"
-#: Tax.php:116
+#: Tax.php:107
msgid "Total Outputs"
msgstr "Egresos Totales"
-#: Tax.php:168
+#: Tax.php:170
msgid "The accounts payable transaction details could not be retrieved because"
msgstr ""
"No se pudieron obtener los detalles de la transacción en cuentas a pagar "
"porque"
-#: Tax.php:179 Tax.php:266
+#: Tax.php:186
msgid "Tax On Purchases"
msgstr "Impuestos en compras"
-#: Tax.php:215
+#: Tax.php:220
msgid "Total Inputs"
msgstr "Ingresos Totales"
-#: Tax.php:253
-msgid "Return Suggested Entries"
-msgstr "Volver a los Comentarios Sugeridos"
+#: Tax.php:269 includes/MainMenuLinksArray.php:24
+#: reportwriter/languages/en_US/reports.php:241
+#: ../webSHOP/CreditCardPayPalPro.php:90
+#: ../webSHOP/includes/ProcessPayPalPayment.php:8
+#: ../webSHOP/includes/ProcessPayPalPayment.php:10
+#: ../webSHOP/includes/ProcessPayPalPayment.php:45
+msgid "Purchases"
+msgstr "Compras"
-#: Tax.php:256
-msgid "Total Sales and Income (incl Tax)"
-msgstr "Ventas Totales e Ingresos (impuestos incluidos)"
+#: Tax.php:285 Z_CheckDebtorsControl.php:77 Z_CheckGLTransBalance.php:14
+msgid "Difference"
+msgstr "Diferencia"
-#: Tax.php:261
-msgid "Tax On Liable Sales"
-msgstr "Impuestos sobre las Ventas Comprometidas"
-
-#: Tax.php:270
+#: Tax.php:299
msgid ""
"Adjustments for Tax paid to Customs, FBT, entertainments etc must also be "
"entered"
@@ -35651,7 +35645,7 @@
"Deben introducirse los ajustes para los Impuestos pagados a Aduanas. "
"entretenimientos, etc."
-#: Tax.php:272
+#: Tax.php:302
msgid ""
"This information excludes Tax on journal entries/payments/receipts all Tax "
"should be entered through AR/AP"
@@ -35659,47 +35653,63 @@
"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"
-#: Tax.php:277
+#: Tax.php:309
msgid "There are no tax entries to list"
msgstr "No hay entradas de impuesto a la lista"
-#: Tax.php:287
+#: Tax.php:319 Tax.php:324
msgid "Tax Reporting"
msgstr "Informe impositivo"
-#: Tax.php:298
+#: Tax.php:331
msgid "Tax Authority To Report On:"
msgstr "Declarar a la Autoridad Fiscal:"
-#: Tax.php:307
+#: Tax.php:340
msgid "Return Covering"
msgstr "Regresar Cubierta"
-#: Tax.php:311
-msgid "Quarter"
-msgstr "Tres meses"
+#: Tax.php:343
+msgid "2 Months"
+msgstr "2 meses"
-#: Tax.php:312
-msgid "Six Months"
-msgstr "Seis meses"
+#: Tax.php:344
+msgid "3 Months"
+msgstr "3 meses"
-#: Tax.php:318
+#: Tax.php:345
+msgid "6 Months"
+msgstr "6 meses"
+
+#: Tax.php:346
+msgid "12 Months"
+msgstr "12 meses"
+
+#: Tax.php:347
+msgid "24 Months"
+msgstr "24 meses"
+
+#: Tax.php:348
+msgid "48 Months"
+msgstr "48 meses"
+
+#: Tax.php:353
msgid "Return To"
msgstr "Regresar A"
-#: Tax.php:327
+#: Tax.php:362
msgid "Could not retrieve the period data because"
msgstr "No se puede obtener el período de fechas porque"
-#: Tax.php:342
+#: Tax.php:376
msgid "Detail Or Summary Only"
msgstr "Detalle ó Sumario"
-#: Tax.php:344
+#: Tax.php:378
msgid "Detail and Summary"
msgstr "Detalle y Resumen"
-#: Tax.php:345
+#: Tax.php:379
msgid "Summary Only"
msgstr "Sólo Sumario"
@@ -39060,10 +39070,6 @@
msgid "Calculated"
msgstr "Calculado"
-#: Z_CheckDebtorsControl.php:77 Z_CheckGLTransBalance.php:14
-msgid "Difference"
-msgstr "Diferencia"
-
#: Z_CheckGLTransBalance.php:5
msgid "Check Period Sales Ledger Control Account"
msgstr "Verifique la Cuenta Control Ventas"
@@ -47253,15 +47259,6 @@
msgid "Login"
msgstr "Ingresar"
-#: includes/MainMenuLinksArray.php:24
-#: reportwriter/languages/en_US/reports.php:241
-#: ../webSHOP/CreditCardPayPalPro.php:90
-#: ../webSHOP/includes/ProcessPayPalPayment.php:8
-#: ../webSHOP/includes/ProcessPayPalPayment.php:10
-#: ../webSHOP/includes/ProcessPayPalPayment.php:45
-msgid "Purchases"
-msgstr "Compras"
-
#: includes/MainMenuLinksArray.php:34
msgid "New Sales Order or Quotation"
msgstr "Nueva orden de venta o cotización"
@@ -50530,12 +50527,3 @@
#: ../webSHOP/includes/session.php:137
msgid "Bank Transfer"
msgstr ""
-
-#~ msgid "Prices for Categories"
-#~ msgstr "Precios por Categorías"
-
-#~ msgid "Prices For Categories"
-#~ msgstr "Precios por categorías"
-
-#~ msgid "Maintenance Of Location Authorised Users"
-#~ msgstr "Mantenimiento de usuarios autorizados por ubicación"
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-27 03:14:38 UTC (rev 6846)
+++ trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po 2014-08-28 05:26:07 UTC (rev 6847)
@@ -8,8 +8,8 @@
msgstr ""
"Project-Id-Version: webERP 4.11.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-18 13:21-0600\n"
-"PO-Revision-Date: 2014-08-18 13:55-0600\n"
+"POT-Creation-Date: 2014-08-27 22:51-0600\n"
+"PO-Revision-Date: 2014-08-27 22:58-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: French <none>\n"
"Language: fr_FR\n"
@@ -412,7 +412,6 @@
#: SystemParameters.php:1123 SystemParameters.php:1127 TaxGroups.php:312
#: TaxGroups.php:315 TaxGroups.php:373 WWW_Users.php:504 WWW_Users.php:508
#: WWW_Users.php:677 WWW_Users.php:681 includes/PDFLowGPPageHeader.inc:44
-#: includes/PDFTaxPageHeader.inc:35
#: reportwriter/languages/en_US/reports.php:82
msgid "No"
msgstr "Non"
@@ -692,9 +691,8 @@
#: CustomerBranches.php:408 Customers.php:1119 Customers.php:1127
#: ImportBankTransAnalysis.php:207 SalesPeople.php:200 SelectCustomer.php:609
#: StockDispatch.php:275 StockDispatch.php:286 StockDispatch.php:297
-#: SuppTransGLAnalysis.php:108 SupplierContacts.php:152
-#: includes/PDFTaxPageHeader.inc:37 includes/InputSerialItemsFile.php:92
-#: includes/InputSerialItemsFile.php:144
+#: SuppTransGLAnalysis.php:108 SupplierContacts.php:152 Tax.php:411
+#: includes/InputSerialItemsFile.php:92 includes/InputSerialItemsFile.php:144
msgid "Name"
msgstr "Nom"
@@ -815,11 +813,10 @@
#: StockDispatch.php:299 StockLocMovements.php:92 StockMovements.php:99
#: StockSerialItemResearch.php:82 SupplierAllocations.php:456
#: SupplierAllocations.php:569 SupplierAllocations.php:644
-#: SupplierInquiry.php:209 SupplierTransInquiry.php:105
+#: SupplierInquiry.php:209 SupplierTransInquiry.php:105 Tax.php:408
#: includes/PDFQuotationPageHeader.inc:23
#: includes/PDFQuotationPortraitPageHeader.inc:80
-#: includes/PDFStatementPageHeader.inc:169 includes/PDFTaxPageHeader.inc:36
-#: includes/PDFTransPageHeader.inc:51
+#: includes/PDFStatementPageHeader.inc:169 includes/PDFTransPageHeader.inc:51
#: includes/PDFTransPageHeaderPortrait.inc:63
#: reportwriter/languages/en_US/reports.php:64
msgid "Date"
@@ -1039,7 +1036,7 @@
#: SuppContractChgs.php:107 SuppFixedAssetChgs.php:97 SuppShiptChgs.php:97
#: SuppTransGLAnalysis.php:139 SupplierAllocations.php:458
#: SupplierAllocations.php:570 SupplierAllocations.php:645
-#: SupplierCredit.php:407 SupplierInquiry.php:214
+#: SupplierCredit.php:407 SupplierInquiry.php:214 Tax.php:250
#: Z_CheckDebtorsControl.php:149 api/api_debtortransactions.php:1271
#: api/api_debtortransactions.php:1284 api/api_debtortransactions.php:1581
#: includes/PDFQuotationP...
[truncated message content] |
