Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[7090] trunk
|
From: <rc...@us...> - 2015-01-20 13:44:23
|
Revision: 7090
http://sourceforge.net/p/web-erp/reponame/7090
Author: rchacon
Date: 2015-01-20 13:44:18 +0000 (Tue, 20 Jan 2015)
Log Message:
-----------
Add translation for transaction type, script ID, manual references, class="number" to columns.
Modified Paths:
--------------
trunk/CustomerPurchases.php
trunk/SelectOrderItems.php
trunk/doc/Change.log
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
Modified: trunk/CustomerPurchases.php
===================================================================
--- trunk/CustomerPurchases.php 2015-01-20 08:04:05 UTC (rev 7089)
+++ trunk/CustomerPurchases.php 2015-01-20 13:44:18 UTC (rev 7090)
@@ -1,15 +1,19 @@
<?php
+/* $Id: CustomerPurchases.php 7090 2015-01-20 13:43:08Z daintree $*/
+/* This script is to view the items purchased by a customer. */
+
include('includes/session.inc');
-$Title = _('Customer Purchases');
+$Title = _('Customer Purchases');// Screen identificator.
+$ViewTopic = 'ARInquiries';// Filename's id in ManualContents.php's TOC.
+/* This help needs to be writing...
+$BookMark = 'CustomerPurchases';// Anchor's id in the manual's html document.*/
include('includes/header.inc');
-if (isset($_GET['DebtorNo'])) {
- $DebtorNo = $_GET['DebtorNo'];
-} //isset($_GET['DebtorNo'])
-else if (isset($_POST['DebtorNo'])) {
- $DebtorNo = $_POST['DebtorNo'];
-} //isset($_POST['DebtorNo'])
-else {
+if(isset($_GET['DebtorNo'])) {
+ $DebtorNo = $_GET['DebtorNo'];// Set DebtorNo from $_GET['DebtorNo'].
+} elseif(isset($_POST['DebtorNo'])) {
+ $DebtorNo = $_POST['DebtorNo'];// Set DebtorNo from $_POST['DebtorNo'].
+} else {
prnMsg(_('This script must be called with a customer code.'), 'info');
include('includes/footer.inc');
exit;
@@ -26,9 +30,10 @@
$CustomerResult = DB_query($SQL, $ErrMsg);
$CustomerRecord = DB_fetch_array($CustomerResult);
-echo '<p class="page_title_text">
- <img src="' . $RootPath . '/css/' . $Theme . '/images/customer.png" title="' . _('Customer') . '" alt="" /> ' . _('Items Purchased by Customer') . ' : ' . $CustomerRecord['name'] . '
- </p>';
+echo '<p class="page_title_text"><img alt="" src="'.$RootPath.'/css/'.$Theme.
+ '/images/customer.png" title="' .
+ _('Customer') . '" /> ' .// Icon title.
+ _('Items Purchased by Customer') . '<br />' . $DebtorNo . " - " . $CustomerRecord['name'] . '</p>';// Page title.
$SQL = "SELECT stockmoves.stockid,
stockmaster.description,
@@ -90,14 +95,14 @@
<td>' . ConvertSQLDate($StockMovesRow['trandate']) . '</td>
<td>' . $StockMovesRow['stockid'] . '</td>
<td>' . $StockMovesRow['description'] . '</td>
- <td>' . $StockMovesRow['typename'] . '</td>
- <td>' . $StockMovesRow['transno'] . '</td>
+ <td>' . _($StockMovesRow['typename']) . '</td>
+ <td class="number">' . $StockMovesRow['transno'] . '</td>
<td>' . $StockMovesRow['locationname'] . '</td>
<td>' . $StockMovesRow['branchcode'] . '</td>
<td class="number">' . locale_number_format($StockMovesRow['price'], $_SESSION['CompanyRecord']['decimalplaces']) . '</td>
<td class="number">' . locale_number_format(-$StockMovesRow['qty'], $_SESSION['CompanyRecord']['decimalplaces']) . '</td>
<td class="number">' . locale_number_format((-$StockMovesRow['qty'] * $StockMovesRow['price']), $_SESSION['CompanyRecord']['decimalplaces']) . '</td>
- <td>' . $StockMovesRow['reference'] . '</td>
+ <td class="number">' . $StockMovesRow['reference'] . '</td>
<td>' . $StockMovesRow['narrative'] . '</td>
</tr>';
@@ -109,4 +114,4 @@
echo '<br /><div class="centre"><a href="SelectCustomer.php">' . _('Return to customer selection screen') . '</a></div><br />';
include('includes/footer.inc');
-?>
\ No newline at end of file
+?>
Modified: trunk/SelectOrderItems.php
===================================================================
--- trunk/SelectOrderItems.php 2015-01-20 08:04:05 UTC (rev 7089)
+++ trunk/SelectOrderItems.php 2015-01-20 13:44:18 UTC (rev 7090)
@@ -561,7 +561,7 @@
echo '<div class="page_help_text">' . _('Orders/Quotations are placed against the Customer Branch. A Customer may have several Branches.') . '</div>';
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier . '" method="post">
<div>
- <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
+ <input name="FormID" type="hidden" value="' . $_SESSION['FormID'] . '" />
<table cellpadding="3" class="selection">
<tr>
<td>' . _('Part of the Customer Branch Name') . ':</td>
@@ -585,8 +585,8 @@
if (isset($result_CustSelect)) {
echo '<div>
- <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
- <input type="hidden" name="JustSelectedACustomer" value="Yes" />
+ <input name="FormID" type="hidden" value="' . $_SESSION['FormID'] . '" />
+ <input name="JustSelectedACustomer" type="hidden" value="Yes" />
<br />
<table class="selection">';
@@ -613,8 +613,8 @@
echo ' <td>' . htmlspecialchars($myrow['name'], ENT_QUOTES, 'UTF-8', false) . '</td>
<td><input tabindex="'.strval($j+5).'" type="submit" name="SubmitCustomerSelection' . $j .'" value="' . htmlspecialchars($myrow['brname'], ENT_QUOTES, 'UTF-8', false). '" />
- <input type="hidden" name="SelectedCustomer' . $j .'" value="'.$myrow['debtorno'].'" />
- <input type="hidden" name="SelectedBranch' . $j .'" value="'. $myrow['branchcode'].'" /></td>
+ <input name="SelectedCustomer' . $j .'" type="hidden" value="'.$myrow['debtorno'].'" />
+ <input name="SelectedBranch' . $j .'" type="hidden" value="'. $myrow['branchcode'].'" /></td>
<td>' . $myrow['contactname'] . '</td>
<td>' . $myrow['phoneno'] . '</td>
<td>' . $myrow['faxno'] . '</td>
@@ -800,7 +800,7 @@
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier . '" id="SelectParts" method="post">';
echo '<div>';
- echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+ echo '<input name="FormID" type="hidden" value="' . $_SESSION['FormID'] . '" />';
//Get The exchange rate used for GPPercent calculations on adding or amending items
if ($_SESSION['Items'.$identifier]->DefaultCurrency != $_SESSION['CompanyRecord']['currencydefault']){
@@ -1278,11 +1278,24 @@
/* This is where the order as selected should be displayed reflecting any deletions or insertions*/
+ if($_SESSION['Items'.$identifier]->DefaultPOLine ==1) {// Does customer require PO Line number by sales order line?
+ $ShowPOLine=1;// Show one additional column: 'PO Line'.
+ } else {
+ $ShowPOLine=0;// Do NOT show 'PO Line'.
+ }
+
+ if(in_array($_SESSION['PageSecurityArray']['OrderEntryDiscountPricing'], $_SESSION['AllowedPageSecurityTokens'])) {//Is it an internal user with appropriate permissions?
+ $ShowDiscountGP=2;// Show two additional columns: 'Discount' and 'GP %'.
+ } else {
+ $ShowDiscountGP=0;// Do NOT show 'Discount' and 'GP %'.
+ }
+
echo '<div class="page_help_text">' . _('Quantity (required) - Enter the number of units ordered. Price (required) - Enter the unit price. Discount (optional) - Enter a percentage discount. GP% (optional) - Enter a percentage Gross Profit (GP) to add to the unit cost. Due Date (optional) - Enter a date for delivery.') . '</div><br />';
echo '<br />
<table width="90%" cellpadding="2">
<tr style="background-color:#800000">';
- if($_SESSION['Items'.$identifier]->DefaultPOLine == 1){
+/* if($_SESSION['Items'.$identifier]->DefaultPOLine == 1){*/
+ if($ShowPOLine) {
echo '<th>' . _('PO Line') . '</th>';
}
echo '<th>' . _('Item Code') . '</th>
@@ -1292,12 +1305,14 @@
<th>' . _('Unit') . '</th>
<th>' . _('Price') . '</th>';
- if (in_array($_SESSION['PageSecurityArray']['OrderEntryDiscountPricing'], $_SESSION['AllowedPageSecurityTokens'])){
+/* if (in_array($_SESSION['PageSecurityArray']['OrderEntryDiscountPricing'], $_SESSION['AllowedPageSecurityTokens'])){*/
+ if($ShowDiscountGP) {
echo '<th>' . _('Discount') . '</th>
<th>' . _('GP %') . '</th>';
}
echo '<th>' . _('Total') . '</th>
- <th>' . _('Due Date') . '</th></tr>';
+ <th>' . _('Due Date') . '</th>
+ <th> </th></tr>';
$_SESSION['Items'.$identifier]->total = 0;
$_SESSION['Items'.$identifier]->totalVolume = 0;
@@ -1324,16 +1339,17 @@
echo $RowStarter;
echo '<td>';
- if($_SESSION['Items'.$identifier]->DefaultPOLine ==1){ //show the input field only if required
- echo '<input tabindex="1" type="text" name="POLine_' . $OrderLine->LineNumber . '" size="20" maxlength="20" value="' . $OrderLine->POLine . '" title="' . _('Enter the customer\'s purchase order reference if required by the customer') . '" /></td><td>';
+/* if($_SESSION['Items'.$identifier]->DefaultPOLine ==1){ //show the input field only if required*/
+ if($ShowPOLine) {// Show the input field only if required.
+ echo '<input maxlength="20" name="POLine_' . $OrderLine->LineNumber . '" size="20" title="' . _('Enter the customer\'s purchase order reference if required by the customer') . '" type="text" value="' . $OrderLine->POLine . '" /></td><td>';
} else {
- echo '<input type="hidden" name="POLine_' . $OrderLine->LineNumber . '" value="" />';
+ echo '<input name="POLine_' . $OrderLine->LineNumber . '" type="hidden" value="" />';
}
- echo '<a target="_blank" href="' . $RootPath . '/StockStatus.php?identifier='.$identifier . '&StockID=' . $OrderLine->StockID . '&DebtorNo=' . $_SESSION['Items'.$identifier]->DebtorNo . '">' . $OrderLine->StockID . '</a></td>
+ echo '<a href="' . $RootPath . '/StockStatus.php?identifier='.$identifier . '&StockID=' . $OrderLine->StockID . '&DebtorNo=' . $_SESSION['Items'.$identifier]->DebtorNo . '" target="_blank">' . $OrderLine->StockID . '</a></td>
<td title="' . $OrderLine->LongDescription . '">' . $OrderLine->ItemDescription . '</td>';
- echo '<td><input class="number" tabindex="2" type="text" required="required" name="Quantity_' . $OrderLine->LineNumber . '" size="6" maxlength="8" value="' . locale_number_format($OrderLine->Quantity,$OrderLine->DecimalPlaces) . '" title="' . _('Enter the quantity of this item ordered by the customer') . '" />';
+ echo '<td><input class="number" maxlength="8" name="Quantity_' . $OrderLine->LineNumber . '" required="required" size="6" title="' . _('Enter the quantity of this item ordered by the customer') . '" type="text" value="' . locale_number_format($OrderLine->Quantity,$OrderLine->DecimalPlaces) . '" />';
if ($QtyRemain != $QtyOrdered){
echo '<br />' . locale_number_format($OrderLine->QtyInv,$OrderLine->DecimalPlaces) .' ' . _('of') . ' ' . locale_number_format($OrderLine->Quantity,$OrderLine->DecimalPlaces).' ' . _('invoiced');
}
@@ -1341,16 +1357,18 @@
<td class="number">' . locale_number_format($OrderLine->QOHatLoc,$OrderLine->DecimalPlaces) . '</td>
<td>' . $OrderLine->Units . '</td>';
- /*OK to display with discount if it is an internal user with appropriate permissions */
- if (in_array($_SESSION['PageSecurityArray']['OrderEntryDiscountPricing'], $_SESSION['AllowedPageSecurityTokens'])){
- echo '<td><input class="number" type="text" required="required" name="Price_' . $OrderLine->LineNumber . '" size="16" maxlength="16" value="' . locale_number_format($OrderLine->Price,$_SESSION['Items'.$identifier]->CurrDecimalPlaces) . '" title="' . _('Enter the price to charge the customer for this item') . '" /></td>
- <td><input class="number" type="text" required="required" name="Discount_' . $OrderLine->LineNumber . '" size="5" maxlength="4" value="' . locale_number_format(($OrderLine->DiscountPercent * 100),2) . '" title="' . _('Enter the discount percentage to apply to the price for this item') . '" /></td>
- <td><input class="number" type="text" required="required" name="GPPercent_' . $OrderLine->LineNumber . '" size="4" maxlength="40" value="' . locale_number_format($OrderLine->GPPercent,2) . '" title="' . _('Enter a gross profit percentage to use as the basis to calculate the price to charge the customer for this line item') . '" /></td>';
+ /*OK to display with discount if it is an internal user with appropriate permissions */
+/* if (in_array($_SESSION['PageSecurityArray']['OrderEntryDiscountPricing'], $_SESSION['AllowedPageSecurityTokens'])){*/
+ if ($ShowDiscountGP){
+ echo '<td><input class="number" maxlength="16" name="Price_' . $OrderLine->LineNumber . '" required="required" size="16" title="' . _('Enter the price to charge the customer for this item') . '" type="text" value="' . locale_number_format($OrderLine->Price,$_SESSION['Items'.$identifier]->CurrDecimalPlaces) . '" /></td>
+ <td><input class="number" maxlength="4" name="Discount_' . $OrderLine->LineNumber . '" required="required" size="5" title="' . _('Enter the discount percentage to apply to the price for this item') . '" type="text" value="' . locale_number_format(($OrderLine->DiscountPercent * 100),2) . '" /></td>
+ <td><input class="number" maxlength="40" name="GPPercent_' . $OrderLine->LineNumber . '" required="required" size="4" value="' . locale_number_format($OrderLine->GPPercent,2) . '" title="' . _('Enter a gross profit percentage to use as the basis to calculate the price to charge the customer for this line item') . '" type="text" /></td>';
} else {
echo '<td class="number">' . locale_number_format($OrderLine->Price,$_SESSION['Items'.$identifier]->CurrDecimalPlaces);
- echo '<input class="number" type="hidden" name="GPPercent_' . $OrderLine->LineNumber . '" size="4" maxlength="40" value="' . locale_number_format($OrderLine->GPPercent,2) . '" />';
- echo '<input type="hidden" name="Price_' . $OrderLine->LineNumber . '" value="' . locale_number_format($OrderLine->Price,$_SESSION['Items'.$identifier]->CurrDecimalPlaces) . '" /></td>';
+ echo '<input class="number" maxlength="40" name="GPPercent_' . $OrderLine->LineNumber . '" size="4" type="hidden" value="' . locale_number_format($OrderLine->GPPercent,2) . '" />';
+ echo '<input name="Price_' . $OrderLine->LineNumber . '" type="hidden" value="' . locale_number_format($OrderLine->Price,$_SESSION['Items'.$identifier]->CurrDecimalPlaces) . '" /></td>';
}
+
if ($_SESSION['Items'.$identifier]->Some_Already_Delivered($OrderLine->LineNumber)){
$RemTxt = _('Clear Remaining');
} else {
@@ -1363,17 +1381,18 @@
$_SESSION['Items'.$identifier]->LineItems[$OrderLine->LineNumber]->ItemDue= $LineDueDate;
}
- echo '<td><input type="text" class="date" alt="' . $_SESSION['DefaultDateFormat'] . '" name="ItemDue_' . $OrderLine->LineNumber . '" size="10" maxlength="10" value="' . $LineDueDate . '" /></td>';
+ echo '<td><input alt="' . $_SESSION['DefaultDateFormat'] . '" class="date" maxlength="10" name="ItemDue_' . $OrderLine->LineNumber . '" size="10" type="text" value="' . $LineDueDate . '" /></td>';
- echo '<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier=' . $identifier . '&Delete=' . $OrderLine->LineNumber . '" onclick="return confirm(\'' . _('Are You Sure?') . '\');">' . $RemTxt . '</a></td></tr>';
+ echo '<td rowspan="2"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier=' . $identifier . '&Delete=' . $OrderLine->LineNumber . '" onclick="return confirm(\'' . _('Are You Sure?') . '\');">' . $RemTxt . '</a></td></tr>';
if ($_SESSION['AllowOrderLineItemNarrative'] == 1){
echo $RowStarter;
- echo '<td colspan="10">' . _('Narrative') . ':<textarea name="Narrative_' . $OrderLine->LineNumber . '" cols="100%" rows="1" title="' . _('Enter any narrative to describe to the customer the nature of the charge for this line') . '" >' . stripslashes(AddCarriageReturns($OrderLine->Narrative)) . '</textarea><br /></td>
+ $varColSpan=8+$ShowPOLine+$ShowDiscountGP;
+ echo '<td colspan="' . $varColSpan . '">' . _('Narrative') . ':<textarea name="Narrative_' . $OrderLine->LineNumber . '" cols="100%" rows="1" title="' . _('Enter any narrative to describe to the customer the nature of the charge for this line') . '" >' . stripslashes(AddCarriageReturns($OrderLine->Narrative)) . '</textarea><br /></td>
</tr>';
} else {
echo '<tr>
- <td><input type="hidden" name="Narrative" value="" /></td>
+ <td><input name="Narrative" type="hidden" value="" /></td>
</tr>';
}
@@ -1384,14 +1403,16 @@
} /* end of loop around items */
$DisplayTotal = locale_number_format($_SESSION['Items'.$identifier]->total,$_SESSION['Items'.$identifier]->CurrDecimalPlaces);
- if (in_array($_SESSION['PageSecurityArray']['OrderEntryDiscountPricing'], $_SESSION['AllowedPageSecurityTokens'])){
+/* if (in_array($_SESSION['PageSecurityArray']['OrderEntryDiscountPricing'], $_SESSION['AllowedPageSecurityTokens'])){
$ColSpanNumber = 2;
} else {
$ColSpanNumber = 1;
- }
+ }*/
+ $varColSpan=1+$ShowPOLine+$ShowDiscountGP;
echo '<tr class="EvenTableRows">
<td class="number" colspan="6"><b>' . _('TOTAL Excl Tax/Freight') . '</b></td>
- <td colspan="' . $ColSpanNumber . '" class="number">' . $DisplayTotal . '</td>
+ <td colspan="' . $varColSpan . '" class="number"><b>' . $DisplayTotal . '</b></td>
+ <td colspan="2">' . $ShowDiscountGP . ' </td>
</tr>
</table>';
@@ -1417,7 +1438,7 @@
if ((!isset($_POST['QuickEntry'])
AND !isset($_POST['SelectAsset']))){
- echo '<input type="hidden" name="PartSearch" value="' . _('Yes Please') . '" />';
+ echo '<input name="PartSearch" type="hidden" value="' . _('Yes Please') . '" />';
if ($_SESSION['FrequentlyOrderedItems']>0){ //show the Frequently Order Items selection where configured to do so
@@ -1516,7 +1537,7 @@
<td class="number">%s</td>
<td class="number">%s</td>
<td><input class="number" ' . ($i==0 ? 'autofocus="autofocus"':'') . ' tabindex="%s" type="text" required="required" size="6" name="OrderQty%s" value="0" />
- <input type="hidden" name="StockID%s" value="%s" />
+ <input name="StockID%s" type="hidden" value="%s" />
</td>
</tr>',
$myrow['stockid'],
@@ -1535,7 +1556,7 @@
#end of page full new headings if
}
#end of while loop for Frequently Ordered Items
- echo '<td style="text-align:center" colspan="8"><input type="hidden" name="SelectingOrderItems" value="1" /><input tabindex="'.strval($j+8).'" type="submit" value="'._('Add to Sales Order').'" /></td></tr>';
+ echo '<td style="text-align:center" colspan="8"><input name="SelectingOrderItems" type="hidden" value="1" /><input tabindex="'.strval($j+8).'" type="submit" value="'._('Add to Sales Order').'" /></td></tr>';
echo '</table>';
} //end of if Frequently Ordered Items > 0
echo '<br /><div class="centre">' . $msg;
@@ -1604,11 +1625,11 @@
$j = 1;
//echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier . '" method="post" name="orderform">';
echo '<div>';
- echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+ echo '<input name="FormID" type="hidden" value="' . $_SESSION['FormID'] . '" />';
echo '<table class="table1">';
- echo '<tr><td colspan="1"><input type="hidden" name="PreviousList" value="'.strval($Offset-1).'" /><input tabindex="'.strval($j+8).'" type="submit" name="Previous" value="'._('Previous').'" /></td>';
- echo '<td style="text-align:center" colspan="6"><input type="hidden" name="SelectingOrderItems" value="1" /><input tabindex="'.strval($j+9).'" type="submit" value="'._('Add to Sales Order').'" /></td>';
- echo '<td colspan="1"><input type="hidden" name="NextList" value="'.strval($Offset+1).'" /><input tabindex="'.strval($j+10).'" type="submit" name="Next" value="'._('Next').'" /></td></tr>';
+ echo '<tr><td colspan="1"><input name="PreviousList" type="hidden" value="'.strval($Offset-1).'" /><input tabindex="'.strval($j+8).'" type="submit" name="Previous" value="'._('Previous').'" /></td>';
+ echo '<td style="text-align:center" colspan="6"><input name="SelectingOrderItems" type="hidden" value="1" /><input tabindex="'.strval($j+9).'" type="submit" value="'._('Add to Sales Order').'" /></td>';
+ echo '<td colspan="1"><input name="NextList" type="hidden" value="'.strval($Offset+1).'" /><input tabindex="'.strval($j+10).'" name="Next" type="submit" value="'._('Next').'" /></td></tr>';
echo '<tr>
<th class="ascending" >' . _('Code') . '</th>
<th class="ascending" >' . _('Description') . '</th>
@@ -1680,7 +1701,7 @@
<td class="number">%s</td>
<td class="number">%s</td>
<td><input class="number" tabindex="%s" type="text" size="6" name="OrderQty%s" ' . ($i==0 ? 'autofocus="autofocus"':'') . ' value="0" min="0"/>
- <input type="hidden" name="StockID%s" value="%s" />
+ <input name="StockID%s" type="hidden" value="%s" />
</td>
</tr>',
$myrow['stockid'],
@@ -1702,9 +1723,9 @@
}
#end of while loop
echo '<tr>
- <td><input type="hidden" name="PreviousList" value="'. strval($Offset-1).'" /><input tabindex="'. strval($j+7).'" type="submit" name="Previous" value="'._('Previous').'" /></td>
- <td style="text-align:center" colspan="6"><input type="hidden" name="SelectingOrderItems" value="1" /><input tabindex="'. strval($j+8).'" type="submit" value="'._('Add to Sales Order').'" /></td>
- <td><input type="hidden" name="NextList" value="'.strval($Offset+1).'" /><input tabindex="'.strval($j+9).'" type="submit" name="Next" value="'._('Next').'" /></td>
+ <td><input name="PreviousList" type="hidden" value="'. strval($Offset-1).'" /><input tabindex="'. strval($j+7).'" type="submit" name="Previous" value="'._('Previous').'" /></td>
+ <td style="text-align:center" colspan="6"><input name="SelectingOrderItems" type="hidden" value="1" /><input tabindex="'. strval($j+8).'" type="submit" value="'._('Add to Sales Order').'" /></td>
+ <td><input name="NextList" type="hidden" value="'.strval($Offset+1).'" /><input tabindex="'.strval($j+9).'" name="Next" type="submit" value="'._('Next').'" /></td>
</tr>
</table>
</div>';
@@ -1783,10 +1804,10 @@
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier .
'" method="post" name="deleteform">';
echo '<div>';
- echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
+ echo '<input name="FormID" type="hidden" value="' . $_SESSION['FormID'] . '" />
<br />
<div class="centre">
- <input type="submit" name="CancelOrder" value="' . _('Cancel Whole Order') . '" onclick="return confirm(\'' . _('Are you sure you wish to cancel this entire order?') . '\');" />
+ <input name="CancelOrder" type="submit" value="' . _('Cancel Whole Order') . '" onclick="return confirm(\'' . _('Are you sure you wish to cancel this entire order?') . '\');" />
</div>
</form>';
}
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-01-20 08:04:05 UTC (rev 7089)
+++ trunk/doc/Change.log 2015-01-20 13:44:18 UTC (rev 7090)
@@ -1,5 +1,6 @@
webERP Change Log
+20/01/15 RChacon: Add translation for transaction type, script ID, manual references, class="number" to columns.
20/1/15 Exson: Remove die() function from Suppliers.php which will make adding or updating suppliers' data failed when google map is activated. Reported by Terry.
17/01/15 RChacon: Fix Czech language code, add info for Croatian language, add the script name and revision number and sort by language code.
16/01/15 RChacon: Standardise RevisionTranslations.php's titles to Stocks.php's titles.
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 2015-01-20 08:04:05 UTC (rev 7089)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2015-01-20 13:44:18 UTC (rev 7090)
@@ -8,7 +8,7 @@
"Project-Id-Version: webERP 4.11.5\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-01-17 17:09-0600\n"
-"PO-Revision-Date: 2015-01-17 09:03-0600\n"
+"PO-Revision-Date: 2015-01-19 16:08-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: TecnoSoluciones.com <web...@te...>\n"
"Language: es_ES\n"
@@ -6981,7 +6981,7 @@
#: CounterSales.php:950
msgid "Amount Paid"
-msgstr "Cantidad Pagada"
+msgstr "Monto pagado"
#: CounterSales.php:951
msgid ""
@@ -8529,7 +8529,7 @@
#: CustomerAllocations.php:51
msgid "Amount entered was negative"
-msgstr "Se indicó una cantidad negativa"
+msgstr "Monto ingresado fue negativo"
#: CustomerAllocations.php:51
msgid "Only positive amounts are allowed"
@@ -8608,7 +8608,7 @@
#: CustomerAllocations.php:371
msgid "Amount in customer currency"
-msgstr "Importe en la moneda del cliente"
+msgstr "Monto en la moneda del cliente"
#: CustomerAllocations.php:371 SupplierAllocations.php:443
msgid "converted into local currency at an exchange rate of"
@@ -9460,7 +9460,7 @@
#: api/api_xml-rpc.php:2493 api/api_xml-rpc.php:2529 api/api_xml-rpc.php:2575
#: api/api_xml-rpc.php:2771 api/api_xml-rpc.php:3048
msgid "Stock ID"
-msgstr "ID de Existencia"
+msgstr "ID de existencia"
#: CustomerPurchases.php:78
msgid "Transaction No."
@@ -9469,15 +9469,15 @@
#: CustomerPurchases.php:79 SelectOrderItems.php:696
#: StockLocTransferReceive.php:343
msgid "From Location"
-msgstr "Desde Ubicación"
+msgstr "Desde ubicación"
#: CustomerPurchases.php:83
msgid "Amount of Sale"
-msgstr "Importe de venta"
+msgstr "Monto de la venta"
#: CustomerPurchases.php:109
msgid "Return to customer selection screen"
-msgstr ""
+msgstr "Volver a la pantalla de selección del cliente"
#: CustomerReceipt.php:8
msgid "Receipt Entry"
@@ -9575,7 +9575,7 @@
#: CustomerReceipt.php:277 CustomerReceipt.php:1139
msgid "Amount of Receipt"
-msgstr "Importe del Ingreso"
+msgstr "Monto del recibo"
#: CustomerReceipt.php:301
msgid "Print a Customer Receipt"
@@ -9813,7 +9813,7 @@
#: CustomerReceipt.php:1145 Payments.php:1132
msgid "Amount of Discount"
-msgstr "Descuento"
+msgstr "Monto del descuento"
#: CustomerReceipt.php:1146
msgid "agreed prompt payment discount is"
@@ -10453,7 +10453,7 @@
#: DailyBankTransactions.php:129 DailyBankTransactions.php:131
msgid "Amount in"
-msgstr "Cantidad en"
+msgstr "Monto en"
#: DailyBankTransactions.php:130 DailyBankTransactions.php:132
msgid "Running Total"
@@ -22109,7 +22109,7 @@
#: Payments.php:1125
msgid "Amount of Payment"
-msgstr "Importe del Pago"
+msgstr "Monto del pago"
#: PcAssignCashToTab.php:5
msgid "Assignment of Cash to Petty Cash Tab"
@@ -23625,7 +23625,7 @@
#: PrintCustStatements.php:416
msgid "Amount received was"
-msgstr "La cantidad recibida fue"
+msgstr "el monto recibido fue"
#: PrintCustStatements.php:421
msgid "Please make payments to our account:"
@@ -32499,7 +32499,7 @@
#: SuppContractChgs.php:165
msgid "Amount must be numeric"
-msgstr ""
+msgstr "Monto debe ser numérico"
#: SuppContractChgs.php:165
msgid "Non zero amount"
@@ -33411,7 +33411,7 @@
#: SupplierAllocations.php:441 SupplierInvoice.php:861 SupplierInvoice.php:868
msgid "Amount in supplier currency"
-msgstr "Importe en la moneda del proveedor"
+msgstr "Monto en la moneda del proveedor"
#: SupplierAllocations.php:447
msgid "Transaction total"
|
