Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[7814] trunk
|
From: <dai...@us...> - 2017-08-12 03:09:27
|
Revision: 7814
http://sourceforge.net/p/web-erp/reponame/7814
Author: daintree
Date: 2017-08-12 03:09:19 +0000 (Sat, 12 Aug 2017)
Log Message:
-----------
allow second chance submission of counter sales if the error traps find an error initially
Modified Paths:
--------------
trunk/CounterSales.php
trunk/includes/header.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.mo
trunk/locale/fr_CA.utf8/LC_MESSAGES/messages.po
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.mo
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po
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/ko_KR.utf8/LC_MESSAGES/messages.mo
trunk/locale/ko_KR.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/mr_IN.utf8/LC_MESSAGES/messages.mo
trunk/locale/mr_IN.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
Modified: trunk/CounterSales.php
===================================================================
--- trunk/CounterSales.php 2017-08-11 00:57:38 UTC (rev 7813)
+++ trunk/CounterSales.php 2017-08-12 03:09:19 UTC (rev 7814)
@@ -1039,9 +1039,15 @@
}//end of testing for negative stocks
+ if ($InputError == true ) { //allow the error to be fixed and then resubmit buttone needs to show
+ echo '<br />
+ <div class="centre">
+ <input type="submit" name="Recalculate" value="' . _('Re-Calculate') . '" />
+ <input type="submit" name="ProcessSale" value="' . _('Process The Sale') . '" />
+ </div>
+ <hr />';
+ } else { //all good so let's get on with the processing
- if ($InputError == false) { //all good so let's get on with the processing
-
/* Now Get the area where the sale is to from the branches table */
$SQL = "SELECT area,
@@ -2392,4 +2398,4 @@
echo '</form>';
}
include('includes/footer.php');
-?>
\ No newline at end of file
+?>
Modified: trunk/includes/header.php
===================================================================
--- trunk/includes/header.php 2017-08-11 00:57:38 UTC (rev 7813)
+++ trunk/includes/header.php 2017-08-12 03:09:19 UTC (rev 7814)
@@ -79,7 +79,8 @@
unset($_SESSION['Favourites'][$_POST['ScriptName']]);
}
if (isset($_SESSION['Favourites']) AND count($_SESSION['Favourites'])>0) {
- echo '<ul>';
+ echo '<br />
+ <ul>';
foreach ($_SESSION['Favourites'] as $url=>$ttl) {
echo '<li><a href="' . $url . '">' . _($ttl) . '<a></li>';
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 2017-08-11 00:57:38 UTC (rev 7813)
+++ trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po 2017-08-12 03:09:19 UTC (rev 7814)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: webERP 4.13\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-25 08:09-0600\n"
+"POT-Creation-Date: 2017-08-12 12:01+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"
@@ -159,23 +159,23 @@
#: Areas.php:115 Areas.php:124 BankAccounts.php:165 CreditStatus.php:125
#: Currencies.php:247 Currencies.php:255 Currencies.php:263 Currencies.php:273
#: CustomerBranches.php:300 CustomerBranches.php:310 CustomerBranches.php:320
-#: CustomerBranches.php:330 CustomerBranches.php:340 CustomerTypes.php:146
-#: CustomerTypes.php:156 Customers.php:296 Customers.php:305 Customers.php:313
-#: Customers.php:324 Customers.php:334 Departments.php:141 Factors.php:134
-#: FixedAssetCategories.php:137 GLAccounts.php:110 GLAccounts.php:124
-#: Locations.php:279 Locations.php:287 Locations.php:298 Locations.php:307
-#: Locations.php:316 Locations.php:325 Locations.php:334 Locations.php:343
-#: Locations.php:351 MRPDemandTypes.php:87 Manufacturers.php:185
-#: PaymentMethods.php:162 PaymentTerms.php:146 PaymentTerms.php:153
-#: PcExpenses.php:161 SalesCategories.php:146 SalesCategories.php:153
-#: SalesPeople.php:159 SalesPeople.php:166 SalesPeople.php:172
-#: SalesTypes.php:140 SalesTypes.php:150 Shippers.php:81 Shippers.php:93
-#: StockCategories.php:216 Stocks.php:767 Stocks.php:776 Stocks.php:784
-#: Stocks.php:792 Stocks.php:800 Stocks.php:808 Stocks.php:816 Stocks.php:824
-#: SupplierTypes.php:126 Suppliers.php:646 Suppliers.php:655 Suppliers.php:663
-#: TaxCategories.php:132 TaxGroups.php:135 TaxGroups.php:143
-#: TaxProvinces.php:129 UnitsOfMeasure.php:135 WWW_Access.php:88
-#: WorkCentres.php:91 WorkCentres.php:97
+#: CustomerBranches.php:330 CustomerBranches.php:340 Customers.php:296
+#: Customers.php:305 Customers.php:313 Customers.php:324 Customers.php:334
+#: CustomerTypes.php:146 CustomerTypes.php:156 Departments.php:141
+#: Factors.php:134 FixedAssetCategories.php:137 GLAccounts.php:110
+#: GLAccounts.php:124 Locations.php:279 Locations.php:287 Locations.php:298
+#: Locations.php:307 Locations.php:316 Locations.php:325 Locations.php:334
+#: Locations.php:343 Locations.php:351 Manufacturers.php:185
+#: MRPDemandTypes.php:87 PaymentMethods.php:162 PaymentTerms.php:146
+#: PaymentTerms.php:153 PcExpenses.php:161 SalesCategories.php:146
+#: SalesCategories.php:153 SalesPeople.php:159 SalesPeople.php:166
+#: SalesPeople.php:172 SalesTypes.php:140 SalesTypes.php:150 Shippers.php:81
+#: Shippers.php:93 StockCategories.php:216 Stocks.php:767 Stocks.php:776
+#: Stocks.php:784 Stocks.php:792 Stocks.php:800 Stocks.php:808 Stocks.php:816
+#: Stocks.php:824 Suppliers.php:646 Suppliers.php:655 Suppliers.php:663
+#: SupplierTypes.php:126 TaxCategories.php:132 TaxGroups.php:135
+#: TaxGroups.php:143 TaxProvinces.php:129 UnitsOfMeasure.php:135
+#: WorkCentres.php:91 WorkCentres.php:97 WWW_Access.php:88
msgid "There are"
msgstr "يوجد"
@@ -227,50 +227,53 @@
#: AccountGroups.php:281 AddCustomerContacts.php:28 AddCustomerContacts.php:30
#: AddCustomerNotes.php:101 AddCustomerTypeNotes.php:94 AgedDebtors.php:454
-#: AgedSuppliers.php:276 Areas.php:144 AuditTrail.php:11 BOMExtendedQty.php:256
+#: AgedSuppliers.php:276 Areas.php:144 AuditTrail.php:11
+#: BOMExtendedQty.php:256 BOMIndented_conflict-20150211-201247.php:249
#: BOMIndented.php:249 BOMIndentedReverse.php:236 BOMInquiry.php:186
-#: BOMListing.php:110 BOMs.php:285 BOMs.php:990 CollectiveWorkOrderCost.php:281
-#: CompanyPreferences.php:100 CounterReturns.php:1625 CounterSales.php:2097
-#: CounterSales.php:2193 CreditStatus.php:21 Credit_Invoice.php:286
+#: BOMListing.php:110 BOMs.php:285 BOMs.php:990 BOMs_SingleLevel.php:231
+#: BOMs_SingleLevel.php:881 CollectiveWorkOrderCost.php:281
+#: CompanyPreferences.php:100 CounterReturns.php:1625 CounterSales.php:2101
+#: CounterSales.php:2197 Credit_Invoice.php:286 CreditStatus.php:21
#: CustEDISetup.php:17 CustItem.php:120 CustItem.php:210 CustItem.php:238
#: DebtorsAtPeriodEnd.php:129 DiscountCategories.php:12
#: DiscountCategories.php:149 DiscountMatrix.php:16 EDIMessageFormat.php:105
#: FixedAssetLocations.php:13 FixedAssetRegister.php:16
#: FixedAssetRegister.php:256 FixedAssetTransfer.php:14 FormDesigner.php:185
-#: GLBudgets.php:32 GLJournal.php:250 GLJournalInquiry.php:11
-#: HistoricalTestResults.php:42 InternalStockRequest.php:316
-#: InternalStockRequestInquiry.php:167 InventoryPlanning.php:459
-#: InventoryPlanningPrefSupplier.php:386 MRPReport.php:543
-#: MaintenanceTasks.php:14 MaintenanceUserSchedule.php:16 NoSalesItems.php:91
-#: PDFPickingList.php:29 PDFStockLocTransfer.php:16 POReport.php:60
-#: POReport.php:64 POReport.php:68 PO_AuthorisationLevels.php:10
-#: PO_SelectOSPurchOrder.php:153 PcAssignCashTabToTab.php:76
+#: GLBudgets.php:32 GLJournalInquiry.php:11 GLJournal.php:250
+#: HistoricalTestResults.php:42 InternalStockRequestInquiry.php:167
+#: InternalStockRequest.php:316 InventoryPlanning.php:459
+#: InventoryPlanningPrefSupplier.php:386 MaintenanceTasks.php:14
+#: MaintenanceUserSchedule.php:16 MasterSalesInquiry.php:1084
+#: MRPReport.php:543 NoSalesItems.php:91 PcAssignCashTabToTab.php:76
#: PcAssignCashTabToTab.php:156 PcAssignCashTabToTab.php:212
-#: PcAssignCashToTab.php:59 PcAssignCashToTab.php:144 PcAssignCashToTab.php:160
-#: PcAssignCashToTab.php:207 PriceMatrix.php:16 Prices.php:11
-#: PricesBasedOnMarkUp.php:8 Prices_Customer.php:35 ProductSpecs.php:38
-#: PurchData.php:241 PurchData.php:373 PurchData.php:401
-#: PurchaseByPrefSupplier.php:305 QATests.php:22 RecurringSalesOrders.php:320
-#: SalesAnalReptCols.php:51 SalesAnalRepts.php:14 SalesCategories.php:11
-#: SalesGLPostings.php:19 SalesGraph.php:39 SalesPeople.php:28
-#: SalesTypes.php:20 SelectAsset.php:48 SelectCompletedOrder.php:11
-#: SelectContract.php:69 SelectCreditItems.php:221 SelectCreditItems.php:292
-#: SelectCustomer.php:258 SelectGLAccount.php:86 SelectOrderItems.php:588
-#: SelectOrderItems.php:1501 SelectOrderItems.php:1601 SelectProduct.php:523
-#: SelectQASamples.php:45 SelectSalesOrder.php:545 SelectSupplier.php:14
-#: SelectSupplier.php:222 SelectWorkOrder.php:9 SelectWorkOrder.php:174
-#: SellThroughSupport.php:229 ShipmentCosting.php:11 Shipments.php:17
-#: Shippers.php:123 Shippers.php:160 Shipt_Select.php:8
-#: StockLocMovements.php:14 StockSerialItemResearch.php:30
-#: SupplierPriceList.php:14 SupplierPriceList.php:229 SupplierPriceList.php:399
-#: SupplierPriceList.php:458 SupplierPriceList.php:503
-#: SupplierTenderCreate.php:556 SupplierTenderCreate.php:664
-#: SupplierTenders.php:322 SupplierTenders.php:388 SupplierTransInquiry.php:10
-#: Suppliers.php:304 TestPlanResults.php:27 TopItems.php:118
-#: UnitsOfMeasure.php:10 WhereUsedInquiry.php:18 WorkCentres.php:113
-#: WorkOrderCosting.php:22 WorkOrderIssue.php:22 WorkOrderReceive.php:34
-#: WorkOrderStatus.php:58 Z_BottomUpCosts.php:57
-#: ../webSHOP/includes/header.php:251
+#: PcAssignCashToTab.php:59 PcAssignCashToTab.php:144
+#: PcAssignCashToTab.php:160 PcAssignCashToTab.php:207 PDFPickingList.php:29
+#: PDFStockLocTransfer.php:16 PO_AuthorisationLevels.php:10 POReport.php:60
+#: POReport.php:64 POReport.php:68 PO_SelectOSPurchOrder.php:153
+#: PriceMatrix.php:16 PricesBasedOnMarkUp.php:8 Prices_Customer.php:35
+#: Prices.php:11 ProductSpecs.php:38 PurchaseByPrefSupplier.php:305
+#: PurchData.php:241 PurchData.php:373 PurchData.php:401 QATests.php:22
+#: RecurringSalesOrders.php:320 SalesAnalReptCols.php:51 SalesAnalRepts.php:14
+#: SalesCategories.php:11 SalesGLPostings.php:19 SalesGraph.php:39
+#: SalesPeople.php:28 SalesTypes.php:20 SelectAsset.php:48
+#: SelectCompletedOrder.php:11 SelectContract.php:69 SelectCreditItems.php:221
+#: SelectCreditItems.php:292 SelectCustomer.php:258 SelectGLAccount.php:86
+#: SelectOrderItems.php:588 SelectOrderItems.php:1514
+#: SelectOrderItems.php:1614 SelectProduct.php:523 SelectQASamples.php:45
+#: SelectSalesOrder.php:545 SelectSupplier.php:14 SelectSupplier.php:222
+#: SelectWorkOrder.php:9 SelectWorkOrder.php:174 SellThroughSupport.php:229
+#: ShipmentCosting.php:11 Shipments.php:17 Shippers.php:123 Shippers.php:160
+#: Shipt_Select.php:8 StockLocMovements.php:14 StockSerialItemResearch.php:30
+#: SupplierPriceList.php:14 SupplierPriceList.php:229
+#: SupplierPriceList.php:399 SupplierPriceList.php:458
+#: SupplierPriceList.php:503 Suppliers.php:304 SupplierTenderCreate.php:556
+#: SupplierTenderCreate.php:664 SupplierTenders.php:322
+#: SupplierTenders.php:388 SupplierTransInquiry.php:10 TestPlanResults.php:27
+#: TopItems.php:118 UnitsOfMeasure.php:10 WhereUsedInquiry.php:18
+#: WorkCentres.php:113 WorkOrderCosting.php:22
+#: WorkOrderEntry_conflict-20141122-150523.php:11 WorkOrderIssue.php:22
+#: WorkOrderReceive.php:34 WorkOrderStatus.php:58 Z_BottomUpCosts.php:57
+#: ../webSHOP/includes/header.php:217
msgid "Search"
msgstr "إبحث"
@@ -296,6 +299,7 @@
#: AccountGroups.php:476 AddCustomerContacts.php:165
#: AddCustomerContacts.php:275 AddCustomerContacts.php:279
#: AddCustomerContacts.php:282 BOMs.php:140 BOMs.php:896 BOMs.php:898
+#: BOMs_SingleLevel.php:125 BOMs_SingleLevel.php:793 BOMs_SingleLevel.php:795
#: CompanyPreferences.php:423 CompanyPreferences.php:425
#: CompanyPreferences.php:438 CompanyPreferences.php:440
#: CompanyPreferences.php:453 CompanyPreferences.php:455
@@ -308,71 +312,73 @@
#: InternalStockRequestInquiry.php:438 InternalStockRequestInquiry.php:449
#: Labels.php:606 Labels.php:608 Labels.php:634 Locations.php:446
#: Locations.php:670 Locations.php:672 Locations.php:685 Locations.php:687
-#: Locations.php:703 MRP.php:554 MRP.php:558 MRP.php:562 MRP.php:566
-#: MRP.php:570 MRPCalendar.php:224 PDFChequeListing.php:65 PDFDIFOT.php:80
-#: PDFDeliveryDifferences.php:76 PDFWOPrint.php:602 PDFWOPrint.php:606
-#: PO_AuthorisationLevels.php:134 PO_AuthorisationLevels.php:139
-#: PO_Header.php:807 PO_PDFPurchOrder.php:413 PO_PDFPurchOrder.php:416
-#: PaymentMethods.php:227 PaymentMethods.php:228 PaymentMethods.php:229
-#: PaymentMethods.php:230 PaymentMethods.php:301 PaymentMethods.php:308
-#: PaymentMethods.php:315 PaymentMethods.php:322 PcAuthorizeExpenses.php:249
-#: ProductSpecs.php:188 ProductSpecs.php:409 ProductSpecs.php:414
-#: ProductSpecs.php:420 ProductSpecs.php:425 ProductSpecs.php:430
-#: ProductSpecs.php:562 ProductSpecs.php:608 ProductSpecs.php:610
-#: ProductSpecs.php:621 ProductSpecs.php:623 ProductSpecs.php:634
-#: ProductSpecs.php:636 ProductSpecs.php:647 ProductSpecs.php:649
-#: PurchData.php:296 PurchData.php:667 PurchData.php:670 QATests.php:293
-#: QATests.php:295 QATests.php:306 QATests.php:308 QATests.php:319
-#: QATests.php:321 QATests.php:332 QATests.php:334 QATests.php:345
-#: QATests.php:347 QATests.php:414 QATests.php:419 QATests.php:424
-#: QATests.php:429 QATests.php:434 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 SalesCategories.php:297
-#: SalesCategories.php:384 SalesCategories.php:388 SalesPeople.php:227
-#: SalesPeople.php:367 SalesPeople.php:369 SelectCustomer.php:757
-#: SelectProduct.php:231 SelectProduct.php:369 SelectQASamples.php:424
-#: SelectQASamples.php:518 SelectQASamples.php:520 SelectQASamples.php:574
-#: SelectQASamples.php:576 SelectQASamples.php:588 SelectQASamples.php:590
-#: ShipmentCosting.php:667 ShopParameters.php:289 ShopParameters.php:293
-#: ShopParameters.php:337 ShopParameters.php:341 ShopParameters.php:391
-#: ShopParameters.php:395 ShopParameters.php:413 ShopParameters.php:417
-#: ShopParameters.php:495 ShopParameters.php:499 StockClone.php:938
-#: StockClone.php:940 StockClone.php:963 StockClone.php:965 Stocks.php:1266
-#: Stocks.php:1268 Stocks.php:1291 Stocks.php:1293 SuppContractChgs.php:90
+#: Locations.php:703 MRPCalendar.php:224 MRP.php:554 MRP.php:558 MRP.php:562
+#: MRP.php:566 MRP.php:570 PaymentMethods.php:227 PaymentMethods.php:228
+#: PaymentMethods.php:229 PaymentMethods.php:230 PaymentMethods.php:301
+#: PaymentMethods.php:308 PaymentMethods.php:315 PaymentMethods.php:322
+#: PcAuthorizeExpenses.php:249 PDFChequeListing.php:65
+#: PDFDeliveryDifferences.php:76 PDFDIFOT.php:80 PDFWOPrint.php:608
+#: PDFWOPrint.php:612 PO_AuthorisationLevels.php:134
+#: PO_AuthorisationLevels.php:139 PO_Header.php:807 PO_PDFPurchOrder.php:413
+#: PO_PDFPurchOrder.php:416 ProductSpecs.php:188 ProductSpecs.php:409
+#: ProductSpecs.php:414 ProductSpecs.php:420 ProductSpecs.php:425
+#: ProductSpecs.php:430 ProductSpecs.php:562 ProductSpecs.php:608
+#: ProductSpecs.php:610 ProductSpecs.php:621 ProductSpecs.php:623
+#: ProductSpecs.php:634 ProductSpecs.php:636 ProductSpecs.php:647
+#: ProductSpecs.php:649 PurchData.php:296 PurchData.php:667 PurchData.php:670
+#: QATests.php:293 QATests.php:295 QATests.php:306 QATests.php:308
+#: QATests.php:319 QATests.php:321 QATests.php:332 QATests.php:334
+#: QATests.php:345 QATests.php:347 QATests.php:414 QATests.php:419
+#: QATests.php:424 QATests.php:429 QATests.php:434
+#: 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 SalesCategories.php:297 SalesCategories.php:384
+#: SalesCategories.php:388 SalesPeople.php:227 SalesPeople.php:367
+#: SalesPeople.php:369 SelectCustomer.php:757 SelectProduct.php:231
+#: SelectProduct.php:369 SelectQASamples.php:424 SelectQASamples.php:518
+#: SelectQASamples.php:520 SelectQASamples.php:574 SelectQASamples.php:576
+#: SelectQASamples.php:588 SelectQASamples.php:590 ShipmentCosting.php:667
+#: ShopParameters.php:289 ShopParameters.php:293 ShopParameters.php:337
+#: ShopParameters.php:341 ShopParameters.php:391 ShopParameters.php:395
+#: ShopParameters.php:413 ShopParameters.php:417 ShopParameters.php:495
+#: ShopParameters.php:499 StockClone.php:938 StockClone.php:940
+#: StockClone.php:963 StockClone.php:965 Stocks.php:1266 Stocks.php:1268
+#: Stocks.php:1291 Stocks.php:1293 SuppContractChgs.php:90
#: SystemParameters.php:479 SystemParameters.php:502 SystemParameters.php:543
#: SystemParameters.php:624 SystemParameters.php:632 SystemParameters.php:672
#: SystemParameters.php:763 SystemParameters.php:772 SystemParameters.php:780
#: SystemParameters.php:798 SystemParameters.php:805 SystemParameters.php:849
-#: SystemParameters.php:945 SystemParameters.php:1088 SystemParameters.php:1090
-#: SystemParameters.php:1100 SystemParameters.php:1102
-#: SystemParameters.php:1156 SystemParameters.php:1168
-#: SystemParameters.php:1170 SystemParameters.php:1208
-#: SystemParameters.php:1210 SystemParameters.php:1232
-#: SystemParameters.php:1234 TaxGroups.php:311 TaxGroups.php:314
-#: TaxGroups.php:365 TestPlanResults.php:304 TestPlanResults.php:532
-#: TestPlanResults.php:747 TestPlanResults.php:864 TestPlanResults.php:924
-#: TestPlanResults.php:928 UserGLAccounts.php:187 UserGLAccounts.php:196
-#: UserSettings.php:209 UserSettings.php:212 UserSettings.php:224
-#: UserSettings.php:227 WWW_Users.php:547 WWW_Users.php:549 WWW_Users.php:718
-#: WWW_Users.php:721 WWW_Users.php:734 WWW_Users.php:737 WWW_Users.php:749
-#: WWW_Users.php:752 WWW_Users.php:764 WWW_Users.php:767
-#: reportwriter/languages/en_US/reports.php:114
+#: SystemParameters.php:945 SystemParameters.php:1088
+#: SystemParameters.php:1090 SystemParameters.php:1100
+#: SystemParameters.php:1102 SystemParameters.php:1156
+#: SystemParameters.php:1168 SystemParameters.php:1170
+#: SystemParameters.php:1208 SystemParameters.php:1210
+#: SystemParameters.php:1232 SystemParameters.php:1234 TaxGroups.php:311
+#: TaxGroups.php:314 TaxGroups.php:365 TestPlanResults.php:304
+#: TestPlanResults.php:532 TestPlanResults.php:747 TestPlanResults.php:864
+#: TestPlanResults.php:924 TestPlanResults.php:928 UserGLAccounts.php:187
+#: UserGLAccounts.php:196 UserSettings.php:209 UserSettings.php:212
+#: UserSettings.php:224 UserSettings.php:227 WWW_Users.php:547
+#: WWW_Users.php:549 WWW_Users.php:718 WWW_Users.php:721 WWW_Users.php:734
+#: WWW_Users.php:737 WWW_Users.php:749 WWW_Users.php:752 WWW_Users.php:764
+#: WWW_Users.php:767
msgid "Yes"
msgstr "موافق"
#: AccountGroups.php:312 AccountGroups.php:472 AccountGroups.php:475
#: AddCustomerContacts.php:165 AddCustomerContacts.php:274
-#: AddCustomerContacts.php:278 AddCustomerContacts.php:281 BOMs.php:142
-#: BOMs.php:895 BOMs.php:899 BankAccounts.php:218 BankAccounts.php:412
-#: BankAccounts.php:414 BankAccounts.php:418 BankAccounts.php:426
-#: CompanyPreferences.php:422 CompanyPreferences.php:426
-#: CompanyPreferences.php:437 CompanyPreferences.php:441
-#: CompanyPreferences.php:452 CompanyPreferences.php:456
-#: ContractCosting.php:200 Currencies.php:344 Currencies.php:525
-#: Currencies.php:527 CustomerBranches.php:452 Customers.php:658
-#: Customers.php:1047 Customers.php:1054 Customers.php:1057
+#: AddCustomerContacts.php:278 AddCustomerContacts.php:281
+#: BankAccounts.php:218 BankAccounts.php:412 BankAccounts.php:414
+#: BankAccounts.php:418 BankAccounts.php:426 BOMs.php:142 BOMs.php:895
+#: BOMs.php:899 BOMs_SingleLevel.php:127 BOMs_SingleLevel.php:792
+#: BOMs_SingleLevel.php:796 CompanyPreferences.php:422
+#: CompanyPreferences.php:426 CompanyPreferences.php:437
+#: CompanyPreferences.php:441 CompanyPreferences.php:452
+#: CompanyPreferences.php:456 ContractCosting.php:200 Currencies.php:344
+#: Currencies.php:525 Currencies.php:527 CustomerBranches.php:452
+#: Customers.php:658 Customers.php:1047 Customers.php:1054 Customers.php:1057
#: DailyBankTransactions.php:217 DeliveryDetails.php:1159
#: DeliveryDetails.php:1200 DeliveryDetails.php:1203 FormDesigner.php:99
#: GLAccountUsers.php:183 GLAccountUsers.php:193 GLTransInquiry.php:93
@@ -379,15 +385,15 @@
#: InternalStockRequestInquiry.php:436 InternalStockRequestInquiry.php:447
#: Labels.php:605 Labels.php:609 Labels.php:635 Locations.php:446
#: Locations.php:675 Locations.php:677 Locations.php:690 Locations.php:692
-#: Locations.php:704 MRP.php:552 MRP.php:556 MRP.php:560 MRP.php:564
-#: MRP.php:568 MRPCalendar.php:226 NoSalesItems.php:191 PDFChequeListing.php:64
-#: PDFDIFOT.php:79 PDFDeliveryDifferences.php:75 PDFWOPrint.php:603
-#: PDFWOPrint.php:607 PO_AuthorisationLevels.php:136
+#: Locations.php:704 MRPCalendar.php:226 MRP.php:552 MRP.php:556 MRP.php:560
+#: MRP.php:564 MRP.php:568 NoSalesItems.php:191 PaymentMethods.php:227
+#: PaymentMethods.php:228 PaymentMethods.php:229 PaymentMethods.php:230
+#: PaymentMethods.php:302 PaymentMethods.php:309 PaymentMethods.php:316
+#: PaymentMethods.php:323 PcAuthorizeExpenses.php:247 PDFChequeListing.php:64
+#: PDFDeliveryDifferences.php:75 PDFDIFOT.php:79 PDFWOPrint.php:609
+#: PDFWOPrint.php:613 PO_AuthorisationLevels.php:136
#: PO_AuthorisationLevels.php:141 PO_Header.php:806 PO_PDFPurchOrder.php:414
-#: PO_PDFPurchOrder.php:417 PaymentMethods.php:227 PaymentMethods.php:228
-#: PaymentMethods.php:229 PaymentMethods.php:230 PaymentMethods.php:302
-#: PaymentMethods.php:309 PaymentMethods.php:316 PaymentMethods.php:323
-#: PcAuthorizeExpenses.php:247 ProductSpecs.php:191 ProductSpecs.php:411
+#: PO_PDFPurchOrder.php:417 ProductSpecs.php:191 ProductSpecs.php:411
#: ProductSpecs.php:417 ProductSpecs.php:422 ProductSpecs.php:427
#: ProductSpecs.php:432 ProductSpecs.php:613 ProductSpecs.php:615
#: ProductSpecs.php:626 ProductSpecs.php:628 ProductSpecs.php:639
@@ -416,54 +422,51 @@
#: SystemParameters.php:625 SystemParameters.php:633 SystemParameters.php:673
#: SystemParameters.php:764 SystemParameters.php:773 SystemParameters.php:781
#: SystemParameters.php:799 SystemParameters.php:806 SystemParameters.php:850
-#: SystemParameters.php:946 SystemParameters.php:1087 SystemParameters.php:1091
-#: SystemParameters.php:1099 SystemParameters.php:1103
-#: SystemParameters.php:1157 SystemParameters.php:1167
-#: SystemParameters.php:1171 SystemParameters.php:1207
-#: SystemParameters.php:1211 SystemParameters.php:1231
-#: SystemParameters.php:1235 TaxGroups.php:312 TaxGroups.php:315
-#: TaxGroups.php:367 TestPlanResults.php:306 TestPlanResults.php:535
-#: TestPlanResults.php:749 TestPlanResults.php:866 TestPlanResults.php:925
-#: TestPlanResults.php:927 UserGLAccounts.php:189 UserGLAccounts.php:199
-#: UserSettings.php:208 UserSettings.php:211 UserSettings.php:223
-#: UserSettings.php:226 WWW_Users.php:546 WWW_Users.php:550 WWW_Users.php:717
-#: WWW_Users.php:720 WWW_Users.php:733 WWW_Users.php:736 WWW_Users.php:748
-#: WWW_Users.php:751 WWW_Users.php:763 WWW_Users.php:766
-#: includes/PDFLowGPPageHeader.inc:44
-#: reportwriter/languages/en_US/reports.php:82
+#: SystemParameters.php:946 SystemParameters.php:1087
+#: SystemParameters.php:1091 SystemParameters.php:1099
+#: SystemParameters.php:1103 SystemParameters.php:1157
+#: SystemParameters.php:1167 SystemParameters.php:1171
+#: SystemParameters.php:1207 SystemParameters.php:1211
+#: SystemParameters.php:1231 SystemParameters.php:1235 TaxGroups.php:312
+#: TaxGroups.php:315 TaxGroups.php:367 TestPlanResults.php:306
+#: TestPlanResults.php:535 TestPlanResults.php:749 TestPlanResults.php:866
+#: TestPlanResults.php:925 TestPlanResults.php:927 UserGLAccounts.php:189
+#: UserGLAccounts.php:199 UserSettings.php:208 UserSettings.php:211
+#: UserSettings.php:223 UserSettings.php:226 WWW_Users.php:546
+#: WWW_Users.php:550 WWW_Users.php:717 WWW_Users.php:720 WWW_Users.php:733
+#: WWW_Users.php:736 WWW_Users.php:748 WWW_Users.php:751 WWW_Users.php:763
+#: WWW_Users.php:766 includes/PDFLowGPPageHeader.inc:44
msgid "No"
msgstr "ﻻ"
#: AccountGroups.php:321 AccountSections.php:196 AddCustomerContacts.php:158
#: AddCustomerNotes.php:137 AddCustomerTypeNotes.php:131 Areas.php:164
-#: BOMs.php:198 BankAccounts.php:243 COGSGLPostings.php:115
-#: COGSGLPostings.php:222 CreditStatus.php:175 Currencies.php:374
-#: Currencies.php:391 CustItem.php:166 CustomerBranches.php:456
-#: CustomerTypes.php:205 Customers.php:1131 Customers.php:1165
-#: Departments.php:186 EDIMessageFormat.php:150 Factors.php:334
-#: FixedAssetCategories.php:190 FixedAssetLocations.php:111
-#: FreightCosts.php:253 GLAccounts.php:335 GLTags.php:96 GeocodeSetup.php:173
+#: BankAccounts.php:243 BOMs.php:198 BOMs_SingleLevel.php:153
+#: COGSGLPostings.php:115 COGSGLPostings.php:222 CreditStatus.php:175
+#: Currencies.php:374 Currencies.php:391 CustItem.php:166
+#: CustomerBranches.php:456 Customers.php:1131 Customers.php:1165
+#: CustomerTypes.php:205 Departments.php:186 EDIMessageFormat.php:150
+#: Factors.php:334 FixedAssetCategories.php:190 FixedAssetLocations.php:111
+#: FreightCosts.php:253 GeocodeSetup.php:173 GLAccounts.php:335 GLTags.php:96
#: ImportBankTransAnalysis.php:223 InternalStockRequest.php:297 Labels.php:333
-#: Labels.php:358 Locations.php:439 MRPDemandTypes.php:120 MRPDemands.php:309
-#: MailingGroupMaintenance.php:178 MaintenanceTasks.php:118
-#: Manufacturers.php:260 PO_AuthorisationLevels.php:151 PaymentMethods.php:232
-#: PaymentTerms.php:205 PcAssignCashToTab.php:291
-#: PcClaimExpensesFromTab.php:280 PcExpenses.php:226 PcTabs.php:256
-#: PcTypeTabs.php:180 PriceMatrix.php:293 Prices.php:253
-#: Prices_Customer.php:286 ProductSpecs.php:465 PurchData.php:312
-#: QATests.php:467 SalesCategories.php:305 SalesGLPostings.php:137
-#: SalesGLPostings.php:255 SalesPeople.php:240 SalesTypes.php:206
-#: SecurityTokens.php:116 SelectCustomer.php:733 SelectCustomer.php:759
-#: SelectCustomer.php:814 SelectCustomer.php:832 SelectCustomer.php:856
-#: SelectCustomer.php:873 SelectGLAccount.php:139 SelectGLAccount.php:154
-#: SelectQASamples.php:417 SellThroughSupport.php:298 Shippers.php:144
-#: StockCategories.php:296 SuppTransGLAnalysis.php:126 SupplierContacts.php:165
-#: SupplierTenderCreate.php:157 SupplierTypes.php:170 TaxAuthorities.php:172
-#: TaxCategories.php:184 TaxGroups.php:191 TaxProvinces.php:179
-#: UnitsOfMeasure.php:185 WWW_Access.php:132 WWW_Users.php:391
-#: WorkCentres.php:145 includes/InputSerialItems.php:110
-#: includes/OutputSerialItems.php:20
-#: reportwriter/languages/en_US/reports.php:143
+#: Labels.php:358 Locations.php:439 MailingGroupMaintenance.php:178
+#: MaintenanceTasks.php:118 Manufacturers.php:260 MRPDemands.php:309
+#: MRPDemandTypes.php:120 PaymentMethods.php:232 PaymentTerms.php:205
+#: PcAssignCashToTab.php:291 PcClaimExpensesFromTab.php:280 PcExpenses.php:226
+#: PcTabs.php:256 PcTypeTabs.php:180 PO_AuthorisationLevels.php:151
+#: PriceMatrix.php:293 Prices_Customer.php:286 Prices.php:253
+#: ProductSpecs.php:465 PurchData.php:312 QATests.php:467
+#: SalesCategories.php:305 SalesGLPostings.php:137 SalesGLPostings.php:255
+#: SalesPeople.php:240 SalesTypes.php:206 SecurityTokens.php:116
+#: SelectCustomer.php:733 SelectCustomer.php:759 SelectCustomer.php:814
+#: SelectCustomer.php:832 SelectCustomer.php:856 SelectCustomer.php:873
+#: SelectGLAccount.php:139 SelectGLAccount.php:154 SelectQASamples.php:417
+#: SellThroughSupport.php:298 Shippers.php:144 StockCategories.php:296
+#: SupplierContacts.php:165 SupplierTenderCreate.php:157 SupplierTypes.php:170
+#: SuppTransGLAnalysis.php:126 TaxAuthorities.php:172 TaxCategories.php:184
+#: TaxGroups.php:191 TaxProvinces.php:179 UnitsOfMeasure.php:185
+#: WorkCentres.php:145 WWW_Access.php:132 WWW_Users.php:391
+#: includes/InputSerialItems.php:110 includes/OutputSerialItems.php:20
#, php-format
msgid "Edit"
msgstr "تحرير"
@@ -474,24 +477,25 @@
#: AccountGroups.php:322 AccountSections.php:201 AddCustomerContacts.php:159
#: AddCustomerNotes.php:138 AddCustomerTypeNotes.php:132 Areas.php:165
-#: BOMs.php:200 BankAccounts.php:244 COGSGLPostings.php:116
-#: COGSGLPostings.php:223 ContractBOM.php:271 ContractOtherReqts.php:123
-#: CounterReturns.php:740 CounterSales.php:836 CreditStatus.php:176
-#: Credit_Invoice.php:419 Currencies.php:377 CustItem.php:167
-#: CustomerReceipt.php:1009 CustomerTypes.php:206 Customers.php:1166
-#: Departments.php:187 DiscountCategories.php:238 DiscountMatrix.php:183
-#: EDIMessageFormat.php:151 FixedAssetCategories.php:191 FreightCosts.php:254
-#: GLAccounts.php:336 GLJournal.php:431 GLTags.php:97 GeocodeSetup.php:174
+#: BankAccounts.php:244 BOMs.php:200 BOMs_SingleLevel.php:154
+#: COGSGLPostings.php:116 COGSGLPostings.php:223 ContractBOM.php:271
+#: ContractOtherReqts.php:123 CounterReturns.php:740 CounterSales.php:836
+#: Credit_Invoice.php:419 CreditStatus.php:176 Currencies.php:377
+#: CustItem.php:167 CustomerReceipt.php:1009 Customers.php:1166
+#: CustomerTypes.php:206 Departments.php:187 DiscountCategories.php:238
+#: DiscountMatrix.php:183 EDIMessageFormat.php:151
+#: FixedAssetCategories.php:191 FreightCosts.php:254 GeocodeSetup.php:174
+#: GLAccounts.php:336 GLJournal.php:431 GLTags.php:97
#: ImportBankTransAnalysis.php:224 InternalStockCategoriesByRole.php:184
#: InternalStockRequest.php:298 Labels.php:334 Labels.php:359 Labels.php:612
-#: Locations.php:440 MRPDemandTypes.php:121 MRPDemands.php:310
-#: MailingGroupMaintenance.php:179 MaintenanceTasks.php:119
-#: Manufacturers.php:261 PO_AuthorisationLevels.php:153 PO_Items.php:768
-#: PaymentMethods.php:233 PaymentTerms.php:206 Payments.php:1155
+#: Locations.php:440 MailingGroupMaintenance.php:179 MaintenanceTasks.php:119
+#: Manufacturers.php:261 MRPDemands.php:310 MRPDemandTypes.php:121
+#: PaymentMethods.php:233 Payments.php:1283 PaymentTerms.php:206
#: PcAssignCashToTab.php:295 PcClaimExpensesFromTab.php:281 PcExpenses.php:227
#: PcExpensesTypeTab.php:186 PcTabs.php:257 PcTypeTabs.php:181
-#: PriceMatrix.php:292 Prices.php:254 Prices_Customer.php:287
-#: ProductSpecs.php:466 PurchData.php:314 PurchData.php:721 QATests.php:468
+#: PO_AuthorisationLevels.php:153 PO_Items.php:768 PriceMatrix.php:292
+#: Prices_Customer.php:287 Prices.php:254 ProductSpecs.php:466
+#: PurchData.php:314 PurchData.php:721 QATests.php:468
#: RelatedItemsUpdate.php:161 RelatedItemsUpdate.php:176
#: SalesAnalReptCols.php:299 SalesAnalRepts.php:307 SalesCategories.php:306
#: SalesGLPostings.php:138 SalesGLPostings.php:256 SalesPeople.php:241
@@ -498,19 +502,18 @@
#: SalesTypes.php:207 SecurityTokens.php:117 SelectCreditItems.php:776
#: SelectCustomer.php:734 SelectCustomer.php:760 SelectCustomer.php:815
#: SelectCustomer.php:833 SelectCustomer.php:857 SelectCustomer.php:874
-#: SelectOrderItems.php:1413 SelectQASamples.php:418 SellThroughSupport.php:299
-#: Shipments.php:438 Shippers.php:145 SpecialOrder.php:667
-#: StockCategories.php:297 StockCategories.php:626 StockLocTransfer.php:325
-#: SuppContractChgs.php:99 SuppCreditGRNs.php:117 SuppFixedAssetChgs.php:86
-#: SuppInvGRNs.php:151 SuppShiptChgs.php:90 SuppTransGLAnalysis.php:127
-#: SupplierContacts.php:166 SupplierTenderCreate.php:422
-#: SupplierTenderCreate.php:452 SupplierTypes.php:172 TaxAuthorities.php:173
-#: TaxCategories.php:186 TaxGroups.php:192 TaxProvinces.php:180
-#: TestPlanResults.php:920 UnitsOfMeasure.php:186 WOSerialNos.php:335
-#: WWW_Access.php:133 WWW_Users.php:392 WorkCentres.php:146
-#: WorkOrderEntry.php:865 includes/InputSerialItemsKeyed.php:60
+#: SelectOrderItems.php:1426 SelectQASamples.php:418
+#: SellThroughSupport.php:299 Shipments.php:438 Shippers.php:145
+#: SpecialOrder.php:667 StockCategories.php:297 StockCategories.php:626
+#: StockLocTransfer.php:325 SuppContractChgs.php:99 SuppCreditGRNs.php:117
+#: SuppFixedAssetChgs.php:86 SuppInvGRNs.php:151 SupplierContacts.php:166
+#: SupplierTenderCreate.php:422 SupplierTenderCreate.php:452
+#: SupplierTypes.php:172 SuppShiptChgs.php:90 SuppTransGLAnalysis.php:127
+#: TaxAuthorities.php:173 TaxCategories.php:186 TaxGroups.php:192
+#: TaxProvinces.php:180 TestPlanResults.php:920 UnitsOfMeasure.php:186
+#: WorkCentres.php:146 WorkOrderEntry.php:865 WOSerialNos.php:335
+#: WWW_Access.php:133 WWW_Users.php:392 includes/InputSerialItemsKeyed.php:60
#: includes/OutputSerialItems.php:99
-#: reportwriter/languages/en_US/reports.php:141
#, php-format
msgid "Delete"
msgstr "حذف"
@@ -540,28 +543,31 @@
#: GLCashFlowsSetup.php:172 GLTags.php:68 GoodsReceived.php:298
#: GoodsReceived.php:304 GoodsReceived.php:311 GoodsReceived.php:819
#: ImportBankTransAnalysis.php:154 ImportBankTransAnalysis.php:185
-#: InternalStockRequest.php:255 InternalStockRequestAuthorisation.php:123
-#: InternalStockRequestFulfill.php:364 LocationUsers.php:177
-#: MRPCalendar.php:315 PO_AuthoriseMyOrders.php:142 Payments.php:981
-#: PcAuthorizeExpenses.php:109 PcAuthorizeExpenses.php:294 PricesByCost.php:223
-#: PurchData.php:758 ReorderLevelLocation.php:140 RevisionTranslations.php:111
-#: SMTPServer.php:126 SecurityTokens.php:136 SelectCreditItems.php:954
-#: SellThroughSupport.php:476 ShopParameters.php:610 StockCostUpdate.php:196
+#: InternalStockRequestAuthorisation.php:123
+#: InternalStockRequestFulfill.php:364 InternalStockRequest.php:255
+#: LocationUsers.php:177 MRPCalendar.php:315 Payments.php:1109
+#: Payments.php:1350 PcAuthorizeExpenses.php:109 PcAuthorizeExpenses.php:294
+#: PO_AuthoriseMyOrders.php:142 PricesByCost.php:223 PurchData.php:758
+#: ReorderLevelLocation.php:140 RevisionTranslations.php:111
+#: SecurityTokens.php:136 SelectCreditItems.php:954 SellThroughSupport.php:476
+#: ShopParameters.php:610 SMTPServer.php:126 StockCostUpdate.php:196
#: StockReorderLevel.php:111 Stocks.php:1452 SystemParameters.php:1246
-#: UserGLAccounts.php:159 UserLocations.php:178 WOSerialNos.php:345
-#: WorkOrderEntry.php:887 reportwriter/languages/en_US/reports.php:156
+#: UserGLAccounts.php:159 UserLocations.php:178
+#: WorkOrderEntry_conflict-20141122-150523.php:661 WorkOrderEntry.php:887
+#: WOSerialNos.php:345
msgid "Update"
msgstr ""
-#: AccountGroups.php:378 AccountGroups.php:418 AnalysisHorizontalIncome.php:125
-#: AnalysisHorizontalIncome.php:526 AnalysisHorizontalPosition.php:79
-#: AnalysisHorizontalPosition.php:362 DailyBankTransactions.php:256
-#: GLAccountUsers.php:253 GLBalanceSheet.php:720 GLCashFlowsIndirect.php:749
-#: GLCashFlowsIndirect.php:782 GLCashFlowsSetup.php:180 GLProfit_Loss.php:1317
-#: GLTrialBalance.php:740 InternalStockRequestInquiry.php:263
-#: PurchasesReport.php:231 PurchasesReport.php:253 SecurityTokens.php:140
-#: SecurityTokens.php:156 UserGLAccounts.php:259
-#: Z_GLAccountUsersCopyAuthority.php:96 includes/Login.php:8
+#: AccountGroups.php:378 AccountGroups.php:418
+#: AnalysisHorizontalIncome.php:125 AnalysisHorizontalIncome.php:526
+#: AnalysisHorizontalPosition.php:79 AnalysisHorizontalPosition.php:362
+#: DailyBankTransactions.php:256 GLAccountUsers.php:253 GLBalanceSheet.php:720
+#: GLCashFlowsIndirect.php:749 GLCashFlowsIndirect.php:782
+#: GLCashFlowsSetup.php:180 GLProfit_Loss.php:1317 GLTrialBalance.php:740
+#: InternalStockRequestInquiry.php:263 PurchasesReport.php:231
+#: PurchasesReport.php:253 SecurityTokens.php:140 SecurityTokens.php:156
+#: UserGLAccounts.php:259 Z_GLAccountUsersCopyAuthority.php:96
+#: includes/Login.php:8
msgid "Return"
msgstr ""
@@ -678,23 +684,24 @@
msgid "New Account Section Details"
msgstr ""
-#: AccountSections.php:285 AddCustomerContacts.php:297 AddCustomerNotes.php:242
-#: AddCustomerTypeNotes.php:221 Areas.php:229 BOMs.php:916 BankAccounts.php:433
+#: AccountSections.php:285 AddCustomerContacts.php:297
+#: AddCustomerNotes.php:242 AddCustomerTypeNotes.php:221 Areas.php:229
+#: BankAccounts.php:433 BOMs.php:916 BOMs_SingleLevel.php:809
#: COGSGLPostings.php:371 CreditStatus.php:259 Currencies.php:537
#: CustLoginSetup.php:273 Departments.php:258 DiscountMatrix.php:142
#: EDIMessageFormat.php:248 FixedAssetCategories.php:350
-#: FixedAssetLocations.php:161 FreightCosts.php:371 GLAccounts.php:285
-#: GeocodeSetup.php:271 Labels.php:647 Locations.php:716 MRPDemandTypes.php:188
-#: MRPDemands.php:424 Manufacturers.php:375 OffersReceived.php:57
-#: OffersReceived.php:146 PO_AuthorisationLevels.php:264 PaymentMethods.php:332
-#: PaymentTerms.php:310 PriceMatrix.php:236 Prices_Customer.php:369
+#: FixedAssetLocations.php:161 FreightCosts.php:371 GeocodeSetup.php:271
+#: GLAccounts.php:285 Labels.php:647 Locations.php:716 Manufacturers.php:375
+#: MRPDemands.php:424 MRPDemandTypes.php:188 OffersReceived.php:57
+#: OffersReceived.php:146 PaymentMethods.php:332 PaymentTerms.php:310
+#: PO_AuthorisationLevels.php:264 PriceMatrix.php:236 Prices_Customer.php:369
#: ProductSpecs.php:661 QATests.php:359 SalesAnalReptCols.php:552
#: SalesAnalRepts.php:519 SalesGLPostings.php:427 SalesPeople.php:381
#: SelectQASamples.php:531 SelectQASamples.php:601 Shippers.php:203
-#: StockCategories.php:653 SuppLoginSetup.php:291 SupplierContacts.php:284
+#: StockCategories.php:653 SupplierContacts.php:284 SuppLoginSetup.php:291
#: TaxAuthorities.php:327 TaxCategories.php:244 TaxProvinces.php:234
-#: TestPlanResults.php:967 UnitsOfMeasure.php:241 WWW_Users.php:835
-#: WorkCentres.php:289
+#: TestPlanResults.php:967 UnitsOfMeasure.php:241 WorkCentres.php:289
+#: WWW_Users.php:835
msgid "Enter Information"
msgstr "أدخل المعلومات"
@@ -735,11 +742,12 @@
#: AddCustomerContacts.php:63 AddCustomerNotes.php:51
#: AddCustomerTypeNotes.php:48 Areas.php:72 CustomerTypes.php:68
#: DeliveryDetails.php:809 DeliveryDetails.php:826 Factors.php:105
-#: FixedAssetItems.php:255 MRPCalendar.php:176 PO_Items.php:380
-#: PcAssignCashToTab.php:102 PcClaimExpensesFromTab.php:86 PcExpenses.php:98
-#: PcTabs.php:124 PcTypeTabs.php:63 ProductSpecs.php:315 QATests.php:76
+#: FixedAssetItems.php:255 MRPCalendar.php:176 PcAssignCashToTab.php:102
+#: PcClaimExpensesFromTab.php:86 PcExpenses.php:98 PcTabs.php:124
+#: PcTypeTabs.php:63 PO_Items.php:380 ProductSpecs.php:315 QATests.php:76
#: SalesAnalReptCols.php:129 SalesPeople.php:105 SalesTypes.php:66
-#: SelectQASamples.php:85 Stocks.php:594 SupplierTypes.php:68 Suppliers.php:531
+#: SelectQASamples.php:85 Stocks.php:594 Suppliers.php:531
+#: SupplierTypes.php:68
msgid "has been updated"
msgstr ""
@@ -757,7 +765,7 @@
#: PrintWOItemSlip.php:195 PrintWOItemSlip.php:206 ProductSpecs.php:164
#: ProductSpecs.php:385 QATests.php:391 SalesPeople.php:208
#: SelectCustomer.php:727 StockDispatch.php:277 StockDispatch.php:288
-#: StockDispatch.php:299 SuppTransGLAnalysis.php:108 SupplierContacts.php:152
+#: StockDispatch.php:299 SupplierContacts.php:152 SuppTransGLAnalysis.php:108
#: Tax.php:411 TestPlanResults.php:508 UserBankAccounts.php:164
#: UserGLAccounts.php:157 UserLocations.php:176
#: includes/InputSerialItemsFile.php:92 includes/InputSerialItemsFile.php:144
@@ -781,18 +789,22 @@
#: CustomerInquiry.php:410 CustomerInquiry.php:445 CustomerInquiry.php:491
#: Customers.php:1121 Customers.php:1129 EmailCustTrans.php:16
#: EmailCustTrans.php:65 Factors.php:246 Factors.php:297 Locations.php:639
-#: OrderDetails.php:127 PDFRemittanceAdvice.php:251 PDFWOPrint.php:593
-#: PDFWOPrint.php:596 PDFWOPrint.php:676 PDFWOPrint.php:679
-#: PO_PDFPurchOrder.php:400 PO_PDFPurchOrder.php:403 PrintCustStatements.php:99
-#: PrintCustTrans.php:740 PrintCustTransPortrait.php:788
-#: PrintCustTransPortrait.php:1034 PrintCustTransPortrait.php:1090
-#: SelectCustomer.php:408 SelectCustomer.php:730 SelectSupplier.php:290
-#: SupplierContacts.php:156 SupplierContacts.php:277 UserSettings.php:184
-#: WWW_Users.php:333 includes/PDFPickingListHeader.inc:25
-#: includes/PDFStatementPageHeader.inc:76 includes/PDFTransPageHeader.inc:85
+#: OrderDetails.php:127 PDFRemittanceAdvice.php:251 PDFWOPrint.php:599
+#: PDFWOPrint.php:602 PDFWOPrint.php:682 PDFWOPrint.php:685
+#: PO_PDFPurchOrder.php:400 PO_PDFPurchOrder.php:403
+#: PrintCustStatements.php:99 PrintCustTrans.php:740
+#: PrintCustTransPortrait_conflict-20150205-211428.php:793
+#: PrintCustTransPortrait_conflict-20150205-211428.php:1039
+#: PrintCustTransPortrait_conflict-20150205-211428.php:1095
+#: PrintCustTransPortrait.php:788 PrintCustTransPortrait.php:1034
+#: PrintCustTransPortrait.php:1090 SelectCustomer.php:408
+#: SelectCustomer.php:730 SelectSupplier.php:290 SupplierContacts.php:156
+#: SupplierContacts.php:277 UserSettings.php:184 WWW_Users.php:333
+#: includes/PDFPickingListHeader.inc:25 includes/PDFStatementPageHeader.inc:76
+#: includes/PDFTransPageHeader.inc:85
#: includes/PDFTransPageHeaderPortrait.inc:113 includes/PDFWOPageHeader.inc:19
-#: includes/PO_PDFOrderPageHeader.inc:29 ../webSHOP/Checkout.php:298
-#: ../webSHOP/Register.php:595
+#: includes/PO_PDFOrderPageHeader.inc:29 ../webSHOP/Checkout.php:443
+#: ../webSHOP/Register.php:607
msgid "Email"
msgstr ""
@@ -804,14 +816,14 @@
#: AddCustomerContacts.php:138 AddCustomerContacts.php:289
#: AnalysisHorizontalIncome.php:173 AnalysisHorizontalPosition.php:123
#: Customers.php:1122 Customers.php:1130 GLCashFlowsIndirect.php:130
-#: GLCashFlowsIndirect.php:450 PDFQuotation.php:252
-#: PDFQuotationPortrait.php:249 PcAssignCashTabToTab.php:261
+#: GLCashFlowsIndirect.php:450 PcAssignCashTabToTab.php:261
#: PcAssignCashTabToTab.php:384 PcAssignCashToTab.php:256
#: PcAssignCashToTab.php:394 PcAuthorizeExpenses.php:98
#: PcClaimExpensesFromTab.php:242 PcClaimExpensesFromTab.php:409
-#: PcReportExpense.php:137 PcReportTab.php:336 PurchasesReport.php:56
-#: SelectCustomer.php:732 ShopParameters.php:198 SystemParameters.php:411
-#: WOSerialNos.php:306 WOSerialNos.php:312
+#: PcReportExpense.php:137 PcReportTab.php:336 PDFQuotation.php:252
+#: PDFQuotationPortrait.php:249 PurchasesReport.php:56 SelectCustomer.php:732
+#: ShopParameters.php:198 SystemParameters.php:411 WOSerialNos.php:306
+#: WOSerialNos.php:312
msgid "Notes"
msgstr ""
@@ -837,16 +849,17 @@
msgstr ""
#: AddCustomerContacts.php:236 Factors.php:234 SupplierContacts.php:239
-#: ../webSHOP/Checkout.php:379 ../webSHOP/Register.php:610
+#: ../webSHOP/Checkout.php:527 ../webSHOP/Register.php:622
msgid "Contact Name"
msgstr ""
-#: AddCustomerContacts.php:254 Contracts.php:788 PDFRemittanceAdvice.php:247
-#: PO_Header.php:1026 PO_Header.php:1111 SelectCreditItems.php:246
-#: SelectCustomer.php:406 SelectOrderItems.php:626 SupplierTenderCreate.php:395
+#: AddCustomerContacts.php:254 Contracts.php:788 MasterSalesInquiry.php:1128
+#: MasterSalesInquiry.php:3062 PDFRemittanceAdvice.php:247 PO_Header.php:1026
+#: PO_Header.php:1111 SelectCreditItems.php:246 SelectCustomer.php:406
+#: SelectOrderItems.php:626 SupplierTenderCreate.php:395
#: includes/PDFStatementPageHeader.inc:72 includes/PDFTransPageHeader.inc:84
-#: includes/PDFTransPageHeaderPortrait.inc:109 ../webSHOP/Checkout.php:389
-#: ../webSHOP/Register.php:255 ../webSHOP/Register.php:723
+#: includes/PDFTransPageHeaderPortrait.inc:109 ../webSHOP/Checkout.php:537
+#: ../webSHOP/Register.php:260 ../webSHOP/Register.php:735
msgid "Phone"
msgstr ""
@@ -897,37 +910,38 @@
#: AddCustomerTypeNotes.php:111 AddCustomerTypeNotes.php:211
#: AgedControlledInventory.php:47 BankMatching.php:281
#: BankReconciliation.php:212 BankReconciliation.php:289
-#: ContractCosting.php:177 CustWhereAlloc.php:133 CustomerAccount.php:252
-#: CustomerAllocations.php:348 CustomerAllocations.php:378
-#: CustomerInquiry.php:252 CustomerTransInquiry.php:100 GLAccountReport.php:347
+#: ContractCosting.php:177 CustomerAccount.php:252 CustomerAllocations.php:348
+#: CustomerAllocations.php:378 CustomerInquiry.php:252
+#: CustomerTransInquiry.php:100 CustWhereAlloc.php:133 GLAccountReport.php:347
#: GLTransInquiry.php:47 GoodsReceived.php:130 MRPCalendar.php:219
-#: PDFOrdersInvoiced.php:378 PDFRemittanceAdvice.php:308 PDFWOPrint.php:450
-#: PaymentAllocations.php:67 PcAssignCashTabToTab.php:257
-#: PcAssignCashToTab.php:252 PcAuthorizeExpenses.php:94 PcReportExpense.php:133
-#: PrintCustTrans.php:822 PrintCustTransPortrait.php:902
-#: PrintWOItemSlip.php:186 PrintWOItemSlip.php:197 PrintWOItemSlip.php:208
-#: PurchasesReport.php:67 ReverseGRN.php:401 SelectCustomer.php:810
-#: SelectCustomer.php:852 ShipmentCosting.php:538 ShipmentCosting.php:615
-#: Shipments.php:489 StockDispatch.php:279 StockDispatch.php:290
-#: StockDispatch.php:301 StockLocMovements.php:92 StockMovements.php:105
-#: StockSerialItemResearch.php:82 SuppWhereAlloc.php:132
-#: SupplierAllocations.php:458 SupplierAllocations.php:572
-#: SupplierAllocations.php:647 SupplierInquiry.php:204
-#: SupplierTransInquiry.php:111 Tax.php:408 Z_CheckGLTransBalance.php:11
+#: PaymentAllocations.php:67 Payments.php:1323 PcAssignCashTabToTab.php:257
+#: PcAssignCashToTab.php:252 PcAuthorizeExpenses.php:94
+#: PcReportExpense.php:133 PDFOrdersInvoiced.php:378
+#: PDFRemittanceAdvice.php:308 PDFWOPrint.php:456 PrintCustTrans.php:822
+#: PrintCustTransPortrait_conflict-20150205-211428.php:907
+#: PrintCustTransPortrait.php:902 PrintWOItemSlip.php:186
+#: PrintWOItemSlip.php:197 PrintWOItemSlip.php:208 PurchasesReport.php:67
+#: ReverseGRN.php:401 SelectCustomer.php:810 SelectCustomer.php:852
+#: ShipmentCosting.php:538 ShipmentCosting.php:615 Shipments.php:489
+#: StockDispatch.php:279 StockDispatch.php:290 StockDispatch.php:301
+#: StockLocMovements.php:92 StockMovements.php:105
+#: StockSerialItemResearch.php:82 SupplierAllocations.php:458
+#: SupplierAllocations.php:572 SupplierAllocations.php:647
+#: SupplierInquiry.php:204 SupplierTransInquiry.php:111 SuppWhereAlloc.php:132
+#: Tax.php:408 Z_CheckGLTransBalance.php:11
#: includes/PDFQuotationPageHeader.inc:31
#: includes/PDFQuotationPortraitPageHeader.inc:80
#: includes/PDFStatementPageHeader.inc:164 includes/PDFTransPageHeader.inc:51
#: includes/PDFTransPageHeaderPortrait.inc:62
-#: reportwriter/languages/en_US/reports.php:64
msgid "Date"
msgstr ""
#: AddCustomerNotes.php:118 AddCustomerTypeNotes.php:112 PcReportTab.php:183
#: SelectCustomer.php:811 SelectCustomer.php:853 StockClone.php:942
-#: Stocks.php:1270 UpgradeDatabase.php:251 UpgradeDatabase.php:254
-#: UpgradeDatabase.php:257 UpgradeDatabase.php:260 UpgradeDatabase.php:263
-#: UpgradeDatabase.php:266 UpgradeDatabase.php:269 UpgradeDatabase.php:272
-#: UpgradeDatabase.php:275 Z_Upgrade_3.10-3.11.php:62
+#: Stocks.php:1270 UpgradeDatabase.php:253 UpgradeDatabase.php:256
+#: UpgradeDatabase.php:259 UpgradeDatabase.php:262 UpgradeDatabase.php:265
+#: UpgradeDatabase.php:268 UpgradeDatabase.php:271 UpgradeDatabase.php:274
+#: UpgradeDatabase.php:277 Z_Upgrade_3.10-3.11.php:62
#: Z_Upgrade_3.10-3.11.php:66 Z_Upgrade_3.10-3.11.php:70
#: Z_Upgrade_3.10-3.11.php:74 Z_Upgrade_3.10-3.11.php:78
#: Z_Upgrade_3.11-4.00.php:62 Z_Upgrade_3.11-4.00.php:66
@@ -1021,16 +1035,15 @@
#: AgedControlledInventory.php:12 GLCashFlowsSetup.php:109
#: InventoryQuantities.php:155 InventoryValuation.php:217 Locations.php:12
-#: MRP.php:542 MRPCalendar.php:21 MRPCreateDemands.php:193
-#: MRPDemandTypes.php:17 MRPDemands.php:27 MRPPlannedPurchaseOrders.php:264
-#: MRPPlannedWorkOrders.php:245 MRPPlannedWorkOrders.php:319 PricesByCost.php:8
-#: ReorderLevel.php:194 ReorderLevelLocation.php:12 SelectProduct.php:91
-#: StockDispatch.php:321 StockMovements.php:22 StockQties_csv.php:8
-#: StockQuantityByDate.php:10 StockReorderLevel.php:20
+#: MRPCalendar.php:21 MRPCreateDemands.php:193 MRPDemands.php:27
+#: MRPDemandTypes.php:17 MRP.php:542 MRPPlannedPurchaseOrders.php:264
+#: MRPPlannedWorkOrders.php:245 MRPPlannedWorkOrders.php:319
+#: PricesByCost.php:8 ReorderLevelLocation.php:12 ReorderLevel.php:183
+#: SelectProduct.php:91 StockDispatch.php:321 StockMovements.php:22
+#: StockQties_csv.php:8 StockQuantityByDate.php:10 StockReorderLevel.php:20
#: StockSerialItemResearch.php:9 StockSerialItems.php:9 StockStatus.php:45
#: StockTransferControlled.php:14 SuppLoginSetup.php:24 WWW_Users.php:28
#: includes/MainMenuLinksArray.php:24
-#: reportwriter/languages/en_US/reports.php:243
msgid "Inventory"
msgstr ""
@@ -1039,62 +1052,68 @@
msgstr ""
#: AgedControlledInventory.php:42 MRPReschedules.php:124 MRPShortages.php:260
-#: StockClone.php:53 Stocks.php:63 reportwriter/languages/en_US/reports.php:103
+#: StockClone.php:53 Stocks.php:63
msgid "Stock"
msgstr ""
#: AgedControlledInventory.php:43 AutomaticTranslationDescriptions.php:37
-#: BOMIndented.php:315 BOMIndentedReverse.php:293 BOMInquiry.php:109
-#: BOMInquiry.php:198 BOMs.php:656 BOMs.php:1014 CollectiveWorkOrderCost.php:53
+#: BOMIndented_conflict-20150211-201247.php:315 BOMIndented.php:315
+#: BOMIndentedReverse.php:293 BOMInquiry.php:109 BOMInquiry.php:198
+#: BOMs.php:656 BOMs.php:1014 BOMs_SingleLevel.php:558
+#: BOMs_SingleLevel.php:905 CollectiveWorkOrderCost.php:53
#: CollectiveWorkOrderCost.php:325 ContractBOM.php:241 ContractBOM.php:353
-#: ContractOtherReqts.php:97 CounterReturns.php:1688 CounterSales.php:2102
-#: CounterSales.php:2256 CreditStatus.php:152 CreditStatus.php:243
-#: CustomerPurchases.php:81 EmailConfirmation.php:219 EmailConfirmation.php:349
-#: FixedAssetCategories.php:167 FixedAssetDepreciation.php:91
-#: FixedAssetRegister.php:87 FixedAssetRegister.php:388
-#: FixedAssetTransfer.php:60 FixedAssetTransfer.php:162 GLTags.php:63
-#: GLTags.php:82 GLTransInquiry.php:49 GoodsReceived.php:122
-#: InternalStockCategoriesByRole.php:168 InternalStockRequest.php:350
-#: InternalStockRequest.php:564 InternalStockRequest.php:634
-#: InternalStockRequestInquiry.php:221 InternalStockRequestInquiry.php:267
-#: InternalStockRequestInquiry.php:406 InventoryPlanning.php:419
+#: ContractOtherReqts.php:97 CounterReturns.php:1688 CounterSales.php:2106
+#: CounterSales.php:2260 CreditStatus.php:152 CreditStatus.php:243
+#: CustomerPurchases.php:81 EmailConfirmation.php:219
+#: EmailConfirmation.php:349 FixedAssetCategories.php:167
+#: FixedAssetDepreciation.php:91 FixedAssetRegister.php:87
+#: FixedAssetRegister.php:388 FixedAssetTransfer.php:60
+#: FixedAssetTransfer.php:162 GLTags.php:63 GLTags.php:82
+#: GLTransInquiry.php:49 GoodsReceived.php:122
+#: InternalStockCategoriesByRole.php:168 InternalStockRequestInquiry.php:221
+#: InternalStockRequestInquiry.php:267 InternalStockRequestInquiry.php:406
+#: InternalStockRequest.php:350 InternalStockRequest.php:564
+#: InternalStockRequest.php:634 InventoryPlanning.php:419
#: InventoryQuantities.php:246 InventoryValuation.php:197 Labels.php:290
-#: MRPDemandTypes.php:113 MRPDemands.php:92 MRPDemands.php:295
-#: MRPPlannedWorkOrders.php:256 MRPReport.php:563 MRPReport.php:777
-#: MRPReschedules.php:190 MRPShortages.php:349 MaintenanceTasks.php:95
-#: MaintenanceUserSchedule.php:50 MaterialsNotUsed.php:35 NoSalesItems.php:194
-#: PDFCOA.php:64 PDFOrderStatus.php:337 PDFOrdersInvoiced.php:335
+#: MaintenanceTasks.php:95 MaintenanceUserSchedule.php:50
+#: MasterSalesInquiry.php:968 MaterialsNotUsed.php:35 MRPDemands.php:92
+#: MRPDemands.php:295 MRPDemandTypes.php:113 MRPPlannedWorkOrders.php:256
+#: MRPReport.php:563 MRPReport.php:777 MRPReschedules.php:190
+#: MRPShortages.php:349 NoSalesItems.php:194 PaymentTerms.php:182
+#: PcExpenses.php:190 PcExpenses.php:296 PcExpensesTypeTab.php:170
+#: PcReportTab.php:181 PcTypeTabs.php:164 PDFCOA.php:64
+#: PDFOrdersInvoiced.php:335 PDFOrderStatus.php:337
#: PDFSalesBySalesperson.php:86 PDFWeeklyOrders.php:82 PO_Items.php:716
#: PO_Items.php:1194 PO_SelectOSPurchOrder.php:310 PO_SelectPurchOrder.php:214
-#: PaymentTerms.php:182 PcExpenses.php:190 PcExpenses.php:296
-#: PcExpensesTypeTab.php:170 PcReportTab.php:181 PcTypeTabs.php:164
-#: PricesByCost.php:153 RelatedItemsUpdate.php:160 ReorderLevel.php:298
-#: ReorderLevelLocation.php:73 ReverseGRN.php:400 SalesCategories.php:541
+#: PricesByCost.php:153 RelatedItemsUpdate.php:160 ReorderLevelLocation.php:73
+#: ReorderLevel.php:287 ReverseGRN.php:400 SalesCategories.php:541
#: SecurityTokens.php:107 SecurityTokens.php:167 SelectAsset.php:264
#: SelectCompletedOrder.php:506 SelectContract.php:147
-#: SelectCreditItems.php:1019 SelectOrderItems.php:1511
-#: SelectOrderItems.php:1682 SelectProduct.php:543 SelectProduct.php:832
+#: SelectCreditItems.php:1019 SelectOrderItems.php:1524
+#: SelectOrderItems.php:1695 SelectProduct.php:543 SelectProduct.php:832
#: SelectQASamples.php:299 SelectQASamples.php:397 SelectSalesOrder.php:603
#: SelectWorkOrder.php:219 Shipt_Select.php:191 StockClone.php:695
#: StockCounts.php:142 StockDispatch.php:506 StockLocStatus.php:176
#: StockQuantityByDate.php:109 Stocks.php:1018 SuppCreditGRNs.php:92
#: SuppCreditGRNs.php:192 SuppFixedAssetChgs.php:74 SuppInvGRNs.php:120
-#: SuppInvGRNs.php:263 SuppPriceList.php:306 SupplierCredit.php:317
-#: SupplierCredit.php:385 SupplierInvoice.php:673 SupplierInvoice.php:757
-#: SupplierPriceList.php:44 SupplierPriceList.php:276 SupplierPriceList.php:542
+#: SuppInvGRNs.php:263 SupplierCredit.php:317 SupplierCredit.php:385
+#: SupplierInvoice.php:675 SupplierInvoice.php:759 SupplierPriceList.php:44
+#: SupplierPriceList.php:276 SupplierPriceList.php:542
#: SupplierTenderCreate.php:434 SupplierTenderCreate.php:695
-#: SupplierTenderCreate.php:853 SupplierTenders.php:326 SupplierTenders.php:421
-#: SupplierTenders.php:687 TestPlanResults.php:177 TestPlanResults.php:280
-#: TopItems.php:170 WorkCentres.php:130 WorkOrderCosting.php:98
-#: WorkOrderCosting.php:130 WorkOrderEntry.php:973 WorkOrderIssue.php:1009
-#: Z_ItemsWithoutPicture.php:35 api/api_xml-rpc.php:3489
+#: SupplierTenderCreate.php:853 SupplierTenders.php:326
+#: SupplierTenders.php:421 SupplierTenders.php:687 SuppPriceList.php:306
+#: TestPlanResults.php:177 TestPlanResults.php:280 TopItems.php:170
+#: WorkCentres.php:130 WorkOrderCosting.php:98 WorkOrderCosting.php:130
+#: WorkOrderEntry_conflict-20141122-150523.php:735 WorkOrderEntry.php:973
+#: WorkOrderIssue.php:1009 Z_ItemsWithoutPicture.php:35
+#: includes/DefineLabelClass.php:12 includes/DefineLabelClass.php:45
#: includes/PDFGrnHeader.inc:30 includes/PDFInventoryPlanPageHeader.inc:51
#: includes/PDFOstdgGRNsPageHeader.inc:38
#: includes/PDFStockLocTransferHeader.inc:65
#: includes/PDFStockTransferHeader.inc:36 includes/PDFTopItemsHeader.inc:50
#: includes/PDFTransPageHeader.inc:211
-#: includes/PDFTransPageHeaderPortrait.inc:256 includes/DefineLabelClass.php:12
-#: includes/DefineLabelClass.php:45 ../webSHOP/includes/PlaceOrder.php:236
+#: includes/PDFTransPageHeaderPortrait.inc:256 api/api_xml-rpc.php:3489
+#: ../webSHOP/includes/PlaceOrder.php:250
msgid "Description"
msgstr ""
@@ -1133,18 +1152,17 @@
#: SalesByTypePeriodInquiry.php:395 SalesByTypePeriodInquiry.php:430
#: SalesByTypePeriodInquiry.php:465 SalesByTypePeriodInquiry.php:500
#: SalesByTypePeriodInquiry.php:561 SelectCreditItems.php:693
-#: SelectCreditItems.php:697 SelectOrderItems.php:1352 SuppContractChgs.php:107
-#: SuppFixedAssetChgs.php:93 SuppShiptChgs.php:97 SuppTransGLAnalysis.php:140
+#: SelectCreditItems.php:697 SelectOrderItems.php:1365
+#: SuppContractChgs.php:107 SuppFixedAssetChgs.php:93
#: SupplierAllocations.php:460 SupplierAllocations.php:573
#: SupplierAllocations.php:648 SupplierCredit.php:407 SupplierInquiry.php:209
-#: Tax.php:250 Z_CheckDebtorsControl.php:149
-#: api/api_debtortransactions.php:1271 api/api_debtortransactions.php:1284
-#: api/api_debtortransactions.php:1581 includes/PDFQuotationPageHeader.inc:119
+#: SuppShiptChgs.php:97 SuppTransGLAnalysis.php:140 Tax.php:250
+#: Z_CheckDebtorsControl.php:149 includes/PDFQuotationPageHeader.inc:119
#: includes/PDFQuotationPortraitPageHeader.inc:100
-#: includes/PO_PDFOrderPageHeader.inc:81
-#: reportwriter/languages/en_US/reports.php:107
-#: ../webSHOP/includes/DisplayShoppingCart.php:7
-#: ../webSHOP/includes/PlaceOrder.php:285
+#: includes/PO_PDFOrderPageHeader.inc:81 api/api_debtortransactions.php:1271
+#: api/api_debtortransactions.php:1284 api/api_debtortransactions.php:1581
+#: ../webSHOP/includes/DisplayShoppingCart.php:8
+#: ../webSHOP/includes/PlaceOrder.php:299
#, php-format
msgid "Total"
msgstr ""
@@ -1162,22 +1180,23 @@
msgstr ""
#: AgedDebtors.php:268 AgedDebtors.php:370 AgedDebtors.php:434
-#: AgedSuppliers.php:108 BOMExtendedQty.php:154 BOMIndented.php:153
+#: AgedSuppliers.php:108 BOMExtendedQty.php:154
+#: BOMIndented_conflict-20150211-201247.php:153 BOMIndented.php:153
#: BOMIndentedReverse.php:140 BOMListing.php:42 BOMListing.php:53
#: DebtorsAtPeriodEnd.php:57 DebtorsAtPeriodEnd.php:69 GLBalanceSheet.php:112
#: GLBalanceSheet.php:152 GLProfit_Loss.php:188 GLTagProfit_Loss.php:195
-#: GLTrialBalance.php:167 InternalStockRequest.php:325
-#: InternalStockRequestInquiry.php:250 InventoryPlanning.php:99
+#: GLTrialBalance.php:167 InternalStockRequestInquiry.php:250
+#: InternalStockRequest.php:325 InventoryPlanning.php:99
#: InventoryPlanning.php:176 InventoryPlanning.php:213
#: InventoryPlanning.php:262 InventoryPlanningPrefSupplier.php:183
#: InventoryPlanningPrefSupplier.php:241 InventoryPlanningPrefSupplier.php:268
#...
[truncated message content] |
