Menu
▾
▴
web-erp-svn — SVN commits
This list is closed, nobody may subscribe to it.
| 2011 |
Jan
(14) |
Feb
(42) |
Mar
(56) |
Apr
(60) |
May
(54) |
Jun
(48) |
Jul
(74) |
Aug
(52) |
Sep
(68) |
Oct
(64) |
Nov
(42) |
Dec
(62) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2012 |
Jan
(142) |
Feb
(270) |
Mar
(374) |
Apr
(230) |
May
(214) |
Jun
(116) |
Jul
(234) |
Aug
(66) |
Sep
(120) |
Oct
(16) |
Nov
(17) |
Dec
(41) |
| 2013 |
Jan
(19) |
Feb
(18) |
Mar
(8) |
Apr
(40) |
May
(121) |
Jun
(42) |
Jul
(127) |
Aug
(145) |
Sep
(27) |
Oct
(38) |
Nov
(83) |
Dec
(61) |
| 2014 |
Jan
(33) |
Feb
(35) |
Mar
(59) |
Apr
(41) |
May
(38) |
Jun
(45) |
Jul
(17) |
Aug
(58) |
Sep
(46) |
Oct
(51) |
Nov
(55) |
Dec
(36) |
| 2015 |
Jan
(57) |
Feb
(67) |
Mar
(70) |
Apr
(34) |
May
(32) |
Jun
(11) |
Jul
(3) |
Aug
(17) |
Sep
(16) |
Oct
(13) |
Nov
(30) |
Dec
(30) |
| 2016 |
Jan
(17) |
Feb
(12) |
Mar
(17) |
Apr
(20) |
May
(47) |
Jun
(15) |
Jul
(13) |
Aug
(30) |
Sep
(32) |
Oct
(20) |
Nov
(32) |
Dec
(24) |
| 2017 |
Jan
(16) |
Feb
|
Mar
(11) |
Apr
(11) |
May
(5) |
Jun
(42) |
Jul
(9) |
Aug
(10) |
Sep
(14) |
Oct
(15) |
Nov
(2) |
Dec
(29) |
| 2018 |
Jan
(28) |
Feb
(49) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <aga...@us...> - 2015-05-18 13:29:41
|
Revision: 7305
http://sourceforge.net/p/web-erp/reponame/7305
Author: agaluski
Date: 2015-05-18 13:29:38 +0000 (Mon, 18 May 2015)
Log Message:
-----------
Use better calculation for width of Spec name before Long Description.
Modified Paths:
--------------
trunk/includes/PDFProdSpecHeader.inc
Modified: trunk/includes/PDFProdSpecHeader.inc
===================================================================
--- trunk/includes/PDFProdSpecHeader.inc 2015-05-17 01:43:20 UTC (rev 7304)
+++ trunk/includes/PDFProdSpecHeader.inc 2015-05-18 13:29:38 UTC (rev 7305)
@@ -31,8 +31,8 @@
$YPos -= $line_height;
$YPos -= $line_height;
$pdf->setFont('','B');
-$LeftOvers = $pdf->addTextWrap($XPos+1,$YPos,210,$FontSize,$Spec);
-$Offset=mb_strlen($Spec) * 7.90;
+$LeftOvers = $pdf->addTextWrap($XPos+1,$YPos,240,$FontSize,$Spec);
+$Offset= array_sum($pdf->GetStringWidth(($Spec), '', '', 0, true)) + 4;
$pdf->setFont('','');
$LeftOvers = $pdf->addTextWrap($XPos+$Offset,$YPos,500-$Offset,$FontSize,'- ' . $SpecDesc);
while (mb_strlen($LeftOvers) > 1) {
|
|
From: <dai...@us...> - 2015-05-17 01:43:23
|
Revision: 7304
http://sourceforge.net/p/web-erp/reponame/7304
Author: daintree
Date: 2015-05-17 01:43:20 +0000 (Sun, 17 May 2015)
Log Message:
-----------
setup new SQL upgrade script
Added Paths:
-----------
trunk/sql/mysql/upgrade4.12.3-4.13.sql
Removed Paths:
-------------
trunk/sql/mysql/upgrade4.12.2-4.13.sql
Deleted: trunk/sql/mysql/upgrade4.12.2-4.13.sql
===================================================================
--- trunk/sql/mysql/upgrade4.12.2-4.13.sql 2015-05-17 01:42:19 UTC (rev 7303)
+++ trunk/sql/mysql/upgrade4.12.2-4.13.sql 2015-05-17 01:43:20 UTC (rev 7304)
@@ -1,12 +0,0 @@
-INSERT INTO `scripts` (`script`, `pagesecurity`, `description`) VALUES ('CustomerAccount.php', '1', 'Shows customer account/statement on screen rather than PDF');
-INSERT INTO `scripts` (`script`, `pagesecurity`, `description`) VALUES ('StockCategorySalesInquiry.php', '2', 'Sales inquiry by stock category showing top items');
-INSERT INTO `scripts` (`script`, `pagesecurity`, `description`) VALUES ('PcAnalysis.php', '15', 'Creates an Excel with details of PC expnese for 24 months');
-
--- Add field to store location's GL account code:
-ALTER TABLE `locations` ADD `glaccountcode` VARCHAR(20) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT 'GL account of the location';
--- Add field to allow or deny the invoicing of items in this location:
-ALTER TABLE `locations` ADD `allowinvoicing` TINYINT(1) NOT NULL DEFAULT '1' COMMENT 'Allow invoicing of items at this location';
----- QUESTION: Existing locations are (always) set to 1? ***********************
-
--- Update version number:
-UPDATE config SET confvalue='4.12.3' WHERE confname='VersionNumber';
Added: trunk/sql/mysql/upgrade4.12.3-4.13.sql
===================================================================
--- trunk/sql/mysql/upgrade4.12.3-4.13.sql (rev 0)
+++ trunk/sql/mysql/upgrade4.12.3-4.13.sql 2015-05-17 01:43:20 UTC (rev 7304)
@@ -0,0 +1,4 @@
+
+
+-- Update version number:
+UPDATE config SET confvalue='4.13' WHERE confname='VersionNumber';
|
|
From: <dai...@us...> - 2015-05-17 01:42:24
|
Revision: 7303
http://sourceforge.net/p/web-erp/reponame/7303
Author: daintree
Date: 2015-05-17 01:42:19 +0000 (Sun, 17 May 2015)
Log Message:
-----------
before 4.12.3 release
Modified Paths:
--------------
trunk/UpgradeDatabase.php
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.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/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
trunk/sql/mysql/country_sql/default.sql
trunk/sql/mysql/country_sql/demo.sql
trunk/sql/mysql/upgrade4.12.2-4.13.sql
Added Paths:
-----------
trunk/sql/mysql/upgrade4.12.2-4.12.3.sql
Modified: trunk/UpgradeDatabase.php
===================================================================
--- trunk/UpgradeDatabase.php 2015-05-16 23:43:12 UTC (rev 7302)
+++ trunk/UpgradeDatabase.php 2015-05-17 01:42:19 UTC (rev 7303)
@@ -190,6 +190,8 @@
$SQLScripts[] = './sql/mysql/upgrade4.12-4.12.1.sql';
case '4.12.1':
$SQLScripts[] = './sql/mysql/upgrade4.12.1-4.12.2.sql';
+ case '4.12.2':
+ $SQLScripts[] = './sql/mysql/upgrade4.12.2-4.12.3.sql';
break;
} //end switch
}
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-05-16 23:43:12 UTC (rev 7302)
+++ trunk/doc/Change.log 2015-05-17 01:42:19 UTC (rev 7303)
@@ -1,7 +1,9 @@
webERP Change Log
+17/5/15 Version 4.12.3
17/5/15 Phil: Made currencies delete check first for bank accounts set up using the currency - as reported by Ricard
10/05/15 RChacon: New features: (1) GL account code for an inventory location, so that you can have general ledger transactions of inventory transfers to or from this location; useful for pledged inventory and goods on consignment. (2) Allow Invoicing parameter to allow or deny the availability of a location to be delivered; useful when a location stores compromised good that can not be sold.
+09/05/15 Exson: Fixed no input filtering bug which cause input failure and location quantity become mess in WorkOrderReceive.php. But the transaction failure maybe still there.
08/05/15 RChacon: In DeliveryDetails.php, add $ViewTopic and $BookMark to ManualSalesOrders.html.
07/05/15 RChacon: In CustomerInquiry.php, hide submit button and 'More Info' columns when printing. Add thead tag to enable the table header to be printed at the top of each page.
07/05/15 RChacon: In SupplierInquiry.php, hide submit button and 'More Info' columns when printing. Add thead tag to enable the table header to be printed at the top of each page.
@@ -25,10 +27,6 @@
01/4/15 Exson: Fixed the bug that when delete one gl item from the payment details, the bank account related setting will disappeared in Payments.php. Reported by Steven.
01/4/15 Thumb: Add a Z_ImportCustbranch.php script to import customer branches.
30/3/15 Vitaly: Get all taxes for the tax group, even if calculationorder is left at default value 0.
-
-
-
-09/05/15 Exson: Fixed no input filtering bug which cause input failure and location quantity become mess in WorkOrderReceive.php. But the transaction failure maybe still there.
29/3/15 Phil: Allow dummy/service items to be propogated to CounterLogic POS installs through the api
27/3/15 Exson: Remove redundant code from PrintCustTrans.php.
27/3/15 Exson: Make credit not for freight only is printable in PrintCustTrans.php.
Modified: trunk/includes/ConnectDB.inc
===================================================================
--- trunk/includes/ConnectDB.inc 2015-05-16 23:43:12 UTC (rev 7302)
+++ trunk/includes/ConnectDB.inc 2015-05-17 01:42:19 UTC (rev 7303)
@@ -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.2'; //must update manually every time there is a DB change
+$Version='4.12.3'; //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-05-16 23:43:12 UTC (rev 7302)
+++ trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po 2015-05-17 01:42:19 UTC (rev 7303)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: webERP 4.12.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-05-10 11:26-0600\n"
+"POT-Creation-Date: 2015-05-17 13:40+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"
@@ -157,25 +157,25 @@
#: AccountGroups.php:213 AccountGroups.php:248 AccountSections.php:130
#: Areas.php:115 Areas.php:124 BankAccounts.php:165 CreditStatus.php:125
-#: Currencies.php:247 Currencies.php:255 Currencies.php:263
+#: 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:79 GLAccounts.php:95
-#: 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:154
-#: PaymentMethods.php:143 PaymentTerms.php:146 PaymentTerms.php:153
-#: PcExpenses.php:161 SalesCategories.php:128 SalesCategories.php:135
-#: 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:762 Stocks.php:771 Stocks.php:779
-#: Stocks.php:787 Stocks.php:795 Stocks.php:803 Stocks.php:811 Stocks.php:819
-#: SupplierTypes.php:126 Suppliers.php:646 Suppliers.php:655 Suppliers.php:663
-#: TaxCategories.php:132 TaxGroups.php:134 TaxGroups.php:142
-#: TaxProvinces.php:129 UnitsOfMeasure.php:135 WWW_Access.php:88
-#: WorkCentres.php:89 WorkCentres.php:95
+#: 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:79
+#: GLAccounts.php:95 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:154
+#: MRPDemandTypes.php:87 PaymentMethods.php:143 PaymentTerms.php:146
+#: PaymentTerms.php:153 PcExpenses.php:161 SalesCategories.php:128
+#: SalesCategories.php:135 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:762 Stocks.php:771
+#: Stocks.php:779 Stocks.php:787 Stocks.php:795 Stocks.php:803 Stocks.php:811
+#: Stocks.php:819 Suppliers.php:646 Suppliers.php:655 Suppliers.php:663
+#: SupplierTypes.php:126 TaxCategories.php:132 TaxGroups.php:134
+#: TaxGroups.php:142 TaxProvinces.php:129 UnitsOfMeasure.php:135
+#: WorkCentres.php:89 WorkCentres.php:95 WWW_Access.php:88
msgid "There are"
msgstr "يوجد"
@@ -232,46 +232,46 @@
#: BOMIndentedReverse.php:236 BOMInquiry.php:186 BOMListing.php:110
#: BOMs.php:239 BOMs.php:890 COGSGLPostings.php:19 CompanyPreferences.php:102
#: CounterReturns.php:1629 CounterSales.php:2097 CounterSales.php:2193
-#: CreditStatus.php:21 Credit_Invoice.php:276 CustEDISetup.php:17
+#: Credit_Invoice.php:276 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
+#: GLBudgets.php:32 GLJournalInquiry.php:11 GLJournal.php:250
#: HistoricalTestResults.php:42 InternalStockRequest.php:311
#: InventoryPlanning.php:459 InventoryPlanningPrefSupplier.php:386
-#: MRPReport.php:544 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
-#: PcAssignCashToTab.php:59 PcAssignCashToTab.php:133
-#: PcAssignCashToTab.php:149 PcAssignCashToTab.php:193 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
-#: RelatedItemsUpdate.php:24 SalesAnalReptCols.php:51 SalesAnalRepts.php:14
-#: SalesCategories.php:11 SalesGLPostings.php:19 SalesGraph.php:40
-#: SalesPeople.php:28 SalesTypes.php:20 SelectAsset.php:48
-#: SelectCompletedOrder.php:11 SelectContract.php:69 SelectCreditItems.php:220
-#: SelectCreditItems.php:291 SelectCustomer.php:266 SelectGLAccount.php:65
-#: SelectOrderItems.php:559 SelectOrderItems.php:1467
-#: SelectOrderItems.php:1567 SelectProduct.php:502 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 StockLocMovements.php:14 StockLocStatus.php:29
+#: MaintenanceTasks.php:14 MaintenanceUserSchedule.php:16 MRPReport.php:544
+#: NoSalesItems.php:91 PcAssignCashToTab.php:59 PcAssignCashToTab.php:133
+#: PcAssignCashToTab.php:149 PcAssignCashToTab.php:193 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 RelatedItemsUpdate.php:24
+#: SalesAnalReptCols.php:51 SalesAnalRepts.php:14 SalesCategories.php:11
+#: SalesGLPostings.php:19 SalesGraph.php:40 SalesPeople.php:28
+#: SalesTypes.php:20 SelectAsset.php:48 SelectCompletedOrder.php:11
+#: SelectContract.php:69 SelectCreditItems.php:220 SelectCreditItems.php:291
+#: SelectCustomer.php:266 SelectGLAccount.php:65 SelectOrderItems.php:559
+#: SelectOrderItems.php:1467 SelectOrderItems.php:1567 SelectProduct.php:502
+#: 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
+#: StockLocMovements.php:14 StockLocStatus.php:29
#: StockSerialItemResearch.php:30 SupplierPriceList.php:14
#: SupplierPriceList.php:224 SupplierPriceList.php:394
#: SupplierPriceList.php:398 SupplierPriceList.php:449
-#: SupplierPriceList.php:499 SupplierTenderCreate.php:556
+#: SupplierPriceList.php:499 Suppliers.php:304 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
-#: WWW_Users.php:34 WhereUsedInquiry.php:18 WorkCentres.php:111
-#: WorkCentres.php:163 WorkOrderCosting.php:22 WorkOrderEntry.php:11
-#: WorkOrderIssue.php:22 WorkOrderReceive.php:34 WorkOrderStatus.php:58
-#: Z_BottomUpCosts.php:57 ../webSHOP/includes/header.php:251
+#: SupplierTenders.php:388 SupplierTransInquiry.php:10 TestPlanResults.php:27
+#: TopItems.php:118 UnitsOfMeasure.php:10 WhereUsedInquiry.php:18
+#: WorkCentres.php:111 WorkCentres.php:163 WorkOrderCosting.php:22
+#: WorkOrderEntry.php:11 WorkOrderIssue.php:22 WorkOrderReceive.php:34
+#: WorkOrderStatus.php:58 WWW_Users.php:34 Z_BottomUpCosts.php:57
+#: ../webSHOP/includes/header.php:217
msgid "Search"
msgstr "إبحث"
@@ -298,22 +298,22 @@
#: CompanyPreferences.php:425 CompanyPreferences.php:427
#: CompanyPreferences.php:440 CompanyPreferences.php:442
#: CompanyPreferences.php:455 CompanyPreferences.php:457
-#: ContractCosting.php:202 Currencies.php:333 Currencies.php:511
-#: Currencies.php:513 CustomerBranches.php:452 Customers.php:659
+#: ContractCosting.php:202 Currencies.php:342 Currencies.php:520
+#: Currencies.php:522 CustomerBranches.php:452 Customers.php:659
#: Customers.php:1049 Customers.php:1055 Customers.php:1058
-#: DailyBankTransactions.php:156 DeliveryDetails.php:1159
-#: DeliveryDetails.php:1202 DeliveryDetails.php:1205 FormDesigner.php:101
+#: DailyBankTransactions.php:156 DeliveryDetails.php:1157
+#: DeliveryDetails.php:1198 DeliveryDetails.php:1201 FormDesigner.php:101
#: GLTransInquiry.php:74 Labels.php:601 Labels.php:603 Labels.php:628
#: Locations.php:446 Locations.php:668 Locations.php:670 Locations.php:683
-#: Locations.php:685 Locations.php:701 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:600
+#: Locations.php:685 Locations.php:701 MRPCalendar.php:224 MRP.php:554
+#: MRP.php:558 MRP.php:562 MRP.php:566 MRP.php:570 PaymentMethods.php:206
+#: PaymentMethods.php:207 PaymentMethods.php:208 PaymentMethods.php:209
+#: PaymentMethods.php:275 PaymentMethods.php:282 PaymentMethods.php:289
+#: PaymentMethods.php:296 PcAuthorizeExpenses.php:248 PDFChequeListing.php:65
+#: 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 PaymentMethods.php:206 PaymentMethods.php:207
-#: PaymentMethods.php:208 PaymentMethods.php:209 PaymentMethods.php:275
-#: PaymentMethods.php:282 PaymentMethods.php:289 PaymentMethods.php:296
-#: PcAuthorizeExpenses.php:248 ProductSpecs.php:188 ProductSpecs.php:409
+#: 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
@@ -352,32 +352,32 @@
#: TestPlanResults.php:532 TestPlanResults.php:747 TestPlanResults.php:864
#: TestPlanResults.php:924 TestPlanResults.php:928 WWW_Users.php:516
#: WWW_Users.php:518 WWW_Users.php:689 WWW_Users.php:691 WWW_Users.php:704
-#: WWW_Users.php:706 reportwriter/languages/en_US/reports.php:114
+#: WWW_Users.php:706
msgid "Yes"
msgstr "موافق"
#: AccountGroups.php:313 AccountGroups.php:450 AccountGroups.php:452
-#: BOMs.php:130 BOMs.php:801 BOMs.php:805 BankAccounts.php:218
-#: BankAccounts.php:412 BankAccounts.php:414 BankAccounts.php:418
-#: BankAccounts.php:426 CompanyPreferences.php:424 CompanyPreferences.php:428
+#: BankAccounts.php:218 BankAccounts.php:412 BankAccounts.php:414
+#: BankAccounts.php:418 BankAccounts.php:426 BOMs.php:130 BOMs.php:801
+#: BOMs.php:805 CompanyPreferences.php:424 CompanyPreferences.php:428
#: CompanyPreferences.php:439 CompanyPreferences.php:443
#: CompanyPreferences.php:454 CompanyPreferences.php:458
-#: ContractCosting.php:200 Currencies.php:335 Currencies.php:516
-#: Currencies.php:518 CustomerBranches.php:452 Customers.php:658
+#: 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:158 DeliveryDetails.php:1160
-#: DeliveryDetails.php:1203 DeliveryDetails.php:1206 FormDesigner.php:99
+#: DailyBankTransactions.php:158 DeliveryDetails.php:1158
+#: DeliveryDetails.php:1199 DeliveryDetails.php:1202 FormDesigner.php:99
#: GLTransInquiry.php:93 Labels.php:600 Labels.php:604 Labels.php:629
#: Locations.php:446 Locations.php:673 Locations.php:675 Locations.php:688
-#: Locations.php:690 Locations.php:702 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
+#: Locations.php:690 Locations.php:702 MRPCalendar.php:226 MRP.php:552
+#: MRP.php:556 MRP.php:560 MRP.php:564 MRP.php:568 NoSalesItems.php:191
+#: PaymentMethods.php:206 PaymentMethods.php:207 PaymentMethods.php:208
+#: PaymentMethods.php:209 PaymentMethods.php:276 PaymentMethods.php:283
+#: PaymentMethods.php:290 PaymentMethods.php:297 PcAuthorizeExpenses.php:246
+#: PDFChequeListing.php:64 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 PaymentMethods.php:206 PaymentMethods.php:207
-#: PaymentMethods.php:208 PaymentMethods.php:209 PaymentMethods.php:276
-#: PaymentMethods.php:283 PaymentMethods.php:290 PaymentMethods.php:297
-#: PcAuthorizeExpenses.php:246 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
@@ -417,40 +417,37 @@
#: TestPlanResults.php:925 TestPlanResults.php:927 WWW_Users.php:515
#: WWW_Users.php:519 WWW_Users.php:688 WWW_Users.php:692 WWW_Users.php:703
#: WWW_Users.php:707 includes/PDFLowGPPageHeader.inc:44
-#: reportwriter/languages/en_US/reports.php:82
msgid "No"
msgstr "ﻻ"
#: AccountGroups.php:322 AccountSections.php:191 AddCustomerContacts.php:148
#: AddCustomerNotes.php:137 AddCustomerTypeNotes.php:131 Areas.php:164
-#: BOMs.php:157 BankAccounts.php:243 COGSGLPostings.php:112
-#: COGSGLPostings.php:219 CreditStatus.php:175 Currencies.php:365
-#: Currencies.php:382 CustItem.php:166 CustomerBranches.php:456
-#: CustomerTypes.php:205 Customers.php:1131 Customers.php:1165
+#: BankAccounts.php:243 BOMs.php:157 COGSGLPostings.php:112
+#: COGSGLPostings.php:219 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 GLAccounts.php:317 GLTags.php:96 GeocodeSetup.php:173
+#: FreightCosts.php:253 GeocodeSetup.php:173 GLAccounts.php:317 GLTags.php:96
#: ImportBankTransAnalysis.php:223 InternalStockRequest.php:293 Labels.php:333
-#: Labels.php:358 Locations.php:439 MRPDemandTypes.php:120 MRPDemands.php:309
-#: MailingGroupMaintenance.php:178 MaintenanceTasks.php:118
-#: Manufacturers.php:217 PO_AuthorisationLevels.php:151 PaymentMethods.php:210
-#: PaymentTerms.php:205 PcAssignCashToTab.php:277
-#: PcClaimExpensesFromTab.php:276 PcExpenses.php:226 PcTabs.php:236
-#: PcTypeTabs.php:180 PriceMatrix.php:287 Prices.php:253
-#: Prices_Customer.php:286 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:615 SelectCustomer.php:634
-#: SelectCustomer.php:664 SelectCustomer.php:682 SelectCustomer.php:706
-#: SelectCustomer.php:723 SelectGLAccount.php:117 SelectGLAccount.php:132
-#: SelectQASamples.php:417 SellThroughSupport.php:298 Shippers.php:144
-#: StockCategories.php:296 SuppTransGLAnalysis.php:125
+#: Labels.php:358 Locations.php:439 MailingGroupMaintenance.php:178
+#: MaintenanceTasks.php:118 Manufacturers.php:217 MRPDemands.php:309
+#: MRPDemandTypes.php:120 PaymentMethods.php:210 PaymentTerms.php:205
+#: 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: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:615 SelectCustomer.php:634 SelectCustomer.php:664
+#: SelectCustomer.php:682 SelectCustomer.php:706 SelectCustomer.php:723
+#: 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
-#: TaxAuthorities.php:172 TaxCategories.php:184 TaxGroups.php:190
-#: TaxProvinces.php:179 UnitsOfMeasure.php:185 WWW_Access.php:132
-#: WWW_Users.php:350 WorkCentres.php:142 includes/InputSerialItems.php:110
-#: includes/OutputSerialItems.php:20
-#: reportwriter/languages/en_US/reports.php:143
+#: SuppTransGLAnalysis.php:125 TaxAuthorities.php:172 TaxCategories.php:184
+#: TaxGroups.php:190 TaxProvinces.php:179 UnitsOfMeasure.php:185
+#: WorkCentres.php:142 WWW_Access.php:132 WWW_Users.php:350
+#: includes/InputSerialItems.php:110 includes/OutputSerialItems.php:20
#, php-format
msgid "Edit"
msgstr "تحرير"
@@ -461,24 +458,24 @@
#: AccountGroups.php:323 AccountSections.php:195 AddCustomerContacts.php:149
#: AddCustomerNotes.php:138 AddCustomerTypeNotes.php:132 Areas.php:165
-#: BOMs.php:159 BankAccounts.php:244 COGSGLPostings.php:113
+#: BankAccounts.php:244 BOMs.php:159 COGSGLPostings.php:113
#: COGSGLPostings.php:220 ContractBOM.php:272 ContractOtherReqts.php:124
-#: CounterReturns.php:740 CounterSales.php:836 CreditStatus.php:176
-#: Credit_Invoice.php:409 Currencies.php:368 CustItem.php:167
-#: CustomerReceipt.php:989 CustomerTypes.php:206 Customers.php:1166
+#: CounterReturns.php:740 CounterSales.php:836 Credit_Invoice.php:409
+#: CreditStatus.php:176 Currencies.php:377 CustItem.php:167
+#: CustomerReceipt.php:989 Customers.php:1166 CustomerTypes.php:206
#: Departments.php:187 DiscountCategories.php:238 DiscountMatrix.php:183
#: EDIMessageFormat.php:151 FixedAssetCategories.php:191 FreightCosts.php:254
-#: GLAccounts.php:318 GLJournal.php:430 GLTags.php:97 GeocodeSetup.php:174
+#: GeocodeSetup.php:174 GLAccounts.php:318 GLJournal.php:430 GLTags.php:97
#: ImportBankTransAnalysis.php:224 InternalStockCategoriesByRole.php:184
#: InternalStockRequest.php:294 Labels.php:334 Labels.php:359 Labels.php:607
-#: Locations.php:440 MRPDemandTypes.php:121 MRPDemands.php:310
-#: MailingGroupMaintenance.php:179 MaintenanceTasks.php:119
-#: Manufacturers.php:218 PO_AuthorisationLevels.php:153 PO_Items.php:768
-#: PaymentMethods.php:211 PaymentTerms.php:206 Payments.php:1112
+#: Locations.php:440 MailingGroupMaintenance.php:179 MaintenanceTasks.php:119
+#: Manufacturers.php:218 MRPDemands.php:310 MRPDemandTypes.php:121
+#: PaymentMethods.php:211 Payments.php:1112 PaymentTerms.php:206
#: PcAssignCashToTab.php:281 PcClaimExpensesFromTab.php:277 PcExpenses.php:227
#: PcExpensesTypeTab.php:187 PcTabs.php:237 PcTypeTabs.php:181
-#: PriceMatrix.php:286 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:286
+#: 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
@@ -489,15 +486,14 @@
#: 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:90 SuppInvGRNs.php:147 SuppShiptChgs.php:90
-#: SuppTransGLAnalysis.php:126 SupplierContacts.php:166
+#: SuppFixedAssetChgs.php:90 SuppInvGRNs.php:147 SupplierContacts.php:166
#: SupplierTenderCreate.php:422 SupplierTenderCreate.php:452
-#: SupplierTypes.php:172 TaxAuthorities.php:173 TaxCategories.php:186
-#: TaxGroups.php:191 TaxProvinces.php:180 TestPlanResults.php:920
-#: UnitsOfMeasure.php:186 WOSerialNos.php:335 WWW_Access.php:133
-#: WWW_Users.php:351 WorkCentres.php:143 includes/InputSerialItemsKeyed.php:60
+#: SupplierTypes.php:172 SuppShiptChgs.php:90 SuppTransGLAnalysis.php:126
+#: TaxAuthorities.php:173 TaxCategories.php:186 TaxGroups.php:191
+#: TaxProvinces.php:180 TestPlanResults.php:920 UnitsOfMeasure.php:186
+#: WorkCentres.php:143 WOSerialNos.php:335 WWW_Access.php:133
+#: WWW_Users.php:351 includes/InputSerialItemsKeyed.php:60
#: includes/OutputSerialItems.php:99
-#: reportwriter/languages/en_US/reports.php:141
#, php-format
msgid "Delete"
msgstr "حذف"
@@ -562,21 +558,21 @@
#: AccountGroups.php:462 AccountSections.php:262 AddCustomerContacts.php:260
#: AddCustomerNotes.php:242 AddCustomerTypeNotes.php:221 Areas.php:229
-#: BOMs.php:818 BankAccounts.php:433 COGSGLPostings.php:368
-#: CreditStatus.php:259 Currencies.php:525 CustLoginSetup.php:273
+#: BankAccounts.php:433 BOMs.php:818 COGSGLPostings.php:368
+#: CreditStatus.php:259 Currencies.php:534 CustLoginSetup.php:273
#: Departments.php:258 DiscountMatrix.php:142 EDIMessageFormat.php:248
#: FixedAssetCategories.php:350 FixedAssetLocations.php:161
-#: FreightCosts.php:371 GLAccounts.php:265 GeocodeSetup.php:271 Labels.php:641
-#: Locations.php:714 MRPDemandTypes.php:188 MRPDemands.php:424
-#: Manufacturers.php:312 OffersReceived.php:57 OffersReceived.php:146
-#: PO_AuthorisationLevels.php:264 PaymentMethods.php:302 PaymentTerms.php:310
+#: FreightCosts.php:371 GeocodeSetup.php:271 GLAccounts.php:265 Labels.php:641
+#: Locations.php:714 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: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 TaxAuthorities.php:327
+#: SupplierContacts.php:284 SuppLoginSetup.php:291 TaxAuthorities.php:327
#: TaxCategories.php:244 TaxProvinces.php:234 TestPlanResults.php:967
-#: UnitsOfMeasure.php:241 WWW_Users.php:774 WorkCentres.php:283
+#: UnitsOfMeasure.php:241 WorkCentres.php:283 WWW_Users.php:774
msgid "Enter Information"
msgstr "أدخل المعلومات"
@@ -675,12 +671,12 @@
#: AddCustomerContacts.php:59 AddCustomerNotes.php:51
#: AddCustomerTypeNotes.php:48 Areas.php:72 CustomerTypes.php:68
#: DeliveryDetails.php:809 DeliveryDetails.php:826 Factors.php:105
-#: FixedAssetItems.php:250 MRPCalendar.php:176 PO_Items.php:380
-#: PcAssignCashToTab.php:91 PcClaimExpensesFromTab.php:82 PcExpenses.php:98
-#: PcTabs.php:104 PcTypeTabs.php:63 ProductSpecs.php:315 QATests.php:76
+#: 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:315 QATests.php:76
#: SalesAnalReptCols.php:129 SalesPeople.php:105 SalesTypes.php:66
-#: SelectQASamples.php:85 Stocks.php:589 SupplierTypes.php:68
-#: Suppliers.php:531
+#: SelectQASamples.php:85 Stocks.php:589 Suppliers.php:531
+#: SupplierTypes.php:68
msgid "has been updated"
msgstr ""
@@ -698,7 +694,7 @@
#: PrintWOItemSlip.php:195 PrintWOItemSlip.php:206 ProductSpecs.php:164
#: ProductSpecs.php:385 QATests.php:391 SalesPeople.php:208
#: SelectCustomer.php:610 StockDispatch.php:275 StockDispatch.php:286
-#: StockDispatch.php:297 SuppTransGLAnalysis.php:108 SupplierContacts.php:152
+#: StockDispatch.php:297 SupplierContacts.php:152 SuppTransGLAnalysis.php:108
#: Tax.php:411 TestPlanResults.php:508 UserLocations.php:176
#: includes/InputSerialItemsFile.php:92 includes/InputSerialItemsFile.php:144
msgid "Name"
@@ -715,7 +711,7 @@
msgstr ""
#: AddCustomerContacts.php:129 AddCustomerContacts.php:241
-#: CustomerAccount.php:345 CustomerBranches.php:415 CustomerBranches.php:858
+#: CustomerAccount.php:345 CustomerBranches.php:415 CustomerBranches.php:856
#: CustomerInquiry.php:324 CustomerInquiry.php:370 CustomerInquiry.php:409
#: CustomerInquiry.php:444 CustomerInquiry.php:490 Customers.php:1121
#: Customers.php:1129 EmailCustTrans.php:16 EmailCustTrans.php:65
@@ -730,18 +726,17 @@
#: includes/PDFPickingListHeader.inc:25 includes/PDFStatementPageHeader.inc:67
#: includes/PDFTransPageHeader.inc:85
#: includes/PDFTransPageHeaderPortrait.inc:114 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 ""
#: AddCustomerContacts.php:130 AddCustomerContacts.php:250 Customers.php:1122
-#: Customers.php:1130 PDFQuotation.php:252 PDFQuotationPortrait.php:249
-#: PcAssignCashToTab.php:242 PcAssignCashToTab.php:380
+#: Customers.php:1130 PcAssignCashToTab.php:242 PcAssignCashToTab.php:380
#: PcAuthorizeExpenses.php:97 PcClaimExpensesFromTab.php:238
-#: PcClaimExpensesFromTab.php:405 PcReportTab.php:333 SelectCustomer.php:614
-#: ShopParameters.php:198 SystemParameters.php:411 WOSerialNos.php:306
-#: WOSerialNos.php:312
+#: PcClaimExpensesFromTab.php:405 PcReportTab.php:333 PDFQuotation.php:252
+#: PDFQuotationPortrait.php:249 SelectCustomer.php:614 ShopParameters.php:198
+#: SystemParameters.php:411 WOSerialNos.php:306 WOSerialNos.php:312
msgid "Notes"
msgstr ""
@@ -759,7 +754,7 @@
msgstr ""
#: AddCustomerContacts.php:214 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 ""
@@ -768,8 +763,8 @@
#: SelectCustomer.php:426 SelectOrderItems.php:597
#: SupplierTenderCreate.php:395 includes/PDFStatementPageHeader.inc:63
#: includes/PDFTransPageHeader.inc:84
-#: includes/PDFTransPageHeaderPortrait.inc:110 ../webSHOP/Checkout.php:389
-#: ../webSHOP/Register.php:255 ../webSHOP/Register.php:723
+#: includes/PDFTransPageHeaderPortrait.inc:110 ../webSHOP/Checkout.php:537
+#: ../webSHOP/Register.php:260 ../webSHOP/Register.php:735
msgid "Phone"
msgstr ""
@@ -814,32 +809,30 @@
#: CustomerAllocations.php:378 CustomerInquiry.php:251
#: CustomerTransInquiry.php:100 GLAccountInquiry.php:173
#: GLAccountReport.php:343 GLTransInquiry.php:47 GoodsReceived.php:109
-#: MRPCalendar.php:219 PDFRemittanceAdvice.php:308 PDFWOPrint.php:448
-#: PaymentAllocations.php:66 PcAssignCashToTab.php:238
-#: PcAuthorizeExpenses.php:93 PrintCustTrans.php:822
-#: PrintCustTransPortrait.php:907 PrintWOItemSlip.php:186
-#: PrintWOItemSlip.php:197 PrintWOItemSlip.php:208 ReverseGRN.php:398
-#: SelectCustomer.php:660 SelectCustomer.php:702 ShipmentCosting.php:538
-#: ShipmentCosting.php:615 Shipments.php:489 StockDispatch.php:277
-#: StockDispatch.php:288 StockDispatch.php:299 StockLocMovements.php:92
-#: StockMovements.php:100 StockSerialItemResearch.php:82
-#: SupplierAllocations.php:456 SupplierAllocations.php:569
-#: SupplierAllocations.php:644 SupplierInquiry.php:210
-#: SupplierTransInquiry.php:105 Tax.php:408
+#: MRPCalendar.php:219 PaymentAllocations.php:66 PcAssignCashToTab.php:238
+#: PcAuthorizeExpenses.php:93 PDFRemittanceAdvice.php:308 PDFWOPrint.php:448
+#: PrintCustTrans.php:822 PrintCustTransPortrait.php:907
+#: PrintWOItemSlip.php:186 PrintWOItemSlip.php:197 PrintWOItemSlip.php:208
+#: ReverseGRN.php:398 SelectCustomer.php:660 SelectCustomer.php:702
+#: ShipmentCosting.php:538 ShipmentCosting.php:615 Shipments.php:489
+#: StockDispatch.php:277 StockDispatch.php:288 StockDispatch.php:299
+#: StockLocMovements.php:92 StockMovements.php:100
+#: StockSerialItemResearch.php:82 SupplierAllocations.php:456
+#: SupplierAllocations.php:569 SupplierAllocations.php:644
+#: SupplierInquiry.php:210 SupplierTransInquiry.php:105 Tax.php:408
#: includes/PDFQuotationPageHeader.inc:23
#: includes/PDFQuotationPortraitPageHeader.inc:80
#: includes/PDFStatementPageHeader.inc:169 includes/PDFTransPageHeader.inc:51
#: includes/PDFTransPageHeaderPortrait.inc:63
-#: reportwriter/languages/en_US/reports.php:64
msgid "Date"
msgstr ""
#: AddCustomerNotes.php:118 AddCustomerTypeNotes.php:112 PcReportTab.php:180
#: SelectCustomer.php:661 SelectCustomer.php:703 StockClone.php:926
-#: Stocks.php:1260 UpgradeDatabase.php:242 UpgradeDatabase.php:245
-#: UpgradeDatabase.php:248 UpgradeDatabase.php:251 UpgradeDatabase.php:254
-#: UpgradeDatabase.php:257 UpgradeDatabase.php:260 UpgradeDatabase.php:263
-#: UpgradeDatabase.php:266 Z_Upgrade_3.10-3.11.php:62
+#: Stocks.php:1260 UpgradeDatabase.php:244 UpgradeDatabase.php:247
+#: UpgradeDatabase.php:250 UpgradeDatabase.php:253 UpgradeDatabase.php:256
+#: UpgradeDatabase.php:259 UpgradeDatabase.php:262 UpgradeDatabase.php:265
+#: UpgradeDatabase.php:268 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
@@ -932,16 +925,15 @@
msgstr ""
#: AgedControlledInventory.php:12 InventoryQuantities.php:155
-#: InventoryValuation.php:217 Locations.php:12 MRP.php:542 MRPCalendar.php:21
-#: MRPCreateDemands.php:197 MRPDemandTypes.php:17 MRPDemands.php:27
-#: MRPPlannedPurchaseOrders.php:265 MRPPlannedWorkOrders.php:247
-#: MRPPlannedWorkOrders.php:321 PricesByCost.php:8 ReorderLevel.php:194
-#: ReorderLevelLocation.php:12 SelectProduct.php:89 StockDispatch.php:319
+#: InventoryValuation.php:217 Locations.php:12 MRPCalendar.php:21
+#: MRPCreateDemands.php:197 MRPDemands.php:27 MRPDemandTypes.php:17
+#: MRP.php:542 MRPPlannedPurchaseOrders.php:265 MRPPlannedWorkOrders.php:247
+#: MRPPlannedWorkOrders.php:321 PricesByCost.php:8 ReorderLevelLocation.php:12
+#: ReorderLevel.php:194 SelectProduct.php:89 StockDispatch.php:319
#: 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:15 includes/MainMenuLinksArray.php:26
-#: reportwriter/languages/en_US/reports.php:243
msgid "Inventory"
msgstr ""
@@ -951,7 +943,6 @@
#: AgedControlledInventory.php:42 MRPReschedules.php:126 MRPShortages.php:261
#: StockClone.php:53 Stocks.php:63
-#: reportwriter/languages/en_US/reports.php:103
msgid "Stock"
msgstr ""
@@ -969,18 +960,18 @@
#: InternalStockCategoriesByRole.php:168 InternalStockRequest.php:345
#: InternalStockRequest.php:559 InternalStockRequest.php:629
#: InventoryPlanning.php:419 InventoryQuantities.php:246
-#: InventoryValuation.php:197 Labels.php:290 MRPDemandTypes.php:113
-#: MRPDemands.php:92 MRPDemands.php:295 MRPPlannedWorkOrders.php:258
+#: InventoryValuation.php:197 Labels.php:290 MaintenanceTasks.php:95
+#: MaintenanceUserSchedule.php:50 MaterialsNotUsed.php:35 MRPDemands.php:92
+#: MRPDemands.php:295 MRPDemandTypes.php:113 MRPPlannedWorkOrders.php:258
#: MRPReport.php:564 MRPReport.php:778 MRPReschedules.php:192
-#: MRPShortages.php:350 MaintenanceTasks.php:95 MaintenanceUserSchedule.php:50
-#: MaterialsNotUsed.php:35 NoSalesItems.php:194 PDFCOA.php:64
-#: PDFOrderStatus.php:337 PDFOrdersInvoiced.php:335
+#: MRPShortages.php:350 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
#: PDFSalesBySalesperson.php:86 PDFWeeklyOrders.php:82 PO_Items.php:716
#: PO_Items.php:1189 PO_SelectOSPurchOrder.php:308 PO_SelectPurchOrder.php:214
-#: PaymentTerms.php:182 PcExpenses.php:190 PcExpenses.php:296
-#: PcExpensesTypeTab.php:171 PcReportTab.php:178 PcTypeTabs.php:164
-#: PricesByCost.php:153 RelatedItemsUpdate.php:154 ReorderLevel.php:298
-#: ReorderLevelLocation.php:73 ReverseGRN.php:397 SalesCategories.php:509
+#: 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:1477
@@ -990,24 +981,23 @@
#: StockCounts.php:142 StockDispatch.php:504 StockLocStatus.php:173
#: StockQuantityByDate.php:109 Stocks.php:1013 SuppCreditGRNs.php:92
#: SuppCreditGRNs.php:192 SuppFixedAssetChgs.php:78 SuppInvGRNs.php:120
-#: SuppInvGRNs.php:258 SuppPriceList.php:309 SupplierCredit.php:317
-#: SupplierCredit.php:385 SupplierInvoice.php:666 SupplierInvoice.php:746
-#: SupplierPriceList.php:39 SupplierPriceList.php:271
-#: SupplierPriceList.php:533 SupplierTenderCreate.php:434
-#: SupplierTenderCreate.php:695 SupplierTenderCreate.php:853
-#: SupplierTenders.php:326 SupplierTenders.php:421 SupplierTenders.php:687
+#: SuppInvGRNs.php:258 SupplierCredit.php:317 SupplierCredit.php:385
+#: SupplierInvoice.php:666 SupplierInvoice.php:746 SupplierPriceList.php:39
+#: SupplierPriceList.php:271 SupplierPriceList.php:533
+#: SupplierTenderCreate.php:434 SupplierTenderCreate.php:695
+#: SupplierTenderCreate.php:853 SupplierTenders.php:326
+#: SupplierTenders.php:421 SupplierTenders.php:687 SuppPriceList.php:309
#: TestPlanResults.php:177 TestPlanResults.php:280 TopItems.php:170
#: WorkCentres.php:128 WorkOrderCosting.php:98 WorkOrderCosting.php:130
#: WorkOrderEntry.php:735 WorkOrderIssue.php:761 Z_ItemsWithoutPicture.php:33
-#: api/api_xml-rpc.php:3489 includes/PDFGrnHeader.inc:29
-#: includes/PDFInventoryPlanPageHeader.inc:51
+#: includes/DefineLabelClass.php:12 includes/DefineLabelClass.php:45
+#: includes/PDFGrnHeader.inc:29 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:267
-#: includes/DefineLabelClass.php:12 includes/DefineLabelClass.php:45
-#: ../webSHOP/includes/PlaceOrder.php:236
+#: includes/PDFTransPageHeaderPortrait.inc:267 api/api_xml-rpc.php:3489
+#: ../webSHOP/includes/PlaceOrder.php:250
msgid "Description"
msgstr ""
@@ -1047,18 +1037,16 @@
#: SalesByTypePeriodInquiry.php:465 SalesByTypePeriodInquiry.php:500
#: SalesByTypePeriodInquiry.php:561 SelectCreditItems.php:692
#: SelectCreditItems.php:696 SelectOrderItems.php:1317
-#: SuppContractChgs.php:107 SuppFixedAssetChgs.php:97 SuppShiptChgs.php:97
-#: SuppTransGLAnalysis.php:139 SupplierAllocations.php:458
-#: SupplierAllocations.php:570 SupplierAllocations.php:645
-#: SupplierCredit.php:407 SupplierInquiry.php:215 Tax.php:250
-#: Z_CheckDebtorsControl.php:149 api/api_debtortransactions.php:1271
+#: SuppContractChgs.php:107 SuppFixedAssetChgs.php:97
+#: SupplierAllocations.php:458 SupplierAllocations.php:570
+#: SupplierAllocations.php:645 SupplierCredit.php:407 SupplierInquiry.php:215
+#: SuppShiptChgs.php:97 SuppTransGLAnalysis.php:139 Tax.php:250
+#: Z_CheckDebtorsControl.php:149 includes/PDFQuotationPageHeader.inc:109
+#: includes/PDFQuotationPortraitPageHeader.inc:100
+#: includes/PO_PDFOrderPageHeader.inc:81 api/api_debtortransactions.php:1271
#: api/api_debtortransactions.php:1284 api/api_debtortransactions.php:1581
-#: includes/PDFQuotationPageHeader.inc:109
-#: 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
+#: ../webSHOP/includes/DisplayShoppingCart.php:8
+#: ../webSHOP/includes/PlaceOrder.php:299
#, php-format
msgid "Total"
msgstr ""
@@ -1086,21 +1074,21 @@
#: InventoryPlanningPrefSupplier.php:183 InventoryPlanningPrefSupplier.php:241
#: InventoryPlanningPrefSupplier.php:268 InventoryPlanningPrefSupplier.php:301
#: InventoryQuantities.php:84 InventoryValuation.php:64
+#: MailInventoryValuation.php:22 MailInventoryValuation.php:120
+#: MailSalesReport_csv.php:30 MailSalesReport.php:23
#: MRPPlannedPurchaseOrders.php:114 MRPPlannedWorkOrders.php:106
#: MRPReport.php:147 MRPReport.php:536 MRPReschedules.php:45
#: MRPReschedules.php:57 MRPShortages.php:155 MRPShortages.php:167
-#: MailInventoryValuation.php:22 MailInventoryValuation.php:120
-#: MailSalesReport.php:23 MailSalesReport_csv.php:30 OutstandingGRNs.php:46
-#: OutstandingGRNs.php:59 PDFCustomerList.php:20 PDFCustomerList.php:232
-#: PDFCustomerList.php:244 PDFLowGP.php:20 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 SelectProduct.php:45
-#: StockCheck.php:60 StockCheck.php:132 SuppPriceList.php:138
-#: SupplierTenderCreate.php:671 SupplierTenders.php:397
+#: OutstandingGRNs.php:46 OutstandingGRNs.php:59 PDFCustomerList.php:20
+#: PDFCustomerList.php:232 PDFCustomerList.php:244 PDFLowGP.php:20
+#: 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
+#: SelectProduct.php:45 StockCheck.php:60 StockCheck.php:132
+#: SupplierTenderCreate.php:671 SupplierTenders.php:397 SuppPriceList.php:138
#: includes/PDFPaymentRun_PymtFooter.php:152
msgid "Problem Report"
msgstr ""
@@ -1117,23 +1105,23 @@
#: BOMIndentedReverse.php:144 BOMIndentedReverse.php:222 BOMListing.php:45
#: Credit_Invoice.php:201 Dashboard.php:146 Dashboard.php:257
#: Dashboard.php:438 DebtorsAtPeriodEnd.php:60 DebtorsAtPeriodEnd.php:72
-#: FTP_RadioBeacon.php:187 GLBalanceSheet.php:116 GLBalanceSheet.php:154
-#: GLBalanceSheet.php:333 GLProfit_Loss.php:190 GLProfit_Loss.php:202
-#: GLTagProfit_Loss.php:198 GLTagProfit_Loss.php:211 GLTrialBalance.php:168
-#: GLTrialBalance.php:180 GetStockImage.php:150 InventoryPlanning.php:102
+#: FTP_RadioBeacon.php:187 GetStockImage.php:150 GLBalanceSheet.php:116
+#: GLBalanceSheet.php:154 GLBalanceSheet.php:333 GLProfit_Loss.php:190
+#: GLProfit_Loss.php:202 GLTagProfit_Loss.php:198 GLTagProfit_Loss.php:211
+#: GLTrialBalance.php:168 GLTrialBalance.php:180 InventoryPlanning.php:102
#: InventoryPlanning.php:179 InventoryPlanning.php:216
#: InventoryPlanning.php:265 InventoryPlanning.php:340
#: InventoryPlanningPrefSupplier.php:186 InventoryPlanningPrefSupplier.php:244
#: InventoryPlanningPrefSupplier.php:271 InventoryPlanningPrefSupplier.php:304
#: InventoryPlanningPrefSupplier.php:372 InventoryQuantities.php:87
#: InventoryQuantities.php:98 InventoryValuation.php:67
-#: InventoryValuation.php:92 MRPPlannedPurchaseOrders.php:117
+#: InventoryValuation.php:92 MailInventoryValuation.php:123
+#: MailInventoryValuation.php:219 MailInventoryValuation.php:243
+#: MailInventoryValuation.php:251 MRPPlannedPurchaseOrders.php:117
#: MRPPlannedPurchaseOrders.php:128 MRPPlannedWorkOrders.php:109
#: MRPPlannedWorkOrders.php:120 MRPPlannedWorkOrders.php:311 MRPReport.php:39
#: MRPReport.php:50 MRPReport.php:150 MRPReschedules.php:48
#: MRPReschedules.php:60 MRPShortages.php:158 MRPShortages.php:170
-#: MailInventoryValuation.php:123 MailInventoryValuation.php:219
-#: MailInventoryValuation.php:243 MailInventoryValuation.php:251
#: OutstandingGRNs.php:49 OutstandingGRNs.php:62 PDFCustomerList.php:235
#: PDFCustomerList.php:247 PDFFGLabel.php:217 PDFGLJournal.php:100
#: PDFGrn.php:176 PDFLowGP.php:59 PDFLowGP.php:71 PDFPriceList.php:147
@@ -1142,31 +1130,31 @@
#: PDFSalesBySalesperson.php:160 PDFSalesBySalesperson.php:168
#: PDFSellThroughSupportClaim.php:74 PDFSellThroughSupportClaim.php:86
#: PDFStockCheckComparison.php:37 PDFStockCheckComparison.php:63
-#: PDFStockCheckComparison.php:271 PDFWOPrint.php:109 PDFWeeklyOrders.php:209
-#: PDFWeeklyOrders.php:217 PO_PDFPurchOrder.php:31 PO_PDFPurchOrder.php:156
-#: PrintCustOrder.php:238 PrintCustOrder_generic.php:256
-#: PrintWOItemSlip.php:122 PurchaseByPrefSupplier.php:402
-#: PurchaseByPrefSupplier.php:450 PurchaseByPrefSupplier.php:474
-#: PurchaseByPrefSupplier.php:503 PurchaseByPrefSupplier.php:534
-#: ReorderLevel.php:63 ReorderLevel.php:182 SalesAnalysis_UserDefined.php:28
-#: SelectCreditItems.php:32 StockCheck.php:42 StockCheck.php:63
-#: StockCheck.php:93 StockCheck.php:135 StockCheck.php:146 StockCheck.php:188
-#: StockDispatch.php:128 StockDispatch.php:141 SuppPaymentRun.php:112
-#: SuppPaymentRun.php:122 SuppPaymentRun.php:186 SuppPaymentRun.php:217
-#: SuppPriceList.php:142 SupplierBalsAtPeriodEnd.php:54
-#: SupplierBalsAtPeriodEnd.php:65 Tax.php:57 Tax.php:171 Tax.php:310
-#: Z_DataExport.php:72 Z_DataExport.php:168 Z_DataExport.php:259
+#: 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
+#: PurchaseByPrefSupplier.php:474 PurchaseByPrefSupplier.php:503
+#: PurchaseByPrefSupplier.php:534 ReorderLevel.php:63 ReorderLevel.php:182
+#: SalesAnalysis_UserDefined.php:28 SelectCreditItems.php:32 StockCheck.php:42
+#: StockCheck.php:63 StockCheck.php:93 StockCheck.php:135 StockCheck.php:146
+#: StockCheck.php:188 StockDispatch.php:128 StockDispatch.php:141
+#: SupplierBalsAtPeriodEnd.php:54 SupplierBalsAtPeriodEnd.php:65
+#: SuppPaymentRun.php:112 SuppPaymentRun.php:122 SuppPaymentRun.php:186
+#: SuppPaymentRun.php:217 SuppPriceList.php:142 Tax.php:57 Tax.php:171
+#: Tax.php:310 Z_DataExport.php:72 Z_DataExport.php:168 Z_DataExport.php:259
#: Z_DataExport.php:308 Z_DataExport.php:347 Z_DataExport.php:383
#: Z_DataExport.php:419 Z_DataExport.php:471 Z_poRebuildDefault.php:41
-#: includes/ConstructSQLForUserDefinedSalesReport.inc:180
-#: includes/ConstructSQLForUserDefinedSalesReport.inc:188
-#: includes/ConstructSQLForUserDefinedSalesReport.inc:343
#: includes/PDFPaymentRun_PymtFooter.php:59
#: includes/PDFPaymentRun_PymtFooter.php:89
#: includes/PDFPaymentRun_PymtFooter.php:119
#: includes/PDFPaymentRun_PymtFooter.php:156
#: includes/PDFPaymentRun_PymtFooter.php:187
#: includes/PDFPaymentRun_PymtFooter.php:218
+#: includes/ConstructSQLForUserDefinedSalesReport.inc:180
+#: includes/ConstructSQLForUserDefinedSalesReport.inc:188
+#: includes/ConstructSQLForUserDefinedSalesReport.inc:343
msgid "Back to the menu"
msgstr ""
@@ -1179,7 +1167,7 @@
#: PO_Items.php:451 PO_Items.php:580 PO_Items.php:605
#: PurchaseByPrefSupplier.php:29 PurchaseByPrefSupplier.php:54
#: SalesAnalReptCols.php:365 SpecialOrder.php:448
-#: StockLocTransferReceive.php:485 StockQuantityByDate.php:124
+#: StockLocTransferReceive.php:481 StockQuantityByDate.php:124
#: includes/SelectOrderItems_IntoCart.inc:55
msgid "could not be retrieved because"
msgstr ""
@@ -1192,34 +1180,34 @@
#: CustItem.php:86 CustItem.php:197 CustomerReceipt.php:574
#: CustomerReceipt.php:726 CustomerReceipt.php:754 CustomerTransInquiry.php:91
#: Dashboard.php:259 Dashboard.php:440 DeliveryDetails.php:412
-#: GLProfit_Loss.php:611 GLTagProfit_Loss.php:515 PDFRemittanceAdvice.php:85
-#: Payments.php:361 PurchData.php:114 PurchData.php:132 PurchData.php:360
-#: RecurringSalesOrders.php:267 ReverseGRN.php:192 ReverseGRN.php:206
-#: ReverseGRN.php:385 SMTPServer.php:66 SelectCreditItems.php:1447
+#: GLProfit_Loss.php:611 GLTagProfit_Loss.php:515 Payments.php:361
+#: PDFRemittanceAdvice.php:85 PurchData.php:114 PurchData.php:132
+#: PurchData.php:360 RecurringSalesOrders.php:267 ReverseGRN.php:192
+#: ReverseGRN.php:206 ReverseGRN.php:385 SelectCreditItems.php:1447
#: SelectSalesOrder.php:209 SelectSalesOrder.php:375 SellThroughSupport.php:81
-#: SellThroughSupport.php:97 StockCheck.php:217 StockClone.php:430
-#: StockClone.php:504 StockCostUpdate.php:78 StockCostUpdate.php:88
-#: StockLocStatus.php:165 StockLocTransferReceive.php:217
-#: StockLocTransferReceive.php:372 StockMovements.php:93
-#: StockQuantityByDate.php:98 StockReorderLevel.php:45 StockStatus.php:285
-#: StockTransfers.php:202 StockTransfers.php:233 StockTransfers.php:390
-#: StockUsage.php:142 StockUsageGraph.php:55 SuppPaymentRun.php:114
-#: SuppPaymentRun.php:188 SuppPaymentRun.php:219 SupplierInquiry.php:79
-#: SupplierInquiry.php:101 SupplierInquiry.php:139 SupplierInquiry.php:195
-#: SupplierPriceList.php:382 SupplierTransInquiry.php:97 WOSerialNos.php:49
-#: WorkOrderCosting.php:427 WorkOrderReceive.php:305
-#: Z_ChangeBranchCode.php:112 Z_ChangeCustomerCode.php:97
+#: SellThroughSupport.php:97 SMTPServer.php:66 StockCheck.php:217
+#: StockClone.php:430 StockClone.php:504 StockCostUpdate.php:78
+#: StockCostUpdate.php:88 StockLocStatus.php:165
+#: StockLocTransferReceive.php:216 StockLocTransferReceive.php:369
+#: StockMovements.php:93 StockQuantityByDate.php:98 StockReorderLevel.php:45
+#: StockStatus.php:285 StockTransfers.php:202 StockTransfers.php:232
+#: StockTransfers.php:387 StockUsageGraph.php:55 StockUsage.php:142
+#: SupplierInquiry.php:79 SupplierInquiry.php:101 SupplierInquiry.php:139
+#: SupplierInquiry.php:195 SupplierPriceList.php:382
+#: SupplierTransInquiry.php:97 SuppPaymentRun.php:114 SuppPaymentRun.php:188
+#: SuppPaymentRun.php:219 WorkOrderCosting.php:427 WorkOrderReceive.php:305
+#: WOSerialNos.php:49 Z_ChangeBranchCode.php:112 Z_ChangeCustomerCode.php:97
#: Z_ChangeSupplierCode.php:88 Z_DeleteCreditNote.php:63
#: Z_DeleteCreditNote.php:73 Z_DeleteCreditNote.php:82 Z_DeleteInvoice.php:88
#: Z_DeleteInvoice.php:98 Z_DeleteInvoice.php:110 Z_UpdateItemCosts.php:90
-#: includes/ConnectDB_mysql.inc:66 includes/ConnectDB_mysqli.inc:74
#: includes/PDFPaymentRun_PymtFooter.php:61
#: includes/PDFPaymentRun_PymtFooter.php:91
#: includes/PDFPaymentRun_PymtFooter.php:121
#: includes/PDFPaymentRun_PymtFooter.php:158
-#: includes/PDFPaymentRun_PymtFooter.php:189
+#: includes/PDFPaymentRun_PymtFooter.php:189 includes/ConnectDB_mysqli.inc:74
+#: includes/ConnectDB_mysql.inc:66
#: ../webSHOP/includes/DatabaseFunctions.php:60
-#: ../webSHOP/includes/Functions.php:438 ../webSHOP/includes/PlaceOrder.php:70
+#: ../webSHOP/includes/Functions.php:448 ../webSHOP/includes/PlaceOrder.php:68
msgid "The SQL that failed was"
msgstr ""
@@ -1298,7 +1286,7 @@
#: PDFPriceList.php:351 PDFRemittanceAdvice.php:175
#: PDFStockCheckComparison.php:373 PrintCustTrans.php:564
#: PrintCustTransPortrait.php:614 ReorderLevel.php:259 StockDispatch.php:447
-#: SuppPriceList.php:263 SupplierBalsAtPeriodEnd.php:159 Tax.php:385
+#: SupplierBalsAtPeriodEnd.php:159 SuppPriceList.php:263 Tax.php:385
msgid "Print PDF"
msgstr ""
@@ -1335,7 +1323,7 @@
msgstr ""
#: AgedSuppliers.php:287 OutstandingGRNs.php:270 PDFRemittanceAdvice.php:153
-#: SuppPaymentRun.php:265 SupplierBalsAtPeriodEnd.php:131
+#: SupplierBalsAtPeriodEnd.php:131 SuppPaymentRun.php:265
#: Z_ClearPOBackOrders.php:20
msgid "From Supplier Code"
msgstr ""
@@ -1345,7 +1333,7 @@
msgstr ""
#: AgedSuppliers.php:291 OutstandingGRNs.php:274 PDFRemittanceAdvice.php:157
-#: SuppPaymentRun.php:269 SupplierBalsAtPeriodEnd.php:135
+#: SupplierBalsAtPeriodEnd.php:135 SuppPaymentRun.php:269
#: Z_ClearPOBackOrders.php:23
msgid "To Supplier Code"
msgstr ""
@@ -1432,12 +1420,12 @@
#: Areas.php:131 CustomerTypes.php:167 Factors.php:140
#: FixedAssetCategories.php:142 GLAccounts.php:196
-#: InternalStockCategoriesByRole.php:102 Locations.php:380 MRPDemands.php:250
-#: Manufacturers.php:163 PcAssignCashToTab.php:138
+#: InternalStockCategoriesByRole.php:102 Locations.php:380
+#: Manufacturers.php:163 MRPDemands.php:250 PcAssignCashToTab.php:138
#: PcClaimExpensesFromTab.php:130 PcExpenses.php:169 PcExpensesTypeTab.php:101
#: PcTabs.php:168 PcTypeTabs.php:143 SalesAnalReptCols.php:215
#: SalesCategories.php:139 SalesTypes.php:156 StockCategories.php:233
-#: SupplierTypes.php:132 Suppliers.php:672 Z_DeleteInvoice.php:178
+#: Suppliers.php:672 SupplierTypes.php:132 Z_DeleteInvoice.php:178
#: includes/DefineOfferClass.php:134
msgid "has been deleted"
msgstr ""
@@ -1498,7 +1486,7 @@
#: MRPReport.php:552 MRPReport.php:554 MRPReschedules.php:145
#: NoSalesItems.php:22 NoSalesItems.php:50 NoSalesItems.php:70
#: NoSalesItems.php:72 PDFPeriodStockTransListing.php:58 PDFPriceList.php:225
-#: PDFPriceList.php:324 POReport.php:1600 PO_Items.php:1126
+#: PDFPriceList.php:324 PO_Items.php:1126 POReport.php:1600
#: PO_SelectOSPurchOrder.php:185 PO_SelectOSPurchOrder.php:195
#: PO_SelectOSPurchOrder.php:208 PO_SelectOSPurchOrder.php:276
#: ReorderLevel.php:212 ReorderLevel.php:214 ReorderLevel.php:244
@@ -1520,7 +1508,6 @@
#: SystemParameters.php:1143 TopItems.php:32 TopItems.php:49 TopItems.php:71
#: TopItems.php:73 WorkOrderEntry.php:677 WorkOrderEntry.php:680
#: WorkOrderIssue.php:716 WorkOrderIssue.php:719
-#: reportwriter/languages/en_US/reports.php:54
msgid "All"
msgstr ""
@@ -1550,12 +1537,12 @@
msgstr ""
#: AuditTrail.php:177 BankReconciliation.php:213 BankReconciliation.php:290
-#: CustWhereAlloc.php:21 CustWhereAlloc.php:111 CustomerAccount.php:246
-#: CustomerAllocations.php:376 CustomerInquiry.php:249
+#: CustomerAccount.php:246 CustomerAllocations.php:376 CustomerInquiry.php:249
#: CustomerPurchases.php:82 CustomerTransInquiry.php:21
-#: CustomerTransInquiry.php:98 DailyBankTransactions.php:137
-#: GLAccountInquiry.php:171 GLAccountReport.php:341 GLJournal.php:266
-#: MRPReschedules.php:194 ProductSpecs.php:388 QATests.php:257 QATests.php:395
+#: CustomerTransInquiry.php:98 CustWhereAlloc.php:21 CustWhereAlloc.php:111
+#: DailyBankTransactions.php:137 GLAccountInquiry.php:171
+#: GLAccountReport.php:341 GLJournal.php:266 MRPReschedules.php:194
+#: ProductSpecs.php:388 QATests.php:257 QATests.php:395
#: SalesByTypePeriodInquiry.php:356 SelectCustomer.php:425
#: ShipmentCosting.php:536 ShipmentCosting.php:613 StockLocMovements.php:90
#: StockMovements.php:98 SupplierAllocations.php:454 SupplierInquiry.php:211
@@ -1563,7 +1550,6 @@
#: Z_CheckAllocationsFrom.php:32 Z_CheckAllocationsFrom.php:57
#: Z_CheckAllocs.php:62 Z_CheckGLTransBalance.php:11
#: includes/InputSerialItemsFile.php:94 includes/InputSerialItemsFile.php:152
-#: reportwriter/languages/en_US/reports.php:111
msgid "Type"
msgstr ""
@@ -1572,7 +1558,7 @@
msgstr ""
#: AuditTrail.php:179 api/api_xml-rpc.php:311 api/api_xml-rpc.php:777
-#: api/api_xml-rpc.php:2187 reportwriter/languages/en_US/reports.php:72
+#: api/api_xml-rpc.php:2187
msgid "Field Name"
msgstr ""
@@ -1601,36 +1587,34 @@
#: BOMs.php:913 ContractBOM.php:353 CounterReturns.php:1691
#: CounterSales.php:2101 CounterSales.php:2255 CustItem.php:297
#: CustomerBranches.php:408 CustomerReceipt.php:1200 GLCodesInquiry.php:26
-#: InternalStockRequest.php:558 InternalStockRequest.php:628 MRPDemands.php:91
-#: MRPPlannedWorkOrders.php:257 MRPReport.php:777 MaterialsNotUsed.php:34
-#: NoSalesItems.php:193 PDFOrderStatus.php:336 PDFOrdersInvoiced.php:334
-#: PO_Header.php:561 PO_Items.php:1188 PO_SelectOSPurchOrder.php:307
-#: PO_SelectPurchOrder.php:213 PricesByCost.php:152 PurchData.php:469
-#: RelatedItemsUpdate.php:153 ReorderLevelLocation.php:72
-#: RevisionTranslations.php:59 SalesPeople.php:207
+#: InternalStockRequest.php:558 InternalStockRequest.php:628
+#: MaterialsNotUsed.php:34 MRPDemands.php:91 MRPPlannedWorkOrders.php:257
+#: MRPReport.php:777 NoSalesItems.php:193 PDFOrdersInvoiced.php:334
+#: PDFOrderStatus.php:336 PO_Header.php:561 PO_Items.php:1188
+#: PO_SelectOSPurchOrder.php:307 PO_SelectPurchOrder.php:213
+#: PricesByCost.php:152 PurchData.php:469 RelatedItemsUpdate.php:153
+#: ReorderLevelLocation.php:72 RevisionTranslations.php:59 SalesPeople.php:207
#: SelectCompletedOrder.php:504 SelectCreditItems.php:1020
#: SelectCustomer.php:421 ...
[truncated message content] |
|
From: <dai...@us...> - 2015-05-16 23:43:15
|
Revision: 7302
http://sourceforge.net/p/web-erp/reponame/7302
Author: daintree
Date: 2015-05-16 23:43:12 +0000 (Sat, 16 May 2015)
Log Message:
-----------
Tim: consistent checking of branch codes with main branch entry script
Modified Paths:
--------------
trunk/Z_ImportDebtors.php
Modified: trunk/Z_ImportDebtors.php
===================================================================
--- trunk/Z_ImportDebtors.php 2015-05-16 23:38:43 UTC (rev 7301)
+++ trunk/Z_ImportDebtors.php 2015-05-16 23:43:12 UTC (rev 7302)
@@ -18,7 +18,7 @@
if(!isset($_POST['UpdateIfExists'])){
$_POST['UpdateIfExists']=0;
}else{
- $_POST['UpdateIfExists']=1;
+ $_POST['UpdateIfExists']=1;
}
}
}else{
@@ -174,14 +174,14 @@
$_POST['TaxRef']=$filerow[28];
$_POST['CustomerPOLine']=$filerow[29];
$_POST['typeid']=$filerow[30];
-
+
if ($_POST['AutoDebtorNo']== 1) {
$_POST['DebtorNo'] = GetNextTransNo(500, $db);
}else{
$_POST['DebtorNo'] = mb_strtoupper($_POST['DebtorNo']);
}
- //$_POST['DebtorNo']=$_POST['DebtorNo'];
+ //$_POST['DebtorNo']=$_POST['DebtorNo'];
$_POST['BranchCode']=$_POST['DebtorNo'];
$_POST['BrName']=$_POST['CustName'];
$_POST['BrAddress1']=$_POST['Address1'];
@@ -212,7 +212,7 @@
$_POST['BrPostAddr5']=$filerow[50];
$_POST['CustBranchCode']=$filerow[51];
$_POST['SpecialInstructions']=$filerow[52];
-
+
$i=0;
if ($_POST['AutoDebtorNo']==0 AND mb_strlen($_POST['DebtorNo']) ==0) {
$InputError = 1;
@@ -318,7 +318,7 @@
if ($DebtorExists AND $_POST['UpdateIfExists']!=1) {
$UpdatedNum++;
}else{
-
+
$SQL_ClientSince = FormatDateForSQL($_POST['ClientSince']);
if ($DebtorExists) {//update
@@ -327,7 +327,7 @@
FROM debtortrans
where debtorno = '" . $_POST['DebtorNo'] . "' LIMIT 1";
$result = DB_query($sql);
-
+
$curr=false;
if (DB_num_rows($result) == 0) {
$curr=true;
@@ -427,13 +427,13 @@
}
}else{
-
+
break;
}
-
+
$i=0;
- if (ContainsIllegalCharacters($_POST['BranchCode']) OR mb_strstr($_POST['BranchCode'],' ') OR mb_strstr($_POST['BranchCode'],'-')) {
+ if (ContainsIllegalCharacters($_POST['BranchCode']) OR mb_strstr($_POST['BranchCode'],' ')) {
$InputError = 1;
prnMsg(_('The Branch code cannot contain any of the following characters')." - & \' < >",'error');
$Errors[$i] = 'BranchCode';
@@ -471,7 +471,7 @@
}
if ($InputError !=1){
- if (DB_error_no() ==0) {
+ if (DB_error_no() ==0) {
$sql = "SELECT 1
FROM custbranch
@@ -482,7 +482,7 @@
if ($BranchExists AND $_POST['UpdateIfExists']!=1) {
//do nothing
}else{
-
+
if (!isset($_POST['EstDeliveryDays'])) {
$_POST['EstDeliveryDays']=1;
}
@@ -587,7 +587,7 @@
'" . $_POST['CustBranchCode'] ."',
'" . $_POST['DeliverBlind'] . "')";
}
-
+
//run the SQL from either of the above possibilites
$ErrMsg = _('The branch record could not be inserted or updated because');
@@ -635,7 +635,7 @@
echo '<br /><br /><br />"'. implode('","',$FieldHeadings). '"<br /><br /><br />';
} else { //show file upload form
-
+
prnMsg(_('Please ensure that your csv file is encoded in UTF-8, otherwise the input data will not store correctly in database'),'warn');
echo '
@@ -651,7 +651,7 @@
_('Upload file') . ': <input name="userfile" type="file" />
<input type="submit" value="' . _('Send File') . '" />';
echo '<br/>',_('Create Debtor Codes Automatically'),':<input type="checkbox" name="AutoDebtorNo" ';
- if($_POST['AutoDebtorNo']==1)echo 'checked="checked"';
+ if($_POST['AutoDebtorNo']==1)echo 'checked="checked"';
echo '>';
echo '<br/>',_('Update if DebtorNo exists'),':<input type="checkbox" name="UpdateIfExists">';
echo'</div>
|
|
From: <dai...@us...> - 2015-05-16 23:38:46
|
Revision: 7301
http://sourceforge.net/p/web-erp/reponame/7301
Author: daintree
Date: 2015-05-16 23:38:43 +0000 (Sat, 16 May 2015)
Log Message:
-----------
added check bank accounts before delete currency;
Modified Paths:
--------------
trunk/Currencies.php
trunk/doc/Change.log
Modified: trunk/Currencies.php
===================================================================
--- trunk/Currencies.php 2015-05-14 14:33:10 UTC (rev 7300)
+++ trunk/Currencies.php 2015-05-16 23:38:43 UTC (rev 7301)
@@ -264,10 +264,19 @@
} elseif ($FunctionalCurrency==$SelectedCurrency){
prnMsg(_('Cannot delete this currency because it is the functional currency of the company'),'warn');
} else {
- //only delete if used in neither customer or supplier, comp prefs, bank trans accounts
- $sql="DELETE FROM currencies WHERE currabrev='" . $SelectedCurrency . "'";
+ $sql= "SELECT COUNT(*) FROM bankaccounts
+ WHERE currcode = '" . $SelectedCurrency . "'";
$result = DB_query($sql);
- prnMsg(_('The currency definition record has been deleted'),'success');
+ $myrow = DB_fetch_row($result);
+ if ($myrow[0] > 0){
+ prnMsg(_('Cannot delete this currency because there are bank accounts that use this currency') .
+ '<br />' . ' ' . _('There are') . ' ' . $myrow[0] . ' ' . _('bank accounts that refer to this currency'),'warn');
+ } else {
+ //only delete if used in neither customer or supplier, comp prefs, bank trans accounts
+ $sql="DELETE FROM currencies WHERE currabrev='" . $SelectedCurrency . "'";
+ $result = DB_query($sql);
+ prnMsg(_('The currency definition record has been deleted'),'success');
+ }
}
}
}
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-05-14 14:33:10 UTC (rev 7300)
+++ trunk/doc/Change.log 2015-05-16 23:38:43 UTC (rev 7301)
@@ -1,5 +1,6 @@
webERP Change Log
+17/5/15 Phil: Made currencies delete check first for bank accounts set up using the currency - as reported by Ricard
10/05/15 RChacon: New features: (1) GL account code for an inventory location, so that you can have general ledger transactions of inventory transfers to or from this location; useful for pledged inventory and goods on consignment. (2) Allow Invoicing parameter to allow or deny the availability of a location to be delivered; useful when a location stores compromised good that can not be sold.
08/05/15 RChacon: In DeliveryDetails.php, add $ViewTopic and $BookMark to ManualSalesOrders.html.
07/05/15 RChacon: In CustomerInquiry.php, hide submit button and 'More Info' columns when printing. Add thead tag to enable the table header to be printed at the top of each page.
@@ -7,7 +8,7 @@
04/05/15 Exson: Make PO number searching also in compliance with location authority rules and make default search result as all if users have full location authority.
04/05/15 Exson: Make all option available for users who have authority for all locations and all option available for all stock categories in PO_SelectOSPurchOrder.php.
02/05/15 TeHonu: Added bankaccountusers table in Z_ChangeGLAccountCode.php
-30/04/15 TurboPT: Add Delivery Date in GoodsReceived.php output. Forum feature request by giusba71.
+30/04/15 TurboPT: Add Delivery Date in GoodsReceived.php output. Forum feature request by giusba71.
30/04/15 Exson: Fixed the notice noise in SupplierCredit.php and SupplierInvoice.php.
30/04/15 Exson: Fixed the properties initial bug and tidy code up by fix typo.
26/04/15 Exson: Add adjustment reason to the mail text and fixed the notice noise in StockAdjustments.php.
|
|
From: <rc...@us...> - 2015-05-14 14:33:13
|
Revision: 7300
http://sourceforge.net/p/web-erp/reponame/7300
Author: rchacon
Date: 2015-05-14 14:33:10 +0000 (Thu, 14 May 2015)
Log Message:
-----------
Spanish translation improvement.
Modified Paths:
--------------
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
Modified: trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2015-05-10 20:53:03 UTC (rev 7299)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2015-05-14 14:33:10 UTC (rev 7300)
@@ -8,7 +8,7 @@
"Project-Id-Version: webERP 4.12.2\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-05-10 11:26-0600\n"
-"PO-Revision-Date: 2015-05-10 12:08-0600\n"
+"PO-Revision-Date: 2015-05-14 08:31-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: TecnoSoluciones.com <web...@te...>\n"
"Language: es_ES\n"
@@ -1634,7 +1634,7 @@
#: AutomaticTranslationDescriptions.php:31
msgid "Description Automatic Translation for empty translations"
-msgstr ""
+msgstr "Traducción automática de descripción para traducciones vacías"
#: AutomaticTranslationDescriptions.php:35 MaterialsNotUsed.php:33
#: TopItems.php:168
@@ -5692,7 +5692,7 @@
#: ContractOtherReqts.php:164
msgid "Enter the cost per unit of this requirement"
-msgstr ""
+msgstr "Introduzca el costo por unidad de este requisito"
#: ContractOtherReqts.php:171
msgid "Enter New Contract Requirement"
@@ -6644,7 +6644,7 @@
#: CounterReturns.php:844
msgid "Paid to Customer"
-msgstr ""
+msgstr "Pagado al cliente"
#: CounterReturns.php:853 CounterSales.php:961 SelectOrderItems.php:1434
msgid "Re-Calculate"
@@ -8651,7 +8651,7 @@
#: CustomerAccount.php:305 CustomerAccount.php:335
msgid "HTML "
-msgstr ""
+msgstr "HTML "
#: CustomerAccount.php:306 CustomerInquiry.php:311 CustomerInquiry.php:357
#: CustomerInquiry.php:396 CustomerInquiry.php:432 CustomerInquiry.php:478
@@ -8662,7 +8662,7 @@
#: CustomerAccount.php:310 CustomerAccount.php:340
msgid "PDF "
-msgstr ""
+msgstr "PDF "
#: CustomerAccount.php:311 CustomerAccount.php:341 CustomerInquiry.php:317
#: CustomerInquiry.php:363 CustomerInquiry.php:402 CustomerInquiry.php:438
@@ -9534,7 +9534,7 @@
#: CustomerPurchases.php:17
msgid "This script must be called with a customer code."
-msgstr ""
+msgstr "Este script debe ser llamado con un código de cliente."
#: CustomerPurchases.php:36
msgid "Items Purchased by Customer"
@@ -19003,7 +19003,7 @@
#: PDFDIFOT.php:21 includes/MainMenuLinksArray.php:64
msgid "Delivery In Full On Time (DIFOT) Report"
-msgstr "Informe de Entregas DIFOT (Delivery In Full On Time)"
+msgstr "Informe de entregas DIFOT (Delivery In Full On Time)"
#: PDFDIFOT.php:25
msgid "DIFOT Report"
@@ -25975,7 +25975,7 @@
#: SalesAnalRepts.php:7
msgid "Sales Analysis Reports Maintenance"
-msgstr "Administrar Informes de Análisis de Ventas"
+msgstr "Administrar informes de análisis de ventas"
#: SalesAnalRepts.php:25 SalesAnalRepts.php:27
msgid "Product Code"
@@ -31960,7 +31960,7 @@
#: StockSerialItemResearch.php:5
msgid "Serial Item Research"
-msgstr "Busqueda del Serial del Elemento"
+msgstr "Investigación de artículo seriado"
#: StockSerialItemResearch.php:71
msgid "No History found for Serial Number"
@@ -31968,7 +31968,7 @@
#: StockSerialItemResearch.php:73
msgid "Details for Serial Item"
-msgstr "Detalles del Serial del Elemento"
+msgstr "Detalles de artículo seriado"
#: StockSerialItemResearch.php:73 reportwriter/languages/en_US/reports.php:80
msgid "Length"
@@ -49078,7 +49078,7 @@
#: includes/MainMenuLinksArray.php:60
msgid "Sales Analysis Reports"
-msgstr "Informes de Análisis de Ventas"
+msgstr "Informes de análisis de ventas"
#: includes/MainMenuLinksArray.php:61
msgid "Sales Graphs"
@@ -49130,7 +49130,7 @@
#: includes/MainMenuLinksArray.php:109
msgid "Where Allocated Inquiry"
-msgstr "Consultar Dónde está Asignado"
+msgstr "Consultar dónde está asignado"
#: includes/MainMenuLinksArray.php:112
msgid "Aged Customer Balances/Overdues Report"
@@ -49139,7 +49139,7 @@
#: includes/MainMenuLinksArray.php:113
msgid "Re-Print A Deposit Listing"
-msgstr "Reimprimir una Lista de Depósitos"
+msgstr "Reimprimir una lista de depósitos"
#: includes/MainMenuLinksArray.php:114
msgid "Debtor Balances At A Prior Month End"
@@ -49147,11 +49147,11 @@
#: includes/MainMenuLinksArray.php:115
msgid "Customer Listing By Area/Salesperson"
-msgstr "Listado de clientes por Zona/Vendedor"
+msgstr "Listado de clientes por zona/vendedor"
#: includes/MainMenuLinksArray.php:116 includes/MainMenuLinksArray.php:152
msgid "List Daily Transactions"
-msgstr "Lista de Transacciones Diarias"
+msgstr "Lista de transacciones diarias"
#: includes/MainMenuLinksArray.php:137
msgid "Add Customer"
@@ -49243,7 +49243,7 @@
#: includes/MainMenuLinksArray.php:223
msgid "Serial Item Research Tool"
-msgstr "Herramienta de Investigación de Artículos Seriados"
+msgstr "Herramienta de investigación de artículo seriado"
#: includes/MainMenuLinksArray.php:225
msgid "Reprint GRN"
@@ -49251,15 +49251,15 @@
#: includes/MainMenuLinksArray.php:226
msgid "Inventory Item Movements"
-msgstr "Movimientos de Artículos del Inventario"
+msgstr "Movimientos de artículo de inventario"
#: includes/MainMenuLinksArray.php:227
msgid "Inventory Item Status"
-msgstr "Estado de Artículos del Inventario"
+msgstr "Estado de artículo de inventario"
#: includes/MainMenuLinksArray.php:228
msgid "Inventory Item Usage"
-msgstr "Uso de Artículos del Inventario"
+msgstr "Uso de artículo de inventario"
#: includes/MainMenuLinksArray.php:231
msgid "Stock Dispatch"
@@ -49312,7 +49312,7 @@
#: includes/MainMenuLinksArray.php:245
msgid "Aged Controlled Stock Report"
-msgstr ""
+msgstr "Informe de inventario controlado AGED"
#: includes/MainMenuLinksArray.php:271
msgid "Add A New Item"
@@ -50925,11 +50925,11 @@
#: reportwriter/languages/en_US/reports.php:272
msgid "Rectangle"
-msgstr ""
+msgstr "Rectángulo"
#: reportwriter/languages/en_US/reports.php:273
msgid "Line"
-msgstr ""
+msgstr "Línea"
#: reportwriter/languages/en_US/reports.php:274
msgid "Company Data Line"
@@ -51025,7 +51025,7 @@
#: reportwriter/languages/en_US/reports.php:311
msgid "4"
-msgstr ""
+msgstr "4"
#: reportwriter/languages/en_US/reports.php:312
msgid "5"
@@ -51081,11 +51081,11 @@
#: reportwriter/languages/en_US/reports.php:325
msgid "32"
-msgstr ""
+msgstr "32"
#: reportwriter/languages/en_US/reports.php:326
msgid "36"
-msgstr ""
+msgstr "36"
#: reportwriter/languages/en_US/reports.php:327
msgid "40"
@@ -51983,7 +51983,7 @@
#: ../webSHOP/Register.php:706
msgid "Billing Currency"
-msgstr ""
+msgstr "Moneda de facturación"
#: ../webSHOP/Register.php:728
msgid "Update Details"
@@ -52017,7 +52017,7 @@
#: ../webSHOP/includes/DisplayShoppingCart.php:26
msgid "Remove item"
-msgstr ""
+msgstr "Remover artículo"
#: ../webSHOP/includes/DisplayShoppingCart.php:29
msgid "Enter New Quantity"
@@ -52025,7 +52025,7 @@
#: ../webSHOP/includes/DisplayShoppingCart.php:64
msgid "Freight cost"
-msgstr ""
+msgstr "Costo del flete"
#: ../webSHOP/includes/DisplayShoppingCart.php:68
#: ../webSHOP/includes/PlaceOrder.php:280
@@ -52036,7 +52036,7 @@
#: ../webSHOP/includes/DisplayShoppingCart.php:85
#: ../webSHOP/includes/Functions.php:61
msgid "incl tax"
-msgstr ""
+msgstr "impuesto incluido"
#: ../webSHOP/includes/DisplayShoppingCart.php:85
msgid "Total Due"
@@ -52044,7 +52044,7 @@
#: ../webSHOP/includes/Functions.php:27 ../webSHOP/includes/Functions.php:30
msgid "Click for more information"
-msgstr ""
+msgstr "Haga clic para más información"
#: ../webSHOP/includes/Functions.php:50
msgid "Stock QTY"
|
|
From: <rc...@us...> - 2015-05-10 20:53:05
|
Revision: 7299
http://sourceforge.net/p/web-erp/reponame/7299
Author: rchacon
Date: 2015-05-10 20:53:03 +0000 (Sun, 10 May 2015)
Log Message:
-----------
Minor changes: clean up code.
Modified Paths:
--------------
trunk/CustomerBranches.php
trunk/DeliveryDetails.php
trunk/Locations.php
trunk/StockLocTransferReceive.php
trunk/StockTransfers.php
trunk/Z_ChangeGLAccountCode.php
trunk/Z_ChangeLocationCode.php
Modified: trunk/CustomerBranches.php
===================================================================
--- trunk/CustomerBranches.php 2015-05-10 18:10:27 UTC (rev 7298)
+++ trunk/CustomerBranches.php 2015-05-10 20:53:03 UTC (rev 7299)
@@ -4,7 +4,7 @@
include('includes/session.inc');
$Title = _('Customer Branches');// Screen identification.
-$ViewTopic= 'AccountsReceivable';// Filename's id in ManualContents.php's TOC.
+$ViewTopic = 'AccountsReceivable';// Filename's id in ManualContents.php's TOC.
$BookMark = 'NewCustomerBranch';// Anchor's id in the manual's html document.
include('includes/header.inc');
@@ -362,7 +362,7 @@
}
}
}
- } //end ifs to test if the branch can be deleted
+ }//end ifs to test if the branch can be deleted
}
if(!isset($SelectedBranch)) {
@@ -601,7 +601,7 @@
<td>' . $_POST['BranchCode'] . '</td>
</tr>';
- } else { //end of if $SelectedBranch only do the else when a new record is being entered
+ } else {//end of if $SelectedBranch only do the else when a new record is being entered
/* SETUP ANY $_GET VALUES THAT ARE PASSED. This really is just used coming from the Customers.php when a new customer is created.
Maybe should only do this when that page is the referrer?
@@ -765,12 +765,12 @@
}
echo $myrow['salesmancode'] . '">' . $myrow['salesmanname'] . '</option>';
- } //end while loop
+ }//end while loop
echo '</select></td>
</tr>';
- // DB_data_seek($result,0); //by thumb
+ // DB_data_seek($result,0);//by thumb
}
$SQL = "SELECT areacode, areadescription FROM areas";
$result = DB_query($SQL);
@@ -793,14 +793,13 @@
}
echo $myrow['areacode'] . '">' . $myrow['areadescription'] . '</option>';
- } //end while loop
+ }//end while loop
echo '</select></td>
</tr>';
DB_data_seek($result,0);
-// BEGIN: **********************************************************************
$SQL = "SELECT locations.loccode, locationname
FROM locations
INNER JOIN locationusers
@@ -831,7 +830,6 @@
echo $myrow['loccode'], '">', $myrow['locationname'], '</option>';
}// End while loop.
-// END: ************************************************************************
echo '</select></td>
</tr>
@@ -856,7 +854,7 @@
}
echo '<tr>
<td>' . (($_POST['Email']) ? '<a href="Mailto:'.$_POST['Email'].'">' . _('Email').':</a>' : _('Email').':') . '</td>';
- //only display email link if there is an email address
+ //only display email link if there is an email address
echo '<td><input tabindex="18" type="email" name="Email" placeholder="e.g. ex...@do..." size="56" maxlength="55" value="'. $_POST['Email'].'" /></td>
</tr>';
@@ -883,7 +881,7 @@
}
echo $myrow['taxgroupid'] . '">' . $myrow['taxgroupdescription'] . '</option>';
- } //end while loop
+ }//end while loop
echo '</select></td>
</tr>
@@ -997,7 +995,7 @@
</div>
</form>';
-} //end if record deleted no point displaying form to add record
+}//end if record deleted no point displaying form to add record
include('includes/footer.inc');
?>
\ No newline at end of file
Modified: trunk/DeliveryDetails.php
===================================================================
--- trunk/DeliveryDetails.php 2015-05-10 18:10:27 UTC (rev 7298)
+++ trunk/DeliveryDetails.php 2015-05-10 20:53:03 UTC (rev 7299)
@@ -44,7 +44,7 @@
if(isset($_POST['ProcessOrder']) OR isset($_POST['MakeRecurringOrder'])) {
/*need to check for input errors in any case before order processed */
- $_POST['Update']='Yes rerun the validation checks'; //no need for gettext!
+ $_POST['Update']='Yes rerun the validation checks';//no need for gettext!
/*store the old freight cost before it is recalculated to ensure that there has been no change - test for change after freight recalculated and get user to re-confirm if changed */
@@ -432,7 +432,7 @@
if($StockItem->MBflag=='M'
AND $_SESSION['AutoCreateWOs']==1
- AND $_SESSION['Items'.$identifier]->Quotation!=1) { //oh yeah its all on!
+ AND $_SESSION['Items'.$identifier]->Quotation!=1) {//oh yeah its all on!
echo '<br />';
@@ -488,7 +488,7 @@
//Now we have the data - do we need to make any more?
$ShortfallQuantity = $QOH-$QuantityDemand-$QuantityAssemblyDemand+$QuantityPurchOrders+$QuantityWorkOrders;
- if($ShortfallQuantity < 0) { //then we need to make a work order
+ if($ShortfallQuantity < 0) {//then we need to make a work order
//How many should the work order be for??
if($ShortfallQuantity + $StockItem->EOQ < 0) {
$WOQuantity = -$ShortfallQuantity;
@@ -565,25 +565,25 @@
$result = DB_query($sql,$ErrMsg,$DbgMsg,true);
$FactoryManagerEmail .= "\n" . ($StockItem->NextSerialNo + $i);
}
- } //end loop around creation of woserialnos
+ }//end loop around creation of woserialnos
$NewNextSerialNo = ($StockItem->NextSerialNo + $WOQuantity +1);
$ErrMsg = _('Could not update the new next serial number for the item');
$UpdateNextSerialNoResult = DB_query("UPDATE stockmaster SET nextserialno='" . $NewNextSerialNo . "' WHERE stockid='" . $StockItem->StockID . "'",$ErrMsg,$DbgMsg,true);
- } // end if the item is serialised and nextserialno is set
+ }// end if the item is serialised and nextserialno is set
$EmailSubject = _('New Work Order Number') . ' ' . $WONo . ' ' . _('for') . ' ' . $StockItem->StockID . ' x ' . $WOQuantity;
//Send email to the Factory Manager
if($_SESSION['SmtpSetting']==0) {
mail($_SESSION['FactoryManagerEmail'],$EmailSubject,$FactoryManagerEmail);
- }else {
+ } else {
include('includes/htmlMimeMail.php');
$mail = new htmlMimeMail();
$mail->setSubject($EmailSubject);
$result = SendmailBySmtp($mail,array($_SESSION['FactoryManagerEmail']));
}
- } //end if with this sales order there is a shortfall of stock - need to create the WO
+ }//end if with this sales order there is a shortfall of stock - need to create the WO
}//end if auto create WOs in on
} /* end inserted line items into sales order details */
@@ -659,12 +659,12 @@
$Result = DB_Txn_Begin();
/*see if this is a contract quotation being changed to an order? */
- if($_SESSION['Items'.$identifier]->Quotation==0) { //now its being changed? to an order
+ if($_SESSION['Items'.$identifier]->Quotation==0) {//now its being changed? to an order
$ContractResult = DB_query("SELECT contractref,
requireddate
FROM contracts WHERE orderno='" . $_SESSION['ExistingOrder'.$identifier] ."'
AND status=1");
- if(DB_num_rows($ContractResult)==1) { //then it is a contract quotation being changed to an order
+ if(DB_num_rows($ContractResult)==1) {//then it is a contract quotation being changed to an order
$ContractRow = DB_fetch_array($ContractResult);
$WONo = GetNextTransNo(40,$db);
$ErrMsg = _('Could not update the contract status');
@@ -716,7 +716,7 @@
$Cost =0;
prnMsg(_('In automatically creating a work order for') . ' ' . $ContractRow['contractref'] . ' ' . _('an item on this sales order, the cost of this item as accumulated from the sum of the component costs is nil. This could be because there is no bill of material set up ... you may wish to double check this'),'warn');
} else {
- $Cost = $CostRow[0]; //cost of contract BOM
+ $Cost = $CostRow[0];//cost of contract BOM
}
$CostResult = DB_query("SELECT SUM(costperunit*quantity) AS cost
FROM contractreqts
@@ -740,8 +740,8 @@
//Recursively insert real component requirements - see includes/SQL_CommonFunctions.in for function WoRealRequirements
WoRealRequirements($db, $WONo, $_SESSION['Items'.$identifier]->Location, $ContractRow['contractref']);
- } //end processing if the order was a contract quotation being changed to an order
- } //end test to see if the order was a contract quotation being changed to an order
+ }//end processing if the order was a contract quotation being changed to an order
+ }//end test to see if the order was a contract quotation being changed to an order
$HeaderSQL = "UPDATE salesorders SET debtorno = '" . $_SESSION['Items'.$identifier]->DebtorNo . "',
@@ -805,7 +805,7 @@
unset($_SESSION['Items'.$identifier]->LineItems);
unset($_SESSION['Items'.$identifier]);
- if($Quotation) { //handle Quotations and Orders print after modification
+ if($Quotation) {//handle Quotations and Orders print after modification
prnMsg(_('Quotation Number') .' ' . $_SESSION['ExistingOrder'.$identifier] . ' ' . _('has been updated'),'success');
/*link to print the quotation */
@@ -821,7 +821,7 @@
<td>' . ' ' . '<a href="' . $RootPath . '/PDFQuotationPortrait.php?identifier='.$identifier . '&QuotationNo=' . $_SESSION['ExistingOrder'.$identifier] . '" target="_blank">' . _('Print Quotation (Portrait)') . '</a></td>
</tr>
</table>';
- }else {
+ } else {
prnMsg(_('Order Number') .' ' . $_SESSION['ExistingOrder'.$identifier] . ' ' . _('has been updated'),'success');
@@ -887,7 +887,7 @@
$_SESSION['Items'.$identifier]->total = 0;
$_SESSION['Items'.$identifier]->totalVolume = 0;
$_SESSION['Items'.$identifier]->totalWeight = 0;
- $k = 0; //row colour counter
+ $k = 0;//row colour counter
foreach ($_SESSION['Items'.$identifier]->LineItems as $StockItem) {
@@ -956,7 +956,7 @@
$_SESSION['Items'.$identifier]->total = 0;
$_SESSION['Items'.$identifier]->totalVolume = 0;
$_SESSION['Items'.$identifier]->totalWeight = 0;
- $k=0; // row colour counter
+ $k=0;// row colour counter
foreach ($_SESSION['Items'.$identifier]->LineItems as $StockItem) {
$LineTotal = $StockItem->Quantity * $StockItem->Price * (1 - $StockItem->DiscountPercent);
@@ -1014,7 +1014,6 @@
$_SESSION['Items'.$identifier]->Location = $DefaultStockLocation;
}
-// BEGIN: **********************************************************************
$SQL = "SELECT locations.loccode, locationname
FROM locations
INNER JOIN locationusers
@@ -1030,7 +1029,6 @@
echo '<option', ($_SESSION['Items'.$identifier]->Location==$myrow['loccode'] ? ' selected="selected"' : ''), ' value="', $myrow['loccode'], '">', $myrow['locationname'], '</option>';
}
echo '</select></td></tr>';
-// END: ************************************************************************
// Set the default date to earliest possible date if not set already
if(!isset($_SESSION['Items'.$identifier]->DeliveryDate)) {
@@ -1084,7 +1082,7 @@
foreach ($CountriesArray as $CountryEntry => $CountryName) {
if(isset($_POST['BrAdd6']) AND (strtoupper($_POST['BrAdd6']) == strtoupper($CountryName))) {
echo '<option selected="selected" value="' . $CountryName . '">' . $CountryName . '</option>';
- }elseif(!isset($_POST['BrAdd6']) AND $CountryName == $_SESSION['Items'.$identifier]->DelAdd6) {
+ } elseif(!isset($_POST['BrAdd6']) AND $CountryName == $_SESSION['Items'.$identifier]->DelAdd6) {
echo '<option selected="selected" value="' . $CountryName . '">' . $CountryName . '</option>';
} else {
echo '<option value="' . $CountryName . '">' . $CountryName . '</option>';
@@ -1187,15 +1185,13 @@
$ShipperResults = DB_query($sql,$ErrMsg,$DbgMsg);
while ($myrow=DB_fetch_array($ShipperResults)) {
if($myrow['shipper_id']==$_POST['ShipVia']) {
- echo '<option selected="selected" value="' . $myrow['shipper_id'] . '">' . $myrow['shippername'] . '</option>';
- }else {
+ echo '<option selected="selected" value="' . $myrow['shipper_id'] . '">' . $myrow['shippername'] . '</option>';
+ } else {
echo '<option value="' . $myrow['shipper_id'] . '">' . $myrow['shippername'] . '</option>';
}
}
-
echo '</select></td></tr>';
-
echo '<tr><td>' . _('Quotation Only') .':</td>
<td><select name="Quotation">';
if($_SESSION['Items'.$identifier]->Quotation==1) {
@@ -1206,7 +1202,7 @@
echo '<option selected="selected" value="0">' . _('No') . '</option>';
}
echo '</select></td></tr>';
- } //end if it is NOT a CustomerLogin
+ }//end if it is NOT a CustomerLogin
echo '</table>';
Modified: trunk/Locations.php
===================================================================
--- trunk/Locations.php 2015-05-10 18:10:27 UTC (rev 7298)
+++ trunk/Locations.php 2015-05-10 20:53:03 UTC (rev 7299)
@@ -7,10 +7,10 @@
$ViewTopic = 'Inventory';// Filename's id in ManualContents.php's TOC.
$BookMark = 'Locations';// Anchor's id in the manual's html document.
include('includes/header.inc');
-echo '<p class="page_title_text"><img alt="" src="'.$RootPath.'/css/'.$Theme.
- '/images/supplier.png" title="' .// Icon image.
- _('Inventory') . '" /> ' .// Icon title.
- _('Location Maintenance') . '</p>';// Page title.
+echo '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/supplier.png" title="',// Icon image.
+ _('Inventory'), '" /> ',// Icon title.
+ _('Location Maintenance'), '</p>';// Page title.
include('includes/CountriesArray.php');
@@ -38,7 +38,7 @@
if($_POST['CashSaleBranch']=='') {
prnMsg(_('A cash sale customer and branch are necessary to fully setup the counter sales functionality'),'error');
$InputError =1;
- } else { //customer branch is set too ... check it ties up with a valid customer
+ } else {//customer branch is set too ... check it ties up with a valid customer
$sql = "SELECT * FROM custbranch
WHERE debtorno='" . $_POST['CashSaleCustomer'] . "'
AND branchcode='" . $_POST['CashSaleBranch'] . "'";
@@ -49,7 +49,7 @@
prnMsg(_('The cash sale customer for this location must be defined with both a valid customer code and a valid branch code for this customer'),'error');
}
}
- } //end of checking the customer - branch code entered
+ }//end of checking the customer - branch code entered
if(isset($SelectedLocation) AND $InputError !=1) {
@@ -235,7 +235,7 @@
$DispTaxProvincesResult = DB_query("SELECT taxprovinceid FROM locations");
$TaxCatsResult = DB_query("SELECT taxcatid FROM taxcategories");
- if(DB_num_rows($TaxCatsResult) > 0) { // This will only work if there are levels else we get an error on seek.
+ if(DB_num_rows($TaxCatsResult) > 0) {// This will only work if there are levels else we get an error on seek.
while ($myrow=DB_fetch_row($DispTaxProvincesResult)) {
/*Check to see there are TaxAuthRates records set up for this TaxProvince */
@@ -379,7 +379,7 @@
prnMsg(_('Location') . ' ' . $SelectedLocation . ' ' . _('has been deleted') . '!', 'success');
unset ($SelectedLocation);
- } //end if Delete Location
+ }//end if Delete Location
unset($SelectedLocation);
unset($_GET['delete']);
}
@@ -415,7 +415,7 @@
<th class="noprint" colspan="2"> </th>
</tr>';
-$k=0; //row colour counter
+$k=0;//row colour counter
while ($myrow = DB_fetch_array($result)) {
if($k==1) {
echo '<tr class="EvenTableRows">';
@@ -525,7 +525,7 @@
<td>' . _('Location Code') . ':</td>
<td>' . $_POST['LocCode'] . '</td>
</tr>';
- } else { //end of if $SelectedLocation only do the else when a new record is being entered
+ } else {//end of if $SelectedLocation only do the else when a new record is being entered
if(!isset($_POST['LocCode'])) {
$_POST['LocCode'] = '';
}
@@ -716,7 +716,7 @@
</div>
</form>';
-} //end if record deleted no point displaying form to add record
+}//end if record deleted no point displaying form to add record
include('includes/footer.inc');
?>
\ No newline at end of file
Modified: trunk/StockLocTransferReceive.php
===================================================================
--- trunk/StockLocTransferReceive.php 2015-05-10 18:10:27 UTC (rev 7298)
+++ trunk/StockLocTransferReceive.php 2015-05-10 20:53:03 UTC (rev 7299)
@@ -199,7 +199,6 @@
// COMMENT: "if($TrfLine->Quantity !=0) {}" should be as a general condition to avoid transactions in zero.
-// BEGIN: **********************************************************************
// Insert outgoing inventory GL transaction if any of the locations has a GL account code:
if(($_SESSION['Transfer']->StockLocationFromAccount !='' or $_SESSION['Transfer']->StockLocationToAccount !='') and $TrfLine->Quantity !=0) {
// Get the account code:
@@ -238,7 +237,6 @@
$DbgMsg = _('The following SQL to insert records was used');
$Result = DB_query($SQL, $ErrMsg, $DbgMsg, true);
}
-// END: ************************************************************************
// Insert the stock movement for the stock coming into the to location
$SQL = "INSERT INTO stockmoves (stockid,
@@ -354,7 +352,6 @@
$DbgMsg = _('The following SQL to update the stock record was used');
$Result = DB_query($SQL, $ErrMsg, $DbgMsg, true);
-// BEGIN: **********************************************************************
// Insert incoming inventory GL transaction if any of the locations has a GL account code:
if(($_SESSION['Transfer']->StockLocationFromAccount !='' or $_SESSION['Transfer']->StockLocationToAccount !='') and $TrfLine->Quantity !=0) {
// Get the account code:
@@ -393,7 +390,6 @@
$DbgMsg = _('The following SQL to insert records was used');
$Result = DB_query($SQL, $ErrMsg, $DbgMsg, true);
}
-// END: ************************************************************************
prnMsg(_('A stock transfer for item code'). ' - ' . $TrfLine->StockID . ' ' . $TrfLine->ItemDescription . ' '. _('has been created from').' ' . $_SESSION['Transfer']->StockLocationFromName . ' '. _('to'). ' ' . $_SESSION['Transfer']->StockLocationToName . ' ' . _('for a quantity of'). ' '. $TrfLine->Quantity,'success');
@@ -432,7 +428,7 @@
$EmailSubject = _('Cancelled balance of transfer'). ' ' . $_SESSION['Transfer']->TrfID;
if($_SESSION['SmtpSetting']==0) {
mail($_SESSION['InventoryManagerEmail'],$EmailSubject,$ConfirmationText);
- }else{
+ } else{
include('includes/htmlMimeMail.php');
$mail = new htmlMimeMail();
$mail->setSubject($EmailSubject);
@@ -533,7 +529,7 @@
prnMsg(_('Please Verify Shipment Quantities Received'),'info');
- $i = 0; //Line Item Array pointer
+ $i = 0;//Line Item Array pointer
echo '<br />
<table class="selection">';
@@ -691,4 +687,4 @@
</form>';
}
include('includes/footer.inc');
-?>
+?>
\ No newline at end of file
Modified: trunk/StockTransfers.php
===================================================================
--- trunk/StockTransfers.php 2015-05-10 18:10:27 UTC (rev 7298)
+++ trunk/StockTransfers.php 2015-05-10 20:53:03 UTC (rev 7299)
@@ -25,10 +25,10 @@
if(isset($_POST['CheckCode'])) {
- echo '<p class="page_title_text">
- <img src="'.$RootPath.'/css/'.$Theme.'/images/magnifier.png" title="' . _('Dispatch') . '" alt="" />
- ' . ' ' . _('Select Item to Transfer') . '
- </p>';
+ echo '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/magnifier.png" title="',// Icon image.
+ _('Dispatch'), '" /> ',// Icon title.
+ _('Select Item to Transfer'), '</p>';// Page title.
if(mb_strlen($_POST['StockText'])>0) {
$sql="SELECT stockid,
@@ -215,7 +215,6 @@
include('includes/footer.inc');
exit;
}
-// BEGIN: **********************************************************************
// Insert outgoing inventory GL transaction if any of the locations has a GL account code:
if($_SESSION['Transfer']->StockLocationFromAccount !='' or $_SESSION['Transfer']->StockLocationToAccount !='') {
// Get the account code:
@@ -254,7 +253,6 @@
$DbgMsg = _('The following SQL to insert records was used');
$Result = DB_query($SQL, $ErrMsg, $DbgMsg, true);
}
-// END: ************************************************************************
// Insert the stock movement for the stock going out of the from location
$SQL = "INSERT INTO stockmoves(stockid,
type,
@@ -372,7 +370,6 @@
// There must actually be some error this should never happen
$QtyOnHandPrior = 0;
}
-// BEGIN: **********************************************************************
// Insert incoming inventory GL transaction if any of the locations has a GL account code:
if($_SESSION['Transfer']->StockLocationFromAccount !='' or $_SESSION['Transfer']->StockLocationToAccount !='') {
// Get the account code:
@@ -411,7 +408,6 @@
$DbgMsg = _('The following SQL to insert records was used');
$Result = DB_query($SQL, $ErrMsg, $DbgMsg, true);
}
-// END: ************************************************************************
// Insert the stock movement for the stock coming into the to location
$SQL = "INSERT INTO stockmoves (stockid,
type,
Modified: trunk/Z_ChangeGLAccountCode.php
===================================================================
--- trunk/Z_ChangeGLAccountCode.php 2015-05-10 18:10:27 UTC (rev 7298)
+++ trunk/Z_ChangeGLAccountCode.php 2015-05-10 20:53:03 UTC (rev 7299)
@@ -4,17 +4,17 @@
include ('includes/session.inc');
$Title = _('UTILITY PAGE Change A GL Account Code');// Screen identificator.
-$ViewTopic = 'SpecialUtilities'; // Filename's id in ManualContents.php's TOC.
-$BookMark = 'Z_ChangeGLAccountCode'; // Anchor's id in the manual's html document.
+$ViewTopic = 'SpecialUtilities';// Filename's id in ManualContents.php's TOC.
+$BookMark = 'Z_ChangeGLAccountCode';// Anchor's id in the manual's html document.
include('includes/header.inc');
-echo '<p class="page_title_text"><img alt="" src="'.$RootPath.'/css/'.$Theme.
- '/images/gl.png" title="' .
- _('Change A GL Account Code') . '" /> ' .// Icon title.
- _('Change A GL Account Code') . '</p>';// Page title.
+echo '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/gl.png" title="',// Icon image.
+ _('Change A GL Account Code'), '" /> ',// Icon title.
+ _('Change A GL Account Code'), '</p>';// Page title.
include('includes/SQL_CommonFunctions.inc');
-if (isset($_POST['ProcessGLAccountCode'])){
+if(isset($_POST['ProcessGLAccountCode'])) {
$InputError =0;
@@ -22,17 +22,17 @@
/*First check the code exists */
$result=DB_query("SELECT accountcode FROM chartmaster WHERE accountcode='" . $_POST['OldAccountCode'] . "'");
- if (DB_num_rows($result)==0){
+ if(DB_num_rows($result)==0) {
prnMsg(_('The GL account code') . ': ' . $_POST['OldAccountCode'] . ' ' . _('does not currently exist as a GL account code in the system'),'error');
$InputError =1;
}
- if (ContainsIllegalCharacters($_POST['NewAccountCode'])){
+ if(ContainsIllegalCharacters($_POST['NewAccountCode'])) {
prnMsg(_('The new GL account code to change the old code to contains illegal characters - no changes will be made'),'error');
$InputError =1;
}
- if ($_POST['NewAccountCode']==''){
+ if($_POST['NewAccountCode']=='') {
prnMsg(_('The new GL account code to change the old code to must be entered as well'),'error');
$InputError =1;
}
@@ -40,14 +40,14 @@
/*Now check that the new code doesn't already exist */
$result=DB_query("SELECT accountcode FROM chartmaster WHERE accountcode='" . $_POST['NewAccountCode'] . "'");
- if (DB_num_rows($result)!=0){
+ if(DB_num_rows($result)!=0) {
echo '<br /><br />';
prnMsg(_('The replacement GL account code') . ': ' . $_POST['NewAccountCode'] . ' ' . _('already exists as a GL account code in the system') . ' - ' . _('a unique GL account code must be entered for the new code'),'error');
$InputError =1;
}
- if ($InputError ==0){ // no input errors
+ if($InputError ==0) {// no input errors
$result = DB_Txn_Begin();
echo '<br />' . _('Adding the new chartmaster record');
$sql = "INSERT INTO chartmaster (accountcode,
@@ -96,9 +96,7 @@
ChangeFieldInTable("lastcostrollup", "stockact", $_POST['OldAccountCode'], $_POST['NewAccountCode'], $db);
ChangeFieldInTable("lastcostrollup", "adjglact", $_POST['OldAccountCode'], $_POST['NewAccountCode'], $db);
-// BEGIN: **********************************************************************
ChangeFieldInTable("locations", "glaccountcode", $_POST['OldAccountCode'], $_POST['NewAccountCode'], $db);// Location's ledger account.
-// END: ************************************************************************
ChangeFieldInTable("pcexpenses", "glaccount", $_POST['OldAccountCode'], $_POST['NewAccountCode'], $db);
@@ -133,9 +131,8 @@
$result = DB_query($sql,$ErrMsg,$DbgMsg,true);
echo ' ... ' . _('completed');
-
echo '<p>' . _('GL account Code') . ': ' . $_POST['OldAccountCode'] . ' ' . _('was successfully changed to') . ' : ' . $_POST['NewAccountCode'];
- } //only do the stuff above if $InputError==0
+ }//only do the stuff above if $InputError==0
}
Modified: trunk/Z_ChangeLocationCode.php
===================================================================
--- trunk/Z_ChangeLocationCode.php 2015-05-10 18:10:27 UTC (rev 7298)
+++ trunk/Z_ChangeLocationCode.php 2015-05-10 20:53:03 UTC (rev 7299)
@@ -1,20 +1,20 @@
<?php
/* $Id: Z_ChangeLocationCode.php 5296 2012-04-29 15:28:19Z vvs2012 $*/
-/* This script is an utility to change a location code. */
+/* Utility to change a location code. */
include ('includes/session.inc');
$Title = _('UTILITY PAGE Change A Location Code');// Screen identificator.
-$ViewTopic = 'SpecialUtilities'; // Filename's id in ManualContents.php's TOC.
-$BookMark = 'Z_ChangeLocationCode'; // Anchor's id in the manual's html document.
+$ViewTopic = 'SpecialUtilities';// Filename's id in ManualContents.php's TOC.
+$BookMark = 'Z_ChangeLocationCode';// Anchor's id in the manual's html document.
include('includes/header.inc');
-echo '<p class="page_title_text"><img alt="" src="'.$RootPath.'/css/'.$Theme.
- '/images/maintenance.png" title="' .
- _('Change A Location Code') . '" /> ' .// Icon title.
- _('Change A Location Code') . '</p>';// Page title.
+echo '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/maintenance.png" title="',// Icon image.
+ _('Change A Location Code'), '" /> ',// Icon title.
+ _('Change A Location Code'), '</p>';// Page title.
include('includes/SQL_CommonFunctions.inc');
-if (isset($_POST['ProcessLocationChange'])){
+if(isset($_POST['ProcessLocationChange'])) {
$InputError =0;
@@ -22,39 +22,39 @@
/*First check the location code exists */
$result=DB_query("SELECT loccode FROM locations WHERE loccode='" . $_POST['OldLocationID'] . "'");
- if (DB_num_rows($result)==0){
+ if(DB_num_rows($result)==0) {
prnMsg(_('The location code') . ': ' . $_POST['OldLocationID'] . ' ' . _('does not currently exist as a location code in the system'),'error');
$InputError =1;
}
- if (ContainsIllegalCharacters($_POST['NewLocationID'])){
+ if(ContainsIllegalCharacters($_POST['NewLocationID'])) {
prnMsg(_('The new location code to change the old code to contains illegal characters - no changes will be made'),'error');
$InputError =1;
}
- if ($_POST['NewLocationID']==''){
+ if($_POST['NewLocationID']=='') {
prnMsg(_('The new location code to change the old code to must be entered as well'),'error');
$InputError =1;
}
- if (ContainsIllegalCharacters($_POST['NewLocationName'])){
+ if(ContainsIllegalCharacters($_POST['NewLocationName'])) {
prnMsg(_('The new location name to change the old name to contains illegal characters - no changes will be made'),'error');
$InputError =1;
}
- if ($_POST['NewLocationName']==''){
+ if($_POST['NewLocationName']=='') {
prnMsg(_('The new location name to change the old name to must be entered as well'),'error');
$InputError =1;
}
/*Now check that the new code doesn't already exist */
$result=DB_query("SELECT loccode FROM locations WHERE loccode='" . $_POST['NewLocationID'] . "'");
- if (DB_num_rows($result)!=0){
+ if(DB_num_rows($result)!=0) {
echo '<br /><br />';
prnMsg(_('The replacement location code') . ': ' . $_POST['NewLocationID'] . ' ' . _('already exists as a location code in the system') . ' - ' . _('a unique location code must be entered for the new code'),'error');
$InputError =1;
}
- if ($InputError ==0){ // no input errors
+ if($InputError ==0) {// no input errors
$result = DB_Txn_Begin();
DB_IgnoreForeignKeys();
@@ -159,7 +159,7 @@
//check if MRP tables exist before assuming
$result = DB_query("SELECT COUNT(*) FROM mrpparameters",'','',false,false);
- if (DB_error_no()==0) {
+ if(DB_error_no()==0) {
echo '<br />' . _('Changing MRP parameters information');
$sql = "UPDATE mrpparameters SET location='" . $_POST['NewLocationID'] . "' WHERE location='" . $_POST['OldLocationID'] . "'";
$ErrMsg = _('The SQL to update the mrpparameters records failed');
@@ -251,7 +251,7 @@
echo '<p>' . _('Location code') . ': ' . $_POST['OldLocationID'] . ' ' . _('was successfully changed to') . ' : ' . $_POST['NewLocationID'];
- } //only do the stuff above if $InputError==0
+ }//only do the stuff above if $InputError==0
}
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">';
@@ -279,4 +279,4 @@
</form>';
include('includes/footer.inc');
-?>
+?>
\ No newline at end of file
|
|
From: <rc...@us...> - 2015-05-10 18:10:29
|
Revision: 7298
http://sourceforge.net/p/web-erp/reponame/7298
Author: rchacon
Date: 2015-05-10 18:10:27 +0000 (Sun, 10 May 2015)
Log Message:
-----------
Spanish translation improvements.
Modified Paths:
--------------
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
Modified: trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2015-05-10 17:38:55 UTC (rev 7297)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2015-05-10 18:10:27 UTC (rev 7298)
@@ -8,7 +8,7 @@
"Project-Id-Version: webERP 4.12.2\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-05-10 11:26-0600\n"
-"PO-Revision-Date: 2015-04-23 07:53-0600\n"
+"PO-Revision-Date: 2015-05-10 12:08-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: TecnoSoluciones.com <web...@te...>\n"
"Language: es_ES\n"
@@ -16931,7 +16931,7 @@
#: Locations.php:414 Locations.php:699
msgid "Allow Invoicing"
-msgstr ""
+msgstr "Permitir facturación"
#: Locations.php:440
#, php-format
@@ -17027,11 +17027,11 @@
#: Locations.php:665
msgid "Allow internal requests?"
-msgstr ""
+msgstr "¿Permitir solicitudes internas?"
#: Locations.php:680
msgid "Use for Work Order Productions?"
-msgstr ""
+msgstr "¿Usar para producciones con órdenes de trabajo?"
#: Locations.php:694
msgid ""
@@ -17154,11 +17154,11 @@
#: MRP.php:592
msgid "Use Reorder Level Demands"
-msgstr ""
+msgstr "Usar demandas de nivel de reorden"
#: MRP.php:596
msgid "Use EOQ"
-msgstr "Usar Cantidad de Requisición Económica"
+msgstr "Usar cantidad económica de pedido"
#: MRP.php:600
msgid "Use Pan Size"
@@ -17178,11 +17178,11 @@
#: MRP.php:642
msgid "Use Reorder Level Demands?"
-msgstr ""
+msgstr "¿Usar demandas de nivel de reorden?"
#: MRP.php:646
msgid "Use EOQ?"
-msgstr "Usar Cantidad de Requisición Económica?"
+msgstr "¿Usar cantidad económica de pedido?"
#: MRP.php:650
msgid "Use Pan Size?"
@@ -25204,7 +25204,7 @@
#: RelatedItemsUpdate.php:5
msgid "Update Related Items"
-msgstr ""
+msgstr "Actualizar artículos relacionados"
#: RelatedItemsUpdate.php:35
msgid "Only valid parts can have related items entered against them"
@@ -29669,7 +29669,7 @@
#: ShopParameters.php:334
msgid "Allow Payment Surcharges"
-msgstr ""
+msgstr "Permitir sobrecargos en pago"
#: ShopParameters.php:344
msgid "Add surcharges for different payment methods."
@@ -29703,7 +29703,7 @@
#: ShopParameters.php:398
msgid "Allow bank transfers to be used for payments."
-msgstr ""
+msgstr "Permitir transferencias bancarias sean usadas para los pagos."
#: ShopParameters.php:401
msgid "Bank Transfer Surcharge"
@@ -29719,7 +29719,7 @@
#: ShopParameters.php:410
msgid "Allow PayPal Payment"
-msgstr ""
+msgstr "Permitir Pago PayPal"
#: ShopParameters.php:420
msgid ""
@@ -36399,7 +36399,7 @@
#: SystemParameters.php:975 SystemParameters.php:977
msgid "Allow SysAdmin Access Only"
-msgstr ""
+msgstr "Permitir solo acceso del SysAdmin"
#: SystemParameters.php:981
msgid ""
@@ -38506,7 +38506,7 @@
#: WWW_Users.php:732
msgid "Allowed Department for Internal Requests"
-msgstr ""
+msgstr "Departamentos permitidos para solicitudes internas"
#: WWW_Users.php:742 WWW_Users.php:744
msgid "Any Internal Department"
@@ -50945,7 +50945,7 @@
#: reportwriter/languages/en_US/reports.php:277
msgid "Uppercase"
-msgstr ""
+msgstr "Mayúsculas"
#: reportwriter/languages/en_US/reports.php:278
msgid "Lowercase"
@@ -51987,7 +51987,7 @@
#: ../webSHOP/Register.php:728
msgid "Update Details"
-msgstr ""
+msgstr "Actualizar detalles"
#: ../webSHOP/index.php:95
msgid ""
@@ -52013,7 +52013,7 @@
#: ../webSHOP/includes/DisplayShoppingCart.php:25
msgid "Update Quantity"
-msgstr ""
+msgstr "Actualizar cantidad"
#: ../webSHOP/includes/DisplayShoppingCart.php:26
msgid "Remove item"
|
|
From: <rc...@us...> - 2015-05-10 17:38:59
|
Revision: 7297
http://sourceforge.net/p/web-erp/reponame/7297
Author: rchacon
Date: 2015-05-10 17:38:55 +0000 (Sun, 10 May 2015)
Log Message:
-----------
Rebuild languages files *.pot, *.po and *.mo.
Modified Paths:
--------------
trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.mo
trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po
trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.mo
trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po
trunk/locale/de_DE.utf8/LC_MESSAGES/messages.mo
trunk/locale/de_DE.utf8/LC_MESSAGES/messages.po
trunk/locale/el_GR.utf8/LC_MESSAGES/messages.mo
trunk/locale/el_GR.utf8/LC_MESSAGES/messages.po
trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot
trunk/locale/en_US.utf8/LC_MESSAGES/messages.mo
trunk/locale/en_US.utf8/LC_MESSAGES/messages.po
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
trunk/locale/et_EE.utf8/LC_MESSAGES/messages.mo
trunk/locale/et_EE.utf8/LC_MESSAGES/messages.po
trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.mo
trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.po
trunk/locale/fr_CA.utf8/LC_MESSAGES/messages.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/lv_LV.utf8/LC_MESSAGES/messages.mo
trunk/locale/lv_LV.utf8/LC_MESSAGES/messages.po
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/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-05-10 04:54:12 UTC (rev 7296)
+++ trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po 2015-05-10 17:38:55 UTC (rev 7297)
@@ -1,13 +1,13 @@
# webERP - Arabic Translation File.
# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the web-erp package.
+# This file is distributed under the same license as the webERP package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
#
msgid ""
msgstr ""
-"Project-Id-Version: webERP 4.11.5\n"
+"Project-Id-Version: webERP 4.12.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-24 17:34-0600\n"
+"POT-Creation-Date: 2015-05-10 11:26-0600\n"
"PO-Revision-Date: 2013-06-01 11:19-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: Arabic <ar...@li...>\n"
@@ -158,14 +158,14 @@
#: AccountGroups.php:213 AccountGroups.php:248 AccountSections.php:130
#: Areas.php:115 Areas.php:124 BankAccounts.php:165 CreditStatus.php:125
#: Currencies.php:247 Currencies.php:255 Currencies.php:263
-#: CustomerBranches.php:301 CustomerBranches.php:311 CustomerBranches.php:321
-#: CustomerBranches.php:331 CustomerBranches.php:341 CustomerTypes.php:146
+#: 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:79 GLAccounts.php:95
-#: Locations.php:265 Locations.php:273 Locations.php:284 Locations.php:293
-#: Locations.php:302 Locations.php:311 Locations.php:320 Locations.php:329
-#: Locations.php:337 MRPDemandTypes.php:87 Manufacturers.php:154
+#: 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:154
#: PaymentMethods.php:143 PaymentTerms.php:146 PaymentTerms.php:153
#: PcExpenses.php:161 SalesCategories.php:128 SalesCategories.php:135
#: SalesPeople.php:159 SalesPeople.php:166 SalesPeople.php:172
@@ -241,10 +241,10 @@
#: GLBudgets.php:32 GLJournal.php:250 GLJournalInquiry.php:11
#: HistoricalTestResults.php:42 InternalStockRequest.php:311
#: InventoryPlanning.php:459 InventoryPlanningPrefSupplier.php:386
-#: MRPReport.php:516 MaintenanceTasks.php:14 MaintenanceUserSchedule.php:16
+#: MRPReport.php:544 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:148
+#: PO_AuthorisationLevels.php:10 PO_SelectOSPurchOrder.php:153
#: PcAssignCashToTab.php:59 PcAssignCashToTab.php:133
#: PcAssignCashToTab.php:149 PcAssignCashToTab.php:193 PriceMatrix.php:16
#: Prices.php:11 PricesBasedOnMarkUp.php:8 Prices_Customer.php:35
@@ -256,7 +256,7 @@
#: SelectCompletedOrder.php:11 SelectContract.php:69 SelectCreditItems.php:220
#: SelectCreditItems.php:291 SelectCustomer.php:266 SelectGLAccount.php:65
#: SelectOrderItems.php:559 SelectOrderItems.php:1467
-#: SelectOrderItems.php:1567 SelectProduct.php:510 SelectQASamples.php:45
+#: SelectOrderItems.php:1567 SelectProduct.php:502 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
@@ -270,7 +270,7 @@
#: TestPlanResults.php:27 TopItems.php:118 UnitsOfMeasure.php:10
#: WWW_Users.php:34 WhereUsedInquiry.php:18 WorkCentres.php:111
#: WorkCentres.php:163 WorkOrderCosting.php:22 WorkOrderEntry.php:11
-#: WorkOrderIssue.php:22 WorkOrderReceive.php:31 WorkOrderStatus.php:58
+#: WorkOrderIssue.php:22 WorkOrderReceive.php:34 WorkOrderStatus.php:58
#: Z_BottomUpCosts.php:57 ../webSHOP/includes/header.php:251
msgid "Search"
msgstr "إبحث"
@@ -299,50 +299,50 @@
#: CompanyPreferences.php:440 CompanyPreferences.php:442
#: CompanyPreferences.php:455 CompanyPreferences.php:457
#: ContractCosting.php:202 Currencies.php:333 Currencies.php:511
-#: Currencies.php:513 CustomerBranches.php:451 Customers.php:659
+#: Currencies.php:513 CustomerBranches.php:452 Customers.php:659
#: Customers.php:1049 Customers.php:1055 Customers.php:1058
-#: DailyBankTransactions.php:147 DeliveryDetails.php:1155
-#: DeliveryDetails.php:1198 DeliveryDetails.php:1201 FormDesigner.php:101
+#: DailyBankTransactions.php:156 DeliveryDetails.php:1159
+#: DeliveryDetails.php:1202 DeliveryDetails.php:1205 FormDesigner.php:101
#: GLTransInquiry.php:74 Labels.php:601 Labels.php:603 Labels.php:628
-#: Locations.php:646 Locations.php:648 Locations.php:661 Locations.php:663
-#: 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:600 PDFWOPrint.php:604
-#: PO_AuthorisationLevels.php:134 PO_AuthorisationLevels.php:139
-#: PO_Header.php:807 PO_PDFPurchOrder.php:413 PO_PDFPurchOrder.php:416
-#: PaymentMethods.php:206 PaymentMethods.php:207 PaymentMethods.php:208
-#: PaymentMethods.php:209 PaymentMethods.php:275 PaymentMethods.php:282
-#: PaymentMethods.php:289 PaymentMethods.php:296 PcAuthorizeExpenses.php:248
-#: 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:264
-#: SalesCategories.php:351 SalesCategories.php:355 SalesPeople.php:227
-#: SalesPeople.php:367 SalesPeople.php:369 SelectProduct.php:237
-#: SelectProduct.php:362 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:922 StockClone.php:924
-#: StockClone.php:947 StockClone.php:949 Stocks.php:1256 Stocks.php:1258
-#: Stocks.php:1281 Stocks.php:1283 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
+#: Locations.php:446 Locations.php:668 Locations.php:670 Locations.php:683
+#: Locations.php:685 Locations.php:701 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:600
+#: PDFWOPrint.php:604 PO_AuthorisationLevels.php:134
+#: PO_AuthorisationLevels.php:139 PO_Header.php:807 PO_PDFPurchOrder.php:413
+#: PO_PDFPurchOrder.php:416 PaymentMethods.php:206 PaymentMethods.php:207
+#: PaymentMethods.php:208 PaymentMethods.php:209 PaymentMethods.php:275
+#: PaymentMethods.php:282 PaymentMethods.php:289 PaymentMethods.php:296
+#: PcAuthorizeExpenses.php:248 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:264 SalesCategories.php:351
+#: SalesCategories.php:355 SalesPeople.php:227 SalesPeople.php:367
+#: SalesPeople.php:369 SelectProduct.php:229 SelectProduct.php:354
+#: 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:922 StockClone.php:924 StockClone.php:947 StockClone.php:949
+#: Stocks.php:1256 Stocks.php:1258 Stocks.php:1281 Stocks.php:1283
+#: 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
@@ -363,16 +363,16 @@
#: CompanyPreferences.php:439 CompanyPreferences.php:443
#: CompanyPreferences.php:454 CompanyPreferences.php:458
#: ContractCosting.php:200 Currencies.php:335 Currencies.php:516
-#: Currencies.php:518 CustomerBranches.php:451 Customers.php:658
+#: Currencies.php:518 CustomerBranches.php:452 Customers.php:658
#: Customers.php:1047 Customers.php:1054 Customers.php:1057
-#: DailyBankTransactions.php:149 DeliveryDetails.php:1156
-#: DeliveryDetails.php:1199 DeliveryDetails.php:1202 FormDesigner.php:99
+#: DailyBankTransactions.php:158 DeliveryDetails.php:1160
+#: DeliveryDetails.php:1203 DeliveryDetails.php:1206 FormDesigner.php:99
#: GLTransInquiry.php:93 Labels.php:600 Labels.php:604 Labels.php:629
-#: Locations.php:651 Locations.php:653 Locations.php:666 Locations.php:668
-#: 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:601
-#: PDFWOPrint.php:605 PO_AuthorisationLevels.php:136
+#: Locations.php:446 Locations.php:673 Locations.php:675 Locations.php:688
+#: Locations.php:690 Locations.php:702 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:601 PDFWOPrint.php:605 PO_AuthorisationLevels.php:136
#: PO_AuthorisationLevels.php:141 PO_Header.php:806 PO_PDFPurchOrder.php:414
#: PO_PDFPurchOrder.php:417 PaymentMethods.php:206 PaymentMethods.php:207
#: PaymentMethods.php:208 PaymentMethods.php:209 PaymentMethods.php:276
@@ -392,8 +392,8 @@
#: 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:426 SelectQASamples.php:523
+#: SalesPeople.php:372 SalesPeople.php:374 SelectProduct.php:231
+#: SelectProduct.php:356 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
@@ -425,13 +425,13 @@
#: AddCustomerNotes.php:137 AddCustomerTypeNotes.php:131 Areas.php:164
#: BOMs.php:157 BankAccounts.php:243 COGSGLPostings.php:112
#: COGSGLPostings.php:219 CreditStatus.php:175 Currencies.php:365
-#: Currencies.php:382 CustItem.php:166 CustomerBranches.php:455
+#: Currencies.php:382 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:317 GLTags.php:96 GeocodeSetup.php:173
#: ImportBankTransAnalysis.php:223 InternalStockRequest.php:293 Labels.php:333
-#: Labels.php:358 Locations.php:420 MRPDemandTypes.php:120 MRPDemands.php:309
+#: Labels.php:358 Locations.php:439 MRPDemandTypes.php:120 MRPDemands.php:309
#: MailingGroupMaintenance.php:178 MaintenanceTasks.php:118
#: Manufacturers.php:217 PO_AuthorisationLevels.php:151 PaymentMethods.php:210
#: PaymentTerms.php:205 PcAssignCashToTab.php:277
@@ -464,17 +464,17 @@
#: BOMs.php:159 BankAccounts.php:244 COGSGLPostings.php:113
#: COGSGLPostings.php:220 ContractBOM.php:272 ContractOtherReqts.php:124
#: CounterReturns.php:740 CounterSales.php:836 CreditStatus.php:176
-#: Credit_Invoice.php:410 Currencies.php:368 CustItem.php:167
+#: Credit_Invoice.php:409 Currencies.php:368 CustItem.php:167
#: CustomerReceipt.php:989 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:318 GLJournal.php:430 GLTags.php:97 GeocodeSetup.php:174
#: ImportBankTransAnalysis.php:224 InternalStockCategoriesByRole.php:184
#: InternalStockRequest.php:294 Labels.php:334 Labels.php:359 Labels.php:607
-#: Locations.php:421 MRPDemandTypes.php:121 MRPDemands.php:310
+#: Locations.php:440 MRPDemandTypes.php:121 MRPDemands.php:310
#: MailingGroupMaintenance.php:179 MaintenanceTasks.php:119
#: Manufacturers.php:218 PO_AuthorisationLevels.php:153 PO_Items.php:768
-#: PaymentMethods.php:211 PaymentTerms.php:206 Payments.php:1103
+#: PaymentMethods.php:211 PaymentTerms.php:206 Payments.php:1112
#: PcAssignCashToTab.php:281 PcClaimExpensesFromTab.php:277 PcExpenses.php:227
#: PcExpensesTypeTab.php:187 PcTabs.php:237 PcTypeTabs.php:181
#: PriceMatrix.php:286 Prices.php:254 Prices_Customer.php:287
@@ -486,7 +486,7 @@
#: SelectCustomer.php:616 SelectCustomer.php:635 SelectCustomer.php:665
#: SelectCustomer.php:683 SelectCustomer.php:707 SelectCustomer.php:724
#: SelectOrderItems.php:1379 SelectQASamples.php:418
-#: SellThroughSupport.php:299 Shipments.php:440 Shippers.php:145
+#: 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:90 SuppInvGRNs.php:147 SuppShiptChgs.php:90
@@ -567,7 +567,7 @@
#: Departments.php:258 DiscountMatrix.php:142 EDIMessageFormat.php:248
#: FixedAssetCategories.php:350 FixedAssetLocations.php:161
#: FreightCosts.php:371 GLAccounts.php:265 GeocodeSetup.php:271 Labels.php:641
-#: Locations.php:680 MRPDemandTypes.php:188 MRPDemands.php:424
+#: Locations.php:714 MRPDemandTypes.php:188 MRPDemands.php:424
#: Manufacturers.php:312 OffersReceived.php:57 OffersReceived.php:146
#: PO_AuthorisationLevels.php:264 PaymentMethods.php:302 PaymentTerms.php:310
#: PriceMatrix.php:230 Prices_Customer.php:369 ProductSpecs.php:661
@@ -674,7 +674,7 @@
#: AddCustomerContacts.php:59 AddCustomerNotes.php:51
#: AddCustomerTypeNotes.php:48 Areas.php:72 CustomerTypes.php:68
-#: DeliveryDetails.php:806 DeliveryDetails.php:823 Factors.php:105
+#: DeliveryDetails.php:809 DeliveryDetails.php:826 Factors.php:105
#: FixedAssetItems.php:250 MRPCalendar.php:176 PO_Items.php:380
#: PcAssignCashToTab.php:91 PcClaimExpensesFromTab.php:82 PcExpenses.php:98
#: PcTabs.php:104 PcTypeTabs.php:63 ProductSpecs.php:315 QATests.php:76
@@ -693,7 +693,7 @@
msgstr ""
#: AddCustomerContacts.php:126 CompanyPreferences.php:173
-#: CustomerBranches.php:408 Customers.php:1118 Customers.php:1126
+#: CustomerBranches.php:409 Customers.php:1118 Customers.php:1126
#: ImportBankTransAnalysis.php:207 PrintWOItemSlip.php:184
#: PrintWOItemSlip.php:195 PrintWOItemSlip.php:206 ProductSpecs.php:164
#: ProductSpecs.php:385 QATests.php:391 SalesPeople.php:208
@@ -715,19 +715,20 @@
msgstr ""
#: AddCustomerContacts.php:129 AddCustomerContacts.php:241
-#: CustomerAccount.php:345 CustomerBranches.php:414 CustomerBranches.php:849
-#: CustomerInquiry.php:432 CustomerInquiry.php:474 Customers.php:1121
-#: Customers.php:1129 EmailCustTrans.php:15 EmailCustTrans.php:64
-#: Factors.php:246 Factors.php:297 Locations.php:616 OrderDetails.php:115
+#: CustomerAccount.php:345 CustomerBranches.php:415 CustomerBranches.php:858
+#: CustomerInquiry.php:324 CustomerInquiry.php:370 CustomerInquiry.php:409
+#: CustomerInquiry.php:444 CustomerInquiry.php:490 Customers.php:1121
+#: Customers.php:1129 EmailCustTrans.php:16 EmailCustTrans.php:65
+#: Factors.php:246 Factors.php:297 Locations.php:638 OrderDetails.php:115
#: PDFRemittanceAdvice.php:251 PDFWOPrint.php:591 PDFWOPrint.php:594
#: PDFWOPrint.php:674 PDFWOPrint.php:677 PO_PDFPurchOrder.php:400
-#: PO_PDFPurchOrder.php:403 PrintCustTrans.php:748 PrintCustTrans.php:979
-#: PrintCustTrans.php:1028 PrintCustTransPortrait.php:793
-#: PrintCustTransPortrait.php:1039 PrintCustTransPortrait.php:1095
-#: SelectCustomer.php:428 SelectCustomer.php:613 SelectSupplier.php:288
-#: SupplierContacts.php:156 SupplierContacts.php:277 UserSettings.php:184
-#: WWW_Users.php:304 includes/PDFPickingListHeader.inc:25
-#: includes/PDFStatementPageHeader.inc:67 includes/PDFTransPageHeader.inc:85
+#: PO_PDFPurchOrder.php:403 PrintCustTrans.php:740
+#: PrintCustTransPortrait.php:793 PrintCustTransPortrait.php:1039
+#: PrintCustTransPortrait.php:1095 SelectCustomer.php:428
+#: SelectCustomer.php:613 SelectSupplier.php:288 SupplierContacts.php:156
+#: SupplierContacts.php:277 UserSettings.php:184 WWW_Users.php:304
+#: includes/PDFPickingListHeader.inc:25 includes/PDFStatementPageHeader.inc:67
+#: includes/PDFTransPageHeader.inc:85
#: includes/PDFTransPageHeaderPortrait.inc:114 includes/PDFWOPageHeader.inc:19
#: includes/PO_PDFOrderPageHeader.inc:29 ../webSHOP/Checkout.php:298
#: ../webSHOP/Register.php:595
@@ -808,21 +809,22 @@
#: AddCustomerNotes.php:117 AddCustomerNotes.php:222
#: AddCustomerTypeNotes.php:111 AddCustomerTypeNotes.php:211
#: AgedControlledInventory.php:47 BankMatching.php:281
-#: BankReconciliation.php:217 BankReconciliation.php:294
+#: BankReconciliation.php:212 BankReconciliation.php:289
#: ContractCosting.php:177 CustomerAccount.php:248 CustomerAllocations.php:348
#: CustomerAllocations.php:378 CustomerInquiry.php:251
#: CustomerTransInquiry.php:100 GLAccountInquiry.php:173
-#: GLAccountReport.php:343 GLTransInquiry.php:47 MRPCalendar.php:219
-#: PDFRemittanceAdvice.php:308 PDFWOPrint.php:448 PaymentAllocations.php:66
-#: PcAssignCashToTab.php:238 PcAuthorizeExpenses.php:93 PrintCustTrans.php:856
+#: GLAccountReport.php:343 GLTransInquiry.php:47 GoodsReceived.php:109
+#: MRPCalendar.php:219 PDFRemittanceAdvice.php:308 PDFWOPrint.php:448
+#: PaymentAllocations.php:66 PcAssignCashToTab.php:238
+#: PcAuthorizeExpenses.php:93 PrintCustTrans.php:822
#: PrintCustTransPortrait.php:907 PrintWOItemSlip.php:186
#: PrintWOItemSlip.php:197 PrintWOItemSlip.php:208 ReverseGRN.php:398
#: SelectCustomer.php:660 SelectCustomer.php:702 ShipmentCosting.php:538
-#: ShipmentCosting.php:615 Shipments.php:491 StockDispatch.php:277
+#: ShipmentCosting.php:615 Shipments.php:489 StockDispatch.php:277
#: StockDispatch.php:288 StockDispatch.php:299 StockLocMovements.php:92
#: StockMovements.php:100 StockSerialItemResearch.php:82
#: SupplierAllocations.php:456 SupplierAllocations.php:569
-#: SupplierAllocations.php:644 SupplierInquiry.php:209
+#: SupplierAllocations.php:644 SupplierInquiry.php:210
#: SupplierTransInquiry.php:105 Tax.php:408
#: includes/PDFQuotationPageHeader.inc:23
#: includes/PDFQuotationPortraitPageHeader.inc:80
@@ -930,16 +932,15 @@
msgstr ""
#: AgedControlledInventory.php:12 InventoryQuantities.php:155
-#: InventoryValuation.php:217 Locations.php:392 Locations.php:453 MRP.php:542
-#: MRPCalendar.php:21 MRPCreateDemands.php:197 MRPDemandTypes.php:17
-#: MRPDemands.php:27 MRPPlannedPurchaseOrders.php:265
-#: MRPPlannedWorkOrders.php:247 MRPPlannedWorkOrders.php:321
-#: PricesByCost.php:8 ReorderLevel.php:194 ReorderLevelLocation.php:12
-#: SelectProduct.php:88 StockDispatch.php:319 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:15
-#: includes/MainMenuLinksArray.php:26
+#: InventoryValuation.php:217 Locations.php:12 MRP.php:542 MRPCalendar.php:21
+#: MRPCreateDemands.php:197 MRPDemandTypes.php:17 MRPDemands.php:27
+#: MRPPlannedPurchaseOrders.php:265 MRPPlannedWorkOrders.php:247
+#: MRPPlannedWorkOrders.php:321 PricesByCost.php:8 ReorderLevel.php:194
+#: ReorderLevelLocation.php:12 SelectProduct.php:89 StockDispatch.php:319
+#: 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:15 includes/MainMenuLinksArray.php:26
#: reportwriter/languages/en_US/reports.php:243
msgid "Inventory"
msgstr ""
@@ -970,12 +971,12 @@
#: InventoryPlanning.php:419 InventoryQuantities.php:246
#: InventoryValuation.php:197 Labels.php:290 MRPDemandTypes.php:113
#: MRPDemands.php:92 MRPDemands.php:295 MRPPlannedWorkOrders.php:258
-#: MRPReport.php:536 MRPReport.php:750 MRPReschedules.php:192
+#: MRPReport.php:564 MRPReport.php:778 MRPReschedules.php:192
#: MRPShortages.php:350 MaintenanceTasks.php:95 MaintenanceUserSchedule.php:50
#: MaterialsNotUsed.php:35 NoSalesItems.php:194 PDFCOA.php:64
#: PDFOrderStatus.php:337 PDFOrdersInvoiced.php:335
#: PDFSalesBySalesperson.php:86 PDFWeeklyOrders.php:82 PO_Items.php:716
-#: PO_Items.php:1187 PO_SelectOSPurchOrder.php:263 PO_SelectPurchOrder.php:214
+#: PO_Items.php:1189 PO_SelectOSPurchOrder.php:308 PO_SelectPurchOrder.php:214
#: PaymentTerms.php:182 PcExpenses.php:190 PcExpenses.php:296
#: PcExpensesTypeTab.php:171 PcReportTab.php:178 PcTypeTabs.php:164
#: PricesByCost.php:153 RelatedItemsUpdate.php:154 ReorderLevel.php:298
@@ -983,7 +984,7 @@
#: SecurityTokens.php:94 SecurityTokens.php:103 SecurityTokens.php:120
#: SelectAsset.php:264 SelectCompletedOrder.php:505 SelectContract.php:147
#: SelectCreditItems.php:1021 SelectOrderItems.php:1477
-#: SelectOrderItems.php:1639 SelectProduct.php:530 SelectProduct.php:756
+#: SelectOrderItems.php:1639 SelectProduct.php:522 SelectProduct.php:748
#: 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
@@ -1026,14 +1027,14 @@
msgid "Days Old"
msgstr ""
-#: AgedControlledInventory.php:91 ConfirmDispatch_Invoice.php:305
-#: ConfirmDispatch_Invoice.php:309 CounterReturns.php:676
+#: AgedControlledInventory.php:91 ConfirmDispatch_Invoice.php:309
+#: ConfirmDispatch_Invoice.php:313 CounterReturns.php:676
#: CounterReturns.php:756 CounterSales.php:759 CounterSales.php:853
-#: CounterSales.php:855 Credit_Invoice.php:299 Credit_Invoice.php:303
+#: CounterSales.php:855 Credit_Invoice.php:298 Credit_Invoice.php:302
#: CustomerAllocations.php:349 CustomerAllocations.php:379
-#: CustomerInquiry.php:256 DeliveryDetails.php:881 DeliveryDetails.php:950
-#: GLBalanceSheet.php:194 GLBalanceSheet.php:206 GLBalanceSheet.php:296
-#: GLBalanceSheet.php:305 GLBudgets.php:213 GLJournal.php:435
+#: CustomerInquiry.php:256 DeliveryDetails.php:884 DeliveryDetails.php:953
+#: GLBalanceSheet.php:195 GLBalanceSheet.php:207 GLBalanceSheet.php:297
+#: GLBalanceSheet.php:306 GLBudgets.php:213 GLJournal.php:435
#: GLTransInquiry.php:195 GLTrialBalance.php:223 GLTrialBalance.php:243
#: GLTrialBalance.php:264 GLTrialBalance.php:360 GLTrialBalance.php:491
#: GLTrialBalance.php:511 GLTrialBalance.php:535 GLTrialBalance.php:647
@@ -1049,7 +1050,7 @@
#: SuppContractChgs.php:107 SuppFixedAssetChgs.php:97 SuppShiptChgs.php:97
#: SuppTransGLAnalysis.php:139 SupplierAllocations.php:458
#: SupplierAllocations.php:570 SupplierAllocations.php:645
-#: SupplierCredit.php:407 SupplierInquiry.php:214 Tax.php:250
+#: SupplierCredit.php:407 SupplierInquiry.php:215 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:109
@@ -1077,8 +1078,8 @@
#: AgedDebtors.php:267 AgedDebtors.php:369 AgedDebtors.php:434
#: AgedSuppliers.php:108 BOMExtendedQty.php:154 BOMIndented.php:153
#: BOMIndentedReverse.php:140 BOMListing.php:42 BOMListing.php:53
-#: DebtorsAtPeriodEnd.php:57 DebtorsAtPeriodEnd.php:69 GLBalanceSheet.php:111
-#: GLBalanceSheet.php:150 GLProfit_Loss.php:187 GLTagProfit_Loss.php:194
+#: DebtorsAtPeriodEnd.php:57 DebtorsAtPeriodEnd.php:69 GLBalanceSheet.php:112
+#: GLBalanceSheet.php:151 GLProfit_Loss.php:187 GLTagProfit_Loss.php:194
#: GLTrialBalance.php:165 InternalStockRequest.php:320
#: InventoryPlanning.php:99 InventoryPlanning.php:176
#: InventoryPlanning.php:213 InventoryPlanning.php:262
@@ -1086,7 +1087,7 @@
#: InventoryPlanningPrefSupplier.php:268 InventoryPlanningPrefSupplier.php:301
#: InventoryQuantities.php:84 InventoryValuation.php:64
#: MRPPlannedPurchaseOrders.php:114 MRPPlannedWorkOrders.php:106
-#: MRPReport.php:147 MRPReport.php:508 MRPReschedules.php:45
+#: MRPReport.php:147 MRPReport.php:536 MRPReschedules.php:45
#: MRPReschedules.php:57 MRPShortages.php:155 MRPShortages.php:167
#: MailInventoryValuation.php:22 MailInventoryValuation.php:120
#: MailSalesReport.php:23 MailSalesReport_csv.php:30 OutstandingGRNs.php:46
@@ -1097,7 +1098,7 @@
#: PDFWeeklyOrders.php:15 PurchaseByPrefSupplier.php:399
#: PurchaseByPrefSupplier.php:447 PurchaseByPrefSupplier.php:471
#: PurchaseByPrefSupplier.php:500 PurchaseByPrefSupplier.php:531
-#: ReorderLevel.php:60 SelectAsset.php:39 SelectProduct.php:44
+#: ReorderLevel.php:60 SelectAsset.php:39 SelectProduct.php:45
#: StockCheck.php:60 StockCheck.php:132 SuppPriceList.php:138
#: SupplierTenderCreate.php:671 SupplierTenders.php:397
#: includes/PDFPaymentRun_PymtFooter.php:152
@@ -1115,9 +1116,9 @@
#: BOMExtendedQty.php:244 BOMIndented.php:156 BOMIndented.php:237
#: BOMIndentedReverse.php:144 BOMIndentedReverse.php:222 BOMListing.php:45
#: Credit_Invoice.php:201 Dashboard.php:146 Dashboard.php:257
-#: Dashboard.php:437 DebtorsAtPeriodEnd.php:60 DebtorsAtPeriodEnd.php:72
-#: FTP_RadioBeacon.php:187 GLBalanceSheet.php:115 GLBalanceSheet.php:153
-#: GLBalanceSheet.php:332 GLProfit_Loss.php:190 GLProfit_Loss.php:202
+#: Dashboard.php:438 DebtorsAtPeriodEnd.php:60 DebtorsAtPeriodEnd.php:72
+#: FTP_RadioBeacon.php:187 GLBalanceSheet.php:116 GLBalanceSheet.php:154
+#: GLBalanceSheet.php:333 GLProfit_Loss.php:190 GLProfit_Loss.php:202
#: GLTagProfit_Loss.php:198 GLTagProfit_Loss.php:211 GLTrialBalance.php:168
#: GLTrialBalance.php:180 GetStockImage.php:150 InventoryPlanning.php:102
#: InventoryPlanning.php:179 InventoryPlanning.php:216
@@ -1178,19 +1179,19 @@
#: PO_Items.php:451 PO_Items.php:580 PO_Items.php:605
#: PurchaseByPrefSupplier.php:29 PurchaseByPrefSupplier.php:54
#: SalesAnalReptCols.php:365 SpecialOrder.php:448
-#: StockLocTransferReceive.php:400 StockQuantityByDate.php:124
+#: StockLocTransferReceive.php:485 StockQuantityByDate.php:124
#: includes/SelectOrderItems_IntoCart.inc:55
msgid "could not be retrieved because"
msgstr ""
#: AgedDebtors.php:374 AgedSuppliers.php:200 Areas.php:94
-#: ConfirmDispatch_Invoice.php:172 ConfirmDispatch_Invoice.php:1001
-#: ConfirmDispatch_Invoice.php:1015 Contracts.php:592 CounterReturns.php:1024
+#: ConfirmDispatch_Invoice.php:172 ConfirmDispatch_Invoice.php:1005
+#: ConfirmDispatch_Invoice.php:1019 Contracts.php:592 CounterReturns.php:1024
#: CounterReturns.php:1038 CounterSales.php:1425 CounterSales.php:1439
-#: Credit_Invoice.php:754 Credit_Invoice.php:775 CustItem.php:73
+#: Credit_Invoice.php:753 Credit_Invoice.php:774 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
+#: Dashboard.php:259 Dashboard.php:440 DeliveryDetails.php:412
#: GLProfit_Loss.php:611 GLTagProfit_Loss.php:515 PDFRemittanceAdvice.php:85
#: Payments.php:361 PurchData.php:114 PurchData.php:132 PurchData.php:360
#: RecurringSalesOrders.php:267 ReverseGRN.php:192 ReverseGRN.php:206
@@ -1198,13 +1199,15 @@
#: SelectSalesOrder.php:209 SelectSalesOrder.php:375 SellThroughSupport.php:81
#: SellThroughSupport.php:97 StockCheck.php:217 StockClone.php:430
#: StockClone.php:504 StockCostUpdate.php:78 StockCostUpdate.php:88
-#: StockLocStatus.php:165 StockMovements.php:93 StockQuantityByDate.php:98
-#: StockReorderLevel.php:45 StockStatus.php:285 StockTransfers.php:201
+#: StockLocStatus.php:165 StockLocTransferReceive.php:217
+#: StockLocTransferReceive.php:372 StockMovements.php:93
+#: StockQuantityByDate.php:98 StockReorderLevel.php:45 StockStatus.php:285
+#: StockTransfers.php:202 StockTransfers.php:233 StockTransfers.php:390
#: StockUsage.php:142 StockUsageGraph.php:55 SuppPaymentRun.php:114
-#: SuppPaymentRun.php:188 SuppPaymentRun.php:219 SupplierInquiry.php:78
-#: SupplierInquiry.php:100 SupplierInquiry.php:138 SupplierInquiry.php:194
+#: SuppPaymentRun.php:188 SuppPaymentRun.php:219 SupplierInquiry.php:79
+#: SupplierInquiry.php:101 SupplierInquiry.php:139 SupplierInquiry.php:195
#: SupplierPriceList.php:382 SupplierTransInquiry.php:97 WOSerialNos.php:49
-#: WorkOrderCosting.php:427 WorkOrderReceive.php:298
+#: WorkOrderCosting.php:427 WorkOrderReceive.php:305
#: Z_ChangeBranchCode.php:112 Z_ChangeCustomerCode.php:97
#: Z_ChangeSupplierCode.php:88 Z_DeleteCreditNote.php:63
#: Z_DeleteCreditNote.php:73 Z_DeleteCreditNote.php:82 Z_DeleteInvoice.php:88
@@ -1293,7 +1296,7 @@
#: MRPPlannedWorkOrders.php:348 MRPReschedules.php:153 MRPShortages.php:303
#: OutstandingGRNs.php:280 PDFCustomerList.php:421 PDFLowGP.php:146
#: PDFPriceList.php:351 PDFRemittanceAdvice.php:175
-#: PDFStockCheckComparison.php:373 PrintCustTrans.php:570
+#: PDFStockCheckComparison.php:373 PrintCustTrans.php:564
#: PrintCustTransPortrait.php:614 ReorderLevel.php:259 StockDispatch.php:447
#: SuppPriceList.php:263 SupplierBalsAtPeriodEnd.php:159 Tax.php:385
msgid "Print PDF"
@@ -1429,7 +1432,7 @@
#: Areas.php:131 CustomerTypes.php:167 Factors.php:140
#: FixedAssetCategories.php:142 GLAccounts.php:196
-#: InternalStockCategoriesByRole.php:102 Locations.php:366 MRPDemands.php:250
+#: InternalStockCategoriesByRole.php:102 Locations.php:380 MRPDemands.php:250
#: Manufacturers.php:163 PcAssignCashToTab.php:138
#: PcClaimExpensesFromTab.php:130 PcExpenses.php:169 PcExpensesTypeTab.php:101
#: PcTabs.php:168 PcTypeTabs.php:143 SalesAnalReptCols.php:215
@@ -1492,16 +1495,18 @@
#: DailySalesInquiry.php:52 DailySalesInquiry.php:54 FixedAssetRegister.php:59
#: FixedAssetRegister.php:68 InventoryQuantities.php:168
#: InventoryQuantities.php:194 InventoryQuantities.php:196 MRP.php:619
-#: MRPReport.php:524 MRPReport.php:526 MRPReschedules.php:145
+#: MRPReport.php:552 MRPReport.php:554 MRPReschedules.php:145
#: NoSalesItems.php:22 NoSalesItems.php:50 NoSalesItems.php:70
#: NoSalesItems.php:72 PDFPeriodStockTransListing.php:58 PDFPriceList.php:225
-#: PDFPriceList.php:324 POReport.php:1586 PO_Items.php:1124
+#: PDFPriceList.php:324 POReport.php:1600 PO_Items.php:1126
+#: PO_SelectOSPurchOrder.php:185 PO_SelectOSPurchOrder.php:195
+#: PO_SelectOSPurchOrder.php:208 PO_SelectOSPurchOrder.php:276
#: ReorderLevel.php:212 ReorderLevel.php:214 ReorderLevel.php:244
#: ReorderLevel.php:246 SalesGraph.php:103 SalesGraph.php:105
#: SalesGraph.php:125 SalesGraph.php:127 SalesGraph.php:149 SalesGraph.php:151
-#: SalesGraph.php:187 SalesInquiry.php:1095 SalesInquiry.php:1158
+#: SalesGraph.php:187 SalesInquiry.php:1096 SalesInquiry.php:1159
#: SelectCreditItems.php:985 SelectOrderItems.php:1575
-#: SelectOrderItems.php:1578 SelectProduct.php:518 SelectProduct.php:520
+#: SelectOrderItems.php:1578 SelectProduct.php:510 SelectProduct.php:512
#: StockCategorySalesInquiry.php:35 StockCategorySalesInquiry.php:37
#: StockDispatch.php:82 StockDispatch.php:394 StockDispatch.php:396
#: StockLocStatus.php:72 StockLocStatus.php:74 StockLocStatus.php:92
@@ -1528,8 +1533,8 @@
msgstr ""
#: AuditTrail.php:90 InternalStockRequest.php:593 LocationUsers.php:176
-#: MRPReport.php:779 PO_SelectPurchOrder.php:432 SelectContract.php:187
-#: SelectProduct.php:791 UserLocations.php:177
+#: MRPReport.php:807 PO_SelectPurchOrder.php:432 SelectContract.php:187
+#: SelectProduct.php:783 UserLocations.php:177
msgid "View"
msgstr ""
@@ -1544,16 +1549,16 @@
msgid "User"
msgstr ""
-#: AuditTrail.php:177 BankReconciliation.php:218 BankReconciliation.php:295
+#: AuditTrail.php:177 BankReconciliation.php:213 BankReconciliation.php:290
#: CustWhereAlloc.php:21 CustWhereAlloc.php:111 CustomerAccount.php:246
#: CustomerAllocations.php:376 CustomerInquiry.php:249
#: CustomerPurchases.php:82 CustomerTransInquiry.php:21
-#: CustomerTransInquiry.php:98 DailyBankTransactions.php:129
+#: CustomerTransInquiry.php:98 DailyBankTransactions.php:137
#: GLAccountInquiry.php:171 GLAccountReport.php:341 GLJournal.php:266
#: MRPReschedules.php:194 ProductSpecs.php:388 QATests.php:257 QATests.php:395
#: SalesByTypePeriodInquiry.php:356 SelectCustomer.php:425
#: ShipmentCosting.php:536 ShipmentCosting.php:613 StockLocMovements.php:90
-#: StockMovements.php:98 SupplierAllocations.php:454 SupplierInquiry.php:210
+#: StockMovements.php:98 SupplierAllocations.php:454 SupplierInquiry.php:211
#: SupplierTransInquiry.php:20 SupplierTransInquiry.php:102 Tax.php:409
#: Z_CheckAllocationsFrom.php:32 Z_CheckAllocationsFrom.php:57
#: Z_CheckAllocs.php:62 Z_CheckGLTransBalance.php:11
@@ -1579,7 +1584,7 @@
msgid "Value"
msgstr ""
-#: AutomaticTranslationDescriptions.php:5 includes/MainMenuLinksArray.php:555
+#: AutomaticTranslationDescriptions.php:5 includes/MainMenuLinksArray.php:557
msgid "Translate Item Descriptions"
msgstr ""
@@ -1595,17 +1600,17 @@
#: AutomaticTranslationDescriptions.php:36 BOMInquiry.php:108 BOMs.php:566
#: BOMs.php:913 ContractBOM.php:353 CounterReturns.php:1691
#: CounterSales.php:2101 CounterSales.php:2255 CustItem.php:297
-#: CustomerBranches.php:407 CustomerReceipt.php:1200 GLCodesInquiry.php:26
+#: CustomerBranches.php:408 CustomerReceipt.php:1200 GLCodesInquiry.php:26
#: InternalStockRequest.php:558 InternalStockRequest.php:628 MRPDemands.php:91
-#: MRPPlannedWorkOrders.php:257 MRPReport.php:749 MaterialsNotUsed.php:34
+#: MRPPlannedWorkOrders.php:257 MRPReport.php:777 MaterialsNotUsed.php:34
#: NoSalesItems.php:193 PDFOrderStatus.php:336 PDFOrdersInvoiced.php:334
-#: PO_Header.php:561 PO_Items.php:1186 PO_SelectOSPurchOrder.php:262
+#: PO_Header.php:561 PO_Items.php:1188 PO_SelectOSPurchOrder.php:307
#: PO_SelectPurchOrder.php:213 PricesByCost.php:152 PurchData.php:469
#: RelatedItemsUpdate.php:153 ReorderLevelLocation.php:72
#: RevisionTranslations.php:59 SalesPeople.php:207
#: SelectCompletedOrder.php:504 SelectCreditItems.php:1020
#: SelectCustomer.php:421 SelectGLAccount.php:112 SelectOrderItems.php:1476
-#: SelectOrderItems.php:1638 SelectProduct.php:755 SelectQASamples.php:298
+#: SelectOrderItems.php:1638 SelectProduct.php:747 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 SuppPriceList.php:308 SupplierPriceList.php:270
@@ -1620,10 +1625,10 @@
#: AutomaticTranslationDescriptions.php:38 CustomerTransInquiry.php:52
#: FixedAssetRegister.php:366 GLJournalInquiry.php:28 GLJournalInquiry.php:45
-#: POReport.php:517 POReport.php:1521 PcReportTab.php:269
+#: POReport.php:519 POReport.php:1535 PcReportTab.php:269
#: SalesAnalRepts.php:436 SalesAnalRepts.php:464 SalesAnalRepts.php:493
-#: SalesAnalRepts.php:512 SalesInquiry.php:798 SalesInquiry.php:1106
-#: StockDispatch.php:513 StockLocTransferReceive.php:104
+#: SalesAnalRepts.php:512 SalesInquiry.php:798 SalesInquiry.php:1107
+#: StockDispatch.php:513 StockLocTransferReceive.php:105
#: SupplierTransInquiry.php:53 includes/PO_PDFOrderPageHeader.inc:40
#: reportwriter/languages/en_US/reports.php:105
msgid "To"
@@ -1684,39 +1689,39 @@
#: Contracts.php:994 Contracts.php:1030 CounterReturns.php:669
#: CounterReturns.php:1698 CounterReturns.php:1797 CounterSales.php:749
#: CounterSales.php:2108 CounterSales.php:2262 CounterSales.php:2365
-#: Credit_Invoice.php:296 CustomerPurchases.php:87 DeliveryDetails.php:877
-#: DeliveryDetails.php:947 GoodsReceived.php:102 GoodsReceived.php:106
-#: GoodsReceived.php:109 InternalStockRequest.php:635
+#: Credit_Invoice.php:295 CustomerPurchases.php:87 DeliveryDetails.php:880
+#: DeliveryDetails.php:950 GoodsReceived.php:102 GoodsReceived.php:106
+#: GoodsReceived.php:110 InternalStockRequest.php:635
#: InternalStockRequestFulfill.php:323 InternalStockRequestFulfill.php:324
#: InventoryPlanningPrefSupplier.php:78 InventoryQuantities.php:248
#: MRPDemands.php:297 MRPDemands.php:395 MRPPlannedPurchaseOrders.php:341
-#: MRPPlannedWorkOrders.php:261 MRPPlannedWorkOrders.php:395 MRPReport.php:413
-#: MRPReport.php:419 MRPReschedules.php:195 OffersReceived.php:108
+#: MRPPlannedWorkOrders.php:261 MRPPlannedWorkOrders.php:395 MRPReport.php:441
+#: MRPReport.php:447 MRPReschedules.php:195 OffersReceived.php:108
#: OffersReceived.php:218 OffersReceived.php:278 OrderDetails.php:173
#: 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
-#: RecurringSalesOrders.php:331 ReorderLevel.php:300 ReverseGRN.php:399
-#: ReverseGRN.php:400 SalesAnalReptCols.php:16 SalesAnalReptCols.php:18
-#: SalesGraph.php:197 SalesGraph.php:280 SalesInquiry.php:997
-#: SalesTopCustomersInquiry.php:218 SalesTopItemsInquiry.php:225
-#: SelectCreditItems.php:687 SelectCreditItems.php:1067
-#: SelectOrderItems.php:1307 SelectOrderItems.php:1483
-#: SelectOrderItems.php:1646 SelectOrderItems.php:1750 ShipmentCosting.php:149
-#: ShipmentCosting.php:150 Shipments.php:401 Shipments.php:403
-#: Shipments.php:404 Shipments.php:488 Shipments.php:490 SpecialOrder.php:628
-#: StockCounts.php:143 StockCounts.php:168 StockLocMovements.php:94
-#: StockLocTransfer.php:307 StockMovements.php:104 StockStatus.php:330
-#: StockUsageGraph.php:12 SuppCreditGRNs.php:291 SuppCreditGRNs.php:292
-#: SupplierCredit.php:318 SupplierTenderCreate.php:435
-#: SupplierTenderCreate.php:856 SupplierTenders.php:124
-#: SupplierTenders.php:327 SupplierTenders.php:531 SupplierTenders.php:534
-#: SupplierTenders.php:690 Tax.php:247 WOSerialNos.php:271 WOSerialNos.php:277
-#: WOSerialNos.php:311 WorkOrderReceive.php:967 api/api_xml-rpc.php:2533
-#: api/api_xml-rpc.php:2579 api/api_xml-rpc.php:2775
-#: includes/PDFBOMListingPageHeader.inc:44 includes/PDFDIFOTPageHeader.inc:42
+#: PDFWeeklyOrders.php:83 POReport.php:770 POReport.php:1463
+#: PrintCustTrans.php:859 PrintCustTransPortrait.php:949
+#: PrintCustTransPortrait.php:1047 PrintCustTransPortrait.php:1103
+#: PrintWOItemSlip.php:155 RecurringSalesOrders.php:331 ReorderLevel.php:300
+#: ReverseGRN.php:399 ReverseGRN.php:400 SalesAnalReptCols.php:16
+#: SalesAnalReptCols.php:18 SalesGraph.php:197 SalesGraph.php:280
+#: SalesInquiry.php:998 SalesTopCustomersInquiry.php:218
+#: SalesTopItemsInquiry.php:225 SelectCreditItems.php:687
+#: SelectCreditItems.php:1067 SelectOrderItems.php:1307
+#: SelectOrderItems.php:1483 SelectOrderItems.php:1646
+#: SelectOrderItems.php:1750 ShipmentCosting.php:149 ShipmentCosting.php:150
+#: Shipments.php:399 Shipments.php:401 Shipments.php:402 Shipments.php:486
+#: Shipments.php:488 SpecialOrder.php:628 StockCounts.php:143
+#: StockCounts.php:168 StockLocMovements.php:94 StockLocTransfer.php:307
+#: StockMovements.php:104 StockStatus.php:330 StockUsageGraph.php:12
+#: SuppCreditGRNs.php:291 SuppCreditGRNs.php:292 SupplierCredit.php:318
+#: SupplierTenderCreate.php:435 SupplierTenderCreate.php:856
+#: SupplierTenders.php:124 SupplierTenders.php:327 SupplierTenders.php:531
+#: SupplierTenders.php:534 SupplierTenders.php:690 Tax.php:247
+#: WOSerialNos.php:271 WOSerialNos.php:277 WOSerialNos.php:311
+#: WorkOrderReceive.php:977 api/api_xml-rpc.php:2533 api/api_xml-rpc.php:2579
+#: api/api_xml-rpc.php:2775 includes/PDFBOMListingPageHeader.inc:44
+#: includes/PDFDIFOTPageHeader.inc:42
#: includes/PDFDeliveryDifferencesPageHeader.inc:43
#: includes/PDFInventoryValnPageHeader.inc:33
#: includes/PDFInventoryValnPageHeader.inc:39
@@ -1775,10 +1780,10 @@
#: BOMExtendedQty.php:316 BOMIndented.php:305 BOMIndentedReverse.php:283
#: GLAccountReport.php:327 InventoryPlanningPrefSupplier.php:58
#: InventoryQuantities.php:234 MRPPlannedPurchaseOrders.php:320
-#: MRPPlannedWorkOrders.php:374 MRPReport.php:817 MRPReschedules.php:180
+#: MRPPlannedWorkOrders.php:374 MRPReport.php:845 MRPReschedules.php:180
#: MRPShortages.php:334 PDFOrderStatus.php:323 PDFPriceList.php:395
#: PDFReceipt.php:34 PO_Header.php:848 PO_PDFPurchOrder.php:64
-#: PO_SelectOSPurchOrder.php:545 PrintWOItemSlip.php:142 ReorderLevel.php:283
+#: PO_SelectOSPurchOrder.php:616 PrintWOItemSlip.php:142 ReorderLevel.php:283
#: StockDispatch.php:477 SuppPriceList.php:292
#: includes/PDFAgedDebtorsPageHeader.inc:34
#: includes/PDFAgedSuppliersPageHeader.inc:21
@@ -1815,10 +1820,9 @@
#: FixedAssetRegister.php:367 GLAccountReport.php:327
#: InventoryPlanningPrefSupplier.php:58 InventoryQuantities.php:235
#: MRPPlannedPurchaseOrders.php:321 MRPPlannedWorkOrders.php:375
-#: MRPReport.php:818 MRPReschedules.php:181 MRPShortages.php:335
+#: MRPReport.php:846 MRPReschedules.php:181 MRPShortages.php:335
#: PDFPriceList.php:385 PDFReceipt.php:34 PDFRemittanceAdvice.php:218
-#: PrintCustOrder.php:175 PrintCustTrans.php:771 PrintCustTrans.php:980
-#: PrintCustTrans.php:1029 PrintCustTransPortrait.php:818
+#: PrintCustOrder.php:175 PrintCustTransPortrait.php:818
#: PrintCustTransPortrait.php:1040 PrintCustTransPortrait.php:1096
#: PrintWOItemSlip.php:143 ReorderLevel.php:284 StockDispatch.php:478
#: SuppPriceList.php:293 includes/PDFAgedDebtorsPageHeader.inc:34
@@ -1878,7 +1882,7 @@
#: BOMExtendedQty.php:327 BOMInquiry.php:110 BOMs.php:915
#: CounterReturns.php:1694 CounterSales.php:2104 CounterSales.php:2258
-#: InternalStockRequest.php:631 PO_SelectOSPurchOrder.php:264
+#: InternalStockRequest.php:631 PO_SelectOSPurchOrder.php:309
#: PO_SelectPurchOrder.php:215 PurchaseByPrefSupplier.php:415
#: ReorderLevelLocation.php:75 ReorderLevelLocation.php:76
#: SelectCompletedOrder.php:506 SelectOrderItems.php:1479
@@ -1900,10 +1904,10 @@
#: InventoryQuantities.php:245 MRPDemands.php:294 MRPDemands.php:371
#: MRPDemands.php:381 MRPPlannedPurchaseOrders.php:338
#: MRPPlannedWorkOrders.php:392 MRPReschedules.php:191 MRPShortages.php:280
-#: MRPShortages.php:349 POReport.php:491 POReport.php:500 POReport.php:519
-#: POReport.php:539 POReport.php:625 POReport.php:725 POReport.php:1267
-#: POReport.php:1276 POReport.php:1290 POReport.php:1305 POReport.php:1356
-#: POReport.php:1419 POReport.php:1525 POReport.php:1610 POReport.php:1623
+#: MRPShortages.php:349 POReport.php:493 POReport.php:502 POReport.php:521
+#: POReport.php:541 POReport.php:630 POReport.php:733 POReport.php:1277
+#: POReport.php:1286 POReport.php:1300 POReport.php:1315 POReport.php:1368
+#: POReport.php:1433 POReport.php:1539 POReport.php:1624 POReport.php:1637
#: ReorderLevel.php:297 StockDispatch.php:503 StockDispatch.php:510
msgid "Part Number"
msgstr ""
@@ -1913,8 +1917,8 @@
msgid "M/B"
msgstr ""
-#: BOMExtendedQty.php:333 POReport.php:549 POReport.php:635 POReport.php:726
-#: POReport.php:1315 POReport.php:1366 POReport.php:1420 StockClone.php:668
+#: BOMExtendedQty.php:333 POReport.php:552 POReport.php:641 POReport.php:734
+#: POReport.php:1326 POReport.php:1379 POReport.php:1434 StockClone.php:668
#: StockClone.php:692 Stocks.php:1001 Stocks.php:1025
msgid "Part Description"
msgstr ""
@@ -2016,14 +2020,14 @@
msgstr ""
#: BOMInquiry.php:26 BOMs.php:896 MRPDemands.php:336
-#: PO_SelectOSPurchOrder.php:241 PO_SelectPurchOrder.php:190
+#: PO_SelectOSPurchOrder.php:286 PO_SelectPurchOrder.php:190
#: 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
+#: PO_SelectOSPurchOrder.php:286 PO_SelectPurchOrder.php:190
#: SelectQASamples.php:275 Shipt_Select.php:169 TestPlanResults.php:153
#: WorkOrderEntry.php:701 WorkOrderIssue.php:732
msgid "description"
@@ -2036,13 +2040,13 @@
#: DiscountCategories.php:123 DiscountCategories.php:127
#: DiscountCategories.php:129 FixedAssetTransfer.php:94
#: InternalStockRequest.php:354 MRPDemands.php:338 MRPDemands.php:341
-#: MRPReport.php:546 PO_Header.php:547 PO_Items.php:1153 PO_Items.php:1157
-#: PO_SelectOSPurchOrder.php:245 PO_SelectPurchOrder.php:195 PurchData.php:383
+#: MRPReport.php:574 PO_Header.php:547 PO_Items.php:1155 PO_Items.php:1159
+#: PO_SelectOSPurchOrder.php:290 PO_SelectPurchOrder.php:195 PurchData.php:383
#: SelectAsset.php:104 SelectCompletedOrder.php:484 SelectCreditItems.php:227
#: SelectCreditItems.php:1004 SelectCustomer.php:275 SelectCustomer.php:285
#: SelectCustomer.php:294 SelectCustomer.php:304 SelectCustomer.php:351
#: SelectGLAccount.php:79 SelectOrderItems.php:569 SelectOrderItems.php:572
-#: SelectOrderItems.php:1603 SelectProduct.php:537 SelectQASamples.php:280
+#: SelectOrderItems.php:1603 SelectProduct.php:529 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
@@ -2053,7 +2057,7 @@
msgstr ""
#: BOMInquiry.php:29 BOMs.php:899 MRPDemands.php:339
-#: PO_SelectOSPurchOrder.php:245 PO_SelectPurchOrder.php:195
+#: PO_SelectOSPurchOrder.php:290 PO_SelectPurchOrder.php:195
#: SelectQASamples.php:280 Shipt_Select.php:174 TestPlanResults.php:158
#: WorkOrderEntry.php:706 WorkOrderIssue.php:737
msgid "Enter extract of the"
@@ -2061,16 +2065,16 @@
#: BOMInquiry.php:29 BOMs.php:899 EmailConfirmation.php:218
#: EmailConfirmation.php:348 InternalStockRequest.php:154
-#: InternalStockRequest.php:354 MRPDemands.php:339 MRPReport.php:546
-#: PO_SelectOSPurchOrder.php:245 PO_SelectPurchOrder.php:195
+#: InternalStockRequest.php:354 MRPDemands.php:339 MRPReport.php:574
+#: PO_SelectOSPurchOrder.php:290 PO_SelectPurchOrder.php:195
#: 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:280 Shipt_Select.php:174
+#: SalesInquiry.php:1114 SalesInquiry.php:1211 SalesInquiry.php:1229
+#: SelectProduct.php:529 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
-#: StockTransfers.php:474 StockUsage.php:64 SupplierPriceList.php:49
+#: StockReorderLevel.php:51 StockStatus.php:62 StockTransfers.php:49
+#: StockTransfers.php:554 StockUsage.php:64 SupplierPriceList.php:49
#: SupplierTenderCreate.php:706 SupplierTenders.php:433
#: TestPlanResults.php:158 WorkOrderEntry.php:706 WorkOrderIssue.php:737
#: Z_ChangeStockCode.php:196 ../webSHOP/includes/PlaceOrder.php:235
@@ -2080,10 +2084,10 @@
#: BOMInquiry.php:35 BOMs.php:903 ContractBOM.php:342 Contracts.php:769
#: CounterReturns.php:1666 CounterSales.php:2231 CustomerReceipt.php:1189
#: FixedAssetTransfer.php:107 InternalStockRequest.php:365 MRPDemands.php:343
-#: MRPReport.php:558 PO_Header.php:554 PO_Items.php:1161 SelectAsset.php:116
+#: MRPReport.php:586 PO_Header.php:554 PO_Items.php:1163 SelectAsset.php:116
#: SelectCreditItems.php:234 SelectCreditItems.php:1011 SelectCustomer.php:376
#: SelectGLAccount.php:103 SelectOrderItems.php:580 SelectOrderItems.php:1614
-#: SelectProduct.php:545 SelectSupplier.php:241 SelectSupplier.php:274
+#: SelectProduct.php:537 SelectSupplier.php:241 SelectSupplier.php:274
#: SupplierPriceList.php:61 SupplierTenderCreate.php:572
#: SupplierTenderCreate.php:611 SupplierTenderCreate.php:717
#: SupplierTenders.php:445 WorkOrderEntry.php:712 WorkOrderIssue.php:744
@@ -2091,9 +2095,9 @@
msgstr ""
#: BOMInquiry.php:47 BOMs.php:833 ContractBOM.php:52 MRPDemands.php:56
-#: MRPReport.php:578 PO_Items.php:852 PO_SelectOSPurchOrder.php:65
+#: MRPReport.php:606 PO_Items.php:852 PO_SelectOSPurchOrder.php:65
#: PO_SelectPurchOrder.php:48 SelectCompletedOrder.php:97
-#: SelectCreditItems.php:301 SelectProduct.php:558 SelectQASamples.php:176
+#: SelectCreditItems.php:301 SelectProduct.php:550 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
@@ -2110,24 +2114,24 @@
msgstr ""
#: BOMInquiry.php:95 BOMs.php:882 MRPCalendar.php:213 MRPDemands.php:80
-#: MRPDemands.php:289 POReport.php:481 POReport.php:1256 SalesInquiry.php:758
+#: MRPDemands.php:289 POReport.php:483 POReport.php:1266 SalesInquiry.php:758
msgid "The SQL to find the parts selected failed with the message"
msgstr ""
-#: BOMInquiry.php:111 BOMs.php:916 ConfirmDispatch_Invoice.php:300
+#: BOMInquiry.php:111 BOMs.php:916 ConfirmDispatch_Invoice.php:304
#: ContractBOM.php:355 CounterReturns.php:1693 CounterSales.php:2103
-#: CounterSales.php:2257 Credit_Invoice.php:295 GoodsReceived.php:103
+#: CounterSales.php:2257 Credit_Invoice.php:294 GoodsReceived.php:103
#: GoodsReceived.php:107 InternalStockRequest.php:561
#: InternalStockRequest.php:630 InternalStockRequestAuthorisation.php:106
#: InternalStockRequestFulfill.php:325 InventoryValuation.php:197
-#: MRPReport.php:752 NoSalesItems.php:197 OffersReceived.php:109
-#: PO_Items.php:1190 PO_SelectOSPurchOrder.php:266 PO_SelectPurchOrder.php:217
+#: MRPReport.php:780 NoSalesItems.php:197 OffersReceived.php:109
+#: PO_Items.php:1192 PO_SelectOSPurchOrder.php:311 PO_SelectPurchOrder.php:217
#: ProductSpecs.php:166 ProductSpecs.php:387 QATests.php:253 QATests.php:394
#: SelectCompletedOrder.php:509 SelectCreditItems.php:1022
-#: SelectOrderItems.php:1478 SelectOrderItems.php:1641 SelectProduct.php:131
-#: 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
+#: SelectOrderItems.php:1478 SelectOrderItems.php:1641 SelectProduct.php:137
+#: SelectProduct.php:750 SelectQASamples.php:301 SelectSalesOrder.php:562
+#: SelectWorkOrder.php:221 Shipments.php:400 Shipments.php:487
+#: Shipt_Select.php:194 StockLocTransferReceive.php:550
#: SupplierPriceList.php:272 SupplierTenderCreate.php:854
#: SupplierTenders.php:688 TestPlanResults.php:179 TestPlanResults.php:510
#: TopItems.php:172 WorkOrderCosting.php:100 WorkOrderEntry.php:736
@@ -2157,7 +2161,7 @@
msgstr ""
#: BOMInquiry.php:197 BOMs.php:644 WOCanBeProducedNow.php:48
-#: WorkOrderReceive.php:184 WorkOrderReceive.php:402 Z_BottomUpCosts.php:33
+#: WorkOrderReceive.php:191 WorkOrderReceive.php:409 Z_BottomUpCosts.php:33
msgid "Component"
msgstr ""
@@ -2266,10 +2270,10 @@
msgstr ""
#: BOMs.php:126 BOMs.php:132 BOMs.php:140 BOMs.php:932 BankAccounts.php:369
-#: InternalStockRequest.php:579 PO_SelectOSPurchOrder.php:550
+#: InternalStockRequest.php:579 PO_SelectOSPurchOrder.php:621
#: PaymentTerms.php:190 PaymentTerms.php:196 SalesAnalReptCols.php:285
-#: SelectProduct.php:129 SelectProduct.php:176 SelectProduct.php:254
-#: SelectProduct.php:255 SelectProduct.php:776
+#: SelectProduct.php:135 SelectProduct.php:185 SelectProduct.php:246
+#: SelectProduct.php:247 SelectProduct.php:768
#: StockCategorySalesInquiry.php:154 StockCategorySalesInquiry.php:188
#: StockCategorySalesInquiry.php:189 StockCategorySalesInquiry.php:194
#: StockCategorySalesInquiry.php:217 StockCategorySalesInquiry.php:230
@@ -2291,7 +2295,7 @@
msgid "The effective to date field must be a date in the format"
msgstr ""
-#: BOMs.php:262 StockAdjustments.php:165 StockTransfers.php:172
+#: BOMs.php:262 StockAdjustments.php:165 StockTransfers.php:173
#: WorkOrderEntry.php:336
msgid "The quantity entered must be numeric"
msgstr ""
@@ -2412,8 +2416,8 @@
msgid "The SQL used to retrieve description of the parent part was"
msgstr ""
-#: BOMs.php:436 ConfirmDispatch_Invoice.php:1050 CounterReturns.php:1074
-#: CounterSales.php:1474 Credit_Invoice.php:812 Credit_Invoice.php:842
+#: BOMs.php:436 ConfirmDispatch_Invoice.php:1054 CounterReturns.php:1074
+#: CounterSales.php:1474 Credit_Invoice.php:811 Credit_Invoice.php:841
#: 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 reportwriter/languages/en_US/reports.php:56
@@ -2465,7 +2469,7 @@
msgstr ""
#: BOMs.php:568 BOMs.php:707 Contracts.php:876 FixedAssetRegister.php:89
-#: InventoryQuantities.php:247 LocationUsers.php:153 Locations.php:366
+#: InventoryQuantities.php:247 LocationUsers.php:153 Locations.php:380
#: MRP.php:580 MRP.php:617 NoSalesItems.php:192 PDFOrderStatus.php:296
#: PDFOrdersInvoiced.php:296 ReorderLevel.php:290 ReorderLevel.php:299
#: ReorderLevelLocation.php:164 StockCounts.php:214 StockReorderLevel.php:58
@@ -2592,18 +2596,18 @@
msgid "Backup"
msgstr ""
-#: BackupDatabase.php:43
+#: BackupDatabase.php:39
msgid ""
"The backup file has now been created. You must now download this to your "
"computer because in case the web-server has a disk failure the backup would "
"then not on the same machine. Use the link below"
msgstr ""
-#: BackupDatabase.php:43
+#: BackupDatabase.php:39
msgid "Download the backup file to your locale machine"
msgstr ""
-#: BackupDatabase.php:44
+#: BackupDatabase.php:40
msgid ""
"Once you have downloaded the database backup file to your local machine you "
"should use the link below to delete it - backup files can consume a lot of "
@@ -2612,17 +2616,10 @@
"to download!"
msgstr ""
-#: BackupDatabase.php:47
+#: BackupDatabase.php:43
msgid "Delete the backup file off the server"
msgstr ""
-#: BackupDatabase.php:49
-msgid ""
-"There was some problem producing ...
[truncated message content] |
|
From: <rc...@us...> - 2015-05-10 04:54:14
|
Revision: 7296
http://sourceforge.net/p/web-erp/reponame/7296
Author: rchacon
Date: 2015-05-10 04:54:12 +0000 (Sun, 10 May 2015)
Log Message:
-----------
New features: (1) GL account code for an inventory location, so that you can have general ledger transactions of inventory transfers to or from this location; useful for pledged inventory and goods on consignment. (2) Allow Invoicing parameter to allow or deny the availability of a location to be delivered; useful when a location stores compromised good that can not be sold.
Modified Paths:
--------------
trunk/CustomerBranches.php
trunk/DeliveryDetails.php
trunk/Locations.php
trunk/StockLocTransferReceive.php
trunk/StockTransfers.php
trunk/Z_ChangeGLAccountCode.php
trunk/Z_ChangeLocationCode.php
trunk/doc/Change.log
trunk/doc/Manual/ManualAccountsReceivable.html
trunk/doc/Manual/ManualInventory.html
trunk/doc/Manual/ManualSalesOrders.html
trunk/includes/DefineStockTransfers.php
trunk/sql/mysql/upgrade4.12.2-4.13.sql
Added Paths:
-----------
trunk/doc/Manual/images/InventoryLocations.png
Modified: trunk/CustomerBranches.php
===================================================================
--- trunk/CustomerBranches.php 2015-05-10 01:01:51 UTC (rev 7295)
+++ trunk/CustomerBranches.php 2015-05-10 04:54:12 UTC (rev 7296)
@@ -12,7 +12,7 @@
if(isset($_GET['DebtorNo'])) {
$DebtorNo = mb_strtoupper($_GET['DebtorNo']);
-} else if(isset($_POST['DebtorNo'])) {
+} elseif(isset($_POST['DebtorNo'])) {
$DebtorNo = mb_strtoupper($_POST['DebtorNo']);
}
@@ -26,7 +26,7 @@
if(isset($_GET['SelectedBranch'])) {
$SelectedBranch = mb_strtoupper($_GET['SelectedBranch']);
-} else if(isset($_POST['SelectedBranch'])) {
+} elseif(isset($_POST['SelectedBranch'])) {
$SelectedBranch = mb_strtoupper($_POST['SelectedBranch']);
}
@@ -177,7 +177,7 @@
$msg = $_POST['BrName'] . ' '._('branch has been updated.');
- } else if($InputError !=1) {
+ } elseif($InputError !=1) {
/*Selected branch is null cos no item selected on first time round so must be adding a record must be submitting new entries in the new Customer Branches form */
@@ -286,7 +286,7 @@
unset($_POST['DeliverBlind']);
unset($SelectedBranch);
}
-} else if(isset($_GET['delete'])) {
+} elseif(isset($_GET['delete'])) {
//the link to delete a selected record was clicked instead of the submit button
// PREVENT DELETES IF DEPENDENT RECORDS IN 'DebtorTrans'
@@ -461,7 +461,7 @@
if($myrow[10]) {
$TotalDisable++;
- }else {
+ } else {
$TotalEnable++;
}
} while ($myrow = DB_fetch_row($result));
@@ -698,7 +698,7 @@
foreach ($CountriesArray as $CountryEntry => $CountryName) {
if(isset($_POST['BrAddress6']) AND ($_POST['BrAddress6'] == $CountryName)) {
echo '<option selected="selected" value="' . $CountryName . '">' . $CountryName . '</option>';
- }elseif(!isset($_POST['BrAddress6']) AND $CountryName == "") {
+ } elseif(!isset($_POST['BrAddress6']) AND $CountryName == "") {
echo '<option selected="selected" value="' . $CountryName . '">' . $CountryName . '</option>';
} else {
echo '<option value="' . $CountryName . '">' . $CountryName . '</option>';
@@ -735,7 +735,7 @@
echo $_SESSION['UsersRealName'];
echo '</td>
</tr>';
- }else{
+ } else {
//SQL to poulate account selection boxes
$SQL = "SELECT salesmanname,
@@ -800,30 +800,38 @@
</tr>';
DB_data_seek($result,0);
- $SQL = "SELECT locations.loccode, locationname FROM locations INNER JOIN locationusers ON locationusers.loccode=locations.loccode AND locationusers.userid='" . $_SESSION['UserID'] . "' AND locationusers.canupd=1";
+// BEGIN: **********************************************************************
+ $SQL = "SELECT locations.loccode, locationname
+ FROM locations
+ INNER JOIN locationusers
+ ON locationusers.loccode=locations.loccode
+ AND locationusers.userid='" . $_SESSION['UserID'] . "'
+ AND locationusers.canupd=1
+ WHERE locations.allowinvoicing='1'";
$result = DB_query($SQL);
if(DB_num_rows($result)==0) {
echo '</table>';
prnMsg(_('There are no stock locations defined as yet') . ' - ' . _('customer branches must refer to a default location where stock is normally drawn from') . '. ' . _('Please use the link below to define at least one stock location'),'error');
- echo '<br /><a href="' . $RootPath . '/Locations.php">' . _('Define Stock Locations') . '</a>';
+ echo '<br /><a href="', $RootPath, '/Locations.php">', _('Define Stock Locations'), '</a>';
include('includes/footer.inc');
exit;
}
echo '<tr>
- <td>' . _('Draw Stock From').':</td>
- <td><select tabindex="15" name="DefaultLocation">';
+ <td>', _('Draw Stock From'), ':</td>
+ <td><select name="DefaultLocation" tabindex="15">';
- while ($myrow = DB_fetch_array($result)) {
+ while($myrow = DB_fetch_array($result)) {
if(isset($_POST['DefaultLocation']) AND $myrow['loccode']==$_POST['DefaultLocation']) {
echo '<option selected="selected" value="';
} else {
echo '<option value="';
}
- echo $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
+ echo $myrow['loccode'], '">', $myrow['locationname'], '</option>';
- } //end while loop
+ }// End while loop.
+// END: ************************************************************************
echo '</select></td>
</tr>
@@ -910,7 +918,7 @@
while ($myrow=DB_fetch_array($ShipperResults)) {
if(isset($_POST['DefaultShipVia'])and $myrow['shipper_id']==$_POST['DefaultShipVia']) {
echo '<option selected="selected" value="' . $myrow['shipper_id'] . '">' . $myrow['shippername'] . '</option>';
- }else {
+ } else {
echo '<option value="' . $myrow['shipper_id'] . '">' . $myrow['shippername'] . '</option>';
}
}
@@ -938,53 +946,53 @@
$_POST['BrPostAddr1']='';
}
echo '<tr>
- <td>' . _('Postal Address 1 (Street)').':</td>
- <td><input tabindex="23" type="text" name="BrPostAddr1" size="41" maxlength="40" value="'. $_POST['BrPostAddr1'].'" /></td>
+ <td>', _('Postal Address 1 (Street)'), ':</td>
+ <td><input maxlength="40" name="BrPostAddr1" size="41" tabindex="23" type="text" value="', $_POST['BrPostAddr1'].'" /></td>
</tr>';
if(!isset($_POST['BrPostAddr2'])) {// Postal address, line 2. Database: custbranch.brpostaddr2, varchar(40)
$_POST['BrPostAddr2']='';
}
echo '<tr>
- <td>' . _('Postal Address 2 (Suburb/City)').':</td>
- <td><input tabindex="24" type="text" name="BrPostAddr2" size="41" maxlength="40" value="'. $_POST['BrPostAddr2'].'" /></td>
+ <td>', _('Postal Address 2 (Suburb/City)'), ':</td>
+ <td><input maxlength="40" name="BrPostAddr2" size="41" tabindex="24" type="text" value="', $_POST['BrPostAddr2'].'" /></td>
</tr>';
if(!isset($_POST['BrPostAddr3'])) {// Postal address, line 3. Database: custbranch.brpostaddr3, varchar(40)
$_POST['BrPostAddr3']='';
}
echo '<tr>
- <td>' . _('Postal Address 3 (State)').':</td>
- <td><input tabindex="25" type="text" name="BrPostAddr3" size="41" maxlength="40" value="'. $_POST['BrPostAddr3'].'" /></td>
+ <td>', _('Postal Address 3 (State)'), ':</td>
+ <td><input maxlength="40" name="BrPostAddr3" size="41" tabindex="25" type="text" value="', $_POST['BrPostAddr3'].'" /></td>
</tr>';
if(!isset($_POST['BrPostAddr4'])) {// Postal address, line 4. Database: custbranch.brpostaddr4, varchar(40)
$_POST['BrPostAddr4']='';
}
echo '<tr>
- <td>' . _('Postal Address 4 (Postal Code)').':</td>
- <td><input tabindex="26" type="text" name="BrPostAddr4" size="41" maxlength="40" value="'. $_POST['BrPostAddr4'].'" /></td>
+ <td>', _('Postal Address 4 (Postal Code)'), ':</td>
+ <td><input maxlength="40" name="BrPostAddr4" size="41" tabindex="26" type="text" value="', $_POST['BrPostAddr4'].'" /></td>
</tr>';
if(!isset($_POST['BrPostAddr5'])) {// Postal address, line 5. Database: custbranch.brpostaddr5, varchar(20)
$_POST['BrPostAddr5']='';
}
echo '<tr>
- <td>' . _('Postal Address 5').':</td>
- <td><input tabindex="27" type="text" name="BrPostAddr5" size="21" maxlength="20" value="'. $_POST['BrPostAddr5'].'" /></td>
+ <td>', _('Postal Address 5'), ':</td>
+ <td><input maxlength="20" name="BrPostAddr5" size="21" tabindex="27" type="text" value="', $_POST['BrPostAddr5'].'" /></td>
</tr>';
if(!isset($_POST['CustBranchCode'])) {
$_POST['CustBranchCode']='';
}
echo '<tr>
- <td>' . _('Customers Internal Branch Code (EDI)').':</td>
- <td><input tabindex="28" type="text" name="CustBranchCode" size="31" maxlength="30" value="'. $_POST['CustBranchCode'].'" /></td>
+ <td>', _('Customers Internal Branch Code (EDI)'), ':</td>
+ <td><input maxlength="30" name="CustBranchCode" size="31" tabindex="28" type="text" value="', $_POST['CustBranchCode'], '" /></td>
</tr>
</table>
<br />
<div class="centre">
- <input tabindex="28" type="submit" name="submit" value="' . _('Enter Or Update Branch') . '" />
+ <input name="submit" tabindex="29" type="submit" value="', _('Enter Or Update Branch'), '" />
</div>
</div>
</form>';
Modified: trunk/DeliveryDetails.php
===================================================================
--- trunk/DeliveryDetails.php 2015-05-10 01:01:51 UTC (rev 7295)
+++ trunk/DeliveryDetails.php 2015-05-10 04:54:12 UTC (rev 7296)
@@ -113,7 +113,7 @@
elseif(Date1GreaterThanDate2(Date($_SESSION['DefaultDateFormat'],$EarliestDispatch), $_POST['DeliveryDate'])) {
$InputErrors =1;
- echo '<br /><b>' . _('The delivery details cannot be updated because you are attempting to set the date the order is to be dispatched earlier than is possible. No dispatches are made on Saturday and Sunday. Also, the dispatch cut off time is') . $_SESSION['DispatchCutOffTime'] . _(':00 hrs. Orders placed after this time will be dispatched the following working day.');
+ echo '<br /><b>' . _('The delivery details cannot be updated because you are attempting to set the date the order is to be dispatched earlier than is possible. No dispatches are made on Saturday and Sunday. Also, the dispatch cut off time is') . $_SESSION['DispatchCutOffTime'] . _(':00 hrs. Orders placed after this time will be dispatched the following working day.');
}
*/
@@ -236,7 +236,7 @@
- if shippers defined but the default shipper is bogus then use the first shipper defined
*/
if((isset($BestShipper) AND $BestShipper=='') AND ($_POST['ShipVia']=='' OR !isset($_POST['ShipVia']))) {
- $sql = "SELECT shipper_id
+ $sql = "SELECT shipper_id
FROM shippers
WHERE shipper_id='" . $_SESSION['Default_Shipper']."'";
$ErrMsg = _('There was a problem testing for the default shipper');
@@ -258,7 +258,7 @@
$BestShipper = $ShipperReturned[0];
} else {
prnMsg(_('We have a problem') . ' - ' . _('there are no shippers defined'). '. ' . _('Please use the link below to set up shipping or freight companies') . ', ' . _('the system expects the shipping company to be selected or a default freight company to be used'),'error');
- echo '<a href="' . $RootPath . 'Shippers.php">' . _('Enter') . '/' . _('Amend Freight Companies') . '</a>';
+ echo '<a href="' . $RootPath . 'Shippers.php">' . _('Enter') . '/' . _('Amend Freight Companies') . '</a>';
}
}
if(isset($_SESSION['Items'.$identifier]->ShipVia) AND $_SESSION['Items'.$identifier]->ShipVia!='') {
@@ -272,8 +272,8 @@
if(isset($_POST['MakeRecurringOrder']) AND ! $InputErrors) {
- echo '<meta http-equiv="Refresh" content="0; url=' . $RootPath . '/RecurringSalesOrders.php?identifier='.$identifier . '&NewRecurringOrder=Yes">';
- prnMsg(_('You should automatically be forwarded to the entry of recurring order details page') . '. ' . _('If this does not happen') . '(' . _('if the browser does not support META Refresh') . ') ' . '<a href="' . $RootPath . '/RecurringOrders.php?identifier='.$identifier . '&NewRecurringOrder=Yes">' . _('click here') . '</a> '. _('to continue'),'info');
+ echo '<meta http-equiv="Refresh" content="0; url=' . $RootPath . '/RecurringSalesOrders.php?identifier='.$identifier . '&NewRecurringOrder=Yes">';
+ prnMsg(_('You should automatically be forwarded to the entry of recurring order details page') . '. ' . _('If this does not happen') . '(' . _('if the browser does not support META Refresh') . ') ' . '<a href="' . $RootPath . '/RecurringOrders.php?identifier='.$identifier . '&NewRecurringOrder=Yes">' . _('click here') . '</a> '. _('to continue'),'info');
include('includes/footer.inc');
exit;
}
@@ -281,8 +281,8 @@
if(isset($_POST['BackToLineDetails']) and $_POST['BackToLineDetails']==_('Modify Order Lines')) {
- echo '<meta http-equiv="Refresh" content="0; url=' . $RootPath . '/SelectOrderItems.php?identifier='.$identifier . '">';
- prnMsg(_('You should automatically be forwarded to the entry of the order line details page') . '. ' . _('If this does not happen') . '(' . _('if the browser does not support META Refresh') . ') ' . '<a href="' . $RootPath . '/SelectOrderItems.php?identifier='.$identifier . '">' . _('click here') . '</a> '. _('to continue'),'info');
+ echo '<meta http-equiv="Refresh" content="0; url=' . $RootPath . '/SelectOrderItems.php?identifier='.$identifier . '">';
+ prnMsg(_('You should automatically be forwarded to the entry of the order line details page') . '. ' . _('If this does not happen') . '(' . _('if the browser does not support META Refresh') . ') ' . '<a href="' . $RootPath . '/SelectOrderItems.php?identifier='.$identifier . '">' . _('click here') . '</a> '. _('to continue'),'info');
include('includes/footer.inc');
exit;
@@ -318,7 +318,7 @@
UNTIL ONLINE CREDIT CARD PROCESSING IS PERFORMED ASSUME OK TO PROCESS
- NOT YET CODED */
+ NOT YET CODED */
$OK_to_PROCESS =1;
@@ -540,7 +540,7 @@
$FactoryManagerEmail = _('A new work order has been created for') .
":\n" . $StockItem->StockID . ' - ' . $StockItem->ItemDescription . ' x ' . $WOQuantity . ' ' . $StockItem->Units .
- "\n" . _('These are for') . ' ' . $_SESSION['Items'.$identifier]->CustomerName . ' ' . _('there order ref') . ': ' . $_SESSION['Items'.$identifier]->CustRef . ' ' ._('our order number') . ': ' . $OrderNo;
+ "\n" . _('These are for') . ' ' . $_SESSION['Items'.$identifier]->CustomerName . ' ' . _('there order ref') . ': ' . $_SESSION['Items'.$identifier]->CustRef . ' ' ._('our order number') . ': ' . $OrderNo;
if($StockItem->Serialised AND $StockItem->NextSerialNo>0) {
//then we must create the serial numbers for the new WO also
@@ -603,16 +603,16 @@
echo '<br /><table class="selection">
<tr>
<td><img src="'.$RootPath.'/css/'.$Theme.'/images/printer.png" title="' . _('Print') . '" alt="" /></td>
- <td>' . ' ' . '<a target="_blank" href="' . $RootPath . '/PrintCustOrder.php?identifier='.$identifier . '&TransNo=' . $OrderNo . '">' . _('Print packing slip') . ' (' . _('Preprinted stationery') . ')' . '</a></td>
+ <td>' . ' ' . '<a target="_blank" href="' . $RootPath . '/PrintCustOrder.php?identifier='.$identifier . '&TransNo=' . $OrderNo . '">' . _('Print packing slip') . ' (' . _('Preprinted stationery') . ')' . '</a></td>
</tr>';
echo '<tr>
<td><img src="'.$RootPath.'/css/'.$Theme.'/images/printer.png" title="' . _('Print') . '" alt="" /></td>
- <td>' . ' ' . '<a target="_blank" href="' . $RootPath . '/PrintCustOrder_generic.php?identifier='.$identifier . '&TransNo=' . $OrderNo . '">' . _('Print packing slip') . ' (' . _('Laser') . ')' . '</a></td>
+ <td>' . ' ' . '<a target="_blank" href="' . $RootPath . '/PrintCustOrder_generic.php?identifier='.$identifier . '&TransNo=' . $OrderNo . '">' . _('Print packing slip') . ' (' . _('Laser') . ')' . '</a></td>
</tr>';
echo '<tr>
<td><img src="'.$RootPath.'/css/'.$Theme.'/images/reports.png" title="' . _('Invoice') . '" alt="" /></td>
- <td>' . ' ' . '<a href="' . $RootPath . '/ConfirmDispatch_Invoice.php?identifier='.$identifier . '&OrderNumber=' . $OrderNo .'">' . _('Confirm Dispatch and Produce Invoice') . '</a></td>
+ <td>' . ' ' . '<a href="' . $RootPath . '/ConfirmDispatch_Invoice.php?identifier='.$identifier . '&OrderNumber=' . $OrderNo .'">' . _('Confirm Dispatch and Produce Invoice') . '</a></td>
</tr>';
echo '</table>';
@@ -622,7 +622,7 @@
echo '<br /><table class="selection">
<tr>
<td><img src="'.$RootPath.'/css/'.$Theme.'/images/printer.png" title="' . _('Order') . '" alt=""></td>
- <td>' . ' ' . '<a href="' . $RootPath . '/PDFQuotation.php?identifier='.$identifier . '&QuotationNo=' . $OrderNo . '" target="_blank">' . _('Print Quotation (Landscape)') . '</a></td>
+ <td>' . ' ' . '<a href="' . $RootPath . '/PDFQuotation.php?identifier='.$identifier . '&QuotationNo=' . $OrderNo . '" target="_blank">' . _('Print Quotation (Landscape)') . '</a></td>
</tr>
</table>';
echo '<br /><table class="selection">
@@ -1007,29 +1007,30 @@
</tr>';
echo '<tr>
- <td>' . _('Deliver from the warehouse at') .':</td>
+ <td>', _('Deliver from the warehouse at'), ':</td>
<td><select name="Location">';
if($_SESSION['Items'.$identifier]->Location=='' OR !isset($_SESSION['Items'.$identifier]->Location)) {
$_SESSION['Items'.$identifier]->Location = $DefaultStockLocation;
}
+// BEGIN: **********************************************************************
+$SQL = "SELECT locations.loccode, locationname
+ FROM locations
+ INNER JOIN locationusers
+ ON locationusers.loccode=locations.loccode
+ AND locationusers.userid='" . $_SESSION['UserID'] . "'
+ AND locationusers.canupd=1
+ WHERE locations.allowinvoicing='1'";
$ErrMsg = _('The stock locations could not be retrieved');
$DbgMsg = _('SQL used to retrieve the stock locations was') . ':';
-$StkLocsResult = DB_query("SELECT locationname,locations.loccode
- FROM locations INNER JOIN locationusers ON locationusers.loccode=locations.loccode AND locationusers.userid='" . $_SESSION['UserID'] . "' AND locationusers.canupd=1",
- $ErrMsg,
- $DbgMsg);
-
-while ($myrow=DB_fetch_array($StkLocsResult)) {
- if($_SESSION['Items'.$identifier]->Location==$myrow['loccode']) {
- echo '<option selected="selected" value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
- } else {
- echo '<option value="'.$myrow['loccode'].'">' . $myrow['locationname'] . '</option>';
- }
+$StkLocsResult = DB_query($SQL, $ErrMsg, $DbgMsg);
+// COMMENT: What if there is no authorized locations available for this user?
+while($myrow=DB_fetch_array($StkLocsResult)) {
+ echo '<option', ($_SESSION['Items'.$identifier]->Location==$myrow['loccode'] ? ' selected="selected"' : ''), ' value="', $myrow['loccode'], '">', $myrow['locationname'], '</option>';
}
-
echo '</select></td></tr>';
+// END: ************************************************************************
// Set the default date to earliest possible date if not set already
if(!isset($_SESSION['Items'.$identifier]->DeliveryDate)) {
Modified: trunk/Locations.php
===================================================================
--- trunk/Locations.php 2015-05-10 01:01:51 UTC (rev 7295)
+++ trunk/Locations.php 2015-05-10 04:54:12 UTC (rev 7296)
@@ -77,7 +77,9 @@
cashsalebranch ='" . $_POST['CashSaleBranch'] . "',
managed = '" . $_POST['Managed'] . "',
internalrequest = '" . $_POST['InternalRequest'] . "',
- usedforwo = '" . $_POST['UsedForWO'] . "'
+ usedforwo = '" . $_POST['UsedForWO'] . "',
+ glaccountcode = '" . $_POST['GLAccountCode'] . "',
+ allowinvoicing = '" . $_POST['AllowInvoicing'] . "'
WHERE loccode = '" . $SelectedLocation . "'";
$ErrMsg = _('An error occurred updating the') . ' ' . $SelectedLocation . ' ' . _('location record because');
@@ -105,6 +107,8 @@
unset($_POST['Contact']);
unset($_POST['InternalRequest']);
unset($_POST['UsedForWO']);
+ unset($_POST['GLAccountCode']);
+ unset($_POST['AllowInvoicing']);
} elseif($InputError !=1) {
@@ -135,7 +139,9 @@
cashsalebranch,
managed,
internalrequest,
- usedforwo)
+ usedforwo,
+ glaccountcode,
+ allowinvoicing)
VALUES ('" . $_POST['LocCode'] . "',
'" . $_POST['LocationName'] . "',
'" . $_POST['DelAdd1'] ."',
@@ -150,13 +156,15 @@
'" . $_POST['Contact'] . "',
'" . $_POST['TaxProvince'] . "',
'" . $_POST['CashSaleCustomer'] . "',
- '" . $_POST['CashSaleBranch'] . "',
+ '" . $_POST['CashSaleBranch'] . "',
'" . $_POST['Managed'] . "',
- '" . $_POST['InternalRequest'] ."',
- '" . $_POST['UsedForWO'] . "')";
+ '" . $_POST['InternalRequest'] . "',
+ '" . $_POST['UsedForWO'] . "',
+ '" . $_POST['GLAccountCode'] . "',
+ '" . $_POST['AllowInvoicing'] . "')";
- $ErrMsg = _('An error occurred inserting the new location record because');
- $DbgMsg = _('The SQL used to insert the location record was');
+ $ErrMsg = _('An error occurred inserting the new location record because');
+ $DbgMsg = _('The SQL used to insert the location record was');
$result = DB_query($sql,$ErrMsg,$DbgMsg);
prnMsg(_('The new location record has been added'),'success');
@@ -174,10 +182,10 @@
0
FROM stockmaster";
- $ErrMsg = _('An error occurred inserting the new location stock records for all pre-existing parts because');
- $DbgMsg = _('The SQL used to insert the new stock location records was');
+ $ErrMsg = _('An error occurred inserting the new location stock records for all pre-existing parts because');
+ $DbgMsg = _('The SQL used to insert the new stock location records was');
$result = DB_query($sql,$ErrMsg, $DbgMsg);
- prnMsg ('........ ' . _('and new stock locations inserted for all existing stock items for the new location'), 'success');
+ prnMsg('........ ' . _('and new stock locations inserted for all existing stock items for the new location'), 'success');
/* Also need to add locationuser records for all existing users*/
$sql = "INSERT INTO locationusers (userid, loccode, canview, canupd)
@@ -190,7 +198,7 @@
ON www_users.userid = locationusers.userid
AND locations.loccode = locationusers.loccode
WHERE locationusers.userid IS NULL
- AND locations.loccode='". $_POST['LocCode'] . "';";
+ AND locations.loccode='". $_POST['LocCode'] . "';";
$ErrMsg = _('The users/locations that need user location records created cannot be retrieved because');
$Result = DB_query($sql,$ErrMsg);
@@ -215,7 +223,8 @@
unset($_POST['Contact']);
unset($_POST['InternalRequest']);
unset($_POST['UsedForWO']);
-
+ unset($_POST['GLAccountCode']);
+ unset($_POST['AllowInvoicing']);
}
@@ -267,7 +276,7 @@
if($myrow[0]>0) {
$CancelDelete = 1;
prnMsg(_('Cannot delete this location because sales orders have been created delivering from this location'),'warn');
- echo _('There are') . ' ' . $myrow[0] . ' ' . _('sales orders with this Location code');
+ echo _('There are') . ' ' . $myrow[0] . ' ' . _('sales orders with this Location code');
} else {
$sql= "SELECT COUNT(*) FROM stockmoves WHERE stockmoves.loccode='" . $SelectedLocation . "'";
$result = DB_query($sql);
@@ -385,20 +394,24 @@
$sql = "SELECT loccode,
locationname,
taxprovinces.taxprovincename as description,
+ glaccountcode,
+ allowinvoicing,
managed
FROM locations INNER JOIN taxprovinces
ON locations.taxprovinceid=taxprovinces.taxprovinceid";
$result = DB_query($sql);
if(DB_num_rows($result)==0) {
- prnMsg (_('There are no locations that match up with a tax province record to display. Check that tax provinces are set up for all dispatch locations'),'error');
+ prnMsg(_('There are no locations that match up with a tax province record to display. Check that tax provinces are set up for all dispatch locations'),'error');
}
- echo '<table class="selection">';
- echo '<tr>
- <th class="ascending">' . _('Location Code') . '</th>
- <th class="ascending">' . _('Location Name') . '</th>
- <th class="ascending">' . _('Tax Province') . '</th>
+ echo '<table class="selection">
+ <tr>
+ <th class="ascending">', _('Location Code'), '</th>
+ <th class="ascending">', _('Location Name'), '</th>
+ <th class="ascending">', _('Tax Province'), '</th>
+ <th class="ascending">', _('GL Account Code'), '</th>
+ <th class="ascending">', _('Allow Invoicing'), '</th>
<th class="noprint" colspan="2"> </th>
</tr>';
@@ -414,22 +427,25 @@
/* warehouse management not implemented ... yet
if($myrow['managed'] == 1) {
$myrow['managed'] = _('Yes');
- } else {
+ } else {
$myrow['managed'] = _('No');
}
*/
printf('<td>%s</td>
<td>%s</td>
<td>%s</td>
+ <td class="number">%s</td>
+ <td class="centre">%s</td>
<td class="noprint"><a href="%sSelectedLocation=%s">' . _('Edit') . '</a></td>
<td class="noprint"><a href="%sSelectedLocation=%s&delete=1" onclick="return confirm(\'' . _('Are you sure you wish to delete this inventory location?') . '\');">' . _('Delete') . '</a></td>
</tr>',
$myrow['loccode'],
$myrow['locationname'],
$myrow['description'],
+ ($myrow['glaccountcode']!='' ? $myrow['glaccountcode'] : ' '),// Use a non-breaking space to avoid an empty cell in a HTML table.
+ ($myrow['allowinvoicing']==1 ? _('Yes') : _('No')),
htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?', $myrow['loccode'],
htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?', $myrow['loccode']);
-
}
//END WHILE LIST LOOP
echo '</table>';
@@ -446,7 +462,7 @@
if(!isset($_GET['delete'])) {
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
- echo '<div>';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if(isset($SelectedLocation)) {
@@ -469,7 +485,9 @@
cashsalebranch,
managed,
internalrequest,
- usedforwo
+ usedforwo,
+ glaccountcode,
+ allowinvoicing
FROM locations
WHERE loccode='" . $SelectedLocation . "'";
@@ -477,7 +495,7 @@
$myrow = DB_fetch_array($result);
$_POST['LocCode'] = $myrow['loccode'];
- $_POST['LocationName'] = $myrow['locationname'];
+ $_POST['LocationName'] = $myrow['locationname'];
$_POST['DelAdd1'] = $myrow['deladd1'];
$_POST['DelAdd2'] = $myrow['deladd2'];
$_POST['DelAdd3'] = $myrow['deladd3'];
@@ -494,8 +512,9 @@
$_POST['Managed'] = $myrow['managed'];
$_POST['InternalRequest'] = $myrow['internalrequest'];
$_POST['UsedForWO'] = $myrow['usedforwo'];
+ $_POST['GLAccountCode'] = $myrow['glaccountcode'];
+ $_POST['AllowInvoicing'] = $myrow['allowinvoicing'];
-
echo '<input type="hidden" name="SelectedLocation" value="' . $SelectedLocation . '" />';
echo '<input type="hidden" name="LocCode" value="' . $_POST['LocCode'] . '" />';
echo '<table class="selection">';
@@ -561,9 +580,12 @@
if(!isset($_POST['Managed'])) {
$_POST['Managed'] = 0;
}
+ if(!isset($_POST['AllowInvoicing'])) {
+ $_POST['AllowInvoicing'] = 1;// If not set, set value to "Yes".
+ }
echo '<tr>
- <td>' . _('Location Name') . ':' . '</td>
+ <td>' . _('Location Name') . ':' . '</td>
<td><input type="text" name="LocationName" required="required" value="'. $_POST['LocationName'] . '" title="' . _('Enter the inventory location name this could be either a warehouse or a factory') . '" namesize="51" maxlength="50" /></td>
</tr>
<tr>
@@ -571,23 +593,23 @@
<td><input type="text" name="Contact" required="required" value="' . $_POST['Contact'] . '" title="' . _('Enter the name of the responsible person to contact for this inventory location') . '" size="31" maxlength="30" /></td>
</tr>
<tr>
- <td>' . _('Delivery Address 1 (Building)') . ':' . '</td>
+ <td>' . _('Delivery Address 1 (Building)') . ':' . '</td>
<td><input type="text" name="DelAdd1" value="' . $_POST['DelAdd1'] . '" size="41" maxlength="40" /></td>
</tr>
<tr>
<td>' . _('Delivery Address 2 (Street)') . ':' . '</td>
- <td><input type="text" name="DelAdd2" value="' . $_POST['DelAdd2'] . '" size="41" maxlength="40" /></td>
+ <td><input type="text" name="DelAdd2" value="' . $_POST['DelAdd2'] . '" size="41" maxlength="40" /></td>
</tr>
<tr>
- <td>' . _('Delivery Address 3 (Suburb)') . ':' . '</td>
- <td><input type="text" name="DelAdd3" value="' . $_POST['DelAdd3'] . '" size="41" maxlength="40" /></td>
+ <td>' . _('Delivery Address 3 (Suburb)') . ':' . '</td>
+ <td><input type="text" name="DelAdd3" value="' . $_POST['DelAdd3'] . '" size="41" maxlength="40" /></td>
</tr>
<tr>
- <td>' . _('Delivery Address 4 (City)') . ':' . '</td>
+ <td>' . _('Delivery Address 4 (City)') . ':' . '</td>
<td><input type="text" name="DelAdd4" value="' . $_POST['DelAdd4'] . '" size="41" maxlength="40" /></td>
</tr>
<tr>
- <td>' . _('Delivery Address 5 (Zip Code)') . ':' . '</td>
+ <td>' . _('Delivery Address 5 (Zip Code)') . ':' . '</td>
<td><input type="text" name="DelAdd5" value="' . $_POST['DelAdd5'] . '" size="21" maxlength="20" /></td>
</tr>
<tr>
@@ -595,29 +617,29 @@
<td><select name="DelAdd6">';
foreach ($CountriesArray as $CountryEntry => $CountryName) {
if(isset($_POST['DelAdd6']) AND (strtoupper($_POST['DelAdd6']) == strtoupper($CountryName))) {
- echo '<option selected="selected" value="' . $CountryName . '">' . $CountryName . '</option>';
- }elseif(!isset($_POST['Address6']) AND $CountryName == "") {
- echo '<option selected="selected" value="' . $CountryName . '">' . $CountryName . '</option>';
+ echo '<option selected="selected" value="' . $CountryName . '">' . $CountryName . '</option>';
+ } elseif(!isset($_POST['Address6']) AND $CountryName == "") {
+ echo '<option selected="selected" value="' . $CountryName . '">' . $CountryName . '</option>';
} else {
- echo '<option value="' . $CountryName . '">' . $CountryName . '</option>';
+ echo '<option value="' . $CountryName . '">' . $CountryName . '</option>';
}
}
echo '</select></td>
</tr>
<tr>
- <td>' . _('Telephone No') . ':' . '</td>
- <td><input type="tel" name="Tel" pattern="[0-9+\-\s()]*" value="' . $_POST['Tel'] . '" size="31" maxlength="30" title="' . _('The phone number should consist of numbers, spaces, parentheses, or the + character') . '" /></td>
+ <td>' . _('Telephone No') . ':' . '</td>
+ <td><input name="Tel" type="tel" pattern="[0-9+\-\s()]*" value="' . $_POST['Tel'] . '" size="31" maxlength="30" title="' . _('The phone number should consist of numbers, spaces, parentheses, or the + character') . '" /></td>
</tr>
<tr>
- <td>' . _('Facsimile No') . ':' . '</td>
- <td><input type="tel" name="Fax" pattern="[0-9+\-\s()]*" value="' . $_POST['Fax'] . '" size="31" maxlength="30" title="' . _('The fax number should consist of numbers, parentheses, spaces or the + character') . '"/></td>
+ <td>' . _('Facsimile No') . ':' . '</td>
+ <td><input name="Fax" type="tel" pattern="[0-9+\-\s()]*" value="' . $_POST['Fax'] . '" size="31" maxlength="30" title="' . _('The fax number should consist of numbers, parentheses, spaces or the + character') . '"/></td>
</tr>
<tr>
- <td>' . _('Email') . ':' . '</td>
- <td><input type="email" name="Email" value="' . $_POST['Email'] . '" size="31" maxlength="55" /></td>
+ <td>' . _('Email') . ':' . '</td>
+ <td><input name="Email" type="email" value="' . $_POST['Email'] . '" size="31" maxlength="55" /></td>
</tr>
<tr>
- <td>' . _('Tax Province') . ':' . '</td>
+ <td>' . _('Tax Province') . ':' . '</td>
<td><select name="TaxProvince">';
$TaxProvinceResult = DB_query("SELECT taxprovinceid, taxprovincename FROM taxprovinces");
@@ -668,6 +690,18 @@
echo '<option value="0">' . _('No') . '</option>';
}
echo '</select></td></tr>';
+ // Location's ledger account:
+ echo '<tr title="', _('Enter the GL account for this location, or leave it in blank if not needed'), '">
+ <td><label for="GLAccountCode">', _('GL Account Code'), ':</label></td>
+ <td><input data-type="no-illegal-chars" id="GLAccountCode" maxlength="20" name="GLAccountCode" size="20" type="text" value="', $_POST['GLAccountCode'], '" /></td></tr>';
+ // Allow or deny the invoicing of items in this location:
+ echo '<tr title="', _('Use this parameter to indicate whether these inventory location allows or denies the invoicing of its items.'), '">
+ <td><label for="AllowInvoicing">', _('Allow Invoicing'), ':</label></td>
+ <td><select name="AllowInvoicing">
+ <option', ($_POST['AllowInvoicing']==1 ? ' selected="selected"' : ''), ' value="1">', _('Yes'), '</option>
+ <option', ($_POST['AllowInvoicing']==0 ? ' selected="selected"' : ''), ' value="0">', _('No'), '</option>
+ </select></td>
+ </tr>';
/*
This functionality is not written yet ...
@@ -677,12 +711,12 @@
echo '</table>
<br />
<div class="centre">
- <input type="submit" name="submit" value="' . _('Enter Information') . '" />
+ <input type="submit" name="submit" value="' . _('Enter Information') . '" />
</div>
- </div>
+ </div>
</form>';
} //end if record deleted no point displaying form to add record
include('includes/footer.inc');
-?>
+?>
\ No newline at end of file
Modified: trunk/StockLocTransferReceive.php
===================================================================
--- trunk/StockLocTransferReceive.php 2015-05-10 01:01:51 UTC (rev 7295)
+++ trunk/StockLocTransferReceive.php 2015-05-10 04:54:12 UTC (rev 7296)
@@ -6,21 +6,22 @@
include('includes/DefineStockTransfers.php');
include('includes/session.inc');
-$Title = _('Inventory Transfer') . ' - ' . _('Receiving');
-$BookMark = "LocationTransfers";
-$ViewTopic = "Inventory";
+$Title = _('Inventory Transfer') . ' - ' . _('Receiving');// Screen identification.
+$ViewTopic = 'Inventory';// Filename's id in ManualContents.php's TOC.
+$BookMark = 'LocationTransfers';// Anchor's id in the manual's html document.
include('includes/header.inc');
+
include('includes/SQL_CommonFunctions.inc');
-if (isset($_GET['NewTransfer'])){
+if(isset($_GET['NewTransfer'])) {
unset($_SESSION['Transfer']);
}
-if ( isset($_SESSION['Transfer']) and $_SESSION['Transfer']->TrfID == ''){
+if(isset($_SESSION['Transfer']) and $_SESSION['Transfer']->TrfID == '') {
unset($_SESSION['Transfer']);
}
-if(isset($_POST['ProcessTransfer'])){
+if(isset($_POST['ProcessTransfer'])) {
/*Ok Time To Post transactions to Inventory Transfers, and Update Posted variable & received Qty's to LocTransfers */
$PeriodNo = GetPeriod ($_SESSION['Transfer']->TranDate, $db);
@@ -30,24 +31,24 @@
$i=0;
$TotalQuantity = 0;
foreach ($_SESSION['Transfer']->TransferItem AS $TrfLine) {
- if (is_numeric(filter_number_format($_POST['Qty' . $i]))){
+ if(is_numeric(filter_number_format($_POST['Qty' . $i]))) {
/*Update the quantity received from the inputs */
$_SESSION['Transfer']->TransferItem[$i]->Quantity= round(filter_number_format($_POST['Qty' . $i]),$_SESSION['Transfer']->TransferItem[$i]->DecimalPlaces);
- } elseif ($_POST['Qty' . $i]=='') {
+ } elseif($_POST['Qty' . $i]=='') {
$_SESSION['Transfer']->TransferItem[$i]->Quantity= 0;
- } else {
+ } else {
prnMsg(_('The quantity entered for'). ' ' . $TrfLine->StockID . ' '. _('is not numeric') . '. ' . _('All quantities must be numeric'),'error');
$InputError = True;
}
- if (filter_number_format($_POST['Qty' . $i])<0){
+ if(filter_number_format($_POST['Qty' . $i])<0) {
prnMsg(_('The quantity entered for'). ' ' . $TrfLine->StockID . ' '. _('is negative') . '. ' . _('All quantities must be for positive numbers greater than zero'),'error');
$InputError = True;
}
- if ($TrfLine->PrevRecvQty + $TrfLine->Quantity > $TrfLine->ShipQty){
+ if($TrfLine->PrevRecvQty + $TrfLine->Quantity > $TrfLine->ShipQty) {
prnMsg( _('The Quantity entered plus the Quantity Previously Received can not be greater than the Total Quantity shipped for').' '. $TrfLine->StockID , 'error');
$InputError = True;
}
- if (isset($_POST['CancelBalance' . $i]) and $_POST['CancelBalance' . $i]==1){
+ if(isset($_POST['CancelBalance' . $i]) and $_POST['CancelBalance' . $i]==1) {
$_SESSION['Transfer']->TransferItem[$i]->CancelBalance=1;
} else {
$_SESSION['Transfer']->TransferItem[$i]->CancelBalance=0;
@@ -55,16 +56,16 @@
$TotalQuantity += $TrfLine->Quantity;
$i++;
} /*end loop to validate and update the SESSION['Transfer'] data */
- if ($TotalQuantity < 0){
+ if($TotalQuantity < 0) {
prnMsg( _('All quantities entered are less than zero') . '. ' . _('Please correct that and try again'), 'error' );
$InputError = True;
}
//exit;
- if (!$InputError){
+ if(!$InputError) {
/*All inputs must be sensible so make the stock movement records and update the locations stocks */
foreach ($_SESSION['Transfer']->TransferItem AS $TrfLine) {
- if ($TrfLine->Quantity >=0){
+ if($TrfLine->Quantity >=0) {
$Result = DB_Txn_Begin();
/* Need to get the current location quantity will need it later for the stock movement */
@@ -74,7 +75,7 @@
AND loccode= '" . $_SESSION['Transfer']->StockLocationFrom . "'";
$Result = DB_query($SQL, _('Could not retrieve the stock quantity at the dispatch stock location prior to this transfer being processed') );
- if (DB_num_rows($Result)==1){
+ if(DB_num_rows($Result)==1) {
$LocQtyRow = DB_fetch_row($Result);
$QtyOnHandPrior = $LocQtyRow[0];
} else {
@@ -115,8 +116,8 @@
/*Insert the StockSerialMovements and update the StockSerialItems for controlled items*/
- if ($TrfLine->Controlled ==1){
- foreach($TrfLine->SerialItems as $Item){
+ if($TrfLine->Controlled ==1) {
+ foreach($TrfLine->SerialItems as $Item) {
/*We need to add or update the StockSerialItem record and
The StockSerialMoves as well */
@@ -131,7 +132,7 @@
$Result = DB_query($SQL,'<br />' . _('Could not determine if the serial item exists') );
$SerialItemExistsRow = DB_fetch_row($Result);
- if ($SerialItemExistsRow[0]==1){
+ if($SerialItemExistsRow[0]==1) {
$SQL = "UPDATE stockserialitems SET
quantity= quantity - " . $Item->BundleQty . "
@@ -188,7 +189,7 @@
AND loccode= '" . $_SESSION['Transfer']->StockLocationTo . "'";
$Result = DB_query($SQL, _('Could not retrieve the quantity on hand at the location being transferred to') );
- if (DB_num_rows($Result)==1){
+ if(DB_num_rows($Result)==1) {
$LocQtyRow = DB_fetch_row($Result);
$QtyOnHandPrior = $LocQtyRow[0];
} else {
@@ -196,6 +197,49 @@
$QtyOnHandPrior = 0;
}
+// COMMENT: "if($TrfLine->Quantity !=0) {}" should be as a general condition to avoid transactions in zero.
+
+// BEGIN: **********************************************************************
+ // Insert outgoing inventory GL transaction if any of the locations has a GL account code:
+ if(($_SESSION['Transfer']->StockLocationFromAccount !='' or $_SESSION['Transfer']->StockLocationToAccount !='') and $TrfLine->Quantity !=0) {
+ // Get the account code:
+ if($_SESSION['Transfer']->StockLocationFromAccount !='') {
+ $AccountCode = $_SESSION['Transfer']->StockLocationFromAccount;
+ } else {
+ $StockGLCode = GetStockGLCode($TrfLine->StockID, $db);// Get Category's account codes.
+ $AccountCode = $StockGLCode['stockact'];// Select account code for stock.
+ }
+ // Get the item cost:
+ $SQLstandardcost = "SELECT stockmaster.materialcost + stockmaster.labourcost + stockmaster.overheadcost AS standardcost
+ FROM stockmaster
+ WHERE stockmaster.stockid ='" . $TrfLine->StockID . "'";
+ $ErrMsg = _('The standard cost of the item cannot be retrieved because');
+ $DbgMsg = _('The SQL that failed was');
+ $myrow = DB_fetch_array(DB_query($SQLstandardcost,$ErrMsg,$DbgMsg));
+ $StandardCost = $myrow['standardcost'];// QUESTION: Standard cost for: Assembly (value="A") and Manufactured (value="M") items ?
+ // Insert record:
+ $SQL = "INSERT INTO gltrans (
+ periodno,
+ trandate,
+ type,
+ typeno,
+ account,
+ narrative,
+ amount)
+ VALUES ('" .
+ $PeriodNo . "','" .
+ $SQLTransferDate .
+ "',16,'" .
+ $_SESSION['Transfer']->TrfID . "','" .
+ $AccountCode . "','" .
+ $_SESSION['Transfer']->StockLocationFrom.' - '.$TrfLine->StockID.' x '.$TrfLine->Quantity.' @ '. $StandardCost . "','" .
+ -$TrfLine->Quantity * $StandardCost . "')";
+ $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The outgoing inventory GL transacction record could not be inserted because');
+ $DbgMsg = _('The following SQL to insert records was used');
+ $Result = DB_query($SQL, $ErrMsg, $DbgMsg, true);
+ }
+// END: ************************************************************************
+
// Insert the stock movement for the stock coming into the to location
$SQL = "INSERT INTO stockmoves (stockid,
type,
@@ -228,13 +272,11 @@
/*Get the ID of the StockMove... */
$StkMoveNo = DB_Last_Insert_ID($db,'stockmoves','stkmoveno');
- /*Insert the StockSerialMovements and update the StockSerialItems for controlled items*/
+ /*Insert the StockSerialMovements and update the StockSerialItems for controlled items*/
+ if($TrfLine->Controlled ==1) {
+ foreach($TrfLine->SerialItems as $Item) {
+ /*We need to add or update the StockSerialItem record and the StockSerialMoves as well */
- if ($TrfLine->Controlled ==1){
- foreach($TrfLine->SerialItems as $Item){
- /*We need to add or update the StockSerialItem record and
- The StockSerialMoves as well */
-
/*First need to check if the serial items already exists or not in the location to */
$SQL = "SELECT COUNT(*)
FROM stockserialitems
@@ -247,7 +289,7 @@
$SerialItemExistsRow = DB_fetch_row($Result);
- if ($SerialItemExistsRow[0]==1){
+ if($SerialItemExistsRow[0]==1) {
$SQL = "UPDATE stockserialitems SET
quantity= quantity + '" . $Item->BundleQty . "'
@@ -312,9 +354,50 @@
$DbgMsg = _('The following SQL to update the stock record was used');
$Result = DB_query($SQL, $ErrMsg, $DbgMsg, true);
+// BEGIN: **********************************************************************
+ // Insert incoming inventory GL transaction if any of the locations has a GL account code:
+ if(($_SESSION['Transfer']->StockLocationFromAccount !='' or $_SESSION['Transfer']->StockLocationToAccount !='') and $TrfLine->Quantity !=0) {
+ // Get the account code:
+ if($_SESSION['Transfer']->StockLocationToAccount !='') {
+ $AccountCode = $_SESSION['Transfer']->StockLocationToAccount;
+ } else {
+ $StockGLCode = GetStockGLCode($TrfLine->StockID, $db);// Get Category's account codes.
+ $AccountCode = $StockGLCode['stockact'];// Select account code for stock.
+ }
+ // Get the item cost:
+ $SQLstandardcost = "SELECT stockmaster.materialcost + stockmaster.labourcost + stockmaster.overheadcost AS standardcost
+ FROM stockmaster
+ WHERE stockmaster.stockid ='" . $TrfLine->StockID . "'";
+ $ErrMsg = _('The standard cost of the item cannot be retrieved because');
+ $DbgMsg = _('The SQL that failed was');
+ $myrow = DB_fetch_array(DB_query($SQLstandardcost,$ErrMsg,$DbgMsg));
+ $StandardCost = $myrow['standardcost'];// QUESTION: Standard cost for: Assembly (value="A") and Manufactured (value="M") items ?
+ // Insert record:
+ $SQL = "INSERT INTO gltrans (
+ periodno,
+ trandate,
+ type,
+ typeno,
+ account,
+ narrative,
+ amount)
+ VALUES ('" .
+ $PeriodNo . "','" .
+ $SQLTransferDate . "',
+ 16,'" .
+ $_SESSION['Transfer']->TrfID . "','" .
+ $AccountCode . "','" .
+ $_SESSION['Transfer']->StockLocationTo.' - '.$TrfLine->StockID.' x '.$TrfLine->Quantity.' @ '. $StandardCost . "','" .
+ $TrfLine->Quantity * $StandardCost . "')";
+ $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The incoming inventory GL transacction record could not be inserted because');
+ $DbgMsg = _('The following SQL to insert records was used');
+ $Result = DB_query($SQL, $ErrMsg, $DbgMsg, true);
+ }
+// END: ************************************************************************
+
prnMsg(_('A stock transfer for item code'). ' - ' . $TrfLine->StockID . ' ' . $TrfLine->ItemDescription . ' '. _('has been created from').' ' . $_SESSION['Transfer']->StockLocationFromName . ' '. _('to'). ' ' . $_SESSION['Transfer']->StockLocationToName . ' ' . _('for a quantity of'). ' '. $TrfLine->Quantity,'success');
- if ($TrfLine->CancelBalance==1){
+ if($TrfLine->CancelBalance==1) {
$sql = "UPDATE loctransfers SET recqty = recqty + '". round($TrfLine->Quantity, $TrfLine->DecimalPlaces) . "',
shipqty = recqty + '". round($TrfLine->Quantity, $TrfLine->DecimalPlaces) . "',
recdate = '".Date('Y-m-d H:i:s'). "'
@@ -323,22 +406,22 @@
} else {
$sql = "UPDATE loctransfers SET recqty = recqty + '". round($TrfLine->Quantity, $TrfLine->DecimalPlaces) . "',
recdate = '".Date('Y-m-d H:i:s'). "'
- WHERE reference = '". $_SESSION['Transfer']->TrfID . "'
- AND stockid = '". $TrfLine->StockID."'";
+ WHERE reference = '". $_SESSION['Transfer']->TrfID . "'
+ AND stockid = '". $TrfLine->StockID."'";
}
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('Unable to update the Location Transfer Record');
$Result = DB_query($sql, $ErrMsg, $DbgMsg, true);
unset ($_SESSION['Transfer']->LineItem[$i]);
unset ($_POST['Qty' . $i]);
} /*end if Quantity > 0 */
- if ($TrfLine->CancelBalance==1){
+ if($TrfLine->CancelBalance==1) {
$sql = "UPDATE loctransfers SET shipqty = recqty
WHERE reference = '". $_SESSION['Transfer']->TrfID . "'
AND stockid = '". $TrfLine->StockID."'";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('Unable to set the quantity received to the quantity shipped to cancel the balance on this transfer line');
$Result = DB_query($sql, $ErrMsg, $DbgMsg, true);
// send an email to the inventory manager about this cancellation (as can lead to employee fraud)
- if ($_SESSION['InventoryManagerEmail']!=''){
+ if($_SESSION['InventoryManagerEmail']!='') {
$ConfirmationText = _('Cancelled balance of transfer'). ': ' . $_SESSION['Transfer']->TrfID .
"\r\n" . _('From Location') . ': ' . $_SESSION['Transfer']->StockLocationFrom .
"\r\n" . _('To Location') . ': ' . $_SESSION['Transfer']->StockLocationTo .
@@ -347,7 +430,7 @@
"\r\n" . _('By user') . ': ' . $_SESSION['UserID'] .
"\r\n" . _('At') . ': ' . Date('Y-m-d H:i:s');
$EmailSubject = _('Cancelled balance of transfer'). ' ' . $_SESSION['Transfer']->TrfID;
- if($_SESSION['SmtpSetting']==0){
+ if($_SESSION['SmtpSetting']==0) {
mail($_SESSION['InventoryManagerEmail'],$EmailSubject,$ConfirmationText);
}else{
include('includes/htmlMimeMail.php');
@@ -370,7 +453,7 @@
} /*end of PRocess Transfer */
-if(isset($_GET['Trf_ID'])){
+if(isset($_GET['Trf_ID'])) {
unset($_SESSION['Transfer']);
@@ -384,7 +467,9 @@
loctransfers.shipqty,
loctransfers.recqty,
locations.locationname as shiplocationname,
+ locations.glaccountcode as shipaccountcode,
reclocations.locationname as reclocationname,
+ reclocations.glaccountcode as recaccountcode,
loctransfers.shiploc,
loctransfers.recloc
FROM loctransfers INNER JOIN locations
@@ -401,7 +486,7 @@
$DbgMsg = _('The SQL to retrieve the transfer was');
$result = DB_query($sql,$ErrMsg,$DbgMsg);
- if(DB_num_rows($result) == 0){
+ if(DB_num_rows($result) == 0) {
echo '<h3>' . _('Transfer') . ' #' . $_GET['Trf_ID'] . ' '. _('Does Not Exist') . '</h3><br />';
include('includes/footer.inc');
exit;
@@ -412,8 +497,10 @@
$_SESSION['Transfer']= new StockTransfer($_GET['Trf_ID'],
$myrow['shiploc'],
$myrow['shiplocationname'],
+ $myrow['shipaccountcode'],
$myrow['recloc'],
$myrow['reclocationname'],
+ $myrow['recaccountcode'],
Date($_SESSION['DefaultDateFormat']) );
/*Populate the StockTransfer TransferItem s array with the lines to be transferred */
$i = 0;
@@ -435,7 +522,7 @@
} /* $_GET['Trf_ID'] is set */
-if (isset($_SESSION['Transfer'])){
+if(isset($_SESSION['Transfer'])) {
//Begin Form for receiving shipment
echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/supplier.png" title="' . _('Dispatch') .
@@ -467,7 +554,7 @@
echo $tableheader;
$k=0;
foreach ($_SESSION['Transfer']->TransferItem AS $TrfLine) {
- if ($k==1){
+ if($k==1) {
echo '<tr class="EvenTableRows">';
$k=0;
} else {
@@ -479,14 +566,14 @@
<td>' . $TrfLine->ItemDescription . '</td>';
echo '<td class="number">' . locale_number_format($TrfLine->ShipQty, $TrfLine->DecimalPlaces) . '</td>';
- if (isset($_POST['Qty' . $i]) AND is_numeric(filter_number_format($_POST['Qty' . $i]))){
+ if(isset($_POST['Qty' . $i]) AND is_numeric(filter_number_format($_POST['Qty' . $i]))) {
$_SESSION['Transfer']->TransferItem[$i]->Quantity= round(filter_number_format($_POST['Qty' . $i]),$TrfLine->DecimalPlaces);
$Qty = round(filter_number_format($_POST['Qty' . $i]),$TrfLine->DecimalPlaces);
- } else if ($TrfLine->Controlled==1) {
- if (sizeOf($TrfLine->SerialItems)==0) {
+ } else if($TrfLine->Controlled==1) {
+ if(sizeOf($TrfLine->SerialItems)==0) {
$Qty = 0;
} else {
$Qty = $TrfLine->Quantity;
@@ -496,7 +583,7 @@
}
echo '<td class="number">' . locale_number_format($TrfLine->PrevRecvQty, $TrfLine->DecimalPlaces) . '</td>';
- if ($TrfLine->Controlled==1){
+ if($TrfLine->Controlled==1) {
echo '<td class="number"><input type="hidden" name="Qty' . $i . '" value="' . locale_number_format($Qty,$TrfLine->DecimalPlaces) . '" /><a href="' . $RootPath .'/StockTransferControlled.php?TransferItem=' . $i . '" />' . $Qty . '</a></td>';
} else {
echo '<td><input type="text" class="number" name="Qty' . $i . '" maxlength="10" size="auto" value="' . locale_number_format($Qty,$TrfLine->DecimalPlaces) . '" /></td>';
@@ -507,8 +594,8 @@
echo '<td><input type="checkbox" name="CancelBalance' . $i . '" value="1" /></td>';
- if ($TrfLine->Controlled==1){
- if ($TrfLine->Serialised==1){
+ if($TrfLine->Controlled==1) {
+ if($TrfLine->Serialised==1) {
echo '<td><a href="' . $RootPath .'/StockTransferControlled.php?TransferItem=' . $i . '">' . _('Enter Serial Numbers') . '</a></td>';
} else {
echo '<td><a href="' . $RootPath .'/StockTransferControlled.php?TransferItem=' . $i . '">' . _('Enter Batch Refs') . '</a></td>';
@@ -545,11 +632,11 @@
<td>' . _('Select Location Receiving Into'). ':</td>
<td>';
echo '<select name="RecLocation" onchange="ReloadForm(form1.RefreshTransferList)">';
- if (!isset($_POST['RecLocation'])){
+ if(!isset($_POST['RecLocation'])) {
$_POST['RecLocation'] = $_SESSION['UserStockLocation'];
}
- while ($myrow=DB_fetch_array($LocResult)){
- if ($myrow['loccode'] == $_POST['RecLocation']){
+ while ($myrow=DB_fetch_array($LocResult)) {
+ if($myrow['loccode'] == $_POST['RecLocation']) {
echo '<option selected="selected" value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
} else {
echo '<option value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
@@ -570,7 +657,7 @@
AND recqty < shipqty";
$TrfResult = DB_query($sql);
- if (DB_num_rows($TrfResult)>0){
+ if(DB_num_rows($TrfResult)>0) {
$LocSql = "SELECT locationname FROM locations WHERE loccode='" . $_POST['RecLocation'] . "'";
$LocResult = DB_query($LocSql);
$LocRow = DB_fetch_array($LocResult);
@@ -581,9 +668,9 @@
<th>' . _('Transfer From'). '</th>
<th>' . _('Dispatch Date'). '</th></tr>';
$k=0;
- while ($myrow=DB_fetch_array($TrfResult)){
+ while ($myrow=DB_fetch_array($TrfResult)) {
- if ($k==1){
+ if($k==1) {
echo '<tr class="EvenTableRows">';
$k=0;
} else {
@@ -597,7 +684,7 @@
</tr>';
}
echo '</table>';
- } else if (!isset($_POST['ProcessTransfer'])) {
+ } else if(!isset($_POST['ProcessTransfer'])) {
prnMsg(_('There are no incoming transfers to this location'), 'info');
}
echo '</div>
Modified: trunk/StockTransfers.php
===================================================================
--- trunk/StockTransfers.php 2015-05-10 01:01:51 UTC (rev 7295)
+++ trunk/StockTransfers.php 2015-05-10 04:54:12 UTC (rev 7296)
@@ -1,35 +1,36 @@
<?php
/* $Id$*/
-/* Inventory Transfer - Item Dispatch */
+/* Entry of point to point stock location transfers of a single part. */
include('includes/DefineSerialItems.php');
include('includes/DefineStockTransfers.php');
include('includes/session.inc');
-$Title = _('Stock Transfers');
-$BookMark = "LocationTransfers";
-$ViewTopic = "Inventory";
+$Title = _('Stock Transfers');// Screen identification.
+$ViewTopic = "Inventory";// Filename's id in ManualContents.php's TOC.
+$BookMark = "LocationTransfers";// Anchor's id in the manual's html document.
include('includes/header.inc');
+
include('includes/SQL_CommonFunctions.inc');
-if (isset($_GET['New'])) {
+if(isset($_GET['New'])) {
unset($_SESSION['Transfer']);
}
-if (isset($_GET['From'])) {
+if(isset($_GET['From'])) {
$_POST['StockLocationFrom']=$_GET['From'];
$_POST['StockLocationTo']=$_GET['To'];
$_POST['Quantity']=$_GET['Quantity'];
}
-if (isset($_POST['CheckCode'])) {
+if(isset($_POST['CheckCode'])) {
echo '<p class="page_title_text">
<img src="'.$RootPath.'/css/'.$Theme.'/images/magnifier.png" title="' . _('Dispatch') . '" alt="" />
' . ' ' . _('Select Item to Transfer') . '
</p>';
- if (mb_strlen($_POST['StockText'])>0) {
+ if(mb_strlen($_POST['StockText'])>0) {
$sql="SELECT stockid,
description
FROM stockmaster
@@ -48,7 +49,7 @@
<th class="ascending">' . _('Stock Code') . '</th>
<th class="ascending">' . _('Stock Description') . '</th>
</tr>';
- while ($myrow = DB_fetch_array($result)) {
+ while($myrow = DB_fetch_array($result)) {
echo '<tr>
<td>' . $myrow['stockid'] . '</td>
<td>' . $myrow['description'] . '</td>
@@ -64,18 +65,18 @@
$NewTransfer = false; /*initialise this first then determine from form inputs */
-if (isset($_GET['NewTransfer'])){
+if(isset($_GET['NewTransfer'])) {
unset($_SESSION['Transfer']);
unset($_SESSION['TransferItem']); /*this is defined in bulk transfers but needs to be unset for individual transfers */
$NewTransfer=$_GET['NewTransfer'];
}
-if (isset($_GET['StockID'])){ /*carry the stockid through to the form for additional inputs */
+if(isset($_GET['StockID'])) { /*carry the stockid through to the form for additional inputs */
$_POST['StockID'] = trim(mb_strtoupper($_GET['StockID']));
-} elseif (isset($_POST['StockID'])){ /* initiate a new transfer only if the StockID is different to the previous entry */
- if (isset($_SESSION['Transfer']->TransferItem[0])) {
- if ($_POST['StockID'] != $_SESSION['Transfer']->TransferItem[0]->StockID){
+} elseif(isset($_POST['StockID'])) { /* initiate a new transfer only if the StockID is different to the previous entry */
+ if(isset($_SESSION['Transfer']->TransferItem[0])) {
+ if($_POST['StockID'] != $_SESSION['Transfer']->TransferItem[0]->StockID) {
unset($_SESSION['Transfer']);
$NewTransfer = true;
}
@@ -84,12 +85,12 @@
}
}
-if ($NewTransfer){
+if($NewTransfer) {
- if(!isset($_POST['StockLocationFrom'])){
+ if(!isset($_POST['StockLocationFrom'])) {
$_POST['StockLocationFrom']='';
}
- if(!isset($_POST['StockLocationTo'])){
+ if(!isset($_POST['StockLocationTo'])) {
$_POST['StockLocationTo']='';
}
@@ -111,11 +112,11 @@
FROM stockmaster
WHERE stockid='" . trim(mb_strtoupper($_POST['StockID'])) . "'");
- if (DB_num_rows($result) == 0){
+ if(DB_num_rows($result) == 0) {
prnMsg( _('Unable to locate Stock Code').' '.mb_strtoupper($_POST['StockID']), 'error' );
- } elseif (DB_num_rows($result)>0){
+ } elseif(DB_num_rows($result)>0) {
$myrow = DB_fetch_array($result);
- $_SESSION['Transfer']->TransferItem[0] = new LineItem ( trim(mb_strtoupper($_POST['StockID'])),
+ $_SESSION['Transfer']->TransferItem[0] = new LineItem( trim(mb_strtoupper($_POST['StockID'])),
$myrow['description'],
filter_number_format($_POST['Quantity']),
$myrow['units'],
@@ -127,66 +128,66 @@
$_SESSION['Transfer']->TransferItem[0]->StandardCost = $myrow['standardcost'];
- if ($myrow['mbflag']=='D' OR $myrow['mbflag']=='A' OR $myrow['mbflag']=='K'){
+ if($myrow['mbflag']=='D' OR $myrow['mbflag']=='A' OR $myrow['mbflag']=='K') {
prnMsg(_('The part entered is either or a dummy part or an assembly or a kit-set part') . '. ' . _('These parts are not physical parts and no stock holding is maintained for them') . '. ' . _('Stock Transfers are therefore not possible'),'warn');
echo '.<hr />';
echo '<a href="' . $RootPath . '/StockTransfers.php?NewTransfer=Yes">' . _('Enter another Transfer') . '</a>';
- unset ($_SESSION['Transfer']);
- include ('includes/footer.inc');
+ unset($_SESSION['Transfer']);
+ include('includes/footer.inc');
exit;
}
}
}
-if (isset($_POST['Quantity'])
+if(isset($_POST['Quantity'])
AND isset($_SESSION['Transfer']->TransferItem[0]->Controlled)
- AND $_SESSION['Transfer']->TransferItem[0]->Controlled==0){
+ AND $_SESSION['Transfer']->TransferItem[0]->Controlled==0) {
$_SESSION['Transfer']->TransferItem[0]->Quantity = filter_number_format($_POST['Quantity']);
}
-if ( isset($_POST['StockLocationFrom'])
- AND $_POST['StockLocationFrom']!= $_SESSION['Transfer']->StockLocationFrom ){
+if(isset($_POST['StockLocationFrom'])
+ AND $_POST['StockLocationFrom']!= $_SESSION['Transfer']->StockLocationFrom ) {
$_SESSION['Transfer']->StockLocationFrom = $_POST['StockLocationFrom'];
$_SESSION['Transfer']->StockLocationTo = $_POST['StockLocationTo'];
$_SESSION['Transfer']->TransferItem[0]->Quantity=filter_number_format($_POST['Quantity']);
$_SESSION['Transfer']->TransferItem[0]->SerialItems=array();
}
-if ( isset($_POST['StockLocationTo']) ){
+if(isset($_POST['StockLocationTo']) ) {
$_SESSION['Transfer']->StockLocationTo = $_POST['StockLocationTo'];
}
-if ( isset($_POST['EnterTransfer']) ){
+if(isset($_POST['EnterTransfer']) ) {
$result = DB_query("SELECT * FROM stockmaster WHERE stockid='" . $_SESSION['Transfer']->TransferItem[0]->StockID ."'");
$myrow = DB_fetch_row($result);
$InputError = false;
- if (DB_num_rows($result)==0) {
+ if(DB_num_rows($result)==0) {
echo '<br />';
prnMsg(_('The entered item code does not exist'), 'error');
$InputError = true;
- } elseif (!is_numeric($_SESSION['Transfer']->TransferItem[0]->Quantity)){
+ } elseif(!is_numeric($_SESSION['Transfer']->TransferItem[0]->Quantity)) {
echo '<br />';
prnMsg( _('The quantity entered must be numeric'), 'error' );
$InputError = true;
- } elseif ($_SESSION['Transfer']->TransferItem[0]->Quantity <= 0){
+ } elseif($_SESSION['Transfer']->TransferItem[0]->Quantity <= 0) {
echo '<br />';
prnMsg( _('The quantity entered must be a positive number greater than zero'), 'error');
$InputError = true;
}
- if ($_SESSION['Transfer']->StockLocationFrom==$_SESSION['Transfer']->StockLocationTo){
+ if($_SESSION['Transfer']->StockLocationFrom==$_SESSION['Transfer']->StockLocationTo) {
echo '<br />';
prnMsg( _('The locations to transfer from and to must be different'), 'error');
$InputError = true;
}
- if ($InputError==False) {
+ if($InputError==False) {
/*All inputs must be sensible so make the stock movement records and update the locations stocks */
$TransferNumber = GetNextTransNo(16,$db);
- $PeriodNo = GetPeriod (Date($_SESSION['DefaultDateFormat']), $db);
+ $PeriodNo = GetPeriod(Date($_SESSION['DefaultDateFormat']), $...
[truncated message content] |
|
From: <rc...@us...> - 2015-05-10 01:01:54
|
Revision: 7295
http://sourceforge.net/p/web-erp/reponame/7295
Author: rchacon
Date: 2015-05-10 01:01:51 +0000 (Sun, 10 May 2015)
Log Message:
-----------
Minor changes: add info.
Modified Paths:
--------------
trunk/CustomerBranches.php
trunk/doc/Manual/ManualAccountsReceivable.html
Modified: trunk/CustomerBranches.php
===================================================================
--- trunk/CustomerBranches.php 2015-05-09 11:12:08 UTC (rev 7294)
+++ trunk/CustomerBranches.php 2015-05-10 01:01:51 UTC (rev 7295)
@@ -1,37 +1,36 @@
<?php
-
/* $Id$*/
+/* Defines the details of customer branches such as delivery address and contact details - also sales area, representative etc.*/
include('includes/session.inc');
-$Title = _('Customer Branches');
-/* webERP manual links before header.inc */
-$ViewTopic= 'AccountsReceivable';
-$BookMark = 'NewCustomerBranch';
+$Title = _('Customer Branches');// Screen identification.
+$ViewTopic= 'AccountsReceivable';// Filename's id in ManualContents.php's TOC.
+$BookMark = 'NewCustomerBranch';// Anchor's id in the manual's html document.
include('includes/header.inc');
+
include('includes/CountriesArray.php');
-if (isset($_GET['DebtorNo'])) {
+if(isset($_GET['DebtorNo'])) {
$DebtorNo = mb_strtoupper($_GET['DebtorNo']);
-} else if (isset($_POST['DebtorNo'])){
+} else if(isset($_POST['DebtorNo'])) {
$DebtorNo = mb_strtoupper($_POST['DebtorNo']);
}
-if (!isset($DebtorNo)) {
+if(!isset($DebtorNo)) {
prnMsg(_('This page must be called with the debtor code of the customer for whom you wish to edit the branches for').'.
- <br />' . _('When the pages is called from within the system this will always be the case').' <br />' .
+ <br />' . _('When the pages is called from within the system this will always be the case').' <br />' .
_('Select a customer first then select the link to add/edit/delete branches'),'warn');
include('includes/footer.inc');
exit;
}
-
-if (isset($_GET['SelectedBranch'])){
+if(isset($_GET['SelectedBranch'])) {
$SelectedBranch = mb_strtoupper($_GET['SelectedBranch']);
-} else if (isset($_POST['SelectedBranch'])){
+} else if(isset($_POST['SelectedBranch'])) {
$SelectedBranch = mb_strtoupper($_POST['SelectedBranch']);
}
-if (isset($Errors)) {
+if(isset($Errors)) {
unset($Errors);
}
@@ -39,7 +38,7 @@
$Errors = array();
$InputError = 0;
-if (isset($_POST['submit'])) {
+if(isset($_POST['submit'])) {
$i=1;
@@ -50,53 +49,53 @@
$_POST['BranchCode'] = mb_strtoupper($_POST['BranchCode']);
- if ($_SESSION['SalesmanLogin'] != '') {
+ if($_SESSION['SalesmanLogin'] != '') {
$_POST['Salesman'] = $_SESSION['SalesmanLogin'];
}
- if (ContainsIllegalCharacters($_POST['BranchCode']) OR mb_strstr($_POST['BranchCode'],' ')) {
+ if(ContainsIllegalCharacters($_POST['BranchCode']) OR mb_strstr($_POST['BranchCode'],' ')) {
$InputError = 1;
- prnMsg(_('The Branch code cannot contain any of the following characters')." - & \' < >",'error');
+ prnMsg(_('The Branch code cannot contain any of the following characters')." - & \' < >",'error');
$Errors[$i] = 'BranchCode';
$i++;
}
- if (mb_strlen($_POST['BranchCode'])==0) {
+ if(mb_strlen($_POST['BranchCode'])==0) {
$InputError = 1;
prnMsg(_('The Branch code must be at least one character long'),'error');
$Errors[$i] = 'BranchCode';
$i++;
}
- if (!is_numeric($_POST['FwdDate'])) {
+ if(!is_numeric($_POST['FwdDate'])) {
$InputError = 1;
prnMsg(_('The date after which invoices are charged to the following month is expected to be a number and a recognised number has not been entered'),'error');
$Errors[$i] = 'FwdDate';
$i++;
}
- if ($_POST['FwdDate'] >30) {
+ if($_POST['FwdDate'] >30) {
$InputError = 1;
prnMsg(_('The date (in the month) after which invoices are charged to the following month should be a number less than 31'),'error');
$Errors[$i] = 'FwdDate';
$i++;
}
- if (!is_numeric(filter_number_format($_POST['EstDeliveryDays']))) {
+ if(!is_numeric(filter_number_format($_POST['EstDeliveryDays']))) {
$InputError = 1;
prnMsg(_('The estimated delivery days is expected to be a number and a recognised number has not been entered'),'error');
$Errors[$i] = 'EstDeliveryDays';
$i++;
}
- if (filter_number_format($_POST['EstDeliveryDays']) >60) {
+ if(filter_number_format($_POST['EstDeliveryDays']) >60) {
$InputError = 1;
prnMsg(_('The estimated delivery days should be a number of days less than 60') . '. ' . _('A package can be delivered by seafreight anywhere in the world normally in less than 60 days'),'error');
$Errors[$i] = 'EstDeliveryDays';
$i++;
}
- if (!isset($_POST['EstDeliveryDays'])) {
+ if(!isset($_POST['EstDeliveryDays'])) {
$_POST['EstDeliveryDays']=1;
}
- if (!isset($Latitude)) {
+ if(!isset($Latitude)) {
$Latitude=0.0;
$Longitude=0.0;
}
- if ($_SESSION['geocode_integration']==1 ){
+ if($_SESSION['geocode_integration']==1 ) {
// Get the lat/long from our geocoding host
$SQL = "SELECT * FROM geocode_param WHERE 1";
$ErrMsg = _('An error occurred in retrieving the information');
@@ -106,9 +105,9 @@
$map_host = $row['map_host'];
define('MAPS_HOST', $map_host);
define('KEY', $api_key);
- if ($map_host=="") {
+ if($map_host=="") {
// check that some sane values are setup already in geocode tables, if not skip the geocoding but add the record anyway.
- echo '<div class="warn">' . _('Warning - Geocode Integration is enabled, but no hosts are setup. Go to Geocode Setup') . '</div>';
+ echo '<div class="warn">' . _('Warning - Geocode Integration is enabled, but no hosts are setup. Go to Geocode Setup') . '</div>';
} else {
$address = $_POST['BrAddress1'] . ', ' . $_POST['BrAddress2'] . ', ' . $_POST['BrAddress3'] . ', ' . $_POST['BrAddress4'];
$base_url = 'http://' . MAPS_HOST . '/maps/geo?output=xml&key=' . KEY;
@@ -121,7 +120,7 @@
$Longitude = $CoordinatesSplit[0];
$Status = $xml->Response->Status->code;
- if (strcmp($Status, '200') == 0) {
+ if(strcmp($Status, '200') == 0) {
// Successful geocode
$Geocode_Pending = false;
$Coordinates = $xml->Response->Placemark->Point->Coordinates;
@@ -137,7 +136,7 @@
}
}
}
- if (isset($SelectedBranch) AND $InputError !=1) {
+ if(isset($SelectedBranch) AND $InputError !=1) {
/*SelectedBranch could also exist if submit had not been clicked this code would not run in this case cos submit is false of course see the delete code below*/
@@ -172,13 +171,13 @@
deliverblind='" . $_POST['DeliverBlind'] . "'
WHERE branchcode = '".$SelectedBranch."' AND debtorno='".$DebtorNo."'";
- if ($_SESSION['SalesmanLogin'] != '') {
+ if($_SESSION['SalesmanLogin'] != '') {
$SQL .= " AND custbranch.salesman='" . $_SESSION['SalesmanLogin'] . "'";
}
$msg = $_POST['BrName'] . ' '._('branch has been updated.');
- } else if ($InputError !=1) {
+ } else if($InputError !=1) {
/*Selected branch is null cos no item selected on first time round so must be adding a record must be submitting new entries in the new Customer Branches form */
@@ -251,11 +250,11 @@
//run the SQL from either of the above possibilites
$ErrMsg = _('The branch record could not be inserted or updated because');
- if ($InputError==0) {
+ if($InputError==0) {
$result = DB_query($SQL, $ErrMsg);
}
- if (DB_error_no() ==0 AND $InputError==0) {
+ if(DB_error_no() ==0 AND $InputError==0) {
prnMsg($msg,'success');
unset($_POST['BranchCode']);
unset($_POST['BrName']);
@@ -287,7 +286,7 @@
unset($_POST['DeliverBlind']);
unset($SelectedBranch);
}
-} else if (isset($_GET['delete'])) {
+} else if(isset($_GET['delete'])) {
//the link to delete a selected record was clicked instead of the submit button
// PREVENT DELETES IF DEPENDENT RECORDS IN 'DebtorTrans'
@@ -296,7 +295,7 @@
$result = DB_query($SQL);
$myrow = DB_fetch_row($result);
- if ($myrow[0]>0) {
+ if($myrow[0]>0) {
prnMsg(_('Cannot delete this branch because customer transactions have been created to this branch') . '<br />' .
_('There are').' ' . $myrow[0] . ' '._('transactions with this Branch Code'),'error');
@@ -306,7 +305,7 @@
$result = DB_query($SQL);
$myrow = DB_fetch_row($result);
- if ($myrow[0]>0) {
+ if($myrow[0]>0) {
prnMsg(_('Cannot delete this branch because sales analysis records exist for it'),'error');
echo '<br />' . _('There are').' ' . $myrow[0] . ' '._('sales analysis records with this Branch Code/customer');
@@ -316,7 +315,7 @@
$result = DB_query($SQL);
$myrow = DB_fetch_row($result);
- if ($myrow[0]>0) {
+ if($myrow[0]>0) {
prnMsg(_('Cannot delete this branch because sales orders exist for it') . '. ' . _('Purge old sales orders first'),'warn');
echo '<br />' . _('There are').' ' . $myrow[0] . ' '._('sales orders for this Branch/customer');
} else {
@@ -326,7 +325,7 @@
$result = DB_query($SQL);
$myrow = DB_fetch_row($result);
- if ($myrow[0]>0) {
+ if($myrow[0]>0) {
prnMsg(_('Cannot delete this branch because users exist that refer to it') . '. ' . _('Purge old users first'),'warn');
echo '<br />' . _('There are') . ' ' . $myrow[0] . ' '._('users referring to this Branch/customer');
} else {
@@ -335,8 +334,8 @@
$result = DB_query($SQL);
$myrow = DB_fetch_row($result);
-
- if ($myrow[0]>0) {
+
+ if($myrow[0]>0) {
prnMsg(_('Cannot delete this branch because contract have been created that refer to it') . '. ' . _('Purge old contracts first'),'warn');
echo '<br />' . _('There are') . ' ' . $myrow[0] . ' '._('contracts referring to this branch/customer');
} else {
@@ -345,17 +344,17 @@
$result = DB_query($SQL);
$myrow = DB_fetch_row($result);
-
- if ($myrow[0]==1) {
+
+ if($myrow[0]==1) {
prnMsg(_('Cannot delete this branch because it is the only branch defined for this customer.'),'warn');
} else {
$SQL="DELETE FROM custbranch WHERE branchcode='" . $SelectedBranch . "' AND debtorno='" . $DebtorNo . "'";
- if ($_SESSION['SalesmanLogin'] != '') {
+ if($_SESSION['SalesmanLogin'] != '') {
$SQL .= " AND custbranch.salesman='" . $_SESSION['SalesmanLogin'] . "'";
}
$ErrMsg = _('The branch record could not be deleted') . ' - ' . _('the SQL server returned the following message');
$result = DB_query($SQL,$ErrMsg);
- if (DB_error_no()==0){
+ if(DB_error_no()==0) {
prnMsg(_('Branch Deleted'),'success');
}
}
@@ -366,7 +365,7 @@
} //end ifs to test if the branch can be deleted
}
-if (!isset($SelectedBranch)){
+if(!isset($SelectedBranch)) {
/* It could still be the second time the page has been run and a record has been selected for modification - SelectedBranch will exist because it was sent with the new call. If its the first time the page has been displayed with no parameters then none of the above are true and the list of branches will be displayed with links to delete or edit each. These will call the same page again and allow update/input or deletion of the records*/
@@ -390,8 +389,8 @@
INNER JOIN taxgroups
ON custbranch.taxgroupid=taxgroups.taxgroupid
WHERE custbranch.debtorno = '".$DebtorNo."'";
-
- if ($_SESSION['SalesmanLogin'] != '') {
+
+ if($_SESSION['SalesmanLogin'] != '') {
$SQL .= " AND custbranch.salesman='" . $_SESSION['SalesmanLogin'] . "'";
}
@@ -399,9 +398,11 @@
$myrow = DB_fetch_row($result);
$TotalEnable = 0;
$TotalDisable = 0;
- if ($myrow) {
- echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/customer.png" title="' . _('Customer') . '" alt="" />
- ' . ' ' . _('Branches defined for'). ' '. $DebtorNo . ' - ' . $myrow[0] . '</p>';
+ if($myrow) {
+ echo '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/customer.png" title="',// Icon image.
+ _('Customer'), '" /> ',// Icon title.
+ _('Branches defined for'), ' ', $DebtorNo, ' - ', $myrow[0], '</p>';// Page title.
echo '<table class="selection">
<tr>
<th class="ascending">' . _('Code') . '</th>
@@ -418,7 +419,7 @@
$k=0;
do {
- if ($k==1){
+ if($k==1) {
echo '<tr class="EvenTableRows">';
$k=0;
} else {
@@ -458,14 +459,14 @@
urlencode($myrow[1]),
_('Delete Branch'));
- if ($myrow[10]){
+ if($myrow[10]) {
$TotalDisable++;
}else {
$TotalEnable++;
}
-
} while ($myrow = DB_fetch_row($result));
//END WHILE LIST LOOP
+
echo '</table>
<br />
<table class="selection">
@@ -489,7 +490,7 @@
$result = DB_query($SQL);
$myrow = DB_fetch_row($result);
- echo '<div class="page_help_text">' . _('No Branches are defined for').' - '.$myrow[0]. '. ' . _('You must have a minimum of one branch for each Customer. Please add a branch now.') . '</div>';
+ echo '<div class="page_help_text">' . _('No Branches are defined for').' - '.$myrow[0]. '. ' . _('You must have a minimum of one branch for each Customer. Please add a branch now.') . '</div>';
$_POST['BranchCode'] = mb_substr($DebtorNo,0,10);
$_POST['BrName'] = $myrow[0];
$_POST['BrAddress1'] = $myrow[1];
@@ -502,12 +503,12 @@
}
}
-if (!isset($_GET['delete'])) {
+if(!isset($_GET['delete'])) {
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') .'">';
echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
- if (isset($SelectedBranch)) {
+ if(isset($SelectedBranch)) {
//editing an existing branch
$SQL = "SELECT branchcode,
@@ -541,30 +542,30 @@
FROM custbranch
WHERE branchcode='".$SelectedBranch."'
AND debtorno='".$DebtorNo."'";
-
- if ($_SESSION['SalesmanLogin'] != '') {
+
+ if($_SESSION['SalesmanLogin'] != '') {
$SQL .= " AND custbranch.salesman='" . $_SESSION['SalesmanLogin'] . "'";
}
$result = DB_query($SQL);
$myrow = DB_fetch_array($result);
- if ($InputError==0) {
+ if($InputError==0) {
$_POST['BranchCode'] = $myrow['branchcode'];
- $_POST['BrName'] = $myrow['brname'];
- $_POST['BrAddress1'] = $myrow['braddress1'];
- $_POST['BrAddress2'] = $myrow['braddress2'];
- $_POST['BrAddress3'] = $myrow['braddress3'];
- $_POST['BrAddress4'] = $myrow['braddress4'];
- $_POST['BrAddress5'] = $myrow['braddress5'];
- $_POST['BrAddress6'] = $myrow['braddress6'];
- $_POST['SpecialInstructions'] = $myrow['specialinstructions'];
- $_POST['BrPostAddr1'] = $myrow['brpostaddr1'];
- $_POST['BrPostAddr2'] = $myrow['brpostaddr2'];
- $_POST['BrPostAddr3'] = $myrow['brpostaddr3'];
- $_POST['BrPostAddr4'] = $myrow['brpostaddr4'];
- $_POST['BrPostAddr5'] = $myrow['brpostaddr5'];
- $_POST['EstDeliveryDays'] = locale_number_format($myrow['estdeliverydays'],0);
+ $_POST['BrName'] = $myrow['brname'];
+ $_POST['BrAddress1'] = $myrow['braddress1'];
+ $_POST['BrAddress2'] = $myrow['braddress2'];
+ $_POST['BrAddress3'] = $myrow['braddress3'];
+ $_POST['BrAddress4'] = $myrow['braddress4'];
+ $_POST['BrAddress5'] = $myrow['braddress5'];
+ $_POST['BrAddress6'] = $myrow['braddress6'];
+ $_POST['SpecialInstructions'] = $myrow['specialinstructions'];
+ $_POST['BrPostAddr1'] = $myrow['brpostaddr1'];
+ $_POST['BrPostAddr2'] = $myrow['brpostaddr2'];
+ $_POST['BrPostAddr3'] = $myrow['brpostaddr3'];
+ $_POST['BrPostAddr4'] = $myrow['brpostaddr4'];
+ $_POST['BrPostAddr5'] = $myrow['brpostaddr5'];
+ $_POST['EstDeliveryDays'] = locale_number_format($myrow['estdeliverydays'],0);
$_POST['FwdDate'] =$myrow['fwddate'];
$_POST['ContactName'] = $myrow['contactname'];
$_POST['Salesman'] =$myrow['salesman'];
@@ -585,7 +586,7 @@
echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/customer.png" title="' . _('Customer') . '" alt="" />
' . ' ' . _('Change Details for Branch'). ' '. $SelectedBranch . '</p>';
- if (isset($SelectedBranch)) {
+ if(isset($SelectedBranch)) {
echo '<div class="centre"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?DebtorNo=' . $DebtorNo. '">' . _('Show all branches defined for'). ' '. $DebtorNo . '</a></div>';
}
echo '<br />
@@ -602,10 +603,10 @@
} else { //end of if $SelectedBranch only do the else when a new record is being entered
- /* SETUP ANY $_GET VALUES THAT ARE PASSED. This really is just used coming from the Customers.php when a new customer is created.
+ /* SETUP ANY $_GET VALUES THAT ARE PASSED. This really is just used coming from the Customers.php when a new customer is created.
Maybe should only do this when that page is the referrer?
*/
- if (isset($_GET['BranchCode'])){
+ if(isset($_GET['BranchCode'])) {
$SQL="SELECT name,
address1,
address2,
@@ -619,7 +620,7 @@
$result = DB_query($SQL);
$myrow = DB_fetch_array($result);
$_POST['BranchCode'] = $_GET['BranchCode'];
- $_POST['BrName'] = $myrow['name'];
+ $_POST['BrName'] = $myrow['name'];
$_POST['BrAddress1'] = $myrow['addrsss1'];
$_POST['BrAddress2'] = $myrow['addrsss2'];
$_POST['BrAddress3'] = $myrow['addrsss3'];
@@ -627,14 +628,14 @@
$_POST['BrAddress5'] = $myrow['addrsss5'];
$_POST['BrAddress6'] = $myrow['addrsss6'];
}
- if (!isset($_POST['BranchCode'])) {
+ if(!isset($_POST['BranchCode'])) {
$_POST['BranchCode']='';
}
echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/customer.png" title="' . _('Customer') . '" alt="" />' . ' ' . _('Add a Branch') . '</p>';
echo '<table class="selection">
<tr>
<td>' . _('Branch Code'). ':</td>
- <td><input data-type="no-illegal-chars" ' . (in_array('BranchCode',$Errors) ? 'class="inputerror"' : '' ) . ' tabindex="1" type="text" name="BranchCode" required="required" title ="'._('Up to 10 characters for the branch code. The following characters are prohibited:') . ' \' " + . & \\ > <" placeholder="'._('alpha-numeric').'" size="12" maxlength="10" value="' . $_POST['BranchCode'] . '" /></td>
+ <td><input data-type="no-illegal-chars" ' . (in_array('BranchCode',$Errors) ? 'class="inputerror"' : '' ) . ' tabindex="1" type="text" name="BranchCode" required="required" title ="'._('Up to 10 characters for the branch code. The following characters are prohibited:') . ' \' " + . & \\ > <" placeholder="'._('alpha-numeric').'" size="12" maxlength="10" value="' . $_POST['BranchCode'] . '" /></td>
</tr>';
$_POST['DeliverBlind'] = $_SESSION['DefaultBlindPackNote'];
}
@@ -646,61 +647,61 @@
echo _('Branch Name').':</td>';
- if (!isset($_POST['BrName'])) {$_POST['BrName']='';}
+ if(!isset($_POST['BrName'])) {$_POST['BrName']='';}
echo '<td><input tabindex="2" type="text" autofocus="autofocus" required="required" name="BrName" title="' . _('The branch name should identify the particular delivery address of the customer and must be entered') . '" minlength="5" size="41" maxlength="40" value="'. $_POST['BrName'].'" /></td>
</tr>';
echo '<tr>
<td>' . _('Branch Contact').':</td>';
- if (!isset($_POST['ContactName'])) {$_POST['ContactName']='';}
+ if(!isset($_POST['ContactName'])) {$_POST['ContactName']='';}
echo '<td><input tabindex="3" type="text" name="ContactName" required="required" size="41" maxlength="40" value="'. $_POST['ContactName'].'" /></td>
</tr>';
echo '<tr><td>' . _('Street Address 1 (Street)').':</td>';
- if (!isset($_POST['BrAddress1'])) {
+ if(!isset($_POST['BrAddress1'])) {
$_POST['BrAddress1']='';
}
echo '<td><input tabindex="4" type="text" name="BrAddress1" size="41" maxlength="40" value="'. $_POST['BrAddress1'].'" /></td>
</tr>
<tr>
<td>' . _('Street Address 2 (Street)').':</td>';
- if (!isset($_POST['BrAddress2'])) {
+ if(!isset($_POST['BrAddress2'])) {
$_POST['BrAddress2']='';
}
echo '<td><input tabindex="5" type="text" name="BrAddress2" size="41" maxlength="40" value="'. $_POST['BrAddress2'].'" /></td>
</tr>
<tr>
<td>' . _('Street Address 3 (Suburb/City)').':</td>';
- if (!isset($_POST['BrAddress3'])) {
+ if(!isset($_POST['BrAddress3'])) {
$_POST['BrAddress3']='';
}
echo '<td><input tabindex="6" type="text" name="BrAddress3" size="41" maxlength="40" value="'. $_POST['BrAddress3'].'" /></td>
</tr>
<tr>
<td>' . _('Street Address 4 (State/Province)').':</td>';
- if (!isset($_POST['BrAddress4'])) {
+ if(!isset($_POST['BrAddress4'])) {
$_POST['BrAddress4']='';
}
echo '<td><input tabindex="7" type="text" name="BrAddress4" size="51" maxlength="50" value="'. $_POST['BrAddress4'].'" /></td>
</tr>
<tr>
<td>' . _('Street Address 5 (Postal Code)').':</td>';
- if (!isset($_POST['BrAddress5'])) {
+ if(!isset($_POST['BrAddress5'])) {
$_POST['BrAddress5']='';
}
echo '<td><input tabindex="8" type="text" name="BrAddress5" size="21" maxlength="20" value="'. $_POST['BrAddress5'].'" /></td>
</tr>
<tr>
<td>' . _('Country').':</td>';
- if (!isset($_POST['BrAddress6'])) {
+ if(!isset($_POST['BrAddress6'])) {
$_POST['BrAddress6']='';
}
echo '<td><select name="BrAddress6">';
- foreach ($CountriesArray as $CountryEntry => $CountryName){
- if (isset($_POST['BrAddress6']) AND ($_POST['BrAddress6'] == $CountryName)){
- echo '<option selected="selected" value="' . $CountryName . '">' . $CountryName . '</option>';
- }elseif (!isset($_POST['BrAddress6']) AND $CountryName == "") {
- echo '<option selected="selected" value="' . $CountryName . '">' . $CountryName . '</option>';
+ foreach ($CountriesArray as $CountryEntry => $CountryName) {
+ if(isset($_POST['BrAddress6']) AND ($_POST['BrAddress6'] == $CountryName)) {
+ echo '<option selected="selected" value="' . $CountryName . '">' . $CountryName . '</option>';
+ }elseif(!isset($_POST['BrAddress6']) AND $CountryName == "") {
+ echo '<option selected="selected" value="' . $CountryName . '">' . $CountryName . '</option>';
} else {
- echo '<option value="' . $CountryName . '">' . $CountryName . '</option>';
+ echo '<option value="' . $CountryName . '">' . $CountryName . '</option>';
}
}
echo '</select></td>
@@ -708,27 +709,27 @@
echo '<tr>
<td>' . _('Special Instructions').':</td>';
- if (!isset($_POST['SpecialInstructions'])) {
+ if(!isset($_POST['SpecialInstructions'])) {
$_POST['SpecialInstructions']='';
}
echo '<td><input tabindex="10" type="text" name="SpecialInstructions" size="56" value="'. $_POST['SpecialInstructions'].'" /></td>
</tr>
<tr>
<td>' . _('Default days to deliver').':</td>';
- if (!isset($_POST['EstDeliveryDays'])) {
+ if(!isset($_POST['EstDeliveryDays'])) {
$_POST['EstDeliveryDays']=0;
}
- echo '<td><input ' .(in_array('EstDeliveryDays',$Errors) ? 'class="inputerror"' : '' ) .' tabindex="11" type="text" class="integer" name="EstDeliveryDays" size="4" maxlength="2" value="'. $_POST['EstDeliveryDays'].'" /></td>
+ echo '<td><input ' .(in_array('EstDeliveryDays',$Errors) ? 'class="inputerror"' : '' ) .' tabindex="11" type="text" class="integer" name="EstDeliveryDays" size="4" maxlength="2" value="'. $_POST['EstDeliveryDays'].'" /></td>
</tr>
<tr>
<td>' . _('Forward Date After (day in month)').':</td>';
- if (!isset($_POST['FwdDate'])) {
+ if(!isset($_POST['FwdDate'])) {
$_POST['FwdDate']=0;
}
- echo '<td><input ' .(in_array('FwdDate',$Errors) ? 'class="inputerror"' : '' ) .' tabindex="12" class="integer" name="FwdDate" size="4" maxlength="2" value="'. $_POST['FwdDate'].'" /></td>
+ echo '<td><input ' .(in_array('FwdDate',$Errors) ? 'class="inputerror"' : '' ) .' tabindex="12" class="integer" name="FwdDate" size="4" maxlength="2" value="'. $_POST['FwdDate'].'" /></td>
</tr>';
- if ($_SESSION['SalesmanLogin'] != '') {
+ if($_SESSION['SalesmanLogin'] != '') {
echo '<tr>
<td>' . _('Salesperson').':</td><td>';
echo $_SESSION['UsersRealName'];
@@ -744,7 +745,7 @@
$result = DB_query($SQL);
- if (DB_num_rows($result)==0){
+ if(DB_num_rows($result)==0) {
echo '</table>';
prnMsg(_('There are no sales people defined as yet') . ' - ' . _('customer branches must be allocated to a sales person') . '. ' . _('Please use the link below to define at least one sales person'),'error');
echo '<p align="center"><a href="' . $RootPath . '/SalesPeople.php">' . _('Define Sales People') . '</a>';
@@ -757,7 +758,7 @@
<td><select tabindex="13" name="Salesman">';
while ($myrow = DB_fetch_array($result)) {
- if (isset($_POST['Salesman']) AND $myrow['salesmancode']==$_POST['Salesman']) {
+ if(isset($_POST['Salesman']) AND $myrow['salesmancode']==$_POST['Salesman']) {
echo '<option selected="selected" value="';
} else {
echo '<option value="';
@@ -773,7 +774,7 @@
}
$SQL = "SELECT areacode, areadescription FROM areas";
$result = DB_query($SQL);
- if (DB_num_rows($result)==0){
+ if(DB_num_rows($result)==0) {
echo '</table>';
prnMsg(_('There are no areas defined as yet') . ' - ' . _('customer branches must be allocated to an area') . '. ' . _('Please use the link below to define at least one sales area'),'error');
echo '<br /><a href="' . $RootPath. '/Areas.php">' . _('Define Sales Areas') . '</a>';
@@ -785,7 +786,7 @@
<td>' . _('Sales Area').':</td>
<td><select tabindex="14" name="Area">';
while ($myrow = DB_fetch_array($result)) {
- if (isset($_POST['Area']) AND $myrow['areacode']==$_POST['Area']) {
+ if(isset($_POST['Area']) AND $myrow['areacode']==$_POST['Area']) {
echo '<option selected="selected" value="';
} else {
echo '<option value="';
@@ -799,10 +800,10 @@
</tr>';
DB_data_seek($result,0);
- $SQL = "SELECT locations.loccode, locationname FROM locations INNER JOIN locationusers ON locationusers.loccode=locations.loccode AND locationusers.userid='" . $_SESSION['UserID'] . "' AND locationusers.canupd=1";
+ $SQL = "SELECT locations.loccode, locationname FROM locations INNER JOIN locationusers ON locationusers.loccode=locations.loccode AND locationusers.userid='" . $_SESSION['UserID'] . "' AND locationusers.canupd=1";
$result = DB_query($SQL);
- if (DB_num_rows($result)==0){
+ if(DB_num_rows($result)==0) {
echo '</table>';
prnMsg(_('There are no stock locations defined as yet') . ' - ' . _('customer branches must refer to a default location where stock is normally drawn from') . '. ' . _('Please use the link below to define at least one stock location'),'error');
echo '<br /><a href="' . $RootPath . '/Locations.php">' . _('Define Stock Locations') . '</a>';
@@ -815,7 +816,7 @@
<td><select tabindex="15" name="DefaultLocation">';
while ($myrow = DB_fetch_array($result)) {
- if (isset($_POST['DefaultLocation']) AND $myrow['loccode']==$_POST['DefaultLocation']) {
+ if(isset($_POST['DefaultLocation']) AND $myrow['loccode']==$_POST['DefaultLocation']) {
echo '<option selected="selected" value="';
} else {
echo '<option value="';
@@ -828,7 +829,7 @@
</tr>
<tr>
<td>' . _('Phone Number').':</td>';
- if (!isset($_POST['PhoneNo'])) {
+ if(!isset($_POST['PhoneNo'])) {
$_POST['PhoneNo']='';
}
echo '<td><input tabindex="16" type="tel" name="PhoneNo" pattern="[0-9+()\s-]*" size="22" maxlength="20" value="'. $_POST['PhoneNo'].'" /></td>
@@ -836,18 +837,18 @@
echo '<tr>
<td>' . _('Fax Number').':</td>';
- if (!isset($_POST['FaxNo'])) {
+ if(!isset($_POST['FaxNo'])) {
$_POST['FaxNo']='';
}
echo '<td><input tabindex="17" type="tel" name="FaxNo" pattern="[0-9+()\s-]*" size="22" maxlength="20" value="'. $_POST['FaxNo'].'" /></td>
</tr>';
- if (!isset($_POST['Email'])) {
+ if(!isset($_POST['Email'])) {
$_POST['Email']='';
}
echo '<tr>
<td>' . (($_POST['Email']) ? '<a href="Mailto:'.$_POST['Email'].'">' . _('Email').':</a>' : _('Email').':') . '</td>';
- //only display email link if there is an email address
+ //only display email link if there is an email address
echo '<td><input tabindex="18" type="email" name="Email" placeholder="e.g. ex...@do..." size="56" maxlength="55" value="'. $_POST['Email'].'" /></td>
</tr>';
@@ -855,7 +856,7 @@
$SQL = "SELECT taxgroupid, taxgroupdescription FROM taxgroups";
$TaxGroupResults = DB_query($SQL);
- if (DB_num_rows($TaxGroupResults)==0){
+ if(DB_num_rows($TaxGroupResults)==0) {
echo '</table>';
prnMsg(_('There are no tax groups defined - these must be set up first before any branches can be set up') . '
<br /><a href="' . $RootPath . '/TaxGroups.php">' . _('Define Tax Groups') . '</a>','error');
@@ -867,7 +868,7 @@
<td><select tabindex="19" name="TaxGroup">';
while ($myrow = DB_fetch_array($TaxGroupResults)) {
- if (isset($_POST['TaxGroup']) AND $myrow['taxgroupid']==$_POST['TaxGroup']) {
+ if(isset($_POST['TaxGroup']) AND $myrow['taxgroupid']==$_POST['TaxGroup']) {
echo '<option selected="selected" value="';
} else {
echo '<option value="';
@@ -881,7 +882,7 @@
<tr>
<td>' . _('Transactions on this branch') . ':</td>
<td><select tabindex="20" name="DisableTrans">';
- if (isset($_POST['DisableTrans']) AND $_POST['DisableTrans']==0){
+ if(isset($_POST['DisableTrans']) AND $_POST['DisableTrans']==0) {
echo '<option selected="selected" value="0">' . _('Enabled') . '</option>
<option value="1">' . _('Disabled') . '</option>';
} else {
@@ -891,12 +892,12 @@
echo ' </select></td>
</tr>';
-
-
+
+
$SQL = "SELECT shipper_id, shippername FROM shippers";
$ShipperResults = DB_query($SQL);
- if (DB_num_rows($ShipperResults)==0){
+ if(DB_num_rows($ShipperResults)==0) {
echo '</table>';
prnMsg(_('There are no shippers defined - these must be set up first before any branches can be set up') . '
<br /><a href="' . $RootPath . '/Shippers.php">' . _('Define Shippers') . '</a>','error');
@@ -906,8 +907,8 @@
echo '<tr>
<td>' . _('Default freight/shipper method') . ':</td>
<td><select tabindex="21" name="DefaultShipVia">';
- while ($myrow=DB_fetch_array($ShipperResults)){
- if (isset($_POST['DefaultShipVia'])and $myrow['shipper_id']==$_POST['DefaultShipVia']){
+ while ($myrow=DB_fetch_array($ShipperResults)) {
+ if(isset($_POST['DefaultShipVia'])and $myrow['shipper_id']==$_POST['DefaultShipVia']) {
echo '<option selected="selected" value="' . $myrow['shipper_id'] . '">' . $myrow['shippername'] . '</option>';
}else {
echo '<option value="' . $myrow['shipper_id'] . '">' . $myrow['shippername'] . '</option>';
@@ -923,9 +924,9 @@
echo '<tr>
<td>' . _('Default Packlist') . ':</td>
<td><select tabindex="22" name="DeliverBlind">';
- if ($_POST['DeliverBlind']==2){
+ if($_POST['DeliverBlind']==2) {
echo '<option value="1">' . _('Show company details and logo') . '</option>
- <option selected="selected" value="2">' . _('Hide company details and logo') . '</option>';
+ <option selected="selected" value="2">' . _('Hide company details and logo') . '</option>';
} else {
echo '<option selected="selected" value="1">' . _('Show company details and logo') . '</option>
<option value="2">' . _('Hide company details and logo') . '</option>';
@@ -933,7 +934,7 @@
echo '</select></td>
</tr>';
- if (!isset($_POST['BrPostAddr1'])) { // Postal address, line 1. Database: custbranch.brpostaddr1, varchar(40)
+ if(!isset($_POST['BrPostAddr1'])) {// Postal address, line 1. Database: custbranch.brpostaddr1, varchar(40)
$_POST['BrPostAddr1']='';
}
echo '<tr>
@@ -941,7 +942,7 @@
<td><input tabindex="23" type="text" name="BrPostAddr1" size="41" maxlength="40" value="'. $_POST['BrPostAddr1'].'" /></td>
</tr>';
- if (!isset($_POST['BrPostAddr2'])) { // Postal address, line 2. Database: custbranch.brpostaddr2, varchar(40)
+ if(!isset($_POST['BrPostAddr2'])) {// Postal address, line 2. Database: custbranch.brpostaddr2, varchar(40)
$_POST['BrPostAddr2']='';
}
echo '<tr>
@@ -949,7 +950,7 @@
<td><input tabindex="24" type="text" name="BrPostAddr2" size="41" maxlength="40" value="'. $_POST['BrPostAddr2'].'" /></td>
</tr>';
- if (!isset($_POST['BrPostAddr3'])) { // Postal address, line 3. Database: custbranch.brpostaddr3, varchar(40)
+ if(!isset($_POST['BrPostAddr3'])) {// Postal address, line 3. Database: custbranch.brpostaddr3, varchar(40)
$_POST['BrPostAddr3']='';
}
echo '<tr>
@@ -957,7 +958,7 @@
<td><input tabindex="25" type="text" name="BrPostAddr3" size="41" maxlength="40" value="'. $_POST['BrPostAddr3'].'" /></td>
</tr>';
- if (!isset($_POST['BrPostAddr4'])) { // Postal address, line 4. Database: custbranch.brpostaddr4, varchar(40)
+ if(!isset($_POST['BrPostAddr4'])) {// Postal address, line 4. Database: custbranch.brpostaddr4, varchar(40)
$_POST['BrPostAddr4']='';
}
echo '<tr>
@@ -965,7 +966,7 @@
<td><input tabindex="26" type="text" name="BrPostAddr4" size="41" maxlength="40" value="'. $_POST['BrPostAddr4'].'" /></td>
</tr>';
- if (!isset($_POST['BrPostAddr5'])) { // Postal address, line 5. Database: custbranch.brpostaddr5, varchar(20)
+ if(!isset($_POST['BrPostAddr5'])) {// Postal address, line 5. Database: custbranch.brpostaddr5, varchar(20)
$_POST['BrPostAddr5']='';
}
echo '<tr>
@@ -973,7 +974,7 @@
<td><input tabindex="27" type="text" name="BrPostAddr5" size="21" maxlength="20" value="'. $_POST['BrPostAddr5'].'" /></td>
</tr>';
- if (!isset($_POST['CustBranchCode'])) {
+ if(!isset($_POST['CustBranchCode'])) {
$_POST['CustBranchCode']='';
}
echo '<tr>
@@ -991,4 +992,4 @@
} //end if record deleted no point displaying form to add record
include('includes/footer.inc');
-?>
+?>
\ No newline at end of file
Modified: trunk/doc/Manual/ManualAccountsReceivable.html
===================================================================
--- trunk/doc/Manual/ManualAccountsReceivable.html 2015-05-09 11:12:08 UTC (rev 7294)
+++ trunk/doc/Manual/ManualAccountsReceivable.html 2015-05-10 01:01:51 UTC (rev 7295)
@@ -98,7 +98,6 @@
</div>
<h2><a id="NewCustomerBranch">Entering Customer Branches</a></h2>
-
<p>A customer code entered on its own is insufficient to enter sales orders against. All customers must have at least one branch. The branch records contain the information about the delivery address, the sales area, the tax code, the sales representative and other regional information. New branches can be set up at any time. The first step will always be to select the customer, then to Add/Edit/Delete Customer Branch Records from the Customer menu. There is no limit to the number of branches that can be referenced against a single charge account (customer record). However, branches cannot be transferred between different customers. Only one statement will print per customer, but each invoice will be referenced to the branch it was delivered to.</p>
<h3>Branch Name</h3>
@@ -123,7 +122,7 @@
<h3>Draw Stock From</h3>
-<p>Branches local to a particular warehouse can be associated with the local warehouse by setting this field to the preferred stocking location. This affects the entry of sales orders that default to the stock location entered here. It can be overridden at the time of order entry.</p>
+<p>Branches local to a particular warehouse can be associated with the local warehouse by setting this field to the preferred stocking location (see <a href="ManualContents.php?ViewTopic=Inventory#Locations">Inventory Locations Maintenance</a>). This affects the entry of sales orders that default to the stock location entered here. It can be overridden at the time of order entry.</p>
<h3>Forward Date From A Day In The Month</h3>
|
|
From: <ex...@us...> - 2015-05-09 11:12:10
|
Revision: 7294
http://sourceforge.net/p/web-erp/reponame/7294
Author: exsonqu
Date: 2015-05-09 11:12:08 +0000 (Sat, 09 May 2015)
Log Message:
-----------
Modified Paths:
--------------
trunk/doc/Change.log
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-05-09 11:11:13 UTC (rev 7293)
+++ trunk/doc/Change.log 2015-05-09 11:12:08 UTC (rev 7294)
@@ -23,6 +23,10 @@
01/4/15 Exson: Fixed the bug that when delete one gl item from the payment details, the bank account related setting will disappeared in Payments.php. Reported by Steven.
01/4/15 Thumb: Add a Z_ImportCustbranch.php script to import customer branches.
30/3/15 Vitaly: Get all taxes for the tax group, even if calculationorder is left at default value 0.
+
+
+
+09/05/15 Exson: Fixed no input filtering bug which cause input failure and location quantity become mess in WorkOrderReceive.php. But the transaction failure maybe still there.
29/3/15 Phil: Allow dummy/service items to be propogated to CounterLogic POS installs through the api
27/3/15 Exson: Remove redundant code from PrintCustTrans.php.
27/3/15 Exson: Make credit not for freight only is printable in PrintCustTrans.php.
|
|
From: <ex...@us...> - 2015-05-09 11:11:15
|
Revision: 7293
http://sourceforge.net/p/web-erp/reponame/7293
Author: exsonqu
Date: 2015-05-09 11:11:13 +0000 (Sat, 09 May 2015)
Log Message:
-----------
09/05/15 Exson: Fixed no input filtering bug which cause input failure and location quantity become mess in WorkOrderReceive.php. But the transaction failure maybe still there.
Modified Paths:
--------------
trunk/WorkOrderReceive.php
Modified: trunk/WorkOrderReceive.php
===================================================================
--- trunk/WorkOrderReceive.php 2015-05-08 14:42:02 UTC (rev 7292)
+++ trunk/WorkOrderReceive.php 2015-05-09 11:11:13 UTC (rev 7293)
@@ -22,11 +22,14 @@
}
echo '<div>
<a href="'. $RootPath . '/SelectWorkOrder.php">' . _('Back to Work Orders'). '</a>
- <br />
- <a href="'. $RootPath . '/WorkOrderCosting.php?WO=' . $SelectedWO . '">' . _('Back to Costing'). '</a>
- <br />
- </div>';
+ <br />';
+if(isset($SelectedWO)){
+ echo '<a href="'. $RootPath . '/WorkOrderCosting.php?WO=' . $SelectedWO . '">' . _('Back to Costing'). '</a>
+ <br />';
+}
+echo '</div>';
+
echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/group_add.png" title="' .
_('Search') . '" alt="" />' . ' ' . $Title . '</p>';
@@ -107,8 +110,12 @@
}
}
} else { //controlled but not serialised - just lot/batch control
- for ($i=0;$i<15;$i++){
- if (mb_strlen($_POST['BatchRef' . $i])>0){
+ for ($i=0;$i<$_POST['CountOfInputs'];$i++){
+ if(isset($_POST['Qty' . $i]) AND trim($_POST['Qty' . $i]) != '' AND !is_numeric($_POST['Qty' . $i])) {
+ $InputError = true;
+ prnMsg(_('The quantity entered is not numeric - a number is expected'),'error');
+ }
+ if (mb_strlen($_POST['BatchRef' . $i])>0 AND (is_numeric($_POST['Qty' . $i]) AND ABS($_POST['Qty' . $i])>0)){
$QuantityReceived += filter_number_format($_POST['Qty' .$i]);
}
}
@@ -452,7 +459,6 @@
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The location stock record could not be updated because');
$DbgMsg = _('The following SQL to update the location stock record was used');
$Result = DB_query($SQL, $ErrMsg, $DbgMsg, true);
-
$WOReceiptNo = GetNextTransNo(26,$db);
/*Insert stock movements - with unit cost */
@@ -576,7 +582,7 @@
/* We need to add the StockSerialItem record and
The StockSerialMoves as well */
//need to test if the batch/lot exists first already
- if (trim($_POST['BatchRef' .$i]) != ""){
+ if (trim($_POST['BatchRef' .$i]) != "" AND (is_numeric($_POST['Qty' . $i]) AND ABS($_POST['Qty' . $i]>0))){
$LastRef = trim($_POST['BatchRef' .$i]);
$SQL = "SELECT COUNT(*) FROM stockserialitems
WHERE stockid='" . $_POST['StockID'] . "'
@@ -597,7 +603,7 @@
WHERE stockid='" . $_POST['StockID'] . "'
AND loccode = '" . $_POST['IntoLocation'] . "'
AND serialno = '" . $_POST['BatchRef' .$i] . "'";
- } else {
+ } else if($_POST['Qty' . $i]>0) {//only the positive quantity can be insert into database;
if(empty($_POST['ExpiryDate'])){
$SQL = "INSERT INTO stockserialitems (stockid,
loccode,
@@ -626,6 +632,10 @@
'" . $_POST['QualityText'] . "',
'" . FormatDateForSQL($_POST['ExpiryDate']) . "')";
}
+ } else {
+ prnMsg(_('The input quantity should not be negative since there are no this lot no existed'),'error');
+ include('includes/footer.inc');
+ exit;
}
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The serial stock item record could not be inserted because');
$DbgMsg = _('The following SQL to insert the serial stock item records was used');
@@ -656,7 +666,7 @@
$BatchTotQtyResult = DB_query($SQL);
$BatchTotQtyRow = DB_fetch_row($BatchTotQtyResult);
- if ($BatchTotQtyRow[0] >= $_POST['QtyReqd'.$i]){
+ /* if ($BatchTotQtyRow[0] >= $_POST['QtyReqd'.$i]){
//need to delete the item from woserialnos
$SQL = "DELETE FROM woserialnos
WHERE wo='" . $_POST['WO'] . "'
@@ -665,7 +675,7 @@
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The predefined batch/lot/bundle record could not be deleted because');
$DbgMsg = _('The following SQL to delete the predefined work order batch/bundle/lot record was used');
$Result = DB_query($SQL, $ErrMsg, $DbgMsg, true);
- }
+ } */
}
if ($_SESSION['QualityLogSamples']==1) {
CreateQASample($_POST['StockID'],$_POST['BatchRef'.$i], '', 'Created from Work Order', 0 ,0,$db);
|
|
From: <rc...@us...> - 2015-05-08 14:42:04
|
Revision: 7292
http://sourceforge.net/p/web-erp/reponame/7292
Author: rchacon
Date: 2015-05-08 14:42:02 +0000 (Fri, 08 May 2015)
Log Message:
-----------
In DeliveryDetails.php, add $ViewTopic and $BookMark to ManualSalesOrders.html.
Modified Paths:
--------------
trunk/DeliveryDetails.php
trunk/doc/Change.log
trunk/doc/Manual/ManualSalesOrders.html
Modified: trunk/DeliveryDetails.php
===================================================================
--- trunk/DeliveryDetails.php 2015-05-07 20:04:23 UTC (rev 7291)
+++ trunk/DeliveryDetails.php 2015-05-08 14:42:02 UTC (rev 7292)
@@ -1,6 +1,6 @@
<?php
-
/* $Id$ */
+/* Used during order entry to allow the entry of delivery addresses other than the defaulted branch delivery address and information about carrier/shipping method etc. */
/*
This is where the delivery details are confirmed/entered/modified and the order committed to the database once the place order/modify order button is hit.
@@ -11,24 +11,27 @@
/* Session started in header.inc for password checking the session will contain the details of the order from the Cart class object. The details of the order come from SelectOrderItems.php */
include('includes/session.inc');
-$Title = _('Order Delivery Details');
+$Title = _('Order Delivery Details');// Screen identification.
+$ViewTopic = 'SalesOrders';// Filename's id in ManualContents.php's TOC.
+$BookMark = 'DeliveryDetails';// Anchor's id in the manual's html document.
include('includes/header.inc');
+
include('includes/FreightCalculation.inc');
include('includes/SQL_CommonFunctions.inc');
include('includes/CountriesArray.php');
-if (isset($_GET['identifier'])) {
+if(isset($_GET['identifier'])) {
$identifier=$_GET['identifier'];
}
unset($_SESSION['WarnOnce']);
-if (!isset($_SESSION['Items'.$identifier]) OR !isset($_SESSION['Items'.$identifier]->DebtorNo)){
+if(!isset($_SESSION['Items'.$identifier]) OR !isset($_SESSION['Items'.$identifier]->DebtorNo)) {
prnMsg(_('This page can only be read if an order has been entered') . '. ' . _('To enter an order select customer transactions then sales order entry'),'error');
include('includes/footer.inc');
exit;
}
-if ($_SESSION['Items'.$identifier]->ItemsOrdered == 0){
+if($_SESSION['Items'.$identifier]->ItemsOrdered == 0) {
prnMsg(_('This page can only be read if an there are items on the order') . '. ' . _('To enter an order select customer transactions then sales order entry'),'error');
include('includes/footer.inc');
exit;
@@ -38,7 +41,7 @@
$EarliestDispatch = CalcEarliestDispatchDate();
-if (isset($_POST['ProcessOrder']) OR isset($_POST['MakeRecurringOrder'])) {
+if(isset($_POST['ProcessOrder']) OR isset($_POST['MakeRecurringOrder'])) {
/*need to check for input errors in any case before order processed */
$_POST['Update']='Yes rerun the validation checks'; //no need for gettext!
@@ -49,42 +52,42 @@
}
-if (isset($_POST['Update'])
+if(isset($_POST['Update'])
OR isset($_POST['BackToLineDetails'])
- OR isset($_POST['MakeRecurringOrder'])) {
+ OR isset($_POST['MakeRecurringOrder'])) {
$InputErrors =0;
- if (mb_strlen($_POST['DeliverTo'])<=1){
+ if(mb_strlen($_POST['DeliverTo'])<=1) {
$InputErrors =1;
prnMsg(_('You must enter the person or company to whom delivery should be made'),'error');
}
- if (mb_strlen($_POST['BrAdd1'])<=1){
+ if(mb_strlen($_POST['BrAdd1'])<=1) {
$InputErrors =1;
prnMsg(_('You should enter the street address in the box provided') . '. ' . _('Orders cannot be accepted without a valid street address'),'error');
}
-// if (mb_strpos($_POST['BrAdd1'],_('Box'))>0){
+// if(mb_strpos($_POST['BrAdd1'],_('Box'))>0) {
// prnMsg(_('You have entered the word') . ' "' . _('Box') . '" ' . _('in the street address') . '. ' . _('Items cannot be delivered to') . ' ' ._('box') . ' ' . _('addresses'),'warn');
// }
- if (!is_numeric($_POST['FreightCost'])){
+ if(!is_numeric($_POST['FreightCost'])) {
$InputErrors =1;
prnMsg( _('The freight cost entered is expected to be numeric'),'error');
}
- if (isset($_POST['MakeRecurringOrder']) AND $_POST['Quotation']==1){
+ if(isset($_POST['MakeRecurringOrder']) AND $_POST['Quotation']==1) {
$InputErrors =1;
prnMsg( _('A recurring order cannot be made from a quotation'),'error');
}
- if (($_POST['DeliverBlind'])<=0){
+ if(($_POST['DeliverBlind'])<=0) {
$InputErrors =1;
prnMsg(_('You must select the type of packlist to print'),'error');
}
-/* If (mb_strlen($_POST['BrAdd3'])==0 OR !isset($_POST['BrAdd3'])){
+/* if(mb_strlen($_POST['BrAdd3'])==0 OR !isset($_POST['BrAdd3'])) {
$InputErrors =1;
echo "<br />A region or city must be entered.<br />";
}
Maybe appropriate in some installations but not here
- If (mb_strlen($_POST['BrAdd2'])<=1){
+ if(mb_strlen($_POST['BrAdd2'])<=1) {
$InputErrors =1;
echo "<br />You should enter the suburb in the box provided. Orders cannot be accepted without a valid suburb being entered.<br />";
}
@@ -108,16 +111,16 @@
/* This check is not appropriate where orders need to be entered in retrospectively in some cases this check will be appropriate and this should be uncommented
- elseif (Date1GreaterThanDate2(Date($_SESSION['DefaultDateFormat'],$EarliestDispatch), $_POST['DeliveryDate'])){
+ elseif(Date1GreaterThanDate2(Date($_SESSION['DefaultDateFormat'],$EarliestDispatch), $_POST['DeliveryDate'])) {
$InputErrors =1;
echo '<br /><b>' . _('The delivery details cannot be updated because you are attempting to set the date the order is to be dispatched earlier than is possible. No dispatches are made on Saturday and Sunday. Also, the dispatch cut off time is') . $_SESSION['DispatchCutOffTime'] . _(':00 hrs. Orders placed after this time will be dispatched the following working day.');
}
*/
- if ($InputErrors==0){
+ if($InputErrors==0) {
- if ($_SESSION['DoFreightCalc']==True){
+ if($_SESSION['DoFreightCalc']==True) {
list ($_POST['FreightCost'], $BestShipper) = CalcFreightCost($_SESSION['Items'.$identifier]->total,
$_POST['BrAdd2'],
$_POST['BrAdd3'],
@@ -129,7 +132,7 @@
$_SESSION['Items'.$identifier]->Location,
$_SESSION['Items'.$identifier]->DefaultCurrency,
$db);
- if ( !empty($BestShipper) ){
+ if( !empty($BestShipper) ) {
$_POST['FreightCost'] = round($_POST['FreightCost'],2);
$_POST['ShipVia'] = $BestShipper;
} else {
@@ -158,23 +161,23 @@
$ErrMsg = _('The customer branch record of the customer selected') . ': ' . $_SESSION['Items'.$identifier]->CustomerName . ' ' . _('cannot be retrieved because');
$DbgMsg = _('SQL used to retrieve the branch details was') . ':';
$result =DB_query($sql,$ErrMsg,$DbgMsg);
- if (DB_num_rows($result)==0){
+ if(DB_num_rows($result)==0) {
prnMsg(_('The branch details for branch code') . ': ' . $_SESSION['Items'.$identifier]->Branch . ' ' . _('against customer code') . ': ' . $_POST['Select'] . ' ' . _('could not be retrieved') . '. ' . _('Check the set up of the customer and branch'),'error');
- if ($debug==1){
+ if($debug==1) {
echo '<br />' . _('The SQL that failed to get the branch details was') . ':<br />' . $sql;
}
include('includes/footer.inc');
exit;
}
- if (!isset($_POST['SpecialInstructions'])) {
+ if(!isset($_POST['SpecialInstructions'])) {
$_POST['SpecialInstructions']='';
}
- if (!isset($_POST['DeliveryDays'])){
+ if(!isset($_POST['DeliveryDays'])) {
$_POST['DeliveryDays']=0;
}
- if (!isset($_SESSION['Items'.$identifier])) {
+ if(!isset($_SESSION['Items'.$identifier])) {
$myrow = DB_fetch_row($result);
$_SESSION['Items'.$identifier]->DeliverTo = $myrow[0];
$_SESSION['Items'.$identifier]->DelAdd1 = $myrow[1];
@@ -232,7 +235,7 @@
and show a link to set them up
- if shippers defined but the default shipper is bogus then use the first shipper defined
*/
- if ((isset($BestShipper) AND $BestShipper=='') AND ($_POST['ShipVia']=='' OR !isset($_POST['ShipVia']))){
+ if((isset($BestShipper) AND $BestShipper=='') AND ($_POST['ShipVia']=='' OR !isset($_POST['ShipVia']))) {
$sql = "SELECT shipper_id
FROM shippers
WHERE shipper_id='" . $_SESSION['Default_Shipper']."'";
@@ -240,7 +243,7 @@
$DbgMsg = _('SQL used to test for the default shipper') . ':';
$TestShipperExists = DB_query($sql,$ErrMsg,$DbgMsg);
- if (DB_num_rows($TestShipperExists)==1){
+ if(DB_num_rows($TestShipperExists)==1) {
$BestShipper = $_SESSION['Default_Shipper'];
@@ -250,7 +253,7 @@
FROM shippers";
$TestShipperExists = DB_query($sql,$ErrMsg,$DbgMsg);
- if (DB_num_rows($TestShipperExists)>=1){
+ if(DB_num_rows($TestShipperExists)>=1) {
$ShipperReturned = DB_fetch_row($TestShipperExists);
$BestShipper = $ShipperReturned[0];
} else {
@@ -258,7 +261,7 @@
echo '<a href="' . $RootPath . 'Shippers.php">' . _('Enter') . '/' . _('Amend Freight Companies') . '</a>';
}
}
- if (isset($_SESSION['Items'.$identifier]->ShipVia) AND $_SESSION['Items'.$identifier]->ShipVia!=''){
+ if(isset($_SESSION['Items'.$identifier]->ShipVia) AND $_SESSION['Items'.$identifier]->ShipVia!='') {
$_POST['ShipVia'] = $_SESSION['Items'.$identifier]->ShipVia;
} else {
$_POST['ShipVia']=$BestShipper;
@@ -267,7 +270,7 @@
}
}
-if(isset($_POST['MakeRecurringOrder']) AND ! $InputErrors){
+if(isset($_POST['MakeRecurringOrder']) AND ! $InputErrors) {
echo '<meta http-equiv="Refresh" content="0; url=' . $RootPath . '/RecurringSalesOrders.php?identifier='.$identifier . '&NewRecurringOrder=Yes">';
prnMsg(_('You should automatically be forwarded to the entry of recurring order details page') . '. ' . _('If this does not happen') . '(' . _('if the browser does not support META Refresh') . ') ' . '<a href="' . $RootPath . '/RecurringOrders.php?identifier='.$identifier . '&NewRecurringOrder=Yes">' . _('click here') . '</a> '. _('to continue'),'info');
@@ -276,7 +279,7 @@
}
-if (isset($_POST['BackToLineDetails']) and $_POST['BackToLineDetails']==_('Modify Order Lines')){
+if(isset($_POST['BackToLineDetails']) and $_POST['BackToLineDetails']==_('Modify Order Lines')) {
echo '<meta http-equiv="Refresh" content="0; url=' . $RootPath . '/SelectOrderItems.php?identifier='.$identifier . '">';
prnMsg(_('You should automatically be forwarded to the entry of the order line details page') . '. ' . _('If this does not happen') . '(' . _('if the browser does not support META Refresh') . ') ' . '<a href="' . $RootPath . '/SelectOrderItems.php?identifier='.$identifier . '">' . _('click here') . '</a> '. _('to continue'),'info');
@@ -285,12 +288,12 @@
}
-If (isset($_POST['ProcessOrder'])) {
+if(isset($_POST['ProcessOrder'])) {
/*Default OK_to_PROCESS to 1 change to 0 later if hit a snag */
- if ($InputErrors ==0) {
+ if($InputErrors ==0) {
$OK_to_PROCESS = 1;
}
- If ($_POST['FreightCost'] != $OldFreightCost AND $_SESSION['DoFreightCalc']==True){
+ if($_POST['FreightCost'] != $OldFreightCost AND $_SESSION['DoFreightCalc']==True) {
$OK_to_PROCESS = 0;
prnMsg(_('The freight charge has been updated') . '. ' . _('Please reconfirm that the order and the freight charges are acceptable and then confirm the order again if OK') .' <br /> '. _('The new freight cost is') .' ' . $_POST['FreightCost'] . ' ' . _('and the previously calculated freight cost was') .' '. $OldFreightCost,'warn');
} else {
@@ -309,7 +312,7 @@
$myrow = DB_fetch_array($TermsResult);
- if ($myrow['daysbeforedue']==0 AND $myrow['dayinfollowingmonth']==0){
+ if($myrow['daysbeforedue']==0 AND $myrow['dayinfollowingmonth']==0) {
/* THIS IS A CASH SALE NEED TO GO OFF TO 3RD PARTY SITE SENDING MERCHANT ACCOUNT DETAILS AND CHECK FOR APPROVAL FROM 3RD PARTY SITE BEFORE CONTINUING TO PROCESS THE ORDER
@@ -325,7 +328,7 @@
} #end if else freight charge not altered
} #end if process order
-if (isset($OK_to_PROCESS) AND $OK_to_PROCESS == 1 AND $_SESSION['ExistingOrder'.$identifier]==0){
+if(isset($OK_to_PROCESS) AND $OK_to_PROCESS == 1 AND $_SESSION['ExistingOrder'.$identifier]==0) {
/* finally write the order header to the database and then the order line details */
@@ -427,9 +430,9 @@
* and AutoCreateWOs is on
* and it is a real order (not just a quotation)*/
- if ($StockItem->MBflag=='M'
+ if($StockItem->MBflag=='M'
AND $_SESSION['AutoCreateWOs']==1
- AND $_SESSION['Items'.$identifier]->Quotation!=1){ //oh yeah its all on!
+ AND $_SESSION['Items'.$identifier]->Quotation!=1) { //oh yeah its all on!
echo '<br />';
@@ -485,9 +488,9 @@
//Now we have the data - do we need to make any more?
$ShortfallQuantity = $QOH-$QuantityDemand-$QuantityAssemblyDemand+$QuantityPurchOrders+$QuantityWorkOrders;
- if ($ShortfallQuantity < 0) { //then we need to make a work order
+ if($ShortfallQuantity < 0) { //then we need to make a work order
//How many should the work order be for??
- if ($ShortfallQuantity + $StockItem->EOQ < 0){
+ if($ShortfallQuantity + $StockItem->EOQ < 0) {
$WOQuantity = -$ShortfallQuantity;
} else {
$WOQuantity = $StockItem->EOQ;
@@ -513,7 +516,7 @@
WHERE bom.parent='" . $StockItem->StockID . "'
AND bom.loccode='" . $_SESSION['DefaultFactoryLocation'] . "'");
$CostRow = DB_fetch_row($CostResult);
- if (is_null($CostRow[0]) OR $CostRow[0]==0){
+ if(is_null($CostRow[0]) OR $CostRow[0]==0) {
$Cost =0;
prnMsg(_('In automatically creating a work order for') . ' ' . $StockItem->StockID . ' ' . _('an item on this sales order, the cost of this item as accumulated from the sum of the component costs is nil. This could be because there is no bill of material set up ... you may wish to double check this'),'warn');
} else {
@@ -539,16 +542,16 @@
":\n" . $StockItem->StockID . ' - ' . $StockItem->ItemDescription . ' x ' . $WOQuantity . ' ' . $StockItem->Units .
"\n" . _('These are for') . ' ' . $_SESSION['Items'.$identifier]->CustomerName . ' ' . _('there order ref') . ': ' . $_SESSION['Items'.$identifier]->CustRef . ' ' ._('our order number') . ': ' . $OrderNo;
- if ($StockItem->Serialised AND $StockItem->NextSerialNo>0){
+ if($StockItem->Serialised AND $StockItem->NextSerialNo>0) {
//then we must create the serial numbers for the new WO also
$FactoryManagerEmail .= "\n" . _('The following serial numbers have been reserved for this work order') . ':';
- for ($i=0;$i<$WOQuantity;$i++){
+ for ($i=0;$i<$WOQuantity;$i++) {
$result = DB_query("SELECT serialno FROM stockserialitems
WHERE serialno='" . ($StockItem->NextSerialNo + $i) . "'
AND stockid='" . $StockItem->StockID ."'");
- if (DB_num_rows($result)!=0){
+ if(DB_num_rows($result)!=0) {
$WOQuantity++;
prnMsg(($StockItem->NextSerialNo + $i) . ': ' . _('This automatically generated serial number already exists - it cannot be added to the work order'),'error');
} else {
@@ -570,10 +573,10 @@
$EmailSubject = _('New Work Order Number') . ' ' . $WONo . ' ' . _('for') . ' ' . $StockItem->StockID . ' x ' . $WOQuantity;
//Send email to the Factory Manager
- if($_SESSION['SmtpSetting']==0){
+ if($_SESSION['SmtpSetting']==0) {
mail($_SESSION['FactoryManagerEmail'],$EmailSubject,$FactoryManagerEmail);
- }else{
+ }else {
include('includes/htmlMimeMail.php');
$mail = new htmlMimeMail();
$mail->setSubject($EmailSubject);
@@ -586,16 +589,16 @@
$result = DB_Txn_Commit();
echo '<br />';
- if ($_SESSION['Items'.$identifier]->Quotation==1){
+ if($_SESSION['Items'.$identifier]->Quotation==1) {
prnMsg(_('Quotation Number') . ' ' . $OrderNo . ' ' . _('has been entered'),'success');
} else {
prnMsg(_('Order Number') . ' ' . $OrderNo . ' ' . _('has been entered'),'success');
}
- if (count($_SESSION['AllowedPageSecurityTokens'])>1){
+ if(count($_SESSION['AllowedPageSecurityTokens'])>1) {
/* Only allow print of packing slip for internal staff - customer logon's cannot go here */
- if ($_POST['Quotation']==0) { /*then its not a quotation its a real order */
+ if($_POST['Quotation']==0) { /*then its not a quotation its a real order */
echo '<br /><table class="selection">
<tr>
@@ -645,7 +648,7 @@
include('includes/footer.inc');
exit;
-} elseif (isset($OK_to_PROCESS) AND ($OK_to_PROCESS == 1 AND $_SESSION['ExistingOrder'.$identifier]!=0)){
+} elseif(isset($OK_to_PROCESS) AND ($OK_to_PROCESS == 1 AND $_SESSION['ExistingOrder'.$identifier]!=0)) {
/* update the order header then update the old order line details and insert the new lines */
@@ -656,12 +659,12 @@
$Result = DB_Txn_Begin();
/*see if this is a contract quotation being changed to an order? */
- if ($_SESSION['Items'.$identifier]->Quotation==0) { //now its being changed? to an order
+ if($_SESSION['Items'.$identifier]->Quotation==0) { //now its being changed? to an order
$ContractResult = DB_query("SELECT contractref,
requireddate
FROM contracts WHERE orderno='" . $_SESSION['ExistingOrder'.$identifier] ."'
AND status=1");
- if (DB_num_rows($ContractResult)==1){ //then it is a contract quotation being changed to an order
+ if(DB_num_rows($ContractResult)==1) { //then it is a contract quotation being changed to an order
$ContractRow = DB_fetch_array($ContractResult);
$WONo = GetNextTransNo(40,$db);
$ErrMsg = _('Could not update the contract status');
@@ -709,7 +712,7 @@
ON stockmaster.stockid=contractbom.stockid
WHERE contractbom.contractref='" . $ContractRow['contractref'] . "'");
$CostRow = DB_fetch_row($CostResult);
- if (is_null($CostRow[0]) OR $CostRow[0]==0){
+ if(is_null($CostRow[0]) OR $CostRow[0]==0) {
$Cost =0;
prnMsg(_('In automatically creating a work order for') . ' ' . $ContractRow['contractref'] . ' ' . _('an item on this sales order, the cost of this item as accumulated from the sum of the component costs is nil. This could be because there is no bill of material set up ... you may wish to double check this'),'warn');
} else {
@@ -776,7 +779,7 @@
/* Check to see if the quantity reduced to the same quantity
as already invoiced - so should set the line to completed */
- if ($StockItem->Quantity == $StockItem->QtyInv){
+ if($StockItem->Quantity == $StockItem->QtyInv) {
$Completed = 1;
} else { /* order line is not complete */
$Completed = 0;
@@ -802,7 +805,7 @@
unset($_SESSION['Items'.$identifier]->LineItems);
unset($_SESSION['Items'.$identifier]);
- if($Quotation){ //handle Quotations and Orders print after modification
+ if($Quotation) { //handle Quotations and Orders print after modification
prnMsg(_('Quotation Number') .' ' . $_SESSION['ExistingOrder'.$identifier] . ' ' . _('has been updated'),'success');
/*link to print the quotation */
@@ -818,7 +821,7 @@
<td>' . ' ' . '<a href="' . $RootPath . '/PDFQuotationPortrait.php?identifier='.$identifier . '&QuotationNo=' . $_SESSION['ExistingOrder'.$identifier] . '" target="_blank">' . _('Print Quotation (Portrait)') . '</a></td>
</tr>
</table>';
- }else{
+ }else {
prnMsg(_('Order Number') .' ' . $_SESSION['ExistingOrder'.$identifier] . ' ' . _('has been updated'),'success');
@@ -847,7 +850,7 @@
}
-if (isset($_SESSION['Items'.$identifier]->SpecialInstructions) and mb_strlen($_SESSION['Items'.$identifier]->SpecialInstructions)>0) {
+if(isset($_SESSION['Items'.$identifier]->SpecialInstructions) and mb_strlen($_SESSION['Items'.$identifier]->SpecialInstructions)>0) {
prnMsg($_SESSION['Items'.$identifier]->SpecialInstructions,'info');
}
echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/inventory.png" title="' . _('Delivery') . '" alt="" />' . ' ' . _('Delivery Details') . '</p>';
@@ -862,11 +865,11 @@
/*Display the order with or without discount depending on access level*/
-if (in_array(2,$_SESSION['AllowedPageSecurityTokens'])){
+if(in_array(2,$_SESSION['AllowedPageSecurityTokens'])) {
echo '<table>';
- if ($_SESSION['Items'.$identifier]->Quotation==1){
+ if($_SESSION['Items'.$identifier]->Quotation==1) {
echo '<tr><th colspan="7">' . _('Quotation Summary') . '</th></tr>';
} else {
echo '<tr><th colspan="7">' . _('Order Summary') . '</th></tr>';
@@ -895,7 +898,7 @@
$DisplayDiscount = locale_number_format(($StockItem->DiscountPercent * 100),2);
- if ($k==1){
+ if($k==1) {
echo '<tr class="EvenTableRows">';
$k=0;
} else {
@@ -961,7 +964,7 @@
$DisplayPrice = locale_number_format($StockItem->Price,$_SESSION['Items'.$identifier]->CurrDecimalPlaces);
$DisplayQuantity = locale_number_format($StockItem->Quantity,$StockItem->DecimalPlaces);
- if ($k==1){
+ if($k==1) {
echo '<tr class="OddTableRows">';
$k=0;
} else {
@@ -1007,7 +1010,7 @@
<td>' . _('Deliver from the warehouse at') .':</td>
<td><select name="Location">';
-if ($_SESSION['Items'.$identifier]->Location=='' OR !isset($_SESSION['Items'.$identifier]->Location)) {
+if($_SESSION['Items'.$identifier]->Location=='' OR !isset($_SESSION['Items'.$identifier]->Location)) {
$_SESSION['Items'.$identifier]->Location = $DefaultStockLocation;
}
@@ -1018,8 +1021,8 @@
$ErrMsg,
$DbgMsg);
-while ($myrow=DB_fetch_array($StkLocsResult)){
- if ($_SESSION['Items'.$identifier]->Location==$myrow['loccode']){
+while ($myrow=DB_fetch_array($StkLocsResult)) {
+ if($_SESSION['Items'.$identifier]->Location==$myrow['loccode']) {
echo '<option selected="selected" value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
} else {
echo '<option value="'.$myrow['loccode'].'">' . $myrow['locationname'] . '</option>';
@@ -1029,13 +1032,13 @@
echo '</select></td></tr>';
// Set the default date to earliest possible date if not set already
-if (!isset($_SESSION['Items'.$identifier]->DeliveryDate)) {
+if(!isset($_SESSION['Items'.$identifier]->DeliveryDate)) {
$_SESSION['Items'.$identifier]->DeliveryDate = Date($_SESSION['DefaultDateFormat'],$EarliestDispatch);
}
-if (!isset($_SESSION['Items'.$identifier]->QuoteDate)) {
+if(!isset($_SESSION['Items'.$identifier]->QuoteDate)) {
$_SESSION['Items'.$identifier]->QuoteDate = Date($_SESSION['DefaultDateFormat'],$EarliestDispatch);
}
-if (!isset($_SESSION['Items'.$identifier]->ConfirmedDate)) {
+if(!isset($_SESSION['Items'.$identifier]->ConfirmedDate)) {
$_SESSION['Items'.$identifier]->ConfirmedDate = Date($_SESSION['DefaultDateFormat'],$EarliestDispatch);
}
@@ -1077,10 +1080,10 @@
echo '<tr>
<td>' . _('Country') . ':</td>
<td><select name="BrAdd6">';
-foreach ($CountriesArray as $CountryEntry => $CountryName){
- if (isset($_POST['BrAdd6']) AND (strtoupper($_POST['BrAdd6']) == strtoupper($CountryName))){
+foreach ($CountriesArray as $CountryEntry => $CountryName) {
+ if(isset($_POST['BrAdd6']) AND (strtoupper($_POST['BrAdd6']) == strtoupper($CountryName))) {
echo '<option selected="selected" value="' . $CountryName . '">' . $CountryName . '</option>';
- }elseif (!isset($_POST['BrAdd6']) AND $CountryName == $_SESSION['Items'.$identifier]->DelAdd6) {
+ }elseif(!isset($_POST['BrAdd6']) AND $CountryName == $_SESSION['Items'.$identifier]->DelAdd6) {
echo '<option selected="selected" value="' . $CountryName . '">' . $CountryName . '</option>';
} else {
echo '<option value="' . $CountryName . '">' . $CountryName . '</option>';
@@ -1106,7 +1109,7 @@
<td><textarea name="Comments" cols="31" rows="5">' . $_SESSION['Items'.$identifier]->Comments . '</textarea></td>
</tr>';
- if ($CustomerLogin == 1){
+ if($CustomerLogin == 1) {
echo '<input type="hidden" name="SalesPerson" value="' . $_SESSION['Items'.$identifier]->SalesPerson . '" />
<input type="hidden" name="DeliverBlind" value="1" />
<input type="hidden" name="FreightCost" value="0" />
@@ -1117,12 +1120,12 @@
<td>' . _('Sales person'). ':</td>
<td><select name="SalesPerson">';
$SalesPeopleResult = DB_query("SELECT salesmancode, salesmanname FROM salesman WHERE current=1");
- if (!isset($_POST['SalesPerson']) AND $_SESSION['SalesmanLogin']!=NULL ){
+ if(!isset($_POST['SalesPerson']) AND $_SESSION['SalesmanLogin']!=NULL ) {
$_SESSION['Items'.$identifier]->SalesPerson = $_SESSION['SalesmanLogin'];
}
- while ($SalesPersonRow = DB_fetch_array($SalesPeopleResult)){
- if ($SalesPersonRow['salesmancode']==$_SESSION['Items'.$identifier]->SalesPerson){
+ while ($SalesPersonRow = DB_fetch_array($SalesPeopleResult)) {
+ if($SalesPersonRow['salesmancode']==$_SESSION['Items'.$identifier]->SalesPerson) {
echo '<option selected="selected" value="' . $SalesPersonRow['salesmancode'] . '">' . $SalesPersonRow['salesmanname'] . '</option>';
} else {
echo '<option value="' . $SalesPersonRow['salesmancode'] . '">' . $SalesPersonRow['salesmanname'] . '</option>';
@@ -1138,7 +1141,7 @@
echo '<tr><td>' . _('Packlist Type') . ':</td>
<td><select name="DeliverBlind">';
- if ($_SESSION['Items'.$identifier]->DeliverBlind ==2){
+ if($_SESSION['Items'.$identifier]->DeliverBlind ==2) {
echo '<option value="1">' . _('Show Company Details/Logo') . '</option>';
echo '<option selected="selected" value="2">' . _('Hide Company Details/Logo') . '</option>';
} else {
@@ -1147,7 +1150,7 @@
}
echo '</select></td></tr>';
- if (isset($_SESSION['PrintedPackingSlip']) AND $_SESSION['PrintedPackingSlip']==1){
+ if(isset($_SESSION['PrintedPackingSlip']) AND $_SESSION['PrintedPackingSlip']==1) {
echo '<tr>
<td>' . _('Reprint packing slip') .':</td>
@@ -1163,12 +1166,12 @@
<td>' . _('Charge Freight Cost ex tax') .':</td>
<td><input type="text" class="number" size="10" maxlength="12" name="FreightCost" value="' . $_SESSION['Items'.$identifier]->FreightCost . '" /></td>';
- if ($_SESSION['DoFreightCalc']==true){
+ if($_SESSION['DoFreightCalc']==true) {
echo '<td><input type="submit" name="Update" value="' . _('Recalc Freight Cost') . '" /></td>';
}
echo '</tr>';
- if ((!isset($_POST['ShipVia']) OR $_POST['ShipVia']=='') AND isset($_SESSION['Items'.$identifier]->ShipVia)){
+ if((!isset($_POST['ShipVia']) OR $_POST['ShipVia']=='') AND isset($_SESSION['Items'.$identifier]->ShipVia)) {
$_POST['ShipVia'] = $_SESSION['Items'.$identifier]->ShipVia;
}
@@ -1181,8 +1184,8 @@
$sql = "SELECT shipper_id, shippername FROM shippers";
$ShipperResults = DB_query($sql,$ErrMsg,$DbgMsg);
- while ($myrow=DB_fetch_array($ShipperResults)){
- if ($myrow['shipper_id']==$_POST['ShipVia']){
+ while ($myrow=DB_fetch_array($ShipperResults)) {
+ if($myrow['shipper_id']==$_POST['ShipVia']) {
echo '<option selected="selected" value="' . $myrow['shipper_id'] . '">' . $myrow['shippername'] . '</option>';
}else {
echo '<option value="' . $myrow['shipper_id'] . '">' . $myrow['shippername'] . '</option>';
@@ -1194,7 +1197,7 @@
echo '<tr><td>' . _('Quotation Only') .':</td>
<td><select name="Quotation">';
- if ($_SESSION['Items'.$identifier]->Quotation==1){
+ if($_SESSION['Items'.$identifier]->Quotation==1) {
echo '<option selected="selected" value="1">' . _('Yes') . '</option>';
echo '<option value="0">' . _('No') . '</option>';
} else {
@@ -1208,7 +1211,7 @@
echo '<br /><div class="centre"><input type="submit" name="BackToLineDetails" value="' . _('Modify Order Lines') . '" /><br />';
-if ($_SESSION['ExistingOrder'.$identifier]==0){
+if($_SESSION['ExistingOrder'.$identifier]==0) {
echo '<br /><br /><input type="submit" name="ProcessOrder" value="' . _('Place Order') . '" />';
echo '<br /><br /><input type="submit" name="MakeRecurringOrder" value="' . _('Create Recurring Order') . '" />';
} else {
@@ -1219,4 +1222,4 @@
</div>
</form>';
include('includes/footer.inc');
-?>
+?>
\ No newline at end of file
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-05-07 20:04:23 UTC (rev 7291)
+++ trunk/doc/Change.log 2015-05-08 14:42:02 UTC (rev 7292)
@@ -1,5 +1,6 @@
webERP Change Log
+08/05/15 RChacon: In DeliveryDetails.php, add $ViewTopic and $BookMark to ManualSalesOrders.html.
07/05/15 RChacon: In CustomerInquiry.php, hide submit button and 'More Info' columns when printing. Add thead tag to enable the table header to be printed at the top of each page.
07/05/15 RChacon: In SupplierInquiry.php, hide submit button and 'More Info' columns when printing. Add thead tag to enable the table header to be printed at the top of each page.
04/05/15 Exson: Make PO number searching also in compliance with location authority rules and make default search result as all if users have full location authority.
Modified: trunk/doc/Manual/ManualSalesOrders.html
===================================================================
--- trunk/doc/Manual/ManualSalesOrders.html 2015-05-07 20:04:23 UTC (rev 7291)
+++ trunk/doc/Manual/ManualSalesOrders.html 2015-05-08 14:42:02 UTC (rev 7292)
@@ -72,7 +72,7 @@
<a class="minitext" href="#top">⬆ Top</a>
</div>
-<h3>Delivery Details</h3>
+<h3><a id="DeliveryDetails">Delivery Details</a></h3>
<p>By default the delivery details are obtained from the physical address of the branch. However, any of the information in this screen can be over-ridden. This information prints on the dispatch/packing slip and on the invoice.</p>
@@ -84,7 +84,7 @@
<p>If the automatic freight calculations are being used - see the parameters in config.php, the freight cost will be calculated based on the sum of the whole order cubic metres and weight. The best shipping company will also be returned. The user can choose to charge the freight calculated or just use the cheapest freight company. The freight charge calculated can be over-ridden if required.</p>
-<p>Once all details are entered correctly the Place Order button should be clicked. It is important to note that abandoning the order before this button is clicked there have been no updates to the database and nothing is saved. Clicking into some other screen loses the order as entered. Whilst it is perfectly acceptable to have several browser screens open looking at different inquiries at the same time. It is not possible to have two windows entering two separate sales orders at the same time, entries in the one window will over-write the other.
+<p>Once all details are entered correctly the Place Order button should be clicked. It is important to note that abandoning the order before this button is clicked there have been no updates to the database and nothing is saved. Clicking into some other screen loses the order as entered. Whilst it is perfectly acceptable to have several browser screens open looking at different inquiries at the same time. It is not possible to have two windows entering two separate sales orders at the same time, entries in the one window will over-write the other.
<!-- Help End: SelectOrderItems --></p>
|
|
From: <rc...@us...> - 2015-05-07 20:04:25
|
Revision: 7291
http://sourceforge.net/p/web-erp/reponame/7291
Author: rchacon
Date: 2015-05-07 20:04:23 +0000 (Thu, 07 May 2015)
Log Message:
-----------
In CustomerInquiry.php, hide submit button and 'More Info' columns when printing. Add thead tag to enable the table header to be printed at the top of each page.
Modified Paths:
--------------
trunk/CustomerInquiry.php
trunk/doc/Change.log
Modified: trunk/CustomerInquiry.php
===================================================================
--- trunk/CustomerInquiry.php 2015-05-07 13:54:04 UTC (rev 7290)
+++ trunk/CustomerInquiry.php 2015-05-07 20:04:23 UTC (rev 7291)
@@ -1,11 +1,11 @@
<?php
/* $Id$*/
+/* Shows the customers account transactions with balances outstanding, links available to drill down to invoice/credit note or email invoices/credit notes. */
include('includes/session.inc');
-$Title = _('Customer Inquiry');
-/* Manual links before header.inc */
-$ViewTopic = 'ARInquiries'; // Filename in ManualContents.php's TOC.
-$BookMark = 'CustomerInquiry'; // Anchor's id in the manual's html document.
+$Title = _('Customer Inquiry');// Screen identification.
+$ViewTopic = 'ARInquiries';// Filename's id in ManualContents.php's TOC.
+$BookMark = 'CustomerInquiry';// Anchor's id in the manual's html document.
include('includes/header.inc');
// always figure out the SQL required from the inputs available
@@ -186,7 +186,7 @@
echo '<div class="centre"><form onSubmit="return VerifyForm(this);" action="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'), '" method="post" class="noPrint">
<input type="hidden" name="FormID" value="', $_SESSION['FormID'], '" />';
-echo _('Show all transactions after'), ':<input tabindex="1" type="text" required="required" class="date" alt="', $_SESSION['DefaultDateFormat'], '" id="datepicker" name="TransAfterDate" value="', $_POST['TransAfterDate'], '" minlength="0" maxlength="10" size="12" />';
+echo _('Show all transactions after'), ':<input type="text" required="required" class="date" alt="', $_SESSION['DefaultDateFormat'], '" id="datepicker" name="TransAfterDate" value="', $_POST['TransAfterDate'], '" minlength="0" maxlength="10" size="12" />';
echo '<select name="Status">';
if ($_POST['Status'] == '') {
@@ -206,7 +206,7 @@
}
echo '</select>';
-echo '<input tabindex="3" type="submit" name="Refresh Inquiry" value="', _('Refresh Inquiry'), '" />
+echo '<input class="noprint" name="Refresh Inquiry" type="submit" value="', _('Refresh Inquiry'), '" />
</form></div>';
$DateAfterCriteria = FormatDateForSQL($_POST['TransAfterDate']);
@@ -244,24 +244,25 @@
/* Show a table of the invoices returned by the SQL. */
-echo '<table class="selection">
- <tr>
- <th class="ascending">', _('Type'), '</th>
- <th class="ascending">', _('Number'), '</th>
- <th class="ascending">', _('Date'), '</th>
- <th>', _('Branch'), '</th>
- <th class="ascending">', _('Reference'), '</th>
- <th>', _('Comments'), '</th>
- <th>', _('Order'), '</th>
- <th>', _('Total'), '</th>
- <th>', _('Allocated'), '</th>
- <th>', _('Balance'), '</th>
- <th>', _('More Info'), '</th>
- <th>', _('More Info'), '</th>
- <th>', _('More Info'), '</th>
- <th>', _('More Info'), '</th>
- <th>', _('More Info'), '</th>
- </tr>';
+echo '<table class="selection"><thead>
+ <tr>
+ <th class="ascending">', _('Type'), '</th>
+ <th class="ascending">', _('Number'), '</th>
+ <th class="ascending">', _('Date'), '</th>
+ <th>', _('Branch'), '</th>
+ <th class="ascending">', _('Reference'), '</th>
+ <th>', _('Comments'), '</th>
+ <th>', _('Order'), '</th>
+ <th>', _('Total'), '</th>
+ <th>', _('Allocated'), '</th>
+ <th>', _('Balance'), '</th>
+ <th class="noprint">', _('More Info'), '</th>
+ <th class="noprint">', _('More Info'), '</th>
+ <th class="noprint">', _('More Info'), '</th>
+ <th class="noprint">', _('More Info'), '</th>
+ <th class="noprint">', _('More Info'), '</th>
+ </tr>
+ </thead><tbody>';
$k = 0; //row colour counter
while ($MyRow = DB_fetch_array($TransResult)) {
@@ -300,29 +301,33 @@
<td class="number">', locale_number_format($MyRow['totalamount'], $CustomerRecord['decimalplaces']), '</td>
<td class="number">', locale_number_format($MyRow['allocated'], $CustomerRecord['decimalplaces']), '</td>
<td class="number">', locale_number_format($MyRow['totalamount'] - $MyRow['allocated'], $CustomerRecord['decimalplaces']), '</td>
- <td>
- <a href="', $RootPath, '/Credit_Invoice.php?InvoiceNumber=', $MyRow['transno'], '">', _('Credit '), '
- <img src="', $RootPath, '/css/', $Theme, '/images/credit.png" title="', _('Click to credit the invoice'), '" alt="" />
+ <td class="noprint">
+ <a href="', $RootPath, '/Credit_Invoice.php?InvoiceNumber=', $MyRow['transno'], '" title="', _('Click to credit the invoice'), '">
+ <img alt="" src="', $RootPath, '/css/', $Theme, '/images/credit.png" /> ',
+ _('Credit'), '
</a>
</td>
- <td>
- <a href="', $RootPath, '/PrintCustTrans.php?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Invoice">', _('HTML '), '
- <img src="', $RootPath, '/css/', $Theme, '/images/preview.png" title="', _('Click to preview the invoice'), '" alt="" />
+ <td class="noprint">
+ <a href="', $RootPath, '/PrintCustTrans.php?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Invoice" title="', _('Click to preview the invoice'), '">
+ <img alt="" src="', $RootPath, '/css/', $Theme, '/images/preview.png" /> ',
+ _('HTML'), '
</a>
</td>
- <td>
- <a href="', $RootPath, '/', $PrintCustomerTransactionScript, '?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Invoice&PrintPDF=True">', _('PDF '), '
- <img src="', $RootPath, '/css/', $Theme, '/images/pdf.png" title="', _('Click for PDF'), '" alt="" />
+ <td class="noprint">
+ <a href="', $RootPath, '/', $PrintCustomerTransactionScript, '?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Invoice&PrintPDF=True" title="', _('Click for PDF'), '">
+ <img alt="" src="', $RootPath, '/css/', $Theme, '/images/pdf.png" /> ',
+ _('PDF'), '
</a>
</td>
- <td>
- <a href="', $RootPath, '/EmailCustTrans.php?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Invoice">', _('Email '), '
- <img src="', $RootPath, '/css/', $Theme, '/images/email.png" title="', _('Click to email the invoice'), '" alt="" />
+ <td class="noprint">
+ <a href="', $RootPath, '/EmailCustTrans.php?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Invoice" title="', _('Click to email the invoice'), '">
+ <img alt="" src="', $RootPath, '/css/', $Theme, '/images/email.png" /> ', _('Email'), '
</a>
</td>
- <td>
- <a href="', $RootPath, '/GLTransInquiry.php?TypeID=', $MyRow['type'], '&TransNo=', $MyRow['transno'], '">', _('View GL Entries'), '
- <img src="', $RootPath, '/css/', $Theme, '/images/gl.png" title="', _('View GL Entries'), '" alt="" />
+ <td class="noprint">
+ <a href="', $RootPath, '/GLTransInquiry.php?TypeID=', $MyRow['type'], '&TransNo=', $MyRow['transno'], '" title="', _('Click to view the GL entries'), '">
+ <img alt="" src="', $RootPath, '/css/', $Theme, '/images/gl.png" /> ',
+ _('GL Entries'), '
</a>
</td>
</tr>';
@@ -342,27 +347,30 @@
<td class="number">', locale_number_format($MyRow['totalamount'], $CustomerRecord['decimalplaces']), '</td>
<td class="number">', locale_number_format($MyRow['allocated'], $CustomerRecord['decimalplaces']), '</td>
<td class="number">', locale_number_format($MyRow['totalamount'] - $MyRow['allocated'], $CustomerRecord['decimalplaces']), '</td>
- <td>
- <a href="', $RootPath, '/Credit_Invoice.php?InvoiceNumber=', $MyRow['transno'], '">' . _('Credit ') . '
- <img src="', $RootPath, '/css/', $Theme, '/images/credit.png" title="', _('Click to credit the invoice'), '" alt="" />
+ <td class="noprint">
+ <a href="', $RootPath, '/Credit_Invoice.php?InvoiceNumber=', $MyRow['transno'], '" title="', _('Click to credit the invoice'), '">
+ <img alt="" src="', $RootPath, '/css/', $Theme, '/images/credit.png" /> ',
+ _('Credit'), '
</a>
</td>
- <td>
- <a href="', $RootPath, '/PrintCustTrans.php?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Invoice">', _('HTML '), '
- <img src="', $RootPath, '/css/', $Theme, '/images/preview.png" title="', _('Click to preview the invoice'), '" alt="" />
+ <td class="noprint">
+ <a href="', $RootPath, '/PrintCustTrans.php?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Invoice" title="', _('Click to preview the invoice'), '">
+ <img alt="" src="', $RootPath, '/css/', $Theme, '/images/preview.png" /> ',
+ _('HTML'), '
</a>
</td>
- <td>
- <a href="', $RootPath, '/', $PrintCustomerTransactionScript, '?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Invoice&PrintPDF=True">', _('PDF '), '
- <img src="', $RootPath, '/css/', $Theme, '/images/pdf.png" title="', _('Click for PDF'), '" alt="" />
+ <td class="noprint">
+ <a href="', $RootPath, '/', $PrintCustomerTransactionScript, '?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Invoice&PrintPDF=True" title="', _('Click for PDF'), '">
+ <img alt="" src="', $RootPath, '/css/', $Theme, '/images/pdf.png" /> ',
+ _('PDF'), '
</a>
</td>
- <td>
- <a href="', $RootPath, '/EmailCustTrans.php?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Invoice">', _('Email ') . '
- <img src="', $RootPath, '/css/', $Theme, '/images/email.png" title="', _('Click to email the invoice'), '" alt="" />
+ <td class="noprint">
+ <a href="', $RootPath, '/EmailCustTrans.php?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Invoice" title="', _('Click to email the invoice'), '">
+ <img alt="" src="', $RootPath, '/css/', $Theme, '/images/email.png" /> ', _('Email'), '
</a>
</td>
- <td></td>
+ <td class="noprint"> </td>
</tr>';
}
@@ -383,23 +391,25 @@
<td class="number">', locale_number_format($MyRow['totalamount'], $CustomerRecord['decimalplaces']), '</td>
<td class="number">', locale_number_format($MyRow['allocated'], $CustomerRecord['decimalplaces']), '</td>
<td class="number">', locale_number_format($MyRow['totalamount'] - $MyRow['allocated'], $CustomerRecord['decimalplaces']), '</td>
- <td></td>
- <td>
- <a href="', $RootPath, '/PrintCustTrans.php?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Invoice">', _('HTML '), '
- <img src="', $RootPath, '/css/', $Theme, '/images/preview.png" title="', _('Click to preview the invoice'), '" alt="" />
+ <td class="noprint"> </td>
+ <td class="noprint">
+ <a href="', $RootPath, '/PrintCustTrans.php?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Invoice" title="', _('Click to preview the invoice'), '">
+ <img alt="" src="', $RootPath, '/css/', $Theme, '/images/preview.png" /> ',
+ _('HTML'), '
</a>
</td>
- <td>
- <a href="', $RootPath, '/', $PrintCustomerTransactionScript, '?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Invoice&PrintPDF=True">' . _('PDF ') . '
- <img src="', $RootPath, '/css/', $Theme, '/images/pdf.png" title="', _('Click for PDF'), '" alt="" />
+ <td class="noprint">
+ <a href="', $RootPath, '/', $PrintCustomerTransactionScript, '?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Invoice&PrintPDF=True" title="', _('Click for PDF'), '">
+ <img alt="" src="', $RootPath, '/css/', $Theme, '/images/pdf.png" /> ',
+ _('PDF'), '
</a>
</td>
- <td>
- <a href="', $RootPath, '/EmailCustTrans.php?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Invoice">', _('Email ') . '
- <img src="', $RootPath, '/css/', $Theme, '/images/email.png" title="', _('Click to email the invoice'), '" alt="" />
+ <td class="noprint">
+ <a href="', $RootPath, '/EmailCustTrans.php?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Invoice" title="', _('Click to email the invoice'), '">
+ <img alt="" src="', $RootPath, '/css/', $Theme, '/images/email.png" /> ', _('Email'), '
</a>
</td>
- <td></td>
+ <td class="noprint"> </td>
</tr>';
} elseif ($MyRow['type'] == 11) {
@@ -418,29 +428,33 @@
<td class="number">', locale_number_format($MyRow['totalamount'], $CustomerRecord['decimalplaces']), '</td>
<td class="number">', locale_number_format($MyRow['allocated'], $CustomerRecord['decimalplaces']), '</td>
<td class="number">', locale_number_format($MyRow['totalamount'] - $MyRow['allocated'], $CustomerRecord['decimalplaces']), '</td>
- <td>
- <a href="', $RootPath, '/PrintCustTrans.php?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Credit">', _('HTML '), '
- <img src="', $RootPath, '/css/', $Theme, '/images/preview.png" title="', _('Click to preview the credit note'), '" />
+ <td class="noprint">
+ <a href="', $RootPath, '/PrintCustTrans.php?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Invoice" title="', _('Click to preview the invoice'), '">
+ <img alt="" src="', $RootPath, '/css/', $Theme, '/images/preview.png" /> ',
+ _('HTML'), '
</a>
</td>
- <td>
- <a href="', $RootPath, '/', $PrintCustomerTransactionScript, '?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Credit&PrintPDF=True">', _('PDF '), '
- <img src="', $RootPath, '/css/', $Theme, '/images/pdf.png" title="', _('Click for PDF'), '" alt="" />
+ <td class="noprint">
+ <a href="', $RootPath, '/', $PrintCustomerTransactionScript, '?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Invoice&PrintPDF=True" title="', _('Click for PDF'), '">
+ <img alt="" src="', $RootPath, '/css/', $Theme, '/images/pdf.png" /> ',
+ _('PDF'), '
</a>
</td>
- <td>
+ <td class="noprint">
<a href="', $RootPath, '/EmailCustTrans.php?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Credit">', _('Email'), '
<img src="', $RootPath, '/css/', $Theme, '/images/email.png" title="', _('Click to email the credit note'), '" alt="" />
</a>
</td>
- <td>
- <a href="', $RootPath, '/CustomerAllocations.php?AllocTrans=', $MyRow['id'], '">', _('Allocation'), '
- <img src="', $RootPath, '/css/', $Theme, '/images/allocation.png" title="', _('Click to allocate funds'), '" alt="" />
+ <td class="noprint">
+ <a href="', $RootPath, '/CustomerAllocations.php?AllocTrans=', $MyRow['id'], '" title="', _('Click to allocate funds'), '">
+ <img alt="" src="', $RootPath, '/css/', $Theme, '/images/allocation.png" /> ',
+ _('Allocation'), '
</a>
</td>
- <td>
- <a href="', $RootPath, '/GLTransInquiry.php?TypeID=', $MyRow['type'], '&TransNo=', $MyRow['transno'], '">' . _('View GL Entries') . '
- <img src="', $RootPath, '/css/', $Theme, '/images/gl.png" title="', _('View GL Entries'), '" alt="" />
+ <td class="noprint">
+ <a href="', $RootPath, '/GLTransInquiry.php?TypeID=', $MyRow['type'], '&TransNo=', $MyRow['transno'], '" title="', _('Click to view the GL entries'), '">
+ <img alt="" src="', $RootPath, '/css/', $Theme, '/images/gl.png" /> ',
+ _('GL Entries'), '
</a>
</td>
</tr>';
@@ -460,27 +474,30 @@
<td class="number">', locale_number_format($MyRow['totalamount'], $CustomerRecord['decimalplaces']), '</td>
<td class="number">', locale_number_format($MyRow['allocated'], $CustomerRecord['decimalplaces']), '</td>
<td class="number">', locale_number_format($MyRow['totalamount'] - $MyRow['allocated'], $CustomerRecord['decimalplaces']), '</td>
- <td>
- <a href="', $RootPath, '/PrintCustTrans.php?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Credit">', _('HTML '), '
- <img src="', $RootPath, '/css/', $Theme, '/images/preview.png" title="', _('Click to preview the credit note'), '" />
+ <td class="noprint">
+ <a href="', $RootPath, '/PrintCustTrans.php?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Invoice" title="', _('Click to preview the invoice'), '">
+ <img alt="" src="', $RootPath, '/css/', $Theme, '/images/preview.png" /> ',
+ _('HTML'), '
</a>
</td>
- <td>
- <a href="', $RootPath, '/', $PrintCustomerTransactionScript, '?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Credit&PrintPDF=True">', _('PDF '), '
- <img src="', $RootPath, '/css/', $Theme, '/images/pdf.png" title="', _('Click for PDF'), '" alt="" />
+ <td class="noprint">
+ <a href="', $RootPath, '/', $PrintCustomerTransactionScript, '?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Invoice&PrintPDF=True" title="', _('Click for PDF'), '">
+ <img alt="" src="', $RootPath, '/css/', $Theme, '/images/pdf.png" /> ',
+ _('PDF'), '
</a>
</td>
- <td>
+ <td class="noprint">
<a href="', $RootPath, '/EmailCustTrans.php?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Credit">', _('Email'), '
<img src="', $RootPath, '/css/', $Theme, '/images/email.png" title="', _('Click to email the credit note'), '" alt="" />
</a>
</td>
- <td>
- <a href="', $RootPath, '/CustomerAllocations.php?AllocTrans=', $MyRow['id'], '">', _('Allocation'), '
- <img src="', $RootPath, '/css/', $Theme, '/images/allocation.png" title="', _('Click to allocate funds'), '" alt="" />
+ <td class="noprint">
+ <a href="', $RootPath, '/CustomerAllocations.php?AllocTrans=', $MyRow['id'], '" title="', _('Click to allocate funds'), '">
+ <img alt="" src="', $RootPath, '/css/', $Theme, '/images/allocation.png" /> ',
+ _('Allocation'), '
</a>
</td>
- <td></td>
+ <td class="noprint"> </td>
</tr>';
}
@@ -500,17 +517,19 @@
<td class="number">', locale_number_format($MyRow['totalamount'], $CustomerRecord['decimalplaces']), '</td>
<td class="number">', locale_number_format($MyRow['allocated'], $CustomerRecord['decimalplaces']), '</td>
<td class="number">', locale_number_format($MyRow['totalamount'] - $MyRow['allocated'], $CustomerRecord['decimalplaces']), '</td>
- <td>
- <a href="', $RootPath, '/CustomerAllocations.php?AllocTrans=', $MyRow['id'], '">', _('Allocation'), '
- <img src="', $RootPath, '/css/', $Theme, '/images/allocation.png" title="', _('Click to allocate funds'), '" alt="" />
+ <td class="noprint">
+ <a href="', $RootPath, '/CustomerAllocations.php?AllocTrans=', $MyRow['id'], '" title="', _('Click to allocate funds'), '">
+ <img alt="" src="', $RootPath, '/css/', $Theme, '/images/allocation.png" /> ',
+ _('Allocation'), '
</a>
</td>
- <td></td>
- <td></td>
- <td></td>
- <td>
- <a href="', $RootPath, '/GLTransInquiry.php?TypeID=', $MyRow['type'], '&TransNo=', $MyRow['transno'], '">', _('View GL Entries'), '
- <img src="', $RootPath, '/css/', $Theme, '/images/gl.png" title="', _('View GL Entries'), '" alt="" />
+ <td class="noprint"> </td>
+ <td class="noprint"> </td>
+ <td class="noprint"> </td>
+ <td class="noprint">
+ <a href="', $RootPath, '/GLTransInquiry.php?TypeID=', $MyRow['type'], '&TransNo=', $MyRow['transno'], '" title="', _('Click to view the GL entries'), '">
+ <img alt="" src="', $RootPath, '/css/', $Theme, '/images/gl.png" /> ',
+ _('GL Entries'), '
</a>
</td>
</tr>';
@@ -530,15 +549,16 @@
<td class="number">', locale_number_format($MyRow['totalamount'], $CustomerRecord['decimalplaces']), '</td>
<td class="number">', locale_number_format($MyRow['allocated'], $CustomerRecord['decimalplaces']), '</td>
<td class="number">', locale_number_format($MyRow['totalamount'] - $MyRow['allocated'], $CustomerRecord['decimalplaces']), '</td>
- <td>
- <a href="', $RootPath, '/CustomerAllocations.php?AllocTrans=', $MyRow['id'], '">', _('Allocation'), '
- <img src="', $RootPath, '/css/', $Theme, '/images/allocation.png" title="', _('Click to allocate funds'), '" alt="" />
+ <td class="noprint">
+ <a href="', $RootPath, '/CustomerAllocations.php?AllocTrans=', $MyRow['id'], '" title="', _('Click to allocate funds'), '">
+ <img alt="" src="', $RootPath, '/css/', $Theme, '/images/allocation.png" /> ',
+ _('Allocation'), '
</a>
</td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
+ <td class="noprint"> </td>
+ <td class="noprint"> </td>
+ <td class="noprint"> </td>
+ <td class="noprint"> </td>
</tr>';
}
@@ -558,14 +578,15 @@
<td class="number">', locale_number_format($MyRow['totalamount'], $CustomerRecord['decimalplaces']), '</td>
<td class="number">', locale_number_format($MyRow['allocated'], $CustomerRecord['decimalplaces']), '</td>
<td class="number">', locale_number_format($MyRow['totalamount'] - $MyRow['allocated'], $CustomerRecord['decimalplaces']), '</td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
- <td>
- <a href="', $RootPath, '/GLTransInquiry.php?TypeID=', $MyRow['type'], '&TransNo=', $MyRow['transno'], '">' . _('View GL Entries') . '
- <img src="', $RootPath, '/css/', $Theme, '/images/gl.png" title="', _('View GL Entries'), '" alt="" />
- </a>
+ <td class="noprint"> </td>
+ <td class="noprint"> </td>
+ <td class="noprint"> </td>
+ <td class="noprint"> </td>
+ <td class="noprint">
+ <a href="', $RootPath, '/GLTransInquiry.php?TypeID=', $MyRow['type'], '&TransNo=', $MyRow['transno'], '" title="', _('Click to view the GL entries'), '">
+ <img alt="" src="', $RootPath, '/css/', $Theme, '/images/gl.png" /> ',
+ _('GL Entries'), '
+ </a>
</td>
</tr>';
@@ -584,11 +605,11 @@
<td class="number">', locale_number_format($MyRow['totalamount'], $CustomerRecord['decimalplaces']), '</td>
<td class="number">', locale_number_format($MyRow['allocated'], $CustomerRecord['decimalplaces']), '</td>
<td class="number">', locale_number_format($MyRow['totalamount'] - $MyRow['allocated'], $CustomerRecord['decimalplaces']), '</td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
+ <td class="noprint"> </td>
+ <td class="noprint"> </td>
+ <td class="noprint"> </td>
+ <td class="noprint"> </td>
+ <td class="noprint"> </td>
</tr>';
}
} else {
@@ -607,13 +628,14 @@
<td class="number">', locale_number_format($MyRow['totalamount'], $CustomerRecord['decimalplaces']), '</td>
<td class="number">', locale_number_format($MyRow['allocated'], $CustomerRecord['decimalplaces']), '</td>
<td class="number">', locale_number_format($MyRow['totalamount'] - $MyRow['allocated'], $CustomerRecord['decimalplaces']), '</td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
- <td>
- <a href="', $RootPath, '/GLTransInquiry.php?TypeID=', $MyRow['type'], '&TransNo=', $MyRow['transno'], '">', _('View GL Entries'), '
- <img src="', $RootPath, '/css/', $Theme, '/images/gl.png" title="', _('View GL Entries'), '" alt="" />
+ <td class="noprint"> </td>
+ <td class="noprint"> </td>
+ <td class="noprint"> </td>
+ <td class="noprint"> </td>
+ <td class="noprint">
+ <a href="', $RootPath, '/GLTransInquiry.php?TypeID=', $MyRow['type'], '&TransNo=', $MyRow['transno'], '" title="', _('Click to view the GL entries'), '">
+ <img alt="" src="', $RootPath, '/css/', $Theme, '/images/gl.png" /> ',
+ _('GL Entries'), '
</a>
</td>
</tr>';
@@ -633,11 +655,11 @@
<td class="number">', locale_number_format($MyRow['totalamount'], $CustomerRecord['decimalplaces']), '</td>
<td class="number">', locale_number_format($MyRow['allocated'], $CustomerRecord['decimalplaces']), '</td>
<td class="number">', locale_number_format($MyRow['totalamount'] - $MyRow['allocated'], $CustomerRecord['decimalplaces']), '</td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
+ <td class="noprint"> </td>
+ <td class="noprint"> </td>
+ <td class="noprint"> </td>
+ <td class="noprint"> </td>
+ <td class="noprint"> </td>
</tr>';
}
}
@@ -645,6 +667,6 @@
}
//end of while loop
-echo '</table>';
+echo '</tbody></table>';
include('includes/footer.inc');
?>
\ No newline at end of file
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-05-07 13:54:04 UTC (rev 7290)
+++ trunk/doc/Change.log 2015-05-07 20:04:23 UTC (rev 7291)
@@ -1,6 +1,7 @@
webERP Change Log
-07/05/15 RChacon: Hides submit button and 'More Info' columns when printing. Add thead tag to enable the table header to be printed at the top of each page.
+07/05/15 RChacon: In CustomerInquiry.php, hide submit button and 'More Info' columns when printing. Add thead tag to enable the table header to be printed at the top of each page.
+07/05/15 RChacon: In SupplierInquiry.php, hide submit button and 'More Info' columns when printing. Add thead tag to enable the table header to be printed at the top of each page.
04/05/15 Exson: Make PO number searching also in compliance with location authority rules and make default search result as all if users have full location authority.
04/05/15 Exson: Make all option available for users who have authority for all locations and all option available for all stock categories in PO_SelectOSPurchOrder.php.
02/05/15 TeHonu: Added bankaccountusers table in Z_ChangeGLAccountCode.php
|
|
From: <rc...@us...> - 2015-05-07 13:54:06
|
Revision: 7290
http://sourceforge.net/p/web-erp/reponame/7290
Author: rchacon
Date: 2015-05-07 13:54:04 +0000 (Thu, 07 May 2015)
Log Message:
-----------
Hides submit button and 'More Info' columns when printing. Add thead tag to enable the table header to be printed at the top of each page.
Modified Paths:
--------------
trunk/SupplierInquiry.php
trunk/doc/Change.log
Modified: trunk/SupplierInquiry.php
===================================================================
--- trunk/SupplierInquiry.php 2015-05-04 06:55:21 UTC (rev 7289)
+++ trunk/SupplierInquiry.php 2015-05-07 13:54:04 UTC (rev 7290)
@@ -1,8 +1,9 @@
<?php
/* $Id$*/
+/* Inquiry showing invoices, credit notes and payments made to suppliers together with the amounts outstanding. */
include('includes/session.inc');
-$Title = _('Supplier Inquiry');
+$Title = _('Supplier Inquiry');// Screen identification.
$ViewTopic = 'AccountsPayable';// Filename in ManualContents.php's TOC./* RChacon: Is there any content for Supplier Inquiry? */
$BookMark = 'AccountsPayable';// Anchor's id in the manual's html document.
include('includes/header.inc');
@@ -114,7 +115,7 @@
$SupplierRecord['overdue2'] = 0;
}
include('includes/CurrenciesArray.php'); // To get the currency name from the currency code.
-echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/supplier.png" title="' . _('Supplier') . '" alt="" /> ' .
+echo '<p class="page_title_text"><img alt="" src="'.$RootPath.'/css/'.$Theme.'/images/supplier.png" title="' . _('Supplier') . '" /> ' .
_('Supplier') . ': ' .
$SupplierID . ' - ' . $SupplierRecord['suppname'] . '<br />' .
_('All amounts stated in') . ': ' .
@@ -163,7 +164,7 @@
echo '<div>
<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo _('Show all transactions after') . ': ' . '<input type="text" class="date" alt="' .$_SESSION['DefaultDateFormat'] .'" name="TransAfterDate" value="' . $_POST['TransAfterDate'] . '" maxlength="10" size="10" />
- <input type="submit" name="Refresh Inquiry" value="' . _('Refresh Inquiry') . '" />
+ <input class="noprint" name="Refresh Inquiry" type="submit" value="' . _('Refresh Inquiry') . '" />
</div>
</form>
<br />';
@@ -204,7 +205,7 @@
/*show a table of the transactions returned by the SQL */
-echo '<table width="90%" class="selection">
+echo '<table class="selection"><thead>
<tr>
<th class="ascending">' . _('Date') . '</th>
<th class="ascending">' . _('Type') . '</th>
@@ -214,9 +215,10 @@
<th class="ascending">' . _('Total') . '</th>
<th class="ascending">' . _('Allocated') . '</th>
<th class="ascending">' . _('Balance') . '</th>
- <th>' . _('More Info') . '</th>
- <th>' . _('More Info') . '</th>
- </tr>';
+ <th class="noprint">' . _('More Info') . '</th>
+ <th class="noprint">' . _('More Info') . '</th>
+ </tr>
+ </thead><tbody>';
$j = 1;
$k = 0;// Row colour counter.
@@ -252,17 +254,17 @@
<td class="number">' . locale_number_format($myrow['allocated'],$SupplierRecord['currdecimalplaces']) . '</td>
<td class="number">' . locale_number_format($myrow['totalamount']-$myrow['allocated'],$SupplierRecord['currdecimalplaces']) . '</td>';
- $PaymentTD1 = '<td><a href="' . $RootPath . '/PaymentAllocations.php?SuppID=%s&InvID=%s" title="' .
+ $PaymentTD1 = '<td class="noprint"><a href="' . $RootPath . '/PaymentAllocations.php?SuppID=%s&InvID=%s" title="' .
_('Click to view payments') . '"><img alt="" src="' . $RootPath .
'/css/' . $Theme . '/images/money_delete.png" width="16"/> ' . _('Payments') . '</a></td>';
/* To do: $HoldValueTD1*/
- $AllocationTD1 = '<td><a href="' . $RootPath . '/SupplierAllocations.php?AllocTrans=%s" title="' .
+ $AllocationTD1 = '<td class="noprint"><a href="' . $RootPath . '/SupplierAllocations.php?AllocTrans=%s" title="' .
_('Click to allocate funds') . '"><img alt="" src="' . $RootPath .
'/css/' . $Theme . '/images/allocation.png" /> ' . _('Allocation') . '</a></td>';
- $GLEntriesTD1 = '<td><a href="' . $RootPath . '/GLTransInquiry.php?TypeID=%s&TransNo=%s" target="_blank" title="' .
+ $GLEntriesTD1 = '<td class="noprint"><a href="' . $RootPath . '/GLTransInquiry.php?TypeID=%s&TransNo=%s" target="_blank" title="' .
_('Click to view the GL entries') . '"><img alt="" src="' . $RootPath .
'/css/' . $Theme . '/images/gl.png" width="16" /> ' . _('GL Entries') . '</a></td>';
@@ -289,12 +291,12 @@
printf($BaseTD8);
if ($AuthRow[0]==0) {
- echo '<td><a href="' .htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?HoldType=' . $myrow['type'] . '&HoldTrans=' . $myrow['transno']. '&HoldStatus=' . $HoldValue . '&FromDate=' . $_POST['TransAfterDate'].'">' . $HoldValue . '</a></td>';
+ echo '<td class="noprint"><a href="' .htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?HoldType=' . $myrow['type'] . '&HoldTrans=' . $myrow['transno']. '&HoldStatus=' . $HoldValue . '&FromDate=' . $_POST['TransAfterDate'].'">' . $HoldValue . '</a></td>';
} else {
if ($HoldValue==_('Release')) {
echo '<td>' . $HoldValue . '</a></td>';
} else {
- echo '<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8'). '?HoldType=' . $myrow['type'] .'&HoldTrans=' . $myrow['transno'] . '&HoldStatus=' . $HoldValue . '&FromDate=' . $_POST['TransAfterDate'] .'">' . $HoldValue . '</a></td>';
+ echo '<td class="noprint"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8'). '?HoldType=' . $myrow['type'] .'&HoldTrans=' . $myrow['transno'] . '&HoldStatus=' . $HoldValue . '&FromDate=' . $_POST['TransAfterDate'] .'">' . $HoldValue . '</a></td>';
}
}
printf($GLEntriesTD1 . '</tr>',
@@ -306,14 +308,13 @@
} else {
if ($myrow['totalamount'] - $myrow['allocated'] == 0) {
/*The trans is settled so don't show option to hold */
- printf($BaseTD8 . '<td> </td><td> </td></tr>');
+ echo $BaseTD8 . '<td class="noprint"> </td><td class="noprint"> </td></tr>';
} else {
- printf($BaseTD8);
- echo '
- <td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES,'UTF-8') . '/PaymentAllocations.php?SuppID=' .
+ echo $BaseTD8 . '
+ <td class="noprint"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES,'UTF-8') . '/PaymentAllocations.php?SuppID=' .
$myrow['type'] . '&InvID=' . $myrow['transno'] . '">' . _('View Payments') . '</a></td>
- <td><a href="' . $HoldValue . '?HoldType=' . $_POST['TransAfterDate'] . '&HoldTrans=' . $HoldValue . '&HoldStatus=' .
+ <td class="noprint"><a href="' . $HoldValue . '?HoldType=' . $_POST['TransAfterDate'] . '&HoldTrans=' . $HoldValue . '&HoldStatus=' .
$RootPath . '&FromDate='. $myrow['supplierno'] . '">' . $myrow['suppreference'] . '</a></td></tr>';
}
}
@@ -329,7 +330,7 @@
$myrow['transno']);
} else { /*Not linked to GL */
- printf($BaseTD8 . $AllocationTD1 . '<td> </td></tr>',
+ printf($BaseTD8 . $AllocationTD1 . '<td class="noprint"> </td></tr>',
// $AllocationTD1 parameters:
$myrow['id']);
@@ -337,6 +338,6 @@
}// End of page full new headings if
}// End of while loop
-echo '</table>';
+echo '</tbody></table>';
include('includes/footer.inc');
-?>
+?>
\ No newline at end of file
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-05-04 06:55:21 UTC (rev 7289)
+++ trunk/doc/Change.log 2015-05-07 13:54:04 UTC (rev 7290)
@@ -1,5 +1,6 @@
webERP Change Log
+07/05/15 RChacon: Hides submit button and 'More Info' columns when printing. Add thead tag to enable the table header to be printed at the top of each page.
04/05/15 Exson: Make PO number searching also in compliance with location authority rules and make default search result as all if users have full location authority.
04/05/15 Exson: Make all option available for users who have authority for all locations and all option available for all stock categories in PO_SelectOSPurchOrder.php.
02/05/15 TeHonu: Added bankaccountusers table in Z_ChangeGLAccountCode.php
|
|
From: <ex...@us...> - 2015-05-04 06:55:23
|
Revision: 7289
http://sourceforge.net/p/web-erp/reponame/7289
Author: exsonqu
Date: 2015-05-04 06:55:21 +0000 (Mon, 04 May 2015)
Log Message:
-----------
Modified Paths:
--------------
trunk/doc/Change.log
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-05-04 06:54:44 UTC (rev 7288)
+++ trunk/doc/Change.log 2015-05-04 06:55:21 UTC (rev 7289)
@@ -1,5 +1,6 @@
webERP Change Log
+04/05/15 Exson: Make PO number searching also in compliance with location authority rules and make default search result as all if users have full location authority.
04/05/15 Exson: Make all option available for users who have authority for all locations and all option available for all stock categories in PO_SelectOSPurchOrder.php.
02/05/15 TeHonu: Added bankaccountusers table in Z_ChangeGLAccountCode.php
30/04/15 TurboPT: Add Delivery Date in GoodsReceived.php output. Forum feature request by giusba71.
|
|
From: <ex...@us...> - 2015-05-04 06:54:46
|
Revision: 7288
http://sourceforge.net/p/web-erp/reponame/7288
Author: exsonqu
Date: 2015-05-04 06:54:44 +0000 (Mon, 04 May 2015)
Log Message:
-----------
04/05/15 Exson: Make PO number searching also in compliance with location authority rules and make default search result as all if users have full location authority.
Modified Paths:
--------------
trunk/PO_SelectOSPurchOrder.php
Modified: trunk/PO_SelectOSPurchOrder.php
===================================================================
--- trunk/PO_SelectOSPurchOrder.php 2015-05-04 03:26:00 UTC (rev 7287)
+++ trunk/PO_SelectOSPurchOrder.php 2015-05-04 06:54:44 UTC (rev 7288)
@@ -176,6 +176,9 @@
$UserLocations = DB_num_rows($resultStkLocs);
$AllListed = false;
while ($myrow = DB_fetch_array($resultStkLocs)) {
+ if(!isset($LocQty)){
+ $LocQty = $myrow['total'];
+ }
if (isset($_POST['StockLocation'])) {//The user has selected location
if ($_POST['StockLocation'] == 'ALLLOC'){//user have selected all locations
if($AllListed === false) {//it's the first loop
@@ -364,6 +367,9 @@
SUM(purchorderdetails.unitprice*purchorderdetails.quantityord) AS ordervalue
FROM purchorders INNER JOIN purchorderdetails
ON purchorders.orderno=purchorderdetails.orderno
+ INNER JOIN locationusers
+ ON purchorders.intostocklocation=locationusers.loccode
+ AND userid='" . $_SESSION['UserID'] . "' AND canview = 1
INNER JOIN suppliers
ON purchorders.supplierno = suppliers.supplierid
INNER JOIN currencies
@@ -382,8 +388,12 @@
//$OrderNumber is not set
if (isset($SelectedSupplier)) {
if (!isset($_POST['StockLocation'])) {
- $_POST['StockLocation'] = $_SESSION['UserStockLocation'];
- $WhereStockLocation = " AND purchorders.intostocklocation ='" . $_POST['StockLocation'] . "' ";
+ if (isset($UserLocations) AND isset($LocQty) AND $UserLocations == $LocQty) {
+ $WhereStockLocation = " AND purchorders.intostocklocation ='" . $_POST['StockLocation'] . "' ";
+ } else {
+ $_POST['StockLocation'] = $_SESSION['UserStockLocation'];
+ $WhereStockLocation = " AND purchorders.intostocklocation ='" . $_POST['StockLocation'] . "' ";
+ }
} else {
if ($_POST['StockLocation'] == 'ALLLOC'){
$WhereStockLocation = ' ';
@@ -469,8 +479,13 @@
} //isset($SelectedSupplier)
else { //no supplier selected
if (!isset($_POST['StockLocation'])) {
- $_POST['StockLocation'] = $_SESSION['UserStockLocation'];
- $WhereStockLocation = " AND purchorders.intostocklocation = '" . $_POST['StockLocation'] . "'";
+ if (isset($UserLocations) AND isset($LocQty) AND $UserLocations == $LocQty) {
+ $WhereStockLocation = " ";
+ $_POST['StockLocation'] = 'ALLLOC';
+ } else {
+ $_POST['StockLocation'] = $_SESSION['UserStockLocation'];
+ $WhereStockLocation = " AND purchorders.intostocklocation ='" . $_POST['StockLocation'] . "' ";
+ }
} else {
if ($_POST['StockLocation'] == 'ALLLOC'){
$WhereStockLocation = ' ';
|
|
From: <ex...@us...> - 2015-05-04 03:26:03
|
Revision: 7287
http://sourceforge.net/p/web-erp/reponame/7287
Author: exsonqu
Date: 2015-05-04 03:26:00 +0000 (Mon, 04 May 2015)
Log Message:
-----------
Modified Paths:
--------------
trunk/doc/Change.log
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-05-04 03:25:24 UTC (rev 7286)
+++ trunk/doc/Change.log 2015-05-04 03:26:00 UTC (rev 7287)
@@ -1,4 +1,6 @@
webERP Change Log
+
+04/05/15 Exson: Make all option available for users who have authority for all locations and all option available for all stock categories in PO_SelectOSPurchOrder.php.
02/05/15 TeHonu: Added bankaccountusers table in Z_ChangeGLAccountCode.php
30/04/15 TurboPT: Add Delivery Date in GoodsReceived.php output. Forum feature request by giusba71.
30/04/15 Exson: Fixed the notice noise in SupplierCredit.php and SupplierInvoice.php.
|
|
From: <ex...@us...> - 2015-05-04 03:25:26
|
Revision: 7286
http://sourceforge.net/p/web-erp/reponame/7286
Author: exsonqu
Date: 2015-05-04 03:25:24 +0000 (Mon, 04 May 2015)
Log Message:
-----------
04/05/15 Exson: Make all option available for users who have authority for all locations and all option available for all stock categories in PO_SelectOSPurchOrder.php.
Modified Paths:
--------------
trunk/PO_SelectOSPurchOrder.php
Modified: trunk/PO_SelectOSPurchOrder.php
===================================================================
--- trunk/PO_SelectOSPurchOrder.php 2015-05-02 21:28:39 UTC (rev 7285)
+++ trunk/PO_SelectOSPurchOrder.php 2015-05-04 03:25:24 UTC (rev 7286)
@@ -64,6 +64,11 @@
if (isset($_POST['Keywords']) AND isset($_POST['StockCode'])) {
echo '<div class="page_help_text">' . _('Stock description keywords have been used in preference to the Stock code extract entered') . '.</div>';
}
+ if (isset($_POST['StockCat']) AND $_POST['StockCat'] == 'All'){
+ $WhereStockCat = ' ';
+ } else {
+ $WhereStockCat = " AND stockmaster.categoryid='" . $_POST['StockCat'] . "'";
+ }
if ($_POST['Keywords']) {
//insert wildcard characters in spaces
$SearchString = '%' . str_replace(' ', '%', $_POST['Keywords']) . '%';
@@ -81,7 +86,7 @@
INNER JOIN locationusers ON locationusers.loccode=purchorders.intostocklocation AND locationusers.userid='" . $_SESSION['UserID'] . "' AND locationusers.canview=1
WHERE purchorderdetails.completed=0
AND stockmaster.description " . LIKE . " '" . $SearchString . "'
- AND stockmaster.categoryid='" . $_POST['StockCat'] . "'
+ " . $WhereStockCat . "
GROUP BY stockmaster.stockid,
stockmaster.description,
stockmaster.units
@@ -103,7 +108,7 @@
INNER JOIN locationusers ON locationusers.loccode=purchorders.intostocklocation AND locationusers.userid='" . $_SESSION['UserID'] . "' AND locationusers.canview=1
WHERE purchorderdetails.completed=0
AND stockmaster.stockid " . LIKE . " '%" . $_POST['StockCode'] . "%'
- AND stockmaster.categoryid='" . $_POST['StockCat'] . "'
+ " . $WhereStockCat . "
GROUP BY stockmaster.stockid,
stockmaster.description,
stockmaster.units
@@ -122,7 +127,7 @@
INNER JOIN purchorders on purchorders.orderno=purchorderdetails.orderno
INNER JOIN locationusers ON locationusers.loccode=purchorders.intostocklocation AND locationusers.userid='" . $_SESSION['UserID'] . "' AND locationusers.canview=1
WHERE purchorderdetails.completed=0
- AND stockmaster.categoryid='" . $_POST['StockCat'] . "'
+ " . $WhereStockCat . "
GROUP BY stockmaster.stockid,
stockmaster.description,
stockmaster.units
@@ -164,21 +169,56 @@
$DateTo = FormatDateForSQL($_POST['DateTo']);
}
- $sql = "SELECT locations.loccode, locationname FROM locations
+ $sql = "SELECT locations.loccode, locationname,(SELECT count(*) FROM locations) AS total FROM locations
INNER JOIN locationusers ON locationusers.loccode=locations.loccode AND locationusers.userid='" . $_SESSION['UserID'] . "' AND locationusers.canview=1";
- $resultStkLocs = DB_query($sql);
+ $ErrMsg = _('Failed to retrieve location data');
+ $resultStkLocs = DB_query($sql,$ErrMsg);
+ $UserLocations = DB_num_rows($resultStkLocs);
+ $AllListed = false;
while ($myrow = DB_fetch_array($resultStkLocs)) {
- if (isset($_POST['StockLocation'])) {
- if ($myrow['loccode'] == $_POST['StockLocation']) {
- echo '<option selected="selected" value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
- } else {
- echo '<option value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
+ if (isset($_POST['StockLocation'])) {//The user has selected location
+ if ($_POST['StockLocation'] == 'ALLLOC'){//user have selected all locations
+ if($AllListed === false) {//it's the first loop
+ echo '<option selected="selected" value="ALLLOC">' . _('All') . '</option>';
+ echo '<option value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
+ $AllListed = true;
+ } else { //it's not the first loop
+ echo '<option value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
+ }
+
+ } else {//user have not selected all locations; There are two possibilities that users have right, but not choose all; or vice visa
+ if ($myrow['total'] == $UserLocations) { //user have allloc right
+ if($AllListed === false){//first loop
+ echo '<option value="ALLLOC">' . _('All') . '</option>';
+ $AllListed = true;
+ }
+ }
+ if ($myrow['loccode'] == $_POST['StockLocation']){
+ echo '<option selected="selected" value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
+ } else {
+ echo '<option value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
+ }
}
- } elseif ($myrow['loccode'] == $_SESSION['UserStockLocation']) {
- echo '<option selected="selected" value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
- } else {
- echo '<option value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
+ } else {//users have not selected locations
+ if($myrow['total'] == $UserLocations){//users have right to submit All locations
+ if($AllListed === false){//first loop
+ echo '<option selected="selected" value="ALLLOC">' . _('All') . '</option>';//default value is all
+ echo '<option value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
+ $AllListed = true;
+ } else {//not first loop
+ echo '<option value="' . $myrow['loccode'] . '" >' . $myrow['locationname'] . '</option>';
+ }
+ } else {//no right to submit all locations
+ if ($myrow['loccode'] == $_SESSION['UserStockLocation']) {
+ echo '<option selected="selected" value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
+ } else {
+ echo '<option value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
+ }
+
+ }
+
}
+
}
echo '</select> ' . _('Order Status:') . ' <select name="Status">';
if (!isset($_POST['Status']) OR $_POST['Status'] == 'Pending_Authorised') {
@@ -229,7 +269,9 @@
echo '<td>' . _('Select a stock category') . ':
<select name="StockCat">';
-
+if (DB_num_rows($result1)>0){
+ echo '<option value="All">' . _('All') . '</option>';
+}
while ($myrow1 = DB_fetch_array($result1)) {
if (isset($_POST['StockCat']) and $myrow1['categoryid'] == $_POST['StockCat']) {
echo '<option selected="selected" value="' . $myrow1['categoryid'] . '">' . $myrow1['categorydescription'] . '</option>';
@@ -341,6 +383,13 @@
if (isset($SelectedSupplier)) {
if (!isset($_POST['StockLocation'])) {
$_POST['StockLocation'] = $_SESSION['UserStockLocation'];
+ $WhereStockLocation = " AND purchorders.intostocklocation ='" . $_POST['StockLocation'] . "' ";
+ } else {
+ if ($_POST['StockLocation'] == 'ALLLOC'){
+ $WhereStockLocation = ' ';
+ } else {
+ $WhereStockLocation = " AND purchorders.intostocklocation = '" . $_POST['StockLocation'] . "' ";
+ }
}
if (isset($SelectedStockItem)) {
@@ -368,8 +417,8 @@
AND orddate<='" . $DateTo . "'
AND purchorderdetails.itemcode='" . $SelectedStockItem . "'
AND purchorders.supplierno='" . $SelectedSupplier . "'
- AND purchorders.intostocklocation = '" . $_POST['StockLocation'] . "'
- " . $StatusCriteria . "
+ " . $WhereStockLocation
+ . $StatusCriteria . "
GROUP BY purchorders.orderno ASC,
purchorders.realorderno,
suppliers.suppname,
@@ -404,8 +453,8 @@
AND orddate>='" . $DateFrom . "'
AND orddate<='" . $DateTo . "'
AND purchorders.supplierno='" . $SelectedSupplier . "'
- AND purchorders.intostocklocation = '" . $_POST['StockLocation'] . "'
- " . $StatusCriteria . "
+ " . $WhereStockLocation
+ . $StatusCriteria . "
GROUP BY purchorders.orderno ASC,
purchorders.realorderno,
suppliers.suppname,
@@ -421,6 +470,13 @@
else { //no supplier selected
if (!isset($_POST['StockLocation'])) {
$_POST['StockLocation'] = $_SESSION['UserStockLocation'];
+ $WhereStockLocation = " AND purchorders.intostocklocation = '" . $_POST['StockLocation'] . "'";
+ } else {
+ if ($_POST['StockLocation'] == 'ALLLOC'){
+ $WhereStockLocation = ' ';
+ } else {
+ $WhereStockLocation = " AND purchorders.intostocklocation = '" . $_POST['StockLocation'] . "'";
+ }
}
if (isset($SelectedStockItem) AND isset($_POST['StockLocation'])) {
$SQL = "SELECT purchorders.realorderno,
@@ -446,8 +502,8 @@
AND orddate>='" . $DateFrom . "'
AND orddate<='" . $DateTo . "'
AND purchorderdetails.itemcode='" . $SelectedStockItem . "'
- AND purchorders.intostocklocation = '" . $_POST['StockLocation'] . "'
- " . $StatusCriteria . "
+ " . $WhereStockLocation .
+ $StatusCriteria . "
GROUP BY purchorders.orderno ASC,
purchorders.realorderno,
suppliers.suppname,
@@ -481,8 +537,8 @@
WHERE purchorderdetails.completed=0
AND orddate>='" . $DateFrom . "'
AND orddate<='" . $DateTo . "'
- AND purchorders.intostocklocation = '" . $_POST['StockLocation'] . "'
- " . $StatusCriteria . "
+ " . $WhereStockLocation .
+ $StatusCriteria . "
GROUP BY purchorders.orderno ASC,
purchorders.realorderno,
suppliers.suppname,
|
|
From: <te...@us...> - 2015-05-02 21:28:41
|
Revision: 7285
http://sourceforge.net/p/web-erp/reponame/7285
Author: tehonu
Date: 2015-05-02 21:28:39 +0000 (Sat, 02 May 2015)
Log Message:
-----------
Added bankaccountusers table in Z_ChangeGLAccountCode.php
Modified Paths:
--------------
trunk/Z_ChangeGLAccountCode.php
trunk/doc/Change.log
Modified: trunk/Z_ChangeGLAccountCode.php
===================================================================
--- trunk/Z_ChangeGLAccountCode.php 2015-05-01 02:42:51 UTC (rev 7284)
+++ trunk/Z_ChangeGLAccountCode.php 2015-05-02 21:28:39 UTC (rev 7285)
@@ -68,6 +68,8 @@
ChangeFieldInTable("bankaccounts", "accountcode", $_POST['OldAccountCode'], $_POST['NewAccountCode'], $db);
+ ChangeFieldInTable("bankaccountusers", "accountcode", $_POST['OldAccountCode'], $_POST['NewAccountCode'], $db);
+
ChangeFieldInTable("banktrans", "bankact", $_POST['OldAccountCode'], $_POST['NewAccountCode'], $db);
ChangeFieldInTable("chartdetails", "accountcode", $_POST['OldAccountCode'], $_POST['NewAccountCode'], $db);
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-05-01 02:42:51 UTC (rev 7284)
+++ trunk/doc/Change.log 2015-05-02 21:28:39 UTC (rev 7285)
@@ -1,5 +1,5 @@
webERP Change Log
-
+02/05/15 TeHonu: Added bankaccountusers table in Z_ChangeGLAccountCode.php
30/04/15 TurboPT: Add Delivery Date in GoodsReceived.php output. Forum feature request by giusba71.
30/04/15 Exson: Fixed the notice noise in SupplierCredit.php and SupplierInvoice.php.
30/04/15 Exson: Fixed the properties initial bug and tidy code up by fix typo.
|
|
From: <tu...@us...> - 2015-05-01 02:42:53
|
Revision: 7284
http://sourceforge.net/p/web-erp/reponame/7284
Author: turbopt
Date: 2015-05-01 02:42:51 +0000 (Fri, 01 May 2015)
Log Message:
-----------
Add Delivery Date in GoodsReceived.php output [forum feature request], plus some very minor cleanup.
Modified Paths:
--------------
trunk/GoodsReceived.php
trunk/doc/Change.log
Modified: trunk/GoodsReceived.php
===================================================================
--- trunk/GoodsReceived.php 2015-04-30 10:31:08 UTC (rev 7283)
+++ trunk/GoodsReceived.php 2015-05-01 02:42:51 UTC (rev 7284)
@@ -92,9 +92,9 @@
echo '<table cellpadding="2" class="selection">
<tr><th colspan="2"></th>
- <th align="center" colspan="3"><b>' . _('Supplier Units') . '</b></th>
+ <th class="centre" colspan="3"><b>' . _('Supplier Units') . '</b></th>
<th></th>
- <th align="center" colspan="5"><b>' . _('Our Receiving Units') . '</b></th>
+ <th class="centre" colspan="5"><b>' . _('Our Receiving Units') . '</b></th>
</tr>
<tr>
<th>' . _('Item Code') . '</th>
@@ -106,6 +106,7 @@
<th>' . _('Quantity') . '<br />' . _('Ordered') . '</th>
<th>' . _('Units') . '</th>
<th>' . _('Already') . '<br />' . _('Received') . '</th>
+ <th>' . _('Delivery') . '<br />' . _('Date') . '</th>
<th>' . _('This Delivery') . '<br />' . _('Quantity') . '</th>
<th>' . _('Completed') . '</th>';
@@ -170,6 +171,7 @@
<td class="number">' . $DisplayQtyOrd . '</td>
<td>' . $LnItm->Units . '</td>
<td class="number">' . $DisplayQtyRec . '</td>
+ <td>' . $LnItm->ReqDelDate . '</td>
<td class="number">';
if ($LnItm->Controlled == 1) {
@@ -206,7 +208,7 @@
$DisplayTotal = locale_number_format($_SESSION['PO'.$identifier]->Total,$_SESSION['PO'.$identifier]->CurrDecimalPlaces);
if ($_SESSION['ShowValueOnGRN']==1) {
echo '<tr>
- <td colspan="11" class="number"><b>' . _('Total value of goods received'). '</b></td>
+ <td colspan="13" class="number"><b>' . _('Total value of goods received'). '</b></td>
<td class="number"><b>' . $DisplayTotal. '</b></td>
</tr>
</table>';
@@ -422,7 +424,7 @@
$_SESSION['PO'.$identifier]->LineItems[$OrderLine->LineNo]->StandardCost = (($CurrentStandardCost * $OrderLine->ReceiveQty) + ($_SESSION['PO'.$identifier]->LineItems[$OrderLine->LineNo]->StandardCost * $OrderLine->QtyReceived)) / ($OrderLine->ReceiveQty + $OrderLine->QtyReceived);
} elseif ($myrow[1] == 'D') { //it's a dummy part which without stock.
$Dummy = true;
- if($OrderLine->QtyReceived == 0){//There is
+ if($OrderLine->QtyReceived == 0){//There is
$_SESSION['PO'.$identifier]->LineItems[$OrderLine->LineNo]->StandardCost = $LocalCurrencyPrice;
}
}
@@ -612,7 +614,7 @@
$Result = DB_query($SQL, $ErrMsg, $DbgMsg, true);
if ($_SESSION['QualityLogSamples']==1) {
CreateQASample($OrderLine->StockID,$Item->BundleRef, '', 'Created from Purchase Order', 0, 0,$db);
- }
+ }
}//non blank BundleRef
} //end foreach
}
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-04-30 10:31:08 UTC (rev 7283)
+++ trunk/doc/Change.log 2015-05-01 02:42:51 UTC (rev 7284)
@@ -1,5 +1,6 @@
webERP Change Log
+30/04/15 TurboPT: Add Delivery Date in GoodsReceived.php output. Forum feature request by giusba71.
30/04/15 Exson: Fixed the notice noise in SupplierCredit.php and SupplierInvoice.php.
30/04/15 Exson: Fixed the properties initial bug and tidy code up by fix typo.
26/04/15 Exson: Add adjustment reason to the mail text and fixed the notice noise in StockAdjustments.php.
|
|
From: <ex...@us...> - 2015-04-30 10:31:11
|
Revision: 7283
http://sourceforge.net/p/web-erp/reponame/7283
Author: exsonqu
Date: 2015-04-30 10:31:08 +0000 (Thu, 30 Apr 2015)
Log Message:
-----------
Modified Paths:
--------------
trunk/doc/Change.log
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-04-30 10:30:23 UTC (rev 7282)
+++ trunk/doc/Change.log 2015-04-30 10:31:08 UTC (rev 7283)
@@ -1,5 +1,6 @@
webERP Change Log
+30/04/15 Exson: Fixed the notice noise in SupplierCredit.php and SupplierInvoice.php.
30/04/15 Exson: Fixed the properties initial bug and tidy code up by fix typo.
26/04/15 Exson: Add adjustment reason to the mail text and fixed the notice noise in StockAdjustments.php.
26/04/15 Exson: Comment out the mrpparameters table update in sql file upgrade4.11.3-4.11.4.sql which made a misleading during upgrade and absolutely non-necessary.
|
|
From: <ex...@us...> - 2015-04-30 10:30:25
|
Revision: 7282
http://sourceforge.net/p/web-erp/reponame/7282
Author: exsonqu
Date: 2015-04-30 10:30:23 +0000 (Thu, 30 Apr 2015)
Log Message:
-----------
30/04/15 Exson: Fixed the notice noise in SupplierCredit.php and SupplierInvoice.php.
Modified Paths:
--------------
trunk/SupplierCredit.php
trunk/SupplierInvoice.php
Modified: trunk/SupplierCredit.php
===================================================================
--- trunk/SupplierCredit.php 2015-04-30 04:30:57 UTC (rev 7281)
+++ trunk/SupplierCredit.php 2015-04-30 10:30:23 UTC (rev 7282)
@@ -526,7 +526,7 @@
<td colspan="2"><input type="submit" name="ToggleTaxMethod" value="' . _('Update Tax Calculation') . '" /></td>
<td><select name="OverRideTax" onchange="ReloadForm(form1.ToggleTaxMethod)">';
-if ($_POST['OverRideTax']=='Man'){
+if (isset($_POST['OverRideTax']) AND $_POST['OverRideTax']=='Man'){
echo '<option value="Auto">' . _('Automatic') . '</option>
<option selected="selected" value="Man">' . _('Manual Entry') . '</option>';
} else {
Modified: trunk/SupplierInvoice.php
===================================================================
--- trunk/SupplierInvoice.php 2015-04-30 04:30:57 UTC (rev 7281)
+++ trunk/SupplierInvoice.php 2015-04-30 10:30:23 UTC (rev 7282)
@@ -874,7 +874,7 @@
<td colspan="2"><input type="submit" name="ToggleTaxMethod" value="' . _('Update Tax Calculation') . '" /></td>
<td><select name="OverRideTax" onchange="ReloadForm(form1.ToggleTaxMethod)">';
- if ($_POST['OverRideTax']=='Man'){
+ if (isset($_POST['OverRideTax']) AND $_POST['OverRideTax']=='Man'){
echo '<option value="Auto">' . _('Automatic') . '</option>
<option selected="selected" value="Man">' . _('Manually') . '</option>';
} else {
|
|
From: <ex...@us...> - 2015-04-30 04:31:00
|
Revision: 7281
http://sourceforge.net/p/web-erp/reponame/7281
Author: exsonqu
Date: 2015-04-30 04:30:57 +0000 (Thu, 30 Apr 2015)
Log Message:
-----------
Modified Paths:
--------------
trunk/doc/Change.log
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-04-30 04:30:19 UTC (rev 7280)
+++ trunk/doc/Change.log 2015-04-30 04:30:57 UTC (rev 7281)
@@ -1,5 +1,6 @@
webERP Change Log
+30/04/15 Exson: Fixed the properties initial bug and tidy code up by fix typo.
26/04/15 Exson: Add adjustment reason to the mail text and fixed the notice noise in StockAdjustments.php.
26/04/15 Exson: Comment out the mrpparameters table update in sql file upgrade4.11.3-4.11.4.sql which made a misleading during upgrade and absolutely non-necessary.
26/4/15 Exson: Fixed the account code cannot be key in directly bug in GLJournal.php. Reported by Akits.
|
15 messages has been excluded from this view by a project administrator.
