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: <rc...@us...> - 2017-12-08 04:09:17
|
Revision: 7874
http://sourceforge.net/p/web-erp/reponame/7874
Author: rchacon
Date: 2017-12-08 04:09:11 +0000 (Fri, 08 Dec 2017)
Log Message:
-----------
Rebuild languages files
Modified Paths:
--------------
trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.mo
trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po
trunk/locale/ar_SY.utf8/LC_MESSAGES/messages.mo
trunk/locale/ar_SY.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/he_IL.utf8/LC_MESSAGES/messages.mo
trunk/locale/he_IL.utf8/LC_MESSAGES/messages.po
trunk/locale/hi_IN.utf8/LC_MESSAGES/messages.mo
trunk/locale/hi_IN.utf8/LC_MESSAGES/messages.po
trunk/locale/hr_HR.utf8/LC_MESSAGES/messages.mo
trunk/locale/hr_HR.utf8/LC_MESSAGES/messages.po
trunk/locale/hu_HU.utf8/LC_MESSAGES/messages.mo
trunk/locale/hu_HU.utf8/LC_MESSAGES/messages.po
trunk/locale/id_ID.utf8/LC_MESSAGES/messages.mo
trunk/locale/id_ID.utf8/LC_MESSAGES/messages.po
trunk/locale/it_IT.utf8/LC_MESSAGES/messages.mo
trunk/locale/it_IT.utf8/LC_MESSAGES/messages.po
trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.mo
trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.po
trunk/locale/ko_KR.utf8/LC_MESSAGES/messages.mo
trunk/locale/ko_KR.utf8/LC_MESSAGES/messages.po
trunk/locale/lv_LV.utf8/LC_MESSAGES/messages.mo
trunk/locale/lv_LV.utf8/LC_MESSAGES/messages.po
trunk/locale/mr_IN.utf8/LC_MESSAGES/messages.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 2017-12-06 21:10:14 UTC (rev 7873)
+++ trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po 2017-12-08 04:09:11 UTC (rev 7874)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: webERP 4.13\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-10-02 10:22-0600\n"
+"POT-Creation-Date: 2017-12-07 22:00-0600\n"
"PO-Revision-Date: 2017-10-02 10:22-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: Arabic <ar...@li...>\n"
@@ -18,7 +18,7 @@
"X-Generator: Poedit 1.8.7.1\n"
"X-Launchpad-Export-Date: 2012-03-07 23:01+0000\n"
-#: AccountGroups.php:6 includes/MainMenuLinksArray.php:403
+#: AccountGroups.php:6 includes/MainMenuLinksArray.php:405
msgid "Account Groups"
msgstr "مجموعات العضوية"
@@ -167,7 +167,7 @@
#: Locations.php:307 Locations.php:316 Locations.php:325 Locations.php:334
#: Locations.php:343 Locations.php:351 Manufacturers.php:185
#: MRPDemandTypes.php:87 PaymentMethods.php:162 PaymentTerms.php:146
-#: PaymentTerms.php:153 PcExpenses.php:115 SalesCategories.php:146
+#: PaymentTerms.php:153 PcExpenses.php:117 SalesCategories.php:146
#: SalesCategories.php:153 SalesPeople.php:159 SalesPeople.php:166
#: SalesPeople.php:172 SalesTypes.php:140 SalesTypes.php:150 Shippers.php:81
#: Shippers.php:93 StockCategories.php:216 Stocks.php:767 Stocks.php:776
@@ -229,7 +229,7 @@
#: AddCustomerNotes.php:101 AddCustomerTypeNotes.php:94 AgedDebtors.php:454
#: AgedSuppliers.php:276 Areas.php:144 AuditTrail.php:11 BOMExtendedQty.php:256
#: BOMIndented.php:249 BOMIndentedReverse.php:236 BOMInquiry.php:186
-#: BOMListing.php:110 BOMs.php:285 BOMs.php:990 CollectiveWorkOrderCost.php:281
+#: BOMListing.php:110 BOMs.php:285 BOMs.php:997 CollectiveWorkOrderCost.php:281
#: CompanyPreferences.php:100 CounterReturns.php:1625 CounterSales.php:2107
#: CounterSales.php:2203 Credit_Invoice.php:286 CreditStatus.php:21
#: CustEDISetup.php:17 CustItem.php:120 CustItem.php:210 CustItem.php:238
@@ -239,15 +239,15 @@
#: FixedAssetRegister.php:256 FixedAssetTransfer.php:14 FormDesigner.php:185
#: GLBudgets.php:32 GLJournalInquiry.php:11 GLJournal.php:250
#: HistoricalTestResults.php:42 InternalStockRequestInquiry.php:167
-#: InternalStockRequest.php:316 InventoryPlanning.php:459
+#: InternalStockRequest.php:316 InventoryPlanning.php:460
#: InventoryPlanningPrefSupplier.php:386 MaintenanceTasks.php:14
#: MaintenanceUserSchedule.php:16 MRPReport.php:543 NoSalesItems.php:91
-#: PcAssignCashTabToTab.php:80 PcAssignCashTabToTab.php:160
-#: PcAssignCashTabToTab.php:216 PcAssignCashToTab.php:49
-#: PcAssignCashToTab.php:121 PcAssignCashToTab.php:136
-#: PcAssignCashToTab.php:170 PDFPickingList.php:29 PDFStockLocTransfer.php:16
+#: PcAssignCashTabToTab.php:80 PcAssignCashTabToTab.php:157
+#: PcAssignCashTabToTab.php:213 PcAssignCashToTab.php:50
+#: PcAssignCashToTab.php:118 PcAssignCashToTab.php:133
+#: PcAssignCashToTab.php:167 PDFPickingList.php:29 PDFStockLocTransfer.php:16
#: POReport.php:60 POReport.php:64 POReport.php:68
-#: PO_SelectOSPurchOrder.php:153 PriceMatrix.php:16 PricesBasedOnMarkUp.php:8
+#: PO_SelectOSPurchOrder.php:147 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
@@ -255,8 +255,8 @@
#: SalesGLPostings.php:19 SalesGraph.php:39 SalesPeople.php:28
#: SalesTypes.php:20 SelectAsset.php:48 SelectCompletedOrder.php:11
#: SelectContract.php:69 SelectCreditItems.php:221 SelectCreditItems.php:292
-#: SelectCustomer.php:258 SelectGLAccount.php:86 SelectOrderItems.php:588
-#: SelectOrderItems.php:1514 SelectOrderItems.php:1614 SelectProduct.php:539
+#: SelectCustomer.php:258 SelectGLAccount.php:86 SelectOrderItems.php:594
+#: SelectOrderItems.php:1522 SelectOrderItems.php:1622 SelectProduct.php:539
#: SelectQASamples.php:45 SelectSalesOrder.php:545 SelectSupplier.php:233
#: SelectWorkOrder.php:9 SelectWorkOrder.php:174 SellThroughSupport.php:229
#: ShipmentCosting.php:11 Shipments.php:17 Shippers.php:123 Shippers.php:160
@@ -293,7 +293,7 @@
#: AccountGroups.php:306 AccountGroups.php:309 AccountGroups.php:473
#: AccountGroups.php:476 AddCustomerContacts.php:165
#: AddCustomerContacts.php:275 AddCustomerContacts.php:279
-#: AddCustomerContacts.php:282 BOMs.php:140 BOMs.php:896 BOMs.php:898
+#: AddCustomerContacts.php:282 BOMs.php:140 BOMs.php:903 BOMs.php:905
#: CompanyPreferences.php:423 CompanyPreferences.php:425
#: CompanyPreferences.php:438 CompanyPreferences.php:440
#: CompanyPreferences.php:453 CompanyPreferences.php:455
@@ -363,7 +363,7 @@
#: AddCustomerContacts.php:165 AddCustomerContacts.php:274
#: AddCustomerContacts.php:278 AddCustomerContacts.php:281 BankAccounts.php:218
#: BankAccounts.php:412 BankAccounts.php:414 BankAccounts.php:418
-#: BankAccounts.php:426 BOMs.php:142 BOMs.php:895 BOMs.php:899
+#: BankAccounts.php:426 BOMs.php:142 BOMs.php:902 BOMs.php:906
#: CompanyPreferences.php:422 CompanyPreferences.php:426
#: CompanyPreferences.php:437 CompanyPreferences.php:441
#: CompanyPreferences.php:452 CompanyPreferences.php:456
@@ -444,8 +444,8 @@
#: Labels.php:358 Locations.php:439 MailingGroupMaintenance.php:178
#: MaintenanceTasks.php:118 Manufacturers.php:260 MRPDemands.php:309
#: MRPDemandTypes.php:120 PaymentMethods.php:232 PaymentTerms.php:205
-#: PcAssignCashToTab.php:271 PcClaimExpensesFromTab.php:330 PcExpenses.php:177
-#: PcTabs.php:214 PcTypeTabs.php:124 PO_AuthorisationLevels.php:156
+#: PcAssignCashToTab.php:283 PcClaimExpensesFromTab.php:460 PcExpenses.php:179
+#: PcTabs.php:216 PcTypeTabs.php:126 PO_AuthorisationLevels.php:156
#: PriceMatrix.php:293 Prices_Customer.php:286 Prices.php:253
#: ProductSpecs.php:465 PurchData.php:312 QATests.php:467
#: SalesCategories.php:305 SalesGLPostings.php:137 SalesGLPostings.php:255
@@ -474,7 +474,7 @@
#: COGSGLPostings.php:223 ContractBOM.php:271 ContractOtherReqts.php:123
#: CounterReturns.php:740 CounterSales.php:836 Credit_Invoice.php:429
#: CreditStatus.php:176 Currencies.php:377 CustItem.php:167
-#: CustomerReceipt.php:1009 Customers.php:1166 CustomerTypes.php:206
+#: CustomerReceipt.php:1021 Customers.php:1166 CustomerTypes.php:206
#: Departments.php:187 DiscountCategories.php:238 DiscountMatrix.php:183
#: EDIMessageFormat.php:151 FixedAssetCategories.php:191 FreightCosts.php:254
#: GeocodeSetup.php:174 GLAccounts.php:336 GLJournal.php:431 GLTags.php:97
@@ -482,9 +482,9 @@
#: InternalStockRequest.php:298 Labels.php:334 Labels.php:359 Labels.php:612
#: Locations.php:440 MailingGroupMaintenance.php:179 MaintenanceTasks.php:119
#: Manufacturers.php:261 MRPDemands.php:310 MRPDemandTypes.php:121
-#: PaymentMethods.php:233 Payments.php:1283 PaymentTerms.php:206
-#: PcAssignCashToTab.php:272 PcClaimExpensesFromTab.php:331 PcExpenses.php:178
-#: PcExpensesTypeTab.php:156 PcTabs.php:215 PcTypeTabs.php:125
+#: PaymentMethods.php:233 Payments.php:1297 PaymentTerms.php:206
+#: PcAssignCashToTab.php:284 PcClaimExpensesFromTab.php:461 PcExpenses.php:180
+#: PcExpensesTypeTab.php:158 PcTabs.php:217 PcTypeTabs.php:127
#: PO_AuthorisationLevels.php:158 PO_Items.php:768 PriceMatrix.php:292
#: Prices_Customer.php:287 Prices.php:254 ProductSpecs.php:466
#: PurchData.php:314 PurchData.php:721 QATests.php:468
@@ -494,7 +494,7 @@
#: SalesTypes.php:207 SecurityTokens.php:117 SelectCreditItems.php:776
#: SelectCustomer.php:734 SelectCustomer.php:760 SelectCustomer.php:815
#: SelectCustomer.php:833 SelectCustomer.php:857 SelectCustomer.php:874
-#: SelectOrderItems.php:1426 SelectQASamples.php:418 SellThroughSupport.php:299
+#: SelectOrderItems.php:1434 SelectQASamples.php:418 SellThroughSupport.php:299
#: Shipments.php:438 Shippers.php:145 SpecialOrder.php:667
#: StockCategories.php:297 StockCategories.php:626 StockLocTransfer.php:325
#: SuppContractChgs.php:99 SuppCreditGRNs.php:117 SuppFixedAssetChgs.php:86
@@ -532,14 +532,14 @@
#: ConfirmDispatch_Invoice.php:656 ConfirmDispatch_Invoice.php:1707
#: Credit_Invoice.php:1643 CustItem.php:452 FixedAssetItems.php:132
#: FixedAssetItems.php:683 GLAccountUsers.php:153 GLBudgets.php:240
-#: GLCashFlowsSetup.php:172 GLTags.php:68 GoodsReceived.php:298
+#: GLCashFlowsSetup.php:170 GLTags.php:68 GoodsReceived.php:298
#: GoodsReceived.php:304 GoodsReceived.php:311 GoodsReceived.php:819
#: ImportBankTransAnalysis.php:154 ImportBankTransAnalysis.php:185
#: InternalStockRequestAuthorisation.php:123
#: InternalStockRequestFulfill.php:364 InternalStockRequest.php:255
-#: LocationUsers.php:177 MRPCalendar.php:315 Payments.php:1109
-#: Payments.php:1350 PcAuthorizeCash.php:100 PcAuthorizeCash.php:274
-#: PcAuthorizeExpenses.php:140 PcAuthorizeExpenses.php:361
+#: LocationUsers.php:177 MRPCalendar.php:315 Payments.php:1123
+#: Payments.php:1364 PcAuthorizeCash.php:104 PcAuthorizeCash.php:269
+#: PcAuthorizeExpenses.php:145 PcAuthorizeExpenses.php:370
#: PO_AuthoriseMyOrders.php:142 PricesByCost.php:223 PurchData.php:758
#: ReorderLevelLocation.php:140 RevisionTranslations.php:111
#: SecurityTokens.php:136 SelectCreditItems.php:954 SellThroughSupport.php:476
@@ -554,7 +554,7 @@
#: AnalysisHorizontalIncome.php:526 AnalysisHorizontalPosition.php:79
#: AnalysisHorizontalPosition.php:362 DailyBankTransactions.php:256
#: GLAccountUsers.php:253 GLBalanceSheet.php:720 GLCashFlowsIndirect.php:749
-#: GLCashFlowsIndirect.php:782 GLCashFlowsSetup.php:180 GLProfit_Loss.php:1317
+#: GLCashFlowsIndirect.php:782 GLCashFlowsSetup.php:178 GLProfit_Loss.php:1317
#: GLTrialBalance.php:740 InternalStockRequestInquiry.php:263
#: PurchasesReport.php:231 PurchasesReport.php:253 SecurityTokens.php:140
#: SecurityTokens.php:156 UserGLAccounts.php:259
@@ -609,7 +609,7 @@
msgstr ""
#: AccountSections.php:6 AccountSections.php:172 AccountSections.php:173
-#: includes/MainMenuLinksArray.php:402
+#: includes/MainMenuLinksArray.php:404
msgid "Account Sections"
msgstr "أعدادات العضو"
@@ -676,7 +676,7 @@
msgstr ""
#: AccountSections.php:285 AddCustomerContacts.php:297 AddCustomerNotes.php:242
-#: AddCustomerTypeNotes.php:221 Areas.php:229 BankAccounts.php:433 BOMs.php:916
+#: AddCustomerTypeNotes.php:221 Areas.php:229 BankAccounts.php:433 BOMs.php:923
#: COGSGLPostings.php:371 CreditStatus.php:259 Currencies.php:537
#: CustLoginSetup.php:273 Departments.php:258 DiscountMatrix.php:142
#: EDIMessageFormat.php:248 FixedAssetCategories.php:350
@@ -733,8 +733,8 @@
#: AddCustomerTypeNotes.php:48 Areas.php:72 CustomerTypes.php:68
#: DeliveryDetails.php:809 DeliveryDetails.php:826 Factors.php:105
#: FixedAssetItems.php:255 MRPCalendar.php:176 PcAssignCashToTab.php:83
-#: PcClaimExpensesFromTab.php:69 PcExpenses.php:63 PcTabs.php:76
-#: PcTypeTabs.php:38 PO_Items.php:380 ProductSpecs.php:315 QATests.php:76
+#: PcClaimExpensesFromTab.php:73 PcExpenses.php:65 PcTabs.php:78
+#: PcTypeTabs.php:40 PO_Items.php:380 ProductSpecs.php:315 QATests.php:76
#: SalesAnalReptCols.php:129 SalesPeople.php:105 SalesTypes.php:66
#: SelectQASamples.php:85 Stocks.php:594 Suppliers.php:524 SupplierTypes.php:68
msgid "has been updated"
@@ -755,7 +755,7 @@
#: ProductSpecs.php:385 QATests.php:391 SalesPeople.php:208
#: SelectCustomer.php:727 StockDispatch.php:277 StockDispatch.php:288
#: StockDispatch.php:299 SupplierContacts.php:152 SuppTransGLAnalysis.php:108
-#: Tax.php:433 TestPlanResults.php:508 UserBankAccounts.php:164
+#: Tax.php:435 TestPlanResults.php:508 UserBankAccounts.php:164
#: UserGLAccounts.php:157 UserLocations.php:176
#: includes/InputSerialItemsFile.php:92 includes/InputSerialItemsFile.php:144
msgid "Name"
@@ -781,7 +781,7 @@
#: OrderDetails.php:127 PDFRemittanceAdvice.php:251 PDFWOPrint.php:599
#: PDFWOPrint.php:602 PDFWOPrint.php:682 PDFWOPrint.php:685
#: PO_PDFPurchOrder.php:400 PO_PDFPurchOrder.php:403 PrintCustStatements.php:99
-#: PrintCustTrans.php:740 PrintCustTransPortrait.php:787
+#: PrintCustTrans.php:762 PrintCustTransPortrait.php:787
#: PrintCustTransPortrait.php:1033 PrintCustTransPortrait.php:1089
#: SelectCustomer.php:408 SelectCustomer.php:730 SelectSupplier.php:301
#: SupplierContacts.php:156 SupplierContacts.php:277 UserSettings.php:184
@@ -801,14 +801,14 @@
#: AddCustomerContacts.php:138 AddCustomerContacts.php:289
#: AnalysisHorizontalIncome.php:173 AnalysisHorizontalPosition.php:123
#: Customers.php:1122 Customers.php:1130 GLCashFlowsIndirect.php:130
-#: GLCashFlowsIndirect.php:450 PcAssignCashTabToTab.php:283
-#: PcAssignCashTabToTab.php:414 PcAssignCashToTab.php:232
-#: PcAssignCashToTab.php:370 PcAuthorizeCash.php:91 PcAuthorizeExpenses.php:95
-#: PcClaimExpensesFromTab.php:261 PcClaimExpensesFromTab.php:524
-#: PcReportExpense.php:144 PcReportTab.php:469 PDFQuotation.php:252
-#: PDFQuotationPortrait.php:249 PurchasesReport.php:56 SelectCustomer.php:732
-#: ShopParameters.php:198 SystemParameters.php:411 WOSerialNos.php:306
-#: WOSerialNos.php:312
+#: GLCashFlowsIndirect.php:450 PcAssignCashTabToTab.php:284
+#: PcAssignCashTabToTab.php:427 PcAssignCashToTab.php:232
+#: PcAssignCashToTab.php:380 PcAuthorizeCash.php:96 PcAuthorizeExpenses.php:100
+#: PcClaimExpensesFromTab.php:377 PcClaimExpensesFromTab.php:675
+#: PcReportExpense.php:145 PcReportTab.php:222 PcReportTab.php:472
+#: PDFQuotation.php:252 PDFQuotationPortrait.php:249 PurchasesReport.php:56
+#: SelectCustomer.php:732 ShopParameters.php:198 SystemParameters.php:411
+#: WOSerialNos.php:306 WOSerialNos.php:312
msgid "Notes"
msgstr ""
@@ -840,7 +840,7 @@
#: AddCustomerContacts.php:254 Contracts.php:788 PDFRemittanceAdvice.php:247
#: PO_Header.php:1028 PO_Header.php:1113 SelectCreditItems.php:246
-#: SelectCustomer.php:406 SelectOrderItems.php:626 SupplierTenderCreate.php:395
+#: SelectCustomer.php:406 SelectOrderItems.php:632 SupplierTenderCreate.php:395
#: includes/PDFStatementPageHeader.inc:72 includes/PDFTransPageHeader.inc:84
#: includes/PDFTransPageHeaderPortrait.inc:109 ../webSHOP/Checkout.php:389
#: ../webSHOP/Register.php:255 ../webSHOP/Register.php:723
@@ -898,19 +898,19 @@
#: CustomerAllocations.php:378 CustomerInquiry.php:252
#: CustomerTransInquiry.php:100 CustWhereAlloc.php:144 GLAccountReport.php:347
#: GLTransInquiry.php:47 GoodsReceived.php:130 MRPCalendar.php:219
-#: PaymentAllocations.php:67 Payments.php:1323 PcAssignCashTabToTab.php:280
-#: PcAssignCashToTab.php:229 PcAuthorizeCash.php:88 PDFOrdersInvoiced.php:378
-#: PDFRemittanceAdvice.php:308 PDFWOPrint.php:456 PrintCustTrans.php:822
-#: PrintCustTransPortrait.php:901 PrintWOItemSlip.php:186
-#: PrintWOItemSlip.php:197 PrintWOItemSlip.php:208 PurchasesReport.php:67
-#: ReverseGRN.php:405 SelectCustomer.php:810 SelectCustomer.php:852
-#: ShipmentCosting.php:538 ShipmentCosting.php:615 Shipments.php:489
-#: StockDispatch.php:279 StockDispatch.php:290 StockDispatch.php:301
-#: StockLocMovements.php:92 StockMovements.php:105
+#: PaymentAllocations.php:67 Payments.php:974 Payments.php:1337
+#: PcAssignCashTabToTab.php:281 PcAssignCashToTab.php:229
+#: PcAuthorizeCash.php:93 PDFOrdersInvoiced.php:378 PDFRemittanceAdvice.php:308
+#: PDFWOPrint.php:456 PrintCustTrans.php:844 PrintCustTransPortrait.php:901
+#: PrintWOItemSlip.php:186 PrintWOItemSlip.php:197 PrintWOItemSlip.php:208
+#: PurchasesReport.php:67 ReverseGRN.php:405 SelectCustomer.php:810
+#: SelectCustomer.php:852 ShipmentCosting.php:538 ShipmentCosting.php:615
+#: Shipments.php:489 StockDispatch.php:279 StockDispatch.php:290
+#: StockDispatch.php:301 StockLocMovements.php:92 StockMovements.php:105
#: StockSerialItemResearch.php:82 SupplierAllocations.php:458
#: SupplierAllocations.php:572 SupplierAllocations.php:647
#: SupplierInquiry.php:204 SupplierTransInquiry.php:111 SuppWhereAlloc.php:132
-#: Tax.php:430 Z_CheckGLTransBalance.php:11
+#: Tax.php:432 Z_CheckGLTransBalance.php:11
#: includes/PDFQuotationPageHeader.inc:31
#: includes/PDFQuotationPortraitPageHeader.inc:80
#: includes/PDFStatementPageHeader.inc:164 includes/PDFTransPageHeader.inc:51
@@ -919,17 +919,16 @@
msgid "Date"
msgstr ""
-#: AddCustomerNotes.php:118 AddCustomerTypeNotes.php:112 PcReportTab.php:226
-#: SelectCustomer.php:811 SelectCustomer.php:853 StockClone.php:942
-#: Stocks.php:1270 UpgradeDatabase.php:253 UpgradeDatabase.php:256
-#: UpgradeDatabase.php:259 UpgradeDatabase.php:262 UpgradeDatabase.php:265
-#: UpgradeDatabase.php:268 UpgradeDatabase.php:271 UpgradeDatabase.php:274
-#: UpgradeDatabase.php:277 Z_Upgrade_3.10-3.11.php:62
-#: Z_Upgrade_3.10-3.11.php:66 Z_Upgrade_3.10-3.11.php:70
-#: Z_Upgrade_3.10-3.11.php:74 Z_Upgrade_3.10-3.11.php:78
-#: Z_Upgrade_3.11-4.00.php:62 Z_Upgrade_3.11-4.00.php:66
-#: Z_Upgrade_3.11-4.00.php:70 Z_Upgrade_3.11-4.00.php:74
-#: Z_Upgrade_3.11-4.00.php:78
+#: AddCustomerNotes.php:118 AddCustomerTypeNotes.php:112 SelectCustomer.php:811
+#: SelectCustomer.php:853 StockClone.php:942 Stocks.php:1270
+#: UpgradeDatabase.php:253 UpgradeDatabase.php:256 UpgradeDatabase.php:259
+#: UpgradeDatabase.php:262 UpgradeDatabase.php:265 UpgradeDatabase.php:268
+#: UpgradeDatabase.php:271 UpgradeDatabase.php:274 UpgradeDatabase.php:277
+#: Z_Upgrade_3.10-3.11.php:62 Z_Upgrade_3.10-3.11.php:66
+#: Z_Upgrade_3.10-3.11.php:70 Z_Upgrade_3.10-3.11.php:74
+#: Z_Upgrade_3.10-3.11.php:78 Z_Upgrade_3.11-4.00.php:62
+#: Z_Upgrade_3.11-4.00.php:66 Z_Upgrade_3.11-4.00.php:70
+#: Z_Upgrade_3.11-4.00.php:74 Z_Upgrade_3.11-4.00.php:78
msgid "Note"
msgstr ""
@@ -1041,7 +1040,7 @@
#: AgedControlledInventory.php:43 AutomaticTranslationDescriptions.php:37
#: BOMIndented.php:315 BOMIndentedReverse.php:293 BOMInquiry.php:109
-#: BOMInquiry.php:198 BOMs.php:656 BOMs.php:1014 CollectiveWorkOrderCost.php:53
+#: BOMInquiry.php:198 BOMs.php:663 BOMs.php:1021 CollectiveWorkOrderCost.php:53
#: CollectiveWorkOrderCost.php:325 ContractBOM.php:241 ContractBOM.php:353
#: ContractOtherReqts.php:97 CounterReturns.php:1688 CounterSales.php:2112
#: CounterSales.php:2266 CreditStatus.php:152 CreditStatus.php:243
@@ -1053,23 +1052,23 @@
#: InternalStockCategoriesByRole.php:168 InternalStockRequestInquiry.php:221
#: InternalStockRequestInquiry.php:267 InternalStockRequestInquiry.php:406
#: InternalStockRequest.php:350 InternalStockRequest.php:564
-#: InternalStockRequest.php:634 InventoryPlanning.php:419
+#: InternalStockRequest.php:634 InventoryPlanning.php:420
#: InventoryQuantities.php:246 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:256 MRPReport.php:563
#: MRPReport.php:777 MRPReschedules.php:190 MRPShortages.php:349
-#: NoSalesItems.php:194 PaymentTerms.php:182 PcExpenses.php:141
-#: PcExpenses.php:229 PcExpensesTypeTab.php:143 PcTypeTabs.php:111
+#: NoSalesItems.php:194 PaymentTerms.php:182 PcExpenses.php:143
+#: PcExpenses.php:231 PcExpensesTypeTab.php:145 PcTypeTabs.php:113
#: PDFCOA.php:64 PDFOrdersInvoiced.php:335 PDFOrderStatus.php:337
#: PDFSalesBySalesperson.php:86 PDFWeeklyOrders.php:82 PO_Items.php:716
-#: PO_Items.php:1194 PO_SelectOSPurchOrder.php:310 PO_SelectPurchOrder.php:214
+#: PO_Items.php:1194 PO_SelectOSPurchOrder.php:302 PO_SelectPurchOrder.php:214
#: PricesByCost.php:153 RelatedItemsUpdate.php:160 ReorderLevelLocation.php:73
#: ReorderLevel.php:287 ReverseGRN.php:404 SalesCategories.php:541
#: SecurityTokens.php:107 SecurityTokens.php:167 SelectAsset.php:264
#: SelectCompletedOrder.php:506 SelectContract.php:147
-#: SelectCreditItems.php:1019 SelectOrderItems.php:1524
-#: SelectOrderItems.php:1695 SelectProduct.php:559 SelectProduct.php:848
+#: SelectCreditItems.php:1019 SelectOrderItems.php:1532
+#: SelectOrderItems.php:1703 SelectProduct.php:559 SelectProduct.php:848
#: SelectQASamples.php:299 SelectQASamples.php:397 SelectSalesOrder.php:603
#: SelectWorkOrder.php:219 Shipt_Select.php:191 StockClone.php:695
#: StockCounts.php:142 StockDispatch.php:506 StockLocStatus.php:176
@@ -1080,12 +1079,12 @@
#: SupplierPriceList.php:276 SupplierPriceList.php:542
#: SupplierTenderCreate.php:434 SupplierTenderCreate.php:695
#: SupplierTenderCreate.php:853 SupplierTenders.php:326 SupplierTenders.php:421
-#: SupplierTenders.php:687 SuppPriceList.php:306 TestPlanResults.php:177
-#: TestPlanResults.php:280 TopItems.php:170 WorkCentres.php:130
-#: WorkOrderCosting.php:98 WorkOrderCosting.php:130 WorkOrderEntry.php:973
-#: WorkOrderIssue.php:1009 Z_ItemsWithoutPicture.php:35
+#: SupplierTenders.php:687 SuppPriceList.php:214 SuppPriceList.php:346
+#: TestPlanResults.php:177 TestPlanResults.php:280 TopItems.php:170
+#: WorkCentres.php:130 WorkOrderCosting.php:98 WorkOrderCosting.php:130
+#: WorkOrderEntry.php:973 WorkOrderIssue.php:1009 Z_ItemsWithoutPicture.php:35
#: api/api_xml-rpc.php:3489 includes/PDFGrnHeader.inc:30
-#: includes/PDFInventoryPlanPageHeader.inc:51
+#: includes/PDFInventoryPlanPageHeader.inc:50
#: includes/PDFOstdgGRNsPageHeader.inc:38
#: includes/PDFStockLocTransferHeader.inc:65
#: includes/PDFStockTransferHeader.inc:36 includes/PDFTopItemsHeader.inc:50
@@ -1130,11 +1129,11 @@
#: SalesByTypePeriodInquiry.php:395 SalesByTypePeriodInquiry.php:430
#: SalesByTypePeriodInquiry.php:465 SalesByTypePeriodInquiry.php:500
#: SalesByTypePeriodInquiry.php:561 SelectCreditItems.php:693
-#: SelectCreditItems.php:697 SelectOrderItems.php:1365 SuppContractChgs.php:107
+#: SelectCreditItems.php:697 SelectOrderItems.php:1371 SuppContractChgs.php:107
#: SuppFixedAssetChgs.php:93 SupplierAllocations.php:460
#: SupplierAllocations.php:573 SupplierAllocations.php:648
#: SupplierCredit.php:407 SupplierInquiry.php:209 SuppShiptChgs.php:97
-#: SuppTransGLAnalysis.php:140 Tax.php:301 Z_CheckDebtorsControl.php:149
+#: SuppTransGLAnalysis.php:140 Tax.php:303 Z_CheckDebtorsControl.php:149
#: api/api_debtortransactions.php:1271 api/api_debtortransactions.php:1284
#: api/api_debtortransactions.php:1581 includes/PDFQuotationPageHeader.inc:119
#: includes/PDFQuotationPortraitPageHeader.inc:100
@@ -1165,8 +1164,8 @@
#: GLBalanceSheet.php:152 GLProfit_Loss.php:188 GLTagProfit_Loss.php:195
#: GLTrialBalance.php:167 InternalStockRequestInquiry.php:250
#: InternalStockRequest.php:325 InventoryPlanning.php:99
-#: InventoryPlanning.php:176 InventoryPlanning.php:213
-#: InventoryPlanning.php:262 InventoryPlanningPrefSupplier.php:183
+#: InventoryPlanning.php:177 InventoryPlanning.php:214
+#: InventoryPlanning.php:263 InventoryPlanningPrefSupplier.php:183
#: InventoryPlanningPrefSupplier.php:241 InventoryPlanningPrefSupplier.php:268
#: InventoryPlanningPrefSupplier.php:301 InventoryQuantities.php:84
#: InventoryValuation.php:64 MailInventoryValuation.php:22
@@ -1199,14 +1198,14 @@
#: AgedSuppliers.php:111 AgedSuppliers.php:198 BOMExtendedQty.php:157
#: BOMExtendedQty.php:244 BOMIndented.php:156 BOMIndented.php:237
#: BOMIndentedReverse.php:144 BOMIndentedReverse.php:222 BOMListing.php:45
-#: Credit_Invoice.php:201 Dashboard.php:158 Dashboard.php:245 Dashboard.php:398
+#: Credit_Invoice.php:201 Dashboard.php:158 Dashboard.php:247 Dashboard.php:400
#: DebtorsAtPeriodEnd.php:60 DebtorsAtPeriodEnd.php:72 FTP_RadioBeacon.php:187
#: GetStockImage.php:143 GLBalanceSheet.php:116 GLBalanceSheet.php:155
#: GLBalanceSheet.php:334 GLProfit_Loss.php:191 GLProfit_Loss.php:203
#: GLTagProfit_Loss.php:199 GLTagProfit_Loss.php:212 GLTrialBalance.php:170
-#: GLTrialBalance.php:182 InventoryPlanning.php:102 InventoryPlanning.php:179
-#: InventoryPlanning.php:216 InventoryPlanning.php:265
-#: InventoryPlanning.php:340 InventoryPlanningPrefSupplier.php:186
+#: GLTrialBalance.php:182 InventoryPlanning.php:102 InventoryPlanning.php:180
+#: InventoryPlanning.php:217 InventoryPlanning.php:266
+#: InventoryPlanning.php:341 InventoryPlanningPrefSupplier.php:186
#: InventoryPlanningPrefSupplier.php:244 InventoryPlanningPrefSupplier.php:271
#: InventoryPlanningPrefSupplier.php:304 InventoryPlanningPrefSupplier.php:372
#: InventoryQuantities.php:87 InventoryQuantities.php:98
@@ -1238,8 +1237,8 @@
#: 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:47 Tax.php:152
-#: Tax.php:181 Tax.php:340 Z_DataExport.php:72 Z_DataExport.php:168
+#: SuppPaymentRun.php:217 SuppPriceList.php:142 Tax.php:49 Tax.php:154
+#: Tax.php:183 Tax.php:342 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
@@ -1255,11 +1254,11 @@
msgid "Back to the menu"
msgstr ""
-#: AgedDebtors.php:372 Dashboard.php:244
+#: AgedDebtors.php:372 Dashboard.php:246
msgid "The details of outstanding transactions for customer"
msgstr ""
-#: AgedDebtors.php:372 AgedSuppliers.php:197 Dashboard.php:244
+#: AgedDebtors.php:372 AgedSuppliers.php:197 Dashboard.php:246
#: GLAccountCSV.php:179 GLAccountInquiry.php:176 GLAccountReport.php:97
#: PO_Items.php:451 PO_Items.php:580 PO_Items.php:605
#: PurchaseByPrefSupplier.php:29 PurchaseByPrefSupplier.php:54
@@ -1275,10 +1274,10 @@
#: Contracts.php:599 CounterReturns.php:1020 CounterReturns.php:1034
#: CounterSales.php:1431 CounterSales.php:1445 Credit_Invoice.php:774
#: Credit_Invoice.php:795 CustItem.php:73 CustItem.php:86 CustItem.php:197
-#: CustomerReceipt.php:595 CustomerReceipt.php:748 CustomerReceipt.php:776
-#: CustomerTransInquiry.php:91 Dashboard.php:247 Dashboard.php:400
+#: CustomerReceipt.php:601 CustomerReceipt.php:754 CustomerReceipt.php:782
+#: CustomerTransInquiry.php:91 Dashboard.php:249 Dashboard.php:402
#: DeliveryDetails.php:412 GLProfit_Loss.php:613 GLTagProfit_Loss.php:516
-#: Payments.php:447 PDFRemittanceAdvice.php:85 PurchData.php:114
+#: Payments.php:451 PDFRemittanceAdvice.php:85 PurchData.php:114
#: PurchData.php:132 PurchData.php:360 RecurringSalesOrders.php:267
#: ReverseGRN.php:197 ReverseGRN.php:211 ReverseGRN.php:391
#: SelectCreditItems.php:1454 SelectSalesOrder.php:213 SelectSalesOrder.php:379
@@ -1376,15 +1375,15 @@
#: AgedDebtors.php:527 AgedSuppliers.php:327 BOMExtendedQty.php:289
#: BOMIndented.php:278 BOMIndentedReverse.php:255 BOMListing.php:131
-#: DebtorsAtPeriodEnd.php:168 InventoryPlanning.php:521
+#: DebtorsAtPeriodEnd.php:168 InventoryPlanning.php:522
#: InventoryPlanningPrefSupplier.php:437 InventoryQuantities.php:210
#: InventoryValuation.php:273 MRPPlannedPurchaseOrders.php:293
#: MRPPlannedWorkOrders.php:346 MRPReschedules.php:151 MRPShortages.php:302
-#: OutstandingGRNs.php:280 PcReportTab.php:79 PDFCustomerList.php:421
+#: OutstandingGRNs.php:280 PcReportTab.php:76 PDFCustomerList.php:421
#: PDFLowGP.php:146 PDFPriceList.php:351 PDFRemittanceAdvice.php:175
-#: PDFStockCheckComparison.php:373 PrintCustTrans.php:564
+#: PDFStockCheckComparison.php:373 PrintCustTrans.php:579
#: PrintCustTransPortrait.php:608 ReorderLevel.php:248 StockDispatch.php:449
-#: SupplierBalsAtPeriodEnd.php:159 SuppPriceList.php:260 Tax.php:410
+#: SupplierBalsAtPeriodEnd.php:159 SuppPriceList.php:300 Tax.php:412
msgid "Print PDF"
msgstr ""
@@ -1453,9 +1452,9 @@
msgstr ""
#: AnalysisHorizontalIncome.php:11 AnalysisHorizontalPosition.php:10
-#: BankAccounts.php:369 BOMs.php:138 BOMs.php:144 BOMs.php:152 BOMs.php:1032
+#: BankAccounts.php:369 BOMs.php:138 BOMs.php:144 BOMs.php:152 BOMs.php:1039
#: InternalStockRequest.php:584 PaymentTerms.php:190 PaymentTerms.php:196
-#: PO_SelectOSPurchOrder.php:651 SalesAnalReptCols.php:285
+#: PO_SelectOSPurchOrder.php:662 SalesAnalReptCols.php:285
#: SelectProduct.php:157 SelectProduct.php:207 SelectProduct.php:268
#: SelectProduct.php:269 SelectProduct.php:868
#: StockCategorySalesInquiry.php:154 StockCategorySalesInquiry.php:188
@@ -1467,7 +1466,7 @@
#: AnalysisHorizontalIncome.php:18 AnalysisHorizontalIncome.php:35
#: AnalysisHorizontalIncome.php:150 AnalysisHorizontalIncome.php:151
-#: includes/MainMenuLinksArray.php:382
+#: includes/MainMenuLinksArray.php:383
msgid "Horizontal Analysis of Statement of Comprehensive Income"
msgstr ""
@@ -1531,7 +1530,7 @@
#: AnalysisHorizontalPosition.php:65 AnalysisHorizontalPosition.php:112
#: EDIMessageFormat.php:224 EDIMessageFormat.php:226 GLBalanceSheet.php:61
#: GLProfit_Loss.php:109 GLTagProfit_Loss.php:120 POReport.php:1521
-#: SalesInquiry.php:1070 Tax.php:453
+#: SalesInquiry.php:1070 Tax.php:455
msgid "Summary"
msgstr ""
@@ -1585,7 +1584,7 @@
msgstr ""
#: AnalysisHorizontalIncome.php:153 GLProfit_Loss.php:624
-#: GLTagProfit_Loss.php:530 GLTrialBalance.php:444 Tax.php:16
+#: GLTagProfit_Loss.php:530 GLTrialBalance.php:444 Tax.php:18
#: includes/PDFTaxPageHeader.inc:31
msgid "months to"
msgstr ""
@@ -1592,9 +1591,9 @@
#: AnalysisHorizontalIncome.php:154 AnalysisHorizontalPosition.php:104
#: Contracts.php:836 CustomerAccount.php:230 CustomerInquiry.php:162
-#: CustomerReceipt.php:1044 GLBalanceSheet.php:404 GLCashFlowsIndirect.php:85
+#: CustomerReceipt.php:1056 GLBalanceSheet.php:404 GLCashFlowsIndirect.php:85
#: GLProfit_Loss.php:626 PDFRemittanceAdvice.php:275 PO_Header.php:609
-#: PrintCustTrans.php:776 PrintCustTransPortrait.php:927
+#: PrintCustTrans.php:798 PrintCustTransPortrait.php:927
#: SupplierInquiry.php:121 includes/PDFQuotationPageHeader.inc:98
#: includes/PDFQuotationPortraitPageHeader.inc:88
#: includes/PDFStatementPageHeader.inc:125 includes/PDFTransPageHeader.inc:162
@@ -1615,7 +1614,7 @@
msgstr ""
#: AnalysisHorizontalIncome.php:160 AnalysisHorizontalPosition.php:110
-#: Dashboard.php:484 GLAccounts.php:251 GLAccounts.php:302
+#: Dashboard.php:486 GLAccounts.php:251 GLAccounts.php:302
#: GLBalanceSheet.php:411 GLCashFlowsIndirect.php:91 GLCodesInquiry.php:27
#: GLProfit_Loss.php:636 GLTagProfit_Loss.php:538 GLTrialBalance.php:453
#: SelectGLAccount.php:135 SupplierCredit.php:459 SupplierInvoice.php:844
@@ -1695,9 +1694,9 @@
msgstr ""
#: AnalysisHorizontalIncome.php:522 AnalysisHorizontalPosition.php:358
-#: BOMs.php:918 ConfirmDispatch_Invoice.php:1655
+#: BOMs.php:925 ConfirmDispatch_Invoice.php:1655
#: ConfirmDispatch_Invoice.php:1657 ContractBOM.php:298 CounterReturns.php:1603
-#: CounterReturns.php:1605 CustomerReceipt.php:601 CustWhereAlloc.php:234
+#: CounterReturns.php:1605 CustomerReceipt.php:607 CustWhereAlloc.php:234
#: DailyBankTransactions.php:251 DeliveryDetails.php:605
#: DeliveryDetails.php:609 DeliveryDetails.php:831 DeliveryDetails.php:835
#: GLAccountUsers.php:248 GLBalanceSheet.php:716 GLCashFlowsIndirect.php:745
@@ -1707,10 +1706,10 @@
#: PDFStockLocTransfer.php:29 PDFWOPrint.php:594 PDFWOPrint.php:598
#: PDFWOPrint.php:601 PDFWOPrint.php:677 PDFWOPrint.php:681 PDFWOPrint.php:684
#: PO_OrderDetails.php:143 PO_PDFPurchOrder.php:395 PO_PDFPurchOrder.php:399
-#: PO_PDFPurchOrder.php:402 PO_SelectOSPurchOrder.php:603
-#: PO_SelectOSPurchOrder.php:644 PrintCustStatements.php:84
+#: PO_PDFPurchOrder.php:402 PO_SelectOSPurchOrder.php:614
+#: PO_SelectOSPurchOrder.php:655 PrintCustStatements.php:84
#: PrintCustStatements.php:533 PrintCustStatements.php:553
-#: PrintCustTrans.php:531 PrintCustTransPortrait.php:565
+#: PrintCustTrans.php:546 PrintCustTransPortrait.php:565
#: PurchasesReport.php:227 SelectSalesOrder.php:918 SuppWhereAlloc.php:196
#: UserGLAccounts.php:254
msgid "Print"
@@ -1727,7 +1726,7 @@
#: AnalysisHorizontalPosition.php:15 AnalysisHorizontalPosition.php:28
#: AnalysisHorizontalPosition.php:100 AnalysisHorizontalPosition.php:101
-#: includes/MainMenuLinksArray.php:381
+#: includes/MainMenuLinksArray.php:382
msgid "Horizontal Analysis of Statement of Financial Position"
msgstr ""
@@ -1831,9 +1830,9 @@
#: Areas.php:131 CustomerTypes.php:167 Factors.php:140
#: FixedAssetCategories.php:142 GLAccounts.php:214
#: InternalStockCategoriesByRole.php:102 Locations.php:380
-#: Manufacturers.php:197 MRPDemands.php:250 PcAssignCashToTab.php:127
-#: PcClaimExpensesFromTab.php:158 PcExpenses.php:121 PcExpensesTypeTab.php:83
-#: PcTabs.php:137 PcTypeTabs.php:94 SalesAnalReptCols.php:215
+#: Manufacturers.php:197 MRPDemands.php:250 PcAssignCashToTab.php:124
+#: PcClaimExpensesFromTab.php:266 PcExpenses.php:123 PcExpensesTypeTab.php:85
+#: PcTabs.php:139 PcTypeTabs.php:96 SalesAnalReptCols.php:215
#: SalesCategories.php:157 SalesTypes.php:156 StockCategories.php:233
#: Suppliers.php:665 SupplierTypes.php:132 Z_DeleteInvoice.php:178
#: includes/DefineOfferClass.php:137
@@ -1869,12 +1868,12 @@
msgstr ""
#: AuditTrail.php:43 BOMIndented.php:319 BOMIndentedReverse.php:297
-#: MRPCalendar.php:264 PcReportExpense.php:68
+#: MRPCalendar.php:264 PcReportExpense.php:70
msgid "From Date"
msgstr ""
#: AuditTrail.php:47 BOMIndented.php:320 BOMIndentedReverse.php:298
-#: MRPCalendar.php:266 PcReportExpense.php:72
+#: MRPCalendar.php:266 PcReportExpense.php:74
msgid "To Date"
msgstr ""
@@ -1902,14 +1901,14 @@
#: NoSalesItems.php:22 NoSalesItems.php:50 NoSalesItems.php:70
#: NoSalesItems.php:72 PDFPeriodStockTransListing.php:58 PDFPriceList.php:225
#: PDFPriceList.php:324 PO_Items.php:1131 POReport.php:1600
-#: PO_SelectOSPurchOrder.php:185 PO_SelectOSPurchOrder.php:195
-#: PO_SelectOSPurchOrder.php:208 PO_SelectOSPurchOrder.php:278
+#: PO_SelectOSPurchOrder.php:179 PO_SelectOSPurchOrder.php:189
+#: PO_SelectOSPurchOrder.php:202 PO_SelectOSPurchOrder.php:270
#: ReorderLevel.php:201 ReorderLevel.php:203 ReorderLevel.php:233
#: ReorderLevel.php:235 SalesGraph.php:102 SalesGraph.php:104
#: SalesGraph.php:124 SalesGraph.php:126 SalesGraph.php:148 SalesGraph.php:150
#: SalesGraph.php:186 SalesInquiry.php:1096 SalesInquiry.php:1159
-#: SelectCreditItems.php:983 SelectOrderItems.php:1622
-#: SelectOrderItems.php:1625 SelectProduct.php:547 SelectProduct.php:549
+#: SelectCreditItems.php:983 SelectOrderItems.php:1630
+#: SelectOrderItems.php:1633 SelectProduct.php:547 SelectProduct.php:549
#: SelectSalesOrder.php:575 StockCategorySalesInquiry.php:35
#: StockCategorySalesInquiry.php:37 StockDispatch.php:82 StockDispatch.php:396
#: StockDispatch.php:398 StockLocStatus.php:74 StockLocStatus.php:76
@@ -1948,10 +1947,10 @@
#: AuditTrail.php:176 BankAccountUsers.php:77 BankAccountUsers.php:90
#: GLAccountUsers.php:117 GLAccountUsers.php:129 GLAccountUsers.php:140
#: LocationUsers.php:77 LocationUsers.php:90 LocationUsers.php:100
-#: PcReportTab.php:376 UserBankAccounts.php:77 UserBankAccounts.php:90
+#: PcReportTab.php:380 UserBankAccounts.php:77 UserBankAccounts.php:90
#: UserGLAccounts.php:118 UserGLAccounts.php:130 UserGLAccounts.php:146
#: UserLocations.php:77 UserLocations.php:90 UserLocations.php:100
-#: includes/header.php:61
+#: includes/header.php:65
msgid "User"
msgstr ""
@@ -1966,7 +1965,7 @@
#: ShipmentCosting.php:536 ShipmentCosting.php:613 StockLocMovements.php:90
#: StockMovements.php:103 SupplierAllocations.php:456 SupplierInquiry.php:205
#: SupplierTransInquiry.php:20 SupplierTransInquiry.php:108
-#: SuppWhereAlloc.php:26 SuppWhereAlloc.php:133 Tax.php:431
+#: SuppWhereAlloc.php:26 SuppWhereAlloc.php:133 Tax.php:433
#: Z_CheckAllocationsFrom.php:32 Z_CheckAllocationsFrom.php:57
#: Z_CheckAllocs.php:62 Z_CheckGLTransBalance.php:12
#: includes/InputSerialItemsFile.php:94 includes/InputSerialItemsFile.php:152
@@ -1991,7 +1990,7 @@
msgid "Value"
msgstr ""
-#: AutomaticTranslationDescriptions.php:5 includes/MainMenuLinksArray.php:583
+#: AutomaticTranslationDescriptions.php:5 includes/MainMenuLinksArray.php:585
msgid "Translate Item Descriptions"
msgstr ""
@@ -2004,36 +2003,37 @@
msgid "#"
msgstr ""
-#: AutomaticTranslationDescriptions.php:36 BOMInquiry.php:108 BOMs.php:655
-#: BOMs.php:1013 CollectiveWorkOrderCost.php:324 ContractBOM.php:352
+#: AutomaticTranslationDescriptions.php:36 BOMInquiry.php:108 BOMs.php:662
+#: BOMs.php:1020 CollectiveWorkOrderCost.php:324 ContractBOM.php:352
#: CounterReturns.php:1687 CounterSales.php:2111 CounterSales.php:2265
-#: CustItem.php:297 CustomerBranches.php:401 CustomerReceipt.php:1232
+#: CustItem.php:297 CustomerBranches.php:401 CustomerReceipt.php:1244
#: GLCodesInquiry.php:26 InternalStockRequestInquiry.php:266
#: InternalStockRequest.php:563 InternalStockRequest.php:633
#: MaterialsNotUsed.php:34 MRPDemands.php:91 MRPPlannedWorkOrders.php:255
#: MRPReport.php:776 NoSalesItems.php:193 PDFOrdersInvoiced.php:334
#: PDFOrderStatus.php:336 PO_Header.php:561 PO_Items.php:1193
-#: PO_SelectOSPurchOrder.php:309 PO_SelectPurchOrder.php:213
+#: PO_SelectOSPurchOrder.php:301 PO_SelectPurchOrder.php:213
#: PricesByCost.php:152 PurchData.php:469 RelatedItemsUpdate.php:159
#: ReorderLevelLocation.php:72 RevisionTranslations.php:59 SalesPeople.php:207
#: SelectCompletedOrder.php:505 SelectCreditItems.php:1018
-#: SelectCustomer.php:401 SelectGLAccount.php:134 SelectOrderItems.php:1523
-#: SelectOrderItems.php:1694 SelectProduct.php:345 SelectProduct.php:846
+#: SelectCustomer.php:401 SelectGLAccount.php:134 SelectOrderItems.php:1531
+#: SelectOrderItems.php:1702 SelectProduct.php:345 SelectProduct.php:846
#: SelectQASamples.php:298 SelectSalesOrder.php:602 SelectSupplier.php:293
#: SelectWorkOrder.php:218 SellThroughSupport.php:159 Shipt_Select.php:190
#: SpecialOrder.php:148 StockCategories.php:263 SupplierPriceList.php:275
#: SupplierPriceList.php:466 SupplierTenderCreate.php:617
-#: SupplierTenderCreate.php:852 SupplierTenders.php:686 SuppPriceList.php:305
-#: TestPlanResults.php:176 TopItems.php:169 UserBankAccounts.php:163
-#: UserGLAccounts.php:156 UserLocations.php:175 WorkOrderEntry.php:972
-#: WorkOrderIssue.php:1008 includes/PDFTopItemsHeader.inc:49
-#: includes/PO_PDFOrderPageHeader.inc:75 ../webSHOP/ItemDetails.php:72
+#: SupplierTenderCreate.php:852 SupplierTenders.php:686 SuppPriceList.php:213
+#: SuppPriceList.php:345 TestPlanResults.php:176 TopItems.php:169
+#: UserBankAccounts.php:163 UserGLAccounts.php:156 UserLocations.php:175
+#: WorkOrderEntry.php:972 WorkOrderIssue.php:1008
+#: includes/PDFTopItemsHeader.inc:49 includes/PO_PDFOrderPageHeader.inc:75
+#: ../webSHOP/ItemDetails.php:72
msgid "Code"
msgstr ""
#: AutomaticTranslationDescriptions.php:38 CustomerTransInquiry.php:52
#: FixedAssetRegister.php:366 GLJournalInquiry.php:45 GLJournalInquiry.php:62
-#: PcReportExpense.php:102 PcReportTab.php:382 PcTabExpensesList.php:277
+#: PcReportExpense.php:104 PcReportTab.php:386 PcTabExpensesList.php:287
#: POReport.php:519 POReport.php:1535 SalesAnalRepts.php:436
#: SalesAnalRepts.php:464 SalesAnalRepts.php:493 SalesAnalRepts.php:512
#: SalesInquiry.php:798 SalesInquiry.php:1107 StockDispatch.php:515
@@ -2100,7 +2100,7 @@
msgid "Delete the backup file off the server"
msgstr ""
-#: BankAccounts.php:6 includes/MainMenuLinksArray.php:409
+#: BankAccounts.php:6 includes/MainMenuLinksArray.php:411
msgid "Bank Accounts"
msgstr ""
@@ -2181,11 +2181,11 @@
msgid "Bank account deleted"
msgstr ""
-#: BankAccounts.php:192 Dashboard.php:499 ImportBankTrans.php:34
+#: BankAccounts.php:192 Dashboard.php:501 ImportBankTrans.php:34
msgid "The bank accounts set up could not be retrieved because"
msgstr ""
-#: BankAccounts.php:193 Dashboard.php:500
+#: BankAccounts.php:193 Dashboard.php:502
msgid "The SQL used to retrieve the bank account details was"
msgstr ""
@@ -2214,18 +2214,18 @@
msgstr ""
#: BankAccounts.php:204 Currencies.php:461 CustItem.php:299 CustItem.php:415
-#: CustomerAllocations.php:351 CustomerReceipt.php:860
-#: CustomerTransInquiry.php:108 OffersReceived.php:112 PcReportExpense.php:139
-#: PcReportTab.php:393 PcTabs.php:180 PcTabs.php:314
+#: CustomerAllocations.php:351 CustomerReceipt.php:866
+#: CustomerTransInquiry.php:108 OffersReceived.php:112 Payments.php:980
+#: PcReportExpense.php:140 PcReportTab.php:397 PcTabs.php:182 PcTabs.php:316
#: PO_AuthorisationLevels.php:130 PO_AuthorisationLevels.php:215
#: PO_AuthorisationLevels.php:221 PO_AuthoriseMyOrders.php:115
-#: PO_Header.php:564 PO_SelectOSPurchOrder.php:597 PO_SelectPurchOrder.php:434
+#: PO_Header.php:564 PO_SelectOSPurchOrder.php:608 PO_SelectPurchOrder.php:434
#: PriceMatrix.php:166 PriceMatrix.php:264 PricesByCost.php:282 Prices.php:220
#: Prices.php:292 PurchData.php:276 PurchData.php:471 PurchData.php:612
#: SelectSupplier.php:295 SellThroughSupport.php:161 SupplierCredit.php:263
#: SupplierInvoice.php:612 SupplierPriceList.php:468
#: SupplierTenderCreate.php:619 SupplierTenders.php:126 SupplierTenders.php:536
-#: SupplierTransInquiry.php:117 SuppPriceList.php:300 Z_ImportPriceList.php:98
+#: SupplierTransInquiry.php:117 SuppPriceList.php:340 Z_ImportPriceList.php:98
#: includes/PDFBankingSummaryPageHeader.inc:42
#: includes/PDFDebtorBalsPageHeader.inc:33
#: includes/PDFSupplierBalsPageHeader.inc:36
@@ -2283,7 +2283,7 @@
msgid "Bank Account Users"
msgstr ""
-#: BankAccountUsers.php:13 includes/MainMenuLinksArray.php:410
+#: BankAccountUsers.php:13 includes/MainMenuLinksArray.php:412
msgid "Bank Account Authorised Users"
msgstr ""
@@ -2330,9 +2330,9 @@
#: BankAccountUsers.php:111 BankAccountUsers.php:211 GLAccountUsers.php:54
#: GLAccountUsers.php:226 InternalStockCategoriesByRole.php:120
#: InternalStockCategoriesByRole.php:209 LocationUsers.php:119
-#: LocationUsers.php:234 PcClaimExpensesFromTab.php:179
-#: PcClaimExpensesFromTab.php:414 PcExpenses.php:241 PcExpensesTypeTab.php:101
-#: PcExpensesTypeTab.php:171 PurchaseByPrefSupplier.php:317 StockCounts.php:121
+#: LocationUsers.php:234 PcClaimExpensesFromTab.php:292
+#: PcClaimExpensesFromTab.php:551 PcExpenses.php:243 PcExpensesTypeTab.php:103
+#: PcExpensesTypeTab.php:173 PurchaseByPrefSupplier.php:317 StockCounts.php:121
#: UserBankAccounts.php:110 UserBankAccounts.php:211 UserGLAccounts.php:54
#: UserGLAccounts.php:232 UserLocations.php:120 UserLocations.php:236
#: Z_GLAccountUsersCopyAuthority.php:66 Z_GLAccountUsersCopyAuthority.php:81
@@ -2339,17 +2339,17 @@
msgid "Not Yet Selected"
msgstr ""
-#: BankAccountUsers.php:129 BankAccountUsers.php:228 CustomerReceipt.php:969
-#: CustomerReceipt.php:1195 CustomerTypes.php:269 ExchangeRateTrend.php:55
+#: BankAccountUsers.php:129 BankAccountUsers.php:228 CustomerReceipt.php:975
+#: CustomerReceipt.php:1207 CustomerTypes.php:269 ExchangeRateTrend.php:55
#: FreightCosts.php:60 GLAccountUsers.php:74 GLJournal.php:139
#: GLJournal.php:378 InternalStockCategoriesByRole.php:136
#: InternalStockCategoriesByRole.php:226 LocationUsers.php:136
-#: LocationUsers.php:253 OffersReceived.php:114 Payments.php:1251
-#: PcAssignCashTabToTab.php:204 PcAssignCashTabToTab.php:434
-#: PcAssignCashToTab.php:161 PcAssignCashToTab.php:385 PcAuthorizeCash.php:301
-#: PcAuthorizeExpenses.php:390 PcClaimExpensesFromTab.php:192
-#: PcClaimExpensesFromTab.php:540 PcExpenses.php:293 PcExpensesTypeTab.php:114
-#: PcExpensesTypeTab.php:185 PcTabs.php:472 PcTypeTabs.php:174
+#: LocationUsers.php:253 OffersReceived.php:114 Payments.php:1265
+#: PcAssignCashTabToTab.php:201 PcAssignCashTabToTab.php:439
+#: PcAssignCashToTab.php:158 PcAssignCashToTab.php:388 PcAuthorizeCash.php:296
+#: PcAuthorizeExpenses.php:399 PcClaimExpensesFromTab.php:305
+#: PcClaimExpensesFromTab.php:685 PcExpenses.php:295 PcExpensesTypeTab.php:116
+#: PcExpensesTypeTab.php:187 PcTabs.php:474 PcTypeTabs.php:176
#: SalesTypes.php:282 SupplierTypes.php:236 UserBankAccounts.php:127
#: UserBankAccounts.php:230 UserGLAccounts.php:76 UserLocations.php:137
#: UserLocations.php:255 Z_CheckDebtorsControl.php:61
@@ -2357,14 +2357,14 @@
msgstr ""
#: BankAccountUsers.php:130 BankAccountUsers.php:229
-#: CustomerAllocations.php:450 CustomerReceipt.php:1196
+#: CustomerAllocations.php:450 CustomerReceipt.php:1208
#: InternalStockCategoriesByRole.php:137 InternalStockCategoriesByRole.php:227
-#: LocationUsers.php:137 LocationUsers.php:254 Payments.php:1252
-#: PcAssignCashTabToTab.php:205 PcAssignCashTabToTab.php:435
-#: PcAssignCashToTab.php:162 PcAssignCashToTab.php:386 PcAuthorizeCash.php:302
-#: PcAuthorizeExpenses.php:391 PcClaimExpensesFromTab.php:193
-#: PcClaimExpensesFromTab.php:541 PcExpenses.php:294 PcExpensesTypeTab.php:115
-#: PcExpensesTypeTab.php:186 PcTabs.php:473 PcTypeTabs.php:175
+#: LocationUsers.php:137 LocationUsers.php:254 Payments.php:1266
+#: PcAssignCashTabToTab.php:202 PcAssignCashTabToTab.php:440
+#: PcAssignCashToTab.php:159 PcAssignCashToTab.php:389 PcAuthorizeCash.php:297
+#: PcAuthorizeExpenses.php:400 PcClaimExpensesFromTab.php:306
+#: PcClaimExpensesFromTab.php:686 PcExpenses.php:296 PcExpensesTypeTab.php:117
+#: PcExpensesTypeTab.php:188 PcTabs.php:475 PcTypeTabs.php:177
#: SalesTypes.php:282 SecurityTokens.php:138 SelectCreditItems.php:955
#: SupplierAllocations.php:523 UserBankAccounts.php:128
#: UserBankAccounts.php:231 UserLocations.php:138 UserLocations.php:256
@@ -2386,7 +2386,7 @@
msgstr ""
#: BankAccountUsers.php:168 GLAccountUsers.php:151 LocationUsers.php:175
-#: PcTabs.php:178 PcTabs.php:279 PO_AuthorisationLevels.php:129
+#: PcTabs.php:180 PcTabs.php:281 PO_AuthorisationLevels.php:129
#: SMTPServer.php:114 UserSettings.php:119
msgid "User Name"
msgstr ""
@@ -2460,8 +2460,8 @@
msgstr ""
#: BankMatching.php:100 BankReconciliation.php:113 CounterReturns.php:825
-#: Currencies.php:221 CustomerReceipt.php:826 DailyBankTransactions.php:37
-#: Payments.php:944 PDFChequeListing.php:46 TaxAuthorities.php:150
+#: Currencies.php:221 CustomerReceipt.php:832 DailyBankTransactions.php:37
+#: Payments.php:948 PDFChequeListing.php:46 TaxAuthorities.php:150
#: TaxAuthorities.php:316
msgid "Bank Account"
msgstr ""
@@ -2481,7 +2481,7 @@
#: BankMatching.php:137 ConfirmDispatchControlled_Invoice.php:68
#: CounterReturns.php:197 EmailCustTrans.php:65 FixedAssetRegister.php:82
#: FTP_RadioBeacon.php:280 GLAccountCSV.php:182 GLAccountReport.php:106
-#: GLCashFlowsIndirect.php:83 Payments.php:919 PcReportTab.php:131
+#: GLCashFlowsIndirect.php:83 Payments.php:923 PcReportTab.php:127
#: PDFChequeListing.php:117 PDFChequeListing.php:127 PDFChequeListing.php:211
#: PDFDeliveryDifferences.php:202 PDFDeliveryDifferences.php:215
#: PDFDeliveryDifferences.php:320 PDFDIFOT.php:201 PDFDIFOT.php:214
@@ -2592,7 +2592,7 @@
msgid "The payments with the selected criteria could not be retrieved because"
msgstr ""
-#: BankMatching.php:279 Payments.php:1259
+#: BankMatching.php:279 Payments.php:1273
msgid "Cheque No"
msgstr ""
@@ -2601,13 +2601,13 @@
msgid "Ref"
msgstr ""
-#: BankMatching.php:283 CustomerAllocations.php:379 CustomerReceipt.php:986
+#: BankMatching.php:283 CustomerAllocations.php:379 CustomerReceipt.php:998
#: CustomerTransInquiry.php:107 CustWhereAlloc.php:149 CustWhereAlloc.php:218
#: GLJournalInquiry.php:102 ImportBankTransAnalysis.php:208
-#: ImportBankTransAnalysis.php:281 PaymentAllocations.php:68 Payments.php:1239
-#: Payments.php:1244 Payments.php:1260 Payments.php:1327
-#: PcAssignCashTabToTab.php:282 PcAssignCashTabToTab.php:405
-#: PcAssignCashToTab.php:231 PcAssignCashToTab.php:363 PcAuthorizeCash.php:90
+#: ImportBankTransAnalysis.php:281 PaymentAllocations.php:68 Payments.php:1253
+#: Payments.php:1258 Payments.php:1274 Payments.php:1341
+#: PcAssignCashTabToTab.php:283 PcAssignCashTabToTab.php:418
+#: PcAssignCashToTab.php:231 PcAssignCashToTab.php:373 PcAuthorizeCash.php:95
#: PrintCheque.php:83 PrintCheque.php:97 SelectCreditItems.php:696
#: SuppContractChgs.php:79 SuppContractChgs.php:164 SuppFixedAssetChgs.php:75
#: SuppFixedAssetChgs.php:149 SupplierAllocations.php:460
@@ -2625,7 +2625,7 @@
#: BankMatching.php:284 BankReconciliation.php:217 BankReconciliation.php:294
#: PDFOrdersInvoiced.php:338 PDFOrderStatus.php:340
-#: PO_SelectOSPurchOrder.php:312 PO_SelectPurchOrder.php:216
+#: PO_SelectOSPurchOrder.php:304 PO_SelectPurchOrder.php:216
#: Shipt_Select.php:193 SuppCreditGRNs.php:291 SystemParameters.php:587
#: includes/PDFStatementPageHeader.inc:168
#: includes/PDFStatementPageHeader.inc:174
@@ -2683,27 +2683,27 @@
msgid "The bank accounts could not be retrieved by the SQL because"
msgstr ""
-#: BankReconciliation.php:110 CustomerReceipt.php:814
-#: DailyBankTransactions.php:23 ImportBankTrans.php:35 Payments.php:940
+#: BankReconciliation.php:110 CustomerReceipt.php:820
+#: DailyBankTransactions.php:23 ImportBankTrans.php:35 Payments.php:944
#: SuppPaymentRun.php:319
msgid "The SQL used to retrieve the bank accounts was"
msgstr ""
-#: BankReconciliation.php:120 CustomerReceipt.php:834
+#: BankReconciliation.php:120 CustomerReceipt.php:840
msgid "Bank Accounts have not yet been defined"
msgstr ""
-#: BankReconciliation.php:120 CustomerReceipt.php:834
+#: BankReconciliation.php:120 CustomerReceipt.php:840
msgid "You must first"
msgstr ""
-#: BankReconciliation.php:120 CustomerReceipt.php:834
-#: DailyBankTransactions.php:43 Payments.php:952 SuppPaymentRun.php:332
+#: BankReconciliation.php:120 CustomerReceipt.php:840
+#: DailyBankTransactions.php:43 Payments.php:956 SuppPaymentRun.php:332
msgid "define the bank accounts"
msgstr ""
-#: BankReconciliation.php:120 CustomerReceipt.php:834
-#: DailyBankTransactions.php:43 Payments.php:952 SuppPaymentRun.php:332
+#: BankReconciliation.php:120 CustomerReceipt.php:840
+#: DailyBankTransactions.php:43 Payments.php:956 SuppPaymentRun.php:332
msgid "and general ledger accounts to be affected"
msgstr ""
@@ -2738,13 +2738,13 @@
#: CustomerAllocations.php:377 CustomerInquiry.php:251
#: CustomerTransInquiry.php:99 CustWhereAlloc.php:146
#: DailyBankTransactions.php:152 EmailCustTrans.php:16 GLAccountInquiry.php:191
-#: ImportBankTrans.php:491 PrintCustTrans.php:503 PrintCustTrans.php:749
+#: ImportBankTrans.php:491 PrintCustTrans.php:518 PrintCustTrans.php:771
#: PrintCustTransPortrait.php:537 PrintCustTransPortrait.php:769
#: PrintCustTransPortrait.php:1017 PrintCustTransPortrait.php:1072
#: StockMovements.php:104 SupplierAllocations.php:457
#: SupplierAllocations.php:571 SupplierAllocations.php:646
#: SupplierInquiry.php:206 SupplierTransInquiry.php:109 SuppWhereAlloc.php:134
-#: Tax.php:432 Z_CheckAllocs.php:63 Z_CheckGLTransBalance.php:13
+#: Tax.php:434 Z_CheckAllocs.php:63 Z_CheckGLTransBalance.php:13
#: includes/PDFQuotationPageHeader.inc:29
#: includes/PDFQuotationPortraitPageHeader.inc:78
#: includes/PDFStatementPageHeader.inc:163
@@ -2755,14 +2755,14 @@
#: BankReconciliation.php:215 BankReconciliation.php:292
#: ContractCosting.php:176 CustomerAccount.php:254 CustomerInquiry.php:254
-#: CustomerPurchases.php:89 CustomerReceipt.php:950
+#: CustomerPurchases.php:89 CustomerReceipt.php:956
#: CustomerTransInquiry.php:103 CustWhereAlloc.php:147
#: DailyBankTransactions.php:154 Dashboard.php:59 GLAccountReport.php:346
-#: PaymentAllocations.php:65 PaymentAllocations.php:66 Payments.php:1089
-#: Payments.php:1326 PDFRemittanceAdvice.php:309 PurchasesReport.php:69
+#: PaymentAllocations.php:65 PaymentAllocations.php:66 Payments.php:1103
+#: Payments.php:1340 PDFRemittanceAdvice.php:309 PurchasesReport.php:69
#: ShiptsList.php:37 StockCounts.php:144 StockCounts.php:169
#: StockCounts.php:216 StockLocMovements.php:95 StockMovements.php:110
-#: SupplierInquiry.php:207 SuppWhereAlloc.php:135 Tax.php:434
+#: SupplierInquiry.php:207 SuppWhereAlloc.php:135 Tax.php:436
#: WorkOrderEntry.php:799 Z_CheckAllocs.php:64
#: includes/PDFBankingSummaryPageHeader.inc:40
#: includes/PDFCustTransListingPageHeader.inc:49
@@ -2814,7 +2814,7 @@
msgstr ""
#: BankReconciliation.php:361 CounterReturns.php:740 CounterSales.php:836
-#: Customers.php:1194 SelectOrderItems.php:1437 Stocks.php:1458
+#: Customers.php:1194 SelectOrderItems.php:1445 Stocks.php:1458
#: WorkOrderCosting.php:567 WorkOrderEntry.php:889
msgid "Are You Sure?"
msgstr ""
@@ -2878,7 +2878,7 @@
#: BOMExtendedQty.php:267 BOMExtendedQty.php:334 BOMExtendedQty.php:335
#: BOMExtendedQty.php:336 BOMExtendedQty.php:337 BOMIndented.php:318
-#: BOMIndentedReverse.php:296 BOMInquiry.php:199 BOMs.php:659 BOMs.php:858
+#: BOMIndentedReverse.php:296 BOMInquiry.php:199 BOMs.php:666 BOMs.php:865
#: ContractBOM.php:242 ContractBOM.php:356 ContractCosting.php:81
#: ContractCosting.php:87 ContractCosting.php:152 ContractOtherReqts.php:98
#: Contracts.php:1006 Contracts.php:1042 CounterReturns.php:669
@@ -2895,7 +2895,7 @@
#: MRPReschedules.php:193 OffersReceived.php:108 OffersReceived.php:218
#: OffersReceived.php:278 OrderDetails.php:189 PDFOrdersInvoiced.php:380
#: PDFSalesBySalesperson.php:87 PDFWeeklyOrders.php:83 POReport.php:770
-#: POReport.php:1463 PO_SelectOSPurchOrder.php:586 PrintCustTrans.php:859
+#: POReport.php:1463 PO_SelectOSPurchOrder.php:597 PrintCustTrans.php:881
#: PrintCustTransPortrait.php:943 PrintCustTransPortrait.php:1041
#: PrintCustTransPortrait.php:1097 PrintWOItemSlip.php:155
#: RecurringSalesOrders.php:331 ReorderLevel.php:289 ReverseGRN.php:406
@@ -2903,8 +2903,8 @@
#: SalesGraph.php:196 SalesGraph.php:279 SalesInquiry.php:998
#: SalesTopCustomersInquiry.php:218 SalesTopItemsInquiry.php:225
#: SelectCreditItems.php:688 SelectCreditItems.php:1074
-#: SelectOrderItems.php:1355 SelectOrderItems.php:1530
-#: SelectOrderItems.php:1702 SelectOrderItems.php:1806 ShipmentCosting.php:149
+#: SelectOrderItems.php:1361 SelectOrderItems.php:1538
+#: SelectOrderItems.php:1710 SelectOrderItems.php:1814 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
@@ -2913,7 +2913,7 @@
#: 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:298 WorkOrderIssue.php:1169 WorkOrderReceive.php:977
+#: Tax.php:300 WorkOrderIssue.php:1169 WorkOrderReceive.php:977
#: WOSerialNos.php:271 WOSerialNos.php:277 WOSerialNos.php:311
#: api/api_xml-rpc.php:2533 api/api_xml-rpc.php:2579 api/api_xml-rpc.php:2775
#: includes/PDFBOMListingPageHeader.inc:44
@@ -2979,8 +2979,8 @@
#: MRPPlannedWorkOrders.php:372 MRPReport.php:844 MRPReschedules.php:178
#: MRPShortages.php:333 PDFOrderStatus.php:323 PDFPriceList.php:395
#: PDFReceipt.php:34 PO_Header.php:850 PO_PDFPurchOrder.php:64
-#: PO_SelectOSPurchOrder.php:646 PrintWOItemSlip.php:142 ReorderLevel.php:272
-#: StockDispatch.php:479 SuppPriceList.php:289
+#: PO_SelectOSPurchOrder.php:657 PrintWOItemSlip.php:142 ReorderLevel.php:272
+#: StockDispatch.php:479 SuppPriceList.php:329
#: includes/PDFAgedDebtorsPageHeader.inc:34
#: includes/PDFAgedSuppliersPageHeader.inc:21
#: includes/PDFBalanceSheetPageHeader.inc:25
@@ -2988,7 +2988,7 @@
#: includes/PDFCustomerListPageHeader.inc:70
#: includes/PDFDebtorBalsPageHeader.inc:20 includes/PDFGLJournalHeaderCN.inc:15
#: includes/PDFGLJournalHeader.inc:13 includes/PDFGrnHeader.inc:23
-#: includes/PDFInventoryPlanPageHeader.inc:36
+#: includes/PDFInventoryPlanPageHeader.inc:35
#: includes/PDFInventoryValnPageHeader.inc:16
#: includes/PDFLowGPPageHeader.inc:16
#: includes/PDFOrderPageHeader_generic.inc:79
@@ -3019,7 +3019,7 @@
#: PrintCustOrder.php:175 PrintCustTransPortrait.php:812
#: PrintCustTransPortrait.php:1034 PrintCustTransPortrait.php:1090
#: PrintWOItemSlip.php:143 ReorderLevel.php:273 StockDispatch.php:480
-#: SuppPriceList.php:290 includes/PDFAgedDebtorsPageHeader.inc:34
+#: SuppPriceList.php:330 includes/PDFAgedDebtorsPageHeader.inc:34
#: includes/PDFAgedSuppliersPageHeader.inc:21
#: includes/PDFBalanceSheetPageHeader.inc:26
#: includes/PDFBankingSummaryPageHeader.inc:23
@@ -3030,7 +3030,7 @@
#: includes/PDFDebtorBalsPageHeader.inc:20
#: includes/PDFDeliveryDifferencesPageHeader.inc:29
#: includes/PDFDIFOTPageHeader.inc:29 includes/PDFGLJournalHeader.inc:13
-#: includes/PDFGrnHeader.inc:23 includes/PDFInventoryPlanPageHeader.inc:36
+#: includes/PDFGrnHeader.inc:23 includes/PDFInventoryPlanPageHeader.inc:35
#: includes/PDFInventoryValnPageHeader.inc:16
#: includes/PDFLowGPPageHeader.inc:16
#: includes/PDFOrderPageHeader_generic.inc:83
@@ -3074,13 +3074,13 @@
msgid "Build"
msgstr ""
-#: BOMExtendedQty.php:327 BOMInquiry.php:110 BOMs.php:1015
+#: BOMExtendedQty.php:327 BOMInquiry.php:110 BOMs.php:1022
#: CollectiveWorkOrderCost.php:326 CounterReturns.php:1690
#: CounterSales.php:2114 CounterSales.ph...
[truncated message content] |
|
From: <rc...@us...> - 2017-12-06 21:10:16
|
Revision: 7873
http://sourceforge.net/p/web-erp/reponame/7873
Author: rchacon
Date: 2017-12-06 21:10:14 +0000 (Wed, 06 Dec 2017)
Log Message:
-----------
Order by transaction date and add link to debtors.
Modified Paths:
--------------
trunk/Dashboard.php
trunk/doc/Change.log
trunk/sql/mysql/upgrade4.14.1-4.14.2.sql
Modified: trunk/Dashboard.php
===================================================================
--- trunk/Dashboard.php 2017-12-05 05:55:16 UTC (rev 7872)
+++ trunk/Dashboard.php 2017-12-06 21:10:14 UTC (rev 7873)
@@ -183,7 +183,8 @@
$TotDue += ($AgedAnalysis['due']-$AgedAnalysis['overdue1']);
$TotOD1 += ($AgedAnalysis['overdue1']-$AgedAnalysis['overdue2']);
$TotOD2 += $AgedAnalysis['overdue2'];
- echo '<td class="text" colspan="4"><b>', $AgedAnalysis['debtorno'], ' - ', $AgedAnalysis['name'], '</b></td>
+ echo ' <td class="text" colspan="4"><a href="CustomerInquiry.php?CustomerID=', $AgedAnalysis['debtorno'],'"><b>',
+ $AgedAnalysis['debtorno'], ' - ', $AgedAnalysis['name'], '</b></a></td>
<td class="number"><b>', $DisplayBalance, '</b></td>
<td class="number"><b>', $DisplayCurrent, '</b></td>
<td class="number" style="color:orange;"><b>', $DisplayDue, '</b></td>
@@ -233,7 +234,8 @@
AND debtorsmaster.paymentterms = paymentterms.termsindicator
AND debtorsmaster.debtorno = debtortrans.debtorno
AND debtortrans.debtorno = '" . $AgedAnalysis['debtorno'] . "'
- AND ABS(debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight + debtortrans.ovdiscount - debtortrans.alloc)>0.004";
+ AND ABS(debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight + debtortrans.ovdiscount - debtortrans.alloc)>0.004
+ ORDER BY debtortrans.trandate";
if($_SESSION['SalesmanLogin'] != '') {
$Sql .= " AND debtortrans.salesperson='" . $_SESSION['SalesmanLogin'] . "'";
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2017-12-05 05:55:16 UTC (rev 7872)
+++ trunk/doc/Change.log 2017-12-06 21:10:14 UTC (rev 7873)
@@ -1,6 +1,6 @@
webERP Change Log
-
+6/12/17 RChacon: Order by transaction date and add link to debtors in Dashboard.php script.
3/12/17 Phil commited Tim's BankAccountBalances.php script
2/12/17 Exson: Fixed the outstanding quantity is not right in PO_SelectOSPurchOrder.php.
2/12/17 Phil committed Tim Schofield's fix for javascript date picker for US date formats
Modified: trunk/sql/mysql/upgrade4.14.1-4.14.2.sql
===================================================================
--- trunk/sql/mysql/upgrade4.14.1-4.14.2.sql 2017-12-05 05:55:16 UTC (rev 7872)
+++ trunk/sql/mysql/upgrade4.14.1-4.14.2.sql 2017-12-06 21:10:14 UTC (rev 7873)
@@ -1,16 +1,17 @@
-ALTER table supptrans ADD chequeno varchar(16) NOT NULL DEFAULT '';
-ALTER table supptrans ADD void tinyint(1) NOT NULL DEFAULT 0;
-ALTER table banktrans ADD chequeno varchar(16) NOT NULL DEFAULT '';
-INSERT INTO `scripts` (`script` ,`pagesecurity` ,`description`) VALUES ('Z_RemovePurchaseBackOrders.php', '1', 'Removes all purchase order back orders');
-ALTER table supptrans DROP KEY `TypeTransNo`;
-ALTER table supptrans ADD KEY `TypeTransNo`(`transno`,`type`);
-ALTER TABLE pcexpenses ADD COLUMN taxcatid TINYINT(4) NOT NULL DEFAULT 1 AFTER tag;
-ALTER TABLE pctabs ADD COLUMN defaulttag TINYINT(4) NOT NULL DEFAULT 0 AFTER glaccountpcash;
-ALTER TABLE pctabs ADD COLUMN taxgroupid TINYINT(4) NOT NULL DEFAULT 1 AFTER defaulttag;
-ALTER TABLE pctabs ADD COLUMN authorizerexpenses VARCHAR(20) NOT NULL AFTER authorizer;
-UPDATE pctabs SET authorizerexpenses=authorizer
-ALTER TABLE pcashdetails ADD COLUMN tag INT(11) NOT NULL DEFAULT 0 AFTER tabcode;
-INSERT INTO `scripts` (`script` ,`pagesecurity` ,`description`) VALUES ('PcAuthorizeCash.php', '6', 'Authorisation of assigned cash');
+ALTER TABLE `banktrans` ADD `chequeno` VARCHAR(16) NOT NULL DEFAULT '' AFTER `currcode`;
+ALTER TABLE `supptrans` ADD `chequeno` VARCHAR(16) NOT NULL DEFAULT '' AFTER `hold`;
+ALTER TABLE `supptrans` ADD `void` TINYINT(1) NOT NULL DEFAULT 0 AFTER `chequeno`;
+ALTER table `supptrans` DROP KEY `TypeTransNo`;
+ALTER table `supptrans` ADD KEY `TypeTransNo`(`transno`,`type`);
+
+ALTER TABLE `pcexpenses` ADD COLUMN `taxcatid` TINYINT(4) NOT NULL DEFAULT 1 AFTER `tag`;
+ALTER TABLE `pctabs` ADD COLUMN `defaulttag` TINYINT(4) NOT NULL DEFAULT 0 AFTER `glaccountpcash`;
+ALTER TABLE `pctabs` ADD COLUMN `taxgroupid` TINYINT(4) NOT NULL DEFAULT 1 AFTER `defaulttag`;
+ALTER TABLE `pctabs` ADD COLUMN `authorizerexpenses` VARCHAR(20) NOT NULL AFTER `authorizer`;
+UPDATE `pctabs` SET authorizerexpenses=authorizer;
+ALTER TABLE `pcashdetails` ADD COLUMN `tag` INT(11) NOT NULL DEFAULT 0 AFTER `tabcode`;
+INSERT INTO `scripts` (`script`, `pagesecurity`, `description`) VALUES ('PcAuthorizeCash.php', '6', 'Authorisation of assigned cash');
+INSERT INTO `scripts` (`script`, `pagesecurity`, `description`) VALUES ('Z_RemovePurchaseBackOrders.php', '1', 'Removes all purchase order back orders');
CREATE TABLE `pcashdetailtaxes` (
`counterindex` INT(20) NOT NULL AUTO_INCREMENT,
`pccashdetail` INT(20) NOT NULL DEFAULT 0,
@@ -30,3 +31,6 @@
ALTER TABLE pcashdetails MODIFY receipt text COMMENT 'Column redundant. Replaced by receipt file upload. Nov 2017.';
INSERT INTO `scripts` (`script` ,`pagesecurity` ,`description`) VALUES ('BankAccountBalances.php', '1', 'Shows bank accounts authorised for with balances');
+
+UPDATE config SET confvalue='4.15' WHERE confname='VersionNumber';
+
|
|
From: <dai...@us...> - 2017-12-05 05:55:18
|
Revision: 7872
http://sourceforge.net/p/web-erp/reponame/7872
Author: daintree
Date: 2017-12-05 05:55:16 +0000 (Tue, 05 Dec 2017)
Log Message:
-----------
Modified Paths:
--------------
trunk/MailInventoryValuation.php
trunk/ManualContents.php
trunk/api/api_session.inc
trunk/doc/Manual/ManualSupplierTenders.html
trunk/includes/session.php
Modified: trunk/MailInventoryValuation.php
===================================================================
--- trunk/MailInventoryValuation.php 2017-12-02 23:30:00 UTC (rev 7871)
+++ trunk/MailInventoryValuation.php 2017-12-05 05:55:16 UTC (rev 7872)
@@ -244,7 +244,7 @@
include('includes/footer.php');
exit;
- }else{
+ } else {
$Title = _('Print Inventory Valuation Error');
include('includes/header.php');
prnMsg(_('There are errors lead to mails not sent'),'error');
@@ -255,4 +255,4 @@
}
}
-?>
+?>
\ No newline at end of file
Modified: trunk/ManualContents.php
===================================================================
--- trunk/ManualContents.php 2017-12-02 23:30:00 UTC (rev 7871)
+++ trunk/ManualContents.php 2017-12-05 05:55:16 UTC (rev 7872)
@@ -9,8 +9,8 @@
Selecting multiple sections is for printing.
The outline of the Table of Contents is contained in the 'ManualOutline.php' file that can be easily translated.
The individual topics in the manual are in straight html files that are called along with the header and foot from here.
-Each function in KwaMoja can initialise a $ViewTopic and $Bookmark variable, prior to including the header.php file.
-This will display the specified topic and bookmark if it exists when the user clicks on the Manual link in the KwaMoja main menu.
+Each function in webERP can initialise a $ViewTopic and $Bookmark variable, prior to including the header.php file.
+This will display the specified topic and bookmark if it exists when the user clicks on the Manual link in the webERP main menu.
In this way the help can be easily broken into sections for online context-sensitive help.
Comments beginning with Help Begin and Help End denote the beginning and end of a section that goes into the online help.
What section is named after Help Begin: and there can be multiple sections separated with a comma.
Modified: trunk/api/api_session.inc
===================================================================
--- trunk/api/api_session.inc 2017-12-02 23:30:00 UTC (rev 7871)
+++ trunk/api/api_session.inc 2017-12-05 05:55:16 UTC (rev 7872)
@@ -56,7 +56,7 @@
}
return $hash;
}
-
+
function VerifyPass($Password,$Hash) {
if(PHP_VERSION_ID < 50500) {
return (crypt($Password,$Hash)==$Hash);
Modified: trunk/doc/Manual/ManualSupplierTenders.html
===================================================================
--- trunk/doc/Manual/ManualSupplierTenders.html 2017-12-02 23:30:00 UTC (rev 7871)
+++ trunk/doc/Manual/ManualSupplierTenders.html 2017-12-05 05:55:16 UTC (rev 7872)
@@ -16,7 +16,7 @@
<p>Clicking on the "Select Suppliers" button brings up a screen to search for suppliers. Only suppliers with email addresses input will show in the supplier search screen. This is because the tendering system works by sending emails to everyone involved. You can choose as many suppliers as you want to send the tender request to.</p>
</li>
<li><h3>Items to be included in the tender</h3>
- <p>Clicking on the "Select Item Details" button brings up an item search screen. You can search for any item currently set up on KwaMoja and select any quantity to be put for tender. You can select multiple items from one screen. Any number of otems can be on the tender.</p>
+ <p>Clicking on the "Select Item Details" button brings up an item search screen. You can search for any item currently set up on webERP and select any quantity to be put for tender. You can select multiple items from one screen. Any number of otems can be on the tender.</p>
</li>
</ul>
Modified: trunk/includes/session.php
===================================================================
--- trunk/includes/session.php 2017-12-02 23:30:00 UTC (rev 7871)
+++ trunk/includes/session.php 2017-12-05 05:55:16 UTC (rev 7872)
@@ -133,9 +133,11 @@
header('Location: index.php');
} elseif (isset($AllowAnyone)){ /* only do security checks if AllowAnyone is not true */
- $_SESSION['AllowedPageSecurityTokens'] = array();
- $_SESSION['DatabaseName'] = $DefaultDatabase;
- $_SESSION['CompanyName'] = $DefaultDatabase;
+ if (!isset($_SESSION['DatabaseName'])){
+ $_SESSION['AllowedPageSecurityTokens'] = array();
+ $_SESSION['DatabaseName'] = $DefaultDatabase;
+ $_SESSION['CompanyName'] = $DefaultDatabase;
+ }
include_once ($PathPrefix . 'includes/ConnectDB_' . $DBType . '.inc');
include($PathPrefix . 'includes/GetConfig.php');
} else {
|
|
From: <dai...@us...> - 2017-12-02 23:30:03
|
Revision: 7871
http://sourceforge.net/p/web-erp/reponame/7871
Author: daintree
Date: 2017-12-02 23:30:00 +0000 (Sat, 02 Dec 2017)
Log Message:
-----------
Modified Paths:
--------------
trunk/doc/Change.log
trunk/includes/MainMenuLinksArray.php
trunk/sql/mysql/upgrade4.14.1-4.14.2.sql
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2017-12-02 13:19:00 UTC (rev 7870)
+++ trunk/doc/Change.log 2017-12-02 23:30:00 UTC (rev 7871)
@@ -1,5 +1,7 @@
webERP Change Log
+
+3/12/17 Phil commited Tim's BankAccountBalances.php script
2/12/17 Exson: Fixed the outstanding quantity is not right in PO_SelectOSPurchOrder.php.
2/12/17 Phil committed Tim Schofield's fix for javascript date picker for US date formats
2/12/17 Phil/Paul Becker: Purchases report - also deleted id non-exsitent in css committed changes suggested by VortecCPI http://www.weberp.org/forum/showthread.php?tid=7943
Modified: trunk/includes/MainMenuLinksArray.php
===================================================================
--- trunk/includes/MainMenuLinksArray.php 2017-12-02 13:19:00 UTC (rev 7870)
+++ trunk/includes/MainMenuLinksArray.php 2017-12-02 23:30:00 UTC (rev 7871)
@@ -367,7 +367,8 @@
'/BankMatching.php?Type=Receipts',
'/GLJournal.php?NewJournal=Yes');
-$MenuItems['GL']['Reports']['Caption'] = array( _('Bank Account Reconciliation Statement'),
+$MenuItems['GL']['Reports']['Caption'] = array( _('Bank Account Balances'),
+ _('Bank Account Reconciliation Statement'),
_('Cheque Payments Listing'),
_('Daily Bank Transactions'),
_('Account Inquiry'),
@@ -383,7 +384,8 @@
_('Tag Reports'),
_('Tax Reports'));
-$MenuItems['GL']['Reports']['URL'] = array( '/BankReconciliation.php',
+$MenuItems['GL']['Reports']['URL'] = array( '/BankAccountBalances.php',
+ '/BankReconciliation.php',
'/PDFChequeListing.php',
'/DailyBankTransactions.php',
'/SelectGLAccount.php',
Modified: trunk/sql/mysql/upgrade4.14.1-4.14.2.sql
===================================================================
--- trunk/sql/mysql/upgrade4.14.1-4.14.2.sql 2017-12-02 13:19:00 UTC (rev 7870)
+++ trunk/sql/mysql/upgrade4.14.1-4.14.2.sql 2017-12-02 23:30:00 UTC (rev 7871)
@@ -28,5 +28,5 @@
ALTER TABLE `custbranch` CHANGE `lng` `lng` FLOAT(12,8) NOT NULL DEFAULT '0.00000000';
ALTER TABLE pcashdetails MODIFY receipt text COMMENT 'Column redundant. Replaced by receipt file upload. Nov 2017.';
+INSERT INTO `scripts` (`script` ,`pagesecurity` ,`description`) VALUES ('BankAccountBalances.php', '1', 'Shows bank accounts authorised for with balances');
-
|
|
From: <dai...@us...> - 2017-12-02 07:55:19
|
Revision: 7869
http://sourceforge.net/p/web-erp/reponame/7869
Author: daintree
Date: 2017-12-02 07:55:17 +0000 (Sat, 02 Dec 2017)
Log Message:
-----------
Tim fixed US date format date picker javascript
Modified Paths:
--------------
trunk/doc/Change.log
trunk/javascripts/MiscFunctions.js
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2017-12-02 07:37:07 UTC (rev 7868)
+++ trunk/doc/Change.log 2017-12-02 07:55:17 UTC (rev 7869)
@@ -1,6 +1,7 @@
webERP Change Log
-2/12/17 Phil: Purchases report - also deleted id non-exsitent in css committed changes suggested by VortecCPI http://www.weberp.org/forum/showthread.php?tid=7943
+2/12/17 Phil committed Tim Schofield's fix for javascript date picker for US date formats
+2/12/17 Phil/Paul Becker: Purchases report - also deleted id non-exsitent in css committed changes suggested by VortecCPI http://www.weberp.org/forum/showthread.php?tid=7943
23/11/2017 Andy Couling: Added Petty Cash receipt file upload to directory functionality.
7/11/17 Exson: Remove cost updating for WAC method in BOMs.php.
25/10/17 Exson: Fixed the salesman authority problem in PrintCustTrans.php.
Modified: trunk/javascripts/MiscFunctions.js
===================================================================
--- trunk/javascripts/MiscFunctions.js 2017-12-02 07:37:07 UTC (rev 7868)
+++ trunk/javascripts/MiscFunctions.js 2017-12-02 07:55:17 UTC (rev 7869)
@@ -249,8 +249,8 @@
break;
case "m/d/Y":
dA = dS.split("/");
- m = parseInt(dA[0], 10);
- d = parseInt(dA[1], 10)-1;
+ m = parseInt(dA[0], 10)-1;
+ d = parseInt(dA[1], 10);
y = parseInt(dA[2], 10);
break;
case "Y-m-d":
|
|
From: <dai...@us...> - 2017-12-02 07:37:10
|
Revision: 7868
http://sourceforge.net/p/web-erp/reponame/7868
Author: daintree
Date: 2017-12-02 07:37:07 +0000 (Sat, 02 Dec 2017)
Log Message:
-----------
VortecCPI: PurchaseReport fix only noticed on US locale
Modified Paths:
--------------
trunk/PurchasesReport.php
trunk/doc/Change.log
Modified: trunk/PurchasesReport.php
===================================================================
--- trunk/PurchasesReport.php 2017-11-23 22:48:11 UTC (rev 7867)
+++ trunk/PurchasesReport.php 2017-12-02 07:37:07 UTC (rev 7868)
@@ -61,8 +61,8 @@
$TotalGlAmount = 0;
$TotalGlTax = 0;
$k = 1;// Row colour counter.
- $PeriodFrom = ConvertSQLDate($_POST['PeriodFrom']);
- $PeriodTo = ConvertSQLDate($_POST['PeriodTo']);
+ $PeriodFrom = FormatDateForSQL($_POST['PeriodFrom']);
+ $PeriodTo = FormatDateForSQL($_POST['PeriodTo']);
if($_POST['ShowDetails']) {// Parameters: PeriodFrom, PeriodTo, ShowDetails=on.
echo '<th>', _('Date'), '</th>
<th>', _('Purchase Invoice'), '</th>
@@ -278,8 +278,8 @@
</tr>',
// Show the budget for the period:
'<tr>',
- '<td><label for="ShowDetails">', _('Show details'), '</label></td>
- <td><input',($_POST['ShowDetails'] ? ' checked="checked"' : ''), ' id="ShowDetails" name="ShowDetails" type="checkbox">', // "Checked" if ShowDetails is set AND it is TRUE.
+ '<td><label>', _('Show details'), '</label></td>
+ <td><input', (isset($_POST['ShowDetails']) ? ' checked="checked"' : ''), ' name="ShowDetails" type="checkbox">', // "Checked" if ShowDetails is set AND it is TRUE.
(!isset($_SESSION['ShowFieldHelp']) || $_SESSION['ShowFieldHelp'] ? _('Check this box to show purchase invoices') : ''), // If it is not set the $_SESSION['ShowFieldHelp'] parameter OR it is TRUE, shows the page help text.
'</td>
</tr>',
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2017-11-23 22:48:11 UTC (rev 7867)
+++ trunk/doc/Change.log 2017-12-02 07:37:07 UTC (rev 7868)
@@ -1,11 +1,12 @@
webERP Change Log
+2/12/17 Phil: Purchases report - also deleted id non-exsitent in css committed changes suggested by VortecCPI http://www.weberp.org/forum/showthread.php?tid=7943
23/11/2017 Andy Couling: Added Petty Cash receipt file upload to directory functionality.
-17/11/07 Exson: Remove cost updating for WAC method in BOMs.php.
-17/10/25 Exson: Fixed the salesman authority problem in PrintCustTrans.php.
-17/10/23 Exson: Prevent sales man from viewing other sales' sales orders in PrintCustTrans.php.
-17/10/23 Exson: Prevent customer from modifying or viewing other customer's order in SelectOrderItems.php and PrintCustTrans.php.
-17/10/21 Exson: Change header to meta data to avoid header do not work in some server environment in SelectCompletedOrder.php and SelectGLAccount.php
+7/11/17 Exson: Remove cost updating for WAC method in BOMs.php.
+25/10/17 Exson: Fixed the salesman authority problem in PrintCustTrans.php.
+23/10/17 Exson: Prevent sales man from viewing other sales' sales orders in PrintCustTrans.php.
+23/10/17 Exson: Prevent customer from modifying or viewing other customer's order in SelectOrderItems.php and PrintCustTrans.php.
+21/10/18 Exson: Change header to meta data to avoid header do not work in some server environment in SelectCompletedOrder.php and SelectGLAccount.php
17/10/17 Andy Couling: Removed reference to css class 'toplink' in CustomerInquiry.php and CustomerAccount.php.
17/10/17 Phil: Fix InventoryPlanning.php and includes/PDFInventoryPlanPageHeader.inc to display categories selected and fix month headings displayed
15/10/17 Andy Couling: New Expenses/Update Expense table header in PcClaimExpensesFromTab.php
@@ -13,19 +14,19 @@
15/10/17 Andy Couling: Table header labels corrected in PcClaimExpensesFromTab.php and PcAuthorizeExpenses.php.
15/10/17 Andy Couling: Fixed expense deletion dialogue box in PcClaimExpensesFromTab.php.
15/10/17 Andy Couling: Missing $Id comments added to Petty Cash scripts.
-17/10/12 Exson: Fixed the bug that Narrative information will loss when add or remove controlled items lot no in StockAdjustments.php.
-17/10/11 RChacon: If it is set the $_SESSION['ShowPageHelp'] parameter AND it is FALSE, hides the page help text (simplifies code using css).
-17/10/11 RChacon: Set decimals variable for exchange rate in Currencies.php.
-17/10/11 RChacon: Improve currency showing and set decimals variable for exchange rate in Payments.php.
-17/10/11 Exson: Fix the indian_number_format bug in MiscFunctions.php.
-17/10/09 Exson: Fixed the non-balance bug in CustomerReceipt.php. And fixed the non rollback problem when there is a non-balance existed. Fixed error noises.
-17/10/03 Exson: Add html view to SuppPriceList.php.
-01/10/26 RChacon: Standardise and add icons for usability.
-27/09/26 RChacon: Increases accuracy in coordinates.
-17/09/26 Exson: Fixed the wrong price retrieved bug in PO_Header.php.
-17/09/26 Exson: Fixed the vendor price bug to ensure only the effective price showed by suppliers in SelectProduct.php.
-17/09/20 Exson: Fixed the bug to make GRN reverse workable.
-17/09/19 Exson: Fixed customer information missing in CustomerReceipt.php. Reported by Steven Fu.
+10/10/12 Exson: Fixed the bug that Narrative information will loss when add or remove controlled items lot no in StockAdjustments.php.
+10/10/17 RChacon: If it is set the $_SESSION['ShowPageHelp'] parameter AND it is FALSE, hides the page help text (simplifies code using css).
+10/10/17 RChacon: Set decimals variable for exchange rate in Currencies.php.
+10/10/17 RChacon: Improve currency showing and set decimals variable for exchange rate in Payments.php.
+10/10/17 Exson: Fix the indian_number_format bug in MiscFunctions.php.
+9/10/17 Exson: Fixed the non-balance bug in CustomerReceipt.php. And fixed the non rollback problem when there is a non-balance existed. Fixed error noises.
+3/10/17 Exson: Add html view to SuppPriceList.php.
+20/9/17 RChacon: Standardise and add icons for usability.
+20/9/17 RChacon: Increases accuracy in coordinates.
+20/9/17 Exson: Fixed the wrong price retrieved bug in PO_Header.php.
+20/9/17 Exson: Fixed the vendor price bug to ensure only the effective price showed by suppliers in SelectProduct.php.
+20/9/17 Exson: Fixed the bug to make GRN reverse workable.
+19/9/17 Exson: customer information missing in CustomerReceipt.php. Reported by Steven Fu.
18/9/2017 Tim (committed by Andy): Geocode bug fixes. http://www.weberp.org/forum/showthread.php?tid=4380
17/9/17 VortecCPI: SelectProduct.php made image dispay code match that used in WorkOrderEntry.php
11/9/17 Andy Couling: Fixed the onclick delete confirmation box call in ContractBOM.php, was 'MakeConfirm'.
|
|
From: <afc...@us...> - 2017-11-23 22:48:13
|
Revision: 7867
http://sourceforge.net/p/web-erp/reponame/7867
Author: afcouling
Date: 2017-11-23 22:48:11 +0000 (Thu, 23 Nov 2017)
Log Message:
-----------
Added Petty Cash receipt file upload to directory functionality. SQL.
Modified Paths:
--------------
trunk/sql/mysql/upgrade4.14.1-4.14.2.sql
Modified: trunk/sql/mysql/upgrade4.14.1-4.14.2.sql
===================================================================
--- trunk/sql/mysql/upgrade4.14.1-4.14.2.sql 2017-11-23 22:45:05 UTC (rev 7866)
+++ trunk/sql/mysql/upgrade4.14.1-4.14.2.sql 2017-11-23 22:48:11 UTC (rev 7867)
@@ -25,6 +25,8 @@
);
ALTER TABLE `custbranch` CHANGE `lat` `lat` FLOAT(12,8) NOT NULL DEFAULT '0.00000000';
-ALTER TABLE `custbranch` CHANGE `lng` `lng` FLOAT(12,8) NOT NULL DEFAULT '0.00000000'
+ALTER TABLE `custbranch` CHANGE `lng` `lng` FLOAT(12,8) NOT NULL DEFAULT '0.00000000';
+ALTER TABLE pcashdetails MODIFY receipt text COMMENT 'Column redundant. Replaced by receipt file upload. Nov 2017.';
+
|
|
From: <afc...@us...> - 2017-11-23 22:45:07
|
Revision: 7866
http://sourceforge.net/p/web-erp/reponame/7866
Author: afcouling
Date: 2017-11-23 22:45:05 +0000 (Thu, 23 Nov 2017)
Log Message:
-----------
Added Petty Cash receipt file upload to directory functionality.
Modified Paths:
--------------
trunk/PcAssignCashTabToTab.php
trunk/PcAssignCashToTab.php
trunk/PcAuthorizeCash.php
trunk/PcAuthorizeExpenses.php
trunk/PcClaimExpensesFromTab.php
trunk/PcExpenses.php
trunk/PcReportExpense.php
trunk/PcReportTab.php
trunk/PcTabExpensesList.php
trunk/doc/Change.log
trunk/doc/Manual/ManualPettyCash.html
Modified: trunk/PcAssignCashTabToTab.php
===================================================================
--- trunk/PcAssignCashTabToTab.php 2017-11-07 01:57:00 UTC (rev 7865)
+++ trunk/PcAssignCashTabToTab.php 2017-11-23 22:45:05 UTC (rev 7866)
@@ -29,7 +29,6 @@
unset($Days);
unset($_POST['Amount']);
unset($_POST['Notes']);
- unset($_POST['Receipt']);
}
if (isset($_POST['Process'])) {
@@ -117,8 +116,7 @@
amount,
authorized,
posted,
- notes,
- receipt)
+ notes)
VALUES (NULL,
'" . $_POST['SelectedTabs'] . "',
'" . FormatDateForSQL($_POST['Date']) . "',
@@ -127,9 +125,8 @@
'0000-00-00',
'0',
'" . $_POST['Notes'] . "',
- '" . $_POST['Receipt'] . "'
- ),
- (NULL,
+ ),
+ (NULL,
'" . $SelectedTabsTo . "',
'" . FormatDateForSQL($_POST['Date']) . "',
'ASSIGNCASH',
@@ -137,7 +134,7 @@
'0000-00-00',
'0',
'" . $_POST['Notes'] . "',
- '" . $_POST['Receipt'] . "')";
+ )";
$msg = _('Assignment of cash from PC Tab ') . ' ' . $SelectedTabs . ' ' . _('to ') . $SelectedTabsTo . ' ' . _('has been created');
}
@@ -148,7 +145,6 @@
unset($_POST['SelectedExpense']);
unset($_POST['Amount']);
unset($_POST['Notes']);
- unset($_POST['Receipt']);
unset($_POST['SelectedTabs']);
unset($_POST['Date']);
}
@@ -235,7 +231,6 @@
unset($_POST['Amount']);
unset($_POST['Date']);
unset($_POST['Notes']);
- unset($_POST['Receipt']);
}
if(!isset ($Days)){
@@ -259,8 +254,7 @@
amount,
authorized,
posted,
- notes,
- receipt
+ notes
FROM pcashdetails
WHERE tabcode='" . $SelectedTabs . "'
AND date >= DATE_SUB(CURDATE(), INTERVAL " . $Days . " DAY)
@@ -269,22 +263,28 @@
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">
<div>
- <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
- <table class="selection">
+ <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+
+ //Limit expenses history to X days
+ echo '<table class="selection">
<tr>
- <th colspan="8">' . _('Detail of Tab Movements For Last') .':
+ <td>' . _('Detail of Tab Movements For Last') .':
<input type="hidden" name="SelectedTabs" value="' . $SelectedTabs . '" />
<input type="text" class="number" name="Days" value="' . $Days . '" maxlength="3" size="4" /> ' . _('Days') . '
- <input type="submit" name="Go" value="' . _('Go') . '" /></th>
+ <input type="submit" name="Go" value="' . _('Go') . '" />
+ </td>
</tr>
- <tr>
- <th>' . _('Date') . '</th>
- <th>' . _('Expense Code') . '</th>
- <th>' . _('Amount') . '</th>
- <th>' . _('Notes') . '</th>
- <th>' . _('Receipt') . '</th>
- <th>' . _('Date Authorised') . '</th>
- </tr>';
+ </table>';
+
+ echo '<table class="selection">
+ <tr>
+ <th>' . _('Date') . '</th>
+ <th>' . _('Expense Code') . '</th>
+ <th>' . _('Amount') . '</th>
+ <th>' . _('Notes') . '</th>
+ <th>' . _('Receipt Attachment') . '</th>
+ <th>' . _('Date Authorised') . '</th>
+ </tr>';
$k = 0; //row colour counter
@@ -309,6 +309,18 @@
$ExpenseCodeDes = $MyRow['codeexpense'] . ' - ' . $Description[0];
}
+ //Generate download link for expense receipt, or show text if no receipt file is found.
+ $ReceiptSupportedExt = array('png','jpg','jpeg','pdf','doc','docx','xls','xlsx'); //Supported file extensions
+ $ReceiptFileDir = $PathPrefix . 'companies/' . $_SESSION['DatabaseName'] . '/expenses_receipts/' . mb_strtolower($SelectedTabs); //Receipts upload directory
+ $ReceiptFilePathMatched = reset(glob($ReceiptFileDir . '/' . $MyRow['counterindex'] . '.{' . implode(',', $ReceiptSupportedExt) . '}', GLOB_BRACE)); //Find the relevant receipt file for the expense. There should only be one (file type), but limit to one result just in case.
+ if (!empty($ReceiptFilePathMatched)) { //If no receipt file for the expenses is found
+ $ReceiptText = '<a href="' . $ReceiptFilePathMatched . '" download="ExpenseReceipt-' . mb_strtolower($SelectedTabs) . '-[' . $MyRow['date'] . ']-[' . $MyRow['counterindex'] . ']">' . _('Download attachment') . '</a>';
+ } elseif ($ExpenseCodeDes == 'ASSIGNCASH') {
+ $ReceiptText = '';
+ } else {
+ $ReceiptText = _('No attachment');
+ }
+
if ($MyRow['authorized'] == '0000-00-00') {
$AuthorisedDate = _('Unauthorised');
} else {
@@ -321,7 +333,7 @@
<td>', $ExpenseCodeDes, '</td>
<td class="number">' . locale_number_format($MyRow['amount'],$CurrDecimalPlaces) . '</td>
<td>' . $MyRow['notes'] . '</td>
- <td>' . $MyRow['receipt'] . '</td>
+ <td>' . $ReceiptText . '</td>
<td>' . $AuthorisedDate . '</td>
</tr>';
}else{
@@ -329,7 +341,7 @@
<td>', $ExpenseCodeDes, '</td>
<td class="number">' . locale_number_format($MyRow['amount'],$CurrDecimalPlaces) . '</td>
<td>' . $MyRow['notes'] . '</td>
- <td>' . $MyRow['receipt'] . '</td>
+ <td>' . $ReceiptText . '</td>
<td>' . $AuthorisedDate . '</td>
</tr>';
}
@@ -416,16 +428,8 @@
<td><input type="text" name="Notes" size="50" maxlength="49" value="' . $_POST['Notes'] . '" /></td>
</tr>';
- if (!isset($_POST['Receipt'])) {
- $_POST['Receipt'] = '';
- }
-
- echo '<tr>
- <td>' . _('Receipt') . ':</td>
- <td><input type="text" name="Receipt" size="50" maxlength="49" value="' . $_POST['Receipt'] . '" /></td>
- </tr>
- </table>
- <input type="hidden" name="CurrentAmount" value="' . $SelectedTab['0']. '" />
+ echo '</table>'; // close main table
+ echo '<input type="hidden" name="CurrentAmount" value="' . $SelectedTab['0']. '" />
<input type="hidden" name="SelectedTabs" value="' . $SelectedTabs . '" />
<input type="hidden" name="Days" value="' . $Days . '" />
<input type="hidden" name="SelectedTabsTo" value="' . $SelectedTabsTo[1] . '" />
Modified: trunk/PcAssignCashToTab.php
===================================================================
--- trunk/PcAssignCashToTab.php 2017-11-07 01:57:00 UTC (rev 7865)
+++ trunk/PcAssignCashToTab.php 2017-11-23 22:45:05 UTC (rev 7866)
@@ -28,7 +28,6 @@
unset($Days);
unset($_POST['Amount']);
unset($_POST['Notes']);
- unset($_POST['Receipt']);
}
if (isset($_POST['Process'])) {
if ($SelectedTabs == '') {
@@ -80,7 +79,6 @@
amount = '" . filter_number_format($_POST['Amount']) . "',
authorized = '0000-00-00',
notes = '" . $_POST['Notes'] . "',
- receipt = '" . $_POST['Receipt'] . "'
WHERE counterindex = '" . $SelectedIndex . "'";
$Msg = _('Assignment of cash to PC Tab ') . ' ' . $SelectedTabs . ' ' . _('has been updated');
} elseif ($InputError != 1) {
@@ -93,8 +91,7 @@
amount,
authorized,
posted,
- notes,
- receipt)
+ notes)
VALUES (NULL,
'" . $_POST['SelectedTabs'] . "',
'" . FormatDateForSQL($_POST['Date']) . "',
@@ -103,7 +100,6 @@
'0000-00-00',
'0',
'" . $_POST['Notes'] . "',
- '" . $_POST['Receipt'] . "'
)";
$Msg = _('Assignment of cash to PC Tab ') . ' ' . $_POST['SelectedTabs'] . ' ' . _('has been created');
}
@@ -114,7 +110,6 @@
unset($_POST['SelectedExpense']);
unset($_POST['Amount']);
unset($_POST['Notes']);
- unset($_POST['Receipt']);
unset($_POST['SelectedTabs']);
unset($_POST['Date']);
}
@@ -188,7 +183,6 @@
unset($_POST['Amount']);
unset($_POST['Date']);
unset($_POST['Notes']);
- unset($_POST['Receipt']);
}
if (!isset($Days)) {
$Days = 30;
@@ -209,8 +203,7 @@
amount,
authorized,
posted,
- notes,
- receipt
+ notes
FROM pcashdetails
WHERE tabcode='" . $SelectedTabs . "'
AND date >=DATE_SUB(CURDATE(), INTERVAL " . $Days . " DAY)
@@ -219,20 +212,25 @@
$Result = DB_query($SQL);
echo '<form method="post" action="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'), '">';
echo '<input type="hidden" name="FormID" value="', $_SESSION['FormID'], '" />';
+
+ //Limit expenses history to X days
echo '<table class="selection">
<tr>
- <th colspan="8">', _('Detail of Tab Movements For Last'), ':
+ <td>', _('Detail of Tab Movements For Last'), ':
<input type="hidden" name="SelectedTabs" value="', $SelectedTabs, '" />
<input type="text" class="number" name="Days" value="', $Days, '" required="required" maxlength="3" size="4" />' . _('Days') . '
<input type="submit" name="Go" value="' . _('Go') . '" /></th>
- </th>
+ </td>
</tr>
+ </table>';
+
+ echo '<table class="selection">
<tr>
<th>', _('Date'), '</th>
<th>', _('Expense Code'), '</th>
<th>', _('Amount'), '</th>
<th>', _('Notes'), '</th>
- <th>', _('Receipt'), '</th>
+ <th>', _('Receipt Attachment'), '</th>
<th>', _('Date Authorised'), '</th>
</tr>';
$k = 0; //row colour counter
@@ -262,6 +260,18 @@
$AuthorisedDate = ConvertSQLDate($MyRow['authorized']);
}
+ //Generate download link for expense receipt, or show text if no receipt file is found.
+ $ReceiptSupportedExt = array('png','jpg','jpeg','pdf','doc','docx','xls','xlsx'); //Supported file extensions
+ $ReceiptFileDir = $PathPrefix . 'companies/' . $_SESSION['DatabaseName'] . '/expenses_receipts/' . mb_strtolower($SelectedTabs); //Receipts upload directory
+ $ReceiptFilePathMatched = reset(glob($ReceiptFileDir . '/' . $MyRow['counterindex'] . '.{' . implode(',', $ReceiptSupportedExt) . '}', GLOB_BRACE)); //Find the relevant receipt file for the expense. There should only be one (file type), but limit to one result just in case.
+ if (!empty($ReceiptFilePathMatched)) { //If no receipt file for the expenses is found
+ $ReceiptText = '<a href="' . $ReceiptFilePathMatched . '" download="ExpenseReceipt-' . mb_strtolower($SelectedTabs) . '-[' . $MyRow['date'] . ']-[' . $MyRow['counterindex'] . ']">' . _('Download attachment') . '</a>';
+ } elseif ($ExpenseCodeDes == 'ASSIGNCASH') {
+ $ReceiptText = '';
+ } else {
+ $ReceiptText = _('No attachment');
+ }
+
if (($MyRow['authorized'] == '0000-00-00') and ($ExpenseCodeDes == 'ASSIGNCASH')) {
// only cash assignations NOT authorized can be modified or deleted
echo '<td>', ConvertSQLDate($MyRow['date']), '</td>
@@ -268,7 +278,7 @@
<td>', $ExpenseCodeDes, '</td>
<td class="number">', locale_number_format($MyRow['amount'], $CurrDecimalPlaces), '</td>
<td>', $MyRow['notes'], '</td>
- <td>', $MyRow['receipt'], '</td>
+ <td>', $ReceiptText, '</td>
<td>', $AuthorisedDate, '</td>
<td><a href="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'), '?SelectedIndex=', $MyRow['counterindex'], '&SelectedTabs=', $SelectedTabs, '&Days=', $Days, '&edit=yes">', _('Edit'), '</a></td>
<td><a href="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'), '?SelectedIndex=', $MyRow['counterindex'], '&SelectedTabs=', $SelectedTabs, '&Days=', $Days, '&delete=yes" onclick=\'return confirm("' . _('Are you sure you wish to delete this assigned cash?') . '");\'>' . _('Delete') . '</a></td>
@@ -278,7 +288,7 @@
<td>', $ExpenseCodeDes, '</td>
<td class="number">', locale_number_format($MyRow['amount'], $CurrDecimalPlaces), '</td>
<td>', $MyRow['notes'], '</td>
- <td>', $MyRow['receipt'], '</td>
+ <td>', $ReceiptText, '</td>
<td>', $AuthorisedDate, '</td>
</tr>';
}
@@ -323,9 +333,8 @@
authorized,
posted,
notes,
- receipt
- FROM pcashdetails
- WHERE counterindex='" . $SelectedIndex . "'";
+ FROM pcashdetails
+ WHERE counterindex='" . $SelectedIndex . "'";
$Result = DB_query($SQL);
$MyRow = DB_fetch_array($Result);
$_POST['Date'] = ConvertSQLDate($MyRow['date']);
@@ -332,7 +341,6 @@
$_POST['SelectedExpense'] = $MyRow['codeexpense'];
$_POST['Amount'] = $MyRow['amount'];
$_POST['Notes'] = $MyRow['notes'];
- $_POST['Receipt'] = $MyRow['receipt'];
echo '<input type="hidden" name="SelectedTabs" value="', $SelectedTabs, '" />';
echo '<input type="hidden" name="SelectedIndex" value="', $SelectedIndex, '" />';
echo '<input type="hidden" name="CurrentAmount" value="', $Amount[0], '" />';
@@ -372,13 +380,6 @@
<td>', _('Notes'), ':</td>
<td><input type="text" name="Notes" size="50" maxlength="49" value="', $_POST['Notes'], '" /></td>
</tr>';
- if (!isset($_POST['Receipt'])) {
- $_POST['Receipt'] = '';
- }
- echo '<tr>
- <td>' . _('Receipt') . ':</td>
- <td><input type="text" name="Receipt" size="50" maxlength="49" value="', $_POST['Receipt'], '" /></td>
- </tr>';
echo '</table>'; // close main table
echo '<input type="hidden" name="CurrentAmount" value="', $Amount['0'], '" />';
echo '<input type="hidden" name="SelectedTabs" value="', $SelectedTabs, '" />';
Modified: trunk/PcAuthorizeCash.php
===================================================================
--- trunk/PcAuthorizeCash.php 2017-11-07 01:57:00 UTC (rev 7865)
+++ trunk/PcAuthorizeCash.php 2017-11-23 22:45:05 UTC (rev 7866)
@@ -55,14 +55,17 @@
if (!isset($Days)) {
$Days = 30;
}
- echo '<input type="hidden" name="SelectedTabs" value="', $SelectedTabs, '" />';
+
+ //Limit expenses history to X days
echo '<table class="selection">
<tr>
- <th colspan="6">', _('Detail of Tab Movements For Last '), ':
+ <td>', _('Detail of Tab Movements For Last '), ':
+ <input type="hidden" name="SelectedTabs" value="', $SelectedTabs, '" />
<input type="text" class="number" name="Days" value="', $Days, '" maxlength="3" size="4" />', _('Days'), '
<input type="submit" name="Go" value="', _('Go'), '" />
- </th>
- </tr>';
+ </td>
+ </tr>
+ </table>';
$SQL = "SELECT pcashdetails.counterindex,
pcashdetails.tabcode,
pcashdetails.date,
@@ -71,7 +74,6 @@
pcashdetails.authorized,
pcashdetails.posted,
pcashdetails.notes,
- pcashdetails.receipt,
pctabs.glaccountassignment,
pctabs.glaccountpcash,
pctabs.usercode,
@@ -86,14 +88,14 @@
AND pcashdetails.codeexpense='ASSIGNCASH'
ORDER BY pcashdetails.date, pcashdetails.counterindex ASC";
$Result = DB_query($SQL);
- echo '<tr>
- <th>', _('Date'), '</th>
- <th>', _('Expense Code'), '</th>
- <th>', _('Amount'), '</th>
- <th>', _('Notes'), '</th>
- <th>', _('Receipt'), '</th>
- <th>', _('Date Authorised'), '</th>
- </tr>';
+ echo '<table class="selection">
+ <tr>
+ <th>', _('Date'), '</th>
+ <th>', _('Expense Code'), '</th>
+ <th>', _('Amount'), '</th>
+ <th>', _('Notes'), '</th>
+ <th>', _('Date Authorised'), '</th>
+ </tr>';
$k = 0; //row colour counter
$CurrDecimalPlaces = 2;
while ($MyRow = DB_fetch_array($Result)) {
@@ -127,7 +129,7 @@
//get typeno
$typeno = GetNextTransNo($type,$db);
//build narrative
- $Narrative = _('PettyCash') . ' - ' . $MyRow['tabcode'] . ' - ' . $MyRow['codeexpense'] . ' - ' . DB_escape_string($MyRow['notes']) . ' - ' . $MyRow['receipt'];
+ $Narrative = _('PettyCash') . ' - ' . $MyRow['tabcode'] . ' - ' . $MyRow['codeexpense'] . ' - ' . DB_escape_string($MyRow['notes']);
//insert to gltrans
DB_Txn_Begin();
$SQLFrom = "INSERT INTO `gltrans` (`counterindex`,
@@ -229,19 +231,10 @@
$k = 1;
}
- /*
- if ($MyRow['posted'] == 0) {
- $Posted = _('No');
- } else {
- $Posted = _('Yes');
- }
- */
-
echo '<td>', ConvertSQLDate($MyRow['date']), '</td>
<td>', $MyRow['codeexpense'], '</td>
<td class="number">', locale_number_format($MyRow['amount'], $CurrDecimalPlaces), '</td>
- <td>', $MyRow['notes'], '</td>
- <td>', $MyRow['receipt'], '</td>';
+ <td>', $MyRow['notes'], '</td>';
if (isset($_POST[$MyRow['counterindex']])) {
echo '<td>' . ConvertSQLDate(Date('Y-m-d'));
} else {
Modified: trunk/PcAuthorizeExpenses.php
===================================================================
--- trunk/PcAuthorizeExpenses.php 2017-11-07 01:57:00 UTC (rev 7865)
+++ trunk/PcAuthorizeExpenses.php 2017-11-23 22:45:05 UTC (rev 7866)
@@ -55,14 +55,17 @@
if (!isset($Days)) {
$Days = 30;
}
- echo '<input type="hidden" name="SelectedTabs" value="', $SelectedTabs, '" />';
+
+ //Limit expenses history to X days
echo '<table class="selection">
<tr>
- <th colspan="9">', _('Detail of Tab Movements For Last '), ':
+ <td>', _('Detail of Tab Movements For Last '), ':
+ <input type="hidden" name="SelectedTabs" value="', $SelectedTabs, '" />
<input type="text" class="number" name="Days" value="', $Days, '" maxlength="3" size="4" />', _('Days'), '
<input type="submit" name="Go" value="', _('Go'), '" />
- </th>
- </tr>';
+ </td>
+ </tr>
+ </table>';
$SQL = "SELECT pcashdetails.counterindex,
pcashdetails.tabcode,
pcashdetails.tag,
@@ -72,7 +75,6 @@
pcashdetails.authorized,
pcashdetails.posted,
pcashdetails.notes,
- pcashdetails.receipt,
pctabs.glaccountassignment,
pctabs.glaccountpcash,
pctabs.usercode,
@@ -87,17 +89,18 @@
AND pcashdetails.codeexpense<>'ASSIGNCASH'
ORDER BY pcashdetails.date, pcashdetails.counterindex ASC";
$Result = DB_query($SQL);
- echo '<tr>
- <th>', _('Date of Expense'), '</th>
- <th>', _('Expense Code'), '</th>
- <th>', _('Gross Amount'), '</th>
- <th>', _('Tax'), '</th>
- <th>', _('Tax Group'), '</th>
- <th>', _('Tag'), '</th>
- <th>', _('Notes'), '</th>
- <th>', _('Receipt'), '</th>
- <th>', _('Date Authorised'), '</th>
- </tr>';
+ echo '<table class="selection">
+ <tr>
+ <th>', _('Date of Expense'), '</th>
+ <th>', _('Expense Code'), '</th>
+ <th>', _('Gross Amount'), '</th>
+ <th>', _('Tax'), '</th>
+ <th>', _('Tax Group'), '</th>
+ <th>', _('Tag'), '</th>
+ <th>', _('Notes'), '</th>
+ <th>', _('Receipt Attachment'), '</th>
+ <th>', _('Date Authorised'), '</th>
+ </tr>';
$k = 0; //row colour counter
while ($MyRow = DB_fetch_array($Result)) {
$CurrDecimalPlaces = $MyRow['decimalplaces'];
@@ -120,13 +123,13 @@
$NetAmount = ($MyRow['amount'] - $TaxTotalRow['totaltax']) / $MyRow['rate'];
}
if ($MyRow['codeexpense'] == 'ASSIGNCASH') {
- $type = 2;
+ $Type = 2;
$AccountFrom = $MyRow['glaccountassignment'];
$AccountTo = $MyRow['glaccountpcash'];
$TagTo = 0;
$TagDescription = '0 - ' . _('None');
} else {
- $type = 1;
+ $Type = 1;
$NetAmount = -$NetAmount;
$AccountFrom = $MyRow['glaccountpcash'];
$SQLAccExp = "SELECT glaccount,
@@ -141,9 +144,9 @@
}
if (isset($_POST['Submit']) and $_POST['Submit'] == _('Update') and isset($_POST[$MyRow['counterindex']])) {
//get typeno
- $typeno = GetNextTransNo($type,$db);
+ $TypeNo = GetNextTransNo($Type,$db);
//build narrative
- $Narrative = _('PettyCash') . ' - ' . $MyRow['tabcode'] . ' - ' . $MyRow['codeexpense'] . ' - ' . DB_escape_string($MyRow['notes']) . ' - ' . $MyRow['receipt'];
+ $Narrative = _('PettyCash') . ' - ' . $MyRow['tabcode'] . ' - ' . $MyRow['codeexpense'] . ' - ' . DB_escape_string($MyRow['notes']);
//insert to gltrans
DB_Txn_Begin();
$SQLFrom = "INSERT INTO `gltrans` (`counterindex`,
@@ -159,8 +162,8 @@
`jobref`,
`tag`)
VALUES (NULL,
- '" . $type . "',
- '" . $typeno . "',
+ '" . $Type . "',
+ '" . $TypeNo . "',
0,
'" . $MyRow['date'] . "',
'" . $PeriodNo . "',
@@ -184,8 +187,8 @@
`jobref`,
`tag`)
VALUES (NULL,
- '" . $type . "',
- '" . $typeno . "',
+ '" . $Type . "',
+ '" . $TypeNo . "',
0,
'" . $MyRow['date'] . "',
'" . $PeriodNo . "',
@@ -222,8 +225,8 @@
`jobref`,
`tag`)
VALUES (NULL,
- '" . $type . "',
- '" . $typeno . "',
+ '" . $Type . "',
+ '" . $TypeNo . "',
0,
'" . $MyRow['date'] . "',
'" . $PeriodNo . "',
@@ -283,14 +286,6 @@
$k = 1;
}
- /*
- if ($MyRow['posted'] == 0) {
- $Posted = _('No');
- } else {
- $Posted = _('Yes');
- }
- */
-
$SQLDes = "SELECT description
FROM pcexpenses
WHERE codeexpense='" . $MyRow['codeexpense'] . "'";
@@ -320,7 +315,19 @@
$TaxesDescription .= $MyTaxRow['description'] . '<br />';
$TaxesTaxAmount .= locale_number_format($MyTaxRow['amount'], $CurrDecimalPlaces) . '<br />';
}
-
+
+ //Generate download link for expense receipt, or show text if no receipt file is found.
+ $ReceiptSupportedExt = array('png','jpg','jpeg','pdf','doc','docx','xls','xlsx'); //Supported file extensions
+ $ReceiptFileDir = $PathPrefix . 'companies/' . $_SESSION['DatabaseName'] . '/expenses_receipts/' . mb_strtolower($SelectedTabs); //Receipts upload directory
+ $ReceiptFilePathMatched = reset(glob($ReceiptFileDir . '/' . $MyRow['counterindex'] . '.{' . implode(',', $ReceiptSupportedExt) . '}', GLOB_BRACE)); //Find the relevant receipt file for the expense. There should only be one (file type), but limit to one result just in case.
+ if (!empty($ReceiptFilePathMatched)) { //If no receipt file for the expenses is found
+ $ReceiptText = '<a href="' . $ReceiptFilePathMatched . '" download="ExpenseReceipt-' . mb_strtolower($SelectedTabs) . '-[' . $MyRow['date'] . ']-[' . $MyRow['counterindex'] . ']">' . _('Download attachment') . '</a>';
+ } elseif ($ExpenseCodeDes == 'ASSIGNCASH') {
+ $ReceiptText = '';
+ } else {
+ $ReceiptText = _('No attachment');
+ }
+
echo '<td>', ConvertSQLDate($MyRow['date']), '</td>
<td>', $ExpenseCodeDes, '</td>
<td class="number">', locale_number_format($MyRow['amount'], $CurrDecimalPlaces), '</td>
@@ -328,7 +335,7 @@
<td>', $TaxesDescription, '</td>
<td>', $TagDescription, '</td>
<td>', $MyRow['notes'], '</td>
- <td>', $MyRow['receipt'], '</td>';
+ <td>', $ReceiptText, '</td>';
if (isset($_POST[$MyRow['counterindex']])) {
echo '<td>' . ConvertSQLDate(Date('Y-m-d'));
} else {
Modified: trunk/PcClaimExpensesFromTab.php
===================================================================
--- trunk/PcClaimExpensesFromTab.php 2017-11-07 01:57:00 UTC (rev 7865)
+++ trunk/PcClaimExpensesFromTab.php 2017-11-23 22:45:05 UTC (rev 7866)
@@ -28,7 +28,7 @@
unset($Days);
unset($_POST['Amount']);
unset($_POST['Notes']);
- unset($_POST['Receipt']);
+ unset($_FILES['Receipt']);
}
if (isset($_POST['Process'])) {
if ($_POST['SelectedTabs'] == '') {
@@ -42,6 +42,9 @@
$Days = 30;
}
}
+//Define receipt attachment upload functions and variables which are used in various places within script
+$ReceiptSupportedExt = array('png','jpg','jpeg','pdf','doc','docx','xls','xlsx'); //Supported file extensions
+$ReceiptFileDir = $PathPrefix . 'companies/' . $_SESSION['DatabaseName'] . '/expenses_receipts/' . mb_strtolower($SelectedTabs); //Receipts upload directory
if (isset($_POST['submit'])) {
//initialise no input errors assumed initially before we test
$InputError = 0;
@@ -59,14 +62,13 @@
$InputError = 1;
prnMsg(_('The date input is not in the correct format'), 'error');
}
- if (isset($SelectedIndex) and $InputError != 1) {
+ if (isset($SelectedIndex) and $InputError != 1) { //Edit
$SQL = "UPDATE pcashdetails
SET date = '" . FormatDateForSQL($_POST['Date']) . "',
tag = '" . $_POST['Tag'] . "',
codeexpense = '" . $_POST['SelectedExpense'] . "',
amount = '" . -filter_number_format($_POST['Amount']) . "',
- notes = '" . $_POST['Notes'] . "',
- receipt = '" . $_POST['Receipt'] . "'
+ notes = '" . $_POST['Notes'] . "'
WHERE counterindex = '" . $SelectedIndex . "'";
$Msg = _('The expense claim on tab') . ' ' . $SelectedTabs . ' ' . _('has been updated');
$Result = DB_query($SQL);
@@ -85,6 +87,59 @@
$Result = DB_query($SQL);
}
}
+ if (isset($_FILES['Receipt']) and $_FILES['Receipt']['name'] != '') {
+ $UploadOriginalName = $_FILES['Receipt']['name'];
+ $UploadTempName = $_FILES['Receipt']['tmp_name'];
+ $UploadSize = $_FILES['Receipt']['size'];
+ $UploadType = $_FILES['Receipt']['type'];
+ $UploadError = $_FILES['Receipt']['error'];
+ $UploadTheFile = 'Yes'; //Assume all is well to start off with, but check for the worst
+ $ReceiptSupportedMime = array('image/png','image/jpeg','application/pdf','application/msword','application/vnd.openxmlformats-officedocument.wordprocessingml.document','application/vnd.ms-excel','application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'); //list of support mime types, corresponding to the list of support file extensions in $ReceiptSupportedExt
+ if ($UploadSize > ($_SESSION['MaxImageSize'] * 1024)) { //Server-side file size check. This will usually be caught by $UploadError == 2 (MAX_FILE_SIZE), but we must not trust the user.
+ prnMsg(_('The uploaded file exceeds the maximum file size of') . ' ' . $_SESSION['MaxImageSize'] . 'KB', 'warn');
+ $UploadTheFile = 'No';
+ } elseif (!in_array($UploadType, $ReceiptSupportedMime) and $UploadError != 2) { //File type check. If $UploadError == 2, then $UploadType will be empty.
+ prnMsg(_('File type not accepted. Only the following file types can be attached') . ': ' . implode(', ', $ReceiptSupportedExt), 'warn');
+ $UploadTheFile = 'No';
+ } elseif ($UploadError == 1 ) { //upload_max_filesize error check
+ prnMsg(_('The uploaded file exceeds the upload_max_filesize directive in php.ini. Please contact your system administrator.'), 'warn');
+ $UploadTheFile ='No';
+ } elseif ($UploadError == 2 ) { //Client-side file size error check (MAX_FILE_SIZE)
+ prnMsg(_('The uploaded file exceeds the maximum file size of') . ' ' . $_SESSION['MaxImageSize'] . 'KB', 'warn');
+ $UploadTheFile ='No';
+ } elseif ($UploadError == 3 ) { //Partial upload error check
+ prnMsg( _('The uploaded file was only partially uploaded. Please try again.'), 'warn');
+ $UploadTheFile ='No';
+ } elseif ($UploadError == 4 ) { //No file uploaded error check
+ prnMsg( _('No file was uploaded'), 'warn');
+ $UploadTheFile ='No';
+ } elseif ($UploadError == 5 ) { //Undefined error check
+ prnMsg( _('Undefined error'), 'warn');
+ $UploadTheFile ='No';
+ } elseif ($UploadError == 6 ) { //Temp directory error check
+ prnMsg( _('A necessary temporary folder is missing. Please contact your system administrator.'), 'warn');
+ $UploadTheFile ='No';
+ } elseif ($UploadError == 7 ) { //Disk write failure error check
+ prnMsg( _('Cannot write file to disk. Please contact your system administrator.'), 'warn');
+ $UploadTheFile ='No';
+ } elseif ($UploadError == 8 ) { //Upload stopped by PHP extension error check
+ prnMsg( _('The file upload was stopped by a PHP extension. Please contact your system administrator.'), 'warn');
+ $UploadTheFile ='No';
+ }
+ if ($UploadTheFile == 'Yes') { //Passed all the above validation
+ if (!file_exists($ReceiptFileDir)) { //Create the receipts directory if it doesn't already exist
+ mkdir($ReceiptFileDir, 0775, true);
+ }
+ $ReceiptFileExt = pathinfo($UploadOriginalName, PATHINFO_EXTENSION); //Grab the file extension of the uploaded file
+ $ReceiptFileName = $SelectedIndex . '.' . $ReceiptFileExt; //Rename the uploaded file with the expenses index number
+ $ReceiptFilePath = $ReceiptFileDir . '/' . $ReceiptFileName;
+ $ReceiptExistingFiles = glob($ReceiptFileDir . '/' . $SelectedIndex . '.{' . implode(',', $ReceiptSupportedExt) . '}', GLOB_BRACE); //Find all existing receipt files for the expense, in case more than 1 file type is currently in the receipts directory
+ foreach($ReceiptExistingFiles as $ReceiptExistingFile) { // Overwrite existing files, and delete all other file types.
+ unlink($ReceiptExistingFile);
+ };
+ move_uploaded_file($UploadTempName, $ReceiptFilePath); //Move the uploaded file from the temp directory to the receipts directory.
+ }
+ }
prnMsg($Msg, 'success');
} elseif ($InputError != 1) {
// First check the type is not being duplicated
@@ -97,8 +152,7 @@
amount,
authorized,
posted,
- notes,
- receipt)
+ notes)
VALUES (NULL,
'" . $_POST['SelectedTabs'] . "',
'" . $_POST['Tag'] . "',
@@ -107,12 +161,11 @@
'" . -filter_number_format($_POST['Amount']) . "',
0,
0,
- '" . $_POST['Notes'] . "',
- '" . $_POST['Receipt'] . "'
+ '" . $_POST['Notes'] . "'
)";
$Msg = _('The expense claim on tab') . ' ' . $_POST['SelectedTabs'] . ' ' . _('has been created');
$Result = DB_query($SQL);
- $PcCashDetail = DB_Last_Insert_ID($db, 'pcashdetails', 'counterindex');
+ $SelectedIndex = DB_Last_Insert_ID($db, 'pcashdetails', 'counterindex');
foreach ($_POST as $Index => $Value) {
if (substr($Index, 0, 5) == 'index') {
$Index = $Value;
@@ -127,7 +180,7 @@
amount
) VALUES (
NULL,
- '" . $PcCashDetail . "',
+ '" . $SelectedIndex . "',
'" . $_POST['CalculationOrder' . $Index] . "',
'" . $_POST['Description' . $Index] . "',
'" . $_POST['TaxAuthority' . $Index] . "',
@@ -139,6 +192,59 @@
$Result = DB_query($SQL);
}
}
+ if (isset($_FILES['Receipt']) and $_FILES['Receipt']['name'] != '') {
+ $UploadOriginalName = $_FILES['Receipt']['name'];
+ $UploadTempName = $_FILES['Receipt']['tmp_name'];
+ $UploadSize = $_FILES['Receipt']['size'];
+ $UploadType = $_FILES['Receipt']['type'];
+ $UploadError = $_FILES['Receipt']['error'];
+ $UploadTheFile = 'Yes'; //Assume all is well to start off with, but check for the worst
+ $ReceiptSupportedMime = array('image/png','image/jpeg','application/pdf','application/msword','application/vnd.openxmlformats-officedocument.wordprocessingml.document','application/vnd.ms-excel','application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'); //list of support mime types, corresponding to the list of support file extensions in $ReceiptSupportedExt
+ if ($UploadSize > ($_SESSION['MaxImageSize'] * 1024)) { //Server-side file size check. This will usually be caught by $UploadError == 2 (MAX_FILE_SIZE), but we must not trust the user.
+ prnMsg(_('The uploaded file exceeds the maximum file size of') . ' ' . $_SESSION['MaxImageSize'] . 'KB', 'warn');
+ $UploadTheFile = 'No';
+ } elseif (!in_array($UploadType, $ReceiptSupportedMime) and $UploadError != 2) { //File type check. If $UploadError == 2, then $UploadType will be empty.
+ prnMsg(_('File type not accepted. Only the following file types can be attached') . ': ' . implode(', ', $ReceiptSupportedExt), 'warn');
+ $UploadTheFile = 'No';
+ } elseif ($UploadError == 1 ) { //upload_max_filesize error check
+ prnMsg(_('The uploaded file exceeds the upload_max_filesize directive in php.ini. Please contact your system administrator.'), 'warn');
+ $UploadTheFile ='No';
+ } elseif ($UploadError == 2 ) { //Client-side file size error check (MAX_FILE_SIZE)
+ prnMsg(_('The uploaded file exceeds the maximum file size of') . ' ' . $_SESSION['MaxImageSize'] . 'KB', 'warn');
+ $UploadTheFile ='No';
+ } elseif ($UploadError == 3 ) { //Partial upload error check
+ prnMsg( _('The uploaded file was only partially uploaded. Please try again.'), 'warn');
+ $UploadTheFile ='No';
+ } elseif ($UploadError == 4 ) { //No file uploaded error check
+ prnMsg( _('No file was uploaded'), 'warn');
+ $UploadTheFile ='No';
+ } elseif ($UploadError == 5 ) { //Undefined error check
+ prnMsg( _('Undefined error'), 'warn');
+ $UploadTheFile ='No';
+ } elseif ($UploadError == 6 ) { //Temp directory error check
+ prnMsg( _('A necessary temporary folder is missing. Please contact your system administrator.'), 'warn');
+ $UploadTheFile ='No';
+ } elseif ($UploadError == 7 ) { //Disk write failure error check
+ prnMsg( _('Cannot write file to disk. Please contact your system administrator.'), 'warn');
+ $UploadTheFile ='No';
+ } elseif ($UploadError == 8 ) { //Upload stopped by PHP extension error check
+ prnMsg( _('The file upload was stopped by a PHP extension. Please contact your system administrator.'), 'warn');
+ $UploadTheFile ='No';
+ }
+ if ($UploadTheFile == 'Yes') { //Passed all the above validation
+ if (!file_exists($ReceiptFileDir)) { //Create the receipts directory if it doesn't already exist
+ mkdir($ReceiptFileDir, 0775, true);
+ }
+ $ReceiptFileExt = pathinfo($UploadOriginalName, PATHINFO_EXTENSION); //Grab the file extension of the uploaded file
+ $ReceiptFileName = $SelectedIndex . '.' . $ReceiptFileExt; //Rename the uploaded file with the expenses index number
+ $ReceiptFilePath = $ReceiptFileDir . '/' . $ReceiptFileName;
+ $ReceiptExistingFiles = glob($ReceiptFileDir . '/' . $SelectedIndex . '.{' . implode(',', $ReceiptSupportedExt) . '}', GLOB_BRACE); //Find all existing receipt files for the expense, in case more than 1 file type is currently in the receipts directory
+ foreach($ReceiptExistingFiles as $ReceiptExistingFile) { // Overwrite existing files, and delete all other file types.
+ unlink($ReceiptExistingFile);
+ };
+ move_uploaded_file($UploadTempName, $ReceiptFilePath); //Move the uploaded file from the temp directory to the receipts directory.
+ }
+ }
prnMsg($Msg, 'success');
}
if ($InputError != 1) {
@@ -147,9 +253,9 @@
unset($_POST['Tag']);
unset($_POST['Date']);
unset($_POST['Notes']);
- unset($_POST['Receipt']);
+ unset($_FILES['Receipt']);
}
-} elseif (isset($_GET['Delete'])) {
+} elseif (isset($_GET['delete'])) {
$SQL = "DELETE FROM pcashdetails, pcashdetailtaxes
USING pcashdetails
INNER JOIN pcashdetailtaxes
@@ -158,7 +264,12 @@
$ErrMsg = _('Petty Cash Expense record could not be deleted because');
$Result = DB_query($SQL, $ErrMsg);
prnMsg(_('Petty Cash expense record') . ' ' . $SelectedTabs . ' ' . _('has been deleted'), 'success');
- unset($_GET['Delete']);
+ //Delete receipt attachments. There should be only one per expenses, but check for all possible file extensions anyway.
+ $ReceiptExistingFiles = glob($ReceiptFileDir . '/' . $SelectedIndex . '.{' . implode(',', $ReceiptSupportedExt) . '}', GLOB_BRACE); //Find all existing receipt files for the expense, in case more than 1 file type is currently in the receipts directory
+ foreach($ReceiptExistingFiles as $ReceiptExistingFile) {
+ unlink($ReceiptExistingFile);
+ };
+ unset($_GET['delete']);
} //end of get delete
if (!isset($SelectedTabs)) {
/* It could still be the first time the page has been run and a record has been selected for modification - SelectedTabs will exist because it was sent with the new call. If its the first time the page has been displayed with no parameters
@@ -168,7 +279,7 @@
echo '<p class="page_title_text">
<img src="', $RootPath, '/css/', $_SESSION['Theme'], '/images/money_add.png" title="', _('Payment Entry'), '" alt="" />', ' ', $Title, '
</p>';
- echo '<form method="post" action="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'), '">';
+ echo '<form method="post" action="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'), '" enctype="multipart/form-data">';
echo '<input type="hidden" name="FormID" value="', $_SESSION['FormID'], '" />';
echo '<table class="selection">
<tr>
@@ -214,7 +325,7 @@
$Result = DB_query($SQLDecimalPlaces);
$MyRow = DB_fetch_array($Result);
$CurrDecimalPlaces = $MyRow['decimalplaces'];
- echo '<form method="post" action="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'), '">';
+ echo '<form method="post" action="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'), '" enctype="multipart/form-data">';
echo '<input type="hidden" name="FormID" value="', $_SESSION['FormID'], '" />';
echo '<br /><table class="selection">';
echo '<tr>
@@ -222,20 +333,23 @@
<td>' . $SelectedTabs . '</td>
</tr>';
echo '</table>';
+
+ //Limit expenses history to X days
echo '<table class="selection">
<tr>
- <th colspan="9">', _('Detail of Tab Movements For Last '), ':
+ <td>', _('Detail of Tab Movements For Last '), ':
<input type="hidden" name="SelectedTabs" value="' . $SelectedTabs . '" />
<input type="text" class="number" name="Days" value="', $Days, '" required="required" maxlength="3" size="4" /> ', _('Days'), '
<input type="submit" name="Go" value="', _('Go'), '" />
- </th>
- </tr>';
+ </td>
+ </tr>
+ </table>';
if (isset($_POST['Cancel'])) {
unset($_POST['SelectedExpense']);
unset($_POST['Amount']);
unset($_POST['Date']);
unset($_POST['Notes']);
- unset($_POST['Receipt']);
+ unset($_FILES['Receipt']);
}
$SQL = "SELECT counterindex,
tabcode,
@@ -245,8 +359,7 @@
amount,
authorized,
posted,
- notes,
- receipt
+ notes
FROM pcashdetails
WHERE tabcode='" . $SelectedTabs . "'
AND date >=DATE_SUB(CURDATE(), INTERVAL " . $Days . " DAY)
@@ -253,17 +366,18 @@
ORDER BY date,
counterindex ASC";
$Result = DB_query($SQL);
- echo '<tr>
- <th>', _('Date of Expense'), '</th>
- <th>', _('Expense Code'), '</th>
- <th>', _('Gross Amount'), '</th>
- <th>', _('Tax'), '</th>
- <th>', _('Tax Group'), '</th>
- <th>', _('Tag'), '</th>
- <th>', _('Notes'), '</th>
- <th>', _('Receipt'), '</th>
- <th>', _('Date Authorised'), '</th>
- </tr>';
+ echo '<table class="selection">
+ <tr>
+ <th>', _('Date of Expense'), '</th>
+ <th>', _('Expense Code'), '</th>
+ <th>', _('Gross Amount'), '</th>
+ <th>', _('Tax'), '</th>
+ <th>', _('Tax Group'), '</th>
+ <th>', _('Tag'), '</th>
+ <th>', _('Notes'), '</th>
+ <th>', _('Receipt Attachment'), '</th>
+ <th>', _('Date Authorised'), '</th>
+ </tr>';
$k = 0; //row colour counter
while ($MyRow = DB_fetch_array($Result)) {
if ($k == 1) {
@@ -291,6 +405,16 @@
$AuthorisedDate = ConvertSQLDate($MyRow['authorized']);
}
+ //Generate download link for expense receipt, or show text if no receipt file is found.
+ $ReceiptFilePathMatched = reset(glob($ReceiptFileDir . '/' . $MyRow['counterindex'] . '.{' . implode(',', $ReceiptSupportedExt) . '}', GLOB_BRACE)); //Find the relevant receipt file for the expense. There should only be one (file type), but limit to one result just in case.
+ if (!empty($ReceiptFilePathMatched)) { //If no receipt file for the expenses is found
+ $ReceiptText = '<a href="' . $ReceiptFilePathMatched . '" download="ExpenseReceipt-' . mb_strtolower($SelectedTabs) . '-[' . $MyRow['date'] . ']-[' . $MyRow['counterindex'] . ']">' . _('Download attachment') . '</a>';
+ } elseif ($ExpenseCodeDes == 'ASSIGNCASH') {
+ $ReceiptText = '';
+ } else {
+ $ReceiptText = _('No attachment');
+ }
+
$TagSQL = "SELECT tagdescription FROM tags WHERE tagref='" . $MyRow['tag'] . "'";
$TagResult = DB_query($TagSQL);
$TagRow = DB_fetch_array($TagResult);
@@ -298,8 +422,12 @@
$TagRow['tagdescription'] = _('None');
}
$TagTo = $MyRow['tag'];
- $TagDescription = $TagTo . ' - ' . $TagRow['tagdescription'];
-
+ if ($ExpenseCodeDes == 'ASSIGNCASH') {
+ $TagDescription = '';
+ } else {
+ $TagDescription = $TagTo . ' - ' . $TagRow['tagdescription'];
+ }
+
$TaxesDescription = '';
$TaxesTaxAmount = '';
$TaxSQL = "SELECT counterindex,
@@ -318,32 +446,32 @@
$TaxesDescription .= $MyTaxRow['description'] . '<br />';
$TaxesTaxAmount .= locale_number_format($MyTaxRow['amount'], $CurrDecimalPlaces) . '<br />';
}
- if (($MyRow['authorized'] == '0000-00-00') and ($ExpenseCodeDes != 'ASSIGNCASH')) {
- // only movements NOT authorised can be modified or deleted
- echo '<td>', ConvertSQLDate($MyRow['date']), '</td>
- <td>', $ExpenseCodeDes, '</td>
- <td class="number">', locale_number_format($MyRow['amount'], $CurrDecimalPlaces), '</td>
- <td class="number">', $TaxesTaxAmount, '</td>
- <td>', $TaxesDescription, '</td>
- <td>', $TagDescription, '</td>
- <td>', $MyRow['notes'], '</td>
- <td>', $MyRow['receipt'], '</td>
- <td>', $AuthorisedDate, '</td>
- <td><a href="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?SelectedIndex=', $MyRow['counterindex'], '&SelectedTabs=' . $SelectedTabs . '&Days=' . $Days . '&edit=yes">' . _('Edit') . '</a></td>
- <td><a href="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?SelectedIndex=', $MyRow['counterindex'], '&SelectedTabs=' . $SelectedTabs . '&Days=' . $Days . '&Delete=yes" onclick=\'return confirm("' . _('Are you sure you wish to delete this expense?') . '");\'>' . _('Delete') . '</a></td>
- </tr>';
- } else {
- echo '<td>', ConvertSQLDate($MyRow['date']), '</td>
- <td>', $ExpenseCodeDes, '</td>
- <td class="number">', locale_number_format($MyRow['amount'], $CurrDecimalPlaces), '</td>
- <td class="number">', $TaxesTaxAmount, '</td>
- <td>', $TaxesDescription, '</td>
- <td>', $MyRow['tag'], ' - ', $TagRow['tagdescription'], '</td>
- <td>', $MyRow['notes'], '</td>
- <td>', $MyRow['receipt'], '</td>
- <td>', $AuthorisedDate, '</td>
- </tr>';
- }
+ if (($MyRow['authorized'] == '0000-00-00') and ($ExpenseCodeDes != 'ASSIGNCASH')) {
+ // only movements NOT authorised can be modified or deleted
+ echo '<td>', ConvertSQLDate($MyRow['date']), '</td>
+ <td>', $ExpenseCodeDes, '</td>
+ <td class="number">', locale_number_format($MyRow['amount'], $CurrDecimalPlaces), '</td>
+ <td class="number">', $TaxesTaxAmount, '</td>
+ <td>', $TaxesDescription, '</td>
+ <td>', $TagDescription, '</td>
+ <td>', $MyRow['notes'], '</td>
+ <td>', $ReceiptText, '</td>
+ <td>', $AuthorisedDate, '</td>
+ <td><a href="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?SelectedIndex=', $MyRow['counterindex'], '&SelectedTabs=' . $SelectedTabs . '&Days=' . $Days . '&edit=yes">' . _('Edit') . '</a></td>
+ <td><a href="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?SelectedIndex=', $MyRow['counterindex'], '&SelectedTabs=' . $SelectedTabs . '&Days=' . $Days . '&delete=yes" onclick=\'return confirm("' . _('Are you sure you wish to delete this expense?') . '");\'>' . _('Delete') . '</a></td>
+ </tr>';
+ } else {
+ echo '<td>', ConvertSQLDate($MyRow['date']), '</td>
+ <td>', $ExpenseCodeDes, '</td>
+ <td class="number">', locale_number_format($MyRow['amount'], $CurrDecimalPlaces), '</td>
+ <td class="number">', $TaxesTaxAmount, '</td>
+ <td>', $TaxesDescription, '</td>
+ <td>', $TagDescription, '</td>
+ <td>', $MyRow['notes'], '</td>
+ <td>', $ReceiptText, '</td>
+ <td>', $AuthorisedDate, '</td>
+ </tr>';
+ }
}
//END WHILE LIST LOOP
$SQLAmount = "SELECT sum(amount)
@@ -361,8 +489,8 @@
echo '</table>';
echo '</form>';
}
- if (!isset($_GET['Delete'])) {
- echo '<form method="post" action="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'), '">';
+ if (!isset($_GET['delete'])) {
+ echo '<form method="post" action="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'), '" enctype="multipart/form-data">';
echo '<input type="hidden" name="FormID" value="', $_SESSION['FormID'], '" />';
if (isset($_GET['edit'])) {
$SQL = "SELECT counterindex,
@@ -373,10 +501,9 @@
amount,
authorized,
posted,
- notes,
- receipt
- FROM pcashdetails
- WHERE counterindex='" . $SelectedIndex . "'";
+ notes
+ FROM pcashdetails
+ WHERE counterindex='" . $SelectedIndex . "'";
$Result = DB_query($SQL);
$MyRow = DB_fetch_array($Result);
$_POST['Date'] = ConvertSQLDate($MyRow['date']);
@@ -384,7 +511,6 @@
$_POST['Amount'] = -$MyRow['amount'];
$_POST['Notes'] = $MyRow['notes'];
$_POST['Tag'] = $MyRow['tag'];
- $_POST['Receipt'] = $MyRow['receipt'];
echo '<input type="hidden" name="SelectedTabs" value="', $SelectedTabs, '" />';
echo '<input type="hidden" name="SelectedIndex" value="', $SelectedIndex, '" />';
echo '<input type="hidden" name="Days" value="', $Days, '" />';
@@ -409,7 +535,7 @@
</td>
</tr>
<tr>
- <td>', _('Code of Expense'), ':</td>
+ <td>', _('Expense Code'), ':</td>
<td>
<select required="required" name="SelectedExpense">';
DB_free_result($Result);
@@ -434,30 +560,6 @@
echo '</select>
</td>
</tr>';
- //Select the tag
- echo '<tr>
- <td>', _('Tag'), ':</td>
- <td><select name="Tag">';
- $SQL = "SELECT tagref,
- tagdescription
- FROM tags
- ORDER BY tagref";
- $Result = DB_query($SQL);
- if (!isset($_POST['Tag'])) {
- $_POST['Tag'] = $DefaultTag;
- }
- echo '<option value="0">0 - ', _('None'), '</option>';
- while ($MyRow = DB_fetch_array($Result)) {
- if ($_POST['Tag'] == $MyRow['tagref']) {
- echo '<option selected="selected" value="', $MyRow['tagref'], '">', $MyRow['tagref'], ' - ', $MyRow['tagdescription'], '</option>';
- } else {
- echo '<option value="', $MyRow['tagref'], '">', $MyRow['tagref'], ' - ', $MyRow['tagdescription'], '</option>';
- }
- }
- echo '</select>
- </td>
- </tr>';
- // End select tag
if (!isset($_POST['Amount'])) {
$_POST['Amount'] = 0;
}
@@ -522,12 +624,50 @@
echo '<input type="hidden" name="TaxOnTax', $i, '" value="', $MyTaxRow['taxontax'], '" />';
echo '<input type="hidden" name="TaxRate', $i, '" value="', $MyTaxRow['taxrate'], '" />';
echo '<tr>
- <td>', $MyTaxRow['description'], ' - ', ($MyTaxRow['taxrate'] * 100), '%</td>
+ <td>', $MyTaxRow['description'], ' - ', ($MyTaxRow['taxrate'] * 100), '%:</td>
<td><input type="text" class="number" size="12" name="TaxAmount', $i, '" value="0" /></td>
</tr>';
++$i;
}
}
+
+ //Select the tag
+ echo '<tr>
+ <td>', _('Tag'), ':</td>
+ <td><select name="Tag">';
+ $SQL = "SELECT tagref,
+ tagdescription
+ FROM tags
+ ORDER BY tagref";
+ $Result = DB_query($SQL);
+ if (!isset($_POST['Tag'])) {
+ $_POST['Tag'] = $DefaultTag;
+ }
+ echo '<option value="0">0 - ', _('None'), '</option>';
+ while ($MyRow = DB_fetch_array($Result)) {
+ if ($_POST['Tag'] == $MyRow['tagref']) {
+ echo '<option selected="selected" value="', $MyRow['tagref'], '">', $MyRow['tagref'], ' - ', $MyRow['tagdescription'], '</option>';
+ } else {
+ echo '<option value="', $MyRow['tagref'], '">', $MyRow['tagref'], ' - ', $MyRow['tagdescription'], '</option>';
+ }
+ }
+ echo '</select>
+ </td>
+ </tr>';
+ // End select tag
+
+ //For the accept attribute of the file element, prefix dots to the front of each supported file extension.
+ $ReceiptSupportedExtDotPrefix = array_map(function($ReceiptSupportedExt) {
+ return '.' . $ReceiptSupportedExt;
+ }, $ReceiptSupportedExt);
+ echo '<tr>
+ <td>', _('Attach Receipt'), ':</td>
+ <td>
+ <input type="hidden" name="MAX_FILE_SIZE" value="' . $_SESSION['MaxImageSize'] * 1024 . '" />
+ <input type="file" name="Receipt" id="Receipt" accept="' . implode(',', $ReceiptSupportedExtDotPrefix) . '" title="', _('Accepted file types'), ': ', implode(', ', $ReceiptSupportedExt), '" />
+ </td>
+ </tr>';
+
if (!isset($_POST['Notes'])) {
$_POST['Notes'] = '';
}
@@ -537,13 +677,7 @@
<input type="text" name="Notes" size="50" maxlength="49" value="', $_POST['Notes'], '" />
</td>
</tr>';
- if (!isset($_POST['Receipt'])) {
- $_POST['Receipt'] = '';
- }
- echo '<tr>
- <td>', _('Receipt'), ':</td>
- <td><input type="text" name="Receipt" size="50" maxlength="49" value="', $_POST['Receipt'], '" /></td>
- </tr>';
+
echo '</table>'; // close main table
echo '<input type="hidden" name="SelectedTabs" value="', $SelectedTabs, '" />';
echo '<input type="hidden" name="Days" value="', $Days, '" />';
Modified: trunk/PcExpenses.php
===================================================================
--- trunk/PcExpenses.php 2017-11-07 01:57:00 UTC (rev 7865)
+++ trunk/PcExpenses.php 2017-11-23 22:45:05 UTC (rev 7866)
@@ -36,16 +36,16 @@
prnMsg(_('The Expense type code cannot be an empty string or spaces'), 'error');
} elseif (mb_strlen($_POST['CodeExpense']) > 20) {
$InputError = 1;
- prnMsg(_('The Expense code must be twenty characters or less long'), 'error');
+ prnMsg(_('The expense code must be twenty characters or less long'), 'error');
} elseif (ContainsIllegalCharacters($_POST['CodeExpense'])) {
$InputError = 1;
- prnMsg(_('The Expense code cannot contain any of the following characters " \' - &'), 'error');
+ prnMsg(_('The expense code cannot contain any of the following characters ') . '" \' - &', 'error');
} elseif (ContainsIllegalCharacters($_POST['Description'])) {
$InputError = 1;
- prnMsg(_('The Expense description cannot contain any of the following characters " \' - &'), 'error');
+ prnMsg(_('The expense description cannot contain any of the following characters ') . '" \' - &', 'error');
} elseif (mb_strlen($_POST['Description']) > 50) {
$InputError = 1;
- prnMsg(_('The tab code must be Fifty characters or less long'), 'error');
+ prnMsg(_('The tab code must be fifty characters or less long'), 'error');
} elseif (mb_strlen($_POST['Description']) == 0) {
$InputError = 1;
echo prnMsg(_('The tab code description must be entered'), 'error');
@@ -139,7 +139,7 @@
$Result = DB_query($SQL);
echo '<table class="selection">
<tr>
- <th>', _('Code Of Expense'), '</th>
+ <th>', _('Expense Code'), '</th>
<th>', _('Description'), '</th>
<th>', _('Account Code'), '</th>
<th>', _('Account Description'), '</th>
@@ -213,7 +213,7 @@
// We dont allow the user to change an existing type code
echo '<table class="selection">
<tr>
- <td>', _('Code Of Expense'), ':</td>
+ <td>', _('Expense Code'), ':</td>
<td>', $_POST['CodeExpense'], '</td>
</tr>';
} else {
@@ -220,7 +220,7 @@
// This is a new type so the user may volunteer a type code
echo '<table class="selection">
<tr>
- <td>', _('Code Of Expense'), ':</td>
+ <td>', _('Expense Code'), ':</td>
<td><input type="text" name="CodeExpense" autofocus="autofocus" required="required" maxlength="20" /></td>
</tr>';
}
Modified: trunk/PcReportExpense.php
===================================================================
--- trunk/PcReportExpense.php 2017-11-07 01:57:00 UTC (rev 7865)
+++ trunk/PcReportExpense.php 2017-11-23 22:45:05 UTC (rev 7866)
@@ -3,6 +3,7 @@
include ('includes/session.php');
$Title = _('Petty Cash Expense Management Report');
+/* webERP manual links before header.php */
$ViewTopic = 'PettyCash';
$BookMark = 'PcReportExpense';
@@ -115,7 +116,6 @@
pcashdetails.authorized,
pcashdetails.posted,
pcashdetails.notes,
- pcashdetails.receipt,
pctabs.currency,
currencies.decimalplaces
FROM pcashdetails, pctabs, currencies
@@ -139,11 +139,10 @@
<th>' . _('Tab') . '</th>
<th>' . _('Currency') . '</th>
<th>' . _('Gross Amount') . '</th>
- <th>', _('Total Tax'), '</th>
+ <th>', _('Tax'), '</th>
<th>', _('Tax Group'), '</th>
<th>', _('Tag'), '</th>
<th>' . _('Notes') . '</th>
- <th>' . _('Receipt') . '</th>
<th>' . _('Date Authorised') . '</th>
</tr>';
@@ -186,7 +185,7 @@
$TagDescription = $TagTo . ' - ' . $TagRow['tagdescription'];
if ($MyRow['authorized'] == '0000-00-00') {
- $AuthorisedDate = _('Unauthorised');
+ $AuthorisedDate = _('Unauthorised');
} else {
$AuthorisedDate = ConvertSQLDate($MyRow['authorized']);
}
@@ -207,7 +206,6 @@
<td>', $TaxesDescription, '</td>
<td>', $TagDescription, '</td>
<td>', $MyRow['notes'], '</td>
- <td>', $MyRow['receipt'], '</td>
<td>', $AuthorisedDate, '</td>
</tr>';
} //end of looping
Modified: trunk/PcReportTab.php
===================================================================
--- trunk/PcReportTab.php 2017-11-07 01:57:00 UTC (rev 7865)
+++ trunk/PcReportTab.php 2017-11-23 22:45:05 UTC (rev 7866)
@@ -3,12 +3,12 @@
include ('includes/session.php');
$Title = _('Petty Cash Management Report');
+/* webERP manual links before header.php */
$ViewTopic = 'PettyCash';
$BookMark = 'PcReportTab';
include ('includes/SQL_CommonFunctions.inc');
-
if (isset($_POST['SelectedTabs'])){
$SelectedTabs = mb_strtoupper($_POST['SelectedTabs']);
} elseif (isset($_GET['SelectedTabs'])){
@@ -41,21 +41,19 @@
<td><select name="SelectedTabs">';
$SQL = "SELECT tabcode
- FROM pctabs
- WHERE ( authorizer = '" . $_SESSION['UserID'] .
- "' OR usercode = '" . $_SESSION['UserID'].
- "' OR assigner = '" . $_SESSION['UserID'] . "' )
- ORDER BY tabcode";
+ FROM pctabs
+ WHERE ( authorizer = '" . $_SESSION['UserID'] .
+ "' OR usercode = '" . $_SESSION['UserID'].
+ "' OR assigner = '" . $_SESSION['UserID'] . "' )
+ ORDER BY tabcode";
$Result = DB_query($SQL);
while ($MyRow = DB_fetch_array($Result)) {
if (isset($_POST['SelectedTabs']) and $MyRow['tabcode'] == $_POST['SelectedTabs']) {
- echo '<option selected="selected" value="';
+ echo '<option selected="selected" value="', $MyRow['tabcode'], '">', $MyRow['tabcode'], '</option>';
} else {
- echo '<option value="';
+ echo '<option value="', $MyRow['tabcode'], '">', $MyRow['tabcode'], '</option>';
}
- echo $MyRow['tabcode'] . '">' . $MyRow['tabcode'] . '</option>';
-
} //end while loop get type of tab
DB_free_result($Result);
@@ -100,8 +98,7 @@
amount,
authorized,
posted,
- notes,
- receipt
+ notes
FROM pcashdetails
WHERE tabcode = '" . $SelectedTabs . "'
AND date >= '" . $SQLFromDate . "' AND date <= '" . $SQLToDate . "'
@@ -219,11 +216,10 @@
$LeftOvers = $pdf->addTextWrap($Left_Margin,$YPos,70,$FontSize,_('Date of Expense'));
$LeftOvers = $pdf->addTextWrap($Left_Margin+60,$YPos,100,$FontSize,_('Expense Code'));
$LeftOvers = $pdf->addTextWrap($Left_Margin+160,$YPos,100,$FontSize,_('Gross Amount'));
- $LeftOvers = $pdf->addTextWrap($Left_Margin+210,$YPos,100,$FontSize,_('Total Tax'));
- $LeftOvers = $pdf->addTextWrap($Left_Margin+245,$YPos,100,$FontSize,_('Tax Group'));
- $LeftOvers = $pdf->addTextWrap($Left_Margin+285,$YPos,100,$FontSize,_('Tag'));
- $LeftOvers = $pdf->addTextWrap($Left_Margin+330,$YPos,100,$FontSize,_('Note'));
- $LeftOvers = $pdf->addTextWrap($Left_Margin+395,$YPos,100,$FontSize,_('Receipt'));
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+210,$YPos,100,$FontSize,_('Tax'));
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+255,$YPos,100,$FontSize,_('Tax Group'));
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+320,$YPos,100,$FontSize,_('Tag'));
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+380,$YPos,100,$FontSize,_('Notes'));
$LeftOvers = $pdf->addTextWrap($Left_Margin+465,$YPos,100,$FontSize,_('Date Authorised'));
$YPos -= (2 * $line_height);
@@ -264,10 +260,20 @@
$TaxResult = DB_query($TaxSQL);
while ($MyTaxRow = DB_fetch_array($TaxResult)) {
- $TaxesDescription .= $MyTaxRow['description'];
- $TaxesTaxAmount .= locale_number_format($MyTaxRow['amount'], $CurrDecimalPlaces);
+ $TaxesDescription .= $MyTaxRow['description'] . "\n"; //Line breaks not working !?
+ $TaxesTaxAmount .= locale_number_format($MyTaxRow['amount'], $CurrDecimalPlaces) . "\n"; //Line breaks not working !?
}
+ //Generate download link for expense receipt, or show text if no receipt file is found.
+ $ReceiptSupportedExt = array('png','jpg','jpeg','pdf','doc','docx','xls','xlsx'); //Supported file extensions
+ $ReceiptFileDir = $PathPrefix . 'companies/' . $_SESSION['DatabaseName'] . '/expenses_receipts/' . mb_strtolower($SelectedTabs); //Receipts upload directory
+ $ReceiptFilePath = reset(glob($ReceiptFileDir . '/' . $MyRow['counterindex'] . '.{' . implode(',', $ReceiptSupportedExt) . '}', GLOB_BRACE)); //Find the relevant receipt file for the expense. There should only be one (file type), but limit to one result just in case.
+ if (empty($ReceiptFilePath)) { //If no receipt file for the expenses is found
+ $ReceiptText = _('No attachment');
+ } else {
+ $ReceiptText = '<a href="' . $ReceiptFilePath . '" download="ExpenseReceipt-' . mb_strtolower($SelectedTabs) . '-[' . $MyRow['date'] . ']-[' . $MyRow['counterindex'] . ']">' . _('Download attachment') . '</a>';
+ }
+
if ($MyRow['authorized'] == '0000-00-00') {
$AuthorisedDate = _('Unauthorised');
} else {
@@ -279,10 +285,9 @@
$LeftOvers = $pdf->addTextWrap($Left_Margin+60,$YPos,130,$FontSize,$Description[0]);
$LeftOvers = $pdf->addTextWrap($Left_Margin+160,$YPos,50,$FontSize,locale_number_format($MyRow['amount'], $CurrDecimalPlaces),'right');
$LeftOvers = $pdf->addTextWrap($Left_Margin+210,$YPos,50,$FontSize,$TaxesTaxAmount);
- $LeftOvers = $pdf->addTextWrap($Left_Margin+245,$YPos,50,$FontSize,$TaxesDescription);
- $LeftOvers = $pdf->addTextWrap($Left_Margin+285,$YPos,50,$FontSize,$TagDescription);
- $LeftOvers = $pdf->addTextWrap($Left_Margin+330,$YPos,60,$FontSize,$MyRow['notes']);
- $LeftOvers = $pdf->addTextWrap($Left_Margin+395,$YPos,65,$FontSize,$MyRow['receipt']);
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+255,$YPos,50,$FontSize,$TaxesDescription);
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+320,$YPos,50,$FontSize,$TagDescription);
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+380,$YPos,60,$FontSize,$MyRow['notes']);
$LeftOvers = $pdf->addTextWrap($Left_Margin+465,$YPos,70,$FontSize,$AuthorisedDate);
$YPos -= $line_height;
@@ -445,8 +450,7 @@
amount,
authorized,
posted,
- notes,
- receipt
+ notes
FROM pcashdetails
WHERE tabcode = '" . $SelectedTabs . "'
AND date >= '" . $SQLFromDate . "'
@@ -462,11 +466,11 @@
<th>' . _('Date of Expense') . '</th>
<th>' . _('Expense Code') . '</th>
<th>' . _('Gross Amount') . '</th>
- <th>' . _('Total Tax') . '</th>
+ <th>' . _('Tax') . '</th>
<th>' . _('Tax Group') . '</th>
<th>' . _('Tag') . '</th>
<th>' . _('Notes') . '</th>
- <th>' . _('Receipt') . '</th>
+ <th>' . _('Receipt Attachment') . '</th>
<th>' . _('Date Authorised') . '</th>
</tr>';
@@ -510,6 +514,16 @@
$TaxesTaxAmount .= locale_number_format($MyTaxRow['amount'], $CurrDecimalPlaces) . '<br />';
}
+ //Generate download link for expense receipt, or show text if no receipt file is found.
+ $ReceiptSupportedExt = array('png','jpg','jpeg','pdf','doc','docx','xls','xlsx'); //Supported file extensions
+ $ReceiptFileDir = $PathPrefix . 'companies/' . $_SESSION['DatabaseName'] . '/expenses_receipts/' . mb_strtolower($SelectedTabs); //Receipts upload directory
+ $ReceiptFilePath = reset(glob($ReceiptFileDir . '/' . $MyRow['counterindex'] . '.{' . implode(',', $ReceiptSupportedExt) . '}', GLOB_BRACE)); //Find the relevant receipt file for the expense. There should only be one (file type), but limit to one result just in case.
+ if (empty($ReceiptFilePath)) { //If no receipt file for the expenses is found
+ $ReceiptText = _('No attachment');
+ } else {
+ $ReceiptText = '<a href="' . $ReceiptFilePath . '" download="ExpenseReceipt-' . mb_strtolower($SelectedTabs) . '-[' . $MyRow['date'] . ']-[' . $MyRow['counterindex'] . ']">' . _('Download attachment') . '</a>';
+ }
+
if ($MyRow['authorized'] == '0000-00-00') {
$AuthorisedDate =...
[truncated message content] |
|
From: <dai...@us...> - 2017-10-20 06:14:33
|
Revision: 7860
http://sourceforge.net/p/web-erp/reponame/7860
Author: daintree
Date: 2017-10-20 06:14:30 +0000 (Fri, 20 Oct 2017)
Log Message:
-----------
Fix callback function ref as string
Modified Paths:
--------------
trunk/includes/PDFQuotationPageHeader.inc
Modified: trunk/includes/PDFQuotationPageHeader.inc
===================================================================
--- trunk/includes/PDFQuotationPageHeader.inc 2017-10-17 22:06:48 UTC (rev 7859)
+++ trunk/includes/PDFQuotationPageHeader.inc 2017-10-20 06:14:30 UTC (rev 7860)
@@ -52,7 +52,7 @@
$XPos = 46;
$YPos = 566;
$FontSize=14;
-$myrow = array_map(html_entity_decode, $myrow);
+$myrow = array_map('html_entity_decode', $myrow);
$line_height = 15;
$pdf->addText($XPos, $YPos, $FontSize, _('Delivery To').':' );
$pdf->addText($XPos, $YPos-$line_height*1, $FontSize, $myrow['deliverto']);
|
|
From: <afc...@us...> - 2017-10-17 22:06:51
|
Revision: 7859
http://sourceforge.net/p/web-erp/reponame/7859
Author: afcouling
Date: 2017-10-17 22:06:48 +0000 (Tue, 17 Oct 2017)
Log Message:
-----------
Removed reference to css class 'toplink' in CustomerInquiry.php and CustomerAccount.php.
Modified Paths:
--------------
trunk/CustomerAccount.php
trunk/CustomerInquiry.php
trunk/doc/Change.log
Modified: trunk/CustomerAccount.php
===================================================================
--- trunk/CustomerAccount.php 2017-10-17 08:02:49 UTC (rev 7858)
+++ trunk/CustomerAccount.php 2017-10-17 22:06:48 UTC (rev 7859)
@@ -212,7 +212,7 @@
$CustomerRecord = DB_fetch_array($CustomerResult);
-echo '<div class="noprint toplink">
+echo '<div class="noprint centre">
<a href="', $RootPath, '/SelectCustomer.php">', _('Back to Customer Screen'), '</a>
</div>';
Modified: trunk/CustomerInquiry.php
===================================================================
--- trunk/CustomerInquiry.php 2017-10-17 08:02:49 UTC (rev 7858)
+++ trunk/CustomerInquiry.php 2017-10-17 22:06:48 UTC (rev 7859)
@@ -154,7 +154,7 @@
$CustomerRecord['overdue2'] = 0;
}
-echo '<div class="toplink">
+echo '<div class="noprint center">
<a href="', $RootPath, '/SelectCustomer.php">', _('Back to Customer Screen'), '</a>
</div>';
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2017-10-17 08:02:49 UTC (rev 7858)
+++ trunk/doc/Change.log 2017-10-17 22:06:48 UTC (rev 7859)
@@ -1,5 +1,6 @@
webERP Change Log
+17/10/17 Andy Couling: Removed reference to css class 'toplink' in CustomerInquiry.php and CustomerAccount.php.
17/10/17 Phil: Fix InventoryPlanning.php and includes/PDFInventoryPlanPageHeader.inc to display categories selected and fix month headings displayed
15/10/17 Andy Couling: New Expenses/Update Expense table header in PcClaimExpensesFromTab.php
15/10/17 Andy Couling: Fixed the edit/delete cash assignment functionality in PcAssignCashToTab.php
@@ -7,8 +8,7 @@
15/10/17 Andy Couling: Fixed expense deletion dialogue box in PcClaimExpensesFromTab.php.
15/10/17 Andy Couling: Missing $Id comments added to Petty Cash scripts.
17/10/12 Exson: Fixed the bug that Narrative information will loss when add or remove controlled items lot no in StockAdjustments.php.
-17/10/11 RChacon: If it is set the $_SESSION['ShowPageHelp'] parameter AND it is FALSE, hides the page help text (simplifies code using css
-).
+17/10/11 RChacon: If it is set the $_SESSION['ShowPageHelp'] parameter AND it is FALSE, hides the page help text (simplifies code using css).
17/10/11 RChacon: Set decimals variable for exchange rate in Currencies.php.
17/10/11 RChacon: Improve currency showing and set decimals variable for exchange rate in Payments.php.
17/10/11 Exson: Fix the indian_number_format bug in MiscFunctions.php.
|
|
From: <dai...@us...> - 2017-10-17 08:02:51
|
Revision: 7858
http://sourceforge.net/p/web-erp/reponame/7858
Author: daintree
Date: 2017-10-17 08:02:49 +0000 (Tue, 17 Oct 2017)
Log Message:
-----------
Phil:Fix InventoryPlanning report
Modified Paths:
--------------
trunk/InventoryPlanning.php
trunk/doc/Change.log
trunk/includes/PDFInventoryPlanPageHeader.inc
Modified: trunk/InventoryPlanning.php
===================================================================
--- trunk/InventoryPlanning.php 2017-10-15 23:18:52 UTC (rev 7857)
+++ trunk/InventoryPlanning.php 2017-10-17 08:02:49 UTC (rev 7858)
@@ -106,13 +106,14 @@
include('includes/footer.php');
exit;
}
- $Period_0_Name = GetMonthText(mktime(0,0,0,Date('m'),Date('d'),Date('Y')));
- $Period_1_Name = GetMonthText(mktime(0,0,0,Date('m')-1,Date('d'),Date('Y')));
- $Period_2_Name = GetMonthText(mktime(0,0,0,Date('m')-2,Date('d'),Date('Y')));
- $Period_3_Name = GetMonthText(mktime(0,0,0,Date('m')-3,Date('d'),Date('Y')));
- $Period_4_Name = GetMonthText(mktime(0,0,0,Date('m')-4,Date('d'),Date('Y')));
- $Period_5_Name = GetMonthText(mktime(0,0,0,Date('m')-5,Date('d'),Date('Y')));
+ $Period_0_Name = GetMonthText(date('m', mktime(0,0,0,Date('m'),Date('d'),Date('Y'))));
+ $Period_1_Name = GetMonthText(date('m', mktime(0,0,0,Date('m')-1,Date('d'),Date('Y'))));
+ $Period_2_Name = GetMonthText(date('m', mktime(0,0,0,Date('m')-2,Date('d'),Date('Y'))));
+ $Period_3_Name = GetMonthText(date('m', mktime(0,0,0,Date('m')-3,Date('d'),Date('Y'))));
+ $Period_4_Name = GetMonthText(date('m', mktime(0,0,0,Date('m')-4,Date('d'),Date('Y'))));
+ $Period_5_Name = GetMonthText(date('m', mktime(0,0,0,Date('m')-5,Date('d'),Date('Y'))));
+
include ('includes/PDFInventoryPlanPageHeader.inc');
$Category = '';
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2017-10-15 23:18:52 UTC (rev 7857)
+++ trunk/doc/Change.log 2017-10-17 08:02:49 UTC (rev 7858)
@@ -1,4 +1,6 @@
webERP Change Log
+
+17/10/17 Phil: Fix InventoryPlanning.php and includes/PDFInventoryPlanPageHeader.inc to display categories selected and fix month headings displayed
15/10/17 Andy Couling: New Expenses/Update Expense table header in PcClaimExpensesFromTab.php
15/10/17 Andy Couling: Fixed the edit/delete cash assignment functionality in PcAssignCashToTab.php
15/10/17 Andy Couling: Table header labels corrected in PcClaimExpensesFromTab.php and PcAuthorizeExpenses.php.
@@ -10,13 +12,13 @@
17/10/11 RChacon: Set decimals variable for exchange rate in Currencies.php.
17/10/11 RChacon: Improve currency showing and set decimals variable for exchange rate in Payments.php.
17/10/11 Exson: Fix the indian_number_format bug in MiscFunctions.php.
-17/10/09 Exson: Fixed the non-balance bug in CustomerReceipt.php. And fixed the non rollback problem when there is a non-balance existed. Fixed error noises.
+17/10/09 Exson: Fixed the non-balance bug in CustomerReceipt.php. And fixed the non rollback problem when there is a non-balance existed. Fixed error noises.
17/10/03 Exson: Add html view to SuppPriceList.php.
01/10/26 RChacon: Standardise and add icons for usability.
27/09/26 RChacon: Increases accuracy in coordinates.
17/09/26 Exson: Fixed the wrong price retrieved bug in PO_Header.php.
17/09/26 Exson: Fixed the vendor price bug to ensure only the effective price showed by suppliers in SelectProduct.php.
-17/09/20 Exson: Fixed the bug to make GRN reverse workable.
+17/09/20 Exson: Fixed the bug to make GRN reverse workable.
17/09/19 Exson: Fixed customer information missing in CustomerReceipt.php. Reported by Steven Fu.
18/9/2017 Tim (committed by Andy): Geocode bug fixes. http://www.weberp.org/forum/showthread.php?tid=4380
17/9/17 VortecCPI: SelectProduct.php made image dispay code match that used in WorkOrderEntry.php
Modified: trunk/includes/PDFInventoryPlanPageHeader.inc
===================================================================
--- trunk/includes/PDFInventoryPlanPageHeader.inc 2017-10-15 23:18:52 UTC (rev 7857)
+++ trunk/includes/PDFInventoryPlanPageHeader.inc 2017-10-17 08:02:49 UTC (rev 7858)
@@ -16,19 +16,18 @@
$FontSize=10;
-if (isset($_POST['SupplierID']) and $_POST['SupplierID']=="0"){ //no supplier selected its a stock category report
- $ReportTitle = _('Inventory Planning for Categories Between') . ' ' . $_POST['FromCriteria'] . ' ' . _('and') . ' ' . $_POST['ToCriteria'];
-} else { //supplier selected its just planning for products from the supplier
- $ReportTitle = _('Inventory Planning for Products Category') . ' ' . $_POST['FromCriteria'];
+$ReportTitle = _('Inventory Planning for Product Categories');
+foreach ($_POST['Categories'] as $Category) {
+ $ReportTitle .= ' ' . $Category;
}
if ($_POST['Location']=='All'){
- $LeftOvers = $pdf->addTextWrap($Left_Margin, $YPos,450,$FontSize, $ReportTitle . ' ' . _('for all stock locations'));
+ $LeftOvers = $pdf->addTextWrap($Left_Margin, $YPos,600,$FontSize, $ReportTitle . ' ' . _('for all stock locations'));
} else {
- $LeftOvers = $pdf->addTextWrap($Left_Margin, $YPos,450,$FontSize, $ReportTitle . ' ' . _('for stock at') . ' ' . $_POST['Location']);
+ $LeftOvers = $pdf->addTextWrap($Left_Margin, $YPos,600,$FontSize, $ReportTitle . ' ' . _('for stock at') . ' ' . $_POST['Location']);
}
|
|
From: <afc...@us...> - 2017-10-15 23:18:55
|
Revision: 7857
http://sourceforge.net/p/web-erp/reponame/7857
Author: afcouling
Date: 2017-10-15 23:18:52 +0000 (Sun, 15 Oct 2017)
Log Message:
-----------
New Expenses/Update Expense table header in PcClaimExpensesFromTab.php
Modified Paths:
--------------
trunk/PcClaimExpensesFromTab.php
trunk/doc/Change.log
Modified: trunk/PcClaimExpensesFromTab.php
===================================================================
--- trunk/PcClaimExpensesFromTab.php 2017-10-15 23:16:12 UTC (rev 7856)
+++ trunk/PcClaimExpensesFromTab.php 2017-10-15 23:18:52 UTC (rev 7857)
@@ -330,7 +330,7 @@
<td>', $MyRow['receipt'], '</td>
<td>', $AuthorisedDate, '</td>
<td><a href="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?SelectedIndex=', $MyRow['counterindex'], '&SelectedTabs=' . $SelectedTabs . '&Days=' . $Days . '&edit=yes">' . _('Edit') . '</a></td>
- <td><a href="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?SelectedIndex=', $MyRow['counterindex'], '&SelectedTabs=' . $SelectedTabs . '&Days=' . $Days . '&Delete=yes" onclick=\'return confirm("' . _('Are you sure you wish to delete this code and the expenses it may have set up?') . '");\'>' . _('Delete') . '</a></td>
+ <td><a href="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?SelectedIndex=', $MyRow['counterindex'], '&SelectedTabs=' . $SelectedTabs . '&Days=' . $Days . '&Delete=yes" onclick=\'return confirm("' . _('Are you sure you wish to delete this expense?') . '");\'>' . _('Delete') . '</a></td>
</tr>';
} else {
echo '<td>', ConvertSQLDate($MyRow['date']), '</td>
@@ -392,16 +392,25 @@
if (!isset($_POST['Date'])) {
$_POST['Date'] = Date($_SESSION['DefaultDateFormat']);
}
- echo '<table class="selection">
- <tr>
- <td>', _('Date of Expense'), ':</td>
- <td>
- <input type="text" class="date" alt="', $_SESSION['DefaultDateFormat'], '" name="Date" size="10" required="required" maxlength="10" value="', $_POST['Date'], '" />
- </td>
- </tr>
- <tr>
- <td>', _('Code of Expense'), ':</td>
- <td>
+ echo '<table class="selection">';
+ if (isset($_GET['SelectedIndex'])) {
+ echo '<tr>
+ <th colspan="2"><h3>', _('Update Expense'), '</h3></th>
+ </tr>';
+ } else {
+ echo '<tr>
+ <th colspan="2"><h3>', _('New Expense'), '</h3></th>
+ </tr>';
+ }
+ echo '<tr>
+ <td>', _('Date of Expense'), ':</td>
+ <td>
+ <input type="text" class="date" alt="', $_SESSION['DefaultDateFormat'], '" name="Date" size="10" required="required" maxlength="10" value="', $_POST['Date'], '" />
+ </td>
+ </tr>
+ <tr>
+ <td>', _('Code of Expense'), ':</td>
+ <td>
<select required="required" name="SelectedExpense">';
DB_free_result($Result);
$SQL = "SELECT pcexpenses.codeexpense,
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2017-10-15 23:16:12 UTC (rev 7856)
+++ trunk/doc/Change.log 2017-10-15 23:18:52 UTC (rev 7857)
@@ -1,4 +1,5 @@
webERP Change Log
+15/10/17 Andy Couling: New Expenses/Update Expense table header in PcClaimExpensesFromTab.php
15/10/17 Andy Couling: Fixed the edit/delete cash assignment functionality in PcAssignCashToTab.php
15/10/17 Andy Couling: Table header labels corrected in PcClaimExpensesFromTab.php and PcAuthorizeExpenses.php.
15/10/17 Andy Couling: Fixed expense deletion dialogue box in PcClaimExpensesFromTab.php.
|
|
From: <afc...@us...> - 2017-10-15 23:16:14
|
Revision: 7856
http://sourceforge.net/p/web-erp/reponame/7856
Author: afcouling
Date: 2017-10-15 23:16:12 +0000 (Sun, 15 Oct 2017)
Log Message:
-----------
Fixed the edit/delete cash assignment functionality in PcAssignCashToTab.php
Modified Paths:
--------------
trunk/PcAssignCashToTab.php
trunk/doc/Change.log
Modified: trunk/PcAssignCashToTab.php
===================================================================
--- trunk/PcAssignCashToTab.php 2017-10-15 22:27:58 UTC (rev 7855)
+++ trunk/PcAssignCashToTab.php 2017-10-15 23:16:12 UTC (rev 7856)
@@ -262,7 +262,7 @@
$AuthorisedDate = ConvertSQLDate($MyRow['authorized']);
}
- if (($MyRow['authorized'] == '0000-00-00') and ($Description['0'] == 'ASSIGNCASH')) {
+ if (($MyRow['authorized'] == '0000-00-00') and ($ExpenseCodeDes == 'ASSIGNCASH')) {
// only cash assignations NOT authorized can be modified or deleted
echo '<td>', ConvertSQLDate($MyRow['date']), '</td>
<td>', $ExpenseCodeDes, '</td>
@@ -271,7 +271,7 @@
<td>', $MyRow['receipt'], '</td>
<td>', $AuthorisedDate, '</td>
<td><a href="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'), '?SelectedIndex=', $MyRow['counterindex'], '&SelectedTabs=', $SelectedTabs, '&Days=', $Days, '&edit=yes">', _('Edit'), '</a></td>
- <td><a href="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'), '?SelectedIndex=', $MyRow['counterindex'], '&SelectedTabs=', $SelectedTabs, '&Days=', $Days, '&delete=yes" onclick="return confirm(\'', _('Are you sure you wish to delete this code and the expense it may have set up?'), '\', \'Confirm Delete\', this);">', _('Delete'), '</a></td>
+ <td><a href="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'), '?SelectedIndex=', $MyRow['counterindex'], '&SelectedTabs=', $SelectedTabs, '&Days=', $Days, '&delete=yes" onclick=\'return confirm("' . _('Are you sure you wish to delete this assigned cash?') . '");\'>' . _('Delete') . '</a></td>
</tr>';
} else {
echo '<td>', ConvertSQLDate($MyRow['date']), '</td>
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2017-10-15 22:27:58 UTC (rev 7855)
+++ trunk/doc/Change.log 2017-10-15 23:16:12 UTC (rev 7856)
@@ -1,4 +1,5 @@
webERP Change Log
+15/10/17 Andy Couling: Fixed the edit/delete cash assignment functionality in PcAssignCashToTab.php
15/10/17 Andy Couling: Table header labels corrected in PcClaimExpensesFromTab.php and PcAuthorizeExpenses.php.
15/10/17 Andy Couling: Fixed expense deletion dialogue box in PcClaimExpensesFromTab.php.
15/10/17 Andy Couling: Missing $Id comments added to Petty Cash scripts.
|
|
From: <afc...@us...> - 2017-10-15 22:28:00
|
Revision: 7855
http://sourceforge.net/p/web-erp/reponame/7855
Author: afcouling
Date: 2017-10-15 22:27:58 +0000 (Sun, 15 Oct 2017)
Log Message:
-----------
Table header labels corrected in PcClaimExpensesFromTab.php and PcAuthorizeExpenses.php.
Modified Paths:
--------------
trunk/PcAuthorizeExpenses.php
trunk/PcClaimExpensesFromTab.php
trunk/doc/Change.log
Modified: trunk/PcAuthorizeExpenses.php
===================================================================
--- trunk/PcAuthorizeExpenses.php 2017-10-15 22:23:49 UTC (rev 7854)
+++ trunk/PcAuthorizeExpenses.php 2017-10-15 22:27:58 UTC (rev 7855)
@@ -91,7 +91,7 @@
<th>', _('Date of Expense'), '</th>
<th>', _('Expense Code'), '</th>
<th>', _('Gross Amount'), '</th>
- <th>', _('Total Tax'), '</th>
+ <th>', _('Tax'), '</th>
<th>', _('Tax Group'), '</th>
<th>', _('Tag'), '</th>
<th>', _('Notes'), '</th>
Modified: trunk/PcClaimExpensesFromTab.php
===================================================================
--- trunk/PcClaimExpensesFromTab.php 2017-10-15 22:23:49 UTC (rev 7854)
+++ trunk/PcClaimExpensesFromTab.php 2017-10-15 22:27:58 UTC (rev 7855)
@@ -257,7 +257,7 @@
<th>', _('Date of Expense'), '</th>
<th>', _('Expense Code'), '</th>
<th>', _('Gross Amount'), '</th>
- <th>', _('Total Tax'), '</th>
+ <th>', _('Tax'), '</th>
<th>', _('Tax Group'), '</th>
<th>', _('Tag'), '</th>
<th>', _('Notes'), '</th>
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2017-10-15 22:23:49 UTC (rev 7854)
+++ trunk/doc/Change.log 2017-10-15 22:27:58 UTC (rev 7855)
@@ -1,4 +1,5 @@
webERP Change Log
+15/10/17 Andy Couling: Table header labels corrected in PcClaimExpensesFromTab.php and PcAuthorizeExpenses.php.
15/10/17 Andy Couling: Fixed expense deletion dialogue box in PcClaimExpensesFromTab.php.
15/10/17 Andy Couling: Missing $Id comments added to Petty Cash scripts.
17/10/12 Exson: Fixed the bug that Narrative information will loss when add or remove controlled items lot no in StockAdjustments.php.
|
|
From: <afc...@us...> - 2017-10-15 22:23:51
|
Revision: 7854
http://sourceforge.net/p/web-erp/reponame/7854
Author: afcouling
Date: 2017-10-15 22:23:49 +0000 (Sun, 15 Oct 2017)
Log Message:
-----------
Fixed expense deletion dialogue box in PcClaimExpensesFromTab.php.
Modified Paths:
--------------
trunk/PcClaimExpensesFromTab.php
trunk/doc/Change.log
Modified: trunk/PcClaimExpensesFromTab.php
===================================================================
--- trunk/PcClaimExpensesFromTab.php 2017-10-15 22:17:04 UTC (rev 7853)
+++ trunk/PcClaimExpensesFromTab.php 2017-10-15 22:23:49 UTC (rev 7854)
@@ -330,7 +330,7 @@
<td>', $MyRow['receipt'], '</td>
<td>', $AuthorisedDate, '</td>
<td><a href="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?SelectedIndex=', $MyRow['counterindex'], '&SelectedTabs=' . $SelectedTabs . '&Days=' . $Days . '&edit=yes">' . _('Edit') . '</a></td>
- <td><a href="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?SelectedIndex=', $MyRow['counterindex'], '&SelectedTabs=' . $SelectedTabs . '&Days=' . $Days . '&Delete=yes" onclick=\'return confirm("' . _('Are you sure you wish to delete this code and the expenses it may have set up?') . '", \'Confirm Delete\', this);\'>' . _('Delete') . '</a></td>
+ <td><a href="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?SelectedIndex=', $MyRow['counterindex'], '&SelectedTabs=' . $SelectedTabs . '&Days=' . $Days . '&Delete=yes" onclick=\'return confirm("' . _('Are you sure you wish to delete this code and the expenses it may have set up?') . '");\'>' . _('Delete') . '</a></td>
</tr>';
} else {
echo '<td>', ConvertSQLDate($MyRow['date']), '</td>
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2017-10-15 22:17:04 UTC (rev 7853)
+++ trunk/doc/Change.log 2017-10-15 22:23:49 UTC (rev 7854)
@@ -1,4 +1,5 @@
webERP Change Log
+15/10/17 Andy Couling: Fixed expense deletion dialogue box in PcClaimExpensesFromTab.php.
15/10/17 Andy Couling: Missing $Id comments added to Petty Cash scripts.
17/10/12 Exson: Fixed the bug that Narrative information will loss when add or remove controlled items lot no in StockAdjustments.php.
17/10/11 RChacon: If it is set the $_SESSION['ShowPageHelp'] parameter AND it is FALSE, hides the page help text (simplifies code using css
|
|
From: <afc...@us...> - 2017-10-15 22:17:07
|
Revision: 7853
http://sourceforge.net/p/web-erp/reponame/7853
Author: afcouling
Date: 2017-10-15 22:17:04 +0000 (Sun, 15 Oct 2017)
Log Message:
-----------
Missing $Id comments added back in to Petty Cash scripts.
Modified Paths:
--------------
trunk/PcAnalysis.php
trunk/PcAssignCashTabToTab.php
trunk/PcAssignCashToTab.php
trunk/PcAuthorizeCash.php
trunk/PcAuthorizeExpenses.php
trunk/PcClaimExpensesFromTab.php
trunk/PcExpenses.php
trunk/PcExpensesTypeTab.php
trunk/PcReportExpense.php
trunk/PcReportTab.php
trunk/PcTabExpensesList.php
trunk/PcTabs.php
trunk/PcTypeTabs.php
trunk/Tax.php
trunk/doc/Change.log
Modified: trunk/PcAnalysis.php
===================================================================
--- trunk/PcAnalysis.php 2017-10-12 11:27:49 UTC (rev 7852)
+++ trunk/PcAnalysis.php 2017-10-15 22:17:04 UTC (rev 7853)
@@ -1,4 +1,6 @@
<?php
+/* $Id: PcAnalysis.php 7751 2017-04-13 16:34:26Z rchacon $*/
+
require_once ('Classes/PHPExcel.php');
include('includes/session.php');
Modified: trunk/PcAssignCashTabToTab.php
===================================================================
--- trunk/PcAssignCashTabToTab.php 2017-10-12 11:27:49 UTC (rev 7852)
+++ trunk/PcAssignCashTabToTab.php 2017-10-15 22:17:04 UTC (rev 7853)
@@ -1,4 +1,5 @@
<?php
+/* $Id: PcAssignCashTabToTab.php 7751 2017-04-13 16:34:26Z rchacon $*/
include('includes/session.php');
$Title = _('Assignment of Cash from Tab to Tab');
Modified: trunk/PcAssignCashToTab.php
===================================================================
--- trunk/PcAssignCashToTab.php 2017-10-12 11:27:49 UTC (rev 7852)
+++ trunk/PcAssignCashToTab.php 2017-10-15 22:17:04 UTC (rev 7853)
@@ -1,4 +1,6 @@
<?php
+/* $Id$*/
+
include('includes/session.php');
$Title = _('Assignment of Cash to Petty Cash Tab');
/* webERP manual links before header.php */
Modified: trunk/PcAuthorizeCash.php
===================================================================
--- trunk/PcAuthorizeCash.php 2017-10-12 11:27:49 UTC (rev 7852)
+++ trunk/PcAuthorizeCash.php 2017-10-15 22:17:04 UTC (rev 7853)
@@ -1,4 +1,6 @@
<?php
+/* $Id: PcAuthorizeCash.php 7751 2017-04-13 16:34:26Z rchacon $*/
+
include('includes/session.php');
$Title = _('Authorisation of Assigned Cash');
/* webERP manual links before header.php */
Modified: trunk/PcAuthorizeExpenses.php
===================================================================
--- trunk/PcAuthorizeExpenses.php 2017-10-12 11:27:49 UTC (rev 7852)
+++ trunk/PcAuthorizeExpenses.php 2017-10-15 22:17:04 UTC (rev 7853)
@@ -1,4 +1,6 @@
<?php
+/* $Id$*/
+
include('includes/session.php');
$Title = _('Authorisation of Petty Cash Expenses');
/* webERP manual links before header.php */
Modified: trunk/PcClaimExpensesFromTab.php
===================================================================
--- trunk/PcClaimExpensesFromTab.php 2017-10-12 11:27:49 UTC (rev 7852)
+++ trunk/PcClaimExpensesFromTab.php 2017-10-15 22:17:04 UTC (rev 7853)
@@ -1,4 +1,6 @@
<?php
+/* $Id$*/
+
include('includes/session.php');
$Title = _('Claim Petty Cash Expenses From Tab');
/* webERP manual links before header.php */
Modified: trunk/PcExpenses.php
===================================================================
--- trunk/PcExpenses.php 2017-10-12 11:27:49 UTC (rev 7852)
+++ trunk/PcExpenses.php 2017-10-15 22:17:04 UTC (rev 7853)
@@ -1,4 +1,6 @@
<?php
+/* $Id$*/
+
include('includes/session.php');
$Title = _('Maintenance Of Petty Cash Of Expenses');
/* webERP manual links before header.php */
Modified: trunk/PcExpensesTypeTab.php
===================================================================
--- trunk/PcExpensesTypeTab.php 2017-10-12 11:27:49 UTC (rev 7852)
+++ trunk/PcExpensesTypeTab.php 2017-10-15 22:17:04 UTC (rev 7853)
@@ -1,4 +1,6 @@
<?php
+/* $Id$*/
+
include('includes/session.php');
$Title = _('Maintenance Of Petty Cash Expenses For a Type Tab');
/* webERP manual links before header.php */
Modified: trunk/PcReportExpense.php
===================================================================
--- trunk/PcReportExpense.php 2017-10-12 11:27:49 UTC (rev 7852)
+++ trunk/PcReportExpense.php 2017-10-15 22:17:04 UTC (rev 7853)
@@ -1,4 +1,5 @@
<?php
+/* $Id: PcReportExpense.php 7751 2017-04-13 16:34:26Z rchacon $*/
include ('includes/session.php');
$Title = _('Petty Cash Expense Management Report');
Modified: trunk/PcReportTab.php
===================================================================
--- trunk/PcReportTab.php 2017-10-12 11:27:49 UTC (rev 7852)
+++ trunk/PcReportTab.php 2017-10-15 22:17:04 UTC (rev 7853)
@@ -1,6 +1,5 @@
<?php
-/* $Id$ */
-/* */
+/* $Id$*/
include ('includes/session.php');
$Title = _('Petty Cash Management Report');
Modified: trunk/PcTabExpensesList.php
===================================================================
--- trunk/PcTabExpensesList.php 2017-10-12 11:27:49 UTC (rev 7852)
+++ trunk/PcTabExpensesList.php 2017-10-15 22:17:04 UTC (rev 7853)
@@ -1,4 +1,6 @@
<?php
+/* $Id: PcTabExpensesList.php 7751 2017-04-13 16:34:26Z rchacon $*/
+
require_once ('Classes/PHPExcel.php');
include('includes/session.php');
Modified: trunk/PcTabs.php
===================================================================
--- trunk/PcTabs.php 2017-10-12 11:27:49 UTC (rev 7852)
+++ trunk/PcTabs.php 2017-10-15 22:17:04 UTC (rev 7853)
@@ -1,4 +1,6 @@
<?php
+/* $Id$*/
+
include('includes/session.php');
$Title = _('Maintenance Of Petty Cash Tabs');
/* webERP manual links before header.php */
Modified: trunk/PcTypeTabs.php
===================================================================
--- trunk/PcTypeTabs.php 2017-10-12 11:27:49 UTC (rev 7852)
+++ trunk/PcTypeTabs.php 2017-10-15 22:17:04 UTC (rev 7853)
@@ -1,4 +1,6 @@
<?php
+/* $Id$*/
+
include('includes/session.php');
$Title = _('Maintenance Of Petty Cash Type of Tabs');
/* webERP manual links before header.php */
Modified: trunk/Tax.php
===================================================================
--- trunk/Tax.php 2017-10-12 11:27:49 UTC (rev 7852)
+++ trunk/Tax.php 2017-10-15 22:17:04 UTC (rev 7853)
@@ -1,4 +1,6 @@
<?php
+/* $Id$*/
+
include('includes/session.php');
if (isset($_POST['TaxAuthority']) and isset($_POST['PrintPDF']) and isset($_POST['NoOfPeriods']) and isset($_POST['ToPeriod'])) {
$SQL = "SELECT lastdate_in_period
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2017-10-12 11:27:49 UTC (rev 7852)
+++ trunk/doc/Change.log 2017-10-15 22:17:04 UTC (rev 7853)
@@ -1,5 +1,5 @@
webERP Change Log
-
+15/10/17 Andy Couling: Missing $Id comments added to Petty Cash scripts.
17/10/12 Exson: Fixed the bug that Narrative information will loss when add or remove controlled items lot no in StockAdjustments.php.
17/10/11 RChacon: If it is set the $_SESSION['ShowPageHelp'] parameter AND it is FALSE, hides the page help text (simplifies code using css
).
|
|
From: <rc...@us...> - 2017-10-11 19:05:03
|
Revision: 7851
http://sourceforge.net/p/web-erp/reponame/7851
Author: rchacon
Date: 2017-10-11 19:05:01 +0000 (Wed, 11 Oct 2017)
Log Message:
-----------
If it is set the $_SESSION['ShowPageHelp'] parameter AND it is FALSE, hides the page help text (simplifies code using css
)
Modified Paths:
--------------
trunk/GLCashFlowsIndirect.php
trunk/GLCashFlowsSetup.php
trunk/doc/Change.log
trunk/includes/header.php
Modified: trunk/GLCashFlowsIndirect.php
===================================================================
--- trunk/GLCashFlowsIndirect.php 2017-10-11 18:16:40 UTC (rev 7850)
+++ trunk/GLCashFlowsIndirect.php 2017-10-11 19:05:01 UTC (rev 7851)
@@ -470,7 +470,7 @@
INNER JOIN chartdetails ON chartmaster.accountcode=chartdetails.accountcode
INNER JOIN accountgroups ON chartmaster.group_=accountgroups.groupname
WHERE accountgroups.pandl=1";
- $Result = DB_query($Sql);
+ $Result = DB_query($Sql);
$MyRow1 = DB_fetch_array($Result);
echo colDebitCredit($MyRow1['ActualProfit']),
colDebitCredit($MyRow1['LastProfit']),
@@ -753,14 +753,14 @@
'/images/reports.png" title="', // Icon image.
$Title, '" /> ', // Icon title.
$Title, '</p>';// Page title.
- if(!isset($_SESSION['ShowPageHelp']) OR $_SESSION['ShowPageHelp']) {// If it is not set the $_SESSION['ShowPageHelp'] parameter OR it is TRUE, shows the page help text:
- echo '<div class="page_help_text">',
- _('The statement of cash flows, also known as the successor of the old source and application of funds statement, reports how changes in balance sheet accounts and income affect cash and cash equivalents, and breaks the analysis down to operating, investing and financing activities.'), '<br />',
- _('The purpose of the statement of cash flows is to show where the company got their money from and how it was spent during the period being reported for a user selectable range of periods.'), '<br />',
- _('The statement of cash flows represents a period of time. This contrasts with the statement of financial position, which represents a single moment in time.'), '<br />',
- _('webERP is an "accrual" based system (not a "cash based" system). Accrual systems include items when they are invoiced to the customer, and when expenses are owed based on the supplier invoice date.'),
- '</div>';
- }
+
+ echo '<div class="page_help_text">',
+ _('The statement of cash flows, also known as the successor of the old source and application of funds statement, reports how changes in balance sheet accounts and income affect cash and cash equivalents, and breaks the analysis down to operating, investing and financing activities.'), '<br />',
+ _('The purpose of the statement of cash flows is to show where the company got their money from and how it was spent during the period being reported for a user selectable range of periods.'), '<br />',
+ _('The statement of cash flows represents a period of time. This contrasts with the statement of financial position, which represents a single moment in time.'), '<br />',
+ _('webERP is an "accrual" based system (not a "cash based" system). Accrual systems include items when they are invoiced to the customer, and when expenses are owed based on the supplier invoice date.'),
+ '</div>';
+
// Shows a form to allow input of criteria for the report to generate:
echo '<br />',
'<form action="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'), '" method="post">',
Modified: trunk/GLCashFlowsSetup.php
===================================================================
--- trunk/GLCashFlowsSetup.php 2017-10-11 18:16:40 UTC (rev 7850)
+++ trunk/GLCashFlowsSetup.php 2017-10-11 19:05:01 UTC (rev 7851)
@@ -145,14 +145,12 @@
'/images/maintenance.png" title="', // Icon image.
$Title, '" /> ', // Icon title.
$Title, '</p>';// Page title.
- // BEGIN menu.
-if(!isset($page_help) OR $page_help) {
- // If it is not set the $page_help parameter OR it is TRUE, shows the page help text:
- echo '<div class="page_help_text">',
- _('The statement of cash flows, using direct and indirect methods, is partitioned into three sections: operating activities, investing activities and financing activities.'), '<br />',
- _('You must classify all accounts in any of those three sections of the cash flow statement, or as no effect on cash flow, or as cash or cash equivalent.'),
- '</div>';
-}
+
+echo '<div class="page_help_text">',
+ _('The statement of cash flows, using direct and indirect methods, is partitioned into three sections: operating activities, investing activities and financing activities.'), '<br />',
+ _('You must classify all accounts in any of those three sections of the cash flow statement, or as no effect on cash flow, or as cash or cash equivalent.'),
+ '</div>';
+
// Show a form to allow input of the action for the script to do:
echo '<br />',
'<form action="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'), '" method="post">',
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2017-10-11 18:16:40 UTC (rev 7850)
+++ trunk/doc/Change.log 2017-10-11 19:05:01 UTC (rev 7851)
@@ -1,5 +1,7 @@
webERP Change Log
+17/10/11 RChacon: If it is set the $_SESSION['ShowPageHelp'] parameter AND it is FALSE, hides the page help text (simplifies code using css
+).
17/10/11 RChacon: Set decimals variable for exchange rate in Currencies.php.
17/10/11 RChacon: Improve currency showing and set decimals variable for exchange rate in Payments.php.
17/10/11 Exson: Fix the indian_number_format bug in MiscFunctions.php.
Modified: trunk/includes/header.php
===================================================================
--- trunk/includes/header.php 2017-10-11 18:16:40 UTC (rev 7850)
+++ trunk/includes/header.php 2017-10-11 19:05:01 UTC (rev 7851)
@@ -43,8 +43,12 @@
'<link href="', $RootPath, '/css/', $_SESSION['Theme'], '/default.css" rel="stylesheet" type="text/css" media="screen"/>',
'<meta name="viewport" content="width=device-width, initial-scale=1">',//To tell the small device that the website is a responsive site (keep relationship between CSS pixels and device pixels).
'<script type="text/javascript" src="', $RootPath, '/javascripts/MiscFunctions.js"></script>',
- '<title>', $Title, '</title>',
- '</head>',
+ '<title>', $Title, '</title>';
+ // If it is set the $_SESSION['ShowPageHelp'] parameter AND it is FALSE, hides the page help text:
+ if(isset($_SESSION['ShowPageHelp']) AND !$_SESSION['ShowPageHelp']) {
+ echo '<style>.page_help_text, DIV.page_help_text {display:none;}</style>';
+ }
+ echo '</head>',
'<body>',
'<div id="CanvasDiv">',
|
|
From: <rc...@us...> - 2017-10-11 18:16:43
|
Revision: 7850
http://sourceforge.net/p/web-erp/reponame/7850
Author: rchacon
Date: 2017-10-11 18:16:40 +0000 (Wed, 11 Oct 2017)
Log Message:
-----------
Set decimals variable for exchange rate in Currencies.php
Modified Paths:
--------------
trunk/Currencies.php
trunk/doc/Change.log
Modified: trunk/Currencies.php
===================================================================
--- trunk/Currencies.php 2017-10-11 17:05:10 UTC (rev 7849)
+++ trunk/Currencies.php 2017-10-11 18:16:40 UTC (rev 7850)
@@ -28,10 +28,10 @@
$Errors = array();
-echo '<p class="page_title_text"><img alt="" src="'.$RootPath.'/css/'.$Theme.
- '/images/currency.png" title="' .// Icon image.
- _('Currencies') . '" /> ' .// Icon title.
- _('Currencies Maintenance') . '</p>';// Page title.
+echo '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/currency.png" title="', // Icon image.
+ _('Currencies'), '" /> ', // Icon title.
+ _('Currencies Maintenance'), '</p>';// Page title.
if (isset($_POST['submit'])) {
@@ -196,7 +196,7 @@
'" . FormatDateForSQL($PostingDate) . "',
'" . $PeriodNo . "',
'" . $_SESSION['CompanyRecord']['exchangediffact'] . "',
- '" . $myrowBankAccount['bankaccountname'] . ' ' . _('currency rate adjustment to') . ' ' . locale_number_format($NewRate,8) . ' ' . $SelectedCurrency . '/' . $_SESSION['CompanyRecord']['currencydefault']. "',
+ '" . $myrowBankAccount['bankaccountname'] . ' ' . _('currency rate adjustment to') . ' ' . locale_number_format($NewRate, 'Variable') . ' ' . $SelectedCurrency . '/' . $_SESSION['CompanyRecord']['currencydefault']. "',
'" . (-$DifferenceToAdjust) . "')";
$ErrMsg = _('Cannot insert a GL entry for the exchange difference because');
@@ -214,11 +214,11 @@
'" . FormatDateForSQL($PostingDate) . "',
'" . $PeriodNo . "',
'" . $myrowBankAccount['accountcode'] . "',
- '" . $myrowBankAccount['bankaccountname'] . ' ' . _('currency rate adjustment to') . ' ' . locale_number_format($NewRate,8) . ' ' . $SelectedCurrency . '/' . $_SESSION['CompanyRecord']['currencydefault']. "',
+ '" . $myrowBankAccount['bankaccountname'] . ' ' . _('currency rate adjustment to') . ' ' . locale_number_format($NewRate, 'Variable') . ' ' . $SelectedCurrency . '/' . $_SESSION['CompanyRecord']['currencydefault']. "',
'" . ($DifferenceToAdjust) . "')";
$result = DB_query($SQL,$ErrMsg,$DbgMsg,true);
- prnMsg(_('Bank Account') . ' ' . $myrowBankAccount['bankaccountname'] . ' ' . _('Currency Rate difference of') . ' ' . locale_number_format($DifferenceToAdjust,$_SESSION['CompanyRecord']['decimalplaces']) . ' ' . _('has been posted'),'success');
+ prnMsg(_('Bank Account') . ' ' . $myrowBankAccount['bankaccountname'] . ' ' . _('Currency Rate difference of') . ' ' . locale_number_format($DifferenceToAdjust, $_SESSION['CompanyRecord']['decimalplaces']) . ' ' . _('has been posted'),'success');
}
}
}
@@ -364,11 +364,11 @@
$CurrencyName[$myrow['currabrev']],
$myrow['country'],
$myrow['hundredsname'],
- locale_number_format($myrow['decimalplaces'],0),
+ locale_number_format($myrow['decimalplaces'], 0),
$ShowInWebText,
- locale_number_format($myrow['rate'],8),
- locale_number_format(1/$myrow['rate'],2),
- locale_number_format(GetCurrencyRate($myrow['currabrev'],$CurrencyRatesArray),8),
+ locale_number_format($myrow['rate'], 'Variable'),
+ locale_number_format(1/$myrow['rate'], 2),
+ locale_number_format(GetCurrencyRate($myrow['currabrev'],$CurrencyRatesArray), 8),
htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?',
$myrow['currabrev'],
_('Edit'),
@@ -442,8 +442,8 @@
$_POST['Abbreviation'] = $myrow['currabrev'];
$_POST['Country'] = $myrow['country'];
$_POST['HundredsName'] = $myrow['hundredsname'];
- $_POST['ExchangeRate'] = locale_number_format($myrow['rate'],8);
- $_POST['DecimalPlaces'] = locale_number_format($myrow['decimalplaces'],0);
+ $_POST['ExchangeRate'] = locale_number_format($myrow['rate'], 'Variable');
+ $_POST['DecimalPlaces'] = locale_number_format($myrow['decimalplaces'], 0);
$_POST['webcart'] = $myrow['webcart'];
echo '<input type="hidden" name="SelectedCurrency" value="' . $SelectedCurrency . '" />';
@@ -502,10 +502,10 @@
$_POST['ExchangeRate'] = 1;
}
if ($_POST['Abbreviation'] != $FunctionalCurrency) {
- echo '<td><input type="text" class="number" name="ExchangeRate" size="10" required="required" minlength="1" maxlength="10" value="' . $_POST['ExchangeRate'] . '" /></td>';
+ echo '<td><input class="number" maxlength="16" minlength="1" name="ExchangeRate" required="required" size="16" type="text" value="', $_POST['ExchangeRate'], '" /></td>';
} else {
- echo '<td>' . $_POST['ExchangeRate'] . '</td>';
- echo '<input type="hidden" class="number" name="ExchangeRate" value="' . $_POST['ExchangeRate'] . '" />';
+ echo '<td>', $_POST['ExchangeRate'], '</td>',
+ '<input class="number" name="ExchangeRate" type="hidden" value="', $_POST['ExchangeRate'], '" />';
}
echo '</tr>';
if (!isset($_POST['webcart'])) {
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2017-10-11 17:05:10 UTC (rev 7849)
+++ trunk/doc/Change.log 2017-10-11 18:16:40 UTC (rev 7850)
@@ -1,6 +1,7 @@
webERP Change Log
-17/10/11 RChacon: Improve currency showing and set decimals variable for exchange rate.
+17/10/11 RChacon: Set decimals variable for exchange rate in Currencies.php.
+17/10/11 RChacon: Improve currency showing and set decimals variable for exchange rate in Payments.php.
17/10/11 Exson: Fix the indian_number_format bug in MiscFunctions.php.
17/10/09 Exson: Fixed the non-balance bug in CustomerReceipt.php. And fixed the non rollback problem when there is a non-balance existed. Fixed error noises.
17/10/03 Exson: Add html view to SuppPriceList.php.
|
|
From: <rc...@us...> - 2017-10-11 17:05:12
|
Revision: 7849
http://sourceforge.net/p/web-erp/reponame/7849
Author: rchacon
Date: 2017-10-11 17:05:10 +0000 (Wed, 11 Oct 2017)
Log Message:
-----------
Improve currency showing and set decimals variable for exchange rate
Modified Paths:
--------------
trunk/Payments.php
trunk/doc/Change.log
Modified: trunk/Payments.php
===================================================================
--- trunk/Payments.php 2017-10-11 11:01:43 UTC (rev 7848)
+++ trunk/Payments.php 2017-10-11 17:05:10 UTC (rev 7849)
@@ -3,17 +3,25 @@
/* Entry of bank account payments either against an AP account or a general ledger payment - if the AP-GL link in company preferences is set */
include('includes/DefinePaymentClass.php');
+
include('includes/session.php');
$Title = _('Payment Entry');
-if(isset($_GET['SupplierID'])) {
+if(isset($_GET['SupplierID'])) {// Links to Manual before header.php
$ViewTopic = 'AccountsPayable';
$BookMark = 'SupplierPayments';
+ $PageTitleText = _('Enter a Payment to, or Receipt from the Supplier');
} else {
$ViewTopic= 'GeneralLedger';
$BookMark = 'BankAccountPayments';
+ $PageTitleText = _('Bank Account Payments Entry');
}
include('includes/header.php');
+echo '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/transactions.png" title="', // Icon image.
+ $PageTitleText, '" /> ', // Icon title.
+ $PageTitleText, '</p>';// Page title.
+
include('includes/SQL_CommonFunctions.inc');
if(isset($_POST['PaymentCancelled'])) {
@@ -21,12 +29,13 @@
include('includes/footer.php');
exit();
}
+
if(empty($_GET['identifier'])) {
- /*unique session identifier to ensure that there is no conflict with other order enty session on the same machine */
- $identifier=date('U');
+ $identifier = date('U');// Unique session identifier to ensure that there is no conflict with other order entry session on the same machine.
} else {
- $identifier=$_GET['identifier'];//edit GLItems
+ $identifier = $_GET['identifier'];
}
+
if(isset($_GET['NewPayment']) AND $_GET['NewPayment']=='Yes') {
unset($_SESSION['PaymentDetail'.$identifier]->GLItems);
unset($_SESSION['PaymentDetail'.$identifier]);
@@ -37,22 +46,16 @@
$_SESSION['PaymentDetail'.$identifier]->GLItemCounter = 1;
}
-if((isset($_POST['UpdateHeader'])
- AND $_POST['BankAccount']=='')
+if((isset($_POST['UpdateHeader']) AND $_POST['BankAccount']=='')
OR (isset($_POST['Process']) AND $_POST['BankAccount']=='')) {
prnMsg(_('A bank account must be selected to make this payment from'), 'warn');
- $BankAccountEmpty=true;
+ $BankAccountEmpty = true;
} else {
-
- $BankAccountEmpty=false;
+ $BankAccountEmpty = false;
}
-echo '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme,
- '/images/transactions.png" title="',// Icon image.
- _('Bank Account Payments Entry'), '" /> ',// Icon title.
- _('Bank Account Payments Entry'), '</p>';// Page title.
-echo '<div class="page_help_text">' . _('Use this screen to enter payments FROM your bank account.<br />Note: To enter a payment FROM a supplier, first select the Supplier, click Enter a Payment to, or Receipt from the Supplier, and use a negative Payment amount on this form.') . '</div>
+echo '<div class="page_help_text">', _('Use this screen to enter payments FROM your bank account.<br />Note: To enter a payment FROM a supplier, first select the Supplier, click Enter a Payment to, or Receipt from the Supplier, and use a negative Payment amount on this form.'), '</div>
<br />';
if(isset($_GET['SupplierID'])) {
@@ -126,12 +129,13 @@
if(isset($_POST['BankAccount']) AND $_POST['BankAccount']!='') {
- $_SESSION['PaymentDetail'.$identifier]->Account=$_POST['BankAccount'];
- /*Get the bank account currency and set that too */
+ $_SESSION['PaymentDetail'.$identifier]->Account = $_POST['BankAccount'];
+ // Get the bank account currency and set that too
$ErrMsg = _('Could not get the currency of the bank account');
$result = DB_query("SELECT currcode,
decimalplaces
- FROM bankaccounts INNER JOIN currencies
+ FROM bankaccounts
+ INNER JOIN currencies
ON bankaccounts.currcode = currencies.currabrev
WHERE accountcode ='" . $_POST['BankAccount'] . "'",
$ErrMsg);
@@ -158,7 +162,7 @@
$_SESSION['PaymentDetail'.$identifier]->ExRate=filter_number_format($_POST['ExRate']); //ex rate between payment currency and account currency
}
if(isset($_POST['FunctionalExRate']) AND $_POST['FunctionalExRate']!='') {
- $_SESSION['PaymentDetail'.$identifier]->FunctionalExRate=filter_number_format($_POST['FunctionalExRate']); //ex rate between bank account currency and functional (business home) currency
+ $_SESSION['PaymentDetail'.$identifier]->FunctionalExRate = filter_number_format($_POST['FunctionalExRate']); //ex rate between bank account currency and functional (business home) currency
}
if(isset($_POST['Paymenttype']) AND $_POST['Paymenttype']!='') {
$_SESSION['PaymentDetail'.$identifier]->Paymenttype = $_POST['Paymenttype'];
@@ -165,11 +169,11 @@
//lets validate the paymenttype here
$sql = "SELECT usepreprintedstationery
FROM paymentmethods
- WHERE paymentname='" . $_SESSION['PaymentDetail' . $identifier]->Paymenttype . "'";
+ WHERE paymentname='" . $_SESSION['PaymentDetail'.$identifier]->Paymenttype . "'";
$result = DB_query($sql);
$myrow = DB_fetch_row($result);
- if ($myrow[0] == 1) {
- if (empty($_POST['ChequeNum'])) {
+ if($myrow[0] == 1) {
+ if(empty($_POST['ChequeNum'])) {
prnMsg(_('The cheque number should not be empty'),'warn');
$Errors[] = 'ChequeNum';
} else {
@@ -177,7 +181,7 @@
$ErrMsg = _('Failed to retrieve cheque number data');
$cheqresult = DB_query($cheqsql,$ErrMsg);
$cheqrow = DB_fetch_row($cheqresult);
- if ($cheqrow[0]>0) {
+ if($cheqrow[0]>0) {
prnMsg(_('The cheque has already been used'),'warn');
$Errors[] = 'ChequeNum';
}
@@ -340,11 +344,11 @@
AND ($myrow[0] == 1)) {
// it is a supplier payment by cheque and haven't printed yet so print cheque
//check the cheque number
- if (empty($_POST['ChequeNum'])) {
+ if(empty($_POST['ChequeNum'])) {
prnMsg(_('There are no Check Number input'),'error');
include('includes/footer.inc');
exit;
- } elseif (!is_numeric($_POST['ChequeNum'])){//check if this cheque no has been used
+ } elseif(!is_numeric($_POST['ChequeNum'])) {//check if this cheque no has been used
prnMsg(_('The cheque no should be numeric'),'error');
include('includes/footer.inc');
exit;
@@ -353,7 +357,7 @@
$ErrMsg = _('Failed to retrieve cheque number data');
$cheqresult = DB_query($cheqsql,$ErrMsg);
$cheqrow = DB_fetch_row($cheqresult);
- if ($cheqrow[0]>0) {
+ if($cheqrow[0]>0) {
prnMsg(_('The cheque has already been used'),'error');
include('includes/footer.inc');
exit;
@@ -362,11 +366,11 @@
//store the paid array here;
$PaidArray = array();
foreach ($_POST as $name=>$Value) {
- if (substr($name, 0, 4) == 'paid' AND $Value>0) {
+ if(substr($name, 0, 4) == 'paid' AND $Value>0) {
$PaidArray[substr($name, 4)] = $Value;
}
}
- if (!empty($PaidArray)) {
+ if(!empty($PaidArray)) {
$PaidJ = base64_encode(serialize($PaidArray));
$PaidInput = '<input type="hidden" name="PaidArray" value="' . $PaidJ . '" />';
} else {
@@ -385,7 +389,7 @@
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo _('Has the cheque been printed') . '?
<br />
- <br />'
+ <br />'
. $PaidInput . '
<input type="hidden" name="BankTransRef" value="' . $_POST['BankTransRef'] . '" />
<input type="hidden" name="ChequeNum" value="' . $_POST['ChequeNum'] . '" />
@@ -474,11 +478,11 @@
/*Make sure to use the same rate if the transfer is between two bank accounts in the same currency */
$TrfToBankExRate = $_SESSION['PaymentDetail'.$identifier]->FunctionalExRate;
}
- if ($_SESSION['PaymentDetail' . $identifier]->Currency == $TrfToBankCurrCode) {
+ if($_SESSION['PaymentDetail'.$identifier]->Currency == $TrfToBankCurrCode) {
$ExRate = 1;
- $TrfToBankExRate = $_SESSION['PaymentDetail' . $identifier]->ExRate;
+ $TrfToBankExRate = $_SESSION['PaymentDetail'.$identifier]->ExRate;
} else {
- $ExRate = ($_SESSION['PaymentDetail'.$identifier]->ExRate * $_SESSION['PaymentDetail' . $identifier]->FunctionalExRate)/$TrfFromBankExRate;
+ $ExRate = ($_SESSION['PaymentDetail'.$identifier]->ExRate * $_SESSION['PaymentDetail'.$identifier]->FunctionalExRate)/$TrfFromBankExRate;
}
/*Consider an example
@@ -538,12 +542,12 @@
}
}
} else {
-
+
/* Get an array of suuptans id fields that were paid */
- if (!isset($_POST['PaidArray'])) {
+ if(!isset($_POST['PaidArray'])) {
$PaidArray = array();
foreach ($_POST as $name=>$Value) {
- if (substr($name, 0, 4) == 'paid' AND $Value>0) {
+ if(substr($name, 0, 4) == 'paid' AND $Value>0) {
$PaidArray[substr($name, 4)] = $Value;
}
}
@@ -588,7 +592,7 @@
$Result = DB_query($SQL,'','',true);
$MyRow = DB_fetch_array($Result);
$PaymentID = $MyRow['id'];
- if (sizeof($PaidArray) > 0) {
+ if(sizeof($PaidArray) > 0) {
foreach ($PaidArray as $PaidID=>$PaidAmount) {
/* Firstly subtract from the payment the amount of the invoice */
$SQL = "UPDATE supptrans SET alloc=alloc-" . $PaidAmount . " WHERE id='" . $PaymentID . "'";
@@ -607,7 +611,7 @@
transid_allocto
) VALUES (
'" . $PaidAmount . "',
- '" . FormatDateForSQL($_SESSION['PaymentDetail' . $identifier]->DatePaid) . "',
+ '" . FormatDateForSQL($_SESSION['PaymentDetail'.$identifier]->DatePaid) . "',
'" . $PaymentID . "',
'" . $PaidID . "'
)";
@@ -795,7 +799,7 @@
$_POST['Narrative'] = $_SESSION['PaymentDetail'.$identifier]->Narrative;
} elseif(isset($_POST['Process']) AND !$BankAccountEmpty) { //user hit submit a new GL Analysis line into the payment
- if (!empty($_POST['Cheque'])) {
+ if(!empty($_POST['Cheque'])) {
$ChequeNoSQL="SELECT transno FROM supptrans WHERE chequeno='" . $_POST['Cheque'] ."'";
$ChequeNoResult=DB_query($ChequeNoSQL);
}
@@ -967,47 +971,57 @@
}
echo '<tr>
- <td>', _('Date Paid'), ':</td>
+ <td>', _('Date'), ':</td>
<td><input alt="', $_SESSION['DefaultDateFormat'], '" class="date" maxlength="10" name="DatePaid" onchange="isDate(this, this.value, ', "'", $_SESSION['DefaultDateFormat'], "'", ')" required="required" size="10" type="text" value="', $_SESSION['PaymentDetail'.$identifier]->DatePaid, '" /></td>
</tr>';
-
-if($_SESSION['PaymentDetail'.$identifier]->SupplierID=='') {
- echo '<tr>
- <td>' . _('Currency of Payment') . ':</td>
- <td><select name="Currency" required="required" onchange="ReloadForm(UpdateHeader)">';
- $SQL = "SELECT currency, currabrev, rate FROM currencies";
- $result=DB_query($SQL);
-
- if(DB_num_rows($result)==0) {
- echo '</select></td>
+// Currency of payment:
+echo '<tr>
+ <td>', _('Currency'), ':</td>
+ <td>';
+/*$result = DB_query("SELECT currency, currabrev, rate FROM currencies");*/
+$result = DB_query("SELECT currabrev FROM currencies");
+if(DB_num_rows($result) == 0) {
+ prnMsg( _('No currencies are defined yet. Payments cannot be entered until a currency is defined'),'error');
+ echo '</td>
+ </tr>';
+} else {
+ include('includes/CurrenciesArray.php');// To get the currency name from the currency code.
+ if($_SESSION['PaymentDetail'.$identifier]->SupplierID == '') {
+ echo '<select name="Currency" onchange="ReloadForm(UpdateHeader)" required="required">';
+ while($myrow=DB_fetch_array($result)) {
+ echo '<option ';
+ if($_SESSION['PaymentDetail'.$identifier]->Currency == $myrow['currabrev']) {
+ echo 'selected="selected" ';
+ }
+ echo 'value="', $myrow['currabrev'], '">', $CurrencyName[$myrow['currabrev']], '</option>';
+ }
+ echo '</select>', _('The transaction currency does not need to be the same as the bank account currency'), '</td>
</tr>';
- prnMsg( _('No currencies are defined yet. Payments cannot be entered until a currency is defined'),'error');
- } else {
- include('includes/CurrenciesArray.php'); // To get the currency name from the currency code.
+ } else { /*It is a supplier payment so it must be in the supplier's currency */
+ echo '<input name="Currency" type="hidden" value="', $_SESSION['PaymentDetail'.$identifier]->Currency, '" />';
+ echo '<select disabled="disabled">';
while($myrow=DB_fetch_array($result)) {
echo '<option ';
- if($_SESSION['PaymentDetail'.$identifier]->Currency==$myrow['currabrev']) {
+ if($_SESSION['PaymentDetail'.$identifier]->Currency == $myrow['currabrev']) {
echo 'selected="selected" ';
}
echo 'value="', $myrow['currabrev'], '">', $CurrencyName[$myrow['currabrev']], '</option>';
}
- echo '</select> <i>', _('The transaction currency does not need to be the same as the bank account currency'), '</i></td>
- </tr>';
+ echo '</select>';
+ echo ' ', _('It is a supplier payment so it should be in the supplier\'s currency'), '</td>
+ </tr>';// Sometimes some people pay in a currency different from supplier's document currency (e.g. invoice in euros paid in dollars).
+
+ /*get the default rate from the currency table if it has not been set */
+ if(!isset($_POST['ExRate']) OR $_POST['ExRate'] == '') {
+ $SQL = "SELECT rate FROM currencies WHERE currabrev='" . $_SESSION['PaymentDetail'.$identifier]->Currency . "'";
+ $Result = DB_query($SQL);
+ $myrow = DB_fetch_row($Result);
+ $_POST['ExRate'] = locale_number_format($myrow[0], 'Variable');
+ }// RChacon: Should be for both cases (Bank_payment and supplier_payment) ?
}
-} else { /*its a supplier payment so it must be in the suppliers currency */
- echo '<tr>';
- echo '<td><input type="hidden" name="Currency" value="' . $_SESSION['PaymentDetail'.$identifier]->Currency . '" />
- ' . _('Supplier Currency') . ':</td>
- <td>' . $_SESSION['PaymentDetail'.$identifier]->Currency . '</td>
- </tr>';
- /*get the default rate from the currency table if it has not been set */
- if(!isset($_POST['ExRate']) OR $_POST['ExRate']=='') {
- $SQL = "SELECT rate FROM currencies WHERE currabrev='" . $_SESSION['PaymentDetail'.$identifier]->Currency ."'";
- $Result=DB_query($SQL);
- $myrow=DB_fetch_row($Result);
- $_POST['ExRate']=locale_number_format($myrow[0],'Variable');
- }
+ // RChacon: Set ExRate from the currency table if it has not been set ?
+ // RChacon: Set SuggestedExRate from the currency table if it has not been set ?
}
if(!isset($_POST['ExRate'])) {
@@ -1018,34 +1032,34 @@
$_POST['FunctionalExRate']=1;
}
if($_SESSION['PaymentDetail'.$identifier]->AccountCurrency != $_SESSION['PaymentDetail'.$identifier]->Currency AND isset($_SESSION['PaymentDetail'.$identifier]->AccountCurrency)) {
- if (isset($SuggestedExRate) AND ($_POST['ExRate'] == 1 OR $_POST['Currency'] != $_POST['PreviousCurrency'] OR $_POST['PreviousBankAccount'] != $_SESSION['PaymentDetail' . $identifier]->Account)) {
- $_POST['ExRate'] = locale_number_format($SuggestedExRate,12);
+ if(isset($SuggestedExRate) AND ($_POST['ExRate'] == 1 OR $_POST['Currency'] != $_POST['PreviousCurrency'] OR $_POST['PreviousBankAccount'] != $_SESSION['PaymentDetail'.$identifier]->Account)) {
+ $_POST['ExRate'] = locale_number_format($SuggestedExRate, 'Variable');
}
if(isset($SuggestedExRate)) {
- $SuggestedExRateText = '<b>' . _('Suggested rate:') . ' 1 ' . $_SESSION['PaymentDetail'.$identifier]->AccountCurrency . ' = ' . locale_number_format($SuggestedExRate,12) . ' ' . $_SESSION['PaymentDetail'.$identifier]->Currency . '</b>';
+ $SuggestedExRateText = '<b>' . _('Suggested rate:') . ' 1 ' . $_SESSION['PaymentDetail'.$identifier]->AccountCurrency . ' = ' . locale_number_format($SuggestedExRate, 'Variable') . ' ' . $_SESSION['PaymentDetail'.$identifier]->Currency . '</b>';
} else {
$SuggestedExRateText = '1 ' . $_SESSION['PaymentDetail'.$identifier]->AccountCurrency . ' = ? ' . $_SESSION['PaymentDetail'.$identifier]->Currency;
}
echo '<tr>
<td>', _('Payment Exchange Rate'), ':</td>
- <td><input class="number" maxlength="12" name="ExRate" size="14" title="', _('The exchange rate between the currency of the bank account currency and the currency of the payment'), '" type="text" value="', $_POST['ExRate'], '" /> ', $SuggestedExRateText, '. <i>', _('The exchange rate between the currency of the bank account currency and the currency of the payment'), '.</i></td>
+ <td><input class="number" maxlength="12" name="ExRate" size="14" title="', _('The exchange rate between the currency of the bank account currency and the currency of the payment'), '" type="text" value="', $_POST['ExRate'], '" /> ', $SuggestedExRateText, ' ', _('The exchange rate between the currency of the bank account currency and the currency of the payment'), '</td>
</tr>';
}
if($_SESSION['PaymentDetail'.$identifier]->AccountCurrency != $_SESSION['CompanyRecord']['currencydefault'] AND isset($_SESSION['PaymentDetail'.$identifier]->AccountCurrency)) {
- if (isset($SuggestedFunctionalExRate) AND ($_POST['FunctionalExRate']==1 OR $_POST['Currency'] != $_POST['PreviousCurrency'] OR $_POST['PreviousBankAccount'] != $_SESSION['PaymentDetail' . $identifier]->Account)) {
- $_POST['FunctionalExRate'] = locale_number_format($SuggestedFunctionalExRate,'Variable');
+ if(isset($SuggestedFunctionalExRate) AND ($_POST['FunctionalExRate']==1 OR $_POST['Currency'] != $_POST['PreviousCurrency'] OR $_POST['PreviousBankAccount'] != $_SESSION['PaymentDetail'.$identifier]->Account)) {
+ $_POST['FunctionalExRate'] = locale_number_format($SuggestedFunctionalExRate, 'Variable');
}
if(isset($SuggestedFunctionalExRate)) {
- $SuggestedFunctionalExRateText = '<b>' . _('Suggested rate:') . ' 1 ' . $_SESSION['CompanyRecord']['currencydefault'] . ' = ' . locale_number_format($SuggestedFunctionalExRate,8) . ' ' . $_SESSION['PaymentDetail'.$identifier]->AccountCurrency . '</b>';
+ $SuggestedFunctionalExRateText = '<b>' . _('Suggested rate:') . ' 1 ' . $_SESSION['CompanyRecord']['currencydefault'] . ' = ' . locale_number_format($SuggestedFunctionalExRate, 'Variable') . ' ' . $_SESSION['PaymentDetail'.$identifier]->AccountCurrency . '</b>';
} else {
$SuggestedFunctionalExRateText = '1 ' . $_SESSION['CompanyRecord']['currencydefault'] . ' = ? ' . $_SESSION['PaymentDetail'.$identifier]->AccountCurrency;
}
echo '<tr>
<td>', _('Functional Exchange Rate'), ':</td>
- <td><input class="number" maxlength="12" name="FunctionalExRate" pattern="[0-9\.,]*" required="required" size="14" title="', _('The exchange rate between the currency of the business (the functional currency) and the currency of the bank account'), '" type="text" value="', $_POST['FunctionalExRate'], '" /> ', $SuggestedFunctionalExRateText, '. <i>', _('The exchange rate between the currency of the business (the functional currency) and the currency of the bank account'), '.</i></td>
+ <td><input class="number" maxlength="16" name="FunctionalExRate" pattern="[0-9\.,]*" required="required" size="18" type="text" value="', $_POST['FunctionalExRate'], '" /> ', $SuggestedFunctionalExRateText, ' ', _('The exchange rate between the currency of the business (the functional currency) and the currency of the bank account'), '</td>
</tr>';
}
echo '<tr>
@@ -1070,7 +1084,7 @@
if(!isset($_POST['ChequeNum'])) {
$_POST['ChequeNum']='';
}
-if (!empty($Errors)) {
+if(!empty($Errors)) {
$ErrClass = 'class="error"';
} else {
$ErrClass = '';
@@ -1087,7 +1101,7 @@
}
echo '<tr>
<td>', _('Reference'), ':</td>
- <td><input maxlength="50" name="BankTransRef" size="52" type="text" value="', stripslashes($_POST['BankTransRef']), '" /> ', _('Reference in banking transactions'), '</td>
+ <td><input maxlength="50" name="BankTransRef" size="52" type="text" value="', stripslashes($_POST['BankTransRef']), '" /> <i>', _('Reference on Bank Transactions Inquiry'), '.</i></td>
</tr>';
// Info to be inserted on `gltrans`.`narrative` varchar(200):
@@ -1094,18 +1108,18 @@
if(!isset($_POST['Narrative'])) {
$_POST['Narrative'] = '';
}
-if (!isset($_POST['Currency'])) {
+if(!isset($_POST['Currency'])) {
$_POST['Currency'] = '';
}
echo '<tr>
<td>', _('Narrative'), ':</td>
- <td><input maxlength="200" name="Narrative" size="52" type="text" value="', stripslashes($_POST['Narrative']), '" /> ', _('Narrative on General Ledger Account Inquiry'), '</td>
+ <td><input maxlength="200" name="Narrative" size="52" type="text" value="', stripslashes($_POST['Narrative']), '" /> <i>', _('Narrative on General Ledger Account Inquiry'), '.</i></td>
</tr>';
echo '<tr>
<td colspan="2"><div class="centre">
<input name="PreviousCurrency" type="hidden" value="', $_POST['Currency'], '" />
- <input type="hidden" name="PreviousBankAccount" value="' . $_SESSION['PaymentDetail' . $identifier]->Account . '" />
+ <input type="hidden" name="PreviousBankAccount" value="' . $_SESSION['PaymentDetail'.$identifier]->Account . '" />
<input name="UpdateHeader" type="submit" value="', _('Update'), '" />
</div></td>
</tr>
@@ -1276,7 +1290,7 @@
echo '<tr>
<td>' . $PaymentItem->Cheque . '</td>
- <td class="number">' . locale_number_format($PaymentItem->Amount,$_SESSION['PaymentDetail'.$identifier]->CurrDecimalPlaces) . '</td>
+ <td class="number">' . locale_number_format($PaymentItem->Amount, $_SESSION['PaymentDetail'.$identifier]->CurrDecimalPlaces) . '</td>
<td>' . $PaymentItem->GLCode . ' - ' . $PaymentItem->GLActName . '</td>
<td>' . stripslashes($PaymentItem->Narrative) . '</td>
<td>' . $PaymentItem->Tag . ' - ' . $TagName . '</td>
@@ -1286,7 +1300,7 @@
}
echo '<tr>
<td></td>
- <td class="number"><b>' . locale_number_format($PaymentTotal,$_SESSION['PaymentDetail'.$identifier]->CurrDecimalPlaces) . '</b></td>
+ <td class="number"><b>' . locale_number_format($PaymentTotal, $_SESSION['PaymentDetail'.$identifier]->CurrDecimalPlaces) . '</b></td>
<td></td>
<td></td>
<td></td>
@@ -1330,7 +1344,7 @@
$ids = '';
while ($myrow = DB_fetch_array($Result)) {
$ids .= $i>0?';' . $myrow['id']:$myrow['id'];
- if (!isset($_POST['paid'.$myrow['id']])) {
+ if(!isset($_POST['paid'.$myrow['id']])) {
$_POST['paid'.$myrow['id']] = 0;
}
echo '<tr>
@@ -1338,9 +1352,9 @@
<td>' . $myrow['typename'] . '</td>
<td>' . $myrow['transno'] . '</td>
<td>' . $myrow['suppreference'] . '</td>
- <td class="number">' . locale_number_format($myrow['amount'],$_SESSION['PaymentDetail'.$identifier]->CurrDecimalPlaces) . '</td>
+ <td class="number">' . locale_number_format($myrow['amount'], $_SESSION['PaymentDetail'.$identifier]->CurrDecimalPlaces) . '</td>
<td><input onclick="AddAmount(this,'.$myrow['id'].');" type="checkbox" name="check'.$myrow['id'] . '" value="' . $myrow['amount'] . '" />' . _('Pay') . '</td>
- <td><input type="text" class="number" id="'.$myrow['id'].'" name="paid'.$myrow['id'].'" value="'.$_POST['paid'.$myrow['id']].'" />
+ <td><input type="text" class="number" id="'.$myrow['id'].'" name="paid'.$myrow['id'].'" value="'.$_POST['paid'.$myrow['id']].'" />
<input type="hidden" name="remainamt'.$myrow['id'] .'" value="'.$myrow['amount'].'" />
</td>
</tr>';
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2017-10-11 11:01:43 UTC (rev 7848)
+++ trunk/doc/Change.log 2017-10-11 17:05:10 UTC (rev 7849)
@@ -1,5 +1,6 @@
webERP Change Log
+17/10/11 RChacon: Improve currency showing and set decimals variable for exchange rate.
17/10/11 Exson: Fix the indian_number_format bug in MiscFunctions.php.
17/10/09 Exson: Fixed the non-balance bug in CustomerReceipt.php. And fixed the non rollback problem when there is a non-balance existed. Fixed error noises.
17/10/03 Exson: Add html view to SuppPriceList.php.
|
|
From: <rc...@us...> - 2017-10-09 23:02:19
|
Revision: 7847
http://sourceforge.net/p/web-erp/reponame/7847
Author: rchacon
Date: 2017-10-09 23:02:16 +0000 (Mon, 09 Oct 2017)
Log Message:
-----------
Update Spanish translation.
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 2017-10-09 09:13:31 UTC (rev 7846)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2017-10-09 23:02:16 UTC (rev 7847)
@@ -8,7 +8,7 @@
"Project-Id-Version: webERP 4.13\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-10-02 10:21-0600\n"
-"PO-Revision-Date: 2017-10-05 12:52-0600\n"
+"PO-Revision-Date: 2017-10-09 17:00-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: TecnoSoluciones.com <web...@te...>\n"
"Language: es_ES\n"
@@ -1139,7 +1139,7 @@
#: AgedControlledInventory.php:48
msgid "Days Old"
-msgstr ""
+msgstr "Días de antigüedad"
#: AgedControlledInventory.php:91 ConfirmDispatch_Invoice.php:310
#: ConfirmDispatch_Invoice.php:314 CounterReturns.php:676
@@ -15872,7 +15872,7 @@
#: GLTrialBalance.php:443 includes/PDFTrialBalancePageHeader.inc:23
msgid "Trial Balance for the month of "
-msgstr "Balance de Comprobación para el mes de "
+msgstr "Balance de comprobación para el mes de "
#: GLTrialBalance.php:444
msgid " AND for the "
@@ -22305,7 +22305,7 @@
#: PDFQALabel.php:20
msgid "QA Label"
-msgstr ""
+msgstr "Etiqueta de aseguramiento de la calidad"
#: PDFQuotation.php:12 PDFQuotationPortrait.php:12
msgid "Select Quotation To Print"
@@ -48074,7 +48074,7 @@
#: includes/PDFTagProfitAndLossPageHeader.inc:21
#: includes/PDFTrialBalancePageHeader.inc:23
msgid " months to "
-msgstr " meses hasta el mes "
+msgstr " meses hasta "
#: includes/PDFProfitAndLossPageHeader.inc:21
#: includes/PDFTagProfitAndLossPageHeader.inc:21
@@ -51824,7 +51824,7 @@
#: install/index.php:1029
msgid "Chart of Accounts"
-msgstr ""
+msgstr "Catálogo contable"
#: install/index.php:1047
msgid ""
@@ -52090,7 +52090,7 @@
#: reportwriter/languages/en_US/reports.php:62
msgid "Custom Color (Range 0-255)"
-msgstr ""
+msgstr "Color personalizado (Rango 0-255)"
#: reportwriter/languages/en_US/reports.php:63
msgid "Custom"
@@ -52500,7 +52500,7 @@
#: reportwriter/languages/en_US/reports.php:210
msgid "Line Width (pts)"
-msgstr ""
+msgstr "Ancho de línea (pts)"
#: reportwriter/languages/en_US/reports.php:211
msgid ""
|
|
From: <rc...@us...> - 2017-10-05 18:55:03
|
Revision: 7845
http://sourceforge.net/p/web-erp/reponame/7845
Author: rchacon
Date: 2017-10-05 18:55:01 +0000 (Thu, 05 Oct 2017)
Log Message:
-----------
Minor: Adjust labels.
Modified Paths:
--------------
trunk/GLTrialBalance.php
trunk/SalesGraph.php
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
Modified: trunk/GLTrialBalance.php
===================================================================
--- trunk/GLTrialBalance.php 2017-10-03 10:19:22 UTC (rev 7844)
+++ trunk/GLTrialBalance.php 2017-10-05 18:55:01 UTC (rev 7845)
@@ -52,7 +52,7 @@
/*Show a form to allow input of criteria for TB to show */
echo '<table class="selection">
<tr>
- <td>' . _('Select Period From:') . '</td>
+ <td>' . _('Select Period From') . ':</td>
<td><select name="FromPeriod">';
$NextYear = date('Y-m-d',strtotime('+1 Year'));
$sql = "SELECT periodno,
@@ -88,7 +88,7 @@
}
echo '<tr>
- <td>' . _('Select Period To:') . '</td>
+ <td>' . _('Select Period To') . ':</td>
<td><select name="ToPeriod">';
$RetResult = DB_data_seek($Periods,0);
Modified: trunk/SalesGraph.php
===================================================================
--- trunk/SalesGraph.php 2017-10-03 10:19:22 UTC (rev 7844)
+++ trunk/SalesGraph.php 2017-10-05 18:55:01 UTC (rev 7845)
@@ -39,7 +39,7 @@
echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title . '</p>';
echo '<table class="selection">
- <tr><td>' . _('Select Period From:') . '</td>
+ <tr><td>' . _('Select Period From') . ':</td>
<td><select name="FromPeriod">';
if (Date('m') > $_SESSION['YearEnd']){
@@ -75,7 +75,7 @@
}
echo '<tr>
- <td>' . _('Select Period To:') . '</td>
+ <td>' . _('Select Period To') . ':</td>
<td><select name="ToPeriod">';
$RetResult = DB_data_seek($Periods,0);
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 2017-10-03 10:19:22 UTC (rev 7844)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2017-10-05 18:55:01 UTC (rev 7845)
@@ -8,7 +8,7 @@
"Project-Id-Version: webERP 4.13\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-10-02 10:21-0600\n"
-"PO-Revision-Date: 2017-10-02 10:27-0600\n"
+"PO-Revision-Date: 2017-10-05 12:52-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: TecnoSoluciones.com <web...@te...>\n"
"Language: es_ES\n"
@@ -15685,11 +15685,11 @@
#: GLProfit_Loss.php:51 GLTagProfit_Loss.php:41 Z_RePostGLFromPeriod.php:18
#: Z_UpdateChartDetailsBFwd.php:24
msgid "Select Period From"
-msgstr "Seleccionar Período Desde"
+msgstr "Seleccionar el período desde"
#: GLProfit_Loss.php:91 GLTagProfit_Loss.php:81 Z_UpdateChartDetailsBFwd.php:42
msgid "Select Period To"
-msgstr "Seleccionar Período Hasta"
+msgstr "Seleccionar el período hasta"
#: GLProfit_Loss.php:199
msgid "Print Profit and Loss Error"
@@ -15845,11 +15845,11 @@
#: GLTrialBalance.php:55 SalesGraph.php:42
msgid "Select Period From:"
-msgstr "Seleccionar Período desde:"
+msgstr "Seleccionar el período desde:"
#: GLTrialBalance.php:91 SalesGraph.php:78
msgid "Select Period To:"
-msgstr "Hata Período:"
+msgstr "Seleccionar el período hasta:"
#: GLTrialBalance.php:110
msgid "Show Trial Balance"
|
|
From: <rc...@us...> - 2017-10-02 16:31:04
|
Revision: 7843
http://sourceforge.net/p/web-erp/reponame/7843
Author: rchacon
Date: 2017-10-02 16:30:58 +0000 (Mon, 02 Oct 2017)
Log Message:
-----------
Rebuild languages files
Modified Paths:
--------------
trunk/SelectCustomer.php
trunk/SelectSupplier.php
trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.mo
trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po
trunk/locale/ar_SY.utf8/LC_MESSAGES/messages.mo
trunk/locale/ar_SY.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/he_IL.utf8/LC_MESSAGES/messages.mo
trunk/locale/he_IL.utf8/LC_MESSAGES/messages.po
trunk/locale/hi_IN.utf8/LC_MESSAGES/messages.mo
trunk/locale/hi_IN.utf8/LC_MESSAGES/messages.po
trunk/locale/hr_HR.utf8/LC_MESSAGES/messages.mo
trunk/locale/hr_HR.utf8/LC_MESSAGES/messages.po
trunk/locale/hu_HU.utf8/LC_MESSAGES/messages.mo
trunk/locale/hu_HU.utf8/LC_MESSAGES/messages.po
trunk/locale/id_ID.utf8/LC_MESSAGES/messages.mo
trunk/locale/id_ID.utf8/LC_MESSAGES/messages.po
trunk/locale/it_IT.utf8/LC_MESSAGES/messages.mo
trunk/locale/it_IT.utf8/LC_MESSAGES/messages.po
trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.mo
trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.po
trunk/locale/ko_KR.utf8/LC_MESSAGES/messages.mo
trunk/locale/ko_KR.utf8/LC_MESSAGES/messages.po
trunk/locale/lv_LV.utf8/LC_MESSAGES/messages.mo
trunk/locale/lv_LV.utf8/LC_MESSAGES/messages.po
trunk/locale/mr_IN.utf8/LC_MESSAGES/messages.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/SelectCustomer.php
===================================================================
--- trunk/SelectCustomer.php 2017-10-02 07:55:23 UTC (rev 7842)
+++ trunk/SelectCustomer.php 2017-10-02 16:30:58 UTC (rev 7843)
@@ -192,8 +192,8 @@
echo '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme,
'/images/customer.png" title="',// Icon image.
_('Customer'), '" /> ',// Icon title.
- _('Customer'), ': ', $_SESSION['CustomerID'], ' - ', $CustomerName, ' - ', $PhoneNo, /*_(' has been selected'), */'</p>',// Page title.
- '<div class="page_help_text">', _('Select a menu option to operate using this customer'), '.</div>',// Page help text.
+ _('Customer'), ': ', $_SESSION['CustomerID'], ' - ', $CustomerName, ' - ', $PhoneNo, '</p>',// Page title.
+ '<div class="page_help_text">', _('Select a menu option to operate using this customer.'), '</div>',// Page help text.
'<br />',
$TableHead,
'<tr>
Modified: trunk/SelectSupplier.php
===================================================================
--- trunk/SelectSupplier.php 2017-10-02 07:55:23 UTC (rev 7842)
+++ trunk/SelectSupplier.php 2017-10-02 16:30:58 UTC (rev 7843)
@@ -176,7 +176,7 @@
echo '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme,
'/images/supplier.png" title="', // Icon image.
_('Supplier'), '" /> ', // Icon title.
- _('Supplier'), ': ', $_SESSION['SupplierID'], ' - ', $SupplierName, /*' ', _('has been selected'), */'</p>',// Page title.
+ _('Supplier'), ': ', $_SESSION['SupplierID'], ' - ', $SupplierName, '</p>',// Page title.
'<div class="page_help_text">', _('Select a menu option to operate using this supplier.'), '</div>',// Page help text.
'<br />',
$TableHead,
Modified: trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po 2017-10-02 07:55:23 UTC (rev 7842)
+++ trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po 2017-10-02 16:30:58 UTC (rev 7843)
@@ -7,8 +7,8 @@
msgstr ""
"Project-Id-Version: webERP 4.13\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-15 10:37-0600\n"
-"PO-Revision-Date: 2013-06-01 11:19-0600\n"
+"POT-Creation-Date: 2017-10-02 10:22-0600\n"
+"PO-Revision-Date: 2017-10-02 10:22-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: Arabic <ar...@li...>\n"
"Language: ar\n"
@@ -15,7 +15,7 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.5.4\n"
+"X-Generator: Poedit 1.8.7.1\n"
"X-Launchpad-Export-Date: 2012-03-07 23:01+0000\n"
#: AccountGroups.php:6 includes/MainMenuLinksArray.php:403
@@ -158,8 +158,8 @@
#: AccountGroups.php:212 AccountGroups.php:247 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:273
-#: CustomerBranches.php:300 CustomerBranches.php:310 CustomerBranches.php:320
-#: CustomerBranches.php:330 CustomerBranches.php:340 Customers.php:296
+#: CustomerBranches.php:293 CustomerBranches.php:303 CustomerBranches.php:313
+#: CustomerBranches.php:323 CustomerBranches.php:333 Customers.php:296
#: Customers.php:305 Customers.php:313 Customers.php:324 Customers.php:334
#: CustomerTypes.php:146 CustomerTypes.php:156 Departments.php:141
#: Factors.php:134 FixedAssetCategories.php:137 GLAccounts.php:110
@@ -167,12 +167,12 @@
#: Locations.php:307 Locations.php:316 Locations.php:325 Locations.php:334
#: Locations.php:343 Locations.php:351 Manufacturers.php:185
#: MRPDemandTypes.php:87 PaymentMethods.php:162 PaymentTerms.php:146
-#: PaymentTerms.php:153 PcExpenses.php:161 SalesCategories.php:146
+#: PaymentTerms.php:153 PcExpenses.php:115 SalesCategories.php:146
#: SalesCategories.php:153 SalesPeople.php:159 SalesPeople.php:166
#: SalesPeople.php:172 SalesTypes.php:140 SalesTypes.php:150 Shippers.php:81
#: Shippers.php:93 StockCategories.php:216 Stocks.php:767 Stocks.php:776
#: Stocks.php:784 Stocks.php:792 Stocks.php:800 Stocks.php:808 Stocks.php:816
-#: Stocks.php:824 Suppliers.php:646 Suppliers.php:655 Suppliers.php:663
+#: Stocks.php:824 Suppliers.php:639 Suppliers.php:648 Suppliers.php:656
#: SupplierTypes.php:126 TaxCategories.php:132 TaxGroups.php:135
#: TaxGroups.php:143 TaxProvinces.php:129 UnitsOfMeasure.php:135
#: WorkCentres.php:91 WorkCentres.php:97 WWW_Access.php:88
@@ -242,26 +242,25 @@
#: InternalStockRequest.php:316 InventoryPlanning.php:459
#: InventoryPlanningPrefSupplier.php:386 MaintenanceTasks.php:14
#: MaintenanceUserSchedule.php:16 MRPReport.php:543 NoSalesItems.php:91
-#: PcAssignCashTabToTab.php:76 PcAssignCashTabToTab.php:156
-#: PcAssignCashTabToTab.php:212 PcAssignCashToTab.php:59
-#: PcAssignCashToTab.php:144 PcAssignCashToTab.php:160
-#: PcAssignCashToTab.php:207 PDFPickingList.php:29 PDFStockLocTransfer.php:16
-#: PO_AuthorisationLevels.php:10 POReport.php:60 POReport.php:64
-#: POReport.php:68 PO_SelectOSPurchOrder.php:153 PriceMatrix.php:16
-#: PricesBasedOnMarkUp.php:8 Prices_Customer.php:35 Prices.php:11
-#: ProductSpecs.php:38 PurchaseByPrefSupplier.php:305 PurchData.php:241
-#: PurchData.php:373 PurchData.php:401 QATests.php:22
-#: RecurringSalesOrders.php:320 SalesAnalReptCols.php:51 SalesAnalRepts.php:14
-#: SalesCategories.php:11 SalesGLPostings.php:19 SalesGraph.php:39
-#: SalesPeople.php:28 SalesTypes.php:20 SelectAsset.php:48
-#: SelectCompletedOrder.php:11 SelectContract.php:69 SelectCreditItems.php:221
-#: SelectCreditItems.php:292 SelectCustomer.php:258 SelectGLAccount.php:86
-#: SelectOrderItems.php:588 SelectOrderItems.php:1514 SelectOrderItems.php:1614
-#: SelectProduct.php:523 SelectQASamples.php:45 SelectSalesOrder.php:545
-#: SelectSupplier.php:14 SelectSupplier.php:222 SelectWorkOrder.php:9
-#: SelectWorkOrder.php:174 SellThroughSupport.php:229 ShipmentCosting.php:11
-#: Shipments.php:17 Shippers.php:123 Shippers.php:160 Shipt_Select.php:8
-#: StockLocMovements.php:14 StockSerialItemResearch.php:30
+#: PcAssignCashTabToTab.php:80 PcAssignCashTabToTab.php:160
+#: PcAssignCashTabToTab.php:216 PcAssignCashToTab.php:49
+#: PcAssignCashToTab.php:121 PcAssignCashToTab.php:136
+#: PcAssignCashToTab.php:170 PDFPickingList.php:29 PDFStockLocTransfer.php:16
+#: POReport.php:60 POReport.php:64 POReport.php:68
+#: PO_SelectOSPurchOrder.php:153 PriceMatrix.php:16 PricesBasedOnMarkUp.php:8
+#: Prices_Customer.php:35 Prices.php:11 ProductSpecs.php:38
+#: PurchaseByPrefSupplier.php:305 PurchData.php:241 PurchData.php:373
+#: PurchData.php:401 QATests.php:22 RecurringSalesOrders.php:320
+#: SalesAnalReptCols.php:51 SalesAnalRepts.php:14 SalesCategories.php:11
+#: SalesGLPostings.php:19 SalesGraph.php:39 SalesPeople.php:28
+#: SalesTypes.php:20 SelectAsset.php:48 SelectCompletedOrder.php:11
+#: SelectContract.php:69 SelectCreditItems.php:221 SelectCreditItems.php:292
+#: SelectCustomer.php:258 SelectGLAccount.php:86 SelectOrderItems.php:588
+#: SelectOrderItems.php:1514 SelectOrderItems.php:1614 SelectProduct.php:539
+#: SelectQASamples.php:45 SelectSalesOrder.php:545 SelectSupplier.php:233
+#: SelectWorkOrder.php:9 SelectWorkOrder.php:174 SellThroughSupport.php:229
+#: ShipmentCosting.php:11 Shipments.php:17 Shippers.php:123 Shippers.php:160
+#: Shipt_Select.php:8 StockLocMovements.php:14 StockSerialItemResearch.php:30
#: SupplierPriceList.php:14 SupplierPriceList.php:229 SupplierPriceList.php:399
#: SupplierPriceList.php:458 SupplierPriceList.php:503 Suppliers.php:304
#: SupplierTenderCreate.php:556 SupplierTenderCreate.php:664
@@ -295,12 +294,11 @@
#: AccountGroups.php:476 AddCustomerContacts.php:165
#: AddCustomerContacts.php:275 AddCustomerContacts.php:279
#: AddCustomerContacts.php:282 BOMs.php:140 BOMs.php:896 BOMs.php:898
-#: BOMs_SingleLevel.php:125 BOMs_SingleLevel.php:793 BOMs_SingleLevel.php:795
#: CompanyPreferences.php:423 CompanyPreferences.php:425
#: CompanyPreferences.php:438 CompanyPreferences.php:440
#: CompanyPreferences.php:453 CompanyPreferences.php:455
#: ContractCosting.php:202 Currencies.php:342 Currencies.php:520
-#: Currencies.php:522 CustomerBranches.php:452 Customers.php:659
+#: Currencies.php:522 CustomerBranches.php:445 Customers.php:659
#: Customers.php:1049 Customers.php:1055 Customers.php:1058
#: DailyBankTransactions.php:215 DeliveryDetails.php:1158
#: DeliveryDetails.php:1199 DeliveryDetails.php:1202 FormDesigner.php:101
@@ -312,10 +310,9 @@
#: MRP.php:566 MRP.php:570 PaymentMethods.php:227 PaymentMethods.php:228
#: PaymentMethods.php:229 PaymentMethods.php:230 PaymentMethods.php:301
#: PaymentMethods.php:308 PaymentMethods.php:315 PaymentMethods.php:322
-#: PcAuthorizeExpenses.php:249 PDFChequeListing.php:65
-#: PDFDeliveryDifferences.php:76 PDFDIFOT.php:80 PDFWOPrint.php:608
-#: PDFWOPrint.php:612 PO_AuthorisationLevels.php:134
-#: PO_AuthorisationLevels.php:139 PO_Header.php:807 PO_PDFPurchOrder.php:413
+#: PDFChequeListing.php:65 PDFDeliveryDifferences.php:76 PDFDIFOT.php:80
+#: PDFWOPrint.php:608 PDFWOPrint.php:612 PO_AuthorisationLevels.php:139
+#: PO_AuthorisationLevels.php:144 PO_Header.php:809 PO_PDFPurchOrder.php:413
#: PO_PDFPurchOrder.php:416 ProductSpecs.php:188 ProductSpecs.php:409
#: ProductSpecs.php:414 ProductSpecs.php:420 ProductSpecs.php:425
#: ProductSpecs.php:430 ProductSpecs.php:562 ProductSpecs.php:608
@@ -332,7 +329,7 @@
#: SalesAnalRepts.php:476 SalesAnalRepts.php:479 SalesCategories.php:297
#: SalesCategories.php:384 SalesCategories.php:388 SalesPeople.php:227
#: SalesPeople.php:367 SalesPeople.php:369 SelectCustomer.php:757
-#: SelectProduct.php:231 SelectProduct.php:369 SelectQASamples.php:424
+#: SelectProduct.php:251 SelectProduct.php:390 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
@@ -345,20 +342,20 @@
#: SystemParameters.php:624 SystemParameters.php:632 SystemParameters.php:672
#: SystemParameters.php:763 SystemParameters.php:772 SystemParameters.php:780
#: SystemParameters.php:798 SystemParameters.php:805 SystemParameters.php:849
-#: SystemParameters.php:945 SystemParameters.php:1088
-#: SystemParameters.php:1090 SystemParameters.php:1100
-#: SystemParameters.php:1102 SystemParameters.php:1156
-#: SystemParameters.php:1168 SystemParameters.php:1170
-#: SystemParameters.php:1208 SystemParameters.php:1210
-#: SystemParameters.php:1232 SystemParameters.php:1234 TaxGroups.php:311
-#: TaxGroups.php:314 TaxGroups.php:365 TestPlanResults.php:304
-#: TestPlanResults.php:532 TestPlanResults.php:747 TestPlanResults.php:864
-#: TestPlanResults.php:924 TestPlanResults.php:928 UserGLAccounts.php:187
-#: UserGLAccounts.php:196 UserSettings.php:209 UserSettings.php:212
-#: UserSettings.php:224 UserSettings.php:227 WWW_Users.php:547
-#: WWW_Users.php:549 WWW_Users.php:718 WWW_Users.php:721 WWW_Users.php:734
-#: WWW_Users.php:737 WWW_Users.php:749 WWW_Users.php:752 WWW_Users.php:764
-#: WWW_Users.php:767
+#: SystemParameters.php:945 SystemParameters.php:1088 SystemParameters.php:1090
+#: SystemParameters.php:1100 SystemParameters.php:1102
+#: SystemParameters.php:1156 SystemParameters.php:1168
+#: SystemParameters.php:1170 SystemParameters.php:1208
+#: SystemParameters.php:1210 SystemParameters.php:1232
+#: SystemParameters.php:1234 TaxGroups.php:311 TaxGroups.php:314
+#: TaxGroups.php:365 TestPlanResults.php:304 TestPlanResults.php:532
+#: TestPlanResults.php:747 TestPlanResults.php:864 TestPlanResults.php:924
+#: TestPlanResults.php:928 UserGLAccounts.php:187 UserGLAccounts.php:196
+#: UserSettings.php:209 UserSettings.php:212 UserSettings.php:224
+#: UserSettings.php:227 WWW_Users.php:547 WWW_Users.php:549 WWW_Users.php:718
+#: WWW_Users.php:721 WWW_Users.php:734 WWW_Users.php:737 WWW_Users.php:749
+#: WWW_Users.php:752 WWW_Users.php:764 WWW_Users.php:767
+#: reportwriter/languages/en_US/reports.php:114
msgid "Yes"
msgstr "موافق"
@@ -371,7 +368,7 @@
#: CompanyPreferences.php:437 CompanyPreferences.php:441
#: CompanyPreferences.php:452 CompanyPreferences.php:456
#: ContractCosting.php:200 Currencies.php:344 Currencies.php:525
-#: Currencies.php:527 CustomerBranches.php:452 Customers.php:658
+#: Currencies.php:527 CustomerBranches.php:445 Customers.php:658
#: Customers.php:1047 Customers.php:1054 Customers.php:1057
#: DailyBankTransactions.php:217 DeliveryDetails.php:1159
#: DeliveryDetails.php:1200 DeliveryDetails.php:1203 FormDesigner.php:99
@@ -383,53 +380,54 @@
#: MRP.php:564 MRP.php:568 NoSalesItems.php:191 PaymentMethods.php:227
#: PaymentMethods.php:228 PaymentMethods.php:229 PaymentMethods.php:230
#: PaymentMethods.php:302 PaymentMethods.php:309 PaymentMethods.php:316
-#: PaymentMethods.php:323 PcAuthorizeExpenses.php:247 PDFChequeListing.php:64
-#: PDFDeliveryDifferences.php:75 PDFDIFOT.php:79 PDFWOPrint.php:609
-#: PDFWOPrint.php:613 PO_AuthorisationLevels.php:136
-#: PO_AuthorisationLevels.php:141 PO_Header.php:806 PO_PDFPurchOrder.php:414
-#: PO_PDFPurchOrder.php:417 ProductSpecs.php:191 ProductSpecs.php:411
-#: ProductSpecs.php:417 ProductSpecs.php:422 ProductSpecs.php:427
-#: ProductSpecs.php:432 ProductSpecs.php:613 ProductSpecs.php:615
-#: ProductSpecs.php:626 ProductSpecs.php:628 ProductSpecs.php:639
-#: ProductSpecs.php:641 ProductSpecs.php:652 ProductSpecs.php:654
-#: PurchData.php:299 PurchData.php:668 PurchData.php:671 QATests.php:298
-#: QATests.php:300 QATests.php:311 QATests.php:313 QATests.php:324
-#: QATests.php:326 QATests.php:337 QATests.php:339 QATests.php:350
-#: QATests.php:352 QATests.php:416 QATests.php:421 QATests.php:426
-#: QATests.php:431 QATests.php:436 RecurringSalesOrders.php:492
-#: RecurringSalesOrders.php:495 SalesAnalReptCols.php:282
-#: SalesAnalReptCols.php:420 SalesAnalReptCols.php:423 SalesAnalRepts.php:419
-#: SalesAnalRepts.php:422 SalesAnalRepts.php:447 SalesAnalRepts.php:450
-#: SalesAnalRepts.php:475 SalesAnalRepts.php:478 SalesCategories.php:299
-#: SalesCategories.php:385 SalesCategories.php:387 SalesPeople.php:229
-#: SalesPeople.php:372 SalesPeople.php:374 SelectCustomer.php:757
-#: SelectProduct.php:233 SelectProduct.php:371 SelectQASamples.php:426
-#: SelectQASamples.php:523 SelectQASamples.php:525 SelectQASamples.php:579
-#: SelectQASamples.php:581 SelectQASamples.php:593 SelectQASamples.php:595
-#: ShipmentCosting.php:668 ShopParameters.php:290 ShopParameters.php:292
-#: ShopParameters.php:338 ShopParameters.php:340 ShopParameters.php:392
-#: ShopParameters.php:394 ShopParameters.php:414 ShopParameters.php:416
-#: ShopParameters.php:496 ShopParameters.php:498 StockClone.php:933
-#: StockClone.php:935 StockClone.php:958 StockClone.php:960 Stocks.php:1261
-#: Stocks.php:1263 Stocks.php:1286 Stocks.php:1288 SuppContractChgs.php:92
+#: PaymentMethods.php:323 PDFChequeListing.php:64 PDFDeliveryDifferences.php:75
+#: PDFDIFOT.php:79 PDFWOPrint.php:609 PDFWOPrint.php:613
+#: PO_AuthorisationLevels.php:141 PO_AuthorisationLevels.php:146
+#: PO_Header.php:808 PO_PDFPurchOrder.php:414 PO_PDFPurchOrder.php:417
+#: ProductSpecs.php:191 ProductSpecs.php:411 ProductSpecs.php:417
+#: ProductSpecs.php:422 ProductSpecs.php:427 ProductSpecs.php:432
+#: ProductSpecs.php:613 ProductSpecs.php:615 ProductSpecs.php:626
+#: ProductSpecs.php:628 ProductSpecs.php:639 ProductSpecs.php:641
+#: ProductSpecs.php:652 ProductSpecs.php:654 PurchData.php:299
+#: PurchData.php:668 PurchData.php:671 QATests.php:298 QATests.php:300
+#: QATests.php:311 QATests.php:313 QATests.php:324 QATests.php:326
+#: QATests.php:337 QATests.php:339 QATests.php:350 QATests.php:352
+#: QATests.php:416 QATests.php:421 QATests.php:426 QATests.php:431
+#: QATests.php:436 RecurringSalesOrders.php:492 RecurringSalesOrders.php:495
+#: SalesAnalReptCols.php:282 SalesAnalReptCols.php:420
+#: SalesAnalReptCols.php:423 SalesAnalRepts.php:419 SalesAnalRepts.php:422
+#: SalesAnalRepts.php:447 SalesAnalRepts.php:450 SalesAnalRepts.php:475
+#: SalesAnalRepts.php:478 SalesCategories.php:299 SalesCategories.php:385
+#: SalesCategories.php:387 SalesPeople.php:229 SalesPeople.php:372
+#: SalesPeople.php:374 SelectCustomer.php:757 SelectProduct.php:253
+#: SelectProduct.php:392 SelectQASamples.php:426 SelectQASamples.php:523
+#: SelectQASamples.php:525 SelectQASamples.php:579 SelectQASamples.php:581
+#: SelectQASamples.php:593 SelectQASamples.php:595 ShipmentCosting.php:668
+#: ShopParameters.php:290 ShopParameters.php:292 ShopParameters.php:338
+#: ShopParameters.php:340 ShopParameters.php:392 ShopParameters.php:394
+#: ShopParameters.php:414 ShopParameters.php:416 ShopParameters.php:496
+#: ShopParameters.php:498 StockClone.php:933 StockClone.php:935
+#: StockClone.php:958 StockClone.php:960 Stocks.php:1261 Stocks.php:1263
+#: Stocks.php:1286 Stocks.php:1288 SuppContractChgs.php:92
#: SystemParameters.php:480 SystemParameters.php:503 SystemParameters.php:544
#: SystemParameters.php:625 SystemParameters.php:633 SystemParameters.php:673
#: SystemParameters.php:764 SystemParameters.php:773 SystemParameters.php:781
#: SystemParameters.php:799 SystemParameters.php:806 SystemParameters.php:850
-#: SystemParameters.php:946 SystemParameters.php:1087
-#: SystemParameters.php:1091 SystemParameters.php:1099
-#: SystemParameters.php:1103 SystemParameters.php:1157
-#: SystemParameters.php:1167 SystemParameters.php:1171
-#: SystemParameters.php:1207 SystemParameters.php:1211
-#: SystemParameters.php:1231 SystemParameters.php:1235 TaxGroups.php:312
-#: TaxGroups.php:315 TaxGroups.php:367 TestPlanResults.php:306
-#: TestPlanResults.php:535 TestPlanResults.php:749 TestPlanResults.php:866
-#: TestPlanResults.php:925 TestPlanResults.php:927 UserGLAccounts.php:189
-#: UserGLAccounts.php:199 UserSettings.php:208 UserSettings.php:211
-#: UserSettings.php:223 UserSettings.php:226 WWW_Users.php:546
-#: WWW_Users.php:550 WWW_Users.php:717 WWW_Users.php:720 WWW_Users.php:733
-#: WWW_Users.php:736 WWW_Users.php:748 WWW_Users.php:751 WWW_Users.php:763
-#: WWW_Users.php:766 includes/PDFLowGPPageHeader.inc:44
+#: SystemParameters.php:946 SystemParameters.php:1087 SystemParameters.php:1091
+#: SystemParameters.php:1099 SystemParameters.php:1103
+#: SystemParameters.php:1157 SystemParameters.php:1167
+#: SystemParameters.php:1171 SystemParameters.php:1207
+#: SystemParameters.php:1211 SystemParameters.php:1231
+#: SystemParameters.php:1235 TaxGroups.php:312 TaxGroups.php:315
+#: TaxGroups.php:367 TestPlanResults.php:306 TestPlanResults.php:535
+#: TestPlanResults.php:749 TestPlanResults.php:866 TestPlanResults.php:925
+#: TestPlanResults.php:927 UserGLAccounts.php:189 UserGLAccounts.php:199
+#: UserSettings.php:208 UserSettings.php:211 UserSettings.php:223
+#: UserSettings.php:226 WWW_Users.php:546 WWW_Users.php:550 WWW_Users.php:717
+#: WWW_Users.php:720 WWW_Users.php:733 WWW_Users.php:736 WWW_Users.php:748
+#: WWW_Users.php:751 WWW_Users.php:763 WWW_Users.php:766
+#: includes/PDFLowGPPageHeader.inc:44
+#: reportwriter/languages/en_US/reports.php:82
msgid "No"
msgstr "ﻻ"
@@ -437,7 +435,7 @@
#: AddCustomerNotes.php:137 AddCustomerTypeNotes.php:131 Areas.php:164
#: BankAccounts.php:243 BOMs.php:198 COGSGLPostings.php:115
#: COGSGLPostings.php:222 CreditStatus.php:175 Currencies.php:374
-#: Currencies.php:391 CustItem.php:166 CustomerBranches.php:456
+#: Currencies.php:391 CustItem.php:166 CustomerBranches.php:449
#: Customers.php:1131 Customers.php:1165 CustomerTypes.php:205
#: Departments.php:186 EDIMessageFormat.php:150 Factors.php:334
#: FixedAssetCategories.php:190 FixedAssetLocations.php:111
@@ -446,8 +444,8 @@
#: Labels.php:358 Locations.php:439 MailingGroupMaintenance.php:178
#: MaintenanceTasks.php:118 Manufacturers.php:260 MRPDemands.php:309
#: MRPDemandTypes.php:120 PaymentMethods.php:232 PaymentTerms.php:205
-#: PcAssignCashToTab.php:291 PcClaimExpensesFromTab.php:280 PcExpenses.php:226
-#: PcTabs.php:256 PcTypeTabs.php:180 PO_AuthorisationLevels.php:151
+#: PcAssignCashToTab.php:271 PcClaimExpensesFromTab.php:330 PcExpenses.php:177
+#: PcTabs.php:214 PcTypeTabs.php:124 PO_AuthorisationLevels.php:156
#: PriceMatrix.php:293 Prices_Customer.php:286 Prices.php:253
#: ProductSpecs.php:465 PurchData.php:312 QATests.php:467
#: SalesCategories.php:305 SalesGLPostings.php:137 SalesGLPostings.php:255
@@ -474,7 +472,7 @@
#: AddCustomerNotes.php:138 AddCustomerTypeNotes.php:132 Areas.php:165
#: BankAccounts.php:244 BOMs.php:200 COGSGLPostings.php:116
#: COGSGLPostings.php:223 ContractBOM.php:271 ContractOtherReqts.php:123
-#: CounterReturns.php:740 CounterSales.php:836 Credit_Invoice.php:419
+#: CounterReturns.php:740 CounterSales.php:836 Credit_Invoice.php:429
#: CreditStatus.php:176 Currencies.php:377 CustItem.php:167
#: CustomerReceipt.php:1009 Customers.php:1166 CustomerTypes.php:206
#: Departments.php:187 DiscountCategories.php:238 DiscountMatrix.php:183
@@ -485,9 +483,9 @@
#: Locations.php:440 MailingGroupMaintenance.php:179 MaintenanceTasks.php:119
#: Manufacturers.php:261 MRPDemands.php:310 MRPDemandTypes.php:121
#: PaymentMethods.php:233 Payments.php:1283 PaymentTerms.php:206
-#: PcAssignCashToTab.php:295 PcClaimExpensesFromTab.php:281 PcExpenses.php:227
-#: PcExpensesTypeTab.php:186 PcTabs.php:257 PcTypeTabs.php:181
-#: PO_AuthorisationLevels.php:153 PO_Items.php:768 PriceMatrix.php:292
+#: PcAssignCashToTab.php:272 PcClaimExpensesFromTab.php:331 PcExpenses.php:178
+#: PcExpensesTypeTab.php:156 PcTabs.php:215 PcTypeTabs.php:125
+#: PO_AuthorisationLevels.php:158 PO_Items.php:768 PriceMatrix.php:292
#: Prices_Customer.php:287 Prices.php:254 ProductSpecs.php:466
#: PurchData.php:314 PurchData.php:721 QATests.php:468
#: RelatedItemsUpdate.php:161 RelatedItemsUpdate.php:176
@@ -507,6 +505,7 @@
#: UnitsOfMeasure.php:186 WorkCentres.php:146 WorkOrderEntry.php:865
#: WOSerialNos.php:335 WWW_Access.php:133 WWW_Users.php:392
#: includes/InputSerialItemsKeyed.php:60 includes/OutputSerialItems.php:99
+#: reportwriter/languages/en_US/reports.php:141
#, php-format
msgid "Delete"
msgstr "حذف"
@@ -531,7 +530,7 @@
#: AccountGroups.php:376 CompanyPreferences.php:466
#: ConfirmDispatch_Invoice.php:656 ConfirmDispatch_Invoice.php:1707
-#: Credit_Invoice.php:1633 CustItem.php:452 FixedAssetItems.php:132
+#: Credit_Invoice.php:1643 CustItem.php:452 FixedAssetItems.php:132
#: FixedAssetItems.php:683 GLAccountUsers.php:153 GLBudgets.php:240
#: GLCashFlowsSetup.php:172 GLTags.php:68 GoodsReceived.php:298
#: GoodsReceived.php:304 GoodsReceived.php:311 GoodsReceived.php:819
@@ -539,7 +538,8 @@
#: InternalStockRequestAuthorisation.php:123
#: InternalStockRequestFulfill.php:364 InternalStockRequest.php:255
#: LocationUsers.php:177 MRPCalendar.php:315 Payments.php:1109
-#: Payments.php:1350 PcAuthorizeExpenses.php:109 PcAuthorizeExpenses.php:294
+#: Payments.php:1350 PcAuthorizeCash.php:100 PcAuthorizeCash.php:274
+#: PcAuthorizeExpenses.php:140 PcAuthorizeExpenses.php:361
#: PO_AuthoriseMyOrders.php:142 PricesByCost.php:223 PurchData.php:758
#: ReorderLevelLocation.php:140 RevisionTranslations.php:111
#: SecurityTokens.php:136 SelectCreditItems.php:954 SellThroughSupport.php:476
@@ -550,16 +550,15 @@
msgid "Update"
msgstr ""
-#: AccountGroups.php:378 AccountGroups.php:418
-#: AnalysisHorizontalIncome.php:125 AnalysisHorizontalIncome.php:526
-#: AnalysisHorizontalPosition.php:79 AnalysisHorizontalPosition.php:362
-#: DailyBankTransactions.php:256 GLAccountUsers.php:253 GLBalanceSheet.php:720
-#: GLCashFlowsIndirect.php:749 GLCashFlowsIndirect.php:782
-#: GLCashFlowsSetup.php:180 GLProfit_Loss.php:1317 GLTrialBalance.php:740
-#: InternalStockRequestInquiry.php:263 PurchasesReport.php:231
-#: PurchasesReport.php:253 SecurityTokens.php:140 SecurityTokens.php:156
-#: UserGLAccounts.php:259 Z_GLAccountUsersCopyAuthority.php:96
-#: includes/Login.php:8
+#: AccountGroups.php:378 AccountGroups.php:418 AnalysisHorizontalIncome.php:125
+#: AnalysisHorizontalIncome.php:526 AnalysisHorizontalPosition.php:79
+#: AnalysisHorizontalPosition.php:362 DailyBankTransactions.php:256
+#: GLAccountUsers.php:253 GLBalanceSheet.php:720 GLCashFlowsIndirect.php:749
+#: GLCashFlowsIndirect.php:782 GLCashFlowsSetup.php:180 GLProfit_Loss.php:1317
+#: GLTrialBalance.php:740 InternalStockRequestInquiry.php:263
+#: PurchasesReport.php:231 PurchasesReport.php:253 SecurityTokens.php:140
+#: SecurityTokens.php:156 UserGLAccounts.php:259
+#: Z_GLAccountUsersCopyAuthority.php:96 includes/Login.php:8
msgid "Return"
msgstr ""
@@ -685,7 +684,7 @@
#: GLAccounts.php:285 Labels.php:647 Locations.php:716 Manufacturers.php:375
#: MRPDemands.php:424 MRPDemandTypes.php:188 OffersReceived.php:57
#: OffersReceived.php:146 PaymentMethods.php:332 PaymentTerms.php:310
-#: PO_AuthorisationLevels.php:264 PriceMatrix.php:236 Prices_Customer.php:369
+#: PO_AuthorisationLevels.php:269 PriceMatrix.php:236 Prices_Customer.php:369
#: ProductSpecs.php:661 QATests.php:359 SalesAnalReptCols.php:552
#: SalesAnalRepts.php:519 SalesGLPostings.php:427 SalesPeople.php:381
#: SelectQASamples.php:531 SelectQASamples.php:601 Shippers.php:203
@@ -733,11 +732,11 @@
#: AddCustomerContacts.php:63 AddCustomerNotes.php:51
#: AddCustomerTypeNotes.php:48 Areas.php:72 CustomerTypes.php:68
#: DeliveryDetails.php:809 DeliveryDetails.php:826 Factors.php:105
-#: FixedAssetItems.php:255 MRPCalendar.php:176 PcAssignCashToTab.php:102
-#: PcClaimExpensesFromTab.php:86 PcExpenses.php:98 PcTabs.php:124
-#: PcTypeTabs.php:63 PO_Items.php:380 ProductSpecs.php:315 QATests.php:76
+#: FixedAssetItems.php:255 MRPCalendar.php:176 PcAssignCashToTab.php:83
+#: PcClaimExpensesFromTab.php:69 PcExpenses.php:63 PcTabs.php:76
+#: PcTypeTabs.php:38 PO_Items.php:380 ProductSpecs.php:315 QATests.php:76
#: SalesAnalReptCols.php:129 SalesPeople.php:105 SalesTypes.php:66
-#: SelectQASamples.php:85 Stocks.php:594 Suppliers.php:531 SupplierTypes.php:68
+#: SelectQASamples.php:85 Stocks.php:594 Suppliers.php:524 SupplierTypes.php:68
msgid "has been updated"
msgstr ""
@@ -750,13 +749,13 @@
msgstr ""
#: AddCustomerContacts.php:133 CompanyPreferences.php:171
-#: CustomerBranches.php:409 Customers.php:1118 Customers.php:1126
+#: CustomerBranches.php:402 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
#: SelectCustomer.php:727 StockDispatch.php:277 StockDispatch.php:288
#: StockDispatch.php:299 SupplierContacts.php:152 SuppTransGLAnalysis.php:108
-#: Tax.php:411 TestPlanResults.php:508 UserBankAccounts.php:164
+#: Tax.php:433 TestPlanResults.php:508 UserBankAccounts.php:164
#: UserGLAccounts.php:157 UserLocations.php:176
#: includes/InputSerialItemsFile.php:92 includes/InputSerialItemsFile.php:144
msgid "Name"
@@ -768,14 +767,14 @@
msgid "Role"
msgstr ""
-#: AddCustomerContacts.php:135 CustomerBranches.php:413
+#: AddCustomerContacts.php:135 CustomerBranches.php:406
#: SupplierContacts.php:154
msgid "Phone No"
msgstr ""
#: AddCustomerContacts.php:136 AddCustomerContacts.php:263
-#: CustomerAccount.php:313 CustomerAccount.php:337 CustomerBranches.php:415
-#: CustomerBranches.php:858 CustomerInquiry.php:325 CustomerInquiry.php:371
+#: CustomerAccount.php:313 CustomerAccount.php:337 CustomerBranches.php:408
+#: CustomerBranches.php:851 CustomerInquiry.php:325 CustomerInquiry.php:371
#: CustomerInquiry.php:410 CustomerInquiry.php:445 CustomerInquiry.php:491
#: Customers.php:1121 Customers.php:1129 EmailCustTrans.php:16
#: EmailCustTrans.php:65 Factors.php:246 Factors.php:297 Locations.php:639
@@ -782,15 +781,15 @@
#: OrderDetails.php:127 PDFRemittanceAdvice.php:251 PDFWOPrint.php:599
#: PDFWOPrint.php:602 PDFWOPrint.php:682 PDFWOPrint.php:685
#: PO_PDFPurchOrder.php:400 PO_PDFPurchOrder.php:403 PrintCustStatements.php:99
-#: PrintCustTrans.php:740 PrintCustTransPortrait.php:788
-#: PrintCustTransPortrait.php:1034 PrintCustTransPortrait.php:1090
-#: SelectCustomer.php:408 SelectCustomer.php:730 SelectSupplier.php:290
+#: PrintCustTrans.php:740 PrintCustTransPortrait.php:787
+#: PrintCustTransPortrait.php:1033 PrintCustTransPortrait.php:1089
+#: SelectCustomer.php:408 SelectCustomer.php:730 SelectSupplier.php:301
#: SupplierContacts.php:156 SupplierContacts.php:277 UserSettings.php:184
#: WWW_Users.php:333 includes/PDFPickingListHeader.inc:25
#: includes/PDFStatementPageHeader.inc:76 includes/PDFTransPageHeader.inc:85
#: includes/PDFTransPageHeaderPortrait.inc:113 includes/PDFWOPageHeader.inc:19
-#: includes/PO_PDFOrderPageHeader.inc:29 ../webSHOP/Checkout.php:443
-#: ../webSHOP/Register.php:608
+#: includes/PO_PDFOrderPageHeader.inc:29 ../webSHOP/Checkout.php:298
+#: ../webSHOP/Register.php:595
msgid "Email"
msgstr ""
@@ -802,11 +801,11 @@
#: AddCustomerContacts.php:138 AddCustomerContacts.php:289
#: AnalysisHorizontalIncome.php:173 AnalysisHorizontalPosition.php:123
#: Customers.php:1122 Customers.php:1130 GLCashFlowsIndirect.php:130
-#: GLCashFlowsIndirect.php:450 PcAssignCashTabToTab.php:261
-#: PcAssignCashTabToTab.php:384 PcAssignCashToTab.php:256
-#: PcAssignCashToTab.php:394 PcAuthorizeExpenses.php:98
-#: PcClaimExpensesFromTab.php:242 PcClaimExpensesFromTab.php:409
-#: PcReportExpense.php:137 PcReportTab.php:336 PDFQuotation.php:252
+#: GLCashFlowsIndirect.php:450 PcAssignCashTabToTab.php:283
+#: PcAssignCashTabToTab.php:414 PcAssignCashToTab.php:232
+#: PcAssignCashToTab.php:370 PcAuthorizeCash.php:91 PcAuthorizeExpenses.php:95
+#: PcClaimExpensesFromTab.php:261 PcClaimExpensesFromTab.php:524
+#: PcReportExpense.php:144 PcReportTab.php:469 PDFQuotation.php:252
#: PDFQuotationPortrait.php:249 PurchasesReport.php:56 SelectCustomer.php:732
#: ShopParameters.php:198 SystemParameters.php:411 WOSerialNos.php:306
#: WOSerialNos.php:312
@@ -835,17 +834,16 @@
msgstr ""
#: AddCustomerContacts.php:236 Factors.php:234 SupplierContacts.php:239
-#: ../webSHOP/Checkout.php:527 ../webSHOP/Register.php:623
+#: ../webSHOP/Checkout.php:379 ../webSHOP/Register.php:610
msgid "Contact Name"
msgstr ""
#: AddCustomerContacts.php:254 Contracts.php:788 PDFRemittanceAdvice.php:247
-#: PO_Header.php:1026 PO_Header.php:1111 SelectCreditItems.php:246
-#: SelectCustomer.php:406 SelectOrderItems.php:626
-#: SupplierTenderCreate.php:395 includes/PDFStatementPageHeader.inc:72
-#: includes/PDFTransPageHeader.inc:84
-#: includes/PDFTransPageHeaderPortrait.inc:109 ../webSHOP/Checkout.php:537
-#: ../webSHOP/Register.php:260 ../webSHOP/Register.php:737
+#: PO_Header.php:1028 PO_Header.php:1113 SelectCreditItems.php:246
+#: SelectCustomer.php:406 SelectOrderItems.php:626 SupplierTenderCreate.php:395
+#: includes/PDFStatementPageHeader.inc:72 includes/PDFTransPageHeader.inc:84
+#: includes/PDFTransPageHeaderPortrait.inc:109 ../webSHOP/Checkout.php:389
+#: ../webSHOP/Register.php:255 ../webSHOP/Register.php:723
msgid "Phone"
msgstr ""
@@ -898,29 +896,30 @@
#: BankReconciliation.php:212 BankReconciliation.php:289
#: ContractCosting.php:177 CustomerAccount.php:252 CustomerAllocations.php:348
#: CustomerAllocations.php:378 CustomerInquiry.php:252
-#: CustomerTransInquiry.php:100 CustWhereAlloc.php:133 GLAccountReport.php:347
+#: CustomerTransInquiry.php:100 CustWhereAlloc.php:144 GLAccountReport.php:347
#: GLTransInquiry.php:47 GoodsReceived.php:130 MRPCalendar.php:219
-#: PaymentAllocations.php:67 Payments.php:1323 PcAssignCashTabToTab.php:257
-#: PcAssignCashToTab.php:252 PcAuthorizeExpenses.php:94 PcReportExpense.php:133
-#: PDFOrdersInvoiced.php:378 PDFRemittanceAdvice.php:308 PDFWOPrint.php:456
-#: PrintCustTrans.php:822 PrintCustTransPortrait.php:902
-#: PrintWOItemSlip.php:186 PrintWOItemSlip.php:197 PrintWOItemSlip.php:208
-#: PurchasesReport.php:67 ReverseGRN.php:401 SelectCustomer.php:810
-#: SelectCustomer.php:852 ShipmentCosting.php:538 ShipmentCosting.php:615
-#: Shipments.php:489 StockDispatch.php:279 StockDispatch.php:290
-#: StockDispatch.php:301 StockLocMovements.php:92 StockMovements.php:105
+#: PaymentAllocations.php:67 Payments.php:1323 PcAssignCashTabToTab.php:280
+#: PcAssignCashToTab.php:229 PcAuthorizeCash.php:88 PDFOrdersInvoiced.php:378
+#: PDFRemittanceAdvice.php:308 PDFWOPrint.php:456 PrintCustTrans.php:822
+#: PrintCustTransPortrait.php:901 PrintWOItemSlip.php:186
+#: PrintWOItemSlip.php:197 PrintWOItemSlip.php:208 PurchasesReport.php:67
+#: ReverseGRN.php:405 SelectCustomer.php:810 SelectCustomer.php:852
+#: ShipmentCosting.php:538 ShipmentCosting.php:615 Shipments.php:489
+#: StockDispatch.php:279 StockDispatch.php:290 StockDispatch.php:301
+#: StockLocMovements.php:92 StockMovements.php:105
#: StockSerialItemResearch.php:82 SupplierAllocations.php:458
#: SupplierAllocations.php:572 SupplierAllocations.php:647
#: SupplierInquiry.php:204 SupplierTransInquiry.php:111 SuppWhereAlloc.php:132
-#: Tax.php:408 Z_CheckGLTransBalance.php:11
+#: Tax.php:430 Z_CheckGLTransBalance.php:11
#: includes/PDFQuotationPageHeader.inc:31
#: includes/PDFQuotationPortraitPageHeader.inc:80
#: includes/PDFStatementPageHeader.inc:164 includes/PDFTransPageHeader.inc:51
#: includes/PDFTransPageHeaderPortrait.inc:62
+#: reportwriter/languages/en_US/reports.php:64
msgid "Date"
msgstr ""
-#: AddCustomerNotes.php:118 AddCustomerTypeNotes.php:112 PcReportTab.php:183
+#: AddCustomerNotes.php:118 AddCustomerTypeNotes.php:112 PcReportTab.php:226
#: SelectCustomer.php:811 SelectCustomer.php:853 StockClone.php:942
#: Stocks.php:1270 UpgradeDatabase.php:253 UpgradeDatabase.php:256
#: UpgradeDatabase.php:259 UpgradeDatabase.php:262 UpgradeDatabase.php:265
@@ -1022,12 +1021,12 @@
#: MRPCalendar.php:21 MRPCreateDemands.php:193 MRPDemands.php:27
#: MRPDemandTypes.php:17 MRP.php:542 MRPPlannedPurchaseOrders.php:264
#: MRPPlannedWorkOrders.php:245 MRPPlannedWorkOrders.php:319 PricesByCost.php:8
-#: ReorderLevelLocation.php:12 ReorderLevel.php:183 SelectProduct.php:91
-#: StockDispatch.php:321 StockMovements.php:22 StockQties_csv.php:8
-#: StockQuantityByDate.php:10 StockReorderLevel.php:20
-#: StockSerialItemResearch.php:9 StockSerialItems.php:9 StockStatus.php:45
-#: StockTransferControlled.php:14 SuppLoginSetup.php:24 WWW_Users.php:28
-#: includes/MainMenuLinksArray.php:24
+#: ReorderLevelLocation.php:12 ReorderLevel.php:183 StockDispatch.php:321
+#: StockMovements.php:22 StockQties_csv.php:8 StockQuantityByDate.php:10
+#: StockReorderLevel.php:20 StockSerialItemResearch.php:9
+#: StockSerialItems.php:9 StockStatus.php:45 StockTransferControlled.php:14
+#: SuppLoginSetup.php:24 WWW_Users.php:28 includes/MainMenuLinksArray.php:24
+#: reportwriter/languages/en_US/reports.php:243
msgid "Inventory"
msgstr ""
@@ -1036,14 +1035,13 @@
msgstr ""
#: AgedControlledInventory.php:42 MRPReschedules.php:124 MRPShortages.php:260
-#: StockClone.php:53 Stocks.php:63
+#: StockClone.php:53 Stocks.php:63 reportwriter/languages/en_US/reports.php:103
msgid "Stock"
msgstr ""
#: AgedControlledInventory.php:43 AutomaticTranslationDescriptions.php:37
#: BOMIndented.php:315 BOMIndentedReverse.php:293 BOMInquiry.php:109
-#: BOMInquiry.php:198 BOMs.php:656 BOMs.php:1014 BOMs_SingleLevel.php:558
-#: BOMs_SingleLevel.php:905 CollectiveWorkOrderCost.php:53
+#: BOMInquiry.php:198 BOMs.php:656 BOMs.php:1014 CollectiveWorkOrderCost.php:53
#: CollectiveWorkOrderCost.php:325 ContractBOM.php:241 ContractBOM.php:353
#: ContractOtherReqts.php:97 CounterReturns.php:1688 CounterSales.php:2112
#: CounterSales.php:2266 CreditStatus.php:152 CreditStatus.php:243
@@ -1061,17 +1059,17 @@
#: MaterialsNotUsed.php:35 MRPDemands.php:92 MRPDemands.php:295
#: MRPDemandTypes.php:113 MRPPlannedWorkOrders.php:256 MRPReport.php:563
#: MRPReport.php:777 MRPReschedules.php:190 MRPShortages.php:349
-#: NoSalesItems.php:194 PaymentTerms.php:182 PcExpenses.php:190
-#: PcExpenses.php:296 PcExpensesTypeTab.php:170 PcReportTab.php:181
-#: PcTypeTabs.php:164 PDFCOA.php:64 PDFOrdersInvoiced.php:335
-#: PDFOrderStatus.php:337 PDFSalesBySalesperson.php:86 PDFWeeklyOrders.php:82
-#: PO_Items.php:716 PO_Items.php:1194 PO_SelectOSPurchOrder.php:310
-#: PO_SelectPurchOrder.php:214 PricesByCost.php:153 RelatedItemsUpdate.php:160
-#: ReorderLevelLocation.php:73 ReorderLevel.php:287 ReverseGRN.php:400
-#: SalesCategories.php:541 SecurityTokens.php:107 SecurityTokens.php:167
-#: SelectAsset.php:264 SelectCompletedOrder.php:506 SelectContract.php:147
+#: NoSalesItems.php:194 PaymentTerms.php:182 PcExpenses.php:141
+#: PcExpenses.php:229 PcExpensesTypeTab.php:143 PcTypeTabs.php:111
+#: PDFCOA.php:64 PDFOrdersInvoiced.php:335 PDFOrderStatus.php:337
+#: PDFSalesBySalesperson.php:86 PDFWeeklyOrders.php:82 PO_Items.php:716
+#: PO_Items.php:1194 PO_SelectOSPurchOrder.php:310 PO_SelectPurchOrder.php:214
+#: PricesByCost.php:153 RelatedItemsUpdate.php:160 ReorderLevelLocation.php:73
+#: ReorderLevel.php:287 ReverseGRN.php:404 SalesCategories.php:541
+#: SecurityTokens.php:107 SecurityTokens.php:167 SelectAsset.php:264
+#: SelectCompletedOrder.php:506 SelectContract.php:147
#: SelectCreditItems.php:1019 SelectOrderItems.php:1524
-#: SelectOrderItems.php:1695 SelectProduct.php:543 SelectProduct.php:832
+#: SelectOrderItems.php:1695 SelectProduct.php:559 SelectProduct.php:848
#: SelectQASamples.php:299 SelectQASamples.php:397 SelectSalesOrder.php:603
#: SelectWorkOrder.php:219 Shipt_Select.php:191 StockClone.php:695
#: StockCounts.php:142 StockDispatch.php:506 StockLocStatus.php:176
@@ -1092,8 +1090,8 @@
#: includes/PDFStockLocTransferHeader.inc:65
#: includes/PDFStockTransferHeader.inc:36 includes/PDFTopItemsHeader.inc:50
#: includes/PDFTransPageHeader.inc:211
-#: includes/PDFTransPageHeaderPortrait.inc:256 api/api_xml-rpc.php:3489
-#: ../webSHOP/includes/PlaceOrder.php:250
+#: includes/PDFTransPageHeaderPortrait.inc:256 includes/DefineLabelClass.php:12
+#: includes/DefineLabelClass.php:45 ../webSHOP/includes/PlaceOrder.php:236
msgid "Description"
msgstr ""
@@ -1136,14 +1134,14 @@
#: SuppFixedAssetChgs.php:93 SupplierAllocations.php:460
#: SupplierAllocations.php:573 SupplierAllocations.php:648
#: SupplierCredit.php:407 SupplierInquiry.php:209 SuppShiptChgs.php:97
-#: SuppTransGLAnalysis.php:140 Tax.php:250 Z_CheckDebtorsControl.php:149
+#: SuppTransGLAnalysis.php:140 Tax.php:301 Z_CheckDebtorsControl.php:149
#: api/api_debtortransactions.php:1271 api/api_debtortransactions.php:1284
#: api/api_debtortransactions.php:1581 includes/PDFQuotationPageHeader.inc:119
#: includes/PDFQuotationPortraitPageHeader.inc:100
-#: includes/PO_PDFOrderPageHeader.inc:81 api/api_debtortransactions.php:1271
-#: api/api_debtortransactions.php:1284 api/api_debtortransactions.php:1581
-#: ../webSHOP/includes/DisplayShoppingCart.php:8
-#: ../webSHOP/includes/PlaceOrder.php:299
+#: includes/PO_PDFOrderPageHeader.inc:81
+#: reportwriter/languages/en_US/reports.php:107
+#: ../webSHOP/includes/DisplayShoppingCart.php:7
+#: ../webSHOP/includes/PlaceOrder.php:285
#, php-format
msgid "Total"
msgstr ""
@@ -1184,7 +1182,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:46
+#: 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
@@ -1240,10 +1238,14 @@
#: 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
+#: SuppPaymentRun.php:217 SuppPriceList.php:142 Tax.php:47 Tax.php:152
+#: Tax.php:181 Tax.php:340 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
@@ -1250,9 +1252,6 @@
#: 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 ""
@@ -1274,14 +1273,14 @@
#: Areas.php:94 ConfirmDispatch_Invoice.php:172
#: ConfirmDispatch_Invoice.php:1003 ConfirmDispatch_Invoice.php:1017
#: Contracts.php:599 CounterReturns.php:1020 CounterReturns.php:1034
-#: CounterSales.php:1431 CounterSales.php:1445 Credit_Invoice.php:764
-#: Credit_Invoice.php:785 CustItem.php:73 CustItem.php:86 CustItem.php:197
+#: CounterSales.php:1431 CounterSales.php:1445 Credit_Invoice.php:774
+#: Credit_Invoice.php:795 CustItem.php:73 CustItem.php:86 CustItem.php:197
#: CustomerReceipt.php:595 CustomerReceipt.php:748 CustomerReceipt.php:776
#: CustomerTransInquiry.php:91 Dashboard.php:247 Dashboard.php:400
#: DeliveryDetails.php:412 GLProfit_Loss.php:613 GLTagProfit_Loss.php:516
#: Payments.php:447 PDFRemittanceAdvice.php:85 PurchData.php:114
#: PurchData.php:132 PurchData.php:360 RecurringSalesOrders.php:267
-#: ReverseGRN.php:193 ReverseGRN.php:207 ReverseGRN.php:387
+#: ReverseGRN.php:197 ReverseGRN.php:211 ReverseGRN.php:391
#: SelectCreditItems.php:1454 SelectSalesOrder.php:213 SelectSalesOrder.php:379
#: SellThroughSupport.php:81 SellThroughSupport.php:97 SMTPServer.php:66
#: StockCheck.php:217 StockClone.php:446 StockClone.php:520
@@ -1303,10 +1302,9 @@
#: includes/PDFPaymentRun_PymtFooter.php:91
#: includes/PDFPaymentRun_PymtFooter.php:121
#: includes/PDFPaymentRun_PymtFooter.php:158
-#: includes/PDFPaymentRun_PymtFooter.php:189 includes/ConnectDB_mysqli.inc:70
-#: includes/ConnectDB_mysql.inc:62
+#: includes/PDFPaymentRun_PymtFooter.php:189
#: ../webSHOP/includes/DatabaseFunctions.php:60
-#: ../webSHOP/includes/Functions.php:448 ../webSHOP/includes/PlaceOrder.php:68
+#: ../webSHOP/includes/Functions.php:438 ../webSHOP/includes/PlaceOrder.php:70
msgid "The SQL that failed was"
msgstr ""
@@ -1382,11 +1380,11 @@
#: InventoryPlanningPrefSupplier.php:437 InventoryQuantities.php:210
#: InventoryValuation.php:273 MRPPlannedPurchaseOrders.php:293
#: MRPPlannedWorkOrders.php:346 MRPReschedules.php:151 MRPShortages.php:302
-#: OutstandingGRNs.php:280 PDFCustomerList.php:421 PDFLowGP.php:146
-#: PDFPriceList.php:351 PDFRemittanceAdvice.php:175
+#: OutstandingGRNs.php:280 PcReportTab.php:79 PDFCustomerList.php:421
+#: PDFLowGP.php:146 PDFPriceList.php:351 PDFRemittanceAdvice.php:175
#: PDFStockCheckComparison.php:373 PrintCustTrans.php:564
-#: PrintCustTransPortrait.php:609 ReorderLevel.php:248 StockDispatch.php:449
-#: SupplierBalsAtPeriodEnd.php:159 SuppPriceList.php:260 Tax.php:385
+#: PrintCustTransPortrait.php:608 ReorderLevel.php:248 StockDispatch.php:449
+#: SupplierBalsAtPeriodEnd.php:159 SuppPriceList.php:260 Tax.php:410
msgid "Print PDF"
msgstr ""
@@ -1458,12 +1456,12 @@
#: BankAccounts.php:369 BOMs.php:138 BOMs.php:144 BOMs.php:152 BOMs.php:1032
#: InternalStockRequest.php:584 PaymentTerms.php:190 PaymentTerms.php:196
#: PO_SelectOSPurchOrder.php:651 SalesAnalReptCols.php:285
-#: SelectProduct.php:137 SelectProduct.php:187 SelectProduct.php:248
-#: SelectProduct.php:249 SelectProduct.php:852
+#: SelectProduct.php:157 SelectProduct.php:207 SelectProduct.php:268
+#: SelectProduct.php:269 SelectProduct.php:868
#: StockCategorySalesInquiry.php:154 StockCategorySalesInquiry.php:188
#: StockCategorySalesInquiry.php:189 StockCategorySalesInquiry.php:194
#: StockCategorySalesInquiry.php:217 StockCategorySalesInquiry.php:230
-#: TopItems.php:193 TopItems.php:194 ../webSHOP/includes/Functions.php:40
+#: TopItems.php:193 TopItems.php:194 ../webSHOP/includes/Functions.php:41
msgid "N/A"
msgstr ""
@@ -1473,13 +1471,12 @@
msgid "Horizontal Analysis of Statement of Comprehensive Income"
msgstr ""
-#: AnalysisHorizontalIncome.php:26 GLProfit_Loss.php:14
-#: GLTagProfit_Loss.php:14 Z_UpdateChartDetailsBFwd.php:14
+#: AnalysisHorizontalIncome.php:26 GLProfit_Loss.php:14 GLTagProfit_Loss.php:14
+#: Z_UpdateChartDetailsBFwd.php:14
msgid "The selected period from is actually after the period to"
msgstr ""
-#: AnalysisHorizontalIncome.php:26 GLProfit_Loss.php:14
-#: GLTagProfit_Loss.php:14
+#: AnalysisHorizontalIncome.php:26 GLProfit_Loss.php:14 GLTagProfit_Loss.php:14
msgid "Please reselect the reporting period"
msgstr ""
@@ -1534,7 +1531,7 @@
#: AnalysisHorizontalPosition.php:65 AnalysisHorizontalPosition.php:112
#: EDIMessageFormat.php:224 EDIMessageFormat.php:226 GLBalanceSheet.php:61
#: GLProfit_Loss.php:109 GLTagProfit_Loss.php:120 POReport.php:1521
-#: SalesInquiry.php:1070 Tax.php:433
+#: SalesInquiry.php:1070 Tax.php:453
msgid "Summary"
msgstr ""
@@ -1560,25 +1557,25 @@
msgid "Show on Screen (HTML)"
msgstr ""
-#: AnalysisHorizontalIncome.php:135 GLProfit_Loss.php:147
-#: GLProfit_Loss.php:577 GLTagProfit_Loss.php:155 GLTagProfit_Loss.php:480
+#: AnalysisHorizontalIncome.php:135 GLProfit_Loss.php:147 GLProfit_Loss.php:577
+#: GLTagProfit_Loss.php:155 GLTagProfit_Loss.php:480
msgid "A period up to 12 months in duration can be specified"
msgstr ""
-#: AnalysisHorizontalIncome.php:135 GLProfit_Loss.php:147
-#: GLProfit_Loss.php:577 GLTagProfit_Loss.php:155 GLTagProfit_Loss.php:480
+#: AnalysisHorizontalIncome.php:135 GLProfit_Loss.php:147 GLProfit_Loss.php:577
+#: GLTagProfit_Loss.php:155 GLTagProfit_Loss.php:480
msgid ""
"the system automatically shows a comparative for the same period from the "
"previous year"
msgstr ""
-#: AnalysisHorizontalIncome.php:135 GLProfit_Loss.php:147
-#: GLProfit_Loss.php:577 GLTagProfit_Loss.php:155 GLTagProfit_Loss.php:480
+#: AnalysisHorizontalIncome.php:135 GLProfit_Loss.php:147 GLProfit_Loss.php:577
+#: GLTagProfit_Loss.php:155 GLTagProfit_Loss.php:480
msgid "it cannot do this if a period of more than 12 months is specified"
msgstr ""
-#: AnalysisHorizontalIncome.php:135 GLProfit_Loss.php:147
-#: GLProfit_Loss.php:577 GLTagProfit_Loss.php:155 GLTagProfit_Loss.php:480
+#: AnalysisHorizontalIncome.php:135 GLProfit_Loss.php:147 GLProfit_Loss.php:577
+#: GLTagProfit_Loss.php:155 GLTagProfit_Loss.php:480
msgid "Please select an alternative period range"
msgstr ""
@@ -1588,7 +1585,7 @@
msgstr ""
#: AnalysisHorizontalIncome.php:153 GLProfit_Loss.php:624
-#: GLTagProfit_Loss.php:530 GLTrialBalance.php:444 Tax.php:25
+#: GLTagProfit_Loss.php:530 GLTrialBalance.php:444 Tax.php:16
#: includes/PDFTaxPageHeader.inc:31
msgid "months to"
msgstr ""
@@ -1597,7 +1594,7 @@
#: Contracts.php:836 CustomerAccount.php:230 CustomerInquiry.php:162
#: CustomerReceipt.php:1044 GLBalanceSheet.php:404 GLCashFlowsIndirect.php:85
#: GLProfit_Loss.php:626 PDFRemittanceAdvice.php:275 PO_Header.php:609
-#: PrintCustTrans.php:776 PrintCustTransPortrait.php:928
+#: PrintCustTrans.php:776 PrintCustTransPortrait.php:927
#: SupplierInquiry.php:121 includes/PDFQuotationPageHeader.inc:98
#: includes/PDFQuotationPortraitPageHeader.inc:88
#: includes/PDFStatementPageHeader.inc:125 includes/PDFTransPageHeader.inc:162
@@ -1684,7 +1681,7 @@
#: PDFPriceList.php:431 SalesAnalReptCols.php:31 SalesAnalReptCols.php:33
#: SalesByTypePeriodInquiry.php:362 SalesCategoryPeriodInquiry.php:169
#: SalesGraph.php:195 SalesGraph.php:214 SalesGraph.php:277
-#: SelectProduct.php:182
+#: SelectProduct.php:202
#, php-format
msgid "Gross Profit"
msgstr ""
@@ -1700,7 +1697,7 @@
#: AnalysisHorizontalIncome.php:522 AnalysisHorizontalPosition.php:358
#: BOMs.php:918 ConfirmDispatch_Invoice.php:1655
#: ConfirmDispatch_Invoice.php:1657 ContractBOM.php:298 CounterReturns.php:1603
-#: CounterReturns.php:1605 CustomerReceipt.php:601 CustWhereAlloc.php:198
+#: CounterReturns.php:1605 CustomerReceipt.php:601 CustWhereAlloc.php:234
#: DailyBankTransactions.php:251 DeliveryDetails.php:605
#: DeliveryDetails.php:609 DeliveryDetails.php:831 DeliveryDetails.php:835
#: GLAccountUsers.php:248 GLBalanceSheet.php:716 GLCashFlowsIndirect.php:745
@@ -1713,7 +1710,7 @@
#: PO_PDFPurchOrder.php:402 PO_SelectOSPurchOrder.php:603
#: PO_SelectOSPurchOrder.php:644 PrintCustStatements.php:84
#: PrintCustStatements.php:533 PrintCustStatements.php:553
-#: PrintCustTrans.php:531 PrintCustTransPortrait.php:566
+#: PrintCustTrans.php:531 PrintCustTransPortrait.php:565
#: PurchasesReport.php:227 SelectSalesOrder.php:918 SuppWhereAlloc.php:196
#: UserGLAccounts.php:254
msgid "Print"
@@ -1834,11 +1831,11 @@
#: Areas.php:131 CustomerTypes.php:167 Factors.php:140
#: FixedAssetCategories.php:142 GLAccounts.php:214
#: InternalStockCategoriesByRole.php:102 Locations.php:380
-#: Manufacturers.php:197 MRPDemands.php:250 PcAssignCashToTab.php:149
-#: PcClaimExpensesFromTab.php:134 PcExpenses.php:169 PcExpensesTypeTab.php:100
-#: PcTabs.php:188 PcTypeTabs.php:143 SalesAnalReptCols.php:215
+#: Manufacturers.php:197 MRPDemands.php:250 PcAssignCashToTab.php:127
+#: PcClaimExpensesFromTab.php:158 PcExpenses.php:121 PcExpensesTypeTab.php:83
+#: PcTabs.php:137 PcTypeTabs.php:94 SalesAnalReptCols.php:215
#: SalesCategories.php:157 SalesTypes.php:156 StockCategories.php:233
-#: Suppliers.php:672 SupplierTypes.php:132 Z_DeleteInvoice.php:178
+#: Suppliers.php:665 SupplierTypes.php:132 Z_DeleteInvoice.php:178
#: includes/DefineOfferClass.php:137
msgid "has been deleted"
msgstr ""
@@ -1881,8 +1878,8 @@
msgid "To Date"
msgstr ""
-#: AuditTrail.php:53 PO_AuthorisationLevels.php:124
-#: PO_AuthorisationLevels.php:173 PO_AuthorisationLevels.php:176
+#: AuditTrail.php:53 PO_AuthorisationLevels.php:128
+#: PO_AuthorisationLevels.php:178 PO_AuthorisationLevels.php:181
#: StockMovements.php:106 UserSettings.php:115 includes/UserLogin.php:251
msgid "User ID"
msgstr ""
@@ -1912,7 +1909,7 @@
#: SalesGraph.php:124 SalesGraph.php:126 SalesGraph.php:148 SalesGraph.php:150
#: SalesGraph.php:186 SalesInquiry.php:1096 SalesInquiry.php:1159
#: SelectCreditItems.php:983 SelectOrderItems.php:1622
-#: SelectOrderItems.php:1625 SelectProduct.php:531 SelectProduct.php:533
+#: SelectOrderItems.php:1625 SelectProduct.php:547 SelectProduct.php:549
#: SelectSalesOrder.php:575 StockCategorySalesInquiry.php:35
#: StockCategorySalesInquiry.php:37 StockDispatch.php:82 StockDispatch.php:396
#: StockDispatch.php:398 StockLocStatus.php:74 StockLocStatus.php:76
@@ -1919,13 +1916,13 @@
#: StockLocStatus.php:94 StockLocStatus.php:99 StockLocStatus.php:104
#: StockLocStatus.php:109 StockQuantityByDate.php:25 SupplierPriceList.php:27
#: SupplierPriceList.php:29 SupplierTenderCreate.php:683
-#: SupplierTenderCreate.php:685 SupplierTenders.php:409
-#: SupplierTenders.php:411 SupplierTransInquiry.php:31
-#: SystemParameters.php:1119 SystemParameters.php:1125
-#: SystemParameters.php:1131 SystemParameters.php:1137
-#: SystemParameters.php:1143 TopItems.php:32 TopItems.php:49 TopItems.php:71
-#: TopItems.php:73 WorkOrderEntry.php:903 WorkOrderEntry.php:906
-#: WorkOrderIssue.php:964 WorkOrderIssue.php:967
+#: SupplierTenderCreate.php:685 SupplierTenders.php:409 SupplierTenders.php:411
+#: SupplierTransInquiry.php:31 SystemParameters.php:1119
+#: SystemParameters.php:1125 SystemParameters.php:1131
+#: SystemParameters.php:1137 SystemParameters.php:1143 TopItems.php:32
+#: TopItems.php:49 TopItems.php:71 TopItems.php:73 WorkOrderEntry.php:903
+#: WorkOrderEntry.php:906 WorkOrderIssue.php:964 WorkOrderIssue.php:967
+#: reportwriter/languages/en_US/reports.php:54
msgid "All"
msgstr ""
@@ -1939,7 +1936,7 @@
#: AuditTrail.php:90 GLAccountUsers.php:152 InternalStockRequest.php:598
#: LocationUsers.php:176 MRPReport.php:806 PO_SelectPurchOrder.php:432
-#: SelectContract.php:187 SelectProduct.php:879 UserGLAccounts.php:158
+#: SelectContract.php:187 SelectProduct.php:899 UserGLAccounts.php:158
#: UserLocations.php:177
msgid "View"
msgstr ""
@@ -1951,7 +1948,7 @@
#: AuditTrail.php:176 BankAccountUsers.php:77 BankAccountUsers.php:90
#: GLAccountUsers.php:117 GLAccountUsers.php:129 GLAccountUsers.php:140
#: LocationUsers.php:77 LocationUsers.php:90 LocationUsers.php:100
-#: PcReportTab.php:269 UserBankAccounts.php:77 UserBankAccounts.php:90
+#: PcReportTab.php:376 UserBankAccounts.php:77 UserBankAccounts.php:90
#: UserGLAccounts.php:118 UserGLAccounts.php:130 UserGLAccounts.php:146
#: UserLocations.php:77 UserLocations.php:90 UserLocations.php:100
#: includes/header.php:61
@@ -1961,7 +1958,7 @@
#: AuditTrail.php:177 BankReconciliation.php:213 BankReconciliation.php:290
#: CustomerAccount.php:250 CustomerAllocations.php:376 CustomerInquiry.php:250
#: CustomerPurchases.php:82 CustomerTransInquiry.php:21
-#: CustomerTransInquiry.php:98 CustWhereAlloc.php:26 CustWhereAlloc.php:134
+#: CustomerTransInquiry.php:98 CustWhereAlloc.php:26 CustWhereAlloc.php:145
#: DailyBankTransactions.php:153 GLAccountInquiry.php:190
#: GLAccountReport.php:345 GLJournal.php:266 MRPReschedules.php:192
#: ProductSpecs.php:388 QATests.php:257 QATests.php:395
@@ -1969,10 +1966,11 @@
#: ShipmentCosting.php:536 ShipmentCosting.php:613 StockLocMovements.php:90
#: StockMovements.php:103 SupplierAllocations.php:456 SupplierInquiry.php:205
#: SupplierTransInquiry.php:20 SupplierTransInquiry.php:108
-#: SuppWhereAlloc.php:26 SuppWhereAlloc.php:133 Tax.php:409
+#: SuppWhereAlloc.php:26 SuppWhereAlloc.php:133 Tax.php:431
#: Z_CheckAllocationsFrom.php:32 Z_CheckAllocationsFrom.php:57
#: Z_CheckAllocs.php:62 Z_CheckGLTransBalance.php:12
#: includes/InputSerialItemsFile.php:94 includes/InputSerialItemsFile.php:152
+#: reportwriter/languages/en_US/reports.php:111
msgid "Type"
msgstr ""
@@ -1981,7 +1979,7 @@
msgstr ""
#: AuditTrail.php:179 api/api_xml-rpc.php:311 api/api_xml-rpc.php:777
-#: api/api_xml-rpc.php:2187
+#: api/api_xml-rpc.php:2187 reportwriter/languages/en_US/reports.php:72
msgid "Field Name"
msgstr ""
@@ -1993,7 +1991,7 @@
msgid "Value"
msgstr ""
-#: AutomaticTranslationDescriptions.php:5 includes/MainMenuLinksArray.php:581
+#: AutomaticTranslationDescriptions.php:5 includes/MainMenuLinksArray.php:583
msgid "Translate Item Descriptions"
msgstr ""
@@ -2009,7 +2007,7 @@
#: AutomaticTranslationDescriptions.php:36 BOMInquiry.php:108 BOMs.php:655
#: BOMs.php:1013 CollectiveWorkOrderCost.php:324 ContractBOM.php:352
#: CounterReturns.php:1687 CounterSales.php:2111 CounterSales.php:2265
-#: CustItem.php:297 CustomerBranches.php:408 CustomerReceipt.php:1232
+#: CustItem.php:297 CustomerBranches.php:401 CustomerReceipt.php:1232
#: GLCodesInquiry.php:26 InternalStockRequestInquiry.php:266
#: InternalStockRequest.php:563 InternalStockRequest.php:633
#: MaterialsNotUsed.php:34 MRPDemands.php:91 MRPPlannedWorkOrders.php:255
@@ -2020,8 +2018,8 @@
#: ReorderLevelLocation.php:72 RevisionTranslations.php:59 SalesPeople.php:207
#: SelectCompletedOrder.php:505 SelectCreditItems.php:1018
#: SelectCustomer.php:401 SelectGLAccount.php:134 SelectOrderItems.php:1523
-#: SelectOrderItems.php:1694 SelectProduct.php:325 SelectProduct.php:830
-#: SelectQASamples.php:298 SelectSalesOrder.php:602 SelectSupplier.php:282
+#: SelectOrderItems.php:1694 SelectProduct.php:345 SelectProduct.php:846
+#: SelectQASamples.php:298 SelectSalesOrder.php:602 SelectSupplier.php:293
#: SelectWorkOrder.php:218 SellThroughSupport.php:159 Shipt_Select.php:190
#: SpecialOrder.php:148 StockCategories.php:263 SupplierPriceList.php:275
#: SupplierPriceList.php:466 SupplierTenderCreate.php:617
@@ -2035,12 +2033,13 @@
#: AutomaticTranslationDescriptions.php:38 CustomerTransInquiry.php:52
#: FixedAssetRegister.php:366 GLJournalInquiry.php:45 GLJournalInquiry.php:62
-#: PcReportExpense.php:102 PcReportTab.php:272 PcTabExpensesList.php:211
+#: PcReportExpense.php:102 PcReportT...
[truncated message content] |
|
From: <rc...@us...> - 2017-10-02 07:55:26
|
Revision: 7842
http://sourceforge.net/p/web-erp/reponame/7842
Author: rchacon
Date: 2017-10-02 07:55:23 +0000 (Mon, 02 Oct 2017)
Log Message:
-----------
Standardise and add icons for usability.
Modified Paths:
--------------
trunk/SelectCustomer.php
trunk/SelectProduct.php
trunk/SelectSupplier.php
trunk/doc/Change.log
trunk/index.php
Modified: trunk/SelectCustomer.php
===================================================================
--- trunk/SelectCustomer.php 2017-09-27 23:48:22 UTC (rev 7841)
+++ trunk/SelectCustomer.php 2017-10-02 07:55:23 UTC (rev 7842)
@@ -8,11 +8,6 @@
$BookMark = 'SelectCustomer';
include('includes/header.php');
-echo '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme,
- '/images/customer.png" title="',// Icon image.
- _('Customer'), '" /> ',// Icon title.
- _('Customers'), '</p>';// Page title.
-
include('includes/SQL_CommonFunctions.inc');
if(isset($_GET['Select'])) {
@@ -147,7 +142,25 @@
}
}// end of if search
+$TableHead =
+ '<table cellpadding="4" width="90%" class="selection">
+ <thead>
+ <tr>
+ <th style="width:33%">' .
+ '<img alt="" src="' . $RootPath . '/css/' . $Theme . '/images/reports.png" title="' . _('Inquiries and Reports') . '" />' .
+ _('Customer Inquiries') . '</th>
+ <th style="width:33%">' .
+ '<img alt="" src="' . $RootPath . '/css/' . $Theme . '/images/transactions.png" title="' . _('Transactions') . '" />' .
+ _('Customer Transactions') . '</th>
+ <th style="width:33%">' .
+ '<img alt="" src="' . $RootPath . '/css/' . $Theme . '/images/maintenance.png" title="' . _('Maintenance') . '" />' .
+ _('Customer Maintenance') . '</th>
+ </tr>
+ </thead>
+ <tbody>';
+
if($_SESSION['CustomerID'] != '' AND !isset($_POST['Search']) AND !isset($_POST['CSV'])) {
+ // A customer is selected
if(!isset($_SESSION['BranchCode'])) {
// !isset($_SESSION['BranchCode'])
$SQL = "SELECT debtorsmaster.name,
@@ -179,20 +192,11 @@
echo '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme,
'/images/customer.png" title="',// Icon image.
_('Customer'), '" /> ',// Icon title.
- _('Customer'), ' : ', $_SESSION['CustomerID'], ' - ', $CustomerName, ' - ', $PhoneNo, _(' has been selected'), '</p>';// Page title.
-
- echo '<div class="page_help_text">', _('Select a menu option to operate using this customer'), '.</div>
- <br />
- <table cellpadding="4" width="90%" class="selection">
- <thead>
- <tr>
- <th style="width:33%">', _('Customer Inquiries'), '</th>
- <th style="width:33%">', _('Customer Transactions'), '</th>
- <th style="width:33%">', _('Customer Maintenance'), '</th>
- </tr>
- </thead>
- <tbody>
- <tr>
+ _('Customer'), ': ', $_SESSION['CustomerID'], ' - ', $CustomerName, ' - ', $PhoneNo, /*_(' has been selected'), */'</p>',// Page title.
+ '<div class="page_help_text">', _('Select a menu option to operate using this customer'), '.</div>',// Page help text.
+ '<br />',
+ $TableHead,
+ '<tr>
<td valign="top" class="select">';
// Customer inquiries options:
echo '<a href="', $RootPath, '/CustomerInquiry.php?CustomerID=', urlencode($_SESSION['CustomerID']), '">' . _('Customer Transaction Inquiries') . '</a><br />';
@@ -225,26 +229,22 @@
<tbody>
</table>';
} else {
- echo '<table cellpadding="4" width="90%" class="selection">
- <thead>
- <tr>
- <th style="width:33%">', _('Customer Inquiries'), '</th>
- <th style="width:33%">', _('Customer Transactions'), '</th>
- <th style="width:33%">', _('Customer Maintenance'), '</th>
- </tr>
- </thead>
- <tbody>';
- echo '<tr>
- <td class="select"></td>
- <td class="select"></td>
- <td class="select">';
+ // Customer is not selected yet
+ echo '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/customer.png" title="', // Icon image.
+ _('Customers'), '" /> ', // Icon title.
+ _('Customers'), '</p>',// Page title.
+ '<br />',
+ $TableHead,
+ '<tr>',
+ '<td class="select"></td>',// Customer inquiries options.
+ '<td class="select"></td>',// Customer transactions options.
+ '<td class="select">';
if(!isset($_SESSION['SalesmanLogin']) OR $_SESSION['SalesmanLogin'] == '') {
- echo '<a href="', $RootPath, '/Customers.php">' . _('Add a New Customer') . '</a><br />';
+ echo '<a href="', $RootPath, '/Customers.php">', _('Add a New Customer'), '</a><br />';
}
- echo '</td>
- </tr>
- <tbody>
- </table>';
+ echo '</td>',// Item maintenance options.
+ '</tr><tbody></table>';
}
// Search for customers:
Modified: trunk/SelectProduct.php
===================================================================
--- trunk/SelectProduct.php 2017-09-27 23:48:22 UTC (rev 7841)
+++ trunk/SelectProduct.php 2017-10-02 07:55:23 UTC (rev 7842)
@@ -8,11 +8,10 @@
include ('includes/session.php');
$Title = _('Search Inventory Items');
-/* webERP manual links before header.php */
$ViewTopic= 'Inventory';
$BookMark = 'SelectingInventory';
+include ('includes/header.php');
-include ('includes/header.php');
include ('includes/SQL_CommonFunctions.inc');
if (isset($_GET['StockID'])) {
@@ -20,7 +19,7 @@
$_GET['StockID'] = trim(mb_strtoupper($_GET['StockID']));
$_POST['Select'] = trim(mb_strtoupper($_GET['StockID']));
}
-echo '<p class="page_title_text"><img src="' . $RootPath . '/css/' . $Theme . '/images/inventory.png" title="' . _('Inventory Items') . '" alt="" />' . ' ' . _('Inventory Items') . '</p>';
+
if (isset($_GET['NewSearch']) or isset($_POST['Next']) or isset($_POST['Previous']) or isset($_POST['Go'])) {
unset($StockID);
unset($_SESSION['SelectedStockItem']);
@@ -50,6 +49,22 @@
}
// end of showing search facilities
/* displays item options if there is one and only one selected */
+$TableHead =
+ '<table cellpadding="4" width="90%" class="selection">
+ <thead>
+ <tr>
+ <th style="width:33%">' .
+ '<img alt="" src="' . $RootPath . '/css/' . $Theme . '/images/reports.png" title="' . _('Inquiries and Reports') . '" />' .
+ _('Item Inquiries') . '</th>
+ <th style="width:33%">' .
+ '<img alt="" src="' . $RootPath . '/css/' . $Theme . '/images/transactions.png" title="' . _('Transactions') . '" />' .
+ _('Item Transactions') . '</th>
+ <th style="width:33%">' .
+ '<img alt="" src="' . $RootPath . '/css/' . $Theme . '/images/maintenance.png" title="' . _('Maintenance') . '" />' .
+ _('Item Maintenance') . '</th>
+ </tr>
+ </thead>
+ <tbody>';
if (!isset($_POST['Search']) AND (isset($_POST['Select']) OR isset($_SESSION['SelectedStockItem']))) {
if (isset($_POST['Select'])) {
$_SESSION['SelectedStockItem'] = $_POST['Select'];
@@ -86,13 +101,18 @@
} else {
$ItemStatus = '';
}
+/* echo '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/inventory.png" title="', // Icon image.
+ _('Inventory Item'), '" /> ', // Icon title.
+ '<b title="', $myrow['longdescription'], '">',
+ _('Inventory Item'), ': ', $StockID, ' - ', $myrow['description'], '</b> ', $ItemStatus, '</p>';// Page title.*/
+ echo '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/inventory.png" title="', // Icon image.
+ _('Inventory Item'), '" /> ', // Icon title.
+ _('Inventory Item'), ': ', $StockID, ' - ', $myrow['description'], ' ', $ItemStatus, '</p>';// Page title.
+
echo '<table width="90%">
- <tr>
- <th colspan="3"><img src="' . $RootPath . '/css/' . $Theme . '/images/inventory.png" title="' . _('Inventory') . '" alt="" /><b title="' . $myrow['longdescription'] . '">' . ' ' . $StockID . ' - ' . $myrow['description'] . '</b> ' . $ItemStatus . '</th>
- </tr>';
-
-
- echo '<tr>
+ <tr>
<td style="width:40%" valign="top">
<table>'; //nested table
echo '<tr><th class="number">' . _('Category') . ':</th> <td colspan="6" class="select">' . $myrow['categorydescription'] , '</td></tr>';
@@ -205,7 +225,7 @@
$PropertiesResult = DB_query($sql);
$PropertyCounter = 0;
$PropertyWidth = array();
- while ($PropertyRow = DB_fetch_array($PropertiesResult)) {
+ while($PropertyRow = DB_fetch_array($PropertiesResult)) {
$PropValResult = DB_query("SELECT value
FROM stockitemproperties
WHERE stockid='" . $StockID . "'
@@ -234,289 +254,284 @@
}
break;
} //end switch
- echo '</td></tr>';
- $PropertyCounter++;
-} //end loop round properties for the item category
-echo '</table></td>'; //end of Item Category Property mod
-echo '<td style="width:15%; vertical-align:top">
- <table>'; //nested table to show QOH/orders
-$QOH = 0;
-switch ($myrow['mbflag']) {
- case 'A':
- case 'D':
- case 'K':
- $QOH = _('N/A');
- $QOO = _('N/A');
- break;
- case 'M':
- case 'B':
- $QOHResult = DB_query("SELECT sum(quantity)
- FROM locstock
- WHERE stockid = '" . $StockID . "'");
- $QOHRow = DB_fetch_row($QOHResult);
- $QOH = locale_number_format($QOHRow[0], $myrow['decimalplaces']);
+ echo '</td></tr>';
+ $PropertyCounter++;
+ } //end loop round properties for the item category
+ echo '</table></td>'; //end of Item Category Property mod
+ echo '<td style="width:15%; vertical-align:top">
+ <table>'; //nested table to show QOH/orders
+ $QOH = 0;
+ switch ($myrow['mbflag']) {
+ case 'A':
+ case 'D':
+ case 'K':
+ $QOH = _('N/A');
+ $QOO = _('N/A');
+ break;
+ case 'M':
+ case 'B':
+ $QOHResult = DB_query("SELECT sum(quantity)
+ FROM locstock
+ WHERE stockid = '" . $StockID . "'");
+ $QOHRow = DB_fetch_row($QOHResult);
+ $QOH = locale_number_format($QOHRow[0], $myrow['decimalplaces']);
- // Get the QOO due to Purchase orders for all locations. Function defined in SQL_CommonFunctions.inc
- $QOO = GetQuantityOnOrderDueToPurchaseOrders($StockID, '');
- // Get the QOO dues to Work Orders for all locations. Function defined in SQL_CommonFunctions.inc
- $QOO += GetQuantityOnOrderDueToWorkOrders($StockID, '');
+ // Get the QOO due to Purchase orders for all locations. Function defined in SQL_CommonFunctions.inc
+ $QOO = GetQuantityOnOrderDueToPurchaseOrders($StockID, '');
+ // Get the QOO dues to Work Orders for all locations. Function defined in SQL_CommonFunctions.inc
+ $QOO += GetQuantityOnOrderDueToWorkOrders($StockID, '');
- $QOO = locale_number_format($QOO, $myrow['decimalplaces']);
- break;
-}
-$Demand = 0;
-$DemResult = DB_query("SELECT SUM(salesorderdetails.quantity-salesorderdetails.qtyinvoiced) AS dem
- FROM salesorderdetails INNER JOIN salesorders
- ON salesorders.orderno = salesorderdetails.orderno
- INNER JOIN locationusers ON locationusers.loccode=salesorders.fromstkloc AND locationusers.userid='" . $_SESSION['UserID'] . "' AND locationusers.canview=1
- WHERE salesorderdetails.completed=0
- AND salesorders.quotation=0
- AND salesorderdetails.stkcode='" . $StockID . "'");
-$DemRow = DB_fetch_row($DemResult);
-$Demand = $DemRow[0];
-$DemAsComponentResult = DB_query("SELECT SUM((salesorderdetails.quantity-salesorderdetails.qtyinvoiced)*bom.quantity) AS dem
- FROM salesorderdetails INNER JOIN salesorders
- ON salesorders.orderno = salesorderdetails.orderno
- INNER JOIN bom ON salesorderdetails.stkcode=bom.parent
- INNER JOIN stockmaster ON stockmaster.stockid=bom.parent
- INNER JOIN locationusers ON locationusers.loccode=salesorders.fromstkloc AND locationusers.userid='" . $_SESSION['UserID'] . "' AND locationusers.canview=1
- WHERE salesorderdetails.quantity-salesorderdetails.qtyinvoiced > 0
- AND bom.component='" . $StockID . "'
- AND stockmaster.mbflag='A'
- AND salesorders.quotation=0");
-$DemAsComponentRow = DB_fetch_row($DemAsComponentResult);
-$Demand+= $DemAsComponentRow[0];
-//Also the demand for the item as a component of works orders
-$sql = "SELECT SUM(qtypu*(woitems.qtyreqd - woitems.qtyrecd)) AS woqtydemo
- FROM woitems INNER JOIN worequirements
- ON woitems.stockid=worequirements.parentstockid
- INNER JOIN workorders
- ON woitems.wo=workorders.wo
- AND woitems.wo=worequirements.wo
- INNER JOIN locationusers ON locationusers.loccode=workorders.loccode AND locationusers.userid='" . $_SESSION['UserID'] . "' AND locationusers.canview=1
- WHERE worequirements.stockid='" . $StockID . "'
- AND workorders.closed=0";
-$ErrMsg = _('The workorder component demand for this product cannot be retrieved because');
-$DemandResult = DB_query($sql, $ErrMsg);
-if (DB_num_rows($DemandResult) == 1) {
- $DemandRow = DB_fetch_row($DemandResult);
- $Demand+= $DemandRow[0];
-}
-echo '<tr>
- <th class="number" style="width:15%">' . _('Quantity On Hand') . ':</th>
- <td style="width:17%; text-align:right" class="select">' . $QOH . '</td>
- </tr>
- <tr>
- <th class="number" style="width:15%">' . _('Quantity Demand') . ':</th>
- <td style="width:17%; text-align:right" class="select">' . locale_number_format($Demand, $myrow['decimalplaces']) . '</td>
- </tr>
- <tr>
- <th class="number" style="width:15%">' . _('Quantity On Order') . ':</th>
- <td style="width:17%; text-align:right" class="select">' . $QOO . '</td>
- </tr>
- </table>'; //end of nested table
-echo '</td>'; //end cell of master table
+ $QOO = locale_number_format($QOO, $myrow['decimalplaces']);
+ break;
+ }
+ $Demand = 0;
+ $DemResult = DB_query("SELECT SUM(salesorderdetails.quantity-salesorderdetails.qtyinvoiced) AS dem
+ FROM salesorderdetails INNER JOIN salesorders
+ ON salesorders.orderno = salesorderdetails.orderno
+ INNER JOIN locationusers ON locationusers.loccode=salesorders.fromstkloc AND locationusers.userid='" . $_SESSION['UserID'] . "' AND locationusers.canview=1
+ WHERE salesorderdetails.completed=0
+ AND salesorders.quotation=0
+ AND salesorderdetails.stkcode='" . $StockID . "'");
+ $DemRow = DB_fetch_row($DemResult);
+ $Demand = $DemRow[0];
+ $DemAsComponentResult = DB_query("SELECT SUM((salesorderdetails.quantity-salesorderdetails.qtyinvoiced)*bom.quantity) AS dem
+ FROM salesorderdetails INNER JOIN salesorders
+ ON salesorders.orderno = salesorderdetails.orderno
+ INNER JOIN bom ON salesorderdetails.stkcode=bom.parent
+ INNER JOIN stockmaster ON stockmaster.stockid=bom.parent
+ INNER JOIN locationusers ON locationusers.loccode=salesorders.fromstkloc AND locationusers.userid='" . $_SESSION['UserID'] . "' AND locationusers.canview=1
+ WHERE salesorderdetails.quantity-salesorderdetails.qtyinvoiced > 0
+ AND bom.component='" . $StockID . "'
+ AND stockmaster.mbflag='A'
+ AND salesorders.quotation=0");
+ $DemAsComponentRow = DB_fetch_row($DemAsComponentResult);
+ $Demand+= $DemAsComponentRow[0];
+ //Also the demand for the item as a component of works orders
+ $sql = "SELECT SUM(qtypu*(woitems.qtyreqd - woitems.qtyrecd)) AS woqtydemo
+ FROM woitems INNER JOIN worequirements
+ ON woitems.stockid=worequirements.parentstockid
+ INNER JOIN workorders
+ ON woitems.wo=workorders.wo
+ AND woitems.wo=worequirements.wo
+ INNER JOIN locationusers ON locationusers.loccode=workorders.loccode AND locationusers.userid='" . $_SESSION['UserID'] . "' AND locationusers.canview=1
+ WHERE worequirements.stockid='" . $StockID . "'
+ AND workorders.closed=0";
+ $ErrMsg = _('The workorder component demand for this product cannot be retrieved because');
+ $DemandResult = DB_query($sql, $ErrMsg);
+ if (DB_num_rows($DemandResult) == 1) {
+ $DemandRow = DB_fetch_row($DemandResult);
+ $Demand+= $DemandRow[0];
+ }
+ echo '<tr>
+ <th class="number" style="width:15%">' . _('Quantity On Hand') . ':</th>
+ <td style="width:17%; text-align:right" class="select">' . $QOH . '</td>
+ </tr>
+ <tr>
+ <th class="number" style="width:15%">' . _('Quantity Demand') . ':</th>
+ <td style="width:17%; text-align:right" class="select">' . locale_number_format($Demand, $myrow['decimalplaces']) . '</td>
+ </tr>
+ <tr>
+ <th class="number" style="width:15%">' . _('Quantity On Order') . ':</th>
+ <td style="width:17%; text-align:right" class="select">' . $QOO . '</td>
+ </tr>
+ </table>'; //end of nested table
+ echo '</td>'; //end cell of master table
-if (($myrow['mbflag'] == 'B' OR ($myrow['mbflag'] == 'M'))
- AND (in_array($SuppliersSecurity, $_SESSION['AllowedPageSecurityTokens']))){
+ if (($myrow['mbflag'] == 'B' OR ($myrow['mbflag'] == 'M'))
+ AND (in_array($SuppliersSecurity, $_SESSION['AllowedPageSecurityTokens']))){
- echo '<td style="width:50%" valign="top"><table>
- <tr><th style="width:20%">' . _('Supplier') . '</th>
- <th stlye="width:15%">' . _('Code') . '</th>
- <th style="width:15%">' . _('Cost') . '</th>
- <th style="width:5%">' . _('Curr') . '</th>
- <th style="width:10%">' . _('Lead Time') . '</th>
- <th style="width:10%">' . _('Min Order Qty') . '</th>
- <th style="width:5%">' . _('Prefer') . '</th></tr>';
- $SuppResult = DB_query("SELECT suppliers.suppname,
- suppliers.currcode,
- suppliers.supplierid,
- purchdata.price,
- purchdata.suppliers_partno,
- purchdata.leadtime,
- purchdata.conversionfactor,
- purchdata.minorderqty,
- purchdata.preferred,
- currencies.decimalplaces,
- purchdata.effectivefrom
- FROM purchdata INNER JOIN suppliers
- ON purchdata.supplierno=suppliers.supplierid
- INNER JOIN currencies
- ON suppliers.currcode=currencies.currabrev
- WHERE purchdata.stockid = '" . $StockID . "'
- AND purchdata.effectivefrom=(SELECT max(a.effectivefrom) FROM purchdata a WHERE purchdata.supplierno=a.supplierno and a.stockid=purchdata.stockid)
- GROUP BY suppliers.suppname,
- suppliers.currcode,
- suppliers.supplierid,
- purchdata.price,
- purchdata.suppliers_partno,
- purchdata.leadtime,
- purchdata.conversionfactor,
- purchdata.minorderqty,
- purchdata.preferred,
- currencies.decimalplaces
- ORDER BY purchdata.preferred DESC");
+ echo '<td style="width:50%" valign="top"><table>
+ <tr><th style="width:20%">' . _('Supplier') . '</th>
+ <th stlye="width:15%">' . _('Code') . '</th>
+ <th style="width:15%">' . _('Cost') . '</th>
+ <th style="width:5%">' . _('Curr') . '</th>
+ <th style="width:10%">' . _('Lead Time') . '</th>
+ <th style="width:10%">' . _('Min Order Qty') . '</th>
+ <th style="width:5%">' . _('Prefer') . '</th></tr>';
+ $SuppResult = DB_query("SELECT suppliers.suppname,
+ suppliers.currcode,
+ suppliers.supplierid,
+ purchdata.price,
+ purchdata.suppliers_partno,
+ purchdata.leadtime,
+ purchdata.conversionfactor,
+ purchdata.minorderqty,
+ purchdata.preferred,
+ currencies.decimalplaces,
+ purchdata.effectivefrom
+ FROM purchdata INNER JOIN suppliers
+ ON purchdata.supplierno=suppliers.supplierid
+ INNER JOIN currencies
+ ON suppliers.currcode=currencies.currabrev
+ WHERE purchdata.stockid = '" . $StockID . "'
+ AND purchdata.effectivefrom=(SELECT max(a.effectivefrom) FROM purchdata a WHERE purchdata.supplierno=a.supplierno and a.stockid=purchdata.stockid)
+ GROUP BY suppliers.suppname,
+ suppliers.currcode,
+ suppliers.supplierid,
+ purchdata.price,
+ purchdata.suppliers_partno,
+ purchdata.leadtime,
+ purchdata.conversionfactor,
+ purchdata.minorderqty,
+ purchdata.preferred,
+ currencies.decimalplaces
+ ORDER BY purchdata.preferred DESC");
- while ($SuppRow = DB_fetch_array($SuppResult)) {
- echo '<tr>
- <td class="select">' . $SuppRow['suppname'] . '</td>
- <td class="select">' . $SuppRow['suppliers_partno'] . '</td>
- <td class="select" style="text-align:right">' . locale_number_format($SuppRow['price'] / $SuppRow['conversionfactor'], $SuppRow['decimalplaces']) . '</td>
- <td class="select">' . $SuppRow['currcode'] . '</td>
- <td class="select" style="text-align:right">' . $SuppRow['leadtime'] . '</td>
- <td class="select" style="text-align:right">' . $SuppRow['minorderqty'] . '</td>';
+ while ($SuppRow = DB_fetch_array($SuppResult)) {
+ echo '<tr>
+ <td class="select">' . $SuppRow['suppname'] . '</td>
+ <td class="select">' . $SuppRow['suppliers_partno'] . '</td>
+ <td class="select" style="text-align:right">' . locale_number_format($SuppRow['price'] / $SuppRow['conversionfactor'], $SuppRow['decimalplaces']) . '</td>
+ <td class="select">' . $SuppRow['currcode'] . '</td>
+ <td class="select" style="text-align:right">' . $SuppRow['leadtime'] . '</td>
+ <td class="select" style="text-align:right">' . $SuppRow['minorderqty'] . '</td>';
- if ($SuppRow['preferred']==1) { //then this is the preferred supplier
- echo '<td class="select">' . _('Yes') . '</td>';
- } else {
- echo '<td class="select">' . _('No') . '</td>';
+ if ($SuppRow['preferred']==1) { //then this is the preferred supplier
+ echo '<td class="select">' . _('Yes') . '</td>';
+ } else {
+ echo '<td class="select">' . _('No') . '</td>';
+ }
+ echo '<td class="select"><a href="' . $RootPath . '/PO_Header.php?NewOrder=Yes&SelectedSupplier=' .
+ $SuppRow['supplierid'] . '&StockID=' . urlencode($StockID) . '&Quantity='.$SuppRow['minorderqty'].'&LeadTime='.$SuppRow['leadtime'] . '">' . _('Order') . ' </a></td>';
+ echo '</tr>';
}
- echo '<td class="select"><a href="' . $RootPath . '/PO_Header.php?NewOrder=Yes&SelectedSupplier=' .
- $SuppRow['supplierid'] . '&StockID=' . urlencode($StockID) . '&Quantity='.$SuppRow['minorderqty'].'&LeadTime='.$SuppRow['leadtime'] . '">' . _('Order') . ' </a></td>';
- echo '</tr>';
+ echo '</table>';
+ DB_data_seek($result, 0);
}
- echo '</table>';
- DB_data_seek($result, 0);
-}
-echo '</td>
- </tr>
- </table>
- <br />'; // end first item details table
-echo '<table width="90%">
- <tr>
- <th style="width:33%">' . _('Item Inquiries') . '</th>
- <th style="width:33%">' . _('Item Transactions') . '</th>
- <th style="width:33%">' . _('Item Maintenance') . '</th>
+ echo '</td>
</tr>
- <tr>
- <td valign="top" class="select">';
-/*Stock Inquiry Options */
-echo '<a href="' . $RootPath . '/StockMovements.php?StockID=' . urlencode($StockID) . '">' . _('Show Stock Movements') . '</a><br />';
-if ($Its_A_Kitset_Assembly_Or_Dummy == False) {
- echo '<a href="' . $RootPath . '/StockStatus.php?StockID=' . urlencode($StockID) . '">' . _('Show Stock Status') . '</a><br />';
- echo '<a href="' . $RootPath . '/StockUsage.php?StockID=' . urlencode($StockID) . '">' . _('Show Stock Usage') . '</a><br />';
-}
-echo '<a href="' . $RootPath . '/SelectSalesOrder.php?SelectedStockItem=' . urlencode($StockID) . '">' . _('Search Outstanding Sales Orders') . '</a><br />';
-echo '<a href="' . $RootPath . '/SelectCompletedOrder.php?SelectedStockItem=' . urlencode($StockID) . '">' . _('Search Completed Sales Orders') . '</a><br />';
-if ($Its_A_Kitset_Assembly_Or_Dummy == False) {
- echo '<a href="' . $RootPath . '/PO_SelectOSPurchOrder.php?SelectedStockItem=' . urlencode($StockID) . '">' . _('Search Outstanding Purchase Orders') . '</a><br />';
- echo '<a href="' . $RootPath . '/PO_SelectPurchOrder.php?SelectedStockItem=' . urlencode($StockID) . '">' . _('Search All Purchase Orders') . '</a><br />';
+ </table>',// End first item details table
+ '<div class="page_help_text">', _('Select a menu option to operate using this inventory item.'), '</div>',// Page help text.
+ '<br />',
+ $TableHead,
+ '<tr>
+ <td valign="top" class="select">';
+ /*Stock Inquiry Options */
+ echo '<a href="' . $RootPath . '/StockMovements.php?StockID=' . urlencode($StockID) . '">' . _('Show Stock Movements') . '</a><br />';
+ if ($Its_A_Kitset_Assembly_Or_Dummy == False) {
+ echo '<a href="' . $RootPath . '/StockStatus.php?StockID=' . urlencode($StockID) . '">' . _('Show Stock Status') . '</a><br />';
+ echo '<a href="' . $RootPath . '/StockUsage.php?StockID=' . urlencode($StockID) . '">' . _('Show Stock Usage') . '</a><br />';
+ }
+ echo '<a href="' . $RootPath . '/SelectSalesOrder.php?SelectedStockItem=' . urlencode($StockID) . '">' . _('Search Outstanding Sales Orders') . '</a><br />';
+ echo '<a href="' . $RootPath . '/SelectCompletedOrder.php?SelectedStockItem=' . urlencode($StockID) . '">' . _('Search Completed Sales Orders') . '</a><br />';
+ if ($Its_A_Kitset_Assembly_Or_Dummy == False) {
+ echo '<a href="' . $RootPath . '/PO_SelectOSPurchOrder.php?SelectedStockItem=' . urlencode($StockID) . '">' . _('Search Outstanding Purchase Orders') . '</a><br />';
+ echo '<a href="' . $RootPath . '/PO_SelectPurchOrder.php?SelectedStockItem=' . urlencode($StockID) . '">' . _('Search All Purchase Orders') . '</a><br />';
- $SupportedImgExt = array('png','jpg','jpeg');
- $imagefile = reset((glob($_SESSION['part_pics_dir'] . '/' . $StockID . '.{' . implode(",", $SupportedImgExt) . '}', GLOB_BRACE)));
- echo '<a href="' . $RootPath . '/' . $imagefile . '" target="_blank">' . _('Show Part Picture (if available)') . '</a><br />';
-}
-if ($Its_A_Dummy == False) {
- echo '<a href="' . $RootPath . '/BOMInquiry.php?StockID=' . urlencode($StockID) . '">' . _('View Costed Bill Of Material') . '</a><br />';
- echo '<a href="' . $RootPath . '/WhereUsedInquiry.php?StockID=' . urlencode($StockID) . '">' . _('Where This Item Is Used') . '</a><br />';
-}
-if ($Its_A_Labour_Item == True) {
- echo '<a href="' . $RootPath . '/WhereUsedInquiry.php?StockID=' . urlencode($StockID) . '">' . _('Where This Labour Item Is Used') . '</a><br />';
-}
-wikiLink('Product', $StockID);
-echo '</td><td valign="top" class="select">';
-/* Stock Transactions */
-if ($Its_A_Kitset_Assembly_Or_Dummy == false) {
- echo '<a href="' . $RootPath . '/StockAdjustments.php?StockID=' . urlencode($StockID) . '">' . _('Quantity Adjustments') . '</a><br />';
- echo '<a href="' . $RootPath . '/StockTransfers.php?StockID=' . urlencode($StockID) . '&NewTransfer=true">' . _('Location Transfers') . '</a><br />';
+ $SupportedImgExt = array('png','jpg','jpeg');
+ $imagefile = reset((glob($_SESSION['part_pics_dir'] . '/' . $StockID . '.{' . implode(",", $SupportedImgExt) . '}', GLOB_BRACE)));
+ echo '<a href="' . $RootPath . '/' . $imagefile . '" target="_blank">' . _('Show Part Picture (if available)') . '</a><br />';
+ }
+ if ($Its_A_Dummy == False) {
+ echo '<a href="' . $RootPath . '/BOMInquiry.php?StockID=' . urlencode($StockID) . '">' . _('View Costed Bill Of Material') . '</a><br />';
+ echo '<a href="' . $RootPath . '/WhereUsedInquiry.php?StockID=' . urlencode($StockID) . '">' . _('Where This Item Is Used') . '</a><br />';
+ }
+ if ($Its_A_Labour_Item == True) {
+ echo '<a href="' . $RootPath . '/WhereUsedInquiry.php?StockID=' . urlencode($StockID) . '">' . _('Where This Labour Item Is Used') . '</a><br />';
+ }
+ wikiLink('Product', $StockID);
+ echo '</td><td valign="top" class="select">';
+ /* Stock Transactions */
+ if ($Its_A_Kitset_Assembly_Or_Dummy == false) {
+ echo '<a href="' . $RootPath . '/StockAdjustments.php?StockID=' . urlencode($StockID) . '">' . _('Quantity Adjustments') . '</a><br />';
+ echo '<a href="' . $RootPath . '/StockTransfers.php?StockID=' . urlencode($StockID) . '&NewTransfer=true">' . _('Location Transfers') . '</a><br />';
- //show the item image if it has been uploaded
- if ( extension_loaded ('gd') && function_exists ('gd_info') && file_exists ($imagefile) ) {
- if ($_SESSION['ShowStockidOnImages'] == '0'){
- $StockImgLink = '<img src="GetStockImage.php?automake=1&textcolor=FFFFFF&bgcolor=CCCCCC'.
- '&StockID='.urlencode($StockID).
- '&text='.
- '&width=200'.
- '&height=200'.
- '" alt="" />';
+ //show the item image if it has been uploaded
+ if ( extension_loaded ('gd') && function_exists ('gd_info') && file_exists ($imagefile) ) {
+ if ($_SESSION['ShowStockidOnImages'] == '0'){
+ $StockImgLink = '<img src="GetStockImage.php?automake=1&textcolor=FFFFFF&bgcolor=CCCCCC'.
+ '&StockID='.urlencode($StockID).
+ '&text='.
+ '&width=200'.
+ '&height=200'.
+ '" alt="" />';
+ } else {
+ $StockImgLink = '<img src="GetStockImage.php?automake=1&textcolor=FFFFFF&bgcolor=CCCCCC'.
+ '&StockID='.urlencode($StockID).
+ '&text='. $StockID .
+ '&width=200'.
+ '&height=200'.
+ '" alt="" />';
+ }
+ } else if (file_exists ($imagefile)) {
+ $StockImgLink = '<img src="' . $imagefile . '" height="200" width="200" />';
} else {
- $StockImgLink = '<img src="GetStockImage.php?automake=1&textcolor=FFFFFF&bgcolor=CCCCCC'.
- '&StockID='.urlencode($StockID).
- '&text='. $StockID .
- '&width=200'.
- '&height=200'.
- '" alt="" />';
+ $StockImgLink = _('No Image');
}
- } else if (file_exists ($imagefile)) {
- $StockImgLink = '<img src="' . $imagefile . '" height="200" width="200" />';
- } else {
- $StockImgLink = _('No Image');
- }
- echo '<div class="centre">' . $StockImgLink . '</div>';
+ echo '<div class="centre">' . $StockImgLink . '</div>';
- if (($myrow['mbflag'] == 'B')
- AND (in_array($SuppliersSecurity, $_SESSION['AllowedPageSecurityTokens']))
- AND $myrow['discontinued']==0){
- echo '<br />';
- $SuppResult = DB_query("SELECT suppliers.suppname,
- suppliers.supplierid,
- purchdata.preferred,
- purchdata.minorderqty,
- purchdata.leadtime
- FROM purchdata INNER JOIN suppliers
- ON purchdata.supplierno=suppliers.supplierid
- WHERE purchdata.stockid='" . $StockID . "'
- ORDER BY purchdata.effectivefrom DESC");
- $LastSupplierShown = "";
- while ($SuppRow = DB_fetch_array($SuppResult)) {
- if ($LastSupplierShown != $SuppRow['supplierid']){
- if (($myrow['eoq'] < $SuppRow['minorderqty'])) {
- $EOQ = $SuppRow['minorderqty'];
- } else {
- $EOQ = $myrow['eoq'];
+ if (($myrow['mbflag'] == 'B')
+ AND (in_array($SuppliersSecurity, $_SESSION['AllowedPageSecurityTokens']))
+ AND $myrow['discontinued']==0){
+ echo '<br />';
+ $SuppResult = DB_query("SELECT suppliers.suppname,
+ suppliers.supplierid,
+ purchdata.preferred,
+ purchdata.minorderqty,
+ purchdata.leadtime
+ FROM purchdata INNER JOIN suppliers
+ ON purchdata.supplierno=suppliers.supplierid
+ WHERE purchdata.stockid='" . $StockID . "'
+ ORDER BY purchdata.effectivefrom DESC");
+ $LastSupplierShown = "";
+ while ($SuppRow = DB_fetch_array($SuppResult)) {
+ if ($LastSupplierShown != $SuppRow['supplierid']){
+ if (($myrow['eoq'] < $SuppRow['minorderqty'])) {
+ $EOQ = $SuppRow['minorderqty'];
+ } else {
+ $EOQ = $myrow['eoq'];
+ }
+ echo '<a href="' . $RootPath . '/PO_Header.php?NewOrder=Yes' . '&SelectedSupplier=' . $SuppRow['supplierid'] . '&StockID=' . urlencode($StockID) . '&Quantity='.$EOQ.'&LeadTime='.$SuppRow['leadtime'].'">' . _('Purchase this Item from') . ' ' . $SuppRow['suppname'] . '</a>
+ <br />';
+ $LastSupplierShown = $SuppRow['supplierid'];
}
- echo '<a href="' . $RootPath . '/PO_Header.php?NewOrder=Yes' . '&SelectedSupplier=' . $SuppRow['supplierid'] . '&StockID=' . urlencode($StockID) . '&Quantity='.$EOQ.'&LeadTime='.$SuppRow['leadtime'].'">' . _('Purchase this Item from') . ' ' . $SuppRow['suppname'] . '</a>
- <br />';
- $LastSupplierShown = $SuppRow['supplierid'];
- }
- /**/
- } /* end of while */
- } /* end of $myrow['mbflag'] == 'B' */
-} /* end of ($Its_A_Kitset_Assembly_Or_Dummy == False) */
-echo '</td><td valign="top" class="select">';
-/* Stock Maintenance Options */
-echo '<a href="' . $RootPath . '/Stocks.php?">' . _('Insert New Item') . '</a><br />';
-echo '<a href="' . $RootPath . '/Stocks.php?StockID=' . urlencode($StockID) . '">' . _('Modify Item Details') . '</a><br />';
-if ($Its_A_Kitset_Assembly_Or_Dummy == False) {
- echo '<a href="' . $RootPath . '/StockReorderLevel.php?StockID=' . urlencode($StockID) . '">' . _('Maintain Reorder Levels') . '</a><br />';
- echo '<a href="' . $RootPath . '/StockCostUpdate.php?StockID=' . urlencode($StockID) . '">' . _('Maintain Standard Cost') . '</a><br />';
- echo '<a href="' . $RootPath . '/PurchData.php?StockID=' . urlencode($StockID) . '">' . _('Maintain Purchasing Data') . '</a><br />';
- echo '<a href="' . $RootPath . '/CustItem.php?StockID=' . urlencode($StockID) . '">' . _('Maintain Customer Item Data') . '</a><br />';
-}
-if ($Its_A_Labour_Item == True) {
- echo '<a href="' . $RootPath . '/StockCostUpdate.php?StockID=' . urlencode($StockID) . '">' . _('Maintain Standard Cost') . '</a><br />';
-}
-if (!$Its_A_Kitset) {
- echo '<a href="' . $RootPath . '/Prices.php?Item=' . urlencode($StockID) . '">' . _('Maintain Pricing') . '</a><br />';
- if (isset($_SESSION['CustomerID'])
- AND $_SESSION['CustomerID'] != ''
- AND mb_strlen($_SESSION['CustomerID']) > 0) {
- echo '<a href="' . $RootPath . '/Prices_Customer.php?Item=' . urlencode($StockID) . '">' . _('Special Prices for customer') . ' - ' . $_SESSION['CustomerID'] . '</a><br />';
+ /**/
+ } /* end of while */
+ } /* end of $myrow['mbflag'] == 'B' */
+ } /* end of ($Its_A_Kitset_Assembly_Or_Dummy == False) */
+ echo '</td><td valign="top" class="select">';
+ /* Stock Maintenance Options */
+ echo '<a href="' . $RootPath . '/Stocks.php?">' . _('Insert New Item') . '</a><br />';
+ echo '<a href="' . $RootPath . '/Stocks.php?StockID=' . urlencode($StockID) . '">' . _('Modify Item Details') . '</a><br />';
+ if ($Its_A_Kitset_Assembly_Or_Dummy == False) {
+ echo '<a href="' . $RootPath . '/StockReorderLevel.php?StockID=' . urlencode($StockID) . '">' . _('Maintain Reorder Levels') . '</a><br />';
+ echo '<a href="' . $RootPath . '/StockCostUpdate.php?StockID=' . urlencode($StockID) . '">' . _('Maintain Standard Cost') . '</a><br />';
+ echo '<a href="' . $RootPath . '/PurchData.php?StockID=' . urlencode($StockID) . '">' . _('Maintain Purchasing Data') . '</a><br />';
+ echo '<a href="' . $RootPath . '/CustItem.php?StockID=' . urlencode($StockID) . '">' . _('Maintain Customer Item Data') . '</a><br />';
}
- echo '<a href="' . $RootPath . '/DiscountCategories.php?StockID=' . urlencode($StockID) . '">' . _('Maintain Discount Category') . '</a><br />';
- echo '<a href="' . $RootPath . '/StockClone.php?OldStockID=' . urlencode($StockID) . '">' . _('Clone This Item') . '</a><br />';
- echo '<a href="' . $RootPath . '/RelatedItemsUpdate.php?Item=' . urlencode($StockID) . '">' . _('Maintain Related Items') . '</a><br />';
- echo '<a href="' . $RootPath . '/PriceMatrix.php?StockID=' . urlencode($StockID) . '">' . _('Maintain Price Matrix') . '</a><br />';
-}
-echo '</td></tr></table>';
+ if ($Its_A_Labour_Item == True) {
+ echo '<a href="' . $RootPath . '/StockCostUpdate.php?StockID=' . urlencode($StockID) . '">' . _('Maintain Standard Cost') . '</a><br />';
+ }
+ if (!$Its_A_Kitset) {
+ echo '<a href="' . $RootPath . '/Prices.php?Item=' . urlencode($StockID) . '">' . _('Maintain Pricing') . '</a><br />';
+ if (isset($_SESSION['CustomerID'])
+ AND $_SESSION['CustomerID'] != ''
+ AND mb_strlen($_SESSION['CustomerID']) > 0) {
+ echo '<a href="' . $RootPath . '/Prices_Customer.php?Item=' . urlencode($StockID) . '">' . _('Special Prices for customer') . ' - ' . $_SESSION['CustomerID'] . '</a><br />';
+ }
+ echo '<a href="' . $RootPath . '/DiscountCategories.php?StockID=' . urlencode($StockID) . '">' . _('Maintain Discount Category') . '</a><br />';
+ echo '<a href="' . $RootPath . '/StockClone.php?OldStockID=' . urlencode($StockID) . '">' . _('Clone This Item') . '</a><br />';
+ echo '<a href="' . $RootPath . '/RelatedItemsUpdate.php?Item=' . urlencode($StockID) . '">' . _('Maintain Related Items') . '</a><br />';
+ echo '<a href="' . $RootPath . '/PriceMatrix.php?StockID=' . urlencode($StockID) . '">' . _('Maintain Price Matrix') . '</a><br />';
+ }
+ echo '</td></tr><tbody></table>';
} else {
// options (links) to pages. This requires stock id also to be passed.
- echo '<table width="90%" cellpadding="4">';
- echo '<tr>
- <th style="width:33%">' . _('Item Inquiries') . '</th>
- <th style="width:33%">' . _('Item Transactions') . '</th>
- <th style="width:33%">' . _('Item Maintenance') . '</th>
- </tr>';
- echo '<tr><td class="select">';
- /*Stock Inquiry Options */
- echo '</td><td class="select">';
- /* Stock Transactions */
- echo '</td><td class="select">';
- /*Stock Maintenance Options */
- echo '<a href="' . $RootPath . '/Stocks.php?">' . _('Insert New Item') . '</a><br />';
- echo '</td></tr></table>';
-} // end displaying item options if there is one and only one record
+
+ // Inventory Item is not selected yet
+ echo '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/inventory.png" title="', // Icon image.
+ _('Inventory Items'), '" /> ', // Icon title.
+ _('Inventory Items'), '</p>',// Page title.
+ '<br />',
+ $TableHead,
+ '<tr>',
+ '<td class="select"></td>',// Item inquiries options.
+ '<td class="select"></td>',// Item transactions options.
+ '<td class="select"><a href="', $RootPath, '/Stocks.php?">', _('Insert New Item'), '</a></td>',// Stock Maintenance Options.
+ '</tr><tbody></table>';
+}// end displaying item options if there is one and only one record
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">';
echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
@@ -572,7 +587,7 @@
echo '</div>
</form>';
// query for list of record(s)
-if(isset($_POST['Go']) OR isset($_POST['Next']) OR isset($_POST['Previous'])) {
+if (isset($_POST['Go']) OR isset($_POST['Next']) OR isset($_POST['Previous'])) {
$_POST['Search']='Search';
}
if (isset($_POST['Search']) OR isset($_POST['Go']) OR isset($_POST['Next']) OR isset($_POST['Previous'])) {
@@ -862,7 +877,7 @@
$SupportedImgExt = array('png','jpg','jpeg');
$imagefile = reset((glob($_SESSION['part_pics_dir'] . '/' . $myrow['stockid'] . '.{' . implode(",", $SupportedImgExt) . '}', GLOB_BRACE)));
- if(extension_loaded('gd') && function_exists('gd_info') && file_exists ($imagefile) ) {
+ if (extension_loaded('gd') && function_exists('gd_info') && file_exists ($imagefile) ) {
$StockImgLink = '<img src="GetStockImage.php?automake=1&textcolor=FFFFFF&bgcolor=CCCCCC'.
'&StockID='.urlencode($myrow['stockid']).
'&text='. //$myrow['stockid'] .
@@ -869,7 +884,7 @@
'&width=100'.
'&height=100'.
'" alt="" />';
- } else if(file_exists ($imagefile)) {
+ } else if (file_exists ($imagefile)) {
$StockImgLink = '<img src="' . $imagefile . '" height="100" width="100" />';
} else {
$StockImgLink = '<p>'._('No Image').'</p>';
Modified: trunk/SelectSupplier.php
===================================================================
--- trunk/SelectSupplier.php 2017-09-27 23:48:22 UTC (rev 7841)
+++ trunk/SelectSupplier.php 2017-10-02 07:55:23 UTC (rev 7842)
@@ -10,9 +10,6 @@
include('includes/SQL_CommonFunctions.inc');
-if (!isset($_SESSION['SupplierID'])) {
- echo '<p class="page_title_text"><img src="' . $RootPath . '/css/' . $Theme . '/images/supplier.png" title="' . _('Search') . '" alt="" />' . ' ' . _('Suppliers') . '</p>';
-}
if (isset($_GET['SupplierID'])) {
$_SESSION['SupplierID']=$_GET['SupplierID'];
}
@@ -148,7 +145,24 @@
}
} //end of if search
+$TableHead =
+ '<table cellpadding="4" width="90%" class="selection">
+ <thead>
+ <tr>
+ <th style="width:33%">' .
+ '<img alt="" src="' . $RootPath . '/css/' . $Theme . '/images/reports.png" title="' . _('Inquiries and Reports') . '" />' .
+ _('Supplier Inquiries') . '</th>
+ <th style="width:33%">' .
+ '<img alt="" src="' . $RootPath . '/css/' . $Theme . '/images/transactions.png" title="' . _('Transactions') . '" />' .
+ _('Supplier Transactions') . '</th>
+ <th style="width:33%">' .
+ '<img alt="" src="' . $RootPath . '/css/' . $Theme . '/images/maintenance.png" title="' . _('Maintenance') . '" />' .
+ _('Supplier Maintenance') . '</th>
+ </tr>
+ </thead>
+ <tbody>';
if (isset($_SESSION['SupplierID'])) {
+ // A supplier is selected
$SupplierName = '';
$SQL = "SELECT suppliers.suppname
FROM suppliers
@@ -158,16 +172,17 @@
$myrow = DB_fetch_row($SupplierNameResult);
$SupplierName = $myrow[0];
}
- echo '<p class="page_title_text"><img src="' . $RootPath . '/css/' . $Theme . '/images/supplier.png" title="' . _('Supplier') . '" alt="" />' . ' ' . _('Supplier') . ' : <b>' . $_SESSION['SupplierID'] . ' - ' . $SupplierName . '</b> ' . _('has been selected') . '.</p>';
- echo '<div class="page_help_text">' . _('Select a menu option to operate using this supplier.') . '</div>';
- echo '<br />
- <table width="90%" cellpadding="4">
- <tr>
- <th style="width:33%">' . _('Supplier Inquiries') . '</th>
- <th style="width:33%">' . _('Supplier Transactions') . '</th>
- <th style="width:33%">' . _('Supplier Maintenance') . '</th>
- </tr>';
- echo '<tr><td valign="top" class="select">'; /* Inquiry Options */
+
+ echo '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/supplier.png" title="', // Icon image.
+ _('Supplier'), '" /> ', // Icon title.
+ _('Supplier'), ': ', $_SESSION['SupplierID'], ' - ', $SupplierName, /*' ', _('has been selected'), */'</p>',// Page title.
+ '<div class="page_help_text">', _('Select a menu option to operate using this supplier.'), '</div>',// Page help text.
+ '<br />',
+ $TableHead,
+ '<tr>
+ <td valign="top" class="select">';
+ // Supplier inquiries options:
echo '<a href="' . $RootPath . '/SupplierInquiry.php?SupplierID=' . $_SESSION['SupplierID'] . '">' . _('Supplier Account Inquiry') . '</a>
<br />
<a href="' . $RootPath . '/SupplierGRNAndInvoiceInquiry.php?SelectedSupplier=' . $_SESSION['SupplierID'] . '&SupplierName='.urlencode($SupplierName).'">' . _('Supplier Delivery Note AND GRN inquiry') . '</a>
@@ -197,24 +212,20 @@
<br /><a href="' . $RootPath . '/SuppLoginSetup.php">' . _('Supplier Login Configuration') . '</a>
</td>
</tr>
- </table>';
+ <tbody></table>';
} else {
// Supplier is not selected yet
- echo '<br />';
- echo '<table width="90%" cellpadding="4">
- <tr>
- <th style="width:33%">' . _('Supplier Inquiries') . '</th>
- <th style="width:33%">' . _('Supplier Transactions') . '</th>
- <th style="width:33%">' . _('Supplier Maintenance') . '</th>
- </tr>';
- echo '<tr>
- <td valign="top" class="select"></td>
- <td valign="top" class="select"></td>
- <td valign="top" class="select">'; /* Supplier Maintenance */
- echo '<a href="' . $RootPath . '/Suppliers.php">' . _('Add a New Supplier') . '</a><br />';
- echo '</td>
- </tr>
- </table>';
+ echo '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/supplier.png" title="', // Icon image.
+ _('Suppliers'), '" /> ', // Icon title.
+ _('Suppliers'), '</p>',// Page title.
+ '<br />',
+ $TableHead,
+ '<tr>',
+ '<td class="select"></td>',// Supplier inquiries options.
+ '<td class="select"></td>',// Supplier transactions options.
+ '<td class="select"><a href="', $RootPath, '/Suppliers.php">', _('Add a New Supplier'), '</a></td>',// Supplier Maintenance options.
+ '</tr><tbody></table>';
}
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">';
echo '<div>';
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2017-09-27 23:48:22 UTC (rev 7841)
+++ trunk/doc/Change.log 2017-10-02 07:55:23 UTC (rev 7842)
@@ -1,5 +1,6 @@
webERP Change Log
+01/10/26 RChacon: Standardise and add icons for usability.
27/09/26 RChacon: Increases accuracy in coordinates.
17/09/26 Exson: Fixed the wrong price retrieved bug in PO_Header.php.
17/09/26 Exson: Fixed the vendor price bug to ensure only the effective price showed by suppliers in SelectProduct.php.
Modified: trunk/index.php
===================================================================
--- trunk/index.php 2017-09-27 23:48:22 UTC (rev 7841)
+++ trunk/index.php 2017-10-02 07:55:23 UTC (rev 7842)
@@ -102,7 +102,7 @@
if ($_SESSION['Module']=='system') {
$Header='<img src="' . $RootPath . '/css/' . $Theme . '/images/company.png" title="' . _('General Setup Options') . '" alt="' . _('General Setup Options') . '" /><b>' . _('General Setup Options') . '</b>';
} else {
- $Header='<img src="' . $RootPath . '/css/' . $Theme . '/images/transactions.png" title="' . _('Transactions') . '" alt="' . _('Transactions') . '" /><b>' . _('Transactions') . '</b>';
+ $Header='<img alt="" src="' . $RootPath . '/css/' . $Theme . '/images/transactions.png" title="' . _('Transactions') . '" /><b>' . _('Transactions') . '</b>';
}
echo $Header;
echo '</li>'; // SubMenuHeader
@@ -130,7 +130,7 @@
if ($_SESSION['Module']=='system') {
$Header='<img src="' . $RootPath . '/css/' . $Theme . '/images/ar.png" title="' . _('Receivables/Payables Setup') . '" alt="' . _('Receivables/Payables Setup') . '" /><b>' . _('Receivables/Payables Setup') . '</b>';
} else {
- $Header='<img src="' . $RootPath . '/css/' . $Theme . '/images/reports.png" title="' . _('Inquiries and Reports') . '" alt="' . _('Inquiries and Reports') . '" /><b>' . _('Inquiries and Reports') . '</b>';
+ $Header='<img alt="" src="' . $RootPath . '/css/' . $Theme . '/images/reports.png" title="' . _('Inquiries and Reports') . '" /><b>' . _('Inquiries and Reports') . '</b>';
}
echo $Header;
echo '</li>';
@@ -158,7 +158,8 @@
if ($_SESSION['Module']=='system') {
$Header='<img src="' . $RootPath . '/css/' . $Theme . '/images/inventory.png" title="' . _('Inventory Setup') . '" alt="' . _('Inventory Setup') . '" /><b>' . _('Inventory Setup') . '</b>';
} else {
- $Header='<img src="' . $RootPath . '/css/' . $Theme . '/images/maintenance.png" title="' . _('Maintenance') . '" alt="' . _('Maintenance') . '" /><b>' . _('Maintenance') . '</b>';
+ $Header='<img alt="" src="' . $RootPath . '/css/' . $Theme . '/images/maintenance.png" title="' . _('Maintenance') . '" /><b>' . _('Maintenance') . '</b>';
+
}
echo $Header;
echo '</li>';
|
|
From: <rc...@us...> - 2017-09-27 23:48:30
|
Revision: 7841
http://sourceforge.net/p/web-erp/reponame/7841
Author: rchacon
Date: 2017-09-27 23:48:22 +0000 (Wed, 27 Sep 2017)
Log Message:
-----------
Increases accuracy in coordinates.
Modified Paths:
--------------
trunk/doc/Change.log
trunk/sql/mysql/upgrade4.14.1-4.14.2.sql
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2017-09-26 12:24:24 UTC (rev 7840)
+++ trunk/doc/Change.log 2017-09-27 23:48:22 UTC (rev 7841)
@@ -1,5 +1,6 @@
webERP Change Log
+27/09/26 RChacon: Increases accuracy in coordinates.
17/09/26 Exson: Fixed the wrong price retrieved bug in PO_Header.php.
17/09/26 Exson: Fixed the vendor price bug to ensure only the effective price showed by suppliers in SelectProduct.php.
17/09/20 Exson: Fixed the bug to make GRN reverse workable.
Modified: trunk/sql/mysql/upgrade4.14.1-4.14.2.sql
===================================================================
--- trunk/sql/mysql/upgrade4.14.1-4.14.2.sql 2017-09-26 12:24:24 UTC (rev 7840)
+++ trunk/sql/mysql/upgrade4.14.1-4.14.2.sql 2017-09-27 23:48:22 UTC (rev 7841)
@@ -23,3 +23,8 @@
`amount` DOUBLE NOT NULL DEFAULT 0.0,
PRIMARY KEY(counterindex)
);
+
+ALTER TABLE `custbranch` CHANGE `lat` `lat` FLOAT(12,8) NOT NULL DEFAULT '0.00000000';
+ALTER TABLE `custbranch` CHANGE `lng` `lng` FLOAT(12,8) NOT NULL DEFAULT '0.00000000'
+
+
|
|
From: <afc...@us...> - 2017-09-18 22:09:36
|
Revision: 7836
http://sourceforge.net/p/web-erp/reponame/7836
Author: afcouling
Date: 2017-09-18 22:09:33 +0000 (Mon, 18 Sep 2017)
Log Message:
-----------
Geocode bug fixes. http://www.weberp.org/forum/showthread.php?tid=4380
Modified Paths:
--------------
trunk/CustomerBranches.php
trunk/SelectSupplier.php
trunk/Suppliers.php
trunk/doc/Change.log
Modified: trunk/CustomerBranches.php
===================================================================
--- trunk/CustomerBranches.php 2017-09-17 01:39:01 UTC (rev 7835)
+++ trunk/CustomerBranches.php 2017-09-18 22:09:33 UTC (rev 7836)
@@ -109,25 +109,18 @@
// 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>';
} else {
- $address = $_POST['BrAddress1'] . ', ' . $_POST['BrAddress2'] . ', ' . $_POST['BrAddress3'] . ', ' . $_POST['BrAddress4'];
- $base_url = 'http://' . MAPS_HOST . '/maps/geo?output=xml&key=' . KEY;
- $request_url = $base_url . '&q=' . urlencode($address);
+ $address = urlencode($_POST['BrAddress1'] . ', ' . $_POST['BrAddress2'] . ', ' . $_POST['BrAddress3'] . ', ' . $_POST['BrAddress4']);
+ $base_url = "http://" . MAPS_HOST . "/maps/api/geocode/xml?address=";
+ $request_url = $base_url . $address . ',&sensor=true';
$xml = simplexml_load_string(utf8_encode(file_get_contents($request_url))) or die('url not loading');
- $Coordinates = $xml->Response->Placemark->Point->Coordinates;
- $CoordinatesSplit = explode(",", $Coordinates);
- // Format: Longitude, Latitude, Altitude
- $Latitude = $CoordinatesSplit[1];
- $Longitude = $CoordinatesSplit[0];
- $Status = $xml->Response->Status->code;
- if (strcmp($Status, '200') == 0) {
+ $Status = $xml->status;
+ if (strcmp($Status, 'OK') == 0) {
// Successful geocode
$Geocode_Pending = false;
- $Coordinates = $xml->Response->Placemark->Point->Coordinates;
- $CoordinatesSplit = explode(",", $Coordinates);
// Format: Longitude, Latitude, Altitude
- $Latitude = $CoordinatesSplit[1];
- $Longitude = $CoordinatesSplit[0];
+ $Latitude = $xml->result->geometry->location->lat;
+ $Longitude = $xml->result->geometry->location->lng;
} else {
// failure to geocode
$Geocode_Pending = false;
Modified: trunk/SelectSupplier.php
===================================================================
--- trunk/SelectSupplier.php 2017-09-17 01:39:01 UTC (rev 7835)
+++ trunk/SelectSupplier.php 2017-09-18 22:09:33 UTC (rev 7836)
@@ -16,6 +16,16 @@
if (isset($_GET['SupplierID'])) {
$_SESSION['SupplierID']=$_GET['SupplierID'];
}
+if (isset($_POST['Select'])) { /*User has hit the button selecting a supplier */
+ $_SESSION['SupplierID'] = $_POST['Select'];
+ unset($_POST['Select']);
+ unset($_POST['Keywords']);
+ unset($_POST['SupplierCode']);
+ unset($_POST['Search']);
+ unset($_POST['Go']);
+ unset($_POST['Next']);
+ unset($_POST['Previous']);
+}
// only get geocode information if integration is on, and supplier has been selected
if ($_SESSION['geocode_integration'] == 1 AND isset($_SESSION['SupplierID'])) {
$sql = "SELECT * FROM geocode_param WHERE 1";
@@ -39,7 +49,7 @@
$map_height = $myrow['map_height'];
$map_width = $myrow['map_width'];
$map_host = $myrow['map_host'];
- echo '<script src="http://maps.google.com/maps?file=api&v=2&key=' . $api_key . '"';
+ echo '<script src="https://maps.google.com/maps?file=api&v=2&key=' . $api_key . '"';
echo ' type="text/javascript"></script>';
echo ' <script type="text/javascript">';
echo 'function load() {
@@ -67,16 +77,6 @@
$_POST['PageOffset'] = 1;
}
}
-if (isset($_POST['Select'])) { /*User has hit the button selecting a supplier */
- $_SESSION['SupplierID'] = $_POST['Select'];
- unset($_POST['Select']);
- unset($_POST['Keywords']);
- unset($_POST['SupplierCode']);
- unset($_POST['Search']);
- unset($_POST['Go']);
- unset($_POST['Next']);
- unset($_POST['Previous']);
-}
if (isset($_POST['Search'])
OR isset($_POST['Go'])
OR isset($_POST['Next'])
Modified: trunk/Suppliers.php
===================================================================
--- trunk/Suppliers.php 2017-09-17 01:39:01 UTC (rev 7835)
+++ trunk/Suppliers.php 2017-09-18 22:09:33 UTC (rev 7836)
@@ -422,29 +422,22 @@
if ($map_host=="") {
echo '<div class="warn">' . _('Warning - Geocode Integration is enabled, but no hosts are setup. Go to Geocode Setup') . '</div>';
} else {
- $address = $_POST['Address1'] . ', ' . $_POST['Address2'] . ', ' . $_POST['Address3'] . ', ' . $_POST['Address4'] . ', ' . $_POST['Address5']. ', ' . $_POST['Address6'];
+ $address = urlencode($_POST['Address1'] . ', ' . $_POST['Address2'] . ', ' . $_POST['Address3'] . ', ' . $_POST['Address4'] . ', ' . $_POST['Address5'] . ', ' . $_POST['Address6']);
+ $base_url = "http://" . MAPS_HOST . "/maps/api/geocode/xml?address=";
+ $request_url = $base_url . $address . ',&sensor=true';
- $base_url = 'http://' . MAPS_HOST . '/maps/geo?output=xml' . '&key=' . KEY;
- $request_url = $base_url . '&q=' . urlencode($address);
-
- $xml = simplexml_load_string(utf8_encode(file_get_contents($request_url))) or prnMsg(_('Goole map url not loading'),'warn');
+ $xml = simplexml_load_string(utf8_encode(file_get_contents($request_url))) or die("url not loading");
// $xml = simplexml_load_file($request_url) or die("url not loading");
$coordinates = $xml->Response->Placemark->Point->coordinates;
- $coordinatesSplit = explode(',', $coordinates);
- // Format: Longitude, Latitude, Altitude
- $latitude = $coordinatesSplit[1];
- $longitude = $coordinatesSplit[0];
- $status = $xml->Response->Status->code;
- if (strcmp($status, '200') == 0) {
+ $status = $xml->status;
+ if (strcmp($status, 'OK') == 0) {
// Successful geocode
$geocode_pending = false;
- $coordinates = $xml->Response->Placemark->Point->coordinates;
- $coordinatesSplit = explode(",", $coordinates);
// Format: Longitude, Latitude, Altitude
- $latitude = $coordinatesSplit[1];
- $longitude = $coordinatesSplit[0];
+ $latitude = $xml->result->geometry->location->lat;
+ $longitude = $xml->result->geometry->location->lng;
} else {
// failure to geocode
$geocode_pending = false;
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2017-09-17 01:39:01 UTC (rev 7835)
+++ trunk/doc/Change.log 2017-09-18 22:09:33 UTC (rev 7836)
@@ -1,5 +1,6 @@
webERP Change Log
+18/9/2017 Tim (committed by Andy): Geocode bug fixes. http://www.weberp.org/forum/showthread.php?tid=4380
17/9/17 VortecCPI: SelectProduct.php made image dispay code match that used in WorkOrderEntry.php
11/9/17 Andy Couling: Fixed the onclick delete confirmation box call in ContractBOM.php, was 'MakeConfirm'.
11/9/17 Andy Couling: Code consistency in PO_Items.php. http://www.weberp.org/forum/showthread.php?tid=4355
|
15 messages has been excluded from this view by a project administrator.
