Menu
▾
▴
web-erp-svn
|
From: <dai...@us...> - 2013-11-15 23:37:42
|
Revision: 6403
http://sourceforge.net/p/web-erp/reponame/6403
Author: daintree
Date: 2013-11-15 23:37:39 +0000 (Fri, 15 Nov 2013)
Log Message:
-----------
MacPhotoBiker: shipment charges html5 type=number removed to use the class=number javascript
Modified Paths:
--------------
trunk/SuppShiptChgs.php
trunk/doc/INSTALL.txt
trunk/sql/mysql/country_sql/demo.sql
Modified: trunk/SuppShiptChgs.php
===================================================================
--- trunk/SuppShiptChgs.php 2013-11-14 17:22:11 UTC (rev 6402)
+++ trunk/SuppShiptChgs.php 2013-11-15 23:37:39 UTC (rev 6403)
@@ -145,7 +145,7 @@
}
echo '<tr>
<td>' . _('Amount') . ':</td>
- <td><input type="number" pattern="(?!^[-]?0[,.]0*$).{1,11}" required="required" title="'._('The input must be non zero number').'" placeholder="'._('Non zero number').'" name="Amount" size="12" maxlength="11" value="' . locale_number_format($_POST['Amount'],$_SESSION['SuppTrans']->CurrDecimalPlaces) . '" /></td>
+ <td><input type="text" class="number" required="required" title="'._('The input must be non zero number').'" placeholder="'._('Non zero number').'" name="Amount" size="12" maxlength="11" value="' . locale_number_format($_POST['Amount'],$_SESSION['SuppTrans']->CurrDecimalPlaces) . '" /></td>
</tr>
</table>';
Modified: trunk/doc/INSTALL.txt
===================================================================
--- trunk/doc/INSTALL.txt 2013-11-14 17:22:11 UTC (rev 6402)
+++ trunk/doc/INSTALL.txt 2013-11-15 23:37:39 UTC (rev 6403)
@@ -22,7 +22,7 @@
If you are running the upgrade script with the mysql command line client, after editing the script as described above the syntax to use is as follows:
-mysql --user=weberp_db_user --password='some_pass' < /webERP/sql/upgradescriptname.sql
+mysql --user=weberp_db_user --password='some_pass' < /webERP/sql/mysql/upgradescriptname.sql
where weberp_db_user is the name of your mysql user and some_pass is the password for that user.
Modified: trunk/sql/mysql/country_sql/demo.sql
===================================================================
--- trunk/sql/mysql/country_sql/demo.sql 2013-11-14 17:22:11 UTC (rev 6402)
+++ trunk/sql/mysql/country_sql/demo.sql 2013-11-15 23:37:39 UTC (rev 6403)
@@ -1,5 +1,3 @@
-CREATE DATABASE IF NOT EXISTS weberpdemo;
-USE weberpdemo;
SET FOREIGN_KEY_CHECKS = 0;
-- MySQL dump 10.13 Distrib 5.5.32, for debian-linux-gnu (x86_64)
--
|
|
From: <rc...@us...> - 2013-11-16 17:13:52
|
Revision: 6405
http://sourceforge.net/p/web-erp/reponame/6405
Author: rchacon
Date: 2013-11-16 17:13:48 +0000 (Sat, 16 Nov 2013)
Log Message:
-----------
Improves translation and format in PaymentMethods.php
Modified Paths:
--------------
trunk/css/default/default.css
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
Modified: trunk/css/default/default.css
===================================================================
--- trunk/css/default/default.css 2013-11-15 23:39:40 UTC (rev 6404)
+++ trunk/css/default/default.css 2013-11-16 17:13:48 UTC (rev 6405)
@@ -88,12 +88,15 @@
td {
text-align:left;
}
-td.select{
- background-color:#eee;
+td.centre{
+ text-align:center;
}
td.number{
text-align:right;
}
+td.select{
+ background-color:#eee;
+}
div.centre{
margin:0 auto;
text-align:center;
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 2013-11-15 23:39:40 UTC (rev 6404)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2013-11-16 17:13:48 UTC (rev 6405)
@@ -8,7 +8,7 @@
"Project-Id-Version: WebERP 4.081\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-09-06 21:34+1200\n"
-"PO-Revision-Date: 2013-11-02 18:01-0600\n"
+"PO-Revision-Date: 2013-11-16 11:08-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: TecnoSoluciones.com <web...@te...>\n"
"Language: es_ES\n"
@@ -17812,7 +17812,7 @@
#: PaymentMethods.php:7 includes/MainMenuLinksArray.php:473
msgid "Payment Methods"
-msgstr "Formas de Pago"
+msgstr "Formas de pago"
#: PaymentMethods.php:39
msgid "The payment method cannot contain illegal characters"
@@ -17879,15 +17879,15 @@
#: PaymentMethods.php:185 PaymentMethods.php:267
msgid "Payment Method"
-msgstr "Forma de Pago"
+msgstr "Forma de pago"
#: PaymentMethods.php:186
msgid "For Payments"
-msgstr "Por Pagos"
+msgstr "Para pagos"
#: PaymentMethods.php:187
msgid "For Receipts"
-msgstr "Para Recibos (A Cobrar)"
+msgstr "Para ingresos"
#: PaymentMethods.php:188
msgid "Use Pre-printed"
@@ -17899,7 +17899,7 @@
#: PaymentMethods.php:189
msgid "Open Cash Drawer"
-msgstr "Abrir Caja de Efectivo"
+msgstr "Abrir caja registradora"
#: PaymentMethods.php:209
msgid "Are you sure you wish to delete this payment method?"
@@ -17907,7 +17907,7 @@
#: PaymentMethods.php:218
msgid "Review Payment Methods"
-msgstr "Revisar Formas de Pago"
+msgstr "Revisar formas de pago"
#: PaymentMethods.php:242
msgid "Could not retrieve the requested payment method, please try again."
@@ -17916,19 +17916,19 @@
#: PaymentMethods.php:271
msgid "Use For Payments"
-msgstr "Usar Para Pagos"
+msgstr "Usar en pagos"
#: PaymentMethods.php:278
msgid "Use For Receipts"
-msgstr "Usar Para Recibos (Cobros)"
+msgstr "Usar en recibos"
#: PaymentMethods.php:285
msgid "Use Pre-printed Stationery"
-msgstr "Usar Papelería Preimpresa"
+msgstr "Usar en papelería preimpresa"
#: PaymentMethods.php:292
msgid "Open POS Cash Drawer for Sale"
-msgstr "Abrir Caja Registradora para Venta"
+msgstr "Abrir caja registradora para ventas"
#: Payments.php:23
msgid "Payment Cancelled since cheque was not printed"
@@ -47622,9 +47622,8 @@
msgstr "Detalles de la Entrega"
#: ../webSHOP/Checkout.php:481
-#, fuzzy
msgid "Choose Your Preferred Payment Method"
-msgstr "Revisar Formas de Pago"
+msgstr "Elija su forma de pago preferida"
#: ../webSHOP/Checkout.php:483 ../webSHOP/includes/DisplayShoppingCart.php:79
#, fuzzy
@@ -47647,14 +47646,12 @@
msgstr "Selección de detalles de reparto"
#: ../webSHOP/Checkout.php:512
-#, fuzzy
msgid "Review Freight Method and Charges"
-msgstr "Revisar Formas de Pago"
+msgstr "Revise forma de envío y cargos."
#: ../webSHOP/Checkout.php:513
-#, fuzzy
msgid "Confirm Selected Payment Method"
-msgstr "Revisar Formas de Pago"
+msgstr "Confirmar forma de pago seleccionada"
#: ../webSHOP/Checkout.php:523
#, fuzzy
|
|
From: <rc...@us...> - 2013-11-16 17:16:47
|
Revision: 6406
http://sourceforge.net/p/web-erp/reponame/6406
Author: rchacon
Date: 2013-11-16 17:16:44 +0000 (Sat, 16 Nov 2013)
Log Message:
-----------
Improves translation and format in PaymentMethods.php (part 2).
Modified Paths:
--------------
trunk/PaymentMethods.php
trunk/doc/Change.log
Modified: trunk/PaymentMethods.php
===================================================================
--- trunk/PaymentMethods.php 2013-11-16 17:13:48 UTC (rev 6405)
+++ trunk/PaymentMethods.php 2013-11-16 17:16:44 UTC (rev 6406)
@@ -183,10 +183,10 @@
echo '<table class="selection">
<tr>
<th>' . _('Payment Method') . '</th>
- <th>' . _('For Payments') . '</th>
- <th>' . _('For Receipts') . '</th>
- <th>' . _('Use Pre-printed') . '<br />' . _('Stationery') . '</th>
- <th>' . _('Open Cash Drawer') . '</th>
+ <th>' . _('Use For Payments') . '</th>
+ <th>' . _('Use For Receipts') . '</th>
+ <th>' . _('Use Pre-printed Stationery') . '</th>
+ <th>' . _('Open POS Cash Drawer for Sale') . '</th>
</tr>';
$k=0; //row colour counter
@@ -201,10 +201,10 @@
}
echo '<td>' . $myrow['paymentname'] . '</td>
- <td>' . ($myrow['paymenttype'] ? _('Yes') : _('No')) . '</td>
- <td>' . ($myrow['receipttype'] ? _('Yes') : _('No')) . '</td>
- <td>' . ($myrow['usepreprintedstationery'] ? _('Yes') : _('No')) . '</td>
- <td>' . ($myrow['opencashdrawer'] ? _('Yes') : _('No')) . '</td>
+ <td class="centre">' . ($myrow['paymenttype'] ? _('Yes') : _('No')) . '</td>
+ <td class="centre">' . ($myrow['receipttype'] ? _('Yes') : _('No')) . '</td>
+ <td class="centre">' . ($myrow['usepreprintedstationery'] ? _('Yes') : _('No')) . '</td>
+ <td class="centre">' . ($myrow['opencashdrawer'] ? _('Yes') : _('No')) . '</td>
<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?SelectedPaymentID=' . $myrow['paymentid'] . '">' . _('Edit') . '</a></td>
<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?SelectedPaymentID=' . $myrow['paymentid'] . '&delete=1" onclick="return confirm(\'' . _('Are you sure you wish to delete this payment method?') . '\');">' . _('Delete') . '</a></td>
</tr>';
@@ -304,4 +304,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 2013-11-16 17:13:48 UTC (rev 6405)
+++ trunk/doc/Change.log 2013-11-16 17:16:44 UTC (rev 6406)
@@ -1,5 +1,6 @@
webERP Change Log
+16/11/13 rchacon: Mejora la traducción y el formato en PaymentMethods.php.
16/11/13 Phil: MacPhotoBiker reported shipment charges html5 type=number removed to use the class=number javascript'
12/11/13 rchacon: Allow translation of the subkey name in FormDesigner.php.
07/11/13 rchacon: Allow translation of the key name in FormDesigner.php.
|
|
From: <ex...@us...> - 2013-11-19 04:39:21
|
Revision: 6416
http://sourceforge.net/p/web-erp/reponame/6416
Author: exsonqu
Date: 2013-11-19 04:39:18 +0000 (Tue, 19 Nov 2013)
Log Message:
-----------
19/11/2013 Thumb: Add '-' to telephone no pattern in CustomerBranches.php and WWW_Users.php.
Modified Paths:
--------------
trunk/CustomerBranches.php
trunk/WWW_Users.php
Modified: trunk/CustomerBranches.php
===================================================================
--- trunk/CustomerBranches.php 2013-11-19 04:36:26 UTC (rev 6415)
+++ trunk/CustomerBranches.php 2013-11-19 04:39:18 UTC (rev 6416)
@@ -796,14 +796,14 @@
if (!isset($_POST['PhoneNo'])) {
$_POST['PhoneNo']='';
}
- echo '<td><input tabindex="16" type="tel" name="PhoneNo" pattern="[0-9+()\s]*" size="22" maxlength="20" value="'. $_POST['PhoneNo'].'" /></td>
+ echo '<td><input tabindex="16" type="tel" name="PhoneNo" pattern="[0-9+()\s-]*" size="22" maxlength="20" value="'. $_POST['PhoneNo'].'" /></td>
</tr>
<tr>
<td>' . _('Fax Number').':</td>';
if (!isset($_POST['FaxNo'])) {
$_POST['FaxNo']='';
}
- echo '<td><input tabindex="17" type="tel" name="FaxNo" pattern="[0-9+()\s]*" size="22" maxlength="20" value="'. $_POST['FaxNo'].'" /></td>
+ echo '<td><input tabindex="17" type="tel" name="FaxNo" pattern="[0-9+()\s-]*" size="22" maxlength="20" value="'. $_POST['FaxNo'].'" /></td>
</tr>';
if (!isset($_POST['Email'])) {
Modified: trunk/WWW_Users.php
===================================================================
--- trunk/WWW_Users.php 2013-11-19 04:36:26 UTC (rev 6415)
+++ trunk/WWW_Users.php 2013-11-19 04:39:18 UTC (rev 6416)
@@ -460,7 +460,7 @@
</tr>';
echo '<tr>
<td>' . _('Telephone No') . ':</td>
- <td><input type="tel" name="Phone" pattern="[0-9+()\s]*" value="' . $_POST['Phone'] . '" size="32" maxlength="30" /></td>
+ <td><input type="tel" name="Phone" pattern="[0-9+()\s-]*" value="' . $_POST['Phone'] . '" size="32" maxlength="30" /></td>
</tr>';
echo '<tr>
<td>' . _('Email Address') .':</td>
|
|
From: <dai...@us...> - 2013-11-19 07:21:27
|
Revision: 6421
http://sourceforge.net/p/web-erp/reponame/6421
Author: daintree
Date: 2013-11-19 07:21:24 +0000 (Tue, 19 Nov 2013)
Log Message:
-----------
Prepare SQL scripts for new release
Modified Paths:
--------------
trunk/UpgradeDatabase.php
trunk/sql/mysql/upgrade4.11-4.12.sql
Added Paths:
-----------
trunk/sql/mysql/upgrade4.11.1-4.11.2.sql
Modified: trunk/UpgradeDatabase.php
===================================================================
--- trunk/UpgradeDatabase.php 2013-11-19 07:11:39 UTC (rev 6420)
+++ trunk/UpgradeDatabase.php 2013-11-19 07:21:24 UTC (rev 6421)
@@ -177,6 +177,9 @@
case '4.10.1':
$SQLScripts[] = './sql/mysql/upgrade4.10-4.11.sql';
case '4.11.0':
+ case '4.11.1':
+ $SQLScripts[] = './sql/mysql/upgrade4.11.1-4.11.2.sql';
+ case '4.11.2':
break;
} //end switch
}
@@ -269,4 +272,4 @@
} /*Dont do upgrade */
include('includes/footer.inc');
-?>
\ No newline at end of file
+?>
Modified: trunk/sql/mysql/upgrade4.11-4.12.sql
===================================================================
--- trunk/sql/mysql/upgrade4.11-4.12.sql 2013-11-19 07:11:39 UTC (rev 6420)
+++ trunk/sql/mysql/upgrade4.11-4.12.sql 2013-11-19 07:21:24 UTC (rev 6421)
@@ -1,10 +1,4 @@
-INSERT INTO scripts VALUES ('Z_UpdateSalesAnalysisWithLatestCustomerData.php','15','Update sales analysis with latest customer and branch salesperson sales area and salestype irrespective of what these settings were when the sale was made');
-INSERT INTO scripts VALUES ('PurchaseByPrefSupplier.php','2','Purchase ordering by preferred supplier');
-ALTER TABLE `suppliers` ADD COLUMN `url` varchar(50) NOT NULL DEFAULT '';
-INSERT INTO config VALUES ('ShopFreightMethod','webERPCalculation');
-INSERT INTO config VALUES ('ShopPaypalCommissionAccount', '7220');
-INSERT INTO `scripts` (`script` , `pagesecurity` , `description`) VALUES ('StockClone.php', '11', 'Script to copy a stock item and associated properties, image, price, purchase and cost data');
-#--UPDATE config SET confvalue='4.11.0' WHERE confname='VersionNumber';
-ALTER table locstock change bin bin varchar(10) NOT NULL DEFAULT '';
+#--UPDATE config SET confvalue='4.12' WHERE confname='VersionNumber';
+
Added: trunk/sql/mysql/upgrade4.11.1-4.11.2.sql
===================================================================
--- trunk/sql/mysql/upgrade4.11.1-4.11.2.sql (rev 0)
+++ trunk/sql/mysql/upgrade4.11.1-4.11.2.sql 2013-11-19 07:21:24 UTC (rev 6421)
@@ -0,0 +1,9 @@
+INSERT INTO scripts VALUES ('Z_UpdateSalesAnalysisWithLatestCustomerData.php','15','Update sales analysis with latest customer and branch salesperson sales area and salestype irrespective of what these settings were when the sale was made');
+INSERT INTO scripts VALUES ('PurchaseByPrefSupplier.php','2','Purchase ordering by preferred supplier');
+ALTER TABLE `suppliers` ADD COLUMN `url` varchar(50) NOT NULL DEFAULT '';
+INSERT INTO config VALUES ('ShopFreightMethod','webERPCalculation');
+INSERT INTO config VALUES ('ShopPaypalCommissionAccount', '7220');
+INSERT INTO `scripts` (`script` , `pagesecurity` , `description`) VALUES ('StockClone.php', '11', 'Script to copy a stock item and associated properties, image, price, purchase and cost data');
+ALTER table locstock change bin bin varchar(10) NOT NULL DEFAULT '';
+UPDATE config SET confvalue='4.11.2' WHERE confname='VersionNumber';
+
|
|
From: <dai...@us...> - 2013-11-20 07:27:59
|
Revision: 6422
http://sourceforge.net/p/web-erp/reponame/6422
Author: daintree
Date: 2013-11-20 07:27:56 +0000 (Wed, 20 Nov 2013)
Log Message:
-----------
Phil: Payments.php FunctionalExchangeRate was not defaulted appropriately when entering a supplier payment in FX from a bank account of the same currency selected and the transaction was posted immediately without update first. Fixed
Modified Paths:
--------------
trunk/Payments.php
trunk/doc/Change.log
Modified: trunk/Payments.php
===================================================================
--- trunk/Payments.php 2013-11-19 07:21:24 UTC (rev 6421)
+++ trunk/Payments.php 2013-11-20 07:27:56 UTC (rev 6422)
@@ -142,15 +142,22 @@
$ErrMsg);
$myrow = DB_fetch_array($result);
- $_SESSION['PaymentDetail' . $identifier]->AccountCurrency=$myrow['currcode'];
- $_SESSION['PaymentDetail' . $identifier]->CurrDecimalPlaces=$myrow['decimalplaces'];
+ if ($_SESSION['PaymentDetail' . $identifier]->AccountCurrency != $myrow['currcode']) {
+ //then we'd better update the functional exchange rate
+ $DefaultFunctionalRate = true;
+ $_SESSION['PaymentDetail' . $identifier]->AccountCurrency = $myrow['currcode'];
+ $_SESSION['PaymentDetail' . $identifier]->CurrDecimalPlaces = $myrow['decimalplaces'];
+ } else {
+ $DefaultFunctionalRate = false;
+ }
+} else {
+
+ $_SESSION['PaymentDetail' . $identifier]->AccountCurrency = $_SESSION['CompanyRecord']['currencydefault'];
+ $_SESSION['PaymentDetail' . $identifier]->CurrDecimalPlaces = $_SESSION['CompanyRecord']['decimalplaces'];
-} else {
- $_SESSION['PaymentDetail' . $identifier]->AccountCurrency =$_SESSION['CompanyRecord']['currencydefault'];
- $_SESSION['PaymentDetail' . $identifier]->CurrDecimalPlaces=$_SESSION['CompanyRecord']['decimalplaces'];
}
if (isset($_POST['DatePaid']) AND $_POST['DatePaid']!='' AND Is_Date($_POST['DatePaid'])){
- $_SESSION['PaymentDetail' . $identifier]->DatePaid=$_POST['DatePaid'];
+ $_SESSION['PaymentDetail' . $identifier]->DatePaid = $_POST['DatePaid'];
}
if (isset($_POST['ExRate']) AND $_POST['ExRate']!=''){
$_SESSION['PaymentDetail' . $identifier]->ExRate=filter_number_format($_POST['ExRate']); //ex rate between payment currency and account currency
@@ -166,7 +173,6 @@
/* Payment currency is the currency that is being paid */
$_SESSION['PaymentDetail' . $identifier]->Currency=$_POST['Currency']; // Payment currency
-
if ($_SESSION['PaymentDetail' . $identifier]->AccountCurrency==$_SESSION['CompanyRecord']['currencydefault']){
$_POST['FunctionalExRate']=1;
$_SESSION['PaymentDetail' . $identifier]->FunctionalExRate=1;
@@ -186,10 +192,11 @@
$result = DB_query("SELECT rate FROM currencies WHERE currabrev='" . $_SESSION['PaymentDetail' . $identifier]->AccountCurrency . "'",$db);
$myrow = DB_fetch_row($result);
$SuggestedFunctionalExRate = $myrow[0];
-
+ if ($DefaultFunctionalRate) {
+ $_SESSION['PaymentDetail' . $identifier]->FunctionalExRate = $SuggestedFunctionalExRate;
+ }
}
-
if ($_POST['Currency']==$_SESSION['PaymentDetail' . $identifier]->AccountCurrency){
/* if the currency being paid is the same as the bank account currency then default ex rate to 1 */
$_POST['ExRate']=1;
@@ -203,7 +210,6 @@
/*Calculate cross rate to suggest appropriate exchange rate between payment currency and account currency */
$SuggestedExRate = $TableExRate/$SuggestedFunctionalExRate;
}
-
}
if (isset($_POST['BankTransRef']) AND $_POST['BankTransRef']!=''){ // Reference on Bank Transactions Inquiry
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2013-11-19 07:21:24 UTC (rev 6421)
+++ trunk/doc/Change.log 2013-11-20 07:27:56 UTC (rev 6422)
@@ -1,10 +1,12 @@
webERP Change Log
-2013/11/19 Thumb/CQZ: Add webERP Chinese country sql including Chinese COA, currency, role,tax, transaction type etc which should be localized.
-2013/11/19 Thumb: Add '-' to telephone no pattern in CustomerBranches.php and WWW_Users.php.
-2013/11/19 Thumb: Correct translation of customer text and customer code in CustomerReceipt.php of locale file.
-2013/11/19 Thumb: Text 'settled transaction' position adjusted to proper position in PrintCustStatements.php.
-2013/11/18 Exson: Make inventory it as default to show inventory serial no in ConfirmDispatchControlled_Invoice.php.
-2013/11/18 Exson Make company name client side requirements consistent with server side in CompanyPreferences.php.
+
+20/11/13 Phil: Payments.php FunctionalExchangeRate was not defaulted appropriately when entering a supplier payment in FX from a bank account of the same currency selected and the transaction was posted immediately without update first. Fixed
+19/11/13 Thumb/CQZ: Add webERP Chinese country sql including Chinese COA, currency, role,tax, transaction type etc which should be localized.
+19/11/13 Thumb: Add '-' to telephone no pattern in CustomerBranches.php and WWW_Users.php.
+19/11/13 Thumb: Correct translation of customer text and customer code in CustomerReceipt.php of locale file.
+19/11/13 Thumb: Text 'settled transaction' position adjusted to proper position in PrintCustStatements.php.
+18/11/13 Exson: Make inventory it as default to show inventory serial no in ConfirmDispatchControlled_Invoice.php.
+18/11/13 Exson Make company name client side requirements consistent with server side in CompanyPreferences.php.
16/11/13 rchacon: Improves translation and format in PaymentMethods.php.
16/11/13 Phil: MacPhotoBiker reported shipment charges html5 type=number removed to use the class=number javascript'
12/11/13 rchacon: Allow translation of the subkey name in FormDesigner.php.
|
|
From: <rc...@us...> - 2013-11-20 23:21:43
|
Revision: 6423
http://sourceforge.net/p/web-erp/reponame/6423
Author: rchacon
Date: 2013-11-20 23:21:40 +0000 (Wed, 20 Nov 2013)
Log Message:
-----------
Translate the name of each language to the name in their respective language.
Modified Paths:
--------------
trunk/doc/Change.log
trunk/includes/LanguagesArray.php
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2013-11-20 07:27:56 UTC (rev 6422)
+++ trunk/doc/Change.log 2013-11-20 23:21:40 UTC (rev 6423)
@@ -1,5 +1,6 @@
webERP Change Log
+20/11/13 rchacon: Translate the name of each language to the name in their respective language.
20/11/13 Phil: Payments.php FunctionalExchangeRate was not defaulted appropriately when entering a supplier payment in FX from a bank account of the same currency selected and the transaction was posted immediately without update first. Fixed
19/11/13 Thumb/CQZ: Add webERP Chinese country sql including Chinese COA, currency, role,tax, transaction type etc which should be localized.
19/11/13 Thumb: Add '-' to telephone no pattern in CustomerBranches.php and WWW_Users.php.
Modified: trunk/includes/LanguagesArray.php
===================================================================
--- trunk/includes/LanguagesArray.php 2013-11-20 07:27:56 UTC (rev 6422)
+++ trunk/includes/LanguagesArray.php 2013-11-20 23:21:40 UTC (rev 6423)
@@ -1,17 +1,17 @@
<?php
$LanguagesArray = array();
-$LanguagesArray['en_US.utf8']['LanguageName'] = _('English US');
+$LanguagesArray['en_US.utf8']['LanguageName'] = 'English US';
$LanguagesArray['en_US.utf8']['WindowsLocale'] = 'english-us';
$LanguagesArray['en_US.utf8']['DecimalPoint'] = '.';
$LanguagesArray['en_US.utf8']['ThousandsSeparator'] = ',';
-$LanguagesArray['en_GB.utf8']['LanguageName'] = _('English British');
+$LanguagesArray['en_GB.utf8']['LanguageName'] = 'English British';
$LanguagesArray['en_GB.utf8']['WindowsLocale'] = 'english-uk';
$LanguagesArray['en_GB.utf8']['DecimalPoint'] = '.';
$LanguagesArray['en_GB.utf8']['ThousandsSeparator'] = ',';
-$LanguagesArray['en_IN.utf8']['LanguageName'] = _('English India');
+$LanguagesArray['en_IN.utf8']['LanguageName'] = 'English India';
$LanguagesArray['en_IN.utf8']['WindowsLocale'] = 'english-in';
$LanguagesArray['en_IN.utf8']['DecimalPoint'] = '.';
$LanguagesArray['en_IN.utf8']['ThousandsSeparator'] = ',';
@@ -21,42 +21,42 @@
$LanguagesArray['ar_EG.utf8']['DecimalPoint'] = ',';
$LanguagesArray['ar_EG.utf8']['ThousandsSeparator'] = ' ';
-$LanguagesArray['cz_CZ.utf8']['LanguageName'] = _('Czech');
+$LanguagesArray['cz_CZ.utf8']['LanguageName'] = 'Čeština';
$LanguagesArray['cz_CZ.utf8']['WindowsLocale'] = 'czech';
$LanguagesArray['cz_CZ.utf8']['DecimalPoint'] = ',';
$LanguagesArray['cz_CZ.utf8']['ThousandsSeparator'] = ' ';
-$LanguagesArray['de_DE.utf8']['LanguageName'] = _('German');
+$LanguagesArray['de_DE.utf8']['LanguageName'] = 'Deutsch';
$LanguagesArray['de_DE.utf8']['WindowsLocale'] = 'german';
$LanguagesArray['de_DE.utf8']['DecimalPoint'] = ',';
$LanguagesArray['de_DE.utf8']['ThousandsSeparator'] = '.';
-$LanguagesArray['el_GR.utf8']['LanguageName'] = _('Greek');
+$LanguagesArray['el_GR.utf8']['LanguageName'] = 'Ελληνικά';
$LanguagesArray['el_GR.utf8']['WindowsLocale'] = 'greek';
$LanguagesArray['el_GR.utf8']['DecimalPoint'] = ',';
$LanguagesArray['el_GR.utf8']['ThousandsSeparator'] = '.';
-$LanguagesArray['es_ES.utf8']['LanguageName'] = _('Spanish');
+$LanguagesArray['es_ES.utf8']['LanguageName'] = 'Español';
$LanguagesArray['es_ES.utf8']['WindowsLocale'] = 'spanish';
$LanguagesArray['es_ES.utf8']['DecimalPoint'] = ',';
$LanguagesArray['es_ES.utf8']['ThousandsSeparator'] = '.';
-$LanguagesArray['et_EE.utf8']['LanguageName'] = _('Estonian');
+$LanguagesArray['et_EE.utf8']['LanguageName'] = 'Eesti';
$LanguagesArray['et_EE.utf8']['WindowsLocale'] = 'estonian';
$LanguagesArray['et_EE.utf8']['DecimalPoint'] = '.';
$LanguagesArray['et_EE.utf8']['ThousandsSeparator'] = ' ';
-$LanguagesArray['fa_IR.utf8']['LanguageName'] = _('Persian');
+$LanguagesArray['fa_IR.utf8']['LanguageName'] = 'فارسی';
$LanguagesArray['fa_IR.utf8']['WindowsLocale'] = 'persian';
$LanguagesArray['fa_IR.utf8']['DecimalPoint'] = ',';
$LanguagesArray['fa_IR.utf8']['ThousandsSeparator'] = '.';
-$LanguagesArray['fr_CA.utf8']['LanguageName'] = _('French-Quebec');
+$LanguagesArray['fr_CA.utf8']['LanguageName'] = 'Français Quebec';
$LanguagesArray['fr_CA.utf8']['WindowsLocale'] = 'french-quebec';
$LanguagesArray['fr_CA.utf8']['DecimalPoint'] = ',';
$LanguagesArray['fr_CA.utf8']['ThousandsSeparator'] = ' ';
-$LanguagesArray['fr_FR.utf8']['LanguageName'] = _('French');
+$LanguagesArray['fr_FR.utf8']['LanguageName'] = 'Français';
$LanguagesArray['fr_FR.utf8']['WindowsLocale'] = 'french';
$LanguagesArray['fr_FR.utf8']['DecimalPoint'] = ',';
$LanguagesArray['fr_FR.utf8']['ThousandsSeparator'] = ' ';
@@ -66,87 +66,87 @@
$LanguagesArray['hi_IN.utf8']['DecimalPoint'] = '.';
$LanguagesArray['hi_IN.utf8']['ThousandsSeparator'] = ',';
-$LanguagesArray['hr_HR.utf8']['LanguageName'] = _('Hungarian');
+$LanguagesArray['hr_HR.utf8']['LanguageName'] = 'Magyar';
$LanguagesArray['hr_HR.utf8']['WindowsLocale'] = 'hungarian';
$LanguagesArray['hr_HR.utf8']['DecimalPoint'] = ',';
$LanguagesArray['hr_HR.utf8']['ThousandsSeparator'] = ' ';
-$LanguagesArray['id_ID.utf8']['LanguageName'] = _('Indonesian');
+$LanguagesArray['id_ID.utf8']['LanguageName'] = 'Bahasa Indonesia';
$LanguagesArray['id_ID.utf8']['WindowsLocale'] = 'indonesian';
$LanguagesArray['id_ID.utf8']['DecimalPoint'] = ',';
$LanguagesArray['id_ID.utf8']['ThousandsSeparator'] = '.';
-$LanguagesArray['it_IT.utf8']['LanguageName'] = _('Italian');
+$LanguagesArray['it_IT.utf8']['LanguageName'] = 'Italiano';
$LanguagesArray['it_IT.utf8']['WindowsLocale'] = 'italian';
$LanguagesArray['it_IT.utf8']['DecimalPoint'] = ',';
$LanguagesArray['it_IT.utf8']['ThousandsSeparator'] = '.';
-$LanguagesArray['ja_JP.utf8']['LanguageName'] = _('Japanese');
+$LanguagesArray['ja_JP.utf8']['LanguageName'] = '日本語';
$LanguagesArray['ja_JP.utf8']['WindowsLocale'] = 'japanese';
$LanguagesArray['ja_JP.utf8']['DecimalPoint'] = '.';
$LanguagesArray['ja_JP.utf8']['ThousandsSeparator'] = ',';
-$LanguagesArray['lv_LV.utf8']['LanguageName'] = _('Latvian');
+$LanguagesArray['lv_LV.utf8']['LanguageName'] = 'Latviešu';
$LanguagesArray['lv_LV.utf8']['WindowsLocale'] = 'latvian';
$LanguagesArray['lv_LV.utf8']['DecimalPoint'] = ',';
$LanguagesArray['lv_LV.utf8']['ThousandsSeparator'] = '.';
-$LanguagesArray['nl_NL.utf8']['LanguageName'] = _('Dutch');
+$LanguagesArray['nl_NL.utf8']['LanguageName'] = 'Nederlands';
$LanguagesArray['nl_NL.utf8']['WindowsLocale'] = 'dutch';
$LanguagesArray['nl_NL.utf8']['DecimalPoint'] = ',';
$LanguagesArray['nl_NL.utf8']['ThousandsSeparator'] = '.';
-$LanguagesArray['pl_PL.utf8']['LanguageName'] = _('Polish');
+$LanguagesArray['pl_PL.utf8']['LanguageName'] = 'Polski';
$LanguagesArray['pl_PL.utf8']['WindowsLocale'] = 'polish';
$LanguagesArray['pl_PL.utf8']['DecimalPoint'] = ',';
$LanguagesArray['pl_PL.utf8']['ThousandsSeparator'] = ' ';
-$LanguagesArray['pt_BR.utf8']['LanguageName'] = _('Brazilian Portuguese');
+$LanguagesArray['pt_BR.utf8']['LanguageName'] = 'Português Brasil';
$LanguagesArray['pt_BR.utf8']['WindowsLocale'] = 'portuguese-brazil';
$LanguagesArray['pt_BR.utf8']['DecimalPoint'] = ',';
$LanguagesArray['pt_BR.utf8']['ThousandsSeparator'] = '.';
-$LanguagesArray['pt_PT.utf8']['LanguageName'] = _('Portuguese');
+$LanguagesArray['pt_PT.utf8']['LanguageName'] = 'Português';
$LanguagesArray['pt_PT.utf8']['WindowsLocale'] = 'portuguese';
$LanguagesArray['pt_PT.utf8']['DecimalPoint'] = ',';
$LanguagesArray['pt_PT.utf8']['ThousandsSeparator'] = '.';
-$LanguagesArray['ro_RO.utf8']['LanguageName'] = _('Romanian');
+$LanguagesArray['ro_RO.utf8']['LanguageName'] = 'Română';
$LanguagesArray['ro_RO.utf8']['WindowsLocale'] = 'romanian';
$LanguagesArray['ro_RO.utf8']['DecimalPoint'] = ',';
$LanguagesArray['ro_RO.utf8']['ThousandsSeparator'] = '.';
-$LanguagesArray['ru_RU.utf8']['LanguageName'] = _('Russian');
+$LanguagesArray['ru_RU.utf8']['LanguageName'] = 'Русский';
$LanguagesArray['ru_RU.utf8']['WindowsLocale'] = 'russian';
$LanguagesArray['ru_RU.utf8']['DecimalPoint'] = ',';
$LanguagesArray['ru_RU.utf8']['ThousandsSeparator'] = ' ';
-$LanguagesArray['sq_AL.utf8']['LanguageName'] = _('Albanian');
+$LanguagesArray['sq_AL.utf8']['LanguageName'] = 'Shqip';
$LanguagesArray['sq_AL.utf8']['WindowsLocale'] = 'albanian';
$LanguagesArray['sq_AL.utf8']['DecimalPoint'] = ',';
$LanguagesArray['sq_AL.utf8']['ThousandsSeparator'] = ' ';
-$LanguagesArray['sv_SE.utf8']['LanguageName'] = _('Swedish');
+$LanguagesArray['sv_SE.utf8']['LanguageName'] = 'Svenska';
$LanguagesArray['sv_SE.utf8']['WindowsLocale'] = 'swedish';
$LanguagesArray['sv_SE.utf8']['DecimalPoint'] = ',';
$LanguagesArray['sv_SE.utf8']['ThousandsSeparator'] = ' ';
-$LanguagesArray['sw_KE.utf8']['LanguageName'] = _('Kiswahili');
-$LanguagesArray['sw_KE.utf8']['WindowsLocale'] = 'kiswahili';
+$LanguagesArray['sw_KE.utf8']['LanguageName'] = 'Kiswahili';
+$LanguagesArray['sw_KE.utf8']['WindowsLocale'] = 'swahili';
$LanguagesArray['sw_KE.utf8']['DecimalPoint'] = '.';
$LanguagesArray['sw_KE.utf8']['ThousandsSeparator'] = ',';
-$LanguagesArray['tr_TR.utf8']['LanguageName'] = _('Turkish');
+$LanguagesArray['tr_TR.utf8']['LanguageName'] = 'Qırımtatarca';
$LanguagesArray['tr_TR.utf8']['WindowsLocale'] = 'turkish';
$LanguagesArray['tr_TR.utf8']['DecimalPoint'] = '.';
$LanguagesArray['tr_TR.utf8']['ThousandsSeparator'] = ',';
-$LanguagesArray['vi_VN.utf8']['LanguageName'] = _('Vietnamese');
+$LanguagesArray['vi_VN.utf8']['LanguageName'] = 'Tiếng Việt';
$LanguagesArray['vi_VN.utf8']['WindowsLocale'] = 'vietnamese';
$LanguagesArray['vi_VN.utf8']['DecimalPoint'] = '.';
$LanguagesArray['vi_VN.utf8']['ThousandsSeparator'] = ',';
-$LanguagesArray['zh_CN.utf8']['LanguageName'] = _('Chinese - Simplified');
+$LanguagesArray['zh_CN.utf8']['LanguageName'] = '中文简体';
$LanguagesArray['zh_CN.utf8']['WindowsLocale'] = 'chinese-simplified';
$LanguagesArray['zh_CN.utf8']['DecimalPoint'] = '.';
$LanguagesArray['zh_CN.utf8']['ThousandsSeparator'] = ',';
|
|
From: <rc...@us...> - 2013-11-22 22:36:44
|
Revision: 6428
http://sourceforge.net/p/web-erp/reponame/6428
Author: rchacon
Date: 2013-11-22 22:36:42 +0000 (Fri, 22 Nov 2013)
Log Message:
-----------
Standardized MainMenuLinksArray.php and $Title caption. Improves Spanish translation.
Modified Paths:
--------------
trunk/SystemParameters.php
trunk/includes/MainMenuLinksArray.php
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
Modified: trunk/SystemParameters.php
===================================================================
--- trunk/SystemParameters.php 2013-11-21 17:55:58 UTC (rev 6427)
+++ trunk/SystemParameters.php 2013-11-22 22:36:42 UTC (rev 6428)
@@ -4,7 +4,7 @@
include('includes/session.inc');
-$Title = _('System Configuration');
+$Title = _('System Parameters');
$ViewTopic= 'GettingStarted';
$BookMark = 'SystemConfiguration';
include('includes/header.inc');
Modified: trunk/includes/MainMenuLinksArray.php
===================================================================
--- trunk/includes/MainMenuLinksArray.php 2013-11-21 17:55:58 UTC (rev 6427)
+++ trunk/includes/MainMenuLinksArray.php 2013-11-22 22:36:42 UTC (rev 6428)
@@ -425,7 +425,7 @@
'/PcExpensesTypeTab.php');
$MenuItems['system']['Transactions']['Caption'] = array(_('Company Preferences'),
- _('Configuration Settings'),
+ _('System Parameters'),
_('User Maintenance'),
_('Maintain Security Tokens'),
_('Access Permissions Maintenance'),
@@ -440,10 +440,10 @@
_('Report Builder Tool'),
_('View Audit Trail'),
_('Geocode Setup'),
- _('Form Design'),
+ _('Form Designer'),
_('Web-Store Configuration'),
_('SMTP Server Details'),
- _('Mailing Group Maintenance') );
+ _('Mailing Group Maintenance'));
$MenuItems['system']['Transactions']['URL'] = array('/CompanyPreferences.php',
'/SystemParameters.php',
@@ -464,7 +464,7 @@
'/FormDesigner.php',
'/ShopParameters.php',
'/SMTPServer.php',
- '/MailingGroupMaintenance.php' );
+ '/MailingGroupMaintenance.php');
$MenuItems['system']['Reports']['Caption'] = array( _('Sales Types'),
_('Customer Types'),
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 2013-11-21 17:55:58 UTC (rev 6427)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2013-11-22 22:36:42 UTC (rev 6428)
@@ -8,7 +8,7 @@
"Project-Id-Version: WebERP 4.081\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-09-06 21:34+1200\n"
-"PO-Revision-Date: 2013-11-16 11:08-0600\n"
+"PO-Revision-Date: 2013-11-22 16:18-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: TecnoSoluciones.com <web...@te...>\n"
"Language: es_ES\n"
@@ -3211,15 +3211,15 @@
#: CompanyPreferences.php:178
msgid "Official Company Number"
-msgstr "Número Oficial de la Compañía (DUN)"
+msgstr "Número oficial de la compañía (DUN)"
#: CompanyPreferences.php:183
msgid "Tax Authority Reference"
-msgstr "Referencia de la Autoridad Fiscal"
+msgstr "Referencia de la administración tributaria"
#: CompanyPreferences.php:188 Factors.php:211
msgid "Address Line 1"
-msgstr "Dirección (1) Calle"
+msgstr "Dirección (línea 1)"
#: CompanyPreferences.php:189
msgid ""
@@ -3229,7 +3229,7 @@
#: CompanyPreferences.php:193 Factors.php:214
msgid "Address Line 2"
-msgstr "Dirección (2)"
+msgstr "Dirección (línea 2)"
#: CompanyPreferences.php:194
msgid ""
@@ -3239,7 +3239,7 @@
#: CompanyPreferences.php:198 Factors.php:218
msgid "Address Line 3"
-msgstr "Dirección (3)"
+msgstr "Dirección (línea 3)"
#: CompanyPreferences.php:199
msgid ""
@@ -3249,7 +3249,7 @@
#: CompanyPreferences.php:203 Factors.php:222
msgid "Address Line 4"
-msgstr "Dirección (4)"
+msgstr "Dirección (línea 4)"
#: CompanyPreferences.php:204
msgid ""
@@ -3259,11 +3259,11 @@
#: CompanyPreferences.php:208 Factors.php:226
msgid "Address Line 5"
-msgstr "Dirección (5)"
+msgstr "Dirección (línea 5)"
#: CompanyPreferences.php:213 Factors.php:230
msgid "Address Line 6"
-msgstr "Dirección (6) País"
+msgstr "Dirección (línea 6)"
#: CompanyPreferences.php:218
msgid "Telephone Number"
@@ -3297,7 +3297,7 @@
#: CompanyPreferences.php:261
msgid "Debtors Control GL Account"
-msgstr "Cuenta de Control de Deudores"
+msgstr "Cuenta para control de deudores"
#: CompanyPreferences.php:262
msgid ""
@@ -3309,7 +3309,7 @@
#: CompanyPreferences.php:278
msgid "Creditors Control GL Account"
-msgstr "Cuenta de Control de Acreedores"
+msgstr "Cuenta para control de acreedores"
#: CompanyPreferences.php:279
msgid ""
@@ -3321,11 +3321,11 @@
#: CompanyPreferences.php:295
msgid "Payroll Net Pay Clearing GL Account"
-msgstr "Cuenta de Pago de Nómina"
+msgstr "Cuenta para pago de nómina"
#: CompanyPreferences.php:312
msgid "Goods Received Clearing GL Account"
-msgstr "Cuenta de Compensación (Liquidación) de Bienes Recibidos"
+msgstr "Cuenta para compensación de bienes recibidos"
#: CompanyPreferences.php:313
msgid ""
@@ -3337,7 +3337,7 @@
#: CompanyPreferences.php:328
msgid "Retained Earning Clearing GL Account"
-msgstr "Cuenta de Compensación (Liquidación) de Ganancias Retenidas"
+msgstr "Cuenta para compensación de ganancias retenidas"
#: CompanyPreferences.php:329
msgid ""
@@ -3352,7 +3352,7 @@
#: CompanyPreferences.php:370
msgid "Sales Exchange Variances GL Account"
-msgstr "Cuenta de Diferencias al Cambio de Ventas"
+msgstr "Cuenta para diferencias de cambio en ventas"
#: CompanyPreferences.php:371
msgid ""
@@ -3366,7 +3366,7 @@
#: CompanyPreferences.php:387
msgid "Purchases Exchange Variances GL Account"
-msgstr "Cuenta de Diferencias al Cambio de Compras"
+msgstr "Cuenta para diferencias de cambio en compras"
#: CompanyPreferences.php:388
msgid ""
@@ -3380,7 +3380,7 @@
#: CompanyPreferences.php:404
msgid "Payment Discount GL Account"
-msgstr "Cuenta de Descuentos en Pagos"
+msgstr "Cuenta para descuentos en pagos"
#: CompanyPreferences.php:405
msgid ""
@@ -3391,7 +3391,7 @@
#: CompanyPreferences.php:421
msgid "Create GL entries for accounts receivable transactions"
-msgstr "Crear asientos contables para transacciones de Cuentas a Cobrar"
+msgstr "Crear asientos contables para transacciones de cuentas por cobrar"
#: CompanyPreferences.php:422
msgid ""
@@ -3403,7 +3403,7 @@
#: CompanyPreferences.php:436
msgid "Create GL entries for accounts payable transactions"
-msgstr "Crear asientos contables para transacciones de Cuentas a Pagar"
+msgstr "Crear asientos contables para transacciones de cuentas por pagar"
#: CompanyPreferences.php:437
msgid ""
@@ -3415,7 +3415,7 @@
#: CompanyPreferences.php:451
msgid "Create GL entries for stock transactions"
-msgstr "Crear asientos contables para transacciones de Existencias"
+msgstr "Crear asientos contables para transacciones de inventario"
#: CompanyPreferences.php:452
msgid ""
@@ -33780,7 +33780,7 @@
#: SystemParameters.php:370
msgid "Default Date Format"
-msgstr "Formato de Fecha"
+msgstr "Formato de fecha"
#: SystemParameters.php:372
msgid "d/m/Y"
@@ -33804,28 +33804,27 @@
#: SystemParameters.php:378
msgid "The default date format for entry of dates and display."
-msgstr ""
-"El formato de fecha predeterminado al entrar y mostrar valores de fecha."
+msgstr "El formato de fecha predeterminado para introducir y mostrar fechas."
#: SystemParameters.php:381
msgid "New Users Default Theme"
-msgstr "Tema Predeterminado para Nuevos Usuarios"
+msgstr "Tema predeterminado para usuarios nuevos"
#: SystemParameters.php:394
msgid ""
"The default theme is used for new users who have not yet defined the display "
"colour scheme theme of their choice"
msgstr ""
-"El tema predeterminado, o esquema de colores por defecto, se usa en los "
-"nuevos usuarios que aún no han elegido el suyo."
+"El tema por defecto se usa para los usuarios nuevos que aún no han elegido "
+"el estilo de presentación en pantalla."
#: SystemParameters.php:396
msgid "Accounts Receivable/Payable Settings"
-msgstr "Configuración de las Cuentas de Cobros/Pagos"
+msgstr "Configuración de las cuentas por cobrar/pagar"
#: SystemParameters.php:399
msgid "First Overdue Deadline in (days)"
-msgstr "Días para la Primera Fecha de Entrega"
+msgstr "Plazo del primer vencimiento (en días)"
#: SystemParameters.php:400 SystemParameters.php:405
#, fuzzy
@@ -33844,7 +33843,7 @@
#: SystemParameters.php:404
msgid "Second Overdue Deadline in (days)"
-msgstr "Plazo del Segundo Vencimiento (en días)"
+msgstr "Plazo del segundo vencimiento (en días)"
#: SystemParameters.php:406
msgid "As above but the next level of overdue"
@@ -33852,7 +33851,7 @@
#: SystemParameters.php:410
msgid "Default Credit Limit"
-msgstr "Límite de Crédito Predeterminado"
+msgstr "Límite de crédito predeterminado"
#: SystemParameters.php:412
msgid "The default used in new customer set up"
@@ -33860,19 +33859,19 @@
#: SystemParameters.php:415
msgid "Check Credit Limits"
-msgstr "Comprobar Límites de Crédito"
+msgstr "Comprobar límites de crédito"
#: SystemParameters.php:417
msgid "Do not check"
-msgstr "No Comprobar"
+msgstr "No comprobar"
#: SystemParameters.php:418
msgid "Warn on breach"
-msgstr "Avisar"
+msgstr "Avisar en incumplimiento"
#: SystemParameters.php:419
msgid "Prohibit Sales"
-msgstr "Prohibir Ventas"
+msgstr "Prohibir ventas"
#: SystemParameters.php:421
msgid ""
@@ -33904,7 +33903,7 @@
#: SystemParameters.php:432
msgid "Romalpa Clause"
-msgstr "Cláusula de reserva de titularidad (cláusula Romalpa)"
+msgstr "Cláusula Romalpa (protección para deudas incobrables)"
#: SystemParameters.php:434
msgid ""
@@ -33921,7 +33920,7 @@
#: SystemParameters.php:437
msgid "Quick Entries"
-msgstr "Entradas Rápidas"
+msgstr "Entradas rápidas"
#: SystemParameters.php:439
msgid ""
|
|
From: <dai...@us...> - 2013-11-23 21:41:54
|
Revision: 6433
http://sourceforge.net/p/web-erp/reponame/6433
Author: daintree
Date: 2013-11-23 21:41:47 +0000 (Sat, 23 Nov 2013)
Log Message:
-----------
update language strings and rebuild demo new dbs
Modified Paths:
--------------
trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.mo
trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po
trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.mo
trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po
trunk/locale/de_DE.utf8/LC_MESSAGES/messages.mo
trunk/locale/de_DE.utf8/LC_MESSAGES/messages.po
trunk/locale/el_GR.utf8/LC_MESSAGES/messages.mo
trunk/locale/el_GR.utf8/LC_MESSAGES/messages.po
trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot
trunk/locale/en_US.utf8/LC_MESSAGES/messages.mo
trunk/locale/en_US.utf8/LC_MESSAGES/messages.po
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
trunk/locale/et_EE.utf8/LC_MESSAGES/messages.mo
trunk/locale/et_EE.utf8/LC_MESSAGES/messages.po
trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.mo
trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.po
trunk/locale/fr_CA.utf8/LC_MESSAGES/messages.po
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.mo
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po
trunk/locale/hi_IN.utf8/LC_MESSAGES/messages.mo
trunk/locale/hi_IN.utf8/LC_MESSAGES/messages.po
trunk/locale/hr_HR.utf8/LC_MESSAGES/messages.mo
trunk/locale/hr_HR.utf8/LC_MESSAGES/messages.po
trunk/locale/hu_HU.utf8/LC_MESSAGES/messages.mo
trunk/locale/hu_HU.utf8/LC_MESSAGES/messages.po
trunk/locale/id_ID.utf8/LC_MESSAGES/messages.mo
trunk/locale/id_ID.utf8/LC_MESSAGES/messages.po
trunk/locale/it_IT.utf8/LC_MESSAGES/messages.mo
trunk/locale/it_IT.utf8/LC_MESSAGES/messages.po
trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.mo
trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.po
trunk/locale/lv_LV.utf8/LC_MESSAGES/messages.mo
trunk/locale/lv_LV.utf8/LC_MESSAGES/messages.po
trunk/locale/nl_NL.utf8/LC_MESSAGES/messages.mo
trunk/locale/nl_NL.utf8/LC_MESSAGES/messages.po
trunk/locale/pl_PL.utf8/LC_MESSAGES/messages.mo
trunk/locale/pl_PL.utf8/LC_MESSAGES/messages.po
trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.mo
trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.po
trunk/locale/pt_PT.utf8/LC_MESSAGES/messages.mo
trunk/locale/pt_PT.utf8/LC_MESSAGES/messages.po
trunk/locale/ro_RO.utf8/LC_MESSAGES/messages.mo
trunk/locale/ro_RO.utf8/LC_MESSAGES/messages.po
trunk/locale/ru_RU.utf8/LC_MESSAGES/messages.mo
trunk/locale/ru_RU.utf8/LC_MESSAGES/messages.po
trunk/locale/sq_AL.utf8/LC_MESSAGES/messages.mo
trunk/locale/sq_AL.utf8/LC_MESSAGES/messages.po
trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.mo
trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.po
trunk/locale/sw_KE.utf8/LC_MESSAGES/messages.mo
trunk/locale/sw_KE.utf8/LC_MESSAGES/messages.po
trunk/locale/tr_TR.utf8/LC_MESSAGES/messages.mo
trunk/locale/tr_TR.utf8/LC_MESSAGES/messages.po
trunk/locale/vi_VN.utf8/LC_MESSAGES/messages.mo
trunk/locale/vi_VN.utf8/LC_MESSAGES/messages.po
trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.po
trunk/locale/zh_HK.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_HK.utf8/LC_MESSAGES/messages.po
trunk/locale/zh_TW.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_TW.utf8/LC_MESSAGES/messages.po
trunk/sql/mysql/country_sql/default.sql
trunk/sql/mysql/country_sql/demo.sql
Modified: trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po 2013-11-23 03:51:31 UTC (rev 6432)
+++ trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po 2013-11-23 21:41:47 UTC (rev 6433)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: web-erp\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-06 21:34+1200\n"
+"POT-Creation-Date: 2013-11-24 10:11+1300\n"
"PO-Revision-Date: 2013-06-01 11:19-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: Arabic <ar...@li...>\n"
@@ -18,7 +18,7 @@
"X-Launchpad-Export-Date: 2012-03-07 23:01+0000\n"
"X-Generator: Poedit 1.5.4\n"
-#: AccountGroups.php:7 includes/MainMenuLinksArray.php:366
+#: AccountGroups.php:7 includes/MainMenuLinksArray.php:368
msgid "Account Groups"
msgstr "مجموعات العضوية"
@@ -163,22 +163,22 @@
#: AccountGroups.php:216 AccountGroups.php:251 AccountSections.php:133
#: Areas.php:115 Areas.php:124 BankAccounts.php:159 CreditStatus.php:125
-#: Currencies.php:246 Currencies.php:254 Currencies.php:262
+#: Currencies.php:245 Currencies.php:253 Currencies.php:261
#: CustomerBranches.php:293 CustomerBranches.php:303 CustomerBranches.php:313
#: CustomerBranches.php:323 CustomerBranches.php:333 Customers.php:295
#: Customers.php:304 Customers.php:312 Customers.php:320 CustomerTypes.php:147
#: CustomerTypes.php:157 Departments.php:141 Factors.php:134
#: FixedAssetCategories.php:137 GLAccounts.php:80 GLAccounts.php:96
-#: Locations.php:249 Locations.php:257 Locations.php:268 Locations.php:277
-#: Locations.php:286 Locations.php:295 Locations.php:304 Locations.php:313
-#: Locations.php:321 Manufacturers.php:154 MRPDemandTypes.php:87
+#: Locations.php:250 Locations.php:258 Locations.php:269 Locations.php:278
+#: Locations.php:287 Locations.php:296 Locations.php:305 Locations.php:314
+#: Locations.php:322 Manufacturers.php:154 MRPDemandTypes.php:87
#: PaymentMethods.php:142 PaymentTerms.php:146 PaymentTerms.php:153
#: PcExpenses.php:161 SalesCategories.php:128 SalesCategories.php:135
#: SalesPeople.php:150 SalesPeople.php:157 SalesPeople.php:163
#: SalesTypes.php:140 SalesTypes.php:150 Shippers.php:81 Shippers.php:93
-#: StockCategories.php:191 Stocks.php:724 Stocks.php:733 Stocks.php:741
-#: Stocks.php:749 Stocks.php:757 Stocks.php:765 Stocks.php:773 Stocks.php:781
-#: Suppliers.php:629 Suppliers.php:638 Suppliers.php:646 SupplierTypes.php:145
+#: StockCategories.php:191 Stocks.php:726 Stocks.php:735 Stocks.php:743
+#: Stocks.php:751 Stocks.php:759 Stocks.php:767 Stocks.php:775 Stocks.php:783
+#: Suppliers.php:640 Suppliers.php:649 Suppliers.php:657 SupplierTypes.php:145
#: TaxCategories.php:131 TaxGroups.php:132 TaxGroups.php:140
#: TaxProvinces.php:129 UnitsOfMeasure.php:135 WorkCentres.php:89
#: WorkCentres.php:95 WWW_Access.php:86
@@ -239,14 +239,14 @@
#: BOMInquiry.php:188 BOMListing.php:109 BOMs.php:231 BOMs.php:862
#: COGSGLPostings.php:19 CompanyPreferences.php:102 CounterReturns.php:1605
#: CounterSales.php:2092 CounterSales.php:2215 Credit_Invoice.php:272
-#: CreditStatus.php:21 Currencies.php:31 CustEDISetup.php:17
+#: CreditStatus.php:21 Currencies.php:30 CustEDISetup.php:17
#: DailyBankTransactions.php:15 DebtorsAtPeriodEnd.php:129
-#: DiscountCategories.php:12 DiscountCategories.php:140 DiscountMatrix.php:16
+#: DiscountCategories.php:12 DiscountCategories.php:149 DiscountMatrix.php:16
#: EDIMessageFormat.php:105 FixedAssetLocations.php:13
#: FixedAssetRegister.php:16 FixedAssetRegister.php:256
-#: FixedAssetTransfer.php:14 FormDesigner.php:129 GLBalanceSheet.php:387
+#: FixedAssetTransfer.php:14 FormDesigner.php:173 GLBalanceSheet.php:387
#: GLBudgets.php:32 GLJournalInquiry.php:11 GLJournal.php:250
-#: InternalStockRequest.php:308 InventoryPlanning.php:379
+#: InternalStockRequest.php:310 InventoryPlanning.php:379
#: InventoryPlanningPrefSupplier.php:469 MaintenanceTasks.php:14
#: MaintenanceUserSchedule.php:16 MRPReport.php:516 NoSalesItems.php:89
#: PcAssignCashToTab.php:59 PcAssignCashToTab.php:133
@@ -254,15 +254,15 @@
#: PDFStockLocTransfer.php:16 PO_AuthorisationLevels.php:10 POReport.php:60
#: POReport.php:64 POReport.php:68 PO_SelectOSPurchOrder.php:142
#: PricesBasedOnMarkUp.php:8 Prices_Customer.php:35 Prices.php:30
-#: PurchData.php:241 PurchData.php:373 PurchData.php:401
-#: RecurringSalesOrders.php:320 SalesAnalReptCols.php:51 SalesAnalRepts.php:14
-#: SalesCategories.php:11 SalesGLPostings.php:19 SalesGraph.php:39
-#: SalesPeople.php:20 SalesTypes.php:20 SelectAsset.php:48
+#: PurchaseByPrefSupplier.php:305 PurchData.php:241 PurchData.php:373
+#: PurchData.php:401 RecurringSalesOrders.php:320 SalesAnalReptCols.php:51
+#: SalesAnalRepts.php:14 SalesCategories.php:11 SalesGLPostings.php:19
+#: SalesGraph.php:39 SalesPeople.php:20 SalesTypes.php:20 SelectAsset.php:48
#: SelectCompletedOrder.php:11 SelectContract.php:69 SelectCreditItems.php:220
#: SelectCreditItems.php:291 SelectCustomer.php:265 SelectGLAccount.php:65
-#: SelectOrderItems.php:609 SelectOrderItems.php:1526
-#: SelectOrderItems.php:1654 SelectProduct.php:525 SelectSalesOrder.php:563
-#: SelectSupplier.php:14 SelectSupplier.php:217 SelectWorkOrder.php:9
+#: SelectOrderItems.php:609 SelectOrderItems.php:1532
+#: SelectOrderItems.php:1660 SelectProduct.php:526 SelectSalesOrder.php:563
+#: SelectSupplier.php:14 SelectSupplier.php:220 SelectWorkOrder.php:9
#: SelectWorkOrder.php:169 SellThroughSupport.php:229 ShipmentCosting.php:11
#: Shipments.php:17 Shippers.php:123 Shippers.php:160 Shipt_Select.php:8
#: StockLocMovements.php:14 StockLocStatus.php:28
@@ -276,7 +276,7 @@
#: WhereUsedInquiry.php:18 WorkCentres.php:111 WorkCentres.php:162
#: WorkOrderCosting.php:22 WorkOrderEntry.php:11 WorkOrderIssue.php:22
#: WorkOrderReceive.php:31 WorkOrderStatus.php:58 WWW_Access.php:11
-#: WWW_Users.php:36 Z_BottomUpCosts.php:57 ../webSHOP/includes/header.php:251
+#: WWW_Users.php:36 Z_BottomUpCosts.php:57 ../webSHOP/includes/header.php:252
msgid "Search"
msgstr "إبحث"
@@ -300,20 +300,20 @@
#: AccountGroups.php:310 AccountGroups.php:313 AccountGroups.php:448
#: AccountGroups.php:450 BOMs.php:124 BOMs.php:774 BOMs.php:776
-#: CompanyPreferences.php:426 CompanyPreferences.php:428
-#: CompanyPreferences.php:441 CompanyPreferences.php:443
-#: CompanyPreferences.php:456 CompanyPreferences.php:458
-#: ContractCosting.php:202 Currencies.php:332 Currencies.php:498
-#: Currencies.php:500 CustomerBranches.php:426 Customers.php:641
-#: Customers.php:1031 Customers.php:1037 Customers.php:1040
+#: CompanyPreferences.php:427 CompanyPreferences.php:429
+#: CompanyPreferences.php:442 CompanyPreferences.php:444
+#: CompanyPreferences.php:457 CompanyPreferences.php:459
+#: ContractCosting.php:202 Currencies.php:331 Currencies.php:497
+#: Currencies.php:499 CustomerBranches.php:426 Customers.php:642
+#: Customers.php:1032 Customers.php:1038 Customers.php:1041
#: DailyBankTransactions.php:145 DeliveryDetails.php:1148
-#: DeliveryDetails.php:1191 DeliveryDetails.php:1194 GLTransInquiry.php:69
-#: Labels.php:591 Labels.php:593 Labels.php:618 Locations.php:617
-#: Locations.php:619 MRPCalendar.php:224 MRP.php:540 MRP.php:544 MRP.php:548
-#: MRP.php:552 PaymentMethods.php:204 PaymentMethods.php:205
-#: PaymentMethods.php:206 PaymentMethods.php:207 PaymentMethods.php:273
-#: PaymentMethods.php:280 PaymentMethods.php:287 PaymentMethods.php:294
-#: PcAuthorizeExpenses.php:248 PDFChequeListing.php:65
+#: DeliveryDetails.php:1191 DeliveryDetails.php:1194 FormDesigner.php:101
+#: GLTransInquiry.php:69 Labels.php:591 Labels.php:593 Labels.php:618
+#: Locations.php:628 Locations.php:630 MRPCalendar.php:224 MRP.php:540
+#: MRP.php:544 MRP.php:548 MRP.php:552 PaymentMethods.php:204
+#: PaymentMethods.php:205 PaymentMethods.php:206 PaymentMethods.php:207
+#: PaymentMethods.php:273 PaymentMethods.php:280 PaymentMethods.php:287
+#: PaymentMethods.php:294 PcAuthorizeExpenses.php:248 PDFChequeListing.php:65
#: PDFDeliveryDifferences.php:76 PDFDIFOT.php:80
#: PO_AuthorisationLevels.php:134 PO_AuthorisationLevels.php:139
#: PO_Header.php:799 PO_PDFPurchOrder.php:408 PO_PDFPurchOrder.php:411
@@ -325,11 +325,12 @@
#: SalesAnalRepts.php:479 SalesCategories.php:264 SalesCategories.php:351
#: SalesCategories.php:355 SalesPeople.php:219 SalesPeople.php:359
#: SalesPeople.php:361 SelectProduct.php:238 SelectProduct.php:381
-#: ShipmentCosting.php:667 ShopParameters.php:284 ShopParameters.php:288
-#: ShopParameters.php:332 ShopParameters.php:336 ShopParameters.php:365
-#: ShopParameters.php:369 ShopParameters.php:387 ShopParameters.php:391
-#: ShopParameters.php:448 ShopParameters.php:452 Stocks.php:1202
-#: Stocks.php:1204 Stocks.php:1227 Stocks.php:1229 SuppContractChgs.php:90
+#: ShipmentCosting.php:667 ShopParameters.php:289 ShopParameters.php:293
+#: ShopParameters.php:337 ShopParameters.php:341 ShopParameters.php:391
+#: ShopParameters.php:395 ShopParameters.php:413 ShopParameters.php:417
+#: ShopParameters.php:495 ShopParameters.php:499 StockClone.php:917
+#: StockClone.php:919 StockClone.php:942 StockClone.php:944 Stocks.php:1204
+#: Stocks.php:1206 Stocks.php:1229 Stocks.php:1231 SuppContractChgs.php:90
#: SystemParameters.php:426 SystemParameters.php:449 SystemParameters.php:486
#: SystemParameters.php:558 SystemParameters.php:566 SystemParameters.php:606
#: SystemParameters.php:682 SystemParameters.php:691 SystemParameters.php:699
@@ -347,21 +348,21 @@
#: AccountGroups.php:316 AccountGroups.php:453 AccountGroups.php:455
#: BankAccounts.php:210 BankAccounts.php:379 BankAccounts.php:381
#: BankAccounts.php:385 BankAccounts.php:393 BOMs.php:126 BOMs.php:773
-#: BOMs.php:777 CompanyPreferences.php:425 CompanyPreferences.php:429
-#: CompanyPreferences.php:440 CompanyPreferences.php:444
-#: CompanyPreferences.php:455 CompanyPreferences.php:459
-#: ContractCosting.php:200 Currencies.php:334 Currencies.php:503
-#: Currencies.php:505 CustomerBranches.php:426 Customers.php:640
-#: Customers.php:1029 Customers.php:1036 Customers.php:1039
+#: BOMs.php:777 CompanyPreferences.php:426 CompanyPreferences.php:430
+#: CompanyPreferences.php:441 CompanyPreferences.php:445
+#: CompanyPreferences.php:456 CompanyPreferences.php:460
+#: ContractCosting.php:200 Currencies.php:333 Currencies.php:502
+#: Currencies.php:504 CustomerBranches.php:426 Customers.php:641
+#: Customers.php:1030 Customers.php:1037 Customers.php:1040
#: DailyBankTransactions.php:147 DeliveryDetails.php:1149
-#: DeliveryDetails.php:1192 DeliveryDetails.php:1195 GLTransInquiry.php:88
-#: Labels.php:590 Labels.php:594 Labels.php:619 Locations.php:622
-#: Locations.php:624 MRPCalendar.php:226 MRP.php:538 MRP.php:542 MRP.php:546
-#: MRP.php:550 NoSalesItems.php:184 PaymentMethods.php:204
-#: PaymentMethods.php:205 PaymentMethods.php:206 PaymentMethods.php:207
-#: PaymentMethods.php:274 PaymentMethods.php:281 PaymentMethods.php:288
-#: PaymentMethods.php:295 PcAuthorizeExpenses.php:246 PDFChequeListing.php:64
-#: PDFDeliveryDifferences.php:75 PDFDIFOT.php:79
+#: DeliveryDetails.php:1192 DeliveryDetails.php:1195 FormDesigner.php:99
+#: GLTransInquiry.php:88 Labels.php:590 Labels.php:594 Labels.php:619
+#: Locations.php:633 Locations.php:635 MRPCalendar.php:226 MRP.php:538
+#: MRP.php:542 MRP.php:546 MRP.php:550 NoSalesItems.php:184
+#: PaymentMethods.php:204 PaymentMethods.php:205 PaymentMethods.php:206
+#: PaymentMethods.php:207 PaymentMethods.php:274 PaymentMethods.php:281
+#: PaymentMethods.php:288 PaymentMethods.php:295 PcAuthorizeExpenses.php:246
+#: PDFChequeListing.php:64 PDFDeliveryDifferences.php:75 PDFDIFOT.php:79
#: PO_AuthorisationLevels.php:136 PO_AuthorisationLevels.php:141
#: PO_Header.php:798 PO_PDFPurchOrder.php:409 PO_PDFPurchOrder.php:412
#: PurchData.php:299 PurchData.php:668 PurchData.php:671
@@ -372,11 +373,12 @@
#: SalesAnalRepts.php:478 SalesCategories.php:266 SalesCategories.php:352
#: SalesCategories.php:354 SalesPeople.php:221 SalesPeople.php:364
#: SalesPeople.php:366 SelectProduct.php:240 SelectProduct.php:383
-#: ShipmentCosting.php:668 ShopParameters.php:285 ShopParameters.php:287
-#: ShopParameters.php:333 ShopParameters.php:335 ShopParameters.php:366
-#: ShopParameters.php:368 ShopParameters.php:388 ShopParameters.php:390
-#: ShopParameters.php:449 ShopParameters.php:451 Stocks.php:1197
-#: Stocks.php:1199 Stocks.php:1222 Stocks.php:1224 SuppContractChgs.php:92
+#: ShipmentCosting.php:668 ShopParameters.php:290 ShopParameters.php:292
+#: ShopParameters.php:338 ShopParameters.php:340 ShopParameters.php:392
+#: ShopParameters.php:394 ShopParameters.php:414 ShopParameters.php:416
+#: ShopParameters.php:496 ShopParameters.php:498 StockClone.php:912
+#: StockClone.php:914 StockClone.php:937 StockClone.php:939 Stocks.php:1199
+#: Stocks.php:1201 Stocks.php:1224 Stocks.php:1226 SuppContractChgs.php:92
#: SystemParameters.php:427 SystemParameters.php:450 SystemParameters.php:487
#: SystemParameters.php:559 SystemParameters.php:567 SystemParameters.php:607
#: SystemParameters.php:683 SystemParameters.php:692 SystemParameters.php:700
@@ -395,13 +397,13 @@
#: AccountGroups.php:325 AccountSections.php:192 AddCustomerContacts.php:148
#: AddCustomerNotes.php:137 AddCustomerTypeNotes.php:131 Areas.php:164
#: BankAccounts.php:223 BOMs.php:151 COGSGLPostings.php:112
-#: COGSGLPostings.php:216 CreditStatus.php:175 Currencies.php:364
-#: CustomerBranches.php:430 Customers.php:1114 Customers.php:1148
+#: COGSGLPostings.php:216 CreditStatus.php:175 Currencies.php:363
+#: CustomerBranches.php:430 Customers.php:1115 Customers.php:1149
#: CustomerTypes.php:206 Departments.php:186 EDIMessageFormat.php:150
#: Factors.php:334 FixedAssetCategories.php:190 FixedAssetLocations.php:111
#: FreightCosts.php:253 GeocodeSetup.php:173 GLAccounts.php:317 GLTags.php:96
-#: ImportBankTransAnalysis.php:224 InternalStockRequest.php:290 Labels.php:323
-#: Labels.php:348 Locations.php:403 MailingGroupMaintenance.php:178
+#: ImportBankTransAnalysis.php:224 InternalStockRequest.php:292 Labels.php:323
+#: Labels.php:348 Locations.php:404 MailingGroupMaintenance.php:178
#: MaintenanceTasks.php:118 Manufacturers.php:217 MRPDemands.php:309
#: MRPDemandTypes.php:120 PaymentMethods.php:208 PaymentTerms.php:205
#: PcAssignCashToTab.php:277 PcClaimExpensesFromTab.php:276 PcExpenses.php:226
@@ -432,26 +434,26 @@
#: BankAccounts.php:224 BOMs.php:153 COGSGLPostings.php:113
#: COGSGLPostings.php:217 ContractBOM.php:272 ContractOtherReqts.php:124
#: CounterReturns.php:740 CounterSales.php:832 Credit_Invoice.php:400
-#: CreditStatus.php:176 Currencies.php:367 CustomerReceipt.php:941
-#: Customers.php:1149 CustomerTypes.php:207 Departments.php:187
-#: DiscountCategories.php:229 DiscountMatrix.php:183 EDIMessageFormat.php:151
+#: CreditStatus.php:176 Currencies.php:366 CustomerReceipt.php:953
+#: Customers.php:1150 CustomerTypes.php:207 Departments.php:187
+#: DiscountCategories.php:238 DiscountMatrix.php:183 EDIMessageFormat.php:151
#: FixedAssetCategories.php:191 FreightCosts.php:254 GeocodeSetup.php:174
#: GLAccounts.php:318 GLJournal.php:429 GLTags.php:97
#: ImportBankTransAnalysis.php:225 InternalStockCategoriesByRole.php:184
-#: InternalStockRequest.php:291 Labels.php:324 Labels.php:349 Labels.php:597
-#: Locations.php:404 MailingGroupMaintenance.php:179 MaintenanceTasks.php:119
+#: InternalStockRequest.php:293 Labels.php:324 Labels.php:349 Labels.php:597
+#: Locations.php:405 MailingGroupMaintenance.php:179 MaintenanceTasks.php:119
#: Manufacturers.php:218 MRPDemands.php:310 MRPDemandTypes.php:121
-#: PaymentMethods.php:209 Payments.php:1093 PaymentTerms.php:206
+#: PaymentMethods.php:209 Payments.php:1111 PaymentTerms.php:206
#: PcAssignCashToTab.php:281 PcClaimExpensesFromTab.php:277 PcExpenses.php:227
#: PcExpensesTypeTab.php:187 PcTabs.php:237 PcTypeTabs.php:181
-#: PO_AuthorisationLevels.php:153 PO_Items.php:770 Prices_Customer.php:281
+#: PO_AuthorisationLevels.php:153 PO_Items.php:772 Prices_Customer.php:281
#: Prices.php:250 PurchData.php:314 PurchData.php:721
#: SalesAnalReptCols.php:299 SalesAnalRepts.php:307 SalesCategories.php:273
#: SalesGLPostings.php:138 SalesGLPostings.php:254 SalesPeople.php:233
#: SalesTypes.php:207 SecurityTokens.php:131 SelectCreditItems.php:779
#: SelectCustomer.php:615 SelectCustomer.php:634 SelectCustomer.php:664
#: SelectCustomer.php:682 SelectCustomer.php:706 SelectCustomer.php:723
-#: SelectOrderItems.php:1441 SellThroughSupport.php:299 Shipments.php:440
+#: SelectOrderItems.php:1447 SellThroughSupport.php:299 Shipments.php:440
#: Shippers.php:145 SpecialOrder.php:667 StockCategories.php:268
#: StockCategories.php:613 StockLocTransfer.php:324 SuppContractChgs.php:99
#: SuppCreditGRNs.php:117 SuppFixedAssetChgs.php:90 SuppInvGRNs.php:151
@@ -531,11 +533,11 @@
#: AccountGroups.php:465 AccountSections.php:263 AddCustomerContacts.php:260
#: AddCustomerNotes.php:242 AddCustomerTypeNotes.php:221 Areas.php:229
#: BankAccounts.php:399 BOMs.php:790 COGSGLPostings.php:365
-#: CreditStatus.php:259 Currencies.php:513 CustLoginSetup.php:273
+#: CreditStatus.php:259 Currencies.php:512 CustLoginSetup.php:273
#: Departments.php:258 DiscountMatrix.php:142 EDIMessageFormat.php:248
#: FixedAssetCategories.php:350 FixedAssetLocations.php:161
#: FreightCosts.php:371 GeocodeSetup.php:271 GLAccounts.php:266 Labels.php:631
-#: Locations.php:635 Manufacturers.php:312 MRPDemands.php:424
+#: Locations.php:646 Manufacturers.php:312 MRPDemands.php:424
#: MRPDemandTypes.php:188 OffersReceived.php:57 OffersReceived.php:146
#: PaymentMethods.php:300 PaymentTerms.php:310 PO_AuthorisationLevels.php:264
#: Prices_Customer.php:363 SalesAnalReptCols.php:552 SalesAnalRepts.php:519
@@ -546,7 +548,7 @@
msgid "Enter Information"
msgstr "أدخل المعلومات"
-#: AccountSections.php:7 includes/MainMenuLinksArray.php:365
+#: AccountSections.php:7 includes/MainMenuLinksArray.php:367
msgid "Account Sections"
msgstr "أعدادات العضو"
@@ -648,7 +650,7 @@
#: FixedAssetItems.php:250 MRPCalendar.php:176 PcAssignCashToTab.php:91
#: PcClaimExpensesFromTab.php:82 PcExpenses.php:98 PcTabs.php:104
#: PcTypeTabs.php:63 PO_Items.php:379 SalesAnalReptCols.php:129
-#: SalesPeople.php:97 SalesTypes.php:66 Stocks.php:561 Suppliers.php:524
+#: SalesPeople.php:97 SalesTypes.php:66 Stocks.php:561 Suppliers.php:532
#: SupplierTypes.php:67
msgid "has been updated"
msgstr ""
@@ -662,7 +664,7 @@
msgstr ""
#: AddCustomerContacts.php:126 CompanyPreferences.php:173
-#: CustomerBranches.php:383 Customers.php:1101 Customers.php:1109
+#: CustomerBranches.php:383 Customers.php:1102 Customers.php:1110
#: ImportBankTransAnalysis.php:207 SalesPeople.php:200 SelectCustomer.php:609
#: StockDispatch.php:275 StockDispatch.php:286 StockDispatch.php:297
#: SupplierContacts.php:152 SuppTransGLAnalysis.php:108
@@ -671,8 +673,8 @@
msgid "Name"
msgstr ""
-#: AddCustomerContacts.php:127 AddCustomerContacts.php:223 Customers.php:1102
-#: Customers.php:1110 SelectCustomer.php:610 WWW_Access.php:110
+#: AddCustomerContacts.php:127 AddCustomerContacts.php:223 Customers.php:1103
+#: Customers.php:1111 SelectCustomer.php:610 WWW_Access.php:110
#: WWW_Access.php:173
msgid "Role"
msgstr ""
@@ -682,28 +684,28 @@
msgstr ""
#: AddCustomerContacts.php:129 AddCustomerContacts.php:241
-#: CustomerBranches.php:389 CustomerBranches.php:811 CustomerInquiry.php:261
-#: Customers.php:1104 Customers.php:1112 EmailCustTrans.php:15
-#: EmailCustTrans.php:64 Factors.php:246 Factors.php:297 Locations.php:587
+#: CustomerBranches.php:389 CustomerBranches.php:813 CustomerInquiry.php:261
+#: Customers.php:1105 Customers.php:1113 EmailCustTrans.php:15
+#: EmailCustTrans.php:64 Factors.php:246 Factors.php:297 Locations.php:598
#: OrderDetails.php:115 PDFRemittanceAdvice.php:251 PO_PDFPurchOrder.php:395
#: PO_PDFPurchOrder.php:398 PrintCustTrans.php:746 PrintCustTrans.php:977
#: PrintCustTrans.php:1026 PrintCustTransPortrait.php:789
#: PrintCustTransPortrait.php:1035 PrintCustTransPortrait.php:1091
-#: SelectCustomer.php:427 SelectCustomer.php:612 SelectSupplier.php:285
+#: SelectCustomer.php:427 SelectCustomer.php:612 SelectSupplier.php:288
#: SupplierContacts.php:156 SupplierContacts.php:277 UserSettings.php:185
#: WWW_Users.php:283 includes/PDFPickingListHeader.inc:25
#: includes/PDFStatementPageHeader.inc:67 includes/PDFTransPageHeader.inc:82
#: includes/PDFTransPageHeaderPortrait.inc:111
-#: includes/PO_PDFOrderPageHeader.inc:29 ../webSHOP/Checkout.php:298
-#: ../webSHOP/Register.php:595
+#: includes/PO_PDFOrderPageHeader.inc:29 ../webSHOP/Checkout.php:420
+#: ../webSHOP/Register.php:607
msgid "Email"
msgstr ""
-#: AddCustomerContacts.php:130 AddCustomerContacts.php:250 Customers.php:1105
-#: Customers.php:1113 PcAssignCashToTab.php:242 PcAssignCashToTab.php:380
+#: AddCustomerContacts.php:130 AddCustomerContacts.php:250 Customers.php:1106
+#: Customers.php:1114 PcAssignCashToTab.php:242 PcAssignCashToTab.php:380
#: PcAuthorizeExpenses.php:97 PcClaimExpensesFromTab.php:238
#: PcClaimExpensesFromTab.php:405 PcReportTab.php:336 SelectCustomer.php:613
-#: ShopParameters.php:193 SystemParameters.php:363 WOSerialNos.php:297
+#: ShopParameters.php:198 SystemParameters.php:363 WOSerialNos.php:297
#: WOSerialNos.php:303
msgid "Notes"
msgstr ""
@@ -722,17 +724,17 @@
msgstr ""
#: AddCustomerContacts.php:214 Factors.php:234 SupplierContacts.php:239
-#: ../webSHOP/Checkout.php:379 ../webSHOP/Register.php:610
+#: ../webSHOP/Checkout.php:504 ../webSHOP/Register.php:622
msgid "Contact Name"
msgstr ""
#: AddCustomerContacts.php:232 Contracts.php:781 PDFRemittanceAdvice.php:247
#: PO_Header.php:1017 PO_Header.php:1102 SelectCreditItems.php:245
-#: SelectCustomer.php:425 SelectOrderItems.php:646
+#: SelectCustomer.php:425 SelectOrderItems.php:647
#: SupplierTenderCreate.php:390 includes/PDFStatementPageHeader.inc:63
#: includes/PDFTransPageHeader.inc:81
-#: includes/PDFTransPageHeaderPortrait.inc:107 ../webSHOP/Checkout.php:389
-#: ../webSHOP/Register.php:255 ../webSHOP/Register.php:723
+#: includes/PDFTransPageHeaderPortrait.inc:107 ../webSHOP/Checkout.php:514
+#: ../webSHOP/Register.php:260 ../webSHOP/Register.php:735
msgid "Phone"
msgstr ""
@@ -794,15 +796,16 @@
msgstr ""
#: AddCustomerNotes.php:118 AddCustomerTypeNotes.php:112 PcReportTab.php:181
-#: SelectCustomer.php:660 SelectCustomer.php:702 Stocks.php:1206
-#: UpgradeDatabase.php:229 UpgradeDatabase.php:232 UpgradeDatabase.php:235
+#: SelectCustomer.php:660 SelectCustomer.php:702 StockClone.php:921
+#: Stocks.php:1208 UpgradeDatabase.php:232 UpgradeDatabase.php:235
#: UpgradeDatabase.php:238 UpgradeDatabase.php:241 UpgradeDatabase.php:244
#: UpgradeDatabase.php:247 UpgradeDatabase.php:250 UpgradeDatabase.php:253
-#: Z_Upgrade_3.10-3.11.php:62 Z_Upgrade_3.10-3.11.php:66
-#: Z_Upgrade_3.10-3.11.php:70 Z_Upgrade_3.10-3.11.php:74
-#: Z_Upgrade_3.10-3.11.php:78 Z_Upgrade_3.11-4.00.php:62
-#: Z_Upgrade_3.11-4.00.php:66 Z_Upgrade_3.11-4.00.php:70
-#: Z_Upgrade_3.11-4.00.php:74 Z_Upgrade_3.11-4.00.php:78
+#: UpgradeDatabase.php:256 Z_Upgrade_3.10-3.11.php:62
+#: Z_Upgrade_3.10-3.11.php:66 Z_Upgrade_3.10-3.11.php:70
+#: Z_Upgrade_3.10-3.11.php:74 Z_Upgrade_3.10-3.11.php:78
+#: Z_Upgrade_3.11-4.00.php:62 Z_Upgrade_3.11-4.00.php:66
+#: Z_Upgrade_3.11-4.00.php:70 Z_Upgrade_3.11-4.00.php:74
+#: Z_Upgrade_3.11-4.00.php:78
msgid "Note"
msgstr ""
@@ -899,7 +902,7 @@
#: BOMIndentedReverse.php:140 BOMListing.php:41 BOMListing.php:52
#: DebtorsAtPeriodEnd.php:57 DebtorsAtPeriodEnd.php:69 GLBalanceSheet.php:108
#: GLBalanceSheet.php:147 GLProfit_Loss.php:185 GLTagProfit_Loss.php:194
-#: GLTrialBalance.php:163 InternalStockRequest.php:317
+#: GLTrialBalance.php:163 InternalStockRequest.php:319
#: InventoryPlanning.php:101 InventoryPlanning.php:176
#: InventoryPlanning.php:211 InventoryPlanning.php:259
#: InventoryPlanning.php:299 InventoryPlanningPrefSupplier.php:201
@@ -915,9 +918,11 @@
#: PDFCustomerList.php:232 PDFCustomerList.php:244 PDFLowGP.php:20
#: PDFSellThroughSupportClaim.php:17 PDFStockCheckComparison.php:33
#: PDFStockCheckComparison.php:59 PDFStockCheckComparison.php:264
-#: ReorderLevel.php:60 SelectAsset.php:39 SelectProduct.php:43
-#: StockCheck.php:65 StockCheck.php:139 SupplierTenderCreate.php:666
-#: SupplierTenders.php:397 SuppPriceList.php:138
+#: PurchaseByPrefSupplier.php:399 PurchaseByPrefSupplier.php:447
+#: PurchaseByPrefSupplier.php:471 PurchaseByPrefSupplier.php:500
+#: PurchaseByPrefSupplier.php:531 ReorderLevel.php:60 SelectAsset.php:39
+#: SelectProduct.php:43 StockCheck.php:65 StockCheck.php:139
+#: SupplierTenderCreate.php:666 SupplierTenders.php:397 SuppPriceList.php:138
#: includes/PDFPaymentRun_PymtFooter.php:152
msgid "Problem Report"
msgstr ""
@@ -953,20 +958,22 @@
#: OutstandingGRNs.php:49 OutstandingGRNs.php:62 PDFCustomerList.php:235
#: PDFCustomerList.php:247 PDFGLJournal.php:100 PDFGrn.php:130 PDFLowGP.php:59
#: PDFLowGP.php:71 PDFPriceList.php:128 PDFPrintLabel.php:46
-#: PDFQuotation.php:272 PDFQuotationPortrait.php:268
+#: PDFQuotation.php:277 PDFQuotationPortrait.php:273
#: PDFRemittanceAdvice.php:83 PDFSellThroughSupportClaim.php:74
#: PDFSellThroughSupportClaim.php:86 PDFStockCheckComparison.php:37
#: PDFStockCheckComparison.php:63 PDFStockCheckComparison.php:268
#: PO_PDFPurchOrder.php:31 PO_PDFPurchOrder.php:155
-#: PrintCustOrder_generic.php:249 PrintCustOrder.php:233 ReorderLevel.php:63
-#: ReorderLevel.php:182 SalesAnalysis_UserDefined.php:28
-#: SelectCreditItems.php:32 StockCheck.php:46 StockCheck.php:68
-#: StockCheck.php:99 StockCheck.php:142 StockCheck.php:153 StockCheck.php:195
-#: StockDispatch.php:128 StockDispatch.php:141 SupplierBalsAtPeriodEnd.php:54
-#: SupplierBalsAtPeriodEnd.php:65 SuppPaymentRun.php:112
-#: SuppPaymentRun.php:122 SuppPaymentRun.php:186 SuppPaymentRun.php:217
-#: SuppPriceList.php:142 Tax.php:63 Tax.php:168 Tax.php:277
-#: Z_DataExport.php:72 Z_DataExport.php:168 Z_DataExport.php:259
+#: PrintCustOrder_generic.php:249 PrintCustOrder.php:233
+#: PurchaseByPrefSupplier.php:402 PurchaseByPrefSupplier.php:450
+#: PurchaseByPrefSupplier.php:474 PurchaseByPrefSupplier.php:503
+#: PurchaseByPrefSupplier.php:534 ReorderLevel.php:63 ReorderLevel.php:182
+#: SalesAnalysis_UserDefined.php:28 SelectCreditItems.php:32 StockCheck.php:46
+#: StockCheck.php:68 StockCheck.php:99 StockCheck.php:142 StockCheck.php:153
+#: StockCheck.php:195 StockDispatch.php:128 StockDispatch.php:141
+#: SupplierBalsAtPeriodEnd.php:54 SupplierBalsAtPeriodEnd.php:65
+#: SuppPaymentRun.php:112 SuppPaymentRun.php:122 SuppPaymentRun.php:186
+#: SuppPaymentRun.php:217 SuppPriceList.php:142 Tax.php:63 Tax.php:168
+#: Tax.php:277 Z_DataExport.php:72 Z_DataExport.php:168 Z_DataExport.php:259
#: Z_DataExport.php:308 Z_DataExport.php:347 Z_DataExport.php:383
#: Z_DataExport.php:419 Z_DataExport.php:471 Z_poRebuildDefault.php:38
#: includes/PDFPaymentRun_PymtFooter.php:59
@@ -986,8 +993,9 @@
msgstr ""
#: AgedDebtors.php:365 AgedSuppliers.php:197 GLAccountCSV.php:175
-#: GLAccountInquiry.php:162 GLAccountReport.php:97 PO_Items.php:448
-#: PO_Items.php:577 PO_Items.php:602 SalesAnalReptCols.php:365
+#: GLAccountInquiry.php:162 GLAccountReport.php:97 PO_Items.php:450
+#: PO_Items.php:579 PO_Items.php:604 PurchaseByPrefSupplier.php:29
+#: PurchaseByPrefSupplier.php:54 SalesAnalReptCols.php:365
#: SpecialOrder.php:449 StockLocTransferReceive.php:390
#: StockQuantityByDate.php:123 includes/SelectOrderItems_IntoCart.inc:55
msgid "could not be retrieved because"
@@ -997,20 +1005,21 @@
#: ConfirmDispatch_Invoice.php:167 ConfirmDispatch_Invoice.php:994
#: ConfirmDispatch_Invoice.php:1008 Contracts.php:592 CounterReturns.php:1010
#: CounterReturns.php:1024 CounterSales.php:1431 CounterSales.php:1445
-#: Credit_Invoice.php:723 Credit_Invoice.php:744 CustomerReceipt.php:556
-#: CustomerReceipt.php:695 CustomerReceipt.php:723 CustomerTransInquiry.php:97
+#: Credit_Invoice.php:723 Credit_Invoice.php:744 CustomerReceipt.php:555
+#: CustomerReceipt.php:694 CustomerReceipt.php:722 CustomerTransInquiry.php:97
#: DeliveryDetails.php:409 GLProfit_Loss.php:608 GLTagProfit_Loss.php:515
-#: Payments.php:353 PDFRemittanceAdvice.php:85 PurchData.php:114
+#: Payments.php:361 PDFRemittanceAdvice.php:85 PurchData.php:114
#: PurchData.php:132 PurchData.php:360 RecurringSalesOrders.php:267
#: ReverseGRN.php:191 ReverseGRN.php:205 ReverseGRN.php:379
#: SelectCreditItems.php:1442 SelectSalesOrder.php:208
#: SelectSalesOrder.php:372 SellThroughSupport.php:81
#: SellThroughSupport.php:97 SMTPServer.php:62 StockCheck.php:224
-#: StockCostUpdate.php:78 StockCostUpdate.php:88 StockLocStatus.php:164
-#: StockMovements.php:91 StockQuantityByDate.php:97 StockReorderLevel.php:43
-#: StockStatus.php:312 StockTransfers.php:203 StockUsageGraph.php:53
-#: StockUsage.php:139 SupplierInquiry.php:78 SupplierInquiry.php:100
-#: SupplierInquiry.php:136 SupplierInquiry.php:192 SupplierPriceList.php:382
+#: StockClone.php:420 StockClone.php:504 StockCostUpdate.php:78
+#: StockCostUpdate.php:88 StockLocStatus.php:164 StockMovements.php:91
+#: StockQuantityByDate.php:97 StockReorderLevel.php:43 StockStatus.php:312
+#: StockTransfers.php:203 StockUsageGraph.php:53 StockUsage.php:139
+#: SupplierInquiry.php:78 SupplierInquiry.php:100 SupplierInquiry.php:136
+#: SupplierInquiry.php:192 SupplierPriceList.php:382
#: SupplierTransInquiry.php:97 SuppPaymentRun.php:114 SuppPaymentRun.php:188
#: SuppPaymentRun.php:219 WorkOrderCosting.php:429 WorkOrderReceive.php:292
#: WOSerialNos.php:49 Z_ChangeBranchCode.php:105 Z_ChangeCustomerCode.php:91
@@ -1024,7 +1033,7 @@
#: includes/PDFPaymentRun_PymtFooter.php:189 includes/ConnectDB_mysqli.inc:76
#: includes/ConnectDB_mysql.inc:66
#: ../webSHOP/includes/DatabaseFunctions.php:60
-#: ../webSHOP/includes/Functions.php:438 ../webSHOP/includes/PlaceOrder.php:70
+#: ../webSHOP/includes/Functions.php:438 ../webSHOP/includes/PlaceOrder.php:68
msgid "The SQL that failed was"
msgstr ""
@@ -1237,12 +1246,12 @@
#: Areas.php:131 CustomerTypes.php:168 Factors.php:140
#: FixedAssetCategories.php:142 GLAccounts.php:197
-#: InternalStockCategoriesByRole.php:102 Locations.php:349
+#: InternalStockCategoriesByRole.php:102 Locations.php:350
#: Manufacturers.php:163 MRPDemands.php:250 PcAssignCashToTab.php:138
#: PcClaimExpensesFromTab.php:130 PcExpenses.php:169 PcExpensesTypeTab.php:101
#: PcTabs.php:168 PcTypeTabs.php:143 SalesAnalReptCols.php:215
#: SalesCategories.php:139 SalesTypes.php:156 StockCategories.php:208
-#: Suppliers.php:655 SupplierTypes.php:151 Z_DeleteInvoice.php:178
+#: Suppliers.php:666 SupplierTypes.php:151 Z_DeleteInvoice.php:178
#: includes/DefineOfferClass.php:134
msgid "has been deleted"
msgstr ""
@@ -1301,13 +1310,13 @@
#: MRPReport.php:524 MRPReport.php:526 MRPReschedules.php:145
#: NoSalesItems.php:22 NoSalesItems.php:48 NoSalesItems.php:68
#: NoSalesItems.php:70 PDFPeriodStockTransListing.php:58 PDFPriceList.php:198
-#: PO_Items.php:1108 POReport.php:1586 ReorderLevel.php:212
+#: PO_Items.php:1110 POReport.php:1586 ReorderLevel.php:212
#: ReorderLevel.php:214 ReorderLevel.php:244 ReorderLevel.php:246
#: SalesGraph.php:102 SalesGraph.php:104 SalesGraph.php:124 SalesGraph.php:126
#: SalesGraph.php:148 SalesGraph.php:150 SalesGraph.php:184
#: SalesInquiry.php:1091 SalesInquiry.php:1154 SelectCreditItems.php:986
-#: SelectOrderItems.php:1662 SelectOrderItems.php:1665 SelectProduct.php:533
-#: SelectProduct.php:535 StockDispatch.php:82 StockDispatch.php:393
+#: SelectOrderItems.php:1668 SelectOrderItems.php:1671 SelectProduct.php:534
+#: SelectProduct.php:536 StockDispatch.php:82 StockDispatch.php:393
#: StockDispatch.php:395 StockLocStatus.php:71 StockLocStatus.php:73
#: StockLocStatus.php:91 StockLocStatus.php:96 StockLocStatus.php:101
#: StockLocStatus.php:106 StockQuantityByDate.php:25 SupplierPriceList.php:22
@@ -1330,8 +1339,8 @@
msgid "Containing text"
msgstr ""
-#: AuditTrail.php:90 InternalStockRequest.php:590 MRPReport.php:779
-#: PO_SelectPurchOrder.php:432 SelectContract.php:184 SelectProduct.php:806
+#: AuditTrail.php:90 InternalStockRequest.php:592 MRPReport.php:779
+#: PO_SelectPurchOrder.php:432 SelectContract.php:184 SelectProduct.php:807
msgid "View"
msgstr ""
@@ -1370,7 +1379,7 @@
msgstr ""
#: AuditTrail.php:180 MaterialsNotUsed.php:38 PurchData.php:700
-#: SellThroughSupport.php:263 ShopParameters.php:192 SystemParameters.php:362
+#: SellThroughSupport.php:263 ShopParameters.php:197 SystemParameters.php:362
#: includes/PDFOstdgGRNsPageHeader.inc:43
msgid "Value"
msgstr ""
@@ -1536,21 +1545,21 @@
msgid "Bank Address"
msgstr ""
-#: BankAccounts.php:196 Currencies.php:446 CustomerAllocations.php:337
-#: CustomerReceipt.php:803 CustomerTransInquiry.php:114 OffersReceived.php:112
+#: BankAccounts.php:196 Currencies.php:445 CustomerAllocations.php:337
+#: CustomerReceipt.php:802 CustomerTransInquiry.php:114 OffersReceived.php:112
#: PcReportTab.php:276 PcTabs.php:208 PcTabs.php:355
#: PO_AuthorisationLevels.php:126 PO_AuthorisationLevels.php:210
#: PO_AuthorisationLevels.php:216 PO_AuthoriseMyOrders.php:115
#: PO_Header.php:559 PO_SelectOSPurchOrder.php:480 PO_SelectPurchOrder.php:434
#: PricesByCost.php:282 Prices.php:220 Prices.php:296 PurchData.php:276
-#: PurchData.php:471 PurchData.php:612 SelectSupplier.php:279
+#: PurchData.php:471 PurchData.php:612 SelectSupplier.php:282
#: SellThroughSupport.php:161 SupplierCredit.php:263 SupplierInvoice.php:606
#: SupplierPriceList.php:457 SupplierTenderCreate.php:614
#: SupplierTenders.php:126 SupplierTenders.php:536
-#: SupplierTransInquiry.php:111 SuppPriceList.php:303
+#: SupplierTransInquiry.php:111 SuppPriceList.php:303 Z_ImportPriceList.php:96
#: includes/PDFBankingSummaryPageHeader.inc:42
#: includes/PDFDebtorBalsPageHeader.inc:33
-#: includes/PDFSupplierBalsPageHeader.inc:36
+#: includes/PDFSupplierBalsPageHeader.inc:36 ../webSHOP/Checkout.php:378
msgid "Currency"
msgstr ""
@@ -1641,19 +1650,20 @@
"the matching transaction."
msgstr ""
-#: BankMatching.php:100 BankReconciliation.php:108 Currencies.php:220
-#: CustomerReceipt.php:769 DailyBankTransactions.php:37 Payments.php:774
+#: BankMatching.php:100 BankReconciliation.php:108 Currencies.php:219
+#: CustomerReceipt.php:768 DailyBankTransactions.php:37 Payments.php:785
#: PDFChequeListing.php:46 TaxAuthorities.php:151 TaxAuthorities.php:318
msgid "Bank Account"
msgstr ""
-#: BankMatching.php:127 ShopParameters.php:298 ShopParameters.php:302
+#: BankMatching.php:127 FormDesigner.php:103 ShopParameters.php:303
+#: ShopParameters.php:307
msgid "Show"
msgstr ""
#: BankMatching.php:127 CounterSales.php:227 CreditItemsControlled.php:79
#: FreightCosts.php:281 GoodsReceivedControlled.php:68 GoodsReceived.php:73
-#: InternalStockRequestFulfill.php:37 StockLocTransferReceive.php:444
+#: InternalStockRequestFulfill.php:39 StockLocTransferReceive.php:444
#: SupplierAllocations.php:435 SuppShiptChgs.php:137
msgid "from"
msgstr ""
@@ -1661,14 +1671,14 @@
#: BankMatching.php:132 ConfirmDispatchControlled_Invoice.php:68
#: CounterReturns.php:197 EmailCustTrans.php:64 FixedAssetRegister.php:82
#: FTP_RadioBeacon.php:280 GLAccountCSV.php:178 GLAccountReport.php:106
-#: Payments.php:753 PcReportTab.php:110 PDFChequeListing.php:117
+#: Payments.php:764 PcReportTab.php:110 PDFChequeListing.php:117
#: PDFChequeListing.php:127 PDFChequeListing.php:196
#: PDFDeliveryDifferences.php:190 PDFDeliveryDifferences.php:203
#: PDFDeliveryDifferences.php:297 PDFDIFOT.php:197 PDFDIFOT.php:210
#: PDFDIFOT.php:303 PDFOrdersInvoiced.php:87 PDFOrdersInvoiced.php:284
#: PDFOrderStatus.php:92 PDFOrderStatus.php:266 PDFRemittanceAdvice.php:48
-#: PO_PDFPurchOrder.php:353 PricesBasedOnMarkUp.php:215
-#: PricesBasedOnMarkUp.php:354 PrintCustStatements.php:46
+#: PO_PDFPurchOrder.php:353 PricesBasedOnMarkUp.php:219
+#: PricesBasedOnMarkUp.php:358 PrintCustStatements.php:46
#: PrintCustTrans.php:63 PrintCustTrans.php:66 PrintCustTransPortrait.php:62
#: PrintCustTransPortrait.php:65 SalesGraph.php:218 SalesGraph.php:247
#: SalesGraph.php:251 StockLocTransferReceive.php:306
@@ -1769,7 +1779,7 @@
msgid "The payments with the selected criteria could not be retrieved because"
msgstr ""
-#: BankMatching.php:275 Payments.php:1069
+#: BankMatching.php:275 Payments.php:1087
msgid "Cheque No"
msgstr ""
@@ -1779,11 +1789,11 @@
msgstr ""
#: BankMatching.php:279 ConfirmDispatch_Invoice.php:297 Credit_Invoice.php:297
-#: CustomerAllocations.php:365 CustomerReceipt.php:918
+#: CustomerAllocations.php:365 CustomerReceipt.php:930
#: CustomerTransInquiry.php:113 CustWhereAlloc.php:115 GLJournalInquiry.php:85
#: ImportBankTransAnalysis.php:208 ImportBankTransAnalysis.php:288
-#: PaymentAllocations.php:67 Payments.php:1049 Payments.php:1054
-#: Payments.php:1070 PcAssignCashToTab.php:240 PcAssignCashToTab.php:371
+#: PaymentAllocations.php:67 Payments.php:1067 Payments.php:1072
+#: Payments.php:1088 PcAssignCashToTab.php:240 PcAssignCashToTab.php:371
#: PcAuthorizeExpenses.php:95 PcClaimExpensesFromTab.php:236
#: PcClaimExpensesFromTab.php:396 PcReportTab.php:180 PcReportTab.php:335
#: PrintCheque.php:83 PrintCheque.php:97 SelectCreditItems.php:696
@@ -1841,11 +1851,11 @@
msgid "reconciliation on"
msgstr ""
-#: BankReconciliation.php:75 Currencies.php:201
+#: BankReconciliation.php:75 Currencies.php:200
msgid "Cannot insert a GL entry for the exchange difference because"
msgstr ""
-#: BankReconciliation.php:76 Currencies.php:202
+#: BankReconciliation.php:76 Currencies.php:201
msgid "The SQL that failed to insert the exchange difference GL entry was"
msgstr ""
@@ -1853,7 +1863,7 @@
msgid "Exchange difference of"
msgstr ""
-#: BankReconciliation.php:96 Currencies.php:220
+#: BankReconciliation.php:96 Currencies.php:219
msgid "has been posted"
msgstr ""
@@ -1861,26 +1871,26 @@
msgid "The bank accounts could not be retrieved by the SQL because"
msgstr ""
-#: BankReconciliation.php:105 CustomerReceipt.php:757
-#: DailyBankTransactions.php:33 Payments.php:770 SuppPaymentRun.php:319
+#: BankReconciliation.php:105 CustomerReceipt.php:756
+#: DailyBankTransactions.php:33 Payments.php:781 SuppPaymentRun.php:319
msgid "The SQL used to retrieve the bank accounts was"
msgstr ""
-#: BankReconciliation.php:115 CustomerReceipt.php:777
+#: BankReconciliation.php:115 CustomerReceipt.php:776
msgid "Bank Accounts have not yet been defined"
msgstr ""
-#: BankReconciliation.php:115 CustomerReceipt.php:777
+#: BankReconciliation.php:115 CustomerReceipt.php:776
msgid "You must first"
msgstr ""
-#: BankReconciliation.php:115 CustomerReceipt.php:777
-#: DailyBankTransactions.php:43 Payments.php:782 SuppPaymentRun.php:332
+#: BankReconciliation.php:115 CustomerReceipt.php:776
+#: DailyBankTransactions.php:43 Payments.php:793 SuppPaymentRun.php:332
msgid "define the bank accounts"
msgstr ""
-#: BankReconciliation.php:115 CustomerReceipt.php:777
-#: DailyBankTransactions.php:43 Payments.php:782 SuppPaymentRun.php:332
+#: BankReconciliation.php:115 CustomerReceipt.php:776
+#: DailyBankTransactions.php:43 Payments.php:793 SuppPaymentRun.php:332
msgid "and general ledger accounts to be affected"
msgstr ""
@@ -1888,7 +1898,7 @@
msgid "Show bank reconciliation statement"
msgstr ""
-#: BankReconciliation.php:159 Currencies.php:173
+#: BankReconciliation.php:159 Currencies.php:172
msgid "The bank account balance could not be returned by the SQL because"
msgstr ""
@@ -1931,9 +1941,9 @@
#: BankReconciliation.php:215 BankReconciliation.php:292
#: ContractCosting.php:176 CustomerInquiry.php:206 CustomerPurchases.php:75
-#: CustomerTransInquiry.php:109 CustWhereAlloc.php:113
+#: CustomerReceipt.php:894 CustomerTransInquiry.php:109 CustWhereAlloc.php:113
#: DailyBankTransactions.php:128 GLAccountReport.php:342
-#: PaymentAllocations.php:64 PaymentAllocations.php:65
+#: PaymentAllocations.php:64 PaymentAllocations.php:65 Payments.php:928
#: PDFRemittanceAdvice.php:309 ShiptsList.php:37 StockCounts.php:115
#: StockCounts.php:158 StockLocMovements.php:94 StockMovements.php:102
#: Z_CheckAllocs.php:64 includes/PDFBankingSummaryPageHeader.inc:40
@@ -1986,7 +1996,7 @@
msgstr ""
#: BankReconciliation.php:361 CounterReturns.php:740 CounterSales.php:832
-#: Customers.php:1177 SelectOrderItems.php:1452 Stocks.php:1395
+#: Customers.php:1178 SelectOrderItems.php:1458 Stocks.php:1397
#: WorkOrderCosting.php:551 WorkOrderEntry.php:589
msgid "Are You Sure?"
msgstr ""
@@ -2058,8 +2068,8 @@
#: CounterSales.php:2103 CounterSales.php:2284 CounterSales.php:2416
#: Credit_Invoice.php:291 CustomerPurchases.php:73 DeliveryDetails.php:872
#: DeliveryDetails.php:942 GoodsReceived.php:102 GoodsReceived.php:106
-#: GoodsReceived.php:109 InternalStockRequestFulfill.php:318
-#: InternalStockRequestFulfill.php:319 InternalStockRequest.php:632
+#: GoodsReceived.php:109 InternalStockRequestFulfill.php:320
+#: InternalStockRequestFulfill.php:321 InternalStockRequest.php:634
#: InventoryPlanningPrefSupplier.php:78 InventoryQuantities.php:248
#: MRPDemands.php:297 MRPDemands.php:395 MRPPlannedPurchaseOrders.php:341
#: MRPPlannedWorkOrders.php:261 MRPPlannedWorkOrders.php:395 MRPReport.php:413
@@ -2073,8 +2083,8 @@
#: SalesAnalReptCols.php:16 SalesAnalReptCols.php:18 SalesGraph.php:193
#: SalesGraph.php:276 SalesInquiry.php:993 SalesTopItemsInquiry.php:225
#: SelectCreditItems.php:688 SelectCreditItems.php:1068
-#: SelectOrderItems.php:1374 SelectOrderItems.php:1542
-#: SelectOrderItems.php:1729 SelectOrderItems.php:1861 ShipmentCosting.php:149
+#: SelectOrderItems.php:1380 SelectOrderItems.php:1548
+#: SelectOrderItems.php:1737 SelectOrderItems.php:1869 ShipmentCosting.php:149
#: ShipmentCosting.php:150 Shipments.php:401 Shipments.php:403
#: Shipments.php:404 Shipments.php:488 Shipments.php:490 SpecialOrder.php:628
#: StockCounts.php:114 StockLocMovements.php:93 StockLocTransfer.php:306
@@ -2247,12 +2257,12 @@
#: BOMExtendedQty.php:323 BOMInquiry.php:110 BOMs.php:887
#: CounterReturns.php:1670 CounterSales.php:2099 CounterSales.php:2280
-#: InternalStockRequest.php:628 PO_SelectOSPurchOrder.php:239
-#: PO_SelectPurchOrder.php:215 ReorderLevelLocation.php:73
-#: ReorderLevelLocation.php:74 SelectCompletedOrder.php:556
-#: SelectOrderItems.php:1538 SelectOrderItems.php:1725
-#: SelectSalesOrder.php:612 SelectWorkOrder.php:215 Shipt_Select.php:192
-#: TopItems.php:168 includes/PDFTopItemsHeader.inc:54
+#: InternalStockRequest.php:630 PO_SelectOSPurchOrder.php:239
+#: PO_SelectPurchOrder.php:215 PurchaseByPrefSupplier.php:415
+#: ReorderLevelLocation.php:73 ReorderLevelLocation.php:74
+#: SelectCompletedOrder.php:556 SelectOrderItems.php:1544
+#: SelectOrderItems.php:1733 SelectSalesOrder.php:612 SelectWorkOrder.php:215
+#: Shipt_Select.php:192 TopItems.php:168 includes/PDFTopItemsHeader.inc:54
msgid "On Hand"
msgstr ""
@@ -2282,8 +2292,8 @@
msgstr ""
#: BOMExtendedQty.php:329 POReport.php:549 POReport.php:635 POReport.php:726
-#: POReport.php:1315 POReport.php:1366 POReport.php:1420 Stocks.php:962
-#: Stocks.php:986
+#: POReport.php:1315 POReport.php:1366 POReport.php:1420 StockClone.php:663
+#: StockClone.php:687 Stocks.php:964 Stocks.php:988
msgid "Part Description"
msgstr ""
@@ -2327,8 +2337,8 @@
#: FixedAssetRegister.php:388 FixedAssetTransfer.php:60
#: FixedAssetTransfer.php:162 GLTags.php:63 GLTags.php:82
#: GLTransInquiry.php:47 GoodsReceived.php:101
-#: InternalStockCategoriesByRole.php:168 InternalStockRequest.php:342
-#: InternalStockRequest.php:556 InternalStockRequest.php:626
+#: InternalStockCategoriesByRole.php:168 InternalStockRequest.php:344
+#: InternalStockRequest.php:558 InternalStockRequest.php:628
#: InventoryQuantities.php:246 Labels.php:288 MaintenanceTasks.php:95
#: MaintenanceUserSchedule.php:50 MaterialsNotUsed.php:35 MRPDemands.php:92
#: MRPDemands.php:295 MRPDemandTypes.php:113 MRPPlannedWorkOrders.php:258
@@ -2336,27 +2346,27 @@
#: MRPShortages.php:350 NoSalesItems.php:187 PaymentTerms.php:182
#: PcExpenses.php:190 PcExpenses.php:296 PcExpensesTypeTab.php:171
#: PcReportTab.php:179 PcTypeTabs.php:164 PDFOrdersInvoiced.php:358
-#: PDFOrderStatus.php:329 PO_Items.php:718 PO_Items.php:1158
+#: PDFOrderStatus.php:329 PO_Items.php:720 PO_Items.php:1160
#: PO_SelectOSPurchOrder.php:238 PO_SelectPurchOrder.php:214
#: PricesByCost.php:153 ReorderLevelLocation.php:71 ReorderLevel.php:298
#: ReverseGRN.php:391 SalesCategories.php:509 SecurityTokens.php:94
#: SecurityTokens.php:103 SecurityTokens.php:120 SelectAsset.php:264
#: SelectCompletedOrder.php:555 SelectContract.php:144
-#: SelectCreditItems.php:1022 SelectOrderItems.php:1536
-#: SelectOrderItems.php:1723 SelectProduct.php:545 SelectProduct.php:771
+#: SelectCreditItems.php:1022 SelectOrderItems.php:1542
+#: SelectOrderItems.php:1731 SelectProduct.php:546 SelectProduct.php:772
#: SelectSalesOrder.php:611 SelectWorkOrder.php:214 Shipt_Select.php:191
-#: StockCategories.php:238 StockDispatch.php:503 StockLocStatus.php:172
-#: StockQuantityByDate.php:108 Stocks.php:974 SuppCreditGRNs.php:92
-#: SuppCreditGRNs.php:192 SuppFixedAssetChgs.php:78 SuppInvGRNs.php:126
-#: SuppInvGRNs.php:307 SupplierCredit.php:317 SupplierCredit.php:385
-#: SupplierInvoice.php:665 SupplierInvoice.php:745 SupplierPriceList.php:39
-#: SupplierPriceList.php:271 SupplierPriceList.php:533
-#: SupplierTenderCreate.php:429 SupplierTenderCreate.php:690
-#: SupplierTenderCreate.php:848 SupplierTenders.php:326
-#: SupplierTenders.php:421 SupplierTenders.php:687 SuppPriceList.php:309
-#: TaxAuthorities.php:147 TopItems.php:164 WorkCentres.php:127
-#: WorkOrderCosting.php:98 WorkOrderCosting.php:130 WorkOrderEntry.php:648
-#: WorkOrderIssue.php:707 Z_ItemsWithoutPicture.php:33
+#: StockCategories.php:238 StockClone.php:675 StockDispatch.php:503
+#: StockLocStatus.php:172 StockQuantityByDate.php:108 Stocks.php:976
+#: SuppCreditGRNs.php:92 SuppCreditGRNs.php:192 SuppFixedAssetChgs.php:78
+#: SuppInvGRNs.php:126 SuppInvGRNs.php:307 SupplierCredit.php:317
+#: SupplierCredit.php:385 SupplierInvoice.php:665 SupplierInvoice.php:745
+#: SupplierPriceList.php:39 SupplierPriceList.php:271
+#: SupplierPriceList.php:533 SupplierTenderCreate.php:429
+#: SupplierTenderCreate.php:690 SupplierTenderCreate.php:848
+#: SupplierTenders.php:326 SupplierTenders.php:421 SupplierTenders.php:687
+#: SuppPriceList.php:309 TaxAuthorities.php:147 TopItems.php:164
+#: WorkCentres.php:127 WorkOrderCosting.php:98 WorkOrderCosting.php:130
+#: WorkOrderEntry.php:648 WorkOrderIssue.php:707 Z_ItemsWithoutPicture.php:33
#: includes/DefineLabelClass.php:12 includes/DefineLabelClass.php:45
#: includes/PDFGrnHeader.inc:29 includes/PDFInventoryPlanPageHeader.inc:51
#: includes/PDFOstdgGRNsPageHeader.inc:38
@@ -2448,18 +2458,18 @@
#: BOMInquiry.php:28 BOMs.php:870 ContractBOM.php:332 ContractBOM.php:337
#: Contracts.php:759 Contracts.php:762 CounterReturns.php:1638
-#: CounterSales.php:2247 CustomerReceipt.php:1129 CustomerReceipt.php:1132
-#: DiscountCategories.php:112 DiscountCategories.php:114
-#: DiscountCategories.php:118 DiscountCategories.php:120
-#: FixedAssetTransfer.php:94 InternalStockRequest.php:351 MRPDemands.php:338
-#: MRPDemands.php:341 MRPReport.php:546 PO_Header.php:542 PO_Items.php:1137
-#: PO_Items.php:1141 PO_SelectOSPurchOrder.php:220 PO_SelectPurchOrder.php:195
+#: CounterSales.php:2247 CustomerReceipt.php:1141 CustomerReceipt.php:1144
+#: DiscountCategories.php:121 DiscountCategories.php:123
+#: DiscountCategories.php:127 DiscountCategories.php:129
+#: FixedAssetTransfer.php:94 InternalStockRequest.php:353 MRPDemands.php:338
+#: MRPDemands.php:341 MRPReport.php:546 PO_Header.php:542 PO_Items.php:1139
+#: PO_Items.php:1143 PO_SelectOSPurchOrder.php:220 PO_SelectPurchOrder.php:195
#: PurchData.php:383 SelectAsset.php:104 SelectCompletedOrder.php:534
#: SelectCreditItems.php:227 SelectCreditItems.php:1005 SelectCustomer.php:274
#: SelectCustomer.php:284 SelectCustomer.php:293 SelectCustomer.php:303
#: SelectCustomer.php:350 SelectGLAccount.php:79 SelectOrderItems.php:619
-#: SelectOrderItems.php:622 SelectOrderItems.php:1690 SelectProduct.php:552
-#: SelectSalesOrder.php:595 SelectSupplier.php:228 SelectWorkOrder.php:201
+#: SelectOrderItems.php:622 SelectOrderItems.php:1696 SelectProduct.php:553
+#: SelectSalesOrder.php:595 SelectSupplier.php:231 SelectWorkOrder.php:201
#: SellThroughSupport.php:202 Shipt_Select.php:174 SuppFixedAssetChgs.php:126
#: SupplierPriceList.php:49 SupplierPriceList.php:406
#: SupplierTenderCreate.php:561 SupplierTenderCreate.php:701
@@ -2474,13 +2484,13 @@
msgstr ""
#: BOMInquiry.php:29 BOMs.php:871 EmailConfirmation.php:217
-#: EmailConfirmation.php:347 InternalStockRequest.php:152
-#: InternalStockRequest.php:351 MRPDemands.php:339 MRPReport.php:546
+#: EmailConfirmation.php:347 InternalStockRequest.php:154
+#: InternalStockRequest.php:353 MRPDemands.php:339 MRPReport.php:546
#: PO_SelectOSPurchOrder.php:220 PO_SelectPurchOrder.php:195
#: SalesInquiry.php:765 SalesInquiry.php:776 SalesInquiry.php:796
#: SalesInquiry.php:822 SalesInquiry.php:841 SalesInquiry.php:951
#: SalesInquiry.php:1109 SalesInquiry.php:1199 SalesInquiry.php:1217
-#: SelectProduct.php:552 Shipt_Select.php:174 StockAdjustments.php:116
+#: SelectProduct.php:553 Shipt_Select.php:174 StockAdjustments.php:116
#: StockAdjustments.php:403 StockCounts.php:113 StockCounts.php:155
#: StockMovements.php:36 StockReorderLevel.php:49 StockStatus.php:62
#: StockTransfers.php:49 StockTransfers.php:470 StockUsage.php:64
@@ -2492,12 +2502,12 @@
msgstr ""
#: BOMInquiry.php:35 BOMs.php:875 ContractBOM.php:342 Contracts.php:769
-#: CounterReturns.php:1642 CounterSales.php:2253 CustomerReceipt.php:1139
-#: FixedAssetTransfer.php:107 InternalStockRequest.php:362 MRPDemands.php:343
-#: MRPReport.php:558 PO_Header.php:549 PO_Items.php:1145 SelectAsset.php:116
+#: CounterReturns.php:1642 CounterSales.php:2253 CustomerReceipt.php:1151
+#: FixedAssetTransfer.php:107 InternalStockRequest.php:364 MRPDemands.php:343
+#: MRPReport.php:558 PO_Header.php:549 PO_Items.php:1147 SelectAsset.php:116
#: SelectCreditItems.php:234 SelectCreditItems.php:1012 SelectCustomer.php:375
-#: SelectGLAccount.php:103 SelectOrderItems.php:629 SelectOrderItems.php:1698
-#: SelectProduct.php:560 SelectSupplier.php:238 SelectSupplier.php:271
+#: SelectGLAccount.php:103 SelectOrderItems.php:630 SelectOrderItems.php:1706
+#: SelectProduct.php:561 SelectSupplier.php:241 SelectSupplier.php:274
#: SupplierPriceList.php:61 SupplierTenderCreate.php:567
#: SupplierTenderCreate.php:606 SupplierTenderCreate.php:712
#: SupplierTenders.php:445 WorkOrderEntry.php:638 WorkOrderIssue.php:690
@@ -2505,9 +2515,9 @@
msgstr ""
#: BOMInquiry.php:47 BOMs.php:805 ContractBOM.php:52 MRPDemands.php:56
-#: MRPReport.php:578 PO_Items.php:855 PO_SelectOSPurchOrder.php:65
+#: MRPReport.php:578 PO_Items.php:857 PO_SelectOSPurchOrder.php:65
#: PO_SelectPurchOrder.php:48 SelectCompletedOrder.php:97
-#: SelectCreditItems.php:301 SelectProduct.php:573 SelectSalesOrder.php:448
+#: SelectCreditItems.php:301 SelectProduct.php:574 SelectSalesOrder.php:448
#: SelectWorkOrder.php:51 Shipt_Select.php:61 SupplierPriceList.php:76
#: SupplierTenderCreate.php:726 SupplierTenders.php:576 WorkOrderEntry.php:86
#: WorkOrderIssue.php:379
@@ -2529,17 +2539,17 @@
#: BOMInquiry.php:108 BOMs.php:553 BOMs.php:885 ContractBOM.php:353
#: CounterReturns.php:1667 CounterSales.php:2096 CounterSales.php:2277
-#: CustomerBranches.php:382 CustomerReceipt.php:1150 GLCodesInquiry.php:26
-#: InternalStockRequest.php:555 InternalStockRequest.php:625
+#: CustomerBranches.php:382 CustomerReceipt.php:1162 GLCodesInquiry.php:26
+#: InternalStockRequest.php:557 InternalStockRequest.php:627
#: MaterialsNotUsed.php:34 MRPDemands.php:91 MRPPlannedWorkOrders.php:257
#: MRPReport.php:749 NoSalesItems.php:186 PDFOrdersInvoiced.php:357
-#: PDFOrderStatus.php:328 PO_Header.php:556 PO_Items.php:1157
+#: PDFOrderStatus.php:328 PO_Header.php:556 PO_Items.php:1159
#: PO_SelectOSPurchOrder.php:237 PO_SelectPurchOrder.php:213
#: PricesByCost.php:152 PurchData.php:469 ReorderLevelLocation.php:70
#: SalesPeople.php:199 SelectCompletedOrder.php:554 SelectCreditItems.php:1021
-#: SelectCustomer.php:420 SelectGLAccount.php:112 SelectOrderItems.php:1535
-#: SelectOrderItems.php:1722 SelectProduct.php:770 SelectSalesOrder.php:610
-#: SelectSupplier.php:277 SelectWorkOrder.php:213 SellThroughSupport.php:159
+#: SelectCustomer.php:420 SelectGLAccount.php:112 SelectOrderItems.php:1541
+#: SelectOrderItems.php:1730 SelectProduct.php:771 SelectSalesOrder.php:610
+#: SelectSupplier.php:280 SelectWorkOrder.php:213 SellThroughSupport.php:159
#: Shipt_Select.php:190 SpecialOrder.php:149 SupplierPriceList.php:270
#: SupplierPriceList.php:455 SupplierTenderCreate.php:612
#: SupplierTenderCreate.php:847 SupplierTenders.php:686 SuppPriceList.php:308
@@ -2552,13 +2562,13 @@
#: BOMInquiry.php:111 BOMs.php:888 ConfirmDispatch_Invoice.php:289
#: ContractBOM.php:355 CounterReturns.php:1669 CounterSales.php:2098
#: CounterSales.php:2279 Credit_Invoice.php:290 GoodsReceived.php:103
-#: GoodsReceived.php:107 InternalStockRequestAuthorisation.php:89
-#: InternalStockRequestFulfill.php:320 InternalStockRequest.php:558
-#: InternalStockRequest.php:627 MRPReport.php:752 NoSalesItems.php:190
-#: OffersReceived.php:109 PO_Items.php:1161 PO_SelectOSPurchOrder.php:241
+#: GoodsReceived.php:107 InternalStockRequestAuthorisation.php:91
+#: InternalStockRequestFulfill.php:322 InternalStockRequest.php:560
+#: InternalStockRequest.php:629 MRPReport.php:752 NoSalesItems.php:190
+#: OffersReceived.php:109 PO_Items.php:1163 PO_SelectOSPurchOrder.php:241
#: PO_SelectPurchOrder.php:217 SelectCompletedOrder.php:559
-#: SelectCreditItems.php:1023 SelectOrderItems.php:1537
-#: SelectOrderItems.php:1724 SelectProduct.php:130 SelectProduct.php:773
+#: SelectCreditItems.php:1023 SelectOrderItems.php:1543
+#: SelectOrderItems.php:1732 SelectProduct.php:130 SelectProduct.php:774
#: SelectSalesOrder.php:613 SelectWorkOrder.php:216 Shipments.php:402
#: Shipments.php:489 Shipt_Select.php:194 StockLocTransferReceive.php:453
#: SupplierPriceList.php:272 SupplierTenderCreate.php:849
@@ -2624,7 +2634,7 @@
msgstr ""
#: BOMListing.php:14 BOMListing.php:15 BOMListing.php:107
-#: includes/MainMenuLinksArray.php:286
+#: includes/MainMenuLinksArray.php:288
msgid "Bill Of Material Listing"
msgstr ""
@@ -2697,10 +2707,10 @@
msgstr ""
#: BOMs.php:122 BOMs.php:128 BOMs.php:136 BOMs.php:904
-#: InternalStockRequest.php:576 OrderDetails.php:192 PaymentTerms.php:190
+#: InternalStockRequest.php:578 OrderDetails.php:192 PaymentTerms.php:190
#: PaymentTerms.php:196 PO_SelectOSPurchOrder.php:516
#: SalesAnalReptCols.php:285 SelectProduct.php:128 SelectProduct.php:175
-#: SelectProduct.php:255 SelectProduct.php:256 SelectProduct.php:791
+#: SelectProduct.php:255 SelectProduct.php:256 SelectProduct.php:792
#: TopItems.php:187 TopItems.php:188 ../webSHOP/includes/Functions.php:41
msgid "N/A"
msgstr ""
@@ -2842,16 +2852,19 @@
#: BOMs.php:425 ConfirmDispatch_Invoice.php:1041 CounterReturns.php:1058
#: CounterSales.php:1478 Credit_Invoice.php:779 Credit_Invoice.php:807
-#: SelectCreditItems.php:1487 Stocks.php:1127 Stocks.php:1129
-#: api/api_debtortransactions.php:753 api/api_salesorders.php:920
+#: SelectCreditItems.php:1487 StockClone.php:842 StockClone.php:844
+#: Stocks.php:1129 Stocks.php:1131 api/api_debtortransactions.php:753
+#: api/api_salesorders.php:920
msgid "Assembly"
msgstr ""
-#: BOMs.php:428 FixedAssetRegister.php:390 Stocks.php:1147 Stocks.php:1149
+#: BOMs.php:428 FixedAssetRegister.php:390 StockClone.php:862
+#: StockClone.php:864 Stocks.php:1149 Stocks.php:1151
msgid "Purchased"
msgstr ""
-#: BOMs.php:431 Stocks.php:1137 Stocks.php:1139
+#: BOMs.php:431 StockClone.php:852 StockClone.php:854 Stocks.php:1139
+#: Stocks.php:1141
msgid "Manufactured"
msgstr ""
@@ -2859,7 +2872,8 @@
msgid "Kit Set"
msgstr ""
-#: BOMs.php:437 BOMs.php:529 Stocks.php:1142 Stocks.php:1144
+#: BOMs.php:437 BOMs.php:529 StockClone.php:857 StockClone.php:859
+#: Stocks.php:1144 Stocks.php:1146
msgid "Phantom"
msgstr ""
@@ -2884,7 +2898,7 @@
msgstr ""
#: BOMs.php:555 BOMs.php:686 Contracts.php:876 FixedAssetRegister.php:89
-#: InventoryQuantities.php:247 Locations.php:349 MRP.php:562 MRP.php:595
+#: InventoryQuantities.php:247 Locations.php:350 MRP.php:562 MRP.php:595
#: NoSalesItems.php:185 PDFOrdersInvoiced.php:319 PDFOrderStatus.php:288
#: ReorderLevelLocation.php:154 ReorderLevel.php:290 ReorderLevel.php:299
#: StockCounts.php:156 StockReorderLevel.php:56 StockSerialItemResearch.php:80
@@ -2896,7 +2910,7 @@
msgid "Location"
msgstr ""
-#: BOMs.php:556 ...
[truncated message content] |
|
From: <rc...@us...> - 2013-11-24 16:31:24
|
Revision: 6434
http://sourceforge.net/p/web-erp/reponame/6434
Author: rchacon
Date: 2013-11-24 16:31:21 +0000 (Sun, 24 Nov 2013)
Log Message:
-----------
Adjustments and translations for help in FormDesigner.php.
Modified Paths:
--------------
trunk/FormDesigner.php
trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot
trunk/locale/en_US.utf8/LC_MESSAGES/messages.mo
trunk/locale/en_US.utf8/LC_MESSAGES/messages.po
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.mo
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po
Modified: trunk/FormDesigner.php
===================================================================
--- trunk/FormDesigner.php 2013-11-23 21:41:47 UTC (rev 6433)
+++ trunk/FormDesigner.php 2013-11-24 16:31:21 UTC (rev 6434)
@@ -199,11 +199,11 @@
if (empty($_POST['preview'])) {
$FormDesign = simplexml_load_file($PathPrefix.'companies/'.$_SESSION['DatabaseName'].'/FormDesigns/'.$_POST['FormName']);
}
-echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/reports.png" title="' . _('Form Design') . '" alt="" />' . ' ' . _('Form Design') . '<br />' . $FormDesign['name'] . '</p>';
+echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/reports.png" title="' . _('Form Designer') . '" alt="" />' . ' ' . _('Form Designer') . '<br />' . _($FormDesign['name']) . '</p>';
echo '<div class="page_help_text">' .
_('Enter the changes that you want in the form layout below.') . '<br /> '.
_('All measurements are in PostScript points (72 points = 25,4 mm).') . '<br /> '.
- _('All coordinates are measured from the lower left corner of the sheet to the top left corner of the field.') . '</div><br />';
+ _('All coordinates are measured from the lower left corner of the sheet to the top left corner of the element.') . '</div><br />';
$Papers=array('A4_Landscape', 'A4_Portrait', 'A5_Landscape', 'A5_Portrait', 'A3_Landscape', 'A3_Portrait', 'Letter_Portrait', 'Letter_Landscape', 'Legal_Portrait', 'Legal_Landscape'); // Possible paper sizes/orientations
echo '<form method="post" id="Form" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?' . SID . '">';
Modified: trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot
===================================================================
--- trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot 2013-11-23 21:41:47 UTC (rev 6433)
+++ trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot 2013-11-24 16:31:21 UTC (rev 6434)
@@ -11094,7 +11094,7 @@
msgstr ""
#: FormDesigner.php:206
-msgid "All coordinates are measured from the lower left corner of the sheet to the top left corner of the field."
+msgid "All coordinates are measured from the lower left corner of the sheet to the top left corner of the element."
msgstr ""
#: FormDesigner.php:214
Modified: trunk/locale/en_US.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/en_US.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/en_US.utf8/LC_MESSAGES/messages.po 2013-11-23 21:41:47 UTC (rev 6433)
+++ trunk/locale/en_US.utf8/LC_MESSAGES/messages.po 2013-11-24 16:31:21 UTC (rev 6434)
@@ -9,7 +9,7 @@
"Project-Id-Version: WebERP 4.10.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-11-24 10:11+1300\n"
-"PO-Revision-Date: 2013-06-11 10:48-0600\n"
+"PO-Revision-Date: 2013-11-24 10:23-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: WebERP Translation Team <web-erp-translation@lists."
"sourceforge.net>\n"
@@ -11996,100 +11996,100 @@
#: FormDesigner.php:22 includes/MainMenuLinksArray.php:443
msgid "Form Designer"
-msgstr ""
+msgstr "Form Designer"
#: FormDesigner.php:33
msgid "x"
-msgstr ""
+msgstr "x"
#: FormDesigner.php:35
msgid ""
"Distance from the left side of the sheet to the left side of the element in "
"points"
msgstr ""
+"Distance from the left side of the sheet to the left side of the element in "
+"points"
#: FormDesigner.php:42
msgid "y"
-msgstr ""
+msgstr "y"
#: FormDesigner.php:44
msgid ""
"Distance from the lower side of the sheet to the top side of the element in "
"points"
msgstr ""
+"Distance from the lower side of the sheet to the top side of the element in "
+"points"
#: FormDesigner.php:50 FormDesigner.php:241 FormDesigner.php:305
#: FormDesigner.php:328 Labels.php:293
msgid "Width"
-msgstr ""
+msgstr "Width"
#: FormDesigner.php:52
msgid "Width of the element in points"
-msgstr ""
+msgstr "Width of the element in points"
#: FormDesigner.php:59 Labels.php:292
-#, fuzzy
msgid "Height"
-msgstr "Shipping"
+msgstr "Height"
#: FormDesigner.php:61
msgid "Height of the element in points"
-msgstr ""
+msgstr "Height of the element in points"
#: FormDesigner.php:69
msgid "Left"
-msgstr ""
+msgstr "Left"
#: FormDesigner.php:70
msgid "Text lines are rendered flush left"
-msgstr ""
+msgstr "Text lines are rendered flush left"
#: FormDesigner.php:71
msgid "Centre"
-msgstr ""
+msgstr "Center"
#: FormDesigner.php:72
msgid "Text lines are centred"
-msgstr ""
+msgstr "Text lines are centred"
#: FormDesigner.php:73
-#, fuzzy
msgid "Right"
-msgstr "Shipping"
+msgstr "Right"
#: FormDesigner.php:74
msgid "Text lines are rendered flush right"
-msgstr ""
+msgstr "Text lines are rendered flush right"
#: FormDesigner.php:75
msgid "Justify"
-msgstr ""
+msgstr "Justify"
#: FormDesigner.php:76
msgid "Text lines are justified to both margins"
-msgstr ""
+msgstr "Text lines are justified to both margins"
#: FormDesigner.php:77
msgid "Alignment"
-msgstr ""
+msgstr "Alignment"
#: FormDesigner.php:88 Labels.php:547
msgid "Font Size"
-msgstr ""
+msgstr "Font Size"
#: FormDesigner.php:92
msgid "Font size in points"
-msgstr ""
+msgstr "Font size in points"
#: FormDesigner.php:100
-#, fuzzy
msgid "Does not display this element"
-msgstr ""
-"Cannot delete this shipping-method because it was used to create sales orders"
+msgstr "Does not display this element"
#: FormDesigner.php:102
msgid "Displays this element"
-msgstr ""
+msgstr "Displays this element"
#: FormDesigner.php:165
msgid "The web server does not have write permissions on the file "
@@ -12121,18 +12121,19 @@
#: FormDesigner.php:205
msgid "All measurements are in PostScript points (72 points = 25,4 mm)."
-msgstr ""
+msgstr "All measurements are in PostScript points (72 points = 25,4 mm)."
#: FormDesigner.php:206
msgid ""
"All coordinates are measured from the lower left corner of the sheet to the "
-"top left corner of the field."
+"top left corner of the element."
msgstr ""
+"All coordinates are measured from the lower left corner of the sheet to the "
+"top left corner of the element."
#: FormDesigner.php:214
-#, fuzzy
msgid "Form Name"
-msgstr "Shipping-Method Name"
+msgstr "Form Name"
#: FormDesigner.php:216
msgid "Paper Size"
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 2013-11-23 21:41:47 UTC (rev 6433)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2013-11-24 16:31:21 UTC (rev 6434)
@@ -8,7 +8,7 @@
"Project-Id-Version: WebERP 4.081\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-11-24 10:11+1300\n"
-"PO-Revision-Date: 2013-11-22 21:37-0600\n"
+"PO-Revision-Date: 2013-11-24 10:13-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: TecnoSoluciones.com <web...@te...>\n"
"Language: es_ES\n"
@@ -12417,7 +12417,7 @@
#: FormDesigner.php:22 includes/MainMenuLinksArray.php:443
msgid "Form Designer"
-msgstr "Diseñador de Formularios"
+msgstr "Diseñador de formularios"
#: FormDesigner.php:33
msgid "x"
@@ -12428,6 +12428,8 @@
"Distance from the left side of the sheet to the left side of the element in "
"points"
msgstr ""
+"Distancia desde el lado izquierdo de la hoja al lado izquierdo del elemento "
+"en puntos"
#: FormDesigner.php:42
msgid "y"
@@ -12438,6 +12440,8 @@
"Distance from the lower side of the sheet to the top side of the element in "
"points"
msgstr ""
+"Distancia desde el lado inferior de la hoja al lado superior del elemento en "
+"puntos"
#: FormDesigner.php:50 FormDesigner.php:241 FormDesigner.php:305
#: FormDesigner.php:328 Labels.php:293
@@ -12446,7 +12450,7 @@
#: FormDesigner.php:52
msgid "Width of the element in points"
-msgstr ""
+msgstr "Ancho del elemento en puntos"
#: FormDesigner.php:59 Labels.php:292
msgid "Height"
@@ -12454,64 +12458,59 @@
#: FormDesigner.php:61
msgid "Height of the element in points"
-msgstr ""
+msgstr "Alto del elemento en puntos"
#: FormDesigner.php:69
msgid "Left"
-msgstr ""
+msgstr "Izquierda"
#: FormDesigner.php:70
msgid "Text lines are rendered flush left"
-msgstr ""
+msgstr "Alinear texto a la izquierda"
#: FormDesigner.php:71
-#, fuzzy
msgid "Centre"
-msgstr "Centro de Trabajo"
+msgstr "Centrada"
#: FormDesigner.php:72
msgid "Text lines are centred"
-msgstr ""
+msgstr "Alinear texto al centro"
#: FormDesigner.php:73
-#, fuzzy
msgid "Right"
-msgstr "ocho"
+msgstr "Derecha"
#: FormDesigner.php:74
msgid "Text lines are rendered flush right"
-msgstr ""
+msgstr "Alinear texto a la derecha"
#: FormDesigner.php:75
msgid "Justify"
-msgstr ""
+msgstr "Justificado"
#: FormDesigner.php:76
msgid "Text lines are justified to both margins"
-msgstr ""
+msgstr "Alinear texto a ambos lados"
#: FormDesigner.php:77
msgid "Alignment"
-msgstr ""
+msgstr "Alineación"
#: FormDesigner.php:88 Labels.php:547
msgid "Font Size"
-msgstr "Tamaño de Letra"
+msgstr "Tamaño de letra"
#: FormDesigner.php:92
-#, fuzzy
msgid "Font size in points"
-msgstr "Tamaño de la fuente"
+msgstr "Tamaño de letra en puntos"
#: FormDesigner.php:100
-#, fuzzy
msgid "Does not display this element"
-msgstr "No se puede eliminar este Departamento"
+msgstr "No mostrar este elemento"
#: FormDesigner.php:102
-#, fuzzy
msgid "Displays this element"
-msgstr "Despachar Porcentaje"
+msgstr "Mostrar este elemento"
#: FormDesigner.php:165
msgid "The web server does not have write permissions on the file "
@@ -12519,7 +12518,7 @@
#: FormDesigner.php:166
msgid "Your changes cannot be saved"
-msgstr "Los cambios no se pueden guardar"
+msgstr "Sus cambios no se pueden guardar"
#: FormDesigner.php:166
msgid "See your system administrator to correct this problem"
@@ -12543,15 +12542,16 @@
"Introduzca los cambios que desee en el diseño del formulario a continuación."
#: FormDesigner.php:205
-#, fuzzy
msgid "All measurements are in PostScript points (72 points = 25,4 mm)."
-msgstr "Todas las medidas están en los puntos"
+msgstr "Todas las medidas están en puntos PostScript (72 puntos = 25,4 mm)."
#: FormDesigner.php:206
msgid ""
"All coordinates are measured from the lower left corner of the sheet to the "
-"top left corner of the field."
+"top left corner of the element."
msgstr ""
+"Todas las coordenadas se miden desde la esquina inferior izquierda de la "
+"hoja a la esquina superior izquierda del elemento."
#: FormDesigner.php:214
msgid "Form Name"
@@ -12571,7 +12571,7 @@
#: FormDesigner.php:309
msgid "Radius of the rounded corners"
-msgstr ""
+msgstr "Radio de las esquinas redondeadas"
#: FormDesigner.php:338
msgid "Start x co-ordinate"
@@ -13401,6 +13401,8 @@
msgid ""
"Enter up to 50 alpha-numeric characters for the general ledger account name"
msgstr ""
+"Introduzca hasta 50 caracteres alfanuméricos para el nombre de cuenta del "
+"libro mayor"
#: GLAccounts.php:250 GLAccounts.php:297 Z_ImportGLAccountGroups.php:26
msgid "Account Group"
Modified: trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po 2013-11-23 21:41:47 UTC (rev 6433)
+++ trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po 2013-11-24 16:31:21 UTC (rev 6434)
@@ -9,7 +9,7 @@
"Project-Id-Version: weberp 3.12\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-11-24 10:11+1300\n"
-"PO-Revision-Date: 2013-08-11 18:54-0600\n"
+"PO-Revision-Date: 2013-11-24 10:10-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: French <none>\n"
"Language: fr_FR\n"
@@ -12649,10 +12649,9 @@
msgid "Move To"
msgstr "Affecter à"
-# JDN
#: FormDesigner.php:22 includes/MainMenuLinksArray.php:443
msgid "Form Designer"
-msgstr "Gestion des formulaires"
+msgstr "Concepteur de formulaires"
#: FormDesigner.php:33
msgid "x"
@@ -12663,6 +12662,7 @@
"Distance from the left side of the sheet to the left side of the element in "
"points"
msgstr ""
+"Distance du côté gauche de la feuille au côté gauche de l'élément en points"
#: FormDesigner.php:42
msgid "y"
@@ -12673,6 +12673,8 @@
"Distance from the lower side of the sheet to the top side of the element in "
"points"
msgstr ""
+"Distance du côté inférieur de la feuille au côté supérieur de l'élément en "
+"points"
#: FormDesigner.php:50 FormDesigner.php:241 FormDesigner.php:305
#: FormDesigner.php:328 Labels.php:293
@@ -12681,7 +12683,7 @@
#: FormDesigner.php:52
msgid "Width of the element in points"
-msgstr ""
+msgstr "Largeur de l'élément en points"
#: FormDesigner.php:59 Labels.php:292
msgid "Height"
@@ -12689,65 +12691,59 @@
#: FormDesigner.php:61
msgid "Height of the element in points"
-msgstr ""
+msgstr "Taille de l'élément aux points"
#: FormDesigner.php:69
msgid "Left"
-msgstr ""
+msgstr "Gauche"
#: FormDesigner.php:70
msgid "Text lines are rendered flush left"
-msgstr ""
+msgstr "Alignement du texte gauche"
-# JDN
#: FormDesigner.php:71
-#, fuzzy
msgid "Centre"
-msgstr "Centre de travail"
+msgstr "Centre"
#: FormDesigner.php:72
msgid "Text lines are centred"
-msgstr ""
+msgstr "Alignement du texte au milieu"
#: FormDesigner.php:73
-#, fuzzy
msgid "Right"
-msgstr "hauteur"
+msgstr "Droite"
#: FormDesigner.php:74
msgid "Text lines are rendered flush right"
-msgstr ""
+msgstr "Alignement du texte à droite"
#: FormDesigner.php:75
msgid "Justify"
-msgstr ""
+msgstr "justifié"
#: FormDesigner.php:76
msgid "Text lines are justified to both margins"
-msgstr ""
+msgstr "Alignement du texte à droite et à gauche"
#: FormDesigner.php:77
msgid "Alignment"
-msgstr ""
+msgstr "Alignment"
#: FormDesigner.php:88 Labels.php:547
msgid "Font Size"
msgstr "Taille de la police"
#: FormDesigner.php:92
-#, fuzzy
msgid "Font size in points"
-msgstr "Taille de la police"
+msgstr "Taille de la police en points "
#: FormDesigner.php:100
-#, fuzzy
msgid "Does not display this element"
-msgstr "Impossible de supprimer ce prix"
+msgstr "Ne pas afficher cet élément"
#: FormDesigner.php:102
-#, fuzzy
msgid "Displays this element"
-msgstr "Pourcentage pour le transfert"
+msgstr "Affiche cet élément"
#: FormDesigner.php:165
msgid "The web server does not have write permissions on the file "
@@ -12779,15 +12775,16 @@
msgstr "Faire les modifications désirées dans le formulaire ci-dessous."
#: FormDesigner.php:205
-#, fuzzy
msgid "All measurements are in PostScript points (72 points = 25,4 mm)."
-msgstr "Toutes les mesures sont en millimètres"
+msgstr "Toutes les mesures sont en points PostScript (72 points = 25,4 mm)."
#: FormDesigner.php:206
msgid ""
"All coordinates are measured from the lower left corner of the sheet to the "
-"top left corner of the field."
+"top left corner of the element."
msgstr ""
+"Toutes les coordonnées sont mesurées à partir du coin gauche inférieur de "
+"la feuille au coin haut gauche de l'élément. "
#: FormDesigner.php:214
msgid "Form Name"
@@ -12807,7 +12804,7 @@
#: FormDesigner.php:309
msgid "Radius of the rounded corners"
-msgstr ""
+msgstr "Rayon des coins arrondis"
#: FormDesigner.php:338
msgid "Start x co-ordinate"
@@ -34793,9 +34790,8 @@
msgstr "être numérique"
#: SystemParameters.php:7 includes/MainMenuLinksArray.php:428
-#, fuzzy
msgid "System Parameters"
-msgstr "Paramètres"
+msgstr "Paramètres du système"
#: SystemParameters.php:31
msgid "First overdue deadline days must be a number"
|
|
From: <rc...@us...> - 2013-11-25 12:45:39
|
Revision: 6436
http://sourceforge.net/p/web-erp/reponame/6436
Author: rchacon
Date: 2013-11-25 12:45:32 +0000 (Mon, 25 Nov 2013)
Log Message:
-----------
Translation adjustements.
Modified Paths:
--------------
trunk/includes/PDFStarter.php
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
trunk/locale/fr_CA.utf8/LC_MESSAGES/messages.mo
trunk/locale/fr_CA.utf8/LC_MESSAGES/messages.po
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.mo
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po
Modified: trunk/includes/PDFStarter.php
===================================================================
--- trunk/includes/PDFStarter.php 2013-11-24 17:06:16 UTC (rev 6435)
+++ trunk/includes/PDFStarter.php 2013-11-25 12:45:32 UTC (rev 6436)
@@ -17,6 +17,9 @@
// Changes to move from FPDF to TCPDF to support UTF-8 by Javier de Lorenzo-Cáceres <in...@ci...>
*/
+/* Initializing the $PageNumber variable. */
+$PageNumber = 0; // Each page header function pre-increments variable $PageNumber before printing it.
+
if (!isset($PaperSize)){ // Javier: Results True, it's not set.
$PaperSize = $_SESSION['DefaultPageSize']; // Javier: DefaultPageSize is taken from DB, www_users, pagesize = A4
}
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 2013-11-24 17:06:16 UTC (rev 6435)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2013-11-25 12:45:32 UTC (rev 6436)
@@ -8,7 +8,7 @@
"Project-Id-Version: WebERP 4.081\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-11-24 10:11+1300\n"
-"PO-Revision-Date: 2013-11-24 10:13-0600\n"
+"PO-Revision-Date: 2013-11-24 15:23-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: TecnoSoluciones.com <web...@te...>\n"
"Language: es_ES\n"
Modified: trunk/locale/fr_CA.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/fr_CA.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/fr_CA.utf8/LC_MESSAGES/messages.po 2013-11-24 17:06:16 UTC (rev 6435)
+++ trunk/locale/fr_CA.utf8/LC_MESSAGES/messages.po 2013-11-25 12:45:32 UTC (rev 6436)
@@ -10,7 +10,7 @@
"Project-Id-Version: WebERP 4.10.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-11-24 10:11+1300\n"
-"PO-Revision-Date: 2013-11-24 10:49-0600\n"
+"PO-Revision-Date: 2013-11-24 11:35-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: french <none>\n"
"Language: fr\n"
@@ -7433,7 +7433,7 @@
#: Currencies.php:296
msgid "Currency Name"
-msgstr "Nom de Devise"
+msgstr "Nom de la monnaie"
#: Currencies.php:297 Currencies.php:456 CustomerBranches.php:664
#: Customers.php:475 Customers.php:779 Customers.php:818
Modified: trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po 2013-11-24 17:06:16 UTC (rev 6435)
+++ trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po 2013-11-25 12:45:32 UTC (rev 6436)
@@ -9,7 +9,7 @@
"Project-Id-Version: weberp 3.12\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-11-24 10:11+1300\n"
-"PO-Revision-Date: 2013-11-24 10:49-0600\n"
+"PO-Revision-Date: 2013-11-24 19:50-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: French <none>\n"
"Language: fr_FR\n"
@@ -3321,15 +3321,15 @@
#: CompanyPreferences.php:208 Factors.php:226
msgid "Address Line 5"
-msgstr "Adresse Ligne 5"
+msgstr "Adresse ligne 5"
#: CompanyPreferences.php:213 Factors.php:230
msgid "Address Line 6"
-msgstr "Adresse Ligne 6"
+msgstr "Adresse ligne 6"
#: CompanyPreferences.php:218
msgid "Telephone Number"
-msgstr "N° tél"
+msgstr "Téléphone"
#: CompanyPreferences.php:219
msgid ""
@@ -7523,7 +7523,7 @@
#: Currencies.php:296
msgid "Currency Name"
-msgstr "Nom"
+msgstr "Nom de la monnaie"
#: Currencies.php:297 Currencies.php:456 CustomerBranches.php:664
#: Customers.php:475 Customers.php:779 Customers.php:818
@@ -7807,7 +7807,7 @@
#: CustLoginSetup.php:158 Locations.php:590 SalesPeople.php:332
#: SupplierContacts.php:265 SuppLoginSetup.php:141 WWW_Users.php:462
msgid "Telephone No"
-msgstr "N° tél"
+msgstr "N° téléphone"
#: CustLoginSetup.php:163
#, fuzzy
@@ -11073,7 +11073,7 @@
#: EDIProcessOrders.php:269
msgid "Order date"
-msgstr "Date de Commande"
+msgstr "Date de commande"
#: EDIProcessOrders.php:275 EDIProcessOrders.php:277
#: SupplierAllocations.php:437
@@ -45618,7 +45618,7 @@
#: includes/PDFPickingListHeader.inc:23 includes/PO_PDFOrderPageHeader.inc:27
msgid "Tel"
-msgstr "N° tél"
+msgstr "Tél"
#: includes/PDFPickingListHeader.inc:77
msgid "Actual Picked"
|
|
From: <rc...@us...> - 2013-11-25 14:47:42
|
Revision: 6437
http://sourceforge.net/p/web-erp/reponame/6437
Author: rchacon
Date: 2013-11-25 14:47:36 +0000 (Mon, 25 Nov 2013)
Log Message:
-----------
Updates Chinese translations for FormDesigner.php. Thanks Exson!
Modified Paths:
--------------
trunk/FormDesigner.php
trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.po
trunk/locale/zh_HK.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_HK.utf8/LC_MESSAGES/messages.po
trunk/locale/zh_TW.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_TW.utf8/LC_MESSAGES/messages.po
Modified: trunk/FormDesigner.php
===================================================================
--- trunk/FormDesigner.php 2013-11-25 12:45:32 UTC (rev 6436)
+++ trunk/FormDesigner.php 2013-11-25 14:47:36 UTC (rev 6437)
@@ -233,8 +233,8 @@
foreach ($FormDesign as $key) {
switch ($key['type']) {
case 'image':
- echo '<td colspan="1" valign="top"><table width="100%" border="1"><tr><th colspan="4">' . _($key['name']) . '</th></tr>';
- echo '<tr>';
+ echo '<td colspan="1" valign="top"><table width="100%" border="1"><tr><th colspan="4">' . _($key['name']) . '</th>';
+ echo '</tr><tr>'; // New table row.
InputX($key['id'], $key->x);
InputY($key['id'], $key->y);
echo '</tr><tr>'; // New table row.
@@ -247,8 +247,8 @@
break;
case 'SimpleText':
echo '<td colspan="1" valign="top"><table width="100%" border="1">';
- echo '<tr><th colspan="6">' . _($key['name']) . '</th></tr>';
- echo '<tr>';
+ echo '<tr><th colspan="6">' . _($key['name']) . '</th>';
+ echo '</tr><tr>'; // New table row.
InputX($key['id'], $key->x);
InputY($key['id'], $key->y);
SelectFontSize($key['id'], $key->FontSize);
@@ -258,8 +258,8 @@
break;
case 'MultiLineText':
echo '<td colspan="1" valign="top"><table width="100%" border="1">';
- echo '<tr><th colspan="8">' . _($key['name']) . '</th></tr>';
- echo '<tr>';
+ echo '<tr><th colspan="8">' . _($key['name']) . '</th>';
+ echo '</tr><tr>'; // New table row.
InputX($key['id'], $key->x);
InputY($key['id'], $key->y);
InputWidth($key['id'], $key->Length);
@@ -298,8 +298,8 @@
$counter=$counter+1;
break;
case 'CurvedRectangle':
- echo '<td colspan="1" valign="top"><table width="100%" border="1"><tr><th colspan="6">' . _($key['name']) . '</th></tr>';
- echo '<tr>';
+ echo '<td colspan="1" valign="top"><table width="100%" border="1"><tr><th colspan="6">' . _($key['name']) . '</th>';
+ echo '</tr><tr>'; // New table row.
InputX($key['id'], $key->x);
InputY($key['id'], $key->y);
echo '<td class="number">' . _('Width').' = ' . '</td><td><input type="text" class="number" name="'.$key['id'].'width" size="4" maxlength="4" value="'.$key->width.'" /></td>';
@@ -320,8 +320,8 @@
$counter=$counter+1;
break;
case 'Rectangle': // This case is probably included in CurvedRectangle.
- echo '<td colspan="1" valign="top"><table width="100%" border="1"><tr><th colspan="8">' . _($key['name']) . '</th></tr>';
- echo '<tr>';
+ echo '<td colspan="1" valign="top"><table width="100%" border="1"><tr><th colspan="8">' . _($key['name']) . '</th>';
+ echo '</tr><tr>'; // New table row.
InputX($key['id'], $key->x);
InputY($key['id'], $key->y);
echo '</tr><tr>'; // New table row.
Modified: trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.po 2013-11-25 12:45:32 UTC (rev 6436)
+++ trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.po 2013-11-25 14:47:36 UTC (rev 6437)
@@ -8,16 +8,15 @@
"Project-Id-Version: WEBERP3.05 VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-11-24 10:11+1300\n"
-"PO-Revision-Date: 2013-11-19 12:32+0800\n"
+"PO-Revision-Date: 2013-11-25 08:20-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: WebERP Translation Team <web-erp-translation@lists."
"sourceforge.net>\n"
-"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-01-29 15:16+0000\n"
-"X-Generator: Poedit 1.5.7\n"
+"X-Generator: Poedit 1.5.4\n"
"X-Poedit-Basepath: C:\\AppServ/www/\n"
"X-Poedit-SearchPath-0: weberptrunk\n"
@@ -11774,7 +11773,7 @@
msgid ""
"Distance from the left side of the sheet to the left side of the element in "
"points"
-msgstr ""
+msgstr "从纸张左侧开始到元素左侧的距离以点数表示"
#: FormDesigner.php:42
msgid "y"
@@ -11784,7 +11783,7 @@
msgid ""
"Distance from the lower side of the sheet to the top side of the element in "
"points"
-msgstr ""
+msgstr "从纸张底部到元素顶部的距离以点数表示"
#: FormDesigner.php:50 FormDesigner.php:241 FormDesigner.php:305
#: FormDesigner.php:328 Labels.php:293
@@ -11793,7 +11792,7 @@
#: FormDesigner.php:52
msgid "Width of the element in points"
-msgstr ""
+msgstr "元素的宽度以点数表示"
#: FormDesigner.php:59 Labels.php:292
msgid "Height"
@@ -11801,7 +11800,7 @@
#: FormDesigner.php:61
msgid "Height of the element in points"
-msgstr ""
+msgstr "元素高度以点数表示"
#: FormDesigner.php:69
msgid "Left"
@@ -11846,9 +11845,8 @@
msgstr "字体大小"
#: FormDesigner.php:92
-#, fuzzy
msgid "Font size in points"
-msgstr "字体大小"
+msgstr "字体大小以点数表示"
#: FormDesigner.php:100
#, fuzzy
@@ -11886,18 +11884,17 @@
#: FormDesigner.php:204
msgid "Enter the changes that you want in the form layout below."
-msgstr "在下面输入您需要变更的表单"
+msgstr "输入报表中你需要修改的部分"
#: FormDesigner.php:205
-#, fuzzy
msgid "All measurements are in PostScript points (72 points = 25,4 mm)."
-msgstr "所有的单位均为点"
+msgstr "所用的计量单位为PostScript的点（72点 = 25.4 毫米)"
#: FormDesigner.php:206
msgid ""
"All coordinates are measured from the lower left corner of the sheet to the "
"top left corner of the element."
-msgstr ""
+msgstr "所有的坐标值均从纸张的左下角开始到元素的左上角"
#: FormDesigner.php:214
msgid "Form Name"
Modified: trunk/locale/zh_HK.utf8/LC_MESSAGES/messages.mo
===================================================================
--- trunk/locale/zh_HK.utf8/LC_MESSAGES/messages.mo 2013-11-25 12:45:32 UTC (rev 6436)
+++ trunk/locale/zh_HK.utf8/LC_MESSAGES/messages.mo 2013-11-25 14:47:36 UTC (rev 6437)
@@ -1,1596 +1,1651 @@
-\xDE\x95------------------------------\xFF--------+++^+q+++++++\x9D++\xA0+++++++++\xB1++++\xD6+\xDE++++\xEC+\xED ------------Z----------o---------x------------\xB4-------\xE0-\xE1----------\xEF-------\xFD-----------+\xF1++++++++++++%+++++>+++++++++++++++k++++++++++++\x94++\xA2+++++++++++++\xC0++\xC4+++>\xE0++++++++++++++++++++ ----------(-------;---------------\-----g-----------\x85-\x867--------
@@ Diff output truncated at 100000 characters. @@
|
|
From: <dai...@us...> - 2013-11-26 09:01:18
|
Revision: 6438
http://sourceforge.net/p/web-erp/reponame/6438
Author: daintree
Date: 2013-11-26 09:01:14 +0000 (Tue, 26 Nov 2013)
Log Message:
-----------
Phil: Supplier invoice entry now allows modification of invoice quantities and prices for multiple goods received lines in line rather than having to go into each line to modify individually.
Modified Paths:
--------------
trunk/SuppInvGRNs.php
trunk/doc/Change.log
trunk/includes/ConnectDB.inc
trunk/includes/DefineSuppTransClass.php
Modified: trunk/SuppInvGRNs.php
===================================================================
--- trunk/SuppInvGRNs.php 2013-11-25 14:47:36 UTC (rev 6437)
+++ trunk/SuppInvGRNs.php 2013-11-26 09:01:14 UTC (rev 6438)
@@ -28,7 +28,7 @@
}
/*If the user hit the Add to Invoice button then process this first before showing all GRNs on the invoice
-otherwise it wouldnt show the latest additions*/
+otherwise it wouldn't show the latest additions*/
if (isset($_POST['AddPOToTrans']) AND $_POST['AddPOToTrans']!=''){
foreach($_SESSION['SuppTransTmp']->GRNs as $GRNTmp) { //loop around temp GRNs array
if ($_POST['AddPOToTrans']==$GRNTmp->PONo) {
@@ -55,56 +55,59 @@
if (isset($_POST['ModifyGRN'])){
- $InputError=False;
- $Hold=False;
- if (filter_number_format($_POST['This_QuantityInv']) >= ($_POST['QtyRecd'] - $_POST['Prev_QuantityInv'])){
- $Complete = True;
- } else {
- $Complete = False;
- }
+ for ($i=0;isset($_POST['GRNNo'.$i]);$i++) { //loop through all the possible form variables where a GRNNo is in the POST variable name
- /* It is not logical to allow being charged for more than was received - and doing so would leave the goods received suspense account out of balance */
- /*
- if ($_SESSION['Check_Qty_Charged_vs_Del_Qty']==True) {
- if ((filter_number_format($_POST['This_QuantityInv'])+ $_POST['Prev_QuantityInv'])/($_POST['QtyRecd'] ) > (1+ ($_SESSION['OverChargeProportion'] / 100))){
- prnMsg(_('The quantity being invoiced is more than the outstanding quantity by more than') . ' ' . $_SESSION['OverChargeProportion'] . ' ' .
- _('percent. The system is set up to prohibit this so will put this invoice on hold until it is authorised'),'warn');
- $Hold = True;
+ $InputError=False;
+ $Hold=False;
+ if (filter_number_format($_POST['This_QuantityInv'. $i]) >= ($_SESSION['SuppTrans']->GRNs[$_POST['GRNNo'.$i]]->QtyRecd - $_SESSION['SuppTrans']->GRNs[$_POST['GRNNo'.$i]]->Prev_QuantityInv )){
+ $Complete = True;
+ } else {
+ $Complete = False;
}
- }
- */
- if (filter_number_format($_POST['This_QuantityInv'])+$_POST['Prev_QuantityInv']-$_POST['QtyRecd'] > 0){
- prnMsg(_('The quantity being invoiced is more than the outstanding quantity that was delivered. It is not possible to enter an invoice for a quantity more than was received into stock'),'warn');
- $InputError = True;
- }
- if (!is_numeric(filter_number_format($_POST['ChgPrice'])) AND filter_number_format($_POST['ChgPrice'])<0){
- $InputError = True;
- prnMsg(_('The price charged in the suppliers currency is either not numeric or negative') . '. ' . _('The goods received cannot be invoiced at this price'),'error');
- } elseif ($_SESSION['Check_Price_Charged_vs_Order_Price'] == True AND $_POST['OrderPrice'] != 0) {
- if (filter_number_format($_POST['ChgPrice'])/$_POST['OrderPrice'] > (1+ ($_SESSION['OverChargeProportion'] / 100))){
- prnMsg(_('The price being invoiced is more than the purchase order price by more than') . ' ' . $_SESSION['OverChargeProportion'] . '%. ' .
- _('The system is set up to prohibit this so will put this invoice on hold until it is authorised'),'warn');
- $Hold=True;
+
+ /* It is not logical to allow being charged for more than was received - and doing so would leave the goods received suspense account out of balance */
+ /*
+ if ($_SESSION['Check_Qty_Charged_vs_Del_Qty']==True) {
+ if ((filter_number_format($_POST['This_QuantityInv'])+ $_POST['Prev_QuantityInv'])/($_POST['QtyRecd'] ) > (1+ ($_SESSION['OverChargeProportion'] / 100))){
+ prnMsg(_('The quantity being invoiced is more than the outstanding quantity by more than') . ' ' . $_SESSION['OverChargeProportion'] . ' ' .
+ _('percent. The system is set up to prohibit this so will put this invoice on hold until it is authorised'),'warn');
+ $Hold = True;
+ }
}
+ */
+ if (filter_number_format($_POST['This_QuantityInv'+$i])+$_SESSION['SuppTrans']->GRNs[$_POST['GRNNo'.$i]]->Prev_QuantityInv-$_SESSION['SuppTrans']->GRNs[$_POST['GRNNo'.$i]]->QtyRecd > 0){
+ prnMsg(_('The quantity being invoiced is more than the outstanding quantity that was delivered. It is not possible to enter an invoice for a quantity more than was received into stock'),'warn');
+ $InputError = True;
+ }
+ if (!is_numeric(filter_number_format($_POST['ChgPrice' . $i])) AND filter_number_format($_POST['ChgPrice' . $i])<0){
+ $InputError = True;
+ prnMsg(_('The price charged in the suppliers currency is either not numeric or negative') . '. ' . _('The goods received cannot be invoiced at this price'),'error');
+ } elseif ($_SESSION['Check_Price_Charged_vs_Order_Price'] == True AND $_SESSION['SuppTrans']->GRNs[$_POST['GRNNo'.$i]]->OrderPrice != 0) {
+ if (filter_number_format($_POST['ChgPrice' . $i])/$_SESSION['SuppTrans']->GRNs[$_POST['GRNNo'.$i]]->OrderPrice > (1+ ($_SESSION['OverChargeProportion'] / 100))){
+ prnMsg(_('The price being invoiced is more than the purchase order price by more than') . ' ' . $_SESSION['OverChargeProportion'] . '%. ' .
+ _('The system is set up to prohibit this so will put this invoice on hold until it is authorised'),'warn');
+ $Hold=True;
+ }
+ }
+
+ if ($InputError==False){
+ $_SESSION['SuppTrans']->Modify_GRN_To_Trans($_POST['GRNNo'.$i],
+ $_SESSION['SuppTrans']->GRNs[$_POST['GRNNo'.$i]]->PODetailItem,
+ $_SESSION['SuppTrans']->GRNs[$_POST['GRNNo'.$i]]->ItemCode,
+ $_SESSION['SuppTrans']->GRNs[$_POST['GRNNo'.$i]]->ItemDescription,
+ $_SESSION['SuppTrans']->GRNs[$_POST['GRNNo'.$i]]->QtyRecd,
+ $_SESSION['SuppTrans']->GRNs[$_POST['GRNNo'.$i]]->Prev_QuantityInv,
+ filter_number_format($_POST['This_QuantityInv' . $i]),
+ $_SESSION['SuppTrans']->GRNs[$_POST['GRNNo'.$i]]->OrderPrice,
+ filter_number_format($_POST['ChgPrice' . $i]),
+ $Complete,
+ $_POST['StdCostUnit'],
+ $_POST['ShiptRef'],
+ $_POST['JobRef'],
+ $_POST['GLCode'],
+ $Hold);
+ }
}
-
- if ($InputError==False){
- $_SESSION['SuppTrans']->Modify_GRN_To_Trans($_POST['GRNNumber'],
- $_POST['PODetailItem'],
- $_POST['ItemCode'],
- $_POST['ItemDescription'],
- $_POST['QtyRecd'],
- $_POST['Prev_QuantityInv'],
- filter_number_format($_POST['This_QuantityInv']),
- $_POST['OrderPrice'],
- filter_number_format($_POST['ChgPrice']),
- $Complete,
- $_POST['StdCostUnit'],
- $_POST['ShiptRef'],
- $_POST['JobRef'],
- $_POST['GLCode'],
- $Hold);
- }
}
if (isset($_GET['Delete'])){
@@ -115,52 +118,56 @@
/*Show all the selected GRNs so far from the SESSION['SuppTrans']->GRNs array */
-echo '<table class="selection">
+echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') .'" method="post">
+ <table class="selection">
+ <tbody>
<tr>
<th colspan="6"><h3>' . _('Invoiced Goods Received Selected') . '</h3></th>
+ </tr>
+ <tr>
+ <th>' . _('Sequence') . ' #</th>
+ <th>' . _('Item Code') . '</th>
+ <th>' . _('Description') . '</th>
+ <th>' . _('Quantity Yet To Inv') . '</th>
+ <th>' . _('Quantity Inv') . '</th>
+ <th>' . _('Order Price') . ' ' . $_SESSION['SuppTrans']->CurrCode . '</th>
+ <th>' . _('Inv Price') . ' ' . $_SESSION['SuppTrans']->CurrCode . '</th>
+ <th>' . _('Order Value') . ' ' . $_SESSION['SuppTrans']->CurrCode . '</th>
</tr>';
-$tableheader = '<tbody><tr>
- <th>' . _('Sequence') . ' #</th>
- <th>' . _('Item Code') . '</th>
- <th>' . _('Description') . '</th>
- <th>' . _('Quantity Charged') . '</th>
- <th>' . _('Price Charge in') . ' ' . $_SESSION['SuppTrans']->CurrCode . '</th>
- <th>' . _('Line Value in') . ' ' . $_SESSION['SuppTrans']->CurrCode . '</th>
- </tr>';
-
-echo $tableheader;
-
$TotalValueCharged=0;
$i=0;
foreach ($_SESSION['SuppTrans']->GRNs as $EnteredGRN){
- if ($EnteredGRN->ChgPrice > 1) {
- $DisplayPrice = locale_number_format($EnteredGRN->ChgPrice,$_SESSION['SuppTrans']->CurrDecimalPlaces);
- } else {
- $DisplayPrice = locale_number_format($EnteredGRN->ChgPrice,4);
- }
+ if ($EnteredGRN->ChgPrice > 1) {
+ $DisplayPrice = locale_number_format($EnteredGRN->OrderPrice,$_SESSION['SuppTrans']->CurrDecimalPlaces);
+ } else {
+ $DisplayPrice = locale_number_format($EnteredGRN->OrderPrice,4);
+ }
+
echo '<tr>
<td>' . $EnteredGRN->GRNNo . '</td>
<td>' . $EnteredGRN->ItemCode . '</td>
<td>' . $EnteredGRN->ItemDescription . '</td>
- <td class="number">' . locale_number_format($EnteredGRN->This_QuantityInv,'Variable') . '</td>
+ <td class="number">' . locale_number_format($EnteredGRN->QtyRecd - $EnteredGRN->Prev_QuantityInv,'Variable') . '</td>
+ <td><input type="text" class="number" name="This_QuantityInv' . $i . '" value="' . locale_number_format($EnteredGRN->This_QuantityInv,'Variable') . '" size="11" maxlength="10" /></td>
<td class="number">' . $DisplayPrice . '</td>
+ <td><input type="text" class="number" name="ChgPrice' . $i . '" value="' . locale_number_format($EnteredGRN->ChgPrice,$_SESSION['SuppTrans']->CurrDecimalPlaces) . '" size="11" maxlength="10" /></td>
<td class="number">' . locale_number_format($EnteredGRN->ChgPrice * $EnteredGRN->This_QuantityInv,$_SESSION['SuppTrans']->CurrDecimalPlaces) . '</td>
- <td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?Modify=' . $EnteredGRN->GRNNo . '">' . _('Modify') . '</a></td>
<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?Delete=' . $EnteredGRN->GRNNo . '">' . _('Delete') . '</a></td>
- </tr>';
-
- $TotalValueCharged = $TotalValueCharged + ($EnteredGRN->ChgPrice * $EnteredGRN->This_QuantityInv);
-
-
+ </tr>
+ <input type="hidden" name="GRNNo' . $i . '" . value="' . $EnteredGRN->GRNNo . '" />';
+ $i++;
}
-echo '</tbody><tr>
- <td colspan="5" align="right">' . _('Total Value of Goods Charged') . ':</td>
- <td class="number"><h4>' . locale_number_format($TotalValueCharged,$_SESSION['SuppTrans']->CurrDecimalPlaces) . '</h4></td>
- </tr>
+echo '</tbody>
+
</table>
+ <div class="centre">
+ <p>
+ <input type="submit" name="ModifyGRN" value="' . _('Update Amounts Invoiced') . '" />
+ </p>
+ </div>
<br />
<div class="centre">
<a href="' . $RootPath . '/SupplierInvoice.php">' . _('Back to Invoice Entry') . '</a>
@@ -202,9 +209,8 @@
}
/*Set up a table to show the GRNs outstanding for selection */
-echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') .'" method="post">';
-echo '<div>';
-echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+echo '<div>
+ <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if (!isset( $_SESSION['SuppTransTmp'])){
$_SESSION['SuppTransTmp'] = new SuppTrans;
@@ -244,73 +250,27 @@
}
}
-if (isset($_GET['Modify'])){
- $GRNNo = $_GET['Modify'];
- $GRNTmp = $_SESSION['SuppTrans']->GRNs[$GRNNo];
-
- echo '<table class="selection">';
- echo '<tr>
- <th colspan="10"><h3>' . _('GRN Selected For Adding To A Purchase Invoice') . '</h3></th>
- </tr>';
- echo '<tr>
- <th>' . _('Sequence') . ' #</th>
- <th>' . _('Item') . '</th>
- <th>' . _('Qty Outstanding') . '</th>
- <th>' . _('Qty Invoiced') . '</th>
- <th>' . _('Order Price in') . ' ' . $_SESSION['SuppTrans']->CurrCode . '</th>
- <th>' . _('Actual Price in') . ' ' . $_SESSION['SuppTrans']->CurrCode . '</th>
- </tr>';
-
- echo '<tr>
- <td>' . $GRNTmp->GRNNo . '</td>
- <td>' . $GRNTmp->ItemCode . ' ' . $GRNTmp->ItemDescription . '</td>
- <td class="number">' . locale_number_format($GRNTmp->QtyRecd - $GRNTmp->Prev_QuantityInv,$GRNTmp->DecimalPlaces) . '</td>
- <td><input type="text" class="number" name="This_QuantityInv" value="' . locale_number_format($GRNTmp->This_QuantityInv,'Variable') . '" size="11" maxlength="10" /></td>
- <td class="number">' . locale_number_format($GRNTmp->OrderPrice,$_SESSION['SuppTrans']->CurrDecimalPlaces) . '</td>
- <td><input type="text" class="number" name="ChgPrice" value="' . locale_number_format($GRNTmp->ChgPrice,$_SESSION['SuppTrans']->CurrDecimalPlaces) . '" size="11" maxlength="10" /></td>
- </tr>';
- echo '</table>';
-
- echo '<input type="hidden" name="ShiptRef" value="' . $GRNTmp->ShiptRef . '" />';
-
- echo '<div class="centre">
- <p>
- <input type="submit" name="ModifyGRN" value="' . _('Modify Line') . '" />
- </p>
- </div>';
-
-
- echo '<input type="hidden" name="GRNNumber" value="' . $GRNTmp->GRNNo . '" />';
- echo '<input type="hidden" name="ItemCode" value="' . $GRNTmp->ItemCode . '" />';
- echo '<input type="hidden" name="ItemDescription" value="' . $GRNTmp->ItemDescription . '" />';
- echo '<input type="hidden" name="QtyRecd" value="' . $GRNTmp->QtyRecd . '" />';
- echo '<input type="hidden" name="Prev_QuantityInv" value="' . $GRNTmp->Prev_QuantityInv . '" />';
- echo '<input type="hidden" name="OrderPrice" value="' . $GRNTmp->OrderPrice . '" />';
- echo '<input type="hidden" name="StdCostUnit" value="' . $GRNTmp->StdCostUnit . '" />';
- echo '<input type="hidden" name="JobRef" value="' . $GRNTmp->JobRef . '" />';
- echo '<input type="hidden" name="GLCode" value="' . $GRNTmp->GLCode . '" />';
- echo '<input type="hidden" name="PODetailItem" value="' . $GRNTmp->PODetailItem . '" />';
- echo '<input type="hidden" name="AssetID" value="' . $GRNTmp->AssetID . '" />';
-}
-else {
+if (!isset($_GET['Modify'])){
if (count( $_SESSION['SuppTransTmp']->GRNs)>0){ /*if there are any outstanding GRNs then */
echo '<table class="selection">
<tr>
- <th colspan="10"><h3>' . _('Goods Received Yet to be Invoiced From') . ' ' . $_SESSION['SuppTrans']->SupplierName . '</h3></th>
- </tr>';
-
- $tableheader = '<tbody><tr>
- <th class="ascending">' . _('Select') . '</th>
- <th class="ascending">' . _('Sequence') . ' #</th>
- <th class="ascending">' . _('Order') . '</th>
- <th class="ascending">' . _('Item Code') . '</th>
- <th class="ascending">' . _('Description') . '</th>
- <th class="ascending">' . _('Total Qty Received') . '</th>
- <th class="ascending">' . _('Qty Already Invoiced') . '</th>
- <th class="ascending">' . _('Qty Yet To Invoice') . '</th>
- <th class="ascending">' . _('Order Price in') . ' ' . $_SESSION['SuppTrans']->CurrCode . '</th>
- <th class="ascending">' . _('Line Value in') . ' ' . $_SESSION['SuppTrans']->CurrCode . '</th>
- </tr>';
+ <th><h3>' . _('Goods Received Yet to be Invoiced From') . ' ' . $_SESSION['SuppTrans']->SupplierName . '</h3></th>
+ </tr>
+ </table>
+ <table>
+ <tbody>
+ <tr>
+ <th class="ascending">' . _('Select') . '</th>
+ <th class="ascending">' . _('Sequence') . ' #</th>
+ <th class="ascending">' . _('Order') . '</th>
+ <th class="ascending">' . _('Item Code') . '</th>
+ <th class="ascending">' . _('Description') . '</th>
+ <th class="ascending">' . _('Total Qty Received') . '</th>
+ <th class="ascending">' . _('Qty Already Invoiced') . '</th>
+ <th class="ascending">' . _('Qty Yet To Invoice') . '</th>
+ <th class="ascending">' . _('Order Price in') . ' ' . $_SESSION['SuppTrans']->CurrCode . '</th>
+ <th class="ascending">' . _('Line Value in') . ' ' . $_SESSION['SuppTrans']->CurrCode . '</th>
+ </tr>';
$i = 0;
$POs = array();
foreach ($_SESSION['SuppTransTmp']->GRNs as $GRNTmp){
@@ -318,16 +278,13 @@
$_SESSION['SuppTransTmp']->GRNs[$GRNTmp->GRNNo]->This_QuantityInv = $GRNTmp->QtyRecd - $GRNTmp->Prev_QuantityInv;
if (isset($POs[$GRNTmp->PONo]) and $POs[$GRNTmp->PONo] != $GRNTmp->PONo) {
- $POs[$GRNTmp->PONo] = $GRNTmp->PONo;
- echo '<tr>
- <td><input type="submit" name="AddPOToTrans" value="' . $GRNTmp->PONo . '" /></td>
- <td colspan="3">' . _('Add Whole PO to Invoice') . '</td>
+ $POs[$GRNTmp->PONo] = $GRNTmp->PONo;
+ echo '<tr>
+ <td><input type="submit" name="AddPOToTrans" value="' . $GRNTmp->PONo . '" /></td>
+ <td colspan="3">' . _('Add Whole PO to Invoice') . '</td>
</tr>';
- $i = 0;
- }
- if ($i == 0){
- echo $tableheader;
}
+
if (isset($_POST['SelectAll'])) {
echo '<tr>
<td><input type="checkbox" checked name="GRNNo_' . $GRNTmp->GRNNo . '" /></td>';
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2013-11-25 14:47:36 UTC (rev 6437)
+++ trunk/doc/Change.log 2013-11-26 09:01:14 UTC (rev 6438)
@@ -1,5 +1,6 @@
webERP Change Log
+26/11/13 Phil: Supplier invoice entry now allows modification of invoice quantities and prices for multiple goods received lines in line rather than having to go into each line to modify individually.
20/11/13 rchacon: Translate the name of each language to the name in their respective language.
20/11/13 Phil: Payments.php FunctionalExchangeRate was not defaulted appropriately when entering a supplier payment in FX from a bank account of the same currency selected and the transaction was posted immediately without update first. Fixed
19/11/13 Thumb/CQZ: Add webERP Chinese country sql including Chinese COA, currency, role,tax, transaction type etc which should be localized.
Modified: trunk/includes/ConnectDB.inc
===================================================================
--- trunk/includes/ConnectDB.inc 2013-11-25 14:47:36 UTC (rev 6437)
+++ trunk/includes/ConnectDB.inc 2013-11-26 09:01:14 UTC (rev 6438)
@@ -4,7 +4,7 @@
* this value is saved in the $_SESSION['Versionumber'] when includes/GetConfig.php is run
* if VersionNumber is < $Version then the DB update script is run */
-$Version='4.11.0'; //must update manually every time there is a DB change
+$Version='4.11.2'; //must update manually every time there is a DB change
require_once ($PathPrefix .'includes/MiscFunctions.php');
if (!isset($_SESSION['DatabaseName'])){ //need to get the database name from the file structure
Modified: trunk/includes/DefineSuppTransClass.php
===================================================================
--- trunk/includes/DefineSuppTransClass.php 2013-11-25 14:47:36 UTC (rev 6437)
+++ trunk/includes/DefineSuppTransClass.php 2013-11-26 09:01:14 UTC (rev 6438)
@@ -145,7 +145,7 @@
$GLCode,
$Hold){
- if ($This_QuantityInv!=0 && isset($This_QuantityInv)){
+ if ($This_QuantityInv!=0 AND isset($This_QuantityInv)){
$this->GRNs[$GRNNo]->Modify($PODetailItem,
$ItemCode,
$ItemDescription,
@@ -515,4 +515,4 @@
}
}
-?>
\ No newline at end of file
+?>
|
|
From: <rc...@us...> - 2013-11-27 01:22:17
|
Revision: 6441
http://sourceforge.net/p/web-erp/reponame/6441
Author: rchacon
Date: 2013-11-27 01:22:14 +0000 (Wed, 27 Nov 2013)
Log Message:
-----------
Standardize titles and Spanish translation improvements
Modified Paths:
--------------
trunk/WWW_Users.php
trunk/includes/MainMenuLinksArray.php
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
Modified: trunk/WWW_Users.php
===================================================================
--- trunk/WWW_Users.php 2013-11-27 00:49:12 UTC (rev 6440)
+++ trunk/WWW_Users.php 2013-11-27 01:22:14 UTC (rev 6441)
@@ -26,7 +26,7 @@
_('Chinese'),
_('Free Serif'));
-$Title = _('User Maintenance');
+$Title = _('Users Maintenance');
/* webERP manual links before header.inc */
$ViewTopic= 'GettingStarted';
$BookMark = 'UserMaintenance';
Modified: trunk/includes/MainMenuLinksArray.php
===================================================================
--- trunk/includes/MainMenuLinksArray.php 2013-11-27 00:49:12 UTC (rev 6440)
+++ trunk/includes/MainMenuLinksArray.php 2013-11-27 01:22:14 UTC (rev 6441)
@@ -426,12 +426,12 @@
$MenuItems['system']['Transactions']['Caption'] = array(_('Company Preferences'),
_('System Parameters'),
- _('User Maintenance'),
+ _('Users Maintenance'),
_('Maintain Security Tokens'),
_('Access Permissions Maintenance'),
_('Page Security Settings'),
_('Bank Accounts'),
- _('Currency Maintenance'),
+ _('Currencies Maintenance'),
_('Tax Authorities and Rates Maintenance'),
_('Tax Group Maintenance'),
_('Dispatch Tax Province Maintenance'),
@@ -439,7 +439,7 @@
_('List Periods Defined'),
_('Report Builder Tool'),
_('View Audit Trail'),
- _('Geocode Setup'),
+ _('Geocode Maintenance'),
_('Form Designer'),
_('Web-Store Configuration'),
_('SMTP Server Details'),
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 2013-11-27 00:49:12 UTC (rev 6440)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2013-11-27 01:22:14 UTC (rev 6441)
@@ -8,7 +8,7 @@
"Project-Id-Version: WebERP 4.081\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-11-24 10:11+1300\n"
-"PO-Revision-Date: 2013-11-26 08:18-0600\n"
+"PO-Revision-Date: 2013-11-26 19:12-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: TecnoSoluciones.com <web...@te...>\n"
"Language: es_ES\n"
@@ -34148,9 +34148,8 @@
msgstr "ser numérico"
#: SystemParameters.php:7 includes/MainMenuLinksArray.php:428
-#, fuzzy
msgid "System Parameters"
-msgstr "Parámetros"
+msgstr "Parámetros del sistema"
#: SystemParameters.php:31
msgid "First overdue deadline days must be a number"
@@ -37804,7 +37803,7 @@
#: WWW_Users.php:29 includes/MainMenuLinksArray.php:429
msgid "User Maintenance"
-msgstr "Administrar Usuarios"
+msgstr "Administrar usuarios"
#: WWW_Users.php:87
#, fuzzy
@@ -43719,7 +43718,7 @@
#: includes/MainMenuLinksArray.php:434
msgid "Currency Maintenance"
-msgstr "Administrar Divisas (moneda)"
+msgstr "Administrar monedas"
#: includes/MainMenuLinksArray.php:435
msgid "Tax Authorities and Rates Maintenance"
|
|
From: <ex...@us...> - 2013-11-27 10:38:52
|
Revision: 6442
http://sourceforge.net/p/web-erp/reponame/6442
Author: exsonqu
Date: 2013-11-27 10:38:49 +0000 (Wed, 27 Nov 2013)
Log Message:
-----------
2013/11/27 Thumb: Add create new scripts to import Customers and Debtors.
Added Paths:
-----------
trunk/Z_ImportDebtors.php
trunk/Z_ImportSuppliers.php
Added: trunk/Z_ImportDebtors.php
===================================================================
--- trunk/Z_ImportDebtors.php (rev 0)
+++ trunk/Z_ImportDebtors.php 2013-11-27 10:38:49 UTC (rev 6442)
@@ -0,0 +1,664 @@
+<?php
+/* $Id: Z_ImportDebtors.php 6067 2013-07-10 02:04:22Z tehonu $*/
+
+include('includes/session.inc');
+$Title = _('Import Debtors And branches');
+include('includes/header.inc');
+include('includes/SQL_CommonFunctions.inc');
+
+if(isset($_POST['FormID'])){
+ if(!isset($_POST['AutoDebtorNo'])){
+ $_POST['AutoDebtorNo']=0;
+ }else{
+ $_POST['AutoDebtorNo']=1;
+ }
+ if($_POST['AutoDebtorNo']==1){
+ $_POST['UpdateIfExists']=0;
+ }else{
+ if(!isset($_POST['UpdateIfExists'])){
+ $_POST['UpdateIfExists']=0;
+ }else{
+ $_POST['UpdateIfExists']=1;
+ }
+ }
+}else{
+ $_POST['AutoDebtorNo']=$_SESSION['AutoDebtorNo'];
+ $_POST['UpdateIfExists']=0;
+}
+
+// If this script is called with a file object, then the file contents are imported
+// If this script is called with the gettemplate flag, then a template file is served
+// Otherwise, a file upload form is displayed
+$FieldHeadings = array(
+ 'debtorno', //0
+ 'name', //1
+ 'address1', //2
+ 'address2', //3
+ 'address3', //4
+ 'address4', //5
+ 'address5', //6
+ 'address6', //7
+ 'currcode', //8
+ 'salestype', //9
+ 'clientsince', //10
+ 'holdreason', //11
+ 'paymentterms', //12
+ 'discount', //13
+ 'pymtdiscount', //14
+ 'lastpaid', //15
+ 'lastpaiddate', //16
+ 'creditlimit', //17
+ 'invaddrbranch', //18
+ 'discountcode', //19
+ 'Languageid',//20
+ 'ediinvoices', //21
+ 'ediorders', //22
+ 'edireference', //23
+ 'editransport', //24
+ 'ediaddress', //25
+ 'ediserveruser', //26
+ 'ediserverpwd', //27
+ 'taxref', //28
+ 'customerpoline', //29
+ 'typeid', //30
+ 'lat', //31
+ 'lng', //32
+ 'estdeliverydays', //33
+ 'area', //34
+ 'salesman', //35
+ 'fwddate', //36
+ 'phoneno', //37
+ 'faxno', //38
+ 'contactname', //39
+ 'email', //40
+ 'defaultlocation', //41
+ 'taxgroupid', //42
+ 'defaultshipvia', //43
+ 'deliverblind', //44
+ 'disabletrans', //45
+ 'brpostaddr1', //46
+ 'brpostaddr2', //47
+ 'brpostaddr3', //48
+ 'brpostaddr4', //49
+ 'brpostaddr5', //50
+ 'brpostaddr6', //51
+ 'specialinstructions', //52
+ 'custbranchcode', //53
+);
+
+if (isset($_FILES['userfile']) and $_FILES['userfile']['name']) { //start file processing
+
+ //initialize
+ $FieldTarget = count($FieldHeadings);
+ $InputError = 0;
+
+ //check file info
+ $FileName = $_FILES['userfile']['name'];
+ $TempName = $_FILES['userfile']['tmp_name'];
+ $FileSize = $_FILES['userfile']['size'];
+ //get file handle
+ $FileHandle = fopen($TempName, 'r');
+ //get the header row
+ $headRow = fgetcsv($FileHandle, 10000, ",");
+ //check for correct number of fields
+ if ( count($headRow) != count($FieldHeadings) ) {
+ prnMsg (_('File contains '. count($headRow). ' columns, expected '. count($FieldHeadings). '. Try downloading a new template.'),'error');
+ fclose($FileHandle);
+ include('includes/footer.inc');
+ exit;
+ }
+
+ //test header row field name and sequence
+ $head = 0;
+ foreach ($headRow as $headField) {
+ if ( mb_strtoupper($headField) != mb_strtoupper($FieldHeadings[$head]) ) {
+ prnMsg (_('File contains incorrect headers ('. mb_strtoupper($headField). ' != '. mb_strtoupper($header[$head]). '. Try downloading a new template.'),'error');
+ fclose($FileHandle);
+ include('includes/footer.inc');
+ exit;
+ }
+ $head++;
+ }
+
+ //start database transaction
+ DB_Txn_Begin($db);
+
+ //loop through file rows
+ $row = 1;
+ $UpdatedNum=0;
+ $InsertNum=0;
+ while ( ($filerow = fgetcsv($FileHandle, 10000, ",")) !== FALSE ) {
+
+ //check for correct number of fields
+ $fieldCount = count($filerow);
+ if ($fieldCount != $FieldTarget){
+ prnMsg (_($FieldTarget. ' fields required, '. $fieldCount. ' fields received'),'error');
+ fclose($FileHandle);
+ include('includes/footer.inc');
+ exit;
+ }
+
+ // cleanup the data (csv files often import with empty strings and such)
+ foreach ($filerow as &$value) {
+ $value = trim($value);
+ }
+
+ $_POST['DebtorNo']=$filerow[0];
+ $_POST['CustName']=$filerow[1];
+ $_POST['Address1']=$filerow[2];
+ $_POST['Address2']=$filerow[3];
+ $_POST['Address3']=$filerow[4];
+ $_POST['Address4']=$filerow[5];
+ $_POST['Address5']=$filerow[6];
+ $_POST['Address6']=$filerow[7];
+ $_POST['CurrCode']=$filerow[8];
+ $_POST['SalesType']=$filerow[9];
+ $_POST['ClientSince']=$filerow[10];
+ $_POST['HoldReason']=$filerow[11];
+ $_POST['PaymentTerms']=$filerow[12];
+ $_POST['Discount']=$filerow[13];
+ $_POST['PymtDiscount']=$filerow[14];
+ $_POST['lastpaid']=$filerow[15];
+ $_POST['lastpaiddate']=$filerow[16];
+ $_POST['CreditLimit']=$filerow[17];
+ $_POST['InvAddrBranch']=$filerow[18];
+ $_POST['DiscountCode']=$filerow[19];
+ $_POST['LanguageID']=$filerow[20];
+ $_POST['EDIInvoices']=$filerow[21];
+ $_POST['EDIOrders']=$filerow[22];
+ $_POST['EDIReference']=$filerow[23];
+ $_POST['EDITransport']=$filerow[24];
+ $_POST['EDIAddress']=$filerow[25];
+ $_POST['EDIServerUser']=$filerow[26];
+ $_POST['EDIServerPwd']=$filerow[27];
+ $_POST['TaxRef']=$filerow[28];
+ $_POST['CustomerPOLine']=$filerow[29];
+ $_POST['typeid']=$filerow[30];
+
+ if ($_POST['AutoDebtorNo']== 1) {
+ $_POST['DebtorNo'] = GetNextTransNo(500, $db);
+ }else{
+ $_POST['DebtorNo'] = mb_strtoupper($_POST['DebtorNo']);
+ }
+
+ //$_POST['DebtorNo']=$_POST['DebtorNo'];
+ $_POST['BranchCode']=$_POST['DebtorNo'];
+ $_POST['BrName']=$_POST['CustName'];
+ $_POST['BrAddress1']=$_POST['Address1'];
+ $_POST['BrAddress2']=$_POST['Address2'];
+ $_POST['BrAddress3']=$_POST['Address3'];
+ $_POST['BrAddress4']=$_POST['Address4'];
+ $_POST['BrAddress5']=$_POST['Address5'];
+ $_POST['BrAddress6']=$_POST['Address6'];
+ $Latitude=$filerow[31];
+ $Longitude=$filerow[32];
+ $_POST['EstDeliveryDays']=$filerow[33];
+ $_POST['Area']=$filerow[34];
+ $_POST['Salesman']=$filerow[35];
+ $_POST['FwdDate']=$filerow[36];
+ $_POST['PhoneNo']=$filerow[37];
+ $_POST['FaxNo']=$filerow[38];
+ $_POST['ContactName']=$filerow[39];
+ $_POST['Email']=$filerow[40];
+ $_POST['DefaultLocation']=$filerow[41];
+ $_POST['TaxGroup']=$filerow[42];
+ $_POST['DefaultShipVia']=$filerow[43];
+ $_POST['DeliverBlind']=$filerow[44];
+ $_POST['DisableTrans']=$filerow[45];
+ $_POST['BrPostAddr1']=$filerow[46];
+ $_POST['BrPostAddr2']=$filerow[47];
+ $_POST['BrPostAddr3']=$filerow[48];
+ $_POST['BrPostAddr4']=$filerow[49];
+ $_POST['BrPostAddr5']=$filerow[50];
+ $_POST['CustBranchCode']=$filerow[51];
+ $_POST['SpecialInstructions']=$filerow[52];
+
+ $i=0;
+ if ($_POST['AutoDebtorNo']==0 AND mb_strlen($_POST['DebtorNo']) ==0) {
+ $InputError = 1;
+ prnMsg( _('The debtor code cannot be empty'),'error');
+ $Errors[$i] = 'DebtorNo';
+ $i++;
+ } elseif ($_POST['AutoDebtorNo']==0 AND (ContainsIllegalCharacters($_POST['DebtorNo']) OR mb_strpos($_POST['DebtorNo'], ' '))) {
+ $InputError = 1;
+ prnMsg( _('The customer code cannot contain any of the following characters') . " . - ' & + \" " . _('or a space'),'error');
+ $Errors[$i] = 'DebtorNo';
+ $i++;
+ }
+ if (mb_strlen($_POST['CustName']) > 40 OR mb_strlen($_POST['CustName'])==0) {
+ $InputError = 1;
+ prnMsg( _('The customer name must be entered and be forty characters or less long'),'error');
+ $Errors[$i] = 'CustName';
+ $i++;
+ } elseif (mb_strlen($_POST['Address1']) >40) {
+ $InputError = 1;
+ prnMsg( _('The Line 1 of the address must be forty characters or less long'),'error');
+ $Errors[$i] = 'Address1';
+ $i++;
+ } elseif (mb_strlen($_POST['Address2']) >40) {
+ $InputError = 1;
+ prnMsg( _('The Line 2 of the address must be forty characters or less long'),'error');
+ $Errors[$i] = 'Address2';
+ $i++;
+ } elseif (mb_strlen($_POST['Address3']) >40) {
+ $InputError = 1;
+ prnMsg( _('The Line 3 of the address must be forty characters or less long'),'error');
+ $Errors[$i] = 'Address3';
+ $i++;
+ } elseif (mb_strlen($_POST['Address4']) >50) {
+ $InputError = 1;
+ prnMsg( _('The Line 4 of the address must be fifty characters or less long'),'error');
+ $Errors[$i] = 'Address4';
+ $i++;
+ } elseif (mb_strlen($_POST['Address5']) >20) {
+ $InputError = 1;
+ prnMsg( _('The Line 5 of the address must be twenty characters or less long'),'error');
+ $Errors[$i] = 'Address5';
+ $i++;
+ } elseif (!is_numeric(filter_number_format($_POST['CreditLimit']))) {
+ $InputError = 1;
+ prnMsg( _('The credit limit must be numeric'),'error');
+ $Errors[$i] = 'CreditLimit';
+ $i++;
+ } elseif (!is_numeric(filter_number_format($_POST['PymtDiscount']))) {
+ $InputError = 1;
+ prnMsg( _('The payment discount must be numeric'),'error');
+ $Errors[$i] = 'PymtDiscount';
+ $i++;
+ } elseif (!Is_Date($_POST['ClientSince'])) {
+ $InputError = 1;
+ prnMsg( _('The customer since field must be a date in the format') . ' ' . $_SESSION['DefaultDateFormat'],'error');
+ $Errors[$i] = 'ClientSince';
+ $i++;
+ } elseif (!is_numeric(filter_number_format($_POST['Discount']))) {
+ $InputError = 1;
+ prnMsg( _('The discount percentage must be numeric'),'error');
+ $Errors[$i] = 'Discount';
+ $i++;
+ } elseif (filter_number_format($_POST['CreditLimit']) <0) {
+ $InputError = 1;
+ prnMsg( _('The credit limit must be a positive number'),'error');
+ $Errors[$i] = 'CreditLimit';
+ $i++;
+ } elseif ((filter_number_format($_POST['PymtDiscount'])> 10) OR (filter_number_format($_POST['PymtDiscount']) <0)) {
+ $InputError = 1;
+ prnMsg( _('The payment discount is expected to be less than 10% and greater than or equal to 0'),'error');
+ $Errors[$i] = 'PymtDiscount';
+ $i++;
+ } elseif ((filter_number_format($_POST['Discount'])> 100) OR (filter_number_format($_POST['Discount']) <0)) {
+ $InputError = 1;
+ prnMsg( _('The discount is expected to be less than 100% and greater than or equal to 0'),'error');
+ $Errors[$i] = 'Discount';
+ $i++;
+ }
+
+ if (ContainsIllegalCharacters($_POST['EDIReference'])
+ OR mb_strstr($_POST['EDIReference'],' ')) {
+ $InputError = 1;
+ prnMsg(_('The customers EDI reference code cannot contain any of the following characters') .' - \' & + \" ' . _('or a space'),'warn');
+ }
+ if (mb_strlen($_POST['EDIReference'])<4 AND ($_POST['EDIInvoices']==1 OR $_POST['EDIOrders']==1)){
+ $InputError = 1;
+ prnMsg(_('The customers EDI reference code must be set when EDI Invoices or EDI orders are activated'),'warn');
+ $Errors[$i] = 'EDIReference';
+ $i++;
+ }
+ if (mb_strlen($_POST['EDIAddress'])<4 AND $_POST['EDIInvoices']==1){
+ $InputError = 1;
+ prnMsg(_('The customers EDI email address or FTP server address must be entered if EDI Invoices are to be sent'),'warn');
+ $Errors[$i] = 'EDIAddress';
+ $i++;
+ }
+
+
+ if ($InputError !=1){
+ $sql="SELECT 1 FROM debtorsmaster WHERE debtorno='".$_POST['DebtorNo']."' LIMIT 1";
+ $result=DB_query($sql,$db);
+ $DebtorExists=(DB_num_rows($result)>0);
+ if ($DebtorExists AND $_POST['UpdateIfExists']!=1) {
+ $UpdatedNum++;
+ }else{
+
+ $SQL_ClientSince = FormatDateForSQL($_POST['ClientSince']);
+
+ if ($DebtorExists) {//update
+ $UpdatedNum++;
+ $sql = "SELECT 1
+ FROM debtortrans
+ where debtorno = '" . $_POST['DebtorNo'] . "' LIMIT 1";
+ $result = DB_query($sql,$db);
+
+ $curr=false;
+ if (DB_num_rows($result) == 0) {
+ $curr=true;
+ }else{
+ $CurrSQL = "SELECT currcode
+ FROM debtorsmaster
+ where debtorno = '" . $_POST['DebtorNo'] . "'";
+ $CurrResult = DB_query($CurrSQL,$db);
+ $CurrRow = DB_fetch_array($CurrResult);
+ $OldCurrency = $CurrRow[0];
+ if ($OldCurrency != $_POST['CurrCode']) {
+ prnMsg( _('The currency code cannot be updated as there are already transactions for this customer'),'info');
+ }
+ }
+
+ $sql = "UPDATE debtorsmaster SET
+ name='" . $_POST['CustName'] . "',
+ address1='" . $_POST['Address1'] . "',
+ address2='" . $_POST['Address2'] . "',
+ address3='" . $_POST['Address3'] ."',
+ address4='" . $_POST['Address4'] . "',
+ address5='" . $_POST['Address5'] . "',
+ address6='" . $_POST['Address6'] . "',";
+
+ if($curr)
+ $sql .= "currcode='" . $_POST['CurrCode'] . "',";
+
+ $sql .= "clientsince='" . $SQL_ClientSince. "',
+ holdreason='" . $_POST['HoldReason'] . "',
+ paymentterms='" . $_POST['PaymentTerms'] . "',
+ discount='" . filter_number_format($_POST['Discount'])/100 . "',
+ discountcode='" . $_POST['DiscountCode'] . "',
+ pymtdiscount='" . filter_number_format($_POST['PymtDiscount'])/100 . "',
+ creditlimit='" . filter_number_format($_POST['CreditLimit']) . "',
+ salestype = '" . $_POST['SalesType'] . "',
+ invaddrbranch='" . $_POST['AddrInvBranch'] . "',
+ taxref='" . $_POST['TaxRef'] . "',
+ customerpoline='" . $_POST['CustomerPOLine'] . "',
+ typeid='" . $_POST['typeid'] . "',
+ language_id='" . $_POST['LanguageID'] . "'
+ WHERE debtorno = '" . $_POST['DebtorNo'] . "'";
+
+ $ErrMsg = _('The customer could not be updated because');
+ $result = DB_query($sql,$db,$ErrMsg);
+
+ } else { //insert
+ $InsertNum++;
+ $sql = "INSERT INTO debtorsmaster (
+ debtorno,
+ name,
+ address1,
+ address2,
+ address3,
+ address4,
+ address5,
+ address6,
+ currcode,
+ clientsince,
+ holdreason,
+ paymentterms,
+ discount,
+ discountcode,
+ pymtdiscount,
+ creditlimit,
+ salestype,
+ invaddrbranch,
+ taxref,
+ customerpoline,
+ typeid,
+ language_id)
+ VALUES ('" . $_POST['DebtorNo'] ."',
+ '" . $_POST['CustName'] ."',
+ '" . $_POST['Address1'] ."',
+ '" . $_POST['Address2'] ."',
+ '" . $_POST['Address3'] . "',
+ '" . $_POST['Address4'] . "',
+ '" . $_POST['Address5'] . "',
+ '" . $_POST['Address6'] . "',
+ '" . $_POST['CurrCode'] . "',
+ '" . $SQL_ClientSince . "',
+ '" . $_POST['HoldReason'] . "',
+ '" . $_POST['PaymentTerms'] . "',
+ '" . filter_number_format($_POST['Discount'])/100 . "',
+ '" . $_POST['DiscountCode'] . "',
+ '" . filter_number_format($_POST['PymtDiscount'])/100 . "',
+ '" . filter_number_format($_POST['CreditLimit']) . "',
+ '" . $_POST['SalesType'] . "',
+ '" . $_POST['AddrInvBranch'] . "',
+ '" . $_POST['TaxRef'] . "',
+ '" . $_POST['CustomerPOLine'] . "',
+ '" . $_POST['typeid'] . "',
+ '" . $_POST['LanguageID'] . "')";
+
+ $ErrMsg = _('This customer could not be added because');
+ $result = DB_query($sql,$db,$ErrMsg);
+ }
+ }
+
+ }else{
+
+ break;
+ }
+
+ $i=0;
+
+ if (ContainsIllegalCharacters($_POST['BranchCode']) OR mb_strstr($_POST['BranchCode'],' ') OR mb_strstr($_POST['BranchCode'],'-')) {
+ $InputError = 1;
+ prnMsg(_('The Branch code cannot contain any of the following characters')." - & \' < >",'error');
+ $Errors[$i] = 'BranchCode';
+ $i++;
+ }
+ if (mb_strlen($_POST['BranchCode'])==0) {
+ $InputError = 1;
+ prnMsg(_('The Branch code must be at least one character long'),'error');
+ $Errors[$i] = 'BranchCode';
+ $i++;
+ }
+ if (!is_numeric($_POST['FwdDate'])) {
+ $InputError = 1;
+ prnMsg(_('The date after which invoices are charged to the following month is expected to be a number and a recognised number has not been entered'),'error');
+ $Errors[$i] = 'FwdDate';
+ $i++;
+ }
+ if ($_POST['FwdDate'] >30) {
+ $InputError = 1;
+ prnMsg(_('The date (in the month) after which invoices are charged to the following month should be a number less than 31'),'error');
+ $Errors[$i] = 'FwdDate';
+ $i++;
+ }
+ if (!is_numeric(filter_number_format($_POST['EstDeliveryDays']))) {
+ $InputError = 1;
+ prnMsg(_('The estimated delivery days is expected to be a number and a recognised number has not been entered'),'error');
+ $Errors[$i] = 'EstDeliveryDays';
+ $i++;
+ }
+ if (filter_number_format($_POST['EstDeliveryDays']) >60) {
+ $InputError = 1;
+ prnMsg(_('The estimated delivery days should be a number of days less than 60') . '. ' . _('A package can be delivered by seafreight anywhere in the world normally in less than 60 days'),'error');
+ $Errors[$i] = 'EstDeliveryDays';
+ $i++;
+ }
+
+ if ($InputError !=1){
+ if (DB_error_no($db) ==0) {
+
+ $sql = "SELECT 1
+ FROM custbranch
+ WHERE debtorno='".$_POST['DebtorNo']."' AND
+ branchcode='".$_POST['BranchCode']."' LIMIT 1";
+ $result=DB_query($sql, $db);
+ $BranchExists=(DB_num_rows($result)>0);
+ if ($BranchExists AND $_POST['UpdateIfExists']!=1) {
+ //do nothing
+ }else{
+
+ if (!isset($_POST['EstDeliveryDays'])) {
+ $_POST['EstDeliveryDays']=1;
+ }
+ if (!isset($Latitude)) {
+ $Latitude=0.0;
+ $Longitude=0.0;
+ }
+ if ($BranchExists) {
+ $sql = "UPDATE custbranch SET brname = '" . $_POST['BrName'] . "',
+ braddress1 = '" . $_POST['BrAddress1'] . "',
+ braddress2 = '" . $_POST['BrAddress2'] . "',
+ braddress3 = '" . $_POST['BrAddress3'] . "',
+ braddress4 = '" . $_POST['BrAddress4'] . "',
+ braddress5 = '" . $_POST['BrAddress5'] . "',
+ braddress6 = '" . $_POST['BrAddress6'] . "',
+ lat = '" . $Latitude . "',
+ lng = '" . $Longitude . "',
+ specialinstructions = '" . $_POST['SpecialInstructions'] . "',
+ phoneno='" . $_POST['PhoneNo'] . "',
+ faxno='" . $_POST['FaxNo'] . "',
+ fwddate= '" . $_POST['FwdDate'] . "',
+ contactname='" . $_POST['ContactName'] . "',
+ salesman= '" . $_POST['Salesman'] . "',
+ area='" . $_POST['Area'] . "',
+ estdeliverydays ='" . filter_number_format($_POST['EstDeliveryDays']) . "',
+ email='" . $_POST['Email'] . "',
+ taxgroupid='" . $_POST['TaxGroup'] . "',
+ defaultlocation='" . $_POST['DefaultLocation'] . "',
+ brpostaddr1 = '" . $_POST['BrPostAddr1'] . "',
+ brpostaddr2 = '" . $_POST['BrPostAddr2'] . "',
+ brpostaddr3 = '" . $_POST['BrPostAddr3'] . "',
+ brpostaddr4 = '" . $_POST['BrPostAddr4'] . "',
+ brpostaddr5 = '" . $_POST['BrPostAddr5'] . "',
+ disabletrans='" . $_POST['DisableTrans'] . "',
+ defaultshipvia='" . $_POST['DefaultShipVia'] . "',
+ custbranchcode='" . $_POST['CustBranchCode'] ."',
+ deliverblind='" . $_POST['DeliverBlind'] . "'
+ WHERE branchcode = '".$_POST['BranchCode']."' AND debtorno='".$_POST['DebtorNo']."'";
+
+ } else {
+
+ $sql = "INSERT INTO custbranch (branchcode,
+ debtorno,
+ brname,
+ braddress1,
+ braddress2,
+ braddress3,
+ braddress4,
+ braddress5,
+ braddress6,
+ lat,
+ lng,
+ specialinstructions,
+ estdeliverydays,
+ fwddate,
+ salesman,
+ phoneno,
+ faxno,
+ contactname,
+ area,
+ email,
+ taxgroupid,
+ defaultlocation,
+ brpostaddr1,
+ brpostaddr2,
+ brpostaddr3,
+ brpostaddr4,
+ brpostaddr5,
+ disabletrans,
+ defaultshipvia,
+ custbranchcode,
+ deliverblind)
+ VALUES ('" . $_POST['BranchCode'] . "',
+ '" . $_POST['DebtorNo'] . "',
+ '" . $_POST['BrName'] . "',
+ '" . $_POST['BrAddress1'] . "',
+ '" . $_POST['BrAddress2'] . "',
+ '" . $_POST['BrAddress3'] . "',
+ '" . $_POST['BrAddress4'] . "',
+ '" . $_POST['BrAddress5'] . "',
+ '" . $_POST['BrAddress6'] . "',
+ '" . $Latitude . "',
+ '" . $Longitude . "',
+ '" . $_POST['SpecialInstructions'] . "',
+ '" . filter_number_format($_POST['EstDeliveryDays']) . "',
+ '" . $_POST['FwdDate'] . "',
+ '" . $_POST['Salesman'] . "',
+ '" . $_POST['PhoneNo'] . "',
+ '" . $_POST['FaxNo'] . "',
+ '" . $_POST['ContactName'] . "',
+ '" . $_POST['Area'] . "',
+ '" . $_POST['Email'] . "',
+ '" . $_POST['TaxGroup'] . "',
+ '" . $_POST['DefaultLocation'] . "',
+ '" . $_POST['BrPostAddr1'] . "',
+ '" . $_POST['BrPostAddr2'] . "',
+ '" . $_POST['BrPostAddr3'] . "',
+ '" . $_POST['BrPostAddr4'] . "',
+ '" . $_POST['BrPostAddr5'] . "',
+ '" . $_POST['DisableTrans'] . "',
+ '" . $_POST['DefaultShipVia'] . "',
+ '" . $_POST['CustBranchCode'] ."',
+ '" . $_POST['DeliverBlind'] . "')";
+ }
+
+ //run the SQL from either of the above possibilites
+
+ $ErrMsg = _('The branch record could not be inserted or updated because');
+ $result = DB_query($sql,$db, $ErrMsg);
+
+
+ if (DB_error_no($db) ==0) {
+ prnMsg( _('New Item') .' ' . $StockID . ' '. _('has been added to the transaction'),'info');
+ } else { //location insert failed so set some useful error info
+ $InputError = 1;
+ prnMsg(_($result),'error');
+ }
+ }
+ } else { //item insert failed so set some useful error info
+ $InputError = 1;
+ prnMsg(_($result),'error');
+ }
+
+ }
+
+ if ($InputError == 1) { //this row failed so exit loop
+ break;
+ }
+
+ $row++;
+ }
+
+ if ($InputError == 1) { //exited loop with errors so rollback
+ prnMsg(_('Failed on row '. $row. '. Batch import has been rolled back.'),'error');
+ DB_Txn_Rollback($db);
+ } else { //all good so commit data transaction
+ DB_Txn_Commit($db);
+ prnMsg( _('Batch Import of') .' ' . $FileName . ' '. _('has been completed. All transactions committed to the database.'),'success');
+ if($_POST['UpdateIfExists']==1){
+ prnMsg( _('Updated:') .' ' . $UpdatedNum .' '._('Insert:'). $InsertNum );
+ }else{
+ prnMsg( _('Exist:') .' ' . $UpdatedNum .' '._('Insert:'). $InsertNum );
+ }
+ }
+
+ fclose($FileHandle);
+
+} elseif ( isset($_POST['gettemplate']) || isset($_GET['gettemplate']) ) { //download an import template
+
+ echo '<br /><br /><br />"'. implode('","',$FieldHeadings). '"<br /><br /><br />';
+
+} else { //show file upload form
+
+ prnMsg(_('Please ensure that your csv file is encoded in UTF-8, otherwise the input data will not store correctly in database'),'warn');
+
+ echo '
+ <br />
+ <a href="Z_ImportDebtors.php?gettemplate=1">Get Import Template</a>
+ <br />
+ <br />';
+ echo '<form action="Z_ImportDebtors.php" method="post" enctype="multipart/form-data">';
+ echo '<div class="centre">';
+ echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+
+ echo '<input type="hidden" name="MAX_FILE_SIZE" value="1000000" />' .
+ _('Upload file') . ': <input name="userfile" type="file" />
+ <input type="submit" value="' . _('Send File') . '" />';
+ echo '<br/>',_('Create Debtor Codes Automatically'),':<input type="checkbox" name="AutoDebtorNo" ';
+ if($_POST['AutoDebtorNo']==1)echo 'checked="checked"';
+ echo '>';
+ echo '<br/>',_('Update if DebtorNo exists'),':<input type="checkbox" name="UpdateIfExists">';
+ echo'</div>
+ </form>';
+
+}
+
+
+include('includes/footer.inc');
+?>
Added: trunk/Z_ImportSuppliers.php
===================================================================
--- trunk/Z_ImportSuppliers.php (rev 0)
+++ trunk/Z_ImportSuppliers.php 2013-11-27 10:38:49 UTC (rev 6442)
@@ -0,0 +1,371 @@
+<?php
+/* $Id: Z_ImportSuppliers.php 6067 2013-07-10 02:04:22Z tehonu $*/
+
+include('includes/session.inc');
+$Title = _('Import Items');
+include('includes/header.inc');
+
+if(isset($_POST['FormID'])){
+ if(!isset($_POST['UpdateIfExists'])){
+ $_POST['UpdateIfExists']=0;
+ }else{
+ $_POST['UpdateIfExists']=1;
+ }
+}else{
+ $_POST['UpdateIfExists']=0;
+}
+// If this script is called with a file object, then the file contents are imported
+// If this script is called with the gettemplate flag, then a template file is served
+// Otherwise, a file upload form is displayed
+
+$FieldHeadings = array(
+ 'SupplierID',//0
+ 'SuppName',//1
+ 'Address1',//2
+ 'Address2',//3
+ 'Address3',//4
+ 'Address4',//5
+ 'Address5',//6
+ 'Address6',//7
+ 'Phone',//8
+ 'Fax',//9
+ 'Email',//10
+ 'SupplierType',//11
+ 'CurrCode',//12
+ 'SupplierSince',//13
+ 'PaymentTerms',//14
+ 'BankPartics',//15
+ 'BankRef',//16
+ 'BankAct',//17
+ 'Remittance',//18
+ 'TaxGroup',//19
+ 'FactorID',//20
+ 'TaxRef',//21
+ 'lat', //22
+ 'lng', //23
+);
+
+if (isset($_FILES['userfile']) and $_FILES['userfile']['name']) { //start file processing
+
+ //initialize
+ $FieldTarget = count($FieldHeadings);
+ $InputError = 0;
+
+ //check file info
+ $FileName = $_FILES['userfile']['name'];
+ $TempName = $_FILES['userfile']['tmp_name'];
+ $FileSize = $_FILES['userfile']['size'];
+
+ //get file handle
+ $FileHandle = fopen($TempName, 'r');
+
+ //get the header row
+ $headRow = fgetcsv($FileHandle, 10000, ",");
+
+ //check for correct number of fields
+ if ( count($headRow) != count($FieldHeadings) ) {
+ prnMsg (_('File contains '. count($headRow). ' columns, expected '. count($FieldHeadings). '. Try downloading a new template.'),'error');
+ fclose($FileHandle);
+ include('includes/footer.inc');
+ exit;
+ }
+
+ //test header row field name and sequence
+ $head = 0;
+ foreach ($headRow as $headField) {
+ if ( mb_strtoupper($headField) != mb_strtoupper($FieldHeadings[$head]) ) {
+ prnMsg (_('File contains incorrect headers ('. mb_strtoupper($headField). ' != '. mb_strtoupper($header[$head]). '. Try downloading a new template.'),'error');
+ fclose($FileHandle);
+ include('includes/footer.inc');
+ exit;
+ }
+ $head++;
+ }
+
+ //start database transaction
+ DB_Txn_Begin($db);
+
+ //loop through file rows
+ $row = 1;
+ $UpdatedNum=0;
+ $InsertNum=0;
+ while ( ($filerow = fgetcsv($FileHandle, 10000, ",")) !== FALSE ) {
+ //check for correct number of fields
+ $fieldCount = count($filerow);
+ if ($fieldCount != $FieldTarget){
+ prnMsg (_($FieldTarget. ' fields required, '. $fieldCount. ' fields received'),'error');
+ fclose($FileHandle);
+ include('includes/footer.inc');
+ exit;
+ }
+
+ // cleanup the data (csv files often import with empty strings and such)
+ foreach ($filerow as &$value) {
+ $value = trim($value);
+ }
+
+ $SupplierID=mb_strtoupper($filerow[0]);
+ $_POST['SuppName']=$filerow[1];
+ $_POST['Address1']=$filerow[2];
+ $_POST['Address2']=$filerow[3];
+ $_POST['Address3']=$filerow[4];
+ $_POST['Address4']=$filerow[5];
+ $_POST['Address5']=$filerow[6];
+ $_POST['Address6']=$filerow[7];
+ $_POST['Phone']=$filerow[8];
+ $_POST['Fax']=$filerow[9];
+ $_POST['Email']=$filerow[10];
+ $_POST['SupplierType']=$filerow[11];
+ $_POST['CurrCode']=$filerow[12];
+ $_POST['SupplierSince']=$filerow[13];
+ $_POST['PaymentTerms']=$filerow[14];
+ $_POST['BankPartics']=$filerow[15];
+ $_POST['BankRef']=$filerow[16];
+ $_POST['BankAct']=$filerow[17];
+ $_POST['Remittance']=$filerow[18];
+ $_POST['TaxGroup']=$filerow[19];
+ $_POST['FactorID']=$filerow[20];
+ $_POST['TaxRef']=$filerow[21];
+ $latitude = $filerow[22];
+ $longitude = $filerow[23];
+ //initialise no input errors assumed initially before we test
+ $i=1;
+ /* actions to take once the user has clicked the submit button
+ ie the page has called itself with some user input */
+
+ if (mb_strlen(trim($_POST['SuppName'])) > 40
+ OR mb_strlen(trim($_POST['SuppName'])) == 0
+ OR trim($_POST['SuppName']) == '') {
+
+ $InputError = 1;
+ prnMsg(_('The supplier name must be entered and be forty characters or less long'),'error');
+ $Errors[$i]='Name';
+ $i++;
+ }
+ if (mb_strlen($SupplierID) == 0) {
+ $InputError = 1;
+ prnMsg(_('The Supplier Code cannot be empty'),'error');
+ $Errors[$i]='ID';
+ $i++;
+ }
+ if (ContainsIllegalCharacters($SupplierID)) {
+ $InputError = 1;
+ prnMsg(_('The supplier code cannot contain any of the illegal characters') ,'error');
+ $Errors[$i]='ID';
+ $i++;
+ }
+ if (mb_strlen($_POST['Phone']) >25) {
+ $InputError = 1;
+ prnMsg(_('The telephone number must be 25 characters or less long'),'error');
+ $Errors[$i] = 'Telephone';
+ $i++;
+ }
+ if (mb_strlen($_POST['Fax']) >25) {
+ $InputError = 1;
+ prnMsg(_('The fax number must be 25 characters or less long'),'error');
+ $Errors[$i] = 'Fax';
+ $i++;
+ }
+ if (mb_strlen($_POST['Email']) >55) {
+ $InputError = 1;
+ prnMsg(_('The email address must be 55 characters or less long'),'error');
+ $Errors[$i] = 'Email';
+ $i++;
+ }
+ if (mb_strlen($_POST['Email'])>0 AND !IsEmailAddress($_POST['Email'])) {
+ $InputError = 1;
+ prnMsg(_('The email address is not correctly formed'),'error');
+ $Errors[$i] = 'Email';
+ $i++;
+ }
+ if (mb_strlen($_POST['BankRef']) > 12) {
+ $InputError = 1;
+ prnMsg(_('The bank reference text must be less than 12 characters long'),'error');
+ $Errors[$i]='BankRef';
+ $i++;
+ }
+ if (!Is_Date($_POST['SupplierSince'])) {
+ $InputError = 1;
+ prnMsg(_('The supplier since field must be a date in the format') . ' ' . $_SESSION['DefaultDateFormat'],'error');
+ $Errors[$i]='SupplierSince';
+ $i++;
+ }
+
+ if ($InputError != 1){
+
+ $SQL_SupplierSince = FormatDateForSQL($_POST['SupplierSince']);
+
+ //first off validate inputs sensible
+ $sql="SELECT COUNT(supplierid) FROM suppliers WHERE supplierid='".$SupplierID."'";
+ $result=DB_query($sql,$db);
+ $myrow=DB_fetch_row($result);
+ $SuppExists=(DB_num_rows($result)>0);
+ if ($SuppExists AND $_POST['UpdateIfExists']!=1) {
+ $UpdatedNum++;
+ }elseif($SuppExists){
+ $UpdatedNum++;
+ $supptranssql = "SELECT supplierno
+ FROM supptrans
+ WHERE supplierno='".$SupplierID ."'";
+ $suppresult = DB_query($supptranssql, $db);
+ $supptrans = DB_num_rows($suppresult);
+
+ $suppcurrssql = "SELECT currcode
+ FROM suppliers
+ WHERE supplierid='".$SupplierID ."'";
+ $currresult = DB_query($suppcurrssql, $db);
+ $suppcurr = DB_fetch_row($currresult);
+
+ $sql = "UPDATE suppliers SET suppname='" . $_POST['SuppName'] . "',
+ address1='" . $_POST['Address1'] . "',
+ address2='" . $_POST['Address2'] . "',
+ address3='" . $_POST['Address3'] . "',
+ address4='" . $_POST['Address4'] . "',
+ address5='" . $_POST['Address5'] . "',
+ address6='" . $_POST['Address6'] . "',
+ telephone='". $_POST['Phone'] ."',
+ fax = '". $_POST['Fax']."',
+ email = '" . $_POST['Email'] . "',
+ supptype = '".$_POST['SupplierType']."',";
+ if ($supptrans == 0)$sql.="currcode='" . $_POST['CurrCode'] . "',";
+ $sql.="suppliersince='".$SQL_SupplierSince . "',
+ paymentterms='" . $_POST['PaymentTerms'] . "',
+ bankpartics='" . $_POST['BankPartics'] . "',
+ bankref='" . $_POST['BankRef'] . "',
+ bankact='" . $_POST['BankAct'] . "',
+ remittance='" . $_POST['Remittance'] . "',
+ taxgroupid='" . $_POST['TaxGroup'] . "',
+ factorcompanyid='" . $_POST['FactorID'] ."',
+ lat='" . $latitude ."',
+ lng='" . $longitude ."',
+ taxref='". $_POST['TaxRef'] ."'
+ WHERE supplierid = '".$SupplierID."'";
+
+ if ($suppcurr[0] != $_POST['CurrCode']) {
+ prnMsg( _('Cannot change currency code as transactions already exist'), 'info');
+ }
+
+ $ErrMsg = _('The supplier could not be updated because');
+ $DbgMsg = _('The SQL that was used to update the supplier but failed was');
+ // echo $sql;
+ $result = DB_query($sql, $db, $ErrMsg, $DbgMsg);
+
+ } else { //its a new supplier
+ $InsertNum++;
+ $sql = "INSERT INTO suppliers (supplierid,
+ suppname,
+ address1,
+ address2,
+ address3,
+ address4,
+ address5,
+ address6,
+ telephone,
+ fax,
+ email,
+ supptype,
+ currcode,
+ suppliersince,
+ paymentterms,
+ bankpartics,
+ bankref,
+ bankact,
+ remittance,
+ taxgroupid,
+ factorcompanyid,
+ lat,
+ lng,
+ taxref)
+ VALUES ('" . $SupplierID . "',
+ '" . $_POST['SuppName'] . "',
+ '" . $_POST['Address1'] . "',
+ '" . $_POST['Address2'] . "',
+ '" . $_POST['Address3'] . "',
+ '" . $_POST['Address4'] . "',
+ '" . $_POST['Address5'] . "',
+ '" . $_POST['Address6'] . "',
+ '" . $_POST['Phone'] . "',
+ '" . $_POST['Fax'] . "',
+ '" . $_POST['Email'] . "',
+ '".$_POST['SupplierType']."',
+ '" . $_POST['CurrCode'] . "',
+ '" . $SQL_SupplierSince . "',
+ '" . $_POST['PaymentTerms'] . "',
+ '" . $_POST['BankPartics'] . "',
+ '" . $_POST['BankRef'] . "',
+ '" . $_POST['BankAct'] . "',
+ '" . $_POST['Remittance'] . "',
+ '" . $_POST['TaxGroup'] . "',
+ '" . $_POST['FactorID'] . "',
+ '" . $latitude ."',
+ '" . $longitude ."',
+ '" . $_POST['TaxRef'] . "')";
+
+ $ErrMsg = _('The supplier') . ' ' . $_POST['SuppName'] . ' ' . _('could not be added because');
+ $DbgMsg = _('The SQL that was used to insert the supplier but failed was');
+
+ $result = DB_query($sql, $db, $ErrMsg, $DbgMsg);
+
+ }
+ if (DB_error_no($db) ==0) {
+
+ } else { //location insert failed so set some useful error info
+ $InputError = 1;
+ }
+ } else { //item insert failed so set some useful error info
+ $InputError = 1;
+ }
+ if ($InputError == 1) { //this row failed so exit loop
+ break;
+ }
+
+ $row++;
+
+ }
+
+ if ($InputError == 1) { //exited loop with errors so rollback
+ prnMsg(_('Failed on row '. $row. '. Batch import has been rolled back.'),'error');
+ DB_Txn_Rollback($db);
+ } else { //all good so commit data transaction
+ DB_Txn_Commit($db);
+ prnMsg( _('Batch Import of') .' ' . $FileName . ' '. _('has been completed. All transactions committed to the database.'),'success');
+ if($_POST['UpdateIfExists']==1){
+ prnMsg( _('Updated:') .' ' . $UpdatedNum .' '._('Insert:'). $InsertNum );
+ }else{
+ prnMsg( _('Exist:') .' ' . $UpdatedNum .' '._('Insert:'). $InsertNum );
+ }
+
+ }
+
+ fclose($FileHandle);
+
+} elseif ( isset($_POST['gettemplate']) || isset($_GET['gettemplate']) ) { //download an import template
+
+ echo '<br /><br /><br />"'. implode('","',$FieldHeadings). '"<br /><br /><br />';
+
+} else { //show file upload form
+
+ prnMsg(_('Please ensure that your csv file charset is UTF-8, otherwise the data will not store correctly in database'),'warn');
+
+ echo '
+ <br />
+ <a href="Z_ImportSuppliers.php?gettemplate=1">Get Import Template</a>
+ <br />
+ <br />';
+ echo '<form action="Z_ImportSuppliers.php" method="post" enctype="multipart/form-data">';
+ echo '<div class="centre">';
+ echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+
+ echo '<input type="hidden" name="MAX_FILE_SIZE" value="1000000" />' .
+ _('Upload file') . ': <input name="userfile" type="file" />
+ <input type="submit" value="' . _('Send File') . '" />';
+
+ echo '<br/>',_('Update if SupplierNo exists'),':<input type="checkbox" name="UpdateIfExists">';
+ echo '</div>
+ </form>';
+
+}
+
+
+include('includes/footer.inc');
+?>
|
|
From: <te...@us...> - 2013-11-29 01:29:02
|
Revision: 6452
http://sourceforge.net/p/web-erp/reponame/6452
Author: tehonu
Date: 2013-11-29 01:28:57 +0000 (Fri, 29 Nov 2013)
Log Message:
-----------
New table bankaccountusers and its maintenance script BankAccountUsers.php. Still not afecting any other webERP script.
Modified Paths:
--------------
trunk/includes/MainMenuLinksArray.php
trunk/sql/mysql/upgrade4.11-4.12.sql
Added Paths:
-----------
trunk/BankAccountUsers.php
Added: trunk/BankAccountUsers.php
===================================================================
--- trunk/BankAccountUsers.php (rev 0)
+++ trunk/BankAccountUsers.php 2013-11-29 01:28:57 UTC (rev 6452)
@@ -0,0 +1,226 @@
+<?php
+
+include('includes/session.inc');
+$Title = _('Maintenance Of Bank Account Authorized Users');
+include('includes/header.inc');
+
+echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/money_add.png" title="' . _('Bank Account Authorized Users')
+ . '" alt="" />' . ' ' . $Title . '</p>';
+
+if (isset($_POST['SelectedUser'])){
+ $SelectedUser = mb_strtoupper($_POST['SelectedUser']);
+} elseif (isset($_GET['SelectedUser'])){
+ $SelectedUser = mb_strtoupper($_GET['SelectedUser']);
+} else {
+ $SelectedUser='';
+}
+
+if (isset($_POST['SelectedBankAccount'])){
+ $SelectedBankAccount = mb_strtoupper($_POST['SelectedBankAccount']);
+} elseif (isset($_GET['SelectedBankAccount'])){
+ $SelectedBankAccount = mb_strtoupper($_GET['SelectedBankAccount']);
+}
+
+if (isset($_POST['Cancel'])) {
+ unset($SelectedBankAccount);
+ unset($SelectedUser);
+}
+
+if (isset($_POST['Process'])) {
+ if ($_POST['SelectedBankAccount'] == '') {
+ echo prnMsg(_('You have not selected any bank account'),'error');
+ echo '<br />';
+ unset($SelectedBankAccount);
+ unset($_POST['SelectedBankAccount']);
+ }
+}
+
+if (isset($_POST['submit'])) {
+
+ $InputError=0;
+
+ if ($_POST['SelectedUser']=='') {
+ $InputError=1;
+ echo prnMsg(_('You have not selected an user to be authorized to use this bank account'),'error');
+ echo '<br />';
+ unset($SelectedBankAccount);
+ }
+
+ if ( $InputError !=1 ) {
+
+ // First check the user is not being duplicated
+
+ $checkSql = "SELECT count(*)
+ FROM bankaccountusers
+ WHERE accountcode= '" . $_POST['SelectedBankAccount'] . "'
+ AND userid = '" . $_POST['SelectedUser'] . "'";
+
+ $checkresult = DB_query($checkSql,$db);
+ $checkrow = DB_fetch_row($checkresult);
+
+ if ( $checkrow[0] >0) {
+ $InputError = 1;
+ prnMsg( _('The user') . ' ' . $_POST['SelectedUser'] . ' ' ._('already authorized to use this bank account'),'error');
+ } else {
+ // Add new record on submit
+ $sql = "INSERT INTO bankaccountusers (accountcode,
+ userid)
+ VALUES ('" . $_POST['SelectedBankAccount'] . "',
+ '" . $_POST['SelectedUser'] . "')";
+
+ $msg = _('User:') . ' ' . $_POST['SelectedUser'].' '._('has been authorized to use') .' '. $_POST['SelectedBankAccount'] . ' ' . _('bank account');
+ $result = DB_query($sql,$db);
+ prnMsg($msg,'success');
+ unset($_POST['SelectedUser']);
+ }
+ }
+} elseif ( isset($_GET['delete']) ) {
+ $sql="DELETE FROM bankaccountusers
+ WHERE accountcode='".$SelectedBankAccount."'
+ AND userid='".$SelectedUser."'";
+
+ $ErrMsg = _('The bank account user record could not be deleted because');
+ $result = DB_query($sql,$db,$ErrMsg);
+ prnMsg(_('User').' '. $SelectedUser .' '. _('has been un-authorized to use').' '. $SelectedBankAccount .' '. _('bank account') ,'success');
+ unset($_GET['delete']);
+}
+
+if (!isset($SelectedBankAccount)){
+
+/* It could still be the second time the page has been run and a record has been selected for modification - SelectedUser will exist because it was sent with the new call. If its the first time the page has been displayed with no parameters
+then none of the above are true. These will call the same page again and allow update/input or deletion of the records*/
+ echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
+ echo '<div>';
+ echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+ echo '<table class="selection">'; //Main table
+
+ echo '<tr><td>' . _('Select Bank Account') . ':</td><td><select name="SelectedBankAccount">';
+
+ $SQL = "SELECT accountcode,
+ bankaccountname
+ FROM bankaccounts";
+
+ $result = DB_query($SQL,$db);
+ echo '<option value="">' . _('Not Yet Selected') . '</option>';
+ while ($myrow = DB_fetch_array($result)) {
+ if (isset($SelectedBankAccount) and $myrow['accountcode']==$SelectedBankAccount) {
+ echo '<option selected="selected" value="';
+ } else {
+ echo '<option value="';
+ }
+ echo $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' - ' . $myrow['bankaccountname'] . '</option>';
+
+ } //end while loop
+
+ echo '</select></td></tr>';
+
+ echo '</table>'; // close main table
+ DB_free_result($result);
+
+ echo '<br /><div class="centre"><input type="submit" name="Process" value="' . _('Accept') . '" />
+ <input type="submit" name="Cancel" value="' . _('Cancel') . '" /></div>';
+
+ echo '</div>
+ </form>';
+
+}
+
+//end of ifs and buts!
+if (isset($_POST['process'])OR isset($SelectedBankAccount)) {
+ $SQLName = "SELECT bankaccountname
+ FROM bankaccounts
+ WHERE accountcode='" .$SelectedBankAccount."'";
+ $result = DB_query($SQLName,$db);
+ $myrow = DB_fetch_array($result);
+ $SelectedBankName = $myrow['bankaccountname'];
+
+ echo '<br /><div class="centre"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">' . _('Authorized users for') . ' ' .$SelectedBankName . ' ' . _('bank account') .'</a></div>';
+ echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
+ echo '<div>';
+ echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+
+ echo '<input type="hidden" name="SelectedBankAccount" value="' . $SelectedBankAccount . '" />';
+
+ $sql = "SELECT bankaccountusers.userid,
+ www_users.realname
+ FROM bankaccountusers INNER JOIN www_users
+ ON bankaccountusers.userid=www_users.userid
+ WHERE bankaccountusers.accountcode='".$SelectedBankAccount."'
+ ORDER BY bankaccountusers.userid ASC";
+
+ $result = DB_query($sql,$db);
+
+ echo '<br />
+ <table class="selection">';
+ echo '<tr><th colspan="3"><h3>' . _('Authorized users for bank account') . ' ' .$SelectedBankName. '</h3></th></tr>';
+ echo '<tr>
+ <th>' . _('User Code') . '</th>
+ <th>' . _('User Name') . '</th>
+ </tr>';
+
+$k=0; //row colour counter
+
+while ($myrow = DB_fetch_array($result)) {
+ if ($k==1){
+ echo '<tr class="EvenTableRows">';
+ $k=0;
+ } else {
+ echo '<tr class="OddTableRows">';
+ $k=1;
+ }
+
+ printf('<td>%s</td>
+ <td>%s</td>
+ <td><a href="%s?SelectedUser=%s&delete=yes&SelectedBankAccount=' . $SelectedBankAccount . '" onclick="return confirm(\'' . _('Are you sure you wish to un-authorize this user?') . '\');">' . _('Un-authorize') . '</a></td>
+ </tr>',
+ $myrow['userid'],
+ $myrow['realname'],
+ htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8'),
+ $myrow['userid'],
+ htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8'),
+ $myrow['userid']);
+ }
+ //END WHILE LIST LOOP
+ echo '</table>';
+
+ if (! isset($_GET['delete'])) {
+
+
+ echo '<br /><table class="selection">'; //Main table
+
+ echo '<tr><td>' . _('Select User') . ':</td><td><select name="SelectedUser">';
+
+ $SQL = "SELECT userid,
+ realname
+ FROM www_users";
+
+ $result = DB_query($SQL,$db);
+ if (!isset($_POST['SelectedUser'])){
+ echo '<option selected="selected" value="">' . _('Not Yet Selected') . '</option>';
+ }
+ while ($myrow = DB_fetch_array($result)) {
+ if (isset($_POST['SelectedUser']) AND $myrow['userid']==$_POST['SelectedUser']) {
+ echo '<option selected="selected" value="';
+ } else {
+ echo '<option value="';
+ }
+ echo $myrow['userid'] . '">' . $myrow['userid'] . ' - ' . $myrow['realname'] . '</option>';
+
+ } //end while loop
+
+ echo '</select></td></tr>';
+
+ echo '</table>'; // close main table
+ DB_free_result($result);
+
+ echo '<br /><div class="centre"><input type="submit" name="submit" value="' . _('Accept') . '" />
+ <input type="submit" name="Cancel" value="' . _('Cancel') . '" /></div>';
+
+ echo '</div>
+ </form>';
+
+ } // end if user wish to delete
+}
+
+include('includes/footer.inc');
+?>
\ No newline at end of file
Modified: trunk/includes/MainMenuLinksArray.php
===================================================================
--- trunk/includes/MainMenuLinksArray.php 2013-11-28 15:19:57 UTC (rev 6451)
+++ trunk/includes/MainMenuLinksArray.php 2013-11-29 01:28:57 UTC (rev 6452)
@@ -368,13 +368,17 @@
_('Account Groups'),
_('GL Accounts'),
_('GL Budgets'),
- _('GL Tags'));
+ _('GL Tags'),
+ _('Bank Accounts'),
+ _('Bank Account Authorized Users'));
$MenuItems['GL']['Maintenance']['URL'] = array( '/AccountSections.php',
'/AccountGroups.php',
'/GLAccounts.php',
'/GLBudgets.php',
- '/GLTags.php');
+ '/GLTags.php',
+ '/BankAccounts.php',
+ '/BankAccountUsers.php'));
$MenuItems['FA']['Transactions']['Caption'] = array(_('Add a new Asset'),
_('Select an Asset'),
@@ -430,7 +434,6 @@
_('Maintain Security Tokens'),
_('Access Permissions Maintenance'),
_('Page Security Settings'),
- _('Bank Accounts'),
_('Currencies Maintenance'),
_('Tax Authorities and Rates Maintenance'),
_('Tax Group Maintenance'),
@@ -451,7 +454,6 @@
'/SecurityTokens.php',
'/WWW_Access.php',
'/PageSecurity.php',
- '/BankAccounts.php',
'/Currencies.php',
'/TaxAuthorities.php',
'/TaxGroups.php',
Modified: trunk/sql/mysql/upgrade4.11-4.12.sql
===================================================================
--- trunk/sql/mysql/upgrade4.11-4.12.sql 2013-11-28 15:19:57 UTC (rev 6451)
+++ trunk/sql/mysql/upgrade4.11-4.12.sql 2013-11-29 01:28:57 UTC (rev 6452)
@@ -1,4 +1,10 @@
#--UPDATE config SET confvalue='4.12' WHERE confname='VersionNumber';
+INSERT INTO `scripts` (`script`, `pagesecurity`, `description`)
+ VALUES ('BankAccountUsers.php', '15', 'Maintains table bankaccountusers (Authorized users to work with a bank account in webERP)');
+CREATE TABLE IF NOT EXISTS `bankaccountusers` (
+ `accountcode` varchar(20) NOT NULL COMMENT 'Bank account code',
+ `userid` varchar(20) NOT NULL COMMENT 'User code'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
|
|
From: <te...@us...> - 2013-11-29 01:58:56
|
Revision: 6453
http://sourceforge.net/p/web-erp/reponame/6453
Author: tehonu
Date: 2013-11-29 01:58:53 +0000 (Fri, 29 Nov 2013)
Log Message:
-----------
Restricted the user selection of bank accounts, only to previously authorized bank accounts
Modified Paths:
--------------
trunk/BankMatching.php
trunk/BankReconciliation.php
trunk/CustomerReceipt.php
trunk/Payments.php
Modified: trunk/BankMatching.php
===================================================================
--- trunk/BankMatching.php 2013-11-29 01:28:57 UTC (rev 6452)
+++ trunk/BankMatching.php 2013-11-29 01:58:53 UTC (rev 6453)
@@ -100,7 +100,12 @@
<td align="left">' . _('Bank Account') . ':</td>
<td colspan="3"><select tabindex="1" autofocus="autofocus" name="BankAccount">';
-$sql = "SELECT accountcode, bankaccountname FROM bankaccounts";
+$sql = "SELECT bankaccounts.accountcode,
+ bankaccounts.bankaccountname
+ FROM bankaccounts, bankaccountusers
+ WHERE bankaccounts.accountcode=bankaccountusers.accountcode
+ AND bankaccountusers.userid = '" . $_SESSION['UserID'] ."'
+ ORDER BY bankaccounts.bankaccountname";
$resultBankActs = DB_query($sql,$db);
while ($myrow=DB_fetch_array($resultBankActs)){
if (isset($_POST['BankAccount'])
Modified: trunk/BankReconciliation.php
===================================================================
--- trunk/BankReconciliation.php 2013-11-29 01:28:57 UTC (rev 6452)
+++ trunk/BankReconciliation.php 2013-11-29 01:58:53 UTC (rev 6453)
@@ -99,7 +99,12 @@
echo '<table class="selection">';
-$SQL = "SELECT bankaccountname, accountcode FROM bankaccounts";
+$SQL = "SELECT bankaccounts.accountcode,
+ bankaccounts.bankaccountname
+ FROM bankaccounts, bankaccountusers
+ WHERE bankaccounts.accountcode=bankaccountusers.accountcode
+ AND bankaccountusers.userid = '" . $_SESSION['UserID'] ."'
+ ORDER BY bankaccounts.bankaccountname";
$ErrMsg = _('The bank accounts could not be retrieved by the SQL because');
$DbgMsg = _('The SQL used to retrieve the bank accounts was');
Modified: trunk/CustomerReceipt.php
===================================================================
--- trunk/CustomerReceipt.php 2013-11-29 01:28:57 UTC (rev 6452)
+++ trunk/CustomerReceipt.php 2013-11-29 01:58:53 UTC (rev 6453)
@@ -748,9 +748,13 @@
$SQL = "SELECT bankaccountname,
bankaccounts.accountcode,
bankaccounts.currcode
- FROM bankaccounts INNER JOIN chartmaster
- ON bankaccounts.accountcode=chartmaster.accountcode
- ORDER BY bankaccountname";
+ FROM bankaccounts
+ INNER JOIN chartmaster
+ ON bankaccounts.accountcode=chartmaster.accountcode
+ INNER JOIN bankaccountusers
+ ON bankaccounts.accountcode=bankaccountusers.accountcode
+ WHERE bankaccountusers.userid = '" . $_SESSION['UserID'] ."'
+ORDER BY bankaccountname";
$ErrMsg = _('The bank accounts could not be retrieved because');
$DbgMsg = _('The SQL used to retrieve the bank accounts was');
Modified: trunk/Payments.php
===================================================================
--- trunk/Payments.php 2013-11-29 01:28:57 UTC (rev 6452)
+++ trunk/Payments.php 2013-11-29 01:58:53 UTC (rev 6453)
@@ -773,8 +773,12 @@
$SQL = "SELECT bankaccountname,
bankaccounts.accountcode,
bankaccounts.currcode
- FROM bankaccounts INNER JOIN chartmaster
- ON bankaccounts.accountcode=chartmaster.accountcode
+ FROM bankaccounts
+ INNER JOIN chartmaster
+ ON bankaccounts.accountcode=chartmaster.accountcode
+ INNER JOIN bankaccountusers
+ ON bankaccounts.accountcode=bankaccountusers.accountcode
+ WHERE bankaccountusers.userid = '" . $_SESSION['UserID'] ."'
ORDER BY bankaccountname";
$ErrMsg = _('The bank accounts could not be retrieved because');
|
|
From: <dai...@us...> - 2013-11-29 07:30:08
|
Revision: 6455
http://sourceforge.net/p/web-erp/reponame/6455
Author: daintree
Date: 2013-11-29 07:30:02 +0000 (Fri, 29 Nov 2013)
Log Message:
-----------
Phil: Apply Tims idea for stripping slashes from incorrectly displayed items PO_Items.php and DeliveryDetails.php
Modified Paths:
--------------
trunk/DeliveryDetails.php
trunk/PO_Items.php
trunk/SuppInvGRNs.php
trunk/doc/Change.log
Modified: trunk/DeliveryDetails.php
===================================================================
--- trunk/DeliveryDetails.php 2013-11-29 03:58:36 UTC (rev 6454)
+++ trunk/DeliveryDetails.php 2013-11-29 07:30:02 UTC (rev 6455)
@@ -995,7 +995,7 @@
<table class="selection">
<tr>
<td>' . _('Deliver To') .':</td>
- <td><input type="text" autofocus="autofocus" required="required" size="42" maxlength="40" name="DeliverTo" value="' . $_SESSION['Items'.$identifier]->DeliverTo . '" title="' . _('Enter the name of the customer to deliver this order to') . '" /></td>
+ <td><input type="text" autofocus="autofocus" required="required" size="42" maxlength="40" name="DeliverTo" value="' . stripslashes($_SESSION['Items' . $identifier]->DeliverTo . '" title="' . _('Enter the name of the customer to deliver this order to') . '" /></td>
</tr>';
echo '<tr>
Modified: trunk/PO_Items.php
===================================================================
--- trunk/PO_Items.php 2013-11-29 03:58:36 UTC (rev 6454)
+++ trunk/PO_Items.php 2013-11-29 07:30:02 UTC (rev 6455)
@@ -756,7 +756,7 @@
}
echo '<td>' . $POLine->StockID . '</td>
- <td><input type="text" name="ItemDescription' . $POLine->LineNo.'" size="30" value="' .$POLine->ItemDescription .'" /></td>
+ <td><input type="text" name="ItemDescription' . $POLine->LineNo.'" size="30" value="' . stripslashes($POLine->ItemDescription) . '" /></td>
<td class="number">' . locale_number_format($POLine->Quantity,$POLine->DecimalPlaces) . '</td>
<td>' . $POLine->Units . '</td>
<td class="number">' . $DisplayPrice . '</td>
Modified: trunk/SuppInvGRNs.php
===================================================================
--- trunk/SuppInvGRNs.php 2013-11-29 03:58:36 UTC (rev 6454)
+++ trunk/SuppInvGRNs.php 2013-11-29 07:30:02 UTC (rev 6455)
@@ -65,16 +65,6 @@
$Complete = False;
}
- /* It is not logical to allow being charged for more than was received - and doing so would leave the goods received suspense account out of balance */
- /*
- if ($_SESSION['Check_Qty_Charged_vs_Del_Qty']==True) {
- if ((filter_number_format($_POST['This_QuantityInv'])+ $_POST['Prev_QuantityInv'])/($_POST['QtyRecd'] ) > (1+ ($_SESSION['OverChargeProportion'] / 100))){
- prnMsg(_('The quantity being invoiced is more than the outstanding quantity by more than') . ' ' . $_SESSION['OverChargeProportion'] . ' ' .
- _('percent. The system is set up to prohibit this so will put this invoice on hold until it is authorised'),'warn');
- $Hold = True;
- }
- }
- */
if (filter_number_format($_POST['This_QuantityInv'+$i])+$_SESSION['SuppTrans']->GRNs[$_POST['GRNNo'.$i]]->Prev_QuantityInv-$_SESSION['SuppTrans']->GRNs[$_POST['GRNNo'.$i]]->QtyRecd > 0){
prnMsg(_('The quantity being invoiced is more than the outstanding quantity that was delivered. It is not possible to enter an invoice for a quantity more than was received into stock'),'warn');
$InputError = True;
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2013-11-29 03:58:36 UTC (rev 6454)
+++ trunk/doc/Change.log 2013-11-29 07:30:02 UTC (rev 6455)
@@ -1,9 +1,11 @@
webERP Change Log
-2013/11/28 Thumb: Add salesman constraints to ConfirmDispatch_Invoice.php to ensure that sales can only print his own sales orders' invoice.
-2013/11/28 Thumb: Add constraints to salesman that he can only print his own sales orders in PrintCustOrder_generic.php
-2013/11/28 Thumb: Add constraints to salesman that he can only print his own sales orders in PrintCustOrder.php
-2013/11/28 Thumb: Add salesman login constraint to only their own customers available in SelectOrderItems.php and fixed SQL error of customers login.
-2013/11/27 Thumb: Add create new scripts to import Customers and Debtors.
+
+28/11/13 Phil: Apply Tim's idea for stripping slashes from incorrectly displayed items PO_Items.php and DeliveryDetails.php
+28/11/13 Thumb: Add salesman constraints to ConfirmDispatch_Invoice.php to ensure that sales can only print his own sales orders' invoice.
+28/11/13 Thumb: Add constraints to salesman that he can only print his own sales orders in PrintCustOrder_generic.php
+28/11/13 Thumb: Add constraints to salesman that he can only print his own sales orders in PrintCustOrder.php
+28/11/13 Thumb: Add salesman login constraint to only their own customers available in SelectOrderItems.php and fixed SQL error of customers login.
+27/11/13 Thumb: Add create new scripts to import Customers and Debtors.
26/11/13 Phil: Supplier invoice entry now allows modification of invoice quantities and prices for multiple goods received lines in line rather than having to go into each line to modify individually.
20/11/13 rchacon: Translate the name of each language to the name in their respective language.
20/11/13 Phil: Payments.php FunctionalExchangeRate was not defaulted appropriately when entering a supplier payment in FX from a bank account of the same currency selected and the transaction was posted immediately without update first. Fixed
|
|
From: <ex...@us...> - 2013-11-30 11:54:06
|
Revision: 6458
http://sourceforge.net/p/web-erp/reponame/6458
Author: exsonqu
Date: 2013-11-30 11:54:03 +0000 (Sat, 30 Nov 2013)
Log Message:
-----------
2013/11/30 Thumb: Add salesman constraint to show salesperson's own sales orders invoice, customer etc in DailySalesInquiry.php,PDFDeliveryDifferences.php,PDFOrdersInvoiced.php,PDFOrderStatus.php,PDFPickingList.php,SalesByTypePeriodInquiry.php,SalesInquiry.php,SelectCompletedOrder.php.
Modified Paths:
--------------
trunk/DailySalesInquiry.php
trunk/PDFDeliveryDifferences.php
trunk/PDFOrderStatus.php
trunk/PDFOrdersInvoiced.php
trunk/PDFPickingList.php
trunk/SalesByTypePeriodInquiry.php
trunk/SalesInquiry.php
trunk/SelectCompletedOrder.php
Modified: trunk/DailySalesInquiry.php
===================================================================
--- trunk/DailySalesInquiry.php 2013-11-29 14:20:40 UTC (rev 6457)
+++ trunk/DailySalesInquiry.php 2013-11-30 11:54:03 UTC (rev 6458)
@@ -37,13 +37,19 @@
}
}
echo '</select></td>
- <td>' . _('Salesperson') . ':</td>
- <td><select tabindex="2" name="Salesperson">';
+ <td>' . _('Salesperson') . ':</td>';
-$SalespeopleResult = DB_query("SELECT salesmancode, salesmanname FROM salesman",$db);
-if (!isset($_POST['Salesperson'])){
- $_POST['Salesperson'] = 'All';
- echo '<option selected="selected" value="All">' . _('All') . '</option>';
+if($_SESSION['SalesmanLogin'] != '') {
+ echo '<td>';
+ echo $_SESSION['UsersRealName'];
+ echo '</td>';
+}else{
+ echo '<td><select tabindex="2" name="Salesperson">';
+
+ $SalespeopleResult = DB_query("SELECT salesmancode, salesmanname FROM salesman",$db);
+ if (!isset($_POST['Salesperson'])){
+ $_POST['Salesperson'] = 'All';
+ echo '<option selected="selected" value="All">' . _('All') . '</option>';
} else {
echo '<option value="All">' . _('All') . '</option>';
}
@@ -56,7 +62,7 @@
}
}
echo '</select></td>';
-
+}
echo '</tr>
</table>
<br />
@@ -94,7 +100,9 @@
AND trandate>='" . $StartDateSQL . "'
AND trandate<='" . $EndDateSQL . "'";
-if ($_POST['Salesperson']!='All') {
+if ($_SESSION['SalesmanLogin'] != '') {
+ $SQL .= " AND custbranch.salesman='" . $_SESSION['SalesmanLogin'] . "'";
+}elseif ($_POST['Salesperson']!='All') {
$sql .= " AND custbranch.salesman='" . $_POST['Salesperson'] . "'";
}
@@ -190,4 +198,4 @@
echo '</table>';
include('includes/footer.inc');
-?>
\ No newline at end of file
+?>
Modified: trunk/PDFDeliveryDifferences.php
===================================================================
--- trunk/PDFDeliveryDifferences.php 2013-11-29 14:20:40 UTC (rev 6457)
+++ trunk/PDFDeliveryDifferences.php 2013-11-30 11:54:03 UTC (rev 6458)
@@ -173,6 +173,10 @@
AND trandate <= '" . FormatDateForSQL($_POST['ToDate']) . "'";
}
+if ($_SESSION['SalesmanLogin'] != '') {
+ $sql .= " AND debtortrans.salesperson='" . $_SESSION['SalesmanLogin'] . "'";
+}
+
$Result=DB_query($sql,$db,'','',false,false); //dont error check - see below
if (DB_error_no($db)!=0){
@@ -270,6 +274,11 @@
AND trandate <= '" . FormatDateForSQL($_POST['ToDate']) . "'";
}
+
+if ($_SESSION['SalesmanLogin'] != '') {
+ $sql .= " AND debtortrans.salesperson='" . $_SESSION['SalesmanLogin'] . "'";
+}
+
$ErrMsg = _('Could not retrieve the count of sales order lines in the period under review');
$result = DB_query($sql,$db,$ErrMsg);
Modified: trunk/PDFOrderStatus.php
===================================================================
--- trunk/PDFOrderStatus.php 2013-11-29 14:20:40 UTC (rev 6457)
+++ trunk/PDFOrderStatus.php 2013-11-30 11:54:03 UTC (rev 6458)
@@ -355,4 +355,4 @@
} /* end of while there are delivery differences to print */
$pdf->OutputD($_SESSION['DatabaseName'] . '_OrderStatus_' . date('Y-m-d') . '.pdf');
$pdf->__destruct();
-?>
\ No newline at end of file
+?>
Modified: trunk/PDFOrdersInvoiced.php
===================================================================
--- trunk/PDFOrdersInvoiced.php 2013-11-29 14:20:40 UTC (rev 6457)
+++ trunk/PDFOrdersInvoiced.php 2013-11-30 11:54:03 UTC (rev 6458)
@@ -121,17 +121,7 @@
INNER JOIN locations
ON salesorders.fromstkloc=locations.loccode
WHERE orddate >='" . FormatDateForSQL($_POST['FromDate']) . "'
- AND orddate <='" . FormatDateForSQL($_POST['ToDate']) . "'
- GROUP BY salesorders.orderno,
- salesorders.debtorno,
- salesorders.branchcode,
- salesorders.customerref,
- salesorders.orddate,
- salesorders.fromstkloc,
- salesorderdetails.stkcode,
- stockmaster.description,
- stockmaster.units,
- stockmaster.decimalplaces";
+ AND orddate <='" . FormatDateForSQL($_POST['ToDate']) . "'";
} elseif ($_POST['CategoryID']!='All' AND $_POST['Location']=='All') {
@@ -166,17 +156,7 @@
ON salesorders.fromstkloc=locations.loccode
WHERE stockmaster.categoryid ='" . $_POST['CategoryID'] . "'
AND orddate >='" . FormatDateForSQL($_POST['FromDate']) . "'
- AND orddate <='" . FormatDateForSQL($_POST['ToDate']) . "'
- GROUP BY salesorders.orderno,
- salesorders.debtorno,
- salesorders.branchcode,
- salesorders.customerref,
- salesorders.orddate,
- salesorders.fromstkloc,
- salesorderdetails.stkcode,
- stockmaster.description,
- stockmaster.units,
- stockmaster.decimalplaces";
+ AND orddate <='" . FormatDateForSQL($_POST['ToDate']) . "'";
} elseif ($_POST['CategoryID']=='All' AND $_POST['Location']!='All') {
$sql= "SELECT salesorders.orderno,
@@ -210,17 +190,7 @@
ON salesorders.fromstkloc=locations.loccode
WHERE salesorders.fromstkloc ='" . $_POST['Location'] . "'
AND orddate >='" . FormatDateForSQL($_POST['FromDate']) . "'
- AND orddate <='" . FormatDateForSQL($_POST['ToDate']) . "'
- GROUP BY salesorders.orderno,
- salesorders.debtorno,
- salesorders.branchcode,
- salesorders.customerref,
- salesorders.orddate,
- salesorders.fromstkloc,
- salesorderdetails.stkcode,
- stockmaster.description,
- stockmaster.units,
- stockmaster.decimalplaces";
+ AND orddate <='" . FormatDateForSQL($_POST['ToDate']) . "'";
} elseif ($_POST['CategoryID']!='All' AND $_POST['location']!='All'){
@@ -254,8 +224,14 @@
WHERE stockmaster.categoryid ='" . $_POST['CategoryID'] . "'
AND salesorders.fromstkloc ='" . $_POST['Location'] . "'
AND orddate >='" . FormatDateForSQL($_POST['FromDate']) . "'
- AND orddate <='" . FormatDateForSQL($_POST['ToDate']) . "'
- GROUP BY salesorders.orderno,
+ AND orddate <='" . FormatDateForSQL($_POST['ToDate']) . "'";
+}
+
+if ($_SESSION['SalesmanLogin'] != '') {
+ $sql .= " AND salesorders.salesperson='" . $_SESSION['SalesmanLogin'] . "'";
+}
+
+$sql .= " GROUP BY salesorders.orderno,
salesorders.debtorno,
salesorders.branchcode,
salesorders.customerref,
@@ -264,11 +240,9 @@
salesorderdetails.stkcode,
stockmaster.description,
stockmaster.units,
- stockmaster.decimalplaces";
-}
+ stockmaster.decimalplaces
+ ORDER BY salesorders.orderno";
-$sql .= " ORDER BY salesorders.orderno";
-
$Result=DB_query($sql,$db,'','',false,false); //dont trap errors here
if (DB_error_no($db)!=0){
@@ -439,4 +413,4 @@
$pdf->OutputD($_SESSION['DatabaseName'] . '_OrdersInvoiced_' . date('Y-m-d') . '.pdf');
$pdf->__destruct();
-?>
\ No newline at end of file
+?>
Modified: trunk/PDFPickingList.php
===================================================================
--- trunk/PDFPickingList.php 2013-11-29 14:20:40 UTC (rev 6457)
+++ trunk/PDFPickingList.php 2013-11-30 11:54:03 UTC (rev 6458)
@@ -130,6 +130,10 @@
AND salesorders.deliverydate<='" . FormatDateForSQL($_POST['TransDate'])."'";
}
+if ($_SESSION['SalesmanLogin'] != '') {
+ $sql .= " AND salesorders.salesperson='" . $_SESSION['SalesmanLogin'] . "'";
+}
+
if (isset($_POST['TransDate'])
OR (isset($_GET['TransNo']) AND $_GET['TransNo'] != 'Preview')) {
$result=DB_query($sql,$db, $ErrMsg);
@@ -349,4 +353,4 @@
$pdf->OutputD($_SESSION['DatabaseName'] . '_PickingLists_' . date('Y-m-d') . '.pdf');
$pdf->__destruct();
}
-?>
\ No newline at end of file
+?>
Modified: trunk/SalesByTypePeriodInquiry.php
===================================================================
--- trunk/SalesByTypePeriodInquiry.php 2013-11-29 14:20:40 UTC (rev 6457)
+++ trunk/SalesByTypePeriodInquiry.php 2013-11-30 11:54:03 UTC (rev 6458)
@@ -209,8 +209,13 @@
WHERE (stockmoves.type=10 or stockmoves.type=11)
AND show_on_inv_crds =1
AND debtortrans.trandate>='" . $FromDate . "'
- AND debtortrans.trandate<='" . $ToDate . "'
- GROUP BY debtortrans.trandate,
+ AND debtortrans.trandate<='" . $ToDate . "'";
+
+ if ($_SESSION['SalesmanLogin'] != '') {
+ $sql .= " AND debtortrans.salesperson='" . $_SESSION['SalesmanLogin'] . "'";
+ }
+
+ $sql .= " GROUP BY debtortrans.trandate,
tpe
ORDER BY debtortrans.trandate,
tpe";
@@ -242,8 +247,13 @@
WHERE (stockmoves.type=10 or stockmoves.type=11)
AND show_on_inv_crds =1
AND debtortrans.trandate>='" . $FromDate . "'
- AND debtortrans.trandate<='" . $ToDate . "'
- GROUP BY week_no,
+ AND debtortrans.trandate<='" . $ToDate . "'";
+
+ if ($_SESSION['SalesmanLogin'] != '') {
+ $sql .= " AND debtortrans.salesperson='" . $_SESSION['SalesmanLogin'] . "'";
+ }
+
+ $sql .= " GROUP BY week_no,
transyear,
tpe
ORDER BY transyear,
@@ -278,8 +288,13 @@
WHERE (stockmoves.type=10 or stockmoves.type=11)
AND show_on_inv_crds =1
AND debtortrans.trandate>='" . $FromDate . "'
- AND debtortrans.trandate<='" . $ToDate . "'
- GROUP BY month_no,
+ AND debtortrans.trandate<='" . $ToDate . "'";
+
+ if ($_SESSION['SalesmanLogin'] != '') {
+ $sql .= " AND debtortrans.salesperson='" . $_SESSION['SalesmanLogin'] . "'";
+ }
+
+ $sql .= " GROUP BY month_no,
month_name,
transyear,
debtortrans.tpe
@@ -314,8 +329,13 @@
WHERE (stockmoves.type=10 or stockmoves.type=11)
AND show_on_inv_crds =1
AND debtortrans.trandate>='" . $FromDate . "'
- AND debtortrans.trandate<='" . $ToDate . "'
- GROUP BY quarter_no,
+ AND debtortrans.trandate<='" . $ToDate . "'";
+
+ if ($_SESSION['SalesmanLogin'] != '') {
+ $sql .= " AND debtortrans.salesperson='" . $_SESSION['SalesmanLogin'] . "'";
+ }
+
+ $sql .= " GROUP BY quarter_no,
transyear,
tpe
ORDER BY transyear,
@@ -566,4 +586,4 @@
} //end of if user hit show sales
include('includes/footer.inc');
-?>
\ No newline at end of file
+?>
Modified: trunk/SalesInquiry.php
===================================================================
--- trunk/SalesInquiry.php 2013-11-29 14:20:40 UTC (rev 6457)
+++ trunk/SalesInquiry.php 2013-11-30 11:54:03 UTC (rev 6458)
@@ -160,9 +160,13 @@
$WhereArea = " AND custbranch.area = '" . $_POST['Area'] . "'";
}
- $WhereSalesman = ' ';
- if ($_POST['Salesman'] != 'All') {
+ $WhereSalesman = ' ';
+ if ($_SESSION['SalesmanLogin'] != '') {
+ $WhereSalesman .= " AND custbranch.salesman='" . $_SESSION['SalesmanLogin'] . "'";
+
+ }elseif ($_POST['Salesman'] != 'All') {
+
$WhereSalesman = " AND custbranch.salesman = '" . $_POST['Salesman'] . "'";
}
@@ -1171,15 +1175,22 @@
</tr>';
echo '<tr>
- <td>' . _('For Sales Person') . ':</td>
- <td><select name="Salesman">';
- $sql="SELECT salesmancode, salesmanname FROM salesman";
- $SalesmanResult= DB_query($sql,$db);
- echo '<option selected="selected" value="All">' . _('All Salesmen') . '</option>';
- While ($myrow = DB_fetch_array($SalesmanResult)){
- echo '<option value="' . $myrow['salesmancode'] . '">' . $myrow['salesmanname'] . '</option>';
+ <td>' . _('For Sales Person') . ':</td>';
+ if ($_SESSION['SalesmanLogin'] != '') {
+ echo '<td>';
+ echo $_SESSION['UsersRealName'];
+ echo '</td>';
+ }else{
+ echo '<td><select name="Salesman">';
+ $sql="SELECT salesmancode, salesmanname FROM salesman";
+ $SalesmanResult= DB_query($sql,$db);
+ echo '<option selected="selected" value="All">' . _('All Salesmen') . '</option>';
+ While ($myrow = DB_fetch_array($SalesmanResult)){
+ echo '<option value="' . $myrow['salesmancode'] . '">' . $myrow['salesmanname'] . '</option>';
+ }
+ echo '</select></td>';
}
- echo '</select></td></tr>';
+ echo '</tr>';
// Use name='Areas[]' multiple - if want to create an array for Areas and allow multiple selections
echo '<tr><td>' . _('For Sales Areas') . ':</td>
@@ -1277,4 +1288,4 @@
} // End of function TempStockmoves
include('includes/footer.inc');
-?>
\ No newline at end of file
+?>
Modified: trunk/SelectCompletedOrder.php
===================================================================
--- trunk/SelectCompletedOrder.php 2013-11-29 14:20:40 UTC (rev 6457)
+++ trunk/SelectCompletedOrder.php 2013-11-30 11:54:03 UTC (rev 6458)
@@ -259,16 +259,7 @@
ON debtorsmaster.currcode = currencies.currabrev
WHERE salesorders.orderno='". $OrderNumber ."'
AND salesorders.quotation=0
- AND salesorderdetails.completed " . $Completed ."
- GROUP BY salesorders.orderno,
- debtorsmaster.name,
- currencies.decimalplaces,
- custbranch.brname,
- salesorders.customerref,
- salesorders.orddate,
- salesorders.deliverydate,
- salesorders.deliverto
- ORDER BY salesorders.orderno";
+ AND salesorderdetails.completed " . $Completed;
} elseif (isset($CustomerRef)) {
if (isset($SelectedCustomer)) {
$SQL = "SELECT salesorders.orderno,
@@ -291,16 +282,7 @@
WHERE salesorders.debtorno='" . $SelectedCustomer ."'
AND salesorders.customerref like '%". $CustomerRef."%'
AND salesorders.quotation=0
- AND salesorderdetails.completed".$Completed."
- GROUP BY salesorders.orderno,
- debtorsmaster.name,
- currencies.decimalplaces,
- custbranch.brname,
- salesorders.customerref,
- salesorders.orddate,
- salesorders.deliverydate,
- salesorders.deliverto
- ORDER BY salesorders.orderno";
+ AND salesorderdetails.completed".$Completed;
} else { //customer not selected
$SQL = "SELECT salesorders.orderno,
debtorsmaster.name,
@@ -321,16 +303,7 @@
ON debtorsmaster.currcode = currencies.currabrev
WHERE salesorders.customerref " . LIKE . " '%". $CustomerRef . "%'
AND salesorders.quotation=0
- AND salesorderdetails.completed" . $Completed . "
- GROUP BY salesorders.orderno,
- debtorsmaster.name,
- currencies.decimalplaces,
- custbranch.brname,
- salesorders.customerref,
- salesorders.orddate,
- salesorders.deliverydate,
- salesorders.deliverto
- ORDER BY salesorders.orderno";
+ AND salesorderdetails.completed" . $Completed;
}
} else {
@@ -360,16 +333,7 @@
AND salesorders.debtorno='" . $SelectedCustomer ."'
AND salesorders.orddate >= '" . $DateAfterCriteria ."'
AND salesorders.quotation=0
- AND salesorderdetails.completed".$Completed."
- GROUP BY salesorders.orderno,
- debtorsmaster.name,
- currencies.decimalplaces,
- custbranch.brname,
- salesorders.customerref,
- salesorders.orddate,
- salesorders.deliverydate,
- salesorders.deliverto
- ORDER BY salesorders.orderno";
+ AND salesorderdetails.completed".$Completed;
} else {
$SQL = "SELECT salesorders.orderno,
debtorsmaster.name,
@@ -391,16 +355,7 @@
WHERE salesorders.debtorno='" . $SelectedCustomer . "'
AND salesorders.orddate >= '" . $DateAfterCriteria . "'
AND salesorders.quotation=0
- AND salesorderdetails.completed".$Completed."
- GROUP BY salesorders.orderno,
- debtorsmaster.name,
- currencies.decimalplaces,
- custbranch.brname,
- salesorders.customerref,
- salesorders.orddate,
- salesorders.deliverydate,
- salesorders.deliverto
- ORDER BY salesorders.orderno";
+ AND salesorderdetails.completed".$Completed;
}
} else { //no customer selected
if (isset($SelectedStockItem)) {
@@ -424,16 +379,7 @@
WHERE salesorderdetails.stkcode='". $SelectedStockItem ."'
AND salesorders.orddate >= '" . $DateAfterCriteria . "'
AND salesorders.quotation=0
- AND salesorderdetails.completed".$Completed."
- GROUP BY salesorders.orderno,
- debtorsmaster.name,
- currencies.decimalplaces,
- custbranch.brname,
- salesorders.customerref,
- salesorders.orddate,
- salesorders.deliverydate,
- salesorders.deliverto
- ORDER BY salesorders.orderno";
+ AND salesorderdetails.completed".$Completed;
} else {
$SQL = "SELECT salesorders.orderno,
debtorsmaster.name,
@@ -454,20 +400,24 @@
ON debtorsmaster.currcode = currencies.currabrev
WHERE salesorders.orddate >= '".$DateAfterCriteria . "'
AND salesorders.quotation=0
- AND salesorderdetails.completed".$Completed."
- GROUP BY salesorders.orderno,
- debtorsmaster.name,
- currencies.decimalplaces,
- custbranch.brname,
- salesorders.customerref,
- salesorders.orddate,
- salesorders.deliverydate,
- salesorders.deliverto
- ORDER BY salesorders.orderno";
+ AND salesorderdetails.completed".$Completed;
}
} //end selected customer
} //end not order number selected
+ if ($_SESSION['SalesmanLogin'] != '') {
+ $SQL .= " AND salesorders.salesperson='" . $_SESSION['SalesmanLogin'] . "'";
+ }
+ $SQL .= " GROUP BY salesorders.orderno,
+ debtorsmaster.name,
+ currencies.decimalplaces,
+ custbranch.brname,
+ salesorders.customerref,
+ salesorders.orddate,
+ salesorders.deliverydate,
+ salesorders.deliverto
+ ORDER BY salesorders.orderno";
+
$SalesOrdersResult = DB_query($SQL,$db);
if (DB_error_no($db) !=0) {
|
|
From: <rc...@us...> - 2013-11-30 16:05:21
|
Revision: 6461
http://sourceforge.net/p/web-erp/reponame/6461
Author: rchacon
Date: 2013-11-30 16:05:19 +0000 (Sat, 30 Nov 2013)
Log Message:
-----------
Includes supplier-code, currency-code, and currency-name-from-CurrenciesArray.php in SelectSupplier.php.
Modified Paths:
--------------
trunk/SupplierInquiry.php
trunk/doc/Change.log
Modified: trunk/SupplierInquiry.php
===================================================================
--- trunk/SupplierInquiry.php 2013-11-30 15:15:06 UTC (rev 6460)
+++ trunk/SupplierInquiry.php 2013-11-30 16:05:19 UTC (rev 6461)
@@ -3,7 +3,6 @@
/* $Id$*/
include('includes/SQL_CommonFunctions.inc');
-
include('includes/session.inc');
$Title = _('Supplier Inquiry');
include('includes/header.inc');
@@ -113,13 +112,15 @@
$SupplierRecord['overdue1'] = 0;
$SupplierRecord['overdue2'] = 0;
}
+include('includes/CurrenciesArray.php'); // To get the currency name.
+echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/supplier.png" title="' . _('Supplier') . '" alt="" /> ' .
+ _('Supplier') . ': ' .
+ $SupplierID . ' - ' . $SupplierRecord['suppname'] . '<br />' .
+ _('All amounts stated in') . ': ' .
+ $SupplierRecord['currcode'] . ' - ' . $CurrenciesArray[$SupplierRecord['currcode']]['Currency'] . '<br />' .
+ _('Terms') . ': ' .
+ $SupplierRecord['terms'] . '</p>';
-echo '<p class="page_title_text">
- <img src="'.$RootPath.'/css/'.$Theme.'/images/supplier.png" title="' . _('Supplier') . '" alt="" />' . ' ' . _('Supplier') . ' : ' . $SupplierRecord['suppname'] . ' - (' . _('All amounts stated in') . ' ' . $SupplierRecord['currency'] . ')
- <br />
- <br />' . _('Terms') . ': ' . $SupplierRecord['terms'] . '
- </p>';
-
if (isset($_GET['HoldType']) AND isset($_GET['HoldTrans'])){
if ($_GET['HoldStatus'] == _('Hold')){
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2013-11-30 15:15:06 UTC (rev 6460)
+++ trunk/doc/Change.log 2013-11-30 16:05:19 UTC (rev 6461)
@@ -1,4 +1,5 @@
webERP Change Log
+30/11/13 rchacon: Includes supplier-code, currency-code, and currency-name-from-CurrenciesArray.php in SelectSupplier.php.
2013/11/30 Thumb: Add salesman constraint to show salesperson's own sales orders invoice, customer etc in DailySalesInquiry.php,PDFDeliveryDifferences.php,PDFOrdersInvoiced.php,PDFOrderStatus.php,PDFPickingList.php,SalesByTypePeriodInquiry.php,SalesInquiry.php,SelectCompletedOrder.php.
28/11/13 Phil: Apply Tim's idea for stripping slashes from incorrectly displayed items PO_Items.php and DeliveryDetails.php
28/11/13 Thumb: Add salesman constraints to ConfirmDispatch_Invoice.php to ensure that sales can only print his own sales orders' invoice.
|
|
From: <dai...@us...> - 2013-12-01 07:37:01
|
Revision: 6462
http://sourceforge.net/p/web-erp/reponame/6462
Author: daintree
Date: 2013-12-01 07:36:55 +0000 (Sun, 01 Dec 2013)
Log Message:
-----------
pre 4.11.2 release
Modified Paths:
--------------
trunk/BankAccountUsers.php
trunk/doc/Change.log
trunk/includes/MainMenuLinksArray.php
trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.mo
trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po
trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.mo
trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po
trunk/locale/de_DE.utf8/LC_MESSAGES/messages.mo
trunk/locale/de_DE.utf8/LC_MESSAGES/messages.po
trunk/locale/el_GR.utf8/LC_MESSAGES/messages.mo
trunk/locale/el_GR.utf8/LC_MESSAGES/messages.po
trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot
trunk/locale/en_US.utf8/LC_MESSAGES/messages.mo
trunk/locale/en_US.utf8/LC_MESSAGES/messages.po
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
trunk/locale/et_EE.utf8/LC_MESSAGES/messages.mo
trunk/locale/et_EE.utf8/LC_MESSAGES/messages.po
trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.mo
trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.po
trunk/locale/fr_CA.utf8/LC_MESSAGES/messages.po
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.mo
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po
trunk/locale/hi_IN.utf8/LC_MESSAGES/messages.mo
trunk/locale/hi_IN.utf8/LC_MESSAGES/messages.po
trunk/locale/hr_HR.utf8/LC_MESSAGES/messages.mo
trunk/locale/hr_HR.utf8/LC_MESSAGES/messages.po
trunk/locale/hu_HU.utf8/LC_MESSAGES/messages.mo
trunk/locale/hu_HU.utf8/LC_MESSAGES/messages.po
trunk/locale/id_ID.utf8/LC_MESSAGES/messages.mo
trunk/locale/id_ID.utf8/LC_MESSAGES/messages.po
trunk/locale/it_IT.utf8/LC_MESSAGES/messages.mo
trunk/locale/it_IT.utf8/LC_MESSAGES/messages.po
trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.mo
trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.po
trunk/locale/lv_LV.utf8/LC_MESSAGES/messages.mo
trunk/locale/lv_LV.utf8/LC_MESSAGES/messages.po
trunk/locale/nl_NL.utf8/LC_MESSAGES/messages.mo
trunk/locale/nl_NL.utf8/LC_MESSAGES/messages.po
trunk/locale/pl_PL.utf8/LC_MESSAGES/messages.mo
trunk/locale/pl_PL.utf8/LC_MESSAGES/messages.po
trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.mo
trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.po
trunk/locale/pt_PT.utf8/LC_MESSAGES/messages.mo
trunk/locale/pt_PT.utf8/LC_MESSAGES/messages.po
trunk/locale/ro_RO.utf8/LC_MESSAGES/messages.mo
trunk/locale/ro_RO.utf8/LC_MESSAGES/messages.po
trunk/locale/ru_RU.utf8/LC_MESSAGES/messages.mo
trunk/locale/ru_RU.utf8/LC_MESSAGES/messages.po
trunk/locale/sq_AL.utf8/LC_MESSAGES/messages.mo
trunk/locale/sq_AL.utf8/LC_MESSAGES/messages.po
trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.mo
trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.po
trunk/locale/sw_KE.utf8/LC_MESSAGES/messages.mo
trunk/locale/sw_KE.utf8/LC_MESSAGES/messages.po
trunk/locale/tr_TR.utf8/LC_MESSAGES/messages.mo
trunk/locale/tr_TR.utf8/LC_MESSAGES/messages.po
trunk/locale/vi_VN.utf8/LC_MESSAGES/messages.mo
trunk/locale/vi_VN.utf8/LC_MESSAGES/messages.po
trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.po
trunk/locale/zh_HK.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_HK.utf8/LC_MESSAGES/messages.po
trunk/locale/zh_TW.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_TW.utf8/LC_MESSAGES/messages.po
trunk/sql/mysql/country_sql/default.sql
trunk/sql/mysql/country_sql/demo.sql
trunk/sql/mysql/upgrade4.11-4.12.sql
trunk/sql/mysql/upgrade4.11.1-4.11.2.sql
Modified: trunk/BankAccountUsers.php
===================================================================
--- trunk/BankAccountUsers.php 2013-11-30 16:05:19 UTC (rev 6461)
+++ trunk/BankAccountUsers.php 2013-12-01 07:36:55 UTC (rev 6462)
@@ -1,10 +1,10 @@
<?php
include('includes/session.inc');
-$Title = _('Maintenance Of Bank Account Authorized Users');
+$Title = _('Maintenance Of Bank Account Authorised Users');
include('includes/header.inc');
-echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/money_add.png" title="' . _('Bank Account Authorized Users')
+echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/money_add.png" title="' . _('Bank Account Authorised Users')
. '" alt="" />' . ' ' . $Title . '</p>';
if (isset($_POST['SelectedUser'])){
@@ -41,7 +41,7 @@
if ($_POST['SelectedUser']=='') {
$InputError=1;
- echo prnMsg(_('You have not selected an user to be authorized to use this bank account'),'error');
+ echo prnMsg(_('You have not selected an user to be authorised to use this bank account'),'error');
echo '<br />';
unset($SelectedBankAccount);
}
@@ -60,7 +60,7 @@
if ( $checkrow[0] >0) {
$InputError = 1;
- prnMsg( _('The user') . ' ' . $_POST['SelectedUser'] . ' ' ._('already authorized to use this bank account'),'error');
+ prnMsg( _('The user') . ' ' . $_POST['SelectedUser'] . ' ' ._('already authorised to use this bank account'),'error');
} else {
// Add new record on submit
$sql = "INSERT INTO bankaccountusers (accountcode,
@@ -68,7 +68,7 @@
VALUES ('" . $_POST['SelectedBankAccount'] . "',
'" . $_POST['SelectedUser'] . "')";
- $msg = _('User:') . ' ' . $_POST['SelectedUser'].' '._('has been authorized to use') .' '. $_POST['SelectedBankAccount'] . ' ' . _('bank account');
+ $msg = _('User:') . ' ' . $_POST['SelectedUser'].' '._('has been authorised to use') .' '. $_POST['SelectedBankAccount'] . ' ' . _('bank account');
$result = DB_query($sql,$db);
prnMsg($msg,'success');
unset($_POST['SelectedUser']);
@@ -81,7 +81,7 @@
$ErrMsg = _('The bank account user record could not be deleted because');
$result = DB_query($sql,$db,$ErrMsg);
- prnMsg(_('User').' '. $SelectedUser .' '. _('has been un-authorized to use').' '. $SelectedBankAccount .' '. _('bank account') ,'success');
+ prnMsg(_('User').' '. $SelectedUser .' '. _('has been un-authorised to use').' '. $SelectedBankAccount .' '. _('bank account') ,'success');
unset($_GET['delete']);
}
@@ -90,12 +90,13 @@
/* It could still be the second time the page has been run and a record has been selected for modification - SelectedUser will exist because it was sent with the new call. If its the first time the page has been displayed with no parameters
then none of the above are true. These will call the same page again and allow update/input or deletion of the records*/
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
- echo '<div>';
- echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
- echo '<table class="selection">'; //Main table
+ echo '<div>
+ <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
+ <table class="selection">
+ <tr>
+ <td>' . _('Select Bank Account') . ':</td>
+ <td><select name="SelectedBankAccount">';
- echo '<tr><td>' . _('Select Bank Account') . ':</td><td><select name="SelectedBankAccount">';
-
$SQL = "SELECT accountcode,
bankaccountname
FROM bankaccounts";
@@ -117,8 +118,11 @@
echo '</table>'; // close main table
DB_free_result($result);
- echo '<br /><div class="centre"><input type="submit" name="Process" value="' . _('Accept') . '" />
- <input type="submit" name="Cancel" value="' . _('Cancel') . '" /></div>';
+ echo '<br />
+ <div class="centre">
+ <input type="submit" name="Process" value="' . _('Accept') . '" />
+ <input type="submit" name="Cancel" value="' . _('Cancel') . '" />
+ </div>';
echo '</div>
</form>';
@@ -134,7 +138,7 @@
$myrow = DB_fetch_array($result);
$SelectedBankName = $myrow['bankaccountname'];
- echo '<br /><div class="centre"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">' . _('Authorized users for') . ' ' .$SelectedBankName . ' ' . _('bank account') .'</a></div>';
+ echo '<br /><div class="centre"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">' . _('Authorised users for') . ' ' .$SelectedBankName . ' ' . _('bank account') .'</a></div>';
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
@@ -145,14 +149,14 @@
www_users.realname
FROM bankaccountusers INNER JOIN www_users
ON bankaccountusers.userid=www_users.userid
- WHERE bankaccountusers.accountcode='".$SelectedBankAccount."'
+ WHERE bankaccountusers.accountcode='" . $SelectedBankAccount . "'
ORDER BY bankaccountusers.userid ASC";
$result = DB_query($sql,$db);
echo '<br />
<table class="selection">';
- echo '<tr><th colspan="3"><h3>' . _('Authorized users for bank account') . ' ' .$SelectedBankName. '</h3></th></tr>';
+ echo '<tr><th colspan="3"><h3>' . _('Authorised users for bank account') . ' ' .$SelectedBankName. '</h3></th></tr>';
echo '<tr>
<th>' . _('User Code') . '</th>
<th>' . _('User Name') . '</th>
@@ -171,7 +175,7 @@
printf('<td>%s</td>
<td>%s</td>
- <td><a href="%s?SelectedUser=%s&delete=yes&SelectedBankAccount=' . $SelectedBankAccount . '" onclick="return confirm(\'' . _('Are you sure you wish to un-authorize this user?') . '\');">' . _('Un-authorize') . '</a></td>
+ <td><a href="%s?SelectedUser=%s&delete=yes&SelectedBankAccount=' . $SelectedBankAccount . '" onclick="return confirm(\'' . _('Are you sure you wish to un-authorise this user?') . '\');">' . _('Un-authorise') . '</a></td>
</tr>',
$myrow['userid'],
$myrow['realname'],
@@ -188,7 +192,9 @@
echo '<br /><table class="selection">'; //Main table
- echo '<tr><td>' . _('Select User') . ':</td><td><select name="SelectedUser">';
+ echo '<tr>
+ <td>' . _('Select User') . ':</td>
+ <td><select name="SelectedUser">';
$SQL = "SELECT userid,
realname
@@ -223,4 +229,4 @@
}
include('includes/footer.inc');
-?>
\ No newline at end of file
+?>
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2013-11-30 16:05:19 UTC (rev 6461)
+++ trunk/doc/Change.log 2013-12-01 07:36:55 UTC (rev 6462)
@@ -1,4 +1,8 @@
webERP Change Log
+
+1/12/13 Release 4.11.2
+
+30/11/13 Ricard: Added user permissions by bank account so only certain users can see and create payments/receipts on bank accounts selected.
30/11/13 rchacon: Includes supplier-code, currency-code, and currency-name-from-CurrenciesArray.php in SelectSupplier.php.
2013/11/30 Thumb: Add salesman constraint to show salesperson's own sales orders invoice, customer etc in DailySalesInquiry.php,PDFDeliveryDifferences.php,PDFOrdersInvoiced.php,PDFOrderStatus.php,PDFPickingList.php,SalesByTypePeriodInquiry.php,SalesInquiry.php,SelectCompletedOrder.php.
28/11/13 Phil: Apply Tim's idea for stripping slashes from incorrectly displayed items PO_Items.php and DeliveryDetails.php
@@ -103,13 +107,13 @@
14/08/13 Exson: html5 compatible for UserSettings.php
14/8/13 Exson: Make table in WorkCentres.php sortable.
14/8/13 Exson: make WhereUsedInquiry.php Html5 compatible.
-14/08/13 Exson: Make WorkCentres.php html5 compatible.
+14/8/13 Exson: Make WorkCentres.php html5 compatible.
14/8/13 Exson: HTML5 compatible for WorkOrderEntry.php.
14/8/13 Exson: fixed the in_array() warning in WorkOrderIssue.php and make it html5 compatible.
14/8/13 Exson: html5 compatible for WorkOrderReceive.php
-14/08/13 Exson: Html5 compatible
-2013/08/14 Exson: Fixed INSERT sql errors and href link error and make it html5 compatible in WOSerialNos.php.
-04/8/13 icedlava: Update Manual - Using the webERP Installer - rework of some text due to new installer, and updated screen shots
+14/8/13 Exson: Html5 compatible
+14/8/13 Exson: Fixed INSERT sql errors and href link error and make it html5 compatible in WOSerialNos.php.
+0/8/13 icedlava: Update Manual - Using the webERP Installer - rework of some text due to new installer, and updated screen shots
03/8/13 icedlava: Obfuscate database name in login, do not show company in login if directory/company not wanted.
29/7/13 Serge Gélinas: Profit and loss now has option to show all accounts and by default just shows those with a balance
29/7/13 icedlava: Hard code the page title in Installer html, previously missing - no language strings available at this time - used English
@@ -129,11 +133,11 @@
20/7/13 Phil: Added Tim's javascript as modified a bit to use different styles to allow sorting of tables - images for styles to all themes and added th.ascending th.descending to theme/default.css scripts
19/7/13 Phil: Swag of scripts updated for html5 <input type="tel" "email" pattern required="required" autofocus="autofocus" as per http://www.weberp.org/wiki/TransitionToHtml5 also added many title="" tooltips
19/7/13 Exson: add required to the input field of WWW_Access.php
-19/7/13: Exson make the WWW_Access.php html5 compatible
-18/7/13: Exson: Move the hidden input after the html document type definition. Reported by Tim.
+19/7/13 Exson make the WWW_Access.php html5 compatible
+18/7/13 Exson: Move the hidden input after the html document type definition. Reported by Tim.
18/7/13 Exson: fixed the LanguageSetup.php extra language mark introduced by handle locale number. Reported by Tim.
-18/7/13: Exson: Fixed the missing negative mark problem reported by Tim.
-18/7/13: Exson add a locale style check to pass the style to MisFunctions.js to do locale number format validation in LanguageSetup.php.
+18/7/13 Exson: Fixed the missing negative mark problem reported by Tim.
+18/7/13 Exson add a locale style check to pass the style to MisFunctions.js to do locale number format validation in LanguageSetup.php.
18/7/13 Exson: modify the MisFunctions.js to improve the locale number validation feature.
17/7/13 icedlava: stripslashes on Description for consistency with LongDescription but why- only until we fix source of this problem in the code
17/7/13 icedlava: add checkbox option in UI to clear item image
Modified: trunk/includes/MainMenuLinksArray.php
===================================================================
--- trunk/includes/MainMenuLinksArray.php 2013-11-30 16:05:19 UTC (rev 6461)
+++ trunk/includes/MainMenuLinksArray.php 2013-12-01 07:36:55 UTC (rev 6462)
@@ -370,7 +370,7 @@
_('GL Budgets'),
_('GL Tags'),
_('Bank Accounts'),
- _('Bank Account Authorized Users'));
+ _('Bank Account Authorised Users'));
$MenuItems['GL']['Maintenance']['URL'] = array( '/AccountSections.php',
'/AccountGroups.php',
Modified: trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po 2013-11-30 16:05:19 UTC (rev 6461)
+++ trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po 2013-12-01 07:36:55 UTC (rev 6462)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: web-erp\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-11-24 10:11+1300\n"
+"POT-Creation-Date: 2013-12-01 20:34+1300\n"
"PO-Revision-Date: 2013-06-01 11:19-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: Arabic <ar...@li...>\n"
@@ -260,8 +260,8 @@
#: SalesGraph.php:39 SalesPeople.php:20 SalesTypes.php:20 SelectAsset.php:48
#: SelectCompletedOrder.php:11 SelectContract.php:69 SelectCreditItems.php:220
#: SelectCreditItems.php:291 SelectCustomer.php:265 SelectGLAccount.php:65
-#: SelectOrderItems.php:609 SelectOrderItems.php:1532
-#: SelectOrderItems.php:1660 SelectProduct.php:526 SelectSalesOrder.php:563
+#: SelectOrderItems.php:601 SelectOrderItems.php:1524
+#: SelectOrderItems.php:1652 SelectProduct.php:526 SelectSalesOrder.php:563
#: SelectSupplier.php:14 SelectSupplier.php:220 SelectWorkOrder.php:9
#: SelectWorkOrder.php:169 SellThroughSupport.php:229 ShipmentCosting.php:11
#: Shipments.php:17 Shippers.php:123 Shippers.php:160 Shipt_Select.php:8
@@ -306,7 +306,7 @@
#: ContractCosting.php:202 Currencies.php:331 Currencies.php:497
#: Currencies.php:499 CustomerBranches.php:426 Customers.php:642
#: Customers.php:1032 Customers.php:1038 Customers.php:1041
-#: DailyBankTransactions.php:145 DeliveryDetails.php:1148
+#: DailyBankTransactions.php:148 DeliveryDetails.php:1148
#: DeliveryDetails.php:1191 DeliveryDetails.php:1194 FormDesigner.php:101
#: GLTransInquiry.php:69 Labels.php:591 Labels.php:593 Labels.php:618
#: Locations.php:628 Locations.php:630 MRPCalendar.php:224 MRP.php:540
@@ -354,7 +354,7 @@
#: ContractCosting.php:200 Currencies.php:333 Currencies.php:502
#: Currencies.php:504 CustomerBranches.php:426 Customers.php:641
#: Customers.php:1030 Customers.php:1037 Customers.php:1040
-#: DailyBankTransactions.php:147 DeliveryDetails.php:1149
+#: DailyBankTransactions.php:150 DeliveryDetails.php:1149
#: DeliveryDetails.php:1192 DeliveryDetails.php:1195 FormDesigner.php:99
#: GLTransInquiry.php:88 Labels.php:590 Labels.php:594 Labels.php:619
#: Locations.php:633 Locations.php:635 MRPCalendar.php:226 MRP.php:538
@@ -434,7 +434,7 @@
#: BankAccounts.php:224 BOMs.php:153 COGSGLPostings.php:113
#: COGSGLPostings.php:217 ContractBOM.php:272 ContractOtherReqts.php:124
#: CounterReturns.php:740 CounterSales.php:832 Credit_Invoice.php:400
-#: CreditStatus.php:176 Currencies.php:366 CustomerReceipt.php:953
+#: CreditStatus.php:176 Currencies.php:366 CustomerReceipt.php:957
#: Customers.php:1150 CustomerTypes.php:207 Departments.php:187
#: DiscountCategories.php:238 DiscountMatrix.php:183 EDIMessageFormat.php:151
#: FixedAssetCategories.php:191 FreightCosts.php:254 GeocodeSetup.php:174
@@ -443,7 +443,7 @@
#: InternalStockRequest.php:293 Labels.php:324 Labels.php:349 Labels.php:597
#: Locations.php:405 MailingGroupMaintenance.php:179 MaintenanceTasks.php:119
#: Manufacturers.php:218 MRPDemands.php:310 MRPDemandTypes.php:121
-#: PaymentMethods.php:209 Payments.php:1111 PaymentTerms.php:206
+#: PaymentMethods.php:209 Payments.php:1115 PaymentTerms.php:206
#: PcAssignCashToTab.php:281 PcClaimExpensesFromTab.php:277 PcExpenses.php:227
#: PcExpensesTypeTab.php:187 PcTabs.php:237 PcTypeTabs.php:181
#: PO_AuthorisationLevels.php:153 PO_Items.php:772 Prices_Customer.php:281
@@ -453,10 +453,10 @@
#: SalesTypes.php:207 SecurityTokens.php:131 SelectCreditItems.php:779
#: SelectCustomer.php:615 SelectCustomer.php:634 SelectCustomer.php:664
#: SelectCustomer.php:682 SelectCustomer.php:706 SelectCustomer.php:723
-#: SelectOrderItems.php:1447 SellThroughSupport.php:299 Shipments.php:440
+#: SelectOrderItems.php:1439 SellThroughSupport.php:299 Shipments.php:440
#: Shippers.php:145 SpecialOrder.php:667 StockCategories.php:268
#: StockCategories.php:613 StockLocTransfer.php:324 SuppContractChgs.php:99
-#: SuppCreditGRNs.php:117 SuppFixedAssetChgs.php:90 SuppInvGRNs.php:151
+#: SuppCreditGRNs.php:117 SuppFixedAssetChgs.php:90 SuppInvGRNs.php:147
#: SupplierContacts.php:166 SupplierTenderCreate.php:417
#: SupplierTenderCreate.php:447 SupplierTypes.php:191 SuppShiptChgs.php:90
#: SuppTransGLAnalysis.php:126 TaxAuthorities.php:175 TaxCategories.php:183
@@ -730,7 +730,7 @@
#: AddCustomerContacts.php:232 Contracts.php:781 PDFRemittanceAdvice.php:247
#: PO_Header.php:1017 PO_Header.php:1102 SelectCreditItems.php:245
-#: SelectCustomer.php:425 SelectOrderItems.php:647
+#: SelectCustomer.php:425 SelectOrderItems.php:639
#: SupplierTenderCreate.php:390 includes/PDFStatementPageHeader.inc:63
#: includes/PDFTransPageHeader.inc:81
#: includes/PDFTransPageHeaderPortrait.inc:107 ../webSHOP/Checkout.php:514
@@ -773,7 +773,7 @@
#: AddCustomerNotes.php:117 AddCustomerNotes.php:222
#: AddCustomerTypeNotes.php:111 AddCustomerTypeNotes.php:211
-#: BankMatching.php:278 BankReconciliation.php:212 BankReconciliation.php:289
+#: BankMatching.php:283 BankReconciliation.php:217 BankReconciliation.php:294
#: ContractCosting.php:177 CustomerAllocations.php:334
#: CustomerAllocations.php:364 CustomerInquiry.php:204
#: CustomerTransInquiry.php:106 GLAccountInquiry.php:174
@@ -786,7 +786,7 @@
#: StockDispatch.php:288 StockDispatch.php:299 StockLocMovements.php:91
#: StockMovements.php:98 StockSerialItemResearch.php:81
#: SupplierAllocations.php:456 SupplierAllocations.php:569
-#: SupplierAllocations.php:644 SupplierInquiry.php:211
+#: SupplierAllocations.php:644 SupplierInquiry.php:212
#: SupplierTransInquiry.php:105 includes/PDFQuotationPageHeader.inc:89
#: includes/PDFQuotationPortraitPageHeader.inc:88
#: includes/PDFStatementPageHeader.inc:169 includes/PDFTaxPageHeader.inc:36
@@ -963,7 +963,7 @@
#: PDFSellThroughSupportClaim.php:86 PDFStockCheckComparison.php:37
#: PDFStockCheckComparison.php:63 PDFStockCheckComparison.php:268
#: PO_PDFPurchOrder.php:31 PO_PDFPurchOrder.php:155
-#: PrintCustOrder_generic.php:249 PrintCustOrder.php:233
+#: PrintCustOrder_generic.php:253 PrintCustOrder.php:237
#: PurchaseByPrefSupplier.php:402 PurchaseByPrefSupplier.php:450
#: PurchaseByPrefSupplier.php:474 PurchaseByPrefSupplier.php:503
#: PurchaseByPrefSupplier.php:534 ReorderLevel.php:63 ReorderLevel.php:182
@@ -1002,8 +1002,8 @@
msgstr ""
#: AgedDebtors.php:368 AgedSuppliers.php:200 Areas.php:94
-#: ConfirmDispatch_Invoice.php:167 ConfirmDispatch_Invoice.php:994
-#: ConfirmDispatch_Invoice.php:1008 Contracts.php:592 CounterReturns.php:1010
+#: ConfirmDispatch_Invoice.php:171 ConfirmDispatch_Invoice.php:998
+#: ConfirmDispatch_Invoice.php:1012 Contracts.php:592 CounterReturns.php:1010
#: CounterReturns.php:1024 CounterSales.php:1431 CounterSales.php:1445
#: Credit_Invoice.php:723 Credit_Invoice.php:744 CustomerReceipt.php:555
#: CustomerReceipt.php:694 CustomerReceipt.php:722 CustomerTransInquiry.php:97
@@ -1018,8 +1018,8 @@
#: StockCostUpdate.php:88 StockLocStatus.php:164 StockMovements.php:91
#: StockQuantityByDate.php:97 StockReorderLevel.php:43 StockStatus.php:312
#: StockTransfers.php:203 StockUsageGraph.php:53 StockUsage.php:139
-#: SupplierInquiry.php:78 SupplierInquiry.php:100 SupplierInquiry.php:136
-#: SupplierInquiry.php:192 SupplierPriceList.php:382
+#: SupplierInquiry.php:77 SupplierInquiry.php:99 SupplierInquiry.php:137
+#: SupplierInquiry.php:193 SupplierPriceList.php:382
#: SupplierTransInquiry.php:97 SuppPaymentRun.php:114 SuppPaymentRun.php:188
#: SuppPaymentRun.php:219 WorkOrderCosting.php:429 WorkOrderReceive.php:292
#: WOSerialNos.php:49 Z_ChangeBranchCode.php:105 Z_ChangeCustomerCode.php:91
@@ -1303,8 +1303,8 @@
#: AuditTrail.php:55 AuditTrail.php:69 ContractBOM.php:306
#: CounterReturns.php:1613 CounterReturns.php:1616 CounterSales.php:2223
#: CounterSales.php:2226 CustomerTransInquiry.php:36
-#: DailyBankTransactions.php:72 DailySalesInquiry.php:46
-#: DailySalesInquiry.php:48 FixedAssetRegister.php:59
+#: DailyBankTransactions.php:75 DailySalesInquiry.php:52
+#: DailySalesInquiry.php:54 FixedAssetRegister.php:59
#: FixedAssetRegister.php:68 InventoryQuantities.php:168
#: InventoryQuantities.php:194 InventoryQuantities.php:196 MRP.php:597
#: MRPReport.php:524 MRPReport.php:526 MRPReschedules.php:145
@@ -1314,8 +1314,8 @@
#: ReorderLevel.php:214 ReorderLevel.php:244 ReorderLevel.php:246
#: SalesGraph.php:102 SalesGraph.php:104 SalesGraph.php:124 SalesGraph.php:126
#: SalesGraph.php:148 SalesGraph.php:150 SalesGraph.php:184
-#: SalesInquiry.php:1091 SalesInquiry.php:1154 SelectCreditItems.php:986
-#: SelectOrderItems.php:1668 SelectOrderItems.php:1671 SelectProduct.php:534
+#: SalesInquiry.php:1095 SalesInquiry.php:1158 SelectCreditItems.php:986
+#: SelectOrderItems.php:1660 SelectOrderItems.php:1663 SelectProduct.php:534
#: SelectProduct.php:536 StockDispatch.php:82 StockDispatch.php:393
#: StockDispatch.php:395 StockLocStatus.php:71 StockLocStatus.php:73
#: StockLocStatus.php:91 StockLocStatus.php:96 StockLocStatus.php:101
@@ -1348,20 +1348,21 @@
msgid "Date/Time"
msgstr ""
-#: AuditTrail.php:176 PcReportTab.php:268 includes/header.inc:59
+#: AuditTrail.php:176 BankAccountUsers.php:84 PcReportTab.php:268
+#: includes/header.inc:59
msgid "User"
msgstr ""
-#: AuditTrail.php:177 BankReconciliation.php:213 BankReconciliation.php:290
+#: AuditTrail.php:177 BankReconciliation.php:218 BankReconciliation.php:295
#: CustomerAllocations.php:362 CustomerInquiry.php:202
#: CustomerPurchases.php:68 CustomerTransInquiry.php:25
#: CustomerTransInquiry.php:104 CustWhereAlloc.php:21 CustWhereAlloc.php:111
-#: DailyBankTransactions.php:127 GLAccountInquiry.php:172
+#: DailyBankTransactions.php:130 GLAccountInquiry.php:172
#: GLAccountReport.php:341 GLJournal.php:266 MRPReschedules.php:194
-#: SalesByTypePeriodInquiry.php:336 SelectCustomer.php:424
+#: SalesByTypePeriodInquiry.php:356 SelectCustomer.php:424
#: ShipmentCosting.php:536 ShipmentCosting.php:613 StockCategories.php:239
#: StockLocMovements.php:89 StockMovements.php:96 SupplierAllocations.php:454
-#: SupplierInquiry.php:209 SupplierTransInquiry.php:20
+#: SupplierInquiry.php:210 SupplierTransInquiry.php:20
#: SupplierTransInquiry.php:102 Z_CheckAllocationsFrom.php:32
#: Z_CheckAllocationsFrom.php:57 Z_CheckAllocs.php:62
#: Z_CheckGLTransBalance.php:11 includes/InputSerialItemsFile.php:94
@@ -1546,7 +1547,7 @@
msgstr ""
#: BankAccounts.php:196 Currencies.php:445 CustomerAllocations.php:337
-#: CustomerReceipt.php:802 CustomerTransInquiry.php:114 OffersReceived.php:112
+#: CustomerReceipt.php:806 CustomerTransInquiry.php:114 OffersReceived.php:112
#: PcReportTab.php:276 PcTabs.php:208 PcTabs.php:355
#: PO_AuthorisationLevels.php:126 PO_AuthorisationLevels.php:210
#: PO_AuthorisationLevels.php:216 PO_AuthoriseMyOrders.php:115
@@ -1594,6 +1595,125 @@
msgid "Currency Of Account"
msgstr ""
+#: BankAccountUsers.php:4
+#, fuzzy
+msgid "Maintenance Of Bank Account Authorised Users"
+msgstr "مجموعات العضوية"
+
+#: BankAccountUsers.php:7 includes/MainMenuLinksArray.php:373
+#, fuzzy
+msgid "Bank Account Authorised Users"
+msgstr "مجموعات العضوية"
+
+#: BankAccountUsers.php:31
+msgid "You have not selected any bank account"
+msgstr ""
+
+#: BankAccountUsers.php:44
+msgid "You have not selected an user to be authorised to use this bank account"
+msgstr ""
+
+#: BankAccountUsers.php:63
+msgid "The user"
+msgstr ""
+
+#: BankAccountUsers.php:63
+msgid "already authorised to use this bank account"
+msgstr ""
+
+#: BankAccountUsers.php:71
+msgid "User:"
+msgstr ""
+
+#: BankAccountUsers.php:71
+#, fuzzy
+msgid "has been authorised to use"
+msgstr "تم حذف المجموعة"
+
+#: BankAccountUsers.php:71 BankAccountUsers.php:84 BankAccountUsers.php:141
+#, fuzzy
+msgid "bank account"
+msgstr "مجموعات العضوية"
+
+#: BankAccountUsers.php:82
+#, fuzzy
+msgid "The bank account user record could not be deleted because"
+msgstr "لم أستطيع استرجاع القطاع المطلوب حاول مجددا"
+
+#: BankAccountUsers.php:84
+#, fuzzy
+msgid "has been un-authorised to use"
+msgstr "تم حذف المجموعة"
+
+#: BankAccountUsers.php:97
+#, fuzzy
+msgid "Select Bank Account"
+msgstr "مجموعات العضوية"
+
+#: BankAccountUsers.php:105 BankAccountUsers.php:205
+#: InternalStockCategoriesByRole.php:120 InternalStockCategoriesByRole.php:209
+#: PcClaimExpensesFromTab.php:157 PcClaimExpensesFromTab.php:377
+#: PcExpenses.php:310 PcExpensesTypeTab.php:123 PcExpensesTypeTab.php:212
+#: PurchaseByPrefSupplier.php:317
+msgid "Not Yet Selected"
+msgstr ""
+
+#: BankAccountUsers.php:123 BankAccountUsers.php:222 CustomerReceipt.php:917
+#: CustomerReceipt.php:1129 CustomerTypes.php:270 ExchangeRateTrend.php:53
+#: FreightCosts.php:60 GLJournal.php:139 GLJournal.php:376
+#: InternalStockCategoriesByRole.php:136 InternalStockCategoriesByRole.php:226
+#: OffersReceived.php:114 Payments.php:1083 PcAssignCashToTab.php:181
+#: PcAssignCashToTab.php:398 PcAuthorizeExpenses.php:334
+#: PcClaimExpensesFromTab.php:174 PcClaimExpensesFromTab.php:422
+#: PcExpenses.php:350 PcExpensesTypeTab.php:139 PcExpensesTypeTab.php:229
+#: PcTabs.php:487 PcTypeTabs.php:253 SalesTypes.php:274 SupplierTypes.php:255
+#: Z_CheckDebtorsControl.php:61
+msgid "Accept"
+msgstr ""
+
+#: BankAccountUsers.php:124 BankAccountUsers.php:223
+#: CustomerAllocations.php:436 CustomerReceipt.php:1130
+#: InternalStockCategoriesByRole.php:137 InternalStockCategoriesByRole.php:227
+#: Payments.php:1084 PcAssignCashToTab.php:182 PcAssignCashToTab.php:399
+#: PcAuthorizeExpenses.php:335 PcClaimExpensesFromTab.php:175
+#: PcClaimExpensesFromTab.php:423 PcExpenses.php:351 PcExpensesTypeTab.php:140
+#: PcExpensesTypeTab.php:230 PcTabs.php:488 PcTypeTabs.php:254
+#: SalesTypes.php:274 SelectCreditItems.php:958 Z_CheckDebtorsControl.php:62
+msgid "Cancel"
+msgstr ""
+
+#: BankAccountUsers.php:141
+msgid "Authorised users for"
+msgstr ""
+
+#: BankAccountUsers.php:159
+msgid "Authorised users for bank account"
+msgstr ""
+
+#: BankAccountUsers.php:161
+msgid "User Code"
+msgstr ""
+
+#: BankAccountUsers.php:162 PcTabs.php:206 PcTabs.php:307
+#: PO_AuthorisationLevels.php:125 SMTPServer.php:101 UserSettings.php:118
+msgid "User Name"
+msgstr ""
+
+#: BankAccountUsers.php:178
+#, fuzzy, php-format
+msgid "Are you sure you wish to un-authorise this user?"
+msgstr "حدث خطأ ما اثناء حذف مجموعة الحسابات"
+
+#: BankAccountUsers.php:178
+#, php-format
+msgid "Un-authorise"
+msgstr ""
+
+#: BankAccountUsers.php:196
+#, fuzzy
+msgid "Select User"
+msgstr "العودة الى العملاء"
+
#: BankMatching.php:6
msgid "Bank Account Matching"
msgstr ""
@@ -1650,32 +1770,32 @@
"the matching transaction."
msgstr ""
-#: BankMatching.php:100 BankReconciliation.php:108 Currencies.php:219
-#: CustomerReceipt.php:768 DailyBankTransactions.php:37 Payments.php:785
+#: BankMatching.php:100 BankReconciliation.php:113 Currencies.php:219
+#: CustomerReceipt.php:772 DailyBankTransactions.php:40 Payments.php:789
#: PDFChequeListing.php:46 TaxAuthorities.php:151 TaxAuthorities.php:318
msgid "Bank Account"
msgstr ""
-#: BankMatching.php:127 FormDesigner.php:103 ShopParameters.php:303
+#: BankMatching.php:132 FormDesigner.php:103 ShopParameters.php:303
#: ShopParameters.php:307
msgid "Show"
msgstr ""
-#: BankMatching.php:127 CounterSales.php:227 CreditItemsControlled.php:79
+#: BankMatching.php:132 CounterSales.php:227 CreditItemsControlled.php:79
#: FreightCosts.php:281 GoodsReceivedControlled.php:68 GoodsReceived.php:73
#: InternalStockRequestFulfill.php:39 StockLocTransferReceive.php:444
#: SupplierAllocations.php:435 SuppShiptChgs.php:137
msgid "from"
msgstr ""
-#: BankMatching.php:132 ConfirmDispatchControlled_Invoice.php:68
+#: BankMatching.php:137 ConfirmDispatchControlled_Invoice.php:68
#: CounterReturns.php:197 EmailCustTrans.php:64 FixedAssetRegister.php:82
#: FTP_RadioBeacon.php:280 GLAccountCSV.php:178 GLAccountReport.php:106
#: Payments.php:764 PcReportTab.php:110 PDFChequeListing.php:117
#: PDFChequeListing.php:127 PDFChequeListing.php:196
-#: PDFDeliveryDifferences.php:190 PDFDeliveryDifferences.php:203
-#: PDFDeliveryDifferences.php:297 PDFDIFOT.php:197 PDFDIFOT.php:210
-#: PDFDIFOT.php:303 PDFOrdersInvoiced.php:87 PDFOrdersInvoiced.php:284
+#: PDFDeliveryDifferences.php:194 PDFDeliveryDifferences.php:207
+#: PDFDeliveryDifferences.php:306 PDFDIFOT.php:197 PDFDIFOT.php:210
+#: PDFDIFOT.php:303 PDFOrdersInvoiced.php:87 PDFOrdersInvoiced.php:258
#: PDFOrderStatus.php:92 PDFOrderStatus.php:266 PDFRemittanceAdvice.php:48
#: PO_PDFPurchOrder.php:353 PricesBasedOnMarkUp.php:219
#: PricesBasedOnMarkUp.php:358 PrintCustStatements.php:46
@@ -1699,29 +1819,29 @@
msgid "to"
msgstr ""
-#: BankMatching.php:136
+#: BankMatching.php:141
msgid "Choose outstanding"
msgstr ""
-#: BankMatching.php:136
+#: BankMatching.php:141
msgid "only or all"
msgstr ""
-#: BankMatching.php:136 BankMatching.php:140 BankMatching.php:143
-#: BankMatching.php:153 BankMatching.php:156
+#: BankMatching.php:141 BankMatching.php:145 BankMatching.php:148
+#: BankMatching.php:158 BankMatching.php:161
msgid "in the date range"
msgstr ""
-#: BankMatching.php:140 BankMatching.php:143 BankMatching.php:153
-#: BankMatching.php:156
+#: BankMatching.php:145 BankMatching.php:148 BankMatching.php:158
+#: BankMatching.php:161
msgid "Show all"
msgstr ""
-#: BankMatching.php:141 BankMatching.php:144
+#: BankMatching.php:146 BankMatching.php:149
msgid "Show unmatched"
msgstr ""
-#: BankMatching.php:141 BankMatching.php:144 PrintCheque.php:52
+#: BankMatching.php:146 BankMatching.php:149 PrintCheque.php:52
#: ReverseGRN.php:104 includes/PDFCustomerListPageHeader.inc:46
#: includes/PDFDeliveryDifferencesPageHeader.inc:24
#: includes/PDFDIFOTPageHeader.inc:24
@@ -1730,70 +1850,70 @@
msgid "only"
msgstr ""
-#: BankMatching.php:150
+#: BankMatching.php:155
msgid "Choose to display only the first 20 matching"
msgstr ""
-#: BankMatching.php:150
+#: BankMatching.php:155
msgid "or all"
msgstr ""
-#: BankMatching.php:150
+#: BankMatching.php:155
msgid "meeting the criteria"
msgstr ""
-#: BankMatching.php:154 BankMatching.php:157
+#: BankMatching.php:159 BankMatching.php:162
msgid "Show only the first 20"
msgstr ""
-#: BankMatching.php:166
+#: BankMatching.php:171
msgid "Show selected"
msgstr ""
-#: BankMatching.php:169
+#: BankMatching.php:174
msgid "Show reconciliation"
msgstr ""
-#: BankMatching.php:177 BankMatching.php:183
+#: BankMatching.php:182 BankMatching.php:188
msgid "The date entered for the field to show"
msgstr ""
-#: BankMatching.php:177
+#: BankMatching.php:182
msgid "before"
msgstr ""
-#: BankMatching.php:178 BankMatching.php:184
+#: BankMatching.php:183 BankMatching.php:189
msgid "is not entered in a recognised date format"
msgstr ""
-#: BankMatching.php:178 BankMatching.php:184
+#: BankMatching.php:183 BankMatching.php:189
msgid "Entry is expected in the format"
msgstr ""
-#: BankMatching.php:183 GLProfit_Loss.php:868
+#: BankMatching.php:188 GLProfit_Loss.php:868
#, php-format
msgid "after"
msgstr ""
-#: BankMatching.php:270
+#: BankMatching.php:275
msgid "The payments with the selected criteria could not be retrieved because"
msgstr ""
-#: BankMatching.php:275 Payments.php:1087
+#: BankMatching.php:280 Payments.php:1091
msgid "Cheque No"
msgstr ""
-#: BankMatching.php:276 ShipmentCosting.php:537 ShipmentCosting.php:614
+#: BankMatching.php:281 ShipmentCosting.php:537 ShipmentCosting.php:614
#: SupplierAllocations.php:457
msgid "Ref"
msgstr ""
-#: BankMatching.php:279 ConfirmDispatch_Invoice.php:297 Credit_Invoice.php:297
-#: CustomerAllocations.php:365 CustomerReceipt.php:930
+#: BankMatching.php:284 ConfirmDispatch_Invoice.php:301 Credit_Invoice.php:297
+#: CustomerAllocations.php:365 CustomerReceipt.php:934
#: CustomerTransInquiry.php:113 CustWhereAlloc.php:115 GLJournalInquiry.php:85
#: ImportBankTransAnalysis.php:208 ImportBankTransAnalysis.php:288
-#: PaymentAllocations.php:67 Payments.php:1067 Payments.php:1072
-#: Payments.php:1088 PcAssignCashToTab.php:240 PcAssignCashToTab.php:371
+#: PaymentAllocations.php:67 Payments.php:1071 Payments.php:1076
+#: Payments.php:1092 PcAssignCashToTab.php:240 PcAssignCashToTab.php:371
#: PcAuthorizeExpenses.php:95 PcClaimExpensesFromTab.php:236
#: PcClaimExpensesFromTab.php:396 PcReportTab.php:180 PcReportTab.php:335
#: PrintCheque.php:83 PrintCheque.php:97 SelectCreditItems.php:696
@@ -1811,8 +1931,8 @@
msgid "Amount"
msgstr ""
-#: BankMatching.php:280 BankReconciliation.php:217 BankReconciliation.php:294
-#: PDFOrdersInvoiced.php:361 PDFOrderStatus.php:332
+#: BankMatching.php:285 BankReconciliation.php:222 BankReconciliation.php:299
+#: PDFOrdersInvoiced.php:335 PDFOrderStatus.php:332
#: PO_SelectOSPurchOrder.php:240 PO_SelectPurchOrder.php:216
#: Shipt_Select.php:193 SuppCreditGRNs.php:291
#: includes/PDFStatementPageHeader.inc:173
@@ -1820,15 +1940,15 @@
msgid "Outstanding"
msgstr ""
-#: BankMatching.php:281
+#: BankMatching.php:286
msgid "Clear"
msgstr ""
-#: BankMatching.php:281 BankMatching.php:307
+#: BankMatching.php:286 BankMatching.php:312
msgid "Unclear"
msgstr ""
-#: BankMatching.php:346
+#: BankMatching.php:351
msgid "Update Matching"
msgstr ""
@@ -1867,60 +1987,60 @@
msgid "has been posted"
msgstr ""
-#: BankReconciliation.php:104 SuppPaymentRun.php:317
+#: BankReconciliation.php:109 SuppPaymentRun.php:317
msgid "The bank accounts could not be retrieved by the SQL because"
msgstr ""
-#: BankReconciliation.php:105 CustomerReceipt.php:756
-#: DailyBankTransactions.php:33 Payments.php:781 SuppPaymentRun.php:319
+#: BankReconciliation.php:110 CustomerReceipt.php:760
+#: DailyBankTransactions.php:36 Payments.php:785 SuppPaymentRun.php:319
msgid "The SQL used to retrieve the bank accounts was"
msgstr ""
-#: BankReconciliation.php:115 CustomerReceipt.php:776
+#: BankReconciliation.php:120 CustomerReceipt.php:780
msgid "Bank Accounts have not yet been defined"
msgstr ""
-#: BankReconciliation.php:115 CustomerReceipt.php:776
+#: BankReconciliation.php:120 CustomerReceipt.php:780
msgid "You must first"
msgstr ""
-#: BankReconciliation.php:115 CustomerReceipt.php:776
-#: DailyBankTransactions.php:43 Payments.php:793 SuppPaymentRun.php:332
+#: BankReconciliation.php:120 CustomerReceipt.php:780
+#: DailyBankTransactions.php:46 Payments.php:797 SuppPaymentRun.php:332
msgid "define the bank accounts"
msgstr ""
-#: BankReconciliation.php:115 CustomerReceipt.php:776
-#: DailyBankTransactions.php:43 Payments.php:793 SuppPaymentRun.php:332
+#: BankReconciliation.php:120 CustomerReceipt.php:780
+#: DailyBankTransactions.php:46 Payments.php:797 SuppPaymentRun.php:332
msgid "and general ledger accounts to be affected"
msgstr ""
-#: BankReconciliation.php:138
+#: BankReconciliation.php:143
msgid "Show bank reconciliation statement"
msgstr ""
-#: BankReconciliation.php:159 Currencies.php:172
+#: BankReconciliation.php:164 Currencies.php:172
msgid "The bank account balance could not be returned by the SQL because"
msgstr ""
-#: BankReconciliation.php:173
+#: BankReconciliation.php:178
msgid ""
"Could not retrieve the currency and exchange rate for the selected bank "
"account"
msgstr ""
-#: BankReconciliation.php:180
+#: BankReconciliation.php:185
msgid "Balance as at"
msgstr ""
-#: BankReconciliation.php:204
+#: BankReconciliation.php:209
msgid "The unpresented cheques could not be retrieved by the SQL because"
msgstr ""
-#: BankReconciliation.php:208
+#: BankReconciliation.php:213
msgid "Add back unpresented cheques"
msgstr ""
-#: BankReconciliation.php:214 BankReconciliation.php:291
+#: BankReconciliation.php:219 BankReconciliation.php:296
#: CustomerAllocations.php:333 CustomerAllocations.php:363
#: CustomerInquiry.php:203 CustomerTransInquiry.php:105 CustWhereAlloc.php:112
#: EmailCustTrans.php:15 GLAccountInquiry.php:173 ImportBankTrans.php:538
@@ -1939,11 +2059,11 @@
msgid "Number"
msgstr ""
-#: BankReconciliation.php:215 BankReconciliation.php:292
+#: BankReconciliation.php:220 BankReconciliation.php:297
#: ContractCosting.php:176 CustomerInquiry.php:206 CustomerPurchases.php:75
-#: CustomerReceipt.php:894 CustomerTransInquiry.php:109 CustWhereAlloc.php:113
-#: DailyBankTransactions.php:128 GLAccountReport.php:342
-#: PaymentAllocations.php:64 PaymentAllocations.php:65 Payments.php:928
+#: CustomerReceipt.php:898 CustomerTransInquiry.php:109 CustWhereAlloc.php:113
+#: DailyBankTransactions.php:131 GLAccountReport.php:342
+#: PaymentAllocations.php:64 PaymentAllocations.php:65 Payments.php:932
#: PDFRemittanceAdvice.php:309 ShiptsList.php:37 StockCounts.php:115
#: StockCounts.php:158 StockLocMovements.php:94 StockMovements.php:102
#: Z_CheckAllocs.php:64 includes/PDFBankingSummaryPageHeader.inc:40
@@ -1956,52 +2076,52 @@
msgid "Reference"
msgstr ""
-#: BankReconciliation.php:216 BankReconciliation.php:293
+#: BankReconciliation.php:221 BankReconciliation.php:298
msgid "Orig Amount"
msgstr ""
-#: BankReconciliation.php:263
+#: BankReconciliation.php:268
msgid "Total of all unpresented cheques"
msgstr ""
-#: BankReconciliation.php:282
+#: BankReconciliation.php:287
msgid "The uncleared deposits could not be retrieved by the SQL because"
msgstr ""
-#: BankReconciliation.php:286
+#: BankReconciliation.php:291
msgid "Less deposits not cleared"
msgstr ""
-#: BankReconciliation.php:339
+#: BankReconciliation.php:344
msgid "Total of all uncleared deposits"
msgstr ""
-#: BankReconciliation.php:347
+#: BankReconciliation.php:352
msgid "Bank statement balance should be"
msgstr ""
-#: BankReconciliation.php:357
+#: BankReconciliation.php:362
msgid "Enter the actual bank statement balance"
msgstr ""
-#: BankReconciliation.php:361 BankReconciliation.php:374
+#: BankReconciliation.php:366 BankReconciliation.php:379
msgid "Calculate and Post Exchange Difference"
msgstr ""
-#: BankReconciliation.php:361
+#: BankReconciliation.php:366
msgid ""
"This will create a general ledger journal to write off the exchange "
"difference in the current balance of the account. It is important that the "
"exchange rate above reflects the current value of the bank account currency"
msgstr ""
-#: BankReconciliation.php:361 CounterReturns.php:740 CounterSales.php:832
-#: Customers.php:1178 SelectOrderItems.php:1458 Stocks.php:1397
+#: BankReconciliation.php:366 CounterReturns.php:740 CounterSales.php:832
+#: Customers.php:1178 SelectOrderItems.php:1450 Stocks.php:1397
#: WorkOrderCosting.php:551 WorkOrderEntry.php:589
msgid "Are You Sure?"
msgstr ""
-#: BankReconciliation.php:371
+#: BankReconciliation.php:376
msgid ""
"It is normal for foreign currency accounts to have exchange differences that "
"need to be reflected as the exchange rate varies. This reconciliation is "
@@ -2012,11 +2132,11 @@
"reconciliation to the actual bank statement balance click below."
msgstr ""
-#: BankReconciliation.php:384 BankReconciliation.php:392
+#: BankReconciliation.php:389 BankReconciliation.php:397
msgid "Match off cleared payments"
msgstr ""
-#: BankReconciliation.php:387 BankReconciliation.php:395
+#: BankReconciliation.php:392 BankReconciliation.php:400
msgid "Match off cleared deposits"
msgstr ""
@@ -2075,16 +2195,16 @@
#: MRPPlannedWorkOrders.php:261 MRPPlannedWorkOrders.php:395 MRPReport.php:413
#: MRPReport.php:419 MRPReschedules.php:195 OffersReceived.php:108
#: OffersReceived.php:218 OffersReceived.php:278 OrderDetails.php:170
-#: PDFOrdersInvoiced.php:400 POReport.php:762 POReport.php:1449
+#: PDFOrdersInvoiced.php:374 POReport.php:762 POReport.php:1449
#: PrintCustTrans.php:894 PrintCustTrans.php:983 PrintCustTrans.php:1032
#: PrintCustTransPortrait.php:945 PrintCustTransPortrait.php:1043
#: PrintCustTransPortrait.php:1099 RecurringSalesOrders.php:331
#: ReorderLevel.php:300 ReverseGRN.php:393 ReverseGRN.php:394
#: SalesAnalReptCols.php:16 SalesAnalReptCols.php:18 SalesGraph.php:193
-#: SalesGraph.php:276 SalesInquiry.php:993 SalesTopItemsInquiry.php:225
+#: SalesGraph.php:276 SalesInquiry.php:997 SalesTopItemsInquiry.php:225
#: SelectCreditItems.php:688 SelectCreditItems.php:1068
-#: SelectOrderItems.php:1380 SelectOrderItems.php:1548
-#: SelectOrderItems.php:1737 SelectOrderItems.php:1869 ShipmentCosting.php:149
+#: SelectOrderItems.php:1372 SelectOrderItems.php:1540
+#: SelectOrderItems.php:1729 SelectOrderItems.php:1861 ShipmentCosting.php:149
#: ShipmentCosting.php:150 Shipments.php:401 Shipments.php:403
#: Shipments.php:404 Shipments.php:488 Shipments.php:490 SpecialOrder.php:628
#: StockCounts.php:114 StockLocMovements.php:93 StockLocTransfer.php:306
@@ -2196,7 +2316,7 @@
#: MRPPlannedPurchaseOrders.php:321 MRPPlannedWorkOrders.php:375
#: MRPReport.php:818 MRPReschedules.php:181 MRPShortages.php:335
#: PDFPriceList.php:345 PDFReceipt.php:31 PDFRemittanceAdvice.php:218
-#: PrintCustOrder.php:170 PrintCustTrans.php:769 PrintCustTrans.php:978
+#: PrintCustOrder.php:174 PrintCustTrans.php:769 PrintCustTrans.php:978
#: PrintCustTrans.php:1027 PrintCustTransPortrait.php:814
#: PrintCustTransPortrait.php:1036 PrintCustTransPortrait.php:1092
#: ReorderLevel.php:284 StockDispatch.php:477 SuppPriceList.php:293
@@ -2260,8 +2380,8 @@
#: InternalStockRequest.php:630 PO_SelectOSPurchOrder.php:239
#: PO_SelectPurchOrder.php:215 PurchaseByPrefSupplier.php:415
#: ReorderLevelLocation.php:73 ReorderLevelLocation.php:74
-#: SelectCompletedOrder.php:556 SelectOrderItems.php:1544
-#: SelectOrderItems.php:1733 SelectSalesOrder.php:612 SelectWorkOrder.php:215
+#: SelectCompletedOrder.php:506 SelectOrderItems.php:1536
+#: SelectOrderItems.php:1725 SelectSalesOrder.php:612 SelectWorkOrder.php:215
#: Shipt_Select.php:192 TopItems.php:168 includes/PDFTopItemsHeader.inc:54
msgid "On Hand"
msgstr ""
@@ -2345,20 +2465,20 @@
#: MRPReport.php:536 MRPReport.php:750 MRPReschedules.php:192
#: MRPShortages.php:350 NoSalesItems.php:187 PaymentTerms.php:182
#: PcExpenses.php:190 PcExpenses.php:296 PcExpensesTypeTab.php:171
-#: PcReportTab.php:179 PcTypeTabs.php:164 PDFOrdersInvoiced.php:358
+#: PcReportTab.php:179 PcTypeTabs.php:164 PDFOrdersInvoiced.php:332
#: PDFOrderStatus.php:329 PO_Items.php:720 PO_Items.php:1160
#: PO_SelectOSPurchOrder.php:238 PO_SelectPurchOrder.php:214
#: PricesByCost.php:153 ReorderLevelLocation.php:71 ReorderLevel.php:298
#: ReverseGRN.php:391 SalesCategories.php:509 SecurityTokens.php:94
#: SecurityTokens.php:103 SecurityTokens.php:120 SelectAsset.php:264
-#: SelectCompletedOrder.php:555 SelectContract.php:144
-#: SelectCreditItems.php:1022 SelectOrderItems.php:1542
-#: SelectOrderItems.php:1731 SelectProduct.php:546 SelectProduct.php:772
+#: SelectCompletedOrder.php:505 SelectContract.php:144
+#: SelectCreditItems.php:1022 SelectOrderItems.php:1534
+#: SelectOrderItems.php:1723 SelectProduct.php:546 SelectProduct.php:772
#: SelectSalesOrder.php:611 SelectWorkOrder.php:214 Shipt_Select.php:191
#: StockCategories.php:238 StockClone.php:675 StockDispatch.php:503
#: StockLocStatus.php:172 StockQuantityByDate.php:108 Stocks.php:976
#: SuppCreditGRNs.php:92 SuppCreditGRNs.php:192 SuppFixedAssetChgs.php:78
-#: SuppInvGRNs.php:126 SuppInvGRNs.php:307 SupplierCredit.php:317
+#: SuppInvGRNs.php:120 SuppInvGRNs.php:257 SupplierCredit.php:317
#: SupplierCredit.php:385 SupplierInvoice.php:665 SupplierInvoice.php:745
#: SupplierPriceList.php:39 SupplierPriceList.php:271
#: SupplierPriceList.php:533 SupplierTenderCreate.php:429
@@ -2458,17 +2578,17 @@
#: BOMInquiry.php:28 BOMs.php:870 ContractBOM.php:332 ContractBOM.php:337
#: Contracts.php:759 Contracts.php:762 CounterReturns.php:1638
-#: CounterSales.php:2247 CustomerReceipt.php:1141 CustomerReceipt.php:1144
+#: CounterSales.php:2247 CustomerReceipt.php:1145 CustomerReceipt.php:1148
#: DiscountCategories.php:121 DiscountCategories.php:123
#: DiscountCategories.php:127 DiscountCategories.php:129
#: FixedAssetTransfer.php:94 InternalStockRequest.php:353 MRPDemands.php:338
#: MRPDemands.php:341 MRPReport.php:546 PO_Header.php:542 PO_Items.php:1139
#: PO_Items.php:1143 PO_SelectOSPurchOrder.php:220 PO_SelectPurchOrder.php:195
-#: PurchData.php:383 SelectAsset.php:104 SelectCompletedOrder.php:534
+#: PurchData.php:383 SelectAsset.php:104 SelectCompletedOrder.php:484
#: SelectCreditItems.php:227 SelectCreditItems.php:1005 SelectCustomer.php:274
#: SelectCustomer.php:284 SelectCustomer.php:293 SelectCustomer.php:303
-#: SelectCustomer.php:350 SelectGLAccount.php:79 SelectOrderItems.php:619
-#: SelectOrderItems.php:622 SelectOrderItems.php:1696 SelectProduct.php:553
+#: SelectCustomer.php:350 SelectGLAccount.php:79 SelectOrderItems.php:611
+#: SelectOrderItems.php:614 SelectOrderItems.php:1688 SelectProduct.php:553
#: SelectSalesOrder.php:595 SelectSupplier.php:231 SelectWorkOrder.php:201
#: SellThroughSupport.php:202 Shipt_Select.php:174 SuppFixedAssetChgs.php:126
#: SupplierPriceList.php:49 SupplierPriceList.php:406
@@ -2487,9 +2607,9 @@
#: EmailConfirmation.php:347 InternalStockRequest.php:154
#: InternalStockRequest.php:353 MRPDemands.php:339 MRPReport.php:546
#: PO_SelectOSPurchOrder.php:220 PO_SelectPurchOrder.php:195
-#: SalesInquiry.php:765 SalesInquiry.php:776 SalesInquiry.php:796
-#: SalesInquiry.php:822 SalesInquiry.php:841 SalesInquiry.php:951
-#: SalesInquiry.php:1109 SalesInquiry.php:1199 SalesInquiry.php:1217
+#: SalesInquiry.php:769 SalesInquiry.php:780 SalesInquiry.php:800
+#: SalesInquiry.php:826 SalesInquiry.php:845 SalesInquiry.php:955
+#: SalesInquiry.php:1113 SalesInquiry.php:1210 SalesInquiry.php:1228
#: SelectProduct.php:553 Shipt_Select.php:174 StockAdjustments.php:116
#: StockAdjustments.php:403 StockCounts.php:113 StockCounts.php:155
#: StockMovements.php:36 StockReorderLevel.php:49 StockStatus.php:62
@@ -2502,11 +2622,11 @@
msgstr ""
#: BOMInquiry.php:35 BOMs.php:875 ContractBOM.php:342 Contracts.php:769
-#: CounterReturns.php:1642 CounterSales.php:2253 CustomerReceipt.php:1151
+#: CounterReturns.php:1642 CounterSales.php:2253 CustomerReceipt.php:1155
#: FixedAssetTransfer.php:107 InternalStockRequest.php:364 MRPDemands.php:343
#: MRPReport.php:558 PO_Header.php:549 PO_Items.php:1147 SelectAsset.php:116
#: SelectCreditItems.php:234 SelectCreditItems.php:1012 SelectCustomer.php:375
-#: SelectGLAccount.php:103 SelectOrderItems.php:630 SelectOrderItems.php:1706
+#: SelectGLAccount.php:103 SelectOrderItems.php:622 SelectOrderItems.php:1698
#: SelectProduct.php:561 SelectSupplier.php:241 SelectSupplier.php:274
#: SupplierPriceList.php:61 SupplierTenderCreate.php:567
#: SupplierTenderCreate.php:606 SupplierTenderCreate.php:712
@@ -2533,22 +2653,22 @@
msgstr ""
#: BOMInquiry.php:95 BOMs.php:854 MRPCalendar.php:213 MRPDemands.php:80
-#: MRPDemands.php:289 POReport.php:481 POReport.php:1256 SalesInquiry.php:754
+#: MRPDemands.php:289 POReport.php:481 POReport.php:1256 SalesInquiry.php:758
msgid "The SQL to find the parts selected failed with the message"
msgstr ""
#: BOMInquiry.php:108 BOMs.php:553 BOMs.php:885 ContractBOM.php:353
#: CounterReturns.php:1667 CounterSales.php:2096 CounterSales.php:2277
-#: CustomerBranches.php:382 CustomerReceipt.php:1162 GLCodesInquiry.php:26
+#: CustomerBranches.php:382 CustomerReceipt.php:1166 GLCodesInquiry.php:26
#: InternalStockRequest.php:557 InternalStockRequest.php:627
#: MaterialsNotUsed.php:34 MRPDemands.php:91 MRPPlannedWorkOrders.php:257
-#: MRPReport.php:749 NoSalesItems.php:186 PDFOrdersInvoiced.php:357
+#: MRPReport.php:749 NoSalesItems.php:186 PDFOrdersInvoiced.php:331
#: PDFOrderStatus.php:328 PO_Header.php:556 PO_Items.php:1159
#: PO_SelectOSPurchOrder.php:237 PO_SelectPurchOrder.php:213
#: PricesByCost.php:152 PurchData.php:469 ReorderLevelLocation.php:70
-#: SalesPeople.php:199 SelectCompletedOrder.php:554 SelectCreditItems.php:1021
-#: SelectCustomer.php:420 SelectGLAccount.php:112 SelectOrderItems.php:1541
-#: SelectOrderItems.php:1730 SelectProduct.php:771 SelectSalesOrder.php:610
+#: SalesPeople.php:199 SelectCompletedOrder.php:504 SelectCreditItems.php:1021
+#: SelectCustomer.php:420 SelectGLAccount.php:112 SelectOrderItems.php:1533
+#: SelectOrderItems.php:1722 SelectProduct.php:771 SelectSalesOrder.php:610
#: SelectSupplier.php:280 SelectWorkOrder.php:213 SellThroughSupport.php:159
#: Shipt_Select.php:190 SpecialOrder.php:149 SupplierPriceList.php:270
#: SupplierPriceList.php:455 SupplierTenderCreate.php:612
@@ -2559,16 +2679,16 @@
msgid "Code"
msgstr ""
-#: BOMInquiry.php:111 BOMs.php:888 ConfirmDispatch_Invoice.php:289
+#: BOMInquiry.php:111 BOMs.php:888 ConfirmDispatch_Invoice.php:293
#: ContractBOM.php:355 CounterReturns.php:1669 CounterSales.php:2098
#: CounterSales.php:2279 Credit_Invoice.php:290 GoodsReceived.php:103
#: GoodsReceived.php:107 InternalStockRequestAuthorisation.php:91
#: InternalStockRequestFulfill.php:322 InternalStockRequest.php:560
#: InternalStockRequest.php:629 MRPReport.php:752 NoSalesItems.php:190
#: OffersReceived.php:109 PO_Items.php:1163 PO_SelectOSPurchOrder.php:241
-#: PO_SelectPurchOrder.php:217 SelectCompletedOrder.php:559
-#: SelectCreditItems.php:1023 SelectOrderItems.php:1543
-#: SelectOrderItems.php:1732 SelectProduct.php:130 SelectProduct.php:774
+#: PO_SelectPurchOrder.php:217 SelectCompletedOrder.php:509
+#: SelectCreditItems.php:1023 SelectOrderItems.php:1535
+#: SelectOrderItems.php:1724 SelectProduct.php:130 SelectProduct.php:774
#: SelectSalesOrder.php:613 SelectWorkOrder.php:216 Shipments.php:402
#: Shipments.php:489 Shipt_Select.php:194 StockLocTransferReceive.php:453
#: SupplierPriceList.php:272 SupplierTenderCreate.php:849
@@ -2850,7 +2970,7 @@
msgid "The SQL used to retrieve description of the parent part was"
msgstr ""
-#: BOMs.php:425 ConfirmDispatch_Invoice.php:1041 CounterReturns.php:1058
+#: BOMs.php:425 ConfirmDispatch_Invoice.php:1045 CounterReturns.php:1058
#: CounterSales.php:1478 Credit_Invoice.php:779 Credit_Invoice.php:807
#: SelectCreditItems.php:1487 StockClone.php:842 StockClone.php:844
#: Stocks.php:1129 Stocks.php:1131 api/api_debtortransactions.php:753
@@ -2899,7 +3019,7 @@
#: BOMs.php:555 BOMs.php:686 Contracts.php:876 FixedAssetRegister.php:89
#: InventoryQuantities.php:247 Locations.php:350 MRP.php:562 MRP.php:595
-#: NoSalesItems.php:185 PDFOrdersInvoiced.php:319 PDFOrderStatus.php:288
+#: NoSalesItems.php:185 PDFOrdersInvoiced.php:293 PDFOrderStatus.php:288
#: ReorderLevelLocation.php:154 ReorderLevel.php:290 ReorderLevel.php:299
#: StockCounts.php:156 StockReorderLevel.php:56 StockSerialItemResearch.php:80
#: StockStatus.php:86 StockStatus.php:91 SupplierTenderCreate.php:135
@@ -3012,7 +3132,7 @@
#: COGSGLPostings.php:92 COGSGLPostings.php:197 COGSGLPostings.php:273
#: CustomerBranches.php:386 SalesGLPostings.php:115 SalesGLPostings.php:230
-#: SalesGLPostings.php:315 SalesInquiry.php:834 SalesInquiry.php:852
+#: SalesGLPostings.php:315 SalesInquiry.php:838 SalesInquiry.php:856
msgid "Area"
msgstr ""
@@ -3020,8 +3140,8 @@
#: POReport.php:496 POReport.php:532 POReport.php:740 POReport.php:1272
#: POReport.php:1299 POReport.php:1434 POReport.php:1628
#: SalesGLPostings.php:116 SalesGLPostings.php:231 SalesGLPostings.php:337
-#: SalesInquiry.php:770 SalesInquiry.php:805 SalesInquiry.php:972
-#: SalesInquiry.php:1222
+#: SalesInquiry.php:774 SalesInquiry.php:809 SalesInquiry.php:976
+#: SalesInquiry.php:1233
msgid "Stock Category"
msgstr ""
@@ -3029,7 +3149,7 @@
#: Customers.php:496 Customers.php:838 Customers.php:843 DiscountMatrix.php:97
#: DiscountMatrix.php:161 PricesByCost.php:268 Prices.php:221
#: SalesAnalRepts.php:35 SalesAnalRepts.php:37 SalesGLPostings.php:117
-#: SalesGLPostings.php:232 SalesGLPostings.php:363 SelectOrderItems.php:747
+#: SalesGLPostings.php:232 SalesGLPostings.php:363 SelectOrderItems.php:739
#: api/api_xml-rpc.php:979 api/api_xml-rpc.php:1022
msgid "Sales Type"
msgstr ""
@@ -3043,8 +3163,8 @@
msgid "Are you sure you wish to delete this COGS GL posting record?"
msgstr ""
-#: COGSGLPostings.php:200 CustomerReceipt.php:1057 GLJournal.php:387
-#: GLTransInquiry.php:44 Payments.php:1089 SupplierTransInquiry.php:172
+#: COGSGLPostings.php:200 CustomerReceipt.php:1061 GLJournal.php:387
+#: GLTransInquiry.php:44 Payments.php:1093 SupplierTransInquiry.php:172
#: TaxAuthorities.php:148 TaxAuthorities.php:149
msgid "GL Account"
msgstr ""
@@ -3061,7 +3181,7 @@
#: COGSGLPostings.php:316 Customers.php:496 Customers.php:843
#: EDIProcessOrders.php:386 PDFCustomerList.php:334 PDFPriceList.php:16
#: PDFPriceList.php:125 PDFPriceList.php:249 PricesBasedOnMarkUp.php:226
-#: PricesByCost.php:268 SalesGLPostings.php:363 SelectOrderItems.php:747
+#: PricesByCost.php:268 SalesGLPostings.php:363 SelectOrderItems.php:739
#: SuppPriceList.php:138 SuppPriceList.php:251
msgid "Price List"
msgstr ""
@@ -3070,7 +3190,7 @@
msgid "Post to GL account"
msgstr ""
-#: CompanyPreferences.php:7 includes/MainMenuLinksArray.php:427
+#: CompanyPreferences.php:7 includes/MainMenuLinksArray.php:431
msgid "Company Preferences"
msgstr ""
@@ -3078,7 +3198,7 @@
msgid "The company name must be entered and be fifty characters or less long"
msgstr ""
-#: CompanyPreferences.php:39 Suppliers.php:375
+#: CompanyPreferences.php:39 Suppliers.php:375 Z_ImportSuppliers.php:177
msgid "The email address is not correctly formed"
msgstr ""
@@ -3334,14 +3454,14 @@
"Only balance sheet general ledger accounts can be selected."
msgstr ""
-#: CompanyPreferences.php:470 ConfirmDispatch_Invoice.php:648
-#: ConfirmDispatch_Invoice.php:1687 Credit_Invoice.php:1563
+#: CompanyPreferences.php:470 ConfirmDispatch_Invoice.php:652
+#: ConfirmDispatch_Invoice.php:1691 Credit_Invoice.php:1563
#: FixedAssetItems.php:127 FixedAssetItems.php:652 GLBudgets.php:240
#: GLTags.php:68 GoodsReceived.php:257 GoodsReceived.php:263
#: GoodsReceived.php:270 GoodsReceived.php:752 ImportBankTransAnalysis.php:154
#: ImportBankTransAnalysis.php:185 InternalStockRequestAuthorisation.php:106
#: InternalStockRequestFulfill.php:361 InternalStockRequest.php:249
-#: MRPCalendar.php:315 Payments.php:940 PcAuthorizeExpenses.php:108
+#: MRPCalendar.php:315 Payments.php:944 PcAuthorizeExpenses.php:108
#: PcAuthorizeExpenses.php:293 PO_AuthoriseMyOrders.php:142
#: PricesByCost.php:223 PurchData.php:758 ReorderLevelLocation.php:130
#: SecurityTokens.php:97 SelectCreditItems.php:957 SellThroughSupport.php:476
@@ -3426,49 +3546,49 @@
"order first from the delivery details screen click on Confirm for invoicing"
msgstr ""
-#: ConfirmDispatch_Invoice.php:88 OrderDetails.php:50
+#: ConfirmDispatch_Invoice.php:92 OrderDetails.php:50
#: RecurringSalesOrders.php:76 SelectOrderItems.php:136
#: includes/PO_ReadInOrder.inc:60
msgid "The order cannot be retrieved because"
msgstr ""
-#: ConfirmDispatch_Invoice.php:89
+#: ConfirmDispatch_Invoice.php:93
msgid "The SQL to get the order header was"
msgstr ""
-#: ConfirmDispatch_Invoice.php:166 Credit_Invoice.php:137 OrderDetails.php:152
+#: ConfirmDispatch_Invoice.php:170 Credit_Invoice.php:137 OrderDetails.php:152
#: RecurringSalesOrders.php:135 SelectOrderItems.php:229
msgid "The line items of the order cannot be retrieved because"
msgstr ""
-#: ConfirmDispatch_Invoice.php:207
+#: ConfirmDispatch_Invoice.php:211
msgid ""
"There are no ordered items with a quantity left to deliver. There is nothing "
"left to invoice"
msgstr ""
-#: ConfirmDispatch_Invoice.php:217
+#: ConfirmDispatch_Invoice.php:221
msgid "This order item could not be retrieved. Please select another order"
msgstr ""
-#: ConfirmDispatch_Invoice.php:264
+#: ConfirmDispatch_Invoice.php:268
msgid "Confirm Invoice"
msgstr ""
-#: ConfirmDispatch_Invoice.php:265
+#: ConfirmDispatch_Invoice.php:269
msgid "Confirm Dispatch and Invoice"
msgstr ""
-#: ConfirmDispatch_Invoice.php:268 Contracts.php:778 CustLoginSetup.php:32
+#: ConfirmDispatch_Invoice.php:272 Contracts.php:778 CustLoginSetup.php:32
#: CustomerAllocations.php:331 CustomerBranches.php:378
#: CustomerBranches.php:557 CustomerBranches.php:604 CustomerInquiry.php:130
-#: CustomerPurchases.php:31 CustomerReceipt.php:932 CustomerReceipt.php:988
-#: CustomerReceipt.php:1136 Customers.php:24 Customers.php:331
+#: CustomerPurchases.php:31 CustomerReceipt.php:936 CustomerReceipt.php:992
+#: CustomerReceipt.php:1140 Customers.php:24 Customers.php:331
#: CustomerTransInquiry.php:107 DeliveryDetails.php:850 FTP_RadioBeacon.php:51
-#: PDFOrdersInvoiced.php:315 PDFOrderStatus.php:285 PricesByCost.php:154
-#: SalesGraph.php:185 SelectCompletedOrder.php:606 SelectContract.php:145
+#: PDFOrdersInvoiced.php:289 PDFOrderStatus.php:285 PricesByCost.php:154
+#: SalesGraph.php:185 SelectCompletedOrder.php:556 SelectContract.php:145
#: SelectCreditItems.php:242 SelectCustomer.php:24 SelectCustomer.php:210
-#: SelectOrderItems.php:644 SelectRecurringSalesOrder.php:91
+#: SelectOrderItems.php:636 SelectRecurringSalesOrder.php:91
#: SelectSalesOrder.php:854 SelectSalesOrder.php:871
#: SellThroughSupport.php:262 StockLocMovements.php:92 StockMovements.php:99
#: includes/PDFAgedDebtorsPageHeader.inc:48
@@ -3483,34 +3603,34 @@
msgid "Customer"
msgstr ""
-#: ConfirmDispatch_Invoice.php:268 CustEDISetup.php:94 Customers.php:442
+#: ConfirmDispatch_Invoice.php:272 CustEDISetup.php:94 Customers.php:442
#: Customers.php:711 Customers.php:749 Deliver...
[truncated message content] |
|
From: <rc...@us...> - 2013-12-04 15:18:01
|
Revision: 6473
http://sourceforge.net/p/web-erp/reponame/6473
Author: rchacon
Date: 2013-12-04 15:17:58 +0000 (Wed, 04 Dec 2013)
Log Message:
-----------
Spanish translation adjustments and update option name.
Modified Paths:
--------------
trunk/doc/Manual/ManualGettingStarted.html
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
Modified: trunk/doc/Manual/ManualGettingStarted.html
===================================================================
--- trunk/doc/Manual/ManualGettingStarted.html 2013-12-04 07:02:42 UTC (rev 6472)
+++ trunk/doc/Manual/ManualGettingStarted.html 2013-12-04 15:17:58 UTC (rev 6473)
@@ -321,7 +321,7 @@
<h2>Configuration Parameters</h2>
-<p>In versions prior to version 3.0, configuration parameters were stored under the config.php file which required manual editing of the system parameters. Since version 3.0 a new screen for System Parameters was developed that allows all the system wide configuration variables to be set. These are now stored in the database allowing for upgrades without then having to re-edit the config.php file. The system parameters screen is at Main Menu > Setup > Configuration Settings. Each of these settings should be reviewed in detail. Notes describing the function of each variable are shown along side it.</p>
+<p>In versions prior to version 3.0, configuration parameters were stored under the config.php file which required manual editing of the system parameters. Since version 3.0 a new screen for System Parameters was developed that allows all the system wide configuration variables to be set. These are now stored in the database allowing for upgrades without then having to re-edit the config.php file. The system parameters screen is at Main Menu > Setup > <a href="../../SystemParameters.php" target="_blank">System Parameters</a>. Each of these settings should be reviewed in detail. Notes describing the function of each variable are shown along side it.</p>
<p>There is additional information on installation in webERP/doc/INSTALL.txt</p>
<div class="floatright">
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 2013-12-04 07:02:42 UTC (rev 6472)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2013-12-04 15:17:58 UTC (rev 6473)
@@ -8,7 +8,7 @@
"Project-Id-Version: WebERP 4.081\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-12-01 20:34+1300\n"
-"PO-Revision-Date: 2013-11-29 12:04-0600\n"
+"PO-Revision-Date: 2013-12-04 08:00-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: TecnoSoluciones.com <web...@te...>\n"
"Language: es_ES\n"
@@ -37893,7 +37893,6 @@
msgstr "Europa del Este Ruso Japonés Coreano Vietnamita Árabe Hebreo Tailandés"
#: WWW_Users.php:29 includes/MainMenuLinksArray.php:433
-#, fuzzy
msgid "Users Maintenance"
msgstr "Administrar usuarios"
|
|
From: <rc...@us...> - 2013-12-04 17:56:13
|
Revision: 6475
http://sourceforge.net/p/web-erp/reponame/6475
Author: rchacon
Date: 2013-12-04 17:56:10 +0000 (Wed, 04 Dec 2013)
Log Message:
-----------
Includes the observation that the default language is not included in the drop-down menu list of "Languages to Maintain Translations for Item Descriptions". Uniforming Login.php.
Modified Paths:
--------------
trunk/SystemParameters.php
trunk/includes/Login.php
trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
Modified: trunk/SystemParameters.php
===================================================================
--- trunk/SystemParameters.php 2013-12-04 15:48:08 UTC (rev 6474)
+++ trunk/SystemParameters.php 2013-12-04 17:56:10 UTC (rev 6475)
@@ -475,11 +475,9 @@
}
}
echo '</select></td>
- <td>' . _('Select all the languages for which item description translations are to be maintained.') . '</td>
+ <td>' . _('Select the languages in which translations of the item description will be maintained. The default language is excluded.') . '</td>
</tr>';
-
-
//'RequirePickingNote'
echo '<tr style="outline: 1px solid"><td>' . _('A picking note must be produced before an order can be delivered') . ':</td>
<td><select name="X_RequirePickingNote">
Modified: trunk/includes/Login.php
===================================================================
--- trunk/includes/Login.php 2013-12-04 15:48:08 UTC (rev 6474)
+++ trunk/includes/Login.php 2013-12-04 17:56:10 UTC (rev 6475)
@@ -53,7 +53,7 @@
echo '<input type="hidden" name="CompanyNameField" value="' . $CompanyNameField . '" />';
} else {
// Show selection box ($AllowCompanySelectionBox == 'ShowSelectionBox')
- echo _('Company:') . '<br />';
+ echo _('Company') . ':<br />';
echo '<select name="CompanyNameField">';
foreach ($CompanyList as $key => $CompanyEntry){
if (is_dir('companies/' . $CompanyEntry['database']) ){
@@ -76,7 +76,7 @@
echo _('Company') . '<input type="text" name="CompanyNameField" autofocus="autofocus" required="required" value="' . $DefaultCompany . '" />';
} else {
// Show selection box ($AllowCompanySelectionBox == 'ShowSelectionBox')
- echo _('Company:') . '<br />';
+ echo _('Company') . ':<br />';
echo '<select name="CompanyNameField">';
$Companies = scandir('companies/', 0);
foreach ($Companies as $CompanyEntry){
@@ -97,7 +97,7 @@
<span><?php echo _('User name'); ?>:</span><br />
<input type="text" name="UserNameEntryField" required="required" autofocus="autofocus" maxlength="20" placeholder="<?php echo _('User name'); ?>" /><br />
<span><?php echo _('Password'); ?>:</span><br />
- <input type="password" required="required" name="Password" placeholder="<?php echo _('password'); ?>" /><br />
+ <input type="password" required="required" name="Password" placeholder="<?php echo _('Password'); ?>" /><br />
<div id="demo_text">
<?php
if (isset($demo_text)){
Modified: trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot
===================================================================
--- trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot 2013-12-04 15:48:08 UTC (rev 6474)
+++ trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot 2013-12-04 17:56:10 UTC (rev 6475)
@@ -29967,7 +29967,7 @@
msgstr ""
#: SystemParameters.php:478
-msgid "Select all the languages for which item description translations are to be maintained."
+msgid "Select the languages in which translations of the item description will be maintained. The default language is excluded."
msgstr ""
#: SystemParameters.php:484
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 2013-12-04 15:48:08 UTC (rev 6474)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2013-12-04 17:56:10 UTC (rev 6475)
@@ -8,7 +8,7 @@
"Project-Id-Version: WebERP 4.081\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-12-01 20:34+1300\n"
-"PO-Revision-Date: 2013-12-04 09:45-0600\n"
+"PO-Revision-Date: 2013-12-04 11:50-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: TecnoSoluciones.com <web...@te...>\n"
"Language: es_ES\n"
@@ -34556,11 +34556,11 @@
#: SystemParameters.php:478
msgid ""
-"Select all the languages for which item description translations are to be "
-"maintained."
+"Select the languages in which translations of the item description will be "
+"maintained. The default language is excluded."
msgstr ""
-"Seleccionar todos los idiomas en los cuales se mantendrán las descripciones "
-"de artículos."
+"Seleccione los idiomas en los cuales se mantendrá traducciones de las "
+"descripciones de los artículos. Se excluye el idioma predeterminado."
#: SystemParameters.php:484
msgid "A picking note must be produced before an order can be delivered"
@@ -43332,9 +43332,8 @@
msgstr "Compañía"
#: includes/Login.php:56 includes/Login.php:79
-#, fuzzy
msgid "Company:"
-msgstr "Compañía"
+msgstr "Compañía:"
#: includes/Login.php:100
#, fuzzy
|
|
From: <rc...@us...> - 2013-12-06 17:09:42
|
Revision: 6480
http://sourceforge.net/p/web-erp/reponame/6480
Author: rchacon
Date: 2013-12-06 17:09:39 +0000 (Fri, 06 Dec 2013)
Log Message:
-----------
Translation adjustments.
Modified Paths:
--------------
trunk/UserSettings.php
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
Modified: trunk/UserSettings.php
===================================================================
--- trunk/UserSettings.php 2013-12-04 21:35:35 UTC (rev 6479)
+++ trunk/UserSettings.php 2013-12-06 17:09:39 UTC (rev 6480)
@@ -93,8 +93,7 @@
$Theme = $_SESSION['Theme'];
$_SESSION['Language'] = trim($_POST['Language']);
$_SESSION['PDFLanguage'] = $_POST['PDFLanguage'];
- include ('includes/LanguageSetup.php');
-
+ include ('includes/LanguageSetup.php'); // After last changes in LanguageSetup.php, is it required to update?
}
}
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 2013-12-04 21:35:35 UTC (rev 6479)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2013-12-06 17:09:39 UTC (rev 6480)
@@ -8,7 +8,7 @@
"Project-Id-Version: WebERP 4.081\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-12-01 20:34+1300\n"
-"PO-Revision-Date: 2013-12-04 15:10-0600\n"
+"PO-Revision-Date: 2013-12-06 09:56-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: TecnoSoluciones.com <web...@te...>\n"
"Language: es_ES\n"
@@ -1314,7 +1314,7 @@
#: PO_AuthorisationLevels.php:173 PO_AuthorisationLevels.php:176
#: UserSettings.php:113 includes/UserLogin.php:134
msgid "User ID"
-msgstr "ID de Usuario"
+msgstr "ID de usuario"
#: AuditTrail.php:55 AuditTrail.php:69 ContractBOM.php:306
#: CounterReturns.php:1613 CounterReturns.php:1616 CounterSales.php:2223
@@ -1744,7 +1744,7 @@
#: BankAccountUsers.php:162 PcTabs.php:206 PcTabs.php:307
#: PO_AuthorisationLevels.php:125 SMTPServer.php:101 UserSettings.php:118
msgid "User Name"
-msgstr "Nombre usuario"
+msgstr "Nombre de usuario"
#: BankAccountUsers.php:178
#, fuzzy, php-format
@@ -28222,9 +28222,8 @@
#: ../webSHOP/CreditCardPayPalPro.php:206 ../webSHOP/index.php:14
#: ../webSHOP/ItemDetails.php:22 ../webSHOP/Register.php:494
#: ../webSHOP/includes/footer.php:6 ../webSHOP/includes/InfoLinks.php:6
-#, fuzzy
msgid "Terms and Conditions"
-msgstr "Artículo y Descripción"
+msgstr "Términos y condiciones"
#: ShopParameters.php:261
msgid ""
@@ -28237,9 +28236,8 @@
#: ../webSHOP/CreditCardPayPalPro.php:210 ../webSHOP/index.php:18
#: ../webSHOP/ItemDetails.php:26 ../webSHOP/Register.php:498
#: ../webSHOP/includes/footer.php:9 ../webSHOP/includes/InfoLinks.php:18
-#, fuzzy
msgid "About Us"
-msgstr "No Usado"
+msgstr "¿Quiénes somos?"
#: ShopParameters.php:267
msgid ""
@@ -28260,9 +28258,8 @@
#: ShopParameters.php:276 ../webSHOP/Checkout.php:282 ../webSHOP/index.php:26
#: ../webSHOP/ItemDetails.php:34 ../webSHOP/Register.php:510
#: ../webSHOP/includes/footer.php:8 ../webSHOP/includes/InfoLinks.php:14
-#, fuzzy
msgid "Freight Policy"
-msgstr "Costo de Transporte"
+msgstr "Política de envíos"
#: ShopParameters.php:278
msgid ""
@@ -34669,7 +34666,7 @@
#: SystemParameters.php:543
msgid "Number of working days on a week"
-msgstr "Número de días laborales en una semana"
+msgstr "Cantidad de días laborales en una semana"
#: SystemParameters.php:548
msgid "Dispatch Cut-Off Time"
@@ -34785,7 +34782,7 @@
#: SystemParameters.php:618 Z_ImportDebtors.php:653
msgid "Create Debtor Codes Automatically"
-msgstr "Crear Códigos de Deudor Automáticamente"
+msgstr "Crear códigos de deudor automáticamente"
#: SystemParameters.php:629
msgid ""
@@ -36269,7 +36266,7 @@
#: UnitsOfMeasure.php:6
msgid "Units Of Measure"
-msgstr "Unidades De Medida"
+msgstr "Unidades de medida"
#: UnitsOfMeasure.php:30
msgid "The unit of measure cannot contain any of the illegal characters"
@@ -36562,7 +36559,7 @@
#: UserSettings.php:6 UserSettings.php:10
msgid "User Settings"
-msgstr "Configuración del Usuario"
+msgstr "Configuración de usuario"
#: UserSettings.php:12
msgid "Latin Western Languages - Times"
@@ -36603,7 +36600,7 @@
#: UserSettings.php:68 UserSettings.php:84 WWW_Users.php:210
#: ../webSHOP/Register.php:375
msgid "The SQL that was used to update the user and failed was"
-msgstr "EL SQL fallo:"
+msgstr "El SQL que se usó para actualizar el usuario y falló era"
#: UserSettings.php:72 UserSettings.php:88
msgid "The user settings have been updated"
@@ -36615,7 +36612,7 @@
#: UserSettings.php:123
msgid "Maximum Number of Records to Display"
-msgstr "Número máximo de registros a mostrar"
+msgstr "Cantidad máxima de registros a mostrar"
#: UserSettings.php:124
msgid "Must be postive integer"
@@ -36623,7 +36620,7 @@
#: UserSettings.php:174
msgid "New Password"
-msgstr "Nueva Contraseña"
+msgstr "Contraseña nueva"
#: UserSettings.php:175 UserSettings.php:179
msgid "Must be more than 5 characters and cannot be as same as userid"
@@ -36631,15 +36628,15 @@
#: UserSettings.php:178 ../webSHOP/Register.php:617
msgid "Confirm Password"
-msgstr "Confirme Contraseña"
+msgstr "Confirme contraseña"
#: UserSettings.php:182
msgid "If you leave the password boxes empty your password will not change"
-msgstr "Si deja vacías los campos de contraseña su contraseña no cambiará"
+msgstr "Si deja los campos de contraseña vacíos, su contraseña no cambiará"
#: UserSettings.php:202 WWW_Users.php:678
msgid "PDF Language Support"
-msgstr "Soporte de Idiomas PDF"
+msgstr "Soporte de idioma para PDF"
#: WhereUsedInquiry.php:6 includes/MainMenuLinksArray.php:287
msgid "Where Used Inquiry"
@@ -48484,9 +48481,8 @@
#: ../webSHOP/CreditCardPayPalPro.php:214 ../webSHOP/index.php:22
#: ../webSHOP/ItemDetails.php:30 ../webSHOP/Register.php:502
#: ../webSHOP/includes/footer.php:7 ../webSHOP/includes/InfoLinks.php:10
-#, fuzzy
msgid "Privacy Policy"
-msgstr "Costo de Transporte"
+msgstr "Política de privacidad"
#: ../webSHOP/Checkout.php:278 ../webSHOP/CreditCardPayFlowPro.php:211
#: ../webSHOP/CreditCardPayPalPro.php:218 ../webSHOP/index.php:30
@@ -49076,9 +49072,8 @@
msgstr "Buscando:"
#: ../webSHOP/index.php:138
-#, fuzzy
msgid "Featured Items"
-msgstr "Borrar"
+msgstr "Artículos destacados"
#: ../webSHOP/index.php:160
#, fuzzy
@@ -49539,9 +49534,8 @@
msgstr "Tipo de Stock"
#: ../webSHOP/includes/Functions.php:64 ../webSHOP/includes/header.php:227
-#, fuzzy
msgid "View Order"
-msgstr "Nuevo Pedido"
+msgstr "Ver pedido"
#: ../webSHOP/includes/Functions.php:278
msgid "Sending the PayPal Request"
@@ -49623,9 +49617,8 @@
msgstr "Sumario"
#: ../webSHOP/includes/header.php:226
-#, fuzzy
msgid "Home"
-msgstr "Volumen"
+msgstr "Inicio"
#: ../webSHOP/includes/header.php:231
msgid "Logged in as"
|
|
From: <dai...@us...> - 2013-12-07 05:39:16
|
Revision: 6481
http://sourceforge.net/p/web-erp/reponame/6481
Author: daintree
Date: 2013-12-07 05:39:13 +0000 (Sat, 07 Dec 2013)
Log Message:
-----------
Phil: Fixed htmlMimeEmail.inc following Tims submission - removed & value by reference errors
Modified Paths:
--------------
trunk/PDFStockCheckComparison.php
trunk/doc/Change.log
trunk/includes/PDFStockComparisonPageHeader.inc
trunk/includes/htmlMimeMail.php
Modified: trunk/PDFStockCheckComparison.php
===================================================================
--- trunk/PDFStockCheckComparison.php 2013-12-06 17:09:39 UTC (rev 6480)
+++ trunk/PDFStockCheckComparison.php 2013-12-07 05:39:13 UTC (rev 6481)
@@ -210,7 +210,10 @@
include('includes/footer.inc');
exit;
}
-
+ $FirstRow = DB_fetch_array($CheckedItems);
+ $LocationName = $FirstRow['locationname'];
+ DB_data_seek($CheckedItems,0);
+
include ('includes/PDFStockComparisonPageHeader.inc');
$Location = '';
@@ -245,13 +248,7 @@
$YPos -=$line_height;
}
- $YPos -=$line_height;
- $FontSize=8;
-
- $LeftOvers = $pdf->addTextWrap($Left_Margin,$YPos,120,$FontSize,$CheckItemRow['stockid'], 'left');
- $LeftOvers = $pdf->addTextWrap(135,$YPos,180,$FontSize,$CheckItemRow['description'], 'left');
- $LeftOvers = $pdf->addTextWrap(315,$YPos,60,$FontSize,locale_number_format($CheckItemRow['qoh'],$CheckItemRow['decimalplaces']), 'right');
-
+
$SQL = "SELECT qtycounted,
reference
FROM stockcounts
@@ -272,17 +269,22 @@
include('includes/footer.inc');
exit;
}
+ if ($CheckItemRow['qoh']!=0 OR DB_num_rows($Counts)>0) {
+ $YPos -=$line_height;
+ $FontSize=8;
+ $LeftOvers = $pdf->addTextWrap($Left_Margin,$YPos,120,$FontSize,$CheckItemRow['stockid'], 'left');
+ $LeftOvers = $pdf->addTextWrap(135,$YPos,180,$FontSize,$CheckItemRow['description'], 'left');
+ $LeftOvers = $pdf->addTextWrap(315,$YPos,60,$FontSize,locale_number_format($CheckItemRow['qoh'],$CheckItemRow['decimalplaces']), 'right');
+ }
-
- if (DB_num_rows($Counts)==0){
+ if (DB_num_rows($Counts)==0 AND $CheckItemRow['qoh']!=0){
$LeftOvers = $pdf->addTextWrap(380, $YPos,160, $FontSize, _('No counts entered'), 'left');
if ($_POST['ZeroCounts']=='Adjust'){
$LeftOvers = $pdf->addTextWrap(485, $YPos, 60, $FontSize, locale_number_format(-($CheckItemRow['qoh']),$CheckItemRow['decimalplaces']), 'right');
}
- } else {
+ } elseif (DB_num_rows($Counts)>0) {
$TotalCount =0;
while ($CountRow=DB_fetch_array($Counts,$db)){
-
$LeftOvers = $pdf->addTextWrap(375, $YPos, 60, $FontSize, locale_number_format(($CountRow['qtycounted']),$CheckItemRow['decimalplaces']), 'right');
$LeftOvers = $pdf->addTextWrap(440, $YPos, 100, $FontSize, $CountRow['reference'], 'left');
$TotalCount += $CountRow['qtycounted'];
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2013-12-06 17:09:39 UTC (rev 6480)
+++ trunk/doc/Change.log 2013-12-07 05:39:13 UTC (rev 6481)
@@ -1,7 +1,9 @@
webERP Change Log
-4/12/2013 Exson: Alter table stockmoves reference to varchar(100) to make it can meet mysql strict mode requirements when data is more than original 40.
-2/12/2013 Exson: Fixed the typo in WWW_Users.php. Reported by Thumb.
-1/12/2013 Exson: Fixed country Chinese sql for installation failure.
+
+7/12/13 Phil: Fixed htmlMimeEmail.inc following Tim's submission - removed & value by reference errors
+4/12/13 Exson: Alter table stockmoves reference to varchar(100) to make it can meet mysql strict mode requirements when data is more than original 40.
+2/12/13 Exson: Fixed the typo in WWW_Users.php. Reported by Thumb.
+1/12/13 Exson: Fixed country Chinese sql for installation failure.
1/12/13 CQZ: Correct Chinese translation error dispatch cut_off time.
1/12/13 Release 4.11.2
Modified: trunk/includes/PDFStockComparisonPageHeader.inc
===================================================================
--- trunk/includes/PDFStockComparisonPageHeader.inc 2013-12-06 17:09:39 UTC (rev 6480)
+++ trunk/includes/PDFStockComparisonPageHeader.inc 2013-12-07 05:39:13 UTC (rev 6481)
@@ -13,7 +13,7 @@
$YPos -=15;
-$LeftOvers = $pdf->addTextWrap($Left_Margin,$YPos,550,$FontSize, _('Stock Check Comparison') );
+$LeftOvers = $pdf->addTextWrap($Left_Margin,$YPos,550,$FontSize, _('Stock Check Comparison at') . ' ' . $LocationName );
$YPos -=15;
@@ -38,4 +38,4 @@
$FontSize=10;
$YPos -=(2*$line_height);
-?>
\ No newline at end of file
+?>
Modified: trunk/includes/htmlMimeMail.php
===================================================================
--- trunk/includes/htmlMimeMail.php 2013-12-06 17:09:39 UTC (rev 6480)
+++ trunk/includes/htmlMimeMail.php 2013-12-07 05:39:13 UTC (rev 6481)
@@ -396,7 +396,7 @@
/**
* Adds a text subpart to a mime_part object
*/
- function _addTextPart(&$obj, $text) // // FIXED PHP & PEAR LIBRARY ERROR - ONLY VARIABLE REFERENCES SHOULD BE RETURNED BY REFERENCE
+ function _addTextPart($obj, $text) // // FIXED PHP & PEAR LIBRARY ERROR - ONLY VARIABLE REFERENCES SHOULD BE RETURNED BY REFERENCE
{
$params['content_type'] = 'text/plain';
$params['encoding'] = $this->build_params['text_encoding'];
@@ -411,7 +411,7 @@
/**
* Adds a html subpart to a mime_part object
*/
- function _addHtmlPart(&$obj) // // FIXED PHP & PEAR LIBRARY ERROR - ONLY VARIABLE REFERENCES SHOULD BE RETURNED BY REFERENCE
+ function _addHtmlPart($obj) // // FIXED PHP & PEAR LIBRARY ERROR - ONLY VARIABLE REFERENCES SHOULD BE RETURNED BY REFERENCE
{
$params['content_type'] = 'text/html';
$params['encoding'] = $this->build_params['html_encoding'];
@@ -435,7 +435,7 @@
/**
* Adds an alternative part to a mime_part object
*/
- function _addAlternativePart(&$obj) // // FIXED PHP & PEAR LIBRARY ERROR - ONLY VARIABLE REFERENCES SHOULD BE RETURNED BY REFERENCE
+ function _addAlternativePart($obj) // // FIXED PHP & PEAR LIBRARY ERROR - ONLY VARIABLE REFERENCES SHOULD BE RETURNED BY REFERENCE
{
$params['content_type'] = 'multipart/alternative';
if (is_object($obj)) {
@@ -448,7 +448,7 @@
/**
* Adds a html subpart to a mime_part object
*/
- function _addRelatedPart(&$obj) // // FIXED PHP & PEAR LIBRARY ERROR - ONLY VARIABLE REFERENCES SHOULD BE RETURNED BY REFERENCE
+ function _addRelatedPart($obj) // // FIXED PHP & PEAR LIBRARY ERROR - ONLY VARIABLE REFERENCES SHOULD BE RETURNED BY REFERENCE
{
$params['content_type'] = 'multipart/related';
if (is_object($obj)) {
@@ -461,7 +461,7 @@
/**
* Adds an html image subpart to a mime_part object
*/
- function _addHtmlImagePart(&$obj, $value) // // FIXED PHP & PEAR LIBRARY ERROR - ONLY VARIABLE REFERENCES SHOULD BE RETURNED BY REFERENCE
+ function _addHtmlImagePart($obj, $value) // // FIXED PHP & PEAR LIBRARY ERROR - ONLY VARIABLE REFERENCES SHOULD BE RETURNED BY REFERENCE
{
$params['content_type'] = $value['c_type'];
$params['encoding'] = 'base64';
@@ -474,7 +474,7 @@
/**
* Adds an attachment subpart to a mime_part object
*/
- function _addAttachmentPart(&$obj, $value) // // FIXED PHP & PEAR LIBRARY ERROR - ONLY VARIABLE REFERENCES SHOULD BE RETURNED BY REFERENCE
+ function _addAttachmentPart($obj, $value) // // FIXED PHP & PEAR LIBRARY ERROR - ONLY VARIABLE REFERENCES SHOULD BE RETURNED BY REFERENCE
{
$params['content_type'] = $value['c_type'];
$params['encoding'] = $value['encoding'];
@@ -526,11 +526,11 @@
switch (true) {
case $text AND !$attachments:
- $message = &$this->_addTextPart($null, $this->text);
+ $message = $this->_addTextPart($null, $this->text);
break;
case !$text AND $attachments AND !$html:
- $message = &$this->_addMixedPart();
+ $message = $this->_addMixedPart();
for ($i=0; $i<count($this->attachments); $i++) {
$this->_addAttachmentPart($message, $this->attachments[$i]);
@@ -538,7 +538,7 @@
break;
case $text AND $attachments:
- $message = &$this->_addMixedPart();
+ $message = $this->_addMixedPart();
$this->_addTextPart($message, $this->text);
for ($i=0; $i<count($this->attachments); $i++) {
@@ -548,22 +548,22 @@
case $html AND !$attachments AND !$html_images:
if (!is_null($this->html_text)) {
- $message = &$this->_addAlternativePart($null);
+ $message = $this->_addAlternativePart($null);
$this->_addTextPart($message, $this->html_text);
$this->_addHtmlPart($message);
} else {
- $message = &$this->_addHtmlPart($null);
+ $message = $this->_addHtmlPart($null);
}
break;
case $html AND !$attachments AND $html_images:
if (!is_null($this->html_text)) {
- $message = &$this->_addAlternativePart($null);
+ $message = $this->_addAlternativePart($null);
$this->_addTextPart($message, $this->html_text);
- $related = &$this->_addRelatedPart($message);
+ $related = $this->_addRelatedPart($message);
} else {
- $message = &$this->_addRelatedPart($null);
- $related = &$message;
+ $message = $this->_addRelatedPart($null);
+ $related = $message;
}
$this->_addHtmlPart($related);
for ($i=0; $i<count($this->html_images); $i++) {
@@ -572,9 +572,9 @@
break;
case $html AND $attachments AND !$html_images:
- $message = &$this->_addMixedPart();
+ $message = $this->_addMixedPart();
if (!is_null($this->html_text)) {
- $alt = &$this->_addAlternativePart($message);
+ $alt = $this->_addAlternativePart($message);
$this->_addTextPart($alt, $this->html_text);
$this->_addHtmlPart($alt);
} else {
@@ -586,13 +586,13 @@
break;
case $html AND $attachments AND $html_images:
- $message = &$this->_addMixedPart();
+ $message = $this->_addMixedPart();
if (!is_null($this->html_text)) {
- $alt = &$this->_addAlternativePart($message);
+ $alt = $this->_addAlternativePart($message);
$this->_addTextPart($alt, $this->html_text);
- $rel = &$this->_addRelatedPart($alt);
+ $rel = $this->_addRelatedPart($alt);
} else {
- $rel = &$this->_addRelatedPart($message);
+ $rel = $this->_addRelatedPart($message);
}
$this->_addHtmlPart($rel);
for ($i=0; $i<count($this->html_images); $i++) {
@@ -688,7 +688,7 @@
case 'smtp':
require_once(dirname(__FILE__) . '/smtp.php');
require_once(dirname(__FILE__) . '/RFC822.php');
- $smtp = &smtp::connect($this->smtp_params);
+ $smtp = smtp::connect($this->smtp_params);
// Parse recipients argument for internet addresses
foreach ($recipients as $recipient) {
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X