Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[6462] trunk
|
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] |
