Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[7126] trunk
|
From: <dai...@us...> - 2015-02-05 23:43:49
|
Revision: 7126
http://sourceforge.net/p/web-erp/reponame/7126
Author: daintree
Date: 2015-02-05 23:43:45 +0000 (Thu, 05 Feb 2015)
Log Message:
-----------
Pre Version 4.12.1
Modified Paths:
--------------
trunk/UpgradeDatabase.php
trunk/build/make_release.sh
trunk/doc/Change.log
trunk/includes/ConnectDB.inc
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/sql/mysql/country_sql/default.sql
trunk/sql/mysql/country_sql/demo.sql
Modified: trunk/UpgradeDatabase.php
===================================================================
--- trunk/UpgradeDatabase.php 2015-02-05 23:00:41 UTC (rev 7125)
+++ trunk/UpgradeDatabase.php 2015-02-05 23:43:45 UTC (rev 7126)
@@ -186,6 +186,8 @@
$SQLScripts[] = './sql/mysql/upgrade4.11.3-4.11.4.sql';
case '4.11.5':
$SQLScripts[] = './sql/mysql/upgrade4.11.4-4.12.sql';
+ case '4.12':
+ $SQLScripts[] = './sql/mysql/upgrade4.12-4.12.1.sql';
break;
} //end switch
}
Modified: trunk/build/make_release.sh
===================================================================
--- trunk/build/make_release.sh 2015-02-05 23:00:41 UTC (rev 7125)
+++ trunk/build/make_release.sh 2015-02-05 23:43:45 UTC (rev 7126)
@@ -1,6 +1,6 @@
#! /bin/bash
-BASE_DIR=/var/www/webERP;
+BASE_DIR=/usr/share/nginx/html/webERP;
OUTPUT_DIR=/home/phil/Documents/webERP;
MYSQL_USER=root;
MYSQL_PWD=a;
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-02-05 23:00:41 UTC (rev 7125)
+++ trunk/doc/Change.log 2015-02-05 23:43:45 UTC (rev 7126)
@@ -1,5 +1,7 @@
webERP Change Log
+6/2/15 Version 4.12.1
+
5/2/15 Phil: Rewrite of Z_ImportChartOfAccounts.php old script used the api and hard coded based on the database in api_php.php
3/02/15 Exson: Fixed date compatible problem for strict sql mode in CopyBOM.php.
3/2/15 Phil: Added more of Andrew Galuski's QA pdf manual to the webERP html manual.
Modified: trunk/includes/ConnectDB.inc
===================================================================
--- trunk/includes/ConnectDB.inc 2015-02-05 23:00:41 UTC (rev 7125)
+++ trunk/includes/ConnectDB.inc 2015-02-05 23:43:45 UTC (rev 7126)
@@ -4,7 +4,7 @@
* this value is saved in the $_SESSION['Versionumber'] when includes/GetConfig.php is run
* if VersionNumber is < $Version then the DB update script is run */
-$Version='4.12'; //must update manually every time there is a DB change
+$Version='4.12.1'; //must update manually every time there is a DB change
require_once ($PathPrefix .'includes/MiscFunctions.php');
if (!isset($_SESSION['DatabaseName'])){
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 2015-02-05 23:00:41 UTC (rev 7125)
+++ trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po 2015-02-05 23:43:45 UTC (rev 7126)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: webERP 4.11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-27 21:55+1300\n"
+"POT-Creation-Date: 2015-02-06 12:41+1300\n"
"PO-Revision-Date: 2013-06-01 11:19-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: Arabic <ar...@li...>\n"
@@ -239,7 +239,7 @@
#: FixedAssetLocations.php:13 FixedAssetRegister.php:16
#: FixedAssetRegister.php:256 FixedAssetTransfer.php:14 FormDesigner.php:185
#: GLBalanceSheet.php:387 GLBudgets.php:32 GLJournalInquiry.php:11
-#: GLJournal.php:250 HistoricalTestResults.php:38 InternalStockRequest.php:311
+#: GLJournal.php:250 HistoricalTestResults.php:42 InternalStockRequest.php:311
#: InventoryPlanning.php:354 InventoryPlanningPrefSupplier.php:386
#: MaintenanceTasks.php:14 MaintenanceUserSchedule.php:16 MRPReport.php:516
#: NoSalesItems.php:91 PcAssignCashToTab.php:59 PcAssignCashToTab.php:133
@@ -248,7 +248,7 @@
#: POReport.php:64 POReport.php:68 PO_SelectOSPurchOrder.php:148
#: 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:20
+#: PurchData.php:241 PurchData.php:373 PurchData.php:401 QATests.php:22
#: RecurringSalesOrders.php:320 RelatedItemsUpdate.php:24
#: SalesAnalReptCols.php:51 SalesAnalRepts.php:14 SalesCategories.php:11
#: SalesGLPostings.php:19 SalesGraph.php:40 SalesPeople.php:28
@@ -256,7 +256,7 @@
#: SelectContract.php:69 SelectCreditItems.php:220 SelectCreditItems.php:291
#: SelectCustomer.php:265 SelectGLAccount.php:65 SelectOrderItems.php:559
#: SelectOrderItems.php:1463 SelectOrderItems.php:1563 SelectProduct.php:510
-#: SelectQASamples.php:43 SelectSalesOrder.php:512 SelectSupplier.php:14
+#: SelectQASamples.php:45 SelectSalesOrder.php:512 SelectSupplier.php:14
#: SelectSupplier.php:220 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
@@ -271,7 +271,7 @@
#: WorkCentres.php:111 WorkCentres.php:163 WorkOrderCosting.php:22
#: WorkOrderEntry.php:11 WorkOrderIssue.php:22 WorkOrderReceive.php:31
#: WorkOrderStatus.php:58 WWW_Users.php:34 Z_BottomUpCosts.php:57
-#: ../webSHOP/includes/header.php:216
+#: ../webSHOP/includes/header.php:217
msgid "Search"
msgstr "إبحث"
@@ -313,16 +313,16 @@
#: PDFDeliveryDifferences.php:76 PDFDIFOT.php:80 PDFWOPrint.php:600
#: PDFWOPrint.php:604 PO_AuthorisationLevels.php:134
#: PO_AuthorisationLevels.php:139 PO_Header.php:807 PO_PDFPurchOrder.php:413
-#: PO_PDFPurchOrder.php:416 ProductSpecs.php:186 ProductSpecs.php:407
-#: ProductSpecs.php:412 ProductSpecs.php:418 ProductSpecs.php:423
-#: ProductSpecs.php:428 ProductSpecs.php:560 ProductSpecs.php:606
-#: ProductSpecs.php:608 ProductSpecs.php:619 ProductSpecs.php:621
-#: ProductSpecs.php:632 ProductSpecs.php:634 ProductSpecs.php:645
-#: ProductSpecs.php:647 PurchData.php:296 PurchData.php:667 PurchData.php:670
-#: QATests.php:291 QATests.php:293 QATests.php:304 QATests.php:306
-#: QATests.php:317 QATests.php:319 QATests.php:330 QATests.php:332
-#: QATests.php:343 QATests.php:345 QATests.php:412 QATests.php:417
-#: QATests.php:422 QATests.php:427 QATests.php:432
+#: 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
@@ -330,9 +330,9 @@
#: SalesAnalRepts.php:479 SalesCategories.php:264 SalesCategories.php:351
#: SalesCategories.php:355 SalesPeople.php:227 SalesPeople.php:367
#: SalesPeople.php:369 SelectProduct.php:237 SelectProduct.php:362
-#: SelectQASamples.php:417 SelectQASamples.php:511 SelectQASamples.php:513
-#: SelectQASamples.php:568 SelectQASamples.php:570 SelectQASamples.php:582
-#: SelectQASamples.php:584 ShipmentCosting.php:667 ShopParameters.php:289
+#: 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
@@ -377,25 +377,25 @@
#: PDFDeliveryDifferences.php:75 PDFDIFOT.php:79 PDFWOPrint.php:601
#: PDFWOPrint.php:605 PO_AuthorisationLevels.php:136
#: PO_AuthorisationLevels.php:141 PO_Header.php:806 PO_PDFPurchOrder.php:414
-#: PO_PDFPurchOrder.php:417 ProductSpecs.php:189 ProductSpecs.php:409
-#: ProductSpecs.php:415 ProductSpecs.php:420 ProductSpecs.php:425
-#: ProductSpecs.php:430 ProductSpecs.php:611 ProductSpecs.php:613
-#: ProductSpecs.php:624 ProductSpecs.php:626 ProductSpecs.php:637
-#: ProductSpecs.php:639 ProductSpecs.php:650 ProductSpecs.php:652
-#: PurchData.php:299 PurchData.php:668 PurchData.php:671 QATests.php:296
-#: QATests.php:298 QATests.php:309 QATests.php:311 QATests.php:322
-#: QATests.php:324 QATests.php:335 QATests.php:337 QATests.php:348
-#: QATests.php:350 QATests.php:414 QATests.php:419 QATests.php:424
-#: QATests.php:429 QATests.php:434 RecurringSalesOrders.php:492
+#: 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
+#: ProductSpecs.php:641 ProductSpecs.php:652 ProductSpecs.php:654
+#: PurchData.php:299 PurchData.php:668 PurchData.php:671 QATests.php:298
+#: QATests.php:300 QATests.php:311 QATests.php:313 QATests.php:324
+#: QATests.php:326 QATests.php:337 QATests.php:339 QATests.php:350
+#: QATests.php:352 QATests.php:416 QATests.php:421 QATests.php:426
+#: QATests.php:431 QATests.php:436 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 SalesCategories.php:266
#: SalesCategories.php:352 SalesCategories.php:354 SalesPeople.php:229
#: SalesPeople.php:372 SalesPeople.php:374 SelectProduct.php:239
-#: SelectProduct.php:364 SelectQASamples.php:419 SelectQASamples.php:516
-#: SelectQASamples.php:518 SelectQASamples.php:573 SelectQASamples.php:575
-#: SelectQASamples.php:587 SelectQASamples.php:589 ShipmentCosting.php:668
+#: SelectProduct.php:364 SelectQASamples.php:426 SelectQASamples.php:523
+#: SelectQASamples.php:525 SelectQASamples.php:579 SelectQASamples.php:581
+#: SelectQASamples.php:593 SelectQASamples.php:595 ShipmentCosting.php:668
#: ShopParameters.php:290 ShopParameters.php:292 ShopParameters.php:338
#: ShopParameters.php:340 ShopParameters.php:392 ShopParameters.php:394
#: ShopParameters.php:414 ShopParameters.php:416 ShopParameters.php:496
@@ -436,12 +436,12 @@
#: PcAssignCashToTab.php:277 PcClaimExpensesFromTab.php:276 PcExpenses.php:226
#: PcTabs.php:236 PcTypeTabs.php:180 PO_AuthorisationLevels.php:151
#: PriceMatrix.php:287 Prices_Customer.php:286 Prices.php:253
-#: ProductSpecs.php:463 PurchData.php:312 QATests.php:465
+#: ProductSpecs.php:465 PurchData.php:312 QATests.php:467
#: SalesCategories.php:272 SalesGLPostings.php:137 SalesGLPostings.php:255
#: SalesPeople.php:240 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 SelectQASamples.php:410
+#: SelectGLAccount.php:117 SelectGLAccount.php:132 SelectQASamples.php:417
#: SellThroughSupport.php:298 Shippers.php:144 StockCategories.php:296
#: SupplierContacts.php:165 SupplierTenderCreate.php:157 SupplierTypes.php:170
#: SuppTransGLAnalysis.php:125 TaxAuthorities.php:172 TaxCategories.php:184
@@ -474,15 +474,15 @@
#: 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 PriceMatrix.php:286
-#: Prices_Customer.php:287 Prices.php:254 ProductSpecs.php:464
-#: PurchData.php:314 PurchData.php:721 QATests.php:466
+#: Prices_Customer.php:287 Prices.php:254 ProductSpecs.php:466
+#: PurchData.php:314 PurchData.php:721 QATests.php:468
#: RelatedItemsUpdate.php:155 RelatedItemsUpdate.php:170
#: SalesAnalReptCols.php:299 SalesAnalRepts.php:307 SalesCategories.php:273
#: SalesGLPostings.php:138 SalesGLPostings.php:256 SalesPeople.php:241
#: SalesTypes.php:207 SecurityTokens.php:131 SelectCreditItems.php:778
#: SelectCustomer.php:615 SelectCustomer.php:634 SelectCustomer.php:664
#: SelectCustomer.php:682 SelectCustomer.php:706 SelectCustomer.php:723
-#: SelectOrderItems.php:1375 SelectQASamples.php:411
+#: SelectOrderItems.php:1375 SelectQASamples.php:418
#: SellThroughSupport.php:299 Shipments.php:440 Shippers.php:145
#: SpecialOrder.php:667 StockCategories.php:297 StockCategories.php:626
#: StockLocTransfer.php:325 SuppContractChgs.php:99 SuppCreditGRNs.php:117
@@ -566,10 +566,10 @@
#: Locations.php:680 Manufacturers.php:312 MRPDemands.php:424
#: MRPDemandTypes.php:188 OffersReceived.php:57 OffersReceived.php:146
#: PaymentMethods.php:302 PaymentTerms.php:310 PO_AuthorisationLevels.php:264
-#: PriceMatrix.php:230 Prices_Customer.php:369 ProductSpecs.php:659
-#: QATests.php:357 SalesAnalReptCols.php:552 SalesAnalRepts.php:519
-#: SalesGLPostings.php:427 SalesPeople.php:381 SelectQASamples.php:524
-#: SelectQASamples.php:595 Shippers.php:203 StockCategories.php:653
+#: PriceMatrix.php:230 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
#: SupplierContacts.php:284 SuppLoginSetup.php:291 TaxAuthorities.php:327
#: TaxCategories.php:244 TaxProvinces.php:234 TestPlanResults.php:967
#: UnitsOfMeasure.php:241 WorkCentres.php:283 WWW_Users.php:774
@@ -673,9 +673,9 @@
#: DeliveryDetails.php:806 DeliveryDetails.php:823 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:380 ProductSpecs.php:313 QATests.php:74
+#: PcTypeTabs.php:63 PO_Items.php:380 ProductSpecs.php:315 QATests.php:76
#: SalesAnalReptCols.php:129 SalesPeople.php:105 SalesTypes.php:66
-#: SelectQASamples.php:83 Stocks.php:589 Suppliers.php:531
+#: SelectQASamples.php:85 Stocks.php:589 Suppliers.php:531
#: SupplierTypes.php:68
msgid "has been updated"
msgstr ""
@@ -691,8 +691,8 @@
#: AddCustomerContacts.php:126 CompanyPreferences.php:173
#: CustomerBranches.php:408 Customers.php:1118 Customers.php:1126
#: ImportBankTransAnalysis.php:207 PrintWOItemSlip.php:184
-#: PrintWOItemSlip.php:195 PrintWOItemSlip.php:206 ProductSpecs.php:162
-#: ProductSpecs.php:383 QATests.php:389 SalesPeople.php:208
+#: PrintWOItemSlip.php:195 PrintWOItemSlip.php:206 ProductSpecs.php:164
+#: ProductSpecs.php:385 QATests.php:391 SalesPeople.php:208
#: SelectCustomer.php:609 StockDispatch.php:275 StockDispatch.php:286
#: StockDispatch.php:297 SupplierContacts.php:152 SuppTransGLAnalysis.php:108
#: Tax.php:411 TestPlanResults.php:508 UserLocations.php:176
@@ -828,10 +828,10 @@
#: AddCustomerNotes.php:118 AddCustomerTypeNotes.php:112 PcReportTab.php:180
#: SelectCustomer.php:660 SelectCustomer.php:702 StockClone.php:926
-#: Stocks.php:1260 UpgradeDatabase.php:238 UpgradeDatabase.php:241
-#: UpgradeDatabase.php:244 UpgradeDatabase.php:247 UpgradeDatabase.php:250
-#: UpgradeDatabase.php:253 UpgradeDatabase.php:256 UpgradeDatabase.php:259
-#: UpgradeDatabase.php:262 Z_Upgrade_3.10-3.11.php:62
+#: Stocks.php:1260 UpgradeDatabase.php:240 UpgradeDatabase.php:243
+#: UpgradeDatabase.php:246 UpgradeDatabase.php:249 UpgradeDatabase.php:252
+#: UpgradeDatabase.php:255 UpgradeDatabase.php:258 UpgradeDatabase.php:261
+#: UpgradeDatabase.php:264 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
@@ -967,15 +967,15 @@
#: NoSalesItems.php:194 PaymentTerms.php:182 PcExpenses.php:190
#: PcExpenses.php:296 PcExpensesTypeTab.php:171 PcReportTab.php:178
#: PcTypeTabs.php:164 PDFCOA.php:64 PDFOrdersInvoiced.php:335
-#: PDFOrderStatus.php:337 PO_Items.php:716 PO_Items.php:1187
-#: PO_SelectOSPurchOrder.php:263 PO_SelectPurchOrder.php:214
-#: PricesByCost.php:153 RelatedItemsUpdate.php:154 ReorderLevelLocation.php:73
-#: ReorderLevel.php:298 ReverseGRN.php:397 SalesCategories.php:509
-#: SecurityTokens.php:94 SecurityTokens.php:103 SecurityTokens.php:120
-#: SelectAsset.php:264 SelectCompletedOrder.php:505 SelectContract.php:147
-#: SelectCreditItems.php:1021 SelectOrderItems.php:1473
+#: PDFOrderStatus.php:337 PDFSalesBySalesperson.php:86 PDFWeeklyOrders.php:82
+#: PO_Items.php:716 PO_Items.php:1187 PO_SelectOSPurchOrder.php:263
+#: PO_SelectPurchOrder.php:214 PricesByCost.php:153 RelatedItemsUpdate.php:154
+#: ReorderLevelLocation.php:73 ReorderLevel.php:298 ReverseGRN.php:397
+#: SalesCategories.php:509 SecurityTokens.php:94 SecurityTokens.php:103
+#: SecurityTokens.php:120 SelectAsset.php:264 SelectCompletedOrder.php:505
+#: SelectContract.php:147 SelectCreditItems.php:1021 SelectOrderItems.php:1473
#: SelectOrderItems.php:1635 SelectProduct.php:530 SelectProduct.php:756
-#: SelectQASamples.php:292 SelectQASamples.php:390 SelectSalesOrder.php:560
+#: SelectQASamples.php:299 SelectQASamples.php:397 SelectSalesOrder.php:560
#: SelectWorkOrder.php:219 Shipt_Select.php:191 StockClone.php:680
#: StockCounts.php:142 StockDispatch.php:504 StockLocStatus.php:173
#: StockQuantityByDate.php:109 Stocks.php:1013 SuppCreditGRNs.php:92
@@ -1080,8 +1080,9 @@
#: MRPReschedules.php:57 MRPShortages.php:155 MRPShortages.php:167
#: OutstandingGRNs.php:46 OutstandingGRNs.php:59 PDFCustomerList.php:20
#: PDFCustomerList.php:232 PDFCustomerList.php:244 PDFLowGP.php:20
-#: PDFSellThroughSupportClaim.php:17 PDFStockCheckComparison.php:33
-#: PDFStockCheckComparison.php:59 PDFStockCheckComparison.php:267
+#: PDFSalesBySalesperson.php:15 PDFSellThroughSupportClaim.php:17
+#: PDFStockCheckComparison.php:33 PDFStockCheckComparison.php:59
+#: PDFStockCheckComparison.php:267 PDFWeeklyOrders.php:15
#: PurchaseByPrefSupplier.php:399 PurchaseByPrefSupplier.php:447
#: PurchaseByPrefSupplier.php:471 PurchaseByPrefSupplier.php:500
#: PurchaseByPrefSupplier.php:531 ReorderLevel.php:60 SelectAsset.php:39
@@ -1124,9 +1125,11 @@
#: PDFGrn.php:176 PDFLowGP.php:59 PDFLowGP.php:71 PDFPriceList.php:147
#: PDFPrintLabel.php:45 PDFQALabel.php:116 PDFQuotation.php:276
#: PDFQuotationPortrait.php:268 PDFRemittanceAdvice.php:83
+#: PDFSalesBySalesperson.php:160 PDFSalesBySalesperson.php:168
#: PDFSellThroughSupportClaim.php:74 PDFSellThroughSupportClaim.php:86
#: PDFStockCheckComparison.php:37 PDFStockCheckComparison.php:63
-#: PDFStockCheckComparison.php:271 PDFWOPrint.php:109 PO_PDFPurchOrder.php:31
+#: PDFStockCheckComparison.php:271 PDFWeeklyOrders.php:209
+#: PDFWeeklyOrders.php:217 PDFWOPrint.php:109 PO_PDFPurchOrder.php:31
#: PO_PDFPurchOrder.php:156 PrintCustOrder_generic.php:256
#: PrintCustOrder.php:238 PrintWOItemSlip.php:122
#: PurchaseByPrefSupplier.php:402 PurchaseByPrefSupplier.php:450
@@ -1171,7 +1174,7 @@
#: ConfirmDispatch_Invoice.php:172 ConfirmDispatch_Invoice.php:1001
#: ConfirmDispatch_Invoice.php:1015 Contracts.php:592 CounterReturns.php:1024
#: CounterReturns.php:1038 CounterSales.php:1425 CounterSales.php:1439
-#: Credit_Invoice.php:755 Credit_Invoice.php:776 CustItem.php:73
+#: Credit_Invoice.php:754 Credit_Invoice.php:775 CustItem.php:73
#: CustItem.php:86 CustItem.php:197 CustomerReceipt.php:574
#: CustomerReceipt.php:726 CustomerReceipt.php:754 CustomerTransInquiry.php:91
#: Dashboard.php:259 Dashboard.php:439 DeliveryDetails.php:409
@@ -1532,7 +1535,7 @@
#: CustomerTransInquiry.php:98 CustWhereAlloc.php:21 CustWhereAlloc.php:111
#: DailyBankTransactions.php:129 GLAccountInquiry.php:171
#: GLAccountReport.php:341 GLJournal.php:266 MRPReschedules.php:194
-#: ProductSpecs.php:386 QATests.php:255 QATests.php:393
+#: ProductSpecs.php:388 QATests.php:257 QATests.php:395
#: SalesByTypePeriodInquiry.php:356 SelectCustomer.php:424
#: ShipmentCosting.php:536 ShipmentCosting.php:613 StockLocMovements.php:90
#: StockMovements.php:98 SupplierAllocations.php:454 SupplierInquiry.php:210
@@ -1553,7 +1556,7 @@
msgstr ""
#: AuditTrail.php:180 MaterialsNotUsed.php:38 PDFCOA.php:169 PDFCOA.php:170
-#: PDFCOA.php:171 PDFProdSpec.php:129 PDFProdSpec.php:130 PDFProdSpec.php:131
+#: PDFCOA.php:171 PDFProdSpec.php:130 PDFProdSpec.php:131 PDFProdSpec.php:132
#: PurchData.php:700 SellThroughSupport.php:263 ShopParameters.php:197
#: SystemParameters.php:410 includes/PDFOstdgGRNsPageHeader.inc:43
msgid "Value"
@@ -1585,7 +1588,7 @@
#: ReorderLevelLocation.php:72 RevisionTranslations.php:59 SalesPeople.php:207
#: SelectCompletedOrder.php:504 SelectCreditItems.php:1020
#: SelectCustomer.php:420 SelectGLAccount.php:112 SelectOrderItems.php:1472
-#: SelectOrderItems.php:1634 SelectProduct.php:755 SelectQASamples.php:291
+#: SelectOrderItems.php:1634 SelectProduct.php:755 SelectQASamples.php:298
#: SelectSalesOrder.php:559 SelectSupplier.php:280 SelectWorkOrder.php:218
#: SellThroughSupport.php:159 Shipt_Select.php:190 SpecialOrder.php:148
#: StockCategories.php:263 SupplierPriceList.php:270 SupplierPriceList.php:455
@@ -2055,7 +2058,8 @@
#: PDFDeliveryDifferences.php:320 PDFDIFOT.php:201 PDFDIFOT.php:214
#: PDFDIFOT.php:313 PDFFGLabel.php:208 PDFOrdersInvoiced.php:87
#: PDFOrdersInvoiced.php:261 PDFOrderStatus.php:92 PDFOrderStatus.php:274
-#: PDFRemittanceAdvice.php:48 PDFWOPrint.php:503 PO_PDFPurchOrder.php:358
+#: PDFRemittanceAdvice.php:48 PDFSalesBySalesperson.php:65
+#: PDFWeeklyOrders.php:61 PDFWOPrint.php:503 PO_PDFPurchOrder.php:358
#: PricesBasedOnMarkUp.php:219 PricesBasedOnMarkUp.php:358
#: PrintCustStatements.php:46 PrintCustTrans.php:63 PrintCustTrans.php:66
#: PrintCustTransPortrait.php:62 PrintCustTransPortrait.php:65
@@ -2458,7 +2462,8 @@
#: MRPPlannedWorkOrders.php:261 MRPPlannedWorkOrders.php:395 MRPReport.php:413
#: MRPReport.php:419 MRPReschedules.php:195 OffersReceived.php:108
#: OffersReceived.php:218 OffersReceived.php:278 OrderDetails.php:173
-#: PDFOrdersInvoiced.php:377 POReport.php:762 POReport.php:1449
+#: PDFOrdersInvoiced.php:377 PDFSalesBySalesperson.php:87
+#: PDFWeeklyOrders.php:83 POReport.php:762 POReport.php:1449
#: PrintCustTrans.php:896 PrintCustTrans.php:985 PrintCustTrans.php:1034
#: PrintCustTransPortrait.php:949 PrintCustTransPortrait.php:1047
#: PrintCustTransPortrait.php:1103 PrintWOItemSlip.php:155
@@ -2646,7 +2651,7 @@
#: PO_SelectPurchOrder.php:215 PurchaseByPrefSupplier.php:415
#: ReorderLevelLocation.php:75 ReorderLevelLocation.php:76
#: SelectCompletedOrder.php:506 SelectOrderItems.php:1475
-#: SelectOrderItems.php:1638 SelectQASamples.php:293 SelectSalesOrder.php:561
+#: SelectOrderItems.php:1638 SelectQASamples.php:300 SelectSalesOrder.php:561
#: SelectWorkOrder.php:220 Shipt_Select.php:192 TestPlanResults.php:178
#: TopItems.php:174 includes/PDFTopItemsHeader.inc:54
msgid "On Hand"
@@ -2781,14 +2786,14 @@
#: BOMInquiry.php:26 BOMs.php:896 MRPDemands.php:336
#: PO_SelectOSPurchOrder.php:241 PO_SelectPurchOrder.php:190
-#: SelectQASamples.php:268 Shipt_Select.php:169 TestPlanResults.php:153
+#: SelectQASamples.php:275 Shipt_Select.php:169 TestPlanResults.php:153
#: WorkOrderEntry.php:701 WorkOrderIssue.php:732
msgid "Enter text extracts in the"
msgstr ""
#: BOMInquiry.php:26 BOMs.php:896 MRPDemands.php:336
#: PO_SelectOSPurchOrder.php:241 PO_SelectPurchOrder.php:190
-#: SelectQASamples.php:268 Shipt_Select.php:169 TestPlanResults.php:153
+#: SelectQASamples.php:275 Shipt_Select.php:169 TestPlanResults.php:153
#: WorkOrderEntry.php:701 WorkOrderIssue.php:732
msgid "description"
msgstr ""
@@ -2806,7 +2811,7 @@
#: SelectCreditItems.php:1004 SelectCustomer.php:274 SelectCustomer.php:284
#: SelectCustomer.php:293 SelectCustomer.php:303 SelectCustomer.php:350
#: SelectGLAccount.php:79 SelectOrderItems.php:569 SelectOrderItems.php:572
-#: SelectOrderItems.php:1599 SelectProduct.php:537 SelectQASamples.php:273
+#: SelectOrderItems.php:1599 SelectProduct.php:537 SelectQASamples.php:280
#: SelectSalesOrder.php:544 SelectSupplier.php:231 SelectWorkOrder.php:206
#: SellThroughSupport.php:202 Shipt_Select.php:174 SuppFixedAssetChgs.php:126
#: SupplierPriceList.php:49 SupplierPriceList.php:406
@@ -2818,7 +2823,7 @@
#: BOMInquiry.php:29 BOMs.php:899 MRPDemands.php:339
#: PO_SelectOSPurchOrder.php:245 PO_SelectPurchOrder.php:195
-#: SelectQASamples.php:273 Shipt_Select.php:174 TestPlanResults.php:158
+#: SelectQASamples.php:280 Shipt_Select.php:174 TestPlanResults.php:158
#: WorkOrderEntry.php:706 WorkOrderIssue.php:737
msgid "Enter extract of the"
msgstr ""
@@ -2830,7 +2835,7 @@
#: SalesInquiry.php:769 SalesInquiry.php:780 SalesInquiry.php:800
#: SalesInquiry.php:826 SalesInquiry.php:845 SalesInquiry.php:955
#: SalesInquiry.php:1113 SalesInquiry.php:1210 SalesInquiry.php:1228
-#: SelectProduct.php:537 SelectQASamples.php:273 Shipt_Select.php:174
+#: SelectProduct.php:537 SelectQASamples.php:280 Shipt_Select.php:174
#: StockAdjustments.php:141 StockAdjustments.php:430 StockCounts.php:141
#: StockCounts.php:167 StockCounts.php:213 StockMovements.php:36
#: StockReorderLevel.php:51 StockStatus.php:62 StockTransfers.php:48
@@ -2857,7 +2862,7 @@
#: BOMInquiry.php:47 BOMs.php:833 ContractBOM.php:52 MRPDemands.php:56
#: MRPReport.php:578 PO_Items.php:852 PO_SelectOSPurchOrder.php:65
#: PO_SelectPurchOrder.php:48 SelectCompletedOrder.php:97
-#: SelectCreditItems.php:301 SelectProduct.php:558 SelectQASamples.php:174
+#: SelectCreditItems.php:301 SelectProduct.php:558 SelectQASamples.php:176
#: SelectSalesOrder.php:876 SelectWorkOrder.php:51 Shipt_Select.php:61
#: SupplierPriceList.php:76 SupplierTenderCreate.php:731
#: SupplierTenders.php:576 TestPlanResults.php:59 WorkOrderEntry.php:100
@@ -2886,10 +2891,10 @@
#: InternalStockRequest.php:630 InventoryValuation.php:197 MRPReport.php:752
#: NoSalesItems.php:197 OffersReceived.php:109 PO_Items.php:1190
#: PO_SelectOSPurchOrder.php:266 PO_SelectPurchOrder.php:217
-#: ProductSpecs.php:164 ProductSpecs.php:385 QATests.php:251 QATests.php:392
+#: ProductSpecs.php:166 ProductSpecs.php:387 QATests.php:253 QATests.php:394
#: SelectCompletedOrder.php:509 SelectCreditItems.php:1022
#: SelectOrderItems.php:1474 SelectOrderItems.php:1637 SelectProduct.php:131
-#: SelectProduct.php:758 SelectQASamples.php:294 SelectSalesOrder.php:562
+#: SelectProduct.php:758 SelectQASamples.php:301 SelectSalesOrder.php:562
#: SelectWorkOrder.php:221 Shipments.php:402 Shipments.php:489
#: Shipt_Select.php:194 StockLocTransferReceive.php:463
#: SupplierPriceList.php:272 SupplierTenderCreate.php:854
@@ -3165,7 +3170,7 @@
msgstr ""
#: BOMs.php:436 ConfirmDispatch_Invoice.php:1050 CounterReturns.php:1074
-#: CounterSales.php:1474 Credit_Invoice.php:813 Credit_Invoice.php:843
+#: CounterSales.php:1474 Credit_Invoice.php:812 Credit_Invoice.php:842
#: SelectCreditItems.php:1494 StockClone.php:847 StockClone.php:849
#: Stocks.php:1181 Stocks.php:1183 api/api_debtortransactions.php:753
#: api/api_salesorders.php:920
@@ -3668,7 +3673,7 @@
msgstr ""
#: CompanyPreferences.php:468 ConfirmDispatch_Invoice.php:654
-#: ConfirmDispatch_Invoice.php:1706 Credit_Invoice.php:1621 CustItem.php:452
+#: ConfirmDispatch_Invoice.php:1706 Credit_Invoice.php:1620 CustItem.php:452
#: FixedAssetItems.php:127 FixedAssetItems.php:653 GLBudgets.php:240
#: GLTags.php:68 GoodsReceived.php:257 GoodsReceived.php:263
#: GoodsReceived.php:270 GoodsReceived.php:771 ImportBankTransAnalysis.php:154
@@ -3815,13 +3820,13 @@
#: CustomerReceipt.php:1174 Customers.php:25 Customers.php:348
#: CustomerTransInquiry.php:101 Dashboard.php:53 Dashboard.php:657
#: DeliveryDetails.php:855 FTP_RadioBeacon.php:51 PDFOrdersInvoiced.php:292
-#: PDFOrderStatus.php:293 PricesByCost.php:154 SalesGraph.php:188
-#: SalesTopCustomersInquiry.php:214 SelectCompletedOrder.php:556
-#: SelectContract.php:148 SelectCreditItems.php:242 SelectCustomer.php:24
-#: SelectCustomer.php:210 SelectOrderItems.php:594
-#: SelectRecurringSalesOrder.php:91 SelectSalesOrder.php:701
-#: SelectSalesOrder.php:718 SellThroughSupport.php:262
-#: StockLocMovements.php:93 StockMovements.php:102
+#: PDFOrderStatus.php:293 PDFSalesBySalesperson.php:83 PDFWeeklyOrders.php:79
+#: PricesByCost.php:154 SalesGraph.php:188 SalesTopCustomersInquiry.php:214
+#: SelectCompletedOrder.php:556 SelectContract.php:148
+#: SelectCreditItems.php:242 SelectCustomer.php:24 SelectCustomer.php:210
+#: SelectOrderItems.php:594 SelectRecurringSalesOrder.php:91
+#: SelectSalesOrder.php:701 SelectSalesOrder.php:718
+#: SellThroughSupport.php:262 StockLocMovements.php:93 StockMovements.php:102
#: includes/PDFAgedDebtorsPageHeader.inc:48
#: includes/PDFBankingSummaryPageHeader.inc:56
#: includes/PDFCustTransListingPageHeader.inc:48
@@ -3916,7 +3921,8 @@
msgstr ""
#: ConfirmDispatch_Invoice.php:299 GoodsReceived.php:102 GoodsReceived.php:106
-#: PDFOrdersInvoiced.php:336 PDFOrderStatus.php:338 Shipments.php:401
+#: PDFOrdersInvoiced.php:336 PDFOrderStatus.php:338
+#: PDFSalesBySalesperson.php:104 PDFWeeklyOrders.php:101 Shipments.php:401
#: Shipments.php:488
msgid "Ordered"
msgstr ""
@@ -4116,12 +4122,12 @@
msgid "Please remedy this"
msgstr ""
-#: ConfirmDispatch_Invoice.php:681 Credit_Invoice.php:536
+#: ConfirmDispatch_Invoice.php:681 Credit_Invoice.php:535
#: GoodsReceived.php:282
msgid "The company information and preferences could not be retrieved"
msgstr ""
-#: ConfirmDispatch_Invoice.php:681 Credit_Invoice.php:536
+#: ConfirmDispatch_Invoice.php:681 Credit_Invoice.php:535
#: GoodsReceived.php:282
msgid "see your system administrator"
msgstr ""
@@ -4224,14 +4230,14 @@
#: CounterSales.php:1576 CounterSales.php:1597 CounterSales.php:1762
#: CounterSales.php:1784 CounterSales.php:1809 CounterSales.php:1830
#: CounterSales.php:1856 CounterSales.php:1879 Credit_Invoice.php:208
-#: Credit_Invoice.php:595 Credit_Invoice.php:638 Credit_Invoice.php:655
-#: Credit_Invoice.php:671 Credit_Invoice.php:720 Credit_Invoice.php:733
-#: Credit_Invoice.php:849 Credit_Invoice.php:859 Credit_Invoice.php:938
-#: Credit_Invoice.php:953 Credit_Invoice.php:970 Credit_Invoice.php:980
-#: Credit_Invoice.php:995 Credit_Invoice.php:1040 Credit_Invoice.php:1082
-#: Credit_Invoice.php:1124 Credit_Invoice.php:1146 Credit_Invoice.php:1320
-#: Credit_Invoice.php:1360 Credit_Invoice.php:1387 Credit_Invoice.php:1408
-#: Credit_Invoice.php:1437 Credit_Invoice.php:1463 Credit_Invoice.php:1489
+#: Credit_Invoice.php:594 Credit_Invoice.php:637 Credit_Invoice.php:654
+#: Credit_Invoice.php:670 Credit_Invoice.php:719 Credit_Invoice.php:732
+#: Credit_Invoice.php:848 Credit_Invoice.php:858 Credit_Invoice.php:937
+#: Credit_Invoice.php:952 Credit_Invoice.php:969 Credit_Invoice.php:979
+#: Credit_Invoice.php:994 Credit_Invoice.php:1039 Credit_Invoice.php:1081
+#: Credit_Invoice.php:1123 Credit_Invoice.php:1145 Credit_Invoice.php:1319
+#: Credit_Invoice.php:1359 Credit_Invoice.php:1386 Credit_Invoice.php:1407
+#: Credit_Invoice.php:1436 Credit_Invoice.php:1462 Credit_Invoice.php:1488
#: GoodsReceived.php:301 GoodsReceived.php:409 GoodsReceived.php:450
#: GoodsReceived.php:480 GoodsReceived.php:508 GoodsReceived.php:541
#: GoodsReceived.php:559 GoodsReceived.php:588 GoodsReceived.php:605
@@ -4347,15 +4353,15 @@
#: CounterSales.php:1438 CounterSales.php:1480 CounterSales.php:1490
#: CounterSales.php:1576 CounterSales.php:1597 CounterSales.php:1762
#: CounterSales.php:1784 CounterSales.php:1809 CounterSales.php:1830
-#: CounterSales.php:1856 CounterSales.php:1879 Credit_Invoice.php:595
-#: Credit_Invoice.php:638 Credit_Invoice.php:655 Credit_Invoice.php:671
-#: Credit_Invoice.php:720 Credit_Invoice.php:733 Credit_Invoice.php:849
-#: Credit_Invoice.php:859 Credit_Invoice.php:938 Credit_Invoice.php:953
-#: Credit_Invoice.php:970 Credit_Invoice.php:980 Credit_Invoice.php:995
-#: Credit_Invoice.php:1040 Credit_Invoice.php:1082 Credit_Invoice.php:1124
-#: Credit_Invoice.php:1146 Credit_Invoice.php:1320 Credit_Invoice.php:1360
-#: Credit_Invoice.php:1387 Credit_Invoice.php:1408 Credit_Invoice.php:1437
-#: Credit_Invoice.php:1463 Credit_Invoice.php:1489 GoodsReceived.php:301
+#: CounterSales.php:1856 CounterSales.php:1879 Credit_Invoice.php:594
+#: Credit_Invoice.php:637 Credit_Invoice.php:654 Credit_Invoice.php:670
+#: Credit_Invoice.php:719 Credit_Invoice.php:732 Credit_Invoice.php:848
+#: Credit_Invoice.php:858 Credit_Invoice.php:937 Credit_Invoice.php:952
+#: Credit_Invoice.php:969 Credit_Invoice.php:979 Credit_Invoice.php:994
+#: Credit_Invoice.php:1039 Credit_Invoice.php:1081 Credit_Invoice.php:1123
+#: Credit_Invoice.php:1145 Credit_Invoice.php:1319 Credit_Invoice.php:1359
+#: Credit_Invoice.php:1386 Credit_Invoice.php:1407 Credit_Invoice.php:1436
+#: Credit_Invoice.php:1462 Credit_Invoice.php:1488 GoodsReceived.php:301
#: GoodsReceived.php:409 GoodsReceived.php:450 GoodsReceived.php:480
#: GoodsReceived.php:508 GoodsReceived.php:541 GoodsReceived.php:559
#: GoodsReceived.php:588 GoodsReceived.php:605 GoodsReceived.php:695
@@ -4461,13 +4467,13 @@
msgstr ""
#: ConfirmDispatch_Invoice.php:834 CounterReturns.php:967
-#: CounterSales.php:1368 Credit_Invoice.php:655
+#: CounterSales.php:1368 Credit_Invoice.php:654
#: RecurringSalesOrdersProcess.php:696 SelectCreditItems.php:1179
msgid "The debtor transaction taxes records could not be inserted because"
msgstr ""
#: ConfirmDispatch_Invoice.php:835 CounterReturns.php:968
-#: CounterSales.php:1369 Credit_Invoice.php:656
+#: CounterSales.php:1369 Credit_Invoice.php:655
#: RecurringSalesOrdersProcess.php:697 SelectCreditItems.php:1180
msgid ""
"The following SQL to insert the debtor transaction taxes record was used"
@@ -4483,7 +4489,7 @@
msgstr ""
#: ConfirmDispatch_Invoice.php:867 ConfirmDispatch_Invoice.php:944
-#: Credit_Invoice.php:721 RecurringSalesOrdersProcess.php:324
+#: Credit_Invoice.php:720 RecurringSalesOrdersProcess.php:324
msgid "The following SQL to update the sales order detail record was used"
msgstr ""
@@ -4512,12 +4518,12 @@
msgstr ""
#: ConfirmDispatch_Invoice.php:982 CounterReturns.php:1004
-#: CounterSales.php:1405 Credit_Invoice.php:733 SelectCreditItems.php:1425
+#: CounterSales.php:1405 Credit_Invoice.php:732 SelectCreditItems.php:1425
msgid "Location stock record could not be updated because"
msgstr ""
#: ConfirmDispatch_Invoice.php:983 ContractCosting.php:338
-#: CounterReturns.php:1005 CounterSales.php:1406 Credit_Invoice.php:734
+#: CounterReturns.php:1005 CounterSales.php:1406 Credit_Invoice.php:733
#: GoodsReceived.php:509 ReverseGRN.php:221 SelectCreditItems.php:1426
#: StockTransfers.php:438 StockTransfers.php:447 SupplierInvoice.php:276
#: WorkOrderIssue.php:181 WorkOrderReceive.php:344 WorkOrderReceive.php:453
@@ -4525,12 +4531,12 @@
msgstr ""
#: ConfirmDispatch_Invoice.php:1000 CounterReturns.php:1023
-#: CounterSales.php:1424 Credit_Invoice.php:754 SelectCreditItems.php:1446
+#: CounterSales.php:1424 Credit_Invoice.php:753 SelectCreditItems.php:1446
msgid "Could not retrieve assembly components from the database for"
msgstr ""
#: ConfirmDispatch_Invoice.php:1000 CounterReturns.php:1023
-#: CounterSales.php:1424 Credit_Invoice.php:754 EDIMessageFormat.php:43
+#: CounterSales.php:1424 Credit_Invoice.php:753 EDIMessageFormat.php:43
#: EDISendInvoices.php:105 EDISendInvoices_Reece.php:185
#: FixedAssetCategories.php:94 FixedAssetCategories.php:113
#: PricesBasedOnMarkUp.php:340 PricesBasedOnMarkUp.php:356
@@ -4550,6 +4556,7 @@
#: DeliveryDetails.php:621 DeliveryDetails.php:627 DeliveryDetails.php:634
#: DeliveryDetails.php:811 DeliveryDetails.php:817 DeliveryDetails.php:840
#: MRPReport.php:412 PDFOrdersInvoiced.php:291 PDFOrderStatus.php:292
+#: PDFSalesBySalesperson.php:82 PDFWeeklyOrders.php:78
#: SelectCompletedOrder.php:555 SelectContract.php:143
#: SelectOrderItems.php:686 SelectProduct.php:367 Shipments.php:399
#: Shipments.php:486 SuppCreditGRNs.php:190 SuppInvGRNs.php:256
@@ -4560,12 +4567,12 @@
msgstr ""
#: ConfirmDispatch_Invoice.php:1056 CounterReturns.php:1080
-#: CounterSales.php:1480 Credit_Invoice.php:849 SelectCreditItems.php:1501
+#: CounterSales.php:1480 Credit_Invoice.php:848 SelectCreditItems.php:1501
msgid "Stock movement records for the assembly components of"
msgstr ""
#: ConfirmDispatch_Invoice.php:1056 CounterReturns.php:1080
-#: CounterSales.php:1480 Credit_Invoice.php:849 SelectCreditItems.php:1501
+#: CounterSales.php:1480 Credit_Invoice.php:848 SelectCreditItems.php:1501
#: ShipmentCosting.php:397 SupplierAllocations.php:139
#: includes/PDFPaymentRun_PymtFooter.php:57
#: includes/PDFPaymentRun_PymtFooter.php:88
@@ -4577,14 +4584,14 @@
msgstr ""
#: ConfirmDispatch_Invoice.php:1057 CounterReturns.php:1081
-#: CounterSales.php:1481 Credit_Invoice.php:850 SelectCreditItems.php:1502
+#: CounterSales.php:1481 Credit_Invoice.php:849 SelectCreditItems.php:1502
msgid ""
"The following SQL to insert the assembly components stock movement records "
"was used"
msgstr ""
#: ConfirmDispatch_Invoice.php:1066 CounterReturns.php:1090
-#: CounterSales.php:1490 Credit_Invoice.php:859 SelectCreditItems.php:1511
+#: CounterSales.php:1490 Credit_Invoice.php:858 SelectCreditItems.php:1511
msgid ""
"Location stock record could not be updated for an assembly component because"
msgstr ""
@@ -4597,16 +4604,16 @@
msgstr ""
#: ConfirmDispatch_Invoice.php:1154 CounterReturns.php:1174
-#: CounterSales.php:1576 Credit_Invoice.php:938 Credit_Invoice.php:1040
-#: Credit_Invoice.php:1082 Credit_Invoice.php:1124
+#: CounterSales.php:1576 Credit_Invoice.php:937 Credit_Invoice.php:1039
+#: Credit_Invoice.php:1081 Credit_Invoice.php:1123
#: RecurringSalesOrdersProcess.php:365 ReverseGRN.php:251
#: SelectCreditItems.php:1248 SelectCreditItems.php:1323
msgid "Stock movement records could not be inserted because"
msgstr ""
#: ConfirmDispatch_Invoice.php:1155 ContractCosting.php:369
-#: CounterReturns.php:1175 CounterSales.php:1577 Credit_Invoice.php:939
-#: Credit_Invoice.php:1041 Credit_Invoice.php:1083 GoodsReceived.php:542
+#: CounterReturns.php:1175 CounterSales.php:1577 Credit_Invoice.php:938
+#: Credit_Invoice.php:1040 Credit_Invoice.php:1082 GoodsReceived.php:542
#: RecurringSalesOrdersProcess.php:366 ReverseGRN.php:252
#: SelectCreditItems.php:1324 SupplierInvoice.php:309 WorkOrderIssue.php:214
#: WorkOrderReceive.php:375 WorkOrderReceive.php:485
@@ -4621,21 +4628,21 @@
msgstr ""
#: ConfirmDispatch_Invoice.php:1176 CounterReturns.php:1196
-#: CounterSales.php:1598 Credit_Invoice.php:1147
+#: CounterSales.php:1598 Credit_Invoice.php:1146
#: RecurringSalesOrdersProcess.php:387 SelectCreditItems.php:1345
msgid ""
"The following SQL to insert the stock movement tax detail records was used"
msgstr ""
-#: ConfirmDispatch_Invoice.php:1192 Credit_Invoice.php:970
-#: Credit_Invoice.php:980 SelectCreditItems.php:1389 StockAdjustments.php:267
+#: ConfirmDispatch_Invoice.php:1192 Credit_Invoice.php:969
+#: Credit_Invoice.php:979 SelectCreditItems.php:1389 StockAdjustments.php:267
#: StockAdjustments.php:285 StockLocTransferReceive.php:143
#: StockTransfers.php:276 StockTransfers.php:391
msgid "The serial stock item record could not be updated because"
msgstr ""
-#: ConfirmDispatch_Invoice.php:1193 Credit_Invoice.php:971
-#: Credit_Invoice.php:981 SelectCreditItems.php:1390
+#: ConfirmDispatch_Invoice.php:1193 Credit_Invoice.php:970
+#: Credit_Invoice.php:980 SelectCreditItems.php:1390
#: SelectCreditItems.php:1620 StockAdjustments.php:268
#: StockAdjustments.php:286 StockLocTransferReceive.php:144
#: StockLocTransferReceive.php:158 StockLocTransferReceive.php:260
@@ -4644,7 +4651,7 @@
msgid "The following SQL to update the serial stock item record was used"
msgstr ""
-#: ConfirmDispatch_Invoice.php:1207 Credit_Invoice.php:995
+#: ConfirmDispatch_Invoice.php:1207 Credit_Invoice.php:994
#: GoodsReceived.php:605 SelectCreditItems.php:1404 StockAdjustments.php:301
#: StockLocTransferReceive.php:176 StockLocTransferReceive.php:290
#: StockTransfers.php:312 StockTransfers.php:425 WorkOrderIssue.php:250
@@ -4652,7 +4659,7 @@
msgid "The serial stock movement record could not be inserted because"
msgstr ""
-#: ConfirmDispatch_Invoice.php:1208 Credit_Invoice.php:996
+#: ConfirmDispatch_Invoice.php:1208 Credit_Invoice.php:995
#: GoodsReceived.php:606 StockAdjustments.php:302
#: StockLocTransferReceive.php:177 StockLocTransferReceive.php:291
#: StockTransfers.php:313 StockTransfers.php:426 WorkOrderIssue.php:251
@@ -4667,7 +4674,7 @@
msgstr ""
#: ConfirmDispatch_Invoice.php:1253 CounterReturns.php:1241
-#: CounterSales.php:1680 Credit_Invoice.php:1178
+#: CounterSales.php:1680 Credit_Invoice.php:1177
#: RecurringSalesOrdersProcess.php:426 SelectCreditItems.php:1678
#: api/api_salesorders.php:1027
msgid "SQL to count the no of sales analysis records"
@@ -4679,13 +4686,13 @@
msgstr ""
#: ConfirmDispatch_Invoice.php:1309 CounterReturns.php:1299
-#: CounterSales.php:1738 Credit_Invoice.php:1290
+#: CounterSales.php:1738 Credit_Invoice.php:1289
#: RecurringSalesOrdersProcess.php:485 SelectCreditItems.php:1788
msgid "The following SQL to insert the sales analysis record was used"
msgstr ""
#: ConfirmDispatch_Invoice.php:1334 CounterReturns.php:1323
-#: CounterSales.php:1762 Credit_Invoice.php:1320
+#: CounterSales.php:1762 Credit_Invoice.php:1319
msgid "The cost of sales GL posting could not be inserted because"
msgstr ""
@@ -4698,9 +4705,9 @@
#: CounterReturns.php:1346 CounterReturns.php:1371 CounterReturns.php:1392
#: CounterReturns.php:1441 CounterSales.php:1763 CounterSales.php:1785
#: CounterSales.php:1810 CounterSales.php:1831 CounterSales.php:1880
-#: Credit_Invoice.php:1321 Credit_Invoice.php:1361 Credit_Invoice.php:1388
-#: Credit_Invoice.php:1409 Credit_Invoice.php:1438 Credit_Invoice.php:1464
-#: Credit_Invoice.php:1490 RecurringSalesOrdersProcess.php:513
+#: Credit_Invoice.php:1320 Credit_Invoice.php:1360 Credit_Invoice.php:1387
+#: Credit_Invoice.php:1408 Credit_Invoice.php:1437 Credit_Invoice.php:1463
+#: Credit_Invoice.php:1489 RecurringSalesOrdersProcess.php:513
#: RecurringSalesOrdersProcess.php:540 RecurringSalesOrdersProcess.php:633
#: SelectCreditItems.php:1822 SelectCreditItems.php:1848
#: SelectCreditItems.php:1871 SelectCreditItems.php:1902
@@ -4808,7 +4815,7 @@
msgstr ""
#: ConfirmDispatch_Invoice.php:1631 CounterReturns.php:1440
-#: CounterSales.php:1879 Credit_Invoice.php:1489
+#: CounterSales.php:1879 Credit_Invoice.php:1488
#: RecurringSalesOrdersProcess.php:579 SelectCreditItems.php:1993
msgid "The tax GL posting could not be inserted because"
msgstr ""
@@ -4830,7 +4837,7 @@
#: DeliveryDetails.php:602 DeliveryDetails.php:606 DeliveryDetails.php:828
#: DeliveryDetails.php:832 GLBalanceSheet.php:22 GLJournalInquiry.php:113
#: GLProfit_Loss.php:25 GLTagProfit_Loss.php:25 GLTagProfit_Loss.php:523
-#: GLTags.php:54 PDFCOA.php:29 PDFPrintLabel.php:67 PDFProdSpec.php:18
+#: GLTags.php:54 PDFCOA.php:29 PDFPrintLabel.php:67 PDFProdSpec.php:19
#: PDFStockLocTransfer.php:29 PDFWOPrint.php:586 PDFWOPrint.php:590
#: PDFWOPrint.php:593 PDFWOPrint.php:669 PDFWOPrint.php:673 PDFWOPrint.php:676
#: PO_OrderDetails.php:143 PO_PDFPurchOrder.php:395 PO_PDFPurchOrder.php:399
@@ -6197,8 +6204,8 @@
"Could not determine if the part being returned was a kitset or not because"
msgstr ""
-#: CounterReturns.php:673 CounterSales.php:755 PricesByCost.php:159
-#: SelectOrderItems.php:1311
+#: CounterReturns.php:673 CounterSales.php:755 PDFWeeklyOrders.php:86
+#: PricesByCost.php:159 SelectOrderItems.php:1311
msgid "GP %"
msgstr ""
@@ -6247,7 +6254,7 @@
msgid "Contact Email"
msgstr ""
-#: CounterReturns.php:787 CounterSales.php:884 Credit_Invoice.php:1594
+#: CounterReturns.php:787 CounterSales.php:884 Credit_Invoice.php:1593
#: DeliveryDetails.php:1117 SelectCreditItems.php:924
msgid "Sales person"
msgstr ""
@@ -6356,12 +6363,12 @@
"Cannot insert the customer allocation of the receipt to the invoice because"
msgstr ""
-#: CounterReturns.php:1602 Credit_Invoice.php:1505 SelectCreditItems.php:2008
+#: CounterReturns.php:1602 Credit_Invoice.php:1504 SelectCreditItems.php:2008
msgid "Credit Note number"
msgstr ""
-#: CounterReturns.php:1607 CounterReturns.php:1609 Credit_Invoice.php:1507
-#: Credit_Invoice.php:1509
+#: CounterReturns.php:1607 CounterReturns.php:1609 Credit_Invoice.php:1506
+#: Credit_Invoice.php:1508
msgid "Print this credit note"
msgstr ""
@@ -6565,13 +6572,12 @@
#: CounterSales.php:909 CustomerInquiry.php:254 CustomerTransInquiry.php:104
#: DeliveryDetails.php:1105 OrderDetails.php:125 PO_Header.php:1155
#: PO_OrderDetails.php:156 RecurringSalesOrders.php:419
-#: SelectQASamples.php:395 SelectQASamples.php:500 SelectQASamples.php:560
+#: SelectQASamples.php:402 SelectQASamples.php:507 SelectQASamples.php:567
#: SpecialOrder.php:613 SupplierCredit.php:602 SupplierInquiry.php:213
#: SupplierInvoice.php:952 SupplierTransInquiry.php:107
#: TestPlanResults.php:285 TestPlanResults.php:760 WorkOrderEntry.php:603
-#: Z_ImportChartOfAccounts.php:28 Z_ImportGLAccountGroups.php:26
-#: Z_ImportGLAccountSections.php:29 Z_ImportPartCodes.php:31
-#: includes/PDFOrderPageHeader_generic.inc:58
+#: Z_ImportGLAccountGroups.php:26 Z_ImportGLAccountSections.php:29
+#: Z_ImportPartCodes.php:31 includes/PDFOrderPageHeader_generic.inc:58
#: includes/PO_PDFOrderPageHeader.inc:65 ../webSHOP/Checkout.php:583
msgid "Comments"
msgstr ""
@@ -6912,171 +6918,171 @@
msgid "Credit Totals"
msgstr ""
-#: Credit_Invoice.php:499
+#: Credit_Invoice.php:498
msgid ""
"Failed to retrieve salesoderdetails to compare if the order has been "
"invoiced and that it is possible that the credit note may not already have "
"been done"
msgstr ""
-#: Credit_Invoice.php:503
+#: Credit_Invoice.php:502
msgid "The credit quantity for the line for"
msgstr ""
-#: Credit_Invoice.php:514 SelectCreditItems.php:952
+#: Credit_Invoice.php:513 SelectCreditItems.php:952
msgid ""
"The GL code to write off the credit value to must be specified. Please "
"select the appropriate GL code for the selection box"
msgstr ""
-#: Credit_Invoice.php:595
+#: Credit_Invoice.php:594
msgid ""
"The alteration to the invoice record to reflect the allocation of the credit "
"note to the invoice could not be done because"
msgstr ""
-#: Credit_Invoice.php:596
+#: Credit_Invoice.php:595
msgid "The following SQL to update the invoice allocation was used"
msgstr ""
-#: Credit_Invoice.php:638 SelectCreditItems.php:1162
+#: Credit_Invoice.php:637 SelectCreditItems.php:1162
msgid ""
"The customer credit note transaction could not be added to the database "
"because"
msgstr ""
-#: Credit_Invoice.php:639 SelectCreditItems.php:1101
+#: Credit_Invoice.php:638 SelectCreditItems.php:1101
#: SelectCreditItems.php:1163
msgid "The following SQL to insert the customer credit note was used"
msgstr ""
-#: Credit_Invoice.php:671
+#: Credit_Invoice.php:670
msgid ""
"The allocation record for the credit note could not be added to the database "
"because"
msgstr ""
-#: Credit_Invoice.php:672
+#: Credit_Invoice.php:671
msgid ""
"The following SQL to insert the allocation record for the credit note was "
"used"
msgstr ""
-#: Credit_Invoice.php:720
+#: Credit_Invoice.php:719
msgid ""
"The sales order detail record could not be updated for the reduced quantity "
"invoiced because"
msgstr ""
-#: Credit_Invoice.php:776
+#: Credit_Invoice.php:775
msgid "Could not get the current location stock of the assembly component"
msgstr ""
-#: Credit_Invoice.php:813 Credit_Invoice.php:843 Credit_Invoice.php:898
-#: Credit_Invoice.php:931 Credit_Invoice.php:1033 Credit_Invoice.php:1115
+#: Credit_Invoice.php:812 Credit_Invoice.php:842 Credit_Invoice.php:897
+#: Credit_Invoice.php:930 Credit_Invoice.php:1032 Credit_Invoice.php:1114
msgid "Ex Inv"
msgstr ""
-#: Credit_Invoice.php:860
+#: Credit_Invoice.php:859
msgid ""
"The following SQL to update the components location stock record was used"
msgstr ""
-#: Credit_Invoice.php:953
+#: Credit_Invoice.php:952
msgid "The serial stock item record could not be selected because"
msgstr ""
-#: Credit_Invoice.php:954
+#: Credit_Invoice.php:953
msgid "The following SQL to select the serial stock item record was used"
msgstr ""
-#: Credit_Invoice.php:1074
+#: Credit_Invoice.php:1073
msgid "Written off ex Inv"
msgstr ""
-#: Credit_Invoice.php:1125 SelectCreditItems.php:1249
+#: Credit_Invoice.php:1124 SelectCreditItems.php:1249
msgid ""
"The following SQL to insert the stock movement records for the purpose of "
"display on the credit note was used"
msgstr ""
-#: Credit_Invoice.php:1146 SelectCreditItems.php:1344
+#: Credit_Invoice.php:1145 SelectCreditItems.php:1344
msgid ""
"Taxes and rates applicable to this credit note line item could not be "
"inserted because"
msgstr ""
-#: Credit_Invoice.php:1177 SelectCreditItems.php:1677
+#: Credit_Invoice.php:1176 SelectCreditItems.php:1677
msgid ""
"The count to check for existing Sales analysis records could not run because"
msgstr ""
-#: Credit_Invoice.php:1289 SelectCreditItems.php:1787
+#: Credit_Invoice.php:1288 SelectCreditItems.php:1787
msgid ""
"The sales analysis record for this credit note could not be added because"
msgstr ""
-#: Credit_Invoice.php:1360
+#: Credit_Invoice.php:1359
msgid ""
"The stock side or write off of the cost of sales GL posting could not be "
"inserted because"
msgstr ""
-#: Credit_Invoice.php:1387 SelectCreditItems.php:1901
+#: Credit_Invoice.php:1386 SelectCreditItems.php:1901
msgid "The credit note GL posting could not be inserted because"
msgstr ""
-#: Credit_Invoice.php:1408 SelectCreditItems.php:1924
+#: Credit_Invoice.php:1407 SelectCreditItems.php:1924
msgid "The credit note discount GL posting could not be inserted because"
msgstr ""
-#: Credit_Invoice.php:1437 SelectCreditItems.php:1952
+#: Credit_Invoice.php:1436 SelectCreditItems.php:1952
msgid ""
"The total debtor GL posting for the credit note could not be inserted because"
msgstr ""
-#: Credit_Invoice.php:1463 SelectCreditItems.php:1972
+#: Credit_Invoice.php:1462 SelectCreditItems.php:1972
msgid ""
"The freight GL posting for this credit note could not be inserted because"
msgstr ""
-#: Credit_Invoice.php:1505 GoodsReceived.php:746 SupplierCredit.php:1329
+#: Credit_Invoice.php:1504 GoodsReceived.php:746 SupplierCredit.php:1329
#: SupplierInvoice.php:1883 WorkOrderIssue.php:376 WorkOrderReceive.php:746
#: Z_BottomUpCosts.php:33
msgid "has been processed"
msgstr ""
-#: Credit_Invoice.php:1520 SelectCreditItems.php:856
+#: Credit_Invoice.php:1519 SelectCreditItems.php:856
msgid "Credit Note Type"
msgstr ""
-#: Credit_Invoice.php:1524 Credit_Invoice.php:1529 Credit_Invoice.php:1533
+#: Credit_Invoice.php:1523 Credit_Invoice.php:1528 Credit_Invoice.php:1532
#: SelectCreditItems.php:860 SelectCreditItems.php:865
msgid "Goods returned to store"
msgstr ""
-#: Credit_Invoice.php:1525 Credit_Invoice.php:1528 Credit_Invoice.php:1532
+#: Credit_Invoice.php:1524 Credit_Invoice.php:1527 Credit_Invoice.php:1531
#: SelectCreditItems.php:861 SelectCreditItems.php:864
msgid "Goods written off"
msgstr ""
-#: Credit_Invoice.php:1526 Credit_Invoice.php:1530 Credit_Invoice.php:1534
+#: Credit_Invoice.php:1525 Credit_Invoice.php:1529 Credit_Invoice.php:1533
msgid "Reverse overcharge"
msgstr ""
-#: Credit_Invoice.php:1545
+#: Credit_Invoice.php:1544
msgid "Goods returned to location"
msgstr ""
-#: Credit_Invoice.php:1568 SelectCreditItems.php:902
+#: Credit_Invoice.php:1567 SelectCreditItems.php:902
msgid "Write off the cost of the goods to"
msgstr ""
-#: Credit_Invoice.php:1615
+#: Credit_Invoice.php:1614
msgid "Credit note text"
msgstr ""
-#: Credit_Invoice.php:1627
+#: Credit_Invoice.php:1626
msgid "Process Credit"
msgstr ""
@@ -7692,8 +7698,8 @@
msgid "Customer Stock Description"
msgstr ""
-#: CustItem.php:455 MailingGroupMaintenance.php:250 ProductSpecs.php:161
-#: ProductSpecs.php:236 PurchData.php:763 SellThroughSupport.php:481
+#: CustItem.php:455 MailingGroupMaintenance.php:250 ProductSpecs.php:163
+#: ProductSpecs.php:238 PurchData.php:763 SellThroughSupport.php:481
#: Shipments.php:523 StockAdjustments.php:487 TaxGroups.php:393
#: TestPlanResults.php:507 TestPlanResults.php:582 WOSerialNos.php:283
#: WWW_Access.php:244
@@ -7804,7 +7810,7 @@
#: CustLoginSetup.php:150 SMTPServer.php:114 SuppLoginSetup.php:133
#: WWW_Users.php:479 includes/Login.php:99 includes/Login.php:100
#: install/index.php:932 ../webSHOP/Checkout.php:447
-#: ../webSHOP/Register.php:612 ../webSHOP/includes/header.php:204
+#: ../webSHOP/Register.php:612 ../webSHOP/includes/header.php:205
msgid "Password"
msgstr ""
@@ -8468,7 +8474,7 @@
msgstr ""
#: CustomerBranches.php:733 CustomerBranches.php:756 DailySalesInquiry.php:40
-#: SalesPeople.php:179 WWW_Users.php:308
+#: PDFSalesBySalesperson.php:90 SalesPeople.php:179 WWW_Users.php:308
msgid "Salesperson"
msgstr ""
@@ -9813,7 +9819,7 @@
#: PO_SelectPurchOrder.php:116 PrintCheque.php:50 PrintCheque.php:175
#: SelectCompletedOrder.php:77 SelectCompletedOrder.php:82
#: SelectCompletedOrder.php:88 SelectCompletedOrder.php:236
-#: SelectContract.php:34 SelectQASamples.php:240 SelectSalesOrder.php:442
+#: SelectContract.php:34 SelectQASamples.php:248 SelectSalesOrder.php:442
#: SelectSalesOrder.php:446 SelectWorkOrder.php:131 Shipt_Select.php:48
#: StockClone.php:1064 StockMovements.php:62 Stocks.php:392 Stocks.php:1398
#: TestPlanResults.php:125 includes/PDFBOMListingPageHeader.inc:21
@@ -9872,9 +9878,9 @@
msgid "Show Daily Sales For The Selected Month"
msgstr ""
-#: DailySalesInquiry.php:110 SalesByTypePeriodInquiry.php:348
-#: SalesCategoryPeriodInquiry.php:158 SalesTopCustomersInquiry.php:207
-#: SalesTopItemsInquiry.php:212
+#: DailySalesInquiry.php:110 PDFWeeklyOrders.php:172
+#: SalesByTypePeriodInquiry.php:348 SalesCategoryPeriodInquiry.php:158
+#: SalesTopCustomersInquiry.php:207 SalesTopItemsInquiry.php:212
msgid "The sales data could not be retrieved because"
msgstr ""
@@ -9934,9 +9940,9 @@
msgstr ""
#: Dashboard.php:16 Dashboard.php:25 Dashboard.php:34 Dashboard.php:43
-#: ProductSpecs.php:77 ProductSpecs.php:280 ProductSpecs.php:315
-#: QATests.php:108 SalesPeople.php:133 SelectQASamples.php:85
-#: SelectQASamples.php:99 TestPlanResults.php:356 TestPlanResults.php:435
+#: ProductSpecs.php:78 ProductSpecs.php:282 ProductSpecs.php:317
+#: QATests.php:110 SalesPeople.php:133 SelectQASamples.php:87
+#: SelectQASamples.php:101 TestPlanResults.php:356 TestPlanResults.php:435
#: TestPlanResults.php:476 TestPlanResults.php:622 TestPlanResults.php:675
#: TestPlanResults.php:692
msgid "The SQL that was used and failed was"
@@ -10034,7 +10040,7 @@
msgstr ""
#: Dashboard.php:656 ../webSHOP/includes/Functions.php:63
-#: ../webSHOP/includes/header.php:191
+#: ../webSHOP/includes/header.php:192
msgid "View Order"
msgstr ""
@@ -10044,8 +10050,9 @@
msgstr ""
#: Dashboard.php:660 FTP_RadioBeacon.php:54 MRPReschedules.php:196
-#: POReport.php:540 POReport.php:626 POReport.php:1306 POReport.php:1357
-#: POReport.php:1514 PO_SelectOSPurchOrder.php:510 PO_SelectPurchOrder.php:436
+#: PDFSalesBySalesperson.php:84 PDFWeeklyOrders.php:80 POReport.php:540
+#: POReport.php:626 POReport.php:1306 POReport.php:1357 POReport.php:1514
+#: PO_SelectOSPurchOrder.php:510 PO_SelectPurchOrder.php:436
#: PrintCustTrans.php:808 PrintCustTransPortrait.php:856 SalesInquiry.php:827
#: SalesInquiry.php:846 SalesInquiry.php:1086 SelectCompletedOrder.php:559
#: SelectSalesOrder.php:704 includes/PDFOrderPageHeader_generic.inc:77
@@ -10674,7 +10681,8 @@
msgstr ""
#: DiscountCategories.php:222 InventoryPlanningPrefSupplier.php:72
-#: PDFCOA.php:64 SalesCategories.php:157 SalesCategories.php:508
+#: PDFCOA.php:64 PDFSalesBySalesperson.php:85 PDFWeeklyOrders.php:81
+#: SalesCategories.php:157 SalesCategories.php:508
#: SalesTopItemsInquiry.php:220 SelectWorkOrder.php:333
#: ShipmentCosting.php:148 ShipmentCosting.php:539 Shipments.php:400
#: Shipments.php:487 StockUsage.php:60 SuppCreditGRNs.php:290
@@ -11346,7 +11354,7 @@
msgstr ""
#: EmailConfirmation.php:43 FTP_RadioBeacon.php:178 PDFCOA.php:81
-#: PDFPickingList.php:224 PDFProdSpec.php:64 PDFQuotation.php:37
+#: PDFPickingList.php:224 PDFProdSpec.php:65 PDFQuotation.php:37
#: PDFQuotation.php:123 PDFQuotationPortrait.php:39
#: PDFQuotationPortrait.php:125 PDFWOPrint.php:144 PDFWOPrint.php:264
#: PO_PDFPurchOrder.php:78 PO_PDFPurchOrder.php:209
@@ -11824,10 +11832,10 @@
msgid "Date Purchased"
msgstr ""
-#: FixedAssetDepreciation.php:93 PricesByCost.php:158 SalesAnalReptCols.php:36
-#: SalesAnalReptCols.php:38 SelectProduct.php:195 SelectProduct.php:331
-#: ShipmentCosting.php:153 ShipmentCosting.php:154 StockCostUpdate.ph...
[truncated message content] |
