Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[7682] trunk
|
From: <rc...@us...> - 2016-11-24 14:10:28
|
Revision: 7682
http://sourceforge.net/p/web-erp/reponame/7682
Author: rchacon
Date: 2016-11-24 14:10:25 +0000 (Thu, 24 Nov 2016)
Log Message:
-----------
Merges duplicated text.
Modified Paths:
--------------
trunk/ContractBOM.php
trunk/ContractOtherReqts.php
trunk/ImportBankTransAnalysis.php
trunk/MRPPlannedPurchaseOrders.php
trunk/MRPPlannedWorkOrders.php
trunk/MRPReport.php
trunk/PDFCustomerList.php
trunk/PcExpensesTypeTab.php
trunk/SalesGraph.php
trunk/Z_MakeNewCompany.php
trunk/geocode.php
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
Modified: trunk/ContractBOM.php
===================================================================
--- trunk/ContractBOM.php 2016-11-24 13:30:26 UTC (rev 7681)
+++ trunk/ContractBOM.php 2016-11-24 14:10:25 UTC (rev 7682)
@@ -1,5 +1,4 @@
<?php
-
/* $Id: ContractBOM.php 4553 2011-04-18 00:09:23Z daintree $*/
include('includes/DefineContractClass.php');
@@ -233,7 +232,7 @@
if (isset($_SESSION['Contract'.$identifier]->ContractRef)) {
echo '<tr>
- <th colspan="7">' . _('Contract Reference:') .' '. $_SESSION['Contract'.$identifier]->ContractRef . '</th>
+ <th colspan="7">' . _('Contract Reference') . ': '. $_SESSION['Contract'.$identifier]->ContractRef . '</th>
</tr>';
}
Modified: trunk/ContractOtherReqts.php
===================================================================
--- trunk/ContractOtherReqts.php 2016-11-24 13:30:26 UTC (rev 7681)
+++ trunk/ContractOtherReqts.php 2016-11-24 14:10:25 UTC (rev 7682)
@@ -1,5 +1,4 @@
<?php
-
/* $Id: ContractOtherReqts.php 3692 2010-08-15 09:22:08Z daintree $*/
include('includes/DefineContractClass.php');
@@ -90,7 +89,7 @@
if (isset($_SESSION['Contract'.$identifier]->ContractRef)) {
echo '<tr>
- <th colspan="5">' . _('Contract Reference:') .' '. $_SESSION['Contract'.$identifier]->ContractRef . '</th>
+ <th colspan="5">' . _('Contract Reference') . ': '. $_SESSION['Contract'.$identifier]->ContractRef . '</th>
</tr>';
}
Modified: trunk/ImportBankTransAnalysis.php
===================================================================
--- trunk/ImportBankTransAnalysis.php 2016-11-24 13:30:26 UTC (rev 7681)
+++ trunk/ImportBankTransAnalysis.php 2016-11-24 14:10:25 UTC (rev 7682)
@@ -110,10 +110,10 @@
/*Show all the selected GLEntries so far from the $_SESSION['Trans'][$TransID]->GLEntries array */
if ($_SESSION['Trans'][$TransID]->Amount >= 0){ //its a receipt
echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/transactions.png" title="' . _('Bank Account Transaction Analysis') . '" alt="" />' . ' '
- . _('Imported Bank Receipt of') . ' ' . $_SESSION['Trans'][$TransID]->Amount . ' ' . $_SESSION['Statement']->CurrCode . ' ' . _('dated:') . ' ' . $_SESSION['Trans'][$TransID]->ValueDate . '<br /> ' . $_SESSION['Trans'][$TransID]->Description;
+ . _('Imported Bank Receipt of') . ' ' . $_SESSION['Trans'][$TransID]->Amount . ' ' . $_SESSION['Statement']->CurrCode . ' ' . _('dated') . ': ' . $_SESSION['Trans'][$TransID]->ValueDate . '<br /> ' . $_SESSION['Trans'][$TransID]->Description;
} else {
echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/transactions.png" title="' . _('Bank Account Transaction Analysis') . '" alt="" />' . ' '
- . _('Imported Bank Payment of') . ' ' . $_SESSION['Trans'][$TransID]->Amount . ' ' . $_SESSION['Statement']->CurrCode . ' ' ._('dated:') . ' ' . $_SESSION['Trans'][$TransID]->ValueDate . '<br /> ' . $_SESSION['Trans'][$TransID]->Description;
+ . _('Imported Bank Payment of') . ' ' . $_SESSION['Trans'][$TransID]->Amount . ' ' . $_SESSION['Statement']->CurrCode . ' ' ._('dated') . ': ' . $_SESSION['Trans'][$TransID]->ValueDate . '<br /> ' . $_SESSION['Trans'][$TransID]->Description;
}
/*Set up a form to allow input of new GL entries */
Modified: trunk/MRPPlannedPurchaseOrders.php
===================================================================
--- trunk/MRPPlannedPurchaseOrders.php 2016-11-24 13:30:26 UTC (rev 7681)
+++ trunk/MRPPlannedPurchaseOrders.php 2016-11-24 14:10:25 UTC (rev 7682)
@@ -1,5 +1,4 @@
<?php
-
/* $Id$*/
// MRPPlannedPurchaseOrders.php - Report of purchase parts that MRP has determined should have
// purchase orders created for them
@@ -14,7 +13,7 @@
$Title=_('MRP error');
include('includes/header.inc');
echo '<br />';
- prnMsg( _('The MRP calculation must be run before you can run this report') . '<br />' .
+ prnMsg( _('The MRP calculation must be run before you can run this report') . '<br />' .
_('To run the MRP calculation click').' ' . '<a href='.$RootPath .'/MRP.php>' . _('here') . '</a>', 'error');
include('includes/footer.inc');
exit;
@@ -327,7 +326,7 @@
} else {
$displayconsolidation = _('Monthly');
};
- $pdf->addTextWrap($Left_Margin,$YPos,65,$FontSize,_('Consolidation:'));
+ $pdf->addTextWrap($Left_Margin,$YPos,65,$FontSize,_('Consolidation').':');
$pdf->addTextWrap(110,$YPos,40,$FontSize,$displayconsolidation);
$YPos -=(2*$line_height);
Modified: trunk/MRPPlannedWorkOrders.php
===================================================================
--- trunk/MRPPlannedWorkOrders.php 2016-11-24 13:30:26 UTC (rev 7681)
+++ trunk/MRPPlannedWorkOrders.php 2016-11-24 14:10:25 UTC (rev 7682)
@@ -1,5 +1,4 @@
<?php
-
/* $Id$*/
// MRPPlannedWorkOrders.php - Report of manufactured parts that MRP has determined should have
@@ -13,7 +12,7 @@
$Title=_('MRP error');
include('includes/header.inc');
echo '<br />';
- prnMsg( _('The MRP calculation must be run before you can run this report') . '<br />' .
+ prnMsg( _('The MRP calculation must be run before you can run this report') . '<br />' .
_('To run the MRP calculation click').' ' . '<a href="' . $RootPath . '/MRP.php">' . _('here') . '</a>', 'error');
include('includes/footer.inc');
exit;
@@ -381,7 +380,7 @@
} else {
$displayconsolidation = _('Monthly');
};
- $pdf->addTextWrap($Left_Margin,$YPos,65,$FontSize,_('Consolidation:'));
+ $pdf->addTextWrap($Left_Margin,$YPos,65,$FontSize,_('Consolidation').':');
$pdf->addTextWrap(110,$YPos,40,$FontSize,$displayconsolidation);
$YPos -=(2*$line_height);
Modified: trunk/MRPReport.php
===================================================================
--- trunk/MRPReport.php 2016-11-24 13:30:26 UTC (rev 7681)
+++ trunk/MRPReport.php 2016-11-24 14:10:25 UTC (rev 7682)
@@ -1,5 +1,4 @@
<?php
-
/* $Id$*/
// MRPReport.php - Shows supply and demand for a part as determined by MRP
@@ -178,7 +177,7 @@
$myrow=DB_fetch_array($result);
$pdf->addTextWrap($Left_Margin,$YPos,35,$FontSize,_('Part:'),'');
$pdf->addTextWrap(70,$YPos,100,$FontSize,$myrow['part'],'');
- $pdf->addTextWrap(245,$YPos,40,$FontSize,_('EOQ:'),'right');
+ $pdf->addTextWrap(245,$YPos,40,$FontSize,_('EOQ').':','right');
$pdf->addTextWrap(285,$YPos,45,$FontSize,locale_number_format($myrow['eoq'],$myrow['decimalplaces']),'right');
$pdf->addTextWrap(360,$YPos,50,$FontSize,_('On Hand:'),'right');
$pdf->addTextWrap(410,$YPos,50,$FontSize,locale_number_format($qoh,$myrow['decimalplaces']),'right');
Modified: trunk/PDFCustomerList.php
===================================================================
--- trunk/PDFCustomerList.php 2016-11-24 13:30:26 UTC (rev 7681)
+++ trunk/PDFCustomerList.php 2016-11-24 14:10:25 UTC (rev 7682)
@@ -386,7 +386,7 @@
}
echo '</select></td></tr>';
- echo '<tr><td>' . _('For Sales folk'). ':</td>
+ echo '<tr><td>' . _('For Salesperson:') . '</td>
<td><select name="SalesPeople[]" multiple="multiple">
<option selected="selected" value="All">' . _('All Salespeople') . '</option>';
Modified: trunk/PcExpensesTypeTab.php
===================================================================
--- trunk/PcExpensesTypeTab.php 2016-11-24 13:30:26 UTC (rev 7681)
+++ trunk/PcExpensesTypeTab.php 2016-11-24 14:10:25 UTC (rev 7682)
@@ -1,5 +1,4 @@
<?php
-
/* $Id$ */
include('includes/session.inc');
@@ -76,7 +75,7 @@
VALUES ('" . $_POST['SelectedTab'] . "',
'" . $_POST['SelectedExpense'] . "')";
- $msg = _('Expense code:') . ' ' . $_POST['SelectedExpense'].' '._('for Type of Tab:') .' '. $_POST['SelectedTab'] . ' ' . _('has been created');
+ $msg = _('Expense code') . ': ' . $_POST['SelectedExpense'].' '._('for Type of Tab:') .' '. $_POST['SelectedTab'] . ' ' . _('has been created');
$checkSql = "SELECT count(typetabcode)
FROM pctypetabs";
$result = DB_query($checkSql);
Modified: trunk/SalesGraph.php
===================================================================
--- trunk/SalesGraph.php 2016-11-24 13:30:26 UTC (rev 7681)
+++ trunk/SalesGraph.php 2016-11-24 14:10:25 UTC (rev 7682)
@@ -1,5 +1,4 @@
<?php
-
/* $Id$*/
include('includes/session.inc');
@@ -119,7 +118,7 @@
$_POST['CategoryID']='';
}
echo '<tr>
- <td>' . _('For Stock Category:') . '</td>
+ <td>' . _('For Stock Category') . ':</td>
<td><select name="CategoryID">';
if($_POST['CategoryID']=='All'){
echo '<option selected="selected" value="All">' . _('All') . '</option>';
@@ -142,7 +141,7 @@
}
echo '<tr>
- <td>' . _('For Sales Person:') . '</td>
+ <td>' . _('For Salesperson:') . '</td>
<td><select name="SalesmanCode">';
if($_POST['SalesmanCode']=='All'){
Modified: trunk/Z_MakeNewCompany.php
===================================================================
--- trunk/Z_MakeNewCompany.php 2016-11-24 13:30:26 UTC (rev 7681)
+++ trunk/Z_MakeNewCompany.php 2016-11-24 14:10:25 UTC (rev 7682)
@@ -176,7 +176,7 @@
$_POST['NewCompany'] = html_entity_decode($_POST['NewCompany'],ENT_QUOTES,'UTF-8');
$config_php = preg_replace('/\/\/End Installed companies-do not change this line/', "\$CompanyList[] = array('database'=>'".$_POST['NewDatabase']."' ,'company'=>'".$_POST['NewCompany']."');\n//End Installed companies-do not change this line", $config_php);
if (!$fp = fopen($ConfigFile, 'wb')) {
- prnMsg(_("Cannot open the configuration file: ").$ConfigFile.". Please add the following line to the end of the file:\n\$CompanyList[] = array('database'=>'".$_POST['NewDatabase']."' ,'company'=>'".htmlspecialchars($_POST['NewCompany'],ENT_QUOTES,'UTF-8').");",'error');
+ prnMsg(_('Cannot open the configuration file' . ': ').$ConfigFile.". Please add the following line to the end of the file:\n\$CompanyList[] = array('database'=>'".$_POST['NewDatabase']."' ,'company'=>'".htmlspecialchars($_POST['NewCompany'],ENT_QUOTES,'UTF-8').");",'error');
} else {
fwrite ($fp, $config_php);
fclose ($fp);
Modified: trunk/geocode.php
===================================================================
--- trunk/geocode.php 2016-11-24 13:30:26 UTC (rev 7681)
+++ trunk/geocode.php 2016-11-24 14:10:25 UTC (rev 7682)
@@ -51,13 +51,13 @@
$debtorno =$row["debtorno"];
$request_url = $base_url . $address . ',&sensor=true';
- echo '<br \>' . _('Customer Code: ') . $id;
+ echo '<br \>', _('Customer Code'), ': ', $id;
$xml = simplexml_load_string(utf8_encode(file_get_contents($request_url))) or die("url not loading");
// $xml = simplexml_load_file($request_url) or die("url not loading");
- $status = $xml->status;
+ $status = $xml->status;
if (strcmp($status, "OK") == 0) {
// Successful geocode
@@ -82,7 +82,7 @@
if ($update_result==1) {
echo '<br />'. 'Address: ' . $address . ' updated to geocode.';
echo '<br />'. 'Received status ' . $status . '<br />';
- }
+ }
} else {
// failure to geocode
$geocode_pending = false;
@@ -108,7 +108,7 @@
$xml = simplexml_load_string(utf8_encode(file_get_contents($request_url))) or die("url not loading");
// $xml = simplexml_load_file($request_url) or die("url not loading");
- $status = $xml->status;
+ $status = $xml->status;
if (strcmp($status, "OK") == 0) {
// Successful geocode
@@ -128,7 +128,7 @@
($id));
$update_result = DB_query($query);
-
+
if ($update_result==1) {
echo '<br />' . 'Address: ' . $address . ' updated to geocode.';
echo '<br />' . 'Received status ' . $status . '<br />';
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-24 13:30:26 UTC (rev 7681)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2016-11-24 14:10:25 UTC (rev 7682)
@@ -8,7 +8,7 @@
"Project-Id-Version: webERP 4.13\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-11-20 17:14-0600\n"
-"PO-Revision-Date: 2016-11-23 13:05-0600\n"
+"PO-Revision-Date: 2016-11-24 08:08-0600\n"
"Last-Translator: Rafael E. Chacón <raf...@gm...>\n"
"Language-Team: TecnoSoluciones.com <web...@te...>\n"
"Language: es_ES\n"
@@ -1896,7 +1896,7 @@
#: AuditTrail.php:43 BOMIndented.php:319 BOMIndentedReverse.php:297
#: MRPCalendar.php:264
msgid "From Date"
-msgstr "Desde la fecha"
+msgstr "Fecha inicial"
#: AuditTrail.php:47 BOMIndented.php:320 BOMIndentedReverse.php:298
#: MRPCalendar.php:266
@@ -3512,7 +3512,7 @@
#: InternalStockRequestFulfill.php:39 StockLocTransferReceive.php:537
#: SuppShiptChgs.php:137 SupplierAllocations.php:434
msgid "from"
-msgstr "Desde"
+msgstr "desde"
#: BankMatching.php:137 ConfirmDispatchControlled_Invoice.php:68
#: CounterReturns.php:197 EmailCustTrans.php:65 FTP_RadioBeacon.php:280
@@ -10654,7 +10654,7 @@
#: includes/PDFStockLocTransferHeader.inc:43
#: reportwriter/languages/en_US/reports.php:73
msgid "From"
-msgstr "De"
+msgstr "Desde"
#: CustomerTransInquiry.php:58 DailyBankTransactions.php:70
#: SupplierTransInquiry.php:65
@@ -19970,7 +19970,7 @@
#: PDFCustomerList.php:389
msgid "For Sales folk"
-msgstr "Para el equipo de Ventas"
+msgstr "Para el vendedor"
#: PDFCustomerList.php:391
msgid "All sales folk"
@@ -27691,7 +27691,7 @@
#: SalesGraph.php:145
msgid "For Sales Person:"
-msgstr "Para el Vendedor:"
+msgstr "Para el vendedor:"
#: SalesGraph.php:165
msgid "Graph Type"
@@ -27784,7 +27784,7 @@
#: SalesGraph.php:246
msgid "For Salesperson:"
-msgstr "Para el Vendedor:"
+msgstr "Para el vendedor:"
#: SalesGraph.php:251
msgid "For Customers from"
@@ -27874,7 +27874,7 @@
#: SalesInquiry.php:1179
msgid "For Sales Person"
-msgstr "Para el Vendedor"
+msgstr "Para el vendedor"
#: SalesInquiry.php:1188
msgid "All Salesmen"
|
