Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[6855] trunk
|
From: <rc...@us...> - 2014-08-29 20:42:02
|
Revision: 6855
http://sourceforge.net/p/web-erp/reponame/6855
Author: rchacon
Date: 2014-08-29 20:41:58 +0000 (Fri, 29 Aug 2014)
Log Message:
-----------
In TaxAuthorityRates.php and TaxCategories.php: adds $ViewTopic and $BookMark; Uses gettext() to translate 'Exempt', 'Freight' and 'Handling'. Minor improvements.
Modified Paths:
--------------
trunk/TaxAuthorityRates.php
trunk/TaxCategories.php
trunk/doc/Change.log
trunk/includes/DatabaseTranslations.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/TaxAuthorityRates.php
===================================================================
--- trunk/TaxAuthorityRates.php 2014-08-29 07:15:02 UTC (rev 6854)
+++ trunk/TaxAuthorityRates.php 2014-08-29 20:41:58 UTC (rev 6855)
@@ -1,32 +1,33 @@
<?php
/* $Id$*/
-if (isset($_POST['TaxAuthority'])){
+include('includes/session.inc');
+$Title = _('Tax Rates');
+$ViewTopic = 'Tax';// Filename in ManualContents.php's TOC.
+$BookMark = 'TaxAuthorityRates';// 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/maintenance.png" title="' .
+ _('Tax Rates') . '" />' . ' ' .
+ _('Tax Rates') . '</p>';
+
+if(isset($_POST['TaxAuthority'])) {
$TaxAuthority = $_POST['TaxAuthority'];
}
-if (isset($_GET['TaxAuthority'])){
+if(isset($_GET['TaxAuthority'])) {
$TaxAuthority = $_GET['TaxAuthority'];
}
-include('includes/session.inc');
-$Title = _('Tax Rates');
-include('includes/header.inc');
-
-echo '<p class="page_title_text">
- <img src="'.$RootPath.'/css/'.$Theme.'/images/maintenance.png" title="' . _('Supplier Types')
- . '" alt="" />' . $Title. '
- </p>';
-
-
-if (!isset($TaxAuthority)){
- prnMsg(_('This page can only be called after selecting the tax authority to edit the rates for') . '. ' . _('Please select the Rates link from the tax authority page') . '<br /><a href="' . $RootPath . '/TaxAuthorities.php">' . _('click here') . '</a> ' . _('to go to the Tax Authority page'),'error');
+if(!isset($TaxAuthority)) {
+ prnMsg(_('This page can only be called after selecting the tax authority to edit the rates for') . '. ' .
+ _('Please select the Rates link from the tax authority page') . '<br /><a href="' .
+ $RootPath . '/TaxAuthorities.php">' . _('click here') . '</a> ' .
+ _('to go to the Tax Authority page'), 'error');
include ('includes/footer.inc');
exit;
}
-
-if (isset($_POST['UpdateRates'])){
-
+if(isset($_POST['UpdateRates'])) {
$TaxRatesResult = DB_query("SELECT taxauthrates.taxcatid,
taxauthrates.taxrate,
taxauthrates.dispatchtaxprovince
@@ -34,7 +35,7 @@
WHERE taxauthrates.taxauthority='" . $TaxAuthority . "'",
$db);
- while ($myrow=DB_fetch_array($TaxRatesResult)){
+ while($myrow=DB_fetch_array($TaxRatesResult)) {
$sql = "UPDATE taxauthrates SET taxrate=" . (filter_number_format($_POST[$myrow['dispatchtaxprovince'] . '_' . $myrow['taxcatid']])/100) . "
WHERE taxcatid = '" . $myrow['taxcatid'] . "'
@@ -45,11 +46,9 @@
prnMsg(_('All rates updated successfully'),'info');
}
-/* end of update code
-*/
+/* end of update code*/
-/*Display updated rates
-*/
+/*Display updated rates*/
$TaxAuthDetail = DB_query("SELECT description
FROM taxauthorities WHERE taxid='" . $TaxAuthority . "'",$db);
@@ -58,7 +57,6 @@
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 '<input type="hidden" name="TaxAuthority" value="' . $TaxAuthority . '" />';
$TaxRatesResult = DB_query("SELECT taxauthrates.taxcatid,
@@ -77,71 +75,56 @@
taxauthrates.taxcatid",
$db);
-if (DB_num_rows($TaxRatesResult)>0){
+if(DB_num_rows($TaxRatesResult)>0) {
+ echo '<div class="centre"><h1>' . $myrow[0] . '</h1></div>';// TaxAuthorityRates table title.
- echo '<table class="selection">';
- echo '<tr>
- <th colspan="3"><h3>' . _('Update') . ' ' . $myrow[0] . ' ' . _('Rates') . '</h3></th>
- </tr>';
- $TableHeader = '<tr>
- <th class="ascending">' . _('Deliveries From') . '<br />' . _('Tax Province') . '</th>
- <th class="ascending">' . _('Tax Category') . '</th>
- <th class="ascending">' . _('Tax Rate') . ' %</th>
- </tr>';
- echo $TableHeader;
+ echo '<table class="selection"><tr>
+ <th class="ascending">' . _('Deliveries From') . '<br />' . _('Tax Province') . '</th>
+ <th class="ascending">' . _('Tax Category') . '</th>
+ <th class="ascending">' . _('Tax Rate') . '</th></tr>';
$j = 1;
- $k = 0; //row counter to determine background colour
- $OldProvince='';
+ $k = 0;// Row counter to determine background colour.
- while ($myrow = DB_fetch_array($TaxRatesResult)){
-
- if ($OldProvince!=$myrow['dispatchtaxprovince'] AND $OldProvince!=''){
- echo '<tr style="background-color:#555555"><td colspan="3"></td></tr>';
- }
-
- if ($k==1){
+ while($myrow = DB_fetch_array($TaxRatesResult)) {
+ if($k==1) {
echo '<tr class="EvenTableRows">';
- $k=0;
+ $k = 0;
} else {
echo '<tr class="OddTableRows">';
- $k=1;
+ $k = 1;
}
+ printf('
+ <td>%s</td>
+ <td>%s</td>
+ <td><input class="number" maxlength="5" name="%s" required="required" size="5" title="' .
+ _('Input must be numeric') . '" type="text" value="%s" /></td></tr>',
+ // Deliveries From:
+ $myrow['taxprovincename'],
+ // Tax Category:
+ _($myrow['taxcatname']),// Uses gettext() to translate 'Exempt', 'Freight' and 'Handling'.
+ // Tax Rate:
+ $myrow['dispatchtaxprovince'] . '_' . $myrow['taxcatid'],
+ locale_number_format($myrow['taxrate']*100,2));
+ }// End of while loop.
+ echo '</table><br /><div class="centre">
+ <input type="submit" name="UpdateRates" value="' . _('Update Rates') . '" />';
+//end if tax taxcatid/rates to show
- printf('<td>%s</td>
- <td>%s</td>
- <td><input type="text" required="required" title="'._('Input must be numeric').'" class="number" name="%s" maxlength="5" size="5" value="%s" /></td>
- </tr>',
- $myrow['taxprovincename'],
- $myrow['taxcatname'],
- $myrow['dispatchtaxprovince'] . '_' . $myrow['taxcatid'],
- locale_number_format($myrow['taxrate']*100,2));
+} else {
+ echo '<div class="centre">';
+ prnMsg(_('There are no tax rates to show - perhaps the dispatch tax province records have not yet been created?'),'warn');
- $OldProvince = $myrow['dispatchtaxprovince'];
-
- }
-//end of while loop
-echo '</table>';
-echo '<br />
- <div class="centre">
- <input type="submit" name="UpdateRates" value="' . _('Update Rates') . '" />';
-} //end if tax taxcatid/rates to show
- else {
- prnMsg(_('There are no tax rates to show - perhaps the dispatch tax province records have not yet been created?'),'warn');
}
-echo '<br />
- <br />
- <a href="' . $RootPath . '/TaxAuthorities.php">' . _('Tax Authorities') . '</a>
- <br />
- <a href="' . $RootPath . '/TaxGroups.php">' . _('Tax Groupings') . '</a>
- <br />
- <a href="' . $RootPath . '/TaxCategories.php">' . _('Tax Categories') . '</a>
- <br />
- <a href="' . $RootPath . '/TaxProvinces.php">' . _('Dispatch Tax Provinces') . '</a>
- </div>';
+echo ' <br />
+ <br />
+ <a href="' . $RootPath . '/TaxAuthorities.php">' . _('Tax Authorities') . '</a><br />
+ <a href="' . $RootPath . '/TaxGroups.php">' . _('Tax Groupings') . '</a><br />
+ <a href="' . $RootPath . '/TaxCategories.php">' . _('Tax Categories') . '</a><br />
+ <a href="' . $RootPath . '/TaxProvinces.php">' . _('Dispatch Tax Provinces') . '</a>
+ </div>
+ </div>
+ </form>';
-echo '</div>
- </form>';
-
include( 'includes/footer.inc' );
?>
Modified: trunk/TaxCategories.php
===================================================================
--- trunk/TaxCategories.php 2014-08-29 07:15:02 UTC (rev 6854)
+++ trunk/TaxCategories.php 2014-08-29 20:41:58 UTC (rev 6855)
@@ -2,20 +2,21 @@
/* $Id$*/
include('includes/session.inc');
-
$Title = _('Tax Categories');
-
+$ViewTopic = 'Tax';// Filename in ManualContents.php's TOC.
+$BookMark = 'TaxCategories';// 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/maintenance.png" title="' .
+ _('Tax Categories') . '" />' . ' ' .
+ _('Tax Categories') . '</p>';
-echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/maintenance.png" title="' . _('Supplier Types')
- . '" alt="" />' . $Title. '</p>';
-
-if ( isset($_GET['SelectedTaxCategory']) )
+if( isset($_GET['SelectedTaxCategory']) )
$SelectedTaxCategory = $_GET['SelectedTaxCategory'];
-elseif (isset($_POST['SelectedTaxCategory']))
+elseif(isset($_POST['SelectedTaxCategory']))
$SelectedTaxCategory = $_POST['SelectedTaxCategory'];
-if (isset($_POST['submit'])) {
+if(isset($_POST['submit'])) {
//initialise no input errors assumed initially before we test
@@ -26,16 +27,16 @@
//first off validate inputs sensible
- if (ContainsIllegalCharacters($_POST['TaxCategoryName'])) {
+ if(ContainsIllegalCharacters($_POST['TaxCategoryName'])) {
$InputError = 1;
prnMsg( _('The tax category name cannot contain the character') . " '&' " . _('or the character') ." ' " . _('or a space') ,'error');
}
- if (trim($_POST['TaxCategoryName']) == '') {
+ if(trim($_POST['TaxCategoryName']) == '') {
$InputError = 1;
prnMsg( _('The tax category name may not be empty'), 'error');
}
- if ($_POST['SelectedTaxCategory']!='' AND $InputError !=1) {
+ if($_POST['SelectedTaxCategory']!='' AND $InputError !=1) {
/*SelectedTaxCategory could also exist if submit had not been clicked this code would not run in this case cos submit is false of course see the delete code below*/
// Check the name does not clash
@@ -44,7 +45,7 @@
AND taxcatname ".LIKE." '" . $_POST['TaxCategoryName'] . "'";
$result = DB_query($sql,$db);
$myrow = DB_fetch_row($result);
- if ( $myrow[0] > 0 ) {
+ if( $myrow[0] > 0 ) {
$InputError = 1;
prnMsg( _('The tax category cannot be renamed because another with the same name already exists.'),'error');
} else {
@@ -53,7 +54,7 @@
$sql = "SELECT taxcatname FROM taxcategories
WHERE taxcatid = '" . $SelectedTaxCategory . "'";
$result = DB_query($sql,$db);
- if ( DB_num_rows($result) != 0 ) {
+ if( DB_num_rows($result) != 0 ) {
// This is probably the safest way there is
$myrow = DB_fetch_row($result);
$OldTaxCategoryName = $myrow[0];
@@ -68,13 +69,13 @@
}
}
$msg = _('Tax category name changed');
- } elseif ($InputError !=1) {
+ } elseif($InputError !=1) {
/*SelectedTaxCategory is null cos no item selected on first time round so must be adding a record*/
$sql = "SELECT count(*) FROM taxcategories
WHERE taxcatname " .LIKE. " '".$_POST['TaxCategoryName'] ."'";
$result = DB_query($sql,$db);
$myrow = DB_fetch_row($result);
- if ( $myrow[0] > 0 ) {
+ if( $myrow[0] > 0 ) {
$InputError = 1;
prnMsg( _('The tax category cannot be created because another with the same name already exists'),'error');
} else {
@@ -103,21 +104,21 @@
$msg = _('New tax category added');
}
- if ($InputError!=1){
+ if($InputError!=1) {
prnMsg($msg,'success');
}
unset ($SelectedTaxCategory);
unset ($_POST['SelectedTaxCategory']);
unset ($_POST['TaxCategoryName']);
-} elseif (isset($_GET['delete'])) {
+} elseif(isset($_GET['delete'])) {
//the link to delete a selected record was clicked instead of the submit button
// PREVENT DELETES IF DEPENDENT RECORDS IN 'stockmaster'
// Get the original name of the tax category the ID is just a secure way to find the tax category
$sql = "SELECT taxcatname FROM taxcategories
WHERE taxcatid = '" . $SelectedTaxCategory . "'";
$result = DB_query($sql,$db);
- if ( DB_num_rows($result) == 0 ) {
+ if( DB_num_rows($result) == 0 ) {
// This is probably the safest way there is
prnMsg( _('Cannot delete this tax category because it no longer exists'),'warn');
} else {
@@ -126,7 +127,7 @@
$sql= "SELECT COUNT(*) FROM stockmaster WHERE taxcatid = '" . $SelectedTaxCategory . "'";
$result = DB_query($sql,$db);
$myrow = DB_fetch_row($result);
- if ($myrow[0]>0) {
+ if($myrow[0]>0) {
prnMsg( _('Cannot delete this tax category because inventory items have been created using this tax category'),'warn');
echo '<br />' . _('There are') . ' ' . $myrow[0] . ' ' . _('inventory items that refer to this tax category') . '</font>';
} else {
@@ -144,7 +145,7 @@
unset ($_POST['TaxCategoryName']);
}
- if (!isset($SelectedTaxCategory)) {
+ if(!isset($SelectedTaxCategory)) {
/* An tax category could be posted when one has been edited and is being updated
or GOT when selected for modification
@@ -165,33 +166,37 @@
echo '<table class="selection">
<tr>
<th class="ascending">' . _('Tax Categories') . '</th>
+ <th colspan="2">' . _('Maintenance') . '</th>
</tr>';
- $k=0; //row colour counter
- while ($myrow = DB_fetch_row($result)) {
-
- if ($k==1){
+ $k = 0;// Row counter to determine background colour.
+ while($myrow = DB_fetch_row($result)) {
+ if($k==1) {
echo '<tr class="EvenTableRows">';
- $k=0;
+ $k = 0;
} else {
echo '<tr class="OddTableRows">';
- $k++;
+ $k ++;
}
- if($myrow[1]!='Freight'){
- echo '<td>' . $myrow[1] . '</td>
- <td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?SelectedTaxCategory=' . $myrow[0] . '">' . _('Edit') . '</a></td>
- <td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?SelectedTaxCategory=' . $myrow[0] . '&delete=1" onclick="return confirm(\'' . _('Are you sure you wish to delete this tax category?') . '\');">' . _('Delete') . '</a></td>
- </tr>';
- }else{
- echo '<td>' . $myrow[1] . '</td><td></td><td></td></tr>';
+ if($myrow[1]!='Freight') {
+ // Uses gettext() to translate 'Exempt' and 'Handling':
+ echo '<td>' . _($myrow[1]) . '</td>
+ <td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?SelectedTaxCategory=' . $myrow[0] . '">' .
+ _('Edit') . '</a></td>
+ <td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?SelectedTaxCategory=' . $myrow[0] .
+ '&delete=1" onclick="return confirm(\'' . _('Are you sure you wish to delete this tax category?') . '\');">' .
+ _('Delete') . '</a></td>';
+ } else {
+ echo '<td>' . _($myrow[1]) . '</td><td> </td><td> </td>';// Uses gettext() to translate 'Freight'.
}
+ echo '</tr>';
+ } //END WHILE LIST LOOP
- } //END WHILE LIST LOOP
echo '</table><br />';
} //end of ifs and buts!
-if (isset($SelectedTaxCategory)) {
+if(isset($SelectedTaxCategory)) {
echo '<div class="centre">
<a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">' . _('Review Tax Categories') . '</a>
</div>';
@@ -199,13 +204,13 @@
echo '<br />';
-if (! isset($_GET['delete'])) {
+if(! isset($_GET['delete'])) {
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
- if (isset($SelectedTaxCategory)) {
+ if(isset($SelectedTaxCategory)) {
//editing an existing section
$sql = "SELECT taxcatid,
@@ -214,7 +219,7 @@
WHERE taxcatid='" . $SelectedTaxCategory . "'";
$result = DB_query($sql, $db);
- if ( DB_num_rows($result) == 0 ) {
+ if( DB_num_rows($result) == 0 ) {
prnMsg( _('Could not retrieve the requested tax category, please try again.'),'warn');
unset($SelectedTaxCategory);
} else {
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2014-08-29 07:15:02 UTC (rev 6854)
+++ trunk/doc/Change.log 2014-08-29 20:41:58 UTC (rev 6855)
@@ -1,4 +1,6 @@
webERP Change Log
+
+29/08/14 RChacon: In TaxAuthorityRates.php and TaxCategories.php: adds $ViewTopic and $BookMark; Uses gettext() to translate 'Exempt', 'Freight' and 'Handling'.
29/08/14 Exson: Fixed the StockLocStatus Serial Number link column shift problem.
28/08/14 RChacon: In Tax.php: Fixes SQL select order-by from transaction-date to record-number (primary key). Minor improvements.
28/08/14 Exson: Fixed the csv file aligned abnormal when there are commas in fields strings.
Modified: trunk/includes/DatabaseTranslations.php
===================================================================
--- trunk/includes/DatabaseTranslations.php 2014-08-29 07:15:02 UTC (rev 6854)
+++ trunk/includes/DatabaseTranslations.php 2014-08-29 20:41:58 UTC (rev 6855)
@@ -55,6 +55,11 @@
$systypes_typename[50] = _('Opening Balance');
$systypes_typename[500] = _('Auto Debtor Number');
+// taxcategories.taxcatname:
+$taxcategories_taxcatname[4] = _('Exempt');
+$taxcategories_taxcatname[5] = _('Freight');
+$taxcategories_taxcatname[6] = _('Handling');
+
// General purpose:
$General_purpose = _('Default');
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-29 07:15:02 UTC (rev 6854)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2014-08-29 20:41:58 UTC (rev 6855)
@@ -7,8 +7,8 @@
msgstr ""
"Project-Id-Version: webERP 4.11.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-28 08:46-0600\n"
-"PO-Revision-Date: 2014-08-28 09:16-0600\n"
+"POT-Creation-Date: 2014-08-29 11:25-0600\n"
+"PO-Revision-Date: 2014-08-29 11:35-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: TecnoSoluciones.com <web...@te...>\n"
"Language: es_ES\n"
@@ -911,7 +911,7 @@
msgstr ""
#: AgedControlledInventory.php:12 InventoryQuantities.php:155
-#: InventoryValuation.php:230 Locations.php:394 Locations.php:455 MRP.php:530
+#: InventoryValuation.php:231 Locations.php:394 Locations.php:455 MRP.php:530
#: MRPCalendar.php:21 MRPCreateDemands.php:196 MRPDemandTypes.php:17
#: MRPDemands.php:27 MRPPlannedPurchaseOrders.php:265
#: MRPPlannedWorkOrders.php:247 MRPPlannedWorkOrders.php:321
@@ -1259,11 +1259,11 @@
msgid "Summary or detailed report"
msgstr "Informe detallado o resumen"
-#: AgedDebtors.php:519 AgedSuppliers.php:320 InventoryValuation.php:288
+#: AgedDebtors.php:519 AgedSuppliers.php:320 InventoryValuation.php:289
msgid "Summary Report"
msgstr "Informe resumen"
-#: AgedDebtors.php:520 AgedSuppliers.php:321 InventoryValuation.php:289
+#: AgedDebtors.php:520 AgedSuppliers.php:321 InventoryValuation.php:290
msgid "Detailed Report"
msgstr "Informe detallado"
@@ -1271,7 +1271,7 @@
#: BOMIndented.php:277 BOMIndentedReverse.php:255 BOMListing.php:131
#: DebtorsAtPeriodEnd.php:168 InventoryPlanning.php:460
#: InventoryPlanningPrefSupplier.php:530 InventoryQuantities.php:210
-#: InventoryValuation.php:295 MRPPlannedPurchaseOrders.php:294
+#: InventoryValuation.php:296 MRPPlannedPurchaseOrders.php:294
#: MRPPlannedWorkOrders.php:348 MRPReschedules.php:153 MRPShortages.php:303
#: OutstandingGRNs.php:277 PDFCustomerList.php:421 PDFLowGP.php:146
#: PDFPriceList.php:340 PDFRemittanceAdvice.php:175
@@ -1344,7 +1344,7 @@
msgid "For suppliers trading in"
msgstr "Para proveedores de"
-#: AgedSuppliers.php:318 InventoryValuation.php:286
+#: AgedSuppliers.php:318 InventoryValuation.php:287
msgid "Summary or Detailed Report"
msgstr "Informe detallado o resumen"
@@ -2429,7 +2429,7 @@
#: PDFOrdersInvoiced.php:296 ReorderLevel.php:290 ReorderLevel.php:299
#: ReorderLevelLocation.php:164 StockCounts.php:214 StockReorderLevel.php:58
#: StockSerialItemResearch.php:81 StockStatus.php:88 StockStatus.php:93
-#: SupplierTenderCreate.php:137 WhereUsedInquiry.php:71 WorkCentres.php:129
+#: SupplierTenderCreate.php:137 WhereUsedInquiry.php:74 WorkCentres.php:129
#: WorkCentres.php:226 api/api_xml-rpc.php:2531 api/api_xml-rpc.php:2577
#: api/api_xml-rpc.php:2773
#: includes/PDFPeriodStockTransListingPageHeader.inc:51
@@ -2437,17 +2437,17 @@
msgid "Location"
msgstr "Ubicación"
-#: BOMs.php:564 WhereUsedInquiry.php:70 includes/MainMenuLinksArray.php:317
+#: BOMs.php:564 WhereUsedInquiry.php:73 includes/MainMenuLinksArray.php:317
msgid "Work Centre"
msgstr "Centro de Trabajo"
-#: BOMs.php:566 BOMs.php:770 WhereUsedInquiry.php:73
+#: BOMs.php:566 BOMs.php:770 WhereUsedInquiry.php:76
#: includes/PDFBOMListingPageHeader.inc:40
msgid "Effective After"
msgstr "Vigente después de"
#: BOMs.php:567 BOMs.php:774 PurchData.php:703 SellThroughSupport.php:267
-#: WhereUsedInquiry.php:74 includes/PDFBOMListingPageHeader.inc:41
+#: WhereUsedInquiry.php:77 includes/PDFBOMListingPageHeader.inc:41
msgid "Effective To"
msgstr "Vigente Para"
@@ -5539,7 +5539,7 @@
#: ContractOtherReqts.php:159 InternalStockRequest.php:273
#: InternalStockRequestAuthorisation.php:105 SelectWorkOrder.php:330
-#: WhereUsedInquiry.php:72 WorkOrderCosting.php:101
+#: WhereUsedInquiry.php:75 WorkOrderCosting.php:101
msgid "Quantity Required"
msgstr "Cantidad Requerida"
@@ -9096,7 +9096,8 @@
#: CustomerInquiry.php:152 CustomerReceipt.php:1033 Dashboard.php:58
#: PrintCustStatements.php:394 SalesPeople.php:206 Shipments.php:406
#: StockClone.php:871 StockClone.php:873 Stocks.php:1180 Stocks.php:1182
-#: SupplierInquiry.php:145 includes/PDFAgedDebtorsPageHeader.inc:50
+#: SupplierInquiry.php:145 WhereUsedInquiry.php:92
+#: includes/PDFAgedDebtorsPageHeader.inc:50
#: includes/PDFAgedSuppliersPageHeader.inc:36
msgid "Current"
msgstr "Actual"
@@ -15600,6 +15601,7 @@
#: InternalStockRequest.php:584 SelectProduct.php:81 SelectProduct.php:805
#: StockClone.php:876 StockClone.php:878 Stocks.php:1185 Stocks.php:1187
+#: WhereUsedInquiry.php:90
msgid "Obsolete"
msgstr "Obsoleto"
@@ -15803,23 +15805,23 @@
msgid "Inventory Planning Reporting"
msgstr "Reporte de Planificación de Inventario"
-#: InventoryPlanning.php:400 InventoryValuation.php:238 PDFPriceList.php:302
+#: InventoryPlanning.php:400 InventoryValuation.php:239 PDFPriceList.php:302
#: PDFPrintLabel.php:296 StockCheck.php:272
msgid "From Inventory Category Code"
msgstr "Desde el código de categoría de inventario"
-#: InventoryPlanning.php:412 InventoryValuation.php:254 PDFPriceList.php:305
+#: InventoryPlanning.php:412 InventoryValuation.php:255 PDFPriceList.php:305
#: PDFPrintLabel.php:305 StockCheck.php:283
msgid "To Inventory Category Code"
msgstr "Hasta el código de categoría de inventario"
#: InventoryPlanning.php:424 InventoryPlanningPrefSupplier.php:486
-#: InventoryValuation.php:267 StockCheck.php:295
+#: InventoryValuation.php:268 StockCheck.php:295
msgid "For Inventory in Location"
msgstr "Para inventario en ubicación"
#: InventoryPlanning.php:430 InventoryPlanningPrefSupplier.php:492
-#: InventoryValuation.php:277 MRPCreateDemands.php:226 PDFDIFOT.php:68
+#: InventoryValuation.php:278 MRPCreateDemands.php:226 PDFDIFOT.php:68
#: PDFDeliveryDifferences.php:64 PDFOrderStatus.php:63
#: PDFOrdersInvoiced.php:66 StockUsage.php:87 StockUsage.php:89
msgid "All Locations"
@@ -16068,11 +16070,11 @@
msgid "Category ID"
msgstr "ID de categoría"
-#: InventoryValuation.php:222
+#: InventoryValuation.php:223
msgid "Inventory Valuation Reporting"
msgstr "Informe de Valoración del Inventario"
-#: InventoryValuation.php:296
+#: InventoryValuation.php:297
msgid "Output to CSV"
msgstr "Salida a CSV"
@@ -18842,7 +18844,7 @@
#: PDFOrderStatus.php:297 PO_AuthoriseMyOrders.php:63 PO_Header.php:829
#: PO_OrderDetails.php:152 PO_SelectOSPurchOrder.php:521
#: PO_SelectPurchOrder.php:440 SelectWorkOrder.php:324 SelectWorkOrder.php:360
-#: WorkOrderCosting.php:104 WorkOrderCosting.php:118
+#: WhereUsedInquiry.php:72 WorkOrderCosting.php:104 WorkOrderCosting.php:118
#: includes/InputSerialItemsFile.php:160
#, php-format
msgid "Status"
@@ -23354,7 +23356,7 @@
#: PrintCustTrans.php:420 PrintCustTrans.php:1075
#: PrintCustTransPortrait.php:477 PrintCustTransPortrait.php:1142
-#: includes/DefineCartClass.php:377
+#: includes/DatabaseTranslations.php:60 includes/DefineCartClass.php:377
msgid "Freight"
msgstr "Flete"
@@ -30438,11 +30440,11 @@
msgid "The quantity on order for this product to be received into"
msgstr "La cantidad en pedidos de este producto a ser recibida en"
-#: StockLocStatus.php:296 StockLocStatus.php:328 StockStatus.php:269
+#: StockLocStatus.php:297 StockLocStatus.php:329 StockStatus.php:269
msgid "Serial Numbers"
msgstr "Numeros de Serie"
-#: StockLocStatus.php:298 StockLocStatus.php:330 StockStatus.php:271
+#: StockLocStatus.php:299 StockLocStatus.php:331 StockStatus.php:271
#: WorkOrderEntry.php:634
msgid "Batches"
msgstr "Lotes"
@@ -37150,23 +37152,23 @@
msgid "Show Where Used"
msgstr "Mostrar Dónde Usado"
-#: WhereUsedInquiry.php:61
+#: WhereUsedInquiry.php:63
msgid "The parents for the selected part could not be retrieved because"
msgstr "La base del código seleccionado no se puede obtener porque"
-#: WhereUsedInquiry.php:64
+#: WhereUsedInquiry.php:66
msgid "The selected item"
msgstr "El artículo seleccionado"
-#: WhereUsedInquiry.php:64
+#: WhereUsedInquiry.php:66
msgid "is not used as a component of any other parts"
msgstr "no se utiliza como un componente de cualquier otro código"
-#: WhereUsedInquiry.php:69
+#: WhereUsedInquiry.php:71
msgid "Used By"
msgstr "Usado Por"
-#: WhereUsedInquiry.php:87
+#: WhereUsedInquiry.php:94
msgid "Show Bill Of Material"
msgstr "Mostrar Lista de Materiales"
@@ -39743,7 +39745,7 @@
msgid "Can field be null"
msgstr "El Campo puede ser nulo"
-#: Z_DescribeTable.php:15 includes/DatabaseTranslations.php:59
+#: Z_DescribeTable.php:15 includes/DatabaseTranslations.php:64
#: install/index.php:1040 reportwriter/languages/en_US/reports.php:65
msgid "Default"
msgstr "Predeterminado"
@@ -46719,15 +46721,15 @@
#: includes/DatabaseTranslations.php:22
msgid "Journal - GL"
-msgstr ""
+msgstr "Diario contable"
#: includes/DatabaseTranslations.php:23
msgid "Payment - GL"
-msgstr ""
+msgstr "Pago contable"
#: includes/DatabaseTranslations.php:24
msgid "Receipt - GL"
-msgstr ""
+msgstr "Recibo contable"
#: includes/DatabaseTranslations.php:25
msgid "Standing Journal"
@@ -46755,23 +46757,23 @@
#: includes/DatabaseTranslations.php:41
msgid "Work Order Variance"
-msgstr ""
+msgstr "Variación en orden de trabajo"
#: includes/DatabaseTranslations.php:43
msgid "Shipment Close"
-msgstr ""
+msgstr "Cierre de embarque"
#: includes/DatabaseTranslations.php:44
msgid "Contract Close"
-msgstr ""
+msgstr "Cierre de contrato"
#: includes/DatabaseTranslations.php:45
msgid "Cost Update"
-msgstr ""
+msgstr "Actualización de costo"
#: includes/DatabaseTranslations.php:46
msgid "Exchange Difference"
-msgstr ""
+msgstr "Diferencia cambiaria"
#: includes/DatabaseTranslations.php:48
msgid "Stock Requests"
@@ -46779,7 +46781,7 @@
#: includes/DatabaseTranslations.php:51
msgid "Asset Category Change"
-msgstr ""
+msgstr "Cambio de categoría de activo"
#: includes/DatabaseTranslations.php:52
msgid "Delete w/down asset"
@@ -46787,12 +46789,20 @@
#: includes/DatabaseTranslations.php:55
msgid "Opening Balance"
-msgstr ""
+msgstr "Saldo inicial"
#: includes/DatabaseTranslations.php:56
msgid "Auto Debtor Number"
msgstr ""
+#: includes/DatabaseTranslations.php:59
+msgid "Exempt"
+msgstr "Exento"
+
+#: includes/DatabaseTranslations.php:61
+msgid "Handling"
+msgstr "Manejo"
+
#: includes/DefineCartClass.php:173
msgid "The order line for"
msgstr "La línea de pedido para"
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-29 07:15:02 UTC (rev 6854)
+++ trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po 2014-08-29 20:41:58 UTC (rev 6855)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: webERP 4.11.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-28 08:46-0600\n"
+"POT-Creation-Date: 2014-08-29 11:25-0600\n"
"PO-Revision-Date: 2014-08-28 08:50-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: French <none>\n"
@@ -920,7 +920,7 @@
msgstr ""
#: AgedControlledInventory.php:12 InventoryQuantities.php:155
-#: InventoryValuation.php:230 Locations.php:394 Locations.php:455 MRP.php:530
+#: InventoryValuation.php:231 Locations.php:394 Locations.php:455 MRP.php:530
#: MRPCalendar.php:21 MRPCreateDemands.php:196 MRPDemandTypes.php:17
#: MRPDemands.php:27 MRPPlannedPurchaseOrders.php:265
#: MRPPlannedWorkOrders.php:247 MRPPlannedWorkOrders.php:321
@@ -1263,11 +1263,11 @@
msgid "Summary or detailed report"
msgstr "Sommaire ou rapport détaillé"
-#: AgedDebtors.php:519 AgedSuppliers.php:320 InventoryValuation.php:288
+#: AgedDebtors.php:519 AgedSuppliers.php:320 InventoryValuation.php:289
msgid "Summary Report"
msgstr "Rapport succinct"
-#: AgedDebtors.php:520 AgedSuppliers.php:321 InventoryValuation.php:289
+#: AgedDebtors.php:520 AgedSuppliers.php:321 InventoryValuation.php:290
msgid "Detailed Report"
msgstr "Rapport détaillé"
@@ -1275,7 +1275,7 @@
#: BOMIndented.php:277 BOMIndentedReverse.php:255 BOMListing.php:131
#: DebtorsAtPeriodEnd.php:168 InventoryPlanning.php:460
#: InventoryPlanningPrefSupplier.php:530 InventoryQuantities.php:210
-#: InventoryValuation.php:295 MRPPlannedPurchaseOrders.php:294
+#: InventoryValuation.php:296 MRPPlannedPurchaseOrders.php:294
#: MRPPlannedWorkOrders.php:348 MRPReschedules.php:153 MRPShortages.php:303
#: OutstandingGRNs.php:277 PDFCustomerList.php:421 PDFLowGP.php:146
#: PDFPriceList.php:340 PDFRemittanceAdvice.php:175
@@ -1347,7 +1347,7 @@
msgstr "Devise fournisseur"
# JDN
-#: AgedSuppliers.php:318 InventoryValuation.php:286
+#: AgedSuppliers.php:318 InventoryValuation.php:287
msgid "Summary or Detailed Report"
msgstr "Type de rapport"
@@ -2457,7 +2457,7 @@
#: PDFOrdersInvoiced.php:296 ReorderLevel.php:290 ReorderLevel.php:299
#: ReorderLevelLocation.php:164 StockCounts.php:214 StockReorderLevel.php:58
#: StockSerialItemResearch.php:81 StockStatus.php:88 StockStatus.php:93
-#: SupplierTenderCreate.php:137 WhereUsedInquiry.php:71 WorkCentres.php:129
+#: SupplierTenderCreate.php:137 WhereUsedInquiry.php:74 WorkCentres.php:129
#: WorkCentres.php:226 api/api_xml-rpc.php:2531 api/api_xml-rpc.php:2577
#: api/api_xml-rpc.php:2773
#: includes/PDFPeriodStockTransListingPageHeader.inc:51
@@ -2466,19 +2466,19 @@
msgstr "Site"
# JDN
-#: BOMs.php:564 WhereUsedInquiry.php:70 includes/MainMenuLinksArray.php:317
+#: BOMs.php:564 WhereUsedInquiry.php:73 includes/MainMenuLinksArray.php:317
msgid "Work Centre"
msgstr "Centre de travail"
# JDN à compléter éventuellement
-#: BOMs.php:566 BOMs.php:770 WhereUsedInquiry.php:73
+#: BOMs.php:566 BOMs.php:770 WhereUsedInquiry.php:76
#: includes/PDFBOMListingPageHeader.inc:40
msgid "Effective After"
msgstr "Du"
# JDN
#: BOMs.php:567 BOMs.php:774 PurchData.php:703 SellThroughSupport.php:267
-#: WhereUsedInquiry.php:74 includes/PDFBOMListingPageHeader.inc:41
+#: WhereUsedInquiry.php:77 includes/PDFBOMListingPageHeader.inc:41
msgid "Effective To"
msgstr "Au"
@@ -5522,7 +5522,7 @@
# JDN
#: ContractOtherReqts.php:159 InternalStockRequest.php:273
#: InternalStockRequestAuthorisation.php:105 SelectWorkOrder.php:330
-#: WhereUsedInquiry.php:72 WorkOrderCosting.php:101
+#: WhereUsedInquiry.php:75 WorkOrderCosting.php:101
msgid "Quantity Required"
msgstr "Quantité demandée"
@@ -9123,7 +9123,8 @@
#: CustomerInquiry.php:152 CustomerReceipt.php:1033 Dashboard.php:58
#: PrintCustStatements.php:394 SalesPeople.php:206 Shipments.php:406
#: StockClone.php:871 StockClone.php:873 Stocks.php:1180 Stocks.php:1182
-#: SupplierInquiry.php:145 includes/PDFAgedDebtorsPageHeader.inc:50
+#: SupplierInquiry.php:145 WhereUsedInquiry.php:92
+#: includes/PDFAgedDebtorsPageHeader.inc:50
#: includes/PDFAgedSuppliersPageHeader.inc:36
msgid "Current"
msgstr "Actif"
@@ -15718,6 +15719,7 @@
#: InternalStockRequest.php:584 SelectProduct.php:81 SelectProduct.php:805
#: StockClone.php:876 StockClone.php:878 Stocks.php:1185 Stocks.php:1187
+#: WhereUsedInquiry.php:90
msgid "Obsolete"
msgstr "Obsolète"
@@ -15923,23 +15925,23 @@
msgid "Inventory Planning Reporting"
msgstr "Rapport d'inventaire"
-#: InventoryPlanning.php:400 InventoryValuation.php:238 PDFPriceList.php:302
+#: InventoryPlanning.php:400 InventoryValuation.php:239 PDFPriceList.php:302
#: PDFPrintLabel.php:296 StockCheck.php:272
msgid "From Inventory Category Code"
msgstr "Du code catégorie"
-#: InventoryPlanning.php:412 InventoryValuation.php:254 PDFPriceList.php:305
+#: InventoryPlanning.php:412 InventoryValuation.php:255 PDFPriceList.php:305
#: PDFPrintLabel.php:305 StockCheck.php:283
msgid "To Inventory Category Code"
msgstr "Au code catégorie"
#: InventoryPlanning.php:424 InventoryPlanningPrefSupplier.php:486
-#: InventoryValuation.php:267 StockCheck.php:295
+#: InventoryValuation.php:268 StockCheck.php:295
msgid "For Inventory in Location"
msgstr "Site du stock"
#: InventoryPlanning.php:430 InventoryPlanningPrefSupplier.php:492
-#: InventoryValuation.php:277 MRPCreateDemands.php:226 PDFDIFOT.php:68
+#: InventoryValuation.php:278 MRPCreateDemands.php:226 PDFDIFOT.php:68
#: PDFDeliveryDifferences.php:64 PDFOrderStatus.php:63
#: PDFOrdersInvoiced.php:66 StockUsage.php:87 StockUsage.php:89
msgid "All Locations"
@@ -16185,11 +16187,11 @@
msgid "Category ID"
msgstr ""
-#: InventoryValuation.php:222
+#: InventoryValuation.php:223
msgid "Inventory Valuation Reporting"
msgstr "Valorisation du stock"
-#: InventoryValuation.php:296
+#: InventoryValuation.php:297
msgid "Output to CSV"
msgstr ""
@@ -19005,7 +19007,7 @@
#: PDFOrderStatus.php:297 PO_AuthoriseMyOrders.php:63 PO_Header.php:829
#: PO_OrderDetails.php:152 PO_SelectOSPurchOrder.php:521
#: PO_SelectPurchOrder.php:440 SelectWorkOrder.php:324 SelectWorkOrder.php:360
-#: WorkOrderCosting.php:104 WorkOrderCosting.php:118
+#: WhereUsedInquiry.php:72 WorkOrderCosting.php:104 WorkOrderCosting.php:118
#: includes/InputSerialItemsFile.php:160
#, php-format
msgid "Status"
@@ -23568,7 +23570,7 @@
#: PrintCustTrans.php:420 PrintCustTrans.php:1075
#: PrintCustTransPortrait.php:477 PrintCustTransPortrait.php:1142
-#: includes/DefineCartClass.php:377
+#: includes/DatabaseTranslations.php:60 includes/DefineCartClass.php:377
msgid "Freight"
msgstr "Transport"
@@ -30804,11 +30806,11 @@
msgid "The quantity on order for this product to be received into"
msgstr "La quantité à la commande de ce produit pour être reçu dans"
-#: StockLocStatus.php:296 StockLocStatus.php:328 StockStatus.php:269
+#: StockLocStatus.php:297 StockLocStatus.php:329 StockStatus.php:269
msgid "Serial Numbers"
msgstr "N° de série"
-#: StockLocStatus.php:298 StockLocStatus.php:330 StockStatus.php:271
+#: StockLocStatus.php:299 StockLocStatus.php:331 StockStatus.php:271
#: WorkOrderEntry.php:634
msgid "Batches"
msgstr "Lots"
@@ -37600,25 +37602,25 @@
msgid "Show Where Used"
msgstr "Afficher le détail de son utilisation"
-#: WhereUsedInquiry.php:61
+#: WhereUsedInquiry.php:63
msgid "The parents for the selected part could not be retrieved because"
msgstr ""
"Les parents de la partie sélectionnée n'a pas pu être récupérés en raison"
-#: WhereUsedInquiry.php:64
+#: WhereUsedInquiry.php:66
msgid "The selected item"
msgstr "L'élément sélectionné"
# JDN
-#: WhereUsedInquiry.php:64
+#: WhereUsedInquiry.php:66
msgid "is not used as a component of any other parts"
msgstr "n'est pas utilisé(e) comme un composant de toute autre article"
-#: WhereUsedInquiry.php:69
+#: WhereUsedInquiry.php:71
msgid "Used By"
msgstr "Utilisé par"
-#: WhereUsedInquiry.php:87
+#: WhereUsedInquiry.php:94
msgid "Show Bill Of Material"
msgstr "Afficher les nomenclatures"
@@ -40158,7 +40160,7 @@
msgid "Can field be null"
msgstr ""
-#: Z_DescribeTable.php:15 includes/DatabaseTranslations.php:59
+#: Z_DescribeTable.php:15 includes/DatabaseTranslations.php:64
#: install/index.php:1040 reportwriter/languages/en_US/reports.php:65
msgid "Default"
msgstr "Par défaut"
@@ -47157,6 +47159,14 @@
msgid "Auto Debtor Number"
msgstr ""
+#: includes/DatabaseTranslations.php:59
+msgid "Exempt"
+msgstr ""
+
+#: includes/DatabaseTranslations.php:61
+msgid "Handling"
+msgstr ""
+
#: includes/DefineCartClass.php:173
msgid "The order line for"
msgstr "La ligne de Commande pour"
|
