Menu
▾
▴
web-erp-svn — SVN commits
This list is closed, nobody may subscribe to it.
| 2011 |
Jan
(14) |
Feb
(42) |
Mar
(56) |
Apr
(60) |
May
(54) |
Jun
(48) |
Jul
(74) |
Aug
(52) |
Sep
(68) |
Oct
(64) |
Nov
(42) |
Dec
(62) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2012 |
Jan
(142) |
Feb
(270) |
Mar
(374) |
Apr
(230) |
May
(214) |
Jun
(116) |
Jul
(234) |
Aug
(66) |
Sep
(120) |
Oct
(16) |
Nov
(17) |
Dec
(41) |
| 2013 |
Jan
(19) |
Feb
(18) |
Mar
(8) |
Apr
(40) |
May
(121) |
Jun
(42) |
Jul
(127) |
Aug
(145) |
Sep
(27) |
Oct
(38) |
Nov
(83) |
Dec
(61) |
| 2014 |
Jan
(33) |
Feb
(35) |
Mar
(59) |
Apr
(41) |
May
(38) |
Jun
(45) |
Jul
(17) |
Aug
(58) |
Sep
(46) |
Oct
(51) |
Nov
(55) |
Dec
(36) |
| 2015 |
Jan
(57) |
Feb
(67) |
Mar
(70) |
Apr
(34) |
May
(32) |
Jun
(11) |
Jul
(3) |
Aug
(17) |
Sep
(16) |
Oct
(13) |
Nov
(30) |
Dec
(30) |
| 2016 |
Jan
(17) |
Feb
(12) |
Mar
(17) |
Apr
(20) |
May
(47) |
Jun
(15) |
Jul
(13) |
Aug
(30) |
Sep
(32) |
Oct
(20) |
Nov
(32) |
Dec
(24) |
| 2017 |
Jan
(16) |
Feb
|
Mar
(11) |
Apr
(11) |
May
(5) |
Jun
(42) |
Jul
(9) |
Aug
(10) |
Sep
(14) |
Oct
(15) |
Nov
(2) |
Dec
(29) |
| 2018 |
Jan
(28) |
Feb
(49) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <rc...@us...> - 2015-08-02 14:56:40
|
Revision: 7330
http://sourceforge.net/p/web-erp/reponame/7330
Author: rchacon
Date: 2015-08-02 14:56:38 +0000 (Sun, 02 Aug 2015)
Log Message:
-----------
Spanish translation minor improvements.
Modified Paths:
--------------
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
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-07-28 01:00:01 UTC (rev 7329)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2015-08-02 14:56:38 UTC (rev 7330)
@@ -8,7 +8,7 @@
"Project-Id-Version: webERP 4.12.2\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-05-17 13:40+1200\n"
-"PO-Revision-Date: 2015-06-25 10:56-0600\n"
+"PO-Revision-Date: 2015-08-02 08:50-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: TecnoSoluciones.com <web...@te...>\n"
"Language: es_ES\n"
@@ -9656,7 +9656,7 @@
#: CustomerReceipt.php:581 includes/MainMenuLinksArray.php:102
msgid "Enter Receipts"
-msgstr "Introducir Ingresos (Cobros)"
+msgstr "Introducir ingresos (cobros)"
#: CustomerReceipt.php:594 SelectCreditItems.php:73
msgid ""
@@ -16394,7 +16394,7 @@
#: InventoryPlanningPrefSupplier.php:75
msgid "4 mths"
-msgstr "Cuatro Meses"
+msgstr "4 meses"
#: InventoryPlanningPrefSupplier.php:77
msgid "Max Mnth"
@@ -18460,7 +18460,7 @@
#: OffersReceived.php:6 OffersReceived.php:100
msgid "Supplier Offers"
-msgstr "Ofertas de proveedores"
+msgstr "Ofertas del proveedor"
#: OffersReceived.php:39
msgid "There are no offers outstanding that you are authorised to deal with"
@@ -19911,7 +19911,7 @@
#: PcTabs.php:118
msgid " already exists"
-msgstr "ya existe"
+msgstr " already exists"
#: PcTabs.php:166
msgid "The Tab record could not be deleted because"
@@ -28703,7 +28703,7 @@
#: SuppPriceList.php:208 SuppPriceList.php:210
#: includes/MainMenuLinksArray.php:191
msgid "Supplier Price List"
-msgstr "Listado de Precios del proveedor"
+msgstr "Lista de precios del proveedor"
#: SelectSupplier.php:182
msgid "Enter a Purchase Order for This Supplier"
@@ -29711,7 +29711,7 @@
#: ShopParameters.php:384
msgid "Bank Transfer Settings"
-msgstr ""
+msgstr "Ajustes de transferencia bancaria"
#: ShopParameters.php:388
msgid "Allow Bank Transfer Payment"
@@ -33110,7 +33110,7 @@
#: SuppFixedAssetChgs.php:71
msgid "Fixed Asset credits on Credit Note"
-msgstr "Créditos de activo fijo en nota de Crédito"
+msgstr "Créditos de activo fijo en nota de crédito"
#: SuppFixedAssetChgs.php:117
msgid ""
@@ -35699,6 +35699,9 @@
"The default theme to use for the login screen and the setup of new users. "
"The users' theme selection will override it."
msgstr ""
+"El tema por defecto a utilizar para la pantalla de inicio de sesión y la "
+"configuración de los usuarios nuevos. Selección de temas de los usuarios lo "
+"anulará."
#: SystemParameters.php:449
msgid "Accounts Receivable/Payable Settings"
@@ -39145,7 +39148,7 @@
#: WorkOrderReceive.php:976 WorkOrderReceive.php:987
msgid "Batch/Lot No"
-msgstr ""
+msgstr "Lote No."
#: WorkOrderReceive.php:1012 includes/PDFWOPageHeader.inc:47
msgid "Received Qty"
@@ -41445,7 +41448,7 @@
#: Z_ImportCustbranch.php:208 Z_ImportCustbranch.php:331
msgid "characters"
-msgstr ""
+msgstr "caracteres"
#: Z_ImportCustbranch.php:214
msgid "The latitude is expected to be a numeric"
@@ -45315,7 +45318,7 @@
#: includes/MainMenuLinksArray.php:61
msgid "Sales Graphs"
-msgstr "Gráficas de Ventas"
+msgstr "Gráficas de ventas"
#: includes/MainMenuLinksArray.php:62
msgid "Top Sellers Inquiry"
@@ -50336,7 +50339,7 @@
#: ../webSHOP/Checkout.php:390
msgid "Customer Phone"
-msgstr ""
+msgstr "Teléfono del cliente"
#: ../webSHOP/Checkout.php:391
msgid "Customer Email"
@@ -50578,7 +50581,7 @@
#: ../webSHOP/Checkout.php:802
msgid "Change Payment Method"
-msgstr ""
+msgstr "Cambiar forma de pago"
#: ../webSHOP/Checkout.php:807
msgid "Back to Shop Home Page"
|
|
From: <te...@us...> - 2015-07-28 01:00:04
|
Revision: 7329
http://sourceforge.net/p/web-erp/reponame/7329
Author: tehonu
Date: 2015-07-28 01:00:01 +0000 (Tue, 28 Jul 2015)
Log Message:
-----------
Show locations order by locationname
Modified Paths:
--------------
trunk/StockMovements.php
Modified: trunk/StockMovements.php
===================================================================
--- trunk/StockMovements.php 2015-07-27 16:52:54 UTC (rev 7328)
+++ trunk/StockMovements.php 2015-07-28 01:00:01 UTC (rev 7329)
@@ -38,7 +38,12 @@
echo ' ' . _('From Stock Location') . ':<select name="StockLocation"> ';
$sql = "SELECT locations.loccode, locationname FROM locations
- INNER JOIN locationusers ON locationusers.loccode=locations.loccode AND locationusers.userid='" . $_SESSION['UserID'] . "' AND locationusers.canview=1";
+ INNER JOIN locationusers
+ ON locationusers.loccode=locations.loccode
+ AND locationusers.userid='" . $_SESSION['UserID'] . "'
+ AND locationusers.canview=1
+ ORDER BY locationname
+ ";
$resultStkLocs = DB_query($sql);
while ($myrow=DB_fetch_array($resultStkLocs)){
|
|
From: <rc...@us...> - 2015-07-27 16:52:56
|
Revision: 7328
http://sourceforge.net/p/web-erp/reponame/7328
Author: rchacon
Date: 2015-07-27 16:52:54 +0000 (Mon, 27 Jul 2015)
Log Message:
-----------
In Payments.php, move currency tags near currency rates.
Modified Paths:
--------------
trunk/Payments.php
trunk/doc/Change.log
Modified: trunk/Payments.php
===================================================================
--- trunk/Payments.php 2015-07-26 00:38:24 UTC (rev 7327)
+++ trunk/Payments.php 2015-07-27 16:52:54 UTC (rev 7328)
@@ -1,6 +1,6 @@
<?php
-
/* $Id$*/
+/* Entry of bank account payments either against an AP account or a general ledger payment - if the AP-GL link in company preferences is set */
include('includes/DefinePaymentClass.php');
include('includes/session.inc');
@@ -488,7 +488,7 @@
$DbgMsg = _('Cannot update the supplier record for the date of the last payment made using the SQL');
$result = DB_query($SQL,$ErrMsg,$DbgMsg,true);
- $_SESSION['PaymentDetail' . $identifier]->Narrative = $_SESSION['PaymentDetail' . $identifier]->SupplierID . '-' . $_SESSION['PaymentDetail' . $identifier]->Narrative;
+ $_SESSION['PaymentDetail' . $identifier]->Narrative = $_SESSION['PaymentDetail' . $identifier]->SupplierID . ' - ' . $_SESSION['PaymentDetail' . $identifier]->Narrative;
if ($_SESSION['CompanyRecord']['gllink_creditors']==1){ /* then do the supplier control GLTrans */
/* Now debit creditors account with payment + discount */
@@ -860,39 +860,39 @@
if (!isset($_POST['FunctionalExRate'])){
$_POST['FunctionalExRate']=1;
}
-if ($_SESSION['PaymentDetail' . $identifier]->AccountCurrency!=$_SESSION['PaymentDetail' . $identifier]->Currency AND isset($_SESSION['PaymentDetail' . $identifier]->AccountCurrency)){
- if (isset($SuggestedExRate)){
- $SuggestedExRateText = '<b>' . _('Suggested rate:') . ' ' . locale_number_format($SuggestedExRate,8) . '</b>';
- } else {
- $SuggestedExRateText ='';
- }
- if ($_POST['ExRate']==1 AND isset($SuggestedExRate)){
+if($_SESSION['PaymentDetail' . $identifier]->AccountCurrency != $_SESSION['PaymentDetail' . $identifier]->Currency AND isset($_SESSION['PaymentDetail' . $identifier]->AccountCurrency)) {
+ if($_POST['ExRate']==1 AND isset($SuggestedExRate)) {
$_POST['ExRate'] = locale_number_format($SuggestedExRate,8);
- }elseif($_POST['Currency'] != $_POST['PreviousCurrency'] and isset($SuggestedExRate)){
+ } elseif($_POST['Currency'] != $_POST['PreviousCurrency'] AND isset($SuggestedExRate)) {
$_POST['ExRate'] = locale_number_format($SuggestedExRate,8);
+ }
+ if(isset($SuggestedExRate)) {
+ $SuggestedExRateText = '<b>' . _('Suggested rate:') . ' 1 ' . $_SESSION['PaymentDetail' . $identifier]->AccountCurrency . ' = ' . locale_number_format($SuggestedExRate,8) . ' ' . $_SESSION['PaymentDetail' . $identifier]->Currency . '</b>';
+ } else {
+ $SuggestedExRateText = '1 ' . $_SESSION['PaymentDetail' . $identifier]->AccountCurrency . ' = ? ' . $_SESSION['PaymentDetail' . $identifier]->Currency;
}
echo '<tr>
- <td>' . _('Payment Exchange Rate') . ':</td>
- <td><input class="number" maxlength="12" name="ExRate" size="14" title="' . _('The exchange rate between the currency of the bank account currency and the currency of the payment') . '" type="text" value="' . $_POST['ExRate'] . '" /></td>
- <td>' . $SuggestedExRateText . ' <i>' . _('The exchange rate between the currency of the bank account currency and the currency of the payment') . '. 1 ' . $_SESSION['PaymentDetail' . $identifier]->AccountCurrency . ' = ? ' . $_SESSION['PaymentDetail' . $identifier]->Currency . '</i></td>
+ <td>', _('Payment Exchange Rate'), ':</td>
+ <td><input class="number" maxlength="12" name="ExRate" size="14" title="', _('The exchange rate between the currency of the bank account currency and the currency of the payment'), '" type="text" value="', $_POST['ExRate'], '" /></td>
+ <td>', $SuggestedExRateText, '. <i>', _('The exchange rate between the currency of the bank account currency and the currency of the payment'), '.</i></td>
</tr>';
}
-if ($_SESSION['PaymentDetail' . $identifier]->AccountCurrency!=$_SESSION['CompanyRecord']['currencydefault']
- AND isset($_SESSION['PaymentDetail' . $identifier]->AccountCurrency)){
- if (isset($SuggestedFunctionalExRate)){
- $SuggestedFunctionalExRateText = '<b>' . _('Suggested rate:') . ' ' . locale_number_format($SuggestedFunctionalExRate,8) . '</b>';
+if($_SESSION['PaymentDetail' . $identifier]->AccountCurrency != $_SESSION['CompanyRecord']['currencydefault'] AND isset($_SESSION['PaymentDetail' . $identifier]->AccountCurrency)) {
+ if($_POST['FunctionalExRate']==1 AND isset($SuggestedFunctionalExRate)) {
+ $_POST['FunctionalExRate'] = locale_number_format($SuggestedFunctionalExRate,'Variable');
+ }
+
+ if(isset($SuggestedFunctionalExRate)) {
+ $SuggestedFunctionalExRateText = '<b>' . _('Suggested rate:') . ' 1 ' . $_SESSION['CompanyRecord']['currencydefault'] . ' = ' . locale_number_format($SuggestedFunctionalExRate,8) . ' ' . $_SESSION['PaymentDetail' . $identifier]->AccountCurrency . '</b>';
} else {
- $SuggestedFunctionalExRateText ='';
+ $SuggestedFunctionalExRateText = '1 ' . $_SESSION['CompanyRecord']['currencydefault'] . ' = ? ' . $_SESSION['PaymentDetail' . $identifier]->AccountCurrency;
}
- if ($_POST['FunctionalExRate']==1 AND isset($SuggestedFunctionalExRate)){
- $_POST['FunctionalExRate'] = locale_number_format($SuggestedFunctionalExRate,'Variable');
- }
echo '<tr>
- <td>' . _('Functional Exchange Rate') . ':</td>
- <td><input class="number" maxlength="12" name="FunctionalExRate" size="14" title="' . _('The exchange rate between the currency of the business (the functional currency) and the currency of the bank account') . '" type="text" value="' . $_POST['FunctionalExRate'] . '" /></td>
- <td>' . ' ' . $SuggestedFunctionalExRateText . ' <i>' . _('The exchange rate between the currency of the business (the functional currency) and the currency of the bank account') . '. 1 ' . $_SESSION['CompanyRecord']['currencydefault'] . ' = ? ' . $_SESSION['PaymentDetail' . $identifier]->AccountCurrency . '</i></td>
+ <td>', _('Functional Exchange Rate'), ':</td>
+ <td><input class="number" maxlength="12" name="FunctionalExRate" size="14" title="', _('The exchange rate between the currency of the business (the functional currency) and the currency of the bank account'), '" type="text" value="', $_POST['FunctionalExRate'], '" /></td>
+ <td>', $SuggestedFunctionalExRateText, '. <i>', _('The exchange rate between the currency of the business (the functional currency) and the currency of the bank account'), '.</i></td>
</tr>';
}
echo '<tr>
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-07-26 00:38:24 UTC (rev 7327)
+++ trunk/doc/Change.log 2015-07-27 16:52:54 UTC (rev 7328)
@@ -1,5 +1,6 @@
webERP Change Log
+27/07/15 RChacon: In Payments.php, move currency tags near currency rates.
20/06/15 RChacon: In header.inc, add meta tag to keep relationship between CSS pixels and device pixels.
19/06/15 : Kif (from webERP Chinese Community QQ group) fixed the menu cannot show completely on mobile phone in xenos/default.css.
04/06/15 TurboPT: Currencies.php: Add closing select, td and tr tags to complete last table row.
|
|
From: <rc...@us...> - 2015-07-26 00:38:26
|
Revision: 7327
http://sourceforge.net/p/web-erp/reponame/7327
Author: rchacon
Date: 2015-07-26 00:38:24 +0000 (Sun, 26 Jul 2015)
Log Message:
-----------
Spanish translation improvements.
Modified Paths:
--------------
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
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-06-28 01:09:00 UTC (rev 7326)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2015-07-26 00:38:24 UTC (rev 7327)
@@ -8,7 +8,7 @@
"Project-Id-Version: webERP 4.12.2\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-05-17 13:40+1200\n"
-"PO-Revision-Date: 2015-06-22 11:30-0600\n"
+"PO-Revision-Date: 2015-06-25 10:56-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: TecnoSoluciones.com <web...@te...>\n"
"Language: es_ES\n"
@@ -3977,7 +3977,7 @@
#: ConfirmDispatch_Invoice.php:280
msgid "Confirm Dispatch and Invoice"
-msgstr "Confirmar nota de Entrega y Factura"
+msgstr "Confirmar despacho y factura"
#: ConfirmDispatch_Invoice.php:283 Contracts.php:778 CustItem.php:144
#: CustLoginSetup.php:32 CustomerAllocations.php:345
@@ -11026,7 +11026,7 @@
#: DeliveryDetails.php:615
msgid "Confirm Dispatch and Produce Invoice"
-msgstr "Confirmar la nota de Entrega y Generar Factura"
+msgstr "Confirmar entrega y generar factura"
#: DeliveryDetails.php:625 DeliveryDetails.php:815
msgid "Print Quotation (Landscape)"
@@ -11140,7 +11140,7 @@
#: DeliveryDetails.php:1046
msgid "Estimated Delivery Date"
-msgstr "Fecha de Entrega Estimada"
+msgstr "Fecha estimada de entrega"
#: DeliveryDetails.php:1047
msgid "Enter the estimated delivery date requested by the customer"
@@ -11148,11 +11148,11 @@
#: DeliveryDetails.php:1051 SelectSalesOrder.php:721
msgid "Quote Date"
-msgstr "Fecha de la Oferta"
+msgstr "Fecha de cotización"
#: DeliveryDetails.php:1056
msgid "Confirmed Order Date"
-msgstr "Fecha de Pedido Confirmado"
+msgstr "Fecha confirmada de pedido"
#: DeliveryDetails.php:1060
msgid "Delivery Address 1 (Street)"
@@ -34968,7 +34968,7 @@
#: SupplierTenders.php:145
msgid "Confirm and Send Email"
-msgstr "Confirmar y Enviar E-mail"
+msgstr "Confirmar y enviar correo-e"
#: SupplierTenders.php:148
msgid "Cancel Offer"
@@ -50379,7 +50379,7 @@
#: ../webSHOP/Checkout.php:519
msgid "Confirm Delivery Address"
-msgstr ""
+msgstr "Confirmar dirección de entrega"
#: ../webSHOP/Checkout.php:523
msgid "Delivery Address - Building/Number"
@@ -50451,7 +50451,7 @@
#: ../webSHOP/Checkout.php:591
msgid "Confirm Delivery Details"
-msgstr ""
+msgstr "Confirmar detalles de entrega"
#: ../webSHOP/Checkout.php:607
msgid "Revise Delivery Address"
@@ -50541,7 +50541,7 @@
#: ../webSHOP/Checkout.php:762 ../webSHOP/Checkout.php:774
msgid "Confirm and Place Order"
-msgstr ""
+msgstr "Confirmar y colocar pedido"
#: ../webSHOP/Checkout.php:766
msgid "Thank you for purchasing from us. Please note the order number"
|
|
From: <dai...@us...> - 2015-06-28 01:09:02
|
Revision: 7326
http://sourceforge.net/p/web-erp/reponame/7326
Author: daintree
Date: 2015-06-28 01:09:00 +0000 (Sun, 28 Jun 2015)
Log Message:
-----------
added narrative to explain the SessionSavePath config.php parameter
Modified Paths:
--------------
trunk/config.distrib.php
trunk/doc/Manual/ManualGettingStarted.html
Modified: trunk/config.distrib.php
===================================================================
--- trunk/config.distrib.php 2015-06-25 13:54:40 UTC (rev 7325)
+++ trunk/config.distrib.php 2015-06-28 01:09:00 UTC (rev 7326)
@@ -74,8 +74,10 @@
//The maximum time that a script can execute for before the web-server should terminate it
$MaximumExecutionTime =120;
-//The path to which session files should be stored in the server - useful for some multi-host web servers
-//this can be left commented out
+/*The path to which session files should be stored in the server - useful for some multi-host web servers where pages are serviced using load balancing servers - when the load picks a different server then the session can be lost unless this option is used - which tells the server explicitly where to find the session file.
+It is also useful where there are several webERP installs where the code is in two different paths on the same server and being used by the same client browser. It is possible in this scenario for the session to be over-written by the two different webERP installations. The solution is to specify different $SessionSavePath in each installations config.php
+If there is only one installation of webERP on the web-server - which can be used with many company databases (and there is no load balancing difficulties to circumvent then this can be left commented out
+*/
//$SessionSavePath = '/tmp';
//Setting to 12 or 24 determines the format of the clock display at the end of all screens
Modified: trunk/doc/Manual/ManualGettingStarted.html
===================================================================
--- trunk/doc/Manual/ManualGettingStarted.html 2015-06-25 13:54:40 UTC (rev 7325)
+++ trunk/doc/Manual/ManualGettingStarted.html 2015-06-28 01:09:00 UTC (rev 7326)
@@ -236,8 +236,12 @@
//The maximum time that a script can execute for before the web-server should terminate it
$MaximumExecutionTime =120;
- //The path to which session files should be stored in the server - useful for some multi-host web servers
- //this can be left commented out
+ /*The path to which session files should be stored in the server - useful for some multi-host web servers where pages are serviced using load balancing servers - when the load picks a different server then the session can be lost unless this option is used - which tells the server explicitly where to find the session file.
+ It is also useful where there are several webERP installs where the code is in two different paths on the same server and being used by the same client browser. It is possible in this scenario for the session to be over-written by the two different webERP installations. The solution is to specify different $SessionSavePath in each installations config.php
+
+ If there is only one installation of webERP on the web-server - which can be used with many company databases (and there is no load balancing difficulties to circumvent then this can be left commented out
+
+ */
//$SessionSavePath = '/tmp';
// which encryption function should be used
|
|
From: <rc...@us...> - 2015-06-25 13:54:42
|
Revision: 7325
http://sourceforge.net/p/web-erp/reponame/7325
Author: rchacon
Date: 2015-06-25 13:54:40 +0000 (Thu, 25 Jun 2015)
Log Message:
-----------
Spanish translation improvements.
Modified Paths:
--------------
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
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-06-20 14:49:56 UTC (rev 7324)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2015-06-25 13:54:40 UTC (rev 7325)
@@ -8,7 +8,7 @@
"Project-Id-Version: webERP 4.12.2\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-05-17 13:40+1200\n"
-"PO-Revision-Date: 2015-06-04 09:54-0600\n"
+"PO-Revision-Date: 2015-06-22 11:30-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: TecnoSoluciones.com <web...@te...>\n"
"Language: es_ES\n"
@@ -16176,7 +16176,7 @@
#: StockLocStatus.php:66 SupplierPriceList.php:17 SupplierTenderCreate.php:678
#: SupplierTenders.php:403 TopItems.php:64
msgid "In Stock Category"
-msgstr "Clase de Artículo"
+msgstr "En categoría de inventario"
#: InternalStockRequest.php:333 InternalStockRequest.php:335
msgid "All Authorized"
@@ -31549,7 +31549,7 @@
#: StockLocStatus.php:86
msgid "Shown Only Items Where"
-msgstr "Mostrar Elementos Únicamente Donde"
+msgstr "Mostrar solo artículos donde"
#: StockLocStatus.php:93 StockLocStatus.php:98 StockLocStatus.php:103
#: StockLocStatus.php:108
@@ -32582,7 +32582,7 @@
#: StockStatus.php:98
msgid "In Transit"
-msgstr "En Tránsito"
+msgstr "En tránsito"
#: StockStatus.php:169
msgid "The workorder component demand for this product from"
|
|
From: <rc...@us...> - 2015-06-20 14:49:59
|
Revision: 7324
http://sourceforge.net/p/web-erp/reponame/7324
Author: rchacon
Date: 2015-06-20 14:49:56 +0000 (Sat, 20 Jun 2015)
Log Message:
-----------
Add meta tag to keep relationship between CSS pixels and device pixels.
Modified Paths:
--------------
trunk/doc/Change.log
trunk/includes/header.inc
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-06-19 11:43:05 UTC (rev 7323)
+++ trunk/doc/Change.log 2015-06-20 14:49:56 UTC (rev 7324)
@@ -1,9 +1,10 @@
webERP Change Log
+20/06/15 RChacon: In header.inc, add meta tag to keep relationship between CSS pixels and device pixels.
19/06/15 : Kif (from webERP Chinese Community QQ group) fixed the menu cannot show completely on mobile phone in xenos/default.css.
04/06/15 TurboPT: Currencies.php: Add closing select, td and tr tags to complete last table row.
27/05/15 Thumb: Fix error_reporting() bug change && to & in install/index.php.
-25/5/15 Tom Barry: SupplierInquiry.php moved SQL to get the users authorisation to put supplier invoices on hold outside the loop to avoid unecessary round trips to the SQL server
+25/5/15 Tom Barry: SupplierInquiry.php moved SQL to get the users authorisation to put supplier invoices on hold outside the loop to avoid unecessary round trips to the SQL server
21/5/15 RChacon: Adjust CustomerAccount.php for direct printing.
19/5/15 RChacon: Add documentation and help for users in Locations.php and ManualInventory.html.
Modified: trunk/includes/header.inc
===================================================================
--- trunk/includes/header.inc 2015-06-19 11:43:05 UTC (rev 7323)
+++ trunk/includes/header.inc 2015-06-20 14:49:56 UTC (rev 7324)
@@ -3,8 +3,8 @@
// Titles and screen header
// Needs the file config.php loaded where the variables are defined for
- // $RootPath
- // $Title - should be defined in the page this file is included with
+ // $RootPath
+ // $Title - should be defined in the page this file is included with
if (!isset($RootPath)){
$RootPath = dirname(htmlspecialchars($_SERVER['PHP_SELF']));
if ($RootPath == '/' OR $RootPath == "\\") {
@@ -26,32 +26,31 @@
if($Title == _('Copy a BOM to New Item Code')){//solve the cannot modify heaer information in CopyBOM.php scritps
ob_start();
}
- echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">';
+ echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">',
+ '<html xmlns="http://www.w3.org/1999/xhtml">',
- echo '<html xmlns="http://www.w3.org/1999/xhtml"><head><title>' . $Title . '</title>';
- echo '<link rel="shortcut icon" href="'. $RootPath.'/favicon.ico" />';
- echo '<link rel="icon" href="' . $RootPath.'/favicon.ico" />';
+ '<head>',
+ '<link rel="icon" href="', $RootPath, '/favicon.ico" />',
+ '<link rel="shortcut icon" href="', $RootPath, '/favicon.ico" />';
if ($StrictXHTML) {
echo '<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=utf-8" />';
} else {
echo '<meta http-equiv="Content-Type" content="application/html; charset=utf-8" />';
}
- echo '<link href="' . $RootPath . '/css/print.css" rel="stylesheet" type="text/css" media="print" />';
- echo '<link href="' . $RootPath . '/css/'. $_SESSION['Theme'] .'/default.css" rel="stylesheet" type="text/css" media="screen"/>';
- echo '<script type="text/javascript" src = "'.$RootPath.'/javascripts/MiscFunctions.js"></script>';
- echo '</head>';
- echo '<body>';
+ echo '<link href="', $RootPath, '/css/print.css" rel="stylesheet" type="text/css" media="print" />',
+ '<link href="', $RootPath, '/css/', $_SESSION['Theme'], '/default.css" rel="stylesheet" type="text/css" media="screen"/>',
+/* '<meta name="viewport" content="width=device-width, initial-scale=1">',//To tell the small device that the website is a responsive site (keep relationship between CSS pixels and device pixels).*/
+ '<script type="text/javascript" src="', $RootPath, '/javascripts/MiscFunctions.js"></script>',
+ '<title>', $Title, '</title>',
+ '</head>',
- echo '<div id="CanvasDiv">';
- echo '<input type="hidden" name="Lang" id="Lang" value="'.$Lang.'" />';
- echo '<div id="HeaderDiv">';
- echo '<div id="HeaderWrapDiv">';
+ '<body>',
+ '<div id="CanvasDiv">',
+ '<input type="hidden" name="Lang" id="Lang" value="', $Lang, '" />',
+ '<div id="HeaderDiv">',
+ '<div id="HeaderWrapDiv">';
-
if (isset($Title)) {
-
-
echo '<div id="AppInfoDiv">'; //===HJ===
echo '<div id="AppInfoCompanyDiv">';
echo '<img alt="'._('Company').'" src="'.$RootPath.'/css/'.$Theme.'/images/company.png" title="'._('Company').'" />' . stripslashes($_SESSION['CompanyRecord']['coyname']);
@@ -92,9 +91,9 @@
echo '</ul></div>'; // QuickMenuDiv
}
- echo '</div>'; // HeaderWrapDiv
- echo '</div>'; // Headerdiv
- echo '<div id="BodyDiv">';
- echo '<div id="BodyWrapDiv">';
+ echo '</div>',// Close HeaderWrapDiv
+ '</div>',// Close Headerdiv
+ '<div id="BodyDiv">',
+ '<div id="BodyWrapDiv">';
-?>
\ No newline at end of file
+?>
|
|
From: <ex...@us...> - 2015-06-19 11:43:07
|
Revision: 7323
http://sourceforge.net/p/web-erp/reponame/7323
Author: exsonqu
Date: 2015-06-19 11:43:05 +0000 (Fri, 19 Jun 2015)
Log Message:
-----------
Modified Paths:
--------------
trunk/doc/Change.log
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-06-19 11:42:21 UTC (rev 7322)
+++ trunk/doc/Change.log 2015-06-19 11:43:05 UTC (rev 7323)
@@ -1,5 +1,6 @@
webERP Change Log
+19/06/15 : Kif (from webERP Chinese Community QQ group) fixed the menu cannot show completely on mobile phone in xenos/default.css.
04/06/15 TurboPT: Currencies.php: Add closing select, td and tr tags to complete last table row.
27/05/15 Thumb: Fix error_reporting() bug change && to & in install/index.php.
25/5/15 Tom Barry: SupplierInquiry.php moved SQL to get the users authorisation to put supplier invoices on hold outside the loop to avoid unecessary round trips to the SQL server
|
|
From: <ex...@us...> - 2015-06-19 11:42:24
|
Revision: 7322
http://sourceforge.net/p/web-erp/reponame/7322
Author: exsonqu
Date: 2015-06-19 11:42:21 +0000 (Fri, 19 Jun 2015)
Log Message:
-----------
19/06/15 : Kif (from webERP Chinese Community QQ group) fixed the menu cannot show completely on mobile phone in xenos/default.css.
Modified Paths:
--------------
trunk/css/xenos/default.css
Modified: trunk/css/xenos/default.css
===================================================================
--- trunk/css/xenos/default.css 2015-06-14 03:38:33 UTC (rev 7321)
+++ trunk/css/xenos/default.css 2015-06-19 11:42:21 UTC (rev 7322)
@@ -358,7 +358,8 @@
/*** HEADER ***/
#HeaderDiv {
- overflow:hidden; /* REQUIRED: height according to items contained */
+ /*
+ overflow:hidden; REQUIRED: height according to items contained */
color:#333333;
font-weight:bold;
padding-left:3px;
|
|
From: <te...@us...> - 2015-06-14 03:38:35
|
Revision: 7321
http://sourceforge.net/p/web-erp/reponame/7321
Author: tehonu
Date: 2015-06-14 03:38:33 +0000 (Sun, 14 Jun 2015)
Log Message:
-----------
Modified Paths:
--------------
trunk/DeliveryDetails.php
Modified: trunk/DeliveryDetails.php
===================================================================
--- trunk/DeliveryDetails.php 2015-06-13 03:43:34 UTC (rev 7320)
+++ trunk/DeliveryDetails.php 2015-06-14 03:38:33 UTC (rev 7321)
@@ -1020,7 +1020,8 @@
ON locationusers.loccode=locations.loccode
AND locationusers.userid='" . $_SESSION['UserID'] . "'
AND locationusers.canupd=1
- WHERE locations.allowinvoicing='1'";
+ WHERE locations.allowinvoicing='1'
+ ORDER BY locations.locationname";
$ErrMsg = _('The stock locations could not be retrieved');
$DbgMsg = _('SQL used to retrieve the stock locations was') . ':';
$StkLocsResult = DB_query($SQL, $ErrMsg, $DbgMsg);
|
|
From: <te...@us...> - 2015-06-13 03:43:35
|
Revision: 7320
http://sourceforge.net/p/web-erp/reponame/7320
Author: tehonu
Date: 2015-06-13 03:43:34 +0000 (Sat, 13 Jun 2015)
Log Message:
-----------
Use of company decimal numbers instead of fixed decimal numbers
Modified Paths:
--------------
trunk/Z_CheckGLTransBalance.php
Modified: trunk/Z_CheckGLTransBalance.php
===================================================================
--- trunk/Z_CheckGLTransBalance.php 2015-06-11 09:49:54 UTC (rev 7319)
+++ trunk/Z_CheckGLTransBalance.php 2015-06-13 03:43:34 UTC (rev 7320)
@@ -17,18 +17,19 @@
echo $Header;
$sql = "SELECT gltrans.type,
- systypes.typename,
- gltrans.typeno,
- periodno,
- SUM(amount) AS nettot
- FROM gltrans,
- systypes
- WHERE gltrans.type = systypes.typeid
- GROUP BY gltrans.type,
- systypes.typename,
- typeno,
- periodno
- HAVING ABS(SUM(amount))>0.01";
+ systypes.typename,
+ gltrans.typeno,
+ periodno,
+ SUM(amount) AS nettot
+ FROM gltrans,
+ systypes
+ WHERE gltrans.type = systypes.typeid
+ GROUP BY gltrans.type,
+ systypes.typename,
+ typeno,
+ periodno
+ HAVING ABS(SUM(amount))>= " . 1/pow(10,$_SESSION['CompanyRecord']['decimalplaces']) . "
+ ORDER BY gltrans.counterindex";
$OutOfWackResult = DB_query($sql);
@@ -47,7 +48,7 @@
<td><a href="' . $RootPath . '/GLTransInquiry.php?TypeID=' . $OutOfWackRow['type'] . '&TransNo=' . $OutOfWackRow['typeno'] . '">' . $OutOfWackRow['typename'] . '</a></td>
<td class="number">' . $OutOfWackRow['typeno'] . '</td>
<td class="number">' . $OutOfWackRow['periodno'] . '</td>
- <td class="number">' . locale_number_format($OutOfWackRow['nettot'],3) . '</td>
+ <td class="number">' . locale_number_format($OutOfWackRow['nettot'],$_SESSION['CompanyRecord']['decimalplaces']) . '</td>
</tr>';
}
|
|
From: <te...@us...> - 2015-06-11 09:49:57
|
Revision: 7319
http://sourceforge.net/p/web-erp/reponame/7319
Author: tehonu
Date: 2015-06-11 09:49:54 +0000 (Thu, 11 Jun 2015)
Log Message:
-----------
Creation of table loctransfercancellations to keep track of cancelled quantities of items in transfers and simplication of code on StocLocTransferReceive.php. More reports on loctransfercancellations will come on the next days.
Modified Paths:
--------------
trunk/StockLocTransferReceive.php
trunk/sql/mysql/upgrade4.12.3-4.13.sql
Modified: trunk/StockLocTransferReceive.php
===================================================================
--- trunk/StockLocTransferReceive.php 2015-06-11 08:13:31 UTC (rev 7318)
+++ trunk/StockLocTransferReceive.php 2015-06-11 09:49:54 UTC (rev 7319)
@@ -67,7 +67,7 @@
$Result = DB_Txn_Begin(); // The Txn should affect the full transfer
foreach ($_SESSION['Transfer']->TransferItem AS $TrfLine) {
- if($TrfLine->Quantity >0) {
+ if($TrfLine->Quantity >= 0) {
/* Need to get the current location quantity will need it later for the stock movement */
$SQL="SELECT locstock.quantity
@@ -393,6 +393,7 @@
prnMsg(_('A stock transfer for item code'). ' - ' . $TrfLine->StockID . ' ' . $TrfLine->ItemDescription . ' '. _('has been created from').' ' . $_SESSION['Transfer']->StockLocationFromName . ' '. _('to'). ' ' . $_SESSION['Transfer']->StockLocationToName . ' ' . _('for a quantity of'). ' '. $TrfLine->Quantity,'success');
if($TrfLine->CancelBalance==1) {
+ RecordItemCancelledInTransfer($_SESSION['Transfer']->TrfID, $TrfLine->StockID, $TrfLine->Quantity);
$sql = "UPDATE loctransfers SET recqty = recqty + '". round($TrfLine->Quantity, $TrfLine->DecimalPlaces) . "',
shipqty = recqty + '". round($TrfLine->Quantity, $TrfLine->DecimalPlaces) . "',
recdate = '".Date('Y-m-d H:i:s'). "'
@@ -408,13 +409,8 @@
$Result = DB_query($sql, $ErrMsg, $DbgMsg, true);
unset ($_SESSION['Transfer']->LineItem[$i]);
unset ($_POST['Qty' . $i]);
- } /*end if Quantity > 0 */
+ } /*end if Quantity >= 0 */
if($TrfLine->CancelBalance==1) {
- $sql = "UPDATE loctransfers SET shipqty = recqty
- WHERE reference = '". $_SESSION['Transfer']->TrfID . "'
- AND stockid = '". $TrfLine->StockID."'";
- $ErrMsg = _('CRITICAL ERROR') . '! ' . _('Unable to set the quantity received to the quantity shipped to cancel the balance on this transfer line');
- $Result = DB_query($sql, $ErrMsg, $DbgMsg, true);
// send an email to the inventory manager about this cancellation (as can lead to employee fraud)
if($_SESSION['InventoryManagerEmail']!='') {
$ConfirmationText = _('Cancelled balance of transfer'). ': ' . $_SESSION['Transfer']->TrfID .
@@ -686,4 +682,25 @@
</form>';
}
include('includes/footer.inc');
+
+function RecordItemCancelledInTransfer($TransferReference, $StockID, $CancelQty){
+ $SQL = "INSERT INTO loctransfercancellations (
+ reference,
+ stockid,
+ cancelqty,
+ canceldate,
+ canceluserid)
+ VALUES ('" . $TransferReference . "',
+ '" . $StockID . "',
+ (SELECT (l2.shipqty-l2.recqty)
+ FROM loctransfers AS l2
+ WHERE l2.reference = '" . $TransferReference . "'
+ AND l2.stockid ='" . $StockID . "') - " . $CancelQty . ",
+ '" . Date('Y-m-d H:i:s') . "',
+ '" . $_SESSION['UserID'] . "')";
+ $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The transfer cancellation record could not be inserted because');
+ $DbgMsg = _('The following SQL to insert records was used');
+ $Result = DB_query($SQL, $ErrMsg, $DbgMsg, true);
+
+}
?>
\ No newline at end of file
Modified: trunk/sql/mysql/upgrade4.12.3-4.13.sql
===================================================================
--- trunk/sql/mysql/upgrade4.12.3-4.13.sql 2015-06-11 08:13:31 UTC (rev 7318)
+++ trunk/sql/mysql/upgrade4.12.3-4.13.sql 2015-06-11 09:49:54 UTC (rev 7319)
@@ -1,4 +1,11 @@
+CREATE TABLE `loctransfercancellations` (
+ `reference` INT(11) NOT NULL ,
+ `stockid` VARCHAR(20) NOT NULL ,
+ `cancelqty` DOUBLE NOT NULL ,
+ `canceldate` DATETIME NOT NULL ,
+ `canceluserid` VARCHAR(20) NOT NULL ) ENGINE = InnoDB;
+ALTER TABLE `loctransfercancellations` ADD INDEX `Index1` (`reference`, `stockid`) COMMENT '';
+ALTER TABLE `loctransfercancellations` ADD INDEX `Index2` (`canceldate`, `reference`, `stockid`) COMMENT '';
-
-- Update version number:
UPDATE config SET confvalue='4.13' WHERE confname='VersionNumber';
|
|
From: <te...@us...> - 2015-06-11 08:13:33
|
Revision: 7318
http://sourceforge.net/p/web-erp/reponame/7318
Author: tehonu
Date: 2015-06-11 08:13:31 +0000 (Thu, 11 Jun 2015)
Log Message:
-----------
Set the DB-Txn_begin() at correct place to take care of all the items in the Transfer and simplify redundant code conditions
Modified Paths:
--------------
trunk/StockLocTransferReceive.php
Modified: trunk/StockLocTransferReceive.php
===================================================================
--- trunk/StockLocTransferReceive.php 2015-06-05 03:28:26 UTC (rev 7317)
+++ trunk/StockLocTransferReceive.php 2015-06-11 08:13:31 UTC (rev 7318)
@@ -64,9 +64,10 @@
if(!$InputError) {
/*All inputs must be sensible so make the stock movement records and update the locations stocks */
+ $Result = DB_Txn_Begin(); // The Txn should affect the full transfer
+
foreach ($_SESSION['Transfer']->TransferItem AS $TrfLine) {
- if($TrfLine->Quantity >=0) {
- $Result = DB_Txn_Begin();
+ if($TrfLine->Quantity >0) {
/* Need to get the current location quantity will need it later for the stock movement */
$SQL="SELECT locstock.quantity
@@ -197,10 +198,8 @@
$QtyOnHandPrior = 0;
}
-// COMMENT: "if($TrfLine->Quantity !=0) {}" should be as a general condition to avoid transactions in zero.
-
// Insert outgoing inventory GL transaction if any of the locations has a GL account code:
- if(($_SESSION['Transfer']->StockLocationFromAccount !='' or $_SESSION['Transfer']->StockLocationToAccount !='') and $TrfLine->Quantity !=0) {
+ if(($_SESSION['Transfer']->StockLocationFromAccount !='' or $_SESSION['Transfer']->StockLocationToAccount !='')) {
// Get the account code:
if($_SESSION['Transfer']->StockLocationFromAccount !='') {
$AccountCode = $_SESSION['Transfer']->StockLocationFromAccount;
@@ -353,7 +352,7 @@
$Result = DB_query($SQL, $ErrMsg, $DbgMsg, true);
// Insert incoming inventory GL transaction if any of the locations has a GL account code:
- if(($_SESSION['Transfer']->StockLocationFromAccount !='' or $_SESSION['Transfer']->StockLocationToAccount !='') and $TrfLine->Quantity !=0) {
+ if(($_SESSION['Transfer']->StockLocationFromAccount !='' or $_SESSION['Transfer']->StockLocationToAccount !='')) {
// Get the account code:
if($_SESSION['Transfer']->StockLocationToAccount !='') {
$AccountCode = $_SESSION['Transfer']->StockLocationToAccount;
|
|
From: <tu...@us...> - 2015-06-05 03:28:29
|
Revision: 7317
http://sourceforge.net/p/web-erp/reponame/7317
Author: turbopt
Date: 2015-06-05 03:28:26 +0000 (Fri, 05 Jun 2015)
Log Message:
-----------
Currencies.php: Add closing select, td and tr tags to complete last table row.
Modified Paths:
--------------
trunk/Currencies.php
trunk/doc/Change.log
Modified: trunk/Currencies.php
===================================================================
--- trunk/Currencies.php 2015-06-04 15:55:47 UTC (rev 7316)
+++ trunk/Currencies.php 2015-06-05 03:28:26 UTC (rev 7317)
@@ -527,7 +527,10 @@
echo '<option value="0">' . _('No') . '</option>';
}
- echo '</table>';
+ echo '</select>
+ </td>
+ </tr>
+ </table>';
echo '<br />
<div class="centre">
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-06-04 15:55:47 UTC (rev 7316)
+++ trunk/doc/Change.log 2015-06-05 03:28:26 UTC (rev 7317)
@@ -1,5 +1,6 @@
webERP Change Log
+04/06/15 TurboPT: Currencies.php: Add closing select, td and tr tags to complete last table row.
27/05/15 Thumb: Fix error_reporting() bug change && to & in install/index.php.
25/5/15 Tom Barry: SupplierInquiry.php moved SQL to get the users authorisation to put supplier invoices on hold outside the loop to avoid unecessary round trips to the SQL server
21/5/15 RChacon: Adjust CustomerAccount.php for direct printing.
|
|
From: <rc...@us...> - 2015-06-04 15:55:50
|
Revision: 7316
http://sourceforge.net/p/web-erp/reponame/7316
Author: rchacon
Date: 2015-06-04 15:55:47 +0000 (Thu, 04 Jun 2015)
Log Message:
-----------
Spanish translation improvements.
Modified Paths:
--------------
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
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-05-27 05:20:33 UTC (rev 7315)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2015-06-04 15:55:47 UTC (rev 7316)
@@ -8,7 +8,7 @@
"Project-Id-Version: webERP 4.12.2\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-05-17 13:40+1200\n"
-"PO-Revision-Date: 2015-05-21 10:54-0600\n"
+"PO-Revision-Date: 2015-06-04 09:54-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: TecnoSoluciones.com <web...@te...>\n"
"Language: es_ES\n"
@@ -545,7 +545,7 @@
#: AccountGroups.php:401
msgid "Enter the account group name"
-msgstr "Introduzca el nombre del grupo de cuentas"
+msgstr "Introducir el nombre del grupo de cuentas"
#: AccountGroups.php:401
msgid ""
@@ -2936,7 +2936,7 @@
#: SelectQASamples.php:280 Shipt_Select.php:174 TestPlanResults.php:158
#: WorkOrderEntry.php:706 WorkOrderIssue.php:737
msgid "Enter extract of the"
-msgstr "Introduzca una parte del"
+msgstr "Introducir una parte del"
#: BOMInquiry.php:29 BOMs.php:899 EmailConfirmation.php:218
#: EmailConfirmation.php:348 InternalStockRequest.php:154
@@ -5326,7 +5326,7 @@
#: ContractBOM.php:327 PO_Items.php:1148 SelectCompletedOrder.php:479
#: SelectCreditItems.php:1001
msgid "Enter text extracts in the description"
-msgstr "Introduzca una parte de la descripción"
+msgstr "Introducir una parte de la descripción"
#: ContractBOM.php:328
msgid ""
@@ -5338,7 +5338,7 @@
#: PO_Items.php:1155 SelectCompletedOrder.php:484 SelectCreditItems.php:1004
#: SelectOrderItems.php:1603 SelectSalesOrder.php:544 SelectWorkOrder.php:206
msgid "Enter extract of the Stock Code"
-msgstr "Introduzca una parte del Código de Existencia"
+msgstr "Introducir una parte del código de inventario"
#: ContractBOM.php:333
msgid ""
@@ -5589,7 +5589,7 @@
"Could not update the work order item record with the total quantity received "
"because"
msgstr ""
-"No se pudo actualizar el registro del Artículo en la Orden de Trabajo con la "
+"No se pudo actualizar el registro del artículo en la Orden de Trabajo con la "
"cantidad total recibida porque"
#: ContractCosting.php:425 WorkOrderIssue.php:365 WorkOrderReceive.php:743
@@ -5682,7 +5682,7 @@
#: ContractOtherReqts.php:171
msgid "Enter New Contract Requirement"
-msgstr "Introducir Nuevo Requerimiento del Contrato"
+msgstr "Introducir nuevo requerimiento del contrato"
#: Contracts.php:9 Contracts.php:832
msgid "Modify Contract"
@@ -6343,7 +6343,7 @@
#: Contracts.php:1066
msgid "Enter Other Requirements"
-msgstr "Introducir Otros Requerimientos"
+msgstr "Introducir otros requerimientos"
#: Contracts.php:1068
msgid "Commit Changes"
@@ -6774,7 +6774,7 @@
#: CounterReturns.php:1659 CounterSales.php:2221 SelectOrderItems.php:1596
msgid "Enter partial Description"
-msgstr "Introduzca una parte de la descripción"
+msgstr "Introducir una parte de la descripción"
#: CounterReturns.php:1667 CounterSales.php:2232 SelectOrderItems.php:1615
msgid "Use Quick Entry"
@@ -7621,7 +7621,7 @@
#: CreditItemsControlled.php:79
msgid "Credit of Controlled Item"
-msgstr "Crédito del Artículo Controlado"
+msgstr "Crédito del artículo Controlado"
#: CreditStatus.php:6
msgid "Credit Status Code Maintenance"
@@ -8339,7 +8339,7 @@
#: CustLoginSetup.php:133
msgid "Enter a userid for this customer login"
-msgstr "Introduzca una identificación de usuario para el acceso este cliente"
+msgstr "Introducir una identificación de usuario para el acceso este cliente"
#: CustLoginSetup.php:150 SMTPServer.php:118 SuppLoginSetup.php:133
#: WWW_Users.php:479 includes/Login.php:99 includes/Login.php:100
@@ -8350,7 +8350,7 @@
#: CustLoginSetup.php:151
msgid "Enter a password for this customer login"
-msgstr "Introduzca una contraseña para el acceso este cliente"
+msgstr "Introducir una contraseña para el acceso este cliente"
#: CustLoginSetup.php:154 SuppLoginSetup.php:137 WWW_Users.php:302
#: WWW_Users.php:483
@@ -8432,7 +8432,7 @@
#: CustomerAccount.php:6
msgid "Customer Account"
-msgstr ""
+msgstr "Cuenta de cliente"
#: CustomerAccount.php:14
msgid ""
@@ -9697,7 +9697,7 @@
#: CustomerReceipt.php:798
msgid "Enter Customer Receipt"
-msgstr "Introduzca un Ingreso de cliente"
+msgstr "Introducir un Ingreso de cliente"
#: CustomerReceipt.php:799
msgid ""
@@ -13260,7 +13260,7 @@
#: SupplierTenderCreate.php:695 SupplierTenderCreate.php:706
#: SupplierTenders.php:421 SupplierTenders.php:433
msgid "Enter partial"
-msgstr "Introduzca una parte de ..."
+msgstr "Introducir una parte de ..."
#: FixedAssetTransfer.php:64 FixedAssetTransfer.php:66
msgid ""
@@ -15172,7 +15172,7 @@
#: GoodsReceived.php:332
msgid "To enter a delivery against this purchase order"
-msgstr "Introduzca una entrega respecto esta orden de compra"
+msgstr "Introducir una entrega respecto esta orden de compra"
#: GoodsReceived.php:332
msgid ""
@@ -15184,11 +15184,11 @@
#: GoodsReceived.php:337
msgid "GL Code of the Line Item"
-msgstr "Código contable del Artículo"
+msgstr "Código contable del artículo"
#: GoodsReceived.php:342
msgid "ShiptRef of the Line Item"
-msgstr "Referencia de Transporte del Artículo"
+msgstr "Referencia de Transporte del artículo"
#: GoodsReceived.php:347
msgid "Contract Reference of the Line Item"
@@ -15196,19 +15196,19 @@
#: GoodsReceived.php:352
msgid "Quantity Invoiced of the Line Item"
-msgstr "Cantidad Facturada del Artículo"
+msgstr "Cantidad Facturada del artículo"
#: GoodsReceived.php:357
msgid "Stock Code of the Line Item"
-msgstr "Código de Existencia del Artículo"
+msgstr "Código de Existencia del artículo"
#: GoodsReceived.php:362
msgid "Order Quantity of the Line Item"
-msgstr "Cantidad Ordenada del Artículo"
+msgstr "Cantidad Ordenada del artículo"
#: GoodsReceived.php:367
msgid "Quantity of the Line Item Already Received"
-msgstr "Cantidad del Artculo ya Recibida"
+msgstr "Cantidad del artículo ya recibida"
#: GoodsReceived.php:375
msgid "Re-read the updated purchase order for receiving goods against"
@@ -15815,7 +15815,7 @@
#: PcClaimExpensesFromTab.php:142 PcExpenses.php:12 PcExpensesTypeTab.php:9
#: PcReportTab.php:20 PcReportTab.php:237 PcTabs.php:11 PcTypeTabs.php:11
msgid "Payment Entry"
-msgstr "Introduzca un Pago a proveedor"
+msgstr "Introducir un pago"
#: InternalStockCategoriesByRole.php:24
msgid "The Selected type cannot contain any of the following characters"
@@ -20935,7 +20935,7 @@
#: PDFPriceList.php:155
msgid "Print Price List Error"
-msgstr "Imprimir Errores en lista de precios"
+msgstr "Imprimir errores en lista de precios"
#: PDFPriceList.php:157
msgid ""
@@ -22757,7 +22757,7 @@
#: PO_PDFPurchOrder.php:153
msgid "Print This Order as a Copy"
-msgstr "Imprimir Esta Orden como una Copia"
+msgstr "Imprimir esta orden como una copia"
#: PO_PDFPurchOrder.php:154
msgid "Modify the order to allow a real reprint"
@@ -22852,7 +22852,7 @@
#: POReport.php:532 POReport.php:1308 POReport.php:1598 SalesInquiry.php:808
#: SalesInquiry.php:1157
msgid "Line Item Status"
-msgstr "Estado del Artículo de la Fila"
+msgstr "Estado del artículo de la Fila"
#: POReport.php:540 POReport.php:629 POReport.php:1314 POReport.php:1367
#: SalesInquiry.php:825 SalesInquiry.php:843
@@ -22892,7 +22892,7 @@
#: POReport.php:551 POReport.php:1325 SalesInquiry.php:836
msgid "Item Due"
-msgstr "Deuda del Artículo"
+msgstr "Deuda del artículo"
#: POReport.php:616 POReport.php:706 POReport.php:819 POReport.php:1354
#: POReport.php:1408 POReport.php:1493 SalesInquiry.php:912
@@ -23646,7 +23646,7 @@
#: Prices.php:5
msgid "Item Prices"
-msgstr "Precios del Artículo"
+msgstr "Precios del artículo"
#: Prices.php:48 RelatedItemsUpdate.php:42
msgid "An item must first be selected before this page is called"
@@ -23936,7 +23936,7 @@
#: PrintCustStatements.php:105 PrintCustStatements.php:453
msgid "Print Customer Account Statements"
-msgstr "Imprimir Estados de las Cuentas del cliente"
+msgstr "Imprimir estados de cuenta del cliente"
#: PrintCustStatements.php:106
msgid "There were no Customers matching your selection of "
@@ -24888,7 +24888,7 @@
#: PurchData.php:651
msgid "Supplier Stock Description"
-msgstr "Descripción del Artículo del proveedor"
+msgstr "Descripción del artículo del proveedor"
#: PurchData.php:659
msgid "in days from date of order"
@@ -25089,7 +25089,7 @@
#: RecurringSalesOrders.php:308
msgid "Enter New Sales Order"
-msgstr "Introduzca una Nuevo Pedido de Venta"
+msgstr "Introducir una Nuevo Pedido de Venta"
#: RecurringSalesOrders.php:321
msgid "Recurring Order for Customer"
@@ -25346,11 +25346,11 @@
#: RelatedItemsUpdate.php:179
msgid "There are no items related set up for this part"
-msgstr ""
+msgstr "No hay artículos relacionados creados para esta parte"
#: RelatedItemsUpdate.php:194
msgid "Related Item Code"
-msgstr ""
+msgstr "Código de artículo relacionado"
#: RelatedItemsUpdate.php:204
msgid "Amend Relation"
@@ -25457,7 +25457,7 @@
#: ReprintGRN.php:22
msgid "Enter a Purchase Order Number"
-msgstr "Introduzca un Número de Orden de Compra"
+msgstr "Introducir un número de orden de compra"
#: ReprintGRN.php:26
msgid "Show GRNs"
@@ -25500,7 +25500,7 @@
#: ReprintGRN.php:109
msgid "Reprint Labels"
-msgstr ""
+msgstr "Reimprimir etiquetas"
#: ReverseGRN.php:9 includes/MainMenuLinksArray.php:206
msgid "Reverse Goods Received"
@@ -27377,11 +27377,11 @@
#: SelectCreditItems.php:225
msgid "Enter text in the customer name"
-msgstr "Introduzca una parte del Nombre del cliente"
+msgstr "Introducir una parte del nombre del cliente"
#: SelectCreditItems.php:228
msgid "Enter text extract in the customer code"
-msgstr "Introduzca una parte del Código del cliente"
+msgstr "Introducir una parte del código del cliente"
#: SelectCreditItems.php:394
msgid "There are no products available that match the criteria specified"
@@ -27601,11 +27601,11 @@
#: SelectCreditItems.php:2011 SelectCreditItems.php:2013
msgid "Print this Credit Note"
-msgstr "Imprimir este abono"
+msgstr "Imprimir esta nota de crédito"
#: SelectCreditItems.php:2015
msgid "Enter Another Credit Note"
-msgstr "Introducir Otro abono"
+msgstr "Introducir otra nota de crédito"
#: SelectCustomer.php:6
msgid "Search Customers"
@@ -27630,7 +27630,7 @@
#: SelectCustomer.php:215 SelectCustomer.php:247
msgid "Customer Inquiries"
-msgstr "Consultas de clientes"
+msgstr "Consultas de cliente"
#: SelectCustomer.php:216 SelectCustomer.php:248
msgid "Customer Transactions"
@@ -27638,19 +27638,19 @@
#: SelectCustomer.php:221 includes/MainMenuLinksArray.php:117
msgid "Customer Transaction Inquiries"
-msgstr "Consultas de transacciones de clientes"
+msgstr "Consultas de transacciones del cliente"
#: SelectCustomer.php:222
msgid "Customer Account statement on screen"
-msgstr ""
+msgstr "Estado de cuenta de cliente en la pantalla"
#: SelectCustomer.php:223
msgid "View Customer Details"
-msgstr "Ver Detalles del cliente"
+msgstr "Ver detalles del cliente"
#: SelectCustomer.php:224
msgid "Print Customer Statement"
-msgstr "Imprimir Estado de Cuenta del cliente"
+msgstr "Imprimir estado de cuenta del cliente"
#: SelectCustomer.php:225
msgid "Order Inquiries"
@@ -27666,7 +27666,7 @@
#: SelectCustomer.php:230
msgid "Allocate Receipts OR Credit Notes"
-msgstr ""
+msgstr "Asignar recibos o notas de crédito"
#: SelectCustomer.php:232
msgid "Create a Counter Sale for this Customer"
@@ -27694,19 +27694,19 @@
#: SelectCustomer.php:268 SelectSupplier.php:223 SupplierTenderCreate.php:559
msgid "Enter a partial Name"
-msgstr "Introduzca una parte del Nombre"
+msgstr "Introducir una parte del nombre"
#: SelectCustomer.php:275 SelectSupplier.php:232 SupplierTenderCreate.php:566
msgid "Enter a partial Code"
-msgstr "Introduzca una parte del Código"
+msgstr "Introducir una parte del código"
#: SelectCustomer.php:286
msgid "Enter a partial Phone Number"
-msgstr "Introduzca una parte del Teléfono"
+msgstr "Introducir una parte del teléfono"
#: SelectCustomer.php:295
msgid "Enter part of the Address"
-msgstr "Introduzca una parte de la Dirección"
+msgstr "Introducir una parte de la dirección"
#: SelectCustomer.php:305
msgid "Choose a Type"
@@ -27723,11 +27723,11 @@
#: SelectCustomer.php:352
msgid "Choose an Area"
-msgstr "Escoja un Área"
+msgstr "Escoja una área"
#: SelectCustomer.php:357
msgid "Setup Areas"
-msgstr "Configurar Áreas"
+msgstr "Configurar áreas"
#: SelectCustomer.php:358
msgid "No Sales Areas defined"
@@ -28371,11 +28371,11 @@
#: SelectProduct.php:477
msgid "Maintain Related Items"
-msgstr ""
+msgstr "Administrar artículos relacionados"
#: SelectProduct.php:478
msgid "Maintain Price Matrix"
-msgstr ""
+msgstr "Administrar matriz de precios"
#: SelectProduct.php:524 SelectProduct.php:526
msgid "Enter text that you wish to search for in the item description"
@@ -28397,7 +28397,7 @@
#: SelectQASamples.php:76
msgid "Some Results are out of Spec"
-msgstr ""
+msgstr "Algunos resultados están fuera de especificaciones"
#: SelectQASamples.php:85
msgid "QA Sample record for"
@@ -28474,11 +28474,11 @@
#: SelectQASamples.php:399 SelectQASamples.php:503 SelectQASamples.php:563
#: TestPlanResults.php:282 TestPlanResults.php:758
msgid "Identifier"
-msgstr ""
+msgstr "Identificador"
#: SelectQASamples.php:400 TestPlanResults.php:283
msgid "Created By"
-msgstr ""
+msgstr "Creado por"
#: SelectQASamples.php:401 SelectQASamples.php:511 TestPlanResults.php:284
#: TestPlanResults.php:759
@@ -28669,7 +28669,7 @@
#: SelectSupplier.php:166 SelectSupplier.php:204
msgid "Supplier Inquiries"
-msgstr "Consultas de proveedores"
+msgstr "Consultas de proveedor"
#: SelectSupplier.php:167 SelectSupplier.php:205
msgid "Supplier Transactions"
@@ -28681,7 +28681,7 @@
#: SelectSupplier.php:171
msgid "Supplier Account Inquiry"
-msgstr "Consultar Cuenta del proveedor"
+msgstr "Consultar cuenta del proveedor"
#: SelectSupplier.php:175
msgid "Add / Receive / View Outstanding Purchase Orders"
@@ -28707,19 +28707,19 @@
#: SelectSupplier.php:182
msgid "Enter a Purchase Order for This Supplier"
-msgstr "Introduzca una Orden de Compra para este proveedor"
+msgstr "Introducir una orden de compra para este proveedor"
#: SelectSupplier.php:183
msgid "Enter a Suppliers Invoice"
-msgstr "Introduzca una Factura de proveedor"
+msgstr "Introducir una Factura de proveedor"
#: SelectSupplier.php:184
msgid "Enter a Suppliers Credit Note"
-msgstr "Introduzca una nota de Crédito (Abono) a proveedor"
+msgstr "Introducir una nota de Crédito (Abono) a proveedor"
#: SelectSupplier.php:185
msgid "Enter a Payment to, or Receipt from the Supplier"
-msgstr "Introduzca un Pago a, ó Ingreso desde, proveedor"
+msgstr "Introducir un Pago a, ó Ingreso desde, proveedor"
#: SelectSupplier.php:187
msgid "Reverse an Outstanding Goods Received Note (GRN)"
@@ -29049,7 +29049,7 @@
#: ShipmentCosting.php:101
msgid "No Item Cost Records exist for Shipment"
-msgstr "No existen Registros de Costo del Artículo para el Envío"
+msgstr "No existen Registros de Costo del artículo para el Envío"
#: ShipmentCosting.php:121
msgid "The lines on the shipment could not be retrieved from the database"
@@ -30167,7 +30167,7 @@
#: SpecialOrder.php:582
msgid "Enter A New Special Order"
-msgstr "Introduzca un Nuevo Pedido Especial"
+msgstr "Introducir un Nuevo Pedido Especial"
#: SpecialOrder.php:590
msgid "Receive Purchase Into and Sell From"
@@ -30215,7 +30215,7 @@
#: StockAdjustmentsControlled.php:22 StockAdjustmentsControlled.php:39
msgid "Enter A Stock Adjustment"
-msgstr "Introduzca un Ajuste de Existencias"
+msgstr "Introducir un ajuste de existencias"
#: StockAdjustmentsControlled.php:23
msgid ""
@@ -30372,7 +30372,7 @@
#: StockAdjustments.php:517
msgid "Enter Stock Adjustment"
-msgstr "Introduzca Ajuste de Existencias"
+msgstr "Introducir ajuste de inventario"
#: StockAdjustments.php:527 StockStatus.php:371 StockTransfers.php:655
msgid "Show Movements"
@@ -31067,7 +31067,7 @@
#: StockClone.php:586
msgid "Enter a unique item code for the new item."
-msgstr "Introduzca un código de artículo único para el nuevo artículo."
+msgstr "Introducir un código de artículo único para el nuevo artículo."
#: StockClone.php:699 Stocks.php:1046
msgid "Clear Image"
@@ -32172,7 +32172,7 @@
#: Stocks.php:131 Z_ImportStocks.php:116
msgid "The Stock Item code cannot be empty"
-msgstr "El código del Artículo de Existencias no puede estar vacío"
+msgstr "El código del artículo de Existencias no puede estar vacío"
#: Stocks.php:305 Stocks.php:310
msgid "The make or buy flag cannot be changed from"
@@ -32611,7 +32611,7 @@
#: StockTransferControlled.php:18 StockTransferControlled.php:46
msgid "Enter A Stock Transfer"
-msgstr "Introduzca una transferencia de la existencia"
+msgstr "Introducir una transferencia de la existencia"
#: StockTransferControlled.php:19
msgid ""
@@ -38165,7 +38165,7 @@
#: WhereUsedInquiry.php:41 WhereUsedInquiry.php:43
msgid "Enter an Item Code"
-msgstr "Introduzca un Código de Artículo"
+msgstr "Introducir un código de artículo"
#: WhereUsedInquiry.php:41 WhereUsedInquiry.php:43
msgid "Illegal characters and blank is not allowed"
@@ -38575,7 +38575,7 @@
#: WorkOrderEntry.php:329
msgid "Enter a new work order"
-msgstr "Introduzca una nueva orden de trabajo"
+msgstr "Introducir una nueva orden de trabajo"
#: WorkOrderEntry.php:331
msgid "Go to Costing"
@@ -41837,7 +41837,7 @@
#: Z_ImportGLTransactions.php:124
msgid "All transactions must be in the same period"
-msgstr ""
+msgstr "Todas las transacciones deben estar en el mismo período"
#: Z_ImportGLTransactions.php:187
msgid "Cheque"
@@ -41880,7 +41880,7 @@
#: Z_ImportGLTransactions.php:231
msgid "All the transactions must be within the same accounting period."
-msgstr ""
+msgstr "Todas las transacciones deben estar dentro del mismo período contable."
#: Z_ImportGLTransactions.php:232
msgid ""
@@ -42715,7 +42715,7 @@
#: Z_SalesIntegrityCheck.php:132
msgid "Check Order Item Amounts"
-msgstr "Comprobar Importes del Artículo del Pedido"
+msgstr "Comprobar Importes del artículo del Pedido"
#: Z_SalesIntegrityCheck.php:141
msgid "Order Item"
@@ -45359,7 +45359,7 @@
#: includes/MainMenuLinksArray.php:103
msgid "Allocate Receipts or Credit Notes"
-msgstr "Asignar Recibos ó notas de Crédito"
+msgstr "Asignar recibos o notas de crédito"
#: includes/MainMenuLinksArray.php:109
msgid "Where Allocated Inquiry"
@@ -45404,7 +45404,7 @@
#: includes/MainMenuLinksArray.php:153
msgid "Supplier Transaction Inquiries"
-msgstr "Consultas de proveedores de Transacción"
+msgstr "Consultas de transacciones del proveedor"
#: includes/MainMenuLinksArray.php:163
msgid "Add Supplier"
@@ -46420,7 +46420,7 @@
#: includes/PDFCustomerListPageHeader.inc:21
msgid "All Territories"
-msgstr "Todos los Territorios"
+msgstr "Todos los territorios"
#: includes/PDFCustomerListPageHeader.inc:24
msgid "Territory"
@@ -50898,7 +50898,7 @@
#: ../webSHOP/Register.php:247
msgid "customer"
-msgstr ""
+msgstr "cliente"
#: ../webSHOP/Register.php:249
msgid "The details that we have on record for you are as follows"
|
|
From: <ex...@us...> - 2015-05-27 05:20:36
|
Revision: 7315
http://sourceforge.net/p/web-erp/reponame/7315
Author: exsonqu
Date: 2015-05-27 05:20:33 +0000 (Wed, 27 May 2015)
Log Message:
-----------
Modified Paths:
--------------
trunk/doc/Change.log
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-05-27 05:19:30 UTC (rev 7314)
+++ trunk/doc/Change.log 2015-05-27 05:20:33 UTC (rev 7315)
@@ -1,5 +1,6 @@
webERP Change Log
+27/05/15 Thumb: Fix error_reporting() bug change && to & in install/index.php.
25/5/15 Tom Barry: SupplierInquiry.php moved SQL to get the users authorisation to put supplier invoices on hold outside the loop to avoid unecessary round trips to the SQL server
21/5/15 RChacon: Adjust CustomerAccount.php for direct printing.
19/5/15 RChacon: Add documentation and help for users in Locations.php and ManualInventory.html.
|
|
From: <ex...@us...> - 2015-05-27 05:19:32
|
Revision: 7314
http://sourceforge.net/p/web-erp/reponame/7314
Author: exsonqu
Date: 2015-05-27 05:19:30 +0000 (Wed, 27 May 2015)
Log Message:
-----------
27/05/15 Thumb: Fix error_reporting() bug change && to & in install/index.php.
Modified Paths:
--------------
trunk/install/index.php
Modified: trunk/install/index.php
===================================================================
--- trunk/install/index.php 2015-05-26 09:43:57 UTC (rev 7313)
+++ trunk/install/index.php 2015-05-27 05:19:30 UTC (rev 7314)
@@ -386,7 +386,7 @@
$msg .= "if (\$RootPath == '/' OR \$RootPath == '\\\') {\n";
$msg .= " \$RootPath = '';\n";
$msg .= "}\n";
- $msg .= "error_reporting(E_ALL && ~E_NOTICE && ~E_WARNING);\n";
+ $msg .= "error_reporting(E_ALL & ~E_NOTICE & ~E_WARNING);\n";
$msg .= "//Installed companies \n";
foreach ($CompanyList as $k=>$compinfo)
{
|
|
From: <dai...@us...> - 2015-05-26 09:43:59
|
Revision: 7313
http://sourceforge.net/p/web-erp/reponame/7313
Author: daintree
Date: 2015-05-26 09:43:57 +0000 (Tue, 26 May 2015)
Log Message:
-----------
Removed SQL outside the loop to avoid unecessary round trips to the SQL server
Modified Paths:
--------------
trunk/SupplierInquiry.php
trunk/doc/Change.log
trunk/doc/Manual/ManualContributors.html
Modified: trunk/SupplierInquiry.php
===================================================================
--- trunk/SupplierInquiry.php 2015-05-21 21:05:18 UTC (rev 7312)
+++ trunk/SupplierInquiry.php 2015-05-26 09:43:57 UTC (rev 7313)
@@ -220,8 +220,16 @@
</tr>
</thead><tbody>';
+$AuthSQL="SELECT offhold
+ FROM purchorderauth
+ WHERE userid='" . $_SESSION['UserID'] . "'
+ AND currabrev='" . $SupplierRecord['currcode']."'";
+$AuthResult=DB_query($AuthSQL);
+$AuthRow=DB_fetch_array($AuthResult);
+
$j = 1;
$k = 0;// Row colour counter.
+
while ($myrow=DB_fetch_array($TransResult)) {
if ($myrow['hold'] == 0 AND $myrow['settled'] == 0) {
@@ -282,15 +290,8 @@
$myrow['transno']);
} else {
- $AuthSQL="SELECT offhold
- FROM purchorderauth
- WHERE userid='" . $_SESSION['UserID'] . "'
- AND currabrev='" . $SupplierRecord['currcode']."'";
- $AuthResult=DB_query($AuthSQL);
- $AuthRow=DB_fetch_array($AuthResult);
-
printf($BaseTD8);
- if ($AuthRow[0]==0) {
+ if ($AuthRow['offhold']==0) {
echo '<td class="noprint"><a href="' .htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?HoldType=' . $myrow['type'] . '&HoldTrans=' . $myrow['transno']. '&HoldStatus=' . $HoldValue . '&FromDate=' . $_POST['TransAfterDate'].'">' . $HoldValue . '</a></td>';
} else {
if ($HoldValue==_('Release')) {
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-05-21 21:05:18 UTC (rev 7312)
+++ trunk/doc/Change.log 2015-05-26 09:43:57 UTC (rev 7313)
@@ -1,5 +1,6 @@
webERP Change Log
+25/5/15 Tom Barry: SupplierInquiry.php moved SQL to get the users authorisation to put supplier invoices on hold outside the loop to avoid unecessary round trips to the SQL server
21/5/15 RChacon: Adjust CustomerAccount.php for direct printing.
19/5/15 RChacon: Add documentation and help for users in Locations.php and ManualInventory.html.
Modified: trunk/doc/Manual/ManualContributors.html
===================================================================
--- trunk/doc/Manual/ManualContributors.html 2015-05-21 21:05:18 UTC (rev 7312)
+++ trunk/doc/Manual/ManualContributors.html 2015-05-26 09:43:57 UTC (rev 7313)
@@ -14,6 +14,8 @@
<br />
Shane Barnaby<br />
<br />
+ Tom Barry<br />
+ <br />
Klaus Beucher<br />
<br />
Chris Bice<br />
|
|
From: <rc...@us...> - 2015-05-21 21:05:20
|
Revision: 7312
http://sourceforge.net/p/web-erp/reponame/7312
Author: rchacon
Date: 2015-05-21 21:05:18 +0000 (Thu, 21 May 2015)
Log Message:
-----------
Adjust CustomerAccount.php for direct printing.
Modified Paths:
--------------
trunk/CustomerAccount.php
trunk/doc/Change.log
Modified: trunk/CustomerAccount.php
===================================================================
--- trunk/CustomerAccount.php 2015-05-21 16:58:25 UTC (rev 7311)
+++ trunk/CustomerAccount.php 2015-05-21 21:05:18 UTC (rev 7312)
@@ -1,6 +1,6 @@
<?php
/* $Id: CustomerAccount.php 7004 2014-11-24 15:56:19Z rchacon $*/
-/* This script is <create a description for script table>. */
+/* Shows customer account/statement on screen rather than PDF. */
include('includes/session.inc');
$Title = _('Customer Account');// Screen identification.
@@ -29,7 +29,7 @@
$result = DB_query($sql,$ErrMsg);
if(DB_num_rows($result)>0) {
while($myrow = DB_fetch_array($result)) {
- if ($_SESSION['SalesmanLogin'] == $myrow['salesman']){
+ if ($_SESSION['SalesmanLogin'] == $myrow['salesman']) {
$ViewAllowed = true;
}
}
@@ -38,7 +38,7 @@
include('includes/footer.inc');
exit;
}
- if (!$ViewAllowed){
+ if (!$ViewAllowed) {
prnMsg(_('You have no authority to review this customer account'),'error');
include('includes/footer.inc');
exit;
@@ -54,7 +54,7 @@
/*now get all the settled transactions which were allocated this month */
$ErrMsg = _('There was a problem retrieving the transactions that were settled over the course of the last month for'). ' ' . $CustomerID . ' ' . _('from the database');
-if ($_SESSION['Show_Settled_LastMonth']==1){
+if ($_SESSION['Show_Settled_LastMonth']==1) {
$sql = "SELECT DISTINCT debtortrans.id,
debtortrans.type,
systypes.typename,
@@ -80,7 +80,7 @@
$SetldTrans=DB_query($sql, $ErrMsg);
$NumberOfRecordsReturned = DB_num_rows($SetldTrans);
- while ($myrow=DB_fetch_array($SetldTrans)){
+ while ($myrow=DB_fetch_array($SetldTrans)) {
$Transactions[] = $myrow;
}
} else {
@@ -114,7 +114,7 @@
$sql .= " ORDER BY debtortrans.id";
$OstdgTrans=DB_query($sql, $ErrMsg);
-while ($myrow=DB_fetch_array($OstdgTrans)){
+while ($myrow=DB_fetch_array($OstdgTrans)) {
$Transactions[] = $myrow;
}
@@ -212,36 +212,40 @@
$CustomerRecord = DB_fetch_array($CustomerResult);
-echo '<div class="toplink">
+echo '<div class="noprint toplink">
<a href="', $RootPath, '/SelectCustomer.php">', _('Back to Customer Screen'), '</a>
</div>';
echo '<table width="100%">
- <tr>
- <th colspan="2">' . _('Customer Statement For'), ': ', stripslashes($CustomerID), ' - ', $CustomerRecord['name'], '</th>
- </tr>
- <tr><td colspan="2">' . $CustomerRecord['address1'] . '</td></tr>
- <tr><td colspan="2">' . $CustomerRecord['address2'] . '</td></tr>
- <tr><td colspan="2">' . $CustomerRecord['address3'] . ' ' . $CustomerRecord['address4'] . ' ' . $CustomerRecord['address5'] . ' ' . $CustomerRecord['address6'] . '</td></tr>
- <tr><th>' . _('All amounts stated in'), ':</th><td>', $CustomerRecord['currency'] . '</td></tr>
- <tr><th>' . _('Terms'), ':</th><td>', $CustomerRecord['terms'] . '</th></tr>
- <tr><th>' . _('Credit Limit'), ':</th><td>', locale_number_format($CustomerRecord['creditlimit'], 0) . '</td></tr>
- <tr><th>' . _('Credit Status'), ':</th><td>', $CustomerRecord['reasondescription'] . '</td></tr>
- </table>';
+ <tr><th colspan="2">', _('Customer Statement For'), ': ', stripslashes($CustomerID), ' - ', $CustomerRecord['name'], '</th></tr>
+ <tr><td colspan="2">', $CustomerRecord['address1'], '</td></tr>';
+if($CustomerRecord['address2']!='') {// If not empty, output this line.
+ echo '<tr><td colspan="2">', $CustomerRecord['address2'], '</td></tr>';
+}
+if($CustomerRecord['address3']!='') {// If not empty, output this line.
+ echo '<tr><td colspan="2">', $CustomerRecord['address3'], '</td></tr>';
+}
+echo ' <tr><td colspan="2">', $CustomerRecord['address4'], '</td></tr>
+ <tr><td colspan="2">', $CustomerRecord['address5'], ' ', $CustomerRecord['address6'], '</td></tr>
+ <tr><th>', _('All amounts stated in'), ':</th><td>', $CustomerRecord['currency'], '</td></tr>
+ <tr><th>', _('Terms'), ':</th><td>', $CustomerRecord['terms'], '</th></tr>
+ <tr><th>', _('Credit Limit'), ':</th><td>', locale_number_format($CustomerRecord['creditlimit'], 0), '</td></tr>
+ <tr><th>', _('Credit Status'), ':</th><td>', $CustomerRecord['reasondescription'], '</td></tr>
+ </table>';
if ($CustomerRecord['dissallowinvoices'] != 0) {
- echo '<br /><font color="red" size="4"><b>', _('ACCOUNT ON HOLD'), '</font></b><br />';
+ echo '<br /><b><font color="red" size="4">', _('ACCOUNT ON HOLD'), '</font></b><br />';
}
-echo '<form onSubmit="return VerifyForm(this);" action="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'), '" method="post" class="noPrint">
- <input type="hidden" name="FormID" value="', $_SESSION['FormID'], '" />';
-echo _('Show all transactions after'), ':<input tabindex="1" type="text" required="required" class="date" alt="', $_SESSION['DefaultDateFormat'], '" id="datepicker" name="TransAfterDate" value="', $_POST['TransAfterDate'], '" minlength="0" maxlength="10" size="12" />';
-
-echo '<input tabindex="3" type="submit" name="Refresh Inquiry" value="', _('Refresh Inquiry'), '" />
+echo '<br /><form onSubmit="return VerifyForm(this);" action="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'), '" method="post" class="centre noprint">
+ <input name="FormID" type="hidden" value="', $_SESSION['FormID'], '" />',
+ _('Show all transactions after'), ':<input alt="', $_SESSION['DefaultDateFormat'], '" class="date" id="datepicker" maxlength="10" minlength="0" name="TransAfterDate" required="required" size="12" tabindex="1" type="text" value="', $_POST['TransAfterDate'], '" />',
+ '<input name="Refresh Inquiry" tabindex="3" type="submit" value="', _('Refresh Inquiry'), '" />
</form>';
/* Show a table of the invoices returned by the SQL. */
-echo '<table class="selection">
+echo '<br /><table class="selection">
+ <thead>
<tr>
<th class="ascending">', _('Type'), '</th>
<th class="ascending">', _('Number'), '</th>
@@ -254,11 +258,9 @@
<th>', _('Credits'), '</th>
<th>', _('Allocated'), '</th>
<th>', _('Balance'), '</th>
- <th></th>
- <th></th>
- <th></th>
- <th></th>
- </tr>';
+ <th class="noprint" colspan="4"> </th>
+ </tr>
+ </thead><tbody>';
$k = 0; //row colour counter
$OutstandingOrSettled = '';
@@ -269,11 +271,11 @@
}
foreach ($Transactions as $MyRow) {
- if ($MyRow['settled']==1 AND $OutstandingOrSettled==''){
- echo '<tr><th colspan="10">' . _('TRANSACTIONS SETTLED SINCE') . ' ' . $_POST['TransAfterDate'] . '</th></tr>';
+ if ($MyRow['settled']==1 AND $OutstandingOrSettled=='') {
+ echo '<tr><th colspan="11">', _('TRANSACTIONS SETTLED SINCE'), ' ', $_POST['TransAfterDate'], '</th><th class="noprint" colspan="4"> </th></tr>';
$OutstandingOrSettled='Settled';
} elseif (($OutstandingOrSettled=='Settled' OR $OutstandingOrSettled=='') AND $MyRow['settled']==0) {
- echo '<tr><th colspan="10">' . _('OUTSTANDING TRANSACTIONS') . ' ' . $_POST['TransAfterDate'] . '</th></tr>';
+ echo '<tr><th colspan="11">', _('OUTSTANDING TRANSACTIONS'), ' ', $_POST['TransAfterDate'], '</th><th class="noprint" colspan="4"> </th></tr>';
$OutstandingOrSettled='Outstanding';
}
@@ -291,65 +293,51 @@
if ($MyRow['type']==10) { //its an invoice
echo '<td>', _($MyRow['typename']), '</td>
- <td>', $MyRow['transno'], '</td>
+ <td class="number">', $MyRow['transno'], '</td>
<td>', ConvertSQLDate($MyRow['trandate']), '</td>
<td>', $MyRow['branchcode'], '</td>
<td>', $MyRow['reference'], '</td>
<td style="width:200px">', $MyRow['invtext'], '</td>
- <td>', $MyRow['order_'], '</td>
+ <td class="number">', $MyRow['order_'], '</td>
<td class="number">', locale_number_format($MyRow['totalamount'], $CustomerRecord['decimalplaces']), '</td>
- <td></td>
+ <td> </td>
<td class="number">', locale_number_format($MyRow['alloc'], $CustomerRecord['decimalplaces']), '</td>
<td class="number">', locale_number_format($MyRow['balance'], $CustomerRecord['decimalplaces']), '</td>
- <td>
- <a href="', $RootPath, '/PrintCustTrans.php?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Invoice">', _('HTML '), '
- <img src="', $RootPath, '/css/', $Theme, '/images/preview.png" title="', _('Click to preview the invoice'), '" alt="" />
- </a>
+ <td class="noprint" title="', _('Click to preview the invoice'), '">
+ <a href="', $RootPath, '/PrintCustTrans.php?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Invoice"><img alt="" src="', $RootPath, '/css/', $Theme, '/images/preview.png" /> ', _('HTML'), '</a>
</td>
- <td>
- <a href="', $RootPath, '/', $PrintCustomerTransactionScript, '?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Invoice&PrintPDF=True">' . _('PDF ') . '
- <img src="', $RootPath, '/css/', $Theme, '/images/pdf.png" title="', _('Click for PDF'), '" alt="" />
- </a>
+ <td class="noprint" title="', _('Click for PDF'), '">
+ <a href="', $RootPath, '/', $PrintCustomerTransactionScript, '?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Invoice&PrintPDF=True"><img alt="" src="', $RootPath, '/css/', $Theme, '/images/pdf.png" /> ', _('PDF'), '</a>
</td>
- <td>
- <a href="', $RootPath, '/EmailCustTrans.php?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Invoice">', _('Email ') . '
- <img src="', $RootPath, '/css/', $Theme, '/images/email.png" title="', _('Click to email the invoice'), '" alt="" />
- </a>
+ <td class="noprint" title="', _('Click to email the invoice'), '">
+ <a href="', $RootPath, '/EmailCustTrans.php?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Invoice"><img alt="" src="', $RootPath, '/css/', $Theme, '/images/email.png" />', _('Email'), '</a>
</td>
- <td></td>
+ <td class="noprint"> </td>
</tr>';
} elseif ($MyRow['type'] == 11) {
echo '<td>', _($MyRow['typename']), '</td>
- <td>', $MyRow['transno'], '</td>
+ <td class="number">', $MyRow['transno'], '</td>
<td>', ConvertSQLDate($MyRow['trandate']), '</td>
<td>', $MyRow['branchcode'], '</td>
<td>', $MyRow['reference'], '</td>
<td style="width:200px">', $MyRow['invtext'], '</td>
- <td>', $MyRow['order_'], '</td>
- <td></td>
+ <td class="number">', $MyRow['order_'], '</td>
+ <td> </td>
<td class="number">', locale_number_format($MyRow['totalamount'], $CustomerRecord['decimalplaces']), '</td>
<td class="number">', locale_number_format($MyRow['alloc'], $CustomerRecord['decimalplaces']), '</td>
<td class="number">', locale_number_format($MyRow['balance'], $CustomerRecord['decimalplaces']), '</td>
- <td>
- <a href="', $RootPath, '/PrintCustTrans.php?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Credit">', _('HTML '), '
- <img src="', $RootPath, '/css/', $Theme, '/images/preview.png" title="', _('Click to preview the credit note'), '" />
- </a>
+ <td class="noprint" title="', _('Click to preview the credit note'), '">
+ <a href="', $RootPath, '/PrintCustTrans.php?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Credit"><img alt="" src="', $RootPath, '/css/', $Theme, '/images/preview.png" />', _('HTML'), '</a>
</td>
- <td>
- <a href="', $RootPath, '/', $PrintCustomerTransactionScript, '?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Credit&PrintPDF=True">', _('PDF '), '
- <img src="', $RootPath, '/css/', $Theme, '/images/pdf.png" title="', _('Click for PDF'), '" alt="" />
- </a>
+ <td class="noprint" title="', _('Click for PDF'), '">
+ <a href="', $RootPath, '/', $PrintCustomerTransactionScript, '?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Credit&PrintPDF=True"><img alt="" src="', $RootPath, '/css/', $Theme, '/images/pdf.png" />', _('PDF'), '</a>
</td>
- <td>
- <a href="', $RootPath, '/EmailCustTrans.php?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Credit">', _('Email'), '
- <img src="', $RootPath, '/css/', $Theme, '/images/email.png" title="', _('Click to email the credit note'), '" alt="" />
- </a>
+ <td class="noprint" title="', _('Click to email the credit note'), '">
+ <a href="', $RootPath, '/EmailCustTrans.php?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Credit"><img alt="" src="', $RootPath, '/css/', $Theme, '/images/email.png" />', _('Email'), '</a>
</td>
- <td>
- <a href="', $RootPath, '/CustomerAllocations.php?AllocTrans=', $MyRow['id'], '">', _('Allocation'), '
- <img src="', $RootPath, '/css/', $Theme, '/images/allocation.png" title="', _('Click to allocate funds'), '" alt="" />
- </a>
+ <td class="noprint" title="', _('Click to allocate funds'), '">
+ <a href="', $RootPath, '/CustomerAllocations.php?AllocTrans=', $MyRow['id'], '"><img alt="" src="', $RootPath, '/css/', $Theme, '/images/allocation.png" />', _('Allocation'), '</a>
</td>
</tr>';
@@ -358,24 +346,22 @@
* - Is receipt
*/
echo '<td>', _($MyRow['typename']), '</td>
- <td>', $MyRow['transno'], '</td>
+ <td class="number">', $MyRow['transno'], '</td>
<td>', ConvertSQLDate($MyRow['trandate']), '</td>
<td>', $MyRow['branchcode'], '</td>
<td>', $MyRow['reference'], '</td>
<td style="width:200px">', $MyRow['invtext'], '</td>
- <td>', $MyRow['order_'], '</td>
- <td></td>
+ <td class="number">', $MyRow['order_'], '</td>
+ <td> </td>
<td class="number">', locale_number_format($MyRow['totalamount'], $CustomerRecord['decimalplaces']), '</td>
<td class="number">', locale_number_format($MyRow['alloc'], $CustomerRecord['decimalplaces']), '</td>
<td class="number">', locale_number_format($MyRow['balance'], $CustomerRecord['decimalplaces']), '</td>
- <td>
- <a href="', $RootPath, '/CustomerAllocations.php?AllocTrans=', $MyRow['id'], '">', _('Allocation'), '
- <img src="', $RootPath, '/css/', $Theme, '/images/allocation.png" title="', _('Click to allocate funds'), '" alt="" />
- </a>
+ <td class="noprint" title="', _('Click to allocate funds'), '">
+ <a href="', $RootPath, '/CustomerAllocations.php?AllocTrans=', $MyRow['id'], '"><img alt="" src="', $RootPath, '/css/', $Theme, '/images/allocation.png" />', _('Allocation'), '</a>
</td>
- <td></td>
- <td></td>
- <td></td>
+ <td class="noprint"> </td>
+ <td class="noprint"> </td>
+ <td class="noprint"> </td>
</tr>';
} elseif ($MyRow['type'] == 12 and $MyRow['totalamount'] > 0) {
@@ -384,45 +370,43 @@
* - User cannot view GL transactions
*/
echo '<td>', _($MyRow['typename']), '</td>
- <td>', $MyRow['transno'], '</td>
+ <td class="number">', $MyRow['transno'], '</td>
<td>', ConvertSQLDate($MyRow['trandate']), '</td>
<td>', $MyRow['branchcode'], '</td>
<td>', $MyRow['reference'], '</td>
<td style="width:200px">', $MyRow['invtext'], '</td>
- <td>', $MyRow['order_'], '</td>
+ <td class="number">', $MyRow['order_'], '</td>
<td class="number">', locale_number_format($MyRow['totalamount'], $CustomerRecord['decimalplaces']), '</td>
- <td></td>
+ <td> </td>
<td class="number">', locale_number_format($MyRow['alloc'], $CustomerRecord['decimalplaces']), '</td>
<td class="number">', locale_number_format($MyRow['balance'], $CustomerRecord['decimalplaces']), '</td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
+ <td class="noprint"> </td>
+ <td class="noprint"> </td>
+ <td class="noprint"> </td>
+ <td class="noprint"> </td>
</tr>';
}
}
//end of while loop
-echo '</table>';
+echo '</tbody></table>
+ <br />
+ <table class="selection" width="70%">
+ <tr>
+ <th style="width:20%">', _('Total Balance'), '</th>
+ <th style="width:20%">', _('Current'), '</th>
+ <th style="width:20%">', _('Now Due'), '</th>
+ <th style="width:20%">', $_SESSION['PastDueDays1'], '-', $_SESSION['PastDueDays2'], ' ', _('Days Overdue'), '</th>
+ <th style="width:20%">', _('Over'), ' ', $_SESSION['PastDueDays2'], ' ', _('Days Overdue'), '</th>
+ </tr>
+ <tr>
+ <td class="number">', locale_number_format($CustomerRecord['balance'], $CustomerRecord['decimalplaces']), '</td>
+ <td class="number">', locale_number_format(($CustomerRecord['balance'] - $CustomerRecord['due']), $CustomerRecord['decimalplaces']), '</td>
+ <td class="number">', locale_number_format(($CustomerRecord['due'] - $CustomerRecord['overdue1']), $CustomerRecord['decimalplaces']), '</td>
+ <td class="number">', locale_number_format(($CustomerRecord['overdue1'] - $CustomerRecord['overdue2']), $CustomerRecord['decimalplaces']), '</td>
+ <td class="number">', locale_number_format($CustomerRecord['overdue2'], $CustomerRecord['decimalplaces']), '</td>
+ </tr>
+ </table>';
-echo '<table class="selection" width="70%">
- <tr>
- <th style="width:20%">', _('Total Balance'), '</th>
- <th style="width:20%">', _('Current'), '</th>
- <th style="width:20%">', _('Now Due'), '</th>
- <th style="width:20%">', $_SESSION['PastDueDays1'], '-', $_SESSION['PastDueDays2'], ' ' . _('Days Overdue'), '</th>
- <th style="width:20%">', _('Over'), ' ', $_SESSION['PastDueDays2'], ' ', _('Days Overdue'), '</th>
- </tr>';
-
-echo '<tr>
- <td class="number">', locale_number_format($CustomerRecord['balance'], $CustomerRecord['decimalplaces']), '</td>
- <td class="number">', locale_number_format(($CustomerRecord['balance'] - $CustomerRecord['due']), $CustomerRecord['decimalplaces']), '</td>
- <td class="number">', locale_number_format(($CustomerRecord['due'] - $CustomerRecord['overdue1']), $CustomerRecord['decimalplaces']), '</td>
- <td class="number">', locale_number_format(($CustomerRecord['overdue1'] - $CustomerRecord['overdue2']), $CustomerRecord['decimalplaces']), '</td>
- <td class="number">', locale_number_format($CustomerRecord['overdue2'], $CustomerRecord['decimalplaces']), '</td>
- </tr>
-</table>';
-
-
include('includes/footer.inc');
?>
\ No newline at end of file
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-05-21 16:58:25 UTC (rev 7311)
+++ trunk/doc/Change.log 2015-05-21 21:05:18 UTC (rev 7312)
@@ -1,5 +1,6 @@
webERP Change Log
+21/5/15 RChacon: Adjust CustomerAccount.php for direct printing.
19/5/15 RChacon: Add documentation and help for users in Locations.php and ManualInventory.html.
17/5/15 Version 4.12.3
|
|
From: <rc...@us...> - 2015-05-21 16:58:27
|
Revision: 7311
http://sourceforge.net/p/web-erp/reponame/7311
Author: rchacon
Date: 2015-05-21 16:58:25 +0000 (Thu, 21 May 2015)
Log Message:
-----------
Spanish translation improvements.
Modified Paths:
--------------
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
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-05-21 14:05:27 UTC (rev 7310)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2015-05-21 16:58:25 UTC (rev 7311)
@@ -8,7 +8,7 @@
"Project-Id-Version: webERP 4.12.2\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-05-17 13:40+1200\n"
-"PO-Revision-Date: 2015-05-19 07:25-0600\n"
+"PO-Revision-Date: 2015-05-21 10:54-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: TecnoSoluciones.com <web...@te...>\n"
"Language: es_ES\n"
@@ -1083,7 +1083,7 @@
#: AgedDebtors.php:14
msgid "Aged Customer Balance Listing"
-msgstr "Consulta de saldos de cuentas por cobrar por vencimiento"
+msgstr "Consultar saldos de cuentas por cobrar por vencimiento"
#: AgedDebtors.php:15
msgid "Aged Customer Balances"
@@ -9397,11 +9397,11 @@
#: CustomerInquiry.php:194 CustomerInquiry.php:199 CustomerInquiry.php:203
msgid "Invoices not fully allocated"
-msgstr ""
+msgstr "Facturas no totalmente asignadas"
#: CustomerInquiry.php:195 CustomerInquiry.php:200 CustomerInquiry.php:204
msgid "Invoices fully allocated"
-msgstr "Facturas totalmente asignados"
+msgstr "Facturas totalmente asignadas"
#: CustomerInquiry.php:236 SupplierInquiry.php:194
msgid "No transactions were returned by the SQL because"
@@ -9796,7 +9796,7 @@
#: CustomerReceipt.php:1039
msgid "Customer Transaction Inquiry"
-msgstr "Consulta de transacción del cliente"
+msgstr "Consultar transacción del cliente"
#: CustomerReceipt.php:1048 SelectGLAccount.php:116 SelectGLAccount.php:131
#, php-format
@@ -10484,7 +10484,7 @@
#: DailyBankTransactions.php:120 DailyBankTransactions.php:121
#: DailyBankTransactions.php:128
msgid "Bank Transactions Inquiry"
-msgstr "Consulta de transacciones bancarias"
+msgstr "Consultar transacciones bancarias"
#: DailyBankTransactions.php:43 Payments.php:794 SuppPaymentRun.php:332
msgid "Bank Accounts have not yet been defined. You must first"
@@ -10591,7 +10591,7 @@
#: DailySalesInquiry.php:6 includes/MainMenuLinksArray.php:56
msgid "Daily Sales Inquiry"
-msgstr "Consulta de ventas diarias"
+msgstr "Consultar ventas diarias"
#: DailySalesInquiry.php:9
msgid "Daily Sales"
@@ -13933,7 +13933,7 @@
#: GLAccountCSV.php:21 GLAccountInquiry.php:5 GLAccountInquiry.php:33
#: GLAccountReport.php:223
msgid "General Ledger Account Inquiry"
-msgstr "Consulta de cuentas contables"
+msgstr "Consultar cuentas contables"
#: GLAccountCSV.php:23 GLAccountReport.php:225
msgid "Use the keyboard Shift key to select multiple accounts and periods"
@@ -14488,7 +14488,7 @@
#: GLCodesInquiry.php:7
msgid "GL Codes Inquiry"
-msgstr "Consultar Códigos Contables"
+msgstr "Consultar códigos contables"
#: GLCodesInquiry.php:25 SelectGLAccount.php:114
msgid "Group"
@@ -15367,7 +15367,7 @@
#: HistoricalTestResults.php:5
msgid "Historical Test Results"
-msgstr ""
+msgstr "Resultados de pruebas históricas"
#: HistoricalTestResults.php:26 MRPCalendar.php:47 POReport.php:88
#: POReport.php:871 SalesInquiry.php:82 SelectQASamples.php:166
@@ -15383,12 +15383,12 @@
#: HistoricalTestResults.php:51
msgid "Show Test Results For"
-msgstr ""
+msgstr "Mostrar resultados de pruebas para"
#: HistoricalTestResults.php:72 SelectQASamples.php:251
#: TestPlanResults.php:128
msgid "From Sample Date"
-msgstr ""
+msgstr "Desde fecha de mustreo"
#: HistoricalTestResults.php:76 SelectQASamples.php:251
#: TestPlanResults.php:128
@@ -15404,7 +15404,7 @@
#: HistoricalTestResults.php:134
msgid "Historical Test Results for"
-msgstr ""
+msgstr "Resultados de pruebas históricas para"
#: HistoricalTestResults.php:136
msgid "Sample ID:"
@@ -15412,7 +15412,7 @@
#: HistoricalTestResults.php:136 PDFGrn.php:142 PDFStockTransfer.php:135
msgid "Lot/Serial:"
-msgstr ""
+msgstr "Lote/Serie:"
#: HistoricalTestResults.php:136
msgid "Identifier:"
@@ -20173,7 +20173,7 @@
#: PDFCOA.php:27
msgid "Select Certificate of Analysis To Print"
-msgstr ""
+msgstr "Seleccione el certificado de análisis a imprimir"
#: PDFCOA.php:35 PO_Items.php:844
msgid "Enter Item"
@@ -20185,7 +20185,7 @@
#: PDFCOA.php:51
msgid "Or Select Existing Lot"
-msgstr ""
+msgstr "O seleccione un lote existente"
#: PDFCOA.php:64
msgid "Lot/Serial"
@@ -26376,7 +26376,7 @@
#: SalesCategories.php:7 includes/MainMenuLinksArray.php:274
msgid "Sales Category Maintenance"
-msgstr "Administrar Categorías de Ventas"
+msgstr "Administrar categorías de ventas"
#: SalesCategories.php:63
msgid "Somthing is wrong with uploading a file"
@@ -26951,7 +26951,7 @@
#: SalesTopCustomersInquiry.php:6 SalesTopCustomersInquiry.php:9
msgid "Top Customer Sales Inquiry"
-msgstr "Consulta de ventas a mejores clientes"
+msgstr "Consultar ventas a mejores clientes"
#: SalesTopCustomersInquiry.php:82 SalesTopItemsInquiry.php:83
#: WWW_Users.php:685
@@ -26976,11 +26976,11 @@
#: SalesTopItemsInquiry.php:6
msgid "Top Sales Inquiry"
-msgstr "Consulta de Mejores Ventas"
+msgstr "Consultar mejores ventas"
#: SalesTopItemsInquiry.php:9 includes/MainMenuLinksArray.php:66
msgid "Top Sales Items Inquiry"
-msgstr "Consulta de artículos más vendidos"
+msgstr "Consultar artículos más vendidos"
#: SalesTypes.php:5 includes/MainMenuLinksArray.php:496
msgid "Sales Types"
@@ -27630,7 +27630,7 @@
#: SelectCustomer.php:215 SelectCustomer.php:247
msgid "Customer Inquiries"
-msgstr "Consultar clientes"
+msgstr "Consultas de clientes"
#: SelectCustomer.php:216 SelectCustomer.php:248
msgid "Customer Transactions"
@@ -27638,7 +27638,7 @@
#: SelectCustomer.php:221 includes/MainMenuLinksArray.php:117
msgid "Customer Transaction Inquiries"
-msgstr "Consultar Transacciones de clientes"
+msgstr "Consultas de transacciones de clientes"
#: SelectCustomer.php:222
msgid "Customer Account statement on screen"
@@ -28293,7 +28293,7 @@
#: SelectProduct.php:368 SelectProduct.php:486
msgid "Item Transactions"
-msgstr "Transacciones de Artículos"
+msgstr "Transacciones de artículos"
#: SelectProduct.php:369 SelectProduct.php:487 Stocks.php:5
msgid "Item Maintenance"
@@ -28442,7 +28442,7 @@
#: SelectQASamples.php:250 TestPlanResults.php:127
msgid "Lot Number"
-msgstr ""
+msgstr "Número de lote"
#: SelectQASamples.php:252 TestPlanResults.php:129
msgid "Search Samples"
@@ -28469,7 +28469,7 @@
#: SelectQASamples.php:398 TestPlanResults.php:281 TestPlanResults.php:757
msgid "Lot / Serial"
-msgstr ""
+msgstr "Lote / Serie"
#: SelectQASamples.php:399 SelectQASamples.php:503 SelectQASamples.php:563
#: TestPlanResults.php:282 TestPlanResults.php:758
@@ -28500,7 +28500,7 @@
#: SelectQASamples.php:499 SelectQASamples.php:559
#: includes/PDFWOPageHeader.inc:45
msgid "Lot"
-msgstr ""
+msgstr "Lote"
#: SelectQASamples.php:515 SelectQASamples.php:571
msgid "Use for Cert?"
@@ -28669,7 +28669,7 @@
#: SelectSupplier.php:166 SelectSupplier.php:204
msgid "Supplier Inquiries"
-msgstr "Consultar proveedores"
+msgstr "Consultas de proveedores"
#: SelectSupplier.php:167 SelectSupplier.php:205
msgid "Supplier Transactions"
@@ -30654,7 +30654,7 @@
#: StockCategorySalesInquiry.php:6 StockCategorySalesInquiry.php:9
#: includes/MainMenuLinksArray.php:59
msgid "Sales By Category By Item Inquiry"
-msgstr ""
+msgstr "Consultar ventas por categoría y por artículo"
#: StockCategorySalesInquiry.php:10
msgid "Select the parameters for the inquiry"
@@ -32508,7 +32508,7 @@
#: Stocks.php:1037
msgid "Long Description"
-msgstr ""
+msgstr "Descripción larga"
#: Stocks.php:1335
msgid "Order multiple. It is the minimum packing quantity."
@@ -34750,7 +34750,7 @@
#: Suppliers.php:776
msgid "Less than 30 characters"
-msgstr ""
+msgstr "Menos de 30 caracteres"
#: Suppliers.php:793 Suppliers.php:1044
msgid "Factor Company"
@@ -38045,7 +38045,7 @@
#: UserLocations.php:65
msgid "is already authorised for this user"
-msgstr ""
+msgstr "ya está autorizado para este usuario"
#: UserLocations.php:154
msgid "Authorised inventory locations for"
@@ -45303,11 +45303,11 @@
#: includes/MainMenuLinksArray.php:57
msgid "Sales By Sales Type Inquiry"
-msgstr "Consulta de ventas por tipo de venta"
+msgstr "Consultar ventas por tipo de venta"
#: includes/MainMenuLinksArray.php:58
msgid "Sales By Category Inquiry"
-msgstr "Consulta de ventas por categoría"
+msgstr "Consultar ventas por categoría"
#: includes/MainMenuLinksArray.php:60
msgid "Sales Analysis Reports"
@@ -45319,7 +45319,7 @@
#: includes/MainMenuLinksArray.php:62
msgid "Top Sellers Inquiry"
-msgstr "Consulta de mejores ventas"
+msgstr "Consultar mejores vendidos"
#: includes/MainMenuLinksArray.php:63
msgid "Order Delivery Differences Report"
@@ -45331,7 +45331,7 @@
#: includes/MainMenuLinksArray.php:67
msgid "Top Customers Inquiry"
-msgstr "Consulta de mejores clientes"
+msgstr "Consultar mejores clientes"
#: includes/MainMenuLinksArray.php:68
msgid "Worst Sales Items Report"
@@ -45573,11 +45573,11 @@
#: includes/MainMenuLinksArray.php:291
msgid "QA Samples and Test Results"
-msgstr ""
+msgstr "Muestras de control de calidad y resultados de pruebas"
#: includes/MainMenuLinksArray.php:297
msgid "Costed Bill Of Material Inquiry"
-msgstr "Consulta de lista de materiales costeada"
+msgstr "Consultar lista de materiales costeada"
#: includes/MainMenuLinksArray.php:300
msgid "Indented Bill Of Material Listing"
@@ -45617,11 +45617,11 @@
#: includes/MainMenuLinksArray.php:311
msgid "Print Certificate of Analysis"
-msgstr ""
+msgstr "Imprimir certificado de análisis"
#: includes/MainMenuLinksArray.php:312
msgid "Historical QA Test Results"
-msgstr ""
+msgstr "Resultados de pruebas de control de calidad históricas"
#: includes/MainMenuLinksArray.php:333
msgid "Bills Of Material"
@@ -45657,7 +45657,7 @@
#: includes/MainMenuLinksArray.php:365
msgid "Account Inquiry"
-msgstr "Consulta de cuenta"
+msgstr "Consultar cuenta"
#: includes/MainMenuLinksArray.php:366
msgid "Account Listing"
@@ -45737,7 +45737,7 @@
#: includes/MainMenuLinksArray.php:441
msgid "PC Expenses Analysis"
-msgstr ""
+msgstr "Análisis de gastos de caja chica"
#: includes/MainMenuLinksArray.php:446
msgid "Types of PC Tabs"
@@ -45809,7 +45809,7 @@
#: includes/MainMenuLinksArray.php:527
msgid "Inventory Locations Maintenance"
-msgstr "Administrar Ubicaciones (Sedes, Almacenes)"
+msgstr "Administrar ubicaciones (sedes, almacenes)"
#: includes/MainMenuLinksArray.php:530
msgid "Discount Category Maintenance"
@@ -50747,7 +50747,7 @@
#: ../webSHOP/CreditCardPayPalPro.php:277
msgid "Last Name"
-msgstr ""
+msgstr "Apellido"
#: ../webSHOP/CreditCardPayPalPro.php:278
msgid "The last name of the credit card holder"
@@ -50986,7 +50986,7 @@
#: ../webSHOP/Register.php:441
msgid "A password is required"
-msgstr ""
+msgstr "Una contraseña es requerida"
#: ../webSHOP/Register.php:442
msgid "The password is expected to 5 characters or more long"
|
|
From: <rc...@us...> - 2015-05-21 14:05:29
|
Revision: 7310
http://sourceforge.net/p/web-erp/reponame/7310
Author: rchacon
Date: 2015-05-21 14:05:27 +0000 (Thu, 21 May 2015)
Log Message:
-----------
Add missing preview.png on /css/default/images.
Added Paths:
-----------
trunk/css/default/images/preview.png
Added: trunk/css/default/images/preview.png
===================================================================
(Binary files differ)
Index: trunk/css/default/images/preview.png
===================================================================
--- trunk/css/default/images/preview.png 2015-05-21 13:09:09 UTC (rev 7309)
+++ trunk/css/default/images/preview.png 2015-05-21 14:05:27 UTC (rev 7310)
Property changes on: trunk/css/default/images/preview.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
|
|
From: <rc...@us...> - 2015-05-21 13:09:12
|
Revision: 7309
http://sourceforge.net/p/web-erp/reponame/7309
Author: rchacon
Date: 2015-05-21 13:09:09 +0000 (Thu, 21 May 2015)
Log Message:
-----------
Clean up SQL code file.
Modified Paths:
--------------
trunk/sql/mysql/upgrade4.12.2-4.12.3.sql
Modified: trunk/sql/mysql/upgrade4.12.2-4.12.3.sql
===================================================================
--- trunk/sql/mysql/upgrade4.12.2-4.12.3.sql 2015-05-19 14:13:54 UTC (rev 7308)
+++ trunk/sql/mysql/upgrade4.12.2-4.12.3.sql 2015-05-21 13:09:09 UTC (rev 7309)
@@ -1,12 +1,12 @@
-INSERT INTO `scripts` (`script`, `pagesecurity`, `description`) VALUES ('CustomerAccount.php', '1', 'Shows customer account/statement on screen rather than PDF');
-INSERT INTO `scripts` (`script`, `pagesecurity`, `description`) VALUES ('StockCategorySalesInquiry.php', '2', 'Sales inquiry by stock category showing top items');
-INSERT INTO `scripts` (`script`, `pagesecurity`, `description`) VALUES ('PcAnalysis.php', '15', 'Creates an Excel with details of PC expnese for 24 months');
+INSERT INTO `scripts` (`script`, `pagesecurity`, `description`) VALUES
+ ('CustomerAccount.php', '1', 'Shows customer account/statement on screen rather than PDF'),
+ ('PcAnalysis.php', '15', 'Creates an Excel with details of PC expense for 24 months'),
+ ('StockCategorySalesInquiry.php', '2', 'Sales inquiry by stock category showing top items');
-- Add field to store location's GL account code:
ALTER TABLE `locations` ADD `glaccountcode` VARCHAR(20) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT 'GL account of the location';
-- Add field to allow or deny the invoicing of items in this location:
ALTER TABLE `locations` ADD `allowinvoicing` TINYINT(1) NOT NULL DEFAULT '1' COMMENT 'Allow invoicing of items at this location';
----- QUESTION: Existing locations are (always) set to 1? ***********************
-- Update version number:
UPDATE config SET confvalue='4.12.3' WHERE confname='VersionNumber';
|
|
From: <rc...@us...> - 2015-05-19 14:13:57
|
Revision: 7308
http://sourceforge.net/p/web-erp/reponame/7308
Author: rchacon
Date: 2015-05-19 14:13:54 +0000 (Tue, 19 May 2015)
Log Message:
-----------
Add documentation and help for users in Locations.php and ManualInventory.html.
Modified Paths:
--------------
trunk/Locations.php
trunk/doc/Change.log
trunk/doc/Manual/ManualInventory.html
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
Modified: trunk/Locations.php
===================================================================
--- trunk/Locations.php 2015-05-19 12:34:08 UTC (rev 7307)
+++ trunk/Locations.php 2015-05-19 14:13:54 UTC (rev 7308)
@@ -633,12 +633,14 @@
<tr>
<td>' . _('Facsimile No') . ':' . '</td>
<td><input name="Fax" type="tel" pattern="[0-9+\-\s()]*" value="' . $_POST['Fax'] . '" size="31" maxlength="30" title="' . _('The fax number should consist of numbers, parentheses, spaces or the + character') . '"/></td>
- </tr>
- <tr>
- <td>' . _('Email') . ':' . '</td>
- <td><input name="Email" type="email" value="' . $_POST['Email'] . '" size="31" maxlength="55" /></td>
- </tr>
- <tr>
+ </tr>';
+ // Email address:
+ echo '<tr title="', _('The email address should be an email format such as ad...@we...'), '">
+ <td><label for="Email">', _('Email'), ':</label></td>
+ <td><input id="Email" maxlength="55" name="Email" size="31" type="email" value="', $_POST['Email'], '" /></td>
+ </tr>';
+ // Tax Province:
+ echo '<tr>
<td>' . _('Tax Province') . ':' . '</td>
<td><select name="TaxProvince">';
@@ -719,4 +721,4 @@
}//end if record deleted no point displaying form to add record
include('includes/footer.inc');
-?>
\ No newline at end of file
+?>
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-05-19 12:34:08 UTC (rev 7307)
+++ trunk/doc/Change.log 2015-05-19 14:13:54 UTC (rev 7308)
@@ -1,4 +1,7 @@
webERP Change Log
+
+19/5/15 RChacon: Add documentation and help for users in Locations.php and ManualInventory.html.
+
17/5/15 Version 4.12.3
17/5/15 Phil: Made currencies delete check first for bank accounts set up using the currency - as reported by Ricard
Modified: trunk/doc/Manual/ManualInventory.html
===================================================================
--- trunk/doc/Manual/ManualInventory.html 2015-05-19 12:34:08 UTC (rev 7307)
+++ trunk/doc/Manual/ManualInventory.html 2015-05-19 14:13:54 UTC (rev 7308)
@@ -522,36 +522,38 @@
<p>When creating a purchase order, the inventory location that it is required for is specified. The inventory location address and contact details defined here are used as the default addresses available for delivery of goods ordered on purchase orders.</p>
<dl>
- <!--dt><Location Code</dt>
- <dd>.</dd>
+ <dt>Location Code</dt>
+ <dd>Enter up to five characters for the inventory location code.</dd>
<dt>Location Name</dt>
- <dd>.</dd>
+ <dd>The inventory location name could be either a warehouse or a factory.</dd>
<dt>Contact for deliveries</dt>
+ <dd>This field is for the name of the responsible person to contact for this inventory location.</dd>
+ <!--dt>Delivery Address 1 (Building)</dt>
<dd>.</dd>
- <dt>Delivery Address 1 (Building)</dt>
+ <dt>Delivery Address 2 (Street)</dt>
<dd>.</dd>
- <dt>Delivery Address 2 (Street):</dt>
+ <dt>Delivery Address 3 (Suburb)</dt>
<dd>.</dd>
- <dt>Delivery Address 3 (Suburb):</dt>
+ <dt>Delivery Address 4 (City)</dt>
<dd>.</dd>
- <dt>Delivery Address 4 (City):</dt>
+ <dt>Delivery Address 5 (Zip Code)</dt>
<dd>.</dd>
- <dt>Delivery Address 5 (Zip Code):</dt>
- <dd>.</dd>
<dt>Country</dt>
- <dd>.</dd>
- <dt>Telephone No:</dt>
- <dd>.</dd>
- <dt>Facsimile No:</dt>
- <dd>.</dd>
- <dt>Email:</dt>
<dd>.</dd-->
- <dt>Tax Province:</dt>
+ <dt>Telephone No</dt>
+ <dd>The phone number should consist of numbers, spaces, parentheses, or the + character.</dd>
+ <dt>Facsimile No</dt>
+ <dd>The fax number should consist of numbers, spaces, parentheses, or the + character.</dd>
+ <dt>Email</dt>
+ <dd>The email address should be an email format such as ad...@we....</dd>
+ <dt>Tax Province</dt>
<dd>Since the location represents the physical location from where goods/services are supplied it is important for determining the tax applicable on a sale. The governing tax authority must specified with the location record. It is used in the calculation of the applicable rate of tax in conjunction with the tax authority of the customer branch being delivered to and the tax level of the item being sold.</dd>
<dt><a id="DefaultCounterSalesCustomerCode">Default Counter Sales Customer Code</a></dt>
- <dd>The counter sales functionality looks at the default inventory location for a user and when that user enters a counter sale it uses the customer account and customer branch defined against the inventory location record. Consider a business with locations in Melbourne Australia and one in Anahaim USA - it is unlikely that a user based in Anaheim would be making a counter sale in Melbourne! Each location can have a customer account (and branch) defined for it's counter sales. These customers are expected to be cash only customers as the counter sales functionality expects the cash to be taken at the time of the sale. Not a substitute for proper Point of Sale - but suitable for occassional Counter Sales.</dd>
+ <dd>The counter sales functionality looks at the default inventory location for a user and when that user enters a counter sale it uses the customer account and customer branch defined against the inventory location record. Consider a business with locations in Melbourne Australia and one in Anahaim USA - it is unlikely that a user based in Anaheim would be making a counter sale in Melbourne! Each location can have a customer account (and branch) defined for it's counter sales. These customers are expected to be cash only customers as the counter sales functionality expects the cash to be taken at the time of the sale. Not a substitute for proper Point of Sale - but suitable for occassional Counter Sales.<br />
+ If counter sales are being used for this location then an existing customer account code needs to be entered here. All sales created from the counter sales will be recorded against this customer account.</dd>
<dt>Counter Sales Branch Code</dt>
- <dd>See <a href="#DefaultCounterSalesCustomerCode">Default Counter Sales Customer Code</a>.</dd>
+ <dd>If counter sales are being used for this location then an existing customer branch code for the customer account code entered above needs to be entered here. All sales created from the counter sales will be recorded against this branch.<br />
+ See <a href="#DefaultCounterSalesCustomerCode">Default Counter Sales Customer Code</a>.</dd>
<!--dt>Allow internal requests?:</dt>
<dd>.</dd-->
<dt>Use for Work Order Productions?</dt>
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-05-19 12:34:08 UTC (rev 7307)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2015-05-19 14:13:54 UTC (rev 7308)
@@ -8,7 +8,7 @@
"Project-Id-Version: webERP 4.12.2\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-05-17 13:40+1200\n"
-"PO-Revision-Date: 2015-05-17 20:11-0600\n"
+"PO-Revision-Date: 2015-05-19 07:25-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: TecnoSoluciones.com <web...@te...>\n"
"Language: es_ES\n"
@@ -29557,7 +29557,7 @@
#: ShopParameters.php:233
msgid "Shop Manager Email"
-msgstr ""
+msgstr "Correo-e del gerente de tienda"
#: ShopParameters.php:235
msgid "Enter the email address of the webSHOP manager."
|
|
From: <rc...@us...> - 2015-05-19 12:34:11
|
Revision: 7307
http://sourceforge.net/p/web-erp/reponame/7307
Author: rchacon
Date: 2015-05-19 12:34:08 +0000 (Tue, 19 May 2015)
Log Message:
-----------
Spanish translation improvements.
Modified Paths:
--------------
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
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-05-18 13:33:12 UTC (rev 7306)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2015-05-19 12:34:08 UTC (rev 7307)
@@ -8,7 +8,7 @@
"Project-Id-Version: webERP 4.12.2\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-05-17 13:40+1200\n"
-"PO-Revision-Date: 2015-05-14 08:31-0600\n"
+"PO-Revision-Date: 2015-05-17 20:11-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: TecnoSoluciones.com <web...@te...>\n"
"Language: es_ES\n"
@@ -16975,6 +16975,7 @@
#: Locations.php:538
msgid "Enter up to five characters for the inventory location code"
msgstr ""
+"Introduzca hasta cinco caracteres para el código de ubicación de inventario"
#: Locations.php:589
msgid ""
@@ -16991,6 +16992,8 @@
"Enter the name of the responsible person to contact for this inventory "
"location"
msgstr ""
+"introduzca el nombre de la persona responsable a contactar para esta "
+"ubicación de inventario"
#: Locations.php:596
msgid "Delivery Address 1 (Building)"
@@ -17013,6 +17016,8 @@
"The phone number should consist of numbers, spaces, parentheses, or the + "
"character"
msgstr ""
+"El número de teléfono debe consistir en números, espacios, paréntesis, o el "
+"carácter +"
#: Locations.php:634 SalesPeople.php:344 SupplierContacts.php:269
msgid "Facsimile No"
@@ -17023,6 +17028,8 @@
"The fax number should consist of numbers, parentheses, spaces or the + "
"character"
msgstr ""
+"El número de facsímil debe consistir en números, espacios, paréntesis, o el "
+"carácter +"
#: Locations.php:657
msgid "Default Counter Sales Customer Code"
@@ -17059,12 +17066,16 @@
msgid ""
"Enter the GL account for this location, or leave it in blank if not needed"
msgstr ""
+"Introduzca la cuenta contable para esta ubicación, o déjelo en blanco si no "
+"se necesita"
#: Locations.php:698
msgid ""
"Use this parameter to indicate whether these inventory location allows or "
"denies the invoicing of its items."
msgstr ""
+"Use este parámetro para indicar si esta ubicación de inventario permite o "
+"deniega la facturación de sus artículos."
#: LocationUsers.php:5 includes/MainMenuLinksArray.php:528
msgid "Inventory Location Authorised Users Maintenance"
|
|
From: <aga...@us...> - 2015-05-18 13:33:15
|
Revision: 7306
http://sourceforge.net/p/web-erp/reponame/7306
Author: agaluski
Date: 2015-05-18 13:33:12 +0000 (Mon, 18 May 2015)
Log Message:
-----------
Improved Dynamic width of Spec name
Modified Paths:
--------------
trunk/includes/PDFProdSpecHeader.inc
Modified: trunk/includes/PDFProdSpecHeader.inc
===================================================================
--- trunk/includes/PDFProdSpecHeader.inc 2015-05-18 13:29:38 UTC (rev 7305)
+++ trunk/includes/PDFProdSpecHeader.inc 2015-05-18 13:33:12 UTC (rev 7306)
@@ -31,8 +31,8 @@
$YPos -= $line_height;
$YPos -= $line_height;
$pdf->setFont('','B');
-$LeftOvers = $pdf->addTextWrap($XPos+1,$YPos,240,$FontSize,$Spec);
-$Offset= array_sum($pdf->GetStringWidth(($Spec), '', '', 0, true)) + 4;
+$Offset= array_sum($pdf->GetStringWidth(($Spec), '', '', 0, true)) + 2;
+$LeftOvers = $pdf->addTextWrap($XPos+1,$YPos,$Offset,$FontSize,$Spec);
$pdf->setFont('','');
$LeftOvers = $pdf->addTextWrap($XPos+$Offset,$YPos,500-$Offset,$FontSize,'- ' . $SpecDesc);
while (mb_strlen($LeftOvers) > 1) {
|
15 messages has been excluded from this view by a project administrator.
