From: <dai...@us...> - 2013-08-24 00:18:16
|
Revision: 6288 http://sourceforge.net/p/web-erp/reponame/6288 Author: daintree Date: 2013-08-24 00:18:10 +0000 (Sat, 24 Aug 2013) Log Message: ----------- update DBs Modified Paths: -------------- trunk/CustomerTypes.php trunk/SalesPeople.php trunk/ShopParameters.php trunk/build/make_release.sh 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/weberp-demo.sql trunk/sql/mysql/weberp-new.sql Modified: trunk/CustomerTypes.php =================================================================== --- trunk/CustomerTypes.php 2013-08-22 07:47:44 UTC (rev 6287) +++ trunk/CustomerTypes.php 2013-08-24 00:18:10 UTC (rev 6288) @@ -186,8 +186,8 @@ echo '<br /><table class="selection">'; echo '<tr> - <th>' . _('Type ID') . '</th> - <th>' . _('Type Name') . '</th> + <th class="ascending">' . _('Type ID') . '</th> + <th class="ascending">' . _('Type Name') . '</th> </tr>'; $k=0; //row colour counter @@ -262,7 +262,7 @@ } echo '<tr> <td>' . _('Type Name') . ':</td> - <td><input type="text" name="typename" required="required" title="' . _('The customer type name is required') . '" value="' . $_POST['TypeName'] . '" /></td> + <td><input type="text" name="TypeName" required="required" title="' . _('The customer type name is required') . '" value="' . $_POST['TypeName'] . '" /></td> </tr> </table> <br /> @@ -275,4 +275,4 @@ } // end if user wish to delete include('includes/footer.inc'); -?> \ No newline at end of file +?> Modified: trunk/SalesPeople.php =================================================================== --- trunk/SalesPeople.php 2013-08-22 07:47:44 UTC (rev 6287) +++ trunk/SalesPeople.php 2013-08-24 00:18:10 UTC (rev 6288) @@ -352,6 +352,9 @@ echo '<tr> <td>' . _('Current?') . ':</td> <td><select name="Current">'; + if (!isset($_POST['Current'])){ + $_POST['Current']=1; + } if ($_POST['Current']==1){ echo '<option selected="selected" value="1">' . _('Yes') . '</option>'; } else { @@ -375,4 +378,4 @@ } //end if record deleted no point displaying form to add record include('includes/footer.inc'); -?> \ No newline at end of file +?> Modified: trunk/ShopParameters.php =================================================================== --- trunk/ShopParameters.php 2013-08-22 07:47:44 UTC (rev 6287) +++ trunk/ShopParameters.php 2013-08-24 00:18:10 UTC (rev 6288) @@ -162,7 +162,7 @@ $ErrMsg = _('The shop configuration could not be updated because'); $DbgMsg = _('The SQL that failed was:'); - print_r($SQL); + //print_r($SQL); if (sizeof($SQL) > 0 ) { $result = DB_Txn_Begin($db); @@ -212,34 +212,34 @@ //Shop Name echo '<tr> <td>' . _('Shop Name') . ':</td> - <td><input type="text" name="X_ShopName" required size="40" maxlength="40" value="' . $_SESSION['ShopName'] . '" /></td> + <td><input type="text" name="X_ShopName" required="required" autofocus="autofocus" size="40" maxlength="40" value="' . $_SESSION['ShopName'] . '" /></td> <td>' . _('Enter the name of the shop that will be displayed on all the store pages') . '</td> </tr>'; //Shop Title echo '<tr> <td>' . _('Shop Title') . ':</td> - <td><input type="text" name="X_ShopTitle" required size="40" maxlength="40" value="' . $_SESSION['ShopTitle'] . '" /></td> + <td><input type="text" name="X_ShopTitle" required="required" size="40" maxlength="40" value="' . $_SESSION['ShopTitle'] . '" /></td> <td>' . _('Enter the title of the shop that will be displayed on the main webSHOP page. Useful for SEO purposes.') . '</td> </tr>'; //Shop Manager Email echo '<tr> <td>' . _('Shop Manager Email') . ':</td> - <td><input type="email" name="X_ShopManagerEmail" required size="50" maxlength="50" value="' . $_SESSION['ShopManagerEmail'] . '" /></td> + <td><input type="email" name="X_ShopManagerEmail" required="required" size="50" maxlength="50" value="' . $_SESSION['ShopManagerEmail'] . '" /></td> <td>' . _('Enter the email address of the webSHOP manager.') . '</td> </tr>'; // Shop Customer echo '<tr> <td>' . _('Default Web Shop Customer Acount') . ':</td> - <td><input type="text"size="12" maxlength="10" required name="X_ShopDebtorNo" value="' . $_SESSION['ShopDebtorNo'] . '" /></td> + <td><input type="text"size="12" maxlength="10" required="required" name="X_ShopDebtorNo" value="' . $_SESSION['ShopDebtorNo'] . '" /></td> <td>' . _('Select the customer account that is to be used for the web-store sales') . '</td> </tr>'; // Shop Customer Branch echo '<tr> <td>'._('Default Web Shop Branch Code').':</td> - <td><input type="text" required size="12" maxlength="10" name="X_ShopBranchCode" value="' . $_SESSION['ShopBranchCode'] . '" /></td> + <td><input type="text" required="required" size="12" maxlength="10" name="X_ShopBranchCode" value="' . $_SESSION['ShopBranchCode'] . '" /></td> <td>' . _('The customer branch code that is to be used - a branch of the above custoemr account - for web-store sales') . '</td> </tr>'; @@ -247,30 +247,30 @@ echo '<tr> <td>' . _('Privacy Statement') . ':</td> <td><textarea name="X_ShopPrivacyStatement" rows="8" cols="60">' . stripslashes($_SESSION['ShopPrivacyStatement']) . '</textarea></td> - <td>' . _('This text will appear on the web-store page that spells out the privacy policy of the web-shop') . '</td> + <td>' . _('This text will appear on the web-store page that spells out the privacy policy of the web-shop') . ' ' . _('Enter the raw html without any line breaks') . '</td> </tr>'; //Terms and Conditions echo '<tr> <td>' . _('Terms and Conditions') . ':</td> <td><textarea name="X_ShopTermsConditions" rows="8" cols="60">' . stripslashes($_SESSION['ShopTermsConditions']) . '</textarea></td> - <td>' . _('This text will appear on the web-store page that spells out the terms and conditions associated with sales from the web-shop') . '</td> + <td>' . _('This text will appear on the web-store page that spells out the terms and conditions associated with sales from the web-shop') . ' ' . _('Enter the raw html without any line breaks') . '</td> </tr>'; //About Us echo '<tr> <td>' . _('About Us') . ':</td> <td><textarea name="X_ShopAboutUs" rows="8" cols="60">' . stripslashes($_SESSION['ShopAboutUs']) . '</textarea></td> - <td>' . _('This text will appear on the web-store page that provides information about us to users of the web-store.') . '</td> + <td>' . _('This text will appear on the web-store page that provides information about us to users of the web-store.') . ' ' . _('Enter the raw html without any line breaks') .'</td> </tr>'; echo '<tr> <td>' . _('Contact Us') . ':</td> <td><textarea name="X_ShopContactUs" rows="8" cols="60">' . stripslashes($_SESSION['ShopContactUs']) . '</textarea></td> - <td>' . _('This text will appear on the web-store page that provides contact information to users of the web-store.') . '</td> + <td>' . _('This text will appear on the web-store page that provides contact information to users of the web-store.') . ' ' . _('Enter the raw html without any line breaks') . '</td> </tr>'; //Freight Policy echo '<tr> <td>' . _('Freight Policy') . ':</td> <td><textarea name="X_ShopFreightPolicy" rows="8" cols="60">' . stripslashes($_SESSION['ShopFreightPolicy']) . '</textarea></td> - <td>' . _('This text will appear on the web-store page that spells out the freight policy of the web-shop') . '</td> + <td>' . _('This text will appear on the web-store page that spells out the freight policy of the web-shop') . ' ' . _('Enter the raw html without any line breaks') .'</td> </tr>'; Modified: trunk/build/make_release.sh =================================================================== --- trunk/build/make_release.sh 2013-08-22 07:47:44 UTC (rev 6287) +++ trunk/build/make_release.sh 2013-08-24 00:18:10 UTC (rev 6288) @@ -1,13 +1,13 @@ #! /bin/bash -BASE_DIR=/root/Web-Server/webERP; -OUTPUT_DIR=/root; +BASE_DIR=/var/www/webERP; +OUTPUT_DIR=/home/phil/Documents/webERP; MYSQL_USER=root; MYSQL_PWD=woofwoof; cd $BASE_DIR; -xgettext --no-wrap --from-code=utf-8 --language=PHP -o locale/en_GB.utf8/LC_MESSAGES/messages.pot *php includes/*.php includes/*.inc reportwriter/*.php reportwriter/*.inc reportwriter/forms/*.html reportwriter/admin/*.php reportwriter/admin/*.inc reportwriter/admin/forms/*.html api/*.php ../webshop/*.php ../webshop/includes/*.php +xgettext --no-wrap --from-code=utf-8 --language=PHP -o locale/en_GB.utf8/LC_MESSAGES/messages.pot *php includes/*.php includes/*.inc reportwriter/*.php reportwriter/*.inc reportwriter/forms/*.html reportwriter/admin/*.php reportwriter/admin/*.inc reportwriter/admin/forms/*.html api/*.php ../webSHOP/*.php ../webSHOP/includes/*.php msgmerge -U --backup=off locale/ar_EG.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot msgmerge -U --backup=off locale/cs_CZ.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot 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-08-22 07:47:44 UTC (rev 6287) +++ trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po 2013-08-24 00:18:10 UTC (rev 6288) @@ -7,20 +7,18 @@ msgstr "" "Project-Id-Version: web-erp\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-07-06 15:49+1200\n" +"POT-Creation-Date: 2013-08-24 10:31+1200\n" "PO-Revision-Date: 2013-06-01 11:19-0600\n" "Last-Translator: Rafael Chacon <raf...@gm...>\n" "Language-Team: Arabic <ar...@li...>\n" +"Language: ar\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ar\n" "X-Launchpad-Export-Date: 2012-03-07 23:01+0000\n" "X-Generator: Poedit 1.5.4\n" -#: AccountGroups.php:7 includes/MainMenuLinksArray.php:362 -#: includes/MainMenuLinksArray (puppypc32158's conflicted copy -#: 2013-06-24).php:362 +#: AccountGroups.php:7 includes/MainMenuLinksArray.php:366 msgid "Account Groups" msgstr "مجموعات العضوية" @@ -167,20 +165,20 @@ #: Areas.php:115 Areas.php:124 BankAccounts.php:159 CreditStatus.php:125 #: Currencies.php:246 Currencies.php:254 Currencies.php:262 #: CustomerBranches.php:293 CustomerBranches.php:303 CustomerBranches.php:313 -#: CustomerBranches.php:323 Customers.php:295 Customers.php:304 -#: Customers.php:312 Customers.php:320 CustomerTypes.php:147 +#: 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 #: PaymentMethods.php:142 PaymentTerms.php:146 PaymentTerms.php:153 -#: PcExpenses.php:161 SalesCategories.php:124 SalesCategories.php:131 +#: 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:188 Stocks.php:703 Stocks.php:712 Stocks.php:720 -#: Stocks.php:728 Stocks.php:736 Stocks.php:744 Stocks.php:752 Stocks.php:760 -#: Suppliers.php:625 Suppliers.php:634 Suppliers.php:642 SupplierTypes.php:145 +#: StockCategories.php:191 Stocks.php:721 Stocks.php:730 Stocks.php:738 +#: Stocks.php:746 Stocks.php:754 Stocks.php:762 Stocks.php:770 Stocks.php:778 +#: Suppliers.php:629 Suppliers.php:638 Suppliers.php:646 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 @@ -238,32 +236,32 @@ #: AddCustomerTypeNotes.php:94 AgedDebtors.php:448 AgedSuppliers.php:276 #: Areas.php:144 AuditTrail.php:11 BankReconciliation.php:17 #: BOMExtendedQty.php:252 BOMIndented.php:246 BOMIndentedReverse.php:235 -#: BOMInquiry.php:187 BOMListing.php:109 BOMs.php:231 BOMs.php:860 -#: COGSGLPostings.php:19 CompanyPreferences.php:155 CounterReturns.php:1609 -#: CounterSales.php:2086 CounterSales.php:2212 Credit_Invoice.php:272 +#: BOMInquiry.php:188 BOMListing.php:109 BOMs.php:231 BOMs.php:864 +#: COGSGLPostings.php:19 CompanyPreferences.php:102 CounterReturns.php:1605 +#: CounterSales.php:2092 CounterSales.php:2218 Credit_Invoice.php:272 #: CreditStatus.php:21 Currencies.php:31 CustEDISetup.php:17 #: DailyBankTransactions.php:15 DebtorsAtPeriodEnd.php:129 -#: DiscountCategories.php:12 DiscountCategories.php:136 DiscountMatrix.php:16 +#: DiscountCategories.php:12 DiscountCategories.php:140 DiscountMatrix.php:16 #: EDIMessageFormat.php:105 FixedAssetLocations.php:13 -#: FixedAssetRegister.php:13 FixedAssetRegister.php:253 -#: FixedAssetTransfer.php:14 FormDesigner.php:129 GLBalanceSheet.php:382 +#: FixedAssetRegister.php:16 FixedAssetRegister.php:256 +#: FixedAssetTransfer.php:14 FormDesigner.php:129 GLBalanceSheet.php:387 #: GLBudgets.php:32 GLJournalInquiry.php:11 GLJournal.php:250 #: InternalStockRequest.php:308 InventoryPlanning.php:379 -#: InventoryPlanningPrefSupplier.php:469 MaintenanceTasks.php:10 -#: MaintenanceUserSchedule.php:10 MRPReport.php:516 NoSalesItems.php:89 +#: InventoryPlanningPrefSupplier.php:469 MaintenanceTasks.php:14 +#: MaintenanceUserSchedule.php:16 MRPReport.php:516 NoSalesItems.php:89 #: PcAssignCashToTab.php:59 PcAssignCashToTab.php:133 #: PcAssignCashToTab.php:149 PcAssignCashToTab.php:193 PDFPickingList.php:28 #: 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:236 PurchData.php:368 PurchData.php:396 +#: 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:70 -#: SelectOrderItems.php:609 SelectOrderItems.php:1530 -#: SelectOrderItems.php:1664 SelectProduct.php:523 SelectSalesOrder.php:563 +#: SelectCreditItems.php:291 SelectCustomer.php:265 SelectGLAccount.php:65 +#: SelectOrderItems.php:609 SelectOrderItems.php:1526 +#: SelectOrderItems.php:1665 SelectProduct.php:525 SelectSalesOrder.php:563 #: SelectSupplier.php:14 SelectSupplier.php:217 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 @@ -272,13 +270,13 @@ #: SupplierPriceList.php:217 SupplierPriceList.php:387 #: SupplierPriceList.php:391 SupplierPriceList.php:442 #: SupplierPriceList.php:492 Suppliers.php:305 SupplierTenderCreate.php:546 -#: SupplierTenderCreate.php:652 SupplierTenders.php:322 +#: SupplierTenderCreate.php:654 SupplierTenders.php:322 #: SupplierTenders.php:388 SupplierTransInquiry.php:10 TaxGroups.php:15 #: TaxProvinces.php:11 TopItems.php:114 UnitsOfMeasure.php:10 #: 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:171 +#: WWW_Users.php:36 Z_BottomUpCosts.php:57 ../webSHOP/includes/header.php:238 msgid "Search" msgstr "إبحث" @@ -295,43 +293,43 @@ msgstr "" #: AccountGroups.php:293 AccountGroups.php:444 GLProfit_Loss.php:6 -#: GLProfit_Loss.php:129 GLProfit_Loss.php:130 GLProfit_Loss.php:181 +#: GLProfit_Loss.php:133 GLProfit_Loss.php:134 GLProfit_Loss.php:185 #: SelectGLAccount.php:23 SelectGLAccount.php:37 SelectGLAccount.php:51 msgid "Profit and Loss" msgstr "" #: AccountGroups.php:310 AccountGroups.php:313 AccountGroups.php:448 -#: AccountGroups.php:450 BOMs.php:124 BOMs.php:774 BOMs.php:776 -#: CompanyPreferences.php:479 CompanyPreferences.php:481 -#: CompanyPreferences.php:494 CompanyPreferences.php:496 -#: CompanyPreferences.php:509 CompanyPreferences.php:511 +#: AccountGroups.php:450 BOMs.php:124 BOMs.php:775 BOMs.php:777 +#: 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:416 Customers.php:617 -#: Customers.php:1004 Customers.php:1010 Customers.php:1013 -#: DailyBankTransactions.php:145 DeliveryDetails.php:1125 -#: DeliveryDetails.php:1168 DeliveryDetails.php:1171 GLTransInquiry.php:69 -#: GLTransInquiry (puppypc32158's conflicted copy 2013-06-24).php:69 +#: Currencies.php:500 CustomerBranches.php:426 Customers.php:641 +#: Customers.php:1031 Customers.php:1037 Customers.php:1040 +#: 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:246 PDFChequeListing.php:65 -#: PDFDeliveryDifferences.php:76 PDFDIFOT.php:76 +#: PcAuthorizeExpenses.php:248 PDFChequeListing.php:65 +#: PDFDeliveryDifferences.php:76 PDFDIFOT.php:80 #: PO_AuthorisationLevels.php:134 PO_AuthorisationLevels.php:139 -#: PO_Header.php:782 PO_PDFPurchOrder.php:408 PO_PDFPurchOrder.php:411 -#: PurchData.php:291 PurchData.php:662 PurchData.php:665 +#: PO_Header.php:799 PO_PDFPurchOrder.php:408 PO_PDFPurchOrder.php:411 +#: PurchData.php:296 PurchData.php:667 PurchData.php:670 #: RecurringSalesOrders.php:493 RecurringSalesOrders.php:496 #: SalesAnalReptCols.php:284 SalesAnalReptCols.php:419 #: SalesAnalReptCols.php:422 SalesAnalRepts.php:420 SalesAnalRepts.php:423 #: SalesAnalRepts.php:448 SalesAnalRepts.php:451 SalesAnalRepts.php:476 -#: SalesAnalRepts.php:479 SalesPeople.php:219 SalesPeople.php:356 -#: SalesPeople.php:358 SelectProduct.php:236 SelectProduct.php:379 -#: ShipmentCosting.php:667 ShopParameters.php:270 ShopParameters.php:274 -#: ShopParameters.php:305 ShopParameters.php:309 ShopParameters.php:339 -#: ShopParameters.php:343 ShopParameters.php:361 ShopParameters.php:365 -#: ShopParameters.php:422 ShopParameters.php:426 Stocks.php:1160 -#: Stocks.php:1162 Stocks.php:1185 Stocks.php:1187 SuppContractChgs.php:90 +#: 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:1199 +#: Stocks.php:1201 Stocks.php:1224 Stocks.php:1226 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 @@ -341,44 +339,44 @@ #: SystemParameters.php:1021 SystemParameters.php:1075 #: SystemParameters.php:1087 SystemParameters.php:1089 #: SystemParameters.php:1127 SystemParameters.php:1129 TaxGroups.php:311 -#: TaxGroups.php:314 TaxGroups.php:371 WWW_Users.php:488 WWW_Users.php:490 -#: WWW_Users.php:661 WWW_Users.php:663 +#: TaxGroups.php:314 TaxGroups.php:371 WWW_Users.php:491 WWW_Users.php:493 +#: WWW_Users.php:664 WWW_Users.php:666 msgid "Yes" msgstr "موافق" #: 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:478 CompanyPreferences.php:482 -#: CompanyPreferences.php:493 CompanyPreferences.php:497 -#: CompanyPreferences.php:508 CompanyPreferences.php:512 +#: BankAccounts.php:385 BankAccounts.php:393 BOMs.php:126 BOMs.php:774 +#: BOMs.php:778 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:416 Customers.php:616 -#: Customers.php:1002 Customers.php:1009 Customers.php:1012 -#: DailyBankTransactions.php:147 DeliveryDetails.php:1126 -#: DeliveryDetails.php:1169 DeliveryDetails.php:1172 GLTransInquiry.php:88 -#: GLTransInquiry (puppypc32158's conflicted copy 2013-06-24).php:88 +#: Currencies.php:505 CustomerBranches.php:426 Customers.php:640 +#: Customers.php:1029 Customers.php:1036 Customers.php:1039 +#: 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:244 PDFChequeListing.php:64 -#: PDFDeliveryDifferences.php:75 PDFDIFOT.php:75 +#: 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:781 PO_PDFPurchOrder.php:409 PO_PDFPurchOrder.php:412 -#: PurchData.php:294 PurchData.php:663 PurchData.php:666 +#: PO_Header.php:798 PO_PDFPurchOrder.php:409 PO_PDFPurchOrder.php:412 +#: PurchData.php:299 PurchData.php:668 PurchData.php:671 #: RecurringSalesOrders.php:492 RecurringSalesOrders.php:495 #: SalesAnalReptCols.php:282 SalesAnalReptCols.php:420 #: SalesAnalReptCols.php:423 SalesAnalRepts.php:419 SalesAnalRepts.php:422 #: SalesAnalRepts.php:447 SalesAnalRepts.php:450 SalesAnalRepts.php:475 -#: SalesAnalRepts.php:478 SalesPeople.php:221 SalesPeople.php:361 -#: SalesPeople.php:363 SelectProduct.php:238 SelectProduct.php:381 -#: ShipmentCosting.php:668 ShopParameters.php:271 ShopParameters.php:273 -#: ShopParameters.php:306 ShopParameters.php:308 ShopParameters.php:340 -#: ShopParameters.php:342 ShopParameters.php:362 ShopParameters.php:364 -#: ShopParameters.php:423 ShopParameters.php:425 Stocks.php:1155 -#: Stocks.php:1157 Stocks.php:1180 Stocks.php:1182 SuppContractChgs.php:92 +#: 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:1194 +#: Stocks.php:1196 Stocks.php:1219 Stocks.php:1221 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 @@ -388,8 +386,8 @@ #: SystemParameters.php:1022 SystemParameters.php:1076 #: SystemParameters.php:1086 SystemParameters.php:1090 #: SystemParameters.php:1126 SystemParameters.php:1130 TaxGroups.php:312 -#: TaxGroups.php:315 TaxGroups.php:373 WWW_Users.php:487 WWW_Users.php:491 -#: WWW_Users.php:660 WWW_Users.php:664 includes/PDFLowGPPageHeader.inc:44 +#: TaxGroups.php:315 TaxGroups.php:373 WWW_Users.php:490 WWW_Users.php:494 +#: WWW_Users.php:663 WWW_Users.php:667 includes/PDFLowGPPageHeader.inc:44 #: includes/PDFTaxPageHeader.inc:35 msgid "No" msgstr "ﻻ" @@ -398,24 +396,23 @@ #: 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:420 Customers.php:1087 Customers.php:1121 +#: CustomerBranches.php:430 Customers.php:1114 Customers.php:1148 #: CustomerTypes.php:206 Departments.php:186 EDIMessageFormat.php:150 #: Factors.php:334 FixedAssetCategories.php:190 FixedAssetLocations.php:111 -#: FreightCosts.php:242 GeocodeSetup.php:173 GLAccounts.php:316 GLTags.php:96 +#: 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 -#: MaintenanceTasks.php:114 Manufacturers.php:217 MRPDemands.php:309 +#: MaintenanceTasks.php:118 Manufacturers.php:217 MRPDemands.php:309 #: MRPDemandTypes.php:120 PaymentMethods.php:208 PaymentTerms.php:205 -#: PcAssignCashToTab.php:276 PcClaimExpensesFromTab.php:268 PcExpenses.php:226 -#: PcTabs.php:236 PcTypeTabs.php:177 PO_AuthorisationLevels.php:151 -#: Prices_Customer.php:278 Prices.php:249 PurchData.php:307 -#: SalesCategories.php:259 SalesCategoryDescriptions.php:113 -#: SalesGLPostings.php:137 SalesGLPostings.php:253 SalesPeople.php:232 -#: SalesTypes.php:206 SecurityTokens.php:130 SelectCustomer.php:621 -#: SelectCustomer.php:640 SelectCustomer.php:670 SelectCustomer.php:688 -#: SelectCustomer.php:712 SelectCustomer.php:729 SelectGLAccount.php:106 -#: SelectGLAccount.php:121 SellThroughSupport.php:298 Shippers.php:144 -#: StockCategories.php:264 SupplierContacts.php:165 +#: PcAssignCashToTab.php:277 PcClaimExpensesFromTab.php:276 PcExpenses.php:226 +#: PcTabs.php:236 PcTypeTabs.php:180 PO_AuthorisationLevels.php:151 +#: Prices_Customer.php:280 Prices.php:249 PurchData.php:312 +#: SalesCategories.php:272 SalesGLPostings.php:137 SalesGLPostings.php:253 +#: SalesPeople.php:232 SalesTypes.php:206 SecurityTokens.php:130 +#: SelectCustomer.php:614 SelectCustomer.php:633 SelectCustomer.php:663 +#: SelectCustomer.php:681 SelectCustomer.php:705 SelectCustomer.php:722 +#: SelectGLAccount.php:117 SelectGLAccount.php:132 SellThroughSupport.php:298 +#: Shippers.php:144 StockCategories.php:267 SupplierContacts.php:165 #: SupplierTenderCreate.php:155 SupplierTypes.php:189 #: SuppTransGLAnalysis.php:125 TaxAuthorities.php:174 TaxCategories.php:182 #: TaxGroups.php:188 TaxProvinces.php:180 UnitsOfMeasure.php:185 @@ -436,35 +433,35 @@ #: 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:1122 CustomerTypes.php:207 Departments.php:187 -#: DiscountCategories.php:225 DiscountMatrix.php:183 EDIMessageFormat.php:151 -#: FixedAssetCategories.php:191 FreightCosts.php:243 GeocodeSetup.php:174 -#: GLAccounts.php:317 GLJournal.php:429 GLTags.php:97 +#: Customers.php:1149 CustomerTypes.php:207 Departments.php:187 +#: DiscountCategories.php:229 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:115 +#: Locations.php:404 MailingGroupMaintenance.php:179 MaintenanceTasks.php:119 #: Manufacturers.php:218 MRPDemands.php:310 MRPDemandTypes.php:121 -#: PaymentMethods.php:209 Payments.php:1095 PaymentTerms.php:206 -#: PcAssignCashToTab.php:280 PcClaimExpensesFromTab.php:269 PcExpenses.php:227 -#: PcExpensesTypeTab.php:187 PcTabs.php:237 PcTypeTabs.php:178 -#: PO_AuthorisationLevels.php:153 PO_Items.php:770 Prices_Customer.php:279 -#: Prices.php:250 PurchData.php:309 PurchData.php:716 -#: SalesAnalReptCols.php:299 SalesAnalRepts.php:307 SalesCategories.php:260 -#: SalesCategoryDescriptions.php:114 SalesGLPostings.php:138 -#: SalesGLPostings.php:254 SalesPeople.php:233 SalesTypes.php:207 -#: SecurityTokens.php:131 SelectCreditItems.php:779 SelectCustomer.php:622 -#: SelectCustomer.php:641 SelectCustomer.php:671 SelectCustomer.php:689 -#: SelectCustomer.php:713 SelectCustomer.php:730 SelectOrderItems.php:1445 -#: SellThroughSupport.php:299 Shipments.php:440 Shippers.php:145 -#: SpecialOrder.php:667 StockCategories.php:265 StockCategories.php:587 -#: StockLocTransfer.php:332 SuppContractChgs.php:99 SuppCreditGRNs.php:112 -#: SuppFixedAssetChgs.php:90 SuppInvGRNs.php:147 SupplierContacts.php:166 -#: SupplierTenderCreate.php:417 SupplierTenderCreate.php:445 -#: SupplierTypes.php:191 SuppShiptChgs.php:90 SuppTransGLAnalysis.php:126 -#: TaxAuthorities.php:175 TaxCategories.php:183 TaxGroups.php:189 -#: TaxProvinces.php:181 UnitsOfMeasure.php:186 WorkCentres.php:142 -#: WOSerialNos.php:323 WWW_Access.php:127 WWW_Users.php:328 -#: includes/InputSerialItemsKeyed.php:60 includes/OutputSerialItems.php:99 +#: PaymentMethods.php:209 Payments.php:1093 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:768 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 +#: Shippers.php:145 SpecialOrder.php:667 StockCategories.php:268 +#: StockCategories.php:613 StockLocTransfer.php:332 SuppContractChgs.php:99 +#: SuppCreditGRNs.php:112 SuppFixedAssetChgs.php:90 SuppInvGRNs.php:147 +#: SupplierContacts.php:166 SupplierTenderCreate.php:417 +#: SupplierTenderCreate.php:445 SupplierTypes.php:191 SuppShiptChgs.php:90 +#: SuppTransGLAnalysis.php:126 TaxAuthorities.php:175 TaxCategories.php:183 +#: TaxGroups.php:189 TaxProvinces.php:181 UnitsOfMeasure.php:186 +#: WorkCentres.php:142 WOSerialNos.php:326 WWW_Access.php:127 +#: WWW_Users.php:328 includes/InputSerialItemsKeyed.php:60 +#: includes/OutputSerialItems.php:99 #, php-format msgid "Delete" msgstr "حذف" @@ -506,7 +503,8 @@ #, fuzzy msgid "" "A unique name for the account group must be entered - at least 3 characters " -"long and less than 30 characters long" +"long and less than 30 characters long. Only alpha numeric characters can be " +"used." msgstr "اسم المجموعة يجب ان يحتوي علي الأقل علي حرف واحد" #: AccountGroups.php:413 AccountGroups.php:415 @@ -530,28 +528,25 @@ "ledger accounts should display in the trial balance" msgstr "" -#: AccountGroups.php:465 AccountSections.php:262 AddCustomerContacts.php:260 +#: AccountGroups.php:465 AccountSections.php:263 AddCustomerContacts.php:260 #: AddCustomerNotes.php:242 AddCustomerTypeNotes.php:221 Areas.php:229 -#: BankAccounts.php:399 BOMs.php:787 COGSGLPostings.php:365 +#: BankAccounts.php:399 BOMs.php:791 COGSGLPostings.php:365 #: CreditStatus.php:259 Currencies.php:513 CustLoginSetup.php:273 #: Departments.php:258 DiscountMatrix.php:142 EDIMessageFormat.php:248 #: FixedAssetCategories.php:350 FixedAssetLocations.php:161 -#: FreightCosts.php:342 GeocodeSetup.php:271 GLAccounts.php:266 Labels.php:631 +#: FreightCosts.php:371 GeocodeSetup.php:271 GLAccounts.php:266 Labels.php:631 #: Locations.php:635 Manufacturers.php:312 MRPDemands.php:424 #: MRPDemandTypes.php:188 OffersReceived.php:57 OffersReceived.php:146 -#: PaymentMethods.php:300 PaymentTerms.php:310 PO_AuthorisationLevels.php:262 -#: Prices_Customer.php:361 SalesAnalReptCols.php:552 SalesAnalRepts.php:519 -#: SalesCategoryDescriptions.php:196 SalesGLPostings.php:425 -#: SalesPeople.php:370 Shippers.php:203 StockCategories.php:614 -#: SupplierContacts.php:284 SuppLoginSetup.php:295 TaxAuthorities.php:329 -#: TaxCategories.php:238 TaxProvinces.php:235 UnitsOfMeasure.php:241 -#: WorkCentres.php:280 WWW_Users.php:732 +#: PaymentMethods.php:300 PaymentTerms.php:310 PO_AuthorisationLevels.php:264 +#: Prices_Customer.php:363 SalesAnalReptCols.php:552 SalesAnalRepts.php:519 +#: SalesGLPostings.php:425 SalesPeople.php:373 Shippers.php:203 +#: StockCategories.php:640 SupplierContacts.php:284 SuppLoginSetup.php:292 +#: TaxAuthorities.php:329 TaxCategories.php:241 TaxProvinces.php:235 +#: UnitsOfMeasure.php:241 WorkCentres.php:280 WWW_Users.php:735 msgid "Enter Information" msgstr "أدخل المعلومات" -#: AccountSections.php:7 includes/MainMenuLinksArray.php:363 -#: includes/MainMenuLinksArray (puppypc32158's conflicted copy -#: 2013-06-24).php:363 +#: AccountSections.php:7 includes/MainMenuLinksArray.php:365 msgid "Account Sections" msgstr "أعدادات العضو" @@ -594,7 +589,7 @@ msgid "Section Number" msgstr "رقم القطاع" -#: AccountSections.php:177 AccountSections.php:257 +#: AccountSections.php:177 AccountSections.php:258 msgid "Section Description" msgstr "وصف القطاع" @@ -610,8 +605,8 @@ msgid "Could not retrieve the requested section please try again." msgstr "لم أستطيع استرجاع القطاع المطلوب حاول مجددا" -#: AddCustomerContacts.php:6 AddCustomerContacts.php:59 SelectCustomer.php:613 -#: SelectCustomer.php:648 +#: AddCustomerContacts.php:6 AddCustomerContacts.php:59 SelectCustomer.php:606 +#: SelectCustomer.php:641 msgid "Customer Contacts" msgstr "" @@ -649,11 +644,11 @@ #: AddCustomerContacts.php:59 AddCustomerNotes.php:51 #: AddCustomerTypeNotes.php:48 Areas.php:72 CustomerTypes.php:69 -#: DeliveryDetails.php:790 DeliveryDetails.php:807 Factors.php:105 +#: DeliveryDetails.php:801 DeliveryDetails.php:818 Factors.php:105 #: 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:545 Suppliers.php:520 +#: SalesPeople.php:97 SalesTypes.php:66 Stocks.php:558 Suppliers.php:524 #: SupplierTypes.php:67 msgid "has been updated" msgstr "" @@ -666,9 +661,9 @@ msgid "The contact record has been deleted" msgstr "" -#: AddCustomerContacts.php:126 CompanyPreferences.php:226 -#: CustomerBranches.php:373 Customers.php:1074 Customers.php:1082 -#: ImportBankTransAnalysis.php:207 SalesPeople.php:200 SelectCustomer.php:616 +#: AddCustomerContacts.php:126 CompanyPreferences.php:173 +#: CustomerBranches.php:383 Customers.php:1101 Customers.php:1109 +#: ImportBankTransAnalysis.php:207 SalesPeople.php:200 SelectCustomer.php:609 #: StockDispatch.php:275 StockDispatch.php:286 StockDispatch.php:297 #: SupplierContacts.php:152 SuppTransGLAnalysis.php:108 #: includes/InputSerialItemsFile.php:92 includes/InputSerialItemsFile.php:144 @@ -676,8 +671,8 @@ msgid "Name" msgstr "" -#: AddCustomerContacts.php:127 AddCustomerContacts.php:223 Customers.php:1075 -#: Customers.php:1083 SelectCustomer.php:617 WWW_Access.php:110 +#: AddCustomerContacts.php:127 AddCustomerContacts.php:223 Customers.php:1102 +#: Customers.php:1110 SelectCustomer.php:610 WWW_Access.php:110 #: WWW_Access.php:173 msgid "Role" msgstr "" @@ -687,31 +682,29 @@ msgstr "" #: AddCustomerContacts.php:129 AddCustomerContacts.php:241 -#: CustomerBranches.php:379 CustomerBranches.php:801 CustomerInquiry.php:261 -#: Customers.php:1077 Customers.php:1085 EmailCustTrans.php:15 +#: 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 #: 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:619 SelectSupplier.php:285 +#: SelectCustomer.php:427 SelectCustomer.php:612 SelectSupplier.php:285 #: 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:109 -#: includes/PO_PDFOrderPageHeader.inc:29 includes/PO_PDFOrderPageHeader -#: (puppypc32158's conflicted copy 2013-05-23).inc:29 2013-06-24).inc:29 -#: ../webshop/Checkout.php:231 ../webshop/Register.php:404 -#: ../webshop/includes/Register.php:404 +#: includes/PO_PDFOrderPageHeader.inc:29 ../webSHOP/Checkout.php:296 +#: ../webSHOP/Register.php:595 msgid "Email" msgstr "" -#: AddCustomerContacts.php:130 AddCustomerContacts.php:250 Customers.php:1078 -#: Customers.php:1086 PcAssignCashToTab.php:241 PcAssignCashToTab.php:372 -#: PcAuthorizeExpenses.php:95 PcClaimExpensesFromTab.php:230 -#: PcClaimExpensesFromTab.php:389 PcReportTab.php:327 SelectCustomer.php:620 -#: ShopParameters.php:193 SystemParameters.php:363 WOSerialNos.php:294 -#: WOSerialNos.php:300 +#: AddCustomerContacts.php:130 AddCustomerContacts.php:250 Customers.php:1105 +#: Customers.php:1113 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 +#: WOSerialNos.php:303 msgid "Notes" msgstr "" @@ -729,23 +722,22 @@ msgstr "" #: AddCustomerContacts.php:214 Factors.php:234 SupplierContacts.php:239 -#: ../webshop/Checkout.php:313 ../webshop/Register.php:421 -#: ../webshop/includes/Register.php:421 +#: ../webSHOP/Checkout.php:377 ../webSHOP/Register.php:610 msgid "Contact Name" msgstr "" -#: AddCustomerContacts.php:232 Contracts.php:778 PDFRemittanceAdvice.php:247 -#: PO_Header.php:997 PO_Header.php:1081 SelectCreditItems.php:245 +#: 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 #: SupplierTenderCreate.php:390 includes/PDFStatementPageHeader.inc:63 #: includes/PDFTransPageHeader.inc:81 -#: includes/PDFTransPageHeaderPortrait.inc:105 ../webshop/Checkout.php:319 -#: ../webshop/Register.php:487 ../webshop/includes/Register.php:487 +#: includes/PDFTransPageHeaderPortrait.inc:105 ../webSHOP/Checkout.php:387 +#: ../webSHOP/Register.php:255 ../webSHOP/Register.php:723 msgid "Phone" msgstr "" -#: AddCustomerNotes.php:6 AddCustomerNotes.php:51 SelectCustomer.php:663 -#: SelectCustomer.php:696 +#: AddCustomerNotes.php:6 AddCustomerNotes.php:51 SelectCustomer.php:656 +#: SelectCustomer.php:689 msgid "Customer Notes" msgstr "" @@ -780,30 +772,29 @@ #: AddCustomerNotes.php:117 AddCustomerNotes.php:222 #: AddCustomerTypeNotes.php:111 AddCustomerTypeNotes.php:211 #: BankMatching.php:278 BankReconciliation.php:212 BankReconciliation.php:289 -#: ContractCosting.php:177 CustomerAllocations.php:334 -#: CustomerAllocations.php:368 CustomerInquiry.php:204 -#: CustomerTransInquiry.php:106 GLAccountInquiry.php:191 -#: GLAccountReport.php:343 GLTransInquiry.php:42 GLTransInquiry -#: (puppypc32158's conflicted copy 2013-06-24).php:42 MRPCalendar.php:219 -#: PaymentAllocations.php:66 PcAssignCashToTab.php:237 -#: PcAuthorizeExpenses.php:91 PDFRemittanceAdvice.php:308 +#: ContractCosting.php:177 CustomerAllocations.php:340 +#: CustomerAllocations.php:370 CustomerInquiry.php:204 +#: CustomerTransInquiry.php:106 GLAccountInquiry.php:174 +#: GLAccountReport.php:343 GLTransInquiry.php:42 MRPCalendar.php:219 +#: PaymentAllocations.php:66 PcAssignCashToTab.php:238 +#: PcAuthorizeExpenses.php:93 PDFRemittanceAdvice.php:308 #: PrintCustTrans.php:854 PrintCustTransPortrait.php:903 ReverseGRN.php:392 -#: SelectCustomer.php:666 SelectCustomer.php:708 ShipmentCosting.php:538 +#: SelectCustomer.php:659 SelectCustomer.php:701 ShipmentCosting.php:538 #: ShipmentCosting.php:615 Shipments.php:491 StockDispatch.php:277 #: 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 -#: SupplierTransInquiry.php:105 includes/PDFQuotationPageHeader.inc:94 -#: includes/PDFQuotationPortraitPageHeader.inc:91 +#: SupplierTransInquiry.php:105 includes/PDFQuotationPageHeader.inc:89 +#: includes/PDFQuotationPortraitPageHeader.inc:88 #: includes/PDFStatementPageHeader.inc:169 includes/PDFTaxPageHeader.inc:36 #: includes/PDFTransPageHeader.inc:48 #: includes/PDFTransPageHeaderPortrait.inc:58 msgid "Date" msgstr "" -#: AddCustomerNotes.php:118 AddCustomerTypeNotes.php:112 PcReportTab.php:172 -#: SelectCustomer.php:667 SelectCustomer.php:709 Stocks.php:1164 +#: AddCustomerNotes.php:118 AddCustomerTypeNotes.php:112 PcReportTab.php:181 +#: SelectCustomer.php:660 SelectCustomer.php:702 Stocks.php:1203 #: UpgradeDatabase.php:229 UpgradeDatabase.php:232 UpgradeDatabase.php:235 #: UpgradeDatabase.php:238 UpgradeDatabase.php:241 UpgradeDatabase.php:244 #: UpgradeDatabase.php:247 UpgradeDatabase.php:250 UpgradeDatabase.php:253 @@ -821,7 +812,7 @@ #: AddCustomerNotes.php:120 AddCustomerNotes.php:231 #: AddCustomerTypeNotes.php:114 AddCustomerTypeNotes.php:215 -#: SelectCustomer.php:669 SelectCustomer.php:711 +#: SelectCustomer.php:662 SelectCustomer.php:704 msgid "Priority" msgstr "" @@ -842,7 +833,7 @@ msgid "Contact Note" msgstr "" -#: AddCustomerTypeNotes.php:5 SelectCustomer.php:705 +#: AddCustomerTypeNotes.php:5 SelectCustomer.php:698 msgid "Customer Type (Group) Notes" msgstr "" @@ -859,7 +850,7 @@ msgid "The contacts notes may not be empty" msgstr "" -#: AddCustomerTypeNotes.php:48 SelectCustomer.php:737 +#: AddCustomerTypeNotes.php:48 SelectCustomer.php:730 msgid "Customer Group Notes" msgstr "" @@ -906,8 +897,8 @@ #: AgedDebtors.php:264 AgedDebtors.php:363 AgedDebtors.php:428 #: AgedSuppliers.php:108 BOMExtendedQty.php:154 BOMIndented.php:150 #: BOMIndentedReverse.php:140 BOMListing.php:41 BOMListing.php:52 -#: DebtorsAtPeriodEnd.php:57 DebtorsAtPeriodEnd.php:69 GLBalanceSheet.php:105 -#: GLBalanceSheet.php:144 GLProfit_Loss.php:181 GLTagProfit_Loss.php:194 +#: 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 #: InventoryPlanning.php:101 InventoryPlanning.php:176 #: InventoryPlanning.php:211 InventoryPlanning.php:259 @@ -925,7 +916,7 @@ #: 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:659 +#: StockCheck.php:65 StockCheck.php:139 SupplierTenderCreate.php:661 #: SupplierTenders.php:397 SuppPriceList.php:138 #: includes/PDFPaymentRun_PymtFooter.php:152 msgid "Problem Report" @@ -941,9 +932,9 @@ #: BOMExtendedQty.php:240 BOMIndented.php:153 BOMIndented.php:234 #: BOMIndentedReverse.php:144 BOMIndentedReverse.php:221 BOMListing.php:44 #: Credit_Invoice.php:197 DebtorsAtPeriodEnd.php:60 DebtorsAtPeriodEnd.php:72 -#: FTP_RadioBeacon.php:187 GetStockImage.php:150 GLBalanceSheet.php:109 -#: GLBalanceSheet.php:147 GLBalanceSheet.php:324 GLProfit_Loss.php:184 -#: GLProfit_Loss.php:196 GLTagProfit_Loss.php:198 GLTagProfit_Loss.php:211 +#: FTP_RadioBeacon.php:187 GetStockImage.php:150 GLBalanceSheet.php:112 +#: GLBalanceSheet.php:150 GLBalanceSheet.php:329 GLProfit_Loss.php:188 +#: GLProfit_Loss.php:200 GLTagProfit_Loss.php:198 GLTagProfit_Loss.php:211 #: GLTrialBalance.php:168 GLTrialBalance.php:182 InventoryPlanning.php:104 #: InventoryPlanning.php:179 InventoryPlanning.php:214 #: InventoryPlanning.php:262 InventoryPlanning.php:302 @@ -995,22 +986,22 @@ msgstr "" #: AgedDebtors.php:365 AgedSuppliers.php:197 GLAccountCSV.php:175 -#: GLAccountInquiry.php:179 GLAccountReport.php:97 PO_Items.php:448 -#: PO_Items.php:579 PO_Items.php:604 SalesAnalReptCols.php:365 +#: GLAccountInquiry.php:162 GLAccountReport.php:97 PO_Items.php:448 +#: PO_Items.php:577 PO_Items.php:602 SalesAnalReptCols.php:365 #: SpecialOrder.php:449 StockLocTransferReceive.php:390 #: StockQuantityByDate.php:123 includes/SelectOrderItems_IntoCart.inc:55 msgid "could not be retrieved because" msgstr "" #: AgedDebtors.php:368 AgedSuppliers.php:200 Areas.php:94 -#: ConfirmDispatch_Invoice.php:167 ConfirmDispatch_Invoice.php:990 -#: ConfirmDispatch_Invoice.php:1004 Contracts.php:592 CounterReturns.php:1014 -#: CounterReturns.php:1028 CounterSales.php:1425 CounterSales.php:1439 +#: 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 -#: DeliveryDetails.php:398 GLProfit_Loss.php:601 GLTagProfit_Loss.php:515 -#: Payments.php:353 PDFRemittanceAdvice.php:85 PurchData.php:109 -#: PurchData.php:127 PurchData.php:355 RecurringSalesOrders.php:267 +#: DeliveryDetails.php:409 GLProfit_Loss.php:608 GLTagProfit_Loss.php:515 +#: Payments.php:353 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 @@ -1032,8 +1023,8 @@ #: includes/PDFPaymentRun_PymtFooter.php:158 #: includes/PDFPaymentRun_PymtFooter.php:189 includes/ConnectDB_mysqli.inc:76 #: includes/ConnectDB_mysql.inc:66 -#: ../webshop/includes/DatabaseFunctions.php:58 -#: ../webshop/includes/Functions.php:425 ../webshop/includes/PlaceOrder.php:52 +#: ../webSHOP/includes/DatabaseFunctions.php:60 +#: ../webSHOP/includes/Functions.php:438 ../webSHOP/includes/PlaceOrder.php:67 msgid "The SQL that failed was" msgstr "" @@ -1050,10 +1041,18 @@ msgid "From Customer Code" msgstr "" +#: AgedDebtors.php:460 +msgid "Enter the first customer code alphabetically to include in the report" +msgstr "" + #: AgedDebtors.php:463 DebtorsAtPeriodEnd.php:146 msgid "To Customer Code" msgstr "" +#: AgedDebtors.php:464 +msgid "Enter the last customer code alphabetically to include in the report" +msgstr "" + #: AgedDebtors.php:467 AgedSuppliers.php:295 msgid "All balances or overdues only" msgstr "" @@ -1098,10 +1097,10 @@ #: BOMIndented.php:275 BOMIndentedReverse.php:254 BOMListing.php:130 #: DebtorsAtPeriodEnd.php:168 InventoryPlanning.php:451 #: InventoryPlanningPrefSupplier.php:519 InventoryQuantities.php:210 -#: InventoryValuation.php:269 MRPPlannedPurchaseOrders.php:282 -#: MRPPlannedWorkOrders.php:341 MRPReschedules.php:153 MRPShortages.php:303 +#: InventoryValuation.php:269 MRPPlannedPurchaseOrders.php:294 +#: MRPPlannedWorkOrders.php:348 MRPReschedules.php:153 MRPShortages.php:303 #: OutstandingGRNs.php:277 PDFCustomerList.php:421 PDFLowGP.php:146 -#: PDFPriceList.php:307 PDFRemittanceAdvice.php:175 +#: PDFPriceList.php:312 PDFRemittanceAdvice.php:175 #: PDFStockCheckComparison.php:361 PrintCustTrans.php:570 #: PrintCustTransPortrait.php:612 ReorderLevel.php:259 StockDispatch.php:446 #: SupplierBalsAtPeriodEnd.php:160 SuppPriceList.php:263 Tax.php:352 @@ -1146,12 +1145,20 @@ msgid "From Supplier Code" msgstr "" +#: AgedSuppliers.php:288 +msgid "Enter the first supplier code alphabetially to include in the report" +msgstr "" + #: AgedSuppliers.php:291 OutstandingGRNs.php:271 PDFRemittanceAdvice.php:157 #: SupplierBalsAtPeriodEnd.php:136 SuppPaymentRun.php:269 #: Z_ClearPOBackOrders.php:23 msgid "To Supplier Code" msgstr "" +#: AgedSuppliers.php:292 +msgid "Enter the last supplier code alphabetically to include in the report" +msgstr "" + #: AgedSuppliers.php:297 msgid "All suppliers with balances" msgstr "" @@ -1233,9 +1240,9 @@ #: InternalStockCategoriesByRole.php:102 Locations.php:349 #: Manufacturers.php:163 MRPDemands.php:250 PcAssignCashToTab.php:138 #: PcClaimExpensesFromTab.php:130 PcExpenses.php:169 PcExpensesTypeTab.php:101 -#: PcTabs.php:168 PcTypeTabs.php:140 SalesAnalReptCols.php:215 -#: SalesCategories.php:135 SalesTypes.php:156 StockCategories.php:205 -#: Suppliers.php:651 SupplierTypes.php:151 Z_DeleteInvoice.php:178 +#: 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 #: includes/DefineOfferClass.php:134 msgid "has been deleted" msgstr "" @@ -1268,44 +1275,44 @@ msgid "Incorrect date format used, please re-enter" msgstr "" -#: AuditTrail.php:42 BOMIndented.php:316 BOMIndentedReverse.php:296 +#: AuditTrail.php:43 BOMIndented.php:316 BOMIndentedReverse.php:296 #: MRPCalendar.php:264 msgid "From Date" msgstr "" -#: AuditTrail.php:44 BOMIndented.php:317 BOMIndentedReverse.php:297 +#: AuditTrail.php:47 BOMIndented.php:317 BOMIndentedReverse.php:297 #: MRPCalendar.php:266 msgid "To Date" msgstr "" -#: AuditTrail.php:48 PO_AuthorisationLevels.php:124 +#: AuditTrail.php:53 PO_AuthorisationLevels.php:124 #: PO_AuthorisationLevels.php:173 PO_AuthorisationLevels.php:176 -#: UserSettings.php:113 includes/UserLogin.php:131 +#: UserSettings.php:113 includes/UserLogin.php:134 msgid "User ID" msgstr "" -#: AuditTrail.php:50 AuditTrail.php:63 ContractBOM.php:305 -#: CounterReturns.php:1617 CounterReturns.php:1620 CounterSales.php:2218 -#: CounterSales.php:2221 CustomerTransInquiry.php:36 +#: AuditTrail.php:55 AuditTrail.php:69 ContractBOM.php:306 +#: CounterReturns.php:1613 CounterReturns.php:1616 CounterSales.php:2224 +#: CounterSales.php:2227 CustomerTransInquiry.php:36 #: DailyBankTransactions.php:72 DailySalesInquiry.php:46 -#: DailySalesInquiry.php:48 FixedAssetRegister.php:56 -#: FixedAssetRegister.php:65 InventoryQuantities.php:168 +#: DailySalesInquiry.php:48 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 #: NoSalesItems.php:22 NoSalesItems.php:48 NoSalesItems.php:68 -#: NoSalesItems.php:70 PDFPeriodStockTransListing.php:60 PDFPriceList.php:198 -#: PO_Items.php:1103 POReport.php:1570 ReorderLevel.php:212 +#: NoSalesItems.php:70 PDFPeriodStockTransListing.php:58 PDFPriceList.php:198 +#: PO_Items.php:1106 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:1075 SalesInquiry.php:1138 SelectCreditItems.php:986 -#: SelectOrderItems.php:1672 SelectOrderItems.php:1675 SelectProduct.php:531 -#: SelectProduct.php:533 StockDispatch.php:82 StockDispatch.php:393 +#: SalesInquiry.php:1091 SalesInquiry.php:1154 SelectCreditItems.php:986 +#: SelectOrderItems.php:1673 SelectOrderItems.php:1676 SelectProduct.php:533 +#: SelectProduct.php:535 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:23 -#: SupplierPriceList.php:25 SupplierTenderCreate.php:671 -#: SupplierTenderCreate.php:673 SupplierTenders.php:409 +#: SupplierPriceList.php:25 SupplierTenderCreate.php:673 +#: SupplierTenderCreate.php:675 SupplierTenders.php:409 #: SupplierTenders.php:411 SupplierTransInquiry.php:31 #: SystemParameters.php:1038 SystemParameters.php:1044 #: SystemParameters.php:1050 SystemParameters.php:1056 @@ -1315,35 +1322,35 @@ msgid "All" msgstr "" -#: AuditTrail.php:61 +#: AuditTrail.php:67 msgid "Table " msgstr "" -#: AuditTrail.php:77 +#: AuditTrail.php:84 msgid "Containing text" msgstr "" -#: AuditTrail.php:82 InternalStockRequest.php:591 MRPReport.php:778 -#: PO_SelectPurchOrder.php:431 SelectContract.php:184 SelectProduct.php:805 +#: AuditTrail.php:90 InternalStockRequest.php:591 MRPReport.php:778 +#: PO_SelectPurchOrder.php:432 SelectContract.php:184 SelectProduct.php:806 msgid "View" msgstr "" -#: AuditTrail.php:165 +#: AuditTrail.php:175 msgid "Date/Time" msgstr "" -#: AuditTrail.php:166 PcReportTab.php:259 includes/header.inc:59 +#: AuditTrail.php:176 PcReportTab.php:268 includes/header.inc:59 msgid "User" msgstr "" -#: AuditTrail.php:167 BankReconciliation.php:213 BankReconciliation.php:290 -#: CustomerAllocations.php:366 CustomerInquiry.php:202 +#: AuditTrail.php:177 BankReconciliation.php:213 BankReconciliation.php:290 +#: CustomerAllocations.php:368 CustomerInquiry.php:202 #: CustomerPurchases.php:68 CustomerTransInquiry.php:25 -#: CustomerTransInquiry.php:104 CustWhereAlloc.php:22 CustWhereAlloc.php:113 -#: DailyBankTransactions.php:127 GLAccountInquiry.php:189 +#: CustomerTransInquiry.php:104 CustWhereAlloc.php:21 CustWhereAlloc.php:111 +#: DailyBankTransactions.php:127 GLAccountInquiry.php:172 #: GLAccountReport.php:341 GLJournal.php:266 MRPReschedules.php:194 #: SalesByTypePeriodInquiry.php:336 SelectCustomer.php:424 -#: ShipmentCosting.php:536 ShipmentCosting.php:613 StockCategories.php:236 +#: ShipmentCosting.php:536 ShipmentCosting.php:613 StockCategories.php:239 #: StockLocMovements.php:89 StockMovements.php:96 SupplierAllocations.php:454 #: SupplierInquiry.php:209 SupplierTransInquiry.php:20 #: SupplierTransInquiry.php:102 Z_CheckAllocationsFrom.php:32 @@ -1353,16 +1360,16 @@ msgid "Type" msgstr "" -#: AuditTrail.php:168 +#: AuditTrail.php:178 msgid "Table" msgstr "" -#: AuditTrail.php:169 api/api_xml-rpc.php:311 api/api_xml-rpc.php:777 +#: AuditTrail.php:179 api/api_xml-rpc.php:311 api/api_xml-rpc.php:777 #: api/api_xml-rpc.php:2187 msgid "Field Name" msgstr "" -#: AuditTrail.php:170 MaterialsNotUsed.php:38 PurchData.php:695 +#: AuditTrail.php:180 MaterialsNotUsed.php:38 PurchData.php:700 #: SellThroughSupport.php:263 ShopParameters.php:192 SystemParameters.php:362 #: includes/PDFOstdgGRNsPageHeader.inc:43 msgid "Value" @@ -1429,6 +1436,7 @@ msgstr "" #: BankAccounts.php:12 TaxAuthorities.php:150 +#: ../webSHOP/includes/Functions.php:756 msgid "Bank" msgstr "" @@ -1528,18 +1536,18 @@ msgid "Bank Address" msgstr "" -#: BankAccounts.php:196 Currencies.php:446 CustomerAllocations.php:337 +#: BankAccounts.php:196 Currencies.php:446 CustomerAllocations.php:343 #: CustomerReceipt.php:803 CustomerTransInquiry.php:114 OffersReceived.php:112 -#: PcReportTab.php:267 PcTabs.php:208 PcTabs.php:351 +#: PcReportTab.php:276 PcTabs.php:208 PcTabs.php:355 #: PO_AuthorisationLevels.php:126 PO_AuthorisationLevels.php:210 -#: PO_AuthorisationLevels.php:215 PO_AuthoriseMyOrders.php:115 -#: PO_Header.php:561 PO_SelectOSPurchOrder.php:478 PO_SelectPurchOrder.php:433 -#: PricesByCost.php:277 Prices.php:220 Prices.php:296 PurchData.php:271 -#: PurchData.php:466 PurchData.php:607 SelectSupplier.php:279 +#: 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 #: SellThroughSupport.php:161 SupplierCredit.php:263 SupplierInvoice.php:606 #: SupplierPriceList.php:450 SupplierTenderCreate.php:609 #: SupplierTenders.php:126 SupplierTenders.php:538 -#: SupplierTransInquiry.php:111 SuppPriceList.php:303 Z_ImportPriceList.php:96 +#: SupplierTransInquiry.php:111 SuppPriceList.php:303 #: includes/PDFBankingSummaryPageHeader.inc:42 #: includes/PDFDebtorBalsPageHeader.inc:33 #: includ... [truncated message content] |